diff options
222 files changed, 3465 insertions, 3963 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 8b0563633442..43e89b1537d9 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
| @@ -134,8 +134,6 @@ dvb/ | |||
| 134 | - info on Linux Digital Video Broadcast (DVB) subsystem. | 134 | - info on Linux Digital Video Broadcast (DVB) subsystem. |
| 135 | early-userspace/ | 135 | early-userspace/ |
| 136 | - info about initramfs, klibc, and userspace early during boot. | 136 | - info about initramfs, klibc, and userspace early during boot. |
| 137 | ecryptfs.txt | ||
| 138 | - docs on eCryptfs: stacked cryptographic filesystem for Linux. | ||
| 139 | eisa.txt | 137 | eisa.txt |
| 140 | - info on EISA bus support. | 138 | - info on EISA bus support. |
| 141 | exception.txt | 139 | exception.txt |
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 397575880dc4..a30dd4480ad4 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches | |||
| @@ -126,7 +126,7 @@ the reviewers time and will get your patch rejected, probably | |||
| 126 | without even being read. | 126 | without even being read. |
| 127 | 127 | ||
| 128 | At a minimum you should check your patches with the patch style | 128 | At a minimum you should check your patches with the patch style |
| 129 | checker prior to submission (scripts/patchcheck.pl). You should | 129 | checker prior to submission (scripts/checkpatch.pl). You should |
| 130 | be able to justify all violations that remain in your patch. | 130 | be able to justify all violations that remain in your patch. |
| 131 | 131 | ||
| 132 | 132 | ||
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 571785887a4f..59db1bca7027 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX | |||
| @@ -32,6 +32,8 @@ directory-locking | |||
| 32 | - info about the locking scheme used for directory operations. | 32 | - info about the locking scheme used for directory operations. |
| 33 | dlmfs.txt | 33 | dlmfs.txt |
| 34 | - info on the userspace interface to the OCFS2 DLM. | 34 | - info on the userspace interface to the OCFS2 DLM. |
| 35 | ecryptfs.txt | ||
| 36 | - docs on eCryptfs: stacked cryptographic filesystem for Linux. | ||
| 35 | ext2.txt | 37 | ext2.txt |
| 36 | - info, mount options and specifications for the Ext2 filesystem. | 38 | - info, mount options and specifications for the Ext2 filesystem. |
| 37 | ext3.txt | 39 | ext3.txt |
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index 8ccf0c1b58ed..ed55238023a9 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt | |||
| @@ -28,11 +28,7 @@ Manish Singh <manish.singh@oracle.com> | |||
| 28 | Caveats | 28 | Caveats |
| 29 | ======= | 29 | ======= |
| 30 | Features which OCFS2 does not support yet: | 30 | Features which OCFS2 does not support yet: |
| 31 | - sparse files | ||
| 32 | - extended attributes | 31 | - extended attributes |
| 33 | - shared writable mmap | ||
| 34 | - loopback is supported, but data written will not | ||
| 35 | be cluster coherent. | ||
| 36 | - quotas | 32 | - quotas |
| 37 | - cluster aware flock | 33 | - cluster aware flock |
| 38 | - cluster aware lockf | 34 | - cluster aware lockf |
| @@ -57,3 +53,12 @@ nointr Do not allow signals to interrupt cluster | |||
| 57 | atime_quantum=60(*) OCFS2 will not update atime unless this number | 53 | atime_quantum=60(*) OCFS2 will not update atime unless this number |
| 58 | of seconds has passed since the last update. | 54 | of seconds has passed since the last update. |
| 59 | Set to zero to always update atime. | 55 | Set to zero to always update atime. |
| 56 | data=ordered (*) All data are forced directly out to the main file | ||
| 57 | system prior to its metadata being committed to the | ||
| 58 | journal. | ||
| 59 | data=writeback Data ordering is not preserved, data may be written | ||
| 60 | into the main file system after its metadata has been | ||
| 61 | committed to the journal. | ||
| 62 | preferred_slot=0(*) During mount, try to use this filesystem slot first. If | ||
| 63 | it is in use by another node, the first empty one found | ||
| 64 | will be chosen. Invalid values will be ignored. | ||
diff --git a/Documentation/networking/multiqueue.txt b/Documentation/networking/multiqueue.txt index 00b60cce2224..ea5a42e8f79f 100644 --- a/Documentation/networking/multiqueue.txt +++ b/Documentation/networking/multiqueue.txt | |||
| @@ -58,9 +58,13 @@ software, so it's a straight round-robin qdisc. It uses the same syntax and | |||
| 58 | classification priomap that sch_prio uses, so it should be intuitive to | 58 | classification priomap that sch_prio uses, so it should be intuitive to |
| 59 | configure for people who've used sch_prio. | 59 | configure for people who've used sch_prio. |
| 60 | 60 | ||
| 61 | The PRIO qdisc naturally plugs into a multiqueue device. If PRIO has been | 61 | In order to utilitize the multiqueue features of the qdiscs, the network |
| 62 | built with NET_SCH_PRIO_MQ, then upon load, it will make sure the number of | 62 | device layer needs to enable multiple queue support. This can be done by |
| 63 | bands requested is equal to the number of queues on the hardware. If they | 63 | selecting NETDEVICES_MULTIQUEUE under Drivers. |
| 64 | |||
| 65 | The PRIO qdisc naturally plugs into a multiqueue device. If | ||
| 66 | NETDEVICES_MULTIQUEUE is selected, then on qdisc load, the number of | ||
| 67 | bands requested is compared to the number of queues on the hardware. If they | ||
| 64 | are equal, it sets a one-to-one mapping up between the queues and bands. If | 68 | are equal, it sets a one-to-one mapping up between the queues and bands. If |
| 65 | they're not equal, it will not load the qdisc. This is the same behavior | 69 | they're not equal, it will not load the qdisc. This is the same behavior |
| 66 | for RR. Once the association is made, any skb that is classified will have | 70 | for RR. Once the association is made, any skb that is classified will have |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 23 | 3 | SUBLEVEL = 23 |
| 4 | EXTRAVERSION =-rc5 | 4 | EXTRAVERSION =-rc6 |
| 5 | NAME = Pink Farting Weasel | 5 | NAME = Pink Farting Weasel |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug index 554efe604a08..996d97e953b0 100644 --- a/arch/h8300/Kconfig.debug +++ b/arch/h8300/Kconfig.debug | |||
| @@ -59,7 +59,7 @@ config BLKDEV_RESERVE | |||
| 59 | help | 59 | help |
| 60 | Reserved BLKDEV area. | 60 | Reserved BLKDEV area. |
| 61 | 61 | ||
| 62 | config CONFIG_BLKDEV_RESERVE_ADDRESS | 62 | config BLKDEV_RESERVE_ADDRESS |
| 63 | hex 'start address' | 63 | hex 'start address' |
| 64 | depends on BLKDEV_RESERVE | 64 | depends on BLKDEV_RESERVE |
| 65 | help | 65 | help |
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c index 6be9ca811d17..09fb342cc62e 100644 --- a/arch/i386/boot/pm.c +++ b/arch/i386/boot/pm.c | |||
| @@ -122,7 +122,11 @@ static void setup_gdt(void) | |||
| 122 | /* DS: data, read/write, 4 GB, base 0 */ | 122 | /* DS: data, read/write, 4 GB, base 0 */ |
| 123 | [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff), | 123 | [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff), |
| 124 | }; | 124 | }; |
| 125 | struct gdt_ptr gdt; | 125 | /* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead |
| 126 | of the gdt_ptr contents. Thus, make it static so it will | ||
| 127 | stay in memory, at least long enough that we switch to the | ||
| 128 | proper kernel GDT. */ | ||
| 129 | static struct gdt_ptr gdt; | ||
| 126 | 130 | ||
| 127 | gdt.len = sizeof(boot_gdt)-1; | 131 | gdt.len = sizeof(boot_gdt)-1; |
| 128 | gdt.ptr = (u32)&boot_gdt + (ds() << 4); | 132 | gdt.ptr = (u32)&boot_gdt + (ds() << 4); |
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index 9f4ac8b02de4..bd72d94e713e 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/i386/kernel/alternative.c | |||
| @@ -445,8 +445,6 @@ void __kprobes text_poke(void *addr, unsigned char *opcode, int len) | |||
| 445 | { | 445 | { |
| 446 | memcpy(addr, opcode, len); | 446 | memcpy(addr, opcode, len); |
| 447 | sync_core(); | 447 | sync_core(); |
| 448 | /* Not strictly needed, but can speed CPU recovery up. Ignore cross cacheline | 448 | /* Could also do a CLFLUSH here to speed up CPU recovery; but |
| 449 | case. */ | 449 | that causes hangs on some VIA CPUs. */ |
| 450 | if (cpu_has_clflush) | ||
| 451 | asm("clflush (%0) " :: "r" (addr) : "memory"); | ||
| 452 | } | 450 | } |
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c index d5a456d27d82..db6c25aa5776 100644 --- a/arch/i386/kernel/cpu/intel_cacheinfo.c +++ b/arch/i386/kernel/cpu/intel_cacheinfo.c | |||
| @@ -515,7 +515,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu) | |||
| 515 | 515 | ||
| 516 | cpuid4_info[cpu] = kzalloc( | 516 | cpuid4_info[cpu] = kzalloc( |
| 517 | sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL); | 517 | sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL); |
| 518 | if (unlikely(cpuid4_info[cpu] == NULL)) | 518 | if (cpuid4_info[cpu] == NULL) |
| 519 | return -ENOMEM; | 519 | return -ENOMEM; |
| 520 | 520 | ||
| 521 | oldmask = current->cpus_allowed; | 521 | oldmask = current->cpus_allowed; |
| @@ -748,6 +748,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev) | |||
| 748 | unsigned int cpu = sys_dev->id; | 748 | unsigned int cpu = sys_dev->id; |
| 749 | unsigned long i; | 749 | unsigned long i; |
| 750 | 750 | ||
| 751 | if (cpuid4_info[cpu] == NULL) | ||
| 752 | return; | ||
| 751 | for (i = 0; i < num_cache_leaves; i++) { | 753 | for (i = 0; i < num_cache_leaves; i++) { |
| 752 | cache_remove_shared_cpu_map(cpu, i); | 754 | cache_remove_shared_cpu_map(cpu, i); |
| 753 | kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj)); | 755 | kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj)); |
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c index 4be488e73bee..93fecd4b03de 100644 --- a/arch/i386/kernel/cpu/perfctr-watchdog.c +++ b/arch/i386/kernel/cpu/perfctr-watchdog.c | |||
| @@ -263,8 +263,8 @@ static int setup_k7_watchdog(unsigned nmi_hz) | |||
| 263 | unsigned int evntsel; | 263 | unsigned int evntsel; |
| 264 | struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); | 264 | struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); |
| 265 | 265 | ||
| 266 | perfctr_msr = MSR_K7_PERFCTR0; | 266 | perfctr_msr = wd_ops->perfctr; |
| 267 | evntsel_msr = MSR_K7_EVNTSEL0; | 267 | evntsel_msr = wd_ops->evntsel; |
| 268 | 268 | ||
| 269 | wrmsrl(perfctr_msr, 0UL); | 269 | wrmsrl(perfctr_msr, 0UL); |
| 270 | 270 | ||
| @@ -343,8 +343,8 @@ static int setup_p6_watchdog(unsigned nmi_hz) | |||
| 343 | unsigned int evntsel; | 343 | unsigned int evntsel; |
| 344 | struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); | 344 | struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); |
| 345 | 345 | ||
| 346 | perfctr_msr = MSR_P6_PERFCTR0; | 346 | perfctr_msr = wd_ops->perfctr; |
| 347 | evntsel_msr = MSR_P6_EVNTSEL0; | 347 | evntsel_msr = wd_ops->evntsel; |
| 348 | 348 | ||
| 349 | /* KVM doesn't implement this MSR */ | 349 | /* KVM doesn't implement this MSR */ |
| 350 | if (wrmsr_safe(perfctr_msr, 0, 0) < 0) | 350 | if (wrmsr_safe(perfctr_msr, 0, 0) < 0) |
| @@ -569,8 +569,8 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz) | |||
| 569 | (ebx & ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT)) | 569 | (ebx & ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT)) |
| 570 | return 0; | 570 | return 0; |
| 571 | 571 | ||
| 572 | perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1; | 572 | perfctr_msr = wd_ops->perfctr; |
| 573 | evntsel_msr = MSR_ARCH_PERFMON_EVENTSEL1; | 573 | evntsel_msr = wd_ops->evntsel; |
| 574 | 574 | ||
| 575 | wrmsrl(perfctr_msr, 0UL); | 575 | wrmsrl(perfctr_msr, 0UL); |
| 576 | 576 | ||
| @@ -605,6 +605,16 @@ static struct wd_ops intel_arch_wd_ops = { | |||
| 605 | .evntsel = MSR_ARCH_PERFMON_EVENTSEL1, | 605 | .evntsel = MSR_ARCH_PERFMON_EVENTSEL1, |
| 606 | }; | 606 | }; |
| 607 | 607 | ||
| 608 | static struct wd_ops coreduo_wd_ops = { | ||
| 609 | .reserve = single_msr_reserve, | ||
| 610 | .unreserve = single_msr_unreserve, | ||
| 611 | .setup = setup_intel_arch_watchdog, | ||
| 612 | .rearm = p6_rearm, | ||
| 613 | .stop = single_msr_stop_watchdog, | ||
| 614 | .perfctr = MSR_ARCH_PERFMON_PERFCTR0, | ||
| 615 | .evntsel = MSR_ARCH_PERFMON_EVENTSEL0, | ||
| 616 | }; | ||
| 617 | |||
| 608 | static void probe_nmi_watchdog(void) | 618 | static void probe_nmi_watchdog(void) |
| 609 | { | 619 | { |
| 610 | switch (boot_cpu_data.x86_vendor) { | 620 | switch (boot_cpu_data.x86_vendor) { |
| @@ -615,6 +625,12 @@ static void probe_nmi_watchdog(void) | |||
| 615 | wd_ops = &k7_wd_ops; | 625 | wd_ops = &k7_wd_ops; |
| 616 | break; | 626 | break; |
| 617 | case X86_VENDOR_INTEL: | 627 | case X86_VENDOR_INTEL: |
| 628 | /* Work around Core Duo (Yonah) errata AE49 where perfctr1 | ||
| 629 | doesn't have a working enable bit. */ | ||
| 630 | if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 14) { | ||
| 631 | wd_ops = &coreduo_wd_ops; | ||
| 632 | break; | ||
| 633 | } | ||
| 618 | if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) { | 634 | if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) { |
| 619 | wd_ops = &intel_arch_wd_ops; | 635 | wd_ops = &intel_arch_wd_ops; |
| 620 | break; | 636 | break; |
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index 8c1c965eb2a8..c7227e2180f8 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
| @@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void) | |||
| 115 | atomic_dec(&nmi_active); | 115 | atomic_dec(&nmi_active); |
| 116 | } | 116 | } |
| 117 | } | 117 | } |
| 118 | endflag = 1; | ||
| 118 | if (!atomic_read(&nmi_active)) { | 119 | if (!atomic_read(&nmi_active)) { |
| 119 | kfree(prev_nmi_count); | 120 | kfree(prev_nmi_count); |
| 120 | atomic_set(&nmi_active, -1); | 121 | atomic_set(&nmi_active, -1); |
| 121 | return -1; | 122 | return -1; |
| 122 | } | 123 | } |
| 123 | endflag = 1; | ||
| 124 | printk("OK.\n"); | 124 | printk("OK.\n"); |
| 125 | 125 | ||
| 126 | /* now that we know it works we can reduce NMI frequency to | 126 | /* now that we know it works we can reduce NMI frequency to |
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index 0c8f00e69c4d..7c1b92522e95 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c | |||
| @@ -274,7 +274,6 @@ static void clear_singlestep(struct task_struct *child) | |||
| 274 | void ptrace_disable(struct task_struct *child) | 274 | void ptrace_disable(struct task_struct *child) |
| 275 | { | 275 | { |
| 276 | clear_singlestep(child); | 276 | clear_singlestep(child); |
| 277 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
| 278 | clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); | 277 | clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); |
| 279 | } | 278 | } |
| 280 | 279 | ||
diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile index 77fbc9f64fbc..6914485c0d85 100644 --- a/arch/i386/mach-generic/Makefile +++ b/arch/i386/mach-generic/Makefile | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | # Makefile for the generic architecture | 2 | # Makefile for the generic architecture |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | EXTRA_CFLAGS += -I../kernel | 5 | EXTRA_CFLAGS := -Iarch/i386/kernel |
| 6 | 6 | ||
| 7 | obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/ | 7 | obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/ |
diff --git a/arch/i386/mach-voyager/Makefile b/arch/i386/mach-voyager/Makefile index f24d29651318..33b74cf0dd22 100644 --- a/arch/i386/mach-voyager/Makefile +++ b/arch/i386/mach-voyager/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | EXTRA_CFLAGS += -I../kernel | 5 | EXTRA_CFLAGS := -Iarch/i386/kernel |
| 6 | obj-y := setup.o voyager_basic.o voyager_thread.o | 6 | obj-y := setup.o voyager_basic.o voyager_thread.o |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o | 8 | obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o |
diff --git a/arch/i386/mm/highmem.c b/arch/i386/mm/highmem.c index ad8d86cc683e..1c3bf95f7356 100644 --- a/arch/i386/mm/highmem.c +++ b/arch/i386/mm/highmem.c | |||
| @@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) | |||
| 34 | /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ | 34 | /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ |
| 35 | pagefault_disable(); | 35 | pagefault_disable(); |
| 36 | 36 | ||
| 37 | idx = type + KM_TYPE_NR*smp_processor_id(); | ||
| 38 | BUG_ON(!pte_none(*(kmap_pte-idx))); | ||
| 39 | |||
| 40 | if (!PageHighMem(page)) | 37 | if (!PageHighMem(page)) |
| 41 | return page_address(page); | 38 | return page_address(page); |
| 42 | 39 | ||
| 40 | idx = type + KM_TYPE_NR*smp_processor_id(); | ||
| 43 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); | 41 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
| 42 | BUG_ON(!pte_none(*(kmap_pte-idx))); | ||
| 44 | set_pte(kmap_pte-idx, mk_pte(page, prot)); | 43 | set_pte(kmap_pte-idx, mk_pte(page, prot)); |
| 45 | arch_flush_lazy_mmu_mode(); | 44 | arch_flush_lazy_mmu_mode(); |
| 46 | 45 | ||
| 47 | return (void*) vaddr; | 46 | return (void *)vaddr; |
| 48 | } | 47 | } |
| 49 | 48 | ||
| 50 | void *kmap_atomic(struct page *page, enum km_type type) | 49 | void *kmap_atomic(struct page *page, enum km_type type) |
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 665db063a40a..8434f2323b87 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -550,6 +550,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 550 | case PCI_DEVICE_ID_INTEL_ICH9_3: | 550 | case PCI_DEVICE_ID_INTEL_ICH9_3: |
| 551 | case PCI_DEVICE_ID_INTEL_ICH9_4: | 551 | case PCI_DEVICE_ID_INTEL_ICH9_4: |
| 552 | case PCI_DEVICE_ID_INTEL_ICH9_5: | 552 | case PCI_DEVICE_ID_INTEL_ICH9_5: |
| 553 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: | ||
| 553 | r->name = "PIIX/ICH"; | 554 | r->name = "PIIX/ICH"; |
| 554 | r->get = pirq_piix_get; | 555 | r->get = pirq_piix_get; |
| 555 | r->set = pirq_piix_set; | 556 | r->set = pirq_piix_set; |
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c index 5f5193401bea..10ac8c316c46 100644 --- a/arch/i386/pci/pcbios.c +++ b/arch/i386/pci/pcbios.c | |||
| @@ -412,7 +412,7 @@ struct irq_routing_options { | |||
| 412 | u16 segment; | 412 | u16 segment; |
| 413 | } __attribute__((packed)); | 413 | } __attribute__((packed)); |
| 414 | 414 | ||
| 415 | struct irq_routing_table * __devinit pcibios_get_irq_routing_table(void) | 415 | struct irq_routing_table * pcibios_get_irq_routing_table(void) |
| 416 | { | 416 | { |
| 417 | struct irq_routing_options opt; | 417 | struct irq_routing_options opt; |
| 418 | struct irq_routing_table *rt = NULL; | 418 | struct irq_routing_table *rt = NULL; |
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 122444a97897..2e96f17b2f3b 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
| @@ -1577,7 +1577,6 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data) | |||
| 1577 | 1577 | ||
| 1578 | case PTRACE_DETACH: | 1578 | case PTRACE_DETACH: |
| 1579 | /* detach a process that was attached. */ | 1579 | /* detach a process that was attached. */ |
| 1580 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
| 1581 | ret = ptrace_detach(child, data); | 1580 | ret = ptrace_detach(child, data); |
| 1582 | goto out_tsk; | 1581 | goto out_tsk; |
| 1583 | 1582 | ||
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 8ccf3e47bff8..bd5fe76401f1 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
| @@ -57,9 +57,13 @@ config PLAT_MAPPI | |||
| 57 | 57 | ||
| 58 | config PLAT_USRV | 58 | config PLAT_USRV |
| 59 | bool "uServer" | 59 | bool "uServer" |
| 60 | select PLAT_HAS_INT1ICU | ||
| 60 | 61 | ||
| 61 | config PLAT_M32700UT | 62 | config PLAT_M32700UT |
| 62 | bool "M32700UT" | 63 | bool "M32700UT" |
| 64 | select PLAT_HAS_INT0ICU | ||
| 65 | select PLAT_HAS_INT1ICU | ||
| 66 | select PLAT_HAS_INT2ICU | ||
| 63 | help | 67 | help |
| 64 | The M3T-M32700UT is an evaluation board based on uT-Engine | 68 | The M3T-M32700UT is an evaluation board based on uT-Engine |
| 65 | specification. This board has an M32700 (Chaos) evaluation chip. | 69 | specification. This board has an M32700 (Chaos) evaluation chip. |
| @@ -68,6 +72,9 @@ config PLAT_M32700UT | |||
| 68 | 72 | ||
| 69 | config PLAT_OPSPUT | 73 | config PLAT_OPSPUT |
| 70 | bool "OPSPUT" | 74 | bool "OPSPUT" |
| 75 | select PLAT_HAS_INT0ICU | ||
| 76 | select PLAT_HAS_INT1ICU | ||
| 77 | select PLAT_HAS_INT2ICU | ||
| 71 | help | 78 | help |
| 72 | The OPSPUT is an evaluation board based on uT-Engine | 79 | The OPSPUT is an evaluation board based on uT-Engine |
| 73 | specification. This board has a OPSP-REP chip. | 80 | specification. This board has a OPSP-REP chip. |
| @@ -89,6 +96,7 @@ config PLAT_MAPPI3 | |||
| 89 | 96 | ||
| 90 | config PLAT_M32104UT | 97 | config PLAT_M32104UT |
| 91 | bool "M32104UT" | 98 | bool "M32104UT" |
| 99 | select PLAT_HAS_INT1ICU | ||
| 92 | help | 100 | help |
| 93 | The M3T-M32104UT is an reference board based on uT-Engine | 101 | The M3T-M32104UT is an reference board based on uT-Engine |
| 94 | specification. This board has a M32104 chip. | 102 | specification. This board has a M32104 chip. |
| @@ -149,6 +157,18 @@ config ISA_DUAL_ISSUE | |||
| 149 | depends on CHIP_M32700 || CHIP_OPSP | 157 | depends on CHIP_M32700 || CHIP_OPSP |
| 150 | default y | 158 | default y |
| 151 | 159 | ||
| 160 | config PLAT_HAS_INT0ICU | ||
| 161 | bool | ||
| 162 | default n | ||
| 163 | |||
| 164 | config PLAT_HAS_INT1ICU | ||
| 165 | bool | ||
| 166 | default n | ||
| 167 | |||
| 168 | config PLAT_HAS_INT2ICU | ||
| 169 | bool | ||
| 170 | default n | ||
| 171 | |||
| 152 | config BUS_CLOCK | 172 | config BUS_CLOCK |
| 153 | int "Bus Clock [Hz] (integer)" | 173 | int "Bus Clock [Hz] (integer)" |
| 154 | default "70000000" if PLAT_MAPPI | 174 | default "70000000" if PLAT_MAPPI |
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile index cdf63b210c53..60e12f312654 100644 --- a/arch/m32r/Makefile +++ b/arch/m32r/Makefile | |||
| @@ -36,7 +36,8 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) | |||
| 36 | libs-y += arch/m32r/lib/ $(LIBGCC) | 36 | libs-y += arch/m32r/lib/ $(LIBGCC) |
| 37 | core-y += arch/m32r/kernel/ \ | 37 | core-y += arch/m32r/kernel/ \ |
| 38 | arch/m32r/mm/ \ | 38 | arch/m32r/mm/ \ |
| 39 | arch/m32r/boot/ | 39 | arch/m32r/boot/ \ |
| 40 | arch/m32r/platforms/ | ||
| 40 | 41 | ||
| 41 | drivers-$(CONFIG_OPROFILE) += arch/m32r/oprofile/ | 42 | drivers-$(CONFIG_OPROFILE) += arch/m32r/oprofile/ |
| 42 | 43 | ||
diff --git a/arch/m32r/m32104ut/defconfig.m32104ut b/arch/m32r/configs/m32104ut_defconfig index 1f88f493a9e2..9b5af6cd2e0b 100644 --- a/arch/m32r/m32104ut/defconfig.m32104ut +++ b/arch/m32r/configs/m32104ut_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 17:22:20 2006 | 4 | # Wed Aug 1 17:22:35 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -23,17 +26,18 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
| 23 | CONFIG_LOCALVERSION="" | 26 | CONFIG_LOCALVERSION="" |
| 24 | CONFIG_LOCALVERSION_AUTO=y | 27 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | CONFIG_SYSVIPC=y | 28 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_IPC_NS is not set | 29 | CONFIG_SYSVIPC_SYSCTL=y |
| 27 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | # CONFIG_BSD_PROCESS_ACCT is not set | 31 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 29 | # CONFIG_TASKSTATS is not set | 32 | # CONFIG_TASKSTATS is not set |
| 30 | # CONFIG_UTS_NS is not set | 33 | # CONFIG_USER_NS is not set |
| 31 | # CONFIG_AUDIT is not set | 34 | # CONFIG_AUDIT is not set |
| 32 | CONFIG_IKCONFIG=y | 35 | CONFIG_IKCONFIG=y |
| 33 | CONFIG_IKCONFIG_PROC=y | 36 | CONFIG_IKCONFIG_PROC=y |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 34 | CONFIG_SYSFS_DEPRECATED=y | 38 | CONFIG_SYSFS_DEPRECATED=y |
| 35 | # CONFIG_RELAY is not set | 39 | # CONFIG_RELAY is not set |
| 36 | CONFIG_INITRAMFS_SOURCE="" | 40 | # CONFIG_BLK_DEV_INITRD is not set |
| 37 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 41 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 38 | CONFIG_SYSCTL=y | 42 | CONFIG_SYSCTL=y |
| 39 | # CONFIG_EMBEDDED is not set | 43 | # CONFIG_EMBEDDED is not set |
| @@ -46,29 +50,29 @@ CONFIG_BUG=y | |||
| 46 | CONFIG_ELF_CORE=y | 50 | CONFIG_ELF_CORE=y |
| 47 | CONFIG_BASE_FULL=y | 51 | CONFIG_BASE_FULL=y |
| 48 | CONFIG_FUTEX=y | 52 | CONFIG_FUTEX=y |
| 53 | CONFIG_ANON_INODES=y | ||
| 49 | CONFIG_EPOLL=y | 54 | CONFIG_EPOLL=y |
| 50 | CONFIG_SLAB=y | 55 | CONFIG_SIGNALFD=y |
| 56 | CONFIG_TIMERFD=y | ||
| 57 | CONFIG_EVENTFD=y | ||
| 51 | CONFIG_VM_EVENT_COUNTERS=y | 58 | CONFIG_VM_EVENT_COUNTERS=y |
| 59 | CONFIG_SLAB=y | ||
| 60 | # CONFIG_SLUB is not set | ||
| 61 | # CONFIG_SLOB is not set | ||
| 52 | CONFIG_RT_MUTEXES=y | 62 | CONFIG_RT_MUTEXES=y |
| 53 | CONFIG_TINY_SHMEM=y | 63 | CONFIG_TINY_SHMEM=y |
| 54 | CONFIG_BASE_SMALL=0 | 64 | CONFIG_BASE_SMALL=0 |
| 55 | # CONFIG_SLOB is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # Loadable module support | ||
| 59 | # | ||
| 60 | CONFIG_MODULES=y | 65 | CONFIG_MODULES=y |
| 61 | CONFIG_MODULE_UNLOAD=y | 66 | CONFIG_MODULE_UNLOAD=y |
| 62 | CONFIG_MODULE_FORCE_UNLOAD=y | 67 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 63 | # CONFIG_MODVERSIONS is not set | 68 | # CONFIG_MODVERSIONS is not set |
| 64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 69 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 65 | CONFIG_KMOD=y | 70 | CONFIG_KMOD=y |
| 66 | |||
| 67 | # | ||
| 68 | # Block layer | ||
| 69 | # | ||
| 70 | CONFIG_BLOCK=y | 71 | CONFIG_BLOCK=y |
| 72 | # CONFIG_LBD is not set | ||
| 71 | # CONFIG_BLK_DEV_IO_TRACE is not set | 73 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 74 | # CONFIG_LSF is not set | ||
| 75 | # CONFIG_BLK_DEV_BSG is not set | ||
| 72 | 76 | ||
| 73 | # | 77 | # |
| 74 | # IO Schedulers | 78 | # IO Schedulers |
| @@ -117,13 +121,18 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 117 | # CONFIG_SPARSEMEM_STATIC is not set | 121 | # CONFIG_SPARSEMEM_STATIC is not set |
| 118 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 122 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 119 | # CONFIG_RESOURCES_64BIT is not set | 123 | # CONFIG_RESOURCES_64BIT is not set |
| 124 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 125 | CONFIG_VIRT_TO_BUS=y | ||
| 120 | CONFIG_IRAM_START=0x00700000 | 126 | CONFIG_IRAM_START=0x00700000 |
| 121 | CONFIG_IRAM_SIZE=0x00010000 | 127 | CONFIG_IRAM_SIZE=0x00010000 |
| 122 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 128 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 123 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 129 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 130 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 131 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 124 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 132 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 125 | CONFIG_GENERIC_HWEIGHT=y | 133 | CONFIG_GENERIC_HWEIGHT=y |
| 126 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 134 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 135 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 127 | CONFIG_PREEMPT=y | 136 | CONFIG_PREEMPT=y |
| 128 | # CONFIG_SMP is not set | 137 | # CONFIG_SMP is not set |
| 129 | CONFIG_NODES_SHIFT=1 | 138 | CONFIG_NODES_SHIFT=1 |
| @@ -131,6 +140,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 131 | # | 140 | # |
| 132 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 141 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 133 | # | 142 | # |
| 143 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 134 | CONFIG_ISA=y | 144 | CONFIG_ISA=y |
| 135 | 145 | ||
| 136 | # | 146 | # |
| @@ -139,10 +149,6 @@ CONFIG_ISA=y | |||
| 139 | # CONFIG_PCCARD is not set | 149 | # CONFIG_PCCARD is not set |
| 140 | 150 | ||
| 141 | # | 151 | # |
| 142 | # PCI Hotplug Support | ||
| 143 | # | ||
| 144 | |||
| 145 | # | ||
| 146 | # Executable file formats | 152 | # Executable file formats |
| 147 | # | 153 | # |
| 148 | # CONFIG_BINFMT_FLAT is not set | 154 | # CONFIG_BINFMT_FLAT is not set |
| @@ -156,13 +162,13 @@ CONFIG_NET=y | |||
| 156 | # | 162 | # |
| 157 | # Networking options | 163 | # Networking options |
| 158 | # | 164 | # |
| 159 | # CONFIG_NETDEBUG is not set | ||
| 160 | CONFIG_PACKET=y | 165 | CONFIG_PACKET=y |
| 161 | # CONFIG_PACKET_MMAP is not set | 166 | # CONFIG_PACKET_MMAP is not set |
| 162 | CONFIG_UNIX=y | 167 | CONFIG_UNIX=y |
| 163 | CONFIG_XFRM=y | 168 | CONFIG_XFRM=y |
| 164 | # CONFIG_XFRM_USER is not set | 169 | # CONFIG_XFRM_USER is not set |
| 165 | # CONFIG_XFRM_SUB_POLICY is not set | 170 | # CONFIG_XFRM_SUB_POLICY is not set |
| 171 | # CONFIG_XFRM_MIGRATE is not set | ||
| 166 | # CONFIG_NET_KEY is not set | 172 | # CONFIG_NET_KEY is not set |
| 167 | CONFIG_INET=y | 173 | CONFIG_INET=y |
| 168 | # CONFIG_IP_MULTICAST is not set | 174 | # CONFIG_IP_MULTICAST is not set |
| @@ -187,10 +193,6 @@ CONFIG_INET_TCP_DIAG=y | |||
| 187 | CONFIG_TCP_CONG_CUBIC=y | 193 | CONFIG_TCP_CONG_CUBIC=y |
| 188 | CONFIG_DEFAULT_TCP_CONG="cubic" | 194 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 189 | # CONFIG_TCP_MD5SIG is not set | 195 | # CONFIG_TCP_MD5SIG is not set |
| 190 | |||
| 191 | # | ||
| 192 | # IP: Virtual Server Configuration | ||
| 193 | # | ||
| 194 | # CONFIG_IP_VS is not set | 196 | # CONFIG_IP_VS is not set |
| 195 | # CONFIG_IPV6 is not set | 197 | # CONFIG_IPV6 is not set |
| 196 | # CONFIG_INET6_XFRM_TUNNEL is not set | 198 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| @@ -206,12 +208,15 @@ CONFIG_NETFILTER_NETLINK=m | |||
| 206 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 208 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 207 | CONFIG_NETFILTER_NETLINK_LOG=m | 209 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 208 | # CONFIG_NF_CONNTRACK_ENABLED is not set | 210 | # CONFIG_NF_CONNTRACK_ENABLED is not set |
| 211 | # CONFIG_NF_CONNTRACK is not set | ||
| 209 | CONFIG_NETFILTER_XTABLES=m | 212 | CONFIG_NETFILTER_XTABLES=m |
| 210 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 213 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 211 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 214 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 212 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 215 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 213 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 216 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 214 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 217 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 218 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
| 219 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | ||
| 215 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 220 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 216 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 221 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 217 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 222 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| @@ -229,6 +234,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m | |||
| 229 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 234 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 230 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 235 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 231 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 236 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 237 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
| 232 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 238 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set |
| 233 | 239 | ||
| 234 | # | 240 | # |
| @@ -248,7 +254,6 @@ CONFIG_IP_NF_FILTER=m | |||
| 248 | CONFIG_IP_NF_TARGET_REJECT=m | 254 | CONFIG_IP_NF_TARGET_REJECT=m |
| 249 | CONFIG_IP_NF_TARGET_LOG=m | 255 | CONFIG_IP_NF_TARGET_LOG=m |
| 250 | CONFIG_IP_NF_TARGET_ULOG=m | 256 | CONFIG_IP_NF_TARGET_ULOG=m |
| 251 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
| 252 | CONFIG_IP_NF_MANGLE=m | 257 | CONFIG_IP_NF_MANGLE=m |
| 253 | CONFIG_IP_NF_TARGET_TOS=m | 258 | CONFIG_IP_NF_TARGET_TOS=m |
| 254 | CONFIG_IP_NF_TARGET_ECN=m | 259 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -257,20 +262,8 @@ CONFIG_IP_NF_RAW=m | |||
| 257 | CONFIG_IP_NF_ARPTABLES=m | 262 | CONFIG_IP_NF_ARPTABLES=m |
| 258 | CONFIG_IP_NF_ARPFILTER=m | 263 | CONFIG_IP_NF_ARPFILTER=m |
| 259 | CONFIG_IP_NF_ARP_MANGLE=m | 264 | CONFIG_IP_NF_ARP_MANGLE=m |
| 260 | |||
| 261 | # | ||
| 262 | # DCCP Configuration (EXPERIMENTAL) | ||
| 263 | # | ||
| 264 | # CONFIG_IP_DCCP is not set | 265 | # CONFIG_IP_DCCP is not set |
| 265 | |||
| 266 | # | ||
| 267 | # SCTP Configuration (EXPERIMENTAL) | ||
| 268 | # | ||
| 269 | # CONFIG_IP_SCTP is not set | 266 | # CONFIG_IP_SCTP is not set |
| 270 | |||
| 271 | # | ||
| 272 | # TIPC Configuration (EXPERIMENTAL) | ||
| 273 | # | ||
| 274 | # CONFIG_TIPC is not set | 267 | # CONFIG_TIPC is not set |
| 275 | # CONFIG_ATM is not set | 268 | # CONFIG_ATM is not set |
| 276 | # CONFIG_BRIDGE is not set | 269 | # CONFIG_BRIDGE is not set |
| @@ -297,7 +290,17 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 297 | # CONFIG_HAMRADIO is not set | 290 | # CONFIG_HAMRADIO is not set |
| 298 | # CONFIG_IRDA is not set | 291 | # CONFIG_IRDA is not set |
| 299 | # CONFIG_BT is not set | 292 | # CONFIG_BT is not set |
| 293 | # CONFIG_AF_RXRPC is not set | ||
| 294 | |||
| 295 | # | ||
| 296 | # Wireless | ||
| 297 | # | ||
| 298 | # CONFIG_CFG80211 is not set | ||
| 299 | # CONFIG_WIRELESS_EXT is not set | ||
| 300 | # CONFIG_MAC80211 is not set | ||
| 300 | # CONFIG_IEEE80211 is not set | 301 | # CONFIG_IEEE80211 is not set |
| 302 | # CONFIG_RFKILL is not set | ||
| 303 | # CONFIG_NET_9P is not set | ||
| 301 | 304 | ||
| 302 | # | 305 | # |
| 303 | # Device Drivers | 306 | # Device Drivers |
| @@ -310,28 +313,12 @@ CONFIG_STANDALONE=y | |||
| 310 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 313 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 311 | # CONFIG_FW_LOADER is not set | 314 | # CONFIG_FW_LOADER is not set |
| 312 | # CONFIG_SYS_HYPERVISOR is not set | 315 | # CONFIG_SYS_HYPERVISOR is not set |
| 313 | |||
| 314 | # | ||
| 315 | # Connector - unified userspace <-> kernelspace linker | ||
| 316 | # | ||
| 317 | # CONFIG_CONNECTOR is not set | 316 | # CONFIG_CONNECTOR is not set |
| 318 | |||
| 319 | # | ||
| 320 | # Memory Technology Devices (MTD) | ||
| 321 | # | ||
| 322 | # CONFIG_MTD is not set | 317 | # CONFIG_MTD is not set |
| 323 | |||
| 324 | # | ||
| 325 | # Parallel port support | ||
| 326 | # | ||
| 327 | CONFIG_PARPORT=m | 318 | CONFIG_PARPORT=m |
| 328 | # CONFIG_PARPORT_GSC is not set | 319 | # CONFIG_PARPORT_GSC is not set |
| 329 | # CONFIG_PARPORT_AX88796 is not set | 320 | # CONFIG_PARPORT_AX88796 is not set |
| 330 | CONFIG_PARPORT_1284=y | 321 | CONFIG_PARPORT_1284=y |
| 331 | |||
| 332 | # | ||
| 333 | # Plug and Play support | ||
| 334 | # | ||
| 335 | CONFIG_PNP=y | 322 | CONFIG_PNP=y |
| 336 | # CONFIG_PNP_DEBUG is not set | 323 | # CONFIG_PNP_DEBUG is not set |
| 337 | 324 | ||
| @@ -339,29 +326,19 @@ CONFIG_PNP=y | |||
| 339 | # Protocols | 326 | # Protocols |
| 340 | # | 327 | # |
| 341 | CONFIG_ISAPNP=y | 328 | CONFIG_ISAPNP=y |
| 342 | 329 | # CONFIG_PNPACPI is not set | |
| 343 | # | 330 | CONFIG_BLK_DEV=y |
| 344 | # Block devices | ||
| 345 | # | ||
| 346 | # CONFIG_BLK_DEV_COW_COMMON is not set | 331 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 347 | CONFIG_BLK_DEV_LOOP=y | 332 | CONFIG_BLK_DEV_LOOP=y |
| 348 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 333 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 349 | CONFIG_BLK_DEV_NBD=m | 334 | CONFIG_BLK_DEV_NBD=m |
| 350 | # CONFIG_BLK_DEV_RAM is not set | 335 | # CONFIG_BLK_DEV_RAM is not set |
| 351 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 352 | CONFIG_CDROM_PKTCDVD=m | 336 | CONFIG_CDROM_PKTCDVD=m |
| 353 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 337 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 354 | CONFIG_CDROM_PKTCDVD_WCACHE=y | 338 | CONFIG_CDROM_PKTCDVD_WCACHE=y |
| 355 | # CONFIG_ATA_OVER_ETH is not set | 339 | # CONFIG_ATA_OVER_ETH is not set |
| 356 | 340 | CONFIG_MISC_DEVICES=y | |
| 357 | # | 341 | # CONFIG_EEPROM_93CX6 is not set |
| 358 | # Misc devices | ||
| 359 | # | ||
| 360 | # CONFIG_TIFM_CORE is not set | ||
| 361 | |||
| 362 | # | ||
| 363 | # ATA/ATAPI/MFM/RLL support | ||
| 364 | # | ||
| 365 | CONFIG_IDE=y | 342 | CONFIG_IDE=y |
| 366 | CONFIG_BLK_DEV_IDE=y | 343 | CONFIG_BLK_DEV_IDE=y |
| 367 | 344 | ||
| @@ -376,16 +353,17 @@ CONFIG_BLK_DEV_IDECD=y | |||
| 376 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 353 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 377 | # CONFIG_BLK_DEV_IDESCSI is not set | 354 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 378 | # CONFIG_IDE_TASK_IOCTL is not set | 355 | # CONFIG_IDE_TASK_IOCTL is not set |
| 356 | CONFIG_IDE_PROC_FS=y | ||
| 379 | 357 | ||
| 380 | # | 358 | # |
| 381 | # IDE chipset support/bugfixes | 359 | # IDE chipset support/bugfixes |
| 382 | # | 360 | # |
| 383 | CONFIG_IDE_GENERIC=y | 361 | CONFIG_IDE_GENERIC=y |
| 384 | # CONFIG_BLK_DEV_IDEPNP is not set | 362 | # CONFIG_BLK_DEV_IDEPNP is not set |
| 363 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 385 | # CONFIG_IDE_ARM is not set | 364 | # CONFIG_IDE_ARM is not set |
| 386 | # CONFIG_IDE_CHIPSETS is not set | 365 | # CONFIG_IDE_CHIPSETS is not set |
| 387 | # CONFIG_BLK_DEV_IDEDMA is not set | 366 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 388 | # CONFIG_IDEDMA_AUTO is not set | ||
| 389 | # CONFIG_BLK_DEV_HD is not set | 367 | # CONFIG_BLK_DEV_HD is not set |
| 390 | 368 | ||
| 391 | # | 369 | # |
| @@ -393,6 +371,8 @@ CONFIG_IDE_GENERIC=y | |||
| 393 | # | 371 | # |
| 394 | # CONFIG_RAID_ATTRS is not set | 372 | # CONFIG_RAID_ATTRS is not set |
| 395 | CONFIG_SCSI=y | 373 | CONFIG_SCSI=y |
| 374 | # CONFIG_SCSI_DMA is not set | ||
| 375 | # CONFIG_SCSI_TGT is not set | ||
| 396 | # CONFIG_SCSI_NETLINK is not set | 376 | # CONFIG_SCSI_NETLINK is not set |
| 397 | CONFIG_SCSI_PROC_FS=y | 377 | CONFIG_SCSI_PROC_FS=y |
| 398 | 378 | ||
| @@ -413,6 +393,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 413 | CONFIG_SCSI_MULTI_LUN=y | 393 | CONFIG_SCSI_MULTI_LUN=y |
| 414 | CONFIG_SCSI_CONSTANTS=y | 394 | CONFIG_SCSI_CONSTANTS=y |
| 415 | # CONFIG_SCSI_LOGGING is not set | 395 | # CONFIG_SCSI_LOGGING is not set |
| 396 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 397 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 416 | 398 | ||
| 417 | # | 399 | # |
| 418 | # SCSI Transports | 400 | # SCSI Transports |
| @@ -420,12 +402,8 @@ CONFIG_SCSI_CONSTANTS=y | |||
| 420 | CONFIG_SCSI_SPI_ATTRS=y | 402 | CONFIG_SCSI_SPI_ATTRS=y |
| 421 | # CONFIG_SCSI_FC_ATTRS is not set | 403 | # CONFIG_SCSI_FC_ATTRS is not set |
| 422 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 404 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 423 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 424 | # CONFIG_SCSI_SAS_LIBSAS is not set | 405 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 425 | 406 | CONFIG_SCSI_LOWLEVEL=y | |
| 426 | # | ||
| 427 | # SCSI low-level drivers | ||
| 428 | # | ||
| 429 | # CONFIG_ISCSI_TCP is not set | 407 | # CONFIG_ISCSI_TCP is not set |
| 430 | # CONFIG_SCSI_AHA152X is not set | 408 | # CONFIG_SCSI_AHA152X is not set |
| 431 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 409 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| @@ -441,19 +419,6 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 441 | # CONFIG_SCSI_SYM53C416 is not set | 419 | # CONFIG_SCSI_SYM53C416 is not set |
| 442 | # CONFIG_SCSI_T128 is not set | 420 | # CONFIG_SCSI_T128 is not set |
| 443 | # CONFIG_SCSI_DEBUG is not set | 421 | # CONFIG_SCSI_DEBUG is not set |
| 444 | |||
| 445 | # | ||
| 446 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 447 | # | ||
| 448 | |||
| 449 | # | ||
| 450 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
| 451 | # | ||
| 452 | # CONFIG_CD_NO_IDESCSI is not set | ||
| 453 | |||
| 454 | # | ||
| 455 | # Multi-device support (RAID and LVM) | ||
| 456 | # | ||
| 457 | CONFIG_MD=y | 422 | CONFIG_MD=y |
| 458 | CONFIG_BLK_DEV_MD=y | 423 | CONFIG_BLK_DEV_MD=y |
| 459 | # CONFIG_MD_LINEAR is not set | 424 | # CONFIG_MD_LINEAR is not set |
| @@ -470,43 +435,17 @@ CONFIG_DM_SNAPSHOT=m | |||
| 470 | # CONFIG_DM_MIRROR is not set | 435 | # CONFIG_DM_MIRROR is not set |
| 471 | # CONFIG_DM_ZERO is not set | 436 | # CONFIG_DM_ZERO is not set |
| 472 | # CONFIG_DM_MULTIPATH is not set | 437 | # CONFIG_DM_MULTIPATH is not set |
| 473 | 438 | # CONFIG_DM_DELAY is not set | |
| 474 | # | ||
| 475 | # Fusion MPT device support | ||
| 476 | # | ||
| 477 | # CONFIG_FUSION is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # IEEE 1394 (FireWire) support | ||
| 481 | # | ||
| 482 | |||
| 483 | # | ||
| 484 | # I2O device support | ||
| 485 | # | ||
| 486 | |||
| 487 | # | ||
| 488 | # Network device support | ||
| 489 | # | ||
| 490 | CONFIG_NETDEVICES=y | 439 | CONFIG_NETDEVICES=y |
| 440 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 491 | CONFIG_DUMMY=m | 441 | CONFIG_DUMMY=m |
| 492 | # CONFIG_BONDING is not set | 442 | # CONFIG_BONDING is not set |
| 443 | # CONFIG_MACVLAN is not set | ||
| 493 | # CONFIG_EQUALIZER is not set | 444 | # CONFIG_EQUALIZER is not set |
| 494 | # CONFIG_TUN is not set | 445 | # CONFIG_TUN is not set |
| 495 | # CONFIG_NET_SB1000 is not set | 446 | # CONFIG_NET_SB1000 is not set |
| 496 | |||
| 497 | # | ||
| 498 | # ARCnet devices | ||
| 499 | # | ||
| 500 | # CONFIG_ARCNET is not set | 447 | # CONFIG_ARCNET is not set |
| 501 | |||
| 502 | # | ||
| 503 | # PHY device support | ||
| 504 | # | ||
| 505 | # CONFIG_PHYLIB is not set | 448 | # CONFIG_PHYLIB is not set |
| 506 | |||
| 507 | # | ||
| 508 | # Ethernet (10 or 100Mbit) | ||
| 509 | # | ||
| 510 | CONFIG_NET_ETHERNET=y | 449 | CONFIG_NET_ETHERNET=y |
| 511 | CONFIG_MII=y | 450 | CONFIG_MII=y |
| 512 | CONFIG_NET_VENDOR_3COM=y | 451 | CONFIG_NET_VENDOR_3COM=y |
| @@ -536,28 +475,15 @@ CONFIG_NET_PCI=y | |||
| 536 | # CONFIG_APRICOT is not set | 475 | # CONFIG_APRICOT is not set |
| 537 | # CONFIG_CS89x0 is not set | 476 | # CONFIG_CS89x0 is not set |
| 538 | # CONFIG_NET_POCKET is not set | 477 | # CONFIG_NET_POCKET is not set |
| 539 | 478 | CONFIG_NETDEV_1000=y | |
| 540 | # | 479 | CONFIG_NETDEV_10000=y |
| 541 | # Ethernet (1000 Mbit) | ||
| 542 | # | ||
| 543 | |||
| 544 | # | ||
| 545 | # Ethernet (10000 Mbit) | ||
| 546 | # | ||
| 547 | |||
| 548 | # | ||
| 549 | # Token Ring devices | ||
| 550 | # | ||
| 551 | # CONFIG_TR is not set | 480 | # CONFIG_TR is not set |
| 552 | 481 | ||
| 553 | # | 482 | # |
| 554 | # Wireless LAN (non-hamradio) | 483 | # Wireless LAN |
| 555 | # | ||
| 556 | # CONFIG_NET_RADIO is not set | ||
| 557 | |||
| 558 | # | ||
| 559 | # Wan interfaces | ||
| 560 | # | 484 | # |
| 485 | # CONFIG_WLAN_PRE80211 is not set | ||
| 486 | # CONFIG_WLAN_80211 is not set | ||
| 561 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 562 | # CONFIG_PLIP is not set | 488 | # CONFIG_PLIP is not set |
| 563 | # CONFIG_PPP is not set | 489 | # CONFIG_PPP is not set |
| @@ -566,15 +492,7 @@ CONFIG_NET_PCI=y | |||
| 566 | # CONFIG_NETCONSOLE is not set | 492 | # CONFIG_NETCONSOLE is not set |
| 567 | # CONFIG_NETPOLL is not set | 493 | # CONFIG_NETPOLL is not set |
| 568 | # CONFIG_NET_POLL_CONTROLLER is not set | 494 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 569 | |||
| 570 | # | ||
| 571 | # ISDN subsystem | ||
| 572 | # | ||
| 573 | # CONFIG_ISDN is not set | 495 | # CONFIG_ISDN is not set |
| 574 | |||
| 575 | # | ||
| 576 | # Telephony Support | ||
| 577 | # | ||
| 578 | # CONFIG_PHONE is not set | 496 | # CONFIG_PHONE is not set |
| 579 | 497 | ||
| 580 | # | 498 | # |
| @@ -582,6 +500,7 @@ CONFIG_NET_PCI=y | |||
| 582 | # | 500 | # |
| 583 | CONFIG_INPUT=y | 501 | CONFIG_INPUT=y |
| 584 | # CONFIG_INPUT_FF_MEMLESS is not set | 502 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 503 | # CONFIG_INPUT_POLLDEV is not set | ||
| 585 | 504 | ||
| 586 | # | 505 | # |
| 587 | # Userland interfaces | 506 | # Userland interfaces |
| @@ -607,12 +526,19 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 607 | # CONFIG_KEYBOARD_STOWAWAY is not set | 526 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 608 | CONFIG_INPUT_MOUSE=y | 527 | CONFIG_INPUT_MOUSE=y |
| 609 | CONFIG_MOUSE_PS2=y | 528 | CONFIG_MOUSE_PS2=y |
| 529 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 530 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 531 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 532 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 533 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 534 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 610 | # CONFIG_MOUSE_SERIAL is not set | 535 | # CONFIG_MOUSE_SERIAL is not set |
| 611 | # CONFIG_MOUSE_INPORT is not set | 536 | # CONFIG_MOUSE_INPORT is not set |
| 612 | # CONFIG_MOUSE_LOGIBM is not set | 537 | # CONFIG_MOUSE_LOGIBM is not set |
| 613 | # CONFIG_MOUSE_PC110PAD is not set | 538 | # CONFIG_MOUSE_PC110PAD is not set |
| 614 | # CONFIG_MOUSE_VSXXXAA is not set | 539 | # CONFIG_MOUSE_VSXXXAA is not set |
| 615 | # CONFIG_INPUT_JOYSTICK is not set | 540 | # CONFIG_INPUT_JOYSTICK is not set |
| 541 | # CONFIG_INPUT_TABLET is not set | ||
| 616 | # CONFIG_INPUT_TOUCHSCREEN is not set | 542 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 617 | # CONFIG_INPUT_MISC is not set | 543 | # CONFIG_INPUT_MISC is not set |
| 618 | 544 | ||
| @@ -657,35 +583,17 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 657 | # CONFIG_PRINTER is not set | 583 | # CONFIG_PRINTER is not set |
| 658 | # CONFIG_PPDEV is not set | 584 | # CONFIG_PPDEV is not set |
| 659 | # CONFIG_TIPAR is not set | 585 | # CONFIG_TIPAR is not set |
| 660 | |||
| 661 | # | ||
| 662 | # IPMI | ||
| 663 | # | ||
| 664 | # CONFIG_IPMI_HANDLER is not set | 586 | # CONFIG_IPMI_HANDLER is not set |
| 665 | |||
| 666 | # | ||
| 667 | # Watchdog Cards | ||
| 668 | # | ||
| 669 | # CONFIG_WATCHDOG is not set | 587 | # CONFIG_WATCHDOG is not set |
| 670 | # CONFIG_HW_RANDOM is not set | 588 | # CONFIG_HW_RANDOM is not set |
| 671 | # CONFIG_RTC is not set | 589 | # CONFIG_RTC is not set |
| 672 | # CONFIG_DTLK is not set | 590 | # CONFIG_DTLK is not set |
| 673 | # CONFIG_R3964 is not set | 591 | # CONFIG_R3964 is not set |
| 674 | |||
| 675 | # | ||
| 676 | # Ftape, the floppy tape device driver | ||
| 677 | # | ||
| 678 | # CONFIG_RAW_DRIVER is not set | 592 | # CONFIG_RAW_DRIVER is not set |
| 679 | |||
| 680 | # | ||
| 681 | # TPM devices | ||
| 682 | # | ||
| 683 | # CONFIG_TCG_TPM is not set | 593 | # CONFIG_TCG_TPM is not set |
| 684 | 594 | CONFIG_DEVPORT=y | |
| 685 | # | ||
| 686 | # I2C support | ||
| 687 | # | ||
| 688 | CONFIG_I2C=m | 595 | CONFIG_I2C=m |
| 596 | CONFIG_I2C_BOARDINFO=y | ||
| 689 | CONFIG_I2C_CHARDEV=m | 597 | CONFIG_I2C_CHARDEV=m |
| 690 | 598 | ||
| 691 | # | 599 | # |
| @@ -702,6 +610,8 @@ CONFIG_I2C_ELEKTOR=m | |||
| 702 | # CONFIG_I2C_OCORES is not set | 610 | # CONFIG_I2C_OCORES is not set |
| 703 | # CONFIG_I2C_PARPORT is not set | 611 | # CONFIG_I2C_PARPORT is not set |
| 704 | # CONFIG_I2C_PARPORT_LIGHT is not set | 612 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 613 | # CONFIG_I2C_SIMTEC is not set | ||
| 614 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 705 | # CONFIG_I2C_STUB is not set | 615 | # CONFIG_I2C_STUB is not set |
| 706 | # CONFIG_I2C_PCA_ISA is not set | 616 | # CONFIG_I2C_PCA_ISA is not set |
| 707 | 617 | ||
| @@ -710,11 +620,13 @@ CONFIG_I2C_ELEKTOR=m | |||
| 710 | # | 620 | # |
| 711 | # CONFIG_SENSORS_DS1337 is not set | 621 | # CONFIG_SENSORS_DS1337 is not set |
| 712 | # CONFIG_SENSORS_DS1374 is not set | 622 | # CONFIG_SENSORS_DS1374 is not set |
| 623 | # CONFIG_DS1682 is not set | ||
| 713 | # CONFIG_SENSORS_EEPROM is not set | 624 | # CONFIG_SENSORS_EEPROM is not set |
| 714 | # CONFIG_SENSORS_PCF8574 is not set | 625 | # CONFIG_SENSORS_PCF8574 is not set |
| 715 | # CONFIG_SENSORS_PCA9539 is not set | 626 | # CONFIG_SENSORS_PCA9539 is not set |
| 716 | # CONFIG_SENSORS_PCF8591 is not set | 627 | # CONFIG_SENSORS_PCF8591 is not set |
| 717 | # CONFIG_SENSORS_MAX6875 is not set | 628 | # CONFIG_SENSORS_MAX6875 is not set |
| 629 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 718 | # CONFIG_I2C_DEBUG_CORE is not set | 630 | # CONFIG_I2C_DEBUG_CORE is not set |
| 719 | # CONFIG_I2C_DEBUG_ALGO is not set | 631 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 720 | # CONFIG_I2C_DEBUG_BUS is not set | 632 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -725,21 +637,17 @@ CONFIG_I2C_ELEKTOR=m | |||
| 725 | # | 637 | # |
| 726 | # CONFIG_SPI is not set | 638 | # CONFIG_SPI is not set |
| 727 | # CONFIG_SPI_MASTER is not set | 639 | # CONFIG_SPI_MASTER is not set |
| 728 | |||
| 729 | # | ||
| 730 | # Dallas's 1-wire bus | ||
| 731 | # | ||
| 732 | # CONFIG_W1 is not set | 640 | # CONFIG_W1 is not set |
| 733 | 641 | # CONFIG_POWER_SUPPLY is not set | |
| 734 | # | ||
| 735 | # Hardware Monitoring support | ||
| 736 | # | ||
| 737 | CONFIG_HWMON=y | 642 | CONFIG_HWMON=y |
| 738 | CONFIG_HWMON_VID=m | 643 | CONFIG_HWMON_VID=m |
| 739 | # CONFIG_SENSORS_ABITUGURU is not set | 644 | # CONFIG_SENSORS_ABITUGURU is not set |
| 645 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 646 | # CONFIG_SENSORS_AD7418 is not set | ||
| 740 | CONFIG_SENSORS_ADM1021=m | 647 | CONFIG_SENSORS_ADM1021=m |
| 741 | CONFIG_SENSORS_ADM1025=m | 648 | CONFIG_SENSORS_ADM1025=m |
| 742 | # CONFIG_SENSORS_ADM1026 is not set | 649 | # CONFIG_SENSORS_ADM1026 is not set |
| 650 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 743 | CONFIG_SENSORS_ADM1031=m | 651 | CONFIG_SENSORS_ADM1031=m |
| 744 | # CONFIG_SENSORS_ADM9240 is not set | 652 | # CONFIG_SENSORS_ADM9240 is not set |
| 745 | CONFIG_SENSORS_ASB100=m | 653 | CONFIG_SENSORS_ASB100=m |
| @@ -761,8 +669,12 @@ CONFIG_SENSORS_LM85=m | |||
| 761 | # CONFIG_SENSORS_LM87 is not set | 669 | # CONFIG_SENSORS_LM87 is not set |
| 762 | CONFIG_SENSORS_LM90=m | 670 | CONFIG_SENSORS_LM90=m |
| 763 | # CONFIG_SENSORS_LM92 is not set | 671 | # CONFIG_SENSORS_LM92 is not set |
| 672 | # CONFIG_SENSORS_LM93 is not set | ||
| 764 | CONFIG_SENSORS_MAX1619=m | 673 | CONFIG_SENSORS_MAX1619=m |
| 674 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 765 | # CONFIG_SENSORS_PC87360 is not set | 675 | # CONFIG_SENSORS_PC87360 is not set |
| 676 | # CONFIG_SENSORS_PC87427 is not set | ||
| 677 | # CONFIG_SENSORS_DME1737 is not set | ||
| 766 | CONFIG_SENSORS_SMSC47M1=m | 678 | CONFIG_SENSORS_SMSC47M1=m |
| 767 | # CONFIG_SENSORS_SMSC47M192 is not set | 679 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 768 | # CONFIG_SENSORS_SMSC47B397 is not set | 680 | # CONFIG_SENSORS_SMSC47B397 is not set |
| @@ -770,29 +682,27 @@ CONFIG_SENSORS_SMSC47M1=m | |||
| 770 | CONFIG_SENSORS_W83781D=m | 682 | CONFIG_SENSORS_W83781D=m |
| 771 | # CONFIG_SENSORS_W83791D is not set | 683 | # CONFIG_SENSORS_W83791D is not set |
| 772 | # CONFIG_SENSORS_W83792D is not set | 684 | # CONFIG_SENSORS_W83792D is not set |
| 685 | # CONFIG_SENSORS_W83793 is not set | ||
| 773 | CONFIG_SENSORS_W83L785TS=m | 686 | CONFIG_SENSORS_W83L785TS=m |
| 774 | CONFIG_SENSORS_W83627HF=m | 687 | CONFIG_SENSORS_W83627HF=m |
| 775 | # CONFIG_SENSORS_W83627EHF is not set | 688 | # CONFIG_SENSORS_W83627EHF is not set |
| 776 | # CONFIG_HWMON_DEBUG_CHIP is not set | 689 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 777 | 690 | ||
| 778 | # | 691 | # |
| 692 | # Multifunction device drivers | ||
| 693 | # | ||
| 694 | # CONFIG_MFD_SM501 is not set | ||
| 695 | |||
| 696 | # | ||
| 779 | # Multimedia devices | 697 | # Multimedia devices |
| 780 | # | 698 | # |
| 781 | CONFIG_VIDEO_DEV=m | 699 | CONFIG_VIDEO_DEV=m |
| 782 | CONFIG_VIDEO_V4L1=y | 700 | CONFIG_VIDEO_V4L1=y |
| 783 | CONFIG_VIDEO_V4L1_COMPAT=y | 701 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 784 | CONFIG_VIDEO_V4L2=y | 702 | CONFIG_VIDEO_V4L2=y |
| 785 | 703 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | |
| 786 | # | ||
| 787 | # Video Capture Adapters | ||
| 788 | # | ||
| 789 | |||
| 790 | # | ||
| 791 | # Video Capture Adapters | ||
| 792 | # | ||
| 793 | # CONFIG_VIDEO_ADV_DEBUG is not set | 704 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 794 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 705 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 795 | # CONFIG_VIDEO_VIVI is not set | ||
| 796 | # CONFIG_VIDEO_PMS is not set | 706 | # CONFIG_VIDEO_PMS is not set |
| 797 | CONFIG_VIDEO_BWQCAM=m | 707 | CONFIG_VIDEO_BWQCAM=m |
| 798 | CONFIG_VIDEO_CQCAM=m | 708 | CONFIG_VIDEO_CQCAM=m |
| @@ -801,11 +711,9 @@ CONFIG_VIDEO_CQCAM=m | |||
| 801 | # CONFIG_VIDEO_SAA5246A is not set | 711 | # CONFIG_VIDEO_SAA5246A is not set |
| 802 | # CONFIG_VIDEO_SAA5249 is not set | 712 | # CONFIG_VIDEO_SAA5249 is not set |
| 803 | # CONFIG_TUNER_3036 is not set | 713 | # CONFIG_TUNER_3036 is not set |
| 714 | # CONFIG_TUNER_TEA5761 is not set | ||
| 804 | # CONFIG_VIDEO_M32R_AR is not set | 715 | # CONFIG_VIDEO_M32R_AR is not set |
| 805 | 716 | CONFIG_RADIO_ADAPTERS=y | |
| 806 | # | ||
| 807 | # Radio Adapters | ||
| 808 | # | ||
| 809 | # CONFIG_RADIO_CADET is not set | 717 | # CONFIG_RADIO_CADET is not set |
| 810 | # CONFIG_RADIO_RTRACK is not set | 718 | # CONFIG_RADIO_RTRACK is not set |
| 811 | # CONFIG_RADIO_RTRACK2 is not set | 719 | # CONFIG_RADIO_RTRACK2 is not set |
| @@ -817,16 +725,20 @@ CONFIG_VIDEO_CQCAM=m | |||
| 817 | # CONFIG_RADIO_TRUST is not set | 725 | # CONFIG_RADIO_TRUST is not set |
| 818 | # CONFIG_RADIO_TYPHOON is not set | 726 | # CONFIG_RADIO_TYPHOON is not set |
| 819 | # CONFIG_RADIO_ZOLTRIX is not set | 727 | # CONFIG_RADIO_ZOLTRIX is not set |
| 728 | # CONFIG_DVB_CORE is not set | ||
| 729 | CONFIG_DAB=y | ||
| 820 | 730 | ||
| 821 | # | 731 | # |
| 822 | # Digital Video Broadcasting Devices | 732 | # Graphics support |
| 823 | # | 733 | # |
| 824 | # CONFIG_DVB is not set | 734 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 825 | 735 | ||
| 826 | # | 736 | # |
| 827 | # Graphics support | 737 | # Display device support |
| 828 | # | 738 | # |
| 829 | CONFIG_FIRMWARE_EDID=y | 739 | # CONFIG_DISPLAY_SUPPORT is not set |
| 740 | # CONFIG_VGASTATE is not set | ||
| 741 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 830 | # CONFIG_FB is not set | 742 | # CONFIG_FB is not set |
| 831 | 743 | ||
| 832 | # | 744 | # |
| @@ -836,16 +748,15 @@ CONFIG_VGA_CONSOLE=y | |||
| 836 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 748 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 837 | # CONFIG_MDA_CONSOLE is not set | 749 | # CONFIG_MDA_CONSOLE is not set |
| 838 | CONFIG_DUMMY_CONSOLE=y | 750 | CONFIG_DUMMY_CONSOLE=y |
| 839 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 840 | 751 | ||
| 841 | # | 752 | # |
| 842 | # Sound | 753 | # Sound |
| 843 | # | 754 | # |
| 844 | # CONFIG_SOUND is not set | 755 | # CONFIG_SOUND is not set |
| 845 | 756 | CONFIG_HID_SUPPORT=y | |
| 846 | # | 757 | CONFIG_HID=y |
| 847 | # USB support | 758 | CONFIG_HID_DEBUG=y |
| 848 | # | 759 | CONFIG_USB_SUPPORT=y |
| 849 | # CONFIG_USB_ARCH_HAS_HCD is not set | 760 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 850 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 761 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 851 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 762 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -858,50 +769,19 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 858 | # USB Gadget Support | 769 | # USB Gadget Support |
| 859 | # | 770 | # |
| 860 | # CONFIG_USB_GADGET is not set | 771 | # CONFIG_USB_GADGET is not set |
| 861 | |||
| 862 | # | ||
| 863 | # MMC/SD Card support | ||
| 864 | # | ||
| 865 | # CONFIG_MMC is not set | 772 | # CONFIG_MMC is not set |
| 866 | |||
| 867 | # | ||
| 868 | # LED devices | ||
| 869 | # | ||
| 870 | # CONFIG_NEW_LEDS is not set | 773 | # CONFIG_NEW_LEDS is not set |
| 871 | 774 | ||
| 872 | # | 775 | # |
| 873 | # LED drivers | ||
| 874 | # | ||
| 875 | |||
| 876 | # | ||
| 877 | # LED Triggers | ||
| 878 | # | ||
| 879 | |||
| 880 | # | ||
| 881 | # InfiniBand support | ||
| 882 | # | ||
| 883 | |||
| 884 | # | ||
| 885 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 886 | # | ||
| 887 | |||
| 888 | # | ||
| 889 | # Real Time Clock | 776 | # Real Time Clock |
| 890 | # | 777 | # |
| 891 | # CONFIG_RTC_CLASS is not set | 778 | # CONFIG_RTC_CLASS is not set |
| 779 | # CONFIG_AUXDISPLAY is not set | ||
| 892 | 780 | ||
| 893 | # | 781 | # |
| 894 | # DMA Engine support | 782 | # Userspace I/O |
| 895 | # | ||
| 896 | # CONFIG_DMA_ENGINE is not set | ||
| 897 | |||
| 898 | # | ||
| 899 | # DMA Clients | ||
| 900 | # | ||
| 901 | |||
| 902 | # | ||
| 903 | # DMA Devices | ||
| 904 | # | 783 | # |
| 784 | # CONFIG_UIO is not set | ||
| 905 | 785 | ||
| 906 | # | 786 | # |
| 907 | # File systems | 787 | # File systems |
| @@ -1000,6 +880,7 @@ CONFIG_LOCKD_V4=y | |||
| 1000 | CONFIG_EXPORTFS=m | 880 | CONFIG_EXPORTFS=m |
| 1001 | CONFIG_NFS_COMMON=y | 881 | CONFIG_NFS_COMMON=y |
| 1002 | CONFIG_SUNRPC=y | 882 | CONFIG_SUNRPC=y |
| 883 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1003 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 884 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1004 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 885 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1005 | # CONFIG_SMB_FS is not set | 886 | # CONFIG_SMB_FS is not set |
| @@ -1007,7 +888,6 @@ CONFIG_SUNRPC=y | |||
| 1007 | # CONFIG_NCP_FS is not set | 888 | # CONFIG_NCP_FS is not set |
| 1008 | # CONFIG_CODA_FS is not set | 889 | # CONFIG_CODA_FS is not set |
| 1009 | # CONFIG_AFS_FS is not set | 890 | # CONFIG_AFS_FS is not set |
| 1010 | # CONFIG_9P_FS is not set | ||
| 1011 | 891 | ||
| 1012 | # | 892 | # |
| 1013 | # Partition Types | 893 | # Partition Types |
| @@ -1060,6 +940,11 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1060 | # CONFIG_NLS_UTF8 is not set | 940 | # CONFIG_NLS_UTF8 is not set |
| 1061 | 941 | ||
| 1062 | # | 942 | # |
| 943 | # Distributed Lock Manager | ||
| 944 | # | ||
| 945 | # CONFIG_DLM is not set | ||
| 946 | |||
| 947 | # | ||
| 1063 | # Profiling support | 948 | # Profiling support |
| 1064 | # | 949 | # |
| 1065 | CONFIG_PROFILING=y | 950 | CONFIG_PROFILING=y |
| @@ -1072,29 +957,24 @@ CONFIG_OPROFILE=m | |||
| 1072 | CONFIG_ENABLE_MUST_CHECK=y | 957 | CONFIG_ENABLE_MUST_CHECK=y |
| 1073 | # CONFIG_MAGIC_SYSRQ is not set | 958 | # CONFIG_MAGIC_SYSRQ is not set |
| 1074 | # CONFIG_UNUSED_SYMBOLS is not set | 959 | # CONFIG_UNUSED_SYMBOLS is not set |
| 960 | # CONFIG_DEBUG_FS is not set | ||
| 961 | # CONFIG_HEADERS_CHECK is not set | ||
| 1075 | # CONFIG_DEBUG_KERNEL is not set | 962 | # CONFIG_DEBUG_KERNEL is not set |
| 1076 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 1077 | CONFIG_DEBUG_BUGVERBOSE=y | 963 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1078 | # CONFIG_DEBUG_FS is not set | ||
| 1079 | # CONFIG_FRAME_POINTER is not set | 964 | # CONFIG_FRAME_POINTER is not set |
| 1080 | # CONFIG_UNWIND_INFO is not set | ||
| 1081 | # CONFIG_HEADERS_CHECK is not set | ||
| 1082 | 965 | ||
| 1083 | # | 966 | # |
| 1084 | # Security options | 967 | # Security options |
| 1085 | # | 968 | # |
| 1086 | # CONFIG_KEYS is not set | 969 | # CONFIG_KEYS is not set |
| 1087 | # CONFIG_SECURITY is not set | 970 | # CONFIG_SECURITY is not set |
| 1088 | |||
| 1089 | # | ||
| 1090 | # Cryptographic options | ||
| 1091 | # | ||
| 1092 | CONFIG_CRYPTO=y | 971 | CONFIG_CRYPTO=y |
| 1093 | CONFIG_CRYPTO_ALGAPI=y | 972 | CONFIG_CRYPTO_ALGAPI=y |
| 1094 | CONFIG_CRYPTO_BLKCIPHER=m | 973 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1095 | CONFIG_CRYPTO_HASH=y | 974 | CONFIG_CRYPTO_HASH=y |
| 1096 | CONFIG_CRYPTO_MANAGER=y | 975 | CONFIG_CRYPTO_MANAGER=y |
| 1097 | CONFIG_CRYPTO_HMAC=y | 976 | CONFIG_CRYPTO_HMAC=y |
| 977 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1098 | CONFIG_CRYPTO_NULL=m | 978 | CONFIG_CRYPTO_NULL=m |
| 1099 | CONFIG_CRYPTO_MD4=m | 979 | CONFIG_CRYPTO_MD4=m |
| 1100 | CONFIG_CRYPTO_MD5=m | 980 | CONFIG_CRYPTO_MD5=m |
| @@ -1103,9 +983,14 @@ CONFIG_CRYPTO_SHA256=m | |||
| 1103 | CONFIG_CRYPTO_SHA512=m | 983 | CONFIG_CRYPTO_SHA512=m |
| 1104 | CONFIG_CRYPTO_WP512=m | 984 | CONFIG_CRYPTO_WP512=m |
| 1105 | # CONFIG_CRYPTO_TGR192 is not set | 985 | # CONFIG_CRYPTO_TGR192 is not set |
| 986 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1106 | CONFIG_CRYPTO_ECB=m | 987 | CONFIG_CRYPTO_ECB=m |
| 1107 | CONFIG_CRYPTO_CBC=m | 988 | CONFIG_CRYPTO_CBC=m |
| 989 | CONFIG_CRYPTO_PCBC=m | ||
| 990 | # CONFIG_CRYPTO_LRW is not set | ||
| 991 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1108 | CONFIG_CRYPTO_DES=m | 992 | CONFIG_CRYPTO_DES=m |
| 993 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1109 | CONFIG_CRYPTO_BLOWFISH=m | 994 | CONFIG_CRYPTO_BLOWFISH=m |
| 1110 | CONFIG_CRYPTO_TWOFISH=m | 995 | CONFIG_CRYPTO_TWOFISH=m |
| 1111 | CONFIG_CRYPTO_TWOFISH_COMMON=m | 996 | CONFIG_CRYPTO_TWOFISH_COMMON=m |
| @@ -1120,21 +1005,23 @@ CONFIG_CRYPTO_AES=m | |||
| 1120 | # CONFIG_CRYPTO_DEFLATE is not set | 1005 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1121 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1006 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1122 | CONFIG_CRYPTO_CRC32C=m | 1007 | CONFIG_CRYPTO_CRC32C=m |
| 1008 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1123 | # CONFIG_CRYPTO_TEST is not set | 1009 | # CONFIG_CRYPTO_TEST is not set |
| 1124 | 1010 | CONFIG_CRYPTO_HW=y | |
| 1125 | # | ||
| 1126 | # Hardware crypto devices | ||
| 1127 | # | ||
| 1128 | 1011 | ||
| 1129 | # | 1012 | # |
| 1130 | # Library routines | 1013 | # Library routines |
| 1131 | # | 1014 | # |
| 1015 | CONFIG_BITREVERSE=y | ||
| 1132 | CONFIG_CRC_CCITT=m | 1016 | CONFIG_CRC_CCITT=m |
| 1133 | CONFIG_CRC16=m | 1017 | CONFIG_CRC16=m |
| 1018 | # CONFIG_CRC_ITU_T is not set | ||
| 1134 | CONFIG_CRC32=y | 1019 | CONFIG_CRC32=y |
| 1020 | # CONFIG_CRC7 is not set | ||
| 1135 | CONFIG_LIBCRC32C=m | 1021 | CONFIG_LIBCRC32C=m |
| 1136 | CONFIG_TEXTSEARCH=y | 1022 | CONFIG_TEXTSEARCH=y |
| 1137 | CONFIG_TEXTSEARCH_KMP=m | 1023 | CONFIG_TEXTSEARCH_KMP=m |
| 1138 | CONFIG_TEXTSEARCH_BM=m | 1024 | CONFIG_TEXTSEARCH_BM=m |
| 1139 | CONFIG_TEXTSEARCH_FSM=m | 1025 | CONFIG_TEXTSEARCH_FSM=m |
| 1140 | CONFIG_PLIST=y | 1026 | CONFIG_PLIST=y |
| 1027 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.smp b/arch/m32r/configs/m32700ut.smp_defconfig index 13579917afef..af3b98179113 100644 --- a/arch/m32r/m32700ut/defconfig.m32700ut.smp +++ b/arch/m32r/configs/m32700ut.smp_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Tue Dec 12 17:52:38 2006 | 4 | # Wed Aug 1 17:22:35 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -23,19 +26,20 @@ CONFIG_LOCALVERSION="" | |||
| 23 | CONFIG_LOCALVERSION_AUTO=y | 26 | CONFIG_LOCALVERSION_AUTO=y |
| 24 | CONFIG_SWAP=y | 27 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 28 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_IPC_NS is not set | 29 | CONFIG_SYSVIPC_SYSCTL=y |
| 27 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | CONFIG_BSD_PROCESS_ACCT=y | 31 | CONFIG_BSD_PROCESS_ACCT=y |
| 29 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 32 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 30 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
| 31 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
| 32 | # CONFIG_AUDIT is not set | 35 | # CONFIG_AUDIT is not set |
| 33 | CONFIG_IKCONFIG=y | 36 | CONFIG_IKCONFIG=y |
| 34 | CONFIG_IKCONFIG_PROC=y | 37 | CONFIG_IKCONFIG_PROC=y |
| 38 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 35 | # CONFIG_CPUSETS is not set | 39 | # CONFIG_CPUSETS is not set |
| 36 | CONFIG_SYSFS_DEPRECATED=y | 40 | CONFIG_SYSFS_DEPRECATED=y |
| 37 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
| 38 | CONFIG_INITRAMFS_SOURCE="" | 42 | # CONFIG_BLK_DEV_INITRD is not set |
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 40 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| 41 | CONFIG_EMBEDDED=y | 45 | CONFIG_EMBEDDED=y |
| @@ -47,17 +51,18 @@ CONFIG_BUG=y | |||
| 47 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 48 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 49 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 50 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 51 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 52 | CONFIG_SLAB=y | ||
| 53 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 54 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 55 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 56 | # CONFIG_SLOB is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # Loadable module support | ||
| 60 | # | ||
| 61 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 62 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -65,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y | |||
| 65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 66 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 67 | CONFIG_STOP_MACHINE=y | 72 | CONFIG_STOP_MACHINE=y |
| 68 | |||
| 69 | # | ||
| 70 | # Block layer | ||
| 71 | # | ||
| 72 | CONFIG_BLOCK=y | 73 | CONFIG_BLOCK=y |
| 74 | # CONFIG_LBD is not set | ||
| 73 | # CONFIG_BLK_DEV_IO_TRACE is not set | 75 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 76 | # CONFIG_LSF is not set | ||
| 77 | # CONFIG_BLK_DEV_BSG is not set | ||
| 74 | 78 | ||
| 75 | # | 79 | # |
| 76 | # IO Schedulers | 80 | # IO Schedulers |
| @@ -123,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 123 | # CONFIG_SPARSEMEM_STATIC is not set | 127 | # CONFIG_SPARSEMEM_STATIC is not set |
| 124 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 128 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 125 | # CONFIG_RESOURCES_64BIT is not set | 129 | # CONFIG_RESOURCES_64BIT is not set |
| 130 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 131 | CONFIG_BOUNCE=y | ||
| 132 | CONFIG_VIRT_TO_BUS=y | ||
| 126 | CONFIG_IRAM_START=0x00f00000 | 133 | CONFIG_IRAM_START=0x00f00000 |
| 127 | CONFIG_IRAM_SIZE=0x00080000 | 134 | CONFIG_IRAM_SIZE=0x00080000 |
| 128 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 135 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 129 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 136 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 137 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 138 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 130 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 139 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 131 | CONFIG_GENERIC_HWEIGHT=y | 140 | CONFIG_GENERIC_HWEIGHT=y |
| 132 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 141 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 142 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 133 | CONFIG_PREEMPT=y | 143 | CONFIG_PREEMPT=y |
| 134 | CONFIG_SMP=y | 144 | CONFIG_SMP=y |
| 135 | # CONFIG_CHIP_M32700_TS1 is not set | 145 | # CONFIG_CHIP_M32700_TS1 is not set |
| @@ -139,6 +149,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 139 | # | 149 | # |
| 140 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 150 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 141 | # | 151 | # |
| 152 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 142 | # CONFIG_ISA is not set | 153 | # CONFIG_ISA is not set |
| 143 | 154 | ||
| 144 | # | 155 | # |
| @@ -147,10 +158,6 @@ CONFIG_NODES_SHIFT=1 | |||
| 147 | # CONFIG_PCCARD is not set | 158 | # CONFIG_PCCARD is not set |
| 148 | 159 | ||
| 149 | # | 160 | # |
| 150 | # PCI Hotplug Support | ||
| 151 | # | ||
| 152 | |||
| 153 | # | ||
| 154 | # Executable file formats | 161 | # Executable file formats |
| 155 | # | 162 | # |
| 156 | CONFIG_BINFMT_ELF=y | 163 | CONFIG_BINFMT_ELF=y |
| @@ -164,13 +171,13 @@ CONFIG_NET=y | |||
| 164 | # | 171 | # |
| 165 | # Networking options | 172 | # Networking options |
| 166 | # | 173 | # |
| 167 | # CONFIG_NETDEBUG is not set | ||
| 168 | CONFIG_PACKET=y | 174 | CONFIG_PACKET=y |
| 169 | # CONFIG_PACKET_MMAP is not set | 175 | # CONFIG_PACKET_MMAP is not set |
| 170 | CONFIG_UNIX=y | 176 | CONFIG_UNIX=y |
| 171 | CONFIG_XFRM=y | 177 | CONFIG_XFRM=y |
| 172 | # CONFIG_XFRM_USER is not set | 178 | # CONFIG_XFRM_USER is not set |
| 173 | # CONFIG_XFRM_SUB_POLICY is not set | 179 | # CONFIG_XFRM_SUB_POLICY is not set |
| 180 | # CONFIG_XFRM_MIGRATE is not set | ||
| 174 | # CONFIG_NET_KEY is not set | 181 | # CONFIG_NET_KEY is not set |
| 175 | CONFIG_INET=y | 182 | CONFIG_INET=y |
| 176 | # CONFIG_IP_MULTICAST is not set | 183 | # CONFIG_IP_MULTICAST is not set |
| @@ -203,20 +210,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 203 | # CONFIG_INET6_TUNNEL is not set | 210 | # CONFIG_INET6_TUNNEL is not set |
| 204 | # CONFIG_NETWORK_SECMARK is not set | 211 | # CONFIG_NETWORK_SECMARK is not set |
| 205 | # CONFIG_NETFILTER is not set | 212 | # CONFIG_NETFILTER is not set |
| 206 | |||
| 207 | # | ||
| 208 | # DCCP Configuration (EXPERIMENTAL) | ||
| 209 | # | ||
| 210 | # CONFIG_IP_DCCP is not set | 213 | # CONFIG_IP_DCCP is not set |
| 211 | |||
| 212 | # | ||
| 213 | # SCTP Configuration (EXPERIMENTAL) | ||
| 214 | # | ||
| 215 | # CONFIG_IP_SCTP is not set | 214 | # CONFIG_IP_SCTP is not set |
| 216 | |||
| 217 | # | ||
| 218 | # TIPC Configuration (EXPERIMENTAL) | ||
| 219 | # | ||
| 220 | # CONFIG_TIPC is not set | 215 | # CONFIG_TIPC is not set |
| 221 | # CONFIG_ATM is not set | 216 | # CONFIG_ATM is not set |
| 222 | # CONFIG_BRIDGE is not set | 217 | # CONFIG_BRIDGE is not set |
| @@ -242,7 +237,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 242 | # CONFIG_HAMRADIO is not set | 237 | # CONFIG_HAMRADIO is not set |
| 243 | # CONFIG_IRDA is not set | 238 | # CONFIG_IRDA is not set |
| 244 | # CONFIG_BT is not set | 239 | # CONFIG_BT is not set |
| 240 | # CONFIG_AF_RXRPC is not set | ||
| 241 | |||
| 242 | # | ||
| 243 | # Wireless | ||
| 244 | # | ||
| 245 | # CONFIG_CFG80211 is not set | ||
| 246 | # CONFIG_WIRELESS_EXT is not set | ||
| 247 | # CONFIG_MAC80211 is not set | ||
| 245 | # CONFIG_IEEE80211 is not set | 248 | # CONFIG_IEEE80211 is not set |
| 249 | # CONFIG_RFKILL is not set | ||
| 250 | # CONFIG_NET_9P is not set | ||
| 246 | 251 | ||
| 247 | # | 252 | # |
| 248 | # Device Drivers | 253 | # Device Drivers |
| @@ -255,15 +260,7 @@ CONFIG_STANDALONE=y | |||
| 255 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 260 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 256 | CONFIG_FW_LOADER=y | 261 | CONFIG_FW_LOADER=y |
| 257 | # CONFIG_SYS_HYPERVISOR is not set | 262 | # CONFIG_SYS_HYPERVISOR is not set |
| 258 | |||
| 259 | # | ||
| 260 | # Connector - unified userspace <-> kernelspace linker | ||
| 261 | # | ||
| 262 | # CONFIG_CONNECTOR is not set | 263 | # CONFIG_CONNECTOR is not set |
| 263 | |||
| 264 | # | ||
| 265 | # Memory Technology Devices (MTD) | ||
| 266 | # | ||
| 267 | CONFIG_MTD=y | 264 | CONFIG_MTD=y |
| 268 | # CONFIG_MTD_DEBUG is not set | 265 | # CONFIG_MTD_DEBUG is not set |
| 269 | # CONFIG_MTD_CONCAT is not set | 266 | # CONFIG_MTD_CONCAT is not set |
| @@ -278,6 +275,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 278 | # User Modules And Translation Layers | 275 | # User Modules And Translation Layers |
| 279 | # | 276 | # |
| 280 | # CONFIG_MTD_CHAR is not set | 277 | # CONFIG_MTD_CHAR is not set |
| 278 | CONFIG_MTD_BLKDEVS=y | ||
| 281 | CONFIG_MTD_BLOCK=y | 279 | CONFIG_MTD_BLOCK=y |
| 282 | # CONFIG_FTL is not set | 280 | # CONFIG_FTL is not set |
| 283 | # CONFIG_NFTL is not set | 281 | # CONFIG_NFTL is not set |
| @@ -314,7 +312,6 @@ CONFIG_MTD_CFI_UTIL=m | |||
| 314 | # CONFIG_MTD_RAM is not set | 312 | # CONFIG_MTD_RAM is not set |
| 315 | # CONFIG_MTD_ROM is not set | 313 | # CONFIG_MTD_ROM is not set |
| 316 | # CONFIG_MTD_ABSENT is not set | 314 | # CONFIG_MTD_ABSENT is not set |
| 317 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 318 | 315 | ||
| 319 | # | 316 | # |
| 320 | # Mapping drivers for chip access | 317 | # Mapping drivers for chip access |
| @@ -337,29 +334,15 @@ CONFIG_MTD_CFI_UTIL=m | |||
| 337 | # CONFIG_MTD_DOC2000 is not set | 334 | # CONFIG_MTD_DOC2000 is not set |
| 338 | # CONFIG_MTD_DOC2001 is not set | 335 | # CONFIG_MTD_DOC2001 is not set |
| 339 | # CONFIG_MTD_DOC2001PLUS is not set | 336 | # CONFIG_MTD_DOC2001PLUS is not set |
| 340 | |||
| 341 | # | ||
| 342 | # NAND Flash Device Drivers | ||
| 343 | # | ||
| 344 | # CONFIG_MTD_NAND is not set | 337 | # CONFIG_MTD_NAND is not set |
| 345 | |||
| 346 | # | ||
| 347 | # OneNAND Flash Device Drivers | ||
| 348 | # | ||
| 349 | # CONFIG_MTD_ONENAND is not set | 338 | # CONFIG_MTD_ONENAND is not set |
| 350 | 339 | ||
| 351 | # | 340 | # |
| 352 | # Parallel port support | 341 | # UBI - Unsorted block images |
| 353 | # | 342 | # |
| 343 | # CONFIG_MTD_UBI is not set | ||
| 354 | # CONFIG_PARPORT is not set | 344 | # CONFIG_PARPORT is not set |
| 355 | 345 | CONFIG_BLK_DEV=y | |
| 356 | # | ||
| 357 | # Plug and Play support | ||
| 358 | # | ||
| 359 | |||
| 360 | # | ||
| 361 | # Block devices | ||
| 362 | # | ||
| 363 | # CONFIG_BLK_DEV_COW_COMMON is not set | 346 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 364 | CONFIG_BLK_DEV_LOOP=y | 347 | CONFIG_BLK_DEV_LOOP=y |
| 365 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 348 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -368,18 +351,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 368 | CONFIG_BLK_DEV_RAM_COUNT=16 | 351 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 369 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 352 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 370 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 353 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 371 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 372 | # CONFIG_CDROM_PKTCDVD is not set | 354 | # CONFIG_CDROM_PKTCDVD is not set |
| 373 | CONFIG_ATA_OVER_ETH=m | 355 | CONFIG_ATA_OVER_ETH=m |
| 374 | 356 | CONFIG_MISC_DEVICES=y | |
| 375 | # | 357 | # CONFIG_EEPROM_93CX6 is not set |
| 376 | # Misc devices | ||
| 377 | # | ||
| 378 | # CONFIG_TIFM_CORE is not set | ||
| 379 | |||
| 380 | # | ||
| 381 | # ATA/ATAPI/MFM/RLL support | ||
| 382 | # | ||
| 383 | CONFIG_IDE=y | 358 | CONFIG_IDE=y |
| 384 | CONFIG_IDE_MAX_HWIFS=4 | 359 | CONFIG_IDE_MAX_HWIFS=4 |
| 385 | CONFIG_BLK_DEV_IDE=y | 360 | CONFIG_BLK_DEV_IDE=y |
| @@ -395,14 +370,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 395 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 370 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 396 | # CONFIG_BLK_DEV_IDESCSI is not set | 371 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 397 | # CONFIG_IDE_TASK_IOCTL is not set | 372 | # CONFIG_IDE_TASK_IOCTL is not set |
| 373 | CONFIG_IDE_PROC_FS=y | ||
| 398 | 374 | ||
| 399 | # | 375 | # |
| 400 | # IDE chipset support/bugfixes | 376 | # IDE chipset support/bugfixes |
| 401 | # | 377 | # |
| 402 | CONFIG_IDE_GENERIC=y | 378 | CONFIG_IDE_GENERIC=y |
| 379 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 403 | # CONFIG_IDE_ARM is not set | 380 | # CONFIG_IDE_ARM is not set |
| 404 | # CONFIG_BLK_DEV_IDEDMA is not set | 381 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 405 | # CONFIG_IDEDMA_AUTO is not set | ||
| 406 | # CONFIG_BLK_DEV_HD is not set | 382 | # CONFIG_BLK_DEV_HD is not set |
| 407 | 383 | ||
| 408 | # | 384 | # |
| @@ -410,6 +386,8 @@ CONFIG_IDE_GENERIC=y | |||
| 410 | # | 386 | # |
| 411 | # CONFIG_RAID_ATTRS is not set | 387 | # CONFIG_RAID_ATTRS is not set |
| 412 | CONFIG_SCSI=m | 388 | CONFIG_SCSI=m |
| 389 | # CONFIG_SCSI_DMA is not set | ||
| 390 | # CONFIG_SCSI_TGT is not set | ||
| 413 | # CONFIG_SCSI_NETLINK is not set | 391 | # CONFIG_SCSI_NETLINK is not set |
| 414 | CONFIG_SCSI_PROC_FS=y | 392 | CONFIG_SCSI_PROC_FS=y |
| 415 | 393 | ||
| @@ -430,6 +408,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 430 | CONFIG_SCSI_MULTI_LUN=y | 408 | CONFIG_SCSI_MULTI_LUN=y |
| 431 | # CONFIG_SCSI_CONSTANTS is not set | 409 | # CONFIG_SCSI_CONSTANTS is not set |
| 432 | # CONFIG_SCSI_LOGGING is not set | 410 | # CONFIG_SCSI_LOGGING is not set |
| 411 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 412 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 433 | 413 | ||
| 434 | # | 414 | # |
| 435 | # SCSI Transports | 415 | # SCSI Transports |
| @@ -437,79 +417,31 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 437 | # CONFIG_SCSI_SPI_ATTRS is not set | 417 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 438 | # CONFIG_SCSI_FC_ATTRS is not set | 418 | # CONFIG_SCSI_FC_ATTRS is not set |
| 439 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 419 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 440 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 441 | # CONFIG_SCSI_SAS_LIBSAS is not set | 420 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 442 | 421 | CONFIG_SCSI_LOWLEVEL=y | |
| 443 | # | ||
| 444 | # SCSI low-level drivers | ||
| 445 | # | ||
| 446 | # CONFIG_ISCSI_TCP is not set | 422 | # CONFIG_ISCSI_TCP is not set |
| 447 | # CONFIG_SCSI_DEBUG is not set | 423 | # CONFIG_SCSI_DEBUG is not set |
| 448 | |||
| 449 | # | ||
| 450 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 451 | # | ||
| 452 | |||
| 453 | # | ||
| 454 | # Multi-device support (RAID and LVM) | ||
| 455 | # | ||
| 456 | # CONFIG_MD is not set | 424 | # CONFIG_MD is not set |
| 457 | |||
| 458 | # | ||
| 459 | # Fusion MPT device support | ||
| 460 | # | ||
| 461 | # CONFIG_FUSION is not set | ||
| 462 | |||
| 463 | # | ||
| 464 | # IEEE 1394 (FireWire) support | ||
| 465 | # | ||
| 466 | |||
| 467 | # | ||
| 468 | # I2O device support | ||
| 469 | # | ||
| 470 | |||
| 471 | # | ||
| 472 | # Network device support | ||
| 473 | # | ||
| 474 | CONFIG_NETDEVICES=y | 425 | CONFIG_NETDEVICES=y |
| 426 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 475 | # CONFIG_DUMMY is not set | 427 | # CONFIG_DUMMY is not set |
| 476 | # CONFIG_BONDING is not set | 428 | # CONFIG_BONDING is not set |
| 429 | # CONFIG_MACVLAN is not set | ||
| 477 | # CONFIG_EQUALIZER is not set | 430 | # CONFIG_EQUALIZER is not set |
| 478 | # CONFIG_TUN is not set | 431 | # CONFIG_TUN is not set |
| 479 | |||
| 480 | # | ||
| 481 | # PHY device support | ||
| 482 | # | ||
| 483 | # CONFIG_PHYLIB is not set | 432 | # CONFIG_PHYLIB is not set |
| 484 | |||
| 485 | # | ||
| 486 | # Ethernet (10 or 100Mbit) | ||
| 487 | # | ||
| 488 | CONFIG_NET_ETHERNET=y | 433 | CONFIG_NET_ETHERNET=y |
| 489 | CONFIG_MII=y | 434 | CONFIG_MII=y |
| 490 | CONFIG_SMC91X=y | 435 | CONFIG_SMC91X=y |
| 491 | # CONFIG_NE2000 is not set | 436 | # CONFIG_NE2000 is not set |
| 437 | CONFIG_NETDEV_1000=y | ||
| 438 | CONFIG_NETDEV_10000=y | ||
| 492 | 439 | ||
| 493 | # | 440 | # |
| 494 | # Ethernet (1000 Mbit) | 441 | # Wireless LAN |
| 495 | # | ||
| 496 | |||
| 497 | # | ||
| 498 | # Ethernet (10000 Mbit) | ||
| 499 | # | ||
| 500 | |||
| 501 | # | ||
| 502 | # Token Ring devices | ||
| 503 | # | ||
| 504 | |||
| 505 | # | ||
| 506 | # Wireless LAN (non-hamradio) | ||
| 507 | # | ||
| 508 | # CONFIG_NET_RADIO is not set | ||
| 509 | |||
| 510 | # | ||
| 511 | # Wan interfaces | ||
| 512 | # | 442 | # |
| 443 | # CONFIG_WLAN_PRE80211 is not set | ||
| 444 | # CONFIG_WLAN_80211 is not set | ||
| 513 | # CONFIG_WAN is not set | 445 | # CONFIG_WAN is not set |
| 514 | # CONFIG_PPP is not set | 446 | # CONFIG_PPP is not set |
| 515 | # CONFIG_SLIP is not set | 447 | # CONFIG_SLIP is not set |
| @@ -517,15 +449,7 @@ CONFIG_SMC91X=y | |||
| 517 | # CONFIG_NETCONSOLE is not set | 449 | # CONFIG_NETCONSOLE is not set |
| 518 | # CONFIG_NETPOLL is not set | 450 | # CONFIG_NETPOLL is not set |
| 519 | # CONFIG_NET_POLL_CONTROLLER is not set | 451 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 520 | |||
| 521 | # | ||
| 522 | # ISDN subsystem | ||
| 523 | # | ||
| 524 | # CONFIG_ISDN is not set | 452 | # CONFIG_ISDN is not set |
| 525 | |||
| 526 | # | ||
| 527 | # Telephony Support | ||
| 528 | # | ||
| 529 | # CONFIG_PHONE is not set | 453 | # CONFIG_PHONE is not set |
| 530 | 454 | ||
| 531 | # | 455 | # |
| @@ -533,6 +457,7 @@ CONFIG_SMC91X=y | |||
| 533 | # | 457 | # |
| 534 | CONFIG_INPUT=y | 458 | CONFIG_INPUT=y |
| 535 | # CONFIG_INPUT_FF_MEMLESS is not set | 459 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 460 | # CONFIG_INPUT_POLLDEV is not set | ||
| 536 | 461 | ||
| 537 | # | 462 | # |
| 538 | # Userland interfaces | 463 | # Userland interfaces |
| @@ -549,6 +474,7 @@ CONFIG_INPUT=y | |||
| 549 | # CONFIG_INPUT_KEYBOARD is not set | 474 | # CONFIG_INPUT_KEYBOARD is not set |
| 550 | # CONFIG_INPUT_MOUSE is not set | 475 | # CONFIG_INPUT_MOUSE is not set |
| 551 | # CONFIG_INPUT_JOYSTICK is not set | 476 | # CONFIG_INPUT_JOYSTICK is not set |
| 477 | # CONFIG_INPUT_TABLET is not set | ||
| 552 | # CONFIG_INPUT_TOUCHSCREEN is not set | 478 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 553 | # CONFIG_INPUT_MISC is not set | 479 | # CONFIG_INPUT_MISC is not set |
| 554 | 480 | ||
| @@ -587,35 +513,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y | |||
| 587 | CONFIG_UNIX98_PTYS=y | 513 | CONFIG_UNIX98_PTYS=y |
| 588 | CONFIG_LEGACY_PTYS=y | 514 | CONFIG_LEGACY_PTYS=y |
| 589 | CONFIG_LEGACY_PTY_COUNT=256 | 515 | CONFIG_LEGACY_PTY_COUNT=256 |
| 590 | |||
| 591 | # | ||
| 592 | # IPMI | ||
| 593 | # | ||
| 594 | # CONFIG_IPMI_HANDLER is not set | 516 | # CONFIG_IPMI_HANDLER is not set |
| 595 | |||
| 596 | # | ||
| 597 | # Watchdog Cards | ||
| 598 | # | ||
| 599 | # CONFIG_WATCHDOG is not set | 517 | # CONFIG_WATCHDOG is not set |
| 600 | CONFIG_HW_RANDOM=y | 518 | CONFIG_HW_RANDOM=y |
| 601 | # CONFIG_RTC is not set | 519 | # CONFIG_RTC is not set |
| 602 | CONFIG_DS1302=y | 520 | CONFIG_DS1302=y |
| 603 | # CONFIG_DTLK is not set | ||
| 604 | # CONFIG_R3964 is not set | 521 | # CONFIG_R3964 is not set |
| 605 | |||
| 606 | # | ||
| 607 | # Ftape, the floppy tape device driver | ||
| 608 | # | ||
| 609 | # CONFIG_RAW_DRIVER is not set | 522 | # CONFIG_RAW_DRIVER is not set |
| 610 | |||
| 611 | # | ||
| 612 | # TPM devices | ||
| 613 | # | ||
| 614 | # CONFIG_TCG_TPM is not set | 523 | # CONFIG_TCG_TPM is not set |
| 615 | |||
| 616 | # | ||
| 617 | # I2C support | ||
| 618 | # | ||
| 619 | # CONFIG_I2C is not set | 524 | # CONFIG_I2C is not set |
| 620 | 525 | ||
| 621 | # | 526 | # |
| @@ -623,65 +528,76 @@ CONFIG_DS1302=y | |||
| 623 | # | 528 | # |
| 624 | # CONFIG_SPI is not set | 529 | # CONFIG_SPI is not set |
| 625 | # CONFIG_SPI_MASTER is not set | 530 | # CONFIG_SPI_MASTER is not set |
| 626 | |||
| 627 | # | ||
| 628 | # Dallas's 1-wire bus | ||
| 629 | # | ||
| 630 | # CONFIG_W1 is not set | 531 | # CONFIG_W1 is not set |
| 631 | 532 | # CONFIG_POWER_SUPPLY is not set | |
| 632 | # | ||
| 633 | # Hardware Monitoring support | ||
| 634 | # | ||
| 635 | CONFIG_HWMON=y | 533 | CONFIG_HWMON=y |
| 636 | # CONFIG_HWMON_VID is not set | 534 | # CONFIG_HWMON_VID is not set |
| 637 | # CONFIG_SENSORS_ABITUGURU is not set | 535 | # CONFIG_SENSORS_ABITUGURU is not set |
| 536 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 638 | # CONFIG_SENSORS_F71805F is not set | 537 | # CONFIG_SENSORS_F71805F is not set |
| 538 | # CONFIG_SENSORS_IT87 is not set | ||
| 539 | # CONFIG_SENSORS_PC87360 is not set | ||
| 540 | # CONFIG_SENSORS_PC87427 is not set | ||
| 541 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 542 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 639 | # CONFIG_SENSORS_VT1211 is not set | 543 | # CONFIG_SENSORS_VT1211 is not set |
| 544 | # CONFIG_SENSORS_W83627HF is not set | ||
| 545 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 640 | # CONFIG_HWMON_DEBUG_CHIP is not set | 546 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 641 | 547 | ||
| 642 | # | 548 | # |
| 549 | # Multifunction device drivers | ||
| 550 | # | ||
| 551 | # CONFIG_MFD_SM501 is not set | ||
| 552 | |||
| 553 | # | ||
| 643 | # Multimedia devices | 554 | # Multimedia devices |
| 644 | # | 555 | # |
| 645 | CONFIG_VIDEO_DEV=m | 556 | CONFIG_VIDEO_DEV=m |
| 646 | CONFIG_VIDEO_V4L1=y | 557 | CONFIG_VIDEO_V4L1=y |
| 647 | CONFIG_VIDEO_V4L1_COMPAT=y | 558 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 648 | CONFIG_VIDEO_V4L2=y | 559 | CONFIG_VIDEO_V4L2=y |
| 649 | 560 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | |
| 650 | # | ||
| 651 | # Video Capture Adapters | ||
| 652 | # | ||
| 653 | |||
| 654 | # | ||
| 655 | # Video Capture Adapters | ||
| 656 | # | ||
| 657 | # CONFIG_VIDEO_ADV_DEBUG is not set | 561 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 658 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 562 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 659 | # CONFIG_VIDEO_VIVI is not set | ||
| 660 | # CONFIG_VIDEO_CPIA is not set | 563 | # CONFIG_VIDEO_CPIA is not set |
| 661 | CONFIG_VIDEO_M32R_AR=m | 564 | CONFIG_VIDEO_M32R_AR=m |
| 662 | CONFIG_VIDEO_M32R_AR_M64278=m | 565 | CONFIG_VIDEO_M32R_AR_M64278=m |
| 566 | CONFIG_RADIO_ADAPTERS=y | ||
| 567 | # CONFIG_DVB_CORE is not set | ||
| 568 | CONFIG_DAB=y | ||
| 663 | 569 | ||
| 664 | # | 570 | # |
| 665 | # Radio Adapters | 571 | # Graphics support |
| 666 | # | ||
| 667 | |||
| 668 | # | ||
| 669 | # Digital Video Broadcasting Devices | ||
| 670 | # | 572 | # |
| 671 | # CONFIG_DVB is not set | 573 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 672 | 574 | ||
| 673 | # | 575 | # |
| 674 | # Graphics support | 576 | # Display device support |
| 675 | # | 577 | # |
| 676 | CONFIG_FIRMWARE_EDID=y | 578 | # CONFIG_DISPLAY_SUPPORT is not set |
| 579 | # CONFIG_VGASTATE is not set | ||
| 580 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 677 | CONFIG_FB=y | 581 | CONFIG_FB=y |
| 582 | CONFIG_FIRMWARE_EDID=y | ||
| 583 | # CONFIG_FB_DDC is not set | ||
| 678 | CONFIG_FB_CFB_FILLRECT=y | 584 | CONFIG_FB_CFB_FILLRECT=y |
| 679 | CONFIG_FB_CFB_COPYAREA=y | 585 | CONFIG_FB_CFB_COPYAREA=y |
| 680 | CONFIG_FB_CFB_IMAGEBLIT=y | 586 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 587 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 588 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 589 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 590 | # CONFIG_FB_SYS_FOPS is not set | ||
| 591 | CONFIG_FB_DEFERRED_IO=y | ||
| 592 | # CONFIG_FB_SVGALIB is not set | ||
| 681 | # CONFIG_FB_MACMODES is not set | 593 | # CONFIG_FB_MACMODES is not set |
| 682 | # CONFIG_FB_BACKLIGHT is not set | 594 | # CONFIG_FB_BACKLIGHT is not set |
| 683 | # CONFIG_FB_MODE_HELPERS is not set | 595 | # CONFIG_FB_MODE_HELPERS is not set |
| 684 | # CONFIG_FB_TILEBLITTING is not set | 596 | # CONFIG_FB_TILEBLITTING is not set |
| 597 | |||
| 598 | # | ||
| 599 | # Frame buffer hardware drivers | ||
| 600 | # | ||
| 685 | CONFIG_FB_S1D13XXX=y | 601 | CONFIG_FB_S1D13XXX=y |
| 686 | # CONFIG_FB_VIRTUAL is not set | 602 | # CONFIG_FB_VIRTUAL is not set |
| 687 | 603 | ||
| @@ -691,29 +607,25 @@ CONFIG_FB_S1D13XXX=y | |||
| 691 | # CONFIG_VGA_CONSOLE is not set | 607 | # CONFIG_VGA_CONSOLE is not set |
| 692 | CONFIG_DUMMY_CONSOLE=y | 608 | CONFIG_DUMMY_CONSOLE=y |
| 693 | CONFIG_FRAMEBUFFER_CONSOLE=y | 609 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 610 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 694 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 611 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 695 | # CONFIG_FONTS is not set | 612 | # CONFIG_FONTS is not set |
| 696 | CONFIG_FONT_8x8=y | 613 | CONFIG_FONT_8x8=y |
| 697 | CONFIG_FONT_8x16=y | 614 | CONFIG_FONT_8x16=y |
| 698 | |||
| 699 | # | ||
| 700 | # Logo configuration | ||
| 701 | # | ||
| 702 | CONFIG_LOGO=y | 615 | CONFIG_LOGO=y |
| 703 | CONFIG_LOGO_LINUX_MONO=y | 616 | CONFIG_LOGO_LINUX_MONO=y |
| 704 | CONFIG_LOGO_LINUX_VGA16=y | 617 | CONFIG_LOGO_LINUX_VGA16=y |
| 705 | CONFIG_LOGO_LINUX_CLUT224=y | 618 | CONFIG_LOGO_LINUX_CLUT224=y |
| 706 | CONFIG_LOGO_M32R_CLUT224=y | 619 | CONFIG_LOGO_M32R_CLUT224=y |
| 707 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 708 | 620 | ||
| 709 | # | 621 | # |
| 710 | # Sound | 622 | # Sound |
| 711 | # | 623 | # |
| 712 | # CONFIG_SOUND is not set | 624 | # CONFIG_SOUND is not set |
| 713 | 625 | CONFIG_HID_SUPPORT=y | |
| 714 | # | 626 | CONFIG_HID=y |
| 715 | # USB support | 627 | # CONFIG_HID_DEBUG is not set |
| 716 | # | 628 | CONFIG_USB_SUPPORT=y |
| 717 | # CONFIG_USB_ARCH_HAS_HCD is not set | 629 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 718 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 630 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 719 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 631 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -726,35 +638,20 @@ CONFIG_LOGO_M32R_CLUT224=y | |||
| 726 | # USB Gadget Support | 638 | # USB Gadget Support |
| 727 | # | 639 | # |
| 728 | # CONFIG_USB_GADGET is not set | 640 | # CONFIG_USB_GADGET is not set |
| 729 | |||
| 730 | # | ||
| 731 | # MMC/SD Card support | ||
| 732 | # | ||
| 733 | CONFIG_MMC=y | 641 | CONFIG_MMC=y |
| 734 | CONFIG_MMC_DEBUG=y | 642 | CONFIG_MMC_DEBUG=y |
| 735 | CONFIG_MMC_BLOCK=y | 643 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| 736 | # CONFIG_MMC_TIFM_SD is not set | ||
| 737 | |||
| 738 | # | ||
| 739 | # LED devices | ||
| 740 | # | ||
| 741 | # CONFIG_NEW_LEDS is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # LED drivers | ||
| 745 | # | ||
| 746 | 644 | ||
| 747 | # | 645 | # |
| 748 | # LED Triggers | 646 | # MMC/SD Card Drivers |
| 749 | # | ||
| 750 | |||
| 751 | # | ||
| 752 | # InfiniBand support | ||
| 753 | # | 647 | # |
| 648 | CONFIG_MMC_BLOCK=y | ||
| 649 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 754 | 650 | ||
| 755 | # | 651 | # |
| 756 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 652 | # MMC/SD Host Controller Drivers |
| 757 | # | 653 | # |
| 654 | # CONFIG_NEW_LEDS is not set | ||
| 758 | 655 | ||
| 759 | # | 656 | # |
| 760 | # Real Time Clock | 657 | # Real Time Clock |
| @@ -762,17 +659,9 @@ CONFIG_MMC_BLOCK=y | |||
| 762 | # CONFIG_RTC_CLASS is not set | 659 | # CONFIG_RTC_CLASS is not set |
| 763 | 660 | ||
| 764 | # | 661 | # |
| 765 | # DMA Engine support | 662 | # Userspace I/O |
| 766 | # | ||
| 767 | # CONFIG_DMA_ENGINE is not set | ||
| 768 | |||
| 769 | # | ||
| 770 | # DMA Clients | ||
| 771 | # | ||
| 772 | |||
| 773 | # | ||
| 774 | # DMA Devices | ||
| 775 | # | 663 | # |
| 664 | # CONFIG_UIO is not set | ||
| 776 | 665 | ||
| 777 | # | 666 | # |
| 778 | # File systems | 667 | # File systems |
| @@ -849,7 +738,6 @@ CONFIG_RAMFS=y | |||
| 849 | # CONFIG_BEFS_FS is not set | 738 | # CONFIG_BEFS_FS is not set |
| 850 | # CONFIG_BFS_FS is not set | 739 | # CONFIG_BFS_FS is not set |
| 851 | # CONFIG_EFS_FS is not set | 740 | # CONFIG_EFS_FS is not set |
| 852 | # CONFIG_JFFS_FS is not set | ||
| 853 | # CONFIG_JFFS2_FS is not set | 741 | # CONFIG_JFFS2_FS is not set |
| 854 | # CONFIG_CRAMFS is not set | 742 | # CONFIG_CRAMFS is not set |
| 855 | # CONFIG_VXFS_FS is not set | 743 | # CONFIG_VXFS_FS is not set |
| @@ -872,6 +760,7 @@ CONFIG_LOCKD=y | |||
| 872 | CONFIG_LOCKD_V4=y | 760 | CONFIG_LOCKD_V4=y |
| 873 | CONFIG_NFS_COMMON=y | 761 | CONFIG_NFS_COMMON=y |
| 874 | CONFIG_SUNRPC=y | 762 | CONFIG_SUNRPC=y |
| 763 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 875 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 764 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 876 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 765 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 877 | # CONFIG_SMB_FS is not set | 766 | # CONFIG_SMB_FS is not set |
| @@ -879,7 +768,6 @@ CONFIG_SUNRPC=y | |||
| 879 | # CONFIG_NCP_FS is not set | 768 | # CONFIG_NCP_FS is not set |
| 880 | # CONFIG_CODA_FS is not set | 769 | # CONFIG_CODA_FS is not set |
| 881 | # CONFIG_AFS_FS is not set | 770 | # CONFIG_AFS_FS is not set |
| 882 | # CONFIG_9P_FS is not set | ||
| 883 | 771 | ||
| 884 | # | 772 | # |
| 885 | # Partition Types | 773 | # Partition Types |
| @@ -932,6 +820,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 932 | # CONFIG_NLS_UTF8 is not set | 820 | # CONFIG_NLS_UTF8 is not set |
| 933 | 821 | ||
| 934 | # | 822 | # |
| 823 | # Distributed Lock Manager | ||
| 824 | # | ||
| 825 | # CONFIG_DLM is not set | ||
| 826 | |||
| 827 | # | ||
| 935 | # Profiling support | 828 | # Profiling support |
| 936 | # | 829 | # |
| 937 | CONFIG_PROFILING=y | 830 | CONFIG_PROFILING=y |
| @@ -944,29 +837,27 @@ CONFIG_OPROFILE=y | |||
| 944 | CONFIG_ENABLE_MUST_CHECK=y | 837 | CONFIG_ENABLE_MUST_CHECK=y |
| 945 | # CONFIG_MAGIC_SYSRQ is not set | 838 | # CONFIG_MAGIC_SYSRQ is not set |
| 946 | # CONFIG_UNUSED_SYMBOLS is not set | 839 | # CONFIG_UNUSED_SYMBOLS is not set |
| 840 | # CONFIG_DEBUG_FS is not set | ||
| 841 | # CONFIG_HEADERS_CHECK is not set | ||
| 947 | # CONFIG_DEBUG_KERNEL is not set | 842 | # CONFIG_DEBUG_KERNEL is not set |
| 948 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 949 | # CONFIG_DEBUG_BUGVERBOSE is not set | 843 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 950 | # CONFIG_DEBUG_FS is not set | ||
| 951 | # CONFIG_FRAME_POINTER is not set | 844 | # CONFIG_FRAME_POINTER is not set |
| 952 | # CONFIG_UNWIND_INFO is not set | ||
| 953 | # CONFIG_HEADERS_CHECK is not set | ||
| 954 | 845 | ||
| 955 | # | 846 | # |
| 956 | # Security options | 847 | # Security options |
| 957 | # | 848 | # |
| 958 | # CONFIG_KEYS is not set | 849 | # CONFIG_KEYS is not set |
| 959 | # CONFIG_SECURITY is not set | 850 | # CONFIG_SECURITY is not set |
| 960 | |||
| 961 | # | ||
| 962 | # Cryptographic options | ||
| 963 | # | ||
| 964 | # CONFIG_CRYPTO is not set | 851 | # CONFIG_CRYPTO is not set |
| 965 | 852 | ||
| 966 | # | 853 | # |
| 967 | # Library routines | 854 | # Library routines |
| 968 | # | 855 | # |
| 856 | CONFIG_BITREVERSE=y | ||
| 969 | # CONFIG_CRC_CCITT is not set | 857 | # CONFIG_CRC_CCITT is not set |
| 970 | # CONFIG_CRC16 is not set | 858 | # CONFIG_CRC16 is not set |
| 859 | # CONFIG_CRC_ITU_T is not set | ||
| 971 | CONFIG_CRC32=y | 860 | CONFIG_CRC32=y |
| 861 | # CONFIG_CRC7 is not set | ||
| 972 | # CONFIG_LIBCRC32C is not set | 862 | # CONFIG_LIBCRC32C is not set |
| 863 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.up b/arch/m32r/configs/m32700ut.up_defconfig index 190f961d33e2..a31823ffe29e 100644 --- a/arch/m32r/m32700ut/defconfig.m32700ut.up +++ b/arch/m32r/configs/m32700ut.up_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Tue Dec 12 12:07:08 2006 | 4 | # Wed Aug 1 17:22:35 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -24,18 +27,19 @@ CONFIG_LOCALVERSION="" | |||
| 24 | CONFIG_LOCALVERSION_AUTO=y | 27 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | CONFIG_SWAP=y | 28 | CONFIG_SWAP=y |
| 26 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 27 | # CONFIG_IPC_NS is not set | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 28 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
| 29 | CONFIG_BSD_PROCESS_ACCT=y | 32 | CONFIG_BSD_PROCESS_ACCT=y |
| 30 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 31 | # CONFIG_TASKSTATS is not set | 34 | # CONFIG_TASKSTATS is not set |
| 32 | # CONFIG_UTS_NS is not set | 35 | # CONFIG_USER_NS is not set |
| 33 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 34 | CONFIG_IKCONFIG=y | 37 | CONFIG_IKCONFIG=y |
| 35 | CONFIG_IKCONFIG_PROC=y | 38 | CONFIG_IKCONFIG_PROC=y |
| 39 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 36 | CONFIG_SYSFS_DEPRECATED=y | 40 | CONFIG_SYSFS_DEPRECATED=y |
| 37 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
| 38 | CONFIG_INITRAMFS_SOURCE="" | 42 | # CONFIG_BLK_DEV_INITRD is not set |
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 40 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| 41 | CONFIG_EMBEDDED=y | 45 | CONFIG_EMBEDDED=y |
| @@ -47,29 +51,29 @@ CONFIG_BUG=y | |||
| 47 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 48 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 49 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 50 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 51 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 52 | CONFIG_SLAB=y | ||
| 53 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 54 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 55 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 56 | # CONFIG_SLOB is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # Loadable module support | ||
| 60 | # | ||
| 61 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 62 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 64 | # CONFIG_MODVERSIONS is not set | 69 | # CONFIG_MODVERSIONS is not set |
| 65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 66 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 67 | |||
| 68 | # | ||
| 69 | # Block layer | ||
| 70 | # | ||
| 71 | CONFIG_BLOCK=y | 72 | CONFIG_BLOCK=y |
| 73 | # CONFIG_LBD is not set | ||
| 72 | # CONFIG_BLK_DEV_IO_TRACE is not set | 74 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 75 | # CONFIG_LSF is not set | ||
| 76 | # CONFIG_BLK_DEV_BSG is not set | ||
| 73 | 77 | ||
| 74 | # | 78 | # |
| 75 | # IO Schedulers | 79 | # IO Schedulers |
| @@ -122,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 126 | # CONFIG_SPARSEMEM_STATIC is not set |
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 127 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 128 | # CONFIG_RESOURCES_64BIT is not set |
| 129 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 130 | CONFIG_BOUNCE=y | ||
| 131 | CONFIG_VIRT_TO_BUS=y | ||
| 125 | CONFIG_IRAM_START=0x00f00000 | 132 | CONFIG_IRAM_START=0x00f00000 |
| 126 | CONFIG_IRAM_SIZE=0x00080000 | 133 | CONFIG_IRAM_SIZE=0x00080000 |
| 127 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 134 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 128 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 135 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 136 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 137 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 129 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 138 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 130 | CONFIG_GENERIC_HWEIGHT=y | 139 | CONFIG_GENERIC_HWEIGHT=y |
| 131 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 140 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 141 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 132 | CONFIG_PREEMPT=y | 142 | CONFIG_PREEMPT=y |
| 133 | # CONFIG_SMP is not set | 143 | # CONFIG_SMP is not set |
| 134 | CONFIG_NODES_SHIFT=1 | 144 | CONFIG_NODES_SHIFT=1 |
| @@ -136,6 +146,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 136 | # | 146 | # |
| 137 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 147 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 138 | # | 148 | # |
| 149 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 139 | # CONFIG_ISA is not set | 150 | # CONFIG_ISA is not set |
| 140 | 151 | ||
| 141 | # | 152 | # |
| @@ -144,10 +155,6 @@ CONFIG_NODES_SHIFT=1 | |||
| 144 | # CONFIG_PCCARD is not set | 155 | # CONFIG_PCCARD is not set |
| 145 | 156 | ||
| 146 | # | 157 | # |
| 147 | # PCI Hotplug Support | ||
| 148 | # | ||
| 149 | |||
| 150 | # | ||
| 151 | # Executable file formats | 158 | # Executable file formats |
| 152 | # | 159 | # |
| 153 | CONFIG_BINFMT_ELF=y | 160 | CONFIG_BINFMT_ELF=y |
| @@ -161,13 +168,13 @@ CONFIG_NET=y | |||
| 161 | # | 168 | # |
| 162 | # Networking options | 169 | # Networking options |
| 163 | # | 170 | # |
| 164 | # CONFIG_NETDEBUG is not set | ||
| 165 | CONFIG_PACKET=y | 171 | CONFIG_PACKET=y |
| 166 | # CONFIG_PACKET_MMAP is not set | 172 | # CONFIG_PACKET_MMAP is not set |
| 167 | CONFIG_UNIX=y | 173 | CONFIG_UNIX=y |
| 168 | CONFIG_XFRM=y | 174 | CONFIG_XFRM=y |
| 169 | # CONFIG_XFRM_USER is not set | 175 | # CONFIG_XFRM_USER is not set |
| 170 | # CONFIG_XFRM_SUB_POLICY is not set | 176 | # CONFIG_XFRM_SUB_POLICY is not set |
| 177 | # CONFIG_XFRM_MIGRATE is not set | ||
| 171 | # CONFIG_NET_KEY is not set | 178 | # CONFIG_NET_KEY is not set |
| 172 | CONFIG_INET=y | 179 | CONFIG_INET=y |
| 173 | # CONFIG_IP_MULTICAST is not set | 180 | # CONFIG_IP_MULTICAST is not set |
| @@ -200,20 +207,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 200 | # CONFIG_INET6_TUNNEL is not set | 207 | # CONFIG_INET6_TUNNEL is not set |
| 201 | # CONFIG_NETWORK_SECMARK is not set | 208 | # CONFIG_NETWORK_SECMARK is not set |
| 202 | # CONFIG_NETFILTER is not set | 209 | # CONFIG_NETFILTER is not set |
| 203 | |||
| 204 | # | ||
| 205 | # DCCP Configuration (EXPERIMENTAL) | ||
| 206 | # | ||
| 207 | # CONFIG_IP_DCCP is not set | 210 | # CONFIG_IP_DCCP is not set |
| 208 | |||
| 209 | # | ||
| 210 | # SCTP Configuration (EXPERIMENTAL) | ||
| 211 | # | ||
| 212 | # CONFIG_IP_SCTP is not set | 211 | # CONFIG_IP_SCTP is not set |
| 213 | |||
| 214 | # | ||
| 215 | # TIPC Configuration (EXPERIMENTAL) | ||
| 216 | # | ||
| 217 | # CONFIG_TIPC is not set | 212 | # CONFIG_TIPC is not set |
| 218 | # CONFIG_ATM is not set | 213 | # CONFIG_ATM is not set |
| 219 | # CONFIG_BRIDGE is not set | 214 | # CONFIG_BRIDGE is not set |
| @@ -239,7 +234,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 239 | # CONFIG_HAMRADIO is not set | 234 | # CONFIG_HAMRADIO is not set |
| 240 | # CONFIG_IRDA is not set | 235 | # CONFIG_IRDA is not set |
| 241 | # CONFIG_BT is not set | 236 | # CONFIG_BT is not set |
| 237 | # CONFIG_AF_RXRPC is not set | ||
| 238 | |||
| 239 | # | ||
| 240 | # Wireless | ||
| 241 | # | ||
| 242 | # CONFIG_CFG80211 is not set | ||
| 243 | # CONFIG_WIRELESS_EXT is not set | ||
| 244 | # CONFIG_MAC80211 is not set | ||
| 242 | # CONFIG_IEEE80211 is not set | 245 | # CONFIG_IEEE80211 is not set |
| 246 | # CONFIG_RFKILL is not set | ||
| 247 | # CONFIG_NET_9P is not set | ||
| 243 | 248 | ||
| 244 | # | 249 | # |
| 245 | # Device Drivers | 250 | # Device Drivers |
| @@ -252,15 +257,7 @@ CONFIG_STANDALONE=y | |||
| 252 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 257 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 253 | CONFIG_FW_LOADER=y | 258 | CONFIG_FW_LOADER=y |
| 254 | # CONFIG_SYS_HYPERVISOR is not set | 259 | # CONFIG_SYS_HYPERVISOR is not set |
| 255 | |||
| 256 | # | ||
| 257 | # Connector - unified userspace <-> kernelspace linker | ||
| 258 | # | ||
| 259 | # CONFIG_CONNECTOR is not set | 260 | # CONFIG_CONNECTOR is not set |
| 260 | |||
| 261 | # | ||
| 262 | # Memory Technology Devices (MTD) | ||
| 263 | # | ||
| 264 | CONFIG_MTD=y | 261 | CONFIG_MTD=y |
| 265 | # CONFIG_MTD_DEBUG is not set | 262 | # CONFIG_MTD_DEBUG is not set |
| 266 | # CONFIG_MTD_CONCAT is not set | 263 | # CONFIG_MTD_CONCAT is not set |
| @@ -275,6 +272,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 275 | # User Modules And Translation Layers | 272 | # User Modules And Translation Layers |
| 276 | # | 273 | # |
| 277 | # CONFIG_MTD_CHAR is not set | 274 | # CONFIG_MTD_CHAR is not set |
| 275 | CONFIG_MTD_BLKDEVS=y | ||
| 278 | CONFIG_MTD_BLOCK=y | 276 | CONFIG_MTD_BLOCK=y |
| 279 | # CONFIG_FTL is not set | 277 | # CONFIG_FTL is not set |
| 280 | # CONFIG_NFTL is not set | 278 | # CONFIG_NFTL is not set |
| @@ -311,7 +309,6 @@ CONFIG_MTD_CFI_UTIL=m | |||
| 311 | # CONFIG_MTD_RAM is not set | 309 | # CONFIG_MTD_RAM is not set |
| 312 | # CONFIG_MTD_ROM is not set | 310 | # CONFIG_MTD_ROM is not set |
| 313 | # CONFIG_MTD_ABSENT is not set | 311 | # CONFIG_MTD_ABSENT is not set |
| 314 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 315 | 312 | ||
| 316 | # | 313 | # |
| 317 | # Mapping drivers for chip access | 314 | # Mapping drivers for chip access |
| @@ -334,29 +331,15 @@ CONFIG_MTD_CFI_UTIL=m | |||
| 334 | # CONFIG_MTD_DOC2000 is not set | 331 | # CONFIG_MTD_DOC2000 is not set |
| 335 | # CONFIG_MTD_DOC2001 is not set | 332 | # CONFIG_MTD_DOC2001 is not set |
| 336 | # CONFIG_MTD_DOC2001PLUS is not set | 333 | # CONFIG_MTD_DOC2001PLUS is not set |
| 337 | |||
| 338 | # | ||
| 339 | # NAND Flash Device Drivers | ||
| 340 | # | ||
| 341 | # CONFIG_MTD_NAND is not set | 334 | # CONFIG_MTD_NAND is not set |
| 342 | |||
| 343 | # | ||
| 344 | # OneNAND Flash Device Drivers | ||
| 345 | # | ||
| 346 | # CONFIG_MTD_ONENAND is not set | 335 | # CONFIG_MTD_ONENAND is not set |
| 347 | 336 | ||
| 348 | # | 337 | # |
| 349 | # Parallel port support | 338 | # UBI - Unsorted block images |
| 350 | # | 339 | # |
| 340 | # CONFIG_MTD_UBI is not set | ||
| 351 | # CONFIG_PARPORT is not set | 341 | # CONFIG_PARPORT is not set |
| 352 | 342 | CONFIG_BLK_DEV=y | |
| 353 | # | ||
| 354 | # Plug and Play support | ||
| 355 | # | ||
| 356 | |||
| 357 | # | ||
| 358 | # Block devices | ||
| 359 | # | ||
| 360 | # CONFIG_BLK_DEV_COW_COMMON is not set | 343 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 361 | CONFIG_BLK_DEV_LOOP=y | 344 | CONFIG_BLK_DEV_LOOP=y |
| 362 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 345 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -365,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 365 | CONFIG_BLK_DEV_RAM_COUNT=16 | 348 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 366 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 349 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 367 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 350 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 368 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 369 | # CONFIG_CDROM_PKTCDVD is not set | 351 | # CONFIG_CDROM_PKTCDVD is not set |
| 370 | CONFIG_ATA_OVER_ETH=m | 352 | CONFIG_ATA_OVER_ETH=m |
| 371 | 353 | CONFIG_MISC_DEVICES=y | |
| 372 | # | 354 | # CONFIG_EEPROM_93CX6 is not set |
| 373 | # Misc devices | ||
| 374 | # | ||
| 375 | # CONFIG_TIFM_CORE is not set | ||
| 376 | |||
| 377 | # | ||
| 378 | # ATA/ATAPI/MFM/RLL support | ||
| 379 | # | ||
| 380 | CONFIG_IDE=y | 355 | CONFIG_IDE=y |
| 381 | CONFIG_IDE_MAX_HWIFS=4 | 356 | CONFIG_IDE_MAX_HWIFS=4 |
| 382 | CONFIG_BLK_DEV_IDE=y | 357 | CONFIG_BLK_DEV_IDE=y |
| @@ -392,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 392 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 367 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 393 | # CONFIG_BLK_DEV_IDESCSI is not set | 368 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 394 | # CONFIG_IDE_TASK_IOCTL is not set | 369 | # CONFIG_IDE_TASK_IOCTL is not set |
| 370 | CONFIG_IDE_PROC_FS=y | ||
| 395 | 371 | ||
| 396 | # | 372 | # |
| 397 | # IDE chipset support/bugfixes | 373 | # IDE chipset support/bugfixes |
| 398 | # | 374 | # |
| 399 | CONFIG_IDE_GENERIC=y | 375 | CONFIG_IDE_GENERIC=y |
| 376 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 400 | # CONFIG_IDE_ARM is not set | 377 | # CONFIG_IDE_ARM is not set |
| 401 | # CONFIG_BLK_DEV_IDEDMA is not set | 378 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 402 | # CONFIG_IDEDMA_AUTO is not set | ||
| 403 | # CONFIG_BLK_DEV_HD is not set | 379 | # CONFIG_BLK_DEV_HD is not set |
| 404 | 380 | ||
| 405 | # | 381 | # |
| @@ -407,6 +383,8 @@ CONFIG_IDE_GENERIC=y | |||
| 407 | # | 383 | # |
| 408 | # CONFIG_RAID_ATTRS is not set | 384 | # CONFIG_RAID_ATTRS is not set |
| 409 | CONFIG_SCSI=m | 385 | CONFIG_SCSI=m |
| 386 | # CONFIG_SCSI_DMA is not set | ||
| 387 | # CONFIG_SCSI_TGT is not set | ||
| 410 | # CONFIG_SCSI_NETLINK is not set | 388 | # CONFIG_SCSI_NETLINK is not set |
| 411 | CONFIG_SCSI_PROC_FS=y | 389 | CONFIG_SCSI_PROC_FS=y |
| 412 | 390 | ||
| @@ -427,6 +405,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 427 | CONFIG_SCSI_MULTI_LUN=y | 405 | CONFIG_SCSI_MULTI_LUN=y |
| 428 | # CONFIG_SCSI_CONSTANTS is not set | 406 | # CONFIG_SCSI_CONSTANTS is not set |
| 429 | # CONFIG_SCSI_LOGGING is not set | 407 | # CONFIG_SCSI_LOGGING is not set |
| 408 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 409 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 430 | 410 | ||
| 431 | # | 411 | # |
| 432 | # SCSI Transports | 412 | # SCSI Transports |
| @@ -434,79 +414,31 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 434 | # CONFIG_SCSI_SPI_ATTRS is not set | 414 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 435 | # CONFIG_SCSI_FC_ATTRS is not set | 415 | # CONFIG_SCSI_FC_ATTRS is not set |
| 436 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 416 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 437 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 438 | # CONFIG_SCSI_SAS_LIBSAS is not set | 417 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 439 | 418 | CONFIG_SCSI_LOWLEVEL=y | |
| 440 | # | ||
| 441 | # SCSI low-level drivers | ||
| 442 | # | ||
| 443 | # CONFIG_ISCSI_TCP is not set | 419 | # CONFIG_ISCSI_TCP is not set |
| 444 | # CONFIG_SCSI_DEBUG is not set | 420 | # CONFIG_SCSI_DEBUG is not set |
| 445 | |||
| 446 | # | ||
| 447 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 448 | # | ||
| 449 | |||
| 450 | # | ||
| 451 | # Multi-device support (RAID and LVM) | ||
| 452 | # | ||
| 453 | # CONFIG_MD is not set | 421 | # CONFIG_MD is not set |
| 454 | |||
| 455 | # | ||
| 456 | # Fusion MPT device support | ||
| 457 | # | ||
| 458 | # CONFIG_FUSION is not set | ||
| 459 | |||
| 460 | # | ||
| 461 | # IEEE 1394 (FireWire) support | ||
| 462 | # | ||
| 463 | |||
| 464 | # | ||
| 465 | # I2O device support | ||
| 466 | # | ||
| 467 | |||
| 468 | # | ||
| 469 | # Network device support | ||
| 470 | # | ||
| 471 | CONFIG_NETDEVICES=y | 422 | CONFIG_NETDEVICES=y |
| 423 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 472 | # CONFIG_DUMMY is not set | 424 | # CONFIG_DUMMY is not set |
| 473 | # CONFIG_BONDING is not set | 425 | # CONFIG_BONDING is not set |
| 426 | # CONFIG_MACVLAN is not set | ||
| 474 | # CONFIG_EQUALIZER is not set | 427 | # CONFIG_EQUALIZER is not set |
| 475 | # CONFIG_TUN is not set | 428 | # CONFIG_TUN is not set |
| 476 | |||
| 477 | # | ||
| 478 | # PHY device support | ||
| 479 | # | ||
| 480 | # CONFIG_PHYLIB is not set | 429 | # CONFIG_PHYLIB is not set |
| 481 | |||
| 482 | # | ||
| 483 | # Ethernet (10 or 100Mbit) | ||
| 484 | # | ||
| 485 | CONFIG_NET_ETHERNET=y | 430 | CONFIG_NET_ETHERNET=y |
| 486 | CONFIG_MII=y | 431 | CONFIG_MII=y |
| 487 | CONFIG_SMC91X=y | 432 | CONFIG_SMC91X=y |
| 488 | # CONFIG_NE2000 is not set | 433 | # CONFIG_NE2000 is not set |
| 434 | CONFIG_NETDEV_1000=y | ||
| 435 | CONFIG_NETDEV_10000=y | ||
| 489 | 436 | ||
| 490 | # | 437 | # |
| 491 | # Ethernet (1000 Mbit) | 438 | # Wireless LAN |
| 492 | # | ||
| 493 | |||
| 494 | # | ||
| 495 | # Ethernet (10000 Mbit) | ||
| 496 | # | ||
| 497 | |||
| 498 | # | ||
| 499 | # Token Ring devices | ||
| 500 | # | ||
| 501 | |||
| 502 | # | ||
| 503 | # Wireless LAN (non-hamradio) | ||
| 504 | # | ||
| 505 | # CONFIG_NET_RADIO is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # Wan interfaces | ||
| 509 | # | 439 | # |
| 440 | # CONFIG_WLAN_PRE80211 is not set | ||
| 441 | # CONFIG_WLAN_80211 is not set | ||
| 510 | # CONFIG_WAN is not set | 442 | # CONFIG_WAN is not set |
| 511 | # CONFIG_PPP is not set | 443 | # CONFIG_PPP is not set |
| 512 | # CONFIG_SLIP is not set | 444 | # CONFIG_SLIP is not set |
| @@ -514,15 +446,7 @@ CONFIG_SMC91X=y | |||
| 514 | # CONFIG_NETCONSOLE is not set | 446 | # CONFIG_NETCONSOLE is not set |
| 515 | # CONFIG_NETPOLL is not set | 447 | # CONFIG_NETPOLL is not set |
| 516 | # CONFIG_NET_POLL_CONTROLLER is not set | 448 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 517 | |||
| 518 | # | ||
| 519 | # ISDN subsystem | ||
| 520 | # | ||
| 521 | # CONFIG_ISDN is not set | 449 | # CONFIG_ISDN is not set |
| 522 | |||
| 523 | # | ||
| 524 | # Telephony Support | ||
| 525 | # | ||
| 526 | # CONFIG_PHONE is not set | 450 | # CONFIG_PHONE is not set |
| 527 | 451 | ||
| 528 | # | 452 | # |
| @@ -530,6 +454,7 @@ CONFIG_SMC91X=y | |||
| 530 | # | 454 | # |
| 531 | CONFIG_INPUT=y | 455 | CONFIG_INPUT=y |
| 532 | # CONFIG_INPUT_FF_MEMLESS is not set | 456 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 457 | # CONFIG_INPUT_POLLDEV is not set | ||
| 533 | 458 | ||
| 534 | # | 459 | # |
| 535 | # Userland interfaces | 460 | # Userland interfaces |
| @@ -546,6 +471,7 @@ CONFIG_INPUT=y | |||
| 546 | # CONFIG_INPUT_KEYBOARD is not set | 471 | # CONFIG_INPUT_KEYBOARD is not set |
| 547 | # CONFIG_INPUT_MOUSE is not set | 472 | # CONFIG_INPUT_MOUSE is not set |
| 548 | # CONFIG_INPUT_JOYSTICK is not set | 473 | # CONFIG_INPUT_JOYSTICK is not set |
| 474 | # CONFIG_INPUT_TABLET is not set | ||
| 549 | # CONFIG_INPUT_TOUCHSCREEN is not set | 475 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 550 | # CONFIG_INPUT_MISC is not set | 476 | # CONFIG_INPUT_MISC is not set |
| 551 | 477 | ||
| @@ -584,35 +510,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y | |||
| 584 | CONFIG_UNIX98_PTYS=y | 510 | CONFIG_UNIX98_PTYS=y |
| 585 | CONFIG_LEGACY_PTYS=y | 511 | CONFIG_LEGACY_PTYS=y |
| 586 | CONFIG_LEGACY_PTY_COUNT=256 | 512 | CONFIG_LEGACY_PTY_COUNT=256 |
| 587 | |||
| 588 | # | ||
| 589 | # IPMI | ||
| 590 | # | ||
| 591 | # CONFIG_IPMI_HANDLER is not set | 513 | # CONFIG_IPMI_HANDLER is not set |
| 592 | |||
| 593 | # | ||
| 594 | # Watchdog Cards | ||
| 595 | # | ||
| 596 | # CONFIG_WATCHDOG is not set | 514 | # CONFIG_WATCHDOG is not set |
| 597 | CONFIG_HW_RANDOM=y | 515 | CONFIG_HW_RANDOM=y |
| 598 | # CONFIG_RTC is not set | 516 | # CONFIG_RTC is not set |
| 599 | CONFIG_DS1302=y | 517 | CONFIG_DS1302=y |
| 600 | # CONFIG_DTLK is not set | ||
| 601 | # CONFIG_R3964 is not set | 518 | # CONFIG_R3964 is not set |
| 602 | |||
| 603 | # | ||
| 604 | # Ftape, the floppy tape device driver | ||
| 605 | # | ||
| 606 | # CONFIG_RAW_DRIVER is not set | 519 | # CONFIG_RAW_DRIVER is not set |
| 607 | |||
| 608 | # | ||
| 609 | # TPM devices | ||
| 610 | # | ||
| 611 | # CONFIG_TCG_TPM is not set | 520 | # CONFIG_TCG_TPM is not set |
| 612 | |||
| 613 | # | ||
| 614 | # I2C support | ||
| 615 | # | ||
| 616 | # CONFIG_I2C is not set | 521 | # CONFIG_I2C is not set |
| 617 | 522 | ||
| 618 | # | 523 | # |
| @@ -620,65 +525,76 @@ CONFIG_DS1302=y | |||
| 620 | # | 525 | # |
| 621 | # CONFIG_SPI is not set | 526 | # CONFIG_SPI is not set |
| 622 | # CONFIG_SPI_MASTER is not set | 527 | # CONFIG_SPI_MASTER is not set |
| 623 | |||
| 624 | # | ||
| 625 | # Dallas's 1-wire bus | ||
| 626 | # | ||
| 627 | # CONFIG_W1 is not set | 528 | # CONFIG_W1 is not set |
| 628 | 529 | # CONFIG_POWER_SUPPLY is not set | |
| 629 | # | ||
| 630 | # Hardware Monitoring support | ||
| 631 | # | ||
| 632 | CONFIG_HWMON=y | 530 | CONFIG_HWMON=y |
| 633 | # CONFIG_HWMON_VID is not set | 531 | # CONFIG_HWMON_VID is not set |
| 634 | # CONFIG_SENSORS_ABITUGURU is not set | 532 | # CONFIG_SENSORS_ABITUGURU is not set |
| 533 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 635 | # CONFIG_SENSORS_F71805F is not set | 534 | # CONFIG_SENSORS_F71805F is not set |
| 535 | # CONFIG_SENSORS_IT87 is not set | ||
| 536 | # CONFIG_SENSORS_PC87360 is not set | ||
| 537 | # CONFIG_SENSORS_PC87427 is not set | ||
| 538 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 539 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 636 | # CONFIG_SENSORS_VT1211 is not set | 540 | # CONFIG_SENSORS_VT1211 is not set |
| 541 | # CONFIG_SENSORS_W83627HF is not set | ||
| 542 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 637 | # CONFIG_HWMON_DEBUG_CHIP is not set | 543 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 638 | 544 | ||
| 639 | # | 545 | # |
| 546 | # Multifunction device drivers | ||
| 547 | # | ||
| 548 | # CONFIG_MFD_SM501 is not set | ||
| 549 | |||
| 550 | # | ||
| 640 | # Multimedia devices | 551 | # Multimedia devices |
| 641 | # | 552 | # |
| 642 | CONFIG_VIDEO_DEV=m | 553 | CONFIG_VIDEO_DEV=m |
| 643 | CONFIG_VIDEO_V4L1=y | 554 | CONFIG_VIDEO_V4L1=y |
| 644 | CONFIG_VIDEO_V4L1_COMPAT=y | 555 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 645 | CONFIG_VIDEO_V4L2=y | 556 | CONFIG_VIDEO_V4L2=y |
| 646 | 557 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | |
| 647 | # | ||
| 648 | # Video Capture Adapters | ||
| 649 | # | ||
| 650 | |||
| 651 | # | ||
| 652 | # Video Capture Adapters | ||
| 653 | # | ||
| 654 | # CONFIG_VIDEO_ADV_DEBUG is not set | 558 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 655 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 559 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 656 | # CONFIG_VIDEO_VIVI is not set | ||
| 657 | # CONFIG_VIDEO_CPIA is not set | 560 | # CONFIG_VIDEO_CPIA is not set |
| 658 | CONFIG_VIDEO_M32R_AR=m | 561 | CONFIG_VIDEO_M32R_AR=m |
| 659 | CONFIG_VIDEO_M32R_AR_M64278=m | 562 | CONFIG_VIDEO_M32R_AR_M64278=m |
| 563 | CONFIG_RADIO_ADAPTERS=y | ||
| 564 | # CONFIG_DVB_CORE is not set | ||
| 565 | CONFIG_DAB=y | ||
| 660 | 566 | ||
| 661 | # | 567 | # |
| 662 | # Radio Adapters | 568 | # Graphics support |
| 663 | # | ||
| 664 | |||
| 665 | # | ||
| 666 | # Digital Video Broadcasting Devices | ||
| 667 | # | 569 | # |
| 668 | # CONFIG_DVB is not set | 570 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 669 | 571 | ||
| 670 | # | 572 | # |
| 671 | # Graphics support | 573 | # Display device support |
| 672 | # | 574 | # |
| 673 | CONFIG_FIRMWARE_EDID=y | 575 | # CONFIG_DISPLAY_SUPPORT is not set |
| 576 | # CONFIG_VGASTATE is not set | ||
| 577 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 674 | CONFIG_FB=y | 578 | CONFIG_FB=y |
| 579 | CONFIG_FIRMWARE_EDID=y | ||
| 580 | # CONFIG_FB_DDC is not set | ||
| 675 | CONFIG_FB_CFB_FILLRECT=y | 581 | CONFIG_FB_CFB_FILLRECT=y |
| 676 | CONFIG_FB_CFB_COPYAREA=y | 582 | CONFIG_FB_CFB_COPYAREA=y |
| 677 | CONFIG_FB_CFB_IMAGEBLIT=y | 583 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 584 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 585 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 586 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 587 | # CONFIG_FB_SYS_FOPS is not set | ||
| 588 | CONFIG_FB_DEFERRED_IO=y | ||
| 589 | # CONFIG_FB_SVGALIB is not set | ||
| 678 | # CONFIG_FB_MACMODES is not set | 590 | # CONFIG_FB_MACMODES is not set |
| 679 | # CONFIG_FB_BACKLIGHT is not set | 591 | # CONFIG_FB_BACKLIGHT is not set |
| 680 | # CONFIG_FB_MODE_HELPERS is not set | 592 | # CONFIG_FB_MODE_HELPERS is not set |
| 681 | # CONFIG_FB_TILEBLITTING is not set | 593 | # CONFIG_FB_TILEBLITTING is not set |
| 594 | |||
| 595 | # | ||
| 596 | # Frame buffer hardware drivers | ||
| 597 | # | ||
| 682 | CONFIG_FB_S1D13XXX=y | 598 | CONFIG_FB_S1D13XXX=y |
| 683 | # CONFIG_FB_VIRTUAL is not set | 599 | # CONFIG_FB_VIRTUAL is not set |
| 684 | 600 | ||
| @@ -688,29 +604,25 @@ CONFIG_FB_S1D13XXX=y | |||
| 688 | # CONFIG_VGA_CONSOLE is not set | 604 | # CONFIG_VGA_CONSOLE is not set |
| 689 | CONFIG_DUMMY_CONSOLE=y | 605 | CONFIG_DUMMY_CONSOLE=y |
| 690 | CONFIG_FRAMEBUFFER_CONSOLE=y | 606 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 607 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 691 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 608 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 692 | # CONFIG_FONTS is not set | 609 | # CONFIG_FONTS is not set |
| 693 | CONFIG_FONT_8x8=y | 610 | CONFIG_FONT_8x8=y |
| 694 | CONFIG_FONT_8x16=y | 611 | CONFIG_FONT_8x16=y |
| 695 | |||
| 696 | # | ||
| 697 | # Logo configuration | ||
| 698 | # | ||
| 699 | CONFIG_LOGO=y | 612 | CONFIG_LOGO=y |
| 700 | CONFIG_LOGO_LINUX_MONO=y | 613 | CONFIG_LOGO_LINUX_MONO=y |
| 701 | CONFIG_LOGO_LINUX_VGA16=y | 614 | CONFIG_LOGO_LINUX_VGA16=y |
| 702 | CONFIG_LOGO_LINUX_CLUT224=y | 615 | CONFIG_LOGO_LINUX_CLUT224=y |
| 703 | CONFIG_LOGO_M32R_CLUT224=y | 616 | CONFIG_LOGO_M32R_CLUT224=y |
| 704 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 705 | 617 | ||
| 706 | # | 618 | # |
| 707 | # Sound | 619 | # Sound |
| 708 | # | 620 | # |
| 709 | # CONFIG_SOUND is not set | 621 | # CONFIG_SOUND is not set |
| 710 | 622 | CONFIG_HID_SUPPORT=y | |
| 711 | # | 623 | CONFIG_HID=y |
| 712 | # USB support | 624 | # CONFIG_HID_DEBUG is not set |
| 713 | # | 625 | CONFIG_USB_SUPPORT=y |
| 714 | # CONFIG_USB_ARCH_HAS_HCD is not set | 626 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 715 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 627 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 716 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 628 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -723,35 +635,20 @@ CONFIG_LOGO_M32R_CLUT224=y | |||
| 723 | # USB Gadget Support | 635 | # USB Gadget Support |
| 724 | # | 636 | # |
| 725 | # CONFIG_USB_GADGET is not set | 637 | # CONFIG_USB_GADGET is not set |
| 726 | |||
| 727 | # | ||
| 728 | # MMC/SD Card support | ||
| 729 | # | ||
| 730 | CONFIG_MMC=y | 638 | CONFIG_MMC=y |
| 731 | CONFIG_MMC_DEBUG=y | 639 | CONFIG_MMC_DEBUG=y |
| 732 | CONFIG_MMC_BLOCK=y | 640 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| 733 | # CONFIG_MMC_TIFM_SD is not set | ||
| 734 | |||
| 735 | # | ||
| 736 | # LED devices | ||
| 737 | # | ||
| 738 | # CONFIG_NEW_LEDS is not set | ||
| 739 | |||
| 740 | # | ||
| 741 | # LED drivers | ||
| 742 | # | ||
| 743 | 641 | ||
| 744 | # | 642 | # |
| 745 | # LED Triggers | 643 | # MMC/SD Card Drivers |
| 746 | # | ||
| 747 | |||
| 748 | # | ||
| 749 | # InfiniBand support | ||
| 750 | # | 644 | # |
| 645 | CONFIG_MMC_BLOCK=y | ||
| 646 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 751 | 647 | ||
| 752 | # | 648 | # |
| 753 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 649 | # MMC/SD Host Controller Drivers |
| 754 | # | 650 | # |
| 651 | # CONFIG_NEW_LEDS is not set | ||
| 755 | 652 | ||
| 756 | # | 653 | # |
| 757 | # Real Time Clock | 654 | # Real Time Clock |
| @@ -759,17 +656,9 @@ CONFIG_MMC_BLOCK=y | |||
| 759 | # CONFIG_RTC_CLASS is not set | 656 | # CONFIG_RTC_CLASS is not set |
| 760 | 657 | ||
| 761 | # | 658 | # |
| 762 | # DMA Engine support | 659 | # Userspace I/O |
| 763 | # | ||
| 764 | # CONFIG_DMA_ENGINE is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # DMA Clients | ||
| 768 | # | ||
| 769 | |||
| 770 | # | ||
| 771 | # DMA Devices | ||
| 772 | # | 660 | # |
| 661 | # CONFIG_UIO is not set | ||
| 773 | 662 | ||
| 774 | # | 663 | # |
| 775 | # File systems | 664 | # File systems |
| @@ -846,7 +735,6 @@ CONFIG_RAMFS=y | |||
| 846 | # CONFIG_BEFS_FS is not set | 735 | # CONFIG_BEFS_FS is not set |
| 847 | # CONFIG_BFS_FS is not set | 736 | # CONFIG_BFS_FS is not set |
| 848 | # CONFIG_EFS_FS is not set | 737 | # CONFIG_EFS_FS is not set |
| 849 | # CONFIG_JFFS_FS is not set | ||
| 850 | # CONFIG_JFFS2_FS is not set | 738 | # CONFIG_JFFS2_FS is not set |
| 851 | # CONFIG_CRAMFS is not set | 739 | # CONFIG_CRAMFS is not set |
| 852 | # CONFIG_VXFS_FS is not set | 740 | # CONFIG_VXFS_FS is not set |
| @@ -869,6 +757,7 @@ CONFIG_LOCKD=y | |||
| 869 | CONFIG_LOCKD_V4=y | 757 | CONFIG_LOCKD_V4=y |
| 870 | CONFIG_NFS_COMMON=y | 758 | CONFIG_NFS_COMMON=y |
| 871 | CONFIG_SUNRPC=y | 759 | CONFIG_SUNRPC=y |
| 760 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 872 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 761 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 873 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 762 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 874 | # CONFIG_SMB_FS is not set | 763 | # CONFIG_SMB_FS is not set |
| @@ -876,7 +765,6 @@ CONFIG_SUNRPC=y | |||
| 876 | # CONFIG_NCP_FS is not set | 765 | # CONFIG_NCP_FS is not set |
| 877 | # CONFIG_CODA_FS is not set | 766 | # CONFIG_CODA_FS is not set |
| 878 | # CONFIG_AFS_FS is not set | 767 | # CONFIG_AFS_FS is not set |
| 879 | # CONFIG_9P_FS is not set | ||
| 880 | 768 | ||
| 881 | # | 769 | # |
| 882 | # Partition Types | 770 | # Partition Types |
| @@ -929,6 +817,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 929 | # CONFIG_NLS_UTF8 is not set | 817 | # CONFIG_NLS_UTF8 is not set |
| 930 | 818 | ||
| 931 | # | 819 | # |
| 820 | # Distributed Lock Manager | ||
| 821 | # | ||
| 822 | # CONFIG_DLM is not set | ||
| 823 | |||
| 824 | # | ||
| 932 | # Profiling support | 825 | # Profiling support |
| 933 | # | 826 | # |
| 934 | CONFIG_PROFILING=y | 827 | CONFIG_PROFILING=y |
| @@ -941,29 +834,27 @@ CONFIG_OPROFILE=y | |||
| 941 | CONFIG_ENABLE_MUST_CHECK=y | 834 | CONFIG_ENABLE_MUST_CHECK=y |
| 942 | # CONFIG_MAGIC_SYSRQ is not set | 835 | # CONFIG_MAGIC_SYSRQ is not set |
| 943 | # CONFIG_UNUSED_SYMBOLS is not set | 836 | # CONFIG_UNUSED_SYMBOLS is not set |
| 837 | # CONFIG_DEBUG_FS is not set | ||
| 838 | # CONFIG_HEADERS_CHECK is not set | ||
| 944 | # CONFIG_DEBUG_KERNEL is not set | 839 | # CONFIG_DEBUG_KERNEL is not set |
| 945 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 946 | # CONFIG_DEBUG_BUGVERBOSE is not set | 840 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 947 | # CONFIG_DEBUG_FS is not set | ||
| 948 | # CONFIG_FRAME_POINTER is not set | 841 | # CONFIG_FRAME_POINTER is not set |
| 949 | # CONFIG_UNWIND_INFO is not set | ||
| 950 | # CONFIG_HEADERS_CHECK is not set | ||
| 951 | 842 | ||
| 952 | # | 843 | # |
| 953 | # Security options | 844 | # Security options |
| 954 | # | 845 | # |
| 955 | # CONFIG_KEYS is not set | 846 | # CONFIG_KEYS is not set |
| 956 | # CONFIG_SECURITY is not set | 847 | # CONFIG_SECURITY is not set |
| 957 | |||
| 958 | # | ||
| 959 | # Cryptographic options | ||
| 960 | # | ||
| 961 | # CONFIG_CRYPTO is not set | 848 | # CONFIG_CRYPTO is not set |
| 962 | 849 | ||
| 963 | # | 850 | # |
| 964 | # Library routines | 851 | # Library routines |
| 965 | # | 852 | # |
| 853 | CONFIG_BITREVERSE=y | ||
| 966 | # CONFIG_CRC_CCITT is not set | 854 | # CONFIG_CRC_CCITT is not set |
| 967 | # CONFIG_CRC16 is not set | 855 | # CONFIG_CRC16 is not set |
| 856 | # CONFIG_CRC_ITU_T is not set | ||
| 968 | CONFIG_CRC32=y | 857 | CONFIG_CRC32=y |
| 858 | # CONFIG_CRC7 is not set | ||
| 969 | # CONFIG_LIBCRC32C is not set | 859 | # CONFIG_LIBCRC32C is not set |
| 860 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/mappi/defconfig.nommu b/arch/m32r/configs/mappi.nommu_defconfig index fbf6c384c9d0..e3379de1f0c8 100644 --- a/arch/m32r/mappi/defconfig.nommu +++ b/arch/m32r/configs/mappi.nommu_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 17:57:45 2006 | 4 | # Wed Aug 1 17:22:36 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -27,13 +30,14 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 27 | CONFIG_BSD_PROCESS_ACCT=y | 30 | CONFIG_BSD_PROCESS_ACCT=y |
| 28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 31 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 29 | # CONFIG_TASKSTATS is not set | 32 | # CONFIG_TASKSTATS is not set |
| 30 | # CONFIG_UTS_NS is not set | 33 | # CONFIG_USER_NS is not set |
| 31 | # CONFIG_AUDIT is not set | 34 | # CONFIG_AUDIT is not set |
| 32 | CONFIG_IKCONFIG=y | 35 | CONFIG_IKCONFIG=y |
| 33 | # CONFIG_IKCONFIG_PROC is not set | 36 | # CONFIG_IKCONFIG_PROC is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 34 | CONFIG_SYSFS_DEPRECATED=y | 38 | CONFIG_SYSFS_DEPRECATED=y |
| 35 | # CONFIG_RELAY is not set | 39 | # CONFIG_RELAY is not set |
| 36 | CONFIG_INITRAMFS_SOURCE="" | 40 | # CONFIG_BLK_DEV_INITRD is not set |
| 37 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 38 | CONFIG_SYSCTL=y | 42 | CONFIG_SYSCTL=y |
| 39 | CONFIG_EMBEDDED=y | 43 | CONFIG_EMBEDDED=y |
| @@ -45,28 +49,28 @@ CONFIG_BUG=y | |||
| 45 | CONFIG_ELF_CORE=y | 49 | CONFIG_ELF_CORE=y |
| 46 | CONFIG_BASE_FULL=y | 50 | CONFIG_BASE_FULL=y |
| 47 | # CONFIG_FUTEX is not set | 51 | # CONFIG_FUTEX is not set |
| 52 | CONFIG_ANON_INODES=y | ||
| 48 | # CONFIG_EPOLL is not set | 53 | # CONFIG_EPOLL is not set |
| 49 | CONFIG_SLAB=y | 54 | CONFIG_SIGNALFD=y |
| 55 | CONFIG_TIMERFD=y | ||
| 56 | CONFIG_EVENTFD=y | ||
| 50 | CONFIG_VM_EVENT_COUNTERS=y | 57 | CONFIG_VM_EVENT_COUNTERS=y |
| 58 | CONFIG_SLAB=y | ||
| 59 | # CONFIG_SLUB is not set | ||
| 60 | # CONFIG_SLOB is not set | ||
| 51 | CONFIG_TINY_SHMEM=y | 61 | CONFIG_TINY_SHMEM=y |
| 52 | CONFIG_BASE_SMALL=0 | 62 | CONFIG_BASE_SMALL=0 |
| 53 | # CONFIG_SLOB is not set | ||
| 54 | |||
| 55 | # | ||
| 56 | # Loadable module support | ||
| 57 | # | ||
| 58 | CONFIG_MODULES=y | 63 | CONFIG_MODULES=y |
| 59 | CONFIG_MODULE_UNLOAD=y | 64 | CONFIG_MODULE_UNLOAD=y |
| 60 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 65 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 61 | # CONFIG_MODVERSIONS is not set | 66 | # CONFIG_MODVERSIONS is not set |
| 62 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 67 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 63 | CONFIG_KMOD=y | 68 | CONFIG_KMOD=y |
| 64 | |||
| 65 | # | ||
| 66 | # Block layer | ||
| 67 | # | ||
| 68 | CONFIG_BLOCK=y | 69 | CONFIG_BLOCK=y |
| 70 | # CONFIG_LBD is not set | ||
| 69 | # CONFIG_BLK_DEV_IO_TRACE is not set | 71 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 72 | # CONFIG_LSF is not set | ||
| 73 | # CONFIG_BLK_DEV_BSG is not set | ||
| 70 | 74 | ||
| 71 | # | 75 | # |
| 72 | # IO Schedulers | 76 | # IO Schedulers |
| @@ -119,13 +123,18 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 119 | # CONFIG_SPARSEMEM_STATIC is not set | 123 | # CONFIG_SPARSEMEM_STATIC is not set |
| 120 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 124 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 121 | # CONFIG_RESOURCES_64BIT is not set | 125 | # CONFIG_RESOURCES_64BIT is not set |
| 126 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 127 | CONFIG_VIRT_TO_BUS=y | ||
| 122 | CONFIG_IRAM_START=0x00f00000 | 128 | CONFIG_IRAM_START=0x00f00000 |
| 123 | CONFIG_IRAM_SIZE=0x00080000 | 129 | CONFIG_IRAM_SIZE=0x00080000 |
| 124 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 130 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 125 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 131 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 132 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 133 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 126 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 134 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 127 | CONFIG_GENERIC_HWEIGHT=y | 135 | CONFIG_GENERIC_HWEIGHT=y |
| 128 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 136 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 137 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 129 | CONFIG_PREEMPT=y | 138 | CONFIG_PREEMPT=y |
| 130 | # CONFIG_SMP is not set | 139 | # CONFIG_SMP is not set |
| 131 | CONFIG_NODES_SHIFT=1 | 140 | CONFIG_NODES_SHIFT=1 |
| @@ -133,6 +142,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 133 | # | 142 | # |
| 134 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 143 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 135 | # | 144 | # |
| 145 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 136 | # CONFIG_ISA is not set | 146 | # CONFIG_ISA is not set |
| 137 | 147 | ||
| 138 | # | 148 | # |
| @@ -151,10 +161,6 @@ CONFIG_M32R_PCC=y | |||
| 151 | CONFIG_PCCARD_NONSTATIC=y | 161 | CONFIG_PCCARD_NONSTATIC=y |
| 152 | 162 | ||
| 153 | # | 163 | # |
| 154 | # PCI Hotplug Support | ||
| 155 | # | ||
| 156 | |||
| 157 | # | ||
| 158 | # Executable file formats | 164 | # Executable file formats |
| 159 | # | 165 | # |
| 160 | CONFIG_BINFMT_FLAT=y | 166 | CONFIG_BINFMT_FLAT=y |
| @@ -170,13 +176,13 @@ CONFIG_NET=y | |||
| 170 | # | 176 | # |
| 171 | # Networking options | 177 | # Networking options |
| 172 | # | 178 | # |
| 173 | # CONFIG_NETDEBUG is not set | ||
| 174 | CONFIG_PACKET=y | 179 | CONFIG_PACKET=y |
| 175 | # CONFIG_PACKET_MMAP is not set | 180 | # CONFIG_PACKET_MMAP is not set |
| 176 | CONFIG_UNIX=y | 181 | CONFIG_UNIX=y |
| 177 | CONFIG_XFRM=y | 182 | CONFIG_XFRM=y |
| 178 | # CONFIG_XFRM_USER is not set | 183 | # CONFIG_XFRM_USER is not set |
| 179 | # CONFIG_XFRM_SUB_POLICY is not set | 184 | # CONFIG_XFRM_SUB_POLICY is not set |
| 185 | # CONFIG_XFRM_MIGRATE is not set | ||
| 180 | # CONFIG_NET_KEY is not set | 186 | # CONFIG_NET_KEY is not set |
| 181 | CONFIG_INET=y | 187 | CONFIG_INET=y |
| 182 | # CONFIG_IP_MULTICAST is not set | 188 | # CONFIG_IP_MULTICAST is not set |
| @@ -209,20 +215,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 209 | # CONFIG_INET6_TUNNEL is not set | 215 | # CONFIG_INET6_TUNNEL is not set |
| 210 | # CONFIG_NETWORK_SECMARK is not set | 216 | # CONFIG_NETWORK_SECMARK is not set |
| 211 | # CONFIG_NETFILTER is not set | 217 | # CONFIG_NETFILTER is not set |
| 212 | |||
| 213 | # | ||
| 214 | # DCCP Configuration (EXPERIMENTAL) | ||
| 215 | # | ||
| 216 | # CONFIG_IP_DCCP is not set | 218 | # CONFIG_IP_DCCP is not set |
| 217 | |||
| 218 | # | ||
| 219 | # SCTP Configuration (EXPERIMENTAL) | ||
| 220 | # | ||
| 221 | # CONFIG_IP_SCTP is not set | 219 | # CONFIG_IP_SCTP is not set |
| 222 | |||
| 223 | # | ||
| 224 | # TIPC Configuration (EXPERIMENTAL) | ||
| 225 | # | ||
| 226 | # CONFIG_TIPC is not set | 220 | # CONFIG_TIPC is not set |
| 227 | # CONFIG_ATM is not set | 221 | # CONFIG_ATM is not set |
| 228 | # CONFIG_BRIDGE is not set | 222 | # CONFIG_BRIDGE is not set |
| @@ -248,7 +242,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 248 | # CONFIG_HAMRADIO is not set | 242 | # CONFIG_HAMRADIO is not set |
| 249 | # CONFIG_IRDA is not set | 243 | # CONFIG_IRDA is not set |
| 250 | # CONFIG_BT is not set | 244 | # CONFIG_BT is not set |
| 245 | # CONFIG_AF_RXRPC is not set | ||
| 246 | |||
| 247 | # | ||
| 248 | # Wireless | ||
| 249 | # | ||
| 250 | # CONFIG_CFG80211 is not set | ||
| 251 | # CONFIG_WIRELESS_EXT is not set | ||
| 252 | # CONFIG_MAC80211 is not set | ||
| 251 | # CONFIG_IEEE80211 is not set | 253 | # CONFIG_IEEE80211 is not set |
| 254 | # CONFIG_RFKILL is not set | ||
| 255 | # CONFIG_NET_9P is not set | ||
| 252 | 256 | ||
| 253 | # | 257 | # |
| 254 | # Device Drivers | 258 | # Device Drivers |
| @@ -261,29 +265,10 @@ CONFIG_STANDALONE=y | |||
| 261 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 265 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 262 | CONFIG_FW_LOADER=y | 266 | CONFIG_FW_LOADER=y |
| 263 | # CONFIG_SYS_HYPERVISOR is not set | 267 | # CONFIG_SYS_HYPERVISOR is not set |
| 264 | |||
| 265 | # | ||
| 266 | # Connector - unified userspace <-> kernelspace linker | ||
| 267 | # | ||
| 268 | # CONFIG_CONNECTOR is not set | 268 | # CONFIG_CONNECTOR is not set |
| 269 | |||
| 270 | # | ||
| 271 | # Memory Technology Devices (MTD) | ||
| 272 | # | ||
| 273 | # CONFIG_MTD is not set | 269 | # CONFIG_MTD is not set |
| 274 | |||
| 275 | # | ||
| 276 | # Parallel port support | ||
| 277 | # | ||
| 278 | # CONFIG_PARPORT is not set | 270 | # CONFIG_PARPORT is not set |
| 279 | 271 | CONFIG_BLK_DEV=y | |
| 280 | # | ||
| 281 | # Plug and Play support | ||
| 282 | # | ||
| 283 | |||
| 284 | # | ||
| 285 | # Block devices | ||
| 286 | # | ||
| 287 | # CONFIG_BLK_DEV_COW_COMMON is not set | 272 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 288 | CONFIG_BLK_DEV_LOOP=y | 273 | CONFIG_BLK_DEV_LOOP=y |
| 289 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 274 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -292,18 +277,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 292 | CONFIG_BLK_DEV_RAM_COUNT=16 | 277 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 293 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 278 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 294 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 279 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 295 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 296 | # CONFIG_CDROM_PKTCDVD is not set | 280 | # CONFIG_CDROM_PKTCDVD is not set |
| 297 | # CONFIG_ATA_OVER_ETH is not set | 281 | # CONFIG_ATA_OVER_ETH is not set |
| 298 | 282 | CONFIG_MISC_DEVICES=y | |
| 299 | # | 283 | # CONFIG_EEPROM_93CX6 is not set |
| 300 | # Misc devices | ||
| 301 | # | ||
| 302 | # CONFIG_TIFM_CORE is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # ATA/ATAPI/MFM/RLL support | ||
| 306 | # | ||
| 307 | # CONFIG_IDE is not set | 284 | # CONFIG_IDE is not set |
| 308 | 285 | ||
| 309 | # | 286 | # |
| @@ -311,74 +288,26 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 311 | # | 288 | # |
| 312 | # CONFIG_RAID_ATTRS is not set | 289 | # CONFIG_RAID_ATTRS is not set |
| 313 | # CONFIG_SCSI is not set | 290 | # CONFIG_SCSI is not set |
| 291 | # CONFIG_SCSI_DMA is not set | ||
| 314 | # CONFIG_SCSI_NETLINK is not set | 292 | # CONFIG_SCSI_NETLINK is not set |
| 315 | |||
| 316 | # | ||
| 317 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 318 | # | ||
| 319 | |||
| 320 | # | ||
| 321 | # Multi-device support (RAID and LVM) | ||
| 322 | # | ||
| 323 | # CONFIG_MD is not set | 293 | # CONFIG_MD is not set |
| 324 | |||
| 325 | # | ||
| 326 | # Fusion MPT device support | ||
| 327 | # | ||
| 328 | # CONFIG_FUSION is not set | ||
| 329 | |||
| 330 | # | ||
| 331 | # IEEE 1394 (FireWire) support | ||
| 332 | # | ||
| 333 | |||
| 334 | # | ||
| 335 | # I2O device support | ||
| 336 | # | ||
| 337 | |||
| 338 | # | ||
| 339 | # Network device support | ||
| 340 | # | ||
| 341 | CONFIG_NETDEVICES=y | 294 | CONFIG_NETDEVICES=y |
| 295 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 342 | # CONFIG_DUMMY is not set | 296 | # CONFIG_DUMMY is not set |
| 343 | # CONFIG_BONDING is not set | 297 | # CONFIG_BONDING is not set |
| 298 | # CONFIG_MACVLAN is not set | ||
| 344 | # CONFIG_EQUALIZER is not set | 299 | # CONFIG_EQUALIZER is not set |
| 345 | # CONFIG_TUN is not set | 300 | # CONFIG_TUN is not set |
| 346 | |||
| 347 | # | ||
| 348 | # PHY device support | ||
| 349 | # | ||
| 350 | |||
| 351 | # | ||
| 352 | # Ethernet (10 or 100Mbit) | ||
| 353 | # | ||
| 354 | # CONFIG_NET_ETHERNET is not set | 301 | # CONFIG_NET_ETHERNET is not set |
| 355 | CONFIG_NE2000=y | 302 | CONFIG_NETDEV_1000=y |
| 356 | 303 | CONFIG_NETDEV_10000=y | |
| 357 | # | ||
| 358 | # Ethernet (1000 Mbit) | ||
| 359 | # | ||
| 360 | |||
| 361 | # | ||
| 362 | # Ethernet (10000 Mbit) | ||
| 363 | # | ||
| 364 | |||
| 365 | # | ||
| 366 | # Token Ring devices | ||
| 367 | # | ||
| 368 | |||
| 369 | # | ||
| 370 | # Wireless LAN (non-hamradio) | ||
| 371 | # | ||
| 372 | # CONFIG_NET_RADIO is not set | ||
| 373 | 304 | ||
| 374 | # | 305 | # |
| 375 | # PCMCIA network device support | 306 | # Wireless LAN |
| 376 | # | 307 | # |
| 308 | # CONFIG_WLAN_PRE80211 is not set | ||
| 309 | # CONFIG_WLAN_80211 is not set | ||
| 377 | # CONFIG_NET_PCMCIA is not set | 310 | # CONFIG_NET_PCMCIA is not set |
| 378 | |||
| 379 | # | ||
| 380 | # Wan interfaces | ||
| 381 | # | ||
| 382 | # CONFIG_WAN is not set | 311 | # CONFIG_WAN is not set |
| 383 | # CONFIG_PPP is not set | 312 | # CONFIG_PPP is not set |
| 384 | # CONFIG_SLIP is not set | 313 | # CONFIG_SLIP is not set |
| @@ -386,15 +315,7 @@ CONFIG_NE2000=y | |||
| 386 | # CONFIG_NETCONSOLE is not set | 315 | # CONFIG_NETCONSOLE is not set |
| 387 | # CONFIG_NETPOLL is not set | 316 | # CONFIG_NETPOLL is not set |
| 388 | # CONFIG_NET_POLL_CONTROLLER is not set | 317 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 389 | |||
| 390 | # | ||
| 391 | # ISDN subsystem | ||
| 392 | # | ||
| 393 | # CONFIG_ISDN is not set | 318 | # CONFIG_ISDN is not set |
| 394 | |||
| 395 | # | ||
| 396 | # Telephony Support | ||
| 397 | # | ||
| 398 | # CONFIG_PHONE is not set | 319 | # CONFIG_PHONE is not set |
| 399 | 320 | ||
| 400 | # | 321 | # |
| @@ -402,6 +323,7 @@ CONFIG_NE2000=y | |||
| 402 | # | 323 | # |
| 403 | CONFIG_INPUT=y | 324 | CONFIG_INPUT=y |
| 404 | # CONFIG_INPUT_FF_MEMLESS is not set | 325 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 326 | # CONFIG_INPUT_POLLDEV is not set | ||
| 405 | 327 | ||
| 406 | # | 328 | # |
| 407 | # Userland interfaces | 329 | # Userland interfaces |
| @@ -418,6 +340,7 @@ CONFIG_INPUT=y | |||
| 418 | # CONFIG_INPUT_KEYBOARD is not set | 340 | # CONFIG_INPUT_KEYBOARD is not set |
| 419 | # CONFIG_INPUT_MOUSE is not set | 341 | # CONFIG_INPUT_MOUSE is not set |
| 420 | # CONFIG_INPUT_JOYSTICK is not set | 342 | # CONFIG_INPUT_JOYSTICK is not set |
| 343 | # CONFIG_INPUT_TABLET is not set | ||
| 421 | # CONFIG_INPUT_TOUCHSCREEN is not set | 344 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 422 | # CONFIG_INPUT_MISC is not set | 345 | # CONFIG_INPUT_MISC is not set |
| 423 | 346 | ||
| @@ -452,41 +375,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 452 | CONFIG_UNIX98_PTYS=y | 375 | CONFIG_UNIX98_PTYS=y |
| 453 | CONFIG_LEGACY_PTYS=y | 376 | CONFIG_LEGACY_PTYS=y |
| 454 | CONFIG_LEGACY_PTY_COUNT=256 | 377 | CONFIG_LEGACY_PTY_COUNT=256 |
| 455 | |||
| 456 | # | ||
| 457 | # IPMI | ||
| 458 | # | ||
| 459 | # CONFIG_IPMI_HANDLER is not set | 378 | # CONFIG_IPMI_HANDLER is not set |
| 460 | |||
| 461 | # | ||
| 462 | # Watchdog Cards | ||
| 463 | # | ||
| 464 | # CONFIG_WATCHDOG is not set | 379 | # CONFIG_WATCHDOG is not set |
| 465 | CONFIG_HW_RANDOM=y | 380 | CONFIG_HW_RANDOM=y |
| 466 | # CONFIG_RTC is not set | 381 | # CONFIG_RTC is not set |
| 467 | # CONFIG_DTLK is not set | ||
| 468 | # CONFIG_R3964 is not set | 382 | # CONFIG_R3964 is not set |
| 469 | 383 | ||
| 470 | # | 384 | # |
| 471 | # Ftape, the floppy tape device driver | ||
| 472 | # | ||
| 473 | |||
| 474 | # | ||
| 475 | # PCMCIA character devices | 385 | # PCMCIA character devices |
| 476 | # | 386 | # |
| 477 | # CONFIG_SYNCLINK_CS is not set | 387 | # CONFIG_SYNCLINK_CS is not set |
| 478 | # CONFIG_CARDMAN_4000 is not set | 388 | # CONFIG_CARDMAN_4000 is not set |
| 479 | # CONFIG_CARDMAN_4040 is not set | 389 | # CONFIG_CARDMAN_4040 is not set |
| 480 | # CONFIG_RAW_DRIVER is not set | 390 | # CONFIG_RAW_DRIVER is not set |
| 481 | |||
| 482 | # | ||
| 483 | # TPM devices | ||
| 484 | # | ||
| 485 | # CONFIG_TCG_TPM is not set | 391 | # CONFIG_TCG_TPM is not set |
| 486 | |||
| 487 | # | ||
| 488 | # I2C support | ||
| 489 | # | ||
| 490 | # CONFIG_I2C is not set | 392 | # CONFIG_I2C is not set |
| 491 | 393 | ||
| 492 | # | 394 | # |
| @@ -494,47 +396,56 @@ CONFIG_HW_RANDOM=y | |||
| 494 | # | 396 | # |
| 495 | # CONFIG_SPI is not set | 397 | # CONFIG_SPI is not set |
| 496 | # CONFIG_SPI_MASTER is not set | 398 | # CONFIG_SPI_MASTER is not set |
| 497 | |||
| 498 | # | ||
| 499 | # Dallas's 1-wire bus | ||
| 500 | # | ||
| 501 | # CONFIG_W1 is not set | 399 | # CONFIG_W1 is not set |
| 502 | 400 | # CONFIG_POWER_SUPPLY is not set | |
| 503 | # | ||
| 504 | # Hardware Monitoring support | ||
| 505 | # | ||
| 506 | CONFIG_HWMON=y | 401 | CONFIG_HWMON=y |
| 507 | # CONFIG_HWMON_VID is not set | 402 | # CONFIG_HWMON_VID is not set |
| 508 | # CONFIG_SENSORS_ABITUGURU is not set | 403 | # CONFIG_SENSORS_ABITUGURU is not set |
| 404 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 509 | # CONFIG_SENSORS_F71805F is not set | 405 | # CONFIG_SENSORS_F71805F is not set |
| 406 | # CONFIG_SENSORS_IT87 is not set | ||
| 407 | # CONFIG_SENSORS_PC87360 is not set | ||
| 408 | # CONFIG_SENSORS_PC87427 is not set | ||
| 409 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 410 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 510 | # CONFIG_SENSORS_VT1211 is not set | 411 | # CONFIG_SENSORS_VT1211 is not set |
| 412 | # CONFIG_SENSORS_W83627HF is not set | ||
| 413 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 511 | # CONFIG_HWMON_DEBUG_CHIP is not set | 414 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 512 | 415 | ||
| 513 | # | 416 | # |
| 514 | # Multimedia devices | 417 | # Multifunction device drivers |
| 515 | # | 418 | # |
| 516 | # CONFIG_VIDEO_DEV is not set | 419 | # CONFIG_MFD_SM501 is not set |
| 517 | 420 | ||
| 518 | # | 421 | # |
| 519 | # Digital Video Broadcasting Devices | 422 | # Multimedia devices |
| 520 | # | 423 | # |
| 521 | # CONFIG_DVB is not set | 424 | # CONFIG_VIDEO_DEV is not set |
| 425 | # CONFIG_DVB_CORE is not set | ||
| 426 | CONFIG_DAB=y | ||
| 522 | 427 | ||
| 523 | # | 428 | # |
| 524 | # Graphics support | 429 | # Graphics support |
| 525 | # | 430 | # |
| 526 | CONFIG_FIRMWARE_EDID=y | ||
| 527 | # CONFIG_FB is not set | ||
| 528 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 431 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 529 | 432 | ||
| 530 | # | 433 | # |
| 531 | # Sound | 434 | # Display device support |
| 532 | # | 435 | # |
| 533 | # CONFIG_SOUND is not set | 436 | # CONFIG_DISPLAY_SUPPORT is not set |
| 437 | # CONFIG_VGASTATE is not set | ||
| 438 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 439 | # CONFIG_FB is not set | ||
| 534 | 440 | ||
| 535 | # | 441 | # |
| 536 | # USB support | 442 | # Sound |
| 537 | # | 443 | # |
| 444 | # CONFIG_SOUND is not set | ||
| 445 | CONFIG_HID_SUPPORT=y | ||
| 446 | CONFIG_HID=y | ||
| 447 | # CONFIG_HID_DEBUG is not set | ||
| 448 | CONFIG_USB_SUPPORT=y | ||
| 538 | # CONFIG_USB_ARCH_HAS_HCD is not set | 449 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 539 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 450 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 540 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 451 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -547,50 +458,18 @@ CONFIG_FIRMWARE_EDID=y | |||
| 547 | # USB Gadget Support | 458 | # USB Gadget Support |
| 548 | # | 459 | # |
| 549 | # CONFIG_USB_GADGET is not set | 460 | # CONFIG_USB_GADGET is not set |
| 550 | |||
| 551 | # | ||
| 552 | # MMC/SD Card support | ||
| 553 | # | ||
| 554 | # CONFIG_MMC is not set | 461 | # CONFIG_MMC is not set |
| 555 | |||
| 556 | # | ||
| 557 | # LED devices | ||
| 558 | # | ||
| 559 | # CONFIG_NEW_LEDS is not set | 462 | # CONFIG_NEW_LEDS is not set |
| 560 | 463 | ||
| 561 | # | 464 | # |
| 562 | # LED drivers | ||
| 563 | # | ||
| 564 | |||
| 565 | # | ||
| 566 | # LED Triggers | ||
| 567 | # | ||
| 568 | |||
| 569 | # | ||
| 570 | # InfiniBand support | ||
| 571 | # | ||
| 572 | |||
| 573 | # | ||
| 574 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 575 | # | ||
| 576 | |||
| 577 | # | ||
| 578 | # Real Time Clock | 465 | # Real Time Clock |
| 579 | # | 466 | # |
| 580 | # CONFIG_RTC_CLASS is not set | 467 | # CONFIG_RTC_CLASS is not set |
| 581 | 468 | ||
| 582 | # | 469 | # |
| 583 | # DMA Engine support | 470 | # Userspace I/O |
| 584 | # | ||
| 585 | # CONFIG_DMA_ENGINE is not set | ||
| 586 | |||
| 587 | # | ||
| 588 | # DMA Clients | ||
| 589 | # | ||
| 590 | |||
| 591 | # | ||
| 592 | # DMA Devices | ||
| 593 | # | 471 | # |
| 472 | # CONFIG_UIO is not set | ||
| 594 | 473 | ||
| 595 | # | 474 | # |
| 596 | # File systems | 475 | # File systems |
| @@ -676,6 +555,7 @@ CONFIG_LOCKD=y | |||
| 676 | CONFIG_LOCKD_V4=y | 555 | CONFIG_LOCKD_V4=y |
| 677 | CONFIG_NFS_COMMON=y | 556 | CONFIG_NFS_COMMON=y |
| 678 | CONFIG_SUNRPC=y | 557 | CONFIG_SUNRPC=y |
| 558 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 679 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 559 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 680 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 560 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 681 | # CONFIG_SMB_FS is not set | 561 | # CONFIG_SMB_FS is not set |
| @@ -683,7 +563,6 @@ CONFIG_SUNRPC=y | |||
| 683 | # CONFIG_NCP_FS is not set | 563 | # CONFIG_NCP_FS is not set |
| 684 | # CONFIG_CODA_FS is not set | 564 | # CONFIG_CODA_FS is not set |
| 685 | # CONFIG_AFS_FS is not set | 565 | # CONFIG_AFS_FS is not set |
| 686 | # CONFIG_9P_FS is not set | ||
| 687 | 566 | ||
| 688 | # | 567 | # |
| 689 | # Partition Types | 568 | # Partition Types |
| @@ -736,6 +615,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 736 | # CONFIG_NLS_UTF8 is not set | 615 | # CONFIG_NLS_UTF8 is not set |
| 737 | 616 | ||
| 738 | # | 617 | # |
| 618 | # Distributed Lock Manager | ||
| 619 | # | ||
| 620 | # CONFIG_DLM is not set | ||
| 621 | |||
| 622 | # | ||
| 739 | # Profiling support | 623 | # Profiling support |
| 740 | # | 624 | # |
| 741 | # CONFIG_PROFILING is not set | 625 | # CONFIG_PROFILING is not set |
| @@ -747,29 +631,27 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 747 | CONFIG_ENABLE_MUST_CHECK=y | 631 | CONFIG_ENABLE_MUST_CHECK=y |
| 748 | # CONFIG_MAGIC_SYSRQ is not set | 632 | # CONFIG_MAGIC_SYSRQ is not set |
| 749 | # CONFIG_UNUSED_SYMBOLS is not set | 633 | # CONFIG_UNUSED_SYMBOLS is not set |
| 634 | # CONFIG_DEBUG_FS is not set | ||
| 635 | # CONFIG_HEADERS_CHECK is not set | ||
| 750 | # CONFIG_DEBUG_KERNEL is not set | 636 | # CONFIG_DEBUG_KERNEL is not set |
| 751 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 752 | # CONFIG_DEBUG_BUGVERBOSE is not set | 637 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 753 | # CONFIG_DEBUG_FS is not set | ||
| 754 | # CONFIG_FRAME_POINTER is not set | 638 | # CONFIG_FRAME_POINTER is not set |
| 755 | # CONFIG_UNWIND_INFO is not set | ||
| 756 | # CONFIG_HEADERS_CHECK is not set | ||
| 757 | 639 | ||
| 758 | # | 640 | # |
| 759 | # Security options | 641 | # Security options |
| 760 | # | 642 | # |
| 761 | # CONFIG_KEYS is not set | 643 | # CONFIG_KEYS is not set |
| 762 | # CONFIG_SECURITY is not set | 644 | # CONFIG_SECURITY is not set |
| 763 | |||
| 764 | # | ||
| 765 | # Cryptographic options | ||
| 766 | # | ||
| 767 | # CONFIG_CRYPTO is not set | 645 | # CONFIG_CRYPTO is not set |
| 768 | 646 | ||
| 769 | # | 647 | # |
| 770 | # Library routines | 648 | # Library routines |
| 771 | # | 649 | # |
| 650 | CONFIG_BITREVERSE=y | ||
| 772 | # CONFIG_CRC_CCITT is not set | 651 | # CONFIG_CRC_CCITT is not set |
| 773 | # CONFIG_CRC16 is not set | 652 | # CONFIG_CRC16 is not set |
| 653 | # CONFIG_CRC_ITU_T is not set | ||
| 774 | CONFIG_CRC32=y | 654 | CONFIG_CRC32=y |
| 655 | # CONFIG_CRC7 is not set | ||
| 775 | # CONFIG_LIBCRC32C is not set | 656 | # CONFIG_LIBCRC32C is not set |
| 657 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/mappi/defconfig.smp b/arch/m32r/configs/mappi.smp_defconfig index 168669202b94..b86fb37fc6c3 100644 --- a/arch/m32r/mappi/defconfig.smp +++ b/arch/m32r/configs/mappi.smp_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 17:50:59 2006 | 4 | # Wed Aug 1 17:22:35 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -23,17 +26,19 @@ CONFIG_LOCALVERSION="" | |||
| 23 | CONFIG_LOCALVERSION_AUTO=y | 26 | CONFIG_LOCALVERSION_AUTO=y |
| 24 | CONFIG_SWAP=y | 27 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 28 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_IPC_NS is not set | 29 | CONFIG_SYSVIPC_SYSCTL=y |
| 27 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | # CONFIG_BSD_PROCESS_ACCT is not set | 31 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 29 | # CONFIG_TASKSTATS is not set | 32 | # CONFIG_TASKSTATS is not set |
| 30 | # CONFIG_UTS_NS is not set | 33 | # CONFIG_USER_NS is not set |
| 31 | # CONFIG_AUDIT is not set | 34 | # CONFIG_AUDIT is not set |
| 32 | CONFIG_IKCONFIG=y | 35 | CONFIG_IKCONFIG=y |
| 33 | CONFIG_IKCONFIG_PROC=y | 36 | CONFIG_IKCONFIG_PROC=y |
| 37 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 34 | # CONFIG_CPUSETS is not set | 38 | # CONFIG_CPUSETS is not set |
| 35 | CONFIG_SYSFS_DEPRECATED=y | 39 | CONFIG_SYSFS_DEPRECATED=y |
| 36 | # CONFIG_RELAY is not set | 40 | # CONFIG_RELAY is not set |
| 41 | CONFIG_BLK_DEV_INITRD=y | ||
| 37 | CONFIG_INITRAMFS_SOURCE="" | 42 | CONFIG_INITRAMFS_SOURCE="" |
| 38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 39 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| @@ -46,17 +51,18 @@ CONFIG_BUG=y | |||
| 46 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 47 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 48 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 49 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 50 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 51 | CONFIG_SLAB=y | ||
| 52 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 53 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 54 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 55 | # CONFIG_SLOB is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # Loadable module support | ||
| 59 | # | ||
| 60 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 61 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 62 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -64,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y | |||
| 64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 65 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 66 | CONFIG_STOP_MACHINE=y | 72 | CONFIG_STOP_MACHINE=y |
| 67 | |||
| 68 | # | ||
| 69 | # Block layer | ||
| 70 | # | ||
| 71 | CONFIG_BLOCK=y | 73 | CONFIG_BLOCK=y |
| 74 | # CONFIG_LBD is not set | ||
| 72 | # CONFIG_BLK_DEV_IO_TRACE is not set | 75 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 76 | # CONFIG_LSF is not set | ||
| 77 | # CONFIG_BLK_DEV_BSG is not set | ||
| 73 | 78 | ||
| 74 | # | 79 | # |
| 75 | # IO Schedulers | 80 | # IO Schedulers |
| @@ -122,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 127 | # CONFIG_SPARSEMEM_STATIC is not set |
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 128 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 129 | # CONFIG_RESOURCES_64BIT is not set |
| 130 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 131 | CONFIG_BOUNCE=y | ||
| 132 | CONFIG_VIRT_TO_BUS=y | ||
| 125 | CONFIG_IRAM_START=0x00f00000 | 133 | CONFIG_IRAM_START=0x00f00000 |
| 126 | CONFIG_IRAM_SIZE=0x00080000 | 134 | CONFIG_IRAM_SIZE=0x00080000 |
| 127 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 135 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 128 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 136 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 137 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 138 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 129 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 139 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 130 | CONFIG_GENERIC_HWEIGHT=y | 140 | CONFIG_GENERIC_HWEIGHT=y |
| 131 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 141 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 142 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 132 | CONFIG_PREEMPT=y | 143 | CONFIG_PREEMPT=y |
| 133 | CONFIG_SMP=y | 144 | CONFIG_SMP=y |
| 134 | CONFIG_CHIP_M32700_TS1=y | 145 | CONFIG_CHIP_M32700_TS1=y |
| @@ -138,6 +149,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 138 | # | 149 | # |
| 139 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 150 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 140 | # | 151 | # |
| 152 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 141 | # CONFIG_ISA is not set | 153 | # CONFIG_ISA is not set |
| 142 | 154 | ||
| 143 | # | 155 | # |
| @@ -156,10 +168,6 @@ CONFIG_M32R_PCC=y | |||
| 156 | CONFIG_PCCARD_NONSTATIC=y | 168 | CONFIG_PCCARD_NONSTATIC=y |
| 157 | 169 | ||
| 158 | # | 170 | # |
| 159 | # PCI Hotplug Support | ||
| 160 | # | ||
| 161 | |||
| 162 | # | ||
| 163 | # Executable file formats | 171 | # Executable file formats |
| 164 | # | 172 | # |
| 165 | CONFIG_BINFMT_ELF=y | 173 | CONFIG_BINFMT_ELF=y |
| @@ -173,12 +181,12 @@ CONFIG_NET=y | |||
| 173 | # | 181 | # |
| 174 | # Networking options | 182 | # Networking options |
| 175 | # | 183 | # |
| 176 | # CONFIG_NETDEBUG is not set | ||
| 177 | # CONFIG_PACKET is not set | 184 | # CONFIG_PACKET is not set |
| 178 | CONFIG_UNIX=y | 185 | CONFIG_UNIX=y |
| 179 | CONFIG_XFRM=y | 186 | CONFIG_XFRM=y |
| 180 | # CONFIG_XFRM_USER is not set | 187 | # CONFIG_XFRM_USER is not set |
| 181 | # CONFIG_XFRM_SUB_POLICY is not set | 188 | # CONFIG_XFRM_SUB_POLICY is not set |
| 189 | # CONFIG_XFRM_MIGRATE is not set | ||
| 182 | # CONFIG_NET_KEY is not set | 190 | # CONFIG_NET_KEY is not set |
| 183 | CONFIG_INET=y | 191 | CONFIG_INET=y |
| 184 | # CONFIG_IP_MULTICAST is not set | 192 | # CONFIG_IP_MULTICAST is not set |
| @@ -211,20 +219,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 211 | # CONFIG_INET6_TUNNEL is not set | 219 | # CONFIG_INET6_TUNNEL is not set |
| 212 | # CONFIG_NETWORK_SECMARK is not set | 220 | # CONFIG_NETWORK_SECMARK is not set |
| 213 | # CONFIG_NETFILTER is not set | 221 | # CONFIG_NETFILTER is not set |
| 214 | |||
| 215 | # | ||
| 216 | # DCCP Configuration (EXPERIMENTAL) | ||
| 217 | # | ||
| 218 | # CONFIG_IP_DCCP is not set | 222 | # CONFIG_IP_DCCP is not set |
| 219 | |||
| 220 | # | ||
| 221 | # SCTP Configuration (EXPERIMENTAL) | ||
| 222 | # | ||
| 223 | # CONFIG_IP_SCTP is not set | 223 | # CONFIG_IP_SCTP is not set |
| 224 | |||
| 225 | # | ||
| 226 | # TIPC Configuration (EXPERIMENTAL) | ||
| 227 | # | ||
| 228 | # CONFIG_TIPC is not set | 224 | # CONFIG_TIPC is not set |
| 229 | # CONFIG_ATM is not set | 225 | # CONFIG_ATM is not set |
| 230 | # CONFIG_BRIDGE is not set | 226 | # CONFIG_BRIDGE is not set |
| @@ -250,7 +246,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 250 | # CONFIG_HAMRADIO is not set | 246 | # CONFIG_HAMRADIO is not set |
| 251 | # CONFIG_IRDA is not set | 247 | # CONFIG_IRDA is not set |
| 252 | # CONFIG_BT is not set | 248 | # CONFIG_BT is not set |
| 249 | # CONFIG_AF_RXRPC is not set | ||
| 250 | |||
| 251 | # | ||
| 252 | # Wireless | ||
| 253 | # | ||
| 254 | # CONFIG_CFG80211 is not set | ||
| 255 | # CONFIG_WIRELESS_EXT is not set | ||
| 256 | # CONFIG_MAC80211 is not set | ||
| 253 | # CONFIG_IEEE80211 is not set | 257 | # CONFIG_IEEE80211 is not set |
| 258 | # CONFIG_RFKILL is not set | ||
| 259 | # CONFIG_NET_9P is not set | ||
| 254 | 260 | ||
| 255 | # | 261 | # |
| 256 | # Device Drivers | 262 | # Device Drivers |
| @@ -263,15 +269,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 263 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 269 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 264 | CONFIG_FW_LOADER=y | 270 | CONFIG_FW_LOADER=y |
| 265 | # CONFIG_SYS_HYPERVISOR is not set | 271 | # CONFIG_SYS_HYPERVISOR is not set |
| 266 | |||
| 267 | # | ||
| 268 | # Connector - unified userspace <-> kernelspace linker | ||
| 269 | # | ||
| 270 | # CONFIG_CONNECTOR is not set | 272 | # CONFIG_CONNECTOR is not set |
| 271 | |||
| 272 | # | ||
| 273 | # Memory Technology Devices (MTD) | ||
| 274 | # | ||
| 275 | CONFIG_MTD=y | 273 | CONFIG_MTD=y |
| 276 | # CONFIG_MTD_DEBUG is not set | 274 | # CONFIG_MTD_DEBUG is not set |
| 277 | # CONFIG_MTD_CONCAT is not set | 275 | # CONFIG_MTD_CONCAT is not set |
| @@ -286,6 +284,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 286 | # User Modules And Translation Layers | 284 | # User Modules And Translation Layers |
| 287 | # | 285 | # |
| 288 | CONFIG_MTD_CHAR=y | 286 | CONFIG_MTD_CHAR=y |
| 287 | CONFIG_MTD_BLKDEVS=y | ||
| 289 | CONFIG_MTD_BLOCK=y | 288 | CONFIG_MTD_BLOCK=y |
| 290 | # CONFIG_FTL is not set | 289 | # CONFIG_FTL is not set |
| 291 | # CONFIG_NFTL is not set | 290 | # CONFIG_NFTL is not set |
| @@ -311,7 +310,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 311 | # CONFIG_MTD_RAM is not set | 310 | # CONFIG_MTD_RAM is not set |
| 312 | # CONFIG_MTD_ROM is not set | 311 | # CONFIG_MTD_ROM is not set |
| 313 | # CONFIG_MTD_ABSENT is not set | 312 | # CONFIG_MTD_ABSENT is not set |
| 314 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 315 | 313 | ||
| 316 | # | 314 | # |
| 317 | # Mapping drivers for chip access | 315 | # Mapping drivers for chip access |
| @@ -333,29 +331,15 @@ CONFIG_MTD_CFI_I2=y | |||
| 333 | # CONFIG_MTD_DOC2000 is not set | 331 | # CONFIG_MTD_DOC2000 is not set |
| 334 | # CONFIG_MTD_DOC2001 is not set | 332 | # CONFIG_MTD_DOC2001 is not set |
| 335 | # CONFIG_MTD_DOC2001PLUS is not set | 333 | # CONFIG_MTD_DOC2001PLUS is not set |
| 336 | |||
| 337 | # | ||
| 338 | # NAND Flash Device Drivers | ||
| 339 | # | ||
| 340 | # CONFIG_MTD_NAND is not set | 334 | # CONFIG_MTD_NAND is not set |
| 341 | |||
| 342 | # | ||
| 343 | # OneNAND Flash Device Drivers | ||
| 344 | # | ||
| 345 | # CONFIG_MTD_ONENAND is not set | 335 | # CONFIG_MTD_ONENAND is not set |
| 346 | 336 | ||
| 347 | # | 337 | # |
| 348 | # Parallel port support | 338 | # UBI - Unsorted block images |
| 349 | # | 339 | # |
| 340 | # CONFIG_MTD_UBI is not set | ||
| 350 | # CONFIG_PARPORT is not set | 341 | # CONFIG_PARPORT is not set |
| 351 | 342 | CONFIG_BLK_DEV=y | |
| 352 | # | ||
| 353 | # Plug and Play support | ||
| 354 | # | ||
| 355 | |||
| 356 | # | ||
| 357 | # Block devices | ||
| 358 | # | ||
| 359 | # CONFIG_BLK_DEV_COW_COMMON is not set | 343 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 360 | CONFIG_BLK_DEV_LOOP=y | 344 | CONFIG_BLK_DEV_LOOP=y |
| 361 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 345 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -364,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 364 | CONFIG_BLK_DEV_RAM_COUNT=16 | 348 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 365 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 349 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 366 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 350 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 367 | CONFIG_BLK_DEV_INITRD=y | ||
| 368 | # CONFIG_CDROM_PKTCDVD is not set | 351 | # CONFIG_CDROM_PKTCDVD is not set |
| 369 | # CONFIG_ATA_OVER_ETH is not set | 352 | # CONFIG_ATA_OVER_ETH is not set |
| 370 | 353 | CONFIG_MISC_DEVICES=y | |
| 371 | # | 354 | # CONFIG_EEPROM_93CX6 is not set |
| 372 | # Misc devices | ||
| 373 | # | ||
| 374 | # CONFIG_TIFM_CORE is not set | ||
| 375 | |||
| 376 | # | ||
| 377 | # ATA/ATAPI/MFM/RLL support | ||
| 378 | # | ||
| 379 | CONFIG_IDE=m | 355 | CONFIG_IDE=m |
| 380 | CONFIG_IDE_MAX_HWIFS=4 | 356 | CONFIG_IDE_MAX_HWIFS=4 |
| 381 | CONFIG_BLK_DEV_IDE=m | 357 | CONFIG_BLK_DEV_IDE=m |
| @@ -391,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 391 | # CONFIG_BLK_DEV_IDETAPE is not set | 367 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 392 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 368 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 393 | # CONFIG_IDE_TASK_IOCTL is not set | 369 | # CONFIG_IDE_TASK_IOCTL is not set |
| 370 | CONFIG_IDE_PROC_FS=y | ||
| 394 | 371 | ||
| 395 | # | 372 | # |
| 396 | # IDE chipset support/bugfixes | 373 | # IDE chipset support/bugfixes |
| 397 | # | 374 | # |
| 398 | CONFIG_IDE_GENERIC=m | 375 | CONFIG_IDE_GENERIC=m |
| 376 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 399 | # CONFIG_IDE_ARM is not set | 377 | # CONFIG_IDE_ARM is not set |
| 400 | # CONFIG_BLK_DEV_IDEDMA is not set | 378 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 401 | # CONFIG_IDEDMA_AUTO is not set | ||
| 402 | # CONFIG_BLK_DEV_HD is not set | 379 | # CONFIG_BLK_DEV_HD is not set |
| 403 | 380 | ||
| 404 | # | 381 | # |
| @@ -406,74 +383,26 @@ CONFIG_IDE_GENERIC=m | |||
| 406 | # | 383 | # |
| 407 | # CONFIG_RAID_ATTRS is not set | 384 | # CONFIG_RAID_ATTRS is not set |
| 408 | # CONFIG_SCSI is not set | 385 | # CONFIG_SCSI is not set |
| 386 | # CONFIG_SCSI_DMA is not set | ||
| 409 | # CONFIG_SCSI_NETLINK is not set | 387 | # CONFIG_SCSI_NETLINK is not set |
| 410 | |||
| 411 | # | ||
| 412 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 413 | # | ||
| 414 | |||
| 415 | # | ||
| 416 | # Multi-device support (RAID and LVM) | ||
| 417 | # | ||
| 418 | # CONFIG_MD is not set | 388 | # CONFIG_MD is not set |
| 419 | |||
| 420 | # | ||
| 421 | # Fusion MPT device support | ||
| 422 | # | ||
| 423 | # CONFIG_FUSION is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # IEEE 1394 (FireWire) support | ||
| 427 | # | ||
| 428 | |||
| 429 | # | ||
| 430 | # I2O device support | ||
| 431 | # | ||
| 432 | |||
| 433 | # | ||
| 434 | # Network device support | ||
| 435 | # | ||
| 436 | CONFIG_NETDEVICES=y | 389 | CONFIG_NETDEVICES=y |
| 390 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 437 | # CONFIG_DUMMY is not set | 391 | # CONFIG_DUMMY is not set |
| 438 | # CONFIG_BONDING is not set | 392 | # CONFIG_BONDING is not set |
| 393 | # CONFIG_MACVLAN is not set | ||
| 439 | # CONFIG_EQUALIZER is not set | 394 | # CONFIG_EQUALIZER is not set |
| 440 | # CONFIG_TUN is not set | 395 | # CONFIG_TUN is not set |
| 441 | |||
| 442 | # | ||
| 443 | # PHY device support | ||
| 444 | # | ||
| 445 | |||
| 446 | # | ||
| 447 | # Ethernet (10 or 100Mbit) | ||
| 448 | # | ||
| 449 | # CONFIG_NET_ETHERNET is not set | 396 | # CONFIG_NET_ETHERNET is not set |
| 450 | CONFIG_NE2000=y | 397 | CONFIG_NETDEV_1000=y |
| 451 | 398 | CONFIG_NETDEV_10000=y | |
| 452 | # | ||
| 453 | # Ethernet (1000 Mbit) | ||
| 454 | # | ||
| 455 | |||
| 456 | # | ||
| 457 | # Ethernet (10000 Mbit) | ||
| 458 | # | ||
| 459 | 399 | ||
| 460 | # | 400 | # |
| 461 | # Token Ring devices | 401 | # Wireless LAN |
| 462 | # | ||
| 463 | |||
| 464 | # | ||
| 465 | # Wireless LAN (non-hamradio) | ||
| 466 | # | ||
| 467 | # CONFIG_NET_RADIO is not set | ||
| 468 | |||
| 469 | # | ||
| 470 | # PCMCIA network device support | ||
| 471 | # | 402 | # |
| 403 | # CONFIG_WLAN_PRE80211 is not set | ||
| 404 | # CONFIG_WLAN_80211 is not set | ||
| 472 | # CONFIG_NET_PCMCIA is not set | 405 | # CONFIG_NET_PCMCIA is not set |
| 473 | |||
| 474 | # | ||
| 475 | # Wan interfaces | ||
| 476 | # | ||
| 477 | # CONFIG_WAN is not set | 406 | # CONFIG_WAN is not set |
| 478 | # CONFIG_PPP is not set | 407 | # CONFIG_PPP is not set |
| 479 | # CONFIG_SLIP is not set | 408 | # CONFIG_SLIP is not set |
| @@ -481,15 +410,7 @@ CONFIG_NE2000=y | |||
| 481 | # CONFIG_NETCONSOLE is not set | 410 | # CONFIG_NETCONSOLE is not set |
| 482 | # CONFIG_NETPOLL is not set | 411 | # CONFIG_NETPOLL is not set |
| 483 | # CONFIG_NET_POLL_CONTROLLER is not set | 412 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 484 | |||
| 485 | # | ||
| 486 | # ISDN subsystem | ||
| 487 | # | ||
| 488 | # CONFIG_ISDN is not set | 413 | # CONFIG_ISDN is not set |
| 489 | |||
| 490 | # | ||
| 491 | # Telephony Support | ||
| 492 | # | ||
| 493 | # CONFIG_PHONE is not set | 414 | # CONFIG_PHONE is not set |
| 494 | 415 | ||
| 495 | # | 416 | # |
| @@ -497,6 +418,7 @@ CONFIG_NE2000=y | |||
| 497 | # | 418 | # |
| 498 | CONFIG_INPUT=y | 419 | CONFIG_INPUT=y |
| 499 | # CONFIG_INPUT_FF_MEMLESS is not set | 420 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 421 | # CONFIG_INPUT_POLLDEV is not set | ||
| 500 | 422 | ||
| 501 | # | 423 | # |
| 502 | # Userland interfaces | 424 | # Userland interfaces |
| @@ -516,6 +438,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 516 | # CONFIG_INPUT_KEYBOARD is not set | 438 | # CONFIG_INPUT_KEYBOARD is not set |
| 517 | # CONFIG_INPUT_MOUSE is not set | 439 | # CONFIG_INPUT_MOUSE is not set |
| 518 | # CONFIG_INPUT_JOYSTICK is not set | 440 | # CONFIG_INPUT_JOYSTICK is not set |
| 441 | # CONFIG_INPUT_TABLET is not set | ||
| 519 | # CONFIG_INPUT_TOUCHSCREEN is not set | 442 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 520 | # CONFIG_INPUT_MISC is not set | 443 | # CONFIG_INPUT_MISC is not set |
| 521 | 444 | ||
| @@ -550,41 +473,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 550 | CONFIG_UNIX98_PTYS=y | 473 | CONFIG_UNIX98_PTYS=y |
| 551 | CONFIG_LEGACY_PTYS=y | 474 | CONFIG_LEGACY_PTYS=y |
| 552 | CONFIG_LEGACY_PTY_COUNT=256 | 475 | CONFIG_LEGACY_PTY_COUNT=256 |
| 553 | |||
| 554 | # | ||
| 555 | # IPMI | ||
| 556 | # | ||
| 557 | # CONFIG_IPMI_HANDLER is not set | 476 | # CONFIG_IPMI_HANDLER is not set |
| 558 | |||
| 559 | # | ||
| 560 | # Watchdog Cards | ||
| 561 | # | ||
| 562 | # CONFIG_WATCHDOG is not set | 477 | # CONFIG_WATCHDOG is not set |
| 563 | CONFIG_HW_RANDOM=y | 478 | CONFIG_HW_RANDOM=y |
| 564 | # CONFIG_RTC is not set | 479 | # CONFIG_RTC is not set |
| 565 | # CONFIG_DTLK is not set | ||
| 566 | # CONFIG_R3964 is not set | 480 | # CONFIG_R3964 is not set |
| 567 | 481 | ||
| 568 | # | 482 | # |
| 569 | # Ftape, the floppy tape device driver | ||
| 570 | # | ||
| 571 | |||
| 572 | # | ||
| 573 | # PCMCIA character devices | 483 | # PCMCIA character devices |
| 574 | # | 484 | # |
| 575 | # CONFIG_SYNCLINK_CS is not set | 485 | # CONFIG_SYNCLINK_CS is not set |
| 576 | # CONFIG_CARDMAN_4000 is not set | 486 | # CONFIG_CARDMAN_4000 is not set |
| 577 | # CONFIG_CARDMAN_4040 is not set | 487 | # CONFIG_CARDMAN_4040 is not set |
| 578 | # CONFIG_RAW_DRIVER is not set | 488 | # CONFIG_RAW_DRIVER is not set |
| 579 | |||
| 580 | # | ||
| 581 | # TPM devices | ||
| 582 | # | ||
| 583 | # CONFIG_TCG_TPM is not set | 489 | # CONFIG_TCG_TPM is not set |
| 584 | |||
| 585 | # | ||
| 586 | # I2C support | ||
| 587 | # | ||
| 588 | # CONFIG_I2C is not set | 490 | # CONFIG_I2C is not set |
| 589 | 491 | ||
| 590 | # | 492 | # |
| @@ -592,47 +494,56 @@ CONFIG_HW_RANDOM=y | |||
| 592 | # | 494 | # |
| 593 | # CONFIG_SPI is not set | 495 | # CONFIG_SPI is not set |
| 594 | # CONFIG_SPI_MASTER is not set | 496 | # CONFIG_SPI_MASTER is not set |
| 595 | |||
| 596 | # | ||
| 597 | # Dallas's 1-wire bus | ||
| 598 | # | ||
| 599 | # CONFIG_W1 is not set | 497 | # CONFIG_W1 is not set |
| 600 | 498 | # CONFIG_POWER_SUPPLY is not set | |
| 601 | # | ||
| 602 | # Hardware Monitoring support | ||
| 603 | # | ||
| 604 | CONFIG_HWMON=y | 499 | CONFIG_HWMON=y |
| 605 | # CONFIG_HWMON_VID is not set | 500 | # CONFIG_HWMON_VID is not set |
| 606 | # CONFIG_SENSORS_ABITUGURU is not set | 501 | # CONFIG_SENSORS_ABITUGURU is not set |
| 502 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 607 | # CONFIG_SENSORS_F71805F is not set | 503 | # CONFIG_SENSORS_F71805F is not set |
| 504 | # CONFIG_SENSORS_IT87 is not set | ||
| 505 | # CONFIG_SENSORS_PC87360 is not set | ||
| 506 | # CONFIG_SENSORS_PC87427 is not set | ||
| 507 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 508 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 608 | # CONFIG_SENSORS_VT1211 is not set | 509 | # CONFIG_SENSORS_VT1211 is not set |
| 510 | # CONFIG_SENSORS_W83627HF is not set | ||
| 511 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 609 | # CONFIG_HWMON_DEBUG_CHIP is not set | 512 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 610 | 513 | ||
| 611 | # | 514 | # |
| 612 | # Multimedia devices | 515 | # Multifunction device drivers |
| 613 | # | 516 | # |
| 614 | # CONFIG_VIDEO_DEV is not set | 517 | # CONFIG_MFD_SM501 is not set |
| 615 | 518 | ||
| 616 | # | 519 | # |
| 617 | # Digital Video Broadcasting Devices | 520 | # Multimedia devices |
| 618 | # | 521 | # |
| 619 | # CONFIG_DVB is not set | 522 | # CONFIG_VIDEO_DEV is not set |
| 523 | # CONFIG_DVB_CORE is not set | ||
| 524 | CONFIG_DAB=y | ||
| 620 | 525 | ||
| 621 | # | 526 | # |
| 622 | # Graphics support | 527 | # Graphics support |
| 623 | # | 528 | # |
| 624 | CONFIG_FIRMWARE_EDID=y | ||
| 625 | # CONFIG_FB is not set | ||
| 626 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 529 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 627 | 530 | ||
| 628 | # | 531 | # |
| 629 | # Sound | 532 | # Display device support |
| 630 | # | 533 | # |
| 631 | # CONFIG_SOUND is not set | 534 | # CONFIG_DISPLAY_SUPPORT is not set |
| 535 | # CONFIG_VGASTATE is not set | ||
| 536 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 537 | # CONFIG_FB is not set | ||
| 632 | 538 | ||
| 633 | # | 539 | # |
| 634 | # USB support | 540 | # Sound |
| 635 | # | 541 | # |
| 542 | # CONFIG_SOUND is not set | ||
| 543 | CONFIG_HID_SUPPORT=y | ||
| 544 | CONFIG_HID=y | ||
| 545 | # CONFIG_HID_DEBUG is not set | ||
| 546 | CONFIG_USB_SUPPORT=y | ||
| 636 | # CONFIG_USB_ARCH_HAS_HCD is not set | 547 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 637 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 548 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 638 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 549 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -645,50 +556,18 @@ CONFIG_FIRMWARE_EDID=y | |||
| 645 | # USB Gadget Support | 556 | # USB Gadget Support |
| 646 | # | 557 | # |
| 647 | # CONFIG_USB_GADGET is not set | 558 | # CONFIG_USB_GADGET is not set |
| 648 | |||
| 649 | # | ||
| 650 | # MMC/SD Card support | ||
| 651 | # | ||
| 652 | # CONFIG_MMC is not set | 559 | # CONFIG_MMC is not set |
| 653 | |||
| 654 | # | ||
| 655 | # LED devices | ||
| 656 | # | ||
| 657 | # CONFIG_NEW_LEDS is not set | 560 | # CONFIG_NEW_LEDS is not set |
| 658 | 561 | ||
| 659 | # | 562 | # |
| 660 | # LED drivers | ||
| 661 | # | ||
| 662 | |||
| 663 | # | ||
| 664 | # LED Triggers | ||
| 665 | # | ||
| 666 | |||
| 667 | # | ||
| 668 | # InfiniBand support | ||
| 669 | # | ||
| 670 | |||
| 671 | # | ||
| 672 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 673 | # | ||
| 674 | |||
| 675 | # | ||
| 676 | # Real Time Clock | 563 | # Real Time Clock |
| 677 | # | 564 | # |
| 678 | # CONFIG_RTC_CLASS is not set | 565 | # CONFIG_RTC_CLASS is not set |
| 679 | 566 | ||
| 680 | # | 567 | # |
| 681 | # DMA Engine support | 568 | # Userspace I/O |
| 682 | # | ||
| 683 | # CONFIG_DMA_ENGINE is not set | ||
| 684 | |||
| 685 | # | ||
| 686 | # DMA Clients | ||
| 687 | # | ||
| 688 | |||
| 689 | # | ||
| 690 | # DMA Devices | ||
| 691 | # | 569 | # |
| 570 | # CONFIG_UIO is not set | ||
| 692 | 571 | ||
| 693 | # | 572 | # |
| 694 | # File systems | 573 | # File systems |
| @@ -761,9 +640,6 @@ CONFIG_RAMFS=y | |||
| 761 | # CONFIG_BEFS_FS is not set | 640 | # CONFIG_BEFS_FS is not set |
| 762 | # CONFIG_BFS_FS is not set | 641 | # CONFIG_BFS_FS is not set |
| 763 | # CONFIG_EFS_FS is not set | 642 | # CONFIG_EFS_FS is not set |
| 764 | CONFIG_JFFS_FS=y | ||
| 765 | CONFIG_JFFS_FS_VERBOSE=0 | ||
| 766 | CONFIG_JFFS_PROC_FS=y | ||
| 767 | CONFIG_JFFS2_FS=y | 643 | CONFIG_JFFS2_FS=y |
| 768 | CONFIG_JFFS2_FS_DEBUG=0 | 644 | CONFIG_JFFS2_FS_DEBUG=0 |
| 769 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 645 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| @@ -794,6 +670,7 @@ CONFIG_LOCKD=y | |||
| 794 | CONFIG_LOCKD_V4=y | 670 | CONFIG_LOCKD_V4=y |
| 795 | CONFIG_NFS_COMMON=y | 671 | CONFIG_NFS_COMMON=y |
| 796 | CONFIG_SUNRPC=y | 672 | CONFIG_SUNRPC=y |
| 673 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 797 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 674 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 798 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 675 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 799 | # CONFIG_SMB_FS is not set | 676 | # CONFIG_SMB_FS is not set |
| @@ -801,7 +678,6 @@ CONFIG_SUNRPC=y | |||
| 801 | # CONFIG_NCP_FS is not set | 678 | # CONFIG_NCP_FS is not set |
| 802 | # CONFIG_CODA_FS is not set | 679 | # CONFIG_CODA_FS is not set |
| 803 | # CONFIG_AFS_FS is not set | 680 | # CONFIG_AFS_FS is not set |
| 804 | # CONFIG_9P_FS is not set | ||
| 805 | 681 | ||
| 806 | # | 682 | # |
| 807 | # Partition Types | 683 | # Partition Types |
| @@ -854,6 +730,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 854 | # CONFIG_NLS_UTF8 is not set | 730 | # CONFIG_NLS_UTF8 is not set |
| 855 | 731 | ||
| 856 | # | 732 | # |
| 733 | # Distributed Lock Manager | ||
| 734 | # | ||
| 735 | # CONFIG_DLM is not set | ||
| 736 | |||
| 737 | # | ||
| 857 | # Profiling support | 738 | # Profiling support |
| 858 | # | 739 | # |
| 859 | # CONFIG_PROFILING is not set | 740 | # CONFIG_PROFILING is not set |
| @@ -865,31 +746,29 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 865 | CONFIG_ENABLE_MUST_CHECK=y | 746 | CONFIG_ENABLE_MUST_CHECK=y |
| 866 | # CONFIG_MAGIC_SYSRQ is not set | 747 | # CONFIG_MAGIC_SYSRQ is not set |
| 867 | # CONFIG_UNUSED_SYMBOLS is not set | 748 | # CONFIG_UNUSED_SYMBOLS is not set |
| 749 | # CONFIG_DEBUG_FS is not set | ||
| 750 | # CONFIG_HEADERS_CHECK is not set | ||
| 868 | # CONFIG_DEBUG_KERNEL is not set | 751 | # CONFIG_DEBUG_KERNEL is not set |
| 869 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 870 | # CONFIG_DEBUG_BUGVERBOSE is not set | 752 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 871 | # CONFIG_DEBUG_FS is not set | ||
| 872 | # CONFIG_FRAME_POINTER is not set | 753 | # CONFIG_FRAME_POINTER is not set |
| 873 | # CONFIG_UNWIND_INFO is not set | ||
| 874 | # CONFIG_HEADERS_CHECK is not set | ||
| 875 | 754 | ||
| 876 | # | 755 | # |
| 877 | # Security options | 756 | # Security options |
| 878 | # | 757 | # |
| 879 | # CONFIG_KEYS is not set | 758 | # CONFIG_KEYS is not set |
| 880 | # CONFIG_SECURITY is not set | 759 | # CONFIG_SECURITY is not set |
| 881 | |||
| 882 | # | ||
| 883 | # Cryptographic options | ||
| 884 | # | ||
| 885 | # CONFIG_CRYPTO is not set | 760 | # CONFIG_CRYPTO is not set |
| 886 | 761 | ||
| 887 | # | 762 | # |
| 888 | # Library routines | 763 | # Library routines |
| 889 | # | 764 | # |
| 765 | CONFIG_BITREVERSE=y | ||
| 890 | # CONFIG_CRC_CCITT is not set | 766 | # CONFIG_CRC_CCITT is not set |
| 891 | # CONFIG_CRC16 is not set | 767 | # CONFIG_CRC16 is not set |
| 768 | # CONFIG_CRC_ITU_T is not set | ||
| 892 | CONFIG_CRC32=y | 769 | CONFIG_CRC32=y |
| 770 | # CONFIG_CRC7 is not set | ||
| 893 | # CONFIG_LIBCRC32C is not set | 771 | # CONFIG_LIBCRC32C is not set |
| 894 | CONFIG_ZLIB_INFLATE=y | 772 | CONFIG_ZLIB_INFLATE=y |
| 895 | CONFIG_ZLIB_DEFLATE=y | 773 | CONFIG_ZLIB_DEFLATE=y |
| 774 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/mappi/defconfig.up b/arch/m32r/configs/mappi.up_defconfig index 5ba00603c1a0..114a6c9b60ef 100644 --- a/arch/m32r/mappi/defconfig.up +++ b/arch/m32r/configs/mappi.up_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 17:51:20 2006 | 4 | # Wed Aug 1 17:22:35 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -24,16 +27,18 @@ CONFIG_LOCALVERSION="" | |||
| 24 | CONFIG_LOCALVERSION_AUTO=y | 27 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | CONFIG_SWAP=y | 28 | CONFIG_SWAP=y |
| 26 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 27 | # CONFIG_IPC_NS is not set | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 28 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
| 29 | # CONFIG_BSD_PROCESS_ACCT is not set | 32 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 30 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
| 31 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
| 32 | # CONFIG_AUDIT is not set | 35 | # CONFIG_AUDIT is not set |
| 33 | CONFIG_IKCONFIG=y | 36 | CONFIG_IKCONFIG=y |
| 34 | CONFIG_IKCONFIG_PROC=y | 37 | CONFIG_IKCONFIG_PROC=y |
| 38 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 35 | CONFIG_SYSFS_DEPRECATED=y | 39 | CONFIG_SYSFS_DEPRECATED=y |
| 36 | # CONFIG_RELAY is not set | 40 | # CONFIG_RELAY is not set |
| 41 | CONFIG_BLK_DEV_INITRD=y | ||
| 37 | CONFIG_INITRAMFS_SOURCE="" | 42 | CONFIG_INITRAMFS_SOURCE="" |
| 38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 39 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| @@ -46,29 +51,29 @@ CONFIG_BUG=y | |||
| 46 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 47 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 48 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 49 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 50 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 51 | CONFIG_SLAB=y | ||
| 52 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 53 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 54 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 55 | # CONFIG_SLOB is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # Loadable module support | ||
| 59 | # | ||
| 60 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 61 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 62 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 63 | # CONFIG_MODVERSIONS is not set | 69 | # CONFIG_MODVERSIONS is not set |
| 64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 65 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 66 | |||
| 67 | # | ||
| 68 | # Block layer | ||
| 69 | # | ||
| 70 | CONFIG_BLOCK=y | 72 | CONFIG_BLOCK=y |
| 73 | # CONFIG_LBD is not set | ||
| 71 | # CONFIG_BLK_DEV_IO_TRACE is not set | 74 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 75 | # CONFIG_LSF is not set | ||
| 76 | # CONFIG_BLK_DEV_BSG is not set | ||
| 72 | 77 | ||
| 73 | # | 78 | # |
| 74 | # IO Schedulers | 79 | # IO Schedulers |
| @@ -121,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 121 | # CONFIG_SPARSEMEM_STATIC is not set | 126 | # CONFIG_SPARSEMEM_STATIC is not set |
| 122 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 127 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 123 | # CONFIG_RESOURCES_64BIT is not set | 128 | # CONFIG_RESOURCES_64BIT is not set |
| 129 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 130 | CONFIG_BOUNCE=y | ||
| 131 | CONFIG_VIRT_TO_BUS=y | ||
| 124 | CONFIG_IRAM_START=0x00f00000 | 132 | CONFIG_IRAM_START=0x00f00000 |
| 125 | CONFIG_IRAM_SIZE=0x00080000 | 133 | CONFIG_IRAM_SIZE=0x00080000 |
| 126 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 134 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 127 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 135 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 136 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 137 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 128 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 138 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 129 | CONFIG_GENERIC_HWEIGHT=y | 139 | CONFIG_GENERIC_HWEIGHT=y |
| 130 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 140 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 141 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 131 | CONFIG_PREEMPT=y | 142 | CONFIG_PREEMPT=y |
| 132 | # CONFIG_SMP is not set | 143 | # CONFIG_SMP is not set |
| 133 | CONFIG_NODES_SHIFT=1 | 144 | CONFIG_NODES_SHIFT=1 |
| @@ -135,6 +146,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 135 | # | 146 | # |
| 136 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 147 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 137 | # | 148 | # |
| 149 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 138 | # CONFIG_ISA is not set | 150 | # CONFIG_ISA is not set |
| 139 | 151 | ||
| 140 | # | 152 | # |
| @@ -153,10 +165,6 @@ CONFIG_M32R_PCC=y | |||
| 153 | CONFIG_PCCARD_NONSTATIC=y | 165 | CONFIG_PCCARD_NONSTATIC=y |
| 154 | 166 | ||
| 155 | # | 167 | # |
| 156 | # PCI Hotplug Support | ||
| 157 | # | ||
| 158 | |||
| 159 | # | ||
| 160 | # Executable file formats | 168 | # Executable file formats |
| 161 | # | 169 | # |
| 162 | CONFIG_BINFMT_ELF=y | 170 | CONFIG_BINFMT_ELF=y |
| @@ -170,12 +178,12 @@ CONFIG_NET=y | |||
| 170 | # | 178 | # |
| 171 | # Networking options | 179 | # Networking options |
| 172 | # | 180 | # |
| 173 | # CONFIG_NETDEBUG is not set | ||
| 174 | # CONFIG_PACKET is not set | 181 | # CONFIG_PACKET is not set |
| 175 | CONFIG_UNIX=y | 182 | CONFIG_UNIX=y |
| 176 | CONFIG_XFRM=y | 183 | CONFIG_XFRM=y |
| 177 | # CONFIG_XFRM_USER is not set | 184 | # CONFIG_XFRM_USER is not set |
| 178 | # CONFIG_XFRM_SUB_POLICY is not set | 185 | # CONFIG_XFRM_SUB_POLICY is not set |
| 186 | # CONFIG_XFRM_MIGRATE is not set | ||
| 179 | # CONFIG_NET_KEY is not set | 187 | # CONFIG_NET_KEY is not set |
| 180 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| 181 | # CONFIG_IP_MULTICAST is not set | 189 | # CONFIG_IP_MULTICAST is not set |
| @@ -208,20 +216,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 208 | # CONFIG_INET6_TUNNEL is not set | 216 | # CONFIG_INET6_TUNNEL is not set |
| 209 | # CONFIG_NETWORK_SECMARK is not set | 217 | # CONFIG_NETWORK_SECMARK is not set |
| 210 | # CONFIG_NETFILTER is not set | 218 | # CONFIG_NETFILTER is not set |
| 211 | |||
| 212 | # | ||
| 213 | # DCCP Configuration (EXPERIMENTAL) | ||
| 214 | # | ||
| 215 | # CONFIG_IP_DCCP is not set | 219 | # CONFIG_IP_DCCP is not set |
| 216 | |||
| 217 | # | ||
| 218 | # SCTP Configuration (EXPERIMENTAL) | ||
| 219 | # | ||
| 220 | # CONFIG_IP_SCTP is not set | 220 | # CONFIG_IP_SCTP is not set |
| 221 | |||
| 222 | # | ||
| 223 | # TIPC Configuration (EXPERIMENTAL) | ||
| 224 | # | ||
| 225 | # CONFIG_TIPC is not set | 221 | # CONFIG_TIPC is not set |
| 226 | # CONFIG_ATM is not set | 222 | # CONFIG_ATM is not set |
| 227 | # CONFIG_BRIDGE is not set | 223 | # CONFIG_BRIDGE is not set |
| @@ -247,7 +243,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 247 | # CONFIG_HAMRADIO is not set | 243 | # CONFIG_HAMRADIO is not set |
| 248 | # CONFIG_IRDA is not set | 244 | # CONFIG_IRDA is not set |
| 249 | # CONFIG_BT is not set | 245 | # CONFIG_BT is not set |
| 246 | # CONFIG_AF_RXRPC is not set | ||
| 247 | |||
| 248 | # | ||
| 249 | # Wireless | ||
| 250 | # | ||
| 251 | # CONFIG_CFG80211 is not set | ||
| 252 | # CONFIG_WIRELESS_EXT is not set | ||
| 253 | # CONFIG_MAC80211 is not set | ||
| 250 | # CONFIG_IEEE80211 is not set | 254 | # CONFIG_IEEE80211 is not set |
| 255 | # CONFIG_RFKILL is not set | ||
| 256 | # CONFIG_NET_9P is not set | ||
| 251 | 257 | ||
| 252 | # | 258 | # |
| 253 | # Device Drivers | 259 | # Device Drivers |
| @@ -260,15 +266,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 260 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 266 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 261 | CONFIG_FW_LOADER=y | 267 | CONFIG_FW_LOADER=y |
| 262 | # CONFIG_SYS_HYPERVISOR is not set | 268 | # CONFIG_SYS_HYPERVISOR is not set |
| 263 | |||
| 264 | # | ||
| 265 | # Connector - unified userspace <-> kernelspace linker | ||
| 266 | # | ||
| 267 | # CONFIG_CONNECTOR is not set | 269 | # CONFIG_CONNECTOR is not set |
| 268 | |||
| 269 | # | ||
| 270 | # Memory Technology Devices (MTD) | ||
| 271 | # | ||
| 272 | CONFIG_MTD=y | 270 | CONFIG_MTD=y |
| 273 | # CONFIG_MTD_DEBUG is not set | 271 | # CONFIG_MTD_DEBUG is not set |
| 274 | # CONFIG_MTD_CONCAT is not set | 272 | # CONFIG_MTD_CONCAT is not set |
| @@ -283,6 +281,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 283 | # User Modules And Translation Layers | 281 | # User Modules And Translation Layers |
| 284 | # | 282 | # |
| 285 | CONFIG_MTD_CHAR=y | 283 | CONFIG_MTD_CHAR=y |
| 284 | CONFIG_MTD_BLKDEVS=y | ||
| 286 | CONFIG_MTD_BLOCK=y | 285 | CONFIG_MTD_BLOCK=y |
| 287 | # CONFIG_FTL is not set | 286 | # CONFIG_FTL is not set |
| 288 | # CONFIG_NFTL is not set | 287 | # CONFIG_NFTL is not set |
| @@ -308,7 +307,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 308 | # CONFIG_MTD_RAM is not set | 307 | # CONFIG_MTD_RAM is not set |
| 309 | # CONFIG_MTD_ROM is not set | 308 | # CONFIG_MTD_ROM is not set |
| 310 | # CONFIG_MTD_ABSENT is not set | 309 | # CONFIG_MTD_ABSENT is not set |
| 311 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 312 | 310 | ||
| 313 | # | 311 | # |
| 314 | # Mapping drivers for chip access | 312 | # Mapping drivers for chip access |
| @@ -330,29 +328,15 @@ CONFIG_MTD_CFI_I2=y | |||
| 330 | # CONFIG_MTD_DOC2000 is not set | 328 | # CONFIG_MTD_DOC2000 is not set |
| 331 | # CONFIG_MTD_DOC2001 is not set | 329 | # CONFIG_MTD_DOC2001 is not set |
| 332 | # CONFIG_MTD_DOC2001PLUS is not set | 330 | # CONFIG_MTD_DOC2001PLUS is not set |
| 333 | |||
| 334 | # | ||
| 335 | # NAND Flash Device Drivers | ||
| 336 | # | ||
| 337 | # CONFIG_MTD_NAND is not set | 331 | # CONFIG_MTD_NAND is not set |
| 338 | |||
| 339 | # | ||
| 340 | # OneNAND Flash Device Drivers | ||
| 341 | # | ||
| 342 | # CONFIG_MTD_ONENAND is not set | 332 | # CONFIG_MTD_ONENAND is not set |
| 343 | 333 | ||
| 344 | # | 334 | # |
| 345 | # Parallel port support | 335 | # UBI - Unsorted block images |
| 346 | # | 336 | # |
| 337 | # CONFIG_MTD_UBI is not set | ||
| 347 | # CONFIG_PARPORT is not set | 338 | # CONFIG_PARPORT is not set |
| 348 | 339 | CONFIG_BLK_DEV=y | |
| 349 | # | ||
| 350 | # Plug and Play support | ||
| 351 | # | ||
| 352 | |||
| 353 | # | ||
| 354 | # Block devices | ||
| 355 | # | ||
| 356 | # CONFIG_BLK_DEV_COW_COMMON is not set | 340 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 357 | CONFIG_BLK_DEV_LOOP=y | 341 | CONFIG_BLK_DEV_LOOP=y |
| 358 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 342 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -361,18 +345,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 361 | CONFIG_BLK_DEV_RAM_COUNT=16 | 345 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 362 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 346 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 363 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 347 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 364 | CONFIG_BLK_DEV_INITRD=y | ||
| 365 | # CONFIG_CDROM_PKTCDVD is not set | 348 | # CONFIG_CDROM_PKTCDVD is not set |
| 366 | # CONFIG_ATA_OVER_ETH is not set | 349 | # CONFIG_ATA_OVER_ETH is not set |
| 367 | 350 | CONFIG_MISC_DEVICES=y | |
| 368 | # | 351 | # CONFIG_EEPROM_93CX6 is not set |
| 369 | # Misc devices | ||
| 370 | # | ||
| 371 | # CONFIG_TIFM_CORE is not set | ||
| 372 | |||
| 373 | # | ||
| 374 | # ATA/ATAPI/MFM/RLL support | ||
| 375 | # | ||
| 376 | CONFIG_IDE=m | 352 | CONFIG_IDE=m |
| 377 | CONFIG_IDE_MAX_HWIFS=4 | 353 | CONFIG_IDE_MAX_HWIFS=4 |
| 378 | CONFIG_BLK_DEV_IDE=m | 354 | CONFIG_BLK_DEV_IDE=m |
| @@ -388,14 +364,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 388 | # CONFIG_BLK_DEV_IDETAPE is not set | 364 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 389 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 365 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 390 | # CONFIG_IDE_TASK_IOCTL is not set | 366 | # CONFIG_IDE_TASK_IOCTL is not set |
| 367 | CONFIG_IDE_PROC_FS=y | ||
| 391 | 368 | ||
| 392 | # | 369 | # |
| 393 | # IDE chipset support/bugfixes | 370 | # IDE chipset support/bugfixes |
| 394 | # | 371 | # |
| 395 | CONFIG_IDE_GENERIC=m | 372 | CONFIG_IDE_GENERIC=m |
| 373 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 396 | # CONFIG_IDE_ARM is not set | 374 | # CONFIG_IDE_ARM is not set |
| 397 | # CONFIG_BLK_DEV_IDEDMA is not set | 375 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 398 | # CONFIG_IDEDMA_AUTO is not set | ||
| 399 | # CONFIG_BLK_DEV_HD is not set | 376 | # CONFIG_BLK_DEV_HD is not set |
| 400 | 377 | ||
| 401 | # | 378 | # |
| @@ -403,74 +380,26 @@ CONFIG_IDE_GENERIC=m | |||
| 403 | # | 380 | # |
| 404 | # CONFIG_RAID_ATTRS is not set | 381 | # CONFIG_RAID_ATTRS is not set |
| 405 | # CONFIG_SCSI is not set | 382 | # CONFIG_SCSI is not set |
| 383 | # CONFIG_SCSI_DMA is not set | ||
| 406 | # CONFIG_SCSI_NETLINK is not set | 384 | # CONFIG_SCSI_NETLINK is not set |
| 407 | |||
| 408 | # | ||
| 409 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 410 | # | ||
| 411 | |||
| 412 | # | ||
| 413 | # Multi-device support (RAID and LVM) | ||
| 414 | # | ||
| 415 | # CONFIG_MD is not set | 385 | # CONFIG_MD is not set |
| 416 | |||
| 417 | # | ||
| 418 | # Fusion MPT device support | ||
| 419 | # | ||
| 420 | # CONFIG_FUSION is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # IEEE 1394 (FireWire) support | ||
| 424 | # | ||
| 425 | |||
| 426 | # | ||
| 427 | # I2O device support | ||
| 428 | # | ||
| 429 | |||
| 430 | # | ||
| 431 | # Network device support | ||
| 432 | # | ||
| 433 | CONFIG_NETDEVICES=y | 386 | CONFIG_NETDEVICES=y |
| 387 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 434 | # CONFIG_DUMMY is not set | 388 | # CONFIG_DUMMY is not set |
| 435 | # CONFIG_BONDING is not set | 389 | # CONFIG_BONDING is not set |
| 390 | # CONFIG_MACVLAN is not set | ||
| 436 | # CONFIG_EQUALIZER is not set | 391 | # CONFIG_EQUALIZER is not set |
| 437 | # CONFIG_TUN is not set | 392 | # CONFIG_TUN is not set |
| 438 | |||
| 439 | # | ||
| 440 | # PHY device support | ||
| 441 | # | ||
| 442 | |||
| 443 | # | ||
| 444 | # Ethernet (10 or 100Mbit) | ||
| 445 | # | ||
| 446 | # CONFIG_NET_ETHERNET is not set | 393 | # CONFIG_NET_ETHERNET is not set |
| 447 | CONFIG_NE2000=y | 394 | CONFIG_NETDEV_1000=y |
| 448 | 395 | CONFIG_NETDEV_10000=y | |
| 449 | # | ||
| 450 | # Ethernet (1000 Mbit) | ||
| 451 | # | ||
| 452 | |||
| 453 | # | ||
| 454 | # Ethernet (10000 Mbit) | ||
| 455 | # | ||
| 456 | 396 | ||
| 457 | # | 397 | # |
| 458 | # Token Ring devices | 398 | # Wireless LAN |
| 459 | # | ||
| 460 | |||
| 461 | # | ||
| 462 | # Wireless LAN (non-hamradio) | ||
| 463 | # | ||
| 464 | # CONFIG_NET_RADIO is not set | ||
| 465 | |||
| 466 | # | ||
| 467 | # PCMCIA network device support | ||
| 468 | # | 399 | # |
| 400 | # CONFIG_WLAN_PRE80211 is not set | ||
| 401 | # CONFIG_WLAN_80211 is not set | ||
| 469 | # CONFIG_NET_PCMCIA is not set | 402 | # CONFIG_NET_PCMCIA is not set |
| 470 | |||
| 471 | # | ||
| 472 | # Wan interfaces | ||
| 473 | # | ||
| 474 | # CONFIG_WAN is not set | 403 | # CONFIG_WAN is not set |
| 475 | # CONFIG_PPP is not set | 404 | # CONFIG_PPP is not set |
| 476 | # CONFIG_SLIP is not set | 405 | # CONFIG_SLIP is not set |
| @@ -478,15 +407,7 @@ CONFIG_NE2000=y | |||
| 478 | # CONFIG_NETCONSOLE is not set | 407 | # CONFIG_NETCONSOLE is not set |
| 479 | # CONFIG_NETPOLL is not set | 408 | # CONFIG_NETPOLL is not set |
| 480 | # CONFIG_NET_POLL_CONTROLLER is not set | 409 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 481 | |||
| 482 | # | ||
| 483 | # ISDN subsystem | ||
| 484 | # | ||
| 485 | # CONFIG_ISDN is not set | 410 | # CONFIG_ISDN is not set |
| 486 | |||
| 487 | # | ||
| 488 | # Telephony Support | ||
| 489 | # | ||
| 490 | # CONFIG_PHONE is not set | 411 | # CONFIG_PHONE is not set |
| 491 | 412 | ||
| 492 | # | 413 | # |
| @@ -494,6 +415,7 @@ CONFIG_NE2000=y | |||
| 494 | # | 415 | # |
| 495 | CONFIG_INPUT=y | 416 | CONFIG_INPUT=y |
| 496 | # CONFIG_INPUT_FF_MEMLESS is not set | 417 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 418 | # CONFIG_INPUT_POLLDEV is not set | ||
| 497 | 419 | ||
| 498 | # | 420 | # |
| 499 | # Userland interfaces | 421 | # Userland interfaces |
| @@ -513,6 +435,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 513 | # CONFIG_INPUT_KEYBOARD is not set | 435 | # CONFIG_INPUT_KEYBOARD is not set |
| 514 | # CONFIG_INPUT_MOUSE is not set | 436 | # CONFIG_INPUT_MOUSE is not set |
| 515 | # CONFIG_INPUT_JOYSTICK is not set | 437 | # CONFIG_INPUT_JOYSTICK is not set |
| 438 | # CONFIG_INPUT_TABLET is not set | ||
| 516 | # CONFIG_INPUT_TOUCHSCREEN is not set | 439 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 517 | # CONFIG_INPUT_MISC is not set | 440 | # CONFIG_INPUT_MISC is not set |
| 518 | 441 | ||
| @@ -547,41 +470,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 547 | CONFIG_UNIX98_PTYS=y | 470 | CONFIG_UNIX98_PTYS=y |
| 548 | CONFIG_LEGACY_PTYS=y | 471 | CONFIG_LEGACY_PTYS=y |
| 549 | CONFIG_LEGACY_PTY_COUNT=256 | 472 | CONFIG_LEGACY_PTY_COUNT=256 |
| 550 | |||
| 551 | # | ||
| 552 | # IPMI | ||
| 553 | # | ||
| 554 | # CONFIG_IPMI_HANDLER is not set | 473 | # CONFIG_IPMI_HANDLER is not set |
| 555 | |||
| 556 | # | ||
| 557 | # Watchdog Cards | ||
| 558 | # | ||
| 559 | # CONFIG_WATCHDOG is not set | 474 | # CONFIG_WATCHDOG is not set |
| 560 | CONFIG_HW_RANDOM=y | 475 | CONFIG_HW_RANDOM=y |
| 561 | # CONFIG_RTC is not set | 476 | # CONFIG_RTC is not set |
| 562 | # CONFIG_DTLK is not set | ||
| 563 | # CONFIG_R3964 is not set | 477 | # CONFIG_R3964 is not set |
| 564 | 478 | ||
| 565 | # | 479 | # |
| 566 | # Ftape, the floppy tape device driver | ||
| 567 | # | ||
| 568 | |||
| 569 | # | ||
| 570 | # PCMCIA character devices | 480 | # PCMCIA character devices |
| 571 | # | 481 | # |
| 572 | # CONFIG_SYNCLINK_CS is not set | 482 | # CONFIG_SYNCLINK_CS is not set |
| 573 | # CONFIG_CARDMAN_4000 is not set | 483 | # CONFIG_CARDMAN_4000 is not set |
| 574 | # CONFIG_CARDMAN_4040 is not set | 484 | # CONFIG_CARDMAN_4040 is not set |
| 575 | # CONFIG_RAW_DRIVER is not set | 485 | # CONFIG_RAW_DRIVER is not set |
| 576 | |||
| 577 | # | ||
| 578 | # TPM devices | ||
| 579 | # | ||
| 580 | # CONFIG_TCG_TPM is not set | 486 | # CONFIG_TCG_TPM is not set |
| 581 | |||
| 582 | # | ||
| 583 | # I2C support | ||
| 584 | # | ||
| 585 | # CONFIG_I2C is not set | 487 | # CONFIG_I2C is not set |
| 586 | 488 | ||
| 587 | # | 489 | # |
| @@ -589,47 +491,56 @@ CONFIG_HW_RANDOM=y | |||
| 589 | # | 491 | # |
| 590 | # CONFIG_SPI is not set | 492 | # CONFIG_SPI is not set |
| 591 | # CONFIG_SPI_MASTER is not set | 493 | # CONFIG_SPI_MASTER is not set |
| 592 | |||
| 593 | # | ||
| 594 | # Dallas's 1-wire bus | ||
| 595 | # | ||
| 596 | # CONFIG_W1 is not set | 494 | # CONFIG_W1 is not set |
| 597 | 495 | # CONFIG_POWER_SUPPLY is not set | |
| 598 | # | ||
| 599 | # Hardware Monitoring support | ||
| 600 | # | ||
| 601 | CONFIG_HWMON=y | 496 | CONFIG_HWMON=y |
| 602 | # CONFIG_HWMON_VID is not set | 497 | # CONFIG_HWMON_VID is not set |
| 603 | # CONFIG_SENSORS_ABITUGURU is not set | 498 | # CONFIG_SENSORS_ABITUGURU is not set |
| 499 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 604 | # CONFIG_SENSORS_F71805F is not set | 500 | # CONFIG_SENSORS_F71805F is not set |
| 501 | # CONFIG_SENSORS_IT87 is not set | ||
| 502 | # CONFIG_SENSORS_PC87360 is not set | ||
| 503 | # CONFIG_SENSORS_PC87427 is not set | ||
| 504 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 505 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 605 | # CONFIG_SENSORS_VT1211 is not set | 506 | # CONFIG_SENSORS_VT1211 is not set |
| 507 | # CONFIG_SENSORS_W83627HF is not set | ||
| 508 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 606 | # CONFIG_HWMON_DEBUG_CHIP is not set | 509 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 607 | 510 | ||
| 608 | # | 511 | # |
| 609 | # Multimedia devices | 512 | # Multifunction device drivers |
| 610 | # | 513 | # |
| 611 | # CONFIG_VIDEO_DEV is not set | 514 | # CONFIG_MFD_SM501 is not set |
| 612 | 515 | ||
| 613 | # | 516 | # |
| 614 | # Digital Video Broadcasting Devices | 517 | # Multimedia devices |
| 615 | # | 518 | # |
| 616 | # CONFIG_DVB is not set | 519 | # CONFIG_VIDEO_DEV is not set |
| 520 | # CONFIG_DVB_CORE is not set | ||
| 521 | CONFIG_DAB=y | ||
| 617 | 522 | ||
| 618 | # | 523 | # |
| 619 | # Graphics support | 524 | # Graphics support |
| 620 | # | 525 | # |
| 621 | CONFIG_FIRMWARE_EDID=y | ||
| 622 | # CONFIG_FB is not set | ||
| 623 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 526 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 624 | 527 | ||
| 625 | # | 528 | # |
| 626 | # Sound | 529 | # Display device support |
| 627 | # | 530 | # |
| 628 | # CONFIG_SOUND is not set | 531 | # CONFIG_DISPLAY_SUPPORT is not set |
| 532 | # CONFIG_VGASTATE is not set | ||
| 533 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 534 | # CONFIG_FB is not set | ||
| 629 | 535 | ||
| 630 | # | 536 | # |
| 631 | # USB support | 537 | # Sound |
| 632 | # | 538 | # |
| 539 | # CONFIG_SOUND is not set | ||
| 540 | CONFIG_HID_SUPPORT=y | ||
| 541 | CONFIG_HID=y | ||
| 542 | # CONFIG_HID_DEBUG is not set | ||
| 543 | CONFIG_USB_SUPPORT=y | ||
| 633 | # CONFIG_USB_ARCH_HAS_HCD is not set | 544 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 634 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 545 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 635 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 546 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -642,50 +553,18 @@ CONFIG_FIRMWARE_EDID=y | |||
| 642 | # USB Gadget Support | 553 | # USB Gadget Support |
| 643 | # | 554 | # |
| 644 | # CONFIG_USB_GADGET is not set | 555 | # CONFIG_USB_GADGET is not set |
| 645 | |||
| 646 | # | ||
| 647 | # MMC/SD Card support | ||
| 648 | # | ||
| 649 | # CONFIG_MMC is not set | 556 | # CONFIG_MMC is not set |
| 650 | |||
| 651 | # | ||
| 652 | # LED devices | ||
| 653 | # | ||
| 654 | # CONFIG_NEW_LEDS is not set | 557 | # CONFIG_NEW_LEDS is not set |
| 655 | 558 | ||
| 656 | # | 559 | # |
| 657 | # LED drivers | ||
| 658 | # | ||
| 659 | |||
| 660 | # | ||
| 661 | # LED Triggers | ||
| 662 | # | ||
| 663 | |||
| 664 | # | ||
| 665 | # InfiniBand support | ||
| 666 | # | ||
| 667 | |||
| 668 | # | ||
| 669 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 670 | # | ||
| 671 | |||
| 672 | # | ||
| 673 | # Real Time Clock | 560 | # Real Time Clock |
| 674 | # | 561 | # |
| 675 | # CONFIG_RTC_CLASS is not set | 562 | # CONFIG_RTC_CLASS is not set |
| 676 | 563 | ||
| 677 | # | 564 | # |
| 678 | # DMA Engine support | 565 | # Userspace I/O |
| 679 | # | ||
| 680 | # CONFIG_DMA_ENGINE is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # DMA Clients | ||
| 684 | # | ||
| 685 | |||
| 686 | # | ||
| 687 | # DMA Devices | ||
| 688 | # | 566 | # |
| 567 | # CONFIG_UIO is not set | ||
| 689 | 568 | ||
| 690 | # | 569 | # |
| 691 | # File systems | 570 | # File systems |
| @@ -758,9 +637,6 @@ CONFIG_RAMFS=y | |||
| 758 | # CONFIG_BEFS_FS is not set | 637 | # CONFIG_BEFS_FS is not set |
| 759 | # CONFIG_BFS_FS is not set | 638 | # CONFIG_BFS_FS is not set |
| 760 | # CONFIG_EFS_FS is not set | 639 | # CONFIG_EFS_FS is not set |
| 761 | CONFIG_JFFS_FS=y | ||
| 762 | CONFIG_JFFS_FS_VERBOSE=0 | ||
| 763 | CONFIG_JFFS_PROC_FS=y | ||
| 764 | CONFIG_JFFS2_FS=y | 640 | CONFIG_JFFS2_FS=y |
| 765 | CONFIG_JFFS2_FS_DEBUG=0 | 641 | CONFIG_JFFS2_FS_DEBUG=0 |
| 766 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 642 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| @@ -791,6 +667,7 @@ CONFIG_LOCKD=y | |||
| 791 | CONFIG_LOCKD_V4=y | 667 | CONFIG_LOCKD_V4=y |
| 792 | CONFIG_NFS_COMMON=y | 668 | CONFIG_NFS_COMMON=y |
| 793 | CONFIG_SUNRPC=y | 669 | CONFIG_SUNRPC=y |
| 670 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 794 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 671 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 795 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 672 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 796 | # CONFIG_SMB_FS is not set | 673 | # CONFIG_SMB_FS is not set |
| @@ -798,7 +675,6 @@ CONFIG_SUNRPC=y | |||
| 798 | # CONFIG_NCP_FS is not set | 675 | # CONFIG_NCP_FS is not set |
| 799 | # CONFIG_CODA_FS is not set | 676 | # CONFIG_CODA_FS is not set |
| 800 | # CONFIG_AFS_FS is not set | 677 | # CONFIG_AFS_FS is not set |
| 801 | # CONFIG_9P_FS is not set | ||
| 802 | 678 | ||
| 803 | # | 679 | # |
| 804 | # Partition Types | 680 | # Partition Types |
| @@ -851,6 +727,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 851 | # CONFIG_NLS_UTF8 is not set | 727 | # CONFIG_NLS_UTF8 is not set |
| 852 | 728 | ||
| 853 | # | 729 | # |
| 730 | # Distributed Lock Manager | ||
| 731 | # | ||
| 732 | # CONFIG_DLM is not set | ||
| 733 | |||
| 734 | # | ||
| 854 | # Profiling support | 735 | # Profiling support |
| 855 | # | 736 | # |
| 856 | # CONFIG_PROFILING is not set | 737 | # CONFIG_PROFILING is not set |
| @@ -862,31 +743,29 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 862 | CONFIG_ENABLE_MUST_CHECK=y | 743 | CONFIG_ENABLE_MUST_CHECK=y |
| 863 | # CONFIG_MAGIC_SYSRQ is not set | 744 | # CONFIG_MAGIC_SYSRQ is not set |
| 864 | # CONFIG_UNUSED_SYMBOLS is not set | 745 | # CONFIG_UNUSED_SYMBOLS is not set |
| 746 | # CONFIG_DEBUG_FS is not set | ||
| 747 | # CONFIG_HEADERS_CHECK is not set | ||
| 865 | # CONFIG_DEBUG_KERNEL is not set | 748 | # CONFIG_DEBUG_KERNEL is not set |
| 866 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 867 | # CONFIG_DEBUG_BUGVERBOSE is not set | 749 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 868 | # CONFIG_DEBUG_FS is not set | ||
| 869 | # CONFIG_FRAME_POINTER is not set | 750 | # CONFIG_FRAME_POINTER is not set |
| 870 | # CONFIG_UNWIND_INFO is not set | ||
| 871 | # CONFIG_HEADERS_CHECK is not set | ||
| 872 | 751 | ||
| 873 | # | 752 | # |
| 874 | # Security options | 753 | # Security options |
| 875 | # | 754 | # |
| 876 | # CONFIG_KEYS is not set | 755 | # CONFIG_KEYS is not set |
| 877 | # CONFIG_SECURITY is not set | 756 | # CONFIG_SECURITY is not set |
| 878 | |||
| 879 | # | ||
| 880 | # Cryptographic options | ||
| 881 | # | ||
| 882 | # CONFIG_CRYPTO is not set | 757 | # CONFIG_CRYPTO is not set |
| 883 | 758 | ||
| 884 | # | 759 | # |
| 885 | # Library routines | 760 | # Library routines |
| 886 | # | 761 | # |
| 762 | CONFIG_BITREVERSE=y | ||
| 887 | # CONFIG_CRC_CCITT is not set | 763 | # CONFIG_CRC_CCITT is not set |
| 888 | # CONFIG_CRC16 is not set | 764 | # CONFIG_CRC16 is not set |
| 765 | # CONFIG_CRC_ITU_T is not set | ||
| 889 | CONFIG_CRC32=y | 766 | CONFIG_CRC32=y |
| 767 | # CONFIG_CRC7 is not set | ||
| 890 | # CONFIG_LIBCRC32C is not set | 768 | # CONFIG_LIBCRC32C is not set |
| 891 | CONFIG_ZLIB_INFLATE=y | 769 | CONFIG_ZLIB_INFLATE=y |
| 892 | CONFIG_ZLIB_DEFLATE=y | 770 | CONFIG_ZLIB_DEFLATE=y |
| 771 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/mappi2/defconfig.opsp b/arch/m32r/configs/mappi2.opsp_defconfig index b379ae96e6a7..54bb6e25d39c 100644 --- a/arch/m32r/mappi2/defconfig.opsp +++ b/arch/m32r/configs/mappi2.opsp_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 19:40:30 2006 | 4 | # Wed Aug 1 17:22:36 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -24,18 +27,19 @@ CONFIG_LOCALVERSION="" | |||
| 24 | CONFIG_LOCALVERSION_AUTO=y | 27 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | CONFIG_SWAP=y | 28 | CONFIG_SWAP=y |
| 26 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 27 | # CONFIG_IPC_NS is not set | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 28 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
| 29 | CONFIG_BSD_PROCESS_ACCT=y | 32 | CONFIG_BSD_PROCESS_ACCT=y |
| 30 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 31 | # CONFIG_TASKSTATS is not set | 34 | # CONFIG_TASKSTATS is not set |
| 32 | # CONFIG_UTS_NS is not set | 35 | # CONFIG_USER_NS is not set |
| 33 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 34 | CONFIG_IKCONFIG=y | 37 | CONFIG_IKCONFIG=y |
| 35 | # CONFIG_IKCONFIG_PROC is not set | 38 | # CONFIG_IKCONFIG_PROC is not set |
| 39 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 36 | CONFIG_SYSFS_DEPRECATED=y | 40 | CONFIG_SYSFS_DEPRECATED=y |
| 37 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
| 38 | CONFIG_INITRAMFS_SOURCE="" | 42 | # CONFIG_BLK_DEV_INITRD is not set |
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 40 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| 41 | CONFIG_EMBEDDED=y | 45 | CONFIG_EMBEDDED=y |
| @@ -47,29 +51,29 @@ CONFIG_BUG=y | |||
| 47 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 48 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 49 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 50 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 51 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 52 | CONFIG_SLAB=y | ||
| 53 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 54 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 55 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 56 | # CONFIG_SLOB is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # Loadable module support | ||
| 60 | # | ||
| 61 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 62 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 64 | # CONFIG_MODVERSIONS is not set | 69 | # CONFIG_MODVERSIONS is not set |
| 65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 66 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 67 | |||
| 68 | # | ||
| 69 | # Block layer | ||
| 70 | # | ||
| 71 | CONFIG_BLOCK=y | 72 | CONFIG_BLOCK=y |
| 73 | # CONFIG_LBD is not set | ||
| 72 | # CONFIG_BLK_DEV_IO_TRACE is not set | 74 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 75 | # CONFIG_LSF is not set | ||
| 76 | # CONFIG_BLK_DEV_BSG is not set | ||
| 73 | 77 | ||
| 74 | # | 78 | # |
| 75 | # IO Schedulers | 79 | # IO Schedulers |
| @@ -122,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 126 | # CONFIG_SPARSEMEM_STATIC is not set |
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 127 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 128 | # CONFIG_RESOURCES_64BIT is not set |
| 129 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 130 | CONFIG_BOUNCE=y | ||
| 131 | CONFIG_VIRT_TO_BUS=y | ||
| 125 | CONFIG_IRAM_START=0x00f00000 | 132 | CONFIG_IRAM_START=0x00f00000 |
| 126 | CONFIG_IRAM_SIZE=0x00008000 | 133 | CONFIG_IRAM_SIZE=0x00008000 |
| 127 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 134 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 128 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 135 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 136 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 137 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 129 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 138 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 130 | CONFIG_GENERIC_HWEIGHT=y | 139 | CONFIG_GENERIC_HWEIGHT=y |
| 131 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 140 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 141 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 132 | CONFIG_PREEMPT=y | 142 | CONFIG_PREEMPT=y |
| 133 | # CONFIG_SMP is not set | 143 | # CONFIG_SMP is not set |
| 134 | CONFIG_NODES_SHIFT=1 | 144 | CONFIG_NODES_SHIFT=1 |
| @@ -136,6 +146,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 136 | # | 146 | # |
| 137 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 147 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 138 | # | 148 | # |
| 149 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 139 | # CONFIG_ISA is not set | 150 | # CONFIG_ISA is not set |
| 140 | 151 | ||
| 141 | # | 152 | # |
| @@ -153,10 +164,6 @@ CONFIG_PCMCIA_IOCTL=y | |||
| 153 | # CONFIG_M32R_CFC is not set | 164 | # CONFIG_M32R_CFC is not set |
| 154 | 165 | ||
| 155 | # | 166 | # |
| 156 | # PCI Hotplug Support | ||
| 157 | # | ||
| 158 | |||
| 159 | # | ||
| 160 | # Executable file formats | 167 | # Executable file formats |
| 161 | # | 168 | # |
| 162 | CONFIG_BINFMT_ELF=y | 169 | CONFIG_BINFMT_ELF=y |
| @@ -170,13 +177,13 @@ CONFIG_NET=y | |||
| 170 | # | 177 | # |
| 171 | # Networking options | 178 | # Networking options |
| 172 | # | 179 | # |
| 173 | # CONFIG_NETDEBUG is not set | ||
| 174 | CONFIG_PACKET=y | 180 | CONFIG_PACKET=y |
| 175 | # CONFIG_PACKET_MMAP is not set | 181 | # CONFIG_PACKET_MMAP is not set |
| 176 | CONFIG_UNIX=y | 182 | CONFIG_UNIX=y |
| 177 | CONFIG_XFRM=y | 183 | CONFIG_XFRM=y |
| 178 | # CONFIG_XFRM_USER is not set | 184 | # CONFIG_XFRM_USER is not set |
| 179 | # CONFIG_XFRM_SUB_POLICY is not set | 185 | # CONFIG_XFRM_SUB_POLICY is not set |
| 186 | # CONFIG_XFRM_MIGRATE is not set | ||
| 180 | # CONFIG_NET_KEY is not set | 187 | # CONFIG_NET_KEY is not set |
| 181 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| 182 | # CONFIG_IP_MULTICAST is not set | 189 | # CONFIG_IP_MULTICAST is not set |
| @@ -209,20 +216,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 209 | # CONFIG_INET6_TUNNEL is not set | 216 | # CONFIG_INET6_TUNNEL is not set |
| 210 | # CONFIG_NETWORK_SECMARK is not set | 217 | # CONFIG_NETWORK_SECMARK is not set |
| 211 | # CONFIG_NETFILTER is not set | 218 | # CONFIG_NETFILTER is not set |
| 212 | |||
| 213 | # | ||
| 214 | # DCCP Configuration (EXPERIMENTAL) | ||
| 215 | # | ||
| 216 | # CONFIG_IP_DCCP is not set | 219 | # CONFIG_IP_DCCP is not set |
| 217 | |||
| 218 | # | ||
| 219 | # SCTP Configuration (EXPERIMENTAL) | ||
| 220 | # | ||
| 221 | # CONFIG_IP_SCTP is not set | 220 | # CONFIG_IP_SCTP is not set |
| 222 | |||
| 223 | # | ||
| 224 | # TIPC Configuration (EXPERIMENTAL) | ||
| 225 | # | ||
| 226 | # CONFIG_TIPC is not set | 221 | # CONFIG_TIPC is not set |
| 227 | # CONFIG_ATM is not set | 222 | # CONFIG_ATM is not set |
| 228 | # CONFIG_BRIDGE is not set | 223 | # CONFIG_BRIDGE is not set |
| @@ -248,7 +243,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 248 | # CONFIG_HAMRADIO is not set | 243 | # CONFIG_HAMRADIO is not set |
| 249 | # CONFIG_IRDA is not set | 244 | # CONFIG_IRDA is not set |
| 250 | # CONFIG_BT is not set | 245 | # CONFIG_BT is not set |
| 246 | # CONFIG_AF_RXRPC is not set | ||
| 247 | |||
| 248 | # | ||
| 249 | # Wireless | ||
| 250 | # | ||
| 251 | # CONFIG_CFG80211 is not set | ||
| 252 | # CONFIG_WIRELESS_EXT is not set | ||
| 253 | # CONFIG_MAC80211 is not set | ||
| 251 | # CONFIG_IEEE80211 is not set | 254 | # CONFIG_IEEE80211 is not set |
| 255 | # CONFIG_RFKILL is not set | ||
| 256 | # CONFIG_NET_9P is not set | ||
| 252 | 257 | ||
| 253 | # | 258 | # |
| 254 | # Device Drivers | 259 | # Device Drivers |
| @@ -261,29 +266,10 @@ CONFIG_STANDALONE=y | |||
| 261 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 266 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 262 | CONFIG_FW_LOADER=y | 267 | CONFIG_FW_LOADER=y |
| 263 | # CONFIG_SYS_HYPERVISOR is not set | 268 | # CONFIG_SYS_HYPERVISOR is not set |
| 264 | |||
| 265 | # | ||
| 266 | # Connector - unified userspace <-> kernelspace linker | ||
| 267 | # | ||
| 268 | # CONFIG_CONNECTOR is not set | 269 | # CONFIG_CONNECTOR is not set |
| 269 | |||
| 270 | # | ||
| 271 | # Memory Technology Devices (MTD) | ||
| 272 | # | ||
| 273 | # CONFIG_MTD is not set | 270 | # CONFIG_MTD is not set |
| 274 | |||
| 275 | # | ||
| 276 | # Parallel port support | ||
| 277 | # | ||
| 278 | # CONFIG_PARPORT is not set | 271 | # CONFIG_PARPORT is not set |
| 279 | 272 | CONFIG_BLK_DEV=y | |
| 280 | # | ||
| 281 | # Plug and Play support | ||
| 282 | # | ||
| 283 | |||
| 284 | # | ||
| 285 | # Block devices | ||
| 286 | # | ||
| 287 | # CONFIG_BLK_DEV_COW_COMMON is not set | 273 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 288 | CONFIG_BLK_DEV_LOOP=y | 274 | CONFIG_BLK_DEV_LOOP=y |
| 289 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 275 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -292,18 +278,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 292 | CONFIG_BLK_DEV_RAM_COUNT=16 | 278 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 293 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 279 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 294 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 280 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 295 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 296 | # CONFIG_CDROM_PKTCDVD is not set | 281 | # CONFIG_CDROM_PKTCDVD is not set |
| 297 | # CONFIG_ATA_OVER_ETH is not set | 282 | # CONFIG_ATA_OVER_ETH is not set |
| 298 | 283 | CONFIG_MISC_DEVICES=y | |
| 299 | # | 284 | # CONFIG_EEPROM_93CX6 is not set |
| 300 | # Misc devices | ||
| 301 | # | ||
| 302 | # CONFIG_TIFM_CORE is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # ATA/ATAPI/MFM/RLL support | ||
| 306 | # | ||
| 307 | CONFIG_IDE=y | 285 | CONFIG_IDE=y |
| 308 | CONFIG_IDE_MAX_HWIFS=4 | 286 | CONFIG_IDE_MAX_HWIFS=4 |
| 309 | CONFIG_BLK_DEV_IDE=y | 287 | CONFIG_BLK_DEV_IDE=y |
| @@ -320,14 +298,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 320 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 298 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 321 | # CONFIG_BLK_DEV_IDESCSI is not set | 299 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 322 | # CONFIG_IDE_TASK_IOCTL is not set | 300 | # CONFIG_IDE_TASK_IOCTL is not set |
| 301 | CONFIG_IDE_PROC_FS=y | ||
| 323 | 302 | ||
| 324 | # | 303 | # |
| 325 | # IDE chipset support/bugfixes | 304 | # IDE chipset support/bugfixes |
| 326 | # | 305 | # |
| 327 | CONFIG_IDE_GENERIC=y | 306 | CONFIG_IDE_GENERIC=y |
| 307 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 328 | # CONFIG_IDE_ARM is not set | 308 | # CONFIG_IDE_ARM is not set |
| 329 | # CONFIG_BLK_DEV_IDEDMA is not set | 309 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 330 | # CONFIG_IDEDMA_AUTO is not set | ||
| 331 | # CONFIG_BLK_DEV_HD is not set | 310 | # CONFIG_BLK_DEV_HD is not set |
| 332 | 311 | ||
| 333 | # | 312 | # |
| @@ -335,6 +314,8 @@ CONFIG_IDE_GENERIC=y | |||
| 335 | # | 314 | # |
| 336 | # CONFIG_RAID_ATTRS is not set | 315 | # CONFIG_RAID_ATTRS is not set |
| 337 | CONFIG_SCSI=m | 316 | CONFIG_SCSI=m |
| 317 | # CONFIG_SCSI_DMA is not set | ||
| 318 | # CONFIG_SCSI_TGT is not set | ||
| 338 | # CONFIG_SCSI_NETLINK is not set | 319 | # CONFIG_SCSI_NETLINK is not set |
| 339 | CONFIG_SCSI_PROC_FS=y | 320 | CONFIG_SCSI_PROC_FS=y |
| 340 | 321 | ||
| @@ -355,6 +336,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 355 | CONFIG_SCSI_MULTI_LUN=y | 336 | CONFIG_SCSI_MULTI_LUN=y |
| 356 | # CONFIG_SCSI_CONSTANTS is not set | 337 | # CONFIG_SCSI_CONSTANTS is not set |
| 357 | # CONFIG_SCSI_LOGGING is not set | 338 | # CONFIG_SCSI_LOGGING is not set |
| 339 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 340 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 358 | 341 | ||
| 359 | # | 342 | # |
| 360 | # SCSI Transports | 343 | # SCSI Transports |
| @@ -362,93 +345,33 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 362 | # CONFIG_SCSI_SPI_ATTRS is not set | 345 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 363 | # CONFIG_SCSI_FC_ATTRS is not set | 346 | # CONFIG_SCSI_FC_ATTRS is not set |
| 364 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 347 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 365 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 366 | # CONFIG_SCSI_SAS_LIBSAS is not set | 348 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 367 | 349 | CONFIG_SCSI_LOWLEVEL=y | |
| 368 | # | ||
| 369 | # SCSI low-level drivers | ||
| 370 | # | ||
| 371 | # CONFIG_ISCSI_TCP is not set | 350 | # CONFIG_ISCSI_TCP is not set |
| 372 | # CONFIG_SCSI_DEBUG is not set | 351 | # CONFIG_SCSI_DEBUG is not set |
| 373 | 352 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | |
| 374 | # | ||
| 375 | # PCMCIA SCSI adapter support | ||
| 376 | # | ||
| 377 | # CONFIG_PCMCIA_AHA152X is not set | ||
| 378 | # CONFIG_PCMCIA_FDOMAIN is not set | ||
| 379 | # CONFIG_PCMCIA_NINJA_SCSI is not set | ||
| 380 | # CONFIG_PCMCIA_QLOGIC is not set | ||
| 381 | # CONFIG_PCMCIA_SYM53C500 is not set | ||
| 382 | |||
| 383 | # | ||
| 384 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 385 | # | ||
| 386 | |||
| 387 | # | ||
| 388 | # Multi-device support (RAID and LVM) | ||
| 389 | # | ||
| 390 | # CONFIG_MD is not set | 353 | # CONFIG_MD is not set |
| 391 | |||
| 392 | # | ||
| 393 | # Fusion MPT device support | ||
| 394 | # | ||
| 395 | # CONFIG_FUSION is not set | ||
| 396 | |||
| 397 | # | ||
| 398 | # IEEE 1394 (FireWire) support | ||
| 399 | # | ||
| 400 | |||
| 401 | # | ||
| 402 | # I2O device support | ||
| 403 | # | ||
| 404 | |||
| 405 | # | ||
| 406 | # Network device support | ||
| 407 | # | ||
| 408 | CONFIG_NETDEVICES=y | 354 | CONFIG_NETDEVICES=y |
| 355 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 409 | # CONFIG_DUMMY is not set | 356 | # CONFIG_DUMMY is not set |
| 410 | # CONFIG_BONDING is not set | 357 | # CONFIG_BONDING is not set |
| 358 | # CONFIG_MACVLAN is not set | ||
| 411 | # CONFIG_EQUALIZER is not set | 359 | # CONFIG_EQUALIZER is not set |
| 412 | # CONFIG_TUN is not set | 360 | # CONFIG_TUN is not set |
| 413 | |||
| 414 | # | ||
| 415 | # PHY device support | ||
| 416 | # | ||
| 417 | # CONFIG_PHYLIB is not set | 361 | # CONFIG_PHYLIB is not set |
| 418 | |||
| 419 | # | ||
| 420 | # Ethernet (10 or 100Mbit) | ||
| 421 | # | ||
| 422 | CONFIG_NET_ETHERNET=y | 362 | CONFIG_NET_ETHERNET=y |
| 423 | CONFIG_MII=y | 363 | CONFIG_MII=y |
| 424 | CONFIG_SMC91X=y | 364 | CONFIG_SMC91X=y |
| 425 | # CONFIG_NE2000 is not set | 365 | # CONFIG_NE2000 is not set |
| 366 | CONFIG_NETDEV_1000=y | ||
| 367 | CONFIG_NETDEV_10000=y | ||
| 426 | 368 | ||
| 427 | # | 369 | # |
| 428 | # Ethernet (1000 Mbit) | 370 | # Wireless LAN |
| 429 | # | ||
| 430 | |||
| 431 | # | ||
| 432 | # Ethernet (10000 Mbit) | ||
| 433 | # | ||
| 434 | |||
| 435 | # | ||
| 436 | # Token Ring devices | ||
| 437 | # | ||
| 438 | |||
| 439 | # | ||
| 440 | # Wireless LAN (non-hamradio) | ||
| 441 | # | ||
| 442 | # CONFIG_NET_RADIO is not set | ||
| 443 | |||
| 444 | # | ||
| 445 | # PCMCIA network device support | ||
| 446 | # | 371 | # |
| 372 | # CONFIG_WLAN_PRE80211 is not set | ||
| 373 | # CONFIG_WLAN_80211 is not set | ||
| 447 | # CONFIG_NET_PCMCIA is not set | 374 | # CONFIG_NET_PCMCIA is not set |
| 448 | |||
| 449 | # | ||
| 450 | # Wan interfaces | ||
| 451 | # | ||
| 452 | # CONFIG_WAN is not set | 375 | # CONFIG_WAN is not set |
| 453 | # CONFIG_PPP is not set | 376 | # CONFIG_PPP is not set |
| 454 | # CONFIG_SLIP is not set | 377 | # CONFIG_SLIP is not set |
| @@ -456,15 +379,7 @@ CONFIG_SMC91X=y | |||
| 456 | # CONFIG_NETCONSOLE is not set | 379 | # CONFIG_NETCONSOLE is not set |
| 457 | # CONFIG_NETPOLL is not set | 380 | # CONFIG_NETPOLL is not set |
| 458 | # CONFIG_NET_POLL_CONTROLLER is not set | 381 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 459 | |||
| 460 | # | ||
| 461 | # ISDN subsystem | ||
| 462 | # | ||
| 463 | # CONFIG_ISDN is not set | 382 | # CONFIG_ISDN is not set |
| 464 | |||
| 465 | # | ||
| 466 | # Telephony Support | ||
| 467 | # | ||
| 468 | # CONFIG_PHONE is not set | 383 | # CONFIG_PHONE is not set |
| 469 | 384 | ||
| 470 | # | 385 | # |
| @@ -472,6 +387,7 @@ CONFIG_SMC91X=y | |||
| 472 | # | 387 | # |
| 473 | CONFIG_INPUT=y | 388 | CONFIG_INPUT=y |
| 474 | # CONFIG_INPUT_FF_MEMLESS is not set | 389 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 390 | # CONFIG_INPUT_POLLDEV is not set | ||
| 475 | 391 | ||
| 476 | # | 392 | # |
| 477 | # Userland interfaces | 393 | # Userland interfaces |
| @@ -488,6 +404,7 @@ CONFIG_INPUT=y | |||
| 488 | # CONFIG_INPUT_KEYBOARD is not set | 404 | # CONFIG_INPUT_KEYBOARD is not set |
| 489 | # CONFIG_INPUT_MOUSE is not set | 405 | # CONFIG_INPUT_MOUSE is not set |
| 490 | # CONFIG_INPUT_JOYSTICK is not set | 406 | # CONFIG_INPUT_JOYSTICK is not set |
| 407 | # CONFIG_INPUT_TABLET is not set | ||
| 491 | # CONFIG_INPUT_TOUCHSCREEN is not set | 408 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 492 | # CONFIG_INPUT_MISC is not set | 409 | # CONFIG_INPUT_MISC is not set |
| 493 | 410 | ||
| @@ -525,41 +442,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 525 | CONFIG_UNIX98_PTYS=y | 442 | CONFIG_UNIX98_PTYS=y |
| 526 | CONFIG_LEGACY_PTYS=y | 443 | CONFIG_LEGACY_PTYS=y |
| 527 | CONFIG_LEGACY_PTY_COUNT=256 | 444 | CONFIG_LEGACY_PTY_COUNT=256 |
| 528 | |||
| 529 | # | ||
| 530 | # IPMI | ||
| 531 | # | ||
| 532 | # CONFIG_IPMI_HANDLER is not set | 445 | # CONFIG_IPMI_HANDLER is not set |
| 533 | |||
| 534 | # | ||
| 535 | # Watchdog Cards | ||
| 536 | # | ||
| 537 | # CONFIG_WATCHDOG is not set | 446 | # CONFIG_WATCHDOG is not set |
| 538 | CONFIG_HW_RANDOM=y | 447 | CONFIG_HW_RANDOM=y |
| 539 | # CONFIG_RTC is not set | 448 | # CONFIG_RTC is not set |
| 540 | # CONFIG_DTLK is not set | ||
| 541 | # CONFIG_R3964 is not set | 449 | # CONFIG_R3964 is not set |
| 542 | 450 | ||
| 543 | # | 451 | # |
| 544 | # Ftape, the floppy tape device driver | ||
| 545 | # | ||
| 546 | |||
| 547 | # | ||
| 548 | # PCMCIA character devices | 452 | # PCMCIA character devices |
| 549 | # | 453 | # |
| 550 | # CONFIG_SYNCLINK_CS is not set | 454 | # CONFIG_SYNCLINK_CS is not set |
| 551 | # CONFIG_CARDMAN_4000 is not set | 455 | # CONFIG_CARDMAN_4000 is not set |
| 552 | # CONFIG_CARDMAN_4040 is not set | 456 | # CONFIG_CARDMAN_4040 is not set |
| 553 | # CONFIG_RAW_DRIVER is not set | 457 | # CONFIG_RAW_DRIVER is not set |
| 554 | |||
| 555 | # | ||
| 556 | # TPM devices | ||
| 557 | # | ||
| 558 | # CONFIG_TCG_TPM is not set | 458 | # CONFIG_TCG_TPM is not set |
| 559 | |||
| 560 | # | ||
| 561 | # I2C support | ||
| 562 | # | ||
| 563 | # CONFIG_I2C is not set | 459 | # CONFIG_I2C is not set |
| 564 | 460 | ||
| 565 | # | 461 | # |
| @@ -567,56 +463,55 @@ CONFIG_HW_RANDOM=y | |||
| 567 | # | 463 | # |
| 568 | # CONFIG_SPI is not set | 464 | # CONFIG_SPI is not set |
| 569 | # CONFIG_SPI_MASTER is not set | 465 | # CONFIG_SPI_MASTER is not set |
| 570 | |||
| 571 | # | ||
| 572 | # Dallas's 1-wire bus | ||
| 573 | # | ||
| 574 | # CONFIG_W1 is not set | 466 | # CONFIG_W1 is not set |
| 575 | 467 | # CONFIG_POWER_SUPPLY is not set | |
| 576 | # | ||
| 577 | # Hardware Monitoring support | ||
| 578 | # | ||
| 579 | CONFIG_HWMON=y | 468 | CONFIG_HWMON=y |
| 580 | # CONFIG_HWMON_VID is not set | 469 | # CONFIG_HWMON_VID is not set |
| 581 | # CONFIG_SENSORS_ABITUGURU is not set | 470 | # CONFIG_SENSORS_ABITUGURU is not set |
| 471 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 582 | # CONFIG_SENSORS_F71805F is not set | 472 | # CONFIG_SENSORS_F71805F is not set |
| 473 | # CONFIG_SENSORS_IT87 is not set | ||
| 474 | # CONFIG_SENSORS_PC87360 is not set | ||
| 475 | # CONFIG_SENSORS_PC87427 is not set | ||
| 476 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 477 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 583 | # CONFIG_SENSORS_VT1211 is not set | 478 | # CONFIG_SENSORS_VT1211 is not set |
| 479 | # CONFIG_SENSORS_W83627HF is not set | ||
| 480 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 584 | # CONFIG_HWMON_DEBUG_CHIP is not set | 481 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 585 | 482 | ||
| 586 | # | 483 | # |
| 484 | # Multifunction device drivers | ||
| 485 | # | ||
| 486 | # CONFIG_MFD_SM501 is not set | ||
| 487 | |||
| 488 | # | ||
| 587 | # Multimedia devices | 489 | # Multimedia devices |
| 588 | # | 490 | # |
| 589 | CONFIG_VIDEO_DEV=y | 491 | CONFIG_VIDEO_DEV=y |
| 590 | CONFIG_VIDEO_V4L1=y | 492 | CONFIG_VIDEO_V4L1=y |
| 591 | CONFIG_VIDEO_V4L1_COMPAT=y | 493 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 592 | CONFIG_VIDEO_V4L2=y | 494 | CONFIG_VIDEO_V4L2=y |
| 593 | 495 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | |
| 594 | # | ||
| 595 | # Video Capture Adapters | ||
| 596 | # | ||
| 597 | |||
| 598 | # | ||
| 599 | # Video Capture Adapters | ||
| 600 | # | ||
| 601 | # CONFIG_VIDEO_ADV_DEBUG is not set | 496 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 602 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 497 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 603 | # CONFIG_VIDEO_VIVI is not set | ||
| 604 | # CONFIG_VIDEO_CPIA is not set | 498 | # CONFIG_VIDEO_CPIA is not set |
| 605 | # CONFIG_VIDEO_M32R_AR is not set | 499 | # CONFIG_VIDEO_M32R_AR is not set |
| 500 | CONFIG_RADIO_ADAPTERS=y | ||
| 501 | # CONFIG_DVB_CORE is not set | ||
| 502 | CONFIG_DAB=y | ||
| 606 | 503 | ||
| 607 | # | 504 | # |
| 608 | # Radio Adapters | 505 | # Graphics support |
| 609 | # | ||
| 610 | |||
| 611 | # | ||
| 612 | # Digital Video Broadcasting Devices | ||
| 613 | # | 506 | # |
| 614 | # CONFIG_DVB is not set | 507 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 615 | 508 | ||
| 616 | # | 509 | # |
| 617 | # Graphics support | 510 | # Display device support |
| 618 | # | 511 | # |
| 619 | CONFIG_FIRMWARE_EDID=y | 512 | # CONFIG_DISPLAY_SUPPORT is not set |
| 513 | # CONFIG_VGASTATE is not set | ||
| 514 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 620 | # CONFIG_FB is not set | 515 | # CONFIG_FB is not set |
| 621 | 516 | ||
| 622 | # | 517 | # |
| @@ -624,16 +519,15 @@ CONFIG_FIRMWARE_EDID=y | |||
| 624 | # | 519 | # |
| 625 | # CONFIG_VGA_CONSOLE is not set | 520 | # CONFIG_VGA_CONSOLE is not set |
| 626 | CONFIG_DUMMY_CONSOLE=y | 521 | CONFIG_DUMMY_CONSOLE=y |
| 627 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 628 | 522 | ||
| 629 | # | 523 | # |
| 630 | # Sound | 524 | # Sound |
| 631 | # | 525 | # |
| 632 | # CONFIG_SOUND is not set | 526 | # CONFIG_SOUND is not set |
| 633 | 527 | CONFIG_HID_SUPPORT=y | |
| 634 | # | 528 | CONFIG_HID=y |
| 635 | # USB support | 529 | # CONFIG_HID_DEBUG is not set |
| 636 | # | 530 | CONFIG_USB_SUPPORT=y |
| 637 | # CONFIG_USB_ARCH_HAS_HCD is not set | 531 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 638 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 532 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 639 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 533 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -646,50 +540,18 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 646 | # USB Gadget Support | 540 | # USB Gadget Support |
| 647 | # | 541 | # |
| 648 | # CONFIG_USB_GADGET is not set | 542 | # CONFIG_USB_GADGET is not set |
| 649 | |||
| 650 | # | ||
| 651 | # MMC/SD Card support | ||
| 652 | # | ||
| 653 | # CONFIG_MMC is not set | 543 | # CONFIG_MMC is not set |
| 654 | |||
| 655 | # | ||
| 656 | # LED devices | ||
| 657 | # | ||
| 658 | # CONFIG_NEW_LEDS is not set | 544 | # CONFIG_NEW_LEDS is not set |
| 659 | 545 | ||
| 660 | # | 546 | # |
| 661 | # LED drivers | ||
| 662 | # | ||
| 663 | |||
| 664 | # | ||
| 665 | # LED Triggers | ||
| 666 | # | ||
| 667 | |||
| 668 | # | ||
| 669 | # InfiniBand support | ||
| 670 | # | ||
| 671 | |||
| 672 | # | ||
| 673 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 674 | # | ||
| 675 | |||
| 676 | # | ||
| 677 | # Real Time Clock | 547 | # Real Time Clock |
| 678 | # | 548 | # |
| 679 | # CONFIG_RTC_CLASS is not set | 549 | # CONFIG_RTC_CLASS is not set |
| 680 | 550 | ||
| 681 | # | 551 | # |
| 682 | # DMA Engine support | 552 | # Userspace I/O |
| 683 | # | ||
| 684 | # CONFIG_DMA_ENGINE is not set | ||
| 685 | |||
| 686 | # | ||
| 687 | # DMA Clients | ||
| 688 | # | ||
| 689 | |||
| 690 | # | ||
| 691 | # DMA Devices | ||
| 692 | # | 553 | # |
| 554 | # CONFIG_UIO is not set | ||
| 693 | 555 | ||
| 694 | # | 556 | # |
| 695 | # File systems | 557 | # File systems |
| @@ -784,6 +646,7 @@ CONFIG_LOCKD=y | |||
| 784 | CONFIG_LOCKD_V4=y | 646 | CONFIG_LOCKD_V4=y |
| 785 | CONFIG_NFS_COMMON=y | 647 | CONFIG_NFS_COMMON=y |
| 786 | CONFIG_SUNRPC=y | 648 | CONFIG_SUNRPC=y |
| 649 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 787 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 650 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 788 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 651 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 789 | # CONFIG_SMB_FS is not set | 652 | # CONFIG_SMB_FS is not set |
| @@ -791,7 +654,6 @@ CONFIG_SUNRPC=y | |||
| 791 | # CONFIG_NCP_FS is not set | 654 | # CONFIG_NCP_FS is not set |
| 792 | # CONFIG_CODA_FS is not set | 655 | # CONFIG_CODA_FS is not set |
| 793 | # CONFIG_AFS_FS is not set | 656 | # CONFIG_AFS_FS is not set |
| 794 | # CONFIG_9P_FS is not set | ||
| 795 | 657 | ||
| 796 | # | 658 | # |
| 797 | # Partition Types | 659 | # Partition Types |
| @@ -844,6 +706,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 844 | # CONFIG_NLS_UTF8 is not set | 706 | # CONFIG_NLS_UTF8 is not set |
| 845 | 707 | ||
| 846 | # | 708 | # |
| 709 | # Distributed Lock Manager | ||
| 710 | # | ||
| 711 | # CONFIG_DLM is not set | ||
| 712 | |||
| 713 | # | ||
| 847 | # Profiling support | 714 | # Profiling support |
| 848 | # | 715 | # |
| 849 | # CONFIG_PROFILING is not set | 716 | # CONFIG_PROFILING is not set |
| @@ -855,29 +722,27 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 855 | CONFIG_ENABLE_MUST_CHECK=y | 722 | CONFIG_ENABLE_MUST_CHECK=y |
| 856 | # CONFIG_MAGIC_SYSRQ is not set | 723 | # CONFIG_MAGIC_SYSRQ is not set |
| 857 | # CONFIG_UNUSED_SYMBOLS is not set | 724 | # CONFIG_UNUSED_SYMBOLS is not set |
| 725 | # CONFIG_DEBUG_FS is not set | ||
| 726 | # CONFIG_HEADERS_CHECK is not set | ||
| 858 | # CONFIG_DEBUG_KERNEL is not set | 727 | # CONFIG_DEBUG_KERNEL is not set |
| 859 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 860 | # CONFIG_DEBUG_BUGVERBOSE is not set | 728 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 861 | # CONFIG_DEBUG_FS is not set | ||
| 862 | # CONFIG_FRAME_POINTER is not set | 729 | # CONFIG_FRAME_POINTER is not set |
| 863 | # CONFIG_UNWIND_INFO is not set | ||
| 864 | # CONFIG_HEADERS_CHECK is not set | ||
| 865 | 730 | ||
| 866 | # | 731 | # |
| 867 | # Security options | 732 | # Security options |
| 868 | # | 733 | # |
| 869 | # CONFIG_KEYS is not set | 734 | # CONFIG_KEYS is not set |
| 870 | # CONFIG_SECURITY is not set | 735 | # CONFIG_SECURITY is not set |
| 871 | |||
| 872 | # | ||
| 873 | # Cryptographic options | ||
| 874 | # | ||
| 875 | # CONFIG_CRYPTO is not set | 736 | # CONFIG_CRYPTO is not set |
| 876 | 737 | ||
| 877 | # | 738 | # |
| 878 | # Library routines | 739 | # Library routines |
| 879 | # | 740 | # |
| 741 | CONFIG_BITREVERSE=y | ||
| 880 | # CONFIG_CRC_CCITT is not set | 742 | # CONFIG_CRC_CCITT is not set |
| 881 | # CONFIG_CRC16 is not set | 743 | # CONFIG_CRC16 is not set |
| 744 | # CONFIG_CRC_ITU_T is not set | ||
| 882 | CONFIG_CRC32=y | 745 | CONFIG_CRC32=y |
| 746 | # CONFIG_CRC7 is not set | ||
| 883 | # CONFIG_LIBCRC32C is not set | 747 | # CONFIG_LIBCRC32C is not set |
| 748 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/mappi2/defconfig.vdec2 b/arch/m32r/configs/mappi2.vdec2_defconfig index fe5b2a63cd68..42247ae4fc58 100644 --- a/arch/m32r/mappi2/defconfig.vdec2 +++ b/arch/m32r/configs/mappi2.vdec2_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 19:31:44 2006 | 4 | # Wed Aug 1 17:22:36 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -24,18 +27,19 @@ CONFIG_LOCALVERSION="" | |||
| 24 | CONFIG_LOCALVERSION_AUTO=y | 27 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | CONFIG_SWAP=y | 28 | CONFIG_SWAP=y |
| 26 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 27 | # CONFIG_IPC_NS is not set | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 28 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
| 29 | CONFIG_BSD_PROCESS_ACCT=y | 32 | CONFIG_BSD_PROCESS_ACCT=y |
| 30 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 31 | # CONFIG_TASKSTATS is not set | 34 | # CONFIG_TASKSTATS is not set |
| 32 | # CONFIG_UTS_NS is not set | 35 | # CONFIG_USER_NS is not set |
| 33 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 34 | CONFIG_IKCONFIG=y | 37 | CONFIG_IKCONFIG=y |
| 35 | # CONFIG_IKCONFIG_PROC is not set | 38 | # CONFIG_IKCONFIG_PROC is not set |
| 39 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 36 | CONFIG_SYSFS_DEPRECATED=y | 40 | CONFIG_SYSFS_DEPRECATED=y |
| 37 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
| 38 | CONFIG_INITRAMFS_SOURCE="" | 42 | # CONFIG_BLK_DEV_INITRD is not set |
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 40 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| 41 | CONFIG_EMBEDDED=y | 45 | CONFIG_EMBEDDED=y |
| @@ -47,29 +51,29 @@ CONFIG_BUG=y | |||
| 47 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 48 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 49 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 50 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 51 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 52 | CONFIG_SLAB=y | ||
| 53 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 54 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 55 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 56 | # CONFIG_SLOB is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # Loadable module support | ||
| 60 | # | ||
| 61 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 62 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 64 | # CONFIG_MODVERSIONS is not set | 69 | # CONFIG_MODVERSIONS is not set |
| 65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 66 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 67 | |||
| 68 | # | ||
| 69 | # Block layer | ||
| 70 | # | ||
| 71 | CONFIG_BLOCK=y | 72 | CONFIG_BLOCK=y |
| 73 | # CONFIG_LBD is not set | ||
| 72 | # CONFIG_BLK_DEV_IO_TRACE is not set | 74 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 75 | # CONFIG_LSF is not set | ||
| 76 | # CONFIG_BLK_DEV_BSG is not set | ||
| 73 | 77 | ||
| 74 | # | 78 | # |
| 75 | # IO Schedulers | 79 | # IO Schedulers |
| @@ -120,13 +124,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 120 | # CONFIG_SPARSEMEM_STATIC is not set | 124 | # CONFIG_SPARSEMEM_STATIC is not set |
| 121 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 125 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 122 | # CONFIG_RESOURCES_64BIT is not set | 126 | # CONFIG_RESOURCES_64BIT is not set |
| 127 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 128 | CONFIG_BOUNCE=y | ||
| 129 | CONFIG_VIRT_TO_BUS=y | ||
| 123 | CONFIG_IRAM_START=0x00f00000 | 130 | CONFIG_IRAM_START=0x00f00000 |
| 124 | CONFIG_IRAM_SIZE=0x00008000 | 131 | CONFIG_IRAM_SIZE=0x00008000 |
| 125 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 132 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 126 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 133 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 134 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 135 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 127 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 136 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 128 | CONFIG_GENERIC_HWEIGHT=y | 137 | CONFIG_GENERIC_HWEIGHT=y |
| 129 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 138 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 139 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 130 | CONFIG_PREEMPT=y | 140 | CONFIG_PREEMPT=y |
| 131 | # CONFIG_SMP is not set | 141 | # CONFIG_SMP is not set |
| 132 | CONFIG_NODES_SHIFT=1 | 142 | CONFIG_NODES_SHIFT=1 |
| @@ -134,6 +144,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 134 | # | 144 | # |
| 135 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 145 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 136 | # | 146 | # |
| 147 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 137 | # CONFIG_ISA is not set | 148 | # CONFIG_ISA is not set |
| 138 | 149 | ||
| 139 | # | 150 | # |
| @@ -151,10 +162,6 @@ CONFIG_PCMCIA_IOCTL=y | |||
| 151 | # CONFIG_M32R_CFC is not set | 162 | # CONFIG_M32R_CFC is not set |
| 152 | 163 | ||
| 153 | # | 164 | # |
| 154 | # PCI Hotplug Support | ||
| 155 | # | ||
| 156 | |||
| 157 | # | ||
| 158 | # Executable file formats | 165 | # Executable file formats |
| 159 | # | 166 | # |
| 160 | CONFIG_BINFMT_ELF=y | 167 | CONFIG_BINFMT_ELF=y |
| @@ -168,13 +175,13 @@ CONFIG_NET=y | |||
| 168 | # | 175 | # |
| 169 | # Networking options | 176 | # Networking options |
| 170 | # | 177 | # |
| 171 | # CONFIG_NETDEBUG is not set | ||
| 172 | CONFIG_PACKET=y | 178 | CONFIG_PACKET=y |
| 173 | # CONFIG_PACKET_MMAP is not set | 179 | # CONFIG_PACKET_MMAP is not set |
| 174 | CONFIG_UNIX=y | 180 | CONFIG_UNIX=y |
| 175 | CONFIG_XFRM=y | 181 | CONFIG_XFRM=y |
| 176 | # CONFIG_XFRM_USER is not set | 182 | # CONFIG_XFRM_USER is not set |
| 177 | # CONFIG_XFRM_SUB_POLICY is not set | 183 | # CONFIG_XFRM_SUB_POLICY is not set |
| 184 | # CONFIG_XFRM_MIGRATE is not set | ||
| 178 | # CONFIG_NET_KEY is not set | 185 | # CONFIG_NET_KEY is not set |
| 179 | CONFIG_INET=y | 186 | CONFIG_INET=y |
| 180 | # CONFIG_IP_MULTICAST is not set | 187 | # CONFIG_IP_MULTICAST is not set |
| @@ -207,20 +214,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 207 | # CONFIG_INET6_TUNNEL is not set | 214 | # CONFIG_INET6_TUNNEL is not set |
| 208 | # CONFIG_NETWORK_SECMARK is not set | 215 | # CONFIG_NETWORK_SECMARK is not set |
| 209 | # CONFIG_NETFILTER is not set | 216 | # CONFIG_NETFILTER is not set |
| 210 | |||
| 211 | # | ||
| 212 | # DCCP Configuration (EXPERIMENTAL) | ||
| 213 | # | ||
| 214 | # CONFIG_IP_DCCP is not set | 217 | # CONFIG_IP_DCCP is not set |
| 215 | |||
| 216 | # | ||
| 217 | # SCTP Configuration (EXPERIMENTAL) | ||
| 218 | # | ||
| 219 | # CONFIG_IP_SCTP is not set | 218 | # CONFIG_IP_SCTP is not set |
| 220 | |||
| 221 | # | ||
| 222 | # TIPC Configuration (EXPERIMENTAL) | ||
| 223 | # | ||
| 224 | # CONFIG_TIPC is not set | 219 | # CONFIG_TIPC is not set |
| 225 | # CONFIG_ATM is not set | 220 | # CONFIG_ATM is not set |
| 226 | # CONFIG_BRIDGE is not set | 221 | # CONFIG_BRIDGE is not set |
| @@ -246,7 +241,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 246 | # CONFIG_HAMRADIO is not set | 241 | # CONFIG_HAMRADIO is not set |
| 247 | # CONFIG_IRDA is not set | 242 | # CONFIG_IRDA is not set |
| 248 | # CONFIG_BT is not set | 243 | # CONFIG_BT is not set |
| 244 | # CONFIG_AF_RXRPC is not set | ||
| 245 | |||
| 246 | # | ||
| 247 | # Wireless | ||
| 248 | # | ||
| 249 | # CONFIG_CFG80211 is not set | ||
| 250 | # CONFIG_WIRELESS_EXT is not set | ||
| 251 | # CONFIG_MAC80211 is not set | ||
| 249 | # CONFIG_IEEE80211 is not set | 252 | # CONFIG_IEEE80211 is not set |
| 253 | # CONFIG_RFKILL is not set | ||
| 254 | # CONFIG_NET_9P is not set | ||
| 250 | 255 | ||
| 251 | # | 256 | # |
| 252 | # Device Drivers | 257 | # Device Drivers |
| @@ -259,29 +264,10 @@ CONFIG_STANDALONE=y | |||
| 259 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 264 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 260 | CONFIG_FW_LOADER=y | 265 | CONFIG_FW_LOADER=y |
| 261 | # CONFIG_SYS_HYPERVISOR is not set | 266 | # CONFIG_SYS_HYPERVISOR is not set |
| 262 | |||
| 263 | # | ||
| 264 | # Connector - unified userspace <-> kernelspace linker | ||
| 265 | # | ||
| 266 | # CONFIG_CONNECTOR is not set | 267 | # CONFIG_CONNECTOR is not set |
| 267 | |||
| 268 | # | ||
| 269 | # Memory Technology Devices (MTD) | ||
| 270 | # | ||
| 271 | # CONFIG_MTD is not set | 268 | # CONFIG_MTD is not set |
| 272 | |||
| 273 | # | ||
| 274 | # Parallel port support | ||
| 275 | # | ||
| 276 | # CONFIG_PARPORT is not set | 269 | # CONFIG_PARPORT is not set |
| 277 | 270 | CONFIG_BLK_DEV=y | |
| 278 | # | ||
| 279 | # Plug and Play support | ||
| 280 | # | ||
| 281 | |||
| 282 | # | ||
| 283 | # Block devices | ||
| 284 | # | ||
| 285 | # CONFIG_BLK_DEV_COW_COMMON is not set | 271 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 286 | CONFIG_BLK_DEV_LOOP=y | 272 | CONFIG_BLK_DEV_LOOP=y |
| 287 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 273 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -290,18 +276,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 290 | CONFIG_BLK_DEV_RAM_COUNT=16 | 276 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 291 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 277 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 292 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 278 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 293 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 294 | # CONFIG_CDROM_PKTCDVD is not set | 279 | # CONFIG_CDROM_PKTCDVD is not set |
| 295 | # CONFIG_ATA_OVER_ETH is not set | 280 | # CONFIG_ATA_OVER_ETH is not set |
| 296 | 281 | CONFIG_MISC_DEVICES=y | |
| 297 | # | 282 | # CONFIG_EEPROM_93CX6 is not set |
| 298 | # Misc devices | ||
| 299 | # | ||
| 300 | # CONFIG_TIFM_CORE is not set | ||
| 301 | |||
| 302 | # | ||
| 303 | # ATA/ATAPI/MFM/RLL support | ||
| 304 | # | ||
| 305 | CONFIG_IDE=y | 283 | CONFIG_IDE=y |
| 306 | CONFIG_IDE_MAX_HWIFS=4 | 284 | CONFIG_IDE_MAX_HWIFS=4 |
| 307 | CONFIG_BLK_DEV_IDE=y | 285 | CONFIG_BLK_DEV_IDE=y |
| @@ -318,14 +296,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 318 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 296 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 319 | # CONFIG_BLK_DEV_IDESCSI is not set | 297 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 320 | # CONFIG_IDE_TASK_IOCTL is not set | 298 | # CONFIG_IDE_TASK_IOCTL is not set |
| 299 | CONFIG_IDE_PROC_FS=y | ||
| 321 | 300 | ||
| 322 | # | 301 | # |
| 323 | # IDE chipset support/bugfixes | 302 | # IDE chipset support/bugfixes |
| 324 | # | 303 | # |
| 325 | CONFIG_IDE_GENERIC=y | 304 | CONFIG_IDE_GENERIC=y |
| 305 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 326 | # CONFIG_IDE_ARM is not set | 306 | # CONFIG_IDE_ARM is not set |
| 327 | # CONFIG_BLK_DEV_IDEDMA is not set | 307 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 328 | # CONFIG_IDEDMA_AUTO is not set | ||
| 329 | # CONFIG_BLK_DEV_HD is not set | 308 | # CONFIG_BLK_DEV_HD is not set |
| 330 | 309 | ||
| 331 | # | 310 | # |
| @@ -333,6 +312,8 @@ CONFIG_IDE_GENERIC=y | |||
| 333 | # | 312 | # |
| 334 | # CONFIG_RAID_ATTRS is not set | 313 | # CONFIG_RAID_ATTRS is not set |
| 335 | CONFIG_SCSI=m | 314 | CONFIG_SCSI=m |
| 315 | # CONFIG_SCSI_DMA is not set | ||
| 316 | # CONFIG_SCSI_TGT is not set | ||
| 336 | # CONFIG_SCSI_NETLINK is not set | 317 | # CONFIG_SCSI_NETLINK is not set |
| 337 | CONFIG_SCSI_PROC_FS=y | 318 | CONFIG_SCSI_PROC_FS=y |
| 338 | 319 | ||
| @@ -353,6 +334,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 353 | CONFIG_SCSI_MULTI_LUN=y | 334 | CONFIG_SCSI_MULTI_LUN=y |
| 354 | # CONFIG_SCSI_CONSTANTS is not set | 335 | # CONFIG_SCSI_CONSTANTS is not set |
| 355 | # CONFIG_SCSI_LOGGING is not set | 336 | # CONFIG_SCSI_LOGGING is not set |
| 337 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 338 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 356 | 339 | ||
| 357 | # | 340 | # |
| 358 | # SCSI Transports | 341 | # SCSI Transports |
| @@ -360,93 +343,33 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 360 | # CONFIG_SCSI_SPI_ATTRS is not set | 343 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 361 | # CONFIG_SCSI_FC_ATTRS is not set | 344 | # CONFIG_SCSI_FC_ATTRS is not set |
| 362 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 345 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 363 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 364 | # CONFIG_SCSI_SAS_LIBSAS is not set | 346 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 365 | 347 | CONFIG_SCSI_LOWLEVEL=y | |
| 366 | # | ||
| 367 | # SCSI low-level drivers | ||
| 368 | # | ||
| 369 | # CONFIG_ISCSI_TCP is not set | 348 | # CONFIG_ISCSI_TCP is not set |
| 370 | # CONFIG_SCSI_DEBUG is not set | 349 | # CONFIG_SCSI_DEBUG is not set |
| 371 | 350 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | |
| 372 | # | ||
| 373 | # PCMCIA SCSI adapter support | ||
| 374 | # | ||
| 375 | # CONFIG_PCMCIA_AHA152X is not set | ||
| 376 | # CONFIG_PCMCIA_FDOMAIN is not set | ||
| 377 | # CONFIG_PCMCIA_NINJA_SCSI is not set | ||
| 378 | # CONFIG_PCMCIA_QLOGIC is not set | ||
| 379 | # CONFIG_PCMCIA_SYM53C500 is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 383 | # | ||
| 384 | |||
| 385 | # | ||
| 386 | # Multi-device support (RAID and LVM) | ||
| 387 | # | ||
| 388 | # CONFIG_MD is not set | 351 | # CONFIG_MD is not set |
| 389 | |||
| 390 | # | ||
| 391 | # Fusion MPT device support | ||
| 392 | # | ||
| 393 | # CONFIG_FUSION is not set | ||
| 394 | |||
| 395 | # | ||
| 396 | # IEEE 1394 (FireWire) support | ||
| 397 | # | ||
| 398 | |||
| 399 | # | ||
| 400 | # I2O device support | ||
| 401 | # | ||
| 402 | |||
| 403 | # | ||
| 404 | # Network device support | ||
| 405 | # | ||
| 406 | CONFIG_NETDEVICES=y | 352 | CONFIG_NETDEVICES=y |
| 353 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 407 | # CONFIG_DUMMY is not set | 354 | # CONFIG_DUMMY is not set |
| 408 | # CONFIG_BONDING is not set | 355 | # CONFIG_BONDING is not set |
| 356 | # CONFIG_MACVLAN is not set | ||
| 409 | # CONFIG_EQUALIZER is not set | 357 | # CONFIG_EQUALIZER is not set |
| 410 | # CONFIG_TUN is not set | 358 | # CONFIG_TUN is not set |
| 411 | |||
| 412 | # | ||
| 413 | # PHY device support | ||
| 414 | # | ||
| 415 | # CONFIG_PHYLIB is not set | 359 | # CONFIG_PHYLIB is not set |
| 416 | |||
| 417 | # | ||
| 418 | # Ethernet (10 or 100Mbit) | ||
| 419 | # | ||
| 420 | CONFIG_NET_ETHERNET=y | 360 | CONFIG_NET_ETHERNET=y |
| 421 | CONFIG_MII=y | 361 | CONFIG_MII=y |
| 422 | CONFIG_SMC91X=y | 362 | CONFIG_SMC91X=y |
| 423 | # CONFIG_NE2000 is not set | 363 | # CONFIG_NE2000 is not set |
| 364 | CONFIG_NETDEV_1000=y | ||
| 365 | CONFIG_NETDEV_10000=y | ||
| 424 | 366 | ||
| 425 | # | 367 | # |
| 426 | # Ethernet (1000 Mbit) | 368 | # Wireless LAN |
| 427 | # | ||
| 428 | |||
| 429 | # | ||
| 430 | # Ethernet (10000 Mbit) | ||
| 431 | # | ||
| 432 | |||
| 433 | # | ||
| 434 | # Token Ring devices | ||
| 435 | # | ||
| 436 | |||
| 437 | # | ||
| 438 | # Wireless LAN (non-hamradio) | ||
| 439 | # | ||
| 440 | # CONFIG_NET_RADIO is not set | ||
| 441 | |||
| 442 | # | ||
| 443 | # PCMCIA network device support | ||
| 444 | # | 369 | # |
| 370 | # CONFIG_WLAN_PRE80211 is not set | ||
| 371 | # CONFIG_WLAN_80211 is not set | ||
| 445 | # CONFIG_NET_PCMCIA is not set | 372 | # CONFIG_NET_PCMCIA is not set |
| 446 | |||
| 447 | # | ||
| 448 | # Wan interfaces | ||
| 449 | # | ||
| 450 | # CONFIG_WAN is not set | 373 | # CONFIG_WAN is not set |
| 451 | # CONFIG_PPP is not set | 374 | # CONFIG_PPP is not set |
| 452 | # CONFIG_SLIP is not set | 375 | # CONFIG_SLIP is not set |
| @@ -454,15 +377,7 @@ CONFIG_SMC91X=y | |||
| 454 | # CONFIG_NETCONSOLE is not set | 377 | # CONFIG_NETCONSOLE is not set |
| 455 | # CONFIG_NETPOLL is not set | 378 | # CONFIG_NETPOLL is not set |
| 456 | # CONFIG_NET_POLL_CONTROLLER is not set | 379 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 457 | |||
| 458 | # | ||
| 459 | # ISDN subsystem | ||
| 460 | # | ||
| 461 | # CONFIG_ISDN is not set | 380 | # CONFIG_ISDN is not set |
| 462 | |||
| 463 | # | ||
| 464 | # Telephony Support | ||
| 465 | # | ||
| 466 | # CONFIG_PHONE is not set | 381 | # CONFIG_PHONE is not set |
| 467 | 382 | ||
| 468 | # | 383 | # |
| @@ -470,6 +385,7 @@ CONFIG_SMC91X=y | |||
| 470 | # | 385 | # |
| 471 | CONFIG_INPUT=y | 386 | CONFIG_INPUT=y |
| 472 | # CONFIG_INPUT_FF_MEMLESS is not set | 387 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 388 | # CONFIG_INPUT_POLLDEV is not set | ||
| 473 | 389 | ||
| 474 | # | 390 | # |
| 475 | # Userland interfaces | 391 | # Userland interfaces |
| @@ -486,6 +402,7 @@ CONFIG_INPUT=y | |||
| 486 | # CONFIG_INPUT_KEYBOARD is not set | 402 | # CONFIG_INPUT_KEYBOARD is not set |
| 487 | # CONFIG_INPUT_MOUSE is not set | 403 | # CONFIG_INPUT_MOUSE is not set |
| 488 | # CONFIG_INPUT_JOYSTICK is not set | 404 | # CONFIG_INPUT_JOYSTICK is not set |
| 405 | # CONFIG_INPUT_TABLET is not set | ||
| 489 | # CONFIG_INPUT_TOUCHSCREEN is not set | 406 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 490 | # CONFIG_INPUT_MISC is not set | 407 | # CONFIG_INPUT_MISC is not set |
| 491 | 408 | ||
| @@ -523,41 +440,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 523 | CONFIG_UNIX98_PTYS=y | 440 | CONFIG_UNIX98_PTYS=y |
| 524 | CONFIG_LEGACY_PTYS=y | 441 | CONFIG_LEGACY_PTYS=y |
| 525 | CONFIG_LEGACY_PTY_COUNT=256 | 442 | CONFIG_LEGACY_PTY_COUNT=256 |
| 526 | |||
| 527 | # | ||
| 528 | # IPMI | ||
| 529 | # | ||
| 530 | # CONFIG_IPMI_HANDLER is not set | 443 | # CONFIG_IPMI_HANDLER is not set |
| 531 | |||
| 532 | # | ||
| 533 | # Watchdog Cards | ||
| 534 | # | ||
| 535 | # CONFIG_WATCHDOG is not set | 444 | # CONFIG_WATCHDOG is not set |
| 536 | CONFIG_HW_RANDOM=y | 445 | CONFIG_HW_RANDOM=y |
| 537 | # CONFIG_RTC is not set | 446 | # CONFIG_RTC is not set |
| 538 | # CONFIG_DTLK is not set | ||
| 539 | # CONFIG_R3964 is not set | 447 | # CONFIG_R3964 is not set |
| 540 | 448 | ||
| 541 | # | 449 | # |
| 542 | # Ftape, the floppy tape device driver | ||
| 543 | # | ||
| 544 | |||
| 545 | # | ||
| 546 | # PCMCIA character devices | 450 | # PCMCIA character devices |
| 547 | # | 451 | # |
| 548 | # CONFIG_SYNCLINK_CS is not set | 452 | # CONFIG_SYNCLINK_CS is not set |
| 549 | # CONFIG_CARDMAN_4000 is not set | 453 | # CONFIG_CARDMAN_4000 is not set |
| 550 | # CONFIG_CARDMAN_4040 is not set | 454 | # CONFIG_CARDMAN_4040 is not set |
| 551 | # CONFIG_RAW_DRIVER is not set | 455 | # CONFIG_RAW_DRIVER is not set |
| 552 | |||
| 553 | # | ||
| 554 | # TPM devices | ||
| 555 | # | ||
| 556 | # CONFIG_TCG_TPM is not set | 456 | # CONFIG_TCG_TPM is not set |
| 557 | |||
| 558 | # | ||
| 559 | # I2C support | ||
| 560 | # | ||
| 561 | # CONFIG_I2C is not set | 457 | # CONFIG_I2C is not set |
| 562 | 458 | ||
| 563 | # | 459 | # |
| @@ -565,56 +461,55 @@ CONFIG_HW_RANDOM=y | |||
| 565 | # | 461 | # |
| 566 | # CONFIG_SPI is not set | 462 | # CONFIG_SPI is not set |
| 567 | # CONFIG_SPI_MASTER is not set | 463 | # CONFIG_SPI_MASTER is not set |
| 568 | |||
| 569 | # | ||
| 570 | # Dallas's 1-wire bus | ||
| 571 | # | ||
| 572 | # CONFIG_W1 is not set | 464 | # CONFIG_W1 is not set |
| 573 | 465 | # CONFIG_POWER_SUPPLY is not set | |
| 574 | # | ||
| 575 | # Hardware Monitoring support | ||
| 576 | # | ||
| 577 | CONFIG_HWMON=y | 466 | CONFIG_HWMON=y |
| 578 | # CONFIG_HWMON_VID is not set | 467 | # CONFIG_HWMON_VID is not set |
| 579 | # CONFIG_SENSORS_ABITUGURU is not set | 468 | # CONFIG_SENSORS_ABITUGURU is not set |
| 469 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 580 | # CONFIG_SENSORS_F71805F is not set | 470 | # CONFIG_SENSORS_F71805F is not set |
| 471 | # CONFIG_SENSORS_IT87 is not set | ||
| 472 | # CONFIG_SENSORS_PC87360 is not set | ||
| 473 | # CONFIG_SENSORS_PC87427 is not set | ||
| 474 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 475 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 581 | # CONFIG_SENSORS_VT1211 is not set | 476 | # CONFIG_SENSORS_VT1211 is not set |
| 477 | # CONFIG_SENSORS_W83627HF is not set | ||
| 478 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 582 | # CONFIG_HWMON_DEBUG_CHIP is not set | 479 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 583 | 480 | ||
| 584 | # | 481 | # |
| 482 | # Multifunction device drivers | ||
| 483 | # | ||
| 484 | # CONFIG_MFD_SM501 is not set | ||
| 485 | |||
| 486 | # | ||
| 585 | # Multimedia devices | 487 | # Multimedia devices |
| 586 | # | 488 | # |
| 587 | CONFIG_VIDEO_DEV=y | 489 | CONFIG_VIDEO_DEV=y |
| 588 | CONFIG_VIDEO_V4L1=y | 490 | CONFIG_VIDEO_V4L1=y |
| 589 | CONFIG_VIDEO_V4L1_COMPAT=y | 491 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 590 | CONFIG_VIDEO_V4L2=y | 492 | CONFIG_VIDEO_V4L2=y |
| 591 | 493 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | |
| 592 | # | ||
| 593 | # Video Capture Adapters | ||
| 594 | # | ||
| 595 | |||
| 596 | # | ||
| 597 | # Video Capture Adapters | ||
| 598 | # | ||
| 599 | # CONFIG_VIDEO_ADV_DEBUG is not set | 494 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 600 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 495 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 601 | # CONFIG_VIDEO_VIVI is not set | ||
| 602 | # CONFIG_VIDEO_CPIA is not set | 496 | # CONFIG_VIDEO_CPIA is not set |
| 603 | # CONFIG_VIDEO_M32R_AR is not set | 497 | # CONFIG_VIDEO_M32R_AR is not set |
| 498 | CONFIG_RADIO_ADAPTERS=y | ||
| 499 | # CONFIG_DVB_CORE is not set | ||
| 500 | CONFIG_DAB=y | ||
| 604 | 501 | ||
| 605 | # | 502 | # |
| 606 | # Radio Adapters | 503 | # Graphics support |
| 607 | # | ||
| 608 | |||
| 609 | # | ||
| 610 | # Digital Video Broadcasting Devices | ||
| 611 | # | 504 | # |
| 612 | # CONFIG_DVB is not set | 505 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 613 | 506 | ||
| 614 | # | 507 | # |
| 615 | # Graphics support | 508 | # Display device support |
| 616 | # | 509 | # |
| 617 | CONFIG_FIRMWARE_EDID=y | 510 | # CONFIG_DISPLAY_SUPPORT is not set |
| 511 | # CONFIG_VGASTATE is not set | ||
| 512 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 618 | # CONFIG_FB is not set | 513 | # CONFIG_FB is not set |
| 619 | 514 | ||
| 620 | # | 515 | # |
| @@ -622,16 +517,15 @@ CONFIG_FIRMWARE_EDID=y | |||
| 622 | # | 517 | # |
| 623 | # CONFIG_VGA_CONSOLE is not set | 518 | # CONFIG_VGA_CONSOLE is not set |
| 624 | CONFIG_DUMMY_CONSOLE=y | 519 | CONFIG_DUMMY_CONSOLE=y |
| 625 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 626 | 520 | ||
| 627 | # | 521 | # |
| 628 | # Sound | 522 | # Sound |
| 629 | # | 523 | # |
| 630 | # CONFIG_SOUND is not set | 524 | # CONFIG_SOUND is not set |
| 631 | 525 | CONFIG_HID_SUPPORT=y | |
| 632 | # | 526 | CONFIG_HID=y |
| 633 | # USB support | 527 | # CONFIG_HID_DEBUG is not set |
| 634 | # | 528 | CONFIG_USB_SUPPORT=y |
| 635 | # CONFIG_USB_ARCH_HAS_HCD is not set | 529 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 636 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 530 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 637 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 531 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -644,50 +538,18 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 644 | # USB Gadget Support | 538 | # USB Gadget Support |
| 645 | # | 539 | # |
| 646 | # CONFIG_USB_GADGET is not set | 540 | # CONFIG_USB_GADGET is not set |
| 647 | |||
| 648 | # | ||
| 649 | # MMC/SD Card support | ||
| 650 | # | ||
| 651 | # CONFIG_MMC is not set | 541 | # CONFIG_MMC is not set |
| 652 | |||
| 653 | # | ||
| 654 | # LED devices | ||
| 655 | # | ||
| 656 | # CONFIG_NEW_LEDS is not set | 542 | # CONFIG_NEW_LEDS is not set |
| 657 | 543 | ||
| 658 | # | 544 | # |
| 659 | # LED drivers | ||
| 660 | # | ||
| 661 | |||
| 662 | # | ||
| 663 | # LED Triggers | ||
| 664 | # | ||
| 665 | |||
| 666 | # | ||
| 667 | # InfiniBand support | ||
| 668 | # | ||
| 669 | |||
| 670 | # | ||
| 671 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 672 | # | ||
| 673 | |||
| 674 | # | ||
| 675 | # Real Time Clock | 545 | # Real Time Clock |
| 676 | # | 546 | # |
| 677 | # CONFIG_RTC_CLASS is not set | 547 | # CONFIG_RTC_CLASS is not set |
| 678 | 548 | ||
| 679 | # | 549 | # |
| 680 | # DMA Engine support | 550 | # Userspace I/O |
| 681 | # | ||
| 682 | # CONFIG_DMA_ENGINE is not set | ||
| 683 | |||
| 684 | # | ||
| 685 | # DMA Clients | ||
| 686 | # | ||
| 687 | |||
| 688 | # | ||
| 689 | # DMA Devices | ||
| 690 | # | 551 | # |
| 552 | # CONFIG_UIO is not set | ||
| 691 | 553 | ||
| 692 | # | 554 | # |
| 693 | # File systems | 555 | # File systems |
| @@ -782,6 +644,7 @@ CONFIG_LOCKD=y | |||
| 782 | CONFIG_LOCKD_V4=y | 644 | CONFIG_LOCKD_V4=y |
| 783 | CONFIG_NFS_COMMON=y | 645 | CONFIG_NFS_COMMON=y |
| 784 | CONFIG_SUNRPC=y | 646 | CONFIG_SUNRPC=y |
| 647 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 785 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 648 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 786 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 649 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 787 | # CONFIG_SMB_FS is not set | 650 | # CONFIG_SMB_FS is not set |
| @@ -789,7 +652,6 @@ CONFIG_SUNRPC=y | |||
| 789 | # CONFIG_NCP_FS is not set | 652 | # CONFIG_NCP_FS is not set |
| 790 | # CONFIG_CODA_FS is not set | 653 | # CONFIG_CODA_FS is not set |
| 791 | # CONFIG_AFS_FS is not set | 654 | # CONFIG_AFS_FS is not set |
| 792 | # CONFIG_9P_FS is not set | ||
| 793 | 655 | ||
| 794 | # | 656 | # |
| 795 | # Partition Types | 657 | # Partition Types |
| @@ -842,6 +704,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 842 | # CONFIG_NLS_UTF8 is not set | 704 | # CONFIG_NLS_UTF8 is not set |
| 843 | 705 | ||
| 844 | # | 706 | # |
| 707 | # Distributed Lock Manager | ||
| 708 | # | ||
| 709 | # CONFIG_DLM is not set | ||
| 710 | |||
| 711 | # | ||
| 845 | # Profiling support | 712 | # Profiling support |
| 846 | # | 713 | # |
| 847 | # CONFIG_PROFILING is not set | 714 | # CONFIG_PROFILING is not set |
| @@ -853,29 +720,27 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 853 | CONFIG_ENABLE_MUST_CHECK=y | 720 | CONFIG_ENABLE_MUST_CHECK=y |
| 854 | # CONFIG_MAGIC_SYSRQ is not set | 721 | # CONFIG_MAGIC_SYSRQ is not set |
| 855 | # CONFIG_UNUSED_SYMBOLS is not set | 722 | # CONFIG_UNUSED_SYMBOLS is not set |
| 723 | # CONFIG_DEBUG_FS is not set | ||
| 724 | # CONFIG_HEADERS_CHECK is not set | ||
| 856 | # CONFIG_DEBUG_KERNEL is not set | 725 | # CONFIG_DEBUG_KERNEL is not set |
| 857 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 858 | # CONFIG_DEBUG_BUGVERBOSE is not set | 726 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 859 | # CONFIG_DEBUG_FS is not set | ||
| 860 | # CONFIG_FRAME_POINTER is not set | 727 | # CONFIG_FRAME_POINTER is not set |
| 861 | # CONFIG_UNWIND_INFO is not set | ||
| 862 | # CONFIG_HEADERS_CHECK is not set | ||
| 863 | 728 | ||
| 864 | # | 729 | # |
| 865 | # Security options | 730 | # Security options |
| 866 | # | 731 | # |
| 867 | # CONFIG_KEYS is not set | 732 | # CONFIG_KEYS is not set |
| 868 | # CONFIG_SECURITY is not set | 733 | # CONFIG_SECURITY is not set |
| 869 | |||
| 870 | # | ||
| 871 | # Cryptographic options | ||
| 872 | # | ||
| 873 | # CONFIG_CRYPTO is not set | 734 | # CONFIG_CRYPTO is not set |
| 874 | 735 | ||
| 875 | # | 736 | # |
| 876 | # Library routines | 737 | # Library routines |
| 877 | # | 738 | # |
| 739 | CONFIG_BITREVERSE=y | ||
| 878 | # CONFIG_CRC_CCITT is not set | 740 | # CONFIG_CRC_CCITT is not set |
| 879 | # CONFIG_CRC16 is not set | 741 | # CONFIG_CRC16 is not set |
| 742 | # CONFIG_CRC_ITU_T is not set | ||
| 880 | CONFIG_CRC32=y | 743 | CONFIG_CRC32=y |
| 744 | # CONFIG_CRC7 is not set | ||
| 881 | # CONFIG_LIBCRC32C is not set | 745 | # CONFIG_LIBCRC32C is not set |
| 746 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/mappi3/defconfig.smp b/arch/m32r/configs/mappi3.smp_defconfig index 2f352267a6d9..18c564f4ea97 100644 --- a/arch/m32r/mappi3/defconfig.smp +++ b/arch/m32r/configs/mappi3.smp_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Mon Dec 11 19:57:33 2006 | 4 | # Wed Aug 1 17:22:36 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -23,17 +26,19 @@ CONFIG_LOCALVERSION="" | |||
| 23 | CONFIG_LOCALVERSION_AUTO=y | 26 | CONFIG_LOCALVERSION_AUTO=y |
| 24 | CONFIG_SWAP=y | 27 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 28 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_IPC_NS is not set | 29 | CONFIG_SYSVIPC_SYSCTL=y |
| 27 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | # CONFIG_BSD_PROCESS_ACCT is not set | 31 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 29 | # CONFIG_TASKSTATS is not set | 32 | # CONFIG_TASKSTATS is not set |
| 30 | # CONFIG_UTS_NS is not set | 33 | # CONFIG_USER_NS is not set |
| 31 | # CONFIG_AUDIT is not set | 34 | # CONFIG_AUDIT is not set |
| 32 | CONFIG_IKCONFIG=y | 35 | CONFIG_IKCONFIG=y |
| 33 | CONFIG_IKCONFIG_PROC=y | 36 | CONFIG_IKCONFIG_PROC=y |
| 37 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 34 | # CONFIG_CPUSETS is not set | 38 | # CONFIG_CPUSETS is not set |
| 35 | CONFIG_SYSFS_DEPRECATED=y | 39 | CONFIG_SYSFS_DEPRECATED=y |
| 36 | # CONFIG_RELAY is not set | 40 | # CONFIG_RELAY is not set |
| 41 | CONFIG_BLK_DEV_INITRD=y | ||
| 37 | CONFIG_INITRAMFS_SOURCE="" | 42 | CONFIG_INITRAMFS_SOURCE="" |
| 38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 39 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| @@ -46,17 +51,18 @@ CONFIG_BUG=y | |||
| 46 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 47 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 48 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 49 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 50 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 51 | CONFIG_SLAB=y | ||
| 52 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 53 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 54 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 55 | # CONFIG_SLOB is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # Loadable module support | ||
| 59 | # | ||
| 60 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 61 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 62 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -64,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y | |||
| 64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 65 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 66 | CONFIG_STOP_MACHINE=y | 72 | CONFIG_STOP_MACHINE=y |
| 67 | |||
| 68 | # | ||
| 69 | # Block layer | ||
| 70 | # | ||
| 71 | CONFIG_BLOCK=y | 73 | CONFIG_BLOCK=y |
| 74 | # CONFIG_LBD is not set | ||
| 72 | # CONFIG_BLK_DEV_IO_TRACE is not set | 75 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 76 | # CONFIG_LSF is not set | ||
| 77 | # CONFIG_BLK_DEV_BSG is not set | ||
| 73 | 78 | ||
| 74 | # | 79 | # |
| 75 | # IO Schedulers | 80 | # IO Schedulers |
| @@ -122,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 127 | # CONFIG_SPARSEMEM_STATIC is not set |
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 128 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 129 | # CONFIG_RESOURCES_64BIT is not set |
| 130 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 131 | CONFIG_BOUNCE=y | ||
| 132 | CONFIG_VIRT_TO_BUS=y | ||
| 125 | CONFIG_IRAM_START=0x00f00000 | 133 | CONFIG_IRAM_START=0x00f00000 |
| 126 | CONFIG_IRAM_SIZE=0x00080000 | 134 | CONFIG_IRAM_SIZE=0x00080000 |
| 127 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 135 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 128 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 136 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 137 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 138 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 129 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 139 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 130 | CONFIG_GENERIC_HWEIGHT=y | 140 | CONFIG_GENERIC_HWEIGHT=y |
| 131 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 141 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 142 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 132 | CONFIG_PREEMPT=y | 143 | CONFIG_PREEMPT=y |
| 133 | CONFIG_SMP=y | 144 | CONFIG_SMP=y |
| 134 | # CONFIG_CHIP_M32700_TS1 is not set | 145 | # CONFIG_CHIP_M32700_TS1 is not set |
| @@ -138,6 +149,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 138 | # | 149 | # |
| 139 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 150 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 140 | # | 151 | # |
| 152 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 141 | # CONFIG_ISA is not set | 153 | # CONFIG_ISA is not set |
| 142 | 154 | ||
| 143 | # | 155 | # |
| @@ -156,10 +168,6 @@ CONFIG_PCMCIA_IOCTL=y | |||
| 156 | # CONFIG_M32R_CFC is not set | 168 | # CONFIG_M32R_CFC is not set |
| 157 | 169 | ||
| 158 | # | 170 | # |
| 159 | # PCI Hotplug Support | ||
| 160 | # | ||
| 161 | |||
| 162 | # | ||
| 163 | # Executable file formats | 171 | # Executable file formats |
| 164 | # | 172 | # |
| 165 | CONFIG_BINFMT_ELF=y | 173 | CONFIG_BINFMT_ELF=y |
| @@ -173,12 +181,12 @@ CONFIG_NET=y | |||
| 173 | # | 181 | # |
| 174 | # Networking options | 182 | # Networking options |
| 175 | # | 183 | # |
| 176 | # CONFIG_NETDEBUG is not set | ||
| 177 | # CONFIG_PACKET is not set | 184 | # CONFIG_PACKET is not set |
| 178 | CONFIG_UNIX=y | 185 | CONFIG_UNIX=y |
| 179 | CONFIG_XFRM=y | 186 | CONFIG_XFRM=y |
| 180 | # CONFIG_XFRM_USER is not set | 187 | # CONFIG_XFRM_USER is not set |
| 181 | # CONFIG_XFRM_SUB_POLICY is not set | 188 | # CONFIG_XFRM_SUB_POLICY is not set |
| 189 | # CONFIG_XFRM_MIGRATE is not set | ||
| 182 | # CONFIG_NET_KEY is not set | 190 | # CONFIG_NET_KEY is not set |
| 183 | CONFIG_INET=y | 191 | CONFIG_INET=y |
| 184 | # CONFIG_IP_MULTICAST is not set | 192 | # CONFIG_IP_MULTICAST is not set |
| @@ -211,20 +219,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 211 | # CONFIG_INET6_TUNNEL is not set | 219 | # CONFIG_INET6_TUNNEL is not set |
| 212 | # CONFIG_NETWORK_SECMARK is not set | 220 | # CONFIG_NETWORK_SECMARK is not set |
| 213 | # CONFIG_NETFILTER is not set | 221 | # CONFIG_NETFILTER is not set |
| 214 | |||
| 215 | # | ||
| 216 | # DCCP Configuration (EXPERIMENTAL) | ||
| 217 | # | ||
| 218 | # CONFIG_IP_DCCP is not set | 222 | # CONFIG_IP_DCCP is not set |
| 219 | |||
| 220 | # | ||
| 221 | # SCTP Configuration (EXPERIMENTAL) | ||
| 222 | # | ||
| 223 | # CONFIG_IP_SCTP is not set | 223 | # CONFIG_IP_SCTP is not set |
| 224 | |||
| 225 | # | ||
| 226 | # TIPC Configuration (EXPERIMENTAL) | ||
| 227 | # | ||
| 228 | # CONFIG_TIPC is not set | 224 | # CONFIG_TIPC is not set |
| 229 | # CONFIG_ATM is not set | 225 | # CONFIG_ATM is not set |
| 230 | # CONFIG_BRIDGE is not set | 226 | # CONFIG_BRIDGE is not set |
| @@ -250,7 +246,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 250 | # CONFIG_HAMRADIO is not set | 246 | # CONFIG_HAMRADIO is not set |
| 251 | # CONFIG_IRDA is not set | 247 | # CONFIG_IRDA is not set |
| 252 | # CONFIG_BT is not set | 248 | # CONFIG_BT is not set |
| 249 | # CONFIG_AF_RXRPC is not set | ||
| 250 | |||
| 251 | # | ||
| 252 | # Wireless | ||
| 253 | # | ||
| 254 | # CONFIG_CFG80211 is not set | ||
| 255 | # CONFIG_WIRELESS_EXT is not set | ||
| 256 | # CONFIG_MAC80211 is not set | ||
| 253 | # CONFIG_IEEE80211 is not set | 257 | # CONFIG_IEEE80211 is not set |
| 258 | # CONFIG_RFKILL is not set | ||
| 259 | # CONFIG_NET_9P is not set | ||
| 254 | 260 | ||
| 255 | # | 261 | # |
| 256 | # Device Drivers | 262 | # Device Drivers |
| @@ -263,15 +269,7 @@ CONFIG_STANDALONE=y | |||
| 263 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 269 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 264 | CONFIG_FW_LOADER=y | 270 | CONFIG_FW_LOADER=y |
| 265 | # CONFIG_SYS_HYPERVISOR is not set | 271 | # CONFIG_SYS_HYPERVISOR is not set |
| 266 | |||
| 267 | # | ||
| 268 | # Connector - unified userspace <-> kernelspace linker | ||
| 269 | # | ||
| 270 | # CONFIG_CONNECTOR is not set | 272 | # CONFIG_CONNECTOR is not set |
| 271 | |||
| 272 | # | ||
| 273 | # Memory Technology Devices (MTD) | ||
| 274 | # | ||
| 275 | CONFIG_MTD=y | 273 | CONFIG_MTD=y |
| 276 | # CONFIG_MTD_DEBUG is not set | 274 | # CONFIG_MTD_DEBUG is not set |
| 277 | # CONFIG_MTD_CONCAT is not set | 275 | # CONFIG_MTD_CONCAT is not set |
| @@ -286,6 +284,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 286 | # User Modules And Translation Layers | 284 | # User Modules And Translation Layers |
| 287 | # | 285 | # |
| 288 | CONFIG_MTD_CHAR=y | 286 | CONFIG_MTD_CHAR=y |
| 287 | CONFIG_MTD_BLKDEVS=y | ||
| 289 | CONFIG_MTD_BLOCK=y | 288 | CONFIG_MTD_BLOCK=y |
| 290 | # CONFIG_FTL is not set | 289 | # CONFIG_FTL is not set |
| 291 | # CONFIG_NFTL is not set | 290 | # CONFIG_NFTL is not set |
| @@ -311,7 +310,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 311 | # CONFIG_MTD_RAM is not set | 310 | # CONFIG_MTD_RAM is not set |
| 312 | # CONFIG_MTD_ROM is not set | 311 | # CONFIG_MTD_ROM is not set |
| 313 | # CONFIG_MTD_ABSENT is not set | 312 | # CONFIG_MTD_ABSENT is not set |
| 314 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 315 | 313 | ||
| 316 | # | 314 | # |
| 317 | # Mapping drivers for chip access | 315 | # Mapping drivers for chip access |
| @@ -333,29 +331,15 @@ CONFIG_MTD_CFI_I2=y | |||
| 333 | # CONFIG_MTD_DOC2000 is not set | 331 | # CONFIG_MTD_DOC2000 is not set |
| 334 | # CONFIG_MTD_DOC2001 is not set | 332 | # CONFIG_MTD_DOC2001 is not set |
| 335 | # CONFIG_MTD_DOC2001PLUS is not set | 333 | # CONFIG_MTD_DOC2001PLUS is not set |
| 336 | |||
| 337 | # | ||
| 338 | # NAND Flash Device Drivers | ||
| 339 | # | ||
| 340 | # CONFIG_MTD_NAND is not set | 334 | # CONFIG_MTD_NAND is not set |
| 341 | |||
| 342 | # | ||
| 343 | # OneNAND Flash Device Drivers | ||
| 344 | # | ||
| 345 | # CONFIG_MTD_ONENAND is not set | 335 | # CONFIG_MTD_ONENAND is not set |
| 346 | 336 | ||
| 347 | # | 337 | # |
| 348 | # Parallel port support | 338 | # UBI - Unsorted block images |
| 349 | # | 339 | # |
| 340 | # CONFIG_MTD_UBI is not set | ||
| 350 | # CONFIG_PARPORT is not set | 341 | # CONFIG_PARPORT is not set |
| 351 | 342 | CONFIG_BLK_DEV=y | |
| 352 | # | ||
| 353 | # Plug and Play support | ||
| 354 | # | ||
| 355 | |||
| 356 | # | ||
| 357 | # Block devices | ||
| 358 | # | ||
| 359 | # CONFIG_BLK_DEV_COW_COMMON is not set | 343 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 360 | CONFIG_BLK_DEV_LOOP=y | 344 | CONFIG_BLK_DEV_LOOP=y |
| 361 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 345 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -364,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 364 | CONFIG_BLK_DEV_RAM_COUNT=16 | 348 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 365 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 349 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 366 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 350 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 367 | CONFIG_BLK_DEV_INITRD=y | ||
| 368 | # CONFIG_CDROM_PKTCDVD is not set | 351 | # CONFIG_CDROM_PKTCDVD is not set |
| 369 | # CONFIG_ATA_OVER_ETH is not set | 352 | # CONFIG_ATA_OVER_ETH is not set |
| 370 | 353 | CONFIG_MISC_DEVICES=y | |
| 371 | # | 354 | # CONFIG_EEPROM_93CX6 is not set |
| 372 | # Misc devices | ||
| 373 | # | ||
| 374 | # CONFIG_TIFM_CORE is not set | ||
| 375 | |||
| 376 | # | ||
| 377 | # ATA/ATAPI/MFM/RLL support | ||
| 378 | # | ||
| 379 | CONFIG_IDE=y | 355 | CONFIG_IDE=y |
| 380 | CONFIG_IDE_MAX_HWIFS=4 | 356 | CONFIG_IDE_MAX_HWIFS=4 |
| 381 | CONFIG_BLK_DEV_IDE=y | 357 | CONFIG_BLK_DEV_IDE=y |
| @@ -391,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 391 | # CONFIG_BLK_DEV_IDETAPE is not set | 367 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 392 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 368 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 393 | # CONFIG_IDE_TASK_IOCTL is not set | 369 | # CONFIG_IDE_TASK_IOCTL is not set |
| 370 | CONFIG_IDE_PROC_FS=y | ||
| 394 | 371 | ||
| 395 | # | 372 | # |
| 396 | # IDE chipset support/bugfixes | 373 | # IDE chipset support/bugfixes |
| 397 | # | 374 | # |
| 398 | CONFIG_IDE_GENERIC=y | 375 | CONFIG_IDE_GENERIC=y |
| 376 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 399 | # CONFIG_IDE_ARM is not set | 377 | # CONFIG_IDE_ARM is not set |
| 400 | # CONFIG_BLK_DEV_IDEDMA is not set | 378 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 401 | # CONFIG_IDEDMA_AUTO is not set | ||
| 402 | # CONFIG_BLK_DEV_HD is not set | 379 | # CONFIG_BLK_DEV_HD is not set |
| 403 | 380 | ||
| 404 | # | 381 | # |
| @@ -406,77 +383,30 @@ CONFIG_IDE_GENERIC=y | |||
| 406 | # | 383 | # |
| 407 | # CONFIG_RAID_ATTRS is not set | 384 | # CONFIG_RAID_ATTRS is not set |
| 408 | # CONFIG_SCSI is not set | 385 | # CONFIG_SCSI is not set |
| 386 | # CONFIG_SCSI_DMA is not set | ||
| 409 | # CONFIG_SCSI_NETLINK is not set | 387 | # CONFIG_SCSI_NETLINK is not set |
| 410 | |||
| 411 | # | ||
| 412 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 413 | # | ||
| 414 | |||
| 415 | # | ||
| 416 | # Multi-device support (RAID and LVM) | ||
| 417 | # | ||
| 418 | # CONFIG_MD is not set | 388 | # CONFIG_MD is not set |
| 419 | |||
| 420 | # | ||
| 421 | # Fusion MPT device support | ||
| 422 | # | ||
| 423 | # CONFIG_FUSION is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # IEEE 1394 (FireWire) support | ||
| 427 | # | ||
| 428 | |||
| 429 | # | ||
| 430 | # I2O device support | ||
| 431 | # | ||
| 432 | |||
| 433 | # | ||
| 434 | # Network device support | ||
| 435 | # | ||
| 436 | CONFIG_NETDEVICES=y | 389 | CONFIG_NETDEVICES=y |
| 390 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 437 | # CONFIG_DUMMY is not set | 391 | # CONFIG_DUMMY is not set |
| 438 | # CONFIG_BONDING is not set | 392 | # CONFIG_BONDING is not set |
| 393 | # CONFIG_MACVLAN is not set | ||
| 439 | # CONFIG_EQUALIZER is not set | 394 | # CONFIG_EQUALIZER is not set |
| 440 | # CONFIG_TUN is not set | 395 | # CONFIG_TUN is not set |
| 441 | |||
| 442 | # | ||
| 443 | # PHY device support | ||
| 444 | # | ||
| 445 | # CONFIG_PHYLIB is not set | 396 | # CONFIG_PHYLIB is not set |
| 446 | |||
| 447 | # | ||
| 448 | # Ethernet (10 or 100Mbit) | ||
| 449 | # | ||
| 450 | CONFIG_NET_ETHERNET=y | 397 | CONFIG_NET_ETHERNET=y |
| 451 | CONFIG_MII=y | 398 | CONFIG_MII=y |
| 452 | CONFIG_SMC91X=y | 399 | CONFIG_SMC91X=y |
| 453 | # CONFIG_NE2000 is not set | 400 | # CONFIG_NE2000 is not set |
| 401 | CONFIG_NETDEV_1000=y | ||
| 402 | CONFIG_NETDEV_10000=y | ||
| 454 | 403 | ||
| 455 | # | 404 | # |
| 456 | # Ethernet (1000 Mbit) | 405 | # Wireless LAN |
| 457 | # | ||
| 458 | |||
| 459 | # | ||
| 460 | # Ethernet (10000 Mbit) | ||
| 461 | # | ||
| 462 | |||
| 463 | # | ||
| 464 | # Token Ring devices | ||
| 465 | # | ||
| 466 | |||
| 467 | # | ||
| 468 | # Wireless LAN (non-hamradio) | ||
| 469 | # | ||
| 470 | # CONFIG_NET_RADIO is not set | ||
| 471 | |||
| 472 | # | ||
| 473 | # PCMCIA network device support | ||
| 474 | # | 406 | # |
| 407 | # CONFIG_WLAN_PRE80211 is not set | ||
| 408 | # CONFIG_WLAN_80211 is not set | ||
| 475 | # CONFIG_NET_PCMCIA is not set | 409 | # CONFIG_NET_PCMCIA is not set |
| 476 | |||
| 477 | # | ||
| 478 | # Wan interfaces | ||
| 479 | # | ||
| 480 | # CONFIG_WAN is not set | 410 | # CONFIG_WAN is not set |
| 481 | # CONFIG_PPP is not set | 411 | # CONFIG_PPP is not set |
| 482 | # CONFIG_SLIP is not set | 412 | # CONFIG_SLIP is not set |
| @@ -484,15 +414,7 @@ CONFIG_SMC91X=y | |||
| 484 | # CONFIG_NETCONSOLE is not set | 414 | # CONFIG_NETCONSOLE is not set |
| 485 | # CONFIG_NETPOLL is not set | 415 | # CONFIG_NETPOLL is not set |
| 486 | # CONFIG_NET_POLL_CONTROLLER is not set | 416 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 487 | |||
| 488 | # | ||
| 489 | # ISDN subsystem | ||
| 490 | # | ||
| 491 | # CONFIG_ISDN is not set | 417 | # CONFIG_ISDN is not set |
| 492 | |||
| 493 | # | ||
| 494 | # Telephony Support | ||
| 495 | # | ||
| 496 | # CONFIG_PHONE is not set | 418 | # CONFIG_PHONE is not set |
| 497 | 419 | ||
| 498 | # | 420 | # |
| @@ -500,6 +422,7 @@ CONFIG_SMC91X=y | |||
| 500 | # | 422 | # |
| 501 | CONFIG_INPUT=y | 423 | CONFIG_INPUT=y |
| 502 | # CONFIG_INPUT_FF_MEMLESS is not set | 424 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 425 | # CONFIG_INPUT_POLLDEV is not set | ||
| 503 | 426 | ||
| 504 | # | 427 | # |
| 505 | # Userland interfaces | 428 | # Userland interfaces |
| @@ -519,6 +442,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 519 | # CONFIG_INPUT_KEYBOARD is not set | 442 | # CONFIG_INPUT_KEYBOARD is not set |
| 520 | # CONFIG_INPUT_MOUSE is not set | 443 | # CONFIG_INPUT_MOUSE is not set |
| 521 | # CONFIG_INPUT_JOYSTICK is not set | 444 | # CONFIG_INPUT_JOYSTICK is not set |
| 445 | # CONFIG_INPUT_TABLET is not set | ||
| 522 | # CONFIG_INPUT_TOUCHSCREEN is not set | 446 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 523 | # CONFIG_INPUT_MISC is not set | 447 | # CONFIG_INPUT_MISC is not set |
| 524 | 448 | ||
| @@ -553,41 +477,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 553 | CONFIG_UNIX98_PTYS=y | 477 | CONFIG_UNIX98_PTYS=y |
| 554 | CONFIG_LEGACY_PTYS=y | 478 | CONFIG_LEGACY_PTYS=y |
| 555 | CONFIG_LEGACY_PTY_COUNT=256 | 479 | CONFIG_LEGACY_PTY_COUNT=256 |
| 556 | |||
| 557 | # | ||
| 558 | # IPMI | ||
| 559 | # | ||
| 560 | # CONFIG_IPMI_HANDLER is not set | 480 | # CONFIG_IPMI_HANDLER is not set |
| 561 | |||
| 562 | # | ||
| 563 | # Watchdog Cards | ||
| 564 | # | ||
| 565 | # CONFIG_WATCHDOG is not set | 481 | # CONFIG_WATCHDOG is not set |
| 566 | CONFIG_HW_RANDOM=y | 482 | CONFIG_HW_RANDOM=y |
| 567 | # CONFIG_RTC is not set | 483 | # CONFIG_RTC is not set |
| 568 | # CONFIG_DTLK is not set | ||
| 569 | # CONFIG_R3964 is not set | 484 | # CONFIG_R3964 is not set |
| 570 | 485 | ||
| 571 | # | 486 | # |
| 572 | # Ftape, the floppy tape device driver | ||
| 573 | # | ||
| 574 | |||
| 575 | # | ||
| 576 | # PCMCIA character devices | 487 | # PCMCIA character devices |
| 577 | # | 488 | # |
| 578 | # CONFIG_SYNCLINK_CS is not set | 489 | # CONFIG_SYNCLINK_CS is not set |
| 579 | # CONFIG_CARDMAN_4000 is not set | 490 | # CONFIG_CARDMAN_4000 is not set |
| 580 | # CONFIG_CARDMAN_4040 is not set | 491 | # CONFIG_CARDMAN_4040 is not set |
| 581 | # CONFIG_RAW_DRIVER is not set | 492 | # CONFIG_RAW_DRIVER is not set |
| 582 | |||
| 583 | # | ||
| 584 | # TPM devices | ||
| 585 | # | ||
| 586 | # CONFIG_TCG_TPM is not set | 493 | # CONFIG_TCG_TPM is not set |
| 587 | |||
| 588 | # | ||
| 589 | # I2C support | ||
| 590 | # | ||
| 591 | # CONFIG_I2C is not set | 494 | # CONFIG_I2C is not set |
| 592 | 495 | ||
| 593 | # | 496 | # |
| @@ -595,47 +498,56 @@ CONFIG_HW_RANDOM=y | |||
| 595 | # | 498 | # |
| 596 | # CONFIG_SPI is not set | 499 | # CONFIG_SPI is not set |
| 597 | # CONFIG_SPI_MASTER is not set | 500 | # CONFIG_SPI_MASTER is not set |
| 598 | |||
| 599 | # | ||
| 600 | # Dallas's 1-wire bus | ||
| 601 | # | ||
| 602 | # CONFIG_W1 is not set | 501 | # CONFIG_W1 is not set |
| 603 | 502 | # CONFIG_POWER_SUPPLY is not set | |
| 604 | # | ||
| 605 | # Hardware Monitoring support | ||
| 606 | # | ||
| 607 | CONFIG_HWMON=y | 503 | CONFIG_HWMON=y |
| 608 | # CONFIG_HWMON_VID is not set | 504 | # CONFIG_HWMON_VID is not set |
| 609 | # CONFIG_SENSORS_ABITUGURU is not set | 505 | # CONFIG_SENSORS_ABITUGURU is not set |
| 506 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 610 | # CONFIG_SENSORS_F71805F is not set | 507 | # CONFIG_SENSORS_F71805F is not set |
| 508 | # CONFIG_SENSORS_IT87 is not set | ||
| 509 | # CONFIG_SENSORS_PC87360 is not set | ||
| 510 | # CONFIG_SENSORS_PC87427 is not set | ||
| 511 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 512 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 611 | # CONFIG_SENSORS_VT1211 is not set | 513 | # CONFIG_SENSORS_VT1211 is not set |
| 514 | # CONFIG_SENSORS_W83627HF is not set | ||
| 515 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 612 | # CONFIG_HWMON_DEBUG_CHIP is not set | 516 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 613 | 517 | ||
| 614 | # | 518 | # |
| 615 | # Multimedia devices | 519 | # Multifunction device drivers |
| 616 | # | 520 | # |
| 617 | # CONFIG_VIDEO_DEV is not set | 521 | # CONFIG_MFD_SM501 is not set |
| 618 | 522 | ||
| 619 | # | 523 | # |
| 620 | # Digital Video Broadcasting Devices | 524 | # Multimedia devices |
| 621 | # | 525 | # |
| 622 | # CONFIG_DVB is not set | 526 | # CONFIG_VIDEO_DEV is not set |
| 527 | # CONFIG_DVB_CORE is not set | ||
| 528 | CONFIG_DAB=y | ||
| 623 | 529 | ||
| 624 | # | 530 | # |
| 625 | # Graphics support | 531 | # Graphics support |
| 626 | # | 532 | # |
| 627 | CONFIG_FIRMWARE_EDID=y | ||
| 628 | # CONFIG_FB is not set | ||
| 629 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 533 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 630 | 534 | ||
| 631 | # | 535 | # |
| 632 | # Sound | 536 | # Display device support |
| 633 | # | 537 | # |
| 634 | # CONFIG_SOUND is not set | 538 | # CONFIG_DISPLAY_SUPPORT is not set |
| 539 | # CONFIG_VGASTATE is not set | ||
| 540 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 541 | # CONFIG_FB is not set | ||
| 635 | 542 | ||
| 636 | # | 543 | # |
| 637 | # USB support | 544 | # Sound |
| 638 | # | 545 | # |
| 546 | # CONFIG_SOUND is not set | ||
| 547 | CONFIG_HID_SUPPORT=y | ||
| 548 | CONFIG_HID=y | ||
| 549 | # CONFIG_HID_DEBUG is not set | ||
| 550 | CONFIG_USB_SUPPORT=y | ||
| 639 | # CONFIG_USB_ARCH_HAS_HCD is not set | 551 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 640 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 552 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 641 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 553 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -648,50 +560,18 @@ CONFIG_FIRMWARE_EDID=y | |||
| 648 | # USB Gadget Support | 560 | # USB Gadget Support |
| 649 | # | 561 | # |
| 650 | # CONFIG_USB_GADGET is not set | 562 | # CONFIG_USB_GADGET is not set |
| 651 | |||
| 652 | # | ||
| 653 | # MMC/SD Card support | ||
| 654 | # | ||
| 655 | # CONFIG_MMC is not set | 563 | # CONFIG_MMC is not set |
| 656 | |||
| 657 | # | ||
| 658 | # LED devices | ||
| 659 | # | ||
| 660 | # CONFIG_NEW_LEDS is not set | 564 | # CONFIG_NEW_LEDS is not set |
| 661 | 565 | ||
| 662 | # | 566 | # |
| 663 | # LED drivers | ||
| 664 | # | ||
| 665 | |||
| 666 | # | ||
| 667 | # LED Triggers | ||
| 668 | # | ||
| 669 | |||
| 670 | # | ||
| 671 | # InfiniBand support | ||
| 672 | # | ||
| 673 | |||
| 674 | # | ||
| 675 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 676 | # | ||
| 677 | |||
| 678 | # | ||
| 679 | # Real Time Clock | 567 | # Real Time Clock |
| 680 | # | 568 | # |
| 681 | # CONFIG_RTC_CLASS is not set | 569 | # CONFIG_RTC_CLASS is not set |
| 682 | 570 | ||
| 683 | # | 571 | # |
| 684 | # DMA Engine support | 572 | # Userspace I/O |
| 685 | # | ||
| 686 | # CONFIG_DMA_ENGINE is not set | ||
| 687 | |||
| 688 | # | ||
| 689 | # DMA Clients | ||
| 690 | # | ||
| 691 | |||
| 692 | # | ||
| 693 | # DMA Devices | ||
| 694 | # | 573 | # |
| 574 | # CONFIG_UIO is not set | ||
| 695 | 575 | ||
| 696 | # | 576 | # |
| 697 | # File systems | 577 | # File systems |
| @@ -764,9 +644,6 @@ CONFIG_RAMFS=y | |||
| 764 | # CONFIG_BEFS_FS is not set | 644 | # CONFIG_BEFS_FS is not set |
| 765 | # CONFIG_BFS_FS is not set | 645 | # CONFIG_BFS_FS is not set |
| 766 | # CONFIG_EFS_FS is not set | 646 | # CONFIG_EFS_FS is not set |
| 767 | CONFIG_JFFS_FS=y | ||
| 768 | CONFIG_JFFS_FS_VERBOSE=0 | ||
| 769 | CONFIG_JFFS_PROC_FS=y | ||
| 770 | CONFIG_JFFS2_FS=y | 647 | CONFIG_JFFS2_FS=y |
| 771 | CONFIG_JFFS2_FS_DEBUG=0 | 648 | CONFIG_JFFS2_FS_DEBUG=0 |
| 772 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 649 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| @@ -797,6 +674,7 @@ CONFIG_LOCKD=y | |||
| 797 | CONFIG_LOCKD_V4=y | 674 | CONFIG_LOCKD_V4=y |
| 798 | CONFIG_NFS_COMMON=y | 675 | CONFIG_NFS_COMMON=y |
| 799 | CONFIG_SUNRPC=y | 676 | CONFIG_SUNRPC=y |
| 677 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 800 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 678 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 801 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 679 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 802 | # CONFIG_SMB_FS is not set | 680 | # CONFIG_SMB_FS is not set |
| @@ -804,7 +682,6 @@ CONFIG_SUNRPC=y | |||
| 804 | # CONFIG_NCP_FS is not set | 682 | # CONFIG_NCP_FS is not set |
| 805 | # CONFIG_CODA_FS is not set | 683 | # CONFIG_CODA_FS is not set |
| 806 | # CONFIG_AFS_FS is not set | 684 | # CONFIG_AFS_FS is not set |
| 807 | # CONFIG_9P_FS is not set | ||
| 808 | 685 | ||
| 809 | # | 686 | # |
| 810 | # Partition Types | 687 | # Partition Types |
| @@ -857,6 +734,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 857 | # CONFIG_NLS_UTF8 is not set | 734 | # CONFIG_NLS_UTF8 is not set |
| 858 | 735 | ||
| 859 | # | 736 | # |
| 737 | # Distributed Lock Manager | ||
| 738 | # | ||
| 739 | # CONFIG_DLM is not set | ||
| 740 | |||
| 741 | # | ||
| 860 | # Profiling support | 742 | # Profiling support |
| 861 | # | 743 | # |
| 862 | # CONFIG_PROFILING is not set | 744 | # CONFIG_PROFILING is not set |
| @@ -868,31 +750,29 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 868 | CONFIG_ENABLE_MUST_CHECK=y | 750 | CONFIG_ENABLE_MUST_CHECK=y |
| 869 | # CONFIG_MAGIC_SYSRQ is not set | 751 | # CONFIG_MAGIC_SYSRQ is not set |
| 870 | # CONFIG_UNUSED_SYMBOLS is not set | 752 | # CONFIG_UNUSED_SYMBOLS is not set |
| 753 | # CONFIG_DEBUG_FS is not set | ||
| 754 | # CONFIG_HEADERS_CHECK is not set | ||
| 871 | # CONFIG_DEBUG_KERNEL is not set | 755 | # CONFIG_DEBUG_KERNEL is not set |
| 872 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 873 | # CONFIG_DEBUG_BUGVERBOSE is not set | 756 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 874 | # CONFIG_DEBUG_FS is not set | ||
| 875 | # CONFIG_FRAME_POINTER is not set | 757 | # CONFIG_FRAME_POINTER is not set |
| 876 | # CONFIG_UNWIND_INFO is not set | ||
| 877 | # CONFIG_HEADERS_CHECK is not set | ||
| 878 | 758 | ||
| 879 | # | 759 | # |
| 880 | # Security options | 760 | # Security options |
| 881 | # | 761 | # |
| 882 | # CONFIG_KEYS is not set | 762 | # CONFIG_KEYS is not set |
| 883 | # CONFIG_SECURITY is not set | 763 | # CONFIG_SECURITY is not set |
| 884 | |||
| 885 | # | ||
| 886 | # Cryptographic options | ||
| 887 | # | ||
| 888 | # CONFIG_CRYPTO is not set | 764 | # CONFIG_CRYPTO is not set |
| 889 | 765 | ||
| 890 | # | 766 | # |
| 891 | # Library routines | 767 | # Library routines |
| 892 | # | 768 | # |
| 769 | CONFIG_BITREVERSE=y | ||
| 893 | # CONFIG_CRC_CCITT is not set | 770 | # CONFIG_CRC_CCITT is not set |
| 894 | # CONFIG_CRC16 is not set | 771 | # CONFIG_CRC16 is not set |
| 772 | # CONFIG_CRC_ITU_T is not set | ||
| 895 | CONFIG_CRC32=y | 773 | CONFIG_CRC32=y |
| 774 | # CONFIG_CRC7 is not set | ||
| 896 | # CONFIG_LIBCRC32C is not set | 775 | # CONFIG_LIBCRC32C is not set |
| 897 | CONFIG_ZLIB_INFLATE=y | 776 | CONFIG_ZLIB_INFLATE=y |
| 898 | CONFIG_ZLIB_DEFLATE=y | 777 | CONFIG_ZLIB_DEFLATE=y |
| 778 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/oaks32r/defconfig.nommu b/arch/m32r/configs/oaks32r_defconfig index aaa00828e0d3..cc0f99a59298 100644 --- a/arch/m32r/oaks32r/defconfig.nommu +++ b/arch/m32r/configs/oaks32r_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Tue Dec 12 12:09:17 2006 | 4 | # Wed Aug 1 17:22:36 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -27,12 +30,13 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 27 | CONFIG_BSD_PROCESS_ACCT=y | 30 | CONFIG_BSD_PROCESS_ACCT=y |
| 28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 31 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 29 | # CONFIG_TASKSTATS is not set | 32 | # CONFIG_TASKSTATS is not set |
| 30 | # CONFIG_UTS_NS is not set | 33 | # CONFIG_USER_NS is not set |
| 31 | # CONFIG_AUDIT is not set | 34 | # CONFIG_AUDIT is not set |
| 32 | # CONFIG_IKCONFIG is not set | 35 | # CONFIG_IKCONFIG is not set |
| 36 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 33 | CONFIG_SYSFS_DEPRECATED=y | 37 | CONFIG_SYSFS_DEPRECATED=y |
| 34 | # CONFIG_RELAY is not set | 38 | # CONFIG_RELAY is not set |
| 35 | CONFIG_INITRAMFS_SOURCE="" | 39 | # CONFIG_BLK_DEV_INITRD is not set |
| 36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 37 | CONFIG_SYSCTL=y | 41 | CONFIG_SYSCTL=y |
| 38 | CONFIG_EMBEDDED=y | 42 | CONFIG_EMBEDDED=y |
| @@ -44,28 +48,28 @@ CONFIG_BUG=y | |||
| 44 | CONFIG_ELF_CORE=y | 48 | CONFIG_ELF_CORE=y |
| 45 | CONFIG_BASE_FULL=y | 49 | CONFIG_BASE_FULL=y |
| 46 | # CONFIG_FUTEX is not set | 50 | # CONFIG_FUTEX is not set |
| 51 | CONFIG_ANON_INODES=y | ||
| 47 | # CONFIG_EPOLL is not set | 52 | # CONFIG_EPOLL is not set |
| 48 | CONFIG_SLAB=y | 53 | CONFIG_SIGNALFD=y |
| 54 | CONFIG_TIMERFD=y | ||
| 55 | CONFIG_EVENTFD=y | ||
| 49 | CONFIG_VM_EVENT_COUNTERS=y | 56 | CONFIG_VM_EVENT_COUNTERS=y |
| 57 | CONFIG_SLAB=y | ||
| 58 | # CONFIG_SLUB is not set | ||
| 59 | # CONFIG_SLOB is not set | ||
| 50 | CONFIG_TINY_SHMEM=y | 60 | CONFIG_TINY_SHMEM=y |
| 51 | CONFIG_BASE_SMALL=0 | 61 | CONFIG_BASE_SMALL=0 |
| 52 | # CONFIG_SLOB is not set | ||
| 53 | |||
| 54 | # | ||
| 55 | # Loadable module support | ||
| 56 | # | ||
| 57 | CONFIG_MODULES=y | 62 | CONFIG_MODULES=y |
| 58 | CONFIG_MODULE_UNLOAD=y | 63 | CONFIG_MODULE_UNLOAD=y |
| 59 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 64 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 60 | # CONFIG_MODVERSIONS is not set | 65 | # CONFIG_MODVERSIONS is not set |
| 61 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 66 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 62 | CONFIG_KMOD=y | 67 | CONFIG_KMOD=y |
| 63 | |||
| 64 | # | ||
| 65 | # Block layer | ||
| 66 | # | ||
| 67 | CONFIG_BLOCK=y | 68 | CONFIG_BLOCK=y |
| 69 | # CONFIG_LBD is not set | ||
| 68 | # CONFIG_BLK_DEV_IO_TRACE is not set | 70 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 71 | # CONFIG_LSF is not set | ||
| 72 | # CONFIG_BLK_DEV_BSG is not set | ||
| 69 | 73 | ||
| 70 | # | 74 | # |
| 71 | # IO Schedulers | 75 | # IO Schedulers |
| @@ -114,13 +118,18 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 114 | # CONFIG_SPARSEMEM_STATIC is not set | 118 | # CONFIG_SPARSEMEM_STATIC is not set |
| 115 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 119 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 116 | # CONFIG_RESOURCES_64BIT is not set | 120 | # CONFIG_RESOURCES_64BIT is not set |
| 121 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 122 | CONFIG_VIRT_TO_BUS=y | ||
| 117 | CONFIG_IRAM_START=0x00f00000 | 123 | CONFIG_IRAM_START=0x00f00000 |
| 118 | CONFIG_IRAM_SIZE=0x00010000 | 124 | CONFIG_IRAM_SIZE=0x00010000 |
| 119 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 125 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 120 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 126 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 127 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 128 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 121 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 129 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 122 | CONFIG_GENERIC_HWEIGHT=y | 130 | CONFIG_GENERIC_HWEIGHT=y |
| 123 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 131 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 132 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 124 | CONFIG_PREEMPT=y | 133 | CONFIG_PREEMPT=y |
| 125 | # CONFIG_SMP is not set | 134 | # CONFIG_SMP is not set |
| 126 | CONFIG_NODES_SHIFT=1 | 135 | CONFIG_NODES_SHIFT=1 |
| @@ -128,6 +137,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 128 | # | 137 | # |
| 129 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 138 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 130 | # | 139 | # |
| 140 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 131 | # CONFIG_ISA is not set | 141 | # CONFIG_ISA is not set |
| 132 | 142 | ||
| 133 | # | 143 | # |
| @@ -136,10 +146,6 @@ CONFIG_NODES_SHIFT=1 | |||
| 136 | # CONFIG_PCCARD is not set | 146 | # CONFIG_PCCARD is not set |
| 137 | 147 | ||
| 138 | # | 148 | # |
| 139 | # PCI Hotplug Support | ||
| 140 | # | ||
| 141 | |||
| 142 | # | ||
| 143 | # Executable file formats | 149 | # Executable file formats |
| 144 | # | 150 | # |
| 145 | CONFIG_BINFMT_FLAT=y | 151 | CONFIG_BINFMT_FLAT=y |
| @@ -155,13 +161,13 @@ CONFIG_NET=y | |||
| 155 | # | 161 | # |
| 156 | # Networking options | 162 | # Networking options |
| 157 | # | 163 | # |
| 158 | # CONFIG_NETDEBUG is not set | ||
| 159 | CONFIG_PACKET=y | 164 | CONFIG_PACKET=y |
| 160 | # CONFIG_PACKET_MMAP is not set | 165 | # CONFIG_PACKET_MMAP is not set |
| 161 | CONFIG_UNIX=y | 166 | CONFIG_UNIX=y |
| 162 | CONFIG_XFRM=y | 167 | CONFIG_XFRM=y |
| 163 | # CONFIG_XFRM_USER is not set | 168 | # CONFIG_XFRM_USER is not set |
| 164 | # CONFIG_XFRM_SUB_POLICY is not set | 169 | # CONFIG_XFRM_SUB_POLICY is not set |
| 170 | # CONFIG_XFRM_MIGRATE is not set | ||
| 165 | # CONFIG_NET_KEY is not set | 171 | # CONFIG_NET_KEY is not set |
| 166 | CONFIG_INET=y | 172 | CONFIG_INET=y |
| 167 | # CONFIG_IP_MULTICAST is not set | 173 | # CONFIG_IP_MULTICAST is not set |
| @@ -194,20 +200,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 194 | # CONFIG_INET6_TUNNEL is not set | 200 | # CONFIG_INET6_TUNNEL is not set |
| 195 | # CONFIG_NETWORK_SECMARK is not set | 201 | # CONFIG_NETWORK_SECMARK is not set |
| 196 | # CONFIG_NETFILTER is not set | 202 | # CONFIG_NETFILTER is not set |
| 197 | |||
| 198 | # | ||
| 199 | # DCCP Configuration (EXPERIMENTAL) | ||
| 200 | # | ||
| 201 | # CONFIG_IP_DCCP is not set | 203 | # CONFIG_IP_DCCP is not set |
| 202 | |||
| 203 | # | ||
| 204 | # SCTP Configuration (EXPERIMENTAL) | ||
| 205 | # | ||
| 206 | # CONFIG_IP_SCTP is not set | 204 | # CONFIG_IP_SCTP is not set |
| 207 | |||
| 208 | # | ||
| 209 | # TIPC Configuration (EXPERIMENTAL) | ||
| 210 | # | ||
| 211 | # CONFIG_TIPC is not set | 205 | # CONFIG_TIPC is not set |
| 212 | # CONFIG_ATM is not set | 206 | # CONFIG_ATM is not set |
| 213 | # CONFIG_BRIDGE is not set | 207 | # CONFIG_BRIDGE is not set |
| @@ -233,7 +227,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 233 | # CONFIG_HAMRADIO is not set | 227 | # CONFIG_HAMRADIO is not set |
| 234 | # CONFIG_IRDA is not set | 228 | # CONFIG_IRDA is not set |
| 235 | # CONFIG_BT is not set | 229 | # CONFIG_BT is not set |
| 230 | # CONFIG_AF_RXRPC is not set | ||
| 231 | |||
| 232 | # | ||
| 233 | # Wireless | ||
| 234 | # | ||
| 235 | # CONFIG_CFG80211 is not set | ||
| 236 | # CONFIG_WIRELESS_EXT is not set | ||
| 237 | # CONFIG_MAC80211 is not set | ||
| 236 | # CONFIG_IEEE80211 is not set | 238 | # CONFIG_IEEE80211 is not set |
| 239 | # CONFIG_RFKILL is not set | ||
| 240 | # CONFIG_NET_9P is not set | ||
| 237 | 241 | ||
| 238 | # | 242 | # |
| 239 | # Device Drivers | 243 | # Device Drivers |
| @@ -246,29 +250,10 @@ CONFIG_STANDALONE=y | |||
| 246 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 250 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 247 | # CONFIG_FW_LOADER is not set | 251 | # CONFIG_FW_LOADER is not set |
| 248 | # CONFIG_SYS_HYPERVISOR is not set | 252 | # CONFIG_SYS_HYPERVISOR is not set |
| 249 | |||
| 250 | # | ||
| 251 | # Connector - unified userspace <-> kernelspace linker | ||
| 252 | # | ||
| 253 | # CONFIG_CONNECTOR is not set | 253 | # CONFIG_CONNECTOR is not set |
| 254 | |||
| 255 | # | ||
| 256 | # Memory Technology Devices (MTD) | ||
| 257 | # | ||
| 258 | # CONFIG_MTD is not set | 254 | # CONFIG_MTD is not set |
| 259 | |||
| 260 | # | ||
| 261 | # Parallel port support | ||
| 262 | # | ||
| 263 | # CONFIG_PARPORT is not set | 255 | # CONFIG_PARPORT is not set |
| 264 | 256 | CONFIG_BLK_DEV=y | |
| 265 | # | ||
| 266 | # Plug and Play support | ||
| 267 | # | ||
| 268 | |||
| 269 | # | ||
| 270 | # Block devices | ||
| 271 | # | ||
| 272 | # CONFIG_BLK_DEV_COW_COMMON is not set | 257 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 273 | CONFIG_BLK_DEV_LOOP=y | 258 | CONFIG_BLK_DEV_LOOP=y |
| 274 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 259 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -277,18 +262,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 277 | CONFIG_BLK_DEV_RAM_COUNT=16 | 262 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 278 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 263 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 279 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 264 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 280 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 281 | # CONFIG_CDROM_PKTCDVD is not set | 265 | # CONFIG_CDROM_PKTCDVD is not set |
| 282 | # CONFIG_ATA_OVER_ETH is not set | 266 | # CONFIG_ATA_OVER_ETH is not set |
| 283 | 267 | CONFIG_MISC_DEVICES=y | |
| 284 | # | 268 | # CONFIG_EEPROM_93CX6 is not set |
| 285 | # Misc devices | ||
| 286 | # | ||
| 287 | # CONFIG_TIFM_CORE is not set | ||
| 288 | |||
| 289 | # | ||
| 290 | # ATA/ATAPI/MFM/RLL support | ||
| 291 | # | ||
| 292 | # CONFIG_IDE is not set | 269 | # CONFIG_IDE is not set |
| 293 | 270 | ||
| 294 | # | 271 | # |
| @@ -296,69 +273,25 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 296 | # | 273 | # |
| 297 | # CONFIG_RAID_ATTRS is not set | 274 | # CONFIG_RAID_ATTRS is not set |
| 298 | # CONFIG_SCSI is not set | 275 | # CONFIG_SCSI is not set |
| 276 | # CONFIG_SCSI_DMA is not set | ||
| 299 | # CONFIG_SCSI_NETLINK is not set | 277 | # CONFIG_SCSI_NETLINK is not set |
| 300 | |||
| 301 | # | ||
| 302 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 303 | # | ||
| 304 | |||
| 305 | # | ||
| 306 | # Multi-device support (RAID and LVM) | ||
| 307 | # | ||
| 308 | # CONFIG_MD is not set | 278 | # CONFIG_MD is not set |
| 309 | |||
| 310 | # | ||
| 311 | # Fusion MPT device support | ||
| 312 | # | ||
| 313 | # CONFIG_FUSION is not set | ||
| 314 | |||
| 315 | # | ||
| 316 | # IEEE 1394 (FireWire) support | ||
| 317 | # | ||
| 318 | |||
| 319 | # | ||
| 320 | # I2O device support | ||
| 321 | # | ||
| 322 | |||
| 323 | # | ||
| 324 | # Network device support | ||
| 325 | # | ||
| 326 | CONFIG_NETDEVICES=y | 279 | CONFIG_NETDEVICES=y |
| 280 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 327 | # CONFIG_DUMMY is not set | 281 | # CONFIG_DUMMY is not set |
| 328 | # CONFIG_BONDING is not set | 282 | # CONFIG_BONDING is not set |
| 283 | # CONFIG_MACVLAN is not set | ||
| 329 | # CONFIG_EQUALIZER is not set | 284 | # CONFIG_EQUALIZER is not set |
| 330 | # CONFIG_TUN is not set | 285 | # CONFIG_TUN is not set |
| 331 | |||
| 332 | # | ||
| 333 | # PHY device support | ||
| 334 | # | ||
| 335 | |||
| 336 | # | ||
| 337 | # Ethernet (10 or 100Mbit) | ||
| 338 | # | ||
| 339 | # CONFIG_NET_ETHERNET is not set | 286 | # CONFIG_NET_ETHERNET is not set |
| 340 | CONFIG_NE2000=y | 287 | CONFIG_NETDEV_1000=y |
| 341 | 288 | CONFIG_NETDEV_10000=y | |
| 342 | # | ||
| 343 | # Ethernet (1000 Mbit) | ||
| 344 | # | ||
| 345 | |||
| 346 | # | ||
| 347 | # Ethernet (10000 Mbit) | ||
| 348 | # | ||
| 349 | 289 | ||
| 350 | # | 290 | # |
| 351 | # Token Ring devices | 291 | # Wireless LAN |
| 352 | # | ||
| 353 | |||
| 354 | # | ||
| 355 | # Wireless LAN (non-hamradio) | ||
| 356 | # | ||
| 357 | # CONFIG_NET_RADIO is not set | ||
| 358 | |||
| 359 | # | ||
| 360 | # Wan interfaces | ||
| 361 | # | 292 | # |
| 293 | # CONFIG_WLAN_PRE80211 is not set | ||
| 294 | # CONFIG_WLAN_80211 is not set | ||
| 362 | # CONFIG_WAN is not set | 295 | # CONFIG_WAN is not set |
| 363 | # CONFIG_PPP is not set | 296 | # CONFIG_PPP is not set |
| 364 | # CONFIG_SLIP is not set | 297 | # CONFIG_SLIP is not set |
| @@ -366,15 +299,7 @@ CONFIG_NE2000=y | |||
| 366 | # CONFIG_NETCONSOLE is not set | 299 | # CONFIG_NETCONSOLE is not set |
| 367 | # CONFIG_NETPOLL is not set | 300 | # CONFIG_NETPOLL is not set |
| 368 | # CONFIG_NET_POLL_CONTROLLER is not set | 301 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 369 | |||
| 370 | # | ||
| 371 | # ISDN subsystem | ||
| 372 | # | ||
| 373 | # CONFIG_ISDN is not set | 302 | # CONFIG_ISDN is not set |
| 374 | |||
| 375 | # | ||
| 376 | # Telephony Support | ||
| 377 | # | ||
| 378 | # CONFIG_PHONE is not set | 303 | # CONFIG_PHONE is not set |
| 379 | 304 | ||
| 380 | # | 305 | # |
| @@ -382,6 +307,7 @@ CONFIG_NE2000=y | |||
| 382 | # | 307 | # |
| 383 | CONFIG_INPUT=y | 308 | CONFIG_INPUT=y |
| 384 | # CONFIG_INPUT_FF_MEMLESS is not set | 309 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 310 | # CONFIG_INPUT_POLLDEV is not set | ||
| 385 | 311 | ||
| 386 | # | 312 | # |
| 387 | # Userland interfaces | 313 | # Userland interfaces |
| @@ -398,6 +324,7 @@ CONFIG_INPUT=y | |||
| 398 | # CONFIG_INPUT_KEYBOARD is not set | 324 | # CONFIG_INPUT_KEYBOARD is not set |
| 399 | # CONFIG_INPUT_MOUSE is not set | 325 | # CONFIG_INPUT_MOUSE is not set |
| 400 | # CONFIG_INPUT_JOYSTICK is not set | 326 | # CONFIG_INPUT_JOYSTICK is not set |
| 327 | # CONFIG_INPUT_TABLET is not set | ||
| 401 | # CONFIG_INPUT_TOUCHSCREEN is not set | 328 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 402 | # CONFIG_INPUT_MISC is not set | 329 | # CONFIG_INPUT_MISC is not set |
| 403 | 330 | ||
| @@ -432,34 +359,13 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y | |||
| 432 | CONFIG_UNIX98_PTYS=y | 359 | CONFIG_UNIX98_PTYS=y |
| 433 | CONFIG_LEGACY_PTYS=y | 360 | CONFIG_LEGACY_PTYS=y |
| 434 | CONFIG_LEGACY_PTY_COUNT=256 | 361 | CONFIG_LEGACY_PTY_COUNT=256 |
| 435 | |||
| 436 | # | ||
| 437 | # IPMI | ||
| 438 | # | ||
| 439 | # CONFIG_IPMI_HANDLER is not set | 362 | # CONFIG_IPMI_HANDLER is not set |
| 440 | |||
| 441 | # | ||
| 442 | # Watchdog Cards | ||
| 443 | # | ||
| 444 | # CONFIG_WATCHDOG is not set | 363 | # CONFIG_WATCHDOG is not set |
| 445 | CONFIG_HW_RANDOM=y | 364 | CONFIG_HW_RANDOM=y |
| 446 | # CONFIG_RTC is not set | 365 | # CONFIG_RTC is not set |
| 447 | # CONFIG_DTLK is not set | ||
| 448 | # CONFIG_R3964 is not set | 366 | # CONFIG_R3964 is not set |
| 449 | |||
| 450 | # | ||
| 451 | # Ftape, the floppy tape device driver | ||
| 452 | # | ||
| 453 | # CONFIG_RAW_DRIVER is not set | 367 | # CONFIG_RAW_DRIVER is not set |
| 454 | |||
| 455 | # | ||
| 456 | # TPM devices | ||
| 457 | # | ||
| 458 | # CONFIG_TCG_TPM is not set | 368 | # CONFIG_TCG_TPM is not set |
| 459 | |||
| 460 | # | ||
| 461 | # I2C support | ||
| 462 | # | ||
| 463 | # CONFIG_I2C is not set | 369 | # CONFIG_I2C is not set |
| 464 | 370 | ||
| 465 | # | 371 | # |
| @@ -467,47 +373,56 @@ CONFIG_HW_RANDOM=y | |||
| 467 | # | 373 | # |
| 468 | # CONFIG_SPI is not set | 374 | # CONFIG_SPI is not set |
| 469 | # CONFIG_SPI_MASTER is not set | 375 | # CONFIG_SPI_MASTER is not set |
| 470 | |||
| 471 | # | ||
| 472 | # Dallas's 1-wire bus | ||
| 473 | # | ||
| 474 | # CONFIG_W1 is not set | 376 | # CONFIG_W1 is not set |
| 475 | 377 | # CONFIG_POWER_SUPPLY is not set | |
| 476 | # | ||
| 477 | # Hardware Monitoring support | ||
| 478 | # | ||
| 479 | CONFIG_HWMON=y | 378 | CONFIG_HWMON=y |
| 480 | # CONFIG_HWMON_VID is not set | 379 | # CONFIG_HWMON_VID is not set |
| 481 | # CONFIG_SENSORS_ABITUGURU is not set | 380 | # CONFIG_SENSORS_ABITUGURU is not set |
| 381 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 482 | # CONFIG_SENSORS_F71805F is not set | 382 | # CONFIG_SENSORS_F71805F is not set |
| 383 | # CONFIG_SENSORS_IT87 is not set | ||
| 384 | # CONFIG_SENSORS_PC87360 is not set | ||
| 385 | # CONFIG_SENSORS_PC87427 is not set | ||
| 386 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 387 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 483 | # CONFIG_SENSORS_VT1211 is not set | 388 | # CONFIG_SENSORS_VT1211 is not set |
| 389 | # CONFIG_SENSORS_W83627HF is not set | ||
| 390 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 484 | # CONFIG_HWMON_DEBUG_CHIP is not set | 391 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 485 | 392 | ||
| 486 | # | 393 | # |
| 487 | # Multimedia devices | 394 | # Multifunction device drivers |
| 488 | # | 395 | # |
| 489 | # CONFIG_VIDEO_DEV is not set | 396 | # CONFIG_MFD_SM501 is not set |
| 490 | 397 | ||
| 491 | # | 398 | # |
| 492 | # Digital Video Broadcasting Devices | 399 | # Multimedia devices |
| 493 | # | 400 | # |
| 494 | # CONFIG_DVB is not set | 401 | # CONFIG_VIDEO_DEV is not set |
| 402 | # CONFIG_DVB_CORE is not set | ||
| 403 | CONFIG_DAB=y | ||
| 495 | 404 | ||
| 496 | # | 405 | # |
| 497 | # Graphics support | 406 | # Graphics support |
| 498 | # | 407 | # |
| 499 | CONFIG_FIRMWARE_EDID=y | ||
| 500 | # CONFIG_FB is not set | ||
| 501 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 408 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 502 | 409 | ||
| 503 | # | 410 | # |
| 504 | # Sound | 411 | # Display device support |
| 505 | # | 412 | # |
| 506 | # CONFIG_SOUND is not set | 413 | # CONFIG_DISPLAY_SUPPORT is not set |
| 414 | # CONFIG_VGASTATE is not set | ||
| 415 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 416 | # CONFIG_FB is not set | ||
| 507 | 417 | ||
| 508 | # | 418 | # |
| 509 | # USB support | 419 | # Sound |
| 510 | # | 420 | # |
| 421 | # CONFIG_SOUND is not set | ||
| 422 | CONFIG_HID_SUPPORT=y | ||
| 423 | CONFIG_HID=y | ||
| 424 | # CONFIG_HID_DEBUG is not set | ||
| 425 | CONFIG_USB_SUPPORT=y | ||
| 511 | # CONFIG_USB_ARCH_HAS_HCD is not set | 426 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 512 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 427 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 513 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 428 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -520,50 +435,18 @@ CONFIG_FIRMWARE_EDID=y | |||
| 520 | # USB Gadget Support | 435 | # USB Gadget Support |
| 521 | # | 436 | # |
| 522 | # CONFIG_USB_GADGET is not set | 437 | # CONFIG_USB_GADGET is not set |
| 523 | |||
| 524 | # | ||
| 525 | # MMC/SD Card support | ||
| 526 | # | ||
| 527 | # CONFIG_MMC is not set | 438 | # CONFIG_MMC is not set |
| 528 | |||
| 529 | # | ||
| 530 | # LED devices | ||
| 531 | # | ||
| 532 | # CONFIG_NEW_LEDS is not set | 439 | # CONFIG_NEW_LEDS is not set |
| 533 | 440 | ||
| 534 | # | 441 | # |
| 535 | # LED drivers | ||
| 536 | # | ||
| 537 | |||
| 538 | # | ||
| 539 | # LED Triggers | ||
| 540 | # | ||
| 541 | |||
| 542 | # | ||
| 543 | # InfiniBand support | ||
| 544 | # | ||
| 545 | |||
| 546 | # | ||
| 547 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 548 | # | ||
| 549 | |||
| 550 | # | ||
| 551 | # Real Time Clock | 442 | # Real Time Clock |
| 552 | # | 443 | # |
| 553 | # CONFIG_RTC_CLASS is not set | 444 | # CONFIG_RTC_CLASS is not set |
| 554 | 445 | ||
| 555 | # | 446 | # |
| 556 | # DMA Engine support | 447 | # Userspace I/O |
| 557 | # | ||
| 558 | # CONFIG_DMA_ENGINE is not set | ||
| 559 | |||
| 560 | # | ||
| 561 | # DMA Clients | ||
| 562 | # | ||
| 563 | |||
| 564 | # | ||
| 565 | # DMA Devices | ||
| 566 | # | 448 | # |
| 449 | # CONFIG_UIO is not set | ||
| 567 | 450 | ||
| 568 | # | 451 | # |
| 569 | # File systems | 452 | # File systems |
| @@ -643,6 +526,7 @@ CONFIG_LOCKD=y | |||
| 643 | CONFIG_LOCKD_V4=y | 526 | CONFIG_LOCKD_V4=y |
| 644 | CONFIG_NFS_COMMON=y | 527 | CONFIG_NFS_COMMON=y |
| 645 | CONFIG_SUNRPC=y | 528 | CONFIG_SUNRPC=y |
| 529 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 646 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 530 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 647 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 531 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 648 | # CONFIG_SMB_FS is not set | 532 | # CONFIG_SMB_FS is not set |
| @@ -650,7 +534,6 @@ CONFIG_SUNRPC=y | |||
| 650 | # CONFIG_NCP_FS is not set | 534 | # CONFIG_NCP_FS is not set |
| 651 | # CONFIG_CODA_FS is not set | 535 | # CONFIG_CODA_FS is not set |
| 652 | # CONFIG_AFS_FS is not set | 536 | # CONFIG_AFS_FS is not set |
| 653 | # CONFIG_9P_FS is not set | ||
| 654 | 537 | ||
| 655 | # | 538 | # |
| 656 | # Partition Types | 539 | # Partition Types |
| @@ -703,6 +586,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 703 | # CONFIG_NLS_UTF8 is not set | 586 | # CONFIG_NLS_UTF8 is not set |
| 704 | 587 | ||
| 705 | # | 588 | # |
| 589 | # Distributed Lock Manager | ||
| 590 | # | ||
| 591 | # CONFIG_DLM is not set | ||
| 592 | |||
| 593 | # | ||
| 706 | # Profiling support | 594 | # Profiling support |
| 707 | # | 595 | # |
| 708 | # CONFIG_PROFILING is not set | 596 | # CONFIG_PROFILING is not set |
| @@ -714,29 +602,27 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 714 | CONFIG_ENABLE_MUST_CHECK=y | 602 | CONFIG_ENABLE_MUST_CHECK=y |
| 715 | # CONFIG_MAGIC_SYSRQ is not set | 603 | # CONFIG_MAGIC_SYSRQ is not set |
| 716 | # CONFIG_UNUSED_SYMBOLS is not set | 604 | # CONFIG_UNUSED_SYMBOLS is not set |
| 605 | # CONFIG_DEBUG_FS is not set | ||
| 606 | # CONFIG_HEADERS_CHECK is not set | ||
| 717 | # CONFIG_DEBUG_KERNEL is not set | 607 | # CONFIG_DEBUG_KERNEL is not set |
| 718 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 719 | # CONFIG_DEBUG_BUGVERBOSE is not set | 608 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 720 | # CONFIG_DEBUG_FS is not set | ||
| 721 | # CONFIG_FRAME_POINTER is not set | 609 | # CONFIG_FRAME_POINTER is not set |
| 722 | # CONFIG_UNWIND_INFO is not set | ||
| 723 | # CONFIG_HEADERS_CHECK is not set | ||
| 724 | 610 | ||
| 725 | # | 611 | # |
| 726 | # Security options | 612 | # Security options |
| 727 | # | 613 | # |
| 728 | # CONFIG_KEYS is not set | 614 | # CONFIG_KEYS is not set |
| 729 | # CONFIG_SECURITY is not set | 615 | # CONFIG_SECURITY is not set |
| 730 | |||
| 731 | # | ||
| 732 | # Cryptographic options | ||
| 733 | # | ||
| 734 | # CONFIG_CRYPTO is not set | 616 | # CONFIG_CRYPTO is not set |
| 735 | 617 | ||
| 736 | # | 618 | # |
| 737 | # Library routines | 619 | # Library routines |
| 738 | # | 620 | # |
| 621 | CONFIG_BITREVERSE=y | ||
| 739 | # CONFIG_CRC_CCITT is not set | 622 | # CONFIG_CRC_CCITT is not set |
| 740 | # CONFIG_CRC16 is not set | 623 | # CONFIG_CRC16 is not set |
| 624 | # CONFIG_CRC_ITU_T is not set | ||
| 741 | CONFIG_CRC32=y | 625 | CONFIG_CRC32=y |
| 626 | # CONFIG_CRC7 is not set | ||
| 742 | # CONFIG_LIBCRC32C is not set | 627 | # CONFIG_LIBCRC32C is not set |
| 628 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/opsput/defconfig.opsput b/arch/m32r/configs/opsput_defconfig index 461f95e72d17..39f5c1a5064b 100644 --- a/arch/m32r/opsput/defconfig.opsput +++ b/arch/m32r/configs/opsput_defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Wed Dec 13 18:34:36 2006 | 4 | # Wed Aug 1 17:22:37 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -23,18 +26,19 @@ CONFIG_LOCALVERSION="" | |||
| 23 | CONFIG_LOCALVERSION_AUTO=y | 26 | CONFIG_LOCALVERSION_AUTO=y |
| 24 | CONFIG_SWAP=y | 27 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 28 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_IPC_NS is not set | 29 | CONFIG_SYSVIPC_SYSCTL=y |
| 27 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | CONFIG_BSD_PROCESS_ACCT=y | 31 | CONFIG_BSD_PROCESS_ACCT=y |
| 29 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 32 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 30 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
| 31 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
| 32 | # CONFIG_AUDIT is not set | 35 | # CONFIG_AUDIT is not set |
| 33 | CONFIG_IKCONFIG=y | 36 | CONFIG_IKCONFIG=y |
| 34 | # CONFIG_IKCONFIG_PROC is not set | 37 | # CONFIG_IKCONFIG_PROC is not set |
| 38 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 35 | CONFIG_SYSFS_DEPRECATED=y | 39 | CONFIG_SYSFS_DEPRECATED=y |
| 36 | # CONFIG_RELAY is not set | 40 | # CONFIG_RELAY is not set |
| 37 | CONFIG_INITRAMFS_SOURCE="" | 41 | # CONFIG_BLK_DEV_INITRD is not set |
| 38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 42 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 39 | CONFIG_SYSCTL=y | 43 | CONFIG_SYSCTL=y |
| 40 | CONFIG_EMBEDDED=y | 44 | CONFIG_EMBEDDED=y |
| @@ -46,29 +50,29 @@ CONFIG_BUG=y | |||
| 46 | CONFIG_ELF_CORE=y | 50 | CONFIG_ELF_CORE=y |
| 47 | CONFIG_BASE_FULL=y | 51 | CONFIG_BASE_FULL=y |
| 48 | # CONFIG_FUTEX is not set | 52 | # CONFIG_FUTEX is not set |
| 53 | CONFIG_ANON_INODES=y | ||
| 49 | # CONFIG_EPOLL is not set | 54 | # CONFIG_EPOLL is not set |
| 55 | CONFIG_SIGNALFD=y | ||
| 56 | CONFIG_TIMERFD=y | ||
| 57 | CONFIG_EVENTFD=y | ||
| 50 | CONFIG_SHMEM=y | 58 | CONFIG_SHMEM=y |
| 51 | CONFIG_SLAB=y | ||
| 52 | CONFIG_VM_EVENT_COUNTERS=y | 59 | CONFIG_VM_EVENT_COUNTERS=y |
| 60 | CONFIG_SLAB=y | ||
| 61 | # CONFIG_SLUB is not set | ||
| 62 | # CONFIG_SLOB is not set | ||
| 53 | # CONFIG_TINY_SHMEM is not set | 63 | # CONFIG_TINY_SHMEM is not set |
| 54 | CONFIG_BASE_SMALL=0 | 64 | CONFIG_BASE_SMALL=0 |
| 55 | # CONFIG_SLOB is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # Loadable module support | ||
| 59 | # | ||
| 60 | CONFIG_MODULES=y | 65 | CONFIG_MODULES=y |
| 61 | CONFIG_MODULE_UNLOAD=y | 66 | CONFIG_MODULE_UNLOAD=y |
| 62 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 67 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 63 | # CONFIG_MODVERSIONS is not set | 68 | # CONFIG_MODVERSIONS is not set |
| 64 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 69 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 65 | CONFIG_KMOD=y | 70 | CONFIG_KMOD=y |
| 66 | |||
| 67 | # | ||
| 68 | # Block layer | ||
| 69 | # | ||
| 70 | CONFIG_BLOCK=y | 71 | CONFIG_BLOCK=y |
| 72 | # CONFIG_LBD is not set | ||
| 71 | # CONFIG_BLK_DEV_IO_TRACE is not set | 73 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 74 | # CONFIG_LSF is not set | ||
| 75 | # CONFIG_BLK_DEV_BSG is not set | ||
| 72 | 76 | ||
| 73 | # | 77 | # |
| 74 | # IO Schedulers | 78 | # IO Schedulers |
| @@ -121,13 +125,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 121 | # CONFIG_SPARSEMEM_STATIC is not set | 125 | # CONFIG_SPARSEMEM_STATIC is not set |
| 122 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 126 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 123 | # CONFIG_RESOURCES_64BIT is not set | 127 | # CONFIG_RESOURCES_64BIT is not set |
| 128 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 129 | CONFIG_BOUNCE=y | ||
| 130 | CONFIG_VIRT_TO_BUS=y | ||
| 124 | CONFIG_IRAM_START=0x00f00000 | 131 | CONFIG_IRAM_START=0x00f00000 |
| 125 | CONFIG_IRAM_SIZE=0x00010000 | 132 | CONFIG_IRAM_SIZE=0x00010000 |
| 126 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 133 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 127 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 134 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 135 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 136 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 128 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 137 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 129 | CONFIG_GENERIC_HWEIGHT=y | 138 | CONFIG_GENERIC_HWEIGHT=y |
| 130 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 139 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 140 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 131 | # CONFIG_PREEMPT is not set | 141 | # CONFIG_PREEMPT is not set |
| 132 | # CONFIG_SMP is not set | 142 | # CONFIG_SMP is not set |
| 133 | CONFIG_NODES_SHIFT=1 | 143 | CONFIG_NODES_SHIFT=1 |
| @@ -135,6 +145,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 135 | # | 145 | # |
| 136 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 146 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 137 | # | 147 | # |
| 148 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 138 | # CONFIG_ISA is not set | 149 | # CONFIG_ISA is not set |
| 139 | 150 | ||
| 140 | # | 151 | # |
| @@ -154,10 +165,6 @@ CONFIG_M32R_CFC_NUM=1 | |||
| 154 | CONFIG_PCCARD_NONSTATIC=y | 165 | CONFIG_PCCARD_NONSTATIC=y |
| 155 | 166 | ||
| 156 | # | 167 | # |
| 157 | # PCI Hotplug Support | ||
| 158 | # | ||
| 159 | |||
| 160 | # | ||
| 161 | # Executable file formats | 168 | # Executable file formats |
| 162 | # | 169 | # |
| 163 | CONFIG_BINFMT_ELF=y | 170 | CONFIG_BINFMT_ELF=y |
| @@ -171,13 +178,13 @@ CONFIG_NET=y | |||
| 171 | # | 178 | # |
| 172 | # Networking options | 179 | # Networking options |
| 173 | # | 180 | # |
| 174 | # CONFIG_NETDEBUG is not set | ||
| 175 | CONFIG_PACKET=y | 181 | CONFIG_PACKET=y |
| 176 | # CONFIG_PACKET_MMAP is not set | 182 | # CONFIG_PACKET_MMAP is not set |
| 177 | CONFIG_UNIX=y | 183 | CONFIG_UNIX=y |
| 178 | CONFIG_XFRM=y | 184 | CONFIG_XFRM=y |
| 179 | # CONFIG_XFRM_USER is not set | 185 | # CONFIG_XFRM_USER is not set |
| 180 | # CONFIG_XFRM_SUB_POLICY is not set | 186 | # CONFIG_XFRM_SUB_POLICY is not set |
| 187 | # CONFIG_XFRM_MIGRATE is not set | ||
| 181 | # CONFIG_NET_KEY is not set | 188 | # CONFIG_NET_KEY is not set |
| 182 | CONFIG_INET=y | 189 | CONFIG_INET=y |
| 183 | # CONFIG_IP_MULTICAST is not set | 190 | # CONFIG_IP_MULTICAST is not set |
| @@ -210,20 +217,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 210 | # CONFIG_INET6_TUNNEL is not set | 217 | # CONFIG_INET6_TUNNEL is not set |
| 211 | # CONFIG_NETWORK_SECMARK is not set | 218 | # CONFIG_NETWORK_SECMARK is not set |
| 212 | # CONFIG_NETFILTER is not set | 219 | # CONFIG_NETFILTER is not set |
| 213 | |||
| 214 | # | ||
| 215 | # DCCP Configuration (EXPERIMENTAL) | ||
| 216 | # | ||
| 217 | # CONFIG_IP_DCCP is not set | 220 | # CONFIG_IP_DCCP is not set |
| 218 | |||
| 219 | # | ||
| 220 | # SCTP Configuration (EXPERIMENTAL) | ||
| 221 | # | ||
| 222 | # CONFIG_IP_SCTP is not set | 221 | # CONFIG_IP_SCTP is not set |
| 223 | |||
| 224 | # | ||
| 225 | # TIPC Configuration (EXPERIMENTAL) | ||
| 226 | # | ||
| 227 | # CONFIG_TIPC is not set | 222 | # CONFIG_TIPC is not set |
| 228 | # CONFIG_ATM is not set | 223 | # CONFIG_ATM is not set |
| 229 | # CONFIG_BRIDGE is not set | 224 | # CONFIG_BRIDGE is not set |
| @@ -249,7 +244,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 249 | # CONFIG_HAMRADIO is not set | 244 | # CONFIG_HAMRADIO is not set |
| 250 | # CONFIG_IRDA is not set | 245 | # CONFIG_IRDA is not set |
| 251 | # CONFIG_BT is not set | 246 | # CONFIG_BT is not set |
| 247 | # CONFIG_AF_RXRPC is not set | ||
| 248 | |||
| 249 | # | ||
| 250 | # Wireless | ||
| 251 | # | ||
| 252 | # CONFIG_CFG80211 is not set | ||
| 253 | # CONFIG_WIRELESS_EXT is not set | ||
| 254 | # CONFIG_MAC80211 is not set | ||
| 252 | # CONFIG_IEEE80211 is not set | 255 | # CONFIG_IEEE80211 is not set |
| 256 | # CONFIG_RFKILL is not set | ||
| 257 | # CONFIG_NET_9P is not set | ||
| 253 | 258 | ||
| 254 | # | 259 | # |
| 255 | # Device Drivers | 260 | # Device Drivers |
| @@ -262,30 +267,12 @@ CONFIG_STANDALONE=y | |||
| 262 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 267 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 263 | CONFIG_FW_LOADER=y | 268 | CONFIG_FW_LOADER=y |
| 264 | # CONFIG_DEBUG_DRIVER is not set | 269 | # CONFIG_DEBUG_DRIVER is not set |
| 270 | # CONFIG_DEBUG_DEVRES is not set | ||
| 265 | # CONFIG_SYS_HYPERVISOR is not set | 271 | # CONFIG_SYS_HYPERVISOR is not set |
| 266 | |||
| 267 | # | ||
| 268 | # Connector - unified userspace <-> kernelspace linker | ||
| 269 | # | ||
| 270 | # CONFIG_CONNECTOR is not set | 272 | # CONFIG_CONNECTOR is not set |
| 271 | |||
| 272 | # | ||
| 273 | # Memory Technology Devices (MTD) | ||
| 274 | # | ||
| 275 | # CONFIG_MTD is not set | 273 | # CONFIG_MTD is not set |
| 276 | |||
| 277 | # | ||
| 278 | # Parallel port support | ||
| 279 | # | ||
| 280 | # CONFIG_PARPORT is not set | 274 | # CONFIG_PARPORT is not set |
| 281 | 275 | CONFIG_BLK_DEV=y | |
| 282 | # | ||
| 283 | # Plug and Play support | ||
| 284 | # | ||
| 285 | |||
| 286 | # | ||
| 287 | # Block devices | ||
| 288 | # | ||
| 289 | # CONFIG_BLK_DEV_COW_COMMON is not set | 276 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 290 | CONFIG_BLK_DEV_LOOP=y | 277 | CONFIG_BLK_DEV_LOOP=y |
| 291 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 278 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -294,18 +281,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 294 | CONFIG_BLK_DEV_RAM_COUNT=16 | 281 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 295 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 282 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 296 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 283 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 297 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 298 | # CONFIG_CDROM_PKTCDVD is not set | 284 | # CONFIG_CDROM_PKTCDVD is not set |
| 299 | # CONFIG_ATA_OVER_ETH is not set | 285 | # CONFIG_ATA_OVER_ETH is not set |
| 300 | 286 | CONFIG_MISC_DEVICES=y | |
| 301 | # | 287 | # CONFIG_EEPROM_93CX6 is not set |
| 302 | # Misc devices | ||
| 303 | # | ||
| 304 | # CONFIG_TIFM_CORE is not set | ||
| 305 | |||
| 306 | # | ||
| 307 | # ATA/ATAPI/MFM/RLL support | ||
| 308 | # | ||
| 309 | # CONFIG_IDE is not set | 288 | # CONFIG_IDE is not set |
| 310 | 289 | ||
| 311 | # | 290 | # |
| @@ -313,6 +292,8 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 313 | # | 292 | # |
| 314 | # CONFIG_RAID_ATTRS is not set | 293 | # CONFIG_RAID_ATTRS is not set |
| 315 | CONFIG_SCSI=m | 294 | CONFIG_SCSI=m |
| 295 | # CONFIG_SCSI_DMA is not set | ||
| 296 | # CONFIG_SCSI_TGT is not set | ||
| 316 | # CONFIG_SCSI_NETLINK is not set | 297 | # CONFIG_SCSI_NETLINK is not set |
| 317 | CONFIG_SCSI_PROC_FS=y | 298 | CONFIG_SCSI_PROC_FS=y |
| 318 | 299 | ||
| @@ -333,6 +314,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 333 | CONFIG_SCSI_MULTI_LUN=y | 314 | CONFIG_SCSI_MULTI_LUN=y |
| 334 | # CONFIG_SCSI_CONSTANTS is not set | 315 | # CONFIG_SCSI_CONSTANTS is not set |
| 335 | # CONFIG_SCSI_LOGGING is not set | 316 | # CONFIG_SCSI_LOGGING is not set |
| 317 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 318 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 336 | 319 | ||
| 337 | # | 320 | # |
| 338 | # SCSI Transports | 321 | # SCSI Transports |
| @@ -340,93 +323,33 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 340 | # CONFIG_SCSI_SPI_ATTRS is not set | 323 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 341 | # CONFIG_SCSI_FC_ATTRS is not set | 324 | # CONFIG_SCSI_FC_ATTRS is not set |
| 342 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 325 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 343 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 344 | # CONFIG_SCSI_SAS_LIBSAS is not set | 326 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 345 | 327 | CONFIG_SCSI_LOWLEVEL=y | |
| 346 | # | ||
| 347 | # SCSI low-level drivers | ||
| 348 | # | ||
| 349 | # CONFIG_ISCSI_TCP is not set | 328 | # CONFIG_ISCSI_TCP is not set |
| 350 | # CONFIG_SCSI_DEBUG is not set | 329 | # CONFIG_SCSI_DEBUG is not set |
| 351 | 330 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | |
| 352 | # | ||
| 353 | # PCMCIA SCSI adapter support | ||
| 354 | # | ||
| 355 | # CONFIG_PCMCIA_AHA152X is not set | ||
| 356 | # CONFIG_PCMCIA_FDOMAIN is not set | ||
| 357 | # CONFIG_PCMCIA_NINJA_SCSI is not set | ||
| 358 | # CONFIG_PCMCIA_QLOGIC is not set | ||
| 359 | # CONFIG_PCMCIA_SYM53C500 is not set | ||
| 360 | |||
| 361 | # | ||
| 362 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 363 | # | ||
| 364 | |||
| 365 | # | ||
| 366 | # Multi-device support (RAID and LVM) | ||
| 367 | # | ||
| 368 | # CONFIG_MD is not set | 331 | # CONFIG_MD is not set |
| 369 | |||
| 370 | # | ||
| 371 | # Fusion MPT device support | ||
| 372 | # | ||
| 373 | # CONFIG_FUSION is not set | ||
| 374 | |||
| 375 | # | ||
| 376 | # IEEE 1394 (FireWire) support | ||
| 377 | # | ||
| 378 | |||
| 379 | # | ||
| 380 | # I2O device support | ||
| 381 | # | ||
| 382 | |||
| 383 | # | ||
| 384 | # Network device support | ||
| 385 | # | ||
| 386 | CONFIG_NETDEVICES=y | 332 | CONFIG_NETDEVICES=y |
| 333 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 387 | # CONFIG_DUMMY is not set | 334 | # CONFIG_DUMMY is not set |
| 388 | # CONFIG_BONDING is not set | 335 | # CONFIG_BONDING is not set |
| 336 | # CONFIG_MACVLAN is not set | ||
| 389 | # CONFIG_EQUALIZER is not set | 337 | # CONFIG_EQUALIZER is not set |
| 390 | # CONFIG_TUN is not set | 338 | # CONFIG_TUN is not set |
| 391 | |||
| 392 | # | ||
| 393 | # PHY device support | ||
| 394 | # | ||
| 395 | # CONFIG_PHYLIB is not set | 339 | # CONFIG_PHYLIB is not set |
| 396 | |||
| 397 | # | ||
| 398 | # Ethernet (10 or 100Mbit) | ||
| 399 | # | ||
| 400 | CONFIG_NET_ETHERNET=y | 340 | CONFIG_NET_ETHERNET=y |
| 401 | CONFIG_MII=y | 341 | CONFIG_MII=y |
| 402 | CONFIG_SMC91X=y | 342 | CONFIG_SMC91X=y |
| 403 | # CONFIG_NE2000 is not set | 343 | # CONFIG_NE2000 is not set |
| 344 | CONFIG_NETDEV_1000=y | ||
| 345 | CONFIG_NETDEV_10000=y | ||
| 404 | 346 | ||
| 405 | # | 347 | # |
| 406 | # Ethernet (1000 Mbit) | 348 | # Wireless LAN |
| 407 | # | ||
| 408 | |||
| 409 | # | ||
| 410 | # Ethernet (10000 Mbit) | ||
| 411 | # | ||
| 412 | |||
| 413 | # | ||
| 414 | # Token Ring devices | ||
| 415 | # | ||
| 416 | |||
| 417 | # | ||
| 418 | # Wireless LAN (non-hamradio) | ||
| 419 | # | ||
| 420 | # CONFIG_NET_RADIO is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # PCMCIA network device support | ||
| 424 | # | 349 | # |
| 350 | # CONFIG_WLAN_PRE80211 is not set | ||
| 351 | # CONFIG_WLAN_80211 is not set | ||
| 425 | # CONFIG_NET_PCMCIA is not set | 352 | # CONFIG_NET_PCMCIA is not set |
| 426 | |||
| 427 | # | ||
| 428 | # Wan interfaces | ||
| 429 | # | ||
| 430 | # CONFIG_WAN is not set | 353 | # CONFIG_WAN is not set |
| 431 | # CONFIG_PPP is not set | 354 | # CONFIG_PPP is not set |
| 432 | # CONFIG_SLIP is not set | 355 | # CONFIG_SLIP is not set |
| @@ -434,15 +357,7 @@ CONFIG_SMC91X=y | |||
| 434 | # CONFIG_NETCONSOLE is not set | 357 | # CONFIG_NETCONSOLE is not set |
| 435 | # CONFIG_NETPOLL is not set | 358 | # CONFIG_NETPOLL is not set |
| 436 | # CONFIG_NET_POLL_CONTROLLER is not set | 359 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 437 | |||
| 438 | # | ||
| 439 | # ISDN subsystem | ||
| 440 | # | ||
| 441 | # CONFIG_ISDN is not set | 360 | # CONFIG_ISDN is not set |
| 442 | |||
| 443 | # | ||
| 444 | # Telephony Support | ||
| 445 | # | ||
| 446 | # CONFIG_PHONE is not set | 361 | # CONFIG_PHONE is not set |
| 447 | 362 | ||
| 448 | # | 363 | # |
| @@ -450,6 +365,7 @@ CONFIG_SMC91X=y | |||
| 450 | # | 365 | # |
| 451 | CONFIG_INPUT=y | 366 | CONFIG_INPUT=y |
| 452 | # CONFIG_INPUT_FF_MEMLESS is not set | 367 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 368 | # CONFIG_INPUT_POLLDEV is not set | ||
| 453 | 369 | ||
| 454 | # | 370 | # |
| 455 | # Userland interfaces | 371 | # Userland interfaces |
| @@ -466,6 +382,7 @@ CONFIG_INPUT=y | |||
| 466 | # CONFIG_INPUT_KEYBOARD is not set | 382 | # CONFIG_INPUT_KEYBOARD is not set |
| 467 | # CONFIG_INPUT_MOUSE is not set | 383 | # CONFIG_INPUT_MOUSE is not set |
| 468 | # CONFIG_INPUT_JOYSTICK is not set | 384 | # CONFIG_INPUT_JOYSTICK is not set |
| 385 | # CONFIG_INPUT_TABLET is not set | ||
| 469 | # CONFIG_INPUT_TOUCHSCREEN is not set | 386 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 470 | # CONFIG_INPUT_MISC is not set | 387 | # CONFIG_INPUT_MISC is not set |
| 471 | 388 | ||
| @@ -501,42 +418,21 @@ CONFIG_SERIAL_M32R_PLDSIO=y | |||
| 501 | CONFIG_UNIX98_PTYS=y | 418 | CONFIG_UNIX98_PTYS=y |
| 502 | CONFIG_LEGACY_PTYS=y | 419 | CONFIG_LEGACY_PTYS=y |
| 503 | CONFIG_LEGACY_PTY_COUNT=256 | 420 | CONFIG_LEGACY_PTY_COUNT=256 |
| 504 | |||
| 505 | # | ||
| 506 | # IPMI | ||
| 507 | # | ||
| 508 | # CONFIG_IPMI_HANDLER is not set | 421 | # CONFIG_IPMI_HANDLER is not set |
| 509 | |||
| 510 | # | ||
| 511 | # Watchdog Cards | ||
| 512 | # | ||
| 513 | # CONFIG_WATCHDOG is not set | 422 | # CONFIG_WATCHDOG is not set |
| 514 | CONFIG_HW_RANDOM=y | 423 | CONFIG_HW_RANDOM=y |
| 515 | # CONFIG_RTC is not set | 424 | # CONFIG_RTC is not set |
| 516 | CONFIG_DS1302=y | 425 | CONFIG_DS1302=y |
| 517 | # CONFIG_DTLK is not set | ||
| 518 | # CONFIG_R3964 is not set | 426 | # CONFIG_R3964 is not set |
| 519 | 427 | ||
| 520 | # | 428 | # |
| 521 | # Ftape, the floppy tape device driver | ||
| 522 | # | ||
| 523 | |||
| 524 | # | ||
| 525 | # PCMCIA character devices | 429 | # PCMCIA character devices |
| 526 | # | 430 | # |
| 527 | # CONFIG_SYNCLINK_CS is not set | 431 | # CONFIG_SYNCLINK_CS is not set |
| 528 | # CONFIG_CARDMAN_4000 is not set | 432 | # CONFIG_CARDMAN_4000 is not set |
| 529 | # CONFIG_CARDMAN_4040 is not set | 433 | # CONFIG_CARDMAN_4040 is not set |
| 530 | # CONFIG_RAW_DRIVER is not set | 434 | # CONFIG_RAW_DRIVER is not set |
| 531 | |||
| 532 | # | ||
| 533 | # TPM devices | ||
| 534 | # | ||
| 535 | # CONFIG_TCG_TPM is not set | 435 | # CONFIG_TCG_TPM is not set |
| 536 | |||
| 537 | # | ||
| 538 | # I2C support | ||
| 539 | # | ||
| 540 | # CONFIG_I2C is not set | 436 | # CONFIG_I2C is not set |
| 541 | 437 | ||
| 542 | # | 438 | # |
| @@ -544,47 +440,56 @@ CONFIG_DS1302=y | |||
| 544 | # | 440 | # |
| 545 | # CONFIG_SPI is not set | 441 | # CONFIG_SPI is not set |
| 546 | # CONFIG_SPI_MASTER is not set | 442 | # CONFIG_SPI_MASTER is not set |
| 547 | |||
| 548 | # | ||
| 549 | # Dallas's 1-wire bus | ||
| 550 | # | ||
| 551 | # CONFIG_W1 is not set | 443 | # CONFIG_W1 is not set |
| 552 | 444 | # CONFIG_POWER_SUPPLY is not set | |
| 553 | # | ||
| 554 | # Hardware Monitoring support | ||
| 555 | # | ||
| 556 | CONFIG_HWMON=y | 445 | CONFIG_HWMON=y |
| 557 | # CONFIG_HWMON_VID is not set | 446 | # CONFIG_HWMON_VID is not set |
| 558 | # CONFIG_SENSORS_ABITUGURU is not set | 447 | # CONFIG_SENSORS_ABITUGURU is not set |
| 448 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 559 | # CONFIG_SENSORS_F71805F is not set | 449 | # CONFIG_SENSORS_F71805F is not set |
| 450 | # CONFIG_SENSORS_IT87 is not set | ||
| 451 | # CONFIG_SENSORS_PC87360 is not set | ||
| 452 | # CONFIG_SENSORS_PC87427 is not set | ||
| 453 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 454 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 560 | # CONFIG_SENSORS_VT1211 is not set | 455 | # CONFIG_SENSORS_VT1211 is not set |
| 456 | # CONFIG_SENSORS_W83627HF is not set | ||
| 457 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 561 | # CONFIG_HWMON_DEBUG_CHIP is not set | 458 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 562 | 459 | ||
| 563 | # | 460 | # |
| 564 | # Multimedia devices | 461 | # Multifunction device drivers |
| 565 | # | 462 | # |
| 566 | # CONFIG_VIDEO_DEV is not set | 463 | # CONFIG_MFD_SM501 is not set |
| 567 | 464 | ||
| 568 | # | 465 | # |
| 569 | # Digital Video Broadcasting Devices | 466 | # Multimedia devices |
| 570 | # | 467 | # |
| 571 | # CONFIG_DVB is not set | 468 | # CONFIG_VIDEO_DEV is not set |
| 469 | # CONFIG_DVB_CORE is not set | ||
| 470 | CONFIG_DAB=y | ||
| 572 | 471 | ||
| 573 | # | 472 | # |
| 574 | # Graphics support | 473 | # Graphics support |
| 575 | # | 474 | # |
| 576 | CONFIG_FIRMWARE_EDID=y | ||
| 577 | # CONFIG_FB is not set | ||
| 578 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 475 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 579 | 476 | ||
| 580 | # | 477 | # |
| 581 | # Sound | 478 | # Display device support |
| 582 | # | 479 | # |
| 583 | # CONFIG_SOUND is not set | 480 | # CONFIG_DISPLAY_SUPPORT is not set |
| 481 | # CONFIG_VGASTATE is not set | ||
| 482 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 483 | # CONFIG_FB is not set | ||
| 584 | 484 | ||
| 585 | # | 485 | # |
| 586 | # USB support | 486 | # Sound |
| 587 | # | 487 | # |
| 488 | # CONFIG_SOUND is not set | ||
| 489 | CONFIG_HID_SUPPORT=y | ||
| 490 | CONFIG_HID=y | ||
| 491 | # CONFIG_HID_DEBUG is not set | ||
| 492 | CONFIG_USB_SUPPORT=y | ||
| 588 | # CONFIG_USB_ARCH_HAS_HCD is not set | 493 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 589 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 494 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 590 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 495 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -597,50 +502,18 @@ CONFIG_FIRMWARE_EDID=y | |||
| 597 | # USB Gadget Support | 502 | # USB Gadget Support |
| 598 | # | 503 | # |
| 599 | # CONFIG_USB_GADGET is not set | 504 | # CONFIG_USB_GADGET is not set |
| 600 | |||
| 601 | # | ||
| 602 | # MMC/SD Card support | ||
| 603 | # | ||
| 604 | # CONFIG_MMC is not set | 505 | # CONFIG_MMC is not set |
| 605 | |||
| 606 | # | ||
| 607 | # LED devices | ||
| 608 | # | ||
| 609 | # CONFIG_NEW_LEDS is not set | 506 | # CONFIG_NEW_LEDS is not set |
| 610 | 507 | ||
| 611 | # | 508 | # |
| 612 | # LED drivers | ||
| 613 | # | ||
| 614 | |||
| 615 | # | ||
| 616 | # LED Triggers | ||
| 617 | # | ||
| 618 | |||
| 619 | # | ||
| 620 | # InfiniBand support | ||
| 621 | # | ||
| 622 | |||
| 623 | # | ||
| 624 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 625 | # | ||
| 626 | |||
| 627 | # | ||
| 628 | # Real Time Clock | 509 | # Real Time Clock |
| 629 | # | 510 | # |
| 630 | # CONFIG_RTC_CLASS is not set | 511 | # CONFIG_RTC_CLASS is not set |
| 631 | 512 | ||
| 632 | # | 513 | # |
| 633 | # DMA Engine support | 514 | # Userspace I/O |
| 634 | # | ||
| 635 | # CONFIG_DMA_ENGINE is not set | ||
| 636 | |||
| 637 | # | ||
| 638 | # DMA Clients | ||
| 639 | # | ||
| 640 | |||
| 641 | # | ||
| 642 | # DMA Devices | ||
| 643 | # | 515 | # |
| 516 | # CONFIG_UIO is not set | ||
| 644 | 517 | ||
| 645 | # | 518 | # |
| 646 | # File systems | 519 | # File systems |
| @@ -735,6 +608,7 @@ CONFIG_LOCKD=y | |||
| 735 | CONFIG_LOCKD_V4=y | 608 | CONFIG_LOCKD_V4=y |
| 736 | CONFIG_NFS_COMMON=y | 609 | CONFIG_NFS_COMMON=y |
| 737 | CONFIG_SUNRPC=y | 610 | CONFIG_SUNRPC=y |
| 611 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 738 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 612 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 739 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 613 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 740 | # CONFIG_SMB_FS is not set | 614 | # CONFIG_SMB_FS is not set |
| @@ -742,7 +616,6 @@ CONFIG_SUNRPC=y | |||
| 742 | # CONFIG_NCP_FS is not set | 616 | # CONFIG_NCP_FS is not set |
| 743 | # CONFIG_CODA_FS is not set | 617 | # CONFIG_CODA_FS is not set |
| 744 | # CONFIG_AFS_FS is not set | 618 | # CONFIG_AFS_FS is not set |
| 745 | # CONFIG_9P_FS is not set | ||
| 746 | 619 | ||
| 747 | # | 620 | # |
| 748 | # Partition Types | 621 | # Partition Types |
| @@ -795,6 +668,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 795 | # CONFIG_NLS_UTF8 is not set | 668 | # CONFIG_NLS_UTF8 is not set |
| 796 | 669 | ||
| 797 | # | 670 | # |
| 671 | # Distributed Lock Manager | ||
| 672 | # | ||
| 673 | # CONFIG_DLM is not set | ||
| 674 | |||
| 675 | # | ||
| 798 | # Profiling support | 676 | # Profiling support |
| 799 | # | 677 | # |
| 800 | # CONFIG_PROFILING is not set | 678 | # CONFIG_PROFILING is not set |
| @@ -806,27 +684,28 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 806 | CONFIG_ENABLE_MUST_CHECK=y | 684 | CONFIG_ENABLE_MUST_CHECK=y |
| 807 | # CONFIG_MAGIC_SYSRQ is not set | 685 | # CONFIG_MAGIC_SYSRQ is not set |
| 808 | # CONFIG_UNUSED_SYMBOLS is not set | 686 | # CONFIG_UNUSED_SYMBOLS is not set |
| 687 | # CONFIG_DEBUG_FS is not set | ||
| 688 | # CONFIG_HEADERS_CHECK is not set | ||
| 809 | CONFIG_DEBUG_KERNEL=y | 689 | CONFIG_DEBUG_KERNEL=y |
| 810 | CONFIG_LOG_BUF_SHIFT=14 | 690 | # CONFIG_DEBUG_SHIRQ is not set |
| 811 | CONFIG_DETECT_SOFTLOCKUP=y | 691 | CONFIG_DETECT_SOFTLOCKUP=y |
| 692 | CONFIG_SCHED_DEBUG=y | ||
| 812 | # CONFIG_SCHEDSTATS is not set | 693 | # CONFIG_SCHEDSTATS is not set |
| 694 | # CONFIG_TIMER_STATS is not set | ||
| 813 | # CONFIG_DEBUG_SLAB is not set | 695 | # CONFIG_DEBUG_SLAB is not set |
| 814 | # CONFIG_DEBUG_SPINLOCK is not set | 696 | # CONFIG_DEBUG_SPINLOCK is not set |
| 815 | # CONFIG_DEBUG_MUTEXES is not set | 697 | # CONFIG_DEBUG_MUTEXES is not set |
| 816 | # CONFIG_DEBUG_RWSEMS is not set | ||
| 817 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 698 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 818 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 699 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 819 | # CONFIG_DEBUG_KOBJECT is not set | 700 | # CONFIG_DEBUG_KOBJECT is not set |
| 820 | # CONFIG_DEBUG_BUGVERBOSE is not set | 701 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 821 | CONFIG_DEBUG_INFO=y | 702 | CONFIG_DEBUG_INFO=y |
| 822 | # CONFIG_DEBUG_FS is not set | ||
| 823 | # CONFIG_DEBUG_VM is not set | 703 | # CONFIG_DEBUG_VM is not set |
| 824 | # CONFIG_DEBUG_LIST is not set | 704 | # CONFIG_DEBUG_LIST is not set |
| 825 | # CONFIG_FRAME_POINTER is not set | 705 | # CONFIG_FRAME_POINTER is not set |
| 826 | # CONFIG_UNWIND_INFO is not set | ||
| 827 | CONFIG_FORCED_INLINING=y | 706 | CONFIG_FORCED_INLINING=y |
| 828 | # CONFIG_HEADERS_CHECK is not set | ||
| 829 | # CONFIG_RCU_TORTURE_TEST is not set | 707 | # CONFIG_RCU_TORTURE_TEST is not set |
| 708 | # CONFIG_FAULT_INJECTION is not set | ||
| 830 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 709 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 831 | # CONFIG_DEBUG_STACK_USAGE is not set | 710 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 832 | 711 | ||
| @@ -835,16 +714,16 @@ CONFIG_FORCED_INLINING=y | |||
| 835 | # | 714 | # |
| 836 | # CONFIG_KEYS is not set | 715 | # CONFIG_KEYS is not set |
| 837 | # CONFIG_SECURITY is not set | 716 | # CONFIG_SECURITY is not set |
| 838 | |||
| 839 | # | ||
| 840 | # Cryptographic options | ||
| 841 | # | ||
| 842 | # CONFIG_CRYPTO is not set | 717 | # CONFIG_CRYPTO is not set |
| 843 | 718 | ||
| 844 | # | 719 | # |
| 845 | # Library routines | 720 | # Library routines |
| 846 | # | 721 | # |
| 722 | CONFIG_BITREVERSE=y | ||
| 847 | # CONFIG_CRC_CCITT is not set | 723 | # CONFIG_CRC_CCITT is not set |
| 848 | # CONFIG_CRC16 is not set | 724 | # CONFIG_CRC16 is not set |
| 725 | # CONFIG_CRC_ITU_T is not set | ||
| 849 | CONFIG_CRC32=y | 726 | CONFIG_CRC32=y |
| 727 | # CONFIG_CRC7 is not set | ||
| 850 | # CONFIG_LIBCRC32C is not set | 728 | # CONFIG_LIBCRC32C is not set |
| 729 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/configs/usrv_defconfig b/arch/m32r/configs/usrv_defconfig new file mode 100644 index 000000000000..62e813e30ce7 --- /dev/null +++ b/arch/m32r/configs/usrv_defconfig | |||
| @@ -0,0 +1,774 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.23-rc1 | ||
| 4 | # Wed Aug 1 17:22:37 2007 | ||
| 5 | # | ||
| 6 | CONFIG_M32R=y | ||
| 7 | CONFIG_GENERIC_ISA_DMA=y | ||
| 8 | CONFIG_ZONE_DMA=y | ||
| 9 | CONFIG_GENERIC_HARDIRQS=y | ||
| 10 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 14 | |||
| 15 | # | ||
| 16 | # Code maturity level options | ||
| 17 | # | ||
| 18 | CONFIG_EXPERIMENTAL=y | ||
| 19 | CONFIG_LOCK_KERNEL=y | ||
| 20 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 21 | |||
| 22 | # | ||
| 23 | # General setup | ||
| 24 | # | ||
| 25 | CONFIG_LOCALVERSION="" | ||
| 26 | CONFIG_LOCALVERSION_AUTO=y | ||
| 27 | CONFIG_SWAP=y | ||
| 28 | CONFIG_SYSVIPC=y | ||
| 29 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 30 | CONFIG_POSIX_MQUEUE=y | ||
| 31 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 32 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 33 | # CONFIG_TASKSTATS is not set | ||
| 34 | # CONFIG_USER_NS is not set | ||
| 35 | # CONFIG_AUDIT is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | ||
| 37 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 38 | # CONFIG_CPUSETS is not set | ||
| 39 | CONFIG_SYSFS_DEPRECATED=y | ||
| 40 | # CONFIG_RELAY is not set | ||
| 41 | CONFIG_BLK_DEV_INITRD=y | ||
| 42 | CONFIG_INITRAMFS_SOURCE="" | ||
| 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 44 | CONFIG_SYSCTL=y | ||
| 45 | CONFIG_EMBEDDED=y | ||
| 46 | CONFIG_SYSCTL_SYSCALL=y | ||
| 47 | CONFIG_KALLSYMS=y | ||
| 48 | # CONFIG_KALLSYMS_ALL is not set | ||
| 49 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 50 | CONFIG_HOTPLUG=y | ||
| 51 | CONFIG_PRINTK=y | ||
| 52 | CONFIG_BUG=y | ||
| 53 | CONFIG_ELF_CORE=y | ||
| 54 | CONFIG_BASE_FULL=y | ||
| 55 | CONFIG_FUTEX=y | ||
| 56 | CONFIG_ANON_INODES=y | ||
| 57 | CONFIG_EPOLL=y | ||
| 58 | CONFIG_SIGNALFD=y | ||
| 59 | CONFIG_TIMERFD=y | ||
| 60 | CONFIG_EVENTFD=y | ||
| 61 | CONFIG_SHMEM=y | ||
| 62 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 63 | CONFIG_SLAB=y | ||
| 64 | # CONFIG_SLUB is not set | ||
| 65 | # CONFIG_SLOB is not set | ||
| 66 | CONFIG_RT_MUTEXES=y | ||
| 67 | # CONFIG_TINY_SHMEM is not set | ||
| 68 | CONFIG_BASE_SMALL=0 | ||
| 69 | CONFIG_MODULES=y | ||
| 70 | CONFIG_MODULE_UNLOAD=y | ||
| 71 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 72 | # CONFIG_MODVERSIONS is not set | ||
| 73 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 74 | CONFIG_KMOD=y | ||
| 75 | CONFIG_STOP_MACHINE=y | ||
| 76 | CONFIG_BLOCK=y | ||
| 77 | # CONFIG_LBD is not set | ||
| 78 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 79 | # CONFIG_LSF is not set | ||
| 80 | # CONFIG_BLK_DEV_BSG is not set | ||
| 81 | |||
| 82 | # | ||
| 83 | # IO Schedulers | ||
| 84 | # | ||
| 85 | CONFIG_IOSCHED_NOOP=y | ||
| 86 | # CONFIG_IOSCHED_AS is not set | ||
| 87 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 88 | # CONFIG_IOSCHED_CFQ is not set | ||
| 89 | # CONFIG_DEFAULT_AS is not set | ||
| 90 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 91 | # CONFIG_DEFAULT_CFQ is not set | ||
| 92 | CONFIG_DEFAULT_NOOP=y | ||
| 93 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 94 | |||
| 95 | # | ||
| 96 | # Processor type and features | ||
| 97 | # | ||
| 98 | # CONFIG_PLAT_MAPPI is not set | ||
| 99 | CONFIG_PLAT_USRV=y | ||
| 100 | # CONFIG_PLAT_M32700UT is not set | ||
| 101 | # CONFIG_PLAT_OPSPUT is not set | ||
| 102 | # CONFIG_PLAT_OAKS32R is not set | ||
| 103 | # CONFIG_PLAT_MAPPI2 is not set | ||
| 104 | # CONFIG_PLAT_MAPPI3 is not set | ||
| 105 | # CONFIG_PLAT_M32104UT is not set | ||
| 106 | CONFIG_CHIP_M32700=y | ||
| 107 | # CONFIG_CHIP_M32102 is not set | ||
| 108 | # CONFIG_CHIP_M32104 is not set | ||
| 109 | # CONFIG_CHIP_VDEC2 is not set | ||
| 110 | # CONFIG_CHIP_OPSP is not set | ||
| 111 | CONFIG_MMU=y | ||
| 112 | CONFIG_TLB_ENTRIES=32 | ||
| 113 | CONFIG_ISA_M32R2=y | ||
| 114 | CONFIG_ISA_DSP_LEVEL2=y | ||
| 115 | CONFIG_ISA_DUAL_ISSUE=y | ||
| 116 | CONFIG_BUS_CLOCK=50000000 | ||
| 117 | CONFIG_TIMER_DIVIDE=128 | ||
| 118 | # CONFIG_CPU_LITTLE_ENDIAN is not set | ||
| 119 | CONFIG_MEMORY_START=0x08000000 | ||
| 120 | CONFIG_MEMORY_SIZE=0x02000000 | ||
| 121 | CONFIG_NOHIGHMEM=y | ||
| 122 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 123 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 124 | CONFIG_FLATMEM_MANUAL=y | ||
| 125 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 126 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 127 | CONFIG_FLATMEM=y | ||
| 128 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 129 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 130 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 131 | # CONFIG_RESOURCES_64BIT is not set | ||
| 132 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 133 | CONFIG_BOUNCE=y | ||
| 134 | CONFIG_VIRT_TO_BUS=y | ||
| 135 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 136 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
| 137 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 138 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 139 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 140 | CONFIG_GENERIC_HWEIGHT=y | ||
| 141 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 142 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 143 | # CONFIG_PREEMPT is not set | ||
| 144 | CONFIG_SMP=y | ||
| 145 | # CONFIG_CHIP_M32700_TS1 is not set | ||
| 146 | CONFIG_NR_CPUS=2 | ||
| 147 | |||
| 148 | # | ||
| 149 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 150 | # | ||
| 151 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 152 | # CONFIG_ISA is not set | ||
| 153 | |||
| 154 | # | ||
| 155 | # PCCARD (PCMCIA/CardBus) support | ||
| 156 | # | ||
| 157 | CONFIG_PCCARD=y | ||
| 158 | # CONFIG_PCMCIA_DEBUG is not set | ||
| 159 | CONFIG_PCMCIA=y | ||
| 160 | CONFIG_PCMCIA_LOAD_CIS=y | ||
| 161 | CONFIG_PCMCIA_IOCTL=y | ||
| 162 | |||
| 163 | # | ||
| 164 | # PC-card bridges | ||
| 165 | # | ||
| 166 | # CONFIG_M32R_PCC is not set | ||
| 167 | CONFIG_M32R_CFC=y | ||
| 168 | CONFIG_M32R_CFC_NUM=2 | ||
| 169 | CONFIG_PCCARD_NONSTATIC=y | ||
| 170 | |||
| 171 | # | ||
| 172 | # Executable file formats | ||
| 173 | # | ||
| 174 | CONFIG_BINFMT_ELF=y | ||
| 175 | # CONFIG_BINFMT_MISC is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Networking | ||
| 179 | # | ||
| 180 | CONFIG_NET=y | ||
| 181 | |||
| 182 | # | ||
| 183 | # Networking options | ||
| 184 | # | ||
| 185 | CONFIG_PACKET=y | ||
| 186 | # CONFIG_PACKET_MMAP is not set | ||
| 187 | CONFIG_UNIX=y | ||
| 188 | CONFIG_XFRM=y | ||
| 189 | CONFIG_XFRM_USER=y | ||
| 190 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 191 | # CONFIG_XFRM_MIGRATE is not set | ||
| 192 | # CONFIG_NET_KEY is not set | ||
| 193 | CONFIG_INET=y | ||
| 194 | CONFIG_IP_MULTICAST=y | ||
| 195 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 196 | CONFIG_IP_FIB_HASH=y | ||
| 197 | CONFIG_IP_PNP=y | ||
| 198 | # CONFIG_IP_PNP_DHCP is not set | ||
| 199 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 200 | # CONFIG_IP_PNP_RARP is not set | ||
| 201 | # CONFIG_NET_IPIP is not set | ||
| 202 | # CONFIG_NET_IPGRE is not set | ||
| 203 | # CONFIG_IP_MROUTE is not set | ||
| 204 | # CONFIG_ARPD is not set | ||
| 205 | # CONFIG_SYN_COOKIES is not set | ||
| 206 | CONFIG_INET_AH=y | ||
| 207 | CONFIG_INET_ESP=y | ||
| 208 | CONFIG_INET_IPCOMP=y | ||
| 209 | CONFIG_INET_XFRM_TUNNEL=y | ||
| 210 | CONFIG_INET_TUNNEL=y | ||
| 211 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 212 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 213 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 214 | CONFIG_INET_DIAG=y | ||
| 215 | CONFIG_INET_TCP_DIAG=y | ||
| 216 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 217 | CONFIG_TCP_CONG_CUBIC=y | ||
| 218 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 219 | # CONFIG_TCP_MD5SIG is not set | ||
| 220 | # CONFIG_IPV6 is not set | ||
| 221 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 222 | # CONFIG_INET6_TUNNEL is not set | ||
| 223 | # CONFIG_NETWORK_SECMARK is not set | ||
| 224 | # CONFIG_NETFILTER is not set | ||
| 225 | # CONFIG_IP_DCCP is not set | ||
| 226 | # CONFIG_IP_SCTP is not set | ||
| 227 | # CONFIG_TIPC is not set | ||
| 228 | # CONFIG_ATM is not set | ||
| 229 | # CONFIG_BRIDGE is not set | ||
| 230 | # CONFIG_VLAN_8021Q is not set | ||
| 231 | # CONFIG_DECNET is not set | ||
| 232 | # CONFIG_LLC2 is not set | ||
| 233 | # CONFIG_IPX is not set | ||
| 234 | # CONFIG_ATALK is not set | ||
| 235 | # CONFIG_X25 is not set | ||
| 236 | # CONFIG_LAPB is not set | ||
| 237 | # CONFIG_ECONET is not set | ||
| 238 | # CONFIG_WAN_ROUTER is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # QoS and/or fair queueing | ||
| 242 | # | ||
| 243 | # CONFIG_NET_SCHED is not set | ||
| 244 | |||
| 245 | # | ||
| 246 | # Network testing | ||
| 247 | # | ||
| 248 | # CONFIG_NET_PKTGEN is not set | ||
| 249 | # CONFIG_HAMRADIO is not set | ||
| 250 | # CONFIG_IRDA is not set | ||
| 251 | # CONFIG_BT is not set | ||
| 252 | # CONFIG_AF_RXRPC is not set | ||
| 253 | |||
| 254 | # | ||
| 255 | # Wireless | ||
| 256 | # | ||
| 257 | # CONFIG_CFG80211 is not set | ||
| 258 | CONFIG_WIRELESS_EXT=y | ||
| 259 | # CONFIG_MAC80211 is not set | ||
| 260 | CONFIG_IEEE80211=y | ||
| 261 | CONFIG_IEEE80211_DEBUG=y | ||
| 262 | CONFIG_IEEE80211_CRYPT_WEP=y | ||
| 263 | CONFIG_IEEE80211_CRYPT_CCMP=y | ||
| 264 | CONFIG_IEEE80211_CRYPT_TKIP=y | ||
| 265 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
| 266 | # CONFIG_RFKILL is not set | ||
| 267 | # CONFIG_NET_9P is not set | ||
| 268 | |||
| 269 | # | ||
| 270 | # Device Drivers | ||
| 271 | # | ||
| 272 | |||
| 273 | # | ||
| 274 | # Generic Driver Options | ||
| 275 | # | ||
| 276 | CONFIG_STANDALONE=y | ||
| 277 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 278 | CONFIG_FW_LOADER=y | ||
| 279 | # CONFIG_DEBUG_DRIVER is not set | ||
| 280 | # CONFIG_DEBUG_DEVRES is not set | ||
| 281 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 282 | # CONFIG_CONNECTOR is not set | ||
| 283 | CONFIG_MTD=y | ||
| 284 | # CONFIG_MTD_DEBUG is not set | ||
| 285 | CONFIG_MTD_CONCAT=y | ||
| 286 | CONFIG_MTD_PARTITIONS=y | ||
| 287 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 288 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # User Modules And Translation Layers | ||
| 292 | # | ||
| 293 | CONFIG_MTD_CHAR=y | ||
| 294 | CONFIG_MTD_BLKDEVS=y | ||
| 295 | CONFIG_MTD_BLOCK=y | ||
| 296 | # CONFIG_FTL is not set | ||
| 297 | # CONFIG_NFTL is not set | ||
| 298 | # CONFIG_INFTL is not set | ||
| 299 | # CONFIG_RFD_FTL is not set | ||
| 300 | # CONFIG_SSFDC is not set | ||
| 301 | |||
| 302 | # | ||
| 303 | # RAM/ROM/Flash chip drivers | ||
| 304 | # | ||
| 305 | CONFIG_MTD_CFI=y | ||
| 306 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 307 | CONFIG_MTD_GEN_PROBE=y | ||
| 308 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 309 | # CONFIG_MTD_CFI_NOSWAP is not set | ||
| 310 | CONFIG_MTD_CFI_BE_BYTE_SWAP=y | ||
| 311 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 312 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 313 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set | ||
| 314 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 315 | # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set | ||
| 316 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 317 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 318 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 319 | CONFIG_MTD_CFI_I1=y | ||
| 320 | # CONFIG_MTD_CFI_I2 is not set | ||
| 321 | # CONFIG_MTD_CFI_I4 is not set | ||
| 322 | # CONFIG_MTD_CFI_I8 is not set | ||
| 323 | # CONFIG_MTD_OTP is not set | ||
| 324 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 325 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 326 | # CONFIG_MTD_CFI_STAA is not set | ||
| 327 | CONFIG_MTD_CFI_UTIL=y | ||
| 328 | CONFIG_MTD_RAM=y | ||
| 329 | CONFIG_MTD_ROM=y | ||
| 330 | # CONFIG_MTD_ABSENT is not set | ||
| 331 | |||
| 332 | # | ||
| 333 | # Mapping drivers for chip access | ||
| 334 | # | ||
| 335 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 336 | # CONFIG_MTD_PHYSMAP is not set | ||
| 337 | # CONFIG_MTD_PLATRAM is not set | ||
| 338 | |||
| 339 | # | ||
| 340 | # Self-contained MTD device drivers | ||
| 341 | # | ||
| 342 | # CONFIG_MTD_SLRAM is not set | ||
| 343 | # CONFIG_MTD_PHRAM is not set | ||
| 344 | # CONFIG_MTD_MTDRAM is not set | ||
| 345 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 346 | |||
| 347 | # | ||
| 348 | # Disk-On-Chip Device Drivers | ||
| 349 | # | ||
| 350 | # CONFIG_MTD_DOC2000 is not set | ||
| 351 | # CONFIG_MTD_DOC2001 is not set | ||
| 352 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 353 | # CONFIG_MTD_NAND is not set | ||
| 354 | # CONFIG_MTD_ONENAND is not set | ||
| 355 | |||
| 356 | # | ||
| 357 | # UBI - Unsorted block images | ||
| 358 | # | ||
| 359 | # CONFIG_MTD_UBI is not set | ||
| 360 | # CONFIG_PARPORT is not set | ||
| 361 | CONFIG_BLK_DEV=y | ||
| 362 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 363 | CONFIG_BLK_DEV_LOOP=y | ||
| 364 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 365 | # CONFIG_BLK_DEV_NBD is not set | ||
| 366 | CONFIG_BLK_DEV_RAM=y | ||
| 367 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 368 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 369 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 370 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 371 | # CONFIG_ATA_OVER_ETH is not set | ||
| 372 | CONFIG_MISC_DEVICES=y | ||
| 373 | # CONFIG_EEPROM_93CX6 is not set | ||
| 374 | CONFIG_IDE=y | ||
| 375 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 376 | CONFIG_BLK_DEV_IDE=y | ||
| 377 | |||
| 378 | # | ||
| 379 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 380 | # | ||
| 381 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 382 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 383 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
| 384 | CONFIG_BLK_DEV_IDECS=y | ||
| 385 | # CONFIG_BLK_DEV_IDECD is not set | ||
| 386 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 387 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 388 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 389 | CONFIG_IDE_PROC_FS=y | ||
| 390 | |||
| 391 | # | ||
| 392 | # IDE chipset support/bugfixes | ||
| 393 | # | ||
| 394 | # CONFIG_IDE_GENERIC is not set | ||
| 395 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 396 | # CONFIG_IDE_ARM is not set | ||
| 397 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
| 398 | # CONFIG_BLK_DEV_HD is not set | ||
| 399 | |||
| 400 | # | ||
| 401 | # SCSI device support | ||
| 402 | # | ||
| 403 | # CONFIG_RAID_ATTRS is not set | ||
| 404 | # CONFIG_SCSI is not set | ||
| 405 | # CONFIG_SCSI_DMA is not set | ||
| 406 | # CONFIG_SCSI_NETLINK is not set | ||
| 407 | # CONFIG_MD is not set | ||
| 408 | CONFIG_NETDEVICES=y | ||
| 409 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 410 | # CONFIG_DUMMY is not set | ||
| 411 | # CONFIG_BONDING is not set | ||
| 412 | # CONFIG_MACVLAN is not set | ||
| 413 | # CONFIG_EQUALIZER is not set | ||
| 414 | # CONFIG_TUN is not set | ||
| 415 | # CONFIG_NET_ETHERNET is not set | ||
| 416 | CONFIG_NETDEV_1000=y | ||
| 417 | CONFIG_NETDEV_10000=y | ||
| 418 | |||
| 419 | # | ||
| 420 | # Wireless LAN | ||
| 421 | # | ||
| 422 | # CONFIG_WLAN_PRE80211 is not set | ||
| 423 | # CONFIG_WLAN_80211 is not set | ||
| 424 | CONFIG_NET_PCMCIA=y | ||
| 425 | # CONFIG_PCMCIA_3C589 is not set | ||
| 426 | # CONFIG_PCMCIA_3C574 is not set | ||
| 427 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
| 428 | CONFIG_PCMCIA_PCNET=y | ||
| 429 | # CONFIG_PCMCIA_NMCLAN is not set | ||
| 430 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
| 431 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
| 432 | # CONFIG_PCMCIA_AXNET is not set | ||
| 433 | # CONFIG_WAN is not set | ||
| 434 | # CONFIG_PPP is not set | ||
| 435 | # CONFIG_SLIP is not set | ||
| 436 | # CONFIG_SHAPER is not set | ||
| 437 | # CONFIG_NETCONSOLE is not set | ||
| 438 | # CONFIG_NETPOLL is not set | ||
| 439 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 440 | # CONFIG_ISDN is not set | ||
| 441 | # CONFIG_PHONE is not set | ||
| 442 | |||
| 443 | # | ||
| 444 | # Input device support | ||
| 445 | # | ||
| 446 | # CONFIG_INPUT is not set | ||
| 447 | |||
| 448 | # | ||
| 449 | # Hardware I/O ports | ||
| 450 | # | ||
| 451 | # CONFIG_SERIO is not set | ||
| 452 | # CONFIG_GAMEPORT is not set | ||
| 453 | |||
| 454 | # | ||
| 455 | # Character devices | ||
| 456 | # | ||
| 457 | # CONFIG_VT is not set | ||
| 458 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 459 | |||
| 460 | # | ||
| 461 | # Serial drivers | ||
| 462 | # | ||
| 463 | CONFIG_SERIAL_8250=y | ||
| 464 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 465 | # CONFIG_SERIAL_8250_CS is not set | ||
| 466 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 467 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 468 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 469 | |||
| 470 | # | ||
| 471 | # Non-8250 serial port support | ||
| 472 | # | ||
| 473 | CONFIG_SERIAL_CORE=y | ||
| 474 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 475 | # CONFIG_SERIAL_M32R_SIO is not set | ||
| 476 | CONFIG_UNIX98_PTYS=y | ||
| 477 | CONFIG_LEGACY_PTYS=y | ||
| 478 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 479 | # CONFIG_IPMI_HANDLER is not set | ||
| 480 | # CONFIG_WATCHDOG is not set | ||
| 481 | CONFIG_HW_RANDOM=m | ||
| 482 | # CONFIG_RTC is not set | ||
| 483 | # CONFIG_R3964 is not set | ||
| 484 | |||
| 485 | # | ||
| 486 | # PCMCIA character devices | ||
| 487 | # | ||
| 488 | # CONFIG_SYNCLINK_CS is not set | ||
| 489 | # CONFIG_CARDMAN_4000 is not set | ||
| 490 | # CONFIG_CARDMAN_4040 is not set | ||
| 491 | # CONFIG_RAW_DRIVER is not set | ||
| 492 | # CONFIG_TCG_TPM is not set | ||
| 493 | # CONFIG_I2C is not set | ||
| 494 | |||
| 495 | # | ||
| 496 | # SPI support | ||
| 497 | # | ||
| 498 | # CONFIG_SPI is not set | ||
| 499 | # CONFIG_SPI_MASTER is not set | ||
| 500 | # CONFIG_W1 is not set | ||
| 501 | # CONFIG_POWER_SUPPLY is not set | ||
| 502 | # CONFIG_HWMON is not set | ||
| 503 | |||
| 504 | # | ||
| 505 | # Multifunction device drivers | ||
| 506 | # | ||
| 507 | # CONFIG_MFD_SM501 is not set | ||
| 508 | |||
| 509 | # | ||
| 510 | # Multimedia devices | ||
| 511 | # | ||
| 512 | # CONFIG_VIDEO_DEV is not set | ||
| 513 | # CONFIG_DVB_CORE is not set | ||
| 514 | CONFIG_DAB=y | ||
| 515 | |||
| 516 | # | ||
| 517 | # Graphics support | ||
| 518 | # | ||
| 519 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 520 | |||
| 521 | # | ||
| 522 | # Display device support | ||
| 523 | # | ||
| 524 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 525 | # CONFIG_VGASTATE is not set | ||
| 526 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 527 | # CONFIG_FB is not set | ||
| 528 | |||
| 529 | # | ||
| 530 | # Sound | ||
| 531 | # | ||
| 532 | # CONFIG_SOUND is not set | ||
| 533 | CONFIG_USB_SUPPORT=y | ||
| 534 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
| 535 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 536 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 537 | |||
| 538 | # | ||
| 539 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 540 | # | ||
| 541 | |||
| 542 | # | ||
| 543 | # USB Gadget Support | ||
| 544 | # | ||
| 545 | # CONFIG_USB_GADGET is not set | ||
| 546 | # CONFIG_MMC is not set | ||
| 547 | # CONFIG_NEW_LEDS is not set | ||
| 548 | |||
| 549 | # | ||
| 550 | # Real Time Clock | ||
| 551 | # | ||
| 552 | # CONFIG_RTC_CLASS is not set | ||
| 553 | |||
| 554 | # | ||
| 555 | # Userspace I/O | ||
| 556 | # | ||
| 557 | # CONFIG_UIO is not set | ||
| 558 | |||
| 559 | # | ||
| 560 | # File systems | ||
| 561 | # | ||
| 562 | CONFIG_EXT2_FS=y | ||
| 563 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 564 | # CONFIG_EXT2_FS_XIP is not set | ||
| 565 | CONFIG_EXT3_FS=y | ||
| 566 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 567 | # CONFIG_EXT4DEV_FS is not set | ||
| 568 | CONFIG_JBD=y | ||
| 569 | # CONFIG_JBD_DEBUG is not set | ||
| 570 | # CONFIG_REISERFS_FS is not set | ||
| 571 | # CONFIG_JFS_FS is not set | ||
| 572 | # CONFIG_FS_POSIX_ACL is not set | ||
| 573 | # CONFIG_XFS_FS is not set | ||
| 574 | # CONFIG_GFS2_FS is not set | ||
| 575 | # CONFIG_OCFS2_FS is not set | ||
| 576 | # CONFIG_MINIX_FS is not set | ||
| 577 | # CONFIG_ROMFS_FS is not set | ||
| 578 | CONFIG_INOTIFY=y | ||
| 579 | CONFIG_INOTIFY_USER=y | ||
| 580 | # CONFIG_QUOTA is not set | ||
| 581 | CONFIG_DNOTIFY=y | ||
| 582 | # CONFIG_AUTOFS_FS is not set | ||
| 583 | # CONFIG_AUTOFS4_FS is not set | ||
| 584 | # CONFIG_FUSE_FS is not set | ||
| 585 | |||
| 586 | # | ||
| 587 | # CD-ROM/DVD Filesystems | ||
| 588 | # | ||
| 589 | # CONFIG_ISO9660_FS is not set | ||
| 590 | # CONFIG_UDF_FS is not set | ||
| 591 | |||
| 592 | # | ||
| 593 | # DOS/FAT/NT Filesystems | ||
| 594 | # | ||
| 595 | # CONFIG_MSDOS_FS is not set | ||
| 596 | # CONFIG_VFAT_FS is not set | ||
| 597 | # CONFIG_NTFS_FS is not set | ||
| 598 | |||
| 599 | # | ||
| 600 | # Pseudo filesystems | ||
| 601 | # | ||
| 602 | CONFIG_PROC_FS=y | ||
| 603 | CONFIG_PROC_KCORE=y | ||
| 604 | CONFIG_PROC_SYSCTL=y | ||
| 605 | CONFIG_SYSFS=y | ||
| 606 | CONFIG_TMPFS=y | ||
| 607 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 608 | # CONFIG_HUGETLB_PAGE is not set | ||
| 609 | CONFIG_RAMFS=y | ||
| 610 | # CONFIG_CONFIGFS_FS is not set | ||
| 611 | |||
| 612 | # | ||
| 613 | # Miscellaneous filesystems | ||
| 614 | # | ||
| 615 | # CONFIG_ADFS_FS is not set | ||
| 616 | # CONFIG_AFFS_FS is not set | ||
| 617 | # CONFIG_HFS_FS is not set | ||
| 618 | # CONFIG_HFSPLUS_FS is not set | ||
| 619 | # CONFIG_BEFS_FS is not set | ||
| 620 | # CONFIG_BFS_FS is not set | ||
| 621 | # CONFIG_EFS_FS is not set | ||
| 622 | CONFIG_JFFS2_FS=y | ||
| 623 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 624 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 625 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 626 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 627 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 628 | CONFIG_JFFS2_ZLIB=y | ||
| 629 | CONFIG_JFFS2_RTIME=y | ||
| 630 | # CONFIG_JFFS2_RUBIN is not set | ||
| 631 | CONFIG_CRAMFS=y | ||
| 632 | # CONFIG_VXFS_FS is not set | ||
| 633 | # CONFIG_HPFS_FS is not set | ||
| 634 | # CONFIG_QNX4FS_FS is not set | ||
| 635 | # CONFIG_SYSV_FS is not set | ||
| 636 | # CONFIG_UFS_FS is not set | ||
| 637 | |||
| 638 | # | ||
| 639 | # Network File Systems | ||
| 640 | # | ||
| 641 | CONFIG_NFS_FS=y | ||
| 642 | CONFIG_NFS_V3=y | ||
| 643 | # CONFIG_NFS_V3_ACL is not set | ||
| 644 | # CONFIG_NFS_V4 is not set | ||
| 645 | # CONFIG_NFS_DIRECTIO is not set | ||
| 646 | # CONFIG_NFSD is not set | ||
| 647 | CONFIG_ROOT_NFS=y | ||
| 648 | CONFIG_LOCKD=y | ||
| 649 | CONFIG_LOCKD_V4=y | ||
| 650 | CONFIG_NFS_COMMON=y | ||
| 651 | CONFIG_SUNRPC=y | ||
| 652 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 653 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 654 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 655 | # CONFIG_SMB_FS is not set | ||
| 656 | # CONFIG_CIFS is not set | ||
| 657 | # CONFIG_NCP_FS is not set | ||
| 658 | # CONFIG_CODA_FS is not set | ||
| 659 | # CONFIG_AFS_FS is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # Partition Types | ||
| 663 | # | ||
| 664 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 665 | CONFIG_MSDOS_PARTITION=y | ||
| 666 | |||
| 667 | # | ||
| 668 | # Native Language Support | ||
| 669 | # | ||
| 670 | # CONFIG_NLS is not set | ||
| 671 | |||
| 672 | # | ||
| 673 | # Distributed Lock Manager | ||
| 674 | # | ||
| 675 | # CONFIG_DLM is not set | ||
| 676 | |||
| 677 | # | ||
| 678 | # Profiling support | ||
| 679 | # | ||
| 680 | # CONFIG_PROFILING is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Kernel hacking | ||
| 684 | # | ||
| 685 | # CONFIG_PRINTK_TIME is not set | ||
| 686 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 687 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 688 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 689 | # CONFIG_DEBUG_FS is not set | ||
| 690 | # CONFIG_HEADERS_CHECK is not set | ||
| 691 | CONFIG_DEBUG_KERNEL=y | ||
| 692 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 693 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 694 | CONFIG_SCHED_DEBUG=y | ||
| 695 | # CONFIG_SCHEDSTATS is not set | ||
| 696 | # CONFIG_TIMER_STATS is not set | ||
| 697 | # CONFIG_DEBUG_SLAB is not set | ||
| 698 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 699 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 700 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 701 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 702 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 703 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 704 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 705 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 706 | CONFIG_DEBUG_INFO=y | ||
| 707 | # CONFIG_DEBUG_VM is not set | ||
| 708 | # CONFIG_DEBUG_LIST is not set | ||
| 709 | CONFIG_FRAME_POINTER=y | ||
| 710 | CONFIG_FORCED_INLINING=y | ||
| 711 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 712 | # CONFIG_FAULT_INJECTION is not set | ||
| 713 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
| 714 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 715 | |||
| 716 | # | ||
| 717 | # Security options | ||
| 718 | # | ||
| 719 | # CONFIG_KEYS is not set | ||
| 720 | # CONFIG_SECURITY is not set | ||
| 721 | CONFIG_CRYPTO=y | ||
| 722 | CONFIG_CRYPTO_ALGAPI=y | ||
| 723 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 724 | CONFIG_CRYPTO_HASH=y | ||
| 725 | CONFIG_CRYPTO_MANAGER=y | ||
| 726 | CONFIG_CRYPTO_HMAC=y | ||
| 727 | # CONFIG_CRYPTO_XCBC is not set | ||
| 728 | # CONFIG_CRYPTO_NULL is not set | ||
| 729 | # CONFIG_CRYPTO_MD4 is not set | ||
| 730 | CONFIG_CRYPTO_MD5=y | ||
| 731 | CONFIG_CRYPTO_SHA1=y | ||
| 732 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 733 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 734 | # CONFIG_CRYPTO_WP512 is not set | ||
| 735 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 736 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 737 | CONFIG_CRYPTO_ECB=y | ||
| 738 | CONFIG_CRYPTO_CBC=y | ||
| 739 | CONFIG_CRYPTO_PCBC=m | ||
| 740 | # CONFIG_CRYPTO_LRW is not set | ||
| 741 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 742 | CONFIG_CRYPTO_DES=y | ||
| 743 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 744 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 745 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 746 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 747 | CONFIG_CRYPTO_AES=y | ||
| 748 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 749 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 750 | # CONFIG_CRYPTO_TEA is not set | ||
| 751 | CONFIG_CRYPTO_ARC4=y | ||
| 752 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 753 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 754 | CONFIG_CRYPTO_DEFLATE=y | ||
| 755 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
| 756 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 757 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 758 | # CONFIG_CRYPTO_TEST is not set | ||
| 759 | CONFIG_CRYPTO_HW=y | ||
| 760 | |||
| 761 | # | ||
| 762 | # Library routines | ||
| 763 | # | ||
| 764 | CONFIG_BITREVERSE=y | ||
| 765 | # CONFIG_CRC_CCITT is not set | ||
| 766 | # CONFIG_CRC16 is not set | ||
| 767 | # CONFIG_CRC_ITU_T is not set | ||
| 768 | CONFIG_CRC32=y | ||
| 769 | # CONFIG_CRC7 is not set | ||
| 770 | # CONFIG_LIBCRC32C is not set | ||
| 771 | CONFIG_ZLIB_INFLATE=y | ||
| 772 | CONFIG_ZLIB_DEFLATE=y | ||
| 773 | CONFIG_PLIST=y | ||
| 774 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/defconfig b/arch/m32r/defconfig index 13579917afef..af3b98179113 100644 --- a/arch/m32r/defconfig +++ b/arch/m32r/defconfig | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19 | 3 | # Linux kernel version: 2.6.23-rc1 |
| 4 | # Tue Dec 12 17:52:38 2006 | 4 | # Wed Aug 1 17:22:35 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
| 7 | CONFIG_GENERIC_ISA_DMA=y | 7 | CONFIG_GENERIC_ISA_DMA=y |
| 8 | CONFIG_ZONE_DMA=y | ||
| 8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
| 9 | CONFIG_GENERIC_IRQ_PROBE=y | 10 | CONFIG_GENERIC_IRQ_PROBE=y |
| 11 | CONFIG_NO_IOPORT=y | ||
| 12 | CONFIG_NO_DMA=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 11 | 14 | ||
| 12 | # | 15 | # |
| @@ -23,19 +26,20 @@ CONFIG_LOCALVERSION="" | |||
| 23 | CONFIG_LOCALVERSION_AUTO=y | 26 | CONFIG_LOCALVERSION_AUTO=y |
| 24 | CONFIG_SWAP=y | 27 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 28 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_IPC_NS is not set | 29 | CONFIG_SYSVIPC_SYSCTL=y |
| 27 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | CONFIG_BSD_PROCESS_ACCT=y | 31 | CONFIG_BSD_PROCESS_ACCT=y |
| 29 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 32 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 30 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
| 31 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
| 32 | # CONFIG_AUDIT is not set | 35 | # CONFIG_AUDIT is not set |
| 33 | CONFIG_IKCONFIG=y | 36 | CONFIG_IKCONFIG=y |
| 34 | CONFIG_IKCONFIG_PROC=y | 37 | CONFIG_IKCONFIG_PROC=y |
| 38 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 35 | # CONFIG_CPUSETS is not set | 39 | # CONFIG_CPUSETS is not set |
| 36 | CONFIG_SYSFS_DEPRECATED=y | 40 | CONFIG_SYSFS_DEPRECATED=y |
| 37 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
| 38 | CONFIG_INITRAMFS_SOURCE="" | 42 | # CONFIG_BLK_DEV_INITRD is not set |
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 40 | CONFIG_SYSCTL=y | 44 | CONFIG_SYSCTL=y |
| 41 | CONFIG_EMBEDDED=y | 45 | CONFIG_EMBEDDED=y |
| @@ -47,17 +51,18 @@ CONFIG_BUG=y | |||
| 47 | CONFIG_ELF_CORE=y | 51 | CONFIG_ELF_CORE=y |
| 48 | CONFIG_BASE_FULL=y | 52 | CONFIG_BASE_FULL=y |
| 49 | # CONFIG_FUTEX is not set | 53 | # CONFIG_FUTEX is not set |
| 54 | CONFIG_ANON_INODES=y | ||
| 50 | # CONFIG_EPOLL is not set | 55 | # CONFIG_EPOLL is not set |
| 56 | CONFIG_SIGNALFD=y | ||
| 57 | CONFIG_TIMERFD=y | ||
| 58 | CONFIG_EVENTFD=y | ||
| 51 | CONFIG_SHMEM=y | 59 | CONFIG_SHMEM=y |
| 52 | CONFIG_SLAB=y | ||
| 53 | CONFIG_VM_EVENT_COUNTERS=y | 60 | CONFIG_VM_EVENT_COUNTERS=y |
| 61 | CONFIG_SLAB=y | ||
| 62 | # CONFIG_SLUB is not set | ||
| 63 | # CONFIG_SLOB is not set | ||
| 54 | # CONFIG_TINY_SHMEM is not set | 64 | # CONFIG_TINY_SHMEM is not set |
| 55 | CONFIG_BASE_SMALL=0 | 65 | CONFIG_BASE_SMALL=0 |
| 56 | # CONFIG_SLOB is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # Loadable module support | ||
| 60 | # | ||
| 61 | CONFIG_MODULES=y | 66 | CONFIG_MODULES=y |
| 62 | CONFIG_MODULE_UNLOAD=y | 67 | CONFIG_MODULE_UNLOAD=y |
| 63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 68 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -65,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y | |||
| 65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 70 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 66 | CONFIG_KMOD=y | 71 | CONFIG_KMOD=y |
| 67 | CONFIG_STOP_MACHINE=y | 72 | CONFIG_STOP_MACHINE=y |
| 68 | |||
| 69 | # | ||
| 70 | # Block layer | ||
| 71 | # | ||
| 72 | CONFIG_BLOCK=y | 73 | CONFIG_BLOCK=y |
| 74 | # CONFIG_LBD is not set | ||
| 73 | # CONFIG_BLK_DEV_IO_TRACE is not set | 75 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 76 | # CONFIG_LSF is not set | ||
| 77 | # CONFIG_BLK_DEV_BSG is not set | ||
| 74 | 78 | ||
| 75 | # | 79 | # |
| 76 | # IO Schedulers | 80 | # IO Schedulers |
| @@ -123,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 123 | # CONFIG_SPARSEMEM_STATIC is not set | 127 | # CONFIG_SPARSEMEM_STATIC is not set |
| 124 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 128 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 125 | # CONFIG_RESOURCES_64BIT is not set | 129 | # CONFIG_RESOURCES_64BIT is not set |
| 130 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 131 | CONFIG_BOUNCE=y | ||
| 132 | CONFIG_VIRT_TO_BUS=y | ||
| 126 | CONFIG_IRAM_START=0x00f00000 | 133 | CONFIG_IRAM_START=0x00f00000 |
| 127 | CONFIG_IRAM_SIZE=0x00080000 | 134 | CONFIG_IRAM_SIZE=0x00080000 |
| 128 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 135 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 129 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 136 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 137 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 138 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 130 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 139 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 131 | CONFIG_GENERIC_HWEIGHT=y | 140 | CONFIG_GENERIC_HWEIGHT=y |
| 132 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 141 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 142 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 133 | CONFIG_PREEMPT=y | 143 | CONFIG_PREEMPT=y |
| 134 | CONFIG_SMP=y | 144 | CONFIG_SMP=y |
| 135 | # CONFIG_CHIP_M32700_TS1 is not set | 145 | # CONFIG_CHIP_M32700_TS1 is not set |
| @@ -139,6 +149,7 @@ CONFIG_NODES_SHIFT=1 | |||
| 139 | # | 149 | # |
| 140 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 150 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
| 141 | # | 151 | # |
| 152 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 142 | # CONFIG_ISA is not set | 153 | # CONFIG_ISA is not set |
| 143 | 154 | ||
| 144 | # | 155 | # |
| @@ -147,10 +158,6 @@ CONFIG_NODES_SHIFT=1 | |||
| 147 | # CONFIG_PCCARD is not set | 158 | # CONFIG_PCCARD is not set |
| 148 | 159 | ||
| 149 | # | 160 | # |
| 150 | # PCI Hotplug Support | ||
| 151 | # | ||
| 152 | |||
| 153 | # | ||
| 154 | # Executable file formats | 161 | # Executable file formats |
| 155 | # | 162 | # |
| 156 | CONFIG_BINFMT_ELF=y | 163 | CONFIG_BINFMT_ELF=y |
| @@ -164,13 +171,13 @@ CONFIG_NET=y | |||
| 164 | # | 171 | # |
| 165 | # Networking options | 172 | # Networking options |
| 166 | # | 173 | # |
| 167 | # CONFIG_NETDEBUG is not set | ||
| 168 | CONFIG_PACKET=y | 174 | CONFIG_PACKET=y |
| 169 | # CONFIG_PACKET_MMAP is not set | 175 | # CONFIG_PACKET_MMAP is not set |
| 170 | CONFIG_UNIX=y | 176 | CONFIG_UNIX=y |
| 171 | CONFIG_XFRM=y | 177 | CONFIG_XFRM=y |
| 172 | # CONFIG_XFRM_USER is not set | 178 | # CONFIG_XFRM_USER is not set |
| 173 | # CONFIG_XFRM_SUB_POLICY is not set | 179 | # CONFIG_XFRM_SUB_POLICY is not set |
| 180 | # CONFIG_XFRM_MIGRATE is not set | ||
| 174 | # CONFIG_NET_KEY is not set | 181 | # CONFIG_NET_KEY is not set |
| 175 | CONFIG_INET=y | 182 | CONFIG_INET=y |
| 176 | # CONFIG_IP_MULTICAST is not set | 183 | # CONFIG_IP_MULTICAST is not set |
| @@ -203,20 +210,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 203 | # CONFIG_INET6_TUNNEL is not set | 210 | # CONFIG_INET6_TUNNEL is not set |
| 204 | # CONFIG_NETWORK_SECMARK is not set | 211 | # CONFIG_NETWORK_SECMARK is not set |
| 205 | # CONFIG_NETFILTER is not set | 212 | # CONFIG_NETFILTER is not set |
| 206 | |||
| 207 | # | ||
| 208 | # DCCP Configuration (EXPERIMENTAL) | ||
| 209 | # | ||
| 210 | # CONFIG_IP_DCCP is not set | 213 | # CONFIG_IP_DCCP is not set |
| 211 | |||
| 212 | # | ||
| 213 | # SCTP Configuration (EXPERIMENTAL) | ||
| 214 | # | ||
| 215 | # CONFIG_IP_SCTP is not set | 214 | # CONFIG_IP_SCTP is not set |
| 216 | |||
| 217 | # | ||
| 218 | # TIPC Configuration (EXPERIMENTAL) | ||
| 219 | # | ||
| 220 | # CONFIG_TIPC is not set | 215 | # CONFIG_TIPC is not set |
| 221 | # CONFIG_ATM is not set | 216 | # CONFIG_ATM is not set |
| 222 | # CONFIG_BRIDGE is not set | 217 | # CONFIG_BRIDGE is not set |
| @@ -242,7 +237,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 242 | # CONFIG_HAMRADIO is not set | 237 | # CONFIG_HAMRADIO is not set |
| 243 | # CONFIG_IRDA is not set | 238 | # CONFIG_IRDA is not set |
| 244 | # CONFIG_BT is not set | 239 | # CONFIG_BT is not set |
| 240 | # CONFIG_AF_RXRPC is not set | ||
| 241 | |||
| 242 | # | ||
| 243 | # Wireless | ||
| 244 | # | ||
| 245 | # CONFIG_CFG80211 is not set | ||
| 246 | # CONFIG_WIRELESS_EXT is not set | ||
| 247 | # CONFIG_MAC80211 is not set | ||
| 245 | # CONFIG_IEEE80211 is not set | 248 | # CONFIG_IEEE80211 is not set |
| 249 | # CONFIG_RFKILL is not set | ||
| 250 | # CONFIG_NET_9P is not set | ||
| 246 | 251 | ||
| 247 | # | 252 | # |
| 248 | # Device Drivers | 253 | # Device Drivers |
| @@ -255,15 +260,7 @@ CONFIG_STANDALONE=y | |||
| 255 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 260 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 256 | CONFIG_FW_LOADER=y | 261 | CONFIG_FW_LOADER=y |
| 257 | # CONFIG_SYS_HYPERVISOR is not set | 262 | # CONFIG_SYS_HYPERVISOR is not set |
| 258 | |||
| 259 | # | ||
| 260 | # Connector - unified userspace <-> kernelspace linker | ||
| 261 | # | ||
| 262 | # CONFIG_CONNECTOR is not set | 263 | # CONFIG_CONNECTOR is not set |
| 263 | |||
| 264 | # | ||
| 265 | # Memory Technology Devices (MTD) | ||
| 266 | # | ||
| 267 | CONFIG_MTD=y | 264 | CONFIG_MTD=y |
| 268 | # CONFIG_MTD_DEBUG is not set | 265 | # CONFIG_MTD_DEBUG is not set |
| 269 | # CONFIG_MTD_CONCAT is not set | 266 | # CONFIG_MTD_CONCAT is not set |
| @@ -278,6 +275,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 278 | # User Modules And Translation Layers | 275 | # User Modules And Translation Layers |
| 279 | # | 276 | # |
| 280 | # CONFIG_MTD_CHAR is not set | 277 | # CONFIG_MTD_CHAR is not set |
| 278 | CONFIG_MTD_BLKDEVS=y | ||
| 281 | CONFIG_MTD_BLOCK=y | 279 | CONFIG_MTD_BLOCK=y |
| 282 | # CONFIG_FTL is not set | 280 | # CONFIG_FTL is not set |
| 283 | # CONFIG_NFTL is not set | 281 | # CONFIG_NFTL is not set |
| @@ -314,7 +312,6 @@ CONFIG_MTD_CFI_UTIL=m | |||
| 314 | # CONFIG_MTD_RAM is not set | 312 | # CONFIG_MTD_RAM is not set |
| 315 | # CONFIG_MTD_ROM is not set | 313 | # CONFIG_MTD_ROM is not set |
| 316 | # CONFIG_MTD_ABSENT is not set | 314 | # CONFIG_MTD_ABSENT is not set |
| 317 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 318 | 315 | ||
| 319 | # | 316 | # |
| 320 | # Mapping drivers for chip access | 317 | # Mapping drivers for chip access |
| @@ -337,29 +334,15 @@ CONFIG_MTD_CFI_UTIL=m | |||
| 337 | # CONFIG_MTD_DOC2000 is not set | 334 | # CONFIG_MTD_DOC2000 is not set |
| 338 | # CONFIG_MTD_DOC2001 is not set | 335 | # CONFIG_MTD_DOC2001 is not set |
| 339 | # CONFIG_MTD_DOC2001PLUS is not set | 336 | # CONFIG_MTD_DOC2001PLUS is not set |
| 340 | |||
| 341 | # | ||
| 342 | # NAND Flash Device Drivers | ||
| 343 | # | ||
| 344 | # CONFIG_MTD_NAND is not set | 337 | # CONFIG_MTD_NAND is not set |
| 345 | |||
| 346 | # | ||
| 347 | # OneNAND Flash Device Drivers | ||
| 348 | # | ||
| 349 | # CONFIG_MTD_ONENAND is not set | 338 | # CONFIG_MTD_ONENAND is not set |
| 350 | 339 | ||
| 351 | # | 340 | # |
| 352 | # Parallel port support | 341 | # UBI - Unsorted block images |
| 353 | # | 342 | # |
| 343 | # CONFIG_MTD_UBI is not set | ||
| 354 | # CONFIG_PARPORT is not set | 344 | # CONFIG_PARPORT is not set |
| 355 | 345 | CONFIG_BLK_DEV=y | |
| 356 | # | ||
| 357 | # Plug and Play support | ||
| 358 | # | ||
| 359 | |||
| 360 | # | ||
| 361 | # Block devices | ||
| 362 | # | ||
| 363 | # CONFIG_BLK_DEV_COW_COMMON is not set | 346 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 364 | CONFIG_BLK_DEV_LOOP=y | 347 | CONFIG_BLK_DEV_LOOP=y |
| 365 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 348 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -368,18 +351,10 @@ CONFIG_BLK_DEV_RAM=y | |||
| 368 | CONFIG_BLK_DEV_RAM_COUNT=16 | 351 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 369 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 352 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 370 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 353 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 371 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 372 | # CONFIG_CDROM_PKTCDVD is not set | 354 | # CONFIG_CDROM_PKTCDVD is not set |
| 373 | CONFIG_ATA_OVER_ETH=m | 355 | CONFIG_ATA_OVER_ETH=m |
| 374 | 356 | CONFIG_MISC_DEVICES=y | |
| 375 | # | 357 | # CONFIG_EEPROM_93CX6 is not set |
| 376 | # Misc devices | ||
| 377 | # | ||
| 378 | # CONFIG_TIFM_CORE is not set | ||
| 379 | |||
| 380 | # | ||
| 381 | # ATA/ATAPI/MFM/RLL support | ||
| 382 | # | ||
| 383 | CONFIG_IDE=y | 358 | CONFIG_IDE=y |
| 384 | CONFIG_IDE_MAX_HWIFS=4 | 359 | CONFIG_IDE_MAX_HWIFS=4 |
| 385 | CONFIG_BLK_DEV_IDE=y | 360 | CONFIG_BLK_DEV_IDE=y |
| @@ -395,14 +370,15 @@ CONFIG_BLK_DEV_IDECD=m | |||
| 395 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 370 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
| 396 | # CONFIG_BLK_DEV_IDESCSI is not set | 371 | # CONFIG_BLK_DEV_IDESCSI is not set |
| 397 | # CONFIG_IDE_TASK_IOCTL is not set | 372 | # CONFIG_IDE_TASK_IOCTL is not set |
| 373 | CONFIG_IDE_PROC_FS=y | ||
| 398 | 374 | ||
| 399 | # | 375 | # |
| 400 | # IDE chipset support/bugfixes | 376 | # IDE chipset support/bugfixes |
| 401 | # | 377 | # |
| 402 | CONFIG_IDE_GENERIC=y | 378 | CONFIG_IDE_GENERIC=y |
| 379 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
| 403 | # CONFIG_IDE_ARM is not set | 380 | # CONFIG_IDE_ARM is not set |
| 404 | # CONFIG_BLK_DEV_IDEDMA is not set | 381 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 405 | # CONFIG_IDEDMA_AUTO is not set | ||
| 406 | # CONFIG_BLK_DEV_HD is not set | 382 | # CONFIG_BLK_DEV_HD is not set |
| 407 | 383 | ||
| 408 | # | 384 | # |
| @@ -410,6 +386,8 @@ CONFIG_IDE_GENERIC=y | |||
| 410 | # | 386 | # |
| 411 | # CONFIG_RAID_ATTRS is not set | 387 | # CONFIG_RAID_ATTRS is not set |
| 412 | CONFIG_SCSI=m | 388 | CONFIG_SCSI=m |
| 389 | # CONFIG_SCSI_DMA is not set | ||
| 390 | # CONFIG_SCSI_TGT is not set | ||
| 413 | # CONFIG_SCSI_NETLINK is not set | 391 | # CONFIG_SCSI_NETLINK is not set |
| 414 | CONFIG_SCSI_PROC_FS=y | 392 | CONFIG_SCSI_PROC_FS=y |
| 415 | 393 | ||
| @@ -430,6 +408,8 @@ CONFIG_CHR_DEV_SG=m | |||
| 430 | CONFIG_SCSI_MULTI_LUN=y | 408 | CONFIG_SCSI_MULTI_LUN=y |
| 431 | # CONFIG_SCSI_CONSTANTS is not set | 409 | # CONFIG_SCSI_CONSTANTS is not set |
| 432 | # CONFIG_SCSI_LOGGING is not set | 410 | # CONFIG_SCSI_LOGGING is not set |
| 411 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 412 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 433 | 413 | ||
| 434 | # | 414 | # |
| 435 | # SCSI Transports | 415 | # SCSI Transports |
| @@ -437,79 +417,31 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 437 | # CONFIG_SCSI_SPI_ATTRS is not set | 417 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 438 | # CONFIG_SCSI_FC_ATTRS is not set | 418 | # CONFIG_SCSI_FC_ATTRS is not set |
| 439 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 419 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 440 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 441 | # CONFIG_SCSI_SAS_LIBSAS is not set | 420 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 442 | 421 | CONFIG_SCSI_LOWLEVEL=y | |
| 443 | # | ||
| 444 | # SCSI low-level drivers | ||
| 445 | # | ||
| 446 | # CONFIG_ISCSI_TCP is not set | 422 | # CONFIG_ISCSI_TCP is not set |
| 447 | # CONFIG_SCSI_DEBUG is not set | 423 | # CONFIG_SCSI_DEBUG is not set |
| 448 | |||
| 449 | # | ||
| 450 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 451 | # | ||
| 452 | |||
| 453 | # | ||
| 454 | # Multi-device support (RAID and LVM) | ||
| 455 | # | ||
| 456 | # CONFIG_MD is not set | 424 | # CONFIG_MD is not set |
| 457 | |||
| 458 | # | ||
| 459 | # Fusion MPT device support | ||
| 460 | # | ||
| 461 | # CONFIG_FUSION is not set | ||
| 462 | |||
| 463 | # | ||
| 464 | # IEEE 1394 (FireWire) support | ||
| 465 | # | ||
| 466 | |||
| 467 | # | ||
| 468 | # I2O device support | ||
| 469 | # | ||
| 470 | |||
| 471 | # | ||
| 472 | # Network device support | ||
| 473 | # | ||
| 474 | CONFIG_NETDEVICES=y | 425 | CONFIG_NETDEVICES=y |
| 426 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 475 | # CONFIG_DUMMY is not set | 427 | # CONFIG_DUMMY is not set |
| 476 | # CONFIG_BONDING is not set | 428 | # CONFIG_BONDING is not set |
| 429 | # CONFIG_MACVLAN is not set | ||
| 477 | # CONFIG_EQUALIZER is not set | 430 | # CONFIG_EQUALIZER is not set |
| 478 | # CONFIG_TUN is not set | 431 | # CONFIG_TUN is not set |
| 479 | |||
| 480 | # | ||
| 481 | # PHY device support | ||
| 482 | # | ||
| 483 | # CONFIG_PHYLIB is not set | 432 | # CONFIG_PHYLIB is not set |
| 484 | |||
| 485 | # | ||
| 486 | # Ethernet (10 or 100Mbit) | ||
| 487 | # | ||
| 488 | CONFIG_NET_ETHERNET=y | 433 | CONFIG_NET_ETHERNET=y |
| 489 | CONFIG_MII=y | 434 | CONFIG_MII=y |
| 490 | CONFIG_SMC91X=y | 435 | CONFIG_SMC91X=y |
| 491 | # CONFIG_NE2000 is not set | 436 | # CONFIG_NE2000 is not set |
| 437 | CONFIG_NETDEV_1000=y | ||
| 438 | CONFIG_NETDEV_10000=y | ||
| 492 | 439 | ||
| 493 | # | 440 | # |
| 494 | # Ethernet (1000 Mbit) | 441 | # Wireless LAN |
| 495 | # | ||
| 496 | |||
| 497 | # | ||
| 498 | # Ethernet (10000 Mbit) | ||
| 499 | # | ||
| 500 | |||
| 501 | # | ||
| 502 | # Token Ring devices | ||
| 503 | # | ||
| 504 | |||
| 505 | # | ||
| 506 | # Wireless LAN (non-hamradio) | ||
| 507 | # | ||
| 508 | # CONFIG_NET_RADIO is not set | ||
| 509 | |||
| 510 | # | ||
| 511 | # Wan interfaces | ||
| 512 | # | 442 | # |
| 443 | # CONFIG_WLAN_PRE80211 is not set | ||
| 444 | # CONFIG_WLAN_80211 is not set | ||
| 513 | # CONFIG_WAN is not set | 445 | # CONFIG_WAN is not set |
| 514 | # CONFIG_PPP is not set | 446 | # CONFIG_PPP is not set |
| 515 | # CONFIG_SLIP is not set | 447 | # CONFIG_SLIP is not set |
| @@ -517,15 +449,7 @@ CONFIG_SMC91X=y | |||
| 517 | # CONFIG_NETCONSOLE is not set | 449 | # CONFIG_NETCONSOLE is not set |
| 518 | # CONFIG_NETPOLL is not set | 450 | # CONFIG_NETPOLL is not set |
| 519 | # CONFIG_NET_POLL_CONTROLLER is not set | 451 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 520 | |||
| 521 | # | ||
| 522 | # ISDN subsystem | ||
| 523 | # | ||
| 524 | # CONFIG_ISDN is not set | 452 | # CONFIG_ISDN is not set |
| 525 | |||
| 526 | # | ||
| 527 | # Telephony Support | ||
| 528 | # | ||
| 529 | # CONFIG_PHONE is not set | 453 | # CONFIG_PHONE is not set |
| 530 | 454 | ||
| 531 | # | 455 | # |
| @@ -533,6 +457,7 @@ CONFIG_SMC91X=y | |||
| 533 | # | 457 | # |
| 534 | CONFIG_INPUT=y | 458 | CONFIG_INPUT=y |
| 535 | # CONFIG_INPUT_FF_MEMLESS is not set | 459 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 460 | # CONFIG_INPUT_POLLDEV is not set | ||
| 536 | 461 | ||
| 537 | # | 462 | # |
| 538 | # Userland interfaces | 463 | # Userland interfaces |
| @@ -549,6 +474,7 @@ CONFIG_INPUT=y | |||
| 549 | # CONFIG_INPUT_KEYBOARD is not set | 474 | # CONFIG_INPUT_KEYBOARD is not set |
| 550 | # CONFIG_INPUT_MOUSE is not set | 475 | # CONFIG_INPUT_MOUSE is not set |
| 551 | # CONFIG_INPUT_JOYSTICK is not set | 476 | # CONFIG_INPUT_JOYSTICK is not set |
| 477 | # CONFIG_INPUT_TABLET is not set | ||
| 552 | # CONFIG_INPUT_TOUCHSCREEN is not set | 478 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 553 | # CONFIG_INPUT_MISC is not set | 479 | # CONFIG_INPUT_MISC is not set |
| 554 | 480 | ||
| @@ -587,35 +513,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y | |||
| 587 | CONFIG_UNIX98_PTYS=y | 513 | CONFIG_UNIX98_PTYS=y |
| 588 | CONFIG_LEGACY_PTYS=y | 514 | CONFIG_LEGACY_PTYS=y |
| 589 | CONFIG_LEGACY_PTY_COUNT=256 | 515 | CONFIG_LEGACY_PTY_COUNT=256 |
| 590 | |||
| 591 | # | ||
| 592 | # IPMI | ||
| 593 | # | ||
| 594 | # CONFIG_IPMI_HANDLER is not set | 516 | # CONFIG_IPMI_HANDLER is not set |
| 595 | |||
| 596 | # | ||
| 597 | # Watchdog Cards | ||
| 598 | # | ||
| 599 | # CONFIG_WATCHDOG is not set | 517 | # CONFIG_WATCHDOG is not set |
| 600 | CONFIG_HW_RANDOM=y | 518 | CONFIG_HW_RANDOM=y |
| 601 | # CONFIG_RTC is not set | 519 | # CONFIG_RTC is not set |
| 602 | CONFIG_DS1302=y | 520 | CONFIG_DS1302=y |
| 603 | # CONFIG_DTLK is not set | ||
| 604 | # CONFIG_R3964 is not set | 521 | # CONFIG_R3964 is not set |
| 605 | |||
| 606 | # | ||
| 607 | # Ftape, the floppy tape device driver | ||
| 608 | # | ||
| 609 | # CONFIG_RAW_DRIVER is not set | 522 | # CONFIG_RAW_DRIVER is not set |
| 610 | |||
| 611 | # | ||
| 612 | # TPM devices | ||
| 613 | # | ||
| 614 | # CONFIG_TCG_TPM is not set | 523 | # CONFIG_TCG_TPM is not set |
| 615 | |||
| 616 | # | ||
| 617 | # I2C support | ||
| 618 | # | ||
| 619 | # CONFIG_I2C is not set | 524 | # CONFIG_I2C is not set |
| 620 | 525 | ||
| 621 | # | 526 | # |
| @@ -623,65 +528,76 @@ CONFIG_DS1302=y | |||
| 623 | # | 528 | # |
| 624 | # CONFIG_SPI is not set | 529 | # CONFIG_SPI is not set |
| 625 | # CONFIG_SPI_MASTER is not set | 530 | # CONFIG_SPI_MASTER is not set |
| 626 | |||
| 627 | # | ||
| 628 | # Dallas's 1-wire bus | ||
| 629 | # | ||
| 630 | # CONFIG_W1 is not set | 531 | # CONFIG_W1 is not set |
| 631 | 532 | # CONFIG_POWER_SUPPLY is not set | |
| 632 | # | ||
| 633 | # Hardware Monitoring support | ||
| 634 | # | ||
| 635 | CONFIG_HWMON=y | 533 | CONFIG_HWMON=y |
| 636 | # CONFIG_HWMON_VID is not set | 534 | # CONFIG_HWMON_VID is not set |
| 637 | # CONFIG_SENSORS_ABITUGURU is not set | 535 | # CONFIG_SENSORS_ABITUGURU is not set |
| 536 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 638 | # CONFIG_SENSORS_F71805F is not set | 537 | # CONFIG_SENSORS_F71805F is not set |
| 538 | # CONFIG_SENSORS_IT87 is not set | ||
| 539 | # CONFIG_SENSORS_PC87360 is not set | ||
| 540 | # CONFIG_SENSORS_PC87427 is not set | ||
| 541 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 542 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 639 | # CONFIG_SENSORS_VT1211 is not set | 543 | # CONFIG_SENSORS_VT1211 is not set |
| 544 | # CONFIG_SENSORS_W83627HF is not set | ||
| 545 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 640 | # CONFIG_HWMON_DEBUG_CHIP is not set | 546 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 641 | 547 | ||
| 642 | # | 548 | # |
| 549 | # Multifunction device drivers | ||
| 550 | # | ||
| 551 | # CONFIG_MFD_SM501 is not set | ||
| 552 | |||
| 553 | # | ||
| 643 | # Multimedia devices | 554 | # Multimedia devices |
| 644 | # | 555 | # |
| 645 | CONFIG_VIDEO_DEV=m | 556 | CONFIG_VIDEO_DEV=m |
| 646 | CONFIG_VIDEO_V4L1=y | 557 | CONFIG_VIDEO_V4L1=y |
| 647 | CONFIG_VIDEO_V4L1_COMPAT=y | 558 | CONFIG_VIDEO_V4L1_COMPAT=y |
| 648 | CONFIG_VIDEO_V4L2=y | 559 | CONFIG_VIDEO_V4L2=y |
| 649 | 560 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | |
| 650 | # | ||
| 651 | # Video Capture Adapters | ||
| 652 | # | ||
| 653 | |||
| 654 | # | ||
| 655 | # Video Capture Adapters | ||
| 656 | # | ||
| 657 | # CONFIG_VIDEO_ADV_DEBUG is not set | 561 | # CONFIG_VIDEO_ADV_DEBUG is not set |
| 658 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | 562 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y |
| 659 | # CONFIG_VIDEO_VIVI is not set | ||
| 660 | # CONFIG_VIDEO_CPIA is not set | 563 | # CONFIG_VIDEO_CPIA is not set |
| 661 | CONFIG_VIDEO_M32R_AR=m | 564 | CONFIG_VIDEO_M32R_AR=m |
| 662 | CONFIG_VIDEO_M32R_AR_M64278=m | 565 | CONFIG_VIDEO_M32R_AR_M64278=m |
| 566 | CONFIG_RADIO_ADAPTERS=y | ||
| 567 | # CONFIG_DVB_CORE is not set | ||
| 568 | CONFIG_DAB=y | ||
| 663 | 569 | ||
| 664 | # | 570 | # |
| 665 | # Radio Adapters | 571 | # Graphics support |
| 666 | # | ||
| 667 | |||
| 668 | # | ||
| 669 | # Digital Video Broadcasting Devices | ||
| 670 | # | 572 | # |
| 671 | # CONFIG_DVB is not set | 573 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 672 | 574 | ||
| 673 | # | 575 | # |
| 674 | # Graphics support | 576 | # Display device support |
| 675 | # | 577 | # |
| 676 | CONFIG_FIRMWARE_EDID=y | 578 | # CONFIG_DISPLAY_SUPPORT is not set |
| 579 | # CONFIG_VGASTATE is not set | ||
| 580 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 677 | CONFIG_FB=y | 581 | CONFIG_FB=y |
| 582 | CONFIG_FIRMWARE_EDID=y | ||
| 583 | # CONFIG_FB_DDC is not set | ||
| 678 | CONFIG_FB_CFB_FILLRECT=y | 584 | CONFIG_FB_CFB_FILLRECT=y |
| 679 | CONFIG_FB_CFB_COPYAREA=y | 585 | CONFIG_FB_CFB_COPYAREA=y |
| 680 | CONFIG_FB_CFB_IMAGEBLIT=y | 586 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 587 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 588 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 589 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 590 | # CONFIG_FB_SYS_FOPS is not set | ||
| 591 | CONFIG_FB_DEFERRED_IO=y | ||
| 592 | # CONFIG_FB_SVGALIB is not set | ||
| 681 | # CONFIG_FB_MACMODES is not set | 593 | # CONFIG_FB_MACMODES is not set |
| 682 | # CONFIG_FB_BACKLIGHT is not set | 594 | # CONFIG_FB_BACKLIGHT is not set |
| 683 | # CONFIG_FB_MODE_HELPERS is not set | 595 | # CONFIG_FB_MODE_HELPERS is not set |
| 684 | # CONFIG_FB_TILEBLITTING is not set | 596 | # CONFIG_FB_TILEBLITTING is not set |
| 597 | |||
| 598 | # | ||
| 599 | # Frame buffer hardware drivers | ||
| 600 | # | ||
| 685 | CONFIG_FB_S1D13XXX=y | 601 | CONFIG_FB_S1D13XXX=y |
| 686 | # CONFIG_FB_VIRTUAL is not set | 602 | # CONFIG_FB_VIRTUAL is not set |
| 687 | 603 | ||
| @@ -691,29 +607,25 @@ CONFIG_FB_S1D13XXX=y | |||
| 691 | # CONFIG_VGA_CONSOLE is not set | 607 | # CONFIG_VGA_CONSOLE is not set |
| 692 | CONFIG_DUMMY_CONSOLE=y | 608 | CONFIG_DUMMY_CONSOLE=y |
| 693 | CONFIG_FRAMEBUFFER_CONSOLE=y | 609 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 610 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 694 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 611 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 695 | # CONFIG_FONTS is not set | 612 | # CONFIG_FONTS is not set |
| 696 | CONFIG_FONT_8x8=y | 613 | CONFIG_FONT_8x8=y |
| 697 | CONFIG_FONT_8x16=y | 614 | CONFIG_FONT_8x16=y |
| 698 | |||
| 699 | # | ||
| 700 | # Logo configuration | ||
| 701 | # | ||
| 702 | CONFIG_LOGO=y | 615 | CONFIG_LOGO=y |
| 703 | CONFIG_LOGO_LINUX_MONO=y | 616 | CONFIG_LOGO_LINUX_MONO=y |
| 704 | CONFIG_LOGO_LINUX_VGA16=y | 617 | CONFIG_LOGO_LINUX_VGA16=y |
| 705 | CONFIG_LOGO_LINUX_CLUT224=y | 618 | CONFIG_LOGO_LINUX_CLUT224=y |
| 706 | CONFIG_LOGO_M32R_CLUT224=y | 619 | CONFIG_LOGO_M32R_CLUT224=y |
| 707 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 708 | 620 | ||
| 709 | # | 621 | # |
| 710 | # Sound | 622 | # Sound |
| 711 | # | 623 | # |
| 712 | # CONFIG_SOUND is not set | 624 | # CONFIG_SOUND is not set |
| 713 | 625 | CONFIG_HID_SUPPORT=y | |
| 714 | # | 626 | CONFIG_HID=y |
| 715 | # USB support | 627 | # CONFIG_HID_DEBUG is not set |
| 716 | # | 628 | CONFIG_USB_SUPPORT=y |
| 717 | # CONFIG_USB_ARCH_HAS_HCD is not set | 629 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 718 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 630 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 719 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 631 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -726,35 +638,20 @@ CONFIG_LOGO_M32R_CLUT224=y | |||
| 726 | # USB Gadget Support | 638 | # USB Gadget Support |
| 727 | # | 639 | # |
| 728 | # CONFIG_USB_GADGET is not set | 640 | # CONFIG_USB_GADGET is not set |
| 729 | |||
| 730 | # | ||
| 731 | # MMC/SD Card support | ||
| 732 | # | ||
| 733 | CONFIG_MMC=y | 641 | CONFIG_MMC=y |
| 734 | CONFIG_MMC_DEBUG=y | 642 | CONFIG_MMC_DEBUG=y |
| 735 | CONFIG_MMC_BLOCK=y | 643 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| 736 | # CONFIG_MMC_TIFM_SD is not set | ||
| 737 | |||
| 738 | # | ||
| 739 | # LED devices | ||
| 740 | # | ||
| 741 | # CONFIG_NEW_LEDS is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # LED drivers | ||
| 745 | # | ||
| 746 | 644 | ||
| 747 | # | 645 | # |
| 748 | # LED Triggers | 646 | # MMC/SD Card Drivers |
| 749 | # | ||
| 750 | |||
| 751 | # | ||
| 752 | # InfiniBand support | ||
| 753 | # | 647 | # |
| 648 | CONFIG_MMC_BLOCK=y | ||
| 649 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 754 | 650 | ||
| 755 | # | 651 | # |
| 756 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 652 | # MMC/SD Host Controller Drivers |
| 757 | # | 653 | # |
| 654 | # CONFIG_NEW_LEDS is not set | ||
| 758 | 655 | ||
| 759 | # | 656 | # |
| 760 | # Real Time Clock | 657 | # Real Time Clock |
| @@ -762,17 +659,9 @@ CONFIG_MMC_BLOCK=y | |||
| 762 | # CONFIG_RTC_CLASS is not set | 659 | # CONFIG_RTC_CLASS is not set |
| 763 | 660 | ||
| 764 | # | 661 | # |
| 765 | # DMA Engine support | 662 | # Userspace I/O |
| 766 | # | ||
| 767 | # CONFIG_DMA_ENGINE is not set | ||
| 768 | |||
| 769 | # | ||
| 770 | # DMA Clients | ||
| 771 | # | ||
| 772 | |||
| 773 | # | ||
| 774 | # DMA Devices | ||
| 775 | # | 663 | # |
| 664 | # CONFIG_UIO is not set | ||
| 776 | 665 | ||
| 777 | # | 666 | # |
| 778 | # File systems | 667 | # File systems |
| @@ -849,7 +738,6 @@ CONFIG_RAMFS=y | |||
| 849 | # CONFIG_BEFS_FS is not set | 738 | # CONFIG_BEFS_FS is not set |
| 850 | # CONFIG_BFS_FS is not set | 739 | # CONFIG_BFS_FS is not set |
| 851 | # CONFIG_EFS_FS is not set | 740 | # CONFIG_EFS_FS is not set |
| 852 | # CONFIG_JFFS_FS is not set | ||
| 853 | # CONFIG_JFFS2_FS is not set | 741 | # CONFIG_JFFS2_FS is not set |
| 854 | # CONFIG_CRAMFS is not set | 742 | # CONFIG_CRAMFS is not set |
| 855 | # CONFIG_VXFS_FS is not set | 743 | # CONFIG_VXFS_FS is not set |
| @@ -872,6 +760,7 @@ CONFIG_LOCKD=y | |||
| 872 | CONFIG_LOCKD_V4=y | 760 | CONFIG_LOCKD_V4=y |
| 873 | CONFIG_NFS_COMMON=y | 761 | CONFIG_NFS_COMMON=y |
| 874 | CONFIG_SUNRPC=y | 762 | CONFIG_SUNRPC=y |
| 763 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 875 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 764 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 876 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 765 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 877 | # CONFIG_SMB_FS is not set | 766 | # CONFIG_SMB_FS is not set |
| @@ -879,7 +768,6 @@ CONFIG_SUNRPC=y | |||
| 879 | # CONFIG_NCP_FS is not set | 768 | # CONFIG_NCP_FS is not set |
| 880 | # CONFIG_CODA_FS is not set | 769 | # CONFIG_CODA_FS is not set |
| 881 | # CONFIG_AFS_FS is not set | 770 | # CONFIG_AFS_FS is not set |
| 882 | # CONFIG_9P_FS is not set | ||
| 883 | 771 | ||
| 884 | # | 772 | # |
| 885 | # Partition Types | 773 | # Partition Types |
| @@ -932,6 +820,11 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 932 | # CONFIG_NLS_UTF8 is not set | 820 | # CONFIG_NLS_UTF8 is not set |
| 933 | 821 | ||
| 934 | # | 822 | # |
| 823 | # Distributed Lock Manager | ||
| 824 | # | ||
| 825 | # CONFIG_DLM is not set | ||
| 826 | |||
| 827 | # | ||
| 935 | # Profiling support | 828 | # Profiling support |
| 936 | # | 829 | # |
| 937 | CONFIG_PROFILING=y | 830 | CONFIG_PROFILING=y |
| @@ -944,29 +837,27 @@ CONFIG_OPROFILE=y | |||
| 944 | CONFIG_ENABLE_MUST_CHECK=y | 837 | CONFIG_ENABLE_MUST_CHECK=y |
| 945 | # CONFIG_MAGIC_SYSRQ is not set | 838 | # CONFIG_MAGIC_SYSRQ is not set |
| 946 | # CONFIG_UNUSED_SYMBOLS is not set | 839 | # CONFIG_UNUSED_SYMBOLS is not set |
| 840 | # CONFIG_DEBUG_FS is not set | ||
| 841 | # CONFIG_HEADERS_CHECK is not set | ||
| 947 | # CONFIG_DEBUG_KERNEL is not set | 842 | # CONFIG_DEBUG_KERNEL is not set |
| 948 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 949 | # CONFIG_DEBUG_BUGVERBOSE is not set | 843 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 950 | # CONFIG_DEBUG_FS is not set | ||
| 951 | # CONFIG_FRAME_POINTER is not set | 844 | # CONFIG_FRAME_POINTER is not set |
| 952 | # CONFIG_UNWIND_INFO is not set | ||
| 953 | # CONFIG_HEADERS_CHECK is not set | ||
| 954 | 845 | ||
| 955 | # | 846 | # |
| 956 | # Security options | 847 | # Security options |
| 957 | # | 848 | # |
| 958 | # CONFIG_KEYS is not set | 849 | # CONFIG_KEYS is not set |
| 959 | # CONFIG_SECURITY is not set | 850 | # CONFIG_SECURITY is not set |
| 960 | |||
| 961 | # | ||
| 962 | # Cryptographic options | ||
| 963 | # | ||
| 964 | # CONFIG_CRYPTO is not set | 851 | # CONFIG_CRYPTO is not set |
| 965 | 852 | ||
| 966 | # | 853 | # |
| 967 | # Library routines | 854 | # Library routines |
| 968 | # | 855 | # |
| 856 | CONFIG_BITREVERSE=y | ||
| 969 | # CONFIG_CRC_CCITT is not set | 857 | # CONFIG_CRC_CCITT is not set |
| 970 | # CONFIG_CRC16 is not set | 858 | # CONFIG_CRC16 is not set |
| 859 | # CONFIG_CRC_ITU_T is not set | ||
| 971 | CONFIG_CRC32=y | 860 | CONFIG_CRC32=y |
| 861 | # CONFIG_CRC7 is not set | ||
| 972 | # CONFIG_LIBCRC32C is not set | 862 | # CONFIG_LIBCRC32C is not set |
| 863 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile index 5a2fa886906f..e97e26e87c9e 100644 --- a/arch/m32r/kernel/Makefile +++ b/arch/m32r/kernel/Makefile | |||
| @@ -8,14 +8,6 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \ | |||
| 8 | m32r_ksyms.o sys_m32r.o semaphore.o signal.o ptrace.o | 8 | m32r_ksyms.o sys_m32r.o semaphore.o signal.o ptrace.o |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_SMP) += smp.o smpboot.o | 10 | obj-$(CONFIG_SMP) += smp.o smpboot.o |
| 11 | obj-$(CONFIG_PLAT_MAPPI) += setup_mappi.o io_mappi.o | ||
| 12 | obj-$(CONFIG_PLAT_MAPPI2) += setup_mappi2.o io_mappi2.o | ||
| 13 | obj-$(CONFIG_PLAT_MAPPI3) += setup_mappi3.o io_mappi3.o | ||
| 14 | obj-$(CONFIG_PLAT_USRV) += setup_usrv.o io_usrv.o | ||
| 15 | obj-$(CONFIG_PLAT_M32700UT) += setup_m32700ut.o io_m32700ut.o | ||
| 16 | obj-$(CONFIG_PLAT_OPSPUT) += setup_opsput.o io_opsput.o | ||
| 17 | obj-$(CONFIG_MODULES) += module.o | 11 | obj-$(CONFIG_MODULES) += module.o |
| 18 | obj-$(CONFIG_PLAT_OAKS32R) += setup_oaks32r.o io_oaks32r.o | ||
| 19 | obj-$(CONFIG_PLAT_M32104UT) += setup_m32104ut.o io_m32104ut.o | ||
| 20 | 12 | ||
| 21 | EXTRA_AFLAGS := -traditional | 13 | EXTRA_AFLAGS := -traditional |
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index a2c472c0549f..d4eaa2fd1818 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S | |||
| @@ -109,15 +109,10 @@ | |||
| 109 | #define SP(reg) @(0x68,reg) | 109 | #define SP(reg) @(0x68,reg) |
| 110 | #define ORIG_R0(reg) @(0x6C,reg) | 110 | #define ORIG_R0(reg) @(0x6C,reg) |
| 111 | 111 | ||
| 112 | CF_MASK = 0x00000001 | 112 | #define nr_syscalls ((syscall_table_size)/4) |
| 113 | TF_MASK = 0x00000100 | ||
| 114 | IF_MASK = 0x00000200 | ||
| 115 | DF_MASK = 0x00000400 | ||
| 116 | NT_MASK = 0x00004000 | ||
| 117 | VM_MASK = 0x00020000 | ||
| 118 | 113 | ||
| 119 | #ifdef CONFIG_PREEMPT | 114 | #ifdef CONFIG_PREEMPT |
| 120 | #define preempt_stop(x) CLI(x) | 115 | #define preempt_stop(x) DISABLE_INTERRUPTS(x) |
| 121 | #else | 116 | #else |
| 122 | #define preempt_stop(x) | 117 | #define preempt_stop(x) |
| 123 | #define resume_kernel restore_all | 118 | #define resume_kernel restore_all |
| @@ -149,7 +144,7 @@ ret_from_intr: | |||
| 149 | #endif | 144 | #endif |
| 150 | beqz r4, resume_kernel | 145 | beqz r4, resume_kernel |
| 151 | ENTRY(resume_userspace) | 146 | ENTRY(resume_userspace) |
| 152 | CLI(r4) ; make sure we don't miss an interrupt | 147 | DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt |
| 153 | ; setting need_resched or sigpending | 148 | ; setting need_resched or sigpending |
| 154 | ; between sampling and the iret | 149 | ; between sampling and the iret |
| 155 | GET_THREAD_INFO(r8) | 150 | GET_THREAD_INFO(r8) |
| @@ -173,11 +168,11 @@ need_resched: | |||
| 173 | beqz r4, restore_all | 168 | beqz r4, restore_all |
| 174 | LDIMM (r4, PREEMPT_ACTIVE) | 169 | LDIMM (r4, PREEMPT_ACTIVE) |
| 175 | st r4, @(TI_PRE_COUNT, r8) | 170 | st r4, @(TI_PRE_COUNT, r8) |
| 176 | STI(r4) | 171 | ENABLE_INTERRUPTS(r4) |
| 177 | bl schedule | 172 | bl schedule |
| 178 | ldi r4, #0 | 173 | ldi r4, #0 |
| 179 | st r4, @(TI_PRE_COUNT, r8) | 174 | st r4, @(TI_PRE_COUNT, r8) |
| 180 | CLI(r4) | 175 | DISABLE_INTERRUPTS(r4) |
| 181 | bra need_resched | 176 | bra need_resched |
| 182 | #endif | 177 | #endif |
| 183 | 178 | ||
| @@ -185,7 +180,7 @@ need_resched: | |||
| 185 | ENTRY(system_call) | 180 | ENTRY(system_call) |
| 186 | SWITCH_TO_KERNEL_STACK | 181 | SWITCH_TO_KERNEL_STACK |
| 187 | SAVE_ALL | 182 | SAVE_ALL |
| 188 | STI(r4) ; Enable interrupt | 183 | ENABLE_INTERRUPTS(r4) ; Enable interrupt |
| 189 | st sp, PTREGS(sp) ; implicit pt_regs parameter | 184 | st sp, PTREGS(sp) ; implicit pt_regs parameter |
| 190 | cmpui r7, #NR_syscalls | 185 | cmpui r7, #NR_syscalls |
| 191 | bnc syscall_badsys | 186 | bnc syscall_badsys |
| @@ -203,7 +198,7 @@ syscall_call: | |||
| 203 | jl r7 ; execute system call | 198 | jl r7 ; execute system call |
| 204 | st r0, R0(sp) ; save the return value | 199 | st r0, R0(sp) ; save the return value |
| 205 | syscall_exit: | 200 | syscall_exit: |
| 206 | CLI(r4) ; make sure we don't miss an interrupt | 201 | DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt |
| 207 | ; setting need_resched or sigpending | 202 | ; setting need_resched or sigpending |
| 208 | ; between sampling and the iret | 203 | ; between sampling and the iret |
| 209 | ld r9, @(TI_FLAGS, r8) | 204 | ld r9, @(TI_FLAGS, r8) |
| @@ -220,7 +215,7 @@ work_pending: | |||
| 220 | beqz r4, work_notifysig | 215 | beqz r4, work_notifysig |
| 221 | work_resched: | 216 | work_resched: |
| 222 | bl schedule | 217 | bl schedule |
| 223 | CLI(r4) ; make sure we don't miss an interrupt | 218 | DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt |
| 224 | ; setting need_resched or sigpending | 219 | ; setting need_resched or sigpending |
| 225 | ; between sampling and the iret | 220 | ; between sampling and the iret |
| 226 | ld r9, @(TI_FLAGS, r8) | 221 | ld r9, @(TI_FLAGS, r8) |
| @@ -262,7 +257,7 @@ syscall_exit_work: | |||
| 262 | ld r9, @(TI_FLAGS, r8) | 257 | ld r9, @(TI_FLAGS, r8) |
| 263 | and3 r4, r9, #_TIF_SYSCALL_TRACE | 258 | and3 r4, r9, #_TIF_SYSCALL_TRACE |
| 264 | beqz r4, work_pending | 259 | beqz r4, work_pending |
| 265 | STI(r4) ; could let do_syscall_trace() call | 260 | ENABLE_INTERRUPTS(r4) ; could let do_syscall_trace() call |
| 266 | ; schedule() instead | 261 | ; schedule() instead |
| 267 | bl do_syscall_trace | 262 | bl do_syscall_trace |
| 268 | bra resume_userspace | 263 | bra resume_userspace |
| @@ -290,16 +285,12 @@ syscall_badsys: | |||
| 290 | */ | 285 | */ |
| 291 | ENTRY(ei_handler) | 286 | ENTRY(ei_handler) |
| 292 | #if defined(CONFIG_CHIP_M32700) | 287 | #if defined(CONFIG_CHIP_M32700) |
| 293 | SWITCH_TO_KERNEL_STACK | ||
| 294 | ; WORKAROUND: force to clear SM bit and use the kernel stack (SPI). | 288 | ; WORKAROUND: force to clear SM bit and use the kernel stack (SPI). |
| 289 | SWITCH_TO_KERNEL_STACK | ||
| 295 | #endif | 290 | #endif |
| 296 | SAVE_ALL | 291 | SAVE_ALL |
| 297 | mv r1, sp ; arg1(regs) | 292 | mv r1, sp ; arg1(regs) |
| 298 | #if defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ | 293 | ; get ICU status |
| 299 | || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \ | ||
| 300 | || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104) | ||
| 301 | |||
| 302 | ; GET_ICU_STATUS; | ||
| 303 | seth r0, #shigh(M32R_ICU_ISTS_ADDR) | 294 | seth r0, #shigh(M32R_ICU_ISTS_ADDR) |
| 304 | ld r0, @(low(M32R_ICU_ISTS_ADDR),r0) | 295 | ld r0, @(low(M32R_ICU_ISTS_ADDR),r0) |
| 305 | push r0 | 296 | push r0 |
| @@ -314,10 +305,15 @@ ENTRY(ei_handler) | |||
| 314 | ;; IRQ exist check | 305 | ;; IRQ exist check |
| 315 | #if defined(CONFIG_CHIP_M32700) | 306 | #if defined(CONFIG_CHIP_M32700) |
| 316 | /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */ | 307 | /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */ |
| 317 | beqz r0, 3f ; if (!irq_num) goto exit | 308 | bnez r0, 0f |
| 318 | #else | 309 | ld24 r14, #0x00070000 |
| 310 | seth r0, #shigh(M32R_ICU_IMASK_ADDR) | ||
| 311 | st r14, @(low(M32R_ICU_IMASK_ADDR),r0) | ||
| 312 | bra 1f | ||
| 313 | .fillinsn | ||
| 314 | 0: | ||
| 315 | #endif /* CONFIG_CHIP_M32700 */ | ||
| 319 | beqz r0, 1f ; if (!irq_num) goto exit | 316 | beqz r0, 1f ; if (!irq_num) goto exit |
| 320 | #endif /* WORKAROUND */ | ||
| 321 | ;; IPI check | 317 | ;; IPI check |
| 322 | cmpi r0, #(M32R_IRQ_IPI0<<2) ; ISN < IPI0 check | 318 | cmpi r0, #(M32R_IRQ_IPI0<<2) ; ISN < IPI0 check |
| 323 | bc 2f | 319 | bc 2f |
| @@ -332,220 +328,56 @@ ENTRY(ei_handler) | |||
| 332 | .fillinsn | 328 | .fillinsn |
| 333 | 1: | 329 | 1: |
| 334 | addi sp, #4 | 330 | addi sp, #4 |
| 335 | bra ret_to_intr | 331 | bra restore_all |
| 336 | #if defined(CONFIG_CHIP_M32700) | ||
| 337 | /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */ | ||
| 338 | .fillinsn | ||
| 339 | 3: | ||
| 340 | ld24 r14, #0x00070000 | ||
| 341 | seth r0, #shigh(M32R_ICU_IMASK_ADDR) | ||
| 342 | st r14, @(low(M32R_ICU_IMASK_ADDR), r0) | ||
| 343 | addi sp, #4 | ||
| 344 | bra ret_to_intr | ||
| 345 | #endif /* WORKAROUND */ | ||
| 346 | ;; do_IRQ | ||
| 347 | .fillinsn | 332 | .fillinsn |
| 348 | 2: | 333 | 2: |
| 349 | srli r0, #2 | 334 | srli r0, #2 |
| 350 | #if defined(CONFIG_PLAT_USRV) | 335 | #else /* not CONFIG_SMP */ |
| 351 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | ||
| 352 | bnez r2, 9f | ||
| 353 | ; read ICU status register of PLD | ||
| 354 | seth r0, #high(PLD_ICUISTS) | ||
| 355 | or3 r0, r0, #low(PLD_ICUISTS) | ||
| 356 | lduh r0, @r0 | ||
| 357 | slli r0, #21 | ||
| 358 | srli r0, #27 ; ISN | ||
| 359 | addi r0, #(M32700UT_PLD_IRQ_BASE) | ||
| 360 | .fillinsn | ||
| 361 | 9: | ||
| 362 | #elif defined(CONFIG_PLAT_M32700UT) | ||
| 363 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | ||
| 364 | bnez r2, check_int0 | ||
| 365 | ; read ICU status register of PLD | ||
| 366 | seth r0, #high(PLD_ICUISTS) | ||
| 367 | or3 r0, r0, #low(PLD_ICUISTS) | ||
| 368 | lduh r0, @r0 | ||
| 369 | slli r0, #21 | ||
| 370 | srli r0, #27 ; ISN | ||
| 371 | addi r0, #(M32700UT_PLD_IRQ_BASE) | ||
| 372 | bra check_end | ||
| 373 | .fillinsn | ||
| 374 | check_int0: | ||
| 375 | add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt | ||
| 376 | bnez r2, check_int2 | ||
| 377 | ; read ICU status of LAN-board | ||
| 378 | seth r0, #high(M32700UT_LAN_ICUISTS) | ||
| 379 | or3 r0, r0, #low(M32700UT_LAN_ICUISTS) | ||
| 380 | lduh r0, @r0 | ||
| 381 | slli r0, #21 | ||
| 382 | srli r0, #27 ; ISN | ||
| 383 | add3 r0, r0, #(M32700UT_LAN_PLD_IRQ_BASE) | ||
| 384 | bra check_end | ||
| 385 | .fillinsn | ||
| 386 | check_int2: | ||
| 387 | add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt | ||
| 388 | bnez r2, check_end | ||
| 389 | ; read ICU status of LCD-board | ||
| 390 | seth r0, #high(M32700UT_LCD_ICUISTS) | ||
| 391 | or3 r0, r0, #low(M32700UT_LCD_ICUISTS) | ||
| 392 | lduh r0, @r0 | ||
| 393 | slli r0, #21 | ||
| 394 | srli r0, #27 ; ISN | ||
| 395 | add3 r0, r0, #(M32700UT_LCD_PLD_IRQ_BASE) | ||
| 396 | bra check_end | ||
| 397 | .fillinsn | ||
| 398 | check_end: | ||
| 399 | #elif defined(CONFIG_PLAT_OPSPUT) | ||
| 400 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | ||
| 401 | bnez r2, check_int0 | ||
| 402 | ; read ICU status register of PLD | ||
| 403 | seth r0, #high(PLD_ICUISTS) | ||
| 404 | or3 r0, r0, #low(PLD_ICUISTS) | ||
| 405 | lduh r0, @r0 | ||
| 406 | slli r0, #21 | ||
| 407 | srli r0, #27 ; ISN | ||
| 408 | addi r0, #(OPSPUT_PLD_IRQ_BASE) | ||
| 409 | bra check_end | ||
| 410 | .fillinsn | ||
| 411 | check_int0: | ||
| 412 | add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt | ||
| 413 | bnez r2, check_int2 | ||
| 414 | ; read ICU status of LAN-board | ||
| 415 | seth r0, #high(OPSPUT_LAN_ICUISTS) | ||
| 416 | or3 r0, r0, #low(OPSPUT_LAN_ICUISTS) | ||
| 417 | lduh r0, @r0 | ||
| 418 | slli r0, #21 | ||
| 419 | srli r0, #27 ; ISN | ||
| 420 | add3 r0, r0, #(OPSPUT_LAN_PLD_IRQ_BASE) | ||
| 421 | bra check_end | ||
| 422 | .fillinsn | ||
| 423 | check_int2: | ||
| 424 | add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt | ||
| 425 | bnez r2, check_end | ||
| 426 | ; read ICU status of LCD-board | ||
| 427 | seth r0, #high(OPSPUT_LCD_ICUISTS) | ||
| 428 | or3 r0, r0, #low(OPSPUT_LCD_ICUISTS) | ||
| 429 | lduh r0, @r0 | ||
| 430 | slli r0, #21 | ||
| 431 | srli r0, #27 ; ISN | ||
| 432 | add3 r0, r0, #(OPSPUT_LCD_PLD_IRQ_BASE) | ||
| 433 | bra check_end | ||
| 434 | .fillinsn | ||
| 435 | check_end: | ||
| 436 | #endif /* CONFIG_PLAT_OPSPUT */ | ||
| 437 | bl do_IRQ ; r0(irq), r1(regs) | ||
| 438 | #else /* not CONFIG_SMP */ | ||
| 439 | srli r0, #22 ; r0(irq) | 336 | srli r0, #22 ; r0(irq) |
| 440 | #if defined(CONFIG_PLAT_USRV) | 337 | #endif /* not CONFIG_SMP */ |
| 338 | |||
| 339 | #if defined(CONFIG_PLAT_HAS_INT1ICU) | ||
| 441 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | 340 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt |
| 442 | bnez r2, 1f | 341 | bnez r2, 3f |
| 443 | ; read ICU status register of PLD | 342 | seth r0, #shigh(M32R_INT1ICU_ISTS) |
| 444 | seth r0, #high(PLD_ICUISTS) | 343 | lduh r0, @(low(M32R_INT1ICU_ISTS),r0) ; bit10-6 : ISN |
| 445 | or3 r0, r0, #low(PLD_ICUISTS) | ||
| 446 | lduh r0, @r0 | ||
| 447 | slli r0, #21 | 344 | slli r0, #21 |
| 448 | srli r0, #27 ; ISN | 345 | srli r0, #27 ; ISN |
| 449 | addi r0, #(M32700UT_PLD_IRQ_BASE) | 346 | addi r0, #(M32R_INT1ICU_IRQ_BASE) |
| 450 | .fillinsn | ||
| 451 | 1: | ||
| 452 | #elif defined(CONFIG_PLAT_M32700UT) | ||
| 453 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | ||
| 454 | bnez r2, check_int0 | ||
| 455 | ; read ICU status register of PLD | ||
| 456 | seth r0, #high(PLD_ICUISTS) | ||
| 457 | or3 r0, r0, #low(PLD_ICUISTS) | ||
| 458 | lduh r0, @r0 | ||
| 459 | slli r0, #21 | ||
| 460 | srli r0, #27 ; ISN | ||
| 461 | addi r0, #(M32700UT_PLD_IRQ_BASE) | ||
| 462 | bra check_end | ||
| 463 | .fillinsn | ||
| 464 | check_int0: | ||
| 465 | add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt | ||
| 466 | bnez r2, check_int2 | ||
| 467 | ; read ICU status of LAN-board | ||
| 468 | seth r0, #high(M32700UT_LAN_ICUISTS) | ||
| 469 | or3 r0, r0, #low(M32700UT_LAN_ICUISTS) | ||
| 470 | lduh r0, @r0 | ||
| 471 | slli r0, #21 | ||
| 472 | srli r0, #27 ; ISN | ||
| 473 | add3 r0, r0, #(M32700UT_LAN_PLD_IRQ_BASE) | ||
| 474 | bra check_end | ||
| 475 | .fillinsn | ||
| 476 | check_int2: | ||
| 477 | add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt | ||
| 478 | bnez r2, check_end | ||
| 479 | ; read ICU status of LCD-board | ||
| 480 | seth r0, #high(M32700UT_LCD_ICUISTS) | ||
| 481 | or3 r0, r0, #low(M32700UT_LCD_ICUISTS) | ||
| 482 | lduh r0, @r0 | ||
| 483 | slli r0, #21 | ||
| 484 | srli r0, #27 ; ISN | ||
| 485 | add3 r0, r0, #(M32700UT_LCD_PLD_IRQ_BASE) | ||
| 486 | bra check_end | ||
| 487 | .fillinsn | ||
| 488 | check_end: | ||
| 489 | #elif defined(CONFIG_PLAT_OPSPUT) | ||
| 490 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | ||
| 491 | bnez r2, check_int0 | ||
| 492 | ; read ICU status register of PLD | ||
| 493 | seth r0, #high(PLD_ICUISTS) | ||
| 494 | or3 r0, r0, #low(PLD_ICUISTS) | ||
| 495 | lduh r0, @r0 | ||
| 496 | slli r0, #21 | ||
| 497 | srli r0, #27 ; ISN | ||
| 498 | addi r0, #(OPSPUT_PLD_IRQ_BASE) | ||
| 499 | bra check_end | ||
| 500 | .fillinsn | ||
| 501 | check_int0: | ||
| 502 | add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt | ||
| 503 | bnez r2, check_int2 | ||
| 504 | ; read ICU status of LAN-board | ||
| 505 | seth r0, #high(OPSPUT_LAN_ICUISTS) | ||
| 506 | or3 r0, r0, #low(OPSPUT_LAN_ICUISTS) | ||
| 507 | lduh r0, @r0 | ||
| 508 | slli r0, #21 | ||
| 509 | srli r0, #27 ; ISN | ||
| 510 | add3 r0, r0, #(OPSPUT_LAN_PLD_IRQ_BASE) | ||
| 511 | bra check_end | 347 | bra check_end |
| 512 | .fillinsn | 348 | .fillinsn |
| 513 | check_int2: | 349 | 3: |
| 514 | add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt | 350 | #endif /* CONFIG_PLAT_HAS_INT1ICU */ |
| 515 | bnez r2, check_end | 351 | #if defined(CONFIG_PLAT_HAS_INT0ICU) |
| 516 | ; read ICU status of LCD-board | 352 | add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt |
| 517 | seth r0, #high(OPSPUT_LCD_ICUISTS) | 353 | bnez r2, 4f |
| 518 | or3 r0, r0, #low(OPSPUT_LCD_ICUISTS) | 354 | seth r0, #shigh(M32R_INT0ICU_ISTS) |
| 519 | lduh r0, @r0 | 355 | lduh r0, @(low(M32R_INT0ICU_ISTS),r0) ; bit10-6 : ISN |
| 520 | slli r0, #21 | 356 | slli r0, #21 |
| 521 | srli r0, #27 ; ISN | 357 | srli r0, #27 ; ISN |
| 522 | add3 r0, r0, #(OPSPUT_LCD_PLD_IRQ_BASE) | 358 | add3 r0, r0, #(M32R_INT0ICU_IRQ_BASE) |
| 523 | bra check_end | 359 | bra check_end |
| 524 | .fillinsn | 360 | .fillinsn |
| 525 | check_end: | 361 | 4: |
| 526 | #elif defined(CONFIG_PLAT_M32104UT) | 362 | #endif /* CONFIG_PLAT_HAS_INT0ICU */ |
| 527 | add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt | 363 | #if defined(CONFIG_PLAT_HAS_INT2ICU) |
| 528 | bnez r2, check_end | 364 | add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt |
| 529 | ; read ICU status register of PLD | 365 | bnez r2, 5f |
| 530 | seth r0, #high(PLD_ICUISTS) | 366 | seth r0, #shigh(M32R_INT2ICU_ISTS) |
| 531 | or3 r0, r0, #low(PLD_ICUISTS) | 367 | lduh r0, @(low(M32R_INT2ICU_ISTS),r0) ; bit10-6 : ISN |
| 532 | lduh r0, @r0 | ||
| 533 | slli r0, #21 | 368 | slli r0, #21 |
| 534 | srli r0, #27 ; ISN | 369 | srli r0, #27 ; ISN |
| 535 | addi r0, #(M32104UT_PLD_IRQ_BASE) | 370 | add3 r0, r0, #(M32R_INT2ICU_IRQ_BASE) |
| 536 | bra check_end | 371 | ; bra check_end |
| 537 | .fillinsn | 372 | .fillinsn |
| 373 | 5: | ||
| 374 | #endif /* CONFIG_PLAT_HAS_INT2ICU */ | ||
| 375 | |||
| 538 | check_end: | 376 | check_end: |
| 539 | #endif /* CONFIG_PLAT_M32104UT */ | ||
| 540 | bl do_IRQ | 377 | bl do_IRQ |
| 541 | #endif /* CONFIG_SMP */ | ||
| 542 | pop r14 | 378 | pop r14 |
| 543 | seth r0, #shigh(M32R_ICU_IMASK_ADDR) | 379 | seth r0, #shigh(M32R_ICU_IMASK_ADDR) |
| 544 | st r14, @(low(M32R_ICU_IMASK_ADDR),r0) | 380 | st r14, @(low(M32R_ICU_IMASK_ADDR),r0) |
| 545 | #else | ||
| 546 | #error no chip configuration | ||
| 547 | #endif | ||
| 548 | ret_to_intr: | ||
| 549 | bra ret_from_intr | 381 | bra ret_from_intr |
| 550 | 382 | ||
| 551 | /* | 383 | /* |
| @@ -631,7 +463,7 @@ inst: | |||
| 631 | 463 | ||
| 632 | 464 | ||
| 633 | ENTRY(alignment_check) | 465 | ENTRY(alignment_check) |
| 634 | /* void alignment_check(int error_code) */ | 466 | /* void alignment_check(int error_code) */ |
| 635 | SWITCH_TO_KERNEL_STACK | 467 | SWITCH_TO_KERNEL_STACK |
| 636 | SAVE_ALL | 468 | SAVE_ALL |
| 637 | ldi r1, #0x30 ; error_code | 469 | ldi r1, #0x30 ; error_code |
| @@ -641,7 +473,7 @@ error_code: | |||
| 641 | bra ret_from_exception | 473 | bra ret_from_exception |
| 642 | 474 | ||
| 643 | ENTRY(rie_handler) | 475 | ENTRY(rie_handler) |
| 644 | /* void rie_handler(int error_code) */ | 476 | /* void rie_handler(int error_code) */ |
| 645 | SWITCH_TO_KERNEL_STACK | 477 | SWITCH_TO_KERNEL_STACK |
| 646 | SAVE_ALL | 478 | SAVE_ALL |
| 647 | ldi r1, #0x20 ; error_code | 479 | ldi r1, #0x20 ; error_code |
| @@ -650,7 +482,7 @@ ENTRY(rie_handler) | |||
| 650 | bra error_code | 482 | bra error_code |
| 651 | 483 | ||
| 652 | ENTRY(pie_handler) | 484 | ENTRY(pie_handler) |
| 653 | /* void pie_handler(int error_code) */ | 485 | /* void pie_handler(int error_code) */ |
| 654 | SWITCH_TO_KERNEL_STACK | 486 | SWITCH_TO_KERNEL_STACK |
| 655 | SAVE_ALL | 487 | SAVE_ALL |
| 656 | ldi r1, #0 ; error_code ; FIXME | 488 | ldi r1, #0 ; error_code ; FIXME |
| @@ -659,8 +491,8 @@ ENTRY(pie_handler) | |||
| 659 | bra error_code | 491 | bra error_code |
| 660 | 492 | ||
| 661 | ENTRY(debug_trap) | 493 | ENTRY(debug_trap) |
| 662 | .global withdraw_debug_trap | ||
| 663 | /* void debug_trap(void) */ | 494 | /* void debug_trap(void) */ |
| 495 | .global withdraw_debug_trap | ||
| 664 | SWITCH_TO_KERNEL_STACK | 496 | SWITCH_TO_KERNEL_STACK |
| 665 | SAVE_ALL | 497 | SAVE_ALL |
| 666 | mv r0, sp ; pt_regs | 498 | mv r0, sp ; pt_regs |
| @@ -679,11 +511,9 @@ ENTRY(ill_trap) | |||
| 679 | bl do_ill_trap | 511 | bl do_ill_trap |
| 680 | bra error_code | 512 | bra error_code |
| 681 | 513 | ||
| 682 | |||
| 683 | /* Cache flushing handler */ | ||
| 684 | ENTRY(cache_flushing_handler) | 514 | ENTRY(cache_flushing_handler) |
| 685 | .global _flush_cache_all | ||
| 686 | /* void _flush_cache_all(void); */ | 515 | /* void _flush_cache_all(void); */ |
| 516 | .global _flush_cache_all | ||
| 687 | SWITCH_TO_KERNEL_STACK | 517 | SWITCH_TO_KERNEL_STACK |
| 688 | push r0 | 518 | push r0 |
| 689 | push r1 | 519 | push r1 |
| @@ -706,292 +536,7 @@ ENTRY(cache_flushing_handler) | |||
| 706 | pop r0 | 536 | pop r0 |
| 707 | rte | 537 | rte |
| 708 | 538 | ||
| 709 | .data | 539 | .section .rodata,"a" |
| 710 | ENTRY(sys_call_table) | 540 | #include "syscall_table.S" |
| 711 | .long sys_restart_syscall /* 0 - old "setup()" system call*/ | ||
| 712 | .long sys_exit | ||
| 713 | .long sys_fork | ||
| 714 | .long sys_read | ||
| 715 | .long sys_write | ||
| 716 | .long sys_open /* 5 */ | ||
| 717 | .long sys_close | ||
| 718 | .long sys_waitpid | ||
| 719 | .long sys_creat | ||
| 720 | .long sys_link | ||
| 721 | .long sys_unlink /* 10 */ | ||
| 722 | .long sys_execve | ||
| 723 | .long sys_chdir | ||
| 724 | .long sys_time | ||
| 725 | .long sys_mknod | ||
| 726 | .long sys_chmod /* 15 */ | ||
| 727 | .long sys_ni_syscall /* lchown16 syscall holder */ | ||
| 728 | .long sys_ni_syscall /* old break syscall holder */ | ||
| 729 | .long sys_ni_syscall /* old stat syscall holder */ | ||
| 730 | .long sys_lseek | ||
| 731 | .long sys_getpid /* 20 */ | ||
| 732 | .long sys_mount | ||
| 733 | .long sys_oldumount | ||
| 734 | .long sys_ni_syscall /* setuid16 syscall holder */ | ||
| 735 | .long sys_ni_syscall /* getuid16 syscall holder */ | ||
| 736 | .long sys_stime /* 25 */ | ||
| 737 | .long sys_ptrace | ||
| 738 | .long sys_alarm | ||
| 739 | .long sys_ni_syscall /* old fstat syscall holder */ | ||
| 740 | .long sys_pause | ||
| 741 | .long sys_utime /* 30 */ | ||
| 742 | .long sys_ni_syscall /* old stty syscall holder */ | ||
| 743 | .long sys_cachectl /* for M32R */ /* old gtty syscall holder */ | ||
| 744 | .long sys_access | ||
| 745 | .long sys_ni_syscall /* nice syscall holder */ | ||
| 746 | .long sys_ni_syscall /* 35 - old ftime syscall holder */ | ||
| 747 | .long sys_sync | ||
| 748 | .long sys_kill | ||
| 749 | .long sys_rename | ||
| 750 | .long sys_mkdir | ||
| 751 | .long sys_rmdir /* 40 */ | ||
| 752 | .long sys_dup | ||
| 753 | .long sys_pipe | ||
| 754 | .long sys_times | ||
| 755 | .long sys_ni_syscall /* old prof syscall holder */ | ||
| 756 | .long sys_brk /* 45 */ | ||
| 757 | .long sys_ni_syscall /* setgid16 syscall holder */ | ||
| 758 | .long sys_getgid /* will be unused */ | ||
| 759 | .long sys_ni_syscall /* signal syscall holder */ | ||
| 760 | .long sys_ni_syscall /* geteuid16 syscall holder */ | ||
| 761 | .long sys_ni_syscall /* 50 - getegid16 syscall holder */ | ||
| 762 | .long sys_acct | ||
| 763 | .long sys_umount /* recycled never used phys() */ | ||
| 764 | .long sys_ni_syscall /* old lock syscall holder */ | ||
| 765 | .long sys_ioctl | ||
| 766 | .long sys_fcntl /* 55 - will be unused */ | ||
| 767 | .long sys_ni_syscall /* mpx syscall holder */ | ||
| 768 | .long sys_setpgid | ||
| 769 | .long sys_ni_syscall /* old ulimit syscall holder */ | ||
| 770 | .long sys_ni_syscall /* sys_olduname */ | ||
| 771 | .long sys_umask /* 60 */ | ||
| 772 | .long sys_chroot | ||
| 773 | .long sys_ustat | ||
| 774 | .long sys_dup2 | ||
| 775 | .long sys_getppid | ||
| 776 | .long sys_getpgrp /* 65 */ | ||
| 777 | .long sys_setsid | ||
| 778 | .long sys_ni_syscall /* sigaction syscall holder */ | ||
| 779 | .long sys_ni_syscall /* sgetmask syscall holder */ | ||
| 780 | .long sys_ni_syscall /* ssetmask syscall holder */ | ||
| 781 | .long sys_ni_syscall /* 70 - setreuid16 syscall holder */ | ||
| 782 | .long sys_ni_syscall /* setregid16 syscall holder */ | ||
| 783 | .long sys_ni_syscall /* sigsuspend syscall holder */ | ||
| 784 | .long sys_ni_syscall /* sigpending syscall holder */ | ||
| 785 | .long sys_sethostname | ||
| 786 | .long sys_setrlimit /* 75 */ | ||
| 787 | .long sys_getrlimit/*will be unused*/ | ||
| 788 | .long sys_getrusage | ||
| 789 | .long sys_gettimeofday | ||
| 790 | .long sys_settimeofday | ||
| 791 | .long sys_ni_syscall /* 80 - getgroups16 syscall holder */ | ||
| 792 | .long sys_ni_syscall /* setgroups16 syscall holder */ | ||
| 793 | .long sys_ni_syscall /* sys_oldselect */ | ||
| 794 | .long sys_symlink | ||
| 795 | .long sys_ni_syscall /* old lstat syscall holder */ | ||
| 796 | .long sys_readlink /* 85 */ | ||
| 797 | .long sys_uselib | ||
| 798 | .long sys_swapon | ||
| 799 | .long sys_reboot | ||
| 800 | .long sys_ni_syscall /* readdir syscall holder */ | ||
| 801 | .long sys_ni_syscall /* 90 - old_mmap syscall holder */ | ||
| 802 | .long sys_munmap | ||
| 803 | .long sys_truncate | ||
| 804 | .long sys_ftruncate | ||
| 805 | .long sys_fchmod | ||
| 806 | .long sys_ni_syscall /* 95 - fchwon16 syscall holder */ | ||
| 807 | .long sys_getpriority | ||
| 808 | .long sys_setpriority | ||
| 809 | .long sys_ni_syscall /* old profil syscall holder */ | ||
| 810 | .long sys_statfs | ||
| 811 | .long sys_fstatfs /* 100 */ | ||
| 812 | .long sys_ni_syscall /* ioperm syscall holder */ | ||
| 813 | .long sys_socketcall | ||
| 814 | .long sys_syslog | ||
| 815 | .long sys_setitimer | ||
| 816 | .long sys_getitimer /* 105 */ | ||
| 817 | .long sys_newstat | ||
| 818 | .long sys_newlstat | ||
| 819 | .long sys_newfstat | ||
| 820 | .long sys_ni_syscall /* old uname syscall holder */ | ||
| 821 | .long sys_ni_syscall /* 110 - iopl syscall holder */ | ||
| 822 | .long sys_vhangup | ||
| 823 | .long sys_ni_syscall /* idle syscall holder */ | ||
| 824 | .long sys_ni_syscall /* vm86old syscall holder */ | ||
| 825 | .long sys_wait4 | ||
| 826 | .long sys_swapoff /* 115 */ | ||
| 827 | .long sys_sysinfo | ||
| 828 | .long sys_ipc | ||
| 829 | .long sys_fsync | ||
| 830 | .long sys_ni_syscall /* sigreturn syscall holder */ | ||
| 831 | .long sys_clone /* 120 */ | ||
| 832 | .long sys_setdomainname | ||
| 833 | .long sys_newuname | ||
| 834 | .long sys_ni_syscall /* modify_ldt syscall holder */ | ||
| 835 | .long sys_adjtimex | ||
| 836 | .long sys_mprotect /* 125 */ | ||
| 837 | .long sys_ni_syscall /* sigprocmask syscall holder */ | ||
| 838 | .long sys_ni_syscall /* create_module syscall holder */ | ||
| 839 | .long sys_init_module | ||
| 840 | .long sys_delete_module | ||
| 841 | .long sys_ni_syscall /* 130 - get_kernel_syms */ | ||
| 842 | .long sys_quotactl | ||
| 843 | .long sys_getpgid | ||
| 844 | .long sys_fchdir | ||
| 845 | .long sys_bdflush | ||
| 846 | .long sys_sysfs /* 135 */ | ||
| 847 | .long sys_personality | ||
| 848 | .long sys_ni_syscall /* afs_syscall syscall holder */ | ||
| 849 | .long sys_ni_syscall /* setfsuid16 syscall holder */ | ||
| 850 | .long sys_ni_syscall /* setfsgid16 syscall holder */ | ||
| 851 | .long sys_llseek /* 140 */ | ||
| 852 | .long sys_getdents | ||
| 853 | .long sys_select | ||
| 854 | .long sys_flock | ||
| 855 | .long sys_msync | ||
| 856 | .long sys_readv /* 145 */ | ||
| 857 | .long sys_writev | ||
| 858 | .long sys_getsid | ||
| 859 | .long sys_fdatasync | ||
| 860 | .long sys_sysctl | ||
| 861 | .long sys_mlock /* 150 */ | ||
| 862 | .long sys_munlock | ||
| 863 | .long sys_mlockall | ||
| 864 | .long sys_munlockall | ||
| 865 | .long sys_sched_setparam | ||
| 866 | .long sys_sched_getparam /* 155 */ | ||
| 867 | .long sys_sched_setscheduler | ||
| 868 | .long sys_sched_getscheduler | ||
| 869 | .long sys_sched_yield | ||
| 870 | .long sys_sched_get_priority_max | ||
| 871 | .long sys_sched_get_priority_min /* 160 */ | ||
| 872 | .long sys_sched_rr_get_interval | ||
| 873 | .long sys_nanosleep | ||
| 874 | .long sys_mremap | ||
| 875 | .long sys_ni_syscall /* setresuid16 syscall holder */ | ||
| 876 | .long sys_ni_syscall /* 165 - getresuid16 syscall holder */ | ||
| 877 | .long sys_tas /* vm86 syscall holder */ | ||
| 878 | .long sys_ni_syscall /* query_module syscall holder */ | ||
| 879 | .long sys_poll | ||
| 880 | .long sys_nfsservctl | ||
| 881 | .long sys_setresgid /* 170 */ | ||
| 882 | .long sys_getresgid | ||
| 883 | .long sys_prctl | ||
| 884 | .long sys_rt_sigreturn | ||
| 885 | .long sys_rt_sigaction | ||
| 886 | .long sys_rt_sigprocmask /* 175 */ | ||
| 887 | .long sys_rt_sigpending | ||
| 888 | .long sys_rt_sigtimedwait | ||
| 889 | .long sys_rt_sigqueueinfo | ||
| 890 | .long sys_rt_sigsuspend | ||
| 891 | .long sys_pread64 /* 180 */ | ||
| 892 | .long sys_pwrite64 | ||
| 893 | .long sys_ni_syscall /* chown16 syscall holder */ | ||
| 894 | .long sys_getcwd | ||
| 895 | .long sys_capget | ||
| 896 | .long sys_capset /* 185 */ | ||
| 897 | .long sys_sigaltstack | ||
| 898 | .long sys_sendfile | ||
| 899 | .long sys_ni_syscall /* streams1 */ | ||
| 900 | .long sys_ni_syscall /* streams2 */ | ||
| 901 | .long sys_vfork /* 190 */ | ||
| 902 | .long sys_getrlimit | ||
| 903 | .long sys_mmap2 | ||
| 904 | .long sys_truncate64 | ||
| 905 | .long sys_ftruncate64 | ||
| 906 | .long sys_stat64 /* 195 */ | ||
| 907 | .long sys_lstat64 | ||
| 908 | .long sys_fstat64 | ||
| 909 | .long sys_lchown | ||
| 910 | .long sys_getuid | ||
| 911 | .long sys_getgid /* 200 */ | ||
| 912 | .long sys_geteuid | ||
| 913 | .long sys_getegid | ||
| 914 | .long sys_setreuid | ||
| 915 | .long sys_setregid | ||
| 916 | .long sys_getgroups /* 205 */ | ||
| 917 | .long sys_setgroups | ||
| 918 | .long sys_fchown | ||
| 919 | .long sys_setresuid | ||
| 920 | .long sys_getresuid | ||
| 921 | .long sys_setresgid /* 210 */ | ||
| 922 | .long sys_getresgid | ||
| 923 | .long sys_chown | ||
| 924 | .long sys_setuid | ||
| 925 | .long sys_setgid | ||
| 926 | .long sys_setfsuid /* 215 */ | ||
| 927 | .long sys_setfsgid | ||
| 928 | .long sys_pivot_root | ||
| 929 | .long sys_mincore | ||
| 930 | .long sys_madvise | ||
| 931 | .long sys_getdents64 /* 220 */ | ||
| 932 | .long sys_fcntl64 | ||
| 933 | .long sys_ni_syscall /* reserved for TUX */ | ||
| 934 | .long sys_ni_syscall /* Reserved for Security */ | ||
| 935 | .long sys_gettid | ||
| 936 | .long sys_readahead /* 225 */ | ||
| 937 | .long sys_setxattr | ||
| 938 | .long sys_lsetxattr | ||
| 939 | .long sys_fsetxattr | ||
| 940 | .long sys_getxattr | ||
| 941 | .long sys_lgetxattr /* 230 */ | ||
| 942 | .long sys_fgetxattr | ||
| 943 | .long sys_listxattr | ||
| 944 | .long sys_llistxattr | ||
| 945 | .long sys_flistxattr | ||
| 946 | .long sys_removexattr /* 235 */ | ||
| 947 | .long sys_lremovexattr | ||
| 948 | .long sys_fremovexattr | ||
| 949 | .long sys_tkill | ||
| 950 | .long sys_sendfile64 | ||
| 951 | .long sys_futex /* 240 */ | ||
| 952 | .long sys_sched_setaffinity | ||
| 953 | .long sys_sched_getaffinity | ||
| 954 | .long sys_ni_syscall /* reserved for "set_thread_area" system call */ | ||
| 955 | .long sys_ni_syscall /* reserved for "get_thread_area" system call */ | ||
| 956 | .long sys_io_setup /* 245 */ | ||
| 957 | .long sys_io_destroy | ||
| 958 | .long sys_io_getevents | ||
| 959 | .long sys_io_submit | ||
| 960 | .long sys_io_cancel | ||
| 961 | .long sys_fadvise64 /* 250 */ | ||
| 962 | .long sys_ni_syscall | ||
| 963 | .long sys_exit_group | ||
| 964 | .long sys_lookup_dcookie | ||
| 965 | .long sys_epoll_create | ||
| 966 | .long sys_epoll_ctl /* 255 */ | ||
| 967 | .long sys_epoll_wait | ||
| 968 | .long sys_remap_file_pages | ||
| 969 | .long sys_set_tid_address | ||
| 970 | .long sys_timer_create | ||
| 971 | .long sys_timer_settime /* 260 */ | ||
| 972 | .long sys_timer_gettime | ||
| 973 | .long sys_timer_getoverrun | ||
| 974 | .long sys_timer_delete | ||
| 975 | .long sys_clock_settime | ||
| 976 | .long sys_clock_gettime /* 265 */ | ||
| 977 | .long sys_clock_getres | ||
| 978 | .long sys_clock_nanosleep | ||
| 979 | .long sys_statfs64 | ||
| 980 | .long sys_fstatfs64 | ||
| 981 | .long sys_tgkill /* 270 */ | ||
| 982 | .long sys_utimes | ||
| 983 | .long sys_fadvise64_64 | ||
| 984 | .long sys_ni_syscall /* Reserved for sys_vserver */ | ||
| 985 | .long sys_ni_syscall /* Reserved for sys_mbind */ | ||
| 986 | .long sys_ni_syscall /* Reserved for sys_get_mempolicy */ | ||
| 987 | .long sys_ni_syscall /* Reserved for sys_set_mempolicy */ | ||
| 988 | .long sys_mq_open | ||
| 989 | .long sys_mq_unlink | ||
| 990 | .long sys_mq_timedsend | ||
| 991 | .long sys_mq_timedreceive /* 280 */ | ||
| 992 | .long sys_mq_notify | ||
| 993 | .long sys_mq_getsetattr | ||
| 994 | .long sys_ni_syscall /* reserved for kexec */ | ||
| 995 | .long sys_waitid | ||
| 996 | 541 | ||
| 997 | syscall_table_size=(.-sys_call_table) | 542 | syscall_table_size=(.-sys_call_table) |
diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S new file mode 100644 index 000000000000..751ac2a3d120 --- /dev/null +++ b/arch/m32r/kernel/syscall_table.S | |||
| @@ -0,0 +1,286 @@ | |||
| 1 | ENTRY(sys_call_table) | ||
| 2 | .long sys_restart_syscall /* 0 - old "setup()" system call*/ | ||
| 3 | .long sys_exit | ||
| 4 | .long sys_fork | ||
| 5 | .long sys_read | ||
| 6 | .long sys_write | ||
| 7 | .long sys_open /* 5 */ | ||
| 8 | .long sys_close | ||
| 9 | .long sys_waitpid | ||
| 10 | .long sys_creat | ||
| 11 | .long sys_link | ||
| 12 | .long sys_unlink /* 10 */ | ||
| 13 | .long sys_execve | ||
| 14 | .long sys_chdir | ||
| 15 | .long sys_time | ||
| 16 | .long sys_mknod | ||
| 17 | .long sys_chmod /* 15 */ | ||
| 18 | .long sys_ni_syscall /* lchown16 syscall holder */ | ||
| 19 | .long sys_ni_syscall /* old break syscall holder */ | ||
| 20 | .long sys_ni_syscall /* old stat syscall holder */ | ||
| 21 | .long sys_lseek | ||
| 22 | .long sys_getpid /* 20 */ | ||
| 23 | .long sys_mount | ||
| 24 | .long sys_oldumount | ||
| 25 | .long sys_ni_syscall /* setuid16 syscall holder */ | ||
| 26 | .long sys_ni_syscall /* getuid16 syscall holder */ | ||
| 27 | .long sys_stime /* 25 */ | ||
| 28 | .long sys_ptrace | ||
| 29 | .long sys_alarm | ||
| 30 | .long sys_ni_syscall /* old fstat syscall holder */ | ||
| 31 | .long sys_pause | ||
| 32 | .long sys_utime /* 30 */ | ||
| 33 | .long sys_ni_syscall /* old stty syscall holder */ | ||
| 34 | .long sys_cachectl /* for M32R */ /* old gtty syscall holder */ | ||
| 35 | .long sys_access | ||
| 36 | .long sys_ni_syscall /* nice syscall holder */ | ||
| 37 | .long sys_ni_syscall /* 35 - old ftime syscall holder */ | ||
| 38 | .long sys_sync | ||
| 39 | .long sys_kill | ||
| 40 | .long sys_rename | ||
| 41 | .long sys_mkdir | ||
| 42 | .long sys_rmdir /* 40 */ | ||
| 43 | .long sys_dup | ||
| 44 | .long sys_pipe | ||
| 45 | .long sys_times | ||
| 46 | .long sys_ni_syscall /* old prof syscall holder */ | ||
| 47 | .long sys_brk /* 45 */ | ||
| 48 | .long sys_ni_syscall /* setgid16 syscall holder */ | ||
| 49 | .long sys_getgid /* will be unused */ | ||
| 50 | .long sys_ni_syscall /* signal syscall holder */ | ||
| 51 | .long sys_ni_syscall /* geteuid16 syscall holder */ | ||
| 52 | .long sys_ni_syscall /* 50 - getegid16 syscall holder */ | ||
| 53 | .long sys_acct | ||
| 54 | .long sys_umount /* recycled never used phys() */ | ||
| 55 | .long sys_ni_syscall /* old lock syscall holder */ | ||
| 56 | .long sys_ioctl | ||
| 57 | .long sys_fcntl /* 55 - will be unused */ | ||
| 58 | .long sys_ni_syscall /* mpx syscall holder */ | ||
| 59 | .long sys_setpgid | ||
| 60 | .long sys_ni_syscall /* old ulimit syscall holder */ | ||
| 61 | .long sys_ni_syscall /* sys_olduname */ | ||
| 62 | .long sys_umask /* 60 */ | ||
| 63 | .long sys_chroot | ||
| 64 | .long sys_ustat | ||
| 65 | .long sys_dup2 | ||
| 66 | .long sys_getppid | ||
| 67 | .long sys_getpgrp /* 65 */ | ||
| 68 | .long sys_setsid | ||
| 69 | .long sys_ni_syscall /* sigaction syscall holder */ | ||
| 70 | .long sys_ni_syscall /* sgetmask syscall holder */ | ||
| 71 | .long sys_ni_syscall /* ssetmask syscall holder */ | ||
| 72 | .long sys_ni_syscall /* 70 - setreuid16 syscall holder */ | ||
| 73 | .long sys_ni_syscall /* setregid16 syscall holder */ | ||
| 74 | .long sys_ni_syscall /* sigsuspend syscall holder */ | ||
| 75 | .long sys_ni_syscall /* sigpending syscall holder */ | ||
| 76 | .long sys_sethostname | ||
| 77 | .long sys_setrlimit /* 75 */ | ||
| 78 | .long sys_getrlimit/*will be unused*/ | ||
| 79 | .long sys_getrusage | ||
| 80 | .long sys_gettimeofday | ||
| 81 | .long sys_settimeofday | ||
| 82 | .long sys_ni_syscall /* 80 - getgroups16 syscall holder */ | ||
| 83 | .long sys_ni_syscall /* setgroups16 syscall holder */ | ||
| 84 | .long sys_ni_syscall /* sys_oldselect */ | ||
| 85 | .long sys_symlink | ||
| 86 | .long sys_ni_syscall /* old lstat syscall holder */ | ||
| 87 | .long sys_readlink /* 85 */ | ||
| 88 | .long sys_uselib | ||
| 89 | .long sys_swapon | ||
| 90 | .long sys_reboot | ||
| 91 | .long sys_ni_syscall /* readdir syscall holder */ | ||
| 92 | .long sys_ni_syscall /* 90 - old_mmap syscall holder */ | ||
| 93 | .long sys_munmap | ||
| 94 | .long sys_truncate | ||
| 95 | .long sys_ftruncate | ||
| 96 | .long sys_fchmod | ||
| 97 | .long sys_ni_syscall /* 95 - fchwon16 syscall holder */ | ||
| 98 | .long sys_getpriority | ||
| 99 | .long sys_setpriority | ||
| 100 | .long sys_ni_syscall /* old profil syscall holder */ | ||
| 101 | .long sys_statfs | ||
| 102 | .long sys_fstatfs /* 100 */ | ||
| 103 | .long sys_ni_syscall /* ioperm syscall holder */ | ||
| 104 | .long sys_socketcall | ||
| 105 | .long sys_syslog | ||
| 106 | .long sys_setitimer | ||
| 107 | .long sys_getitimer /* 105 */ | ||
| 108 | .long sys_newstat | ||
| 109 | .long sys_newlstat | ||
| 110 | .long sys_newfstat | ||
| 111 | .long sys_ni_syscall /* old uname syscall holder */ | ||
| 112 | .long sys_ni_syscall /* 110 - iopl syscall holder */ | ||
| 113 | .long sys_vhangup | ||
| 114 | .long sys_ni_syscall /* idle syscall holder */ | ||
| 115 | .long sys_ni_syscall /* vm86old syscall holder */ | ||
| 116 | .long sys_wait4 | ||
| 117 | .long sys_swapoff /* 115 */ | ||
| 118 | .long sys_sysinfo | ||
| 119 | .long sys_ipc | ||
| 120 | .long sys_fsync | ||
| 121 | .long sys_ni_syscall /* sigreturn syscall holder */ | ||
| 122 | .long sys_clone /* 120 */ | ||
| 123 | .long sys_setdomainname | ||
| 124 | .long sys_newuname | ||
| 125 | .long sys_ni_syscall /* modify_ldt syscall holder */ | ||
| 126 | .long sys_adjtimex | ||
| 127 | .long sys_mprotect /* 125 */ | ||
| 128 | .long sys_ni_syscall /* sigprocmask syscall holder */ | ||
| 129 | .long sys_ni_syscall /* create_module syscall holder */ | ||
| 130 | .long sys_init_module | ||
| 131 | .long sys_delete_module | ||
| 132 | .long sys_ni_syscall /* 130 - get_kernel_syms */ | ||
| 133 | .long sys_quotactl | ||
| 134 | .long sys_getpgid | ||
| 135 | .long sys_fchdir | ||
| 136 | .long sys_bdflush | ||
| 137 | .long sys_sysfs /* 135 */ | ||
| 138 | .long sys_personality | ||
| 139 | .long sys_ni_syscall /* afs_syscall syscall holder */ | ||
| 140 | .long sys_ni_syscall /* setfsuid16 syscall holder */ | ||
| 141 | .long sys_ni_syscall /* setfsgid16 syscall holder */ | ||
| 142 | .long sys_llseek /* 140 */ | ||
| 143 | .long sys_getdents | ||
| 144 | .long sys_select | ||
| 145 | .long sys_flock | ||
| 146 | .long sys_msync | ||
| 147 | .long sys_readv /* 145 */ | ||
| 148 | .long sys_writev | ||
| 149 | .long sys_getsid | ||
| 150 | .long sys_fdatasync | ||
| 151 | .long sys_sysctl | ||
| 152 | .long sys_mlock /* 150 */ | ||
| 153 | .long sys_munlock | ||
| 154 | .long sys_mlockall | ||
| 155 | .long sys_munlockall | ||
| 156 | .long sys_sched_setparam | ||
| 157 | .long sys_sched_getparam /* 155 */ | ||
| 158 | .long sys_sched_setscheduler | ||
| 159 | .long sys_sched_getscheduler | ||
| 160 | .long sys_sched_yield | ||
| 161 | .long sys_sched_get_priority_max | ||
| 162 | .long sys_sched_get_priority_min /* 160 */ | ||
| 163 | .long sys_sched_rr_get_interval | ||
| 164 | .long sys_nanosleep | ||
| 165 | .long sys_mremap | ||
| 166 | .long sys_ni_syscall /* setresuid16 syscall holder */ | ||
| 167 | .long sys_ni_syscall /* 165 - getresuid16 syscall holder */ | ||
| 168 | .long sys_tas /* vm86 syscall holder */ | ||
| 169 | .long sys_ni_syscall /* query_module syscall holder */ | ||
| 170 | .long sys_poll | ||
| 171 | .long sys_nfsservctl | ||
| 172 | .long sys_setresgid /* 170 */ | ||
| 173 | .long sys_getresgid | ||
| 174 | .long sys_prctl | ||
| 175 | .long sys_rt_sigreturn | ||
| 176 | .long sys_rt_sigaction | ||
| 177 | .long sys_rt_sigprocmask /* 175 */ | ||
| 178 | .long sys_rt_sigpending | ||
| 179 | .long sys_rt_sigtimedwait | ||
| 180 | .long sys_rt_sigqueueinfo | ||
| 181 | .long sys_rt_sigsuspend | ||
| 182 | .long sys_pread64 /* 180 */ | ||
| 183 | .long sys_pwrite64 | ||
| 184 | .long sys_ni_syscall /* chown16 syscall holder */ | ||
| 185 | .long sys_getcwd | ||
| 186 | .long sys_capget | ||
| 187 | .long sys_capset /* 185 */ | ||
| 188 | .long sys_sigaltstack | ||
| 189 | .long sys_sendfile | ||
| 190 | .long sys_ni_syscall /* streams1 */ | ||
| 191 | .long sys_ni_syscall /* streams2 */ | ||
| 192 | .long sys_vfork /* 190 */ | ||
| 193 | .long sys_getrlimit | ||
| 194 | .long sys_mmap2 | ||
| 195 | .long sys_truncate64 | ||
| 196 | .long sys_ftruncate64 | ||
| 197 | .long sys_stat64 /* 195 */ | ||
| 198 | .long sys_lstat64 | ||
| 199 | .long sys_fstat64 | ||
| 200 | .long sys_lchown | ||
| 201 | .long sys_getuid | ||
| 202 | .long sys_getgid /* 200 */ | ||
| 203 | .long sys_geteuid | ||
| 204 | .long sys_getegid | ||
| 205 | .long sys_setreuid | ||
| 206 | .long sys_setregid | ||
| 207 | .long sys_getgroups /* 205 */ | ||
| 208 | .long sys_setgroups | ||
| 209 | .long sys_fchown | ||
| 210 | .long sys_setresuid | ||
| 211 | .long sys_getresuid | ||
| 212 | .long sys_setresgid /* 210 */ | ||
| 213 | .long sys_getresgid | ||
| 214 | .long sys_chown | ||
| 215 | .long sys_setuid | ||
| 216 | .long sys_setgid | ||
| 217 | .long sys_setfsuid /* 215 */ | ||
| 218 | .long sys_setfsgid | ||
| 219 | .long sys_pivot_root | ||
| 220 | .long sys_mincore | ||
| 221 | .long sys_madvise | ||
| 222 | .long sys_getdents64 /* 220 */ | ||
| 223 | .long sys_fcntl64 | ||
| 224 | .long sys_ni_syscall /* reserved for TUX */ | ||
| 225 | .long sys_ni_syscall /* Reserved for Security */ | ||
| 226 | .long sys_gettid | ||
| 227 | .long sys_readahead /* 225 */ | ||
| 228 | .long sys_setxattr | ||
| 229 | .long sys_lsetxattr | ||
| 230 | .long sys_fsetxattr | ||
| 231 | .long sys_getxattr | ||
| 232 | .long sys_lgetxattr /* 230 */ | ||
| 233 | .long sys_fgetxattr | ||
| 234 | .long sys_listxattr | ||
| 235 | .long sys_llistxattr | ||
| 236 | .long sys_flistxattr | ||
| 237 | .long sys_removexattr /* 235 */ | ||
| 238 | .long sys_lremovexattr | ||
| 239 | .long sys_fremovexattr | ||
| 240 | .long sys_tkill | ||
| 241 | .long sys_sendfile64 | ||
| 242 | .long sys_futex /* 240 */ | ||
| 243 | .long sys_sched_setaffinity | ||
| 244 | .long sys_sched_getaffinity | ||
| 245 | .long sys_ni_syscall /* reserved for "set_thread_area" system call */ | ||
| 246 | .long sys_ni_syscall /* reserved for "get_thread_area" system call */ | ||
| 247 | .long sys_io_setup /* 245 */ | ||
| 248 | .long sys_io_destroy | ||
| 249 | .long sys_io_getevents | ||
| 250 | .long sys_io_submit | ||
| 251 | .long sys_io_cancel | ||
| 252 | .long sys_fadvise64 /* 250 */ | ||
| 253 | .long sys_ni_syscall | ||
| 254 | .long sys_exit_group | ||
| 255 | .long sys_lookup_dcookie | ||
| 256 | .long sys_epoll_create | ||
| 257 | .long sys_epoll_ctl /* 255 */ | ||
| 258 | .long sys_epoll_wait | ||
| 259 | .long sys_remap_file_pages | ||
| 260 | .long sys_set_tid_address | ||
| 261 | .long sys_timer_create | ||
| 262 | .long sys_timer_settime /* 260 */ | ||
| 263 | .long sys_timer_gettime | ||
| 264 | .long sys_timer_getoverrun | ||
| 265 | .long sys_timer_delete | ||
| 266 | .long sys_clock_settime | ||
| 267 | .long sys_clock_gettime /* 265 */ | ||
| 268 | .long sys_clock_getres | ||
| 269 | .long sys_clock_nanosleep | ||
| 270 | .long sys_statfs64 | ||
| 271 | .long sys_fstatfs64 | ||
| 272 | .long sys_tgkill /* 270 */ | ||
| 273 | .long sys_utimes | ||
| 274 | .long sys_fadvise64_64 | ||
| 275 | .long sys_ni_syscall /* Reserved for sys_vserver */ | ||
| 276 | .long sys_ni_syscall /* Reserved for sys_mbind */ | ||
| 277 | .long sys_ni_syscall /* Reserved for sys_get_mempolicy */ | ||
| 278 | .long sys_ni_syscall /* Reserved for sys_set_mempolicy */ | ||
| 279 | .long sys_mq_open | ||
| 280 | .long sys_mq_unlink | ||
| 281 | .long sys_mq_timedsend | ||
| 282 | .long sys_mq_timedreceive /* 280 */ | ||
| 283 | .long sys_mq_notify | ||
| 284 | .long sys_mq_getsetattr | ||
| 285 | .long sys_ni_syscall /* reserved for kexec */ | ||
| 286 | .long sys_waitid | ||
diff --git a/arch/m32r/platforms/Makefile b/arch/m32r/platforms/Makefile new file mode 100644 index 000000000000..da03e1a8fe91 --- /dev/null +++ b/arch/m32r/platforms/Makefile | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | # arch/m32r/platforms/Makefile | ||
| 2 | obj-$(CONFIG_PLAT_M32104UT) += m32104ut/ | ||
| 3 | obj-$(CONFIG_PLAT_M32700UT) += m32700ut/ | ||
| 4 | obj-$(CONFIG_PLAT_MAPPI) += mappi/ | ||
| 5 | obj-$(CONFIG_PLAT_MAPPI2) += mappi2/ | ||
| 6 | obj-$(CONFIG_PLAT_MAPPI3) += mappi3/ | ||
| 7 | obj-$(CONFIG_PLAT_OAKS32R) += oaks32r/ | ||
| 8 | obj-$(CONFIG_PLAT_OPSPUT) += opsput/ | ||
| 9 | obj-$(CONFIG_PLAT_USRV) += usrv/ | ||
diff --git a/arch/m32r/platforms/m32104ut/Makefile b/arch/m32r/platforms/m32104ut/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/m32104ut/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/kernel/io_m32104ut.c b/arch/m32r/platforms/m32104ut/io.c index 2189eca30b56..e5d8be6fbb2d 100644 --- a/arch/m32r/kernel/io_m32104ut.c +++ b/arch/m32r/platforms/m32104ut/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_m32104ut.c | 2 | * linux/arch/m32r/platforms/m32104ut/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for M32104UT board. | 4 | * Typical I/O routines for M32104UT board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/platforms/m32104ut/setup.c index 1692b321f476..98138b4e9220 100644 --- a/arch/m32r/kernel/setup_m32104ut.c +++ b/arch/m32r/platforms/m32104ut/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_m32104ut.c | 2 | * linux/arch/m32r/platforms/m32104ut/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for M32104UT Board | 4 | * Setup routines for M32104UT Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/m32700ut/Makefile b/arch/m32r/platforms/m32700ut/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/m32700ut/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB index 525dab46982b..525dab46982b 100644 --- a/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB +++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB | |||
diff --git a/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB index aa503657a49b..aa503657a49b 100644 --- a/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB +++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB | |||
diff --git a/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB index adc608aab2fe..adc608aab2fe 100644 --- a/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB +++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB | |||
diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/platforms/m32700ut/io.c index 5898f4031a0c..6862586e58db 100644 --- a/arch/m32r/kernel/io_m32700ut.c +++ b/arch/m32r/platforms/m32700ut/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_m32700ut.c | 2 | * linux/arch/m32r/platforms/m32700ut/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for M32700UT board. | 4 | * Typical I/O routines for M32700UT board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/platforms/m32700ut/setup.c index 7efc145c74c2..77b0ae9379e9 100644 --- a/arch/m32r/kernel/setup_m32700ut.c +++ b/arch/m32r/platforms/m32700ut/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_m32700ut.c | 2 | * linux/arch/m32r/platforms/m32700ut/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for Renesas M32700UT Board | 4 | * Setup routines for Renesas M32700UT Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/mappi/Makefile b/arch/m32r/platforms/mappi/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/mappi/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/mappi/dot.gdbinit b/arch/m32r/platforms/mappi/dot.gdbinit index 7a1d293863eb..7a1d293863eb 100644 --- a/arch/m32r/mappi/dot.gdbinit +++ b/arch/m32r/platforms/mappi/dot.gdbinit | |||
diff --git a/arch/m32r/mappi/dot.gdbinit.nommu b/arch/m32r/platforms/mappi/dot.gdbinit.nommu index 297536cf67cf..297536cf67cf 100644 --- a/arch/m32r/mappi/dot.gdbinit.nommu +++ b/arch/m32r/platforms/mappi/dot.gdbinit.nommu | |||
diff --git a/arch/m32r/mappi/dot.gdbinit.smp b/arch/m32r/platforms/mappi/dot.gdbinit.smp index 171489a440d9..171489a440d9 100644 --- a/arch/m32r/mappi/dot.gdbinit.smp +++ b/arch/m32r/platforms/mappi/dot.gdbinit.smp | |||
diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/platforms/mappi/io.c index 31396789ab1b..ac1c396d477d 100644 --- a/arch/m32r/kernel/io_mappi.c +++ b/arch/m32r/platforms/mappi/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_mappi.c | 2 | * linux/arch/m32r/platforms/mappi/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for Mappi board. | 4 | * Typical I/O routines for Mappi board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/platforms/mappi/setup.c index fe73c9ec611f..3ec087ff2214 100644 --- a/arch/m32r/kernel/setup_mappi.c +++ b/arch/m32r/platforms/mappi/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_mappi.c | 2 | * linux/arch/m32r/platforms/mappi/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for Renesas MAPPI Board | 4 | * Setup routines for Renesas MAPPI Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/mappi2/Makefile b/arch/m32r/platforms/mappi2/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/mappi2/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/mappi2/dot.gdbinit.vdec2 b/arch/m32r/platforms/mappi2/dot.gdbinit.vdec2 index 797a830bd4b7..797a830bd4b7 100644 --- a/arch/m32r/mappi2/dot.gdbinit.vdec2 +++ b/arch/m32r/platforms/mappi2/dot.gdbinit.vdec2 | |||
diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/platforms/mappi2/io.c index ecc6aa88f9ac..da58960b3f8a 100644 --- a/arch/m32r/kernel/io_mappi2.c +++ b/arch/m32r/platforms/mappi2/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_mappi2.c | 2 | * linux/arch/m32r/platforms/mappi2/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for Mappi2 board. | 4 | * Typical I/O routines for Mappi2 board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/platforms/mappi2/setup.c index 55abb2102750..d87969c6356e 100644 --- a/arch/m32r/kernel/setup_mappi2.c +++ b/arch/m32r/platforms/mappi2/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_mappi2.c | 2 | * linux/arch/m32r/platforms/mappi2/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board | 4 | * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/mappi3/Makefile b/arch/m32r/platforms/mappi3/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/mappi3/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/mappi3/dot.gdbinit b/arch/m32r/platforms/mappi3/dot.gdbinit index 89c22184e139..89c22184e139 100644 --- a/arch/m32r/mappi3/dot.gdbinit +++ b/arch/m32r/platforms/mappi3/dot.gdbinit | |||
diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/platforms/mappi3/io.c index a13b5f6b07e9..1bc3f90fdc53 100644 --- a/arch/m32r/kernel/io_mappi3.c +++ b/arch/m32r/platforms/mappi3/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_mappi3.c | 2 | * linux/arch/m32r/platforms/mappi3/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for Mappi3 board. | 4 | * Typical I/O routines for Mappi3 board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/platforms/mappi3/setup.c index 93dc010c7fc3..785b4bd6d9fd 100644 --- a/arch/m32r/kernel/setup_mappi3.c +++ b/arch/m32r/platforms/mappi3/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_mappi3.c | 2 | * linux/arch/m32r/platforms/mappi3/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for Renesas MAPPI-III(M3A-2170) Board | 4 | * Setup routines for Renesas MAPPI-III(M3A-2170) Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/oaks32r/Makefile b/arch/m32r/platforms/oaks32r/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/oaks32r/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/oaks32r/dot.gdbinit.nommu b/arch/m32r/platforms/oaks32r/dot.gdbinit.nommu index d481d972b802..d481d972b802 100644 --- a/arch/m32r/oaks32r/dot.gdbinit.nommu +++ b/arch/m32r/platforms/oaks32r/dot.gdbinit.nommu | |||
diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/platforms/oaks32r/io.c index 068bf47060f8..364a3b2e8907 100644 --- a/arch/m32r/kernel/io_oaks32r.c +++ b/arch/m32r/platforms/oaks32r/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_oaks32r.c | 2 | * linux/arch/m32r/platforms/oaks32r/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for OAKS32R board. | 4 | * Typical I/O routines for OAKS32R board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/platforms/oaks32r/setup.c index cd62598e3cea..6faa5db68e95 100644 --- a/arch/m32r/kernel/setup_oaks32r.c +++ b/arch/m32r/platforms/oaks32r/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_oaks32r.c | 2 | * linux/arch/m32r/platforms/oaks32r/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for OAKS32R Board | 4 | * Setup routines for OAKS32R Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/opsput/Makefile b/arch/m32r/platforms/opsput/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/opsput/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/opsput/dot.gdbinit b/arch/m32r/platforms/opsput/dot.gdbinit index b7e6c6640857..b7e6c6640857 100644 --- a/arch/m32r/opsput/dot.gdbinit +++ b/arch/m32r/platforms/opsput/dot.gdbinit | |||
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/platforms/opsput/io.c index 3cbb1f717e50..379efb77123d 100644 --- a/arch/m32r/kernel/io_opsput.c +++ b/arch/m32r/platforms/opsput/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_opsput.c | 2 | * linux/arch/m32r/platforms/opsput/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for OPSPUT board. | 4 | * Typical I/O routines for OPSPUT board. |
| 5 | * | 5 | * |
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/platforms/opsput/setup.c index 62d6b71de45f..fab13fd85422 100644 --- a/arch/m32r/kernel/setup_opsput.c +++ b/arch/m32r/platforms/opsput/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_opsput.c | 2 | * linux/arch/m32r/platforms/opsput/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for Renesas OPSPUT Board | 4 | * Setup routines for Renesas OPSPUT Board |
| 5 | * | 5 | * |
diff --git a/arch/m32r/platforms/usrv/Makefile b/arch/m32r/platforms/usrv/Makefile new file mode 100644 index 000000000000..0de59084f21c --- /dev/null +++ b/arch/m32r/platforms/usrv/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-y := setup.o io.o | |||
diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/platforms/usrv/io.c index a8c0e2eceb4d..f5e50d37badb 100644 --- a/arch/m32r/kernel/io_usrv.c +++ b/arch/m32r/platforms/usrv/io.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/io_usrv.c | 2 | * linux/arch/m32r/platforms/usrv/io.c |
| 3 | * | 3 | * |
| 4 | * Typical I/O routines for uServer board. | 4 | * Typical I/O routines for uServer board. |
| 5 | * | 5 | * |
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | 18 | ||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include "../drivers/m32r_cfc.h" | 20 | #include "../../../../drivers/pcmcia/m32r_cfc.h" |
| 21 | 21 | ||
| 22 | extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int); | 22 | extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int); |
| 23 | extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); | 23 | extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); |
diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/platforms/usrv/setup.c index f5b4b5ac31e7..89588d649eb7 100644 --- a/arch/m32r/kernel/setup_usrv.c +++ b/arch/m32r/platforms/usrv/setup.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/m32r/kernel/setup_usrv.c | 2 | * linux/arch/m32r/platforms/usrv/setup.c |
| 3 | * | 3 | * |
| 4 | * Setup routines for MITSUBISHI uServer | 4 | * Setup routines for MITSUBISHI uServer |
| 5 | * | 5 | * |
| @@ -198,7 +198,7 @@ void __init init_IRQ(void) | |||
| 198 | #endif /* CONFIG_SERIAL_M32R_SIO */ | 198 | #endif /* CONFIG_SERIAL_M32R_SIO */ |
| 199 | 199 | ||
| 200 | /* INT#67-#71: CFC#0 IREQ on PLD */ | 200 | /* INT#67-#71: CFC#0 IREQ on PLD */ |
| 201 | for (i = 0 ; i < CONFIG_CFC_NUM ; i++ ) { | 201 | for (i = 0 ; i < CONFIG_M32R_CFC_NUM ; i++ ) { |
| 202 | irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED; | 202 | irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED; |
| 203 | irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type; | 203 | irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type; |
| 204 | irq_desc[PLD_IRQ_CF0 + i].action = 0; | 204 | irq_desc[PLD_IRQ_CF0 + i].action = 0; |
| @@ -246,4 +246,3 @@ void __init init_IRQ(void) | |||
| 246 | icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD11; | 246 | icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD11; |
| 247 | enable_mappi_irq(M32R_IRQ_INT1); | 247 | enable_mappi_irq(M32R_IRQ_INT1); |
| 248 | } | 248 | } |
| 249 | |||
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index e162ee685d20..918f5dbeaef6 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -735,4 +735,14 @@ sys_call_table: | |||
| 735 | .long sys_tee | 735 | .long sys_tee |
| 736 | .long sys_vmsplice | 736 | .long sys_vmsplice |
| 737 | .long sys_move_pages /* 310 */ | 737 | .long sys_move_pages /* 310 */ |
| 738 | .long sys_sched_setaffinity | ||
| 739 | .long sys_sched_getaffinity | ||
| 740 | .long sys_kexec_load | ||
| 741 | .long sys_getcpu | ||
| 742 | .long sys_epoll_pwait /* 315 */ | ||
| 743 | .long sys_utimensat | ||
| 744 | .long sys_signalfd | ||
| 745 | .long sys_timerfd | ||
| 746 | .long sys_eventfd | ||
| 747 | .long sys_fallocate /* 320 */ | ||
| 738 | 748 | ||
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 2cf0690b7882..e792d3cba4c7 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c | |||
| @@ -116,7 +116,6 @@ static inline void singlestep_disable(struct task_struct *child) | |||
| 116 | void ptrace_disable(struct task_struct *child) | 116 | void ptrace_disable(struct task_struct *child) |
| 117 | { | 117 | { |
| 118 | singlestep_disable(child); | 118 | singlestep_disable(child); |
| 119 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
| 120 | } | 119 | } |
| 121 | 120 | ||
| 122 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 121 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index 4603f4f3c935..9620093514bc 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
| @@ -329,6 +329,16 @@ ENTRY(sys_call_table) | |||
| 329 | .long sys_tee | 329 | .long sys_tee |
| 330 | .long sys_vmsplice | 330 | .long sys_vmsplice |
| 331 | .long sys_move_pages /* 310 */ | 331 | .long sys_move_pages /* 310 */ |
| 332 | .long sys_sched_setaffinity | ||
| 333 | .long sys_sched_getaffinity | ||
| 334 | .long sys_kexec_load | ||
| 335 | .long sys_getcpu | ||
| 336 | .long sys_epoll_pwait /* 315 */ | ||
| 337 | .long sys_utimensat | ||
| 338 | .long sys_signalfd | ||
| 339 | .long sys_timerfd | ||
| 340 | .long sys_eventfd | ||
| 341 | .long sys_fallocate /* 320 */ | ||
| 332 | 342 | ||
| 333 | .rept NR_syscalls-(.-sys_call_table)/4 | 343 | .rept NR_syscalls-(.-sys_call_table)/4 |
| 334 | .long sys_ni_syscall | 344 | .long sys_ni_syscall |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 04797b289c21..3b807b4bc7cd 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -80,10 +80,10 @@ config MACH_DECSTATION | |||
| 80 | If you have one of the following DECstation Models you definitely | 80 | If you have one of the following DECstation Models you definitely |
| 81 | want to choose R4xx0 for the CPU Type: | 81 | want to choose R4xx0 for the CPU Type: |
| 82 | 82 | ||
| 83 | DECstation 5000/50 | 83 | DECstation 5000/50 |
| 84 | DECstation 5000/150 | 84 | DECstation 5000/150 |
| 85 | DECstation 5000/260 | 85 | DECstation 5000/260 |
| 86 | DECsystem 5900/260 | 86 | DECsystem 5900/260 |
| 87 | 87 | ||
| 88 | otherwise choose R3000. | 88 | otherwise choose R3000. |
| 89 | 89 | ||
| @@ -818,20 +818,6 @@ config EMMA2RH | |||
| 818 | config SERIAL_RM9000 | 818 | config SERIAL_RM9000 |
| 819 | bool | 819 | bool |
| 820 | 820 | ||
| 821 | # | ||
| 822 | # Unfortunately not all GT64120 systems run the chip at the same clock. | ||
| 823 | # As the user for the clock rate and try to minimize the available options. | ||
| 824 | # | ||
| 825 | choice | ||
| 826 | prompt "Galileo Chip Clock" | ||
| 827 | depends on MOMENCO_OCELOT | ||
| 828 | default SYSCLK_100 if MOMENCO_OCELOT | ||
| 829 | |||
| 830 | config SYSCLK_100 | ||
| 831 | bool "100" if MOMENCO_OCELOT | ||
| 832 | |||
| 833 | endchoice | ||
| 834 | |||
| 835 | config ARC32 | 821 | config ARC32 |
| 836 | bool | 822 | bool |
| 837 | 823 | ||
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index 2345160e63fc..b6c30800c667 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c | |||
| @@ -36,6 +36,7 @@ void mask_and_ack_8259A(unsigned int); | |||
| 36 | static struct irq_chip i8259A_chip = { | 36 | static struct irq_chip i8259A_chip = { |
| 37 | .name = "XT-PIC", | 37 | .name = "XT-PIC", |
| 38 | .mask = disable_8259A_irq, | 38 | .mask = disable_8259A_irq, |
| 39 | .disable = disable_8259A_irq, | ||
| 39 | .unmask = enable_8259A_irq, | 40 | .unmask = enable_8259A_irq, |
| 40 | .mask_ack = mask_and_ack_8259A, | 41 | .mask_ack = mask_and_ack_8259A, |
| 41 | }; | 42 | }; |
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 76903c727647..f60b3dc0fc62 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c | |||
| @@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr) | |||
| 35 | static inline int cpu_is_noncoherent_r10000(struct device *dev) | 35 | static inline int cpu_is_noncoherent_r10000(struct device *dev) |
| 36 | { | 36 | { |
| 37 | return !plat_device_is_coherent(dev) && | 37 | return !plat_device_is_coherent(dev) && |
| 38 | (current_cpu_data.cputype == CPU_R10000 && | 38 | (current_cpu_data.cputype == CPU_R10000 || |
| 39 | current_cpu_data.cputype == CPU_R12000); | 39 | current_cpu_data.cputype == CPU_R12000); |
| 40 | } | 40 | } |
| 41 | 41 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 09d91505b90c..5240432e6d1d 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com | 8 | * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com |
| 9 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. | 9 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/bug.h> | ||
| 11 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 13 | #include <linux/signal.h> | 14 | #include <linux/signal.h> |
| @@ -132,6 +133,8 @@ void *kmap_coherent(struct page *page, unsigned long addr) | |||
| 132 | pte_t pte; | 133 | pte_t pte; |
| 133 | int tlbidx; | 134 | int tlbidx; |
| 134 | 135 | ||
| 136 | BUG_ON(Page_dcache_dirty(page)); | ||
| 137 | |||
| 135 | inc_preempt_count(); | 138 | inc_preempt_count(); |
| 136 | idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); | 139 | idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); |
| 137 | #ifdef CONFIG_MIPS_MT_SMTC | 140 | #ifdef CONFIG_MIPS_MT_SMTC |
| @@ -208,7 +211,7 @@ void copy_user_highpage(struct page *to, struct page *from, | |||
| 208 | void *vfrom, *vto; | 211 | void *vfrom, *vto; |
| 209 | 212 | ||
| 210 | vto = kmap_atomic(to, KM_USER1); | 213 | vto = kmap_atomic(to, KM_USER1); |
| 211 | if (cpu_has_dc_aliases) { | 214 | if (cpu_has_dc_aliases && !Page_dcache_dirty(from)) { |
| 212 | vfrom = kmap_coherent(from, vaddr); | 215 | vfrom = kmap_coherent(from, vaddr); |
| 213 | copy_page(vto, vfrom); | 216 | copy_page(vto, vfrom); |
| 214 | kunmap_coherent(); | 217 | kunmap_coherent(); |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 4ec0964b8394..9cb39644b6f1 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
| @@ -78,7 +78,7 @@ enum fields | |||
| 78 | SET = 0x200 | 78 | SET = 0x200 |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | #define OP_MASK 0x2f | 81 | #define OP_MASK 0x3f |
| 82 | #define OP_SH 26 | 82 | #define OP_SH 26 |
| 83 | #define RS_MASK 0x1f | 83 | #define RS_MASK 0x1f |
| 84 | #define RS_SH 21 | 84 | #define RS_SH 21 |
| @@ -92,7 +92,7 @@ enum fields | |||
| 92 | #define IMM_SH 0 | 92 | #define IMM_SH 0 |
| 93 | #define JIMM_MASK 0x3ffffff | 93 | #define JIMM_MASK 0x3ffffff |
| 94 | #define JIMM_SH 0 | 94 | #define JIMM_SH 0 |
| 95 | #define FUNC_MASK 0x2f | 95 | #define FUNC_MASK 0x3f |
| 96 | #define FUNC_SH 0 | 96 | #define FUNC_SH 0 |
| 97 | #define SET_MASK 0x7 | 97 | #define SET_MASK 0x7 |
| 98 | #define SET_SH 0 | 98 | #define SET_SH 0 |
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 6c5c684d1422..589b745d822a 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -141,6 +141,7 @@ static int __init pcibios_init(void) | |||
| 141 | 141 | ||
| 142 | bus = pci_scan_bus(next_busno, hose->pci_ops, hose); | 142 | bus = pci_scan_bus(next_busno, hose->pci_ops, hose); |
| 143 | hose->bus = bus; | 143 | hose->bus = bus; |
| 144 | need_domain_info = need_domain_info || hose->index; | ||
| 144 | hose->need_domain_info = need_domain_info; | 145 | hose->need_domain_info = need_domain_info; |
| 145 | if (bus) { | 146 | if (bus) { |
| 146 | next_busno = bus->subordinate + 1; | 147 | next_busno = bus->subordinate + 1; |
diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c index 78b608d2d4e1..28ffec8e5d1a 100644 --- a/arch/mips/sgi-ip22/ip22-platform.c +++ b/arch/mips/sgi-ip22/ip22-platform.c | |||
| @@ -150,8 +150,8 @@ static int __init sgiseeq_devinit(void) | |||
| 150 | return res; | 150 | return res; |
| 151 | 151 | ||
| 152 | /* Second HPC is missing? */ | 152 | /* Second HPC is missing? */ |
| 153 | if (ip22_is_fullhouse() || | 153 | if (!ip22_is_fullhouse() || |
| 154 | !get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1])) | 154 | get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1])) |
| 155 | return 0; | 155 | return 0; |
| 156 | 156 | ||
| 157 | sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 | | 157 | sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 | |
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c index 8e88a442b22a..de3d01823ad5 100644 --- a/arch/mips/sgi-ip22/ip22-time.c +++ b/arch/mips/sgi-ip22/ip22-time.c | |||
| @@ -114,8 +114,8 @@ static unsigned long dosample(void) | |||
| 114 | } while (msb); | 114 | } while (msb); |
| 115 | 115 | ||
| 116 | /* Stop the counter. */ | 116 | /* Stop the counter. */ |
| 117 | writeb(sgint->tcword, (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | | 117 | writeb(SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | SGINT_TCWORD_MSWST, |
| 118 | SGINT_TCWORD_MSWST)); | 118 | &sgint->tcword); |
| 119 | /* | 119 | /* |
| 120 | * Return the difference, this is how far the r4k counter increments | 120 | * Return the difference, this is how far the r4k counter increments |
| 121 | * for every 1/HZ seconds. We round off the nearest 1 MHz of master | 121 | * for every 1/HZ seconds. We round off the nearest 1 MHz of master |
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig index e6b003ec6716..fdd7bd98fb44 100644 --- a/arch/mips/sibyte/Kconfig +++ b/arch/mips/sibyte/Kconfig | |||
| @@ -48,7 +48,6 @@ config SIBYTE_BCM1x55 | |||
| 48 | 48 | ||
| 49 | config SIBYTE_SB1xxx_SOC | 49 | config SIBYTE_SB1xxx_SOC |
| 50 | bool | 50 | bool |
| 51 | depends on EXPERIMENTAL | ||
| 52 | select DMA_COHERENT | 51 | select DMA_COHERENT |
| 53 | select SIBYTE_CFE | 52 | select SIBYTE_CFE |
| 54 | select SWAP_IO_SPACE | 53 | select SWAP_IO_SPACE |
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 79ae6ef979bb..e729b5f30264 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
| @@ -100,8 +100,8 @@ DEFINE_SPINLOCK(bcm1480_imr_lock); | |||
| 100 | 100 | ||
| 101 | void bcm1480_mask_irq(int cpu, int irq) | 101 | void bcm1480_mask_irq(int cpu, int irq) |
| 102 | { | 102 | { |
| 103 | unsigned long flags; | 103 | unsigned long flags, hl_spacing; |
| 104 | u64 cur_ints,hl_spacing; | 104 | u64 cur_ints; |
| 105 | 105 | ||
| 106 | spin_lock_irqsave(&bcm1480_imr_lock, flags); | 106 | spin_lock_irqsave(&bcm1480_imr_lock, flags); |
| 107 | hl_spacing = 0; | 107 | hl_spacing = 0; |
| @@ -117,8 +117,8 @@ void bcm1480_mask_irq(int cpu, int irq) | |||
| 117 | 117 | ||
| 118 | void bcm1480_unmask_irq(int cpu, int irq) | 118 | void bcm1480_unmask_irq(int cpu, int irq) |
| 119 | { | 119 | { |
| 120 | unsigned long flags; | 120 | unsigned long flags, hl_spacing; |
| 121 | u64 cur_ints,hl_spacing; | 121 | u64 cur_ints; |
| 122 | 122 | ||
| 123 | spin_lock_irqsave(&bcm1480_imr_lock, flags); | 123 | spin_lock_irqsave(&bcm1480_imr_lock, flags); |
| 124 | hl_spacing = 0; | 124 | hl_spacing = 0; |
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index 9a8c9af43b22..d6a38cd5018e 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c | |||
| @@ -188,33 +188,21 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node( | |||
| 188 | struct device_node *dn) | 188 | struct device_node *dn) |
| 189 | { | 189 | { |
| 190 | struct ibmebus_dev *dev; | 190 | struct ibmebus_dev *dev; |
| 191 | const char *loc_code; | 191 | int i, len, bus_len; |
| 192 | int length; | ||
| 193 | |||
| 194 | loc_code = of_get_property(dn, "ibm,loc-code", NULL); | ||
| 195 | if (!loc_code) { | ||
| 196 | printk(KERN_WARNING "%s: node %s missing 'ibm,loc-code'\n", | ||
| 197 | __FUNCTION__, dn->name ? dn->name : "<unknown>"); | ||
| 198 | return ERR_PTR(-EINVAL); | ||
| 199 | } | ||
| 200 | |||
| 201 | if (strlen(loc_code) == 0) { | ||
| 202 | printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n", | ||
| 203 | __FUNCTION__); | ||
| 204 | return ERR_PTR(-EINVAL); | ||
| 205 | } | ||
| 206 | 192 | ||
| 207 | dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL); | 193 | dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL); |
| 208 | if (!dev) { | 194 | if (!dev) |
| 209 | return ERR_PTR(-ENOMEM); | 195 | return ERR_PTR(-ENOMEM); |
| 210 | } | ||
| 211 | 196 | ||
| 212 | dev->ofdev.node = of_node_get(dn); | 197 | dev->ofdev.node = of_node_get(dn); |
| 213 | 198 | ||
| 214 | length = strlen(loc_code); | 199 | len = strlen(dn->full_name + 1); |
| 215 | memcpy(dev->ofdev.dev.bus_id, loc_code | 200 | bus_len = min(len, BUS_ID_SIZE - 1); |
| 216 | + (length - min(length, BUS_ID_SIZE - 1)), | 201 | memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1 |
| 217 | min(length, BUS_ID_SIZE - 1)); | 202 | + (len - bus_len), bus_len); |
| 203 | for (i = 0; i < bus_len; i++) | ||
| 204 | if (dev->ofdev.dev.bus_id[i] == '/') | ||
| 205 | dev->ofdev.dev.bus_id[i] = '_'; | ||
| 218 | 206 | ||
| 219 | /* Register with generic device framework. */ | 207 | /* Register with generic device framework. */ |
| 220 | if (ibmebus_register_device_common(dev, dn->name) != 0) { | 208 | if (ibmebus_register_device_common(dev, dn->name) != 0) { |
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 095a30304c56..106d2921e2d9 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c | |||
| @@ -236,27 +236,34 @@ static irqreturn_t | |||
| 236 | spu_irq_class_0(int irq, void *data) | 236 | spu_irq_class_0(int irq, void *data) |
| 237 | { | 237 | { |
| 238 | struct spu *spu; | 238 | struct spu *spu; |
| 239 | unsigned long stat, mask; | ||
| 239 | 240 | ||
| 240 | spu = data; | 241 | spu = data; |
| 241 | spu->class_0_pending = 1; | 242 | |
| 243 | mask = spu_int_mask_get(spu, 0); | ||
| 244 | stat = spu_int_stat_get(spu, 0); | ||
| 245 | stat &= mask; | ||
| 246 | |||
| 247 | spin_lock(&spu->register_lock); | ||
| 248 | spu->class_0_pending |= stat; | ||
| 249 | spin_unlock(&spu->register_lock); | ||
| 250 | |||
| 242 | spu->stop_callback(spu); | 251 | spu->stop_callback(spu); |
| 243 | 252 | ||
| 253 | spu_int_stat_clear(spu, 0, stat); | ||
| 254 | |||
| 244 | return IRQ_HANDLED; | 255 | return IRQ_HANDLED; |
| 245 | } | 256 | } |
| 246 | 257 | ||
| 247 | int | 258 | int |
| 248 | spu_irq_class_0_bottom(struct spu *spu) | 259 | spu_irq_class_0_bottom(struct spu *spu) |
| 249 | { | 260 | { |
| 250 | unsigned long stat, mask; | ||
| 251 | unsigned long flags; | 261 | unsigned long flags; |
| 252 | 262 | unsigned long stat; | |
| 253 | spu->class_0_pending = 0; | ||
| 254 | 263 | ||
| 255 | spin_lock_irqsave(&spu->register_lock, flags); | 264 | spin_lock_irqsave(&spu->register_lock, flags); |
| 256 | mask = spu_int_mask_get(spu, 0); | 265 | stat = spu->class_0_pending; |
| 257 | stat = spu_int_stat_get(spu, 0); | 266 | spu->class_0_pending = 0; |
| 258 | |||
| 259 | stat &= mask; | ||
| 260 | 267 | ||
| 261 | if (stat & 1) /* invalid DMA alignment */ | 268 | if (stat & 1) /* invalid DMA alignment */ |
| 262 | __spu_trap_dma_align(spu); | 269 | __spu_trap_dma_align(spu); |
| @@ -267,7 +274,6 @@ spu_irq_class_0_bottom(struct spu *spu) | |||
| 267 | if (stat & 4) /* error on SPU */ | 274 | if (stat & 4) /* error on SPU */ |
| 268 | __spu_trap_error(spu); | 275 | __spu_trap_error(spu); |
| 269 | 276 | ||
| 270 | spu_int_stat_clear(spu, 0, stat); | ||
| 271 | spin_unlock_irqrestore(&spu->register_lock, flags); | 277 | spin_unlock_irqrestore(&spu->register_lock, flags); |
| 272 | 278 | ||
| 273 | return (stat & 0x7) ? -EIO : 0; | 279 | return (stat & 0x7) ? -EIO : 0; |
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h index 87d52060fec0..2eb8f92704b4 100644 --- a/arch/powerpc/platforms/ps3/platform.h +++ b/arch/powerpc/platforms/ps3/platform.h | |||
| @@ -83,6 +83,7 @@ enum ps3_dev_type { | |||
| 83 | PS3_DEV_TYPE_STOR_ROM = TYPE_ROM, /* 5 */ | 83 | PS3_DEV_TYPE_STOR_ROM = TYPE_ROM, /* 5 */ |
| 84 | PS3_DEV_TYPE_SB_GPIO = 6, | 84 | PS3_DEV_TYPE_SB_GPIO = 6, |
| 85 | PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC, /* 14 */ | 85 | PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC, /* 14 */ |
| 86 | PS3_DEV_TYPE_STOR_DUMMY = 32, | ||
| 86 | PS3_DEV_TYPE_NOACCESS = 255, | 87 | PS3_DEV_TYPE_NOACCESS = 255, |
| 87 | }; | 88 | }; |
| 88 | 89 | ||
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c index 8cc37cfea0f2..1c94824f7b63 100644 --- a/arch/powerpc/platforms/ps3/repository.c +++ b/arch/powerpc/platforms/ps3/repository.c | |||
| @@ -349,6 +349,35 @@ int ps3_repository_find_device(struct ps3_repository_device *repo) | |||
| 349 | return result; | 349 | return result; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | if (tmp.bus_type == PS3_BUS_TYPE_STORAGE) { | ||
| 353 | /* | ||
| 354 | * A storage device may show up in the repository before the | ||
| 355 | * hypervisor has finished probing its type and regions | ||
| 356 | */ | ||
| 357 | unsigned int num_regions; | ||
| 358 | |||
| 359 | if (tmp.dev_type == PS3_DEV_TYPE_STOR_DUMMY) { | ||
| 360 | pr_debug("%s:%u storage device not ready\n", __func__, | ||
| 361 | __LINE__); | ||
| 362 | return -ENODEV; | ||
| 363 | } | ||
| 364 | |||
| 365 | result = ps3_repository_read_stor_dev_num_regions(tmp.bus_index, | ||
| 366 | tmp.dev_index, | ||
| 367 | &num_regions); | ||
| 368 | if (result) { | ||
| 369 | pr_debug("%s:%d read_stor_dev_num_regions failed\n", | ||
| 370 | __func__, __LINE__); | ||
| 371 | return result; | ||
| 372 | } | ||
| 373 | |||
| 374 | if (!num_regions) { | ||
| 375 | pr_debug("%s:%u storage device has no regions yet\n", | ||
| 376 | __func__, __LINE__); | ||
| 377 | return -ENODEV; | ||
| 378 | } | ||
| 379 | } | ||
| 380 | |||
| 352 | result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index, | 381 | result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index, |
| 353 | &tmp.dev_id); | 382 | &tmp.dev_id); |
| 354 | 383 | ||
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c index ac2a4b8a4c14..d1630a074acf 100644 --- a/arch/powerpc/platforms/ps3/spu.c +++ b/arch/powerpc/platforms/ps3/spu.c | |||
| @@ -505,6 +505,8 @@ static void mfc_sr1_set(struct spu *spu, u64 sr1) | |||
| 505 | static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK | 505 | static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK |
| 506 | | MFC_STATE1_PROBLEM_STATE_MASK); | 506 | | MFC_STATE1_PROBLEM_STATE_MASK); |
| 507 | 507 | ||
| 508 | sr1 |= MFC_STATE1_MASTER_RUN_CONTROL_MASK; | ||
| 509 | |||
| 508 | BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed)); | 510 | BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed)); |
| 509 | 511 | ||
| 510 | spu_pdata(spu)->cache.sr1 = sr1; | 512 | spu_pdata(spu)->cache.sr1 = sr1; |
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 139b4cff8019..e8dac81d8a0d 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c | |||
| @@ -744,7 +744,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, | |||
| 744 | { | 744 | { |
| 745 | struct device_node *child; | 745 | struct device_node *child; |
| 746 | const u32 *reg; | 746 | const u32 *reg; |
| 747 | int reglen, devfn; | 747 | int reglen, devfn, prev_devfn; |
| 748 | struct pci_dev *dev; | 748 | struct pci_dev *dev; |
| 749 | 749 | ||
| 750 | if (ofpci_verbose) | 750 | if (ofpci_verbose) |
| @@ -752,14 +752,25 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, | |||
| 752 | node->full_name, bus->number); | 752 | node->full_name, bus->number); |
| 753 | 753 | ||
| 754 | child = NULL; | 754 | child = NULL; |
| 755 | prev_devfn = -1; | ||
| 755 | while ((child = of_get_next_child(node, child)) != NULL) { | 756 | while ((child = of_get_next_child(node, child)) != NULL) { |
| 756 | if (ofpci_verbose) | 757 | if (ofpci_verbose) |
| 757 | printk(" * %s\n", child->full_name); | 758 | printk(" * %s\n", child->full_name); |
| 758 | reg = of_get_property(child, "reg", ®len); | 759 | reg = of_get_property(child, "reg", ®len); |
| 759 | if (reg == NULL || reglen < 20) | 760 | if (reg == NULL || reglen < 20) |
| 760 | continue; | 761 | continue; |
| 762 | |||
| 761 | devfn = (reg[0] >> 8) & 0xff; | 763 | devfn = (reg[0] >> 8) & 0xff; |
| 762 | 764 | ||
| 765 | /* This is a workaround for some device trees | ||
| 766 | * which list PCI devices twice. On the V100 | ||
| 767 | * for example, device number 3 is listed twice. | ||
| 768 | * Once as "pm" and once again as "lomp". | ||
| 769 | */ | ||
| 770 | if (devfn == prev_devfn) | ||
| 771 | continue; | ||
| 772 | prev_devfn = devfn; | ||
| 773 | |||
| 763 | /* create a new pci_dev for this device */ | 774 | /* create a new pci_dev for this device */ |
| 764 | dev = of_create_pci_dev(pbm, child, bus, devfn, 0); | 775 | dev = of_create_pci_dev(pbm, child, bus, devfn, 0); |
| 765 | if (!dev) | 776 | if (!dev) |
diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86_64/vdso/vclock_gettime.c index 17f6a00de712..5b54cdfb2b07 100644 --- a/arch/x86_64/vdso/vclock_gettime.c +++ b/arch/x86_64/vdso/vclock_gettime.c | |||
| @@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long clock, struct timespec *ts) | |||
| 34 | 34 | ||
| 35 | static inline long vgetns(void) | 35 | static inline long vgetns(void) |
| 36 | { | 36 | { |
| 37 | long v; | ||
| 37 | cycles_t (*vread)(void); | 38 | cycles_t (*vread)(void); |
| 38 | vread = gtod->clock.vread; | 39 | vread = gtod->clock.vread; |
| 39 | return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >> | 40 | v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask; |
| 40 | gtod->clock.shift; | 41 | return (v * gtod->clock.mult) >> gtod->clock.shift; |
| 41 | } | 42 | } |
| 42 | 43 | ||
| 43 | static noinline int do_realtime(struct timespec *ts) | 44 | static noinline int do_realtime(struct timespec *ts) |
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 7755834b8846..d8f8ec320213 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c | |||
| @@ -59,11 +59,13 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk) | |||
| 59 | scatterwalk_unmap(walk->dst.virt.addr, 1); | 59 | scatterwalk_unmap(walk->dst.virt.addr, 1); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | /* Get a spot of the specified length that does not straddle a page. | ||
| 63 | * The caller needs to ensure that there is enough space for this operation. | ||
| 64 | */ | ||
| 62 | static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len) | 65 | static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len) |
| 63 | { | 66 | { |
| 64 | if (offset_in_page(start + len) < len) | 67 | u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK); |
| 65 | return (u8 *)((unsigned long)(start + len) & PAGE_MASK); | 68 | return start > end_page ? start : end_page; |
| 66 | return start; | ||
| 67 | } | 69 | } |
| 68 | 70 | ||
| 69 | static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm, | 71 | static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm, |
| @@ -155,7 +157,8 @@ static inline int blkcipher_next_slow(struct blkcipher_desc *desc, | |||
| 155 | if (walk->buffer) | 157 | if (walk->buffer) |
| 156 | goto ok; | 158 | goto ok; |
| 157 | 159 | ||
| 158 | n = bsize * 2 + (alignmask & ~(crypto_tfm_ctx_alignment() - 1)); | 160 | n = bsize * 3 - (alignmask + 1) + |
| 161 | (alignmask & ~(crypto_tfm_ctx_alignment() - 1)); | ||
| 159 | walk->buffer = kmalloc(n, GFP_ATOMIC); | 162 | walk->buffer = kmalloc(n, GFP_ATOMIC); |
| 160 | if (!walk->buffer) | 163 | if (!walk->buffer) |
| 161 | return blkcipher_walk_done(desc, walk, -ENOMEM); | 164 | return blkcipher_walk_done(desc, walk, -ENOMEM); |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index a3ee087223de..c43de9a710db 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -6035,6 +6035,7 @@ void ata_dev_init(struct ata_device *dev) | |||
| 6035 | */ | 6035 | */ |
| 6036 | spin_lock_irqsave(ap->lock, flags); | 6036 | spin_lock_irqsave(ap->lock, flags); |
| 6037 | dev->flags &= ~ATA_DFLAG_INIT_MASK; | 6037 | dev->flags &= ~ATA_DFLAG_INIT_MASK; |
| 6038 | dev->horkage = 0; | ||
| 6038 | spin_unlock_irqrestore(ap->lock, flags); | 6039 | spin_unlock_irqrestore(ap->lock, flags); |
| 6039 | 6040 | ||
| 6040 | memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0, | 6041 | memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0, |
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 94e5edc12ac9..71bdc3b3189c 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
| @@ -48,6 +48,13 @@ static struct dmi_system_id cable_dmi_table[] = { | |||
| 48 | DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), | 48 | DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), |
| 49 | }, | 49 | }, |
| 50 | }, | 50 | }, |
| 51 | { | ||
| 52 | .ident = "Toshiba Satelite S1800-814", | ||
| 53 | .matches = { | ||
| 54 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 55 | DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"), | ||
| 56 | }, | ||
| 57 | }, | ||
| 51 | { } | 58 | { } |
| 52 | }; | 59 | }; |
| 53 | 60 | ||
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index ed637ae33ece..5d8b91e70ecd 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc) | |||
| 533 | struct ata_port *ap = qc->ap; | 533 | struct ata_port *ap = qc->ap; |
| 534 | struct it821x_dev *itdev = ap->private_data; | 534 | struct it821x_dev *itdev = ap->private_data; |
| 535 | 535 | ||
| 536 | /* Only use dma for transfers to/from the media. */ | ||
| 537 | if (qc->nbytes < 2048) | ||
| 538 | return -EOPNOTSUPP; | ||
| 539 | |||
| 536 | /* No ATAPI DMA in smart mode */ | 540 | /* No ATAPI DMA in smart mode */ |
| 537 | if (itdev->smart) | 541 | if (itdev->smart) |
| 538 | return -EOPNOTSUPP; | 542 | return -EOPNOTSUPP; |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index ea18e33f50ef..636c4f1a0b24 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
| @@ -97,6 +97,7 @@ static const struct via_isa_bridge { | |||
| 97 | u8 rev_max; | 97 | u8 rev_max; |
| 98 | u16 flags; | 98 | u16 flags; |
| 99 | } via_isa_bridges[] = { | 99 | } via_isa_bridges[] = { |
| 100 | { "vx800", PCI_DEVICE_ID_VIA_VX800, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | ||
| 100 | { "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 101 | { "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
| 101 | { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 102 | { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
| 102 | { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 103 | { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
| @@ -243,7 +244,6 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo | |||
| 243 | int ut; | 244 | int ut; |
| 244 | int offset = 3 - (2*ap->port_no) - adev->devno; | 245 | int offset = 3 - (2*ap->port_no) - adev->devno; |
| 245 | 246 | ||
| 246 | |||
| 247 | /* Calculate the timing values we require */ | 247 | /* Calculate the timing values we require */ |
| 248 | ata_timing_compute(adev, mode, &t, T, UT); | 248 | ata_timing_compute(adev, mode, &t, T, UT); |
| 249 | 249 | ||
| @@ -290,9 +290,17 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo | |||
| 290 | ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07; | 290 | ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07; |
| 291 | break; | 291 | break; |
| 292 | } | 292 | } |
| 293 | |||
| 293 | /* Set UDMA unless device is not UDMA capable */ | 294 | /* Set UDMA unless device is not UDMA capable */ |
| 294 | if (udma_type) | 295 | if (udma_type) { |
| 295 | pci_write_config_byte(pdev, 0x50 + offset, ut); | 296 | u8 cable80_status; |
| 297 | |||
| 298 | /* Get 80-wire cable detection bit */ | ||
| 299 | pci_read_config_byte(pdev, 0x50 + offset, &cable80_status); | ||
| 300 | cable80_status &= 0x10; | ||
| 301 | |||
| 302 | pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status); | ||
| 303 | } | ||
| 296 | } | 304 | } |
| 297 | 305 | ||
| 298 | static void via_set_piomode(struct ata_port *ap, struct ata_device *adev) | 306 | static void via_set_piomode(struct ata_port *ap, struct ata_device *adev) |
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 92bf868ca056..504a95d888b2 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | #define DAC960_DriverVersion "2.5.48" | 20 | #define DAC960_DriverVersion "2.5.49" |
| 21 | #define DAC960_DriverDate "14 May 2006" | 21 | #define DAC960_DriverDate "21 Aug 2007" |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| @@ -1165,9 +1165,9 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T | |||
| 1165 | int i; | 1165 | int i; |
| 1166 | 1166 | ||
| 1167 | 1167 | ||
| 1168 | if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V1_PciDmaMask)) | 1168 | if (pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK)) |
| 1169 | return DAC960_Failure(Controller, "DMA mask out of range"); | 1169 | return DAC960_Failure(Controller, "DMA mask out of range"); |
| 1170 | Controller->BounceBufferLimit = DAC690_V1_PciDmaMask; | 1170 | Controller->BounceBufferLimit = DMA_32BIT_MASK; |
| 1171 | 1171 | ||
| 1172 | if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) { | 1172 | if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) { |
| 1173 | CommandMailboxesSize = 0; | 1173 | CommandMailboxesSize = 0; |
| @@ -1368,9 +1368,12 @@ static bool DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T | |||
| 1368 | dma_addr_t CommandMailboxDMA; | 1368 | dma_addr_t CommandMailboxDMA; |
| 1369 | DAC960_V2_CommandStatus_T CommandStatus; | 1369 | DAC960_V2_CommandStatus_T CommandStatus; |
| 1370 | 1370 | ||
| 1371 | if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V2_PciDmaMask)) | 1371 | if (!pci_set_dma_mask(Controller->PCIDevice, DMA_64BIT_MASK)) |
| 1372 | return DAC960_Failure(Controller, "DMA mask out of range"); | 1372 | Controller->BounceBufferLimit = DMA_64BIT_MASK; |
| 1373 | Controller->BounceBufferLimit = DAC690_V2_PciDmaMask; | 1373 | else if (!pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK)) |
| 1374 | Controller->BounceBufferLimit = DMA_32BIT_MASK; | ||
| 1375 | else | ||
| 1376 | return DAC960_Failure(Controller, "DMA mask out of range"); | ||
| 1374 | 1377 | ||
| 1375 | /* This is a temporary dma mapping, used only in the scope of this function */ | 1378 | /* This is a temporary dma mapping, used only in the scope of this function */ |
| 1376 | CommandMailbox = pci_alloc_consistent(PCI_Device, | 1379 | CommandMailbox = pci_alloc_consistent(PCI_Device, |
diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h index f5e2436c39aa..85fa9bb63759 100644 --- a/drivers/block/DAC960.h +++ b/drivers/block/DAC960.h | |||
| @@ -61,13 +61,6 @@ | |||
| 61 | #define DAC960_V2_MaxPhysicalDevices 272 | 61 | #define DAC960_V2_MaxPhysicalDevices 272 |
| 62 | 62 | ||
| 63 | /* | 63 | /* |
| 64 | Define the pci dma mask supported by DAC960 V1 and V2 Firmware Controlers | ||
| 65 | */ | ||
| 66 | |||
| 67 | #define DAC690_V1_PciDmaMask 0xffffffff | ||
| 68 | #define DAC690_V2_PciDmaMask 0xffffffffffffffffULL | ||
| 69 | |||
| 70 | /* | ||
| 71 | Define a 32/64 bit I/O Address data type. | 64 | Define a 32/64 bit I/O Address data type. |
| 72 | */ | 65 | */ |
| 73 | 66 | ||
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 59b054810ed0..98a9cdeaffb6 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
| @@ -691,15 +691,18 @@ static void hci_usb_rx_complete(struct urb *urb) | |||
| 691 | urb->iso_frame_desc[i].offset, | 691 | urb->iso_frame_desc[i].offset, |
| 692 | urb->iso_frame_desc[i].actual_length); | 692 | urb->iso_frame_desc[i].actual_length); |
| 693 | 693 | ||
| 694 | if (!urb->iso_frame_desc[i].status) | 694 | if (!urb->iso_frame_desc[i].status) { |
| 695 | husb->hdev->stat.byte_rx += urb->iso_frame_desc[i].actual_length; | ||
| 695 | hci_recv_fragment(husb->hdev, _urb->type, | 696 | hci_recv_fragment(husb->hdev, _urb->type, |
| 696 | urb->transfer_buffer + urb->iso_frame_desc[i].offset, | 697 | urb->transfer_buffer + urb->iso_frame_desc[i].offset, |
| 697 | urb->iso_frame_desc[i].actual_length); | 698 | urb->iso_frame_desc[i].actual_length); |
| 699 | } | ||
| 698 | } | 700 | } |
| 699 | #else | 701 | #else |
| 700 | ; | 702 | ; |
| 701 | #endif | 703 | #endif |
| 702 | } else { | 704 | } else { |
| 705 | husb->hdev->stat.byte_rx += count; | ||
| 703 | err = hci_recv_fragment(husb->hdev, _urb->type, urb->transfer_buffer, count); | 706 | err = hci_recv_fragment(husb->hdev, _urb->type, urb->transfer_buffer, count); |
| 704 | if (err < 0) { | 707 | if (err < 0) { |
| 705 | BT_ERR("%s corrupted packet: type %d count %d", | 708 | BT_ERR("%s corrupted packet: type %d count %d", |
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 2c9ca2c64628..7c69bf259caa 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
| @@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void) | |||
| 506 | break; | 506 | break; |
| 507 | } | 507 | } |
| 508 | } else { | 508 | } else { |
| 509 | /* G33's GTT stolen memory is separate from gfx data | ||
| 510 | * stolen memory. | ||
| 511 | */ | ||
| 512 | if (IS_G33) | ||
| 513 | size = 0; | ||
| 509 | switch (gmch_ctrl & I830_GMCH_GMS_MASK) { | 514 | switch (gmch_ctrl & I830_GMCH_GMS_MASK) { |
| 510 | case I855_GMCH_GMS_STOLEN_1M: | 515 | case I855_GMCH_GMS_STOLEN_1M: |
| 511 | gtt_entries = MB(1) - KB(size); | 516 | gtt_entries = MB(1) - KB(size); |
| @@ -914,6 +919,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) | |||
| 914 | struct aper_size_info_fixed *size; | 919 | struct aper_size_info_fixed *size; |
| 915 | int num_entries; | 920 | int num_entries; |
| 916 | u32 temp, temp2; | 921 | u32 temp, temp2; |
| 922 | int gtt_map_size = 256 * 1024; | ||
| 917 | 923 | ||
| 918 | size = agp_bridge->current_size; | 924 | size = agp_bridge->current_size; |
| 919 | page_order = size->page_order; | 925 | page_order = size->page_order; |
| @@ -923,7 +929,9 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) | |||
| 923 | pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); | 929 | pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); |
| 924 | pci_read_config_dword(intel_private.pcidev, I915_PTEADDR,&temp2); | 930 | pci_read_config_dword(intel_private.pcidev, I915_PTEADDR,&temp2); |
| 925 | 931 | ||
| 926 | intel_private.gtt = ioremap(temp2, 256 * 1024); | 932 | if (IS_G33) |
| 933 | gtt_map_size = 1024 * 1024; /* 1M on G33 */ | ||
| 934 | intel_private.gtt = ioremap(temp2, gtt_map_size); | ||
| 927 | if (!intel_private.gtt) | 935 | if (!intel_private.gtt) |
| 928 | return -ENOMEM; | 936 | return -ENOMEM; |
| 929 | 937 | ||
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 3423e9ee6481..4a8969cef315 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
| @@ -796,14 +796,14 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file, | |||
| 796 | retval = inq_canon(tty); | 796 | retval = inq_canon(tty); |
| 797 | return put_user(retval, (unsigned int __user *) arg); | 797 | return put_user(retval, (unsigned int __user *) arg); |
| 798 | case TIOCGLCKTRMIOS: | 798 | case TIOCGLCKTRMIOS: |
| 799 | if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios_locked)) | 799 | if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios_locked)) |
| 800 | return -EFAULT; | 800 | return -EFAULT; |
| 801 | return 0; | 801 | return 0; |
| 802 | 802 | ||
| 803 | case TIOCSLCKTRMIOS: | 803 | case TIOCSLCKTRMIOS: |
| 804 | if (!capable(CAP_SYS_ADMIN)) | 804 | if (!capable(CAP_SYS_ADMIN)) |
| 805 | return -EPERM; | 805 | return -EPERM; |
| 806 | if (user_termios_to_kernel_termios(real_tty->termios_locked, (struct termios __user *) arg)) | 806 | if (user_termios_to_kernel_termios_1(real_tty->termios_locked, (struct termios __user *) arg)) |
| 807 | return -EFAULT; | 807 | return -EFAULT; |
| 808 | return 0; | 808 | return 0; |
| 809 | 809 | ||
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 3bba224cb55d..6eb434749cd5 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
| @@ -967,7 +967,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 967 | if (!force_function_unhide && !(stat8 & (1 << 5))) { | 967 | if (!force_function_unhide && !(stat8 & (1 << 5))) { |
| 968 | printk(KERN_INFO "Contact your BIOS vendor to see if the " | 968 | printk(KERN_INFO "Contact your BIOS vendor to see if the " |
| 969 | "E752x error registers can be safely un-hidden\n"); | 969 | "E752x error registers can be safely un-hidden\n"); |
| 970 | return -ENOMEM; | 970 | return -ENODEV; |
| 971 | } | 971 | } |
| 972 | stat8 |= (1 << 5); | 972 | stat8 |= (1 << 5); |
| 973 | pci_write_config_byte(pdev, E752X_DEVPRES1, stat8); | 973 | pci_write_config_byte(pdev, E752X_DEVPRES1, stat8); |
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 4e6bad15c4ba..e80af67664cc 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
| @@ -75,7 +75,7 @@ extern int edac_debug_level; | |||
| 75 | #define edac_debug_printk(level, fmt, arg...) \ | 75 | #define edac_debug_printk(level, fmt, arg...) \ |
| 76 | do { \ | 76 | do { \ |
| 77 | if (level <= edac_debug_level) \ | 77 | if (level <= edac_debug_level) \ |
| 78 | edac_printk(KERN_EMERG, EDAC_DEBUG, fmt, ##arg); \ | 78 | edac_printk(KERN_DEBUG, EDAC_DEBUG, fmt, ##arg); \ |
| 79 | } while(0) | 79 | } while(0) |
| 80 | 80 | ||
| 81 | #define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ ) | 81 | #define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ ) |
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 7e427b4c74b5..e14c1ca7813e 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
| @@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 1945 | return err; | 1945 | return err; |
| 1946 | } | 1946 | } |
| 1947 | err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 1947 | err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
| 1948 | if (err) { | 1948 | if (err) |
| 1949 | fw_error("pci_set_power_state failed\n"); | 1949 | fw_error("pci_set_power_state failed with %d\n", err); |
| 1950 | return err; | ||
| 1951 | } | ||
| 1952 | 1950 | ||
| 1953 | return 0; | 1951 | return 0; |
| 1954 | } | 1952 | } |
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 565c4e679b8d..6eea3476b90c 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
| @@ -882,7 +882,7 @@ static int __init lm78_isa_device_add(unsigned short address) | |||
| 882 | { | 882 | { |
| 883 | struct resource res = { | 883 | struct resource res = { |
| 884 | .start = address, | 884 | .start = address, |
| 885 | .end = address + LM78_EXTENT, | 885 | .end = address + LM78_EXTENT - 1, |
| 886 | .name = "lm78", | 886 | .name = "lm78", |
| 887 | .flags = IORESOURCE_IO, | 887 | .flags = IORESOURCE_IO, |
| 888 | }; | 888 | }; |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index c95909cc1d21..dcc941a5aaff 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
| @@ -1746,7 +1746,7 @@ w83781d_isa_device_add(unsigned short address) | |||
| 1746 | { | 1746 | { |
| 1747 | struct resource res = { | 1747 | struct resource res = { |
| 1748 | .start = address, | 1748 | .start = address, |
| 1749 | .end = address + W83781D_EXTENT, | 1749 | .end = address + W83781D_EXTENT - 1, |
| 1750 | .name = "w83781d", | 1750 | .name = "w83781d", |
| 1751 | .flags = IORESOURCE_IO, | 1751 | .flags = IORESOURCE_IO, |
| 1752 | }; | 1752 | }; |
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index 8a5f5825bb72..7f0a0a62cf60 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
| @@ -357,13 +357,29 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) | |||
| 357 | return wrcount; | 357 | return wrcount; |
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | static int acknak(struct i2c_adapter *i2c_adap, int is_ack) | ||
| 361 | { | ||
| 362 | struct i2c_algo_bit_data *adap = i2c_adap->algo_data; | ||
| 363 | |||
| 364 | /* assert: sda is high */ | ||
| 365 | if (is_ack) /* send ack */ | ||
| 366 | setsda(adap, 0); | ||
| 367 | udelay((adap->udelay + 1) / 2); | ||
| 368 | if (sclhi(adap) < 0) { /* timeout */ | ||
| 369 | dev_err(&i2c_adap->dev, "readbytes: ack/nak timeout\n"); | ||
| 370 | return -ETIMEDOUT; | ||
| 371 | } | ||
| 372 | scllo(adap); | ||
| 373 | return 0; | ||
| 374 | } | ||
| 375 | |||
| 360 | static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) | 376 | static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) |
| 361 | { | 377 | { |
| 362 | int inval; | 378 | int inval; |
| 363 | int rdcount=0; /* counts bytes read */ | 379 | int rdcount=0; /* counts bytes read */ |
| 364 | struct i2c_algo_bit_data *adap = i2c_adap->algo_data; | ||
| 365 | unsigned char *temp = msg->buf; | 380 | unsigned char *temp = msg->buf; |
| 366 | int count = msg->len; | 381 | int count = msg->len; |
| 382 | const unsigned flags = msg->flags; | ||
| 367 | 383 | ||
| 368 | while (count > 0) { | 384 | while (count > 0) { |
| 369 | inval = i2c_inb(i2c_adap); | 385 | inval = i2c_inb(i2c_adap); |
| @@ -377,28 +393,12 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) | |||
| 377 | temp++; | 393 | temp++; |
| 378 | count--; | 394 | count--; |
| 379 | 395 | ||
| 380 | if (msg->flags & I2C_M_NO_RD_ACK) { | ||
| 381 | bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x\n", | ||
| 382 | inval); | ||
| 383 | continue; | ||
| 384 | } | ||
| 385 | |||
| 386 | /* assert: sda is high */ | ||
| 387 | if (count) /* send ack */ | ||
| 388 | setsda(adap, 0); | ||
| 389 | udelay((adap->udelay + 1) / 2); | ||
| 390 | bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x %s\n", inval, | ||
| 391 | count ? "A" : "NA"); | ||
| 392 | if (sclhi(adap)<0) { /* timeout */ | ||
| 393 | dev_err(&i2c_adap->dev, "readbytes: timeout at ack\n"); | ||
| 394 | return -ETIMEDOUT; | ||
| 395 | }; | ||
| 396 | scllo(adap); | ||
| 397 | |||
| 398 | /* Some SMBus transactions require that we receive the | 396 | /* Some SMBus transactions require that we receive the |
| 399 | transaction length as the first read byte. */ | 397 | transaction length as the first read byte. */ |
| 400 | if (rdcount == 1 && (msg->flags & I2C_M_RECV_LEN)) { | 398 | if (rdcount == 1 && (flags & I2C_M_RECV_LEN)) { |
| 401 | if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) { | 399 | if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) { |
| 400 | if (!(flags & I2C_M_NO_RD_ACK)) | ||
| 401 | acknak(i2c_adap, 0); | ||
| 402 | dev_err(&i2c_adap->dev, "readbytes: invalid " | 402 | dev_err(&i2c_adap->dev, "readbytes: invalid " |
| 403 | "block length (%d)\n", inval); | 403 | "block length (%d)\n", inval); |
| 404 | return -EREMOTEIO; | 404 | return -EREMOTEIO; |
| @@ -409,6 +409,18 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) | |||
| 409 | count += inval; | 409 | count += inval; |
| 410 | msg->len += inval; | 410 | msg->len += inval; |
| 411 | } | 411 | } |
| 412 | |||
| 413 | bit_dbg(2, &i2c_adap->dev, "readbytes: 0x%02x %s\n", | ||
| 414 | inval, | ||
| 415 | (flags & I2C_M_NO_RD_ACK) | ||
| 416 | ? "(no ack/nak)" | ||
| 417 | : (count ? "A" : "NA")); | ||
| 418 | |||
| 419 | if (!(flags & I2C_M_NO_RD_ACK)) { | ||
| 420 | inval = acknak(i2c_adap, count); | ||
| 421 | if (inval < 0) | ||
| 422 | return inval; | ||
| 423 | } | ||
| 412 | } | 424 | } |
| 413 | return rdcount; | 425 | return rdcount; |
| 414 | } | 426 | } |
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 025f19423faf..44e1cd21bb01 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c | |||
| @@ -147,7 +147,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev) | |||
| 147 | * The reason to do so is to avoid sysfs names that only make | 147 | * The reason to do so is to avoid sysfs names that only make |
| 148 | * sense when there are multiple adapters. | 148 | * sense when there are multiple adapters. |
| 149 | */ | 149 | */ |
| 150 | adap->nr = pdev->id >= 0 ? pdev->id : 0; | 150 | adap->nr = (pdev->id != -1) ? pdev->id : 0; |
| 151 | ret = i2c_bit_add_numbered_bus(adap); | 151 | ret = i2c_bit_add_numbered_bus(adap); |
| 152 | if (ret) | 152 | if (ret) |
| 153 | goto err_add_bus; | 153 | goto err_add_bus; |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 9d6b790d4321..bb5466b27b59 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
| @@ -926,7 +926,7 @@ static int i2c_pxa_probe(struct platform_device *dev) | |||
| 926 | * The reason to do so is to avoid sysfs names that only make | 926 | * The reason to do so is to avoid sysfs names that only make |
| 927 | * sense when there are multiple adapters. | 927 | * sense when there are multiple adapters. |
| 928 | */ | 928 | */ |
| 929 | i2c->adap.nr = dev->id >= 0 ? dev->id : 0; | 929 | i2c->adap.nr = dev->id != -1 ? dev->id : 0; |
| 930 | 930 | ||
| 931 | ret = i2c_add_numbered_adapter(&i2c->adap); | 931 | ret = i2c_add_numbered_adapter(&i2c->adap); |
| 932 | if (ret < 0) { | 932 | if (ret < 0) { |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 7adb61bad6ad..4200251ff635 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -781,7 +781,7 @@ endif | |||
| 781 | 781 | ||
| 782 | config BLK_DEV_IDE_PMAC | 782 | config BLK_DEV_IDE_PMAC |
| 783 | bool "Builtin PowerMac IDE support" | 783 | bool "Builtin PowerMac IDE support" |
| 784 | depends on PPC_PMAC && IDE=y | 784 | depends on PPC_PMAC && IDE=y && BLK_DEV_IDE=y |
| 785 | help | 785 | help |
| 786 | This driver provides support for the built-in IDE controller on | 786 | This driver provides support for the built-in IDE controller on |
| 787 | most of the recent Apple Power Macintoshes and PowerBooks. | 787 | most of the recent Apple Power Macintoshes and PowerBooks. |
| @@ -946,7 +946,7 @@ config BLK_DEV_Q40IDE | |||
| 946 | 946 | ||
| 947 | config BLK_DEV_MPC8xx_IDE | 947 | config BLK_DEV_MPC8xx_IDE |
| 948 | bool "MPC8xx IDE support" | 948 | bool "MPC8xx IDE support" |
| 949 | depends on 8xx && IDE=y && BLK_DEV_IDE=y | 949 | depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE |
| 950 | select IDE_GENERIC | 950 | select IDE_GENERIC |
| 951 | help | 951 | help |
| 952 | This option provides support for IDE on Motorola MPC8xx Systems. | 952 | This option provides support for IDE on Motorola MPC8xx Systems. |
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index f4cd2700cae5..646a54e233d3 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -615,8 +615,7 @@ u8 eighty_ninty_three (ide_drive_t *drive) | |||
| 615 | if (hwif->cbl != ATA_CBL_PATA80 && !ivb) | 615 | if (hwif->cbl != ATA_CBL_PATA80 && !ivb) |
| 616 | goto no_80w; | 616 | goto no_80w; |
| 617 | 617 | ||
| 618 | /* Check for SATA but only if we are ATA5 or higher */ | 618 | if (ide_dev_is_sata(id)) |
| 619 | if (id->hw_config == 0 && (id->major_rev_num & 0x7FE0)) | ||
| 620 | return 1; | 619 | return 1; |
| 621 | 620 | ||
| 622 | /* | 621 | /* |
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 025689de50e9..11ecb618007c 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -596,6 +596,13 @@ static struct dmi_system_id cable_dmi_table[] = { | |||
| 596 | DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), | 596 | DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), |
| 597 | }, | 597 | }, |
| 598 | }, | 598 | }, |
| 599 | { | ||
| 600 | .ident = "Toshiba Satellite S1800-814", | ||
| 601 | .matches = { | ||
| 602 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 603 | DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"), | ||
| 604 | }, | ||
| 605 | }, | ||
| 599 | { } | 606 | { } |
| 600 | }; | 607 | }; |
| 601 | 608 | ||
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 2cd74c345a6c..39f1c89f7c86 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/drivers/ide/pci/hpt366.c Version 1.10 Jun 29, 2007 | 2 | * linux/drivers/ide/pci/hpt366.c Version 1.12 Aug 19, 2007 |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> | 4 | * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> |
| 5 | * Portions Copyright (C) 2001 Sun Microsystems, Inc. | 5 | * Portions Copyright (C) 2001 Sun Microsystems, Inc. |
| @@ -68,7 +68,8 @@ | |||
| 68 | * HPT37x chip family; save space by introducing the separate transfer mode | 68 | * HPT37x chip family; save space by introducing the separate transfer mode |
| 69 | * table in which the mode lookup is done | 69 | * table in which the mode lookup is done |
| 70 | * - use f_CNT value saved by the HighPoint BIOS as reading it directly gives | 70 | * - use f_CNT value saved by the HighPoint BIOS as reading it directly gives |
| 71 | * the wrong PCI frequency since DPLL has already been calibrated by BIOS | 71 | * the wrong PCI frequency since DPLL has already been calibrated by BIOS; |
| 72 | * read it only from the function 0 of HPT374 chips | ||
| 72 | * - fix the hotswap code: it caused RESET- to glitch when tristating the bus, | 73 | * - fix the hotswap code: it caused RESET- to glitch when tristating the bus, |
| 73 | * and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead | 74 | * and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead |
| 74 | * - pass to init_chipset() handlers a copy of the IDE PCI device structure as | 75 | * - pass to init_chipset() handlers a copy of the IDE PCI device structure as |
| @@ -113,6 +114,7 @@ | |||
| 113 | * unify HPT36x/37x timing setup code and the speedproc handlers by joining | 114 | * unify HPT36x/37x timing setup code and the speedproc handlers by joining |
| 114 | * the register setting lists into the table indexed by the clock selected | 115 | * the register setting lists into the table indexed by the clock selected |
| 115 | * - set the correct hwif->ultra_mask for each individual chip | 116 | * - set the correct hwif->ultra_mask for each individual chip |
| 117 | * - add UltraDMA mode filtering for the HPT37[24] based SATA cards | ||
| 116 | * Sergei Shtylyov, <sshtylyov@ru.mvista.com> or <source@mvista.com> | 118 | * Sergei Shtylyov, <sshtylyov@ru.mvista.com> or <source@mvista.com> |
| 117 | */ | 119 | */ |
| 118 | 120 | ||
| @@ -517,42 +519,44 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list) | |||
| 517 | } | 519 | } |
| 518 | 520 | ||
| 519 | /* | 521 | /* |
| 520 | * Note for the future; the SATA hpt37x we must set | 522 | * The Marvell bridge chips used on the HighPoint SATA cards do not seem |
| 521 | * either PIO or UDMA modes 0,4,5 | 523 | * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes... |
| 522 | */ | 524 | */ |
| 523 | 525 | ||
| 524 | static u8 hpt3xx_udma_filter(ide_drive_t *drive) | 526 | static u8 hpt3xx_udma_filter(ide_drive_t *drive) |
| 525 | { | 527 | { |
| 526 | struct hpt_info *info = pci_get_drvdata(HWIF(drive)->pci_dev); | 528 | ide_hwif_t *hwif = HWIF(drive); |
| 527 | u8 mask; | 529 | struct hpt_info *info = pci_get_drvdata(hwif->pci_dev); |
| 530 | u8 mask = hwif->ultra_mask; | ||
| 528 | 531 | ||
| 529 | switch (info->chip_type) { | 532 | switch (info->chip_type) { |
| 530 | case HPT370A: | ||
| 531 | if (!HPT370_ALLOW_ATA100_5 || | ||
| 532 | check_in_drive_list(drive, bad_ata100_5)) | ||
| 533 | return 0x1f; | ||
| 534 | else | ||
| 535 | return 0x3f; | ||
| 536 | case HPT370: | ||
| 537 | if (!HPT370_ALLOW_ATA100_5 || | ||
| 538 | check_in_drive_list(drive, bad_ata100_5)) | ||
| 539 | mask = 0x1f; | ||
| 540 | else | ||
| 541 | mask = 0x3f; | ||
| 542 | break; | ||
| 543 | case HPT36x: | 533 | case HPT36x: |
| 544 | if (!HPT366_ALLOW_ATA66_4 || | 534 | if (!HPT366_ALLOW_ATA66_4 || |
| 545 | check_in_drive_list(drive, bad_ata66_4)) | 535 | check_in_drive_list(drive, bad_ata66_4)) |
| 546 | mask = 0x0f; | 536 | mask = ATA_UDMA3; |
| 547 | else | ||
| 548 | mask = 0x1f; | ||
| 549 | 537 | ||
| 550 | if (!HPT366_ALLOW_ATA66_3 || | 538 | if (!HPT366_ALLOW_ATA66_3 || |
| 551 | check_in_drive_list(drive, bad_ata66_3)) | 539 | check_in_drive_list(drive, bad_ata66_3)) |
| 552 | mask = 0x07; | 540 | mask = ATA_UDMA2; |
| 541 | break; | ||
| 542 | case HPT370: | ||
| 543 | if (!HPT370_ALLOW_ATA100_5 || | ||
| 544 | check_in_drive_list(drive, bad_ata100_5)) | ||
| 545 | mask = ATA_UDMA4; | ||
| 553 | break; | 546 | break; |
| 547 | case HPT370A: | ||
| 548 | if (!HPT370_ALLOW_ATA100_5 || | ||
| 549 | check_in_drive_list(drive, bad_ata100_5)) | ||
| 550 | return ATA_UDMA4; | ||
| 551 | case HPT372 : | ||
| 552 | case HPT372A: | ||
| 553 | case HPT372N: | ||
| 554 | case HPT374 : | ||
| 555 | if (ide_dev_is_sata(drive->id)) | ||
| 556 | mask &= ~0x0e; | ||
| 557 | /* Fall thru */ | ||
| 554 | default: | 558 | default: |
| 555 | return 0x7f; | 559 | return mask; |
| 556 | } | 560 | } |
| 557 | 561 | ||
| 558 | return check_in_drive_list(drive, bad_ata33) ? 0x00 : mask; | 562 | return check_in_drive_list(drive, bad_ata33) ? 0x00 : mask; |
| @@ -981,6 +985,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 981 | struct hpt_info *info = kmalloc(sizeof(struct hpt_info), GFP_KERNEL); | 985 | struct hpt_info *info = kmalloc(sizeof(struct hpt_info), GFP_KERNEL); |
| 982 | unsigned long io_base = pci_resource_start(dev, 4); | 986 | unsigned long io_base = pci_resource_start(dev, 4); |
| 983 | u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */ | 987 | u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */ |
| 988 | u8 chip_type; | ||
| 984 | enum ata_clock clock; | 989 | enum ata_clock clock; |
| 985 | 990 | ||
| 986 | if (info == NULL) { | 991 | if (info == NULL) { |
| @@ -992,7 +997,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 992 | * Copy everything from a static "template" structure | 997 | * Copy everything from a static "template" structure |
| 993 | * to just allocated per-chip hpt_info structure. | 998 | * to just allocated per-chip hpt_info structure. |
| 994 | */ | 999 | */ |
| 995 | *info = *(struct hpt_info *)pci_get_drvdata(dev); | 1000 | memcpy(info, pci_get_drvdata(dev), sizeof(struct hpt_info)); |
| 1001 | chip_type = info->chip_type; | ||
| 996 | 1002 | ||
| 997 | pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4)); | 1003 | pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4)); |
| 998 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78); | 1004 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78); |
| @@ -1002,7 +1008,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1002 | /* | 1008 | /* |
| 1003 | * First, try to estimate the PCI clock frequency... | 1009 | * First, try to estimate the PCI clock frequency... |
| 1004 | */ | 1010 | */ |
| 1005 | if (info->chip_type >= HPT370) { | 1011 | if (chip_type >= HPT370) { |
| 1006 | u8 scr1 = 0; | 1012 | u8 scr1 = 0; |
| 1007 | u16 f_cnt = 0; | 1013 | u16 f_cnt = 0; |
| 1008 | u32 temp = 0; | 1014 | u32 temp = 0; |
| @@ -1016,7 +1022,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1016 | * HighPoint does this for HPT372A. | 1022 | * HighPoint does this for HPT372A. |
| 1017 | * NOTE: This register is only writeable via I/O space. | 1023 | * NOTE: This register is only writeable via I/O space. |
| 1018 | */ | 1024 | */ |
| 1019 | if (info->chip_type == HPT372A) | 1025 | if (chip_type == HPT372A) |
| 1020 | outb(0x0e, io_base + 0x9c); | 1026 | outb(0x0e, io_base + 0x9c); |
| 1021 | 1027 | ||
| 1022 | /* | 1028 | /* |
| @@ -1034,13 +1040,28 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1034 | * First try reading the register in which the HighPoint BIOS | 1040 | * First try reading the register in which the HighPoint BIOS |
| 1035 | * saves f_CNT value before reprogramming the DPLL from its | 1041 | * saves f_CNT value before reprogramming the DPLL from its |
| 1036 | * default setting (which differs for the various chips). | 1042 | * default setting (which differs for the various chips). |
| 1037 | * NOTE: This register is only accessible via I/O space. | ||
| 1038 | * | 1043 | * |
| 1039 | * In case the signature check fails, we'll have to resort to | 1044 | * NOTE: This register is only accessible via I/O space; |
| 1040 | * reading the f_CNT register itself in hopes that nobody has | 1045 | * HPT374 BIOS only saves it for the function 0, so we have to |
| 1041 | * touched the DPLL yet... | 1046 | * always read it from there -- no need to check the result of |
| 1047 | * pci_get_slot() for the function 0 as the whole device has | ||
| 1048 | * been already "pinned" (via function 1) in init_setup_hpt374() | ||
| 1049 | */ | ||
| 1050 | if (chip_type == HPT374 && (PCI_FUNC(dev->devfn) & 1)) { | ||
| 1051 | struct pci_dev *dev1 = pci_get_slot(dev->bus, | ||
| 1052 | dev->devfn - 1); | ||
| 1053 | unsigned long io_base = pci_resource_start(dev1, 4); | ||
| 1054 | |||
| 1055 | temp = inl(io_base + 0x90); | ||
| 1056 | pci_dev_put(dev1); | ||
| 1057 | } else | ||
| 1058 | temp = inl(io_base + 0x90); | ||
| 1059 | |||
| 1060 | /* | ||
| 1061 | * In case the signature check fails, we'll have to | ||
| 1062 | * resort to reading the f_CNT register itself in hopes | ||
| 1063 | * that nobody has touched the DPLL yet... | ||
| 1042 | */ | 1064 | */ |
| 1043 | temp = inl(io_base + 0x90); | ||
| 1044 | if ((temp & 0xFFFFF000) != 0xABCDE000) { | 1065 | if ((temp & 0xFFFFF000) != 0xABCDE000) { |
| 1045 | int i; | 1066 | int i; |
| 1046 | 1067 | ||
| @@ -1120,7 +1141,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1120 | * We also don't like using the DPLL because this causes glitches | 1141 | * We also don't like using the DPLL because this causes glitches |
| 1121 | * on PRST-/SRST- when the state engine gets reset... | 1142 | * on PRST-/SRST- when the state engine gets reset... |
| 1122 | */ | 1143 | */ |
| 1123 | if (info->chip_type >= HPT374 || info->settings[clock] == NULL) { | 1144 | if (chip_type >= HPT374 || info->settings[clock] == NULL) { |
| 1124 | u16 f_low, delta = pci_clk < 50 ? 2 : 4; | 1145 | u16 f_low, delta = pci_clk < 50 ? 2 : 4; |
| 1125 | int adjust; | 1146 | int adjust; |
| 1126 | 1147 | ||
| @@ -1190,7 +1211,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1190 | /* Point to this chip's own instance of the hpt_info structure. */ | 1211 | /* Point to this chip's own instance of the hpt_info structure. */ |
| 1191 | pci_set_drvdata(dev, info); | 1212 | pci_set_drvdata(dev, info); |
| 1192 | 1213 | ||
| 1193 | if (info->chip_type >= HPT370) { | 1214 | if (chip_type >= HPT370) { |
| 1194 | u8 mcr1, mcr4; | 1215 | u8 mcr1, mcr4; |
| 1195 | 1216 | ||
| 1196 | /* | 1217 | /* |
| @@ -1209,7 +1230,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1209 | * the MISC. register to stretch the UltraDMA Tss timing. | 1230 | * the MISC. register to stretch the UltraDMA Tss timing. |
| 1210 | * NOTE: This register is only writeable via I/O space. | 1231 | * NOTE: This register is only writeable via I/O space. |
| 1211 | */ | 1232 | */ |
| 1212 | if (info->chip_type == HPT371N && clock == ATA_CLOCK_66MHZ) | 1233 | if (chip_type == HPT371N && clock == ATA_CLOCK_66MHZ) |
| 1213 | 1234 | ||
| 1214 | outb(inb(io_base + 0x9c) | 0x04, io_base + 0x9c); | 1235 | outb(inb(io_base + 0x9c) | 0x04, io_base + 0x9c); |
| 1215 | 1236 | ||
| @@ -1218,25 +1239,24 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
| 1218 | 1239 | ||
| 1219 | static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) | 1240 | static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) |
| 1220 | { | 1241 | { |
| 1221 | struct pci_dev *dev = hwif->pci_dev; | 1242 | struct pci_dev *dev = hwif->pci_dev; |
| 1222 | struct hpt_info *info = pci_get_drvdata(dev); | 1243 | struct hpt_info *info = pci_get_drvdata(dev); |
| 1223 | int serialize = HPT_SERIALIZE_IO; | 1244 | int serialize = HPT_SERIALIZE_IO; |
| 1224 | u8 scr1 = 0, ata66 = hwif->channel ? 0x01 : 0x02; | 1245 | u8 scr1 = 0, ata66 = hwif->channel ? 0x01 : 0x02; |
| 1225 | u8 chip_type = info->chip_type; | 1246 | u8 chip_type = info->chip_type; |
| 1226 | u8 new_mcr, old_mcr = 0; | 1247 | u8 new_mcr, old_mcr = 0; |
| 1227 | 1248 | ||
| 1228 | /* Cache the channel's MISC. control registers' offset */ | 1249 | /* Cache the channel's MISC. control registers' offset */ |
| 1229 | hwif->select_data = hwif->channel ? 0x54 : 0x50; | 1250 | hwif->select_data = hwif->channel ? 0x54 : 0x50; |
| 1230 | 1251 | ||
| 1231 | hwif->tuneproc = &hpt3xx_tune_drive; | 1252 | hwif->tuneproc = &hpt3xx_tune_drive; |
| 1232 | hwif->speedproc = &hpt3xx_tune_chipset; | 1253 | hwif->speedproc = &hpt3xx_tune_chipset; |
| 1233 | hwif->quirkproc = &hpt3xx_quirkproc; | 1254 | hwif->quirkproc = &hpt3xx_quirkproc; |
| 1234 | hwif->intrproc = &hpt3xx_intrproc; | 1255 | hwif->intrproc = &hpt3xx_intrproc; |
| 1235 | hwif->maskproc = &hpt3xx_maskproc; | 1256 | hwif->maskproc = &hpt3xx_maskproc; |
| 1236 | hwif->busproc = &hpt3xx_busproc; | 1257 | hwif->busproc = &hpt3xx_busproc; |
| 1237 | 1258 | ||
| 1238 | if (chip_type <= HPT370A) | 1259 | hwif->udma_filter = &hpt3xx_udma_filter; |
| 1239 | hwif->udma_filter = &hpt3xx_udma_filter; | ||
| 1240 | 1260 | ||
| 1241 | /* | 1261 | /* |
| 1242 | * HPT3xxN chips have some complications: | 1262 | * HPT3xxN chips have some complications: |
| @@ -1486,19 +1506,19 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d) | |||
| 1486 | d->host_flags |= IDE_HFLAG_SINGLE; | 1506 | d->host_flags |= IDE_HFLAG_SINGLE; |
| 1487 | d->enablebits[0].mask = d->enablebits[0].val = 0x10; | 1507 | d->enablebits[0].mask = d->enablebits[0].val = 0x10; |
| 1488 | 1508 | ||
| 1489 | d->udma_mask = HPT366_ALLOW_ATA66_3 ? | 1509 | d->udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? |
| 1490 | (HPT366_ALLOW_ATA66_4 ? 0x1f : 0x0f) : 0x07; | 1510 | ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2; |
| 1491 | break; | 1511 | break; |
| 1492 | case 3: | 1512 | case 3: |
| 1493 | case 4: | 1513 | case 4: |
| 1494 | d->udma_mask = HPT370_ALLOW_ATA100_5 ? 0x3f : 0x1f; | 1514 | d->udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4; |
| 1495 | break; | 1515 | break; |
| 1496 | default: | 1516 | default: |
| 1497 | rev = 6; | 1517 | rev = 6; |
| 1498 | /* fall thru */ | 1518 | /* fall thru */ |
| 1499 | case 5: | 1519 | case 5: |
| 1500 | case 6: | 1520 | case 6: |
| 1501 | d->udma_mask = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f; | 1521 | d->udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5; |
| 1502 | break; | 1522 | break; |
| 1503 | } | 1523 | } |
| 1504 | 1524 | ||
| @@ -1559,7 +1579,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = { | |||
| 1559 | .init_dma = init_dma_hpt366, | 1579 | .init_dma = init_dma_hpt366, |
| 1560 | .autodma = AUTODMA, | 1580 | .autodma = AUTODMA, |
| 1561 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | 1581 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, |
| 1562 | .udma_mask = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f, | 1582 | .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, |
| 1563 | .bootable = OFF_BOARD, | 1583 | .bootable = OFF_BOARD, |
| 1564 | .extra = 240, | 1584 | .extra = 240, |
| 1565 | .pio_mask = ATA_PIO4, | 1585 | .pio_mask = ATA_PIO4, |
| @@ -1571,7 +1591,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = { | |||
| 1571 | .init_dma = init_dma_hpt366, | 1591 | .init_dma = init_dma_hpt366, |
| 1572 | .autodma = AUTODMA, | 1592 | .autodma = AUTODMA, |
| 1573 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | 1593 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, |
| 1574 | .udma_mask = HPT302_ALLOW_ATA133_6 ? 0x7f : 0x3f, | 1594 | .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, |
| 1575 | .bootable = OFF_BOARD, | 1595 | .bootable = OFF_BOARD, |
| 1576 | .extra = 240, | 1596 | .extra = 240, |
| 1577 | .pio_mask = ATA_PIO4, | 1597 | .pio_mask = ATA_PIO4, |
| @@ -1583,7 +1603,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = { | |||
| 1583 | .init_dma = init_dma_hpt366, | 1603 | .init_dma = init_dma_hpt366, |
| 1584 | .autodma = AUTODMA, | 1604 | .autodma = AUTODMA, |
| 1585 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | 1605 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, |
| 1586 | .udma_mask = HPT371_ALLOW_ATA133_6 ? 0x7f : 0x3f, | 1606 | .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, |
| 1587 | .bootable = OFF_BOARD, | 1607 | .bootable = OFF_BOARD, |
| 1588 | .extra = 240, | 1608 | .extra = 240, |
| 1589 | .pio_mask = ATA_PIO4, | 1609 | .pio_mask = ATA_PIO4, |
| @@ -1595,7 +1615,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = { | |||
| 1595 | .init_dma = init_dma_hpt366, | 1615 | .init_dma = init_dma_hpt366, |
| 1596 | .autodma = AUTODMA, | 1616 | .autodma = AUTODMA, |
| 1597 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | 1617 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, |
| 1598 | .udma_mask = 0x3f, | 1618 | .udma_mask = ATA_UDMA5, |
| 1599 | .bootable = OFF_BOARD, | 1619 | .bootable = OFF_BOARD, |
| 1600 | .extra = 240, | 1620 | .extra = 240, |
| 1601 | .pio_mask = ATA_PIO4, | 1621 | .pio_mask = ATA_PIO4, |
| @@ -1607,7 +1627,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = { | |||
| 1607 | .init_dma = init_dma_hpt366, | 1627 | .init_dma = init_dma_hpt366, |
| 1608 | .autodma = AUTODMA, | 1628 | .autodma = AUTODMA, |
| 1609 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | 1629 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, |
| 1610 | .udma_mask = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f, | 1630 | .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, |
| 1611 | .bootable = OFF_BOARD, | 1631 | .bootable = OFF_BOARD, |
| 1612 | .extra = 240, | 1632 | .extra = 240, |
| 1613 | .pio_mask = ATA_PIO4, | 1633 | .pio_mask = ATA_PIO4, |
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index f6db2f37efad..7b0e479c355c 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * Split from: | 9 | * Split from: |
| 10 | * linux/drivers/ide/pdc202xx.c Version 0.35 Mar. 30, 2002 | 10 | * linux/drivers/ide/pdc202xx.c Version 0.35 Mar. 30, 2002 |
| 11 | * Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org> | 11 | * Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org> |
| 12 | * Copyright (C) 2005-2006 MontaVista Software, Inc. | 12 | * Copyright (C) 2005-2007 MontaVista Software, Inc. |
| 13 | * Portions Copyright (C) 1999 Promise Technology, Inc. | 13 | * Portions Copyright (C) 1999 Promise Technology, Inc. |
| 14 | * Author: Frank Tiernan (frankt@promise.com) | 14 | * Author: Frank Tiernan (frankt@promise.com) |
| 15 | * Released under terms of General Public License | 15 | * Released under terms of General Public License |
| @@ -341,7 +341,7 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base) | |||
| 341 | */ | 341 | */ |
| 342 | usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 + | 342 | usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 + |
| 343 | (end_time.tv_usec - start_time.tv_usec); | 343 | (end_time.tv_usec - start_time.tv_usec); |
| 344 | pll_input = ((start_count - end_count) & 0x3ffffff) / 10 * | 344 | pll_input = ((start_count - end_count) & 0x3fffffff) / 10 * |
| 345 | (10000000 / usec_elapsed); | 345 | (10000000 / usec_elapsed); |
| 346 | 346 | ||
| 347 | DBG("start[%ld] end[%ld]\n", start_count, end_count); | 347 | DBG("start[%ld] end[%ld]\n", start_count, end_count); |
| @@ -535,7 +535,7 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev, | |||
| 535 | (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) { | 535 | (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) { |
| 536 | if (PCI_SLOT(dev->devfn) & 2) | 536 | if (PCI_SLOT(dev->devfn) & 2) |
| 537 | return -ENODEV; | 537 | return -ENODEV; |
| 538 | d->extra = 0; | 538 | |
| 539 | while ((findev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) { | 539 | while ((findev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) { |
| 540 | if ((findev->vendor == dev->vendor) && | 540 | if ((findev->vendor == dev->vendor) && |
| 541 | (findev->device == dev->device) && | 541 | (findev->device == dev->device) && |
| @@ -544,7 +544,8 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev, | |||
| 544 | findev->irq = dev->irq; | 544 | findev->irq = dev->irq; |
| 545 | } | 545 | } |
| 546 | ret = ide_setup_pci_devices(dev, findev, d); | 546 | ret = ide_setup_pci_devices(dev, findev, d); |
| 547 | pci_dev_put(findev); | 547 | if (ret < 0) |
| 548 | pci_dev_put(findev); | ||
| 548 | return ret; | 549 | return ret; |
| 549 | } | 550 | } |
| 550 | } | 551 | } |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 581316f9581d..a7be7795e6af 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * | 2 | * |
| 3 | * Version 3.46 | 3 | * Version 3.47 |
| 4 | * | 4 | * |
| 5 | * VIA IDE driver for Linux. Supported southbridges: | 5 | * VIA IDE driver for Linux. Supported southbridges: |
| 6 | * | 6 | * |
| @@ -74,6 +74,7 @@ static struct via_isa_bridge { | |||
| 74 | u8 udma_mask; | 74 | u8 udma_mask; |
| 75 | u8 flags; | 75 | u8 flags; |
| 76 | } via_isa_bridges[] = { | 76 | } via_isa_bridges[] = { |
| 77 | { "vx800", PCI_DEVICE_ID_VIA_VX800, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, | ||
| 77 | { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, | 78 | { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, |
| 78 | { "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, | 79 | { "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, |
| 79 | { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, | 80 | { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, |
| @@ -429,19 +430,26 @@ static struct dmi_system_id cable_dmi_table[] = { | |||
| 429 | { } | 430 | { } |
| 430 | }; | 431 | }; |
| 431 | 432 | ||
| 432 | static int via_cable_override(void) | 433 | static int via_cable_override(struct pci_dev *pdev) |
| 433 | { | 434 | { |
| 434 | /* Systems by DMI */ | 435 | /* Systems by DMI */ |
| 435 | if (dmi_check_system(cable_dmi_table)) | 436 | if (dmi_check_system(cable_dmi_table)) |
| 436 | return 1; | 437 | return 1; |
| 438 | |||
| 439 | /* Arima W730-K8/Targa Visionary 811/... */ | ||
| 440 | if (pdev->subsystem_vendor == 0x161F && | ||
| 441 | pdev->subsystem_device == 0x2032) | ||
| 442 | return 1; | ||
| 443 | |||
| 437 | return 0; | 444 | return 0; |
| 438 | } | 445 | } |
| 439 | 446 | ||
| 440 | static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif) | 447 | static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif) |
| 441 | { | 448 | { |
| 442 | struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev); | 449 | struct pci_dev *pdev = hwif->pci_dev; |
| 450 | struct via82cxxx_dev *vdev = pci_get_drvdata(pdev); | ||
| 443 | 451 | ||
| 444 | if (via_cable_override()) | 452 | if (via_cable_override(pdev)) |
| 445 | return ATA_CBL_PATA40_SHORT; | 453 | return ATA_CBL_PATA40_SHORT; |
| 446 | 454 | ||
| 447 | if ((vdev->via_80w >> hwif->channel) & 1) | 455 | if ((vdev->via_80w >> hwif->channel) & 1) |
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index 8859fe2f5ac2..dab79afa9b22 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <asm/mpc8xx.h> | 32 | #include <asm/mpc8xx.h> |
| 33 | #include <asm/mmu.h> | 33 | #include <asm/mmu.h> |
| 34 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
| 35 | #include <asm/residual.h> | ||
| 36 | #include <asm/io.h> | 35 | #include <asm/io.h> |
| 37 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| 38 | #include <asm/ide.h> | 37 | #include <asm/ide.h> |
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 30e596c0f120..1129f8c30840 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
| @@ -816,19 +816,15 @@ static int __init ide_scan_pcidev(struct pci_dev *dev) | |||
| 816 | struct list_head *l; | 816 | struct list_head *l; |
| 817 | struct pci_driver *d; | 817 | struct pci_driver *d; |
| 818 | 818 | ||
| 819 | list_for_each(l, &ide_pci_drivers) | 819 | list_for_each(l, &ide_pci_drivers) { |
| 820 | { | ||
| 821 | d = list_entry(l, struct pci_driver, node); | 820 | d = list_entry(l, struct pci_driver, node); |
| 822 | if(d->id_table) | 821 | if (d->id_table) { |
| 823 | { | 822 | const struct pci_device_id *id = pci_match_id(d->id_table, |
| 824 | const struct pci_device_id *id = pci_match_id(d->id_table, dev); | 823 | dev); |
| 825 | if(id != NULL) | 824 | if (id != NULL && d->probe(dev, id) >= 0) { |
| 826 | { | 825 | dev->driver = d; |
| 827 | if(d->probe(dev, id) >= 0) | 826 | pci_dev_get(dev); |
| 828 | { | 827 | return 1; |
| 829 | dev->driver = d; | ||
| 830 | return 1; | ||
| 831 | } | ||
| 832 | } | 828 | } |
| 833 | } | 829 | } |
| 834 | } | 830 | } |
| @@ -851,15 +847,13 @@ void __init ide_scan_pcibus (int scan_direction) | |||
| 851 | struct list_head *l, *n; | 847 | struct list_head *l, *n; |
| 852 | 848 | ||
| 853 | pre_init = 0; | 849 | pre_init = 0; |
| 854 | if (!scan_direction) { | 850 | if (!scan_direction) |
| 855 | while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | 851 | while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) |
| 856 | ide_scan_pcidev(dev); | 852 | ide_scan_pcidev(dev); |
| 857 | } | 853 | else |
| 858 | } else { | 854 | while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, dev)) |
| 859 | while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | 855 | != NULL) |
| 860 | ide_scan_pcidev(dev); | 856 | ide_scan_pcidev(dev); |
| 861 | } | ||
| 862 | } | ||
| 863 | 857 | ||
| 864 | /* | 858 | /* |
| 865 | * Hand the drivers over to the PCI layer now we | 859 | * Hand the drivers over to the PCI layer now we |
| @@ -869,12 +863,9 @@ void __init ide_scan_pcibus (int scan_direction) | |||
| 869 | list_for_each_safe(l, n, &ide_pci_drivers) { | 863 | list_for_each_safe(l, n, &ide_pci_drivers) { |
| 870 | list_del(l); | 864 | list_del(l); |
| 871 | d = list_entry(l, struct pci_driver, node); | 865 | d = list_entry(l, struct pci_driver, node); |
| 872 | if (__pci_register_driver(d, d->driver.owner, | 866 | if (__pci_register_driver(d, d->driver.owner, d->driver.mod_name)) |
| 873 | d->driver.mod_name)) { | 867 | printk(KERN_ERR "%s: failed to register driver for %s\n", |
| 874 | printk(KERN_ERR "%s: failed to register driver " | 868 | __FUNCTION__, d->driver.mod_name); |
| 875 | "for %s\n", __FUNCTION__, | ||
| 876 | d->driver.mod_name); | ||
| 877 | } | ||
| 878 | } | 869 | } |
| 879 | } | 870 | } |
| 880 | #endif | 871 | #endif |
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 702a526cf45b..f8fe42148093 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -211,6 +211,16 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { | |||
| 211 | }, | 211 | }, |
| 212 | }, | 212 | }, |
| 213 | { | 213 | { |
| 214 | /* | ||
| 215 | * Like DV4017EA does not raise AUXERR for errors on MUX ports. | ||
| 216 | */ | ||
| 217 | .ident = "HP Pavilion DV4270ca", | ||
| 218 | .matches = { | ||
| 219 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 220 | DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"), | ||
| 221 | }, | ||
| 222 | }, | ||
| 223 | { | ||
| 214 | .ident = "Toshiba P10", | 224 | .ident = "Toshiba P10", |
| 215 | .matches = { | 225 | .matches = { |
| 216 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | 226 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 06b05dd22485..c2eea2767e10 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -1040,7 +1040,7 @@ static void __devinit i8042_register_ports(void) | |||
| 1040 | } | 1040 | } |
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||
| 1043 | static void __devinit i8042_unregister_ports(void) | 1043 | static void __devexit i8042_unregister_ports(void) |
| 1044 | { | 1044 | { |
| 1045 | int i; | 1045 | int i; |
| 1046 | 1046 | ||
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index b407028ffc59..741f6c6f1e50 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c | |||
| @@ -767,7 +767,7 @@ static int usbtouch_probe(struct usb_interface *intf, | |||
| 767 | le16_to_cpu(udev->descriptor.idProduct)); | 767 | le16_to_cpu(udev->descriptor.idProduct)); |
| 768 | 768 | ||
| 769 | usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys)); | 769 | usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys)); |
| 770 | strlcpy(usbtouch->phys, "/input0", sizeof(usbtouch->phys)); | 770 | strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys)); |
| 771 | 771 | ||
| 772 | input_dev->name = usbtouch->name; | 772 | input_dev->name = usbtouch->name; |
| 773 | input_dev->phys = usbtouch->phys; | 773 | input_dev->phys = usbtouch->phys; |
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c index 6e135ac0834f..ee1c6d05c3d3 100644 --- a/drivers/lguest/lguest.c +++ b/drivers/lguest/lguest.c | |||
| @@ -964,11 +964,12 @@ __init void lguest_init(void *boot) | |||
| 964 | { | 964 | { |
| 965 | /* Copy boot parameters first: the Launcher put the physical location | 965 | /* Copy boot parameters first: the Launcher put the physical location |
| 966 | * in %esi, and head.S converted that to a virtual address and handed | 966 | * in %esi, and head.S converted that to a virtual address and handed |
| 967 | * it to us. */ | 967 | * it to us. We use "__memcpy" because "memcpy" sometimes tries to do |
| 968 | memcpy(&boot_params, boot, PARAM_SIZE); | 968 | * tricky things to go faster, and we're not ready for that. */ |
| 969 | __memcpy(&boot_params, boot, PARAM_SIZE); | ||
| 969 | /* The boot parameters also tell us where the command-line is: save | 970 | /* The boot parameters also tell us where the command-line is: save |
| 970 | * that, too. */ | 971 | * that, too. */ |
| 971 | memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr), | 972 | __memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr), |
| 972 | COMMAND_LINE_SIZE); | 973 | COMMAND_LINE_SIZE); |
| 973 | 974 | ||
| 974 | /* We're under lguest, paravirt is enabled, and we're running at | 975 | /* We're under lguest, paravirt is enabled, and we're running at |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 2aff4be35dc4..4d63773ee73a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -2541,7 +2541,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, | |||
| 2541 | struct dma_async_tx_descriptor *tx = NULL; | 2541 | struct dma_async_tx_descriptor *tx = NULL; |
| 2542 | clear_bit(STRIPE_EXPAND_SOURCE, &sh->state); | 2542 | clear_bit(STRIPE_EXPAND_SOURCE, &sh->state); |
| 2543 | for (i = 0; i < sh->disks; i++) | 2543 | for (i = 0; i < sh->disks; i++) |
| 2544 | if (i != sh->pd_idx && (r6s && i != r6s->qd_idx)) { | 2544 | if (i != sh->pd_idx && (!r6s || i != r6s->qd_idx)) { |
| 2545 | int dd_idx, pd_idx, j; | 2545 | int dd_idx, pd_idx, j; |
| 2546 | struct stripe_head *sh2; | 2546 | struct stripe_head *sh2; |
| 2547 | 2547 | ||
| @@ -2574,7 +2574,8 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, | |||
| 2574 | set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags); | 2574 | set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags); |
| 2575 | for (j = 0; j < conf->raid_disks; j++) | 2575 | for (j = 0; j < conf->raid_disks; j++) |
| 2576 | if (j != sh2->pd_idx && | 2576 | if (j != sh2->pd_idx && |
| 2577 | (r6s && j != r6s->qd_idx) && | 2577 | (!r6s || j != raid6_next_disk(sh2->pd_idx, |
| 2578 | sh2->disks)) && | ||
| 2578 | !test_bit(R5_Expanded, &sh2->dev[j].flags)) | 2579 | !test_bit(R5_Expanded, &sh2->dev[j].flags)) |
| 2579 | break; | 2580 | break; |
| 2580 | if (j == conf->raid_disks) { | 2581 | if (j == conf->raid_disks) { |
| @@ -2583,12 +2584,12 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, | |||
| 2583 | } | 2584 | } |
| 2584 | release_stripe(sh2); | 2585 | release_stripe(sh2); |
| 2585 | 2586 | ||
| 2586 | /* done submitting copies, wait for them to complete */ | ||
| 2587 | if (i + 1 >= sh->disks) { | ||
| 2588 | async_tx_ack(tx); | ||
| 2589 | dma_wait_for_async_tx(tx); | ||
| 2590 | } | ||
| 2591 | } | 2587 | } |
| 2588 | /* done submitting copies, wait for them to complete */ | ||
| 2589 | if (tx) { | ||
| 2590 | async_tx_ack(tx); | ||
| 2591 | dma_wait_for_async_tx(tx); | ||
| 2592 | } | ||
| 2592 | } | 2593 | } |
| 2593 | 2594 | ||
| 2594 | /* | 2595 | /* |
| @@ -2855,7 +2856,7 @@ static void handle_stripe5(struct stripe_head *sh) | |||
| 2855 | sh->disks = conf->raid_disks; | 2856 | sh->disks = conf->raid_disks; |
| 2856 | sh->pd_idx = stripe_to_pdidx(sh->sector, conf, | 2857 | sh->pd_idx = stripe_to_pdidx(sh->sector, conf, |
| 2857 | conf->raid_disks); | 2858 | conf->raid_disks); |
| 2858 | s.locked += handle_write_operations5(sh, 0, 1); | 2859 | s.locked += handle_write_operations5(sh, 1, 1); |
| 2859 | } else if (s.expanded && | 2860 | } else if (s.expanded && |
| 2860 | !test_bit(STRIPE_OP_POSTXOR, &sh->ops.pending)) { | 2861 | !test_bit(STRIPE_OP_POSTXOR, &sh->ops.pending)) { |
| 2861 | clear_bit(STRIPE_EXPAND_READY, &sh->state); | 2862 | clear_bit(STRIPE_EXPAND_READY, &sh->state); |
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index bfebd2fa7ada..955ea60583b5 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
| @@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev) | |||
| 941 | 941 | ||
| 942 | host = mmc_priv(mmc); | 942 | host = mmc_priv(mmc); |
| 943 | 943 | ||
| 944 | if (host->present != -1) { | 944 | if (host->board->det_pin) { |
| 945 | device_init_wakeup(&pdev->dev, 0); | 945 | device_init_wakeup(&pdev->dev, 0); |
| 946 | free_irq(host->board->det_pin, host); | 946 | free_irq(host->board->det_pin, host); |
| 947 | cancel_delayed_work(&host->mmc->detect); | 947 | cancel_delayed_work(&host->mmc->detect); |
| @@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state) | |||
| 972 | struct at91mci_host *host = mmc_priv(mmc); | 972 | struct at91mci_host *host = mmc_priv(mmc); |
| 973 | int ret = 0; | 973 | int ret = 0; |
| 974 | 974 | ||
| 975 | if (device_may_wakeup(&pdev->dev)) | 975 | if (host->board->det_pin && device_may_wakeup(&pdev->dev)) |
| 976 | enable_irq_wake(host->board->det_pin); | 976 | enable_irq_wake(host->board->det_pin); |
| 977 | 977 | ||
| 978 | if (mmc) | 978 | if (mmc) |
| @@ -987,7 +987,7 @@ static int at91_mci_resume(struct platform_device *pdev) | |||
| 987 | struct at91mci_host *host = mmc_priv(mmc); | 987 | struct at91mci_host *host = mmc_priv(mmc); |
| 988 | int ret = 0; | 988 | int ret = 0; |
| 989 | 989 | ||
| 990 | if (device_may_wakeup(&pdev->dev)) | 990 | if (host->board->det_pin && device_may_wakeup(&pdev->dev)) |
| 991 | disable_irq_wake(host->board->det_pin); | 991 | disable_irq_wake(host->board->det_pin); |
| 992 | 992 | ||
| 993 | if (mmc) | 993 | if (mmc) |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 58740428dd07..9034a05734ef 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.80" | 67 | #define DRV_MODULE_VERSION "3.81" |
| 68 | #define DRV_MODULE_RELDATE "August 2, 2007" | 68 | #define DRV_MODULE_RELDATE "September 5, 2007" |
| 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 |
| @@ -7127,6 +7127,10 @@ static int tg3_open(struct net_device *dev) | |||
| 7127 | } else if (pci_enable_msi(tp->pdev) == 0) { | 7127 | } else if (pci_enable_msi(tp->pdev) == 0) { |
| 7128 | u32 msi_mode; | 7128 | u32 msi_mode; |
| 7129 | 7129 | ||
| 7130 | /* Hardware bug - MSI won't work if INTX disabled. */ | ||
| 7131 | if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) | ||
| 7132 | pci_intx(tp->pdev, 1); | ||
| 7133 | |||
| 7130 | msi_mode = tr32(MSGINT_MODE); | 7134 | msi_mode = tr32(MSGINT_MODE); |
| 7131 | tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE); | 7135 | tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE); |
| 7132 | tp->tg3_flags2 |= TG3_FLG2_USING_MSI; | 7136 | tp->tg3_flags2 |= TG3_FLG2_USING_MSI; |
| @@ -12172,6 +12176,11 @@ static int tg3_resume(struct pci_dev *pdev) | |||
| 12172 | if (err) | 12176 | if (err) |
| 12173 | return err; | 12177 | return err; |
| 12174 | 12178 | ||
| 12179 | /* Hardware bug - MSI won't work if INTX disabled. */ | ||
| 12180 | if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) && | ||
| 12181 | (tp->tg3_flags2 & TG3_FLG2_USING_MSI)) | ||
| 12182 | pci_intx(tp->pdev, 1); | ||
| 12183 | |||
| 12175 | netif_device_attach(dev); | 12184 | netif_device_attach(dev); |
| 12176 | 12185 | ||
| 12177 | tg3_full_lock(tp, 0); | 12186 | tg3_full_lock(tp, 0); |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 27e00b2d7b5b..171ca712e523 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -285,7 +285,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) | |||
| 285 | } | 285 | } |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | void __devinit pci_read_bridge_bases(struct pci_bus *child) | 288 | void pci_read_bridge_bases(struct pci_bus *child) |
| 289 | { | 289 | { |
| 290 | struct pci_dev *dev = child->self; | 290 | struct pci_dev *dev = child->self; |
| 291 | u8 io_base_lo, io_limit_lo; | 291 | u8 io_base_lo, io_limit_lo; |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 2d40f437b9fc..7dcaa09b3c20 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -972,8 +972,8 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho | |||
| 972 | * | 972 | * |
| 973 | * The SMBus PCI Device can be activated by setting a bit in the ICH LPC | 973 | * The SMBus PCI Device can be activated by setting a bit in the ICH LPC |
| 974 | * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it | 974 | * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it |
| 975 | * becomes necessary to do this tweak in two steps -- I've chosen the Host | 975 | * becomes necessary to do this tweak in two steps -- the chosen trigger |
| 976 | * bridge as trigger. | 976 | * is either the Host bridge (preferred) or on-board VGA controller. |
| 977 | * | 977 | * |
| 978 | * Note that we used to unhide the SMBus that way on Toshiba laptops | 978 | * Note that we used to unhide the SMBus that way on Toshiba laptops |
| 979 | * (Satellite A40 and Tecra M2) but then found that the thermal management | 979 | * (Satellite A40 and Tecra M2) but then found that the thermal management |
| @@ -1070,6 +1070,14 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) | |||
| 1070 | case 0x0058: /* Compaq Evo N620c */ | 1070 | case 0x0058: /* Compaq Evo N620c */ |
| 1071 | asus_hides_smbus = 1; | 1071 | asus_hides_smbus = 1; |
| 1072 | } | 1072 | } |
| 1073 | else if (dev->device == PCI_DEVICE_ID_INTEL_82810_IG3) | ||
| 1074 | switch(dev->subsystem_device) { | ||
| 1075 | case 0xB16C: /* Compaq Deskpro EP 401963-001 (PCA# 010174) */ | ||
| 1076 | /* Motherboard doesn't have Host bridge | ||
| 1077 | * subvendor/subdevice IDs, therefore checking | ||
| 1078 | * its on-board VGA controller */ | ||
| 1079 | asus_hides_smbus = 1; | ||
| 1080 | } | ||
| 1073 | } | 1081 | } |
| 1074 | } | 1082 | } |
| 1075 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845_HB, asus_hides_smbus_hostbridge ); | 1083 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845_HB, asus_hides_smbus_hostbridge ); |
| @@ -1082,6 +1090,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855PM_HB, as | |||
| 1082 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge ); | 1090 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge ); |
| 1083 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge ); | 1091 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge ); |
| 1084 | 1092 | ||
| 1093 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG3, asus_hides_smbus_hostbridge ); | ||
| 1094 | |||
| 1085 | static void asus_hides_smbus_lpc(struct pci_dev *dev) | 1095 | static void asus_hides_smbus_lpc(struct pci_dev *dev) |
| 1086 | { | 1096 | { |
| 1087 | u16 val; | 1097 | u16 val; |
| @@ -1099,12 +1109,14 @@ static void asus_hides_smbus_lpc(struct pci_dev *dev) | |||
| 1099 | printk(KERN_INFO "PCI: Enabled i801 SMBus device\n"); | 1109 | printk(KERN_INFO "PCI: Enabled i801 SMBus device\n"); |
| 1100 | } | 1110 | } |
| 1101 | } | 1111 | } |
| 1112 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0, asus_hides_smbus_lpc ); | ||
| 1102 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc ); | 1113 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc ); |
| 1103 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc ); | 1114 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc ); |
| 1104 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, asus_hides_smbus_lpc ); | 1115 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, asus_hides_smbus_lpc ); |
| 1105 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc ); | 1116 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc ); |
| 1106 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc ); | 1117 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc ); |
| 1107 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, asus_hides_smbus_lpc ); | 1118 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, asus_hides_smbus_lpc ); |
| 1119 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0, asus_hides_smbus_lpc ); | ||
| 1108 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc ); | 1120 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc ); |
| 1109 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc ); | 1121 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc ); |
| 1110 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, asus_hides_smbus_lpc ); | 1122 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, asus_hides_smbus_lpc ); |
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index 90755d4cdb9f..6b0cf0c2a088 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c | |||
| @@ -107,108 +107,6 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev) | |||
| 107 | "pnp: SB audio device quirk - increasing port range\n"); | 107 | "pnp: SB audio device quirk - increasing port range\n"); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static int quirk_smc_fir_enabled(struct pnp_dev *dev) | ||
| 111 | { | ||
| 112 | unsigned long firbase; | ||
| 113 | u8 bank, high, low, chip; | ||
| 114 | |||
| 115 | if (!pnp_port_valid(dev, 1)) | ||
| 116 | return 0; | ||
| 117 | |||
| 118 | firbase = pnp_port_start(dev, 1); | ||
| 119 | |||
| 120 | /* Select register bank 3 */ | ||
| 121 | bank = inb(firbase + 7); | ||
| 122 | bank &= 0xf0; | ||
| 123 | bank |= 3; | ||
| 124 | outb(bank, firbase + 7); | ||
| 125 | |||
| 126 | high = inb(firbase + 0); | ||
| 127 | low = inb(firbase + 1); | ||
| 128 | chip = inb(firbase + 2); | ||
| 129 | |||
| 130 | /* This corresponds to the check in smsc_ircc_present() */ | ||
| 131 | if (high == 0x10 && low == 0xb8 && (chip == 0xf1 || chip == 0xf2)) | ||
| 132 | return 1; | ||
| 133 | |||
| 134 | return 0; | ||
| 135 | } | ||
| 136 | |||
| 137 | static void quirk_smc_enable(struct pnp_dev *dev) | ||
| 138 | { | ||
| 139 | struct resource fir, sir, irq; | ||
| 140 | |||
| 141 | pnp_activate_dev(dev); | ||
| 142 | if (quirk_smc_fir_enabled(dev)) | ||
| 143 | return; | ||
| 144 | |||
| 145 | /* | ||
| 146 | * Sometimes the BIOS claims the device is enabled, but it reports | ||
| 147 | * the wrong FIR resources or doesn't properly configure ISA or LPC | ||
| 148 | * bridges on the way to the device. | ||
| 149 | * | ||
| 150 | * HP nc6000 and nc8000/nw8000 laptops have known problems like | ||
| 151 | * this. Fortunately, they do fix things up if we auto-configure | ||
| 152 | * the device using its _PRS and _SRS methods. | ||
| 153 | */ | ||
| 154 | dev_err(&dev->dev, "%s not responding at SIR 0x%lx, FIR 0x%lx; " | ||
| 155 | "auto-configuring\n", dev->id->id, | ||
| 156 | (unsigned long)pnp_port_start(dev, 0), | ||
| 157 | (unsigned long)pnp_port_start(dev, 1)); | ||
| 158 | |||
| 159 | pnp_disable_dev(dev); | ||
| 160 | pnp_init_resource_table(&dev->res); | ||
| 161 | pnp_auto_config_dev(dev); | ||
| 162 | pnp_activate_dev(dev); | ||
| 163 | if (quirk_smc_fir_enabled(dev)) { | ||
| 164 | dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n", | ||
| 165 | (unsigned long)pnp_port_start(dev, 0), | ||
| 166 | (unsigned long)pnp_port_start(dev, 1)); | ||
| 167 | return; | ||
| 168 | } | ||
| 169 | |||
| 170 | /* | ||
| 171 | * The Toshiba Portege 4000 _CRS reports the FIR region first, | ||
| 172 | * followed by the SIR region. The BIOS will configure the bridge, | ||
| 173 | * but only if we call _SRS with SIR first, then FIR. It also | ||
| 174 | * reports the IRQ as active high, when it is really active low. | ||
| 175 | */ | ||
| 176 | dev_err(&dev->dev, "not responding at SIR 0x%lx, FIR 0x%lx; " | ||
| 177 | "swapping SIR/FIR and reconfiguring\n", | ||
| 178 | (unsigned long)pnp_port_start(dev, 0), | ||
| 179 | (unsigned long)pnp_port_start(dev, 1)); | ||
| 180 | |||
| 181 | /* | ||
| 182 | * Clear IORESOURCE_AUTO so pnp_activate_dev() doesn't reassign | ||
| 183 | * these resources any more. | ||
| 184 | */ | ||
| 185 | fir = dev->res.port_resource[0]; | ||
| 186 | sir = dev->res.port_resource[1]; | ||
| 187 | fir.flags &= ~IORESOURCE_AUTO; | ||
| 188 | sir.flags &= ~IORESOURCE_AUTO; | ||
| 189 | |||
| 190 | irq = dev->res.irq_resource[0]; | ||
| 191 | irq.flags &= ~IORESOURCE_AUTO; | ||
| 192 | irq.flags &= ~IORESOURCE_BITS; | ||
| 193 | irq.flags |= IORESOURCE_IRQ_LOWEDGE; | ||
| 194 | |||
| 195 | pnp_disable_dev(dev); | ||
| 196 | dev->res.port_resource[0] = sir; | ||
| 197 | dev->res.port_resource[1] = fir; | ||
| 198 | dev->res.irq_resource[0] = irq; | ||
| 199 | pnp_activate_dev(dev); | ||
| 200 | |||
| 201 | if (quirk_smc_fir_enabled(dev)) { | ||
| 202 | dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n", | ||
| 203 | (unsigned long)pnp_port_start(dev, 0), | ||
| 204 | (unsigned long)pnp_port_start(dev, 1)); | ||
| 205 | return; | ||
| 206 | } | ||
| 207 | |||
| 208 | dev_err(&dev->dev, "giving up; try \"smsc-ircc2.nopnp\" and " | ||
| 209 | "email bjorn.helgaas@hp.com\n"); | ||
| 210 | } | ||
| 211 | |||
| 212 | /* | 110 | /* |
| 213 | * PnP Quirks | 111 | * PnP Quirks |
| 214 | * Cards or devices that need some tweaking due to incomplete resource info | 112 | * Cards or devices that need some tweaking due to incomplete resource info |
| @@ -229,7 +127,6 @@ static struct pnp_fixup pnp_fixups[] = { | |||
| 229 | {"CTL0043", quirk_sb16audio_resources}, | 127 | {"CTL0043", quirk_sb16audio_resources}, |
| 230 | {"CTL0044", quirk_sb16audio_resources}, | 128 | {"CTL0044", quirk_sb16audio_resources}, |
| 231 | {"CTL0045", quirk_sb16audio_resources}, | 129 | {"CTL0045", quirk_sb16audio_resources}, |
| 232 | {"SMCf010", quirk_smc_enable}, | ||
| 233 | {""} | 130 | {""} |
| 234 | }; | 131 | }; |
| 235 | 132 | ||
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index 3b58d3d5d38a..a6b572978dc0 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 27 | #include <linux/bcd.h> | 27 | #include <linux/bcd.h> |
| 28 | #include <linux/rtc-v3020.h> | 28 | #include <linux/rtc-v3020.h> |
| 29 | #include <linux/delay.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 31 | 32 | ||
| @@ -47,6 +48,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address, | |||
| 47 | for (i = 0; i < 4; i++) { | 48 | for (i = 0; i < 4; i++) { |
| 48 | writel((tmp & 1) << chip->leftshift, chip->ioaddress); | 49 | writel((tmp & 1) << chip->leftshift, chip->ioaddress); |
| 49 | tmp >>= 1; | 50 | tmp >>= 1; |
| 51 | udelay(1); | ||
| 50 | } | 52 | } |
| 51 | 53 | ||
| 52 | /* Commands dont have data */ | 54 | /* Commands dont have data */ |
| @@ -54,6 +56,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address, | |||
| 54 | for (i = 0; i < 8; i++) { | 56 | for (i = 0; i < 8; i++) { |
| 55 | writel((data & 1) << chip->leftshift, chip->ioaddress); | 57 | writel((data & 1) << chip->leftshift, chip->ioaddress); |
| 56 | data >>= 1; | 58 | data >>= 1; |
| 59 | udelay(1); | ||
| 57 | } | 60 | } |
| 58 | } | 61 | } |
| 59 | } | 62 | } |
| @@ -66,12 +69,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address) | |||
| 66 | for (i = 0; i < 4; i++) { | 69 | for (i = 0; i < 4; i++) { |
| 67 | writel((address & 1) << chip->leftshift, chip->ioaddress); | 70 | writel((address & 1) << chip->leftshift, chip->ioaddress); |
| 68 | address >>= 1; | 71 | address >>= 1; |
| 72 | udelay(1); | ||
| 69 | } | 73 | } |
| 70 | 74 | ||
| 71 | for (i = 0; i < 8; i++) { | 75 | for (i = 0; i < 8; i++) { |
| 72 | data >>= 1; | 76 | data >>= 1; |
| 73 | if (readl(chip->ioaddress) & (1 << chip->leftshift)) | 77 | if (readl(chip->ioaddress) & (1 << chip->leftshift)) |
| 74 | data |= 0x80; | 78 | data |= 0x80; |
| 79 | udelay(1); | ||
| 75 | } | 80 | } |
| 76 | 81 | ||
| 77 | return data; | 82 | return data; |
| @@ -95,7 +100,7 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt) | |||
| 95 | tmp = v3020_get_reg(chip, V3020_MONTH_DAY); | 100 | tmp = v3020_get_reg(chip, V3020_MONTH_DAY); |
| 96 | dt->tm_mday = BCD2BIN(tmp); | 101 | dt->tm_mday = BCD2BIN(tmp); |
| 97 | tmp = v3020_get_reg(chip, V3020_MONTH); | 102 | tmp = v3020_get_reg(chip, V3020_MONTH); |
| 98 | dt->tm_mon = BCD2BIN(tmp); | 103 | dt->tm_mon = BCD2BIN(tmp) - 1; |
| 99 | tmp = v3020_get_reg(chip, V3020_WEEK_DAY); | 104 | tmp = v3020_get_reg(chip, V3020_WEEK_DAY); |
| 100 | dt->tm_wday = BCD2BIN(tmp); | 105 | dt->tm_wday = BCD2BIN(tmp); |
| 101 | tmp = v3020_get_reg(chip, V3020_YEAR); | 106 | tmp = v3020_get_reg(chip, V3020_YEAR); |
| @@ -135,7 +140,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt) | |||
| 135 | v3020_set_reg(chip, V3020_MINUTES, BIN2BCD(dt->tm_min)); | 140 | v3020_set_reg(chip, V3020_MINUTES, BIN2BCD(dt->tm_min)); |
| 136 | v3020_set_reg(chip, V3020_HOURS, BIN2BCD(dt->tm_hour)); | 141 | v3020_set_reg(chip, V3020_HOURS, BIN2BCD(dt->tm_hour)); |
| 137 | v3020_set_reg(chip, V3020_MONTH_DAY, BIN2BCD(dt->tm_mday)); | 142 | v3020_set_reg(chip, V3020_MONTH_DAY, BIN2BCD(dt->tm_mday)); |
| 138 | v3020_set_reg(chip, V3020_MONTH, BIN2BCD(dt->tm_mon)); | 143 | v3020_set_reg(chip, V3020_MONTH, BIN2BCD(dt->tm_mon + 1)); |
| 139 | v3020_set_reg(chip, V3020_WEEK_DAY, BIN2BCD(dt->tm_wday)); | 144 | v3020_set_reg(chip, V3020_WEEK_DAY, BIN2BCD(dt->tm_wday)); |
| 140 | v3020_set_reg(chip, V3020_YEAR, BIN2BCD(dt->tm_year % 100)); | 145 | v3020_set_reg(chip, V3020_YEAR, BIN2BCD(dt->tm_year % 100)); |
| 141 | 146 | ||
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index ab5ec1feaf4e..90aa53fc4f3e 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
| @@ -1503,7 +1503,7 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool) | |||
| 1503 | data->ct.pool = pool; | 1503 | data->ct.pool = pool; |
| 1504 | } | 1504 | } |
| 1505 | } else { | 1505 | } else { |
| 1506 | data = kmalloc(sizeof(struct zfcp_gid_pn_data), GFP_ATOMIC); | 1506 | data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC); |
| 1507 | } | 1507 | } |
| 1508 | 1508 | ||
| 1509 | if (NULL == data) | 1509 | if (NULL == data) |
| @@ -1531,7 +1531,7 @@ static void zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn) | |||
| 1531 | if (gid_pn->ct.pool) | 1531 | if (gid_pn->ct.pool) |
| 1532 | mempool_free(gid_pn, gid_pn->ct.pool); | 1532 | mempool_free(gid_pn, gid_pn->ct.pool); |
| 1533 | else | 1533 | else |
| 1534 | kfree(gid_pn); | 1534 | kmem_cache_free(zfcp_data.gid_pn_cache, gid_pn); |
| 1535 | } | 1535 | } |
| 1536 | 1536 | ||
| 1537 | /** | 1537 | /** |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index 81daa8204bfe..c6899efdc8f6 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
| @@ -640,13 +640,9 @@ int | |||
| 640 | zfcp_qdio_sbals_from_scsicmnd(struct zfcp_fsf_req *fsf_req, | 640 | zfcp_qdio_sbals_from_scsicmnd(struct zfcp_fsf_req *fsf_req, |
| 641 | unsigned long sbtype, struct scsi_cmnd *scsi_cmnd) | 641 | unsigned long sbtype, struct scsi_cmnd *scsi_cmnd) |
| 642 | { | 642 | { |
| 643 | if (scsi_sg_count(scsi_cmnd)) | 643 | return zfcp_qdio_sbals_from_sg(fsf_req, sbtype, scsi_sglist(scsi_cmnd), |
| 644 | return zfcp_qdio_sbals_from_sg(fsf_req, sbtype, | 644 | scsi_sg_count(scsi_cmnd), |
| 645 | scsi_sglist(scsi_cmnd), | 645 | ZFCP_MAX_SBALS_PER_REQ); |
| 646 | scsi_sg_count(scsi_cmnd), | ||
| 647 | ZFCP_MAX_SBALS_PER_REQ); | ||
| 648 | else | ||
| 649 | return 0; | ||
| 650 | } | 646 | } |
| 651 | 647 | ||
| 652 | /** | 648 | /** |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 0acf6db0a08d..ad7eb4a9261c 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
| @@ -764,7 +764,9 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost) | |||
| 764 | return; | 764 | return; |
| 765 | 765 | ||
| 766 | ret = zfcp_fsf_exchange_port_data(NULL, adapter, data); | 766 | ret = zfcp_fsf_exchange_port_data(NULL, adapter, data); |
| 767 | if (ret == 0) { | 767 | if (ret) { |
| 768 | kfree(data); | ||
| 769 | } else { | ||
| 768 | adapter->stats_reset = jiffies/HZ; | 770 | adapter->stats_reset = jiffies/HZ; |
| 769 | old_data = adapter->stats_reset_data; | 771 | old_data = adapter->stats_reset_data; |
| 770 | adapter->stats_reset_data = data; /* finally freed in | 772 | adapter->stats_reset_data = data; /* finally freed in |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 5606d1e62978..efceed451b46 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
| @@ -737,12 +737,19 @@ check_mgmt: | |||
| 737 | */ | 737 | */ |
| 738 | conn->ctask = list_entry(conn->xmitqueue.next, | 738 | conn->ctask = list_entry(conn->xmitqueue.next, |
| 739 | struct iscsi_cmd_task, running); | 739 | struct iscsi_cmd_task, running); |
| 740 | if (conn->ctask->state == ISCSI_TASK_PENDING) { | 740 | switch (conn->ctask->state) { |
| 741 | case ISCSI_TASK_ABORTING: | ||
| 742 | break; | ||
| 743 | case ISCSI_TASK_PENDING: | ||
| 741 | iscsi_prep_scsi_cmd_pdu(conn->ctask); | 744 | iscsi_prep_scsi_cmd_pdu(conn->ctask); |
| 742 | conn->session->tt->init_cmd_task(conn->ctask); | 745 | conn->session->tt->init_cmd_task(conn->ctask); |
| 746 | /* fall through */ | ||
| 747 | default: | ||
| 748 | conn->ctask->state = ISCSI_TASK_RUNNING; | ||
| 749 | break; | ||
| 743 | } | 750 | } |
| 744 | conn->ctask->state = ISCSI_TASK_RUNNING; | ||
| 745 | list_move_tail(conn->xmitqueue.next, &conn->run_list); | 751 | list_move_tail(conn->xmitqueue.next, &conn->run_list); |
| 752 | |||
| 746 | rc = iscsi_xmit_ctask(conn); | 753 | rc = iscsi_xmit_ctask(conn); |
| 747 | if (rc) | 754 | if (rc) |
| 748 | goto again; | 755 | goto again; |
| @@ -1049,7 +1056,9 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc, | |||
| 1049 | ctask->mtask = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)hdr, | 1056 | ctask->mtask = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)hdr, |
| 1050 | NULL, 0); | 1057 | NULL, 0); |
| 1051 | if (!ctask->mtask) { | 1058 | if (!ctask->mtask) { |
| 1059 | spin_unlock_bh(&session->lock); | ||
| 1052 | iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED); | 1060 | iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED); |
| 1061 | spin_lock_bh(&session->lock) | ||
| 1053 | debug_scsi("abort sent failure [itt 0x%x]\n", ctask->itt); | 1062 | debug_scsi("abort sent failure [itt 0x%x]\n", ctask->itt); |
| 1054 | return -EPERM; | 1063 | return -EPERM; |
| 1055 | } | 1064 | } |
| @@ -1066,6 +1075,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc, | |||
| 1066 | debug_scsi("abort set timeout [itt 0x%x]\n", ctask->itt); | 1075 | debug_scsi("abort set timeout [itt 0x%x]\n", ctask->itt); |
| 1067 | } | 1076 | } |
| 1068 | spin_unlock_bh(&session->lock); | 1077 | spin_unlock_bh(&session->lock); |
| 1078 | mutex_unlock(&session->eh_mutex); | ||
| 1069 | scsi_queue_work(session->host, &conn->xmitwork); | 1079 | scsi_queue_work(session->host, &conn->xmitwork); |
| 1070 | 1080 | ||
| 1071 | /* | 1081 | /* |
| @@ -1083,6 +1093,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc, | |||
| 1083 | if (signal_pending(current)) | 1093 | if (signal_pending(current)) |
| 1084 | flush_signals(current); | 1094 | flush_signals(current); |
| 1085 | del_timer_sync(&conn->tmabort_timer); | 1095 | del_timer_sync(&conn->tmabort_timer); |
| 1096 | mutex_lock(&session->eh_mutex); | ||
| 1086 | spin_lock_bh(&session->lock); | 1097 | spin_lock_bh(&session->lock); |
| 1087 | return 0; | 1098 | return 0; |
| 1088 | } | 1099 | } |
| @@ -1158,31 +1169,45 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask, | |||
| 1158 | __iscsi_put_ctask(ctask); | 1169 | __iscsi_put_ctask(ctask); |
| 1159 | } | 1170 | } |
| 1160 | 1171 | ||
| 1172 | static void iscsi_suspend_tx(struct iscsi_conn *conn) | ||
| 1173 | { | ||
| 1174 | set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); | ||
| 1175 | scsi_flush_work(conn->session->host); | ||
| 1176 | } | ||
| 1177 | |||
| 1178 | static void iscsi_start_tx(struct iscsi_conn *conn) | ||
| 1179 | { | ||
| 1180 | clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); | ||
| 1181 | scsi_queue_work(conn->session->host, &conn->xmitwork); | ||
| 1182 | } | ||
| 1183 | |||
| 1161 | int iscsi_eh_abort(struct scsi_cmnd *sc) | 1184 | int iscsi_eh_abort(struct scsi_cmnd *sc) |
| 1162 | { | 1185 | { |
| 1186 | struct Scsi_Host *host = sc->device->host; | ||
| 1187 | struct iscsi_session *session = iscsi_hostdata(host->hostdata); | ||
| 1163 | struct iscsi_cmd_task *ctask; | 1188 | struct iscsi_cmd_task *ctask; |
| 1164 | struct iscsi_conn *conn; | 1189 | struct iscsi_conn *conn; |
| 1165 | struct iscsi_session *session; | ||
| 1166 | int rc; | 1190 | int rc; |
| 1167 | 1191 | ||
| 1192 | mutex_lock(&session->eh_mutex); | ||
| 1193 | spin_lock_bh(&session->lock); | ||
| 1168 | /* | 1194 | /* |
| 1169 | * if session was ISCSI_STATE_IN_RECOVERY then we may not have | 1195 | * if session was ISCSI_STATE_IN_RECOVERY then we may not have |
| 1170 | * got the command. | 1196 | * got the command. |
| 1171 | */ | 1197 | */ |
| 1172 | if (!sc->SCp.ptr) { | 1198 | if (!sc->SCp.ptr) { |
| 1173 | debug_scsi("sc never reached iscsi layer or it completed.\n"); | 1199 | debug_scsi("sc never reached iscsi layer or it completed.\n"); |
| 1200 | spin_unlock_bh(&session->lock); | ||
| 1201 | mutex_unlock(&session->eh_mutex); | ||
| 1174 | return SUCCESS; | 1202 | return SUCCESS; |
| 1175 | } | 1203 | } |
| 1176 | 1204 | ||
| 1177 | ctask = (struct iscsi_cmd_task *)sc->SCp.ptr; | 1205 | ctask = (struct iscsi_cmd_task *)sc->SCp.ptr; |
| 1178 | conn = ctask->conn; | 1206 | conn = ctask->conn; |
| 1179 | session = conn->session; | ||
| 1180 | 1207 | ||
| 1181 | conn->eh_abort_cnt++; | 1208 | conn->eh_abort_cnt++; |
| 1182 | debug_scsi("aborting [sc %p itt 0x%x]\n", sc, ctask->itt); | 1209 | debug_scsi("aborting [sc %p itt 0x%x]\n", sc, ctask->itt); |
| 1183 | 1210 | ||
| 1184 | spin_lock_bh(&session->lock); | ||
| 1185 | |||
| 1186 | /* | 1211 | /* |
| 1187 | * If we are not logged in or we have started a new session | 1212 | * If we are not logged in or we have started a new session |
| 1188 | * then let the host reset code handle this | 1213 | * then let the host reset code handle this |
| @@ -1219,6 +1244,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) | |||
| 1219 | switch (conn->tmabort_state) { | 1244 | switch (conn->tmabort_state) { |
| 1220 | case TMABORT_SUCCESS: | 1245 | case TMABORT_SUCCESS: |
| 1221 | spin_unlock_bh(&session->lock); | 1246 | spin_unlock_bh(&session->lock); |
| 1247 | iscsi_suspend_tx(conn); | ||
| 1222 | /* | 1248 | /* |
| 1223 | * clean up task if aborted. grab the recv lock as a writer | 1249 | * clean up task if aborted. grab the recv lock as a writer |
| 1224 | */ | 1250 | */ |
| @@ -1227,11 +1253,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) | |||
| 1227 | fail_command(conn, ctask, DID_ABORT << 16); | 1253 | fail_command(conn, ctask, DID_ABORT << 16); |
| 1228 | spin_unlock(&session->lock); | 1254 | spin_unlock(&session->lock); |
| 1229 | write_unlock_bh(conn->recv_lock); | 1255 | write_unlock_bh(conn->recv_lock); |
| 1230 | /* | 1256 | iscsi_start_tx(conn); |
| 1231 | * make sure xmit thread is not still touching the | ||
| 1232 | * ctask/scsi_cmnd | ||
| 1233 | */ | ||
| 1234 | scsi_flush_work(session->host); | ||
| 1235 | goto success_unlocked; | 1257 | goto success_unlocked; |
| 1236 | case TMABORT_NOT_FOUND: | 1258 | case TMABORT_NOT_FOUND: |
| 1237 | if (!ctask->sc) { | 1259 | if (!ctask->sc) { |
| @@ -1251,12 +1273,14 @@ success: | |||
| 1251 | spin_unlock_bh(&session->lock); | 1273 | spin_unlock_bh(&session->lock); |
| 1252 | success_unlocked: | 1274 | success_unlocked: |
| 1253 | debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt); | 1275 | debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt); |
| 1276 | mutex_unlock(&session->eh_mutex); | ||
| 1254 | return SUCCESS; | 1277 | return SUCCESS; |
| 1255 | 1278 | ||
| 1256 | failed: | 1279 | failed: |
| 1257 | spin_unlock_bh(&session->lock); | 1280 | spin_unlock_bh(&session->lock); |
| 1258 | failed_unlocked: | 1281 | failed_unlocked: |
| 1259 | debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask->itt); | 1282 | debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask->itt); |
| 1283 | mutex_unlock(&session->eh_mutex); | ||
| 1260 | return FAILED; | 1284 | return FAILED; |
| 1261 | } | 1285 | } |
| 1262 | EXPORT_SYMBOL_GPL(iscsi_eh_abort); | 1286 | EXPORT_SYMBOL_GPL(iscsi_eh_abort); |
| @@ -1403,6 +1427,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, | |||
| 1403 | session->max_cmdsn = initial_cmdsn + 1; | 1427 | session->max_cmdsn = initial_cmdsn + 1; |
| 1404 | session->max_r2t = 1; | 1428 | session->max_r2t = 1; |
| 1405 | session->tt = iscsit; | 1429 | session->tt = iscsit; |
| 1430 | mutex_init(&session->eh_mutex); | ||
| 1406 | 1431 | ||
| 1407 | /* initialize SCSI PDU commands pool */ | 1432 | /* initialize SCSI PDU commands pool */ |
| 1408 | if (iscsi_pool_init(&session->cmdpool, session->cmds_max, | 1433 | if (iscsi_pool_init(&session->cmdpool, session->cmds_max, |
| @@ -1736,9 +1761,22 @@ static void iscsi_start_session_recovery(struct iscsi_session *session, | |||
| 1736 | { | 1761 | { |
| 1737 | int old_stop_stage; | 1762 | int old_stop_stage; |
| 1738 | 1763 | ||
| 1764 | mutex_lock(&session->eh_mutex); | ||
| 1739 | spin_lock_bh(&session->lock); | 1765 | spin_lock_bh(&session->lock); |
| 1740 | if (conn->stop_stage == STOP_CONN_TERM) { | 1766 | if (conn->stop_stage == STOP_CONN_TERM) { |
| 1741 | spin_unlock_bh(&session->lock); | 1767 | spin_unlock_bh(&session->lock); |
| 1768 | mutex_unlock(&session->eh_mutex); | ||
| 1769 | return; | ||
| 1770 | } | ||
| 1771 | |||
| 1772 | /* | ||
| 1773 | * The LLD either freed/unset the lock on us, or userspace called | ||
| 1774 | * stop but did not create a proper connection (connection was never | ||
| 1775 | * bound or it was unbound then stop was called). | ||
| 1776 | */ | ||
| 1777 | if (!conn->recv_lock) { | ||
| 1778 | spin_unlock_bh(&session->lock); | ||
| 1779 | mutex_unlock(&session->eh_mutex); | ||
| 1742 | return; | 1780 | return; |
| 1743 | } | 1781 | } |
| 1744 | 1782 | ||
| @@ -1755,9 +1793,9 @@ static void iscsi_start_session_recovery(struct iscsi_session *session, | |||
| 1755 | old_stop_stage = conn->stop_stage; | 1793 | old_stop_stage = conn->stop_stage; |
| 1756 | conn->stop_stage = flag; | 1794 | conn->stop_stage = flag; |
| 1757 | conn->c_stage = ISCSI_CONN_STOPPED; | 1795 | conn->c_stage = ISCSI_CONN_STOPPED; |
| 1758 | set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); | ||
| 1759 | spin_unlock_bh(&session->lock); | 1796 | spin_unlock_bh(&session->lock); |
| 1760 | scsi_flush_work(session->host); | 1797 | |
| 1798 | iscsi_suspend_tx(conn); | ||
| 1761 | 1799 | ||
| 1762 | write_lock_bh(conn->recv_lock); | 1800 | write_lock_bh(conn->recv_lock); |
| 1763 | set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx); | 1801 | set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx); |
| @@ -1786,6 +1824,7 @@ static void iscsi_start_session_recovery(struct iscsi_session *session, | |||
| 1786 | fail_all_commands(conn); | 1824 | fail_all_commands(conn); |
| 1787 | flush_control_queues(session, conn); | 1825 | flush_control_queues(session, conn); |
| 1788 | spin_unlock_bh(&session->lock); | 1826 | spin_unlock_bh(&session->lock); |
| 1827 | mutex_unlock(&session->eh_mutex); | ||
| 1789 | } | 1828 | } |
| 1790 | 1829 | ||
| 1791 | void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag) | 1830 | void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag) |
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 563d18f4ff50..c6680348b648 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c | |||
| @@ -2050,21 +2050,18 @@ qla25xx_fw_dump_failed: | |||
| 2050 | void | 2050 | void |
| 2051 | qla2x00_dump_regs(scsi_qla_host_t *ha) | 2051 | qla2x00_dump_regs(scsi_qla_host_t *ha) |
| 2052 | { | 2052 | { |
| 2053 | int i; | ||
| 2053 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | 2054 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; |
| 2055 | struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24; | ||
| 2056 | uint16_t __iomem *mbx_reg; | ||
| 2057 | |||
| 2058 | mbx_reg = IS_FWI2_CAPABLE(ha) ? ®24->mailbox0: | ||
| 2059 | MAILBOX_REG(ha, reg, 0); | ||
| 2054 | 2060 | ||
| 2055 | printk("Mailbox registers:\n"); | 2061 | printk("Mailbox registers:\n"); |
| 2056 | printk("scsi(%ld): mbox 0 0x%04x \n", | 2062 | for (i = 0; i < 6; i++) |
| 2057 | ha->host_no, RD_MAILBOX_REG(ha, reg, 0)); | 2063 | printk("scsi(%ld): mbox %d 0x%04x \n", ha->host_no, i, |
| 2058 | printk("scsi(%ld): mbox 1 0x%04x \n", | 2064 | RD_REG_WORD(mbx_reg++)); |
| 2059 | ha->host_no, RD_MAILBOX_REG(ha, reg, 1)); | ||
| 2060 | printk("scsi(%ld): mbox 2 0x%04x \n", | ||
| 2061 | ha->host_no, RD_MAILBOX_REG(ha, reg, 2)); | ||
| 2062 | printk("scsi(%ld): mbox 3 0x%04x \n", | ||
| 2063 | ha->host_no, RD_MAILBOX_REG(ha, reg, 3)); | ||
| 2064 | printk("scsi(%ld): mbox 4 0x%04x \n", | ||
| 2065 | ha->host_no, RD_MAILBOX_REG(ha, reg, 4)); | ||
| 2066 | printk("scsi(%ld): mbox 5 0x%04x \n", | ||
| 2067 | ha->host_no, RD_MAILBOX_REG(ha, reg, 5)); | ||
| 2068 | } | 2065 | } |
| 2069 | 2066 | ||
| 2070 | 2067 | ||
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 27ae3a532a55..c1964866a423 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
| @@ -1502,7 +1502,6 @@ typedef struct { | |||
| 1502 | uint8_t node_name[WWN_SIZE]; | 1502 | uint8_t node_name[WWN_SIZE]; |
| 1503 | uint8_t port_name[WWN_SIZE]; | 1503 | uint8_t port_name[WWN_SIZE]; |
| 1504 | uint8_t fabric_port_name[WWN_SIZE]; | 1504 | uint8_t fabric_port_name[WWN_SIZE]; |
| 1505 | uint16_t fp_speeds; | ||
| 1506 | uint16_t fp_speed; | 1505 | uint16_t fp_speed; |
| 1507 | } sw_info_t; | 1506 | } sw_info_t; |
| 1508 | 1507 | ||
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index b06cbb8580d3..a7e23583f899 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c | |||
| @@ -295,6 +295,8 @@ qla2x00_gid_pt(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 295 | list[i].d_id.b.domain = gid_data->port_id[0]; | 295 | list[i].d_id.b.domain = gid_data->port_id[0]; |
| 296 | list[i].d_id.b.area = gid_data->port_id[1]; | 296 | list[i].d_id.b.area = gid_data->port_id[1]; |
| 297 | list[i].d_id.b.al_pa = gid_data->port_id[2]; | 297 | list[i].d_id.b.al_pa = gid_data->port_id[2]; |
| 298 | memset(list[i].fabric_port_name, 0, WWN_SIZE); | ||
| 299 | list[i].fp_speed = PORT_SPEED_UNKNOWN; | ||
| 298 | 300 | ||
| 299 | /* Last one exit. */ | 301 | /* Last one exit. */ |
| 300 | if (gid_data->control_byte & BIT_7) { | 302 | if (gid_data->control_byte & BIT_7) { |
| @@ -1707,8 +1709,6 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1707 | 1709 | ||
| 1708 | for (i = 0; i < MAX_FIBRE_DEVICES; i++) { | 1710 | for (i = 0; i < MAX_FIBRE_DEVICES; i++) { |
| 1709 | /* Issue GFPN_ID */ | 1711 | /* Issue GFPN_ID */ |
| 1710 | memset(list[i].fabric_port_name, 0, WWN_SIZE); | ||
| 1711 | |||
| 1712 | /* Prepare common MS IOCB */ | 1712 | /* Prepare common MS IOCB */ |
| 1713 | ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE, | 1713 | ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE, |
| 1714 | GFPN_ID_RSP_SIZE); | 1714 | GFPN_ID_RSP_SIZE); |
| @@ -1821,8 +1821,6 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1821 | 1821 | ||
| 1822 | for (i = 0; i < MAX_FIBRE_DEVICES; i++) { | 1822 | for (i = 0; i < MAX_FIBRE_DEVICES; i++) { |
| 1823 | /* Issue GFPN_ID */ | 1823 | /* Issue GFPN_ID */ |
| 1824 | list[i].fp_speeds = list[i].fp_speed = 0; | ||
| 1825 | |||
| 1826 | /* Prepare common MS IOCB */ | 1824 | /* Prepare common MS IOCB */ |
| 1827 | ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE, | 1825 | ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE, |
| 1828 | GPSC_RSP_SIZE); | 1826 | GPSC_RSP_SIZE); |
| @@ -1858,9 +1856,21 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1858 | } | 1856 | } |
| 1859 | rval = QLA_FUNCTION_FAILED; | 1857 | rval = QLA_FUNCTION_FAILED; |
| 1860 | } else { | 1858 | } else { |
| 1861 | /* Save portname */ | 1859 | /* Save port-speed */ |
| 1862 | list[i].fp_speeds = ct_rsp->rsp.gpsc.speeds; | 1860 | switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) { |
| 1863 | list[i].fp_speed = ct_rsp->rsp.gpsc.speed; | 1861 | case BIT_15: |
| 1862 | list[i].fp_speed = PORT_SPEED_1GB; | ||
| 1863 | break; | ||
| 1864 | case BIT_14: | ||
| 1865 | list[i].fp_speed = PORT_SPEED_2GB; | ||
| 1866 | break; | ||
| 1867 | case BIT_13: | ||
| 1868 | list[i].fp_speed = PORT_SPEED_4GB; | ||
| 1869 | break; | ||
| 1870 | case BIT_11: | ||
| 1871 | list[i].fp_speed = PORT_SPEED_8GB; | ||
| 1872 | break; | ||
| 1873 | } | ||
| 1864 | 1874 | ||
| 1865 | DEBUG2_3(printk("scsi(%ld): GPSC ext entry - " | 1875 | DEBUG2_3(printk("scsi(%ld): GPSC ext entry - " |
| 1866 | "fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x " | 1876 | "fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x " |
| @@ -1873,8 +1883,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1873 | list[i].fabric_port_name[5], | 1883 | list[i].fabric_port_name[5], |
| 1874 | list[i].fabric_port_name[6], | 1884 | list[i].fabric_port_name[6], |
| 1875 | list[i].fabric_port_name[7], | 1885 | list[i].fabric_port_name[7], |
| 1876 | be16_to_cpu(list[i].fp_speeds), | 1886 | be16_to_cpu(ct_rsp->rsp.gpsc.speeds), |
| 1877 | be16_to_cpu(list[i].fp_speed))); | 1887 | be16_to_cpu(ct_rsp->rsp.gpsc.speed))); |
| 1878 | } | 1888 | } |
| 1879 | 1889 | ||
| 1880 | /* Last device exit. */ | 1890 | /* Last device exit. */ |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 374abe19b547..1a058ec9bd0c 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -2079,17 +2079,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha) | |||
| 2079 | } | 2079 | } |
| 2080 | 2080 | ||
| 2081 | /* Base iIDMA settings on HBA port speed. */ | 2081 | /* Base iIDMA settings on HBA port speed. */ |
| 2082 | switch (ha->link_data_rate) { | 2082 | fcport->fp_speed = ha->link_data_rate; |
| 2083 | case PORT_SPEED_1GB: | ||
| 2084 | fcport->fp_speed = cpu_to_be16(BIT_15); | ||
| 2085 | break; | ||
| 2086 | case PORT_SPEED_2GB: | ||
| 2087 | fcport->fp_speed = cpu_to_be16(BIT_14); | ||
| 2088 | break; | ||
| 2089 | case PORT_SPEED_4GB: | ||
| 2090 | fcport->fp_speed = cpu_to_be16(BIT_13); | ||
| 2091 | break; | ||
| 2092 | } | ||
| 2093 | 2083 | ||
| 2094 | qla2x00_update_fcport(ha, fcport); | 2084 | qla2x00_update_fcport(ha, fcport); |
| 2095 | 2085 | ||
| @@ -2130,38 +2120,25 @@ static void | |||
| 2130 | qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | 2120 | qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) |
| 2131 | { | 2121 | { |
| 2132 | #define LS_UNKNOWN 2 | 2122 | #define LS_UNKNOWN 2 |
| 2133 | static char *link_speeds[5] = { "1", "2", "?", "4" }; | 2123 | static char *link_speeds[5] = { "1", "2", "?", "4", "8" }; |
| 2134 | int rval; | 2124 | int rval; |
| 2135 | uint16_t port_speed, mb[6]; | 2125 | uint16_t mb[6]; |
| 2136 | 2126 | ||
| 2137 | if (!IS_IIDMA_CAPABLE(ha)) | 2127 | if (!IS_IIDMA_CAPABLE(ha)) |
| 2138 | return; | 2128 | return; |
| 2139 | 2129 | ||
| 2140 | switch (be16_to_cpu(fcport->fp_speed)) { | 2130 | if (fcport->fp_speed == PORT_SPEED_UNKNOWN) { |
| 2141 | case BIT_15: | ||
| 2142 | port_speed = PORT_SPEED_1GB; | ||
| 2143 | break; | ||
| 2144 | case BIT_14: | ||
| 2145 | port_speed = PORT_SPEED_2GB; | ||
| 2146 | break; | ||
| 2147 | case BIT_13: | ||
| 2148 | port_speed = PORT_SPEED_4GB; | ||
| 2149 | break; | ||
| 2150 | default: | ||
| 2151 | DEBUG2(printk("scsi(%ld): %02x%02x%02x%02x%02x%02x%02x%02x -- " | 2131 | DEBUG2(printk("scsi(%ld): %02x%02x%02x%02x%02x%02x%02x%02x -- " |
| 2152 | "unsupported FM port operating speed (%04x).\n", | 2132 | "unsupported FM port operating speed.\n", |
| 2153 | ha->host_no, fcport->port_name[0], fcport->port_name[1], | 2133 | ha->host_no, fcport->port_name[0], fcport->port_name[1], |
| 2154 | fcport->port_name[2], fcport->port_name[3], | 2134 | fcport->port_name[2], fcport->port_name[3], |
| 2155 | fcport->port_name[4], fcport->port_name[5], | 2135 | fcport->port_name[4], fcport->port_name[5], |
| 2156 | fcport->port_name[6], fcport->port_name[7], | 2136 | fcport->port_name[6], fcport->port_name[7])); |
| 2157 | be16_to_cpu(fcport->fp_speed))); | ||
| 2158 | port_speed = PORT_SPEED_UNKNOWN; | ||
| 2159 | break; | ||
| 2160 | } | ||
| 2161 | if (port_speed == PORT_SPEED_UNKNOWN) | ||
| 2162 | return; | 2137 | return; |
| 2138 | } | ||
| 2163 | 2139 | ||
| 2164 | rval = qla2x00_set_idma_speed(ha, fcport->loop_id, port_speed, mb); | 2140 | rval = qla2x00_set_idma_speed(ha, fcport->loop_id, fcport->fp_speed, |
| 2141 | mb); | ||
| 2165 | if (rval != QLA_SUCCESS) { | 2142 | if (rval != QLA_SUCCESS) { |
| 2166 | DEBUG2(printk("scsi(%ld): Unable to adjust iIDMA " | 2143 | DEBUG2(printk("scsi(%ld): Unable to adjust iIDMA " |
| 2167 | "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x %04x.\n", | 2144 | "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x %04x.\n", |
| @@ -2169,12 +2146,12 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | |||
| 2169 | fcport->port_name[2], fcport->port_name[3], | 2146 | fcport->port_name[2], fcport->port_name[3], |
| 2170 | fcport->port_name[4], fcport->port_name[5], | 2147 | fcport->port_name[4], fcport->port_name[5], |
| 2171 | fcport->port_name[6], fcport->port_name[7], rval, | 2148 | fcport->port_name[6], fcport->port_name[7], rval, |
| 2172 | port_speed, mb[0], mb[1])); | 2149 | fcport->fp_speed, mb[0], mb[1])); |
| 2173 | } else { | 2150 | } else { |
| 2174 | DEBUG2(qla_printk(KERN_INFO, ha, | 2151 | DEBUG2(qla_printk(KERN_INFO, ha, |
| 2175 | "iIDMA adjusted to %s GB/s on " | 2152 | "iIDMA adjusted to %s GB/s on " |
| 2176 | "%02x%02x%02x%02x%02x%02x%02x%02x.\n", | 2153 | "%02x%02x%02x%02x%02x%02x%02x%02x.\n", |
| 2177 | link_speeds[port_speed], fcport->port_name[0], | 2154 | link_speeds[fcport->fp_speed], fcport->port_name[0], |
| 2178 | fcport->port_name[1], fcport->port_name[2], | 2155 | fcport->port_name[1], fcport->port_name[2], |
| 2179 | fcport->port_name[3], fcport->port_name[4], | 2156 | fcport->port_name[3], fcport->port_name[4], |
| 2180 | fcport->port_name[5], fcport->port_name[6], | 2157 | fcport->port_name[5], fcport->port_name[6], |
| @@ -3354,7 +3331,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha) | |||
| 3354 | 3331 | ||
| 3355 | spin_lock_irqsave(&ha->hardware_lock, flags); | 3332 | spin_lock_irqsave(&ha->hardware_lock, flags); |
| 3356 | 3333 | ||
| 3357 | if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) { | 3334 | if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) && |
| 3335 | !IS_QLA25XX(ha)) { | ||
| 3358 | /* | 3336 | /* |
| 3359 | * Disable SRAM, Instruction RAM and GP RAM | 3337 | * Disable SRAM, Instruction RAM and GP RAM |
| 3360 | * parity. | 3338 | * parity. |
| @@ -3370,7 +3348,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha) | |||
| 3370 | 3348 | ||
| 3371 | spin_lock_irqsave(&ha->hardware_lock, flags); | 3349 | spin_lock_irqsave(&ha->hardware_lock, flags); |
| 3372 | 3350 | ||
| 3373 | if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) { | 3351 | if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) && |
| 3352 | !IS_QLA25XX(ha)) { | ||
| 3374 | /* Enable proper parity */ | 3353 | /* Enable proper parity */ |
| 3375 | if (IS_QLA2300(ha)) | 3354 | if (IS_QLA2300(ha)) |
| 3376 | /* SRAM parity */ | 3355 | /* SRAM parity */ |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 50539da467bf..eecae9905ece 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
| @@ -490,6 +490,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb) | |||
| 490 | set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags); | 490 | set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags); |
| 491 | 491 | ||
| 492 | ha->flags.gpsc_supported = 1; | 492 | ha->flags.gpsc_supported = 1; |
| 493 | ha->flags.management_server_logged_in = 0; | ||
| 493 | break; | 494 | break; |
| 494 | 495 | ||
| 495 | case MBA_CHG_IN_CONNECTION: /* Change in connection mode */ | 496 | case MBA_CHG_IN_CONNECTION: /* Change in connection mode */ |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 93c0c7e4f08f..acca898ce0a2 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -1564,7 +1564,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1564 | struct Scsi_Host *host; | 1564 | struct Scsi_Host *host; |
| 1565 | scsi_qla_host_t *ha; | 1565 | scsi_qla_host_t *ha; |
| 1566 | unsigned long flags = 0; | 1566 | unsigned long flags = 0; |
| 1567 | char pci_info[20]; | 1567 | char pci_info[30]; |
| 1568 | char fw_str[30]; | 1568 | char fw_str[30]; |
| 1569 | struct scsi_host_template *sht; | 1569 | struct scsi_host_template *sht; |
| 1570 | 1570 | ||
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index dd1f8ceb79c4..18095b9b76f4 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | /* | 7 | /* |
| 8 | * Driver version | 8 | * Driver version |
| 9 | */ | 9 | */ |
| 10 | #define QLA2XXX_VERSION "8.02.00-k2" | 10 | #define QLA2XXX_VERSION "8.02.00-k3" |
| 11 | 11 | ||
| 12 | #define QLA_DRIVER_MAJOR_VER 8 | 12 | #define QLA_DRIVER_MAJOR_VER 8 |
| 13 | #define QLA_DRIVER_MINOR_VER 2 | 13 | #define QLA_DRIVER_MINOR_VER 2 |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 64ff6a5f6afd..81b52b7cca21 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -611,7 +611,7 @@ config SERIAL_BFIN | |||
| 611 | 611 | ||
| 612 | config SERIAL_BFIN_CONSOLE | 612 | config SERIAL_BFIN_CONSOLE |
| 613 | bool "Console on Blackfin serial port" | 613 | bool "Console on Blackfin serial port" |
| 614 | depends on SERIAL_BFIN | 614 | depends on SERIAL_BFIN=y |
| 615 | select SERIAL_CORE_CONSOLE | 615 | select SERIAL_CORE_CONSOLE |
| 616 | 616 | ||
| 617 | choice | 617 | choice |
| @@ -832,10 +832,10 @@ config SERIAL_MUX | |||
| 832 | 4. Change the kernel command console parameter to: console=ttyB0 | 832 | 4. Change the kernel command console parameter to: console=ttyB0 |
| 833 | 833 | ||
| 834 | config SERIAL_MUX_CONSOLE | 834 | config SERIAL_MUX_CONSOLE |
| 835 | bool "Support for console on serial MUX" | 835 | bool "Support for console on serial MUX" |
| 836 | depends on SERIAL_MUX | 836 | depends on SERIAL_MUX=y |
| 837 | select SERIAL_CORE_CONSOLE | 837 | select SERIAL_CORE_CONSOLE |
| 838 | default y | 838 | default y |
| 839 | 839 | ||
| 840 | config PDC_CONSOLE | 840 | config PDC_CONSOLE |
| 841 | bool "PDC software console support" | 841 | bool "PDC software console support" |
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c index 201253755011..2d6c08b3dbcf 100644 --- a/drivers/serial/sb1250-duart.c +++ b/drivers/serial/sb1250-duart.c | |||
| @@ -58,6 +58,12 @@ | |||
| 58 | #define SBD_CTRLREGS(line) A_BCM1480_DUART_CTRLREG((line), 0) | 58 | #define SBD_CTRLREGS(line) A_BCM1480_DUART_CTRLREG((line), 0) |
| 59 | #define SBD_INT(line) (K_BCM1480_INT_UART_0 + (line)) | 59 | #define SBD_INT(line) (K_BCM1480_INT_UART_0 + (line)) |
| 60 | 60 | ||
| 61 | #define DUART_CHANREG_SPACING BCM1480_DUART_CHANREG_SPACING | ||
| 62 | |||
| 63 | #define R_DUART_IMRREG(line) R_BCM1480_DUART_IMRREG(line) | ||
| 64 | #define R_DUART_INCHREG(line) R_BCM1480_DUART_INCHREG(line) | ||
| 65 | #define R_DUART_ISRREG(line) R_BCM1480_DUART_ISRREG(line) | ||
| 66 | |||
| 61 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) | 67 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) |
| 62 | #include <asm/sibyte/sb1250_regs.h> | 68 | #include <asm/sibyte/sb1250_regs.h> |
| 63 | #include <asm/sibyte/sb1250_int.h> | 69 | #include <asm/sibyte/sb1250_int.h> |
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index fcbf1b8a5264..32cda77b31cd 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
| @@ -384,11 +384,8 @@ irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data) | |||
| 384 | 384 | ||
| 385 | mpc83xx_spi->count -= 1; | 385 | mpc83xx_spi->count -= 1; |
| 386 | if (mpc83xx_spi->count) { | 386 | if (mpc83xx_spi->count) { |
| 387 | if (mpc83xx_spi->tx) { | 387 | u32 word = mpc83xx_spi->get_tx(mpc83xx_spi); |
| 388 | u32 word = mpc83xx_spi->get_tx(mpc83xx_spi); | 388 | mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word); |
| 389 | mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, | ||
| 390 | word); | ||
| 391 | } | ||
| 392 | } else { | 389 | } else { |
| 393 | complete(&mpc83xx_spi->done); | 390 | complete(&mpc83xx_spi->done); |
| 394 | } | 391 | } |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index a1ad11d0c47c..63b1243a9139 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -60,7 +60,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids, | |||
| 60 | dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE; | 60 | dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE; |
| 61 | 61 | ||
| 62 | spin_lock(&dynids->lock); | 62 | spin_lock(&dynids->lock); |
| 63 | list_add_tail(&dynids->list, &dynid->node); | 63 | list_add_tail(&dynid->node, &dynids->list); |
| 64 | spin_unlock(&dynids->lock); | 64 | spin_unlock(&dynids->lock); |
| 65 | 65 | ||
| 66 | if (get_driver(driver)) { | 66 | if (get_driver(driver)) { |
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 9e467118dc94..7f17d0fd76c0 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
| @@ -28,10 +28,16 @@ | |||
| 28 | * devices is broken... | 28 | * devices is broken... |
| 29 | */ | 29 | */ |
| 30 | static const struct usb_device_id usb_quirk_list[] = { | 30 | static const struct usb_device_id usb_quirk_list[] = { |
| 31 | /* CBM - Flash disk */ | ||
| 32 | { USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 31 | /* HP 5300/5370C scanner */ | 33 | /* HP 5300/5370C scanner */ |
| 32 | { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 }, | 34 | { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 }, |
| 33 | /* Hewlett-Packard PhotoSmart 720 / PhotoSmart 935 (storage) */ | 35 | /* Hewlett-Packard PhotoSmart 720 / PhotoSmart 935 (storage) */ |
| 34 | { USB_DEVICE(0x03f0, 0x4002), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 36 | { USB_DEVICE(0x03f0, 0x4002), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 37 | |||
| 38 | /* SGS Thomson Microelectronics 4in1 card reader */ | ||
| 39 | { USB_DEVICE(0x0483, 0x0321), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | ||
| 40 | |||
| 35 | /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */ | 41 | /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */ |
| 36 | { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 42 | { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 37 | /* Benq S2W 3300U */ | 43 | /* Benq S2W 3300U */ |
| @@ -66,6 +72,19 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
| 66 | { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 72 | { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 67 | /* Ultima Electronics Corp.*/ | 73 | /* Ultima Electronics Corp.*/ |
| 68 | { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 74 | { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 75 | |||
| 76 | /* Genesys USB-to-IDE */ | ||
| 77 | { USB_DEVICE(0x0503, 0x0702), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | ||
| 78 | |||
| 79 | /* USB Graphical LCD - EEH Datalink GmbH */ | ||
| 80 | { USB_DEVICE(0x060c, 0x04eb), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | ||
| 81 | |||
| 82 | /* INTEL VALUE SSD */ | ||
| 83 | { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 84 | |||
| 85 | /* M-Systems Flash Disk Pioneers */ | ||
| 86 | { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 87 | |||
| 69 | /* Agfa Snapscan1212u */ | 88 | /* Agfa Snapscan1212u */ |
| 70 | { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 89 | { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 71 | /* Seagate RSS LLC */ | 90 | /* Seagate RSS LLC */ |
| @@ -87,6 +106,12 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
| 87 | { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 106 | { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 88 | { USB_DEVICE(0x0fca, 0x0006), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | 107 | { USB_DEVICE(0x0fca, 0x0006), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, |
| 89 | 108 | ||
| 109 | /* Apple iPhone */ | ||
| 110 | { USB_DEVICE(0x05ac, 0x1290), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, | ||
| 111 | |||
| 112 | /* SKYMEDI USB_DRIVE */ | ||
| 113 | { USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 114 | |||
| 90 | { } /* terminating entry must be last */ | 115 | { } /* terminating entry must be last */ |
| 91 | }; | 116 | }; |
| 92 | 117 | ||
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index 9cd98e73dc1d..ce4d2e09633d 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c | |||
| @@ -1691,14 +1691,12 @@ static int gs_setup_class(struct usb_gadget *gadget, | |||
| 1691 | 1691 | ||
| 1692 | switch (ctrl->bRequest) { | 1692 | switch (ctrl->bRequest) { |
| 1693 | case USB_CDC_REQ_SET_LINE_CODING: | 1693 | case USB_CDC_REQ_SET_LINE_CODING: |
| 1694 | ret = min(wLength, | 1694 | /* FIXME Submit req to read the data; have its completion |
| 1695 | (u16)sizeof(struct usb_cdc_line_coding)); | 1695 | * handler copy that data to port->port_line_coding (iff |
| 1696 | if (port) { | 1696 | * it's valid) and maybe pass it on. Until then, fail. |
| 1697 | spin_lock(&port->port_lock); | 1697 | */ |
| 1698 | memcpy(&port->port_line_coding, req->buf, ret); | 1698 | printk(KERN_WARNING "gs_setup: set_line_coding " |
| 1699 | spin_unlock(&port->port_lock); | 1699 | "unuspported\n"); |
| 1700 | } | ||
| 1701 | ret = 0; | ||
| 1702 | break; | 1700 | break; |
| 1703 | 1701 | ||
| 1704 | case USB_CDC_REQ_GET_LINE_CODING: | 1702 | case USB_CDC_REQ_GET_LINE_CODING: |
| @@ -1713,11 +1711,18 @@ static int gs_setup_class(struct usb_gadget *gadget, | |||
| 1713 | break; | 1711 | break; |
| 1714 | 1712 | ||
| 1715 | case USB_CDC_REQ_SET_CONTROL_LINE_STATE: | 1713 | case USB_CDC_REQ_SET_CONTROL_LINE_STATE: |
| 1716 | ret = 0; | 1714 | /* FIXME Submit req to read the data; have its completion |
| 1715 | * handler use that to set the state (iff it's valid) and | ||
| 1716 | * maybe pass it on. Until then, fail. | ||
| 1717 | */ | ||
| 1718 | printk(KERN_WARNING "gs_setup: set_control_line_state " | ||
| 1719 | "unuspported\n"); | ||
| 1717 | break; | 1720 | break; |
| 1718 | 1721 | ||
| 1719 | default: | 1722 | default: |
| 1720 | printk(KERN_ERR "gs_setup: unknown class request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n", | 1723 | printk(KERN_ERR "gs_setup: unknown class request, " |
| 1724 | "type=%02x, request=%02x, value=%04x, " | ||
| 1725 | "index=%04x, length=%d\n", | ||
| 1721 | ctrl->bRequestType, ctrl->bRequest, | 1726 | ctrl->bRequestType, ctrl->bRequest, |
| 1722 | wValue, wIndex, wLength); | 1727 | wValue, wIndex, wLength); |
| 1723 | break; | 1728 | break; |
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 9f37ba44c132..b64ca91d9b02 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
| @@ -3404,6 +3404,7 @@ static void sisusb_disconnect(struct usb_interface *intf) | |||
| 3404 | } | 3404 | } |
| 3405 | 3405 | ||
| 3406 | static struct usb_device_id sisusb_table [] = { | 3406 | static struct usb_device_id sisusb_table [] = { |
| 3407 | { USB_DEVICE(0x0711, 0x0550) }, | ||
| 3407 | { USB_DEVICE(0x0711, 0x0900) }, | 3408 | { USB_DEVICE(0x0711, 0x0900) }, |
| 3408 | { USB_DEVICE(0x0711, 0x0901) }, | 3409 | { USB_DEVICE(0x0711, 0x0901) }, |
| 3409 | { USB_DEVICE(0x0711, 0x0902) }, | 3410 | { USB_DEVICE(0x0711, 0x0902) }, |
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index c08a38402b93..a47a24f8820d 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c | |||
| @@ -138,7 +138,7 @@ static void free_dynids(struct usb_serial_driver *drv) | |||
| 138 | static struct driver_attribute drv_attrs[] = { | 138 | static struct driver_attribute drv_attrs[] = { |
| 139 | __ATTR_NULL, | 139 | __ATTR_NULL, |
| 140 | }; | 140 | }; |
| 141 | static inline void free_dynids(struct usb_driver *drv) | 141 | static inline void free_dynids(struct usb_serial_driver *drv) |
| 142 | { | 142 | { |
| 143 | } | 143 | } |
| 144 | #endif | 144 | #endif |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 1370c423d7c2..2d045857b181 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -568,6 +568,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 568 | { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) }, | 568 | { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) }, |
| 569 | { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, | 569 | { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, |
| 570 | { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, | 570 | { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, |
| 571 | { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) }, | ||
| 571 | { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID), | 572 | { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID), |
| 572 | .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk }, | 573 | .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk }, |
| 573 | { }, /* Optional parameter entry */ | 574 | { }, /* Optional parameter entry */ |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index c70e1de6389e..b57b90ae9f9d 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -534,6 +534,14 @@ | |||
| 534 | #define OLIMEX_VID 0x15BA | 534 | #define OLIMEX_VID 0x15BA |
| 535 | #define OLIMEX_ARM_USB_OCD_PID 0x0003 | 535 | #define OLIMEX_ARM_USB_OCD_PID 0x0003 |
| 536 | 536 | ||
| 537 | |||
| 538 | /* | ||
| 539 | * The Mobility Lab (TML) | ||
| 540 | * Submitted by Pierre Castella | ||
| 541 | */ | ||
| 542 | #define TML_VID 0x1B91 /* Vendor ID */ | ||
| 543 | #define TML_USB_SERIAL_PID 0x0064 /* USB - Serial Converter */ | ||
| 544 | |||
| 537 | /* Commands */ | 545 | /* Commands */ |
| 538 | #define FTDI_SIO_RESET 0 /* Reset the port */ | 546 | #define FTDI_SIO_RESET 0 /* Reset the port */ |
| 539 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ | 547 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 4cb3c165742b..a18659e0700c 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -108,6 +108,7 @@ static int option_send_setup(struct usb_serial_port *port); | |||
| 108 | #define HUAWEI_VENDOR_ID 0x12D1 | 108 | #define HUAWEI_VENDOR_ID 0x12D1 |
| 109 | #define HUAWEI_PRODUCT_E600 0x1001 | 109 | #define HUAWEI_PRODUCT_E600 0x1001 |
| 110 | #define HUAWEI_PRODUCT_E220 0x1003 | 110 | #define HUAWEI_PRODUCT_E220 0x1003 |
| 111 | #define HUAWEI_PRODUCT_E220BIS 0x1004 | ||
| 111 | 112 | ||
| 112 | #define NOVATELWIRELESS_VENDOR_ID 0x1410 | 113 | #define NOVATELWIRELESS_VENDOR_ID 0x1410 |
| 113 | #define DELL_VENDOR_ID 0x413C | 114 | #define DELL_VENDOR_ID 0x413C |
| @@ -158,6 +159,7 @@ static struct usb_device_id option_ids[] = { | |||
| 158 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) }, | 159 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) }, |
| 159 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) }, | 160 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) }, |
| 160 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) }, | 161 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) }, |
| 162 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS) }, | ||
| 161 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */ | 163 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */ |
| 162 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */ | 164 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */ |
| 163 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */ | 165 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */ |
| @@ -176,6 +178,7 @@ static struct usb_device_id option_ids[] = { | |||
| 176 | { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */ | 178 | { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */ |
| 177 | { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */ | 179 | { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */ |
| 178 | { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */ | 180 | { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */ |
| 181 | { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */ | ||
| 179 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, | 182 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, |
| 180 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, | 183 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, |
| 181 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, | 184 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, |
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 833ada47fc54..64f3f66a7a35 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
| @@ -817,21 +817,6 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file, | |||
| 817 | __FUNCTION__, port->number, cmd, arg); | 817 | __FUNCTION__, port->number, cmd, arg); |
| 818 | 818 | ||
| 819 | switch (cmd) { | 819 | switch (cmd) { |
| 820 | case TCGETS: | ||
| 821 | if (kernel_termios_to_user_termios((struct ktermios __user *)arg, | ||
| 822 | port->tty->termios)) | ||
| 823 | return -EFAULT; | ||
| 824 | return 0; | ||
| 825 | |||
| 826 | case TCSETS: | ||
| 827 | case TCSETSW: /* FIXME: this is not the same! */ | ||
| 828 | case TCSETSF: /* FIXME: this is not the same! */ | ||
| 829 | if (user_termios_to_kernel_termios(port->tty->termios, | ||
| 830 | (struct ktermios __user *)arg)) | ||
| 831 | return -EFAULT; | ||
| 832 | oti6858_set_termios(port, NULL); | ||
| 833 | return 0; | ||
| 834 | |||
| 835 | case TCFLSH: | 820 | case TCFLSH: |
| 836 | /* FIXME */ | 821 | /* FIXME */ |
| 837 | return 0; | 822 | return 0; |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 2d92ce31018f..c6b78ba815ea 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -348,6 +348,13 @@ UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0101, | |||
| 348 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 348 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 349 | US_FL_FIX_CAPACITY), | 349 | US_FL_FIX_CAPACITY), |
| 350 | 350 | ||
| 351 | /* Reported by Ortwin Glueck <odi@odi.ch> */ | ||
| 352 | UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0110, | ||
| 353 | "NIKON", | ||
| 354 | "NIKON DSC D40", | ||
| 355 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 356 | US_FL_FIX_CAPACITY), | ||
| 357 | |||
| 351 | /* BENQ DC5330 | 358 | /* BENQ DC5330 |
| 352 | * Reported by Manuel Fombuena <mfombuena@ya.com> and | 359 | * Reported by Manuel Fombuena <mfombuena@ya.com> and |
| 353 | * Frank Copeland <fjc@thingy.apana.org.au> */ | 360 | * Frank Copeland <fjc@thingy.apana.org.au> */ |
| @@ -897,6 +904,22 @@ UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, | |||
| 897 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 904 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 898 | US_FL_FIX_CAPACITY ), | 905 | US_FL_FIX_CAPACITY ), |
| 899 | 906 | ||
| 907 | /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com> | ||
| 908 | * This USB MP3/AVI player device fails and disconnects if more than 128 | ||
| 909 | * sectors (64kB) are read/written in a single command, and may be present | ||
| 910 | * at least in the following products: | ||
| 911 | * "Magnex Digital Video Panel DVP 1800" | ||
| 912 | * "MP4 AIGO 4GB SLOT SD" | ||
| 913 | * "Teclast TL-C260 MP3" | ||
| 914 | * "i.Meizu PMP MP3/MP4" | ||
| 915 | * "Speed MV8 MP4 Audio Player" | ||
| 916 | */ | ||
| 917 | UNUSUAL_DEV( 0x071b, 0x3203, 0x0100, 0x0100, | ||
| 918 | "RockChip", | ||
| 919 | "ROCK MP3", | ||
| 920 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 921 | US_FL_MAX_SECTORS_64), | ||
| 922 | |||
| 900 | /* Reported by Olivier Blondeau <zeitoun@gmail.com> */ | 923 | /* Reported by Olivier Blondeau <zeitoun@gmail.com> */ |
| 901 | UNUSUAL_DEV( 0x0727, 0x0306, 0x0100, 0x0100, | 924 | UNUSUAL_DEV( 0x0727, 0x0306, 0x0100, 0x0100, |
| 902 | "ATMEL", | 925 | "ATMEL", |
| @@ -1393,6 +1416,13 @@ UNUSUAL_DEV( 0x0fce, 0xe030, 0x0000, 0x0000, | |||
| 1393 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1416 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1394 | US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ), | 1417 | US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ), |
| 1395 | 1418 | ||
| 1419 | /* Reported by Ricardo Barberis <ricardo@dattatec.com> */ | ||
| 1420 | UNUSUAL_DEV( 0x0fce, 0xe092, 0x0000, 0x0000, | ||
| 1421 | "Sony Ericsson", | ||
| 1422 | "P1i", | ||
| 1423 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 1424 | US_FL_IGNORE_RESIDUE ), | ||
| 1425 | |||
| 1396 | /* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */ | 1426 | /* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */ |
| 1397 | UNUSUAL_DEV( 0x0fce, 0xe031, 0x0000, 0x0000, | 1427 | UNUSUAL_DEV( 0x0fce, 0xe031, 0x0000, 0x0000, |
| 1398 | "Sony Ericsson", | 1428 | "Sony Ericsson", |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 16bc8d75e36e..b21d0dec9283 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
| @@ -924,10 +924,10 @@ calc_pll_params(int index, int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *re | |||
| 924 | if (m > pll->max_m) | 924 | if (m > pll->max_m) |
| 925 | m = pll->max_m - 1; | 925 | m = pll->max_m - 1; |
| 926 | for (testm = m - 1; testm <= m; testm++) { | 926 | for (testm = m - 1; testm <= m; testm++) { |
| 927 | f_out = calc_vclock3(index, m, n, p); | 927 | f_out = calc_vclock3(index, testm, n, p); |
| 928 | if (splitm(index, testm, &m1, &m2)) { | 928 | if (splitm(index, testm, &m1, &m2)) { |
| 929 | WRN_MSG("cannot split m = %d\n", m); | 929 | WRN_MSG("cannot split m = %d\n", |
| 930 | n++; | 930 | testm); |
| 931 | continue; | 931 | continue; |
| 932 | } | 932 | } |
| 933 | if (clock > f_out) | 933 | if (clock > f_out) |
diff --git a/fs/Kconfig b/fs/Kconfig index 58a0650293e1..f9eed6d79066 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -441,9 +441,6 @@ config OCFS2_FS | |||
| 441 | 441 | ||
| 442 | Note: Features which OCFS2 does not support yet: | 442 | Note: Features which OCFS2 does not support yet: |
| 443 | - extended attributes | 443 | - extended attributes |
| 444 | - shared writeable mmap | ||
| 445 | - loopback is supported, but data written will not | ||
| 446 | be cluster coherent. | ||
| 447 | - quotas | 444 | - quotas |
| 448 | - cluster aware flock | 445 | - cluster aware flock |
| 449 | - Directory change notification (F_NOTIFY) | 446 | - Directory change notification (F_NOTIFY) |
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c index a3684dcc76e7..6f8c96fb29eb 100644 --- a/fs/afs/mntpt.c +++ b/fs/afs/mntpt.c | |||
| @@ -235,8 +235,8 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
| 235 | err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, &afs_vfsmounts); | 235 | err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, &afs_vfsmounts); |
| 236 | switch (err) { | 236 | switch (err) { |
| 237 | case 0: | 237 | case 0: |
| 238 | mntput(nd->mnt); | ||
| 239 | dput(nd->dentry); | 238 | dput(nd->dentry); |
| 239 | mntput(nd->mnt); | ||
| 240 | nd->mnt = newmnt; | 240 | nd->mnt = newmnt; |
| 241 | nd->dentry = dget(newmnt->mnt_root); | 241 | nd->dentry = dget(newmnt->mnt_root); |
| 242 | schedule_delayed_work(&afs_mntpt_expiry_timer, | 242 | schedule_delayed_work(&afs_mntpt_expiry_timer, |
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 22cfdd61c060..9537316a0714 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -2578,8 +2578,11 @@ static int ext3_release_dquot(struct dquot *dquot) | |||
| 2578 | 2578 | ||
| 2579 | handle = ext3_journal_start(dquot_to_inode(dquot), | 2579 | handle = ext3_journal_start(dquot_to_inode(dquot), |
| 2580 | EXT3_QUOTA_DEL_BLOCKS(dquot->dq_sb)); | 2580 | EXT3_QUOTA_DEL_BLOCKS(dquot->dq_sb)); |
| 2581 | if (IS_ERR(handle)) | 2581 | if (IS_ERR(handle)) { |
| 2582 | /* Release dquot anyway to avoid endless cycle in dqput() */ | ||
| 2583 | dquot_release(dquot); | ||
| 2582 | return PTR_ERR(handle); | 2584 | return PTR_ERR(handle); |
| 2585 | } | ||
| 2583 | ret = dquot_release(dquot); | 2586 | ret = dquot_release(dquot); |
| 2584 | err = ext3_journal_stop(handle); | 2587 | err = ext3_journal_stop(handle); |
| 2585 | if (!ret) | 2588 | if (!ret) |
| @@ -2712,6 +2715,12 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, | |||
| 2712 | struct buffer_head *bh; | 2715 | struct buffer_head *bh; |
| 2713 | handle_t *handle = journal_current_handle(); | 2716 | handle_t *handle = journal_current_handle(); |
| 2714 | 2717 | ||
| 2718 | if (!handle) { | ||
| 2719 | printk(KERN_WARNING "EXT3-fs: Quota write (off=%Lu, len=%Lu)" | ||
| 2720 | " cancelled because transaction is not started.\n", | ||
| 2721 | (unsigned long long)off, (unsigned long long)len); | ||
| 2722 | return -EIO; | ||
| 2723 | } | ||
| 2715 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); | 2724 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); |
| 2716 | while (towrite > 0) { | 2725 | while (towrite > 0) { |
| 2717 | tocopy = sb->s_blocksize - offset < towrite ? | 2726 | tocopy = sb->s_blocksize - offset < towrite ? |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 4550b83ab1c9..3c1397fa83df 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -2698,8 +2698,11 @@ static int ext4_release_dquot(struct dquot *dquot) | |||
| 2698 | 2698 | ||
| 2699 | handle = ext4_journal_start(dquot_to_inode(dquot), | 2699 | handle = ext4_journal_start(dquot_to_inode(dquot), |
| 2700 | EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb)); | 2700 | EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb)); |
| 2701 | if (IS_ERR(handle)) | 2701 | if (IS_ERR(handle)) { |
| 2702 | /* Release dquot anyway to avoid endless cycle in dqput() */ | ||
| 2703 | dquot_release(dquot); | ||
| 2702 | return PTR_ERR(handle); | 2704 | return PTR_ERR(handle); |
| 2705 | } | ||
| 2703 | ret = dquot_release(dquot); | 2706 | ret = dquot_release(dquot); |
| 2704 | err = ext4_journal_stop(handle); | 2707 | err = ext4_journal_stop(handle); |
| 2705 | if (!ret) | 2708 | if (!ret) |
| @@ -2832,6 +2835,12 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type, | |||
| 2832 | struct buffer_head *bh; | 2835 | struct buffer_head *bh; |
| 2833 | handle_t *handle = journal_current_handle(); | 2836 | handle_t *handle = journal_current_handle(); |
| 2834 | 2837 | ||
| 2838 | if (!handle) { | ||
| 2839 | printk(KERN_WARNING "EXT4-fs: Quota write (off=%Lu, len=%Lu)" | ||
| 2840 | " cancelled because transaction is not started.\n", | ||
| 2841 | (unsigned long long)off, (unsigned long long)len); | ||
| 2842 | return -EIO; | ||
| 2843 | } | ||
| 2835 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); | 2844 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); |
| 2836 | while (towrite > 0) { | 2845 | while (towrite > 0) { |
| 2837 | tocopy = sb->s_blocksize - offset < towrite ? | 2846 | tocopy = sb->s_blocksize - offset < towrite ? |
diff --git a/fs/locks.c b/fs/locks.c index 50857d2d3404..c795eaaf6c4c 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -782,7 +782,7 @@ find_conflict: | |||
| 782 | if (request->fl_flags & FL_ACCESS) | 782 | if (request->fl_flags & FL_ACCESS) |
| 783 | goto out; | 783 | goto out; |
| 784 | locks_copy_lock(new_fl, request); | 784 | locks_copy_lock(new_fl, request); |
| 785 | locks_insert_lock(&inode->i_flock, new_fl); | 785 | locks_insert_lock(before, new_fl); |
| 786 | new_fl = NULL; | 786 | new_fl = NULL; |
| 787 | error = 0; | 787 | error = 0; |
| 788 | 788 | ||
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 0eb464a39aae..7011d62acfc8 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
| @@ -566,13 +566,23 @@ enum fsid_source fsid_source(struct svc_fh *fhp) | |||
| 566 | case FSID_DEV: | 566 | case FSID_DEV: |
| 567 | case FSID_ENCODE_DEV: | 567 | case FSID_ENCODE_DEV: |
| 568 | case FSID_MAJOR_MINOR: | 568 | case FSID_MAJOR_MINOR: |
| 569 | return FSIDSOURCE_DEV; | 569 | if (fhp->fh_export->ex_dentry->d_inode->i_sb->s_type->fs_flags |
| 570 | & FS_REQUIRES_DEV) | ||
| 571 | return FSIDSOURCE_DEV; | ||
| 572 | break; | ||
| 570 | case FSID_NUM: | 573 | case FSID_NUM: |
| 571 | return FSIDSOURCE_FSID; | ||
| 572 | default: | ||
| 573 | if (fhp->fh_export->ex_flags & NFSEXP_FSID) | 574 | if (fhp->fh_export->ex_flags & NFSEXP_FSID) |
| 574 | return FSIDSOURCE_FSID; | 575 | return FSIDSOURCE_FSID; |
| 575 | else | 576 | break; |
| 576 | return FSIDSOURCE_UUID; | 577 | default: |
| 578 | break; | ||
| 577 | } | 579 | } |
| 580 | /* either a UUID type filehandle, or the filehandle doesn't | ||
| 581 | * match the export. | ||
| 582 | */ | ||
| 583 | if (fhp->fh_export->ex_flags & NFSEXP_FSID) | ||
| 584 | return FSIDSOURCE_FSID; | ||
| 585 | if (fhp->fh_export->ex_uuid) | ||
| 586 | return FSIDSOURCE_UUID; | ||
| 587 | return FSIDSOURCE_DEV; | ||
| 578 | } | 588 | } |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index a0c2b253818b..7867151ebb83 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -115,7 +115,8 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, | |||
| 115 | 115 | ||
| 116 | exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts); | 116 | exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts); |
| 117 | if (IS_ERR(exp2)) { | 117 | if (IS_ERR(exp2)) { |
| 118 | err = PTR_ERR(exp2); | 118 | if (PTR_ERR(exp2) != -ENOENT) |
| 119 | err = PTR_ERR(exp2); | ||
| 119 | dput(mounts); | 120 | dput(mounts); |
| 120 | mntput(mnt); | 121 | mntput(mnt); |
| 121 | goto out; | 122 | goto out; |
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 4f517665c9a0..778a850b4634 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
| @@ -5602,6 +5602,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, | |||
| 5602 | clusters_to_del; | 5602 | clusters_to_del; |
| 5603 | spin_unlock(&OCFS2_I(inode)->ip_lock); | 5603 | spin_unlock(&OCFS2_I(inode)->ip_lock); |
| 5604 | le32_add_cpu(&fe->i_clusters, -clusters_to_del); | 5604 | le32_add_cpu(&fe->i_clusters, -clusters_to_del); |
| 5605 | inode->i_blocks = ocfs2_inode_sector_count(inode); | ||
| 5605 | 5606 | ||
| 5606 | status = ocfs2_trim_tree(inode, path, handle, tc, | 5607 | status = ocfs2_trim_tree(inode, path, handle, tc, |
| 5607 | clusters_to_del, &delete_blk); | 5608 | clusters_to_del, &delete_blk); |
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 460d440310f2..50cd8a209012 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
| @@ -855,6 +855,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp, | |||
| 855 | struct ocfs2_super *osb, loff_t pos, | 855 | struct ocfs2_super *osb, loff_t pos, |
| 856 | unsigned len, struct buffer_head *di_bh) | 856 | unsigned len, struct buffer_head *di_bh) |
| 857 | { | 857 | { |
| 858 | u32 cend; | ||
| 858 | struct ocfs2_write_ctxt *wc; | 859 | struct ocfs2_write_ctxt *wc; |
| 859 | 860 | ||
| 860 | wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS); | 861 | wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS); |
| @@ -862,7 +863,8 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp, | |||
| 862 | return -ENOMEM; | 863 | return -ENOMEM; |
| 863 | 864 | ||
| 864 | wc->w_cpos = pos >> osb->s_clustersize_bits; | 865 | wc->w_cpos = pos >> osb->s_clustersize_bits; |
| 865 | wc->w_clen = ocfs2_clusters_for_bytes(osb->sb, len); | 866 | cend = (pos + len - 1) >> osb->s_clustersize_bits; |
| 867 | wc->w_clen = cend - wc->w_cpos + 1; | ||
| 866 | get_bh(di_bh); | 868 | get_bh(di_bh); |
| 867 | wc->w_di_bh = di_bh; | 869 | wc->w_di_bh = di_bh; |
| 868 | 870 | ||
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 4ffa715be09c..7e34e66159c6 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -314,7 +314,6 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, | |||
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | i_size_write(inode, new_i_size); | 316 | i_size_write(inode, new_i_size); |
| 317 | inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size); | ||
| 318 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; | 317 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; |
| 319 | 318 | ||
| 320 | di = (struct ocfs2_dinode *) fe_bh->b_data; | 319 | di = (struct ocfs2_dinode *) fe_bh->b_data; |
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index f2fc9a795deb..c034b5129c1e 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
| @@ -81,8 +81,15 @@ static struct dentry *ocfs2_debugfs_root = NULL; | |||
| 81 | MODULE_AUTHOR("Oracle"); | 81 | MODULE_AUTHOR("Oracle"); |
| 82 | MODULE_LICENSE("GPL"); | 82 | MODULE_LICENSE("GPL"); |
| 83 | 83 | ||
| 84 | struct mount_options | ||
| 85 | { | ||
| 86 | unsigned long mount_opt; | ||
| 87 | unsigned int atime_quantum; | ||
| 88 | signed short slot; | ||
| 89 | }; | ||
| 90 | |||
| 84 | static int ocfs2_parse_options(struct super_block *sb, char *options, | 91 | static int ocfs2_parse_options(struct super_block *sb, char *options, |
| 85 | unsigned long *mount_opt, s16 *slot, | 92 | struct mount_options *mopt, |
| 86 | int is_remount); | 93 | int is_remount); |
| 87 | static void ocfs2_put_super(struct super_block *sb); | 94 | static void ocfs2_put_super(struct super_block *sb); |
| 88 | static int ocfs2_mount_volume(struct super_block *sb); | 95 | static int ocfs2_mount_volume(struct super_block *sb); |
| @@ -367,24 +374,23 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data) | |||
| 367 | { | 374 | { |
| 368 | int incompat_features; | 375 | int incompat_features; |
| 369 | int ret = 0; | 376 | int ret = 0; |
| 370 | unsigned long parsed_options; | 377 | struct mount_options parsed_options; |
| 371 | s16 slot; | ||
| 372 | struct ocfs2_super *osb = OCFS2_SB(sb); | 378 | struct ocfs2_super *osb = OCFS2_SB(sb); |
| 373 | 379 | ||
| 374 | if (!ocfs2_parse_options(sb, data, &parsed_options, &slot, 1)) { | 380 | if (!ocfs2_parse_options(sb, data, &parsed_options, 1)) { |
| 375 | ret = -EINVAL; | 381 | ret = -EINVAL; |
| 376 | goto out; | 382 | goto out; |
| 377 | } | 383 | } |
| 378 | 384 | ||
| 379 | if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) != | 385 | if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) != |
| 380 | (parsed_options & OCFS2_MOUNT_HB_LOCAL)) { | 386 | (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL)) { |
| 381 | ret = -EINVAL; | 387 | ret = -EINVAL; |
| 382 | mlog(ML_ERROR, "Cannot change heartbeat mode on remount\n"); | 388 | mlog(ML_ERROR, "Cannot change heartbeat mode on remount\n"); |
| 383 | goto out; | 389 | goto out; |
| 384 | } | 390 | } |
| 385 | 391 | ||
| 386 | if ((osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK) != | 392 | if ((osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK) != |
| 387 | (parsed_options & OCFS2_MOUNT_DATA_WRITEBACK)) { | 393 | (parsed_options.mount_opt & OCFS2_MOUNT_DATA_WRITEBACK)) { |
| 388 | ret = -EINVAL; | 394 | ret = -EINVAL; |
| 389 | mlog(ML_ERROR, "Cannot change data mode on remount\n"); | 395 | mlog(ML_ERROR, "Cannot change data mode on remount\n"); |
| 390 | goto out; | 396 | goto out; |
| @@ -435,7 +441,9 @@ unlock_osb: | |||
| 435 | 441 | ||
| 436 | /* Only save off the new mount options in case of a successful | 442 | /* Only save off the new mount options in case of a successful |
| 437 | * remount. */ | 443 | * remount. */ |
| 438 | osb->s_mount_opt = parsed_options; | 444 | osb->s_mount_opt = parsed_options.mount_opt; |
| 445 | osb->s_atime_quantum = parsed_options.atime_quantum; | ||
| 446 | osb->preferred_slot = parsed_options.slot; | ||
| 439 | } | 447 | } |
| 440 | out: | 448 | out: |
| 441 | return ret; | 449 | return ret; |
| @@ -547,8 +555,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
| 547 | { | 555 | { |
| 548 | struct dentry *root; | 556 | struct dentry *root; |
| 549 | int status, sector_size; | 557 | int status, sector_size; |
| 550 | unsigned long parsed_opt; | 558 | struct mount_options parsed_options; |
| 551 | s16 slot; | ||
| 552 | struct inode *inode = NULL; | 559 | struct inode *inode = NULL; |
| 553 | struct ocfs2_super *osb = NULL; | 560 | struct ocfs2_super *osb = NULL; |
| 554 | struct buffer_head *bh = NULL; | 561 | struct buffer_head *bh = NULL; |
| @@ -556,14 +563,14 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
| 556 | 563 | ||
| 557 | mlog_entry("%p, %p, %i", sb, data, silent); | 564 | mlog_entry("%p, %p, %i", sb, data, silent); |
| 558 | 565 | ||
| 559 | if (!ocfs2_parse_options(sb, data, &parsed_opt, &slot, 0)) { | 566 | if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) { |
| 560 | status = -EINVAL; | 567 | status = -EINVAL; |
| 561 | goto read_super_error; | 568 | goto read_super_error; |
| 562 | } | 569 | } |
| 563 | 570 | ||
| 564 | /* for now we only have one cluster/node, make sure we see it | 571 | /* for now we only have one cluster/node, make sure we see it |
| 565 | * in the heartbeat universe */ | 572 | * in the heartbeat universe */ |
| 566 | if (parsed_opt & OCFS2_MOUNT_HB_LOCAL) { | 573 | if (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL) { |
| 567 | if (!o2hb_check_local_node_heartbeating()) { | 574 | if (!o2hb_check_local_node_heartbeating()) { |
| 568 | status = -EINVAL; | 575 | status = -EINVAL; |
| 569 | goto read_super_error; | 576 | goto read_super_error; |
| @@ -585,8 +592,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
| 585 | } | 592 | } |
| 586 | brelse(bh); | 593 | brelse(bh); |
| 587 | bh = NULL; | 594 | bh = NULL; |
| 588 | osb->s_mount_opt = parsed_opt; | 595 | osb->s_mount_opt = parsed_options.mount_opt; |
| 589 | osb->preferred_slot = slot; | 596 | osb->s_atime_quantum = parsed_options.atime_quantum; |
| 597 | osb->preferred_slot = parsed_options.slot; | ||
| 590 | 598 | ||
| 591 | sb->s_magic = OCFS2_SUPER_MAGIC; | 599 | sb->s_magic = OCFS2_SUPER_MAGIC; |
| 592 | 600 | ||
| @@ -728,8 +736,7 @@ static struct file_system_type ocfs2_fs_type = { | |||
| 728 | 736 | ||
| 729 | static int ocfs2_parse_options(struct super_block *sb, | 737 | static int ocfs2_parse_options(struct super_block *sb, |
| 730 | char *options, | 738 | char *options, |
| 731 | unsigned long *mount_opt, | 739 | struct mount_options *mopt, |
| 732 | s16 *slot, | ||
| 733 | int is_remount) | 740 | int is_remount) |
| 734 | { | 741 | { |
| 735 | int status; | 742 | int status; |
| @@ -738,8 +745,9 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
| 738 | mlog_entry("remount: %d, options: \"%s\"\n", is_remount, | 745 | mlog_entry("remount: %d, options: \"%s\"\n", is_remount, |
| 739 | options ? options : "(none)"); | 746 | options ? options : "(none)"); |
| 740 | 747 | ||
| 741 | *mount_opt = 0; | 748 | mopt->mount_opt = 0; |
| 742 | *slot = OCFS2_INVALID_SLOT; | 749 | mopt->atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM; |
| 750 | mopt->slot = OCFS2_INVALID_SLOT; | ||
| 743 | 751 | ||
| 744 | if (!options) { | 752 | if (!options) { |
| 745 | status = 1; | 753 | status = 1; |
| @@ -749,7 +757,6 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
| 749 | while ((p = strsep(&options, ",")) != NULL) { | 757 | while ((p = strsep(&options, ",")) != NULL) { |
| 750 | int token, option; | 758 | int token, option; |
| 751 | substring_t args[MAX_OPT_ARGS]; | 759 | substring_t args[MAX_OPT_ARGS]; |
| 752 | struct ocfs2_super * osb = OCFS2_SB(sb); | ||
| 753 | 760 | ||
| 754 | if (!*p) | 761 | if (!*p) |
| 755 | continue; | 762 | continue; |
| @@ -757,10 +764,10 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
| 757 | token = match_token(p, tokens, args); | 764 | token = match_token(p, tokens, args); |
| 758 | switch (token) { | 765 | switch (token) { |
| 759 | case Opt_hb_local: | 766 | case Opt_hb_local: |
| 760 | *mount_opt |= OCFS2_MOUNT_HB_LOCAL; | 767 | mopt->mount_opt |= OCFS2_MOUNT_HB_LOCAL; |
| 761 | break; | 768 | break; |
| 762 | case Opt_hb_none: | 769 | case Opt_hb_none: |
| 763 | *mount_opt &= ~OCFS2_MOUNT_HB_LOCAL; | 770 | mopt->mount_opt &= ~OCFS2_MOUNT_HB_LOCAL; |
| 764 | break; | 771 | break; |
| 765 | case Opt_barrier: | 772 | case Opt_barrier: |
| 766 | if (match_int(&args[0], &option)) { | 773 | if (match_int(&args[0], &option)) { |
| @@ -768,27 +775,27 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
| 768 | goto bail; | 775 | goto bail; |
| 769 | } | 776 | } |
| 770 | if (option) | 777 | if (option) |
| 771 | *mount_opt |= OCFS2_MOUNT_BARRIER; | 778 | mopt->mount_opt |= OCFS2_MOUNT_BARRIER; |
| 772 | else | 779 | else |
| 773 | *mount_opt &= ~OCFS2_MOUNT_BARRIER; | 780 | mopt->mount_opt &= ~OCFS2_MOUNT_BARRIER; |
| 774 | break; | 781 | break; |
| 775 | case Opt_intr: | 782 | case Opt_intr: |
| 776 | *mount_opt &= ~OCFS2_MOUNT_NOINTR; | 783 | mopt->mount_opt &= ~OCFS2_MOUNT_NOINTR; |
| 777 | break; | 784 | break; |
| 778 | case Opt_nointr: | 785 | case Opt_nointr: |
| 779 | *mount_opt |= OCFS2_MOUNT_NOINTR; | 786 | mopt->mount_opt |= OCFS2_MOUNT_NOINTR; |
| 780 | break; | 787 | break; |
| 781 | case Opt_err_panic: | 788 | case Opt_err_panic: |
| 782 | *mount_opt |= OCFS2_MOUNT_ERRORS_PANIC; | 789 | mopt->mount_opt |= OCFS2_MOUNT_ERRORS_PANIC; |
| 783 | break; | 790 | break; |
| 784 | case Opt_err_ro: | 791 | case Opt_err_ro: |
| 785 | *mount_opt &= ~OCFS2_MOUNT_ERRORS_PANIC; | 792 | mopt->mount_opt &= ~OCFS2_MOUNT_ERRORS_PANIC; |
| 786 | break; | 793 | break; |
| 787 | case Opt_data_ordered: | 794 | case Opt_data_ordered: |
| 788 | *mount_opt &= ~OCFS2_MOUNT_DATA_WRITEBACK; | 795 | mopt->mount_opt &= ~OCFS2_MOUNT_DATA_WRITEBACK; |
| 789 | break; | 796 | break; |
| 790 | case Opt_data_writeback: | 797 | case Opt_data_writeback: |
| 791 | *mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK; | 798 | mopt->mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK; |
| 792 | break; | 799 | break; |
| 793 | case Opt_atime_quantum: | 800 | case Opt_atime_quantum: |
| 794 | if (match_int(&args[0], &option)) { | 801 | if (match_int(&args[0], &option)) { |
| @@ -796,9 +803,7 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
| 796 | goto bail; | 803 | goto bail; |
| 797 | } | 804 | } |
| 798 | if (option >= 0) | 805 | if (option >= 0) |
| 799 | osb->s_atime_quantum = option; | 806 | mopt->atime_quantum = option; |
| 800 | else | ||
| 801 | osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM; | ||
| 802 | break; | 807 | break; |
| 803 | case Opt_slot: | 808 | case Opt_slot: |
| 804 | option = 0; | 809 | option = 0; |
| @@ -807,7 +812,7 @@ static int ocfs2_parse_options(struct super_block *sb, | |||
| 807 | goto bail; | 812 | goto bail; |
| 808 | } | 813 | } |
| 809 | if (option) | 814 | if (option) |
| 810 | *slot = (s16)option; | 815 | mopt->slot = (s16)option; |
| 811 | break; | 816 | break; |
| 812 | default: | 817 | default: |
| 813 | mlog(ML_ERROR, | 818 | mlog(ML_ERROR, |
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index a5b0dfd89a17..0e4d37c93eea 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| 12 | #include <linux/stat.h> | 12 | #include <linux/stat.h> |
| 13 | #include <linux/completion.h> | 13 | #include <linux/completion.h> |
| 14 | #include <linux/poll.h> | ||
| 14 | #include <linux/file.h> | 15 | #include <linux/file.h> |
| 15 | #include <linux/limits.h> | 16 | #include <linux/limits.h> |
| 16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| @@ -232,7 +233,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t | |||
| 232 | static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts) | 233 | static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts) |
| 233 | { | 234 | { |
| 234 | struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode); | 235 | struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode); |
| 235 | unsigned int rv = 0; | 236 | unsigned int rv = DEFAULT_POLLMASK; |
| 236 | unsigned int (*poll)(struct file *, struct poll_table_struct *); | 237 | unsigned int (*poll)(struct file *, struct poll_table_struct *); |
| 237 | 238 | ||
| 238 | spin_lock(&pde->pde_unload_lock); | 239 | spin_lock(&pde->pde_unload_lock); |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 5b68dd3f191a..a005451930b7 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -1915,8 +1915,11 @@ static int reiserfs_release_dquot(struct dquot *dquot) | |||
| 1915 | ret = | 1915 | ret = |
| 1916 | journal_begin(&th, dquot->dq_sb, | 1916 | journal_begin(&th, dquot->dq_sb, |
| 1917 | REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb)); | 1917 | REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb)); |
| 1918 | if (ret) | 1918 | if (ret) { |
| 1919 | /* Release dquot anyway to avoid endless cycle in dqput() */ | ||
| 1920 | dquot_release(dquot); | ||
| 1919 | goto out; | 1921 | goto out; |
| 1922 | } | ||
| 1920 | ret = dquot_release(dquot); | 1923 | ret = dquot_release(dquot); |
| 1921 | err = | 1924 | err = |
| 1922 | journal_end(&th, dquot->dq_sb, | 1925 | journal_end(&th, dquot->dq_sb, |
| @@ -2067,6 +2070,12 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, | |||
| 2067 | size_t towrite = len; | 2070 | size_t towrite = len; |
| 2068 | struct buffer_head tmp_bh, *bh; | 2071 | struct buffer_head tmp_bh, *bh; |
| 2069 | 2072 | ||
| 2073 | if (!current->journal_info) { | ||
| 2074 | printk(KERN_WARNING "reiserfs: Quota write (off=%Lu, len=%Lu)" | ||
| 2075 | " cancelled because transaction is not started.\n", | ||
| 2076 | (unsigned long long)off, (unsigned long long)len); | ||
| 2077 | return -EIO; | ||
| 2078 | } | ||
| 2070 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); | 2079 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); |
| 2071 | while (towrite > 0) { | 2080 | while (towrite > 0) { |
| 2072 | tocopy = sb->s_blocksize - offset < towrite ? | 2081 | tocopy = sb->s_blocksize - offset < towrite ? |
| @@ -2098,7 +2107,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, | |||
| 2098 | data += tocopy; | 2107 | data += tocopy; |
| 2099 | blk++; | 2108 | blk++; |
| 2100 | } | 2109 | } |
| 2101 | out: | 2110 | out: |
| 2102 | if (len == towrite) | 2111 | if (len == towrite) |
| 2103 | return err; | 2112 | return err; |
| 2104 | if (inode->i_size < off + len - towrite) | 2113 | if (inode->i_size < off + len - towrite) |
diff --git a/fs/select.c b/fs/select.c index a974082b0824..46dca31c607a 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -26,8 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 28 | 28 | ||
| 29 | #define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) | ||
| 30 | |||
| 31 | struct poll_table_page { | 29 | struct poll_table_page { |
| 32 | struct poll_table_page * next; | 30 | struct poll_table_page * next; |
| 33 | struct poll_table_entry * entry; | 31 | struct poll_table_entry * entry; |
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h index b4acc7f3c374..e6ea293f303c 100644 --- a/fs/xfs/linux-2.6/kmem.h +++ b/fs/xfs/linux-2.6/kmem.h | |||
| @@ -103,7 +103,7 @@ extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast); | |||
| 103 | static inline int | 103 | static inline int |
| 104 | kmem_shake_allow(gfp_t gfp_mask) | 104 | kmem_shake_allow(gfp_t gfp_mask) |
| 105 | { | 105 | { |
| 106 | return (gfp_mask & __GFP_WAIT); | 106 | return (gfp_mask & __GFP_WAIT) != 0; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | #endif /* __XFS_SUPPORT_KMEM_H__ */ | 109 | #endif /* __XFS_SUPPORT_KMEM_H__ */ |
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index fd4105d662e0..d9c40fe64195 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
| @@ -652,7 +652,7 @@ xfs_probe_cluster( | |||
| 652 | 652 | ||
| 653 | for (i = 0; i < pagevec_count(&pvec); i++) { | 653 | for (i = 0; i < pagevec_count(&pvec); i++) { |
| 654 | struct page *page = pvec.pages[i]; | 654 | struct page *page = pvec.pages[i]; |
| 655 | size_t pg_offset, len = 0; | 655 | size_t pg_offset, pg_len = 0; |
| 656 | 656 | ||
| 657 | if (tindex == tlast) { | 657 | if (tindex == tlast) { |
| 658 | pg_offset = | 658 | pg_offset = |
| @@ -665,16 +665,16 @@ xfs_probe_cluster( | |||
| 665 | pg_offset = PAGE_CACHE_SIZE; | 665 | pg_offset = PAGE_CACHE_SIZE; |
| 666 | 666 | ||
| 667 | if (page->index == tindex && !TestSetPageLocked(page)) { | 667 | if (page->index == tindex && !TestSetPageLocked(page)) { |
| 668 | len = xfs_probe_page(page, pg_offset, mapped); | 668 | pg_len = xfs_probe_page(page, pg_offset, mapped); |
| 669 | unlock_page(page); | 669 | unlock_page(page); |
| 670 | } | 670 | } |
| 671 | 671 | ||
| 672 | if (!len) { | 672 | if (!pg_len) { |
| 673 | done = 1; | 673 | done = 1; |
| 674 | break; | 674 | break; |
| 675 | } | 675 | } |
| 676 | 676 | ||
| 677 | total += len; | 677 | total += pg_len; |
| 678 | tindex++; | 678 | tindex++; |
| 679 | } | 679 | } |
| 680 | 680 | ||
diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c index bb72c3d4141f..81565dea9af7 100644 --- a/fs/xfs/linux-2.6/xfs_globals.c +++ b/fs/xfs/linux-2.6/xfs_globals.c | |||
| @@ -46,7 +46,7 @@ xfs_param_t xfs_params = { | |||
| 46 | .inherit_nosym = { 0, 0, 1 }, | 46 | .inherit_nosym = { 0, 0, 1 }, |
| 47 | .rotorstep = { 1, 1, 255 }, | 47 | .rotorstep = { 1, 1, 255 }, |
| 48 | .inherit_nodfrg = { 0, 1, 1 }, | 48 | .inherit_nodfrg = { 0, 1, 1 }, |
| 49 | .fstrm_timer = { 1, 50, 3600*100}, | 49 | .fstrm_timer = { 1, 30*100, 3600*100}, |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | /* | 52 | /* |
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 2d274b23ade5..6ff0f4de1630 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
| @@ -120,7 +120,8 @@ xfs_Gqm_init(void) | |||
| 120 | * Initialize the dquot hash tables. | 120 | * Initialize the dquot hash tables. |
| 121 | */ | 121 | */ |
| 122 | udqhash = kmem_zalloc_greedy(&hsize, | 122 | udqhash = kmem_zalloc_greedy(&hsize, |
| 123 | XFS_QM_HASHSIZE_LOW, XFS_QM_HASHSIZE_HIGH, | 123 | XFS_QM_HASHSIZE_LOW * sizeof(xfs_dqhash_t), |
| 124 | XFS_QM_HASHSIZE_HIGH * sizeof(xfs_dqhash_t), | ||
| 124 | KM_SLEEP | KM_MAYFAIL | KM_LARGE); | 125 | KM_SLEEP | KM_MAYFAIL | KM_LARGE); |
| 125 | gdqhash = kmem_zalloc(hsize, KM_SLEEP | KM_LARGE); | 126 | gdqhash = kmem_zalloc(hsize, KM_SLEEP | KM_LARGE); |
| 126 | hsize /= sizeof(xfs_dqhash_t); | 127 | hsize /= sizeof(xfs_dqhash_t); |
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h index a27a7c8c0526..855da0408647 100644 --- a/fs/xfs/support/debug.h +++ b/fs/xfs/support/debug.h | |||
| @@ -34,10 +34,10 @@ extern void cmn_err(int, char *, ...) | |||
| 34 | extern void assfail(char *expr, char *f, int l); | 34 | extern void assfail(char *expr, char *f, int l); |
| 35 | 35 | ||
| 36 | #define ASSERT_ALWAYS(expr) \ | 36 | #define ASSERT_ALWAYS(expr) \ |
| 37 | (unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) | 37 | (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) |
| 38 | 38 | ||
| 39 | #ifndef DEBUG | 39 | #ifndef DEBUG |
| 40 | # define ASSERT(expr) ((void)0) | 40 | #define ASSERT(expr) ((void)0) |
| 41 | 41 | ||
| 42 | #ifndef STATIC | 42 | #ifndef STATIC |
| 43 | # define STATIC static noinline | 43 | # define STATIC static noinline |
| @@ -49,8 +49,10 @@ extern void assfail(char *expr, char *f, int l); | |||
| 49 | 49 | ||
| 50 | #else /* DEBUG */ | 50 | #else /* DEBUG */ |
| 51 | 51 | ||
| 52 | # define ASSERT(expr) ASSERT_ALWAYS(expr) | 52 | #include <linux/random.h> |
| 53 | # include <linux/random.h> | 53 | |
| 54 | #define ASSERT(expr) \ | ||
| 55 | (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) | ||
| 54 | 56 | ||
| 55 | #ifndef STATIC | 57 | #ifndef STATIC |
| 56 | # define STATIC noinline | 58 | # define STATIC noinline |
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index aea37df4aa62..26d09e2e1a7f 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c | |||
| @@ -1975,7 +1975,6 @@ xfs_da_do_buf( | |||
| 1975 | error = mappedbno == -2 ? 0 : XFS_ERROR(EFSCORRUPTED); | 1975 | error = mappedbno == -2 ? 0 : XFS_ERROR(EFSCORRUPTED); |
| 1976 | if (unlikely(error == EFSCORRUPTED)) { | 1976 | if (unlikely(error == EFSCORRUPTED)) { |
| 1977 | if (xfs_error_level >= XFS_ERRLEVEL_LOW) { | 1977 | if (xfs_error_level >= XFS_ERRLEVEL_LOW) { |
| 1978 | int i; | ||
| 1979 | cmn_err(CE_ALERT, "xfs_da_do_buf: bno %lld\n", | 1978 | cmn_err(CE_ALERT, "xfs_da_do_buf: bno %lld\n", |
| 1980 | (long long)bno); | 1979 | (long long)bno); |
| 1981 | cmn_err(CE_ALERT, "dir: inode %lld\n", | 1980 | cmn_err(CE_ALERT, "dir: inode %lld\n", |
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 9d4c4fbeb3ee..9bfb69e1e885 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
| @@ -2185,13 +2185,13 @@ xlog_state_do_callback( | |||
| 2185 | } | 2185 | } |
| 2186 | cb = iclog->ic_callback; | 2186 | cb = iclog->ic_callback; |
| 2187 | 2187 | ||
| 2188 | while (cb != 0) { | 2188 | while (cb) { |
| 2189 | iclog->ic_callback_tail = &(iclog->ic_callback); | 2189 | iclog->ic_callback_tail = &(iclog->ic_callback); |
| 2190 | iclog->ic_callback = NULL; | 2190 | iclog->ic_callback = NULL; |
| 2191 | LOG_UNLOCK(log, s); | 2191 | LOG_UNLOCK(log, s); |
| 2192 | 2192 | ||
| 2193 | /* perform callbacks in the order given */ | 2193 | /* perform callbacks in the order given */ |
| 2194 | for (; cb != 0; cb = cb_next) { | 2194 | for (; cb; cb = cb_next) { |
| 2195 | cb_next = cb->cb_next; | 2195 | cb_next = cb->cb_next; |
| 2196 | cb->cb_func(cb->cb_arg, aborted); | 2196 | cb->cb_func(cb->cb_arg, aborted); |
| 2197 | } | 2197 | } |
| @@ -2202,7 +2202,7 @@ xlog_state_do_callback( | |||
| 2202 | loopdidcallbacks++; | 2202 | loopdidcallbacks++; |
| 2203 | funcdidcallbacks++; | 2203 | funcdidcallbacks++; |
| 2204 | 2204 | ||
| 2205 | ASSERT(iclog->ic_callback == 0); | 2205 | ASSERT(iclog->ic_callback == NULL); |
| 2206 | if (!(iclog->ic_state & XLOG_STATE_IOERROR)) | 2206 | if (!(iclog->ic_state & XLOG_STATE_IOERROR)) |
| 2207 | iclog->ic_state = XLOG_STATE_DIRTY; | 2207 | iclog->ic_state = XLOG_STATE_DIRTY; |
| 2208 | 2208 | ||
| @@ -3242,10 +3242,10 @@ xlog_ticket_put(xlog_t *log, | |||
| 3242 | #else | 3242 | #else |
| 3243 | /* When we debug, it is easier if tickets are cycled */ | 3243 | /* When we debug, it is easier if tickets are cycled */ |
| 3244 | ticket->t_next = NULL; | 3244 | ticket->t_next = NULL; |
| 3245 | if (log->l_tail != 0) { | 3245 | if (log->l_tail) { |
| 3246 | log->l_tail->t_next = ticket; | 3246 | log->l_tail->t_next = ticket; |
| 3247 | } else { | 3247 | } else { |
| 3248 | ASSERT(log->l_freelist == 0); | 3248 | ASSERT(log->l_freelist == NULL); |
| 3249 | log->l_freelist = ticket; | 3249 | log->l_freelist = ticket; |
| 3250 | } | 3250 | } |
| 3251 | log->l_tail = ticket; | 3251 | log->l_tail = ticket; |
| @@ -3463,7 +3463,7 @@ xlog_verify_iclog(xlog_t *log, | |||
| 3463 | s = LOG_LOCK(log); | 3463 | s = LOG_LOCK(log); |
| 3464 | icptr = log->l_iclog; | 3464 | icptr = log->l_iclog; |
| 3465 | for (i=0; i < log->l_iclog_bufs; i++) { | 3465 | for (i=0; i < log->l_iclog_bufs; i++) { |
| 3466 | if (icptr == 0) | 3466 | if (icptr == NULL) |
| 3467 | xlog_panic("xlog_verify_iclog: invalid ptr"); | 3467 | xlog_panic("xlog_verify_iclog: invalid ptr"); |
| 3468 | icptr = icptr->ic_next; | 3468 | icptr = icptr->ic_next; |
| 3469 | } | 3469 | } |
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index fddbb091a86f..8ae6e8e5f3db 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -1366,7 +1366,7 @@ xlog_recover_add_to_cont_trans( | |||
| 1366 | int old_len; | 1366 | int old_len; |
| 1367 | 1367 | ||
| 1368 | item = trans->r_itemq; | 1368 | item = trans->r_itemq; |
| 1369 | if (item == 0) { | 1369 | if (item == NULL) { |
| 1370 | /* finish copying rest of trans header */ | 1370 | /* finish copying rest of trans header */ |
| 1371 | xlog_recover_add_item(&trans->r_itemq); | 1371 | xlog_recover_add_item(&trans->r_itemq); |
| 1372 | ptr = (xfs_caddr_t) &trans->r_theader + | 1372 | ptr = (xfs_caddr_t) &trans->r_theader + |
| @@ -1412,7 +1412,7 @@ xlog_recover_add_to_trans( | |||
| 1412 | if (!len) | 1412 | if (!len) |
| 1413 | return 0; | 1413 | return 0; |
| 1414 | item = trans->r_itemq; | 1414 | item = trans->r_itemq; |
| 1415 | if (item == 0) { | 1415 | if (item == NULL) { |
| 1416 | ASSERT(*(uint *)dp == XFS_TRANS_HEADER_MAGIC); | 1416 | ASSERT(*(uint *)dp == XFS_TRANS_HEADER_MAGIC); |
| 1417 | if (len == sizeof(xfs_trans_header_t)) | 1417 | if (len == sizeof(xfs_trans_header_t)) |
| 1418 | xlog_recover_add_item(&trans->r_itemq); | 1418 | xlog_recover_add_item(&trans->r_itemq); |
| @@ -1467,12 +1467,12 @@ xlog_recover_unlink_tid( | |||
| 1467 | xlog_recover_t *tp; | 1467 | xlog_recover_t *tp; |
| 1468 | int found = 0; | 1468 | int found = 0; |
| 1469 | 1469 | ||
| 1470 | ASSERT(trans != 0); | 1470 | ASSERT(trans != NULL); |
| 1471 | if (trans == *q) { | 1471 | if (trans == *q) { |
| 1472 | *q = (*q)->r_next; | 1472 | *q = (*q)->r_next; |
| 1473 | } else { | 1473 | } else { |
| 1474 | tp = *q; | 1474 | tp = *q; |
| 1475 | while (tp != 0) { | 1475 | while (tp) { |
| 1476 | if (tp->r_next == trans) { | 1476 | if (tp->r_next == trans) { |
| 1477 | found = 1; | 1477 | found = 1; |
| 1478 | break; | 1478 | break; |
| @@ -1495,7 +1495,7 @@ xlog_recover_insert_item_backq( | |||
| 1495 | xlog_recover_item_t **q, | 1495 | xlog_recover_item_t **q, |
| 1496 | xlog_recover_item_t *item) | 1496 | xlog_recover_item_t *item) |
| 1497 | { | 1497 | { |
| 1498 | if (*q == 0) { | 1498 | if (*q == NULL) { |
| 1499 | item->ri_prev = item->ri_next = item; | 1499 | item->ri_prev = item->ri_next = item; |
| 1500 | *q = item; | 1500 | *q = item; |
| 1501 | } else { | 1501 | } else { |
| @@ -1899,7 +1899,7 @@ xlog_recover_do_reg_buffer( | |||
| 1899 | break; | 1899 | break; |
| 1900 | nbits = xfs_contig_bits(data_map, map_size, bit); | 1900 | nbits = xfs_contig_bits(data_map, map_size, bit); |
| 1901 | ASSERT(nbits > 0); | 1901 | ASSERT(nbits > 0); |
| 1902 | ASSERT(item->ri_buf[i].i_addr != 0); | 1902 | ASSERT(item->ri_buf[i].i_addr != NULL); |
| 1903 | ASSERT(item->ri_buf[i].i_len % XFS_BLI_CHUNK == 0); | 1903 | ASSERT(item->ri_buf[i].i_len % XFS_BLI_CHUNK == 0); |
| 1904 | ASSERT(XFS_BUF_COUNT(bp) >= | 1904 | ASSERT(XFS_BUF_COUNT(bp) >= |
| 1905 | ((uint)bit << XFS_BLI_SHIFT)+(nbits<<XFS_BLI_SHIFT)); | 1905 | ((uint)bit << XFS_BLI_SHIFT)+(nbits<<XFS_BLI_SHIFT)); |
diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h index 3769e6bd63b1..33dca30a3c45 100644 --- a/include/asm-generic/termios.h +++ b/include/asm-generic/termios.h | |||
| @@ -63,6 +63,8 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio, | |||
| 63 | 63 | ||
| 64 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios)) | 64 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios)) |
| 65 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios)) | 65 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios)) |
| 66 | #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) | ||
| 67 | #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) | ||
| 66 | 68 | ||
| 67 | #endif /* __ARCH_TERMIO_GETPUT */ | 69 | #endif /* __ARCH_TERMIO_GETPUT */ |
| 68 | 70 | ||
diff --git a/include/asm-m32r/assembler.h b/include/asm-m32r/assembler.h index 47041d19d4a8..26351539b5ff 100644 --- a/include/asm-m32r/assembler.h +++ b/include/asm-m32r/assembler.h | |||
| @@ -52,27 +52,27 @@ | |||
| 52 | .endm | 52 | .endm |
| 53 | 53 | ||
| 54 | #if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104)) | 54 | #if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104)) |
| 55 | #define STI(reg) STI_M reg | 55 | #define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg |
| 56 | .macro STI_M reg | 56 | .macro ENABLE_INTERRUPTS reg |
| 57 | setpsw #0x40 -> nop | 57 | setpsw #0x40 -> nop |
| 58 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). | 58 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). |
| 59 | .endm | 59 | .endm |
| 60 | 60 | ||
| 61 | #define CLI(reg) CLI_M reg | 61 | #define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg |
| 62 | .macro CLI_M reg | 62 | .macro DISABLE_INTERRUPTS reg |
| 63 | clrpsw #0x40 -> nop | 63 | clrpsw #0x40 -> nop |
| 64 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). | 64 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). |
| 65 | .endm | 65 | .endm |
| 66 | #else /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */ | 66 | #else /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */ |
| 67 | #define STI(reg) STI_M reg | 67 | #define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg |
| 68 | .macro STI_M reg | 68 | .macro ENABLE_INTERRUPTS reg |
| 69 | mvfc \reg, psw | 69 | mvfc \reg, psw |
| 70 | or3 \reg, \reg, #0x0040 | 70 | or3 \reg, \reg, #0x0040 |
| 71 | mvtc \reg, psw | 71 | mvtc \reg, psw |
| 72 | .endm | 72 | .endm |
| 73 | 73 | ||
| 74 | #define CLI(reg) CLI_M reg | 74 | #define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg |
| 75 | .macro CLI_M reg | 75 | .macro DISABLE_INTERRUPTS reg |
| 76 | mvfc \reg, psw | 76 | mvfc \reg, psw |
| 77 | and3 \reg, \reg, #0xffbf | 77 | and3 \reg, \reg, #0xffbf |
| 78 | mvtc \reg, psw | 78 | mvtc \reg, psw |
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h index decfc59907c7..214b44b40757 100644 --- a/include/asm-m32r/m32r.h +++ b/include/asm-m32r/m32r.h | |||
| @@ -22,12 +22,26 @@ | |||
| 22 | #include <asm/m32700ut/m32700ut_pld.h> | 22 | #include <asm/m32700ut/m32700ut_pld.h> |
| 23 | #include <asm/m32700ut/m32700ut_lan.h> | 23 | #include <asm/m32700ut/m32700ut_lan.h> |
| 24 | #include <asm/m32700ut/m32700ut_lcd.h> | 24 | #include <asm/m32700ut/m32700ut_lcd.h> |
| 25 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
| 26 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
| 27 | #define M32R_INT1ICU_IRQ_BASE M32700UT_PLD_IRQ_BASE | ||
| 28 | #define M32R_INT0ICU_ISTS M32700UT_LAN_ICUISTS | ||
| 29 | #define M32R_INT0ICU_IRQ_BASE M32700UT_LAN_PLD_IRQ_BASE | ||
| 30 | #define M32R_INT2ICU_ISTS M32700UT_LCD_ICUISTS | ||
| 31 | #define M32R_INT2ICU_IRQ_BASE M32700UT_LCD_PLD_IRQ_BASE | ||
| 25 | #endif /* CONFIG_PLAT_M32700UT */ | 32 | #endif /* CONFIG_PLAT_M32700UT */ |
| 26 | 33 | ||
| 27 | #if defined(CONFIG_PLAT_OPSPUT) | 34 | #if defined(CONFIG_PLAT_OPSPUT) |
| 28 | #include <asm/opsput/opsput_pld.h> | 35 | #include <asm/opsput/opsput_pld.h> |
| 29 | #include <asm/opsput/opsput_lan.h> | 36 | #include <asm/opsput/opsput_lan.h> |
| 30 | #include <asm/opsput/opsput_lcd.h> | 37 | #include <asm/opsput/opsput_lcd.h> |
| 38 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
| 39 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
| 40 | #define M32R_INT1ICU_IRQ_BASE OPSPUT_PLD_IRQ_BASE | ||
| 41 | #define M32R_INT0ICU_ISTS OPSPUT_LAN_ICUISTS | ||
| 42 | #define M32R_INT0ICU_IRQ_BASE OPSPUT_LAN_PLD_IRQ_BASE | ||
| 43 | #define M32R_INT2ICU_ISTS OPSPUT_LCD_ICUISTS | ||
| 44 | #define M32R_INT2ICU_IRQ_BASE OPSPUT_LCD_PLD_IRQ_BASE | ||
| 31 | #endif /* CONFIG_PLAT_OPSPUT */ | 45 | #endif /* CONFIG_PLAT_OPSPUT */ |
| 32 | 46 | ||
| 33 | #if defined(CONFIG_PLAT_MAPPI2) | 47 | #if defined(CONFIG_PLAT_MAPPI2) |
| @@ -40,10 +54,16 @@ | |||
| 40 | 54 | ||
| 41 | #if defined(CONFIG_PLAT_USRV) | 55 | #if defined(CONFIG_PLAT_USRV) |
| 42 | #include <asm/m32700ut/m32700ut_pld.h> | 56 | #include <asm/m32700ut/m32700ut_pld.h> |
| 57 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
| 58 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
| 59 | #define M32R_INT1ICU_IRQ_BASE M32700UT_PLD_IRQ_BASE | ||
| 43 | #endif | 60 | #endif |
| 44 | 61 | ||
| 45 | #if defined(CONFIG_PLAT_M32104UT) | 62 | #if defined(CONFIG_PLAT_M32104UT) |
| 46 | #include <asm/m32104ut/m32104ut_pld.h> | 63 | #include <asm/m32104ut/m32104ut_pld.h> |
| 64 | /* for ei_handler:linux/arch/m32r/kernel/entry.S */ | ||
| 65 | #define M32R_INT1ICU_ISTS PLD_ICUISTS | ||
| 66 | #define M32R_INT1ICU_IRQ_BASE M32104UT_PLD_IRQ_BASE | ||
| 47 | #endif /* CONFIG_PLAT_M32104 */ | 67 | #endif /* CONFIG_PLAT_M32104 */ |
| 48 | 68 | ||
| 49 | /* | 69 | /* |
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index fdbb60e6a0d4..a30fe9c64143 100644 --- a/include/asm-m68k/unistd.h +++ b/include/asm-m68k/unistd.h | |||
| @@ -313,10 +313,20 @@ | |||
| 313 | #define __NR_tee 308 | 313 | #define __NR_tee 308 |
| 314 | #define __NR_vmsplice 309 | 314 | #define __NR_vmsplice 309 |
| 315 | #define __NR_move_pages 310 | 315 | #define __NR_move_pages 310 |
| 316 | #define __NR_sched_setaffinity 311 | ||
| 317 | #define __NR_sched_getaffinity 312 | ||
| 318 | #define __NR_kexec_load 313 | ||
| 319 | #define __NR_getcpu 314 | ||
| 320 | #define __NR_epoll_pwait 315 | ||
| 321 | #define __NR_utimensat 316 | ||
| 322 | #define __NR_signalfd 317 | ||
| 323 | #define __NR_timerfd 318 | ||
| 324 | #define __NR_eventfd 319 | ||
| 325 | #define __NR_fallocate 320 | ||
| 316 | 326 | ||
| 317 | #ifdef __KERNEL__ | 327 | #ifdef __KERNEL__ |
| 318 | 328 | ||
| 319 | #define NR_syscalls 311 | 329 | #define NR_syscalls 321 |
| 320 | 330 | ||
| 321 | #define __ARCH_WANT_IPC_PARSE_VERSION | 331 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 322 | #define __ARCH_WANT_OLD_READDIR | 332 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h index 82e03195f325..eb1b566793fe 100644 --- a/include/asm-m68knommu/unistd.h +++ b/include/asm-m68knommu/unistd.h | |||
| @@ -314,10 +314,20 @@ | |||
| 314 | #define __NR_tee 308 | 314 | #define __NR_tee 308 |
| 315 | #define __NR_vmsplice 309 | 315 | #define __NR_vmsplice 309 |
| 316 | #define __NR_move_pages 310 | 316 | #define __NR_move_pages 310 |
| 317 | #define __NR_sched_setaffinity 311 | ||
| 318 | #define __NR_sched_getaffinity 312 | ||
| 319 | #define __NR_kexec_load 313 | ||
| 320 | #define __NR_getcpu 314 | ||
| 321 | #define __NR_epoll_pwait 315 | ||
| 322 | #define __NR_utimensat 316 | ||
| 323 | #define __NR_signalfd 317 | ||
| 324 | #define __NR_timerfd 318 | ||
| 325 | #define __NR_eventfd 319 | ||
| 326 | #define __NR_fallocate 320 | ||
| 317 | 327 | ||
| 318 | #ifdef __KERNEL__ | 328 | #ifdef __KERNEL__ |
| 319 | 329 | ||
| 320 | #define NR_syscalls 311 | 330 | #define NR_syscalls 321 |
| 321 | 331 | ||
| 322 | #define __ARCH_WANT_IPC_PARSE_VERSION | 332 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 323 | #define __ARCH_WANT_OLD_READDIR | 333 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h index 918a4894b587..6a5fa32f615b 100644 --- a/include/asm-mips/hazards.h +++ b/include/asm-mips/hazards.h | |||
| @@ -172,6 +172,7 @@ ASMMACRO(tlb_probe_hazard, | |||
| 172 | nop; nop; nop | 172 | nop; nop; nop |
| 173 | ) | 173 | ) |
| 174 | ASMMACRO(irq_enable_hazard, | 174 | ASMMACRO(irq_enable_hazard, |
| 175 | _ssnop; _ssnop; _ssnop; | ||
| 175 | ) | 176 | ) |
| 176 | ASMMACRO(irq_disable_hazard, | 177 | ASMMACRO(irq_disable_hazard, |
| 177 | nop; nop; nop | 178 | nop; nop; nop |
diff --git a/include/asm-mips/ioctls.h b/include/asm-mips/ioctls.h index 92f6c36aac4d..5097cbf183a9 100644 --- a/include/asm-mips/ioctls.h +++ b/include/asm-mips/ioctls.h | |||
| @@ -77,6 +77,10 @@ | |||
| 77 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | 77 | #define TIOCSBRK 0x5427 /* BSD compatibility */ |
| 78 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | 78 | #define TIOCCBRK 0x5428 /* BSD compatibility */ |
| 79 | #define TIOCGSID 0x7416 /* Return the session ID of FD */ | 79 | #define TIOCGSID 0x7416 /* Return the session ID of FD */ |
| 80 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
| 81 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
| 82 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
| 83 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
| 80 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | 84 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ |
| 81 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | 85 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ |
| 82 | 86 | ||
diff --git a/include/asm-mips/mach-ocelot/mach-gt64120.h b/include/asm-mips/mach-ocelot/mach-gt64120.h deleted file mode 100644 index a62ecb53c751..000000000000 --- a/include/asm-mips/mach-ocelot/mach-gt64120.h +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2001 MontaVista Software Inc. | ||
| 3 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms of the GNU General Public License as published by the | ||
| 7 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 8 | * option) any later version. | ||
| 9 | */ | ||
| 10 | #ifndef _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H | ||
| 11 | #define _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H | ||
| 12 | |||
| 13 | /* | ||
| 14 | * PCI address allocation | ||
| 15 | */ | ||
| 16 | #define GT_PCI_MEM_BASE (0x22000000UL) | ||
| 17 | #define GT_PCI_MEM_SIZE GT_DEF_PCI0_MEM0_SIZE | ||
| 18 | #define GT_PCI_IO_BASE (0x20000000UL) | ||
| 19 | #define GT_PCI_IO_SIZE GT_DEF_PCI0_IO_SIZE | ||
| 20 | |||
| 21 | extern unsigned long gt64120_base; | ||
| 22 | |||
| 23 | #define GT64120_BASE (gt64120_base) | ||
| 24 | |||
| 25 | /* | ||
| 26 | * GT timer irq | ||
| 27 | */ | ||
| 28 | #define GT_TIMER 6 | ||
| 29 | |||
| 30 | #endif /* _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H */ | ||
diff --git a/include/asm-mips/sibyte/bcm1480_regs.h b/include/asm-mips/sibyte/bcm1480_regs.h index 2738c1366f66..c34d36b6b8c2 100644 --- a/include/asm-mips/sibyte/bcm1480_regs.h +++ b/include/asm-mips/sibyte/bcm1480_regs.h | |||
| @@ -227,10 +227,15 @@ | |||
| 227 | (A_BCM1480_DUART(chan) + \ | 227 | (A_BCM1480_DUART(chan) + \ |
| 228 | BCM1480_DUART_CHANREG_SPACING * 3 + (reg)) | 228 | BCM1480_DUART_CHANREG_SPACING * 3 + (reg)) |
| 229 | 229 | ||
| 230 | #define DUART_IMRISR_SPACING 0x20 | ||
| 231 | #define DUART_INCHNG_SPACING 0x10 | ||
| 232 | |||
| 230 | #define R_BCM1480_DUART_IMRREG(chan) \ | 233 | #define R_BCM1480_DUART_IMRREG(chan) \ |
| 231 | (R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING) | 234 | (R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING) |
| 232 | #define R_BCM1480_DUART_ISRREG(chan) \ | 235 | #define R_BCM1480_DUART_ISRREG(chan) \ |
| 233 | (R_DUART_ISR_A + ((chan) & 1) * DUART_IMRISR_SPACING) | 236 | (R_DUART_ISR_A + ((chan) & 1) * DUART_IMRISR_SPACING) |
| 237 | #define R_BCM1480_DUART_INCHREG(chan) \ | ||
| 238 | (R_DUART_IN_CHNG_A + ((chan) & 1) * DUART_INCHNG_SPACING) | ||
| 234 | 239 | ||
| 235 | #define A_BCM1480_DUART_IMRREG(chan) \ | 240 | #define A_BCM1480_DUART_IMRREG(chan) \ |
| 236 | (A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan))) | 241 | (A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan))) |
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h index 5bfdc3b64510..c83c68444e86 100644 --- a/include/asm-mips/termbits.h +++ b/include/asm-mips/termbits.h | |||
| @@ -164,6 +164,7 @@ struct ktermios { | |||
| 164 | #define HUPCL 0002000 /* Hang up on last close. */ | 164 | #define HUPCL 0002000 /* Hang up on last close. */ |
| 165 | #define CLOCAL 0004000 /* Ignore modem status lines. */ | 165 | #define CLOCAL 0004000 /* Ignore modem status lines. */ |
| 166 | #define CBAUDEX 0010000 | 166 | #define CBAUDEX 0010000 |
| 167 | #define BOTHER 0010000 | ||
| 167 | #define B57600 0010001 | 168 | #define B57600 0010001 |
| 168 | #define B115200 0010002 | 169 | #define B115200 0010002 |
| 169 | #define B230400 0010003 | 170 | #define B230400 0010003 |
| @@ -179,9 +180,11 @@ struct ktermios { | |||
| 179 | #define B3000000 0010015 | 180 | #define B3000000 0010015 |
| 180 | #define B3500000 0010016 | 181 | #define B3500000 0010016 |
| 181 | #define B4000000 0010017 | 182 | #define B4000000 0010017 |
| 182 | #define CIBAUD 002003600000 /* input baud rate (not used) */ | 183 | #define CIBAUD 002003600000 /* input baud rate */ |
| 183 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ | 184 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 184 | #define CRTSCTS 020000000000 /* flow control */ | 185 | #define CRTSCTS 020000000000 /* flow control */ |
| 186 | |||
| 187 | #define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ | ||
| 185 | 188 | ||
| 186 | /* c_lflag bits */ | 189 | /* c_lflag bits */ |
| 187 | #define ISIG 0000001 /* Enable signals. */ | 190 | #define ISIG 0000001 /* Enable signals. */ |
diff --git a/include/asm-mips/termios.h b/include/asm-mips/termios.h index 2ce07f4be369..a275661fa7e1 100644 --- a/include/asm-mips/termios.h +++ b/include/asm-mips/termios.h | |||
| @@ -122,8 +122,10 @@ struct termio { | |||
| 122 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ | 122 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ |
| 123 | }) | 123 | }) |
| 124 | 124 | ||
| 125 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios)) | 125 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) |
| 126 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios)) | 126 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) |
| 127 | #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) | ||
| 128 | #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) | ||
| 127 | 129 | ||
| 128 | #endif /* defined(__KERNEL__) */ | 130 | #endif /* defined(__KERNEL__) */ |
| 129 | 131 | ||
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 8836c0f1f2f7..5bde3980bf49 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h | |||
| @@ -130,6 +130,7 @@ struct spu { | |||
| 130 | u64 flags; | 130 | u64 flags; |
| 131 | u64 dar; | 131 | u64 dar; |
| 132 | u64 dsisr; | 132 | u64 dsisr; |
| 133 | u64 class_0_pending; | ||
| 133 | size_t ls_size; | 134 | size_t ls_size; |
| 134 | unsigned int slb_replace; | 135 | unsigned int slb_replace; |
| 135 | struct mm_struct *mm; | 136 | struct mm_struct *mm; |
| @@ -138,7 +139,6 @@ struct spu { | |||
| 138 | unsigned long long timestamp; | 139 | unsigned long long timestamp; |
| 139 | pid_t pid; | 140 | pid_t pid; |
| 140 | pid_t tgid; | 141 | pid_t tgid; |
| 141 | int class_0_pending; | ||
| 142 | spinlock_t register_lock; | 142 | spinlock_t register_lock; |
| 143 | 143 | ||
| 144 | void (* wbox_callback)(struct spu *spu); | 144 | void (* wbox_callback)(struct spu *spu); |
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h index bfe27aa2c9c4..857471c49dac 100644 --- a/include/asm-um/elf-x86_64.h +++ b/include/asm-um/elf-x86_64.h | |||
| @@ -67,27 +67,27 @@ typedef struct { } elf_fpregset_t; | |||
| 67 | } while (0) | 67 | } while (0) |
| 68 | 68 | ||
| 69 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | 69 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ |
| 70 | (pr_reg)[0] = (regs)->regs.gp[0]; \ | 70 | (pr_reg)[0] = (regs)->regs.skas.regs[0]; \ |
| 71 | (pr_reg)[1] = (regs)->regs.gp[1]; \ | 71 | (pr_reg)[1] = (regs)->regs.skas.regs[1]; \ |
| 72 | (pr_reg)[2] = (regs)->regs.gp[2]; \ | 72 | (pr_reg)[2] = (regs)->regs.skas.regs[2]; \ |
| 73 | (pr_reg)[3] = (regs)->regs.gp[3]; \ | 73 | (pr_reg)[3] = (regs)->regs.skas.regs[3]; \ |
| 74 | (pr_reg)[4] = (regs)->regs.gp[4]; \ | 74 | (pr_reg)[4] = (regs)->regs.skas.regs[4]; \ |
| 75 | (pr_reg)[5] = (regs)->regs.gp[5]; \ | 75 | (pr_reg)[5] = (regs)->regs.skas.regs[5]; \ |
| 76 | (pr_reg)[6] = (regs)->regs.gp[6]; \ | 76 | (pr_reg)[6] = (regs)->regs.skas.regs[6]; \ |
| 77 | (pr_reg)[7] = (regs)->regs.gp[7]; \ | 77 | (pr_reg)[7] = (regs)->regs.skas.regs[7]; \ |
| 78 | (pr_reg)[8] = (regs)->regs.gp[8]; \ | 78 | (pr_reg)[8] = (regs)->regs.skas.regs[8]; \ |
| 79 | (pr_reg)[9] = (regs)->regs.gp[9]; \ | 79 | (pr_reg)[9] = (regs)->regs.skas.regs[9]; \ |
| 80 | (pr_reg)[10] = (regs)->regs.gp[10]; \ | 80 | (pr_reg)[10] = (regs)->regs.skas.regs[10]; \ |
| 81 | (pr_reg)[11] = (regs)->regs.gp[11]; \ | 81 | (pr_reg)[11] = (regs)->regs.skas.regs[11]; \ |
| 82 | (pr_reg)[12] = (regs)->regs.gp[12]; \ | 82 | (pr_reg)[12] = (regs)->regs.skas.regs[12]; \ |
| 83 | (pr_reg)[13] = (regs)->regs.gp[13]; \ | 83 | (pr_reg)[13] = (regs)->regs.skas.regs[13]; \ |
| 84 | (pr_reg)[14] = (regs)->regs.gp[14]; \ | 84 | (pr_reg)[14] = (regs)->regs.skas.regs[14]; \ |
| 85 | (pr_reg)[15] = (regs)->regs.gp[15]; \ | 85 | (pr_reg)[15] = (regs)->regs.skas.regs[15]; \ |
| 86 | (pr_reg)[16] = (regs)->regs.gp[16]; \ | 86 | (pr_reg)[16] = (regs)->regs.skas.regs[16]; \ |
| 87 | (pr_reg)[17] = (regs)->regs.gp[17]; \ | 87 | (pr_reg)[17] = (regs)->regs.skas.regs[17]; \ |
| 88 | (pr_reg)[18] = (regs)->regs.gp[18]; \ | 88 | (pr_reg)[18] = (regs)->regs.skas.regs[18]; \ |
| 89 | (pr_reg)[19] = (regs)->regs.gp[19]; \ | 89 | (pr_reg)[19] = (regs)->regs.skas.regs[19]; \ |
| 90 | (pr_reg)[20] = (regs)->regs.gp[20]; \ | 90 | (pr_reg)[20] = (regs)->regs.skas.regs[20]; \ |
| 91 | (pr_reg)[21] = current->thread.arch.fs; \ | 91 | (pr_reg)[21] = current->thread.arch.fs; \ |
| 92 | (pr_reg)[22] = 0; \ | 92 | (pr_reg)[22] = 0; \ |
| 93 | (pr_reg)[23] = 0; \ | 93 | (pr_reg)[23] = 0; \ |
diff --git a/include/linux/aer.h b/include/linux/aer.h index 509656286e53..bcf236d825e8 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h | |||
| @@ -15,11 +15,26 @@ extern int pci_disable_pcie_error_reporting(struct pci_dev *dev); | |||
| 15 | extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev); | 15 | extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev); |
| 16 | extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev); | 16 | extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev); |
| 17 | #else | 17 | #else |
| 18 | #define pci_enable_pcie_error_reporting(dev) (-EINVAL) | 18 | static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev) |
| 19 | #define pci_find_aer_capability(dev) (0) | 19 | { |
| 20 | #define pci_disable_pcie_error_reporting(dev) (-EINVAL) | 20 | return -EINVAL; |
| 21 | #define pci_cleanup_aer_uncorrect_error_status(dev) (-EINVAL) | 21 | } |
| 22 | #define pci_cleanup_aer_correct_error_status(dev) (-EINVAL) | 22 | static inline int pci_find_aer_capability(struct pci_dev *dev) |
| 23 | { | ||
| 24 | return 0; | ||
| 25 | } | ||
| 26 | static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev) | ||
| 27 | { | ||
| 28 | return -EINVAL; | ||
| 29 | } | ||
| 30 | static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) | ||
| 31 | { | ||
| 32 | return -EINVAL; | ||
| 33 | } | ||
| 34 | static inline int pci_cleanup_aer_correct_error_status(struct pci_dev *dev) | ||
| 35 | { | ||
| 36 | return -EINVAL; | ||
| 37 | } | ||
| 23 | #endif | 38 | #endif |
| 24 | 39 | ||
| 25 | #endif //_AER_H_ | 40 | #endif //_AER_H_ |
diff --git a/include/linux/ide.h b/include/linux/ide.h index c792b4fd1588..b9f66c10caa0 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1378,6 +1378,19 @@ static inline int ide_dev_has_iordy(struct hd_driveid *id) | |||
| 1378 | return ((id->field_valid & 2) && (id->capability & 8)) ? 1 : 0; | 1378 | return ((id->field_valid & 2) && (id->capability & 8)) ? 1 : 0; |
| 1379 | } | 1379 | } |
| 1380 | 1380 | ||
| 1381 | static inline int ide_dev_is_sata(struct hd_driveid *id) | ||
| 1382 | { | ||
| 1383 | /* | ||
| 1384 | * See if word 93 is 0 AND drive is at least ATA-5 compatible | ||
| 1385 | * verifying that word 80 by casting it to a signed type -- | ||
| 1386 | * this trick allows us to filter out the reserved values of | ||
| 1387 | * 0x0000 and 0xffff along with the earlier ATA revisions... | ||
| 1388 | */ | ||
| 1389 | if (id->hw_config == 0 && (short)id->major_rev_num >= 0x0020) | ||
| 1390 | return 1; | ||
| 1391 | return 0; | ||
| 1392 | } | ||
| 1393 | |||
| 1381 | u8 ide_dump_status(ide_drive_t *, const char *, u8); | 1394 | u8 ide_dump_status(ide_drive_t *, const char *, u8); |
| 1382 | 1395 | ||
| 1383 | typedef struct ide_pio_timings_s { | 1396 | typedef struct ide_pio_timings_s { |
diff --git a/include/linux/input.h b/include/linux/input.h index cf2b5619aa13..36e00aa6f03b 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -558,6 +558,8 @@ struct input_absinfo { | |||
| 558 | #define KEY_BRL_DOT6 0x1f6 | 558 | #define KEY_BRL_DOT6 0x1f6 |
| 559 | #define KEY_BRL_DOT7 0x1f7 | 559 | #define KEY_BRL_DOT7 0x1f7 |
| 560 | #define KEY_BRL_DOT8 0x1f8 | 560 | #define KEY_BRL_DOT8 0x1f8 |
| 561 | #define KEY_BRL_DOT9 0x1f9 | ||
| 562 | #define KEY_BRL_DOT10 0x1fa | ||
| 561 | 563 | ||
| 562 | /* We avoid low common keys in module aliases so they don't get huge. */ | 564 | /* We avoid low common keys in module aliases so they don't get huge. */ |
| 563 | #define KEY_MIN_INTERESTING KEY_MUTE | 565 | #define KEY_MIN_INTERESTING KEY_MUTE |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index f592df74b3cf..47160fe378c9 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -34,6 +34,7 @@ extern const char linux_proc_banner[]; | |||
| 34 | 34 | ||
| 35 | #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) | 35 | #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) |
| 36 | #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) | 36 | #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) |
| 37 | #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) | ||
| 37 | 38 | ||
| 38 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) | 39 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) |
| 39 | 40 | ||
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h index de76843bbe8a..7ddbc30aa8e7 100644 --- a/include/linux/keyboard.h +++ b/include/linux/keyboard.h | |||
| @@ -437,8 +437,10 @@ extern unsigned short plain_map[NR_KEYS]; | |||
| 437 | #define K_BRL_DOT6 K(KT_BRL, 6) | 437 | #define K_BRL_DOT6 K(KT_BRL, 6) |
| 438 | #define K_BRL_DOT7 K(KT_BRL, 7) | 438 | #define K_BRL_DOT7 K(KT_BRL, 7) |
| 439 | #define K_BRL_DOT8 K(KT_BRL, 8) | 439 | #define K_BRL_DOT8 K(KT_BRL, 8) |
| 440 | #define K_BRL_DOT9 K(KT_BRL, 9) | ||
| 441 | #define K_BRL_DOT10 K(KT_BRL, 10) | ||
| 440 | 442 | ||
| 441 | #define NR_BRL 9 | 443 | #define NR_BRL 11 |
| 442 | 444 | ||
| 443 | #define MAX_DIACR 256 | 445 | #define MAX_DIACR 256 |
| 444 | #endif | 446 | #endif |
diff --git a/include/linux/leds.h b/include/linux/leds.h index 421175092ee2..dc1178f6184b 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define __LINUX_LEDS_H_INCLUDED | 13 | #define __LINUX_LEDS_H_INCLUDED |
| 14 | 14 | ||
| 15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 16 | #include <linux/spinlock.h> | ||
| 16 | 17 | ||
| 17 | struct device; | 18 | struct device; |
| 18 | /* | 19 | /* |
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 0eed0b7ab2df..1dd075eda595 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
| @@ -88,9 +88,8 @@ struct nf_sockopt_ops | |||
| 88 | int (*compat_get)(struct sock *sk, int optval, | 88 | int (*compat_get)(struct sock *sk, int optval, |
| 89 | void __user *user, int *len); | 89 | void __user *user, int *len); |
| 90 | 90 | ||
| 91 | /* Number of users inside set() or get(). */ | 91 | /* Use the module struct to lock set/get code in place */ |
| 92 | unsigned int use; | 92 | struct module *owner; |
| 93 | struct task_struct *cleanup_task; | ||
| 94 | }; | 93 | }; |
| 95 | 94 | ||
| 96 | /* Each queued (to userspace) skbuff has one of these. */ | 95 | /* Each queued (to userspace) skbuff has one of these. */ |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 17168f3cc73f..55f307ffbf96 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1343,6 +1343,7 @@ | |||
| 1343 | #define PCI_DEVICE_ID_VIA_8231_4 0x8235 | 1343 | #define PCI_DEVICE_ID_VIA_8231_4 0x8235 |
| 1344 | #define PCI_DEVICE_ID_VIA_8365_1 0x8305 | 1344 | #define PCI_DEVICE_ID_VIA_8365_1 0x8305 |
| 1345 | #define PCI_DEVICE_ID_VIA_CX700 0x8324 | 1345 | #define PCI_DEVICE_ID_VIA_CX700 0x8324 |
| 1346 | #define PCI_DEVICE_ID_VIA_VX800 0x8353 | ||
| 1346 | #define PCI_DEVICE_ID_VIA_8371_1 0x8391 | 1347 | #define PCI_DEVICE_ID_VIA_8371_1 0x8391 |
| 1347 | #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 | 1348 | #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 |
| 1348 | #define PCI_DEVICE_ID_VIA_838X_1 0xB188 | 1349 | #define PCI_DEVICE_ID_VIA_838X_1 0xB188 |
| @@ -2292,6 +2293,8 @@ | |||
| 2292 | #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599 | 2293 | #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599 |
| 2293 | #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a | 2294 | #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a |
| 2294 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e | 2295 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e |
| 2296 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031 | ||
| 2297 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x5032 | ||
| 2295 | #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000 | 2298 | #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000 |
| 2296 | #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010 | 2299 | #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010 |
| 2297 | #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020 | 2300 | #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020 |
diff --git a/include/linux/poll.h b/include/linux/poll.h index 27690798623f..16d813b364ef 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | #define WQUEUES_STACK_ALLOC (MAX_STACK_ALLOC - FRONTEND_STACK_ALLOC) | 21 | #define WQUEUES_STACK_ALLOC (MAX_STACK_ALLOC - FRONTEND_STACK_ALLOC) |
| 22 | #define N_INLINE_POLL_ENTRIES (WQUEUES_STACK_ALLOC / sizeof(struct poll_table_entry)) | 22 | #define N_INLINE_POLL_ENTRIES (WQUEUES_STACK_ALLOC / sizeof(struct poll_table_entry)) |
| 23 | 23 | ||
| 24 | #define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) | ||
| 25 | |||
| 24 | struct poll_table_struct; | 26 | struct poll_table_struct; |
| 25 | 27 | ||
| 26 | /* | 28 | /* |
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 007d442412e2..b4b31132618b 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h | |||
| @@ -205,6 +205,13 @@ struct iscsi_queue { | |||
| 205 | }; | 205 | }; |
| 206 | 206 | ||
| 207 | struct iscsi_session { | 207 | struct iscsi_session { |
| 208 | /* | ||
| 209 | * Syncs up the scsi eh thread with the iscsi eh thread when sending | ||
| 210 | * task management functions. This must be taken before the session | ||
| 211 | * and recv lock. | ||
| 212 | */ | ||
| 213 | struct mutex eh_mutex; | ||
| 214 | |||
| 208 | /* iSCSI session-wide sequencing */ | 215 | /* iSCSI session-wide sequencing */ |
| 209 | uint32_t cmdsn; | 216 | uint32_t cmdsn; |
| 210 | uint32_t exp_cmdsn; | 217 | uint32_t exp_cmdsn; |
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index f7921360efad..7e52eb051f22 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c | |||
| @@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr) | |||
| 61 | if (fetch_robust_entry(&upending, &pending, | 61 | if (fetch_robust_entry(&upending, &pending, |
| 62 | &head->list_op_pending, &pip)) | 62 | &head->list_op_pending, &pip)) |
| 63 | return; | 63 | return; |
| 64 | if (upending) | 64 | if (pending) |
| 65 | handle_futex_death((void __user *)pending + futex_offset, curr, pip); | 65 | handle_futex_death((void __user *)pending + futex_offset, curr, pip); |
| 66 | 66 | ||
| 67 | while (compat_ptr(uentry) != &head->list) { | 67 | while (entry != (struct robust_list __user *) &head->list) { |
| 68 | /* | 68 | /* |
| 69 | * A pending lock might already be on the list, so | 69 | * A pending lock might already be on the list, so |
| 70 | * dont process it twice: | 70 | * dont process it twice: |
diff --git a/kernel/kmod.c b/kernel/kmod.c index 9809cc1f33d6..c6a4f8aebeba 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
| @@ -505,7 +505,7 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp, | |||
| 505 | if (ret < 0) | 505 | if (ret < 0) |
| 506 | goto out; | 506 | goto out; |
| 507 | 507 | ||
| 508 | return call_usermodehelper_exec(sub_info, 1); | 508 | return call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC); |
| 509 | 509 | ||
| 510 | out: | 510 | out: |
| 511 | call_usermodehelper_freeinfo(sub_info); | 511 | call_usermodehelper_freeinfo(sub_info); |
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 82a558b655da..3eca7a55f2ee 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -233,6 +233,7 @@ int ptrace_detach(struct task_struct *child, unsigned int data) | |||
| 233 | 233 | ||
| 234 | /* Architecture-specific hardware disable .. */ | 234 | /* Architecture-specific hardware disable .. */ |
| 235 | ptrace_disable(child); | 235 | ptrace_disable(child); |
| 236 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
| 236 | 237 | ||
| 237 | write_lock_irq(&tasklist_lock); | 238 | write_lock_irq(&tasklist_lock); |
| 238 | /* protect against de_thread()->release_task() */ | 239 | /* protect against de_thread()->release_task() */ |
diff --git a/kernel/sched.c b/kernel/sched.c index b533d6db78aa..deeb1f8e0c30 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -668,7 +668,7 @@ static u64 div64_likely32(u64 divident, unsigned long divisor) | |||
| 668 | /* | 668 | /* |
| 669 | * Shift right and round: | 669 | * Shift right and round: |
| 670 | */ | 670 | */ |
| 671 | #define RSR(x, y) (((x) + (1UL << ((y) - 1))) >> (y)) | 671 | #define SRR(x, y) (((x) + (1UL << ((y) - 1))) >> (y)) |
| 672 | 672 | ||
| 673 | static unsigned long | 673 | static unsigned long |
| 674 | calc_delta_mine(unsigned long delta_exec, unsigned long weight, | 674 | calc_delta_mine(unsigned long delta_exec, unsigned long weight, |
| @@ -684,10 +684,10 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, | |||
| 684 | * Check whether we'd overflow the 64-bit multiplication: | 684 | * Check whether we'd overflow the 64-bit multiplication: |
| 685 | */ | 685 | */ |
| 686 | if (unlikely(tmp > WMULT_CONST)) | 686 | if (unlikely(tmp > WMULT_CONST)) |
| 687 | tmp = RSR(RSR(tmp, WMULT_SHIFT/2) * lw->inv_weight, | 687 | tmp = SRR(SRR(tmp, WMULT_SHIFT/2) * lw->inv_weight, |
| 688 | WMULT_SHIFT/2); | 688 | WMULT_SHIFT/2); |
| 689 | else | 689 | else |
| 690 | tmp = RSR(tmp * lw->inv_weight, WMULT_SHIFT); | 690 | tmp = SRR(tmp * lw->inv_weight, WMULT_SHIFT); |
| 691 | 691 | ||
| 692 | return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX); | 692 | return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX); |
| 693 | } | 693 | } |
| @@ -858,7 +858,6 @@ static void dec_nr_running(struct task_struct *p, struct rq *rq) | |||
| 858 | 858 | ||
| 859 | static void set_load_weight(struct task_struct *p) | 859 | static void set_load_weight(struct task_struct *p) |
| 860 | { | 860 | { |
| 861 | task_rq(p)->cfs.wait_runtime -= p->se.wait_runtime; | ||
| 862 | p->se.wait_runtime = 0; | 861 | p->se.wait_runtime = 0; |
| 863 | 862 | ||
| 864 | if (task_has_rt_policy(p)) { | 863 | if (task_has_rt_policy(p)) { |
| @@ -2512,7 +2511,7 @@ group_next: | |||
| 2512 | * a think about bumping its value to force at least one task to be | 2511 | * a think about bumping its value to force at least one task to be |
| 2513 | * moved | 2512 | * moved |
| 2514 | */ | 2513 | */ |
| 2515 | if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) { | 2514 | if (*imbalance < busiest_load_per_task) { |
| 2516 | unsigned long tmp, pwr_now, pwr_move; | 2515 | unsigned long tmp, pwr_now, pwr_move; |
| 2517 | unsigned int imbn; | 2516 | unsigned int imbn; |
| 2518 | 2517 | ||
| @@ -2564,10 +2563,8 @@ small_imbalance: | |||
| 2564 | pwr_move /= SCHED_LOAD_SCALE; | 2563 | pwr_move /= SCHED_LOAD_SCALE; |
| 2565 | 2564 | ||
| 2566 | /* Move if we gain throughput */ | 2565 | /* Move if we gain throughput */ |
| 2567 | if (pwr_move <= pwr_now) | 2566 | if (pwr_move > pwr_now) |
| 2568 | goto out_balanced; | 2567 | *imbalance = busiest_load_per_task; |
| 2569 | |||
| 2570 | *imbalance = busiest_load_per_task; | ||
| 2571 | } | 2568 | } |
| 2572 | 2569 | ||
| 2573 | return busiest; | 2570 | return busiest; |
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index ab18f45f2ab2..c3ee38bd3426 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c | |||
| @@ -283,4 +283,5 @@ void proc_sched_set_task(struct task_struct *p) | |||
| 283 | p->se.wait_runtime_overruns = p->se.wait_runtime_underruns = 0; | 283 | p->se.wait_runtime_overruns = p->se.wait_runtime_underruns = 0; |
| 284 | #endif | 284 | #endif |
| 285 | p->se.sum_exec_runtime = 0; | 285 | p->se.sum_exec_runtime = 0; |
| 286 | p->se.prev_sum_exec_runtime = 0; | ||
| 286 | } | 287 | } |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index ce39282d9c0d..892616bf2c77 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -194,6 +194,8 @@ __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
| 194 | update_load_add(&cfs_rq->load, se->load.weight); | 194 | update_load_add(&cfs_rq->load, se->load.weight); |
| 195 | cfs_rq->nr_running++; | 195 | cfs_rq->nr_running++; |
| 196 | se->on_rq = 1; | 196 | se->on_rq = 1; |
| 197 | |||
| 198 | schedstat_add(cfs_rq, wait_runtime, se->wait_runtime); | ||
| 197 | } | 199 | } |
| 198 | 200 | ||
| 199 | static inline void | 201 | static inline void |
| @@ -205,6 +207,8 @@ __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
| 205 | update_load_sub(&cfs_rq->load, se->load.weight); | 207 | update_load_sub(&cfs_rq->load, se->load.weight); |
| 206 | cfs_rq->nr_running--; | 208 | cfs_rq->nr_running--; |
| 207 | se->on_rq = 0; | 209 | se->on_rq = 0; |
| 210 | |||
| 211 | schedstat_add(cfs_rq, wait_runtime, -se->wait_runtime); | ||
| 208 | } | 212 | } |
| 209 | 213 | ||
| 210 | static inline struct rb_node *first_fair(struct cfs_rq *cfs_rq) | 214 | static inline struct rb_node *first_fair(struct cfs_rq *cfs_rq) |
| @@ -291,7 +295,7 @@ niced_granularity(struct sched_entity *curr, unsigned long granularity) | |||
| 291 | /* | 295 | /* |
| 292 | * It will always fit into 'long': | 296 | * It will always fit into 'long': |
| 293 | */ | 297 | */ |
| 294 | return (long) (tmp >> WMULT_SHIFT); | 298 | return (long) (tmp >> (WMULT_SHIFT-NICE_0_SHIFT)); |
| 295 | } | 299 | } |
| 296 | 300 | ||
| 297 | static inline void | 301 | static inline void |
| @@ -574,7 +578,6 @@ static void __enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
| 574 | 578 | ||
| 575 | prev_runtime = se->wait_runtime; | 579 | prev_runtime = se->wait_runtime; |
| 576 | __add_wait_runtime(cfs_rq, se, delta_fair); | 580 | __add_wait_runtime(cfs_rq, se, delta_fair); |
| 577 | schedstat_add(cfs_rq, wait_runtime, se->wait_runtime); | ||
| 578 | delta_fair = se->wait_runtime - prev_runtime; | 581 | delta_fair = se->wait_runtime - prev_runtime; |
| 579 | 582 | ||
| 580 | /* | 583 | /* |
| @@ -662,7 +665,6 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) | |||
| 662 | if (tsk->state & TASK_UNINTERRUPTIBLE) | 665 | if (tsk->state & TASK_UNINTERRUPTIBLE) |
| 663 | se->block_start = rq_of(cfs_rq)->clock; | 666 | se->block_start = rq_of(cfs_rq)->clock; |
| 664 | } | 667 | } |
| 665 | cfs_rq->wait_runtime -= se->wait_runtime; | ||
| 666 | #endif | 668 | #endif |
| 667 | } | 669 | } |
| 668 | __dequeue_entity(cfs_rq, se); | 670 | __dequeue_entity(cfs_rq, se); |
| @@ -671,22 +673,39 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) | |||
| 671 | /* | 673 | /* |
| 672 | * Preempt the current task with a newly woken task if needed: | 674 | * Preempt the current task with a newly woken task if needed: |
| 673 | */ | 675 | */ |
| 674 | static int | 676 | static void |
| 675 | __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, | 677 | __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, |
| 676 | struct sched_entity *curr, unsigned long granularity) | 678 | struct sched_entity *curr, unsigned long granularity) |
| 677 | { | 679 | { |
| 678 | s64 __delta = curr->fair_key - se->fair_key; | 680 | s64 __delta = curr->fair_key - se->fair_key; |
| 681 | unsigned long ideal_runtime, delta_exec; | ||
| 682 | |||
| 683 | /* | ||
| 684 | * ideal_runtime is compared against sum_exec_runtime, which is | ||
| 685 | * walltime, hence do not scale. | ||
| 686 | */ | ||
| 687 | ideal_runtime = max(sysctl_sched_latency / cfs_rq->nr_running, | ||
| 688 | (unsigned long)sysctl_sched_min_granularity); | ||
| 689 | |||
| 690 | /* | ||
| 691 | * If we executed more than what the latency constraint suggests, | ||
| 692 | * reduce the rescheduling granularity. This way the total latency | ||
| 693 | * of how much a task is not scheduled converges to | ||
| 694 | * sysctl_sched_latency: | ||
| 695 | */ | ||
| 696 | delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; | ||
| 697 | if (delta_exec > ideal_runtime) | ||
| 698 | granularity = 0; | ||
| 679 | 699 | ||
| 680 | /* | 700 | /* |
| 681 | * Take scheduling granularity into account - do not | 701 | * Take scheduling granularity into account - do not |
| 682 | * preempt the current task unless the best task has | 702 | * preempt the current task unless the best task has |
| 683 | * a larger than sched_granularity fairness advantage: | 703 | * a larger than sched_granularity fairness advantage: |
| 704 | * | ||
| 705 | * scale granularity as key space is in fair_clock. | ||
| 684 | */ | 706 | */ |
| 685 | if (__delta > niced_granularity(curr, granularity)) { | 707 | if (__delta > niced_granularity(curr, granularity)) |
| 686 | resched_task(rq_of(cfs_rq)->curr); | 708 | resched_task(rq_of(cfs_rq)->curr); |
| 687 | return 1; | ||
| 688 | } | ||
| 689 | return 0; | ||
| 690 | } | 709 | } |
| 691 | 710 | ||
| 692 | static inline void | 711 | static inline void |
| @@ -702,6 +721,7 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
| 702 | update_stats_wait_end(cfs_rq, se); | 721 | update_stats_wait_end(cfs_rq, se); |
| 703 | update_stats_curr_start(cfs_rq, se); | 722 | update_stats_curr_start(cfs_rq, se); |
| 704 | set_cfs_rq_curr(cfs_rq, se); | 723 | set_cfs_rq_curr(cfs_rq, se); |
| 724 | se->prev_sum_exec_runtime = se->sum_exec_runtime; | ||
| 705 | } | 725 | } |
| 706 | 726 | ||
| 707 | static struct sched_entity *pick_next_entity(struct cfs_rq *cfs_rq) | 727 | static struct sched_entity *pick_next_entity(struct cfs_rq *cfs_rq) |
| @@ -731,7 +751,6 @@ static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev) | |||
| 731 | 751 | ||
| 732 | static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) | 752 | static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) |
| 733 | { | 753 | { |
| 734 | unsigned long gran, ideal_runtime, delta_exec; | ||
| 735 | struct sched_entity *next; | 754 | struct sched_entity *next; |
| 736 | 755 | ||
| 737 | /* | 756 | /* |
| @@ -748,22 +767,8 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) | |||
| 748 | if (next == curr) | 767 | if (next == curr) |
| 749 | return; | 768 | return; |
| 750 | 769 | ||
| 751 | gran = sched_granularity(cfs_rq); | 770 | __check_preempt_curr_fair(cfs_rq, next, curr, |
| 752 | ideal_runtime = niced_granularity(curr, | 771 | sched_granularity(cfs_rq)); |
| 753 | max(sysctl_sched_latency / cfs_rq->nr_running, | ||
| 754 | (unsigned long)sysctl_sched_min_granularity)); | ||
| 755 | /* | ||
| 756 | * If we executed more than what the latency constraint suggests, | ||
| 757 | * reduce the rescheduling granularity. This way the total latency | ||
| 758 | * of how much a task is not scheduled converges to | ||
| 759 | * sysctl_sched_latency: | ||
| 760 | */ | ||
| 761 | delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; | ||
| 762 | if (delta_exec > ideal_runtime) | ||
| 763 | gran = 0; | ||
| 764 | |||
| 765 | if (__check_preempt_curr_fair(cfs_rq, next, curr, gran)) | ||
| 766 | curr->prev_sum_exec_runtime = curr->sum_exec_runtime; | ||
| 767 | } | 772 | } |
| 768 | 773 | ||
| 769 | /************************************************** | 774 | /************************************************** |
| @@ -1121,10 +1126,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p) | |||
| 1121 | * The statistical average of wait_runtime is about | 1126 | * The statistical average of wait_runtime is about |
| 1122 | * -granularity/2, so initialize the task with that: | 1127 | * -granularity/2, so initialize the task with that: |
| 1123 | */ | 1128 | */ |
| 1124 | if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) { | 1129 | if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) |
| 1125 | se->wait_runtime = -(sched_granularity(cfs_rq) / 2); | 1130 | se->wait_runtime = -(sched_granularity(cfs_rq) / 2); |
| 1126 | schedstat_add(cfs_rq, wait_runtime, se->wait_runtime); | ||
| 1127 | } | ||
| 1128 | 1131 | ||
| 1129 | __enqueue_entity(cfs_rq, se); | 1132 | __enqueue_entity(cfs_rq, se); |
| 1130 | } | 1133 | } |
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index cd91237dbfe3..de6a2d6b3ebb 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
| @@ -226,7 +226,7 @@ static void sync_cmos_clock(unsigned long dummy) | |||
| 226 | 226 | ||
| 227 | static void notify_cmos_timer(void) | 227 | static void notify_cmos_timer(void) |
| 228 | { | 228 | { |
| 229 | if (no_sync_cmos_clock) | 229 | if (!no_sync_cmos_clock) |
| 230 | mod_timer(&sync_cmos_timer, jiffies + 1); | 230 | mod_timer(&sync_cmos_timer, jiffies + 1); |
| 231 | } | 231 | } |
| 232 | 232 | ||
| @@ -986,7 +986,9 @@ out: | |||
| 986 | 986 | ||
| 987 | __setup("slub_debug", setup_slub_debug); | 987 | __setup("slub_debug", setup_slub_debug); |
| 988 | 988 | ||
| 989 | static void kmem_cache_open_debug_check(struct kmem_cache *s) | 989 | static unsigned long kmem_cache_flags(unsigned long objsize, |
| 990 | unsigned long flags, const char *name, | ||
| 991 | void (*ctor)(void *, struct kmem_cache *, unsigned long)) | ||
| 990 | { | 992 | { |
| 991 | /* | 993 | /* |
| 992 | * The page->offset field is only 16 bit wide. This is an offset | 994 | * The page->offset field is only 16 bit wide. This is an offset |
| @@ -1000,19 +1002,21 @@ static void kmem_cache_open_debug_check(struct kmem_cache *s) | |||
| 1000 | * Debugging or ctor may create a need to move the free | 1002 | * Debugging or ctor may create a need to move the free |
| 1001 | * pointer. Fail if this happens. | 1003 | * pointer. Fail if this happens. |
| 1002 | */ | 1004 | */ |
| 1003 | if (s->objsize >= 65535 * sizeof(void *)) { | 1005 | if (objsize >= 65535 * sizeof(void *)) { |
| 1004 | BUG_ON(s->flags & (SLAB_RED_ZONE | SLAB_POISON | | 1006 | BUG_ON(flags & (SLAB_RED_ZONE | SLAB_POISON | |
| 1005 | SLAB_STORE_USER | SLAB_DESTROY_BY_RCU)); | 1007 | SLAB_STORE_USER | SLAB_DESTROY_BY_RCU)); |
| 1006 | BUG_ON(s->ctor); | 1008 | BUG_ON(ctor); |
| 1007 | } | 1009 | } else { |
| 1008 | else | ||
| 1009 | /* | 1010 | /* |
| 1010 | * Enable debugging if selected on the kernel commandline. | 1011 | * Enable debugging if selected on the kernel commandline. |
| 1011 | */ | 1012 | */ |
| 1012 | if (slub_debug && (!slub_debug_slabs || | 1013 | if (slub_debug && (!slub_debug_slabs || |
| 1013 | strncmp(slub_debug_slabs, s->name, | 1014 | strncmp(slub_debug_slabs, name, |
| 1014 | strlen(slub_debug_slabs)) == 0)) | 1015 | strlen(slub_debug_slabs)) == 0)) |
| 1015 | s->flags |= slub_debug; | 1016 | flags |= slub_debug; |
| 1017 | } | ||
| 1018 | |||
| 1019 | return flags; | ||
| 1016 | } | 1020 | } |
| 1017 | #else | 1021 | #else |
| 1018 | static inline void setup_object_debug(struct kmem_cache *s, | 1022 | static inline void setup_object_debug(struct kmem_cache *s, |
| @@ -1029,7 +1033,12 @@ static inline int slab_pad_check(struct kmem_cache *s, struct page *page) | |||
| 1029 | static inline int check_object(struct kmem_cache *s, struct page *page, | 1033 | static inline int check_object(struct kmem_cache *s, struct page *page, |
| 1030 | void *object, int active) { return 1; } | 1034 | void *object, int active) { return 1; } |
| 1031 | static inline void add_full(struct kmem_cache_node *n, struct page *page) {} | 1035 | static inline void add_full(struct kmem_cache_node *n, struct page *page) {} |
| 1032 | static inline void kmem_cache_open_debug_check(struct kmem_cache *s) {} | 1036 | static inline unsigned long kmem_cache_flags(unsigned long objsize, |
| 1037 | unsigned long flags, const char *name, | ||
| 1038 | void (*ctor)(void *, struct kmem_cache *, unsigned long)) | ||
| 1039 | { | ||
| 1040 | return flags; | ||
| 1041 | } | ||
| 1033 | #define slub_debug 0 | 1042 | #define slub_debug 0 |
| 1034 | #endif | 1043 | #endif |
| 1035 | /* | 1044 | /* |
| @@ -2088,9 +2097,8 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags, | |||
| 2088 | s->name = name; | 2097 | s->name = name; |
| 2089 | s->ctor = ctor; | 2098 | s->ctor = ctor; |
| 2090 | s->objsize = size; | 2099 | s->objsize = size; |
| 2091 | s->flags = flags; | ||
| 2092 | s->align = align; | 2100 | s->align = align; |
| 2093 | kmem_cache_open_debug_check(s); | 2101 | s->flags = kmem_cache_flags(size, flags, name, ctor); |
| 2094 | 2102 | ||
| 2095 | if (!calculate_sizes(s)) | 2103 | if (!calculate_sizes(s)) |
| 2096 | goto error; | 2104 | goto error; |
| @@ -2660,7 +2668,7 @@ static int slab_unmergeable(struct kmem_cache *s) | |||
| 2660 | } | 2668 | } |
| 2661 | 2669 | ||
| 2662 | static struct kmem_cache *find_mergeable(size_t size, | 2670 | static struct kmem_cache *find_mergeable(size_t size, |
| 2663 | size_t align, unsigned long flags, | 2671 | size_t align, unsigned long flags, const char *name, |
| 2664 | void (*ctor)(void *, struct kmem_cache *, unsigned long)) | 2672 | void (*ctor)(void *, struct kmem_cache *, unsigned long)) |
| 2665 | { | 2673 | { |
| 2666 | struct kmem_cache *s; | 2674 | struct kmem_cache *s; |
| @@ -2674,6 +2682,7 @@ static struct kmem_cache *find_mergeable(size_t size, | |||
| 2674 | size = ALIGN(size, sizeof(void *)); | 2682 | size = ALIGN(size, sizeof(void *)); |
| 2675 | align = calculate_alignment(flags, align, size); | 2683 | align = calculate_alignment(flags, align, size); |
| 2676 | size = ALIGN(size, align); | 2684 | size = ALIGN(size, align); |
| 2685 | flags = kmem_cache_flags(size, flags, name, NULL); | ||
| 2677 | 2686 | ||
| 2678 | list_for_each_entry(s, &slab_caches, list) { | 2687 | list_for_each_entry(s, &slab_caches, list) { |
| 2679 | if (slab_unmergeable(s)) | 2688 | if (slab_unmergeable(s)) |
| @@ -2682,8 +2691,7 @@ static struct kmem_cache *find_mergeable(size_t size, | |||
| 2682 | if (size > s->size) | 2691 | if (size > s->size) |
| 2683 | continue; | 2692 | continue; |
| 2684 | 2693 | ||
| 2685 | if (((flags | slub_debug) & SLUB_MERGE_SAME) != | 2694 | if ((flags & SLUB_MERGE_SAME) != (s->flags & SLUB_MERGE_SAME)) |
| 2686 | (s->flags & SLUB_MERGE_SAME)) | ||
| 2687 | continue; | 2695 | continue; |
| 2688 | /* | 2696 | /* |
| 2689 | * Check if alignment is compatible. | 2697 | * Check if alignment is compatible. |
| @@ -2707,7 +2715,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, | |||
| 2707 | struct kmem_cache *s; | 2715 | struct kmem_cache *s; |
| 2708 | 2716 | ||
| 2709 | down_write(&slub_lock); | 2717 | down_write(&slub_lock); |
| 2710 | s = find_mergeable(size, align, flags, ctor); | 2718 | s = find_mergeable(size, align, flags, name, ctor); |
| 2711 | if (s) { | 2719 | if (s) { |
| 2712 | s->refcount++; | 2720 | s->refcount++; |
| 2713 | /* | 2721 | /* |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 63caa414945d..18e3afc964df 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -183,6 +183,7 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) | |||
| 183 | { | 183 | { |
| 184 | struct sk_buff *skb; | 184 | struct sk_buff *skb; |
| 185 | __le16 param; | 185 | __le16 param; |
| 186 | __u8 flt_type; | ||
| 186 | 187 | ||
| 187 | BT_DBG("%s %ld", hdev->name, opt); | 188 | BT_DBG("%s %ld", hdev->name, opt); |
| 188 | 189 | ||
| @@ -233,11 +234,8 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) | |||
| 233 | /* Optional initialization */ | 234 | /* Optional initialization */ |
| 234 | 235 | ||
| 235 | /* Clear Event Filters */ | 236 | /* Clear Event Filters */ |
| 236 | { | 237 | flt_type = HCI_FLT_CLEAR_ALL; |
| 237 | struct hci_cp_set_event_flt cp; | 238 | hci_send_cmd(hdev, OGF_HOST_CTL, OCF_SET_EVENT_FLT, 1, &flt_type); |
| 238 | cp.flt_type = HCI_FLT_CLEAR_ALL; | ||
| 239 | hci_send_cmd(hdev, OGF_HOST_CTL, OCF_SET_EVENT_FLT, sizeof(cp), &cp); | ||
| 240 | } | ||
| 241 | 239 | ||
| 242 | /* Page timeout ~20 secs */ | 240 | /* Page timeout ~20 secs */ |
| 243 | param = cpu_to_le16(0x8000); | 241 | param = cpu_to_le16(0x8000); |
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 1dae3dfc66a9..5ccea5fbd236 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/skbuff.h> | 37 | #include <linux/skbuff.h> |
| 38 | #include <linux/workqueue.h> | 38 | #include <linux/workqueue.h> |
| 39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 40 | #include <linux/compat.h> | ||
| 40 | #include <linux/socket.h> | 41 | #include <linux/socket.h> |
| 41 | #include <linux/ioctl.h> | 42 | #include <linux/ioctl.h> |
| 42 | #include <net/sock.h> | 43 | #include <net/sock.h> |
| @@ -70,15 +71,15 @@ static struct hci_sec_filter hci_sec_filter = { | |||
| 70 | { | 71 | { |
| 71 | { 0x0 }, | 72 | { 0x0 }, |
| 72 | /* OGF_LINK_CTL */ | 73 | /* OGF_LINK_CTL */ |
| 73 | { 0xbe000006, 0x00000001, 0x000000, 0x00 }, | 74 | { 0xbe000006, 0x00000001, 0x00000000, 0x00 }, |
| 74 | /* OGF_LINK_POLICY */ | 75 | /* OGF_LINK_POLICY */ |
| 75 | { 0x00005200, 0x00000000, 0x000000, 0x00 }, | 76 | { 0x00005200, 0x00000000, 0x00000000, 0x00 }, |
| 76 | /* OGF_HOST_CTL */ | 77 | /* OGF_HOST_CTL */ |
| 77 | { 0xaab00200, 0x2b402aaa, 0x020154, 0x00 }, | 78 | { 0xaab00200, 0x2b402aaa, 0x05220154, 0x00 }, |
| 78 | /* OGF_INFO_PARAM */ | 79 | /* OGF_INFO_PARAM */ |
| 79 | { 0x000002be, 0x00000000, 0x000000, 0x00 }, | 80 | { 0x000002be, 0x00000000, 0x00000000, 0x00 }, |
| 80 | /* OGF_STATUS_PARAM */ | 81 | /* OGF_STATUS_PARAM */ |
| 81 | { 0x000000ea, 0x00000000, 0x000000, 0x00 } | 82 | { 0x000000ea, 0x00000000, 0x00000000, 0x00 } |
| 82 | } | 83 | } |
| 83 | }; | 84 | }; |
| 84 | 85 | ||
| @@ -342,9 +343,24 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ | |||
| 342 | 343 | ||
| 343 | if (mask & HCI_CMSG_TSTAMP) { | 344 | if (mask & HCI_CMSG_TSTAMP) { |
| 344 | struct timeval tv; | 345 | struct timeval tv; |
| 346 | void *data; | ||
| 347 | int len; | ||
| 345 | 348 | ||
| 346 | skb_get_timestamp(skb, &tv); | 349 | skb_get_timestamp(skb, &tv); |
| 347 | put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, sizeof(tv), &tv); | 350 | |
| 351 | data = &tv; | ||
| 352 | len = sizeof(tv); | ||
| 353 | #ifdef CONFIG_COMPAT | ||
| 354 | if (msg->msg_flags & MSG_CMSG_COMPAT) { | ||
| 355 | struct compat_timeval ctv; | ||
| 356 | ctv.tv_sec = tv.tv_sec; | ||
| 357 | ctv.tv_usec = tv.tv_usec; | ||
| 358 | data = &ctv; | ||
| 359 | len = sizeof(ctv); | ||
| 360 | } | ||
| 361 | #endif | ||
| 362 | |||
| 363 | put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data); | ||
| 348 | } | 364 | } |
| 349 | } | 365 | } |
| 350 | 366 | ||
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 4169a2a89a39..6018d0e51938 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c | |||
| @@ -1513,6 +1513,7 @@ static struct nf_sockopt_ops ebt_sockopts = | |||
| 1513 | .get_optmin = EBT_BASE_CTL, | 1513 | .get_optmin = EBT_BASE_CTL, |
| 1514 | .get_optmax = EBT_SO_GET_MAX + 1, | 1514 | .get_optmax = EBT_SO_GET_MAX + 1, |
| 1515 | .get = do_ebt_get_ctl, | 1515 | .get = do_ebt_get_ctl, |
| 1516 | .owner = THIS_MODULE, | ||
| 1516 | }; | 1517 | }; |
| 1517 | 1518 | ||
| 1518 | static int __init ebtables_init(void) | 1519 | static int __init ebtables_init(void) |
diff --git a/net/core/datagram.c b/net/core/datagram.c index cb056f476126..029b93e246b4 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c | |||
| @@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, | |||
| 450 | __wsum csum; | 450 | __wsum csum; |
| 451 | int chunk = skb->len - hlen; | 451 | int chunk = skb->len - hlen; |
| 452 | 452 | ||
| 453 | if (!chunk) | ||
| 454 | return 0; | ||
| 455 | |||
| 453 | /* Skip filled elements. | 456 | /* Skip filled elements. |
| 454 | * Pretty silly, look at memcpy_toiovec, though 8) | 457 | * Pretty silly, look at memcpy_toiovec, though 8) |
| 455 | */ | 458 | */ |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index fa6604fcf0e7..8def68209edd 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
| @@ -814,7 +814,7 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 814 | for (ifa = dn_db->ifa_list, dn_idx = 0; ifa; | 814 | for (ifa = dn_db->ifa_list, dn_idx = 0; ifa; |
| 815 | ifa = ifa->ifa_next, dn_idx++) { | 815 | ifa = ifa->ifa_next, dn_idx++) { |
| 816 | if (dn_idx < skip_naddr) | 816 | if (dn_idx < skip_naddr) |
| 817 | goto cont; | 817 | continue; |
| 818 | 818 | ||
| 819 | if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, | 819 | if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, |
| 820 | cb->nlh->nlmsg_seq, RTM_NEWADDR, | 820 | cb->nlh->nlmsg_seq, RTM_NEWADDR, |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 5b77bdaa57dd..5dbe5803b7d5 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
| @@ -1193,7 +1193,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 1193 | for (ifa = in_dev->ifa_list, ip_idx = 0; ifa; | 1193 | for (ifa = in_dev->ifa_list, ip_idx = 0; ifa; |
| 1194 | ifa = ifa->ifa_next, ip_idx++) { | 1194 | ifa = ifa->ifa_next, ip_idx++) { |
| 1195 | if (ip_idx < s_ip_idx) | 1195 | if (ip_idx < s_ip_idx) |
| 1196 | goto cont; | 1196 | continue; |
| 1197 | if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, | 1197 | if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, |
| 1198 | cb->nlh->nlmsg_seq, | 1198 | cb->nlh->nlmsg_seq, |
| 1199 | RTM_NEWADDR, NLM_F_MULTI) <= 0) | 1199 | RTM_NEWADDR, NLM_F_MULTI) <= 0) |
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index dbeacd8b0f90..def007ec1d6f 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
| @@ -836,12 +836,16 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 836 | return inet_diag_get_exact(skb, nlh); | 836 | return inet_diag_get_exact(skb, nlh); |
| 837 | } | 837 | } |
| 838 | 838 | ||
| 839 | static DEFINE_MUTEX(inet_diag_mutex); | ||
| 840 | |||
| 839 | static void inet_diag_rcv(struct sock *sk, int len) | 841 | static void inet_diag_rcv(struct sock *sk, int len) |
| 840 | { | 842 | { |
| 841 | unsigned int qlen = 0; | 843 | unsigned int qlen = 0; |
| 842 | 844 | ||
| 843 | do { | 845 | do { |
| 846 | mutex_lock(&inet_diag_mutex); | ||
| 844 | netlink_run_queue(sk, &qlen, &inet_diag_rcv_msg); | 847 | netlink_run_queue(sk, &qlen, &inet_diag_rcv_msg); |
| 848 | mutex_unlock(&inet_diag_mutex); | ||
| 845 | } while (qlen); | 849 | } while (qlen); |
| 846 | } | 850 | } |
| 847 | 851 | ||
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index 902fd578aa3c..f656d41d8d41 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c | |||
| @@ -2339,6 +2339,7 @@ static struct nf_sockopt_ops ip_vs_sockopts = { | |||
| 2339 | .get_optmin = IP_VS_BASE_CTL, | 2339 | .get_optmin = IP_VS_BASE_CTL, |
| 2340 | .get_optmax = IP_VS_SO_GET_MAX+1, | 2340 | .get_optmax = IP_VS_SO_GET_MAX+1, |
| 2341 | .get = do_ip_vs_get_ctl, | 2341 | .get = do_ip_vs_get_ctl, |
| 2342 | .owner = THIS_MODULE, | ||
| 2342 | }; | 2343 | }; |
| 2343 | 2344 | ||
| 2344 | 2345 | ||
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c index d1149aba9351..29114a9ccd1d 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c | |||
| @@ -1161,6 +1161,7 @@ static struct nf_sockopt_ops arpt_sockopts = { | |||
| 1161 | .get_optmin = ARPT_BASE_CTL, | 1161 | .get_optmin = ARPT_BASE_CTL, |
| 1162 | .get_optmax = ARPT_SO_GET_MAX+1, | 1162 | .get_optmax = ARPT_SO_GET_MAX+1, |
| 1163 | .get = do_arpt_get_ctl, | 1163 | .get = do_arpt_get_ctl, |
| 1164 | .owner = THIS_MODULE, | ||
| 1164 | }; | 1165 | }; |
| 1165 | 1166 | ||
| 1166 | static int __init arp_tables_init(void) | 1167 | static int __init arp_tables_init(void) |
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index e1b402c6b855..6486894f450c 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
| @@ -2296,6 +2296,7 @@ static struct nf_sockopt_ops ipt_sockopts = { | |||
| 2296 | #ifdef CONFIG_COMPAT | 2296 | #ifdef CONFIG_COMPAT |
| 2297 | .compat_get = compat_do_ipt_get_ctl, | 2297 | .compat_get = compat_do_ipt_get_ctl, |
| 2298 | #endif | 2298 | #endif |
| 2299 | .owner = THIS_MODULE, | ||
| 2299 | }; | 2300 | }; |
| 2300 | 2301 | ||
| 2301 | static struct xt_match icmp_matchstruct __read_mostly = { | 2302 | static struct xt_match icmp_matchstruct __read_mostly = { |
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index d9b5177989c6..f813e02aab30 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | |||
| @@ -87,14 +87,10 @@ static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff, | |||
| 87 | if (iph == NULL) | 87 | if (iph == NULL) |
| 88 | return -NF_DROP; | 88 | return -NF_DROP; |
| 89 | 89 | ||
| 90 | /* Never happen */ | 90 | /* Conntrack defragments packets, we might still see fragments |
| 91 | if (iph->frag_off & htons(IP_OFFSET)) { | 91 | * inside ICMP packets though. */ |
| 92 | if (net_ratelimit()) { | 92 | if (iph->frag_off & htons(IP_OFFSET)) |
| 93 | printk(KERN_ERR "ipv4_get_l4proto: Frag of proto %u\n", | ||
| 94 | iph->protocol); | ||
| 95 | } | ||
| 96 | return -NF_DROP; | 93 | return -NF_DROP; |
| 97 | } | ||
| 98 | 94 | ||
| 99 | *dataoff = nhoff + (iph->ihl << 2); | 95 | *dataoff = nhoff + (iph->ihl << 2); |
| 100 | *protonum = iph->protocol; | 96 | *protonum = iph->protocol; |
| @@ -403,6 +399,7 @@ static struct nf_sockopt_ops so_getorigdst = { | |||
| 403 | .get_optmin = SO_ORIGINAL_DST, | 399 | .get_optmin = SO_ORIGINAL_DST, |
| 404 | .get_optmax = SO_ORIGINAL_DST+1, | 400 | .get_optmax = SO_ORIGINAL_DST+1, |
| 405 | .get = &getorigdst, | 401 | .get = &getorigdst, |
| 402 | .owner = THIS_MODULE, | ||
| 406 | }; | 403 | }; |
| 407 | 404 | ||
| 408 | struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { | 405 | struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 5dead399fe64..26de3c0ea31e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -1427,8 +1427,9 @@ void ip6_flush_pending_frames(struct sock *sk) | |||
| 1427 | struct sk_buff *skb; | 1427 | struct sk_buff *skb; |
| 1428 | 1428 | ||
| 1429 | while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL) { | 1429 | while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL) { |
| 1430 | IP6_INC_STATS(ip6_dst_idev(skb->dst), | 1430 | if (skb->dst) |
| 1431 | IPSTATS_MIB_OUTDISCARDS); | 1431 | IP6_INC_STATS(ip6_dst_idev(skb->dst), |
| 1432 | IPSTATS_MIB_OUTDISCARDS); | ||
| 1432 | kfree_skb(skb); | 1433 | kfree_skb(skb); |
| 1433 | } | 1434 | } |
| 1434 | 1435 | ||
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 0358e6066a4e..73a894a2152c 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -736,7 +736,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 736 | * so fail our DAD process | 736 | * so fail our DAD process |
| 737 | */ | 737 | */ |
| 738 | addrconf_dad_failure(ifp); | 738 | addrconf_dad_failure(ifp); |
| 739 | goto out; | 739 | return; |
| 740 | } else { | 740 | } else { |
| 741 | /* | 741 | /* |
| 742 | * This is not a dad solicitation. | 742 | * This is not a dad solicitation. |
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index aeda617246b7..cd9df02bb85c 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
| @@ -1462,6 +1462,7 @@ static struct nf_sockopt_ops ip6t_sockopts = { | |||
| 1462 | .get_optmin = IP6T_BASE_CTL, | 1462 | .get_optmin = IP6T_BASE_CTL, |
| 1463 | .get_optmax = IP6T_SO_GET_MAX+1, | 1463 | .get_optmax = IP6T_SO_GET_MAX+1, |
| 1464 | .get = do_ip6t_get_ctl, | 1464 | .get = do_ip6t_get_ctl, |
| 1465 | .owner = THIS_MODULE, | ||
| 1465 | }; | 1466 | }; |
| 1466 | 1467 | ||
| 1467 | static struct xt_match icmp6_matchstruct __read_mostly = { | 1468 | static struct xt_match icmp6_matchstruct __read_mostly = { |
diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c index 8b8ece750313..e32761ce260c 100644 --- a/net/netfilter/nf_sockopt.c +++ b/net/netfilter/nf_sockopt.c | |||
| @@ -55,18 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt); | |||
| 55 | 55 | ||
| 56 | void nf_unregister_sockopt(struct nf_sockopt_ops *reg) | 56 | void nf_unregister_sockopt(struct nf_sockopt_ops *reg) |
| 57 | { | 57 | { |
| 58 | /* No point being interruptible: we're probably in cleanup_module() */ | ||
| 59 | restart: | ||
| 60 | mutex_lock(&nf_sockopt_mutex); | 58 | mutex_lock(&nf_sockopt_mutex); |
| 61 | if (reg->use != 0) { | ||
| 62 | /* To be woken by nf_sockopt call... */ | ||
| 63 | /* FIXME: Stuart Young's name appears gratuitously. */ | ||
| 64 | set_current_state(TASK_UNINTERRUPTIBLE); | ||
| 65 | reg->cleanup_task = current; | ||
| 66 | mutex_unlock(&nf_sockopt_mutex); | ||
| 67 | schedule(); | ||
| 68 | goto restart; | ||
| 69 | } | ||
| 70 | list_del(®->list); | 59 | list_del(®->list); |
| 71 | mutex_unlock(&nf_sockopt_mutex); | 60 | mutex_unlock(&nf_sockopt_mutex); |
| 72 | } | 61 | } |
| @@ -86,10 +75,11 @@ static int nf_sockopt(struct sock *sk, int pf, int val, | |||
| 86 | list_for_each(i, &nf_sockopts) { | 75 | list_for_each(i, &nf_sockopts) { |
| 87 | ops = (struct nf_sockopt_ops *)i; | 76 | ops = (struct nf_sockopt_ops *)i; |
| 88 | if (ops->pf == pf) { | 77 | if (ops->pf == pf) { |
| 78 | if (!try_module_get(ops->owner)) | ||
| 79 | goto out_nosup; | ||
| 89 | if (get) { | 80 | if (get) { |
| 90 | if (val >= ops->get_optmin | 81 | if (val >= ops->get_optmin |
| 91 | && val < ops->get_optmax) { | 82 | && val < ops->get_optmax) { |
| 92 | ops->use++; | ||
| 93 | mutex_unlock(&nf_sockopt_mutex); | 83 | mutex_unlock(&nf_sockopt_mutex); |
| 94 | ret = ops->get(sk, val, opt, len); | 84 | ret = ops->get(sk, val, opt, len); |
| 95 | goto out; | 85 | goto out; |
| @@ -97,23 +87,20 @@ static int nf_sockopt(struct sock *sk, int pf, int val, | |||
| 97 | } else { | 87 | } else { |
| 98 | if (val >= ops->set_optmin | 88 | if (val >= ops->set_optmin |
| 99 | && val < ops->set_optmax) { | 89 | && val < ops->set_optmax) { |
| 100 | ops->use++; | ||
| 101 | mutex_unlock(&nf_sockopt_mutex); | 90 | mutex_unlock(&nf_sockopt_mutex); |
| 102 | ret = ops->set(sk, val, opt, *len); | 91 | ret = ops->set(sk, val, opt, *len); |
| 103 | goto out; | 92 | goto out; |
| 104 | } | 93 | } |
| 105 | } | 94 | } |
| 95 | module_put(ops->owner); | ||
| 106 | } | 96 | } |
| 107 | } | 97 | } |
| 98 | out_nosup: | ||
| 108 | mutex_unlock(&nf_sockopt_mutex); | 99 | mutex_unlock(&nf_sockopt_mutex); |
| 109 | return -ENOPROTOOPT; | 100 | return -ENOPROTOOPT; |
| 110 | 101 | ||
| 111 | out: | 102 | out: |
| 112 | mutex_lock(&nf_sockopt_mutex); | 103 | module_put(ops->owner); |
| 113 | ops->use--; | ||
| 114 | if (ops->cleanup_task) | ||
| 115 | wake_up_process(ops->cleanup_task); | ||
| 116 | mutex_unlock(&nf_sockopt_mutex); | ||
| 117 | return ret; | 104 | return ret; |
| 118 | } | 105 | } |
| 119 | 106 | ||
| @@ -144,10 +131,12 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val, | |||
| 144 | list_for_each(i, &nf_sockopts) { | 131 | list_for_each(i, &nf_sockopts) { |
| 145 | ops = (struct nf_sockopt_ops *)i; | 132 | ops = (struct nf_sockopt_ops *)i; |
| 146 | if (ops->pf == pf) { | 133 | if (ops->pf == pf) { |
| 134 | if (!try_module_get(ops->owner)) | ||
| 135 | goto out_nosup; | ||
| 136 | |||
| 147 | if (get) { | 137 | if (get) { |
| 148 | if (val >= ops->get_optmin | 138 | if (val >= ops->get_optmin |
| 149 | && val < ops->get_optmax) { | 139 | && val < ops->get_optmax) { |
| 150 | ops->use++; | ||
| 151 | mutex_unlock(&nf_sockopt_mutex); | 140 | mutex_unlock(&nf_sockopt_mutex); |
| 152 | if (ops->compat_get) | 141 | if (ops->compat_get) |
| 153 | ret = ops->compat_get(sk, | 142 | ret = ops->compat_get(sk, |
| @@ -160,7 +149,6 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val, | |||
| 160 | } else { | 149 | } else { |
| 161 | if (val >= ops->set_optmin | 150 | if (val >= ops->set_optmin |
| 162 | && val < ops->set_optmax) { | 151 | && val < ops->set_optmax) { |
| 163 | ops->use++; | ||
| 164 | mutex_unlock(&nf_sockopt_mutex); | 152 | mutex_unlock(&nf_sockopt_mutex); |
| 165 | if (ops->compat_set) | 153 | if (ops->compat_set) |
| 166 | ret = ops->compat_set(sk, | 154 | ret = ops->compat_set(sk, |
| @@ -171,17 +159,15 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val, | |||
| 171 | goto out; | 159 | goto out; |
| 172 | } | 160 | } |
| 173 | } | 161 | } |
| 162 | module_put(ops->owner); | ||
| 174 | } | 163 | } |
| 175 | } | 164 | } |
| 165 | out_nosup: | ||
| 176 | mutex_unlock(&nf_sockopt_mutex); | 166 | mutex_unlock(&nf_sockopt_mutex); |
| 177 | return -ENOPROTOOPT; | 167 | return -ENOPROTOOPT; |
| 178 | 168 | ||
| 179 | out: | 169 | out: |
| 180 | mutex_lock(&nf_sockopt_mutex); | 170 | module_put(ops->owner); |
| 181 | ops->use--; | ||
| 182 | if (ops->cleanup_task) | ||
| 183 | wake_up_process(ops->cleanup_task); | ||
| 184 | mutex_unlock(&nf_sockopt_mutex); | ||
| 185 | return ret; | 171 | return ret; |
| 186 | } | 172 | } |
| 187 | 173 | ||