diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
Merge branch 'merge'
283 files changed, 7551 insertions, 3818 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO index 6c9e746267da..915ae8c986c6 100644 --- a/Documentation/HOWTO +++ b/Documentation/HOWTO | |||
| @@ -603,7 +603,8 @@ start exactly where you are now. | |||
| 603 | 603 | ||
| 604 | 604 | ||
| 605 | ---------- | 605 | ---------- |
| 606 | Thanks to Paolo Ciarrocchi who allowed the "Development Process" section | 606 | Thanks to Paolo Ciarrocchi who allowed the "Development Process" |
| 607 | (http://linux.tar.bz/articles/2.6-development_process) section | ||
| 607 | to be based on text he had written, and to Randy Dunlap and Gerrit | 608 | to be based on text he had written, and to Randy Dunlap and Gerrit |
| 608 | Huizenga for some of the list of things you should and should not say. | 609 | Huizenga for some of the list of things you should and should not say. |
| 609 | Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers, | 610 | Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers, |
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt index c8bce82ddcac..89b1d196ca80 100644 --- a/Documentation/filesystems/sysfs.txt +++ b/Documentation/filesystems/sysfs.txt | |||
| @@ -246,6 +246,7 @@ class/ | |||
| 246 | devices/ | 246 | devices/ |
| 247 | firmware/ | 247 | firmware/ |
| 248 | net/ | 248 | net/ |
| 249 | fs/ | ||
| 249 | 250 | ||
| 250 | devices/ contains a filesystem representation of the device tree. It maps | 251 | devices/ contains a filesystem representation of the device tree. It maps |
| 251 | directly to the internal kernel device tree, which is a hierarchy of | 252 | directly to the internal kernel device tree, which is a hierarchy of |
| @@ -264,6 +265,10 @@ drivers/ contains a directory for each device driver that is loaded | |||
| 264 | for devices on that particular bus (this assumes that drivers do not | 265 | for devices on that particular bus (this assumes that drivers do not |
| 265 | span multiple bus types). | 266 | span multiple bus types). |
| 266 | 267 | ||
| 268 | fs/ contains a directory for some filesystems. Currently each | ||
| 269 | filesystem wanting to export attributes must create its own hierarchy | ||
| 270 | below fs/ (see ./fuse.txt for an example). | ||
| 271 | |||
| 267 | 272 | ||
| 268 | More information can driver-model specific features can be found in | 273 | More information can driver-model specific features can be found in |
| 269 | Documentation/driver-model/. | 274 | Documentation/driver-model/. |
diff --git a/Documentation/pci.txt b/Documentation/pci.txt index 711210b38f5f..66bbbf1d1ef6 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt | |||
| @@ -259,7 +259,17 @@ on the bus need to be capable of doing it, so this is something which needs | |||
| 259 | to be handled by platform and generic code, not individual drivers. | 259 | to be handled by platform and generic code, not individual drivers. |
| 260 | 260 | ||
| 261 | 261 | ||
| 262 | 8. Obsolete functions | 262 | 8. Vendor and device identifications |
| 263 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 264 | For the future, let's avoid adding device ids to include/linux/pci_ids.h. | ||
| 265 | |||
| 266 | PCI_VENDOR_ID_xxx for vendors, and a hex constant for device ids. | ||
| 267 | |||
| 268 | Rationale: PCI_VENDOR_ID_xxx constants are re-used, but device ids are not. | ||
| 269 | Further, device ids are arbitrary hex numbers, normally used only in a | ||
| 270 | single location, the pci_device_id table. | ||
| 271 | |||
| 272 | 9. Obsolete functions | ||
| 263 | ~~~~~~~~~~~~~~~~~~~~~ | 273 | ~~~~~~~~~~~~~~~~~~~~~ |
| 264 | There are several functions which you might come across when trying to | 274 | There are several functions which you might come across when trying to |
| 265 | port an old driver to the new PCI interface. They are no longer present | 275 | port an old driver to the new PCI interface. They are no longer present |
diff --git a/MAINTAINERS b/MAINTAINERS index 61060e82fb0e..d6a8e5b434ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -421,6 +421,14 @@ L: linux-hams@vger.kernel.org | |||
| 421 | W: http://www.baycom.org/~tom/ham/ham.html | 421 | W: http://www.baycom.org/~tom/ham/ham.html |
| 422 | S: Maintained | 422 | S: Maintained |
| 423 | 423 | ||
| 424 | BCM43XX WIRELESS DRIVER | ||
| 425 | P: Michael Buesch | ||
| 426 | M: mb@bu3sch.de | ||
| 427 | P: Stefano Brivio | ||
| 428 | M: st3@riseup.net | ||
| 429 | W: http://bcm43xx.berlios.de/ | ||
| 430 | S: Maintained | ||
| 431 | |||
| 424 | BEFS FILE SYSTEM | 432 | BEFS FILE SYSTEM |
| 425 | P: Sergey S. Kostyliov | 433 | P: Sergey S. Kostyliov |
| 426 | M: rathamahata@php4.ru | 434 | M: rathamahata@php4.ru |
| @@ -2065,8 +2073,12 @@ P: Matthew Wilcox | |||
| 2065 | M: matthew@wil.cx | 2073 | M: matthew@wil.cx |
| 2066 | P: Grant Grundler | 2074 | P: Grant Grundler |
| 2067 | M: grundler@parisc-linux.org | 2075 | M: grundler@parisc-linux.org |
| 2076 | P: Kyle McMartin | ||
| 2077 | M: kyle@parisc-linux.org | ||
| 2068 | L: parisc-linux@parisc-linux.org | 2078 | L: parisc-linux@parisc-linux.org |
| 2069 | W: http://www.parisc-linux.org/ | 2079 | W: http://www.parisc-linux.org/ |
| 2080 | T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git | ||
| 2081 | T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6 | ||
| 2070 | S: Maintained | 2082 | S: Maintained |
| 2071 | 2083 | ||
| 2072 | PCI ERROR RECOVERY | 2084 | PCI ERROR RECOVERY |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 17 | 3 | SUBLEVEL = 17 |
| 4 | EXTRAVERSION =-rc2 | 4 | EXTRAVERSION =-rc3 |
| 5 | NAME=Sliding Snow Leopard | 5 | NAME=Sliding Snow Leopard |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/alpha/lib/strncpy.S b/arch/alpha/lib/strncpy.S index 338551c7113c..bbdef1be5f95 100644 --- a/arch/alpha/lib/strncpy.S +++ b/arch/alpha/lib/strncpy.S | |||
| @@ -43,8 +43,8 @@ strncpy: | |||
| 43 | 43 | ||
| 44 | .align 4 | 44 | .align 4 |
| 45 | $multiword: | 45 | $multiword: |
| 46 | subq $24, 1, $2 # clear the final bits in the prev word | 46 | subq $27, 1, $2 # clear the final bits in the prev word |
| 47 | or $2, $24, $2 | 47 | or $2, $27, $2 |
| 48 | zapnot $1, $2, $1 | 48 | zapnot $1, $2, $1 |
| 49 | subq $18, 1, $18 | 49 | subq $18, 1, $18 |
| 50 | 50 | ||
| @@ -70,8 +70,8 @@ $multiword: | |||
| 70 | bne $18, 0b | 70 | bne $18, 0b |
| 71 | 71 | ||
| 72 | 1: ldq_u $1, 0($16) # clear the leading bits in the final word | 72 | 1: ldq_u $1, 0($16) # clear the leading bits in the final word |
| 73 | subq $27, 1, $2 | 73 | subq $24, 1, $2 |
| 74 | or $2, $27, $2 | 74 | or $2, $24, $2 |
| 75 | 75 | ||
| 76 | zap $1, $2, $1 | 76 | zap $1, $2, $1 |
| 77 | stq_u $1, 0($16) | 77 | stq_u $1, 0($16) |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 95a96275f88a..6f8e84c1c1f2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -66,7 +66,7 @@ tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) - | |||
| 66 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) | 66 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) |
| 67 | 67 | ||
| 68 | ifeq ($(CONFIG_AEABI),y) | 68 | ifeq ($(CONFIG_AEABI),y) |
| 69 | CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork | 69 | CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork |
| 70 | else | 70 | else |
| 71 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) | 71 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) |
| 72 | endif | 72 | endif |
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 2ce0e3a27a45..a601b8b55f35 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
| @@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y) | |||
| 29 | obj-y += io.o | 29 | obj-y += io.o |
| 30 | endif | 30 | endif |
| 31 | 31 | ||
| 32 | head-y := head.o | 32 | head-y := head$(MMUEXT).o |
| 33 | obj-$(CONFIG_DEBUG_LL) += debug.o | 33 | obj-$(CONFIG_DEBUG_LL) += debug.o |
| 34 | 34 | ||
| 35 | extra-y := $(head-y) init_task.o vmlinux.lds | 35 | extra-y := $(head-y) init_task.o vmlinux.lds |
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index b093ab8738b5..0bea65864051 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
| @@ -20,10 +20,11 @@ | |||
| 20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 21 | #include <asm/procinfo.h> | 21 | #include <asm/procinfo.h> |
| 22 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
| 23 | #include <asm/constants.h> | 23 | #include <asm/thread_info.h> |
| 24 | #include <asm/system.h> | 24 | #include <asm/system.h> |
| 25 | 25 | ||
| 26 | #define PROCINFO_INITFUNC 12 | 26 | #define PROCINFO_INITFUNC 12 |
| 27 | #define MACHINFO_TYPE 0 | ||
| 27 | 28 | ||
| 28 | /* | 29 | /* |
| 29 | * Kernel startup entry point. | 30 | * Kernel startup entry point. |
| @@ -79,5 +80,6 @@ __after_proc_init: | |||
| 79 | 80 | ||
| 80 | mov pc, r13 @ clear the BSS and jump | 81 | mov pc, r13 @ clear the BSS and jump |
| 81 | @ to start_kernel | 82 | @ to start_kernel |
| 83 | .ltorg | ||
| 82 | 84 | ||
| 83 | #include "head-common.S" | 85 | #include "head-common.S" |
diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c index febd115dba28..009038c8113e 100644 --- a/arch/arm/vfp/vfpdouble.c +++ b/arch/arm/vfp/vfpdouble.c | |||
| @@ -197,7 +197,7 @@ u32 vfp_double_normaliseround(int dd, struct vfp_double *vd, u32 fpscr, u32 exce | |||
| 197 | dd, d, exceptions); | 197 | dd, d, exceptions); |
| 198 | vfp_put_double(dd, d); | 198 | vfp_put_double(dd, d); |
| 199 | } | 199 | } |
| 200 | return exceptions & ~VFP_NAN_FLAG; | 200 | return exceptions; |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | /* | 203 | /* |
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 22f3da4e0829..37ff8145b5b5 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
| @@ -180,7 +180,7 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) | |||
| 180 | * emulate it. | 180 | * emulate it. |
| 181 | */ | 181 | */ |
| 182 | } | 182 | } |
| 183 | return exceptions; | 183 | return exceptions & ~VFP_NAN_FLAG; |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | /* | 186 | /* |
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c index 4ac27f193934..dae2c2f46052 100644 --- a/arch/arm/vfp/vfpsingle.c +++ b/arch/arm/vfp/vfpsingle.c | |||
| @@ -203,7 +203,7 @@ u32 vfp_single_normaliseround(int sd, struct vfp_single *vs, u32 fpscr, u32 exce | |||
| 203 | vfp_put_float(sd, d); | 203 | vfp_put_float(sd, d); |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | return exceptions & ~VFP_NAN_FLAG; | 206 | return exceptions; |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | /* | 209 | /* |
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c index 9df87b03612c..c8547a6fa7e6 100644 --- a/arch/i386/kernel/cpu/intel_cacheinfo.c +++ b/arch/i386/kernel/cpu/intel_cacheinfo.c | |||
| @@ -642,7 +642,7 @@ static void __cpuexit cache_remove_dev(struct sys_device * sys_dev) | |||
| 642 | return; | 642 | return; |
| 643 | } | 643 | } |
| 644 | 644 | ||
| 645 | static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb, | 645 | static int cacheinfo_cpu_callback(struct notifier_block *nfb, |
| 646 | unsigned long action, void *hcpu) | 646 | unsigned long action, void *hcpu) |
| 647 | { | 647 | { |
| 648 | unsigned int cpu = (unsigned long)hcpu; | 648 | unsigned int cpu = (unsigned long)hcpu; |
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 73235443fda7..06dab00aaadc 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -591,7 +591,6 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 591 | case PCI_DEVICE_ID_VIA_8233A: | 591 | case PCI_DEVICE_ID_VIA_8233A: |
| 592 | case PCI_DEVICE_ID_VIA_8235: | 592 | case PCI_DEVICE_ID_VIA_8235: |
| 593 | case PCI_DEVICE_ID_VIA_8237: | 593 | case PCI_DEVICE_ID_VIA_8237: |
| 594 | case PCI_DEVICE_ID_VIA_8237_SATA: | ||
| 595 | /* FIXME: add new ones for 8233/5 */ | 594 | /* FIXME: add new ones for 8233/5 */ |
| 596 | r->name = "VIA"; | 595 | r->name = "VIA"; |
| 597 | r->get = pirq_via_get; | 596 | r->get = pirq_via_get; |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9f40eeff0b5c..0f3076a820c3 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -413,6 +413,8 @@ config IA64_PALINFO | |||
| 413 | config SGI_SN | 413 | config SGI_SN |
| 414 | def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) | 414 | def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) |
| 415 | 415 | ||
| 416 | source "drivers/sn/Kconfig" | ||
| 417 | |||
| 416 | source "drivers/firmware/Kconfig" | 418 | source "drivers/firmware/Kconfig" |
| 417 | 419 | ||
| 418 | source "fs/Kconfig.binfmt" | 420 | source "fs/Kconfig.binfmt" |
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index a718034d68d0..f6a8853cd1b4 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc5 | 3 | # Linux kernel version: 2.6.17-rc3 |
| 4 | # Mon Feb 27 16:06:38 2006 | 4 | # Thu Apr 27 11:48:23 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| @@ -24,6 +24,7 @@ CONFIG_SYSCTL=y | |||
| 24 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 25 | # CONFIG_IKCONFIG is not set | 25 | # CONFIG_IKCONFIG is not set |
| 26 | CONFIG_CPUSETS=y | 26 | CONFIG_CPUSETS=y |
| 27 | CONFIG_RELAY=y | ||
| 27 | CONFIG_INITRAMFS_SOURCE="" | 28 | CONFIG_INITRAMFS_SOURCE="" |
| 28 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 29 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 29 | # CONFIG_EMBEDDED is not set | 30 | # CONFIG_EMBEDDED is not set |
| @@ -38,10 +39,6 @@ CONFIG_BASE_FULL=y | |||
| 38 | CONFIG_FUTEX=y | 39 | CONFIG_FUTEX=y |
| 39 | CONFIG_EPOLL=y | 40 | CONFIG_EPOLL=y |
| 40 | CONFIG_SHMEM=y | 41 | CONFIG_SHMEM=y |
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | CONFIG_SLAB=y | 42 | CONFIG_SLAB=y |
| 46 | # CONFIG_TINY_SHMEM is not set | 43 | # CONFIG_TINY_SHMEM is not set |
| 47 | CONFIG_BASE_SMALL=0 | 44 | CONFIG_BASE_SMALL=0 |
| @@ -53,7 +50,6 @@ CONFIG_BASE_SMALL=0 | |||
| 53 | CONFIG_MODULES=y | 50 | CONFIG_MODULES=y |
| 54 | CONFIG_MODULE_UNLOAD=y | 51 | CONFIG_MODULE_UNLOAD=y |
| 55 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 52 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 56 | CONFIG_OBSOLETE_MODPARM=y | ||
| 57 | # CONFIG_MODVERSIONS is not set | 53 | # CONFIG_MODVERSIONS is not set |
| 58 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 54 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 59 | CONFIG_KMOD=y | 55 | CONFIG_KMOD=y |
| @@ -62,6 +58,7 @@ CONFIG_STOP_MACHINE=y | |||
| 62 | # | 58 | # |
| 63 | # Block layer | 59 | # Block layer |
| 64 | # | 60 | # |
| 61 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 65 | 62 | ||
| 66 | # | 63 | # |
| 67 | # IO Schedulers | 64 | # IO Schedulers |
| @@ -84,8 +81,10 @@ CONFIG_64BIT=y | |||
| 84 | CONFIG_MMU=y | 81 | CONFIG_MMU=y |
| 85 | CONFIG_SWIOTLB=y | 82 | CONFIG_SWIOTLB=y |
| 86 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 83 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 84 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 87 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 85 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 88 | CONFIG_TIME_INTERPOLATION=y | 86 | CONFIG_TIME_INTERPOLATION=y |
| 87 | CONFIG_DMI=y | ||
| 89 | CONFIG_EFI=y | 88 | CONFIG_EFI=y |
| 90 | CONFIG_GENERIC_IOMAP=y | 89 | CONFIG_GENERIC_IOMAP=y |
| 91 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 90 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| @@ -116,7 +115,6 @@ CONFIG_IA64_SGI_SN_XP=m | |||
| 116 | CONFIG_FORCE_MAX_ZONEORDER=17 | 115 | CONFIG_FORCE_MAX_ZONEORDER=17 |
| 117 | CONFIG_SMP=y | 116 | CONFIG_SMP=y |
| 118 | CONFIG_NR_CPUS=1024 | 117 | CONFIG_NR_CPUS=1024 |
| 119 | CONFIG_IA64_NR_NODES=256 | ||
| 120 | # CONFIG_HOTPLUG_CPU is not set | 118 | # CONFIG_HOTPLUG_CPU is not set |
| 121 | CONFIG_SCHED_SMT=y | 119 | CONFIG_SCHED_SMT=y |
| 122 | CONFIG_PREEMPT=y | 120 | CONFIG_PREEMPT=y |
| @@ -136,6 +134,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y | |||
| 136 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 134 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 137 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | 135 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y |
| 138 | CONFIG_NUMA=y | 136 | CONFIG_NUMA=y |
| 137 | CONFIG_NODES_SHIFT=8 | ||
| 139 | CONFIG_VIRTUAL_MEM_MAP=y | 138 | CONFIG_VIRTUAL_MEM_MAP=y |
| 140 | CONFIG_HOLES_IN_ZONE=y | 139 | CONFIG_HOLES_IN_ZONE=y |
| 141 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 140 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
| @@ -187,7 +186,6 @@ CONFIG_ACPI_SYSTEM=y | |||
| 187 | CONFIG_PCI=y | 186 | CONFIG_PCI=y |
| 188 | CONFIG_PCI_DOMAINS=y | 187 | CONFIG_PCI_DOMAINS=y |
| 189 | # CONFIG_PCI_MSI is not set | 188 | # CONFIG_PCI_MSI is not set |
| 190 | CONFIG_PCI_LEGACY_PROC=y | ||
| 191 | # CONFIG_PCI_DEBUG is not set | 189 | # CONFIG_PCI_DEBUG is not set |
| 192 | 190 | ||
| 193 | # | 191 | # |
| @@ -231,6 +229,7 @@ CONFIG_SYN_COOKIES=y | |||
| 231 | # CONFIG_INET_AH is not set | 229 | # CONFIG_INET_AH is not set |
| 232 | # CONFIG_INET_ESP is not set | 230 | # CONFIG_INET_ESP is not set |
| 233 | # CONFIG_INET_IPCOMP is not set | 231 | # CONFIG_INET_IPCOMP is not set |
| 232 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 234 | # CONFIG_INET_TUNNEL is not set | 233 | # CONFIG_INET_TUNNEL is not set |
| 235 | CONFIG_INET_DIAG=m | 234 | CONFIG_INET_DIAG=m |
| 236 | CONFIG_INET_TCP_DIAG=m | 235 | CONFIG_INET_TCP_DIAG=m |
| @@ -238,9 +237,11 @@ CONFIG_INET_TCP_DIAG=m | |||
| 238 | CONFIG_TCP_CONG_BIC=y | 237 | CONFIG_TCP_CONG_BIC=y |
| 239 | CONFIG_IPV6=m | 238 | CONFIG_IPV6=m |
| 240 | # CONFIG_IPV6_PRIVACY is not set | 239 | # CONFIG_IPV6_PRIVACY is not set |
| 240 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 241 | # CONFIG_INET6_AH is not set | 241 | # CONFIG_INET6_AH is not set |
| 242 | # CONFIG_INET6_ESP is not set | 242 | # CONFIG_INET6_ESP is not set |
| 243 | # CONFIG_INET6_IPCOMP is not set | 243 | # CONFIG_INET6_IPCOMP is not set |
| 244 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 244 | # CONFIG_INET6_TUNNEL is not set | 245 | # CONFIG_INET6_TUNNEL is not set |
| 245 | # CONFIG_IPV6_TUNNEL is not set | 246 | # CONFIG_IPV6_TUNNEL is not set |
| 246 | # CONFIG_NETFILTER is not set | 247 | # CONFIG_NETFILTER is not set |
| @@ -468,9 +469,14 @@ CONFIG_SCSI_SATA_VITESSE=y | |||
| 468 | # CONFIG_SCSI_INIA100 is not set | 469 | # CONFIG_SCSI_INIA100 is not set |
| 469 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 470 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 470 | # CONFIG_SCSI_IPR is not set | 471 | # CONFIG_SCSI_IPR is not set |
| 471 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 472 | CONFIG_SCSI_QLOGIC_1280=y | 472 | CONFIG_SCSI_QLOGIC_1280=y |
| 473 | # CONFIG_SCSI_QLA_FC is not set | 473 | CONFIG_SCSI_QLA_FC=y |
| 474 | CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y | ||
| 475 | # CONFIG_SCSI_QLA21XX is not set | ||
| 476 | CONFIG_SCSI_QLA22XX=y | ||
| 477 | CONFIG_SCSI_QLA2300=y | ||
| 478 | CONFIG_SCSI_QLA2322=y | ||
| 479 | # CONFIG_SCSI_QLA24XX is not set | ||
| 474 | # CONFIG_SCSI_LPFC is not set | 480 | # CONFIG_SCSI_LPFC is not set |
| 475 | # CONFIG_SCSI_DC395x is not set | 481 | # CONFIG_SCSI_DC395x is not set |
| 476 | # CONFIG_SCSI_DC390T is not set | 482 | # CONFIG_SCSI_DC390T is not set |
| @@ -486,6 +492,7 @@ CONFIG_MD_RAID0=y | |||
| 486 | CONFIG_MD_RAID1=y | 492 | CONFIG_MD_RAID1=y |
| 487 | # CONFIG_MD_RAID10 is not set | 493 | # CONFIG_MD_RAID10 is not set |
| 488 | CONFIG_MD_RAID5=y | 494 | CONFIG_MD_RAID5=y |
| 495 | # CONFIG_MD_RAID5_RESHAPE is not set | ||
| 489 | # CONFIG_MD_RAID6 is not set | 496 | # CONFIG_MD_RAID6 is not set |
| 490 | CONFIG_MD_MULTIPATH=y | 497 | CONFIG_MD_MULTIPATH=y |
| 491 | # CONFIG_MD_FAULTY is not set | 498 | # CONFIG_MD_FAULTY is not set |
| @@ -694,6 +701,7 @@ CONFIG_EFI_RTC=y | |||
| 694 | # Ftape, the floppy tape device driver | 701 | # Ftape, the floppy tape device driver |
| 695 | # | 702 | # |
| 696 | CONFIG_AGP=y | 703 | CONFIG_AGP=y |
| 704 | # CONFIG_AGP_VIA is not set | ||
| 697 | CONFIG_AGP_SGI_TIOCA=y | 705 | CONFIG_AGP_SGI_TIOCA=y |
| 698 | # CONFIG_DRM is not set | 706 | # CONFIG_DRM is not set |
| 699 | CONFIG_RAW_DRIVER=m | 707 | CONFIG_RAW_DRIVER=m |
| @@ -735,10 +743,6 @@ CONFIG_MMTIMER=y | |||
| 735 | # | 743 | # |
| 736 | 744 | ||
| 737 | # | 745 | # |
| 738 | # Multimedia Capabilities Port drivers | ||
| 739 | # | ||
| 740 | |||
| 741 | # | ||
| 742 | # Multimedia devices | 746 | # Multimedia devices |
| 743 | # | 747 | # |
| 744 | # CONFIG_VIDEO_DEV is not set | 748 | # CONFIG_VIDEO_DEV is not set |
| @@ -747,6 +751,7 @@ CONFIG_MMTIMER=y | |||
| 747 | # Digital Video Broadcasting Devices | 751 | # Digital Video Broadcasting Devices |
| 748 | # | 752 | # |
| 749 | # CONFIG_DVB is not set | 753 | # CONFIG_DVB is not set |
| 754 | # CONFIG_USB_DABUSB is not set | ||
| 750 | 755 | ||
| 751 | # | 756 | # |
| 752 | # Graphics support | 757 | # Graphics support |
| @@ -757,6 +762,7 @@ CONFIG_MMTIMER=y | |||
| 757 | # Console display driver support | 762 | # Console display driver support |
| 758 | # | 763 | # |
| 759 | CONFIG_VGA_CONSOLE=y | 764 | CONFIG_VGA_CONSOLE=y |
| 765 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 760 | CONFIG_DUMMY_CONSOLE=y | 766 | CONFIG_DUMMY_CONSOLE=y |
| 761 | 767 | ||
| 762 | # | 768 | # |
| @@ -769,6 +775,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 769 | # | 775 | # |
| 770 | CONFIG_USB_ARCH_HAS_HCD=y | 776 | CONFIG_USB_ARCH_HAS_HCD=y |
| 771 | CONFIG_USB_ARCH_HAS_OHCI=y | 777 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 778 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 772 | CONFIG_USB=m | 779 | CONFIG_USB=m |
| 773 | # CONFIG_USB_DEBUG is not set | 780 | # CONFIG_USB_DEBUG is not set |
| 774 | 781 | ||
| @@ -829,9 +836,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 829 | # CONFIG_USB_ACECAD is not set | 836 | # CONFIG_USB_ACECAD is not set |
| 830 | # CONFIG_USB_KBTAB is not set | 837 | # CONFIG_USB_KBTAB is not set |
| 831 | # CONFIG_USB_POWERMATE is not set | 838 | # CONFIG_USB_POWERMATE is not set |
| 832 | # CONFIG_USB_MTOUCH is not set | 839 | # CONFIG_USB_TOUCHSCREEN is not set |
| 833 | # CONFIG_USB_ITMTOUCH is not set | ||
| 834 | # CONFIG_USB_EGALAX is not set | ||
| 835 | # CONFIG_USB_YEALINK is not set | 840 | # CONFIG_USB_YEALINK is not set |
| 836 | # CONFIG_USB_XPAD is not set | 841 | # CONFIG_USB_XPAD is not set |
| 837 | # CONFIG_USB_ATI_REMOTE is not set | 842 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -846,15 +851,6 @@ CONFIG_USB_HIDINPUT=y | |||
| 846 | # CONFIG_USB_MICROTEK is not set | 851 | # CONFIG_USB_MICROTEK is not set |
| 847 | 852 | ||
| 848 | # | 853 | # |
| 849 | # USB Multimedia devices | ||
| 850 | # | ||
| 851 | # CONFIG_USB_DABUSB is not set | ||
| 852 | |||
| 853 | # | ||
| 854 | # Video4Linux support is needed for USB Multimedia device support | ||
| 855 | # | ||
| 856 | |||
| 857 | # | ||
| 858 | # USB Network Adapters | 854 | # USB Network Adapters |
| 859 | # | 855 | # |
| 860 | # CONFIG_USB_CATC is not set | 856 | # CONFIG_USB_CATC is not set |
| @@ -905,15 +901,29 @@ CONFIG_USB_MON=y | |||
| 905 | # CONFIG_MMC is not set | 901 | # CONFIG_MMC is not set |
| 906 | 902 | ||
| 907 | # | 903 | # |
| 904 | # LED devices | ||
| 905 | # | ||
| 906 | # CONFIG_NEW_LEDS is not set | ||
| 907 | |||
| 908 | # | ||
| 909 | # LED drivers | ||
| 910 | # | ||
| 911 | |||
| 912 | # | ||
| 913 | # LED Triggers | ||
| 914 | # | ||
| 915 | |||
| 916 | # | ||
| 908 | # InfiniBand support | 917 | # InfiniBand support |
| 909 | # | 918 | # |
| 910 | CONFIG_INFINIBAND=m | 919 | CONFIG_INFINIBAND=m |
| 911 | # CONFIG_INFINIBAND_USER_MAD is not set | 920 | # CONFIG_INFINIBAND_USER_MAD is not set |
| 912 | CONFIG_INFINIBAND_USER_ACCESS=m | 921 | CONFIG_INFINIBAND_USER_ACCESS=m |
| 913 | CONFIG_INFINIBAND_MTHCA=m | 922 | CONFIG_INFINIBAND_MTHCA=m |
| 914 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 923 | CONFIG_INFINIBAND_MTHCA_DEBUG=y |
| 915 | CONFIG_INFINIBAND_IPOIB=m | 924 | CONFIG_INFINIBAND_IPOIB=m |
| 916 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | 925 | CONFIG_INFINIBAND_IPOIB_DEBUG=y |
| 926 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | ||
| 917 | CONFIG_INFINIBAND_SRP=m | 927 | CONFIG_INFINIBAND_SRP=m |
| 918 | 928 | ||
| 919 | # | 929 | # |
| @@ -923,8 +933,13 @@ CONFIG_SGI_IOC4=y | |||
| 923 | CONFIG_SGI_IOC3=y | 933 | CONFIG_SGI_IOC3=y |
| 924 | 934 | ||
| 925 | # | 935 | # |
| 926 | # EDAC - error detection and reporting (RAS) | 936 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 937 | # | ||
| 938 | |||
| 939 | # | ||
| 940 | # Real Time Clock | ||
| 927 | # | 941 | # |
| 942 | # CONFIG_RTC_CLASS is not set | ||
| 928 | 943 | ||
| 929 | # | 944 | # |
| 930 | # File systems | 945 | # File systems |
| @@ -997,7 +1012,6 @@ CONFIG_TMPFS=y | |||
| 997 | CONFIG_HUGETLBFS=y | 1012 | CONFIG_HUGETLBFS=y |
| 998 | CONFIG_HUGETLB_PAGE=y | 1013 | CONFIG_HUGETLB_PAGE=y |
| 999 | CONFIG_RAMFS=y | 1014 | CONFIG_RAMFS=y |
| 1000 | CONFIG_RELAYFS_FS=m | ||
| 1001 | # CONFIG_CONFIGFS_FS is not set | 1015 | # CONFIG_CONFIGFS_FS is not set |
| 1002 | 1016 | ||
| 1003 | # | 1017 | # |
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 4e7a6a1ec6c7..da03c06744f1 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
| @@ -35,6 +35,9 @@ extern void ia64_elf32_init (struct pt_regs *regs); | |||
| 35 | 35 | ||
| 36 | static void elf32_set_personality (void); | 36 | static void elf32_set_personality (void); |
| 37 | 37 | ||
| 38 | static unsigned long __attribute ((unused)) | ||
| 39 | randomize_stack_top(unsigned long stack_top); | ||
| 40 | |||
| 38 | #define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec) | 41 | #define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec) |
| 39 | #define elf_map elf32_map | 42 | #define elf_map elf32_map |
| 40 | 43 | ||
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 95fe04400f6b..a32cd59b81ed 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
| @@ -334,7 +334,7 @@ ia32_syscall_table: | |||
| 334 | data8 sys_setdomainname | 334 | data8 sys_setdomainname |
| 335 | data8 sys32_newuname | 335 | data8 sys32_newuname |
| 336 | data8 sys32_modify_ldt | 336 | data8 sys32_modify_ldt |
| 337 | data8 sys_ni_syscall /* adjtimex */ | 337 | data8 compat_sys_adjtimex |
| 338 | data8 sys32_mprotect /* 125 */ | 338 | data8 sys32_mprotect /* 125 */ |
| 339 | data8 compat_sys_sigprocmask | 339 | data8 compat_sys_sigprocmask |
| 340 | data8 sys_ni_syscall /* create_module */ | 340 | data8 sys_ni_syscall /* create_module */ |
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index e30798811216..bcb80ca5cf40 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1610,5 +1610,6 @@ sys_call_table: | |||
| 1610 | data8 sys_get_robust_list | 1610 | data8 sys_get_robust_list |
| 1611 | data8 sys_sync_file_range // 1300 | 1611 | data8 sys_sync_file_range // 1300 |
| 1612 | data8 sys_tee | 1612 | data8 sys_tee |
| 1613 | data8 sys_vmsplice | ||
| 1613 | 1614 | ||
| 1614 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1615 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index 37c88eb55873..ca6666b51ccb 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c | |||
| @@ -62,6 +62,11 @@ typedef enum { | |||
| 62 | ISOLATE_NONE | 62 | ISOLATE_NONE |
| 63 | } isolate_status_t; | 63 | } isolate_status_t; |
| 64 | 64 | ||
| 65 | typedef enum { | ||
| 66 | MCA_NOT_RECOVERED = 0, | ||
| 67 | MCA_RECOVERED = 1 | ||
| 68 | } recovery_status_t; | ||
| 69 | |||
| 65 | /* | 70 | /* |
| 66 | * This pool keeps pointers to the section part of SAL error record | 71 | * This pool keeps pointers to the section part of SAL error record |
| 67 | */ | 72 | */ |
| @@ -71,6 +76,18 @@ static struct { | |||
| 71 | int max_idx; /* Maximum index of section pointer list pool */ | 76 | int max_idx; /* Maximum index of section pointer list pool */ |
| 72 | } slidx_pool; | 77 | } slidx_pool; |
| 73 | 78 | ||
| 79 | static int | ||
| 80 | fatal_mca(const char *fmt, ...) | ||
| 81 | { | ||
| 82 | va_list args; | ||
| 83 | |||
| 84 | va_start(args, fmt); | ||
| 85 | vprintk(fmt, args); | ||
| 86 | va_end(args); | ||
| 87 | |||
| 88 | return MCA_NOT_RECOVERED; | ||
| 89 | } | ||
| 90 | |||
| 74 | /** | 91 | /** |
| 75 | * mca_page_isolate - isolate a poisoned page in order not to use it later | 92 | * mca_page_isolate - isolate a poisoned page in order not to use it later |
| 76 | * @paddr: poisoned memory location | 93 | * @paddr: poisoned memory location |
| @@ -424,7 +441,7 @@ recover_from_read_error(slidx_table_t *slidx, | |||
| 424 | 441 | ||
| 425 | /* Is target address valid? */ | 442 | /* Is target address valid? */ |
| 426 | if (!pbci->tv) | 443 | if (!pbci->tv) |
| 427 | return 0; | 444 | return fatal_mca(KERN_ALERT "MCA: target address not valid\n"); |
| 428 | 445 | ||
| 429 | /* | 446 | /* |
| 430 | * cpu read or memory-mapped io read | 447 | * cpu read or memory-mapped io read |
| @@ -442,7 +459,7 @@ recover_from_read_error(slidx_table_t *slidx, | |||
| 442 | 459 | ||
| 443 | /* Is minstate valid? */ | 460 | /* Is minstate valid? */ |
| 444 | if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate)) | 461 | if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate)) |
| 445 | return 0; | 462 | return fatal_mca(KERN_ALERT "MCA: minstate not valid\n"); |
| 446 | psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr); | 463 | psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr); |
| 447 | psr2 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_xpsr); | 464 | psr2 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_xpsr); |
| 448 | 465 | ||
| @@ -476,12 +493,13 @@ recover_from_read_error(slidx_table_t *slidx, | |||
| 476 | psr2->bn = 1; | 493 | psr2->bn = 1; |
| 477 | psr2->i = 0; | 494 | psr2->i = 0; |
| 478 | 495 | ||
| 479 | return 1; | 496 | return MCA_RECOVERED; |
| 480 | } | 497 | } |
| 481 | 498 | ||
| 482 | } | 499 | } |
| 483 | 500 | ||
| 484 | return 0; | 501 | return fatal_mca(KERN_ALERT "MCA: kernel context not recovered," |
| 502 | " iip 0x%lx\n", pmsa->pmsa_iip); | ||
| 485 | } | 503 | } |
| 486 | 504 | ||
| 487 | /** | 505 | /** |
| @@ -567,13 +585,13 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, | |||
| 567 | * The machine check is corrected. | 585 | * The machine check is corrected. |
| 568 | */ | 586 | */ |
| 569 | if (psp->cm == 1) | 587 | if (psp->cm == 1) |
| 570 | return 1; | 588 | return MCA_RECOVERED; |
| 571 | 589 | ||
| 572 | /* | 590 | /* |
| 573 | * The error was not contained. Software must be reset. | 591 | * The error was not contained. Software must be reset. |
| 574 | */ | 592 | */ |
| 575 | if (psp->us || psp->ci == 0) | 593 | if (psp->us || psp->ci == 0) |
| 576 | return 0; | 594 | return fatal_mca(KERN_ALERT "MCA: error not contained\n"); |
| 577 | 595 | ||
| 578 | /* | 596 | /* |
| 579 | * The cache check and bus check bits have four possible states | 597 | * The cache check and bus check bits have four possible states |
| @@ -584,20 +602,22 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, | |||
| 584 | * 1 1 Memory error, attempt recovery | 602 | * 1 1 Memory error, attempt recovery |
| 585 | */ | 603 | */ |
| 586 | if (psp->bc == 0 || pbci == NULL) | 604 | if (psp->bc == 0 || pbci == NULL) |
| 587 | return 0; | 605 | return fatal_mca(KERN_ALERT "MCA: No bus check\n"); |
| 588 | 606 | ||
| 589 | /* | 607 | /* |
| 590 | * Sorry, we cannot handle so many. | 608 | * Sorry, we cannot handle so many. |
| 591 | */ | 609 | */ |
| 592 | if (peidx_bus_check_num(peidx) > 1) | 610 | if (peidx_bus_check_num(peidx) > 1) |
| 593 | return 0; | 611 | return fatal_mca(KERN_ALERT "MCA: Too many bus checks\n"); |
| 594 | /* | 612 | /* |
| 595 | * Well, here is only one bus error. | 613 | * Well, here is only one bus error. |
| 596 | */ | 614 | */ |
| 597 | if (pbci->ib || pbci->cc) | 615 | if (pbci->ib) |
| 598 | return 0; | 616 | return fatal_mca(KERN_ALERT "MCA: Internal Bus error\n"); |
| 617 | if (pbci->cc) | ||
| 618 | return fatal_mca(KERN_ALERT "MCA: Cache-cache error\n"); | ||
| 599 | if (pbci->eb && pbci->bsi > 0) | 619 | if (pbci->eb && pbci->bsi > 0) |
| 600 | return 0; | 620 | return fatal_mca(KERN_ALERT "MCA: External bus check fatal status\n"); |
| 601 | 621 | ||
| 602 | /* | 622 | /* |
| 603 | * This is a local MCA and estimated as recoverble external bus error. | 623 | * This is a local MCA and estimated as recoverble external bus error. |
| @@ -609,7 +629,7 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, | |||
| 609 | /* | 629 | /* |
| 610 | * On account of strange SAL error record, we cannot recover. | 630 | * On account of strange SAL error record, we cannot recover. |
| 611 | */ | 631 | */ |
| 612 | return 0; | 632 | return fatal_mca(KERN_ALERT "MCA: Strange SAL record\n"); |
| 613 | } | 633 | } |
| 614 | 634 | ||
| 615 | /** | 635 | /** |
| @@ -638,12 +658,10 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos) | |||
| 638 | 658 | ||
| 639 | /* Now, OS can recover when there is one processor error section */ | 659 | /* Now, OS can recover when there is one processor error section */ |
| 640 | if (n_proc_err > 1) | 660 | if (n_proc_err > 1) |
| 641 | return 0; | 661 | return fatal_mca(KERN_ALERT "MCA: Too Many Errors\n"); |
| 642 | else if (n_proc_err == 0) { | 662 | else if (n_proc_err == 0) |
| 643 | /* Weird SAL record ... We need not to recover */ | 663 | /* Weird SAL record ... We need not to recover */ |
| 644 | 664 | return fatal_mca(KERN_ALERT "MCA: Weird SAL record\n"); | |
| 645 | return 1; | ||
| 646 | } | ||
| 647 | 665 | ||
| 648 | /* Make index of processor error section */ | 666 | /* Make index of processor error section */ |
| 649 | mca_make_peidx((sal_log_processor_info_t*) | 667 | mca_make_peidx((sal_log_processor_info_t*) |
| @@ -654,7 +672,7 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos) | |||
| 654 | 672 | ||
| 655 | /* Check whether MCA is global or not */ | 673 | /* Check whether MCA is global or not */ |
| 656 | if (is_mca_global(&peidx, &pbci, sos)) | 674 | if (is_mca_global(&peidx, &pbci, sos)) |
| 657 | return 0; | 675 | return fatal_mca(KERN_ALERT "MCA: global MCA\n"); |
| 658 | 676 | ||
| 659 | /* Try to recover a processor error */ | 677 | /* Try to recover a processor error */ |
| 660 | return recover_from_processor_error(platform_err, &slidx, &peidx, | 678 | return recover_from_processor_error(platform_err, &slidx, &peidx, |
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c index 6386f63c413e..859fb37ff49b 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c | |||
| @@ -959,7 +959,7 @@ remove_palinfo_proc_entries(unsigned int hcpu) | |||
| 959 | } | 959 | } |
| 960 | } | 960 | } |
| 961 | 961 | ||
| 962 | static int __devinit palinfo_cpu_callback(struct notifier_block *nfb, | 962 | static int palinfo_cpu_callback(struct notifier_block *nfb, |
| 963 | unsigned long action, | 963 | unsigned long action, |
| 964 | void *hcpu) | 964 | void *hcpu) |
| 965 | { | 965 | { |
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index 9d5a823479a3..663a186ad194 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c | |||
| @@ -572,7 +572,7 @@ static struct file_operations salinfo_data_fops = { | |||
| 572 | }; | 572 | }; |
| 573 | 573 | ||
| 574 | #ifdef CONFIG_HOTPLUG_CPU | 574 | #ifdef CONFIG_HOTPLUG_CPU |
| 575 | static int __devinit | 575 | static int |
| 576 | salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) | 576 | salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) |
| 577 | { | 577 | { |
| 578 | unsigned int i, cpu = (unsigned long)hcpu; | 578 | unsigned int i, cpu = (unsigned long)hcpu; |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index b47476d655f1..4f3a16b37f8f 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -305,13 +305,10 @@ static struct kobj_type cache_ktype_percpu_entry = { | |||
| 305 | 305 | ||
| 306 | static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu) | 306 | static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu) |
| 307 | { | 307 | { |
| 308 | if (all_cpu_cache_info[cpu].cache_leaves) { | 308 | kfree(all_cpu_cache_info[cpu].cache_leaves); |
| 309 | kfree(all_cpu_cache_info[cpu].cache_leaves); | 309 | all_cpu_cache_info[cpu].cache_leaves = NULL; |
| 310 | all_cpu_cache_info[cpu].cache_leaves = NULL; | ||
| 311 | } | ||
| 312 | all_cpu_cache_info[cpu].num_cache_leaves = 0; | 310 | all_cpu_cache_info[cpu].num_cache_leaves = 0; |
| 313 | memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject)); | 311 | memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject)); |
| 314 | |||
| 315 | return; | 312 | return; |
| 316 | } | 313 | } |
| 317 | 314 | ||
| @@ -429,7 +426,7 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev) | |||
| 429 | * When a cpu is hot-plugged, do a check and initiate | 426 | * When a cpu is hot-plugged, do a check and initiate |
| 430 | * cache kobject if necessary | 427 | * cache kobject if necessary |
| 431 | */ | 428 | */ |
| 432 | static int __cpuinit cache_cpu_callback(struct notifier_block *nfb, | 429 | static int cache_cpu_callback(struct notifier_block *nfb, |
| 433 | unsigned long action, void *hcpu) | 430 | unsigned long action, void *hcpu) |
| 434 | { | 431 | { |
| 435 | unsigned int cpu = (unsigned long)hcpu; | 432 | unsigned int cpu = (unsigned long)hcpu; |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 9ba32b2d96d0..ab829a22f8a4 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 32 | #include <asm/hw_irq.h> | 32 | #include <asm/hw_irq.h> |
| 33 | 33 | ||
| 34 | |||
| 35 | /* | 34 | /* |
| 36 | * Low-level SAL-based PCI configuration access functions. Note that SAL | 35 | * Low-level SAL-based PCI configuration access functions. Note that SAL |
| 37 | * calls are already serialized (via sal_lock), so we don't need another | 36 | * calls are already serialized (via sal_lock), so we don't need another |
| @@ -707,7 +706,7 @@ int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size) | |||
| 707 | * | 706 | * |
| 708 | * Simply writes @size bytes of @val to @port. | 707 | * Simply writes @size bytes of @val to @port. |
| 709 | */ | 708 | */ |
| 710 | int ia64_pci_legacy_write(struct pci_dev *bus, u16 port, u32 val, u8 size) | 709 | int ia64_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size) |
| 711 | { | 710 | { |
| 712 | int ret = size; | 711 | int ret = size; |
| 713 | 712 | ||
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index d917afa30b27..739c948dc504 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
| @@ -284,6 +284,8 @@ static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objb | |||
| 284 | /* find nearest node with cpus and nearest memory */ | 284 | /* find nearest node with cpus and nearest memory */ |
| 285 | for (router=NULL, j=0; j < op->ports; j++) { | 285 | for (router=NULL, j=0; j < op->ports; j++) { |
| 286 | dest = sn_hwperf_findobj_id(objbuf, nobj, ptdata[j].conn_id); | 286 | dest = sn_hwperf_findobj_id(objbuf, nobj, ptdata[j].conn_id); |
| 287 | if (dest && SN_HWPERF_IS_ROUTER(dest)) | ||
| 288 | router = dest; | ||
| 287 | if (!dest || SN_HWPERF_FOREIGN(dest) || | 289 | if (!dest || SN_HWPERF_FOREIGN(dest) || |
| 288 | !SN_HWPERF_IS_NODE(dest) || SN_HWPERF_IS_IONODE(dest)) { | 290 | !SN_HWPERF_IS_NODE(dest) || SN_HWPERF_IS_IONODE(dest)) { |
| 289 | continue; | 291 | continue; |
| @@ -299,8 +301,6 @@ static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objb | |||
| 299 | *near_mem_node = c; | 301 | *near_mem_node = c; |
| 300 | found_mem++; | 302 | found_mem++; |
| 301 | } | 303 | } |
| 302 | if (SN_HWPERF_IS_ROUTER(dest)) | ||
| 303 | router = dest; | ||
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | if (router && (!found_cpu || !found_mem)) { | 306 | if (router && (!found_cpu || !found_mem)) { |
| @@ -493,7 +493,7 @@ static int sn_topology_show(struct seq_file *s, void *d) | |||
| 493 | * numalink ports | 493 | * numalink ports |
| 494 | */ | 494 | */ |
| 495 | sz = obj->ports * sizeof(struct sn_hwperf_port_info); | 495 | sz = obj->ports * sizeof(struct sn_hwperf_port_info); |
| 496 | if ((ptdata = vmalloc(sz)) == NULL) | 496 | if ((ptdata = kmalloc(sz, GFP_KERNEL)) == NULL) |
| 497 | return -ENOMEM; | 497 | return -ENOMEM; |
| 498 | e = ia64_sn_hwperf_op(sn_hwperf_master_nasid, | 498 | e = ia64_sn_hwperf_op(sn_hwperf_master_nasid, |
| 499 | SN_HWPERF_ENUM_PORTS, obj->id, sz, | 499 | SN_HWPERF_ENUM_PORTS, obj->id, sz, |
| @@ -541,7 +541,7 @@ static int sn_topology_show(struct seq_file *s, void *d) | |||
| 541 | (SN_HWPERF_IS_NL3ROUTER(obj) || | 541 | (SN_HWPERF_IS_NL3ROUTER(obj) || |
| 542 | SN_HWPERF_IS_NL3ROUTER(p)) ? "LLP3" : "LLP4"); | 542 | SN_HWPERF_IS_NL3ROUTER(p)) ? "LLP3" : "LLP4"); |
| 543 | } | 543 | } |
| 544 | vfree(ptdata); | 544 | kfree(ptdata); |
| 545 | } | 545 | } |
| 546 | 546 | ||
| 547 | return 0; | 547 | return 0; |
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c index 94211429fd0c..2a89cfce4954 100644 --- a/arch/ia64/sn/kernel/xpc_partition.c +++ b/arch/ia64/sn/kernel/xpc_partition.c | |||
| @@ -136,9 +136,7 @@ xpc_get_rsvd_page_pa(int nasid) | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | if (L1_CACHE_ALIGN(len) > buf_len) { | 138 | if (L1_CACHE_ALIGN(len) > buf_len) { |
| 139 | if (buf_base != NULL) { | 139 | kfree(buf_base); |
| 140 | kfree(buf_base); | ||
| 141 | } | ||
| 142 | buf_len = L1_CACHE_ALIGN(len); | 140 | buf_len = L1_CACHE_ALIGN(len); |
| 143 | buf = (u64) xpc_kmalloc_cacheline_aligned(buf_len, | 141 | buf = (u64) xpc_kmalloc_cacheline_aligned(buf_len, |
| 144 | GFP_KERNEL, &buf_base); | 142 | GFP_KERNEL, &buf_base); |
| @@ -159,9 +157,7 @@ xpc_get_rsvd_page_pa(int nasid) | |||
| 159 | } | 157 | } |
| 160 | } | 158 | } |
| 161 | 159 | ||
| 162 | if (buf_base != NULL) { | 160 | kfree(buf_base); |
| 163 | kfree(buf_base); | ||
| 164 | } | ||
| 165 | 161 | ||
| 166 | if (status != SALRET_OK) { | 162 | if (status != SALRET_OK) { |
| 167 | rp_pa = 0; | 163 | rp_pa = 0; |
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index fa073cc4b565..833295624e5d 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c | |||
| @@ -682,9 +682,6 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit) | |||
| 682 | int ate_index, last_ate, ps; | 682 | int ate_index, last_ate, ps; |
| 683 | struct tioce *ce_mmr; | 683 | struct tioce *ce_mmr; |
| 684 | 684 | ||
| 685 | if (!TIOCE_M32_ADDR(base)) | ||
| 686 | return; | ||
| 687 | |||
| 688 | ce_mmr = (struct tioce *)ce_kern->ce_common->ce_pcibus.bs_base; | 685 | ce_mmr = (struct tioce *)ce_kern->ce_common->ce_pcibus.bs_base; |
| 689 | ps = ce_kern->ce_ate3240_pagesize; | 686 | ps = ce_kern->ce_ate3240_pagesize; |
| 690 | ate_index = ATE_PAGE(base, ps); | 687 | ate_index = ATE_PAGE(base, ps); |
| @@ -693,6 +690,9 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit) | |||
| 693 | if (ate_index < 64) | 690 | if (ate_index < 64) |
| 694 | ate_index = 64; | 691 | ate_index = 64; |
| 695 | 692 | ||
| 693 | if (last_ate >= TIOCE_NUM_M3240_ATES) | ||
| 694 | last_ate = TIOCE_NUM_M3240_ATES - 1; | ||
| 695 | |||
| 696 | while (ate_index <= last_ate) { | 696 | while (ate_index <= last_ate) { |
| 697 | u64 ate; | 697 | u64 ate; |
| 698 | 698 | ||
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 87f0b79c6b15..ee5fbb02b28f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -1067,6 +1067,7 @@ choice | |||
| 1067 | config CPU_MIPS32_R1 | 1067 | config CPU_MIPS32_R1 |
| 1068 | bool "MIPS32 Release 1" | 1068 | bool "MIPS32 Release 1" |
| 1069 | depends on SYS_HAS_CPU_MIPS32_R1 | 1069 | depends on SYS_HAS_CPU_MIPS32_R1 |
| 1070 | select CPU_HAS_LLSC | ||
| 1070 | select CPU_HAS_PREFETCH | 1071 | select CPU_HAS_PREFETCH |
| 1071 | select CPU_SUPPORTS_32BIT_KERNEL | 1072 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1072 | select CPU_SUPPORTS_HIGHMEM | 1073 | select CPU_SUPPORTS_HIGHMEM |
| @@ -1084,6 +1085,7 @@ config CPU_MIPS32_R1 | |||
| 1084 | config CPU_MIPS32_R2 | 1085 | config CPU_MIPS32_R2 |
| 1085 | bool "MIPS32 Release 2" | 1086 | bool "MIPS32 Release 2" |
| 1086 | depends on SYS_HAS_CPU_MIPS32_R2 | 1087 | depends on SYS_HAS_CPU_MIPS32_R2 |
| 1088 | select CPU_HAS_LLSC | ||
| 1087 | select CPU_HAS_PREFETCH | 1089 | select CPU_HAS_PREFETCH |
| 1088 | select CPU_SUPPORTS_32BIT_KERNEL | 1090 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1089 | select CPU_SUPPORTS_HIGHMEM | 1091 | select CPU_SUPPORTS_HIGHMEM |
| @@ -1097,6 +1099,7 @@ config CPU_MIPS32_R2 | |||
| 1097 | config CPU_MIPS64_R1 | 1099 | config CPU_MIPS64_R1 |
| 1098 | bool "MIPS64 Release 1" | 1100 | bool "MIPS64 Release 1" |
| 1099 | depends on SYS_HAS_CPU_MIPS64_R1 | 1101 | depends on SYS_HAS_CPU_MIPS64_R1 |
| 1102 | select CPU_HAS_LLSC | ||
| 1100 | select CPU_HAS_PREFETCH | 1103 | select CPU_HAS_PREFETCH |
| 1101 | select CPU_SUPPORTS_32BIT_KERNEL | 1104 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1102 | select CPU_SUPPORTS_64BIT_KERNEL | 1105 | select CPU_SUPPORTS_64BIT_KERNEL |
| @@ -1115,6 +1118,7 @@ config CPU_MIPS64_R1 | |||
| 1115 | config CPU_MIPS64_R2 | 1118 | config CPU_MIPS64_R2 |
| 1116 | bool "MIPS64 Release 2" | 1119 | bool "MIPS64 Release 2" |
| 1117 | depends on SYS_HAS_CPU_MIPS64_R2 | 1120 | depends on SYS_HAS_CPU_MIPS64_R2 |
| 1121 | select CPU_HAS_LLSC | ||
| 1118 | select CPU_HAS_PREFETCH | 1122 | select CPU_HAS_PREFETCH |
| 1119 | select CPU_SUPPORTS_32BIT_KERNEL | 1123 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1120 | select CPU_SUPPORTS_64BIT_KERNEL | 1124 | select CPU_SUPPORTS_64BIT_KERNEL |
| @@ -1129,6 +1133,7 @@ config CPU_MIPS64_R2 | |||
| 1129 | config CPU_R3000 | 1133 | config CPU_R3000 |
| 1130 | bool "R3000" | 1134 | bool "R3000" |
| 1131 | depends on SYS_HAS_CPU_R3000 | 1135 | depends on SYS_HAS_CPU_R3000 |
| 1136 | select CPU_HAS_WB | ||
| 1132 | select CPU_SUPPORTS_32BIT_KERNEL | 1137 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1133 | select CPU_SUPPORTS_HIGHMEM | 1138 | select CPU_SUPPORTS_HIGHMEM |
| 1134 | help | 1139 | help |
| @@ -1158,6 +1163,7 @@ config CPU_VR41XX | |||
| 1158 | config CPU_R4300 | 1163 | config CPU_R4300 |
| 1159 | bool "R4300" | 1164 | bool "R4300" |
| 1160 | depends on SYS_HAS_CPU_R4300 | 1165 | depends on SYS_HAS_CPU_R4300 |
| 1166 | select CPU_HAS_LLSC | ||
| 1161 | select CPU_SUPPORTS_32BIT_KERNEL | 1167 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1162 | select CPU_SUPPORTS_64BIT_KERNEL | 1168 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1163 | help | 1169 | help |
| @@ -1166,6 +1172,7 @@ config CPU_R4300 | |||
| 1166 | config CPU_R4X00 | 1172 | config CPU_R4X00 |
| 1167 | bool "R4x00" | 1173 | bool "R4x00" |
| 1168 | depends on SYS_HAS_CPU_R4X00 | 1174 | depends on SYS_HAS_CPU_R4X00 |
| 1175 | select CPU_HAS_LLSC | ||
| 1169 | select CPU_SUPPORTS_32BIT_KERNEL | 1176 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1170 | select CPU_SUPPORTS_64BIT_KERNEL | 1177 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1171 | help | 1178 | help |
| @@ -1175,6 +1182,7 @@ config CPU_R4X00 | |||
| 1175 | config CPU_TX49XX | 1182 | config CPU_TX49XX |
| 1176 | bool "R49XX" | 1183 | bool "R49XX" |
| 1177 | depends on SYS_HAS_CPU_TX49XX | 1184 | depends on SYS_HAS_CPU_TX49XX |
| 1185 | select CPU_HAS_LLSC | ||
| 1178 | select CPU_HAS_PREFETCH | 1186 | select CPU_HAS_PREFETCH |
| 1179 | select CPU_SUPPORTS_32BIT_KERNEL | 1187 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1180 | select CPU_SUPPORTS_64BIT_KERNEL | 1188 | select CPU_SUPPORTS_64BIT_KERNEL |
| @@ -1182,6 +1190,7 @@ config CPU_TX49XX | |||
| 1182 | config CPU_R5000 | 1190 | config CPU_R5000 |
| 1183 | bool "R5000" | 1191 | bool "R5000" |
| 1184 | depends on SYS_HAS_CPU_R5000 | 1192 | depends on SYS_HAS_CPU_R5000 |
| 1193 | select CPU_HAS_LLSC | ||
| 1185 | select CPU_SUPPORTS_32BIT_KERNEL | 1194 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1186 | select CPU_SUPPORTS_64BIT_KERNEL | 1195 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1187 | help | 1196 | help |
| @@ -1190,12 +1199,14 @@ config CPU_R5000 | |||
| 1190 | config CPU_R5432 | 1199 | config CPU_R5432 |
| 1191 | bool "R5432" | 1200 | bool "R5432" |
| 1192 | depends on SYS_HAS_CPU_R5432 | 1201 | depends on SYS_HAS_CPU_R5432 |
| 1202 | select CPU_HAS_LLSC | ||
| 1193 | select CPU_SUPPORTS_32BIT_KERNEL | 1203 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1194 | select CPU_SUPPORTS_64BIT_KERNEL | 1204 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1195 | 1205 | ||
| 1196 | config CPU_R6000 | 1206 | config CPU_R6000 |
| 1197 | bool "R6000" | 1207 | bool "R6000" |
| 1198 | depends on EXPERIMENTAL | 1208 | depends on EXPERIMENTAL |
| 1209 | select CPU_HAS_LLSC | ||
| 1199 | depends on SYS_HAS_CPU_R6000 | 1210 | depends on SYS_HAS_CPU_R6000 |
| 1200 | select CPU_SUPPORTS_32BIT_KERNEL | 1211 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1201 | help | 1212 | help |
| @@ -1205,6 +1216,7 @@ config CPU_R6000 | |||
| 1205 | config CPU_NEVADA | 1216 | config CPU_NEVADA |
| 1206 | bool "RM52xx" | 1217 | bool "RM52xx" |
| 1207 | depends on SYS_HAS_CPU_NEVADA | 1218 | depends on SYS_HAS_CPU_NEVADA |
| 1219 | select CPU_HAS_LLSC | ||
| 1208 | select CPU_SUPPORTS_32BIT_KERNEL | 1220 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1209 | select CPU_SUPPORTS_64BIT_KERNEL | 1221 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1210 | help | 1222 | help |
| @@ -1214,6 +1226,7 @@ config CPU_R8000 | |||
| 1214 | bool "R8000" | 1226 | bool "R8000" |
| 1215 | depends on EXPERIMENTAL | 1227 | depends on EXPERIMENTAL |
| 1216 | depends on SYS_HAS_CPU_R8000 | 1228 | depends on SYS_HAS_CPU_R8000 |
| 1229 | select CPU_HAS_LLSC | ||
| 1217 | select CPU_HAS_PREFETCH | 1230 | select CPU_HAS_PREFETCH |
| 1218 | select CPU_SUPPORTS_64BIT_KERNEL | 1231 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1219 | help | 1232 | help |
| @@ -1223,6 +1236,7 @@ config CPU_R8000 | |||
| 1223 | config CPU_R10000 | 1236 | config CPU_R10000 |
| 1224 | bool "R10000" | 1237 | bool "R10000" |
| 1225 | depends on SYS_HAS_CPU_R10000 | 1238 | depends on SYS_HAS_CPU_R10000 |
| 1239 | select CPU_HAS_LLSC | ||
| 1226 | select CPU_HAS_PREFETCH | 1240 | select CPU_HAS_PREFETCH |
| 1227 | select CPU_SUPPORTS_32BIT_KERNEL | 1241 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1228 | select CPU_SUPPORTS_64BIT_KERNEL | 1242 | select CPU_SUPPORTS_64BIT_KERNEL |
| @@ -1233,6 +1247,7 @@ config CPU_R10000 | |||
| 1233 | config CPU_RM7000 | 1247 | config CPU_RM7000 |
| 1234 | bool "RM7000" | 1248 | bool "RM7000" |
| 1235 | depends on SYS_HAS_CPU_RM7000 | 1249 | depends on SYS_HAS_CPU_RM7000 |
| 1250 | select CPU_HAS_LLSC | ||
| 1236 | select CPU_HAS_PREFETCH | 1251 | select CPU_HAS_PREFETCH |
| 1237 | select CPU_SUPPORTS_32BIT_KERNEL | 1252 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1238 | select CPU_SUPPORTS_64BIT_KERNEL | 1253 | select CPU_SUPPORTS_64BIT_KERNEL |
| @@ -1241,6 +1256,7 @@ config CPU_RM7000 | |||
| 1241 | config CPU_RM9000 | 1256 | config CPU_RM9000 |
| 1242 | bool "RM9000" | 1257 | bool "RM9000" |
| 1243 | depends on SYS_HAS_CPU_RM9000 | 1258 | depends on SYS_HAS_CPU_RM9000 |
| 1259 | select CPU_HAS_LLSC | ||
| 1244 | select CPU_HAS_PREFETCH | 1260 | select CPU_HAS_PREFETCH |
| 1245 | select CPU_SUPPORTS_32BIT_KERNEL | 1261 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1246 | select CPU_SUPPORTS_64BIT_KERNEL | 1262 | select CPU_SUPPORTS_64BIT_KERNEL |
| @@ -1249,6 +1265,7 @@ config CPU_RM9000 | |||
| 1249 | config CPU_SB1 | 1265 | config CPU_SB1 |
| 1250 | bool "SB1" | 1266 | bool "SB1" |
| 1251 | depends on SYS_HAS_CPU_SB1 | 1267 | depends on SYS_HAS_CPU_SB1 |
| 1268 | select CPU_HAS_LLSC | ||
| 1252 | select CPU_SUPPORTS_32BIT_KERNEL | 1269 | select CPU_SUPPORTS_32BIT_KERNEL |
| 1253 | select CPU_SUPPORTS_64BIT_KERNEL | 1270 | select CPU_SUPPORTS_64BIT_KERNEL |
| 1254 | select CPU_SUPPORTS_HIGHMEM | 1271 | select CPU_SUPPORTS_HIGHMEM |
| @@ -1449,6 +1466,8 @@ choice | |||
| 1449 | 1466 | ||
| 1450 | config MIPS_MT_SMTC | 1467 | config MIPS_MT_SMTC |
| 1451 | bool "SMTC: Use all TCs on all VPEs for SMP" | 1468 | bool "SMTC: Use all TCs on all VPEs for SMP" |
| 1469 | select CPU_MIPSR2_IRQ_VI | ||
| 1470 | select CPU_MIPSR2_SRS | ||
| 1452 | select SMP | 1471 | select SMP |
| 1453 | 1472 | ||
| 1454 | config MIPS_MT_SMP | 1473 | config MIPS_MT_SMP |
| @@ -1514,38 +1533,15 @@ config 64BIT_PHYS_ADDR | |||
| 1514 | bool "Support for 64-bit physical address space" | 1533 | bool "Support for 64-bit physical address space" |
| 1515 | depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT | 1534 | depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT |
| 1516 | 1535 | ||
| 1517 | config CPU_ADVANCED | ||
| 1518 | bool "Override CPU Options" | ||
| 1519 | depends on 32BIT | ||
| 1520 | help | ||
| 1521 | Saying yes here allows you to select support for various features | ||
| 1522 | your CPU may or may not have. Most people should say N here. | ||
| 1523 | |||
| 1524 | config CPU_HAS_LLSC | 1536 | config CPU_HAS_LLSC |
| 1525 | bool "ll/sc Instructions available" if CPU_ADVANCED | 1537 | bool |
| 1526 | default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX | ||
| 1527 | help | ||
| 1528 | MIPS R4000 series and later provide the Load Linked (ll) | ||
| 1529 | and Store Conditional (sc) instructions. More information is | ||
| 1530 | available at <http://www.go-ecs.com/mips/miptek1.htm>. | ||
| 1531 | |||
| 1532 | Say Y here if your CPU has the ll and sc instructions. Say Y here | ||
| 1533 | for better performance, N if you don't know. You must say Y here | ||
| 1534 | for multiprocessor machines. | ||
| 1535 | 1538 | ||
| 1536 | config CPU_HAS_WB | 1539 | config CPU_HAS_WB |
| 1537 | bool "Writeback Buffer available" if CPU_ADVANCED | 1540 | bool |
| 1538 | default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION | ||
| 1539 | help | ||
| 1540 | Say N here for slightly better performance. You must say Y here for | ||
| 1541 | machines which require flushing of write buffers in software. Saying | ||
| 1542 | Y is the safe option; N may result in kernel malfunction and crashes. | ||
| 1543 | |||
| 1544 | menu "MIPSR2 Interrupt handling" | ||
| 1545 | depends on CPU_MIPSR2 && CPU_ADVANCED | ||
| 1546 | 1541 | ||
| 1547 | config CPU_MIPSR2_IRQ_VI | 1542 | config CPU_MIPSR2_IRQ_VI |
| 1548 | bool "Vectored interrupt mode" | 1543 | bool "Vectored interrupt mode" |
| 1544 | depends on CPU_MIPSR2 | ||
| 1549 | help | 1545 | help |
| 1550 | Vectored interrupt mode allowing faster dispatching of interrupts. | 1546 | Vectored interrupt mode allowing faster dispatching of interrupts. |
| 1551 | The board support code needs to be written to take advantage of this | 1547 | The board support code needs to be written to take advantage of this |
| @@ -1555,6 +1551,7 @@ config CPU_MIPSR2_IRQ_VI | |||
| 1555 | 1551 | ||
| 1556 | config CPU_MIPSR2_IRQ_EI | 1552 | config CPU_MIPSR2_IRQ_EI |
| 1557 | bool "External interrupt controller mode" | 1553 | bool "External interrupt controller mode" |
| 1554 | depends on CPU_MIPSR2 | ||
| 1558 | help | 1555 | help |
| 1559 | Extended interrupt mode takes advantage of an external interrupt | 1556 | Extended interrupt mode takes advantage of an external interrupt |
| 1560 | controller to allow fast dispatching from many possible interrupt | 1557 | controller to allow fast dispatching from many possible interrupt |
| @@ -1568,7 +1565,6 @@ config CPU_MIPSR2_SRS | |||
| 1568 | Allow the kernel to use shadow register sets for fast interrupts. | 1565 | Allow the kernel to use shadow register sets for fast interrupts. |
| 1569 | Interrupt handlers must be specially written to use shadow sets. | 1566 | Interrupt handlers must be specially written to use shadow sets. |
| 1570 | Say N unless you know that shadow register set upport is needed. | 1567 | Say N unless you know that shadow register set upport is needed. |
| 1571 | endmenu | ||
| 1572 | 1568 | ||
| 1573 | config CPU_HAS_SYNC | 1569 | config CPU_HAS_SYNC |
| 1574 | bool | 1570 | bool |
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index d3c5cc3b9c9d..515f9e611307 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
| @@ -6,7 +6,13 @@ config CROSSCOMPILE | |||
| 6 | bool "Are you using a crosscompiler" | 6 | bool "Are you using a crosscompiler" |
| 7 | help | 7 | help |
| 8 | Say Y here if you are compiling the kernel on a different | 8 | Say Y here if you are compiling the kernel on a different |
| 9 | architecture than the one it is intended to run on. | 9 | architecture than the one it is intended to run on. This is just a |
| 10 | convenience option which will select the appropriate value for | ||
| 11 | the CROSS_COMPILE make variable which otherwise has to be passed on | ||
| 12 | the command line from mips-linux-, mipsel-linux-, mips64-linux- and | ||
| 13 | mips64el-linux- as appropriate for a particular kernel configuration. | ||
| 14 | You will have to pass the value for CROSS_COMPILE manually if the | ||
| 15 | name prefix for your tools is different. | ||
| 10 | 16 | ||
| 11 | config CMDLINE | 17 | config CMDLINE |
| 12 | string "Default kernel command string" | 18 | string "Default kernel command string" |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 69b9c1b8fafc..133900aca992 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -615,7 +615,10 @@ LDFLAGS += -m $(ld-emul) | |||
| 615 | ifdef CONFIG_MIPS | 615 | ifdef CONFIG_MIPS |
| 616 | CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \ | 616 | CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \ |
| 617 | egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \ | 617 | egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \ |
| 618 | sed -e 's/^\#define /-D/' -e 's/ /="/' -e 's/$$/"/') | 618 | sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/") |
| 619 | ifdef CONFIG_64BIT | ||
| 620 | CHECKFLAGS += -m64 | ||
| 621 | endif | ||
| 619 | endif | 622 | endif |
| 620 | 623 | ||
| 621 | OBJCOPYFLAGS += --remove-section=.reginfo | 624 | OBJCOPYFLAGS += --remove-section=.reginfo |
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 9e1ae953e966..4b080bcb258f 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:52 2006 | 4 | # Mon Apr 24 14:50:55 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_ATLAS=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -127,11 +129,11 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 127 | CONFIG_CPU_HAS_PREFETCH=y | 129 | CONFIG_CPU_HAS_PREFETCH=y |
| 128 | # CONFIG_MIPS_MT is not set | 130 | # CONFIG_MIPS_MT is not set |
| 129 | # CONFIG_64BIT_PHYS_ADDR is not set | 131 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 130 | # CONFIG_CPU_ADVANCED is not set | ||
| 131 | CONFIG_CPU_HAS_LLSC=y | 132 | CONFIG_CPU_HAS_LLSC=y |
| 132 | CONFIG_CPU_HAS_SYNC=y | 133 | CONFIG_CPU_HAS_SYNC=y |
| 133 | CONFIG_GENERIC_HARDIRQS=y | 134 | CONFIG_GENERIC_HARDIRQS=y |
| 134 | CONFIG_GENERIC_IRQ_PROBE=y | 135 | CONFIG_GENERIC_IRQ_PROBE=y |
| 136 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 135 | CONFIG_ARCH_FLATMEM_ENABLE=y | 137 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 136 | CONFIG_SELECT_MEMORY_MODEL=y | 138 | CONFIG_SELECT_MEMORY_MODEL=y |
| 137 | CONFIG_FLATMEM_MANUAL=y | 139 | CONFIG_FLATMEM_MANUAL=y |
| @@ -149,7 +151,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 149 | # Code maturity level options | 151 | # Code maturity level options |
| 150 | # | 152 | # |
| 151 | CONFIG_EXPERIMENTAL=y | 153 | CONFIG_EXPERIMENTAL=y |
| 152 | CONFIG_CLEAN_COMPILE=y | ||
| 153 | CONFIG_BROKEN_ON_SMP=y | 154 | CONFIG_BROKEN_ON_SMP=y |
| 154 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 155 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 155 | 156 | ||
| @@ -165,6 +166,7 @@ CONFIG_SYSVIPC=y | |||
| 165 | CONFIG_SYSCTL=y | 166 | CONFIG_SYSCTL=y |
| 166 | # CONFIG_AUDIT is not set | 167 | # CONFIG_AUDIT is not set |
| 167 | # CONFIG_IKCONFIG is not set | 168 | # CONFIG_IKCONFIG is not set |
| 169 | CONFIG_RELAY=y | ||
| 168 | CONFIG_INITRAMFS_SOURCE="" | 170 | CONFIG_INITRAMFS_SOURCE="" |
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 171 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 170 | CONFIG_EMBEDDED=y | 172 | CONFIG_EMBEDDED=y |
| @@ -178,10 +180,6 @@ CONFIG_BASE_FULL=y | |||
| 178 | CONFIG_FUTEX=y | 180 | CONFIG_FUTEX=y |
| 179 | CONFIG_EPOLL=y | 181 | CONFIG_EPOLL=y |
| 180 | CONFIG_SHMEM=y | 182 | CONFIG_SHMEM=y |
| 181 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 182 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 183 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 184 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 185 | CONFIG_SLAB=y | 183 | CONFIG_SLAB=y |
| 186 | # CONFIG_TINY_SHMEM is not set | 184 | # CONFIG_TINY_SHMEM is not set |
| 187 | CONFIG_BASE_SMALL=0 | 185 | CONFIG_BASE_SMALL=0 |
| @@ -193,7 +191,6 @@ CONFIG_BASE_SMALL=0 | |||
| 193 | CONFIG_MODULES=y | 191 | CONFIG_MODULES=y |
| 194 | CONFIG_MODULE_UNLOAD=y | 192 | CONFIG_MODULE_UNLOAD=y |
| 195 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 193 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 196 | CONFIG_OBSOLETE_MODPARM=y | ||
| 197 | CONFIG_MODVERSIONS=y | 194 | CONFIG_MODVERSIONS=y |
| 198 | CONFIG_MODULE_SRCVERSION_ALL=y | 195 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 199 | CONFIG_KMOD=y | 196 | CONFIG_KMOD=y |
| @@ -202,6 +199,8 @@ CONFIG_KMOD=y | |||
| 202 | # Block layer | 199 | # Block layer |
| 203 | # | 200 | # |
| 204 | # CONFIG_LBD is not set | 201 | # CONFIG_LBD is not set |
| 202 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 203 | # CONFIG_LSF is not set | ||
| 205 | 204 | ||
| 206 | # | 205 | # |
| 207 | # IO Schedulers | 206 | # IO Schedulers |
| @@ -221,7 +220,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 221 | # | 220 | # |
| 222 | CONFIG_HW_HAS_PCI=y | 221 | CONFIG_HW_HAS_PCI=y |
| 223 | CONFIG_PCI=y | 222 | CONFIG_PCI=y |
| 224 | CONFIG_PCI_LEGACY_PROC=y | ||
| 225 | CONFIG_MMU=y | 223 | CONFIG_MMU=y |
| 226 | 224 | ||
| 227 | # | 225 | # |
| @@ -249,6 +247,7 @@ CONFIG_NET=y | |||
| 249 | # | 247 | # |
| 250 | # Networking options | 248 | # Networking options |
| 251 | # | 249 | # |
| 250 | # CONFIG_NETDEBUG is not set | ||
| 252 | CONFIG_PACKET=y | 251 | CONFIG_PACKET=y |
| 253 | CONFIG_PACKET_MMAP=y | 252 | CONFIG_PACKET_MMAP=y |
| 254 | CONFIG_UNIX=y | 253 | CONFIG_UNIX=y |
| @@ -281,6 +280,7 @@ CONFIG_SYN_COOKIES=y | |||
| 281 | CONFIG_INET_AH=m | 280 | CONFIG_INET_AH=m |
| 282 | CONFIG_INET_ESP=m | 281 | CONFIG_INET_ESP=m |
| 283 | CONFIG_INET_IPCOMP=m | 282 | CONFIG_INET_IPCOMP=m |
| 283 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 284 | CONFIG_INET_TUNNEL=m | 284 | CONFIG_INET_TUNNEL=m |
| 285 | CONFIG_INET_DIAG=y | 285 | CONFIG_INET_DIAG=y |
| 286 | CONFIG_INET_TCP_DIAG=y | 286 | CONFIG_INET_TCP_DIAG=y |
| @@ -322,9 +322,12 @@ CONFIG_IP_VS_NQ=m | |||
| 322 | CONFIG_IP_VS_FTP=m | 322 | CONFIG_IP_VS_FTP=m |
| 323 | CONFIG_IPV6=m | 323 | CONFIG_IPV6=m |
| 324 | CONFIG_IPV6_PRIVACY=y | 324 | CONFIG_IPV6_PRIVACY=y |
| 325 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 326 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 325 | CONFIG_INET6_AH=m | 327 | CONFIG_INET6_AH=m |
| 326 | CONFIG_INET6_ESP=m | 328 | CONFIG_INET6_ESP=m |
| 327 | CONFIG_INET6_IPCOMP=m | 329 | CONFIG_INET6_IPCOMP=m |
| 330 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 328 | CONFIG_INET6_TUNNEL=m | 331 | CONFIG_INET6_TUNNEL=m |
| 329 | CONFIG_IPV6_TUNNEL=m | 332 | CONFIG_IPV6_TUNNEL=m |
| 330 | CONFIG_NETFILTER=y | 333 | CONFIG_NETFILTER=y |
| @@ -348,11 +351,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | |||
| 348 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 351 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 349 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 352 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 350 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 353 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 354 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 351 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 355 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 352 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 356 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 353 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 357 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 354 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 358 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 355 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 359 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 360 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 361 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 356 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | 362 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m |
| 357 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 363 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 358 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 364 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| @@ -376,20 +382,19 @@ CONFIG_IP_NF_IRC=m | |||
| 376 | CONFIG_IP_NF_TFTP=m | 382 | CONFIG_IP_NF_TFTP=m |
| 377 | CONFIG_IP_NF_AMANDA=m | 383 | CONFIG_IP_NF_AMANDA=m |
| 378 | CONFIG_IP_NF_PPTP=m | 384 | CONFIG_IP_NF_PPTP=m |
| 385 | CONFIG_IP_NF_H323=m | ||
| 379 | CONFIG_IP_NF_QUEUE=m | 386 | CONFIG_IP_NF_QUEUE=m |
| 380 | CONFIG_IP_NF_IPTABLES=m | 387 | CONFIG_IP_NF_IPTABLES=m |
| 381 | CONFIG_IP_NF_MATCH_IPRANGE=m | 388 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 382 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 383 | CONFIG_IP_NF_MATCH_TOS=m | 389 | CONFIG_IP_NF_MATCH_TOS=m |
| 384 | CONFIG_IP_NF_MATCH_RECENT=m | 390 | CONFIG_IP_NF_MATCH_RECENT=m |
| 385 | CONFIG_IP_NF_MATCH_ECN=m | 391 | CONFIG_IP_NF_MATCH_ECN=m |
| 386 | CONFIG_IP_NF_MATCH_DSCP=m | 392 | CONFIG_IP_NF_MATCH_DSCP=m |
| 387 | CONFIG_IP_NF_MATCH_AH_ESP=m | 393 | CONFIG_IP_NF_MATCH_AH=m |
| 388 | CONFIG_IP_NF_MATCH_TTL=m | 394 | CONFIG_IP_NF_MATCH_TTL=m |
| 389 | CONFIG_IP_NF_MATCH_OWNER=m | 395 | CONFIG_IP_NF_MATCH_OWNER=m |
| 390 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 396 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 391 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 397 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
| 392 | CONFIG_IP_NF_MATCH_POLICY=m | ||
| 393 | CONFIG_IP_NF_FILTER=m | 398 | CONFIG_IP_NF_FILTER=m |
| 394 | CONFIG_IP_NF_TARGET_REJECT=m | 399 | CONFIG_IP_NF_TARGET_REJECT=m |
| 395 | CONFIG_IP_NF_TARGET_LOG=m | 400 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -407,6 +412,7 @@ CONFIG_IP_NF_NAT_FTP=m | |||
| 407 | CONFIG_IP_NF_NAT_TFTP=m | 412 | CONFIG_IP_NF_NAT_TFTP=m |
| 408 | CONFIG_IP_NF_NAT_AMANDA=m | 413 | CONFIG_IP_NF_NAT_AMANDA=m |
| 409 | CONFIG_IP_NF_NAT_PPTP=m | 414 | CONFIG_IP_NF_NAT_PPTP=m |
| 415 | CONFIG_IP_NF_NAT_H323=m | ||
| 410 | CONFIG_IP_NF_MANGLE=m | 416 | CONFIG_IP_NF_MANGLE=m |
| 411 | CONFIG_IP_NF_TARGET_TOS=m | 417 | CONFIG_IP_NF_TARGET_TOS=m |
| 412 | CONFIG_IP_NF_TARGET_ECN=m | 418 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -427,12 +433,10 @@ CONFIG_IP6_NF_MATCH_RT=m | |||
| 427 | CONFIG_IP6_NF_MATCH_OPTS=m | 433 | CONFIG_IP6_NF_MATCH_OPTS=m |
| 428 | CONFIG_IP6_NF_MATCH_FRAG=m | 434 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 429 | CONFIG_IP6_NF_MATCH_HL=m | 435 | CONFIG_IP6_NF_MATCH_HL=m |
| 430 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
| 431 | CONFIG_IP6_NF_MATCH_OWNER=m | 436 | CONFIG_IP6_NF_MATCH_OWNER=m |
| 432 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 437 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 433 | CONFIG_IP6_NF_MATCH_AHESP=m | 438 | CONFIG_IP6_NF_MATCH_AH=m |
| 434 | CONFIG_IP6_NF_MATCH_EUI64=m | 439 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 435 | CONFIG_IP6_NF_MATCH_POLICY=m | ||
| 436 | CONFIG_IP6_NF_FILTER=m | 440 | CONFIG_IP6_NF_FILTER=m |
| 437 | CONFIG_IP6_NF_TARGET_LOG=m | 441 | CONFIG_IP6_NF_TARGET_LOG=m |
| 438 | CONFIG_IP6_NF_TARGET_REJECT=m | 442 | CONFIG_IP6_NF_TARGET_REJECT=m |
| @@ -478,6 +482,11 @@ CONFIG_IP_SCTP=m | |||
| 478 | # CONFIG_SCTP_HMAC_NONE is not set | 482 | # CONFIG_SCTP_HMAC_NONE is not set |
| 479 | # CONFIG_SCTP_HMAC_SHA1 is not set | 483 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 480 | CONFIG_SCTP_HMAC_MD5=y | 484 | CONFIG_SCTP_HMAC_MD5=y |
| 485 | |||
| 486 | # | ||
| 487 | # TIPC Configuration (EXPERIMENTAL) | ||
| 488 | # | ||
| 489 | # CONFIG_TIPC is not set | ||
| 481 | # CONFIG_ATM is not set | 490 | # CONFIG_ATM is not set |
| 482 | CONFIG_BRIDGE=m | 491 | CONFIG_BRIDGE=m |
| 483 | CONFIG_VLAN_8021Q=m | 492 | CONFIG_VLAN_8021Q=m |
| @@ -492,11 +501,6 @@ CONFIG_IPDDP_ENCAP=y | |||
| 492 | CONFIG_IPDDP_DECAP=y | 501 | CONFIG_IPDDP_DECAP=y |
| 493 | # CONFIG_X25 is not set | 502 | # CONFIG_X25 is not set |
| 494 | # CONFIG_LAPB is not set | 503 | # CONFIG_LAPB is not set |
| 495 | |||
| 496 | # | ||
| 497 | # TIPC Configuration (EXPERIMENTAL) | ||
| 498 | # | ||
| 499 | # CONFIG_TIPC is not set | ||
| 500 | CONFIG_NET_DIVERT=y | 504 | CONFIG_NET_DIVERT=y |
| 501 | # CONFIG_ECONET is not set | 505 | # CONFIG_ECONET is not set |
| 502 | # CONFIG_WAN_ROUTER is not set | 506 | # CONFIG_WAN_ROUTER is not set |
| @@ -556,6 +560,9 @@ CONFIG_IEEE80211=m | |||
| 556 | # CONFIG_IEEE80211_DEBUG is not set | 560 | # CONFIG_IEEE80211_DEBUG is not set |
| 557 | CONFIG_IEEE80211_CRYPT_WEP=m | 561 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 558 | CONFIG_IEEE80211_CRYPT_CCMP=m | 562 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 563 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 564 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 565 | CONFIG_WIRELESS_EXT=y | ||
| 559 | 566 | ||
| 560 | # | 567 | # |
| 561 | # Device Drivers | 568 | # Device Drivers |
| @@ -694,9 +701,8 @@ CONFIG_SCSI_SYM53C8XX_2=y | |||
| 694 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 | 701 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
| 695 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | 702 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
| 696 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | 703 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
| 697 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | 704 | CONFIG_SCSI_SYM53C8XX_MMIO=y |
| 698 | # CONFIG_SCSI_IPR is not set | 705 | # CONFIG_SCSI_IPR is not set |
| 699 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 700 | # CONFIG_SCSI_QLOGIC_1280 is not set | 706 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 701 | # CONFIG_SCSI_QLA_FC is not set | 707 | # CONFIG_SCSI_QLA_FC is not set |
| 702 | # CONFIG_SCSI_LPFC is not set | 708 | # CONFIG_SCSI_LPFC is not set |
| @@ -715,6 +721,7 @@ CONFIG_MD_RAID0=m | |||
| 715 | CONFIG_MD_RAID1=m | 721 | CONFIG_MD_RAID1=m |
| 716 | CONFIG_MD_RAID10=m | 722 | CONFIG_MD_RAID10=m |
| 717 | CONFIG_MD_RAID5=m | 723 | CONFIG_MD_RAID5=m |
| 724 | CONFIG_MD_RAID5_RESHAPE=y | ||
| 718 | CONFIG_MD_RAID6=m | 725 | CONFIG_MD_RAID6=m |
| 719 | CONFIG_MD_MULTIPATH=m | 726 | CONFIG_MD_MULTIPATH=m |
| 720 | CONFIG_MD_FAULTY=m | 727 | CONFIG_MD_FAULTY=m |
| @@ -921,6 +928,7 @@ CONFIG_HW_CONSOLE=y | |||
| 921 | # | 928 | # |
| 922 | CONFIG_SERIAL_8250=y | 929 | CONFIG_SERIAL_8250=y |
| 923 | CONFIG_SERIAL_8250_CONSOLE=y | 930 | CONFIG_SERIAL_8250_CONSOLE=y |
| 931 | CONFIG_SERIAL_8250_PCI=m | ||
| 924 | CONFIG_SERIAL_8250_NR_UARTS=4 | 932 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 925 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 933 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 926 | # CONFIG_SERIAL_8250_EXTENDED is not set | 934 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -930,6 +938,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 930 | # | 938 | # |
| 931 | CONFIG_SERIAL_CORE=y | 939 | CONFIG_SERIAL_CORE=y |
| 932 | CONFIG_SERIAL_CORE_CONSOLE=y | 940 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 941 | # CONFIG_SERIAL_JSM is not set | ||
| 933 | CONFIG_UNIX98_PTYS=y | 942 | CONFIG_UNIX98_PTYS=y |
| 934 | CONFIG_LEGACY_PTYS=y | 943 | CONFIG_LEGACY_PTYS=y |
| 935 | CONFIG_LEGACY_PTY_COUNT=256 | 944 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -988,10 +997,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 988 | # | 997 | # |
| 989 | 998 | ||
| 990 | # | 999 | # |
| 991 | # Multimedia Capabilities Port drivers | ||
| 992 | # | ||
| 993 | |||
| 994 | # | ||
| 995 | # Multimedia devices | 1000 | # Multimedia devices |
| 996 | # | 1001 | # |
| 997 | # CONFIG_VIDEO_DEV is not set | 1002 | # CONFIG_VIDEO_DEV is not set |
| @@ -1022,6 +1027,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 1022 | # | 1027 | # |
| 1023 | CONFIG_USB_ARCH_HAS_HCD=y | 1028 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1024 | CONFIG_USB_ARCH_HAS_OHCI=y | 1029 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1030 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 1025 | # CONFIG_USB is not set | 1031 | # CONFIG_USB is not set |
| 1026 | 1032 | ||
| 1027 | # | 1033 | # |
| @@ -1039,13 +1045,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 1039 | # CONFIG_MMC is not set | 1045 | # CONFIG_MMC is not set |
| 1040 | 1046 | ||
| 1041 | # | 1047 | # |
| 1048 | # LED devices | ||
| 1049 | # | ||
| 1050 | # CONFIG_NEW_LEDS is not set | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # LED drivers | ||
| 1054 | # | ||
| 1055 | |||
| 1056 | # | ||
| 1057 | # LED Triggers | ||
| 1058 | # | ||
| 1059 | |||
| 1060 | # | ||
| 1042 | # InfiniBand support | 1061 | # InfiniBand support |
| 1043 | # | 1062 | # |
| 1044 | # CONFIG_INFINIBAND is not set | 1063 | # CONFIG_INFINIBAND is not set |
| 1045 | 1064 | ||
| 1046 | # | 1065 | # |
| 1047 | # SN Devices | 1066 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1067 | # | ||
| 1068 | |||
| 1069 | # | ||
| 1070 | # Real Time Clock | ||
| 1048 | # | 1071 | # |
| 1072 | # CONFIG_RTC_CLASS is not set | ||
| 1049 | 1073 | ||
| 1050 | # | 1074 | # |
| 1051 | # File systems | 1075 | # File systems |
| @@ -1120,7 +1144,6 @@ CONFIG_SYSFS=y | |||
| 1120 | # CONFIG_TMPFS is not set | 1144 | # CONFIG_TMPFS is not set |
| 1121 | # CONFIG_HUGETLB_PAGE is not set | 1145 | # CONFIG_HUGETLB_PAGE is not set |
| 1122 | CONFIG_RAMFS=y | 1146 | CONFIG_RAMFS=y |
| 1123 | CONFIG_RELAYFS_FS=m | ||
| 1124 | # CONFIG_CONFIGFS_FS is not set | 1147 | # CONFIG_CONFIGFS_FS is not set |
| 1125 | 1148 | ||
| 1126 | # | 1149 | # |
| @@ -1140,7 +1163,6 @@ CONFIG_VXFS_FS=m | |||
| 1140 | # CONFIG_QNX4FS_FS is not set | 1163 | # CONFIG_QNX4FS_FS is not set |
| 1141 | CONFIG_SYSV_FS=m | 1164 | CONFIG_SYSV_FS=m |
| 1142 | CONFIG_UFS_FS=m | 1165 | CONFIG_UFS_FS=m |
| 1143 | # CONFIG_UFS_FS_WRITE is not set | ||
| 1144 | 1166 | ||
| 1145 | # | 1167 | # |
| 1146 | # Network File Systems | 1168 | # Network File Systems |
| @@ -1232,6 +1254,7 @@ CONFIG_NLS_UTF8=m | |||
| 1232 | # CONFIG_MAGIC_SYSRQ is not set | 1254 | # CONFIG_MAGIC_SYSRQ is not set |
| 1233 | # CONFIG_DEBUG_KERNEL is not set | 1255 | # CONFIG_DEBUG_KERNEL is not set |
| 1234 | CONFIG_LOG_BUF_SHIFT=14 | 1256 | CONFIG_LOG_BUF_SHIFT=14 |
| 1257 | # CONFIG_DEBUG_FS is not set | ||
| 1235 | CONFIG_CROSSCOMPILE=y | 1258 | CONFIG_CROSSCOMPILE=y |
| 1236 | CONFIG_CMDLINE="" | 1259 | CONFIG_CMDLINE="" |
| 1237 | 1260 | ||
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 32984100a75e..d85cda58d650 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:53 2006 | 4 | # Mon Apr 24 14:50:55 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -80,6 +80,8 @@ CONFIG_SIBYTE_CFE=y | |||
| 80 | # CONFIG_SIBYTE_SB1250_PROF is not set | 80 | # CONFIG_SIBYTE_SB1250_PROF is not set |
| 81 | # CONFIG_SIBYTE_TBPROF is not set | 81 | # CONFIG_SIBYTE_TBPROF is not set |
| 82 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 82 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 83 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 84 | CONFIG_GENERIC_HWEIGHT=y | ||
| 83 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 85 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 84 | CONFIG_DMA_COHERENT=y | 86 | CONFIG_DMA_COHERENT=y |
| 85 | CONFIG_CPU_BIG_ENDIAN=y | 87 | CONFIG_CPU_BIG_ENDIAN=y |
| @@ -154,7 +156,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 154 | # Code maturity level options | 156 | # Code maturity level options |
| 155 | # | 157 | # |
| 156 | CONFIG_EXPERIMENTAL=y | 158 | CONFIG_EXPERIMENTAL=y |
| 157 | CONFIG_CLEAN_COMPILE=y | ||
| 158 | CONFIG_LOCK_KERNEL=y | 159 | CONFIG_LOCK_KERNEL=y |
| 159 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 160 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 160 | 161 | ||
| @@ -172,6 +173,7 @@ CONFIG_SYSCTL=y | |||
| 172 | CONFIG_IKCONFIG=y | 173 | CONFIG_IKCONFIG=y |
| 173 | CONFIG_IKCONFIG_PROC=y | 174 | CONFIG_IKCONFIG_PROC=y |
| 174 | # CONFIG_CPUSETS is not set | 175 | # CONFIG_CPUSETS is not set |
| 176 | # CONFIG_RELAY is not set | ||
| 175 | CONFIG_INITRAMFS_SOURCE="" | 177 | CONFIG_INITRAMFS_SOURCE="" |
| 176 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 178 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 177 | CONFIG_EMBEDDED=y | 179 | CONFIG_EMBEDDED=y |
| @@ -186,10 +188,6 @@ CONFIG_BASE_FULL=y | |||
| 186 | CONFIG_FUTEX=y | 188 | CONFIG_FUTEX=y |
| 187 | CONFIG_EPOLL=y | 189 | CONFIG_EPOLL=y |
| 188 | CONFIG_SHMEM=y | 190 | CONFIG_SHMEM=y |
| 189 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 190 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 191 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 192 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 193 | CONFIG_SLAB=y | 191 | CONFIG_SLAB=y |
| 194 | # CONFIG_TINY_SHMEM is not set | 192 | # CONFIG_TINY_SHMEM is not set |
| 195 | CONFIG_BASE_SMALL=0 | 193 | CONFIG_BASE_SMALL=0 |
| @@ -201,7 +199,6 @@ CONFIG_BASE_SMALL=0 | |||
| 201 | CONFIG_MODULES=y | 199 | CONFIG_MODULES=y |
| 202 | CONFIG_MODULE_UNLOAD=y | 200 | CONFIG_MODULE_UNLOAD=y |
| 203 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 201 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 204 | CONFIG_OBSOLETE_MODPARM=y | ||
| 205 | CONFIG_MODVERSIONS=y | 202 | CONFIG_MODVERSIONS=y |
| 206 | CONFIG_MODULE_SRCVERSION_ALL=y | 203 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 207 | CONFIG_KMOD=y | 204 | CONFIG_KMOD=y |
| @@ -210,6 +207,7 @@ CONFIG_STOP_MACHINE=y | |||
| 210 | # | 207 | # |
| 211 | # Block layer | 208 | # Block layer |
| 212 | # | 209 | # |
| 210 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 213 | 211 | ||
| 214 | # | 212 | # |
| 215 | # IO Schedulers | 213 | # IO Schedulers |
| @@ -230,7 +228,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 230 | CONFIG_HW_HAS_PCI=y | 228 | CONFIG_HW_HAS_PCI=y |
| 231 | CONFIG_PCI=y | 229 | CONFIG_PCI=y |
| 232 | CONFIG_PCI_DOMAINS=y | 230 | CONFIG_PCI_DOMAINS=y |
| 233 | CONFIG_PCI_LEGACY_PROC=y | ||
| 234 | CONFIG_PCI_DEBUG=y | 231 | CONFIG_PCI_DEBUG=y |
| 235 | CONFIG_MMU=y | 232 | CONFIG_MMU=y |
| 236 | 233 | ||
| @@ -249,6 +246,7 @@ CONFIG_MMU=y | |||
| 249 | # | 246 | # |
| 250 | CONFIG_BINFMT_ELF=y | 247 | CONFIG_BINFMT_ELF=y |
| 251 | # CONFIG_BINFMT_MISC is not set | 248 | # CONFIG_BINFMT_MISC is not set |
| 249 | CONFIG_BUILD_ELF64=y | ||
| 252 | CONFIG_MIPS32_COMPAT=y | 250 | CONFIG_MIPS32_COMPAT=y |
| 253 | CONFIG_COMPAT=y | 251 | CONFIG_COMPAT=y |
| 254 | CONFIG_MIPS32_O32=y | 252 | CONFIG_MIPS32_O32=y |
| @@ -263,6 +261,7 @@ CONFIG_NET=y | |||
| 263 | # | 261 | # |
| 264 | # Networking options | 262 | # Networking options |
| 265 | # | 263 | # |
| 264 | # CONFIG_NETDEBUG is not set | ||
| 266 | CONFIG_PACKET=y | 265 | CONFIG_PACKET=y |
| 267 | CONFIG_PACKET_MMAP=y | 266 | CONFIG_PACKET_MMAP=y |
| 268 | CONFIG_UNIX=y | 267 | CONFIG_UNIX=y |
| @@ -284,12 +283,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 284 | # CONFIG_INET_AH is not set | 283 | # CONFIG_INET_AH is not set |
| 285 | # CONFIG_INET_ESP is not set | 284 | # CONFIG_INET_ESP is not set |
| 286 | # CONFIG_INET_IPCOMP is not set | 285 | # CONFIG_INET_IPCOMP is not set |
| 287 | CONFIG_INET_TUNNEL=m | 286 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 287 | # CONFIG_INET_TUNNEL is not set | ||
| 288 | CONFIG_INET_DIAG=y | 288 | CONFIG_INET_DIAG=y |
| 289 | CONFIG_INET_TCP_DIAG=y | 289 | CONFIG_INET_TCP_DIAG=y |
| 290 | # CONFIG_TCP_CONG_ADVANCED is not set | 290 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 291 | CONFIG_TCP_CONG_BIC=y | 291 | CONFIG_TCP_CONG_BIC=y |
| 292 | # CONFIG_IPV6 is not set | 292 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 293 | # CONFIG_NETFILTER is not set | 295 | # CONFIG_NETFILTER is not set |
| 294 | 296 | ||
| 295 | # | 297 | # |
| @@ -301,6 +303,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 301 | # SCTP Configuration (EXPERIMENTAL) | 303 | # SCTP Configuration (EXPERIMENTAL) |
| 302 | # | 304 | # |
| 303 | # CONFIG_IP_SCTP is not set | 305 | # CONFIG_IP_SCTP is not set |
| 306 | |||
| 307 | # | ||
| 308 | # TIPC Configuration (EXPERIMENTAL) | ||
| 309 | # | ||
| 310 | # CONFIG_TIPC is not set | ||
| 304 | # CONFIG_ATM is not set | 311 | # CONFIG_ATM is not set |
| 305 | # CONFIG_BRIDGE is not set | 312 | # CONFIG_BRIDGE is not set |
| 306 | # CONFIG_VLAN_8021Q is not set | 313 | # CONFIG_VLAN_8021Q is not set |
| @@ -310,11 +317,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 310 | # CONFIG_ATALK is not set | 317 | # CONFIG_ATALK is not set |
| 311 | # CONFIG_X25 is not set | 318 | # CONFIG_X25 is not set |
| 312 | # CONFIG_LAPB is not set | 319 | # CONFIG_LAPB is not set |
| 313 | |||
| 314 | # | ||
| 315 | # TIPC Configuration (EXPERIMENTAL) | ||
| 316 | # | ||
| 317 | # CONFIG_TIPC is not set | ||
| 318 | # CONFIG_NET_DIVERT is not set | 320 | # CONFIG_NET_DIVERT is not set |
| 319 | # CONFIG_ECONET is not set | 321 | # CONFIG_ECONET is not set |
| 320 | # CONFIG_WAN_ROUTER is not set | 322 | # CONFIG_WAN_ROUTER is not set |
| @@ -377,7 +379,7 @@ CONFIG_BLK_DEV_LOOP=m | |||
| 377 | CONFIG_BLK_DEV_NBD=m | 379 | CONFIG_BLK_DEV_NBD=m |
| 378 | # CONFIG_BLK_DEV_SX8 is not set | 380 | # CONFIG_BLK_DEV_SX8 is not set |
| 379 | # CONFIG_BLK_DEV_RAM is not set | 381 | # CONFIG_BLK_DEV_RAM is not set |
| 380 | CONFIG_BLK_DEV_RAM_COUNT=16 | 382 | # CONFIG_BLK_DEV_INITRD is not set |
| 381 | # CONFIG_CDROM_PKTCDVD is not set | 383 | # CONFIG_CDROM_PKTCDVD is not set |
| 382 | # CONFIG_ATA_OVER_ETH is not set | 384 | # CONFIG_ATA_OVER_ETH is not set |
| 383 | 385 | ||
| @@ -575,6 +577,7 @@ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y | |||
| 575 | # | 577 | # |
| 576 | # Non-8250 serial port support | 578 | # Non-8250 serial port support |
| 577 | # | 579 | # |
| 580 | # CONFIG_SERIAL_JSM is not set | ||
| 578 | CONFIG_UNIX98_PTYS=y | 581 | CONFIG_UNIX98_PTYS=y |
| 579 | CONFIG_LEGACY_PTYS=y | 582 | CONFIG_LEGACY_PTYS=y |
| 580 | CONFIG_LEGACY_PTY_COUNT=256 | 583 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -637,7 +640,6 @@ CONFIG_I2C_ALGO_SIBYTE=y | |||
| 637 | # CONFIG_I2C_PROSAVAGE is not set | 640 | # CONFIG_I2C_PROSAVAGE is not set |
| 638 | # CONFIG_I2C_SAVAGE4 is not set | 641 | # CONFIG_I2C_SAVAGE4 is not set |
| 639 | CONFIG_I2C_SIBYTE=y | 642 | CONFIG_I2C_SIBYTE=y |
| 640 | # CONFIG_SCx200_ACB is not set | ||
| 641 | # CONFIG_I2C_SIS5595 is not set | 643 | # CONFIG_I2C_SIS5595 is not set |
| 642 | # CONFIG_I2C_SIS630 is not set | 644 | # CONFIG_I2C_SIS630 is not set |
| 643 | # CONFIG_I2C_SIS96X is not set | 645 | # CONFIG_I2C_SIS96X is not set |
| @@ -656,9 +658,7 @@ CONFIG_SENSORS_EEPROM=y | |||
| 656 | CONFIG_SENSORS_PCF8574=y | 658 | CONFIG_SENSORS_PCF8574=y |
| 657 | CONFIG_SENSORS_PCA9539=y | 659 | CONFIG_SENSORS_PCA9539=y |
| 658 | CONFIG_SENSORS_PCF8591=y | 660 | CONFIG_SENSORS_PCF8591=y |
| 659 | CONFIG_SENSORS_RTC8564=y | ||
| 660 | CONFIG_SENSORS_MAX6875=y | 661 | CONFIG_SENSORS_MAX6875=y |
| 661 | # CONFIG_RTC_X1205_I2C is not set | ||
| 662 | CONFIG_I2C_DEBUG_CORE=y | 662 | CONFIG_I2C_DEBUG_CORE=y |
| 663 | CONFIG_I2C_DEBUG_ALGO=y | 663 | CONFIG_I2C_DEBUG_ALGO=y |
| 664 | CONFIG_I2C_DEBUG_BUS=y | 664 | CONFIG_I2C_DEBUG_BUS=y |
| @@ -686,10 +686,6 @@ CONFIG_I2C_DEBUG_CHIP=y | |||
| 686 | # | 686 | # |
| 687 | 687 | ||
| 688 | # | 688 | # |
| 689 | # Multimedia Capabilities Port drivers | ||
| 690 | # | ||
| 691 | |||
| 692 | # | ||
| 693 | # Multimedia devices | 689 | # Multimedia devices |
| 694 | # | 690 | # |
| 695 | # CONFIG_VIDEO_DEV is not set | 691 | # CONFIG_VIDEO_DEV is not set |
| @@ -714,6 +710,7 @@ CONFIG_I2C_DEBUG_CHIP=y | |||
| 714 | # | 710 | # |
| 715 | CONFIG_USB_ARCH_HAS_HCD=y | 711 | CONFIG_USB_ARCH_HAS_HCD=y |
| 716 | CONFIG_USB_ARCH_HAS_OHCI=y | 712 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 713 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 717 | # CONFIG_USB is not set | 714 | # CONFIG_USB is not set |
| 718 | 715 | ||
| 719 | # | 716 | # |
| @@ -731,13 +728,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 731 | # CONFIG_MMC is not set | 728 | # CONFIG_MMC is not set |
| 732 | 729 | ||
| 733 | # | 730 | # |
| 731 | # LED devices | ||
| 732 | # | ||
| 733 | # CONFIG_NEW_LEDS is not set | ||
| 734 | |||
| 735 | # | ||
| 736 | # LED drivers | ||
| 737 | # | ||
| 738 | |||
| 739 | # | ||
| 740 | # LED Triggers | ||
| 741 | # | ||
| 742 | |||
| 743 | # | ||
| 734 | # InfiniBand support | 744 | # InfiniBand support |
| 735 | # | 745 | # |
| 736 | # CONFIG_INFINIBAND is not set | 746 | # CONFIG_INFINIBAND is not set |
| 737 | 747 | ||
| 738 | # | 748 | # |
| 739 | # SN Devices | 749 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 750 | # | ||
| 751 | |||
| 752 | # | ||
| 753 | # Real Time Clock | ||
| 740 | # | 754 | # |
| 755 | # CONFIG_RTC_CLASS is not set | ||
| 741 | 756 | ||
| 742 | # | 757 | # |
| 743 | # File systems | 758 | # File systems |
| @@ -785,7 +800,6 @@ CONFIG_SYSFS=y | |||
| 785 | # CONFIG_TMPFS is not set | 800 | # CONFIG_TMPFS is not set |
| 786 | # CONFIG_HUGETLB_PAGE is not set | 801 | # CONFIG_HUGETLB_PAGE is not set |
| 787 | CONFIG_RAMFS=y | 802 | CONFIG_RAMFS=y |
| 788 | # CONFIG_RELAYFS_FS is not set | ||
| 789 | # CONFIG_CONFIGFS_FS is not set | 803 | # CONFIG_CONFIGFS_FS is not set |
| 790 | 804 | ||
| 791 | # | 805 | # |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index 6c2961affbd6..ca0af1683a00 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:54 2006 | 4 | # Tue Apr 25 00:08:06 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -72,6 +72,8 @@ CONFIG_ZAO_CAPCELLA=y | |||
| 72 | CONFIG_PCI_VR41XX=y | 72 | CONFIG_PCI_VR41XX=y |
| 73 | # CONFIG_VRC4173 is not set | 73 | # CONFIG_VRC4173 is not set |
| 74 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 74 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 75 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 76 | CONFIG_GENERIC_HWEIGHT=y | ||
| 75 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 76 | CONFIG_DMA_NONCOHERENT=y | 78 | CONFIG_DMA_NONCOHERENT=y |
| 77 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 79 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -90,7 +92,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 90 | # CONFIG_CPU_MIPS64_R2 is not set | 92 | # CONFIG_CPU_MIPS64_R2 is not set |
| 91 | # CONFIG_CPU_R3000 is not set | 93 | # CONFIG_CPU_R3000 is not set |
| 92 | # CONFIG_CPU_TX39XX is not set | 94 | # CONFIG_CPU_TX39XX is not set |
| 93 | # CONFIG_CPU_VR41XX is not set | 95 | CONFIG_CPU_VR41XX=y |
| 94 | # CONFIG_CPU_R4300 is not set | 96 | # CONFIG_CPU_R4300 is not set |
| 95 | # CONFIG_CPU_R4X00 is not set | 97 | # CONFIG_CPU_R4X00 is not set |
| 96 | # CONFIG_CPU_TX49XX is not set | 98 | # CONFIG_CPU_TX49XX is not set |
| @@ -103,18 +105,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 103 | # CONFIG_CPU_RM7000 is not set | 105 | # CONFIG_CPU_RM7000 is not set |
| 104 | # CONFIG_CPU_RM9000 is not set | 106 | # CONFIG_CPU_RM9000 is not set |
| 105 | # CONFIG_CPU_SB1 is not set | 107 | # CONFIG_CPU_SB1 is not set |
| 108 | CONFIG_SYS_HAS_CPU_VR41XX=y | ||
| 109 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
| 110 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
| 111 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 106 | 112 | ||
| 107 | # | 113 | # |
| 108 | # Kernel type | 114 | # Kernel type |
| 109 | # | 115 | # |
| 110 | # CONFIG_32BIT is not set | 116 | CONFIG_32BIT=y |
| 111 | # CONFIG_64BIT is not set | 117 | # CONFIG_64BIT is not set |
| 112 | CONFIG_PAGE_SIZE_4KB=y | 118 | CONFIG_PAGE_SIZE_4KB=y |
| 113 | # CONFIG_PAGE_SIZE_8KB is not set | 119 | # CONFIG_PAGE_SIZE_8KB is not set |
| 114 | # CONFIG_PAGE_SIZE_16KB is not set | 120 | # CONFIG_PAGE_SIZE_16KB is not set |
| 115 | # CONFIG_PAGE_SIZE_64KB is not set | 121 | # CONFIG_PAGE_SIZE_64KB is not set |
| 116 | # CONFIG_MIPS_MT is not set | 122 | # CONFIG_MIPS_MT is not set |
| 117 | CONFIG_CPU_HAS_LLSC=y | ||
| 118 | CONFIG_CPU_HAS_SYNC=y | 123 | CONFIG_CPU_HAS_SYNC=y |
| 119 | CONFIG_GENERIC_HARDIRQS=y | 124 | CONFIG_GENERIC_HARDIRQS=y |
| 120 | CONFIG_GENERIC_IRQ_PROBE=y | 125 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -135,7 +140,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 135 | # Code maturity level options | 140 | # Code maturity level options |
| 136 | # | 141 | # |
| 137 | CONFIG_EXPERIMENTAL=y | 142 | CONFIG_EXPERIMENTAL=y |
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | 143 | CONFIG_BROKEN_ON_SMP=y |
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 141 | 145 | ||
| @@ -151,6 +155,7 @@ CONFIG_SYSVIPC=y | |||
| 151 | CONFIG_SYSCTL=y | 155 | CONFIG_SYSCTL=y |
| 152 | # CONFIG_AUDIT is not set | 156 | # CONFIG_AUDIT is not set |
| 153 | # CONFIG_IKCONFIG is not set | 157 | # CONFIG_IKCONFIG is not set |
| 158 | # CONFIG_RELAY is not set | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | 159 | CONFIG_INITRAMFS_SOURCE="" |
| 155 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 160 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 156 | CONFIG_EMBEDDED=y | 161 | CONFIG_EMBEDDED=y |
| @@ -164,10 +169,6 @@ CONFIG_BASE_FULL=y | |||
| 164 | CONFIG_FUTEX=y | 169 | CONFIG_FUTEX=y |
| 165 | CONFIG_EPOLL=y | 170 | CONFIG_EPOLL=y |
| 166 | CONFIG_SHMEM=y | 171 | CONFIG_SHMEM=y |
| 167 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 168 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 169 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 170 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 171 | CONFIG_SLAB=y | 172 | CONFIG_SLAB=y |
| 172 | # CONFIG_TINY_SHMEM is not set | 173 | # CONFIG_TINY_SHMEM is not set |
| 173 | CONFIG_BASE_SMALL=0 | 174 | CONFIG_BASE_SMALL=0 |
| @@ -179,7 +180,6 @@ CONFIG_BASE_SMALL=0 | |||
| 179 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 180 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 185 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -187,6 +187,9 @@ CONFIG_KMOD=y | |||
| 187 | # | 187 | # |
| 188 | # Block layer | 188 | # Block layer |
| 189 | # | 189 | # |
| 190 | # CONFIG_LBD is not set | ||
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 190 | 193 | ||
| 191 | # | 194 | # |
| 192 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -206,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 206 | # | 209 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| 208 | CONFIG_PCI=y | 211 | CONFIG_PCI=y |
| 209 | CONFIG_PCI_LEGACY_PROC=y | ||
| 210 | CONFIG_MMU=y | 212 | CONFIG_MMU=y |
| 211 | 213 | ||
| 212 | # | 214 | # |
| @@ -224,6 +226,7 @@ CONFIG_MMU=y | |||
| 224 | # | 226 | # |
| 225 | CONFIG_BINFMT_ELF=y | 227 | CONFIG_BINFMT_ELF=y |
| 226 | # CONFIG_BINFMT_MISC is not set | 228 | # CONFIG_BINFMT_MISC is not set |
| 229 | CONFIG_TRAD_SIGNALS=y | ||
| 227 | 230 | ||
| 228 | # | 231 | # |
| 229 | # Networking | 232 | # Networking |
| @@ -233,6 +236,7 @@ CONFIG_NET=y | |||
| 233 | # | 236 | # |
| 234 | # Networking options | 237 | # Networking options |
| 235 | # | 238 | # |
| 239 | # CONFIG_NETDEBUG is not set | ||
| 236 | CONFIG_PACKET=y | 240 | CONFIG_PACKET=y |
| 237 | CONFIG_PACKET_MMAP=y | 241 | CONFIG_PACKET_MMAP=y |
| 238 | CONFIG_UNIX=y | 242 | CONFIG_UNIX=y |
| @@ -255,12 +259,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 255 | # CONFIG_INET_AH is not set | 259 | # CONFIG_INET_AH is not set |
| 256 | # CONFIG_INET_ESP is not set | 260 | # CONFIG_INET_ESP is not set |
| 257 | # CONFIG_INET_IPCOMP is not set | 261 | # CONFIG_INET_IPCOMP is not set |
| 258 | CONFIG_INET_TUNNEL=m | 262 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 263 | # CONFIG_INET_TUNNEL is not set | ||
| 259 | CONFIG_INET_DIAG=y | 264 | CONFIG_INET_DIAG=y |
| 260 | CONFIG_INET_TCP_DIAG=y | 265 | CONFIG_INET_TCP_DIAG=y |
| 261 | # CONFIG_TCP_CONG_ADVANCED is not set | 266 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 262 | CONFIG_TCP_CONG_BIC=y | 267 | CONFIG_TCP_CONG_BIC=y |
| 263 | # CONFIG_IPV6 is not set | 268 | # CONFIG_IPV6 is not set |
| 269 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 270 | # CONFIG_INET6_TUNNEL is not set | ||
| 264 | # CONFIG_NETFILTER is not set | 271 | # CONFIG_NETFILTER is not set |
| 265 | 272 | ||
| 266 | # | 273 | # |
| @@ -272,6 +279,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 272 | # SCTP Configuration (EXPERIMENTAL) | 279 | # SCTP Configuration (EXPERIMENTAL) |
| 273 | # | 280 | # |
| 274 | # CONFIG_IP_SCTP is not set | 281 | # CONFIG_IP_SCTP is not set |
| 282 | |||
| 283 | # | ||
| 284 | # TIPC Configuration (EXPERIMENTAL) | ||
| 285 | # | ||
| 286 | # CONFIG_TIPC is not set | ||
| 275 | # CONFIG_ATM is not set | 287 | # CONFIG_ATM is not set |
| 276 | # CONFIG_BRIDGE is not set | 288 | # CONFIG_BRIDGE is not set |
| 277 | # CONFIG_VLAN_8021Q is not set | 289 | # CONFIG_VLAN_8021Q is not set |
| @@ -281,11 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 281 | # CONFIG_ATALK is not set | 293 | # CONFIG_ATALK is not set |
| 282 | # CONFIG_X25 is not set | 294 | # CONFIG_X25 is not set |
| 283 | # CONFIG_LAPB is not set | 295 | # CONFIG_LAPB is not set |
| 284 | |||
| 285 | # | ||
| 286 | # TIPC Configuration (EXPERIMENTAL) | ||
| 287 | # | ||
| 288 | # CONFIG_TIPC is not set | ||
| 289 | # CONFIG_NET_DIVERT is not set | 296 | # CONFIG_NET_DIVERT is not set |
| 290 | # CONFIG_ECONET is not set | 297 | # CONFIG_ECONET is not set |
| 291 | # CONFIG_WAN_ROUTER is not set | 298 | # CONFIG_WAN_ROUTER is not set |
| @@ -302,10 +309,7 @@ CONFIG_TCP_CONG_BIC=y | |||
| 302 | # CONFIG_HAMRADIO is not set | 309 | # CONFIG_HAMRADIO is not set |
| 303 | # CONFIG_IRDA is not set | 310 | # CONFIG_IRDA is not set |
| 304 | # CONFIG_BT is not set | 311 | # CONFIG_BT is not set |
| 305 | CONFIG_IEEE80211=m | 312 | # CONFIG_IEEE80211 is not set |
| 306 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 307 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 308 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 309 | 313 | ||
| 310 | # | 314 | # |
| 311 | # Device Drivers | 315 | # Device Drivers |
| @@ -348,10 +352,12 @@ CONFIG_CONNECTOR=m | |||
| 348 | # CONFIG_BLK_DEV_LOOP is not set | 352 | # CONFIG_BLK_DEV_LOOP is not set |
| 349 | # CONFIG_BLK_DEV_NBD is not set | 353 | # CONFIG_BLK_DEV_NBD is not set |
| 350 | # CONFIG_BLK_DEV_SX8 is not set | 354 | # CONFIG_BLK_DEV_SX8 is not set |
| 351 | # CONFIG_BLK_DEV_RAM is not set | 355 | CONFIG_BLK_DEV_RAM=y |
| 352 | CONFIG_BLK_DEV_RAM_COUNT=16 | 356 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 357 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 358 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 353 | # CONFIG_CDROM_PKTCDVD is not set | 359 | # CONFIG_CDROM_PKTCDVD is not set |
| 354 | CONFIG_ATA_OVER_ETH=m | 360 | # CONFIG_ATA_OVER_ETH is not set |
| 355 | 361 | ||
| 356 | # | 362 | # |
| 357 | # ATA/ATAPI/MFM/RLL support | 363 | # ATA/ATAPI/MFM/RLL support |
| @@ -578,6 +584,11 @@ CONFIG_HW_CONSOLE=y | |||
| 578 | # | 584 | # |
| 579 | # Non-8250 serial port support | 585 | # Non-8250 serial port support |
| 580 | # | 586 | # |
| 587 | CONFIG_SERIAL_CORE=y | ||
| 588 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 589 | CONFIG_SERIAL_VR41XX=y | ||
| 590 | CONFIG_SERIAL_VR41XX_CONSOLE=y | ||
| 591 | # CONFIG_SERIAL_JSM is not set | ||
| 581 | CONFIG_UNIX98_PTYS=y | 592 | CONFIG_UNIX98_PTYS=y |
| 582 | CONFIG_LEGACY_PTYS=y | 593 | CONFIG_LEGACY_PTYS=y |
| 583 | CONFIG_LEGACY_PTY_COUNT=256 | 594 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -601,6 +612,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 601 | # Ftape, the floppy tape device driver | 612 | # Ftape, the floppy tape device driver |
| 602 | # | 613 | # |
| 603 | # CONFIG_DRM is not set | 614 | # CONFIG_DRM is not set |
| 615 | CONFIG_GPIO_VR41XX=y | ||
| 604 | # CONFIG_RAW_DRIVER is not set | 616 | # CONFIG_RAW_DRIVER is not set |
| 605 | 617 | ||
| 606 | # | 618 | # |
| @@ -636,10 +648,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 636 | # | 648 | # |
| 637 | 649 | ||
| 638 | # | 650 | # |
| 639 | # Multimedia Capabilities Port drivers | ||
| 640 | # | ||
| 641 | |||
| 642 | # | ||
| 643 | # Multimedia devices | 651 | # Multimedia devices |
| 644 | # | 652 | # |
| 645 | # CONFIG_VIDEO_DEV is not set | 653 | # CONFIG_VIDEO_DEV is not set |
| @@ -670,6 +678,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 670 | # | 678 | # |
| 671 | CONFIG_USB_ARCH_HAS_HCD=y | 679 | CONFIG_USB_ARCH_HAS_HCD=y |
| 672 | CONFIG_USB_ARCH_HAS_OHCI=y | 680 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 681 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 673 | # CONFIG_USB is not set | 682 | # CONFIG_USB is not set |
| 674 | 683 | ||
| 675 | # | 684 | # |
| @@ -687,13 +696,48 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 687 | # CONFIG_MMC is not set | 696 | # CONFIG_MMC is not set |
| 688 | 697 | ||
| 689 | # | 698 | # |
| 699 | # LED devices | ||
| 700 | # | ||
| 701 | # CONFIG_NEW_LEDS is not set | ||
| 702 | |||
| 703 | # | ||
| 704 | # LED drivers | ||
| 705 | # | ||
| 706 | |||
| 707 | # | ||
| 708 | # LED Triggers | ||
| 709 | # | ||
| 710 | |||
| 711 | # | ||
| 690 | # InfiniBand support | 712 | # InfiniBand support |
| 691 | # | 713 | # |
| 692 | # CONFIG_INFINIBAND is not set | 714 | # CONFIG_INFINIBAND is not set |
| 693 | 715 | ||
| 694 | # | 716 | # |
| 695 | # SN Devices | 717 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 718 | # | ||
| 719 | |||
| 720 | # | ||
| 721 | # Real Time Clock | ||
| 722 | # | ||
| 723 | CONFIG_RTC_LIB=y | ||
| 724 | CONFIG_RTC_CLASS=y | ||
| 725 | CONFIG_RTC_HCTOSYS=y | ||
| 726 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 727 | |||
| 728 | # | ||
| 729 | # RTC interfaces | ||
| 730 | # | ||
| 731 | CONFIG_RTC_INTF_SYSFS=y | ||
| 732 | CONFIG_RTC_INTF_PROC=y | ||
| 733 | CONFIG_RTC_INTF_DEV=y | ||
| 734 | |||
| 735 | # | ||
| 736 | # RTC drivers | ||
| 696 | # | 737 | # |
| 738 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 739 | CONFIG_RTC_DRV_VR41XX=y | ||
| 740 | # CONFIG_RTC_DRV_TEST is not set | ||
| 697 | 741 | ||
| 698 | # | 742 | # |
| 699 | # File systems | 743 | # File systems |
| @@ -712,7 +756,7 @@ CONFIG_EXT2_FS=y | |||
| 712 | CONFIG_INOTIFY=y | 756 | CONFIG_INOTIFY=y |
| 713 | # CONFIG_QUOTA is not set | 757 | # CONFIG_QUOTA is not set |
| 714 | CONFIG_DNOTIFY=y | 758 | CONFIG_DNOTIFY=y |
| 715 | CONFIG_AUTOFS_FS=y | 759 | # CONFIG_AUTOFS_FS is not set |
| 716 | CONFIG_AUTOFS4_FS=y | 760 | CONFIG_AUTOFS4_FS=y |
| 717 | CONFIG_FUSE_FS=m | 761 | CONFIG_FUSE_FS=m |
| 718 | 762 | ||
| @@ -735,10 +779,9 @@ CONFIG_FUSE_FS=m | |||
| 735 | CONFIG_PROC_FS=y | 779 | CONFIG_PROC_FS=y |
| 736 | CONFIG_PROC_KCORE=y | 780 | CONFIG_PROC_KCORE=y |
| 737 | CONFIG_SYSFS=y | 781 | CONFIG_SYSFS=y |
| 738 | # CONFIG_TMPFS is not set | 782 | CONFIG_TMPFS=y |
| 739 | # CONFIG_HUGETLB_PAGE is not set | 783 | # CONFIG_HUGETLB_PAGE is not set |
| 740 | CONFIG_RAMFS=y | 784 | CONFIG_RAMFS=y |
| 741 | CONFIG_RELAYFS_FS=m | ||
| 742 | # CONFIG_CONFIGFS_FS is not set | 785 | # CONFIG_CONFIGFS_FS is not set |
| 743 | 786 | ||
| 744 | # | 787 | # |
| @@ -805,44 +848,20 @@ CONFIG_MSDOS_PARTITION=y | |||
| 805 | # CONFIG_MAGIC_SYSRQ is not set | 848 | # CONFIG_MAGIC_SYSRQ is not set |
| 806 | # CONFIG_DEBUG_KERNEL is not set | 849 | # CONFIG_DEBUG_KERNEL is not set |
| 807 | CONFIG_LOG_BUF_SHIFT=14 | 850 | CONFIG_LOG_BUF_SHIFT=14 |
| 851 | # CONFIG_DEBUG_FS is not set | ||
| 808 | CONFIG_CROSSCOMPILE=y | 852 | CONFIG_CROSSCOMPILE=y |
| 809 | CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" | 853 | CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" |
| 810 | 854 | ||
| 811 | # | 855 | # |
| 812 | # Security options | 856 | # Security options |
| 813 | # | 857 | # |
| 814 | CONFIG_KEYS=y | 858 | # CONFIG_KEYS is not set |
| 815 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 816 | # CONFIG_SECURITY is not set | 859 | # CONFIG_SECURITY is not set |
| 817 | 860 | ||
| 818 | # | 861 | # |
| 819 | # Cryptographic options | 862 | # Cryptographic options |
| 820 | # | 863 | # |
| 821 | CONFIG_CRYPTO=y | 864 | # CONFIG_CRYPTO is not set |
| 822 | CONFIG_CRYPTO_HMAC=y | ||
| 823 | CONFIG_CRYPTO_NULL=m | ||
| 824 | CONFIG_CRYPTO_MD4=m | ||
| 825 | CONFIG_CRYPTO_MD5=m | ||
| 826 | CONFIG_CRYPTO_SHA1=m | ||
| 827 | CONFIG_CRYPTO_SHA256=m | ||
| 828 | CONFIG_CRYPTO_SHA512=m | ||
| 829 | CONFIG_CRYPTO_WP512=m | ||
| 830 | CONFIG_CRYPTO_TGR192=m | ||
| 831 | CONFIG_CRYPTO_DES=m | ||
| 832 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 833 | CONFIG_CRYPTO_TWOFISH=m | ||
| 834 | CONFIG_CRYPTO_SERPENT=m | ||
| 835 | CONFIG_CRYPTO_AES=m | ||
| 836 | CONFIG_CRYPTO_CAST5=m | ||
| 837 | CONFIG_CRYPTO_CAST6=m | ||
| 838 | CONFIG_CRYPTO_TEA=m | ||
| 839 | CONFIG_CRYPTO_ARC4=m | ||
| 840 | CONFIG_CRYPTO_KHAZAD=m | ||
| 841 | CONFIG_CRYPTO_ANUBIS=m | ||
| 842 | CONFIG_CRYPTO_DEFLATE=m | ||
| 843 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 844 | CONFIG_CRYPTO_CRC32C=m | ||
| 845 | # CONFIG_CRYPTO_TEST is not set | ||
| 846 | 865 | ||
| 847 | # | 866 | # |
| 848 | # Hardware crypto devices | 867 | # Hardware crypto devices |
| @@ -852,8 +871,6 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 852 | # Library routines | 871 | # Library routines |
| 853 | # | 872 | # |
| 854 | # CONFIG_CRC_CCITT is not set | 873 | # CONFIG_CRC_CCITT is not set |
| 855 | CONFIG_CRC16=m | 874 | # CONFIG_CRC16 is not set |
| 856 | CONFIG_CRC32=y | 875 | CONFIG_CRC32=y |
| 857 | CONFIG_LIBCRC32C=m | 876 | # CONFIG_LIBCRC32C is not set |
| 858 | CONFIG_ZLIB_INFLATE=m | ||
| 859 | CONFIG_ZLIB_DEFLATE=m | ||
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 8336b21d3db2..7d269e609282 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:55 2006 | 4 | # Mon Apr 24 14:50:57 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -63,7 +63,10 @@ CONFIG_MIPS_COBALT=y | |||
| 63 | # CONFIG_TOSHIBA_JMR3927 is not set | 63 | # CONFIG_TOSHIBA_JMR3927 is not set |
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_EARLY_PRINTK=y | ||
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -113,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 113 | # CONFIG_PAGE_SIZE_16KB is not set | 116 | # CONFIG_PAGE_SIZE_16KB is not set |
| 114 | # CONFIG_PAGE_SIZE_64KB is not set | 117 | # CONFIG_PAGE_SIZE_64KB is not set |
| 115 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 116 | # CONFIG_CPU_ADVANCED is not set | ||
| 117 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 118 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 119 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -135,7 +137,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 135 | # Code maturity level options | 137 | # Code maturity level options |
| 136 | # | 138 | # |
| 137 | CONFIG_EXPERIMENTAL=y | 139 | CONFIG_EXPERIMENTAL=y |
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | 140 | CONFIG_BROKEN_ON_SMP=y |
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 141 | 142 | ||
| @@ -151,6 +152,7 @@ CONFIG_SYSVIPC=y | |||
| 151 | CONFIG_SYSCTL=y | 152 | CONFIG_SYSCTL=y |
| 152 | # CONFIG_AUDIT is not set | 153 | # CONFIG_AUDIT is not set |
| 153 | # CONFIG_IKCONFIG is not set | 154 | # CONFIG_IKCONFIG is not set |
| 155 | CONFIG_RELAY=y | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | 156 | CONFIG_INITRAMFS_SOURCE="" |
| 155 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 156 | CONFIG_EMBEDDED=y | 158 | CONFIG_EMBEDDED=y |
| @@ -164,10 +166,6 @@ CONFIG_BASE_FULL=y | |||
| 164 | CONFIG_FUTEX=y | 166 | CONFIG_FUTEX=y |
| 165 | CONFIG_EPOLL=y | 167 | CONFIG_EPOLL=y |
| 166 | CONFIG_SHMEM=y | 168 | CONFIG_SHMEM=y |
| 167 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 168 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 169 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 170 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 171 | CONFIG_SLAB=y | 169 | CONFIG_SLAB=y |
| 172 | # CONFIG_TINY_SHMEM is not set | 170 | # CONFIG_TINY_SHMEM is not set |
| 173 | CONFIG_BASE_SMALL=0 | 171 | CONFIG_BASE_SMALL=0 |
| @@ -182,6 +180,8 @@ CONFIG_BASE_SMALL=0 | |||
| 182 | # Block layer | 180 | # Block layer |
| 183 | # | 181 | # |
| 184 | # CONFIG_LBD is not set | 182 | # CONFIG_LBD is not set |
| 183 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 184 | # CONFIG_LSF is not set | ||
| 185 | 185 | ||
| 186 | # | 186 | # |
| 187 | # IO Schedulers | 187 | # IO Schedulers |
| @@ -201,7 +201,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 201 | # | 201 | # |
| 202 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| 203 | CONFIG_PCI=y | 203 | CONFIG_PCI=y |
| 204 | CONFIG_PCI_LEGACY_PROC=y | ||
| 205 | CONFIG_MMU=y | 204 | CONFIG_MMU=y |
| 206 | 205 | ||
| 207 | # | 206 | # |
| @@ -229,6 +228,7 @@ CONFIG_NET=y | |||
| 229 | # | 228 | # |
| 230 | # Networking options | 229 | # Networking options |
| 231 | # | 230 | # |
| 231 | # CONFIG_NETDEBUG is not set | ||
| 232 | CONFIG_PACKET=y | 232 | CONFIG_PACKET=y |
| 233 | # CONFIG_PACKET_MMAP is not set | 233 | # CONFIG_PACKET_MMAP is not set |
| 234 | CONFIG_UNIX=y | 234 | CONFIG_UNIX=y |
| @@ -247,12 +247,15 @@ CONFIG_IP_FIB_HASH=y | |||
| 247 | # CONFIG_INET_AH is not set | 247 | # CONFIG_INET_AH is not set |
| 248 | # CONFIG_INET_ESP is not set | 248 | # CONFIG_INET_ESP is not set |
| 249 | # CONFIG_INET_IPCOMP is not set | 249 | # CONFIG_INET_IPCOMP is not set |
| 250 | CONFIG_INET_TUNNEL=y | 250 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 251 | # CONFIG_INET_TUNNEL is not set | ||
| 251 | CONFIG_INET_DIAG=y | 252 | CONFIG_INET_DIAG=y |
| 252 | CONFIG_INET_TCP_DIAG=y | 253 | CONFIG_INET_TCP_DIAG=y |
| 253 | # CONFIG_TCP_CONG_ADVANCED is not set | 254 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 254 | CONFIG_TCP_CONG_BIC=y | 255 | CONFIG_TCP_CONG_BIC=y |
| 255 | # CONFIG_IPV6 is not set | 256 | # CONFIG_IPV6 is not set |
| 257 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 258 | # CONFIG_INET6_TUNNEL is not set | ||
| 256 | # CONFIG_NETFILTER is not set | 259 | # CONFIG_NETFILTER is not set |
| 257 | 260 | ||
| 258 | # | 261 | # |
| @@ -264,6 +267,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 264 | # SCTP Configuration (EXPERIMENTAL) | 267 | # SCTP Configuration (EXPERIMENTAL) |
| 265 | # | 268 | # |
| 266 | # CONFIG_IP_SCTP is not set | 269 | # CONFIG_IP_SCTP is not set |
| 270 | |||
| 271 | # | ||
| 272 | # TIPC Configuration (EXPERIMENTAL) | ||
| 273 | # | ||
| 274 | # CONFIG_TIPC is not set | ||
| 267 | # CONFIG_ATM is not set | 275 | # CONFIG_ATM is not set |
| 268 | # CONFIG_BRIDGE is not set | 276 | # CONFIG_BRIDGE is not set |
| 269 | # CONFIG_VLAN_8021Q is not set | 277 | # CONFIG_VLAN_8021Q is not set |
| @@ -273,11 +281,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 273 | # CONFIG_ATALK is not set | 281 | # CONFIG_ATALK is not set |
| 274 | # CONFIG_X25 is not set | 282 | # CONFIG_X25 is not set |
| 275 | # CONFIG_LAPB is not set | 283 | # CONFIG_LAPB is not set |
| 276 | |||
| 277 | # | ||
| 278 | # TIPC Configuration (EXPERIMENTAL) | ||
| 279 | # | ||
| 280 | # CONFIG_TIPC is not set | ||
| 281 | # CONFIG_NET_DIVERT is not set | 284 | # CONFIG_NET_DIVERT is not set |
| 282 | # CONFIG_ECONET is not set | 285 | # CONFIG_ECONET is not set |
| 283 | # CONFIG_WAN_ROUTER is not set | 286 | # CONFIG_WAN_ROUTER is not set |
| @@ -298,6 +301,9 @@ CONFIG_IEEE80211=y | |||
| 298 | # CONFIG_IEEE80211_DEBUG is not set | 301 | # CONFIG_IEEE80211_DEBUG is not set |
| 299 | CONFIG_IEEE80211_CRYPT_WEP=y | 302 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 300 | CONFIG_IEEE80211_CRYPT_CCMP=y | 303 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 304 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 305 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 306 | CONFIG_WIRELESS_EXT=y | ||
| 301 | 307 | ||
| 302 | # | 308 | # |
| 303 | # Device Drivers | 309 | # Device Drivers |
| @@ -343,7 +349,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 343 | # CONFIG_BLK_DEV_NBD is not set | 349 | # CONFIG_BLK_DEV_NBD is not set |
| 344 | # CONFIG_BLK_DEV_SX8 is not set | 350 | # CONFIG_BLK_DEV_SX8 is not set |
| 345 | # CONFIG_BLK_DEV_RAM is not set | 351 | # CONFIG_BLK_DEV_RAM is not set |
| 346 | CONFIG_BLK_DEV_RAM_COUNT=16 | 352 | # CONFIG_BLK_DEV_INITRD is not set |
| 347 | CONFIG_CDROM_PKTCDVD=y | 353 | CONFIG_CDROM_PKTCDVD=y |
| 348 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 354 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 349 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 355 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -593,6 +599,7 @@ CONFIG_HW_CONSOLE=y | |||
| 593 | # | 599 | # |
| 594 | CONFIG_SERIAL_8250=y | 600 | CONFIG_SERIAL_8250=y |
| 595 | CONFIG_SERIAL_8250_CONSOLE=y | 601 | CONFIG_SERIAL_8250_CONSOLE=y |
| 602 | CONFIG_SERIAL_8250_PCI=y | ||
| 596 | CONFIG_SERIAL_8250_NR_UARTS=4 | 603 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 597 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 604 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 598 | # CONFIG_SERIAL_8250_EXTENDED is not set | 605 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -602,6 +609,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 602 | # | 609 | # |
| 603 | CONFIG_SERIAL_CORE=y | 610 | CONFIG_SERIAL_CORE=y |
| 604 | CONFIG_SERIAL_CORE_CONSOLE=y | 611 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 612 | # CONFIG_SERIAL_JSM is not set | ||
| 605 | CONFIG_UNIX98_PTYS=y | 613 | CONFIG_UNIX98_PTYS=y |
| 606 | CONFIG_LEGACY_PTYS=y | 614 | CONFIG_LEGACY_PTYS=y |
| 607 | CONFIG_LEGACY_PTY_COUNT=256 | 615 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -660,10 +668,6 @@ CONFIG_COBALT_LCD=y | |||
| 660 | # | 668 | # |
| 661 | 669 | ||
| 662 | # | 670 | # |
| 663 | # Multimedia Capabilities Port drivers | ||
| 664 | # | ||
| 665 | |||
| 666 | # | ||
| 667 | # Multimedia devices | 671 | # Multimedia devices |
| 668 | # | 672 | # |
| 669 | # CONFIG_VIDEO_DEV is not set | 673 | # CONFIG_VIDEO_DEV is not set |
| @@ -694,6 +698,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 694 | # | 698 | # |
| 695 | CONFIG_USB_ARCH_HAS_HCD=y | 699 | CONFIG_USB_ARCH_HAS_HCD=y |
| 696 | CONFIG_USB_ARCH_HAS_OHCI=y | 700 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 701 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 697 | # CONFIG_USB is not set | 702 | # CONFIG_USB is not set |
| 698 | 703 | ||
| 699 | # | 704 | # |
| @@ -711,13 +716,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 711 | # CONFIG_MMC is not set | 716 | # CONFIG_MMC is not set |
| 712 | 717 | ||
| 713 | # | 718 | # |
| 719 | # LED devices | ||
| 720 | # | ||
| 721 | # CONFIG_NEW_LEDS is not set | ||
| 722 | |||
| 723 | # | ||
| 724 | # LED drivers | ||
| 725 | # | ||
| 726 | |||
| 727 | # | ||
| 728 | # LED Triggers | ||
| 729 | # | ||
| 730 | |||
| 731 | # | ||
| 714 | # InfiniBand support | 732 | # InfiniBand support |
| 715 | # | 733 | # |
| 716 | # CONFIG_INFINIBAND is not set | 734 | # CONFIG_INFINIBAND is not set |
| 717 | 735 | ||
| 718 | # | 736 | # |
| 719 | # SN Devices | 737 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 738 | # | ||
| 739 | |||
| 740 | # | ||
| 741 | # Real Time Clock | ||
| 720 | # | 742 | # |
| 743 | # CONFIG_RTC_CLASS is not set | ||
| 721 | 744 | ||
| 722 | # | 745 | # |
| 723 | # File systems | 746 | # File systems |
| @@ -765,7 +788,6 @@ CONFIG_SYSFS=y | |||
| 765 | # CONFIG_TMPFS is not set | 788 | # CONFIG_TMPFS is not set |
| 766 | # CONFIG_HUGETLB_PAGE is not set | 789 | # CONFIG_HUGETLB_PAGE is not set |
| 767 | CONFIG_RAMFS=y | 790 | CONFIG_RAMFS=y |
| 768 | CONFIG_RELAYFS_FS=y | ||
| 769 | # CONFIG_CONFIGFS_FS is not set | 791 | # CONFIG_CONFIGFS_FS is not set |
| 770 | 792 | ||
| 771 | # | 793 | # |
| @@ -828,6 +850,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 828 | # CONFIG_MAGIC_SYSRQ is not set | 850 | # CONFIG_MAGIC_SYSRQ is not set |
| 829 | # CONFIG_DEBUG_KERNEL is not set | 851 | # CONFIG_DEBUG_KERNEL is not set |
| 830 | CONFIG_LOG_BUF_SHIFT=14 | 852 | CONFIG_LOG_BUF_SHIFT=14 |
| 853 | # CONFIG_DEBUG_FS is not set | ||
| 854 | # CONFIG_UNWIND_INFO is not set | ||
| 831 | CONFIG_CROSSCOMPILE=y | 855 | CONFIG_CROSSCOMPILE=y |
| 832 | CONFIG_CMDLINE="" | 856 | CONFIG_CMDLINE="" |
| 833 | 857 | ||
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 7f071403c8e3..579b665e3339 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:56 2006 | 4 | # Mon Apr 24 14:50:57 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_DB1000=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | CONFIG_CPU_HAS_PREFETCH=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 115 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
| 116 | CONFIG_64BIT_PHYS_ADDR=y | 118 | CONFIG_64BIT_PHYS_ADDR=y |
| 117 | # CONFIG_CPU_ADVANCED is not set | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 121 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 123 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 122 | CONFIG_ARCH_FLATMEM_ENABLE=y | 124 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 123 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 124 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| @@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 136 | # Code maturity level options | 138 | # Code maturity level options |
| 137 | # | 139 | # |
| 138 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 142 | 143 | ||
| @@ -152,6 +153,7 @@ CONFIG_SYSVIPC=y | |||
| 152 | CONFIG_SYSCTL=y | 153 | CONFIG_SYSCTL=y |
| 153 | # CONFIG_AUDIT is not set | 154 | # CONFIG_AUDIT is not set |
| 154 | # CONFIG_IKCONFIG is not set | 155 | # CONFIG_IKCONFIG is not set |
| 156 | CONFIG_RELAY=y | ||
| 155 | CONFIG_INITRAMFS_SOURCE="" | 157 | CONFIG_INITRAMFS_SOURCE="" |
| 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 157 | CONFIG_EMBEDDED=y | 159 | CONFIG_EMBEDDED=y |
| @@ -165,10 +167,6 @@ CONFIG_BASE_FULL=y | |||
| 165 | CONFIG_FUTEX=y | 167 | CONFIG_FUTEX=y |
| 166 | CONFIG_EPOLL=y | 168 | CONFIG_EPOLL=y |
| 167 | CONFIG_SHMEM=y | 169 | CONFIG_SHMEM=y |
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | CONFIG_SLAB=y | 170 | CONFIG_SLAB=y |
| 173 | # CONFIG_TINY_SHMEM is not set | 171 | # CONFIG_TINY_SHMEM is not set |
| 174 | CONFIG_BASE_SMALL=0 | 172 | CONFIG_BASE_SMALL=0 |
| @@ -181,7 +179,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 181 | CONFIG_MODULES=y | 179 | CONFIG_MODULES=y |
| 182 | CONFIG_MODULE_UNLOAD=y | 180 | CONFIG_MODULE_UNLOAD=y |
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | 182 | CONFIG_MODVERSIONS=y |
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | 183 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 187 | CONFIG_KMOD=y | 184 | CONFIG_KMOD=y |
| @@ -190,6 +187,8 @@ CONFIG_KMOD=y | |||
| 190 | # Block layer | 187 | # Block layer |
| 191 | # | 188 | # |
| 192 | # CONFIG_LBD is not set | 189 | # CONFIG_LBD is not set |
| 190 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 191 | # CONFIG_LSF is not set | ||
| 193 | 192 | ||
| 194 | # | 193 | # |
| 195 | # IO Schedulers | 194 | # IO Schedulers |
| @@ -245,6 +244,7 @@ CONFIG_NET=y | |||
| 245 | # | 244 | # |
| 246 | # Networking options | 245 | # Networking options |
| 247 | # | 246 | # |
| 247 | # CONFIG_NETDEBUG is not set | ||
| 248 | CONFIG_PACKET=y | 248 | CONFIG_PACKET=y |
| 249 | # CONFIG_PACKET_MMAP is not set | 249 | # CONFIG_PACKET_MMAP is not set |
| 250 | CONFIG_UNIX=y | 250 | CONFIG_UNIX=y |
| @@ -267,7 +267,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 267 | # CONFIG_INET_AH is not set | 267 | # CONFIG_INET_AH is not set |
| 268 | # CONFIG_INET_ESP is not set | 268 | # CONFIG_INET_ESP is not set |
| 269 | # CONFIG_INET_IPCOMP is not set | 269 | # CONFIG_INET_IPCOMP is not set |
| 270 | CONFIG_INET_TUNNEL=m | 270 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 271 | # CONFIG_INET_TUNNEL is not set | ||
| 271 | CONFIG_INET_DIAG=y | 272 | CONFIG_INET_DIAG=y |
| 272 | CONFIG_INET_TCP_DIAG=y | 273 | CONFIG_INET_TCP_DIAG=y |
| 273 | # CONFIG_TCP_CONG_ADVANCED is not set | 274 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -278,6 +279,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 278 | # | 279 | # |
| 279 | # CONFIG_IP_VS is not set | 280 | # CONFIG_IP_VS is not set |
| 280 | # CONFIG_IPV6 is not set | 281 | # CONFIG_IPV6 is not set |
| 282 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 283 | # CONFIG_INET6_TUNNEL is not set | ||
| 281 | CONFIG_NETFILTER=y | 284 | CONFIG_NETFILTER=y |
| 282 | # CONFIG_NETFILTER_DEBUG is not set | 285 | # CONFIG_NETFILTER_DEBUG is not set |
| 283 | 286 | ||
| @@ -294,10 +297,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 294 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 297 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 298 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 299 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 297 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 301 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 298 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 302 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 303 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 304 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 306 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 301 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 307 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 308 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 309 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -321,6 +327,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 321 | # SCTP Configuration (EXPERIMENTAL) | 327 | # SCTP Configuration (EXPERIMENTAL) |
| 322 | # | 328 | # |
| 323 | # CONFIG_IP_SCTP is not set | 329 | # CONFIG_IP_SCTP is not set |
| 330 | |||
| 331 | # | ||
| 332 | # TIPC Configuration (EXPERIMENTAL) | ||
| 333 | # | ||
| 334 | # CONFIG_TIPC is not set | ||
| 324 | # CONFIG_ATM is not set | 335 | # CONFIG_ATM is not set |
| 325 | # CONFIG_BRIDGE is not set | 336 | # CONFIG_BRIDGE is not set |
| 326 | # CONFIG_VLAN_8021Q is not set | 337 | # CONFIG_VLAN_8021Q is not set |
| @@ -330,11 +341,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 330 | # CONFIG_ATALK is not set | 341 | # CONFIG_ATALK is not set |
| 331 | # CONFIG_X25 is not set | 342 | # CONFIG_X25 is not set |
| 332 | # CONFIG_LAPB is not set | 343 | # CONFIG_LAPB is not set |
| 333 | |||
| 334 | # | ||
| 335 | # TIPC Configuration (EXPERIMENTAL) | ||
| 336 | # | ||
| 337 | # CONFIG_TIPC is not set | ||
| 338 | # CONFIG_NET_DIVERT is not set | 344 | # CONFIG_NET_DIVERT is not set |
| 339 | # CONFIG_ECONET is not set | 345 | # CONFIG_ECONET is not set |
| 340 | # CONFIG_WAN_ROUTER is not set | 346 | # CONFIG_WAN_ROUTER is not set |
| @@ -356,6 +362,9 @@ CONFIG_IEEE80211=m | |||
| 356 | # CONFIG_IEEE80211_DEBUG is not set | 362 | # CONFIG_IEEE80211_DEBUG is not set |
| 357 | CONFIG_IEEE80211_CRYPT_WEP=m | 363 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 358 | CONFIG_IEEE80211_CRYPT_CCMP=m | 364 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 365 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 366 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 367 | CONFIG_WIRELESS_EXT=y | ||
| 359 | 368 | ||
| 360 | # | 369 | # |
| 361 | # Device Drivers | 370 | # Device Drivers |
| @@ -412,7 +421,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 412 | # CONFIG_MTD_CFI_I8 is not set | 421 | # CONFIG_MTD_CFI_I8 is not set |
| 413 | # CONFIG_MTD_CFI_INTELEXT is not set | 422 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 414 | CONFIG_MTD_CFI_AMDSTD=y | 423 | CONFIG_MTD_CFI_AMDSTD=y |
| 415 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 416 | # CONFIG_MTD_CFI_STAA is not set | 424 | # CONFIG_MTD_CFI_STAA is not set |
| 417 | CONFIG_MTD_CFI_UTIL=y | 425 | CONFIG_MTD_CFI_UTIL=y |
| 418 | # CONFIG_MTD_RAM is not set | 426 | # CONFIG_MTD_RAM is not set |
| @@ -434,7 +442,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 434 | # CONFIG_MTD_SLRAM is not set | 442 | # CONFIG_MTD_SLRAM is not set |
| 435 | # CONFIG_MTD_PHRAM is not set | 443 | # CONFIG_MTD_PHRAM is not set |
| 436 | # CONFIG_MTD_MTDRAM is not set | 444 | # CONFIG_MTD_MTDRAM is not set |
| 437 | # CONFIG_MTD_BLKMTD is not set | ||
| 438 | # CONFIG_MTD_BLOCK2MTD is not set | 445 | # CONFIG_MTD_BLOCK2MTD is not set |
| 439 | 446 | ||
| 440 | # | 447 | # |
| @@ -471,7 +478,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 471 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 478 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 472 | # CONFIG_BLK_DEV_NBD is not set | 479 | # CONFIG_BLK_DEV_NBD is not set |
| 473 | # CONFIG_BLK_DEV_RAM is not set | 480 | # CONFIG_BLK_DEV_RAM is not set |
| 474 | CONFIG_BLK_DEV_RAM_COUNT=16 | 481 | # CONFIG_BLK_DEV_INITRD is not set |
| 475 | CONFIG_CDROM_PKTCDVD=m | 482 | CONFIG_CDROM_PKTCDVD=m |
| 476 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 483 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 477 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 484 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -722,10 +729,6 @@ CONFIG_SYNCLINK_CS=m | |||
| 722 | # | 729 | # |
| 723 | 730 | ||
| 724 | # | 731 | # |
| 725 | # Multimedia Capabilities Port drivers | ||
| 726 | # | ||
| 727 | |||
| 728 | # | ||
| 729 | # Multimedia devices | 732 | # Multimedia devices |
| 730 | # | 733 | # |
| 731 | # CONFIG_VIDEO_DEV is not set | 734 | # CONFIG_VIDEO_DEV is not set |
| @@ -756,6 +759,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 756 | # | 759 | # |
| 757 | CONFIG_USB_ARCH_HAS_HCD=y | 760 | CONFIG_USB_ARCH_HAS_HCD=y |
| 758 | CONFIG_USB_ARCH_HAS_OHCI=y | 761 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 762 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 759 | # CONFIG_USB is not set | 763 | # CONFIG_USB is not set |
| 760 | 764 | ||
| 761 | # | 765 | # |
| @@ -773,12 +777,30 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 773 | # CONFIG_MMC is not set | 777 | # CONFIG_MMC is not set |
| 774 | 778 | ||
| 775 | # | 779 | # |
| 780 | # LED devices | ||
| 781 | # | ||
| 782 | # CONFIG_NEW_LEDS is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # LED drivers | ||
| 786 | # | ||
| 787 | |||
| 788 | # | ||
| 789 | # LED Triggers | ||
| 790 | # | ||
| 791 | |||
| 792 | # | ||
| 776 | # InfiniBand support | 793 | # InfiniBand support |
| 777 | # | 794 | # |
| 778 | 795 | ||
| 779 | # | 796 | # |
| 780 | # SN Devices | 797 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 798 | # | ||
| 799 | |||
| 800 | # | ||
| 801 | # Real Time Clock | ||
| 781 | # | 802 | # |
| 803 | # CONFIG_RTC_CLASS is not set | ||
| 782 | 804 | ||
| 783 | # | 805 | # |
| 784 | # File systems | 806 | # File systems |
| @@ -836,7 +858,6 @@ CONFIG_SYSFS=y | |||
| 836 | CONFIG_TMPFS=y | 858 | CONFIG_TMPFS=y |
| 837 | # CONFIG_HUGETLB_PAGE is not set | 859 | # CONFIG_HUGETLB_PAGE is not set |
| 838 | CONFIG_RAMFS=y | 860 | CONFIG_RAMFS=y |
| 839 | CONFIG_RELAYFS_FS=m | ||
| 840 | # CONFIG_CONFIGFS_FS is not set | 861 | # CONFIG_CONFIGFS_FS is not set |
| 841 | 862 | ||
| 842 | # | 863 | # |
| @@ -945,6 +966,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 945 | # CONFIG_MAGIC_SYSRQ is not set | 966 | # CONFIG_MAGIC_SYSRQ is not set |
| 946 | # CONFIG_DEBUG_KERNEL is not set | 967 | # CONFIG_DEBUG_KERNEL is not set |
| 947 | CONFIG_LOG_BUF_SHIFT=14 | 968 | CONFIG_LOG_BUF_SHIFT=14 |
| 969 | # CONFIG_DEBUG_FS is not set | ||
| 948 | CONFIG_CROSSCOMPILE=y | 970 | CONFIG_CROSSCOMPILE=y |
| 949 | CONFIG_CMDLINE="" | 971 | CONFIG_CMDLINE="" |
| 950 | 972 | ||
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index 98590cac1ec5..e5eb53867422 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:57 2006 | 4 | # Mon Apr 24 14:50:58 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_DB1100=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | CONFIG_CPU_HAS_PREFETCH=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 115 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
| 116 | CONFIG_64BIT_PHYS_ADDR=y | 118 | CONFIG_64BIT_PHYS_ADDR=y |
| 117 | # CONFIG_CPU_ADVANCED is not set | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 121 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 123 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 122 | CONFIG_ARCH_FLATMEM_ENABLE=y | 124 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 123 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 124 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| @@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 136 | # Code maturity level options | 138 | # Code maturity level options |
| 137 | # | 139 | # |
| 138 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 142 | 143 | ||
| @@ -152,6 +153,7 @@ CONFIG_SYSVIPC=y | |||
| 152 | CONFIG_SYSCTL=y | 153 | CONFIG_SYSCTL=y |
| 153 | # CONFIG_AUDIT is not set | 154 | # CONFIG_AUDIT is not set |
| 154 | # CONFIG_IKCONFIG is not set | 155 | # CONFIG_IKCONFIG is not set |
| 156 | CONFIG_RELAY=y | ||
| 155 | CONFIG_INITRAMFS_SOURCE="" | 157 | CONFIG_INITRAMFS_SOURCE="" |
| 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 157 | CONFIG_EMBEDDED=y | 159 | CONFIG_EMBEDDED=y |
| @@ -165,10 +167,6 @@ CONFIG_BASE_FULL=y | |||
| 165 | CONFIG_FUTEX=y | 167 | CONFIG_FUTEX=y |
| 166 | CONFIG_EPOLL=y | 168 | CONFIG_EPOLL=y |
| 167 | CONFIG_SHMEM=y | 169 | CONFIG_SHMEM=y |
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | CONFIG_SLAB=y | 170 | CONFIG_SLAB=y |
| 173 | # CONFIG_TINY_SHMEM is not set | 171 | # CONFIG_TINY_SHMEM is not set |
| 174 | CONFIG_BASE_SMALL=0 | 172 | CONFIG_BASE_SMALL=0 |
| @@ -181,7 +179,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 181 | CONFIG_MODULES=y | 179 | CONFIG_MODULES=y |
| 182 | CONFIG_MODULE_UNLOAD=y | 180 | CONFIG_MODULE_UNLOAD=y |
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | 182 | CONFIG_MODVERSIONS=y |
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | 183 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 187 | CONFIG_KMOD=y | 184 | CONFIG_KMOD=y |
| @@ -190,6 +187,8 @@ CONFIG_KMOD=y | |||
| 190 | # Block layer | 187 | # Block layer |
| 191 | # | 188 | # |
| 192 | # CONFIG_LBD is not set | 189 | # CONFIG_LBD is not set |
| 190 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 191 | # CONFIG_LSF is not set | ||
| 193 | 192 | ||
| 194 | # | 193 | # |
| 195 | # IO Schedulers | 194 | # IO Schedulers |
| @@ -234,6 +233,7 @@ CONFIG_NET=y | |||
| 234 | # | 233 | # |
| 235 | # Networking options | 234 | # Networking options |
| 236 | # | 235 | # |
| 236 | # CONFIG_NETDEBUG is not set | ||
| 237 | CONFIG_PACKET=y | 237 | CONFIG_PACKET=y |
| 238 | # CONFIG_PACKET_MMAP is not set | 238 | # CONFIG_PACKET_MMAP is not set |
| 239 | CONFIG_UNIX=y | 239 | CONFIG_UNIX=y |
| @@ -256,7 +256,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 256 | # CONFIG_INET_AH is not set | 256 | # CONFIG_INET_AH is not set |
| 257 | # CONFIG_INET_ESP is not set | 257 | # CONFIG_INET_ESP is not set |
| 258 | # CONFIG_INET_IPCOMP is not set | 258 | # CONFIG_INET_IPCOMP is not set |
| 259 | CONFIG_INET_TUNNEL=m | 259 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 260 | # CONFIG_INET_TUNNEL is not set | ||
| 260 | CONFIG_INET_DIAG=y | 261 | CONFIG_INET_DIAG=y |
| 261 | CONFIG_INET_TCP_DIAG=y | 262 | CONFIG_INET_TCP_DIAG=y |
| 262 | # CONFIG_TCP_CONG_ADVANCED is not set | 263 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -267,6 +268,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 267 | # | 268 | # |
| 268 | # CONFIG_IP_VS is not set | 269 | # CONFIG_IP_VS is not set |
| 269 | # CONFIG_IPV6 is not set | 270 | # CONFIG_IPV6 is not set |
| 271 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 272 | # CONFIG_INET6_TUNNEL is not set | ||
| 270 | CONFIG_NETFILTER=y | 273 | CONFIG_NETFILTER=y |
| 271 | # CONFIG_NETFILTER_DEBUG is not set | 274 | # CONFIG_NETFILTER_DEBUG is not set |
| 272 | 275 | ||
| @@ -283,10 +286,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 283 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 286 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 284 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 287 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 288 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 286 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 290 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 292 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 293 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 295 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 290 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 296 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 297 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 298 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -310,6 +316,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 310 | # SCTP Configuration (EXPERIMENTAL) | 316 | # SCTP Configuration (EXPERIMENTAL) |
| 311 | # | 317 | # |
| 312 | # CONFIG_IP_SCTP is not set | 318 | # CONFIG_IP_SCTP is not set |
| 319 | |||
| 320 | # | ||
| 321 | # TIPC Configuration (EXPERIMENTAL) | ||
| 322 | # | ||
| 323 | # CONFIG_TIPC is not set | ||
| 313 | # CONFIG_ATM is not set | 324 | # CONFIG_ATM is not set |
| 314 | # CONFIG_BRIDGE is not set | 325 | # CONFIG_BRIDGE is not set |
| 315 | # CONFIG_VLAN_8021Q is not set | 326 | # CONFIG_VLAN_8021Q is not set |
| @@ -319,11 +330,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 319 | # CONFIG_ATALK is not set | 330 | # CONFIG_ATALK is not set |
| 320 | # CONFIG_X25 is not set | 331 | # CONFIG_X25 is not set |
| 321 | # CONFIG_LAPB is not set | 332 | # CONFIG_LAPB is not set |
| 322 | |||
| 323 | # | ||
| 324 | # TIPC Configuration (EXPERIMENTAL) | ||
| 325 | # | ||
| 326 | # CONFIG_TIPC is not set | ||
| 327 | # CONFIG_NET_DIVERT is not set | 333 | # CONFIG_NET_DIVERT is not set |
| 328 | # CONFIG_ECONET is not set | 334 | # CONFIG_ECONET is not set |
| 329 | # CONFIG_WAN_ROUTER is not set | 335 | # CONFIG_WAN_ROUTER is not set |
| @@ -345,6 +351,9 @@ CONFIG_IEEE80211=m | |||
| 345 | # CONFIG_IEEE80211_DEBUG is not set | 351 | # CONFIG_IEEE80211_DEBUG is not set |
| 346 | CONFIG_IEEE80211_CRYPT_WEP=m | 352 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 347 | CONFIG_IEEE80211_CRYPT_CCMP=m | 353 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 354 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 355 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 356 | CONFIG_WIRELESS_EXT=y | ||
| 348 | 357 | ||
| 349 | # | 358 | # |
| 350 | # Device Drivers | 359 | # Device Drivers |
| @@ -401,7 +410,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 401 | # CONFIG_MTD_CFI_I8 is not set | 410 | # CONFIG_MTD_CFI_I8 is not set |
| 402 | # CONFIG_MTD_CFI_INTELEXT is not set | 411 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 403 | CONFIG_MTD_CFI_AMDSTD=y | 412 | CONFIG_MTD_CFI_AMDSTD=y |
| 404 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 405 | # CONFIG_MTD_CFI_STAA is not set | 413 | # CONFIG_MTD_CFI_STAA is not set |
| 406 | CONFIG_MTD_CFI_UTIL=y | 414 | CONFIG_MTD_CFI_UTIL=y |
| 407 | # CONFIG_MTD_RAM is not set | 415 | # CONFIG_MTD_RAM is not set |
| @@ -423,7 +431,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 423 | # CONFIG_MTD_SLRAM is not set | 431 | # CONFIG_MTD_SLRAM is not set |
| 424 | # CONFIG_MTD_PHRAM is not set | 432 | # CONFIG_MTD_PHRAM is not set |
| 425 | # CONFIG_MTD_MTDRAM is not set | 433 | # CONFIG_MTD_MTDRAM is not set |
| 426 | # CONFIG_MTD_BLKMTD is not set | ||
| 427 | # CONFIG_MTD_BLOCK2MTD is not set | 434 | # CONFIG_MTD_BLOCK2MTD is not set |
| 428 | 435 | ||
| 429 | # | 436 | # |
| @@ -460,7 +467,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 460 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 467 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 461 | # CONFIG_BLK_DEV_NBD is not set | 468 | # CONFIG_BLK_DEV_NBD is not set |
| 462 | # CONFIG_BLK_DEV_RAM is not set | 469 | # CONFIG_BLK_DEV_RAM is not set |
| 463 | CONFIG_BLK_DEV_RAM_COUNT=16 | 470 | # CONFIG_BLK_DEV_INITRD is not set |
| 464 | CONFIG_CDROM_PKTCDVD=m | 471 | CONFIG_CDROM_PKTCDVD=m |
| 465 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 472 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 466 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 473 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -690,10 +697,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 690 | # | 697 | # |
| 691 | 698 | ||
| 692 | # | 699 | # |
| 693 | # Multimedia Capabilities Port drivers | ||
| 694 | # | ||
| 695 | |||
| 696 | # | ||
| 697 | # Multimedia devices | 700 | # Multimedia devices |
| 698 | # | 701 | # |
| 699 | # CONFIG_VIDEO_DEV is not set | 702 | # CONFIG_VIDEO_DEV is not set |
| @@ -711,6 +714,7 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 711 | CONFIG_FB_CFB_COPYAREA=y | 714 | CONFIG_FB_CFB_COPYAREA=y |
| 712 | CONFIG_FB_CFB_IMAGEBLIT=y | 715 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 713 | # CONFIG_FB_MACMODES is not set | 716 | # CONFIG_FB_MACMODES is not set |
| 717 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 714 | # CONFIG_FB_MODE_HELPERS is not set | 718 | # CONFIG_FB_MODE_HELPERS is not set |
| 715 | # CONFIG_FB_TILEBLITTING is not set | 719 | # CONFIG_FB_TILEBLITTING is not set |
| 716 | # CONFIG_FB_S1D13XXX is not set | 720 | # CONFIG_FB_S1D13XXX is not set |
| @@ -755,6 +759,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 755 | # | 759 | # |
| 756 | CONFIG_USB_ARCH_HAS_HCD=y | 760 | CONFIG_USB_ARCH_HAS_HCD=y |
| 757 | CONFIG_USB_ARCH_HAS_OHCI=y | 761 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 762 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 758 | # CONFIG_USB is not set | 763 | # CONFIG_USB is not set |
| 759 | 764 | ||
| 760 | # | 765 | # |
| @@ -772,12 +777,30 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 772 | # CONFIG_MMC is not set | 777 | # CONFIG_MMC is not set |
| 773 | 778 | ||
| 774 | # | 779 | # |
| 780 | # LED devices | ||
| 781 | # | ||
| 782 | # CONFIG_NEW_LEDS is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # LED drivers | ||
| 786 | # | ||
| 787 | |||
| 788 | # | ||
| 789 | # LED Triggers | ||
| 790 | # | ||
| 791 | |||
| 792 | # | ||
| 775 | # InfiniBand support | 793 | # InfiniBand support |
| 776 | # | 794 | # |
| 777 | 795 | ||
| 778 | # | 796 | # |
| 779 | # SN Devices | 797 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 798 | # | ||
| 799 | |||
| 800 | # | ||
| 801 | # Real Time Clock | ||
| 780 | # | 802 | # |
| 803 | # CONFIG_RTC_CLASS is not set | ||
| 781 | 804 | ||
| 782 | # | 805 | # |
| 783 | # File systems | 806 | # File systems |
| @@ -835,7 +858,6 @@ CONFIG_SYSFS=y | |||
| 835 | CONFIG_TMPFS=y | 858 | CONFIG_TMPFS=y |
| 836 | # CONFIG_HUGETLB_PAGE is not set | 859 | # CONFIG_HUGETLB_PAGE is not set |
| 837 | CONFIG_RAMFS=y | 860 | CONFIG_RAMFS=y |
| 838 | CONFIG_RELAYFS_FS=m | ||
| 839 | # CONFIG_CONFIGFS_FS is not set | 861 | # CONFIG_CONFIGFS_FS is not set |
| 840 | 862 | ||
| 841 | # | 863 | # |
| @@ -944,6 +966,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 944 | # CONFIG_MAGIC_SYSRQ is not set | 966 | # CONFIG_MAGIC_SYSRQ is not set |
| 945 | # CONFIG_DEBUG_KERNEL is not set | 967 | # CONFIG_DEBUG_KERNEL is not set |
| 946 | CONFIG_LOG_BUF_SHIFT=14 | 968 | CONFIG_LOG_BUF_SHIFT=14 |
| 969 | # CONFIG_DEBUG_FS is not set | ||
| 947 | CONFIG_CROSSCOMPILE=y | 970 | CONFIG_CROSSCOMPILE=y |
| 948 | CONFIG_CMDLINE="" | 971 | CONFIG_CMDLINE="" |
| 949 | 972 | ||
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index 92888472dca0..a43fb2329fd5 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:58 2006 | 4 | # Mon Apr 24 14:50:58 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_DB1200=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_COHERENT=y | 70 | CONFIG_DMA_COHERENT=y |
| 69 | CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y | 71 | CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y |
| @@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | CONFIG_CPU_HAS_PREFETCH=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 115 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
| 116 | CONFIG_64BIT_PHYS_ADDR=y | 118 | CONFIG_64BIT_PHYS_ADDR=y |
| 117 | # CONFIG_CPU_ADVANCED is not set | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 121 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 123 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 122 | CONFIG_ARCH_FLATMEM_ENABLE=y | 124 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 123 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 124 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| @@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 136 | # Code maturity level options | 138 | # Code maturity level options |
| 137 | # | 139 | # |
| 138 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 142 | 143 | ||
| @@ -153,6 +154,7 @@ CONFIG_SYSCTL=y | |||
| 153 | # CONFIG_AUDIT is not set | 154 | # CONFIG_AUDIT is not set |
| 154 | CONFIG_IKCONFIG=y | 155 | CONFIG_IKCONFIG=y |
| 155 | CONFIG_IKCONFIG_PROC=y | 156 | CONFIG_IKCONFIG_PROC=y |
| 157 | # CONFIG_RELAY is not set | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 166 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 167 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 168 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 174 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 175 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 182 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 183 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 188 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -191,6 +188,8 @@ CONFIG_KMOD=y | |||
| 191 | # Block layer | 188 | # Block layer |
| 192 | # | 189 | # |
| 193 | # CONFIG_LBD is not set | 190 | # CONFIG_LBD is not set |
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 194 | 193 | ||
| 195 | # | 194 | # |
| 196 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -244,6 +243,7 @@ CONFIG_NET=y | |||
| 244 | # | 243 | # |
| 245 | # Networking options | 244 | # Networking options |
| 246 | # | 245 | # |
| 246 | # CONFIG_NETDEBUG is not set | ||
| 247 | CONFIG_PACKET=y | 247 | CONFIG_PACKET=y |
| 248 | # CONFIG_PACKET_MMAP is not set | 248 | # CONFIG_PACKET_MMAP is not set |
| 249 | CONFIG_UNIX=y | 249 | CONFIG_UNIX=y |
| @@ -263,7 +263,8 @@ CONFIG_IP_FIB_HASH=y | |||
| 263 | # CONFIG_INET_AH is not set | 263 | # CONFIG_INET_AH is not set |
| 264 | # CONFIG_INET_ESP is not set | 264 | # CONFIG_INET_ESP is not set |
| 265 | # CONFIG_INET_IPCOMP is not set | 265 | # CONFIG_INET_IPCOMP is not set |
| 266 | CONFIG_INET_TUNNEL=m | 266 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 267 | # CONFIG_INET_TUNNEL is not set | ||
| 267 | CONFIG_INET_DIAG=y | 268 | CONFIG_INET_DIAG=y |
| 268 | CONFIG_INET_TCP_DIAG=y | 269 | CONFIG_INET_TCP_DIAG=y |
| 269 | # CONFIG_TCP_CONG_ADVANCED is not set | 270 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -274,6 +275,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 274 | # | 275 | # |
| 275 | # CONFIG_IP_VS is not set | 276 | # CONFIG_IP_VS is not set |
| 276 | # CONFIG_IPV6 is not set | 277 | # CONFIG_IPV6 is not set |
| 278 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 279 | # CONFIG_INET6_TUNNEL is not set | ||
| 277 | CONFIG_NETFILTER=y | 280 | CONFIG_NETFILTER=y |
| 278 | # CONFIG_NETFILTER_DEBUG is not set | 281 | # CONFIG_NETFILTER_DEBUG is not set |
| 279 | 282 | ||
| @@ -288,10 +291,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 288 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 291 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 292 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 293 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 291 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 295 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 296 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 297 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 294 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 298 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 299 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 300 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 295 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 301 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 302 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 303 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -315,6 +321,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 315 | # SCTP Configuration (EXPERIMENTAL) | 321 | # SCTP Configuration (EXPERIMENTAL) |
| 316 | # | 322 | # |
| 317 | # CONFIG_IP_SCTP is not set | 323 | # CONFIG_IP_SCTP is not set |
| 324 | |||
| 325 | # | ||
| 326 | # TIPC Configuration (EXPERIMENTAL) | ||
| 327 | # | ||
| 328 | # CONFIG_TIPC is not set | ||
| 318 | # CONFIG_ATM is not set | 329 | # CONFIG_ATM is not set |
| 319 | # CONFIG_BRIDGE is not set | 330 | # CONFIG_BRIDGE is not set |
| 320 | # CONFIG_VLAN_8021Q is not set | 331 | # CONFIG_VLAN_8021Q is not set |
| @@ -324,11 +335,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 324 | # CONFIG_ATALK is not set | 335 | # CONFIG_ATALK is not set |
| 325 | # CONFIG_X25 is not set | 336 | # CONFIG_X25 is not set |
| 326 | # CONFIG_LAPB is not set | 337 | # CONFIG_LAPB is not set |
| 327 | |||
| 328 | # | ||
| 329 | # TIPC Configuration (EXPERIMENTAL) | ||
| 330 | # | ||
| 331 | # CONFIG_TIPC is not set | ||
| 332 | # CONFIG_NET_DIVERT is not set | 338 | # CONFIG_NET_DIVERT is not set |
| 333 | # CONFIG_ECONET is not set | 339 | # CONFIG_ECONET is not set |
| 334 | # CONFIG_WAN_ROUTER is not set | 340 | # CONFIG_WAN_ROUTER is not set |
| @@ -403,7 +409,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 403 | # CONFIG_MTD_CFI_I8 is not set | 409 | # CONFIG_MTD_CFI_I8 is not set |
| 404 | # CONFIG_MTD_CFI_INTELEXT is not set | 410 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 405 | CONFIG_MTD_CFI_AMDSTD=y | 411 | CONFIG_MTD_CFI_AMDSTD=y |
| 406 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 407 | # CONFIG_MTD_CFI_STAA is not set | 412 | # CONFIG_MTD_CFI_STAA is not set |
| 408 | CONFIG_MTD_CFI_UTIL=y | 413 | CONFIG_MTD_CFI_UTIL=y |
| 409 | # CONFIG_MTD_RAM is not set | 414 | # CONFIG_MTD_RAM is not set |
| @@ -425,7 +430,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 425 | # CONFIG_MTD_SLRAM is not set | 430 | # CONFIG_MTD_SLRAM is not set |
| 426 | # CONFIG_MTD_PHRAM is not set | 431 | # CONFIG_MTD_PHRAM is not set |
| 427 | # CONFIG_MTD_MTDRAM is not set | 432 | # CONFIG_MTD_MTDRAM is not set |
| 428 | # CONFIG_MTD_BLKMTD is not set | ||
| 429 | # CONFIG_MTD_BLOCK2MTD is not set | 433 | # CONFIG_MTD_BLOCK2MTD is not set |
| 430 | 434 | ||
| 431 | # | 435 | # |
| @@ -763,10 +767,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 763 | # | 767 | # |
| 764 | 768 | ||
| 765 | # | 769 | # |
| 766 | # Multimedia Capabilities Port drivers | ||
| 767 | # | ||
| 768 | |||
| 769 | # | ||
| 770 | # Multimedia devices | 770 | # Multimedia devices |
| 771 | # | 771 | # |
| 772 | # CONFIG_VIDEO_DEV is not set | 772 | # CONFIG_VIDEO_DEV is not set |
| @@ -784,6 +784,7 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 784 | CONFIG_FB_CFB_COPYAREA=y | 784 | CONFIG_FB_CFB_COPYAREA=y |
| 785 | CONFIG_FB_CFB_IMAGEBLIT=y | 785 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 786 | # CONFIG_FB_MACMODES is not set | 786 | # CONFIG_FB_MACMODES is not set |
| 787 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 787 | # CONFIG_FB_MODE_HELPERS is not set | 788 | # CONFIG_FB_MODE_HELPERS is not set |
| 788 | # CONFIG_FB_TILEBLITTING is not set | 789 | # CONFIG_FB_TILEBLITTING is not set |
| 789 | # CONFIG_FB_S1D13XXX is not set | 790 | # CONFIG_FB_S1D13XXX is not set |
| @@ -794,6 +795,7 @@ CONFIG_FB_AU1200=y | |||
| 794 | # Console display driver support | 795 | # Console display driver support |
| 795 | # | 796 | # |
| 796 | CONFIG_VGA_CONSOLE=y | 797 | CONFIG_VGA_CONSOLE=y |
| 798 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 797 | CONFIG_DUMMY_CONSOLE=y | 799 | CONFIG_DUMMY_CONSOLE=y |
| 798 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 800 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
| 799 | 801 | ||
| @@ -816,6 +818,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 816 | # | 818 | # |
| 817 | CONFIG_USB_ARCH_HAS_HCD=y | 819 | CONFIG_USB_ARCH_HAS_HCD=y |
| 818 | CONFIG_USB_ARCH_HAS_OHCI=y | 820 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 821 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 819 | # CONFIG_USB is not set | 822 | # CONFIG_USB is not set |
| 820 | 823 | ||
| 821 | # | 824 | # |
| @@ -832,6 +835,7 @@ CONFIG_USB_GADGET=m | |||
| 832 | # CONFIG_USB_GADGET_GOKU is not set | 835 | # CONFIG_USB_GADGET_GOKU is not set |
| 833 | # CONFIG_USB_GADGET_LH7A40X is not set | 836 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 834 | # CONFIG_USB_GADGET_OMAP is not set | 837 | # CONFIG_USB_GADGET_OMAP is not set |
| 838 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 835 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 839 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
| 836 | # CONFIG_USB_GADGET_DUALSPEED is not set | 840 | # CONFIG_USB_GADGET_DUALSPEED is not set |
| 837 | 841 | ||
| @@ -844,12 +848,30 @@ CONFIG_MMC_BLOCK=y | |||
| 844 | CONFIG_MMC_AU1X=y | 848 | CONFIG_MMC_AU1X=y |
| 845 | 849 | ||
| 846 | # | 850 | # |
| 851 | # LED devices | ||
| 852 | # | ||
| 853 | # CONFIG_NEW_LEDS is not set | ||
| 854 | |||
| 855 | # | ||
| 856 | # LED drivers | ||
| 857 | # | ||
| 858 | |||
| 859 | # | ||
| 860 | # LED Triggers | ||
| 861 | # | ||
| 862 | |||
| 863 | # | ||
| 847 | # InfiniBand support | 864 | # InfiniBand support |
| 848 | # | 865 | # |
| 849 | 866 | ||
| 850 | # | 867 | # |
| 851 | # SN Devices | 868 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 869 | # | ||
| 870 | |||
| 871 | # | ||
| 872 | # Real Time Clock | ||
| 852 | # | 873 | # |
| 874 | # CONFIG_RTC_CLASS is not set | ||
| 853 | 875 | ||
| 854 | # | 876 | # |
| 855 | # File systems | 877 | # File systems |
| @@ -913,7 +935,6 @@ CONFIG_SYSFS=y | |||
| 913 | CONFIG_TMPFS=y | 935 | CONFIG_TMPFS=y |
| 914 | # CONFIG_HUGETLB_PAGE is not set | 936 | # CONFIG_HUGETLB_PAGE is not set |
| 915 | CONFIG_RAMFS=y | 937 | CONFIG_RAMFS=y |
| 916 | # CONFIG_RELAYFS_FS is not set | ||
| 917 | # CONFIG_CONFIGFS_FS is not set | 938 | # CONFIG_CONFIGFS_FS is not set |
| 918 | 939 | ||
| 919 | # | 940 | # |
| @@ -1027,6 +1048,7 @@ CONFIG_NLS_UTF8=m | |||
| 1027 | # CONFIG_MAGIC_SYSRQ is not set | 1048 | # CONFIG_MAGIC_SYSRQ is not set |
| 1028 | # CONFIG_DEBUG_KERNEL is not set | 1049 | # CONFIG_DEBUG_KERNEL is not set |
| 1029 | CONFIG_LOG_BUF_SHIFT=14 | 1050 | CONFIG_LOG_BUF_SHIFT=14 |
| 1051 | # CONFIG_DEBUG_FS is not set | ||
| 1030 | CONFIG_CROSSCOMPILE=y | 1052 | CONFIG_CROSSCOMPILE=y |
| 1031 | CONFIG_CMDLINE="mem=48M" | 1053 | CONFIG_CMDLINE="mem=48M" |
| 1032 | 1054 | ||
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 5a415b1d4af0..ad632d87c4ef 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:59 2006 | 4 | # Mon Apr 24 14:50:59 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_DB1500=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -116,11 +118,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 116 | CONFIG_CPU_HAS_PREFETCH=y | 118 | CONFIG_CPU_HAS_PREFETCH=y |
| 117 | # CONFIG_MIPS_MT is not set | 119 | # CONFIG_MIPS_MT is not set |
| 118 | CONFIG_64BIT_PHYS_ADDR=y | 120 | CONFIG_64BIT_PHYS_ADDR=y |
| 119 | # CONFIG_CPU_ADVANCED is not set | ||
| 120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
| 121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
| 122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
| 123 | CONFIG_GENERIC_IRQ_PROBE=y | 124 | CONFIG_GENERIC_IRQ_PROBE=y |
| 125 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 126 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 125 | CONFIG_SELECT_MEMORY_MODEL=y | 127 | CONFIG_SELECT_MEMORY_MODEL=y |
| 126 | CONFIG_FLATMEM_MANUAL=y | 128 | CONFIG_FLATMEM_MANUAL=y |
| @@ -138,7 +140,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 138 | # Code maturity level options | 140 | # Code maturity level options |
| 139 | # | 141 | # |
| 140 | CONFIG_EXPERIMENTAL=y | 142 | CONFIG_EXPERIMENTAL=y |
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | 143 | CONFIG_BROKEN_ON_SMP=y |
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 144 | 145 | ||
| @@ -154,6 +155,7 @@ CONFIG_SYSVIPC=y | |||
| 154 | CONFIG_SYSCTL=y | 155 | CONFIG_SYSCTL=y |
| 155 | # CONFIG_AUDIT is not set | 156 | # CONFIG_AUDIT is not set |
| 156 | # CONFIG_IKCONFIG is not set | 157 | # CONFIG_IKCONFIG is not set |
| 158 | CONFIG_RELAY=y | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | 159 | CONFIG_INITRAMFS_SOURCE="" |
| 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 160 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 159 | CONFIG_EMBEDDED=y | 161 | CONFIG_EMBEDDED=y |
| @@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 169 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 170 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 171 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 172 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 173 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 174 | CONFIG_BASE_SMALL=0 |
| @@ -183,7 +181,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 183 | CONFIG_MODULES=y | 181 | CONFIG_MODULES=y |
| 184 | CONFIG_MODULE_UNLOAD=y | 182 | CONFIG_MODULE_UNLOAD=y |
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | 184 | CONFIG_MODVERSIONS=y |
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | 185 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 189 | CONFIG_KMOD=y | 186 | CONFIG_KMOD=y |
| @@ -192,6 +189,8 @@ CONFIG_KMOD=y | |||
| 192 | # Block layer | 189 | # Block layer |
| 193 | # | 190 | # |
| 194 | # CONFIG_LBD is not set | 191 | # CONFIG_LBD is not set |
| 192 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 193 | # CONFIG_LSF is not set | ||
| 195 | 194 | ||
| 196 | # | 195 | # |
| 197 | # IO Schedulers | 196 | # IO Schedulers |
| @@ -211,7 +210,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 211 | # | 210 | # |
| 212 | CONFIG_HW_HAS_PCI=y | 211 | CONFIG_HW_HAS_PCI=y |
| 213 | CONFIG_PCI=y | 212 | CONFIG_PCI=y |
| 214 | CONFIG_PCI_LEGACY_PROC=y | ||
| 215 | CONFIG_MMU=y | 213 | CONFIG_MMU=y |
| 216 | 214 | ||
| 217 | # | 215 | # |
| @@ -253,6 +251,7 @@ CONFIG_NET=y | |||
| 253 | # | 251 | # |
| 254 | # Networking options | 252 | # Networking options |
| 255 | # | 253 | # |
| 254 | # CONFIG_NETDEBUG is not set | ||
| 256 | CONFIG_PACKET=y | 255 | CONFIG_PACKET=y |
| 257 | # CONFIG_PACKET_MMAP is not set | 256 | # CONFIG_PACKET_MMAP is not set |
| 258 | CONFIG_UNIX=y | 257 | CONFIG_UNIX=y |
| @@ -275,7 +274,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 275 | # CONFIG_INET_AH is not set | 274 | # CONFIG_INET_AH is not set |
| 276 | # CONFIG_INET_ESP is not set | 275 | # CONFIG_INET_ESP is not set |
| 277 | # CONFIG_INET_IPCOMP is not set | 276 | # CONFIG_INET_IPCOMP is not set |
| 278 | CONFIG_INET_TUNNEL=m | 277 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 278 | # CONFIG_INET_TUNNEL is not set | ||
| 279 | CONFIG_INET_DIAG=y | 279 | CONFIG_INET_DIAG=y |
| 280 | CONFIG_INET_TCP_DIAG=y | 280 | CONFIG_INET_TCP_DIAG=y |
| 281 | # CONFIG_TCP_CONG_ADVANCED is not set | 281 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -286,6 +286,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # | 286 | # |
| 287 | # CONFIG_IP_VS is not set | 287 | # CONFIG_IP_VS is not set |
| 288 | # CONFIG_IPV6 is not set | 288 | # CONFIG_IPV6 is not set |
| 289 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 290 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | CONFIG_NETFILTER=y | 291 | CONFIG_NETFILTER=y |
| 290 | # CONFIG_NETFILTER_DEBUG is not set | 292 | # CONFIG_NETFILTER_DEBUG is not set |
| 291 | 293 | ||
| @@ -302,10 +304,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 302 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 304 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 305 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 306 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 308 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 309 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 310 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 308 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 311 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 312 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 313 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 309 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 314 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 315 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 311 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 316 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -329,6 +334,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 329 | # SCTP Configuration (EXPERIMENTAL) | 334 | # SCTP Configuration (EXPERIMENTAL) |
| 330 | # | 335 | # |
| 331 | # CONFIG_IP_SCTP is not set | 336 | # CONFIG_IP_SCTP is not set |
| 337 | |||
| 338 | # | ||
| 339 | # TIPC Configuration (EXPERIMENTAL) | ||
| 340 | # | ||
| 341 | # CONFIG_TIPC is not set | ||
| 332 | # CONFIG_ATM is not set | 342 | # CONFIG_ATM is not set |
| 333 | # CONFIG_BRIDGE is not set | 343 | # CONFIG_BRIDGE is not set |
| 334 | # CONFIG_VLAN_8021Q is not set | 344 | # CONFIG_VLAN_8021Q is not set |
| @@ -338,11 +348,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 338 | # CONFIG_ATALK is not set | 348 | # CONFIG_ATALK is not set |
| 339 | # CONFIG_X25 is not set | 349 | # CONFIG_X25 is not set |
| 340 | # CONFIG_LAPB is not set | 350 | # CONFIG_LAPB is not set |
| 341 | |||
| 342 | # | ||
| 343 | # TIPC Configuration (EXPERIMENTAL) | ||
| 344 | # | ||
| 345 | # CONFIG_TIPC is not set | ||
| 346 | # CONFIG_NET_DIVERT is not set | 351 | # CONFIG_NET_DIVERT is not set |
| 347 | # CONFIG_ECONET is not set | 352 | # CONFIG_ECONET is not set |
| 348 | # CONFIG_WAN_ROUTER is not set | 353 | # CONFIG_WAN_ROUTER is not set |
| @@ -364,6 +369,9 @@ CONFIG_IEEE80211=m | |||
| 364 | # CONFIG_IEEE80211_DEBUG is not set | 369 | # CONFIG_IEEE80211_DEBUG is not set |
| 365 | CONFIG_IEEE80211_CRYPT_WEP=m | 370 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 366 | CONFIG_IEEE80211_CRYPT_CCMP=m | 371 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 372 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 373 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 374 | CONFIG_WIRELESS_EXT=y | ||
| 367 | 375 | ||
| 368 | # | 376 | # |
| 369 | # Device Drivers | 377 | # Device Drivers |
| @@ -420,7 +428,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 420 | # CONFIG_MTD_CFI_I8 is not set | 428 | # CONFIG_MTD_CFI_I8 is not set |
| 421 | CONFIG_MTD_CFI_INTELEXT=y | 429 | CONFIG_MTD_CFI_INTELEXT=y |
| 422 | CONFIG_MTD_CFI_AMDSTD=y | 430 | CONFIG_MTD_CFI_AMDSTD=y |
| 423 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 424 | # CONFIG_MTD_CFI_STAA is not set | 431 | # CONFIG_MTD_CFI_STAA is not set |
| 425 | CONFIG_MTD_CFI_UTIL=y | 432 | CONFIG_MTD_CFI_UTIL=y |
| 426 | # CONFIG_MTD_RAM is not set | 433 | # CONFIG_MTD_RAM is not set |
| @@ -443,7 +450,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 443 | # CONFIG_MTD_SLRAM is not set | 450 | # CONFIG_MTD_SLRAM is not set |
| 444 | # CONFIG_MTD_PHRAM is not set | 451 | # CONFIG_MTD_PHRAM is not set |
| 445 | # CONFIG_MTD_MTDRAM is not set | 452 | # CONFIG_MTD_MTDRAM is not set |
| 446 | # CONFIG_MTD_BLKMTD is not set | ||
| 447 | # CONFIG_MTD_BLOCK2MTD is not set | 453 | # CONFIG_MTD_BLOCK2MTD is not set |
| 448 | 454 | ||
| 449 | # | 455 | # |
| @@ -486,7 +492,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 486 | # CONFIG_BLK_DEV_SX8 is not set | 492 | # CONFIG_BLK_DEV_SX8 is not set |
| 487 | # CONFIG_BLK_DEV_UB is not set | 493 | # CONFIG_BLK_DEV_UB is not set |
| 488 | # CONFIG_BLK_DEV_RAM is not set | 494 | # CONFIG_BLK_DEV_RAM is not set |
| 489 | CONFIG_BLK_DEV_RAM_COUNT=16 | 495 | # CONFIG_BLK_DEV_INITRD is not set |
| 490 | CONFIG_CDROM_PKTCDVD=m | 496 | CONFIG_CDROM_PKTCDVD=m |
| 491 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 497 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 492 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 498 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -714,6 +720,7 @@ CONFIG_SERIO_RAW=m | |||
| 714 | # | 720 | # |
| 715 | CONFIG_SERIAL_8250=y | 721 | CONFIG_SERIAL_8250=y |
| 716 | CONFIG_SERIAL_8250_CONSOLE=y | 722 | CONFIG_SERIAL_8250_CONSOLE=y |
| 723 | CONFIG_SERIAL_8250_PCI=y | ||
| 717 | # CONFIG_SERIAL_8250_CS is not set | 724 | # CONFIG_SERIAL_8250_CS is not set |
| 718 | CONFIG_SERIAL_8250_NR_UARTS=4 | 725 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 719 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 726 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| @@ -725,6 +732,7 @@ CONFIG_SERIAL_8250_AU1X00=y | |||
| 725 | # | 732 | # |
| 726 | CONFIG_SERIAL_CORE=y | 733 | CONFIG_SERIAL_CORE=y |
| 727 | CONFIG_SERIAL_CORE_CONSOLE=y | 734 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 735 | # CONFIG_SERIAL_JSM is not set | ||
| 728 | CONFIG_UNIX98_PTYS=y | 736 | CONFIG_UNIX98_PTYS=y |
| 729 | CONFIG_LEGACY_PTYS=y | 737 | CONFIG_LEGACY_PTYS=y |
| 730 | CONFIG_LEGACY_PTY_COUNT=256 | 738 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -790,10 +798,6 @@ CONFIG_SYNCLINK_CS=m | |||
| 790 | # | 798 | # |
| 791 | 799 | ||
| 792 | # | 800 | # |
| 793 | # Multimedia Capabilities Port drivers | ||
| 794 | # | ||
| 795 | |||
| 796 | # | ||
| 797 | # Multimedia devices | 801 | # Multimedia devices |
| 798 | # | 802 | # |
| 799 | # CONFIG_VIDEO_DEV is not set | 803 | # CONFIG_VIDEO_DEV is not set |
| @@ -802,6 +806,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 802 | # Digital Video Broadcasting Devices | 806 | # Digital Video Broadcasting Devices |
| 803 | # | 807 | # |
| 804 | # CONFIG_DVB is not set | 808 | # CONFIG_DVB is not set |
| 809 | # CONFIG_USB_DABUSB is not set | ||
| 805 | 810 | ||
| 806 | # | 811 | # |
| 807 | # Graphics support | 812 | # Graphics support |
| @@ -825,9 +830,11 @@ CONFIG_SND_SEQ_DUMMY=m | |||
| 825 | CONFIG_SND_OSSEMUL=y | 830 | CONFIG_SND_OSSEMUL=y |
| 826 | CONFIG_SND_MIXER_OSS=m | 831 | CONFIG_SND_MIXER_OSS=m |
| 827 | CONFIG_SND_PCM_OSS=m | 832 | CONFIG_SND_PCM_OSS=m |
| 833 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 828 | CONFIG_SND_SEQUENCER_OSS=y | 834 | CONFIG_SND_SEQUENCER_OSS=y |
| 829 | # CONFIG_SND_DYNAMIC_MINORS is not set | 835 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 830 | CONFIG_SND_SUPPORT_OLD_API=y | 836 | CONFIG_SND_SUPPORT_OLD_API=y |
| 837 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 831 | # CONFIG_SND_VERBOSE_PRINTK is not set | 838 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 832 | # CONFIG_SND_DEBUG is not set | 839 | # CONFIG_SND_DEBUG is not set |
| 833 | 840 | ||
| @@ -846,6 +853,7 @@ CONFIG_SND_MTPAV=m | |||
| 846 | # PCI devices | 853 | # PCI devices |
| 847 | # | 854 | # |
| 848 | # CONFIG_SND_AD1889 is not set | 855 | # CONFIG_SND_AD1889 is not set |
| 856 | # CONFIG_SND_ALS300 is not set | ||
| 849 | # CONFIG_SND_ALI5451 is not set | 857 | # CONFIG_SND_ALI5451 is not set |
| 850 | # CONFIG_SND_ATIIXP is not set | 858 | # CONFIG_SND_ATIIXP is not set |
| 851 | # CONFIG_SND_ATIIXP_MODEM is not set | 859 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -877,6 +885,7 @@ CONFIG_SND_MTPAV=m | |||
| 877 | # CONFIG_SND_MIXART is not set | 885 | # CONFIG_SND_MIXART is not set |
| 878 | # CONFIG_SND_NM256 is not set | 886 | # CONFIG_SND_NM256 is not set |
| 879 | # CONFIG_SND_PCXHR is not set | 887 | # CONFIG_SND_PCXHR is not set |
| 888 | # CONFIG_SND_RIPTIDE is not set | ||
| 880 | # CONFIG_SND_RME32 is not set | 889 | # CONFIG_SND_RME32 is not set |
| 881 | # CONFIG_SND_RME96 is not set | 890 | # CONFIG_SND_RME96 is not set |
| 882 | # CONFIG_SND_RME9652 is not set | 891 | # CONFIG_SND_RME9652 is not set |
| @@ -905,34 +914,22 @@ CONFIG_SND_AU1X00=m | |||
| 905 | # Open Sound System | 914 | # Open Sound System |
| 906 | # | 915 | # |
| 907 | CONFIG_SOUND_PRIME=y | 916 | CONFIG_SOUND_PRIME=y |
| 908 | CONFIG_OBSOLETE_OSS_DRIVER=y | ||
| 909 | # CONFIG_SOUND_BT878 is not set | 917 | # CONFIG_SOUND_BT878 is not set |
| 910 | # CONFIG_SOUND_CMPCI is not set | ||
| 911 | # CONFIG_SOUND_EMU10K1 is not set | 918 | # CONFIG_SOUND_EMU10K1 is not set |
| 912 | # CONFIG_SOUND_FUSION is not set | 919 | # CONFIG_SOUND_FUSION is not set |
| 913 | # CONFIG_SOUND_CS4281 is not set | ||
| 914 | # CONFIG_SOUND_ES1370 is not set | ||
| 915 | # CONFIG_SOUND_ES1371 is not set | 920 | # CONFIG_SOUND_ES1371 is not set |
| 916 | # CONFIG_SOUND_ESSSOLO1 is not set | ||
| 917 | # CONFIG_SOUND_MAESTRO is not set | ||
| 918 | # CONFIG_SOUND_MAESTRO3 is not set | ||
| 919 | # CONFIG_SOUND_ICH is not set | 921 | # CONFIG_SOUND_ICH is not set |
| 920 | # CONFIG_SOUND_SONICVIBES is not set | ||
| 921 | # CONFIG_SOUND_AU1000 is not set | ||
| 922 | # CONFIG_SOUND_TRIDENT is not set | 922 | # CONFIG_SOUND_TRIDENT is not set |
| 923 | # CONFIG_SOUND_MSNDCLAS is not set | 923 | # CONFIG_SOUND_MSNDCLAS is not set |
| 924 | # CONFIG_SOUND_MSNDPIN is not set | 924 | # CONFIG_SOUND_MSNDPIN is not set |
| 925 | # CONFIG_SOUND_VIA82CXXX is not set | 925 | # CONFIG_SOUND_VIA82CXXX is not set |
| 926 | # CONFIG_SOUND_ALI5455 is not set | ||
| 927 | # CONFIG_SOUND_FORTE is not set | ||
| 928 | # CONFIG_SOUND_RME96XX is not set | ||
| 929 | # CONFIG_SOUND_AD1980 is not set | ||
| 930 | 926 | ||
| 931 | # | 927 | # |
| 932 | # USB support | 928 | # USB support |
| 933 | # | 929 | # |
| 934 | CONFIG_USB_ARCH_HAS_HCD=y | 930 | CONFIG_USB_ARCH_HAS_HCD=y |
| 935 | CONFIG_USB_ARCH_HAS_OHCI=y | 931 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 932 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 936 | CONFIG_USB=y | 933 | CONFIG_USB=y |
| 937 | # CONFIG_USB_DEBUG is not set | 934 | # CONFIG_USB_DEBUG is not set |
| 938 | 935 | ||
| @@ -958,7 +955,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 958 | # | 955 | # |
| 959 | # USB Device Class drivers | 956 | # USB Device Class drivers |
| 960 | # | 957 | # |
| 961 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | ||
| 962 | # CONFIG_USB_ACM is not set | 958 | # CONFIG_USB_ACM is not set |
| 963 | # CONFIG_USB_PRINTER is not set | 959 | # CONFIG_USB_PRINTER is not set |
| 964 | 960 | ||
| @@ -985,9 +981,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 985 | # CONFIG_USB_ACECAD is not set | 981 | # CONFIG_USB_ACECAD is not set |
| 986 | # CONFIG_USB_KBTAB is not set | 982 | # CONFIG_USB_KBTAB is not set |
| 987 | # CONFIG_USB_POWERMATE is not set | 983 | # CONFIG_USB_POWERMATE is not set |
| 988 | # CONFIG_USB_MTOUCH is not set | 984 | # CONFIG_USB_TOUCHSCREEN is not set |
| 989 | # CONFIG_USB_ITMTOUCH is not set | ||
| 990 | # CONFIG_USB_EGALAX is not set | ||
| 991 | CONFIG_USB_YEALINK=m | 985 | CONFIG_USB_YEALINK=m |
| 992 | # CONFIG_USB_XPAD is not set | 986 | # CONFIG_USB_XPAD is not set |
| 993 | # CONFIG_USB_ATI_REMOTE is not set | 987 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -1001,15 +995,6 @@ CONFIG_USB_YEALINK=m | |||
| 1001 | # CONFIG_USB_MDC800 is not set | 995 | # CONFIG_USB_MDC800 is not set |
| 1002 | 996 | ||
| 1003 | # | 997 | # |
| 1004 | # USB Multimedia devices | ||
| 1005 | # | ||
| 1006 | # CONFIG_USB_DABUSB is not set | ||
| 1007 | |||
| 1008 | # | ||
| 1009 | # Video4Linux support is needed for USB Multimedia device support | ||
| 1010 | # | ||
| 1011 | |||
| 1012 | # | ||
| 1013 | # USB Network Adapters | 998 | # USB Network Adapters |
| 1014 | # | 999 | # |
| 1015 | # CONFIG_USB_CATC is not set | 1000 | # CONFIG_USB_CATC is not set |
| @@ -1059,13 +1044,31 @@ CONFIG_USB_LD=m | |||
| 1059 | # CONFIG_MMC is not set | 1044 | # CONFIG_MMC is not set |
| 1060 | 1045 | ||
| 1061 | # | 1046 | # |
| 1047 | # LED devices | ||
| 1048 | # | ||
| 1049 | # CONFIG_NEW_LEDS is not set | ||
| 1050 | |||
| 1051 | # | ||
| 1052 | # LED drivers | ||
| 1053 | # | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # LED Triggers | ||
| 1057 | # | ||
| 1058 | |||
| 1059 | # | ||
| 1062 | # InfiniBand support | 1060 | # InfiniBand support |
| 1063 | # | 1061 | # |
| 1064 | # CONFIG_INFINIBAND is not set | 1062 | # CONFIG_INFINIBAND is not set |
| 1065 | 1063 | ||
| 1066 | # | 1064 | # |
| 1067 | # SN Devices | 1065 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1066 | # | ||
| 1067 | |||
| 1068 | # | ||
| 1069 | # Real Time Clock | ||
| 1068 | # | 1070 | # |
| 1071 | # CONFIG_RTC_CLASS is not set | ||
| 1069 | 1072 | ||
| 1070 | # | 1073 | # |
| 1071 | # File systems | 1074 | # File systems |
| @@ -1123,7 +1126,6 @@ CONFIG_SYSFS=y | |||
| 1123 | CONFIG_TMPFS=y | 1126 | CONFIG_TMPFS=y |
| 1124 | # CONFIG_HUGETLB_PAGE is not set | 1127 | # CONFIG_HUGETLB_PAGE is not set |
| 1125 | CONFIG_RAMFS=y | 1128 | CONFIG_RAMFS=y |
| 1126 | CONFIG_RELAYFS_FS=m | ||
| 1127 | # CONFIG_CONFIGFS_FS is not set | 1129 | # CONFIG_CONFIGFS_FS is not set |
| 1128 | 1130 | ||
| 1129 | # | 1131 | # |
| @@ -1232,6 +1234,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1232 | # CONFIG_MAGIC_SYSRQ is not set | 1234 | # CONFIG_MAGIC_SYSRQ is not set |
| 1233 | # CONFIG_DEBUG_KERNEL is not set | 1235 | # CONFIG_DEBUG_KERNEL is not set |
| 1234 | CONFIG_LOG_BUF_SHIFT=14 | 1236 | CONFIG_LOG_BUF_SHIFT=14 |
| 1237 | # CONFIG_DEBUG_FS is not set | ||
| 1235 | CONFIG_CROSSCOMPILE=y | 1238 | CONFIG_CROSSCOMPILE=y |
| 1236 | CONFIG_CMDLINE="" | 1239 | CONFIG_CMDLINE="" |
| 1237 | 1240 | ||
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 8dc1f18badfe..8130e23dc255 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:00 2006 | 4 | # Mon Apr 24 14:51:00 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_DB1550=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -115,11 +117,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 115 | CONFIG_CPU_HAS_PREFETCH=y | 117 | CONFIG_CPU_HAS_PREFETCH=y |
| 116 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 117 | CONFIG_64BIT_PHYS_ADDR=y | 119 | CONFIG_64BIT_PHYS_ADDR=y |
| 118 | # CONFIG_CPU_ADVANCED is not set | ||
| 119 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
| 120 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
| 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 123 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_SELECT_MEMORY_MODEL=y | 126 | CONFIG_SELECT_MEMORY_MODEL=y |
| 125 | CONFIG_FLATMEM_MANUAL=y | 127 | CONFIG_FLATMEM_MANUAL=y |
| @@ -137,7 +139,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 139 | # Code maturity level options |
| 138 | # | 140 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 141 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 142 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 144 | ||
| @@ -153,6 +154,7 @@ CONFIG_SYSVIPC=y | |||
| 153 | CONFIG_SYSCTL=y | 154 | CONFIG_SYSCTL=y |
| 154 | # CONFIG_AUDIT is not set | 155 | # CONFIG_AUDIT is not set |
| 155 | # CONFIG_IKCONFIG is not set | 156 | # CONFIG_IKCONFIG is not set |
| 157 | CONFIG_RELAY=y | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 166 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 167 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 168 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 174 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 175 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 182 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 183 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 188 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -191,6 +188,8 @@ CONFIG_KMOD=y | |||
| 191 | # Block layer | 188 | # Block layer |
| 192 | # | 189 | # |
| 193 | # CONFIG_LBD is not set | 190 | # CONFIG_LBD is not set |
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 194 | 193 | ||
| 195 | # | 194 | # |
| 196 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -210,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 210 | # | 209 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| 212 | CONFIG_PCI=y | 211 | CONFIG_PCI=y |
| 213 | CONFIG_PCI_LEGACY_PROC=y | ||
| 214 | CONFIG_MMU=y | 212 | CONFIG_MMU=y |
| 215 | 213 | ||
| 216 | # | 214 | # |
| @@ -252,6 +250,7 @@ CONFIG_NET=y | |||
| 252 | # | 250 | # |
| 253 | # Networking options | 251 | # Networking options |
| 254 | # | 252 | # |
| 253 | # CONFIG_NETDEBUG is not set | ||
| 255 | CONFIG_PACKET=y | 254 | CONFIG_PACKET=y |
| 256 | # CONFIG_PACKET_MMAP is not set | 255 | # CONFIG_PACKET_MMAP is not set |
| 257 | CONFIG_UNIX=y | 256 | CONFIG_UNIX=y |
| @@ -274,7 +273,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 274 | # CONFIG_INET_AH is not set | 273 | # CONFIG_INET_AH is not set |
| 275 | # CONFIG_INET_ESP is not set | 274 | # CONFIG_INET_ESP is not set |
| 276 | # CONFIG_INET_IPCOMP is not set | 275 | # CONFIG_INET_IPCOMP is not set |
| 277 | CONFIG_INET_TUNNEL=m | 276 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 277 | # CONFIG_INET_TUNNEL is not set | ||
| 278 | CONFIG_INET_DIAG=y | 278 | CONFIG_INET_DIAG=y |
| 279 | CONFIG_INET_TCP_DIAG=y | 279 | CONFIG_INET_TCP_DIAG=y |
| 280 | # CONFIG_TCP_CONG_ADVANCED is not set | 280 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -285,6 +285,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 285 | # | 285 | # |
| 286 | # CONFIG_IP_VS is not set | 286 | # CONFIG_IP_VS is not set |
| 287 | # CONFIG_IPV6 is not set | 287 | # CONFIG_IPV6 is not set |
| 288 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 289 | # CONFIG_INET6_TUNNEL is not set | ||
| 288 | CONFIG_NETFILTER=y | 290 | CONFIG_NETFILTER=y |
| 289 | # CONFIG_NETFILTER_DEBUG is not set | 291 | # CONFIG_NETFILTER_DEBUG is not set |
| 290 | 292 | ||
| @@ -301,10 +303,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 301 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 303 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 304 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 305 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 304 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 307 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 308 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 309 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 310 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 311 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 312 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 308 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 313 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 309 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 314 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 315 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -328,6 +333,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 328 | # SCTP Configuration (EXPERIMENTAL) | 333 | # SCTP Configuration (EXPERIMENTAL) |
| 329 | # | 334 | # |
| 330 | # CONFIG_IP_SCTP is not set | 335 | # CONFIG_IP_SCTP is not set |
| 336 | |||
| 337 | # | ||
| 338 | # TIPC Configuration (EXPERIMENTAL) | ||
| 339 | # | ||
| 340 | # CONFIG_TIPC is not set | ||
| 331 | # CONFIG_ATM is not set | 341 | # CONFIG_ATM is not set |
| 332 | # CONFIG_BRIDGE is not set | 342 | # CONFIG_BRIDGE is not set |
| 333 | # CONFIG_VLAN_8021Q is not set | 343 | # CONFIG_VLAN_8021Q is not set |
| @@ -337,11 +347,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 337 | # CONFIG_ATALK is not set | 347 | # CONFIG_ATALK is not set |
| 338 | # CONFIG_X25 is not set | 348 | # CONFIG_X25 is not set |
| 339 | # CONFIG_LAPB is not set | 349 | # CONFIG_LAPB is not set |
| 340 | |||
| 341 | # | ||
| 342 | # TIPC Configuration (EXPERIMENTAL) | ||
| 343 | # | ||
| 344 | # CONFIG_TIPC is not set | ||
| 345 | # CONFIG_NET_DIVERT is not set | 350 | # CONFIG_NET_DIVERT is not set |
| 346 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
| 347 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
| @@ -363,6 +368,9 @@ CONFIG_IEEE80211=m | |||
| 363 | # CONFIG_IEEE80211_DEBUG is not set | 368 | # CONFIG_IEEE80211_DEBUG is not set |
| 364 | CONFIG_IEEE80211_CRYPT_WEP=m | 369 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 365 | CONFIG_IEEE80211_CRYPT_CCMP=m | 370 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 371 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 372 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 373 | CONFIG_WIRELESS_EXT=y | ||
| 366 | 374 | ||
| 367 | # | 375 | # |
| 368 | # Device Drivers | 376 | # Device Drivers |
| @@ -419,7 +427,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 419 | # CONFIG_MTD_CFI_I8 is not set | 427 | # CONFIG_MTD_CFI_I8 is not set |
| 420 | # CONFIG_MTD_CFI_INTELEXT is not set | 428 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 421 | CONFIG_MTD_CFI_AMDSTD=y | 429 | CONFIG_MTD_CFI_AMDSTD=y |
| 422 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 423 | # CONFIG_MTD_CFI_STAA is not set | 430 | # CONFIG_MTD_CFI_STAA is not set |
| 424 | CONFIG_MTD_CFI_UTIL=y | 431 | CONFIG_MTD_CFI_UTIL=y |
| 425 | # CONFIG_MTD_RAM is not set | 432 | # CONFIG_MTD_RAM is not set |
| @@ -442,7 +449,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 442 | # CONFIG_MTD_SLRAM is not set | 449 | # CONFIG_MTD_SLRAM is not set |
| 443 | # CONFIG_MTD_PHRAM is not set | 450 | # CONFIG_MTD_PHRAM is not set |
| 444 | # CONFIG_MTD_MTDRAM is not set | 451 | # CONFIG_MTD_MTDRAM is not set |
| 445 | # CONFIG_MTD_BLKMTD is not set | ||
| 446 | # CONFIG_MTD_BLOCK2MTD is not set | 452 | # CONFIG_MTD_BLOCK2MTD is not set |
| 447 | 453 | ||
| 448 | # | 454 | # |
| @@ -489,7 +495,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 489 | # CONFIG_BLK_DEV_NBD is not set | 495 | # CONFIG_BLK_DEV_NBD is not set |
| 490 | # CONFIG_BLK_DEV_SX8 is not set | 496 | # CONFIG_BLK_DEV_SX8 is not set |
| 491 | # CONFIG_BLK_DEV_RAM is not set | 497 | # CONFIG_BLK_DEV_RAM is not set |
| 492 | CONFIG_BLK_DEV_RAM_COUNT=16 | 498 | # CONFIG_BLK_DEV_INITRD is not set |
| 493 | CONFIG_CDROM_PKTCDVD=m | 499 | CONFIG_CDROM_PKTCDVD=m |
| 494 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 500 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 495 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 501 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -754,6 +760,7 @@ CONFIG_SERIO_RAW=m | |||
| 754 | # | 760 | # |
| 755 | CONFIG_SERIAL_8250=y | 761 | CONFIG_SERIAL_8250=y |
| 756 | CONFIG_SERIAL_8250_CONSOLE=y | 762 | CONFIG_SERIAL_8250_CONSOLE=y |
| 763 | CONFIG_SERIAL_8250_PCI=y | ||
| 757 | # CONFIG_SERIAL_8250_CS is not set | 764 | # CONFIG_SERIAL_8250_CS is not set |
| 758 | CONFIG_SERIAL_8250_NR_UARTS=4 | 765 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 759 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 766 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| @@ -765,6 +772,7 @@ CONFIG_SERIAL_8250_AU1X00=y | |||
| 765 | # | 772 | # |
| 766 | CONFIG_SERIAL_CORE=y | 773 | CONFIG_SERIAL_CORE=y |
| 767 | CONFIG_SERIAL_CORE_CONSOLE=y | 774 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 775 | # CONFIG_SERIAL_JSM is not set | ||
| 768 | CONFIG_UNIX98_PTYS=y | 776 | CONFIG_UNIX98_PTYS=y |
| 769 | CONFIG_LEGACY_PTYS=y | 777 | CONFIG_LEGACY_PTYS=y |
| 770 | CONFIG_LEGACY_PTY_COUNT=256 | 778 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -830,10 +838,6 @@ CONFIG_SYNCLINK_CS=m | |||
| 830 | # | 838 | # |
| 831 | 839 | ||
| 832 | # | 840 | # |
| 833 | # Multimedia Capabilities Port drivers | ||
| 834 | # | ||
| 835 | |||
| 836 | # | ||
| 837 | # Multimedia devices | 841 | # Multimedia devices |
| 838 | # | 842 | # |
| 839 | # CONFIG_VIDEO_DEV is not set | 843 | # CONFIG_VIDEO_DEV is not set |
| @@ -858,6 +862,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 858 | # | 862 | # |
| 859 | CONFIG_USB_ARCH_HAS_HCD=y | 863 | CONFIG_USB_ARCH_HAS_HCD=y |
| 860 | CONFIG_USB_ARCH_HAS_OHCI=y | 864 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 865 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 861 | # CONFIG_USB is not set | 866 | # CONFIG_USB is not set |
| 862 | 867 | ||
| 863 | # | 868 | # |
| @@ -875,13 +880,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 875 | # CONFIG_MMC is not set | 880 | # CONFIG_MMC is not set |
| 876 | 881 | ||
| 877 | # | 882 | # |
| 883 | # LED devices | ||
| 884 | # | ||
| 885 | # CONFIG_NEW_LEDS is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # LED drivers | ||
| 889 | # | ||
| 890 | |||
| 891 | # | ||
| 892 | # LED Triggers | ||
| 893 | # | ||
| 894 | |||
| 895 | # | ||
| 878 | # InfiniBand support | 896 | # InfiniBand support |
| 879 | # | 897 | # |
| 880 | # CONFIG_INFINIBAND is not set | 898 | # CONFIG_INFINIBAND is not set |
| 881 | 899 | ||
| 882 | # | 900 | # |
| 883 | # SN Devices | 901 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 902 | # | ||
| 903 | |||
| 904 | # | ||
| 905 | # Real Time Clock | ||
| 884 | # | 906 | # |
| 907 | # CONFIG_RTC_CLASS is not set | ||
| 885 | 908 | ||
| 886 | # | 909 | # |
| 887 | # File systems | 910 | # File systems |
| @@ -939,7 +962,6 @@ CONFIG_SYSFS=y | |||
| 939 | CONFIG_TMPFS=y | 962 | CONFIG_TMPFS=y |
| 940 | # CONFIG_HUGETLB_PAGE is not set | 963 | # CONFIG_HUGETLB_PAGE is not set |
| 941 | CONFIG_RAMFS=y | 964 | CONFIG_RAMFS=y |
| 942 | CONFIG_RELAYFS_FS=m | ||
| 943 | # CONFIG_CONFIGFS_FS is not set | 965 | # CONFIG_CONFIGFS_FS is not set |
| 944 | 966 | ||
| 945 | # | 967 | # |
| @@ -1048,6 +1070,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1048 | # CONFIG_MAGIC_SYSRQ is not set | 1070 | # CONFIG_MAGIC_SYSRQ is not set |
| 1049 | # CONFIG_DEBUG_KERNEL is not set | 1071 | # CONFIG_DEBUG_KERNEL is not set |
| 1050 | CONFIG_LOG_BUF_SHIFT=14 | 1072 | CONFIG_LOG_BUF_SHIFT=14 |
| 1073 | # CONFIG_DEBUG_FS is not set | ||
| 1051 | CONFIG_CROSSCOMPILE=y | 1074 | CONFIG_CROSSCOMPILE=y |
| 1052 | CONFIG_CMDLINE="" | 1075 | CONFIG_CMDLINE="" |
| 1053 | 1076 | ||
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 8fae63e47e5e..8d88ac1bbfeb 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:02 2006 | 4 | # Mon Apr 24 14:51:00 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_DDB5476=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | # CONFIG_PAGE_SIZE_16KB is not set | 116 | # CONFIG_PAGE_SIZE_16KB is not set |
| 115 | # CONFIG_PAGE_SIZE_64KB is not set | 117 | # CONFIG_PAGE_SIZE_64KB is not set |
| 116 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 117 | # CONFIG_CPU_ADVANCED is not set | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -136,7 +137,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 136 | # Code maturity level options | 137 | # Code maturity level options |
| 137 | # | 138 | # |
| 138 | CONFIG_EXPERIMENTAL=y | 139 | CONFIG_EXPERIMENTAL=y |
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | 140 | CONFIG_BROKEN_ON_SMP=y |
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 142 | 142 | ||
| @@ -152,6 +152,7 @@ CONFIG_SYSVIPC=y | |||
| 152 | CONFIG_SYSCTL=y | 152 | CONFIG_SYSCTL=y |
| 153 | # CONFIG_AUDIT is not set | 153 | # CONFIG_AUDIT is not set |
| 154 | # CONFIG_IKCONFIG is not set | 154 | # CONFIG_IKCONFIG is not set |
| 155 | CONFIG_RELAY=y | ||
| 155 | CONFIG_INITRAMFS_SOURCE="" | 156 | CONFIG_INITRAMFS_SOURCE="" |
| 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 157 | CONFIG_EMBEDDED=y | 158 | CONFIG_EMBEDDED=y |
| @@ -165,10 +166,6 @@ CONFIG_BASE_FULL=y | |||
| 165 | CONFIG_FUTEX=y | 166 | CONFIG_FUTEX=y |
| 166 | CONFIG_EPOLL=y | 167 | CONFIG_EPOLL=y |
| 167 | CONFIG_SHMEM=y | 168 | CONFIG_SHMEM=y |
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | CONFIG_SLAB=y | 169 | CONFIG_SLAB=y |
| 173 | # CONFIG_TINY_SHMEM is not set | 170 | # CONFIG_TINY_SHMEM is not set |
| 174 | CONFIG_BASE_SMALL=0 | 171 | CONFIG_BASE_SMALL=0 |
| @@ -183,6 +180,8 @@ CONFIG_BASE_SMALL=0 | |||
| 183 | # Block layer | 180 | # Block layer |
| 184 | # | 181 | # |
| 185 | # CONFIG_LBD is not set | 182 | # CONFIG_LBD is not set |
| 183 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 184 | # CONFIG_LSF is not set | ||
| 186 | 185 | ||
| 187 | # | 186 | # |
| 188 | # IO Schedulers | 187 | # IO Schedulers |
| @@ -202,7 +201,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 202 | # | 201 | # |
| 203 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| 204 | CONFIG_PCI=y | 203 | CONFIG_PCI=y |
| 205 | CONFIG_PCI_LEGACY_PROC=y | ||
| 206 | CONFIG_ISA=y | 204 | CONFIG_ISA=y |
| 207 | CONFIG_MMU=y | 205 | CONFIG_MMU=y |
| 208 | 206 | ||
| @@ -231,6 +229,7 @@ CONFIG_NET=y | |||
| 231 | # | 229 | # |
| 232 | # Networking options | 230 | # Networking options |
| 233 | # | 231 | # |
| 232 | # CONFIG_NETDEBUG is not set | ||
| 234 | CONFIG_PACKET=y | 233 | CONFIG_PACKET=y |
| 235 | # CONFIG_PACKET_MMAP is not set | 234 | # CONFIG_PACKET_MMAP is not set |
| 236 | CONFIG_UNIX=y | 235 | CONFIG_UNIX=y |
| @@ -252,12 +251,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 252 | # CONFIG_INET_AH is not set | 251 | # CONFIG_INET_AH is not set |
| 253 | # CONFIG_INET_ESP is not set | 252 | # CONFIG_INET_ESP is not set |
| 254 | # CONFIG_INET_IPCOMP is not set | 253 | # CONFIG_INET_IPCOMP is not set |
| 255 | CONFIG_INET_TUNNEL=y | 254 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 255 | # CONFIG_INET_TUNNEL is not set | ||
| 256 | CONFIG_INET_DIAG=y | 256 | CONFIG_INET_DIAG=y |
| 257 | CONFIG_INET_TCP_DIAG=y | 257 | CONFIG_INET_TCP_DIAG=y |
| 258 | # CONFIG_TCP_CONG_ADVANCED is not set | 258 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 259 | CONFIG_TCP_CONG_BIC=y | 259 | CONFIG_TCP_CONG_BIC=y |
| 260 | # CONFIG_IPV6 is not set | 260 | # CONFIG_IPV6 is not set |
| 261 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 262 | # CONFIG_INET6_TUNNEL is not set | ||
| 261 | # CONFIG_NETFILTER is not set | 263 | # CONFIG_NETFILTER is not set |
| 262 | 264 | ||
| 263 | # | 265 | # |
| @@ -269,6 +271,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 269 | # SCTP Configuration (EXPERIMENTAL) | 271 | # SCTP Configuration (EXPERIMENTAL) |
| 270 | # | 272 | # |
| 271 | # CONFIG_IP_SCTP is not set | 273 | # CONFIG_IP_SCTP is not set |
| 274 | |||
| 275 | # | ||
| 276 | # TIPC Configuration (EXPERIMENTAL) | ||
| 277 | # | ||
| 278 | # CONFIG_TIPC is not set | ||
| 272 | # CONFIG_ATM is not set | 279 | # CONFIG_ATM is not set |
| 273 | # CONFIG_BRIDGE is not set | 280 | # CONFIG_BRIDGE is not set |
| 274 | # CONFIG_VLAN_8021Q is not set | 281 | # CONFIG_VLAN_8021Q is not set |
| @@ -278,11 +285,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 278 | # CONFIG_ATALK is not set | 285 | # CONFIG_ATALK is not set |
| 279 | # CONFIG_X25 is not set | 286 | # CONFIG_X25 is not set |
| 280 | # CONFIG_LAPB is not set | 287 | # CONFIG_LAPB is not set |
| 281 | |||
| 282 | # | ||
| 283 | # TIPC Configuration (EXPERIMENTAL) | ||
| 284 | # | ||
| 285 | # CONFIG_TIPC is not set | ||
| 286 | # CONFIG_NET_DIVERT is not set | 288 | # CONFIG_NET_DIVERT is not set |
| 287 | # CONFIG_ECONET is not set | 289 | # CONFIG_ECONET is not set |
| 288 | # CONFIG_WAN_ROUTER is not set | 290 | # CONFIG_WAN_ROUTER is not set |
| @@ -303,6 +305,9 @@ CONFIG_IEEE80211=y | |||
| 303 | # CONFIG_IEEE80211_DEBUG is not set | 305 | # CONFIG_IEEE80211_DEBUG is not set |
| 304 | CONFIG_IEEE80211_CRYPT_WEP=y | 306 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 305 | CONFIG_IEEE80211_CRYPT_CCMP=y | 307 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 308 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 309 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 310 | CONFIG_WIRELESS_EXT=y | ||
| 306 | 311 | ||
| 307 | # | 312 | # |
| 308 | # Device Drivers | 313 | # Device Drivers |
| @@ -348,7 +353,7 @@ CONFIG_PROC_EVENTS=y | |||
| 348 | # CONFIG_BLK_DEV_NBD is not set | 353 | # CONFIG_BLK_DEV_NBD is not set |
| 349 | # CONFIG_BLK_DEV_SX8 is not set | 354 | # CONFIG_BLK_DEV_SX8 is not set |
| 350 | # CONFIG_BLK_DEV_RAM is not set | 355 | # CONFIG_BLK_DEV_RAM is not set |
| 351 | CONFIG_BLK_DEV_RAM_COUNT=16 | 356 | # CONFIG_BLK_DEV_INITRD is not set |
| 352 | CONFIG_CDROM_PKTCDVD=y | 357 | CONFIG_CDROM_PKTCDVD=y |
| 353 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 358 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 354 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 359 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -571,6 +576,7 @@ CONFIG_HW_CONSOLE=y | |||
| 571 | # | 576 | # |
| 572 | CONFIG_SERIAL_8250=y | 577 | CONFIG_SERIAL_8250=y |
| 573 | CONFIG_SERIAL_8250_CONSOLE=y | 578 | CONFIG_SERIAL_8250_CONSOLE=y |
| 579 | CONFIG_SERIAL_8250_PCI=y | ||
| 574 | CONFIG_SERIAL_8250_NR_UARTS=4 | 580 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 575 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 581 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 576 | # CONFIG_SERIAL_8250_EXTENDED is not set | 582 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -580,6 +586,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 580 | # | 586 | # |
| 581 | CONFIG_SERIAL_CORE=y | 587 | CONFIG_SERIAL_CORE=y |
| 582 | CONFIG_SERIAL_CORE_CONSOLE=y | 588 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 589 | # CONFIG_SERIAL_JSM is not set | ||
| 583 | CONFIG_UNIX98_PTYS=y | 590 | CONFIG_UNIX98_PTYS=y |
| 584 | CONFIG_LEGACY_PTYS=y | 591 | CONFIG_LEGACY_PTYS=y |
| 585 | CONFIG_LEGACY_PTY_COUNT=256 | 592 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -638,10 +645,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 638 | # | 645 | # |
| 639 | 646 | ||
| 640 | # | 647 | # |
| 641 | # Multimedia Capabilities Port drivers | ||
| 642 | # | ||
| 643 | |||
| 644 | # | ||
| 645 | # Multimedia devices | 648 | # Multimedia devices |
| 646 | # | 649 | # |
| 647 | # CONFIG_VIDEO_DEV is not set | 650 | # CONFIG_VIDEO_DEV is not set |
| @@ -659,6 +662,7 @@ CONFIG_FB=y | |||
| 659 | # CONFIG_FB_CFB_COPYAREA is not set | 662 | # CONFIG_FB_CFB_COPYAREA is not set |
| 660 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 663 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| 661 | # CONFIG_FB_MACMODES is not set | 664 | # CONFIG_FB_MACMODES is not set |
| 665 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 662 | # CONFIG_FB_MODE_HELPERS is not set | 666 | # CONFIG_FB_MODE_HELPERS is not set |
| 663 | # CONFIG_FB_TILEBLITTING is not set | 667 | # CONFIG_FB_TILEBLITTING is not set |
| 664 | # CONFIG_FB_CIRRUS is not set | 668 | # CONFIG_FB_CIRRUS is not set |
| @@ -670,7 +674,6 @@ CONFIG_FB=y | |||
| 670 | # CONFIG_FB_NVIDIA is not set | 674 | # CONFIG_FB_NVIDIA is not set |
| 671 | # CONFIG_FB_RIVA is not set | 675 | # CONFIG_FB_RIVA is not set |
| 672 | # CONFIG_FB_MATROX is not set | 676 | # CONFIG_FB_MATROX is not set |
| 673 | # CONFIG_FB_RADEON_OLD is not set | ||
| 674 | # CONFIG_FB_RADEON is not set | 677 | # CONFIG_FB_RADEON is not set |
| 675 | # CONFIG_FB_ATY128 is not set | 678 | # CONFIG_FB_ATY128 is not set |
| 676 | # CONFIG_FB_ATY is not set | 679 | # CONFIG_FB_ATY is not set |
| @@ -708,6 +711,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 708 | # | 711 | # |
| 709 | CONFIG_USB_ARCH_HAS_HCD=y | 712 | CONFIG_USB_ARCH_HAS_HCD=y |
| 710 | CONFIG_USB_ARCH_HAS_OHCI=y | 713 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 714 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 711 | # CONFIG_USB is not set | 715 | # CONFIG_USB is not set |
| 712 | 716 | ||
| 713 | # | 717 | # |
| @@ -725,13 +729,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 725 | # CONFIG_MMC is not set | 729 | # CONFIG_MMC is not set |
| 726 | 730 | ||
| 727 | # | 731 | # |
| 732 | # LED devices | ||
| 733 | # | ||
| 734 | # CONFIG_NEW_LEDS is not set | ||
| 735 | |||
| 736 | # | ||
| 737 | # LED drivers | ||
| 738 | # | ||
| 739 | |||
| 740 | # | ||
| 741 | # LED Triggers | ||
| 742 | # | ||
| 743 | |||
| 744 | # | ||
| 728 | # InfiniBand support | 745 | # InfiniBand support |
| 729 | # | 746 | # |
| 730 | # CONFIG_INFINIBAND is not set | 747 | # CONFIG_INFINIBAND is not set |
| 731 | 748 | ||
| 732 | # | 749 | # |
| 733 | # SN Devices | 750 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 751 | # | ||
| 752 | |||
| 753 | # | ||
| 754 | # Real Time Clock | ||
| 734 | # | 755 | # |
| 756 | # CONFIG_RTC_CLASS is not set | ||
| 735 | 757 | ||
| 736 | # | 758 | # |
| 737 | # File systems | 759 | # File systems |
| @@ -776,7 +798,6 @@ CONFIG_SYSFS=y | |||
| 776 | # CONFIG_TMPFS is not set | 798 | # CONFIG_TMPFS is not set |
| 777 | # CONFIG_HUGETLB_PAGE is not set | 799 | # CONFIG_HUGETLB_PAGE is not set |
| 778 | CONFIG_RAMFS=y | 800 | CONFIG_RAMFS=y |
| 779 | CONFIG_RELAYFS_FS=y | ||
| 780 | # CONFIG_CONFIGFS_FS is not set | 801 | # CONFIG_CONFIGFS_FS is not set |
| 781 | 802 | ||
| 782 | # | 803 | # |
| @@ -840,6 +861,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 840 | # CONFIG_MAGIC_SYSRQ is not set | 861 | # CONFIG_MAGIC_SYSRQ is not set |
| 841 | # CONFIG_DEBUG_KERNEL is not set | 862 | # CONFIG_DEBUG_KERNEL is not set |
| 842 | CONFIG_LOG_BUF_SHIFT=14 | 863 | CONFIG_LOG_BUF_SHIFT=14 |
| 864 | # CONFIG_DEBUG_FS is not set | ||
| 865 | # CONFIG_UNWIND_INFO is not set | ||
| 843 | CONFIG_CROSSCOMPILE=y | 866 | CONFIG_CROSSCOMPILE=y |
| 844 | CONFIG_CMDLINE="ip=any" | 867 | CONFIG_CMDLINE="ip=any" |
| 845 | 868 | ||
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index a0fcd44e7709..8c911b671415 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:02 2006 | 4 | # Mon Apr 24 14:51:01 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -65,6 +65,8 @@ CONFIG_DDB5477=y | |||
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_DDB5477_BUS_FREQUENCY=0 | 66 | CONFIG_DDB5477_BUS_FREQUENCY=0 |
| 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| 70 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | # CONFIG_PAGE_SIZE_16KB is not set | 116 | # CONFIG_PAGE_SIZE_16KB is not set |
| 115 | # CONFIG_PAGE_SIZE_64KB is not set | 117 | # CONFIG_PAGE_SIZE_64KB is not set |
| 116 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 117 | # CONFIG_CPU_ADVANCED is not set | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -136,7 +137,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 136 | # Code maturity level options | 137 | # Code maturity level options |
| 137 | # | 138 | # |
| 138 | CONFIG_EXPERIMENTAL=y | 139 | CONFIG_EXPERIMENTAL=y |
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | 140 | CONFIG_BROKEN_ON_SMP=y |
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 142 | 142 | ||
| @@ -152,6 +152,7 @@ CONFIG_SYSVIPC=y | |||
| 152 | CONFIG_SYSCTL=y | 152 | CONFIG_SYSCTL=y |
| 153 | # CONFIG_AUDIT is not set | 153 | # CONFIG_AUDIT is not set |
| 154 | # CONFIG_IKCONFIG is not set | 154 | # CONFIG_IKCONFIG is not set |
| 155 | CONFIG_RELAY=y | ||
| 155 | CONFIG_INITRAMFS_SOURCE="" | 156 | CONFIG_INITRAMFS_SOURCE="" |
| 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 157 | CONFIG_EMBEDDED=y | 158 | CONFIG_EMBEDDED=y |
| @@ -165,10 +166,6 @@ CONFIG_BASE_FULL=y | |||
| 165 | CONFIG_FUTEX=y | 166 | CONFIG_FUTEX=y |
| 166 | CONFIG_EPOLL=y | 167 | CONFIG_EPOLL=y |
| 167 | CONFIG_SHMEM=y | 168 | CONFIG_SHMEM=y |
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | CONFIG_SLAB=y | 169 | CONFIG_SLAB=y |
| 173 | # CONFIG_TINY_SHMEM is not set | 170 | # CONFIG_TINY_SHMEM is not set |
| 174 | CONFIG_BASE_SMALL=0 | 171 | CONFIG_BASE_SMALL=0 |
| @@ -183,6 +180,8 @@ CONFIG_BASE_SMALL=0 | |||
| 183 | # Block layer | 180 | # Block layer |
| 184 | # | 181 | # |
| 185 | # CONFIG_LBD is not set | 182 | # CONFIG_LBD is not set |
| 183 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 184 | # CONFIG_LSF is not set | ||
| 186 | 185 | ||
| 187 | # | 186 | # |
| 188 | # IO Schedulers | 187 | # IO Schedulers |
| @@ -202,7 +201,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 202 | # | 201 | # |
| 203 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| 204 | CONFIG_PCI=y | 203 | CONFIG_PCI=y |
| 205 | CONFIG_PCI_LEGACY_PROC=y | ||
| 206 | CONFIG_MMU=y | 204 | CONFIG_MMU=y |
| 207 | 205 | ||
| 208 | # | 206 | # |
| @@ -230,6 +228,7 @@ CONFIG_NET=y | |||
| 230 | # | 228 | # |
| 231 | # Networking options | 229 | # Networking options |
| 232 | # | 230 | # |
| 231 | # CONFIG_NETDEBUG is not set | ||
| 233 | CONFIG_PACKET=y | 232 | CONFIG_PACKET=y |
| 234 | # CONFIG_PACKET_MMAP is not set | 233 | # CONFIG_PACKET_MMAP is not set |
| 235 | CONFIG_UNIX=y | 234 | CONFIG_UNIX=y |
| @@ -251,12 +250,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 251 | # CONFIG_INET_AH is not set | 250 | # CONFIG_INET_AH is not set |
| 252 | # CONFIG_INET_ESP is not set | 251 | # CONFIG_INET_ESP is not set |
| 253 | # CONFIG_INET_IPCOMP is not set | 252 | # CONFIG_INET_IPCOMP is not set |
| 254 | CONFIG_INET_TUNNEL=y | 253 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 254 | # CONFIG_INET_TUNNEL is not set | ||
| 255 | CONFIG_INET_DIAG=y | 255 | CONFIG_INET_DIAG=y |
| 256 | CONFIG_INET_TCP_DIAG=y | 256 | CONFIG_INET_TCP_DIAG=y |
| 257 | # CONFIG_TCP_CONG_ADVANCED is not set | 257 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 258 | CONFIG_TCP_CONG_BIC=y | 258 | CONFIG_TCP_CONG_BIC=y |
| 259 | # CONFIG_IPV6 is not set | 259 | # CONFIG_IPV6 is not set |
| 260 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 261 | # CONFIG_INET6_TUNNEL is not set | ||
| 260 | # CONFIG_NETFILTER is not set | 262 | # CONFIG_NETFILTER is not set |
| 261 | 263 | ||
| 262 | # | 264 | # |
| @@ -268,6 +270,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 268 | # SCTP Configuration (EXPERIMENTAL) | 270 | # SCTP Configuration (EXPERIMENTAL) |
| 269 | # | 271 | # |
| 270 | # CONFIG_IP_SCTP is not set | 272 | # CONFIG_IP_SCTP is not set |
| 273 | |||
| 274 | # | ||
| 275 | # TIPC Configuration (EXPERIMENTAL) | ||
| 276 | # | ||
| 277 | # CONFIG_TIPC is not set | ||
| 271 | # CONFIG_ATM is not set | 278 | # CONFIG_ATM is not set |
| 272 | # CONFIG_BRIDGE is not set | 279 | # CONFIG_BRIDGE is not set |
| 273 | # CONFIG_VLAN_8021Q is not set | 280 | # CONFIG_VLAN_8021Q is not set |
| @@ -277,11 +284,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 277 | # CONFIG_ATALK is not set | 284 | # CONFIG_ATALK is not set |
| 278 | # CONFIG_X25 is not set | 285 | # CONFIG_X25 is not set |
| 279 | # CONFIG_LAPB is not set | 286 | # CONFIG_LAPB is not set |
| 280 | |||
| 281 | # | ||
| 282 | # TIPC Configuration (EXPERIMENTAL) | ||
| 283 | # | ||
| 284 | # CONFIG_TIPC is not set | ||
| 285 | # CONFIG_NET_DIVERT is not set | 287 | # CONFIG_NET_DIVERT is not set |
| 286 | # CONFIG_ECONET is not set | 288 | # CONFIG_ECONET is not set |
| 287 | # CONFIG_WAN_ROUTER is not set | 289 | # CONFIG_WAN_ROUTER is not set |
| @@ -302,6 +304,9 @@ CONFIG_IEEE80211=y | |||
| 302 | # CONFIG_IEEE80211_DEBUG is not set | 304 | # CONFIG_IEEE80211_DEBUG is not set |
| 303 | CONFIG_IEEE80211_CRYPT_WEP=y | 305 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 304 | CONFIG_IEEE80211_CRYPT_CCMP=y | 306 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 307 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 308 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 309 | CONFIG_WIRELESS_EXT=y | ||
| 305 | 310 | ||
| 306 | # | 311 | # |
| 307 | # Device Drivers | 312 | # Device Drivers |
| @@ -346,7 +351,7 @@ CONFIG_PROC_EVENTS=y | |||
| 346 | # CONFIG_BLK_DEV_NBD is not set | 351 | # CONFIG_BLK_DEV_NBD is not set |
| 347 | # CONFIG_BLK_DEV_SX8 is not set | 352 | # CONFIG_BLK_DEV_SX8 is not set |
| 348 | # CONFIG_BLK_DEV_RAM is not set | 353 | # CONFIG_BLK_DEV_RAM is not set |
| 349 | CONFIG_BLK_DEV_RAM_COUNT=16 | 354 | # CONFIG_BLK_DEV_INITRD is not set |
| 350 | CONFIG_CDROM_PKTCDVD=y | 355 | CONFIG_CDROM_PKTCDVD=y |
| 351 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 356 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 352 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 357 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -556,6 +561,7 @@ CONFIG_HW_CONSOLE=y | |||
| 556 | # | 561 | # |
| 557 | CONFIG_SERIAL_8250=y | 562 | CONFIG_SERIAL_8250=y |
| 558 | CONFIG_SERIAL_8250_CONSOLE=y | 563 | CONFIG_SERIAL_8250_CONSOLE=y |
| 564 | CONFIG_SERIAL_8250_PCI=y | ||
| 559 | CONFIG_SERIAL_8250_NR_UARTS=4 | 565 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 560 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 566 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 561 | # CONFIG_SERIAL_8250_EXTENDED is not set | 567 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -565,6 +571,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 565 | # | 571 | # |
| 566 | CONFIG_SERIAL_CORE=y | 572 | CONFIG_SERIAL_CORE=y |
| 567 | CONFIG_SERIAL_CORE_CONSOLE=y | 573 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 574 | # CONFIG_SERIAL_JSM is not set | ||
| 568 | CONFIG_UNIX98_PTYS=y | 575 | CONFIG_UNIX98_PTYS=y |
| 569 | CONFIG_LEGACY_PTYS=y | 576 | CONFIG_LEGACY_PTYS=y |
| 570 | CONFIG_LEGACY_PTY_COUNT=256 | 577 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -623,10 +630,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 623 | # | 630 | # |
| 624 | 631 | ||
| 625 | # | 632 | # |
| 626 | # Multimedia Capabilities Port drivers | ||
| 627 | # | ||
| 628 | |||
| 629 | # | ||
| 630 | # Multimedia devices | 633 | # Multimedia devices |
| 631 | # | 634 | # |
| 632 | # CONFIG_VIDEO_DEV is not set | 635 | # CONFIG_VIDEO_DEV is not set |
| @@ -657,6 +660,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 657 | # | 660 | # |
| 658 | CONFIG_USB_ARCH_HAS_HCD=y | 661 | CONFIG_USB_ARCH_HAS_HCD=y |
| 659 | CONFIG_USB_ARCH_HAS_OHCI=y | 662 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 663 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 660 | # CONFIG_USB is not set | 664 | # CONFIG_USB is not set |
| 661 | 665 | ||
| 662 | # | 666 | # |
| @@ -674,13 +678,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 674 | # CONFIG_MMC is not set | 678 | # CONFIG_MMC is not set |
| 675 | 679 | ||
| 676 | # | 680 | # |
| 681 | # LED devices | ||
| 682 | # | ||
| 683 | # CONFIG_NEW_LEDS is not set | ||
| 684 | |||
| 685 | # | ||
| 686 | # LED drivers | ||
| 687 | # | ||
| 688 | |||
| 689 | # | ||
| 690 | # LED Triggers | ||
| 691 | # | ||
| 692 | |||
| 693 | # | ||
| 677 | # InfiniBand support | 694 | # InfiniBand support |
| 678 | # | 695 | # |
| 679 | # CONFIG_INFINIBAND is not set | 696 | # CONFIG_INFINIBAND is not set |
| 680 | 697 | ||
| 681 | # | 698 | # |
| 682 | # SN Devices | 699 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 700 | # | ||
| 701 | |||
| 702 | # | ||
| 703 | # Real Time Clock | ||
| 683 | # | 704 | # |
| 705 | # CONFIG_RTC_CLASS is not set | ||
| 684 | 706 | ||
| 685 | # | 707 | # |
| 686 | # File systems | 708 | # File systems |
| @@ -725,7 +747,6 @@ CONFIG_SYSFS=y | |||
| 725 | # CONFIG_TMPFS is not set | 747 | # CONFIG_TMPFS is not set |
| 726 | # CONFIG_HUGETLB_PAGE is not set | 748 | # CONFIG_HUGETLB_PAGE is not set |
| 727 | CONFIG_RAMFS=y | 749 | CONFIG_RAMFS=y |
| 728 | CONFIG_RELAYFS_FS=y | ||
| 729 | # CONFIG_CONFIGFS_FS is not set | 750 | # CONFIG_CONFIGFS_FS is not set |
| 730 | 751 | ||
| 731 | # | 752 | # |
| @@ -792,6 +813,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 792 | # CONFIG_MAGIC_SYSRQ is not set | 813 | # CONFIG_MAGIC_SYSRQ is not set |
| 793 | # CONFIG_DEBUG_KERNEL is not set | 814 | # CONFIG_DEBUG_KERNEL is not set |
| 794 | CONFIG_LOG_BUF_SHIFT=14 | 815 | CONFIG_LOG_BUF_SHIFT=14 |
| 816 | # CONFIG_DEBUG_FS is not set | ||
| 817 | # CONFIG_UNWIND_INFO is not set | ||
| 795 | CONFIG_CROSSCOMPILE=y | 818 | CONFIG_CROSSCOMPILE=y |
| 796 | CONFIG_CMDLINE="ip=any" | 819 | CONFIG_CMDLINE="ip=any" |
| 797 | 820 | ||
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 5a181eadd437..d838496e114f 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:03 2006 | 4 | # Mon Apr 24 14:51:01 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -63,11 +63,13 @@ CONFIG_MACH_DECSTATION=y | |||
| 63 | # CONFIG_TOSHIBA_JMR3927 is not set | 63 | # CONFIG_TOSHIBA_JMR3927 is not set |
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_EARLY_PRINTK=y | ||
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 70 | CONFIG_EARLY_PRINTK=y | ||
| 71 | # CONFIG_CPU_BIG_ENDIAN is not set | 73 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 72 | CONFIG_CPU_LITTLE_ENDIAN=y | 74 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 73 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 75 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| @@ -113,7 +115,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 113 | # CONFIG_PAGE_SIZE_16KB is not set | 115 | # CONFIG_PAGE_SIZE_16KB is not set |
| 114 | # CONFIG_PAGE_SIZE_64KB is not set | 116 | # CONFIG_PAGE_SIZE_64KB is not set |
| 115 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
| 116 | # CONFIG_CPU_ADVANCED is not set | ||
| 117 | CONFIG_CPU_HAS_WB=y | 118 | CONFIG_CPU_HAS_WB=y |
| 118 | CONFIG_GENERIC_HARDIRQS=y | 119 | CONFIG_GENERIC_HARDIRQS=y |
| 119 | CONFIG_GENERIC_IRQ_PROBE=y | 120 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -135,7 +136,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 135 | # Code maturity level options | 136 | # Code maturity level options |
| 136 | # | 137 | # |
| 137 | CONFIG_EXPERIMENTAL=y | 138 | CONFIG_EXPERIMENTAL=y |
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | 139 | CONFIG_BROKEN_ON_SMP=y |
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 141 | 141 | ||
| @@ -151,6 +151,7 @@ CONFIG_SYSVIPC=y | |||
| 151 | CONFIG_SYSCTL=y | 151 | CONFIG_SYSCTL=y |
| 152 | # CONFIG_AUDIT is not set | 152 | # CONFIG_AUDIT is not set |
| 153 | # CONFIG_IKCONFIG is not set | 153 | # CONFIG_IKCONFIG is not set |
| 154 | CONFIG_RELAY=y | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | 155 | CONFIG_INITRAMFS_SOURCE="" |
| 155 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 156 | CONFIG_EMBEDDED=y | 157 | CONFIG_EMBEDDED=y |
| @@ -165,10 +166,6 @@ CONFIG_BASE_FULL=y | |||
| 165 | CONFIG_FUTEX=y | 166 | CONFIG_FUTEX=y |
| 166 | CONFIG_EPOLL=y | 167 | CONFIG_EPOLL=y |
| 167 | CONFIG_SHMEM=y | 168 | CONFIG_SHMEM=y |
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | CONFIG_SLAB=y | 169 | CONFIG_SLAB=y |
| 173 | # CONFIG_TINY_SHMEM is not set | 170 | # CONFIG_TINY_SHMEM is not set |
| 174 | CONFIG_BASE_SMALL=0 | 171 | CONFIG_BASE_SMALL=0 |
| @@ -180,7 +177,6 @@ CONFIG_BASE_SMALL=0 | |||
| 180 | CONFIG_MODULES=y | 177 | CONFIG_MODULES=y |
| 181 | CONFIG_MODULE_UNLOAD=y | 178 | CONFIG_MODULE_UNLOAD=y |
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 179 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | # CONFIG_MODVERSIONS is not set | 180 | # CONFIG_MODVERSIONS is not set |
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | 181 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 186 | CONFIG_KMOD=y | 182 | CONFIG_KMOD=y |
| @@ -189,6 +185,8 @@ CONFIG_KMOD=y | |||
| 189 | # Block layer | 185 | # Block layer |
| 190 | # | 186 | # |
| 191 | # CONFIG_LBD is not set | 187 | # CONFIG_LBD is not set |
| 188 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 189 | # CONFIG_LSF is not set | ||
| 192 | 190 | ||
| 193 | # | 191 | # |
| 194 | # IO Schedulers | 192 | # IO Schedulers |
| @@ -233,11 +231,10 @@ CONFIG_NET=y | |||
| 233 | # | 231 | # |
| 234 | # Networking options | 232 | # Networking options |
| 235 | # | 233 | # |
| 234 | # CONFIG_NETDEBUG is not set | ||
| 236 | CONFIG_PACKET=y | 235 | CONFIG_PACKET=y |
| 237 | CONFIG_PACKET_MMAP=y | 236 | CONFIG_PACKET_MMAP=y |
| 238 | CONFIG_UNIX=y | 237 | CONFIG_UNIX=y |
| 239 | CONFIG_XFRM=y | ||
| 240 | CONFIG_XFRM_USER=m | ||
| 241 | # CONFIG_NET_KEY is not set | 238 | # CONFIG_NET_KEY is not set |
| 242 | CONFIG_INET=y | 239 | CONFIG_INET=y |
| 243 | # CONFIG_IP_MULTICAST is not set | 240 | # CONFIG_IP_MULTICAST is not set |
| @@ -254,12 +251,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 254 | # CONFIG_INET_AH is not set | 251 | # CONFIG_INET_AH is not set |
| 255 | # CONFIG_INET_ESP is not set | 252 | # CONFIG_INET_ESP is not set |
| 256 | # CONFIG_INET_IPCOMP is not set | 253 | # CONFIG_INET_IPCOMP is not set |
| 257 | CONFIG_INET_TUNNEL=m | 254 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 255 | # CONFIG_INET_TUNNEL is not set | ||
| 258 | CONFIG_INET_DIAG=y | 256 | CONFIG_INET_DIAG=y |
| 259 | CONFIG_INET_TCP_DIAG=y | 257 | CONFIG_INET_TCP_DIAG=y |
| 260 | # CONFIG_TCP_CONG_ADVANCED is not set | 258 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 261 | CONFIG_TCP_CONG_BIC=y | 259 | CONFIG_TCP_CONG_BIC=y |
| 262 | # CONFIG_IPV6 is not set | 260 | # CONFIG_IPV6 is not set |
| 261 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 262 | # CONFIG_INET6_TUNNEL is not set | ||
| 263 | # CONFIG_NETFILTER is not set | 263 | # CONFIG_NETFILTER is not set |
| 264 | 264 | ||
| 265 | # | 265 | # |
| @@ -271,6 +271,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 271 | # SCTP Configuration (EXPERIMENTAL) | 271 | # SCTP Configuration (EXPERIMENTAL) |
| 272 | # | 272 | # |
| 273 | # CONFIG_IP_SCTP is not set | 273 | # CONFIG_IP_SCTP is not set |
| 274 | |||
| 275 | # | ||
| 276 | # TIPC Configuration (EXPERIMENTAL) | ||
| 277 | # | ||
| 278 | # CONFIG_TIPC is not set | ||
| 274 | # CONFIG_ATM is not set | 279 | # CONFIG_ATM is not set |
| 275 | # CONFIG_BRIDGE is not set | 280 | # CONFIG_BRIDGE is not set |
| 276 | # CONFIG_VLAN_8021Q is not set | 281 | # CONFIG_VLAN_8021Q is not set |
| @@ -280,11 +285,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # CONFIG_ATALK is not set | 285 | # CONFIG_ATALK is not set |
| 281 | # CONFIG_X25 is not set | 286 | # CONFIG_X25 is not set |
| 282 | # CONFIG_LAPB is not set | 287 | # CONFIG_LAPB is not set |
| 283 | |||
| 284 | # | ||
| 285 | # TIPC Configuration (EXPERIMENTAL) | ||
| 286 | # | ||
| 287 | # CONFIG_TIPC is not set | ||
| 288 | # CONFIG_NET_DIVERT is not set | 288 | # CONFIG_NET_DIVERT is not set |
| 289 | # CONFIG_ECONET is not set | 289 | # CONFIG_ECONET is not set |
| 290 | # CONFIG_WAN_ROUTER is not set | 290 | # CONFIG_WAN_ROUTER is not set |
| @@ -305,6 +305,9 @@ CONFIG_IEEE80211=m | |||
| 305 | # CONFIG_IEEE80211_DEBUG is not set | 305 | # CONFIG_IEEE80211_DEBUG is not set |
| 306 | CONFIG_IEEE80211_CRYPT_WEP=m | 306 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 307 | CONFIG_IEEE80211_CRYPT_CCMP=m | 307 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 308 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 309 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 310 | CONFIG_WIRELESS_EXT=y | ||
| 308 | 311 | ||
| 309 | # | 312 | # |
| 310 | # Device Drivers | 313 | # Device Drivers |
| @@ -345,7 +348,7 @@ CONFIG_BLK_DEV_LOOP=m | |||
| 345 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 348 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 346 | # CONFIG_BLK_DEV_NBD is not set | 349 | # CONFIG_BLK_DEV_NBD is not set |
| 347 | # CONFIG_BLK_DEV_RAM is not set | 350 | # CONFIG_BLK_DEV_RAM is not set |
| 348 | CONFIG_BLK_DEV_RAM_COUNT=16 | 351 | # CONFIG_BLK_DEV_INITRD is not set |
| 349 | # CONFIG_CDROM_PKTCDVD is not set | 352 | # CONFIG_CDROM_PKTCDVD is not set |
| 350 | # CONFIG_ATA_OVER_ETH is not set | 353 | # CONFIG_ATA_OVER_ETH is not set |
| 351 | 354 | ||
| @@ -567,10 +570,6 @@ CONFIG_RTC=y | |||
| 567 | # | 570 | # |
| 568 | 571 | ||
| 569 | # | 572 | # |
| 570 | # Multimedia Capabilities Port drivers | ||
| 571 | # | ||
| 572 | |||
| 573 | # | ||
| 574 | # Multimedia devices | 573 | # Multimedia devices |
| 575 | # | 574 | # |
| 576 | # CONFIG_VIDEO_DEV is not set | 575 | # CONFIG_VIDEO_DEV is not set |
| @@ -588,6 +587,7 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 588 | CONFIG_FB_CFB_COPYAREA=y | 587 | CONFIG_FB_CFB_COPYAREA=y |
| 589 | CONFIG_FB_CFB_IMAGEBLIT=y | 588 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 590 | # CONFIG_FB_MACMODES is not set | 589 | # CONFIG_FB_MACMODES is not set |
| 590 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 591 | # CONFIG_FB_MODE_HELPERS is not set | 591 | # CONFIG_FB_MODE_HELPERS is not set |
| 592 | # CONFIG_FB_TILEBLITTING is not set | 592 | # CONFIG_FB_TILEBLITTING is not set |
| 593 | # CONFIG_FB_S1D13XXX is not set | 593 | # CONFIG_FB_S1D13XXX is not set |
| @@ -617,6 +617,7 @@ CONFIG_LOGO_DEC_CLUT224=y | |||
| 617 | # | 617 | # |
| 618 | # CONFIG_USB_ARCH_HAS_HCD is not set | 618 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 619 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 619 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 620 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 620 | 621 | ||
| 621 | # | 622 | # |
| 622 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 623 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -633,12 +634,30 @@ CONFIG_LOGO_DEC_CLUT224=y | |||
| 633 | # CONFIG_MMC is not set | 634 | # CONFIG_MMC is not set |
| 634 | 635 | ||
| 635 | # | 636 | # |
| 637 | # LED devices | ||
| 638 | # | ||
| 639 | # CONFIG_NEW_LEDS is not set | ||
| 640 | |||
| 641 | # | ||
| 642 | # LED drivers | ||
| 643 | # | ||
| 644 | |||
| 645 | # | ||
| 646 | # LED Triggers | ||
| 647 | # | ||
| 648 | |||
| 649 | # | ||
| 636 | # InfiniBand support | 650 | # InfiniBand support |
| 637 | # | 651 | # |
| 638 | 652 | ||
| 639 | # | 653 | # |
| 640 | # SN Devices | 654 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 655 | # | ||
| 656 | |||
| 657 | # | ||
| 658 | # Real Time Clock | ||
| 641 | # | 659 | # |
| 660 | # CONFIG_RTC_CLASS is not set | ||
| 642 | 661 | ||
| 643 | # | 662 | # |
| 644 | # File systems | 663 | # File systems |
| @@ -686,7 +705,6 @@ CONFIG_SYSFS=y | |||
| 686 | CONFIG_TMPFS=y | 705 | CONFIG_TMPFS=y |
| 687 | # CONFIG_HUGETLB_PAGE is not set | 706 | # CONFIG_HUGETLB_PAGE is not set |
| 688 | CONFIG_RAMFS=y | 707 | CONFIG_RAMFS=y |
| 689 | CONFIG_RELAYFS_FS=m | ||
| 690 | # CONFIG_CONFIGFS_FS is not set | 708 | # CONFIG_CONFIGFS_FS is not set |
| 691 | 709 | ||
| 692 | # | 710 | # |
| @@ -705,7 +723,6 @@ CONFIG_RELAYFS_FS=m | |||
| 705 | # CONFIG_QNX4FS_FS is not set | 723 | # CONFIG_QNX4FS_FS is not set |
| 706 | # CONFIG_SYSV_FS is not set | 724 | # CONFIG_SYSV_FS is not set |
| 707 | CONFIG_UFS_FS=y | 725 | CONFIG_UFS_FS=y |
| 708 | CONFIG_UFS_FS_WRITE=y | ||
| 709 | 726 | ||
| 710 | # | 727 | # |
| 711 | # Network File Systems | 728 | # Network File Systems |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 8fbfc06a6a2a..0760f4318910 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:04 2006 | 4 | # Tue Apr 25 00:08:20 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -70,6 +70,8 @@ CONFIG_CASIO_E55=y | |||
| 70 | # CONFIG_VICTOR_MPC30X is not set | 70 | # CONFIG_VICTOR_MPC30X is not set |
| 71 | # CONFIG_ZAO_CAPCELLA is not set | 71 | # CONFIG_ZAO_CAPCELLA is not set |
| 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 73 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 74 | CONFIG_GENERIC_HWEIGHT=y | ||
| 73 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 75 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 74 | CONFIG_DMA_NONCOHERENT=y | 76 | CONFIG_DMA_NONCOHERENT=y |
| 75 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 77 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -88,7 +90,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 88 | # CONFIG_CPU_MIPS64_R2 is not set | 90 | # CONFIG_CPU_MIPS64_R2 is not set |
| 89 | # CONFIG_CPU_R3000 is not set | 91 | # CONFIG_CPU_R3000 is not set |
| 90 | # CONFIG_CPU_TX39XX is not set | 92 | # CONFIG_CPU_TX39XX is not set |
| 91 | # CONFIG_CPU_VR41XX is not set | 93 | CONFIG_CPU_VR41XX=y |
| 92 | # CONFIG_CPU_R4300 is not set | 94 | # CONFIG_CPU_R4300 is not set |
| 93 | # CONFIG_CPU_R4X00 is not set | 95 | # CONFIG_CPU_R4X00 is not set |
| 94 | # CONFIG_CPU_TX49XX is not set | 96 | # CONFIG_CPU_TX49XX is not set |
| @@ -101,18 +103,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 101 | # CONFIG_CPU_RM7000 is not set | 103 | # CONFIG_CPU_RM7000 is not set |
| 102 | # CONFIG_CPU_RM9000 is not set | 104 | # CONFIG_CPU_RM9000 is not set |
| 103 | # CONFIG_CPU_SB1 is not set | 105 | # CONFIG_CPU_SB1 is not set |
| 106 | CONFIG_SYS_HAS_CPU_VR41XX=y | ||
| 107 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
| 108 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
| 109 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 104 | 110 | ||
| 105 | # | 111 | # |
| 106 | # Kernel type | 112 | # Kernel type |
| 107 | # | 113 | # |
| 108 | # CONFIG_32BIT is not set | 114 | CONFIG_32BIT=y |
| 109 | # CONFIG_64BIT is not set | 115 | # CONFIG_64BIT is not set |
| 110 | CONFIG_PAGE_SIZE_4KB=y | 116 | CONFIG_PAGE_SIZE_4KB=y |
| 111 | # CONFIG_PAGE_SIZE_8KB is not set | 117 | # CONFIG_PAGE_SIZE_8KB is not set |
| 112 | # CONFIG_PAGE_SIZE_16KB is not set | 118 | # CONFIG_PAGE_SIZE_16KB is not set |
| 113 | # CONFIG_PAGE_SIZE_64KB is not set | 119 | # CONFIG_PAGE_SIZE_64KB is not set |
| 114 | # CONFIG_MIPS_MT is not set | 120 | # CONFIG_MIPS_MT is not set |
| 115 | CONFIG_CPU_HAS_LLSC=y | ||
| 116 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 117 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| 118 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -133,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 133 | # Code maturity level options | 138 | # Code maturity level options |
| 134 | # | 139 | # |
| 135 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 139 | 143 | ||
| @@ -144,11 +148,10 @@ CONFIG_LOCALVERSION="" | |||
| 144 | CONFIG_LOCALVERSION_AUTO=y | 148 | CONFIG_LOCALVERSION_AUTO=y |
| 145 | CONFIG_SWAP=y | 149 | CONFIG_SWAP=y |
| 146 | CONFIG_SYSVIPC=y | 150 | CONFIG_SYSVIPC=y |
| 147 | # CONFIG_POSIX_MQUEUE is not set | ||
| 148 | # CONFIG_BSD_PROCESS_ACCT is not set | 151 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 149 | CONFIG_SYSCTL=y | 152 | CONFIG_SYSCTL=y |
| 150 | # CONFIG_AUDIT is not set | ||
| 151 | # CONFIG_IKCONFIG is not set | 153 | # CONFIG_IKCONFIG is not set |
| 154 | # CONFIG_RELAY is not set | ||
| 152 | CONFIG_INITRAMFS_SOURCE="" | 155 | CONFIG_INITRAMFS_SOURCE="" |
| 153 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 154 | CONFIG_EMBEDDED=y | 157 | CONFIG_EMBEDDED=y |
| @@ -162,10 +165,6 @@ CONFIG_BASE_FULL=y | |||
| 162 | CONFIG_FUTEX=y | 165 | CONFIG_FUTEX=y |
| 163 | CONFIG_EPOLL=y | 166 | CONFIG_EPOLL=y |
| 164 | CONFIG_SHMEM=y | 167 | CONFIG_SHMEM=y |
| 165 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 166 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 167 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 168 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 169 | CONFIG_SLAB=y | 168 | CONFIG_SLAB=y |
| 170 | # CONFIG_TINY_SHMEM is not set | 169 | # CONFIG_TINY_SHMEM is not set |
| 171 | CONFIG_BASE_SMALL=0 | 170 | CONFIG_BASE_SMALL=0 |
| @@ -177,7 +176,6 @@ CONFIG_BASE_SMALL=0 | |||
| 177 | CONFIG_MODULES=y | 176 | CONFIG_MODULES=y |
| 178 | CONFIG_MODULE_UNLOAD=y | 177 | CONFIG_MODULE_UNLOAD=y |
| 179 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 178 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 180 | CONFIG_OBSOLETE_MODPARM=y | ||
| 181 | CONFIG_MODVERSIONS=y | 179 | CONFIG_MODVERSIONS=y |
| 182 | CONFIG_MODULE_SRCVERSION_ALL=y | 180 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 183 | CONFIG_KMOD=y | 181 | CONFIG_KMOD=y |
| @@ -185,6 +183,9 @@ CONFIG_KMOD=y | |||
| 185 | # | 183 | # |
| 186 | # Block layer | 184 | # Block layer |
| 187 | # | 185 | # |
| 186 | # CONFIG_LBD is not set | ||
| 187 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 188 | # CONFIG_LSF is not set | ||
| 188 | 189 | ||
| 189 | # | 190 | # |
| 190 | # IO Schedulers | 191 | # IO Schedulers |
| @@ -219,85 +220,12 @@ CONFIG_MMU=y | |||
| 219 | # | 220 | # |
| 220 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
| 221 | # CONFIG_BINFMT_MISC is not set | 222 | # CONFIG_BINFMT_MISC is not set |
| 223 | CONFIG_TRAD_SIGNALS=y | ||
| 222 | 224 | ||
| 223 | # | 225 | # |
| 224 | # Networking | 226 | # Networking |
| 225 | # | 227 | # |
| 226 | CONFIG_NET=y | 228 | # CONFIG_NET is not set |
| 227 | |||
| 228 | # | ||
| 229 | # Networking options | ||
| 230 | # | ||
| 231 | CONFIG_PACKET=y | ||
| 232 | CONFIG_PACKET_MMAP=y | ||
| 233 | CONFIG_UNIX=y | ||
| 234 | CONFIG_XFRM=y | ||
| 235 | CONFIG_XFRM_USER=m | ||
| 236 | CONFIG_NET_KEY=y | ||
| 237 | CONFIG_INET=y | ||
| 238 | CONFIG_IP_MULTICAST=y | ||
| 239 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 240 | CONFIG_IP_FIB_HASH=y | ||
| 241 | # CONFIG_IP_PNP is not set | ||
| 242 | # CONFIG_NET_IPIP is not set | ||
| 243 | # CONFIG_NET_IPGRE is not set | ||
| 244 | # CONFIG_IP_MROUTE is not set | ||
| 245 | # CONFIG_ARPD is not set | ||
| 246 | # CONFIG_SYN_COOKIES is not set | ||
| 247 | # CONFIG_INET_AH is not set | ||
| 248 | # CONFIG_INET_ESP is not set | ||
| 249 | # CONFIG_INET_IPCOMP is not set | ||
| 250 | CONFIG_INET_TUNNEL=m | ||
| 251 | CONFIG_INET_DIAG=y | ||
| 252 | CONFIG_INET_TCP_DIAG=y | ||
| 253 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 254 | CONFIG_TCP_CONG_BIC=y | ||
| 255 | # CONFIG_IPV6 is not set | ||
| 256 | # CONFIG_NETFILTER is not set | ||
| 257 | |||
| 258 | # | ||
| 259 | # DCCP Configuration (EXPERIMENTAL) | ||
| 260 | # | ||
| 261 | # CONFIG_IP_DCCP is not set | ||
| 262 | |||
| 263 | # | ||
| 264 | # SCTP Configuration (EXPERIMENTAL) | ||
| 265 | # | ||
| 266 | # CONFIG_IP_SCTP is not set | ||
| 267 | # CONFIG_ATM is not set | ||
| 268 | # CONFIG_BRIDGE is not set | ||
| 269 | # CONFIG_VLAN_8021Q is not set | ||
| 270 | # CONFIG_DECNET is not set | ||
| 271 | # CONFIG_LLC2 is not set | ||
| 272 | # CONFIG_IPX is not set | ||
| 273 | # CONFIG_ATALK is not set | ||
| 274 | # CONFIG_X25 is not set | ||
| 275 | # CONFIG_LAPB is not set | ||
| 276 | |||
| 277 | # | ||
| 278 | # TIPC Configuration (EXPERIMENTAL) | ||
| 279 | # | ||
| 280 | # CONFIG_TIPC is not set | ||
| 281 | # CONFIG_NET_DIVERT is not set | ||
| 282 | # CONFIG_ECONET is not set | ||
| 283 | # CONFIG_WAN_ROUTER is not set | ||
| 284 | |||
| 285 | # | ||
| 286 | # QoS and/or fair queueing | ||
| 287 | # | ||
| 288 | # CONFIG_NET_SCHED is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Network testing | ||
| 292 | # | ||
| 293 | # CONFIG_NET_PKTGEN is not set | ||
| 294 | # CONFIG_HAMRADIO is not set | ||
| 295 | # CONFIG_IRDA is not set | ||
| 296 | # CONFIG_BT is not set | ||
| 297 | CONFIG_IEEE80211=m | ||
| 298 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 299 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 300 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 301 | 229 | ||
| 302 | # | 230 | # |
| 303 | # Device Drivers | 231 | # Device Drivers |
| @@ -313,7 +241,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 313 | # | 241 | # |
| 314 | # Connector - unified userspace <-> kernelspace linker | 242 | # Connector - unified userspace <-> kernelspace linker |
| 315 | # | 243 | # |
| 316 | CONFIG_CONNECTOR=m | ||
| 317 | 244 | ||
| 318 | # | 245 | # |
| 319 | # Memory Technology Devices (MTD) | 246 | # Memory Technology Devices (MTD) |
| @@ -335,11 +262,11 @@ CONFIG_CONNECTOR=m | |||
| 335 | # | 262 | # |
| 336 | # CONFIG_BLK_DEV_COW_COMMON is not set | 263 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 337 | # CONFIG_BLK_DEV_LOOP is not set | 264 | # CONFIG_BLK_DEV_LOOP is not set |
| 338 | # CONFIG_BLK_DEV_NBD is not set | 265 | CONFIG_BLK_DEV_RAM=m |
| 339 | # CONFIG_BLK_DEV_RAM is not set | ||
| 340 | CONFIG_BLK_DEV_RAM_COUNT=16 | 266 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 267 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 268 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 341 | # CONFIG_CDROM_PKTCDVD is not set | 269 | # CONFIG_CDROM_PKTCDVD is not set |
| 342 | # CONFIG_ATA_OVER_ETH is not set | ||
| 343 | 270 | ||
| 344 | # | 271 | # |
| 345 | # ATA/ATAPI/MFM/RLL support | 272 | # ATA/ATAPI/MFM/RLL support |
| @@ -398,81 +325,8 @@ CONFIG_IDE_GENERIC=y | |||
| 398 | # | 325 | # |
| 399 | 326 | ||
| 400 | # | 327 | # |
| 401 | # Network device support | ||
| 402 | # | ||
| 403 | CONFIG_NETDEVICES=y | ||
| 404 | # CONFIG_DUMMY is not set | ||
| 405 | # CONFIG_BONDING is not set | ||
| 406 | # CONFIG_EQUALIZER is not set | ||
| 407 | # CONFIG_TUN is not set | ||
| 408 | |||
| 409 | # | ||
| 410 | # ARCnet devices | ||
| 411 | # | ||
| 412 | # CONFIG_ARCNET is not set | ||
| 413 | |||
| 414 | # | ||
| 415 | # PHY device support | ||
| 416 | # | ||
| 417 | CONFIG_PHYLIB=m | ||
| 418 | |||
| 419 | # | ||
| 420 | # MII PHY device drivers | ||
| 421 | # | ||
| 422 | CONFIG_MARVELL_PHY=m | ||
| 423 | CONFIG_DAVICOM_PHY=m | ||
| 424 | CONFIG_QSEMI_PHY=m | ||
| 425 | CONFIG_LXT_PHY=m | ||
| 426 | CONFIG_CICADA_PHY=m | ||
| 427 | |||
| 428 | # | ||
| 429 | # Ethernet (10 or 100Mbit) | ||
| 430 | # | ||
| 431 | CONFIG_NET_ETHERNET=y | ||
| 432 | # CONFIG_MII is not set | ||
| 433 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 434 | # CONFIG_NET_VENDOR_SMC is not set | ||
| 435 | # CONFIG_DM9000 is not set | ||
| 436 | # CONFIG_NET_VENDOR_RACAL is not set | ||
| 437 | # CONFIG_AT1700 is not set | ||
| 438 | # CONFIG_DEPCA is not set | ||
| 439 | # CONFIG_HP100 is not set | ||
| 440 | # CONFIG_NET_ISA is not set | ||
| 441 | # CONFIG_NET_PCI is not set | ||
| 442 | |||
| 443 | # | ||
| 444 | # Ethernet (1000 Mbit) | ||
| 445 | # | ||
| 446 | |||
| 447 | # | ||
| 448 | # Ethernet (10000 Mbit) | ||
| 449 | # | ||
| 450 | |||
| 451 | # | ||
| 452 | # Token Ring devices | ||
| 453 | # | ||
| 454 | # CONFIG_TR is not set | ||
| 455 | |||
| 456 | # | ||
| 457 | # Wireless LAN (non-hamradio) | ||
| 458 | # | ||
| 459 | # CONFIG_NET_RADIO is not set | ||
| 460 | |||
| 461 | # | ||
| 462 | # Wan interfaces | ||
| 463 | # | ||
| 464 | # CONFIG_WAN is not set | ||
| 465 | # CONFIG_PPP is not set | ||
| 466 | # CONFIG_SLIP is not set | ||
| 467 | # CONFIG_SHAPER is not set | ||
| 468 | # CONFIG_NETCONSOLE is not set | ||
| 469 | # CONFIG_NETPOLL is not set | ||
| 470 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 471 | |||
| 472 | # | ||
| 473 | # ISDN subsystem | 328 | # ISDN subsystem |
| 474 | # | 329 | # |
| 475 | # CONFIG_ISDN is not set | ||
| 476 | 330 | ||
| 477 | # | 331 | # |
| 478 | # Telephony Support | 332 | # Telephony Support |
| @@ -508,11 +362,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 | |||
| 508 | # | 362 | # |
| 509 | # Hardware I/O ports | 363 | # Hardware I/O ports |
| 510 | # | 364 | # |
| 511 | CONFIG_SERIO=y | 365 | # CONFIG_SERIO is not set |
| 512 | # CONFIG_SERIO_I8042 is not set | ||
| 513 | CONFIG_SERIO_SERPORT=y | ||
| 514 | # CONFIG_SERIO_LIBPS2 is not set | ||
| 515 | CONFIG_SERIO_RAW=m | ||
| 516 | # CONFIG_GAMEPORT is not set | 366 | # CONFIG_GAMEPORT is not set |
| 517 | 367 | ||
| 518 | # | 368 | # |
| @@ -531,6 +381,10 @@ CONFIG_HW_CONSOLE=y | |||
| 531 | # | 381 | # |
| 532 | # Non-8250 serial port support | 382 | # Non-8250 serial port support |
| 533 | # | 383 | # |
| 384 | CONFIG_SERIAL_CORE=y | ||
| 385 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 386 | CONFIG_SERIAL_VR41XX=y | ||
| 387 | CONFIG_SERIAL_VR41XX_CONSOLE=y | ||
| 534 | CONFIG_UNIX98_PTYS=y | 388 | CONFIG_UNIX98_PTYS=y |
| 535 | CONFIG_LEGACY_PTYS=y | 389 | CONFIG_LEGACY_PTYS=y |
| 536 | CONFIG_LEGACY_PTY_COUNT=256 | 390 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -565,6 +419,7 @@ CONFIG_WATCHDOG=y | |||
| 565 | # | 419 | # |
| 566 | # Ftape, the floppy tape device driver | 420 | # Ftape, the floppy tape device driver |
| 567 | # | 421 | # |
| 422 | CONFIG_GPIO_VR41XX=y | ||
| 568 | # CONFIG_RAW_DRIVER is not set | 423 | # CONFIG_RAW_DRIVER is not set |
| 569 | 424 | ||
| 570 | # | 425 | # |
| @@ -600,10 +455,6 @@ CONFIG_WATCHDOG=y | |||
| 600 | # | 455 | # |
| 601 | 456 | ||
| 602 | # | 457 | # |
| 603 | # Multimedia Capabilities Port drivers | ||
| 604 | # | ||
| 605 | |||
| 606 | # | ||
| 607 | # Multimedia devices | 458 | # Multimedia devices |
| 608 | # | 459 | # |
| 609 | # CONFIG_VIDEO_DEV is not set | 460 | # CONFIG_VIDEO_DEV is not set |
| @@ -611,7 +462,6 @@ CONFIG_WATCHDOG=y | |||
| 611 | # | 462 | # |
| 612 | # Digital Video Broadcasting Devices | 463 | # Digital Video Broadcasting Devices |
| 613 | # | 464 | # |
| 614 | # CONFIG_DVB is not set | ||
| 615 | 465 | ||
| 616 | # | 466 | # |
| 617 | # Graphics support | 467 | # Graphics support |
| @@ -635,6 +485,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 635 | # | 485 | # |
| 636 | # CONFIG_USB_ARCH_HAS_HCD is not set | 486 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 637 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 487 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 488 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 638 | 489 | ||
| 639 | # | 490 | # |
| 640 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 491 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -651,12 +502,30 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 651 | # CONFIG_MMC is not set | 502 | # CONFIG_MMC is not set |
| 652 | 503 | ||
| 653 | # | 504 | # |
| 505 | # LED devices | ||
| 506 | # | ||
| 507 | # CONFIG_NEW_LEDS is not set | ||
| 508 | |||
| 509 | # | ||
| 510 | # LED drivers | ||
| 511 | # | ||
| 512 | |||
| 513 | # | ||
| 514 | # LED Triggers | ||
| 515 | # | ||
| 516 | |||
| 517 | # | ||
| 654 | # InfiniBand support | 518 | # InfiniBand support |
| 655 | # | 519 | # |
| 656 | 520 | ||
| 657 | # | 521 | # |
| 658 | # SN Devices | 522 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 523 | # | ||
| 524 | |||
| 525 | # | ||
| 526 | # Real Time Clock | ||
| 659 | # | 527 | # |
| 528 | # CONFIG_RTC_CLASS is not set | ||
| 660 | 529 | ||
| 661 | # | 530 | # |
| 662 | # File systems | 531 | # File systems |
| @@ -669,13 +538,12 @@ CONFIG_EXT2_FS=y | |||
| 669 | # CONFIG_JFS_FS is not set | 538 | # CONFIG_JFS_FS is not set |
| 670 | # CONFIG_FS_POSIX_ACL is not set | 539 | # CONFIG_FS_POSIX_ACL is not set |
| 671 | # CONFIG_XFS_FS is not set | 540 | # CONFIG_XFS_FS is not set |
| 672 | # CONFIG_OCFS2_FS is not set | ||
| 673 | # CONFIG_MINIX_FS is not set | 541 | # CONFIG_MINIX_FS is not set |
| 674 | # CONFIG_ROMFS_FS is not set | 542 | # CONFIG_ROMFS_FS is not set |
| 675 | CONFIG_INOTIFY=y | 543 | CONFIG_INOTIFY=y |
| 676 | # CONFIG_QUOTA is not set | 544 | # CONFIG_QUOTA is not set |
| 677 | CONFIG_DNOTIFY=y | 545 | CONFIG_DNOTIFY=y |
| 678 | CONFIG_AUTOFS_FS=y | 546 | # CONFIG_AUTOFS_FS is not set |
| 679 | CONFIG_AUTOFS4_FS=y | 547 | CONFIG_AUTOFS4_FS=y |
| 680 | CONFIG_FUSE_FS=m | 548 | CONFIG_FUSE_FS=m |
| 681 | 549 | ||
| @@ -698,10 +566,9 @@ CONFIG_FUSE_FS=m | |||
| 698 | CONFIG_PROC_FS=y | 566 | CONFIG_PROC_FS=y |
| 699 | CONFIG_PROC_KCORE=y | 567 | CONFIG_PROC_KCORE=y |
| 700 | CONFIG_SYSFS=y | 568 | CONFIG_SYSFS=y |
| 701 | # CONFIG_TMPFS is not set | 569 | CONFIG_TMPFS=y |
| 702 | # CONFIG_HUGETLB_PAGE is not set | 570 | # CONFIG_HUGETLB_PAGE is not set |
| 703 | CONFIG_RAMFS=y | 571 | CONFIG_RAMFS=y |
| 704 | CONFIG_RELAYFS_FS=m | ||
| 705 | # CONFIG_CONFIGFS_FS is not set | 572 | # CONFIG_CONFIGFS_FS is not set |
| 706 | 573 | ||
| 707 | # | 574 | # |
| @@ -722,29 +589,6 @@ CONFIG_RELAYFS_FS=m | |||
| 722 | # CONFIG_UFS_FS is not set | 589 | # CONFIG_UFS_FS is not set |
| 723 | 590 | ||
| 724 | # | 591 | # |
| 725 | # Network File Systems | ||
| 726 | # | ||
| 727 | CONFIG_NFS_FS=m | ||
| 728 | # CONFIG_NFS_V3 is not set | ||
| 729 | # CONFIG_NFS_V4 is not set | ||
| 730 | # CONFIG_NFS_DIRECTIO is not set | ||
| 731 | CONFIG_NFSD=m | ||
| 732 | # CONFIG_NFSD_V3 is not set | ||
| 733 | # CONFIG_NFSD_TCP is not set | ||
| 734 | CONFIG_LOCKD=m | ||
| 735 | CONFIG_EXPORTFS=m | ||
| 736 | CONFIG_NFS_COMMON=y | ||
| 737 | CONFIG_SUNRPC=m | ||
| 738 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 739 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 740 | # CONFIG_SMB_FS is not set | ||
| 741 | # CONFIG_CIFS is not set | ||
| 742 | # CONFIG_NCP_FS is not set | ||
| 743 | # CONFIG_CODA_FS is not set | ||
| 744 | # CONFIG_AFS_FS is not set | ||
| 745 | # CONFIG_9P_FS is not set | ||
| 746 | |||
| 747 | # | ||
| 748 | # Partition Types | 592 | # Partition Types |
| 749 | # | 593 | # |
| 750 | # CONFIG_PARTITION_ADVANCED is not set | 594 | # CONFIG_PARTITION_ADVANCED is not set |
| @@ -767,44 +611,20 @@ CONFIG_MSDOS_PARTITION=y | |||
| 767 | # CONFIG_MAGIC_SYSRQ is not set | 611 | # CONFIG_MAGIC_SYSRQ is not set |
| 768 | # CONFIG_DEBUG_KERNEL is not set | 612 | # CONFIG_DEBUG_KERNEL is not set |
| 769 | CONFIG_LOG_BUF_SHIFT=14 | 613 | CONFIG_LOG_BUF_SHIFT=14 |
| 614 | # CONFIG_DEBUG_FS is not set | ||
| 770 | CONFIG_CROSSCOMPILE=y | 615 | CONFIG_CROSSCOMPILE=y |
| 771 | CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M" | 616 | CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M" |
| 772 | 617 | ||
| 773 | # | 618 | # |
| 774 | # Security options | 619 | # Security options |
| 775 | # | 620 | # |
| 776 | CONFIG_KEYS=y | 621 | # CONFIG_KEYS is not set |
| 777 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 778 | # CONFIG_SECURITY is not set | 622 | # CONFIG_SECURITY is not set |
| 779 | 623 | ||
| 780 | # | 624 | # |
| 781 | # Cryptographic options | 625 | # Cryptographic options |
| 782 | # | 626 | # |
| 783 | CONFIG_CRYPTO=y | 627 | # CONFIG_CRYPTO is not set |
| 784 | CONFIG_CRYPTO_HMAC=y | ||
| 785 | CONFIG_CRYPTO_NULL=m | ||
| 786 | CONFIG_CRYPTO_MD4=m | ||
| 787 | CONFIG_CRYPTO_MD5=m | ||
| 788 | CONFIG_CRYPTO_SHA1=m | ||
| 789 | CONFIG_CRYPTO_SHA256=m | ||
| 790 | CONFIG_CRYPTO_SHA512=m | ||
| 791 | CONFIG_CRYPTO_WP512=m | ||
| 792 | CONFIG_CRYPTO_TGR192=m | ||
| 793 | CONFIG_CRYPTO_DES=m | ||
| 794 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 795 | CONFIG_CRYPTO_TWOFISH=m | ||
| 796 | CONFIG_CRYPTO_SERPENT=m | ||
| 797 | CONFIG_CRYPTO_AES=m | ||
| 798 | CONFIG_CRYPTO_CAST5=m | ||
| 799 | CONFIG_CRYPTO_CAST6=m | ||
| 800 | CONFIG_CRYPTO_TEA=m | ||
| 801 | CONFIG_CRYPTO_ARC4=m | ||
| 802 | CONFIG_CRYPTO_KHAZAD=m | ||
| 803 | CONFIG_CRYPTO_ANUBIS=m | ||
| 804 | CONFIG_CRYPTO_DEFLATE=m | ||
| 805 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 806 | CONFIG_CRYPTO_CRC32C=m | ||
| 807 | # CONFIG_CRYPTO_TEST is not set | ||
| 808 | 628 | ||
| 809 | # | 629 | # |
| 810 | # Hardware crypto devices | 630 | # Hardware crypto devices |
| @@ -814,8 +634,6 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 814 | # Library routines | 634 | # Library routines |
| 815 | # | 635 | # |
| 816 | # CONFIG_CRC_CCITT is not set | 636 | # CONFIG_CRC_CCITT is not set |
| 817 | CONFIG_CRC16=m | 637 | # CONFIG_CRC16 is not set |
| 818 | CONFIG_CRC32=m | 638 | # CONFIG_CRC32 is not set |
| 819 | CONFIG_LIBCRC32C=m | 639 | # CONFIG_LIBCRC32C is not set |
| 820 | CONFIG_ZLIB_INFLATE=m | ||
| 821 | CONFIG_ZLIB_DEFLATE=m | ||
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index f2d43be69007..7067f608b22c 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:05 2006 | 4 | # Mon Apr 24 14:51:02 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -65,6 +65,8 @@ CONFIG_MIPS_EV64120=y | |||
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | # CONFIG_EVB_PCI1 is not set | 66 | # CONFIG_EVB_PCI1 is not set |
| 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| 70 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -116,7 +118,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 116 | # CONFIG_PAGE_SIZE_64KB is not set | 118 | # CONFIG_PAGE_SIZE_64KB is not set |
| 117 | # CONFIG_MIPS_MT is not set | 119 | # CONFIG_MIPS_MT is not set |
| 118 | # CONFIG_64BIT_PHYS_ADDR is not set | 120 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 119 | # CONFIG_CPU_ADVANCED is not set | ||
| 120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
| 121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
| 122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -138,7 +139,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 138 | # Code maturity level options | 139 | # Code maturity level options |
| 139 | # | 140 | # |
| 140 | CONFIG_EXPERIMENTAL=y | 141 | CONFIG_EXPERIMENTAL=y |
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | 142 | CONFIG_BROKEN_ON_SMP=y |
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 144 | 144 | ||
| @@ -154,6 +154,7 @@ CONFIG_SYSVIPC=y | |||
| 154 | CONFIG_SYSCTL=y | 154 | CONFIG_SYSCTL=y |
| 155 | # CONFIG_AUDIT is not set | 155 | # CONFIG_AUDIT is not set |
| 156 | # CONFIG_IKCONFIG is not set | 156 | # CONFIG_IKCONFIG is not set |
| 157 | CONFIG_RELAY=y | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 159 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -167,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -182,7 +179,6 @@ CONFIG_BASE_SMALL=0 | |||
| 182 | CONFIG_MODULES=y | 179 | CONFIG_MODULES=y |
| 183 | CONFIG_MODULE_UNLOAD=y | 180 | CONFIG_MODULE_UNLOAD=y |
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | 182 | CONFIG_MODVERSIONS=y |
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | 183 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 188 | # CONFIG_KMOD is not set | 184 | # CONFIG_KMOD is not set |
| @@ -191,6 +187,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y | |||
| 191 | # Block layer | 187 | # Block layer |
| 192 | # | 188 | # |
| 193 | # CONFIG_LBD is not set | 189 | # CONFIG_LBD is not set |
| 190 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 191 | # CONFIG_LSF is not set | ||
| 194 | 192 | ||
| 195 | # | 193 | # |
| 196 | # IO Schedulers | 194 | # IO Schedulers |
| @@ -210,7 +208,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 210 | # | 208 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| 212 | CONFIG_PCI=y | 210 | CONFIG_PCI=y |
| 213 | CONFIG_PCI_LEGACY_PROC=y | ||
| 214 | CONFIG_MMU=y | 211 | CONFIG_MMU=y |
| 215 | 212 | ||
| 216 | # | 213 | # |
| @@ -238,6 +235,7 @@ CONFIG_NET=y | |||
| 238 | # | 235 | # |
| 239 | # Networking options | 236 | # Networking options |
| 240 | # | 237 | # |
| 238 | # CONFIG_NETDEBUG is not set | ||
| 241 | # CONFIG_PACKET is not set | 239 | # CONFIG_PACKET is not set |
| 242 | CONFIG_UNIX=y | 240 | CONFIG_UNIX=y |
| 243 | CONFIG_XFRM=y | 241 | CONFIG_XFRM=y |
| @@ -258,12 +256,15 @@ CONFIG_IP_PNP=y | |||
| 258 | # CONFIG_INET_AH is not set | 256 | # CONFIG_INET_AH is not set |
| 259 | # CONFIG_INET_ESP is not set | 257 | # CONFIG_INET_ESP is not set |
| 260 | # CONFIG_INET_IPCOMP is not set | 258 | # CONFIG_INET_IPCOMP is not set |
| 261 | CONFIG_INET_TUNNEL=m | 259 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 260 | # CONFIG_INET_TUNNEL is not set | ||
| 262 | CONFIG_INET_DIAG=y | 261 | CONFIG_INET_DIAG=y |
| 263 | CONFIG_INET_TCP_DIAG=y | 262 | CONFIG_INET_TCP_DIAG=y |
| 264 | # CONFIG_TCP_CONG_ADVANCED is not set | 263 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 265 | CONFIG_TCP_CONG_BIC=y | 264 | CONFIG_TCP_CONG_BIC=y |
| 266 | # CONFIG_IPV6 is not set | 265 | # CONFIG_IPV6 is not set |
| 266 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 267 | # CONFIG_INET6_TUNNEL is not set | ||
| 267 | # CONFIG_NETFILTER is not set | 268 | # CONFIG_NETFILTER is not set |
| 268 | 269 | ||
| 269 | # | 270 | # |
| @@ -275,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 275 | # SCTP Configuration (EXPERIMENTAL) | 276 | # SCTP Configuration (EXPERIMENTAL) |
| 276 | # | 277 | # |
| 277 | # CONFIG_IP_SCTP is not set | 278 | # CONFIG_IP_SCTP is not set |
| 279 | |||
| 280 | # | ||
| 281 | # TIPC Configuration (EXPERIMENTAL) | ||
| 282 | # | ||
| 283 | # CONFIG_TIPC is not set | ||
| 278 | # CONFIG_ATM is not set | 284 | # CONFIG_ATM is not set |
| 279 | # CONFIG_BRIDGE is not set | 285 | # CONFIG_BRIDGE is not set |
| 280 | # CONFIG_VLAN_8021Q is not set | 286 | # CONFIG_VLAN_8021Q is not set |
| @@ -284,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 284 | # CONFIG_ATALK is not set | 290 | # CONFIG_ATALK is not set |
| 285 | # CONFIG_X25 is not set | 291 | # CONFIG_X25 is not set |
| 286 | # CONFIG_LAPB is not set | 292 | # CONFIG_LAPB is not set |
| 287 | |||
| 288 | # | ||
| 289 | # TIPC Configuration (EXPERIMENTAL) | ||
| 290 | # | ||
| 291 | # CONFIG_TIPC is not set | ||
| 292 | # CONFIG_NET_DIVERT is not set | 293 | # CONFIG_NET_DIVERT is not set |
| 293 | # CONFIG_ECONET is not set | 294 | # CONFIG_ECONET is not set |
| 294 | # CONFIG_WAN_ROUTER is not set | 295 | # CONFIG_WAN_ROUTER is not set |
| @@ -309,6 +310,9 @@ CONFIG_IEEE80211=m | |||
| 309 | # CONFIG_IEEE80211_DEBUG is not set | 310 | # CONFIG_IEEE80211_DEBUG is not set |
| 310 | CONFIG_IEEE80211_CRYPT_WEP=m | 311 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 311 | CONFIG_IEEE80211_CRYPT_CCMP=m | 312 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 313 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 314 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 315 | CONFIG_WIRELESS_EXT=y | ||
| 312 | 316 | ||
| 313 | # | 317 | # |
| 314 | # Device Drivers | 318 | # Device Drivers |
| @@ -352,7 +356,7 @@ CONFIG_CONNECTOR=m | |||
| 352 | # CONFIG_BLK_DEV_NBD is not set | 356 | # CONFIG_BLK_DEV_NBD is not set |
| 353 | # CONFIG_BLK_DEV_SX8 is not set | 357 | # CONFIG_BLK_DEV_SX8 is not set |
| 354 | # CONFIG_BLK_DEV_RAM is not set | 358 | # CONFIG_BLK_DEV_RAM is not set |
| 355 | CONFIG_BLK_DEV_RAM_COUNT=16 | 359 | # CONFIG_BLK_DEV_INITRD is not set |
| 356 | CONFIG_CDROM_PKTCDVD=m | 360 | CONFIG_CDROM_PKTCDVD=m |
| 357 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 361 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 358 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 362 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -550,6 +554,7 @@ CONFIG_HW_CONSOLE=y | |||
| 550 | # | 554 | # |
| 551 | CONFIG_SERIAL_8250=y | 555 | CONFIG_SERIAL_8250=y |
| 552 | CONFIG_SERIAL_8250_CONSOLE=y | 556 | CONFIG_SERIAL_8250_CONSOLE=y |
| 557 | CONFIG_SERIAL_8250_PCI=y | ||
| 553 | CONFIG_SERIAL_8250_NR_UARTS=4 | 558 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 554 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 559 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 555 | # CONFIG_SERIAL_8250_EXTENDED is not set | 560 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -559,6 +564,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 559 | # | 564 | # |
| 560 | CONFIG_SERIAL_CORE=y | 565 | CONFIG_SERIAL_CORE=y |
| 561 | CONFIG_SERIAL_CORE_CONSOLE=y | 566 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 567 | # CONFIG_SERIAL_JSM is not set | ||
| 562 | CONFIG_UNIX98_PTYS=y | 568 | CONFIG_UNIX98_PTYS=y |
| 563 | CONFIG_LEGACY_PTYS=y | 569 | CONFIG_LEGACY_PTYS=y |
| 564 | CONFIG_LEGACY_PTY_COUNT=256 | 570 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -617,10 +623,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 617 | # | 623 | # |
| 618 | 624 | ||
| 619 | # | 625 | # |
| 620 | # Multimedia Capabilities Port drivers | ||
| 621 | # | ||
| 622 | |||
| 623 | # | ||
| 624 | # Multimedia devices | 626 | # Multimedia devices |
| 625 | # | 627 | # |
| 626 | # CONFIG_VIDEO_DEV is not set | 628 | # CONFIG_VIDEO_DEV is not set |
| @@ -651,6 +653,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 651 | # | 653 | # |
| 652 | CONFIG_USB_ARCH_HAS_HCD=y | 654 | CONFIG_USB_ARCH_HAS_HCD=y |
| 653 | CONFIG_USB_ARCH_HAS_OHCI=y | 655 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 656 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 654 | # CONFIG_USB is not set | 657 | # CONFIG_USB is not set |
| 655 | 658 | ||
| 656 | # | 659 | # |
| @@ -668,13 +671,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 668 | # CONFIG_MMC is not set | 671 | # CONFIG_MMC is not set |
| 669 | 672 | ||
| 670 | # | 673 | # |
| 674 | # LED devices | ||
| 675 | # | ||
| 676 | # CONFIG_NEW_LEDS is not set | ||
| 677 | |||
| 678 | # | ||
| 679 | # LED drivers | ||
| 680 | # | ||
| 681 | |||
| 682 | # | ||
| 683 | # LED Triggers | ||
| 684 | # | ||
| 685 | |||
| 686 | # | ||
| 671 | # InfiniBand support | 687 | # InfiniBand support |
| 672 | # | 688 | # |
| 673 | # CONFIG_INFINIBAND is not set | 689 | # CONFIG_INFINIBAND is not set |
| 674 | 690 | ||
| 675 | # | 691 | # |
| 676 | # SN Devices | 692 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 693 | # | ||
| 694 | |||
| 695 | # | ||
| 696 | # Real Time Clock | ||
| 677 | # | 697 | # |
| 698 | # CONFIG_RTC_CLASS is not set | ||
| 678 | 699 | ||
| 679 | # | 700 | # |
| 680 | # File systems | 701 | # File systems |
| @@ -719,7 +740,6 @@ CONFIG_SYSFS=y | |||
| 719 | # CONFIG_TMPFS is not set | 740 | # CONFIG_TMPFS is not set |
| 720 | # CONFIG_HUGETLB_PAGE is not set | 741 | # CONFIG_HUGETLB_PAGE is not set |
| 721 | CONFIG_RAMFS=y | 742 | CONFIG_RAMFS=y |
| 722 | CONFIG_RELAYFS_FS=m | ||
| 723 | # CONFIG_CONFIGFS_FS is not set | 743 | # CONFIG_CONFIGFS_FS is not set |
| 724 | 744 | ||
| 725 | # | 745 | # |
| @@ -783,6 +803,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 783 | # CONFIG_MAGIC_SYSRQ is not set | 803 | # CONFIG_MAGIC_SYSRQ is not set |
| 784 | # CONFIG_DEBUG_KERNEL is not set | 804 | # CONFIG_DEBUG_KERNEL is not set |
| 785 | CONFIG_LOG_BUF_SHIFT=14 | 805 | CONFIG_LOG_BUF_SHIFT=14 |
| 806 | # CONFIG_DEBUG_FS is not set | ||
| 786 | CONFIG_CROSSCOMPILE=y | 807 | CONFIG_CROSSCOMPILE=y |
| 787 | CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::" | 808 | CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::" |
| 788 | 809 | ||
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index ac5841c4b698..00b56ed0e638 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:06 2006 | 4 | # Mon Apr 24 14:51:03 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_EV96100=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -119,7 +121,6 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 119 | CONFIG_CPU_HAS_PREFETCH=y | 121 | CONFIG_CPU_HAS_PREFETCH=y |
| 120 | # CONFIG_MIPS_MT is not set | 122 | # CONFIG_MIPS_MT is not set |
| 121 | # CONFIG_64BIT_PHYS_ADDR is not set | 123 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 122 | # CONFIG_CPU_ADVANCED is not set | ||
| 123 | CONFIG_CPU_HAS_LLSC=y | 124 | CONFIG_CPU_HAS_LLSC=y |
| 124 | CONFIG_CPU_HAS_SYNC=y | 125 | CONFIG_CPU_HAS_SYNC=y |
| 125 | CONFIG_GENERIC_HARDIRQS=y | 126 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -142,7 +143,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 142 | # Code maturity level options | 143 | # Code maturity level options |
| 143 | # | 144 | # |
| 144 | CONFIG_EXPERIMENTAL=y | 145 | CONFIG_EXPERIMENTAL=y |
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | 146 | CONFIG_BROKEN_ON_SMP=y |
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 148 | 148 | ||
| @@ -158,6 +158,7 @@ CONFIG_SYSVIPC=y | |||
| 158 | CONFIG_SYSCTL=y | 158 | CONFIG_SYSCTL=y |
| 159 | # CONFIG_AUDIT is not set | 159 | # CONFIG_AUDIT is not set |
| 160 | # CONFIG_IKCONFIG is not set | 160 | # CONFIG_IKCONFIG is not set |
| 161 | CONFIG_RELAY=y | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | 162 | CONFIG_INITRAMFS_SOURCE="" |
| 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 163 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 163 | CONFIG_EMBEDDED=y | 164 | CONFIG_EMBEDDED=y |
| @@ -171,10 +172,6 @@ CONFIG_BASE_FULL=y | |||
| 171 | CONFIG_FUTEX=y | 172 | CONFIG_FUTEX=y |
| 172 | CONFIG_EPOLL=y | 173 | CONFIG_EPOLL=y |
| 173 | CONFIG_SHMEM=y | 174 | CONFIG_SHMEM=y |
| 174 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 175 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 176 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 177 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 178 | CONFIG_SLAB=y | 175 | CONFIG_SLAB=y |
| 179 | # CONFIG_TINY_SHMEM is not set | 176 | # CONFIG_TINY_SHMEM is not set |
| 180 | CONFIG_BASE_SMALL=0 | 177 | CONFIG_BASE_SMALL=0 |
| @@ -186,7 +183,6 @@ CONFIG_BASE_SMALL=0 | |||
| 186 | CONFIG_MODULES=y | 183 | CONFIG_MODULES=y |
| 187 | CONFIG_MODULE_UNLOAD=y | 184 | CONFIG_MODULE_UNLOAD=y |
| 188 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 189 | CONFIG_OBSOLETE_MODPARM=y | ||
| 190 | CONFIG_MODVERSIONS=y | 186 | CONFIG_MODVERSIONS=y |
| 191 | CONFIG_MODULE_SRCVERSION_ALL=y | 187 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 192 | # CONFIG_KMOD is not set | 188 | # CONFIG_KMOD is not set |
| @@ -195,6 +191,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y | |||
| 195 | # Block layer | 191 | # Block layer |
| 196 | # | 192 | # |
| 197 | # CONFIG_LBD is not set | 193 | # CONFIG_LBD is not set |
| 194 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 195 | # CONFIG_LSF is not set | ||
| 198 | 196 | ||
| 199 | # | 197 | # |
| 200 | # IO Schedulers | 198 | # IO Schedulers |
| @@ -240,6 +238,7 @@ CONFIG_NET=y | |||
| 240 | # | 238 | # |
| 241 | # Networking options | 239 | # Networking options |
| 242 | # | 240 | # |
| 241 | # CONFIG_NETDEBUG is not set | ||
| 243 | # CONFIG_PACKET is not set | 242 | # CONFIG_PACKET is not set |
| 244 | CONFIG_UNIX=y | 243 | CONFIG_UNIX=y |
| 245 | CONFIG_XFRM=y | 244 | CONFIG_XFRM=y |
| @@ -260,12 +259,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 260 | # CONFIG_INET_AH is not set | 259 | # CONFIG_INET_AH is not set |
| 261 | # CONFIG_INET_ESP is not set | 260 | # CONFIG_INET_ESP is not set |
| 262 | # CONFIG_INET_IPCOMP is not set | 261 | # CONFIG_INET_IPCOMP is not set |
| 263 | CONFIG_INET_TUNNEL=m | 262 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 263 | # CONFIG_INET_TUNNEL is not set | ||
| 264 | CONFIG_INET_DIAG=y | 264 | CONFIG_INET_DIAG=y |
| 265 | CONFIG_INET_TCP_DIAG=y | 265 | CONFIG_INET_TCP_DIAG=y |
| 266 | # CONFIG_TCP_CONG_ADVANCED is not set | 266 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 267 | CONFIG_TCP_CONG_BIC=y | 267 | CONFIG_TCP_CONG_BIC=y |
| 268 | # CONFIG_IPV6 is not set | 268 | # CONFIG_IPV6 is not set |
| 269 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 270 | # CONFIG_INET6_TUNNEL is not set | ||
| 269 | # CONFIG_NETFILTER is not set | 271 | # CONFIG_NETFILTER is not set |
| 270 | 272 | ||
| 271 | # | 273 | # |
| @@ -277,6 +279,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 277 | # SCTP Configuration (EXPERIMENTAL) | 279 | # SCTP Configuration (EXPERIMENTAL) |
| 278 | # | 280 | # |
| 279 | # CONFIG_IP_SCTP is not set | 281 | # CONFIG_IP_SCTP is not set |
| 282 | |||
| 283 | # | ||
| 284 | # TIPC Configuration (EXPERIMENTAL) | ||
| 285 | # | ||
| 286 | # CONFIG_TIPC is not set | ||
| 280 | # CONFIG_ATM is not set | 287 | # CONFIG_ATM is not set |
| 281 | # CONFIG_BRIDGE is not set | 288 | # CONFIG_BRIDGE is not set |
| 282 | # CONFIG_VLAN_8021Q is not set | 289 | # CONFIG_VLAN_8021Q is not set |
| @@ -286,11 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # CONFIG_ATALK is not set | 293 | # CONFIG_ATALK is not set |
| 287 | # CONFIG_X25 is not set | 294 | # CONFIG_X25 is not set |
| 288 | # CONFIG_LAPB is not set | 295 | # CONFIG_LAPB is not set |
| 289 | |||
| 290 | # | ||
| 291 | # TIPC Configuration (EXPERIMENTAL) | ||
| 292 | # | ||
| 293 | # CONFIG_TIPC is not set | ||
| 294 | # CONFIG_NET_DIVERT is not set | 296 | # CONFIG_NET_DIVERT is not set |
| 295 | # CONFIG_ECONET is not set | 297 | # CONFIG_ECONET is not set |
| 296 | # CONFIG_WAN_ROUTER is not set | 298 | # CONFIG_WAN_ROUTER is not set |
| @@ -311,6 +313,9 @@ CONFIG_IEEE80211=m | |||
| 311 | # CONFIG_IEEE80211_DEBUG is not set | 313 | # CONFIG_IEEE80211_DEBUG is not set |
| 312 | CONFIG_IEEE80211_CRYPT_WEP=m | 314 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 313 | CONFIG_IEEE80211_CRYPT_CCMP=m | 315 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 316 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 317 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 318 | CONFIG_WIRELESS_EXT=y | ||
| 314 | 319 | ||
| 315 | # | 320 | # |
| 316 | # Device Drivers | 321 | # Device Drivers |
| @@ -349,7 +354,7 @@ CONFIG_CONNECTOR=m | |||
| 349 | # CONFIG_BLK_DEV_LOOP is not set | 354 | # CONFIG_BLK_DEV_LOOP is not set |
| 350 | # CONFIG_BLK_DEV_NBD is not set | 355 | # CONFIG_BLK_DEV_NBD is not set |
| 351 | # CONFIG_BLK_DEV_RAM is not set | 356 | # CONFIG_BLK_DEV_RAM is not set |
| 352 | CONFIG_BLK_DEV_RAM_COUNT=16 | 357 | # CONFIG_BLK_DEV_INITRD is not set |
| 353 | CONFIG_CDROM_PKTCDVD=m | 358 | CONFIG_CDROM_PKTCDVD=m |
| 354 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 359 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 355 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 360 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -567,10 +572,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 567 | # | 572 | # |
| 568 | 573 | ||
| 569 | # | 574 | # |
| 570 | # Multimedia Capabilities Port drivers | ||
| 571 | # | ||
| 572 | |||
| 573 | # | ||
| 574 | # Multimedia devices | 575 | # Multimedia devices |
| 575 | # | 576 | # |
| 576 | # CONFIG_VIDEO_DEV is not set | 577 | # CONFIG_VIDEO_DEV is not set |
| @@ -601,6 +602,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 601 | # | 602 | # |
| 602 | # CONFIG_USB_ARCH_HAS_HCD is not set | 603 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 603 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 604 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 605 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 604 | 606 | ||
| 605 | # | 607 | # |
| 606 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 608 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -617,12 +619,30 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 617 | # CONFIG_MMC is not set | 619 | # CONFIG_MMC is not set |
| 618 | 620 | ||
| 619 | # | 621 | # |
| 622 | # LED devices | ||
| 623 | # | ||
| 624 | # CONFIG_NEW_LEDS is not set | ||
| 625 | |||
| 626 | # | ||
| 627 | # LED drivers | ||
| 628 | # | ||
| 629 | |||
| 630 | # | ||
| 631 | # LED Triggers | ||
| 632 | # | ||
| 633 | |||
| 634 | # | ||
| 620 | # InfiniBand support | 635 | # InfiniBand support |
| 621 | # | 636 | # |
| 622 | 637 | ||
| 623 | # | 638 | # |
| 624 | # SN Devices | 639 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 640 | # | ||
| 641 | |||
| 642 | # | ||
| 643 | # Real Time Clock | ||
| 625 | # | 644 | # |
| 645 | # CONFIG_RTC_CLASS is not set | ||
| 626 | 646 | ||
| 627 | # | 647 | # |
| 628 | # File systems | 648 | # File systems |
| @@ -667,7 +687,6 @@ CONFIG_SYSFS=y | |||
| 667 | # CONFIG_TMPFS is not set | 687 | # CONFIG_TMPFS is not set |
| 668 | # CONFIG_HUGETLB_PAGE is not set | 688 | # CONFIG_HUGETLB_PAGE is not set |
| 669 | CONFIG_RAMFS=y | 689 | CONFIG_RAMFS=y |
| 670 | CONFIG_RELAYFS_FS=m | ||
| 671 | # CONFIG_CONFIGFS_FS is not set | 690 | # CONFIG_CONFIGFS_FS is not set |
| 672 | 691 | ||
| 673 | # | 692 | # |
| @@ -731,6 +750,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 731 | # CONFIG_MAGIC_SYSRQ is not set | 750 | # CONFIG_MAGIC_SYSRQ is not set |
| 732 | # CONFIG_DEBUG_KERNEL is not set | 751 | # CONFIG_DEBUG_KERNEL is not set |
| 733 | CONFIG_LOG_BUF_SHIFT=14 | 752 | CONFIG_LOG_BUF_SHIFT=14 |
| 753 | # CONFIG_DEBUG_FS is not set | ||
| 734 | CONFIG_CROSSCOMPILE=y | 754 | CONFIG_CROSSCOMPILE=y |
| 735 | CONFIG_CMDLINE="" | 755 | CONFIG_CMDLINE="" |
| 736 | 756 | ||
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 42d5cd7927cb..607e2985ffe3 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:51 2006 | 4 | # Mon Apr 24 14:50:54 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_SGI_IP22=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_ARC=y | 70 | CONFIG_ARC=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| @@ -121,7 +123,6 @@ CONFIG_BOARD_SCACHE=y | |||
| 121 | CONFIG_IP22_CPU_SCACHE=y | 123 | CONFIG_IP22_CPU_SCACHE=y |
| 122 | # CONFIG_MIPS_MT is not set | 124 | # CONFIG_MIPS_MT is not set |
| 123 | # CONFIG_64BIT_PHYS_ADDR is not set | 125 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 124 | # CONFIG_CPU_ADVANCED is not set | ||
| 125 | CONFIG_CPU_HAS_LLSC=y | 126 | CONFIG_CPU_HAS_LLSC=y |
| 126 | CONFIG_CPU_HAS_SYNC=y | 127 | CONFIG_CPU_HAS_SYNC=y |
| 127 | CONFIG_GENERIC_HARDIRQS=y | 128 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -143,7 +144,6 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 143 | # Code maturity level options | 144 | # Code maturity level options |
| 144 | # | 145 | # |
| 145 | CONFIG_EXPERIMENTAL=y | 146 | CONFIG_EXPERIMENTAL=y |
| 146 | CONFIG_CLEAN_COMPILE=y | ||
| 147 | CONFIG_BROKEN_ON_SMP=y | 147 | CONFIG_BROKEN_ON_SMP=y |
| 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 149 | 149 | ||
| @@ -160,6 +160,7 @@ CONFIG_SYSCTL=y | |||
| 160 | # CONFIG_AUDIT is not set | 160 | # CONFIG_AUDIT is not set |
| 161 | CONFIG_IKCONFIG=y | 161 | CONFIG_IKCONFIG=y |
| 162 | CONFIG_IKCONFIG_PROC=y | 162 | CONFIG_IKCONFIG_PROC=y |
| 163 | CONFIG_RELAY=y | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | 164 | CONFIG_INITRAMFS_SOURCE="" |
| 164 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 165 | CONFIG_EMBEDDED=y | 166 | CONFIG_EMBEDDED=y |
| @@ -173,10 +174,6 @@ CONFIG_BASE_FULL=y | |||
| 173 | CONFIG_FUTEX=y | 174 | CONFIG_FUTEX=y |
| 174 | CONFIG_EPOLL=y | 175 | CONFIG_EPOLL=y |
| 175 | CONFIG_SHMEM=y | 176 | CONFIG_SHMEM=y |
| 176 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 177 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 178 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 179 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 180 | CONFIG_SLAB=y | 177 | CONFIG_SLAB=y |
| 181 | # CONFIG_TINY_SHMEM is not set | 178 | # CONFIG_TINY_SHMEM is not set |
| 182 | CONFIG_BASE_SMALL=0 | 179 | CONFIG_BASE_SMALL=0 |
| @@ -188,7 +185,6 @@ CONFIG_BASE_SMALL=0 | |||
| 188 | CONFIG_MODULES=y | 185 | CONFIG_MODULES=y |
| 189 | CONFIG_MODULE_UNLOAD=y | 186 | CONFIG_MODULE_UNLOAD=y |
| 190 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 187 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 191 | CONFIG_OBSOLETE_MODPARM=y | ||
| 192 | CONFIG_MODVERSIONS=y | 188 | CONFIG_MODVERSIONS=y |
| 193 | CONFIG_MODULE_SRCVERSION_ALL=y | 189 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 194 | CONFIG_KMOD=y | 190 | CONFIG_KMOD=y |
| @@ -197,6 +193,8 @@ CONFIG_KMOD=y | |||
| 197 | # Block layer | 193 | # Block layer |
| 198 | # | 194 | # |
| 199 | # CONFIG_LBD is not set | 195 | # CONFIG_LBD is not set |
| 196 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 197 | # CONFIG_LSF is not set | ||
| 200 | 198 | ||
| 201 | # | 199 | # |
| 202 | # IO Schedulers | 200 | # IO Schedulers |
| @@ -242,6 +240,7 @@ CONFIG_NET=y | |||
| 242 | # | 240 | # |
| 243 | # Networking options | 241 | # Networking options |
| 244 | # | 242 | # |
| 243 | # CONFIG_NETDEBUG is not set | ||
| 245 | CONFIG_PACKET=y | 244 | CONFIG_PACKET=y |
| 246 | CONFIG_PACKET_MMAP=y | 245 | CONFIG_PACKET_MMAP=y |
| 247 | CONFIG_UNIX=y | 246 | CONFIG_UNIX=y |
| @@ -264,6 +263,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 264 | CONFIG_INET_AH=m | 263 | CONFIG_INET_AH=m |
| 265 | CONFIG_INET_ESP=m | 264 | CONFIG_INET_ESP=m |
| 266 | CONFIG_INET_IPCOMP=m | 265 | CONFIG_INET_IPCOMP=m |
| 266 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 267 | CONFIG_INET_TUNNEL=m | 267 | CONFIG_INET_TUNNEL=m |
| 268 | CONFIG_INET_DIAG=y | 268 | CONFIG_INET_DIAG=y |
| 269 | CONFIG_INET_TCP_DIAG=y | 269 | CONFIG_INET_TCP_DIAG=y |
| @@ -305,9 +305,12 @@ CONFIG_IP_VS_NQ=m | |||
| 305 | CONFIG_IP_VS_FTP=m | 305 | CONFIG_IP_VS_FTP=m |
| 306 | CONFIG_IPV6=m | 306 | CONFIG_IPV6=m |
| 307 | CONFIG_IPV6_PRIVACY=y | 307 | CONFIG_IPV6_PRIVACY=y |
| 308 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 309 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 308 | CONFIG_INET6_AH=m | 310 | CONFIG_INET6_AH=m |
| 309 | CONFIG_INET6_ESP=m | 311 | CONFIG_INET6_ESP=m |
| 310 | CONFIG_INET6_IPCOMP=m | 312 | CONFIG_INET6_IPCOMP=m |
| 313 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 311 | CONFIG_INET6_TUNNEL=m | 314 | CONFIG_INET6_TUNNEL=m |
| 312 | CONFIG_IPV6_TUNNEL=m | 315 | CONFIG_IPV6_TUNNEL=m |
| 313 | CONFIG_NETFILTER=y | 316 | CONFIG_NETFILTER=y |
| @@ -330,11 +333,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | |||
| 330 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 333 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 331 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 334 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 332 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 335 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 333 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 337 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 334 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 338 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 335 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 339 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 340 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 337 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 341 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 342 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 343 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 338 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 344 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 339 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 345 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 340 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 346 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -357,20 +363,19 @@ CONFIG_IP_NF_IRC=m | |||
| 357 | CONFIG_IP_NF_TFTP=m | 363 | CONFIG_IP_NF_TFTP=m |
| 358 | CONFIG_IP_NF_AMANDA=m | 364 | CONFIG_IP_NF_AMANDA=m |
| 359 | CONFIG_IP_NF_PPTP=m | 365 | CONFIG_IP_NF_PPTP=m |
| 366 | CONFIG_IP_NF_H323=m | ||
| 360 | CONFIG_IP_NF_QUEUE=m | 367 | CONFIG_IP_NF_QUEUE=m |
| 361 | CONFIG_IP_NF_IPTABLES=m | 368 | CONFIG_IP_NF_IPTABLES=m |
| 362 | CONFIG_IP_NF_MATCH_IPRANGE=m | 369 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 363 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 364 | CONFIG_IP_NF_MATCH_TOS=m | 370 | CONFIG_IP_NF_MATCH_TOS=m |
| 365 | CONFIG_IP_NF_MATCH_RECENT=m | 371 | CONFIG_IP_NF_MATCH_RECENT=m |
| 366 | CONFIG_IP_NF_MATCH_ECN=m | 372 | CONFIG_IP_NF_MATCH_ECN=m |
| 367 | CONFIG_IP_NF_MATCH_DSCP=m | 373 | CONFIG_IP_NF_MATCH_DSCP=m |
| 368 | CONFIG_IP_NF_MATCH_AH_ESP=m | 374 | CONFIG_IP_NF_MATCH_AH=m |
| 369 | CONFIG_IP_NF_MATCH_TTL=m | 375 | CONFIG_IP_NF_MATCH_TTL=m |
| 370 | CONFIG_IP_NF_MATCH_OWNER=m | 376 | CONFIG_IP_NF_MATCH_OWNER=m |
| 371 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 377 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 372 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 378 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
| 373 | CONFIG_IP_NF_MATCH_POLICY=m | ||
| 374 | CONFIG_IP_NF_FILTER=m | 379 | CONFIG_IP_NF_FILTER=m |
| 375 | CONFIG_IP_NF_TARGET_REJECT=m | 380 | CONFIG_IP_NF_TARGET_REJECT=m |
| 376 | CONFIG_IP_NF_TARGET_LOG=m | 381 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -388,6 +393,7 @@ CONFIG_IP_NF_NAT_FTP=m | |||
| 388 | CONFIG_IP_NF_NAT_TFTP=m | 393 | CONFIG_IP_NF_NAT_TFTP=m |
| 389 | CONFIG_IP_NF_NAT_AMANDA=m | 394 | CONFIG_IP_NF_NAT_AMANDA=m |
| 390 | CONFIG_IP_NF_NAT_PPTP=m | 395 | CONFIG_IP_NF_NAT_PPTP=m |
| 396 | CONFIG_IP_NF_NAT_H323=m | ||
| 391 | CONFIG_IP_NF_MANGLE=m | 397 | CONFIG_IP_NF_MANGLE=m |
| 392 | CONFIG_IP_NF_TARGET_TOS=m | 398 | CONFIG_IP_NF_TARGET_TOS=m |
| 393 | CONFIG_IP_NF_TARGET_ECN=m | 399 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -408,12 +414,10 @@ CONFIG_IP6_NF_MATCH_RT=m | |||
| 408 | CONFIG_IP6_NF_MATCH_OPTS=m | 414 | CONFIG_IP6_NF_MATCH_OPTS=m |
| 409 | CONFIG_IP6_NF_MATCH_FRAG=m | 415 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 410 | CONFIG_IP6_NF_MATCH_HL=m | 416 | CONFIG_IP6_NF_MATCH_HL=m |
| 411 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
| 412 | CONFIG_IP6_NF_MATCH_OWNER=m | 417 | CONFIG_IP6_NF_MATCH_OWNER=m |
| 413 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 418 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 414 | CONFIG_IP6_NF_MATCH_AHESP=m | 419 | CONFIG_IP6_NF_MATCH_AH=m |
| 415 | CONFIG_IP6_NF_MATCH_EUI64=m | 420 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 416 | CONFIG_IP6_NF_MATCH_POLICY=m | ||
| 417 | CONFIG_IP6_NF_FILTER=m | 421 | CONFIG_IP6_NF_FILTER=m |
| 418 | CONFIG_IP6_NF_TARGET_LOG=m | 422 | CONFIG_IP6_NF_TARGET_LOG=m |
| 419 | CONFIG_IP6_NF_TARGET_REJECT=m | 423 | CONFIG_IP6_NF_TARGET_REJECT=m |
| @@ -435,6 +439,11 @@ CONFIG_IP_SCTP=m | |||
| 435 | # CONFIG_SCTP_HMAC_NONE is not set | 439 | # CONFIG_SCTP_HMAC_NONE is not set |
| 436 | # CONFIG_SCTP_HMAC_SHA1 is not set | 440 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 437 | CONFIG_SCTP_HMAC_MD5=y | 441 | CONFIG_SCTP_HMAC_MD5=y |
| 442 | |||
| 443 | # | ||
| 444 | # TIPC Configuration (EXPERIMENTAL) | ||
| 445 | # | ||
| 446 | # CONFIG_TIPC is not set | ||
| 438 | # CONFIG_ATM is not set | 447 | # CONFIG_ATM is not set |
| 439 | # CONFIG_BRIDGE is not set | 448 | # CONFIG_BRIDGE is not set |
| 440 | # CONFIG_VLAN_8021Q is not set | 449 | # CONFIG_VLAN_8021Q is not set |
| @@ -444,11 +453,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 444 | # CONFIG_ATALK is not set | 453 | # CONFIG_ATALK is not set |
| 445 | # CONFIG_X25 is not set | 454 | # CONFIG_X25 is not set |
| 446 | # CONFIG_LAPB is not set | 455 | # CONFIG_LAPB is not set |
| 447 | |||
| 448 | # | ||
| 449 | # TIPC Configuration (EXPERIMENTAL) | ||
| 450 | # | ||
| 451 | # CONFIG_TIPC is not set | ||
| 452 | CONFIG_NET_DIVERT=y | 456 | CONFIG_NET_DIVERT=y |
| 453 | # CONFIG_ECONET is not set | 457 | # CONFIG_ECONET is not set |
| 454 | # CONFIG_WAN_ROUTER is not set | 458 | # CONFIG_WAN_ROUTER is not set |
| @@ -508,6 +512,9 @@ CONFIG_IEEE80211=m | |||
| 508 | # CONFIG_IEEE80211_DEBUG is not set | 512 | # CONFIG_IEEE80211_DEBUG is not set |
| 509 | CONFIG_IEEE80211_CRYPT_WEP=m | 513 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 510 | CONFIG_IEEE80211_CRYPT_CCMP=m | 514 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 515 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 516 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 517 | CONFIG_WIRELESS_EXT=y | ||
| 511 | 518 | ||
| 512 | # | 519 | # |
| 513 | # Device Drivers | 520 | # Device Drivers |
| @@ -546,7 +553,7 @@ CONFIG_CONNECTOR=m | |||
| 546 | # CONFIG_BLK_DEV_LOOP is not set | 553 | # CONFIG_BLK_DEV_LOOP is not set |
| 547 | # CONFIG_BLK_DEV_NBD is not set | 554 | # CONFIG_BLK_DEV_NBD is not set |
| 548 | # CONFIG_BLK_DEV_RAM is not set | 555 | # CONFIG_BLK_DEV_RAM is not set |
| 549 | CONFIG_BLK_DEV_RAM_COUNT=16 | 556 | # CONFIG_BLK_DEV_INITRD is not set |
| 550 | CONFIG_CDROM_PKTCDVD=m | 557 | CONFIG_CDROM_PKTCDVD=m |
| 551 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 558 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 552 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 559 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -812,10 +819,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 812 | # | 819 | # |
| 813 | 820 | ||
| 814 | # | 821 | # |
| 815 | # Multimedia Capabilities Port drivers | ||
| 816 | # | ||
| 817 | |||
| 818 | # | ||
| 819 | # Multimedia devices | 822 | # Multimedia devices |
| 820 | # | 823 | # |
| 821 | # CONFIG_VIDEO_DEV is not set | 824 | # CONFIG_VIDEO_DEV is not set |
| @@ -857,6 +860,7 @@ CONFIG_LOGO_SGI_CLUT224=y | |||
| 857 | # | 860 | # |
| 858 | # CONFIG_USB_ARCH_HAS_HCD is not set | 861 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 859 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 862 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 863 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 860 | 864 | ||
| 861 | # | 865 | # |
| 862 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 866 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,12 +877,30 @@ CONFIG_LOGO_SGI_CLUT224=y | |||
| 873 | # CONFIG_MMC is not set | 877 | # CONFIG_MMC is not set |
| 874 | 878 | ||
| 875 | # | 879 | # |
| 880 | # LED devices | ||
| 881 | # | ||
| 882 | # CONFIG_NEW_LEDS is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # LED drivers | ||
| 886 | # | ||
| 887 | |||
| 888 | # | ||
| 889 | # LED Triggers | ||
| 890 | # | ||
| 891 | |||
| 892 | # | ||
| 876 | # InfiniBand support | 893 | # InfiniBand support |
| 877 | # | 894 | # |
| 878 | 895 | ||
| 879 | # | 896 | # |
| 880 | # SN Devices | 897 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 898 | # | ||
| 899 | |||
| 900 | # | ||
| 901 | # Real Time Clock | ||
| 881 | # | 902 | # |
| 903 | # CONFIG_RTC_CLASS is not set | ||
| 882 | 904 | ||
| 883 | # | 905 | # |
| 884 | # File systems | 906 | # File systems |
| @@ -944,7 +966,6 @@ CONFIG_SYSFS=y | |||
| 944 | # CONFIG_TMPFS is not set | 966 | # CONFIG_TMPFS is not set |
| 945 | # CONFIG_HUGETLB_PAGE is not set | 967 | # CONFIG_HUGETLB_PAGE is not set |
| 946 | CONFIG_RAMFS=y | 968 | CONFIG_RAMFS=y |
| 947 | CONFIG_RELAYFS_FS=m | ||
| 948 | # CONFIG_CONFIGFS_FS is not set | 969 | # CONFIG_CONFIGFS_FS is not set |
| 949 | 970 | ||
| 950 | # | 971 | # |
| @@ -963,7 +984,6 @@ CONFIG_EFS_FS=m | |||
| 963 | # CONFIG_QNX4FS_FS is not set | 984 | # CONFIG_QNX4FS_FS is not set |
| 964 | # CONFIG_SYSV_FS is not set | 985 | # CONFIG_SYSV_FS is not set |
| 965 | CONFIG_UFS_FS=m | 986 | CONFIG_UFS_FS=m |
| 966 | # CONFIG_UFS_FS_WRITE is not set | ||
| 967 | 987 | ||
| 968 | # | 988 | # |
| 969 | # Network File Systems | 989 | # Network File Systems |
| @@ -1078,6 +1098,7 @@ CONFIG_NLS_UTF8=m | |||
| 1078 | # CONFIG_MAGIC_SYSRQ is not set | 1098 | # CONFIG_MAGIC_SYSRQ is not set |
| 1079 | # CONFIG_DEBUG_KERNEL is not set | 1099 | # CONFIG_DEBUG_KERNEL is not set |
| 1080 | CONFIG_LOG_BUF_SHIFT=14 | 1100 | CONFIG_LOG_BUF_SHIFT=14 |
| 1101 | # CONFIG_DEBUG_FS is not set | ||
| 1081 | CONFIG_CROSSCOMPILE=y | 1102 | CONFIG_CROSSCOMPILE=y |
| 1082 | CONFIG_CMDLINE="" | 1103 | CONFIG_CMDLINE="" |
| 1083 | 1104 | ||
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 8c40590737e1..f724b4b2ecf2 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc4 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Tue Feb 21 13:44:31 2006 | 4 | # Mon Apr 24 14:51:04 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -70,6 +70,8 @@ CONFIG_NUMA=y | |||
| 70 | # CONFIG_REPLICATE_KTEXT is not set | 70 | # CONFIG_REPLICATE_KTEXT is not set |
| 71 | # CONFIG_REPLICATE_EXHANDLERS is not set | 71 | # CONFIG_REPLICATE_EXHANDLERS is not set |
| 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 73 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 74 | CONFIG_GENERIC_HWEIGHT=y | ||
| 73 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 75 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 74 | CONFIG_ARC=y | 76 | CONFIG_ARC=y |
| 75 | CONFIG_DMA_IP27=y | 77 | CONFIG_DMA_IP27=y |
| @@ -123,6 +125,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 123 | CONFIG_GENERIC_HARDIRQS=y | 125 | CONFIG_GENERIC_HARDIRQS=y |
| 124 | CONFIG_GENERIC_IRQ_PROBE=y | 126 | CONFIG_GENERIC_IRQ_PROBE=y |
| 125 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 127 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 128 | CONFIG_NODES_SHIFT=6 | ||
| 126 | CONFIG_SELECT_MEMORY_MODEL=y | 129 | CONFIG_SELECT_MEMORY_MODEL=y |
| 127 | # CONFIG_FLATMEM_MANUAL is not set | 130 | # CONFIG_FLATMEM_MANUAL is not set |
| 128 | CONFIG_DISCONTIGMEM_MANUAL=y | 131 | CONFIG_DISCONTIGMEM_MANUAL=y |
| @@ -162,6 +165,7 @@ CONFIG_SYSCTL=y | |||
| 162 | CONFIG_IKCONFIG=y | 165 | CONFIG_IKCONFIG=y |
| 163 | CONFIG_IKCONFIG_PROC=y | 166 | CONFIG_IKCONFIG_PROC=y |
| 164 | CONFIG_CPUSETS=y | 167 | CONFIG_CPUSETS=y |
| 168 | CONFIG_RELAY=y | ||
| 165 | CONFIG_INITRAMFS_SOURCE="" | 169 | CONFIG_INITRAMFS_SOURCE="" |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_EMBEDDED=y | 171 | CONFIG_EMBEDDED=y |
| @@ -175,10 +179,6 @@ CONFIG_BASE_FULL=y | |||
| 175 | CONFIG_FUTEX=y | 179 | CONFIG_FUTEX=y |
| 176 | CONFIG_EPOLL=y | 180 | CONFIG_EPOLL=y |
| 177 | CONFIG_SHMEM=y | 181 | CONFIG_SHMEM=y |
| 178 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 179 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 180 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 181 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 182 | CONFIG_SLAB=y | 182 | CONFIG_SLAB=y |
| 183 | # CONFIG_TINY_SHMEM is not set | 183 | # CONFIG_TINY_SHMEM is not set |
| 184 | CONFIG_BASE_SMALL=0 | 184 | CONFIG_BASE_SMALL=0 |
| @@ -190,7 +190,6 @@ CONFIG_BASE_SMALL=0 | |||
| 190 | CONFIG_MODULES=y | 190 | CONFIG_MODULES=y |
| 191 | CONFIG_MODULE_UNLOAD=y | 191 | CONFIG_MODULE_UNLOAD=y |
| 192 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 192 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 193 | CONFIG_OBSOLETE_MODPARM=y | ||
| 194 | # CONFIG_MODVERSIONS is not set | 193 | # CONFIG_MODVERSIONS is not set |
| 195 | CONFIG_MODULE_SRCVERSION_ALL=y | 194 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 196 | CONFIG_KMOD=y | 195 | CONFIG_KMOD=y |
| @@ -199,6 +198,7 @@ CONFIG_STOP_MACHINE=y | |||
| 199 | # | 198 | # |
| 200 | # Block layer | 199 | # Block layer |
| 201 | # | 200 | # |
| 201 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 202 | 202 | ||
| 203 | # | 203 | # |
| 204 | # IO Schedulers | 204 | # IO Schedulers |
| @@ -219,7 +219,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 219 | CONFIG_HW_HAS_PCI=y | 219 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 220 | CONFIG_PCI=y |
| 221 | CONFIG_PCI_DOMAINS=y | 221 | CONFIG_PCI_DOMAINS=y |
| 222 | CONFIG_PCI_LEGACY_PROC=y | ||
| 223 | CONFIG_MMU=y | 222 | CONFIG_MMU=y |
| 224 | 223 | ||
| 225 | # | 224 | # |
| @@ -237,6 +236,7 @@ CONFIG_MMU=y | |||
| 237 | # | 236 | # |
| 238 | CONFIG_BINFMT_ELF=y | 237 | CONFIG_BINFMT_ELF=y |
| 239 | # CONFIG_BINFMT_MISC is not set | 238 | # CONFIG_BINFMT_MISC is not set |
| 239 | # CONFIG_BUILD_ELF64 is not set | ||
| 240 | CONFIG_MIPS32_COMPAT=y | 240 | CONFIG_MIPS32_COMPAT=y |
| 241 | CONFIG_COMPAT=y | 241 | CONFIG_COMPAT=y |
| 242 | CONFIG_MIPS32_O32=y | 242 | CONFIG_MIPS32_O32=y |
| @@ -274,12 +274,15 @@ CONFIG_IP_PNP=y | |||
| 274 | # CONFIG_INET_AH is not set | 274 | # CONFIG_INET_AH is not set |
| 275 | # CONFIG_INET_ESP is not set | 275 | # CONFIG_INET_ESP is not set |
| 276 | # CONFIG_INET_IPCOMP is not set | 276 | # CONFIG_INET_IPCOMP is not set |
| 277 | CONFIG_INET_TUNNEL=m | 277 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 278 | # CONFIG_INET_TUNNEL is not set | ||
| 278 | CONFIG_INET_DIAG=y | 279 | CONFIG_INET_DIAG=y |
| 279 | CONFIG_INET_TCP_DIAG=y | 280 | CONFIG_INET_TCP_DIAG=y |
| 280 | # CONFIG_TCP_CONG_ADVANCED is not set | 281 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 281 | CONFIG_TCP_CONG_BIC=y | 282 | CONFIG_TCP_CONG_BIC=y |
| 282 | # CONFIG_IPV6 is not set | 283 | # CONFIG_IPV6 is not set |
| 284 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 285 | # CONFIG_INET6_TUNNEL is not set | ||
| 283 | # CONFIG_NETFILTER is not set | 286 | # CONFIG_NETFILTER is not set |
| 284 | 287 | ||
| 285 | # | 288 | # |
| @@ -363,6 +366,9 @@ CONFIG_IEEE80211=m | |||
| 363 | # CONFIG_IEEE80211_DEBUG is not set | 366 | # CONFIG_IEEE80211_DEBUG is not set |
| 364 | CONFIG_IEEE80211_CRYPT_WEP=m | 367 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 365 | CONFIG_IEEE80211_CRYPT_CCMP=m | 368 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 369 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 370 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 371 | CONFIG_WIRELESS_EXT=y | ||
| 366 | 372 | ||
| 367 | # | 373 | # |
| 368 | # Device Drivers | 374 | # Device Drivers |
| @@ -407,7 +413,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
| 407 | # CONFIG_BLK_DEV_NBD is not set | 413 | # CONFIG_BLK_DEV_NBD is not set |
| 408 | # CONFIG_BLK_DEV_SX8 is not set | 414 | # CONFIG_BLK_DEV_SX8 is not set |
| 409 | # CONFIG_BLK_DEV_RAM is not set | 415 | # CONFIG_BLK_DEV_RAM is not set |
| 410 | CONFIG_BLK_DEV_RAM_COUNT=16 | 416 | # CONFIG_BLK_DEV_INITRD is not set |
| 411 | CONFIG_CDROM_PKTCDVD=m | 417 | CONFIG_CDROM_PKTCDVD=m |
| 412 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 418 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 413 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 419 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -473,7 +479,6 @@ CONFIG_SCSI_SAS_ATTRS=m | |||
| 473 | # CONFIG_SCSI_INIA100 is not set | 479 | # CONFIG_SCSI_INIA100 is not set |
| 474 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 480 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 475 | # CONFIG_SCSI_IPR is not set | 481 | # CONFIG_SCSI_IPR is not set |
| 476 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 477 | CONFIG_SCSI_QLOGIC_1280=y | 482 | CONFIG_SCSI_QLOGIC_1280=y |
| 478 | # CONFIG_SCSI_QLA_FC is not set | 483 | # CONFIG_SCSI_QLA_FC is not set |
| 479 | # CONFIG_SCSI_LPFC is not set | 484 | # CONFIG_SCSI_LPFC is not set |
| @@ -491,6 +496,7 @@ CONFIG_MD_RAID0=y | |||
| 491 | CONFIG_MD_RAID1=y | 496 | CONFIG_MD_RAID1=y |
| 492 | CONFIG_MD_RAID10=m | 497 | CONFIG_MD_RAID10=m |
| 493 | CONFIG_MD_RAID5=y | 498 | CONFIG_MD_RAID5=y |
| 499 | CONFIG_MD_RAID5_RESHAPE=y | ||
| 494 | CONFIG_MD_RAID6=m | 500 | CONFIG_MD_RAID6=m |
| 495 | CONFIG_MD_MULTIPATH=m | 501 | CONFIG_MD_MULTIPATH=m |
| 496 | CONFIG_MD_FAULTY=m | 502 | CONFIG_MD_FAULTY=m |
| @@ -654,6 +660,7 @@ CONFIG_SERIO_RAW=m | |||
| 654 | # | 660 | # |
| 655 | CONFIG_SERIAL_8250=y | 661 | CONFIG_SERIAL_8250=y |
| 656 | CONFIG_SERIAL_8250_CONSOLE=y | 662 | CONFIG_SERIAL_8250_CONSOLE=y |
| 663 | CONFIG_SERIAL_8250_PCI=y | ||
| 657 | CONFIG_SERIAL_8250_NR_UARTS=4 | 664 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 658 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 665 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 659 | CONFIG_SERIAL_8250_EXTENDED=y | 666 | CONFIG_SERIAL_8250_EXTENDED=y |
| @@ -727,10 +734,6 @@ CONFIG_SGI_IP27_RTC=y | |||
| 727 | # | 734 | # |
| 728 | 735 | ||
| 729 | # | 736 | # |
| 730 | # Multimedia Capabilities Port drivers | ||
| 731 | # | ||
| 732 | |||
| 733 | # | ||
| 734 | # Multimedia devices | 737 | # Multimedia devices |
| 735 | # | 738 | # |
| 736 | # CONFIG_VIDEO_DEV is not set | 739 | # CONFIG_VIDEO_DEV is not set |
| @@ -755,6 +758,7 @@ CONFIG_SGI_IP27_RTC=y | |||
| 755 | # | 758 | # |
| 756 | CONFIG_USB_ARCH_HAS_HCD=y | 759 | CONFIG_USB_ARCH_HAS_HCD=y |
| 757 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 761 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 758 | # CONFIG_USB is not set | 762 | # CONFIG_USB is not set |
| 759 | 763 | ||
| 760 | # | 764 | # |
| @@ -772,17 +776,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 772 | # CONFIG_MMC is not set | 776 | # CONFIG_MMC is not set |
| 773 | 777 | ||
| 774 | # | 778 | # |
| 779 | # LED devices | ||
| 780 | # | ||
| 781 | # CONFIG_NEW_LEDS is not set | ||
| 782 | |||
| 783 | # | ||
| 784 | # LED drivers | ||
| 785 | # | ||
| 786 | |||
| 787 | # | ||
| 788 | # LED Triggers | ||
| 789 | # | ||
| 790 | |||
| 791 | # | ||
| 775 | # InfiniBand support | 792 | # InfiniBand support |
| 776 | # | 793 | # |
| 777 | # CONFIG_INFINIBAND is not set | 794 | # CONFIG_INFINIBAND is not set |
| 778 | 795 | ||
| 779 | # | 796 | # |
| 780 | # SN Devices | 797 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 781 | # | 798 | # |
| 782 | 799 | ||
| 783 | # | 800 | # |
| 784 | # EDAC - error detection and reporting (RAS) | 801 | # Real Time Clock |
| 785 | # | 802 | # |
| 803 | # CONFIG_RTC_CLASS is not set | ||
| 786 | 804 | ||
| 787 | # | 805 | # |
| 788 | # File systems | 806 | # File systems |
| @@ -840,7 +858,6 @@ CONFIG_SYSFS=y | |||
| 840 | # CONFIG_TMPFS is not set | 858 | # CONFIG_TMPFS is not set |
| 841 | # CONFIG_HUGETLB_PAGE is not set | 859 | # CONFIG_HUGETLB_PAGE is not set |
| 842 | CONFIG_RAMFS=y | 860 | CONFIG_RAMFS=y |
| 843 | CONFIG_RELAYFS_FS=m | ||
| 844 | # CONFIG_CONFIGFS_FS is not set | 861 | # CONFIG_CONFIGFS_FS is not set |
| 845 | 862 | ||
| 846 | # | 863 | # |
| @@ -922,6 +939,7 @@ CONFIG_SGI_PARTITION=y | |||
| 922 | # CONFIG_MAGIC_SYSRQ is not set | 939 | # CONFIG_MAGIC_SYSRQ is not set |
| 923 | # CONFIG_DEBUG_KERNEL is not set | 940 | # CONFIG_DEBUG_KERNEL is not set |
| 924 | CONFIG_LOG_BUF_SHIFT=15 | 941 | CONFIG_LOG_BUF_SHIFT=15 |
| 942 | # CONFIG_DEBUG_FS is not set | ||
| 925 | CONFIG_CROSSCOMPILE=y | 943 | CONFIG_CROSSCOMPILE=y |
| 926 | CONFIG_CMDLINE="" | 944 | CONFIG_CMDLINE="" |
| 927 | 945 | ||
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 7fdcaf51face..8f11d3565b2d 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:09 2006 | 4 | # Mon Apr 24 14:51:05 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_SGI_IP32=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_ARC=y | 70 | CONFIG_ARC=y |
| 69 | CONFIG_DMA_IP32=y | 71 | CONFIG_DMA_IP32=y |
| @@ -142,7 +144,6 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 142 | # Code maturity level options | 144 | # Code maturity level options |
| 143 | # | 145 | # |
| 144 | CONFIG_EXPERIMENTAL=y | 146 | CONFIG_EXPERIMENTAL=y |
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | 147 | CONFIG_BROKEN_ON_SMP=y |
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 148 | 149 | ||
| @@ -159,6 +160,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
| 159 | CONFIG_SYSCTL=y | 160 | CONFIG_SYSCTL=y |
| 160 | # CONFIG_AUDIT is not set | 161 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 162 | # CONFIG_IKCONFIG is not set |
| 163 | CONFIG_RELAY=y | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | 164 | CONFIG_INITRAMFS_SOURCE="" |
| 163 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 164 | CONFIG_EMBEDDED=y | 166 | CONFIG_EMBEDDED=y |
| @@ -172,10 +174,6 @@ CONFIG_BASE_FULL=y | |||
| 172 | CONFIG_FUTEX=y | 174 | CONFIG_FUTEX=y |
| 173 | CONFIG_EPOLL=y | 175 | CONFIG_EPOLL=y |
| 174 | CONFIG_SHMEM=y | 176 | CONFIG_SHMEM=y |
| 175 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 176 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 177 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 178 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 179 | CONFIG_SLAB=y | 177 | CONFIG_SLAB=y |
| 180 | # CONFIG_TINY_SHMEM is not set | 178 | # CONFIG_TINY_SHMEM is not set |
| 181 | CONFIG_BASE_SMALL=0 | 179 | CONFIG_BASE_SMALL=0 |
| @@ -189,6 +187,7 @@ CONFIG_BASE_SMALL=0 | |||
| 189 | # | 187 | # |
| 190 | # Block layer | 188 | # Block layer |
| 191 | # | 189 | # |
| 190 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | 191 | ||
| 193 | # | 192 | # |
| 194 | # IO Schedulers | 193 | # IO Schedulers |
| @@ -208,7 +207,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 208 | # | 207 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| 210 | CONFIG_PCI=y | 209 | CONFIG_PCI=y |
| 211 | CONFIG_PCI_LEGACY_PROC=y | ||
| 212 | CONFIG_MMU=y | 210 | CONFIG_MMU=y |
| 213 | 211 | ||
| 214 | # | 212 | # |
| @@ -226,6 +224,7 @@ CONFIG_MMU=y | |||
| 226 | # | 224 | # |
| 227 | CONFIG_BINFMT_ELF=y | 225 | CONFIG_BINFMT_ELF=y |
| 228 | CONFIG_BINFMT_MISC=y | 226 | CONFIG_BINFMT_MISC=y |
| 227 | # CONFIG_BUILD_ELF64 is not set | ||
| 229 | CONFIG_MIPS32_COMPAT=y | 228 | CONFIG_MIPS32_COMPAT=y |
| 230 | CONFIG_COMPAT=y | 229 | CONFIG_COMPAT=y |
| 231 | CONFIG_MIPS32_O32=y | 230 | CONFIG_MIPS32_O32=y |
| @@ -240,6 +239,7 @@ CONFIG_NET=y | |||
| 240 | # | 239 | # |
| 241 | # Networking options | 240 | # Networking options |
| 242 | # | 241 | # |
| 242 | # CONFIG_NETDEBUG is not set | ||
| 243 | CONFIG_PACKET=y | 243 | CONFIG_PACKET=y |
| 244 | CONFIG_PACKET_MMAP=y | 244 | CONFIG_PACKET_MMAP=y |
| 245 | CONFIG_UNIX=y | 245 | CONFIG_UNIX=y |
| @@ -261,12 +261,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 261 | # CONFIG_INET_AH is not set | 261 | # CONFIG_INET_AH is not set |
| 262 | # CONFIG_INET_ESP is not set | 262 | # CONFIG_INET_ESP is not set |
| 263 | # CONFIG_INET_IPCOMP is not set | 263 | # CONFIG_INET_IPCOMP is not set |
| 264 | CONFIG_INET_TUNNEL=y | 264 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 265 | # CONFIG_INET_TUNNEL is not set | ||
| 265 | CONFIG_INET_DIAG=y | 266 | CONFIG_INET_DIAG=y |
| 266 | CONFIG_INET_TCP_DIAG=y | 267 | CONFIG_INET_TCP_DIAG=y |
| 267 | # CONFIG_TCP_CONG_ADVANCED is not set | 268 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 268 | CONFIG_TCP_CONG_BIC=y | 269 | CONFIG_TCP_CONG_BIC=y |
| 269 | # CONFIG_IPV6 is not set | 270 | # CONFIG_IPV6 is not set |
| 271 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 272 | # CONFIG_INET6_TUNNEL is not set | ||
| 270 | # CONFIG_NETFILTER is not set | 273 | # CONFIG_NETFILTER is not set |
| 271 | 274 | ||
| 272 | # | 275 | # |
| @@ -278,6 +281,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 278 | # SCTP Configuration (EXPERIMENTAL) | 281 | # SCTP Configuration (EXPERIMENTAL) |
| 279 | # | 282 | # |
| 280 | # CONFIG_IP_SCTP is not set | 283 | # CONFIG_IP_SCTP is not set |
| 284 | |||
| 285 | # | ||
| 286 | # TIPC Configuration (EXPERIMENTAL) | ||
| 287 | # | ||
| 288 | # CONFIG_TIPC is not set | ||
| 281 | # CONFIG_ATM is not set | 289 | # CONFIG_ATM is not set |
| 282 | # CONFIG_BRIDGE is not set | 290 | # CONFIG_BRIDGE is not set |
| 283 | # CONFIG_VLAN_8021Q is not set | 291 | # CONFIG_VLAN_8021Q is not set |
| @@ -287,11 +295,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 287 | # CONFIG_ATALK is not set | 295 | # CONFIG_ATALK is not set |
| 288 | # CONFIG_X25 is not set | 296 | # CONFIG_X25 is not set |
| 289 | # CONFIG_LAPB is not set | 297 | # CONFIG_LAPB is not set |
| 290 | |||
| 291 | # | ||
| 292 | # TIPC Configuration (EXPERIMENTAL) | ||
| 293 | # | ||
| 294 | # CONFIG_TIPC is not set | ||
| 295 | # CONFIG_NET_DIVERT is not set | 298 | # CONFIG_NET_DIVERT is not set |
| 296 | # CONFIG_ECONET is not set | 299 | # CONFIG_ECONET is not set |
| 297 | # CONFIG_WAN_ROUTER is not set | 300 | # CONFIG_WAN_ROUTER is not set |
| @@ -312,6 +315,9 @@ CONFIG_IEEE80211=y | |||
| 312 | # CONFIG_IEEE80211_DEBUG is not set | 315 | # CONFIG_IEEE80211_DEBUG is not set |
| 313 | CONFIG_IEEE80211_CRYPT_WEP=y | 316 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 314 | CONFIG_IEEE80211_CRYPT_CCMP=y | 317 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 318 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 319 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 320 | CONFIG_WIRELESS_EXT=y | ||
| 315 | 321 | ||
| 316 | # | 322 | # |
| 317 | # Device Drivers | 323 | # Device Drivers |
| @@ -357,7 +363,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 357 | # CONFIG_BLK_DEV_NBD is not set | 363 | # CONFIG_BLK_DEV_NBD is not set |
| 358 | # CONFIG_BLK_DEV_SX8 is not set | 364 | # CONFIG_BLK_DEV_SX8 is not set |
| 359 | # CONFIG_BLK_DEV_RAM is not set | 365 | # CONFIG_BLK_DEV_RAM is not set |
| 360 | CONFIG_BLK_DEV_RAM_COUNT=16 | 366 | # CONFIG_BLK_DEV_INITRD is not set |
| 361 | CONFIG_CDROM_PKTCDVD=y | 367 | CONFIG_CDROM_PKTCDVD=y |
| 362 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 368 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 363 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 369 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -428,7 +434,6 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 428 | # CONFIG_SCSI_INIA100 is not set | 434 | # CONFIG_SCSI_INIA100 is not set |
| 429 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 435 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 430 | # CONFIG_SCSI_IPR is not set | 436 | # CONFIG_SCSI_IPR is not set |
| 431 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 432 | # CONFIG_SCSI_QLOGIC_1280 is not set | 437 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 433 | # CONFIG_SCSI_QLA_FC is not set | 438 | # CONFIG_SCSI_QLA_FC is not set |
| 434 | # CONFIG_SCSI_LPFC is not set | 439 | # CONFIG_SCSI_LPFC is not set |
| @@ -615,6 +620,7 @@ CONFIG_HW_CONSOLE=y | |||
| 615 | # | 620 | # |
| 616 | CONFIG_SERIAL_8250=y | 621 | CONFIG_SERIAL_8250=y |
| 617 | CONFIG_SERIAL_8250_CONSOLE=y | 622 | CONFIG_SERIAL_8250_CONSOLE=y |
| 623 | CONFIG_SERIAL_8250_PCI=y | ||
| 618 | CONFIG_SERIAL_8250_NR_UARTS=4 | 624 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 619 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 625 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 620 | # CONFIG_SERIAL_8250_EXTENDED is not set | 626 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -624,6 +630,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 624 | # | 630 | # |
| 625 | CONFIG_SERIAL_CORE=y | 631 | CONFIG_SERIAL_CORE=y |
| 626 | CONFIG_SERIAL_CORE_CONSOLE=y | 632 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 633 | # CONFIG_SERIAL_JSM is not set | ||
| 627 | CONFIG_UNIX98_PTYS=y | 634 | CONFIG_UNIX98_PTYS=y |
| 628 | CONFIG_LEGACY_PTYS=y | 635 | CONFIG_LEGACY_PTYS=y |
| 629 | CONFIG_LEGACY_PTY_COUNT=256 | 636 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -682,10 +689,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 682 | # | 689 | # |
| 683 | 690 | ||
| 684 | # | 691 | # |
| 685 | # Multimedia Capabilities Port drivers | ||
| 686 | # | ||
| 687 | |||
| 688 | # | ||
| 689 | # Multimedia devices | 692 | # Multimedia devices |
| 690 | # | 693 | # |
| 691 | # CONFIG_VIDEO_DEV is not set | 694 | # CONFIG_VIDEO_DEV is not set |
| @@ -716,6 +719,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 716 | # | 719 | # |
| 717 | CONFIG_USB_ARCH_HAS_HCD=y | 720 | CONFIG_USB_ARCH_HAS_HCD=y |
| 718 | CONFIG_USB_ARCH_HAS_OHCI=y | 721 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 722 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 719 | # CONFIG_USB is not set | 723 | # CONFIG_USB is not set |
| 720 | 724 | ||
| 721 | # | 725 | # |
| @@ -733,13 +737,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 733 | # CONFIG_MMC is not set | 737 | # CONFIG_MMC is not set |
| 734 | 738 | ||
| 735 | # | 739 | # |
| 740 | # LED devices | ||
| 741 | # | ||
| 742 | # CONFIG_NEW_LEDS is not set | ||
| 743 | |||
| 744 | # | ||
| 745 | # LED drivers | ||
| 746 | # | ||
| 747 | |||
| 748 | # | ||
| 749 | # LED Triggers | ||
| 750 | # | ||
| 751 | |||
| 752 | # | ||
| 736 | # InfiniBand support | 753 | # InfiniBand support |
| 737 | # | 754 | # |
| 738 | # CONFIG_INFINIBAND is not set | 755 | # CONFIG_INFINIBAND is not set |
| 739 | 756 | ||
| 740 | # | 757 | # |
| 741 | # SN Devices | 758 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 759 | # | ||
| 760 | |||
| 761 | # | ||
| 762 | # Real Time Clock | ||
| 742 | # | 763 | # |
| 764 | # CONFIG_RTC_CLASS is not set | ||
| 743 | 765 | ||
| 744 | # | 766 | # |
| 745 | # File systems | 767 | # File systems |
| @@ -784,7 +806,6 @@ CONFIG_SYSFS=y | |||
| 784 | CONFIG_TMPFS=y | 806 | CONFIG_TMPFS=y |
| 785 | # CONFIG_HUGETLB_PAGE is not set | 807 | # CONFIG_HUGETLB_PAGE is not set |
| 786 | CONFIG_RAMFS=y | 808 | CONFIG_RAMFS=y |
| 787 | CONFIG_RELAYFS_FS=y | ||
| 788 | # CONFIG_CONFIGFS_FS is not set | 809 | # CONFIG_CONFIGFS_FS is not set |
| 789 | 810 | ||
| 790 | # | 811 | # |
| @@ -861,6 +882,8 @@ CONFIG_SGI_PARTITION=y | |||
| 861 | # CONFIG_MAGIC_SYSRQ is not set | 882 | # CONFIG_MAGIC_SYSRQ is not set |
| 862 | # CONFIG_DEBUG_KERNEL is not set | 883 | # CONFIG_DEBUG_KERNEL is not set |
| 863 | CONFIG_LOG_BUF_SHIFT=14 | 884 | CONFIG_LOG_BUF_SHIFT=14 |
| 885 | # CONFIG_DEBUG_FS is not set | ||
| 886 | # CONFIG_UNWIND_INFO is not set | ||
| 864 | CONFIG_CROSSCOMPILE=y | 887 | CONFIG_CROSSCOMPILE=y |
| 865 | CONFIG_CMDLINE="" | 888 | CONFIG_CMDLINE="" |
| 866 | 889 | ||
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index c716996d9eca..757adf23853d 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:10 2006 | 4 | # Mon Apr 24 14:51:05 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -65,6 +65,8 @@ CONFIG_MIPS_ITE8172=y | |||
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | # CONFIG_IT8172_REVC is not set | 66 | # CONFIG_IT8172_REVC is not set |
| 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| 70 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -115,7 +117,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 115 | # CONFIG_PAGE_SIZE_16KB is not set | 117 | # CONFIG_PAGE_SIZE_16KB is not set |
| 116 | # CONFIG_PAGE_SIZE_64KB is not set | 118 | # CONFIG_PAGE_SIZE_64KB is not set |
| 117 | # CONFIG_MIPS_MT is not set | 119 | # CONFIG_MIPS_MT is not set |
| 118 | # CONFIG_CPU_ADVANCED is not set | ||
| 119 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
| 120 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -137,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 138 | # Code maturity level options |
| 138 | # | 139 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 143 | ||
| @@ -154,6 +154,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
| 154 | CONFIG_SYSCTL=y | 154 | CONFIG_SYSCTL=y |
| 155 | # CONFIG_AUDIT is not set | 155 | # CONFIG_AUDIT is not set |
| 156 | # CONFIG_IKCONFIG is not set | 156 | # CONFIG_IKCONFIG is not set |
| 157 | CONFIG_RELAY=y | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 159 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -167,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -183,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 183 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 184 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 189 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -192,6 +188,8 @@ CONFIG_KMOD=y | |||
| 192 | # Block layer | 188 | # Block layer |
| 193 | # | 189 | # |
| 194 | # CONFIG_LBD is not set | 190 | # CONFIG_LBD is not set |
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 195 | 193 | ||
| 196 | # | 194 | # |
| 197 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -237,6 +235,7 @@ CONFIG_NET=y | |||
| 237 | # | 235 | # |
| 238 | # Networking options | 236 | # Networking options |
| 239 | # | 237 | # |
| 238 | # CONFIG_NETDEBUG is not set | ||
| 240 | CONFIG_PACKET=y | 239 | CONFIG_PACKET=y |
| 241 | CONFIG_PACKET_MMAP=y | 240 | CONFIG_PACKET_MMAP=y |
| 242 | CONFIG_UNIX=y | 241 | CONFIG_UNIX=y |
| @@ -258,12 +257,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 258 | # CONFIG_INET_AH is not set | 257 | # CONFIG_INET_AH is not set |
| 259 | # CONFIG_INET_ESP is not set | 258 | # CONFIG_INET_ESP is not set |
| 260 | # CONFIG_INET_IPCOMP is not set | 259 | # CONFIG_INET_IPCOMP is not set |
| 261 | CONFIG_INET_TUNNEL=m | 260 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 261 | # CONFIG_INET_TUNNEL is not set | ||
| 262 | CONFIG_INET_DIAG=y | 262 | CONFIG_INET_DIAG=y |
| 263 | CONFIG_INET_TCP_DIAG=y | 263 | CONFIG_INET_TCP_DIAG=y |
| 264 | # CONFIG_TCP_CONG_ADVANCED is not set | 264 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 265 | CONFIG_TCP_CONG_BIC=y | 265 | CONFIG_TCP_CONG_BIC=y |
| 266 | # CONFIG_IPV6 is not set | 266 | # CONFIG_IPV6 is not set |
| 267 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 268 | # CONFIG_INET6_TUNNEL is not set | ||
| 267 | # CONFIG_NETFILTER is not set | 269 | # CONFIG_NETFILTER is not set |
| 268 | 270 | ||
| 269 | # | 271 | # |
| @@ -275,6 +277,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 275 | # SCTP Configuration (EXPERIMENTAL) | 277 | # SCTP Configuration (EXPERIMENTAL) |
| 276 | # | 278 | # |
| 277 | # CONFIG_IP_SCTP is not set | 279 | # CONFIG_IP_SCTP is not set |
| 280 | |||
| 281 | # | ||
| 282 | # TIPC Configuration (EXPERIMENTAL) | ||
| 283 | # | ||
| 284 | # CONFIG_TIPC is not set | ||
| 278 | # CONFIG_ATM is not set | 285 | # CONFIG_ATM is not set |
| 279 | # CONFIG_BRIDGE is not set | 286 | # CONFIG_BRIDGE is not set |
| 280 | # CONFIG_VLAN_8021Q is not set | 287 | # CONFIG_VLAN_8021Q is not set |
| @@ -284,11 +291,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 284 | # CONFIG_ATALK is not set | 291 | # CONFIG_ATALK is not set |
| 285 | # CONFIG_X25 is not set | 292 | # CONFIG_X25 is not set |
| 286 | # CONFIG_LAPB is not set | 293 | # CONFIG_LAPB is not set |
| 287 | |||
| 288 | # | ||
| 289 | # TIPC Configuration (EXPERIMENTAL) | ||
| 290 | # | ||
| 291 | # CONFIG_TIPC is not set | ||
| 292 | # CONFIG_NET_DIVERT is not set | 294 | # CONFIG_NET_DIVERT is not set |
| 293 | # CONFIG_ECONET is not set | 295 | # CONFIG_ECONET is not set |
| 294 | # CONFIG_WAN_ROUTER is not set | 296 | # CONFIG_WAN_ROUTER is not set |
| @@ -309,6 +311,9 @@ CONFIG_IEEE80211=m | |||
| 309 | # CONFIG_IEEE80211_DEBUG is not set | 311 | # CONFIG_IEEE80211_DEBUG is not set |
| 310 | CONFIG_IEEE80211_CRYPT_WEP=m | 312 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 311 | CONFIG_IEEE80211_CRYPT_CCMP=m | 313 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 314 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 315 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 316 | CONFIG_WIRELESS_EXT=y | ||
| 312 | 317 | ||
| 313 | # | 318 | # |
| 314 | # Device Drivers | 319 | # Device Drivers |
| @@ -387,7 +392,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 387 | # CONFIG_MTD_SLRAM is not set | 392 | # CONFIG_MTD_SLRAM is not set |
| 388 | # CONFIG_MTD_PHRAM is not set | 393 | # CONFIG_MTD_PHRAM is not set |
| 389 | # CONFIG_MTD_MTDRAM is not set | 394 | # CONFIG_MTD_MTDRAM is not set |
| 390 | # CONFIG_MTD_BLKMTD is not set | ||
| 391 | # CONFIG_MTD_BLOCK2MTD is not set | 395 | # CONFIG_MTD_BLOCK2MTD is not set |
| 392 | 396 | ||
| 393 | # | 397 | # |
| @@ -424,7 +428,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 424 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 428 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 425 | # CONFIG_BLK_DEV_NBD is not set | 429 | # CONFIG_BLK_DEV_NBD is not set |
| 426 | # CONFIG_BLK_DEV_RAM is not set | 430 | # CONFIG_BLK_DEV_RAM is not set |
| 427 | CONFIG_BLK_DEV_RAM_COUNT=16 | 431 | # CONFIG_BLK_DEV_INITRD is not set |
| 428 | CONFIG_CDROM_PKTCDVD=m | 432 | CONFIG_CDROM_PKTCDVD=m |
| 429 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 433 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 430 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 434 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -666,10 +670,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 666 | # | 670 | # |
| 667 | 671 | ||
| 668 | # | 672 | # |
| 669 | # Multimedia Capabilities Port drivers | ||
| 670 | # | ||
| 671 | |||
| 672 | # | ||
| 673 | # Multimedia devices | 673 | # Multimedia devices |
| 674 | # | 674 | # |
| 675 | # CONFIG_VIDEO_DEV is not set | 675 | # CONFIG_VIDEO_DEV is not set |
| @@ -704,7 +704,6 @@ CONFIG_SOUND=y | |||
| 704 | # Open Sound System | 704 | # Open Sound System |
| 705 | # | 705 | # |
| 706 | CONFIG_SOUND_PRIME=y | 706 | CONFIG_SOUND_PRIME=y |
| 707 | # CONFIG_OBSOLETE_OSS_DRIVER is not set | ||
| 708 | CONFIG_SOUND_IT8172=y | 707 | CONFIG_SOUND_IT8172=y |
| 709 | # CONFIG_SOUND_MSNDCLAS is not set | 708 | # CONFIG_SOUND_MSNDCLAS is not set |
| 710 | # CONFIG_SOUND_MSNDPIN is not set | 709 | # CONFIG_SOUND_MSNDPIN is not set |
| @@ -714,6 +713,7 @@ CONFIG_SOUND_IT8172=y | |||
| 714 | # | 713 | # |
| 715 | # CONFIG_USB_ARCH_HAS_HCD is not set | 714 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 716 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 715 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 716 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 717 | 717 | ||
| 718 | # | 718 | # |
| 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -730,12 +730,30 @@ CONFIG_SOUND_IT8172=y | |||
| 730 | # CONFIG_MMC is not set | 730 | # CONFIG_MMC is not set |
| 731 | 731 | ||
| 732 | # | 732 | # |
| 733 | # LED devices | ||
| 734 | # | ||
| 735 | # CONFIG_NEW_LEDS is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # LED drivers | ||
| 739 | # | ||
| 740 | |||
| 741 | # | ||
| 742 | # LED Triggers | ||
| 743 | # | ||
| 744 | |||
| 745 | # | ||
| 733 | # InfiniBand support | 746 | # InfiniBand support |
| 734 | # | 747 | # |
| 735 | 748 | ||
| 736 | # | 749 | # |
| 737 | # SN Devices | 750 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 751 | # | ||
| 752 | |||
| 753 | # | ||
| 754 | # Real Time Clock | ||
| 738 | # | 755 | # |
| 756 | # CONFIG_RTC_CLASS is not set | ||
| 739 | 757 | ||
| 740 | # | 758 | # |
| 741 | # File systems | 759 | # File systems |
| @@ -780,7 +798,6 @@ CONFIG_SYSFS=y | |||
| 780 | # CONFIG_TMPFS is not set | 798 | # CONFIG_TMPFS is not set |
| 781 | # CONFIG_HUGETLB_PAGE is not set | 799 | # CONFIG_HUGETLB_PAGE is not set |
| 782 | CONFIG_RAMFS=y | 800 | CONFIG_RAMFS=y |
| 783 | CONFIG_RELAYFS_FS=m | ||
| 784 | # CONFIG_CONFIGFS_FS is not set | 801 | # CONFIG_CONFIGFS_FS is not set |
| 785 | 802 | ||
| 786 | # | 803 | # |
| @@ -846,6 +863,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 846 | # CONFIG_MAGIC_SYSRQ is not set | 863 | # CONFIG_MAGIC_SYSRQ is not set |
| 847 | # CONFIG_DEBUG_KERNEL is not set | 864 | # CONFIG_DEBUG_KERNEL is not set |
| 848 | CONFIG_LOG_BUF_SHIFT=14 | 865 | CONFIG_LOG_BUF_SHIFT=14 |
| 866 | # CONFIG_DEBUG_FS is not set | ||
| 849 | CONFIG_CROSSCOMPILE=y | 867 | CONFIG_CROSSCOMPILE=y |
| 850 | CONFIG_CMDLINE="" | 868 | CONFIG_CMDLINE="" |
| 851 | 869 | ||
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index a8376d125e11..021761a8a237 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:11 2006 | 4 | # Mon Apr 24 14:51:06 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_IVR=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -112,7 +114,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 112 | # CONFIG_PAGE_SIZE_16KB is not set | 114 | # CONFIG_PAGE_SIZE_16KB is not set |
| 113 | # CONFIG_PAGE_SIZE_64KB is not set | 115 | # CONFIG_PAGE_SIZE_64KB is not set |
| 114 | # CONFIG_MIPS_MT is not set | 116 | # CONFIG_MIPS_MT is not set |
| 115 | # CONFIG_CPU_ADVANCED is not set | ||
| 116 | CONFIG_CPU_HAS_LLSC=y | 117 | CONFIG_CPU_HAS_LLSC=y |
| 117 | CONFIG_CPU_HAS_SYNC=y | 118 | CONFIG_CPU_HAS_SYNC=y |
| 118 | CONFIG_GENERIC_HARDIRQS=y | 119 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -134,7 +135,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 134 | # Code maturity level options | 135 | # Code maturity level options |
| 135 | # | 136 | # |
| 136 | CONFIG_EXPERIMENTAL=y | 137 | CONFIG_EXPERIMENTAL=y |
| 137 | CONFIG_CLEAN_COMPILE=y | ||
| 138 | CONFIG_BROKEN_ON_SMP=y | 138 | CONFIG_BROKEN_ON_SMP=y |
| 139 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 139 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 140 | 140 | ||
| @@ -151,6 +151,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
| 151 | CONFIG_SYSCTL=y | 151 | CONFIG_SYSCTL=y |
| 152 | # CONFIG_AUDIT is not set | 152 | # CONFIG_AUDIT is not set |
| 153 | # CONFIG_IKCONFIG is not set | 153 | # CONFIG_IKCONFIG is not set |
| 154 | CONFIG_RELAY=y | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | 155 | CONFIG_INITRAMFS_SOURCE="" |
| 155 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 156 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 156 | CONFIG_EMBEDDED=y | 157 | CONFIG_EMBEDDED=y |
| @@ -164,10 +165,6 @@ CONFIG_BASE_FULL=y | |||
| 164 | CONFIG_FUTEX=y | 165 | CONFIG_FUTEX=y |
| 165 | CONFIG_EPOLL=y | 166 | CONFIG_EPOLL=y |
| 166 | CONFIG_SHMEM=y | 167 | CONFIG_SHMEM=y |
| 167 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 168 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 169 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 170 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 171 | CONFIG_SLAB=y | 168 | CONFIG_SLAB=y |
| 172 | # CONFIG_TINY_SHMEM is not set | 169 | # CONFIG_TINY_SHMEM is not set |
| 173 | CONFIG_BASE_SMALL=0 | 170 | CONFIG_BASE_SMALL=0 |
| @@ -179,7 +176,6 @@ CONFIG_BASE_SMALL=0 | |||
| 179 | CONFIG_MODULES=y | 176 | CONFIG_MODULES=y |
| 180 | CONFIG_MODULE_UNLOAD=y | 177 | CONFIG_MODULE_UNLOAD=y |
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 178 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | 179 | CONFIG_MODVERSIONS=y |
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | 180 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 185 | CONFIG_KMOD=y | 181 | CONFIG_KMOD=y |
| @@ -188,6 +184,8 @@ CONFIG_KMOD=y | |||
| 188 | # Block layer | 184 | # Block layer |
| 189 | # | 185 | # |
| 190 | # CONFIG_LBD is not set | 186 | # CONFIG_LBD is not set |
| 187 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 188 | # CONFIG_LSF is not set | ||
| 191 | 189 | ||
| 192 | # | 190 | # |
| 193 | # IO Schedulers | 191 | # IO Schedulers |
| @@ -207,7 +205,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 207 | # | 205 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 206 | CONFIG_HW_HAS_PCI=y |
| 209 | CONFIG_PCI=y | 207 | CONFIG_PCI=y |
| 210 | CONFIG_PCI_LEGACY_PROC=y | ||
| 211 | CONFIG_MMU=y | 208 | CONFIG_MMU=y |
| 212 | 209 | ||
| 213 | # | 210 | # |
| @@ -235,6 +232,7 @@ CONFIG_NET=y | |||
| 235 | # | 232 | # |
| 236 | # Networking options | 233 | # Networking options |
| 237 | # | 234 | # |
| 235 | # CONFIG_NETDEBUG is not set | ||
| 238 | CONFIG_PACKET=y | 236 | CONFIG_PACKET=y |
| 239 | CONFIG_PACKET_MMAP=y | 237 | CONFIG_PACKET_MMAP=y |
| 240 | CONFIG_UNIX=y | 238 | CONFIG_UNIX=y |
| @@ -256,12 +254,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 256 | # CONFIG_INET_AH is not set | 254 | # CONFIG_INET_AH is not set |
| 257 | # CONFIG_INET_ESP is not set | 255 | # CONFIG_INET_ESP is not set |
| 258 | # CONFIG_INET_IPCOMP is not set | 256 | # CONFIG_INET_IPCOMP is not set |
| 259 | CONFIG_INET_TUNNEL=m | 257 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 258 | # CONFIG_INET_TUNNEL is not set | ||
| 260 | CONFIG_INET_DIAG=y | 259 | CONFIG_INET_DIAG=y |
| 261 | CONFIG_INET_TCP_DIAG=y | 260 | CONFIG_INET_TCP_DIAG=y |
| 262 | # CONFIG_TCP_CONG_ADVANCED is not set | 261 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 263 | CONFIG_TCP_CONG_BIC=y | 262 | CONFIG_TCP_CONG_BIC=y |
| 264 | # CONFIG_IPV6 is not set | 263 | # CONFIG_IPV6 is not set |
| 264 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 265 | # CONFIG_INET6_TUNNEL is not set | ||
| 265 | # CONFIG_NETFILTER is not set | 266 | # CONFIG_NETFILTER is not set |
| 266 | 267 | ||
| 267 | # | 268 | # |
| @@ -273,6 +274,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 273 | # SCTP Configuration (EXPERIMENTAL) | 274 | # SCTP Configuration (EXPERIMENTAL) |
| 274 | # | 275 | # |
| 275 | # CONFIG_IP_SCTP is not set | 276 | # CONFIG_IP_SCTP is not set |
| 277 | |||
| 278 | # | ||
| 279 | # TIPC Configuration (EXPERIMENTAL) | ||
| 280 | # | ||
| 281 | # CONFIG_TIPC is not set | ||
| 276 | # CONFIG_ATM is not set | 282 | # CONFIG_ATM is not set |
| 277 | # CONFIG_BRIDGE is not set | 283 | # CONFIG_BRIDGE is not set |
| 278 | # CONFIG_VLAN_8021Q is not set | 284 | # CONFIG_VLAN_8021Q is not set |
| @@ -282,11 +288,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 282 | # CONFIG_ATALK is not set | 288 | # CONFIG_ATALK is not set |
| 283 | # CONFIG_X25 is not set | 289 | # CONFIG_X25 is not set |
| 284 | # CONFIG_LAPB is not set | 290 | # CONFIG_LAPB is not set |
| 285 | |||
| 286 | # | ||
| 287 | # TIPC Configuration (EXPERIMENTAL) | ||
| 288 | # | ||
| 289 | # CONFIG_TIPC is not set | ||
| 290 | # CONFIG_NET_DIVERT is not set | 291 | # CONFIG_NET_DIVERT is not set |
| 291 | # CONFIG_ECONET is not set | 292 | # CONFIG_ECONET is not set |
| 292 | # CONFIG_WAN_ROUTER is not set | 293 | # CONFIG_WAN_ROUTER is not set |
| @@ -307,6 +308,9 @@ CONFIG_IEEE80211=m | |||
| 307 | # CONFIG_IEEE80211_DEBUG is not set | 308 | # CONFIG_IEEE80211_DEBUG is not set |
| 308 | CONFIG_IEEE80211_CRYPT_WEP=m | 309 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 309 | CONFIG_IEEE80211_CRYPT_CCMP=m | 310 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 311 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 312 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 313 | CONFIG_WIRELESS_EXT=y | ||
| 310 | 314 | ||
| 311 | # | 315 | # |
| 312 | # Device Drivers | 316 | # Device Drivers |
| @@ -350,7 +354,7 @@ CONFIG_CONNECTOR=m | |||
| 350 | # CONFIG_BLK_DEV_NBD is not set | 354 | # CONFIG_BLK_DEV_NBD is not set |
| 351 | # CONFIG_BLK_DEV_SX8 is not set | 355 | # CONFIG_BLK_DEV_SX8 is not set |
| 352 | # CONFIG_BLK_DEV_RAM is not set | 356 | # CONFIG_BLK_DEV_RAM is not set |
| 353 | CONFIG_BLK_DEV_RAM_COUNT=16 | 357 | # CONFIG_BLK_DEV_INITRD is not set |
| 354 | CONFIG_CDROM_PKTCDVD=m | 358 | CONFIG_CDROM_PKTCDVD=m |
| 355 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 359 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 356 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 360 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -565,6 +569,7 @@ CONFIG_IT8172_SCR1=y | |||
| 565 | # | 569 | # |
| 566 | CONFIG_SERIAL_8250=y | 570 | CONFIG_SERIAL_8250=y |
| 567 | CONFIG_SERIAL_8250_CONSOLE=y | 571 | CONFIG_SERIAL_8250_CONSOLE=y |
| 572 | CONFIG_SERIAL_8250_PCI=y | ||
| 568 | CONFIG_SERIAL_8250_NR_UARTS=4 | 573 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 569 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 574 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 570 | # CONFIG_SERIAL_8250_EXTENDED is not set | 575 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -574,6 +579,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 574 | # | 579 | # |
| 575 | CONFIG_SERIAL_CORE=y | 580 | CONFIG_SERIAL_CORE=y |
| 576 | CONFIG_SERIAL_CORE_CONSOLE=y | 581 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 582 | # CONFIG_SERIAL_JSM is not set | ||
| 577 | CONFIG_UNIX98_PTYS=y | 583 | CONFIG_UNIX98_PTYS=y |
| 578 | CONFIG_LEGACY_PTYS=y | 584 | CONFIG_LEGACY_PTYS=y |
| 579 | CONFIG_LEGACY_PTY_COUNT=256 | 585 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -631,10 +637,6 @@ CONFIG_RTC=y | |||
| 631 | # | 637 | # |
| 632 | 638 | ||
| 633 | # | 639 | # |
| 634 | # Multimedia Capabilities Port drivers | ||
| 635 | # | ||
| 636 | |||
| 637 | # | ||
| 638 | # Multimedia devices | 640 | # Multimedia devices |
| 639 | # | 641 | # |
| 640 | # CONFIG_VIDEO_DEV is not set | 642 | # CONFIG_VIDEO_DEV is not set |
| @@ -665,6 +667,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 665 | # | 667 | # |
| 666 | CONFIG_USB_ARCH_HAS_HCD=y | 668 | CONFIG_USB_ARCH_HAS_HCD=y |
| 667 | CONFIG_USB_ARCH_HAS_OHCI=y | 669 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 670 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 668 | # CONFIG_USB is not set | 671 | # CONFIG_USB is not set |
| 669 | 672 | ||
| 670 | # | 673 | # |
| @@ -682,13 +685,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 682 | # CONFIG_MMC is not set | 685 | # CONFIG_MMC is not set |
| 683 | 686 | ||
| 684 | # | 687 | # |
| 688 | # LED devices | ||
| 689 | # | ||
| 690 | # CONFIG_NEW_LEDS is not set | ||
| 691 | |||
| 692 | # | ||
| 693 | # LED drivers | ||
| 694 | # | ||
| 695 | |||
| 696 | # | ||
| 697 | # LED Triggers | ||
| 698 | # | ||
| 699 | |||
| 700 | # | ||
| 685 | # InfiniBand support | 701 | # InfiniBand support |
| 686 | # | 702 | # |
| 687 | # CONFIG_INFINIBAND is not set | 703 | # CONFIG_INFINIBAND is not set |
| 688 | 704 | ||
| 689 | # | 705 | # |
| 690 | # SN Devices | 706 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 707 | # | ||
| 708 | |||
| 709 | # | ||
| 710 | # Real Time Clock | ||
| 691 | # | 711 | # |
| 712 | # CONFIG_RTC_CLASS is not set | ||
| 692 | 713 | ||
| 693 | # | 714 | # |
| 694 | # File systems | 715 | # File systems |
| @@ -733,7 +754,6 @@ CONFIG_SYSFS=y | |||
| 733 | # CONFIG_TMPFS is not set | 754 | # CONFIG_TMPFS is not set |
| 734 | # CONFIG_HUGETLB_PAGE is not set | 755 | # CONFIG_HUGETLB_PAGE is not set |
| 735 | CONFIG_RAMFS=y | 756 | CONFIG_RAMFS=y |
| 736 | CONFIG_RELAYFS_FS=m | ||
| 737 | # CONFIG_CONFIGFS_FS is not set | 757 | # CONFIG_CONFIGFS_FS is not set |
| 738 | 758 | ||
| 739 | # | 759 | # |
| @@ -797,6 +817,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 797 | # CONFIG_MAGIC_SYSRQ is not set | 817 | # CONFIG_MAGIC_SYSRQ is not set |
| 798 | # CONFIG_DEBUG_KERNEL is not set | 818 | # CONFIG_DEBUG_KERNEL is not set |
| 799 | CONFIG_LOG_BUF_SHIFT=14 | 819 | CONFIG_LOG_BUF_SHIFT=14 |
| 820 | # CONFIG_DEBUG_FS is not set | ||
| 800 | CONFIG_CROSSCOMPILE=y | 821 | CONFIG_CROSSCOMPILE=y |
| 801 | CONFIG_CMDLINE="" | 822 | CONFIG_CMDLINE="" |
| 802 | 823 | ||
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index 316015379dbc..08f6c30b0abc 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:12 2006 | 4 | # Mon Apr 24 14:51:06 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -65,6 +65,8 @@ CONFIG_MOMENCO_JAGUAR_ATX=y | |||
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_JAGUAR_DMALOW=y | 66 | CONFIG_JAGUAR_DMALOW=y |
| 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| 70 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -122,7 +124,6 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 122 | CONFIG_CPU_HAS_PREFETCH=y | 124 | CONFIG_CPU_HAS_PREFETCH=y |
| 123 | # CONFIG_MIPS_MT is not set | 125 | # CONFIG_MIPS_MT is not set |
| 124 | # CONFIG_64BIT_PHYS_ADDR is not set | 126 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 125 | # CONFIG_CPU_ADVANCED is not set | ||
| 126 | CONFIG_CPU_HAS_LLSC=y | 127 | CONFIG_CPU_HAS_LLSC=y |
| 127 | CONFIG_CPU_HAS_SYNC=y | 128 | CONFIG_CPU_HAS_SYNC=y |
| 128 | CONFIG_GENERIC_HARDIRQS=y | 129 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -144,7 +145,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 144 | # Code maturity level options | 145 | # Code maturity level options |
| 145 | # | 146 | # |
| 146 | # CONFIG_EXPERIMENTAL is not set | 147 | # CONFIG_EXPERIMENTAL is not set |
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | 148 | CONFIG_BROKEN_ON_SMP=y |
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 150 | 150 | ||
| @@ -160,6 +160,7 @@ CONFIG_SYSCTL=y | |||
| 160 | # CONFIG_AUDIT is not set | 160 | # CONFIG_AUDIT is not set |
| 161 | CONFIG_IKCONFIG=y | 161 | CONFIG_IKCONFIG=y |
| 162 | CONFIG_IKCONFIG_PROC=y | 162 | CONFIG_IKCONFIG_PROC=y |
| 163 | CONFIG_RELAY=y | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | 164 | CONFIG_INITRAMFS_SOURCE="" |
| 164 | CONFIG_EMBEDDED=y | 165 | CONFIG_EMBEDDED=y |
| 165 | CONFIG_KALLSYMS=y | 166 | CONFIG_KALLSYMS=y |
| @@ -172,10 +173,6 @@ CONFIG_BASE_FULL=y | |||
| 172 | CONFIG_FUTEX=y | 173 | CONFIG_FUTEX=y |
| 173 | CONFIG_EPOLL=y | 174 | CONFIG_EPOLL=y |
| 174 | CONFIG_SHMEM=y | 175 | CONFIG_SHMEM=y |
| 175 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 176 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 177 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 178 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 179 | CONFIG_SLAB=y | 176 | CONFIG_SLAB=y |
| 180 | # CONFIG_TINY_SHMEM is not set | 177 | # CONFIG_TINY_SHMEM is not set |
| 181 | CONFIG_BASE_SMALL=0 | 178 | CONFIG_BASE_SMALL=0 |
| @@ -186,7 +183,6 @@ CONFIG_BASE_SMALL=0 | |||
| 186 | # | 183 | # |
| 187 | CONFIG_MODULES=y | 184 | CONFIG_MODULES=y |
| 188 | CONFIG_MODULE_UNLOAD=y | 185 | CONFIG_MODULE_UNLOAD=y |
| 189 | CONFIG_OBSOLETE_MODPARM=y | ||
| 190 | # CONFIG_MODVERSIONS is not set | 186 | # CONFIG_MODVERSIONS is not set |
| 191 | CONFIG_MODULE_SRCVERSION_ALL=y | 187 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 192 | CONFIG_KMOD=y | 188 | CONFIG_KMOD=y |
| @@ -195,6 +191,8 @@ CONFIG_KMOD=y | |||
| 195 | # Block layer | 191 | # Block layer |
| 196 | # | 192 | # |
| 197 | # CONFIG_LBD is not set | 193 | # CONFIG_LBD is not set |
| 194 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 195 | # CONFIG_LSF is not set | ||
| 198 | 196 | ||
| 199 | # | 197 | # |
| 200 | # IO Schedulers | 198 | # IO Schedulers |
| @@ -214,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 214 | # | 212 | # |
| 215 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| 216 | CONFIG_PCI=y | 214 | CONFIG_PCI=y |
| 217 | CONFIG_PCI_LEGACY_PROC=y | ||
| 218 | CONFIG_MMU=y | 215 | CONFIG_MMU=y |
| 219 | 216 | ||
| 220 | # | 217 | # |
| @@ -241,6 +238,7 @@ CONFIG_NET=y | |||
| 241 | # | 238 | # |
| 242 | # Networking options | 239 | # Networking options |
| 243 | # | 240 | # |
| 241 | # CONFIG_NETDEBUG is not set | ||
| 244 | # CONFIG_PACKET is not set | 242 | # CONFIG_PACKET is not set |
| 245 | CONFIG_UNIX=y | 243 | CONFIG_UNIX=y |
| 246 | CONFIG_XFRM=y | 244 | CONFIG_XFRM=y |
| @@ -260,16 +258,19 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 260 | # CONFIG_INET_AH is not set | 258 | # CONFIG_INET_AH is not set |
| 261 | # CONFIG_INET_ESP is not set | 259 | # CONFIG_INET_ESP is not set |
| 262 | # CONFIG_INET_IPCOMP is not set | 260 | # CONFIG_INET_IPCOMP is not set |
| 263 | CONFIG_INET_TUNNEL=m | 261 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 262 | # CONFIG_INET_TUNNEL is not set | ||
| 264 | CONFIG_INET_DIAG=y | 263 | CONFIG_INET_DIAG=y |
| 265 | CONFIG_INET_TCP_DIAG=y | 264 | CONFIG_INET_TCP_DIAG=y |
| 266 | # CONFIG_TCP_CONG_ADVANCED is not set | 265 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 267 | CONFIG_TCP_CONG_BIC=y | 266 | CONFIG_TCP_CONG_BIC=y |
| 268 | CONFIG_IPV6=m | 267 | CONFIG_IPV6=m |
| 269 | CONFIG_IPV6_PRIVACY=y | 268 | CONFIG_IPV6_PRIVACY=y |
| 269 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 270 | CONFIG_INET6_AH=m | 270 | CONFIG_INET6_AH=m |
| 271 | CONFIG_INET6_ESP=m | 271 | CONFIG_INET6_ESP=m |
| 272 | CONFIG_INET6_IPCOMP=m | 272 | CONFIG_INET6_IPCOMP=m |
| 273 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 273 | CONFIG_INET6_TUNNEL=m | 274 | CONFIG_INET6_TUNNEL=m |
| 274 | CONFIG_IPV6_TUNNEL=m | 275 | CONFIG_IPV6_TUNNEL=m |
| 275 | # CONFIG_NETFILTER is not set | 276 | # CONFIG_NETFILTER is not set |
| @@ -338,10 +339,9 @@ CONFIG_CONNECTOR=m | |||
| 338 | # CONFIG_BLK_DEV_NBD is not set | 339 | # CONFIG_BLK_DEV_NBD is not set |
| 339 | # CONFIG_BLK_DEV_SX8 is not set | 340 | # CONFIG_BLK_DEV_SX8 is not set |
| 340 | # CONFIG_BLK_DEV_RAM is not set | 341 | # CONFIG_BLK_DEV_RAM is not set |
| 341 | CONFIG_BLK_DEV_RAM_COUNT=16 | 342 | # CONFIG_BLK_DEV_INITRD is not set |
| 342 | CONFIG_CDROM_PKTCDVD=m | 343 | CONFIG_CDROM_PKTCDVD=m |
| 343 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 344 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 344 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
| 345 | CONFIG_ATA_OVER_ETH=m | 345 | CONFIG_ATA_OVER_ETH=m |
| 346 | 346 | ||
| 347 | # | 347 | # |
| @@ -423,6 +423,7 @@ CONFIG_NET_PCI=y | |||
| 423 | # CONFIG_PCNET32 is not set | 423 | # CONFIG_PCNET32 is not set |
| 424 | # CONFIG_AMD8111_ETH is not set | 424 | # CONFIG_AMD8111_ETH is not set |
| 425 | # CONFIG_ADAPTEC_STARFIRE is not set | 425 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 426 | # CONFIG_FORCEDETH is not set | ||
| 426 | # CONFIG_DGRS is not set | 427 | # CONFIG_DGRS is not set |
| 427 | CONFIG_EEPRO100=y | 428 | CONFIG_EEPRO100=y |
| 428 | # CONFIG_E100 is not set | 429 | # CONFIG_E100 is not set |
| @@ -446,6 +447,7 @@ CONFIG_EEPRO100=y | |||
| 446 | # CONFIG_HAMACHI is not set | 447 | # CONFIG_HAMACHI is not set |
| 447 | # CONFIG_R8169 is not set | 448 | # CONFIG_R8169 is not set |
| 448 | # CONFIG_SIS190 is not set | 449 | # CONFIG_SIS190 is not set |
| 450 | # CONFIG_SKGE is not set | ||
| 449 | # CONFIG_SK98LIN is not set | 451 | # CONFIG_SK98LIN is not set |
| 450 | # CONFIG_VIA_VELOCITY is not set | 452 | # CONFIG_VIA_VELOCITY is not set |
| 451 | # CONFIG_TIGON3 is not set | 453 | # CONFIG_TIGON3 is not set |
| @@ -514,6 +516,7 @@ CONFIG_MV643XX_ETH_2=y | |||
| 514 | # | 516 | # |
| 515 | CONFIG_SERIAL_8250=y | 517 | CONFIG_SERIAL_8250=y |
| 516 | CONFIG_SERIAL_8250_CONSOLE=y | 518 | CONFIG_SERIAL_8250_CONSOLE=y |
| 519 | CONFIG_SERIAL_8250_PCI=y | ||
| 517 | CONFIG_SERIAL_8250_NR_UARTS=4 | 520 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 518 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 521 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 519 | # CONFIG_SERIAL_8250_EXTENDED is not set | 522 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -523,6 +526,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 523 | # | 526 | # |
| 524 | CONFIG_SERIAL_CORE=y | 527 | CONFIG_SERIAL_CORE=y |
| 525 | CONFIG_SERIAL_CORE_CONSOLE=y | 528 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 529 | # CONFIG_SERIAL_JSM is not set | ||
| 526 | CONFIG_UNIX98_PTYS=y | 530 | CONFIG_UNIX98_PTYS=y |
| 527 | CONFIG_LEGACY_PTYS=y | 531 | CONFIG_LEGACY_PTYS=y |
| 528 | CONFIG_LEGACY_PTY_COUNT=256 | 532 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -579,10 +583,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 579 | # | 583 | # |
| 580 | 584 | ||
| 581 | # | 585 | # |
| 582 | # Multimedia Capabilities Port drivers | ||
| 583 | # | ||
| 584 | |||
| 585 | # | ||
| 586 | # Multimedia devices | 586 | # Multimedia devices |
| 587 | # | 587 | # |
| 588 | # CONFIG_VIDEO_DEV is not set | 588 | # CONFIG_VIDEO_DEV is not set |
| @@ -607,6 +607,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 607 | # | 607 | # |
| 608 | CONFIG_USB_ARCH_HAS_HCD=y | 608 | CONFIG_USB_ARCH_HAS_HCD=y |
| 609 | CONFIG_USB_ARCH_HAS_OHCI=y | 609 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 610 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 610 | # CONFIG_USB is not set | 611 | # CONFIG_USB is not set |
| 611 | 612 | ||
| 612 | # | 613 | # |
| @@ -624,12 +625,29 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 624 | # CONFIG_MMC is not set | 625 | # CONFIG_MMC is not set |
| 625 | 626 | ||
| 626 | # | 627 | # |
| 628 | # LED devices | ||
| 629 | # | ||
| 630 | # CONFIG_NEW_LEDS is not set | ||
| 631 | |||
| 632 | # | ||
| 633 | # LED drivers | ||
| 634 | # | ||
| 635 | |||
| 636 | # | ||
| 637 | # LED Triggers | ||
| 638 | # | ||
| 639 | |||
| 640 | # | ||
| 627 | # InfiniBand support | 641 | # InfiniBand support |
| 628 | # | 642 | # |
| 629 | # CONFIG_INFINIBAND is not set | 643 | # CONFIG_INFINIBAND is not set |
| 630 | 644 | ||
| 631 | # | 645 | # |
| 632 | # SN Devices | 646 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 647 | # | ||
| 648 | |||
| 649 | # | ||
| 650 | # Real Time Clock | ||
| 633 | # | 651 | # |
| 634 | 652 | ||
| 635 | # | 653 | # |
| @@ -672,7 +690,6 @@ CONFIG_SYSFS=y | |||
| 672 | # CONFIG_TMPFS is not set | 690 | # CONFIG_TMPFS is not set |
| 673 | # CONFIG_HUGETLB_PAGE is not set | 691 | # CONFIG_HUGETLB_PAGE is not set |
| 674 | CONFIG_RAMFS=y | 692 | CONFIG_RAMFS=y |
| 675 | CONFIG_RELAYFS_FS=m | ||
| 676 | 693 | ||
| 677 | # | 694 | # |
| 678 | # Miscellaneous filesystems | 695 | # Miscellaneous filesystems |
| @@ -718,6 +735,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 718 | # CONFIG_MAGIC_SYSRQ is not set | 735 | # CONFIG_MAGIC_SYSRQ is not set |
| 719 | # CONFIG_DEBUG_KERNEL is not set | 736 | # CONFIG_DEBUG_KERNEL is not set |
| 720 | CONFIG_LOG_BUF_SHIFT=14 | 737 | CONFIG_LOG_BUF_SHIFT=14 |
| 738 | # CONFIG_DEBUG_FS is not set | ||
| 721 | CONFIG_CROSSCOMPILE=y | 739 | CONFIG_CROSSCOMPILE=y |
| 722 | CONFIG_CMDLINE="" | 740 | CONFIG_CMDLINE="" |
| 723 | 741 | ||
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 53fbef1ac25d..38b1e026e10d 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:13 2006 | 4 | # Mon Apr 24 14:51:07 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_TOSHIBA_JMR3927=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -111,7 +113,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 111 | # CONFIG_PAGE_SIZE_16KB is not set | 113 | # CONFIG_PAGE_SIZE_16KB is not set |
| 112 | # CONFIG_PAGE_SIZE_64KB is not set | 114 | # CONFIG_PAGE_SIZE_64KB is not set |
| 113 | # CONFIG_MIPS_MT is not set | 115 | # CONFIG_MIPS_MT is not set |
| 114 | # CONFIG_CPU_ADVANCED is not set | ||
| 115 | CONFIG_CPU_HAS_SYNC=y | 116 | CONFIG_CPU_HAS_SYNC=y |
| 116 | CONFIG_GENERIC_HARDIRQS=y | 117 | CONFIG_GENERIC_HARDIRQS=y |
| 117 | CONFIG_GENERIC_IRQ_PROBE=y | 118 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -133,7 +134,6 @@ CONFIG_RTC_DS1742=y | |||
| 133 | # Code maturity level options | 134 | # Code maturity level options |
| 134 | # | 135 | # |
| 135 | CONFIG_EXPERIMENTAL=y | 136 | CONFIG_EXPERIMENTAL=y |
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | 137 | CONFIG_BROKEN_ON_SMP=y |
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 139 | 139 | ||
| @@ -149,6 +149,7 @@ CONFIG_SYSVIPC=y | |||
| 149 | CONFIG_SYSCTL=y | 149 | CONFIG_SYSCTL=y |
| 150 | # CONFIG_AUDIT is not set | 150 | # CONFIG_AUDIT is not set |
| 151 | # CONFIG_IKCONFIG is not set | 151 | # CONFIG_IKCONFIG is not set |
| 152 | CONFIG_RELAY=y | ||
| 152 | CONFIG_INITRAMFS_SOURCE="" | 153 | CONFIG_INITRAMFS_SOURCE="" |
| 153 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 154 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 154 | CONFIG_EMBEDDED=y | 155 | CONFIG_EMBEDDED=y |
| @@ -162,10 +163,6 @@ CONFIG_BASE_FULL=y | |||
| 162 | CONFIG_FUTEX=y | 163 | CONFIG_FUTEX=y |
| 163 | CONFIG_EPOLL=y | 164 | CONFIG_EPOLL=y |
| 164 | CONFIG_SHMEM=y | 165 | CONFIG_SHMEM=y |
| 165 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 166 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 167 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 168 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 169 | CONFIG_SLAB=y | 166 | CONFIG_SLAB=y |
| 170 | # CONFIG_TINY_SHMEM is not set | 167 | # CONFIG_TINY_SHMEM is not set |
| 171 | CONFIG_BASE_SMALL=0 | 168 | CONFIG_BASE_SMALL=0 |
| @@ -180,6 +177,8 @@ CONFIG_BASE_SMALL=0 | |||
| 180 | # Block layer | 177 | # Block layer |
| 181 | # | 178 | # |
| 182 | # CONFIG_LBD is not set | 179 | # CONFIG_LBD is not set |
| 180 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 181 | # CONFIG_LSF is not set | ||
| 183 | 182 | ||
| 184 | # | 183 | # |
| 185 | # IO Schedulers | 184 | # IO Schedulers |
| @@ -199,7 +198,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 199 | # | 198 | # |
| 200 | CONFIG_HW_HAS_PCI=y | 199 | CONFIG_HW_HAS_PCI=y |
| 201 | CONFIG_PCI=y | 200 | CONFIG_PCI=y |
| 202 | CONFIG_PCI_LEGACY_PROC=y | ||
| 203 | CONFIG_MMU=y | 201 | CONFIG_MMU=y |
| 204 | 202 | ||
| 205 | # | 203 | # |
| @@ -227,6 +225,7 @@ CONFIG_NET=y | |||
| 227 | # | 225 | # |
| 228 | # Networking options | 226 | # Networking options |
| 229 | # | 227 | # |
| 228 | # CONFIG_NETDEBUG is not set | ||
| 230 | CONFIG_PACKET=y | 229 | CONFIG_PACKET=y |
| 231 | # CONFIG_PACKET_MMAP is not set | 230 | # CONFIG_PACKET_MMAP is not set |
| 232 | CONFIG_UNIX=y | 231 | CONFIG_UNIX=y |
| @@ -248,12 +247,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 248 | # CONFIG_INET_AH is not set | 247 | # CONFIG_INET_AH is not set |
| 249 | # CONFIG_INET_ESP is not set | 248 | # CONFIG_INET_ESP is not set |
| 250 | # CONFIG_INET_IPCOMP is not set | 249 | # CONFIG_INET_IPCOMP is not set |
| 251 | CONFIG_INET_TUNNEL=y | 250 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 251 | # CONFIG_INET_TUNNEL is not set | ||
| 252 | CONFIG_INET_DIAG=y | 252 | CONFIG_INET_DIAG=y |
| 253 | CONFIG_INET_TCP_DIAG=y | 253 | CONFIG_INET_TCP_DIAG=y |
| 254 | # CONFIG_TCP_CONG_ADVANCED is not set | 254 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 255 | CONFIG_TCP_CONG_BIC=y | 255 | CONFIG_TCP_CONG_BIC=y |
| 256 | # CONFIG_IPV6 is not set | 256 | # CONFIG_IPV6 is not set |
| 257 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 258 | # CONFIG_INET6_TUNNEL is not set | ||
| 257 | # CONFIG_NETFILTER is not set | 259 | # CONFIG_NETFILTER is not set |
| 258 | 260 | ||
| 259 | # | 261 | # |
| @@ -265,6 +267,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 265 | # SCTP Configuration (EXPERIMENTAL) | 267 | # SCTP Configuration (EXPERIMENTAL) |
| 266 | # | 268 | # |
| 267 | # CONFIG_IP_SCTP is not set | 269 | # CONFIG_IP_SCTP is not set |
| 270 | |||
| 271 | # | ||
| 272 | # TIPC Configuration (EXPERIMENTAL) | ||
| 273 | # | ||
| 274 | # CONFIG_TIPC is not set | ||
| 268 | # CONFIG_ATM is not set | 275 | # CONFIG_ATM is not set |
| 269 | # CONFIG_BRIDGE is not set | 276 | # CONFIG_BRIDGE is not set |
| 270 | # CONFIG_VLAN_8021Q is not set | 277 | # CONFIG_VLAN_8021Q is not set |
| @@ -274,11 +281,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 274 | # CONFIG_ATALK is not set | 281 | # CONFIG_ATALK is not set |
| 275 | # CONFIG_X25 is not set | 282 | # CONFIG_X25 is not set |
| 276 | # CONFIG_LAPB is not set | 283 | # CONFIG_LAPB is not set |
| 277 | |||
| 278 | # | ||
| 279 | # TIPC Configuration (EXPERIMENTAL) | ||
| 280 | # | ||
| 281 | # CONFIG_TIPC is not set | ||
| 282 | # CONFIG_NET_DIVERT is not set | 284 | # CONFIG_NET_DIVERT is not set |
| 283 | # CONFIG_ECONET is not set | 285 | # CONFIG_ECONET is not set |
| 284 | # CONFIG_WAN_ROUTER is not set | 286 | # CONFIG_WAN_ROUTER is not set |
| @@ -299,6 +301,9 @@ CONFIG_IEEE80211=y | |||
| 299 | # CONFIG_IEEE80211_DEBUG is not set | 301 | # CONFIG_IEEE80211_DEBUG is not set |
| 300 | CONFIG_IEEE80211_CRYPT_WEP=y | 302 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 301 | CONFIG_IEEE80211_CRYPT_CCMP=y | 303 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 304 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 305 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 306 | CONFIG_WIRELESS_EXT=y | ||
| 302 | 307 | ||
| 303 | # | 308 | # |
| 304 | # Device Drivers | 309 | # Device Drivers |
| @@ -343,7 +348,7 @@ CONFIG_PROC_EVENTS=y | |||
| 343 | # CONFIG_BLK_DEV_NBD is not set | 348 | # CONFIG_BLK_DEV_NBD is not set |
| 344 | # CONFIG_BLK_DEV_SX8 is not set | 349 | # CONFIG_BLK_DEV_SX8 is not set |
| 345 | # CONFIG_BLK_DEV_RAM is not set | 350 | # CONFIG_BLK_DEV_RAM is not set |
| 346 | CONFIG_BLK_DEV_RAM_COUNT=16 | 351 | # CONFIG_BLK_DEV_INITRD is not set |
| 347 | CONFIG_CDROM_PKTCDVD=y | 352 | CONFIG_CDROM_PKTCDVD=y |
| 348 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 353 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 349 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 354 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -551,7 +556,12 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 551 | # | 556 | # |
| 552 | # Non-8250 serial port support | 557 | # Non-8250 serial port support |
| 553 | # | 558 | # |
| 559 | CONFIG_SERIAL_CORE=y | ||
| 560 | CONFIG_SERIAL_TXX9=y | ||
| 554 | CONFIG_HAS_TXX9_SERIAL=y | 561 | CONFIG_HAS_TXX9_SERIAL=y |
| 562 | # CONFIG_SERIAL_TXX9_CONSOLE is not set | ||
| 563 | # CONFIG_SERIAL_TXX9_STDSERIAL is not set | ||
| 564 | # CONFIG_SERIAL_JSM is not set | ||
| 555 | # CONFIG_UNIX98_PTYS is not set | 565 | # CONFIG_UNIX98_PTYS is not set |
| 556 | CONFIG_LEGACY_PTYS=y | 566 | CONFIG_LEGACY_PTYS=y |
| 557 | CONFIG_LEGACY_PTY_COUNT=256 | 567 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -610,10 +620,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 610 | # | 620 | # |
| 611 | 621 | ||
| 612 | # | 622 | # |
| 613 | # Multimedia Capabilities Port drivers | ||
| 614 | # | ||
| 615 | |||
| 616 | # | ||
| 617 | # Multimedia devices | 623 | # Multimedia devices |
| 618 | # | 624 | # |
| 619 | # CONFIG_VIDEO_DEV is not set | 625 | # CONFIG_VIDEO_DEV is not set |
| @@ -631,6 +637,7 @@ CONFIG_FB=y | |||
| 631 | # CONFIG_FB_CFB_COPYAREA is not set | 637 | # CONFIG_FB_CFB_COPYAREA is not set |
| 632 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 638 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| 633 | # CONFIG_FB_MACMODES is not set | 639 | # CONFIG_FB_MACMODES is not set |
| 640 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 634 | # CONFIG_FB_MODE_HELPERS is not set | 641 | # CONFIG_FB_MODE_HELPERS is not set |
| 635 | # CONFIG_FB_TILEBLITTING is not set | 642 | # CONFIG_FB_TILEBLITTING is not set |
| 636 | # CONFIG_FB_CIRRUS is not set | 643 | # CONFIG_FB_CIRRUS is not set |
| @@ -642,7 +649,6 @@ CONFIG_FB=y | |||
| 642 | # CONFIG_FB_NVIDIA is not set | 649 | # CONFIG_FB_NVIDIA is not set |
| 643 | # CONFIG_FB_RIVA is not set | 650 | # CONFIG_FB_RIVA is not set |
| 644 | # CONFIG_FB_MATROX is not set | 651 | # CONFIG_FB_MATROX is not set |
| 645 | # CONFIG_FB_RADEON_OLD is not set | ||
| 646 | # CONFIG_FB_RADEON is not set | 652 | # CONFIG_FB_RADEON is not set |
| 647 | # CONFIG_FB_ATY128 is not set | 653 | # CONFIG_FB_ATY128 is not set |
| 648 | # CONFIG_FB_ATY is not set | 654 | # CONFIG_FB_ATY is not set |
| @@ -679,6 +685,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 679 | # | 685 | # |
| 680 | CONFIG_USB_ARCH_HAS_HCD=y | 686 | CONFIG_USB_ARCH_HAS_HCD=y |
| 681 | CONFIG_USB_ARCH_HAS_OHCI=y | 687 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 688 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 682 | # CONFIG_USB is not set | 689 | # CONFIG_USB is not set |
| 683 | 690 | ||
| 684 | # | 691 | # |
| @@ -696,13 +703,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 696 | # CONFIG_MMC is not set | 703 | # CONFIG_MMC is not set |
| 697 | 704 | ||
| 698 | # | 705 | # |
| 706 | # LED devices | ||
| 707 | # | ||
| 708 | # CONFIG_NEW_LEDS is not set | ||
| 709 | |||
| 710 | # | ||
| 711 | # LED drivers | ||
| 712 | # | ||
| 713 | |||
| 714 | # | ||
| 715 | # LED Triggers | ||
| 716 | # | ||
| 717 | |||
| 718 | # | ||
| 699 | # InfiniBand support | 719 | # InfiniBand support |
| 700 | # | 720 | # |
| 701 | # CONFIG_INFINIBAND is not set | 721 | # CONFIG_INFINIBAND is not set |
| 702 | 722 | ||
| 703 | # | 723 | # |
| 704 | # SN Devices | 724 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 725 | # | ||
| 726 | |||
| 727 | # | ||
| 728 | # Real Time Clock | ||
| 705 | # | 729 | # |
| 730 | # CONFIG_RTC_CLASS is not set | ||
| 706 | 731 | ||
| 707 | # | 732 | # |
| 708 | # File systems | 733 | # File systems |
| @@ -745,7 +770,6 @@ CONFIG_SYSFS=y | |||
| 745 | # CONFIG_TMPFS is not set | 770 | # CONFIG_TMPFS is not set |
| 746 | # CONFIG_HUGETLB_PAGE is not set | 771 | # CONFIG_HUGETLB_PAGE is not set |
| 747 | CONFIG_RAMFS=y | 772 | CONFIG_RAMFS=y |
| 748 | CONFIG_RELAYFS_FS=y | ||
| 749 | # CONFIG_CONFIGFS_FS is not set | 773 | # CONFIG_CONFIGFS_FS is not set |
| 750 | 774 | ||
| 751 | # | 775 | # |
| @@ -809,6 +833,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 809 | # CONFIG_MAGIC_SYSRQ is not set | 833 | # CONFIG_MAGIC_SYSRQ is not set |
| 810 | # CONFIG_DEBUG_KERNEL is not set | 834 | # CONFIG_DEBUG_KERNEL is not set |
| 811 | CONFIG_LOG_BUF_SHIFT=14 | 835 | CONFIG_LOG_BUF_SHIFT=14 |
| 836 | # CONFIG_DEBUG_FS is not set | ||
| 837 | # CONFIG_UNWIND_INFO is not set | ||
| 812 | CONFIG_CROSSCOMPILE=y | 838 | CONFIG_CROSSCOMPILE=y |
| 813 | CONFIG_CMDLINE="" | 839 | CONFIG_CMDLINE="" |
| 814 | 840 | ||
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index ef0fa9fc79d6..4d25990a0a05 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:14 2006 | 4 | # Mon Apr 24 14:51:07 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -68,6 +68,8 @@ CONFIG_PICVUE_PROC=y | |||
| 68 | CONFIG_DS1603=y | 68 | CONFIG_DS1603=y |
| 69 | CONFIG_LASAT_SYSCTL=y | 69 | CONFIG_LASAT_SYSCTL=y |
| 70 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 70 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 71 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 72 | CONFIG_GENERIC_HWEIGHT=y | ||
| 71 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 73 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 72 | CONFIG_DMA_NONCOHERENT=y | 74 | CONFIG_DMA_NONCOHERENT=y |
| 73 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 75 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -119,7 +121,6 @@ CONFIG_BOARD_SCACHE=y | |||
| 119 | CONFIG_R5000_CPU_SCACHE=y | 121 | CONFIG_R5000_CPU_SCACHE=y |
| 120 | # CONFIG_MIPS_MT is not set | 122 | # CONFIG_MIPS_MT is not set |
| 121 | # CONFIG_64BIT_PHYS_ADDR is not set | 123 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 122 | # CONFIG_CPU_ADVANCED is not set | ||
| 123 | CONFIG_CPU_HAS_LLSC=y | 124 | CONFIG_CPU_HAS_LLSC=y |
| 124 | CONFIG_CPU_HAS_SYNC=y | 125 | CONFIG_CPU_HAS_SYNC=y |
| 125 | CONFIG_GENERIC_HARDIRQS=y | 126 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -141,7 +142,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 141 | # Code maturity level options | 142 | # Code maturity level options |
| 142 | # | 143 | # |
| 143 | CONFIG_EXPERIMENTAL=y | 144 | CONFIG_EXPERIMENTAL=y |
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | 145 | CONFIG_BROKEN_ON_SMP=y |
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 147 | 147 | ||
| @@ -157,6 +157,7 @@ CONFIG_SYSVIPC=y | |||
| 157 | CONFIG_SYSCTL=y | 157 | CONFIG_SYSCTL=y |
| 158 | # CONFIG_AUDIT is not set | 158 | # CONFIG_AUDIT is not set |
| 159 | # CONFIG_IKCONFIG is not set | 159 | # CONFIG_IKCONFIG is not set |
| 160 | CONFIG_RELAY=y | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | 161 | CONFIG_INITRAMFS_SOURCE="" |
| 161 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 162 | CONFIG_EMBEDDED=y | 163 | CONFIG_EMBEDDED=y |
| @@ -170,10 +171,6 @@ CONFIG_BASE_FULL=y | |||
| 170 | CONFIG_FUTEX=y | 171 | CONFIG_FUTEX=y |
| 171 | CONFIG_EPOLL=y | 172 | CONFIG_EPOLL=y |
| 172 | CONFIG_SHMEM=y | 173 | CONFIG_SHMEM=y |
| 173 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 174 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 175 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 176 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 177 | CONFIG_SLAB=y | 174 | CONFIG_SLAB=y |
| 178 | # CONFIG_TINY_SHMEM is not set | 175 | # CONFIG_TINY_SHMEM is not set |
| 179 | CONFIG_BASE_SMALL=0 | 176 | CONFIG_BASE_SMALL=0 |
| @@ -186,7 +183,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 186 | CONFIG_MODULES=y | 183 | CONFIG_MODULES=y |
| 187 | CONFIG_MODULE_UNLOAD=y | 184 | CONFIG_MODULE_UNLOAD=y |
| 188 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 189 | CONFIG_OBSOLETE_MODPARM=y | ||
| 190 | CONFIG_MODVERSIONS=y | 186 | CONFIG_MODVERSIONS=y |
| 191 | CONFIG_MODULE_SRCVERSION_ALL=y | 187 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 192 | CONFIG_KMOD=y | 188 | CONFIG_KMOD=y |
| @@ -195,6 +191,8 @@ CONFIG_KMOD=y | |||
| 195 | # Block layer | 191 | # Block layer |
| 196 | # | 192 | # |
| 197 | # CONFIG_LBD is not set | 193 | # CONFIG_LBD is not set |
| 194 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 195 | # CONFIG_LSF is not set | ||
| 198 | 196 | ||
| 199 | # | 197 | # |
| 200 | # IO Schedulers | 198 | # IO Schedulers |
| @@ -214,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 214 | # | 212 | # |
| 215 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| 216 | CONFIG_PCI=y | 214 | CONFIG_PCI=y |
| 217 | CONFIG_PCI_LEGACY_PROC=y | ||
| 218 | CONFIG_MMU=y | 215 | CONFIG_MMU=y |
| 219 | 216 | ||
| 220 | # | 217 | # |
| @@ -242,6 +239,7 @@ CONFIG_NET=y | |||
| 242 | # | 239 | # |
| 243 | # Networking options | 240 | # Networking options |
| 244 | # | 241 | # |
| 242 | # CONFIG_NETDEBUG is not set | ||
| 245 | # CONFIG_PACKET is not set | 243 | # CONFIG_PACKET is not set |
| 246 | CONFIG_UNIX=y | 244 | CONFIG_UNIX=y |
| 247 | CONFIG_XFRM=y | 245 | CONFIG_XFRM=y |
| @@ -259,12 +257,15 @@ CONFIG_IP_FIB_HASH=y | |||
| 259 | # CONFIG_INET_AH is not set | 257 | # CONFIG_INET_AH is not set |
| 260 | # CONFIG_INET_ESP is not set | 258 | # CONFIG_INET_ESP is not set |
| 261 | # CONFIG_INET_IPCOMP is not set | 259 | # CONFIG_INET_IPCOMP is not set |
| 262 | CONFIG_INET_TUNNEL=m | 260 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 261 | # CONFIG_INET_TUNNEL is not set | ||
| 263 | CONFIG_INET_DIAG=y | 262 | CONFIG_INET_DIAG=y |
| 264 | CONFIG_INET_TCP_DIAG=y | 263 | CONFIG_INET_TCP_DIAG=y |
| 265 | # CONFIG_TCP_CONG_ADVANCED is not set | 264 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 266 | CONFIG_TCP_CONG_BIC=y | 265 | CONFIG_TCP_CONG_BIC=y |
| 267 | # CONFIG_IPV6 is not set | 266 | # CONFIG_IPV6 is not set |
| 267 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 268 | # CONFIG_INET6_TUNNEL is not set | ||
| 268 | # CONFIG_NETFILTER is not set | 269 | # CONFIG_NETFILTER is not set |
| 269 | 270 | ||
| 270 | # | 271 | # |
| @@ -276,6 +277,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 276 | # SCTP Configuration (EXPERIMENTAL) | 277 | # SCTP Configuration (EXPERIMENTAL) |
| 277 | # | 278 | # |
| 278 | # CONFIG_IP_SCTP is not set | 279 | # CONFIG_IP_SCTP is not set |
| 280 | |||
| 281 | # | ||
| 282 | # TIPC Configuration (EXPERIMENTAL) | ||
| 283 | # | ||
| 284 | # CONFIG_TIPC is not set | ||
| 279 | # CONFIG_ATM is not set | 285 | # CONFIG_ATM is not set |
| 280 | # CONFIG_BRIDGE is not set | 286 | # CONFIG_BRIDGE is not set |
| 281 | # CONFIG_VLAN_8021Q is not set | 287 | # CONFIG_VLAN_8021Q is not set |
| @@ -285,11 +291,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 285 | # CONFIG_ATALK is not set | 291 | # CONFIG_ATALK is not set |
| 286 | # CONFIG_X25 is not set | 292 | # CONFIG_X25 is not set |
| 287 | # CONFIG_LAPB is not set | 293 | # CONFIG_LAPB is not set |
| 288 | |||
| 289 | # | ||
| 290 | # TIPC Configuration (EXPERIMENTAL) | ||
| 291 | # | ||
| 292 | # CONFIG_TIPC is not set | ||
| 293 | # CONFIG_NET_DIVERT is not set | 294 | # CONFIG_NET_DIVERT is not set |
| 294 | # CONFIG_ECONET is not set | 295 | # CONFIG_ECONET is not set |
| 295 | # CONFIG_WAN_ROUTER is not set | 296 | # CONFIG_WAN_ROUTER is not set |
| @@ -310,6 +311,9 @@ CONFIG_IEEE80211=m | |||
| 310 | # CONFIG_IEEE80211_DEBUG is not set | 311 | # CONFIG_IEEE80211_DEBUG is not set |
| 311 | CONFIG_IEEE80211_CRYPT_WEP=m | 312 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 312 | CONFIG_IEEE80211_CRYPT_CCMP=m | 313 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 314 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 315 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 316 | CONFIG_WIRELESS_EXT=y | ||
| 313 | 317 | ||
| 314 | # | 318 | # |
| 315 | # Device Drivers | 319 | # Device Drivers |
| @@ -366,7 +370,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 366 | # CONFIG_MTD_CFI_I8 is not set | 370 | # CONFIG_MTD_CFI_I8 is not set |
| 367 | # CONFIG_MTD_CFI_INTELEXT is not set | 371 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 368 | CONFIG_MTD_CFI_AMDSTD=y | 372 | CONFIG_MTD_CFI_AMDSTD=y |
| 369 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 370 | # CONFIG_MTD_CFI_STAA is not set | 373 | # CONFIG_MTD_CFI_STAA is not set |
| 371 | CONFIG_MTD_CFI_UTIL=y | 374 | CONFIG_MTD_CFI_UTIL=y |
| 372 | # CONFIG_MTD_RAM is not set | 375 | # CONFIG_MTD_RAM is not set |
| @@ -389,7 +392,6 @@ CONFIG_MTD_LASAT=y | |||
| 389 | # CONFIG_MTD_SLRAM is not set | 392 | # CONFIG_MTD_SLRAM is not set |
| 390 | # CONFIG_MTD_PHRAM is not set | 393 | # CONFIG_MTD_PHRAM is not set |
| 391 | # CONFIG_MTD_MTDRAM is not set | 394 | # CONFIG_MTD_MTDRAM is not set |
| 392 | # CONFIG_MTD_BLKMTD is not set | ||
| 393 | # CONFIG_MTD_BLOCK2MTD is not set | 395 | # CONFIG_MTD_BLOCK2MTD is not set |
| 394 | 396 | ||
| 395 | # | 397 | # |
| @@ -430,7 +432,7 @@ CONFIG_MTD_LASAT=y | |||
| 430 | # CONFIG_BLK_DEV_NBD is not set | 432 | # CONFIG_BLK_DEV_NBD is not set |
| 431 | # CONFIG_BLK_DEV_SX8 is not set | 433 | # CONFIG_BLK_DEV_SX8 is not set |
| 432 | # CONFIG_BLK_DEV_RAM is not set | 434 | # CONFIG_BLK_DEV_RAM is not set |
| 433 | CONFIG_BLK_DEV_RAM_COUNT=16 | 435 | # CONFIG_BLK_DEV_INITRD is not set |
| 434 | CONFIG_CDROM_PKTCDVD=m | 436 | CONFIG_CDROM_PKTCDVD=m |
| 435 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 437 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 436 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 438 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -672,6 +674,7 @@ CONFIG_HW_CONSOLE=y | |||
| 672 | # | 674 | # |
| 673 | CONFIG_SERIAL_8250=y | 675 | CONFIG_SERIAL_8250=y |
| 674 | CONFIG_SERIAL_8250_CONSOLE=y | 676 | CONFIG_SERIAL_8250_CONSOLE=y |
| 677 | CONFIG_SERIAL_8250_PCI=y | ||
| 675 | CONFIG_SERIAL_8250_NR_UARTS=4 | 678 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 676 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 679 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 677 | # CONFIG_SERIAL_8250_EXTENDED is not set | 680 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -681,6 +684,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 681 | # | 684 | # |
| 682 | CONFIG_SERIAL_CORE=y | 685 | CONFIG_SERIAL_CORE=y |
| 683 | CONFIG_SERIAL_CORE_CONSOLE=y | 686 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 687 | # CONFIG_SERIAL_JSM is not set | ||
| 684 | CONFIG_UNIX98_PTYS=y | 688 | CONFIG_UNIX98_PTYS=y |
| 685 | CONFIG_LEGACY_PTYS=y | 689 | CONFIG_LEGACY_PTYS=y |
| 686 | CONFIG_LEGACY_PTY_COUNT=256 | 690 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -739,10 +743,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 739 | # | 743 | # |
| 740 | 744 | ||
| 741 | # | 745 | # |
| 742 | # Multimedia Capabilities Port drivers | ||
| 743 | # | ||
| 744 | |||
| 745 | # | ||
| 746 | # Multimedia devices | 746 | # Multimedia devices |
| 747 | # | 747 | # |
| 748 | # CONFIG_VIDEO_DEV is not set | 748 | # CONFIG_VIDEO_DEV is not set |
| @@ -773,6 +773,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 773 | # | 773 | # |
| 774 | CONFIG_USB_ARCH_HAS_HCD=y | 774 | CONFIG_USB_ARCH_HAS_HCD=y |
| 775 | CONFIG_USB_ARCH_HAS_OHCI=y | 775 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 776 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 776 | # CONFIG_USB is not set | 777 | # CONFIG_USB is not set |
| 777 | 778 | ||
| 778 | # | 779 | # |
| @@ -790,13 +791,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 790 | # CONFIG_MMC is not set | 791 | # CONFIG_MMC is not set |
| 791 | 792 | ||
| 792 | # | 793 | # |
| 794 | # LED devices | ||
| 795 | # | ||
| 796 | # CONFIG_NEW_LEDS is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # LED drivers | ||
| 800 | # | ||
| 801 | |||
| 802 | # | ||
| 803 | # LED Triggers | ||
| 804 | # | ||
| 805 | |||
| 806 | # | ||
| 793 | # InfiniBand support | 807 | # InfiniBand support |
| 794 | # | 808 | # |
| 795 | # CONFIG_INFINIBAND is not set | 809 | # CONFIG_INFINIBAND is not set |
| 796 | 810 | ||
| 797 | # | 811 | # |
| 798 | # SN Devices | 812 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 813 | # | ||
| 814 | |||
| 815 | # | ||
| 816 | # Real Time Clock | ||
| 799 | # | 817 | # |
| 818 | # CONFIG_RTC_CLASS is not set | ||
| 800 | 819 | ||
| 801 | # | 820 | # |
| 802 | # File systems | 821 | # File systems |
| @@ -847,7 +866,6 @@ CONFIG_SYSFS=y | |||
| 847 | # CONFIG_TMPFS is not set | 866 | # CONFIG_TMPFS is not set |
| 848 | # CONFIG_HUGETLB_PAGE is not set | 867 | # CONFIG_HUGETLB_PAGE is not set |
| 849 | CONFIG_RAMFS=y | 868 | CONFIG_RAMFS=y |
| 850 | CONFIG_RELAYFS_FS=m | ||
| 851 | # CONFIG_CONFIGFS_FS is not set | 869 | # CONFIG_CONFIGFS_FS is not set |
| 852 | 870 | ||
| 853 | # | 871 | # |
| @@ -914,6 +932,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 914 | # CONFIG_MAGIC_SYSRQ is not set | 932 | # CONFIG_MAGIC_SYSRQ is not set |
| 915 | # CONFIG_DEBUG_KERNEL is not set | 933 | # CONFIG_DEBUG_KERNEL is not set |
| 916 | CONFIG_LOG_BUF_SHIFT=14 | 934 | CONFIG_LOG_BUF_SHIFT=14 |
| 935 | # CONFIG_DEBUG_FS is not set | ||
| 917 | CONFIG_CROSSCOMPILE=y | 936 | CONFIG_CROSSCOMPILE=y |
| 918 | CONFIG_CMDLINE="" | 937 | CONFIG_CMDLINE="" |
| 919 | 938 | ||
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 367d279efdd9..977f52be51dc 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:15 2006 | 4 | # Mon Apr 24 14:51:08 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_MALTA=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 70 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| @@ -128,16 +130,21 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 128 | # CONFIG_PAGE_SIZE_64KB is not set | 130 | # CONFIG_PAGE_SIZE_64KB is not set |
| 129 | CONFIG_CPU_HAS_PREFETCH=y | 131 | CONFIG_CPU_HAS_PREFETCH=y |
| 130 | CONFIG_MIPS_MT=y | 132 | CONFIG_MIPS_MT=y |
| 133 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 131 | # CONFIG_MIPS_MT_SMP is not set | 134 | # CONFIG_MIPS_MT_SMP is not set |
| 132 | CONFIG_MIPS_VPE_LOADER=y | 135 | CONFIG_MIPS_VPE_LOADER=y |
| 136 | CONFIG_MIPS_MT_FPAFF=y | ||
| 133 | CONFIG_MIPS_VPE_LOADER_TOM=y | 137 | CONFIG_MIPS_VPE_LOADER_TOM=y |
| 134 | CONFIG_MIPS_VPE_APSP_API=y | 138 | CONFIG_MIPS_VPE_APSP_API=y |
| 139 | CONFIG_MIPS_APSP_KSPD=y | ||
| 135 | # CONFIG_64BIT_PHYS_ADDR is not set | 140 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 136 | # CONFIG_CPU_ADVANCED is not set | ||
| 137 | CONFIG_CPU_HAS_LLSC=y | 141 | CONFIG_CPU_HAS_LLSC=y |
| 142 | # CONFIG_CPU_MIPSR2_IRQ_VI is not set | ||
| 143 | # CONFIG_CPU_MIPSR2_IRQ_EI is not set | ||
| 138 | CONFIG_CPU_HAS_SYNC=y | 144 | CONFIG_CPU_HAS_SYNC=y |
| 139 | CONFIG_GENERIC_HARDIRQS=y | 145 | CONFIG_GENERIC_HARDIRQS=y |
| 140 | CONFIG_GENERIC_IRQ_PROBE=y | 146 | CONFIG_GENERIC_IRQ_PROBE=y |
| 147 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 141 | CONFIG_ARCH_FLATMEM_ENABLE=y | 148 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 142 | CONFIG_SELECT_MEMORY_MODEL=y | 149 | CONFIG_SELECT_MEMORY_MODEL=y |
| 143 | CONFIG_FLATMEM_MANUAL=y | 150 | CONFIG_FLATMEM_MANUAL=y |
| @@ -155,7 +162,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 155 | # Code maturity level options | 162 | # Code maturity level options |
| 156 | # | 163 | # |
| 157 | CONFIG_EXPERIMENTAL=y | 164 | CONFIG_EXPERIMENTAL=y |
| 158 | CONFIG_CLEAN_COMPILE=y | ||
| 159 | CONFIG_BROKEN_ON_SMP=y | 165 | CONFIG_BROKEN_ON_SMP=y |
| 160 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 166 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 161 | 167 | ||
| @@ -171,6 +177,7 @@ CONFIG_SYSVIPC=y | |||
| 171 | CONFIG_SYSCTL=y | 177 | CONFIG_SYSCTL=y |
| 172 | # CONFIG_AUDIT is not set | 178 | # CONFIG_AUDIT is not set |
| 173 | # CONFIG_IKCONFIG is not set | 179 | # CONFIG_IKCONFIG is not set |
| 180 | CONFIG_RELAY=y | ||
| 174 | CONFIG_INITRAMFS_SOURCE="" | 181 | CONFIG_INITRAMFS_SOURCE="" |
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 182 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 176 | CONFIG_EMBEDDED=y | 183 | CONFIG_EMBEDDED=y |
| @@ -184,10 +191,6 @@ CONFIG_BASE_FULL=y | |||
| 184 | CONFIG_FUTEX=y | 191 | CONFIG_FUTEX=y |
| 185 | CONFIG_EPOLL=y | 192 | CONFIG_EPOLL=y |
| 186 | CONFIG_SHMEM=y | 193 | CONFIG_SHMEM=y |
| 187 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 188 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 189 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 190 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 191 | CONFIG_SLAB=y | 194 | CONFIG_SLAB=y |
| 192 | # CONFIG_TINY_SHMEM is not set | 195 | # CONFIG_TINY_SHMEM is not set |
| 193 | CONFIG_BASE_SMALL=0 | 196 | CONFIG_BASE_SMALL=0 |
| @@ -199,7 +202,6 @@ CONFIG_BASE_SMALL=0 | |||
| 199 | CONFIG_MODULES=y | 202 | CONFIG_MODULES=y |
| 200 | CONFIG_MODULE_UNLOAD=y | 203 | CONFIG_MODULE_UNLOAD=y |
| 201 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 204 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 202 | CONFIG_OBSOLETE_MODPARM=y | ||
| 203 | CONFIG_MODVERSIONS=y | 205 | CONFIG_MODVERSIONS=y |
| 204 | CONFIG_MODULE_SRCVERSION_ALL=y | 206 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 205 | CONFIG_KMOD=y | 207 | CONFIG_KMOD=y |
| @@ -208,6 +210,8 @@ CONFIG_KMOD=y | |||
| 208 | # Block layer | 210 | # Block layer |
| 209 | # | 211 | # |
| 210 | # CONFIG_LBD is not set | 212 | # CONFIG_LBD is not set |
| 213 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 214 | # CONFIG_LSF is not set | ||
| 211 | 215 | ||
| 212 | # | 216 | # |
| 213 | # IO Schedulers | 217 | # IO Schedulers |
| @@ -227,7 +231,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 227 | # | 231 | # |
| 228 | CONFIG_HW_HAS_PCI=y | 232 | CONFIG_HW_HAS_PCI=y |
| 229 | CONFIG_PCI=y | 233 | CONFIG_PCI=y |
| 230 | CONFIG_PCI_LEGACY_PROC=y | ||
| 231 | CONFIG_MMU=y | 234 | CONFIG_MMU=y |
| 232 | 235 | ||
| 233 | # | 236 | # |
| @@ -255,6 +258,7 @@ CONFIG_NET=y | |||
| 255 | # | 258 | # |
| 256 | # Networking options | 259 | # Networking options |
| 257 | # | 260 | # |
| 261 | # CONFIG_NETDEBUG is not set | ||
| 258 | CONFIG_PACKET=y | 262 | CONFIG_PACKET=y |
| 259 | CONFIG_PACKET_MMAP=y | 263 | CONFIG_PACKET_MMAP=y |
| 260 | CONFIG_UNIX=y | 264 | CONFIG_UNIX=y |
| @@ -287,6 +291,7 @@ CONFIG_SYN_COOKIES=y | |||
| 287 | CONFIG_INET_AH=m | 291 | CONFIG_INET_AH=m |
| 288 | CONFIG_INET_ESP=m | 292 | CONFIG_INET_ESP=m |
| 289 | CONFIG_INET_IPCOMP=m | 293 | CONFIG_INET_IPCOMP=m |
| 294 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 290 | CONFIG_INET_TUNNEL=m | 295 | CONFIG_INET_TUNNEL=m |
| 291 | CONFIG_INET_DIAG=y | 296 | CONFIG_INET_DIAG=y |
| 292 | CONFIG_INET_TCP_DIAG=y | 297 | CONFIG_INET_TCP_DIAG=y |
| @@ -328,9 +333,12 @@ CONFIG_IP_VS_NQ=m | |||
| 328 | CONFIG_IP_VS_FTP=m | 333 | CONFIG_IP_VS_FTP=m |
| 329 | CONFIG_IPV6=m | 334 | CONFIG_IPV6=m |
| 330 | CONFIG_IPV6_PRIVACY=y | 335 | CONFIG_IPV6_PRIVACY=y |
| 336 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 337 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 331 | CONFIG_INET6_AH=m | 338 | CONFIG_INET6_AH=m |
| 332 | CONFIG_INET6_ESP=m | 339 | CONFIG_INET6_ESP=m |
| 333 | CONFIG_INET6_IPCOMP=m | 340 | CONFIG_INET6_IPCOMP=m |
| 341 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 334 | CONFIG_INET6_TUNNEL=m | 342 | CONFIG_INET6_TUNNEL=m |
| 335 | CONFIG_IPV6_TUNNEL=m | 343 | CONFIG_IPV6_TUNNEL=m |
| 336 | CONFIG_NETFILTER=y | 344 | CONFIG_NETFILTER=y |
| @@ -354,11 +362,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | |||
| 354 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 362 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 355 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 363 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 356 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 364 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 365 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 357 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 366 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 358 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 367 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 359 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 368 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 360 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 369 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 361 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 370 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 371 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 372 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 362 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | 373 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set |
| 363 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 374 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 364 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 375 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| @@ -382,20 +393,19 @@ CONFIG_IP_NF_IRC=m | |||
| 382 | CONFIG_IP_NF_TFTP=m | 393 | CONFIG_IP_NF_TFTP=m |
| 383 | CONFIG_IP_NF_AMANDA=m | 394 | CONFIG_IP_NF_AMANDA=m |
| 384 | CONFIG_IP_NF_PPTP=m | 395 | CONFIG_IP_NF_PPTP=m |
| 396 | CONFIG_IP_NF_H323=m | ||
| 385 | CONFIG_IP_NF_QUEUE=m | 397 | CONFIG_IP_NF_QUEUE=m |
| 386 | CONFIG_IP_NF_IPTABLES=m | 398 | CONFIG_IP_NF_IPTABLES=m |
| 387 | CONFIG_IP_NF_MATCH_IPRANGE=m | 399 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 388 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 389 | CONFIG_IP_NF_MATCH_TOS=m | 400 | CONFIG_IP_NF_MATCH_TOS=m |
| 390 | CONFIG_IP_NF_MATCH_RECENT=m | 401 | CONFIG_IP_NF_MATCH_RECENT=m |
| 391 | CONFIG_IP_NF_MATCH_ECN=m | 402 | CONFIG_IP_NF_MATCH_ECN=m |
| 392 | CONFIG_IP_NF_MATCH_DSCP=m | 403 | CONFIG_IP_NF_MATCH_DSCP=m |
| 393 | CONFIG_IP_NF_MATCH_AH_ESP=m | 404 | CONFIG_IP_NF_MATCH_AH=m |
| 394 | CONFIG_IP_NF_MATCH_TTL=m | 405 | CONFIG_IP_NF_MATCH_TTL=m |
| 395 | CONFIG_IP_NF_MATCH_OWNER=m | 406 | CONFIG_IP_NF_MATCH_OWNER=m |
| 396 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 407 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 397 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 408 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
| 398 | CONFIG_IP_NF_MATCH_POLICY=m | ||
| 399 | CONFIG_IP_NF_FILTER=m | 409 | CONFIG_IP_NF_FILTER=m |
| 400 | CONFIG_IP_NF_TARGET_REJECT=m | 410 | CONFIG_IP_NF_TARGET_REJECT=m |
| 401 | CONFIG_IP_NF_TARGET_LOG=m | 411 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -413,6 +423,7 @@ CONFIG_IP_NF_NAT_FTP=m | |||
| 413 | CONFIG_IP_NF_NAT_TFTP=m | 423 | CONFIG_IP_NF_NAT_TFTP=m |
| 414 | CONFIG_IP_NF_NAT_AMANDA=m | 424 | CONFIG_IP_NF_NAT_AMANDA=m |
| 415 | CONFIG_IP_NF_NAT_PPTP=m | 425 | CONFIG_IP_NF_NAT_PPTP=m |
| 426 | CONFIG_IP_NF_NAT_H323=m | ||
| 416 | CONFIG_IP_NF_MANGLE=m | 427 | CONFIG_IP_NF_MANGLE=m |
| 417 | CONFIG_IP_NF_TARGET_TOS=m | 428 | CONFIG_IP_NF_TARGET_TOS=m |
| 418 | CONFIG_IP_NF_TARGET_ECN=m | 429 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -433,12 +444,10 @@ CONFIG_IP6_NF_MATCH_RT=m | |||
| 433 | CONFIG_IP6_NF_MATCH_OPTS=m | 444 | CONFIG_IP6_NF_MATCH_OPTS=m |
| 434 | CONFIG_IP6_NF_MATCH_FRAG=m | 445 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 435 | CONFIG_IP6_NF_MATCH_HL=m | 446 | CONFIG_IP6_NF_MATCH_HL=m |
| 436 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
| 437 | CONFIG_IP6_NF_MATCH_OWNER=m | 447 | CONFIG_IP6_NF_MATCH_OWNER=m |
| 438 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 448 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 439 | CONFIG_IP6_NF_MATCH_AHESP=m | 449 | CONFIG_IP6_NF_MATCH_AH=m |
| 440 | CONFIG_IP6_NF_MATCH_EUI64=m | 450 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 441 | CONFIG_IP6_NF_MATCH_POLICY=m | ||
| 442 | CONFIG_IP6_NF_FILTER=m | 451 | CONFIG_IP6_NF_FILTER=m |
| 443 | CONFIG_IP6_NF_TARGET_LOG=m | 452 | CONFIG_IP6_NF_TARGET_LOG=m |
| 444 | CONFIG_IP6_NF_TARGET_REJECT=m | 453 | CONFIG_IP6_NF_TARGET_REJECT=m |
| @@ -484,6 +493,11 @@ CONFIG_IP_SCTP=m | |||
| 484 | # CONFIG_SCTP_HMAC_NONE is not set | 493 | # CONFIG_SCTP_HMAC_NONE is not set |
| 485 | # CONFIG_SCTP_HMAC_SHA1 is not set | 494 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 486 | CONFIG_SCTP_HMAC_MD5=y | 495 | CONFIG_SCTP_HMAC_MD5=y |
| 496 | |||
| 497 | # | ||
| 498 | # TIPC Configuration (EXPERIMENTAL) | ||
| 499 | # | ||
| 500 | # CONFIG_TIPC is not set | ||
| 487 | # CONFIG_ATM is not set | 501 | # CONFIG_ATM is not set |
| 488 | CONFIG_BRIDGE=m | 502 | CONFIG_BRIDGE=m |
| 489 | CONFIG_VLAN_8021Q=m | 503 | CONFIG_VLAN_8021Q=m |
| @@ -498,11 +512,6 @@ CONFIG_IPDDP_ENCAP=y | |||
| 498 | CONFIG_IPDDP_DECAP=y | 512 | CONFIG_IPDDP_DECAP=y |
| 499 | # CONFIG_X25 is not set | 513 | # CONFIG_X25 is not set |
| 500 | # CONFIG_LAPB is not set | 514 | # CONFIG_LAPB is not set |
| 501 | |||
| 502 | # | ||
| 503 | # TIPC Configuration (EXPERIMENTAL) | ||
| 504 | # | ||
| 505 | # CONFIG_TIPC is not set | ||
| 506 | CONFIG_NET_DIVERT=y | 515 | CONFIG_NET_DIVERT=y |
| 507 | # CONFIG_ECONET is not set | 516 | # CONFIG_ECONET is not set |
| 508 | # CONFIG_WAN_ROUTER is not set | 517 | # CONFIG_WAN_ROUTER is not set |
| @@ -562,6 +571,9 @@ CONFIG_IEEE80211=m | |||
| 562 | # CONFIG_IEEE80211_DEBUG is not set | 571 | # CONFIG_IEEE80211_DEBUG is not set |
| 563 | CONFIG_IEEE80211_CRYPT_WEP=m | 572 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 564 | CONFIG_IEEE80211_CRYPT_CCMP=m | 573 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 574 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 575 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 576 | CONFIG_WIRELESS_EXT=y | ||
| 565 | 577 | ||
| 566 | # | 578 | # |
| 567 | # Device Drivers | 579 | # Device Drivers |
| @@ -734,7 +746,6 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
| 734 | # CONFIG_SCSI_INIA100 is not set | 746 | # CONFIG_SCSI_INIA100 is not set |
| 735 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 747 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 736 | # CONFIG_SCSI_IPR is not set | 748 | # CONFIG_SCSI_IPR is not set |
| 737 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 738 | # CONFIG_SCSI_QLOGIC_1280 is not set | 749 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 739 | # CONFIG_SCSI_QLA_FC is not set | 750 | # CONFIG_SCSI_QLA_FC is not set |
| 740 | # CONFIG_SCSI_LPFC is not set | 751 | # CONFIG_SCSI_LPFC is not set |
| @@ -753,6 +764,7 @@ CONFIG_MD_RAID0=m | |||
| 753 | CONFIG_MD_RAID1=m | 764 | CONFIG_MD_RAID1=m |
| 754 | CONFIG_MD_RAID10=m | 765 | CONFIG_MD_RAID10=m |
| 755 | CONFIG_MD_RAID5=m | 766 | CONFIG_MD_RAID5=m |
| 767 | CONFIG_MD_RAID5_RESHAPE=y | ||
| 756 | CONFIG_MD_RAID6=m | 768 | CONFIG_MD_RAID6=m |
| 757 | CONFIG_MD_MULTIPATH=m | 769 | CONFIG_MD_MULTIPATH=m |
| 758 | CONFIG_MD_FAULTY=m | 770 | CONFIG_MD_FAULTY=m |
| @@ -956,6 +968,7 @@ CONFIG_HW_CONSOLE=y | |||
| 956 | # | 968 | # |
| 957 | CONFIG_SERIAL_8250=y | 969 | CONFIG_SERIAL_8250=y |
| 958 | CONFIG_SERIAL_8250_CONSOLE=y | 970 | CONFIG_SERIAL_8250_CONSOLE=y |
| 971 | CONFIG_SERIAL_8250_PCI=y | ||
| 959 | CONFIG_SERIAL_8250_NR_UARTS=4 | 972 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 960 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 973 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 961 | # CONFIG_SERIAL_8250_EXTENDED is not set | 974 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -965,6 +978,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 965 | # | 978 | # |
| 966 | CONFIG_SERIAL_CORE=y | 979 | CONFIG_SERIAL_CORE=y |
| 967 | CONFIG_SERIAL_CORE_CONSOLE=y | 980 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 981 | # CONFIG_SERIAL_JSM is not set | ||
| 968 | CONFIG_UNIX98_PTYS=y | 982 | CONFIG_UNIX98_PTYS=y |
| 969 | CONFIG_LEGACY_PTYS=y | 983 | CONFIG_LEGACY_PTYS=y |
| 970 | CONFIG_LEGACY_PTY_COUNT=256 | 984 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -1022,10 +1036,6 @@ CONFIG_RTC=y | |||
| 1022 | # | 1036 | # |
| 1023 | 1037 | ||
| 1024 | # | 1038 | # |
| 1025 | # Multimedia Capabilities Port drivers | ||
| 1026 | # | ||
| 1027 | |||
| 1028 | # | ||
| 1029 | # Multimedia devices | 1039 | # Multimedia devices |
| 1030 | # | 1040 | # |
| 1031 | # CONFIG_VIDEO_DEV is not set | 1041 | # CONFIG_VIDEO_DEV is not set |
| @@ -1056,6 +1066,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 1056 | # | 1066 | # |
| 1057 | CONFIG_USB_ARCH_HAS_HCD=y | 1067 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1058 | CONFIG_USB_ARCH_HAS_OHCI=y | 1068 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1069 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 1059 | # CONFIG_USB is not set | 1070 | # CONFIG_USB is not set |
| 1060 | 1071 | ||
| 1061 | # | 1072 | # |
| @@ -1073,13 +1084,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 1073 | # CONFIG_MMC is not set | 1084 | # CONFIG_MMC is not set |
| 1074 | 1085 | ||
| 1075 | # | 1086 | # |
| 1087 | # LED devices | ||
| 1088 | # | ||
| 1089 | # CONFIG_NEW_LEDS is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # LED drivers | ||
| 1093 | # | ||
| 1094 | |||
| 1095 | # | ||
| 1096 | # LED Triggers | ||
| 1097 | # | ||
| 1098 | |||
| 1099 | # | ||
| 1076 | # InfiniBand support | 1100 | # InfiniBand support |
| 1077 | # | 1101 | # |
| 1078 | # CONFIG_INFINIBAND is not set | 1102 | # CONFIG_INFINIBAND is not set |
| 1079 | 1103 | ||
| 1080 | # | 1104 | # |
| 1081 | # SN Devices | 1105 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1106 | # | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # Real Time Clock | ||
| 1082 | # | 1110 | # |
| 1111 | # CONFIG_RTC_CLASS is not set | ||
| 1083 | 1112 | ||
| 1084 | # | 1113 | # |
| 1085 | # File systems | 1114 | # File systems |
| @@ -1154,7 +1183,6 @@ CONFIG_SYSFS=y | |||
| 1154 | # CONFIG_TMPFS is not set | 1183 | # CONFIG_TMPFS is not set |
| 1155 | # CONFIG_HUGETLB_PAGE is not set | 1184 | # CONFIG_HUGETLB_PAGE is not set |
| 1156 | CONFIG_RAMFS=y | 1185 | CONFIG_RAMFS=y |
| 1157 | CONFIG_RELAYFS_FS=m | ||
| 1158 | # CONFIG_CONFIGFS_FS is not set | 1186 | # CONFIG_CONFIGFS_FS is not set |
| 1159 | 1187 | ||
| 1160 | # | 1188 | # |
| @@ -1174,7 +1202,6 @@ CONFIG_VXFS_FS=m | |||
| 1174 | # CONFIG_QNX4FS_FS is not set | 1202 | # CONFIG_QNX4FS_FS is not set |
| 1175 | CONFIG_SYSV_FS=m | 1203 | CONFIG_SYSV_FS=m |
| 1176 | CONFIG_UFS_FS=m | 1204 | CONFIG_UFS_FS=m |
| 1177 | # CONFIG_UFS_FS_WRITE is not set | ||
| 1178 | 1205 | ||
| 1179 | # | 1206 | # |
| 1180 | # Network File Systems | 1207 | # Network File Systems |
| @@ -1266,6 +1293,7 @@ CONFIG_NLS_UTF8=m | |||
| 1266 | # CONFIG_MAGIC_SYSRQ is not set | 1293 | # CONFIG_MAGIC_SYSRQ is not set |
| 1267 | # CONFIG_DEBUG_KERNEL is not set | 1294 | # CONFIG_DEBUG_KERNEL is not set |
| 1268 | CONFIG_LOG_BUF_SHIFT=14 | 1295 | CONFIG_LOG_BUF_SHIFT=14 |
| 1296 | # CONFIG_DEBUG_FS is not set | ||
| 1269 | CONFIG_CROSSCOMPILE=y | 1297 | CONFIG_CROSSCOMPILE=y |
| 1270 | CONFIG_CMDLINE="" | 1298 | CONFIG_CMDLINE="" |
| 1271 | 1299 | ||
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index fe78961762b8..00560e0143f1 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:16 2006 | 4 | # Mon Apr 24 14:51:09 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_SIM=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,16 +116,19 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | # CONFIG_PAGE_SIZE_64KB is not set | 116 | # CONFIG_PAGE_SIZE_64KB is not set |
| 115 | CONFIG_CPU_HAS_PREFETCH=y | 117 | CONFIG_CPU_HAS_PREFETCH=y |
| 116 | CONFIG_MIPS_MT=y | 118 | CONFIG_MIPS_MT=y |
| 119 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 117 | # CONFIG_MIPS_MT_SMP is not set | 120 | # CONFIG_MIPS_MT_SMP is not set |
| 118 | CONFIG_MIPS_VPE_LOADER=y | 121 | CONFIG_MIPS_VPE_LOADER=y |
| 122 | CONFIG_MIPS_MT_FPAFF=y | ||
| 119 | CONFIG_MIPS_VPE_LOADER_TOM=y | 123 | CONFIG_MIPS_VPE_LOADER_TOM=y |
| 120 | CONFIG_MIPS_VPE_APSP_API=y | 124 | CONFIG_MIPS_VPE_APSP_API=y |
| 125 | CONFIG_MIPS_APSP_KSPD=y | ||
| 121 | # CONFIG_64BIT_PHYS_ADDR is not set | 126 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 122 | # CONFIG_CPU_ADVANCED is not set | ||
| 123 | CONFIG_CPU_HAS_LLSC=y | 127 | CONFIG_CPU_HAS_LLSC=y |
| 124 | CONFIG_CPU_HAS_SYNC=y | 128 | CONFIG_CPU_HAS_SYNC=y |
| 125 | CONFIG_GENERIC_HARDIRQS=y | 129 | CONFIG_GENERIC_HARDIRQS=y |
| 126 | CONFIG_GENERIC_IRQ_PROBE=y | 130 | CONFIG_GENERIC_IRQ_PROBE=y |
| 131 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 127 | CONFIG_ARCH_FLATMEM_ENABLE=y | 132 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 128 | CONFIG_SELECT_MEMORY_MODEL=y | 133 | CONFIG_SELECT_MEMORY_MODEL=y |
| 129 | CONFIG_FLATMEM_MANUAL=y | 134 | CONFIG_FLATMEM_MANUAL=y |
| @@ -141,7 +146,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 141 | # Code maturity level options | 146 | # Code maturity level options |
| 142 | # | 147 | # |
| 143 | CONFIG_EXPERIMENTAL=y | 148 | CONFIG_EXPERIMENTAL=y |
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | 149 | CONFIG_BROKEN_ON_SMP=y |
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 147 | 151 | ||
| @@ -157,6 +161,7 @@ CONFIG_SYSVIPC=y | |||
| 157 | CONFIG_SYSCTL=y | 161 | CONFIG_SYSCTL=y |
| 158 | # CONFIG_AUDIT is not set | 162 | # CONFIG_AUDIT is not set |
| 159 | # CONFIG_IKCONFIG is not set | 163 | # CONFIG_IKCONFIG is not set |
| 164 | # CONFIG_RELAY is not set | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | 165 | CONFIG_INITRAMFS_SOURCE="" |
| 161 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 162 | CONFIG_EMBEDDED=y | 167 | CONFIG_EMBEDDED=y |
| @@ -171,10 +176,6 @@ CONFIG_BASE_FULL=y | |||
| 171 | CONFIG_FUTEX=y | 176 | CONFIG_FUTEX=y |
| 172 | CONFIG_EPOLL=y | 177 | CONFIG_EPOLL=y |
| 173 | CONFIG_SHMEM=y | 178 | CONFIG_SHMEM=y |
| 174 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 175 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 176 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 177 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 178 | CONFIG_SLAB=y | 179 | CONFIG_SLAB=y |
| 179 | # CONFIG_TINY_SHMEM is not set | 180 | # CONFIG_TINY_SHMEM is not set |
| 180 | CONFIG_BASE_SMALL=0 | 181 | CONFIG_BASE_SMALL=0 |
| @@ -186,7 +187,6 @@ CONFIG_BASE_SMALL=0 | |||
| 186 | CONFIG_MODULES=y | 187 | CONFIG_MODULES=y |
| 187 | CONFIG_MODULE_UNLOAD=y | 188 | CONFIG_MODULE_UNLOAD=y |
| 188 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 189 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 189 | CONFIG_OBSOLETE_MODPARM=y | ||
| 190 | CONFIG_MODVERSIONS=y | 190 | CONFIG_MODVERSIONS=y |
| 191 | CONFIG_MODULE_SRCVERSION_ALL=y | 191 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 192 | CONFIG_KMOD=y | 192 | CONFIG_KMOD=y |
| @@ -195,6 +195,7 @@ CONFIG_KMOD=y | |||
| 195 | # Block layer | 195 | # Block layer |
| 196 | # | 196 | # |
| 197 | # CONFIG_LBD is not set | 197 | # CONFIG_LBD is not set |
| 198 | # CONFIG_LSF is not set | ||
| 198 | 199 | ||
| 199 | # | 200 | # |
| 200 | # IO Schedulers | 201 | # IO Schedulers |
| @@ -238,6 +239,7 @@ CONFIG_NET=y | |||
| 238 | # | 239 | # |
| 239 | # Networking options | 240 | # Networking options |
| 240 | # | 241 | # |
| 242 | # CONFIG_NETDEBUG is not set | ||
| 241 | CONFIG_PACKET=y | 243 | CONFIG_PACKET=y |
| 242 | CONFIG_PACKET_MMAP=y | 244 | CONFIG_PACKET_MMAP=y |
| 243 | CONFIG_UNIX=y | 245 | CONFIG_UNIX=y |
| @@ -268,12 +270,15 @@ CONFIG_SYN_COOKIES=y | |||
| 268 | # CONFIG_INET_AH is not set | 270 | # CONFIG_INET_AH is not set |
| 269 | # CONFIG_INET_ESP is not set | 271 | # CONFIG_INET_ESP is not set |
| 270 | # CONFIG_INET_IPCOMP is not set | 272 | # CONFIG_INET_IPCOMP is not set |
| 273 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 271 | # CONFIG_INET_TUNNEL is not set | 274 | # CONFIG_INET_TUNNEL is not set |
| 272 | CONFIG_INET_DIAG=y | 275 | CONFIG_INET_DIAG=y |
| 273 | CONFIG_INET_TCP_DIAG=y | 276 | CONFIG_INET_TCP_DIAG=y |
| 274 | # CONFIG_TCP_CONG_ADVANCED is not set | 277 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 275 | CONFIG_TCP_CONG_BIC=y | 278 | CONFIG_TCP_CONG_BIC=y |
| 276 | # CONFIG_IPV6 is not set | 279 | # CONFIG_IPV6 is not set |
| 280 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 281 | # CONFIG_INET6_TUNNEL is not set | ||
| 277 | # CONFIG_NETFILTER is not set | 282 | # CONFIG_NETFILTER is not set |
| 278 | 283 | ||
| 279 | # | 284 | # |
| @@ -290,6 +295,11 @@ CONFIG_IP_SCTP=m | |||
| 290 | # CONFIG_SCTP_HMAC_NONE is not set | 295 | # CONFIG_SCTP_HMAC_NONE is not set |
| 291 | # CONFIG_SCTP_HMAC_SHA1 is not set | 296 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 292 | CONFIG_SCTP_HMAC_MD5=y | 297 | CONFIG_SCTP_HMAC_MD5=y |
| 298 | |||
| 299 | # | ||
| 300 | # TIPC Configuration (EXPERIMENTAL) | ||
| 301 | # | ||
| 302 | # CONFIG_TIPC is not set | ||
| 293 | # CONFIG_ATM is not set | 303 | # CONFIG_ATM is not set |
| 294 | # CONFIG_BRIDGE is not set | 304 | # CONFIG_BRIDGE is not set |
| 295 | # CONFIG_VLAN_8021Q is not set | 305 | # CONFIG_VLAN_8021Q is not set |
| @@ -299,11 +309,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 299 | # CONFIG_ATALK is not set | 309 | # CONFIG_ATALK is not set |
| 300 | # CONFIG_X25 is not set | 310 | # CONFIG_X25 is not set |
| 301 | # CONFIG_LAPB is not set | 311 | # CONFIG_LAPB is not set |
| 302 | |||
| 303 | # | ||
| 304 | # TIPC Configuration (EXPERIMENTAL) | ||
| 305 | # | ||
| 306 | # CONFIG_TIPC is not set | ||
| 307 | CONFIG_NET_DIVERT=y | 312 | CONFIG_NET_DIVERT=y |
| 308 | # CONFIG_ECONET is not set | 313 | # CONFIG_ECONET is not set |
| 309 | # CONFIG_WAN_ROUTER is not set | 314 | # CONFIG_WAN_ROUTER is not set |
| @@ -397,7 +402,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 397 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 402 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 398 | CONFIG_BLK_DEV_NBD=y | 403 | CONFIG_BLK_DEV_NBD=y |
| 399 | # CONFIG_BLK_DEV_RAM is not set | 404 | # CONFIG_BLK_DEV_RAM is not set |
| 400 | CONFIG_BLK_DEV_RAM_COUNT=16 | 405 | # CONFIG_BLK_DEV_INITRD is not set |
| 401 | # CONFIG_CDROM_PKTCDVD is not set | 406 | # CONFIG_CDROM_PKTCDVD is not set |
| 402 | # CONFIG_ATA_OVER_ETH is not set | 407 | # CONFIG_ATA_OVER_ETH is not set |
| 403 | 408 | ||
| @@ -532,7 +537,7 @@ CONFIG_SERIO_SERPORT=y | |||
| 532 | CONFIG_SERIAL_8250=y | 537 | CONFIG_SERIAL_8250=y |
| 533 | CONFIG_SERIAL_8250_CONSOLE=y | 538 | CONFIG_SERIAL_8250_CONSOLE=y |
| 534 | CONFIG_SERIAL_8250_NR_UARTS=1 | 539 | CONFIG_SERIAL_8250_NR_UARTS=1 |
| 535 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 540 | CONFIG_SERIAL_8250_RUNTIME_UARTS=1 |
| 536 | # CONFIG_SERIAL_8250_EXTENDED is not set | 541 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| 537 | 542 | ||
| 538 | # | 543 | # |
| @@ -596,10 +601,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 596 | # | 601 | # |
| 597 | 602 | ||
| 598 | # | 603 | # |
| 599 | # Multimedia Capabilities Port drivers | ||
| 600 | # | ||
| 601 | |||
| 602 | # | ||
| 603 | # Multimedia devices | 604 | # Multimedia devices |
| 604 | # | 605 | # |
| 605 | # CONFIG_VIDEO_DEV is not set | 606 | # CONFIG_VIDEO_DEV is not set |
| @@ -624,6 +625,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 624 | # | 625 | # |
| 625 | # CONFIG_USB_ARCH_HAS_HCD is not set | 626 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 626 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 627 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 628 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 627 | 629 | ||
| 628 | # | 630 | # |
| 629 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 631 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -640,12 +642,30 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 640 | # CONFIG_MMC is not set | 642 | # CONFIG_MMC is not set |
| 641 | 643 | ||
| 642 | # | 644 | # |
| 645 | # LED devices | ||
| 646 | # | ||
| 647 | # CONFIG_NEW_LEDS is not set | ||
| 648 | |||
| 649 | # | ||
| 650 | # LED drivers | ||
| 651 | # | ||
| 652 | |||
| 653 | # | ||
| 654 | # LED Triggers | ||
| 655 | # | ||
| 656 | |||
| 657 | # | ||
| 643 | # InfiniBand support | 658 | # InfiniBand support |
| 644 | # | 659 | # |
| 645 | 660 | ||
| 646 | # | 661 | # |
| 647 | # SN Devices | 662 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 663 | # | ||
| 664 | |||
| 665 | # | ||
| 666 | # Real Time Clock | ||
| 648 | # | 667 | # |
| 668 | # CONFIG_RTC_CLASS is not set | ||
| 649 | 669 | ||
| 650 | # | 670 | # |
| 651 | # File systems | 671 | # File systems |
| @@ -690,8 +710,6 @@ CONFIG_PROC_FS=y | |||
| 690 | # CONFIG_TMPFS is not set | 710 | # CONFIG_TMPFS is not set |
| 691 | # CONFIG_HUGETLB_PAGE is not set | 711 | # CONFIG_HUGETLB_PAGE is not set |
| 692 | CONFIG_RAMFS=y | 712 | CONFIG_RAMFS=y |
| 693 | # CONFIG_RELAYFS_FS is not set | ||
| 694 | # CONFIG_CONFIGFS_FS is not set | ||
| 695 | 713 | ||
| 696 | # | 714 | # |
| 697 | # Miscellaneous filesystems | 715 | # Miscellaneous filesystems |
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index e4620e7f0a5e..286a018375b2 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:17 2006 | 4 | # Mon Apr 24 14:51:09 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -72,6 +72,8 @@ CONFIG_VICTOR_MPC30X=y | |||
| 72 | CONFIG_PCI_VR41XX=y | 72 | CONFIG_PCI_VR41XX=y |
| 73 | CONFIG_VRC4173=y | 73 | CONFIG_VRC4173=y |
| 74 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 74 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 75 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 76 | CONFIG_GENERIC_HWEIGHT=y | ||
| 75 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 76 | CONFIG_DMA_NONCOHERENT=y | 78 | CONFIG_DMA_NONCOHERENT=y |
| 77 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 79 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -90,7 +92,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 90 | # CONFIG_CPU_MIPS64_R2 is not set | 92 | # CONFIG_CPU_MIPS64_R2 is not set |
| 91 | # CONFIG_CPU_R3000 is not set | 93 | # CONFIG_CPU_R3000 is not set |
| 92 | # CONFIG_CPU_TX39XX is not set | 94 | # CONFIG_CPU_TX39XX is not set |
| 93 | # CONFIG_CPU_VR41XX is not set | 95 | CONFIG_CPU_VR41XX=y |
| 94 | # CONFIG_CPU_R4300 is not set | 96 | # CONFIG_CPU_R4300 is not set |
| 95 | # CONFIG_CPU_R4X00 is not set | 97 | # CONFIG_CPU_R4X00 is not set |
| 96 | # CONFIG_CPU_TX49XX is not set | 98 | # CONFIG_CPU_TX49XX is not set |
| @@ -103,18 +105,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 103 | # CONFIG_CPU_RM7000 is not set | 105 | # CONFIG_CPU_RM7000 is not set |
| 104 | # CONFIG_CPU_RM9000 is not set | 106 | # CONFIG_CPU_RM9000 is not set |
| 105 | # CONFIG_CPU_SB1 is not set | 107 | # CONFIG_CPU_SB1 is not set |
| 108 | CONFIG_SYS_HAS_CPU_VR41XX=y | ||
| 109 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
| 110 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
| 111 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 106 | 112 | ||
| 107 | # | 113 | # |
| 108 | # Kernel type | 114 | # Kernel type |
| 109 | # | 115 | # |
| 110 | # CONFIG_32BIT is not set | 116 | CONFIG_32BIT=y |
| 111 | # CONFIG_64BIT is not set | 117 | # CONFIG_64BIT is not set |
| 112 | CONFIG_PAGE_SIZE_4KB=y | 118 | CONFIG_PAGE_SIZE_4KB=y |
| 113 | # CONFIG_PAGE_SIZE_8KB is not set | 119 | # CONFIG_PAGE_SIZE_8KB is not set |
| 114 | # CONFIG_PAGE_SIZE_16KB is not set | 120 | # CONFIG_PAGE_SIZE_16KB is not set |
| 115 | # CONFIG_PAGE_SIZE_64KB is not set | 121 | # CONFIG_PAGE_SIZE_64KB is not set |
| 116 | # CONFIG_MIPS_MT is not set | 122 | # CONFIG_MIPS_MT is not set |
| 117 | CONFIG_CPU_HAS_LLSC=y | ||
| 118 | CONFIG_CPU_HAS_SYNC=y | 123 | CONFIG_CPU_HAS_SYNC=y |
| 119 | CONFIG_GENERIC_HARDIRQS=y | 124 | CONFIG_GENERIC_HARDIRQS=y |
| 120 | CONFIG_GENERIC_IRQ_PROBE=y | 125 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -135,7 +140,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 135 | # Code maturity level options | 140 | # Code maturity level options |
| 136 | # | 141 | # |
| 137 | CONFIG_EXPERIMENTAL=y | 142 | CONFIG_EXPERIMENTAL=y |
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | 143 | CONFIG_BROKEN_ON_SMP=y |
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 141 | 145 | ||
| @@ -151,6 +155,7 @@ CONFIG_SYSVIPC=y | |||
| 151 | CONFIG_SYSCTL=y | 155 | CONFIG_SYSCTL=y |
| 152 | # CONFIG_AUDIT is not set | 156 | # CONFIG_AUDIT is not set |
| 153 | # CONFIG_IKCONFIG is not set | 157 | # CONFIG_IKCONFIG is not set |
| 158 | CONFIG_RELAY=y | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | 159 | CONFIG_INITRAMFS_SOURCE="" |
| 155 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 160 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 156 | CONFIG_EMBEDDED=y | 161 | CONFIG_EMBEDDED=y |
| @@ -164,10 +169,6 @@ CONFIG_BASE_FULL=y | |||
| 164 | CONFIG_FUTEX=y | 169 | CONFIG_FUTEX=y |
| 165 | CONFIG_EPOLL=y | 170 | CONFIG_EPOLL=y |
| 166 | CONFIG_SHMEM=y | 171 | CONFIG_SHMEM=y |
| 167 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 168 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 169 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 170 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 171 | CONFIG_SLAB=y | 172 | CONFIG_SLAB=y |
| 172 | # CONFIG_TINY_SHMEM is not set | 173 | # CONFIG_TINY_SHMEM is not set |
| 173 | CONFIG_BASE_SMALL=0 | 174 | CONFIG_BASE_SMALL=0 |
| @@ -179,7 +180,6 @@ CONFIG_BASE_SMALL=0 | |||
| 179 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 180 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 185 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -187,6 +187,9 @@ CONFIG_KMOD=y | |||
| 187 | # | 187 | # |
| 188 | # Block layer | 188 | # Block layer |
| 189 | # | 189 | # |
| 190 | # CONFIG_LBD is not set | ||
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 190 | 193 | ||
| 191 | # | 194 | # |
| 192 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -206,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 206 | # | 209 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| 208 | CONFIG_PCI=y | 211 | CONFIG_PCI=y |
| 209 | CONFIG_PCI_LEGACY_PROC=y | ||
| 210 | CONFIG_MMU=y | 212 | CONFIG_MMU=y |
| 211 | 213 | ||
| 212 | # | 214 | # |
| @@ -225,6 +227,7 @@ CONFIG_PCMCIA_IOCTL=y | |||
| 225 | # CONFIG_YENTA is not set | 227 | # CONFIG_YENTA is not set |
| 226 | # CONFIG_PD6729 is not set | 228 | # CONFIG_PD6729 is not set |
| 227 | # CONFIG_I82092 is not set | 229 | # CONFIG_I82092 is not set |
| 230 | # CONFIG_PCMCIA_VRC4173 is not set | ||
| 228 | 231 | ||
| 229 | # | 232 | # |
| 230 | # PCI Hotplug Support | 233 | # PCI Hotplug Support |
| @@ -236,6 +239,7 @@ CONFIG_PCMCIA_IOCTL=y | |||
| 236 | # | 239 | # |
| 237 | CONFIG_BINFMT_ELF=y | 240 | CONFIG_BINFMT_ELF=y |
| 238 | # CONFIG_BINFMT_MISC is not set | 241 | # CONFIG_BINFMT_MISC is not set |
| 242 | CONFIG_TRAD_SIGNALS=y | ||
| 239 | 243 | ||
| 240 | # | 244 | # |
| 241 | # Networking | 245 | # Networking |
| @@ -245,6 +249,7 @@ CONFIG_NET=y | |||
| 245 | # | 249 | # |
| 246 | # Networking options | 250 | # Networking options |
| 247 | # | 251 | # |
| 252 | # CONFIG_NETDEBUG is not set | ||
| 248 | CONFIG_PACKET=y | 253 | CONFIG_PACKET=y |
| 249 | CONFIG_PACKET_MMAP=y | 254 | CONFIG_PACKET_MMAP=y |
| 250 | CONFIG_UNIX=y | 255 | CONFIG_UNIX=y |
| @@ -264,12 +269,15 @@ CONFIG_IP_FIB_HASH=y | |||
| 264 | # CONFIG_INET_AH is not set | 269 | # CONFIG_INET_AH is not set |
| 265 | # CONFIG_INET_ESP is not set | 270 | # CONFIG_INET_ESP is not set |
| 266 | # CONFIG_INET_IPCOMP is not set | 271 | # CONFIG_INET_IPCOMP is not set |
| 267 | CONFIG_INET_TUNNEL=m | 272 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 273 | # CONFIG_INET_TUNNEL is not set | ||
| 268 | CONFIG_INET_DIAG=y | 274 | CONFIG_INET_DIAG=y |
| 269 | CONFIG_INET_TCP_DIAG=y | 275 | CONFIG_INET_TCP_DIAG=y |
| 270 | # CONFIG_TCP_CONG_ADVANCED is not set | 276 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 271 | CONFIG_TCP_CONG_BIC=y | 277 | CONFIG_TCP_CONG_BIC=y |
| 272 | # CONFIG_IPV6 is not set | 278 | # CONFIG_IPV6 is not set |
| 279 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 280 | # CONFIG_INET6_TUNNEL is not set | ||
| 273 | # CONFIG_NETFILTER is not set | 281 | # CONFIG_NETFILTER is not set |
| 274 | 282 | ||
| 275 | # | 283 | # |
| @@ -281,6 +289,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 281 | # SCTP Configuration (EXPERIMENTAL) | 289 | # SCTP Configuration (EXPERIMENTAL) |
| 282 | # | 290 | # |
| 283 | # CONFIG_IP_SCTP is not set | 291 | # CONFIG_IP_SCTP is not set |
| 292 | |||
| 293 | # | ||
| 294 | # TIPC Configuration (EXPERIMENTAL) | ||
| 295 | # | ||
| 296 | # CONFIG_TIPC is not set | ||
| 284 | # CONFIG_ATM is not set | 297 | # CONFIG_ATM is not set |
| 285 | # CONFIG_BRIDGE is not set | 298 | # CONFIG_BRIDGE is not set |
| 286 | # CONFIG_VLAN_8021Q is not set | 299 | # CONFIG_VLAN_8021Q is not set |
| @@ -290,11 +303,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 290 | # CONFIG_ATALK is not set | 303 | # CONFIG_ATALK is not set |
| 291 | # CONFIG_X25 is not set | 304 | # CONFIG_X25 is not set |
| 292 | # CONFIG_LAPB is not set | 305 | # CONFIG_LAPB is not set |
| 293 | |||
| 294 | # | ||
| 295 | # TIPC Configuration (EXPERIMENTAL) | ||
| 296 | # | ||
| 297 | # CONFIG_TIPC is not set | ||
| 298 | # CONFIG_NET_DIVERT is not set | 306 | # CONFIG_NET_DIVERT is not set |
| 299 | # CONFIG_ECONET is not set | 307 | # CONFIG_ECONET is not set |
| 300 | # CONFIG_WAN_ROUTER is not set | 308 | # CONFIG_WAN_ROUTER is not set |
| @@ -316,6 +324,9 @@ CONFIG_IEEE80211=m | |||
| 316 | CONFIG_IEEE80211_CRYPT_WEP=m | 324 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 317 | CONFIG_IEEE80211_CRYPT_CCMP=m | 325 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 318 | CONFIG_IEEE80211_CRYPT_TKIP=m | 326 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 327 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 328 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 329 | CONFIG_WIRELESS_EXT=y | ||
| 319 | 330 | ||
| 320 | # | 331 | # |
| 321 | # Device Drivers | 332 | # Device Drivers |
| @@ -360,7 +371,7 @@ CONFIG_CONNECTOR=m | |||
| 360 | # CONFIG_BLK_DEV_SX8 is not set | 371 | # CONFIG_BLK_DEV_SX8 is not set |
| 361 | # CONFIG_BLK_DEV_UB is not set | 372 | # CONFIG_BLK_DEV_UB is not set |
| 362 | # CONFIG_BLK_DEV_RAM is not set | 373 | # CONFIG_BLK_DEV_RAM is not set |
| 363 | CONFIG_BLK_DEV_RAM_COUNT=16 | 374 | # CONFIG_BLK_DEV_INITRD is not set |
| 364 | # CONFIG_CDROM_PKTCDVD is not set | 375 | # CONFIG_CDROM_PKTCDVD is not set |
| 365 | CONFIG_ATA_OVER_ETH=m | 376 | CONFIG_ATA_OVER_ETH=m |
| 366 | 377 | ||
| @@ -475,6 +486,7 @@ CONFIG_MII=m | |||
| 475 | # Wireless LAN (non-hamradio) | 486 | # Wireless LAN (non-hamradio) |
| 476 | # | 487 | # |
| 477 | CONFIG_NET_RADIO=y | 488 | CONFIG_NET_RADIO=y |
| 489 | # CONFIG_NET_WIRELESS_RTNETLINK is not set | ||
| 478 | 490 | ||
| 479 | # | 491 | # |
| 480 | # Obsolete Wireless cards support (pre-802.11) | 492 | # Obsolete Wireless cards support (pre-802.11) |
| @@ -513,6 +525,7 @@ CONFIG_PCMCIA_HERMES=m | |||
| 513 | # | 525 | # |
| 514 | # CONFIG_PRISM54 is not set | 526 | # CONFIG_PRISM54 is not set |
| 515 | # CONFIG_HOSTAP is not set | 527 | # CONFIG_HOSTAP is not set |
| 528 | # CONFIG_BCM43XX is not set | ||
| 516 | CONFIG_NET_WIRELESS=y | 529 | CONFIG_NET_WIRELESS=y |
| 517 | 530 | ||
| 518 | # | 531 | # |
| @@ -604,6 +617,8 @@ CONFIG_HW_CONSOLE=y | |||
| 604 | # | 617 | # |
| 605 | # Non-8250 serial port support | 618 | # Non-8250 serial port support |
| 606 | # | 619 | # |
| 620 | # CONFIG_SERIAL_VR41XX is not set | ||
| 621 | # CONFIG_SERIAL_JSM is not set | ||
| 607 | CONFIG_UNIX98_PTYS=y | 622 | CONFIG_UNIX98_PTYS=y |
| 608 | CONFIG_LEGACY_PTYS=y | 623 | CONFIG_LEGACY_PTYS=y |
| 609 | CONFIG_LEGACY_PTY_COUNT=256 | 624 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -634,6 +649,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 634 | # CONFIG_SYNCLINK_CS is not set | 649 | # CONFIG_SYNCLINK_CS is not set |
| 635 | # CONFIG_CARDMAN_4000 is not set | 650 | # CONFIG_CARDMAN_4000 is not set |
| 636 | # CONFIG_CARDMAN_4040 is not set | 651 | # CONFIG_CARDMAN_4040 is not set |
| 652 | # CONFIG_GPIO_VR41XX is not set | ||
| 637 | # CONFIG_RAW_DRIVER is not set | 653 | # CONFIG_RAW_DRIVER is not set |
| 638 | 654 | ||
| 639 | # | 655 | # |
| @@ -669,10 +685,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 669 | # | 685 | # |
| 670 | 686 | ||
| 671 | # | 687 | # |
| 672 | # Multimedia Capabilities Port drivers | ||
| 673 | # | ||
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia devices | 688 | # Multimedia devices |
| 677 | # | 689 | # |
| 678 | # CONFIG_VIDEO_DEV is not set | 690 | # CONFIG_VIDEO_DEV is not set |
| @@ -681,6 +693,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 681 | # Digital Video Broadcasting Devices | 693 | # Digital Video Broadcasting Devices |
| 682 | # | 694 | # |
| 683 | # CONFIG_DVB is not set | 695 | # CONFIG_DVB is not set |
| 696 | # CONFIG_USB_DABUSB is not set | ||
| 684 | 697 | ||
| 685 | # | 698 | # |
| 686 | # Graphics support | 699 | # Graphics support |
| @@ -703,6 +716,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 703 | # | 716 | # |
| 704 | CONFIG_USB_ARCH_HAS_HCD=y | 717 | CONFIG_USB_ARCH_HAS_HCD=y |
| 705 | CONFIG_USB_ARCH_HAS_OHCI=y | 718 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 719 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 706 | CONFIG_USB=m | 720 | CONFIG_USB=m |
| 707 | # CONFIG_USB_DEBUG is not set | 721 | # CONFIG_USB_DEBUG is not set |
| 708 | 722 | ||
| @@ -756,9 +770,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 756 | # CONFIG_USB_ACECAD is not set | 770 | # CONFIG_USB_ACECAD is not set |
| 757 | # CONFIG_USB_KBTAB is not set | 771 | # CONFIG_USB_KBTAB is not set |
| 758 | # CONFIG_USB_POWERMATE is not set | 772 | # CONFIG_USB_POWERMATE is not set |
| 759 | # CONFIG_USB_MTOUCH is not set | 773 | # CONFIG_USB_TOUCHSCREEN is not set |
| 760 | # CONFIG_USB_ITMTOUCH is not set | ||
| 761 | # CONFIG_USB_EGALAX is not set | ||
| 762 | # CONFIG_USB_YEALINK is not set | 774 | # CONFIG_USB_YEALINK is not set |
| 763 | # CONFIG_USB_XPAD is not set | 775 | # CONFIG_USB_XPAD is not set |
| 764 | # CONFIG_USB_ATI_REMOTE is not set | 776 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -772,15 +784,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 772 | # CONFIG_USB_MDC800 is not set | 784 | # CONFIG_USB_MDC800 is not set |
| 773 | 785 | ||
| 774 | # | 786 | # |
| 775 | # USB Multimedia devices | ||
| 776 | # | ||
| 777 | # CONFIG_USB_DABUSB is not set | ||
| 778 | |||
| 779 | # | ||
| 780 | # Video4Linux support is needed for USB Multimedia device support | ||
| 781 | # | ||
| 782 | |||
| 783 | # | ||
| 784 | # USB Network Adapters | 787 | # USB Network Adapters |
| 785 | # | 788 | # |
| 786 | # CONFIG_USB_CATC is not set | 789 | # CONFIG_USB_CATC is not set |
| @@ -832,13 +835,31 @@ CONFIG_USB_PEGASUS=m | |||
| 832 | # CONFIG_MMC is not set | 835 | # CONFIG_MMC is not set |
| 833 | 836 | ||
| 834 | # | 837 | # |
| 838 | # LED devices | ||
| 839 | # | ||
| 840 | # CONFIG_NEW_LEDS is not set | ||
| 841 | |||
| 842 | # | ||
| 843 | # LED drivers | ||
| 844 | # | ||
| 845 | |||
| 846 | # | ||
| 847 | # LED Triggers | ||
| 848 | # | ||
| 849 | |||
| 850 | # | ||
| 835 | # InfiniBand support | 851 | # InfiniBand support |
| 836 | # | 852 | # |
| 837 | # CONFIG_INFINIBAND is not set | 853 | # CONFIG_INFINIBAND is not set |
| 838 | 854 | ||
| 839 | # | 855 | # |
| 840 | # SN Devices | 856 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 857 | # | ||
| 858 | |||
| 859 | # | ||
| 860 | # Real Time Clock | ||
| 841 | # | 861 | # |
| 862 | # CONFIG_RTC_CLASS is not set | ||
| 842 | 863 | ||
| 843 | # | 864 | # |
| 844 | # File systems | 865 | # File systems |
| @@ -883,7 +904,6 @@ CONFIG_SYSFS=y | |||
| 883 | # CONFIG_TMPFS is not set | 904 | # CONFIG_TMPFS is not set |
| 884 | # CONFIG_HUGETLB_PAGE is not set | 905 | # CONFIG_HUGETLB_PAGE is not set |
| 885 | CONFIG_RAMFS=y | 906 | CONFIG_RAMFS=y |
| 886 | CONFIG_RELAYFS_FS=m | ||
| 887 | # CONFIG_CONFIGFS_FS is not set | 907 | # CONFIG_CONFIGFS_FS is not set |
| 888 | 908 | ||
| 889 | # | 909 | # |
| @@ -946,6 +966,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 946 | # CONFIG_MAGIC_SYSRQ is not set | 966 | # CONFIG_MAGIC_SYSRQ is not set |
| 947 | # CONFIG_DEBUG_KERNEL is not set | 967 | # CONFIG_DEBUG_KERNEL is not set |
| 948 | CONFIG_LOG_BUF_SHIFT=14 | 968 | CONFIG_LOG_BUF_SHIFT=14 |
| 969 | # CONFIG_DEBUG_FS is not set | ||
| 949 | CONFIG_CROSSCOMPILE=y | 970 | CONFIG_CROSSCOMPILE=y |
| 950 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200" | 971 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200" |
| 951 | 972 | ||
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 925d8adef88d..1ce4310fd92a 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:18 2006 | 4 | # Mon Apr 24 14:51:10 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MOMENCO_OCELOT_3=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -120,7 +122,6 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 120 | CONFIG_CPU_HAS_PREFETCH=y | 122 | CONFIG_CPU_HAS_PREFETCH=y |
| 121 | # CONFIG_MIPS_MT is not set | 123 | # CONFIG_MIPS_MT is not set |
| 122 | # CONFIG_64BIT_PHYS_ADDR is not set | 124 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 123 | # CONFIG_CPU_ADVANCED is not set | ||
| 124 | CONFIG_CPU_HAS_LLSC=y | 125 | CONFIG_CPU_HAS_LLSC=y |
| 125 | CONFIG_CPU_HAS_SYNC=y | 126 | CONFIG_CPU_HAS_SYNC=y |
| 126 | CONFIG_GENERIC_HARDIRQS=y | 127 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -144,7 +145,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 144 | # Code maturity level options | 145 | # Code maturity level options |
| 145 | # | 146 | # |
| 146 | CONFIG_EXPERIMENTAL=y | 147 | CONFIG_EXPERIMENTAL=y |
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | 148 | CONFIG_BROKEN_ON_SMP=y |
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 150 | 150 | ||
| @@ -161,6 +161,7 @@ CONFIG_SYSCTL=y | |||
| 161 | # CONFIG_AUDIT is not set | 161 | # CONFIG_AUDIT is not set |
| 162 | CONFIG_IKCONFIG=y | 162 | CONFIG_IKCONFIG=y |
| 163 | CONFIG_IKCONFIG_PROC=y | 163 | CONFIG_IKCONFIG_PROC=y |
| 164 | CONFIG_RELAY=y | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | 165 | CONFIG_INITRAMFS_SOURCE="" |
| 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 166 | CONFIG_EMBEDDED=y | 167 | CONFIG_EMBEDDED=y |
| @@ -174,10 +175,6 @@ CONFIG_BASE_FULL=y | |||
| 174 | CONFIG_FUTEX=y | 175 | CONFIG_FUTEX=y |
| 175 | CONFIG_EPOLL=y | 176 | CONFIG_EPOLL=y |
| 176 | CONFIG_SHMEM=y | 177 | CONFIG_SHMEM=y |
| 177 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 178 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 179 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 180 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 181 | CONFIG_SLAB=y | 178 | CONFIG_SLAB=y |
| 182 | # CONFIG_TINY_SHMEM is not set | 179 | # CONFIG_TINY_SHMEM is not set |
| 183 | CONFIG_BASE_SMALL=0 | 180 | CONFIG_BASE_SMALL=0 |
| @@ -189,7 +186,6 @@ CONFIG_BASE_SMALL=0 | |||
| 189 | CONFIG_MODULES=y | 186 | CONFIG_MODULES=y |
| 190 | CONFIG_MODULE_UNLOAD=y | 187 | CONFIG_MODULE_UNLOAD=y |
| 191 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 188 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 192 | CONFIG_OBSOLETE_MODPARM=y | ||
| 193 | CONFIG_MODVERSIONS=y | 189 | CONFIG_MODVERSIONS=y |
| 194 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 190 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 195 | CONFIG_KMOD=y | 191 | CONFIG_KMOD=y |
| @@ -198,6 +194,8 @@ CONFIG_KMOD=y | |||
| 198 | # Block layer | 194 | # Block layer |
| 199 | # | 195 | # |
| 200 | # CONFIG_LBD is not set | 196 | # CONFIG_LBD is not set |
| 197 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 198 | # CONFIG_LSF is not set | ||
| 201 | 199 | ||
| 202 | # | 200 | # |
| 203 | # IO Schedulers | 201 | # IO Schedulers |
| @@ -217,7 +215,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 217 | # | 215 | # |
| 218 | CONFIG_HW_HAS_PCI=y | 216 | CONFIG_HW_HAS_PCI=y |
| 219 | CONFIG_PCI=y | 217 | CONFIG_PCI=y |
| 220 | CONFIG_PCI_LEGACY_PROC=y | ||
| 221 | CONFIG_MMU=y | 218 | CONFIG_MMU=y |
| 222 | 219 | ||
| 223 | # | 220 | # |
| @@ -245,6 +242,7 @@ CONFIG_NET=y | |||
| 245 | # | 242 | # |
| 246 | # Networking options | 243 | # Networking options |
| 247 | # | 244 | # |
| 245 | # CONFIG_NETDEBUG is not set | ||
| 248 | CONFIG_PACKET=y | 246 | CONFIG_PACKET=y |
| 249 | # CONFIG_PACKET_MMAP is not set | 247 | # CONFIG_PACKET_MMAP is not set |
| 250 | CONFIG_UNIX=y | 248 | CONFIG_UNIX=y |
| @@ -266,6 +264,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 266 | # CONFIG_INET_AH is not set | 264 | # CONFIG_INET_AH is not set |
| 267 | # CONFIG_INET_ESP is not set | 265 | # CONFIG_INET_ESP is not set |
| 268 | # CONFIG_INET_IPCOMP is not set | 266 | # CONFIG_INET_IPCOMP is not set |
| 267 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 269 | # CONFIG_INET_TUNNEL is not set | 268 | # CONFIG_INET_TUNNEL is not set |
| 270 | CONFIG_INET_DIAG=y | 269 | CONFIG_INET_DIAG=y |
| 271 | CONFIG_INET_TCP_DIAG=y | 270 | CONFIG_INET_TCP_DIAG=y |
| @@ -278,9 +277,12 @@ CONFIG_TCP_CONG_BIC=y | |||
| 278 | # CONFIG_IP_VS is not set | 277 | # CONFIG_IP_VS is not set |
| 279 | CONFIG_IPV6=m | 278 | CONFIG_IPV6=m |
| 280 | # CONFIG_IPV6_PRIVACY is not set | 279 | # CONFIG_IPV6_PRIVACY is not set |
| 280 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 281 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 281 | # CONFIG_INET6_AH is not set | 282 | # CONFIG_INET6_AH is not set |
| 282 | # CONFIG_INET6_ESP is not set | 283 | # CONFIG_INET6_ESP is not set |
| 283 | # CONFIG_INET6_IPCOMP is not set | 284 | # CONFIG_INET6_IPCOMP is not set |
| 285 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 284 | # CONFIG_INET6_TUNNEL is not set | 286 | # CONFIG_INET6_TUNNEL is not set |
| 285 | # CONFIG_IPV6_TUNNEL is not set | 287 | # CONFIG_IPV6_TUNNEL is not set |
| 286 | CONFIG_NETFILTER=y | 288 | CONFIG_NETFILTER=y |
| @@ -299,10 +301,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 299 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 301 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 302 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 303 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 302 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 307 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 308 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 309 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 310 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 306 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 311 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 312 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 308 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 313 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -332,6 +337,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 332 | # SCTP Configuration (EXPERIMENTAL) | 337 | # SCTP Configuration (EXPERIMENTAL) |
| 333 | # | 338 | # |
| 334 | # CONFIG_IP_SCTP is not set | 339 | # CONFIG_IP_SCTP is not set |
| 340 | |||
| 341 | # | ||
| 342 | # TIPC Configuration (EXPERIMENTAL) | ||
| 343 | # | ||
| 344 | # CONFIG_TIPC is not set | ||
| 335 | # CONFIG_ATM is not set | 345 | # CONFIG_ATM is not set |
| 336 | # CONFIG_BRIDGE is not set | 346 | # CONFIG_BRIDGE is not set |
| 337 | # CONFIG_VLAN_8021Q is not set | 347 | # CONFIG_VLAN_8021Q is not set |
| @@ -341,11 +351,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 341 | # CONFIG_ATALK is not set | 351 | # CONFIG_ATALK is not set |
| 342 | # CONFIG_X25 is not set | 352 | # CONFIG_X25 is not set |
| 343 | # CONFIG_LAPB is not set | 353 | # CONFIG_LAPB is not set |
| 344 | |||
| 345 | # | ||
| 346 | # TIPC Configuration (EXPERIMENTAL) | ||
| 347 | # | ||
| 348 | # CONFIG_TIPC is not set | ||
| 349 | # CONFIG_NET_DIVERT is not set | 354 | # CONFIG_NET_DIVERT is not set |
| 350 | # CONFIG_ECONET is not set | 355 | # CONFIG_ECONET is not set |
| 351 | # CONFIG_WAN_ROUTER is not set | 356 | # CONFIG_WAN_ROUTER is not set |
| @@ -367,6 +372,9 @@ CONFIG_IEEE80211=m | |||
| 367 | # CONFIG_IEEE80211_DEBUG is not set | 372 | # CONFIG_IEEE80211_DEBUG is not set |
| 368 | CONFIG_IEEE80211_CRYPT_WEP=m | 373 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 369 | CONFIG_IEEE80211_CRYPT_CCMP=m | 374 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 375 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 376 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 377 | CONFIG_WIRELESS_EXT=y | ||
| 370 | 378 | ||
| 371 | # | 379 | # |
| 372 | # Device Drivers | 380 | # Device Drivers |
| @@ -411,7 +419,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 411 | # CONFIG_BLK_DEV_NBD is not set | 419 | # CONFIG_BLK_DEV_NBD is not set |
| 412 | # CONFIG_BLK_DEV_SX8 is not set | 420 | # CONFIG_BLK_DEV_SX8 is not set |
| 413 | # CONFIG_BLK_DEV_RAM is not set | 421 | # CONFIG_BLK_DEV_RAM is not set |
| 414 | CONFIG_BLK_DEV_RAM_COUNT=16 | 422 | # CONFIG_BLK_DEV_INITRD is not set |
| 415 | # CONFIG_CDROM_PKTCDVD is not set | 423 | # CONFIG_CDROM_PKTCDVD is not set |
| 416 | CONFIG_ATA_OVER_ETH=m | 424 | CONFIG_ATA_OVER_ETH=m |
| 417 | 425 | ||
| @@ -475,7 +483,6 @@ CONFIG_ISCSI_TCP=m | |||
| 475 | # CONFIG_SCSI_INIA100 is not set | 483 | # CONFIG_SCSI_INIA100 is not set |
| 476 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 484 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 477 | # CONFIG_SCSI_IPR is not set | 485 | # CONFIG_SCSI_IPR is not set |
| 478 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 479 | # CONFIG_SCSI_QLOGIC_1280 is not set | 486 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 480 | # CONFIG_SCSI_QLA_FC is not set | 487 | # CONFIG_SCSI_QLA_FC is not set |
| 481 | # CONFIG_SCSI_LPFC is not set | 488 | # CONFIG_SCSI_LPFC is not set |
| @@ -690,6 +697,7 @@ CONFIG_HW_CONSOLE=y | |||
| 690 | # | 697 | # |
| 691 | CONFIG_SERIAL_8250=y | 698 | CONFIG_SERIAL_8250=y |
| 692 | CONFIG_SERIAL_8250_CONSOLE=y | 699 | CONFIG_SERIAL_8250_CONSOLE=y |
| 700 | CONFIG_SERIAL_8250_PCI=y | ||
| 693 | CONFIG_SERIAL_8250_NR_UARTS=4 | 701 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 694 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 702 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 695 | # CONFIG_SERIAL_8250_EXTENDED is not set | 703 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -699,6 +707,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 699 | # | 707 | # |
| 700 | CONFIG_SERIAL_CORE=y | 708 | CONFIG_SERIAL_CORE=y |
| 701 | CONFIG_SERIAL_CORE_CONSOLE=y | 709 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 710 | # CONFIG_SERIAL_JSM is not set | ||
| 702 | CONFIG_UNIX98_PTYS=y | 711 | CONFIG_UNIX98_PTYS=y |
| 703 | CONFIG_LEGACY_PTYS=y | 712 | CONFIG_LEGACY_PTYS=y |
| 704 | CONFIG_LEGACY_PTY_COUNT=256 | 713 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -756,10 +765,6 @@ CONFIG_RTC=y | |||
| 756 | # | 765 | # |
| 757 | 766 | ||
| 758 | # | 767 | # |
| 759 | # Multimedia Capabilities Port drivers | ||
| 760 | # | ||
| 761 | |||
| 762 | # | ||
| 763 | # Multimedia devices | 768 | # Multimedia devices |
| 764 | # | 769 | # |
| 765 | # CONFIG_VIDEO_DEV is not set | 770 | # CONFIG_VIDEO_DEV is not set |
| @@ -777,6 +782,7 @@ CONFIG_FB=y | |||
| 777 | # CONFIG_FB_CFB_COPYAREA is not set | 782 | # CONFIG_FB_CFB_COPYAREA is not set |
| 778 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 783 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| 779 | # CONFIG_FB_MACMODES is not set | 784 | # CONFIG_FB_MACMODES is not set |
| 785 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 780 | CONFIG_FB_MODE_HELPERS=y | 786 | CONFIG_FB_MODE_HELPERS=y |
| 781 | # CONFIG_FB_TILEBLITTING is not set | 787 | # CONFIG_FB_TILEBLITTING is not set |
| 782 | # CONFIG_FB_CIRRUS is not set | 788 | # CONFIG_FB_CIRRUS is not set |
| @@ -788,7 +794,6 @@ CONFIG_FB_MODE_HELPERS=y | |||
| 788 | # CONFIG_FB_NVIDIA is not set | 794 | # CONFIG_FB_NVIDIA is not set |
| 789 | # CONFIG_FB_RIVA is not set | 795 | # CONFIG_FB_RIVA is not set |
| 790 | # CONFIG_FB_MATROX is not set | 796 | # CONFIG_FB_MATROX is not set |
| 791 | # CONFIG_FB_RADEON_OLD is not set | ||
| 792 | # CONFIG_FB_RADEON is not set | 797 | # CONFIG_FB_RADEON is not set |
| 793 | # CONFIG_FB_ATY128 is not set | 798 | # CONFIG_FB_ATY128 is not set |
| 794 | # CONFIG_FB_ATY is not set | 799 | # CONFIG_FB_ATY is not set |
| @@ -832,6 +837,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 832 | # | 837 | # |
| 833 | CONFIG_USB_ARCH_HAS_HCD=y | 838 | CONFIG_USB_ARCH_HAS_HCD=y |
| 834 | CONFIG_USB_ARCH_HAS_OHCI=y | 839 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 840 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 835 | # CONFIG_USB is not set | 841 | # CONFIG_USB is not set |
| 836 | 842 | ||
| 837 | # | 843 | # |
| @@ -849,13 +855,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 849 | # CONFIG_MMC is not set | 855 | # CONFIG_MMC is not set |
| 850 | 856 | ||
| 851 | # | 857 | # |
| 858 | # LED devices | ||
| 859 | # | ||
| 860 | # CONFIG_NEW_LEDS is not set | ||
| 861 | |||
| 862 | # | ||
| 863 | # LED drivers | ||
| 864 | # | ||
| 865 | |||
| 866 | # | ||
| 867 | # LED Triggers | ||
| 868 | # | ||
| 869 | |||
| 870 | # | ||
| 852 | # InfiniBand support | 871 | # InfiniBand support |
| 853 | # | 872 | # |
| 854 | # CONFIG_INFINIBAND is not set | 873 | # CONFIG_INFINIBAND is not set |
| 855 | 874 | ||
| 856 | # | 875 | # |
| 857 | # SN Devices | 876 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 877 | # | ||
| 878 | |||
| 879 | # | ||
| 880 | # Real Time Clock | ||
| 858 | # | 881 | # |
| 882 | # CONFIG_RTC_CLASS is not set | ||
| 859 | 883 | ||
| 860 | # | 884 | # |
| 861 | # File systems | 885 | # File systems |
| @@ -914,7 +938,6 @@ CONFIG_SYSFS=y | |||
| 914 | CONFIG_TMPFS=y | 938 | CONFIG_TMPFS=y |
| 915 | # CONFIG_HUGETLB_PAGE is not set | 939 | # CONFIG_HUGETLB_PAGE is not set |
| 916 | CONFIG_RAMFS=y | 940 | CONFIG_RAMFS=y |
| 917 | CONFIG_RELAYFS_FS=m | ||
| 918 | # CONFIG_CONFIGFS_FS is not set | 941 | # CONFIG_CONFIGFS_FS is not set |
| 919 | 942 | ||
| 920 | # | 943 | # |
| @@ -1025,6 +1048,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1025 | # CONFIG_MAGIC_SYSRQ is not set | 1048 | # CONFIG_MAGIC_SYSRQ is not set |
| 1026 | # CONFIG_DEBUG_KERNEL is not set | 1049 | # CONFIG_DEBUG_KERNEL is not set |
| 1027 | CONFIG_LOG_BUF_SHIFT=14 | 1050 | CONFIG_LOG_BUF_SHIFT=14 |
| 1051 | # CONFIG_DEBUG_FS is not set | ||
| 1028 | CONFIG_CROSSCOMPILE=y | 1052 | CONFIG_CROSSCOMPILE=y |
| 1029 | CONFIG_CMDLINE="ip=any root=nfs" | 1053 | CONFIG_CMDLINE="ip=any root=nfs" |
| 1030 | 1054 | ||
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index ee1cf9b9eb9a..8a6aa5012f89 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:19 2006 | 4 | # Mon Apr 24 14:51:10 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MOMENCO_OCELOT_C=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -139,7 +141,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 139 | # Code maturity level options | 141 | # Code maturity level options |
| 140 | # | 142 | # |
| 141 | CONFIG_EXPERIMENTAL=y | 143 | CONFIG_EXPERIMENTAL=y |
| 142 | CONFIG_CLEAN_COMPILE=y | ||
| 143 | CONFIG_BROKEN_ON_SMP=y | 144 | CONFIG_BROKEN_ON_SMP=y |
| 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 145 | 146 | ||
| @@ -155,6 +156,7 @@ CONFIG_SYSVIPC=y | |||
| 155 | CONFIG_SYSCTL=y | 156 | CONFIG_SYSCTL=y |
| 156 | # CONFIG_AUDIT is not set | 157 | # CONFIG_AUDIT is not set |
| 157 | # CONFIG_IKCONFIG is not set | 158 | # CONFIG_IKCONFIG is not set |
| 159 | CONFIG_RELAY=y | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | 160 | CONFIG_INITRAMFS_SOURCE="" |
| 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 161 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 160 | CONFIG_EMBEDDED=y | 162 | CONFIG_EMBEDDED=y |
| @@ -168,10 +170,6 @@ CONFIG_BASE_FULL=y | |||
| 168 | CONFIG_FUTEX=y | 170 | CONFIG_FUTEX=y |
| 169 | CONFIG_EPOLL=y | 171 | CONFIG_EPOLL=y |
| 170 | CONFIG_SHMEM=y | 172 | CONFIG_SHMEM=y |
| 171 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 172 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 173 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 174 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 175 | CONFIG_SLAB=y | 173 | CONFIG_SLAB=y |
| 176 | # CONFIG_TINY_SHMEM is not set | 174 | # CONFIG_TINY_SHMEM is not set |
| 177 | CONFIG_BASE_SMALL=0 | 175 | CONFIG_BASE_SMALL=0 |
| @@ -185,6 +183,7 @@ CONFIG_BASE_SMALL=0 | |||
| 185 | # | 183 | # |
| 186 | # Block layer | 184 | # Block layer |
| 187 | # | 185 | # |
| 186 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 188 | 187 | ||
| 189 | # | 188 | # |
| 190 | # IO Schedulers | 189 | # IO Schedulers |
| @@ -204,7 +203,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 204 | # | 203 | # |
| 205 | CONFIG_HW_HAS_PCI=y | 204 | CONFIG_HW_HAS_PCI=y |
| 206 | CONFIG_PCI=y | 205 | CONFIG_PCI=y |
| 207 | CONFIG_PCI_LEGACY_PROC=y | ||
| 208 | CONFIG_MMU=y | 206 | CONFIG_MMU=y |
| 209 | 207 | ||
| 210 | # | 208 | # |
| @@ -222,6 +220,7 @@ CONFIG_MMU=y | |||
| 222 | # | 220 | # |
| 223 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
| 224 | # CONFIG_BINFMT_MISC is not set | 222 | # CONFIG_BINFMT_MISC is not set |
| 223 | # CONFIG_BUILD_ELF64 is not set | ||
| 225 | CONFIG_MIPS32_COMPAT=y | 224 | CONFIG_MIPS32_COMPAT=y |
| 226 | CONFIG_COMPAT=y | 225 | CONFIG_COMPAT=y |
| 227 | CONFIG_MIPS32_O32=y | 226 | CONFIG_MIPS32_O32=y |
| @@ -236,6 +235,7 @@ CONFIG_NET=y | |||
| 236 | # | 235 | # |
| 237 | # Networking options | 236 | # Networking options |
| 238 | # | 237 | # |
| 238 | # CONFIG_NETDEBUG is not set | ||
| 239 | # CONFIG_PACKET is not set | 239 | # CONFIG_PACKET is not set |
| 240 | CONFIG_UNIX=y | 240 | CONFIG_UNIX=y |
| 241 | CONFIG_XFRM=y | 241 | CONFIG_XFRM=y |
| @@ -256,12 +256,15 @@ CONFIG_IP_PNP_DHCP=y | |||
| 256 | # CONFIG_INET_AH is not set | 256 | # CONFIG_INET_AH is not set |
| 257 | # CONFIG_INET_ESP is not set | 257 | # CONFIG_INET_ESP is not set |
| 258 | # CONFIG_INET_IPCOMP is not set | 258 | # CONFIG_INET_IPCOMP is not set |
| 259 | CONFIG_INET_TUNNEL=y | 259 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 260 | # CONFIG_INET_TUNNEL is not set | ||
| 260 | CONFIG_INET_DIAG=y | 261 | CONFIG_INET_DIAG=y |
| 261 | CONFIG_INET_TCP_DIAG=y | 262 | CONFIG_INET_TCP_DIAG=y |
| 262 | # CONFIG_TCP_CONG_ADVANCED is not set | 263 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 263 | CONFIG_TCP_CONG_BIC=y | 264 | CONFIG_TCP_CONG_BIC=y |
| 264 | # CONFIG_IPV6 is not set | 265 | # CONFIG_IPV6 is not set |
| 266 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 267 | # CONFIG_INET6_TUNNEL is not set | ||
| 265 | # CONFIG_NETFILTER is not set | 268 | # CONFIG_NETFILTER is not set |
| 266 | 269 | ||
| 267 | # | 270 | # |
| @@ -273,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 273 | # SCTP Configuration (EXPERIMENTAL) | 276 | # SCTP Configuration (EXPERIMENTAL) |
| 274 | # | 277 | # |
| 275 | # CONFIG_IP_SCTP is not set | 278 | # CONFIG_IP_SCTP is not set |
| 279 | |||
| 280 | # | ||
| 281 | # TIPC Configuration (EXPERIMENTAL) | ||
| 282 | # | ||
| 283 | # CONFIG_TIPC is not set | ||
| 276 | # CONFIG_ATM is not set | 284 | # CONFIG_ATM is not set |
| 277 | # CONFIG_BRIDGE is not set | 285 | # CONFIG_BRIDGE is not set |
| 278 | # CONFIG_VLAN_8021Q is not set | 286 | # CONFIG_VLAN_8021Q is not set |
| @@ -282,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 282 | # CONFIG_ATALK is not set | 290 | # CONFIG_ATALK is not set |
| 283 | # CONFIG_X25 is not set | 291 | # CONFIG_X25 is not set |
| 284 | # CONFIG_LAPB is not set | 292 | # CONFIG_LAPB is not set |
| 285 | |||
| 286 | # | ||
| 287 | # TIPC Configuration (EXPERIMENTAL) | ||
| 288 | # | ||
| 289 | # CONFIG_TIPC is not set | ||
| 290 | # CONFIG_NET_DIVERT is not set | 293 | # CONFIG_NET_DIVERT is not set |
| 291 | # CONFIG_ECONET is not set | 294 | # CONFIG_ECONET is not set |
| 292 | # CONFIG_WAN_ROUTER is not set | 295 | # CONFIG_WAN_ROUTER is not set |
| @@ -307,6 +310,9 @@ CONFIG_IEEE80211=y | |||
| 307 | # CONFIG_IEEE80211_DEBUG is not set | 310 | # CONFIG_IEEE80211_DEBUG is not set |
| 308 | CONFIG_IEEE80211_CRYPT_WEP=y | 311 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 309 | CONFIG_IEEE80211_CRYPT_CCMP=y | 312 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 313 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 314 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 315 | CONFIG_WIRELESS_EXT=y | ||
| 310 | 316 | ||
| 311 | # | 317 | # |
| 312 | # Device Drivers | 318 | # Device Drivers |
| @@ -351,7 +357,7 @@ CONFIG_PROC_EVENTS=y | |||
| 351 | # CONFIG_BLK_DEV_NBD is not set | 357 | # CONFIG_BLK_DEV_NBD is not set |
| 352 | # CONFIG_BLK_DEV_SX8 is not set | 358 | # CONFIG_BLK_DEV_SX8 is not set |
| 353 | # CONFIG_BLK_DEV_RAM is not set | 359 | # CONFIG_BLK_DEV_RAM is not set |
| 354 | CONFIG_BLK_DEV_RAM_COUNT=16 | 360 | # CONFIG_BLK_DEV_INITRD is not set |
| 355 | CONFIG_CDROM_PKTCDVD=y | 361 | CONFIG_CDROM_PKTCDVD=y |
| 356 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 362 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 357 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 363 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -542,6 +548,7 @@ CONFIG_HW_CONSOLE=y | |||
| 542 | # | 548 | # |
| 543 | CONFIG_SERIAL_8250=y | 549 | CONFIG_SERIAL_8250=y |
| 544 | CONFIG_SERIAL_8250_CONSOLE=y | 550 | CONFIG_SERIAL_8250_CONSOLE=y |
| 551 | CONFIG_SERIAL_8250_PCI=y | ||
| 545 | CONFIG_SERIAL_8250_NR_UARTS=4 | 552 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 546 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 553 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 547 | # CONFIG_SERIAL_8250_EXTENDED is not set | 554 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -551,6 +558,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 551 | # | 558 | # |
| 552 | CONFIG_SERIAL_CORE=y | 559 | CONFIG_SERIAL_CORE=y |
| 553 | CONFIG_SERIAL_CORE_CONSOLE=y | 560 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 561 | # CONFIG_SERIAL_JSM is not set | ||
| 554 | CONFIG_UNIX98_PTYS=y | 562 | CONFIG_UNIX98_PTYS=y |
| 555 | CONFIG_LEGACY_PTYS=y | 563 | CONFIG_LEGACY_PTYS=y |
| 556 | CONFIG_LEGACY_PTY_COUNT=256 | 564 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -609,10 +617,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 609 | # | 617 | # |
| 610 | 618 | ||
| 611 | # | 619 | # |
| 612 | # Multimedia Capabilities Port drivers | ||
| 613 | # | ||
| 614 | |||
| 615 | # | ||
| 616 | # Multimedia devices | 620 | # Multimedia devices |
| 617 | # | 621 | # |
| 618 | # CONFIG_VIDEO_DEV is not set | 622 | # CONFIG_VIDEO_DEV is not set |
| @@ -643,6 +647,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 643 | # | 647 | # |
| 644 | CONFIG_USB_ARCH_HAS_HCD=y | 648 | CONFIG_USB_ARCH_HAS_HCD=y |
| 645 | CONFIG_USB_ARCH_HAS_OHCI=y | 649 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 650 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 646 | # CONFIG_USB is not set | 651 | # CONFIG_USB is not set |
| 647 | 652 | ||
| 648 | # | 653 | # |
| @@ -660,13 +665,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 660 | # CONFIG_MMC is not set | 665 | # CONFIG_MMC is not set |
| 661 | 666 | ||
| 662 | # | 667 | # |
| 668 | # LED devices | ||
| 669 | # | ||
| 670 | # CONFIG_NEW_LEDS is not set | ||
| 671 | |||
| 672 | # | ||
| 673 | # LED drivers | ||
| 674 | # | ||
| 675 | |||
| 676 | # | ||
| 677 | # LED Triggers | ||
| 678 | # | ||
| 679 | |||
| 680 | # | ||
| 663 | # InfiniBand support | 681 | # InfiniBand support |
| 664 | # | 682 | # |
| 665 | # CONFIG_INFINIBAND is not set | 683 | # CONFIG_INFINIBAND is not set |
| 666 | 684 | ||
| 667 | # | 685 | # |
| 668 | # SN Devices | 686 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 687 | # | ||
| 688 | |||
| 689 | # | ||
| 690 | # Real Time Clock | ||
| 669 | # | 691 | # |
| 692 | # CONFIG_RTC_CLASS is not set | ||
| 670 | 693 | ||
| 671 | # | 694 | # |
| 672 | # File systems | 695 | # File systems |
| @@ -711,7 +734,6 @@ CONFIG_SYSFS=y | |||
| 711 | # CONFIG_TMPFS is not set | 734 | # CONFIG_TMPFS is not set |
| 712 | # CONFIG_HUGETLB_PAGE is not set | 735 | # CONFIG_HUGETLB_PAGE is not set |
| 713 | CONFIG_RAMFS=y | 736 | CONFIG_RAMFS=y |
| 714 | CONFIG_RELAYFS_FS=y | ||
| 715 | # CONFIG_CONFIGFS_FS is not set | 737 | # CONFIG_CONFIGFS_FS is not set |
| 716 | 738 | ||
| 717 | # | 739 | # |
| @@ -778,6 +800,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 778 | # CONFIG_MAGIC_SYSRQ is not set | 800 | # CONFIG_MAGIC_SYSRQ is not set |
| 779 | # CONFIG_DEBUG_KERNEL is not set | 801 | # CONFIG_DEBUG_KERNEL is not set |
| 780 | CONFIG_LOG_BUF_SHIFT=14 | 802 | CONFIG_LOG_BUF_SHIFT=14 |
| 803 | # CONFIG_DEBUG_FS is not set | ||
| 804 | # CONFIG_UNWIND_INFO is not set | ||
| 781 | CONFIG_CROSSCOMPILE=y | 805 | CONFIG_CROSSCOMPILE=y |
| 782 | CONFIG_CMDLINE="" | 806 | CONFIG_CMDLINE="" |
| 783 | 807 | ||
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index d80ff278f2af..f9ee35eeb762 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:20 2006 | 4 | # Mon Apr 24 14:51:11 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MOMENCO_OCELOT=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -121,7 +123,6 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
| 121 | CONFIG_CPU_HAS_PREFETCH=y | 123 | CONFIG_CPU_HAS_PREFETCH=y |
| 122 | # CONFIG_MIPS_MT is not set | 124 | # CONFIG_MIPS_MT is not set |
| 123 | # CONFIG_64BIT_PHYS_ADDR is not set | 125 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 124 | # CONFIG_CPU_ADVANCED is not set | ||
| 125 | CONFIG_CPU_HAS_LLSC=y | 126 | CONFIG_CPU_HAS_LLSC=y |
| 126 | CONFIG_CPU_HAS_SYNC=y | 127 | CONFIG_CPU_HAS_SYNC=y |
| 127 | CONFIG_GENERIC_HARDIRQS=y | 128 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -144,7 +145,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 144 | # Code maturity level options | 145 | # Code maturity level options |
| 145 | # | 146 | # |
| 146 | CONFIG_EXPERIMENTAL=y | 147 | CONFIG_EXPERIMENTAL=y |
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | 148 | CONFIG_BROKEN_ON_SMP=y |
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 150 | 150 | ||
| @@ -160,6 +160,7 @@ CONFIG_SYSVIPC=y | |||
| 160 | CONFIG_SYSCTL=y | 160 | CONFIG_SYSCTL=y |
| 161 | # CONFIG_AUDIT is not set | 161 | # CONFIG_AUDIT is not set |
| 162 | # CONFIG_IKCONFIG is not set | 162 | # CONFIG_IKCONFIG is not set |
| 163 | CONFIG_RELAY=y | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | 164 | CONFIG_INITRAMFS_SOURCE="" |
| 164 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 165 | CONFIG_EMBEDDED=y | 166 | CONFIG_EMBEDDED=y |
| @@ -173,10 +174,6 @@ CONFIG_BASE_FULL=y | |||
| 173 | CONFIG_FUTEX=y | 174 | CONFIG_FUTEX=y |
| 174 | CONFIG_EPOLL=y | 175 | CONFIG_EPOLL=y |
| 175 | CONFIG_SHMEM=y | 176 | CONFIG_SHMEM=y |
| 176 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 177 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 178 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 179 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 180 | CONFIG_SLAB=y | 177 | CONFIG_SLAB=y |
| 181 | # CONFIG_TINY_SHMEM is not set | 178 | # CONFIG_TINY_SHMEM is not set |
| 182 | CONFIG_BASE_SMALL=0 | 179 | CONFIG_BASE_SMALL=0 |
| @@ -191,6 +188,8 @@ CONFIG_BASE_SMALL=0 | |||
| 191 | # Block layer | 188 | # Block layer |
| 192 | # | 189 | # |
| 193 | # CONFIG_LBD is not set | 190 | # CONFIG_LBD is not set |
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 194 | 193 | ||
| 195 | # | 194 | # |
| 196 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -236,6 +235,7 @@ CONFIG_NET=y | |||
| 236 | # | 235 | # |
| 237 | # Networking options | 236 | # Networking options |
| 238 | # | 237 | # |
| 238 | # CONFIG_NETDEBUG is not set | ||
| 239 | # CONFIG_PACKET is not set | 239 | # CONFIG_PACKET is not set |
| 240 | CONFIG_UNIX=y | 240 | CONFIG_UNIX=y |
| 241 | CONFIG_XFRM=y | 241 | CONFIG_XFRM=y |
| @@ -256,12 +256,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 256 | # CONFIG_INET_AH is not set | 256 | # CONFIG_INET_AH is not set |
| 257 | # CONFIG_INET_ESP is not set | 257 | # CONFIG_INET_ESP is not set |
| 258 | # CONFIG_INET_IPCOMP is not set | 258 | # CONFIG_INET_IPCOMP is not set |
| 259 | CONFIG_INET_TUNNEL=y | 259 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 260 | # CONFIG_INET_TUNNEL is not set | ||
| 260 | CONFIG_INET_DIAG=y | 261 | CONFIG_INET_DIAG=y |
| 261 | CONFIG_INET_TCP_DIAG=y | 262 | CONFIG_INET_TCP_DIAG=y |
| 262 | # CONFIG_TCP_CONG_ADVANCED is not set | 263 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 263 | CONFIG_TCP_CONG_BIC=y | 264 | CONFIG_TCP_CONG_BIC=y |
| 264 | # CONFIG_IPV6 is not set | 265 | # CONFIG_IPV6 is not set |
| 266 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 267 | # CONFIG_INET6_TUNNEL is not set | ||
| 265 | # CONFIG_NETFILTER is not set | 268 | # CONFIG_NETFILTER is not set |
| 266 | 269 | ||
| 267 | # | 270 | # |
| @@ -273,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 273 | # SCTP Configuration (EXPERIMENTAL) | 276 | # SCTP Configuration (EXPERIMENTAL) |
| 274 | # | 277 | # |
| 275 | # CONFIG_IP_SCTP is not set | 278 | # CONFIG_IP_SCTP is not set |
| 279 | |||
| 280 | # | ||
| 281 | # TIPC Configuration (EXPERIMENTAL) | ||
| 282 | # | ||
| 283 | # CONFIG_TIPC is not set | ||
| 276 | # CONFIG_ATM is not set | 284 | # CONFIG_ATM is not set |
| 277 | # CONFIG_BRIDGE is not set | 285 | # CONFIG_BRIDGE is not set |
| 278 | # CONFIG_VLAN_8021Q is not set | 286 | # CONFIG_VLAN_8021Q is not set |
| @@ -282,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 282 | # CONFIG_ATALK is not set | 290 | # CONFIG_ATALK is not set |
| 283 | # CONFIG_X25 is not set | 291 | # CONFIG_X25 is not set |
| 284 | # CONFIG_LAPB is not set | 292 | # CONFIG_LAPB is not set |
| 285 | |||
| 286 | # | ||
| 287 | # TIPC Configuration (EXPERIMENTAL) | ||
| 288 | # | ||
| 289 | # CONFIG_TIPC is not set | ||
| 290 | # CONFIG_NET_DIVERT is not set | 293 | # CONFIG_NET_DIVERT is not set |
| 291 | # CONFIG_ECONET is not set | 294 | # CONFIG_ECONET is not set |
| 292 | # CONFIG_WAN_ROUTER is not set | 295 | # CONFIG_WAN_ROUTER is not set |
| @@ -307,6 +310,9 @@ CONFIG_IEEE80211=y | |||
| 307 | # CONFIG_IEEE80211_DEBUG is not set | 310 | # CONFIG_IEEE80211_DEBUG is not set |
| 308 | CONFIG_IEEE80211_CRYPT_WEP=y | 311 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 309 | CONFIG_IEEE80211_CRYPT_CCMP=y | 312 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 313 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 314 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 315 | CONFIG_WIRELESS_EXT=y | ||
| 310 | 316 | ||
| 311 | # | 317 | # |
| 312 | # Device Drivers | 318 | # Device Drivers |
| @@ -346,7 +352,7 @@ CONFIG_PROC_EVENTS=y | |||
| 346 | # CONFIG_BLK_DEV_LOOP is not set | 352 | # CONFIG_BLK_DEV_LOOP is not set |
| 347 | # CONFIG_BLK_DEV_NBD is not set | 353 | # CONFIG_BLK_DEV_NBD is not set |
| 348 | # CONFIG_BLK_DEV_RAM is not set | 354 | # CONFIG_BLK_DEV_RAM is not set |
| 349 | CONFIG_BLK_DEV_RAM_COUNT=16 | 355 | # CONFIG_BLK_DEV_INITRD is not set |
| 350 | CONFIG_CDROM_PKTCDVD=y | 356 | CONFIG_CDROM_PKTCDVD=y |
| 351 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 357 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 352 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 358 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -563,10 +569,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 563 | # | 569 | # |
| 564 | 570 | ||
| 565 | # | 571 | # |
| 566 | # Multimedia Capabilities Port drivers | ||
| 567 | # | ||
| 568 | |||
| 569 | # | ||
| 570 | # Multimedia devices | 572 | # Multimedia devices |
| 571 | # | 573 | # |
| 572 | # CONFIG_VIDEO_DEV is not set | 574 | # CONFIG_VIDEO_DEV is not set |
| @@ -597,6 +599,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 597 | # | 599 | # |
| 598 | # CONFIG_USB_ARCH_HAS_HCD is not set | 600 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 599 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 601 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 602 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 600 | 603 | ||
| 601 | # | 604 | # |
| 602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 605 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -613,12 +616,30 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 613 | # CONFIG_MMC is not set | 616 | # CONFIG_MMC is not set |
| 614 | 617 | ||
| 615 | # | 618 | # |
| 619 | # LED devices | ||
| 620 | # | ||
| 621 | # CONFIG_NEW_LEDS is not set | ||
| 622 | |||
| 623 | # | ||
| 624 | # LED drivers | ||
| 625 | # | ||
| 626 | |||
| 627 | # | ||
| 628 | # LED Triggers | ||
| 629 | # | ||
| 630 | |||
| 631 | # | ||
| 616 | # InfiniBand support | 632 | # InfiniBand support |
| 617 | # | 633 | # |
| 618 | 634 | ||
| 619 | # | 635 | # |
| 620 | # SN Devices | 636 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 637 | # | ||
| 638 | |||
| 639 | # | ||
| 640 | # Real Time Clock | ||
| 621 | # | 641 | # |
| 642 | # CONFIG_RTC_CLASS is not set | ||
| 622 | 643 | ||
| 623 | # | 644 | # |
| 624 | # File systems | 645 | # File systems |
| @@ -663,7 +684,6 @@ CONFIG_SYSFS=y | |||
| 663 | # CONFIG_TMPFS is not set | 684 | # CONFIG_TMPFS is not set |
| 664 | # CONFIG_HUGETLB_PAGE is not set | 685 | # CONFIG_HUGETLB_PAGE is not set |
| 665 | CONFIG_RAMFS=y | 686 | CONFIG_RAMFS=y |
| 666 | CONFIG_RELAYFS_FS=y | ||
| 667 | # CONFIG_CONFIGFS_FS is not set | 687 | # CONFIG_CONFIGFS_FS is not set |
| 668 | 688 | ||
| 669 | # | 689 | # |
| @@ -730,6 +750,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 730 | # CONFIG_MAGIC_SYSRQ is not set | 750 | # CONFIG_MAGIC_SYSRQ is not set |
| 731 | # CONFIG_DEBUG_KERNEL is not set | 751 | # CONFIG_DEBUG_KERNEL is not set |
| 732 | CONFIG_LOG_BUF_SHIFT=14 | 752 | CONFIG_LOG_BUF_SHIFT=14 |
| 753 | # CONFIG_DEBUG_FS is not set | ||
| 754 | # CONFIG_UNWIND_INFO is not set | ||
| 733 | CONFIG_CROSSCOMPILE=y | 755 | CONFIG_CROSSCOMPILE=y |
| 734 | CONFIG_CMDLINE="" | 756 | CONFIG_CMDLINE="" |
| 735 | 757 | ||
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index c0f508d180c4..b48bdee2411f 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:21 2006 | 4 | # Mon Apr 24 14:51:11 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MOMENCO_OCELOT_G=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -142,7 +144,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 142 | # Code maturity level options | 144 | # Code maturity level options |
| 143 | # | 145 | # |
| 144 | CONFIG_EXPERIMENTAL=y | 146 | CONFIG_EXPERIMENTAL=y |
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | 147 | CONFIG_BROKEN_ON_SMP=y |
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 148 | 149 | ||
| @@ -158,6 +159,7 @@ CONFIG_SYSVIPC=y | |||
| 158 | CONFIG_SYSCTL=y | 159 | CONFIG_SYSCTL=y |
| 159 | # CONFIG_AUDIT is not set | 160 | # CONFIG_AUDIT is not set |
| 160 | # CONFIG_IKCONFIG is not set | 161 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_RELAY=y | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | 163 | CONFIG_INITRAMFS_SOURCE="" |
| 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 164 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 163 | CONFIG_EMBEDDED=y | 165 | CONFIG_EMBEDDED=y |
| @@ -171,10 +173,6 @@ CONFIG_BASE_FULL=y | |||
| 171 | CONFIG_FUTEX=y | 173 | CONFIG_FUTEX=y |
| 172 | CONFIG_EPOLL=y | 174 | CONFIG_EPOLL=y |
| 173 | CONFIG_SHMEM=y | 175 | CONFIG_SHMEM=y |
| 174 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 175 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 176 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 177 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 178 | CONFIG_SLAB=y | 176 | CONFIG_SLAB=y |
| 179 | # CONFIG_TINY_SHMEM is not set | 177 | # CONFIG_TINY_SHMEM is not set |
| 180 | CONFIG_BASE_SMALL=0 | 178 | CONFIG_BASE_SMALL=0 |
| @@ -188,6 +186,7 @@ CONFIG_BASE_SMALL=0 | |||
| 188 | # | 186 | # |
| 189 | # Block layer | 187 | # Block layer |
| 190 | # | 188 | # |
| 189 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 191 | 190 | ||
| 192 | # | 191 | # |
| 193 | # IO Schedulers | 192 | # IO Schedulers |
| @@ -207,7 +206,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 207 | # | 206 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| 209 | CONFIG_PCI=y | 208 | CONFIG_PCI=y |
| 210 | CONFIG_PCI_LEGACY_PROC=y | ||
| 211 | CONFIG_MMU=y | 209 | CONFIG_MMU=y |
| 212 | 210 | ||
| 213 | # | 211 | # |
| @@ -225,6 +223,7 @@ CONFIG_MMU=y | |||
| 225 | # | 223 | # |
| 226 | CONFIG_BINFMT_ELF=y | 224 | CONFIG_BINFMT_ELF=y |
| 227 | # CONFIG_BINFMT_MISC is not set | 225 | # CONFIG_BINFMT_MISC is not set |
| 226 | # CONFIG_BUILD_ELF64 is not set | ||
| 228 | CONFIG_MIPS32_COMPAT=y | 227 | CONFIG_MIPS32_COMPAT=y |
| 229 | CONFIG_COMPAT=y | 228 | CONFIG_COMPAT=y |
| 230 | CONFIG_MIPS32_O32=y | 229 | CONFIG_MIPS32_O32=y |
| @@ -239,6 +238,7 @@ CONFIG_NET=y | |||
| 239 | # | 238 | # |
| 240 | # Networking options | 239 | # Networking options |
| 241 | # | 240 | # |
| 241 | # CONFIG_NETDEBUG is not set | ||
| 242 | # CONFIG_PACKET is not set | 242 | # CONFIG_PACKET is not set |
| 243 | CONFIG_UNIX=y | 243 | CONFIG_UNIX=y |
| 244 | CONFIG_XFRM=y | 244 | CONFIG_XFRM=y |
| @@ -259,12 +259,15 @@ CONFIG_IP_PNP_DHCP=y | |||
| 259 | # CONFIG_INET_AH is not set | 259 | # CONFIG_INET_AH is not set |
| 260 | # CONFIG_INET_ESP is not set | 260 | # CONFIG_INET_ESP is not set |
| 261 | # CONFIG_INET_IPCOMP is not set | 261 | # CONFIG_INET_IPCOMP is not set |
| 262 | CONFIG_INET_TUNNEL=y | 262 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 263 | # CONFIG_INET_TUNNEL is not set | ||
| 263 | CONFIG_INET_DIAG=y | 264 | CONFIG_INET_DIAG=y |
| 264 | CONFIG_INET_TCP_DIAG=y | 265 | CONFIG_INET_TCP_DIAG=y |
| 265 | # CONFIG_TCP_CONG_ADVANCED is not set | 266 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 266 | CONFIG_TCP_CONG_BIC=y | 267 | CONFIG_TCP_CONG_BIC=y |
| 267 | # CONFIG_IPV6 is not set | 268 | # CONFIG_IPV6 is not set |
| 269 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 270 | # CONFIG_INET6_TUNNEL is not set | ||
| 268 | # CONFIG_NETFILTER is not set | 271 | # CONFIG_NETFILTER is not set |
| 269 | 272 | ||
| 270 | # | 273 | # |
| @@ -276,6 +279,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 276 | # SCTP Configuration (EXPERIMENTAL) | 279 | # SCTP Configuration (EXPERIMENTAL) |
| 277 | # | 280 | # |
| 278 | # CONFIG_IP_SCTP is not set | 281 | # CONFIG_IP_SCTP is not set |
| 282 | |||
| 283 | # | ||
| 284 | # TIPC Configuration (EXPERIMENTAL) | ||
| 285 | # | ||
| 286 | # CONFIG_TIPC is not set | ||
| 279 | # CONFIG_ATM is not set | 287 | # CONFIG_ATM is not set |
| 280 | # CONFIG_BRIDGE is not set | 288 | # CONFIG_BRIDGE is not set |
| 281 | # CONFIG_VLAN_8021Q is not set | 289 | # CONFIG_VLAN_8021Q is not set |
| @@ -285,11 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 285 | # CONFIG_ATALK is not set | 293 | # CONFIG_ATALK is not set |
| 286 | # CONFIG_X25 is not set | 294 | # CONFIG_X25 is not set |
| 287 | # CONFIG_LAPB is not set | 295 | # CONFIG_LAPB is not set |
| 288 | |||
| 289 | # | ||
| 290 | # TIPC Configuration (EXPERIMENTAL) | ||
| 291 | # | ||
| 292 | # CONFIG_TIPC is not set | ||
| 293 | # CONFIG_NET_DIVERT is not set | 296 | # CONFIG_NET_DIVERT is not set |
| 294 | # CONFIG_ECONET is not set | 297 | # CONFIG_ECONET is not set |
| 295 | # CONFIG_WAN_ROUTER is not set | 298 | # CONFIG_WAN_ROUTER is not set |
| @@ -310,6 +313,9 @@ CONFIG_IEEE80211=y | |||
| 310 | # CONFIG_IEEE80211_DEBUG is not set | 313 | # CONFIG_IEEE80211_DEBUG is not set |
| 311 | CONFIG_IEEE80211_CRYPT_WEP=y | 314 | CONFIG_IEEE80211_CRYPT_WEP=y |
| 312 | CONFIG_IEEE80211_CRYPT_CCMP=y | 315 | CONFIG_IEEE80211_CRYPT_CCMP=y |
| 316 | CONFIG_IEEE80211_SOFTMAC=y | ||
| 317 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 318 | CONFIG_WIRELESS_EXT=y | ||
| 313 | 319 | ||
| 314 | # | 320 | # |
| 315 | # Device Drivers | 321 | # Device Drivers |
| @@ -354,7 +360,7 @@ CONFIG_PROC_EVENTS=y | |||
| 354 | # CONFIG_BLK_DEV_NBD is not set | 360 | # CONFIG_BLK_DEV_NBD is not set |
| 355 | # CONFIG_BLK_DEV_SX8 is not set | 361 | # CONFIG_BLK_DEV_SX8 is not set |
| 356 | # CONFIG_BLK_DEV_RAM is not set | 362 | # CONFIG_BLK_DEV_RAM is not set |
| 357 | CONFIG_BLK_DEV_RAM_COUNT=16 | 363 | # CONFIG_BLK_DEV_INITRD is not set |
| 358 | CONFIG_CDROM_PKTCDVD=y | 364 | CONFIG_CDROM_PKTCDVD=y |
| 359 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 365 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 360 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 366 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -545,6 +551,7 @@ CONFIG_HW_CONSOLE=y | |||
| 545 | # | 551 | # |
| 546 | CONFIG_SERIAL_8250=y | 552 | CONFIG_SERIAL_8250=y |
| 547 | CONFIG_SERIAL_8250_CONSOLE=y | 553 | CONFIG_SERIAL_8250_CONSOLE=y |
| 554 | CONFIG_SERIAL_8250_PCI=y | ||
| 548 | CONFIG_SERIAL_8250_NR_UARTS=4 | 555 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 549 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 556 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 550 | # CONFIG_SERIAL_8250_EXTENDED is not set | 557 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -554,6 +561,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 554 | # | 561 | # |
| 555 | CONFIG_SERIAL_CORE=y | 562 | CONFIG_SERIAL_CORE=y |
| 556 | CONFIG_SERIAL_CORE_CONSOLE=y | 563 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 564 | # CONFIG_SERIAL_JSM is not set | ||
| 557 | CONFIG_UNIX98_PTYS=y | 565 | CONFIG_UNIX98_PTYS=y |
| 558 | CONFIG_LEGACY_PTYS=y | 566 | CONFIG_LEGACY_PTYS=y |
| 559 | CONFIG_LEGACY_PTY_COUNT=256 | 567 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -612,10 +620,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 612 | # | 620 | # |
| 613 | 621 | ||
| 614 | # | 622 | # |
| 615 | # Multimedia Capabilities Port drivers | ||
| 616 | # | ||
| 617 | |||
| 618 | # | ||
| 619 | # Multimedia devices | 623 | # Multimedia devices |
| 620 | # | 624 | # |
| 621 | # CONFIG_VIDEO_DEV is not set | 625 | # CONFIG_VIDEO_DEV is not set |
| @@ -646,6 +650,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 646 | # | 650 | # |
| 647 | CONFIG_USB_ARCH_HAS_HCD=y | 651 | CONFIG_USB_ARCH_HAS_HCD=y |
| 648 | CONFIG_USB_ARCH_HAS_OHCI=y | 652 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 653 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 649 | # CONFIG_USB is not set | 654 | # CONFIG_USB is not set |
| 650 | 655 | ||
| 651 | # | 656 | # |
| @@ -663,13 +668,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 663 | # CONFIG_MMC is not set | 668 | # CONFIG_MMC is not set |
| 664 | 669 | ||
| 665 | # | 670 | # |
| 671 | # LED devices | ||
| 672 | # | ||
| 673 | # CONFIG_NEW_LEDS is not set | ||
| 674 | |||
| 675 | # | ||
| 676 | # LED drivers | ||
| 677 | # | ||
| 678 | |||
| 679 | # | ||
| 680 | # LED Triggers | ||
| 681 | # | ||
| 682 | |||
| 683 | # | ||
| 666 | # InfiniBand support | 684 | # InfiniBand support |
| 667 | # | 685 | # |
| 668 | # CONFIG_INFINIBAND is not set | 686 | # CONFIG_INFINIBAND is not set |
| 669 | 687 | ||
| 670 | # | 688 | # |
| 671 | # SN Devices | 689 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 690 | # | ||
| 691 | |||
| 692 | # | ||
| 693 | # Real Time Clock | ||
| 672 | # | 694 | # |
| 695 | # CONFIG_RTC_CLASS is not set | ||
| 673 | 696 | ||
| 674 | # | 697 | # |
| 675 | # File systems | 698 | # File systems |
| @@ -714,7 +737,6 @@ CONFIG_SYSFS=y | |||
| 714 | # CONFIG_TMPFS is not set | 737 | # CONFIG_TMPFS is not set |
| 715 | # CONFIG_HUGETLB_PAGE is not set | 738 | # CONFIG_HUGETLB_PAGE is not set |
| 716 | CONFIG_RAMFS=y | 739 | CONFIG_RAMFS=y |
| 717 | CONFIG_RELAYFS_FS=y | ||
| 718 | # CONFIG_CONFIGFS_FS is not set | 740 | # CONFIG_CONFIGFS_FS is not set |
| 719 | 741 | ||
| 720 | # | 742 | # |
| @@ -781,6 +803,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 781 | # CONFIG_MAGIC_SYSRQ is not set | 803 | # CONFIG_MAGIC_SYSRQ is not set |
| 782 | # CONFIG_DEBUG_KERNEL is not set | 804 | # CONFIG_DEBUG_KERNEL is not set |
| 783 | CONFIG_LOG_BUF_SHIFT=14 | 805 | CONFIG_LOG_BUF_SHIFT=14 |
| 806 | # CONFIG_DEBUG_FS is not set | ||
| 807 | # CONFIG_UNWIND_INFO is not set | ||
| 784 | CONFIG_CROSSCOMPILE=y | 808 | CONFIG_CROSSCOMPILE=y |
| 785 | CONFIG_CMDLINE="" | 809 | CONFIG_CMDLINE="" |
| 786 | 810 | ||
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index 194b3c772bb7..01aac40634b4 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:22 2006 | 4 | # Mon Apr 24 14:51:12 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_PB1100=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -116,11 +118,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 116 | CONFIG_CPU_HAS_PREFETCH=y | 118 | CONFIG_CPU_HAS_PREFETCH=y |
| 117 | # CONFIG_MIPS_MT is not set | 119 | # CONFIG_MIPS_MT is not set |
| 118 | CONFIG_64BIT_PHYS_ADDR=y | 120 | CONFIG_64BIT_PHYS_ADDR=y |
| 119 | # CONFIG_CPU_ADVANCED is not set | ||
| 120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
| 121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
| 122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
| 123 | CONFIG_GENERIC_IRQ_PROBE=y | 124 | CONFIG_GENERIC_IRQ_PROBE=y |
| 125 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 126 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 125 | CONFIG_SELECT_MEMORY_MODEL=y | 127 | CONFIG_SELECT_MEMORY_MODEL=y |
| 126 | CONFIG_FLATMEM_MANUAL=y | 128 | CONFIG_FLATMEM_MANUAL=y |
| @@ -138,7 +140,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 138 | # Code maturity level options | 140 | # Code maturity level options |
| 139 | # | 141 | # |
| 140 | CONFIG_EXPERIMENTAL=y | 142 | CONFIG_EXPERIMENTAL=y |
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | 143 | CONFIG_BROKEN_ON_SMP=y |
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 144 | 145 | ||
| @@ -154,6 +155,7 @@ CONFIG_SYSVIPC=y | |||
| 154 | CONFIG_SYSCTL=y | 155 | CONFIG_SYSCTL=y |
| 155 | # CONFIG_AUDIT is not set | 156 | # CONFIG_AUDIT is not set |
| 156 | # CONFIG_IKCONFIG is not set | 157 | # CONFIG_IKCONFIG is not set |
| 158 | CONFIG_RELAY=y | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | 159 | CONFIG_INITRAMFS_SOURCE="" |
| 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 160 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 159 | CONFIG_EMBEDDED=y | 161 | CONFIG_EMBEDDED=y |
| @@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 169 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 170 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 171 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 172 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 173 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 174 | CONFIG_BASE_SMALL=0 |
| @@ -183,7 +181,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 183 | CONFIG_MODULES=y | 181 | CONFIG_MODULES=y |
| 184 | CONFIG_MODULE_UNLOAD=y | 182 | CONFIG_MODULE_UNLOAD=y |
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | 184 | CONFIG_MODVERSIONS=y |
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | 185 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 189 | CONFIG_KMOD=y | 186 | CONFIG_KMOD=y |
| @@ -192,6 +189,8 @@ CONFIG_KMOD=y | |||
| 192 | # Block layer | 189 | # Block layer |
| 193 | # | 190 | # |
| 194 | # CONFIG_LBD is not set | 191 | # CONFIG_LBD is not set |
| 192 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 193 | # CONFIG_LSF is not set | ||
| 195 | 194 | ||
| 196 | # | 195 | # |
| 197 | # IO Schedulers | 196 | # IO Schedulers |
| @@ -247,6 +246,7 @@ CONFIG_NET=y | |||
| 247 | # | 246 | # |
| 248 | # Networking options | 247 | # Networking options |
| 249 | # | 248 | # |
| 249 | # CONFIG_NETDEBUG is not set | ||
| 250 | CONFIG_PACKET=y | 250 | CONFIG_PACKET=y |
| 251 | # CONFIG_PACKET_MMAP is not set | 251 | # CONFIG_PACKET_MMAP is not set |
| 252 | CONFIG_UNIX=y | 252 | CONFIG_UNIX=y |
| @@ -269,7 +269,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 269 | # CONFIG_INET_AH is not set | 269 | # CONFIG_INET_AH is not set |
| 270 | # CONFIG_INET_ESP is not set | 270 | # CONFIG_INET_ESP is not set |
| 271 | # CONFIG_INET_IPCOMP is not set | 271 | # CONFIG_INET_IPCOMP is not set |
| 272 | CONFIG_INET_TUNNEL=m | 272 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 273 | # CONFIG_INET_TUNNEL is not set | ||
| 273 | CONFIG_INET_DIAG=y | 274 | CONFIG_INET_DIAG=y |
| 274 | CONFIG_INET_TCP_DIAG=y | 275 | CONFIG_INET_TCP_DIAG=y |
| 275 | # CONFIG_TCP_CONG_ADVANCED is not set | 276 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -280,6 +281,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # | 281 | # |
| 281 | # CONFIG_IP_VS is not set | 282 | # CONFIG_IP_VS is not set |
| 282 | # CONFIG_IPV6 is not set | 283 | # CONFIG_IPV6 is not set |
| 284 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 285 | # CONFIG_INET6_TUNNEL is not set | ||
| 283 | CONFIG_NETFILTER=y | 286 | CONFIG_NETFILTER=y |
| 284 | # CONFIG_NETFILTER_DEBUG is not set | 287 | # CONFIG_NETFILTER_DEBUG is not set |
| 285 | 288 | ||
| @@ -296,10 +299,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 296 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 299 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 300 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 298 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 301 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 299 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 303 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 304 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 305 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 306 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 308 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 303 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 309 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 310 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 311 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -323,6 +329,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 323 | # SCTP Configuration (EXPERIMENTAL) | 329 | # SCTP Configuration (EXPERIMENTAL) |
| 324 | # | 330 | # |
| 325 | # CONFIG_IP_SCTP is not set | 331 | # CONFIG_IP_SCTP is not set |
| 332 | |||
| 333 | # | ||
| 334 | # TIPC Configuration (EXPERIMENTAL) | ||
| 335 | # | ||
| 336 | # CONFIG_TIPC is not set | ||
| 326 | # CONFIG_ATM is not set | 337 | # CONFIG_ATM is not set |
| 327 | # CONFIG_BRIDGE is not set | 338 | # CONFIG_BRIDGE is not set |
| 328 | # CONFIG_VLAN_8021Q is not set | 339 | # CONFIG_VLAN_8021Q is not set |
| @@ -332,11 +343,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 332 | # CONFIG_ATALK is not set | 343 | # CONFIG_ATALK is not set |
| 333 | # CONFIG_X25 is not set | 344 | # CONFIG_X25 is not set |
| 334 | # CONFIG_LAPB is not set | 345 | # CONFIG_LAPB is not set |
| 335 | |||
| 336 | # | ||
| 337 | # TIPC Configuration (EXPERIMENTAL) | ||
| 338 | # | ||
| 339 | # CONFIG_TIPC is not set | ||
| 340 | # CONFIG_NET_DIVERT is not set | 346 | # CONFIG_NET_DIVERT is not set |
| 341 | # CONFIG_ECONET is not set | 347 | # CONFIG_ECONET is not set |
| 342 | # CONFIG_WAN_ROUTER is not set | 348 | # CONFIG_WAN_ROUTER is not set |
| @@ -358,6 +364,9 @@ CONFIG_IEEE80211=m | |||
| 358 | # CONFIG_IEEE80211_DEBUG is not set | 364 | # CONFIG_IEEE80211_DEBUG is not set |
| 359 | CONFIG_IEEE80211_CRYPT_WEP=m | 365 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 360 | CONFIG_IEEE80211_CRYPT_CCMP=m | 366 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 367 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 368 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 369 | CONFIG_WIRELESS_EXT=y | ||
| 361 | 370 | ||
| 362 | # | 371 | # |
| 363 | # Device Drivers | 372 | # Device Drivers |
| @@ -414,7 +423,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 414 | # CONFIG_MTD_CFI_I8 is not set | 423 | # CONFIG_MTD_CFI_I8 is not set |
| 415 | # CONFIG_MTD_CFI_INTELEXT is not set | 424 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 416 | CONFIG_MTD_CFI_AMDSTD=y | 425 | CONFIG_MTD_CFI_AMDSTD=y |
| 417 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 418 | # CONFIG_MTD_CFI_STAA is not set | 426 | # CONFIG_MTD_CFI_STAA is not set |
| 419 | CONFIG_MTD_CFI_UTIL=y | 427 | CONFIG_MTD_CFI_UTIL=y |
| 420 | # CONFIG_MTD_RAM is not set | 428 | # CONFIG_MTD_RAM is not set |
| @@ -436,7 +444,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 436 | # CONFIG_MTD_SLRAM is not set | 444 | # CONFIG_MTD_SLRAM is not set |
| 437 | # CONFIG_MTD_PHRAM is not set | 445 | # CONFIG_MTD_PHRAM is not set |
| 438 | # CONFIG_MTD_MTDRAM is not set | 446 | # CONFIG_MTD_MTDRAM is not set |
| 439 | # CONFIG_MTD_BLKMTD is not set | ||
| 440 | # CONFIG_MTD_BLOCK2MTD is not set | 447 | # CONFIG_MTD_BLOCK2MTD is not set |
| 441 | 448 | ||
| 442 | # | 449 | # |
| @@ -473,7 +480,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 473 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 480 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 474 | # CONFIG_BLK_DEV_NBD is not set | 481 | # CONFIG_BLK_DEV_NBD is not set |
| 475 | # CONFIG_BLK_DEV_RAM is not set | 482 | # CONFIG_BLK_DEV_RAM is not set |
| 476 | CONFIG_BLK_DEV_RAM_COUNT=16 | 483 | # CONFIG_BLK_DEV_INITRD is not set |
| 477 | CONFIG_CDROM_PKTCDVD=m | 484 | CONFIG_CDROM_PKTCDVD=m |
| 478 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 485 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 479 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 486 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -716,10 +723,6 @@ CONFIG_SYNCLINK_CS=m | |||
| 716 | # | 723 | # |
| 717 | 724 | ||
| 718 | # | 725 | # |
| 719 | # Multimedia Capabilities Port drivers | ||
| 720 | # | ||
| 721 | |||
| 722 | # | ||
| 723 | # Multimedia devices | 726 | # Multimedia devices |
| 724 | # | 727 | # |
| 725 | # CONFIG_VIDEO_DEV is not set | 728 | # CONFIG_VIDEO_DEV is not set |
| @@ -750,6 +753,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 750 | # | 753 | # |
| 751 | CONFIG_USB_ARCH_HAS_HCD=y | 754 | CONFIG_USB_ARCH_HAS_HCD=y |
| 752 | CONFIG_USB_ARCH_HAS_OHCI=y | 755 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 756 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 753 | # CONFIG_USB is not set | 757 | # CONFIG_USB is not set |
| 754 | 758 | ||
| 755 | # | 759 | # |
| @@ -767,12 +771,30 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 767 | # CONFIG_MMC is not set | 771 | # CONFIG_MMC is not set |
| 768 | 772 | ||
| 769 | # | 773 | # |
| 774 | # LED devices | ||
| 775 | # | ||
| 776 | # CONFIG_NEW_LEDS is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # LED drivers | ||
| 780 | # | ||
| 781 | |||
| 782 | # | ||
| 783 | # LED Triggers | ||
| 784 | # | ||
| 785 | |||
| 786 | # | ||
| 770 | # InfiniBand support | 787 | # InfiniBand support |
| 771 | # | 788 | # |
| 772 | 789 | ||
| 773 | # | 790 | # |
| 774 | # SN Devices | 791 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 792 | # | ||
| 793 | |||
| 794 | # | ||
| 795 | # Real Time Clock | ||
| 775 | # | 796 | # |
| 797 | # CONFIG_RTC_CLASS is not set | ||
| 776 | 798 | ||
| 777 | # | 799 | # |
| 778 | # File systems | 800 | # File systems |
| @@ -830,7 +852,6 @@ CONFIG_SYSFS=y | |||
| 830 | CONFIG_TMPFS=y | 852 | CONFIG_TMPFS=y |
| 831 | # CONFIG_HUGETLB_PAGE is not set | 853 | # CONFIG_HUGETLB_PAGE is not set |
| 832 | CONFIG_RAMFS=y | 854 | CONFIG_RAMFS=y |
| 833 | CONFIG_RELAYFS_FS=m | ||
| 834 | # CONFIG_CONFIGFS_FS is not set | 855 | # CONFIG_CONFIGFS_FS is not set |
| 835 | 856 | ||
| 836 | # | 857 | # |
| @@ -939,6 +960,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 939 | # CONFIG_MAGIC_SYSRQ is not set | 960 | # CONFIG_MAGIC_SYSRQ is not set |
| 940 | # CONFIG_DEBUG_KERNEL is not set | 961 | # CONFIG_DEBUG_KERNEL is not set |
| 941 | CONFIG_LOG_BUF_SHIFT=14 | 962 | CONFIG_LOG_BUF_SHIFT=14 |
| 963 | # CONFIG_DEBUG_FS is not set | ||
| 942 | CONFIG_CROSSCOMPILE=y | 964 | CONFIG_CROSSCOMPILE=y |
| 943 | CONFIG_CMDLINE="" | 965 | CONFIG_CMDLINE="" |
| 944 | 966 | ||
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index 8985725e6a98..398c3c265b9f 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:24 2006 | 4 | # Mon Apr 24 14:51:13 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_PB1500=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -115,11 +117,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 115 | CONFIG_CPU_HAS_PREFETCH=y | 117 | CONFIG_CPU_HAS_PREFETCH=y |
| 116 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 117 | CONFIG_64BIT_PHYS_ADDR=y | 119 | CONFIG_64BIT_PHYS_ADDR=y |
| 118 | # CONFIG_CPU_ADVANCED is not set | ||
| 119 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
| 120 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
| 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 123 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_SELECT_MEMORY_MODEL=y | 126 | CONFIG_SELECT_MEMORY_MODEL=y |
| 125 | CONFIG_FLATMEM_MANUAL=y | 127 | CONFIG_FLATMEM_MANUAL=y |
| @@ -137,7 +139,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 139 | # Code maturity level options |
| 138 | # | 140 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 141 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 142 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 144 | ||
| @@ -153,6 +154,7 @@ CONFIG_SYSVIPC=y | |||
| 153 | CONFIG_SYSCTL=y | 154 | CONFIG_SYSCTL=y |
| 154 | # CONFIG_AUDIT is not set | 155 | # CONFIG_AUDIT is not set |
| 155 | # CONFIG_IKCONFIG is not set | 156 | # CONFIG_IKCONFIG is not set |
| 157 | CONFIG_RELAY=y | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 166 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 167 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 168 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 174 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 175 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 182 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 183 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 188 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -191,6 +188,8 @@ CONFIG_KMOD=y | |||
| 191 | # Block layer | 188 | # Block layer |
| 192 | # | 189 | # |
| 193 | # CONFIG_LBD is not set | 190 | # CONFIG_LBD is not set |
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 194 | 193 | ||
| 195 | # | 194 | # |
| 196 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -210,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 210 | # | 209 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| 212 | CONFIG_PCI=y | 211 | CONFIG_PCI=y |
| 213 | CONFIG_PCI_LEGACY_PROC=y | ||
| 214 | CONFIG_MMU=y | 212 | CONFIG_MMU=y |
| 215 | 213 | ||
| 216 | # | 214 | # |
| @@ -253,6 +251,7 @@ CONFIG_NET=y | |||
| 253 | # | 251 | # |
| 254 | # Networking options | 252 | # Networking options |
| 255 | # | 253 | # |
| 254 | # CONFIG_NETDEBUG is not set | ||
| 256 | CONFIG_PACKET=y | 255 | CONFIG_PACKET=y |
| 257 | # CONFIG_PACKET_MMAP is not set | 256 | # CONFIG_PACKET_MMAP is not set |
| 258 | CONFIG_UNIX=y | 257 | CONFIG_UNIX=y |
| @@ -275,7 +274,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 275 | # CONFIG_INET_AH is not set | 274 | # CONFIG_INET_AH is not set |
| 276 | # CONFIG_INET_ESP is not set | 275 | # CONFIG_INET_ESP is not set |
| 277 | # CONFIG_INET_IPCOMP is not set | 276 | # CONFIG_INET_IPCOMP is not set |
| 278 | CONFIG_INET_TUNNEL=m | 277 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 278 | # CONFIG_INET_TUNNEL is not set | ||
| 279 | CONFIG_INET_DIAG=y | 279 | CONFIG_INET_DIAG=y |
| 280 | CONFIG_INET_TCP_DIAG=y | 280 | CONFIG_INET_TCP_DIAG=y |
| 281 | # CONFIG_TCP_CONG_ADVANCED is not set | 281 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -286,6 +286,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # | 286 | # |
| 287 | # CONFIG_IP_VS is not set | 287 | # CONFIG_IP_VS is not set |
| 288 | # CONFIG_IPV6 is not set | 288 | # CONFIG_IPV6 is not set |
| 289 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 290 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | CONFIG_NETFILTER=y | 291 | CONFIG_NETFILTER=y |
| 290 | # CONFIG_NETFILTER_DEBUG is not set | 292 | # CONFIG_NETFILTER_DEBUG is not set |
| 291 | 293 | ||
| @@ -302,10 +304,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 302 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 304 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 305 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 306 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 308 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 309 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 310 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 308 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 311 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 312 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 313 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 309 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 314 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 315 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 311 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 316 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -329,6 +334,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 329 | # SCTP Configuration (EXPERIMENTAL) | 334 | # SCTP Configuration (EXPERIMENTAL) |
| 330 | # | 335 | # |
| 331 | # CONFIG_IP_SCTP is not set | 336 | # CONFIG_IP_SCTP is not set |
| 337 | |||
| 338 | # | ||
| 339 | # TIPC Configuration (EXPERIMENTAL) | ||
| 340 | # | ||
| 341 | # CONFIG_TIPC is not set | ||
| 332 | # CONFIG_ATM is not set | 342 | # CONFIG_ATM is not set |
| 333 | # CONFIG_BRIDGE is not set | 343 | # CONFIG_BRIDGE is not set |
| 334 | # CONFIG_VLAN_8021Q is not set | 344 | # CONFIG_VLAN_8021Q is not set |
| @@ -338,11 +348,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 338 | # CONFIG_ATALK is not set | 348 | # CONFIG_ATALK is not set |
| 339 | # CONFIG_X25 is not set | 349 | # CONFIG_X25 is not set |
| 340 | # CONFIG_LAPB is not set | 350 | # CONFIG_LAPB is not set |
| 341 | |||
| 342 | # | ||
| 343 | # TIPC Configuration (EXPERIMENTAL) | ||
| 344 | # | ||
| 345 | # CONFIG_TIPC is not set | ||
| 346 | # CONFIG_NET_DIVERT is not set | 351 | # CONFIG_NET_DIVERT is not set |
| 347 | # CONFIG_ECONET is not set | 352 | # CONFIG_ECONET is not set |
| 348 | # CONFIG_WAN_ROUTER is not set | 353 | # CONFIG_WAN_ROUTER is not set |
| @@ -364,6 +369,9 @@ CONFIG_IEEE80211=m | |||
| 364 | # CONFIG_IEEE80211_DEBUG is not set | 369 | # CONFIG_IEEE80211_DEBUG is not set |
| 365 | CONFIG_IEEE80211_CRYPT_WEP=m | 370 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 366 | CONFIG_IEEE80211_CRYPT_CCMP=m | 371 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 372 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 373 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 374 | CONFIG_WIRELESS_EXT=y | ||
| 367 | 375 | ||
| 368 | # | 376 | # |
| 369 | # Device Drivers | 377 | # Device Drivers |
| @@ -420,7 +428,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 420 | # CONFIG_MTD_CFI_I8 is not set | 428 | # CONFIG_MTD_CFI_I8 is not set |
| 421 | # CONFIG_MTD_CFI_INTELEXT is not set | 429 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 422 | CONFIG_MTD_CFI_AMDSTD=y | 430 | CONFIG_MTD_CFI_AMDSTD=y |
| 423 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 424 | # CONFIG_MTD_CFI_STAA is not set | 431 | # CONFIG_MTD_CFI_STAA is not set |
| 425 | CONFIG_MTD_CFI_UTIL=y | 432 | CONFIG_MTD_CFI_UTIL=y |
| 426 | # CONFIG_MTD_RAM is not set | 433 | # CONFIG_MTD_RAM is not set |
| @@ -443,7 +450,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 443 | # CONFIG_MTD_SLRAM is not set | 450 | # CONFIG_MTD_SLRAM is not set |
| 444 | # CONFIG_MTD_PHRAM is not set | 451 | # CONFIG_MTD_PHRAM is not set |
| 445 | # CONFIG_MTD_MTDRAM is not set | 452 | # CONFIG_MTD_MTDRAM is not set |
| 446 | # CONFIG_MTD_BLKMTD is not set | ||
| 447 | # CONFIG_MTD_BLOCK2MTD is not set | 453 | # CONFIG_MTD_BLOCK2MTD is not set |
| 448 | 454 | ||
| 449 | # | 455 | # |
| @@ -485,7 +491,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 485 | # CONFIG_BLK_DEV_NBD is not set | 491 | # CONFIG_BLK_DEV_NBD is not set |
| 486 | # CONFIG_BLK_DEV_SX8 is not set | 492 | # CONFIG_BLK_DEV_SX8 is not set |
| 487 | # CONFIG_BLK_DEV_RAM is not set | 493 | # CONFIG_BLK_DEV_RAM is not set |
| 488 | CONFIG_BLK_DEV_RAM_COUNT=16 | 494 | # CONFIG_BLK_DEV_INITRD is not set |
| 489 | CONFIG_CDROM_PKTCDVD=m | 495 | CONFIG_CDROM_PKTCDVD=m |
| 490 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 496 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 491 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 497 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -750,6 +756,7 @@ CONFIG_SERIO_RAW=m | |||
| 750 | # | 756 | # |
| 751 | CONFIG_SERIAL_8250=y | 757 | CONFIG_SERIAL_8250=y |
| 752 | CONFIG_SERIAL_8250_CONSOLE=y | 758 | CONFIG_SERIAL_8250_CONSOLE=y |
| 759 | CONFIG_SERIAL_8250_PCI=y | ||
| 753 | # CONFIG_SERIAL_8250_CS is not set | 760 | # CONFIG_SERIAL_8250_CS is not set |
| 754 | CONFIG_SERIAL_8250_NR_UARTS=4 | 761 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 755 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 762 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| @@ -761,6 +768,7 @@ CONFIG_SERIAL_8250_AU1X00=y | |||
| 761 | # | 768 | # |
| 762 | CONFIG_SERIAL_CORE=y | 769 | CONFIG_SERIAL_CORE=y |
| 763 | CONFIG_SERIAL_CORE_CONSOLE=y | 770 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 771 | # CONFIG_SERIAL_JSM is not set | ||
| 764 | CONFIG_UNIX98_PTYS=y | 772 | CONFIG_UNIX98_PTYS=y |
| 765 | CONFIG_LEGACY_PTYS=y | 773 | CONFIG_LEGACY_PTYS=y |
| 766 | CONFIG_LEGACY_PTY_COUNT=256 | 774 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -826,10 +834,6 @@ CONFIG_SYNCLINK_CS=m | |||
| 826 | # | 834 | # |
| 827 | 835 | ||
| 828 | # | 836 | # |
| 829 | # Multimedia Capabilities Port drivers | ||
| 830 | # | ||
| 831 | |||
| 832 | # | ||
| 833 | # Multimedia devices | 837 | # Multimedia devices |
| 834 | # | 838 | # |
| 835 | # CONFIG_VIDEO_DEV is not set | 839 | # CONFIG_VIDEO_DEV is not set |
| @@ -854,6 +858,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 854 | # | 858 | # |
| 855 | CONFIG_USB_ARCH_HAS_HCD=y | 859 | CONFIG_USB_ARCH_HAS_HCD=y |
| 856 | CONFIG_USB_ARCH_HAS_OHCI=y | 860 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 861 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 857 | # CONFIG_USB is not set | 862 | # CONFIG_USB is not set |
| 858 | 863 | ||
| 859 | # | 864 | # |
| @@ -871,13 +876,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 871 | # CONFIG_MMC is not set | 876 | # CONFIG_MMC is not set |
| 872 | 877 | ||
| 873 | # | 878 | # |
| 879 | # LED devices | ||
| 880 | # | ||
| 881 | # CONFIG_NEW_LEDS is not set | ||
| 882 | |||
| 883 | # | ||
| 884 | # LED drivers | ||
| 885 | # | ||
| 886 | |||
| 887 | # | ||
| 888 | # LED Triggers | ||
| 889 | # | ||
| 890 | |||
| 891 | # | ||
| 874 | # InfiniBand support | 892 | # InfiniBand support |
| 875 | # | 893 | # |
| 876 | # CONFIG_INFINIBAND is not set | 894 | # CONFIG_INFINIBAND is not set |
| 877 | 895 | ||
| 878 | # | 896 | # |
| 879 | # SN Devices | 897 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 898 | # | ||
| 899 | |||
| 900 | # | ||
| 901 | # Real Time Clock | ||
| 880 | # | 902 | # |
| 903 | # CONFIG_RTC_CLASS is not set | ||
| 881 | 904 | ||
| 882 | # | 905 | # |
| 883 | # File systems | 906 | # File systems |
| @@ -935,7 +958,6 @@ CONFIG_SYSFS=y | |||
| 935 | CONFIG_TMPFS=y | 958 | CONFIG_TMPFS=y |
| 936 | # CONFIG_HUGETLB_PAGE is not set | 959 | # CONFIG_HUGETLB_PAGE is not set |
| 937 | CONFIG_RAMFS=y | 960 | CONFIG_RAMFS=y |
| 938 | CONFIG_RELAYFS_FS=m | ||
| 939 | # CONFIG_CONFIGFS_FS is not set | 961 | # CONFIG_CONFIGFS_FS is not set |
| 940 | 962 | ||
| 941 | # | 963 | # |
| @@ -1044,6 +1066,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1044 | # CONFIG_MAGIC_SYSRQ is not set | 1066 | # CONFIG_MAGIC_SYSRQ is not set |
| 1045 | # CONFIG_DEBUG_KERNEL is not set | 1067 | # CONFIG_DEBUG_KERNEL is not set |
| 1046 | CONFIG_LOG_BUF_SHIFT=14 | 1068 | CONFIG_LOG_BUF_SHIFT=14 |
| 1069 | # CONFIG_DEBUG_FS is not set | ||
| 1047 | CONFIG_CROSSCOMPILE=y | 1070 | CONFIG_CROSSCOMPILE=y |
| 1048 | CONFIG_CMDLINE="" | 1071 | CONFIG_CMDLINE="" |
| 1049 | 1072 | ||
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index adbf997b540e..ea282a53bb66 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:25 2006 | 4 | # Mon Apr 24 14:51:13 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_PB1550=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -115,11 +117,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 115 | CONFIG_CPU_HAS_PREFETCH=y | 117 | CONFIG_CPU_HAS_PREFETCH=y |
| 116 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 117 | CONFIG_64BIT_PHYS_ADDR=y | 119 | CONFIG_64BIT_PHYS_ADDR=y |
| 118 | # CONFIG_CPU_ADVANCED is not set | ||
| 119 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
| 120 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
| 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 123 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_SELECT_MEMORY_MODEL=y | 126 | CONFIG_SELECT_MEMORY_MODEL=y |
| 125 | CONFIG_FLATMEM_MANUAL=y | 127 | CONFIG_FLATMEM_MANUAL=y |
| @@ -137,7 +139,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 139 | # Code maturity level options |
| 138 | # | 140 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 141 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 142 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 144 | ||
| @@ -153,6 +154,7 @@ CONFIG_SYSVIPC=y | |||
| 153 | CONFIG_SYSCTL=y | 154 | CONFIG_SYSCTL=y |
| 154 | # CONFIG_AUDIT is not set | 155 | # CONFIG_AUDIT is not set |
| 155 | # CONFIG_IKCONFIG is not set | 156 | # CONFIG_IKCONFIG is not set |
| 157 | CONFIG_RELAY=y | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 166 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 167 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 168 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 174 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 175 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 182 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 183 | CONFIG_MODULE_UNLOAD=y | 181 | CONFIG_MODULE_UNLOAD=y |
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | 183 | CONFIG_MODVERSIONS=y |
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | 184 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 188 | CONFIG_KMOD=y | 185 | CONFIG_KMOD=y |
| @@ -191,6 +188,8 @@ CONFIG_KMOD=y | |||
| 191 | # Block layer | 188 | # Block layer |
| 192 | # | 189 | # |
| 193 | # CONFIG_LBD is not set | 190 | # CONFIG_LBD is not set |
| 191 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 192 | # CONFIG_LSF is not set | ||
| 194 | 193 | ||
| 195 | # | 194 | # |
| 196 | # IO Schedulers | 195 | # IO Schedulers |
| @@ -210,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 210 | # | 209 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| 212 | CONFIG_PCI=y | 211 | CONFIG_PCI=y |
| 213 | CONFIG_PCI_LEGACY_PROC=y | ||
| 214 | CONFIG_MMU=y | 212 | CONFIG_MMU=y |
| 215 | 213 | ||
| 216 | # | 214 | # |
| @@ -253,6 +251,7 @@ CONFIG_NET=y | |||
| 253 | # | 251 | # |
| 254 | # Networking options | 252 | # Networking options |
| 255 | # | 253 | # |
| 254 | # CONFIG_NETDEBUG is not set | ||
| 256 | CONFIG_PACKET=y | 255 | CONFIG_PACKET=y |
| 257 | # CONFIG_PACKET_MMAP is not set | 256 | # CONFIG_PACKET_MMAP is not set |
| 258 | CONFIG_UNIX=y | 257 | CONFIG_UNIX=y |
| @@ -275,7 +274,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 275 | # CONFIG_INET_AH is not set | 274 | # CONFIG_INET_AH is not set |
| 276 | # CONFIG_INET_ESP is not set | 275 | # CONFIG_INET_ESP is not set |
| 277 | # CONFIG_INET_IPCOMP is not set | 276 | # CONFIG_INET_IPCOMP is not set |
| 278 | CONFIG_INET_TUNNEL=m | 277 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 278 | # CONFIG_INET_TUNNEL is not set | ||
| 279 | CONFIG_INET_DIAG=y | 279 | CONFIG_INET_DIAG=y |
| 280 | CONFIG_INET_TCP_DIAG=y | 280 | CONFIG_INET_TCP_DIAG=y |
| 281 | # CONFIG_TCP_CONG_ADVANCED is not set | 281 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -286,6 +286,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # | 286 | # |
| 287 | # CONFIG_IP_VS is not set | 287 | # CONFIG_IP_VS is not set |
| 288 | # CONFIG_IPV6 is not set | 288 | # CONFIG_IPV6 is not set |
| 289 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 290 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | CONFIG_NETFILTER=y | 291 | CONFIG_NETFILTER=y |
| 290 | # CONFIG_NETFILTER_DEBUG is not set | 292 | # CONFIG_NETFILTER_DEBUG is not set |
| 291 | 293 | ||
| @@ -302,10 +304,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 302 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 304 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 305 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 306 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 308 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 309 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 307 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 310 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 308 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 311 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 312 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 313 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 309 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 314 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 315 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 311 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 316 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -329,6 +334,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 329 | # SCTP Configuration (EXPERIMENTAL) | 334 | # SCTP Configuration (EXPERIMENTAL) |
| 330 | # | 335 | # |
| 331 | # CONFIG_IP_SCTP is not set | 336 | # CONFIG_IP_SCTP is not set |
| 337 | |||
| 338 | # | ||
| 339 | # TIPC Configuration (EXPERIMENTAL) | ||
| 340 | # | ||
| 341 | # CONFIG_TIPC is not set | ||
| 332 | # CONFIG_ATM is not set | 342 | # CONFIG_ATM is not set |
| 333 | # CONFIG_BRIDGE is not set | 343 | # CONFIG_BRIDGE is not set |
| 334 | # CONFIG_VLAN_8021Q is not set | 344 | # CONFIG_VLAN_8021Q is not set |
| @@ -338,11 +348,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 338 | # CONFIG_ATALK is not set | 348 | # CONFIG_ATALK is not set |
| 339 | # CONFIG_X25 is not set | 349 | # CONFIG_X25 is not set |
| 340 | # CONFIG_LAPB is not set | 350 | # CONFIG_LAPB is not set |
| 341 | |||
| 342 | # | ||
| 343 | # TIPC Configuration (EXPERIMENTAL) | ||
| 344 | # | ||
| 345 | # CONFIG_TIPC is not set | ||
| 346 | # CONFIG_NET_DIVERT is not set | 351 | # CONFIG_NET_DIVERT is not set |
| 347 | # CONFIG_ECONET is not set | 352 | # CONFIG_ECONET is not set |
| 348 | # CONFIG_WAN_ROUTER is not set | 353 | # CONFIG_WAN_ROUTER is not set |
| @@ -364,6 +369,9 @@ CONFIG_IEEE80211=m | |||
| 364 | # CONFIG_IEEE80211_DEBUG is not set | 369 | # CONFIG_IEEE80211_DEBUG is not set |
| 365 | CONFIG_IEEE80211_CRYPT_WEP=m | 370 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 366 | CONFIG_IEEE80211_CRYPT_CCMP=m | 371 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 372 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 373 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 374 | CONFIG_WIRELESS_EXT=y | ||
| 367 | 375 | ||
| 368 | # | 376 | # |
| 369 | # Device Drivers | 377 | # Device Drivers |
| @@ -420,7 +428,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 420 | # CONFIG_MTD_CFI_I8 is not set | 428 | # CONFIG_MTD_CFI_I8 is not set |
| 421 | # CONFIG_MTD_CFI_INTELEXT is not set | 429 | # CONFIG_MTD_CFI_INTELEXT is not set |
| 422 | CONFIG_MTD_CFI_AMDSTD=y | 430 | CONFIG_MTD_CFI_AMDSTD=y |
| 423 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 424 | # CONFIG_MTD_CFI_STAA is not set | 431 | # CONFIG_MTD_CFI_STAA is not set |
| 425 | CONFIG_MTD_CFI_UTIL=y | 432 | CONFIG_MTD_CFI_UTIL=y |
| 426 | # CONFIG_MTD_RAM is not set | 433 | # CONFIG_MTD_RAM is not set |
| @@ -443,7 +450,6 @@ CONFIG_MTD_ALCHEMY=y | |||
| 443 | # CONFIG_MTD_SLRAM is not set | 450 | # CONFIG_MTD_SLRAM is not set |
| 444 | # CONFIG_MTD_PHRAM is not set | 451 | # CONFIG_MTD_PHRAM is not set |
| 445 | # CONFIG_MTD_MTDRAM is not set | 452 | # CONFIG_MTD_MTDRAM is not set |
| 446 | # CONFIG_MTD_BLKMTD is not set | ||
| 447 | # CONFIG_MTD_BLOCK2MTD is not set | 453 | # CONFIG_MTD_BLOCK2MTD is not set |
| 448 | 454 | ||
| 449 | # | 455 | # |
| @@ -485,7 +491,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 485 | # CONFIG_BLK_DEV_NBD is not set | 491 | # CONFIG_BLK_DEV_NBD is not set |
| 486 | # CONFIG_BLK_DEV_SX8 is not set | 492 | # CONFIG_BLK_DEV_SX8 is not set |
| 487 | # CONFIG_BLK_DEV_RAM is not set | 493 | # CONFIG_BLK_DEV_RAM is not set |
| 488 | CONFIG_BLK_DEV_RAM_COUNT=16 | 494 | # CONFIG_BLK_DEV_INITRD is not set |
| 489 | CONFIG_CDROM_PKTCDVD=m | 495 | CONFIG_CDROM_PKTCDVD=m |
| 490 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 496 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 491 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 497 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -742,6 +748,7 @@ CONFIG_SERIO_RAW=m | |||
| 742 | # | 748 | # |
| 743 | CONFIG_SERIAL_8250=y | 749 | CONFIG_SERIAL_8250=y |
| 744 | CONFIG_SERIAL_8250_CONSOLE=y | 750 | CONFIG_SERIAL_8250_CONSOLE=y |
| 751 | CONFIG_SERIAL_8250_PCI=y | ||
| 745 | # CONFIG_SERIAL_8250_CS is not set | 752 | # CONFIG_SERIAL_8250_CS is not set |
| 746 | CONFIG_SERIAL_8250_NR_UARTS=4 | 753 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 747 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 754 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| @@ -753,6 +760,7 @@ CONFIG_SERIAL_8250_AU1X00=y | |||
| 753 | # | 760 | # |
| 754 | CONFIG_SERIAL_CORE=y | 761 | CONFIG_SERIAL_CORE=y |
| 755 | CONFIG_SERIAL_CORE_CONSOLE=y | 762 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 763 | # CONFIG_SERIAL_JSM is not set | ||
| 756 | CONFIG_UNIX98_PTYS=y | 764 | CONFIG_UNIX98_PTYS=y |
| 757 | CONFIG_LEGACY_PTYS=y | 765 | CONFIG_LEGACY_PTYS=y |
| 758 | CONFIG_LEGACY_PTY_COUNT=256 | 766 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -818,10 +826,6 @@ CONFIG_SYNCLINK_CS=m | |||
| 818 | # | 826 | # |
| 819 | 827 | ||
| 820 | # | 828 | # |
| 821 | # Multimedia Capabilities Port drivers | ||
| 822 | # | ||
| 823 | |||
| 824 | # | ||
| 825 | # Multimedia devices | 829 | # Multimedia devices |
| 826 | # | 830 | # |
| 827 | # CONFIG_VIDEO_DEV is not set | 831 | # CONFIG_VIDEO_DEV is not set |
| @@ -846,6 +850,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 846 | # | 850 | # |
| 847 | CONFIG_USB_ARCH_HAS_HCD=y | 851 | CONFIG_USB_ARCH_HAS_HCD=y |
| 848 | CONFIG_USB_ARCH_HAS_OHCI=y | 852 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 853 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 849 | # CONFIG_USB is not set | 854 | # CONFIG_USB is not set |
| 850 | 855 | ||
| 851 | # | 856 | # |
| @@ -863,13 +868,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 863 | # CONFIG_MMC is not set | 868 | # CONFIG_MMC is not set |
| 864 | 869 | ||
| 865 | # | 870 | # |
| 871 | # LED devices | ||
| 872 | # | ||
| 873 | # CONFIG_NEW_LEDS is not set | ||
| 874 | |||
| 875 | # | ||
| 876 | # LED drivers | ||
| 877 | # | ||
| 878 | |||
| 879 | # | ||
| 880 | # LED Triggers | ||
| 881 | # | ||
| 882 | |||
| 883 | # | ||
| 866 | # InfiniBand support | 884 | # InfiniBand support |
| 867 | # | 885 | # |
| 868 | # CONFIG_INFINIBAND is not set | 886 | # CONFIG_INFINIBAND is not set |
| 869 | 887 | ||
| 870 | # | 888 | # |
| 871 | # SN Devices | 889 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 890 | # | ||
| 891 | |||
| 892 | # | ||
| 893 | # Real Time Clock | ||
| 872 | # | 894 | # |
| 895 | # CONFIG_RTC_CLASS is not set | ||
| 873 | 896 | ||
| 874 | # | 897 | # |
| 875 | # File systems | 898 | # File systems |
| @@ -927,7 +950,6 @@ CONFIG_SYSFS=y | |||
| 927 | CONFIG_TMPFS=y | 950 | CONFIG_TMPFS=y |
| 928 | # CONFIG_HUGETLB_PAGE is not set | 951 | # CONFIG_HUGETLB_PAGE is not set |
| 929 | CONFIG_RAMFS=y | 952 | CONFIG_RAMFS=y |
| 930 | CONFIG_RELAYFS_FS=m | ||
| 931 | # CONFIG_CONFIGFS_FS is not set | 953 | # CONFIG_CONFIGFS_FS is not set |
| 932 | 954 | ||
| 933 | # | 955 | # |
| @@ -1036,6 +1058,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1036 | # CONFIG_MAGIC_SYSRQ is not set | 1058 | # CONFIG_MAGIC_SYSRQ is not set |
| 1037 | # CONFIG_DEBUG_KERNEL is not set | 1059 | # CONFIG_DEBUG_KERNEL is not set |
| 1038 | CONFIG_LOG_BUF_SHIFT=14 | 1060 | CONFIG_LOG_BUF_SHIFT=14 |
| 1061 | # CONFIG_DEBUG_FS is not set | ||
| 1039 | CONFIG_CROSSCOMPILE=y | 1062 | CONFIG_CROSSCOMPILE=y |
| 1040 | CONFIG_CMDLINE="" | 1063 | CONFIG_CMDLINE="" |
| 1041 | 1064 | ||
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index b5db700450ba..4c57e564db0b 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:26 2006 | 4 | # Mon Apr 24 14:51:14 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_PNX8550_JBS=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | CONFIG_CPU_HAS_PREFETCH=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 115 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
| 116 | # CONFIG_64BIT_PHYS_ADDR is not set | 118 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 117 | # CONFIG_CPU_ADVANCED is not set | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 121 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 123 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 122 | CONFIG_ARCH_FLATMEM_ENABLE=y | 124 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 123 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 124 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| @@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 136 | # Code maturity level options | 138 | # Code maturity level options |
| 137 | # | 139 | # |
| 138 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 142 | 143 | ||
| @@ -153,6 +154,7 @@ CONFIG_SYSCTL=y | |||
| 153 | # CONFIG_AUDIT is not set | 154 | # CONFIG_AUDIT is not set |
| 154 | CONFIG_IKCONFIG=y | 155 | CONFIG_IKCONFIG=y |
| 155 | CONFIG_IKCONFIG_PROC=y | 156 | CONFIG_IKCONFIG_PROC=y |
| 157 | # CONFIG_RELAY is not set | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 169 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 170 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 171 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 172 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 173 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 174 | CONFIG_BASE_SMALL=0 |
| @@ -181,7 +179,6 @@ CONFIG_BASE_SMALL=0 | |||
| 181 | # | 179 | # |
| 182 | CONFIG_MODULES=y | 180 | CONFIG_MODULES=y |
| 183 | # CONFIG_MODULE_UNLOAD is not set | 181 | # CONFIG_MODULE_UNLOAD is not set |
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | # CONFIG_MODVERSIONS is not set | 182 | # CONFIG_MODVERSIONS is not set |
| 186 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 183 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 187 | CONFIG_KMOD=y | 184 | CONFIG_KMOD=y |
| @@ -190,6 +187,8 @@ CONFIG_KMOD=y | |||
| 190 | # Block layer | 187 | # Block layer |
| 191 | # | 188 | # |
| 192 | # CONFIG_LBD is not set | 189 | # CONFIG_LBD is not set |
| 190 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 191 | # CONFIG_LSF is not set | ||
| 193 | 192 | ||
| 194 | # | 193 | # |
| 195 | # IO Schedulers | 194 | # IO Schedulers |
| @@ -209,7 +208,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 209 | # | 208 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| 211 | CONFIG_PCI=y | 210 | CONFIG_PCI=y |
| 212 | # CONFIG_PCI_LEGACY_PROC is not set | ||
| 213 | # CONFIG_PCI_DEBUG is not set | 211 | # CONFIG_PCI_DEBUG is not set |
| 214 | CONFIG_MMU=y | 212 | CONFIG_MMU=y |
| 215 | 213 | ||
| @@ -238,6 +236,7 @@ CONFIG_NET=y | |||
| 238 | # | 236 | # |
| 239 | # Networking options | 237 | # Networking options |
| 240 | # | 238 | # |
| 239 | # CONFIG_NETDEBUG is not set | ||
| 241 | CONFIG_PACKET=y | 240 | CONFIG_PACKET=y |
| 242 | # CONFIG_PACKET_MMAP is not set | 241 | # CONFIG_PACKET_MMAP is not set |
| 243 | CONFIG_UNIX=y | 242 | CONFIG_UNIX=y |
| @@ -257,12 +256,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 257 | # CONFIG_INET_AH is not set | 256 | # CONFIG_INET_AH is not set |
| 258 | # CONFIG_INET_ESP is not set | 257 | # CONFIG_INET_ESP is not set |
| 259 | # CONFIG_INET_IPCOMP is not set | 258 | # CONFIG_INET_IPCOMP is not set |
| 259 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 260 | # CONFIG_INET_TUNNEL is not set | 260 | # CONFIG_INET_TUNNEL is not set |
| 261 | CONFIG_INET_DIAG=y | 261 | CONFIG_INET_DIAG=y |
| 262 | CONFIG_INET_TCP_DIAG=y | 262 | CONFIG_INET_TCP_DIAG=y |
| 263 | # CONFIG_TCP_CONG_ADVANCED is not set | 263 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 264 | CONFIG_TCP_CONG_BIC=y | 264 | CONFIG_TCP_CONG_BIC=y |
| 265 | # CONFIG_IPV6 is not set | 265 | # CONFIG_IPV6 is not set |
| 266 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 267 | # CONFIG_INET6_TUNNEL is not set | ||
| 266 | # CONFIG_NETFILTER is not set | 268 | # CONFIG_NETFILTER is not set |
| 267 | 269 | ||
| 268 | # | 270 | # |
| @@ -274,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 274 | # SCTP Configuration (EXPERIMENTAL) | 276 | # SCTP Configuration (EXPERIMENTAL) |
| 275 | # | 277 | # |
| 276 | # CONFIG_IP_SCTP is not set | 278 | # CONFIG_IP_SCTP is not set |
| 279 | |||
| 280 | # | ||
| 281 | # TIPC Configuration (EXPERIMENTAL) | ||
| 282 | # | ||
| 283 | # CONFIG_TIPC is not set | ||
| 277 | # CONFIG_ATM is not set | 284 | # CONFIG_ATM is not set |
| 278 | # CONFIG_BRIDGE is not set | 285 | # CONFIG_BRIDGE is not set |
| 279 | # CONFIG_VLAN_8021Q is not set | 286 | # CONFIG_VLAN_8021Q is not set |
| @@ -283,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 283 | # CONFIG_ATALK is not set | 290 | # CONFIG_ATALK is not set |
| 284 | # CONFIG_X25 is not set | 291 | # CONFIG_X25 is not set |
| 285 | # CONFIG_LAPB is not set | 292 | # CONFIG_LAPB is not set |
| 286 | |||
| 287 | # | ||
| 288 | # TIPC Configuration (EXPERIMENTAL) | ||
| 289 | # | ||
| 290 | # CONFIG_TIPC is not set | ||
| 291 | # CONFIG_NET_DIVERT is not set | 293 | # CONFIG_NET_DIVERT is not set |
| 292 | # CONFIG_ECONET is not set | 294 | # CONFIG_ECONET is not set |
| 293 | # CONFIG_WAN_ROUTER is not set | 295 | # CONFIG_WAN_ROUTER is not set |
| @@ -469,7 +471,6 @@ CONFIG_ISCSI_TCP=m | |||
| 469 | # CONFIG_SCSI_INIA100 is not set | 471 | # CONFIG_SCSI_INIA100 is not set |
| 470 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 472 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 471 | # CONFIG_SCSI_IPR is not set | 473 | # CONFIG_SCSI_IPR is not set |
| 472 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 473 | # CONFIG_SCSI_QLOGIC_1280 is not set | 474 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 474 | # CONFIG_SCSI_QLA_FC is not set | 475 | # CONFIG_SCSI_QLA_FC is not set |
| 475 | # CONFIG_SCSI_LPFC is not set | 476 | # CONFIG_SCSI_LPFC is not set |
| @@ -671,6 +672,7 @@ CONFIG_HW_CONSOLE=y | |||
| 671 | # Non-8250 serial port support | 672 | # Non-8250 serial port support |
| 672 | # | 673 | # |
| 673 | # CONFIG_SERIAL_IP3106 is not set | 674 | # CONFIG_SERIAL_IP3106 is not set |
| 675 | # CONFIG_SERIAL_JSM is not set | ||
| 674 | CONFIG_UNIX98_PTYS=y | 676 | CONFIG_UNIX98_PTYS=y |
| 675 | CONFIG_LEGACY_PTYS=y | 677 | CONFIG_LEGACY_PTYS=y |
| 676 | CONFIG_LEGACY_PTY_COUNT=256 | 678 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -723,6 +725,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 723 | # | 725 | # |
| 724 | CONFIG_HWMON=y | 726 | CONFIG_HWMON=y |
| 725 | # CONFIG_HWMON_VID is not set | 727 | # CONFIG_HWMON_VID is not set |
| 728 | # CONFIG_SENSORS_F71805F is not set | ||
| 726 | # CONFIG_HWMON_DEBUG_CHIP is not set | 729 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 727 | 730 | ||
| 728 | # | 731 | # |
| @@ -730,10 +733,6 @@ CONFIG_HWMON=y | |||
| 730 | # | 733 | # |
| 731 | 734 | ||
| 732 | # | 735 | # |
| 733 | # Multimedia Capabilities Port drivers | ||
| 734 | # | ||
| 735 | |||
| 736 | # | ||
| 737 | # Multimedia devices | 736 | # Multimedia devices |
| 738 | # | 737 | # |
| 739 | # CONFIG_VIDEO_DEV is not set | 738 | # CONFIG_VIDEO_DEV is not set |
| @@ -742,6 +741,7 @@ CONFIG_HWMON=y | |||
| 742 | # Digital Video Broadcasting Devices | 741 | # Digital Video Broadcasting Devices |
| 743 | # | 742 | # |
| 744 | # CONFIG_DVB is not set | 743 | # CONFIG_DVB is not set |
| 744 | # CONFIG_USB_DABUSB is not set | ||
| 745 | 745 | ||
| 746 | # | 746 | # |
| 747 | # Graphics support | 747 | # Graphics support |
| @@ -764,6 +764,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 764 | # | 764 | # |
| 765 | CONFIG_USB_ARCH_HAS_HCD=y | 765 | CONFIG_USB_ARCH_HAS_HCD=y |
| 766 | CONFIG_USB_ARCH_HAS_OHCI=y | 766 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 767 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 767 | CONFIG_USB=y | 768 | CONFIG_USB=y |
| 768 | # CONFIG_USB_DEBUG is not set | 769 | # CONFIG_USB_DEBUG is not set |
| 769 | 770 | ||
| @@ -827,9 +828,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 827 | # CONFIG_USB_ACECAD is not set | 828 | # CONFIG_USB_ACECAD is not set |
| 828 | # CONFIG_USB_KBTAB is not set | 829 | # CONFIG_USB_KBTAB is not set |
| 829 | # CONFIG_USB_POWERMATE is not set | 830 | # CONFIG_USB_POWERMATE is not set |
| 830 | # CONFIG_USB_MTOUCH is not set | 831 | # CONFIG_USB_TOUCHSCREEN is not set |
| 831 | # CONFIG_USB_ITMTOUCH is not set | ||
| 832 | # CONFIG_USB_EGALAX is not set | ||
| 833 | # CONFIG_USB_YEALINK is not set | 832 | # CONFIG_USB_YEALINK is not set |
| 834 | # CONFIG_USB_XPAD is not set | 833 | # CONFIG_USB_XPAD is not set |
| 835 | # CONFIG_USB_ATI_REMOTE is not set | 834 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -844,15 +843,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 844 | # CONFIG_USB_MICROTEK is not set | 843 | # CONFIG_USB_MICROTEK is not set |
| 845 | 844 | ||
| 846 | # | 845 | # |
| 847 | # USB Multimedia devices | ||
| 848 | # | ||
| 849 | # CONFIG_USB_DABUSB is not set | ||
| 850 | |||
| 851 | # | ||
| 852 | # Video4Linux support is needed for USB Multimedia device support | ||
| 853 | # | ||
| 854 | |||
| 855 | # | ||
| 856 | # USB Network Adapters | 846 | # USB Network Adapters |
| 857 | # | 847 | # |
| 858 | # CONFIG_USB_CATC is not set | 848 | # CONFIG_USB_CATC is not set |
| @@ -902,13 +892,31 @@ CONFIG_USB_MON=y | |||
| 902 | # CONFIG_MMC is not set | 892 | # CONFIG_MMC is not set |
| 903 | 893 | ||
| 904 | # | 894 | # |
| 895 | # LED devices | ||
| 896 | # | ||
| 897 | # CONFIG_NEW_LEDS is not set | ||
| 898 | |||
| 899 | # | ||
| 900 | # LED drivers | ||
| 901 | # | ||
| 902 | |||
| 903 | # | ||
| 904 | # LED Triggers | ||
| 905 | # | ||
| 906 | |||
| 907 | # | ||
| 905 | # InfiniBand support | 908 | # InfiniBand support |
| 906 | # | 909 | # |
| 907 | # CONFIG_INFINIBAND is not set | 910 | # CONFIG_INFINIBAND is not set |
| 908 | 911 | ||
| 909 | # | 912 | # |
| 910 | # SN Devices | 913 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 914 | # | ||
| 915 | |||
| 916 | # | ||
| 917 | # Real Time Clock | ||
| 911 | # | 918 | # |
| 919 | # CONFIG_RTC_CLASS is not set | ||
| 912 | 920 | ||
| 913 | # | 921 | # |
| 914 | # File systems | 922 | # File systems |
| @@ -956,7 +964,6 @@ CONFIG_SYSFS=y | |||
| 956 | CONFIG_TMPFS=y | 964 | CONFIG_TMPFS=y |
| 957 | # CONFIG_HUGETLB_PAGE is not set | 965 | # CONFIG_HUGETLB_PAGE is not set |
| 958 | CONFIG_RAMFS=y | 966 | CONFIG_RAMFS=y |
| 959 | # CONFIG_RELAYFS_FS is not set | ||
| 960 | # CONFIG_CONFIGFS_FS is not set | 967 | # CONFIG_CONFIGFS_FS is not set |
| 961 | 968 | ||
| 962 | # | 969 | # |
| @@ -1067,6 +1074,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 1067 | CONFIG_DETECT_SOFTLOCKUP=y | 1074 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1068 | # CONFIG_SCHEDSTATS is not set | 1075 | # CONFIG_SCHEDSTATS is not set |
| 1069 | CONFIG_DEBUG_SLAB=y | 1076 | CONFIG_DEBUG_SLAB=y |
| 1077 | # CONFIG_DEBUG_SLAB_LEAK is not set | ||
| 1070 | CONFIG_DEBUG_MUTEXES=y | 1078 | CONFIG_DEBUG_MUTEXES=y |
| 1071 | # CONFIG_DEBUG_SPINLOCK is not set | 1079 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1072 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1080 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index 4187287f0763..3c8f35162fec 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:28 2006 | 4 | # Mon Apr 24 14:51:14 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_PNX8550_V2PCI=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -114,12 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 114 | CONFIG_CPU_HAS_PREFETCH=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 115 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
| 116 | # CONFIG_64BIT_PHYS_ADDR is not set | 118 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 117 | CONFIG_CPU_ADVANCED=y | ||
| 118 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
| 119 | # CONFIG_CPU_HAS_WB is not set | ||
| 120 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 123 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 123 | CONFIG_ARCH_FLATMEM_ENABLE=y | 124 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 125 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| @@ -137,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 138 | # Code maturity level options |
| 138 | # | 139 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 143 | ||
| @@ -154,6 +154,7 @@ CONFIG_SYSCTL=y | |||
| 154 | # CONFIG_AUDIT is not set | 154 | # CONFIG_AUDIT is not set |
| 155 | CONFIG_IKCONFIG=y | 155 | CONFIG_IKCONFIG=y |
| 156 | CONFIG_IKCONFIG_PROC=y | 156 | CONFIG_IKCONFIG_PROC=y |
| 157 | # CONFIG_RELAY is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
| 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 159 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 159 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
| @@ -167,10 +168,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 168 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 169 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 170 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 171 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 172 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 173 | CONFIG_BASE_SMALL=0 |
| @@ -181,7 +178,6 @@ CONFIG_BASE_SMALL=0 | |||
| 181 | # | 178 | # |
| 182 | CONFIG_MODULES=y | 179 | CONFIG_MODULES=y |
| 183 | # CONFIG_MODULE_UNLOAD is not set | 180 | # CONFIG_MODULE_UNLOAD is not set |
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | # CONFIG_MODVERSIONS is not set | 181 | # CONFIG_MODVERSIONS is not set |
| 186 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 182 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 187 | CONFIG_KMOD=y | 183 | CONFIG_KMOD=y |
| @@ -190,6 +186,8 @@ CONFIG_KMOD=y | |||
| 190 | # Block layer | 186 | # Block layer |
| 191 | # | 187 | # |
| 192 | # CONFIG_LBD is not set | 188 | # CONFIG_LBD is not set |
| 189 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 190 | # CONFIG_LSF is not set | ||
| 193 | 191 | ||
| 194 | # | 192 | # |
| 195 | # IO Schedulers | 193 | # IO Schedulers |
| @@ -209,7 +207,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 209 | # | 207 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| 211 | CONFIG_PCI=y | 209 | CONFIG_PCI=y |
| 212 | # CONFIG_PCI_LEGACY_PROC is not set | ||
| 213 | CONFIG_MMU=y | 210 | CONFIG_MMU=y |
| 214 | 211 | ||
| 215 | # | 212 | # |
| @@ -237,6 +234,7 @@ CONFIG_NET=y | |||
| 237 | # | 234 | # |
| 238 | # Networking options | 235 | # Networking options |
| 239 | # | 236 | # |
| 237 | # CONFIG_NETDEBUG is not set | ||
| 240 | CONFIG_PACKET=y | 238 | CONFIG_PACKET=y |
| 241 | # CONFIG_PACKET_MMAP is not set | 239 | # CONFIG_PACKET_MMAP is not set |
| 242 | CONFIG_UNIX=y | 240 | CONFIG_UNIX=y |
| @@ -256,6 +254,7 @@ CONFIG_IP_PNP=y | |||
| 256 | # CONFIG_INET_AH is not set | 254 | # CONFIG_INET_AH is not set |
| 257 | # CONFIG_INET_ESP is not set | 255 | # CONFIG_INET_ESP is not set |
| 258 | # CONFIG_INET_IPCOMP is not set | 256 | # CONFIG_INET_IPCOMP is not set |
| 257 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 259 | # CONFIG_INET_TUNNEL is not set | 258 | # CONFIG_INET_TUNNEL is not set |
| 260 | CONFIG_INET_DIAG=y | 259 | CONFIG_INET_DIAG=y |
| 261 | CONFIG_INET_TCP_DIAG=y | 260 | CONFIG_INET_TCP_DIAG=y |
| @@ -268,9 +267,12 @@ CONFIG_TCP_CONG_BIC=y | |||
| 268 | # CONFIG_IP_VS is not set | 267 | # CONFIG_IP_VS is not set |
| 269 | CONFIG_IPV6=m | 268 | CONFIG_IPV6=m |
| 270 | # CONFIG_IPV6_PRIVACY is not set | 269 | # CONFIG_IPV6_PRIVACY is not set |
| 270 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 271 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 271 | # CONFIG_INET6_AH is not set | 272 | # CONFIG_INET6_AH is not set |
| 272 | # CONFIG_INET6_ESP is not set | 273 | # CONFIG_INET6_ESP is not set |
| 273 | # CONFIG_INET6_IPCOMP is not set | 274 | # CONFIG_INET6_IPCOMP is not set |
| 275 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 274 | # CONFIG_INET6_TUNNEL is not set | 276 | # CONFIG_INET6_TUNNEL is not set |
| 275 | # CONFIG_IPV6_TUNNEL is not set | 277 | # CONFIG_IPV6_TUNNEL is not set |
| 276 | CONFIG_NETFILTER=y | 278 | CONFIG_NETFILTER=y |
| @@ -287,10 +289,12 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 287 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 289 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 290 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 291 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 290 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 293 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 294 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 295 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 296 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 297 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 294 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 298 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 295 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 299 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 300 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -320,6 +324,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 320 | # SCTP Configuration (EXPERIMENTAL) | 324 | # SCTP Configuration (EXPERIMENTAL) |
| 321 | # | 325 | # |
| 322 | # CONFIG_IP_SCTP is not set | 326 | # CONFIG_IP_SCTP is not set |
| 327 | |||
| 328 | # | ||
| 329 | # TIPC Configuration (EXPERIMENTAL) | ||
| 330 | # | ||
| 331 | # CONFIG_TIPC is not set | ||
| 323 | # CONFIG_ATM is not set | 332 | # CONFIG_ATM is not set |
| 324 | # CONFIG_BRIDGE is not set | 333 | # CONFIG_BRIDGE is not set |
| 325 | # CONFIG_VLAN_8021Q is not set | 334 | # CONFIG_VLAN_8021Q is not set |
| @@ -329,11 +338,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 329 | # CONFIG_ATALK is not set | 338 | # CONFIG_ATALK is not set |
| 330 | # CONFIG_X25 is not set | 339 | # CONFIG_X25 is not set |
| 331 | # CONFIG_LAPB is not set | 340 | # CONFIG_LAPB is not set |
| 332 | |||
| 333 | # | ||
| 334 | # TIPC Configuration (EXPERIMENTAL) | ||
| 335 | # | ||
| 336 | # CONFIG_TIPC is not set | ||
| 337 | # CONFIG_NET_DIVERT is not set | 341 | # CONFIG_NET_DIVERT is not set |
| 338 | # CONFIG_ECONET is not set | 342 | # CONFIG_ECONET is not set |
| 339 | # CONFIG_WAN_ROUTER is not set | 343 | # CONFIG_WAN_ROUTER is not set |
| @@ -521,7 +525,6 @@ CONFIG_AIC7XXX_DEBUG_MASK=0 | |||
| 521 | # CONFIG_SCSI_INIA100 is not set | 525 | # CONFIG_SCSI_INIA100 is not set |
| 522 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 526 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 523 | # CONFIG_SCSI_IPR is not set | 527 | # CONFIG_SCSI_IPR is not set |
| 524 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 525 | # CONFIG_SCSI_QLOGIC_1280 is not set | 528 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 526 | # CONFIG_SCSI_QLA_FC is not set | 529 | # CONFIG_SCSI_QLA_FC is not set |
| 527 | # CONFIG_SCSI_LPFC is not set | 530 | # CONFIG_SCSI_LPFC is not set |
| @@ -757,6 +760,7 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 757 | # Non-8250 serial port support | 760 | # Non-8250 serial port support |
| 758 | # | 761 | # |
| 759 | # CONFIG_SERIAL_IP3106 is not set | 762 | # CONFIG_SERIAL_IP3106 is not set |
| 763 | # CONFIG_SERIAL_JSM is not set | ||
| 760 | CONFIG_UNIX98_PTYS=y | 764 | CONFIG_UNIX98_PTYS=y |
| 761 | CONFIG_LEGACY_PTYS=y | 765 | CONFIG_LEGACY_PTYS=y |
| 762 | CONFIG_LEGACY_PTY_COUNT=256 | 766 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -816,7 +820,6 @@ CONFIG_I2C_ALGOBIT=m | |||
| 816 | # CONFIG_I2C_PARPORT_LIGHT is not set | 820 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 817 | # CONFIG_I2C_PROSAVAGE is not set | 821 | # CONFIG_I2C_PROSAVAGE is not set |
| 818 | # CONFIG_I2C_SAVAGE4 is not set | 822 | # CONFIG_I2C_SAVAGE4 is not set |
| 819 | # CONFIG_SCx200_ACB is not set | ||
| 820 | # CONFIG_I2C_SIS5595 is not set | 823 | # CONFIG_I2C_SIS5595 is not set |
| 821 | # CONFIG_I2C_SIS630 is not set | 824 | # CONFIG_I2C_SIS630 is not set |
| 822 | # CONFIG_I2C_SIS96X is not set | 825 | # CONFIG_I2C_SIS96X is not set |
| @@ -835,9 +838,7 @@ CONFIG_I2C_ALGOBIT=m | |||
| 835 | # CONFIG_SENSORS_PCF8574 is not set | 838 | # CONFIG_SENSORS_PCF8574 is not set |
| 836 | # CONFIG_SENSORS_PCA9539 is not set | 839 | # CONFIG_SENSORS_PCA9539 is not set |
| 837 | # CONFIG_SENSORS_PCF8591 is not set | 840 | # CONFIG_SENSORS_PCF8591 is not set |
| 838 | # CONFIG_SENSORS_RTC8564 is not set | ||
| 839 | # CONFIG_SENSORS_MAX6875 is not set | 841 | # CONFIG_SENSORS_MAX6875 is not set |
| 840 | # CONFIG_RTC_X1205_I2C is not set | ||
| 841 | # CONFIG_I2C_DEBUG_CORE is not set | 842 | # CONFIG_I2C_DEBUG_CORE is not set |
| 842 | # CONFIG_I2C_DEBUG_ALGO is not set | 843 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 843 | # CONFIG_I2C_DEBUG_BUS is not set | 844 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -867,6 +868,7 @@ CONFIG_HWMON=y | |||
| 867 | # CONFIG_SENSORS_ASB100 is not set | 868 | # CONFIG_SENSORS_ASB100 is not set |
| 868 | # CONFIG_SENSORS_ATXP1 is not set | 869 | # CONFIG_SENSORS_ATXP1 is not set |
| 869 | # CONFIG_SENSORS_DS1621 is not set | 870 | # CONFIG_SENSORS_DS1621 is not set |
| 871 | # CONFIG_SENSORS_F71805F is not set | ||
| 870 | # CONFIG_SENSORS_FSCHER is not set | 872 | # CONFIG_SENSORS_FSCHER is not set |
| 871 | # CONFIG_SENSORS_FSCPOS is not set | 873 | # CONFIG_SENSORS_FSCPOS is not set |
| 872 | # CONFIG_SENSORS_GL518SM is not set | 874 | # CONFIG_SENSORS_GL518SM is not set |
| @@ -901,10 +903,6 @@ CONFIG_HWMON=y | |||
| 901 | # | 903 | # |
| 902 | 904 | ||
| 903 | # | 905 | # |
| 904 | # Multimedia Capabilities Port drivers | ||
| 905 | # | ||
| 906 | |||
| 907 | # | ||
| 908 | # Multimedia devices | 906 | # Multimedia devices |
| 909 | # | 907 | # |
| 910 | # CONFIG_VIDEO_DEV is not set | 908 | # CONFIG_VIDEO_DEV is not set |
| @@ -913,6 +911,7 @@ CONFIG_HWMON=y | |||
| 913 | # Digital Video Broadcasting Devices | 911 | # Digital Video Broadcasting Devices |
| 914 | # | 912 | # |
| 915 | # CONFIG_DVB is not set | 913 | # CONFIG_DVB is not set |
| 914 | # CONFIG_USB_DABUSB is not set | ||
| 916 | 915 | ||
| 917 | # | 916 | # |
| 918 | # Graphics support | 917 | # Graphics support |
| @@ -922,6 +921,7 @@ CONFIG_FB=y | |||
| 922 | # CONFIG_FB_CFB_COPYAREA is not set | 921 | # CONFIG_FB_CFB_COPYAREA is not set |
| 923 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 922 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| 924 | # CONFIG_FB_MACMODES is not set | 923 | # CONFIG_FB_MACMODES is not set |
| 924 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 925 | # CONFIG_FB_MODE_HELPERS is not set | 925 | # CONFIG_FB_MODE_HELPERS is not set |
| 926 | # CONFIG_FB_TILEBLITTING is not set | 926 | # CONFIG_FB_TILEBLITTING is not set |
| 927 | # CONFIG_FB_CIRRUS is not set | 927 | # CONFIG_FB_CIRRUS is not set |
| @@ -933,7 +933,6 @@ CONFIG_FB=y | |||
| 933 | # CONFIG_FB_NVIDIA is not set | 933 | # CONFIG_FB_NVIDIA is not set |
| 934 | # CONFIG_FB_RIVA is not set | 934 | # CONFIG_FB_RIVA is not set |
| 935 | # CONFIG_FB_MATROX is not set | 935 | # CONFIG_FB_MATROX is not set |
| 936 | # CONFIG_FB_RADEON_OLD is not set | ||
| 937 | # CONFIG_FB_RADEON is not set | 936 | # CONFIG_FB_RADEON is not set |
| 938 | # CONFIG_FB_ATY128 is not set | 937 | # CONFIG_FB_ATY128 is not set |
| 939 | # CONFIG_FB_ATY is not set | 938 | # CONFIG_FB_ATY is not set |
| @@ -970,6 +969,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 970 | # | 969 | # |
| 971 | CONFIG_USB_ARCH_HAS_HCD=y | 970 | CONFIG_USB_ARCH_HAS_HCD=y |
| 972 | CONFIG_USB_ARCH_HAS_OHCI=y | 971 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 972 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 973 | CONFIG_USB=y | 973 | CONFIG_USB=y |
| 974 | # CONFIG_USB_DEBUG is not set | 974 | # CONFIG_USB_DEBUG is not set |
| 975 | 975 | ||
| @@ -1030,9 +1030,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1030 | # CONFIG_USB_ACECAD is not set | 1030 | # CONFIG_USB_ACECAD is not set |
| 1031 | # CONFIG_USB_KBTAB is not set | 1031 | # CONFIG_USB_KBTAB is not set |
| 1032 | # CONFIG_USB_POWERMATE is not set | 1032 | # CONFIG_USB_POWERMATE is not set |
| 1033 | # CONFIG_USB_MTOUCH is not set | 1033 | # CONFIG_USB_TOUCHSCREEN is not set |
| 1034 | # CONFIG_USB_ITMTOUCH is not set | ||
| 1035 | # CONFIG_USB_EGALAX is not set | ||
| 1036 | # CONFIG_USB_YEALINK is not set | 1034 | # CONFIG_USB_YEALINK is not set |
| 1037 | # CONFIG_USB_XPAD is not set | 1035 | # CONFIG_USB_XPAD is not set |
| 1038 | # CONFIG_USB_ATI_REMOTE is not set | 1036 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -1047,15 +1045,6 @@ CONFIG_USB_HIDDEV=y | |||
| 1047 | # CONFIG_USB_MICROTEK is not set | 1045 | # CONFIG_USB_MICROTEK is not set |
| 1048 | 1046 | ||
| 1049 | # | 1047 | # |
| 1050 | # USB Multimedia devices | ||
| 1051 | # | ||
| 1052 | # CONFIG_USB_DABUSB is not set | ||
| 1053 | |||
| 1054 | # | ||
| 1055 | # Video4Linux support is needed for USB Multimedia device support | ||
| 1056 | # | ||
| 1057 | |||
| 1058 | # | ||
| 1059 | # USB Network Adapters | 1048 | # USB Network Adapters |
| 1060 | # | 1049 | # |
| 1061 | # CONFIG_USB_CATC is not set | 1050 | # CONFIG_USB_CATC is not set |
| @@ -1106,13 +1095,31 @@ CONFIG_USB_MON=y | |||
| 1106 | # CONFIG_MMC is not set | 1095 | # CONFIG_MMC is not set |
| 1107 | 1096 | ||
| 1108 | # | 1097 | # |
| 1098 | # LED devices | ||
| 1099 | # | ||
| 1100 | # CONFIG_NEW_LEDS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # LED drivers | ||
| 1104 | # | ||
| 1105 | |||
| 1106 | # | ||
| 1107 | # LED Triggers | ||
| 1108 | # | ||
| 1109 | |||
| 1110 | # | ||
| 1109 | # InfiniBand support | 1111 | # InfiniBand support |
| 1110 | # | 1112 | # |
| 1111 | # CONFIG_INFINIBAND is not set | 1113 | # CONFIG_INFINIBAND is not set |
| 1112 | 1114 | ||
| 1113 | # | 1115 | # |
| 1114 | # SN Devices | 1116 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1117 | # | ||
| 1118 | |||
| 1119 | # | ||
| 1120 | # Real Time Clock | ||
| 1115 | # | 1121 | # |
| 1122 | # CONFIG_RTC_CLASS is not set | ||
| 1116 | 1123 | ||
| 1117 | # | 1124 | # |
| 1118 | # File systems | 1125 | # File systems |
| @@ -1171,7 +1178,6 @@ CONFIG_SYSFS=y | |||
| 1171 | CONFIG_TMPFS=y | 1178 | CONFIG_TMPFS=y |
| 1172 | # CONFIG_HUGETLB_PAGE is not set | 1179 | # CONFIG_HUGETLB_PAGE is not set |
| 1173 | CONFIG_RAMFS=y | 1180 | CONFIG_RAMFS=y |
| 1174 | # CONFIG_RELAYFS_FS is not set | ||
| 1175 | # CONFIG_CONFIGFS_FS is not set | 1181 | # CONFIG_CONFIGFS_FS is not set |
| 1176 | 1182 | ||
| 1177 | # | 1183 | # |
| @@ -1280,6 +1286,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1280 | # CONFIG_MAGIC_SYSRQ is not set | 1286 | # CONFIG_MAGIC_SYSRQ is not set |
| 1281 | # CONFIG_DEBUG_KERNEL is not set | 1287 | # CONFIG_DEBUG_KERNEL is not set |
| 1282 | CONFIG_LOG_BUF_SHIFT=14 | 1288 | CONFIG_LOG_BUF_SHIFT=14 |
| 1289 | # CONFIG_DEBUG_FS is not set | ||
| 1283 | CONFIG_CROSSCOMPILE=y | 1290 | CONFIG_CROSSCOMPILE=y |
| 1284 | CONFIG_CMDLINE="" | 1291 | CONFIG_CMDLINE="" |
| 1285 | 1292 | ||
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 31f5afabafa8..4bcc01dea041 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc2 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Sun Feb 12 19:18:55 2006 | 4 | # Mon Apr 24 14:51:15 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_QEMU=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_COHERENT=y | 70 | CONFIG_DMA_COHERENT=y |
| 69 | CONFIG_GENERIC_ISA_DMA=y | 71 | CONFIG_GENERIC_ISA_DMA=y |
| @@ -115,16 +117,17 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 115 | CONFIG_CPU_HAS_PREFETCH=y | 117 | CONFIG_CPU_HAS_PREFETCH=y |
| 116 | # CONFIG_MIPS_MT is not set | 118 | # CONFIG_MIPS_MT is not set |
| 117 | # CONFIG_64BIT_PHYS_ADDR is not set | 119 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 118 | # CONFIG_CPU_ADVANCED is not set | ||
| 119 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
| 120 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
| 124 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 123 | CONFIG_ARCH_FLATMEM_ENABLE=y | 125 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_FLATMEM=y | 126 | CONFIG_FLATMEM=y |
| 125 | CONFIG_FLAT_NODE_MEM_MAP=y | 127 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 126 | # CONFIG_SPARSEMEM_STATIC is not set | 128 | # CONFIG_SPARSEMEM_STATIC is not set |
| 127 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 129 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 130 | # CONFIG_SMP is not set | ||
| 128 | CONFIG_PREEMPT_NONE=y | 131 | CONFIG_PREEMPT_NONE=y |
| 129 | # CONFIG_PREEMPT_VOLUNTARY is not set | 132 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 130 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| @@ -147,6 +150,7 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 147 | CONFIG_SYSCTL=y | 150 | CONFIG_SYSCTL=y |
| 148 | # CONFIG_AUDIT is not set | 151 | # CONFIG_AUDIT is not set |
| 149 | # CONFIG_IKCONFIG is not set | 152 | # CONFIG_IKCONFIG is not set |
| 153 | CONFIG_RELAY=y | ||
| 150 | CONFIG_INITRAMFS_SOURCE="" | 154 | CONFIG_INITRAMFS_SOURCE="" |
| 151 | CONFIG_EMBEDDED=y | 155 | CONFIG_EMBEDDED=y |
| 152 | CONFIG_KALLSYMS=y | 156 | CONFIG_KALLSYMS=y |
| @@ -159,10 +163,6 @@ CONFIG_ELF_CORE=y | |||
| 159 | # CONFIG_FUTEX is not set | 163 | # CONFIG_FUTEX is not set |
| 160 | # CONFIG_EPOLL is not set | 164 | # CONFIG_EPOLL is not set |
| 161 | # CONFIG_SHMEM is not set | 165 | # CONFIG_SHMEM is not set |
| 162 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 163 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 164 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 165 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 166 | CONFIG_SLAB=y | 166 | CONFIG_SLAB=y |
| 167 | CONFIG_TINY_SHMEM=y | 167 | CONFIG_TINY_SHMEM=y |
| 168 | CONFIG_BASE_SMALL=1 | 168 | CONFIG_BASE_SMALL=1 |
| @@ -177,6 +177,8 @@ CONFIG_BASE_SMALL=1 | |||
| 177 | # Block layer | 177 | # Block layer |
| 178 | # | 178 | # |
| 179 | # CONFIG_LBD is not set | 179 | # CONFIG_LBD is not set |
| 180 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 181 | # CONFIG_LSF is not set | ||
| 180 | 182 | ||
| 181 | # | 183 | # |
| 182 | # IO Schedulers | 184 | # IO Schedulers |
| @@ -196,6 +198,7 @@ CONFIG_DEFAULT_IOSCHED="noop" | |||
| 196 | # | 198 | # |
| 197 | CONFIG_ISA=y | 199 | CONFIG_ISA=y |
| 198 | CONFIG_MMU=y | 200 | CONFIG_MMU=y |
| 201 | CONFIG_I8253=y | ||
| 199 | 202 | ||
| 200 | # | 203 | # |
| 201 | # PCCARD (PCMCIA/CardBus) support | 204 | # PCCARD (PCMCIA/CardBus) support |
| @@ -241,12 +244,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 241 | # CONFIG_INET_AH is not set | 244 | # CONFIG_INET_AH is not set |
| 242 | # CONFIG_INET_ESP is not set | 245 | # CONFIG_INET_ESP is not set |
| 243 | # CONFIG_INET_IPCOMP is not set | 246 | # CONFIG_INET_IPCOMP is not set |
| 247 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 244 | # CONFIG_INET_TUNNEL is not set | 248 | # CONFIG_INET_TUNNEL is not set |
| 245 | CONFIG_INET_DIAG=y | 249 | CONFIG_INET_DIAG=y |
| 246 | CONFIG_INET_TCP_DIAG=y | 250 | CONFIG_INET_TCP_DIAG=y |
| 247 | # CONFIG_TCP_CONG_ADVANCED is not set | 251 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 248 | CONFIG_TCP_CONG_BIC=y | 252 | CONFIG_TCP_CONG_BIC=y |
| 249 | # CONFIG_IPV6 is not set | 253 | # CONFIG_IPV6 is not set |
| 254 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 255 | # CONFIG_INET6_TUNNEL is not set | ||
| 250 | # CONFIG_NETFILTER is not set | 256 | # CONFIG_NETFILTER is not set |
| 251 | # CONFIG_BRIDGE is not set | 257 | # CONFIG_BRIDGE is not set |
| 252 | # CONFIG_VLAN_8021Q is not set | 258 | # CONFIG_VLAN_8021Q is not set |
| @@ -308,7 +314,7 @@ CONFIG_PROC_EVENTS=y | |||
| 308 | # CONFIG_BLK_DEV_LOOP is not set | 314 | # CONFIG_BLK_DEV_LOOP is not set |
| 309 | # CONFIG_BLK_DEV_NBD is not set | 315 | # CONFIG_BLK_DEV_NBD is not set |
| 310 | # CONFIG_BLK_DEV_RAM is not set | 316 | # CONFIG_BLK_DEV_RAM is not set |
| 311 | CONFIG_BLK_DEV_RAM_COUNT=16 | 317 | # CONFIG_BLK_DEV_INITRD is not set |
| 312 | # CONFIG_CDROM_PKTCDVD is not set | 318 | # CONFIG_CDROM_PKTCDVD is not set |
| 313 | # CONFIG_ATA_OVER_ETH is not set | 319 | # CONFIG_ATA_OVER_ETH is not set |
| 314 | 320 | ||
| @@ -530,10 +536,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 530 | # | 536 | # |
| 531 | 537 | ||
| 532 | # | 538 | # |
| 533 | # Multimedia Capabilities Port drivers | ||
| 534 | # | ||
| 535 | |||
| 536 | # | ||
| 537 | # Multimedia devices | 539 | # Multimedia devices |
| 538 | # | 540 | # |
| 539 | # CONFIG_VIDEO_DEV is not set | 541 | # CONFIG_VIDEO_DEV is not set |
| @@ -552,6 +554,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 552 | # Console display driver support | 554 | # Console display driver support |
| 553 | # | 555 | # |
| 554 | CONFIG_VGA_CONSOLE=y | 556 | CONFIG_VGA_CONSOLE=y |
| 557 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 555 | # CONFIG_MDA_CONSOLE is not set | 558 | # CONFIG_MDA_CONSOLE is not set |
| 556 | CONFIG_DUMMY_CONSOLE=y | 559 | CONFIG_DUMMY_CONSOLE=y |
| 557 | 560 | ||
| @@ -565,6 +568,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 565 | # | 568 | # |
| 566 | # CONFIG_USB_ARCH_HAS_HCD is not set | 569 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 567 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 570 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 571 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 568 | 572 | ||
| 569 | # | 573 | # |
| 570 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 574 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -581,15 +585,28 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 581 | # CONFIG_MMC is not set | 585 | # CONFIG_MMC is not set |
| 582 | 586 | ||
| 583 | # | 587 | # |
| 588 | # LED devices | ||
| 589 | # | ||
| 590 | # CONFIG_NEW_LEDS is not set | ||
| 591 | |||
| 592 | # | ||
| 593 | # LED drivers | ||
| 594 | # | ||
| 595 | |||
| 596 | # | ||
| 597 | # LED Triggers | ||
| 598 | # | ||
| 599 | |||
| 600 | # | ||
| 584 | # InfiniBand support | 601 | # InfiniBand support |
| 585 | # | 602 | # |
| 586 | 603 | ||
| 587 | # | 604 | # |
| 588 | # SN Devices | 605 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 589 | # | 606 | # |
| 590 | 607 | ||
| 591 | # | 608 | # |
| 592 | # EDAC - error detection and reporting (RAS) | 609 | # Real Time Clock |
| 593 | # | 610 | # |
| 594 | 611 | ||
| 595 | # | 612 | # |
| @@ -632,7 +649,6 @@ CONFIG_SYSFS=y | |||
| 632 | # CONFIG_TMPFS is not set | 649 | # CONFIG_TMPFS is not set |
| 633 | # CONFIG_HUGETLB_PAGE is not set | 650 | # CONFIG_HUGETLB_PAGE is not set |
| 634 | CONFIG_RAMFS=y | 651 | CONFIG_RAMFS=y |
| 635 | CONFIG_RELAYFS_FS=y | ||
| 636 | 652 | ||
| 637 | # | 653 | # |
| 638 | # Miscellaneous filesystems | 654 | # Miscellaneous filesystems |
| @@ -680,6 +696,8 @@ CONFIG_MSDOS_PARTITION=y | |||
| 680 | # CONFIG_MAGIC_SYSRQ is not set | 696 | # CONFIG_MAGIC_SYSRQ is not set |
| 681 | # CONFIG_DEBUG_KERNEL is not set | 697 | # CONFIG_DEBUG_KERNEL is not set |
| 682 | CONFIG_LOG_BUF_SHIFT=14 | 698 | CONFIG_LOG_BUF_SHIFT=14 |
| 699 | # CONFIG_DEBUG_FS is not set | ||
| 700 | # CONFIG_UNWIND_INFO is not set | ||
| 683 | CONFIG_CROSSCOMPILE=y | 701 | CONFIG_CROSSCOMPILE=y |
| 684 | CONFIG_CMDLINE="" | 702 | CONFIG_CMDLINE="" |
| 685 | 703 | ||
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index b126f763cf51..3d441932e43a 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:30 2006 | 4 | # Mon Apr 24 14:51:16 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -71,6 +71,8 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61=y | |||
| 71 | # CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set | 71 | # CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set |
| 72 | # CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set | 72 | # CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set |
| 73 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 73 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 74 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 75 | CONFIG_GENERIC_HWEIGHT=y | ||
| 74 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 76 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 75 | CONFIG_DMA_NONCOHERENT=y | 77 | CONFIG_DMA_NONCOHERENT=y |
| 76 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 78 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -121,10 +123,9 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 121 | # CONFIG_PAGE_SIZE_8KB is not set | 123 | # CONFIG_PAGE_SIZE_8KB is not set |
| 122 | # CONFIG_PAGE_SIZE_16KB is not set | 124 | # CONFIG_PAGE_SIZE_16KB is not set |
| 123 | # CONFIG_PAGE_SIZE_64KB is not set | 125 | # CONFIG_PAGE_SIZE_64KB is not set |
| 126 | CONFIG_CPU_HAS_PREFETCH=y | ||
| 124 | # CONFIG_MIPS_MT is not set | 127 | # CONFIG_MIPS_MT is not set |
| 125 | CONFIG_CPU_ADVANCED=y | ||
| 126 | CONFIG_CPU_HAS_LLSC=y | 128 | CONFIG_CPU_HAS_LLSC=y |
| 127 | CONFIG_CPU_HAS_WB=y | ||
| 128 | CONFIG_CPU_HAS_SYNC=y | 129 | CONFIG_CPU_HAS_SYNC=y |
| 129 | CONFIG_GENERIC_HARDIRQS=y | 130 | CONFIG_GENERIC_HARDIRQS=y |
| 130 | CONFIG_GENERIC_IRQ_PROBE=y | 131 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -145,7 +146,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 145 | # Code maturity level options | 146 | # Code maturity level options |
| 146 | # | 147 | # |
| 147 | CONFIG_EXPERIMENTAL=y | 148 | CONFIG_EXPERIMENTAL=y |
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | 149 | CONFIG_BROKEN_ON_SMP=y |
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 151 | 151 | ||
| @@ -162,6 +162,7 @@ CONFIG_SYSCTL=y | |||
| 162 | # CONFIG_AUDIT is not set | 162 | # CONFIG_AUDIT is not set |
| 163 | CONFIG_IKCONFIG=y | 163 | CONFIG_IKCONFIG=y |
| 164 | CONFIG_IKCONFIG_PROC=y | 164 | CONFIG_IKCONFIG_PROC=y |
| 165 | CONFIG_RELAY=y | ||
| 165 | CONFIG_INITRAMFS_SOURCE="" | 166 | CONFIG_INITRAMFS_SOURCE="" |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_EMBEDDED=y | 168 | CONFIG_EMBEDDED=y |
| @@ -175,10 +176,6 @@ CONFIG_BASE_FULL=y | |||
| 175 | # CONFIG_FUTEX is not set | 176 | # CONFIG_FUTEX is not set |
| 176 | # CONFIG_EPOLL is not set | 177 | # CONFIG_EPOLL is not set |
| 177 | CONFIG_SHMEM=y | 178 | CONFIG_SHMEM=y |
| 178 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 179 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 180 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 181 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 182 | CONFIG_SLAB=y | 179 | CONFIG_SLAB=y |
| 183 | # CONFIG_TINY_SHMEM is not set | 180 | # CONFIG_TINY_SHMEM is not set |
| 184 | CONFIG_BASE_SMALL=0 | 181 | CONFIG_BASE_SMALL=0 |
| @@ -190,7 +187,6 @@ CONFIG_OBSOLETE_INTERMODULE=y | |||
| 190 | # | 187 | # |
| 191 | CONFIG_MODULES=y | 188 | CONFIG_MODULES=y |
| 192 | # CONFIG_MODULE_UNLOAD is not set | 189 | # CONFIG_MODULE_UNLOAD is not set |
| 193 | CONFIG_OBSOLETE_MODPARM=y | ||
| 194 | # CONFIG_MODVERSIONS is not set | 190 | # CONFIG_MODVERSIONS is not set |
| 195 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 191 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 196 | CONFIG_KMOD=y | 192 | CONFIG_KMOD=y |
| @@ -199,6 +195,8 @@ CONFIG_KMOD=y | |||
| 199 | # Block layer | 195 | # Block layer |
| 200 | # | 196 | # |
| 201 | # CONFIG_LBD is not set | 197 | # CONFIG_LBD is not set |
| 198 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 199 | # CONFIG_LSF is not set | ||
| 202 | 200 | ||
| 203 | # | 201 | # |
| 204 | # IO Schedulers | 202 | # IO Schedulers |
| @@ -218,7 +216,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 218 | # | 216 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 217 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 218 | CONFIG_PCI=y |
| 221 | # CONFIG_PCI_LEGACY_PROC is not set | ||
| 222 | CONFIG_ISA=y | 219 | CONFIG_ISA=y |
| 223 | CONFIG_MMU=y | 220 | CONFIG_MMU=y |
| 224 | 221 | ||
| @@ -247,6 +244,7 @@ CONFIG_NET=y | |||
| 247 | # | 244 | # |
| 248 | # Networking options | 245 | # Networking options |
| 249 | # | 246 | # |
| 247 | # CONFIG_NETDEBUG is not set | ||
| 250 | CONFIG_PACKET=y | 248 | CONFIG_PACKET=y |
| 251 | # CONFIG_PACKET_MMAP is not set | 249 | # CONFIG_PACKET_MMAP is not set |
| 252 | CONFIG_UNIX=y | 250 | CONFIG_UNIX=y |
| @@ -267,6 +265,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 267 | # CONFIG_INET_AH is not set | 265 | # CONFIG_INET_AH is not set |
| 268 | # CONFIG_INET_ESP is not set | 266 | # CONFIG_INET_ESP is not set |
| 269 | # CONFIG_INET_IPCOMP is not set | 267 | # CONFIG_INET_IPCOMP is not set |
| 268 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 270 | # CONFIG_INET_TUNNEL is not set | 269 | # CONFIG_INET_TUNNEL is not set |
| 271 | CONFIG_INET_DIAG=y | 270 | CONFIG_INET_DIAG=y |
| 272 | CONFIG_INET_TCP_DIAG=y | 271 | CONFIG_INET_TCP_DIAG=y |
| @@ -279,9 +278,12 @@ CONFIG_TCP_CONG_BIC=y | |||
| 279 | # CONFIG_IP_VS is not set | 278 | # CONFIG_IP_VS is not set |
| 280 | CONFIG_IPV6=m | 279 | CONFIG_IPV6=m |
| 281 | # CONFIG_IPV6_PRIVACY is not set | 280 | # CONFIG_IPV6_PRIVACY is not set |
| 281 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 282 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 282 | # CONFIG_INET6_AH is not set | 283 | # CONFIG_INET6_AH is not set |
| 283 | # CONFIG_INET6_ESP is not set | 284 | # CONFIG_INET6_ESP is not set |
| 284 | # CONFIG_INET6_IPCOMP is not set | 285 | # CONFIG_INET6_IPCOMP is not set |
| 286 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 285 | # CONFIG_INET6_TUNNEL is not set | 287 | # CONFIG_INET6_TUNNEL is not set |
| 286 | # CONFIG_IPV6_TUNNEL is not set | 288 | # CONFIG_IPV6_TUNNEL is not set |
| 287 | CONFIG_NETFILTER=y | 289 | CONFIG_NETFILTER=y |
| @@ -300,10 +302,12 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 300 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 302 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 303 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 304 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 303 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 306 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 307 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 308 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 306 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 309 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 307 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 311 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 308 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 312 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 309 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 313 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -333,6 +337,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 333 | # SCTP Configuration (EXPERIMENTAL) | 337 | # SCTP Configuration (EXPERIMENTAL) |
| 334 | # | 338 | # |
| 335 | # CONFIG_IP_SCTP is not set | 339 | # CONFIG_IP_SCTP is not set |
| 340 | |||
| 341 | # | ||
| 342 | # TIPC Configuration (EXPERIMENTAL) | ||
| 343 | # | ||
| 344 | # CONFIG_TIPC is not set | ||
| 336 | # CONFIG_ATM is not set | 345 | # CONFIG_ATM is not set |
| 337 | # CONFIG_BRIDGE is not set | 346 | # CONFIG_BRIDGE is not set |
| 338 | # CONFIG_VLAN_8021Q is not set | 347 | # CONFIG_VLAN_8021Q is not set |
| @@ -342,11 +351,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 342 | # CONFIG_ATALK is not set | 351 | # CONFIG_ATALK is not set |
| 343 | # CONFIG_X25 is not set | 352 | # CONFIG_X25 is not set |
| 344 | # CONFIG_LAPB is not set | 353 | # CONFIG_LAPB is not set |
| 345 | |||
| 346 | # | ||
| 347 | # TIPC Configuration (EXPERIMENTAL) | ||
| 348 | # | ||
| 349 | # CONFIG_TIPC is not set | ||
| 350 | # CONFIG_NET_DIVERT is not set | 354 | # CONFIG_NET_DIVERT is not set |
| 351 | # CONFIG_ECONET is not set | 355 | # CONFIG_ECONET is not set |
| 352 | # CONFIG_WAN_ROUTER is not set | 356 | # CONFIG_WAN_ROUTER is not set |
| @@ -369,6 +373,9 @@ CONFIG_IEEE80211=m | |||
| 369 | CONFIG_IEEE80211_CRYPT_WEP=m | 373 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 370 | CONFIG_IEEE80211_CRYPT_CCMP=m | 374 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 371 | CONFIG_IEEE80211_CRYPT_TKIP=m | 375 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 376 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 377 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 378 | CONFIG_WIRELESS_EXT=y | ||
| 372 | 379 | ||
| 373 | # | 380 | # |
| 374 | # Device Drivers | 381 | # Device Drivers |
| @@ -425,7 +432,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 425 | # CONFIG_MTD_CFI_I8 is not set | 432 | # CONFIG_MTD_CFI_I8 is not set |
| 426 | CONFIG_MTD_CFI_INTELEXT=y | 433 | CONFIG_MTD_CFI_INTELEXT=y |
| 427 | CONFIG_MTD_CFI_AMDSTD=y | 434 | CONFIG_MTD_CFI_AMDSTD=y |
| 428 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 429 | # CONFIG_MTD_CFI_STAA is not set | 435 | # CONFIG_MTD_CFI_STAA is not set |
| 430 | CONFIG_MTD_CFI_UTIL=y | 436 | CONFIG_MTD_CFI_UTIL=y |
| 431 | # CONFIG_MTD_RAM is not set | 437 | # CONFIG_MTD_RAM is not set |
| @@ -447,7 +453,6 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 447 | # CONFIG_MTD_SLRAM is not set | 453 | # CONFIG_MTD_SLRAM is not set |
| 448 | # CONFIG_MTD_PHRAM is not set | 454 | # CONFIG_MTD_PHRAM is not set |
| 449 | # CONFIG_MTD_MTDRAM is not set | 455 | # CONFIG_MTD_MTDRAM is not set |
| 450 | # CONFIG_MTD_BLKMTD is not set | ||
| 451 | # CONFIG_MTD_BLOCK2MTD is not set | 456 | # CONFIG_MTD_BLOCK2MTD is not set |
| 452 | 457 | ||
| 453 | # | 458 | # |
| @@ -702,6 +707,7 @@ CONFIG_NET_PCI=y | |||
| 702 | # Wireless LAN (non-hamradio) | 707 | # Wireless LAN (non-hamradio) |
| 703 | # | 708 | # |
| 704 | CONFIG_NET_RADIO=y | 709 | CONFIG_NET_RADIO=y |
| 710 | # CONFIG_NET_WIRELESS_RTNETLINK is not set | ||
| 705 | 711 | ||
| 706 | # | 712 | # |
| 707 | # Obsolete Wireless cards support (pre-802.11) | 713 | # Obsolete Wireless cards support (pre-802.11) |
| @@ -715,6 +721,8 @@ CONFIG_NET_RADIO=y | |||
| 715 | # | 721 | # |
| 716 | # CONFIG_IPW2100 is not set | 722 | # CONFIG_IPW2100 is not set |
| 717 | CONFIG_IPW2200=m | 723 | CONFIG_IPW2200=m |
| 724 | # CONFIG_IPW2200_MONITOR is not set | ||
| 725 | # CONFIG_IPW_QOS is not set | ||
| 718 | # CONFIG_IPW2200_DEBUG is not set | 726 | # CONFIG_IPW2200_DEBUG is not set |
| 719 | # CONFIG_HERMES is not set | 727 | # CONFIG_HERMES is not set |
| 720 | # CONFIG_ATMEL is not set | 728 | # CONFIG_ATMEL is not set |
| @@ -724,6 +732,7 @@ CONFIG_IPW2200=m | |||
| 724 | # | 732 | # |
| 725 | # CONFIG_PRISM54 is not set | 733 | # CONFIG_PRISM54 is not set |
| 726 | # CONFIG_HOSTAP is not set | 734 | # CONFIG_HOSTAP is not set |
| 735 | # CONFIG_BCM43XX is not set | ||
| 727 | CONFIG_NET_WIRELESS=y | 736 | CONFIG_NET_WIRELESS=y |
| 728 | 737 | ||
| 729 | # | 738 | # |
| @@ -821,7 +830,12 @@ CONFIG_HW_CONSOLE=y | |||
| 821 | # | 830 | # |
| 822 | # Non-8250 serial port support | 831 | # Non-8250 serial port support |
| 823 | # | 832 | # |
| 833 | CONFIG_SERIAL_CORE=y | ||
| 834 | CONFIG_SERIAL_TXX9=y | ||
| 824 | CONFIG_HAS_TXX9_SERIAL=y | 835 | CONFIG_HAS_TXX9_SERIAL=y |
| 836 | # CONFIG_SERIAL_TXX9_CONSOLE is not set | ||
| 837 | # CONFIG_SERIAL_TXX9_STDSERIAL is not set | ||
| 838 | # CONFIG_SERIAL_JSM is not set | ||
| 825 | CONFIG_UNIX98_PTYS=y | 839 | CONFIG_UNIX98_PTYS=y |
| 826 | CONFIG_LEGACY_PTYS=y | 840 | CONFIG_LEGACY_PTYS=y |
| 827 | CONFIG_LEGACY_PTY_COUNT=256 | 841 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -874,6 +888,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 874 | # | 888 | # |
| 875 | CONFIG_HWMON=y | 889 | CONFIG_HWMON=y |
| 876 | # CONFIG_HWMON_VID is not set | 890 | # CONFIG_HWMON_VID is not set |
| 891 | # CONFIG_SENSORS_F71805F is not set | ||
| 877 | # CONFIG_HWMON_DEBUG_CHIP is not set | 892 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 878 | 893 | ||
| 879 | # | 894 | # |
| @@ -881,10 +896,6 @@ CONFIG_HWMON=y | |||
| 881 | # | 896 | # |
| 882 | 897 | ||
| 883 | # | 898 | # |
| 884 | # Multimedia Capabilities Port drivers | ||
| 885 | # | ||
| 886 | |||
| 887 | # | ||
| 888 | # Multimedia devices | 899 | # Multimedia devices |
| 889 | # | 900 | # |
| 890 | # CONFIG_VIDEO_DEV is not set | 901 | # CONFIG_VIDEO_DEV is not set |
| @@ -893,6 +904,7 @@ CONFIG_HWMON=y | |||
| 893 | # Digital Video Broadcasting Devices | 904 | # Digital Video Broadcasting Devices |
| 894 | # | 905 | # |
| 895 | # CONFIG_DVB is not set | 906 | # CONFIG_DVB is not set |
| 907 | # CONFIG_USB_DABUSB is not set | ||
| 896 | 908 | ||
| 897 | # | 909 | # |
| 898 | # Graphics support | 910 | # Graphics support |
| @@ -902,6 +914,7 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 902 | CONFIG_FB_CFB_COPYAREA=y | 914 | CONFIG_FB_CFB_COPYAREA=y |
| 903 | CONFIG_FB_CFB_IMAGEBLIT=y | 915 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 904 | # CONFIG_FB_MACMODES is not set | 916 | # CONFIG_FB_MACMODES is not set |
| 917 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 905 | # CONFIG_FB_MODE_HELPERS is not set | 918 | # CONFIG_FB_MODE_HELPERS is not set |
| 906 | # CONFIG_FB_TILEBLITTING is not set | 919 | # CONFIG_FB_TILEBLITTING is not set |
| 907 | # CONFIG_FB_CIRRUS is not set | 920 | # CONFIG_FB_CIRRUS is not set |
| @@ -913,7 +926,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 913 | # CONFIG_FB_NVIDIA is not set | 926 | # CONFIG_FB_NVIDIA is not set |
| 914 | # CONFIG_FB_RIVA is not set | 927 | # CONFIG_FB_RIVA is not set |
| 915 | # CONFIG_FB_MATROX is not set | 928 | # CONFIG_FB_MATROX is not set |
| 916 | # CONFIG_FB_RADEON_OLD is not set | ||
| 917 | # CONFIG_FB_RADEON is not set | 929 | # CONFIG_FB_RADEON is not set |
| 918 | # CONFIG_FB_ATY128 is not set | 930 | # CONFIG_FB_ATY128 is not set |
| 919 | CONFIG_FB_ATY=y | 931 | CONFIG_FB_ATY=y |
| @@ -934,6 +946,7 @@ CONFIG_FB_ATY_CT=y | |||
| 934 | # Console display driver support | 946 | # Console display driver support |
| 935 | # | 947 | # |
| 936 | CONFIG_VGA_CONSOLE=y | 948 | CONFIG_VGA_CONSOLE=y |
| 949 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 937 | # CONFIG_MDA_CONSOLE is not set | 950 | # CONFIG_MDA_CONSOLE is not set |
| 938 | CONFIG_DUMMY_CONSOLE=y | 951 | CONFIG_DUMMY_CONSOLE=y |
| 939 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 952 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
| @@ -954,6 +967,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 954 | # | 967 | # |
| 955 | CONFIG_USB_ARCH_HAS_HCD=y | 968 | CONFIG_USB_ARCH_HAS_HCD=y |
| 956 | CONFIG_USB_ARCH_HAS_OHCI=y | 969 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 970 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 957 | CONFIG_USB=y | 971 | CONFIG_USB=y |
| 958 | # CONFIG_USB_DEBUG is not set | 972 | # CONFIG_USB_DEBUG is not set |
| 959 | 973 | ||
| @@ -1003,9 +1017,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1003 | # CONFIG_USB_ACECAD is not set | 1017 | # CONFIG_USB_ACECAD is not set |
| 1004 | # CONFIG_USB_KBTAB is not set | 1018 | # CONFIG_USB_KBTAB is not set |
| 1005 | # CONFIG_USB_POWERMATE is not set | 1019 | # CONFIG_USB_POWERMATE is not set |
| 1006 | # CONFIG_USB_MTOUCH is not set | 1020 | # CONFIG_USB_TOUCHSCREEN is not set |
| 1007 | # CONFIG_USB_ITMTOUCH is not set | ||
| 1008 | # CONFIG_USB_EGALAX is not set | ||
| 1009 | CONFIG_USB_YEALINK=m | 1021 | CONFIG_USB_YEALINK=m |
| 1010 | # CONFIG_USB_XPAD is not set | 1022 | # CONFIG_USB_XPAD is not set |
| 1011 | # CONFIG_USB_ATI_REMOTE is not set | 1023 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -1019,15 +1031,6 @@ CONFIG_USB_YEALINK=m | |||
| 1019 | # CONFIG_USB_MDC800 is not set | 1031 | # CONFIG_USB_MDC800 is not set |
| 1020 | 1032 | ||
| 1021 | # | 1033 | # |
| 1022 | # USB Multimedia devices | ||
| 1023 | # | ||
| 1024 | # CONFIG_USB_DABUSB is not set | ||
| 1025 | |||
| 1026 | # | ||
| 1027 | # Video4Linux support is needed for USB Multimedia device support | ||
| 1028 | # | ||
| 1029 | |||
| 1030 | # | ||
| 1031 | # USB Network Adapters | 1034 | # USB Network Adapters |
| 1032 | # | 1035 | # |
| 1033 | # CONFIG_USB_CATC is not set | 1036 | # CONFIG_USB_CATC is not set |
| @@ -1078,13 +1081,31 @@ CONFIG_USB_MON=y | |||
| 1078 | # CONFIG_MMC is not set | 1081 | # CONFIG_MMC is not set |
| 1079 | 1082 | ||
| 1080 | # | 1083 | # |
| 1084 | # LED devices | ||
| 1085 | # | ||
| 1086 | # CONFIG_NEW_LEDS is not set | ||
| 1087 | |||
| 1088 | # | ||
| 1089 | # LED drivers | ||
| 1090 | # | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # LED Triggers | ||
| 1094 | # | ||
| 1095 | |||
| 1096 | # | ||
| 1081 | # InfiniBand support | 1097 | # InfiniBand support |
| 1082 | # | 1098 | # |
| 1083 | # CONFIG_INFINIBAND is not set | 1099 | # CONFIG_INFINIBAND is not set |
| 1084 | 1100 | ||
| 1085 | # | 1101 | # |
| 1086 | # SN Devices | 1102 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1103 | # | ||
| 1104 | |||
| 1105 | # | ||
| 1106 | # Real Time Clock | ||
| 1087 | # | 1107 | # |
| 1108 | # CONFIG_RTC_CLASS is not set | ||
| 1088 | 1109 | ||
| 1089 | # | 1110 | # |
| 1090 | # File systems | 1111 | # File systems |
| @@ -1148,7 +1169,6 @@ CONFIG_SYSFS=y | |||
| 1148 | CONFIG_TMPFS=y | 1169 | CONFIG_TMPFS=y |
| 1149 | # CONFIG_HUGETLB_PAGE is not set | 1170 | # CONFIG_HUGETLB_PAGE is not set |
| 1150 | CONFIG_RAMFS=y | 1171 | CONFIG_RAMFS=y |
| 1151 | CONFIG_RELAYFS_FS=m | ||
| 1152 | # CONFIG_CONFIGFS_FS is not set | 1172 | # CONFIG_CONFIGFS_FS is not set |
| 1153 | 1173 | ||
| 1154 | # | 1174 | # |
| @@ -1266,6 +1286,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1266 | # CONFIG_MAGIC_SYSRQ is not set | 1286 | # CONFIG_MAGIC_SYSRQ is not set |
| 1267 | # CONFIG_DEBUG_KERNEL is not set | 1287 | # CONFIG_DEBUG_KERNEL is not set |
| 1268 | CONFIG_LOG_BUF_SHIFT=14 | 1288 | CONFIG_LOG_BUF_SHIFT=14 |
| 1289 | # CONFIG_DEBUG_FS is not set | ||
| 1269 | CONFIG_CROSSCOMPILE=y | 1290 | CONFIG_CROSSCOMPILE=y |
| 1270 | CONFIG_CMDLINE="" | 1291 | CONFIG_CMDLINE="" |
| 1271 | 1292 | ||
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 463ed3dbf6ae..edfb9679a25a 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:31 2006 | 4 | # Mon Apr 24 14:51:16 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_SNI_RM200_PCI=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_ARC=y | 70 | CONFIG_ARC=y |
| 69 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 71 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| @@ -122,7 +124,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 122 | # CONFIG_PAGE_SIZE_64KB is not set | 124 | # CONFIG_PAGE_SIZE_64KB is not set |
| 123 | # CONFIG_MIPS_MT is not set | 125 | # CONFIG_MIPS_MT is not set |
| 124 | # CONFIG_64BIT_PHYS_ADDR is not set | 126 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 125 | # CONFIG_CPU_ADVANCED is not set | ||
| 126 | CONFIG_CPU_HAS_LLSC=y | 127 | CONFIG_CPU_HAS_LLSC=y |
| 127 | CONFIG_CPU_HAS_SYNC=y | 128 | CONFIG_CPU_HAS_SYNC=y |
| 128 | CONFIG_GENERIC_HARDIRQS=y | 129 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -145,7 +146,6 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 145 | # Code maturity level options | 146 | # Code maturity level options |
| 146 | # | 147 | # |
| 147 | CONFIG_EXPERIMENTAL=y | 148 | CONFIG_EXPERIMENTAL=y |
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | 149 | CONFIG_BROKEN_ON_SMP=y |
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 151 | 151 | ||
| @@ -163,6 +163,7 @@ CONFIG_SYSCTL=y | |||
| 163 | # CONFIG_AUDIT is not set | 163 | # CONFIG_AUDIT is not set |
| 164 | CONFIG_IKCONFIG=y | 164 | CONFIG_IKCONFIG=y |
| 165 | CONFIG_IKCONFIG_PROC=y | 165 | CONFIG_IKCONFIG_PROC=y |
| 166 | CONFIG_RELAY=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | 167 | CONFIG_INITRAMFS_SOURCE="" |
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 168 | CONFIG_EMBEDDED=y | 169 | CONFIG_EMBEDDED=y |
| @@ -176,10 +177,6 @@ CONFIG_BASE_FULL=y | |||
| 176 | CONFIG_FUTEX=y | 177 | CONFIG_FUTEX=y |
| 177 | CONFIG_EPOLL=y | 178 | CONFIG_EPOLL=y |
| 178 | CONFIG_SHMEM=y | 179 | CONFIG_SHMEM=y |
| 179 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 180 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 181 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 182 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 183 | CONFIG_SLAB=y | 180 | CONFIG_SLAB=y |
| 184 | # CONFIG_TINY_SHMEM is not set | 181 | # CONFIG_TINY_SHMEM is not set |
| 185 | CONFIG_BASE_SMALL=0 | 182 | CONFIG_BASE_SMALL=0 |
| @@ -191,7 +188,6 @@ CONFIG_BASE_SMALL=0 | |||
| 191 | CONFIG_MODULES=y | 188 | CONFIG_MODULES=y |
| 192 | CONFIG_MODULE_UNLOAD=y | 189 | CONFIG_MODULE_UNLOAD=y |
| 193 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 190 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 194 | CONFIG_OBSOLETE_MODPARM=y | ||
| 195 | CONFIG_MODVERSIONS=y | 191 | CONFIG_MODVERSIONS=y |
| 196 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 192 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 197 | CONFIG_KMOD=y | 193 | CONFIG_KMOD=y |
| @@ -200,6 +196,8 @@ CONFIG_KMOD=y | |||
| 200 | # Block layer | 196 | # Block layer |
| 201 | # | 197 | # |
| 202 | # CONFIG_LBD is not set | 198 | # CONFIG_LBD is not set |
| 199 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 200 | # CONFIG_LSF is not set | ||
| 203 | 201 | ||
| 204 | # | 202 | # |
| 205 | # IO Schedulers | 203 | # IO Schedulers |
| @@ -220,10 +218,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 220 | CONFIG_HW_HAS_EISA=y | 218 | CONFIG_HW_HAS_EISA=y |
| 221 | CONFIG_HW_HAS_PCI=y | 219 | CONFIG_HW_HAS_PCI=y |
| 222 | CONFIG_PCI=y | 220 | CONFIG_PCI=y |
| 223 | CONFIG_PCI_LEGACY_PROC=y | ||
| 224 | CONFIG_ISA=y | 221 | CONFIG_ISA=y |
| 225 | # CONFIG_EISA is not set | 222 | # CONFIG_EISA is not set |
| 226 | CONFIG_MMU=y | 223 | CONFIG_MMU=y |
| 224 | CONFIG_I8253=y | ||
| 227 | 225 | ||
| 228 | # | 226 | # |
| 229 | # PCCARD (PCMCIA/CardBus) support | 227 | # PCCARD (PCMCIA/CardBus) support |
| @@ -250,6 +248,7 @@ CONFIG_NET=y | |||
| 250 | # | 248 | # |
| 251 | # Networking options | 249 | # Networking options |
| 252 | # | 250 | # |
| 251 | # CONFIG_NETDEBUG is not set | ||
| 253 | CONFIG_PACKET=m | 252 | CONFIG_PACKET=m |
| 254 | CONFIG_PACKET_MMAP=y | 253 | CONFIG_PACKET_MMAP=y |
| 255 | CONFIG_UNIX=y | 254 | CONFIG_UNIX=y |
| @@ -272,6 +271,7 @@ CONFIG_IP_PIMSM_V2=y | |||
| 272 | # CONFIG_INET_AH is not set | 271 | # CONFIG_INET_AH is not set |
| 273 | # CONFIG_INET_ESP is not set | 272 | # CONFIG_INET_ESP is not set |
| 274 | # CONFIG_INET_IPCOMP is not set | 273 | # CONFIG_INET_IPCOMP is not set |
| 274 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 275 | CONFIG_INET_TUNNEL=m | 275 | CONFIG_INET_TUNNEL=m |
| 276 | CONFIG_INET_DIAG=y | 276 | CONFIG_INET_DIAG=y |
| 277 | CONFIG_INET_TCP_DIAG=y | 277 | CONFIG_INET_TCP_DIAG=y |
| @@ -284,9 +284,12 @@ CONFIG_TCP_CONG_BIC=y | |||
| 284 | # CONFIG_IP_VS is not set | 284 | # CONFIG_IP_VS is not set |
| 285 | CONFIG_IPV6=m | 285 | CONFIG_IPV6=m |
| 286 | CONFIG_IPV6_PRIVACY=y | 286 | CONFIG_IPV6_PRIVACY=y |
| 287 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 288 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 287 | CONFIG_INET6_AH=m | 289 | CONFIG_INET6_AH=m |
| 288 | CONFIG_INET6_ESP=m | 290 | CONFIG_INET6_ESP=m |
| 289 | CONFIG_INET6_IPCOMP=m | 291 | CONFIG_INET6_IPCOMP=m |
| 292 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 290 | CONFIG_INET6_TUNNEL=m | 293 | CONFIG_INET6_TUNNEL=m |
| 291 | CONFIG_IPV6_TUNNEL=m | 294 | CONFIG_IPV6_TUNNEL=m |
| 292 | CONFIG_NETFILTER=y | 295 | CONFIG_NETFILTER=y |
| @@ -309,11 +312,14 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m | |||
| 309 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 312 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 313 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 311 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 314 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 315 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 312 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 316 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 313 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 317 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 314 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 318 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 315 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 319 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 316 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 320 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 321 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 322 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 317 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | 323 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m |
| 318 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 324 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 319 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 325 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| @@ -337,20 +343,19 @@ CONFIG_IP_NF_IRC=m | |||
| 337 | CONFIG_IP_NF_TFTP=m | 343 | CONFIG_IP_NF_TFTP=m |
| 338 | CONFIG_IP_NF_AMANDA=m | 344 | CONFIG_IP_NF_AMANDA=m |
| 339 | CONFIG_IP_NF_PPTP=m | 345 | CONFIG_IP_NF_PPTP=m |
| 346 | CONFIG_IP_NF_H323=m | ||
| 340 | CONFIG_IP_NF_QUEUE=m | 347 | CONFIG_IP_NF_QUEUE=m |
| 341 | CONFIG_IP_NF_IPTABLES=m | 348 | CONFIG_IP_NF_IPTABLES=m |
| 342 | CONFIG_IP_NF_MATCH_IPRANGE=m | 349 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 343 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 344 | CONFIG_IP_NF_MATCH_TOS=m | 350 | CONFIG_IP_NF_MATCH_TOS=m |
| 345 | CONFIG_IP_NF_MATCH_RECENT=m | 351 | CONFIG_IP_NF_MATCH_RECENT=m |
| 346 | CONFIG_IP_NF_MATCH_ECN=m | 352 | CONFIG_IP_NF_MATCH_ECN=m |
| 347 | CONFIG_IP_NF_MATCH_DSCP=m | 353 | CONFIG_IP_NF_MATCH_DSCP=m |
| 348 | CONFIG_IP_NF_MATCH_AH_ESP=m | 354 | CONFIG_IP_NF_MATCH_AH=m |
| 349 | CONFIG_IP_NF_MATCH_TTL=m | 355 | CONFIG_IP_NF_MATCH_TTL=m |
| 350 | CONFIG_IP_NF_MATCH_OWNER=m | 356 | CONFIG_IP_NF_MATCH_OWNER=m |
| 351 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 357 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 352 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 358 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
| 353 | CONFIG_IP_NF_MATCH_POLICY=m | ||
| 354 | CONFIG_IP_NF_FILTER=m | 359 | CONFIG_IP_NF_FILTER=m |
| 355 | CONFIG_IP_NF_TARGET_REJECT=m | 360 | CONFIG_IP_NF_TARGET_REJECT=m |
| 356 | CONFIG_IP_NF_TARGET_LOG=m | 361 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -368,6 +373,7 @@ CONFIG_IP_NF_NAT_FTP=m | |||
| 368 | CONFIG_IP_NF_NAT_TFTP=m | 373 | CONFIG_IP_NF_NAT_TFTP=m |
| 369 | CONFIG_IP_NF_NAT_AMANDA=m | 374 | CONFIG_IP_NF_NAT_AMANDA=m |
| 370 | CONFIG_IP_NF_NAT_PPTP=m | 375 | CONFIG_IP_NF_NAT_PPTP=m |
| 376 | CONFIG_IP_NF_NAT_H323=m | ||
| 371 | CONFIG_IP_NF_MANGLE=m | 377 | CONFIG_IP_NF_MANGLE=m |
| 372 | CONFIG_IP_NF_TARGET_TOS=m | 378 | CONFIG_IP_NF_TARGET_TOS=m |
| 373 | CONFIG_IP_NF_TARGET_ECN=m | 379 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -388,12 +394,10 @@ CONFIG_IP6_NF_MATCH_RT=m | |||
| 388 | CONFIG_IP6_NF_MATCH_OPTS=m | 394 | CONFIG_IP6_NF_MATCH_OPTS=m |
| 389 | CONFIG_IP6_NF_MATCH_FRAG=m | 395 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 390 | CONFIG_IP6_NF_MATCH_HL=m | 396 | CONFIG_IP6_NF_MATCH_HL=m |
| 391 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
| 392 | CONFIG_IP6_NF_MATCH_OWNER=m | 397 | CONFIG_IP6_NF_MATCH_OWNER=m |
| 393 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 398 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 394 | CONFIG_IP6_NF_MATCH_AHESP=m | 399 | CONFIG_IP6_NF_MATCH_AH=m |
| 395 | CONFIG_IP6_NF_MATCH_EUI64=m | 400 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 396 | CONFIG_IP6_NF_MATCH_POLICY=m | ||
| 397 | CONFIG_IP6_NF_FILTER=m | 401 | CONFIG_IP6_NF_FILTER=m |
| 398 | CONFIG_IP6_NF_TARGET_LOG=m | 402 | CONFIG_IP6_NF_TARGET_LOG=m |
| 399 | CONFIG_IP6_NF_TARGET_REJECT=m | 403 | CONFIG_IP6_NF_TARGET_REJECT=m |
| @@ -439,21 +443,22 @@ CONFIG_BRIDGE_EBT_ULOG=m | |||
| 439 | # SCTP Configuration (EXPERIMENTAL) | 443 | # SCTP Configuration (EXPERIMENTAL) |
| 440 | # | 444 | # |
| 441 | # CONFIG_IP_SCTP is not set | 445 | # CONFIG_IP_SCTP is not set |
| 446 | |||
| 447 | # | ||
| 448 | # TIPC Configuration (EXPERIMENTAL) | ||
| 449 | # | ||
| 450 | # CONFIG_TIPC is not set | ||
| 442 | # CONFIG_ATM is not set | 451 | # CONFIG_ATM is not set |
| 443 | CONFIG_BRIDGE=m | 452 | CONFIG_BRIDGE=m |
| 444 | # CONFIG_VLAN_8021Q is not set | 453 | # CONFIG_VLAN_8021Q is not set |
| 445 | CONFIG_DECNET=m | 454 | CONFIG_DECNET=m |
| 446 | # CONFIG_DECNET_ROUTER is not set | 455 | # CONFIG_DECNET_ROUTER is not set |
| 456 | CONFIG_LLC=m | ||
| 447 | # CONFIG_LLC2 is not set | 457 | # CONFIG_LLC2 is not set |
| 448 | # CONFIG_IPX is not set | 458 | # CONFIG_IPX is not set |
| 449 | # CONFIG_ATALK is not set | 459 | # CONFIG_ATALK is not set |
| 450 | # CONFIG_X25 is not set | 460 | # CONFIG_X25 is not set |
| 451 | # CONFIG_LAPB is not set | 461 | # CONFIG_LAPB is not set |
| 452 | |||
| 453 | # | ||
| 454 | # TIPC Configuration (EXPERIMENTAL) | ||
| 455 | # | ||
| 456 | # CONFIG_TIPC is not set | ||
| 457 | # CONFIG_NET_DIVERT is not set | 462 | # CONFIG_NET_DIVERT is not set |
| 458 | # CONFIG_ECONET is not set | 463 | # CONFIG_ECONET is not set |
| 459 | # CONFIG_WAN_ROUTER is not set | 464 | # CONFIG_WAN_ROUTER is not set |
| @@ -533,6 +538,9 @@ CONFIG_IEEE80211=m | |||
| 533 | # CONFIG_IEEE80211_DEBUG is not set | 538 | # CONFIG_IEEE80211_DEBUG is not set |
| 534 | CONFIG_IEEE80211_CRYPT_WEP=m | 539 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 535 | CONFIG_IEEE80211_CRYPT_CCMP=m | 540 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 541 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 542 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 543 | CONFIG_WIRELESS_EXT=y | ||
| 536 | 544 | ||
| 537 | # | 545 | # |
| 538 | # Device Drivers | 546 | # Device Drivers |
| @@ -620,6 +628,7 @@ CONFIG_BLK_DEV_UB=m | |||
| 620 | CONFIG_BLK_DEV_RAM=m | 628 | CONFIG_BLK_DEV_RAM=m |
| 621 | CONFIG_BLK_DEV_RAM_COUNT=16 | 629 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 622 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 630 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 631 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 623 | CONFIG_CDROM_PKTCDVD=m | 632 | CONFIG_CDROM_PKTCDVD=m |
| 624 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 633 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 625 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 634 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -700,12 +709,11 @@ CONFIG_SCSI_SYM53C8XX_2=y | |||
| 700 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | 709 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 |
| 701 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | 710 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
| 702 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | 711 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
| 703 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | 712 | CONFIG_SCSI_SYM53C8XX_MMIO=y |
| 704 | # CONFIG_SCSI_IPR is not set | 713 | # CONFIG_SCSI_IPR is not set |
| 705 | # CONFIG_SCSI_PAS16 is not set | 714 | # CONFIG_SCSI_PAS16 is not set |
| 706 | # CONFIG_SCSI_PSI240I is not set | 715 | # CONFIG_SCSI_PSI240I is not set |
| 707 | # CONFIG_SCSI_QLOGIC_FAS is not set | 716 | # CONFIG_SCSI_QLOGIC_FAS is not set |
| 708 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 709 | # CONFIG_SCSI_QLOGIC_1280 is not set | 717 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 710 | # CONFIG_SCSI_QLA_FC is not set | 718 | # CONFIG_SCSI_QLA_FC is not set |
| 711 | # CONFIG_SCSI_LPFC is not set | 719 | # CONFIG_SCSI_LPFC is not set |
| @@ -731,6 +739,7 @@ CONFIG_MD_RAID0=m | |||
| 731 | CONFIG_MD_RAID1=m | 739 | CONFIG_MD_RAID1=m |
| 732 | CONFIG_MD_RAID10=m | 740 | CONFIG_MD_RAID10=m |
| 733 | CONFIG_MD_RAID5=m | 741 | CONFIG_MD_RAID5=m |
| 742 | CONFIG_MD_RAID5_RESHAPE=y | ||
| 734 | # CONFIG_MD_RAID6 is not set | 743 | # CONFIG_MD_RAID6 is not set |
| 735 | CONFIG_MD_MULTIPATH=m | 744 | CONFIG_MD_MULTIPATH=m |
| 736 | CONFIG_MD_FAULTY=m | 745 | CONFIG_MD_FAULTY=m |
| @@ -965,6 +974,7 @@ CONFIG_HW_CONSOLE=y | |||
| 965 | # Serial drivers | 974 | # Serial drivers |
| 966 | # | 975 | # |
| 967 | CONFIG_SERIAL_8250=m | 976 | CONFIG_SERIAL_8250=m |
| 977 | CONFIG_SERIAL_8250_PCI=m | ||
| 968 | CONFIG_SERIAL_8250_NR_UARTS=4 | 978 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 969 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 979 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 970 | CONFIG_SERIAL_8250_EXTENDED=y | 980 | CONFIG_SERIAL_8250_EXTENDED=y |
| @@ -977,6 +987,7 @@ CONFIG_SERIAL_8250_RSA=y | |||
| 977 | # Non-8250 serial port support | 987 | # Non-8250 serial port support |
| 978 | # | 988 | # |
| 979 | CONFIG_SERIAL_CORE=m | 989 | CONFIG_SERIAL_CORE=m |
| 990 | # CONFIG_SERIAL_JSM is not set | ||
| 980 | CONFIG_UNIX98_PTYS=y | 991 | CONFIG_UNIX98_PTYS=y |
| 981 | CONFIG_LEGACY_PTYS=y | 992 | CONFIG_LEGACY_PTYS=y |
| 982 | CONFIG_LEGACY_PTY_COUNT=256 | 993 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -1027,12 +1038,19 @@ CONFIG_RTC=m | |||
| 1027 | # Dallas's 1-wire bus | 1038 | # Dallas's 1-wire bus |
| 1028 | # | 1039 | # |
| 1029 | CONFIG_W1=m | 1040 | CONFIG_W1=m |
| 1030 | CONFIG_W1_MATROX=m | 1041 | |
| 1031 | CONFIG_W1_DS9490=m | 1042 | # |
| 1032 | # CONFIG_W1_DS9490_BRIDGE is not set | 1043 | # 1-wire Bus Masters |
| 1033 | CONFIG_W1_THERM=m | 1044 | # |
| 1034 | CONFIG_W1_SMEM=m | 1045 | # CONFIG_W1_MASTER_MATROX is not set |
| 1035 | # CONFIG_W1_DS2433 is not set | 1046 | # CONFIG_W1_MASTER_DS9490 is not set |
| 1047 | |||
| 1048 | # | ||
| 1049 | # 1-wire Slaves | ||
| 1050 | # | ||
| 1051 | # CONFIG_W1_SLAVE_THERM is not set | ||
| 1052 | # CONFIG_W1_SLAVE_SMEM is not set | ||
| 1053 | # CONFIG_W1_SLAVE_DS2433 is not set | ||
| 1036 | 1054 | ||
| 1037 | # | 1055 | # |
| 1038 | # Hardware Monitoring support | 1056 | # Hardware Monitoring support |
| @@ -1045,10 +1063,6 @@ CONFIG_W1_SMEM=m | |||
| 1045 | # | 1063 | # |
| 1046 | 1064 | ||
| 1047 | # | 1065 | # |
| 1048 | # Multimedia Capabilities Port drivers | ||
| 1049 | # | ||
| 1050 | |||
| 1051 | # | ||
| 1052 | # Multimedia devices | 1066 | # Multimedia devices |
| 1053 | # | 1067 | # |
| 1054 | # CONFIG_VIDEO_DEV is not set | 1068 | # CONFIG_VIDEO_DEV is not set |
| @@ -1057,6 +1071,7 @@ CONFIG_W1_SMEM=m | |||
| 1057 | # Digital Video Broadcasting Devices | 1071 | # Digital Video Broadcasting Devices |
| 1058 | # | 1072 | # |
| 1059 | # CONFIG_DVB is not set | 1073 | # CONFIG_DVB is not set |
| 1074 | CONFIG_USB_DABUSB=m | ||
| 1060 | 1075 | ||
| 1061 | # | 1076 | # |
| 1062 | # Graphics support | 1077 | # Graphics support |
| @@ -1067,6 +1082,7 @@ CONFIG_W1_SMEM=m | |||
| 1067 | # Console display driver support | 1082 | # Console display driver support |
| 1068 | # | 1083 | # |
| 1069 | CONFIG_VGA_CONSOLE=y | 1084 | CONFIG_VGA_CONSOLE=y |
| 1085 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 1070 | # CONFIG_MDA_CONSOLE is not set | 1086 | # CONFIG_MDA_CONSOLE is not set |
| 1071 | CONFIG_DUMMY_CONSOLE=y | 1087 | CONFIG_DUMMY_CONSOLE=y |
| 1072 | 1088 | ||
| @@ -1080,6 +1096,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 1080 | # | 1096 | # |
| 1081 | CONFIG_USB_ARCH_HAS_HCD=y | 1097 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1082 | CONFIG_USB_ARCH_HAS_OHCI=y | 1098 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1099 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 1083 | CONFIG_USB=m | 1100 | CONFIG_USB=m |
| 1084 | # CONFIG_USB_DEBUG is not set | 1101 | # CONFIG_USB_DEBUG is not set |
| 1085 | 1102 | ||
| @@ -1151,9 +1168,7 @@ CONFIG_USB_WACOM=m | |||
| 1151 | # CONFIG_USB_ACECAD is not set | 1168 | # CONFIG_USB_ACECAD is not set |
| 1152 | CONFIG_USB_KBTAB=m | 1169 | CONFIG_USB_KBTAB=m |
| 1153 | CONFIG_USB_POWERMATE=m | 1170 | CONFIG_USB_POWERMATE=m |
| 1154 | # CONFIG_USB_MTOUCH is not set | 1171 | # CONFIG_USB_TOUCHSCREEN is not set |
| 1155 | # CONFIG_USB_ITMTOUCH is not set | ||
| 1156 | CONFIG_USB_EGALAX=m | ||
| 1157 | CONFIG_USB_YEALINK=m | 1172 | CONFIG_USB_YEALINK=m |
| 1158 | CONFIG_USB_XPAD=m | 1173 | CONFIG_USB_XPAD=m |
| 1159 | # CONFIG_USB_ATI_REMOTE is not set | 1174 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -1168,15 +1183,6 @@ CONFIG_USB_MDC800=m | |||
| 1168 | CONFIG_USB_MICROTEK=m | 1183 | CONFIG_USB_MICROTEK=m |
| 1169 | 1184 | ||
| 1170 | # | 1185 | # |
| 1171 | # USB Multimedia devices | ||
| 1172 | # | ||
| 1173 | CONFIG_USB_DABUSB=m | ||
| 1174 | |||
| 1175 | # | ||
| 1176 | # Video4Linux support is needed for USB Multimedia device support | ||
| 1177 | # | ||
| 1178 | |||
| 1179 | # | ||
| 1180 | # USB Network Adapters | 1186 | # USB Network Adapters |
| 1181 | # | 1187 | # |
| 1182 | CONFIG_USB_CATC=m | 1188 | CONFIG_USB_CATC=m |
| @@ -1213,6 +1219,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m | |||
| 1213 | CONFIG_USB_SERIAL_CYPRESS_M8=m | 1219 | CONFIG_USB_SERIAL_CYPRESS_M8=m |
| 1214 | CONFIG_USB_SERIAL_EMPEG=m | 1220 | CONFIG_USB_SERIAL_EMPEG=m |
| 1215 | CONFIG_USB_SERIAL_FTDI_SIO=m | 1221 | CONFIG_USB_SERIAL_FTDI_SIO=m |
| 1222 | # CONFIG_USB_SERIAL_FUNSOFT is not set | ||
| 1216 | CONFIG_USB_SERIAL_VISOR=m | 1223 | CONFIG_USB_SERIAL_VISOR=m |
| 1217 | CONFIG_USB_SERIAL_IPAQ=m | 1224 | CONFIG_USB_SERIAL_IPAQ=m |
| 1218 | CONFIG_USB_SERIAL_IR=m | 1225 | CONFIG_USB_SERIAL_IR=m |
| @@ -1237,6 +1244,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1237 | CONFIG_USB_SERIAL_KLSI=m | 1244 | CONFIG_USB_SERIAL_KLSI=m |
| 1238 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 1245 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
| 1239 | CONFIG_USB_SERIAL_MCT_U232=m | 1246 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1247 | # CONFIG_USB_SERIAL_NAVMAN is not set | ||
| 1240 | CONFIG_USB_SERIAL_PL2303=m | 1248 | CONFIG_USB_SERIAL_PL2303=m |
| 1241 | CONFIG_USB_SERIAL_HP4X=m | 1249 | CONFIG_USB_SERIAL_HP4X=m |
| 1242 | CONFIG_USB_SERIAL_SAFE=m | 1250 | CONFIG_USB_SERIAL_SAFE=m |
| @@ -1281,13 +1289,31 @@ CONFIG_USB_TEST=m | |||
| 1281 | # CONFIG_MMC is not set | 1289 | # CONFIG_MMC is not set |
| 1282 | 1290 | ||
| 1283 | # | 1291 | # |
| 1292 | # LED devices | ||
| 1293 | # | ||
| 1294 | # CONFIG_NEW_LEDS is not set | ||
| 1295 | |||
| 1296 | # | ||
| 1297 | # LED drivers | ||
| 1298 | # | ||
| 1299 | |||
| 1300 | # | ||
| 1301 | # LED Triggers | ||
| 1302 | # | ||
| 1303 | |||
| 1304 | # | ||
| 1284 | # InfiniBand support | 1305 | # InfiniBand support |
| 1285 | # | 1306 | # |
| 1286 | # CONFIG_INFINIBAND is not set | 1307 | # CONFIG_INFINIBAND is not set |
| 1287 | 1308 | ||
| 1288 | # | 1309 | # |
| 1289 | # SN Devices | 1310 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1311 | # | ||
| 1312 | |||
| 1313 | # | ||
| 1314 | # Real Time Clock | ||
| 1290 | # | 1315 | # |
| 1316 | # CONFIG_RTC_CLASS is not set | ||
| 1291 | 1317 | ||
| 1292 | # | 1318 | # |
| 1293 | # File systems | 1319 | # File systems |
| @@ -1358,7 +1384,6 @@ CONFIG_SYSFS=y | |||
| 1358 | # CONFIG_TMPFS is not set | 1384 | # CONFIG_TMPFS is not set |
| 1359 | # CONFIG_HUGETLB_PAGE is not set | 1385 | # CONFIG_HUGETLB_PAGE is not set |
| 1360 | CONFIG_RAMFS=y | 1386 | CONFIG_RAMFS=y |
| 1361 | CONFIG_RELAYFS_FS=m | ||
| 1362 | # CONFIG_CONFIGFS_FS is not set | 1387 | # CONFIG_CONFIGFS_FS is not set |
| 1363 | 1388 | ||
| 1364 | # | 1389 | # |
| @@ -1379,7 +1404,6 @@ CONFIG_HPFS_FS=m | |||
| 1379 | CONFIG_QNX4FS_FS=m | 1404 | CONFIG_QNX4FS_FS=m |
| 1380 | CONFIG_SYSV_FS=m | 1405 | CONFIG_SYSV_FS=m |
| 1381 | CONFIG_UFS_FS=m | 1406 | CONFIG_UFS_FS=m |
| 1382 | # CONFIG_UFS_FS_WRITE is not set | ||
| 1383 | 1407 | ||
| 1384 | # | 1408 | # |
| 1385 | # Network File Systems | 1409 | # Network File Systems |
| @@ -1500,6 +1524,7 @@ CONFIG_NLS_UTF8=m | |||
| 1500 | # CONFIG_MAGIC_SYSRQ is not set | 1524 | # CONFIG_MAGIC_SYSRQ is not set |
| 1501 | # CONFIG_DEBUG_KERNEL is not set | 1525 | # CONFIG_DEBUG_KERNEL is not set |
| 1502 | CONFIG_LOG_BUF_SHIFT=14 | 1526 | CONFIG_LOG_BUF_SHIFT=14 |
| 1527 | # CONFIG_DEBUG_FS is not set | ||
| 1503 | CONFIG_CROSSCOMPILE=y | 1528 | CONFIG_CROSSCOMPILE=y |
| 1504 | CONFIG_CMDLINE="" | 1529 | CONFIG_CMDLINE="" |
| 1505 | 1530 | ||
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index da68c3f72050..e388a3dae0a9 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:32 2006 | 4 | # Mon Apr 24 14:51:17 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -81,6 +81,8 @@ CONFIG_SIBYTE_CFE=y | |||
| 81 | # CONFIG_SIBYTE_SB1250_PROF is not set | 81 | # CONFIG_SIBYTE_SB1250_PROF is not set |
| 82 | # CONFIG_SIBYTE_TBPROF is not set | 82 | # CONFIG_SIBYTE_TBPROF is not set |
| 83 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 83 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 84 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 85 | CONFIG_GENERIC_HWEIGHT=y | ||
| 84 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 86 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 85 | CONFIG_DMA_COHERENT=y | 87 | CONFIG_DMA_COHERENT=y |
| 86 | CONFIG_CPU_BIG_ENDIAN=y | 88 | CONFIG_CPU_BIG_ENDIAN=y |
| @@ -158,7 +160,6 @@ CONFIG_PREEMPT_BKL=y | |||
| 158 | # Code maturity level options | 160 | # Code maturity level options |
| 159 | # | 161 | # |
| 160 | CONFIG_EXPERIMENTAL=y | 162 | CONFIG_EXPERIMENTAL=y |
| 161 | CONFIG_CLEAN_COMPILE=y | ||
| 162 | CONFIG_LOCK_KERNEL=y | 163 | CONFIG_LOCK_KERNEL=y |
| 163 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 164 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 164 | 165 | ||
| @@ -175,6 +176,7 @@ CONFIG_SYSCTL=y | |||
| 175 | # CONFIG_AUDIT is not set | 176 | # CONFIG_AUDIT is not set |
| 176 | # CONFIG_IKCONFIG is not set | 177 | # CONFIG_IKCONFIG is not set |
| 177 | CONFIG_CPUSETS=y | 178 | CONFIG_CPUSETS=y |
| 179 | CONFIG_RELAY=y | ||
| 178 | CONFIG_INITRAMFS_SOURCE="" | 180 | CONFIG_INITRAMFS_SOURCE="" |
| 179 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 181 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 180 | CONFIG_EMBEDDED=y | 182 | CONFIG_EMBEDDED=y |
| @@ -188,10 +190,6 @@ CONFIG_BASE_FULL=y | |||
| 188 | CONFIG_FUTEX=y | 190 | CONFIG_FUTEX=y |
| 189 | CONFIG_EPOLL=y | 191 | CONFIG_EPOLL=y |
| 190 | CONFIG_SHMEM=y | 192 | CONFIG_SHMEM=y |
| 191 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 192 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 193 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 194 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 195 | CONFIG_SLAB=y | 193 | CONFIG_SLAB=y |
| 196 | # CONFIG_TINY_SHMEM is not set | 194 | # CONFIG_TINY_SHMEM is not set |
| 197 | CONFIG_BASE_SMALL=0 | 195 | CONFIG_BASE_SMALL=0 |
| @@ -203,7 +201,6 @@ CONFIG_BASE_SMALL=0 | |||
| 203 | CONFIG_MODULES=y | 201 | CONFIG_MODULES=y |
| 204 | CONFIG_MODULE_UNLOAD=y | 202 | CONFIG_MODULE_UNLOAD=y |
| 205 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 203 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 206 | CONFIG_OBSOLETE_MODPARM=y | ||
| 207 | CONFIG_MODVERSIONS=y | 204 | CONFIG_MODVERSIONS=y |
| 208 | CONFIG_MODULE_SRCVERSION_ALL=y | 205 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 209 | CONFIG_KMOD=y | 206 | CONFIG_KMOD=y |
| @@ -212,6 +209,7 @@ CONFIG_STOP_MACHINE=y | |||
| 212 | # | 209 | # |
| 213 | # Block layer | 210 | # Block layer |
| 214 | # | 211 | # |
| 212 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 215 | 213 | ||
| 216 | # | 214 | # |
| 217 | # IO Schedulers | 215 | # IO Schedulers |
| @@ -231,7 +229,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 231 | # | 229 | # |
| 232 | CONFIG_HW_HAS_PCI=y | 230 | CONFIG_HW_HAS_PCI=y |
| 233 | CONFIG_PCI=y | 231 | CONFIG_PCI=y |
| 234 | CONFIG_PCI_LEGACY_PROC=y | ||
| 235 | CONFIG_MMU=y | 232 | CONFIG_MMU=y |
| 236 | 233 | ||
| 237 | # | 234 | # |
| @@ -249,6 +246,7 @@ CONFIG_MMU=y | |||
| 249 | # | 246 | # |
| 250 | CONFIG_BINFMT_ELF=y | 247 | CONFIG_BINFMT_ELF=y |
| 251 | # CONFIG_BINFMT_MISC is not set | 248 | # CONFIG_BINFMT_MISC is not set |
| 249 | # CONFIG_BUILD_ELF64 is not set | ||
| 252 | CONFIG_MIPS32_COMPAT=y | 250 | CONFIG_MIPS32_COMPAT=y |
| 253 | CONFIG_COMPAT=y | 251 | CONFIG_COMPAT=y |
| 254 | CONFIG_MIPS32_O32=y | 252 | CONFIG_MIPS32_O32=y |
| @@ -263,6 +261,7 @@ CONFIG_NET=y | |||
| 263 | # | 261 | # |
| 264 | # Networking options | 262 | # Networking options |
| 265 | # | 263 | # |
| 264 | # CONFIG_NETDEBUG is not set | ||
| 266 | CONFIG_PACKET=y | 265 | CONFIG_PACKET=y |
| 267 | CONFIG_PACKET_MMAP=y | 266 | CONFIG_PACKET_MMAP=y |
| 268 | CONFIG_UNIX=y | 267 | CONFIG_UNIX=y |
| @@ -284,12 +283,15 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 284 | # CONFIG_INET_AH is not set | 283 | # CONFIG_INET_AH is not set |
| 285 | # CONFIG_INET_ESP is not set | 284 | # CONFIG_INET_ESP is not set |
| 286 | # CONFIG_INET_IPCOMP is not set | 285 | # CONFIG_INET_IPCOMP is not set |
| 287 | CONFIG_INET_TUNNEL=m | 286 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 287 | # CONFIG_INET_TUNNEL is not set | ||
| 288 | CONFIG_INET_DIAG=y | 288 | CONFIG_INET_DIAG=y |
| 289 | CONFIG_INET_TCP_DIAG=y | 289 | CONFIG_INET_TCP_DIAG=y |
| 290 | # CONFIG_TCP_CONG_ADVANCED is not set | 290 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 291 | CONFIG_TCP_CONG_BIC=y | 291 | CONFIG_TCP_CONG_BIC=y |
| 292 | # CONFIG_IPV6 is not set | 292 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 293 | # CONFIG_NETFILTER is not set | 295 | # CONFIG_NETFILTER is not set |
| 294 | 296 | ||
| 295 | # | 297 | # |
| @@ -301,6 +303,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 301 | # SCTP Configuration (EXPERIMENTAL) | 303 | # SCTP Configuration (EXPERIMENTAL) |
| 302 | # | 304 | # |
| 303 | # CONFIG_IP_SCTP is not set | 305 | # CONFIG_IP_SCTP is not set |
| 306 | |||
| 307 | # | ||
| 308 | # TIPC Configuration (EXPERIMENTAL) | ||
| 309 | # | ||
| 310 | # CONFIG_TIPC is not set | ||
| 304 | # CONFIG_ATM is not set | 311 | # CONFIG_ATM is not set |
| 305 | # CONFIG_BRIDGE is not set | 312 | # CONFIG_BRIDGE is not set |
| 306 | # CONFIG_VLAN_8021Q is not set | 313 | # CONFIG_VLAN_8021Q is not set |
| @@ -310,11 +317,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 310 | # CONFIG_ATALK is not set | 317 | # CONFIG_ATALK is not set |
| 311 | # CONFIG_X25 is not set | 318 | # CONFIG_X25 is not set |
| 312 | # CONFIG_LAPB is not set | 319 | # CONFIG_LAPB is not set |
| 313 | |||
| 314 | # | ||
| 315 | # TIPC Configuration (EXPERIMENTAL) | ||
| 316 | # | ||
| 317 | # CONFIG_TIPC is not set | ||
| 318 | # CONFIG_NET_DIVERT is not set | 320 | # CONFIG_NET_DIVERT is not set |
| 319 | # CONFIG_ECONET is not set | 321 | # CONFIG_ECONET is not set |
| 320 | # CONFIG_WAN_ROUTER is not set | 322 | # CONFIG_WAN_ROUTER is not set |
| @@ -335,6 +337,9 @@ CONFIG_IEEE80211=m | |||
| 335 | # CONFIG_IEEE80211_DEBUG is not set | 337 | # CONFIG_IEEE80211_DEBUG is not set |
| 336 | CONFIG_IEEE80211_CRYPT_WEP=m | 338 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 337 | CONFIG_IEEE80211_CRYPT_CCMP=m | 339 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 340 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 341 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 342 | CONFIG_WIRELESS_EXT=y | ||
| 338 | 343 | ||
| 339 | # | 344 | # |
| 340 | # Device Drivers | 345 | # Device Drivers |
| @@ -589,6 +594,7 @@ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y | |||
| 589 | # | 594 | # |
| 590 | # Non-8250 serial port support | 595 | # Non-8250 serial port support |
| 591 | # | 596 | # |
| 597 | # CONFIG_SERIAL_JSM is not set | ||
| 592 | CONFIG_UNIX98_PTYS=y | 598 | CONFIG_UNIX98_PTYS=y |
| 593 | CONFIG_LEGACY_PTYS=y | 599 | CONFIG_LEGACY_PTYS=y |
| 594 | CONFIG_LEGACY_PTY_COUNT=256 | 600 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -647,10 +653,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 647 | # | 653 | # |
| 648 | 654 | ||
| 649 | # | 655 | # |
| 650 | # Multimedia Capabilities Port drivers | ||
| 651 | # | ||
| 652 | |||
| 653 | # | ||
| 654 | # Multimedia devices | 656 | # Multimedia devices |
| 655 | # | 657 | # |
| 656 | # CONFIG_VIDEO_DEV is not set | 658 | # CONFIG_VIDEO_DEV is not set |
| @@ -675,6 +677,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 675 | # | 677 | # |
| 676 | CONFIG_USB_ARCH_HAS_HCD=y | 678 | CONFIG_USB_ARCH_HAS_HCD=y |
| 677 | CONFIG_USB_ARCH_HAS_OHCI=y | 679 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 680 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 678 | # CONFIG_USB is not set | 681 | # CONFIG_USB is not set |
| 679 | 682 | ||
| 680 | # | 683 | # |
| @@ -692,13 +695,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 692 | # CONFIG_MMC is not set | 695 | # CONFIG_MMC is not set |
| 693 | 696 | ||
| 694 | # | 697 | # |
| 698 | # LED devices | ||
| 699 | # | ||
| 700 | # CONFIG_NEW_LEDS is not set | ||
| 701 | |||
| 702 | # | ||
| 703 | # LED drivers | ||
| 704 | # | ||
| 705 | |||
| 706 | # | ||
| 707 | # LED Triggers | ||
| 708 | # | ||
| 709 | |||
| 710 | # | ||
| 695 | # InfiniBand support | 711 | # InfiniBand support |
| 696 | # | 712 | # |
| 697 | # CONFIG_INFINIBAND is not set | 713 | # CONFIG_INFINIBAND is not set |
| 698 | 714 | ||
| 699 | # | 715 | # |
| 700 | # SN Devices | 716 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 717 | # | ||
| 718 | |||
| 719 | # | ||
| 720 | # Real Time Clock | ||
| 701 | # | 721 | # |
| 722 | # CONFIG_RTC_CLASS is not set | ||
| 702 | 723 | ||
| 703 | # | 724 | # |
| 704 | # File systems | 725 | # File systems |
| @@ -746,7 +767,6 @@ CONFIG_SYSFS=y | |||
| 746 | # CONFIG_TMPFS is not set | 767 | # CONFIG_TMPFS is not set |
| 747 | # CONFIG_HUGETLB_PAGE is not set | 768 | # CONFIG_HUGETLB_PAGE is not set |
| 748 | CONFIG_RAMFS=y | 769 | CONFIG_RAMFS=y |
| 749 | CONFIG_RELAYFS_FS=m | ||
| 750 | # CONFIG_CONFIGFS_FS is not set | 770 | # CONFIG_CONFIGFS_FS is not set |
| 751 | 771 | ||
| 752 | # | 772 | # |
| @@ -812,6 +832,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 812 | # CONFIG_MAGIC_SYSRQ is not set | 832 | # CONFIG_MAGIC_SYSRQ is not set |
| 813 | # CONFIG_DEBUG_KERNEL is not set | 833 | # CONFIG_DEBUG_KERNEL is not set |
| 814 | CONFIG_LOG_BUF_SHIFT=15 | 834 | CONFIG_LOG_BUF_SHIFT=15 |
| 835 | # CONFIG_DEBUG_FS is not set | ||
| 815 | CONFIG_CROSSCOMPILE=y | 836 | CONFIG_CROSSCOMPILE=y |
| 816 | CONFIG_CMDLINE="" | 837 | CONFIG_CMDLINE="" |
| 817 | # CONFIG_SB1XXX_CORELIS is not set | 838 | # CONFIG_SB1XXX_CORELIS is not set |
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index 9a936d7b7c0c..6b8a6a416a25 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:33 2006 | 4 | # Mon Apr 24 14:51:17 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_MIPS_SEAD=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -118,11 +120,11 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 118 | CONFIG_CPU_HAS_PREFETCH=y | 120 | CONFIG_CPU_HAS_PREFETCH=y |
| 119 | # CONFIG_MIPS_MT is not set | 121 | # CONFIG_MIPS_MT is not set |
| 120 | # CONFIG_64BIT_PHYS_ADDR is not set | 122 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 121 | # CONFIG_CPU_ADVANCED is not set | ||
| 122 | CONFIG_CPU_HAS_LLSC=y | 123 | CONFIG_CPU_HAS_LLSC=y |
| 123 | CONFIG_CPU_HAS_SYNC=y | 124 | CONFIG_CPU_HAS_SYNC=y |
| 124 | CONFIG_GENERIC_HARDIRQS=y | 125 | CONFIG_GENERIC_HARDIRQS=y |
| 125 | CONFIG_GENERIC_IRQ_PROBE=y | 126 | CONFIG_GENERIC_IRQ_PROBE=y |
| 127 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 126 | CONFIG_ARCH_FLATMEM_ENABLE=y | 128 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 127 | CONFIG_SELECT_MEMORY_MODEL=y | 129 | CONFIG_SELECT_MEMORY_MODEL=y |
| 128 | CONFIG_FLATMEM_MANUAL=y | 130 | CONFIG_FLATMEM_MANUAL=y |
| @@ -140,7 +142,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 140 | # Code maturity level options | 142 | # Code maturity level options |
| 141 | # | 143 | # |
| 142 | CONFIG_EXPERIMENTAL=y | 144 | CONFIG_EXPERIMENTAL=y |
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | 145 | CONFIG_BROKEN_ON_SMP=y |
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 146 | 147 | ||
| @@ -154,6 +155,7 @@ CONFIG_SYSVIPC=y | |||
| 154 | # CONFIG_BSD_PROCESS_ACCT is not set | 155 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 155 | CONFIG_SYSCTL=y | 156 | CONFIG_SYSCTL=y |
| 156 | # CONFIG_IKCONFIG is not set | 157 | # CONFIG_IKCONFIG is not set |
| 158 | CONFIG_RELAY=y | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | 159 | CONFIG_INITRAMFS_SOURCE="" |
| 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 160 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 159 | CONFIG_EMBEDDED=y | 161 | CONFIG_EMBEDDED=y |
| @@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y | |||
| 167 | CONFIG_FUTEX=y | 169 | CONFIG_FUTEX=y |
| 168 | CONFIG_EPOLL=y | 170 | CONFIG_EPOLL=y |
| 169 | CONFIG_SHMEM=y | 171 | CONFIG_SHMEM=y |
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | CONFIG_SLAB=y | 172 | CONFIG_SLAB=y |
| 175 | # CONFIG_TINY_SHMEM is not set | 173 | # CONFIG_TINY_SHMEM is not set |
| 176 | CONFIG_BASE_SMALL=0 | 174 | CONFIG_BASE_SMALL=0 |
| @@ -185,6 +183,8 @@ CONFIG_BASE_SMALL=0 | |||
| 185 | # Block layer | 183 | # Block layer |
| 186 | # | 184 | # |
| 187 | # CONFIG_LBD is not set | 185 | # CONFIG_LBD is not set |
| 186 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 187 | # CONFIG_LSF is not set | ||
| 188 | 188 | ||
| 189 | # | 189 | # |
| 190 | # IO Schedulers | 190 | # IO Schedulers |
| @@ -296,12 +296,6 @@ CONFIG_RAID_ATTRS=y | |||
| 296 | # | 296 | # |
| 297 | 297 | ||
| 298 | # | 298 | # |
| 299 | # Network device support | ||
| 300 | # | ||
| 301 | # CONFIG_NETPOLL is not set | ||
| 302 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # ISDN subsystem | 299 | # ISDN subsystem |
| 306 | # | 300 | # |
| 307 | 301 | ||
| @@ -397,10 +391,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 397 | # | 391 | # |
| 398 | 392 | ||
| 399 | # | 393 | # |
| 400 | # Multimedia Capabilities Port drivers | ||
| 401 | # | ||
| 402 | |||
| 403 | # | ||
| 404 | # Multimedia devices | 394 | # Multimedia devices |
| 405 | # | 395 | # |
| 406 | # CONFIG_VIDEO_DEV is not set | 396 | # CONFIG_VIDEO_DEV is not set |
| @@ -424,6 +414,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 424 | # | 414 | # |
| 425 | # CONFIG_USB_ARCH_HAS_HCD is not set | 415 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 426 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 416 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 417 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 427 | 418 | ||
| 428 | # | 419 | # |
| 429 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 420 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -440,12 +431,30 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 440 | # CONFIG_MMC is not set | 431 | # CONFIG_MMC is not set |
| 441 | 432 | ||
| 442 | # | 433 | # |
| 434 | # LED devices | ||
| 435 | # | ||
| 436 | # CONFIG_NEW_LEDS is not set | ||
| 437 | |||
| 438 | # | ||
| 439 | # LED drivers | ||
| 440 | # | ||
| 441 | |||
| 442 | # | ||
| 443 | # LED Triggers | ||
| 444 | # | ||
| 445 | |||
| 446 | # | ||
| 443 | # InfiniBand support | 447 | # InfiniBand support |
| 444 | # | 448 | # |
| 445 | 449 | ||
| 446 | # | 450 | # |
| 447 | # SN Devices | 451 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 452 | # | ||
| 453 | |||
| 454 | # | ||
| 455 | # Real Time Clock | ||
| 448 | # | 456 | # |
| 457 | # CONFIG_RTC_CLASS is not set | ||
| 449 | 458 | ||
| 450 | # | 459 | # |
| 451 | # File systems | 460 | # File systems |
| @@ -489,7 +498,6 @@ CONFIG_SYSFS=y | |||
| 489 | # CONFIG_TMPFS is not set | 498 | # CONFIG_TMPFS is not set |
| 490 | # CONFIG_HUGETLB_PAGE is not set | 499 | # CONFIG_HUGETLB_PAGE is not set |
| 491 | CONFIG_RAMFS=y | 500 | CONFIG_RAMFS=y |
| 492 | CONFIG_RELAYFS_FS=y | ||
| 493 | # CONFIG_CONFIGFS_FS is not set | 501 | # CONFIG_CONFIGFS_FS is not set |
| 494 | 502 | ||
| 495 | # | 503 | # |
| @@ -543,6 +551,8 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 543 | # CONFIG_MAGIC_SYSRQ is not set | 551 | # CONFIG_MAGIC_SYSRQ is not set |
| 544 | # CONFIG_DEBUG_KERNEL is not set | 552 | # CONFIG_DEBUG_KERNEL is not set |
| 545 | CONFIG_LOG_BUF_SHIFT=14 | 553 | CONFIG_LOG_BUF_SHIFT=14 |
| 554 | # CONFIG_DEBUG_FS is not set | ||
| 555 | # CONFIG_UNWIND_INFO is not set | ||
| 546 | CONFIG_CROSSCOMPILE=y | 556 | CONFIG_CROSSCOMPILE=y |
| 547 | CONFIG_CMDLINE="" | 557 | CONFIG_CMDLINE="" |
| 548 | 558 | ||
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index c2dee0d1c72c..dba0bdcdcf29 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:34 2006 | 4 | # Tue Apr 25 00:08:41 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -68,12 +68,14 @@ CONFIG_MACH_VR41XX=y | |||
| 68 | # CONFIG_NEC_CMBVR4133 is not set | 68 | # CONFIG_NEC_CMBVR4133 is not set |
| 69 | CONFIG_TANBAC_TB022X=y | 69 | CONFIG_TANBAC_TB022X=y |
| 70 | CONFIG_TANBAC_TB0226=y | 70 | CONFIG_TANBAC_TB0226=y |
| 71 | CONFIG_TANBAC_TB0287=y | 71 | # CONFIG_TANBAC_TB0287 is not set |
| 72 | # CONFIG_VICTOR_MPC30X is not set | 72 | # CONFIG_VICTOR_MPC30X is not set |
| 73 | # CONFIG_ZAO_CAPCELLA is not set | 73 | # CONFIG_ZAO_CAPCELLA is not set |
| 74 | CONFIG_PCI_VR41XX=y | 74 | CONFIG_PCI_VR41XX=y |
| 75 | # CONFIG_VRC4173 is not set | 75 | # CONFIG_VRC4173 is not set |
| 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 77 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 78 | CONFIG_GENERIC_HWEIGHT=y | ||
| 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 79 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 78 | CONFIG_DMA_NONCOHERENT=y | 80 | CONFIG_DMA_NONCOHERENT=y |
| 79 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 81 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -92,7 +94,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 92 | # CONFIG_CPU_MIPS64_R2 is not set | 94 | # CONFIG_CPU_MIPS64_R2 is not set |
| 93 | # CONFIG_CPU_R3000 is not set | 95 | # CONFIG_CPU_R3000 is not set |
| 94 | # CONFIG_CPU_TX39XX is not set | 96 | # CONFIG_CPU_TX39XX is not set |
| 95 | # CONFIG_CPU_VR41XX is not set | 97 | CONFIG_CPU_VR41XX=y |
| 96 | # CONFIG_CPU_R4300 is not set | 98 | # CONFIG_CPU_R4300 is not set |
| 97 | # CONFIG_CPU_R4X00 is not set | 99 | # CONFIG_CPU_R4X00 is not set |
| 98 | # CONFIG_CPU_TX49XX is not set | 100 | # CONFIG_CPU_TX49XX is not set |
| @@ -105,18 +107,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 105 | # CONFIG_CPU_RM7000 is not set | 107 | # CONFIG_CPU_RM7000 is not set |
| 106 | # CONFIG_CPU_RM9000 is not set | 108 | # CONFIG_CPU_RM9000 is not set |
| 107 | # CONFIG_CPU_SB1 is not set | 109 | # CONFIG_CPU_SB1 is not set |
| 110 | CONFIG_SYS_HAS_CPU_VR41XX=y | ||
| 111 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
| 112 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
| 113 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 108 | 114 | ||
| 109 | # | 115 | # |
| 110 | # Kernel type | 116 | # Kernel type |
| 111 | # | 117 | # |
| 112 | # CONFIG_32BIT is not set | 118 | CONFIG_32BIT=y |
| 113 | # CONFIG_64BIT is not set | 119 | # CONFIG_64BIT is not set |
| 114 | CONFIG_PAGE_SIZE_4KB=y | 120 | CONFIG_PAGE_SIZE_4KB=y |
| 115 | # CONFIG_PAGE_SIZE_8KB is not set | 121 | # CONFIG_PAGE_SIZE_8KB is not set |
| 116 | # CONFIG_PAGE_SIZE_16KB is not set | 122 | # CONFIG_PAGE_SIZE_16KB is not set |
| 117 | # CONFIG_PAGE_SIZE_64KB is not set | 123 | # CONFIG_PAGE_SIZE_64KB is not set |
| 118 | # CONFIG_MIPS_MT is not set | 124 | # CONFIG_MIPS_MT is not set |
| 119 | CONFIG_CPU_HAS_LLSC=y | ||
| 120 | CONFIG_CPU_HAS_SYNC=y | 125 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 126 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 127 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -137,7 +142,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 142 | # Code maturity level options |
| 138 | # | 143 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 144 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 145 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 147 | ||
| @@ -153,6 +157,7 @@ CONFIG_SYSVIPC=y | |||
| 153 | CONFIG_SYSCTL=y | 157 | CONFIG_SYSCTL=y |
| 154 | # CONFIG_AUDIT is not set | 158 | # CONFIG_AUDIT is not set |
| 155 | # CONFIG_IKCONFIG is not set | 159 | # CONFIG_IKCONFIG is not set |
| 160 | # CONFIG_RELAY is not set | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 161 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 163 | CONFIG_EMBEDDED=y |
| @@ -166,10 +171,6 @@ CONFIG_BASE_FULL=y | |||
| 166 | CONFIG_FUTEX=y | 171 | CONFIG_FUTEX=y |
| 167 | CONFIG_EPOLL=y | 172 | CONFIG_EPOLL=y |
| 168 | CONFIG_SHMEM=y | 173 | CONFIG_SHMEM=y |
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | CONFIG_SLAB=y | 174 | CONFIG_SLAB=y |
| 174 | # CONFIG_TINY_SHMEM is not set | 175 | # CONFIG_TINY_SHMEM is not set |
| 175 | CONFIG_BASE_SMALL=0 | 176 | CONFIG_BASE_SMALL=0 |
| @@ -181,7 +182,6 @@ CONFIG_BASE_SMALL=0 | |||
| 181 | CONFIG_MODULES=y | 182 | CONFIG_MODULES=y |
| 182 | CONFIG_MODULE_UNLOAD=y | 183 | CONFIG_MODULE_UNLOAD=y |
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | 185 | CONFIG_MODVERSIONS=y |
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | 186 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 187 | CONFIG_KMOD=y | 187 | CONFIG_KMOD=y |
| @@ -189,6 +189,9 @@ CONFIG_KMOD=y | |||
| 189 | # | 189 | # |
| 190 | # Block layer | 190 | # Block layer |
| 191 | # | 191 | # |
| 192 | # CONFIG_LBD is not set | ||
| 193 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 194 | # CONFIG_LSF is not set | ||
| 192 | 195 | ||
| 193 | # | 196 | # |
| 194 | # IO Schedulers | 197 | # IO Schedulers |
| @@ -208,7 +211,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 208 | # | 211 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| 210 | CONFIG_PCI=y | 213 | CONFIG_PCI=y |
| 211 | # CONFIG_PCI_LEGACY_PROC is not set | ||
| 212 | CONFIG_MMU=y | 214 | CONFIG_MMU=y |
| 213 | 215 | ||
| 214 | # | 216 | # |
| @@ -226,6 +228,7 @@ CONFIG_MMU=y | |||
| 226 | # | 228 | # |
| 227 | CONFIG_BINFMT_ELF=y | 229 | CONFIG_BINFMT_ELF=y |
| 228 | # CONFIG_BINFMT_MISC is not set | 230 | # CONFIG_BINFMT_MISC is not set |
| 231 | CONFIG_TRAD_SIGNALS=y | ||
| 229 | 232 | ||
| 230 | # | 233 | # |
| 231 | # Networking | 234 | # Networking |
| @@ -235,11 +238,10 @@ CONFIG_NET=y | |||
| 235 | # | 238 | # |
| 236 | # Networking options | 239 | # Networking options |
| 237 | # | 240 | # |
| 241 | # CONFIG_NETDEBUG is not set | ||
| 238 | CONFIG_PACKET=y | 242 | CONFIG_PACKET=y |
| 239 | # CONFIG_PACKET_MMAP is not set | 243 | # CONFIG_PACKET_MMAP is not set |
| 240 | CONFIG_UNIX=y | 244 | CONFIG_UNIX=y |
| 241 | CONFIG_XFRM=y | ||
| 242 | CONFIG_XFRM_USER=m | ||
| 243 | # CONFIG_NET_KEY is not set | 245 | # CONFIG_NET_KEY is not set |
| 244 | CONFIG_INET=y | 246 | CONFIG_INET=y |
| 245 | CONFIG_IP_MULTICAST=y | 247 | CONFIG_IP_MULTICAST=y |
| @@ -263,12 +265,15 @@ CONFIG_SYN_COOKIES=y | |||
| 263 | # CONFIG_INET_AH is not set | 265 | # CONFIG_INET_AH is not set |
| 264 | # CONFIG_INET_ESP is not set | 266 | # CONFIG_INET_ESP is not set |
| 265 | # CONFIG_INET_IPCOMP is not set | 267 | # CONFIG_INET_IPCOMP is not set |
| 266 | CONFIG_INET_TUNNEL=m | 268 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 269 | # CONFIG_INET_TUNNEL is not set | ||
| 267 | CONFIG_INET_DIAG=y | 270 | CONFIG_INET_DIAG=y |
| 268 | CONFIG_INET_TCP_DIAG=y | 271 | CONFIG_INET_TCP_DIAG=y |
| 269 | # CONFIG_TCP_CONG_ADVANCED is not set | 272 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 270 | CONFIG_TCP_CONG_BIC=y | 273 | CONFIG_TCP_CONG_BIC=y |
| 271 | # CONFIG_IPV6 is not set | 274 | # CONFIG_IPV6 is not set |
| 275 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 276 | # CONFIG_INET6_TUNNEL is not set | ||
| 272 | # CONFIG_NETFILTER is not set | 277 | # CONFIG_NETFILTER is not set |
| 273 | 278 | ||
| 274 | # | 279 | # |
| @@ -280,6 +285,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # SCTP Configuration (EXPERIMENTAL) | 285 | # SCTP Configuration (EXPERIMENTAL) |
| 281 | # | 286 | # |
| 282 | # CONFIG_IP_SCTP is not set | 287 | # CONFIG_IP_SCTP is not set |
| 288 | |||
| 289 | # | ||
| 290 | # TIPC Configuration (EXPERIMENTAL) | ||
| 291 | # | ||
| 292 | # CONFIG_TIPC is not set | ||
| 283 | # CONFIG_ATM is not set | 293 | # CONFIG_ATM is not set |
| 284 | # CONFIG_BRIDGE is not set | 294 | # CONFIG_BRIDGE is not set |
| 285 | # CONFIG_VLAN_8021Q is not set | 295 | # CONFIG_VLAN_8021Q is not set |
| @@ -289,11 +299,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # CONFIG_ATALK is not set | 299 | # CONFIG_ATALK is not set |
| 290 | # CONFIG_X25 is not set | 300 | # CONFIG_X25 is not set |
| 291 | # CONFIG_LAPB is not set | 301 | # CONFIG_LAPB is not set |
| 292 | |||
| 293 | # | ||
| 294 | # TIPC Configuration (EXPERIMENTAL) | ||
| 295 | # | ||
| 296 | # CONFIG_TIPC is not set | ||
| 297 | # CONFIG_NET_DIVERT is not set | 302 | # CONFIG_NET_DIVERT is not set |
| 298 | # CONFIG_ECONET is not set | 303 | # CONFIG_ECONET is not set |
| 299 | # CONFIG_WAN_ROUTER is not set | 304 | # CONFIG_WAN_ROUTER is not set |
| @@ -310,10 +315,7 @@ CONFIG_TCP_CONG_BIC=y | |||
| 310 | # CONFIG_HAMRADIO is not set | 315 | # CONFIG_HAMRADIO is not set |
| 311 | # CONFIG_IRDA is not set | 316 | # CONFIG_IRDA is not set |
| 312 | # CONFIG_BT is not set | 317 | # CONFIG_BT is not set |
| 313 | CONFIG_IEEE80211=m | 318 | # CONFIG_IEEE80211 is not set |
| 314 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 315 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 316 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 317 | 319 | ||
| 318 | # | 320 | # |
| 319 | # Device Drivers | 321 | # Device Drivers |
| @@ -358,11 +360,12 @@ CONFIG_BLK_DEV_LOOP=m | |||
| 358 | CONFIG_BLK_DEV_NBD=m | 360 | CONFIG_BLK_DEV_NBD=m |
| 359 | # CONFIG_BLK_DEV_SX8 is not set | 361 | # CONFIG_BLK_DEV_SX8 is not set |
| 360 | # CONFIG_BLK_DEV_UB is not set | 362 | # CONFIG_BLK_DEV_UB is not set |
| 361 | CONFIG_BLK_DEV_RAM=m | 363 | CONFIG_BLK_DEV_RAM=y |
| 362 | CONFIG_BLK_DEV_RAM_COUNT=16 | 364 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 363 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 365 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 366 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 364 | # CONFIG_CDROM_PKTCDVD is not set | 367 | # CONFIG_CDROM_PKTCDVD is not set |
| 365 | CONFIG_ATA_OVER_ETH=m | 368 | # CONFIG_ATA_OVER_ETH is not set |
| 366 | 369 | ||
| 367 | # | 370 | # |
| 368 | # ATA/ATAPI/MFM/RLL support | 371 | # ATA/ATAPI/MFM/RLL support |
| @@ -397,14 +400,14 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 397 | # SCSI Transport Attributes | 400 | # SCSI Transport Attributes |
| 398 | # | 401 | # |
| 399 | # CONFIG_SCSI_SPI_ATTRS is not set | 402 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 400 | CONFIG_SCSI_FC_ATTRS=y | 403 | # CONFIG_SCSI_FC_ATTRS is not set |
| 401 | CONFIG_SCSI_ISCSI_ATTRS=m | 404 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 402 | # CONFIG_SCSI_SAS_ATTRS is not set | 405 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 403 | 406 | ||
| 404 | # | 407 | # |
| 405 | # SCSI low-level drivers | 408 | # SCSI low-level drivers |
| 406 | # | 409 | # |
| 407 | CONFIG_ISCSI_TCP=m | 410 | # CONFIG_ISCSI_TCP is not set |
| 408 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 411 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 409 | # CONFIG_SCSI_3W_9XXX is not set | 412 | # CONFIG_SCSI_3W_9XXX is not set |
| 410 | # CONFIG_SCSI_ACARD is not set | 413 | # CONFIG_SCSI_ACARD is not set |
| @@ -424,7 +427,6 @@ CONFIG_ISCSI_TCP=m | |||
| 424 | # CONFIG_SCSI_INIA100 is not set | 427 | # CONFIG_SCSI_INIA100 is not set |
| 425 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 428 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 426 | # CONFIG_SCSI_IPR is not set | 429 | # CONFIG_SCSI_IPR is not set |
| 427 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 428 | # CONFIG_SCSI_QLOGIC_1280 is not set | 430 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 429 | # CONFIG_SCSI_QLA_FC is not set | 431 | # CONFIG_SCSI_QLA_FC is not set |
| 430 | # CONFIG_SCSI_LPFC is not set | 432 | # CONFIG_SCSI_LPFC is not set |
| @@ -507,8 +509,8 @@ CONFIG_NET_PCI=y | |||
| 507 | # CONFIG_B44 is not set | 509 | # CONFIG_B44 is not set |
| 508 | # CONFIG_FORCEDETH is not set | 510 | # CONFIG_FORCEDETH is not set |
| 509 | # CONFIG_DGRS is not set | 511 | # CONFIG_DGRS is not set |
| 510 | CONFIG_EEPRO100=y | 512 | # CONFIG_EEPRO100 is not set |
| 511 | # CONFIG_E100 is not set | 513 | CONFIG_E100=y |
| 512 | # CONFIG_FEALNX is not set | 514 | # CONFIG_FEALNX is not set |
| 513 | # CONFIG_NATSEMI is not set | 515 | # CONFIG_NATSEMI is not set |
| 514 | # CONFIG_NE2K_PCI is not set | 516 | # CONFIG_NE2K_PCI is not set |
| @@ -625,6 +627,11 @@ CONFIG_HW_CONSOLE=y | |||
| 625 | # | 627 | # |
| 626 | # Non-8250 serial port support | 628 | # Non-8250 serial port support |
| 627 | # | 629 | # |
| 630 | CONFIG_SERIAL_CORE=y | ||
| 631 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 632 | CONFIG_SERIAL_VR41XX=y | ||
| 633 | CONFIG_SERIAL_VR41XX_CONSOLE=y | ||
| 634 | # CONFIG_SERIAL_JSM is not set | ||
| 628 | CONFIG_UNIX98_PTYS=y | 635 | CONFIG_UNIX98_PTYS=y |
| 629 | CONFIG_LEGACY_PTYS=y | 636 | CONFIG_LEGACY_PTYS=y |
| 630 | CONFIG_LEGACY_PTY_COUNT=256 | 637 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -685,10 +692,6 @@ CONFIG_GPIO_VR41XX=y | |||
| 685 | # | 692 | # |
| 686 | 693 | ||
| 687 | # | 694 | # |
| 688 | # Multimedia Capabilities Port drivers | ||
| 689 | # | ||
| 690 | |||
| 691 | # | ||
| 692 | # Multimedia devices | 695 | # Multimedia devices |
| 693 | # | 696 | # |
| 694 | # CONFIG_VIDEO_DEV is not set | 697 | # CONFIG_VIDEO_DEV is not set |
| @@ -697,6 +700,7 @@ CONFIG_GPIO_VR41XX=y | |||
| 697 | # Digital Video Broadcasting Devices | 700 | # Digital Video Broadcasting Devices |
| 698 | # | 701 | # |
| 699 | # CONFIG_DVB is not set | 702 | # CONFIG_DVB is not set |
| 703 | # CONFIG_USB_DABUSB is not set | ||
| 700 | 704 | ||
| 701 | # | 705 | # |
| 702 | # Graphics support | 706 | # Graphics support |
| @@ -719,6 +723,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 719 | # | 723 | # |
| 720 | CONFIG_USB_ARCH_HAS_HCD=y | 724 | CONFIG_USB_ARCH_HAS_HCD=y |
| 721 | CONFIG_USB_ARCH_HAS_OHCI=y | 725 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 726 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 722 | CONFIG_USB=y | 727 | CONFIG_USB=y |
| 723 | # CONFIG_USB_DEBUG is not set | 728 | # CONFIG_USB_DEBUG is not set |
| 724 | 729 | ||
| @@ -756,7 +761,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 756 | # | 761 | # |
| 757 | # may also be needed; see USB_STORAGE Help for more information | 762 | # may also be needed; see USB_STORAGE Help for more information |
| 758 | # | 763 | # |
| 759 | CONFIG_USB_STORAGE=m | 764 | CONFIG_USB_STORAGE=y |
| 760 | # CONFIG_USB_STORAGE_DEBUG is not set | 765 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 761 | # CONFIG_USB_STORAGE_DATAFAB is not set | 766 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 762 | # CONFIG_USB_STORAGE_FREECOM is not set | 767 | # CONFIG_USB_STORAGE_FREECOM is not set |
| @@ -783,9 +788,7 @@ CONFIG_USB_STORAGE=m | |||
| 783 | # CONFIG_USB_ACECAD is not set | 788 | # CONFIG_USB_ACECAD is not set |
| 784 | # CONFIG_USB_KBTAB is not set | 789 | # CONFIG_USB_KBTAB is not set |
| 785 | # CONFIG_USB_POWERMATE is not set | 790 | # CONFIG_USB_POWERMATE is not set |
| 786 | # CONFIG_USB_MTOUCH is not set | 791 | # CONFIG_USB_TOUCHSCREEN is not set |
| 787 | # CONFIG_USB_ITMTOUCH is not set | ||
| 788 | # CONFIG_USB_EGALAX is not set | ||
| 789 | # CONFIG_USB_YEALINK is not set | 792 | # CONFIG_USB_YEALINK is not set |
| 790 | # CONFIG_USB_XPAD is not set | 793 | # CONFIG_USB_XPAD is not set |
| 791 | # CONFIG_USB_ATI_REMOTE is not set | 794 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -800,15 +803,6 @@ CONFIG_USB_STORAGE=m | |||
| 800 | # CONFIG_USB_MICROTEK is not set | 803 | # CONFIG_USB_MICROTEK is not set |
| 801 | 804 | ||
| 802 | # | 805 | # |
| 803 | # USB Multimedia devices | ||
| 804 | # | ||
| 805 | # CONFIG_USB_DABUSB is not set | ||
| 806 | |||
| 807 | # | ||
| 808 | # Video4Linux support is needed for USB Multimedia device support | ||
| 809 | # | ||
| 810 | |||
| 811 | # | ||
| 812 | # USB Network Adapters | 806 | # USB Network Adapters |
| 813 | # | 807 | # |
| 814 | # CONFIG_USB_CATC is not set | 808 | # CONFIG_USB_CATC is not set |
| @@ -816,7 +810,7 @@ CONFIG_USB_STORAGE=m | |||
| 816 | # CONFIG_USB_PEGASUS is not set | 810 | # CONFIG_USB_PEGASUS is not set |
| 817 | # CONFIG_USB_RTL8150 is not set | 811 | # CONFIG_USB_RTL8150 is not set |
| 818 | # CONFIG_USB_USBNET is not set | 812 | # CONFIG_USB_USBNET is not set |
| 819 | CONFIG_USB_MON=y | 813 | # CONFIG_USB_MON is not set |
| 820 | 814 | ||
| 821 | # | 815 | # |
| 822 | # USB port drivers | 816 | # USB port drivers |
| @@ -860,13 +854,48 @@ CONFIG_USB_MON=y | |||
| 860 | # CONFIG_MMC is not set | 854 | # CONFIG_MMC is not set |
| 861 | 855 | ||
| 862 | # | 856 | # |
| 857 | # LED devices | ||
| 858 | # | ||
| 859 | # CONFIG_NEW_LEDS is not set | ||
| 860 | |||
| 861 | # | ||
| 862 | # LED drivers | ||
| 863 | # | ||
| 864 | |||
| 865 | # | ||
| 866 | # LED Triggers | ||
| 867 | # | ||
| 868 | |||
| 869 | # | ||
| 863 | # InfiniBand support | 870 | # InfiniBand support |
| 864 | # | 871 | # |
| 865 | # CONFIG_INFINIBAND is not set | 872 | # CONFIG_INFINIBAND is not set |
| 866 | 873 | ||
| 867 | # | 874 | # |
| 868 | # SN Devices | 875 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 876 | # | ||
| 877 | |||
| 878 | # | ||
| 879 | # Real Time Clock | ||
| 880 | # | ||
| 881 | CONFIG_RTC_LIB=y | ||
| 882 | CONFIG_RTC_CLASS=y | ||
| 883 | CONFIG_RTC_HCTOSYS=y | ||
| 884 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 885 | |||
| 886 | # | ||
| 887 | # RTC interfaces | ||
| 888 | # | ||
| 889 | CONFIG_RTC_INTF_SYSFS=y | ||
| 890 | CONFIG_RTC_INTF_PROC=y | ||
| 891 | CONFIG_RTC_INTF_DEV=y | ||
| 892 | |||
| 893 | # | ||
| 894 | # RTC drivers | ||
| 869 | # | 895 | # |
| 896 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 897 | CONFIG_RTC_DRV_VR41XX=y | ||
| 898 | # CONFIG_RTC_DRV_TEST is not set | ||
| 870 | 899 | ||
| 871 | # | 900 | # |
| 872 | # File systems | 901 | # File systems |
| @@ -911,7 +940,6 @@ CONFIG_SYSFS=y | |||
| 911 | CONFIG_TMPFS=y | 940 | CONFIG_TMPFS=y |
| 912 | # CONFIG_HUGETLB_PAGE is not set | 941 | # CONFIG_HUGETLB_PAGE is not set |
| 913 | CONFIG_RAMFS=y | 942 | CONFIG_RAMFS=y |
| 914 | CONFIG_RELAYFS_FS=m | ||
| 915 | # CONFIG_CONFIGFS_FS is not set | 943 | # CONFIG_CONFIGFS_FS is not set |
| 916 | 944 | ||
| 917 | # | 945 | # |
| @@ -952,9 +980,7 @@ CONFIG_NFS_COMMON=y | |||
| 952 | CONFIG_SUNRPC=y | 980 | CONFIG_SUNRPC=y |
| 953 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 981 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 954 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 982 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 955 | CONFIG_SMB_FS=m | 983 | # CONFIG_SMB_FS is not set |
| 956 | CONFIG_SMB_NLS_DEFAULT=y | ||
| 957 | CONFIG_SMB_NLS_REMOTE="cp932" | ||
| 958 | # CONFIG_CIFS is not set | 984 | # CONFIG_CIFS is not set |
| 959 | # CONFIG_NCP_FS is not set | 985 | # CONFIG_NCP_FS is not set |
| 960 | # CONFIG_CODA_FS is not set | 986 | # CONFIG_CODA_FS is not set |
| @@ -970,46 +996,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 970 | # | 996 | # |
| 971 | # Native Language Support | 997 | # Native Language Support |
| 972 | # | 998 | # |
| 973 | CONFIG_NLS=y | 999 | # CONFIG_NLS is not set |
| 974 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 975 | CONFIG_NLS_CODEPAGE_437=m | ||
| 976 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 977 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 978 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 979 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 980 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 981 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 982 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 983 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 984 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 985 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 986 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 987 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 988 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 989 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 990 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 991 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 992 | CONFIG_NLS_CODEPAGE_932=m | ||
| 993 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 994 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 995 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 996 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 997 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 998 | # CONFIG_NLS_ASCII is not set | ||
| 999 | CONFIG_NLS_ISO8859_1=m | ||
| 1000 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1001 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1002 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1003 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1004 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1005 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1006 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1007 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1008 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1009 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1010 | # CONFIG_NLS_KOI8_R is not set | ||
| 1011 | # CONFIG_NLS_KOI8_U is not set | ||
| 1012 | # CONFIG_NLS_UTF8 is not set | ||
| 1013 | 1000 | ||
| 1014 | # | 1001 | # |
| 1015 | # Profiling support | 1002 | # Profiling support |
| @@ -1023,44 +1010,20 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1023 | # CONFIG_MAGIC_SYSRQ is not set | 1010 | # CONFIG_MAGIC_SYSRQ is not set |
| 1024 | # CONFIG_DEBUG_KERNEL is not set | 1011 | # CONFIG_DEBUG_KERNEL is not set |
| 1025 | CONFIG_LOG_BUF_SHIFT=14 | 1012 | CONFIG_LOG_BUF_SHIFT=14 |
| 1013 | # CONFIG_DEBUG_FS is not set | ||
| 1026 | CONFIG_CROSSCOMPILE=y | 1014 | CONFIG_CROSSCOMPILE=y |
| 1027 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | 1015 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" |
| 1028 | 1016 | ||
| 1029 | # | 1017 | # |
| 1030 | # Security options | 1018 | # Security options |
| 1031 | # | 1019 | # |
| 1032 | CONFIG_KEYS=y | 1020 | # CONFIG_KEYS is not set |
| 1033 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 1034 | # CONFIG_SECURITY is not set | 1021 | # CONFIG_SECURITY is not set |
| 1035 | 1022 | ||
| 1036 | # | 1023 | # |
| 1037 | # Cryptographic options | 1024 | # Cryptographic options |
| 1038 | # | 1025 | # |
| 1039 | CONFIG_CRYPTO=y | 1026 | # CONFIG_CRYPTO is not set |
| 1040 | CONFIG_CRYPTO_HMAC=y | ||
| 1041 | CONFIG_CRYPTO_NULL=m | ||
| 1042 | CONFIG_CRYPTO_MD4=m | ||
| 1043 | CONFIG_CRYPTO_MD5=m | ||
| 1044 | CONFIG_CRYPTO_SHA1=m | ||
| 1045 | CONFIG_CRYPTO_SHA256=m | ||
| 1046 | CONFIG_CRYPTO_SHA512=m | ||
| 1047 | CONFIG_CRYPTO_WP512=m | ||
| 1048 | CONFIG_CRYPTO_TGR192=m | ||
| 1049 | CONFIG_CRYPTO_DES=m | ||
| 1050 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1051 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1052 | CONFIG_CRYPTO_SERPENT=m | ||
| 1053 | CONFIG_CRYPTO_AES=m | ||
| 1054 | CONFIG_CRYPTO_CAST5=m | ||
| 1055 | CONFIG_CRYPTO_CAST6=m | ||
| 1056 | CONFIG_CRYPTO_TEA=m | ||
| 1057 | CONFIG_CRYPTO_ARC4=m | ||
| 1058 | CONFIG_CRYPTO_KHAZAD=m | ||
| 1059 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1060 | CONFIG_CRYPTO_DEFLATE=m | ||
| 1061 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1062 | CONFIG_CRYPTO_CRC32C=m | ||
| 1063 | # CONFIG_CRYPTO_TEST is not set | ||
| 1064 | 1027 | ||
| 1065 | # | 1028 | # |
| 1066 | # Hardware crypto devices | 1029 | # Hardware crypto devices |
| @@ -1069,9 +1032,8 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1069 | # | 1032 | # |
| 1070 | # Library routines | 1033 | # Library routines |
| 1071 | # | 1034 | # |
| 1072 | CONFIG_CRC_CCITT=m | 1035 | # CONFIG_CRC_CCITT is not set |
| 1073 | CONFIG_CRC16=m | 1036 | # CONFIG_CRC16 is not set |
| 1074 | CONFIG_CRC32=m | 1037 | # CONFIG_CRC32 is not set |
| 1075 | CONFIG_LIBCRC32C=m | 1038 | # CONFIG_LIBCRC32C is not set |
| 1076 | CONFIG_ZLIB_INFLATE=m | 1039 | CONFIG_ZLIB_INFLATE=m |
| 1077 | CONFIG_ZLIB_DEFLATE=m | ||
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index be99261d7997..5a924c1a5803 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:35 2006 | 4 | # Tue Apr 25 00:08:59 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -68,12 +68,14 @@ CONFIG_MACH_VR41XX=y | |||
| 68 | # CONFIG_NEC_CMBVR4133 is not set | 68 | # CONFIG_NEC_CMBVR4133 is not set |
| 69 | CONFIG_TANBAC_TB022X=y | 69 | CONFIG_TANBAC_TB022X=y |
| 70 | # CONFIG_TANBAC_TB0226 is not set | 70 | # CONFIG_TANBAC_TB0226 is not set |
| 71 | CONFIG_TANBAC_TB0287=y | 71 | # CONFIG_TANBAC_TB0287 is not set |
| 72 | # CONFIG_VICTOR_MPC30X is not set | 72 | # CONFIG_VICTOR_MPC30X is not set |
| 73 | # CONFIG_ZAO_CAPCELLA is not set | 73 | # CONFIG_ZAO_CAPCELLA is not set |
| 74 | CONFIG_PCI_VR41XX=y | 74 | CONFIG_PCI_VR41XX=y |
| 75 | # CONFIG_VRC4173 is not set | 75 | # CONFIG_VRC4173 is not set |
| 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 77 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 78 | CONFIG_GENERIC_HWEIGHT=y | ||
| 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 79 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 78 | CONFIG_DMA_NONCOHERENT=y | 80 | CONFIG_DMA_NONCOHERENT=y |
| 79 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 81 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -92,7 +94,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 92 | # CONFIG_CPU_MIPS64_R2 is not set | 94 | # CONFIG_CPU_MIPS64_R2 is not set |
| 93 | # CONFIG_CPU_R3000 is not set | 95 | # CONFIG_CPU_R3000 is not set |
| 94 | # CONFIG_CPU_TX39XX is not set | 96 | # CONFIG_CPU_TX39XX is not set |
| 95 | # CONFIG_CPU_VR41XX is not set | 97 | CONFIG_CPU_VR41XX=y |
| 96 | # CONFIG_CPU_R4300 is not set | 98 | # CONFIG_CPU_R4300 is not set |
| 97 | # CONFIG_CPU_R4X00 is not set | 99 | # CONFIG_CPU_R4X00 is not set |
| 98 | # CONFIG_CPU_TX49XX is not set | 100 | # CONFIG_CPU_TX49XX is not set |
| @@ -105,18 +107,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 105 | # CONFIG_CPU_RM7000 is not set | 107 | # CONFIG_CPU_RM7000 is not set |
| 106 | # CONFIG_CPU_RM9000 is not set | 108 | # CONFIG_CPU_RM9000 is not set |
| 107 | # CONFIG_CPU_SB1 is not set | 109 | # CONFIG_CPU_SB1 is not set |
| 110 | CONFIG_SYS_HAS_CPU_VR41XX=y | ||
| 111 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
| 112 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
| 113 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 108 | 114 | ||
| 109 | # | 115 | # |
| 110 | # Kernel type | 116 | # Kernel type |
| 111 | # | 117 | # |
| 112 | # CONFIG_32BIT is not set | 118 | CONFIG_32BIT=y |
| 113 | # CONFIG_64BIT is not set | 119 | # CONFIG_64BIT is not set |
| 114 | CONFIG_PAGE_SIZE_4KB=y | 120 | CONFIG_PAGE_SIZE_4KB=y |
| 115 | # CONFIG_PAGE_SIZE_8KB is not set | 121 | # CONFIG_PAGE_SIZE_8KB is not set |
| 116 | # CONFIG_PAGE_SIZE_16KB is not set | 122 | # CONFIG_PAGE_SIZE_16KB is not set |
| 117 | # CONFIG_PAGE_SIZE_64KB is not set | 123 | # CONFIG_PAGE_SIZE_64KB is not set |
| 118 | # CONFIG_MIPS_MT is not set | 124 | # CONFIG_MIPS_MT is not set |
| 119 | CONFIG_CPU_HAS_LLSC=y | ||
| 120 | CONFIG_CPU_HAS_SYNC=y | 125 | CONFIG_CPU_HAS_SYNC=y |
| 121 | CONFIG_GENERIC_HARDIRQS=y | 126 | CONFIG_GENERIC_HARDIRQS=y |
| 122 | CONFIG_GENERIC_IRQ_PROBE=y | 127 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -137,7 +142,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # Code maturity level options | 142 | # Code maturity level options |
| 138 | # | 143 | # |
| 139 | CONFIG_EXPERIMENTAL=y | 144 | CONFIG_EXPERIMENTAL=y |
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | 145 | CONFIG_BROKEN_ON_SMP=y |
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 143 | 147 | ||
| @@ -153,6 +157,7 @@ CONFIG_SYSVIPC=y | |||
| 153 | CONFIG_SYSCTL=y | 157 | CONFIG_SYSCTL=y |
| 154 | # CONFIG_AUDIT is not set | 158 | # CONFIG_AUDIT is not set |
| 155 | # CONFIG_IKCONFIG is not set | 159 | # CONFIG_IKCONFIG is not set |
| 160 | # CONFIG_RELAY is not set | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | 161 | CONFIG_INITRAMFS_SOURCE="" |
| 157 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 158 | CONFIG_EMBEDDED=y | 163 | CONFIG_EMBEDDED=y |
| @@ -166,10 +171,6 @@ CONFIG_BASE_FULL=y | |||
| 166 | CONFIG_FUTEX=y | 171 | CONFIG_FUTEX=y |
| 167 | CONFIG_EPOLL=y | 172 | CONFIG_EPOLL=y |
| 168 | CONFIG_SHMEM=y | 173 | CONFIG_SHMEM=y |
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | CONFIG_SLAB=y | 174 | CONFIG_SLAB=y |
| 174 | # CONFIG_TINY_SHMEM is not set | 175 | # CONFIG_TINY_SHMEM is not set |
| 175 | CONFIG_BASE_SMALL=0 | 176 | CONFIG_BASE_SMALL=0 |
| @@ -181,7 +182,6 @@ CONFIG_BASE_SMALL=0 | |||
| 181 | CONFIG_MODULES=y | 182 | CONFIG_MODULES=y |
| 182 | CONFIG_MODULE_UNLOAD=y | 183 | CONFIG_MODULE_UNLOAD=y |
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | 185 | CONFIG_MODVERSIONS=y |
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | 186 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 187 | CONFIG_KMOD=y | 187 | CONFIG_KMOD=y |
| @@ -189,6 +189,9 @@ CONFIG_KMOD=y | |||
| 189 | # | 189 | # |
| 190 | # Block layer | 190 | # Block layer |
| 191 | # | 191 | # |
| 192 | # CONFIG_LBD is not set | ||
| 193 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 194 | # CONFIG_LSF is not set | ||
| 192 | 195 | ||
| 193 | # | 196 | # |
| 194 | # IO Schedulers | 197 | # IO Schedulers |
| @@ -208,7 +211,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 208 | # | 211 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| 210 | CONFIG_PCI=y | 213 | CONFIG_PCI=y |
| 211 | # CONFIG_PCI_LEGACY_PROC is not set | ||
| 212 | CONFIG_MMU=y | 214 | CONFIG_MMU=y |
| 213 | 215 | ||
| 214 | # | 216 | # |
| @@ -226,6 +228,7 @@ CONFIG_MMU=y | |||
| 226 | # | 228 | # |
| 227 | CONFIG_BINFMT_ELF=y | 229 | CONFIG_BINFMT_ELF=y |
| 228 | # CONFIG_BINFMT_MISC is not set | 230 | # CONFIG_BINFMT_MISC is not set |
| 231 | CONFIG_TRAD_SIGNALS=y | ||
| 229 | 232 | ||
| 230 | # | 233 | # |
| 231 | # Networking | 234 | # Networking |
| @@ -235,11 +238,10 @@ CONFIG_NET=y | |||
| 235 | # | 238 | # |
| 236 | # Networking options | 239 | # Networking options |
| 237 | # | 240 | # |
| 241 | # CONFIG_NETDEBUG is not set | ||
| 238 | CONFIG_PACKET=y | 242 | CONFIG_PACKET=y |
| 239 | # CONFIG_PACKET_MMAP is not set | 243 | # CONFIG_PACKET_MMAP is not set |
| 240 | CONFIG_UNIX=y | 244 | CONFIG_UNIX=y |
| 241 | CONFIG_XFRM=y | ||
| 242 | CONFIG_XFRM_USER=m | ||
| 243 | # CONFIG_NET_KEY is not set | 245 | # CONFIG_NET_KEY is not set |
| 244 | CONFIG_INET=y | 246 | CONFIG_INET=y |
| 245 | CONFIG_IP_MULTICAST=y | 247 | CONFIG_IP_MULTICAST=y |
| @@ -264,12 +266,15 @@ CONFIG_SYN_COOKIES=y | |||
| 264 | # CONFIG_INET_AH is not set | 266 | # CONFIG_INET_AH is not set |
| 265 | # CONFIG_INET_ESP is not set | 267 | # CONFIG_INET_ESP is not set |
| 266 | # CONFIG_INET_IPCOMP is not set | 268 | # CONFIG_INET_IPCOMP is not set |
| 269 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 267 | CONFIG_INET_TUNNEL=m | 270 | CONFIG_INET_TUNNEL=m |
| 268 | CONFIG_INET_DIAG=y | 271 | CONFIG_INET_DIAG=y |
| 269 | CONFIG_INET_TCP_DIAG=y | 272 | CONFIG_INET_TCP_DIAG=y |
| 270 | # CONFIG_TCP_CONG_ADVANCED is not set | 273 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 271 | CONFIG_TCP_CONG_BIC=y | 274 | CONFIG_TCP_CONG_BIC=y |
| 272 | # CONFIG_IPV6 is not set | 275 | # CONFIG_IPV6 is not set |
| 276 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 277 | # CONFIG_INET6_TUNNEL is not set | ||
| 273 | # CONFIG_NETFILTER is not set | 278 | # CONFIG_NETFILTER is not set |
| 274 | 279 | ||
| 275 | # | 280 | # |
| @@ -281,6 +286,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 281 | # SCTP Configuration (EXPERIMENTAL) | 286 | # SCTP Configuration (EXPERIMENTAL) |
| 282 | # | 287 | # |
| 283 | # CONFIG_IP_SCTP is not set | 288 | # CONFIG_IP_SCTP is not set |
| 289 | |||
| 290 | # | ||
| 291 | # TIPC Configuration (EXPERIMENTAL) | ||
| 292 | # | ||
| 293 | # CONFIG_TIPC is not set | ||
| 284 | # CONFIG_ATM is not set | 294 | # CONFIG_ATM is not set |
| 285 | # CONFIG_BRIDGE is not set | 295 | # CONFIG_BRIDGE is not set |
| 286 | # CONFIG_VLAN_8021Q is not set | 296 | # CONFIG_VLAN_8021Q is not set |
| @@ -290,11 +300,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 290 | # CONFIG_ATALK is not set | 300 | # CONFIG_ATALK is not set |
| 291 | # CONFIG_X25 is not set | 301 | # CONFIG_X25 is not set |
| 292 | # CONFIG_LAPB is not set | 302 | # CONFIG_LAPB is not set |
| 293 | |||
| 294 | # | ||
| 295 | # TIPC Configuration (EXPERIMENTAL) | ||
| 296 | # | ||
| 297 | # CONFIG_TIPC is not set | ||
| 298 | # CONFIG_NET_DIVERT is not set | 303 | # CONFIG_NET_DIVERT is not set |
| 299 | # CONFIG_ECONET is not set | 304 | # CONFIG_ECONET is not set |
| 300 | # CONFIG_WAN_ROUTER is not set | 305 | # CONFIG_WAN_ROUTER is not set |
| @@ -311,10 +316,7 @@ CONFIG_TCP_CONG_BIC=y | |||
| 311 | # CONFIG_HAMRADIO is not set | 316 | # CONFIG_HAMRADIO is not set |
| 312 | # CONFIG_IRDA is not set | 317 | # CONFIG_IRDA is not set |
| 313 | # CONFIG_BT is not set | 318 | # CONFIG_BT is not set |
| 314 | CONFIG_IEEE80211=m | 319 | # CONFIG_IEEE80211 is not set |
| 315 | # CONFIG_IEEE80211_DEBUG is not set | ||
| 316 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 317 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 318 | 320 | ||
| 319 | # | 321 | # |
| 320 | # Device Drivers | 322 | # Device Drivers |
| @@ -325,12 +327,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m | |||
| 325 | # | 327 | # |
| 326 | CONFIG_STANDALONE=y | 328 | CONFIG_STANDALONE=y |
| 327 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 329 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 328 | CONFIG_FW_LOADER=m | 330 | # CONFIG_FW_LOADER is not set |
| 329 | 331 | ||
| 330 | # | 332 | # |
| 331 | # Connector - unified userspace <-> kernelspace linker | 333 | # Connector - unified userspace <-> kernelspace linker |
| 332 | # | 334 | # |
| 333 | CONFIG_CONNECTOR=m | 335 | # CONFIG_CONNECTOR is not set |
| 334 | 336 | ||
| 335 | # | 337 | # |
| 336 | # Memory Technology Devices (MTD) | 338 | # Memory Technology Devices (MTD) |
| @@ -363,10 +365,8 @@ CONFIG_BLK_DEV_RAM=y | |||
| 363 | CONFIG_BLK_DEV_RAM_COUNT=16 | 365 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 364 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 366 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 365 | # CONFIG_BLK_DEV_INITRD is not set | 367 | # CONFIG_BLK_DEV_INITRD is not set |
| 366 | CONFIG_CDROM_PKTCDVD=m | 368 | # CONFIG_CDROM_PKTCDVD is not set |
| 367 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 369 | # CONFIG_ATA_OVER_ETH is not set |
| 368 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
| 369 | CONFIG_ATA_OVER_ETH=m | ||
| 370 | 370 | ||
| 371 | # | 371 | # |
| 372 | # ATA/ATAPI/MFM/RLL support | 372 | # ATA/ATAPI/MFM/RLL support |
| @@ -443,30 +443,7 @@ CONFIG_MII=y | |||
| 443 | # | 443 | # |
| 444 | # CONFIG_NET_TULIP is not set | 444 | # CONFIG_NET_TULIP is not set |
| 445 | # CONFIG_HP100 is not set | 445 | # CONFIG_HP100 is not set |
| 446 | CONFIG_NET_PCI=y | 446 | # CONFIG_NET_PCI is not set |
| 447 | # CONFIG_PCNET32 is not set | ||
| 448 | # CONFIG_AMD8111_ETH is not set | ||
| 449 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 450 | # CONFIG_B44 is not set | ||
| 451 | # CONFIG_FORCEDETH is not set | ||
| 452 | # CONFIG_DGRS is not set | ||
| 453 | CONFIG_EEPRO100=y | ||
| 454 | # CONFIG_E100 is not set | ||
| 455 | # CONFIG_FEALNX is not set | ||
| 456 | # CONFIG_NATSEMI is not set | ||
| 457 | # CONFIG_NE2K_PCI is not set | ||
| 458 | # CONFIG_8139CP is not set | ||
| 459 | CONFIG_8139TOO=y | ||
| 460 | CONFIG_8139TOO_PIO=y | ||
| 461 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
| 462 | # CONFIG_8139TOO_8129 is not set | ||
| 463 | # CONFIG_8139_OLD_RX_RESET is not set | ||
| 464 | # CONFIG_SIS900 is not set | ||
| 465 | # CONFIG_EPIC100 is not set | ||
| 466 | # CONFIG_SUNDANCE is not set | ||
| 467 | # CONFIG_TLAN is not set | ||
| 468 | # CONFIG_VIA_RHINE is not set | ||
| 469 | # CONFIG_LAN_SAA9730 is not set | ||
| 470 | 447 | ||
| 471 | # | 448 | # |
| 472 | # Ethernet (1000 Mbit) | 449 | # Ethernet (1000 Mbit) |
| @@ -483,7 +460,6 @@ CONFIG_R8169=y | |||
| 483 | # CONFIG_SKGE is not set | 460 | # CONFIG_SKGE is not set |
| 484 | # CONFIG_SKY2 is not set | 461 | # CONFIG_SKY2 is not set |
| 485 | # CONFIG_SK98LIN is not set | 462 | # CONFIG_SK98LIN is not set |
| 486 | # CONFIG_VIA_VELOCITY is not set | ||
| 487 | # CONFIG_TIGON3 is not set | 463 | # CONFIG_TIGON3 is not set |
| 488 | # CONFIG_BNX2 is not set | 464 | # CONFIG_BNX2 is not set |
| 489 | 465 | ||
| @@ -510,19 +486,8 @@ CONFIG_R8169=y | |||
| 510 | # CONFIG_WAN is not set | 486 | # CONFIG_WAN is not set |
| 511 | # CONFIG_FDDI is not set | 487 | # CONFIG_FDDI is not set |
| 512 | # CONFIG_HIPPI is not set | 488 | # CONFIG_HIPPI is not set |
| 513 | CONFIG_PPP=m | 489 | # CONFIG_PPP is not set |
| 514 | CONFIG_PPP_MULTILINK=y | 490 | # CONFIG_SLIP is not set |
| 515 | CONFIG_PPP_FILTER=y | ||
| 516 | CONFIG_PPP_ASYNC=m | ||
| 517 | CONFIG_PPP_SYNC_TTY=m | ||
| 518 | CONFIG_PPP_DEFLATE=m | ||
| 519 | CONFIG_PPP_BSDCOMP=m | ||
| 520 | CONFIG_PPP_MPPE=m | ||
| 521 | CONFIG_PPPOE=m | ||
| 522 | CONFIG_SLIP=m | ||
| 523 | CONFIG_SLIP_COMPRESSED=y | ||
| 524 | CONFIG_SLIP_SMART=y | ||
| 525 | CONFIG_SLIP_MODE_SLIP6=y | ||
| 526 | # CONFIG_SHAPER is not set | 491 | # CONFIG_SHAPER is not set |
| 527 | # CONFIG_NETCONSOLE is not set | 492 | # CONFIG_NETCONSOLE is not set |
| 528 | # CONFIG_NETPOLL is not set | 493 | # CONFIG_NETPOLL is not set |
| @@ -583,6 +548,11 @@ CONFIG_HW_CONSOLE=y | |||
| 583 | # | 548 | # |
| 584 | # Non-8250 serial port support | 549 | # Non-8250 serial port support |
| 585 | # | 550 | # |
| 551 | CONFIG_SERIAL_CORE=y | ||
| 552 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 553 | CONFIG_SERIAL_VR41XX=y | ||
| 554 | CONFIG_SERIAL_VR41XX_CONSOLE=y | ||
| 555 | # CONFIG_SERIAL_JSM is not set | ||
| 586 | CONFIG_UNIX98_PTYS=y | 556 | CONFIG_UNIX98_PTYS=y |
| 587 | CONFIG_LEGACY_PTYS=y | 557 | CONFIG_LEGACY_PTYS=y |
| 588 | CONFIG_LEGACY_PTY_COUNT=256 | 558 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -607,6 +577,7 @@ CONFIG_TANBAC_TB0219=y | |||
| 607 | # Ftape, the floppy tape device driver | 577 | # Ftape, the floppy tape device driver |
| 608 | # | 578 | # |
| 609 | # CONFIG_DRM is not set | 579 | # CONFIG_DRM is not set |
| 580 | CONFIG_GPIO_VR41XX=y | ||
| 610 | # CONFIG_RAW_DRIVER is not set | 581 | # CONFIG_RAW_DRIVER is not set |
| 611 | 582 | ||
| 612 | # | 583 | # |
| @@ -642,10 +613,6 @@ CONFIG_TANBAC_TB0219=y | |||
| 642 | # | 613 | # |
| 643 | 614 | ||
| 644 | # | 615 | # |
| 645 | # Multimedia Capabilities Port drivers | ||
| 646 | # | ||
| 647 | |||
| 648 | # | ||
| 649 | # Multimedia devices | 616 | # Multimedia devices |
| 650 | # | 617 | # |
| 651 | # CONFIG_VIDEO_DEV is not set | 618 | # CONFIG_VIDEO_DEV is not set |
| @@ -654,6 +621,7 @@ CONFIG_TANBAC_TB0219=y | |||
| 654 | # Digital Video Broadcasting Devices | 621 | # Digital Video Broadcasting Devices |
| 655 | # | 622 | # |
| 656 | # CONFIG_DVB is not set | 623 | # CONFIG_DVB is not set |
| 624 | # CONFIG_USB_DABUSB is not set | ||
| 657 | 625 | ||
| 658 | # | 626 | # |
| 659 | # Graphics support | 627 | # Graphics support |
| @@ -676,6 +644,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 676 | # | 644 | # |
| 677 | CONFIG_USB_ARCH_HAS_HCD=y | 645 | CONFIG_USB_ARCH_HAS_HCD=y |
| 678 | CONFIG_USB_ARCH_HAS_OHCI=y | 646 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 647 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 679 | CONFIG_USB=m | 648 | CONFIG_USB=m |
| 680 | # CONFIG_USB_DEBUG is not set | 649 | # CONFIG_USB_DEBUG is not set |
| 681 | 650 | ||
| @@ -731,9 +700,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 731 | # CONFIG_USB_ACECAD is not set | 700 | # CONFIG_USB_ACECAD is not set |
| 732 | # CONFIG_USB_KBTAB is not set | 701 | # CONFIG_USB_KBTAB is not set |
| 733 | # CONFIG_USB_POWERMATE is not set | 702 | # CONFIG_USB_POWERMATE is not set |
| 734 | # CONFIG_USB_MTOUCH is not set | 703 | # CONFIG_USB_TOUCHSCREEN is not set |
| 735 | # CONFIG_USB_ITMTOUCH is not set | ||
| 736 | # CONFIG_USB_EGALAX is not set | ||
| 737 | # CONFIG_USB_YEALINK is not set | 704 | # CONFIG_USB_YEALINK is not set |
| 738 | # CONFIG_USB_XPAD is not set | 705 | # CONFIG_USB_XPAD is not set |
| 739 | # CONFIG_USB_ATI_REMOTE is not set | 706 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -747,15 +714,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 747 | # CONFIG_USB_MDC800 is not set | 714 | # CONFIG_USB_MDC800 is not set |
| 748 | 715 | ||
| 749 | # | 716 | # |
| 750 | # USB Multimedia devices | ||
| 751 | # | ||
| 752 | # CONFIG_USB_DABUSB is not set | ||
| 753 | |||
| 754 | # | ||
| 755 | # Video4Linux support is needed for USB Multimedia device support | ||
| 756 | # | ||
| 757 | |||
| 758 | # | ||
| 759 | # USB Network Adapters | 717 | # USB Network Adapters |
| 760 | # | 718 | # |
| 761 | # CONFIG_USB_CATC is not set | 719 | # CONFIG_USB_CATC is not set |
| @@ -807,13 +765,48 @@ CONFIG_USB_MON=y | |||
| 807 | # CONFIG_MMC is not set | 765 | # CONFIG_MMC is not set |
| 808 | 766 | ||
| 809 | # | 767 | # |
| 768 | # LED devices | ||
| 769 | # | ||
| 770 | # CONFIG_NEW_LEDS is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # LED drivers | ||
| 774 | # | ||
| 775 | |||
| 776 | # | ||
| 777 | # LED Triggers | ||
| 778 | # | ||
| 779 | |||
| 780 | # | ||
| 810 | # InfiniBand support | 781 | # InfiniBand support |
| 811 | # | 782 | # |
| 812 | # CONFIG_INFINIBAND is not set | 783 | # CONFIG_INFINIBAND is not set |
| 813 | 784 | ||
| 814 | # | 785 | # |
| 815 | # SN Devices | 786 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 787 | # | ||
| 788 | |||
| 789 | # | ||
| 790 | # Real Time Clock | ||
| 791 | # | ||
| 792 | CONFIG_RTC_LIB=y | ||
| 793 | CONFIG_RTC_CLASS=y | ||
| 794 | CONFIG_RTC_HCTOSYS=y | ||
| 795 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 796 | |||
| 797 | # | ||
| 798 | # RTC interfaces | ||
| 799 | # | ||
| 800 | CONFIG_RTC_INTF_SYSFS=y | ||
| 801 | CONFIG_RTC_INTF_PROC=y | ||
| 802 | CONFIG_RTC_INTF_DEV=y | ||
| 803 | |||
| 804 | # | ||
| 805 | # RTC drivers | ||
| 816 | # | 806 | # |
| 807 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 808 | CONFIG_RTC_DRV_VR41XX=y | ||
| 809 | # CONFIG_RTC_DRV_TEST is not set | ||
| 817 | 810 | ||
| 818 | # | 811 | # |
| 819 | # File systems | 812 | # File systems |
| @@ -821,32 +814,16 @@ CONFIG_USB_MON=y | |||
| 821 | CONFIG_EXT2_FS=y | 814 | CONFIG_EXT2_FS=y |
| 822 | # CONFIG_EXT2_FS_XATTR is not set | 815 | # CONFIG_EXT2_FS_XATTR is not set |
| 823 | # CONFIG_EXT2_FS_XIP is not set | 816 | # CONFIG_EXT2_FS_XIP is not set |
| 824 | CONFIG_EXT3_FS=m | 817 | # CONFIG_EXT3_FS is not set |
| 825 | CONFIG_EXT3_FS_XATTR=y | ||
| 826 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 827 | CONFIG_EXT3_FS_SECURITY=y | ||
| 828 | CONFIG_JBD=m | ||
| 829 | # CONFIG_JBD_DEBUG is not set | ||
| 830 | CONFIG_FS_MBCACHE=y | ||
| 831 | # CONFIG_REISERFS_FS is not set | 818 | # CONFIG_REISERFS_FS is not set |
| 832 | CONFIG_JFS_FS=m | 819 | # CONFIG_JFS_FS is not set |
| 833 | # CONFIG_JFS_POSIX_ACL is not set | ||
| 834 | # CONFIG_JFS_SECURITY is not set | ||
| 835 | # CONFIG_JFS_DEBUG is not set | ||
| 836 | # CONFIG_JFS_STATISTICS is not set | ||
| 837 | # CONFIG_FS_POSIX_ACL is not set | 820 | # CONFIG_FS_POSIX_ACL is not set |
| 838 | CONFIG_XFS_FS=y | 821 | # CONFIG_XFS_FS is not set |
| 839 | CONFIG_XFS_EXPORT=y | ||
| 840 | CONFIG_XFS_QUOTA=y | ||
| 841 | # CONFIG_XFS_SECURITY is not set | ||
| 842 | CONFIG_XFS_POSIX_ACL=y | ||
| 843 | # CONFIG_XFS_RT is not set | ||
| 844 | # CONFIG_OCFS2_FS is not set | 822 | # CONFIG_OCFS2_FS is not set |
| 845 | # CONFIG_MINIX_FS is not set | 823 | # CONFIG_MINIX_FS is not set |
| 846 | CONFIG_ROMFS_FS=m | 824 | CONFIG_ROMFS_FS=m |
| 847 | CONFIG_INOTIFY=y | 825 | CONFIG_INOTIFY=y |
| 848 | # CONFIG_QUOTA is not set | 826 | # CONFIG_QUOTA is not set |
| 849 | CONFIG_QUOTACTL=y | ||
| 850 | CONFIG_DNOTIFY=y | 827 | CONFIG_DNOTIFY=y |
| 851 | # CONFIG_AUTOFS_FS is not set | 828 | # CONFIG_AUTOFS_FS is not set |
| 852 | CONFIG_AUTOFS4_FS=y | 829 | CONFIG_AUTOFS4_FS=y |
| @@ -855,20 +832,14 @@ CONFIG_FUSE_FS=m | |||
| 855 | # | 832 | # |
| 856 | # CD-ROM/DVD Filesystems | 833 | # CD-ROM/DVD Filesystems |
| 857 | # | 834 | # |
| 858 | CONFIG_ISO9660_FS=y | 835 | # CONFIG_ISO9660_FS is not set |
| 859 | CONFIG_JOLIET=y | ||
| 860 | CONFIG_ZISOFS=y | ||
| 861 | CONFIG_ZISOFS_FS=y | ||
| 862 | # CONFIG_UDF_FS is not set | 836 | # CONFIG_UDF_FS is not set |
| 863 | 837 | ||
| 864 | # | 838 | # |
| 865 | # DOS/FAT/NT Filesystems | 839 | # DOS/FAT/NT Filesystems |
| 866 | # | 840 | # |
| 867 | CONFIG_FAT_FS=m | 841 | # CONFIG_MSDOS_FS is not set |
| 868 | CONFIG_MSDOS_FS=m | 842 | # CONFIG_VFAT_FS is not set |
| 869 | CONFIG_VFAT_FS=m | ||
| 870 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 871 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 872 | # CONFIG_NTFS_FS is not set | 843 | # CONFIG_NTFS_FS is not set |
| 873 | 844 | ||
| 874 | # | 845 | # |
| @@ -880,7 +851,6 @@ CONFIG_SYSFS=y | |||
| 880 | CONFIG_TMPFS=y | 851 | CONFIG_TMPFS=y |
| 881 | # CONFIG_HUGETLB_PAGE is not set | 852 | # CONFIG_HUGETLB_PAGE is not set |
| 882 | CONFIG_RAMFS=y | 853 | CONFIG_RAMFS=y |
| 883 | CONFIG_RELAYFS_FS=m | ||
| 884 | # CONFIG_CONFIGFS_FS is not set | 854 | # CONFIG_CONFIGFS_FS is not set |
| 885 | 855 | ||
| 886 | # | 856 | # |
| @@ -921,9 +891,7 @@ CONFIG_NFS_COMMON=y | |||
| 921 | CONFIG_SUNRPC=y | 891 | CONFIG_SUNRPC=y |
| 922 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 892 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 923 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 893 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 924 | CONFIG_SMB_FS=m | 894 | # CONFIG_SMB_FS is not set |
| 925 | CONFIG_SMB_NLS_DEFAULT=y | ||
| 926 | CONFIG_SMB_NLS_REMOTE="cp932" | ||
| 927 | # CONFIG_CIFS is not set | 895 | # CONFIG_CIFS is not set |
| 928 | # CONFIG_NCP_FS is not set | 896 | # CONFIG_NCP_FS is not set |
| 929 | # CONFIG_CODA_FS is not set | 897 | # CONFIG_CODA_FS is not set |
| @@ -939,46 +907,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 939 | # | 907 | # |
| 940 | # Native Language Support | 908 | # Native Language Support |
| 941 | # | 909 | # |
| 942 | CONFIG_NLS=y | 910 | # CONFIG_NLS is not set |
| 943 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 944 | CONFIG_NLS_CODEPAGE_437=m | ||
| 945 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 946 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 947 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 948 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 949 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 950 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 951 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 952 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 953 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 954 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 955 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 956 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 957 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 958 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 959 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 960 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 961 | CONFIG_NLS_CODEPAGE_932=m | ||
| 962 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 963 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 964 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 965 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 966 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 967 | # CONFIG_NLS_ASCII is not set | ||
| 968 | CONFIG_NLS_ISO8859_1=m | ||
| 969 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 970 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 971 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 972 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 973 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 974 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 975 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 976 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 977 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 978 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 979 | # CONFIG_NLS_KOI8_R is not set | ||
| 980 | # CONFIG_NLS_KOI8_U is not set | ||
| 981 | # CONFIG_NLS_UTF8 is not set | ||
| 982 | 911 | ||
| 983 | # | 912 | # |
| 984 | # Profiling support | 913 | # Profiling support |
| @@ -992,44 +921,20 @@ CONFIG_NLS_ISO8859_1=m | |||
| 992 | # CONFIG_MAGIC_SYSRQ is not set | 921 | # CONFIG_MAGIC_SYSRQ is not set |
| 993 | # CONFIG_DEBUG_KERNEL is not set | 922 | # CONFIG_DEBUG_KERNEL is not set |
| 994 | CONFIG_LOG_BUF_SHIFT=14 | 923 | CONFIG_LOG_BUF_SHIFT=14 |
| 924 | # CONFIG_DEBUG_FS is not set | ||
| 995 | CONFIG_CROSSCOMPILE=y | 925 | CONFIG_CROSSCOMPILE=y |
| 996 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 926 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 997 | 927 | ||
| 998 | # | 928 | # |
| 999 | # Security options | 929 | # Security options |
| 1000 | # | 930 | # |
| 1001 | CONFIG_KEYS=y | 931 | # CONFIG_KEYS is not set |
| 1002 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 1003 | # CONFIG_SECURITY is not set | 932 | # CONFIG_SECURITY is not set |
| 1004 | 933 | ||
| 1005 | # | 934 | # |
| 1006 | # Cryptographic options | 935 | # Cryptographic options |
| 1007 | # | 936 | # |
| 1008 | CONFIG_CRYPTO=y | 937 | # CONFIG_CRYPTO is not set |
| 1009 | CONFIG_CRYPTO_HMAC=y | ||
| 1010 | CONFIG_CRYPTO_NULL=m | ||
| 1011 | CONFIG_CRYPTO_MD4=m | ||
| 1012 | CONFIG_CRYPTO_MD5=m | ||
| 1013 | CONFIG_CRYPTO_SHA1=m | ||
| 1014 | CONFIG_CRYPTO_SHA256=m | ||
| 1015 | CONFIG_CRYPTO_SHA512=m | ||
| 1016 | CONFIG_CRYPTO_WP512=m | ||
| 1017 | CONFIG_CRYPTO_TGR192=m | ||
| 1018 | CONFIG_CRYPTO_DES=m | ||
| 1019 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1020 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1021 | CONFIG_CRYPTO_SERPENT=m | ||
| 1022 | CONFIG_CRYPTO_AES=m | ||
| 1023 | CONFIG_CRYPTO_CAST5=m | ||
| 1024 | CONFIG_CRYPTO_CAST6=m | ||
| 1025 | CONFIG_CRYPTO_TEA=m | ||
| 1026 | CONFIG_CRYPTO_ARC4=m | ||
| 1027 | CONFIG_CRYPTO_KHAZAD=m | ||
| 1028 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1029 | CONFIG_CRYPTO_DEFLATE=m | ||
| 1030 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1031 | CONFIG_CRYPTO_CRC32C=m | ||
| 1032 | # CONFIG_CRYPTO_TEST is not set | ||
| 1033 | 938 | ||
| 1034 | # | 939 | # |
| 1035 | # Hardware crypto devices | 940 | # Hardware crypto devices |
| @@ -1038,9 +943,8 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1038 | # | 943 | # |
| 1039 | # Library routines | 944 | # Library routines |
| 1040 | # | 945 | # |
| 1041 | CONFIG_CRC_CCITT=m | 946 | # CONFIG_CRC_CCITT is not set |
| 1042 | CONFIG_CRC16=m | 947 | # CONFIG_CRC16 is not set |
| 1043 | CONFIG_CRC32=y | 948 | CONFIG_CRC32=y |
| 1044 | CONFIG_LIBCRC32C=m | 949 | # CONFIG_LIBCRC32C is not set |
| 1045 | CONFIG_ZLIB_INFLATE=y | 950 | CONFIG_ZLIB_INFLATE=m |
| 1046 | CONFIG_ZLIB_DEFLATE=m | ||
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 8a1e3ace0b2c..9f215ea350dc 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Wed Mar 22 11:07:34 2006 | 4 | # Tue Apr 25 00:09:17 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -74,7 +74,10 @@ CONFIG_TANBAC_TB0287=y | |||
| 74 | CONFIG_PCI_VR41XX=y | 74 | CONFIG_PCI_VR41XX=y |
| 75 | # CONFIG_VRC4173 is not set | 75 | # CONFIG_VRC4173 is not set |
| 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 77 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 78 | CONFIG_GENERIC_HWEIGHT=y | ||
| 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 79 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 80 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 78 | CONFIG_DMA_NONCOHERENT=y | 81 | CONFIG_DMA_NONCOHERENT=y |
| 79 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 82 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 80 | # CONFIG_CPU_BIG_ENDIAN is not set | 83 | # CONFIG_CPU_BIG_ENDIAN is not set |
| @@ -107,7 +110,6 @@ CONFIG_CPU_VR41XX=y | |||
| 107 | # CONFIG_CPU_SB1 is not set | 110 | # CONFIG_CPU_SB1 is not set |
| 108 | CONFIG_SYS_HAS_CPU_VR41XX=y | 111 | CONFIG_SYS_HAS_CPU_VR41XX=y |
| 109 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 112 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
| 110 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
| 111 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 113 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
| 112 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 114 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
| 113 | 115 | ||
| @@ -121,7 +123,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 121 | # CONFIG_PAGE_SIZE_16KB is not set | 123 | # CONFIG_PAGE_SIZE_16KB is not set |
| 122 | # CONFIG_PAGE_SIZE_64KB is not set | 124 | # CONFIG_PAGE_SIZE_64KB is not set |
| 123 | # CONFIG_MIPS_MT is not set | 125 | # CONFIG_MIPS_MT is not set |
| 124 | # CONFIG_CPU_ADVANCED is not set | ||
| 125 | CONFIG_CPU_HAS_SYNC=y | 126 | CONFIG_CPU_HAS_SYNC=y |
| 126 | CONFIG_GENERIC_HARDIRQS=y | 127 | CONFIG_GENERIC_HARDIRQS=y |
| 127 | CONFIG_GENERIC_IRQ_PROBE=y | 128 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -157,6 +158,7 @@ CONFIG_SYSVIPC=y | |||
| 157 | CONFIG_SYSCTL=y | 158 | CONFIG_SYSCTL=y |
| 158 | # CONFIG_AUDIT is not set | 159 | # CONFIG_AUDIT is not set |
| 159 | # CONFIG_IKCONFIG is not set | 160 | # CONFIG_IKCONFIG is not set |
| 161 | # CONFIG_RELAY is not set | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | 162 | CONFIG_INITRAMFS_SOURCE="" |
| 161 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 163 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 162 | CONFIG_EMBEDDED=y | 164 | CONFIG_EMBEDDED=y |
| @@ -170,10 +172,6 @@ CONFIG_BASE_FULL=y | |||
| 170 | CONFIG_FUTEX=y | 172 | CONFIG_FUTEX=y |
| 171 | CONFIG_EPOLL=y | 173 | CONFIG_EPOLL=y |
| 172 | CONFIG_SHMEM=y | 174 | CONFIG_SHMEM=y |
| 173 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 174 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 175 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 176 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 177 | CONFIG_SLAB=y | 175 | CONFIG_SLAB=y |
| 178 | # CONFIG_TINY_SHMEM is not set | 176 | # CONFIG_TINY_SHMEM is not set |
| 179 | CONFIG_BASE_SMALL=0 | 177 | CONFIG_BASE_SMALL=0 |
| @@ -185,7 +183,6 @@ CONFIG_BASE_SMALL=0 | |||
| 185 | CONFIG_MODULES=y | 183 | CONFIG_MODULES=y |
| 186 | CONFIG_MODULE_UNLOAD=y | 184 | CONFIG_MODULE_UNLOAD=y |
| 187 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 188 | CONFIG_OBSOLETE_MODPARM=y | ||
| 189 | CONFIG_MODVERSIONS=y | 186 | CONFIG_MODVERSIONS=y |
| 190 | CONFIG_MODULE_SRCVERSION_ALL=y | 187 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 191 | CONFIG_KMOD=y | 188 | CONFIG_KMOD=y |
| @@ -194,6 +191,8 @@ CONFIG_KMOD=y | |||
| 194 | # Block layer | 191 | # Block layer |
| 195 | # | 192 | # |
| 196 | # CONFIG_LBD is not set | 193 | # CONFIG_LBD is not set |
| 194 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 195 | # CONFIG_LSF is not set | ||
| 197 | 196 | ||
| 198 | # | 197 | # |
| 199 | # IO Schedulers | 198 | # IO Schedulers |
| @@ -213,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 213 | # | 212 | # |
| 214 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| 215 | CONFIG_PCI=y | 214 | CONFIG_PCI=y |
| 216 | # CONFIG_PCI_LEGACY_PROC is not set | ||
| 217 | CONFIG_MMU=y | 215 | CONFIG_MMU=y |
| 218 | 216 | ||
| 219 | # | 217 | # |
| @@ -245,8 +243,6 @@ CONFIG_NET=y | |||
| 245 | CONFIG_PACKET=y | 243 | CONFIG_PACKET=y |
| 246 | # CONFIG_PACKET_MMAP is not set | 244 | # CONFIG_PACKET_MMAP is not set |
| 247 | CONFIG_UNIX=y | 245 | CONFIG_UNIX=y |
| 248 | CONFIG_XFRM=y | ||
| 249 | CONFIG_XFRM_USER=m | ||
| 250 | # CONFIG_NET_KEY is not set | 246 | # CONFIG_NET_KEY is not set |
| 251 | CONFIG_INET=y | 247 | CONFIG_INET=y |
| 252 | CONFIG_IP_MULTICAST=y | 248 | CONFIG_IP_MULTICAST=y |
| @@ -271,6 +267,7 @@ CONFIG_SYN_COOKIES=y | |||
| 271 | # CONFIG_INET_AH is not set | 267 | # CONFIG_INET_AH is not set |
| 272 | # CONFIG_INET_ESP is not set | 268 | # CONFIG_INET_ESP is not set |
| 273 | # CONFIG_INET_IPCOMP is not set | 269 | # CONFIG_INET_IPCOMP is not set |
| 270 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 274 | CONFIG_INET_TUNNEL=m | 271 | CONFIG_INET_TUNNEL=m |
| 275 | CONFIG_INET_DIAG=y | 272 | CONFIG_INET_DIAG=y |
| 276 | CONFIG_INET_TCP_DIAG=y | 273 | CONFIG_INET_TCP_DIAG=y |
| @@ -288,6 +285,8 @@ CONFIG_TCP_CONG_HTCP=m | |||
| 288 | # CONFIG_TCP_CONG_VEGAS is not set | 285 | # CONFIG_TCP_CONG_VEGAS is not set |
| 289 | # CONFIG_TCP_CONG_SCALABLE is not set | 286 | # CONFIG_TCP_CONG_SCALABLE is not set |
| 290 | # CONFIG_IPV6 is not set | 287 | # CONFIG_IPV6 is not set |
| 288 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 289 | # CONFIG_INET6_TUNNEL is not set | ||
| 291 | # CONFIG_NETFILTER is not set | 290 | # CONFIG_NETFILTER is not set |
| 292 | 291 | ||
| 293 | # | 292 | # |
| @@ -493,7 +492,6 @@ CONFIG_BLK_DEV_SD=y | |||
| 493 | # CONFIG_SCSI_INIA100 is not set | 492 | # CONFIG_SCSI_INIA100 is not set |
| 494 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 493 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 495 | # CONFIG_SCSI_IPR is not set | 494 | # CONFIG_SCSI_IPR is not set |
| 496 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
| 497 | # CONFIG_SCSI_QLOGIC_1280 is not set | 495 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 498 | # CONFIG_SCSI_QLA_FC is not set | 496 | # CONFIG_SCSI_QLA_FC is not set |
| 499 | # CONFIG_SCSI_LPFC is not set | 497 | # CONFIG_SCSI_LPFC is not set |
| @@ -714,7 +712,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 714 | # CONFIG_WATCHDOG is not set | 712 | # CONFIG_WATCHDOG is not set |
| 715 | # CONFIG_RTC is not set | 713 | # CONFIG_RTC is not set |
| 716 | # CONFIG_GEN_RTC is not set | 714 | # CONFIG_GEN_RTC is not set |
| 717 | # CONFIG_RTC_VR41XX is not set | ||
| 718 | # CONFIG_DTLK is not set | 715 | # CONFIG_DTLK is not set |
| 719 | # CONFIG_R3964 is not set | 716 | # CONFIG_R3964 is not set |
| 720 | # CONFIG_APPLICOM is not set | 717 | # CONFIG_APPLICOM is not set |
| @@ -760,10 +757,6 @@ CONFIG_GPIO_VR41XX=y | |||
| 760 | # | 757 | # |
| 761 | 758 | ||
| 762 | # | 759 | # |
| 763 | # Multimedia Capabilities Port drivers | ||
| 764 | # | ||
| 765 | |||
| 766 | # | ||
| 767 | # Multimedia devices | 760 | # Multimedia devices |
| 768 | # | 761 | # |
| 769 | # CONFIG_VIDEO_DEV is not set | 762 | # CONFIG_VIDEO_DEV is not set |
| @@ -772,17 +765,53 @@ CONFIG_GPIO_VR41XX=y | |||
| 772 | # Digital Video Broadcasting Devices | 765 | # Digital Video Broadcasting Devices |
| 773 | # | 766 | # |
| 774 | # CONFIG_DVB is not set | 767 | # CONFIG_DVB is not set |
| 768 | # CONFIG_USB_DABUSB is not set | ||
| 775 | 769 | ||
| 776 | # | 770 | # |
| 777 | # Graphics support | 771 | # Graphics support |
| 778 | # | 772 | # |
| 779 | # CONFIG_FB is not set | 773 | CONFIG_FB=y |
| 774 | CONFIG_FB_CFB_FILLRECT=y | ||
| 775 | CONFIG_FB_CFB_COPYAREA=y | ||
| 776 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 777 | # CONFIG_FB_MACMODES is not set | ||
| 778 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 779 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 780 | # CONFIG_FB_TILEBLITTING is not set | ||
| 781 | # CONFIG_FB_CIRRUS is not set | ||
| 782 | # CONFIG_FB_PM2 is not set | ||
| 783 | # CONFIG_FB_CYBER2000 is not set | ||
| 784 | # CONFIG_FB_ASILIANT is not set | ||
| 785 | # CONFIG_FB_IMSTT is not set | ||
| 786 | # CONFIG_FB_S1D13XXX is not set | ||
| 787 | # CONFIG_FB_NVIDIA is not set | ||
| 788 | # CONFIG_FB_RIVA is not set | ||
| 789 | # CONFIG_FB_MATROX is not set | ||
| 790 | # CONFIG_FB_RADEON is not set | ||
| 791 | # CONFIG_FB_ATY128 is not set | ||
| 792 | # CONFIG_FB_ATY is not set | ||
| 793 | # CONFIG_FB_SAVAGE is not set | ||
| 794 | # CONFIG_FB_SIS is not set | ||
| 795 | # CONFIG_FB_NEOMAGIC is not set | ||
| 796 | # CONFIG_FB_KYRO is not set | ||
| 797 | # CONFIG_FB_3DFX is not set | ||
| 798 | # CONFIG_FB_VOODOO1 is not set | ||
| 799 | CONFIG_FB_SMIVGX=y | ||
| 800 | # CONFIG_FB_TRIDENT is not set | ||
| 801 | # CONFIG_FB_VIRTUAL is not set | ||
| 780 | 802 | ||
| 781 | # | 803 | # |
| 782 | # Console display driver support | 804 | # Console display driver support |
| 783 | # | 805 | # |
| 784 | # CONFIG_VGA_CONSOLE is not set | 806 | # CONFIG_VGA_CONSOLE is not set |
| 785 | CONFIG_DUMMY_CONSOLE=y | 807 | CONFIG_DUMMY_CONSOLE=y |
| 808 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 809 | |||
| 810 | # | ||
| 811 | # Logo configuration | ||
| 812 | # | ||
| 813 | # CONFIG_LOGO is not set | ||
| 814 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 786 | 815 | ||
| 787 | # | 816 | # |
| 788 | # Sound | 817 | # Sound |
| @@ -794,6 +823,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 794 | # | 823 | # |
| 795 | CONFIG_USB_ARCH_HAS_HCD=y | 824 | CONFIG_USB_ARCH_HAS_HCD=y |
| 796 | CONFIG_USB_ARCH_HAS_OHCI=y | 825 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 826 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 797 | CONFIG_USB=m | 827 | CONFIG_USB=m |
| 798 | # CONFIG_USB_DEBUG is not set | 828 | # CONFIG_USB_DEBUG is not set |
| 799 | 829 | ||
| @@ -863,9 +893,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 863 | # CONFIG_USB_ACECAD is not set | 893 | # CONFIG_USB_ACECAD is not set |
| 864 | # CONFIG_USB_KBTAB is not set | 894 | # CONFIG_USB_KBTAB is not set |
| 865 | # CONFIG_USB_POWERMATE is not set | 895 | # CONFIG_USB_POWERMATE is not set |
| 866 | # CONFIG_USB_MTOUCH is not set | 896 | # CONFIG_USB_TOUCHSCREEN is not set |
| 867 | # CONFIG_USB_ITMTOUCH is not set | ||
| 868 | # CONFIG_USB_EGALAX is not set | ||
| 869 | # CONFIG_USB_YEALINK is not set | 897 | # CONFIG_USB_YEALINK is not set |
| 870 | # CONFIG_USB_XPAD is not set | 898 | # CONFIG_USB_XPAD is not set |
| 871 | # CONFIG_USB_ATI_REMOTE is not set | 899 | # CONFIG_USB_ATI_REMOTE is not set |
| @@ -880,15 +908,6 @@ CONFIG_USB_HIDINPUT=y | |||
| 880 | # CONFIG_USB_MICROTEK is not set | 908 | # CONFIG_USB_MICROTEK is not set |
| 881 | 909 | ||
| 882 | # | 910 | # |
| 883 | # USB Multimedia devices | ||
| 884 | # | ||
| 885 | # CONFIG_USB_DABUSB is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # Video4Linux support is needed for USB Multimedia device support | ||
| 889 | # | ||
| 890 | |||
| 891 | # | ||
| 892 | # USB Network Adapters | 911 | # USB Network Adapters |
| 893 | # | 912 | # |
| 894 | # CONFIG_USB_CATC is not set | 913 | # CONFIG_USB_CATC is not set |
| @@ -939,6 +958,19 @@ CONFIG_USB_MON=y | |||
| 939 | # CONFIG_MMC is not set | 958 | # CONFIG_MMC is not set |
| 940 | 959 | ||
| 941 | # | 960 | # |
| 961 | # LED devices | ||
| 962 | # | ||
| 963 | # CONFIG_NEW_LEDS is not set | ||
| 964 | |||
| 965 | # | ||
| 966 | # LED drivers | ||
| 967 | # | ||
| 968 | |||
| 969 | # | ||
| 970 | # LED Triggers | ||
| 971 | # | ||
| 972 | |||
| 973 | # | ||
| 942 | # InfiniBand support | 974 | # InfiniBand support |
| 943 | # | 975 | # |
| 944 | # CONFIG_INFINIBAND is not set | 976 | # CONFIG_INFINIBAND is not set |
| @@ -948,6 +980,11 @@ CONFIG_USB_MON=y | |||
| 948 | # | 980 | # |
| 949 | 981 | ||
| 950 | # | 982 | # |
| 983 | # Real Time Clock | ||
| 984 | # | ||
| 985 | # CONFIG_RTC_CLASS is not set | ||
| 986 | |||
| 987 | # | ||
| 951 | # File systems | 988 | # File systems |
| 952 | # | 989 | # |
| 953 | CONFIG_EXT2_FS=y | 990 | CONFIG_EXT2_FS=y |
| @@ -1001,7 +1038,6 @@ CONFIG_SYSFS=y | |||
| 1001 | CONFIG_TMPFS=y | 1038 | CONFIG_TMPFS=y |
| 1002 | # CONFIG_HUGETLB_PAGE is not set | 1039 | # CONFIG_HUGETLB_PAGE is not set |
| 1003 | CONFIG_RAMFS=y | 1040 | CONFIG_RAMFS=y |
| 1004 | # CONFIG_RELAYFS_FS is not set | ||
| 1005 | # CONFIG_CONFIGFS_FS is not set | 1041 | # CONFIG_CONFIGFS_FS is not set |
| 1006 | 1042 | ||
| 1007 | # | 1043 | # |
| @@ -1067,14 +1103,14 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1067 | # CONFIG_MAGIC_SYSRQ is not set | 1103 | # CONFIG_MAGIC_SYSRQ is not set |
| 1068 | # CONFIG_DEBUG_KERNEL is not set | 1104 | # CONFIG_DEBUG_KERNEL is not set |
| 1069 | CONFIG_LOG_BUF_SHIFT=14 | 1105 | CONFIG_LOG_BUF_SHIFT=14 |
| 1106 | # CONFIG_DEBUG_FS is not set | ||
| 1070 | CONFIG_CROSSCOMPILE=y | 1107 | CONFIG_CROSSCOMPILE=y |
| 1071 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1108 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 1072 | 1109 | ||
| 1073 | # | 1110 | # |
| 1074 | # Security options | 1111 | # Security options |
| 1075 | # | 1112 | # |
| 1076 | CONFIG_KEYS=y | 1113 | # CONFIG_KEYS is not set |
| 1077 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 1078 | # CONFIG_SECURITY is not set | 1114 | # CONFIG_SECURITY is not set |
| 1079 | 1115 | ||
| 1080 | # | 1116 | # |
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index 7132e296d40a..ac7765eb8da7 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:36 2006 | 4 | # Tue Apr 25 00:09:33 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -70,6 +70,8 @@ CONFIG_IBM_WORKPAD=y | |||
| 70 | # CONFIG_VICTOR_MPC30X is not set | 70 | # CONFIG_VICTOR_MPC30X is not set |
| 71 | # CONFIG_ZAO_CAPCELLA is not set | 71 | # CONFIG_ZAO_CAPCELLA is not set |
| 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 73 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 74 | CONFIG_GENERIC_HWEIGHT=y | ||
| 73 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 75 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 74 | CONFIG_DMA_NONCOHERENT=y | 76 | CONFIG_DMA_NONCOHERENT=y |
| 75 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 77 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -88,7 +90,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 88 | # CONFIG_CPU_MIPS64_R2 is not set | 90 | # CONFIG_CPU_MIPS64_R2 is not set |
| 89 | # CONFIG_CPU_R3000 is not set | 91 | # CONFIG_CPU_R3000 is not set |
| 90 | # CONFIG_CPU_TX39XX is not set | 92 | # CONFIG_CPU_TX39XX is not set |
| 91 | # CONFIG_CPU_VR41XX is not set | 93 | CONFIG_CPU_VR41XX=y |
| 92 | # CONFIG_CPU_R4300 is not set | 94 | # CONFIG_CPU_R4300 is not set |
| 93 | # CONFIG_CPU_R4X00 is not set | 95 | # CONFIG_CPU_R4X00 is not set |
| 94 | # CONFIG_CPU_TX49XX is not set | 96 | # CONFIG_CPU_TX49XX is not set |
| @@ -101,18 +103,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 101 | # CONFIG_CPU_RM7000 is not set | 103 | # CONFIG_CPU_RM7000 is not set |
| 102 | # CONFIG_CPU_RM9000 is not set | 104 | # CONFIG_CPU_RM9000 is not set |
| 103 | # CONFIG_CPU_SB1 is not set | 105 | # CONFIG_CPU_SB1 is not set |
| 106 | CONFIG_SYS_HAS_CPU_VR41XX=y | ||
| 107 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
| 108 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
| 109 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 104 | 110 | ||
| 105 | # | 111 | # |
| 106 | # Kernel type | 112 | # Kernel type |
| 107 | # | 113 | # |
| 108 | # CONFIG_32BIT is not set | 114 | CONFIG_32BIT=y |
| 109 | # CONFIG_64BIT is not set | 115 | # CONFIG_64BIT is not set |
| 110 | CONFIG_PAGE_SIZE_4KB=y | 116 | CONFIG_PAGE_SIZE_4KB=y |
| 111 | # CONFIG_PAGE_SIZE_8KB is not set | 117 | # CONFIG_PAGE_SIZE_8KB is not set |
| 112 | # CONFIG_PAGE_SIZE_16KB is not set | 118 | # CONFIG_PAGE_SIZE_16KB is not set |
| 113 | # CONFIG_PAGE_SIZE_64KB is not set | 119 | # CONFIG_PAGE_SIZE_64KB is not set |
| 114 | # CONFIG_MIPS_MT is not set | 120 | # CONFIG_MIPS_MT is not set |
| 115 | CONFIG_CPU_HAS_LLSC=y | ||
| 116 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
| 117 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
| 118 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -133,7 +138,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 133 | # Code maturity level options | 138 | # Code maturity level options |
| 134 | # | 139 | # |
| 135 | CONFIG_EXPERIMENTAL=y | 140 | CONFIG_EXPERIMENTAL=y |
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | 141 | CONFIG_BROKEN_ON_SMP=y |
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 139 | 143 | ||
| @@ -149,6 +153,7 @@ CONFIG_SYSVIPC=y | |||
| 149 | CONFIG_SYSCTL=y | 153 | CONFIG_SYSCTL=y |
| 150 | # CONFIG_AUDIT is not set | 154 | # CONFIG_AUDIT is not set |
| 151 | # CONFIG_IKCONFIG is not set | 155 | # CONFIG_IKCONFIG is not set |
| 156 | # CONFIG_RELAY is not set | ||
| 152 | CONFIG_INITRAMFS_SOURCE="" | 157 | CONFIG_INITRAMFS_SOURCE="" |
| 153 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 158 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 154 | CONFIG_EMBEDDED=y | 159 | CONFIG_EMBEDDED=y |
| @@ -162,10 +167,6 @@ CONFIG_BASE_FULL=y | |||
| 162 | CONFIG_FUTEX=y | 167 | CONFIG_FUTEX=y |
| 163 | CONFIG_EPOLL=y | 168 | CONFIG_EPOLL=y |
| 164 | CONFIG_SHMEM=y | 169 | CONFIG_SHMEM=y |
| 165 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 166 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 167 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 168 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 169 | CONFIG_SLAB=y | 170 | CONFIG_SLAB=y |
| 170 | # CONFIG_TINY_SHMEM is not set | 171 | # CONFIG_TINY_SHMEM is not set |
| 171 | CONFIG_BASE_SMALL=0 | 172 | CONFIG_BASE_SMALL=0 |
| @@ -177,7 +178,6 @@ CONFIG_BASE_SMALL=0 | |||
| 177 | CONFIG_MODULES=y | 178 | CONFIG_MODULES=y |
| 178 | CONFIG_MODULE_UNLOAD=y | 179 | CONFIG_MODULE_UNLOAD=y |
| 179 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 180 | CONFIG_OBSOLETE_MODPARM=y | ||
| 181 | CONFIG_MODVERSIONS=y | 181 | CONFIG_MODVERSIONS=y |
| 182 | CONFIG_MODULE_SRCVERSION_ALL=y | 182 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 183 | CONFIG_KMOD=y | 183 | CONFIG_KMOD=y |
| @@ -185,6 +185,9 @@ CONFIG_KMOD=y | |||
| 185 | # | 185 | # |
| 186 | # Block layer | 186 | # Block layer |
| 187 | # | 187 | # |
| 188 | # CONFIG_LBD is not set | ||
| 189 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 190 | # CONFIG_LSF is not set | ||
| 188 | 191 | ||
| 189 | # | 192 | # |
| 190 | # IO Schedulers | 193 | # IO Schedulers |
| @@ -220,6 +223,7 @@ CONFIG_PCMCIA_IOCTL=y | |||
| 220 | # CONFIG_I82365 is not set | 223 | # CONFIG_I82365 is not set |
| 221 | # CONFIG_TCIC is not set | 224 | # CONFIG_TCIC is not set |
| 222 | CONFIG_PCMCIA_PROBE=y | 225 | CONFIG_PCMCIA_PROBE=y |
| 226 | CONFIG_PCMCIA_VRC4171=y | ||
| 223 | 227 | ||
| 224 | # | 228 | # |
| 225 | # PCI Hotplug Support | 229 | # PCI Hotplug Support |
| @@ -230,6 +234,7 @@ CONFIG_PCMCIA_PROBE=y | |||
| 230 | # | 234 | # |
| 231 | CONFIG_BINFMT_ELF=y | 235 | CONFIG_BINFMT_ELF=y |
| 232 | # CONFIG_BINFMT_MISC is not set | 236 | # CONFIG_BINFMT_MISC is not set |
| 237 | CONFIG_TRAD_SIGNALS=y | ||
| 233 | 238 | ||
| 234 | # | 239 | # |
| 235 | # Networking | 240 | # Networking |
| @@ -239,6 +244,7 @@ CONFIG_NET=y | |||
| 239 | # | 244 | # |
| 240 | # Networking options | 245 | # Networking options |
| 241 | # | 246 | # |
| 247 | # CONFIG_NETDEBUG is not set | ||
| 242 | CONFIG_PACKET=y | 248 | CONFIG_PACKET=y |
| 243 | CONFIG_PACKET_MMAP=y | 249 | CONFIG_PACKET_MMAP=y |
| 244 | CONFIG_UNIX=y | 250 | CONFIG_UNIX=y |
| @@ -258,12 +264,15 @@ CONFIG_IP_FIB_HASH=y | |||
| 258 | # CONFIG_INET_AH is not set | 264 | # CONFIG_INET_AH is not set |
| 259 | # CONFIG_INET_ESP is not set | 265 | # CONFIG_INET_ESP is not set |
| 260 | # CONFIG_INET_IPCOMP is not set | 266 | # CONFIG_INET_IPCOMP is not set |
| 261 | CONFIG_INET_TUNNEL=m | 267 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 268 | # CONFIG_INET_TUNNEL is not set | ||
| 262 | CONFIG_INET_DIAG=y | 269 | CONFIG_INET_DIAG=y |
| 263 | CONFIG_INET_TCP_DIAG=y | 270 | CONFIG_INET_TCP_DIAG=y |
| 264 | # CONFIG_TCP_CONG_ADVANCED is not set | 271 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 265 | CONFIG_TCP_CONG_BIC=y | 272 | CONFIG_TCP_CONG_BIC=y |
| 266 | # CONFIG_IPV6 is not set | 273 | # CONFIG_IPV6 is not set |
| 274 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 275 | # CONFIG_INET6_TUNNEL is not set | ||
| 267 | # CONFIG_NETFILTER is not set | 276 | # CONFIG_NETFILTER is not set |
| 268 | 277 | ||
| 269 | # | 278 | # |
| @@ -275,6 +284,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 275 | # SCTP Configuration (EXPERIMENTAL) | 284 | # SCTP Configuration (EXPERIMENTAL) |
| 276 | # | 285 | # |
| 277 | # CONFIG_IP_SCTP is not set | 286 | # CONFIG_IP_SCTP is not set |
| 287 | |||
| 288 | # | ||
| 289 | # TIPC Configuration (EXPERIMENTAL) | ||
| 290 | # | ||
| 291 | # CONFIG_TIPC is not set | ||
| 278 | # CONFIG_ATM is not set | 292 | # CONFIG_ATM is not set |
| 279 | # CONFIG_BRIDGE is not set | 293 | # CONFIG_BRIDGE is not set |
| 280 | # CONFIG_VLAN_8021Q is not set | 294 | # CONFIG_VLAN_8021Q is not set |
| @@ -284,11 +298,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 284 | # CONFIG_ATALK is not set | 298 | # CONFIG_ATALK is not set |
| 285 | # CONFIG_X25 is not set | 299 | # CONFIG_X25 is not set |
| 286 | # CONFIG_LAPB is not set | 300 | # CONFIG_LAPB is not set |
| 287 | |||
| 288 | # | ||
| 289 | # TIPC Configuration (EXPERIMENTAL) | ||
| 290 | # | ||
| 291 | # CONFIG_TIPC is not set | ||
| 292 | # CONFIG_NET_DIVERT is not set | 301 | # CONFIG_NET_DIVERT is not set |
| 293 | # CONFIG_ECONET is not set | 302 | # CONFIG_ECONET is not set |
| 294 | # CONFIG_WAN_ROUTER is not set | 303 | # CONFIG_WAN_ROUTER is not set |
| @@ -305,10 +314,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 305 | # CONFIG_HAMRADIO is not set | 314 | # CONFIG_HAMRADIO is not set |
| 306 | # CONFIG_IRDA is not set | 315 | # CONFIG_IRDA is not set |
| 307 | # CONFIG_BT is not set | 316 | # CONFIG_BT is not set |
| 308 | CONFIG_IEEE80211=m | 317 | # CONFIG_IEEE80211 is not set |
| 309 | # CONFIG_IEEE80211_DEBUG is not set | 318 | CONFIG_WIRELESS_EXT=y |
| 310 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
| 311 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
| 312 | 319 | ||
| 313 | # | 320 | # |
| 314 | # Device Drivers | 321 | # Device Drivers |
| @@ -347,10 +354,12 @@ CONFIG_CONNECTOR=m | |||
| 347 | # CONFIG_BLK_DEV_COW_COMMON is not set | 354 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 348 | # CONFIG_BLK_DEV_LOOP is not set | 355 | # CONFIG_BLK_DEV_LOOP is not set |
| 349 | # CONFIG_BLK_DEV_NBD is not set | 356 | # CONFIG_BLK_DEV_NBD is not set |
| 350 | # CONFIG_BLK_DEV_RAM is not set | 357 | CONFIG_BLK_DEV_RAM=m |
| 351 | CONFIG_BLK_DEV_RAM_COUNT=16 | 358 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 359 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 360 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 352 | # CONFIG_CDROM_PKTCDVD is not set | 361 | # CONFIG_CDROM_PKTCDVD is not set |
| 353 | CONFIG_ATA_OVER_ETH=m | 362 | # CONFIG_ATA_OVER_ETH is not set |
| 354 | 363 | ||
| 355 | # | 364 | # |
| 356 | # ATA/ATAPI/MFM/RLL support | 365 | # ATA/ATAPI/MFM/RLL support |
| @@ -468,7 +477,38 @@ CONFIG_MII=m | |||
| 468 | # | 477 | # |
| 469 | # Wireless LAN (non-hamradio) | 478 | # Wireless LAN (non-hamradio) |
| 470 | # | 479 | # |
| 471 | # CONFIG_NET_RADIO is not set | 480 | CONFIG_NET_RADIO=y |
| 481 | # CONFIG_NET_WIRELESS_RTNETLINK is not set | ||
| 482 | |||
| 483 | # | ||
| 484 | # Obsolete Wireless cards support (pre-802.11) | ||
| 485 | # | ||
| 486 | # CONFIG_STRIP is not set | ||
| 487 | # CONFIG_ARLAN is not set | ||
| 488 | # CONFIG_WAVELAN is not set | ||
| 489 | # CONFIG_PCMCIA_WAVELAN is not set | ||
| 490 | # CONFIG_PCMCIA_NETWAVE is not set | ||
| 491 | |||
| 492 | # | ||
| 493 | # Wireless 802.11 Frequency Hopping cards support | ||
| 494 | # | ||
| 495 | # CONFIG_PCMCIA_RAYCS is not set | ||
| 496 | |||
| 497 | # | ||
| 498 | # Wireless 802.11b ISA/PCI cards support | ||
| 499 | # | ||
| 500 | CONFIG_HERMES=m | ||
| 501 | # CONFIG_ATMEL is not set | ||
| 502 | |||
| 503 | # | ||
| 504 | # Wireless 802.11b Pcmcia/Cardbus cards support | ||
| 505 | # | ||
| 506 | CONFIG_PCMCIA_HERMES=m | ||
| 507 | # CONFIG_PCMCIA_SPECTRUM is not set | ||
| 508 | # CONFIG_AIRO_CS is not set | ||
| 509 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 510 | # CONFIG_HOSTAP is not set | ||
| 511 | CONFIG_NET_WIRELESS=y | ||
| 472 | 512 | ||
| 473 | # | 513 | # |
| 474 | # PCMCIA network device support | 514 | # PCMCIA network device support |
| @@ -512,10 +552,7 @@ CONFIG_INPUT=y | |||
| 512 | # | 552 | # |
| 513 | # Userland interfaces | 553 | # Userland interfaces |
| 514 | # | 554 | # |
| 515 | CONFIG_INPUT_MOUSEDEV=y | 555 | # CONFIG_INPUT_MOUSEDEV is not set |
| 516 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 517 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 518 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 519 | # CONFIG_INPUT_JOYDEV is not set | 556 | # CONFIG_INPUT_JOYDEV is not set |
| 520 | # CONFIG_INPUT_TSDEV is not set | 557 | # CONFIG_INPUT_TSDEV is not set |
| 521 | # CONFIG_INPUT_EVDEV is not set | 558 | # CONFIG_INPUT_EVDEV is not set |
| @@ -533,11 +570,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 533 | # | 570 | # |
| 534 | # Hardware I/O ports | 571 | # Hardware I/O ports |
| 535 | # | 572 | # |
| 536 | CONFIG_SERIO=y | 573 | # CONFIG_SERIO is not set |
| 537 | # CONFIG_SERIO_I8042 is not set | ||
| 538 | CONFIG_SERIO_SERPORT=y | ||
| 539 | # CONFIG_SERIO_LIBPS2 is not set | ||
| 540 | CONFIG_SERIO_RAW=m | ||
| 541 | # CONFIG_GAMEPORT is not set | 574 | # CONFIG_GAMEPORT is not set |
| 542 | 575 | ||
| 543 | # | 576 | # |
| @@ -556,6 +589,10 @@ CONFIG_HW_CONSOLE=y | |||
| 556 | # | 589 | # |
| 557 | # Non-8250 serial port support | 590 | # Non-8250 serial port support |
| 558 | # | 591 | # |
| 592 | CONFIG_SERIAL_CORE=y | ||
| 593 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 594 | CONFIG_SERIAL_VR41XX=y | ||
| 595 | CONFIG_SERIAL_VR41XX_CONSOLE=y | ||
| 559 | CONFIG_UNIX98_PTYS=y | 596 | CONFIG_UNIX98_PTYS=y |
| 560 | CONFIG_LEGACY_PTYS=y | 597 | CONFIG_LEGACY_PTYS=y |
| 561 | CONFIG_LEGACY_PTY_COUNT=256 | 598 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -568,20 +605,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 568 | # | 605 | # |
| 569 | # Watchdog Cards | 606 | # Watchdog Cards |
| 570 | # | 607 | # |
| 571 | CONFIG_WATCHDOG=y | 608 | # CONFIG_WATCHDOG is not set |
| 572 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 573 | |||
| 574 | # | ||
| 575 | # Watchdog Device Drivers | ||
| 576 | # | ||
| 577 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 578 | |||
| 579 | # | ||
| 580 | # ISA-based Watchdog Cards | ||
| 581 | # | ||
| 582 | # CONFIG_PCWATCHDOG is not set | ||
| 583 | # CONFIG_MIXCOMWD is not set | ||
| 584 | # CONFIG_WDT is not set | ||
| 585 | # CONFIG_RTC is not set | 609 | # CONFIG_RTC is not set |
| 586 | # CONFIG_GEN_RTC is not set | 610 | # CONFIG_GEN_RTC is not set |
| 587 | # CONFIG_DTLK is not set | 611 | # CONFIG_DTLK is not set |
| @@ -597,6 +621,7 @@ CONFIG_WATCHDOG=y | |||
| 597 | # CONFIG_SYNCLINK_CS is not set | 621 | # CONFIG_SYNCLINK_CS is not set |
| 598 | # CONFIG_CARDMAN_4000 is not set | 622 | # CONFIG_CARDMAN_4000 is not set |
| 599 | # CONFIG_CARDMAN_4040 is not set | 623 | # CONFIG_CARDMAN_4040 is not set |
| 624 | # CONFIG_GPIO_VR41XX is not set | ||
| 600 | # CONFIG_RAW_DRIVER is not set | 625 | # CONFIG_RAW_DRIVER is not set |
| 601 | 626 | ||
| 602 | # | 627 | # |
| @@ -632,10 +657,6 @@ CONFIG_WATCHDOG=y | |||
| 632 | # | 657 | # |
| 633 | 658 | ||
| 634 | # | 659 | # |
| 635 | # Multimedia Capabilities Port drivers | ||
| 636 | # | ||
| 637 | |||
| 638 | # | ||
| 639 | # Multimedia devices | 660 | # Multimedia devices |
| 640 | # | 661 | # |
| 641 | # CONFIG_VIDEO_DEV is not set | 662 | # CONFIG_VIDEO_DEV is not set |
| @@ -667,6 +688,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 667 | # | 688 | # |
| 668 | # CONFIG_USB_ARCH_HAS_HCD is not set | 689 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 669 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 690 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 691 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 670 | 692 | ||
| 671 | # | 693 | # |
| 672 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 694 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -683,12 +705,30 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 683 | # CONFIG_MMC is not set | 705 | # CONFIG_MMC is not set |
| 684 | 706 | ||
| 685 | # | 707 | # |
| 708 | # LED devices | ||
| 709 | # | ||
| 710 | # CONFIG_NEW_LEDS is not set | ||
| 711 | |||
| 712 | # | ||
| 713 | # LED drivers | ||
| 714 | # | ||
| 715 | |||
| 716 | # | ||
| 717 | # LED Triggers | ||
| 718 | # | ||
| 719 | |||
| 720 | # | ||
| 686 | # InfiniBand support | 721 | # InfiniBand support |
| 687 | # | 722 | # |
| 688 | 723 | ||
| 689 | # | 724 | # |
| 690 | # SN Devices | 725 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 726 | # | ||
| 727 | |||
| 728 | # | ||
| 729 | # Real Time Clock | ||
| 691 | # | 730 | # |
| 731 | # CONFIG_RTC_CLASS is not set | ||
| 692 | 732 | ||
| 693 | # | 733 | # |
| 694 | # File systems | 734 | # File systems |
| @@ -710,7 +750,7 @@ CONFIG_FS_POSIX_ACL=y | |||
| 710 | CONFIG_INOTIFY=y | 750 | CONFIG_INOTIFY=y |
| 711 | # CONFIG_QUOTA is not set | 751 | # CONFIG_QUOTA is not set |
| 712 | CONFIG_DNOTIFY=y | 752 | CONFIG_DNOTIFY=y |
| 713 | CONFIG_AUTOFS_FS=y | 753 | # CONFIG_AUTOFS_FS is not set |
| 714 | CONFIG_AUTOFS4_FS=y | 754 | CONFIG_AUTOFS4_FS=y |
| 715 | CONFIG_FUSE_FS=m | 755 | CONFIG_FUSE_FS=m |
| 716 | 756 | ||
| @@ -733,10 +773,9 @@ CONFIG_FUSE_FS=m | |||
| 733 | CONFIG_PROC_FS=y | 773 | CONFIG_PROC_FS=y |
| 734 | CONFIG_PROC_KCORE=y | 774 | CONFIG_PROC_KCORE=y |
| 735 | CONFIG_SYSFS=y | 775 | CONFIG_SYSFS=y |
| 736 | # CONFIG_TMPFS is not set | 776 | CONFIG_TMPFS=y |
| 737 | # CONFIG_HUGETLB_PAGE is not set | 777 | # CONFIG_HUGETLB_PAGE is not set |
| 738 | CONFIG_RAMFS=y | 778 | CONFIG_RAMFS=y |
| 739 | CONFIG_RELAYFS_FS=m | ||
| 740 | # CONFIG_CONFIGFS_FS is not set | 779 | # CONFIG_CONFIGFS_FS is not set |
| 741 | 780 | ||
| 742 | # | 781 | # |
| @@ -802,44 +841,20 @@ CONFIG_MSDOS_PARTITION=y | |||
| 802 | # CONFIG_MAGIC_SYSRQ is not set | 841 | # CONFIG_MAGIC_SYSRQ is not set |
| 803 | # CONFIG_DEBUG_KERNEL is not set | 842 | # CONFIG_DEBUG_KERNEL is not set |
| 804 | CONFIG_LOG_BUF_SHIFT=14 | 843 | CONFIG_LOG_BUF_SHIFT=14 |
| 844 | # CONFIG_DEBUG_FS is not set | ||
| 805 | CONFIG_CROSSCOMPILE=y | 845 | CONFIG_CROSSCOMPILE=y |
| 806 | CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M" | 846 | CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M" |
| 807 | 847 | ||
| 808 | # | 848 | # |
| 809 | # Security options | 849 | # Security options |
| 810 | # | 850 | # |
| 811 | CONFIG_KEYS=y | 851 | # CONFIG_KEYS is not set |
| 812 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 813 | # CONFIG_SECURITY is not set | 852 | # CONFIG_SECURITY is not set |
| 814 | 853 | ||
| 815 | # | 854 | # |
| 816 | # Cryptographic options | 855 | # Cryptographic options |
| 817 | # | 856 | # |
| 818 | CONFIG_CRYPTO=y | 857 | # CONFIG_CRYPTO is not set |
| 819 | CONFIG_CRYPTO_HMAC=y | ||
| 820 | CONFIG_CRYPTO_NULL=m | ||
| 821 | CONFIG_CRYPTO_MD4=m | ||
| 822 | CONFIG_CRYPTO_MD5=m | ||
| 823 | CONFIG_CRYPTO_SHA1=m | ||
| 824 | CONFIG_CRYPTO_SHA256=m | ||
| 825 | CONFIG_CRYPTO_SHA512=m | ||
| 826 | CONFIG_CRYPTO_WP512=m | ||
| 827 | CONFIG_CRYPTO_TGR192=m | ||
| 828 | CONFIG_CRYPTO_DES=m | ||
| 829 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 830 | CONFIG_CRYPTO_TWOFISH=m | ||
| 831 | CONFIG_CRYPTO_SERPENT=m | ||
| 832 | CONFIG_CRYPTO_AES=m | ||
| 833 | CONFIG_CRYPTO_CAST5=m | ||
| 834 | CONFIG_CRYPTO_CAST6=m | ||
| 835 | CONFIG_CRYPTO_TEA=m | ||
| 836 | CONFIG_CRYPTO_ARC4=m | ||
| 837 | CONFIG_CRYPTO_KHAZAD=m | ||
| 838 | CONFIG_CRYPTO_ANUBIS=m | ||
| 839 | CONFIG_CRYPTO_DEFLATE=m | ||
| 840 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 841 | CONFIG_CRYPTO_CRC32C=m | ||
| 842 | # CONFIG_CRYPTO_TEST is not set | ||
| 843 | 858 | ||
| 844 | # | 859 | # |
| 845 | # Hardware crypto devices | 860 | # Hardware crypto devices |
| @@ -849,8 +864,6 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 849 | # Library routines | 864 | # Library routines |
| 850 | # | 865 | # |
| 851 | # CONFIG_CRC_CCITT is not set | 866 | # CONFIG_CRC_CCITT is not set |
| 852 | CONFIG_CRC16=m | 867 | # CONFIG_CRC16 is not set |
| 853 | CONFIG_CRC32=y | 868 | CONFIG_CRC32=y |
| 854 | CONFIG_LIBCRC32C=m | 869 | # CONFIG_LIBCRC32C is not set |
| 855 | CONFIG_ZLIB_INFLATE=m | ||
| 856 | CONFIG_ZLIB_DEFLATE=m | ||
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index 67457850941d..b52d709de962 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:40:37 2006 | 4 | # Mon Apr 24 14:51:20 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -65,6 +65,8 @@ CONFIG_PMC_YOSEMITE=y | |||
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | # CONFIG_HYPERTRANSPORT is not set | 66 | # CONFIG_HYPERTRANSPORT is not set |
| 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 69 | CONFIG_GENERIC_HWEIGHT=y | ||
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_DMA_COHERENT=y | 71 | CONFIG_DMA_COHERENT=y |
| 70 | CONFIG_CPU_BIG_ENDIAN=y | 72 | CONFIG_CPU_BIG_ENDIAN=y |
| @@ -116,7 +118,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 116 | CONFIG_CPU_HAS_PREFETCH=y | 118 | CONFIG_CPU_HAS_PREFETCH=y |
| 117 | # CONFIG_MIPS_MT is not set | 119 | # CONFIG_MIPS_MT is not set |
| 118 | # CONFIG_64BIT_PHYS_ADDR is not set | 120 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 119 | # CONFIG_CPU_ADVANCED is not set | ||
| 120 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
| 121 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
| 122 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -140,7 +141,6 @@ CONFIG_PREEMPT_BKL=y | |||
| 140 | # Code maturity level options | 141 | # Code maturity level options |
| 141 | # | 142 | # |
| 142 | # CONFIG_EXPERIMENTAL is not set | 143 | # CONFIG_EXPERIMENTAL is not set |
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_LOCK_KERNEL=y | 144 | CONFIG_LOCK_KERNEL=y |
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 146 | 146 | ||
| @@ -157,6 +157,7 @@ CONFIG_SYSCTL=y | |||
| 157 | CONFIG_IKCONFIG=y | 157 | CONFIG_IKCONFIG=y |
| 158 | CONFIG_IKCONFIG_PROC=y | 158 | CONFIG_IKCONFIG_PROC=y |
| 159 | # CONFIG_CPUSETS is not set | 159 | # CONFIG_CPUSETS is not set |
| 160 | CONFIG_RELAY=y | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | 161 | CONFIG_INITRAMFS_SOURCE="" |
| 161 | CONFIG_EMBEDDED=y | 162 | CONFIG_EMBEDDED=y |
| 162 | CONFIG_KALLSYMS=y | 163 | CONFIG_KALLSYMS=y |
| @@ -170,10 +171,6 @@ CONFIG_BASE_FULL=y | |||
| 170 | CONFIG_FUTEX=y | 171 | CONFIG_FUTEX=y |
| 171 | CONFIG_EPOLL=y | 172 | CONFIG_EPOLL=y |
| 172 | CONFIG_SHMEM=y | 173 | CONFIG_SHMEM=y |
| 173 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 174 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 175 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 176 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 177 | CONFIG_SLAB=y | 174 | CONFIG_SLAB=y |
| 178 | # CONFIG_TINY_SHMEM is not set | 175 | # CONFIG_TINY_SHMEM is not set |
| 179 | CONFIG_BASE_SMALL=0 | 176 | CONFIG_BASE_SMALL=0 |
| @@ -184,7 +181,6 @@ CONFIG_BASE_SMALL=0 | |||
| 184 | # | 181 | # |
| 185 | CONFIG_MODULES=y | 182 | CONFIG_MODULES=y |
| 186 | CONFIG_MODULE_UNLOAD=y | 183 | CONFIG_MODULE_UNLOAD=y |
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | # CONFIG_MODVERSIONS is not set | 184 | # CONFIG_MODVERSIONS is not set |
| 189 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 185 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 190 | CONFIG_KMOD=y | 186 | CONFIG_KMOD=y |
| @@ -194,6 +190,8 @@ CONFIG_STOP_MACHINE=y | |||
| 194 | # Block layer | 190 | # Block layer |
| 195 | # | 191 | # |
| 196 | # CONFIG_LBD is not set | 192 | # CONFIG_LBD is not set |
| 193 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 194 | # CONFIG_LSF is not set | ||
| 197 | 195 | ||
| 198 | # | 196 | # |
| 199 | # IO Schedulers | 197 | # IO Schedulers |
| @@ -213,7 +211,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 213 | # | 211 | # |
| 214 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| 215 | CONFIG_PCI=y | 213 | CONFIG_PCI=y |
| 216 | CONFIG_PCI_LEGACY_PROC=y | ||
| 217 | # CONFIG_PCI_DEBUG is not set | 214 | # CONFIG_PCI_DEBUG is not set |
| 218 | CONFIG_MMU=y | 215 | CONFIG_MMU=y |
| 219 | 216 | ||
| @@ -241,6 +238,7 @@ CONFIG_NET=y | |||
| 241 | # | 238 | # |
| 242 | # Networking options | 239 | # Networking options |
| 243 | # | 240 | # |
| 241 | # CONFIG_NETDEBUG is not set | ||
| 244 | CONFIG_PACKET=m | 242 | CONFIG_PACKET=m |
| 245 | CONFIG_PACKET_MMAP=y | 243 | CONFIG_PACKET_MMAP=y |
| 246 | CONFIG_UNIX=y | 244 | CONFIG_UNIX=y |
| @@ -261,16 +259,19 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 261 | # CONFIG_INET_AH is not set | 259 | # CONFIG_INET_AH is not set |
| 262 | # CONFIG_INET_ESP is not set | 260 | # CONFIG_INET_ESP is not set |
| 263 | # CONFIG_INET_IPCOMP is not set | 261 | # CONFIG_INET_IPCOMP is not set |
| 264 | CONFIG_INET_TUNNEL=m | 262 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 263 | # CONFIG_INET_TUNNEL is not set | ||
| 265 | CONFIG_INET_DIAG=y | 264 | CONFIG_INET_DIAG=y |
| 266 | CONFIG_INET_TCP_DIAG=y | 265 | CONFIG_INET_TCP_DIAG=y |
| 267 | # CONFIG_TCP_CONG_ADVANCED is not set | 266 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 268 | CONFIG_TCP_CONG_BIC=y | 267 | CONFIG_TCP_CONG_BIC=y |
| 269 | CONFIG_IPV6=m | 268 | CONFIG_IPV6=m |
| 270 | CONFIG_IPV6_PRIVACY=y | 269 | CONFIG_IPV6_PRIVACY=y |
| 270 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 271 | CONFIG_INET6_AH=m | 271 | CONFIG_INET6_AH=m |
| 272 | CONFIG_INET6_ESP=m | 272 | CONFIG_INET6_ESP=m |
| 273 | CONFIG_INET6_IPCOMP=m | 273 | CONFIG_INET6_IPCOMP=m |
| 274 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 274 | CONFIG_INET6_TUNNEL=m | 275 | CONFIG_INET6_TUNNEL=m |
| 275 | CONFIG_IPV6_TUNNEL=m | 276 | CONFIG_IPV6_TUNNEL=m |
| 276 | # CONFIG_NETFILTER is not set | 277 | # CONFIG_NETFILTER is not set |
| @@ -340,10 +341,9 @@ CONFIG_CONNECTOR=m | |||
| 340 | # CONFIG_BLK_DEV_NBD is not set | 341 | # CONFIG_BLK_DEV_NBD is not set |
| 341 | # CONFIG_BLK_DEV_SX8 is not set | 342 | # CONFIG_BLK_DEV_SX8 is not set |
| 342 | # CONFIG_BLK_DEV_RAM is not set | 343 | # CONFIG_BLK_DEV_RAM is not set |
| 343 | CONFIG_BLK_DEV_RAM_COUNT=16 | 344 | # CONFIG_BLK_DEV_INITRD is not set |
| 344 | CONFIG_CDROM_PKTCDVD=m | 345 | CONFIG_CDROM_PKTCDVD=m |
| 345 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 346 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 346 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
| 347 | CONFIG_ATA_OVER_ETH=m | 347 | CONFIG_ATA_OVER_ETH=m |
| 348 | 348 | ||
| 349 | # | 349 | # |
| @@ -433,6 +433,7 @@ CONFIG_MII=y | |||
| 433 | # CONFIG_HAMACHI is not set | 433 | # CONFIG_HAMACHI is not set |
| 434 | # CONFIG_R8169 is not set | 434 | # CONFIG_R8169 is not set |
| 435 | # CONFIG_SIS190 is not set | 435 | # CONFIG_SIS190 is not set |
| 436 | # CONFIG_SKGE is not set | ||
| 436 | # CONFIG_SK98LIN is not set | 437 | # CONFIG_SK98LIN is not set |
| 437 | # CONFIG_TIGON3 is not set | 438 | # CONFIG_TIGON3 is not set |
| 438 | # CONFIG_BNX2 is not set | 439 | # CONFIG_BNX2 is not set |
| @@ -497,6 +498,7 @@ CONFIG_TITAN_GE=y | |||
| 497 | # | 498 | # |
| 498 | CONFIG_SERIAL_8250=y | 499 | CONFIG_SERIAL_8250=y |
| 499 | CONFIG_SERIAL_8250_CONSOLE=y | 500 | CONFIG_SERIAL_8250_CONSOLE=y |
| 501 | CONFIG_SERIAL_8250_PCI=y | ||
| 500 | CONFIG_SERIAL_8250_NR_UARTS=4 | 502 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 501 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 503 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 502 | # CONFIG_SERIAL_8250_EXTENDED is not set | 504 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -506,6 +508,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 506 | # | 508 | # |
| 507 | CONFIG_SERIAL_CORE=y | 509 | CONFIG_SERIAL_CORE=y |
| 508 | CONFIG_SERIAL_CORE_CONSOLE=y | 510 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 511 | # CONFIG_SERIAL_JSM is not set | ||
| 509 | CONFIG_UNIX98_PTYS=y | 512 | CONFIG_UNIX98_PTYS=y |
| 510 | CONFIG_LEGACY_PTYS=y | 513 | CONFIG_LEGACY_PTYS=y |
| 511 | CONFIG_LEGACY_PTY_COUNT=256 | 514 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -563,10 +566,6 @@ CONFIG_GEN_RTC_X=y | |||
| 563 | # | 566 | # |
| 564 | 567 | ||
| 565 | # | 568 | # |
| 566 | # Multimedia Capabilities Port drivers | ||
| 567 | # | ||
| 568 | |||
| 569 | # | ||
| 570 | # Multimedia devices | 569 | # Multimedia devices |
| 571 | # | 570 | # |
| 572 | # CONFIG_VIDEO_DEV is not set | 571 | # CONFIG_VIDEO_DEV is not set |
| @@ -591,6 +590,7 @@ CONFIG_GEN_RTC_X=y | |||
| 591 | # | 590 | # |
| 592 | CONFIG_USB_ARCH_HAS_HCD=y | 591 | CONFIG_USB_ARCH_HAS_HCD=y |
| 593 | CONFIG_USB_ARCH_HAS_OHCI=y | 592 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 593 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 594 | # CONFIG_USB is not set | 594 | # CONFIG_USB is not set |
| 595 | 595 | ||
| 596 | # | 596 | # |
| @@ -608,12 +608,29 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 608 | # CONFIG_MMC is not set | 608 | # CONFIG_MMC is not set |
| 609 | 609 | ||
| 610 | # | 610 | # |
| 611 | # LED devices | ||
| 612 | # | ||
| 613 | # CONFIG_NEW_LEDS is not set | ||
| 614 | |||
| 615 | # | ||
| 616 | # LED drivers | ||
| 617 | # | ||
| 618 | |||
| 619 | # | ||
| 620 | # LED Triggers | ||
| 621 | # | ||
| 622 | |||
| 623 | # | ||
| 611 | # InfiniBand support | 624 | # InfiniBand support |
| 612 | # | 625 | # |
| 613 | # CONFIG_INFINIBAND is not set | 626 | # CONFIG_INFINIBAND is not set |
| 614 | 627 | ||
| 615 | # | 628 | # |
| 616 | # SN Devices | 629 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 630 | # | ||
| 631 | |||
| 632 | # | ||
| 633 | # Real Time Clock | ||
| 617 | # | 634 | # |
| 618 | 635 | ||
| 619 | # | 636 | # |
| @@ -656,7 +673,6 @@ CONFIG_SYSFS=y | |||
| 656 | CONFIG_TMPFS=y | 673 | CONFIG_TMPFS=y |
| 657 | # CONFIG_HUGETLB_PAGE is not set | 674 | # CONFIG_HUGETLB_PAGE is not set |
| 658 | CONFIG_RAMFS=y | 675 | CONFIG_RAMFS=y |
| 659 | CONFIG_RELAYFS_FS=m | ||
| 660 | 676 | ||
| 661 | # | 677 | # |
| 662 | # Miscellaneous filesystems | 678 | # Miscellaneous filesystems |
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 42d5cd7927cb..607e2985ffe3 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.17-rc2 |
| 4 | # Fri Jan 27 15:39:51 2006 | 4 | # Mon Apr 24 14:50:54 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -64,6 +64,8 @@ CONFIG_SGI_IP22=y | |||
| 64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 68 | CONFIG_GENERIC_HWEIGHT=y | ||
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_ARC=y | 70 | CONFIG_ARC=y |
| 69 | CONFIG_DMA_NONCOHERENT=y | 71 | CONFIG_DMA_NONCOHERENT=y |
| @@ -121,7 +123,6 @@ CONFIG_BOARD_SCACHE=y | |||
| 121 | CONFIG_IP22_CPU_SCACHE=y | 123 | CONFIG_IP22_CPU_SCACHE=y |
| 122 | # CONFIG_MIPS_MT is not set | 124 | # CONFIG_MIPS_MT is not set |
| 123 | # CONFIG_64BIT_PHYS_ADDR is not set | 125 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 124 | # CONFIG_CPU_ADVANCED is not set | ||
| 125 | CONFIG_CPU_HAS_LLSC=y | 126 | CONFIG_CPU_HAS_LLSC=y |
| 126 | CONFIG_CPU_HAS_SYNC=y | 127 | CONFIG_CPU_HAS_SYNC=y |
| 127 | CONFIG_GENERIC_HARDIRQS=y | 128 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -143,7 +144,6 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 143 | # Code maturity level options | 144 | # Code maturity level options |
| 144 | # | 145 | # |
| 145 | CONFIG_EXPERIMENTAL=y | 146 | CONFIG_EXPERIMENTAL=y |
| 146 | CONFIG_CLEAN_COMPILE=y | ||
| 147 | CONFIG_BROKEN_ON_SMP=y | 147 | CONFIG_BROKEN_ON_SMP=y |
| 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 149 | 149 | ||
| @@ -160,6 +160,7 @@ CONFIG_SYSCTL=y | |||
| 160 | # CONFIG_AUDIT is not set | 160 | # CONFIG_AUDIT is not set |
| 161 | CONFIG_IKCONFIG=y | 161 | CONFIG_IKCONFIG=y |
| 162 | CONFIG_IKCONFIG_PROC=y | 162 | CONFIG_IKCONFIG_PROC=y |
| 163 | CONFIG_RELAY=y | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | 164 | CONFIG_INITRAMFS_SOURCE="" |
| 164 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 165 | CONFIG_EMBEDDED=y | 166 | CONFIG_EMBEDDED=y |
| @@ -173,10 +174,6 @@ CONFIG_BASE_FULL=y | |||
| 173 | CONFIG_FUTEX=y | 174 | CONFIG_FUTEX=y |
| 174 | CONFIG_EPOLL=y | 175 | CONFIG_EPOLL=y |
| 175 | CONFIG_SHMEM=y | 176 | CONFIG_SHMEM=y |
| 176 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 177 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 178 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 179 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 180 | CONFIG_SLAB=y | 177 | CONFIG_SLAB=y |
| 181 | # CONFIG_TINY_SHMEM is not set | 178 | # CONFIG_TINY_SHMEM is not set |
| 182 | CONFIG_BASE_SMALL=0 | 179 | CONFIG_BASE_SMALL=0 |
| @@ -188,7 +185,6 @@ CONFIG_BASE_SMALL=0 | |||
| 188 | CONFIG_MODULES=y | 185 | CONFIG_MODULES=y |
| 189 | CONFIG_MODULE_UNLOAD=y | 186 | CONFIG_MODULE_UNLOAD=y |
| 190 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 187 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 191 | CONFIG_OBSOLETE_MODPARM=y | ||
| 192 | CONFIG_MODVERSIONS=y | 188 | CONFIG_MODVERSIONS=y |
| 193 | CONFIG_MODULE_SRCVERSION_ALL=y | 189 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 194 | CONFIG_KMOD=y | 190 | CONFIG_KMOD=y |
| @@ -197,6 +193,8 @@ CONFIG_KMOD=y | |||
| 197 | # Block layer | 193 | # Block layer |
| 198 | # | 194 | # |
| 199 | # CONFIG_LBD is not set | 195 | # CONFIG_LBD is not set |
| 196 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 197 | # CONFIG_LSF is not set | ||
| 200 | 198 | ||
| 201 | # | 199 | # |
| 202 | # IO Schedulers | 200 | # IO Schedulers |
| @@ -242,6 +240,7 @@ CONFIG_NET=y | |||
| 242 | # | 240 | # |
| 243 | # Networking options | 241 | # Networking options |
| 244 | # | 242 | # |
| 243 | # CONFIG_NETDEBUG is not set | ||
| 245 | CONFIG_PACKET=y | 244 | CONFIG_PACKET=y |
| 246 | CONFIG_PACKET_MMAP=y | 245 | CONFIG_PACKET_MMAP=y |
| 247 | CONFIG_UNIX=y | 246 | CONFIG_UNIX=y |
| @@ -264,6 +263,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 264 | CONFIG_INET_AH=m | 263 | CONFIG_INET_AH=m |
| 265 | CONFIG_INET_ESP=m | 264 | CONFIG_INET_ESP=m |
| 266 | CONFIG_INET_IPCOMP=m | 265 | CONFIG_INET_IPCOMP=m |
| 266 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 267 | CONFIG_INET_TUNNEL=m | 267 | CONFIG_INET_TUNNEL=m |
| 268 | CONFIG_INET_DIAG=y | 268 | CONFIG_INET_DIAG=y |
| 269 | CONFIG_INET_TCP_DIAG=y | 269 | CONFIG_INET_TCP_DIAG=y |
| @@ -305,9 +305,12 @@ CONFIG_IP_VS_NQ=m | |||
| 305 | CONFIG_IP_VS_FTP=m | 305 | CONFIG_IP_VS_FTP=m |
| 306 | CONFIG_IPV6=m | 306 | CONFIG_IPV6=m |
| 307 | CONFIG_IPV6_PRIVACY=y | 307 | CONFIG_IPV6_PRIVACY=y |
| 308 | CONFIG_IPV6_ROUTER_PREF=y | ||
| 309 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 308 | CONFIG_INET6_AH=m | 310 | CONFIG_INET6_AH=m |
| 309 | CONFIG_INET6_ESP=m | 311 | CONFIG_INET6_ESP=m |
| 310 | CONFIG_INET6_IPCOMP=m | 312 | CONFIG_INET6_IPCOMP=m |
| 313 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 311 | CONFIG_INET6_TUNNEL=m | 314 | CONFIG_INET6_TUNNEL=m |
| 312 | CONFIG_IPV6_TUNNEL=m | 315 | CONFIG_IPV6_TUNNEL=m |
| 313 | CONFIG_NETFILTER=y | 316 | CONFIG_NETFILTER=y |
| @@ -330,11 +333,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | |||
| 330 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 333 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 331 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 334 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 332 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 335 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 333 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 337 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 334 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 338 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 335 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 339 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 340 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 337 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 341 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 342 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
| 343 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 338 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 344 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 339 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 345 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 340 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 346 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -357,20 +363,19 @@ CONFIG_IP_NF_IRC=m | |||
| 357 | CONFIG_IP_NF_TFTP=m | 363 | CONFIG_IP_NF_TFTP=m |
| 358 | CONFIG_IP_NF_AMANDA=m | 364 | CONFIG_IP_NF_AMANDA=m |
| 359 | CONFIG_IP_NF_PPTP=m | 365 | CONFIG_IP_NF_PPTP=m |
| 366 | CONFIG_IP_NF_H323=m | ||
| 360 | CONFIG_IP_NF_QUEUE=m | 367 | CONFIG_IP_NF_QUEUE=m |
| 361 | CONFIG_IP_NF_IPTABLES=m | 368 | CONFIG_IP_NF_IPTABLES=m |
| 362 | CONFIG_IP_NF_MATCH_IPRANGE=m | 369 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 363 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 364 | CONFIG_IP_NF_MATCH_TOS=m | 370 | CONFIG_IP_NF_MATCH_TOS=m |
| 365 | CONFIG_IP_NF_MATCH_RECENT=m | 371 | CONFIG_IP_NF_MATCH_RECENT=m |
| 366 | CONFIG_IP_NF_MATCH_ECN=m | 372 | CONFIG_IP_NF_MATCH_ECN=m |
| 367 | CONFIG_IP_NF_MATCH_DSCP=m | 373 | CONFIG_IP_NF_MATCH_DSCP=m |
| 368 | CONFIG_IP_NF_MATCH_AH_ESP=m | 374 | CONFIG_IP_NF_MATCH_AH=m |
| 369 | CONFIG_IP_NF_MATCH_TTL=m | 375 | CONFIG_IP_NF_MATCH_TTL=m |
| 370 | CONFIG_IP_NF_MATCH_OWNER=m | 376 | CONFIG_IP_NF_MATCH_OWNER=m |
| 371 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 377 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 372 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 378 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
| 373 | CONFIG_IP_NF_MATCH_POLICY=m | ||
| 374 | CONFIG_IP_NF_FILTER=m | 379 | CONFIG_IP_NF_FILTER=m |
| 375 | CONFIG_IP_NF_TARGET_REJECT=m | 380 | CONFIG_IP_NF_TARGET_REJECT=m |
| 376 | CONFIG_IP_NF_TARGET_LOG=m | 381 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -388,6 +393,7 @@ CONFIG_IP_NF_NAT_FTP=m | |||
| 388 | CONFIG_IP_NF_NAT_TFTP=m | 393 | CONFIG_IP_NF_NAT_TFTP=m |
| 389 | CONFIG_IP_NF_NAT_AMANDA=m | 394 | CONFIG_IP_NF_NAT_AMANDA=m |
| 390 | CONFIG_IP_NF_NAT_PPTP=m | 395 | CONFIG_IP_NF_NAT_PPTP=m |
| 396 | CONFIG_IP_NF_NAT_H323=m | ||
| 391 | CONFIG_IP_NF_MANGLE=m | 397 | CONFIG_IP_NF_MANGLE=m |
| 392 | CONFIG_IP_NF_TARGET_TOS=m | 398 | CONFIG_IP_NF_TARGET_TOS=m |
| 393 | CONFIG_IP_NF_TARGET_ECN=m | 399 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -408,12 +414,10 @@ CONFIG_IP6_NF_MATCH_RT=m | |||
| 408 | CONFIG_IP6_NF_MATCH_OPTS=m | 414 | CONFIG_IP6_NF_MATCH_OPTS=m |
| 409 | CONFIG_IP6_NF_MATCH_FRAG=m | 415 | CONFIG_IP6_NF_MATCH_FRAG=m |
| 410 | CONFIG_IP6_NF_MATCH_HL=m | 416 | CONFIG_IP6_NF_MATCH_HL=m |
| 411 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
| 412 | CONFIG_IP6_NF_MATCH_OWNER=m | 417 | CONFIG_IP6_NF_MATCH_OWNER=m |
| 413 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 418 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 414 | CONFIG_IP6_NF_MATCH_AHESP=m | 419 | CONFIG_IP6_NF_MATCH_AH=m |
| 415 | CONFIG_IP6_NF_MATCH_EUI64=m | 420 | CONFIG_IP6_NF_MATCH_EUI64=m |
| 416 | CONFIG_IP6_NF_MATCH_POLICY=m | ||
| 417 | CONFIG_IP6_NF_FILTER=m | 421 | CONFIG_IP6_NF_FILTER=m |
| 418 | CONFIG_IP6_NF_TARGET_LOG=m | 422 | CONFIG_IP6_NF_TARGET_LOG=m |
| 419 | CONFIG_IP6_NF_TARGET_REJECT=m | 423 | CONFIG_IP6_NF_TARGET_REJECT=m |
| @@ -435,6 +439,11 @@ CONFIG_IP_SCTP=m | |||
| 435 | # CONFIG_SCTP_HMAC_NONE is not set | 439 | # CONFIG_SCTP_HMAC_NONE is not set |
| 436 | # CONFIG_SCTP_HMAC_SHA1 is not set | 440 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 437 | CONFIG_SCTP_HMAC_MD5=y | 441 | CONFIG_SCTP_HMAC_MD5=y |
| 442 | |||
| 443 | # | ||
| 444 | # TIPC Configuration (EXPERIMENTAL) | ||
| 445 | # | ||
| 446 | # CONFIG_TIPC is not set | ||
| 438 | # CONFIG_ATM is not set | 447 | # CONFIG_ATM is not set |
| 439 | # CONFIG_BRIDGE is not set | 448 | # CONFIG_BRIDGE is not set |
| 440 | # CONFIG_VLAN_8021Q is not set | 449 | # CONFIG_VLAN_8021Q is not set |
| @@ -444,11 +453,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 444 | # CONFIG_ATALK is not set | 453 | # CONFIG_ATALK is not set |
| 445 | # CONFIG_X25 is not set | 454 | # CONFIG_X25 is not set |
| 446 | # CONFIG_LAPB is not set | 455 | # CONFIG_LAPB is not set |
| 447 | |||
| 448 | # | ||
| 449 | # TIPC Configuration (EXPERIMENTAL) | ||
| 450 | # | ||
| 451 | # CONFIG_TIPC is not set | ||
| 452 | CONFIG_NET_DIVERT=y | 456 | CONFIG_NET_DIVERT=y |
| 453 | # CONFIG_ECONET is not set | 457 | # CONFIG_ECONET is not set |
| 454 | # CONFIG_WAN_ROUTER is not set | 458 | # CONFIG_WAN_ROUTER is not set |
| @@ -508,6 +512,9 @@ CONFIG_IEEE80211=m | |||
| 508 | # CONFIG_IEEE80211_DEBUG is not set | 512 | # CONFIG_IEEE80211_DEBUG is not set |
| 509 | CONFIG_IEEE80211_CRYPT_WEP=m | 513 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 510 | CONFIG_IEEE80211_CRYPT_CCMP=m | 514 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 515 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 516 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
| 517 | CONFIG_WIRELESS_EXT=y | ||
| 511 | 518 | ||
| 512 | # | 519 | # |
| 513 | # Device Drivers | 520 | # Device Drivers |
| @@ -546,7 +553,7 @@ CONFIG_CONNECTOR=m | |||
| 546 | # CONFIG_BLK_DEV_LOOP is not set | 553 | # CONFIG_BLK_DEV_LOOP is not set |
| 547 | # CONFIG_BLK_DEV_NBD is not set | 554 | # CONFIG_BLK_DEV_NBD is not set |
| 548 | # CONFIG_BLK_DEV_RAM is not set | 555 | # CONFIG_BLK_DEV_RAM is not set |
| 549 | CONFIG_BLK_DEV_RAM_COUNT=16 | 556 | # CONFIG_BLK_DEV_INITRD is not set |
| 550 | CONFIG_CDROM_PKTCDVD=m | 557 | CONFIG_CDROM_PKTCDVD=m |
| 551 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 558 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 552 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 559 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| @@ -812,10 +819,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 812 | # | 819 | # |
| 813 | 820 | ||
| 814 | # | 821 | # |
| 815 | # Multimedia Capabilities Port drivers | ||
| 816 | # | ||
| 817 | |||
| 818 | # | ||
| 819 | # Multimedia devices | 822 | # Multimedia devices |
| 820 | # | 823 | # |
| 821 | # CONFIG_VIDEO_DEV is not set | 824 | # CONFIG_VIDEO_DEV is not set |
| @@ -857,6 +860,7 @@ CONFIG_LOGO_SGI_CLUT224=y | |||
| 857 | # | 860 | # |
| 858 | # CONFIG_USB_ARCH_HAS_HCD is not set | 861 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 859 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 862 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 863 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 860 | 864 | ||
| 861 | # | 865 | # |
| 862 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 866 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,12 +877,30 @@ CONFIG_LOGO_SGI_CLUT224=y | |||
| 873 | # CONFIG_MMC is not set | 877 | # CONFIG_MMC is not set |
| 874 | 878 | ||
| 875 | # | 879 | # |
| 880 | # LED devices | ||
| 881 | # | ||
| 882 | # CONFIG_NEW_LEDS is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # LED drivers | ||
| 886 | # | ||
| 887 | |||
| 888 | # | ||
| 889 | # LED Triggers | ||
| 890 | # | ||
| 891 | |||
| 892 | # | ||
| 876 | # InfiniBand support | 893 | # InfiniBand support |
| 877 | # | 894 | # |
| 878 | 895 | ||
| 879 | # | 896 | # |
| 880 | # SN Devices | 897 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 898 | # | ||
| 899 | |||
| 900 | # | ||
| 901 | # Real Time Clock | ||
| 881 | # | 902 | # |
| 903 | # CONFIG_RTC_CLASS is not set | ||
| 882 | 904 | ||
| 883 | # | 905 | # |
| 884 | # File systems | 906 | # File systems |
| @@ -944,7 +966,6 @@ CONFIG_SYSFS=y | |||
| 944 | # CONFIG_TMPFS is not set | 966 | # CONFIG_TMPFS is not set |
| 945 | # CONFIG_HUGETLB_PAGE is not set | 967 | # CONFIG_HUGETLB_PAGE is not set |
| 946 | CONFIG_RAMFS=y | 968 | CONFIG_RAMFS=y |
| 947 | CONFIG_RELAYFS_FS=m | ||
| 948 | # CONFIG_CONFIGFS_FS is not set | 969 | # CONFIG_CONFIGFS_FS is not set |
| 949 | 970 | ||
| 950 | # | 971 | # |
| @@ -963,7 +984,6 @@ CONFIG_EFS_FS=m | |||
| 963 | # CONFIG_QNX4FS_FS is not set | 984 | # CONFIG_QNX4FS_FS is not set |
| 964 | # CONFIG_SYSV_FS is not set | 985 | # CONFIG_SYSV_FS is not set |
| 965 | CONFIG_UFS_FS=m | 986 | CONFIG_UFS_FS=m |
| 966 | # CONFIG_UFS_FS_WRITE is not set | ||
| 967 | 987 | ||
| 968 | # | 988 | # |
| 969 | # Network File Systems | 989 | # Network File Systems |
| @@ -1078,6 +1098,7 @@ CONFIG_NLS_UTF8=m | |||
| 1078 | # CONFIG_MAGIC_SYSRQ is not set | 1098 | # CONFIG_MAGIC_SYSRQ is not set |
| 1079 | # CONFIG_DEBUG_KERNEL is not set | 1099 | # CONFIG_DEBUG_KERNEL is not set |
| 1080 | CONFIG_LOG_BUF_SHIFT=14 | 1100 | CONFIG_LOG_BUF_SHIFT=14 |
| 1101 | # CONFIG_DEBUG_FS is not set | ||
| 1081 | CONFIG_CROSSCOMPILE=y | 1102 | CONFIG_CROSSCOMPILE=y |
| 1082 | CONFIG_CMDLINE="" | 1103 | CONFIG_CMDLINE="" |
| 1083 | 1104 | ||
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 374de839558d..b6232d9033cb 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
| @@ -184,7 +184,7 @@ int __compute_return_epc(struct pt_regs *regs) | |||
| 184 | bit = (insn.i_format.rt >> 2); | 184 | bit = (insn.i_format.rt >> 2); |
| 185 | bit += (bit != 0); | 185 | bit += (bit != 0); |
| 186 | bit += 23; | 186 | bit += 23; |
| 187 | switch (insn.i_format.rt) { | 187 | switch (insn.i_format.rt & 3) { |
| 188 | case 0: /* bc1f */ | 188 | case 0: /* bc1f */ |
| 189 | case 2: /* bc1fl */ | 189 | case 2: /* bc1fl */ |
| 190 | if (~fcr31 & (1 << bit)) | 190 | if (~fcr31 & (1 << bit)) |
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 7c953bcc5f6a..a7d2bb3cf835 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -356,73 +356,13 @@ asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high, | |||
| 356 | asmlinkage ssize_t sys32_pread(unsigned int fd, char __user * buf, | 356 | asmlinkage ssize_t sys32_pread(unsigned int fd, char __user * buf, |
| 357 | size_t count, u32 unused, u64 a4, u64 a5) | 357 | size_t count, u32 unused, u64 a4, u64 a5) |
| 358 | { | 358 | { |
| 359 | ssize_t ret; | 359 | return sys_pread64(fd, buf, count, merge_64(a4, a5)); |
| 360 | struct file * file; | ||
| 361 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); | ||
| 362 | loff_t pos; | ||
| 363 | |||
| 364 | ret = -EBADF; | ||
| 365 | file = fget(fd); | ||
| 366 | if (!file) | ||
| 367 | goto bad_file; | ||
| 368 | if (!(file->f_mode & FMODE_READ)) | ||
| 369 | goto out; | ||
| 370 | pos = merge_64(a4, a5); | ||
| 371 | ret = rw_verify_area(READ, file, &pos, count); | ||
| 372 | if (ret < 0) | ||
| 373 | goto out; | ||
| 374 | ret = -EINVAL; | ||
| 375 | if (!file->f_op || !(read = file->f_op->read)) | ||
| 376 | goto out; | ||
| 377 | if (pos < 0) | ||
| 378 | goto out; | ||
| 379 | ret = -ESPIPE; | ||
| 380 | if (!(file->f_mode & FMODE_PREAD)) | ||
| 381 | goto out; | ||
| 382 | ret = read(file, buf, count, &pos); | ||
| 383 | if (ret > 0) | ||
| 384 | dnotify_parent(file->f_dentry, DN_ACCESS); | ||
| 385 | out: | ||
| 386 | fput(file); | ||
| 387 | bad_file: | ||
| 388 | return ret; | ||
| 389 | } | 360 | } |
| 390 | 361 | ||
| 391 | asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char __user * buf, | 362 | asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char __user * buf, |
| 392 | size_t count, u32 unused, u64 a4, u64 a5) | 363 | size_t count, u32 unused, u64 a4, u64 a5) |
| 393 | { | 364 | { |
| 394 | ssize_t ret; | 365 | return sys_pwrite64(fd, buf, count, merge_64(a4, a5)); |
| 395 | struct file * file; | ||
| 396 | ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); | ||
| 397 | loff_t pos; | ||
| 398 | |||
| 399 | ret = -EBADF; | ||
| 400 | file = fget(fd); | ||
| 401 | if (!file) | ||
| 402 | goto bad_file; | ||
| 403 | if (!(file->f_mode & FMODE_WRITE)) | ||
| 404 | goto out; | ||
| 405 | pos = merge_64(a4, a5); | ||
| 406 | ret = rw_verify_area(WRITE, file, &pos, count); | ||
| 407 | if (ret < 0) | ||
| 408 | goto out; | ||
| 409 | ret = -EINVAL; | ||
| 410 | if (!file->f_op || !(write = file->f_op->write)) | ||
| 411 | goto out; | ||
| 412 | if (pos < 0) | ||
| 413 | goto out; | ||
| 414 | |||
| 415 | ret = -ESPIPE; | ||
| 416 | if (!(file->f_mode & FMODE_PWRITE)) | ||
| 417 | goto out; | ||
| 418 | |||
| 419 | ret = write(file, buf, count, &pos); | ||
| 420 | if (ret > 0) | ||
| 421 | dnotify_parent(file->f_dentry, DN_MODIFY); | ||
| 422 | out: | ||
| 423 | fput(file); | ||
| 424 | bad_file: | ||
| 425 | return ret; | ||
| 426 | } | 366 | } |
| 427 | 367 | ||
| 428 | asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, | 368 | asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, |
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c index 6179805af9f0..caf777f83289 100644 --- a/arch/mips/kernel/rtlx.c +++ b/arch/mips/kernel/rtlx.c | |||
| @@ -398,15 +398,14 @@ ssize_t rtlx_write(int index, void *buffer, size_t count, int user) | |||
| 398 | 398 | ||
| 399 | static int file_open(struct inode *inode, struct file *filp) | 399 | static int file_open(struct inode *inode, struct file *filp) |
| 400 | { | 400 | { |
| 401 | int minor = MINOR(inode->i_rdev); | 401 | int minor = iminor(inode); |
| 402 | 402 | ||
| 403 | return rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1); | 403 | return rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1); |
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | static int file_release(struct inode *inode, struct file *filp) | 406 | static int file_release(struct inode *inode, struct file *filp) |
| 407 | { | 407 | { |
| 408 | int minor; | 408 | int minor = iminor(inode); |
| 409 | minor = MINOR(inode->i_rdev); | ||
| 410 | 409 | ||
| 411 | return rtlx_release(minor); | 410 | return rtlx_release(minor); |
| 412 | } | 411 | } |
| @@ -416,7 +415,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait) | |||
| 416 | int minor; | 415 | int minor; |
| 417 | unsigned int mask = 0; | 416 | unsigned int mask = 0; |
| 418 | 417 | ||
| 419 | minor = MINOR(file->f_dentry->d_inode->i_rdev); | 418 | minor = iminor(file->f_dentry->d_inode); |
| 420 | 419 | ||
| 421 | poll_wait(file, &channel_wqs[minor].rt_queue, wait); | 420 | poll_wait(file, &channel_wqs[minor].rt_queue, wait); |
| 422 | poll_wait(file, &channel_wqs[minor].lx_queue, wait); | 421 | poll_wait(file, &channel_wqs[minor].lx_queue, wait); |
| @@ -438,7 +437,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait) | |||
| 438 | static ssize_t file_read(struct file *file, char __user * buffer, size_t count, | 437 | static ssize_t file_read(struct file *file, char __user * buffer, size_t count, |
| 439 | loff_t * ppos) | 438 | loff_t * ppos) |
| 440 | { | 439 | { |
| 441 | int minor = MINOR(file->f_dentry->d_inode->i_rdev); | 440 | int minor = iminor(file->f_dentry->d_inode); |
| 442 | 441 | ||
| 443 | /* data available? */ | 442 | /* data available? */ |
| 444 | if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) { | 443 | if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) { |
| @@ -455,7 +454,7 @@ static ssize_t file_write(struct file *file, const char __user * buffer, | |||
| 455 | struct rtlx_channel *rt; | 454 | struct rtlx_channel *rt; |
| 456 | DECLARE_WAITQUEUE(wait, current); | 455 | DECLARE_WAITQUEUE(wait, current); |
| 457 | 456 | ||
| 458 | minor = MINOR(file->f_dentry->d_inode->i_rdev); | 457 | minor = iminor(file->f_dentry->d_inode); |
| 459 | rt = &rtlx->channel[minor]; | 458 | rt = &rtlx->channel[minor]; |
| 460 | 459 | ||
| 461 | /* any space left... */ | 460 | /* any space left... */ |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 80ffaa6d50ad..85d7df7b18e1 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
| @@ -1072,7 +1072,7 @@ static int vpe_open(struct inode *inode, struct file *filp) | |||
| 1072 | struct vpe_notifications *not; | 1072 | struct vpe_notifications *not; |
| 1073 | 1073 | ||
| 1074 | /* assume only 1 device at the mo. */ | 1074 | /* assume only 1 device at the mo. */ |
| 1075 | if ((minor = MINOR(inode->i_rdev)) != 1) { | 1075 | if ((minor = iminor(inode)) != 1) { |
| 1076 | printk(KERN_WARNING "VPE loader: only vpe1 is supported\n"); | 1076 | printk(KERN_WARNING "VPE loader: only vpe1 is supported\n"); |
| 1077 | return -ENODEV; | 1077 | return -ENODEV; |
| 1078 | } | 1078 | } |
| @@ -1133,7 +1133,7 @@ static int vpe_release(struct inode *inode, struct file *filp) | |||
| 1133 | struct vpe *v; | 1133 | struct vpe *v; |
| 1134 | Elf_Ehdr *hdr; | 1134 | Elf_Ehdr *hdr; |
| 1135 | 1135 | ||
| 1136 | minor = MINOR(inode->i_rdev); | 1136 | minor = iminor(inode); |
| 1137 | if ((v = get_vpe(minor)) == NULL) | 1137 | if ((v = get_vpe(minor)) == NULL) |
| 1138 | return -ENODEV; | 1138 | return -ENODEV; |
| 1139 | 1139 | ||
| @@ -1174,7 +1174,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer, | |||
| 1174 | size_t ret = count; | 1174 | size_t ret = count; |
| 1175 | struct vpe *v; | 1175 | struct vpe *v; |
| 1176 | 1176 | ||
| 1177 | minor = MINOR(file->f_dentry->d_inode->i_rdev); | 1177 | minor = iminor(file->f_dentry->d_inode); |
| 1178 | if ((v = get_vpe(minor)) == NULL) | 1178 | if ((v = get_vpe(minor)) == NULL) |
| 1179 | return -ENODEV; | 1179 | return -ENODEV; |
| 1180 | 1180 | ||
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index 17dfe6a8cab9..df4e94735604 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
| @@ -337,6 +337,7 @@ void __init prom_init(void) | |||
| 337 | case MIPS_REVISION_CORID_CORE_MSC: | 337 | case MIPS_REVISION_CORID_CORE_MSC: |
| 338 | case MIPS_REVISION_CORID_CORE_FPGA2: | 338 | case MIPS_REVISION_CORID_CORE_FPGA2: |
| 339 | case MIPS_REVISION_CORID_CORE_FPGA3: | 339 | case MIPS_REVISION_CORID_CORE_FPGA3: |
| 340 | case MIPS_REVISION_CORID_CORE_24K: | ||
| 340 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 341 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
| 341 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); | 342 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); |
| 342 | 343 | ||
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c index 1f6f9df74ab2..9337f6c8873a 100644 --- a/arch/mips/mips-boards/generic/pci.c +++ b/arch/mips/mips-boards/generic/pci.c | |||
| @@ -198,6 +198,7 @@ void __init mips_pcibios_init(void) | |||
| 198 | case MIPS_REVISION_CORID_CORE_MSC: | 198 | case MIPS_REVISION_CORID_CORE_MSC: |
| 199 | case MIPS_REVISION_CORID_CORE_FPGA2: | 199 | case MIPS_REVISION_CORID_CORE_FPGA2: |
| 200 | case MIPS_REVISION_CORID_CORE_FPGA3: | 200 | case MIPS_REVISION_CORID_CORE_FPGA3: |
| 201 | case MIPS_REVISION_CORID_CORE_24K: | ||
| 201 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 202 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
| 202 | /* Set up resource ranges from the controller's registers. */ | 203 | /* Set up resource ranges from the controller's registers. */ |
| 203 | MSC_READ(MSC01_PCI_SC2PMBASL, start); | 204 | MSC_READ(MSC01_PCI_SC2PMBASL, start); |
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index 64db07d4dbe5..7cc0ba4f553a 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c | |||
| @@ -57,6 +57,7 @@ static inline int mips_pcibios_iack(void) | |||
| 57 | case MIPS_REVISION_CORID_CORE_MSC: | 57 | case MIPS_REVISION_CORID_CORE_MSC: |
| 58 | case MIPS_REVISION_CORID_CORE_FPGA2: | 58 | case MIPS_REVISION_CORID_CORE_FPGA2: |
| 59 | case MIPS_REVISION_CORID_CORE_FPGA3: | 59 | case MIPS_REVISION_CORID_CORE_FPGA3: |
| 60 | case MIPS_REVISION_CORID_CORE_24K: | ||
| 60 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 61 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
| 61 | MSC_READ(MSC01_PCI_IACK, irq); | 62 | MSC_READ(MSC01_PCI_IACK, irq); |
| 62 | irq &= 0xff; | 63 | irq &= 0xff; |
| @@ -143,6 +144,7 @@ void corehi_irqdispatch(struct pt_regs *regs) | |||
| 143 | case MIPS_REVISION_CORID_CORE_MSC: | 144 | case MIPS_REVISION_CORID_CORE_MSC: |
| 144 | case MIPS_REVISION_CORID_CORE_FPGA2: | 145 | case MIPS_REVISION_CORID_CORE_FPGA2: |
| 145 | case MIPS_REVISION_CORID_CORE_FPGA3: | 146 | case MIPS_REVISION_CORID_CORE_FPGA3: |
| 147 | case MIPS_REVISION_CORID_CORE_24K: | ||
| 146 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 148 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
| 147 | ll_msc_irq(regs); | 149 | ll_msc_irq(regs); |
| 148 | break; | 150 | break; |
| @@ -309,6 +311,7 @@ void __init arch_init_irq(void) | |||
| 309 | case MIPS_REVISION_CORID_CORE_MSC: | 311 | case MIPS_REVISION_CORID_CORE_MSC: |
| 310 | case MIPS_REVISION_CORID_CORE_FPGA2: | 312 | case MIPS_REVISION_CORID_CORE_FPGA2: |
| 311 | case MIPS_REVISION_CORID_CORE_FPGA3: | 313 | case MIPS_REVISION_CORID_CORE_FPGA3: |
| 314 | case MIPS_REVISION_CORID_CORE_24K: | ||
| 312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 315 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
| 313 | if (cpu_has_veic) | 316 | if (cpu_has_veic) |
| 314 | init_msc_irqs (MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 317 | init_msc_irqs (MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); |
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c index 935dd851f480..f2b4862aaae5 100644 --- a/arch/mips/oprofile/common.c +++ b/arch/mips/oprofile/common.c | |||
| @@ -27,7 +27,7 @@ static int op_mips_setup(void) | |||
| 27 | model->reg_setup(ctr); | 27 | model->reg_setup(ctr); |
| 28 | 28 | ||
| 29 | /* Configure the registers on all cpus. */ | 29 | /* Configure the registers on all cpus. */ |
| 30 | on_each_cpu(model->cpu_setup, 0, 0, 1); | 30 | on_each_cpu(model->cpu_setup, NULL, 0, 1); |
| 31 | 31 | ||
| 32 | return 0; | 32 | return 0; |
| 33 | } | 33 | } |
| @@ -114,5 +114,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
| 114 | 114 | ||
| 115 | void oprofile_arch_exit(void) | 115 | void oprofile_arch_exit(void) |
| 116 | { | 116 | { |
| 117 | model->exit(); | 117 | if (model) |
| 118 | model->exit(); | ||
| 118 | } | 119 | } |
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index cddf1cedf007..36b662e27b6e 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c | |||
| @@ -122,7 +122,7 @@ again: | |||
| 122 | xtime.tv_sec > last_rtc_update + 660 && | 122 | xtime.tv_sec > last_rtc_update + 660 && |
| 123 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 123 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
| 124 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 124 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |
| 125 | if (rtc_set_time(xtime.tv_sec) == 0) { | 125 | if (rtc_mips_set_time(xtime.tv_sec) == 0) { |
| 126 | last_rtc_update = xtime.tv_sec; | 126 | last_rtc_update = xtime.tv_sec; |
| 127 | } else { | 127 | } else { |
| 128 | last_rtc_update = xtime.tv_sec - 600; | 128 | last_rtc_update = xtime.tv_sec - 600; |
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index 22a6df94b4a1..de01c9815bdd 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
| @@ -507,13 +507,14 @@ static void ip32_irq0(struct pt_regs *regs) | |||
| 507 | int irq = 0; | 507 | int irq = 0; |
| 508 | 508 | ||
| 509 | crime_int = crime->istat & crime_mask; | 509 | crime_int = crime->istat & crime_mask; |
| 510 | irq = ffs(crime_int); | 510 | irq = __ffs(crime_int); |
| 511 | crime_int = 1 << (irq - 1); | 511 | crime_int = 1 << irq; |
| 512 | 512 | ||
| 513 | if (crime_int & CRIME_MACEISA_INT_MASK) { | 513 | if (crime_int & CRIME_MACEISA_INT_MASK) { |
| 514 | unsigned long mace_int = mace->perif.ctrl.istat; | 514 | unsigned long mace_int = mace->perif.ctrl.istat; |
| 515 | irq = ffs(mace_int & maceisa_mask) + 32; | 515 | irq = __ffs(mace_int & maceisa_mask) + 32; |
| 516 | } | 516 | } |
| 517 | irq++; | ||
| 517 | DBG("*irq %u*\n", irq); | 518 | DBG("*irq %u*\n", irq); |
| 518 | do_IRQ(irq, regs); | 519 | do_IRQ(irq, regs); |
| 519 | } | 520 | } |
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 19f911c5dd58..910fb3afc0b5 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
| @@ -138,6 +138,37 @@ config 64BIT | |||
| 138 | enable this option otherwise. The 64bit kernel is significantly bigger | 138 | enable this option otherwise. The 64bit kernel is significantly bigger |
| 139 | and slower than the 32bit one. | 139 | and slower than the 32bit one. |
| 140 | 140 | ||
| 141 | choice | ||
| 142 | prompt "Kernel page size" | ||
| 143 | default PARISC_PAGE_SIZE_4KB if !64BIT | ||
| 144 | default PARISC_PAGE_SIZE_4KB if 64BIT | ||
| 145 | # default PARISC_PAGE_SIZE_16KB if 64BIT | ||
| 146 | |||
| 147 | config PARISC_PAGE_SIZE_4KB | ||
| 148 | bool "4KB" | ||
| 149 | help | ||
| 150 | This lets you select the page size of the kernel. For best | ||
| 151 | performance, a page size of 16KB is recommended. For best | ||
| 152 | compatibility with 32bit applications, a page size of 4KB should be | ||
| 153 | selected (the vast majority of 32bit binaries work perfectly fine | ||
| 154 | with a larger page size). | ||
| 155 | |||
| 156 | 4KB For best 32bit compatibility | ||
| 157 | 16KB For best performance | ||
| 158 | 64KB For best performance, might give more overhead. | ||
| 159 | |||
| 160 | If you don't know what to do, choose 4KB. | ||
| 161 | |||
| 162 | config PARISC_PAGE_SIZE_16KB | ||
| 163 | bool "16KB (EXPERIMENTAL)" | ||
| 164 | depends on PA8X00 && EXPERIMENTAL | ||
| 165 | |||
| 166 | config PARISC_PAGE_SIZE_64KB | ||
| 167 | bool "64KB (EXPERIMENTAL)" | ||
| 168 | depends on PA8X00 && EXPERIMENTAL | ||
| 169 | |||
| 170 | endchoice | ||
| 171 | |||
| 141 | config SMP | 172 | config SMP |
| 142 | bool "Symmetric multi-processing support" | 173 | bool "Symmetric multi-processing support" |
| 143 | ---help--- | 174 | ---help--- |
diff --git a/arch/parisc/defconfig b/arch/parisc/defconfig index 59f7bc38e72e..b38b58eb9dc2 100644 --- a/arch/parisc/defconfig +++ b/arch/parisc/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-pa6 | 3 | # Linux kernel version: 2.6.16-pa10 |
| 4 | # Sun Mar 26 19:50:07 2006 | 4 | # Sun Apr 2 15:26:38 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PARISC=y | 6 | CONFIG_PARISC=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -25,7 +25,7 @@ CONFIG_LOCALVERSION="" | |||
| 25 | # CONFIG_LOCALVERSION_AUTO is not set | 25 | # CONFIG_LOCALVERSION_AUTO is not set |
| 26 | CONFIG_SWAP=y | 26 | CONFIG_SWAP=y |
| 27 | CONFIG_SYSVIPC=y | 27 | CONFIG_SYSVIPC=y |
| 28 | # CONFIG_POSIX_MQUEUE is not set | 28 | CONFIG_POSIX_MQUEUE=y |
| 29 | # CONFIG_BSD_PROCESS_ACCT is not set | 29 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 30 | CONFIG_SYSCTL=y | 30 | CONFIG_SYSCTL=y |
| 31 | # CONFIG_AUDIT is not set | 31 | # CONFIG_AUDIT is not set |
| @@ -35,7 +35,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 35 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 35 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 36 | # CONFIG_EMBEDDED is not set | 36 | # CONFIG_EMBEDDED is not set |
| 37 | CONFIG_KALLSYMS=y | 37 | CONFIG_KALLSYMS=y |
| 38 | # CONFIG_KALLSYMS_ALL is not set | 38 | CONFIG_KALLSYMS_ALL=y |
| 39 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 39 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 40 | CONFIG_HOTPLUG=y | 40 | CONFIG_HOTPLUG=y |
| 41 | CONFIG_PRINTK=y | 41 | CONFIG_PRINTK=y |
| @@ -57,7 +57,13 @@ CONFIG_BASE_SMALL=0 | |||
| 57 | # | 57 | # |
| 58 | # Loadable module support | 58 | # Loadable module support |
| 59 | # | 59 | # |
| 60 | # CONFIG_MODULES is not set | 60 | CONFIG_MODULES=y |
| 61 | CONFIG_MODULE_UNLOAD=y | ||
| 62 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 63 | CONFIG_OBSOLETE_MODPARM=y | ||
| 64 | # CONFIG_MODVERSIONS is not set | ||
| 65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 66 | CONFIG_KMOD=y | ||
| 61 | 67 | ||
| 62 | # | 68 | # |
| 63 | # Block layer | 69 | # Block layer |
| @@ -79,16 +85,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 79 | # | 85 | # |
| 80 | # Processor type and features | 86 | # Processor type and features |
| 81 | # | 87 | # |
| 82 | CONFIG_PA7000=y | 88 | # CONFIG_PA7000 is not set |
| 83 | # CONFIG_PA7100LC is not set | 89 | CONFIG_PA7100LC=y |
| 84 | # CONFIG_PA7200 is not set | 90 | # CONFIG_PA7200 is not set |
| 85 | # CONFIG_PA7300LC is not set | 91 | # CONFIG_PA7300LC is not set |
| 86 | # CONFIG_PA8X00 is not set | 92 | # CONFIG_PA8X00 is not set |
| 87 | CONFIG_PA11=y | 93 | CONFIG_PA11=y |
| 94 | CONFIG_PARISC_PAGE_SIZE_4KB=y | ||
| 95 | # CONFIG_PARISC_PAGE_SIZE_16KB is not set | ||
| 96 | # CONFIG_PARISC_PAGE_SIZE_64KB is not set | ||
| 88 | # CONFIG_SMP is not set | 97 | # CONFIG_SMP is not set |
| 89 | CONFIG_ARCH_FLATMEM_ENABLE=y | 98 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 90 | CONFIG_PREEMPT_NONE=y | 99 | # CONFIG_PREEMPT_NONE is not set |
| 91 | # CONFIG_PREEMPT_VOLUNTARY is not set | 100 | CONFIG_PREEMPT_VOLUNTARY=y |
| 92 | # CONFIG_PREEMPT is not set | 101 | # CONFIG_PREEMPT is not set |
| 93 | # CONFIG_HZ_100 is not set | 102 | # CONFIG_HZ_100 is not set |
| 94 | CONFIG_HZ_250=y | 103 | CONFIG_HZ_250=y |
| @@ -108,7 +117,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 | |||
| 108 | # Bus options (PCI, PCMCIA, EISA, GSC, ISA) | 117 | # Bus options (PCI, PCMCIA, EISA, GSC, ISA) |
| 109 | # | 118 | # |
| 110 | CONFIG_GSC=y | 119 | CONFIG_GSC=y |
| 111 | CONFIG_HPPB=y | 120 | # CONFIG_HPPB is not set |
| 112 | CONFIG_IOMMU_CCIO=y | 121 | CONFIG_IOMMU_CCIO=y |
| 113 | CONFIG_GSC_LASI=y | 122 | CONFIG_GSC_LASI=y |
| 114 | CONFIG_GSC_WAX=y | 123 | CONFIG_GSC_WAX=y |
| @@ -126,7 +135,25 @@ CONFIG_IOMMU_SBA=y | |||
| 126 | # | 135 | # |
| 127 | # PCCARD (PCMCIA/CardBus) support | 136 | # PCCARD (PCMCIA/CardBus) support |
| 128 | # | 137 | # |
| 129 | # CONFIG_PCCARD is not set | 138 | CONFIG_PCCARD=y |
| 139 | # CONFIG_PCMCIA_DEBUG is not set | ||
| 140 | CONFIG_PCMCIA=y | ||
| 141 | CONFIG_PCMCIA_LOAD_CIS=y | ||
| 142 | CONFIG_PCMCIA_IOCTL=y | ||
| 143 | CONFIG_CARDBUS=y | ||
| 144 | |||
| 145 | # | ||
| 146 | # PC-card bridges | ||
| 147 | # | ||
| 148 | CONFIG_YENTA=y | ||
| 149 | CONFIG_YENTA_O2=y | ||
| 150 | CONFIG_YENTA_RICOH=y | ||
| 151 | CONFIG_YENTA_TI=y | ||
| 152 | CONFIG_YENTA_ENE_TUNE=y | ||
| 153 | CONFIG_YENTA_TOSHIBA=y | ||
| 154 | CONFIG_PD6729=y | ||
| 155 | CONFIG_I82092=y | ||
| 156 | CONFIG_PCCARD_NONSTATIC=y | ||
| 130 | 157 | ||
| 131 | # | 158 | # |
| 132 | # PCI Hotplug Support | 159 | # PCI Hotplug Support |
| @@ -145,7 +172,7 @@ CONFIG_PDC_STABLE=y | |||
| 145 | # Executable file formats | 172 | # Executable file formats |
| 146 | # | 173 | # |
| 147 | CONFIG_BINFMT_ELF=y | 174 | CONFIG_BINFMT_ELF=y |
| 148 | # CONFIG_BINFMT_MISC is not set | 175 | CONFIG_BINFMT_MISC=m |
| 149 | 176 | ||
| 150 | # | 177 | # |
| 151 | # Networking | 178 | # Networking |
| @@ -159,13 +186,15 @@ CONFIG_NET=y | |||
| 159 | CONFIG_PACKET=y | 186 | CONFIG_PACKET=y |
| 160 | CONFIG_PACKET_MMAP=y | 187 | CONFIG_PACKET_MMAP=y |
| 161 | CONFIG_UNIX=y | 188 | CONFIG_UNIX=y |
| 162 | # CONFIG_NET_KEY is not set | 189 | CONFIG_XFRM=y |
| 190 | CONFIG_XFRM_USER=m | ||
| 191 | CONFIG_NET_KEY=m | ||
| 163 | CONFIG_INET=y | 192 | CONFIG_INET=y |
| 164 | CONFIG_IP_MULTICAST=y | 193 | CONFIG_IP_MULTICAST=y |
| 165 | # CONFIG_IP_ADVANCED_ROUTER is not set | 194 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 166 | CONFIG_IP_FIB_HASH=y | 195 | CONFIG_IP_FIB_HASH=y |
| 167 | CONFIG_IP_PNP=y | 196 | CONFIG_IP_PNP=y |
| 168 | # CONFIG_IP_PNP_DHCP is not set | 197 | CONFIG_IP_PNP_DHCP=y |
| 169 | CONFIG_IP_PNP_BOOTP=y | 198 | CONFIG_IP_PNP_BOOTP=y |
| 170 | # CONFIG_IP_PNP_RARP is not set | 199 | # CONFIG_IP_PNP_RARP is not set |
| 171 | # CONFIG_NET_IPIP is not set | 200 | # CONFIG_NET_IPIP is not set |
| @@ -173,19 +202,20 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 173 | # CONFIG_IP_MROUTE is not set | 202 | # CONFIG_IP_MROUTE is not set |
| 174 | # CONFIG_ARPD is not set | 203 | # CONFIG_ARPD is not set |
| 175 | # CONFIG_SYN_COOKIES is not set | 204 | # CONFIG_SYN_COOKIES is not set |
| 176 | # CONFIG_INET_AH is not set | 205 | CONFIG_INET_AH=m |
| 177 | # CONFIG_INET_ESP is not set | 206 | CONFIG_INET_ESP=m |
| 178 | # CONFIG_INET_IPCOMP is not set | 207 | # CONFIG_INET_IPCOMP is not set |
| 179 | # CONFIG_INET_TUNNEL is not set | 208 | CONFIG_INET_TUNNEL=m |
| 180 | # CONFIG_INET_DIAG is not set | 209 | CONFIG_INET_DIAG=m |
| 210 | CONFIG_INET_TCP_DIAG=m | ||
| 181 | # CONFIG_TCP_CONG_ADVANCED is not set | 211 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 182 | CONFIG_TCP_CONG_BIC=y | 212 | CONFIG_TCP_CONG_BIC=y |
| 183 | CONFIG_IPV6=y | 213 | CONFIG_IPV6=y |
| 184 | # CONFIG_IPV6_PRIVACY is not set | 214 | # CONFIG_IPV6_PRIVACY is not set |
| 185 | # CONFIG_INET6_AH is not set | 215 | CONFIG_INET6_AH=y |
| 186 | # CONFIG_INET6_ESP is not set | 216 | CONFIG_INET6_ESP=y |
| 187 | # CONFIG_INET6_IPCOMP is not set | 217 | CONFIG_INET6_IPCOMP=y |
| 188 | # CONFIG_INET6_TUNNEL is not set | 218 | CONFIG_INET6_TUNNEL=y |
| 189 | # CONFIG_IPV6_TUNNEL is not set | 219 | # CONFIG_IPV6_TUNNEL is not set |
| 190 | # CONFIG_NETFILTER is not set | 220 | # CONFIG_NETFILTER is not set |
| 191 | 221 | ||
| @@ -207,7 +237,8 @@ CONFIG_IPV6=y | |||
| 207 | # CONFIG_BRIDGE is not set | 237 | # CONFIG_BRIDGE is not set |
| 208 | # CONFIG_VLAN_8021Q is not set | 238 | # CONFIG_VLAN_8021Q is not set |
| 209 | # CONFIG_DECNET is not set | 239 | # CONFIG_DECNET is not set |
| 210 | # CONFIG_LLC2 is not set | 240 | CONFIG_LLC=m |
| 241 | CONFIG_LLC2=m | ||
| 211 | # CONFIG_IPX is not set | 242 | # CONFIG_IPX is not set |
| 212 | # CONFIG_ATALK is not set | 243 | # CONFIG_ATALK is not set |
| 213 | # CONFIG_X25 is not set | 244 | # CONFIG_X25 is not set |
| @@ -237,9 +268,9 @@ CONFIG_IPV6=y | |||
| 237 | # | 268 | # |
| 238 | # Generic Driver Options | 269 | # Generic Driver Options |
| 239 | # | 270 | # |
| 240 | CONFIG_STANDALONE=y | 271 | # CONFIG_STANDALONE is not set |
| 241 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 272 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 242 | # CONFIG_FW_LOADER is not set | 273 | CONFIG_FW_LOADER=y |
| 243 | # CONFIG_DEBUG_DRIVER is not set | 274 | # CONFIG_DEBUG_DRIVER is not set |
| 244 | 275 | ||
| 245 | # | 276 | # |
| @@ -256,13 +287,14 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 256 | # Parallel port support | 287 | # Parallel port support |
| 257 | # | 288 | # |
| 258 | CONFIG_PARPORT=y | 289 | CONFIG_PARPORT=y |
| 259 | CONFIG_PARPORT_PC=y | 290 | CONFIG_PARPORT_PC=m |
| 260 | # CONFIG_PARPORT_SERIAL is not set | 291 | # CONFIG_PARPORT_SERIAL is not set |
| 261 | # CONFIG_PARPORT_PC_FIFO is not set | 292 | # CONFIG_PARPORT_PC_FIFO is not set |
| 262 | # CONFIG_PARPORT_PC_SUPERIO is not set | 293 | # CONFIG_PARPORT_PC_SUPERIO is not set |
| 294 | CONFIG_PARPORT_PC_PCMCIA=m | ||
| 263 | CONFIG_PARPORT_NOT_PC=y | 295 | CONFIG_PARPORT_NOT_PC=y |
| 264 | CONFIG_PARPORT_GSC=y | 296 | CONFIG_PARPORT_GSC=y |
| 265 | # CONFIG_PARPORT_1284 is not set | 297 | CONFIG_PARPORT_1284=y |
| 266 | 298 | ||
| 267 | # | 299 | # |
| 268 | # Plug and Play support | 300 | # Plug and Play support |
| @@ -284,7 +316,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y | |||
| 284 | # CONFIG_BLK_DEV_UB is not set | 316 | # CONFIG_BLK_DEV_UB is not set |
| 285 | CONFIG_BLK_DEV_RAM=y | 317 | CONFIG_BLK_DEV_RAM=y |
| 286 | CONFIG_BLK_DEV_RAM_COUNT=16 | 318 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 287 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 319 | CONFIG_BLK_DEV_RAM_SIZE=6144 |
| 288 | CONFIG_BLK_DEV_INITRD=y | 320 | CONFIG_BLK_DEV_INITRD=y |
| 289 | # CONFIG_CDROM_PKTCDVD is not set | 321 | # CONFIG_CDROM_PKTCDVD is not set |
| 290 | # CONFIG_ATA_OVER_ETH is not set | 322 | # CONFIG_ATA_OVER_ETH is not set |
| @@ -292,7 +324,60 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 292 | # | 324 | # |
| 293 | # ATA/ATAPI/MFM/RLL support | 325 | # ATA/ATAPI/MFM/RLL support |
| 294 | # | 326 | # |
| 295 | # CONFIG_IDE is not set | 327 | CONFIG_IDE=y |
| 328 | CONFIG_BLK_DEV_IDE=y | ||
| 329 | |||
| 330 | # | ||
| 331 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 332 | # | ||
| 333 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 334 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 335 | CONFIG_IDEDISK_MULTI_MODE=y | ||
| 336 | CONFIG_BLK_DEV_IDECS=y | ||
| 337 | CONFIG_BLK_DEV_IDECD=y | ||
| 338 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 339 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 340 | CONFIG_BLK_DEV_IDESCSI=y | ||
| 341 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 342 | |||
| 343 | # | ||
| 344 | # IDE chipset support/bugfixes | ||
| 345 | # | ||
| 346 | CONFIG_IDE_GENERIC=y | ||
| 347 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 348 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 349 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 350 | CONFIG_BLK_DEV_GENERIC=y | ||
| 351 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 352 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 353 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 354 | # CONFIG_IDEDMA_PCI_AUTO is not set | ||
| 355 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 356 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 357 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 358 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 359 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 360 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 361 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 362 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 363 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 364 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 365 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 366 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 367 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 368 | CONFIG_BLK_DEV_NS87415=y | ||
| 369 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 370 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 371 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 372 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 373 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 374 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 375 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 376 | # CONFIG_IDE_ARM is not set | ||
| 377 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 378 | # CONFIG_IDEDMA_IVB is not set | ||
| 379 | # CONFIG_IDEDMA_AUTO is not set | ||
| 380 | # CONFIG_BLK_DEV_HD is not set | ||
| 296 | 381 | ||
| 297 | # | 382 | # |
| 298 | # SCSI device support | 383 | # SCSI device support |
| @@ -375,6 +460,15 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20 | |||
| 375 | # CONFIG_SCSI_DEBUG is not set | 460 | # CONFIG_SCSI_DEBUG is not set |
| 376 | 461 | ||
| 377 | # | 462 | # |
| 463 | # PCMCIA SCSI adapter support | ||
| 464 | # | ||
| 465 | # CONFIG_PCMCIA_AHA152X is not set | ||
| 466 | # CONFIG_PCMCIA_FDOMAIN is not set | ||
| 467 | # CONFIG_PCMCIA_NINJA_SCSI is not set | ||
| 468 | # CONFIG_PCMCIA_QLOGIC is not set | ||
| 469 | # CONFIG_PCMCIA_SYM53C500 is not set | ||
| 470 | |||
| 471 | # | ||
| 378 | # Multi-device support (RAID and LVM) | 472 | # Multi-device support (RAID and LVM) |
| 379 | # | 473 | # |
| 380 | CONFIG_MD=y | 474 | CONFIG_MD=y |
| @@ -382,12 +476,17 @@ CONFIG_BLK_DEV_MD=y | |||
| 382 | CONFIG_MD_LINEAR=y | 476 | CONFIG_MD_LINEAR=y |
| 383 | CONFIG_MD_RAID0=y | 477 | CONFIG_MD_RAID0=y |
| 384 | CONFIG_MD_RAID1=y | 478 | CONFIG_MD_RAID1=y |
| 385 | # CONFIG_MD_RAID10 is not set | 479 | CONFIG_MD_RAID10=y |
| 386 | CONFIG_MD_RAID5=y | 480 | CONFIG_MD_RAID5=y |
| 387 | # CONFIG_MD_RAID6 is not set | 481 | CONFIG_MD_RAID6=y |
| 388 | # CONFIG_MD_MULTIPATH is not set | 482 | # CONFIG_MD_MULTIPATH is not set |
| 389 | # CONFIG_MD_FAULTY is not set | 483 | # CONFIG_MD_FAULTY is not set |
| 390 | # CONFIG_BLK_DEV_DM is not set | 484 | CONFIG_BLK_DEV_DM=y |
| 485 | # CONFIG_DM_CRYPT is not set | ||
| 486 | # CONFIG_DM_SNAPSHOT is not set | ||
| 487 | # CONFIG_DM_MIRROR is not set | ||
| 488 | # CONFIG_DM_ZERO is not set | ||
| 489 | # CONFIG_DM_MULTIPATH is not set | ||
| 391 | 490 | ||
| 392 | # | 491 | # |
| 393 | # Fusion MPT device support | 492 | # Fusion MPT device support |
| @@ -411,10 +510,10 @@ CONFIG_MD_RAID5=y | |||
| 411 | # Network device support | 510 | # Network device support |
| 412 | # | 511 | # |
| 413 | CONFIG_NETDEVICES=y | 512 | CONFIG_NETDEVICES=y |
| 414 | # CONFIG_DUMMY is not set | 513 | CONFIG_DUMMY=m |
| 415 | # CONFIG_BONDING is not set | 514 | CONFIG_BONDING=m |
| 416 | # CONFIG_EQUALIZER is not set | 515 | # CONFIG_EQUALIZER is not set |
| 417 | # CONFIG_TUN is not set | 516 | CONFIG_TUN=m |
| 418 | 517 | ||
| 419 | # | 518 | # |
| 420 | # ARCnet devices | 519 | # ARCnet devices |
| @@ -430,7 +529,7 @@ CONFIG_NETDEVICES=y | |||
| 430 | # Ethernet (10 or 100Mbit) | 529 | # Ethernet (10 or 100Mbit) |
| 431 | # | 530 | # |
| 432 | CONFIG_NET_ETHERNET=y | 531 | CONFIG_NET_ETHERNET=y |
| 433 | # CONFIG_MII is not set | 532 | CONFIG_MII=m |
| 434 | CONFIG_LASI_82596=y | 533 | CONFIG_LASI_82596=y |
| 435 | # CONFIG_HAPPYMEAL is not set | 534 | # CONFIG_HAPPYMEAL is not set |
| 436 | # CONFIG_SUNGEM is not set | 535 | # CONFIG_SUNGEM is not set |
| @@ -451,6 +550,8 @@ CONFIG_TULIP=y | |||
| 451 | # CONFIG_WINBOND_840 is not set | 550 | # CONFIG_WINBOND_840 is not set |
| 452 | # CONFIG_DM9102 is not set | 551 | # CONFIG_DM9102 is not set |
| 453 | # CONFIG_ULI526X is not set | 552 | # CONFIG_ULI526X is not set |
| 553 | # CONFIG_PCMCIA_XIRCOM is not set | ||
| 554 | # CONFIG_PCMCIA_XIRTULIP is not set | ||
| 454 | # CONFIG_DEPCA is not set | 555 | # CONFIG_DEPCA is not set |
| 455 | # CONFIG_HP100 is not set | 556 | # CONFIG_HP100 is not set |
| 456 | CONFIG_NET_PCI=y | 557 | CONFIG_NET_PCI=y |
| @@ -518,14 +619,33 @@ CONFIG_NET_RADIO=y | |||
| 518 | # Obsolete Wireless cards support (pre-802.11) | 619 | # Obsolete Wireless cards support (pre-802.11) |
| 519 | # | 620 | # |
| 520 | # CONFIG_STRIP is not set | 621 | # CONFIG_STRIP is not set |
| 622 | # CONFIG_PCMCIA_WAVELAN is not set | ||
| 623 | # CONFIG_PCMCIA_NETWAVE is not set | ||
| 624 | |||
| 625 | # | ||
| 626 | # Wireless 802.11 Frequency Hopping cards support | ||
| 627 | # | ||
| 628 | # CONFIG_PCMCIA_RAYCS is not set | ||
| 521 | 629 | ||
| 522 | # | 630 | # |
| 523 | # Wireless 802.11b ISA/PCI cards support | 631 | # Wireless 802.11b ISA/PCI cards support |
| 524 | # | 632 | # |
| 525 | # CONFIG_HERMES is not set | 633 | CONFIG_HERMES=y |
| 634 | # CONFIG_PLX_HERMES is not set | ||
| 635 | # CONFIG_TMD_HERMES is not set | ||
| 636 | # CONFIG_NORTEL_HERMES is not set | ||
| 637 | # CONFIG_PCI_HERMES is not set | ||
| 526 | # CONFIG_ATMEL is not set | 638 | # CONFIG_ATMEL is not set |
| 527 | 639 | ||
| 528 | # | 640 | # |
| 641 | # Wireless 802.11b Pcmcia/Cardbus cards support | ||
| 642 | # | ||
| 643 | CONFIG_PCMCIA_HERMES=y | ||
| 644 | CONFIG_PCMCIA_SPECTRUM=y | ||
| 645 | # CONFIG_AIRO_CS is not set | ||
| 646 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 647 | |||
| 648 | # | ||
| 529 | # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support | 649 | # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support |
| 530 | # | 650 | # |
| 531 | # CONFIG_PRISM54 is not set | 651 | # CONFIG_PRISM54 is not set |
| @@ -533,13 +653,34 @@ CONFIG_NET_RADIO=y | |||
| 533 | CONFIG_NET_WIRELESS=y | 653 | CONFIG_NET_WIRELESS=y |
| 534 | 654 | ||
| 535 | # | 655 | # |
| 656 | # PCMCIA network device support | ||
| 657 | # | ||
| 658 | CONFIG_NET_PCMCIA=y | ||
| 659 | # CONFIG_PCMCIA_3C589 is not set | ||
| 660 | # CONFIG_PCMCIA_3C574 is not set | ||
| 661 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
| 662 | # CONFIG_PCMCIA_PCNET is not set | ||
| 663 | # CONFIG_PCMCIA_NMCLAN is not set | ||
| 664 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
| 665 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
| 666 | # CONFIG_PCMCIA_AXNET is not set | ||
| 667 | |||
| 668 | # | ||
| 536 | # Wan interfaces | 669 | # Wan interfaces |
| 537 | # | 670 | # |
| 538 | # CONFIG_WAN is not set | 671 | # CONFIG_WAN is not set |
| 539 | # CONFIG_FDDI is not set | 672 | # CONFIG_FDDI is not set |
| 540 | # CONFIG_HIPPI is not set | 673 | # CONFIG_HIPPI is not set |
| 541 | # CONFIG_PLIP is not set | 674 | # CONFIG_PLIP is not set |
| 542 | # CONFIG_PPP is not set | 675 | CONFIG_PPP=m |
| 676 | # CONFIG_PPP_MULTILINK is not set | ||
| 677 | # CONFIG_PPP_FILTER is not set | ||
| 678 | CONFIG_PPP_ASYNC=m | ||
| 679 | CONFIG_PPP_SYNC_TTY=m | ||
| 680 | CONFIG_PPP_DEFLATE=m | ||
| 681 | CONFIG_PPP_BSDCOMP=m | ||
| 682 | # CONFIG_PPP_MPPE is not set | ||
| 683 | CONFIG_PPPOE=m | ||
| 543 | # CONFIG_SLIP is not set | 684 | # CONFIG_SLIP is not set |
| 544 | # CONFIG_NET_FC is not set | 685 | # CONFIG_NET_FC is not set |
| 545 | # CONFIG_SHAPER is not set | 686 | # CONFIG_SHAPER is not set |
| @@ -571,14 +712,16 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | |||
| 571 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 712 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 572 | # CONFIG_INPUT_JOYDEV is not set | 713 | # CONFIG_INPUT_JOYDEV is not set |
| 573 | # CONFIG_INPUT_TSDEV is not set | 714 | # CONFIG_INPUT_TSDEV is not set |
| 574 | CONFIG_INPUT_EVDEV=y | 715 | # CONFIG_INPUT_EVDEV is not set |
| 575 | # CONFIG_INPUT_EVBUG is not set | 716 | # CONFIG_INPUT_EVBUG is not set |
| 576 | 717 | ||
| 577 | # | 718 | # |
| 578 | # Input Device Drivers | 719 | # Input Device Drivers |
| 579 | # | 720 | # |
| 580 | CONFIG_INPUT_KEYBOARD=y | 721 | CONFIG_INPUT_KEYBOARD=y |
| 581 | # CONFIG_KEYBOARD_ATKBD is not set | 722 | CONFIG_KEYBOARD_ATKBD=y |
| 723 | CONFIG_KEYBOARD_ATKBD_HP_KEYCODES=y | ||
| 724 | # CONFIG_KEYBOARD_ATKBD_RDI_KEYCODES is not set | ||
| 582 | # CONFIG_KEYBOARD_SUNKBD is not set | 725 | # CONFIG_KEYBOARD_SUNKBD is not set |
| 583 | # CONFIG_KEYBOARD_LKKBD is not set | 726 | # CONFIG_KEYBOARD_LKKBD is not set |
| 584 | # CONFIG_KEYBOARD_XTKBD is not set | 727 | # CONFIG_KEYBOARD_XTKBD is not set |
| @@ -586,52 +729,25 @@ CONFIG_INPUT_KEYBOARD=y | |||
| 586 | # CONFIG_KEYBOARD_HIL_OLD is not set | 729 | # CONFIG_KEYBOARD_HIL_OLD is not set |
| 587 | CONFIG_KEYBOARD_HIL=y | 730 | CONFIG_KEYBOARD_HIL=y |
| 588 | CONFIG_INPUT_MOUSE=y | 731 | CONFIG_INPUT_MOUSE=y |
| 589 | # CONFIG_MOUSE_PS2 is not set | 732 | CONFIG_MOUSE_PS2=y |
| 590 | # CONFIG_MOUSE_SERIAL is not set | 733 | CONFIG_MOUSE_SERIAL=y |
| 591 | # CONFIG_MOUSE_VSXXXAA is not set | 734 | # CONFIG_MOUSE_VSXXXAA is not set |
| 592 | CONFIG_MOUSE_HIL=y | 735 | CONFIG_MOUSE_HIL=y |
| 593 | CONFIG_INPUT_JOYSTICK=y | 736 | # CONFIG_INPUT_JOYSTICK is not set |
| 594 | # CONFIG_JOYSTICK_ANALOG is not set | 737 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 595 | # CONFIG_JOYSTICK_A3D is not set | 738 | # CONFIG_INPUT_MISC is not set |
| 596 | # CONFIG_JOYSTICK_ADI is not set | ||
| 597 | # CONFIG_JOYSTICK_COBRA is not set | ||
| 598 | # CONFIG_JOYSTICK_GF2K is not set | ||
| 599 | # CONFIG_JOYSTICK_GRIP is not set | ||
| 600 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
| 601 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
| 602 | # CONFIG_JOYSTICK_INTERACT is not set | ||
| 603 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
| 604 | # CONFIG_JOYSTICK_TMDC is not set | ||
| 605 | # CONFIG_JOYSTICK_IFORCE is not set | ||
| 606 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
| 607 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
| 608 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
| 609 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
| 610 | # CONFIG_JOYSTICK_STINGER is not set | ||
| 611 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
| 612 | # CONFIG_JOYSTICK_DB9 is not set | ||
| 613 | # CONFIG_JOYSTICK_GAMECON is not set | ||
| 614 | # CONFIG_JOYSTICK_TURBOGRAFX is not set | ||
| 615 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
| 616 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 617 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 618 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 619 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 620 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 621 | CONFIG_INPUT_MISC=y | ||
| 622 | # CONFIG_INPUT_UINPUT is not set | ||
| 623 | CONFIG_HP_SDC_RTC=y | ||
| 624 | 739 | ||
| 625 | # | 740 | # |
| 626 | # Hardware I/O ports | 741 | # Hardware I/O ports |
| 627 | # | 742 | # |
| 628 | CONFIG_SERIO=y | 743 | CONFIG_SERIO=y |
| 629 | # CONFIG_SERIO_SERPORT is not set | 744 | CONFIG_SERIO_SERPORT=y |
| 630 | # CONFIG_SERIO_PARKBD is not set | 745 | # CONFIG_SERIO_PARKBD is not set |
| 631 | CONFIG_SERIO_GSCPS2=y | 746 | CONFIG_SERIO_GSCPS2=y |
| 632 | CONFIG_HP_SDC=y | 747 | CONFIG_HP_SDC=y |
| 633 | CONFIG_HIL_MLC=y | 748 | CONFIG_HIL_MLC=y |
| 634 | # CONFIG_SERIO_PCIPS2 is not set | 749 | # CONFIG_SERIO_PCIPS2 is not set |
| 750 | CONFIG_SERIO_LIBPS2=y | ||
| 635 | # CONFIG_SERIO_RAW is not set | 751 | # CONFIG_SERIO_RAW is not set |
| 636 | # CONFIG_GAMEPORT is not set | 752 | # CONFIG_GAMEPORT is not set |
| 637 | 753 | ||
| @@ -648,7 +764,8 @@ CONFIG_HW_CONSOLE=y | |||
| 648 | # | 764 | # |
| 649 | CONFIG_SERIAL_8250=y | 765 | CONFIG_SERIAL_8250=y |
| 650 | CONFIG_SERIAL_8250_CONSOLE=y | 766 | CONFIG_SERIAL_8250_CONSOLE=y |
| 651 | CONFIG_SERIAL_8250_NR_UARTS=13 | 767 | CONFIG_SERIAL_8250_CS=y |
| 768 | CONFIG_SERIAL_8250_NR_UARTS=17 | ||
| 652 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 769 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 653 | CONFIG_SERIAL_8250_EXTENDED=y | 770 | CONFIG_SERIAL_8250_EXTENDED=y |
| 654 | CONFIG_SERIAL_8250_MANY_PORTS=y | 771 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| @@ -666,10 +783,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 666 | # CONFIG_SERIAL_JSM is not set | 783 | # CONFIG_SERIAL_JSM is not set |
| 667 | CONFIG_UNIX98_PTYS=y | 784 | CONFIG_UNIX98_PTYS=y |
| 668 | CONFIG_LEGACY_PTYS=y | 785 | CONFIG_LEGACY_PTYS=y |
| 669 | CONFIG_LEGACY_PTY_COUNT=256 | 786 | CONFIG_LEGACY_PTY_COUNT=64 |
| 670 | CONFIG_PRINTER=y | 787 | CONFIG_PRINTER=m |
| 671 | # CONFIG_LP_CONSOLE is not set | 788 | # CONFIG_LP_CONSOLE is not set |
| 672 | # CONFIG_PPDEV is not set | 789 | CONFIG_PPDEV=m |
| 673 | # CONFIG_TIPAR is not set | 790 | # CONFIG_TIPAR is not set |
| 674 | 791 | ||
| 675 | # | 792 | # |
| @@ -682,7 +799,7 @@ CONFIG_PRINTER=y | |||
| 682 | # | 799 | # |
| 683 | # CONFIG_WATCHDOG is not set | 800 | # CONFIG_WATCHDOG is not set |
| 684 | CONFIG_GEN_RTC=y | 801 | CONFIG_GEN_RTC=y |
| 685 | # CONFIG_GEN_RTC_X is not set | 802 | CONFIG_GEN_RTC_X=y |
| 686 | # CONFIG_DTLK is not set | 803 | # CONFIG_DTLK is not set |
| 687 | # CONFIG_R3964 is not set | 804 | # CONFIG_R3964 is not set |
| 688 | # CONFIG_APPLICOM is not set | 805 | # CONFIG_APPLICOM is not set |
| @@ -691,6 +808,13 @@ CONFIG_GEN_RTC=y | |||
| 691 | # Ftape, the floppy tape device driver | 808 | # Ftape, the floppy tape device driver |
| 692 | # | 809 | # |
| 693 | # CONFIG_DRM is not set | 810 | # CONFIG_DRM is not set |
| 811 | |||
| 812 | # | ||
| 813 | # PCMCIA character devices | ||
| 814 | # | ||
| 815 | # CONFIG_SYNCLINK_CS is not set | ||
| 816 | # CONFIG_CARDMAN_4000 is not set | ||
| 817 | # CONFIG_CARDMAN_4040 is not set | ||
| 694 | # CONFIG_RAW_DRIVER is not set | 818 | # CONFIG_RAW_DRIVER is not set |
| 695 | 819 | ||
| 696 | # | 820 | # |
| @@ -718,10 +842,8 @@ CONFIG_GEN_RTC=y | |||
| 718 | # | 842 | # |
| 719 | # Hardware Monitoring support | 843 | # Hardware Monitoring support |
| 720 | # | 844 | # |
| 721 | CONFIG_HWMON=y | 845 | # CONFIG_HWMON is not set |
| 722 | # CONFIG_HWMON_VID is not set | 846 | # CONFIG_HWMON_VID is not set |
| 723 | # CONFIG_SENSORS_F71805F is not set | ||
| 724 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 725 | 847 | ||
| 726 | # | 848 | # |
| 727 | # Misc devices | 849 | # Misc devices |
| @@ -749,8 +871,8 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 749 | CONFIG_FB_CFB_COPYAREA=y | 871 | CONFIG_FB_CFB_COPYAREA=y |
| 750 | CONFIG_FB_CFB_IMAGEBLIT=y | 872 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 751 | # CONFIG_FB_MACMODES is not set | 873 | # CONFIG_FB_MACMODES is not set |
| 752 | # CONFIG_FB_MODE_HELPERS is not set | 874 | CONFIG_FB_MODE_HELPERS=y |
| 753 | # CONFIG_FB_TILEBLITTING is not set | 875 | CONFIG_FB_TILEBLITTING=y |
| 754 | # CONFIG_FB_CIRRUS is not set | 876 | # CONFIG_FB_CIRRUS is not set |
| 755 | # CONFIG_FB_PM2 is not set | 877 | # CONFIG_FB_PM2 is not set |
| 756 | # CONFIG_FB_CYBER2000 is not set | 878 | # CONFIG_FB_CYBER2000 is not set |
| @@ -778,8 +900,8 @@ CONFIG_FB_STI=y | |||
| 778 | # Console display driver support | 900 | # Console display driver support |
| 779 | # | 901 | # |
| 780 | CONFIG_DUMMY_CONSOLE=y | 902 | CONFIG_DUMMY_CONSOLE=y |
| 781 | CONFIG_DUMMY_CONSOLE_COLUMNS=160 | 903 | CONFIG_DUMMY_CONSOLE_COLUMNS=128 |
| 782 | CONFIG_DUMMY_CONSOLE_ROWS=64 | 904 | CONFIG_DUMMY_CONSOLE_ROWS=48 |
| 783 | CONFIG_FRAMEBUFFER_CONSOLE=y | 905 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 784 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 906 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 785 | CONFIG_STI_CONSOLE=y | 907 | CONFIG_STI_CONSOLE=y |
| @@ -816,13 +938,14 @@ CONFIG_SOUND=y | |||
| 816 | CONFIG_SND=y | 938 | CONFIG_SND=y |
| 817 | CONFIG_SND_TIMER=y | 939 | CONFIG_SND_TIMER=y |
| 818 | CONFIG_SND_PCM=y | 940 | CONFIG_SND_PCM=y |
| 941 | CONFIG_SND_HWDEP=y | ||
| 819 | CONFIG_SND_SEQUENCER=y | 942 | CONFIG_SND_SEQUENCER=y |
| 820 | # CONFIG_SND_SEQ_DUMMY is not set | 943 | # CONFIG_SND_SEQ_DUMMY is not set |
| 821 | CONFIG_SND_OSSEMUL=y | 944 | CONFIG_SND_OSSEMUL=y |
| 822 | CONFIG_SND_MIXER_OSS=y | 945 | CONFIG_SND_MIXER_OSS=y |
| 823 | CONFIG_SND_PCM_OSS=y | 946 | CONFIG_SND_PCM_OSS=y |
| 824 | CONFIG_SND_SEQUENCER_OSS=y | 947 | CONFIG_SND_SEQUENCER_OSS=y |
| 825 | # CONFIG_SND_DYNAMIC_MINORS is not set | 948 | CONFIG_SND_DYNAMIC_MINORS=y |
| 826 | CONFIG_SND_SUPPORT_OLD_API=y | 949 | CONFIG_SND_SUPPORT_OLD_API=y |
| 827 | # CONFIG_SND_VERBOSE_PRINTK is not set | 950 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 828 | # CONFIG_SND_DEBUG is not set | 951 | # CONFIG_SND_DEBUG is not set |
| @@ -830,6 +953,7 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 830 | # | 953 | # |
| 831 | # Generic devices | 954 | # Generic devices |
| 832 | # | 955 | # |
| 956 | CONFIG_SND_OPL3_LIB=y | ||
| 833 | CONFIG_SND_AC97_CODEC=y | 957 | CONFIG_SND_AC97_CODEC=y |
| 834 | CONFIG_SND_AC97_BUS=y | 958 | CONFIG_SND_AC97_BUS=y |
| 835 | # CONFIG_SND_DUMMY is not set | 959 | # CONFIG_SND_DUMMY is not set |
| @@ -842,7 +966,7 @@ CONFIG_SND_AC97_BUS=y | |||
| 842 | # PCI devices | 966 | # PCI devices |
| 843 | # | 967 | # |
| 844 | CONFIG_SND_AD1889=y | 968 | CONFIG_SND_AD1889=y |
| 845 | # CONFIG_SND_AD1889_OPL3 is not set | 969 | CONFIG_SND_AD1889_OPL3=y |
| 846 | # CONFIG_SND_ALI5451 is not set | 970 | # CONFIG_SND_ALI5451 is not set |
| 847 | # CONFIG_SND_ATIIXP is not set | 971 | # CONFIG_SND_ATIIXP is not set |
| 848 | # CONFIG_SND_ATIIXP_MODEM is not set | 972 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -890,6 +1014,10 @@ CONFIG_SND_AD1889=y | |||
| 890 | # CONFIG_SND_USB_AUDIO is not set | 1014 | # CONFIG_SND_USB_AUDIO is not set |
| 891 | 1015 | ||
| 892 | # | 1016 | # |
| 1017 | # PCMCIA devices | ||
| 1018 | # | ||
| 1019 | |||
| 1020 | # | ||
| 893 | # GSC devices | 1021 | # GSC devices |
| 894 | # | 1022 | # |
| 895 | CONFIG_SND_HARMONY=y | 1023 | CONFIG_SND_HARMONY=y |
| @@ -905,12 +1033,12 @@ CONFIG_SND_HARMONY=y | |||
| 905 | CONFIG_USB_ARCH_HAS_HCD=y | 1033 | CONFIG_USB_ARCH_HAS_HCD=y |
| 906 | CONFIG_USB_ARCH_HAS_OHCI=y | 1034 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 907 | CONFIG_USB=y | 1035 | CONFIG_USB=y |
| 908 | CONFIG_USB_DEBUG=y | 1036 | # CONFIG_USB_DEBUG is not set |
| 909 | 1037 | ||
| 910 | # | 1038 | # |
| 911 | # Miscellaneous USB options | 1039 | # Miscellaneous USB options |
| 912 | # | 1040 | # |
| 913 | # CONFIG_USB_DEVICEFS is not set | 1041 | CONFIG_USB_DEVICEFS=y |
| 914 | # CONFIG_USB_BANDWIDTH is not set | 1042 | # CONFIG_USB_BANDWIDTH is not set |
| 915 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1043 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 916 | # CONFIG_USB_OTG is not set | 1044 | # CONFIG_USB_OTG is not set |
| @@ -918,14 +1046,12 @@ CONFIG_USB_DEBUG=y | |||
| 918 | # | 1046 | # |
| 919 | # USB Host Controller Drivers | 1047 | # USB Host Controller Drivers |
| 920 | # | 1048 | # |
| 921 | CONFIG_USB_EHCI_HCD=y | 1049 | # CONFIG_USB_EHCI_HCD is not set |
| 922 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 923 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
| 924 | # CONFIG_USB_ISP116X_HCD is not set | 1050 | # CONFIG_USB_ISP116X_HCD is not set |
| 925 | CONFIG_USB_OHCI_HCD=y | 1051 | CONFIG_USB_OHCI_HCD=y |
| 926 | # CONFIG_USB_OHCI_BIG_ENDIAN is not set | 1052 | # CONFIG_USB_OHCI_BIG_ENDIAN is not set |
| 927 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1053 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 928 | # CONFIG_USB_UHCI_HCD is not set | 1054 | CONFIG_USB_UHCI_HCD=y |
| 929 | # CONFIG_USB_SL811_HCD is not set | 1055 | # CONFIG_USB_SL811_HCD is not set |
| 930 | 1056 | ||
| 931 | # | 1057 | # |
| @@ -948,13 +1074,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 948 | # | 1074 | # |
| 949 | # USB Input Devices | 1075 | # USB Input Devices |
| 950 | # | 1076 | # |
| 951 | # CONFIG_USB_HID is not set | 1077 | CONFIG_USB_HID=y |
| 952 | 1078 | CONFIG_USB_HIDINPUT=y | |
| 953 | # | 1079 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 954 | # USB HID Boot Protocol drivers | 1080 | # CONFIG_HID_FF is not set |
| 955 | # | 1081 | # CONFIG_USB_HIDDEV is not set |
| 956 | # CONFIG_USB_KBD is not set | ||
| 957 | # CONFIG_USB_MOUSE is not set | ||
| 958 | # CONFIG_USB_AIPTEK is not set | 1082 | # CONFIG_USB_AIPTEK is not set |
| 959 | # CONFIG_USB_WACOM is not set | 1083 | # CONFIG_USB_WACOM is not set |
| 960 | # CONFIG_USB_ACECAD is not set | 1084 | # CONFIG_USB_ACECAD is not set |
| @@ -1020,8 +1144,8 @@ CONFIG_USB_MON=y | |||
| 1020 | # CONFIG_USB_PHIDGETKIT is not set | 1144 | # CONFIG_USB_PHIDGETKIT is not set |
| 1021 | # CONFIG_USB_PHIDGETSERVO is not set | 1145 | # CONFIG_USB_PHIDGETSERVO is not set |
| 1022 | # CONFIG_USB_IDMOUSE is not set | 1146 | # CONFIG_USB_IDMOUSE is not set |
| 1023 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1024 | # CONFIG_USB_LD is not set | 1147 | # CONFIG_USB_LD is not set |
| 1148 | # CONFIG_USB_TEST is not set | ||
| 1025 | 1149 | ||
| 1026 | # | 1150 | # |
| 1027 | # USB DSL modem support | 1151 | # USB DSL modem support |
| @@ -1058,7 +1182,7 @@ CONFIG_JBD=y | |||
| 1058 | # CONFIG_JBD_DEBUG is not set | 1182 | # CONFIG_JBD_DEBUG is not set |
| 1059 | # CONFIG_REISERFS_FS is not set | 1183 | # CONFIG_REISERFS_FS is not set |
| 1060 | # CONFIG_JFS_FS is not set | 1184 | # CONFIG_JFS_FS is not set |
| 1061 | # CONFIG_FS_POSIX_ACL is not set | 1185 | CONFIG_FS_POSIX_ACL=y |
| 1062 | # CONFIG_XFS_FS is not set | 1186 | # CONFIG_XFS_FS is not set |
| 1063 | # CONFIG_OCFS2_FS is not set | 1187 | # CONFIG_OCFS2_FS is not set |
| 1064 | # CONFIG_MINIX_FS is not set | 1188 | # CONFIG_MINIX_FS is not set |
| @@ -1066,7 +1190,7 @@ CONFIG_JBD=y | |||
| 1066 | CONFIG_INOTIFY=y | 1190 | CONFIG_INOTIFY=y |
| 1067 | # CONFIG_QUOTA is not set | 1191 | # CONFIG_QUOTA is not set |
| 1068 | CONFIG_DNOTIFY=y | 1192 | CONFIG_DNOTIFY=y |
| 1069 | # CONFIG_AUTOFS_FS is not set | 1193 | CONFIG_AUTOFS_FS=y |
| 1070 | # CONFIG_AUTOFS4_FS is not set | 1194 | # CONFIG_AUTOFS4_FS is not set |
| 1071 | # CONFIG_FUSE_FS is not set | 1195 | # CONFIG_FUSE_FS is not set |
| 1072 | 1196 | ||
| @@ -1081,8 +1205,11 @@ CONFIG_JOLIET=y | |||
| 1081 | # | 1205 | # |
| 1082 | # DOS/FAT/NT Filesystems | 1206 | # DOS/FAT/NT Filesystems |
| 1083 | # | 1207 | # |
| 1208 | CONFIG_FAT_FS=y | ||
| 1084 | # CONFIG_MSDOS_FS is not set | 1209 | # CONFIG_MSDOS_FS is not set |
| 1085 | # CONFIG_VFAT_FS is not set | 1210 | CONFIG_VFAT_FS=y |
| 1211 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1212 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1086 | # CONFIG_NTFS_FS is not set | 1213 | # CONFIG_NTFS_FS is not set |
| 1087 | 1214 | ||
| 1088 | # | 1215 | # |
| @@ -1125,7 +1252,7 @@ CONFIG_NFS_V3=y | |||
| 1125 | CONFIG_NFSD=y | 1252 | CONFIG_NFSD=y |
| 1126 | CONFIG_NFSD_V3=y | 1253 | CONFIG_NFSD_V3=y |
| 1127 | # CONFIG_NFSD_V3_ACL is not set | 1254 | # CONFIG_NFSD_V3_ACL is not set |
| 1128 | # CONFIG_NFSD_V4 is not set | 1255 | CONFIG_NFSD_V4=y |
| 1129 | CONFIG_NFSD_TCP=y | 1256 | CONFIG_NFSD_TCP=y |
| 1130 | CONFIG_ROOT_NFS=y | 1257 | CONFIG_ROOT_NFS=y |
| 1131 | CONFIG_LOCKD=y | 1258 | CONFIG_LOCKD=y |
| @@ -1133,10 +1260,16 @@ CONFIG_LOCKD_V4=y | |||
| 1133 | CONFIG_EXPORTFS=y | 1260 | CONFIG_EXPORTFS=y |
| 1134 | CONFIG_NFS_COMMON=y | 1261 | CONFIG_NFS_COMMON=y |
| 1135 | CONFIG_SUNRPC=y | 1262 | CONFIG_SUNRPC=y |
| 1136 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1263 | CONFIG_SUNRPC_GSS=y |
| 1137 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1264 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1138 | # CONFIG_SMB_FS is not set | 1265 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 1139 | # CONFIG_CIFS is not set | 1266 | CONFIG_SMB_FS=m |
| 1267 | CONFIG_SMB_NLS_DEFAULT=y | ||
| 1268 | CONFIG_SMB_NLS_REMOTE="cp437" | ||
| 1269 | CONFIG_CIFS=m | ||
| 1270 | # CONFIG_CIFS_STATS is not set | ||
| 1271 | # CONFIG_CIFS_XATTR is not set | ||
| 1272 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
| 1140 | # CONFIG_NCP_FS is not set | 1273 | # CONFIG_NCP_FS is not set |
| 1141 | # CONFIG_CODA_FS is not set | 1274 | # CONFIG_CODA_FS is not set |
| 1142 | # CONFIG_AFS_FS is not set | 1275 | # CONFIG_AFS_FS is not set |
| @@ -1153,50 +1286,50 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1153 | # | 1286 | # |
| 1154 | CONFIG_NLS=y | 1287 | CONFIG_NLS=y |
| 1155 | CONFIG_NLS_DEFAULT="iso8859-1" | 1288 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1156 | # CONFIG_NLS_CODEPAGE_437 is not set | 1289 | CONFIG_NLS_CODEPAGE_437=y |
| 1157 | # CONFIG_NLS_CODEPAGE_737 is not set | 1290 | CONFIG_NLS_CODEPAGE_737=m |
| 1158 | # CONFIG_NLS_CODEPAGE_775 is not set | 1291 | CONFIG_NLS_CODEPAGE_775=m |
| 1159 | # CONFIG_NLS_CODEPAGE_850 is not set | 1292 | CONFIG_NLS_CODEPAGE_850=m |
| 1160 | # CONFIG_NLS_CODEPAGE_852 is not set | 1293 | CONFIG_NLS_CODEPAGE_852=m |
| 1161 | # CONFIG_NLS_CODEPAGE_855 is not set | 1294 | CONFIG_NLS_CODEPAGE_855=m |
| 1162 | # CONFIG_NLS_CODEPAGE_857 is not set | 1295 | CONFIG_NLS_CODEPAGE_857=m |
| 1163 | # CONFIG_NLS_CODEPAGE_860 is not set | 1296 | CONFIG_NLS_CODEPAGE_860=m |
| 1164 | # CONFIG_NLS_CODEPAGE_861 is not set | 1297 | CONFIG_NLS_CODEPAGE_861=m |
| 1165 | # CONFIG_NLS_CODEPAGE_862 is not set | 1298 | CONFIG_NLS_CODEPAGE_862=m |
| 1166 | # CONFIG_NLS_CODEPAGE_863 is not set | 1299 | CONFIG_NLS_CODEPAGE_863=m |
| 1167 | # CONFIG_NLS_CODEPAGE_864 is not set | 1300 | CONFIG_NLS_CODEPAGE_864=m |
| 1168 | # CONFIG_NLS_CODEPAGE_865 is not set | 1301 | CONFIG_NLS_CODEPAGE_865=m |
| 1169 | # CONFIG_NLS_CODEPAGE_866 is not set | 1302 | CONFIG_NLS_CODEPAGE_866=m |
| 1170 | # CONFIG_NLS_CODEPAGE_869 is not set | 1303 | CONFIG_NLS_CODEPAGE_869=m |
| 1171 | # CONFIG_NLS_CODEPAGE_936 is not set | 1304 | CONFIG_NLS_CODEPAGE_936=m |
| 1172 | # CONFIG_NLS_CODEPAGE_950 is not set | 1305 | CONFIG_NLS_CODEPAGE_950=m |
| 1173 | # CONFIG_NLS_CODEPAGE_932 is not set | 1306 | CONFIG_NLS_CODEPAGE_932=m |
| 1174 | # CONFIG_NLS_CODEPAGE_949 is not set | 1307 | CONFIG_NLS_CODEPAGE_949=m |
| 1175 | # CONFIG_NLS_CODEPAGE_874 is not set | 1308 | CONFIG_NLS_CODEPAGE_874=m |
| 1176 | # CONFIG_NLS_ISO8859_8 is not set | 1309 | CONFIG_NLS_ISO8859_8=m |
| 1177 | # CONFIG_NLS_CODEPAGE_1250 is not set | 1310 | CONFIG_NLS_CODEPAGE_1250=y |
| 1178 | # CONFIG_NLS_CODEPAGE_1251 is not set | 1311 | CONFIG_NLS_CODEPAGE_1251=m |
| 1179 | # CONFIG_NLS_ASCII is not set | 1312 | CONFIG_NLS_ASCII=m |
| 1180 | # CONFIG_NLS_ISO8859_1 is not set | 1313 | CONFIG_NLS_ISO8859_1=y |
| 1181 | # CONFIG_NLS_ISO8859_2 is not set | 1314 | CONFIG_NLS_ISO8859_2=m |
| 1182 | # CONFIG_NLS_ISO8859_3 is not set | 1315 | CONFIG_NLS_ISO8859_3=m |
| 1183 | # CONFIG_NLS_ISO8859_4 is not set | 1316 | CONFIG_NLS_ISO8859_4=m |
| 1184 | # CONFIG_NLS_ISO8859_5 is not set | 1317 | CONFIG_NLS_ISO8859_5=m |
| 1185 | # CONFIG_NLS_ISO8859_6 is not set | 1318 | CONFIG_NLS_ISO8859_6=m |
| 1186 | # CONFIG_NLS_ISO8859_7 is not set | 1319 | CONFIG_NLS_ISO8859_7=m |
| 1187 | # CONFIG_NLS_ISO8859_9 is not set | 1320 | CONFIG_NLS_ISO8859_9=m |
| 1188 | # CONFIG_NLS_ISO8859_13 is not set | 1321 | CONFIG_NLS_ISO8859_13=m |
| 1189 | # CONFIG_NLS_ISO8859_14 is not set | 1322 | CONFIG_NLS_ISO8859_14=m |
| 1190 | # CONFIG_NLS_ISO8859_15 is not set | 1323 | CONFIG_NLS_ISO8859_15=m |
| 1191 | # CONFIG_NLS_KOI8_R is not set | 1324 | CONFIG_NLS_KOI8_R=m |
| 1192 | # CONFIG_NLS_KOI8_U is not set | 1325 | CONFIG_NLS_KOI8_U=m |
| 1193 | # CONFIG_NLS_UTF8 is not set | 1326 | CONFIG_NLS_UTF8=y |
| 1194 | 1327 | ||
| 1195 | # | 1328 | # |
| 1196 | # Profiling support | 1329 | # Profiling support |
| 1197 | # | 1330 | # |
| 1198 | CONFIG_PROFILING=y | 1331 | CONFIG_PROFILING=y |
| 1199 | CONFIG_OPROFILE=y | 1332 | CONFIG_OPROFILE=m |
| 1200 | 1333 | ||
| 1201 | # | 1334 | # |
| 1202 | # Kernel hacking | 1335 | # Kernel hacking |
| @@ -1204,7 +1337,7 @@ CONFIG_OPROFILE=y | |||
| 1204 | # CONFIG_PRINTK_TIME is not set | 1337 | # CONFIG_PRINTK_TIME is not set |
| 1205 | CONFIG_MAGIC_SYSRQ=y | 1338 | CONFIG_MAGIC_SYSRQ=y |
| 1206 | CONFIG_DEBUG_KERNEL=y | 1339 | CONFIG_DEBUG_KERNEL=y |
| 1207 | CONFIG_LOG_BUF_SHIFT=15 | 1340 | CONFIG_LOG_BUF_SHIFT=16 |
| 1208 | CONFIG_DETECT_SOFTLOCKUP=y | 1341 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1209 | # CONFIG_SCHEDSTATS is not set | 1342 | # CONFIG_SCHEDSTATS is not set |
| 1210 | # CONFIG_DEBUG_SLAB is not set | 1343 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1217,42 +1350,43 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 1217 | # CONFIG_DEBUG_VM is not set | 1350 | # CONFIG_DEBUG_VM is not set |
| 1218 | CONFIG_FORCED_INLINING=y | 1351 | CONFIG_FORCED_INLINING=y |
| 1219 | # CONFIG_RCU_TORTURE_TEST is not set | 1352 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1220 | CONFIG_DEBUG_RODATA=y | 1353 | # CONFIG_DEBUG_RODATA is not set |
| 1221 | 1354 | ||
| 1222 | # | 1355 | # |
| 1223 | # Security options | 1356 | # Security options |
| 1224 | # | 1357 | # |
| 1225 | # CONFIG_KEYS is not set | 1358 | CONFIG_KEYS=y |
| 1359 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
| 1226 | # CONFIG_SECURITY is not set | 1360 | # CONFIG_SECURITY is not set |
| 1227 | 1361 | ||
| 1228 | # | 1362 | # |
| 1229 | # Cryptographic options | 1363 | # Cryptographic options |
| 1230 | # | 1364 | # |
| 1231 | CONFIG_CRYPTO=y | 1365 | CONFIG_CRYPTO=y |
| 1232 | # CONFIG_CRYPTO_HMAC is not set | 1366 | CONFIG_CRYPTO_HMAC=y |
| 1233 | # CONFIG_CRYPTO_NULL is not set | 1367 | CONFIG_CRYPTO_NULL=m |
| 1234 | # CONFIG_CRYPTO_MD4 is not set | 1368 | CONFIG_CRYPTO_MD4=m |
| 1235 | # CONFIG_CRYPTO_MD5 is not set | 1369 | CONFIG_CRYPTO_MD5=y |
| 1236 | # CONFIG_CRYPTO_SHA1 is not set | 1370 | CONFIG_CRYPTO_SHA1=y |
| 1237 | # CONFIG_CRYPTO_SHA256 is not set | 1371 | CONFIG_CRYPTO_SHA256=m |
| 1238 | # CONFIG_CRYPTO_SHA512 is not set | 1372 | CONFIG_CRYPTO_SHA512=m |
| 1239 | # CONFIG_CRYPTO_WP512 is not set | 1373 | CONFIG_CRYPTO_WP512=m |
| 1240 | # CONFIG_CRYPTO_TGR192 is not set | 1374 | CONFIG_CRYPTO_TGR192=m |
| 1241 | # CONFIG_CRYPTO_DES is not set | 1375 | CONFIG_CRYPTO_DES=y |
| 1242 | # CONFIG_CRYPTO_BLOWFISH is not set | 1376 | CONFIG_CRYPTO_BLOWFISH=m |
| 1243 | # CONFIG_CRYPTO_TWOFISH is not set | 1377 | CONFIG_CRYPTO_TWOFISH=m |
| 1244 | # CONFIG_CRYPTO_SERPENT is not set | 1378 | CONFIG_CRYPTO_SERPENT=m |
| 1245 | # CONFIG_CRYPTO_AES is not set | 1379 | CONFIG_CRYPTO_AES=m |
| 1246 | # CONFIG_CRYPTO_CAST5 is not set | 1380 | CONFIG_CRYPTO_CAST5=m |
| 1247 | # CONFIG_CRYPTO_CAST6 is not set | 1381 | CONFIG_CRYPTO_CAST6=m |
| 1248 | # CONFIG_CRYPTO_TEA is not set | 1382 | CONFIG_CRYPTO_TEA=m |
| 1249 | # CONFIG_CRYPTO_ARC4 is not set | 1383 | CONFIG_CRYPTO_ARC4=m |
| 1250 | # CONFIG_CRYPTO_KHAZAD is not set | 1384 | CONFIG_CRYPTO_KHAZAD=m |
| 1251 | # CONFIG_CRYPTO_ANUBIS is not set | 1385 | CONFIG_CRYPTO_ANUBIS=m |
| 1252 | # CONFIG_CRYPTO_DEFLATE is not set | 1386 | CONFIG_CRYPTO_DEFLATE=y |
| 1253 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1387 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1254 | # CONFIG_CRYPTO_CRC32C is not set | 1388 | CONFIG_CRYPTO_CRC32C=m |
| 1255 | # CONFIG_CRYPTO_TEST is not set | 1389 | CONFIG_CRYPTO_TEST=m |
| 1256 | 1390 | ||
| 1257 | # | 1391 | # |
| 1258 | # Hardware crypto devices | 1392 | # Hardware crypto devices |
| @@ -1261,7 +1395,9 @@ CONFIG_CRYPTO=y | |||
| 1261 | # | 1395 | # |
| 1262 | # Library routines | 1396 | # Library routines |
| 1263 | # | 1397 | # |
| 1264 | # CONFIG_CRC_CCITT is not set | 1398 | CONFIG_CRC_CCITT=m |
| 1265 | # CONFIG_CRC16 is not set | 1399 | # CONFIG_CRC16 is not set |
| 1266 | CONFIG_CRC32=y | 1400 | CONFIG_CRC32=y |
| 1267 | # CONFIG_LIBCRC32C is not set | 1401 | CONFIG_LIBCRC32C=m |
| 1402 | CONFIG_ZLIB_INFLATE=y | ||
| 1403 | CONFIG_ZLIB_DEFLATE=y | ||
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c index e23c4e1e3a25..c11a5bc7c067 100644 --- a/arch/parisc/kernel/asm-offsets.c +++ b/arch/parisc/kernel/asm-offsets.c | |||
| @@ -288,8 +288,11 @@ int main(void) | |||
| 288 | DEFINE(ASM_PGD_ENTRY_SIZE, PGD_ENTRY_SIZE); | 288 | DEFINE(ASM_PGD_ENTRY_SIZE, PGD_ENTRY_SIZE); |
| 289 | DEFINE(ASM_PMD_ENTRY_SIZE, PMD_ENTRY_SIZE); | 289 | DEFINE(ASM_PMD_ENTRY_SIZE, PMD_ENTRY_SIZE); |
| 290 | DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE); | 290 | DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE); |
| 291 | DEFINE(ASM_PFN_PTE_SHIFT, PFN_PTE_SHIFT); | ||
| 291 | DEFINE(ASM_PT_INITIAL, PT_INITIAL); | 292 | DEFINE(ASM_PT_INITIAL, PT_INITIAL); |
| 292 | DEFINE(ASM_PAGE_SIZE, PAGE_SIZE); | 293 | DEFINE(ASM_PAGE_SIZE, PAGE_SIZE); |
| 294 | DEFINE(ASM_PAGE_SIZE_DIV64, PAGE_SIZE/64); | ||
| 295 | DEFINE(ASM_PAGE_SIZE_DIV128, PAGE_SIZE/128); | ||
| 293 | BLANK(); | 296 | BLANK(); |
| 294 | DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip)); | 297 | DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip)); |
| 295 | DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space)); | 298 | DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space)); |
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 360b7391cb8c..c057ad7605ba 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * License. See the file "COPYING" in the main directory of this archive | 4 | * License. See the file "COPYING" in the main directory of this archive |
| 5 | * for more details. | 5 | * for more details. |
| 6 | * | 6 | * |
| 7 | * Copyright (C) 1999 Helge Deller (07-13-1999) | 7 | * Copyright (C) 1999-2006 Helge Deller <deller@gmx.de> (07-13-1999) |
| 8 | * Copyright (C) 1999 SuSE GmbH Nuernberg | 8 | * Copyright (C) 1999 SuSE GmbH Nuernberg |
| 9 | * Copyright (C) 2000 Philipp Rumpf (prumpf@tux.org) | 9 | * Copyright (C) 2000 Philipp Rumpf (prumpf@tux.org) |
| 10 | * | 10 | * |
| @@ -358,5 +358,5 @@ void parisc_setup_cache_timing(void) | |||
| 358 | if (!parisc_cache_flush_threshold) | 358 | if (!parisc_cache_flush_threshold) |
| 359 | parisc_cache_flush_threshold = FLUSH_THRESHOLD; | 359 | parisc_cache_flush_threshold = FLUSH_THRESHOLD; |
| 360 | 360 | ||
| 361 | printk("Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus()); | 361 | printk(KERN_INFO "Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus()); |
| 362 | } | 362 | } |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 7c95d7663c29..d9e53cf0372b 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
| @@ -502,18 +502,20 @@ | |||
| 502 | * all ILP32 processes and all the kernel for machines with | 502 | * all ILP32 processes and all the kernel for machines with |
| 503 | * under 4GB of memory) */ | 503 | * under 4GB of memory) */ |
| 504 | .macro L3_ptep pgd,pte,index,va,fault | 504 | .macro L3_ptep pgd,pte,index,va,fault |
| 505 | #if PT_NLEVELS == 3 /* we might have a 2-Level scheme, e.g. with 16kb page size */ | ||
| 505 | extrd,u \va,63-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index | 506 | extrd,u \va,63-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index |
| 506 | copy %r0,\pte | 507 | copy %r0,\pte |
| 507 | extrd,u,*= \va,31,32,%r0 | 508 | extrd,u,*= \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0 |
| 508 | ldw,s \index(\pgd),\pgd | 509 | ldw,s \index(\pgd),\pgd |
| 509 | extrd,u,*= \va,31,32,%r0 | 510 | extrd,u,*= \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0 |
| 510 | bb,>=,n \pgd,_PxD_PRESENT_BIT,\fault | 511 | bb,>=,n \pgd,_PxD_PRESENT_BIT,\fault |
| 511 | extrd,u,*= \va,31,32,%r0 | 512 | extrd,u,*= \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0 |
| 512 | shld \pgd,PxD_VALUE_SHIFT,\index | 513 | shld \pgd,PxD_VALUE_SHIFT,\index |
| 513 | extrd,u,*= \va,31,32,%r0 | 514 | extrd,u,*= \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0 |
| 514 | copy \index,\pgd | 515 | copy \index,\pgd |
| 515 | extrd,u,*<> \va,31,32,%r0 | 516 | extrd,u,*<> \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0 |
| 516 | ldo ASM_PGD_PMD_OFFSET(\pgd),\pgd | 517 | ldo ASM_PGD_PMD_OFFSET(\pgd),\pgd |
| 518 | #endif | ||
| 517 | L2_ptep \pgd,\pte,\index,\va,\fault | 519 | L2_ptep \pgd,\pte,\index,\va,\fault |
| 518 | .endm | 520 | .endm |
| 519 | 521 | ||
| @@ -563,10 +565,18 @@ | |||
| 563 | extrd,u,*= \pte,_PAGE_GATEWAY_BIT+32,1,%r0 | 565 | extrd,u,*= \pte,_PAGE_GATEWAY_BIT+32,1,%r0 |
| 564 | depd %r0,11,2,\prot /* If Gateway, Set PL2 to 0 */ | 566 | depd %r0,11,2,\prot /* If Gateway, Set PL2 to 0 */ |
| 565 | 567 | ||
| 566 | /* Get rid of prot bits and convert to page addr for iitlbt and idtlbt */ | 568 | /* Enforce uncacheable pages. |
| 569 | * This should ONLY be use for MMIO on PA 2.0 machines. | ||
| 570 | * Memory/DMA is cache coherent on all PA2.0 machines we support | ||
| 571 | * (that means T-class is NOT supported) and the memory controllers | ||
| 572 | * on most of those machines only handles cache transactions. | ||
| 573 | */ | ||
| 574 | extrd,u,*= \pte,_PAGE_NO_CACHE_BIT+32,1,%r0 | ||
| 575 | depi 1,12,1,\prot | ||
| 567 | 576 | ||
| 568 | depd %r0,63,PAGE_SHIFT,\pte | 577 | /* Drop prot bits and convert to page addr for iitlbt and idtlbt */ |
| 569 | extrd,s \pte,(63-PAGE_SHIFT)+(63-58),64-PAGE_SHIFT,\pte | 578 | extrd,u \pte,(63-ASM_PFN_PTE_SHIFT)+(63-58),64-PAGE_SHIFT,\pte |
| 579 | depdi _PAGE_SIZE_ENCODING_DEFAULT,63,63-58,\pte | ||
| 570 | .endm | 580 | .endm |
| 571 | 581 | ||
| 572 | /* Identical macro to make_insert_tlb above, except it | 582 | /* Identical macro to make_insert_tlb above, except it |
| @@ -584,9 +594,8 @@ | |||
| 584 | 594 | ||
| 585 | /* Get rid of prot bits and convert to page addr for iitlba */ | 595 | /* Get rid of prot bits and convert to page addr for iitlba */ |
| 586 | 596 | ||
| 587 | depi 0,31,PAGE_SHIFT,\pte | 597 | depi _PAGE_SIZE_ENCODING_DEFAULT,31,ASM_PFN_PTE_SHIFT,\pte |
| 588 | extru \pte,24,25,\pte | 598 | extru \pte,24,25,\pte |
| 589 | |||
| 590 | .endm | 599 | .endm |
| 591 | 600 | ||
| 592 | /* This is for ILP32 PA2.0 only. The TLB insertion needs | 601 | /* This is for ILP32 PA2.0 only. The TLB insertion needs |
| @@ -1201,10 +1210,9 @@ intr_save: | |||
| 1201 | */ | 1210 | */ |
| 1202 | 1211 | ||
| 1203 | /* adjust isr/ior. */ | 1212 | /* adjust isr/ior. */ |
| 1204 | 1213 | extrd,u %r16,63,SPACEID_SHIFT,%r1 /* get high bits from isr for ior */ | |
| 1205 | extrd,u %r16,63,7,%r1 /* get high bits from isr for ior */ | 1214 | depd %r1,31,SPACEID_SHIFT,%r17 /* deposit them into ior */ |
| 1206 | depd %r1,31,7,%r17 /* deposit them into ior */ | 1215 | depdi 0,63,SPACEID_SHIFT,%r16 /* clear them from isr */ |
| 1207 | depdi 0,63,7,%r16 /* clear them from isr */ | ||
| 1208 | #endif | 1216 | #endif |
| 1209 | STREG %r16, PT_ISR(%r29) | 1217 | STREG %r16, PT_ISR(%r29) |
| 1210 | STREG %r17, PT_IOR(%r29) | 1218 | STREG %r17, PT_IOR(%r29) |
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 0b47afc20690..3e79e62f7b0b 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -76,16 +76,16 @@ $bss_loop: | |||
| 76 | mtctl %r4,%cr24 /* Initialize kernel root pointer */ | 76 | mtctl %r4,%cr24 /* Initialize kernel root pointer */ |
| 77 | mtctl %r4,%cr25 /* Initialize user root pointer */ | 77 | mtctl %r4,%cr25 /* Initialize user root pointer */ |
| 78 | 78 | ||
| 79 | #ifdef CONFIG_64BIT | 79 | #if PT_NLEVELS == 3 |
| 80 | /* Set pmd in pgd */ | 80 | /* Set pmd in pgd */ |
| 81 | load32 PA(pmd0),%r5 | 81 | load32 PA(pmd0),%r5 |
| 82 | shrd %r5,PxD_VALUE_SHIFT,%r3 | 82 | shrd %r5,PxD_VALUE_SHIFT,%r3 |
| 83 | ldo (PxD_FLAG_PRESENT+PxD_FLAG_VALID)(%r3),%r3 | 83 | ldo (PxD_FLAG_PRESENT+PxD_FLAG_VALID)(%r3),%r3 |
| 84 | stw %r3,ASM_PGD_ENTRY*ASM_PGD_ENTRY_SIZE(%r4) | 84 | stw %r3,ASM_PGD_ENTRY*ASM_PGD_ENTRY_SIZE(%r4) |
| 85 | ldo ASM_PMD_ENTRY*ASM_PMD_ENTRY_SIZE(%r5),%r4 | 85 | ldo ASM_PMD_ENTRY*ASM_PMD_ENTRY_SIZE(%r5),%r4 |
| 86 | #else | 86 | #else |
| 87 | /* 2-level page table, so pmd == pgd */ | 87 | /* 2-level page table, so pmd == pgd */ |
| 88 | ldo ASM_PGD_ENTRY*ASM_PGD_ENTRY_SIZE(%r4),%r4 | 88 | ldo ASM_PGD_ENTRY*ASM_PGD_ENTRY_SIZE(%r4),%r4 |
| 89 | #endif | 89 | #endif |
| 90 | 90 | ||
| 91 | /* Fill in pmd with enough pte directories */ | 91 | /* Fill in pmd with enough pte directories */ |
| @@ -99,7 +99,7 @@ $bss_loop: | |||
| 99 | stw %r3,0(%r4) | 99 | stw %r3,0(%r4) |
| 100 | ldo (ASM_PAGE_SIZE >> PxD_VALUE_SHIFT)(%r3),%r3 | 100 | ldo (ASM_PAGE_SIZE >> PxD_VALUE_SHIFT)(%r3),%r3 |
| 101 | addib,> -1,%r1,1b | 101 | addib,> -1,%r1,1b |
| 102 | #ifdef CONFIG_64BIT | 102 | #if PT_NLEVELS == 3 |
| 103 | ldo ASM_PMD_ENTRY_SIZE(%r4),%r4 | 103 | ldo ASM_PMD_ENTRY_SIZE(%r4),%r4 |
| 104 | #else | 104 | #else |
| 105 | ldo ASM_PGD_ENTRY_SIZE(%r4),%r4 | 105 | ldo ASM_PGD_ENTRY_SIZE(%r4),%r4 |
| @@ -107,13 +107,14 @@ $bss_loop: | |||
| 107 | 107 | ||
| 108 | 108 | ||
| 109 | /* Now initialize the PTEs themselves */ | 109 | /* Now initialize the PTEs themselves */ |
| 110 | ldo _PAGE_KERNEL(%r0),%r3 /* Hardwired 0 phys addr start */ | 110 | ldo 0+_PAGE_KERNEL(%r0),%r3 /* Hardwired 0 phys addr start */ |
| 111 | ldi (1<<(KERNEL_INITIAL_ORDER-PAGE_SHIFT)),%r11 /* PFN count */ | ||
| 111 | load32 PA(pg0),%r1 | 112 | load32 PA(pg0),%r1 |
| 112 | 113 | ||
| 113 | $pgt_fill_loop: | 114 | $pgt_fill_loop: |
| 114 | STREGM %r3,ASM_PTE_ENTRY_SIZE(%r1) | 115 | STREGM %r3,ASM_PTE_ENTRY_SIZE(%r1) |
| 115 | ldo ASM_PAGE_SIZE(%r3),%r3 | 116 | ldo (1<<PFN_PTE_SHIFT)(%r3),%r3 /* add one PFN */ |
| 116 | bb,>= %r3,31-KERNEL_INITIAL_ORDER,$pgt_fill_loop | 117 | addib,> -1,%r11,$pgt_fill_loop |
| 117 | nop | 118 | nop |
| 118 | 119 | ||
| 119 | /* Load the return address...er...crash 'n burn */ | 120 | /* Load the return address...er...crash 'n burn */ |
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c index 7e898fd64415..8384bf9cecd2 100644 --- a/arch/parisc/kernel/init_task.c +++ b/arch/parisc/kernel/init_task.c | |||
| @@ -53,17 +53,17 @@ union thread_union init_thread_union | |||
| 53 | __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) = | 53 | __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) = |
| 54 | { INIT_THREAD_INFO(init_task) }; | 54 | { INIT_THREAD_INFO(init_task) }; |
| 55 | 55 | ||
| 56 | #ifdef __LP64__ | 56 | #if PT_NLEVELS == 3 |
| 57 | /* NOTE: This layout exactly conforms to the hybrid L2/L3 page table layout | 57 | /* NOTE: This layout exactly conforms to the hybrid L2/L3 page table layout |
| 58 | * with the first pmd adjacent to the pgd and below it. gcc doesn't actually | 58 | * with the first pmd adjacent to the pgd and below it. gcc doesn't actually |
| 59 | * guarantee that global objects will be laid out in memory in the same order | 59 | * guarantee that global objects will be laid out in memory in the same order |
| 60 | * as the order of declaration, so put these in different sections and use | 60 | * as the order of declaration, so put these in different sections and use |
| 61 | * the linker script to order them. */ | 61 | * the linker script to order them. */ |
| 62 | pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((aligned(PAGE_SIZE))) __attribute__ ((__section__ (".data.vm0.pmd"))) = { {0}, }; | 62 | pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((__section__ (".data.vm0.pmd"), aligned(PAGE_SIZE))); |
| 63 | |||
| 64 | #endif | 63 | #endif |
| 65 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((aligned(PAGE_SIZE))) __attribute__ ((__section__ (".data.vm0.pgd"))) = { {0}, }; | 64 | |
| 66 | pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((aligned(PAGE_SIZE))) __attribute__ ((__section__ (".data.vm0.pte"))) = { {0}, }; | 65 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((__section__ (".data.vm0.pgd"), aligned(PAGE_SIZE))); |
| 66 | pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((__section__ (".data.vm0.pte"), aligned(PAGE_SIZE))); | ||
| 67 | 67 | ||
| 68 | /* | 68 | /* |
| 69 | * Initial task structure. | 69 | * Initial task structure. |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index 7a4f07e8d3c3..f600556414d1 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
| @@ -65,7 +65,7 @@ flush_tlb_all_local: | |||
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | /* pcxt_ssm_bug - relied upon translation! PA 2.0 Arch. F-4 and F-5 */ | 67 | /* pcxt_ssm_bug - relied upon translation! PA 2.0 Arch. F-4 and F-5 */ |
| 68 | rsm PSW_SM_I, %r19 /* save I-bit state */ | 68 | rsm PSW_SM_I, %r19 /* save I-bit state */ |
| 69 | load32 PA(1f), %r1 | 69 | load32 PA(1f), %r1 |
| 70 | nop | 70 | nop |
| 71 | nop | 71 | nop |
| @@ -84,8 +84,7 @@ flush_tlb_all_local: | |||
| 84 | rfi | 84 | rfi |
| 85 | nop | 85 | nop |
| 86 | 86 | ||
| 87 | 1: ldil L%PA(cache_info), %r1 | 87 | 1: load32 PA(cache_info), %r1 |
| 88 | ldo R%PA(cache_info)(%r1), %r1 | ||
| 89 | 88 | ||
| 90 | /* Flush Instruction Tlb */ | 89 | /* Flush Instruction Tlb */ |
| 91 | 90 | ||
| @@ -212,8 +211,7 @@ flush_instruction_cache_local: | |||
| 212 | .entry | 211 | .entry |
| 213 | 212 | ||
| 214 | mtsp %r0, %sr1 | 213 | mtsp %r0, %sr1 |
| 215 | ldil L%cache_info, %r1 | 214 | load32 cache_info, %r1 |
| 216 | ldo R%cache_info(%r1), %r1 | ||
| 217 | 215 | ||
| 218 | /* Flush Instruction Cache */ | 216 | /* Flush Instruction Cache */ |
| 219 | 217 | ||
| @@ -254,8 +252,7 @@ flush_data_cache_local: | |||
| 254 | .entry | 252 | .entry |
| 255 | 253 | ||
| 256 | mtsp %r0, %sr1 | 254 | mtsp %r0, %sr1 |
| 257 | ldil L%cache_info, %r1 | 255 | load32 cache_info, %r1 |
| 258 | ldo R%cache_info(%r1), %r1 | ||
| 259 | 256 | ||
| 260 | /* Flush Data Cache */ | 257 | /* Flush Data Cache */ |
| 261 | 258 | ||
| @@ -303,7 +300,8 @@ copy_user_page_asm: | |||
| 303 | */ | 300 | */ |
| 304 | 301 | ||
| 305 | ldd 0(%r25), %r19 | 302 | ldd 0(%r25), %r19 |
| 306 | ldi 32, %r1 /* PAGE_SIZE/128 == 32 */ | 303 | ldi ASM_PAGE_SIZE_DIV128, %r1 |
| 304 | |||
| 307 | ldw 64(%r25), %r0 /* prefetch 1 cacheline ahead */ | 305 | ldw 64(%r25), %r0 /* prefetch 1 cacheline ahead */ |
| 308 | ldw 128(%r25), %r0 /* prefetch 2 */ | 306 | ldw 128(%r25), %r0 /* prefetch 2 */ |
| 309 | 307 | ||
| @@ -368,7 +366,7 @@ copy_user_page_asm: | |||
| 368 | * use ldd/std on a 32 bit kernel. | 366 | * use ldd/std on a 32 bit kernel. |
| 369 | */ | 367 | */ |
| 370 | ldw 0(%r25), %r19 | 368 | ldw 0(%r25), %r19 |
| 371 | ldi 64, %r1 /* PAGE_SIZE/64 == 64 */ | 369 | ldi ASM_PAGE_SIZE_DIV64, %r1 |
| 372 | 370 | ||
| 373 | 1: | 371 | 1: |
| 374 | ldw 4(%r25), %r20 | 372 | ldw 4(%r25), %r20 |
| @@ -461,6 +459,7 @@ copy_user_page_asm: | |||
| 461 | sub %r25, %r1, %r23 /* move physical addr into non shadowed reg */ | 459 | sub %r25, %r1, %r23 /* move physical addr into non shadowed reg */ |
| 462 | 460 | ||
| 463 | ldil L%(TMPALIAS_MAP_START), %r28 | 461 | ldil L%(TMPALIAS_MAP_START), %r28 |
| 462 | /* FIXME for different page sizes != 4k */ | ||
| 464 | #ifdef CONFIG_64BIT | 463 | #ifdef CONFIG_64BIT |
| 465 | extrd,u %r26,56,32, %r26 /* convert phys addr to tlb insert format */ | 464 | extrd,u %r26,56,32, %r26 /* convert phys addr to tlb insert format */ |
| 466 | extrd,u %r23,56,32, %r23 /* convert phys addr to tlb insert format */ | 465 | extrd,u %r23,56,32, %r23 /* convert phys addr to tlb insert format */ |
| @@ -551,6 +550,7 @@ __clear_user_page_asm: | |||
| 551 | #ifdef CONFIG_64BIT | 550 | #ifdef CONFIG_64BIT |
| 552 | #if (TMPALIAS_MAP_START >= 0x80000000) | 551 | #if (TMPALIAS_MAP_START >= 0x80000000) |
| 553 | depdi 0, 31,32, %r28 /* clear any sign extension */ | 552 | depdi 0, 31,32, %r28 /* clear any sign extension */ |
| 553 | /* FIXME: page size dependend */ | ||
| 554 | #endif | 554 | #endif |
| 555 | extrd,u %r26, 56,32, %r26 /* convert phys addr to tlb insert format */ | 555 | extrd,u %r26, 56,32, %r26 /* convert phys addr to tlb insert format */ |
| 556 | depd %r25, 63,22, %r28 /* Form aliased virtual address 'to' */ | 556 | depd %r25, 63,22, %r28 /* Form aliased virtual address 'to' */ |
| @@ -566,10 +566,10 @@ __clear_user_page_asm: | |||
| 566 | pdtlb 0(%r28) | 566 | pdtlb 0(%r28) |
| 567 | 567 | ||
| 568 | #ifdef CONFIG_64BIT | 568 | #ifdef CONFIG_64BIT |
| 569 | ldi 32, %r1 /* PAGE_SIZE/128 == 32 */ | 569 | ldi ASM_PAGE_SIZE_DIV128, %r1 |
| 570 | 570 | ||
| 571 | /* PREFETCH (Write) has not (yet) been proven to help here */ | 571 | /* PREFETCH (Write) has not (yet) been proven to help here */ |
| 572 | /* #define PREFETCHW_OP ldd 256(%0), %r0 */ | 572 | /* #define PREFETCHW_OP ldd 256(%0), %r0 */ |
| 573 | 573 | ||
| 574 | 1: std %r0, 0(%r28) | 574 | 1: std %r0, 0(%r28) |
| 575 | std %r0, 8(%r28) | 575 | std %r0, 8(%r28) |
| @@ -591,8 +591,7 @@ __clear_user_page_asm: | |||
| 591 | ldo 128(%r28), %r28 | 591 | ldo 128(%r28), %r28 |
| 592 | 592 | ||
| 593 | #else /* ! CONFIG_64BIT */ | 593 | #else /* ! CONFIG_64BIT */ |
| 594 | 594 | ldi ASM_PAGE_SIZE_DIV64, %r1 | |
| 595 | ldi 64, %r1 /* PAGE_SIZE/64 == 64 */ | ||
| 596 | 595 | ||
| 597 | 1: | 596 | 1: |
| 598 | stw %r0, 0(%r28) | 597 | stw %r0, 0(%r28) |
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index d15a1d53e101..8b5df98e2b31 100644 --- a/arch/parisc/kernel/sys_parisc.c +++ b/arch/parisc/kernel/sys_parisc.c | |||
| @@ -231,6 +231,14 @@ asmlinkage long parisc_fadvise64_64(int fd, | |||
| 231 | (loff_t)high_len << 32 | low_len, advice); | 231 | (loff_t)high_len << 32 | low_len, advice); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | asmlinkage long parisc_sync_file_range(int fd, | ||
| 235 | u32 hi_off, u32 lo_off, u32 hi_nbytes, u32 lo_nbytes, | ||
| 236 | unsigned int flags) | ||
| 237 | { | ||
| 238 | return sys_sync_file_range(fd, (loff_t)hi_off << 32 | lo_off, | ||
| 239 | (loff_t)hi_nbytes << 32 | lo_nbytes, flags); | ||
| 240 | } | ||
| 241 | |||
| 234 | asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag) | 242 | asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag) |
| 235 | { | 243 | { |
| 236 | return -ENOMEM; | 244 | return -ENOMEM; |
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index af88afef41bd..479d9a017cd1 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | * pointers. | 55 | * pointers. |
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | .align 4096 | 58 | .align ASM_PAGE_SIZE |
| 59 | linux_gateway_page: | 59 | linux_gateway_page: |
| 60 | 60 | ||
| 61 | /* ADDRESS 0x00 to 0xb0 = 176 bytes / 4 bytes per insn = 44 insns */ | 61 | /* ADDRESS 0x00 to 0xb0 = 176 bytes / 4 bytes per insn = 44 insns */ |
| @@ -632,7 +632,7 @@ cas_action: | |||
| 632 | end_compare_and_swap: | 632 | end_compare_and_swap: |
| 633 | 633 | ||
| 634 | /* Make sure nothing else is placed on this page */ | 634 | /* Make sure nothing else is placed on this page */ |
| 635 | .align 4096 | 635 | .align ASM_PAGE_SIZE |
| 636 | .export end_linux_gateway_page | 636 | .export end_linux_gateway_page |
| 637 | end_linux_gateway_page: | 637 | end_linux_gateway_page: |
| 638 | 638 | ||
| @@ -652,7 +652,7 @@ end_linux_gateway_page: | |||
| 652 | 652 | ||
| 653 | .section .rodata,"a" | 653 | .section .rodata,"a" |
| 654 | 654 | ||
| 655 | .align 4096 | 655 | .align ASM_PAGE_SIZE |
| 656 | /* Light-weight-syscall table */ | 656 | /* Light-weight-syscall table */ |
| 657 | /* Start of lws table. */ | 657 | /* Start of lws table. */ |
| 658 | .export lws_table | 658 | .export lws_table |
| @@ -662,14 +662,14 @@ lws_table: | |||
| 662 | LWS_ENTRY(compare_and_swap64) /* 1 - ELF64 Atomic compare and swap */ | 662 | LWS_ENTRY(compare_and_swap64) /* 1 - ELF64 Atomic compare and swap */ |
| 663 | /* End of lws table */ | 663 | /* End of lws table */ |
| 664 | 664 | ||
| 665 | .align 4096 | 665 | .align ASM_PAGE_SIZE |
| 666 | .export sys_call_table | 666 | .export sys_call_table |
| 667 | .Lsys_call_table: | 667 | .Lsys_call_table: |
| 668 | sys_call_table: | 668 | sys_call_table: |
| 669 | #include "syscall_table.S" | 669 | #include "syscall_table.S" |
| 670 | 670 | ||
| 671 | #ifdef CONFIG_64BIT | 671 | #ifdef CONFIG_64BIT |
| 672 | .align 4096 | 672 | .align ASM_PAGE_SIZE |
| 673 | .export sys_call_table64 | 673 | .export sys_call_table64 |
| 674 | .Lsys_call_table64: | 674 | .Lsys_call_table64: |
| 675 | sys_call_table64: | 675 | sys_call_table64: |
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index bbeeb614cfab..e27b432f90a8 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * Copyright (C) 2001 Helge Deller <deller at parisc-linux.org> | 13 | * Copyright (C) 2001 Helge Deller <deller at parisc-linux.org> |
| 14 | * Copyright (C) 2000-2001 Thomas Bogendoerfer <tsbogend at parisc-linux.org> | 14 | * Copyright (C) 2000-2001 Thomas Bogendoerfer <tsbogend at parisc-linux.org> |
| 15 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> | 15 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> |
| 16 | * | 16 | * Copyright (C) 2005-2006 Kyle McMartin <kyle at parisc-linux.org> |
| 17 | * | 17 | * |
| 18 | * This program is free software; you can redistribute it and/or modify | 18 | * This program is free software; you can redistribute it and/or modify |
| 19 | * it under the terms of the GNU General Public License as published by | 19 | * it under the terms of the GNU General Public License as published by |
| @@ -393,5 +393,11 @@ | |||
| 393 | ENTRY_SAME(readlinkat) /* 285 */ | 393 | ENTRY_SAME(readlinkat) /* 285 */ |
| 394 | ENTRY_SAME(fchmodat) | 394 | ENTRY_SAME(fchmodat) |
| 395 | ENTRY_SAME(faccessat) | 395 | ENTRY_SAME(faccessat) |
| 396 | ENTRY_SAME(unshare) | ||
| 397 | ENTRY_COMP(set_robust_list) | ||
| 398 | ENTRY_COMP(get_robust_list) /* 290 */ | ||
| 399 | ENTRY_SAME(splice) | ||
| 400 | ENTRY_OURS(sync_file_range) | ||
| 401 | ENTRY_SAME(tee) | ||
| 396 | /* Nothing yet */ | 402 | /* Nothing yet */ |
| 397 | 403 | ||
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 6d6436a6b624..94dcc03a28ed 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * Copyright (C) 2000 Michael Ang <mang with subcarrier.org> | 6 | * Copyright (C) 2000 Michael Ang <mang with subcarrier.org> |
| 7 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> | 7 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> |
| 8 | * Copyright (C) 2003 James Bottomley <jejb with parisc-linux.org> | 8 | * Copyright (C) 2003 James Bottomley <jejb with parisc-linux.org> |
| 9 | * Copyright (C) 2006 Helge Deller <deller@gmx.de> | ||
| 9 | * | 10 | * |
| 10 | * | 11 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| @@ -27,6 +28,7 @@ | |||
| 27 | /* needed for the processor specific cache alignment size */ | 28 | /* needed for the processor specific cache alignment size */ |
| 28 | #include <asm/cache.h> | 29 | #include <asm/cache.h> |
| 29 | #include <asm/page.h> | 30 | #include <asm/page.h> |
| 31 | #include <asm/asm-offsets.h> | ||
| 30 | 32 | ||
| 31 | /* ld script to make hppa Linux kernel */ | 33 | /* ld script to make hppa Linux kernel */ |
| 32 | #ifndef CONFIG_64BIT | 34 | #ifndef CONFIG_64BIT |
| @@ -68,7 +70,7 @@ SECTIONS | |||
| 68 | RODATA | 70 | RODATA |
| 69 | 71 | ||
| 70 | /* writeable */ | 72 | /* writeable */ |
| 71 | . = ALIGN(4096); /* Make sure this is page aligned so | 73 | . = ALIGN(ASM_PAGE_SIZE); /* Make sure this is page aligned so |
| 72 | that we can properly leave these | 74 | that we can properly leave these |
| 73 | as writable */ | 75 | as writable */ |
| 74 | data_start = .; | 76 | data_start = .; |
| @@ -81,23 +83,17 @@ SECTIONS | |||
| 81 | __start___unwind = .; /* unwind info */ | 83 | __start___unwind = .; /* unwind info */ |
| 82 | .PARISC.unwind : { *(.PARISC.unwind) } | 84 | .PARISC.unwind : { *(.PARISC.unwind) } |
| 83 | __stop___unwind = .; | 85 | __stop___unwind = .; |
| 84 | 86 | ||
| 87 | /* rarely changed data like cpu maps */ | ||
| 88 | . = ALIGN(16); | ||
| 89 | .data.read_mostly : { *(.data.read_mostly) } | ||
| 90 | |||
| 91 | . = ALIGN(L1_CACHE_BYTES); | ||
| 85 | .data : { /* Data */ | 92 | .data : { /* Data */ |
| 86 | *(.data) | 93 | *(.data) |
| 87 | *(.data.vm0.pmd) | ||
| 88 | *(.data.vm0.pgd) | ||
| 89 | *(.data.vm0.pte) | ||
| 90 | CONSTRUCTORS | 94 | CONSTRUCTORS |
| 91 | } | 95 | } |
| 92 | 96 | ||
| 93 | . = ALIGN(4096); | ||
| 94 | /* nosave data is really only used for software suspend...it's here | ||
| 95 | * just in case we ever implement it */ | ||
| 96 | __nosave_begin = .; | ||
| 97 | .data_nosave : { *(.data.nosave) } | ||
| 98 | . = ALIGN(4096); | ||
| 99 | __nosave_end = .; | ||
| 100 | |||
| 101 | . = ALIGN(L1_CACHE_BYTES); | 97 | . = ALIGN(L1_CACHE_BYTES); |
| 102 | .data.cacheline_aligned : { *(.data.cacheline_aligned) } | 98 | .data.cacheline_aligned : { *(.data.cacheline_aligned) } |
| 103 | 99 | ||
| @@ -105,12 +101,29 @@ SECTIONS | |||
| 105 | . = ALIGN(16); | 101 | . = ALIGN(16); |
| 106 | .data.lock_aligned : { *(.data.lock_aligned) } | 102 | .data.lock_aligned : { *(.data.lock_aligned) } |
| 107 | 103 | ||
| 108 | /* rarely changed data like cpu maps */ | 104 | . = ALIGN(ASM_PAGE_SIZE); |
| 109 | . = ALIGN(16); | 105 | /* nosave data is really only used for software suspend...it's here |
| 110 | .data.read_mostly : { *(.data.read_mostly) } | 106 | * just in case we ever implement it */ |
| 107 | __nosave_begin = .; | ||
| 108 | .data_nosave : { *(.data.nosave) } | ||
| 109 | . = ALIGN(ASM_PAGE_SIZE); | ||
| 110 | __nosave_end = .; | ||
| 111 | 111 | ||
| 112 | _edata = .; /* End of data section */ | 112 | _edata = .; /* End of data section */ |
| 113 | 113 | ||
| 114 | __bss_start = .; /* BSS */ | ||
| 115 | /* page table entries need to be PAGE_SIZE aligned */ | ||
| 116 | . = ALIGN(ASM_PAGE_SIZE); | ||
| 117 | .data.vmpages : { | ||
| 118 | *(.data.vm0.pmd) | ||
| 119 | *(.data.vm0.pgd) | ||
| 120 | *(.data.vm0.pte) | ||
| 121 | } | ||
| 122 | .bss : { *(.bss) *(COMMON) } | ||
| 123 | __bss_stop = .; | ||
| 124 | |||
| 125 | |||
| 126 | /* assembler code expects init_task to be 16k aligned */ | ||
| 114 | . = ALIGN(16384); /* init_task */ | 127 | . = ALIGN(16384); /* init_task */ |
| 115 | .data.init_task : { *(.data.init_task) } | 128 | .data.init_task : { *(.data.init_task) } |
| 116 | 129 | ||
| @@ -126,6 +139,7 @@ SECTIONS | |||
| 126 | .dlt : { *(.dlt) } | 139 | .dlt : { *(.dlt) } |
| 127 | #endif | 140 | #endif |
| 128 | 141 | ||
| 142 | /* reserve space for interrupt stack by aligning __init* to 16k */ | ||
| 129 | . = ALIGN(16384); | 143 | . = ALIGN(16384); |
| 130 | __init_begin = .; | 144 | __init_begin = .; |
| 131 | .init.text : { | 145 | .init.text : { |
| @@ -166,7 +180,7 @@ SECTIONS | |||
| 166 | from .altinstructions and .eh_frame */ | 180 | from .altinstructions and .eh_frame */ |
| 167 | .exit.text : { *(.exit.text) } | 181 | .exit.text : { *(.exit.text) } |
| 168 | .exit.data : { *(.exit.data) } | 182 | .exit.data : { *(.exit.data) } |
| 169 | . = ALIGN(4096); | 183 | . = ALIGN(ASM_PAGE_SIZE); |
| 170 | __initramfs_start = .; | 184 | __initramfs_start = .; |
| 171 | .init.ramfs : { *(.init.ramfs) } | 185 | .init.ramfs : { *(.init.ramfs) } |
| 172 | __initramfs_end = .; | 186 | __initramfs_end = .; |
| @@ -174,14 +188,10 @@ SECTIONS | |||
| 174 | __per_cpu_start = .; | 188 | __per_cpu_start = .; |
| 175 | .data.percpu : { *(.data.percpu) } | 189 | .data.percpu : { *(.data.percpu) } |
| 176 | __per_cpu_end = .; | 190 | __per_cpu_end = .; |
| 177 | . = ALIGN(4096); | 191 | . = ALIGN(ASM_PAGE_SIZE); |
| 178 | __init_end = .; | 192 | __init_end = .; |
| 179 | /* freed after init ends here */ | 193 | /* freed after init ends here */ |
| 180 | 194 | ||
| 181 | __bss_start = .; /* BSS */ | ||
| 182 | .bss : { *(.bss) *(COMMON) } | ||
| 183 | __bss_stop = .; | ||
| 184 | |||
| 185 | _end = . ; | 195 | _end = . ; |
| 186 | 196 | ||
| 187 | /* Sections to be discarded */ | 197 | /* Sections to be discarded */ |
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 0ad945d4c0a4..64785e46f93b 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
| @@ -186,7 +186,7 @@ good_area: | |||
| 186 | break; | 186 | break; |
| 187 | case VM_FAULT_SIGBUS: | 187 | case VM_FAULT_SIGBUS: |
| 188 | /* | 188 | /* |
| 189 | * We hit a hared mapping outside of the file, or some | 189 | * We hit a shared mapping outside of the file, or some |
| 190 | * other thing happened to us that made us unable to | 190 | * other thing happened to us that made us unable to |
| 191 | * handle the page fault gracefully. | 191 | * handle the page fault gracefully. |
| 192 | */ | 192 | */ |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 3796be67cd53..631712562656 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * changed by Philipp Rumpf | 6 | * changed by Philipp Rumpf |
| 7 | * Copyright 1999 Philipp Rumpf (prumpf@tux.org) | 7 | * Copyright 1999 Philipp Rumpf (prumpf@tux.org) |
| 8 | * Copyright 2004 Randolph Chung (tausq@debian.org) | 8 | * Copyright 2004 Randolph Chung (tausq@debian.org) |
| 9 | * Copyright 2006 Helge Deller (deller@gmx.de) | ||
| 9 | * | 10 | * |
| 10 | */ | 11 | */ |
| 11 | 12 | ||
| @@ -371,8 +372,8 @@ static void __init setup_bootmem(void) | |||
| 371 | 372 | ||
| 372 | void free_initmem(void) | 373 | void free_initmem(void) |
| 373 | { | 374 | { |
| 374 | unsigned long addr; | 375 | unsigned long addr, init_begin, init_end; |
| 375 | 376 | ||
| 376 | printk(KERN_INFO "Freeing unused kernel memory: "); | 377 | printk(KERN_INFO "Freeing unused kernel memory: "); |
| 377 | 378 | ||
| 378 | #ifdef CONFIG_DEBUG_KERNEL | 379 | #ifdef CONFIG_DEBUG_KERNEL |
| @@ -395,8 +396,11 @@ void free_initmem(void) | |||
| 395 | local_irq_enable(); | 396 | local_irq_enable(); |
| 396 | #endif | 397 | #endif |
| 397 | 398 | ||
| 398 | addr = (unsigned long)(&__init_begin); | 399 | /* align __init_begin and __init_end to page size, |
| 399 | for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { | 400 | ignoring linker script where we might have tried to save RAM */ |
| 401 | init_begin = PAGE_ALIGN((unsigned long)(&__init_begin)); | ||
| 402 | init_end = PAGE_ALIGN((unsigned long)(&__init_end)); | ||
| 403 | for (addr = init_begin; addr < init_end; addr += PAGE_SIZE) { | ||
| 400 | ClearPageReserved(virt_to_page(addr)); | 404 | ClearPageReserved(virt_to_page(addr)); |
| 401 | init_page_count(virt_to_page(addr)); | 405 | init_page_count(virt_to_page(addr)); |
| 402 | free_page(addr); | 406 | free_page(addr); |
| @@ -407,7 +411,7 @@ void free_initmem(void) | |||
| 407 | /* set up a new led state on systems shipped LED State panel */ | 411 | /* set up a new led state on systems shipped LED State panel */ |
| 408 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE); | 412 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE); |
| 409 | 413 | ||
| 410 | printk("%luk freed\n", (unsigned long)(&__init_end - &__init_begin) >> 10); | 414 | printk("%luk freed\n", (init_end - init_begin) >> 10); |
| 411 | } | 415 | } |
| 412 | 416 | ||
| 413 | 417 | ||
| @@ -639,11 +643,13 @@ static void __init map_pages(unsigned long start_vaddr, unsigned long start_padd | |||
| 639 | * Map the fault vector writable so we can | 643 | * Map the fault vector writable so we can |
| 640 | * write the HPMC checksum. | 644 | * write the HPMC checksum. |
| 641 | */ | 645 | */ |
| 646 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) | ||
| 642 | if (address >= ro_start && address < ro_end | 647 | if (address >= ro_start && address < ro_end |
| 643 | && address != fv_addr | 648 | && address != fv_addr |
| 644 | && address != gw_addr) | 649 | && address != gw_addr) |
| 645 | pte = __mk_pte(address, PAGE_KERNEL_RO); | 650 | pte = __mk_pte(address, PAGE_KERNEL_RO); |
| 646 | else | 651 | else |
| 652 | #endif | ||
| 647 | pte = __mk_pte(address, pgprot); | 653 | pte = __mk_pte(address, pgprot); |
| 648 | 654 | ||
| 649 | if (address >= end_paddr) | 655 | if (address >= end_paddr) |
| @@ -874,8 +880,7 @@ unsigned long alloc_sid(void) | |||
| 874 | flush_tlb_all(); /* flush_tlb_all() calls recycle_sids() */ | 880 | flush_tlb_all(); /* flush_tlb_all() calls recycle_sids() */ |
| 875 | spin_lock(&sid_lock); | 881 | spin_lock(&sid_lock); |
| 876 | } | 882 | } |
| 877 | if (free_space_ids == 0) | 883 | BUG_ON(free_space_ids == 0); |
| 878 | BUG(); | ||
| 879 | } | 884 | } |
| 880 | 885 | ||
| 881 | free_space_ids--; | 886 | free_space_ids--; |
| @@ -899,8 +904,7 @@ void free_sid(unsigned long spaceid) | |||
| 899 | 904 | ||
| 900 | spin_lock(&sid_lock); | 905 | spin_lock(&sid_lock); |
| 901 | 906 | ||
| 902 | if (*dirty_space_offset & (1L << index)) | 907 | BUG_ON(*dirty_space_offset & (1L << index)); /* attempt to free space id twice */ |
| 903 | BUG(); /* attempt to free space id twice */ | ||
| 904 | 908 | ||
| 905 | *dirty_space_offset |= (1L << index); | 909 | *dirty_space_offset |= (1L << index); |
| 906 | dirty_space_ids++; | 910 | dirty_space_ids++; |
| @@ -975,7 +979,7 @@ static void recycle_sids(void) | |||
| 975 | 979 | ||
| 976 | static unsigned long recycle_ndirty; | 980 | static unsigned long recycle_ndirty; |
| 977 | static unsigned long recycle_dirty_array[SID_ARRAY_SIZE]; | 981 | static unsigned long recycle_dirty_array[SID_ARRAY_SIZE]; |
| 978 | static unsigned int recycle_inuse = 0; | 982 | static unsigned int recycle_inuse; |
| 979 | 983 | ||
| 980 | void flush_tlb_all(void) | 984 | void flush_tlb_all(void) |
| 981 | { | 985 | { |
| @@ -984,9 +988,7 @@ void flush_tlb_all(void) | |||
| 984 | do_recycle = 0; | 988 | do_recycle = 0; |
| 985 | spin_lock(&sid_lock); | 989 | spin_lock(&sid_lock); |
| 986 | if (dirty_space_ids > RECYCLE_THRESHOLD) { | 990 | if (dirty_space_ids > RECYCLE_THRESHOLD) { |
| 987 | if (recycle_inuse) { | 991 | BUG_ON(recycle_inuse); /* FIXME: Use a semaphore/wait queue here */ |
| 988 | BUG(); /* FIXME: Use a semaphore/wait queue here */ | ||
| 989 | } | ||
| 990 | get_dirty_sids(&recycle_ndirty,recycle_dirty_array); | 992 | get_dirty_sids(&recycle_ndirty,recycle_dirty_array); |
| 991 | recycle_inuse++; | 993 | recycle_inuse++; |
| 992 | do_recycle++; | 994 | do_recycle++; |
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 0db12818d7bc..27384567a1d0 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * arch/parisc/mm/ioremap.c | 2 | * arch/parisc/mm/ioremap.c |
| 3 | * | 3 | * |
| 4 | * (C) Copyright 1995 1996 Linus Torvalds | 4 | * (C) Copyright 1995 1996 Linus Torvalds |
| 5 | * (C) Copyright 2001 Helge Deller <deller@gmx.de> | 5 | * (C) Copyright 2001-2006 Helge Deller <deller@gmx.de> |
| 6 | * (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org> | 6 | * (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| @@ -138,6 +138,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l | |||
| 138 | if ((phys_addr >= 0x00080000 && end < 0x000fffff) || | 138 | if ((phys_addr >= 0x00080000 && end < 0x000fffff) || |
| 139 | (phys_addr >= 0x00500000 && end < 0x03bfffff)) { | 139 | (phys_addr >= 0x00500000 && end < 0x03bfffff)) { |
| 140 | phys_addr |= F_EXTEND(0xfc000000); | 140 | phys_addr |= F_EXTEND(0xfc000000); |
| 141 | flags |= _PAGE_NO_CACHE; | ||
| 141 | } | 142 | } |
| 142 | #endif | 143 | #endif |
| 143 | 144 | ||
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index fe22e54ab2b0..dbe421dc3c11 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
| @@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y | |||
| 9 | CONFIG_MMU=y | 9 | CONFIG_MMU=y |
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 12 | CONFIG_GENERIC_HWEIGHT=y | ||
| 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 13 | CONFIG_PPC=y | 14 | CONFIG_PPC=y |
| 14 | CONFIG_EARLY_PRINTK=y | 15 | CONFIG_EARLY_PRINTK=y |
| @@ -55,6 +56,7 @@ CONFIG_SYSCTL=y | |||
| 55 | CONFIG_IKCONFIG=y | 56 | CONFIG_IKCONFIG=y |
| 56 | CONFIG_IKCONFIG_PROC=y | 57 | CONFIG_IKCONFIG_PROC=y |
| 57 | # CONFIG_CPUSETS is not set | 58 | # CONFIG_CPUSETS is not set |
| 59 | # CONFIG_RELAY is not set | ||
| 58 | CONFIG_INITRAMFS_SOURCE="" | 60 | CONFIG_INITRAMFS_SOURCE="" |
| 59 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 61 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 60 | # CONFIG_EMBEDDED is not set | 62 | # CONFIG_EMBEDDED is not set |
| @@ -69,10 +71,6 @@ CONFIG_BASE_FULL=y | |||
| 69 | CONFIG_FUTEX=y | 71 | CONFIG_FUTEX=y |
| 70 | CONFIG_EPOLL=y | 72 | CONFIG_EPOLL=y |
| 71 | CONFIG_SHMEM=y | 73 | CONFIG_SHMEM=y |
| 72 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 73 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 74 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 75 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 76 | CONFIG_SLAB=y | 74 | CONFIG_SLAB=y |
| 77 | # CONFIG_TINY_SHMEM is not set | 75 | # CONFIG_TINY_SHMEM is not set |
| 78 | CONFIG_BASE_SMALL=0 | 76 | CONFIG_BASE_SMALL=0 |
| @@ -84,7 +82,6 @@ CONFIG_BASE_SMALL=0 | |||
| 84 | CONFIG_MODULES=y | 82 | CONFIG_MODULES=y |
| 85 | CONFIG_MODULE_UNLOAD=y | 83 | CONFIG_MODULE_UNLOAD=y |
| 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 87 | CONFIG_OBSOLETE_MODPARM=y | ||
| 88 | # CONFIG_MODVERSIONS is not set | 85 | # CONFIG_MODVERSIONS is not set |
| 89 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 90 | CONFIG_KMOD=y | 87 | CONFIG_KMOD=y |
| @@ -93,6 +90,7 @@ CONFIG_STOP_MACHINE=y | |||
| 93 | # | 90 | # |
| 94 | # Block layer | 91 | # Block layer |
| 95 | # | 92 | # |
| 93 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 96 | 94 | ||
| 97 | # | 95 | # |
| 98 | # IO Schedulers | 96 | # IO Schedulers |
| @@ -126,6 +124,7 @@ CONFIG_RTAS_FLASH=y | |||
| 126 | CONFIG_MMIO_NVRAM=y | 124 | CONFIG_MMIO_NVRAM=y |
| 127 | CONFIG_CELL_IIC=y | 125 | CONFIG_CELL_IIC=y |
| 128 | # CONFIG_PPC_MPC106 is not set | 126 | # CONFIG_PPC_MPC106 is not set |
| 127 | # CONFIG_PPC_970_NAP is not set | ||
| 129 | # CONFIG_CPU_FREQ is not set | 128 | # CONFIG_CPU_FREQ is not set |
| 130 | # CONFIG_WANT_EARLY_SERIAL is not set | 129 | # CONFIG_WANT_EARLY_SERIAL is not set |
| 131 | 130 | ||
| @@ -167,7 +166,6 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
| 167 | CONFIG_SPARSEMEM_EXTREME=y | 166 | CONFIG_SPARSEMEM_EXTREME=y |
| 168 | # CONFIG_MEMORY_HOTPLUG is not set | 167 | # CONFIG_MEMORY_HOTPLUG is not set |
| 169 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 168 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 170 | CONFIG_MIGRATION=y | ||
| 171 | # CONFIG_PPC_64K_PAGES is not set | 169 | # CONFIG_PPC_64K_PAGES is not set |
| 172 | CONFIG_SCHED_SMT=y | 170 | CONFIG_SCHED_SMT=y |
| 173 | CONFIG_PROC_DEVICETREE=y | 171 | CONFIG_PROC_DEVICETREE=y |
| @@ -184,7 +182,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 184 | # CONFIG_PPC_INDIRECT_PCI is not set | 182 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 185 | CONFIG_PCI=y | 183 | CONFIG_PCI=y |
| 186 | CONFIG_PCI_DOMAINS=y | 184 | CONFIG_PCI_DOMAINS=y |
| 187 | CONFIG_PCI_LEGACY_PROC=y | ||
| 188 | # CONFIG_PCI_DEBUG is not set | 185 | # CONFIG_PCI_DEBUG is not set |
| 189 | 186 | ||
| 190 | # | 187 | # |
| @@ -226,6 +223,7 @@ CONFIG_SYN_COOKIES=y | |||
| 226 | # CONFIG_INET_AH is not set | 223 | # CONFIG_INET_AH is not set |
| 227 | # CONFIG_INET_ESP is not set | 224 | # CONFIG_INET_ESP is not set |
| 228 | # CONFIG_INET_IPCOMP is not set | 225 | # CONFIG_INET_IPCOMP is not set |
| 226 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 229 | CONFIG_INET_TUNNEL=y | 227 | CONFIG_INET_TUNNEL=y |
| 230 | CONFIG_INET_DIAG=y | 228 | CONFIG_INET_DIAG=y |
| 231 | CONFIG_INET_TCP_DIAG=y | 229 | CONFIG_INET_TCP_DIAG=y |
| @@ -242,6 +240,7 @@ CONFIG_IPV6=y | |||
| 242 | CONFIG_INET6_AH=m | 240 | CONFIG_INET6_AH=m |
| 243 | CONFIG_INET6_ESP=m | 241 | CONFIG_INET6_ESP=m |
| 244 | CONFIG_INET6_IPCOMP=m | 242 | CONFIG_INET6_IPCOMP=m |
| 243 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 245 | CONFIG_INET6_TUNNEL=m | 244 | CONFIG_INET6_TUNNEL=m |
| 246 | CONFIG_IPV6_TUNNEL=m | 245 | CONFIG_IPV6_TUNNEL=m |
| 247 | CONFIG_NETFILTER=y | 246 | CONFIG_NETFILTER=y |
| @@ -632,6 +631,7 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 632 | # | 631 | # |
| 633 | CONFIG_SERIAL_8250=y | 632 | CONFIG_SERIAL_8250=y |
| 634 | CONFIG_SERIAL_8250_CONSOLE=y | 633 | CONFIG_SERIAL_8250_CONSOLE=y |
| 634 | CONFIG_SERIAL_8250_PCI=y | ||
| 635 | CONFIG_SERIAL_8250_NR_UARTS=4 | 635 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 636 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 636 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 637 | # CONFIG_SERIAL_8250_EXTENDED is not set | 637 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -717,7 +717,6 @@ CONFIG_I2C_ALGOBIT=y | |||
| 717 | # CONFIG_I2C_PARPORT_LIGHT is not set | 717 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 718 | # CONFIG_I2C_PROSAVAGE is not set | 718 | # CONFIG_I2C_PROSAVAGE is not set |
| 719 | # CONFIG_I2C_SAVAGE4 is not set | 719 | # CONFIG_I2C_SAVAGE4 is not set |
| 720 | # CONFIG_SCx200_ACB is not set | ||
| 721 | # CONFIG_I2C_SIS5595 is not set | 720 | # CONFIG_I2C_SIS5595 is not set |
| 722 | # CONFIG_I2C_SIS630 is not set | 721 | # CONFIG_I2C_SIS630 is not set |
| 723 | # CONFIG_I2C_SIS96X is not set | 722 | # CONFIG_I2C_SIS96X is not set |
| @@ -736,9 +735,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 736 | # CONFIG_SENSORS_PCF8574 is not set | 735 | # CONFIG_SENSORS_PCF8574 is not set |
| 737 | # CONFIG_SENSORS_PCA9539 is not set | 736 | # CONFIG_SENSORS_PCA9539 is not set |
| 738 | # CONFIG_SENSORS_PCF8591 is not set | 737 | # CONFIG_SENSORS_PCF8591 is not set |
| 739 | # CONFIG_SENSORS_RTC8564 is not set | ||
| 740 | # CONFIG_SENSORS_MAX6875 is not set | 738 | # CONFIG_SENSORS_MAX6875 is not set |
| 741 | # CONFIG_RTC_X1205_I2C is not set | ||
| 742 | # CONFIG_I2C_DEBUG_CORE is not set | 739 | # CONFIG_I2C_DEBUG_CORE is not set |
| 743 | # CONFIG_I2C_DEBUG_ALGO is not set | 740 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 744 | # CONFIG_I2C_DEBUG_BUS is not set | 741 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -766,10 +763,6 @@ CONFIG_I2C_ALGOBIT=y | |||
| 766 | # | 763 | # |
| 767 | 764 | ||
| 768 | # | 765 | # |
| 769 | # Multimedia Capabilities Port drivers | ||
| 770 | # | ||
| 771 | |||
| 772 | # | ||
| 773 | # Multimedia devices | 766 | # Multimedia devices |
| 774 | # | 767 | # |
| 775 | # CONFIG_VIDEO_DEV is not set | 768 | # CONFIG_VIDEO_DEV is not set |
| @@ -818,6 +811,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 818 | # CONFIG_MMC is not set | 811 | # CONFIG_MMC is not set |
| 819 | 812 | ||
| 820 | # | 813 | # |
| 814 | # LED devices | ||
| 815 | # | ||
| 816 | # CONFIG_NEW_LEDS is not set | ||
| 817 | |||
| 818 | # | ||
| 819 | # LED drivers | ||
| 820 | # | ||
| 821 | |||
| 822 | # | ||
| 823 | # LED Triggers | ||
| 824 | # | ||
| 825 | |||
| 826 | # | ||
| 821 | # InfiniBand support | 827 | # InfiniBand support |
| 822 | # | 828 | # |
| 823 | CONFIG_INFINIBAND=y | 829 | CONFIG_INFINIBAND=y |
| @@ -834,6 +840,11 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y | |||
| 834 | # | 840 | # |
| 835 | 841 | ||
| 836 | # | 842 | # |
| 843 | # Real Time Clock | ||
| 844 | # | ||
| 845 | # CONFIG_RTC_CLASS is not set | ||
| 846 | |||
| 847 | # | ||
| 837 | # File systems | 848 | # File systems |
| 838 | # | 849 | # |
| 839 | CONFIG_EXT2_FS=y | 850 | CONFIG_EXT2_FS=y |
| @@ -889,7 +900,6 @@ CONFIG_TMPFS=y | |||
| 889 | CONFIG_HUGETLBFS=y | 900 | CONFIG_HUGETLBFS=y |
| 890 | CONFIG_HUGETLB_PAGE=y | 901 | CONFIG_HUGETLB_PAGE=y |
| 891 | CONFIG_RAMFS=y | 902 | CONFIG_RAMFS=y |
| 892 | # CONFIG_RELAYFS_FS is not set | ||
| 893 | # CONFIG_CONFIGFS_FS is not set | 903 | # CONFIG_CONFIGFS_FS is not set |
| 894 | 904 | ||
| 895 | # | 905 | # |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 39e348a3ade2..3f7182db9ed5 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -57,6 +57,8 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec); | |||
| 57 | PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP) | 57 | PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP) |
| 58 | #define COMMON_USER_POWER5_PLUS (COMMON_USER_PPC64 | PPC_FEATURE_POWER5_PLUS|\ | 58 | #define COMMON_USER_POWER5_PLUS (COMMON_USER_PPC64 | PPC_FEATURE_POWER5_PLUS|\ |
| 59 | PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP) | 59 | PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP) |
| 60 | #define COMMON_USER_POWER6 (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_05 |\ | ||
| 61 | PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP) | ||
| 60 | #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ | 62 | #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ |
| 61 | PPC_FEATURE_BOOKE) | 63 | PPC_FEATURE_BOOKE) |
| 62 | 64 | ||
| @@ -263,6 +265,20 @@ struct cpu_spec cpu_specs[] = { | |||
| 263 | .oprofile_type = PPC_OPROFILE_POWER4, | 265 | .oprofile_type = PPC_OPROFILE_POWER4, |
| 264 | .platform = "power5+", | 266 | .platform = "power5+", |
| 265 | }, | 267 | }, |
| 268 | { /* Power6 */ | ||
| 269 | .pvr_mask = 0xffff0000, | ||
| 270 | .pvr_value = 0x003e0000, | ||
| 271 | .cpu_name = "POWER6", | ||
| 272 | .cpu_features = CPU_FTRS_POWER6, | ||
| 273 | .cpu_user_features = COMMON_USER_POWER6, | ||
| 274 | .icache_bsize = 128, | ||
| 275 | .dcache_bsize = 128, | ||
| 276 | .num_pmcs = 6, | ||
| 277 | .cpu_setup = __setup_cpu_power4, | ||
| 278 | .oprofile_cpu_type = "ppc64/power6", | ||
| 279 | .oprofile_type = PPC_OPROFILE_POWER4, | ||
| 280 | .platform = "power6", | ||
| 281 | }, | ||
| 266 | { /* Cell Broadband Engine */ | 282 | { /* Cell Broadband Engine */ |
| 267 | .pvr_mask = 0xffff0000, | 283 | .pvr_mask = 0xffff0000, |
| 268 | .pvr_value = 0x00700000, | 284 | .pvr_value = 0x00700000, |
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index 928b8581fcb0..ba34001fca8e 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c | |||
| @@ -191,11 +191,19 @@ int module_frob_arch_sections(Elf64_Ehdr *hdr, | |||
| 191 | (void *)hdr | 191 | (void *)hdr |
| 192 | + sechdrs[sechdrs[i].sh_link].sh_offset); | 192 | + sechdrs[sechdrs[i].sh_link].sh_offset); |
| 193 | } | 193 | } |
| 194 | if (!me->arch.stubs_section || !me->arch.toc_section) { | 194 | |
| 195 | printk("%s: doesn't contain .toc or .stubs.\n", me->name); | 195 | if (!me->arch.stubs_section) { |
| 196 | printk("%s: doesn't contain .stubs.\n", me->name); | ||
| 196 | return -ENOEXEC; | 197 | return -ENOEXEC; |
| 197 | } | 198 | } |
| 198 | 199 | ||
| 200 | /* If we don't have a .toc, just use .stubs. We need to set r2 | ||
| 201 | to some reasonable value in case the module calls out to | ||
| 202 | other functions via a stub, or if a function pointer escapes | ||
| 203 | the module by some means. */ | ||
| 204 | if (!me->arch.toc_section) | ||
| 205 | me->arch.toc_section = me->arch.stubs_section; | ||
| 206 | |||
| 199 | /* Override the stubs size */ | 207 | /* Override the stubs size */ |
| 200 | sechdrs[me->arch.stubs_section].sh_size = get_stubs_size(hdr, sechdrs); | 208 | sechdrs[me->arch.stubs_section].sh_size = get_stubs_size(hdr, sechdrs); |
| 201 | return 0; | 209 | return 0; |
| @@ -342,7 +350,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, | |||
| 342 | break; | 350 | break; |
| 343 | 351 | ||
| 344 | case R_PPC64_TOC16: | 352 | case R_PPC64_TOC16: |
| 345 | /* Subtact TOC pointer */ | 353 | /* Subtract TOC pointer */ |
| 346 | value -= my_r2(sechdrs, me); | 354 | value -= my_r2(sechdrs, me); |
| 347 | if (value + 0x8000 > 0xffff) { | 355 | if (value + 0x8000 > 0xffff) { |
| 348 | printk("%s: bad TOC16 relocation (%lu)\n", | 356 | printk("%s: bad TOC16 relocation (%lu)\n", |
| @@ -355,7 +363,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, | |||
| 355 | break; | 363 | break; |
| 356 | 364 | ||
| 357 | case R_PPC64_TOC16_DS: | 365 | case R_PPC64_TOC16_DS: |
| 358 | /* Subtact TOC pointer */ | 366 | /* Subtract TOC pointer */ |
| 359 | value -= my_r2(sechdrs, me); | 367 | value -= my_r2(sechdrs, me); |
| 360 | if ((value & 3) != 0 || value + 0x8000 > 0xffff) { | 368 | if ((value & 3) != 0 || value + 0x8000 > 0xffff) { |
| 361 | printk("%s: bad TOC16_DS relocation (%lu)\n", | 369 | printk("%s: bad TOC16_DS relocation (%lu)\n", |
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 7e4d54821a07..078fb5533541 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -636,10 +636,96 @@ static void __init early_cmdline_parse(void) | |||
| 636 | 636 | ||
| 637 | #ifdef CONFIG_PPC_PSERIES | 637 | #ifdef CONFIG_PPC_PSERIES |
| 638 | /* | 638 | /* |
| 639 | * To tell the firmware what our capabilities are, we have to pass | 639 | * There are two methods for telling firmware what our capabilities are. |
| 640 | * it a fake 32-bit ELF header containing a couple of PT_NOTE sections | 640 | * Newer machines have an "ibm,client-architecture-support" method on the |
| 641 | * that contain structures that contain the actual values. | 641 | * root node. For older machines, we have to call the "process-elf-header" |
| 642 | * method in the /packages/elf-loader node, passing it a fake 32-bit | ||
| 643 | * ELF header containing a couple of PT_NOTE sections that contain | ||
| 644 | * structures that contain various information. | ||
| 642 | */ | 645 | */ |
| 646 | |||
| 647 | /* | ||
| 648 | * New method - extensible architecture description vector. | ||
| 649 | * | ||
| 650 | * Because the description vector contains a mix of byte and word | ||
| 651 | * values, we declare it as an unsigned char array, and use this | ||
| 652 | * macro to put word values in. | ||
| 653 | */ | ||
| 654 | #define W(x) ((x) >> 24) & 0xff, ((x) >> 16) & 0xff, \ | ||
| 655 | ((x) >> 8) & 0xff, (x) & 0xff | ||
| 656 | |||
| 657 | /* Option vector bits - generic bits in byte 1 */ | ||
| 658 | #define OV_IGNORE 0x80 /* ignore this vector */ | ||
| 659 | #define OV_CESSATION_POLICY 0x40 /* halt if unsupported option present*/ | ||
| 660 | |||
| 661 | /* Option vector 1: processor architectures supported */ | ||
| 662 | #define OV1_PPC_2_00 0x80 /* set if we support PowerPC 2.00 */ | ||
| 663 | #define OV1_PPC_2_01 0x40 /* set if we support PowerPC 2.01 */ | ||
| 664 | #define OV1_PPC_2_02 0x20 /* set if we support PowerPC 2.02 */ | ||
| 665 | #define OV1_PPC_2_03 0x10 /* set if we support PowerPC 2.03 */ | ||
| 666 | #define OV1_PPC_2_04 0x08 /* set if we support PowerPC 2.04 */ | ||
| 667 | #define OV1_PPC_2_05 0x04 /* set if we support PowerPC 2.05 */ | ||
| 668 | |||
| 669 | /* Option vector 2: Open Firmware options supported */ | ||
| 670 | #define OV2_REAL_MODE 0x20 /* set if we want OF in real mode */ | ||
| 671 | |||
| 672 | /* Option vector 3: processor options supported */ | ||
| 673 | #define OV3_FP 0x80 /* floating point */ | ||
| 674 | #define OV3_VMX 0x40 /* VMX/Altivec */ | ||
| 675 | |||
| 676 | /* Option vector 5: PAPR/OF options supported */ | ||
| 677 | #define OV5_LPAR 0x80 /* logical partitioning supported */ | ||
| 678 | #define OV5_SPLPAR 0x40 /* shared-processor LPAR supported */ | ||
| 679 | /* ibm,dynamic-reconfiguration-memory property supported */ | ||
| 680 | #define OV5_DRCONF_MEMORY 0x20 | ||
| 681 | #define OV5_LARGE_PAGES 0x10 /* large pages supported */ | ||
| 682 | |||
| 683 | /* | ||
| 684 | * The architecture vector has an array of PVR mask/value pairs, | ||
| 685 | * followed by # option vectors - 1, followed by the option vectors. | ||
| 686 | */ | ||
| 687 | static unsigned char ibm_architecture_vec[] = { | ||
| 688 | W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */ | ||
| 689 | W(0xffff0000), W(0x003e0000), /* POWER6 */ | ||
| 690 | W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */ | ||
| 691 | 5 - 1, /* 5 option vectors */ | ||
| 692 | |||
| 693 | /* option vector 1: processor architectures supported */ | ||
| 694 | 3 - 1, /* length */ | ||
| 695 | 0, /* don't ignore, don't halt */ | ||
| 696 | OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 | | ||
| 697 | OV1_PPC_2_04 | OV1_PPC_2_05, | ||
| 698 | |||
| 699 | /* option vector 2: Open Firmware options supported */ | ||
| 700 | 34 - 1, /* length */ | ||
| 701 | OV2_REAL_MODE, | ||
| 702 | 0, 0, | ||
| 703 | W(0xffffffff), /* real_base */ | ||
| 704 | W(0xffffffff), /* real_size */ | ||
| 705 | W(0xffffffff), /* virt_base */ | ||
| 706 | W(0xffffffff), /* virt_size */ | ||
| 707 | W(0xffffffff), /* load_base */ | ||
| 708 | W(64), /* 128MB min RMA */ | ||
| 709 | W(0xffffffff), /* full client load */ | ||
| 710 | 0, /* min RMA percentage of total RAM */ | ||
| 711 | 48, /* max log_2(hash table size) */ | ||
| 712 | |||
| 713 | /* option vector 3: processor options supported */ | ||
| 714 | 3 - 1, /* length */ | ||
| 715 | 0, /* don't ignore, don't halt */ | ||
| 716 | OV3_FP | OV3_VMX, | ||
| 717 | |||
| 718 | /* option vector 4: IBM PAPR implementation */ | ||
| 719 | 2 - 1, /* length */ | ||
| 720 | 0, /* don't halt */ | ||
| 721 | |||
| 722 | /* option vector 5: PAPR/OF options */ | ||
| 723 | 3 - 1, /* length */ | ||
| 724 | 0, /* don't ignore, don't halt */ | ||
| 725 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES, | ||
| 726 | }; | ||
| 727 | |||
| 728 | /* Old method - ELF header with PT_NOTE sections */ | ||
| 643 | static struct fake_elf { | 729 | static struct fake_elf { |
| 644 | Elf32_Ehdr elfhdr; | 730 | Elf32_Ehdr elfhdr; |
| 645 | Elf32_Phdr phdr[2]; | 731 | Elf32_Phdr phdr[2]; |
| @@ -728,8 +814,26 @@ static struct fake_elf { | |||
| 728 | 814 | ||
| 729 | static void __init prom_send_capabilities(void) | 815 | static void __init prom_send_capabilities(void) |
| 730 | { | 816 | { |
| 731 | ihandle elfloader; | 817 | ihandle elfloader, root; |
| 818 | prom_arg_t ret; | ||
| 819 | |||
| 820 | root = call_prom("open", 1, 1, ADDR("/")); | ||
| 821 | if (root != 0) { | ||
| 822 | /* try calling the ibm,client-architecture-support method */ | ||
| 823 | if (call_prom_ret("call-method", 3, 2, &ret, | ||
| 824 | ADDR("ibm,client-architecture-support"), | ||
| 825 | ADDR(ibm_architecture_vec)) == 0) { | ||
| 826 | /* the call exists... */ | ||
| 827 | if (ret) | ||
| 828 | prom_printf("WARNING: ibm,client-architecture" | ||
| 829 | "-support call FAILED!\n"); | ||
| 830 | call_prom("close", 1, 0, root); | ||
| 831 | return; | ||
| 832 | } | ||
| 833 | call_prom("close", 1, 0, root); | ||
| 834 | } | ||
| 732 | 835 | ||
| 836 | /* no ibm,client-architecture-support call, try the old way */ | ||
| 733 | elfloader = call_prom("open", 1, 1, ADDR("/packages/elf-loader")); | 837 | elfloader = call_prom("open", 1, 1, ADDR("/packages/elf-loader")); |
| 734 | if (elfloader == 0) { | 838 | if (elfloader == 0) { |
| 735 | prom_printf("couldn't open /packages/elf-loader\n"); | 839 | prom_printf("couldn't open /packages/elf-loader\n"); |
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 1d93e73a7003..684ab1d49c65 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
| @@ -516,3 +516,11 @@ void probe_machine(void) | |||
| 516 | 516 | ||
| 517 | printk(KERN_INFO "Using %s machine description\n", ppc_md.name); | 517 | printk(KERN_INFO "Using %s machine description\n", ppc_md.name); |
| 518 | } | 518 | } |
| 519 | |||
| 520 | int check_legacy_ioport(unsigned long base_port) | ||
| 521 | { | ||
| 522 | if (ppc_md.check_legacy_ioport == NULL) | ||
| 523 | return 0; | ||
| 524 | return ppc_md.check_legacy_ioport(base_port); | ||
| 525 | } | ||
| 526 | EXPORT_SYMBOL(check_legacy_ioport); | ||
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 13e91c4d70a8..4467c49903b6 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -594,14 +594,6 @@ void ppc64_terminate_msg(unsigned int src, const char *msg) | |||
| 594 | printk("[terminate]%04x %s\n", src, msg); | 594 | printk("[terminate]%04x %s\n", src, msg); |
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | int check_legacy_ioport(unsigned long base_port) | ||
| 598 | { | ||
| 599 | if (ppc_md.check_legacy_ioport == NULL) | ||
| 600 | return 0; | ||
| 601 | return ppc_md.check_legacy_ioport(base_port); | ||
| 602 | } | ||
| 603 | EXPORT_SYMBOL(check_legacy_ioport); | ||
| 604 | |||
| 605 | void cpu_die(void) | 597 | void cpu_die(void) |
| 606 | { | 598 | { |
| 607 | if (ppc_md.cpu_die) | 599 | if (ppc_md.cpu_die) |
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 73560ef6f802..ed737cacf92d 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
| @@ -279,7 +279,7 @@ static void unregister_cpu_online(unsigned int cpu) | |||
| 279 | } | 279 | } |
| 280 | #endif /* CONFIG_HOTPLUG_CPU */ | 280 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 281 | 281 | ||
| 282 | static int __devinit sysfs_cpu_notify(struct notifier_block *self, | 282 | static int sysfs_cpu_notify(struct notifier_block *self, |
| 283 | unsigned long action, void *hcpu) | 283 | unsigned long action, void *hcpu) |
| 284 | { | 284 | { |
| 285 | unsigned int cpu = (unsigned int)(long)hcpu; | 285 | unsigned int cpu = (unsigned int)(long)hcpu; |
| @@ -297,7 +297,7 @@ static int __devinit sysfs_cpu_notify(struct notifier_block *self, | |||
| 297 | return NOTIFY_OK; | 297 | return NOTIFY_OK; |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | static struct notifier_block __devinitdata sysfs_cpu_nb = { | 300 | static struct notifier_block sysfs_cpu_nb = { |
| 301 | .notifier_call = sysfs_cpu_notify, | 301 | .notifier_call = sysfs_cpu_notify, |
| 302 | }; | 302 | }; |
| 303 | 303 | ||
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 8d1522690501..cf56a1d499ff 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S | |||
| @@ -324,6 +324,20 @@ COMPAT_SYS(ppoll) | |||
| 324 | SYSCALL(unshare) | 324 | SYSCALL(unshare) |
| 325 | SYSCALL(splice) | 325 | SYSCALL(splice) |
| 326 | SYSCALL(tee) | 326 | SYSCALL(tee) |
| 327 | SYSCALL(vmsplice) | ||
| 328 | COMPAT_SYS(openat) | ||
| 329 | SYSCALL(mkdirat) | ||
| 330 | SYSCALL(mknodat) | ||
| 331 | SYSCALL(fchownat) | ||
| 332 | COMPAT_SYS(futimesat) | ||
| 333 | SYSX(sys_newfstatat, sys_fstatat64, sys_fstatat64) | ||
| 334 | SYSCALL(unlinkat) | ||
| 335 | SYSCALL(renameat) | ||
| 336 | SYSCALL(linkat) | ||
| 337 | SYSCALL(symlinkat) | ||
| 338 | SYSCALL(readlinkat) | ||
| 339 | SYSCALL(fchmodat) | ||
| 340 | SYSCALL(faccessat) | ||
| 327 | 341 | ||
| 328 | /* | 342 | /* |
| 329 | * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c | 343 | * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 7370f9f33e29..266b8b2ceac9 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -30,13 +30,66 @@ | |||
| 30 | #define NUM_LOW_AREAS (0x100000000UL >> SID_SHIFT) | 30 | #define NUM_LOW_AREAS (0x100000000UL >> SID_SHIFT) |
| 31 | #define NUM_HIGH_AREAS (PGTABLE_RANGE >> HTLB_AREA_SHIFT) | 31 | #define NUM_HIGH_AREAS (PGTABLE_RANGE >> HTLB_AREA_SHIFT) |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_PPC_64K_PAGES | ||
| 34 | #define HUGEPTE_INDEX_SIZE (PMD_SHIFT-HPAGE_SHIFT) | ||
| 35 | #else | ||
| 36 | #define HUGEPTE_INDEX_SIZE (PUD_SHIFT-HPAGE_SHIFT) | ||
| 37 | #endif | ||
| 38 | #define PTRS_PER_HUGEPTE (1 << HUGEPTE_INDEX_SIZE) | ||
| 39 | #define HUGEPTE_TABLE_SIZE (sizeof(pte_t) << HUGEPTE_INDEX_SIZE) | ||
| 40 | |||
| 41 | #define HUGEPD_SHIFT (HPAGE_SHIFT + HUGEPTE_INDEX_SIZE) | ||
| 42 | #define HUGEPD_SIZE (1UL << HUGEPD_SHIFT) | ||
| 43 | #define HUGEPD_MASK (~(HUGEPD_SIZE-1)) | ||
| 44 | |||
| 45 | #define huge_pgtable_cache (pgtable_cache[HUGEPTE_CACHE_NUM]) | ||
| 46 | |||
| 47 | /* Flag to mark huge PD pointers. This means pmd_bad() and pud_bad() | ||
| 48 | * will choke on pointers to hugepte tables, which is handy for | ||
| 49 | * catching screwups early. */ | ||
| 50 | #define HUGEPD_OK 0x1 | ||
| 51 | |||
| 52 | typedef struct { unsigned long pd; } hugepd_t; | ||
| 53 | |||
| 54 | #define hugepd_none(hpd) ((hpd).pd == 0) | ||
| 55 | |||
| 56 | static inline pte_t *hugepd_page(hugepd_t hpd) | ||
| 57 | { | ||
| 58 | BUG_ON(!(hpd.pd & HUGEPD_OK)); | ||
| 59 | return (pte_t *)(hpd.pd & ~HUGEPD_OK); | ||
| 60 | } | ||
| 61 | |||
| 62 | static inline pte_t *hugepte_offset(hugepd_t *hpdp, unsigned long addr) | ||
| 63 | { | ||
| 64 | unsigned long idx = ((addr >> HPAGE_SHIFT) & (PTRS_PER_HUGEPTE-1)); | ||
| 65 | pte_t *dir = hugepd_page(*hpdp); | ||
| 66 | |||
| 67 | return dir + idx; | ||
| 68 | } | ||
| 69 | |||
| 70 | static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, | ||
| 71 | unsigned long address) | ||
| 72 | { | ||
| 73 | pte_t *new = kmem_cache_alloc(huge_pgtable_cache, | ||
| 74 | GFP_KERNEL|__GFP_REPEAT); | ||
| 75 | |||
| 76 | if (! new) | ||
| 77 | return -ENOMEM; | ||
| 78 | |||
| 79 | spin_lock(&mm->page_table_lock); | ||
| 80 | if (!hugepd_none(*hpdp)) | ||
| 81 | kmem_cache_free(huge_pgtable_cache, new); | ||
| 82 | else | ||
| 83 | hpdp->pd = (unsigned long)new | HUGEPD_OK; | ||
| 84 | spin_unlock(&mm->page_table_lock); | ||
| 85 | return 0; | ||
| 86 | } | ||
| 87 | |||
| 33 | /* Modelled after find_linux_pte() */ | 88 | /* Modelled after find_linux_pte() */ |
| 34 | pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) | 89 | pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) |
| 35 | { | 90 | { |
| 36 | pgd_t *pg; | 91 | pgd_t *pg; |
| 37 | pud_t *pu; | 92 | pud_t *pu; |
| 38 | pmd_t *pm; | ||
| 39 | pte_t *pt; | ||
| 40 | 93 | ||
| 41 | BUG_ON(! in_hugepage_area(mm->context, addr)); | 94 | BUG_ON(! in_hugepage_area(mm->context, addr)); |
| 42 | 95 | ||
| @@ -46,26 +99,14 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) | |||
| 46 | if (!pgd_none(*pg)) { | 99 | if (!pgd_none(*pg)) { |
| 47 | pu = pud_offset(pg, addr); | 100 | pu = pud_offset(pg, addr); |
| 48 | if (!pud_none(*pu)) { | 101 | if (!pud_none(*pu)) { |
| 49 | pm = pmd_offset(pu, addr); | ||
| 50 | #ifdef CONFIG_PPC_64K_PAGES | 102 | #ifdef CONFIG_PPC_64K_PAGES |
| 51 | /* Currently, we use the normal PTE offset within full | 103 | pmd_t *pm; |
| 52 | * size PTE pages, thus our huge PTEs are scattered in | 104 | pm = pmd_offset(pu, addr); |
| 53 | * the PTE page and we do waste some. We may change | 105 | if (!pmd_none(*pm)) |
| 54 | * that in the future, but the current mecanism keeps | 106 | return hugepte_offset((hugepd_t *)pm, addr); |
| 55 | * things much simpler | 107 | #else |
| 56 | */ | 108 | return hugepte_offset((hugepd_t *)pu, addr); |
| 57 | if (!pmd_none(*pm)) { | 109 | #endif |
| 58 | /* Note: pte_offset_* are all equivalent on | ||
| 59 | * ppc64 as we don't have HIGHMEM | ||
| 60 | */ | ||
| 61 | pt = pte_offset_kernel(pm, addr); | ||
| 62 | return pt; | ||
| 63 | } | ||
| 64 | #else /* CONFIG_PPC_64K_PAGES */ | ||
| 65 | /* On 4k pages, we put huge PTEs in the PMD page */ | ||
| 66 | pt = (pte_t *)pm; | ||
| 67 | return pt; | ||
| 68 | #endif /* CONFIG_PPC_64K_PAGES */ | ||
| 69 | } | 110 | } |
| 70 | } | 111 | } |
| 71 | 112 | ||
| @@ -76,8 +117,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr) | |||
| 76 | { | 117 | { |
| 77 | pgd_t *pg; | 118 | pgd_t *pg; |
| 78 | pud_t *pu; | 119 | pud_t *pu; |
| 79 | pmd_t *pm; | 120 | hugepd_t *hpdp = NULL; |
| 80 | pte_t *pt; | ||
| 81 | 121 | ||
| 82 | BUG_ON(! in_hugepage_area(mm->context, addr)); | 122 | BUG_ON(! in_hugepage_area(mm->context, addr)); |
| 83 | 123 | ||
| @@ -87,23 +127,182 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr) | |||
| 87 | pu = pud_alloc(mm, pg, addr); | 127 | pu = pud_alloc(mm, pg, addr); |
| 88 | 128 | ||
| 89 | if (pu) { | 129 | if (pu) { |
| 130 | #ifdef CONFIG_PPC_64K_PAGES | ||
| 131 | pmd_t *pm; | ||
| 90 | pm = pmd_alloc(mm, pu, addr); | 132 | pm = pmd_alloc(mm, pu, addr); |
| 91 | if (pm) { | 133 | if (pm) |
| 134 | hpdp = (hugepd_t *)pm; | ||
| 135 | #else | ||
| 136 | hpdp = (hugepd_t *)pu; | ||
| 137 | #endif | ||
| 138 | } | ||
| 139 | |||
| 140 | if (! hpdp) | ||
| 141 | return NULL; | ||
| 142 | |||
| 143 | if (hugepd_none(*hpdp) && __hugepte_alloc(mm, hpdp, addr)) | ||
| 144 | return NULL; | ||
| 145 | |||
| 146 | return hugepte_offset(hpdp, addr); | ||
| 147 | } | ||
| 148 | |||
| 149 | static void free_hugepte_range(struct mmu_gather *tlb, hugepd_t *hpdp) | ||
| 150 | { | ||
| 151 | pte_t *hugepte = hugepd_page(*hpdp); | ||
| 152 | |||
| 153 | hpdp->pd = 0; | ||
| 154 | tlb->need_flush = 1; | ||
| 155 | pgtable_free_tlb(tlb, pgtable_free_cache(hugepte, HUGEPTE_CACHE_NUM, | ||
| 156 | HUGEPTE_TABLE_SIZE-1)); | ||
| 157 | } | ||
| 158 | |||
| 92 | #ifdef CONFIG_PPC_64K_PAGES | 159 | #ifdef CONFIG_PPC_64K_PAGES |
| 93 | /* See comment in huge_pte_offset. Note that if we ever | 160 | static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud, |
| 94 | * want to put the page size in the PMD, we would have | 161 | unsigned long addr, unsigned long end, |
| 95 | * to open code our own pte_alloc* function in order | 162 | unsigned long floor, unsigned long ceiling) |
| 96 | * to populate and set the size atomically | 163 | { |
| 97 | */ | 164 | pmd_t *pmd; |
| 98 | pt = pte_alloc_map(mm, pm, addr); | 165 | unsigned long next; |
| 99 | #else /* CONFIG_PPC_64K_PAGES */ | 166 | unsigned long start; |
| 100 | pt = (pte_t *)pm; | 167 | |
| 101 | #endif /* CONFIG_PPC_64K_PAGES */ | 168 | start = addr; |
| 102 | return pt; | 169 | pmd = pmd_offset(pud, addr); |
| 103 | } | 170 | do { |
| 171 | next = pmd_addr_end(addr, end); | ||
| 172 | if (pmd_none(*pmd)) | ||
| 173 | continue; | ||
| 174 | free_hugepte_range(tlb, (hugepd_t *)pmd); | ||
| 175 | } while (pmd++, addr = next, addr != end); | ||
| 176 | |||
| 177 | start &= PUD_MASK; | ||
| 178 | if (start < floor) | ||
| 179 | return; | ||
| 180 | if (ceiling) { | ||
| 181 | ceiling &= PUD_MASK; | ||
| 182 | if (!ceiling) | ||
| 183 | return; | ||
| 104 | } | 184 | } |
| 185 | if (end - 1 > ceiling - 1) | ||
| 186 | return; | ||
| 105 | 187 | ||
| 106 | return NULL; | 188 | pmd = pmd_offset(pud, start); |
| 189 | pud_clear(pud); | ||
| 190 | pmd_free_tlb(tlb, pmd); | ||
| 191 | } | ||
| 192 | #endif | ||
| 193 | |||
| 194 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, | ||
| 195 | unsigned long addr, unsigned long end, | ||
| 196 | unsigned long floor, unsigned long ceiling) | ||
| 197 | { | ||
| 198 | pud_t *pud; | ||
| 199 | unsigned long next; | ||
| 200 | unsigned long start; | ||
| 201 | |||
| 202 | start = addr; | ||
| 203 | pud = pud_offset(pgd, addr); | ||
| 204 | do { | ||
| 205 | next = pud_addr_end(addr, end); | ||
| 206 | #ifdef CONFIG_PPC_64K_PAGES | ||
| 207 | if (pud_none_or_clear_bad(pud)) | ||
| 208 | continue; | ||
| 209 | hugetlb_free_pmd_range(tlb, pud, addr, next, floor, ceiling); | ||
| 210 | #else | ||
| 211 | if (pud_none(*pud)) | ||
| 212 | continue; | ||
| 213 | free_hugepte_range(tlb, (hugepd_t *)pud); | ||
| 214 | #endif | ||
| 215 | } while (pud++, addr = next, addr != end); | ||
| 216 | |||
| 217 | start &= PGDIR_MASK; | ||
| 218 | if (start < floor) | ||
| 219 | return; | ||
| 220 | if (ceiling) { | ||
| 221 | ceiling &= PGDIR_MASK; | ||
| 222 | if (!ceiling) | ||
| 223 | return; | ||
| 224 | } | ||
| 225 | if (end - 1 > ceiling - 1) | ||
| 226 | return; | ||
| 227 | |||
| 228 | pud = pud_offset(pgd, start); | ||
| 229 | pgd_clear(pgd); | ||
| 230 | pud_free_tlb(tlb, pud); | ||
| 231 | } | ||
| 232 | |||
| 233 | /* | ||
| 234 | * This function frees user-level page tables of a process. | ||
| 235 | * | ||
| 236 | * Must be called with pagetable lock held. | ||
| 237 | */ | ||
| 238 | void hugetlb_free_pgd_range(struct mmu_gather **tlb, | ||
| 239 | unsigned long addr, unsigned long end, | ||
| 240 | unsigned long floor, unsigned long ceiling) | ||
| 241 | { | ||
| 242 | pgd_t *pgd; | ||
| 243 | unsigned long next; | ||
| 244 | unsigned long start; | ||
| 245 | |||
| 246 | /* | ||
| 247 | * Comments below take from the normal free_pgd_range(). They | ||
| 248 | * apply here too. The tests against HUGEPD_MASK below are | ||
| 249 | * essential, because we *don't* test for this at the bottom | ||
| 250 | * level. Without them we'll attempt to free a hugepte table | ||
| 251 | * when we unmap just part of it, even if there are other | ||
| 252 | * active mappings using it. | ||
| 253 | * | ||
| 254 | * The next few lines have given us lots of grief... | ||
| 255 | * | ||
| 256 | * Why are we testing HUGEPD* at this top level? Because | ||
| 257 | * often there will be no work to do at all, and we'd prefer | ||
| 258 | * not to go all the way down to the bottom just to discover | ||
| 259 | * that. | ||
| 260 | * | ||
| 261 | * Why all these "- 1"s? Because 0 represents both the bottom | ||
| 262 | * of the address space and the top of it (using -1 for the | ||
| 263 | * top wouldn't help much: the masks would do the wrong thing). | ||
| 264 | * The rule is that addr 0 and floor 0 refer to the bottom of | ||
| 265 | * the address space, but end 0 and ceiling 0 refer to the top | ||
| 266 | * Comparisons need to use "end - 1" and "ceiling - 1" (though | ||
| 267 | * that end 0 case should be mythical). | ||
| 268 | * | ||
| 269 | * Wherever addr is brought up or ceiling brought down, we | ||
| 270 | * must be careful to reject "the opposite 0" before it | ||
| 271 | * confuses the subsequent tests. But what about where end is | ||
| 272 | * brought down by HUGEPD_SIZE below? no, end can't go down to | ||
| 273 | * 0 there. | ||
| 274 | * | ||
| 275 | * Whereas we round start (addr) and ceiling down, by different | ||
| 276 | * masks at different levels, in order to test whether a table | ||
| 277 | * now has no other vmas using it, so can be freed, we don't | ||
| 278 | * bother to round floor or end up - the tests don't need that. | ||
| 279 | */ | ||
| 280 | |||
| 281 | addr &= HUGEPD_MASK; | ||
| 282 | if (addr < floor) { | ||
| 283 | addr += HUGEPD_SIZE; | ||
| 284 | if (!addr) | ||
| 285 | return; | ||
| 286 | } | ||
| 287 | if (ceiling) { | ||
| 288 | ceiling &= HUGEPD_MASK; | ||
| 289 | if (!ceiling) | ||
| 290 | return; | ||
| 291 | } | ||
| 292 | if (end - 1 > ceiling - 1) | ||
| 293 | end -= HUGEPD_SIZE; | ||
| 294 | if (addr > end - 1) | ||
| 295 | return; | ||
| 296 | |||
| 297 | start = addr; | ||
| 298 | pgd = pgd_offset((*tlb)->mm, addr); | ||
| 299 | do { | ||
| 300 | BUG_ON(! in_hugepage_area((*tlb)->mm->context, addr)); | ||
| 301 | next = pgd_addr_end(addr, end); | ||
| 302 | if (pgd_none_or_clear_bad(pgd)) | ||
| 303 | continue; | ||
| 304 | hugetlb_free_pud_range(*tlb, pgd, addr, next, floor, ceiling); | ||
| 305 | } while (pgd++, addr = next, addr != end); | ||
| 107 | } | 306 | } |
| 108 | 307 | ||
| 109 | void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | 308 | void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, |
| @@ -841,3 +1040,27 @@ repeat: | |||
| 841 | out: | 1040 | out: |
| 842 | return err; | 1041 | return err; |
| 843 | } | 1042 | } |
| 1043 | |||
| 1044 | static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags) | ||
| 1045 | { | ||
| 1046 | memset(addr, 0, kmem_cache_size(cache)); | ||
| 1047 | } | ||
| 1048 | |||
| 1049 | static int __init hugetlbpage_init(void) | ||
| 1050 | { | ||
| 1051 | if (!cpu_has_feature(CPU_FTR_16M_PAGE)) | ||
| 1052 | return -ENODEV; | ||
| 1053 | |||
| 1054 | huge_pgtable_cache = kmem_cache_create("hugepte_cache", | ||
| 1055 | HUGEPTE_TABLE_SIZE, | ||
| 1056 | HUGEPTE_TABLE_SIZE, | ||
| 1057 | SLAB_HWCACHE_ALIGN | | ||
| 1058 | SLAB_MUST_HWCACHE_ALIGN, | ||
| 1059 | zero_ctor, NULL); | ||
| 1060 | if (! huge_pgtable_cache) | ||
| 1061 | panic("hugetlbpage_init(): could not create hugepte cache\n"); | ||
| 1062 | |||
| 1063 | return 0; | ||
| 1064 | } | ||
| 1065 | |||
| 1066 | module_init(hugetlbpage_init); | ||
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index babebd15bdc4..9e30f968c184 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c | |||
| @@ -162,7 +162,14 @@ static const char *pgtable_cache_name[ARRAY_SIZE(pgtable_cache_size)] = { | |||
| 162 | }; | 162 | }; |
| 163 | #endif /* CONFIG_PPC_64K_PAGES */ | 163 | #endif /* CONFIG_PPC_64K_PAGES */ |
| 164 | 164 | ||
| 165 | #ifdef CONFIG_HUGETLB_PAGE | ||
| 166 | /* Hugepages need one extra cache, initialized in hugetlbpage.c. We | ||
| 167 | * can't put into the tables above, because HPAGE_SHIFT is not compile | ||
| 168 | * time constant. */ | ||
| 169 | kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)+1]; | ||
| 170 | #else | ||
| 165 | kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)]; | 171 | kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)]; |
| 172 | #endif | ||
| 166 | 173 | ||
| 167 | void pgtable_cache_init(void) | 174 | void pgtable_cache_init(void) |
| 168 | { | 175 | { |
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 269dda4fd0b4..ef47a6239d48 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c | |||
| @@ -306,19 +306,19 @@ spu_request_irqs(struct spu *spu) | |||
| 306 | 306 | ||
| 307 | snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number); | 307 | snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number); |
| 308 | ret = request_irq(irq_base + spu->isrc, | 308 | ret = request_irq(irq_base + spu->isrc, |
| 309 | spu_irq_class_0, 0, spu->irq_c0, spu); | 309 | spu_irq_class_0, SA_INTERRUPT, spu->irq_c0, spu); |
| 310 | if (ret) | 310 | if (ret) |
| 311 | goto out; | 311 | goto out; |
| 312 | 312 | ||
| 313 | snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number); | 313 | snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number); |
| 314 | ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc, | 314 | ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc, |
| 315 | spu_irq_class_1, 0, spu->irq_c1, spu); | 315 | spu_irq_class_1, SA_INTERRUPT, spu->irq_c1, spu); |
| 316 | if (ret) | 316 | if (ret) |
| 317 | goto out1; | 317 | goto out1; |
| 318 | 318 | ||
| 319 | snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number); | 319 | snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number); |
| 320 | ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc, | 320 | ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc, |
| 321 | spu_irq_class_2, 0, spu->irq_c2, spu); | 321 | spu_irq_class_2, SA_INTERRUPT, spu->irq_c2, spu); |
| 322 | if (ret) | 322 | if (ret) |
| 323 | goto out2; | 323 | goto out2; |
| 324 | goto out; | 324 | goto out; |
| @@ -487,10 +487,14 @@ int spu_irq_class_1_bottom(struct spu *spu) | |||
| 487 | ea = spu->dar; | 487 | ea = spu->dar; |
| 488 | dsisr = spu->dsisr; | 488 | dsisr = spu->dsisr; |
| 489 | if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) { | 489 | if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) { |
| 490 | u64 flags; | ||
| 491 | |||
| 490 | access = (_PAGE_PRESENT | _PAGE_USER); | 492 | access = (_PAGE_PRESENT | _PAGE_USER); |
| 491 | access |= (dsisr & MFC_DSISR_ACCESS_PUT) ? _PAGE_RW : 0UL; | 493 | access |= (dsisr & MFC_DSISR_ACCESS_PUT) ? _PAGE_RW : 0UL; |
| 494 | local_irq_save(flags); | ||
| 492 | if (hash_page(ea, access, 0x300) != 0) | 495 | if (hash_page(ea, access, 0x300) != 0) |
| 493 | error |= CLASS1_ENABLE_STORAGE_FAULT_INTR; | 496 | error |= CLASS1_ENABLE_STORAGE_FAULT_INTR; |
| 497 | local_irq_restore(flags); | ||
| 494 | } | 498 | } |
| 495 | if (error & CLASS1_ENABLE_STORAGE_FAULT_INTR) { | 499 | if (error & CLASS1_ENABLE_STORAGE_FAULT_INTR) { |
| 496 | if ((ret = spu_handle_mm_fault(spu)) != 0) | 500 | if ((ret = spu_handle_mm_fault(spu)) != 0) |
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c index deb3afb94484..95b36430aa0f 100644 --- a/arch/powerpc/platforms/cell/spu_callbacks.c +++ b/arch/powerpc/platforms/cell/spu_callbacks.c | |||
| @@ -318,6 +318,20 @@ void *spu_syscall_table[] = { | |||
| 318 | [__NR_unshare] sys_unshare, | 318 | [__NR_unshare] sys_unshare, |
| 319 | [__NR_splice] sys_splice, | 319 | [__NR_splice] sys_splice, |
| 320 | [__NR_tee] sys_tee, | 320 | [__NR_tee] sys_tee, |
| 321 | [__NR_vmsplice] sys_vmsplice, | ||
| 322 | [__NR_openat] sys_openat, | ||
| 323 | [__NR_mkdirat] sys_mkdirat, | ||
| 324 | [__NR_mknodat] sys_mknodat, | ||
| 325 | [__NR_fchownat] sys_fchownat, | ||
| 326 | [__NR_futimesat] sys_futimesat, | ||
| 327 | [__NR_newfstatat] sys_newfstatat, | ||
| 328 | [__NR_unlinkat] sys_unlinkat, | ||
| 329 | [__NR_renameat] sys_renameat, | ||
| 330 | [__NR_linkat] sys_linkat, | ||
| 331 | [__NR_symlinkat] sys_symlinkat, | ||
| 332 | [__NR_readlinkat] sys_readlinkat, | ||
| 333 | [__NR_fchmodat] sys_fchmodat, | ||
| 334 | [__NR_faccessat] sys_faccessat, | ||
| 321 | }; | 335 | }; |
| 322 | 336 | ||
| 323 | long spu_sys_callback(struct spu_syscall_block *s) | 337 | long spu_sys_callback(struct spu_syscall_block *s) |
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 3212618e7909..80035853467b 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
| @@ -1094,7 +1094,7 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial) | |||
| 1094 | * (iBook second controller) | 1094 | * (iBook second controller) |
| 1095 | */ | 1095 | */ |
| 1096 | if (dev->vendor == PCI_VENDOR_ID_APPLE | 1096 | if (dev->vendor == PCI_VENDOR_ID_APPLE |
| 1097 | && (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10)) | 1097 | && dev->class == PCI_CLASS_SERIAL_USB_OHCI |
| 1098 | && !node) { | 1098 | && !node) { |
| 1099 | printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n", | 1099 | printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n", |
| 1100 | pci_name(dev)); | 1100 | pci_name(dev)); |
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c index f841972f1fa9..554776d4b8ac 100644 --- a/arch/ppc/platforms/4xx/ocotea.c +++ b/arch/ppc/platforms/4xx/ocotea.c | |||
| @@ -331,7 +331,7 @@ static void __init ocotea_init(void) | |||
| 331 | void __init platform_init(unsigned long r3, unsigned long r4, | 331 | void __init platform_init(unsigned long r3, unsigned long r4, |
| 332 | unsigned long r5, unsigned long r6, unsigned long r7) | 332 | unsigned long r5, unsigned long r6, unsigned long r7) |
| 333 | { | 333 | { |
| 334 | ibm44x_platform_init(r3, r4, r5, r6, r7); | 334 | ibm440gx_platform_init(r3, r4, r5, r6, r7); |
| 335 | 335 | ||
| 336 | ppc_md.setup_arch = ocotea_setup_arch; | 336 | ppc_md.setup_arch = ocotea_setup_arch; |
| 337 | ppc_md.show_cpuinfo = ocotea_show_cpuinfo; | 337 | ppc_md.show_cpuinfo = ocotea_show_cpuinfo; |
diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c index bc9b94f77e39..e62b75707f7a 100644 --- a/arch/ppc/platforms/mpc8272ads_setup.c +++ b/arch/ppc/platforms/mpc8272ads_setup.c | |||
| @@ -26,11 +26,35 @@ | |||
| 26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
| 27 | #include <asm/ppc_sys.h> | 27 | #include <asm/ppc_sys.h> |
| 28 | #include <asm/ppcboot.h> | 28 | #include <asm/ppcboot.h> |
| 29 | #include <linux/fs_uart_pd.h> | ||
| 29 | 30 | ||
| 30 | #include "pq2ads_pd.h" | 31 | #include "pq2ads_pd.h" |
| 31 | 32 | ||
| 32 | static void init_fcc1_ioports(void); | 33 | static void init_fcc1_ioports(void); |
| 33 | static void init_fcc2_ioports(void); | 34 | static void init_fcc2_ioports(void); |
| 35 | static void init_scc1_uart_ioports(void); | ||
| 36 | static void init_scc4_uart_ioports(void); | ||
| 37 | |||
| 38 | static struct fs_uart_platform_info mpc8272_uart_pdata[] = { | ||
| 39 | [fsid_scc1_uart] = { | ||
| 40 | .init_ioports = init_scc1_uart_ioports, | ||
| 41 | .fs_no = fsid_scc1_uart, | ||
| 42 | .brg = 1, | ||
| 43 | .tx_num_fifo = 4, | ||
| 44 | .tx_buf_size = 32, | ||
| 45 | .rx_num_fifo = 4, | ||
| 46 | .rx_buf_size = 32, | ||
| 47 | }, | ||
| 48 | [fsid_scc4_uart] = { | ||
| 49 | .init_ioports = init_scc4_uart_ioports, | ||
| 50 | .fs_no = fsid_scc4_uart, | ||
| 51 | .brg = 4, | ||
| 52 | .tx_num_fifo = 4, | ||
| 53 | .tx_buf_size = 32, | ||
| 54 | .rx_num_fifo = 4, | ||
| 55 | .rx_buf_size = 32, | ||
| 56 | }, | ||
| 57 | }; | ||
| 34 | 58 | ||
| 35 | static struct fs_mii_bus_info mii_bus_info = { | 59 | static struct fs_mii_bus_info mii_bus_info = { |
| 36 | .method = fsmii_bitbang, | 60 | .method = fsmii_bitbang, |
| @@ -201,6 +225,55 @@ static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev, | |||
| 201 | } | 225 | } |
| 202 | } | 226 | } |
| 203 | 227 | ||
| 228 | static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev, | ||
| 229 | int idx) | ||
| 230 | { | ||
| 231 | bd_t *bd = (bd_t *) __res; | ||
| 232 | struct fs_uart_platform_info *pinfo; | ||
| 233 | int num = ARRAY_SIZE(mpc8272_uart_pdata); | ||
| 234 | int id = fs_uart_id_scc2fsid(idx); | ||
| 235 | |||
| 236 | /* no need to alter anything if console */ | ||
| 237 | if ((id <= num) && (!pdev->dev.platform_data)) { | ||
| 238 | pinfo = &mpc8272_uart_pdata[id]; | ||
| 239 | pinfo->uart_clk = bd->bi_intfreq; | ||
| 240 | pdev->dev.platform_data = pinfo; | ||
| 241 | } | ||
| 242 | } | ||
| 243 | |||
| 244 | static void init_scc1_uart_ioports(void) | ||
| 245 | { | ||
| 246 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
| 247 | |||
| 248 | /* SCC1 is only on port D */ | ||
| 249 | setbits32(&immap->im_ioport.iop_ppard,0x00000003); | ||
| 250 | clrbits32(&immap->im_ioport.iop_psord,0x00000001); | ||
| 251 | setbits32(&immap->im_ioport.iop_psord,0x00000002); | ||
| 252 | clrbits32(&immap->im_ioport.iop_pdird,0x00000001); | ||
| 253 | setbits32(&immap->im_ioport.iop_pdird,0x00000002); | ||
| 254 | |||
| 255 | /* Wire BRG1 to SCC1 */ | ||
| 256 | clrbits32(&immap->im_cpmux.cmx_scr,0x00ffffff); | ||
| 257 | |||
| 258 | iounmap(immap); | ||
| 259 | } | ||
| 260 | |||
| 261 | static void init_scc4_uart_ioports(void) | ||
| 262 | { | ||
| 263 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
| 264 | |||
| 265 | setbits32(&immap->im_ioport.iop_ppard,0x00000600); | ||
| 266 | clrbits32(&immap->im_ioport.iop_psord,0x00000600); | ||
| 267 | clrbits32(&immap->im_ioport.iop_pdird,0x00000200); | ||
| 268 | setbits32(&immap->im_ioport.iop_pdird,0x00000400); | ||
| 269 | |||
| 270 | /* Wire BRG4 to SCC4 */ | ||
| 271 | clrbits32(&immap->im_cpmux.cmx_scr,0x000000ff); | ||
| 272 | setbits32(&immap->im_cpmux.cmx_scr,0x0000001b); | ||
| 273 | |||
| 274 | iounmap(immap); | ||
| 275 | } | ||
| 276 | |||
| 204 | static int mpc8272ads_platform_notify(struct device *dev) | 277 | static int mpc8272ads_platform_notify(struct device *dev) |
| 205 | { | 278 | { |
| 206 | static const struct platform_notify_dev_map dev_map[] = { | 279 | static const struct platform_notify_dev_map dev_map[] = { |
| @@ -209,6 +282,10 @@ static int mpc8272ads_platform_notify(struct device *dev) | |||
| 209 | .rtn = mpc8272ads_fixup_enet_pdata | 282 | .rtn = mpc8272ads_fixup_enet_pdata |
| 210 | }, | 283 | }, |
| 211 | { | 284 | { |
| 285 | .bus_id = "fsl-cpm-scc:uart", | ||
| 286 | .rtn = mpc | ||
| 287 | }, | ||
| 288 | { | ||
| 212 | .bus_id = NULL | 289 | .bus_id = NULL |
| 213 | } | 290 | } |
| 214 | }; | 291 | }; |
| @@ -230,7 +307,44 @@ int __init mpc8272ads_init(void) | |||
| 230 | ppc_sys_device_enable(MPC82xx_CPM_FCC1); | 307 | ppc_sys_device_enable(MPC82xx_CPM_FCC1); |
| 231 | ppc_sys_device_enable(MPC82xx_CPM_FCC2); | 308 | ppc_sys_device_enable(MPC82xx_CPM_FCC2); |
| 232 | 309 | ||
| 310 | /* to be ready for console, let's attach pdata here */ | ||
| 311 | #ifdef CONFIG_SERIAL_CPM_SCC1 | ||
| 312 | ppc_sys_device_setfunc(MPC82xx_CPM_SCC1, PPC_SYS_FUNC_UART); | ||
| 313 | ppc_sys_device_enable(MPC82xx_CPM_SCC1); | ||
| 314 | |||
| 315 | #endif | ||
| 316 | |||
| 317 | #ifdef CONFIG_SERIAL_CPM_SCC4 | ||
| 318 | ppc_sys_device_setfunc(MPC82xx_CPM_SCC4, PPC_SYS_FUNC_UART); | ||
| 319 | ppc_sys_device_enable(MPC82xx_CPM_SCC4); | ||
| 320 | #endif | ||
| 321 | |||
| 322 | |||
| 233 | return 0; | 323 | return 0; |
| 234 | } | 324 | } |
| 235 | 325 | ||
| 326 | /* | ||
| 327 | To prevent confusion, console selection is gross: | ||
| 328 | by 0 assumed SCC1 and by 1 assumed SCC4 | ||
| 329 | */ | ||
| 330 | struct platform_device* early_uart_get_pdev(int index) | ||
| 331 | { | ||
| 332 | bd_t *bd = (bd_t *) __res; | ||
| 333 | struct fs_uart_platform_info *pinfo; | ||
| 334 | |||
| 335 | struct platform_device* pdev = NULL; | ||
| 336 | if(index) { /*assume SCC4 here*/ | ||
| 337 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC4]; | ||
| 338 | pinfo = &mpc8272<F12>_uart_pdata[1]; | ||
| 339 | } else { /*over SCC1*/ | ||
| 340 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC1]; | ||
| 341 | pinfo = &mpc8272_uart_pdata[0]; | ||
| 342 | } | ||
| 343 | |||
| 344 | pinfo->uart_clk = bd->bi_intfreq; | ||
| 345 | pdev->dev.platform_data = pinfo; | ||
| 346 | ppc_sys_fixup_mem_resource(pdev, IMAP_ADDR); | ||
| 347 | return NULL; | ||
| 348 | } | ||
| 349 | |||
| 236 | arch_initcall(mpc8272ads_init); | 350 | arch_initcall(mpc8272ads_init); |
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c index ac8fcc68afeb..6ce3b842defe 100644 --- a/arch/ppc/platforms/mpc866ads_setup.c +++ b/arch/ppc/platforms/mpc866ads_setup.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | 21 | ||
| 22 | #include <linux/fs_enet_pd.h> | 22 | #include <linux/fs_enet_pd.h> |
| 23 | #include <linux/fs_uart_pd.h> | ||
| 23 | #include <linux/mii.h> | 24 | #include <linux/mii.h> |
| 24 | 25 | ||
| 25 | #include <asm/delay.h> | 26 | #include <asm/delay.h> |
| @@ -37,6 +38,11 @@ | |||
| 37 | 38 | ||
| 38 | extern unsigned char __res[]; | 39 | extern unsigned char __res[]; |
| 39 | 40 | ||
| 41 | static void setup_fec1_ioports(void); | ||
| 42 | static void setup_scc1_ioports(void); | ||
| 43 | static void setup_smc1_ioports(void); | ||
| 44 | static void setup_smc2_ioports(void); | ||
| 45 | |||
| 40 | static struct fs_mii_bus_info fec_mii_bus_info = { | 46 | static struct fs_mii_bus_info fec_mii_bus_info = { |
| 41 | .method = fsmii_fec, | 47 | .method = fsmii_fec, |
| 42 | .id = 0, | 48 | .id = 0, |
| @@ -79,6 +85,28 @@ static struct fs_platform_info mpc8xx_scc_pdata = { | |||
| 79 | .phy_irq = -1, | 85 | .phy_irq = -1, |
| 80 | 86 | ||
| 81 | .bus_info = &scc_mii_bus_info, | 87 | .bus_info = &scc_mii_bus_info, |
| 88 | |||
| 89 | }; | ||
| 90 | |||
| 91 | static struct fs_uart_platform_info mpc866_uart_pdata[] = { | ||
| 92 | [fsid_smc1_uart] = { | ||
| 93 | .brg = 1, | ||
| 94 | .fs_no = fsid_smc1_uart, | ||
| 95 | .init_ioports = setup_smc1_ioports, | ||
| 96 | .tx_num_fifo = 4, | ||
| 97 | .tx_buf_size = 32, | ||
| 98 | .rx_num_fifo = 4, | ||
| 99 | .rx_buf_size = 32, | ||
| 100 | }, | ||
| 101 | [fsid_smc2_uart] = { | ||
| 102 | .brg = 2, | ||
| 103 | .fs_no = fsid_smc2_uart, | ||
| 104 | .init_ioports = setup_smc2_ioports, | ||
| 105 | .tx_num_fifo = 4, | ||
| 106 | .tx_buf_size = 32, | ||
| 107 | .rx_num_fifo = 4, | ||
| 108 | .rx_buf_size = 32, | ||
| 109 | }, | ||
| 82 | }; | 110 | }; |
| 83 | 111 | ||
| 84 | void __init board_init(void) | 112 | void __init board_init(void) |
| @@ -92,9 +120,12 @@ void __init board_init(void) | |||
| 92 | printk(KERN_CRIT "Could not remap BCSR1\n"); | 120 | printk(KERN_CRIT "Could not remap BCSR1\n"); |
| 93 | return; | 121 | return; |
| 94 | } | 122 | } |
| 123 | |||
| 95 | #ifdef CONFIG_SERIAL_CPM_SMC1 | 124 | #ifdef CONFIG_SERIAL_CPM_SMC1 |
| 96 | cp->cp_simode &= ~(0xe0000000 >> 17); /* brg1 */ | 125 | cp->cp_simode &= ~(0xe0000000 >> 17); /* brg1 */ |
| 97 | clrbits32(bcsr_io,(0x80000000 >> 7)); | 126 | clrbits32(bcsr_io,(0x80000000 >> 7)); |
| 127 | cp->cp_smc[0].smc_smcm |= (SMCM_RX | SMCM_TX); | ||
| 128 | cp->cp_smc[0].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
| 98 | #else | 129 | #else |
| 99 | setbits32(bcsr_io,(0x80000000 >> 7)); | 130 | setbits32(bcsr_io,(0x80000000 >> 7)); |
| 100 | 131 | ||
| @@ -108,6 +139,8 @@ void __init board_init(void) | |||
| 108 | cp->cp_simode &= ~(0xe0000000 >> 1); | 139 | cp->cp_simode &= ~(0xe0000000 >> 1); |
| 109 | cp->cp_simode |= (0x20000000 >> 1); /* brg2 */ | 140 | cp->cp_simode |= (0x20000000 >> 1); /* brg2 */ |
| 110 | clrbits32(bcsr_io,(0x80000000 >> 13)); | 141 | clrbits32(bcsr_io,(0x80000000 >> 13)); |
| 142 | cp->cp_smc[1].smc_smcm |= (SMCM_RX | SMCM_TX); | ||
| 143 | cp->cp_smc[1].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
| 111 | #else | 144 | #else |
| 112 | clrbits32(bcsr_io,(0x80000000 >> 13)); | 145 | clrbits32(bcsr_io,(0x80000000 >> 13)); |
| 113 | cp->cp_pbpar &= ~(0x00000c00); | 146 | cp->cp_pbpar &= ~(0x00000c00); |
| @@ -232,6 +265,74 @@ static void mpc866ads_fixup_scc_enet_pdata(struct platform_device *pdev, | |||
| 232 | mpc866ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1); | 265 | mpc866ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1); |
| 233 | } | 266 | } |
| 234 | 267 | ||
| 268 | static void setup_smc1_ioports(void) | ||
| 269 | { | ||
| 270 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
| 271 | unsigned *bcsr_io; | ||
| 272 | unsigned int iobits = 0x000000c0; | ||
| 273 | |||
| 274 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
| 275 | |||
| 276 | if (bcsr_io == NULL) { | ||
| 277 | printk(KERN_CRIT "Could not remap BCSR1\n"); | ||
| 278 | return; | ||
| 279 | } | ||
| 280 | |||
| 281 | clrbits32(bcsr_io,BCSR1_RS232EN_1); | ||
| 282 | iounmap(bcsr_io); | ||
| 283 | |||
| 284 | setbits32(&immap->im_cpm.cp_pbpar, iobits); | ||
| 285 | clrbits32(&immap->im_cpm.cp_pbdir, iobits); | ||
| 286 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | ||
| 287 | |||
| 288 | } | ||
| 289 | |||
| 290 | static void setup_smc2_ioports(void) | ||
| 291 | { | ||
| 292 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
| 293 | unsigned *bcsr_io; | ||
| 294 | unsigned int iobits = 0x00000c00; | ||
| 295 | |||
| 296 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
| 297 | |||
| 298 | if (bcsr_io == NULL) { | ||
| 299 | printk(KERN_CRIT "Could not remap BCSR1\n"); | ||
| 300 | return; | ||
| 301 | } | ||
| 302 | |||
| 303 | clrbits32(bcsr_io,BCSR1_RS232EN_2); | ||
| 304 | |||
| 305 | iounmap(bcsr_io); | ||
| 306 | |||
| 307 | #ifndef CONFIG_SERIAL_CPM_ALT_SMC2 | ||
| 308 | setbits32(&immap->im_cpm.cp_pbpar, iobits); | ||
| 309 | clrbits32(&immap->im_cpm.cp_pbdir, iobits); | ||
| 310 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | ||
| 311 | #else | ||
| 312 | setbits16(&immap->im_ioport.iop_papar, iobits); | ||
| 313 | clrbits16(&immap->im_ioport.iop_padir, iobits); | ||
| 314 | clrbits16(&immap->im_ioport.iop_paodr, iobits); | ||
| 315 | #endif | ||
| 316 | |||
| 317 | } | ||
| 318 | |||
| 319 | static void __init mpc866ads_fixup_uart_pdata(struct platform_device *pdev, | ||
| 320 | int idx) | ||
| 321 | { | ||
| 322 | bd_t *bd = (bd_t *) __res; | ||
| 323 | struct fs_uart_platform_info *pinfo; | ||
| 324 | int num = ARRAY_SIZE(mpc866_uart_pdata); | ||
| 325 | |||
| 326 | int id = fs_uart_id_smc2fsid(idx); | ||
| 327 | |||
| 328 | /* no need to alter anything if console */ | ||
| 329 | if ((id <= num) && (!pdev->dev.platform_data)) { | ||
| 330 | pinfo = &mpc866_uart_pdata[id]; | ||
| 331 | pinfo->uart_clk = bd->bi_intfreq; | ||
| 332 | pdev->dev.platform_data = pinfo; | ||
| 333 | } | ||
| 334 | } | ||
| 335 | |||
| 235 | static int mpc866ads_platform_notify(struct device *dev) | 336 | static int mpc866ads_platform_notify(struct device *dev) |
| 236 | { | 337 | { |
| 237 | static const struct platform_notify_dev_map dev_map[] = { | 338 | static const struct platform_notify_dev_map dev_map[] = { |
| @@ -244,6 +345,10 @@ static int mpc866ads_platform_notify(struct device *dev) | |||
| 244 | .rtn = mpc866ads_fixup_scc_enet_pdata, | 345 | .rtn = mpc866ads_fixup_scc_enet_pdata, |
| 245 | }, | 346 | }, |
| 246 | { | 347 | { |
| 348 | .bus_id = "fsl-cpm-smc:uart", | ||
| 349 | .rtn = mpc866ads_fixup_uart_pdata | ||
| 350 | }, | ||
| 351 | { | ||
| 247 | .bus_id = NULL | 352 | .bus_id = NULL |
| 248 | } | 353 | } |
| 249 | }; | 354 | }; |
| @@ -267,7 +372,42 @@ int __init mpc866ads_init(void) | |||
| 267 | #endif | 372 | #endif |
| 268 | ppc_sys_device_enable(MPC8xx_CPM_FEC1); | 373 | ppc_sys_device_enable(MPC8xx_CPM_FEC1); |
| 269 | 374 | ||
| 375 | /* Since either of the uarts could be used as console, they need to ready */ | ||
| 376 | #ifdef CONFIG_SERIAL_CPM_SMC1 | ||
| 377 | ppc_sys_device_enable(MPC8xx_CPM_SMC1); | ||
| 378 | ppc_sys_device_setfunc(MPC8xx_CPM_SMC1, PPC_SYS_FUNC_UART); | ||
| 379 | #endif | ||
| 380 | |||
| 381 | #ifdef CONFIG_SERIAL_CPM_SMCer | ||
| 382 | ppc_sys_device_enable(MPC8xx_CPM_SMC2); | ||
| 383 | ppc_sys_device_setfunc(MPC8xx_CPM_SMC2, PPC_SYS_FUNC_UART); | ||
| 384 | #endif | ||
| 385 | |||
| 270 | return 0; | 386 | return 0; |
| 271 | } | 387 | } |
| 272 | 388 | ||
| 389 | /* | ||
| 390 | To prevent confusion, console selection is gross: | ||
| 391 | by 0 assumed SMC1 and by 1 assumed SMC2 | ||
| 392 | */ | ||
| 393 | struct platform_device* early_uart_get_pdev(int index) | ||
| 394 | { | ||
| 395 | bd_t *bd = (bd_t *) __res; | ||
| 396 | struct fs_uart_platform_info *pinfo; | ||
| 397 | |||
| 398 | struct platform_device* pdev = NULL; | ||
| 399 | if(index) { /*assume SMC2 here*/ | ||
| 400 | pdev = &ppc_sys_platform_devices[MPC8xx_CPM_SMC2]; | ||
| 401 | pinfo = &mpc866_uart_pdata[1]; | ||
| 402 | } else { /*over SMC1*/ | ||
| 403 | pdev = &ppc_sys_platform_devices[MPC8xx_CPM_SMC1]; | ||
| 404 | pinfo = &mpc866_uart_pdata[0]; | ||
| 405 | } | ||
| 406 | |||
| 407 | pinfo->uart_clk = bd->bi_intfreq; | ||
| 408 | pdev->dev.platform_data = pinfo; | ||
| 409 | ppc_sys_fixup_mem_resource(pdev, IMAP_ADDR); | ||
| 410 | return NULL; | ||
| 411 | } | ||
| 412 | |||
| 273 | arch_initcall(mpc866ads_init); | 413 | arch_initcall(mpc866ads_init); |
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c index 50a99e5f7c68..4b88679cd31c 100644 --- a/arch/ppc/platforms/mpc885ads_setup.c +++ b/arch/ppc/platforms/mpc885ads_setup.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | 21 | ||
| 22 | #include <linux/fs_enet_pd.h> | 22 | #include <linux/fs_enet_pd.h> |
| 23 | #include <linux/fs_uart_pd.h> | ||
| 23 | #include <linux/mii.h> | 24 | #include <linux/mii.h> |
| 24 | 25 | ||
| 25 | #include <asm/delay.h> | 26 | #include <asm/delay.h> |
| @@ -35,9 +36,32 @@ | |||
| 35 | #include <asm/ppc_sys.h> | 36 | #include <asm/ppc_sys.h> |
| 36 | 37 | ||
| 37 | extern unsigned char __res[]; | 38 | extern unsigned char __res[]; |
| 39 | static void setup_smc1_ioports(void); | ||
| 40 | static void setup_smc2_ioports(void); | ||
| 38 | 41 | ||
| 39 | static void __init mpc885ads_scc_phy_init(char); | 42 | static void __init mpc885ads_scc_phy_init(char); |
| 40 | 43 | ||
| 44 | static struct fs_uart_platform_info mpc885_uart_pdata[] = { | ||
| 45 | [fsid_smc1_uart] = { | ||
| 46 | .brg = 1, | ||
| 47 | .fs_no = fsid_smc1_uart, | ||
| 48 | .init_ioports = setup_smc1_ioports, | ||
| 49 | .tx_num_fifo = 4, | ||
| 50 | .tx_buf_size = 32, | ||
| 51 | .rx_num_fifo = 4, | ||
| 52 | .rx_buf_size = 32, | ||
| 53 | }, | ||
| 54 | [fsid_smc2_uart] = { | ||
| 55 | .brg = 2, | ||
| 56 | .fs_no = fsid_smc2_uart, | ||
| 57 | .init_ioports = setup_smc2_ioports, | ||
| 58 | .tx_num_fifo = 4, | ||
| 59 | .tx_buf_size = 32, | ||
| 60 | .rx_num_fifo = 4, | ||
| 61 | .rx_buf_size = 32, | ||
| 62 | }, | ||
| 63 | }; | ||
| 64 | |||
| 41 | static struct fs_mii_bus_info fec_mii_bus_info = { | 65 | static struct fs_mii_bus_info fec_mii_bus_info = { |
| 42 | .method = fsmii_fec, | 66 | .method = fsmii_fec, |
| 43 | .id = 0, | 67 | .id = 0, |
| @@ -116,6 +140,8 @@ void __init board_init(void) | |||
| 116 | #ifdef CONFIG_SERIAL_CPM_SMC1 | 140 | #ifdef CONFIG_SERIAL_CPM_SMC1 |
| 117 | cp->cp_simode &= ~(0xe0000000 >> 17); /* brg1 */ | 141 | cp->cp_simode &= ~(0xe0000000 >> 17); /* brg1 */ |
| 118 | clrbits32(bcsr_io, BCSR1_RS232EN_1); | 142 | clrbits32(bcsr_io, BCSR1_RS232EN_1); |
| 143 | cp->cp_smc[0].smc_smcm |= (SMCM_RX | SMCM_TX); | ||
| 144 | cp->cp_smc[0].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
| 119 | #else | 145 | #else |
| 120 | setbits32(bcsr_io,BCSR1_RS232EN_1); | 146 | setbits32(bcsr_io,BCSR1_RS232EN_1); |
| 121 | cp->cp_smc[0].smc_smcmr = 0; | 147 | cp->cp_smc[0].smc_smcmr = 0; |
| @@ -126,6 +152,8 @@ void __init board_init(void) | |||
| 126 | cp->cp_simode &= ~(0xe0000000 >> 1); | 152 | cp->cp_simode &= ~(0xe0000000 >> 1); |
| 127 | cp->cp_simode |= (0x20000000 >> 1); /* brg2 */ | 153 | cp->cp_simode |= (0x20000000 >> 1); /* brg2 */ |
| 128 | clrbits32(bcsr_io,BCSR1_RS232EN_2); | 154 | clrbits32(bcsr_io,BCSR1_RS232EN_2); |
| 155 | cp->cp_smc[1].smc_smcm |= (SMCM_RX | SMCM_TX); | ||
| 156 | cp->cp_smc[1].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
| 129 | #else | 157 | #else |
| 130 | setbits32(bcsr_io,BCSR1_RS232EN_2); | 158 | setbits32(bcsr_io,BCSR1_RS232EN_2); |
| 131 | cp->cp_smc[1].smc_smcmr = 0; | 159 | cp->cp_smc[1].smc_smcmr = 0; |
| @@ -343,6 +371,70 @@ static void mpc885ads_scc_phy_init(char phy_addr) | |||
| 343 | out_be32(&fecp->fec_mii_speed, 0); | 371 | out_be32(&fecp->fec_mii_speed, 0); |
| 344 | } | 372 | } |
| 345 | 373 | ||
| 374 | static void setup_smc1_ioports(void) | ||
| 375 | { | ||
| 376 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
| 377 | unsigned *bcsr_io; | ||
| 378 | unsigned int iobits = 0x000000c0; | ||
| 379 | |||
| 380 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
| 381 | |||
| 382 | if (bcsr_io == NULL) { | ||
| 383 | printk(KERN_CRIT "Could not remap BCSR1\n"); | ||
| 384 | return; | ||
| 385 | } | ||
| 386 | clrbits32(bcsr_io,BCSR1_RS232EN_1); | ||
| 387 | iounmap(bcsr_io); | ||
| 388 | |||
| 389 | setbits32(&immap->im_cpm.cp_pbpar, iobits); | ||
| 390 | clrbits32(&immap->im_cpm.cp_pbdir, iobits); | ||
| 391 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | ||
| 392 | } | ||
| 393 | |||
| 394 | static void setup_smc2_ioports(void) | ||
| 395 | { | ||
| 396 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
| 397 | unsigned *bcsr_io; | ||
| 398 | unsigned int iobits = 0x00000c00; | ||
| 399 | |||
| 400 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
| 401 | |||
| 402 | if (bcsr_io == NULL) { | ||
| 403 | printk(KERN_CRIT "Could not remap BCSR1\n"); | ||
| 404 | return; | ||
| 405 | } | ||
| 406 | clrbits32(bcsr_io,BCSR1_RS232EN_2); | ||
| 407 | iounmap(bcsr_io); | ||
| 408 | |||
| 409 | #ifndef CONFIG_SERIAL_CPM_ALT_SMC2 | ||
| 410 | setbits32(&immap->im_cpm.cp_pbpar, iobits); | ||
| 411 | clrbits32(&immap->im_cpm.cp_pbdir, iobits); | ||
| 412 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | ||
| 413 | #else | ||
| 414 | setbits16(&immap->im_ioport.iop_papar, iobits); | ||
| 415 | clrbits16(&immap->im_ioport.iop_padir, iobits); | ||
| 416 | clrbits16(&immap->im_ioport.iop_paodr, iobits); | ||
| 417 | #endif | ||
| 418 | } | ||
| 419 | |||
| 420 | static void __init mpc885ads_fixup_uart_pdata(struct platform_device *pdev, | ||
| 421 | int idx) | ||
| 422 | { | ||
| 423 | bd_t *bd = (bd_t *) __res; | ||
| 424 | struct fs_uart_platform_info *pinfo; | ||
| 425 | int num = ARRAY_SIZE(mpc885_uart_pdata); | ||
| 426 | |||
| 427 | int id = fs_uart_id_smc2fsid(idx); | ||
| 428 | |||
| 429 | /* no need to alter anything if console */ | ||
| 430 | if ((id <= num) && (!pdev->dev.platform_data)) { | ||
| 431 | pinfo = &mpc885_uart_pdata[id]; | ||
| 432 | pinfo->uart_clk = bd->bi_intfreq; | ||
| 433 | pdev->dev.platform_data = pinfo; | ||
| 434 | } | ||
| 435 | } | ||
| 436 | |||
| 437 | |||
| 346 | static int mpc885ads_platform_notify(struct device *dev) | 438 | static int mpc885ads_platform_notify(struct device *dev) |
| 347 | { | 439 | { |
| 348 | 440 | ||
| @@ -356,12 +448,17 @@ static int mpc885ads_platform_notify(struct device *dev) | |||
| 356 | .rtn = mpc885ads_fixup_scc_enet_pdata, | 448 | .rtn = mpc885ads_fixup_scc_enet_pdata, |
| 357 | }, | 449 | }, |
| 358 | { | 450 | { |
| 451 | .bus_id = "fsl-cpm-smc:uart", | ||
| 452 | .rtn = mpc885ads_fixup_uart_pdata | ||
| 453 | }, | ||
| 454 | { | ||
| 359 | .bus_id = NULL | 455 | .bus_id = NULL |
| 360 | } | 456 | } |
| 361 | }; | 457 | }; |
| 362 | 458 | ||
| 363 | platform_notify_map(dev_map,dev); | 459 | platform_notify_map(dev_map,dev); |
| 364 | 460 | ||
| 461 | return 0; | ||
| 365 | } | 462 | } |
| 366 | 463 | ||
| 367 | int __init mpc885ads_init(void) | 464 | int __init mpc885ads_init(void) |
| @@ -383,7 +480,41 @@ int __init mpc885ads_init(void) | |||
| 383 | ppc_sys_device_enable(MPC8xx_CPM_FEC2); | 480 | ppc_sys_device_enable(MPC8xx_CPM_FEC2); |
| 384 | #endif | 481 | #endif |
| 385 | 482 | ||
| 483 | #ifdef CONFIG_SERIAL_CPM_SMC1 | ||
| 484 | ppc_sys_device_enable(MPC8xx_CPM_SMC1); | ||
| 485 | ppc_sys_device_setfunc(MPC8xx_CPM_SMC1, PPC_SYS_FUNC_UART); | ||
| 486 | #endif | ||
| 487 | |||
| 488 | #ifdef CONFIG_SERIAL_CPM_SMC2 | ||
| 489 | ppc_sys_device_enable(MPC8xx_CPM_SMC2); | ||
| 490 | ppc_sys_device_setfunc(MPC8xx_CPM_SMC2, PPC_SYS_FUNC_UART); | ||
| 491 | #endif | ||
| 386 | return 0; | 492 | return 0; |
| 387 | } | 493 | } |
| 388 | 494 | ||
| 389 | arch_initcall(mpc885ads_init); | 495 | arch_initcall(mpc885ads_init); |
| 496 | |||
| 497 | /* | ||
| 498 | To prevent confusion, console selection is gross: | ||
| 499 | by 0 assumed SMC1 and by 1 assumed SMC2 | ||
| 500 | */ | ||
| 501 | struct platform_device* early_uart_get_pdev(int index) | ||
| 502 | { | ||
| 503 | bd_t *bd = (bd_t *) __res; | ||
| 504 | struct fs_uart_platform_info *pinfo; | ||
| 505 | |||
| 506 | struct platform_device* pdev = NULL; | ||
| 507 | if(index) { /*assume SMC2 here*/ | ||
| 508 | pdev = &ppc_sys_platform_devices[MPC8xx_CPM_SMC2]; | ||
| 509 | pinfo = &mpc885_uart_pdata[1]; | ||
| 510 | } else { /*over SMC1*/ | ||
| 511 | pdev = &ppc_sys_platform_devices[MPC8xx_CPM_SMC1]; | ||
| 512 | pinfo = &mpc885_uart_pdata[0]; | ||
| 513 | } | ||
| 514 | |||
| 515 | pinfo->uart_clk = bd->bi_intfreq; | ||
| 516 | pdev->dev.platform_data = pinfo; | ||
| 517 | ppc_sys_fixup_mem_resource(pdev, IMAP_ADDR); | ||
| 518 | return NULL; | ||
| 519 | } | ||
| 520 | |||
diff --git a/arch/ppc/platforms/pq2ads.c b/arch/ppc/platforms/pq2ads.c index 3365fd788a7a..7fc2e02f5246 100644 --- a/arch/ppc/platforms/pq2ads.c +++ b/arch/ppc/platforms/pq2ads.c | |||
| @@ -14,11 +14,40 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | 16 | ||
| 17 | #include <asm/io.h> | ||
| 17 | #include <asm/mpc8260.h> | 18 | #include <asm/mpc8260.h> |
| 19 | #include <asm/cpm2.h> | ||
| 20 | #include <asm/immap_cpm2.h> | ||
| 18 | 21 | ||
| 19 | void __init | 22 | void __init |
| 20 | m82xx_board_setup(void) | 23 | m82xx_board_setup(void) |
| 21 | { | 24 | { |
| 25 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
| 26 | u32 *bcsr = ioremap(BCSR_ADDR+4, sizeof(u32)); | ||
| 27 | |||
| 22 | /* Enable the 2nd UART port */ | 28 | /* Enable the 2nd UART port */ |
| 23 | *(volatile uint *)(BCSR_ADDR + 4) &= ~BCSR1_RS232_EN2; | 29 | clrbits32(bcsr, BCSR1_RS232_EN2); |
| 30 | |||
| 31 | #ifdef CONFIG_SERIAL_CPM_SCC1 | ||
| 32 | clrbits32((u32*)&immap->im_scc[0].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
| 33 | clrbits32((u32*)&immap->im_scc[0].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
| 34 | #endif | ||
| 35 | |||
| 36 | #ifdef CONFIG_SERIAL_CPM_SCC2 | ||
| 37 | clrbits32((u32*)&immap->im_scc[1].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
| 38 | clrbits32((u32*)&immap->im_scc[1].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
| 39 | #endif | ||
| 40 | |||
| 41 | #ifdef CONFIG_SERIAL_CPM_SCC3 | ||
| 42 | clrbits32((u32*)&immap->im_scc[2].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
| 43 | clrbits32((u32*)&immap->im_scc[2].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
| 44 | #endif | ||
| 45 | |||
| 46 | #ifdef CONFIG_SERIAL_CPM_SCC4 | ||
| 47 | clrbits32((u32*)&immap->im_scc[3].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
| 48 | clrbits32((u32*)&immap->im_scc[3].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
| 49 | #endif | ||
| 50 | |||
| 51 | iounmap(bcsr); | ||
| 52 | iounmap(immap); | ||
| 24 | } | 53 | } |
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c index a7dd55f1c63e..f6cc16888527 100644 --- a/arch/ppc/syslib/ibm440gx_common.c +++ b/arch/ppc/syslib/ibm440gx_common.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * PPC440GX system library | 2 | * PPC440GX system library |
| 3 | * | 3 | * |
| 4 | * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net> | 4 | * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net> |
| 5 | * Copyright (c) 2003, 2004 Zultys Technologies | 5 | * Copyright (c) 2003 - 2006 Zultys Technologies |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify it | 7 | * This program is free software; you can redistribute it and/or modify it |
| 8 | * under the terms of the GNU General Public License as published by the | 8 | * under the terms of the GNU General Public License as published by the |
| @@ -282,3 +282,14 @@ int ibm440gx_show_cpuinfo(struct seq_file *m){ | |||
| 282 | return 0; | 282 | return 0; |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | void __init ibm440gx_platform_init(unsigned long r3, unsigned long r4, | ||
| 286 | unsigned long r5, unsigned long r6, | ||
| 287 | unsigned long r7) | ||
| 288 | { | ||
| 289 | /* Erratum 440_43 workaround, disable L1 cache parity checking */ | ||
| 290 | if (!strcmp(cur_cpu_spec->cpu_name, "440GX Rev. C") || | ||
| 291 | !strcmp(cur_cpu_spec->cpu_name, "440GX Rev. F")) | ||
| 292 | mtspr(SPRN_CCR1, mfspr(SPRN_CCR1) | CCR1_DPC); | ||
| 293 | |||
| 294 | ibm44x_platform_init(r3, r4, r5, r6, r7); | ||
| 295 | } | ||
diff --git a/arch/ppc/syslib/ibm440gx_common.h b/arch/ppc/syslib/ibm440gx_common.h index a2ab9fab8e34..a03ec6022e8f 100644 --- a/arch/ppc/syslib/ibm440gx_common.h +++ b/arch/ppc/syslib/ibm440gx_common.h | |||
| @@ -29,6 +29,10 @@ | |||
| 29 | void ibm440gx_get_clocks(struct ibm44x_clocks*, unsigned int sys_clk, | 29 | void ibm440gx_get_clocks(struct ibm44x_clocks*, unsigned int sys_clk, |
| 30 | unsigned int ser_clk) __init; | 30 | unsigned int ser_clk) __init; |
| 31 | 31 | ||
| 32 | /* common 440GX platform init */ | ||
| 33 | void ibm440gx_platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | ||
| 34 | unsigned long r6, unsigned long r7) __init; | ||
| 35 | |||
| 32 | /* Enable L2 cache */ | 36 | /* Enable L2 cache */ |
| 33 | void ibm440gx_l2c_enable(void) __init; | 37 | void ibm440gx_l2c_enable(void) __init; |
| 34 | 38 | ||
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c index bd41ed83beb3..6f536383866e 100644 --- a/arch/ppc/syslib/mpc8xx_devices.c +++ b/arch/ppc/syslib/mpc8xx_devices.c | |||
| @@ -170,12 +170,18 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
| 170 | [MPC8xx_CPM_SMC1] = { | 170 | [MPC8xx_CPM_SMC1] = { |
| 171 | .name = "fsl-cpm-smc", | 171 | .name = "fsl-cpm-smc", |
| 172 | .id = 1, | 172 | .id = 1, |
| 173 | .num_resources = 2, | 173 | .num_resources = 3, |
| 174 | .resource = (struct resource[]) { | 174 | .resource = (struct resource[]) { |
| 175 | { | 175 | { |
| 176 | .name = "regs", | 176 | .name = "regs", |
| 177 | .start = 0xa82, | 177 | .start = 0xa80, |
| 178 | .end = 0xa91, | 178 | .end = 0xa8f, |
| 179 | .flags = IORESOURCE_MEM, | ||
| 180 | }, | ||
| 181 | { | ||
| 182 | .name = "pram", | ||
| 183 | .start = 0x3e80, | ||
| 184 | .end = 0x3ebf, | ||
| 179 | .flags = IORESOURCE_MEM, | 185 | .flags = IORESOURCE_MEM, |
| 180 | }, | 186 | }, |
| 181 | { | 187 | { |
| @@ -189,15 +195,22 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
| 189 | [MPC8xx_CPM_SMC2] = { | 195 | [MPC8xx_CPM_SMC2] = { |
| 190 | .name = "fsl-cpm-smc", | 196 | .name = "fsl-cpm-smc", |
| 191 | .id = 2, | 197 | .id = 2, |
| 192 | .num_resources = 2, | 198 | .num_resources = 3, |
| 193 | .resource = (struct resource[]) { | 199 | .resource = (struct resource[]) { |
| 194 | { | 200 | { |
| 195 | .name = "regs", | 201 | .name = "regs", |
| 196 | .start = 0xa92, | 202 | .start = 0xa90, |
| 197 | .end = 0xaa1, | 203 | .end = 0xa9f, |
| 198 | .flags = IORESOURCE_MEM, | 204 | .flags = IORESOURCE_MEM, |
| 199 | }, | 205 | }, |
| 200 | { | 206 | { |
| 207 | .name = "pram", | ||
| 208 | .start = 0x3f80, | ||
| 209 | .end = 0x3fbf, | ||
| 210 | .flags = IORESOURCE_MEM, | ||
| 211 | |||
| 212 | }, | ||
| 213 | { | ||
| 201 | .name = "interrupt", | 214 | .name = "interrupt", |
| 202 | .start = MPC8xx_INT_SMC2, | 215 | .start = MPC8xx_INT_SMC2, |
| 203 | .end = MPC8xx_INT_SMC2, | 216 | .end = MPC8xx_INT_SMC2, |
diff --git a/arch/ppc/syslib/ppc_sys.c b/arch/ppc/syslib/ppc_sys.c index 7662c4e6e7d6..2d48018b71d9 100644 --- a/arch/ppc/syslib/ppc_sys.c +++ b/arch/ppc/syslib/ppc_sys.c | |||
| @@ -109,9 +109,11 @@ ppc_sys_fixup_mem_resource(struct platform_device *pdev, phys_addr_t paddr) | |||
| 109 | int i; | 109 | int i; |
| 110 | for (i = 0; i < pdev->num_resources; i++) { | 110 | for (i = 0; i < pdev->num_resources; i++) { |
| 111 | struct resource *r = &pdev->resource[i]; | 111 | struct resource *r = &pdev->resource[i]; |
| 112 | if ((r->flags & IORESOURCE_MEM) == IORESOURCE_MEM) { | 112 | if (((r->flags & IORESOURCE_MEM) == IORESOURCE_MEM) && |
| 113 | ((r->flags & PPC_SYS_IORESOURCE_FIXUPPED) != PPC_SYS_IORESOURCE_FIXUPPED)) { | ||
| 113 | r->start += paddr; | 114 | r->start += paddr; |
| 114 | r->end += paddr; | 115 | r->end += paddr; |
| 116 | r->flags |= PPC_SYS_IORESOURCE_FIXUPPED; | ||
| 115 | } | 117 | } |
| 116 | } | 118 | } |
| 117 | } | 119 | } |
diff --git a/arch/ppc/syslib/pq2_sys.c b/arch/ppc/syslib/pq2_sys.c index 75e64f1c144d..433b0fa203e1 100644 --- a/arch/ppc/syslib/pq2_sys.c +++ b/arch/ppc/syslib/pq2_sys.c | |||
| @@ -113,13 +113,13 @@ struct ppc_sys_spec ppc_sys_specs[] = { | |||
| 113 | .ppc_sys_name = "8248", | 113 | .ppc_sys_name = "8248", |
| 114 | .mask = 0x0000ff00, | 114 | .mask = 0x0000ff00, |
| 115 | .value = 0x00000c00, | 115 | .value = 0x00000c00, |
| 116 | .num_devices = 11, | 116 | .num_devices = 12, |
| 117 | .device_list = (enum ppc_sys_devices[]) | 117 | .device_list = (enum ppc_sys_devices[]) |
| 118 | { | 118 | { |
| 119 | MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1, | 119 | MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1, |
| 120 | MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1, | 120 | MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4, |
| 121 | MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, | 121 | MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, |
| 122 | MPC82xx_CPM_USB, MPC82xx_SEC1, | 122 | MPC82xx_CPM_I2C, MPC82xx_CPM_USB, MPC82xx_SEC1, |
| 123 | }, | 123 | }, |
| 124 | }, | 124 | }, |
| 125 | { | 125 | { |
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 54d35c130907..9a22434a580c 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
| @@ -652,7 +652,7 @@ appldata_cpu_notify(struct notifier_block *self, | |||
| 652 | return NOTIFY_OK; | 652 | return NOTIFY_OK; |
| 653 | } | 653 | } |
| 654 | 654 | ||
| 655 | static struct notifier_block __devinitdata appldata_nb = { | 655 | static struct notifier_block appldata_nb = { |
| 656 | .notifier_call = appldata_cpu_notify, | 656 | .notifier_call = appldata_cpu_notify, |
| 657 | }; | 657 | }; |
| 658 | 658 | ||
diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile index 929e6b0771f8..e9263b4975e0 100644 --- a/arch/x86_64/ia32/Makefile +++ b/arch/x86_64/ia32/Makefile | |||
| @@ -27,5 +27,5 @@ $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \ | |||
| 27 | $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE | 27 | $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE |
| 28 | $(call if_changed,syscall) | 28 | $(call if_changed,syscall) |
| 29 | 29 | ||
| 30 | AFLAGS_vsyscall-sysenter.o = -m32 | 30 | AFLAGS_vsyscall-sysenter.o = -m32 -Wa,-32 |
| 31 | AFLAGS_vsyscall-syscall.o = -m32 | 31 | AFLAGS_vsyscall-syscall.o = -m32 -Wa,-32 |
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c index 6f0790e8b6d3..c69fc43cee7b 100644 --- a/arch/x86_64/kernel/mce.c +++ b/arch/x86_64/kernel/mce.c | |||
| @@ -629,7 +629,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu) | |||
| 629 | #endif | 629 | #endif |
| 630 | 630 | ||
| 631 | /* Get notified when a cpu comes on/off. Be hotplug friendly. */ | 631 | /* Get notified when a cpu comes on/off. Be hotplug friendly. */ |
| 632 | static __cpuinit int | 632 | static int |
| 633 | mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | 633 | mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) |
| 634 | { | 634 | { |
| 635 | unsigned int cpu = (unsigned long)hcpu; | 635 | unsigned int cpu = (unsigned long)hcpu; |
diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86_64/kernel/mce_amd.c index d3ad7d81266d..d13b241ad094 100644 --- a/arch/x86_64/kernel/mce_amd.c +++ b/arch/x86_64/kernel/mce_amd.c | |||
| @@ -482,7 +482,7 @@ static void threshold_remove_device(unsigned int cpu) | |||
| 482 | #endif | 482 | #endif |
| 483 | 483 | ||
| 484 | /* get notified when a cpu comes on/off */ | 484 | /* get notified when a cpu comes on/off */ |
| 485 | static __cpuinit int threshold_cpu_callback(struct notifier_block *nfb, | 485 | static int threshold_cpu_callback(struct notifier_block *nfb, |
| 486 | unsigned long action, void *hcpu) | 486 | unsigned long action, void *hcpu) |
| 487 | { | 487 | { |
| 488 | /* cpu was unsigned int to begin with */ | 488 | /* cpu was unsigned int to begin with */ |
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index a6c01e121266..9d3d76c85ae7 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/arch/x86_64/kernel/pci-gart.c | |||
| @@ -112,10 +112,6 @@ static unsigned long alloc_iommu(int size) | |||
| 112 | static void free_iommu(unsigned long offset, int size) | 112 | static void free_iommu(unsigned long offset, int size) |
| 113 | { | 113 | { |
| 114 | unsigned long flags; | 114 | unsigned long flags; |
| 115 | if (size == 1) { | ||
| 116 | clear_bit(offset, iommu_gart_bitmap); | ||
| 117 | return; | ||
| 118 | } | ||
| 119 | spin_lock_irqsave(&iommu_bitmap_lock, flags); | 115 | spin_lock_irqsave(&iommu_bitmap_lock, flags); |
| 120 | __clear_bit_string(iommu_gart_bitmap, offset, size); | 116 | __clear_bit_string(iommu_gart_bitmap, offset, size); |
| 121 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); | 117 | spin_unlock_irqrestore(&iommu_bitmap_lock, flags); |
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index cc02573a3271..b2fac14baac0 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c | |||
| @@ -188,11 +188,13 @@ void __init setup_node_zones(int nodeid) | |||
| 188 | memory. */ | 188 | memory. */ |
| 189 | memmapsize = sizeof(struct page) * (end_pfn-start_pfn); | 189 | memmapsize = sizeof(struct page) * (end_pfn-start_pfn); |
| 190 | limit = end_pfn << PAGE_SHIFT; | 190 | limit = end_pfn << PAGE_SHIFT; |
| 191 | #ifdef CONFIG_FLAT_NODE_MEM_MAP | ||
| 191 | NODE_DATA(nodeid)->node_mem_map = | 192 | NODE_DATA(nodeid)->node_mem_map = |
| 192 | __alloc_bootmem_core(NODE_DATA(nodeid)->bdata, | 193 | __alloc_bootmem_core(NODE_DATA(nodeid)->bdata, |
| 193 | memmapsize, SMP_CACHE_BYTES, | 194 | memmapsize, SMP_CACHE_BYTES, |
| 194 | round_down(limit - memmapsize, PAGE_SIZE), | 195 | round_down(limit - memmapsize, PAGE_SIZE), |
| 195 | limit); | 196 | limit); |
| 197 | #endif | ||
| 196 | 198 | ||
| 197 | size_zones(zones, holes, start_pfn, end_pfn); | 199 | size_zones(zones, holes, start_pfn, end_pfn); |
| 198 | free_area_init_node(nodeid, NODE_DATA(nodeid), zones, | 200 | free_area_init_node(nodeid, NODE_DATA(nodeid), zones, |
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 1755c053fd68..e5041a02e21f 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -3385,7 +3385,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action, | |||
| 3385 | } | 3385 | } |
| 3386 | 3386 | ||
| 3387 | 3387 | ||
| 3388 | static struct notifier_block __devinitdata blk_cpu_notifier = { | 3388 | static struct notifier_block blk_cpu_notifier = { |
| 3389 | .notifier_call = blk_cpu_notify, | 3389 | .notifier_call = blk_cpu_notify, |
| 3390 | }; | 3390 | }; |
| 3391 | 3391 | ||
diff --git a/drivers/Kconfig b/drivers/Kconfig index 5c91d6afb117..aeb5ab2391e4 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -68,8 +68,6 @@ source "drivers/leds/Kconfig" | |||
| 68 | 68 | ||
| 69 | source "drivers/infiniband/Kconfig" | 69 | source "drivers/infiniband/Kconfig" |
| 70 | 70 | ||
| 71 | source "drivers/sn/Kconfig" | ||
| 72 | |||
| 73 | source "drivers/edac/Kconfig" | 71 | source "drivers/edac/Kconfig" |
| 74 | 72 | ||
| 75 | source "drivers/rtc/Kconfig" | 73 | source "drivers/rtc/Kconfig" |
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 915810f6237e..8c52421cbc54 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c | |||
| @@ -107,7 +107,7 @@ static int __cpuinit topology_remove_dev(struct sys_device * sys_dev) | |||
| 107 | return 0; | 107 | return 0; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static int __cpuinit topology_cpu_callback(struct notifier_block *nfb, | 110 | static int topology_cpu_callback(struct notifier_block *nfb, |
| 111 | unsigned long action, void *hcpu) | 111 | unsigned long action, void *hcpu) |
| 112 | { | 112 | { |
| 113 | unsigned int cpu = (unsigned long)hcpu; | 113 | unsigned int cpu = (unsigned long)hcpu; |
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index bedb689b051f..dff1e67b1dd4 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -4301,7 +4301,7 @@ static int __init floppy_init(void) | |||
| 4301 | } | 4301 | } |
| 4302 | 4302 | ||
| 4303 | use_virtual_dma = can_use_virtual_dma & 1; | 4303 | use_virtual_dma = can_use_virtual_dma & 1; |
| 4304 | #if defined(CONFIG_PPC64) | 4304 | #if defined(CONFIG_PPC_MERGE) |
| 4305 | if (check_legacy_ioport(FDC1)) { | 4305 | if (check_legacy_ioport(FDC1)) { |
| 4306 | del_timer(&fd_timeout); | 4306 | del_timer(&fd_timeout); |
| 4307 | err = -ENODEV; | 4307 | err = -ENODEV; |
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index e1aadae00623..cb76e5ca9a23 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
| @@ -889,7 +889,6 @@ extern int drm_lock_free(drm_device_t * dev, | |||
| 889 | /* Buffer management support (drm_bufs.h) */ | 889 | /* Buffer management support (drm_bufs.h) */ |
| 890 | extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request); | 890 | extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request); |
| 891 | extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request); | 891 | extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request); |
| 892 | extern int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request); | ||
| 893 | extern int drm_addmap(drm_device_t * dev, unsigned int offset, | 892 | extern int drm_addmap(drm_device_t * dev, unsigned int offset, |
| 894 | unsigned int size, drm_map_type_t type, | 893 | unsigned int size, drm_map_type_t type, |
| 895 | drm_map_flags_t flags, drm_local_map_t ** map_ptr); | 894 | drm_map_flags_t flags, drm_local_map_t ** map_ptr); |
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c index fabc930c67a2..40bfd9b01e39 100644 --- a/drivers/char/drm/drm_agpsupport.c +++ b/drivers/char/drm/drm_agpsupport.c | |||
| @@ -503,8 +503,6 @@ int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start) | |||
| 503 | return agp_bind_memory(handle, start); | 503 | return agp_bind_memory(handle, start); |
| 504 | } | 504 | } |
| 505 | 505 | ||
| 506 | EXPORT_SYMBOL(drm_agp_bind_memory); | ||
| 507 | |||
| 508 | /** Calls agp_unbind_memory() */ | 506 | /** Calls agp_unbind_memory() */ |
| 509 | int drm_agp_unbind_memory(DRM_AGP_MEM * handle) | 507 | int drm_agp_unbind_memory(DRM_AGP_MEM * handle) |
| 510 | { | 508 | { |
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index 8a9cf12e6183..006b06d29727 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c | |||
| @@ -386,7 +386,6 @@ int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map) | |||
| 386 | 386 | ||
| 387 | return 0; | 387 | return 0; |
| 388 | } | 388 | } |
| 389 | EXPORT_SYMBOL(drm_rmmap_locked); | ||
| 390 | 389 | ||
| 391 | int drm_rmmap(drm_device_t *dev, drm_local_map_t *map) | 390 | int drm_rmmap(drm_device_t *dev, drm_local_map_t *map) |
| 392 | { | 391 | { |
| @@ -398,7 +397,6 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map) | |||
| 398 | 397 | ||
| 399 | return ret; | 398 | return ret; |
| 400 | } | 399 | } |
| 401 | EXPORT_SYMBOL(drm_rmmap); | ||
| 402 | 400 | ||
| 403 | /* The rmmap ioctl appears to be unnecessary. All mappings are torn down on | 401 | /* The rmmap ioctl appears to be unnecessary. All mappings are torn down on |
| 404 | * the last close of the device, and this is necessary for cleanup when things | 402 | * the last close of the device, and this is necessary for cleanup when things |
| @@ -1053,7 +1051,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request) | |||
| 1053 | return 0; | 1051 | return 0; |
| 1054 | } | 1052 | } |
| 1055 | 1053 | ||
| 1056 | int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request) | 1054 | static int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request) |
| 1057 | { | 1055 | { |
| 1058 | drm_device_dma_t *dma = dev->dma; | 1056 | drm_device_dma_t *dma = dev->dma; |
| 1059 | drm_buf_entry_t *entry; | 1057 | drm_buf_entry_t *entry; |
| @@ -1212,7 +1210,6 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request) | |||
| 1212 | atomic_dec(&dev->buf_alloc); | 1210 | atomic_dec(&dev->buf_alloc); |
| 1213 | return 0; | 1211 | return 0; |
| 1214 | } | 1212 | } |
| 1215 | EXPORT_SYMBOL(drm_addbufs_fb); | ||
| 1216 | 1213 | ||
| 1217 | 1214 | ||
| 1218 | /** | 1215 | /** |
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 68073e14fdec..9a842a36bb27 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/char/drm/drm_stub.c | |||
| @@ -229,8 +229,6 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
| 229 | return ret; | 229 | return ret; |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | EXPORT_SYMBOL(drm_get_dev); | ||
| 233 | |||
| 234 | /** | 232 | /** |
| 235 | * Put a device minor number. | 233 | * Put a device minor number. |
| 236 | * | 234 | * |
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c index b108c7f913b2..26bdf2ca59d7 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/char/drm/r300_cmdbuf.c | |||
| @@ -723,7 +723,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, | |||
| 723 | 723 | ||
| 724 | dev_priv->scratch_ages[header.scratch.reg]++; | 724 | dev_priv->scratch_ages[header.scratch.reg]++; |
| 725 | 725 | ||
| 726 | ref_age_base = *(u32 **)cmdbuf->buf; | 726 | ref_age_base = (u32 *)(unsigned long)*((uint64_t *)cmdbuf->buf); |
| 727 | 727 | ||
| 728 | cmdbuf->buf += sizeof(u64); | 728 | cmdbuf->buf += sizeof(u64); |
| 729 | cmdbuf->bufsz -= sizeof(u64); | 729 | cmdbuf->bufsz -= sizeof(u64); |
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 66719f9d294c..1fa9fa157c12 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/crash_dump.h> | 27 | #include <linux/crash_dump.h> |
| 28 | #include <linux/backing-dev.h> | 28 | #include <linux/backing-dev.h> |
| 29 | #include <linux/bootmem.h> | 29 | #include <linux/bootmem.h> |
| 30 | #include <linux/pipe_fs_i.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
| @@ -578,6 +579,18 @@ static ssize_t write_null(struct file * file, const char __user * buf, | |||
| 578 | return count; | 579 | return count; |
| 579 | } | 580 | } |
| 580 | 581 | ||
| 582 | static int pipe_to_null(struct pipe_inode_info *info, struct pipe_buffer *buf, | ||
| 583 | struct splice_desc *sd) | ||
| 584 | { | ||
| 585 | return sd->len; | ||
| 586 | } | ||
| 587 | |||
| 588 | static ssize_t splice_write_null(struct pipe_inode_info *pipe,struct file *out, | ||
| 589 | loff_t *ppos, size_t len, unsigned int flags) | ||
| 590 | { | ||
| 591 | return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_null); | ||
| 592 | } | ||
| 593 | |||
| 581 | #ifdef CONFIG_MMU | 594 | #ifdef CONFIG_MMU |
| 582 | /* | 595 | /* |
| 583 | * For fun, we are using the MMU for this. | 596 | * For fun, we are using the MMU for this. |
| @@ -785,6 +798,7 @@ static struct file_operations null_fops = { | |||
| 785 | .llseek = null_lseek, | 798 | .llseek = null_lseek, |
| 786 | .read = read_null, | 799 | .read = read_null, |
| 787 | .write = write_null, | 800 | .write = write_null, |
| 801 | .splice_write = splice_write_null, | ||
| 788 | }; | 802 | }; |
| 789 | 803 | ||
| 790 | #if defined(CONFIG_ISA) || !defined(__mc68000__) | 804 | #if defined(CONFIG_ISA) || !defined(__mc68000__) |
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index b543821d8cb4..56c8243cdb73 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c | |||
| @@ -390,7 +390,8 @@ scdrv_init(void) | |||
| 390 | format_module_id(devnamep, geo_module(geoid), | 390 | format_module_id(devnamep, geo_module(geoid), |
| 391 | MODULE_FORMAT_BRIEF); | 391 | MODULE_FORMAT_BRIEF); |
| 392 | devnamep = devname + strlen(devname); | 392 | devnamep = devname + strlen(devname); |
| 393 | sprintf(devnamep, "#%d", geo_slab(geoid)); | 393 | sprintf(devnamep, "^%d#%d", geo_slot(geoid), |
| 394 | geo_slab(geoid)); | ||
| 394 | 395 | ||
| 395 | /* allocate sysctl device data */ | 396 | /* allocate sysctl device data */ |
| 396 | scd = kzalloc(sizeof (struct sysctl_data_s), | 397 | scd = kzalloc(sizeof (struct sysctl_data_s), |
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index a6873bf89ffa..1efde3b27619 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -20,9 +20,18 @@ config TCG_TPM | |||
| 20 | Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI | 20 | Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI |
| 21 | and CONFIG_PNPACPI. | 21 | and CONFIG_PNPACPI. |
| 22 | 22 | ||
| 23 | config TCG_TIS | ||
| 24 | tristate "TPM Interface Specification 1.2 Interface" | ||
| 25 | depends on TCG_TPM | ||
| 26 | ---help--- | ||
| 27 | If you have a TPM security chip that is compliant with the | ||
| 28 | TCG TIS 1.2 TPM specification say Yes and it will be accessible | ||
| 29 | from within Linux. To compile this driver as a module, choose | ||
| 30 | M here; the module will be called tpm_tis. | ||
| 31 | |||
| 23 | config TCG_NSC | 32 | config TCG_NSC |
| 24 | tristate "National Semiconductor TPM Interface" | 33 | tristate "National Semiconductor TPM Interface" |
| 25 | depends on TCG_TPM | 34 | depends on TCG_TPM && PNPACPI |
| 26 | ---help--- | 35 | ---help--- |
| 27 | If you have a TPM security chip from National Semicondutor | 36 | If you have a TPM security chip from National Semicondutor |
| 28 | say Yes and it will be accessible from within Linux. To | 37 | say Yes and it will be accessible from within Linux. To |
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index ba4582d160fd..ea3a1e02a824 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile | |||
| @@ -5,6 +5,7 @@ obj-$(CONFIG_TCG_TPM) += tpm.o | |||
| 5 | ifdef CONFIG_ACPI | 5 | ifdef CONFIG_ACPI |
| 6 | obj-$(CONFIG_TCG_TPM) += tpm_bios.o | 6 | obj-$(CONFIG_TCG_TPM) += tpm_bios.o |
| 7 | endif | 7 | endif |
| 8 | obj-$(CONFIG_TCG_TIS) += tpm_tis.o | ||
| 8 | obj-$(CONFIG_TCG_NSC) += tpm_nsc.o | 9 | obj-$(CONFIG_TCG_NSC) += tpm_nsc.o |
| 9 | obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o | 10 | obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o |
| 10 | obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o | 11 | obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o |
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index 5a3870477ef1..6889e7db3aff 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c | |||
| @@ -32,12 +32,291 @@ enum tpm_const { | |||
| 32 | TPM_MINOR = 224, /* officially assigned */ | 32 | TPM_MINOR = 224, /* officially assigned */ |
| 33 | TPM_BUFSIZE = 2048, | 33 | TPM_BUFSIZE = 2048, |
| 34 | TPM_NUM_DEVICES = 256, | 34 | TPM_NUM_DEVICES = 256, |
| 35 | TPM_NUM_MASK_ENTRIES = TPM_NUM_DEVICES / (8 * sizeof(int)) | ||
| 36 | }; | 35 | }; |
| 37 | 36 | ||
| 37 | enum tpm_duration { | ||
| 38 | TPM_SHORT = 0, | ||
| 39 | TPM_MEDIUM = 1, | ||
| 40 | TPM_LONG = 2, | ||
| 41 | TPM_UNDEFINED, | ||
| 42 | }; | ||
| 43 | |||
| 44 | #define TPM_MAX_ORDINAL 243 | ||
| 45 | #define TPM_MAX_PROTECTED_ORDINAL 12 | ||
| 46 | #define TPM_PROTECTED_ORDINAL_MASK 0xFF | ||
| 47 | |||
| 38 | static LIST_HEAD(tpm_chip_list); | 48 | static LIST_HEAD(tpm_chip_list); |
| 39 | static DEFINE_SPINLOCK(driver_lock); | 49 | static DEFINE_SPINLOCK(driver_lock); |
| 40 | static int dev_mask[TPM_NUM_MASK_ENTRIES]; | 50 | static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES); |
| 51 | |||
| 52 | /* | ||
| 53 | * Array with one entry per ordinal defining the maximum amount | ||
| 54 | * of time the chip could take to return the result. The ordinal | ||
| 55 | * designation of short, medium or long is defined in a table in | ||
| 56 | * TCG Specification TPM Main Part 2 TPM Structures Section 17. The | ||
| 57 | * values of the SHORT, MEDIUM, and LONG durations are retrieved | ||
| 58 | * from the chip during initialization with a call to tpm_get_timeouts. | ||
| 59 | */ | ||
| 60 | static const u8 tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL] = { | ||
| 61 | TPM_UNDEFINED, /* 0 */ | ||
| 62 | TPM_UNDEFINED, | ||
| 63 | TPM_UNDEFINED, | ||
| 64 | TPM_UNDEFINED, | ||
| 65 | TPM_UNDEFINED, | ||
| 66 | TPM_UNDEFINED, /* 5 */ | ||
| 67 | TPM_UNDEFINED, | ||
| 68 | TPM_UNDEFINED, | ||
| 69 | TPM_UNDEFINED, | ||
| 70 | TPM_UNDEFINED, | ||
| 71 | TPM_SHORT, /* 10 */ | ||
| 72 | TPM_SHORT, | ||
| 73 | }; | ||
| 74 | |||
| 75 | static const u8 tpm_ordinal_duration[TPM_MAX_ORDINAL] = { | ||
| 76 | TPM_UNDEFINED, /* 0 */ | ||
| 77 | TPM_UNDEFINED, | ||
| 78 | TPM_UNDEFINED, | ||
| 79 | TPM_UNDEFINED, | ||
| 80 | TPM_UNDEFINED, | ||
| 81 | TPM_UNDEFINED, /* 5 */ | ||
| 82 | TPM_UNDEFINED, | ||
| 83 | TPM_UNDEFINED, | ||
| 84 | TPM_UNDEFINED, | ||
| 85 | TPM_UNDEFINED, | ||
| 86 | TPM_SHORT, /* 10 */ | ||
| 87 | TPM_SHORT, | ||
| 88 | TPM_MEDIUM, | ||
| 89 | TPM_LONG, | ||
| 90 | TPM_LONG, | ||
| 91 | TPM_MEDIUM, /* 15 */ | ||
| 92 | TPM_SHORT, | ||
| 93 | TPM_SHORT, | ||
| 94 | TPM_MEDIUM, | ||
| 95 | TPM_LONG, | ||
| 96 | TPM_SHORT, /* 20 */ | ||
| 97 | TPM_SHORT, | ||
| 98 | TPM_MEDIUM, | ||
| 99 | TPM_MEDIUM, | ||
| 100 | TPM_MEDIUM, | ||
| 101 | TPM_SHORT, /* 25 */ | ||
| 102 | TPM_SHORT, | ||
| 103 | TPM_MEDIUM, | ||
| 104 | TPM_SHORT, | ||
| 105 | TPM_SHORT, | ||
| 106 | TPM_MEDIUM, /* 30 */ | ||
| 107 | TPM_LONG, | ||
| 108 | TPM_MEDIUM, | ||
| 109 | TPM_SHORT, | ||
| 110 | TPM_SHORT, | ||
| 111 | TPM_SHORT, /* 35 */ | ||
| 112 | TPM_MEDIUM, | ||
| 113 | TPM_MEDIUM, | ||
| 114 | TPM_UNDEFINED, | ||
| 115 | TPM_UNDEFINED, | ||
| 116 | TPM_MEDIUM, /* 40 */ | ||
| 117 | TPM_LONG, | ||
| 118 | TPM_MEDIUM, | ||
| 119 | TPM_SHORT, | ||
| 120 | TPM_SHORT, | ||
| 121 | TPM_SHORT, /* 45 */ | ||
| 122 | TPM_SHORT, | ||
| 123 | TPM_SHORT, | ||
| 124 | TPM_SHORT, | ||
| 125 | TPM_LONG, | ||
| 126 | TPM_MEDIUM, /* 50 */ | ||
| 127 | TPM_MEDIUM, | ||
| 128 | TPM_UNDEFINED, | ||
| 129 | TPM_UNDEFINED, | ||
| 130 | TPM_UNDEFINED, | ||
| 131 | TPM_UNDEFINED, /* 55 */ | ||
| 132 | TPM_UNDEFINED, | ||
| 133 | TPM_UNDEFINED, | ||
| 134 | TPM_UNDEFINED, | ||
| 135 | TPM_UNDEFINED, | ||
| 136 | TPM_MEDIUM, /* 60 */ | ||
| 137 | TPM_MEDIUM, | ||
| 138 | TPM_MEDIUM, | ||
| 139 | TPM_SHORT, | ||
| 140 | TPM_SHORT, | ||
| 141 | TPM_MEDIUM, /* 65 */ | ||
| 142 | TPM_UNDEFINED, | ||
| 143 | TPM_UNDEFINED, | ||
| 144 | TPM_UNDEFINED, | ||
| 145 | TPM_UNDEFINED, | ||
| 146 | TPM_SHORT, /* 70 */ | ||
| 147 | TPM_SHORT, | ||
| 148 | TPM_UNDEFINED, | ||
| 149 | TPM_UNDEFINED, | ||
| 150 | TPM_UNDEFINED, | ||
| 151 | TPM_UNDEFINED, /* 75 */ | ||
| 152 | TPM_UNDEFINED, | ||
| 153 | TPM_UNDEFINED, | ||
| 154 | TPM_UNDEFINED, | ||
| 155 | TPM_UNDEFINED, | ||
| 156 | TPM_LONG, /* 80 */ | ||
| 157 | TPM_UNDEFINED, | ||
| 158 | TPM_MEDIUM, | ||
| 159 | TPM_LONG, | ||
| 160 | TPM_SHORT, | ||
| 161 | TPM_UNDEFINED, /* 85 */ | ||
| 162 | TPM_UNDEFINED, | ||
| 163 | TPM_UNDEFINED, | ||
| 164 | TPM_UNDEFINED, | ||
| 165 | TPM_UNDEFINED, | ||
| 166 | TPM_SHORT, /* 90 */ | ||
| 167 | TPM_SHORT, | ||
| 168 | TPM_SHORT, | ||
| 169 | TPM_SHORT, | ||
| 170 | TPM_SHORT, | ||
| 171 | TPM_UNDEFINED, /* 95 */ | ||
| 172 | TPM_UNDEFINED, | ||
| 173 | TPM_UNDEFINED, | ||
| 174 | TPM_UNDEFINED, | ||
| 175 | TPM_UNDEFINED, | ||
| 176 | TPM_MEDIUM, /* 100 */ | ||
| 177 | TPM_SHORT, | ||
| 178 | TPM_SHORT, | ||
| 179 | TPM_UNDEFINED, | ||
| 180 | TPM_UNDEFINED, | ||
| 181 | TPM_UNDEFINED, /* 105 */ | ||
| 182 | TPM_UNDEFINED, | ||
| 183 | TPM_UNDEFINED, | ||
| 184 | TPM_UNDEFINED, | ||
| 185 | TPM_UNDEFINED, | ||
| 186 | TPM_SHORT, /* 110 */ | ||
| 187 | TPM_SHORT, | ||
| 188 | TPM_SHORT, | ||
| 189 | TPM_SHORT, | ||
| 190 | TPM_SHORT, | ||
| 191 | TPM_SHORT, /* 115 */ | ||
| 192 | TPM_SHORT, | ||
| 193 | TPM_SHORT, | ||
| 194 | TPM_UNDEFINED, | ||
| 195 | TPM_UNDEFINED, | ||
| 196 | TPM_LONG, /* 120 */ | ||
| 197 | TPM_LONG, | ||
| 198 | TPM_MEDIUM, | ||
| 199 | TPM_UNDEFINED, | ||
| 200 | TPM_SHORT, | ||
| 201 | TPM_SHORT, /* 125 */ | ||
| 202 | TPM_SHORT, | ||
| 203 | TPM_LONG, | ||
| 204 | TPM_SHORT, | ||
| 205 | TPM_SHORT, | ||
| 206 | TPM_SHORT, /* 130 */ | ||
| 207 | TPM_MEDIUM, | ||
| 208 | TPM_UNDEFINED, | ||
| 209 | TPM_SHORT, | ||
| 210 | TPM_MEDIUM, | ||
| 211 | TPM_UNDEFINED, /* 135 */ | ||
| 212 | TPM_UNDEFINED, | ||
| 213 | TPM_UNDEFINED, | ||
| 214 | TPM_UNDEFINED, | ||
| 215 | TPM_UNDEFINED, | ||
| 216 | TPM_SHORT, /* 140 */ | ||
| 217 | TPM_SHORT, | ||
| 218 | TPM_UNDEFINED, | ||
| 219 | TPM_UNDEFINED, | ||
| 220 | TPM_UNDEFINED, | ||
| 221 | TPM_UNDEFINED, /* 145 */ | ||
| 222 | TPM_UNDEFINED, | ||
| 223 | TPM_UNDEFINED, | ||
| 224 | TPM_UNDEFINED, | ||
| 225 | TPM_UNDEFINED, | ||
| 226 | TPM_SHORT, /* 150 */ | ||
| 227 | TPM_MEDIUM, | ||
| 228 | TPM_MEDIUM, | ||
| 229 | TPM_SHORT, | ||
| 230 | TPM_SHORT, | ||
| 231 | TPM_UNDEFINED, /* 155 */ | ||
| 232 | TPM_UNDEFINED, | ||
| 233 | TPM_UNDEFINED, | ||
| 234 | TPM_UNDEFINED, | ||
| 235 | TPM_UNDEFINED, | ||
| 236 | TPM_SHORT, /* 160 */ | ||
| 237 | TPM_SHORT, | ||
| 238 | TPM_SHORT, | ||
| 239 | TPM_SHORT, | ||
| 240 | TPM_UNDEFINED, | ||
| 241 | TPM_UNDEFINED, /* 165 */ | ||
| 242 | TPM_UNDEFINED, | ||
| 243 | TPM_UNDEFINED, | ||
| 244 | TPM_UNDEFINED, | ||
| 245 | TPM_UNDEFINED, | ||
| 246 | TPM_LONG, /* 170 */ | ||
| 247 | TPM_UNDEFINED, | ||
| 248 | TPM_UNDEFINED, | ||
| 249 | TPM_UNDEFINED, | ||
| 250 | TPM_UNDEFINED, | ||
| 251 | TPM_UNDEFINED, /* 175 */ | ||
| 252 | TPM_UNDEFINED, | ||
| 253 | TPM_UNDEFINED, | ||
| 254 | TPM_UNDEFINED, | ||
| 255 | TPM_UNDEFINED, | ||
| 256 | TPM_MEDIUM, /* 180 */ | ||
| 257 | TPM_SHORT, | ||
| 258 | TPM_MEDIUM, | ||
| 259 | TPM_MEDIUM, | ||
| 260 | TPM_MEDIUM, | ||
| 261 | TPM_MEDIUM, /* 185 */ | ||
| 262 | TPM_SHORT, | ||
| 263 | TPM_UNDEFINED, | ||
| 264 | TPM_UNDEFINED, | ||
| 265 | TPM_UNDEFINED, | ||
| 266 | TPM_UNDEFINED, /* 190 */ | ||
| 267 | TPM_UNDEFINED, | ||
| 268 | TPM_UNDEFINED, | ||
| 269 | TPM_UNDEFINED, | ||
| 270 | TPM_UNDEFINED, | ||
| 271 | TPM_UNDEFINED, /* 195 */ | ||
| 272 | TPM_UNDEFINED, | ||
| 273 | TPM_UNDEFINED, | ||
| 274 | TPM_UNDEFINED, | ||
| 275 | TPM_UNDEFINED, | ||
| 276 | TPM_SHORT, /* 200 */ | ||
| 277 | TPM_UNDEFINED, | ||
| 278 | TPM_UNDEFINED, | ||
| 279 | TPM_UNDEFINED, | ||
| 280 | TPM_SHORT, | ||
| 281 | TPM_SHORT, /* 205 */ | ||
| 282 | TPM_SHORT, | ||
| 283 | TPM_SHORT, | ||
| 284 | TPM_SHORT, | ||
| 285 | TPM_SHORT, | ||
| 286 | TPM_MEDIUM, /* 210 */ | ||
| 287 | TPM_UNDEFINED, | ||
| 288 | TPM_MEDIUM, | ||
| 289 | TPM_MEDIUM, | ||
| 290 | TPM_MEDIUM, | ||
| 291 | TPM_UNDEFINED, /* 215 */ | ||
| 292 | TPM_MEDIUM, | ||
| 293 | TPM_UNDEFINED, | ||
| 294 | TPM_UNDEFINED, | ||
| 295 | TPM_SHORT, | ||
| 296 | TPM_SHORT, /* 220 */ | ||
| 297 | TPM_SHORT, | ||
| 298 | TPM_SHORT, | ||
| 299 | TPM_SHORT, | ||
| 300 | TPM_SHORT, | ||
| 301 | TPM_UNDEFINED, /* 225 */ | ||
| 302 | TPM_UNDEFINED, | ||
| 303 | TPM_UNDEFINED, | ||
| 304 | TPM_UNDEFINED, | ||
| 305 | TPM_UNDEFINED, | ||
| 306 | TPM_SHORT, /* 230 */ | ||
| 307 | TPM_LONG, | ||
| 308 | TPM_MEDIUM, | ||
| 309 | TPM_UNDEFINED, | ||
| 310 | TPM_UNDEFINED, | ||
| 311 | TPM_UNDEFINED, /* 235 */ | ||
| 312 | TPM_UNDEFINED, | ||
| 313 | TPM_UNDEFINED, | ||
| 314 | TPM_UNDEFINED, | ||
| 315 | TPM_UNDEFINED, | ||
| 316 | TPM_SHORT, /* 240 */ | ||
| 317 | TPM_UNDEFINED, | ||
| 318 | TPM_MEDIUM, | ||
| 319 | }; | ||
| 41 | 320 | ||
| 42 | static void user_reader_timeout(unsigned long ptr) | 321 | static void user_reader_timeout(unsigned long ptr) |
| 43 | { | 322 | { |
| @@ -46,7 +325,7 @@ static void user_reader_timeout(unsigned long ptr) | |||
| 46 | schedule_work(&chip->work); | 325 | schedule_work(&chip->work); |
| 47 | } | 326 | } |
| 48 | 327 | ||
| 49 | static void timeout_work(void * ptr) | 328 | static void timeout_work(void *ptr) |
| 50 | { | 329 | { |
| 51 | struct tpm_chip *chip = ptr; | 330 | struct tpm_chip *chip = ptr; |
| 52 | 331 | ||
| @@ -57,17 +336,43 @@ static void timeout_work(void * ptr) | |||
| 57 | } | 336 | } |
| 58 | 337 | ||
| 59 | /* | 338 | /* |
| 339 | * Returns max number of jiffies to wait | ||
| 340 | */ | ||
| 341 | unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, | ||
| 342 | u32 ordinal) | ||
| 343 | { | ||
| 344 | int duration_idx = TPM_UNDEFINED; | ||
| 345 | int duration = 0; | ||
| 346 | |||
| 347 | if (ordinal < TPM_MAX_ORDINAL) | ||
| 348 | duration_idx = tpm_ordinal_duration[ordinal]; | ||
| 349 | else if ((ordinal & TPM_PROTECTED_ORDINAL_MASK) < | ||
| 350 | TPM_MAX_PROTECTED_ORDINAL) | ||
| 351 | duration_idx = | ||
| 352 | tpm_protected_ordinal_duration[ordinal & | ||
| 353 | TPM_PROTECTED_ORDINAL_MASK]; | ||
| 354 | |||
| 355 | if (duration_idx != TPM_UNDEFINED) | ||
| 356 | duration = chip->vendor.duration[duration_idx]; | ||
| 357 | if (duration <= 0) | ||
| 358 | return 2 * 60 * HZ; | ||
| 359 | else | ||
| 360 | return duration; | ||
| 361 | } | ||
| 362 | EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration); | ||
| 363 | |||
| 364 | /* | ||
| 60 | * Internal kernel interface to transmit TPM commands | 365 | * Internal kernel interface to transmit TPM commands |
| 61 | */ | 366 | */ |
| 62 | static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, | 367 | static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, |
| 63 | size_t bufsiz) | 368 | size_t bufsiz) |
| 64 | { | 369 | { |
| 65 | ssize_t rc; | 370 | ssize_t rc; |
| 66 | u32 count; | 371 | u32 count, ordinal; |
| 67 | unsigned long stop; | 372 | unsigned long stop; |
| 68 | 373 | ||
| 69 | count = be32_to_cpu(*((__be32 *) (buf + 2))); | 374 | count = be32_to_cpu(*((__be32 *) (buf + 2))); |
| 70 | 375 | ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); | |
| 71 | if (count == 0) | 376 | if (count == 0) |
| 72 | return -ENODATA; | 377 | return -ENODATA; |
| 73 | if (count > bufsiz) { | 378 | if (count > bufsiz) { |
| @@ -78,21 +383,23 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, | |||
| 78 | 383 | ||
| 79 | down(&chip->tpm_mutex); | 384 | down(&chip->tpm_mutex); |
| 80 | 385 | ||
| 81 | if ((rc = chip->vendor->send(chip, (u8 *) buf, count)) < 0) { | 386 | if ((rc = chip->vendor.send(chip, (u8 *) buf, count)) < 0) { |
| 82 | dev_err(chip->dev, | 387 | dev_err(chip->dev, |
| 83 | "tpm_transmit: tpm_send: error %zd\n", rc); | 388 | "tpm_transmit: tpm_send: error %zd\n", rc); |
| 84 | goto out; | 389 | goto out; |
| 85 | } | 390 | } |
| 86 | 391 | ||
| 87 | stop = jiffies + 2 * 60 * HZ; | 392 | if (chip->vendor.irq) |
| 393 | goto out_recv; | ||
| 394 | |||
| 395 | stop = jiffies + tpm_calc_ordinal_duration(chip, ordinal); | ||
| 88 | do { | 396 | do { |
| 89 | u8 status = chip->vendor->status(chip); | 397 | u8 status = chip->vendor.status(chip); |
| 90 | if ((status & chip->vendor->req_complete_mask) == | 398 | if ((status & chip->vendor.req_complete_mask) == |
| 91 | chip->vendor->req_complete_val) { | 399 | chip->vendor.req_complete_val) |
| 92 | goto out_recv; | 400 | goto out_recv; |
| 93 | } | ||
| 94 | 401 | ||
| 95 | if ((status == chip->vendor->req_canceled)) { | 402 | if ((status == chip->vendor.req_canceled)) { |
| 96 | dev_err(chip->dev, "Operation Canceled\n"); | 403 | dev_err(chip->dev, "Operation Canceled\n"); |
| 97 | rc = -ECANCELED; | 404 | rc = -ECANCELED; |
| 98 | goto out; | 405 | goto out; |
| @@ -102,14 +409,13 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, | |||
| 102 | rmb(); | 409 | rmb(); |
| 103 | } while (time_before(jiffies, stop)); | 410 | } while (time_before(jiffies, stop)); |
| 104 | 411 | ||
| 105 | 412 | chip->vendor.cancel(chip); | |
| 106 | chip->vendor->cancel(chip); | ||
| 107 | dev_err(chip->dev, "Operation Timed out\n"); | 413 | dev_err(chip->dev, "Operation Timed out\n"); |
| 108 | rc = -ETIME; | 414 | rc = -ETIME; |
| 109 | goto out; | 415 | goto out; |
| 110 | 416 | ||
| 111 | out_recv: | 417 | out_recv: |
| 112 | rc = chip->vendor->recv(chip, (u8 *) buf, bufsiz); | 418 | rc = chip->vendor.recv(chip, (u8 *) buf, bufsiz); |
| 113 | if (rc < 0) | 419 | if (rc < 0) |
| 114 | dev_err(chip->dev, | 420 | dev_err(chip->dev, |
| 115 | "tpm_transmit: tpm_recv: error %zd\n", rc); | 421 | "tpm_transmit: tpm_recv: error %zd\n", rc); |
| @@ -119,17 +425,247 @@ out: | |||
| 119 | } | 425 | } |
| 120 | 426 | ||
| 121 | #define TPM_DIGEST_SIZE 20 | 427 | #define TPM_DIGEST_SIZE 20 |
| 122 | #define CAP_PCR_RESULT_SIZE 18 | 428 | #define TPM_ERROR_SIZE 10 |
| 123 | static const u8 cap_pcr[] = { | 429 | #define TPM_RET_CODE_IDX 6 |
| 430 | #define TPM_GET_CAP_RET_SIZE_IDX 10 | ||
| 431 | #define TPM_GET_CAP_RET_UINT32_1_IDX 14 | ||
| 432 | #define TPM_GET_CAP_RET_UINT32_2_IDX 18 | ||
| 433 | #define TPM_GET_CAP_RET_UINT32_3_IDX 22 | ||
| 434 | #define TPM_GET_CAP_RET_UINT32_4_IDX 26 | ||
| 435 | #define TPM_GET_CAP_PERM_DISABLE_IDX 16 | ||
| 436 | #define TPM_GET_CAP_PERM_INACTIVE_IDX 18 | ||
| 437 | #define TPM_GET_CAP_RET_BOOL_1_IDX 14 | ||
| 438 | #define TPM_GET_CAP_TEMP_INACTIVE_IDX 16 | ||
| 439 | |||
| 440 | #define TPM_CAP_IDX 13 | ||
| 441 | #define TPM_CAP_SUBCAP_IDX 21 | ||
| 442 | |||
| 443 | enum tpm_capabilities { | ||
| 444 | TPM_CAP_FLAG = 4, | ||
| 445 | TPM_CAP_PROP = 5, | ||
| 446 | }; | ||
| 447 | |||
| 448 | enum tpm_sub_capabilities { | ||
| 449 | TPM_CAP_PROP_PCR = 0x1, | ||
| 450 | TPM_CAP_PROP_MANUFACTURER = 0x3, | ||
| 451 | TPM_CAP_FLAG_PERM = 0x8, | ||
| 452 | TPM_CAP_FLAG_VOL = 0x9, | ||
| 453 | TPM_CAP_PROP_OWNER = 0x11, | ||
| 454 | TPM_CAP_PROP_TIS_TIMEOUT = 0x15, | ||
| 455 | TPM_CAP_PROP_TIS_DURATION = 0x20, | ||
| 456 | }; | ||
| 457 | |||
| 458 | /* | ||
| 459 | * This is a semi generic GetCapability command for use | ||
| 460 | * with the capability type TPM_CAP_PROP or TPM_CAP_FLAG | ||
| 461 | * and their associated sub_capabilities. | ||
| 462 | */ | ||
| 463 | |||
| 464 | static const u8 tpm_cap[] = { | ||
| 124 | 0, 193, /* TPM_TAG_RQU_COMMAND */ | 465 | 0, 193, /* TPM_TAG_RQU_COMMAND */ |
| 125 | 0, 0, 0, 22, /* length */ | 466 | 0, 0, 0, 22, /* length */ |
| 126 | 0, 0, 0, 101, /* TPM_ORD_GetCapability */ | 467 | 0, 0, 0, 101, /* TPM_ORD_GetCapability */ |
| 127 | 0, 0, 0, 5, | 468 | 0, 0, 0, 0, /* TPM_CAP_<TYPE> */ |
| 128 | 0, 0, 0, 4, | 469 | 0, 0, 0, 4, /* TPM_CAP_SUB_<TYPE> size */ |
| 129 | 0, 0, 1, 1 | 470 | 0, 0, 1, 0 /* TPM_CAP_SUB_<TYPE> */ |
| 130 | }; | 471 | }; |
| 131 | 472 | ||
| 132 | #define READ_PCR_RESULT_SIZE 30 | 473 | static ssize_t transmit_cmd(struct tpm_chip *chip, u8 *data, int len, |
| 474 | char *desc) | ||
| 475 | { | ||
| 476 | int err; | ||
| 477 | |||
| 478 | len = tpm_transmit(chip, data, len); | ||
| 479 | if (len < 0) | ||
| 480 | return len; | ||
| 481 | if (len == TPM_ERROR_SIZE) { | ||
| 482 | err = be32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX))); | ||
| 483 | dev_dbg(chip->dev, "A TPM error (%d) occurred %s\n", err, desc); | ||
| 484 | return err; | ||
| 485 | } | ||
| 486 | return 0; | ||
| 487 | } | ||
| 488 | |||
| 489 | void tpm_gen_interrupt(struct tpm_chip *chip) | ||
| 490 | { | ||
| 491 | u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)]; | ||
| 492 | ssize_t rc; | ||
| 493 | |||
| 494 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 495 | data[TPM_CAP_IDX] = TPM_CAP_PROP; | ||
| 496 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_TIS_TIMEOUT; | ||
| 497 | |||
| 498 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 499 | "attempting to determine the timeouts"); | ||
| 500 | } | ||
| 501 | EXPORT_SYMBOL_GPL(tpm_gen_interrupt); | ||
| 502 | |||
| 503 | void tpm_get_timeouts(struct tpm_chip *chip) | ||
| 504 | { | ||
| 505 | u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)]; | ||
| 506 | ssize_t rc; | ||
| 507 | u32 timeout; | ||
| 508 | |||
| 509 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 510 | data[TPM_CAP_IDX] = TPM_CAP_PROP; | ||
| 511 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_TIS_TIMEOUT; | ||
| 512 | |||
| 513 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 514 | "attempting to determine the timeouts"); | ||
| 515 | if (rc) | ||
| 516 | goto duration; | ||
| 517 | |||
| 518 | if (be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_SIZE_IDX))) | ||
| 519 | != 4 * sizeof(u32)) | ||
| 520 | goto duration; | ||
| 521 | |||
| 522 | /* Don't overwrite default if value is 0 */ | ||
| 523 | timeout = | ||
| 524 | be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX))); | ||
| 525 | if (timeout) | ||
| 526 | chip->vendor.timeout_a = msecs_to_jiffies(timeout); | ||
| 527 | timeout = | ||
| 528 | be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_2_IDX))); | ||
| 529 | if (timeout) | ||
| 530 | chip->vendor.timeout_b = msecs_to_jiffies(timeout); | ||
| 531 | timeout = | ||
| 532 | be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_3_IDX))); | ||
| 533 | if (timeout) | ||
| 534 | chip->vendor.timeout_c = msecs_to_jiffies(timeout); | ||
| 535 | timeout = | ||
| 536 | be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_4_IDX))); | ||
| 537 | if (timeout) | ||
| 538 | chip->vendor.timeout_d = msecs_to_jiffies(timeout); | ||
| 539 | |||
| 540 | duration: | ||
| 541 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 542 | data[TPM_CAP_IDX] = TPM_CAP_PROP; | ||
| 543 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_TIS_DURATION; | ||
| 544 | |||
| 545 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 546 | "attempting to determine the durations"); | ||
| 547 | if (rc) | ||
| 548 | return; | ||
| 549 | |||
| 550 | if (be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_SIZE_IDX))) | ||
| 551 | != 3 * sizeof(u32)) | ||
| 552 | return; | ||
| 553 | |||
| 554 | chip->vendor.duration[TPM_SHORT] = | ||
| 555 | msecs_to_jiffies(be32_to_cpu | ||
| 556 | (*((__be32 *) (data + | ||
| 557 | TPM_GET_CAP_RET_UINT32_1_IDX)))); | ||
| 558 | chip->vendor.duration[TPM_MEDIUM] = | ||
| 559 | msecs_to_jiffies(be32_to_cpu | ||
| 560 | (*((__be32 *) (data + | ||
| 561 | TPM_GET_CAP_RET_UINT32_2_IDX)))); | ||
| 562 | chip->vendor.duration[TPM_LONG] = | ||
| 563 | msecs_to_jiffies(be32_to_cpu | ||
| 564 | (*((__be32 *) (data + | ||
| 565 | TPM_GET_CAP_RET_UINT32_3_IDX)))); | ||
| 566 | } | ||
| 567 | EXPORT_SYMBOL_GPL(tpm_get_timeouts); | ||
| 568 | |||
| 569 | void tpm_continue_selftest(struct tpm_chip *chip) | ||
| 570 | { | ||
| 571 | u8 data[] = { | ||
| 572 | 0, 193, /* TPM_TAG_RQU_COMMAND */ | ||
| 573 | 0, 0, 0, 10, /* length */ | ||
| 574 | 0, 0, 0, 83, /* TPM_ORD_GetCapability */ | ||
| 575 | }; | ||
| 576 | |||
| 577 | tpm_transmit(chip, data, sizeof(data)); | ||
| 578 | } | ||
| 579 | EXPORT_SYMBOL_GPL(tpm_continue_selftest); | ||
| 580 | |||
| 581 | ssize_t tpm_show_enabled(struct device * dev, struct device_attribute * attr, | ||
| 582 | char *buf) | ||
| 583 | { | ||
| 584 | u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 35)]; | ||
| 585 | ssize_t rc; | ||
| 586 | |||
| 587 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 588 | if (chip == NULL) | ||
| 589 | return -ENODEV; | ||
| 590 | |||
| 591 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 592 | data[TPM_CAP_IDX] = TPM_CAP_FLAG; | ||
| 593 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_PERM; | ||
| 594 | |||
| 595 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 596 | "attemtping to determine the permanent state"); | ||
| 597 | if (rc) | ||
| 598 | return 0; | ||
| 599 | return sprintf(buf, "%d\n", !data[TPM_GET_CAP_PERM_DISABLE_IDX]); | ||
| 600 | } | ||
| 601 | EXPORT_SYMBOL_GPL(tpm_show_enabled); | ||
| 602 | |||
| 603 | ssize_t tpm_show_active(struct device * dev, struct device_attribute * attr, | ||
| 604 | char *buf) | ||
| 605 | { | ||
| 606 | u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 35)]; | ||
| 607 | ssize_t rc; | ||
| 608 | |||
| 609 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 610 | if (chip == NULL) | ||
| 611 | return -ENODEV; | ||
| 612 | |||
| 613 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 614 | data[TPM_CAP_IDX] = TPM_CAP_FLAG; | ||
| 615 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_PERM; | ||
| 616 | |||
| 617 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 618 | "attemtping to determine the permanent state"); | ||
| 619 | if (rc) | ||
| 620 | return 0; | ||
| 621 | return sprintf(buf, "%d\n", !data[TPM_GET_CAP_PERM_INACTIVE_IDX]); | ||
| 622 | } | ||
| 623 | EXPORT_SYMBOL_GPL(tpm_show_active); | ||
| 624 | |||
| 625 | ssize_t tpm_show_owned(struct device * dev, struct device_attribute * attr, | ||
| 626 | char *buf) | ||
| 627 | { | ||
| 628 | u8 data[sizeof(tpm_cap)]; | ||
| 629 | ssize_t rc; | ||
| 630 | |||
| 631 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 632 | if (chip == NULL) | ||
| 633 | return -ENODEV; | ||
| 634 | |||
| 635 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 636 | data[TPM_CAP_IDX] = TPM_CAP_PROP; | ||
| 637 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_OWNER; | ||
| 638 | |||
| 639 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 640 | "attempting to determine the owner state"); | ||
| 641 | if (rc) | ||
| 642 | return 0; | ||
| 643 | return sprintf(buf, "%d\n", data[TPM_GET_CAP_RET_BOOL_1_IDX]); | ||
| 644 | } | ||
| 645 | EXPORT_SYMBOL_GPL(tpm_show_owned); | ||
| 646 | |||
| 647 | ssize_t tpm_show_temp_deactivated(struct device * dev, | ||
| 648 | struct device_attribute * attr, char *buf) | ||
| 649 | { | ||
| 650 | u8 data[sizeof(tpm_cap)]; | ||
| 651 | ssize_t rc; | ||
| 652 | |||
| 653 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 654 | if (chip == NULL) | ||
| 655 | return -ENODEV; | ||
| 656 | |||
| 657 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 658 | data[TPM_CAP_IDX] = TPM_CAP_FLAG; | ||
| 659 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_VOL; | ||
| 660 | |||
| 661 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 662 | "attempting to determine the temporary state"); | ||
| 663 | if (rc) | ||
| 664 | return 0; | ||
| 665 | return sprintf(buf, "%d\n", data[TPM_GET_CAP_TEMP_INACTIVE_IDX]); | ||
| 666 | } | ||
| 667 | EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated); | ||
| 668 | |||
| 133 | static const u8 pcrread[] = { | 669 | static const u8 pcrread[] = { |
| 134 | 0, 193, /* TPM_TAG_RQU_COMMAND */ | 670 | 0, 193, /* TPM_TAG_RQU_COMMAND */ |
| 135 | 0, 0, 0, 14, /* length */ | 671 | 0, 0, 0, 14, /* length */ |
| @@ -140,8 +676,8 @@ static const u8 pcrread[] = { | |||
| 140 | ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr, | 676 | ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr, |
| 141 | char *buf) | 677 | char *buf) |
| 142 | { | 678 | { |
| 143 | u8 data[READ_PCR_RESULT_SIZE]; | 679 | u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(pcrread)), 30)]; |
| 144 | ssize_t len; | 680 | ssize_t rc; |
| 145 | int i, j, num_pcrs; | 681 | int i, j, num_pcrs; |
| 146 | __be32 index; | 682 | __be32 index; |
| 147 | char *str = buf; | 683 | char *str = buf; |
| @@ -150,29 +686,24 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr, | |||
| 150 | if (chip == NULL) | 686 | if (chip == NULL) |
| 151 | return -ENODEV; | 687 | return -ENODEV; |
| 152 | 688 | ||
| 153 | memcpy(data, cap_pcr, sizeof(cap_pcr)); | 689 | memcpy(data, tpm_cap, sizeof(tpm_cap)); |
| 154 | if ((len = tpm_transmit(chip, data, sizeof(data))) | 690 | data[TPM_CAP_IDX] = TPM_CAP_PROP; |
| 155 | < CAP_PCR_RESULT_SIZE) { | 691 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_PCR; |
| 156 | dev_dbg(chip->dev, "A TPM error (%d) occurred " | 692 | |
| 157 | "attempting to determine the number of PCRS\n", | 693 | rc = transmit_cmd(chip, data, sizeof(data), |
| 158 | be32_to_cpu(*((__be32 *) (data + 6)))); | 694 | "attempting to determine the number of PCRS"); |
| 695 | if (rc) | ||
| 159 | return 0; | 696 | return 0; |
| 160 | } | ||
| 161 | 697 | ||
| 162 | num_pcrs = be32_to_cpu(*((__be32 *) (data + 14))); | 698 | num_pcrs = be32_to_cpu(*((__be32 *) (data + 14))); |
| 163 | |||
| 164 | for (i = 0; i < num_pcrs; i++) { | 699 | for (i = 0; i < num_pcrs; i++) { |
| 165 | memcpy(data, pcrread, sizeof(pcrread)); | 700 | memcpy(data, pcrread, sizeof(pcrread)); |
| 166 | index = cpu_to_be32(i); | 701 | index = cpu_to_be32(i); |
| 167 | memcpy(data + 10, &index, 4); | 702 | memcpy(data + 10, &index, 4); |
| 168 | if ((len = tpm_transmit(chip, data, sizeof(data))) | 703 | rc = transmit_cmd(chip, data, sizeof(data), |
| 169 | < READ_PCR_RESULT_SIZE){ | 704 | "attempting to read a PCR"); |
| 170 | dev_dbg(chip->dev, "A TPM error (%d) occurred" | 705 | if (rc) |
| 171 | " attempting to read PCR %d of %d\n", | ||
| 172 | be32_to_cpu(*((__be32 *) (data + 6))), | ||
| 173 | i, num_pcrs); | ||
| 174 | goto out; | 706 | goto out; |
| 175 | } | ||
| 176 | str += sprintf(str, "PCR-%02d: ", i); | 707 | str += sprintf(str, "PCR-%02d: ", i); |
| 177 | for (j = 0; j < TPM_DIGEST_SIZE; j++) | 708 | for (j = 0; j < TPM_DIGEST_SIZE; j++) |
| 178 | str += sprintf(str, "%02X ", *(data + 10 + j)); | 709 | str += sprintf(str, "%02X ", *(data + 10 + j)); |
| @@ -194,7 +725,7 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, | |||
| 194 | char *buf) | 725 | char *buf) |
| 195 | { | 726 | { |
| 196 | u8 *data; | 727 | u8 *data; |
| 197 | ssize_t len; | 728 | ssize_t err; |
| 198 | int i, rc; | 729 | int i, rc; |
| 199 | char *str = buf; | 730 | char *str = buf; |
| 200 | 731 | ||
| @@ -208,14 +739,10 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, | |||
| 208 | 739 | ||
| 209 | memcpy(data, readpubek, sizeof(readpubek)); | 740 | memcpy(data, readpubek, sizeof(readpubek)); |
| 210 | 741 | ||
| 211 | if ((len = tpm_transmit(chip, data, READ_PUBEK_RESULT_SIZE)) < | 742 | err = transmit_cmd(chip, data, READ_PUBEK_RESULT_SIZE, |
| 212 | READ_PUBEK_RESULT_SIZE) { | 743 | "attempting to read the PUBEK"); |
| 213 | dev_dbg(chip->dev, "A TPM error (%d) occurred " | 744 | if (err) |
| 214 | "attempting to read the PUBEK\n", | ||
| 215 | be32_to_cpu(*((__be32 *) (data + 6)))); | ||
| 216 | rc = 0; | ||
| 217 | goto out; | 745 | goto out; |
| 218 | } | ||
| 219 | 746 | ||
| 220 | /* | 747 | /* |
| 221 | ignore header 10 bytes | 748 | ignore header 10 bytes |
| @@ -245,67 +772,110 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, | |||
| 245 | if ((i + 1) % 16 == 0) | 772 | if ((i + 1) % 16 == 0) |
| 246 | str += sprintf(str, "\n"); | 773 | str += sprintf(str, "\n"); |
| 247 | } | 774 | } |
| 248 | rc = str - buf; | ||
| 249 | out: | 775 | out: |
| 776 | rc = str - buf; | ||
| 250 | kfree(data); | 777 | kfree(data); |
| 251 | return rc; | 778 | return rc; |
| 252 | } | 779 | } |
| 253 | EXPORT_SYMBOL_GPL(tpm_show_pubek); | 780 | EXPORT_SYMBOL_GPL(tpm_show_pubek); |
| 254 | 781 | ||
| 255 | #define CAP_VER_RESULT_SIZE 18 | 782 | #define CAP_VERSION_1_1 6 |
| 783 | #define CAP_VERSION_1_2 0x1A | ||
| 784 | #define CAP_VERSION_IDX 13 | ||
| 256 | static const u8 cap_version[] = { | 785 | static const u8 cap_version[] = { |
| 257 | 0, 193, /* TPM_TAG_RQU_COMMAND */ | 786 | 0, 193, /* TPM_TAG_RQU_COMMAND */ |
| 258 | 0, 0, 0, 18, /* length */ | 787 | 0, 0, 0, 18, /* length */ |
| 259 | 0, 0, 0, 101, /* TPM_ORD_GetCapability */ | 788 | 0, 0, 0, 101, /* TPM_ORD_GetCapability */ |
| 260 | 0, 0, 0, 6, | 789 | 0, 0, 0, 0, |
| 261 | 0, 0, 0, 0 | 790 | 0, 0, 0, 0 |
| 262 | }; | 791 | }; |
| 263 | 792 | ||
| 264 | #define CAP_MANUFACTURER_RESULT_SIZE 18 | ||
| 265 | static const u8 cap_manufacturer[] = { | ||
| 266 | 0, 193, /* TPM_TAG_RQU_COMMAND */ | ||
| 267 | 0, 0, 0, 22, /* length */ | ||
| 268 | 0, 0, 0, 101, /* TPM_ORD_GetCapability */ | ||
| 269 | 0, 0, 0, 5, | ||
| 270 | 0, 0, 0, 4, | ||
| 271 | 0, 0, 1, 3 | ||
| 272 | }; | ||
| 273 | |||
| 274 | ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr, | 793 | ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr, |
| 275 | char *buf) | 794 | char *buf) |
| 276 | { | 795 | { |
| 277 | u8 data[sizeof(cap_manufacturer)]; | 796 | u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)]; |
| 278 | ssize_t len; | 797 | ssize_t rc; |
| 279 | char *str = buf; | 798 | char *str = buf; |
| 280 | 799 | ||
| 281 | struct tpm_chip *chip = dev_get_drvdata(dev); | 800 | struct tpm_chip *chip = dev_get_drvdata(dev); |
| 282 | if (chip == NULL) | 801 | if (chip == NULL) |
| 283 | return -ENODEV; | 802 | return -ENODEV; |
| 284 | 803 | ||
| 285 | memcpy(data, cap_manufacturer, sizeof(cap_manufacturer)); | 804 | memcpy(data, tpm_cap, sizeof(tpm_cap)); |
| 805 | data[TPM_CAP_IDX] = TPM_CAP_PROP; | ||
| 806 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_MANUFACTURER; | ||
| 286 | 807 | ||
| 287 | if ((len = tpm_transmit(chip, data, sizeof(data))) < | 808 | rc = transmit_cmd(chip, data, sizeof(data), |
| 288 | CAP_MANUFACTURER_RESULT_SIZE) | 809 | "attempting to determine the manufacturer"); |
| 289 | return len; | 810 | if (rc) |
| 811 | return 0; | ||
| 290 | 812 | ||
| 291 | str += sprintf(str, "Manufacturer: 0x%x\n", | 813 | str += sprintf(str, "Manufacturer: 0x%x\n", |
| 292 | be32_to_cpu(*((__be32 *) (data + 14)))); | 814 | be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX)))); |
| 293 | 815 | ||
| 294 | memcpy(data, cap_version, sizeof(cap_version)); | 816 | memcpy(data, cap_version, sizeof(cap_version)); |
| 817 | data[CAP_VERSION_IDX] = CAP_VERSION_1_1; | ||
| 818 | rc = transmit_cmd(chip, data, sizeof(data), | ||
| 819 | "attempting to determine the 1.1 version"); | ||
| 820 | if (rc) | ||
| 821 | goto out; | ||
| 295 | 822 | ||
| 296 | if ((len = tpm_transmit(chip, data, sizeof(data))) < | 823 | str += sprintf(str, |
| 297 | CAP_VER_RESULT_SIZE) | 824 | "TCG version: %d.%d\nFirmware version: %d.%d\n", |
| 298 | return len; | 825 | (int) data[14], (int) data[15], (int) data[16], |
| 299 | 826 | (int) data[17]); | |
| 300 | str += | ||
| 301 | sprintf(str, "TCG version: %d.%d\nFirmware version: %d.%d\n", | ||
| 302 | (int) data[14], (int) data[15], (int) data[16], | ||
| 303 | (int) data[17]); | ||
| 304 | 827 | ||
| 828 | out: | ||
| 305 | return str - buf; | 829 | return str - buf; |
| 306 | } | 830 | } |
| 307 | EXPORT_SYMBOL_GPL(tpm_show_caps); | 831 | EXPORT_SYMBOL_GPL(tpm_show_caps); |
| 308 | 832 | ||
| 833 | ssize_t tpm_show_caps_1_2(struct device * dev, | ||
| 834 | struct device_attribute * attr, char *buf) | ||
| 835 | { | ||
| 836 | u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)]; | ||
| 837 | ssize_t len; | ||
| 838 | char *str = buf; | ||
| 839 | |||
| 840 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 841 | if (chip == NULL) | ||
| 842 | return -ENODEV; | ||
| 843 | |||
| 844 | memcpy(data, tpm_cap, sizeof(tpm_cap)); | ||
| 845 | data[TPM_CAP_IDX] = TPM_CAP_PROP; | ||
| 846 | data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_MANUFACTURER; | ||
| 847 | |||
| 848 | if ((len = tpm_transmit(chip, data, sizeof(data))) <= | ||
| 849 | TPM_ERROR_SIZE) { | ||
| 850 | dev_dbg(chip->dev, "A TPM error (%d) occurred " | ||
| 851 | "attempting to determine the manufacturer\n", | ||
| 852 | be32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX)))); | ||
| 853 | return 0; | ||
| 854 | } | ||
| 855 | |||
| 856 | str += sprintf(str, "Manufacturer: 0x%x\n", | ||
| 857 | be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX)))); | ||
| 858 | |||
| 859 | memcpy(data, cap_version, sizeof(cap_version)); | ||
| 860 | data[CAP_VERSION_IDX] = CAP_VERSION_1_2; | ||
| 861 | |||
| 862 | if ((len = tpm_transmit(chip, data, sizeof(data))) <= | ||
| 863 | TPM_ERROR_SIZE) { | ||
| 864 | dev_err(chip->dev, "A TPM error (%d) occurred " | ||
| 865 | "attempting to determine the 1.2 version\n", | ||
| 866 | be32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX)))); | ||
| 867 | goto out; | ||
| 868 | } | ||
| 869 | str += sprintf(str, | ||
| 870 | "TCG version: %d.%d\nFirmware version: %d.%d\n", | ||
| 871 | (int) data[16], (int) data[17], (int) data[18], | ||
| 872 | (int) data[19]); | ||
| 873 | |||
| 874 | out: | ||
| 875 | return str - buf; | ||
| 876 | } | ||
| 877 | EXPORT_SYMBOL_GPL(tpm_show_caps_1_2); | ||
| 878 | |||
| 309 | ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr, | 879 | ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr, |
| 310 | const char *buf, size_t count) | 880 | const char *buf, size_t count) |
| 311 | { | 881 | { |
| @@ -313,7 +883,7 @@ ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr, | |||
| 313 | if (chip == NULL) | 883 | if (chip == NULL) |
| 314 | return 0; | 884 | return 0; |
| 315 | 885 | ||
| 316 | chip->vendor->cancel(chip); | 886 | chip->vendor.cancel(chip); |
| 317 | return count; | 887 | return count; |
| 318 | } | 888 | } |
| 319 | EXPORT_SYMBOL_GPL(tpm_store_cancel); | 889 | EXPORT_SYMBOL_GPL(tpm_store_cancel); |
| @@ -329,7 +899,7 @@ int tpm_open(struct inode *inode, struct file *file) | |||
| 329 | spin_lock(&driver_lock); | 899 | spin_lock(&driver_lock); |
| 330 | 900 | ||
| 331 | list_for_each_entry(pos, &tpm_chip_list, list) { | 901 | list_for_each_entry(pos, &tpm_chip_list, list) { |
| 332 | if (pos->vendor->miscdev.minor == minor) { | 902 | if (pos->vendor.miscdev.minor == minor) { |
| 333 | chip = pos; | 903 | chip = pos; |
| 334 | break; | 904 | break; |
| 335 | } | 905 | } |
| @@ -387,7 +957,7 @@ int tpm_release(struct inode *inode, struct file *file) | |||
| 387 | EXPORT_SYMBOL_GPL(tpm_release); | 957 | EXPORT_SYMBOL_GPL(tpm_release); |
| 388 | 958 | ||
| 389 | ssize_t tpm_write(struct file *file, const char __user *buf, | 959 | ssize_t tpm_write(struct file *file, const char __user *buf, |
| 390 | size_t size, loff_t * off) | 960 | size_t size, loff_t *off) |
| 391 | { | 961 | { |
| 392 | struct tpm_chip *chip = file->private_data; | 962 | struct tpm_chip *chip = file->private_data; |
| 393 | int in_size = size, out_size; | 963 | int in_size = size, out_size; |
| @@ -419,11 +989,10 @@ ssize_t tpm_write(struct file *file, const char __user *buf, | |||
| 419 | 989 | ||
| 420 | return in_size; | 990 | return in_size; |
| 421 | } | 991 | } |
| 422 | |||
| 423 | EXPORT_SYMBOL_GPL(tpm_write); | 992 | EXPORT_SYMBOL_GPL(tpm_write); |
| 424 | 993 | ||
| 425 | ssize_t tpm_read(struct file * file, char __user *buf, | 994 | ssize_t tpm_read(struct file *file, char __user *buf, |
| 426 | size_t size, loff_t * off) | 995 | size_t size, loff_t *off) |
| 427 | { | 996 | { |
| 428 | struct tpm_chip *chip = file->private_data; | 997 | struct tpm_chip *chip = file->private_data; |
| 429 | int ret_size; | 998 | int ret_size; |
| @@ -462,14 +1031,13 @@ void tpm_remove_hardware(struct device *dev) | |||
| 462 | spin_unlock(&driver_lock); | 1031 | spin_unlock(&driver_lock); |
| 463 | 1032 | ||
| 464 | dev_set_drvdata(dev, NULL); | 1033 | dev_set_drvdata(dev, NULL); |
| 465 | misc_deregister(&chip->vendor->miscdev); | 1034 | misc_deregister(&chip->vendor.miscdev); |
| 466 | kfree(chip->vendor->miscdev.name); | 1035 | kfree(chip->vendor.miscdev.name); |
| 467 | 1036 | ||
| 468 | sysfs_remove_group(&dev->kobj, chip->vendor->attr_group); | 1037 | sysfs_remove_group(&dev->kobj, chip->vendor.attr_group); |
| 469 | tpm_bios_log_teardown(chip->bios_dir); | 1038 | tpm_bios_log_teardown(chip->bios_dir); |
| 470 | 1039 | ||
| 471 | dev_mask[chip->dev_num / TPM_NUM_MASK_ENTRIES ] &= | 1040 | clear_bit(chip->dev_num, dev_mask); |
| 472 | ~(1 << (chip->dev_num % TPM_NUM_MASK_ENTRIES)); | ||
| 473 | 1041 | ||
| 474 | kfree(chip); | 1042 | kfree(chip); |
| 475 | 1043 | ||
| @@ -520,18 +1088,18 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume); | |||
| 520 | * upon errant exit from this function specific probe function should call | 1088 | * upon errant exit from this function specific probe function should call |
| 521 | * pci_disable_device | 1089 | * pci_disable_device |
| 522 | */ | 1090 | */ |
| 523 | int tpm_register_hardware(struct device *dev, struct tpm_vendor_specific *entry) | 1091 | struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vendor_specific |
| 1092 | *entry) | ||
| 524 | { | 1093 | { |
| 525 | #define DEVNAME_SIZE 7 | 1094 | #define DEVNAME_SIZE 7 |
| 526 | 1095 | ||
| 527 | char *devname; | 1096 | char *devname; |
| 528 | struct tpm_chip *chip; | 1097 | struct tpm_chip *chip; |
| 529 | int i, j; | ||
| 530 | 1098 | ||
| 531 | /* Driver specific per-device data */ | 1099 | /* Driver specific per-device data */ |
| 532 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | 1100 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 533 | if (chip == NULL) | 1101 | if (chip == NULL) |
| 534 | return -ENOMEM; | 1102 | return NULL; |
| 535 | 1103 | ||
| 536 | init_MUTEX(&chip->buffer_mutex); | 1104 | init_MUTEX(&chip->buffer_mutex); |
| 537 | init_MUTEX(&chip->tpm_mutex); | 1105 | init_MUTEX(&chip->tpm_mutex); |
| @@ -543,45 +1111,37 @@ int tpm_register_hardware(struct device *dev, struct tpm_vendor_specific *entry) | |||
| 543 | chip->user_read_timer.function = user_reader_timeout; | 1111 | chip->user_read_timer.function = user_reader_timeout; |
| 544 | chip->user_read_timer.data = (unsigned long) chip; | 1112 | chip->user_read_timer.data = (unsigned long) chip; |
| 545 | 1113 | ||
| 546 | chip->vendor = entry; | 1114 | memcpy(&chip->vendor, entry, sizeof(struct tpm_vendor_specific)); |
| 547 | |||
| 548 | chip->dev_num = -1; | ||
| 549 | 1115 | ||
| 550 | for (i = 0; i < TPM_NUM_MASK_ENTRIES; i++) | 1116 | chip->dev_num = find_first_zero_bit(dev_mask, TPM_NUM_DEVICES); |
| 551 | for (j = 0; j < 8 * sizeof(int); j++) | ||
| 552 | if ((dev_mask[i] & (1 << j)) == 0) { | ||
| 553 | chip->dev_num = | ||
| 554 | i * TPM_NUM_MASK_ENTRIES + j; | ||
| 555 | dev_mask[i] |= 1 << j; | ||
| 556 | goto dev_num_search_complete; | ||
| 557 | } | ||
| 558 | 1117 | ||
| 559 | dev_num_search_complete: | 1118 | if (chip->dev_num >= TPM_NUM_DEVICES) { |
| 560 | if (chip->dev_num < 0) { | ||
| 561 | dev_err(dev, "No available tpm device numbers\n"); | 1119 | dev_err(dev, "No available tpm device numbers\n"); |
| 562 | kfree(chip); | 1120 | kfree(chip); |
| 563 | return -ENODEV; | 1121 | return NULL; |
| 564 | } else if (chip->dev_num == 0) | 1122 | } else if (chip->dev_num == 0) |
| 565 | chip->vendor->miscdev.minor = TPM_MINOR; | 1123 | chip->vendor.miscdev.minor = TPM_MINOR; |
| 566 | else | 1124 | else |
| 567 | chip->vendor->miscdev.minor = MISC_DYNAMIC_MINOR; | 1125 | chip->vendor.miscdev.minor = MISC_DYNAMIC_MINOR; |
| 1126 | |||
| 1127 | set_bit(chip->dev_num, dev_mask); | ||
| 568 | 1128 | ||
| 569 | devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL); | 1129 | devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL); |
| 570 | scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num); | 1130 | scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num); |
| 571 | chip->vendor->miscdev.name = devname; | 1131 | chip->vendor.miscdev.name = devname; |
| 572 | 1132 | ||
| 573 | chip->vendor->miscdev.dev = dev; | 1133 | chip->vendor.miscdev.dev = dev; |
| 574 | chip->dev = get_device(dev); | 1134 | chip->dev = get_device(dev); |
| 575 | 1135 | ||
| 576 | if (misc_register(&chip->vendor->miscdev)) { | 1136 | if (misc_register(&chip->vendor.miscdev)) { |
| 577 | dev_err(chip->dev, | 1137 | dev_err(chip->dev, |
| 578 | "unable to misc_register %s, minor %d\n", | 1138 | "unable to misc_register %s, minor %d\n", |
| 579 | chip->vendor->miscdev.name, | 1139 | chip->vendor.miscdev.name, |
| 580 | chip->vendor->miscdev.minor); | 1140 | chip->vendor.miscdev.minor); |
| 581 | put_device(dev); | 1141 | put_device(dev); |
| 1142 | clear_bit(chip->dev_num, dev_mask); | ||
| 582 | kfree(chip); | 1143 | kfree(chip); |
| 583 | dev_mask[i] &= !(1 << j); | 1144 | return NULL; |
| 584 | return -ENODEV; | ||
| 585 | } | 1145 | } |
| 586 | 1146 | ||
| 587 | spin_lock(&driver_lock); | 1147 | spin_lock(&driver_lock); |
| @@ -592,11 +1152,11 @@ dev_num_search_complete: | |||
| 592 | 1152 | ||
| 593 | spin_unlock(&driver_lock); | 1153 | spin_unlock(&driver_lock); |
| 594 | 1154 | ||
| 595 | sysfs_create_group(&dev->kobj, chip->vendor->attr_group); | 1155 | sysfs_create_group(&dev->kobj, chip->vendor.attr_group); |
| 596 | 1156 | ||
| 597 | chip->bios_dir = tpm_bios_log_setup(devname); | 1157 | chip->bios_dir = tpm_bios_log_setup(devname); |
| 598 | 1158 | ||
| 599 | return 0; | 1159 | return chip; |
| 600 | } | 1160 | } |
| 601 | EXPORT_SYMBOL_GPL(tpm_register_hardware); | 1161 | EXPORT_SYMBOL_GPL(tpm_register_hardware); |
| 602 | 1162 | ||
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index dec0224b4478..54a4c804e25f 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h | |||
| @@ -42,18 +42,30 @@ extern ssize_t tpm_show_pcrs(struct device *, struct device_attribute *attr, | |||
| 42 | char *); | 42 | char *); |
| 43 | extern ssize_t tpm_show_caps(struct device *, struct device_attribute *attr, | 43 | extern ssize_t tpm_show_caps(struct device *, struct device_attribute *attr, |
| 44 | char *); | 44 | char *); |
| 45 | extern ssize_t tpm_show_caps_1_2(struct device *, struct device_attribute *attr, | ||
| 46 | char *); | ||
| 45 | extern ssize_t tpm_store_cancel(struct device *, struct device_attribute *attr, | 47 | extern ssize_t tpm_store_cancel(struct device *, struct device_attribute *attr, |
| 46 | const char *, size_t); | 48 | const char *, size_t); |
| 49 | extern ssize_t tpm_show_enabled(struct device *, struct device_attribute *attr, | ||
| 50 | char *); | ||
| 51 | extern ssize_t tpm_show_active(struct device *, struct device_attribute *attr, | ||
| 52 | char *); | ||
| 53 | extern ssize_t tpm_show_owned(struct device *, struct device_attribute *attr, | ||
| 54 | char *); | ||
| 55 | extern ssize_t tpm_show_temp_deactivated(struct device *, | ||
| 56 | struct device_attribute *attr, char *); | ||
| 47 | 57 | ||
| 48 | struct tpm_chip; | 58 | struct tpm_chip; |
| 49 | 59 | ||
| 50 | struct tpm_vendor_specific { | 60 | struct tpm_vendor_specific { |
| 51 | u8 req_complete_mask; | 61 | const u8 req_complete_mask; |
| 52 | u8 req_complete_val; | 62 | const u8 req_complete_val; |
| 53 | u8 req_canceled; | 63 | const u8 req_canceled; |
| 54 | void __iomem *iobase; /* ioremapped address */ | 64 | void __iomem *iobase; /* ioremapped address */ |
| 55 | unsigned long base; /* TPM base address */ | 65 | unsigned long base; /* TPM base address */ |
| 56 | 66 | ||
| 67 | int irq; | ||
| 68 | |||
| 57 | int region_size; | 69 | int region_size; |
| 58 | int have_region; | 70 | int have_region; |
| 59 | 71 | ||
| @@ -63,6 +75,13 @@ struct tpm_vendor_specific { | |||
| 63 | u8 (*status) (struct tpm_chip *); | 75 | u8 (*status) (struct tpm_chip *); |
| 64 | struct miscdevice miscdev; | 76 | struct miscdevice miscdev; |
| 65 | struct attribute_group *attr_group; | 77 | struct attribute_group *attr_group; |
| 78 | struct list_head list; | ||
| 79 | int locality; | ||
| 80 | unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */ | ||
| 81 | unsigned long duration[3]; /* jiffies */ | ||
| 82 | |||
| 83 | wait_queue_head_t read_queue; | ||
| 84 | wait_queue_head_t int_queue; | ||
| 66 | }; | 85 | }; |
| 67 | 86 | ||
| 68 | struct tpm_chip { | 87 | struct tpm_chip { |
| @@ -81,13 +100,15 @@ struct tpm_chip { | |||
| 81 | struct work_struct work; | 100 | struct work_struct work; |
| 82 | struct semaphore tpm_mutex; /* tpm is processing */ | 101 | struct semaphore tpm_mutex; /* tpm is processing */ |
| 83 | 102 | ||
| 84 | struct tpm_vendor_specific *vendor; | 103 | struct tpm_vendor_specific vendor; |
| 85 | 104 | ||
| 86 | struct dentry **bios_dir; | 105 | struct dentry **bios_dir; |
| 87 | 106 | ||
| 88 | struct list_head list; | 107 | struct list_head list; |
| 89 | }; | 108 | }; |
| 90 | 109 | ||
| 110 | #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) | ||
| 111 | |||
| 91 | static inline int tpm_read_index(int base, int index) | 112 | static inline int tpm_read_index(int base, int index) |
| 92 | { | 113 | { |
| 93 | outb(index, base); | 114 | outb(index, base); |
| @@ -100,8 +121,12 @@ static inline void tpm_write_index(int base, int index, int value) | |||
| 100 | outb(value & 0xFF, base+1); | 121 | outb(value & 0xFF, base+1); |
| 101 | } | 122 | } |
| 102 | 123 | ||
| 103 | extern int tpm_register_hardware(struct device *, | 124 | extern void tpm_get_timeouts(struct tpm_chip *); |
| 104 | struct tpm_vendor_specific *); | 125 | extern void tpm_gen_interrupt(struct tpm_chip *); |
| 126 | extern void tpm_continue_selftest(struct tpm_chip *); | ||
| 127 | extern unsigned long tpm_calc_ordinal_duration(struct tpm_chip *, u32); | ||
| 128 | extern struct tpm_chip* tpm_register_hardware(struct device *, | ||
| 129 | const struct tpm_vendor_specific *); | ||
| 105 | extern int tpm_open(struct inode *, struct file *); | 130 | extern int tpm_open(struct inode *, struct file *); |
| 106 | extern int tpm_release(struct inode *, struct file *); | 131 | extern int tpm_release(struct inode *, struct file *); |
| 107 | extern ssize_t tpm_write(struct file *, const char __user *, size_t, | 132 | extern ssize_t tpm_write(struct file *, const char __user *, size_t, |
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c index ff3654964fe3..58a258cec153 100644 --- a/drivers/char/tpm/tpm_atmel.c +++ b/drivers/char/tpm/tpm_atmel.c | |||
| @@ -47,12 +47,12 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) | |||
| 47 | return -EIO; | 47 | return -EIO; |
| 48 | 48 | ||
| 49 | for (i = 0; i < 6; i++) { | 49 | for (i = 0; i < 6; i++) { |
| 50 | status = ioread8(chip->vendor->iobase + 1); | 50 | status = ioread8(chip->vendor.iobase + 1); |
| 51 | if ((status & ATML_STATUS_DATA_AVAIL) == 0) { | 51 | if ((status & ATML_STATUS_DATA_AVAIL) == 0) { |
| 52 | dev_err(chip->dev, "error reading header\n"); | 52 | dev_err(chip->dev, "error reading header\n"); |
| 53 | return -EIO; | 53 | return -EIO; |
| 54 | } | 54 | } |
| 55 | *buf++ = ioread8(chip->vendor->iobase); | 55 | *buf++ = ioread8(chip->vendor.iobase); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | /* size of the data received */ | 58 | /* size of the data received */ |
| @@ -63,7 +63,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) | |||
| 63 | dev_err(chip->dev, | 63 | dev_err(chip->dev, |
| 64 | "Recv size(%d) less than available space\n", size); | 64 | "Recv size(%d) less than available space\n", size); |
| 65 | for (; i < size; i++) { /* clear the waiting data anyway */ | 65 | for (; i < size; i++) { /* clear the waiting data anyway */ |
| 66 | status = ioread8(chip->vendor->iobase + 1); | 66 | status = ioread8(chip->vendor.iobase + 1); |
| 67 | if ((status & ATML_STATUS_DATA_AVAIL) == 0) { | 67 | if ((status & ATML_STATUS_DATA_AVAIL) == 0) { |
| 68 | dev_err(chip->dev, "error reading data\n"); | 68 | dev_err(chip->dev, "error reading data\n"); |
| 69 | return -EIO; | 69 | return -EIO; |
| @@ -74,16 +74,16 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) | |||
| 74 | 74 | ||
| 75 | /* read all the data available */ | 75 | /* read all the data available */ |
| 76 | for (; i < size; i++) { | 76 | for (; i < size; i++) { |
| 77 | status = ioread8(chip->vendor->iobase + 1); | 77 | status = ioread8(chip->vendor.iobase + 1); |
| 78 | if ((status & ATML_STATUS_DATA_AVAIL) == 0) { | 78 | if ((status & ATML_STATUS_DATA_AVAIL) == 0) { |
| 79 | dev_err(chip->dev, "error reading data\n"); | 79 | dev_err(chip->dev, "error reading data\n"); |
| 80 | return -EIO; | 80 | return -EIO; |
| 81 | } | 81 | } |
| 82 | *buf++ = ioread8(chip->vendor->iobase); | 82 | *buf++ = ioread8(chip->vendor.iobase); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | /* make sure data available is gone */ | 85 | /* make sure data available is gone */ |
| 86 | status = ioread8(chip->vendor->iobase + 1); | 86 | status = ioread8(chip->vendor.iobase + 1); |
| 87 | 87 | ||
| 88 | if (status & ATML_STATUS_DATA_AVAIL) { | 88 | if (status & ATML_STATUS_DATA_AVAIL) { |
| 89 | dev_err(chip->dev, "data available is stuck\n"); | 89 | dev_err(chip->dev, "data available is stuck\n"); |
| @@ -100,7 +100,7 @@ static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count) | |||
| 100 | dev_dbg(chip->dev, "tpm_atml_send:\n"); | 100 | dev_dbg(chip->dev, "tpm_atml_send:\n"); |
| 101 | for (i = 0; i < count; i++) { | 101 | for (i = 0; i < count; i++) { |
| 102 | dev_dbg(chip->dev, "%d 0x%x(%d)\n", i, buf[i], buf[i]); | 102 | dev_dbg(chip->dev, "%d 0x%x(%d)\n", i, buf[i], buf[i]); |
| 103 | iowrite8(buf[i], chip->vendor->iobase); | 103 | iowrite8(buf[i], chip->vendor.iobase); |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | return count; | 106 | return count; |
| @@ -108,12 +108,12 @@ static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count) | |||
| 108 | 108 | ||
| 109 | static void tpm_atml_cancel(struct tpm_chip *chip) | 109 | static void tpm_atml_cancel(struct tpm_chip *chip) |
| 110 | { | 110 | { |
| 111 | iowrite8(ATML_STATUS_ABORT, chip->vendor->iobase + 1); | 111 | iowrite8(ATML_STATUS_ABORT, chip->vendor.iobase + 1); |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static u8 tpm_atml_status(struct tpm_chip *chip) | 114 | static u8 tpm_atml_status(struct tpm_chip *chip) |
| 115 | { | 115 | { |
| 116 | return ioread8(chip->vendor->iobase + 1); | 116 | return ioread8(chip->vendor.iobase + 1); |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | static struct file_operations atmel_ops = { | 119 | static struct file_operations atmel_ops = { |
| @@ -140,7 +140,7 @@ static struct attribute* atmel_attrs[] = { | |||
| 140 | 140 | ||
| 141 | static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs }; | 141 | static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs }; |
| 142 | 142 | ||
| 143 | static struct tpm_vendor_specific tpm_atmel = { | 143 | static const struct tpm_vendor_specific tpm_atmel = { |
| 144 | .recv = tpm_atml_recv, | 144 | .recv = tpm_atml_recv, |
| 145 | .send = tpm_atml_send, | 145 | .send = tpm_atml_send, |
| 146 | .cancel = tpm_atml_cancel, | 146 | .cancel = tpm_atml_cancel, |
| @@ -159,10 +159,10 @@ static void atml_plat_remove(void) | |||
| 159 | struct tpm_chip *chip = dev_get_drvdata(&pdev->dev); | 159 | struct tpm_chip *chip = dev_get_drvdata(&pdev->dev); |
| 160 | 160 | ||
| 161 | if (chip) { | 161 | if (chip) { |
| 162 | if (chip->vendor->have_region) | 162 | if (chip->vendor.have_region) |
| 163 | atmel_release_region(chip->vendor->base, | 163 | atmel_release_region(chip->vendor.base, |
| 164 | chip->vendor->region_size); | 164 | chip->vendor.region_size); |
| 165 | atmel_put_base_addr(chip->vendor); | 165 | atmel_put_base_addr(chip->vendor.iobase); |
| 166 | tpm_remove_hardware(chip->dev); | 166 | tpm_remove_hardware(chip->dev); |
| 167 | platform_device_unregister(pdev); | 167 | platform_device_unregister(pdev); |
| 168 | } | 168 | } |
| @@ -179,18 +179,22 @@ static struct device_driver atml_drv = { | |||
| 179 | static int __init init_atmel(void) | 179 | static int __init init_atmel(void) |
| 180 | { | 180 | { |
| 181 | int rc = 0; | 181 | int rc = 0; |
| 182 | void __iomem *iobase = NULL; | ||
| 183 | int have_region, region_size; | ||
| 184 | unsigned long base; | ||
| 185 | struct tpm_chip *chip; | ||
| 182 | 186 | ||
| 183 | driver_register(&atml_drv); | 187 | driver_register(&atml_drv); |
| 184 | 188 | ||
| 185 | if ((tpm_atmel.iobase = atmel_get_base_addr(&tpm_atmel)) == NULL) { | 189 | if ((iobase = atmel_get_base_addr(&base, ®ion_size)) == NULL) { |
| 186 | rc = -ENODEV; | 190 | rc = -ENODEV; |
| 187 | goto err_unreg_drv; | 191 | goto err_unreg_drv; |
| 188 | } | 192 | } |
| 189 | 193 | ||
| 190 | tpm_atmel.have_region = | 194 | have_region = |
| 191 | (atmel_request_region | 195 | (atmel_request_region |
| 192 | (tpm_atmel.base, tpm_atmel.region_size, | 196 | (tpm_atmel.base, region_size, "tpm_atmel0") == NULL) ? 0 : 1; |
| 193 | "tpm_atmel0") == NULL) ? 0 : 1; | 197 | |
| 194 | 198 | ||
| 195 | if (IS_ERR | 199 | if (IS_ERR |
| 196 | (pdev = | 200 | (pdev = |
| @@ -199,17 +203,25 @@ static int __init init_atmel(void) | |||
| 199 | goto err_rel_reg; | 203 | goto err_rel_reg; |
| 200 | } | 204 | } |
| 201 | 205 | ||
| 202 | if ((rc = tpm_register_hardware(&pdev->dev, &tpm_atmel)) < 0) | 206 | if (!(chip = tpm_register_hardware(&pdev->dev, &tpm_atmel))) { |
| 207 | rc = -ENODEV; | ||
| 203 | goto err_unreg_dev; | 208 | goto err_unreg_dev; |
| 209 | } | ||
| 210 | |||
| 211 | chip->vendor.iobase = iobase; | ||
| 212 | chip->vendor.base = base; | ||
| 213 | chip->vendor.have_region = have_region; | ||
| 214 | chip->vendor.region_size = region_size; | ||
| 215 | |||
| 204 | return 0; | 216 | return 0; |
| 205 | 217 | ||
| 206 | err_unreg_dev: | 218 | err_unreg_dev: |
| 207 | platform_device_unregister(pdev); | 219 | platform_device_unregister(pdev); |
| 208 | err_rel_reg: | 220 | err_rel_reg: |
| 209 | atmel_put_base_addr(&tpm_atmel); | 221 | atmel_put_base_addr(iobase); |
| 210 | if (tpm_atmel.have_region) | 222 | if (have_region) |
| 211 | atmel_release_region(tpm_atmel.base, | 223 | atmel_release_region(base, |
| 212 | tpm_atmel.region_size); | 224 | region_size); |
| 213 | err_unreg_drv: | 225 | err_unreg_drv: |
| 214 | driver_unregister(&atml_drv); | 226 | driver_unregister(&atml_drv); |
| 215 | return rc; | 227 | return rc; |
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h index d3478aaadd77..2e68eeb8a2cd 100644 --- a/drivers/char/tpm/tpm_atmel.h +++ b/drivers/char/tpm/tpm_atmel.h | |||
| @@ -28,13 +28,12 @@ | |||
| 28 | #define atmel_request_region request_mem_region | 28 | #define atmel_request_region request_mem_region |
| 29 | #define atmel_release_region release_mem_region | 29 | #define atmel_release_region release_mem_region |
| 30 | 30 | ||
| 31 | static inline void atmel_put_base_addr(struct tpm_vendor_specific | 31 | static inline void atmel_put_base_addr(void __iomem *iobase) |
| 32 | *vendor) | ||
| 33 | { | 32 | { |
| 34 | iounmap(vendor->iobase); | 33 | iounmap(iobase); |
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | static void __iomem * atmel_get_base_addr(struct tpm_vendor_specific *vendor) | 36 | static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) |
| 38 | { | 37 | { |
| 39 | struct device_node *dn; | 38 | struct device_node *dn; |
| 40 | unsigned long address, size; | 39 | unsigned long address, size; |
| @@ -71,9 +70,9 @@ static void __iomem * atmel_get_base_addr(struct tpm_vendor_specific *vendor) | |||
| 71 | else | 70 | else |
| 72 | size = reg[naddrc]; | 71 | size = reg[naddrc]; |
| 73 | 72 | ||
| 74 | vendor->base = address; | 73 | *base = address; |
| 75 | vendor->region_size = size; | 74 | *region_size = size; |
| 76 | return ioremap(vendor->base, vendor->region_size); | 75 | return ioremap(*base, *region_size); |
| 77 | } | 76 | } |
| 78 | #else | 77 | #else |
| 79 | #define atmel_getb(chip, offset) inb(chip->vendor->base + offset) | 78 | #define atmel_getb(chip, offset) inb(chip->vendor->base + offset) |
| @@ -106,14 +105,12 @@ static int atmel_verify_tpm11(void) | |||
| 106 | return 0; | 105 | return 0; |
| 107 | } | 106 | } |
| 108 | 107 | ||
| 109 | static inline void atmel_put_base_addr(struct tpm_vendor_specific | 108 | static inline void atmel_put_base_addr(void __iomem *iobase) |
| 110 | *vendor) | ||
| 111 | { | 109 | { |
| 112 | } | 110 | } |
| 113 | 111 | ||
| 114 | /* Determine where to talk to device */ | 112 | /* Determine where to talk to device */ |
| 115 | static void __iomem * atmel_get_base_addr(struct tpm_vendor_specific | 113 | static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) |
| 116 | *vendor) | ||
| 117 | { | 114 | { |
| 118 | int lo, hi; | 115 | int lo, hi; |
| 119 | 116 | ||
| @@ -123,9 +120,9 @@ static void __iomem * atmel_get_base_addr(struct tpm_vendor_specific | |||
| 123 | lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO); | 120 | lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO); |
| 124 | hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI); | 121 | hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI); |
| 125 | 122 | ||
| 126 | vendor->base = (hi << 8) | lo; | 123 | *base = (hi << 8) | lo; |
| 127 | vendor->region_size = 2; | 124 | *region_size = 2; |
| 128 | 125 | ||
| 129 | return ioport_map(vendor->base, vendor->region_size); | 126 | return ioport_map(*base, *region_size); |
| 130 | } | 127 | } |
| 131 | #endif | 128 | #endif |
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c index 537aa45d8c67..e45f0d3d12de 100644 --- a/drivers/char/tpm/tpm_bios.c +++ b/drivers/char/tpm/tpm_bios.c | |||
| @@ -29,6 +29,11 @@ | |||
| 29 | #define MAX_TEXT_EVENT 1000 /* Max event string length */ | 29 | #define MAX_TEXT_EVENT 1000 /* Max event string length */ |
| 30 | #define ACPI_TCPA_SIG "TCPA" /* 0x41504354 /'TCPA' */ | 30 | #define ACPI_TCPA_SIG "TCPA" /* 0x41504354 /'TCPA' */ |
| 31 | 31 | ||
| 32 | enum bios_platform_class { | ||
| 33 | BIOS_CLIENT = 0x00, | ||
| 34 | BIOS_SERVER = 0x01, | ||
| 35 | }; | ||
| 36 | |||
| 32 | struct tpm_bios_log { | 37 | struct tpm_bios_log { |
| 33 | void *bios_event_log; | 38 | void *bios_event_log; |
| 34 | void *bios_event_log_end; | 39 | void *bios_event_log_end; |
| @@ -36,9 +41,18 @@ struct tpm_bios_log { | |||
| 36 | 41 | ||
| 37 | struct acpi_tcpa { | 42 | struct acpi_tcpa { |
| 38 | struct acpi_table_header hdr; | 43 | struct acpi_table_header hdr; |
| 39 | u16 reserved; | 44 | u16 platform_class; |
| 40 | u32 log_max_len __attribute__ ((packed)); | 45 | union { |
| 41 | u32 log_start_addr __attribute__ ((packed)); | 46 | struct client_hdr { |
| 47 | u32 log_max_len __attribute__ ((packed)); | ||
| 48 | u64 log_start_addr __attribute__ ((packed)); | ||
| 49 | } client; | ||
| 50 | struct server_hdr { | ||
| 51 | u16 reserved; | ||
| 52 | u64 log_max_len __attribute__ ((packed)); | ||
| 53 | u64 log_start_addr __attribute__ ((packed)); | ||
| 54 | } server; | ||
| 55 | }; | ||
| 42 | }; | 56 | }; |
| 43 | 57 | ||
| 44 | struct tcpa_event { | 58 | struct tcpa_event { |
| @@ -120,6 +134,7 @@ static const char* tcpa_pc_event_id_strings[] = { | |||
| 120 | "S-CRTM Version", | 134 | "S-CRTM Version", |
| 121 | "S-CRTM Contents", | 135 | "S-CRTM Contents", |
| 122 | "S-CRTM POST Contents", | 136 | "S-CRTM POST Contents", |
| 137 | "POST Contents", | ||
| 123 | }; | 138 | }; |
| 124 | 139 | ||
| 125 | /* returns pointer to start of pos. entry of tcg log */ | 140 | /* returns pointer to start of pos. entry of tcg log */ |
| @@ -306,6 +321,7 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) | |||
| 306 | /* 5th: delimiter */ | 321 | /* 5th: delimiter */ |
| 307 | seq_putc(m, '\0'); | 322 | seq_putc(m, '\0'); |
| 308 | 323 | ||
| 324 | kfree(eventname); | ||
| 309 | return 0; | 325 | return 0; |
| 310 | } | 326 | } |
| 311 | 327 | ||
| @@ -353,6 +369,7 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v) | |||
| 353 | /* 4th: eventname <= max + \'0' delimiter */ | 369 | /* 4th: eventname <= max + \'0' delimiter */ |
| 354 | seq_printf(m, " %s\n", eventname); | 370 | seq_printf(m, " %s\n", eventname); |
| 355 | 371 | ||
| 372 | kfree(eventname); | ||
| 356 | return 0; | 373 | return 0; |
| 357 | } | 374 | } |
| 358 | 375 | ||
| @@ -376,6 +393,7 @@ static int read_log(struct tpm_bios_log *log) | |||
| 376 | struct acpi_tcpa *buff; | 393 | struct acpi_tcpa *buff; |
| 377 | acpi_status status; | 394 | acpi_status status; |
| 378 | struct acpi_table_header *virt; | 395 | struct acpi_table_header *virt; |
| 396 | u64 len, start; | ||
| 379 | 397 | ||
| 380 | if (log->bios_event_log != NULL) { | 398 | if (log->bios_event_log != NULL) { |
| 381 | printk(KERN_ERR | 399 | printk(KERN_ERR |
| @@ -396,27 +414,37 @@ static int read_log(struct tpm_bios_log *log) | |||
| 396 | return -EIO; | 414 | return -EIO; |
| 397 | } | 415 | } |
| 398 | 416 | ||
| 399 | if (buff->log_max_len == 0) { | 417 | switch(buff->platform_class) { |
| 418 | case BIOS_SERVER: | ||
| 419 | len = buff->server.log_max_len; | ||
| 420 | start = buff->server.log_start_addr; | ||
| 421 | break; | ||
| 422 | case BIOS_CLIENT: | ||
| 423 | default: | ||
| 424 | len = buff->client.log_max_len; | ||
| 425 | start = buff->client.log_start_addr; | ||
| 426 | break; | ||
| 427 | } | ||
| 428 | if (!len) { | ||
| 400 | printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__); | 429 | printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__); |
| 401 | return -EIO; | 430 | return -EIO; |
| 402 | } | 431 | } |
| 403 | 432 | ||
| 404 | /* malloc EventLog space */ | 433 | /* malloc EventLog space */ |
| 405 | log->bios_event_log = kmalloc(buff->log_max_len, GFP_KERNEL); | 434 | log->bios_event_log = kmalloc(len, GFP_KERNEL); |
| 406 | if (!log->bios_event_log) { | 435 | if (!log->bios_event_log) { |
| 407 | printk | 436 | printk("%s: ERROR - Not enough Memory for BIOS measurements\n", |
| 408 | ("%s: ERROR - Not enough Memory for BIOS measurements\n", | 437 | __func__); |
| 409 | __func__); | ||
| 410 | return -ENOMEM; | 438 | return -ENOMEM; |
| 411 | } | 439 | } |
| 412 | 440 | ||
| 413 | log->bios_event_log_end = log->bios_event_log + buff->log_max_len; | 441 | log->bios_event_log_end = log->bios_event_log + len; |
| 414 | 442 | ||
| 415 | acpi_os_map_memory(buff->log_start_addr, buff->log_max_len, (void *) &virt); | 443 | acpi_os_map_memory(start, len, (void *) &virt); |
| 416 | 444 | ||
| 417 | memcpy(log->bios_event_log, virt, buff->log_max_len); | 445 | memcpy(log->bios_event_log, virt, len); |
| 418 | 446 | ||
| 419 | acpi_os_unmap_memory(virt, buff->log_max_len); | 447 | acpi_os_unmap_memory(virt, len); |
| 420 | return 0; | 448 | return 0; |
| 421 | } | 449 | } |
| 422 | 450 | ||
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index 24095f6ee6da..adfff21beb21 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * License. | 15 | * License. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/init.h> | ||
| 18 | #include <linux/pnp.h> | 19 | #include <linux/pnp.h> |
| 19 | #include "tpm.h" | 20 | #include "tpm.h" |
| 20 | 21 | ||
| @@ -104,7 +105,7 @@ static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo) | |||
| 104 | 105 | ||
| 105 | if (clear_wrfifo) { | 106 | if (clear_wrfifo) { |
| 106 | for (i = 0; i < 4096; i++) { | 107 | for (i = 0; i < 4096; i++) { |
| 107 | status = inb(chip->vendor->base + WRFIFO); | 108 | status = inb(chip->vendor.base + WRFIFO); |
| 108 | if (status == 0xff) { | 109 | if (status == 0xff) { |
| 109 | if (check == 5) | 110 | if (check == 5) |
| 110 | break; | 111 | break; |
| @@ -124,8 +125,8 @@ static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo) | |||
| 124 | */ | 125 | */ |
| 125 | i = 0; | 126 | i = 0; |
| 126 | do { | 127 | do { |
| 127 | status = inb(chip->vendor->base + RDFIFO); | 128 | status = inb(chip->vendor.base + RDFIFO); |
| 128 | status = inb(chip->vendor->base + STAT); | 129 | status = inb(chip->vendor.base + STAT); |
| 129 | i++; | 130 | i++; |
| 130 | if (i == TPM_MAX_TRIES) | 131 | if (i == TPM_MAX_TRIES) |
| 131 | return -EIO; | 132 | return -EIO; |
| @@ -138,7 +139,7 @@ static int wait(struct tpm_chip *chip, int wait_for_bit) | |||
| 138 | int status; | 139 | int status; |
| 139 | int i; | 140 | int i; |
| 140 | for (i = 0; i < TPM_MAX_TRIES; i++) { | 141 | for (i = 0; i < TPM_MAX_TRIES; i++) { |
| 141 | status = inb(chip->vendor->base + STAT); | 142 | status = inb(chip->vendor.base + STAT); |
| 142 | /* check the status-register if wait_for_bit is set */ | 143 | /* check the status-register if wait_for_bit is set */ |
| 143 | if (status & 1 << wait_for_bit) | 144 | if (status & 1 << wait_for_bit) |
| 144 | break; | 145 | break; |
| @@ -157,7 +158,7 @@ static int wait(struct tpm_chip *chip, int wait_for_bit) | |||
| 157 | static void wait_and_send(struct tpm_chip *chip, u8 sendbyte) | 158 | static void wait_and_send(struct tpm_chip *chip, u8 sendbyte) |
| 158 | { | 159 | { |
| 159 | wait(chip, STAT_XFE); | 160 | wait(chip, STAT_XFE); |
| 160 | outb(sendbyte, chip->vendor->base + WRFIFO); | 161 | outb(sendbyte, chip->vendor.base + WRFIFO); |
| 161 | } | 162 | } |
| 162 | 163 | ||
| 163 | /* Note: WTX means Waiting-Time-Extension. Whenever the TPM needs more | 164 | /* Note: WTX means Waiting-Time-Extension. Whenever the TPM needs more |
| @@ -204,7 +205,7 @@ recv_begin: | |||
| 204 | ret = wait(chip, STAT_RDA); | 205 | ret = wait(chip, STAT_RDA); |
| 205 | if (ret) | 206 | if (ret) |
| 206 | return -EIO; | 207 | return -EIO; |
| 207 | buf[i] = inb(chip->vendor->base + RDFIFO); | 208 | buf[i] = inb(chip->vendor.base + RDFIFO); |
| 208 | } | 209 | } |
| 209 | 210 | ||
| 210 | if (buf[0] != TPM_VL_VER) { | 211 | if (buf[0] != TPM_VL_VER) { |
| @@ -219,7 +220,7 @@ recv_begin: | |||
| 219 | 220 | ||
| 220 | for (i = 0; i < size; i++) { | 221 | for (i = 0; i < size; i++) { |
| 221 | wait(chip, STAT_RDA); | 222 | wait(chip, STAT_RDA); |
| 222 | buf[i] = inb(chip->vendor->base + RDFIFO); | 223 | buf[i] = inb(chip->vendor.base + RDFIFO); |
| 223 | } | 224 | } |
| 224 | 225 | ||
| 225 | if ((size == 0x6D00) && (buf[1] == 0x80)) { | 226 | if ((size == 0x6D00) && (buf[1] == 0x80)) { |
| @@ -268,7 +269,7 @@ static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 268 | u8 count_high, count_low, count_4, count_3, count_2, count_1; | 269 | u8 count_high, count_low, count_4, count_3, count_2, count_1; |
| 269 | 270 | ||
| 270 | /* Disabling Reset, LP and IRQC */ | 271 | /* Disabling Reset, LP and IRQC */ |
| 271 | outb(RESET_LP_IRQC_DISABLE, chip->vendor->base + CMD); | 272 | outb(RESET_LP_IRQC_DISABLE, chip->vendor.base + CMD); |
| 272 | 273 | ||
| 273 | ret = empty_fifo(chip, 1); | 274 | ret = empty_fifo(chip, 1); |
| 274 | if (ret) { | 275 | if (ret) { |
| @@ -319,7 +320,7 @@ static void tpm_inf_cancel(struct tpm_chip *chip) | |||
| 319 | 320 | ||
| 320 | static u8 tpm_inf_status(struct tpm_chip *chip) | 321 | static u8 tpm_inf_status(struct tpm_chip *chip) |
| 321 | { | 322 | { |
| 322 | return inb(chip->vendor->base + STAT); | 323 | return inb(chip->vendor.base + STAT); |
| 323 | } | 324 | } |
| 324 | 325 | ||
| 325 | static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); | 326 | static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); |
| @@ -346,7 +347,7 @@ static struct file_operations inf_ops = { | |||
| 346 | .release = tpm_release, | 347 | .release = tpm_release, |
| 347 | }; | 348 | }; |
| 348 | 349 | ||
| 349 | static struct tpm_vendor_specific tpm_inf = { | 350 | static const struct tpm_vendor_specific tpm_inf = { |
| 350 | .recv = tpm_inf_recv, | 351 | .recv = tpm_inf_recv, |
| 351 | .send = tpm_inf_send, | 352 | .send = tpm_inf_send, |
| 352 | .cancel = tpm_inf_cancel, | 353 | .cancel = tpm_inf_cancel, |
| @@ -375,6 +376,7 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 375 | int version[2]; | 376 | int version[2]; |
| 376 | int productid[2]; | 377 | int productid[2]; |
| 377 | char chipname[20]; | 378 | char chipname[20]; |
| 379 | struct tpm_chip *chip; | ||
| 378 | 380 | ||
| 379 | /* read IO-ports through PnP */ | 381 | /* read IO-ports through PnP */ |
| 380 | if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) && | 382 | if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) && |
| @@ -395,14 +397,13 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 395 | goto err_last; | 397 | goto err_last; |
| 396 | } | 398 | } |
| 397 | /* publish my base address and request region */ | 399 | /* publish my base address and request region */ |
| 398 | tpm_inf.base = TPM_INF_BASE; | ||
| 399 | if (request_region | 400 | if (request_region |
| 400 | (tpm_inf.base, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) { | 401 | (TPM_INF_BASE, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) { |
| 401 | rc = -EINVAL; | 402 | rc = -EINVAL; |
| 402 | goto err_last; | 403 | goto err_last; |
| 403 | } | 404 | } |
| 404 | if (request_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN, | 405 | if (request_region |
| 405 | "tpm_infineon0") == NULL) { | 406 | (TPM_INF_ADDR, TPM_INF_ADDR_LEN, "tpm_infineon0") == NULL) { |
| 406 | rc = -EINVAL; | 407 | rc = -EINVAL; |
| 407 | goto err_last; | 408 | goto err_last; |
| 408 | } | 409 | } |
| @@ -442,9 +443,9 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 442 | 443 | ||
| 443 | /* configure TPM with IO-ports */ | 444 | /* configure TPM with IO-ports */ |
| 444 | outb(IOLIMH, TPM_INF_ADDR); | 445 | outb(IOLIMH, TPM_INF_ADDR); |
| 445 | outb(((tpm_inf.base >> 8) & 0xff), TPM_INF_DATA); | 446 | outb(((TPM_INF_BASE >> 8) & 0xff), TPM_INF_DATA); |
| 446 | outb(IOLIML, TPM_INF_ADDR); | 447 | outb(IOLIML, TPM_INF_ADDR); |
| 447 | outb((tpm_inf.base & 0xff), TPM_INF_DATA); | 448 | outb((TPM_INF_BASE & 0xff), TPM_INF_DATA); |
| 448 | 449 | ||
| 449 | /* control if IO-ports are set correctly */ | 450 | /* control if IO-ports are set correctly */ |
| 450 | outb(IOLIMH, TPM_INF_ADDR); | 451 | outb(IOLIMH, TPM_INF_ADDR); |
| @@ -452,10 +453,10 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 452 | outb(IOLIML, TPM_INF_ADDR); | 453 | outb(IOLIML, TPM_INF_ADDR); |
| 453 | iol = inb(TPM_INF_DATA); | 454 | iol = inb(TPM_INF_DATA); |
| 454 | 455 | ||
| 455 | if ((ioh << 8 | iol) != tpm_inf.base) { | 456 | if ((ioh << 8 | iol) != TPM_INF_BASE) { |
| 456 | dev_err(&dev->dev, | 457 | dev_err(&dev->dev, |
| 457 | "Could not set IO-ports to 0x%lx\n", | 458 | "Could not set IO-ports to 0x%x\n", |
| 458 | tpm_inf.base); | 459 | TPM_INF_BASE); |
| 459 | rc = -EIO; | 460 | rc = -EIO; |
| 460 | goto err_release_region; | 461 | goto err_release_region; |
| 461 | } | 462 | } |
| @@ -466,15 +467,15 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 466 | outb(DISABLE_REGISTER_PAIR, TPM_INF_ADDR); | 467 | outb(DISABLE_REGISTER_PAIR, TPM_INF_ADDR); |
| 467 | 468 | ||
| 468 | /* disable RESET, LP and IRQC */ | 469 | /* disable RESET, LP and IRQC */ |
| 469 | outb(RESET_LP_IRQC_DISABLE, tpm_inf.base + CMD); | 470 | outb(RESET_LP_IRQC_DISABLE, TPM_INF_BASE + CMD); |
| 470 | 471 | ||
| 471 | /* Finally, we're done, print some infos */ | 472 | /* Finally, we're done, print some infos */ |
| 472 | dev_info(&dev->dev, "TPM found: " | 473 | dev_info(&dev->dev, "TPM found: " |
| 473 | "config base 0x%x, " | 474 | "config base 0x%x, " |
| 474 | "io base 0x%x, " | 475 | "io base 0x%x, " |
| 475 | "chip version %02x%02x, " | 476 | "chip version 0x%02x%02x, " |
| 476 | "vendor id %x%x (Infineon), " | 477 | "vendor id 0x%x%x (Infineon), " |
| 477 | "product id %02x%02x" | 478 | "product id 0x%02x%02x" |
| 478 | "%s\n", | 479 | "%s\n", |
| 479 | TPM_INF_ADDR, | 480 | TPM_INF_ADDR, |
| 480 | TPM_INF_BASE, | 481 | TPM_INF_BASE, |
| @@ -482,11 +483,10 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 482 | vendorid[0], vendorid[1], | 483 | vendorid[0], vendorid[1], |
| 483 | productid[0], productid[1], chipname); | 484 | productid[0], productid[1], chipname); |
| 484 | 485 | ||
| 485 | rc = tpm_register_hardware(&dev->dev, &tpm_inf); | 486 | if (!(chip = tpm_register_hardware(&dev->dev, &tpm_inf))) { |
| 486 | if (rc < 0) { | ||
| 487 | rc = -ENODEV; | ||
| 488 | goto err_release_region; | 487 | goto err_release_region; |
| 489 | } | 488 | } |
| 489 | chip->vendor.base = TPM_INF_BASE; | ||
| 490 | return 0; | 490 | return 0; |
| 491 | } else { | 491 | } else { |
| 492 | rc = -ENODEV; | 492 | rc = -ENODEV; |
| @@ -494,7 +494,7 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
| 494 | } | 494 | } |
| 495 | 495 | ||
| 496 | err_release_region: | 496 | err_release_region: |
| 497 | release_region(tpm_inf.base, TPM_INF_PORT_LEN); | 497 | release_region(TPM_INF_BASE, TPM_INF_PORT_LEN); |
| 498 | release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN); | 498 | release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN); |
| 499 | 499 | ||
| 500 | err_last: | 500 | err_last: |
| @@ -506,7 +506,8 @@ static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev) | |||
| 506 | struct tpm_chip *chip = pnp_get_drvdata(dev); | 506 | struct tpm_chip *chip = pnp_get_drvdata(dev); |
| 507 | 507 | ||
| 508 | if (chip) { | 508 | if (chip) { |
| 509 | release_region(chip->vendor->base, TPM_INF_PORT_LEN); | 509 | release_region(TPM_INF_BASE, TPM_INF_PORT_LEN); |
| 510 | release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN); | ||
| 510 | tpm_remove_hardware(chip->dev); | 511 | tpm_remove_hardware(chip->dev); |
| 511 | } | 512 | } |
| 512 | } | 513 | } |
| @@ -520,7 +521,7 @@ static struct pnp_driver tpm_inf_pnp = { | |||
| 520 | }, | 521 | }, |
| 521 | .id_table = tpm_pnp_tbl, | 522 | .id_table = tpm_pnp_tbl, |
| 522 | .probe = tpm_inf_pnp_probe, | 523 | .probe = tpm_inf_pnp_probe, |
| 523 | .remove = tpm_inf_pnp_remove, | 524 | .remove = __devexit_p(tpm_inf_pnp_remove), |
| 524 | }; | 525 | }; |
| 525 | 526 | ||
| 526 | static int __init init_inf(void) | 527 | static int __init init_inf(void) |
| @@ -538,5 +539,5 @@ module_exit(cleanup_inf); | |||
| 538 | 539 | ||
| 539 | MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); | 540 | MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); |
| 540 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); | 541 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); |
| 541 | MODULE_VERSION("1.7"); | 542 | MODULE_VERSION("1.8"); |
| 542 | MODULE_LICENSE("GPL"); | 543 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c index 680a8e331887..4c8bc06c7d95 100644 --- a/drivers/char/tpm/tpm_nsc.c +++ b/drivers/char/tpm/tpm_nsc.c | |||
| @@ -71,7 +71,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, u8 val, u8 * data) | |||
| 71 | unsigned long stop; | 71 | unsigned long stop; |
| 72 | 72 | ||
| 73 | /* status immediately available check */ | 73 | /* status immediately available check */ |
| 74 | *data = inb(chip->vendor->base + NSC_STATUS); | 74 | *data = inb(chip->vendor.base + NSC_STATUS); |
| 75 | if ((*data & mask) == val) | 75 | if ((*data & mask) == val) |
| 76 | return 0; | 76 | return 0; |
| 77 | 77 | ||
| @@ -79,7 +79,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, u8 val, u8 * data) | |||
| 79 | stop = jiffies + 10 * HZ; | 79 | stop = jiffies + 10 * HZ; |
| 80 | do { | 80 | do { |
| 81 | msleep(TPM_TIMEOUT); | 81 | msleep(TPM_TIMEOUT); |
| 82 | *data = inb(chip->vendor->base + 1); | 82 | *data = inb(chip->vendor.base + 1); |
| 83 | if ((*data & mask) == val) | 83 | if ((*data & mask) == val) |
| 84 | return 0; | 84 | return 0; |
| 85 | } | 85 | } |
| @@ -94,9 +94,9 @@ static int nsc_wait_for_ready(struct tpm_chip *chip) | |||
| 94 | unsigned long stop; | 94 | unsigned long stop; |
| 95 | 95 | ||
| 96 | /* status immediately available check */ | 96 | /* status immediately available check */ |
| 97 | status = inb(chip->vendor->base + NSC_STATUS); | 97 | status = inb(chip->vendor.base + NSC_STATUS); |
| 98 | if (status & NSC_STATUS_OBF) | 98 | if (status & NSC_STATUS_OBF) |
| 99 | status = inb(chip->vendor->base + NSC_DATA); | 99 | status = inb(chip->vendor.base + NSC_DATA); |
| 100 | if (status & NSC_STATUS_RDY) | 100 | if (status & NSC_STATUS_RDY) |
| 101 | return 0; | 101 | return 0; |
| 102 | 102 | ||
| @@ -104,9 +104,9 @@ static int nsc_wait_for_ready(struct tpm_chip *chip) | |||
| 104 | stop = jiffies + 100; | 104 | stop = jiffies + 100; |
| 105 | do { | 105 | do { |
| 106 | msleep(TPM_TIMEOUT); | 106 | msleep(TPM_TIMEOUT); |
| 107 | status = inb(chip->vendor->base + NSC_STATUS); | 107 | status = inb(chip->vendor.base + NSC_STATUS); |
| 108 | if (status & NSC_STATUS_OBF) | 108 | if (status & NSC_STATUS_OBF) |
| 109 | status = inb(chip->vendor->base + NSC_DATA); | 109 | status = inb(chip->vendor.base + NSC_DATA); |
| 110 | if (status & NSC_STATUS_RDY) | 110 | if (status & NSC_STATUS_RDY) |
| 111 | return 0; | 111 | return 0; |
| 112 | } | 112 | } |
| @@ -132,7 +132,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 132 | return -EIO; | 132 | return -EIO; |
| 133 | } | 133 | } |
| 134 | if ((data = | 134 | if ((data = |
| 135 | inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_NORMAL) { | 135 | inb(chip->vendor.base + NSC_DATA)) != NSC_COMMAND_NORMAL) { |
| 136 | dev_err(chip->dev, "not in normal mode (0x%x)\n", | 136 | dev_err(chip->dev, "not in normal mode (0x%x)\n", |
| 137 | data); | 137 | data); |
| 138 | return -EIO; | 138 | return -EIO; |
| @@ -148,7 +148,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 148 | } | 148 | } |
| 149 | if (data & NSC_STATUS_F0) | 149 | if (data & NSC_STATUS_F0) |
| 150 | break; | 150 | break; |
| 151 | *p = inb(chip->vendor->base + NSC_DATA); | 151 | *p = inb(chip->vendor.base + NSC_DATA); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | if ((data & NSC_STATUS_F0) == 0 && | 154 | if ((data & NSC_STATUS_F0) == 0 && |
| @@ -156,7 +156,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 156 | dev_err(chip->dev, "F0 not set\n"); | 156 | dev_err(chip->dev, "F0 not set\n"); |
| 157 | return -EIO; | 157 | return -EIO; |
| 158 | } | 158 | } |
| 159 | if ((data = inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_EOC) { | 159 | if ((data = inb(chip->vendor.base + NSC_DATA)) != NSC_COMMAND_EOC) { |
| 160 | dev_err(chip->dev, | 160 | dev_err(chip->dev, |
| 161 | "expected end of command(0x%x)\n", data); | 161 | "expected end of command(0x%x)\n", data); |
| 162 | return -EIO; | 162 | return -EIO; |
| @@ -182,7 +182,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 182 | * fix it. Not sure why this is needed, we followed the flow | 182 | * fix it. Not sure why this is needed, we followed the flow |
| 183 | * chart in the manual to the letter. | 183 | * chart in the manual to the letter. |
| 184 | */ | 184 | */ |
| 185 | outb(NSC_COMMAND_CANCEL, chip->vendor->base + NSC_COMMAND); | 185 | outb(NSC_COMMAND_CANCEL, chip->vendor.base + NSC_COMMAND); |
| 186 | 186 | ||
| 187 | if (nsc_wait_for_ready(chip) != 0) | 187 | if (nsc_wait_for_ready(chip) != 0) |
| 188 | return -EIO; | 188 | return -EIO; |
| @@ -192,7 +192,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 192 | return -EIO; | 192 | return -EIO; |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | outb(NSC_COMMAND_NORMAL, chip->vendor->base + NSC_COMMAND); | 195 | outb(NSC_COMMAND_NORMAL, chip->vendor.base + NSC_COMMAND); |
| 196 | if (wait_for_stat(chip, NSC_STATUS_IBR, NSC_STATUS_IBR, &data) < 0) { | 196 | if (wait_for_stat(chip, NSC_STATUS_IBR, NSC_STATUS_IBR, &data) < 0) { |
| 197 | dev_err(chip->dev, "IBR timeout\n"); | 197 | dev_err(chip->dev, "IBR timeout\n"); |
| 198 | return -EIO; | 198 | return -EIO; |
| @@ -204,26 +204,26 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count) | |||
| 204 | "IBF timeout (while writing data)\n"); | 204 | "IBF timeout (while writing data)\n"); |
| 205 | return -EIO; | 205 | return -EIO; |
| 206 | } | 206 | } |
| 207 | outb(buf[i], chip->vendor->base + NSC_DATA); | 207 | outb(buf[i], chip->vendor.base + NSC_DATA); |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) { | 210 | if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) { |
| 211 | dev_err(chip->dev, "IBF timeout\n"); | 211 | dev_err(chip->dev, "IBF timeout\n"); |
| 212 | return -EIO; | 212 | return -EIO; |
| 213 | } | 213 | } |
| 214 | outb(NSC_COMMAND_EOC, chip->vendor->base + NSC_COMMAND); | 214 | outb(NSC_COMMAND_EOC, chip->vendor.base + NSC_COMMAND); |
| 215 | 215 | ||
| 216 | return count; | 216 | return count; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | static void tpm_nsc_cancel(struct tpm_chip *chip) | 219 | static void tpm_nsc_cancel(struct tpm_chip *chip) |
| 220 | { | 220 | { |
| 221 | outb(NSC_COMMAND_CANCEL, chip->vendor->base + NSC_COMMAND); | 221 | outb(NSC_COMMAND_CANCEL, chip->vendor.base + NSC_COMMAND); |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | static u8 tpm_nsc_status(struct tpm_chip *chip) | 224 | static u8 tpm_nsc_status(struct tpm_chip *chip) |
| 225 | { | 225 | { |
| 226 | return inb(chip->vendor->base + NSC_STATUS); | 226 | return inb(chip->vendor.base + NSC_STATUS); |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | static struct file_operations nsc_ops = { | 229 | static struct file_operations nsc_ops = { |
| @@ -250,7 +250,7 @@ static struct attribute * nsc_attrs[] = { | |||
| 250 | 250 | ||
| 251 | static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; | 251 | static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; |
| 252 | 252 | ||
| 253 | static struct tpm_vendor_specific tpm_nsc = { | 253 | static const struct tpm_vendor_specific tpm_nsc = { |
| 254 | .recv = tpm_nsc_recv, | 254 | .recv = tpm_nsc_recv, |
| 255 | .send = tpm_nsc_send, | 255 | .send = tpm_nsc_send, |
| 256 | .cancel = tpm_nsc_cancel, | 256 | .cancel = tpm_nsc_cancel, |
| @@ -268,7 +268,7 @@ static void __devexit tpm_nsc_remove(struct device *dev) | |||
| 268 | { | 268 | { |
| 269 | struct tpm_chip *chip = dev_get_drvdata(dev); | 269 | struct tpm_chip *chip = dev_get_drvdata(dev); |
| 270 | if ( chip ) { | 270 | if ( chip ) { |
| 271 | release_region(chip->vendor->base, 2); | 271 | release_region(chip->vendor.base, 2); |
| 272 | tpm_remove_hardware(chip->dev); | 272 | tpm_remove_hardware(chip->dev); |
| 273 | } | 273 | } |
| 274 | } | 274 | } |
| @@ -286,7 +286,8 @@ static int __init init_nsc(void) | |||
| 286 | int rc = 0; | 286 | int rc = 0; |
| 287 | int lo, hi; | 287 | int lo, hi; |
| 288 | int nscAddrBase = TPM_ADDR; | 288 | int nscAddrBase = TPM_ADDR; |
| 289 | 289 | struct tpm_chip *chip; | |
| 290 | unsigned long base; | ||
| 290 | 291 | ||
| 291 | /* verify that it is a National part (SID) */ | 292 | /* verify that it is a National part (SID) */ |
| 292 | if (tpm_read_index(TPM_ADDR, NSC_SID_INDEX) != 0xEF) { | 293 | if (tpm_read_index(TPM_ADDR, NSC_SID_INDEX) != 0xEF) { |
| @@ -300,7 +301,7 @@ static int __init init_nsc(void) | |||
| 300 | 301 | ||
| 301 | hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI); | 302 | hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI); |
| 302 | lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO); | 303 | lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO); |
| 303 | tpm_nsc.base = (hi<<8) | lo; | 304 | base = (hi<<8) | lo; |
| 304 | 305 | ||
| 305 | /* enable the DPM module */ | 306 | /* enable the DPM module */ |
| 306 | tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01); | 307 | tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01); |
| @@ -320,13 +321,15 @@ static int __init init_nsc(void) | |||
| 320 | if ((rc = platform_device_register(pdev)) < 0) | 321 | if ((rc = platform_device_register(pdev)) < 0) |
| 321 | goto err_free_dev; | 322 | goto err_free_dev; |
| 322 | 323 | ||
| 323 | if (request_region(tpm_nsc.base, 2, "tpm_nsc0") == NULL ) { | 324 | if (request_region(base, 2, "tpm_nsc0") == NULL ) { |
| 324 | rc = -EBUSY; | 325 | rc = -EBUSY; |
| 325 | goto err_unreg_dev; | 326 | goto err_unreg_dev; |
| 326 | } | 327 | } |
| 327 | 328 | ||
| 328 | if ((rc = tpm_register_hardware(&pdev->dev, &tpm_nsc)) < 0) | 329 | if (!(chip = tpm_register_hardware(&pdev->dev, &tpm_nsc))) { |
| 330 | rc = -ENODEV; | ||
| 329 | goto err_rel_reg; | 331 | goto err_rel_reg; |
| 332 | } | ||
| 330 | 333 | ||
| 331 | dev_dbg(&pdev->dev, "NSC TPM detected\n"); | 334 | dev_dbg(&pdev->dev, "NSC TPM detected\n"); |
| 332 | dev_dbg(&pdev->dev, | 335 | dev_dbg(&pdev->dev, |
| @@ -361,10 +364,12 @@ static int __init init_nsc(void) | |||
| 361 | "NSC TPM revision %d\n", | 364 | "NSC TPM revision %d\n", |
| 362 | tpm_read_index(nscAddrBase, 0x27) & 0x1F); | 365 | tpm_read_index(nscAddrBase, 0x27) & 0x1F); |
| 363 | 366 | ||
| 367 | chip->vendor.base = base; | ||
| 368 | |||
| 364 | return 0; | 369 | return 0; |
| 365 | 370 | ||
| 366 | err_rel_reg: | 371 | err_rel_reg: |
| 367 | release_region(tpm_nsc.base, 2); | 372 | release_region(base, 2); |
| 368 | err_unreg_dev: | 373 | err_unreg_dev: |
| 369 | platform_device_unregister(pdev); | 374 | platform_device_unregister(pdev); |
| 370 | err_free_dev: | 375 | err_free_dev: |
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c new file mode 100644 index 000000000000..b9cae9a238bb --- /dev/null +++ b/drivers/char/tpm/tpm_tis.c | |||
| @@ -0,0 +1,669 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005, 2006 IBM Corporation | ||
| 3 | * | ||
| 4 | * Authors: | ||
| 5 | * Leendert van Doorn <leendert@watson.ibm.com> | ||
| 6 | * Kylene Hall <kjhall@us.ibm.com> | ||
| 7 | * | ||
| 8 | * Device driver for TCG/TCPA TPM (trusted platform module). | ||
| 9 | * Specifications at www.trustedcomputinggroup.org | ||
| 10 | * | ||
| 11 | * This device driver implements the TPM interface as defined in | ||
| 12 | * the TCG TPM Interface Spec version 1.2, revision 1.0. | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or | ||
| 15 | * modify it under the terms of the GNU General Public License as | ||
| 16 | * published by the Free Software Foundation, version 2 of the | ||
| 17 | * License. | ||
| 18 | */ | ||
| 19 | #include <linux/init.h> | ||
| 20 | #include <linux/module.h> | ||
| 21 | #include <linux/moduleparam.h> | ||
| 22 | #include <linux/pnp.h> | ||
| 23 | #include <linux/interrupt.h> | ||
| 24 | #include <linux/wait.h> | ||
| 25 | #include "tpm.h" | ||
| 26 | |||
| 27 | #define TPM_HEADER_SIZE 10 | ||
| 28 | |||
| 29 | enum tis_access { | ||
| 30 | TPM_ACCESS_VALID = 0x80, | ||
| 31 | TPM_ACCESS_ACTIVE_LOCALITY = 0x20, | ||
| 32 | TPM_ACCESS_REQUEST_PENDING = 0x04, | ||
| 33 | TPM_ACCESS_REQUEST_USE = 0x02, | ||
| 34 | }; | ||
| 35 | |||
| 36 | enum tis_status { | ||
| 37 | TPM_STS_VALID = 0x80, | ||
| 38 | TPM_STS_COMMAND_READY = 0x40, | ||
| 39 | TPM_STS_GO = 0x20, | ||
| 40 | TPM_STS_DATA_AVAIL = 0x10, | ||
| 41 | TPM_STS_DATA_EXPECT = 0x08, | ||
| 42 | }; | ||
| 43 | |||
| 44 | enum tis_int_flags { | ||
| 45 | TPM_GLOBAL_INT_ENABLE = 0x80000000, | ||
| 46 | TPM_INTF_BURST_COUNT_STATIC = 0x100, | ||
| 47 | TPM_INTF_CMD_READY_INT = 0x080, | ||
| 48 | TPM_INTF_INT_EDGE_FALLING = 0x040, | ||
| 49 | TPM_INTF_INT_EDGE_RISING = 0x020, | ||
| 50 | TPM_INTF_INT_LEVEL_LOW = 0x010, | ||
| 51 | TPM_INTF_INT_LEVEL_HIGH = 0x008, | ||
| 52 | TPM_INTF_LOCALITY_CHANGE_INT = 0x004, | ||
| 53 | TPM_INTF_STS_VALID_INT = 0x002, | ||
| 54 | TPM_INTF_DATA_AVAIL_INT = 0x001, | ||
| 55 | }; | ||
| 56 | |||
| 57 | enum tis_defaults { | ||
| 58 | TIS_MEM_BASE = 0xFED4000, | ||
| 59 | TIS_MEM_LEN = 0x5000, | ||
| 60 | TIS_SHORT_TIMEOUT = 750, /* ms */ | ||
| 61 | TIS_LONG_TIMEOUT = 2000, /* 2 sec */ | ||
| 62 | }; | ||
| 63 | |||
| 64 | #define TPM_ACCESS(l) (0x0000 | ((l) << 12)) | ||
| 65 | #define TPM_INT_ENABLE(l) (0x0008 | ((l) << 12)) | ||
| 66 | #define TPM_INT_VECTOR(l) (0x000C | ((l) << 12)) | ||
| 67 | #define TPM_INT_STATUS(l) (0x0010 | ((l) << 12)) | ||
| 68 | #define TPM_INTF_CAPS(l) (0x0014 | ((l) << 12)) | ||
| 69 | #define TPM_STS(l) (0x0018 | ((l) << 12)) | ||
| 70 | #define TPM_DATA_FIFO(l) (0x0024 | ((l) << 12)) | ||
| 71 | |||
| 72 | #define TPM_DID_VID(l) (0x0F00 | ((l) << 12)) | ||
| 73 | #define TPM_RID(l) (0x0F04 | ((l) << 12)) | ||
| 74 | |||
| 75 | static LIST_HEAD(tis_chips); | ||
| 76 | static DEFINE_SPINLOCK(tis_lock); | ||
| 77 | |||
| 78 | static int check_locality(struct tpm_chip *chip, int l) | ||
| 79 | { | ||
| 80 | if ((ioread8(chip->vendor.iobase + TPM_ACCESS(l)) & | ||
| 81 | (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == | ||
| 82 | (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) | ||
| 83 | return chip->vendor.locality = l; | ||
| 84 | |||
| 85 | return -1; | ||
| 86 | } | ||
| 87 | |||
| 88 | static void release_locality(struct tpm_chip *chip, int l, int force) | ||
| 89 | { | ||
| 90 | if (force || (ioread8(chip->vendor.iobase + TPM_ACCESS(l)) & | ||
| 91 | (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) == | ||
| 92 | (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) | ||
| 93 | iowrite8(TPM_ACCESS_ACTIVE_LOCALITY, | ||
| 94 | chip->vendor.iobase + TPM_ACCESS(l)); | ||
| 95 | } | ||
| 96 | |||
| 97 | static int request_locality(struct tpm_chip *chip, int l) | ||
| 98 | { | ||
| 99 | unsigned long stop; | ||
| 100 | long rc; | ||
| 101 | |||
| 102 | if (check_locality(chip, l) >= 0) | ||
| 103 | return l; | ||
| 104 | |||
| 105 | iowrite8(TPM_ACCESS_REQUEST_USE, | ||
| 106 | chip->vendor.iobase + TPM_ACCESS(l)); | ||
| 107 | |||
| 108 | if (chip->vendor.irq) { | ||
| 109 | rc = wait_event_interruptible_timeout(chip->vendor.int_queue, | ||
| 110 | (check_locality | ||
| 111 | (chip, l) >= 0), | ||
| 112 | chip->vendor.timeout_a); | ||
| 113 | if (rc > 0) | ||
| 114 | return l; | ||
| 115 | |||
| 116 | } else { | ||
| 117 | /* wait for burstcount */ | ||
| 118 | stop = jiffies + chip->vendor.timeout_a; | ||
| 119 | do { | ||
| 120 | if (check_locality(chip, l) >= 0) | ||
| 121 | return l; | ||
| 122 | msleep(TPM_TIMEOUT); | ||
| 123 | } | ||
| 124 | while (time_before(jiffies, stop)); | ||
| 125 | } | ||
| 126 | return -1; | ||
| 127 | } | ||
| 128 | |||
| 129 | static u8 tpm_tis_status(struct tpm_chip *chip) | ||
| 130 | { | ||
| 131 | return ioread8(chip->vendor.iobase + | ||
| 132 | TPM_STS(chip->vendor.locality)); | ||
| 133 | } | ||
| 134 | |||
| 135 | static void tpm_tis_ready(struct tpm_chip *chip) | ||
| 136 | { | ||
| 137 | /* this causes the current command to be aborted */ | ||
| 138 | iowrite8(TPM_STS_COMMAND_READY, | ||
| 139 | chip->vendor.iobase + TPM_STS(chip->vendor.locality)); | ||
| 140 | } | ||
| 141 | |||
| 142 | static int get_burstcount(struct tpm_chip *chip) | ||
| 143 | { | ||
| 144 | unsigned long stop; | ||
| 145 | int burstcnt; | ||
| 146 | |||
| 147 | /* wait for burstcount */ | ||
| 148 | /* which timeout value, spec has 2 answers (c & d) */ | ||
| 149 | stop = jiffies + chip->vendor.timeout_d; | ||
| 150 | do { | ||
| 151 | burstcnt = ioread8(chip->vendor.iobase + | ||
| 152 | TPM_STS(chip->vendor.locality) + 1); | ||
| 153 | burstcnt += ioread8(chip->vendor.iobase + | ||
| 154 | TPM_STS(chip->vendor.locality) + | ||
| 155 | 2) << 8; | ||
| 156 | if (burstcnt) | ||
| 157 | return burstcnt; | ||
| 158 | msleep(TPM_TIMEOUT); | ||
| 159 | } while (time_before(jiffies, stop)); | ||
| 160 | return -EBUSY; | ||
| 161 | } | ||
| 162 | |||
| 163 | static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, | ||
| 164 | wait_queue_head_t *queue) | ||
| 165 | { | ||
| 166 | unsigned long stop; | ||
| 167 | long rc; | ||
| 168 | u8 status; | ||
| 169 | |||
| 170 | /* check current status */ | ||
| 171 | status = tpm_tis_status(chip); | ||
| 172 | if ((status & mask) == mask) | ||
| 173 | return 0; | ||
| 174 | |||
| 175 | if (chip->vendor.irq) { | ||
| 176 | rc = wait_event_interruptible_timeout(*queue, | ||
| 177 | ((tpm_tis_status | ||
| 178 | (chip) & mask) == | ||
| 179 | mask), timeout); | ||
| 180 | if (rc > 0) | ||
| 181 | return 0; | ||
| 182 | } else { | ||
| 183 | stop = jiffies + timeout; | ||
| 184 | do { | ||
| 185 | msleep(TPM_TIMEOUT); | ||
| 186 | status = tpm_tis_status(chip); | ||
| 187 | if ((status & mask) == mask) | ||
| 188 | return 0; | ||
| 189 | } while (time_before(jiffies, stop)); | ||
| 190 | } | ||
| 191 | return -ETIME; | ||
| 192 | } | ||
| 193 | |||
| 194 | static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) | ||
| 195 | { | ||
| 196 | int size = 0, burstcnt; | ||
| 197 | while (size < count && | ||
| 198 | wait_for_stat(chip, | ||
| 199 | TPM_STS_DATA_AVAIL | TPM_STS_VALID, | ||
| 200 | chip->vendor.timeout_c, | ||
| 201 | &chip->vendor.read_queue) | ||
| 202 | == 0) { | ||
| 203 | burstcnt = get_burstcount(chip); | ||
| 204 | for (; burstcnt > 0 && size < count; burstcnt--) | ||
| 205 | buf[size++] = ioread8(chip->vendor.iobase + | ||
| 206 | TPM_DATA_FIFO(chip->vendor. | ||
| 207 | locality)); | ||
| 208 | } | ||
| 209 | return size; | ||
| 210 | } | ||
| 211 | |||
| 212 | static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) | ||
| 213 | { | ||
| 214 | int size = 0; | ||
| 215 | int expected, status; | ||
| 216 | |||
| 217 | if (count < TPM_HEADER_SIZE) { | ||
| 218 | size = -EIO; | ||
| 219 | goto out; | ||
| 220 | } | ||
| 221 | |||
| 222 | /* read first 10 bytes, including tag, paramsize, and result */ | ||
| 223 | if ((size = | ||
| 224 | recv_data(chip, buf, TPM_HEADER_SIZE)) < TPM_HEADER_SIZE) { | ||
| 225 | dev_err(chip->dev, "Unable to read header\n"); | ||
| 226 | goto out; | ||
| 227 | } | ||
| 228 | |||
| 229 | expected = be32_to_cpu(*(__be32 *) (buf + 2)); | ||
| 230 | if (expected > count) { | ||
| 231 | size = -EIO; | ||
| 232 | goto out; | ||
| 233 | } | ||
| 234 | |||
| 235 | if ((size += | ||
| 236 | recv_data(chip, &buf[TPM_HEADER_SIZE], | ||
| 237 | expected - TPM_HEADER_SIZE)) < expected) { | ||
| 238 | dev_err(chip->dev, "Unable to read remainder of result\n"); | ||
| 239 | size = -ETIME; | ||
| 240 | goto out; | ||
| 241 | } | ||
| 242 | |||
| 243 | wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c, | ||
| 244 | &chip->vendor.int_queue); | ||
| 245 | status = tpm_tis_status(chip); | ||
| 246 | if (status & TPM_STS_DATA_AVAIL) { /* retry? */ | ||
| 247 | dev_err(chip->dev, "Error left over data\n"); | ||
| 248 | size = -EIO; | ||
| 249 | goto out; | ||
| 250 | } | ||
| 251 | |||
| 252 | out: | ||
| 253 | tpm_tis_ready(chip); | ||
| 254 | release_locality(chip, chip->vendor.locality, 0); | ||
| 255 | return size; | ||
| 256 | } | ||
| 257 | |||
| 258 | /* | ||
| 259 | * If interrupts are used (signaled by an irq set in the vendor structure) | ||
| 260 | * tpm.c can skip polling for the data to be available as the interrupt is | ||
| 261 | * waited for here | ||
| 262 | */ | ||
| 263 | static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len) | ||
| 264 | { | ||
| 265 | int rc, status, burstcnt; | ||
| 266 | size_t count = 0; | ||
| 267 | u32 ordinal; | ||
| 268 | |||
| 269 | if (request_locality(chip, 0) < 0) | ||
| 270 | return -EBUSY; | ||
| 271 | |||
| 272 | status = tpm_tis_status(chip); | ||
| 273 | if ((status & TPM_STS_COMMAND_READY) == 0) { | ||
| 274 | tpm_tis_ready(chip); | ||
| 275 | if (wait_for_stat | ||
| 276 | (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b, | ||
| 277 | &chip->vendor.int_queue) < 0) { | ||
| 278 | rc = -ETIME; | ||
| 279 | goto out_err; | ||
| 280 | } | ||
| 281 | } | ||
| 282 | |||
| 283 | while (count < len - 1) { | ||
| 284 | burstcnt = get_burstcount(chip); | ||
| 285 | for (; burstcnt > 0 && count < len - 1; burstcnt--) { | ||
| 286 | iowrite8(buf[count], chip->vendor.iobase + | ||
| 287 | TPM_DATA_FIFO(chip->vendor.locality)); | ||
| 288 | count++; | ||
| 289 | } | ||
| 290 | |||
| 291 | wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c, | ||
| 292 | &chip->vendor.int_queue); | ||
| 293 | status = tpm_tis_status(chip); | ||
| 294 | if ((status & TPM_STS_DATA_EXPECT) == 0) { | ||
| 295 | rc = -EIO; | ||
| 296 | goto out_err; | ||
| 297 | } | ||
| 298 | } | ||
| 299 | |||
| 300 | /* write last byte */ | ||
| 301 | iowrite8(buf[count], | ||
| 302 | chip->vendor.iobase + | ||
| 303 | TPM_DATA_FIFO(chip->vendor.locality)); | ||
| 304 | wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c, | ||
| 305 | &chip->vendor.int_queue); | ||
| 306 | status = tpm_tis_status(chip); | ||
| 307 | if ((status & TPM_STS_DATA_EXPECT) != 0) { | ||
| 308 | rc = -EIO; | ||
| 309 | goto out_err; | ||
| 310 | } | ||
| 311 | |||
| 312 | /* go and do it */ | ||
| 313 | iowrite8(TPM_STS_GO, | ||
| 314 | chip->vendor.iobase + TPM_STS(chip->vendor.locality)); | ||
| 315 | |||
| 316 | if (chip->vendor.irq) { | ||
| 317 | ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); | ||
| 318 | if (wait_for_stat | ||
| 319 | (chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, | ||
| 320 | tpm_calc_ordinal_duration(chip, ordinal), | ||
| 321 | &chip->vendor.read_queue) < 0) { | ||
| 322 | rc = -ETIME; | ||
| 323 | goto out_err; | ||
| 324 | } | ||
| 325 | } | ||
| 326 | return len; | ||
| 327 | out_err: | ||
| 328 | tpm_tis_ready(chip); | ||
| 329 | release_locality(chip, chip->vendor.locality, 0); | ||
| 330 | return rc; | ||
| 331 | } | ||
| 332 | |||
| 333 | static struct file_operations tis_ops = { | ||
| 334 | .owner = THIS_MODULE, | ||
| 335 | .llseek = no_llseek, | ||
| 336 | .open = tpm_open, | ||
| 337 | .read = tpm_read, | ||
| 338 | .write = tpm_write, | ||
| 339 | .release = tpm_release, | ||
| 340 | }; | ||
| 341 | |||
| 342 | static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); | ||
| 343 | static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); | ||
| 344 | static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); | ||
| 345 | static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); | ||
| 346 | static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); | ||
| 347 | static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, | ||
| 348 | NULL); | ||
| 349 | static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL); | ||
| 350 | static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); | ||
| 351 | |||
| 352 | static struct attribute *tis_attrs[] = { | ||
| 353 | &dev_attr_pubek.attr, | ||
| 354 | &dev_attr_pcrs.attr, | ||
| 355 | &dev_attr_enabled.attr, | ||
| 356 | &dev_attr_active.attr, | ||
| 357 | &dev_attr_owned.attr, | ||
| 358 | &dev_attr_temp_deactivated.attr, | ||
| 359 | &dev_attr_caps.attr, | ||
| 360 | &dev_attr_cancel.attr, NULL, | ||
| 361 | }; | ||
| 362 | |||
| 363 | static struct attribute_group tis_attr_grp = { | ||
| 364 | .attrs = tis_attrs | ||
| 365 | }; | ||
| 366 | |||
| 367 | static struct tpm_vendor_specific tpm_tis = { | ||
| 368 | .status = tpm_tis_status, | ||
| 369 | .recv = tpm_tis_recv, | ||
| 370 | .send = tpm_tis_send, | ||
| 371 | .cancel = tpm_tis_ready, | ||
| 372 | .req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID, | ||
| 373 | .req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID, | ||
| 374 | .req_canceled = TPM_STS_COMMAND_READY, | ||
| 375 | .attr_group = &tis_attr_grp, | ||
| 376 | .miscdev = { | ||
| 377 | .fops = &tis_ops,}, | ||
| 378 | }; | ||
| 379 | |||
| 380 | static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs) | ||
| 381 | { | ||
| 382 | struct tpm_chip *chip = (struct tpm_chip *) dev_id; | ||
| 383 | u32 interrupt; | ||
| 384 | |||
| 385 | interrupt = ioread32(chip->vendor.iobase + | ||
| 386 | TPM_INT_STATUS(chip->vendor.locality)); | ||
| 387 | |||
| 388 | if (interrupt == 0) | ||
| 389 | return IRQ_NONE; | ||
| 390 | |||
| 391 | chip->vendor.irq = irq; | ||
| 392 | |||
| 393 | /* Clear interrupts handled with TPM_EOI */ | ||
| 394 | iowrite32(interrupt, | ||
| 395 | chip->vendor.iobase + | ||
| 396 | TPM_INT_STATUS(chip->vendor.locality)); | ||
| 397 | return IRQ_HANDLED; | ||
| 398 | } | ||
| 399 | |||
| 400 | static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs) | ||
| 401 | { | ||
| 402 | struct tpm_chip *chip = (struct tpm_chip *) dev_id; | ||
| 403 | u32 interrupt; | ||
| 404 | int i; | ||
| 405 | |||
| 406 | interrupt = ioread32(chip->vendor.iobase + | ||
| 407 | TPM_INT_STATUS(chip->vendor.locality)); | ||
| 408 | |||
| 409 | if (interrupt == 0) | ||
| 410 | return IRQ_NONE; | ||
| 411 | |||
| 412 | if (interrupt & TPM_INTF_DATA_AVAIL_INT) | ||
| 413 | wake_up_interruptible(&chip->vendor.read_queue); | ||
| 414 | if (interrupt & TPM_INTF_LOCALITY_CHANGE_INT) | ||
| 415 | for (i = 0; i < 5; i++) | ||
| 416 | if (check_locality(chip, i) >= 0) | ||
| 417 | break; | ||
| 418 | if (interrupt & | ||
| 419 | (TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT | | ||
| 420 | TPM_INTF_CMD_READY_INT)) | ||
| 421 | wake_up_interruptible(&chip->vendor.int_queue); | ||
| 422 | |||
| 423 | /* Clear interrupts handled with TPM_EOI */ | ||
| 424 | iowrite32(interrupt, | ||
| 425 | chip->vendor.iobase + | ||
| 426 | TPM_INT_STATUS(chip->vendor.locality)); | ||
| 427 | return IRQ_HANDLED; | ||
| 428 | } | ||
| 429 | |||
| 430 | static int interrupts = 1; | ||
| 431 | module_param(interrupts, bool, 0444); | ||
| 432 | MODULE_PARM_DESC(interrupts, "Enable interrupts"); | ||
| 433 | |||
| 434 | static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, | ||
| 435 | const struct pnp_device_id *pnp_id) | ||
| 436 | { | ||
| 437 | u32 vendor, intfcaps, intmask; | ||
| 438 | int rc, i; | ||
| 439 | unsigned long start, len; | ||
| 440 | struct tpm_chip *chip; | ||
| 441 | |||
| 442 | start = pnp_mem_start(pnp_dev, 0); | ||
| 443 | len = pnp_mem_len(pnp_dev, 0); | ||
| 444 | |||
| 445 | if (!start) | ||
| 446 | start = TIS_MEM_BASE; | ||
| 447 | if (!len) | ||
| 448 | len = TIS_MEM_LEN; | ||
| 449 | |||
| 450 | if (!(chip = tpm_register_hardware(&pnp_dev->dev, &tpm_tis))) | ||
| 451 | return -ENODEV; | ||
| 452 | |||
| 453 | chip->vendor.iobase = ioremap(start, len); | ||
| 454 | if (!chip->vendor.iobase) { | ||
| 455 | rc = -EIO; | ||
| 456 | goto out_err; | ||
| 457 | } | ||
| 458 | |||
| 459 | vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0)); | ||
| 460 | if ((vendor & 0xFFFF) == 0xFFFF) { | ||
| 461 | rc = -ENODEV; | ||
| 462 | goto out_err; | ||
| 463 | } | ||
| 464 | |||
| 465 | /* Default timeouts */ | ||
| 466 | chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT); | ||
| 467 | chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT); | ||
| 468 | chip->vendor.timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT); | ||
| 469 | chip->vendor.timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT); | ||
| 470 | |||
| 471 | dev_info(&pnp_dev->dev, | ||
| 472 | "1.2 TPM (device-id 0x%X, rev-id %d)\n", | ||
| 473 | vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0))); | ||
| 474 | |||
| 475 | /* Figure out the capabilities */ | ||
| 476 | intfcaps = | ||
| 477 | ioread32(chip->vendor.iobase + | ||
| 478 | TPM_INTF_CAPS(chip->vendor.locality)); | ||
| 479 | dev_dbg(&pnp_dev->dev, "TPM interface capabilities (0x%x):\n", | ||
| 480 | intfcaps); | ||
| 481 | if (intfcaps & TPM_INTF_BURST_COUNT_STATIC) | ||
| 482 | dev_dbg(&pnp_dev->dev, "\tBurst Count Static\n"); | ||
| 483 | if (intfcaps & TPM_INTF_CMD_READY_INT) | ||
| 484 | dev_dbg(&pnp_dev->dev, "\tCommand Ready Int Support\n"); | ||
| 485 | if (intfcaps & TPM_INTF_INT_EDGE_FALLING) | ||
| 486 | dev_dbg(&pnp_dev->dev, "\tInterrupt Edge Falling\n"); | ||
| 487 | if (intfcaps & TPM_INTF_INT_EDGE_RISING) | ||
| 488 | dev_dbg(&pnp_dev->dev, "\tInterrupt Edge Rising\n"); | ||
| 489 | if (intfcaps & TPM_INTF_INT_LEVEL_LOW) | ||
| 490 | dev_dbg(&pnp_dev->dev, "\tInterrupt Level Low\n"); | ||
| 491 | if (intfcaps & TPM_INTF_INT_LEVEL_HIGH) | ||
| 492 | dev_dbg(&pnp_dev->dev, "\tInterrupt Level High\n"); | ||
| 493 | if (intfcaps & TPM_INTF_LOCALITY_CHANGE_INT) | ||
| 494 | dev_dbg(&pnp_dev->dev, "\tLocality Change Int Support\n"); | ||
| 495 | if (intfcaps & TPM_INTF_STS_VALID_INT) | ||
| 496 | dev_dbg(&pnp_dev->dev, "\tSts Valid Int Support\n"); | ||
| 497 | if (intfcaps & TPM_INTF_DATA_AVAIL_INT) | ||
| 498 | dev_dbg(&pnp_dev->dev, "\tData Avail Int Support\n"); | ||
| 499 | |||
| 500 | if (request_locality(chip, 0) != 0) { | ||
| 501 | rc = -ENODEV; | ||
| 502 | goto out_err; | ||
| 503 | } | ||
| 504 | |||
| 505 | /* INTERRUPT Setup */ | ||
| 506 | init_waitqueue_head(&chip->vendor.read_queue); | ||
| 507 | init_waitqueue_head(&chip->vendor.int_queue); | ||
| 508 | |||
| 509 | intmask = | ||
| 510 | ioread32(chip->vendor.iobase + | ||
| 511 | TPM_INT_ENABLE(chip->vendor.locality)); | ||
| 512 | |||
| 513 | intmask |= TPM_INTF_CMD_READY_INT | ||
| 514 | | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT | ||
| 515 | | TPM_INTF_STS_VALID_INT; | ||
| 516 | |||
| 517 | iowrite32(intmask, | ||
| 518 | chip->vendor.iobase + | ||
| 519 | TPM_INT_ENABLE(chip->vendor.locality)); | ||
| 520 | if (interrupts) { | ||
| 521 | chip->vendor.irq = | ||
| 522 | ioread8(chip->vendor.iobase + | ||
| 523 | TPM_INT_VECTOR(chip->vendor.locality)); | ||
| 524 | |||
| 525 | for (i = 3; i < 16 && chip->vendor.irq == 0; i++) { | ||
| 526 | iowrite8(i, chip->vendor.iobase + | ||
| 527 | TPM_INT_VECTOR(chip->vendor.locality)); | ||
| 528 | if (request_irq | ||
| 529 | (i, tis_int_probe, SA_SHIRQ, | ||
| 530 | chip->vendor.miscdev.name, chip) != 0) { | ||
| 531 | dev_info(chip->dev, | ||
| 532 | "Unable to request irq: %d for probe\n", | ||
| 533 | i); | ||
| 534 | continue; | ||
| 535 | } | ||
| 536 | |||
| 537 | /* Clear all existing */ | ||
| 538 | iowrite32(ioread32 | ||
| 539 | (chip->vendor.iobase + | ||
| 540 | TPM_INT_STATUS(chip->vendor.locality)), | ||
| 541 | chip->vendor.iobase + | ||
| 542 | TPM_INT_STATUS(chip->vendor.locality)); | ||
| 543 | |||
| 544 | /* Turn on */ | ||
| 545 | iowrite32(intmask | TPM_GLOBAL_INT_ENABLE, | ||
| 546 | chip->vendor.iobase + | ||
| 547 | TPM_INT_ENABLE(chip->vendor.locality)); | ||
| 548 | |||
| 549 | /* Generate Interrupts */ | ||
| 550 | tpm_gen_interrupt(chip); | ||
| 551 | |||
| 552 | /* Turn off */ | ||
| 553 | iowrite32(intmask, | ||
| 554 | chip->vendor.iobase + | ||
| 555 | TPM_INT_ENABLE(chip->vendor.locality)); | ||
| 556 | free_irq(i, chip); | ||
| 557 | } | ||
| 558 | } | ||
| 559 | if (chip->vendor.irq) { | ||
| 560 | iowrite8(chip->vendor.irq, | ||
| 561 | chip->vendor.iobase + | ||
| 562 | TPM_INT_VECTOR(chip->vendor.locality)); | ||
| 563 | if (request_irq | ||
| 564 | (chip->vendor.irq, tis_int_handler, SA_SHIRQ, | ||
| 565 | chip->vendor.miscdev.name, chip) != 0) { | ||
| 566 | dev_info(chip->dev, | ||
| 567 | "Unable to request irq: %d for use\n", | ||
| 568 | chip->vendor.irq); | ||
| 569 | chip->vendor.irq = 0; | ||
| 570 | } else { | ||
| 571 | /* Clear all existing */ | ||
| 572 | iowrite32(ioread32 | ||
| 573 | (chip->vendor.iobase + | ||
| 574 | TPM_INT_STATUS(chip->vendor.locality)), | ||
| 575 | chip->vendor.iobase + | ||
| 576 | TPM_INT_STATUS(chip->vendor.locality)); | ||
| 577 | |||
| 578 | /* Turn on */ | ||
| 579 | iowrite32(intmask | TPM_GLOBAL_INT_ENABLE, | ||
| 580 | chip->vendor.iobase + | ||
| 581 | TPM_INT_ENABLE(chip->vendor.locality)); | ||
| 582 | } | ||
| 583 | } | ||
| 584 | |||
| 585 | INIT_LIST_HEAD(&chip->vendor.list); | ||
| 586 | spin_lock(&tis_lock); | ||
| 587 | list_add(&chip->vendor.list, &tis_chips); | ||
| 588 | spin_unlock(&tis_lock); | ||
| 589 | |||
| 590 | tpm_get_timeouts(chip); | ||
| 591 | tpm_continue_selftest(chip); | ||
| 592 | |||
| 593 | return 0; | ||
| 594 | out_err: | ||
| 595 | if (chip->vendor.iobase) | ||
| 596 | iounmap(chip->vendor.iobase); | ||
| 597 | tpm_remove_hardware(chip->dev); | ||
| 598 | return rc; | ||
| 599 | } | ||
| 600 | |||
| 601 | static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg) | ||
| 602 | { | ||
| 603 | return tpm_pm_suspend(&dev->dev, msg); | ||
| 604 | } | ||
| 605 | |||
| 606 | static int tpm_tis_pnp_resume(struct pnp_dev *dev) | ||
| 607 | { | ||
| 608 | return tpm_pm_resume(&dev->dev); | ||
| 609 | } | ||
| 610 | |||
| 611 | static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = { | ||
| 612 | {"PNP0C31", 0}, /* TPM */ | ||
| 613 | {"ATM1200", 0}, /* Atmel */ | ||
| 614 | {"IFX0102", 0}, /* Infineon */ | ||
| 615 | {"BCM0101", 0}, /* Broadcom */ | ||
| 616 | {"NSC1200", 0}, /* National */ | ||
| 617 | /* Add new here */ | ||
| 618 | {"", 0}, /* User Specified */ | ||
| 619 | {"", 0} /* Terminator */ | ||
| 620 | }; | ||
| 621 | |||
| 622 | static struct pnp_driver tis_pnp_driver = { | ||
| 623 | .name = "tpm_tis", | ||
| 624 | .id_table = tpm_pnp_tbl, | ||
| 625 | .probe = tpm_tis_pnp_init, | ||
| 626 | .suspend = tpm_tis_pnp_suspend, | ||
| 627 | .resume = tpm_tis_pnp_resume, | ||
| 628 | }; | ||
| 629 | |||
| 630 | #define TIS_HID_USR_IDX sizeof(tpm_pnp_tbl)/sizeof(struct pnp_device_id) -2 | ||
| 631 | module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id, | ||
| 632 | sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444); | ||
| 633 | MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe"); | ||
| 634 | |||
| 635 | static int __init init_tis(void) | ||
| 636 | { | ||
| 637 | return pnp_register_driver(&tis_pnp_driver); | ||
| 638 | } | ||
| 639 | |||
| 640 | static void __exit cleanup_tis(void) | ||
| 641 | { | ||
| 642 | struct tpm_vendor_specific *i, *j; | ||
| 643 | struct tpm_chip *chip; | ||
| 644 | spin_lock(&tis_lock); | ||
| 645 | list_for_each_entry_safe(i, j, &tis_chips, list) { | ||
| 646 | chip = to_tpm_chip(i); | ||
| 647 | iowrite32(~TPM_GLOBAL_INT_ENABLE & | ||
| 648 | ioread32(chip->vendor.iobase + | ||
| 649 | TPM_INT_ENABLE(chip->vendor. | ||
| 650 | locality)), | ||
| 651 | chip->vendor.iobase + | ||
| 652 | TPM_INT_ENABLE(chip->vendor.locality)); | ||
| 653 | release_locality(chip, chip->vendor.locality, 1); | ||
| 654 | if (chip->vendor.irq) | ||
| 655 | free_irq(chip->vendor.irq, chip); | ||
| 656 | iounmap(i->iobase); | ||
| 657 | list_del(&i->list); | ||
| 658 | tpm_remove_hardware(chip->dev); | ||
| 659 | } | ||
| 660 | spin_unlock(&tis_lock); | ||
| 661 | pnp_unregister_driver(&tis_pnp_driver); | ||
| 662 | } | ||
| 663 | |||
| 664 | module_init(init_tis); | ||
| 665 | module_exit(cleanup_tis); | ||
| 666 | MODULE_AUTHOR("Leendert van Doorn (leendert@watson.ibm.com)"); | ||
| 667 | MODULE_DESCRIPTION("TPM Driver"); | ||
| 668 | MODULE_VERSION("2.0"); | ||
| 669 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 9759d05b1972..29b2fa5534ae 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -1497,7 +1497,7 @@ int cpufreq_update_policy(unsigned int cpu) | |||
| 1497 | } | 1497 | } |
| 1498 | EXPORT_SYMBOL(cpufreq_update_policy); | 1498 | EXPORT_SYMBOL(cpufreq_update_policy); |
| 1499 | 1499 | ||
| 1500 | static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb, | 1500 | static int cpufreq_cpu_callback(struct notifier_block *nfb, |
| 1501 | unsigned long action, void *hcpu) | 1501 | unsigned long action, void *hcpu) |
| 1502 | { | 1502 | { |
| 1503 | unsigned int cpu = (unsigned long)hcpu; | 1503 | unsigned int cpu = (unsigned long)hcpu; |
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index 1dca3cf42a54..2e4abdc26367 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c | |||
| @@ -350,11 +350,11 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv) | |||
| 350 | return 0; | 350 | return 0; |
| 351 | bail2: | 351 | bail2: |
| 352 | serio_close(serio); | 352 | serio_close(serio); |
| 353 | serio_set_drvdata(serio, NULL); | ||
| 353 | bail1: | 354 | bail1: |
| 354 | input_free_device(kbd->dev); | 355 | input_free_device(kbd->dev); |
| 355 | bail0: | 356 | bail0: |
| 356 | kfree(kbd); | 357 | kfree(kbd); |
| 357 | serio_set_drvdata(serio, NULL); | ||
| 358 | return -EIO; | 358 | return -EIO; |
| 359 | } | 359 | } |
| 360 | 360 | ||
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h index 9a9221644250..cc21914fbc72 100644 --- a/drivers/input/serio/i8042-io.h +++ b/drivers/input/serio/i8042-io.h | |||
| @@ -67,14 +67,14 @@ static inline int i8042_platform_init(void) | |||
| 67 | * On some platforms touching the i8042 data register region can do really | 67 | * On some platforms touching the i8042 data register region can do really |
| 68 | * bad things. Because of this the region is always reserved on such boxes. | 68 | * bad things. Because of this the region is always reserved on such boxes. |
| 69 | */ | 69 | */ |
| 70 | #if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64) | 70 | #if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC_MERGE) |
| 71 | if (!request_region(I8042_DATA_REG, 16, "i8042")) | 71 | if (!request_region(I8042_DATA_REG, 16, "i8042")) |
| 72 | return -EBUSY; | 72 | return -EBUSY; |
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | i8042_reset = 1; | 75 | i8042_reset = 1; |
| 76 | 76 | ||
| 77 | #if defined(CONFIG_PPC64) | 77 | #if defined(CONFIG_PPC_MERGE) |
| 78 | if (check_legacy_ioport(I8042_DATA_REG)) | 78 | if (check_legacy_ioport(I8042_DATA_REG)) |
| 79 | return -EBUSY; | 79 | return -EBUSY; |
| 80 | if (!request_region(I8042_DATA_REG, 16, "i8042")) | 80 | if (!request_region(I8042_DATA_REG, 16, "i8042")) |
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index f86ed6af3aa2..eb41aba3ddef 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c | |||
| @@ -5,8 +5,6 @@ | |||
| 5 | * Tilman Schmidt <tilman@imap.cc>, | 5 | * Tilman Schmidt <tilman@imap.cc>, |
| 6 | * Stefan Eilers. | 6 | * Stefan Eilers. |
| 7 | * | 7 | * |
| 8 | * Based on usb-gigaset.c. | ||
| 9 | * | ||
| 10 | * ===================================================================== | 8 | * ===================================================================== |
| 11 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 12 | * modify it under the terms of the GNU General Public License as | 10 | * modify it under the terms of the GNU General Public License as |
| @@ -46,19 +44,20 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode"); | |||
| 46 | #define GIGASET_DEVFSNAME "gig/bas/" | 44 | #define GIGASET_DEVFSNAME "gig/bas/" |
| 47 | #define GIGASET_DEVNAME "ttyGB" | 45 | #define GIGASET_DEVNAME "ttyGB" |
| 48 | 46 | ||
| 49 | #define IF_WRITEBUF 256 //FIXME | 47 | /* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */ |
| 48 | #define IF_WRITEBUF 264 | ||
| 50 | 49 | ||
| 51 | /* Values for the Gigaset 307x */ | 50 | /* Values for the Gigaset 307x */ |
| 52 | #define USB_GIGA_VENDOR_ID 0x0681 | 51 | #define USB_GIGA_VENDOR_ID 0x0681 |
| 53 | #define USB_GIGA_PRODUCT_ID 0x0001 | 52 | #define USB_3070_PRODUCT_ID 0x0001 |
| 54 | #define USB_4175_PRODUCT_ID 0x0002 | 53 | #define USB_3075_PRODUCT_ID 0x0002 |
| 55 | #define USB_SX303_PRODUCT_ID 0x0021 | 54 | #define USB_SX303_PRODUCT_ID 0x0021 |
| 56 | #define USB_SX353_PRODUCT_ID 0x0022 | 55 | #define USB_SX353_PRODUCT_ID 0x0022 |
| 57 | 56 | ||
| 58 | /* table of devices that work with this driver */ | 57 | /* table of devices that work with this driver */ |
| 59 | static struct usb_device_id gigaset_table [] = { | 58 | static struct usb_device_id gigaset_table [] = { |
| 60 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_GIGA_PRODUCT_ID) }, | 59 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3070_PRODUCT_ID) }, |
| 61 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_4175_PRODUCT_ID) }, | 60 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3075_PRODUCT_ID) }, |
| 62 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX303_PRODUCT_ID) }, | 61 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX303_PRODUCT_ID) }, |
| 63 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX353_PRODUCT_ID) }, | 62 | { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX353_PRODUCT_ID) }, |
| 64 | { } /* Terminating entry */ | 63 | { } /* Terminating entry */ |
| @@ -77,6 +76,10 @@ static int gigaset_probe(struct usb_interface *interface, | |||
| 77 | /* Function will be called if the device is unplugged */ | 76 | /* Function will be called if the device is unplugged */ |
| 78 | static void gigaset_disconnect(struct usb_interface *interface); | 77 | static void gigaset_disconnect(struct usb_interface *interface); |
| 79 | 78 | ||
| 79 | static void read_ctrl_callback(struct urb *, struct pt_regs *); | ||
| 80 | static void stopurbs(struct bas_bc_state *); | ||
| 81 | static int atwrite_submit(struct cardstate *, unsigned char *, int); | ||
| 82 | static int start_cbsend(struct cardstate *); | ||
| 80 | 83 | ||
| 81 | /*==============================================================================*/ | 84 | /*==============================================================================*/ |
| 82 | 85 | ||
| @@ -111,12 +114,14 @@ struct bas_cardstate { | |||
| 111 | }; | 114 | }; |
| 112 | 115 | ||
| 113 | /* status of direct USB connection to 307x base (bits in basstate) */ | 116 | /* status of direct USB connection to 307x base (bits in basstate) */ |
| 114 | #define BS_ATOPEN 0x001 | 117 | #define BS_ATOPEN 0x001 /* AT channel open */ |
| 115 | #define BS_B1OPEN 0x002 | 118 | #define BS_B1OPEN 0x002 /* B channel 1 open */ |
| 116 | #define BS_B2OPEN 0x004 | 119 | #define BS_B2OPEN 0x004 /* B channel 2 open */ |
| 117 | #define BS_ATREADY 0x008 | 120 | #define BS_ATREADY 0x008 /* base ready for AT command */ |
| 118 | #define BS_INIT 0x010 | 121 | #define BS_INIT 0x010 /* base has signalled INIT_OK */ |
| 119 | #define BS_ATTIMER 0x020 | 122 | #define BS_ATTIMER 0x020 /* waiting for HD_READY_SEND_ATDATA */ |
| 123 | #define BS_ATRDPEND 0x040 /* urb_cmd_in in use */ | ||
| 124 | #define BS_ATWRPEND 0x080 /* urb_cmd_out in use */ | ||
| 120 | 125 | ||
| 121 | 126 | ||
| 122 | static struct gigaset_driver *driver = NULL; | 127 | static struct gigaset_driver *driver = NULL; |
| @@ -130,6 +135,47 @@ static struct usb_driver gigaset_usb_driver = { | |||
| 130 | .id_table = gigaset_table, | 135 | .id_table = gigaset_table, |
| 131 | }; | 136 | }; |
| 132 | 137 | ||
| 138 | /* get message text for usb_submit_urb return code | ||
| 139 | */ | ||
| 140 | static char *get_usb_rcmsg(int rc) | ||
| 141 | { | ||
| 142 | static char unkmsg[28]; | ||
| 143 | |||
| 144 | switch (rc) { | ||
| 145 | case 0: | ||
| 146 | return "success"; | ||
| 147 | case -ENOMEM: | ||
| 148 | return "out of memory"; | ||
| 149 | case -ENODEV: | ||
| 150 | return "device not present"; | ||
| 151 | case -ENOENT: | ||
| 152 | return "endpoint not present"; | ||
| 153 | case -ENXIO: | ||
| 154 | return "URB type not supported"; | ||
| 155 | case -EINVAL: | ||
| 156 | return "invalid argument"; | ||
| 157 | case -EAGAIN: | ||
| 158 | return "start frame too early or too much scheduled"; | ||
| 159 | case -EFBIG: | ||
| 160 | return "too many isochronous frames requested"; | ||
| 161 | case -EPIPE: | ||
| 162 | return "endpoint stalled"; | ||
| 163 | case -EMSGSIZE: | ||
| 164 | return "invalid packet size"; | ||
| 165 | case -ENOSPC: | ||
| 166 | return "would overcommit USB bandwidth"; | ||
| 167 | case -ESHUTDOWN: | ||
| 168 | return "device shut down"; | ||
| 169 | case -EPERM: | ||
| 170 | return "reject flag set"; | ||
| 171 | case -EHOSTUNREACH: | ||
| 172 | return "device suspended"; | ||
| 173 | default: | ||
| 174 | snprintf(unkmsg, sizeof(unkmsg), "unknown error %d", rc); | ||
| 175 | return unkmsg; | ||
| 176 | } | ||
| 177 | } | ||
| 178 | |||
| 133 | /* get message text for USB status code | 179 | /* get message text for USB status code |
| 134 | */ | 180 | */ |
| 135 | static char *get_usb_statmsg(int status) | 181 | static char *get_usb_statmsg(int status) |
| @@ -140,43 +186,37 @@ static char *get_usb_statmsg(int status) | |||
| 140 | case 0: | 186 | case 0: |
| 141 | return "success"; | 187 | return "success"; |
| 142 | case -ENOENT: | 188 | case -ENOENT: |
| 143 | return "canceled"; | 189 | return "unlinked (sync)"; |
| 144 | case -ECONNRESET: | ||
| 145 | return "canceled (async)"; | ||
| 146 | case -EINPROGRESS: | 190 | case -EINPROGRESS: |
| 147 | return "pending"; | 191 | return "pending"; |
| 148 | case -EPROTO: | 192 | case -EPROTO: |
| 149 | return "bit stuffing or unknown USB error"; | 193 | return "bit stuffing error, timeout, or unknown USB error"; |
| 150 | case -EILSEQ: | 194 | case -EILSEQ: |
| 151 | return "Illegal byte sequence (CRC mismatch)"; | 195 | return "CRC mismatch, timeout, or unknown USB error"; |
| 152 | case -EPIPE: | ||
| 153 | return "babble detect or endpoint stalled"; | ||
| 154 | case -ENOSR: | ||
| 155 | return "buffer error"; | ||
| 156 | case -ETIMEDOUT: | 196 | case -ETIMEDOUT: |
| 157 | return "timed out"; | 197 | return "timed out"; |
| 158 | case -ENODEV: | 198 | case -EPIPE: |
| 159 | return "device not present"; | 199 | return "endpoint stalled"; |
| 200 | case -ECOMM: | ||
| 201 | return "IN buffer overrun"; | ||
| 202 | case -ENOSR: | ||
| 203 | return "OUT buffer underrun"; | ||
| 204 | case -EOVERFLOW: | ||
| 205 | return "too much data"; | ||
| 160 | case -EREMOTEIO: | 206 | case -EREMOTEIO: |
| 161 | return "short packet detected"; | 207 | return "short packet detected"; |
| 208 | case -ENODEV: | ||
| 209 | return "device removed"; | ||
| 162 | case -EXDEV: | 210 | case -EXDEV: |
| 163 | return "partial isochronous transfer"; | 211 | return "partial isochronous transfer"; |
| 164 | case -EINVAL: | 212 | case -EINVAL: |
| 165 | return "invalid argument"; | 213 | return "invalid argument"; |
| 166 | case -ENXIO: | 214 | case -ECONNRESET: |
| 167 | return "URB already queued"; | 215 | return "unlinked (async)"; |
| 168 | case -EAGAIN: | ||
| 169 | return "isochronous start frame too early or too much scheduled"; | ||
| 170 | case -EFBIG: | ||
| 171 | return "too many isochronous frames requested"; | ||
| 172 | case -EMSGSIZE: | ||
| 173 | return "endpoint message size zero"; | ||
| 174 | case -ESHUTDOWN: | 216 | case -ESHUTDOWN: |
| 175 | return "endpoint shutdown"; | 217 | return "device shut down"; |
| 176 | case -EBUSY: | ||
| 177 | return "another request pending"; | ||
| 178 | default: | 218 | default: |
| 179 | snprintf(unkmsg, sizeof(unkmsg), "unknown error %d", status); | 219 | snprintf(unkmsg, sizeof(unkmsg), "unknown status %d", status); |
| 180 | return unkmsg; | 220 | return unkmsg; |
| 181 | } | 221 | } |
| 182 | } | 222 | } |
| @@ -277,18 +317,17 @@ static inline void error_hangup(struct bc_state *bcs) | |||
| 277 | gig_dbg(DEBUG_ANY, "%s: scheduling HUP for channel %d", | 317 | gig_dbg(DEBUG_ANY, "%s: scheduling HUP for channel %d", |
| 278 | __func__, bcs->channel); | 318 | __func__, bcs->channel); |
| 279 | 319 | ||
| 280 | if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL)) { | 320 | if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL)) |
| 281 | //FIXME what should we do? | 321 | dev_err(cs->dev, "event queue full\n"); |
| 282 | return; | ||
| 283 | } | ||
| 284 | 322 | ||
| 285 | gigaset_schedule_event(cs); | 323 | gigaset_schedule_event(cs); |
| 286 | } | 324 | } |
| 287 | 325 | ||
| 288 | /* error_reset | 326 | /* error_reset |
| 289 | * reset Gigaset device because of an unrecoverable error | 327 | * reset Gigaset device because of an unrecoverable error |
| 290 | * This function may be called from any context and takes care of scheduling | 328 | * This function may be called from any context, and should take care of |
| 291 | * the necessary actions for execution outside of interrupt context. | 329 | * scheduling the necessary actions for execution outside of interrupt context. |
| 330 | * Right now, it just generates a kernel message calling for help. | ||
| 292 | * argument: | 331 | * argument: |
| 293 | * controller state structure | 332 | * controller state structure |
| 294 | */ | 333 | */ |
| @@ -364,36 +403,38 @@ static void cmd_in_timeout(unsigned long data) | |||
| 364 | { | 403 | { |
| 365 | struct cardstate *cs = (struct cardstate *) data; | 404 | struct cardstate *cs = (struct cardstate *) data; |
| 366 | struct bas_cardstate *ucs = cs->hw.bas; | 405 | struct bas_cardstate *ucs = cs->hw.bas; |
| 367 | unsigned long flags; | ||
| 368 | 406 | ||
| 369 | spin_lock_irqsave(&cs->lock, flags); | ||
| 370 | if (unlikely(!cs->connected)) { | ||
| 371 | gig_dbg(DEBUG_USBREQ, "%s: disconnected", __func__); | ||
| 372 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 373 | return; | ||
| 374 | } | ||
| 375 | if (!ucs->rcvbuf_size) { | 407 | if (!ucs->rcvbuf_size) { |
| 376 | gig_dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__); | 408 | gig_dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__); |
| 377 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 378 | return; | 409 | return; |
| 379 | } | 410 | } |
| 380 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 381 | 411 | ||
| 382 | dev_err(cs->dev, "timeout reading AT response\n"); | 412 | dev_err(cs->dev, "timeout reading AT response\n"); |
| 383 | error_reset(cs); //FIXME retry? | 413 | error_reset(cs); //FIXME retry? |
| 384 | } | 414 | } |
| 385 | 415 | ||
| 416 | /* set/clear bits in base connection state, return previous state | ||
| 417 | */ | ||
| 418 | inline static int update_basstate(struct bas_cardstate *ucs, | ||
| 419 | int set, int clear) | ||
| 420 | { | ||
| 421 | unsigned long flags; | ||
| 422 | int state; | ||
| 386 | 423 | ||
| 387 | static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs); | 424 | spin_lock_irqsave(&ucs->lock, flags); |
| 425 | state = atomic_read(&ucs->basstate); | ||
| 426 | atomic_set(&ucs->basstate, (state & ~clear) | set); | ||
| 427 | spin_unlock_irqrestore(&ucs->lock, flags); | ||
| 428 | return state; | ||
| 429 | } | ||
| 388 | 430 | ||
| 389 | /* atread_submit | 431 | /* atread_submit |
| 390 | * submit an HD_READ_ATMESSAGE command URB | 432 | * submit an HD_READ_ATMESSAGE command URB and optionally start a timeout |
| 391 | * parameters: | 433 | * parameters: |
| 392 | * cs controller state structure | 434 | * cs controller state structure |
| 393 | * timeout timeout in 1/10 sec., 0: none | 435 | * timeout timeout in 1/10 sec., 0: none |
| 394 | * return value: | 436 | * return value: |
| 395 | * 0 on success | 437 | * 0 on success |
| 396 | * -EINVAL if a NULL pointer is encountered somewhere | ||
| 397 | * -EBUSY if another request is pending | 438 | * -EBUSY if another request is pending |
| 398 | * any URB submission error code | 439 | * any URB submission error code |
| 399 | */ | 440 | */ |
| @@ -405,7 +446,7 @@ static int atread_submit(struct cardstate *cs, int timeout) | |||
| 405 | gig_dbg(DEBUG_USBREQ, "-------> HD_READ_ATMESSAGE (%d)", | 446 | gig_dbg(DEBUG_USBREQ, "-------> HD_READ_ATMESSAGE (%d)", |
| 406 | ucs->rcvbuf_size); | 447 | ucs->rcvbuf_size); |
| 407 | 448 | ||
| 408 | if (ucs->urb_cmd_in->status == -EINPROGRESS) { | 449 | if (update_basstate(ucs, BS_ATRDPEND, 0) & BS_ATRDPEND) { |
| 409 | dev_err(cs->dev, | 450 | dev_err(cs->dev, |
| 410 | "could not submit HD_READ_ATMESSAGE: URB busy\n"); | 451 | "could not submit HD_READ_ATMESSAGE: URB busy\n"); |
| 411 | return -EBUSY; | 452 | return -EBUSY; |
| @@ -423,6 +464,7 @@ static int atread_submit(struct cardstate *cs, int timeout) | |||
| 423 | read_ctrl_callback, cs->inbuf); | 464 | read_ctrl_callback, cs->inbuf); |
| 424 | 465 | ||
| 425 | if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) { | 466 | if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) { |
| 467 | update_basstate(ucs, 0, BS_ATRDPEND); | ||
| 426 | dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n", | 468 | dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n", |
| 427 | get_usb_statmsg(ret)); | 469 | get_usb_statmsg(ret)); |
| 428 | return ret; | 470 | return ret; |
| @@ -438,26 +480,6 @@ static int atread_submit(struct cardstate *cs, int timeout) | |||
| 438 | return 0; | 480 | return 0; |
| 439 | } | 481 | } |
| 440 | 482 | ||
| 441 | static void stopurbs(struct bas_bc_state *); | ||
| 442 | static int start_cbsend(struct cardstate *); | ||
| 443 | |||
| 444 | /* set/clear bits in base connection state | ||
| 445 | */ | ||
| 446 | inline static void update_basstate(struct bas_cardstate *ucs, | ||
| 447 | int set, int clear) | ||
| 448 | { | ||
| 449 | unsigned long flags; | ||
| 450 | int state; | ||
| 451 | |||
| 452 | spin_lock_irqsave(&ucs->lock, flags); | ||
| 453 | state = atomic_read(&ucs->basstate); | ||
| 454 | state &= ~clear; | ||
| 455 | state |= set; | ||
| 456 | atomic_set(&ucs->basstate, state); | ||
| 457 | spin_unlock_irqrestore(&ucs->lock, flags); | ||
| 458 | } | ||
| 459 | |||
| 460 | |||
| 461 | /* read_int_callback | 483 | /* read_int_callback |
| 462 | * USB completion handler for interrupt pipe input | 484 | * USB completion handler for interrupt pipe input |
| 463 | * called by the USB subsystem in interrupt context | 485 | * called by the USB subsystem in interrupt context |
| @@ -471,20 +493,25 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs) | |||
| 471 | struct bas_cardstate *ucs = cs->hw.bas; | 493 | struct bas_cardstate *ucs = cs->hw.bas; |
| 472 | struct bc_state *bcs; | 494 | struct bc_state *bcs; |
| 473 | unsigned long flags; | 495 | unsigned long flags; |
| 474 | int status; | 496 | int rc; |
| 475 | unsigned l; | 497 | unsigned l; |
| 476 | int channel; | 498 | int channel; |
| 477 | 499 | ||
| 478 | switch (urb->status) { | 500 | switch (urb->status) { |
| 479 | case 0: /* success */ | 501 | case 0: /* success */ |
| 480 | break; | 502 | break; |
| 481 | case -ENOENT: /* canceled */ | 503 | case -ENOENT: /* cancelled */ |
| 482 | case -ECONNRESET: /* canceled (async) */ | 504 | case -ECONNRESET: /* cancelled (async) */ |
| 483 | case -EINPROGRESS: /* pending */ | 505 | case -EINPROGRESS: /* pending */ |
| 484 | /* ignore silently */ | 506 | /* ignore silently */ |
| 485 | gig_dbg(DEBUG_USBREQ, "%s: %s", | 507 | gig_dbg(DEBUG_USBREQ, "%s: %s", |
| 486 | __func__, get_usb_statmsg(urb->status)); | 508 | __func__, get_usb_statmsg(urb->status)); |
| 487 | return; | 509 | return; |
| 510 | case -ENODEV: /* device removed */ | ||
| 511 | case -ESHUTDOWN: /* device shut down */ | ||
| 512 | //FIXME use this as disconnect indicator? | ||
| 513 | gig_dbg(DEBUG_USBREQ, "%s: device disconnected", __func__); | ||
| 514 | return; | ||
| 488 | default: /* severe trouble */ | 515 | default: /* severe trouble */ |
| 489 | dev_warn(cs->dev, "interrupt read: %s\n", | 516 | dev_warn(cs->dev, "interrupt read: %s\n", |
| 490 | get_usb_statmsg(urb->status)); | 517 | get_usb_statmsg(urb->status)); |
| @@ -492,6 +519,13 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs) | |||
| 492 | goto resubmit; | 519 | goto resubmit; |
| 493 | } | 520 | } |
| 494 | 521 | ||
| 522 | /* drop incomplete packets even if the missing bytes wouldn't matter */ | ||
| 523 | if (unlikely(urb->actual_length < 3)) { | ||
| 524 | dev_warn(cs->dev, "incomplete interrupt packet (%d bytes)\n", | ||
| 525 | urb->actual_length); | ||
| 526 | goto resubmit; | ||
| 527 | } | ||
| 528 | |||
| 495 | l = (unsigned) ucs->int_in_buf[1] + | 529 | l = (unsigned) ucs->int_in_buf[1] + |
| 496 | (((unsigned) ucs->int_in_buf[2]) << 8); | 530 | (((unsigned) ucs->int_in_buf[2]) << 8); |
| 497 | 531 | ||
| @@ -558,25 +592,28 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs) | |||
| 558 | } | 592 | } |
| 559 | spin_lock_irqsave(&cs->lock, flags); | 593 | spin_lock_irqsave(&cs->lock, flags); |
| 560 | if (ucs->rcvbuf_size) { | 594 | if (ucs->rcvbuf_size) { |
| 561 | spin_unlock_irqrestore(&cs->lock, flags); | 595 | /* throw away previous buffer - we have no queue */ |
| 562 | dev_err(cs->dev, | 596 | dev_err(cs->dev, |
| 563 | "receive AT data overrun, %d bytes lost\n", l); | 597 | "receive AT data overrun, %d bytes lost\n", |
| 564 | error_reset(cs); //FIXME reschedule | 598 | ucs->rcvbuf_size); |
| 565 | break; | 599 | kfree(ucs->rcvbuf); |
| 600 | ucs->rcvbuf_size = 0; | ||
| 566 | } | 601 | } |
| 567 | if ((ucs->rcvbuf = kmalloc(l, GFP_ATOMIC)) == NULL) { | 602 | if ((ucs->rcvbuf = kmalloc(l, GFP_ATOMIC)) == NULL) { |
| 568 | spin_unlock_irqrestore(&cs->lock, flags); | 603 | spin_unlock_irqrestore(&cs->lock, flags); |
| 569 | dev_err(cs->dev, "out of memory, %d bytes lost\n", l); | 604 | dev_err(cs->dev, "out of memory receiving AT data\n"); |
| 570 | error_reset(cs); //FIXME reschedule | 605 | error_reset(cs); |
| 571 | break; | 606 | break; |
| 572 | } | 607 | } |
| 573 | ucs->rcvbuf_size = l; | 608 | ucs->rcvbuf_size = l; |
| 574 | ucs->retry_cmd_in = 0; | 609 | ucs->retry_cmd_in = 0; |
| 575 | if ((status = atread_submit(cs, BAS_TIMEOUT)) < 0) { | 610 | if ((rc = atread_submit(cs, BAS_TIMEOUT)) < 0) { |
| 576 | kfree(ucs->rcvbuf); | 611 | kfree(ucs->rcvbuf); |
| 577 | ucs->rcvbuf = NULL; | 612 | ucs->rcvbuf = NULL; |
| 578 | ucs->rcvbuf_size = 0; | 613 | ucs->rcvbuf_size = 0; |
| 579 | error_reset(cs); //FIXME reschedule | 614 | if (rc != -ENODEV) |
| 615 | //FIXME corrective action? | ||
| 616 | error_reset(cs); | ||
| 580 | } | 617 | } |
| 581 | spin_unlock_irqrestore(&cs->lock, flags); | 618 | spin_unlock_irqrestore(&cs->lock, flags); |
| 582 | break; | 619 | break; |
| @@ -598,12 +635,10 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs) | |||
| 598 | check_pending(ucs); | 635 | check_pending(ucs); |
| 599 | 636 | ||
| 600 | resubmit: | 637 | resubmit: |
| 601 | spin_lock_irqsave(&cs->lock, flags); | 638 | rc = usb_submit_urb(urb, SLAB_ATOMIC); |
| 602 | status = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV; | 639 | if (unlikely(rc != 0 && rc != -ENODEV)) { |
| 603 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 604 | if (unlikely(status)) { | ||
| 605 | dev_err(cs->dev, "could not resubmit interrupt URB: %s\n", | 640 | dev_err(cs->dev, "could not resubmit interrupt URB: %s\n", |
| 606 | get_usb_statmsg(status)); | 641 | get_usb_rcmsg(rc)); |
| 607 | error_reset(cs); | 642 | error_reset(cs); |
| 608 | } | 643 | } |
| 609 | } | 644 | } |
| @@ -622,18 +657,12 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs) | |||
| 622 | struct bas_cardstate *ucs = cs->hw.bas; | 657 | struct bas_cardstate *ucs = cs->hw.bas; |
| 623 | int have_data = 0; | 658 | int have_data = 0; |
| 624 | unsigned numbytes; | 659 | unsigned numbytes; |
| 625 | unsigned long flags; | 660 | int rc; |
| 626 | 661 | ||
| 627 | spin_lock_irqsave(&cs->lock, flags); | 662 | update_basstate(ucs, 0, BS_ATRDPEND); |
| 628 | if (unlikely(!cs->connected)) { | ||
| 629 | warn("%s: disconnected", __func__); | ||
| 630 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 631 | return; | ||
| 632 | } | ||
| 633 | 663 | ||
| 634 | if (!ucs->rcvbuf_size) { | 664 | if (!ucs->rcvbuf_size) { |
| 635 | dev_warn(cs->dev, "%s: no receive in progress\n", __func__); | 665 | dev_warn(cs->dev, "%s: no receive in progress\n", __func__); |
| 636 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 637 | return; | 666 | return; |
| 638 | } | 667 | } |
| 639 | 668 | ||
| @@ -666,9 +695,11 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs) | |||
| 666 | } | 695 | } |
| 667 | break; | 696 | break; |
| 668 | 697 | ||
| 669 | case -ENOENT: /* canceled */ | 698 | case -ENOENT: /* cancelled */ |
| 670 | case -ECONNRESET: /* canceled (async) */ | 699 | case -ECONNRESET: /* cancelled (async) */ |
| 671 | case -EINPROGRESS: /* pending */ | 700 | case -EINPROGRESS: /* pending */ |
| 701 | case -ENODEV: /* device removed */ | ||
| 702 | case -ESHUTDOWN: /* device shut down */ | ||
| 672 | /* no action necessary */ | 703 | /* no action necessary */ |
| 673 | gig_dbg(DEBUG_USBREQ, "%s: %s", | 704 | gig_dbg(DEBUG_USBREQ, "%s: %s", |
| 674 | __func__, get_usb_statmsg(urb->status)); | 705 | __func__, get_usb_statmsg(urb->status)); |
| @@ -681,11 +712,11 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs) | |||
| 681 | if (ucs->retry_cmd_in++ < BAS_RETRY) { | 712 | if (ucs->retry_cmd_in++ < BAS_RETRY) { |
| 682 | dev_notice(cs->dev, "control read: retry %d\n", | 713 | dev_notice(cs->dev, "control read: retry %d\n", |
| 683 | ucs->retry_cmd_in); | 714 | ucs->retry_cmd_in); |
| 684 | if (atread_submit(cs, BAS_TIMEOUT) >= 0) { | 715 | rc = atread_submit(cs, BAS_TIMEOUT); |
| 685 | /* resubmitted - bypass regular exit block */ | 716 | if (rc >= 0 || rc == -ENODEV) |
| 686 | spin_unlock_irqrestore(&cs->lock, flags); | 717 | /* resubmitted or disconnected */ |
| 718 | /* - bypass regular exit block */ | ||
| 687 | return; | 719 | return; |
| 688 | } | ||
| 689 | } else { | 720 | } else { |
| 690 | dev_err(cs->dev, | 721 | dev_err(cs->dev, |
| 691 | "control read: giving up after %d tries\n", | 722 | "control read: giving up after %d tries\n", |
| @@ -697,7 +728,6 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs) | |||
| 697 | kfree(ucs->rcvbuf); | 728 | kfree(ucs->rcvbuf); |
| 698 | ucs->rcvbuf = NULL; | 729 | ucs->rcvbuf = NULL; |
| 699 | ucs->rcvbuf_size = 0; | 730 | ucs->rcvbuf_size = 0; |
| 700 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 701 | if (have_data) { | 731 | if (have_data) { |
| 702 | gig_dbg(DEBUG_INTR, "%s-->BH", __func__); | 732 | gig_dbg(DEBUG_INTR, "%s-->BH", __func__); |
| 703 | gigaset_schedule_event(cs); | 733 | gigaset_schedule_event(cs); |
| @@ -719,8 +749,11 @@ static void read_iso_callback(struct urb *urb, struct pt_regs *regs) | |||
| 719 | int i, rc; | 749 | int i, rc; |
| 720 | 750 | ||
| 721 | /* status codes not worth bothering the tasklet with */ | 751 | /* status codes not worth bothering the tasklet with */ |
| 722 | if (unlikely(urb->status == -ENOENT || urb->status == -ECONNRESET || | 752 | if (unlikely(urb->status == -ENOENT || |
| 723 | urb->status == -EINPROGRESS)) { | 753 | urb->status == -ECONNRESET || |
| 754 | urb->status == -EINPROGRESS || | ||
| 755 | urb->status == -ENODEV || | ||
| 756 | urb->status == -ESHUTDOWN)) { | ||
| 724 | gig_dbg(DEBUG_ISO, "%s: %s", | 757 | gig_dbg(DEBUG_ISO, "%s: %s", |
| 725 | __func__, get_usb_statmsg(urb->status)); | 758 | __func__, get_usb_statmsg(urb->status)); |
| 726 | return; | 759 | return; |
| @@ -740,9 +773,9 @@ static void read_iso_callback(struct urb *urb, struct pt_regs *regs) | |||
| 740 | for (i = 0; i < BAS_NUMFRAMES; i++) { | 773 | for (i = 0; i < BAS_NUMFRAMES; i++) { |
| 741 | ubc->isoinlost += urb->iso_frame_desc[i].actual_length; | 774 | ubc->isoinlost += urb->iso_frame_desc[i].actual_length; |
| 742 | if (unlikely(urb->iso_frame_desc[i].status != 0 && | 775 | if (unlikely(urb->iso_frame_desc[i].status != 0 && |
| 743 | urb->iso_frame_desc[i].status != -EINPROGRESS)) { | 776 | urb->iso_frame_desc[i].status != |
| 777 | -EINPROGRESS)) | ||
| 744 | ubc->loststatus = urb->iso_frame_desc[i].status; | 778 | ubc->loststatus = urb->iso_frame_desc[i].status; |
| 745 | } | ||
| 746 | urb->iso_frame_desc[i].status = 0; | 779 | urb->iso_frame_desc[i].status = 0; |
| 747 | urb->iso_frame_desc[i].actual_length = 0; | 780 | urb->iso_frame_desc[i].actual_length = 0; |
| 748 | } | 781 | } |
| @@ -754,10 +787,10 @@ static void read_iso_callback(struct urb *urb, struct pt_regs *regs) | |||
| 754 | gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", | 787 | gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", |
| 755 | __func__); | 788 | __func__); |
| 756 | rc = usb_submit_urb(urb, SLAB_ATOMIC); | 789 | rc = usb_submit_urb(urb, SLAB_ATOMIC); |
| 757 | if (unlikely(rc != 0)) { | 790 | if (unlikely(rc != 0 && rc != -ENODEV)) { |
| 758 | dev_err(bcs->cs->dev, | 791 | dev_err(bcs->cs->dev, |
| 759 | "could not resubmit isochronous read " | 792 | "could not resubmit isochronous read " |
| 760 | "URB: %s\n", get_usb_statmsg(rc)); | 793 | "URB: %s\n", get_usb_rcmsg(rc)); |
| 761 | dump_urb(DEBUG_ISO, "isoc read", urb); | 794 | dump_urb(DEBUG_ISO, "isoc read", urb); |
| 762 | error_hangup(bcs); | 795 | error_hangup(bcs); |
| 763 | } | 796 | } |
| @@ -780,8 +813,11 @@ static void write_iso_callback(struct urb *urb, struct pt_regs *regs) | |||
| 780 | unsigned long flags; | 813 | unsigned long flags; |
| 781 | 814 | ||
| 782 | /* status codes not worth bothering the tasklet with */ | 815 | /* status codes not worth bothering the tasklet with */ |
| 783 | if (unlikely(urb->status == -ENOENT || urb->status == -ECONNRESET || | 816 | if (unlikely(urb->status == -ENOENT || |
| 784 | urb->status == -EINPROGRESS)) { | 817 | urb->status == -ECONNRESET || |
| 818 | urb->status == -EINPROGRESS || | ||
| 819 | urb->status == -ENODEV || | ||
| 820 | urb->status == -ESHUTDOWN)) { | ||
| 785 | gig_dbg(DEBUG_ISO, "%s: %s", | 821 | gig_dbg(DEBUG_ISO, "%s: %s", |
| 786 | __func__, get_usb_statmsg(urb->status)); | 822 | __func__, get_usb_statmsg(urb->status)); |
| 787 | return; | 823 | return; |
| @@ -822,7 +858,6 @@ static int starturbs(struct bc_state *bcs) | |||
| 822 | for (k = 0; k < BAS_INURBS; k++) { | 858 | for (k = 0; k < BAS_INURBS; k++) { |
| 823 | urb = ubc->isoinurbs[k]; | 859 | urb = ubc->isoinurbs[k]; |
| 824 | if (!urb) { | 860 | if (!urb) { |
| 825 | dev_err(bcs->cs->dev, "isoinurbs[%d]==NULL\n", k); | ||
| 826 | rc = -EFAULT; | 861 | rc = -EFAULT; |
| 827 | goto error; | 862 | goto error; |
| 828 | } | 863 | } |
| @@ -844,12 +879,8 @@ static int starturbs(struct bc_state *bcs) | |||
| 844 | } | 879 | } |
| 845 | 880 | ||
| 846 | dump_urb(DEBUG_ISO, "Initial isoc read", urb); | 881 | dump_urb(DEBUG_ISO, "Initial isoc read", urb); |
| 847 | if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) { | 882 | if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) |
| 848 | dev_err(bcs->cs->dev, | ||
| 849 | "could not submit isochronous read URB %d: %s\n", | ||
| 850 | k, get_usb_statmsg(rc)); | ||
| 851 | goto error; | 883 | goto error; |
| 852 | } | ||
| 853 | } | 884 | } |
| 854 | 885 | ||
| 855 | /* initialize L2 transmission */ | 886 | /* initialize L2 transmission */ |
| @@ -859,7 +890,6 @@ static int starturbs(struct bc_state *bcs) | |||
| 859 | for (k = 0; k < BAS_OUTURBS; ++k) { | 890 | for (k = 0; k < BAS_OUTURBS; ++k) { |
| 860 | urb = ubc->isoouturbs[k].urb; | 891 | urb = ubc->isoouturbs[k].urb; |
| 861 | if (!urb) { | 892 | if (!urb) { |
| 862 | dev_err(bcs->cs->dev, "isoouturbs[%d].urb==NULL\n", k); | ||
| 863 | rc = -EFAULT; | 893 | rc = -EFAULT; |
| 864 | goto error; | 894 | goto error; |
| 865 | } | 895 | } |
| @@ -885,12 +915,8 @@ static int starturbs(struct bc_state *bcs) | |||
| 885 | for (k = 0; k < 2; ++k) { | 915 | for (k = 0; k < 2; ++k) { |
| 886 | dump_urb(DEBUG_ISO, "Initial isoc write", urb); | 916 | dump_urb(DEBUG_ISO, "Initial isoc write", urb); |
| 887 | rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC); | 917 | rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC); |
| 888 | if (rc != 0) { | 918 | if (rc != 0) |
| 889 | dev_err(bcs->cs->dev, | ||
| 890 | "could not submit isochronous write URB %d: %s\n", | ||
| 891 | k, get_usb_statmsg(rc)); | ||
| 892 | goto error; | 919 | goto error; |
| 893 | } | ||
| 894 | } | 920 | } |
| 895 | dump_urb(DEBUG_ISO, "Initial isoc write (free)", urb); | 921 | dump_urb(DEBUG_ISO, "Initial isoc write (free)", urb); |
| 896 | ubc->isooutfree = &ubc->isoouturbs[2]; | 922 | ubc->isooutfree = &ubc->isoouturbs[2]; |
| @@ -916,15 +942,15 @@ static void stopurbs(struct bas_bc_state *ubc) | |||
| 916 | for (k = 0; k < BAS_INURBS; ++k) { | 942 | for (k = 0; k < BAS_INURBS; ++k) { |
| 917 | rc = usb_unlink_urb(ubc->isoinurbs[k]); | 943 | rc = usb_unlink_urb(ubc->isoinurbs[k]); |
| 918 | gig_dbg(DEBUG_ISO, | 944 | gig_dbg(DEBUG_ISO, |
| 919 | "%s: isoc input URB %d unlinked, result = %d", | 945 | "%s: isoc input URB %d unlinked, result = %s", |
| 920 | __func__, k, rc); | 946 | __func__, k, get_usb_rcmsg(rc)); |
| 921 | } | 947 | } |
| 922 | 948 | ||
| 923 | for (k = 0; k < BAS_OUTURBS; ++k) { | 949 | for (k = 0; k < BAS_OUTURBS; ++k) { |
| 924 | rc = usb_unlink_urb(ubc->isoouturbs[k].urb); | 950 | rc = usb_unlink_urb(ubc->isoouturbs[k].urb); |
| 925 | gig_dbg(DEBUG_ISO, | 951 | gig_dbg(DEBUG_ISO, |
| 926 | "%s: isoc output URB %d unlinked, result = %d", | 952 | "%s: isoc output URB %d unlinked, result = %s", |
| 927 | __func__, k, rc); | 953 | __func__, k, get_usb_rcmsg(rc)); |
| 928 | } | 954 | } |
| 929 | } | 955 | } |
| 930 | 956 | ||
| @@ -934,7 +960,7 @@ static void stopurbs(struct bas_bc_state *ubc) | |||
| 934 | /* submit_iso_write_urb | 960 | /* submit_iso_write_urb |
| 935 | * fill and submit the next isochronous write URB | 961 | * fill and submit the next isochronous write URB |
| 936 | * parameters: | 962 | * parameters: |
| 937 | * bcs B channel state structure | 963 | * ucx context structure containing URB |
| 938 | * return value: | 964 | * return value: |
| 939 | * number of frames submitted in URB | 965 | * number of frames submitted in URB |
| 940 | * 0 if URB not submitted because no data available (isooutbuf busy) | 966 | * 0 if URB not submitted because no data available (isooutbuf busy) |
| @@ -946,7 +972,6 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx) | |||
| 946 | struct bas_bc_state *ubc = ucx->bcs->hw.bas; | 972 | struct bas_bc_state *ubc = ucx->bcs->hw.bas; |
| 947 | struct usb_iso_packet_descriptor *ifd; | 973 | struct usb_iso_packet_descriptor *ifd; |
| 948 | int corrbytes, nframe, rc; | 974 | int corrbytes, nframe, rc; |
| 949 | unsigned long flags; | ||
| 950 | 975 | ||
| 951 | /* urb->dev is clobbered by USB subsystem */ | 976 | /* urb->dev is clobbered by USB subsystem */ |
| 952 | urb->dev = ucx->bcs->cs->hw.bas->udev; | 977 | urb->dev = ucx->bcs->cs->hw.bas->udev; |
| @@ -992,20 +1017,22 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx) | |||
| 992 | ifd->status = 0; | 1017 | ifd->status = 0; |
| 993 | ifd->actual_length = 0; | 1018 | ifd->actual_length = 0; |
| 994 | } | 1019 | } |
| 995 | if ((urb->number_of_packets = nframe) > 0) { | 1020 | if (unlikely(nframe == 0)) |
| 996 | spin_lock_irqsave(&ucx->bcs->cs->lock, flags); | 1021 | return 0; /* no data to send */ |
| 997 | rc = ucx->bcs->cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV; | 1022 | urb->number_of_packets = nframe; |
| 998 | spin_unlock_irqrestore(&ucx->bcs->cs->lock, flags); | ||
| 999 | 1023 | ||
| 1000 | if (rc) { | 1024 | rc = usb_submit_urb(urb, SLAB_ATOMIC); |
| 1025 | if (unlikely(rc)) { | ||
| 1026 | if (rc == -ENODEV) | ||
| 1027 | /* device removed - give up silently */ | ||
| 1028 | gig_dbg(DEBUG_ISO, "%s: disconnected", __func__); | ||
| 1029 | else | ||
| 1001 | dev_err(ucx->bcs->cs->dev, | 1030 | dev_err(ucx->bcs->cs->dev, |
| 1002 | "could not submit isochronous write URB: %s\n", | 1031 | "could not submit isochronous write URB: %s\n", |
| 1003 | get_usb_statmsg(rc)); | 1032 | get_usb_rcmsg(rc)); |
| 1004 | dump_urb(DEBUG_ISO, "isoc write", urb); | 1033 | return rc; |
| 1005 | return rc; | ||
| 1006 | } | ||
| 1007 | ++ubc->numsub; | ||
| 1008 | } | 1034 | } |
| 1035 | ++ubc->numsub; | ||
| 1009 | return nframe; | 1036 | return nframe; |
| 1010 | } | 1037 | } |
| 1011 | 1038 | ||
| @@ -1028,6 +1055,7 @@ static void write_iso_tasklet(unsigned long data) | |||
| 1028 | int i; | 1055 | int i; |
| 1029 | struct sk_buff *skb; | 1056 | struct sk_buff *skb; |
| 1030 | int len; | 1057 | int len; |
| 1058 | int rc; | ||
| 1031 | 1059 | ||
| 1032 | /* loop while completed URBs arrive in time */ | 1060 | /* loop while completed URBs arrive in time */ |
| 1033 | for (;;) { | 1061 | for (;;) { |
| @@ -1057,7 +1085,8 @@ static void write_iso_tasklet(unsigned long data) | |||
| 1057 | ubc->isooutfree = NULL; | 1085 | ubc->isooutfree = NULL; |
| 1058 | spin_unlock_irqrestore(&ubc->isooutlock, flags); | 1086 | spin_unlock_irqrestore(&ubc->isooutlock, flags); |
| 1059 | if (next) { | 1087 | if (next) { |
| 1060 | if (submit_iso_write_urb(next) <= 0) { | 1088 | rc = submit_iso_write_urb(next); |
| 1089 | if (unlikely(rc <= 0 && rc != -ENODEV)) { | ||
| 1061 | /* could not submit URB, put it back */ | 1090 | /* could not submit URB, put it back */ |
| 1062 | spin_lock_irqsave(&ubc->isooutlock, flags); | 1091 | spin_lock_irqsave(&ubc->isooutlock, flags); |
| 1063 | if (ubc->isooutfree == NULL) { | 1092 | if (ubc->isooutfree == NULL) { |
| @@ -1077,17 +1106,18 @@ static void write_iso_tasklet(unsigned long data) | |||
| 1077 | /* process completed URB */ | 1106 | /* process completed URB */ |
| 1078 | urb = done->urb; | 1107 | urb = done->urb; |
| 1079 | switch (urb->status) { | 1108 | switch (urb->status) { |
| 1109 | case -EXDEV: /* partial completion */ | ||
| 1110 | gig_dbg(DEBUG_ISO, "%s: URB partially completed", | ||
| 1111 | __func__); | ||
| 1112 | /* fall through - what's the difference anyway? */ | ||
| 1080 | case 0: /* normal completion */ | 1113 | case 0: /* normal completion */ |
| 1081 | break; | 1114 | /* inspect individual frames |
| 1082 | case -EXDEV: /* inspect individual frames */ | 1115 | * assumptions (for lack of documentation): |
| 1083 | /* assumptions (for lack of documentation): | 1116 | * - actual_length bytes of first frame in error are |
| 1084 | * - actual_length bytes of the frame in error are | ||
| 1085 | * successfully sent | 1117 | * successfully sent |
| 1086 | * - all following frames are not sent at all | 1118 | * - all following frames are not sent at all |
| 1087 | */ | 1119 | */ |
| 1088 | gig_dbg(DEBUG_ISO, "%s: URB partially completed", | 1120 | offset = done->limit; /* default (no error) */ |
| 1089 | __func__); | ||
| 1090 | offset = done->limit; /* just in case */ | ||
| 1091 | for (i = 0; i < BAS_NUMFRAMES; i++) { | 1121 | for (i = 0; i < BAS_NUMFRAMES; i++) { |
| 1092 | ifd = &urb->iso_frame_desc[i]; | 1122 | ifd = &urb->iso_frame_desc[i]; |
| 1093 | if (ifd->status || | 1123 | if (ifd->status || |
| @@ -1122,7 +1152,7 @@ static void write_iso_tasklet(unsigned long data) | |||
| 1122 | } | 1152 | } |
| 1123 | #endif | 1153 | #endif |
| 1124 | break; | 1154 | break; |
| 1125 | case -EPIPE: //FIXME is this the code for "underrun"? | 1155 | case -EPIPE: /* stall - probably underrun */ |
| 1126 | dev_err(cs->dev, "isochronous write stalled\n"); | 1156 | dev_err(cs->dev, "isochronous write stalled\n"); |
| 1127 | error_hangup(bcs); | 1157 | error_hangup(bcs); |
| 1128 | break; | 1158 | break; |
| @@ -1142,7 +1172,8 @@ static void write_iso_tasklet(unsigned long data) | |||
| 1142 | spin_unlock_irqrestore(&ubc->isooutlock, flags); | 1172 | spin_unlock_irqrestore(&ubc->isooutlock, flags); |
| 1143 | if (next) { | 1173 | if (next) { |
| 1144 | /* only one URB still active - resubmit one */ | 1174 | /* only one URB still active - resubmit one */ |
| 1145 | if (submit_iso_write_urb(next) <= 0) { | 1175 | rc = submit_iso_write_urb(next); |
| 1176 | if (unlikely(rc <= 0 && rc != -ENODEV)) { | ||
| 1146 | /* couldn't submit */ | 1177 | /* couldn't submit */ |
| 1147 | error_hangup(bcs); | 1178 | error_hangup(bcs); |
| 1148 | } | 1179 | } |
| @@ -1222,10 +1253,9 @@ static void read_iso_tasklet(unsigned long data) | |||
| 1222 | break; | 1253 | break; |
| 1223 | case -ENOENT: | 1254 | case -ENOENT: |
| 1224 | case -ECONNRESET: | 1255 | case -ECONNRESET: |
| 1225 | gig_dbg(DEBUG_ISO, "%s: URB canceled", __func__); | 1256 | case -EINPROGRESS: |
| 1226 | continue; /* -> skip */ | 1257 | gig_dbg(DEBUG_ISO, "%s: %s", |
| 1227 | case -EINPROGRESS: /* huh? */ | 1258 | __func__, get_usb_statmsg(urb->status)); |
| 1228 | gig_dbg(DEBUG_ISO, "%s: URB still pending", __func__); | ||
| 1229 | continue; /* -> skip */ | 1259 | continue; /* -> skip */ |
| 1230 | case -EPIPE: | 1260 | case -EPIPE: |
| 1231 | dev_err(cs->dev, "isochronous read stalled\n"); | 1261 | dev_err(cs->dev, "isochronous read stalled\n"); |
| @@ -1290,13 +1320,11 @@ static void read_iso_tasklet(unsigned long data) | |||
| 1290 | urb->dev = bcs->cs->hw.bas->udev; | 1320 | urb->dev = bcs->cs->hw.bas->udev; |
| 1291 | urb->transfer_flags = URB_ISO_ASAP; | 1321 | urb->transfer_flags = URB_ISO_ASAP; |
| 1292 | urb->number_of_packets = BAS_NUMFRAMES; | 1322 | urb->number_of_packets = BAS_NUMFRAMES; |
| 1293 | spin_lock_irqsave(&cs->lock, flags); | 1323 | rc = usb_submit_urb(urb, SLAB_ATOMIC); |
| 1294 | rc = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV; | 1324 | if (unlikely(rc != 0 && rc != -ENODEV)) { |
| 1295 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 1296 | if (rc) { | ||
| 1297 | dev_err(cs->dev, | 1325 | dev_err(cs->dev, |
| 1298 | "could not resubmit isochronous read URB: %s\n", | 1326 | "could not resubmit isochronous read URB: %s\n", |
| 1299 | get_usb_statmsg(rc)); | 1327 | get_usb_rcmsg(rc)); |
| 1300 | dump_urb(DEBUG_ISO, "resubmit iso read", urb); | 1328 | dump_urb(DEBUG_ISO, "resubmit iso read", urb); |
| 1301 | error_hangup(bcs); | 1329 | error_hangup(bcs); |
| 1302 | } | 1330 | } |
| @@ -1397,7 +1425,6 @@ static void write_ctrl_callback(struct urb *urb, struct pt_regs *regs) | |||
| 1397 | * timeout timeout in seconds (0: no timeout) | 1425 | * timeout timeout in seconds (0: no timeout) |
| 1398 | * return value: | 1426 | * return value: |
| 1399 | * 0 on success | 1427 | * 0 on success |
| 1400 | * -EINVAL if a NULL pointer is encountered somewhere | ||
| 1401 | * -EBUSY if another request is pending | 1428 | * -EBUSY if another request is pending |
| 1402 | * any URB submission error code | 1429 | * any URB submission error code |
| 1403 | */ | 1430 | */ |
| @@ -1418,12 +1445,6 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout) | |||
| 1418 | req, ucs->pending); | 1445 | req, ucs->pending); |
| 1419 | return -EBUSY; | 1446 | return -EBUSY; |
| 1420 | } | 1447 | } |
| 1421 | if (ucs->urb_ctrl->status == -EINPROGRESS) { | ||
| 1422 | spin_unlock_irqrestore(&ucs->lock, flags); | ||
| 1423 | dev_err(bcs->cs->dev, | ||
| 1424 | "could not submit request 0x%02x: URB busy\n", req); | ||
| 1425 | return -EBUSY; | ||
| 1426 | } | ||
| 1427 | 1448 | ||
| 1428 | ucs->dr_ctrl.bRequestType = OUT_VENDOR_REQ; | 1449 | ucs->dr_ctrl.bRequestType = OUT_VENDOR_REQ; |
| 1429 | ucs->dr_ctrl.bRequest = req; | 1450 | ucs->dr_ctrl.bRequest = req; |
| @@ -1465,22 +1486,36 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout) | |||
| 1465 | static int gigaset_init_bchannel(struct bc_state *bcs) | 1486 | static int gigaset_init_bchannel(struct bc_state *bcs) |
| 1466 | { | 1487 | { |
| 1467 | int req, ret; | 1488 | int req, ret; |
| 1489 | unsigned long flags; | ||
| 1490 | |||
| 1491 | spin_lock_irqsave(&bcs->cs->lock, flags); | ||
| 1492 | if (unlikely(!bcs->cs->connected)) { | ||
| 1493 | gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__); | ||
| 1494 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 1495 | return -ENODEV; | ||
| 1496 | } | ||
| 1468 | 1497 | ||
| 1469 | if ((ret = starturbs(bcs)) < 0) { | 1498 | if ((ret = starturbs(bcs)) < 0) { |
| 1470 | dev_err(bcs->cs->dev, | 1499 | dev_err(bcs->cs->dev, |
| 1471 | "could not start isochronous I/O for channel %d\n", | 1500 | "could not start isochronous I/O for channel B%d: %s\n", |
| 1472 | bcs->channel + 1); | 1501 | bcs->channel + 1, |
| 1473 | error_hangup(bcs); | 1502 | ret == -EFAULT ? "null URB" : get_usb_rcmsg(ret)); |
| 1503 | if (ret != -ENODEV) | ||
| 1504 | error_hangup(bcs); | ||
| 1505 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 1474 | return ret; | 1506 | return ret; |
| 1475 | } | 1507 | } |
| 1476 | 1508 | ||
| 1477 | req = bcs->channel ? HD_OPEN_B2CHANNEL : HD_OPEN_B1CHANNEL; | 1509 | req = bcs->channel ? HD_OPEN_B2CHANNEL : HD_OPEN_B1CHANNEL; |
| 1478 | if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0) { | 1510 | if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0) { |
| 1479 | dev_err(bcs->cs->dev, "could not open channel %d: %s\n", | 1511 | dev_err(bcs->cs->dev, "could not open channel B%d\n", |
| 1480 | bcs->channel + 1, get_usb_statmsg(ret)); | 1512 | bcs->channel + 1); |
| 1481 | stopurbs(bcs->hw.bas); | 1513 | stopurbs(bcs->hw.bas); |
| 1482 | error_hangup(bcs); | 1514 | if (ret != -ENODEV) |
| 1515 | error_hangup(bcs); | ||
| 1483 | } | 1516 | } |
| 1517 | |||
| 1518 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 1484 | return ret; | 1519 | return ret; |
| 1485 | } | 1520 | } |
| 1486 | 1521 | ||
| @@ -1497,19 +1532,30 @@ static int gigaset_init_bchannel(struct bc_state *bcs) | |||
| 1497 | static int gigaset_close_bchannel(struct bc_state *bcs) | 1532 | static int gigaset_close_bchannel(struct bc_state *bcs) |
| 1498 | { | 1533 | { |
| 1499 | int req, ret; | 1534 | int req, ret; |
| 1535 | unsigned long flags; | ||
| 1536 | |||
| 1537 | spin_lock_irqsave(&bcs->cs->lock, flags); | ||
| 1538 | if (unlikely(!bcs->cs->connected)) { | ||
| 1539 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 1540 | gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__); | ||
| 1541 | return -ENODEV; | ||
| 1542 | } | ||
| 1500 | 1543 | ||
| 1501 | if (!(atomic_read(&bcs->cs->hw.bas->basstate) & | 1544 | if (!(atomic_read(&bcs->cs->hw.bas->basstate) & |
| 1502 | (bcs->channel ? BS_B2OPEN : BS_B1OPEN))) { | 1545 | (bcs->channel ? BS_B2OPEN : BS_B1OPEN))) { |
| 1503 | /* channel not running: just signal common.c */ | 1546 | /* channel not running: just signal common.c */ |
| 1547 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 1504 | gigaset_bchannel_down(bcs); | 1548 | gigaset_bchannel_down(bcs); |
| 1505 | return 0; | 1549 | return 0; |
| 1506 | } | 1550 | } |
| 1507 | 1551 | ||
| 1552 | /* channel running: tell device to close it */ | ||
| 1508 | req = bcs->channel ? HD_CLOSE_B2CHANNEL : HD_CLOSE_B1CHANNEL; | 1553 | req = bcs->channel ? HD_CLOSE_B2CHANNEL : HD_CLOSE_B1CHANNEL; |
| 1509 | if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0) | 1554 | if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0) |
| 1510 | dev_err(bcs->cs->dev, | 1555 | dev_err(bcs->cs->dev, "closing channel B%d failed\n", |
| 1511 | "could not submit HD_CLOSE_BxCHANNEL request: %s\n", | 1556 | bcs->channel + 1); |
| 1512 | get_usb_statmsg(ret)); | 1557 | |
| 1558 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 1513 | return ret; | 1559 | return ret; |
| 1514 | } | 1560 | } |
| 1515 | 1561 | ||
| @@ -1545,8 +1591,6 @@ static void complete_cb(struct cardstate *cs) | |||
| 1545 | kfree(cb); | 1591 | kfree(cb); |
| 1546 | } | 1592 | } |
| 1547 | 1593 | ||
| 1548 | static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len); | ||
| 1549 | |||
| 1550 | /* write_command_callback | 1594 | /* write_command_callback |
| 1551 | * USB completion handler for AT command transmission | 1595 | * USB completion handler for AT command transmission |
| 1552 | * called by the USB subsystem in interrupt context | 1596 | * called by the USB subsystem in interrupt context |
| @@ -1560,13 +1604,17 @@ static void write_command_callback(struct urb *urb, struct pt_regs *regs) | |||
| 1560 | struct bas_cardstate *ucs = cs->hw.bas; | 1604 | struct bas_cardstate *ucs = cs->hw.bas; |
| 1561 | unsigned long flags; | 1605 | unsigned long flags; |
| 1562 | 1606 | ||
| 1607 | update_basstate(ucs, 0, BS_ATWRPEND); | ||
| 1608 | |||
| 1563 | /* check status */ | 1609 | /* check status */ |
| 1564 | switch (urb->status) { | 1610 | switch (urb->status) { |
| 1565 | case 0: /* normal completion */ | 1611 | case 0: /* normal completion */ |
| 1566 | break; | 1612 | break; |
| 1567 | case -ENOENT: /* canceled */ | 1613 | case -ENOENT: /* cancelled */ |
| 1568 | case -ECONNRESET: /* canceled (async) */ | 1614 | case -ECONNRESET: /* cancelled (async) */ |
| 1569 | case -EINPROGRESS: /* pending */ | 1615 | case -EINPROGRESS: /* pending */ |
| 1616 | case -ENODEV: /* device removed */ | ||
| 1617 | case -ESHUTDOWN: /* device shut down */ | ||
| 1570 | /* ignore silently */ | 1618 | /* ignore silently */ |
| 1571 | gig_dbg(DEBUG_USBREQ, "%s: %s", | 1619 | gig_dbg(DEBUG_USBREQ, "%s: %s", |
| 1572 | __func__, get_usb_statmsg(urb->status)); | 1620 | __func__, get_usb_statmsg(urb->status)); |
| @@ -1627,19 +1675,17 @@ static void atrdy_timeout(unsigned long data) | |||
| 1627 | * len length of command to send | 1675 | * len length of command to send |
| 1628 | * return value: | 1676 | * return value: |
| 1629 | * 0 on success | 1677 | * 0 on success |
| 1630 | * -EFAULT if a NULL pointer is encountered somewhere | ||
| 1631 | * -EBUSY if another request is pending | 1678 | * -EBUSY if another request is pending |
| 1632 | * any URB submission error code | 1679 | * any URB submission error code |
| 1633 | */ | 1680 | */ |
| 1634 | static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len) | 1681 | static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len) |
| 1635 | { | 1682 | { |
| 1636 | struct bas_cardstate *ucs = cs->hw.bas; | 1683 | struct bas_cardstate *ucs = cs->hw.bas; |
| 1637 | unsigned long flags; | 1684 | int rc; |
| 1638 | int ret; | ||
| 1639 | 1685 | ||
| 1640 | gig_dbg(DEBUG_USBREQ, "-------> HD_WRITE_ATMESSAGE (%d)", len); | 1686 | gig_dbg(DEBUG_USBREQ, "-------> HD_WRITE_ATMESSAGE (%d)", len); |
| 1641 | 1687 | ||
| 1642 | if (ucs->urb_cmd_out->status == -EINPROGRESS) { | 1688 | if (update_basstate(ucs, BS_ATWRPEND, 0) & BS_ATWRPEND) { |
| 1643 | dev_err(cs->dev, | 1689 | dev_err(cs->dev, |
| 1644 | "could not submit HD_WRITE_ATMESSAGE: URB busy\n"); | 1690 | "could not submit HD_WRITE_ATMESSAGE: URB busy\n"); |
| 1645 | return -EBUSY; | 1691 | return -EBUSY; |
| @@ -1654,29 +1700,22 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len) | |||
| 1654 | usb_sndctrlpipe(ucs->udev, 0), | 1700 | usb_sndctrlpipe(ucs->udev, 0), |
| 1655 | (unsigned char*) &ucs->dr_cmd_out, buf, len, | 1701 | (unsigned char*) &ucs->dr_cmd_out, buf, len, |
| 1656 | write_command_callback, cs); | 1702 | write_command_callback, cs); |
| 1657 | 1703 | rc = usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC); | |
| 1658 | spin_lock_irqsave(&cs->lock, flags); | 1704 | if (unlikely(rc)) { |
| 1659 | ret = cs->connected ? usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC) : -ENODEV; | 1705 | update_basstate(ucs, 0, BS_ATWRPEND); |
| 1660 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 1661 | |||
| 1662 | if (ret) { | ||
| 1663 | dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n", | 1706 | dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n", |
| 1664 | get_usb_statmsg(ret)); | 1707 | get_usb_rcmsg(rc)); |
| 1665 | return ret; | 1708 | return rc; |
| 1666 | } | 1709 | } |
| 1667 | 1710 | ||
| 1668 | /* submitted successfully */ | 1711 | /* submitted successfully, start timeout if necessary */ |
| 1669 | update_basstate(ucs, 0, BS_ATREADY); | 1712 | if (!(update_basstate(ucs, BS_ATTIMER, BS_ATREADY) & BS_ATTIMER)) { |
| 1670 | |||
| 1671 | /* start timeout if necessary */ | ||
| 1672 | if (!(atomic_read(&ucs->basstate) & BS_ATTIMER)) { | ||
| 1673 | gig_dbg(DEBUG_OUTPUT, "setting ATREADY timeout of %d/10 secs", | 1713 | gig_dbg(DEBUG_OUTPUT, "setting ATREADY timeout of %d/10 secs", |
| 1674 | ATRDY_TIMEOUT); | 1714 | ATRDY_TIMEOUT); |
| 1675 | ucs->timer_atrdy.expires = jiffies + ATRDY_TIMEOUT * HZ / 10; | 1715 | ucs->timer_atrdy.expires = jiffies + ATRDY_TIMEOUT * HZ / 10; |
| 1676 | ucs->timer_atrdy.data = (unsigned long) cs; | 1716 | ucs->timer_atrdy.data = (unsigned long) cs; |
| 1677 | ucs->timer_atrdy.function = atrdy_timeout; | 1717 | ucs->timer_atrdy.function = atrdy_timeout; |
| 1678 | add_timer(&ucs->timer_atrdy); | 1718 | add_timer(&ucs->timer_atrdy); |
| 1679 | update_basstate(ucs, BS_ATTIMER, 0); | ||
| 1680 | } | 1719 | } |
| 1681 | return 0; | 1720 | return 0; |
| 1682 | } | 1721 | } |
| @@ -1702,7 +1741,6 @@ static int start_cbsend(struct cardstate *cs) | |||
| 1702 | gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD, "AT channel not open"); | 1741 | gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD, "AT channel not open"); |
| 1703 | rc = req_submit(cs->bcs, HD_OPEN_ATCHANNEL, 0, BAS_TIMEOUT); | 1742 | rc = req_submit(cs->bcs, HD_OPEN_ATCHANNEL, 0, BAS_TIMEOUT); |
| 1704 | if (rc < 0) { | 1743 | if (rc < 0) { |
| 1705 | dev_err(cs->dev, "could not open AT channel\n"); | ||
| 1706 | /* flush command queue */ | 1744 | /* flush command queue */ |
| 1707 | spin_lock_irqsave(&cs->cmdlock, flags); | 1745 | spin_lock_irqsave(&cs->cmdlock, flags); |
| 1708 | while (cs->cmdbuf != NULL) | 1746 | while (cs->cmdbuf != NULL) |
| @@ -1786,8 +1824,14 @@ static int gigaset_write_cmd(struct cardstate *cs, | |||
| 1786 | cs->lastcmdbuf = cb; | 1824 | cs->lastcmdbuf = cb; |
| 1787 | spin_unlock_irqrestore(&cs->cmdlock, flags); | 1825 | spin_unlock_irqrestore(&cs->cmdlock, flags); |
| 1788 | 1826 | ||
| 1827 | spin_lock_irqsave(&cs->lock, flags); | ||
| 1828 | if (unlikely(!cs->connected)) { | ||
| 1829 | spin_unlock_irqrestore(&cs->lock, flags); | ||
| 1830 | gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__); | ||
| 1831 | return -ENODEV; | ||
| 1832 | } | ||
| 1789 | status = start_cbsend(cs); | 1833 | status = start_cbsend(cs); |
| 1790 | 1834 | spin_unlock_irqrestore(&cs->lock, flags); | |
| 1791 | return status < 0 ? status : len; | 1835 | return status < 0 ? status : len; |
| 1792 | } | 1836 | } |
| 1793 | 1837 | ||
| @@ -1849,12 +1893,32 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6]) | |||
| 1849 | */ | 1893 | */ |
| 1850 | static int gigaset_freebcshw(struct bc_state *bcs) | 1894 | static int gigaset_freebcshw(struct bc_state *bcs) |
| 1851 | { | 1895 | { |
| 1852 | if (!bcs->hw.bas) | 1896 | struct bas_bc_state *ubc = bcs->hw.bas; |
| 1897 | int i; | ||
| 1898 | |||
| 1899 | if (!ubc) | ||
| 1853 | return 0; | 1900 | return 0; |
| 1854 | 1901 | ||
| 1855 | if (bcs->hw.bas->isooutbuf) | 1902 | /* kill URBs and tasklets before freeing - better safe than sorry */ |
| 1856 | kfree(bcs->hw.bas->isooutbuf); | 1903 | atomic_set(&ubc->running, 0); |
| 1857 | kfree(bcs->hw.bas); | 1904 | for (i = 0; i < BAS_OUTURBS; ++i) |
| 1905 | if (ubc->isoouturbs[i].urb) { | ||
| 1906 | gig_dbg(DEBUG_INIT, "%s: killing iso out URB %d", | ||
| 1907 | __func__, i); | ||
| 1908 | usb_kill_urb(ubc->isoouturbs[i].urb); | ||
| 1909 | usb_free_urb(ubc->isoouturbs[i].urb); | ||
| 1910 | } | ||
| 1911 | for (i = 0; i < BAS_INURBS; ++i) | ||
| 1912 | if (ubc->isoinurbs[i]) { | ||
| 1913 | gig_dbg(DEBUG_INIT, "%s: killing iso in URB %d", | ||
| 1914 | __func__, i); | ||
| 1915 | usb_kill_urb(ubc->isoinurbs[i]); | ||
| 1916 | usb_free_urb(ubc->isoinurbs[i]); | ||
| 1917 | } | ||
| 1918 | tasklet_kill(&ubc->sent_tasklet); | ||
| 1919 | tasklet_kill(&ubc->rcvd_tasklet); | ||
| 1920 | kfree(ubc->isooutbuf); | ||
| 1921 | kfree(ubc); | ||
| 1858 | bcs->hw.bas = NULL; | 1922 | bcs->hw.bas = NULL; |
| 1859 | return 1; | 1923 | return 1; |
| 1860 | } | 1924 | } |
| @@ -1931,13 +1995,9 @@ static void gigaset_reinitbcshw(struct bc_state *bcs) | |||
| 1931 | 1995 | ||
| 1932 | static void gigaset_freecshw(struct cardstate *cs) | 1996 | static void gigaset_freecshw(struct cardstate *cs) |
| 1933 | { | 1997 | { |
| 1934 | struct bas_cardstate *ucs = cs->hw.bas; | 1998 | /* timers, URBs and rcvbuf are disposed of in disconnect */ |
| 1935 | |||
| 1936 | del_timer(&ucs->timer_ctrl); | ||
| 1937 | del_timer(&ucs->timer_atrdy); | ||
| 1938 | del_timer(&ucs->timer_cmd_in); | ||
| 1939 | |||
| 1940 | kfree(cs->hw.bas); | 1999 | kfree(cs->hw.bas); |
| 2000 | cs->hw.bas = NULL; | ||
| 1941 | } | 2001 | } |
| 1942 | 2002 | ||
| 1943 | static int gigaset_initcshw(struct cardstate *cs) | 2003 | static int gigaset_initcshw(struct cardstate *cs) |
| @@ -2041,23 +2101,13 @@ static int gigaset_probe(struct usb_interface *interface, | |||
| 2041 | struct bas_bc_state *ubc; | 2101 | struct bas_bc_state *ubc; |
| 2042 | struct usb_endpoint_descriptor *endpoint; | 2102 | struct usb_endpoint_descriptor *endpoint; |
| 2043 | int i, j; | 2103 | int i, j; |
| 2044 | int ret; | 2104 | int rc; |
| 2045 | 2105 | ||
| 2046 | gig_dbg(DEBUG_ANY, | 2106 | gig_dbg(DEBUG_ANY, |
| 2047 | "%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)", | 2107 | "%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)", |
| 2048 | __func__, le16_to_cpu(udev->descriptor.idVendor), | 2108 | __func__, le16_to_cpu(udev->descriptor.idVendor), |
| 2049 | le16_to_cpu(udev->descriptor.idProduct)); | 2109 | le16_to_cpu(udev->descriptor.idProduct)); |
| 2050 | 2110 | ||
| 2051 | /* See if the device offered us matches what we can accept */ | ||
| 2052 | if ((le16_to_cpu(udev->descriptor.idVendor) != USB_GIGA_VENDOR_ID) || | ||
| 2053 | (le16_to_cpu(udev->descriptor.idProduct) != USB_GIGA_PRODUCT_ID && | ||
| 2054 | le16_to_cpu(udev->descriptor.idProduct) != USB_4175_PRODUCT_ID && | ||
| 2055 | le16_to_cpu(udev->descriptor.idProduct) != USB_SX303_PRODUCT_ID && | ||
| 2056 | le16_to_cpu(udev->descriptor.idProduct) != USB_SX353_PRODUCT_ID)) { | ||
| 2057 | gig_dbg(DEBUG_ANY, "%s: unmatched ID - exiting", __func__); | ||
| 2058 | return -ENODEV; | ||
| 2059 | } | ||
| 2060 | |||
| 2061 | /* set required alternate setting */ | 2111 | /* set required alternate setting */ |
| 2062 | hostif = interface->cur_altsetting; | 2112 | hostif = interface->cur_altsetting; |
| 2063 | if (hostif->desc.bAlternateSetting != 3) { | 2113 | if (hostif->desc.bAlternateSetting != 3) { |
| @@ -2105,45 +2155,22 @@ static int gigaset_probe(struct usb_interface *interface, | |||
| 2105 | * - three for the different uses of the default control pipe | 2155 | * - three for the different uses of the default control pipe |
| 2106 | * - three for each isochronous pipe | 2156 | * - three for each isochronous pipe |
| 2107 | */ | 2157 | */ |
| 2108 | ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL); | 2158 | if (!(ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL)) || |
| 2109 | if (!ucs->urb_int_in) { | 2159 | !(ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL)) || |
| 2110 | dev_err(cs->dev, "no free urbs available\n"); | 2160 | !(ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL)) || |
| 2111 | goto error; | 2161 | !(ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL))) |
| 2112 | } | 2162 | goto allocerr; |
| 2113 | ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL); | ||
| 2114 | if (!ucs->urb_cmd_in) { | ||
| 2115 | dev_err(cs->dev, "no free urbs available\n"); | ||
| 2116 | goto error; | ||
| 2117 | } | ||
| 2118 | ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL); | ||
| 2119 | if (!ucs->urb_cmd_out) { | ||
| 2120 | dev_err(cs->dev, "no free urbs available\n"); | ||
| 2121 | goto error; | ||
| 2122 | } | ||
| 2123 | ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL); | ||
| 2124 | if (!ucs->urb_ctrl) { | ||
| 2125 | dev_err(cs->dev, "no free urbs available\n"); | ||
| 2126 | goto error; | ||
| 2127 | } | ||
| 2128 | 2163 | ||
| 2129 | for (j = 0; j < 2; ++j) { | 2164 | for (j = 0; j < 2; ++j) { |
| 2130 | ubc = cs->bcs[j].hw.bas; | 2165 | ubc = cs->bcs[j].hw.bas; |
| 2131 | for (i = 0; i < BAS_OUTURBS; ++i) { | 2166 | for (i = 0; i < BAS_OUTURBS; ++i) |
| 2132 | ubc->isoouturbs[i].urb = | 2167 | if (!(ubc->isoouturbs[i].urb = |
| 2133 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL); | 2168 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL))) |
| 2134 | if (!ubc->isoouturbs[i].urb) { | 2169 | goto allocerr; |
| 2135 | dev_err(cs->dev, "no free urbs available\n"); | 2170 | for (i = 0; i < BAS_INURBS; ++i) |
| 2136 | goto error; | 2171 | if (!(ubc->isoinurbs[i] = |
| 2137 | } | 2172 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL))) |
| 2138 | } | 2173 | goto allocerr; |
| 2139 | for (i = 0; i < BAS_INURBS; ++i) { | ||
| 2140 | ubc->isoinurbs[i] = | ||
| 2141 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL); | ||
| 2142 | if (!ubc->isoinurbs[i]) { | ||
| 2143 | dev_err(cs->dev, "no free urbs available\n"); | ||
| 2144 | goto error; | ||
| 2145 | } | ||
| 2146 | } | ||
| 2147 | } | 2174 | } |
| 2148 | 2175 | ||
| 2149 | ucs->rcvbuf = NULL; | 2176 | ucs->rcvbuf = NULL; |
| @@ -2156,15 +2183,14 @@ static int gigaset_probe(struct usb_interface *interface, | |||
| 2156 | (endpoint->bEndpointAddress) & 0x0f), | 2183 | (endpoint->bEndpointAddress) & 0x0f), |
| 2157 | ucs->int_in_buf, 3, read_int_callback, cs, | 2184 | ucs->int_in_buf, 3, read_int_callback, cs, |
| 2158 | endpoint->bInterval); | 2185 | endpoint->bInterval); |
| 2159 | ret = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL); | 2186 | if ((rc = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL)) != 0) { |
| 2160 | if (ret) { | ||
| 2161 | dev_err(cs->dev, "could not submit interrupt URB: %s\n", | 2187 | dev_err(cs->dev, "could not submit interrupt URB: %s\n", |
| 2162 | get_usb_statmsg(ret)); | 2188 | get_usb_rcmsg(rc)); |
| 2163 | goto error; | 2189 | goto error; |
| 2164 | } | 2190 | } |
| 2165 | 2191 | ||
| 2166 | /* tell the device that the driver is ready */ | 2192 | /* tell the device that the driver is ready */ |
| 2167 | if ((ret = req_submit(cs->bcs, HD_DEVICE_INIT_ACK, 0, 0)) != 0) | 2193 | if ((rc = req_submit(cs->bcs, HD_DEVICE_INIT_ACK, 0, 0)) != 0) |
| 2168 | goto error; | 2194 | goto error; |
| 2169 | 2195 | ||
| 2170 | /* tell common part that the device is ready */ | 2196 | /* tell common part that the device is ready */ |
| @@ -2179,6 +2205,8 @@ static int gigaset_probe(struct usb_interface *interface, | |||
| 2179 | 2205 | ||
| 2180 | return 0; | 2206 | return 0; |
| 2181 | 2207 | ||
| 2208 | allocerr: | ||
| 2209 | dev_err(cs->dev, "could not allocate URBs\n"); | ||
| 2182 | error: | 2210 | error: |
| 2183 | freeurbs(cs); | 2211 | freeurbs(cs); |
| 2184 | usb_set_intfdata(interface, NULL); | 2212 | usb_set_intfdata(interface, NULL); |
| @@ -2193,19 +2221,34 @@ static void gigaset_disconnect(struct usb_interface *interface) | |||
| 2193 | { | 2221 | { |
| 2194 | struct cardstate *cs; | 2222 | struct cardstate *cs; |
| 2195 | struct bas_cardstate *ucs; | 2223 | struct bas_cardstate *ucs; |
| 2224 | int j; | ||
| 2196 | 2225 | ||
| 2197 | cs = usb_get_intfdata(interface); | 2226 | cs = usb_get_intfdata(interface); |
| 2198 | 2227 | ||
| 2199 | ucs = cs->hw.bas; | 2228 | ucs = cs->hw.bas; |
| 2200 | 2229 | ||
| 2201 | dev_info(cs->dev, "disconnecting Gigaset base\n"); | 2230 | dev_info(cs->dev, "disconnecting Gigaset base\n"); |
| 2231 | |||
| 2232 | /* mark base as not ready, all channels disconnected */ | ||
| 2233 | atomic_set(&ucs->basstate, 0); | ||
| 2234 | |||
| 2235 | /* tell LL all channels are down */ | ||
| 2236 | //FIXME shouldn't gigaset_stop() do this? | ||
| 2237 | for (j = 0; j < 2; ++j) | ||
| 2238 | gigaset_bchannel_down(cs->bcs + j); | ||
| 2239 | |||
| 2240 | /* stop driver (common part) */ | ||
| 2202 | gigaset_stop(cs); | 2241 | gigaset_stop(cs); |
| 2242 | |||
| 2243 | /* stop timers and URBs, free ressources */ | ||
| 2244 | del_timer_sync(&ucs->timer_ctrl); | ||
| 2245 | del_timer_sync(&ucs->timer_atrdy); | ||
| 2246 | del_timer_sync(&ucs->timer_cmd_in); | ||
| 2203 | freeurbs(cs); | 2247 | freeurbs(cs); |
| 2204 | usb_set_intfdata(interface, NULL); | 2248 | usb_set_intfdata(interface, NULL); |
| 2205 | kfree(ucs->rcvbuf); | 2249 | kfree(ucs->rcvbuf); |
| 2206 | ucs->rcvbuf = NULL; | 2250 | ucs->rcvbuf = NULL; |
| 2207 | ucs->rcvbuf_size = 0; | 2251 | ucs->rcvbuf_size = 0; |
| 2208 | atomic_set(&ucs->basstate, 0); | ||
| 2209 | usb_put_dev(ucs->udev); | 2252 | usb_put_dev(ucs->udev); |
| 2210 | ucs->interface = NULL; | 2253 | ucs->interface = NULL; |
| 2211 | ucs->udev = NULL; | 2254 | ucs->udev = NULL; |
| @@ -2277,6 +2320,8 @@ error: if (cardstate) | |||
| 2277 | */ | 2320 | */ |
| 2278 | static void __exit bas_gigaset_exit(void) | 2321 | static void __exit bas_gigaset_exit(void) |
| 2279 | { | 2322 | { |
| 2323 | struct bas_cardstate *ucs = cardstate->hw.bas; | ||
| 2324 | |||
| 2280 | gigaset_blockdriver(driver); /* => probe will fail | 2325 | gigaset_blockdriver(driver); /* => probe will fail |
| 2281 | * => no gigaset_start any more | 2326 | * => no gigaset_start any more |
| 2282 | */ | 2327 | */ |
| @@ -2284,14 +2329,26 @@ static void __exit bas_gigaset_exit(void) | |||
| 2284 | gigaset_shutdown(cardstate); | 2329 | gigaset_shutdown(cardstate); |
| 2285 | /* from now on, no isdn callback should be possible */ | 2330 | /* from now on, no isdn callback should be possible */ |
| 2286 | 2331 | ||
| 2287 | if (atomic_read(&cardstate->hw.bas->basstate) & BS_ATOPEN) { | 2332 | /* close all still open channels */ |
| 2288 | gig_dbg(DEBUG_ANY, "closing AT channel"); | 2333 | if (atomic_read(&ucs->basstate) & BS_B1OPEN) { |
| 2289 | if (req_submit(cardstate->bcs, | 2334 | gig_dbg(DEBUG_INIT, "closing B1 channel"); |
| 2290 | HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT) >= 0) { | 2335 | usb_control_msg(ucs->udev, usb_sndctrlpipe(ucs->udev, 0), |
| 2291 | /* successfully submitted */ | 2336 | HD_CLOSE_B1CHANNEL, OUT_VENDOR_REQ, 0, 0, |
| 2292 | //FIXME wait for completion? | 2337 | NULL, 0, BAS_TIMEOUT); |
| 2293 | } | 2338 | } |
| 2339 | if (atomic_read(&ucs->basstate) & BS_B2OPEN) { | ||
| 2340 | gig_dbg(DEBUG_INIT, "closing B2 channel"); | ||
| 2341 | usb_control_msg(ucs->udev, usb_sndctrlpipe(ucs->udev, 0), | ||
| 2342 | HD_CLOSE_B2CHANNEL, OUT_VENDOR_REQ, 0, 0, | ||
| 2343 | NULL, 0, BAS_TIMEOUT); | ||
| 2344 | } | ||
| 2345 | if (atomic_read(&ucs->basstate) & BS_ATOPEN) { | ||
| 2346 | gig_dbg(DEBUG_INIT, "closing AT channel"); | ||
| 2347 | usb_control_msg(ucs->udev, usb_sndctrlpipe(ucs->udev, 0), | ||
| 2348 | HD_CLOSE_ATCHANNEL, OUT_VENDOR_REQ, 0, 0, | ||
| 2349 | NULL, 0, BAS_TIMEOUT); | ||
| 2294 | } | 2350 | } |
| 2351 | atomic_set(&ucs->basstate, 0); | ||
| 2295 | 2352 | ||
| 2296 | /* deregister this driver with the USB subsystem */ | 2353 | /* deregister this driver with the USB subsystem */ |
| 2297 | usb_deregister(&gigaset_usb_driver); | 2354 | usb_deregister(&gigaset_usb_driver); |
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c index 749b3da1236e..e55767b2ccd3 100644 --- a/drivers/isdn/gigaset/common.c +++ b/drivers/isdn/gigaset/common.c | |||
| @@ -781,8 +781,7 @@ error: if (cs) | |||
| 781 | } | 781 | } |
| 782 | EXPORT_SYMBOL_GPL(gigaset_initcs); | 782 | EXPORT_SYMBOL_GPL(gigaset_initcs); |
| 783 | 783 | ||
| 784 | /* ReInitialize the b-channel structure */ | 784 | /* ReInitialize the b-channel structure on hangup */ |
| 785 | /* e.g. called on hangup, disconnect */ | ||
| 786 | void gigaset_bcs_reinit(struct bc_state *bcs) | 785 | void gigaset_bcs_reinit(struct bc_state *bcs) |
| 787 | { | 786 | { |
| 788 | struct sk_buff *skb; | 787 | struct sk_buff *skb; |
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index 1ba3424a286b..18e05c09b71c 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c | |||
| @@ -373,6 +373,9 @@ struct reply_t gigaset_tab_cid_m10x[] = /* for M10x */ | |||
| 373 | 373 | ||
| 374 | {EV_TIMEOUT, 750,750, -1, 0, 0, {ACT_CONNTIMEOUT}}, | 374 | {EV_TIMEOUT, 750,750, -1, 0, 0, {ACT_CONNTIMEOUT}}, |
| 375 | 375 | ||
| 376 | /* B channel closed (general case) */ | ||
| 377 | {EV_BC_CLOSED, -1, -1, -1, -1,-1, {ACT_NOTIFY_BC_DOWN}}, //FIXME | ||
| 378 | |||
| 376 | /* misc. */ | 379 | /* misc. */ |
| 377 | {EV_PROTO_L2, -1, -1, -1, -1,-1, {ACT_PROTO_L2}}, //FIXME | 380 | {EV_PROTO_L2, -1, -1, -1, -1,-1, {ACT_PROTO_L2}}, //FIXME |
| 378 | 381 | ||
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index 9d21ba8757b0..22b9693f7c0a 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h | |||
| @@ -75,7 +75,7 @@ extern int gigaset_debuglevel; /* "needs" cast to (enum debuglevel) */ | |||
| 75 | * e.g. 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and | 75 | * e.g. 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and |
| 76 | * DEBUG_INTR. | 76 | * DEBUG_INTR. |
| 77 | */ | 77 | */ |
| 78 | enum debuglevel { /* up to 24 bits (atomic_t) */ | 78 | enum debuglevel { |
| 79 | DEBUG_REG = 0x0002, /* serial port I/O register operations */ | 79 | DEBUG_REG = 0x0002, /* serial port I/O register operations */ |
| 80 | DEBUG_OPEN = 0x0004, /* open/close serial port */ | 80 | DEBUG_OPEN = 0x0004, /* open/close serial port */ |
| 81 | DEBUG_INTR = 0x0008, /* interrupt processing */ | 81 | DEBUG_INTR = 0x0008, /* interrupt processing */ |
| @@ -141,7 +141,7 @@ enum debuglevel { /* up to 24 bits (atomic_t) */ | |||
| 141 | printk(KERN_DEBUG KBUILD_MODNAME ": " format "\n", \ | 141 | printk(KERN_DEBUG KBUILD_MODNAME ": " format "\n", \ |
| 142 | ## arg); \ | 142 | ## arg); \ |
| 143 | } while (0) | 143 | } while (0) |
| 144 | #define DEBUG_DEFAULT (DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ) | 144 | #define DEBUG_DEFAULT (DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ) |
| 145 | 145 | ||
| 146 | #else | 146 | #else |
| 147 | 147 | ||
| @@ -627,8 +627,7 @@ struct gigaset_ops { | |||
| 627 | /* Called by gigaset_freecs() for freeing bcs->hw.xxx */ | 627 | /* Called by gigaset_freecs() for freeing bcs->hw.xxx */ |
| 628 | int (*freebcshw)(struct bc_state *bcs); | 628 | int (*freebcshw)(struct bc_state *bcs); |
| 629 | 629 | ||
| 630 | /* Called by gigaset_stop() or gigaset_bchannel_down() for resetting | 630 | /* Called by gigaset_bchannel_down() for resetting bcs->hw.xxx */ |
| 631 | bcs->hw.xxx */ | ||
| 632 | void (*reinitbcshw)(struct bc_state *bcs); | 631 | void (*reinitbcshw)(struct bc_state *bcs); |
| 633 | 632 | ||
| 634 | /* Called by gigaset_initcs() for setting up cs->hw.xxx */ | 633 | /* Called by gigaset_initcs() for setting up cs->hw.xxx */ |
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c index 0815dbfb8291..1654fa413575 100644 --- a/drivers/isdn/gigaset/i4l.c +++ b/drivers/isdn/gigaset/i4l.c | |||
| @@ -73,7 +73,7 @@ static int writebuf_from_LL(int driverID, int channel, int ack, | |||
| 73 | len, skblen, (unsigned) skb->head[0], (unsigned) skb->head[1]); | 73 | len, skblen, (unsigned) skb->head[0], (unsigned) skb->head[1]); |
| 74 | 74 | ||
| 75 | /* pass to device-specific module */ | 75 | /* pass to device-specific module */ |
| 76 | return cs->ops->send_skb(bcs, skb); //FIXME cs->ops->send_skb() must handle !cs->connected correctly | 76 | return cs->ops->send_skb(bcs, skb); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb) | 79 | void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb) |
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c index 45f017ed6e8c..8667daaa1a82 100644 --- a/drivers/isdn/gigaset/isocdata.c +++ b/drivers/isdn/gigaset/isocdata.c | |||
| @@ -992,14 +992,18 @@ int gigaset_isoc_send_skb(struct bc_state *bcs, struct sk_buff *skb) | |||
| 992 | int len = skb->len; | 992 | int len = skb->len; |
| 993 | unsigned long flags; | 993 | unsigned long flags; |
| 994 | 994 | ||
| 995 | spin_lock_irqsave(&bcs->cs->lock, flags); | ||
| 996 | if (!bcs->cs->connected) { | ||
| 997 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | ||
| 998 | return -ENODEV; | ||
| 999 | } | ||
| 1000 | |||
| 995 | skb_queue_tail(&bcs->squeue, skb); | 1001 | skb_queue_tail(&bcs->squeue, skb); |
| 996 | gig_dbg(DEBUG_ISO, "%s: skb queued, qlen=%d", | 1002 | gig_dbg(DEBUG_ISO, "%s: skb queued, qlen=%d", |
| 997 | __func__, skb_queue_len(&bcs->squeue)); | 1003 | __func__, skb_queue_len(&bcs->squeue)); |
| 998 | 1004 | ||
| 999 | /* tasklet submits URB if necessary */ | 1005 | /* tasklet submits URB if necessary */ |
| 1000 | spin_lock_irqsave(&bcs->cs->lock, flags); | 1006 | tasklet_schedule(&bcs->hw.bas->sent_tasklet); |
| 1001 | if (bcs->cs->connected) | ||
| 1002 | tasklet_schedule(&bcs->hw.bas->sent_tasklet); | ||
| 1003 | spin_unlock_irqrestore(&bcs->cs->lock, flags); | 1007 | spin_unlock_irqrestore(&bcs->cs->lock, flags); |
| 1004 | 1008 | ||
| 1005 | return len; /* ok so far */ | 1009 | return len; /* ok so far */ |
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index eb9a8826e9b5..eb42cb349420 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
| @@ -65,11 +65,6 @@ struct pxamci_host { | |||
| 65 | unsigned int dma_dir; | 65 | unsigned int dma_dir; |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | static inline unsigned int ns_to_clocks(unsigned int ns) | ||
| 69 | { | ||
| 70 | return (ns * (CLOCKRATE / 1000000) + 999) / 1000; | ||
| 71 | } | ||
| 72 | |||
| 73 | static void pxamci_stop_clock(struct pxamci_host *host) | 68 | static void pxamci_stop_clock(struct pxamci_host *host) |
| 74 | { | 69 | { |
| 75 | if (readl(host->base + MMC_STAT) & STAT_CLK_EN) { | 70 | if (readl(host->base + MMC_STAT) & STAT_CLK_EN) { |
| @@ -113,6 +108,7 @@ static void pxamci_disable_irq(struct pxamci_host *host, unsigned int mask) | |||
| 113 | static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | 108 | static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) |
| 114 | { | 109 | { |
| 115 | unsigned int nob = data->blocks; | 110 | unsigned int nob = data->blocks; |
| 111 | unsigned long long clks; | ||
| 116 | unsigned int timeout; | 112 | unsigned int timeout; |
| 117 | u32 dcmd; | 113 | u32 dcmd; |
| 118 | int i; | 114 | int i; |
| @@ -125,7 +121,9 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 125 | writel(nob, host->base + MMC_NOB); | 121 | writel(nob, host->base + MMC_NOB); |
| 126 | writel(1 << data->blksz_bits, host->base + MMC_BLKLEN); | 122 | writel(1 << data->blksz_bits, host->base + MMC_BLKLEN); |
| 127 | 123 | ||
| 128 | timeout = ns_to_clocks(data->timeout_ns) + data->timeout_clks; | 124 | clks = (unsigned long long)data->timeout_ns * CLOCKRATE; |
| 125 | do_div(clks, 1000000000UL); | ||
| 126 | timeout = (unsigned int)clks + (data->timeout_clks << host->clkrt); | ||
| 129 | writel((timeout + 255) / 256, host->base + MMC_RDTO); | 127 | writel((timeout + 255) / 256, host->base + MMC_RDTO); |
| 130 | 128 | ||
| 131 | if (data->flags & MMC_DATA_READ) { | 129 | if (data->flags & MMC_DATA_READ) { |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index add8dc4aa7b0..c99e87838f92 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -3768,6 +3768,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, | |||
| 3768 | ps_page->ps_page[j] = NULL; | 3768 | ps_page->ps_page[j] = NULL; |
| 3769 | skb->len += length; | 3769 | skb->len += length; |
| 3770 | skb->data_len += length; | 3770 | skb->data_len += length; |
| 3771 | skb->truesize += length; | ||
| 3771 | } | 3772 | } |
| 3772 | 3773 | ||
| 3773 | copydone: | 3774 | copydone: |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 7627a75f4f7c..9788b1ef2e7d 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -105,6 +105,7 @@ | |||
| 105 | * 0.50: 20 Jan 2006: Add 8021pq tagging support. | 105 | * 0.50: 20 Jan 2006: Add 8021pq tagging support. |
| 106 | * 0.51: 20 Jan 2006: Add 64bit consistent memory allocation for rings. | 106 | * 0.51: 20 Jan 2006: Add 64bit consistent memory allocation for rings. |
| 107 | * 0.52: 20 Jan 2006: Add MSI/MSIX support. | 107 | * 0.52: 20 Jan 2006: Add MSI/MSIX support. |
| 108 | * 0.53: 19 Mar 2006: Fix init from low power mode and add hw reset. | ||
| 108 | * | 109 | * |
| 109 | * Known bugs: | 110 | * Known bugs: |
| 110 | * We suspect that on some hardware no TX done interrupts are generated. | 111 | * We suspect that on some hardware no TX done interrupts are generated. |
| @@ -116,7 +117,7 @@ | |||
| 116 | * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few | 117 | * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few |
| 117 | * superfluous timer interrupts from the nic. | 118 | * superfluous timer interrupts from the nic. |
| 118 | */ | 119 | */ |
| 119 | #define FORCEDETH_VERSION "0.52" | 120 | #define FORCEDETH_VERSION "0.53" |
| 120 | #define DRV_NAME "forcedeth" | 121 | #define DRV_NAME "forcedeth" |
| 121 | 122 | ||
| 122 | #include <linux/module.h> | 123 | #include <linux/module.h> |
| @@ -160,6 +161,7 @@ | |||
| 160 | #define DEV_HAS_VLAN 0x0020 /* device supports vlan tagging and striping */ | 161 | #define DEV_HAS_VLAN 0x0020 /* device supports vlan tagging and striping */ |
| 161 | #define DEV_HAS_MSI 0x0040 /* device supports MSI */ | 162 | #define DEV_HAS_MSI 0x0040 /* device supports MSI */ |
| 162 | #define DEV_HAS_MSI_X 0x0080 /* device supports MSI-X */ | 163 | #define DEV_HAS_MSI_X 0x0080 /* device supports MSI-X */ |
| 164 | #define DEV_HAS_POWER_CNTRL 0x0100 /* device supports power savings */ | ||
| 163 | 165 | ||
| 164 | enum { | 166 | enum { |
| 165 | NvRegIrqStatus = 0x000, | 167 | NvRegIrqStatus = 0x000, |
| @@ -203,6 +205,8 @@ enum { | |||
| 203 | #define NVREG_MISC1_HD 0x02 | 205 | #define NVREG_MISC1_HD 0x02 |
| 204 | #define NVREG_MISC1_FORCE 0x3b0f3c | 206 | #define NVREG_MISC1_FORCE 0x3b0f3c |
| 205 | 207 | ||
| 208 | NvRegMacReset = 0x3c, | ||
| 209 | #define NVREG_MAC_RESET_ASSERT 0x0F3 | ||
| 206 | NvRegTransmitterControl = 0x084, | 210 | NvRegTransmitterControl = 0x084, |
| 207 | #define NVREG_XMITCTL_START 0x01 | 211 | #define NVREG_XMITCTL_START 0x01 |
| 208 | NvRegTransmitterStatus = 0x088, | 212 | NvRegTransmitterStatus = 0x088, |
| @@ -326,6 +330,10 @@ enum { | |||
| 326 | NvRegMSIXMap0 = 0x3e0, | 330 | NvRegMSIXMap0 = 0x3e0, |
| 327 | NvRegMSIXMap1 = 0x3e4, | 331 | NvRegMSIXMap1 = 0x3e4, |
| 328 | NvRegMSIXIrqStatus = 0x3f0, | 332 | NvRegMSIXIrqStatus = 0x3f0, |
| 333 | |||
| 334 | NvRegPowerState2 = 0x600, | ||
| 335 | #define NVREG_POWERSTATE2_POWERUP_MASK 0x0F11 | ||
| 336 | #define NVREG_POWERSTATE2_POWERUP_REV_A3 0x0001 | ||
| 329 | }; | 337 | }; |
| 330 | 338 | ||
| 331 | /* Big endian: should work, but is untested */ | 339 | /* Big endian: should work, but is untested */ |
| @@ -414,7 +422,8 @@ typedef union _ring_type { | |||
| 414 | #define NV_RX3_VLAN_TAG_MASK (0x0000FFFF) | 422 | #define NV_RX3_VLAN_TAG_MASK (0x0000FFFF) |
| 415 | 423 | ||
| 416 | /* Miscelaneous hardware related defines: */ | 424 | /* Miscelaneous hardware related defines: */ |
| 417 | #define NV_PCI_REGSZ 0x270 | 425 | #define NV_PCI_REGSZ_VER1 0x270 |
| 426 | #define NV_PCI_REGSZ_VER2 0x604 | ||
| 418 | 427 | ||
| 419 | /* various timeout delays: all in usec */ | 428 | /* various timeout delays: all in usec */ |
| 420 | #define NV_TXRX_RESET_DELAY 4 | 429 | #define NV_TXRX_RESET_DELAY 4 |
| @@ -431,6 +440,7 @@ typedef union _ring_type { | |||
| 431 | #define NV_MIIBUSY_DELAY 50 | 440 | #define NV_MIIBUSY_DELAY 50 |
| 432 | #define NV_MIIPHY_DELAY 10 | 441 | #define NV_MIIPHY_DELAY 10 |
| 433 | #define NV_MIIPHY_DELAYMAX 10000 | 442 | #define NV_MIIPHY_DELAYMAX 10000 |
| 443 | #define NV_MAC_RESET_DELAY 64 | ||
| 434 | 444 | ||
| 435 | #define NV_WAKEUPPATTERNS 5 | 445 | #define NV_WAKEUPPATTERNS 5 |
| 436 | #define NV_WAKEUPMASKENTRIES 4 | 446 | #define NV_WAKEUPMASKENTRIES 4 |
| @@ -552,6 +562,8 @@ struct fe_priv { | |||
| 552 | u32 desc_ver; | 562 | u32 desc_ver; |
| 553 | u32 txrxctl_bits; | 563 | u32 txrxctl_bits; |
| 554 | u32 vlanctl_bits; | 564 | u32 vlanctl_bits; |
| 565 | u32 driver_data; | ||
| 566 | u32 register_size; | ||
| 555 | 567 | ||
| 556 | void __iomem *base; | 568 | void __iomem *base; |
| 557 | 569 | ||
| @@ -919,6 +931,24 @@ static void nv_txrx_reset(struct net_device *dev) | |||
| 919 | pci_push(base); | 931 | pci_push(base); |
| 920 | } | 932 | } |
| 921 | 933 | ||
| 934 | static void nv_mac_reset(struct net_device *dev) | ||
| 935 | { | ||
| 936 | struct fe_priv *np = netdev_priv(dev); | ||
| 937 | u8 __iomem *base = get_hwbase(dev); | ||
| 938 | |||
| 939 | dprintk(KERN_DEBUG "%s: nv_mac_reset\n", dev->name); | ||
| 940 | writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl); | ||
| 941 | pci_push(base); | ||
| 942 | writel(NVREG_MAC_RESET_ASSERT, base + NvRegMacReset); | ||
| 943 | pci_push(base); | ||
| 944 | udelay(NV_MAC_RESET_DELAY); | ||
| 945 | writel(0, base + NvRegMacReset); | ||
| 946 | pci_push(base); | ||
| 947 | udelay(NV_MAC_RESET_DELAY); | ||
| 948 | writel(NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl); | ||
| 949 | pci_push(base); | ||
| 950 | } | ||
| 951 | |||
| 922 | /* | 952 | /* |
| 923 | * nv_get_stats: dev->get_stats function | 953 | * nv_get_stats: dev->get_stats function |
| 924 | * Get latest stats value from the nic. | 954 | * Get latest stats value from the nic. |
| @@ -1331,7 +1361,7 @@ static void nv_tx_timeout(struct net_device *dev) | |||
| 1331 | dev->name, (unsigned long)np->ring_addr, | 1361 | dev->name, (unsigned long)np->ring_addr, |
| 1332 | np->next_tx, np->nic_tx); | 1362 | np->next_tx, np->nic_tx); |
| 1333 | printk(KERN_INFO "%s: Dumping tx registers\n", dev->name); | 1363 | printk(KERN_INFO "%s: Dumping tx registers\n", dev->name); |
| 1334 | for (i=0;i<0x400;i+= 32) { | 1364 | for (i=0;i<=np->register_size;i+= 32) { |
| 1335 | printk(KERN_INFO "%3x: %08x %08x %08x %08x %08x %08x %08x %08x\n", | 1365 | printk(KERN_INFO "%3x: %08x %08x %08x %08x %08x %08x %08x %08x\n", |
| 1336 | i, | 1366 | i, |
| 1337 | readl(base + i + 0), readl(base + i + 4), | 1367 | readl(base + i + 0), readl(base + i + 4), |
| @@ -2488,11 +2518,11 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
| 2488 | } | 2518 | } |
| 2489 | 2519 | ||
| 2490 | #define FORCEDETH_REGS_VER 1 | 2520 | #define FORCEDETH_REGS_VER 1 |
| 2491 | #define FORCEDETH_REGS_SIZE 0x400 /* 256 32-bit registers */ | ||
| 2492 | 2521 | ||
| 2493 | static int nv_get_regs_len(struct net_device *dev) | 2522 | static int nv_get_regs_len(struct net_device *dev) |
| 2494 | { | 2523 | { |
| 2495 | return FORCEDETH_REGS_SIZE; | 2524 | struct fe_priv *np = netdev_priv(dev); |
| 2525 | return np->register_size; | ||
| 2496 | } | 2526 | } |
| 2497 | 2527 | ||
| 2498 | static void nv_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *buf) | 2528 | static void nv_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *buf) |
| @@ -2504,7 +2534,7 @@ static void nv_get_regs(struct net_device *dev, struct ethtool_regs *regs, void | |||
| 2504 | 2534 | ||
| 2505 | regs->version = FORCEDETH_REGS_VER; | 2535 | regs->version = FORCEDETH_REGS_VER; |
| 2506 | spin_lock_irq(&np->lock); | 2536 | spin_lock_irq(&np->lock); |
| 2507 | for (i=0;i<FORCEDETH_REGS_SIZE/sizeof(u32);i++) | 2537 | for (i = 0;i <= np->register_size/sizeof(u32); i++) |
| 2508 | rbuf[i] = readl(base + i*sizeof(u32)); | 2538 | rbuf[i] = readl(base + i*sizeof(u32)); |
| 2509 | spin_unlock_irq(&np->lock); | 2539 | spin_unlock_irq(&np->lock); |
| 2510 | } | 2540 | } |
| @@ -2608,6 +2638,8 @@ static int nv_open(struct net_device *dev) | |||
| 2608 | dprintk(KERN_DEBUG "nv_open: begin\n"); | 2638 | dprintk(KERN_DEBUG "nv_open: begin\n"); |
| 2609 | 2639 | ||
| 2610 | /* 1) erase previous misconfiguration */ | 2640 | /* 1) erase previous misconfiguration */ |
| 2641 | if (np->driver_data & DEV_HAS_POWER_CNTRL) | ||
| 2642 | nv_mac_reset(dev); | ||
| 2611 | /* 4.1-1: stop adapter: ignored, 4.3 seems to be overkill */ | 2643 | /* 4.1-1: stop adapter: ignored, 4.3 seems to be overkill */ |
| 2612 | writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA); | 2644 | writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA); |
| 2613 | writel(0, base + NvRegMulticastAddrB); | 2645 | writel(0, base + NvRegMulticastAddrB); |
| @@ -2878,6 +2910,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 2878 | unsigned long addr; | 2910 | unsigned long addr; |
| 2879 | u8 __iomem *base; | 2911 | u8 __iomem *base; |
| 2880 | int err, i; | 2912 | int err, i; |
| 2913 | u32 powerstate; | ||
| 2881 | 2914 | ||
| 2882 | dev = alloc_etherdev(sizeof(struct fe_priv)); | 2915 | dev = alloc_etherdev(sizeof(struct fe_priv)); |
| 2883 | err = -ENOMEM; | 2916 | err = -ENOMEM; |
| @@ -2910,6 +2943,11 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 2910 | if (err < 0) | 2943 | if (err < 0) |
| 2911 | goto out_disable; | 2944 | goto out_disable; |
| 2912 | 2945 | ||
| 2946 | if (id->driver_data & (DEV_HAS_VLAN|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL)) | ||
| 2947 | np->register_size = NV_PCI_REGSZ_VER2; | ||
| 2948 | else | ||
| 2949 | np->register_size = NV_PCI_REGSZ_VER1; | ||
| 2950 | |||
| 2913 | err = -EINVAL; | 2951 | err = -EINVAL; |
| 2914 | addr = 0; | 2952 | addr = 0; |
| 2915 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { | 2953 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { |
| @@ -2918,7 +2956,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 2918 | pci_resource_len(pci_dev, i), | 2956 | pci_resource_len(pci_dev, i), |
| 2919 | pci_resource_flags(pci_dev, i)); | 2957 | pci_resource_flags(pci_dev, i)); |
| 2920 | if (pci_resource_flags(pci_dev, i) & IORESOURCE_MEM && | 2958 | if (pci_resource_flags(pci_dev, i) & IORESOURCE_MEM && |
| 2921 | pci_resource_len(pci_dev, i) >= NV_PCI_REGSZ) { | 2959 | pci_resource_len(pci_dev, i) >= np->register_size) { |
| 2922 | addr = pci_resource_start(pci_dev, i); | 2960 | addr = pci_resource_start(pci_dev, i); |
| 2923 | break; | 2961 | break; |
| 2924 | } | 2962 | } |
| @@ -2929,6 +2967,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 2929 | goto out_relreg; | 2967 | goto out_relreg; |
| 2930 | } | 2968 | } |
| 2931 | 2969 | ||
| 2970 | /* copy of driver data */ | ||
| 2971 | np->driver_data = id->driver_data; | ||
| 2972 | |||
| 2932 | /* handle different descriptor versions */ | 2973 | /* handle different descriptor versions */ |
| 2933 | if (id->driver_data & DEV_HAS_HIGH_DMA) { | 2974 | if (id->driver_data & DEV_HAS_HIGH_DMA) { |
| 2934 | /* packet format 3: supports 40-bit addressing */ | 2975 | /* packet format 3: supports 40-bit addressing */ |
| @@ -2986,7 +3027,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 2986 | } | 3027 | } |
| 2987 | 3028 | ||
| 2988 | err = -ENOMEM; | 3029 | err = -ENOMEM; |
| 2989 | np->base = ioremap(addr, NV_PCI_REGSZ); | 3030 | np->base = ioremap(addr, np->register_size); |
| 2990 | if (!np->base) | 3031 | if (!np->base) |
| 2991 | goto out_relreg; | 3032 | goto out_relreg; |
| 2992 | dev->base_addr = (unsigned long)np->base; | 3033 | dev->base_addr = (unsigned long)np->base; |
| @@ -3062,6 +3103,20 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 3062 | writel(0, base + NvRegWakeUpFlags); | 3103 | writel(0, base + NvRegWakeUpFlags); |
| 3063 | np->wolenabled = 0; | 3104 | np->wolenabled = 0; |
| 3064 | 3105 | ||
| 3106 | if (id->driver_data & DEV_HAS_POWER_CNTRL) { | ||
| 3107 | u8 revision_id; | ||
| 3108 | pci_read_config_byte(pci_dev, PCI_REVISION_ID, &revision_id); | ||
| 3109 | |||
| 3110 | /* take phy and nic out of low power mode */ | ||
| 3111 | powerstate = readl(base + NvRegPowerState2); | ||
| 3112 | powerstate &= ~NVREG_POWERSTATE2_POWERUP_MASK; | ||
| 3113 | if ((id->device == PCI_DEVICE_ID_NVIDIA_NVENET_12 || | ||
| 3114 | id->device == PCI_DEVICE_ID_NVIDIA_NVENET_13) && | ||
| 3115 | revision_id >= 0xA3) | ||
| 3116 | powerstate |= NVREG_POWERSTATE2_POWERUP_REV_A3; | ||
| 3117 | writel(powerstate, base + NvRegPowerState2); | ||
| 3118 | } | ||
| 3119 | |||
| 3065 | if (np->desc_ver == DESC_VER_1) { | 3120 | if (np->desc_ver == DESC_VER_1) { |
| 3066 | np->tx_flags = NV_TX_VALID; | 3121 | np->tx_flags = NV_TX_VALID; |
| 3067 | } else { | 3122 | } else { |
| @@ -3223,19 +3278,19 @@ static struct pci_device_id pci_tbl[] = { | |||
| 3223 | }, | 3278 | }, |
| 3224 | { /* MCP51 Ethernet Controller */ | 3279 | { /* MCP51 Ethernet Controller */ |
| 3225 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_12), | 3280 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_12), |
| 3226 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA, | 3281 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL, |
| 3227 | }, | 3282 | }, |
| 3228 | { /* MCP51 Ethernet Controller */ | 3283 | { /* MCP51 Ethernet Controller */ |
| 3229 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_13), | 3284 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_13), |
| 3230 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA, | 3285 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL, |
| 3231 | }, | 3286 | }, |
| 3232 | { /* MCP55 Ethernet Controller */ | 3287 | { /* MCP55 Ethernet Controller */ |
| 3233 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_14), | 3288 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_14), |
| 3234 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X, | 3289 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL, |
| 3235 | }, | 3290 | }, |
| 3236 | { /* MCP55 Ethernet Controller */ | 3291 | { /* MCP55 Ethernet Controller */ |
| 3237 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_15), | 3292 | PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_15), |
| 3238 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X, | 3293 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL, |
| 3239 | }, | 3294 | }, |
| 3240 | {0,}, | 3295 | {0,}, |
| 3241 | }; | 3296 | }; |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 771e25d8c417..218d31764c52 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -210,7 +210,8 @@ static int gfar_probe(struct platform_device *pdev) | |||
| 210 | goto regs_fail; | 210 | goto regs_fail; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | spin_lock_init(&priv->lock); | 213 | spin_lock_init(&priv->txlock); |
| 214 | spin_lock_init(&priv->rxlock); | ||
| 214 | 215 | ||
| 215 | platform_set_drvdata(pdev, dev); | 216 | platform_set_drvdata(pdev, dev); |
| 216 | 217 | ||
| @@ -515,11 +516,13 @@ void stop_gfar(struct net_device *dev) | |||
| 515 | phy_stop(priv->phydev); | 516 | phy_stop(priv->phydev); |
| 516 | 517 | ||
| 517 | /* Lock it down */ | 518 | /* Lock it down */ |
| 518 | spin_lock_irqsave(&priv->lock, flags); | 519 | spin_lock_irqsave(&priv->txlock, flags); |
| 520 | spin_lock(&priv->rxlock); | ||
| 519 | 521 | ||
| 520 | gfar_halt(dev); | 522 | gfar_halt(dev); |
| 521 | 523 | ||
| 522 | spin_unlock_irqrestore(&priv->lock, flags); | 524 | spin_unlock(&priv->rxlock); |
| 525 | spin_unlock_irqrestore(&priv->txlock, flags); | ||
| 523 | 526 | ||
| 524 | /* Free the IRQs */ | 527 | /* Free the IRQs */ |
| 525 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) { | 528 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) { |
| @@ -605,14 +608,15 @@ void gfar_start(struct net_device *dev) | |||
| 605 | tempval |= DMACTRL_INIT_SETTINGS; | 608 | tempval |= DMACTRL_INIT_SETTINGS; |
| 606 | gfar_write(&priv->regs->dmactrl, tempval); | 609 | gfar_write(&priv->regs->dmactrl, tempval); |
| 607 | 610 | ||
| 608 | /* Clear THLT, so that the DMA starts polling now */ | ||
| 609 | gfar_write(®s->tstat, TSTAT_CLEAR_THALT); | ||
| 610 | |||
| 611 | /* Make sure we aren't stopped */ | 611 | /* Make sure we aren't stopped */ |
| 612 | tempval = gfar_read(&priv->regs->dmactrl); | 612 | tempval = gfar_read(&priv->regs->dmactrl); |
| 613 | tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); | 613 | tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); |
| 614 | gfar_write(&priv->regs->dmactrl, tempval); | 614 | gfar_write(&priv->regs->dmactrl, tempval); |
| 615 | 615 | ||
| 616 | /* Clear THLT/RHLT, so that the DMA starts polling now */ | ||
| 617 | gfar_write(®s->tstat, TSTAT_CLEAR_THALT); | ||
| 618 | gfar_write(®s->rstat, RSTAT_CLEAR_RHALT); | ||
| 619 | |||
| 616 | /* Unmask the interrupts we look for */ | 620 | /* Unmask the interrupts we look for */ |
| 617 | gfar_write(®s->imask, IMASK_DEFAULT); | 621 | gfar_write(®s->imask, IMASK_DEFAULT); |
| 618 | } | 622 | } |
| @@ -928,12 +932,13 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 928 | struct txfcb *fcb = NULL; | 932 | struct txfcb *fcb = NULL; |
| 929 | struct txbd8 *txbdp; | 933 | struct txbd8 *txbdp; |
| 930 | u16 status; | 934 | u16 status; |
| 935 | unsigned long flags; | ||
| 931 | 936 | ||
| 932 | /* Update transmit stats */ | 937 | /* Update transmit stats */ |
| 933 | priv->stats.tx_bytes += skb->len; | 938 | priv->stats.tx_bytes += skb->len; |
| 934 | 939 | ||
| 935 | /* Lock priv now */ | 940 | /* Lock priv now */ |
| 936 | spin_lock_irq(&priv->lock); | 941 | spin_lock_irqsave(&priv->txlock, flags); |
| 937 | 942 | ||
| 938 | /* Point at the first free tx descriptor */ | 943 | /* Point at the first free tx descriptor */ |
| 939 | txbdp = priv->cur_tx; | 944 | txbdp = priv->cur_tx; |
| @@ -1004,7 +1009,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1004 | gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT); | 1009 | gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT); |
| 1005 | 1010 | ||
| 1006 | /* Unlock priv */ | 1011 | /* Unlock priv */ |
| 1007 | spin_unlock_irq(&priv->lock); | 1012 | spin_unlock_irqrestore(&priv->txlock, flags); |
| 1008 | 1013 | ||
| 1009 | return 0; | 1014 | return 0; |
| 1010 | } | 1015 | } |
| @@ -1049,7 +1054,7 @@ static void gfar_vlan_rx_register(struct net_device *dev, | |||
| 1049 | unsigned long flags; | 1054 | unsigned long flags; |
| 1050 | u32 tempval; | 1055 | u32 tempval; |
| 1051 | 1056 | ||
| 1052 | spin_lock_irqsave(&priv->lock, flags); | 1057 | spin_lock_irqsave(&priv->rxlock, flags); |
| 1053 | 1058 | ||
| 1054 | priv->vlgrp = grp; | 1059 | priv->vlgrp = grp; |
| 1055 | 1060 | ||
| @@ -1076,7 +1081,7 @@ static void gfar_vlan_rx_register(struct net_device *dev, | |||
| 1076 | gfar_write(&priv->regs->rctrl, tempval); | 1081 | gfar_write(&priv->regs->rctrl, tempval); |
| 1077 | } | 1082 | } |
| 1078 | 1083 | ||
| 1079 | spin_unlock_irqrestore(&priv->lock, flags); | 1084 | spin_unlock_irqrestore(&priv->rxlock, flags); |
| 1080 | } | 1085 | } |
| 1081 | 1086 | ||
| 1082 | 1087 | ||
| @@ -1085,12 +1090,12 @@ static void gfar_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid) | |||
| 1085 | struct gfar_private *priv = netdev_priv(dev); | 1090 | struct gfar_private *priv = netdev_priv(dev); |
| 1086 | unsigned long flags; | 1091 | unsigned long flags; |
| 1087 | 1092 | ||
| 1088 | spin_lock_irqsave(&priv->lock, flags); | 1093 | spin_lock_irqsave(&priv->rxlock, flags); |
| 1089 | 1094 | ||
| 1090 | if (priv->vlgrp) | 1095 | if (priv->vlgrp) |
| 1091 | priv->vlgrp->vlan_devices[vid] = NULL; | 1096 | priv->vlgrp->vlan_devices[vid] = NULL; |
| 1092 | 1097 | ||
| 1093 | spin_unlock_irqrestore(&priv->lock, flags); | 1098 | spin_unlock_irqrestore(&priv->rxlock, flags); |
| 1094 | } | 1099 | } |
| 1095 | 1100 | ||
| 1096 | 1101 | ||
| @@ -1179,7 +1184,7 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs) | |||
| 1179 | gfar_write(&priv->regs->ievent, IEVENT_TX_MASK); | 1184 | gfar_write(&priv->regs->ievent, IEVENT_TX_MASK); |
| 1180 | 1185 | ||
| 1181 | /* Lock priv */ | 1186 | /* Lock priv */ |
| 1182 | spin_lock(&priv->lock); | 1187 | spin_lock(&priv->txlock); |
| 1183 | bdp = priv->dirty_tx; | 1188 | bdp = priv->dirty_tx; |
| 1184 | while ((bdp->status & TXBD_READY) == 0) { | 1189 | while ((bdp->status & TXBD_READY) == 0) { |
| 1185 | /* If dirty_tx and cur_tx are the same, then either the */ | 1190 | /* If dirty_tx and cur_tx are the same, then either the */ |
| @@ -1224,7 +1229,7 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs) | |||
| 1224 | else | 1229 | else |
| 1225 | gfar_write(&priv->regs->txic, 0); | 1230 | gfar_write(&priv->regs->txic, 0); |
| 1226 | 1231 | ||
| 1227 | spin_unlock(&priv->lock); | 1232 | spin_unlock(&priv->txlock); |
| 1228 | 1233 | ||
| 1229 | return IRQ_HANDLED; | 1234 | return IRQ_HANDLED; |
| 1230 | } | 1235 | } |
| @@ -1305,9 +1310,10 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | |||
| 1305 | { | 1310 | { |
| 1306 | struct net_device *dev = (struct net_device *) dev_id; | 1311 | struct net_device *dev = (struct net_device *) dev_id; |
| 1307 | struct gfar_private *priv = netdev_priv(dev); | 1312 | struct gfar_private *priv = netdev_priv(dev); |
| 1308 | |||
| 1309 | #ifdef CONFIG_GFAR_NAPI | 1313 | #ifdef CONFIG_GFAR_NAPI |
| 1310 | u32 tempval; | 1314 | u32 tempval; |
| 1315 | #else | ||
| 1316 | unsigned long flags; | ||
| 1311 | #endif | 1317 | #endif |
| 1312 | 1318 | ||
| 1313 | /* Clear IEVENT, so rx interrupt isn't called again | 1319 | /* Clear IEVENT, so rx interrupt isn't called again |
| @@ -1330,7 +1336,7 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | |||
| 1330 | } | 1336 | } |
| 1331 | #else | 1337 | #else |
| 1332 | 1338 | ||
| 1333 | spin_lock(&priv->lock); | 1339 | spin_lock_irqsave(&priv->rxlock, flags); |
| 1334 | gfar_clean_rx_ring(dev, priv->rx_ring_size); | 1340 | gfar_clean_rx_ring(dev, priv->rx_ring_size); |
| 1335 | 1341 | ||
| 1336 | /* If we are coalescing interrupts, update the timer */ | 1342 | /* If we are coalescing interrupts, update the timer */ |
| @@ -1341,7 +1347,7 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | |||
| 1341 | else | 1347 | else |
| 1342 | gfar_write(&priv->regs->rxic, 0); | 1348 | gfar_write(&priv->regs->rxic, 0); |
| 1343 | 1349 | ||
| 1344 | spin_unlock(&priv->lock); | 1350 | spin_unlock_irqrestore(&priv->rxlock, flags); |
| 1345 | #endif | 1351 | #endif |
| 1346 | 1352 | ||
| 1347 | return IRQ_HANDLED; | 1353 | return IRQ_HANDLED; |
| @@ -1490,13 +1496,6 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit) | |||
| 1490 | /* Update the current rxbd pointer to be the next one */ | 1496 | /* Update the current rxbd pointer to be the next one */ |
| 1491 | priv->cur_rx = bdp; | 1497 | priv->cur_rx = bdp; |
| 1492 | 1498 | ||
| 1493 | /* If no packets have arrived since the | ||
| 1494 | * last one we processed, clear the IEVENT RX and | ||
| 1495 | * BSY bits so that another interrupt won't be | ||
| 1496 | * generated when we set IMASK */ | ||
| 1497 | if (bdp->status & RXBD_EMPTY) | ||
| 1498 | gfar_write(&priv->regs->ievent, IEVENT_RX_MASK); | ||
| 1499 | |||
| 1500 | return howmany; | 1499 | return howmany; |
| 1501 | } | 1500 | } |
| 1502 | 1501 | ||
| @@ -1516,7 +1515,7 @@ static int gfar_poll(struct net_device *dev, int *budget) | |||
| 1516 | rx_work_limit -= howmany; | 1515 | rx_work_limit -= howmany; |
| 1517 | *budget -= howmany; | 1516 | *budget -= howmany; |
| 1518 | 1517 | ||
| 1519 | if (rx_work_limit >= 0) { | 1518 | if (rx_work_limit > 0) { |
| 1520 | netif_rx_complete(dev); | 1519 | netif_rx_complete(dev); |
| 1521 | 1520 | ||
| 1522 | /* Clear the halt bit in RSTAT */ | 1521 | /* Clear the halt bit in RSTAT */ |
| @@ -1533,7 +1532,8 @@ static int gfar_poll(struct net_device *dev, int *budget) | |||
| 1533 | gfar_write(&priv->regs->rxic, 0); | 1532 | gfar_write(&priv->regs->rxic, 0); |
| 1534 | } | 1533 | } |
| 1535 | 1534 | ||
| 1536 | return (rx_work_limit < 0) ? 1 : 0; | 1535 | /* Return 1 if there's more work to do */ |
| 1536 | return (rx_work_limit > 0) ? 0 : 1; | ||
| 1537 | } | 1537 | } |
| 1538 | #endif | 1538 | #endif |
| 1539 | 1539 | ||
| @@ -1629,7 +1629,7 @@ static void adjust_link(struct net_device *dev) | |||
| 1629 | struct phy_device *phydev = priv->phydev; | 1629 | struct phy_device *phydev = priv->phydev; |
| 1630 | int new_state = 0; | 1630 | int new_state = 0; |
| 1631 | 1631 | ||
| 1632 | spin_lock_irqsave(&priv->lock, flags); | 1632 | spin_lock_irqsave(&priv->txlock, flags); |
| 1633 | if (phydev->link) { | 1633 | if (phydev->link) { |
| 1634 | u32 tempval = gfar_read(®s->maccfg2); | 1634 | u32 tempval = gfar_read(®s->maccfg2); |
| 1635 | u32 ecntrl = gfar_read(®s->ecntrl); | 1635 | u32 ecntrl = gfar_read(®s->ecntrl); |
| @@ -1694,7 +1694,7 @@ static void adjust_link(struct net_device *dev) | |||
| 1694 | if (new_state && netif_msg_link(priv)) | 1694 | if (new_state && netif_msg_link(priv)) |
| 1695 | phy_print_status(phydev); | 1695 | phy_print_status(phydev); |
| 1696 | 1696 | ||
| 1697 | spin_unlock_irqrestore(&priv->lock, flags); | 1697 | spin_unlock_irqrestore(&priv->txlock, flags); |
| 1698 | } | 1698 | } |
| 1699 | 1699 | ||
| 1700 | /* Update the hash table based on the current list of multicast | 1700 | /* Update the hash table based on the current list of multicast |
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index d37d5401be6e..127c98cf3336 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -656,43 +656,62 @@ struct gfar { | |||
| 656 | * the buffer descriptor determines the actual condition. | 656 | * the buffer descriptor determines the actual condition. |
| 657 | */ | 657 | */ |
| 658 | struct gfar_private { | 658 | struct gfar_private { |
| 659 | /* pointers to arrays of skbuffs for tx and rx */ | 659 | /* Fields controlled by TX lock */ |
| 660 | spinlock_t txlock; | ||
| 661 | |||
| 662 | /* Pointer to the array of skbuffs */ | ||
| 660 | struct sk_buff ** tx_skbuff; | 663 | struct sk_buff ** tx_skbuff; |
| 661 | struct sk_buff ** rx_skbuff; | ||
| 662 | 664 | ||
| 663 | /* indices pointing to the next free sbk in skb arrays */ | 665 | /* next free skb in the array */ |
| 664 | u16 skb_curtx; | 666 | u16 skb_curtx; |
| 665 | u16 skb_currx; | ||
| 666 | 667 | ||
| 667 | /* index of the first skb which hasn't been transmitted | 668 | /* First skb in line to be transmitted */ |
| 668 | * yet. */ | ||
| 669 | u16 skb_dirtytx; | 669 | u16 skb_dirtytx; |
| 670 | 670 | ||
| 671 | /* Configuration info for the coalescing features */ | 671 | /* Configuration info for the coalescing features */ |
| 672 | unsigned char txcoalescing; | 672 | unsigned char txcoalescing; |
| 673 | unsigned short txcount; | 673 | unsigned short txcount; |
| 674 | unsigned short txtime; | 674 | unsigned short txtime; |
| 675 | |||
| 676 | /* Buffer descriptor pointers */ | ||
| 677 | struct txbd8 *tx_bd_base; /* First tx buffer descriptor */ | ||
| 678 | struct txbd8 *cur_tx; /* Next free ring entry */ | ||
| 679 | struct txbd8 *dirty_tx; /* First buffer in line | ||
| 680 | to be transmitted */ | ||
| 681 | unsigned int tx_ring_size; | ||
| 682 | |||
| 683 | /* RX Locked fields */ | ||
| 684 | spinlock_t rxlock; | ||
| 685 | |||
| 686 | /* skb array and index */ | ||
| 687 | struct sk_buff ** rx_skbuff; | ||
| 688 | u16 skb_currx; | ||
| 689 | |||
| 690 | /* RX Coalescing values */ | ||
| 675 | unsigned char rxcoalescing; | 691 | unsigned char rxcoalescing; |
| 676 | unsigned short rxcount; | 692 | unsigned short rxcount; |
| 677 | unsigned short rxtime; | 693 | unsigned short rxtime; |
| 678 | 694 | ||
| 679 | /* GFAR addresses */ | 695 | struct rxbd8 *rx_bd_base; /* First Rx buffers */ |
| 680 | struct rxbd8 *rx_bd_base; /* Base addresses of Rx and Tx Buffers */ | ||
| 681 | struct txbd8 *tx_bd_base; | ||
| 682 | struct rxbd8 *cur_rx; /* Next free rx ring entry */ | 696 | struct rxbd8 *cur_rx; /* Next free rx ring entry */ |
| 683 | struct txbd8 *cur_tx; /* Next free ring entry */ | 697 | |
| 684 | struct txbd8 *dirty_tx; /* The Ring entry to be freed. */ | 698 | /* RX parameters */ |
| 685 | struct gfar __iomem *regs; /* Pointer to the GFAR memory mapped Registers */ | 699 | unsigned int rx_ring_size; |
| 686 | u32 __iomem *hash_regs[16]; | ||
| 687 | int hash_width; | ||
| 688 | struct net_device_stats stats; /* linux network statistics */ | ||
| 689 | struct gfar_extra_stats extra_stats; | ||
| 690 | spinlock_t lock; | ||
| 691 | unsigned int rx_buffer_size; | 700 | unsigned int rx_buffer_size; |
| 692 | unsigned int rx_stash_size; | 701 | unsigned int rx_stash_size; |
| 693 | unsigned int rx_stash_index; | 702 | unsigned int rx_stash_index; |
| 694 | unsigned int tx_ring_size; | 703 | |
| 695 | unsigned int rx_ring_size; | 704 | struct vlan_group *vlgrp; |
| 705 | |||
| 706 | /* Unprotected fields */ | ||
| 707 | /* Pointer to the GFAR memory mapped Registers */ | ||
| 708 | struct gfar __iomem *regs; | ||
| 709 | |||
| 710 | /* Hash registers and their width */ | ||
| 711 | u32 __iomem *hash_regs[16]; | ||
| 712 | int hash_width; | ||
| 713 | |||
| 714 | /* global parameters */ | ||
| 696 | unsigned int fifo_threshold; | 715 | unsigned int fifo_threshold; |
| 697 | unsigned int fifo_starve; | 716 | unsigned int fifo_starve; |
| 698 | unsigned int fifo_starve_off; | 717 | unsigned int fifo_starve_off; |
| @@ -702,13 +721,15 @@ struct gfar_private { | |||
| 702 | extended_hash:1, | 721 | extended_hash:1, |
| 703 | bd_stash_en:1; | 722 | bd_stash_en:1; |
| 704 | unsigned short padding; | 723 | unsigned short padding; |
| 705 | struct vlan_group *vlgrp; | 724 | |
| 706 | /* Info structure initialized by board setup code */ | ||
| 707 | unsigned int interruptTransmit; | 725 | unsigned int interruptTransmit; |
| 708 | unsigned int interruptReceive; | 726 | unsigned int interruptReceive; |
| 709 | unsigned int interruptError; | 727 | unsigned int interruptError; |
| 728 | |||
| 729 | /* info structure initialized by platform code */ | ||
| 710 | struct gianfar_platform_data *einfo; | 730 | struct gianfar_platform_data *einfo; |
| 711 | 731 | ||
| 732 | /* PHY stuff */ | ||
| 712 | struct phy_device *phydev; | 733 | struct phy_device *phydev; |
| 713 | struct mii_bus *mii_bus; | 734 | struct mii_bus *mii_bus; |
| 714 | int oldspeed; | 735 | int oldspeed; |
| @@ -716,6 +737,10 @@ struct gfar_private { | |||
| 716 | int oldlink; | 737 | int oldlink; |
| 717 | 738 | ||
| 718 | uint32_t msg_enable; | 739 | uint32_t msg_enable; |
| 740 | |||
| 741 | /* Network Statistics */ | ||
| 742 | struct net_device_stats stats; | ||
| 743 | struct gfar_extra_stats extra_stats; | ||
| 719 | }; | 744 | }; |
| 720 | 745 | ||
| 721 | static inline u32 gfar_read(volatile unsigned __iomem *addr) | 746 | static inline u32 gfar_read(volatile unsigned __iomem *addr) |
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 5de7b2e259dc..d69698c695ef 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
| @@ -455,10 +455,14 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva | |||
| 455 | 455 | ||
| 456 | /* Halt TX and RX, and process the frames which | 456 | /* Halt TX and RX, and process the frames which |
| 457 | * have already been received */ | 457 | * have already been received */ |
| 458 | spin_lock_irqsave(&priv->lock, flags); | 458 | spin_lock_irqsave(&priv->txlock, flags); |
| 459 | spin_lock(&priv->rxlock); | ||
| 460 | |||
| 459 | gfar_halt(dev); | 461 | gfar_halt(dev); |
| 460 | gfar_clean_rx_ring(dev, priv->rx_ring_size); | 462 | gfar_clean_rx_ring(dev, priv->rx_ring_size); |
| 461 | spin_unlock_irqrestore(&priv->lock, flags); | 463 | |
| 464 | spin_unlock(&priv->rxlock); | ||
| 465 | spin_unlock_irqrestore(&priv->txlock, flags); | ||
| 462 | 466 | ||
| 463 | /* Now we take down the rings to rebuild them */ | 467 | /* Now we take down the rings to rebuild them */ |
| 464 | stop_gfar(dev); | 468 | stop_gfar(dev); |
| @@ -488,10 +492,14 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data) | |||
| 488 | 492 | ||
| 489 | /* Halt TX and RX, and process the frames which | 493 | /* Halt TX and RX, and process the frames which |
| 490 | * have already been received */ | 494 | * have already been received */ |
| 491 | spin_lock_irqsave(&priv->lock, flags); | 495 | spin_lock_irqsave(&priv->txlock, flags); |
| 496 | spin_lock(&priv->rxlock); | ||
| 497 | |||
| 492 | gfar_halt(dev); | 498 | gfar_halt(dev); |
| 493 | gfar_clean_rx_ring(dev, priv->rx_ring_size); | 499 | gfar_clean_rx_ring(dev, priv->rx_ring_size); |
| 494 | spin_unlock_irqrestore(&priv->lock, flags); | 500 | |
| 501 | spin_unlock(&priv->rxlock); | ||
| 502 | spin_unlock_irqrestore(&priv->txlock, flags); | ||
| 495 | 503 | ||
| 496 | /* Now we take down the rings to rebuild them */ | 504 | /* Now we take down the rings to rebuild them */ |
| 497 | stop_gfar(dev); | 505 | stop_gfar(dev); |
| @@ -523,7 +531,7 @@ static int gfar_set_tx_csum(struct net_device *dev, uint32_t data) | |||
| 523 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM)) | 531 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM)) |
| 524 | return -EOPNOTSUPP; | 532 | return -EOPNOTSUPP; |
| 525 | 533 | ||
| 526 | spin_lock_irqsave(&priv->lock, flags); | 534 | spin_lock_irqsave(&priv->txlock, flags); |
| 527 | gfar_halt(dev); | 535 | gfar_halt(dev); |
| 528 | 536 | ||
| 529 | if (data) | 537 | if (data) |
| @@ -532,7 +540,7 @@ static int gfar_set_tx_csum(struct net_device *dev, uint32_t data) | |||
| 532 | dev->features &= ~NETIF_F_IP_CSUM; | 540 | dev->features &= ~NETIF_F_IP_CSUM; |
| 533 | 541 | ||
| 534 | gfar_start(dev); | 542 | gfar_start(dev); |
| 535 | spin_unlock_irqrestore(&priv->lock, flags); | 543 | spin_unlock_irqrestore(&priv->txlock, flags); |
| 536 | 544 | ||
| 537 | return 0; | 545 | return 0; |
| 538 | } | 546 | } |
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c index 51ef181b1368..a6d5c43199cb 100644 --- a/drivers/net/gianfar_sysfs.c +++ b/drivers/net/gianfar_sysfs.c | |||
| @@ -82,7 +82,7 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev, | |||
| 82 | else | 82 | else |
| 83 | return count; | 83 | return count; |
| 84 | 84 | ||
| 85 | spin_lock_irqsave(&priv->lock, flags); | 85 | spin_lock_irqsave(&priv->rxlock, flags); |
| 86 | 86 | ||
| 87 | /* Set the new stashing value */ | 87 | /* Set the new stashing value */ |
| 88 | priv->bd_stash_en = new_setting; | 88 | priv->bd_stash_en = new_setting; |
| @@ -96,7 +96,7 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev, | |||
| 96 | 96 | ||
| 97 | gfar_write(&priv->regs->attr, temp); | 97 | gfar_write(&priv->regs->attr, temp); |
| 98 | 98 | ||
| 99 | spin_unlock_irqrestore(&priv->lock, flags); | 99 | spin_unlock_irqrestore(&priv->rxlock, flags); |
| 100 | 100 | ||
| 101 | return count; | 101 | return count; |
| 102 | } | 102 | } |
| @@ -118,7 +118,7 @@ static ssize_t gfar_set_rx_stash_size(struct class_device *cdev, | |||
| 118 | u32 temp; | 118 | u32 temp; |
| 119 | unsigned long flags; | 119 | unsigned long flags; |
| 120 | 120 | ||
| 121 | spin_lock_irqsave(&priv->lock, flags); | 121 | spin_lock_irqsave(&priv->rxlock, flags); |
| 122 | if (length > priv->rx_buffer_size) | 122 | if (length > priv->rx_buffer_size) |
| 123 | return count; | 123 | return count; |
| 124 | 124 | ||
| @@ -142,7 +142,7 @@ static ssize_t gfar_set_rx_stash_size(struct class_device *cdev, | |||
| 142 | 142 | ||
| 143 | gfar_write(&priv->regs->attr, temp); | 143 | gfar_write(&priv->regs->attr, temp); |
| 144 | 144 | ||
| 145 | spin_unlock_irqrestore(&priv->lock, flags); | 145 | spin_unlock_irqrestore(&priv->rxlock, flags); |
| 146 | 146 | ||
| 147 | return count; | 147 | return count; |
| 148 | } | 148 | } |
| @@ -166,7 +166,7 @@ static ssize_t gfar_set_rx_stash_index(struct class_device *cdev, | |||
| 166 | u32 temp; | 166 | u32 temp; |
| 167 | unsigned long flags; | 167 | unsigned long flags; |
| 168 | 168 | ||
| 169 | spin_lock_irqsave(&priv->lock, flags); | 169 | spin_lock_irqsave(&priv->rxlock, flags); |
| 170 | if (index > priv->rx_stash_size) | 170 | if (index > priv->rx_stash_size) |
| 171 | return count; | 171 | return count; |
| 172 | 172 | ||
| @@ -180,7 +180,7 @@ static ssize_t gfar_set_rx_stash_index(struct class_device *cdev, | |||
| 180 | temp |= ATTRELI_EI(index); | 180 | temp |= ATTRELI_EI(index); |
| 181 | gfar_write(&priv->regs->attreli, flags); | 181 | gfar_write(&priv->regs->attreli, flags); |
| 182 | 182 | ||
| 183 | spin_unlock_irqrestore(&priv->lock, flags); | 183 | spin_unlock_irqrestore(&priv->rxlock, flags); |
| 184 | 184 | ||
| 185 | return count; | 185 | return count; |
| 186 | } | 186 | } |
| @@ -205,7 +205,7 @@ static ssize_t gfar_set_fifo_threshold(struct class_device *cdev, | |||
| 205 | if (length > GFAR_MAX_FIFO_THRESHOLD) | 205 | if (length > GFAR_MAX_FIFO_THRESHOLD) |
| 206 | return count; | 206 | return count; |
| 207 | 207 | ||
| 208 | spin_lock_irqsave(&priv->lock, flags); | 208 | spin_lock_irqsave(&priv->txlock, flags); |
| 209 | 209 | ||
| 210 | priv->fifo_threshold = length; | 210 | priv->fifo_threshold = length; |
| 211 | 211 | ||
| @@ -214,7 +214,7 @@ static ssize_t gfar_set_fifo_threshold(struct class_device *cdev, | |||
| 214 | temp |= length; | 214 | temp |= length; |
| 215 | gfar_write(&priv->regs->fifo_tx_thr, temp); | 215 | gfar_write(&priv->regs->fifo_tx_thr, temp); |
| 216 | 216 | ||
| 217 | spin_unlock_irqrestore(&priv->lock, flags); | 217 | spin_unlock_irqrestore(&priv->txlock, flags); |
| 218 | 218 | ||
| 219 | return count; | 219 | return count; |
| 220 | } | 220 | } |
| @@ -240,7 +240,7 @@ static ssize_t gfar_set_fifo_starve(struct class_device *cdev, | |||
| 240 | if (num > GFAR_MAX_FIFO_STARVE) | 240 | if (num > GFAR_MAX_FIFO_STARVE) |
| 241 | return count; | 241 | return count; |
| 242 | 242 | ||
| 243 | spin_lock_irqsave(&priv->lock, flags); | 243 | spin_lock_irqsave(&priv->txlock, flags); |
| 244 | 244 | ||
| 245 | priv->fifo_starve = num; | 245 | priv->fifo_starve = num; |
| 246 | 246 | ||
| @@ -249,7 +249,7 @@ static ssize_t gfar_set_fifo_starve(struct class_device *cdev, | |||
| 249 | temp |= num; | 249 | temp |= num; |
| 250 | gfar_write(&priv->regs->fifo_tx_starve, temp); | 250 | gfar_write(&priv->regs->fifo_tx_starve, temp); |
| 251 | 251 | ||
| 252 | spin_unlock_irqrestore(&priv->lock, flags); | 252 | spin_unlock_irqrestore(&priv->txlock, flags); |
| 253 | 253 | ||
| 254 | return count; | 254 | return count; |
| 255 | } | 255 | } |
| @@ -274,7 +274,7 @@ static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev, | |||
| 274 | if (num > GFAR_MAX_FIFO_STARVE_OFF) | 274 | if (num > GFAR_MAX_FIFO_STARVE_OFF) |
| 275 | return count; | 275 | return count; |
| 276 | 276 | ||
| 277 | spin_lock_irqsave(&priv->lock, flags); | 277 | spin_lock_irqsave(&priv->txlock, flags); |
| 278 | 278 | ||
| 279 | priv->fifo_starve_off = num; | 279 | priv->fifo_starve_off = num; |
| 280 | 280 | ||
| @@ -283,7 +283,7 @@ static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev, | |||
| 283 | temp |= num; | 283 | temp |= num; |
| 284 | gfar_write(&priv->regs->fifo_tx_starve_shutoff, temp); | 284 | gfar_write(&priv->regs->fifo_tx_starve_shutoff, temp); |
| 285 | 285 | ||
| 286 | spin_unlock_irqrestore(&priv->lock, flags); | 286 | spin_unlock_irqrestore(&priv->txlock, flags); |
| 287 | 287 | ||
| 288 | return count; | 288 | return count; |
| 289 | } | 289 | } |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 506e777c5f06..d090df413049 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -1639,6 +1639,7 @@ static struct pcmcia_device_id pcnet_ids[] = { | |||
| 1639 | PCMCIA_DEVICE_PROD_ID12("CONTEC", "C-NET(PC)C-10L", 0x21cab552, 0xf6f90722), | 1639 | PCMCIA_DEVICE_PROD_ID12("CONTEC", "C-NET(PC)C-10L", 0x21cab552, 0xf6f90722), |
| 1640 | PCMCIA_DEVICE_PROD_ID12("corega", "FEther PCC-TXF", 0x0a21501a, 0xa51564a2), | 1640 | PCMCIA_DEVICE_PROD_ID12("corega", "FEther PCC-TXF", 0x0a21501a, 0xa51564a2), |
| 1641 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-T", 0x5261440f, 0xfa9d85bd), | 1641 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-T", 0x5261440f, 0xfa9d85bd), |
| 1642 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d), | ||
| 1642 | PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d), | 1643 | PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d), |
| 1643 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa), | 1644 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa), |
| 1644 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9), | 1645 | PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9), |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 67b0eab16589..227df9876a2c 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -51,7 +51,7 @@ | |||
| 51 | #include "sky2.h" | 51 | #include "sky2.h" |
| 52 | 52 | ||
| 53 | #define DRV_NAME "sky2" | 53 | #define DRV_NAME "sky2" |
| 54 | #define DRV_VERSION "1.1" | 54 | #define DRV_VERSION "1.2" |
| 55 | #define PFX DRV_NAME " " | 55 | #define PFX DRV_NAME " " |
| 56 | 56 | ||
| 57 | /* | 57 | /* |
| @@ -925,8 +925,7 @@ static inline struct sk_buff *sky2_alloc_skb(unsigned int size, gfp_t gfp_mask) | |||
| 925 | skb = alloc_skb(size + RX_SKB_ALIGN, gfp_mask); | 925 | skb = alloc_skb(size + RX_SKB_ALIGN, gfp_mask); |
| 926 | if (likely(skb)) { | 926 | if (likely(skb)) { |
| 927 | unsigned long p = (unsigned long) skb->data; | 927 | unsigned long p = (unsigned long) skb->data; |
| 928 | skb_reserve(skb, | 928 | skb_reserve(skb, ALIGN(p, RX_SKB_ALIGN) - p); |
| 929 | ((p + RX_SKB_ALIGN - 1) & ~(RX_SKB_ALIGN - 1)) - p); | ||
| 930 | } | 929 | } |
| 931 | 930 | ||
| 932 | return skb; | 931 | return skb; |
| @@ -1686,13 +1685,12 @@ static void sky2_tx_timeout(struct net_device *dev) | |||
| 1686 | } | 1685 | } |
| 1687 | 1686 | ||
| 1688 | 1687 | ||
| 1689 | #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) | ||
| 1690 | /* Want receive buffer size to be multiple of 64 bits | 1688 | /* Want receive buffer size to be multiple of 64 bits |
| 1691 | * and incl room for vlan and truncation | 1689 | * and incl room for vlan and truncation |
| 1692 | */ | 1690 | */ |
| 1693 | static inline unsigned sky2_buf_size(int mtu) | 1691 | static inline unsigned sky2_buf_size(int mtu) |
| 1694 | { | 1692 | { |
| 1695 | return roundup(mtu + ETH_HLEN + VLAN_HLEN, 8) + 8; | 1693 | return ALIGN(mtu + ETH_HLEN + VLAN_HLEN, 8) + 8; |
| 1696 | } | 1694 | } |
| 1697 | 1695 | ||
| 1698 | static int sky2_change_mtu(struct net_device *dev, int new_mtu) | 1696 | static int sky2_change_mtu(struct net_device *dev, int new_mtu) |
| @@ -2086,6 +2084,20 @@ static void sky2_descriptor_error(struct sky2_hw *hw, unsigned port, | |||
| 2086 | } | 2084 | } |
| 2087 | } | 2085 | } |
| 2088 | 2086 | ||
| 2087 | /* If idle then force a fake soft NAPI poll once a second | ||
| 2088 | * to work around cases where sharing an edge triggered interrupt. | ||
| 2089 | */ | ||
| 2090 | static void sky2_idle(unsigned long arg) | ||
| 2091 | { | ||
| 2092 | struct net_device *dev = (struct net_device *) arg; | ||
| 2093 | |||
| 2094 | local_irq_disable(); | ||
| 2095 | if (__netif_rx_schedule_prep(dev)) | ||
| 2096 | __netif_rx_schedule(dev); | ||
| 2097 | local_irq_enable(); | ||
| 2098 | } | ||
| 2099 | |||
| 2100 | |||
| 2089 | static int sky2_poll(struct net_device *dev0, int *budget) | 2101 | static int sky2_poll(struct net_device *dev0, int *budget) |
| 2090 | { | 2102 | { |
| 2091 | struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; | 2103 | struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; |
| @@ -2093,6 +2105,7 @@ static int sky2_poll(struct net_device *dev0, int *budget) | |||
| 2093 | int work_done = 0; | 2105 | int work_done = 0; |
| 2094 | u32 status = sky2_read32(hw, B0_Y2_SP_EISR); | 2106 | u32 status = sky2_read32(hw, B0_Y2_SP_EISR); |
| 2095 | 2107 | ||
| 2108 | restart_poll: | ||
| 2096 | if (unlikely(status & ~Y2_IS_STAT_BMU)) { | 2109 | if (unlikely(status & ~Y2_IS_STAT_BMU)) { |
| 2097 | if (status & Y2_IS_HW_ERR) | 2110 | if (status & Y2_IS_HW_ERR) |
| 2098 | sky2_hw_intr(hw); | 2111 | sky2_hw_intr(hw); |
| @@ -2123,7 +2136,7 @@ static int sky2_poll(struct net_device *dev0, int *budget) | |||
| 2123 | } | 2136 | } |
| 2124 | 2137 | ||
| 2125 | if (status & Y2_IS_STAT_BMU) { | 2138 | if (status & Y2_IS_STAT_BMU) { |
| 2126 | work_done = sky2_status_intr(hw, work_limit); | 2139 | work_done += sky2_status_intr(hw, work_limit - work_done); |
| 2127 | *budget -= work_done; | 2140 | *budget -= work_done; |
| 2128 | dev0->quota -= work_done; | 2141 | dev0->quota -= work_done; |
| 2129 | 2142 | ||
| @@ -2133,9 +2146,24 @@ static int sky2_poll(struct net_device *dev0, int *budget) | |||
| 2133 | sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); | 2146 | sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); |
| 2134 | } | 2147 | } |
| 2135 | 2148 | ||
| 2136 | netif_rx_complete(dev0); | 2149 | mod_timer(&hw->idle_timer, jiffies + HZ); |
| 2150 | |||
| 2151 | local_irq_disable(); | ||
| 2152 | __netif_rx_complete(dev0); | ||
| 2137 | 2153 | ||
| 2138 | status = sky2_read32(hw, B0_Y2_SP_LISR); | 2154 | status = sky2_read32(hw, B0_Y2_SP_LISR); |
| 2155 | |||
| 2156 | if (unlikely(status)) { | ||
| 2157 | /* More work pending, try and keep going */ | ||
| 2158 | if (__netif_rx_schedule_prep(dev0)) { | ||
| 2159 | __netif_rx_reschedule(dev0, work_done); | ||
| 2160 | status = sky2_read32(hw, B0_Y2_SP_EISR); | ||
| 2161 | local_irq_enable(); | ||
| 2162 | goto restart_poll; | ||
| 2163 | } | ||
| 2164 | } | ||
| 2165 | |||
| 2166 | local_irq_enable(); | ||
| 2139 | return 0; | 2167 | return 0; |
| 2140 | } | 2168 | } |
| 2141 | 2169 | ||
| @@ -2153,8 +2181,6 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 2153 | prefetch(&hw->st_le[hw->st_idx]); | 2181 | prefetch(&hw->st_le[hw->st_idx]); |
| 2154 | if (likely(__netif_rx_schedule_prep(dev0))) | 2182 | if (likely(__netif_rx_schedule_prep(dev0))) |
| 2155 | __netif_rx_schedule(dev0); | 2183 | __netif_rx_schedule(dev0); |
| 2156 | else | ||
| 2157 | printk(KERN_DEBUG PFX "irq race detected\n"); | ||
| 2158 | 2184 | ||
| 2159 | return IRQ_HANDLED; | 2185 | return IRQ_HANDLED; |
| 2160 | } | 2186 | } |
| @@ -2193,7 +2219,7 @@ static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk) | |||
| 2193 | } | 2219 | } |
| 2194 | 2220 | ||
| 2195 | 2221 | ||
| 2196 | static int sky2_reset(struct sky2_hw *hw) | 2222 | static int __devinit sky2_reset(struct sky2_hw *hw) |
| 2197 | { | 2223 | { |
| 2198 | u16 status; | 2224 | u16 status; |
| 2199 | u8 t8, pmd_type; | 2225 | u8 t8, pmd_type; |
| @@ -3276,6 +3302,8 @@ static int __devinit sky2_probe(struct pci_dev *pdev, | |||
| 3276 | 3302 | ||
| 3277 | sky2_write32(hw, B0_IMSK, Y2_IS_BASE); | 3303 | sky2_write32(hw, B0_IMSK, Y2_IS_BASE); |
| 3278 | 3304 | ||
| 3305 | setup_timer(&hw->idle_timer, sky2_idle, (unsigned long) dev); | ||
| 3306 | |||
| 3279 | pci_set_drvdata(pdev, hw); | 3307 | pci_set_drvdata(pdev, hw); |
| 3280 | 3308 | ||
| 3281 | return 0; | 3309 | return 0; |
| @@ -3311,13 +3339,15 @@ static void __devexit sky2_remove(struct pci_dev *pdev) | |||
| 3311 | if (!hw) | 3339 | if (!hw) |
| 3312 | return; | 3340 | return; |
| 3313 | 3341 | ||
| 3342 | del_timer_sync(&hw->idle_timer); | ||
| 3343 | |||
| 3344 | sky2_write32(hw, B0_IMSK, 0); | ||
| 3314 | dev0 = hw->dev[0]; | 3345 | dev0 = hw->dev[0]; |
| 3315 | dev1 = hw->dev[1]; | 3346 | dev1 = hw->dev[1]; |
| 3316 | if (dev1) | 3347 | if (dev1) |
| 3317 | unregister_netdev(dev1); | 3348 | unregister_netdev(dev1); |
| 3318 | unregister_netdev(dev0); | 3349 | unregister_netdev(dev0); |
| 3319 | 3350 | ||
| 3320 | sky2_write32(hw, B0_IMSK, 0); | ||
| 3321 | sky2_set_power_state(hw, PCI_D3hot); | 3351 | sky2_set_power_state(hw, PCI_D3hot); |
| 3322 | sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); | 3352 | sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); |
| 3323 | sky2_write8(hw, B0_CTST, CS_RST_SET); | 3353 | sky2_write8(hw, B0_CTST, CS_RST_SET); |
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 89dd18cd12f0..b026f5653f04 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
| @@ -1880,6 +1880,8 @@ struct sky2_hw { | |||
| 1880 | struct sky2_status_le *st_le; | 1880 | struct sky2_status_le *st_le; |
| 1881 | u32 st_idx; | 1881 | u32 st_idx; |
| 1882 | dma_addr_t st_dma; | 1882 | dma_addr_t st_dma; |
| 1883 | |||
| 1884 | struct timer_list idle_timer; | ||
| 1883 | int msi_detected; | 1885 | int msi_detected; |
| 1884 | wait_queue_head_t msi_wait; | 1886 | wait_queue_head_t msi_wait; |
| 1885 | }; | 1887 | }; |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h index 2d520e4b0276..b7d77638ba8c 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h | |||
| @@ -213,6 +213,14 @@ static inline | |||
| 213 | void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring) | 213 | void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring) |
| 214 | { | 214 | { |
| 215 | } | 215 | } |
| 216 | static inline | ||
| 217 | void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring) | ||
| 218 | { | ||
| 219 | } | ||
| 220 | static inline | ||
| 221 | void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring) | ||
| 222 | { | ||
| 223 | } | ||
| 216 | 224 | ||
| 217 | #endif /* CONFIG_BCM43XX_DMA */ | 225 | #endif /* CONFIG_BCM43XX_DMA */ |
| 218 | #endif /* BCM43xx_DMA_H_ */ | 226 | #endif /* BCM43xx_DMA_H_ */ |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c index c59ddd40680d..0aa1bd269a25 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include "bcm43xx_pio.h" | 27 | #include "bcm43xx_pio.h" |
| 28 | #include "bcm43xx_main.h" | 28 | #include "bcm43xx_main.h" |
| 29 | #include "bcm43xx_xmit.h" | 29 | #include "bcm43xx_xmit.h" |
| 30 | #include "bcm43xx_power.h" | ||
| 30 | 31 | ||
| 31 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 32 | 33 | ||
| @@ -44,10 +45,10 @@ static void tx_octet(struct bcm43xx_pioqueue *queue, | |||
| 44 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, | 45 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, |
| 45 | octet); | 46 | octet); |
| 46 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, | 47 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, |
| 47 | BCM43xx_PIO_TXCTL_WRITEHI); | 48 | BCM43xx_PIO_TXCTL_WRITELO); |
| 48 | } else { | 49 | } else { |
| 49 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, | 50 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, |
| 50 | BCM43xx_PIO_TXCTL_WRITEHI); | 51 | BCM43xx_PIO_TXCTL_WRITELO); |
| 51 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, | 52 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, |
| 52 | octet); | 53 | octet); |
| 53 | } | 54 | } |
| @@ -103,7 +104,7 @@ static void tx_complete(struct bcm43xx_pioqueue *queue, | |||
| 103 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, | 104 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, |
| 104 | skb->data[skb->len - 1]); | 105 | skb->data[skb->len - 1]); |
| 105 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, | 106 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, |
| 106 | BCM43xx_PIO_TXCTL_WRITEHI | | 107 | BCM43xx_PIO_TXCTL_WRITELO | |
| 107 | BCM43xx_PIO_TXCTL_COMPLETE); | 108 | BCM43xx_PIO_TXCTL_COMPLETE); |
| 108 | } else { | 109 | } else { |
| 109 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, | 110 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, |
| @@ -112,9 +113,10 @@ static void tx_complete(struct bcm43xx_pioqueue *queue, | |||
| 112 | } | 113 | } |
| 113 | 114 | ||
| 114 | static u16 generate_cookie(struct bcm43xx_pioqueue *queue, | 115 | static u16 generate_cookie(struct bcm43xx_pioqueue *queue, |
| 115 | int packetindex) | 116 | struct bcm43xx_pio_txpacket *packet) |
| 116 | { | 117 | { |
| 117 | u16 cookie = 0x0000; | 118 | u16 cookie = 0x0000; |
| 119 | int packetindex; | ||
| 118 | 120 | ||
| 119 | /* We use the upper 4 bits for the PIO | 121 | /* We use the upper 4 bits for the PIO |
| 120 | * controller ID and the lower 12 bits | 122 | * controller ID and the lower 12 bits |
| @@ -135,6 +137,7 @@ static u16 generate_cookie(struct bcm43xx_pioqueue *queue, | |||
| 135 | default: | 137 | default: |
| 136 | assert(0); | 138 | assert(0); |
| 137 | } | 139 | } |
| 140 | packetindex = pio_txpacket_getindex(packet); | ||
| 138 | assert(((u16)packetindex & 0xF000) == 0x0000); | 141 | assert(((u16)packetindex & 0xF000) == 0x0000); |
| 139 | cookie |= (u16)packetindex; | 142 | cookie |= (u16)packetindex; |
| 140 | 143 | ||
| @@ -184,7 +187,7 @@ static void pio_tx_write_fragment(struct bcm43xx_pioqueue *queue, | |||
| 184 | bcm43xx_generate_txhdr(queue->bcm, | 187 | bcm43xx_generate_txhdr(queue->bcm, |
| 185 | &txhdr, skb->data, skb->len, | 188 | &txhdr, skb->data, skb->len, |
| 186 | (packet->xmitted_frags == 0), | 189 | (packet->xmitted_frags == 0), |
| 187 | generate_cookie(queue, pio_txpacket_getindex(packet))); | 190 | generate_cookie(queue, packet)); |
| 188 | 191 | ||
| 189 | tx_start(queue); | 192 | tx_start(queue); |
| 190 | octets = skb->len + sizeof(txhdr); | 193 | octets = skb->len + sizeof(txhdr); |
| @@ -241,7 +244,7 @@ static int pio_tx_packet(struct bcm43xx_pio_txpacket *packet) | |||
| 241 | queue->tx_devq_packets++; | 244 | queue->tx_devq_packets++; |
| 242 | queue->tx_devq_used += octets; | 245 | queue->tx_devq_used += octets; |
| 243 | 246 | ||
| 244 | assert(packet->xmitted_frags <= packet->txb->nr_frags); | 247 | assert(packet->xmitted_frags < packet->txb->nr_frags); |
| 245 | packet->xmitted_frags++; | 248 | packet->xmitted_frags++; |
| 246 | packet->xmitted_octets += octets; | 249 | packet->xmitted_octets += octets; |
| 247 | } | 250 | } |
| @@ -257,8 +260,14 @@ static void tx_tasklet(unsigned long d) | |||
| 257 | unsigned long flags; | 260 | unsigned long flags; |
| 258 | struct bcm43xx_pio_txpacket *packet, *tmp_packet; | 261 | struct bcm43xx_pio_txpacket *packet, *tmp_packet; |
| 259 | int err; | 262 | int err; |
| 263 | u16 txctl; | ||
| 260 | 264 | ||
| 261 | bcm43xx_lock_mmio(bcm, flags); | 265 | bcm43xx_lock_mmio(bcm, flags); |
| 266 | |||
| 267 | txctl = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL); | ||
| 268 | if (txctl & BCM43xx_PIO_TXCTL_SUSPEND) | ||
| 269 | goto out_unlock; | ||
| 270 | |||
| 262 | list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list) { | 271 | list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list) { |
| 263 | assert(packet->xmitted_frags < packet->txb->nr_frags); | 272 | assert(packet->xmitted_frags < packet->txb->nr_frags); |
| 264 | if (packet->xmitted_frags == 0) { | 273 | if (packet->xmitted_frags == 0) { |
| @@ -288,6 +297,7 @@ static void tx_tasklet(unsigned long d) | |||
| 288 | next_packet: | 297 | next_packet: |
| 289 | continue; | 298 | continue; |
| 290 | } | 299 | } |
| 300 | out_unlock: | ||
| 291 | bcm43xx_unlock_mmio(bcm, flags); | 301 | bcm43xx_unlock_mmio(bcm, flags); |
| 292 | } | 302 | } |
| 293 | 303 | ||
| @@ -330,12 +340,19 @@ struct bcm43xx_pioqueue * bcm43xx_setup_pioqueue(struct bcm43xx_private *bcm, | |||
| 330 | (unsigned long)queue); | 340 | (unsigned long)queue); |
| 331 | 341 | ||
| 332 | value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); | 342 | value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); |
| 333 | value |= BCM43xx_SBF_XFER_REG_BYTESWAP; | 343 | value &= ~BCM43xx_SBF_XFER_REG_BYTESWAP; |
| 334 | bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value); | 344 | bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value); |
| 335 | 345 | ||
| 336 | qsize = bcm43xx_read16(bcm, queue->mmio_base + BCM43xx_PIO_TXQBUFSIZE); | 346 | qsize = bcm43xx_read16(bcm, queue->mmio_base + BCM43xx_PIO_TXQBUFSIZE); |
| 347 | if (qsize == 0) { | ||
| 348 | printk(KERN_ERR PFX "ERROR: This card does not support PIO " | ||
| 349 | "operation mode. Please use DMA mode " | ||
| 350 | "(module parameter pio=0).\n"); | ||
| 351 | goto err_freequeue; | ||
| 352 | } | ||
| 337 | if (qsize <= BCM43xx_PIO_TXQADJUST) { | 353 | if (qsize <= BCM43xx_PIO_TXQADJUST) { |
| 338 | printk(KERN_ERR PFX "PIO tx device-queue too small (%u)\n", qsize); | 354 | printk(KERN_ERR PFX "PIO tx device-queue too small (%u)\n", |
| 355 | qsize); | ||
| 339 | goto err_freequeue; | 356 | goto err_freequeue; |
| 340 | } | 357 | } |
| 341 | qsize -= BCM43xx_PIO_TXQADJUST; | 358 | qsize -= BCM43xx_PIO_TXQADJUST; |
| @@ -444,15 +461,10 @@ int bcm43xx_pio_tx(struct bcm43xx_private *bcm, | |||
| 444 | { | 461 | { |
| 445 | struct bcm43xx_pioqueue *queue = bcm43xx_current_pio(bcm)->queue1; | 462 | struct bcm43xx_pioqueue *queue = bcm43xx_current_pio(bcm)->queue1; |
| 446 | struct bcm43xx_pio_txpacket *packet; | 463 | struct bcm43xx_pio_txpacket *packet; |
| 447 | u16 tmp; | ||
| 448 | 464 | ||
| 449 | assert(!queue->tx_suspended); | 465 | assert(!queue->tx_suspended); |
| 450 | assert(!list_empty(&queue->txfree)); | 466 | assert(!list_empty(&queue->txfree)); |
| 451 | 467 | ||
| 452 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL); | ||
| 453 | if (tmp & BCM43xx_PIO_TXCTL_SUSPEND) | ||
| 454 | return -EBUSY; | ||
| 455 | |||
| 456 | packet = list_entry(queue->txfree.next, struct bcm43xx_pio_txpacket, list); | 468 | packet = list_entry(queue->txfree.next, struct bcm43xx_pio_txpacket, list); |
| 457 | packet->txb = txb; | 469 | packet->txb = txb; |
| 458 | packet->xmitted_frags = 0; | 470 | packet->xmitted_frags = 0; |
| @@ -462,7 +474,7 @@ int bcm43xx_pio_tx(struct bcm43xx_private *bcm, | |||
| 462 | assert(queue->nr_txfree < BCM43xx_PIO_MAXTXPACKETS); | 474 | assert(queue->nr_txfree < BCM43xx_PIO_MAXTXPACKETS); |
| 463 | 475 | ||
| 464 | /* Suspend TX, if we are out of packets in the "free" queue. */ | 476 | /* Suspend TX, if we are out of packets in the "free" queue. */ |
| 465 | if (unlikely(list_empty(&queue->txfree))) { | 477 | if (list_empty(&queue->txfree)) { |
| 466 | netif_stop_queue(queue->bcm->net_dev); | 478 | netif_stop_queue(queue->bcm->net_dev); |
| 467 | queue->tx_suspended = 1; | 479 | queue->tx_suspended = 1; |
| 468 | } | 480 | } |
| @@ -480,15 +492,15 @@ void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm, | |||
| 480 | 492 | ||
| 481 | queue = parse_cookie(bcm, status->cookie, &packet); | 493 | queue = parse_cookie(bcm, status->cookie, &packet); |
| 482 | assert(queue); | 494 | assert(queue); |
| 483 | //TODO | 495 | |
| 484 | if (!queue) | ||
| 485 | return; | ||
| 486 | free_txpacket(packet, 1); | 496 | free_txpacket(packet, 1); |
| 487 | if (unlikely(queue->tx_suspended)) { | 497 | if (queue->tx_suspended) { |
| 488 | queue->tx_suspended = 0; | 498 | queue->tx_suspended = 0; |
| 489 | netif_wake_queue(queue->bcm->net_dev); | 499 | netif_wake_queue(queue->bcm->net_dev); |
| 490 | } | 500 | } |
| 491 | /* If there are packets on the txqueue, poke the tasklet. */ | 501 | /* If there are packets on the txqueue, poke the tasklet |
| 502 | * to transmit them. | ||
| 503 | */ | ||
| 492 | if (!list_empty(&queue->txqueue)) | 504 | if (!list_empty(&queue->txqueue)) |
| 493 | tasklet_schedule(&queue->txtask); | 505 | tasklet_schedule(&queue->txtask); |
| 494 | } | 506 | } |
| @@ -519,12 +531,9 @@ void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue) | |||
| 519 | int i, preamble_readwords; | 531 | int i, preamble_readwords; |
| 520 | struct sk_buff *skb; | 532 | struct sk_buff *skb; |
| 521 | 533 | ||
| 522 | return; | ||
| 523 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL); | 534 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL); |
| 524 | if (!(tmp & BCM43xx_PIO_RXCTL_DATAAVAILABLE)) { | 535 | if (!(tmp & BCM43xx_PIO_RXCTL_DATAAVAILABLE)) |
| 525 | dprintkl(KERN_ERR PFX "PIO RX: No data available\n");//TODO: remove this printk. | ||
| 526 | return; | 536 | return; |
| 527 | } | ||
| 528 | bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL, | 537 | bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL, |
| 529 | BCM43xx_PIO_RXCTL_DATAAVAILABLE); | 538 | BCM43xx_PIO_RXCTL_DATAAVAILABLE); |
| 530 | 539 | ||
| @@ -538,8 +547,7 @@ return; | |||
| 538 | return; | 547 | return; |
| 539 | data_ready: | 548 | data_ready: |
| 540 | 549 | ||
| 541 | //FIXME: endianess in this function. | 550 | len = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); |
| 542 | len = le16_to_cpu(bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA)); | ||
| 543 | if (unlikely(len > 0x700)) { | 551 | if (unlikely(len > 0x700)) { |
| 544 | pio_rx_error(queue, 0, "len > 0x700"); | 552 | pio_rx_error(queue, 0, "len > 0x700"); |
| 545 | return; | 553 | return; |
| @@ -555,7 +563,7 @@ data_ready: | |||
| 555 | preamble_readwords = 18 / sizeof(u16); | 563 | preamble_readwords = 18 / sizeof(u16); |
| 556 | for (i = 0; i < preamble_readwords; i++) { | 564 | for (i = 0; i < preamble_readwords; i++) { |
| 557 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); | 565 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); |
| 558 | preamble[i + 1] = cpu_to_be16(tmp);//FIXME? | 566 | preamble[i + 1] = cpu_to_le16(tmp); |
| 559 | } | 567 | } |
| 560 | rxhdr = (struct bcm43xx_rxhdr *)preamble; | 568 | rxhdr = (struct bcm43xx_rxhdr *)preamble; |
| 561 | rxflags2 = le16_to_cpu(rxhdr->flags2); | 569 | rxflags2 = le16_to_cpu(rxhdr->flags2); |
| @@ -591,16 +599,40 @@ data_ready: | |||
| 591 | } | 599 | } |
| 592 | skb_put(skb, len); | 600 | skb_put(skb, len); |
| 593 | for (i = 0; i < len - 1; i += 2) { | 601 | for (i = 0; i < len - 1; i += 2) { |
| 594 | tmp = cpu_to_be16(bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA)); | 602 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); |
| 595 | *((u16 *)(skb->data + i)) = tmp; | 603 | *((u16 *)(skb->data + i)) = cpu_to_le16(tmp); |
| 596 | } | 604 | } |
| 597 | if (len % 2) { | 605 | if (len % 2) { |
| 598 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); | 606 | tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); |
| 599 | skb->data[len - 1] = (tmp & 0x00FF); | 607 | skb->data[len - 1] = (tmp & 0x00FF); |
| 608 | /* The specs say the following is required, but | ||
| 609 | * it is wrong and corrupts the PLCP. If we don't do | ||
| 610 | * this, the PLCP seems to be correct. So ifdef it out for now. | ||
| 611 | */ | ||
| 612 | #if 0 | ||
| 600 | if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME) | 613 | if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME) |
| 601 | skb->data[0x20] = (tmp & 0xFF00) >> 8; | 614 | skb->data[2] = (tmp & 0xFF00) >> 8; |
| 602 | else | 615 | else |
| 603 | skb->data[0x1E] = (tmp & 0xFF00) >> 8; | 616 | skb->data[0] = (tmp & 0xFF00) >> 8; |
| 617 | #endif | ||
| 604 | } | 618 | } |
| 619 | skb_trim(skb, len - IEEE80211_FCS_LEN); | ||
| 605 | bcm43xx_rx(queue->bcm, skb, rxhdr); | 620 | bcm43xx_rx(queue->bcm, skb, rxhdr); |
| 606 | } | 621 | } |
| 622 | |||
| 623 | void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue) | ||
| 624 | { | ||
| 625 | bcm43xx_power_saving_ctl_bits(queue->bcm, -1, 1); | ||
| 626 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, | ||
| 627 | bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL) | ||
| 628 | | BCM43xx_PIO_TXCTL_SUSPEND); | ||
| 629 | } | ||
| 630 | |||
| 631 | void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue) | ||
| 632 | { | ||
| 633 | bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, | ||
| 634 | bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL) | ||
| 635 | & ~BCM43xx_PIO_TXCTL_SUSPEND); | ||
| 636 | bcm43xx_power_saving_ctl_bits(queue->bcm, -1, -1); | ||
| 637 | tasklet_schedule(&queue->txtask); | ||
| 638 | } | ||
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h index 970627bc1769..dfc78209e3a3 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | #define BCM43xx_PIO_RXCTL 0x08 | 14 | #define BCM43xx_PIO_RXCTL 0x08 |
| 15 | #define BCM43xx_PIO_RXDATA 0x0A | 15 | #define BCM43xx_PIO_RXDATA 0x0A |
| 16 | 16 | ||
| 17 | #define BCM43xx_PIO_TXCTL_WRITEHI (1 << 0) | 17 | #define BCM43xx_PIO_TXCTL_WRITELO (1 << 0) |
| 18 | #define BCM43xx_PIO_TXCTL_WRITELO (1 << 1) | 18 | #define BCM43xx_PIO_TXCTL_WRITEHI (1 << 1) |
| 19 | #define BCM43xx_PIO_TXCTL_COMPLETE (1 << 2) | 19 | #define BCM43xx_PIO_TXCTL_COMPLETE (1 << 2) |
| 20 | #define BCM43xx_PIO_TXCTL_INIT (1 << 3) | 20 | #define BCM43xx_PIO_TXCTL_INIT (1 << 3) |
| 21 | #define BCM43xx_PIO_TXCTL_SUSPEND (1 << 7) | 21 | #define BCM43xx_PIO_TXCTL_SUSPEND (1 << 7) |
| @@ -95,6 +95,7 @@ void bcm43xx_pio_write(struct bcm43xx_pioqueue *queue, | |||
| 95 | u16 offset, u16 value) | 95 | u16 offset, u16 value) |
| 96 | { | 96 | { |
| 97 | bcm43xx_write16(queue->bcm, queue->mmio_base + offset, value); | 97 | bcm43xx_write16(queue->bcm, queue->mmio_base + offset, value); |
| 98 | mmiowb(); | ||
| 98 | } | 99 | } |
| 99 | 100 | ||
| 100 | 101 | ||
| @@ -107,6 +108,9 @@ void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm, | |||
| 107 | struct bcm43xx_xmitstatus *status); | 108 | struct bcm43xx_xmitstatus *status); |
| 108 | void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue); | 109 | void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue); |
| 109 | 110 | ||
| 111 | void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue); | ||
| 112 | void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue); | ||
| 113 | |||
| 110 | #else /* CONFIG_BCM43XX_PIO */ | 114 | #else /* CONFIG_BCM43XX_PIO */ |
| 111 | 115 | ||
| 112 | static inline | 116 | static inline |
| @@ -133,6 +137,14 @@ static inline | |||
| 133 | void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue) | 137 | void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue) |
| 134 | { | 138 | { |
| 135 | } | 139 | } |
| 140 | static inline | ||
| 141 | void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue) | ||
| 142 | { | ||
| 143 | } | ||
| 144 | static inline | ||
| 145 | void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue) | ||
| 146 | { | ||
| 147 | } | ||
| 136 | 148 | ||
| 137 | #endif /* CONFIG_BCM43XX_PIO */ | 149 | #endif /* CONFIG_BCM43XX_PIO */ |
| 138 | #endif /* BCM43xx_PIO_H_ */ | 150 | #endif /* BCM43xx_PIO_H_ */ |
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 8b37e824dfcb..8399de581893 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
| @@ -1860,7 +1860,7 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
| 1860 | memset(&iwe, 0, sizeof(iwe)); | 1860 | memset(&iwe, 0, sizeof(iwe)); |
| 1861 | iwe.cmd = SIOCGIWFREQ; | 1861 | iwe.cmd = SIOCGIWFREQ; |
| 1862 | if (scan) { | 1862 | if (scan) { |
| 1863 | chan = scan->chid; | 1863 | chan = le16_to_cpu(scan->chid); |
| 1864 | } else if (bss) { | 1864 | } else if (bss) { |
| 1865 | chan = bss->chan; | 1865 | chan = bss->chan; |
| 1866 | } else { | 1866 | } else { |
| @@ -1868,7 +1868,7 @@ static char * __prism2_translate_scan(local_info_t *local, | |||
| 1868 | } | 1868 | } |
| 1869 | 1869 | ||
| 1870 | if (chan > 0) { | 1870 | if (chan > 0) { |
| 1871 | iwe.u.freq.m = freq_list[le16_to_cpu(chan - 1)] * 100000; | 1871 | iwe.u.freq.m = freq_list[chan - 1] * 100000; |
| 1872 | iwe.u.freq.e = 1; | 1872 | iwe.u.freq.e = 1; |
| 1873 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, | 1873 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, |
| 1874 | IW_EV_FREQ_LEN); | 1874 | IW_EV_FREQ_LEN); |
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index 4e53be9c03ab..bbeabe3fc4c6 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c | |||
| @@ -535,7 +535,7 @@ pdcs_auto_read(struct subsystem *entry, char *buf, int knob) | |||
| 535 | { | 535 | { |
| 536 | char *out = buf; | 536 | char *out = buf; |
| 537 | struct pdcspath_entry *pathentry; | 537 | struct pdcspath_entry *pathentry; |
| 538 | 538 | ||
| 539 | if (!entry || !buf) | 539 | if (!entry || !buf) |
| 540 | return -EINVAL; | 540 | return -EINVAL; |
| 541 | 541 | ||
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 42b32ff2fca6..278f325021ee 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
| @@ -178,6 +178,11 @@ extern struct proc_dir_entry * proc_mckinley_root; | |||
| 178 | #define ROPE6_CTL 0x230 | 178 | #define ROPE6_CTL 0x230 |
| 179 | #define ROPE7_CTL 0x238 | 179 | #define ROPE7_CTL 0x238 |
| 180 | 180 | ||
| 181 | #define IOC_ROPE0_CFG 0x500 /* pluto only */ | ||
| 182 | #define IOC_ROPE_AO 0x10 /* Allow "Relaxed Ordering" */ | ||
| 183 | |||
| 184 | |||
| 185 | |||
| 181 | #define HF_ENABLE 0x40 | 186 | #define HF_ENABLE 0x40 |
| 182 | 187 | ||
| 183 | 188 | ||
| @@ -1759,19 +1764,33 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa, | |||
| 1759 | 1764 | ||
| 1760 | sba_dev->num_ioc = num_ioc; | 1765 | sba_dev->num_ioc = num_ioc; |
| 1761 | for (i = 0; i < num_ioc; i++) { | 1766 | for (i = 0; i < num_ioc; i++) { |
| 1762 | /* | 1767 | unsigned long ioc_hpa = sba_dev->ioc[i].ioc_hpa; |
| 1763 | ** Make sure the box crashes if we get any errors on a rope. | 1768 | unsigned int j; |
| 1764 | */ | 1769 | |
| 1765 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE0_CTL); | 1770 | for (j=0; j < sizeof(u64) * ROPES_PER_IOC; j+=sizeof(u64)) { |
| 1766 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE1_CTL); | 1771 | |
| 1767 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE2_CTL); | 1772 | /* |
| 1768 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE3_CTL); | 1773 | * Clear ROPE(N)_CONFIG AO bit. |
| 1769 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE4_CTL); | 1774 | * Disables "NT Ordering" (~= !"Relaxed Ordering") |
| 1770 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE5_CTL); | 1775 | * Overrides bit 1 in DMA Hint Sets. |
| 1771 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE6_CTL); | 1776 | * Improves netperf UDP_STREAM by ~10% for bcm5701. |
| 1772 | WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE7_CTL); | 1777 | */ |
| 1773 | 1778 | if (IS_PLUTO(sba_dev->iodc)) { | |
| 1774 | /* flush out the writes */ | 1779 | unsigned long rope_cfg, cfg_val; |
| 1780 | |||
| 1781 | rope_cfg = ioc_hpa + IOC_ROPE0_CFG + j; | ||
| 1782 | cfg_val = READ_REG(rope_cfg); | ||
| 1783 | cfg_val &= ~IOC_ROPE_AO; | ||
| 1784 | WRITE_REG(cfg_val, rope_cfg); | ||
| 1785 | } | ||
| 1786 | |||
| 1787 | /* | ||
| 1788 | ** Make sure the box crashes on rope errors. | ||
| 1789 | */ | ||
| 1790 | WRITE_REG(HF_ENABLE, ioc_hpa + ROPE0_CTL + j); | ||
| 1791 | } | ||
| 1792 | |||
| 1793 | /* flush out the last writes */ | ||
| 1775 | READ_REG(sba_dev->ioc[i].ioc_hpa + ROPE7_CTL); | 1794 | READ_REG(sba_dev->ioc[i].ioc_hpa + ROPE7_CTL); |
| 1776 | 1795 | ||
| 1777 | DBG_INIT(" ioc[%d] ROPE_CFG 0x%Lx ROPE_DBG 0x%Lx\n", | 1796 | DBG_INIT(" ioc[%d] ROPE_CFG 0x%Lx ROPE_DBG 0x%Lx\n", |
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index 719b863bc20e..828eb45062de 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c | |||
| @@ -155,7 +155,7 @@ superio_init(struct pci_dev *pcidev) | |||
| 155 | struct pci_dev *pdev = sio->lio_pdev; | 155 | struct pci_dev *pdev = sio->lio_pdev; |
| 156 | u16 word; | 156 | u16 word; |
| 157 | 157 | ||
| 158 | if (sio->suckyio_irq_enabled) | 158 | if (sio->suckyio_irq_enabled) |
| 159 | return; | 159 | return; |
| 160 | 160 | ||
| 161 | BUG_ON(!pdev); | 161 | BUG_ON(!pdev); |
| @@ -194,7 +194,7 @@ superio_init(struct pci_dev *pcidev) | |||
| 194 | request_region (sio->acpi_base, 0x1f, "acpi"); | 194 | request_region (sio->acpi_base, 0x1f, "acpi"); |
| 195 | 195 | ||
| 196 | /* Enable the legacy I/O function */ | 196 | /* Enable the legacy I/O function */ |
| 197 | pci_read_config_word (pdev, PCI_COMMAND, &word); | 197 | pci_read_config_word (pdev, PCI_COMMAND, &word); |
| 198 | word |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_IO; | 198 | word |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_IO; |
| 199 | pci_write_config_word (pdev, PCI_COMMAND, word); | 199 | pci_write_config_word (pdev, PCI_COMMAND, word); |
| 200 | 200 | ||
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 2087a397ef16..9855c4c920b8 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -793,8 +793,10 @@ static int msix_capability_init(struct pci_dev *dev, | |||
| 793 | if (!entry) | 793 | if (!entry) |
| 794 | break; | 794 | break; |
| 795 | vector = get_msi_vector(dev); | 795 | vector = get_msi_vector(dev); |
| 796 | if (vector < 0) | 796 | if (vector < 0) { |
| 797 | kmem_cache_free(msi_cachep, entry); | ||
| 797 | break; | 798 | break; |
| 799 | } | ||
| 798 | 800 | ||
| 799 | j = entries[i].entry; | 801 | j = entries[i].entry; |
| 800 | entries[i].vector = vector; | 802 | entries[i].vector = vector; |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c42ae2cf8d64..19e2b174d33c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -642,13 +642,15 @@ static void quirk_via_irq(struct pci_dev *dev) | |||
| 642 | new_irq = dev->irq & 0xf; | 642 | new_irq = dev->irq & 0xf; |
| 643 | pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq); | 643 | pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq); |
| 644 | if (new_irq != irq) { | 644 | if (new_irq != irq) { |
| 645 | printk(KERN_INFO "PCI: Via IRQ fixup for %s, from %d to %d\n", | 645 | printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n", |
| 646 | pci_name(dev), irq, new_irq); | 646 | pci_name(dev), irq, new_irq); |
| 647 | udelay(15); /* unknown if delay really needed */ | 647 | udelay(15); /* unknown if delay really needed */ |
| 648 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq); | 648 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq); |
| 649 | } | 649 | } |
| 650 | } | 650 | } |
| 651 | DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); | 651 | DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_irq); |
| 652 | DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_irq); | ||
| 653 | DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, quirk_via_irq); | ||
| 652 | 654 | ||
| 653 | /* | 655 | /* |
| 654 | * VIA VT82C598 has its device ID settable and many BIOSes | 656 | * VIA VT82C598 has its device ID settable and many BIOSes |
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index cba6c9eef28e..61cb4b29f55c 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -250,7 +250,7 @@ config M32R_CFC_NUM | |||
| 250 | 250 | ||
| 251 | config PCMCIA_VRC4171 | 251 | config PCMCIA_VRC4171 |
| 252 | tristate "NEC VRC4171 Card Controllers support" | 252 | tristate "NEC VRC4171 Card Controllers support" |
| 253 | depends on VRC4171 && PCMCIA | 253 | depends on CPU_VR41XX && ISA && PCMCIA |
| 254 | 254 | ||
| 255 | config PCMCIA_VRC4173 | 255 | config PCMCIA_VRC4173 |
| 256 | tristate "NEC VRC4173 CARDU support" | 256 | tristate "NEC VRC4173 CARDU support" |
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index ae10d1eed65e..48d3b3d30c21 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -236,11 +236,11 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv) | |||
| 236 | /** | 236 | /** |
| 237 | * pcmcia_load_firmware - load CIS from userspace if device-provided is broken | 237 | * pcmcia_load_firmware - load CIS from userspace if device-provided is broken |
| 238 | * @dev - the pcmcia device which needs a CIS override | 238 | * @dev - the pcmcia device which needs a CIS override |
| 239 | * @filename - requested filename in /lib/firmware/cis/ | 239 | * @filename - requested filename in /lib/firmware/ |
| 240 | * | 240 | * |
| 241 | * This uses the in-kernel firmware loading mechanism to use a "fake CIS" if | 241 | * This uses the in-kernel firmware loading mechanism to use a "fake CIS" if |
| 242 | * the one provided by the card is broken. The firmware files reside in | 242 | * the one provided by the card is broken. The firmware files reside in |
| 243 | * /lib/firmware/cis/ in userspace. | 243 | * /lib/firmware/ in userspace. |
| 244 | */ | 244 | */ |
| 245 | static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) | 245 | static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) |
| 246 | { | 246 | { |
| @@ -298,9 +298,6 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam | |||
| 298 | * | 298 | * |
| 299 | * Registers a PCMCIA driver with the PCMCIA bus core. | 299 | * Registers a PCMCIA driver with the PCMCIA bus core. |
| 300 | */ | 300 | */ |
| 301 | static int pcmcia_device_probe(struct device *dev); | ||
| 302 | static int pcmcia_device_remove(struct device * dev); | ||
| 303 | |||
| 304 | int pcmcia_register_driver(struct pcmcia_driver *driver) | 301 | int pcmcia_register_driver(struct pcmcia_driver *driver) |
| 305 | { | 302 | { |
| 306 | if (!driver) | 303 | if (!driver) |
| @@ -400,7 +397,7 @@ static int pcmcia_device_probe(struct device * dev) | |||
| 400 | * call which will then check whether there are two | 397 | * call which will then check whether there are two |
| 401 | * pseudo devices, and if not, add the second one. | 398 | * pseudo devices, and if not, add the second one. |
| 402 | */ | 399 | */ |
| 403 | did = (struct pcmcia_device_id *) p_dev->dev.driver_data; | 400 | did = p_dev->dev.driver_data; |
| 404 | if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && | 401 | if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && |
| 405 | (p_dev->socket->device_count == 1) && (p_dev->device_no == 0)) | 402 | (p_dev->socket->device_count == 1) && (p_dev->device_no == 0)) |
| 406 | pcmcia_add_pseudo_device(p_dev->socket); | 403 | pcmcia_add_pseudo_device(p_dev->socket); |
| @@ -448,7 +445,6 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le | |||
| 448 | return; | 445 | return; |
| 449 | } | 446 | } |
| 450 | 447 | ||
| 451 | |||
| 452 | static int pcmcia_device_remove(struct device * dev) | 448 | static int pcmcia_device_remove(struct device * dev) |
| 453 | { | 449 | { |
| 454 | struct pcmcia_device *p_dev; | 450 | struct pcmcia_device *p_dev; |
| @@ -463,7 +459,7 @@ static int pcmcia_device_remove(struct device * dev) | |||
| 463 | * pseudo multi-function card, we need to unbind | 459 | * pseudo multi-function card, we need to unbind |
| 464 | * all devices | 460 | * all devices |
| 465 | */ | 461 | */ |
| 466 | did = (struct pcmcia_device_id *) p_dev->dev.driver_data; | 462 | did = p_dev->dev.driver_data; |
| 467 | if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && | 463 | if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && |
| 468 | (p_dev->socket->device_count != 0) && | 464 | (p_dev->socket->device_count != 0) && |
| 469 | (p_dev->device_no == 0)) | 465 | (p_dev->device_no == 0)) |
| @@ -476,6 +472,8 @@ static int pcmcia_device_remove(struct device * dev) | |||
| 476 | if (p_drv->remove) | 472 | if (p_drv->remove) |
| 477 | p_drv->remove(p_dev); | 473 | p_drv->remove(p_dev); |
| 478 | 474 | ||
| 475 | p_dev->dev_node = NULL; | ||
| 476 | |||
| 479 | /* check for proper unloading */ | 477 | /* check for proper unloading */ |
| 480 | if (p_dev->_irq || p_dev->_io || p_dev->_locked) | 478 | if (p_dev->_irq || p_dev->_io || p_dev->_locked) |
| 481 | printk(KERN_INFO "pcmcia: driver %s did not release config properly\n", | 479 | printk(KERN_INFO "pcmcia: driver %s did not release config properly\n", |
| @@ -628,7 +626,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f | |||
| 628 | } | 626 | } |
| 629 | 627 | ||
| 630 | /* Add to the list in pcmcia_bus_socket */ | 628 | /* Add to the list in pcmcia_bus_socket */ |
| 631 | list_add_tail(&p_dev->socket_device_list, &s->devices_list); | 629 | list_add(&p_dev->socket_device_list, &s->devices_list); |
| 632 | 630 | ||
| 633 | spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); | 631 | spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); |
| 634 | 632 | ||
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 45063b4e5b78..3131bb0a0095 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
| @@ -88,7 +88,6 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base, | |||
| 88 | } | 88 | } |
| 89 | if ((s->features & SS_CAP_STATIC_MAP) && s->io_offset) { | 89 | if ((s->features & SS_CAP_STATIC_MAP) && s->io_offset) { |
| 90 | *base = s->io_offset | (*base & 0x0fff); | 90 | *base = s->io_offset | (*base & 0x0fff); |
| 91 | s->io[0].res->flags = (s->io[0].res->flags & ~IORESOURCE_BITS) | (attr & IORESOURCE_BITS); | ||
| 92 | return 0; | 91 | return 0; |
| 93 | } | 92 | } |
| 94 | /* Check for an already-allocated window that must conflict with | 93 | /* Check for an already-allocated window that must conflict with |
| @@ -209,7 +208,6 @@ int pccard_get_configuration_info(struct pcmcia_socket *s, | |||
| 209 | if (!(s->state & SOCKET_PRESENT)) | 208 | if (!(s->state & SOCKET_PRESENT)) |
| 210 | return CS_NO_CARD; | 209 | return CS_NO_CARD; |
| 211 | 210 | ||
| 212 | config->Function = p_dev->func; | ||
| 213 | 211 | ||
| 214 | #ifdef CONFIG_CARDBUS | 212 | #ifdef CONFIG_CARDBUS |
| 215 | if (s->state & SOCKET_CARDBUS) { | 213 | if (s->state & SOCKET_CARDBUS) { |
| @@ -223,14 +221,22 @@ int pccard_get_configuration_info(struct pcmcia_socket *s, | |||
| 223 | config->AssignedIRQ = s->irq.AssignedIRQ; | 221 | config->AssignedIRQ = s->irq.AssignedIRQ; |
| 224 | if (config->AssignedIRQ) | 222 | if (config->AssignedIRQ) |
| 225 | config->Attributes |= CONF_ENABLE_IRQ; | 223 | config->Attributes |= CONF_ENABLE_IRQ; |
| 226 | config->BasePort1 = s->io[0].res->start; | 224 | if (s->io[0].res) { |
| 227 | config->NumPorts1 = s->io[0].res->end - config->BasePort1 + 1; | 225 | config->BasePort1 = s->io[0].res->start; |
| 226 | config->NumPorts1 = s->io[0].res->end - config->BasePort1 + 1; | ||
| 227 | } | ||
| 228 | } | 228 | } |
| 229 | return CS_SUCCESS; | 229 | return CS_SUCCESS; |
| 230 | } | 230 | } |
| 231 | #endif | 231 | #endif |
| 232 | 232 | ||
| 233 | c = (p_dev) ? p_dev->function_config : NULL; | 233 | if (p_dev) { |
| 234 | c = p_dev->function_config; | ||
| 235 | config->Function = p_dev->func; | ||
| 236 | } else { | ||
| 237 | c = NULL; | ||
| 238 | config->Function = 0; | ||
| 239 | } | ||
| 234 | 240 | ||
| 235 | if ((c == NULL) || !(c->state & CONFIG_LOCKED)) { | 241 | if ((c == NULL) || !(c->state & CONFIG_LOCKED)) { |
| 236 | config->Attributes = 0; | 242 | config->Attributes = 0; |
| @@ -947,7 +953,5 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) { | |||
| 947 | pcmcia_release_irq(p_dev, &p_dev->irq); | 953 | pcmcia_release_irq(p_dev, &p_dev->irq); |
| 948 | if (&p_dev->win) | 954 | if (&p_dev->win) |
| 949 | pcmcia_release_window(p_dev->win); | 955 | pcmcia_release_window(p_dev->win); |
| 950 | |||
| 951 | p_dev->dev_node = NULL; | ||
| 952 | } | 956 | } |
| 953 | EXPORT_SYMBOL(pcmcia_disable_device); | 957 | EXPORT_SYMBOL(pcmcia_disable_device); |
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h index 73c8a088c160..aa5eb7ddeda9 100644 --- a/drivers/serial/cpm_uart/cpm_uart.h +++ b/drivers/serial/cpm_uart/cpm_uart.h | |||
| @@ -10,6 +10,8 @@ | |||
| 10 | #define CPM_UART_H | 10 | #define CPM_UART_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/fs_uart_pd.h> | ||
| 13 | 15 | ||
| 14 | #if defined(CONFIG_CPM2) | 16 | #if defined(CONFIG_CPM2) |
| 15 | #include "cpm_uart_cpm2.h" | 17 | #include "cpm_uart_cpm2.h" |
| @@ -26,14 +28,14 @@ | |||
| 26 | #define FLAG_SMC 0x00000002 | 28 | #define FLAG_SMC 0x00000002 |
| 27 | #define FLAG_CONSOLE 0x00000001 | 29 | #define FLAG_CONSOLE 0x00000001 |
| 28 | 30 | ||
| 29 | #define UART_SMC1 0 | 31 | #define UART_SMC1 fsid_smc1_uart |
| 30 | #define UART_SMC2 1 | 32 | #define UART_SMC2 fsid_smc2_uart |
| 31 | #define UART_SCC1 2 | 33 | #define UART_SCC1 fsid_scc1_uart |
| 32 | #define UART_SCC2 3 | 34 | #define UART_SCC2 fsid_scc2_uart |
| 33 | #define UART_SCC3 4 | 35 | #define UART_SCC3 fsid_scc3_uart |
| 34 | #define UART_SCC4 5 | 36 | #define UART_SCC4 fsid_scc4_uart |
| 35 | 37 | ||
| 36 | #define UART_NR 6 | 38 | #define UART_NR fs_uart_nr |
| 37 | 39 | ||
| 38 | #define RX_NUM_FIFO 4 | 40 | #define RX_NUM_FIFO 4 |
| 39 | #define RX_BUF_SIZE 32 | 41 | #define RX_BUF_SIZE 32 |
| @@ -64,6 +66,7 @@ struct uart_cpm_port { | |||
| 64 | uint dp_addr; | 66 | uint dp_addr; |
| 65 | void *mem_addr; | 67 | void *mem_addr; |
| 66 | dma_addr_t dma_addr; | 68 | dma_addr_t dma_addr; |
| 69 | u32 mem_size; | ||
| 67 | /* helpers */ | 70 | /* helpers */ |
| 68 | int baud; | 71 | int baud; |
| 69 | int bits; | 72 | int bits; |
| @@ -90,4 +93,36 @@ void scc2_lineif(struct uart_cpm_port *pinfo); | |||
| 90 | void scc3_lineif(struct uart_cpm_port *pinfo); | 93 | void scc3_lineif(struct uart_cpm_port *pinfo); |
| 91 | void scc4_lineif(struct uart_cpm_port *pinfo); | 94 | void scc4_lineif(struct uart_cpm_port *pinfo); |
| 92 | 95 | ||
| 96 | /* | ||
| 97 | virtual to phys transtalion | ||
| 98 | */ | ||
| 99 | static inline unsigned long cpu2cpm_addr(void* addr, struct uart_cpm_port *pinfo) | ||
| 100 | { | ||
| 101 | int offset; | ||
| 102 | u32 val = (u32)addr; | ||
| 103 | /* sane check */ | ||
| 104 | if ((val >= (u32)pinfo->mem_addr) && | ||
| 105 | (val<((u32)pinfo->mem_addr + pinfo->mem_size))) { | ||
| 106 | offset = val - (u32)pinfo->mem_addr; | ||
| 107 | return pinfo->dma_addr+offset; | ||
| 108 | } | ||
| 109 | printk("%s(): address %x to translate out of range!\n", __FUNCTION__, val); | ||
| 110 | return 0; | ||
| 111 | } | ||
| 112 | |||
| 113 | static inline void *cpm2cpu_addr(unsigned long addr, struct uart_cpm_port *pinfo) | ||
| 114 | { | ||
| 115 | int offset; | ||
| 116 | u32 val = addr; | ||
| 117 | /* sane check */ | ||
| 118 | if ((val >= pinfo->dma_addr) && | ||
| 119 | (val<(pinfo->dma_addr + pinfo->mem_size))) { | ||
| 120 | offset = val - (u32)pinfo->dma_addr; | ||
| 121 | return (void*)(pinfo->mem_addr+offset); | ||
| 122 | } | ||
| 123 | printk("%s(): address %x to translate out of range!\n", __FUNCTION__, val); | ||
| 124 | return 0; | ||
| 125 | } | ||
| 126 | |||
| 127 | |||
| 93 | #endif /* CPM_UART_H */ | 128 | #endif /* CPM_UART_H */ |
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index b7bf4c698a47..ced193bf9e1e 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/device.h> | 41 | #include <linux/device.h> |
| 42 | #include <linux/bootmem.h> | 42 | #include <linux/bootmem.h> |
| 43 | #include <linux/dma-mapping.h> | 43 | #include <linux/dma-mapping.h> |
| 44 | #include <linux/fs_uart_pd.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 46 | #include <asm/irq.h> | 47 | #include <asm/irq.h> |
| @@ -60,7 +61,7 @@ | |||
| 60 | /* Track which ports are configured as uarts */ | 61 | /* Track which ports are configured as uarts */ |
| 61 | int cpm_uart_port_map[UART_NR]; | 62 | int cpm_uart_port_map[UART_NR]; |
| 62 | /* How many ports did we config as uarts */ | 63 | /* How many ports did we config as uarts */ |
| 63 | int cpm_uart_nr; | 64 | int cpm_uart_nr = 0; |
| 64 | 65 | ||
| 65 | /**************************************************************/ | 66 | /**************************************************************/ |
| 66 | 67 | ||
| @@ -71,18 +72,36 @@ static void cpm_uart_initbd(struct uart_cpm_port *pinfo); | |||
| 71 | 72 | ||
| 72 | /**************************************************************/ | 73 | /**************************************************************/ |
| 73 | 74 | ||
| 74 | static inline unsigned long cpu2cpm_addr(void *addr) | 75 | |
| 76 | /* Place-holder for board-specific stuff */ | ||
| 77 | struct platform_device* __attribute__ ((weak)) __init | ||
| 78 | early_uart_get_pdev(int index) | ||
| 75 | { | 79 | { |
| 76 | if ((unsigned long)addr >= CPM_ADDR) | 80 | return NULL; |
| 77 | return (unsigned long)addr; | ||
| 78 | return virt_to_bus(addr); | ||
| 79 | } | 81 | } |
| 80 | 82 | ||
| 81 | static inline void *cpm2cpu_addr(unsigned long addr) | 83 | |
| 84 | void cpm_uart_count(void) | ||
| 82 | { | 85 | { |
| 83 | if (addr >= CPM_ADDR) | 86 | cpm_uart_nr = 0; |
| 84 | return (void *)addr; | 87 | #ifdef CONFIG_SERIAL_CPM_SMC1 |
| 85 | return bus_to_virt(addr); | 88 | cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1; |
| 89 | #endif | ||
| 90 | #ifdef CONFIG_SERIAL_CPM_SMC2 | ||
| 91 | cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2; | ||
| 92 | #endif | ||
| 93 | #ifdef CONFIG_SERIAL_CPM_SCC1 | ||
| 94 | cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1; | ||
| 95 | #endif | ||
| 96 | #ifdef CONFIG_SERIAL_CPM_SCC2 | ||
| 97 | cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2; | ||
| 98 | #endif | ||
| 99 | #ifdef CONFIG_SERIAL_CPM_SCC3 | ||
| 100 | cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3; | ||
| 101 | #endif | ||
| 102 | #ifdef CONFIG_SERIAL_CPM_SCC4 | ||
| 103 | cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4; | ||
| 104 | #endif | ||
| 86 | } | 105 | } |
| 87 | 106 | ||
| 88 | /* | 107 | /* |
| @@ -258,7 +277,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
| 258 | } | 277 | } |
| 259 | 278 | ||
| 260 | /* get pointer */ | 279 | /* get pointer */ |
| 261 | cp = cpm2cpu_addr(bdp->cbd_bufaddr); | 280 | cp = cpm2cpu_addr(bdp->cbd_bufaddr, pinfo); |
| 262 | 281 | ||
| 263 | /* loop through the buffer */ | 282 | /* loop through the buffer */ |
| 264 | while (i-- > 0) { | 283 | while (i-- > 0) { |
| @@ -601,7 +620,7 @@ static int cpm_uart_tx_pump(struct uart_port *port) | |||
| 601 | /* Pick next descriptor and fill from buffer */ | 620 | /* Pick next descriptor and fill from buffer */ |
| 602 | bdp = pinfo->tx_cur; | 621 | bdp = pinfo->tx_cur; |
| 603 | 622 | ||
| 604 | p = cpm2cpu_addr(bdp->cbd_bufaddr); | 623 | p = cpm2cpu_addr(bdp->cbd_bufaddr, pinfo); |
| 605 | 624 | ||
| 606 | *p++ = port->x_char; | 625 | *p++ = port->x_char; |
| 607 | bdp->cbd_datlen = 1; | 626 | bdp->cbd_datlen = 1; |
| @@ -628,7 +647,7 @@ static int cpm_uart_tx_pump(struct uart_port *port) | |||
| 628 | 647 | ||
| 629 | while (!(bdp->cbd_sc & BD_SC_READY) && (xmit->tail != xmit->head)) { | 648 | while (!(bdp->cbd_sc & BD_SC_READY) && (xmit->tail != xmit->head)) { |
| 630 | count = 0; | 649 | count = 0; |
| 631 | p = cpm2cpu_addr(bdp->cbd_bufaddr); | 650 | p = cpm2cpu_addr(bdp->cbd_bufaddr, pinfo); |
| 632 | while (count < pinfo->tx_fifosize) { | 651 | while (count < pinfo->tx_fifosize) { |
| 633 | *p++ = xmit->buf[xmit->tail]; | 652 | *p++ = xmit->buf[xmit->tail]; |
| 634 | xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); | 653 | xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); |
| @@ -677,12 +696,12 @@ static void cpm_uart_initbd(struct uart_cpm_port *pinfo) | |||
| 677 | mem_addr = pinfo->mem_addr; | 696 | mem_addr = pinfo->mem_addr; |
| 678 | bdp = pinfo->rx_cur = pinfo->rx_bd_base; | 697 | bdp = pinfo->rx_cur = pinfo->rx_bd_base; |
| 679 | for (i = 0; i < (pinfo->rx_nrfifos - 1); i++, bdp++) { | 698 | for (i = 0; i < (pinfo->rx_nrfifos - 1); i++, bdp++) { |
| 680 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr); | 699 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr, pinfo); |
| 681 | bdp->cbd_sc = BD_SC_EMPTY | BD_SC_INTRPT; | 700 | bdp->cbd_sc = BD_SC_EMPTY | BD_SC_INTRPT; |
| 682 | mem_addr += pinfo->rx_fifosize; | 701 | mem_addr += pinfo->rx_fifosize; |
| 683 | } | 702 | } |
| 684 | 703 | ||
| 685 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr); | 704 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr, pinfo); |
| 686 | bdp->cbd_sc = BD_SC_WRAP | BD_SC_EMPTY | BD_SC_INTRPT; | 705 | bdp->cbd_sc = BD_SC_WRAP | BD_SC_EMPTY | BD_SC_INTRPT; |
| 687 | 706 | ||
| 688 | /* Set the physical address of the host memory | 707 | /* Set the physical address of the host memory |
| @@ -692,12 +711,12 @@ static void cpm_uart_initbd(struct uart_cpm_port *pinfo) | |||
| 692 | mem_addr = pinfo->mem_addr + L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize); | 711 | mem_addr = pinfo->mem_addr + L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize); |
| 693 | bdp = pinfo->tx_cur = pinfo->tx_bd_base; | 712 | bdp = pinfo->tx_cur = pinfo->tx_bd_base; |
| 694 | for (i = 0; i < (pinfo->tx_nrfifos - 1); i++, bdp++) { | 713 | for (i = 0; i < (pinfo->tx_nrfifos - 1); i++, bdp++) { |
| 695 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr); | 714 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr, pinfo); |
| 696 | bdp->cbd_sc = BD_SC_INTRPT; | 715 | bdp->cbd_sc = BD_SC_INTRPT; |
| 697 | mem_addr += pinfo->tx_fifosize; | 716 | mem_addr += pinfo->tx_fifosize; |
| 698 | } | 717 | } |
| 699 | 718 | ||
| 700 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr); | 719 | bdp->cbd_bufaddr = cpu2cpm_addr(mem_addr, pinfo); |
| 701 | bdp->cbd_sc = BD_SC_WRAP | BD_SC_INTRPT; | 720 | bdp->cbd_sc = BD_SC_WRAP | BD_SC_INTRPT; |
| 702 | } | 721 | } |
| 703 | 722 | ||
| @@ -829,14 +848,6 @@ static int cpm_uart_request_port(struct uart_port *port) | |||
| 829 | if (pinfo->flags & FLAG_CONSOLE) | 848 | if (pinfo->flags & FLAG_CONSOLE) |
| 830 | return 0; | 849 | return 0; |
| 831 | 850 | ||
| 832 | /* | ||
| 833 | * Setup any port IO, connect any baud rate generators, | ||
| 834 | * etc. This is expected to be handled by board | ||
| 835 | * dependant code | ||
| 836 | */ | ||
| 837 | if (pinfo->set_lineif) | ||
| 838 | pinfo->set_lineif(pinfo); | ||
| 839 | |||
| 840 | if (IS_SMC(pinfo)) { | 851 | if (IS_SMC(pinfo)) { |
| 841 | pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX); | 852 | pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX); |
| 842 | pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | 853 | pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); |
| @@ -988,6 +999,54 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 988 | }, | 999 | }, |
| 989 | }; | 1000 | }; |
| 990 | 1001 | ||
| 1002 | int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con) | ||
| 1003 | { | ||
| 1004 | struct resource *r; | ||
| 1005 | struct fs_uart_platform_info *pdata = pdev->dev.platform_data; | ||
| 1006 | int idx = pdata->fs_no; /* It is UART_SMCx or UART_SCCx index */ | ||
| 1007 | struct uart_cpm_port *pinfo; | ||
| 1008 | int line; | ||
| 1009 | u32 mem, pram; | ||
| 1010 | |||
| 1011 | for (line=0; line<UART_NR && cpm_uart_port_map[line]!=pdata->fs_no; line++); | ||
| 1012 | |||
| 1013 | pinfo = (struct uart_cpm_port *) &cpm_uart_ports[idx]; | ||
| 1014 | |||
| 1015 | pinfo->brg = pdata->brg; | ||
| 1016 | |||
| 1017 | if (!is_con) { | ||
| 1018 | pinfo->port.line = line; | ||
| 1019 | pinfo->port.flags = UPF_BOOT_AUTOCONF; | ||
| 1020 | } | ||
| 1021 | |||
| 1022 | if (!(r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"))) | ||
| 1023 | return -EINVAL; | ||
| 1024 | mem = r->start; | ||
| 1025 | |||
| 1026 | if (!(r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pram"))) | ||
| 1027 | return -EINVAL; | ||
| 1028 | pram = r->start; | ||
| 1029 | |||
| 1030 | if(idx > fsid_smc2_uart) { | ||
| 1031 | pinfo->sccp = (scc_t *)mem; | ||
| 1032 | pinfo->sccup = (scc_uart_t *)pram; | ||
| 1033 | } else { | ||
| 1034 | pinfo->smcp = (smc_t *)mem; | ||
| 1035 | pinfo->smcup = (smc_uart_t *)pram; | ||
| 1036 | } | ||
| 1037 | pinfo->tx_nrfifos = pdata->tx_num_fifo; | ||
| 1038 | pinfo->tx_fifosize = pdata->tx_buf_size; | ||
| 1039 | |||
| 1040 | pinfo->rx_nrfifos = pdata->rx_num_fifo; | ||
| 1041 | pinfo->rx_fifosize = pdata->rx_buf_size; | ||
| 1042 | |||
| 1043 | pinfo->port.uartclk = pdata->uart_clk; | ||
| 1044 | pinfo->port.mapbase = (unsigned long)mem; | ||
| 1045 | pinfo->port.irq = platform_get_irq(pdev, 0); | ||
| 1046 | |||
| 1047 | return 0; | ||
| 1048 | } | ||
| 1049 | |||
| 991 | #ifdef CONFIG_SERIAL_CPM_CONSOLE | 1050 | #ifdef CONFIG_SERIAL_CPM_CONSOLE |
| 992 | /* | 1051 | /* |
| 993 | * Print a string to the serial port trying not to disturb | 1052 | * Print a string to the serial port trying not to disturb |
| @@ -1027,7 +1086,7 @@ static void cpm_uart_console_write(struct console *co, const char *s, | |||
| 1027 | * If the buffer address is in the CPM DPRAM, don't | 1086 | * If the buffer address is in the CPM DPRAM, don't |
| 1028 | * convert it. | 1087 | * convert it. |
| 1029 | */ | 1088 | */ |
| 1030 | cp = cpm2cpu_addr(bdp->cbd_bufaddr); | 1089 | cp = cpm2cpu_addr(bdp->cbd_bufaddr, pinfo); |
| 1031 | 1090 | ||
| 1032 | *cp = *s; | 1091 | *cp = *s; |
| 1033 | 1092 | ||
| @@ -1044,7 +1103,7 @@ static void cpm_uart_console_write(struct console *co, const char *s, | |||
| 1044 | while ((bdp->cbd_sc & BD_SC_READY) != 0) | 1103 | while ((bdp->cbd_sc & BD_SC_READY) != 0) |
| 1045 | ; | 1104 | ; |
| 1046 | 1105 | ||
| 1047 | cp = cpm2cpu_addr(bdp->cbd_bufaddr); | 1106 | cp = cpm2cpu_addr(bdp->cbd_bufaddr, pinfo); |
| 1048 | 1107 | ||
| 1049 | *cp = 13; | 1108 | *cp = 13; |
| 1050 | bdp->cbd_datlen = 1; | 1109 | bdp->cbd_datlen = 1; |
| @@ -1067,9 +1126,7 @@ static void cpm_uart_console_write(struct console *co, const char *s, | |||
| 1067 | pinfo->tx_cur = (volatile cbd_t *) bdp; | 1126 | pinfo->tx_cur = (volatile cbd_t *) bdp; |
| 1068 | } | 1127 | } |
| 1069 | 1128 | ||
| 1070 | /* | 1129 | |
| 1071 | * Setup console. Be careful is called early ! | ||
| 1072 | */ | ||
| 1073 | static int __init cpm_uart_console_setup(struct console *co, char *options) | 1130 | static int __init cpm_uart_console_setup(struct console *co, char *options) |
| 1074 | { | 1131 | { |
| 1075 | struct uart_port *port; | 1132 | struct uart_port *port; |
| @@ -1080,9 +1137,27 @@ static int __init cpm_uart_console_setup(struct console *co, char *options) | |||
| 1080 | int flow = 'n'; | 1137 | int flow = 'n'; |
| 1081 | int ret; | 1138 | int ret; |
| 1082 | 1139 | ||
| 1140 | struct fs_uart_platform_info *pdata; | ||
| 1141 | struct platform_device* pdev = early_uart_get_pdev(co->index); | ||
| 1142 | |||
| 1083 | port = | 1143 | port = |
| 1084 | (struct uart_port *)&cpm_uart_ports[cpm_uart_port_map[co->index]]; | 1144 | (struct uart_port *)&cpm_uart_ports[cpm_uart_port_map[co->index]]; |
| 1085 | pinfo = (struct uart_cpm_port *)port; | 1145 | pinfo = (struct uart_cpm_port *)port; |
| 1146 | if (!pdev) { | ||
| 1147 | pr_info("cpm_uart: console: compat mode\n"); | ||
| 1148 | /* compatibility - will be cleaned up */ | ||
| 1149 | cpm_uart_init_portdesc(); | ||
| 1150 | |||
| 1151 | if (pinfo->set_lineif) | ||
| 1152 | pinfo->set_lineif(pinfo); | ||
| 1153 | } else { | ||
| 1154 | pdata = pdev->dev.platform_data; | ||
| 1155 | if (pdata) | ||
| 1156 | if (pdata->init_ioports) | ||
| 1157 | pdata->init_ioports(); | ||
| 1158 | |||
| 1159 | cpm_uart_drv_get_platform_data(pdev, 1); | ||
| 1160 | } | ||
| 1086 | 1161 | ||
| 1087 | pinfo->flags |= FLAG_CONSOLE; | 1162 | pinfo->flags |= FLAG_CONSOLE; |
| 1088 | 1163 | ||
| @@ -1097,14 +1172,6 @@ static int __init cpm_uart_console_setup(struct console *co, char *options) | |||
| 1097 | baud = 9600; | 1172 | baud = 9600; |
| 1098 | } | 1173 | } |
| 1099 | 1174 | ||
| 1100 | /* | ||
| 1101 | * Setup any port IO, connect any baud rate generators, | ||
| 1102 | * etc. This is expected to be handled by board | ||
| 1103 | * dependant code | ||
| 1104 | */ | ||
| 1105 | if (pinfo->set_lineif) | ||
| 1106 | pinfo->set_lineif(pinfo); | ||
| 1107 | |||
| 1108 | if (IS_SMC(pinfo)) { | 1175 | if (IS_SMC(pinfo)) { |
| 1109 | pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX); | 1176 | pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX); |
| 1110 | pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | 1177 | pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); |
| @@ -1143,11 +1210,8 @@ static struct console cpm_scc_uart_console = { | |||
| 1143 | 1210 | ||
| 1144 | int __init cpm_uart_console_init(void) | 1211 | int __init cpm_uart_console_init(void) |
| 1145 | { | 1212 | { |
| 1146 | int ret = cpm_uart_init_portdesc(); | 1213 | register_console(&cpm_scc_uart_console); |
| 1147 | 1214 | return 0; | |
| 1148 | if (!ret) | ||
| 1149 | register_console(&cpm_scc_uart_console); | ||
| 1150 | return ret; | ||
| 1151 | } | 1215 | } |
| 1152 | 1216 | ||
| 1153 | console_initcall(cpm_uart_console_init); | 1217 | console_initcall(cpm_uart_console_init); |
| @@ -1165,44 +1229,130 @@ static struct uart_driver cpm_reg = { | |||
| 1165 | .minor = SERIAL_CPM_MINOR, | 1229 | .minor = SERIAL_CPM_MINOR, |
| 1166 | .cons = CPM_UART_CONSOLE, | 1230 | .cons = CPM_UART_CONSOLE, |
| 1167 | }; | 1231 | }; |
| 1168 | 1232 | static int cpm_uart_drv_probe(struct device *dev) | |
| 1169 | static int __init cpm_uart_init(void) | ||
| 1170 | { | 1233 | { |
| 1171 | int ret, i; | 1234 | struct platform_device *pdev = to_platform_device(dev); |
| 1172 | 1235 | struct fs_uart_platform_info *pdata; | |
| 1173 | printk(KERN_INFO "Serial: CPM driver $Revision: 0.01 $\n"); | 1236 | int ret = -ENODEV; |
| 1174 | 1237 | ||
| 1175 | #ifndef CONFIG_SERIAL_CPM_CONSOLE | 1238 | if(!pdev) { |
| 1176 | ret = cpm_uart_init_portdesc(); | 1239 | printk(KERN_ERR"CPM UART: platform data missing!\n"); |
| 1177 | if (ret) | ||
| 1178 | return ret; | 1240 | return ret; |
| 1179 | #endif | 1241 | } |
| 1180 | 1242 | ||
| 1181 | cpm_reg.nr = cpm_uart_nr; | 1243 | pdata = pdev->dev.platform_data; |
| 1182 | ret = uart_register_driver(&cpm_reg); | 1244 | pr_debug("cpm_uart_drv_probe: Adding CPM UART %d\n", |
| 1245 | cpm_uart_port_map[pdata->fs_no]); | ||
| 1183 | 1246 | ||
| 1184 | if (ret) | 1247 | if ((ret = cpm_uart_drv_get_platform_data(pdev, 0))) |
| 1185 | return ret; | 1248 | return ret; |
| 1186 | 1249 | ||
| 1187 | for (i = 0; i < cpm_uart_nr; i++) { | 1250 | if (pdata->init_ioports) |
| 1188 | int con = cpm_uart_port_map[i]; | 1251 | pdata->init_ioports(); |
| 1189 | cpm_uart_ports[con].port.line = i; | ||
| 1190 | cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF; | ||
| 1191 | uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port); | ||
| 1192 | } | ||
| 1193 | 1252 | ||
| 1194 | return ret; | 1253 | ret = uart_add_one_port(&cpm_reg, &cpm_uart_ports[pdata->fs_no].port); |
| 1254 | |||
| 1255 | return ret; | ||
| 1195 | } | 1256 | } |
| 1196 | 1257 | ||
| 1197 | static void __exit cpm_uart_exit(void) | 1258 | static int cpm_uart_drv_remove(struct device *dev) |
| 1259 | { | ||
| 1260 | struct platform_device *pdev = to_platform_device(dev); | ||
| 1261 | struct fs_uart_platform_info *pdata = pdev->dev.platform_data; | ||
| 1262 | |||
| 1263 | pr_debug("cpm_uart_drv_remove: Removing CPM UART %d\n", | ||
| 1264 | cpm_uart_port_map[pdata->fs_no]); | ||
| 1265 | |||
| 1266 | uart_remove_one_port(&cpm_reg, &cpm_uart_ports[pdata->fs_no].port); | ||
| 1267 | return 0; | ||
| 1268 | } | ||
| 1269 | |||
| 1270 | static struct device_driver cpm_smc_uart_driver = { | ||
| 1271 | .name = "fsl-cpm-smc:uart", | ||
| 1272 | .bus = &platform_bus_type, | ||
| 1273 | .probe = cpm_uart_drv_probe, | ||
| 1274 | .remove = cpm_uart_drv_remove, | ||
| 1275 | }; | ||
| 1276 | |||
| 1277 | static struct device_driver cpm_scc_uart_driver = { | ||
| 1278 | .name = "fsl-cpm-scc:uart", | ||
| 1279 | .bus = &platform_bus_type, | ||
| 1280 | .probe = cpm_uart_drv_probe, | ||
| 1281 | .remove = cpm_uart_drv_remove, | ||
| 1282 | }; | ||
| 1283 | |||
| 1284 | /* | ||
| 1285 | This is supposed to match uart devices on platform bus, | ||
| 1286 | */ | ||
| 1287 | static int match_is_uart (struct device* dev, void* data) | ||
| 1198 | { | 1288 | { |
| 1289 | struct platform_device* pdev = container_of(dev, struct platform_device, dev); | ||
| 1290 | int ret = 0; | ||
| 1291 | /* this was setfunc as uart */ | ||
| 1292 | if(strstr(pdev->name,":uart")) { | ||
| 1293 | ret = 1; | ||
| 1294 | } | ||
| 1295 | return ret; | ||
| 1296 | } | ||
| 1297 | |||
| 1298 | |||
| 1299 | static int cpm_uart_init(void) { | ||
| 1300 | |||
| 1301 | int ret; | ||
| 1199 | int i; | 1302 | int i; |
| 1303 | struct device *dev; | ||
| 1304 | printk(KERN_INFO "Serial: CPM driver $Revision: 0.02 $\n"); | ||
| 1305 | |||
| 1306 | /* lookup the bus for uart devices */ | ||
| 1307 | dev = bus_find_device(&platform_bus_type, NULL, 0, match_is_uart); | ||
| 1308 | |||
| 1309 | /* There are devices on the bus - all should be OK */ | ||
| 1310 | if (dev) { | ||
| 1311 | cpm_uart_count(); | ||
| 1312 | cpm_reg.nr = cpm_uart_nr; | ||
| 1313 | |||
| 1314 | if (!(ret = uart_register_driver(&cpm_reg))) { | ||
| 1315 | if ((ret = driver_register(&cpm_smc_uart_driver))) { | ||
| 1316 | uart_unregister_driver(&cpm_reg); | ||
| 1317 | return ret; | ||
| 1318 | } | ||
| 1319 | if ((ret = driver_register(&cpm_scc_uart_driver))) { | ||
| 1320 | driver_unregister(&cpm_scc_uart_driver); | ||
| 1321 | uart_unregister_driver(&cpm_reg); | ||
| 1322 | } | ||
| 1323 | } | ||
| 1324 | } else { | ||
| 1325 | /* No capable platform devices found - falling back to legacy mode */ | ||
| 1326 | pr_info("cpm_uart: WARNING: no UART devices found on platform bus!\n"); | ||
| 1327 | pr_info( | ||
| 1328 | "cpm_uart: the driver will guess configuration, but this mode is no longer supported.\n"); | ||
| 1329 | #ifndef CONFIG_SERIAL_CPM_CONSOLE | ||
| 1330 | ret = cpm_uart_init_portdesc(); | ||
| 1331 | if (ret) | ||
| 1332 | return ret; | ||
| 1333 | #endif | ||
| 1334 | |||
| 1335 | cpm_reg.nr = cpm_uart_nr; | ||
| 1336 | ret = uart_register_driver(&cpm_reg); | ||
| 1337 | |||
| 1338 | if (ret) | ||
| 1339 | return ret; | ||
| 1340 | |||
| 1341 | for (i = 0; i < cpm_uart_nr; i++) { | ||
| 1342 | int con = cpm_uart_port_map[i]; | ||
| 1343 | cpm_uart_ports[con].port.line = i; | ||
| 1344 | cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF; | ||
| 1345 | uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port); | ||
| 1346 | } | ||
| 1200 | 1347 | ||
| 1201 | for (i = 0; i < cpm_uart_nr; i++) { | ||
| 1202 | int con = cpm_uart_port_map[i]; | ||
| 1203 | uart_remove_one_port(&cpm_reg, &cpm_uart_ports[con].port); | ||
| 1204 | } | 1348 | } |
| 1349 | return ret; | ||
| 1350 | } | ||
| 1205 | 1351 | ||
| 1352 | static void __exit cpm_uart_exit(void) | ||
| 1353 | { | ||
| 1354 | driver_unregister(&cpm_scc_uart_driver); | ||
| 1355 | driver_unregister(&cpm_smc_uart_driver); | ||
| 1206 | uart_unregister_driver(&cpm_reg); | 1356 | uart_unregister_driver(&cpm_reg); |
| 1207 | } | 1357 | } |
| 1208 | 1358 | ||
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c index d789ee55cbb7..a5a30622637a 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c | |||
| @@ -81,58 +81,11 @@ void cpm_line_cr_cmd(int line, int cmd) | |||
| 81 | 81 | ||
| 82 | void smc1_lineif(struct uart_cpm_port *pinfo) | 82 | void smc1_lineif(struct uart_cpm_port *pinfo) |
| 83 | { | 83 | { |
| 84 | volatile cpm8xx_t *cp = cpmp; | ||
| 85 | |||
| 86 | (void)cp; /* fix warning */ | ||
| 87 | #if defined (CONFIG_MPC885ADS) | ||
| 88 | /* Enable SMC1 transceivers */ | ||
| 89 | { | ||
| 90 | cp->cp_pepar |= 0x000000c0; | ||
| 91 | cp->cp_pedir &= ~0x000000c0; | ||
| 92 | cp->cp_peso &= ~0x00000040; | ||
| 93 | cp->cp_peso |= 0x00000080; | ||
| 94 | } | ||
| 95 | #elif defined (CONFIG_MPC86XADS) | ||
| 96 | unsigned int iobits = 0x000000c0; | ||
| 97 | |||
| 98 | if (!pinfo->is_portb) { | ||
| 99 | cp->cp_pbpar |= iobits; | ||
| 100 | cp->cp_pbdir &= ~iobits; | ||
| 101 | cp->cp_pbodr &= ~iobits; | ||
| 102 | } else { | ||
| 103 | ((immap_t *)IMAP_ADDR)->im_ioport.iop_papar |= iobits; | ||
| 104 | ((immap_t *)IMAP_ADDR)->im_ioport.iop_padir &= ~iobits; | ||
| 105 | ((immap_t *)IMAP_ADDR)->im_ioport.iop_paodr &= ~iobits; | ||
| 106 | } | ||
| 107 | #endif | ||
| 108 | pinfo->brg = 1; | 84 | pinfo->brg = 1; |
| 109 | } | 85 | } |
| 110 | 86 | ||
| 111 | void smc2_lineif(struct uart_cpm_port *pinfo) | 87 | void smc2_lineif(struct uart_cpm_port *pinfo) |
| 112 | { | 88 | { |
| 113 | volatile cpm8xx_t *cp = cpmp; | ||
| 114 | |||
| 115 | (void)cp; /* fix warning */ | ||
| 116 | #if defined (CONFIG_MPC885ADS) | ||
| 117 | cp->cp_pepar |= 0x00000c00; | ||
| 118 | cp->cp_pedir &= ~0x00000c00; | ||
| 119 | cp->cp_peso &= ~0x00000400; | ||
| 120 | cp->cp_peso |= 0x00000800; | ||
| 121 | #elif defined (CONFIG_MPC86XADS) | ||
| 122 | unsigned int iobits = 0x00000c00; | ||
| 123 | |||
| 124 | if (!pinfo->is_portb) { | ||
| 125 | cp->cp_pbpar |= iobits; | ||
| 126 | cp->cp_pbdir &= ~iobits; | ||
| 127 | cp->cp_pbodr &= ~iobits; | ||
| 128 | } else { | ||
| 129 | ((immap_t *)IMAP_ADDR)->im_ioport.iop_papar |= iobits; | ||
| 130 | ((immap_t *)IMAP_ADDR)->im_ioport.iop_padir &= ~iobits; | ||
| 131 | ((immap_t *)IMAP_ADDR)->im_ioport.iop_paodr &= ~iobits; | ||
| 132 | } | ||
| 133 | |||
| 134 | #endif | ||
| 135 | |||
| 136 | pinfo->brg = 2; | 89 | pinfo->brg = 2; |
| 137 | } | 90 | } |
| 138 | 91 | ||
| @@ -191,7 +144,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) | |||
| 191 | /* was hostalloc but changed cause it blows away the */ | 144 | /* was hostalloc but changed cause it blows away the */ |
| 192 | /* large tlb mapping when pinning the kernel area */ | 145 | /* large tlb mapping when pinning the kernel area */ |
| 193 | mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8)); | 146 | mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8)); |
| 194 | dma_addr = 0; | 147 | dma_addr = (u32)mem_addr; |
| 195 | } else | 148 | } else |
| 196 | mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr, | 149 | mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr, |
| 197 | GFP_KERNEL); | 150 | GFP_KERNEL); |
| @@ -204,8 +157,9 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) | |||
| 204 | } | 157 | } |
| 205 | 158 | ||
| 206 | pinfo->dp_addr = dp_offset; | 159 | pinfo->dp_addr = dp_offset; |
| 207 | pinfo->mem_addr = mem_addr; | 160 | pinfo->mem_addr = mem_addr; /* virtual address*/ |
| 208 | pinfo->dma_addr = dma_addr; | 161 | pinfo->dma_addr = dma_addr; /* physical address*/ |
| 162 | pinfo->mem_size = memsz; | ||
| 209 | 163 | ||
| 210 | pinfo->rx_buf = mem_addr; | 164 | pinfo->rx_buf = mem_addr; |
| 211 | pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos | 165 | pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index fd9e53ed3feb..7c6b07aeea92 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c | |||
| @@ -142,14 +142,6 @@ void scc2_lineif(struct uart_cpm_port *pinfo) | |||
| 142 | * be supported in a sane fashion. | 142 | * be supported in a sane fashion. |
| 143 | */ | 143 | */ |
| 144 | #ifndef CONFIG_STX_GP3 | 144 | #ifndef CONFIG_STX_GP3 |
| 145 | #ifdef CONFIG_MPC8560_ADS | ||
| 146 | volatile iop_cpm2_t *io = &cpm2_immr->im_ioport; | ||
| 147 | io->iop_ppard |= 0x00000018; | ||
| 148 | io->iop_psord &= ~0x00000008; /* Rx */ | ||
| 149 | io->iop_psord &= ~0x00000010; /* Tx */ | ||
| 150 | io->iop_pdird &= ~0x00000008; /* Rx */ | ||
| 151 | io->iop_pdird |= 0x00000010; /* Tx */ | ||
| 152 | #else | ||
| 153 | volatile iop_cpm2_t *io = &cpm2_immr->im_ioport; | 145 | volatile iop_cpm2_t *io = &cpm2_immr->im_ioport; |
| 154 | io->iop_pparb |= 0x008b0000; | 146 | io->iop_pparb |= 0x008b0000; |
| 155 | io->iop_pdirb |= 0x00880000; | 147 | io->iop_pdirb |= 0x00880000; |
| @@ -157,7 +149,6 @@ void scc2_lineif(struct uart_cpm_port *pinfo) | |||
| 157 | io->iop_pdirb &= ~0x00030000; | 149 | io->iop_pdirb &= ~0x00030000; |
| 158 | io->iop_psorb &= ~0x00030000; | 150 | io->iop_psorb &= ~0x00030000; |
| 159 | #endif | 151 | #endif |
| 160 | #endif | ||
| 161 | cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff; | 152 | cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff; |
| 162 | cpm2_immr->im_cpmux.cmx_scr |= 0x00090000; | 153 | cpm2_immr->im_cpmux.cmx_scr |= 0x00090000; |
| 163 | pinfo->brg = 2; | 154 | pinfo->brg = 2; |
| @@ -218,8 +209,10 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) | |||
| 218 | 209 | ||
| 219 | memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) + | 210 | memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) + |
| 220 | L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize); | 211 | L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize); |
| 221 | if (is_con) | 212 | if (is_con) { |
| 222 | mem_addr = alloc_bootmem(memsz); | 213 | mem_addr = alloc_bootmem(memsz); |
| 214 | dma_addr = mem_addr; | ||
| 215 | } | ||
| 223 | else | 216 | else |
| 224 | mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr, | 217 | mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr, |
| 225 | GFP_KERNEL); | 218 | GFP_KERNEL); |
| @@ -234,6 +227,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) | |||
| 234 | pinfo->dp_addr = dp_offset; | 227 | pinfo->dp_addr = dp_offset; |
| 235 | pinfo->mem_addr = mem_addr; | 228 | pinfo->mem_addr = mem_addr; |
| 236 | pinfo->dma_addr = dma_addr; | 229 | pinfo->dma_addr = dma_addr; |
| 230 | pinfo->mem_size = memsz; | ||
| 237 | 231 | ||
| 238 | pinfo->rx_buf = mem_addr; | 232 | pinfo->rx_buf = mem_addr; |
| 239 | pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos | 233 | pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos |
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 42b457030b03..0eb010a3f5bc 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
| @@ -1614,6 +1614,7 @@ static int activate_ep_files (struct dev_data *dev) | |||
| 1614 | data, &ep_config_operations, | 1614 | data, &ep_config_operations, |
| 1615 | &data->dentry); | 1615 | &data->dentry); |
| 1616 | if (!data->inode) { | 1616 | if (!data->inode) { |
| 1617 | usb_ep_free_request(ep, data->req); | ||
| 1617 | kfree (data); | 1618 | kfree (data); |
| 1618 | goto enomem; | 1619 | goto enomem; |
| 1619 | } | 1620 | } |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 6a4b93ad1082..0b9293493957 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
| @@ -2166,7 +2166,7 @@ static void handle_ep_small (struct net2280_ep *ep) | |||
| 2166 | ep->stopped = 1; | 2166 | ep->stopped = 1; |
| 2167 | set_halt (ep); | 2167 | set_halt (ep); |
| 2168 | mode = 2; | 2168 | mode = 2; |
| 2169 | } else if (!req && ep->stopped) | 2169 | } else if (!req && !ep->stopped) |
| 2170 | write_fifo (ep, NULL); | 2170 | write_fifo (ep, NULL); |
| 2171 | } | 2171 | } |
| 2172 | } else { | 2172 | } else { |
| @@ -2280,9 +2280,7 @@ static void handle_ep_small (struct net2280_ep *ep) | |||
| 2280 | /* if we wrote it all, we're usually done */ | 2280 | /* if we wrote it all, we're usually done */ |
| 2281 | if (req->req.actual == req->req.length) { | 2281 | if (req->req.actual == req->req.length) { |
| 2282 | if (ep->num == 0) { | 2282 | if (ep->num == 0) { |
| 2283 | /* wait for control status */ | 2283 | /* send zlps until the status stage */ |
| 2284 | if (mode != 2) | ||
| 2285 | req = NULL; | ||
| 2286 | } else if (!req->req.zero || len != ep->ep.maxpacket) | 2284 | } else if (!req->req.zero || len != ep->ep.maxpacket) |
| 2287 | mode = 2; | 2285 | mode = 2; |
| 2288 | } | 2286 | } |
| @@ -2744,6 +2742,10 @@ static irqreturn_t net2280_irq (int irq, void *_dev, struct pt_regs * r) | |||
| 2744 | { | 2742 | { |
| 2745 | struct net2280 *dev = _dev; | 2743 | struct net2280 *dev = _dev; |
| 2746 | 2744 | ||
| 2745 | /* shared interrupt, not ours */ | ||
| 2746 | if (!(readl(&dev->regs->irqstat0) & (1 << INTA_ASSERTED))) | ||
| 2747 | return IRQ_NONE; | ||
| 2748 | |||
| 2747 | spin_lock (&dev->lock); | 2749 | spin_lock (&dev->lock); |
| 2748 | 2750 | ||
| 2749 | /* handle disconnect, dma, and more */ | 2751 | /* handle disconnect, dma, and more */ |
| @@ -2831,13 +2833,13 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 2831 | } | 2833 | } |
| 2832 | 2834 | ||
| 2833 | /* alloc, and start init */ | 2835 | /* alloc, and start init */ |
| 2834 | dev = kmalloc (sizeof *dev, SLAB_KERNEL); | 2836 | dev = kzalloc (sizeof *dev, SLAB_KERNEL); |
| 2835 | if (dev == NULL){ | 2837 | if (dev == NULL){ |
| 2836 | retval = -ENOMEM; | 2838 | retval = -ENOMEM; |
| 2837 | goto done; | 2839 | goto done; |
| 2838 | } | 2840 | } |
| 2839 | 2841 | ||
| 2840 | memset (dev, 0, sizeof *dev); | 2842 | pci_set_drvdata (pdev, dev); |
| 2841 | spin_lock_init (&dev->lock); | 2843 | spin_lock_init (&dev->lock); |
| 2842 | dev->pdev = pdev; | 2844 | dev->pdev = pdev; |
| 2843 | dev->gadget.ops = &net2280_ops; | 2845 | dev->gadget.ops = &net2280_ops; |
| @@ -2950,7 +2952,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 2950 | dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff; | 2952 | dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff; |
| 2951 | 2953 | ||
| 2952 | /* done */ | 2954 | /* done */ |
| 2953 | pci_set_drvdata (pdev, dev); | ||
| 2954 | INFO (dev, "%s\n", driver_desc); | 2955 | INFO (dev, "%s\n", driver_desc); |
| 2955 | INFO (dev, "irq %s, pci mem %p, chip rev %04x\n", | 2956 | INFO (dev, "irq %s, pci mem %p, chip rev %04x\n", |
| 2956 | bufp, base, dev->chiprev); | 2957 | bufp, base, dev->chiprev); |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 1e03f1a5a5fd..a1bd2bea6deb 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
| @@ -350,7 +350,7 @@ static const struct hc_driver ehci_pci_hc_driver = { | |||
| 350 | /* PCI driver selection metadata; PCI hotplugging uses this */ | 350 | /* PCI driver selection metadata; PCI hotplugging uses this */ |
| 351 | static const struct pci_device_id pci_ids [] = { { | 351 | static const struct pci_device_id pci_ids [] = { { |
| 352 | /* handle any USB 2.0 EHCI controller */ | 352 | /* handle any USB 2.0 EHCI controller */ |
| 353 | PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x20), ~0), | 353 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), |
| 354 | .driver_data = (unsigned long) &ehci_pci_hc_driver, | 354 | .driver_data = (unsigned long) &ehci_pci_hc_driver, |
| 355 | }, | 355 | }, |
| 356 | { /* end: all zeroes */ } | 356 | { /* end: all zeroes */ } |
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 1bfe96f4d045..b268537e389e 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -206,7 +206,7 @@ static const struct hc_driver ohci_pci_hc_driver = { | |||
| 206 | 206 | ||
| 207 | static const struct pci_device_id pci_ids [] = { { | 207 | static const struct pci_device_id pci_ids [] = { { |
| 208 | /* handle any USB OHCI controller */ | 208 | /* handle any USB OHCI controller */ |
| 209 | PCI_DEVICE_CLASS((PCI_CLASS_SERIAL_USB << 8) | 0x10, ~0), | 209 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0), |
| 210 | .driver_data = (unsigned long) &ohci_pci_hc_driver, | 210 | .driver_data = (unsigned long) &ohci_pci_hc_driver, |
| 211 | }, { /* end: all zeroes */ } | 211 | }, { /* end: all zeroes */ } |
| 212 | }; | 212 | }; |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index c0c4db78b590..d225e11f4055 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
| @@ -858,7 +858,7 @@ static const struct hc_driver uhci_driver = { | |||
| 858 | 858 | ||
| 859 | static const struct pci_device_id uhci_pci_ids[] = { { | 859 | static const struct pci_device_id uhci_pci_ids[] = { { |
| 860 | /* handle any USB UHCI controller */ | 860 | /* handle any USB UHCI controller */ |
| 861 | PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x00), ~0), | 861 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), |
| 862 | .driver_data = (unsigned long) &uhci_driver, | 862 | .driver_data = (unsigned long) &uhci_driver, |
| 863 | }, { /* end: all zeroes */ } | 863 | }, { /* end: all zeroes */ } |
| 864 | }; | 864 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index f5851db67f5b..82151207d814 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -308,6 +308,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = { | |||
| 308 | 308 | ||
| 309 | static struct usb_device_id id_table_combined [] = { | 309 | static struct usb_device_id id_table_combined [] = { |
| 310 | { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) }, | 310 | { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) }, |
| 311 | { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) }, | ||
| 311 | { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) }, | 312 | { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) }, |
| 312 | { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, | 313 | { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, |
| 313 | { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, | 314 | { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, |
| @@ -493,6 +494,8 @@ static struct usb_device_id id_table_combined [] = { | |||
| 493 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) }, | 494 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) }, |
| 494 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) }, | 495 | { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) }, |
| 495 | { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) }, | 496 | { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) }, |
| 497 | { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) }, | ||
| 498 | { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) }, | ||
| 496 | { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, | 499 | { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, |
| 497 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, | 500 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, |
| 498 | { }, /* Optional parameter entry */ | 501 | { }, /* Optional parameter entry */ |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 2155f0e4a378..2c55a5ea9c99 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -39,6 +39,9 @@ | |||
| 39 | /* www.thoughttechnology.com/ TT-USB provide with procomp use ftdi_sio */ | 39 | /* www.thoughttechnology.com/ TT-USB provide with procomp use ftdi_sio */ |
| 40 | #define FTDI_TTUSB_PID 0xFF20 /* Product Id */ | 40 | #define FTDI_TTUSB_PID 0xFF20 /* Product Id */ |
| 41 | 41 | ||
| 42 | /* iPlus device */ | ||
| 43 | #define FTDI_IPLUS_PID 0xD070 /* Product Id */ | ||
| 44 | |||
| 42 | /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */ | 45 | /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */ |
| 43 | /* they use the ftdi chipset for the USB interface and the vendor id is the same */ | 46 | /* they use the ftdi chipset for the USB interface and the vendor id is the same */ |
| 44 | #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */ | 47 | #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */ |
| @@ -153,6 +156,11 @@ | |||
| 153 | #define ICOM_ID1_PID 0x0004 | 156 | #define ICOM_ID1_PID 0x0004 |
| 154 | 157 | ||
| 155 | /* | 158 | /* |
| 159 | * ASK.fr devices | ||
| 160 | */ | ||
| 161 | #define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ | ||
| 162 | |||
| 163 | /* | ||
| 156 | * DSS-20 Sync Station for Sony Ericsson P800 | 164 | * DSS-20 Sync Station for Sony Ericsson P800 |
| 157 | */ | 165 | */ |
| 158 | 166 | ||
| @@ -400,6 +408,11 @@ | |||
| 400 | #define FTDI_WESTREX_MODEL_8900F_PID 0xDC01 /* Model 8900F */ | 408 | #define FTDI_WESTREX_MODEL_8900F_PID 0xDC01 /* Model 8900F */ |
| 401 | 409 | ||
| 402 | /* | 410 | /* |
| 411 | * RR-CirKits LocoBuffer USB (http://www.rr-cirkits.com) | ||
| 412 | */ | ||
| 413 | #define FTDI_RRCIRKITS_LOCOBUFFER_PID 0xc7d0 /* LocoBuffer USB */ | ||
| 414 | |||
| 415 | /* | ||
| 403 | * Eclo (http://www.eclo.pt/) product IDs. | 416 | * Eclo (http://www.eclo.pt/) product IDs. |
| 404 | * PID 0xEA90 submitted by Martin Grill. | 417 | * PID 0xEA90 submitted by Martin Grill. |
| 405 | */ | 418 | */ |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index ccf746b27d4e..c96714bb1cb8 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -61,6 +61,7 @@ static struct usb_device_id id_table [] = { | |||
| 61 | { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, | 61 | { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, |
| 62 | { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID_UCSGT) }, | 62 | { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID_UCSGT) }, |
| 63 | { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) }, | 63 | { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) }, |
| 64 | { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) }, | ||
| 64 | { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, | 65 | { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, |
| 65 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, | 66 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, |
| 66 | { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, | 67 | { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, |
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 09f379b19e98..7f29e81d3e35 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #define ITEGNO_VENDOR_ID 0x0eba | 27 | #define ITEGNO_VENDOR_ID 0x0eba |
| 28 | #define ITEGNO_PRODUCT_ID 0x1080 | 28 | #define ITEGNO_PRODUCT_ID 0x1080 |
| 29 | #define ITEGNO_PRODUCT_ID_2080 0x2080 | ||
| 29 | 30 | ||
| 30 | #define MA620_VENDOR_ID 0x0df7 | 31 | #define MA620_VENDOR_ID 0x0df7 |
| 31 | #define MA620_PRODUCT_ID 0x0620 | 32 | #define MA620_PRODUCT_ID 0x0620 |
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 557411c6e7c7..f806553cd9a4 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
| @@ -508,6 +508,7 @@ no_firmware: | |||
| 508 | err("%s: Unable to retrieve firmware version, try replugging\n", serial->type->description); | 508 | err("%s: Unable to retrieve firmware version, try replugging\n", serial->type->description); |
| 509 | err("%s: If the firmware is not running (status led not blinking)\n", serial->type->description); | 509 | err("%s: If the firmware is not running (status led not blinking)\n", serial->type->description); |
| 510 | err("%s: please contact support@connecttech.com\n", serial->type->description); | 510 | err("%s: please contact support@connecttech.com\n", serial->type->description); |
| 511 | kfree(result); | ||
| 511 | return -ENODEV; | 512 | return -ENODEV; |
| 512 | 513 | ||
| 513 | no_command_private: | 514 | no_command_private: |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index c4a9dcff5f2b..aec5ea8682d5 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -411,7 +411,7 @@ UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x0133, | |||
| 411 | UNUSUAL_DEV( 0x0525, 0xa140, 0x0100, 0x0100, | 411 | UNUSUAL_DEV( 0x0525, 0xa140, 0x0100, 0x0100, |
| 412 | "Iomega", | 412 | "Iomega", |
| 413 | "USB Clik! 40", | 413 | "USB Clik! 40", |
| 414 | US_SC_8070, US_PR_BULK, NULL, | 414 | US_SC_8070, US_PR_DEVICE, NULL, |
| 415 | US_FL_FIX_INQUIRY ), | 415 | US_FL_FIX_INQUIRY ), |
| 416 | 416 | ||
| 417 | /* Yakumo Mega Image 37 | 417 | /* Yakumo Mega Image 37 |
| @@ -773,6 +773,13 @@ UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, | |||
| 773 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 773 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 774 | US_FL_FIX_CAPACITY ), | 774 | US_FL_FIX_CAPACITY ), |
| 775 | 775 | ||
| 776 | /* Reported by Olivier Blondeau <zeitoun@gmail.com> */ | ||
| 777 | UNUSUAL_DEV( 0x0727, 0x0306, 0x0100, 0x0100, | ||
| 778 | "ATMEL", | ||
| 779 | "SND1 Storage", | ||
| 780 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 781 | US_FL_IGNORE_RESIDUE), | ||
| 782 | |||
| 776 | /* Submitted by Roman Hodek <roman@hodek.net> */ | 783 | /* Submitted by Roman Hodek <roman@hodek.net> */ |
| 777 | UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200, | 784 | UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200, |
| 778 | "Sandisk", | 785 | "Sandisk", |
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index b72b05250a9d..34e07399756b 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
| @@ -305,94 +305,6 @@ static ssize_t show_stride(struct class_device *class_device, char *buf) | |||
| 305 | return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length); | 305 | return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length); |
| 306 | } | 306 | } |
| 307 | 307 | ||
| 308 | /* Format for cmap is "%02x%c%4x%4x%4x\n" */ | ||
| 309 | /* %02x entry %c transp %4x red %4x blue %4x green \n */ | ||
| 310 | /* 256 rows at 16 chars equals 4096, the normal page size */ | ||
| 311 | /* the code will automatically adjust for different page sizes */ | ||
| 312 | static ssize_t store_cmap(struct class_device *class_device, const char *buf, | ||
| 313 | size_t count) | ||
| 314 | { | ||
| 315 | struct fb_info *fb_info = class_get_devdata(class_device); | ||
| 316 | int rc, i, start, length, transp = 0; | ||
| 317 | |||
| 318 | if ((count > PAGE_SIZE) || ((count % 16) != 0)) | ||
| 319 | return -EINVAL; | ||
| 320 | |||
| 321 | if (!fb_info->fbops->fb_setcolreg && !fb_info->fbops->fb_setcmap) | ||
| 322 | return -EINVAL; | ||
| 323 | |||
| 324 | sscanf(buf, "%02x", &start); | ||
| 325 | length = count / 16; | ||
| 326 | |||
| 327 | for (i = 0; i < length; i++) | ||
| 328 | if (buf[i * 16 + 2] != ' ') | ||
| 329 | transp = 1; | ||
| 330 | |||
| 331 | /* If we can batch, do it */ | ||
| 332 | if (fb_info->fbops->fb_setcmap && length > 1) { | ||
| 333 | struct fb_cmap umap; | ||
| 334 | |||
| 335 | memset(&umap, 0, sizeof(umap)); | ||
| 336 | if ((rc = fb_alloc_cmap(&umap, length, transp))) | ||
| 337 | return rc; | ||
| 338 | |||
| 339 | umap.start = start; | ||
| 340 | for (i = 0; i < length; i++) { | ||
| 341 | sscanf(&buf[i * 16 + 3], "%4hx", &umap.red[i]); | ||
| 342 | sscanf(&buf[i * 16 + 7], "%4hx", &umap.blue[i]); | ||
| 343 | sscanf(&buf[i * 16 + 11], "%4hx", &umap.green[i]); | ||
| 344 | if (transp) | ||
| 345 | umap.transp[i] = (buf[i * 16 + 2] != ' '); | ||
| 346 | } | ||
| 347 | rc = fb_info->fbops->fb_setcmap(&umap, fb_info); | ||
| 348 | fb_copy_cmap(&umap, &fb_info->cmap); | ||
| 349 | fb_dealloc_cmap(&umap); | ||
| 350 | |||
| 351 | return rc ?: count; | ||
| 352 | } | ||
| 353 | for (i = 0; i < length; i++) { | ||
| 354 | u16 red, blue, green, tsp; | ||
| 355 | |||
| 356 | sscanf(&buf[i * 16 + 3], "%4hx", &red); | ||
| 357 | sscanf(&buf[i * 16 + 7], "%4hx", &blue); | ||
| 358 | sscanf(&buf[i * 16 + 11], "%4hx", &green); | ||
| 359 | tsp = (buf[i * 16 + 2] != ' '); | ||
| 360 | if ((rc = fb_info->fbops->fb_setcolreg(start++, | ||
| 361 | red, green, blue, tsp, fb_info))) | ||
| 362 | return rc; | ||
| 363 | |||
| 364 | fb_info->cmap.red[i] = red; | ||
| 365 | fb_info->cmap.blue[i] = blue; | ||
| 366 | fb_info->cmap.green[i] = green; | ||
| 367 | if (transp) | ||
| 368 | fb_info->cmap.transp[i] = tsp; | ||
| 369 | } | ||
| 370 | return count; | ||
| 371 | } | ||
| 372 | |||
| 373 | static ssize_t show_cmap(struct class_device *class_device, char *buf) | ||
| 374 | { | ||
| 375 | struct fb_info *fb_info = class_get_devdata(class_device); | ||
| 376 | unsigned int i; | ||
| 377 | |||
| 378 | if (!fb_info->cmap.red || !fb_info->cmap.blue || | ||
| 379 | !fb_info->cmap.green) | ||
| 380 | return -EINVAL; | ||
| 381 | |||
| 382 | if (fb_info->cmap.len > PAGE_SIZE / 16) | ||
| 383 | return -EINVAL; | ||
| 384 | |||
| 385 | /* don't mess with the format, the buffer is PAGE_SIZE */ | ||
| 386 | /* 256 entries at 16 chars per line equals 4096 = PAGE_SIZE */ | ||
| 387 | for (i = 0; i < fb_info->cmap.len; i++) { | ||
| 388 | snprintf(&buf[ i * 16], PAGE_SIZE - i * 16, "%02x%c%4x%4x%4x\n", i + fb_info->cmap.start, | ||
| 389 | ((fb_info->cmap.transp && fb_info->cmap.transp[i]) ? '*' : ' '), | ||
| 390 | fb_info->cmap.red[i], fb_info->cmap.blue[i], | ||
| 391 | fb_info->cmap.green[i]); | ||
| 392 | } | ||
| 393 | return 16 * fb_info->cmap.len; | ||
| 394 | } | ||
| 395 | |||
| 396 | static ssize_t store_blank(struct class_device *class_device, const char * buf, | 308 | static ssize_t store_blank(struct class_device *class_device, const char * buf, |
| 397 | size_t count) | 309 | size_t count) |
| 398 | { | 310 | { |
| @@ -502,10 +414,12 @@ static ssize_t show_fbstate(struct class_device *class_device, char *buf) | |||
| 502 | return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state); | 414 | return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state); |
| 503 | } | 415 | } |
| 504 | 416 | ||
| 417 | /* When cmap is added back in it should be a binary attribute | ||
| 418 | * not a text one. Consideration should also be given to converting | ||
| 419 | * fbdev to use configfs instead of sysfs */ | ||
| 505 | static struct class_device_attribute class_device_attrs[] = { | 420 | static struct class_device_attribute class_device_attrs[] = { |
| 506 | __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp), | 421 | __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp), |
| 507 | __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank), | 422 | __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank), |
| 508 | __ATTR(color_map, S_IRUGO|S_IWUSR, show_cmap, store_cmap), | ||
| 509 | __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console), | 423 | __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console), |
| 510 | __ATTR(cursor, S_IRUGO|S_IWUSR, show_cursor, store_cursor), | 424 | __ATTR(cursor, S_IRUGO|S_IWUSR, show_cursor, store_cursor), |
| 511 | __ATTR(mode, S_IRUGO|S_IWUSR, show_mode, store_mode), | 425 | __ATTR(mode, S_IRUGO|S_IWUSR, show_mode, store_mode), |
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 8a2de038882e..1a27ecb46c9a 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
| @@ -1,7 +1,11 @@ | |||
| 1 | Version 1.42 | 1 | Version 1.42 |
| 2 | ------------ | 2 | ------------ |
| 3 | Fix slow oplock break when mounted to different servers at the same time and | 3 | Fix slow oplock break when mounted to different servers at the same time and |
| 4 | the tids match and we try to find matching fid on wrong server. | 4 | the tids match and we try to find matching fid on wrong server. Fix read |
| 5 | looping when signing required by server (2.6.16 kernel only). Fix readdir | ||
| 6 | vs. rename race which could cause each to hang. Return . and .. even | ||
| 7 | if server does not. Allow searches to skip first three entries and | ||
| 8 | begin at any location. Fix oops in find_writeable_file. | ||
| 5 | 9 | ||
| 6 | Version 1.41 | 10 | Version 1.41 |
| 7 | ------------ | 11 | ------------ |
diff --git a/fs/cifs/README b/fs/cifs/README index b2b4d0803761..0355003f4f0a 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
| @@ -511,6 +511,14 @@ LinuxExtensionsEnabled If set to one then the client will attempt to | |||
| 511 | support and want to map the uid and gid fields | 511 | support and want to map the uid and gid fields |
| 512 | to values supplied at mount (rather than the | 512 | to values supplied at mount (rather than the |
| 513 | actual values, then set this to zero. (default 1) | 513 | actual values, then set this to zero. (default 1) |
| 514 | Experimental When set to 1 used to enable certain experimental | ||
| 515 | features (currently enables multipage writes | ||
| 516 | when signing is enabled, the multipage write | ||
| 517 | performance enhancement was disabled when | ||
| 518 | signing turned on in case buffer was modified | ||
| 519 | just before it was sent, also this flag will | ||
| 520 | be used to use the new experimental sessionsetup | ||
| 521 | code). | ||
| 514 | 522 | ||
| 515 | These experimental features and tracing can be enabled by changing flags in | 523 | These experimental features and tracing can be enabled by changing flags in |
| 516 | /proc/fs/cifs (after the cifs module has been installed or built into the | 524 | /proc/fs/cifs (after the cifs module has been installed or built into the |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index d4b713e5affb..c262d8874ce9 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/vfs.h> | 33 | #include <linux/vfs.h> |
| 34 | #include <linux/mempool.h> | 34 | #include <linux/mempool.h> |
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/kthread.h> | ||
| 36 | #include "cifsfs.h" | 37 | #include "cifsfs.h" |
| 37 | #include "cifspdu.h" | 38 | #include "cifspdu.h" |
| 38 | #define DECLARE_GLOBALS_HERE | 39 | #define DECLARE_GLOBALS_HERE |
| @@ -75,9 +76,6 @@ unsigned int cifs_max_pending = CIFS_MAX_REQ; | |||
| 75 | module_param(cifs_max_pending, int, 0); | 76 | module_param(cifs_max_pending, int, 0); |
| 76 | MODULE_PARM_DESC(cifs_max_pending,"Simultaneous requests to server. Default: 50 Range: 2 to 256"); | 77 | MODULE_PARM_DESC(cifs_max_pending,"Simultaneous requests to server. Default: 50 Range: 2 to 256"); |
| 77 | 78 | ||
| 78 | static DECLARE_COMPLETION(cifs_oplock_exited); | ||
| 79 | static DECLARE_COMPLETION(cifs_dnotify_exited); | ||
| 80 | |||
| 81 | extern mempool_t *cifs_sm_req_poolp; | 79 | extern mempool_t *cifs_sm_req_poolp; |
| 82 | extern mempool_t *cifs_req_poolp; | 80 | extern mempool_t *cifs_req_poolp; |
| 83 | extern mempool_t *cifs_mid_poolp; | 81 | extern mempool_t *cifs_mid_poolp; |
| @@ -841,10 +839,6 @@ static int cifs_oplock_thread(void * dummyarg) | |||
| 841 | __u16 netfid; | 839 | __u16 netfid; |
| 842 | int rc; | 840 | int rc; |
| 843 | 841 | ||
| 844 | daemonize("cifsoplockd"); | ||
| 845 | allow_signal(SIGTERM); | ||
| 846 | |||
| 847 | oplockThread = current; | ||
| 848 | do { | 842 | do { |
| 849 | if (try_to_freeze()) | 843 | if (try_to_freeze()) |
| 850 | continue; | 844 | continue; |
| @@ -900,9 +894,9 @@ static int cifs_oplock_thread(void * dummyarg) | |||
| 900 | set_current_state(TASK_INTERRUPTIBLE); | 894 | set_current_state(TASK_INTERRUPTIBLE); |
| 901 | schedule_timeout(1); /* yield in case q were corrupt */ | 895 | schedule_timeout(1); /* yield in case q were corrupt */ |
| 902 | } | 896 | } |
| 903 | } while(!signal_pending(current)); | 897 | } while (!kthread_should_stop()); |
| 904 | oplockThread = NULL; | 898 | |
| 905 | complete_and_exit (&cifs_oplock_exited, 0); | 899 | return 0; |
| 906 | } | 900 | } |
| 907 | 901 | ||
| 908 | static int cifs_dnotify_thread(void * dummyarg) | 902 | static int cifs_dnotify_thread(void * dummyarg) |
| @@ -910,10 +904,6 @@ static int cifs_dnotify_thread(void * dummyarg) | |||
| 910 | struct list_head *tmp; | 904 | struct list_head *tmp; |
| 911 | struct cifsSesInfo *ses; | 905 | struct cifsSesInfo *ses; |
| 912 | 906 | ||
| 913 | daemonize("cifsdnotifyd"); | ||
| 914 | allow_signal(SIGTERM); | ||
| 915 | |||
| 916 | dnotifyThread = current; | ||
| 917 | do { | 907 | do { |
| 918 | if(try_to_freeze()) | 908 | if(try_to_freeze()) |
| 919 | continue; | 909 | continue; |
| @@ -931,8 +921,9 @@ static int cifs_dnotify_thread(void * dummyarg) | |||
| 931 | wake_up_all(&ses->server->response_q); | 921 | wake_up_all(&ses->server->response_q); |
| 932 | } | 922 | } |
| 933 | read_unlock(&GlobalSMBSeslock); | 923 | read_unlock(&GlobalSMBSeslock); |
| 934 | } while(!signal_pending(current)); | 924 | } while (!kthread_should_stop()); |
| 935 | complete_and_exit (&cifs_dnotify_exited, 0); | 925 | |
| 926 | return 0; | ||
| 936 | } | 927 | } |
| 937 | 928 | ||
| 938 | static int __init | 929 | static int __init |
| @@ -982,32 +973,48 @@ init_cifs(void) | |||
| 982 | } | 973 | } |
| 983 | 974 | ||
| 984 | rc = cifs_init_inodecache(); | 975 | rc = cifs_init_inodecache(); |
| 985 | if (!rc) { | 976 | if (rc) |
| 986 | rc = cifs_init_mids(); | 977 | goto out_clean_proc; |
| 987 | if (!rc) { | 978 | |
| 988 | rc = cifs_init_request_bufs(); | 979 | rc = cifs_init_mids(); |
| 989 | if (!rc) { | 980 | if (rc) |
| 990 | rc = register_filesystem(&cifs_fs_type); | 981 | goto out_destroy_inodecache; |
| 991 | if (!rc) { | 982 | |
| 992 | rc = (int)kernel_thread(cifs_oplock_thread, NULL, | 983 | rc = cifs_init_request_bufs(); |
| 993 | CLONE_FS | CLONE_FILES | CLONE_VM); | 984 | if (rc) |
| 994 | if(rc > 0) { | 985 | goto out_destroy_mids; |
| 995 | rc = (int)kernel_thread(cifs_dnotify_thread, NULL, | 986 | |
| 996 | CLONE_FS | CLONE_FILES | CLONE_VM); | 987 | rc = register_filesystem(&cifs_fs_type); |
| 997 | if(rc > 0) | 988 | if (rc) |
| 998 | return 0; | 989 | goto out_destroy_request_bufs; |
| 999 | else | 990 | |
| 1000 | cERROR(1,("error %d create dnotify thread", rc)); | 991 | oplockThread = kthread_run(cifs_oplock_thread, NULL, "cifsoplockd"); |
| 1001 | } else { | 992 | if (IS_ERR(oplockThread)) { |
| 1002 | cERROR(1,("error %d create oplock thread",rc)); | 993 | rc = PTR_ERR(oplockThread); |
| 1003 | } | 994 | cERROR(1,("error %d create oplock thread", rc)); |
| 1004 | } | 995 | goto out_unregister_filesystem; |
| 1005 | cifs_destroy_request_bufs(); | ||
| 1006 | } | ||
| 1007 | cifs_destroy_mids(); | ||
| 1008 | } | ||
| 1009 | cifs_destroy_inodecache(); | ||
| 1010 | } | 996 | } |
| 997 | |||
| 998 | dnotifyThread = kthread_run(cifs_dnotify_thread, NULL, "cifsdnotifyd"); | ||
| 999 | if (IS_ERR(dnotifyThread)) { | ||
| 1000 | rc = PTR_ERR(dnotifyThread); | ||
| 1001 | cERROR(1,("error %d create dnotify thread", rc)); | ||
| 1002 | goto out_stop_oplock_thread; | ||
| 1003 | } | ||
| 1004 | |||
| 1005 | return 0; | ||
| 1006 | |||
| 1007 | out_stop_oplock_thread: | ||
| 1008 | kthread_stop(oplockThread); | ||
| 1009 | out_unregister_filesystem: | ||
| 1010 | unregister_filesystem(&cifs_fs_type); | ||
| 1011 | out_destroy_request_bufs: | ||
| 1012 | cifs_destroy_request_bufs(); | ||
| 1013 | out_destroy_mids: | ||
| 1014 | cifs_destroy_mids(); | ||
| 1015 | out_destroy_inodecache: | ||
| 1016 | cifs_destroy_inodecache(); | ||
| 1017 | out_clean_proc: | ||
| 1011 | #ifdef CONFIG_PROC_FS | 1018 | #ifdef CONFIG_PROC_FS |
| 1012 | cifs_proc_clean(); | 1019 | cifs_proc_clean(); |
| 1013 | #endif | 1020 | #endif |
| @@ -1025,14 +1032,8 @@ exit_cifs(void) | |||
| 1025 | cifs_destroy_inodecache(); | 1032 | cifs_destroy_inodecache(); |
| 1026 | cifs_destroy_mids(); | 1033 | cifs_destroy_mids(); |
| 1027 | cifs_destroy_request_bufs(); | 1034 | cifs_destroy_request_bufs(); |
| 1028 | if(oplockThread) { | 1035 | kthread_stop(oplockThread); |
| 1029 | send_sig(SIGTERM, oplockThread, 1); | 1036 | kthread_stop(dnotifyThread); |
| 1030 | wait_for_completion(&cifs_oplock_exited); | ||
| 1031 | } | ||
| 1032 | if(dnotifyThread) { | ||
| 1033 | send_sig(SIGTERM, dnotifyThread, 1); | ||
| 1034 | wait_for_completion(&cifs_dnotify_exited); | ||
| 1035 | } | ||
| 1036 | } | 1037 | } |
| 1037 | 1038 | ||
| 1038 | MODULE_AUTHOR("Steve French <sfrench@us.ibm.com>"); | 1039 | MODULE_AUTHOR("Steve French <sfrench@us.ibm.com>"); |
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index d705500aa283..fd36892eda55 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -3119,7 +3119,7 @@ findFirstRetry: | |||
| 3119 | psrch_inf->endOfSearch = FALSE; | 3119 | psrch_inf->endOfSearch = FALSE; |
| 3120 | 3120 | ||
| 3121 | psrch_inf->entries_in_buffer = le16_to_cpu(parms->SearchCount); | 3121 | psrch_inf->entries_in_buffer = le16_to_cpu(parms->SearchCount); |
| 3122 | psrch_inf->index_of_last_entry = | 3122 | psrch_inf->index_of_last_entry = 2 /* skip . and .. */ + |
| 3123 | psrch_inf->entries_in_buffer; | 3123 | psrch_inf->entries_in_buffer; |
| 3124 | *pnetfid = parms->SearchHandle; | 3124 | *pnetfid = parms->SearchHandle; |
| 3125 | } else { | 3125 | } else { |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 0b86d5ca9014..d2ec806a4f32 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -3447,6 +3447,12 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
| 3447 | pSesInfo->server->secMode, | 3447 | pSesInfo->server->secMode, |
| 3448 | pSesInfo->server->capabilities, | 3448 | pSesInfo->server->capabilities, |
| 3449 | pSesInfo->server->timeZone)); | 3449 | pSesInfo->server->timeZone)); |
| 3450 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
| 3451 | if(experimEnabled > 1) | ||
| 3452 | rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */, | ||
| 3453 | &ntlmv2_flag, nls_info); | ||
| 3454 | else | ||
| 3455 | #endif | ||
| 3450 | if (extended_security | 3456 | if (extended_security |
| 3451 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | 3457 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) |
| 3452 | && (pSesInfo->server->secType == NTLMSSP)) { | 3458 | && (pSesInfo->server->secType == NTLMSSP)) { |
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 1d0ca3eaaca5..82315edc77d7 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
| @@ -139,9 +139,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
| 139 | cifs_sb = CIFS_SB(inode->i_sb); | 139 | cifs_sb = CIFS_SB(inode->i_sb); |
| 140 | pTcon = cifs_sb->tcon; | 140 | pTcon = cifs_sb->tcon; |
| 141 | 141 | ||
| 142 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 143 | full_path = build_path_from_dentry(direntry); | 142 | full_path = build_path_from_dentry(direntry); |
| 144 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 145 | if(full_path == NULL) { | 143 | if(full_path == NULL) { |
| 146 | FreeXid(xid); | 144 | FreeXid(xid); |
| 147 | return -ENOMEM; | 145 | return -ENOMEM; |
| @@ -316,9 +314,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, | |||
| 316 | cifs_sb = CIFS_SB(inode->i_sb); | 314 | cifs_sb = CIFS_SB(inode->i_sb); |
| 317 | pTcon = cifs_sb->tcon; | 315 | pTcon = cifs_sb->tcon; |
| 318 | 316 | ||
| 319 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 320 | full_path = build_path_from_dentry(direntry); | 317 | full_path = build_path_from_dentry(direntry); |
| 321 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 322 | if(full_path == NULL) | 318 | if(full_path == NULL) |
| 323 | rc = -ENOMEM; | 319 | rc = -ENOMEM; |
| 324 | else if (pTcon->ses->capabilities & CAP_UNIX) { | 320 | else if (pTcon->ses->capabilities & CAP_UNIX) { |
| @@ -440,6 +436,20 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct name | |||
| 440 | cifs_sb = CIFS_SB(parent_dir_inode->i_sb); | 436 | cifs_sb = CIFS_SB(parent_dir_inode->i_sb); |
| 441 | pTcon = cifs_sb->tcon; | 437 | pTcon = cifs_sb->tcon; |
| 442 | 438 | ||
| 439 | /* | ||
| 440 | * Don't allow the separator character in a path component. | ||
| 441 | * The VFS will not allow "/", but "\" is allowed by posix. | ||
| 442 | */ | ||
| 443 | if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)) { | ||
| 444 | int i; | ||
| 445 | for (i = 0; i < direntry->d_name.len; i++) | ||
| 446 | if (direntry->d_name.name[i] == '\\') { | ||
| 447 | cFYI(1, ("Invalid file name")); | ||
| 448 | FreeXid(xid); | ||
| 449 | return ERR_PTR(-EINVAL); | ||
| 450 | } | ||
| 451 | } | ||
| 452 | |||
| 443 | /* can not grab the rename sem here since it would | 453 | /* can not grab the rename sem here since it would |
| 444 | deadlock in the cases (beginning of sys_rename itself) | 454 | deadlock in the cases (beginning of sys_rename itself) |
| 445 | in which we already have the sb rename sem */ | 455 | in which we already have the sb rename sem */ |
diff --git a/fs/cifs/fcntl.c b/fs/cifs/fcntl.c index ec4dfe9bf5ef..633a93811328 100644 --- a/fs/cifs/fcntl.c +++ b/fs/cifs/fcntl.c | |||
| @@ -86,9 +86,7 @@ int cifs_dir_notify(struct file * file, unsigned long arg) | |||
| 86 | cifs_sb = CIFS_SB(file->f_dentry->d_sb); | 86 | cifs_sb = CIFS_SB(file->f_dentry->d_sb); |
| 87 | pTcon = cifs_sb->tcon; | 87 | pTcon = cifs_sb->tcon; |
| 88 | 88 | ||
| 89 | mutex_lock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 90 | full_path = build_path_from_dentry(file->f_dentry); | 89 | full_path = build_path_from_dentry(file->f_dentry); |
| 91 | mutex_unlock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 92 | 90 | ||
| 93 | if(full_path == NULL) { | 91 | if(full_path == NULL) { |
| 94 | rc = -ENOMEM; | 92 | rc = -ENOMEM; |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5c497c529772..e152bf6afa60 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -203,9 +203,7 @@ int cifs_open(struct inode *inode, struct file *file) | |||
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 207 | full_path = build_path_from_dentry(file->f_dentry); | 206 | full_path = build_path_from_dentry(file->f_dentry); |
| 208 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 209 | if (full_path == NULL) { | 207 | if (full_path == NULL) { |
| 210 | FreeXid(xid); | 208 | FreeXid(xid); |
| 211 | return -ENOMEM; | 209 | return -ENOMEM; |
| @@ -906,8 +904,7 @@ static ssize_t cifs_write(struct file *file, const char *write_data, | |||
| 906 | if (rc != 0) | 904 | if (rc != 0) |
| 907 | break; | 905 | break; |
| 908 | } | 906 | } |
| 909 | /* BB FIXME We can not sign across two buffers yet */ | 907 | if(experimEnabled || (pTcon->ses->server->secMode & |
| 910 | if((pTcon->ses->server->secMode & | ||
| 911 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) == 0) { | 908 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) == 0) { |
| 912 | struct kvec iov[2]; | 909 | struct kvec iov[2]; |
| 913 | unsigned int len; | 910 | unsigned int len; |
| @@ -923,13 +920,13 @@ static ssize_t cifs_write(struct file *file, const char *write_data, | |||
| 923 | *poffset, &bytes_written, | 920 | *poffset, &bytes_written, |
| 924 | iov, 1, long_op); | 921 | iov, 1, long_op); |
| 925 | } else | 922 | } else |
| 926 | /* BB FIXME fixup indentation of line below */ | 923 | rc = CIFSSMBWrite(xid, pTcon, |
| 927 | rc = CIFSSMBWrite(xid, pTcon, | 924 | open_file->netfid, |
| 928 | open_file->netfid, | 925 | min_t(const int, cifs_sb->wsize, |
| 929 | min_t(const int, cifs_sb->wsize, | 926 | write_size - total_written), |
| 930 | write_size - total_written), | 927 | *poffset, &bytes_written, |
| 931 | *poffset, &bytes_written, | 928 | write_data + total_written, |
| 932 | write_data + total_written, NULL, long_op); | 929 | NULL, long_op); |
| 933 | } | 930 | } |
| 934 | if (rc || (bytes_written == 0)) { | 931 | if (rc || (bytes_written == 0)) { |
| 935 | if (total_written) | 932 | if (total_written) |
| @@ -968,6 +965,16 @@ struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *cifs_inode) | |||
| 968 | struct cifsFileInfo *open_file; | 965 | struct cifsFileInfo *open_file; |
| 969 | int rc; | 966 | int rc; |
| 970 | 967 | ||
| 968 | /* Having a null inode here (because mapping->host was set to zero by | ||
| 969 | the VFS or MM) should not happen but we had reports of on oops (due to | ||
| 970 | it being zero) during stress testcases so we need to check for it */ | ||
| 971 | |||
| 972 | if(cifs_inode == NULL) { | ||
| 973 | cERROR(1,("Null inode passed to cifs_writeable_file")); | ||
| 974 | dump_stack(); | ||
| 975 | return NULL; | ||
| 976 | } | ||
| 977 | |||
| 971 | read_lock(&GlobalSMBSeslock); | 978 | read_lock(&GlobalSMBSeslock); |
| 972 | list_for_each_entry(open_file, &cifs_inode->openFileList, flist) { | 979 | list_for_each_entry(open_file, &cifs_inode->openFileList, flist) { |
| 973 | if (open_file->closePend) | 980 | if (open_file->closePend) |
| @@ -1093,12 +1100,11 @@ static int cifs_writepages(struct address_space *mapping, | |||
| 1093 | if (cifs_sb->wsize < PAGE_CACHE_SIZE) | 1100 | if (cifs_sb->wsize < PAGE_CACHE_SIZE) |
| 1094 | return generic_writepages(mapping, wbc); | 1101 | return generic_writepages(mapping, wbc); |
| 1095 | 1102 | ||
| 1096 | /* BB FIXME we do not have code to sign across multiple buffers yet, | ||
| 1097 | so go to older writepage style write which we can sign if needed */ | ||
| 1098 | if((cifs_sb->tcon->ses) && (cifs_sb->tcon->ses->server)) | 1103 | if((cifs_sb->tcon->ses) && (cifs_sb->tcon->ses->server)) |
| 1099 | if(cifs_sb->tcon->ses->server->secMode & | 1104 | if(cifs_sb->tcon->ses->server->secMode & |
| 1100 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) | 1105 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) |
| 1101 | return generic_writepages(mapping, wbc); | 1106 | if(!experimEnabled) |
| 1107 | return generic_writepages(mapping, wbc); | ||
| 1102 | 1108 | ||
| 1103 | /* | 1109 | /* |
| 1104 | * BB: Is this meaningful for a non-block-device file system? | 1110 | * BB: Is this meaningful for a non-block-device file system? |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 957ddd1571c6..4093764ef461 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -722,9 +722,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) | |||
| 722 | cifs_sb = CIFS_SB(inode->i_sb); | 722 | cifs_sb = CIFS_SB(inode->i_sb); |
| 723 | pTcon = cifs_sb->tcon; | 723 | pTcon = cifs_sb->tcon; |
| 724 | 724 | ||
| 725 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 726 | full_path = build_path_from_dentry(direntry); | 725 | full_path = build_path_from_dentry(direntry); |
| 727 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 728 | if (full_path == NULL) { | 726 | if (full_path == NULL) { |
| 729 | FreeXid(xid); | 727 | FreeXid(xid); |
| 730 | return -ENOMEM; | 728 | return -ENOMEM; |
| @@ -807,9 +805,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) | |||
| 807 | cifs_sb = CIFS_SB(inode->i_sb); | 805 | cifs_sb = CIFS_SB(inode->i_sb); |
| 808 | pTcon = cifs_sb->tcon; | 806 | pTcon = cifs_sb->tcon; |
| 809 | 807 | ||
| 810 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 811 | full_path = build_path_from_dentry(direntry); | 808 | full_path = build_path_from_dentry(direntry); |
| 812 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 813 | if (full_path == NULL) { | 809 | if (full_path == NULL) { |
| 814 | FreeXid(xid); | 810 | FreeXid(xid); |
| 815 | return -ENOMEM; | 811 | return -ENOMEM; |
| @@ -1141,9 +1137,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
| 1141 | rc = 0; | 1137 | rc = 0; |
| 1142 | } | 1138 | } |
| 1143 | 1139 | ||
| 1144 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 1145 | full_path = build_path_from_dentry(direntry); | 1140 | full_path = build_path_from_dentry(direntry); |
| 1146 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 1147 | if (full_path == NULL) { | 1141 | if (full_path == NULL) { |
| 1148 | FreeXid(xid); | 1142 | FreeXid(xid); |
| 1149 | return -ENOMEM; | 1143 | return -ENOMEM; |
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 9562f5bba65c..2ec99f833142 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c | |||
| @@ -48,10 +48,8 @@ cifs_hardlink(struct dentry *old_file, struct inode *inode, | |||
| 48 | /* No need to check for cross device links since server will do that | 48 | /* No need to check for cross device links since server will do that |
| 49 | BB note DFS case in future though (when we may have to check) */ | 49 | BB note DFS case in future though (when we may have to check) */ |
| 50 | 50 | ||
| 51 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 52 | fromName = build_path_from_dentry(old_file); | 51 | fromName = build_path_from_dentry(old_file); |
| 53 | toName = build_path_from_dentry(direntry); | 52 | toName = build_path_from_dentry(direntry); |
| 54 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 55 | if((fromName == NULL) || (toName == NULL)) { | 53 | if((fromName == NULL) || (toName == NULL)) { |
| 56 | rc = -ENOMEM; | 54 | rc = -ENOMEM; |
| 57 | goto cifs_hl_exit; | 55 | goto cifs_hl_exit; |
| @@ -103,9 +101,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd) | |||
| 103 | 101 | ||
| 104 | xid = GetXid(); | 102 | xid = GetXid(); |
| 105 | 103 | ||
| 106 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 107 | full_path = build_path_from_dentry(direntry); | 104 | full_path = build_path_from_dentry(direntry); |
| 108 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 109 | 105 | ||
| 110 | if (!full_path) | 106 | if (!full_path) |
| 111 | goto out_no_free; | 107 | goto out_no_free; |
| @@ -164,9 +160,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname) | |||
| 164 | cifs_sb = CIFS_SB(inode->i_sb); | 160 | cifs_sb = CIFS_SB(inode->i_sb); |
| 165 | pTcon = cifs_sb->tcon; | 161 | pTcon = cifs_sb->tcon; |
| 166 | 162 | ||
| 167 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 168 | full_path = build_path_from_dentry(direntry); | 163 | full_path = build_path_from_dentry(direntry); |
| 169 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 170 | 164 | ||
| 171 | if(full_path == NULL) { | 165 | if(full_path == NULL) { |
| 172 | FreeXid(xid); | 166 | FreeXid(xid); |
diff --git a/fs/cifs/ntlmssp.c b/fs/cifs/ntlmssp.c index 78866f925747..115359cc7a32 100644 --- a/fs/cifs/ntlmssp.c +++ b/fs/cifs/ntlmssp.c | |||
| @@ -121,6 +121,20 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, const int type, | |||
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | 123 | ||
| 124 | /* copy session key */ | ||
| 125 | |||
| 126 | /* if Unicode, align strings to two byte boundary */ | ||
| 127 | |||
| 128 | /* copy user name */ /* BB Do we need to special case null user name? */ | ||
| 129 | |||
| 130 | /* copy domain name */ | ||
| 131 | |||
| 132 | /* copy Linux version */ | ||
| 133 | |||
| 134 | /* copy network operating system name */ | ||
| 135 | |||
| 136 | /* update bcc and smb buffer length */ | ||
| 137 | |||
| 124 | /* rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buf_type, 0); */ | 138 | /* rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buf_type, 0); */ |
| 125 | /* SMB request buf freed in SendReceive2 */ | 139 | /* SMB request buf freed in SendReceive2 */ |
| 126 | 140 | ||
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 2f6e2825571e..b689c5035124 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
| @@ -404,9 +404,7 @@ static int initiate_cifs_search(const int xid, struct file *file) | |||
| 404 | if(pTcon == NULL) | 404 | if(pTcon == NULL) |
| 405 | return -EINVAL; | 405 | return -EINVAL; |
| 406 | 406 | ||
| 407 | mutex_lock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 408 | full_path = build_path_from_dentry(file->f_dentry); | 407 | full_path = build_path_from_dentry(file->f_dentry); |
| 409 | mutex_unlock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 410 | 408 | ||
| 411 | if(full_path == NULL) { | 409 | if(full_path == NULL) { |
| 412 | return -ENOMEM; | 410 | return -ENOMEM; |
| @@ -592,6 +590,13 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, | |||
| 592 | first_entry_in_buffer = | 590 | first_entry_in_buffer = |
| 593 | cifsFile->srch_inf.index_of_last_entry - | 591 | cifsFile->srch_inf.index_of_last_entry - |
| 594 | cifsFile->srch_inf.entries_in_buffer; | 592 | cifsFile->srch_inf.entries_in_buffer; |
| 593 | |||
| 594 | /* if first entry in buf is zero then is first buffer | ||
| 595 | in search response data which means it is likely . and .. | ||
| 596 | will be in this buffer, although some servers do not return | ||
| 597 | . and .. for the root of a drive and for those we need | ||
| 598 | to start two entries earlier */ | ||
| 599 | |||
| 595 | /* dump_cifs_file_struct(file, "In fce ");*/ | 600 | /* dump_cifs_file_struct(file, "In fce ");*/ |
| 596 | if(((index_to_find < cifsFile->srch_inf.index_of_last_entry) && | 601 | if(((index_to_find < cifsFile->srch_inf.index_of_last_entry) && |
| 597 | is_dir_changed(file)) || | 602 | is_dir_changed(file)) || |
| @@ -634,23 +639,14 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, | |||
| 634 | char * end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + | 639 | char * end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + |
| 635 | smbCalcSize((struct smb_hdr *) | 640 | smbCalcSize((struct smb_hdr *) |
| 636 | cifsFile->srch_inf.ntwrk_buf_start); | 641 | cifsFile->srch_inf.ntwrk_buf_start); |
| 642 | |||
| 643 | current_entry = cifsFile->srch_inf.srch_entries_start; | ||
| 637 | first_entry_in_buffer = cifsFile->srch_inf.index_of_last_entry | 644 | first_entry_in_buffer = cifsFile->srch_inf.index_of_last_entry |
| 638 | - cifsFile->srch_inf.entries_in_buffer; | 645 | - cifsFile->srch_inf.entries_in_buffer; |
| 639 | pos_in_buf = index_to_find - first_entry_in_buffer; | 646 | pos_in_buf = index_to_find - first_entry_in_buffer; |
| 640 | cFYI(1,("found entry - pos_in_buf %d",pos_in_buf)); | 647 | cFYI(1,("found entry - pos_in_buf %d",pos_in_buf)); |
| 641 | current_entry = cifsFile->srch_inf.srch_entries_start; | ||
| 642 | for(i=0;(i<(pos_in_buf)) && (current_entry != NULL);i++) { | 648 | for(i=0;(i<(pos_in_buf)) && (current_entry != NULL);i++) { |
| 643 | /* go entry by entry figuring out which is first */ | 649 | /* go entry by entry figuring out which is first */ |
| 644 | /* if( . or ..) | ||
| 645 | skip */ | ||
| 646 | rc = cifs_entry_is_dot(current_entry,cifsFile); | ||
| 647 | if(rc == 1) /* is . or .. so skip */ { | ||
| 648 | cFYI(1,("Entry is .")); /* BB removeme BB */ | ||
| 649 | /* continue; */ | ||
| 650 | } else if (rc == 2 ) { | ||
| 651 | cFYI(1,("Entry is ..")); /* BB removeme BB */ | ||
| 652 | /* continue; */ | ||
| 653 | } | ||
| 654 | current_entry = nxt_dir_entry(current_entry,end_of_smb); | 650 | current_entry = nxt_dir_entry(current_entry,end_of_smb); |
| 655 | } | 651 | } |
| 656 | if((current_entry == NULL) && (i < pos_in_buf)) { | 652 | if((current_entry == NULL) && (i < pos_in_buf)) { |
| @@ -770,6 +766,11 @@ static int cifs_filldir(char *pfindEntry, struct file *file, | |||
| 770 | if(file->f_dentry == NULL) | 766 | if(file->f_dentry == NULL) |
| 771 | return -ENOENT; | 767 | return -ENOENT; |
| 772 | 768 | ||
| 769 | rc = cifs_entry_is_dot(pfindEntry,pCifsF); | ||
| 770 | /* skip . and .. since we added them first */ | ||
| 771 | if(rc != 0) | ||
| 772 | return 0; | ||
| 773 | |||
| 773 | cifs_sb = CIFS_SB(file->f_dentry->d_sb); | 774 | cifs_sb = CIFS_SB(file->f_dentry->d_sb); |
| 774 | 775 | ||
| 775 | qstring.name = scratch_buf; | 776 | qstring.name = scratch_buf; |
| @@ -898,22 +899,22 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 898 | 899 | ||
| 899 | switch ((int) file->f_pos) { | 900 | switch ((int) file->f_pos) { |
| 900 | case 0: | 901 | case 0: |
| 901 | /*if (filldir(direntry, ".", 1, file->f_pos, | 902 | if (filldir(direntry, ".", 1, file->f_pos, |
| 902 | file->f_dentry->d_inode->i_ino, DT_DIR) < 0) { | 903 | file->f_dentry->d_inode->i_ino, DT_DIR) < 0) { |
| 903 | cERROR(1, ("Filldir for current dir failed ")); | 904 | cERROR(1, ("Filldir for current dir failed")); |
| 904 | rc = -ENOMEM; | 905 | rc = -ENOMEM; |
| 905 | break; | 906 | break; |
| 906 | } | 907 | } |
| 907 | file->f_pos++; */ | 908 | file->f_pos++; |
| 908 | case 1: | 909 | case 1: |
| 909 | /* if (filldir(direntry, "..", 2, file->f_pos, | 910 | if (filldir(direntry, "..", 2, file->f_pos, |
| 910 | file->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) { | 911 | file->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) { |
| 911 | cERROR(1, ("Filldir for parent dir failed ")); | 912 | cERROR(1, ("Filldir for parent dir failed ")); |
| 912 | rc = -ENOMEM; | 913 | rc = -ENOMEM; |
| 913 | break; | 914 | break; |
| 914 | } | 915 | } |
| 915 | file->f_pos++; */ | 916 | file->f_pos++; |
| 916 | case 2: | 917 | default: |
| 917 | /* 1) If search is active, | 918 | /* 1) If search is active, |
| 918 | is in current search buffer? | 919 | is in current search buffer? |
| 919 | if it before then restart search | 920 | if it before then restart search |
| @@ -927,7 +928,6 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 927 | return rc; | 928 | return rc; |
| 928 | } | 929 | } |
| 929 | } | 930 | } |
| 930 | default: | ||
| 931 | if(file->private_data == NULL) { | 931 | if(file->private_data == NULL) { |
| 932 | rc = -EINVAL; | 932 | rc = -EINVAL; |
| 933 | FreeXid(xid); | 933 | FreeXid(xid); |
| @@ -947,8 +947,6 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 947 | kfree(cifsFile->search_resume_name); | 947 | kfree(cifsFile->search_resume_name); |
| 948 | cifsFile->search_resume_name = NULL; */ | 948 | cifsFile->search_resume_name = NULL; */ |
| 949 | 949 | ||
| 950 | /* BB account for . and .. in f_pos as special case */ | ||
| 951 | |||
| 952 | rc = find_cifs_entry(xid,pTcon, file, | 950 | rc = find_cifs_entry(xid,pTcon, file, |
| 953 | ¤t_entry,&num_to_fill); | 951 | ¤t_entry,&num_to_fill); |
| 954 | if(rc) { | 952 | if(rc) { |
| @@ -977,7 +975,8 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 977 | num_to_fill, i)); | 975 | num_to_fill, i)); |
| 978 | break; | 976 | break; |
| 979 | } | 977 | } |
| 980 | 978 | /* if buggy server returns . and .. late do | |
| 979 | we want to check for that here? */ | ||
| 981 | rc = cifs_filldir(current_entry, file, | 980 | rc = cifs_filldir(current_entry, file, |
| 982 | filldir, direntry,tmp_buf); | 981 | filldir, direntry,tmp_buf); |
| 983 | file->f_pos++; | 982 | file->f_pos++; |
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 3938444d87b2..7754d641775e 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c | |||
| @@ -62,9 +62,7 @@ int cifs_removexattr(struct dentry * direntry, const char * ea_name) | |||
| 62 | cifs_sb = CIFS_SB(sb); | 62 | cifs_sb = CIFS_SB(sb); |
| 63 | pTcon = cifs_sb->tcon; | 63 | pTcon = cifs_sb->tcon; |
| 64 | 64 | ||
| 65 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 66 | full_path = build_path_from_dentry(direntry); | 65 | full_path = build_path_from_dentry(direntry); |
| 67 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 68 | if(full_path == NULL) { | 66 | if(full_path == NULL) { |
| 69 | FreeXid(xid); | 67 | FreeXid(xid); |
| 70 | return -ENOMEM; | 68 | return -ENOMEM; |
| @@ -116,9 +114,7 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name, | |||
| 116 | cifs_sb = CIFS_SB(sb); | 114 | cifs_sb = CIFS_SB(sb); |
| 117 | pTcon = cifs_sb->tcon; | 115 | pTcon = cifs_sb->tcon; |
| 118 | 116 | ||
| 119 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 120 | full_path = build_path_from_dentry(direntry); | 117 | full_path = build_path_from_dentry(direntry); |
| 121 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 122 | if(full_path == NULL) { | 118 | if(full_path == NULL) { |
| 123 | FreeXid(xid); | 119 | FreeXid(xid); |
| 124 | return -ENOMEM; | 120 | return -ENOMEM; |
| @@ -223,9 +219,7 @@ ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name, | |||
| 223 | cifs_sb = CIFS_SB(sb); | 219 | cifs_sb = CIFS_SB(sb); |
| 224 | pTcon = cifs_sb->tcon; | 220 | pTcon = cifs_sb->tcon; |
| 225 | 221 | ||
| 226 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 227 | full_path = build_path_from_dentry(direntry); | 222 | full_path = build_path_from_dentry(direntry); |
| 228 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 229 | if(full_path == NULL) { | 223 | if(full_path == NULL) { |
| 230 | FreeXid(xid); | 224 | FreeXid(xid); |
| 231 | return -ENOMEM; | 225 | return -ENOMEM; |
| @@ -341,9 +335,7 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size) | |||
| 341 | cifs_sb = CIFS_SB(sb); | 335 | cifs_sb = CIFS_SB(sb); |
| 342 | pTcon = cifs_sb->tcon; | 336 | pTcon = cifs_sb->tcon; |
| 343 | 337 | ||
| 344 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 345 | full_path = build_path_from_dentry(direntry); | 338 | full_path = build_path_from_dentry(direntry); |
| 346 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 347 | if(full_path == NULL) { | 339 | if(full_path == NULL) { |
| 348 | FreeXid(xid); | 340 | FreeXid(xid); |
| 349 | return -ENOMEM; | 341 | return -ENOMEM; |
diff --git a/fs/compat.c b/fs/compat.c index 7f8e26ea427c..2e32bd340474 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1217,6 +1217,10 @@ static ssize_t compat_do_readv_writev(int type, struct file *file, | |||
| 1217 | if (ret < 0) | 1217 | if (ret < 0) |
| 1218 | goto out; | 1218 | goto out; |
| 1219 | 1219 | ||
| 1220 | ret = security_file_permission(file, type == READ ? MAY_READ:MAY_WRITE); | ||
| 1221 | if (ret) | ||
| 1222 | goto out; | ||
| 1223 | |||
| 1220 | fnv = NULL; | 1224 | fnv = NULL; |
| 1221 | if (type == READ) { | 1225 | if (type == READ) { |
| 1222 | fn = file->f_op->read; | 1226 | fn = file->f_op->read; |
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c index aaf1da17b6d4..8c22aa9a7fbb 100644 --- a/fs/ext3/ioctl.c +++ b/fs/ext3/ioctl.c | |||
| @@ -48,6 +48,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, | |||
| 48 | if (!S_ISDIR(inode->i_mode)) | 48 | if (!S_ISDIR(inode->i_mode)) |
| 49 | flags &= ~EXT3_DIRSYNC_FL; | 49 | flags &= ~EXT3_DIRSYNC_FL; |
| 50 | 50 | ||
| 51 | mutex_lock(&inode->i_mutex); | ||
| 51 | oldflags = ei->i_flags; | 52 | oldflags = ei->i_flags; |
| 52 | 53 | ||
| 53 | /* The JOURNAL_DATA flag is modifiable only by root */ | 54 | /* The JOURNAL_DATA flag is modifiable only by root */ |
| @@ -60,8 +61,10 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, | |||
| 60 | * This test looks nicer. Thanks to Pauline Middelink | 61 | * This test looks nicer. Thanks to Pauline Middelink |
| 61 | */ | 62 | */ |
| 62 | if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) { | 63 | if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) { |
| 63 | if (!capable(CAP_LINUX_IMMUTABLE)) | 64 | if (!capable(CAP_LINUX_IMMUTABLE)) { |
| 65 | mutex_unlock(&inode->i_mutex); | ||
| 64 | return -EPERM; | 66 | return -EPERM; |
| 67 | } | ||
| 65 | } | 68 | } |
| 66 | 69 | ||
| 67 | /* | 70 | /* |
| @@ -69,14 +72,18 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, | |||
| 69 | * the relevant capability. | 72 | * the relevant capability. |
| 70 | */ | 73 | */ |
| 71 | if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL)) { | 74 | if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL)) { |
| 72 | if (!capable(CAP_SYS_RESOURCE)) | 75 | if (!capable(CAP_SYS_RESOURCE)) { |
| 76 | mutex_unlock(&inode->i_mutex); | ||
| 73 | return -EPERM; | 77 | return -EPERM; |
| 78 | } | ||
| 74 | } | 79 | } |
| 75 | 80 | ||
| 76 | 81 | ||
| 77 | handle = ext3_journal_start(inode, 1); | 82 | handle = ext3_journal_start(inode, 1); |
| 78 | if (IS_ERR(handle)) | 83 | if (IS_ERR(handle)) { |
| 84 | mutex_unlock(&inode->i_mutex); | ||
| 79 | return PTR_ERR(handle); | 85 | return PTR_ERR(handle); |
| 86 | } | ||
| 80 | if (IS_SYNC(inode)) | 87 | if (IS_SYNC(inode)) |
| 81 | handle->h_sync = 1; | 88 | handle->h_sync = 1; |
| 82 | err = ext3_reserve_inode_write(handle, inode, &iloc); | 89 | err = ext3_reserve_inode_write(handle, inode, &iloc); |
| @@ -93,11 +100,14 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, | |||
| 93 | err = ext3_mark_iloc_dirty(handle, inode, &iloc); | 100 | err = ext3_mark_iloc_dirty(handle, inode, &iloc); |
| 94 | flags_err: | 101 | flags_err: |
| 95 | ext3_journal_stop(handle); | 102 | ext3_journal_stop(handle); |
| 96 | if (err) | 103 | if (err) { |
| 104 | mutex_unlock(&inode->i_mutex); | ||
| 97 | return err; | 105 | return err; |
| 106 | } | ||
| 98 | 107 | ||
| 99 | if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL)) | 108 | if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL)) |
| 100 | err = ext3_change_inode_journal_flag(inode, jflag); | 109 | err = ext3_change_inode_journal_flag(inode, jflag); |
| 110 | mutex_unlock(&inode->i_mutex); | ||
| 101 | return err; | 111 | return err; |
| 102 | } | 112 | } |
| 103 | case EXT3_IOC_GETVERSION: | 113 | case EXT3_IOC_GETVERSION: |
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c index c5ffa8523968..8aac5334680d 100644 --- a/fs/ext3/resize.c +++ b/fs/ext3/resize.c | |||
| @@ -213,7 +213,7 @@ static int setup_new_group_blocks(struct super_block *sb, | |||
| 213 | goto exit_bh; | 213 | goto exit_bh; |
| 214 | } | 214 | } |
| 215 | lock_buffer(bh); | 215 | lock_buffer(bh); |
| 216 | memcpy(gdb->b_data, sbi->s_group_desc[i], bh->b_size); | 216 | memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, bh->b_size); |
| 217 | set_buffer_uptodate(gdb); | 217 | set_buffer_uptodate(gdb); |
| 218 | unlock_buffer(bh); | 218 | unlock_buffer(bh); |
| 219 | ext3_journal_dirty_metadata(handle, gdb); | 219 | ext3_journal_dirty_metadata(handle, gdb); |
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index cc750c68fe70..104a62dadb94 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
| @@ -128,14 +128,24 @@ void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req) | |||
| 128 | } | 128 | } |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | void fuse_remove_background(struct fuse_conn *fc, struct fuse_req *req) | 131 | /* |
| 132 | * Called with sbput_sem held for read (request_end) or write | ||
| 133 | * (fuse_put_super). By the time fuse_put_super() is finished, all | ||
| 134 | * inodes belonging to background requests must be released, so the | ||
| 135 | * iputs have to be done within the locked region. | ||
| 136 | */ | ||
| 137 | void fuse_release_background(struct fuse_conn *fc, struct fuse_req *req) | ||
| 132 | { | 138 | { |
| 133 | list_del_init(&req->bg_entry); | 139 | iput(req->inode); |
| 140 | iput(req->inode2); | ||
| 141 | spin_lock(&fc->lock); | ||
| 142 | list_del(&req->bg_entry); | ||
| 134 | if (fc->num_background == FUSE_MAX_BACKGROUND) { | 143 | if (fc->num_background == FUSE_MAX_BACKGROUND) { |
| 135 | fc->blocked = 0; | 144 | fc->blocked = 0; |
| 136 | wake_up_all(&fc->blocked_waitq); | 145 | wake_up_all(&fc->blocked_waitq); |
| 137 | } | 146 | } |
| 138 | fc->num_background--; | 147 | fc->num_background--; |
| 148 | spin_unlock(&fc->lock); | ||
| 139 | } | 149 | } |
| 140 | 150 | ||
| 141 | /* | 151 | /* |
| @@ -165,27 +175,22 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) | |||
| 165 | wake_up(&req->waitq); | 175 | wake_up(&req->waitq); |
| 166 | fuse_put_request(fc, req); | 176 | fuse_put_request(fc, req); |
| 167 | } else { | 177 | } else { |
| 168 | struct inode *inode = req->inode; | ||
| 169 | struct inode *inode2 = req->inode2; | ||
| 170 | struct file *file = req->file; | ||
| 171 | void (*end) (struct fuse_conn *, struct fuse_req *) = req->end; | 178 | void (*end) (struct fuse_conn *, struct fuse_req *) = req->end; |
| 172 | req->end = NULL; | 179 | req->end = NULL; |
| 173 | req->inode = NULL; | ||
| 174 | req->inode2 = NULL; | ||
| 175 | req->file = NULL; | ||
| 176 | if (!list_empty(&req->bg_entry)) | ||
| 177 | fuse_remove_background(fc, req); | ||
| 178 | spin_unlock(&fc->lock); | 180 | spin_unlock(&fc->lock); |
| 181 | down_read(&fc->sbput_sem); | ||
| 182 | if (fc->mounted) | ||
| 183 | fuse_release_background(fc, req); | ||
| 184 | up_read(&fc->sbput_sem); | ||
| 185 | |||
| 186 | /* fput must go outside sbput_sem, otherwise it can deadlock */ | ||
| 187 | if (req->file) | ||
| 188 | fput(req->file); | ||
| 179 | 189 | ||
| 180 | if (end) | 190 | if (end) |
| 181 | end(fc, req); | 191 | end(fc, req); |
| 182 | else | 192 | else |
| 183 | fuse_put_request(fc, req); | 193 | fuse_put_request(fc, req); |
| 184 | |||
| 185 | if (file) | ||
| 186 | fput(file); | ||
| 187 | iput(inode); | ||
| 188 | iput(inode2); | ||
| 189 | } | 194 | } |
| 190 | } | 195 | } |
| 191 | 196 | ||
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 59661c481d9d..0474202cb5dc 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h | |||
| @@ -258,9 +258,15 @@ struct fuse_conn { | |||
| 258 | /** waitq for blocked connection */ | 258 | /** waitq for blocked connection */ |
| 259 | wait_queue_head_t blocked_waitq; | 259 | wait_queue_head_t blocked_waitq; |
| 260 | 260 | ||
| 261 | /** RW semaphore for exclusion with fuse_put_super() */ | ||
| 262 | struct rw_semaphore sbput_sem; | ||
| 263 | |||
| 261 | /** The next unique request id */ | 264 | /** The next unique request id */ |
| 262 | u64 reqctr; | 265 | u64 reqctr; |
| 263 | 266 | ||
| 267 | /** Mount is active */ | ||
| 268 | unsigned mounted; | ||
| 269 | |||
| 264 | /** Connection established, cleared on umount, connection | 270 | /** Connection established, cleared on umount, connection |
| 265 | abort and device release */ | 271 | abort and device release */ |
| 266 | unsigned connected; | 272 | unsigned connected; |
| @@ -471,11 +477,11 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req); | |||
| 471 | void request_send_background(struct fuse_conn *fc, struct fuse_req *req); | 477 | void request_send_background(struct fuse_conn *fc, struct fuse_req *req); |
| 472 | 478 | ||
| 473 | /** | 479 | /** |
| 474 | * Remove request from the the background list | 480 | * Release inodes and file associated with background request |
| 475 | */ | 481 | */ |
| 476 | void fuse_remove_background(struct fuse_conn *fc, struct fuse_req *req); | 482 | void fuse_release_background(struct fuse_conn *fc, struct fuse_req *req); |
| 477 | 483 | ||
| 478 | /** Abort all requests */ | 484 | /* Abort all requests */ |
| 479 | void fuse_abort_conn(struct fuse_conn *fc); | 485 | void fuse_abort_conn(struct fuse_conn *fc); |
| 480 | 486 | ||
| 481 | /** | 487 | /** |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 43a6fc0db8a7..7627022446b2 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
| @@ -204,26 +204,17 @@ static void fuse_put_super(struct super_block *sb) | |||
| 204 | { | 204 | { |
| 205 | struct fuse_conn *fc = get_fuse_conn_super(sb); | 205 | struct fuse_conn *fc = get_fuse_conn_super(sb); |
| 206 | 206 | ||
| 207 | down_write(&fc->sbput_sem); | ||
| 208 | while (!list_empty(&fc->background)) | ||
| 209 | fuse_release_background(fc, | ||
| 210 | list_entry(fc->background.next, | ||
| 211 | struct fuse_req, bg_entry)); | ||
| 212 | |||
| 207 | spin_lock(&fc->lock); | 213 | spin_lock(&fc->lock); |
| 214 | fc->mounted = 0; | ||
| 208 | fc->connected = 0; | 215 | fc->connected = 0; |
| 209 | while (!list_empty(&fc->background)) { | ||
| 210 | struct fuse_req *req = list_entry(fc->background.next, | ||
| 211 | struct fuse_req, bg_entry); | ||
| 212 | struct inode *inode = req->inode; | ||
| 213 | struct inode *inode2 = req->inode2; | ||
| 214 | |||
| 215 | /* File would hold a reference to vfsmount */ | ||
| 216 | BUG_ON(req->file); | ||
| 217 | req->inode = NULL; | ||
| 218 | req->inode2 = NULL; | ||
| 219 | fuse_remove_background(fc, req); | ||
| 220 | |||
| 221 | spin_unlock(&fc->lock); | ||
| 222 | iput(inode); | ||
| 223 | iput(inode2); | ||
| 224 | spin_lock(&fc->lock); | ||
| 225 | } | ||
| 226 | spin_unlock(&fc->lock); | 216 | spin_unlock(&fc->lock); |
| 217 | up_write(&fc->sbput_sem); | ||
| 227 | /* Flush all readers on this fs */ | 218 | /* Flush all readers on this fs */ |
| 228 | kill_fasync(&fc->fasync, SIGIO, POLL_IN); | 219 | kill_fasync(&fc->fasync, SIGIO, POLL_IN); |
| 229 | wake_up_all(&fc->waitq); | 220 | wake_up_all(&fc->waitq); |
| @@ -395,6 +386,7 @@ static struct fuse_conn *new_conn(void) | |||
| 395 | INIT_LIST_HEAD(&fc->processing); | 386 | INIT_LIST_HEAD(&fc->processing); |
| 396 | INIT_LIST_HEAD(&fc->io); | 387 | INIT_LIST_HEAD(&fc->io); |
| 397 | INIT_LIST_HEAD(&fc->background); | 388 | INIT_LIST_HEAD(&fc->background); |
| 389 | init_rwsem(&fc->sbput_sem); | ||
| 398 | kobj_set_kset_s(fc, connections_subsys); | 390 | kobj_set_kset_s(fc, connections_subsys); |
| 399 | kobject_init(&fc->kobj); | 391 | kobject_init(&fc->kobj); |
| 400 | atomic_set(&fc->num_waiting, 0); | 392 | atomic_set(&fc->num_waiting, 0); |
| @@ -508,11 +500,6 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
| 508 | if (file->f_op != &fuse_dev_operations) | 500 | if (file->f_op != &fuse_dev_operations) |
| 509 | return -EINVAL; | 501 | return -EINVAL; |
| 510 | 502 | ||
| 511 | /* Setting file->private_data can't race with other mount() | ||
| 512 | instances, since BKL is held for ->get_sb() */ | ||
| 513 | if (file->private_data) | ||
| 514 | return -EINVAL; | ||
| 515 | |||
| 516 | fc = new_conn(); | 503 | fc = new_conn(); |
| 517 | if (!fc) | 504 | if (!fc) |
| 518 | return -ENOMEM; | 505 | return -ENOMEM; |
| @@ -548,7 +535,14 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
| 548 | if (err) | 535 | if (err) |
| 549 | goto err_free_req; | 536 | goto err_free_req; |
| 550 | 537 | ||
| 538 | /* Setting file->private_data can't race with other mount() | ||
| 539 | instances, since BKL is held for ->get_sb() */ | ||
| 540 | err = -EINVAL; | ||
| 541 | if (file->private_data) | ||
| 542 | goto err_kobject_del; | ||
| 543 | |||
| 551 | sb->s_root = root_dentry; | 544 | sb->s_root = root_dentry; |
| 545 | fc->mounted = 1; | ||
| 552 | fc->connected = 1; | 546 | fc->connected = 1; |
| 553 | kobject_get(&fc->kobj); | 547 | kobject_get(&fc->kobj); |
| 554 | file->private_data = fc; | 548 | file->private_data = fc; |
| @@ -563,6 +557,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
| 563 | 557 | ||
| 564 | return 0; | 558 | return 0; |
| 565 | 559 | ||
| 560 | err_kobject_del: | ||
| 561 | kobject_del(&fc->kobj); | ||
| 566 | err_free_req: | 562 | err_free_req: |
| 567 | fuse_request_free(init_req); | 563 | fuse_request_free(init_req); |
| 568 | err_put_root: | 564 | err_put_root: |
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 58c418fbca2c..97ae1b92bc47 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c | |||
| @@ -408,8 +408,9 @@ int reiserfs_cache_default_acl(struct inode *inode) | |||
| 408 | acl = reiserfs_get_acl(inode, ACL_TYPE_DEFAULT); | 408 | acl = reiserfs_get_acl(inode, ACL_TYPE_DEFAULT); |
| 409 | reiserfs_read_unlock_xattrs(inode->i_sb); | 409 | reiserfs_read_unlock_xattrs(inode->i_sb); |
| 410 | reiserfs_read_unlock_xattr_i(inode); | 410 | reiserfs_read_unlock_xattr_i(inode); |
| 411 | ret = acl ? 1 : 0; | 411 | ret = (acl && !IS_ERR(acl)); |
| 412 | posix_acl_release(acl); | 412 | if (ret) |
| 413 | posix_acl_release(acl); | ||
| 413 | } | 414 | } |
| 414 | 415 | ||
| 415 | return ret; | 416 | return ret; |
diff --git a/fs/splice.c b/fs/splice.c index 0559e7577a04..a46ddd28561e 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
| @@ -27,15 +27,22 @@ | |||
| 27 | #include <linux/buffer_head.h> | 27 | #include <linux/buffer_head.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/syscalls.h> | 29 | #include <linux/syscalls.h> |
| 30 | #include <linux/uio.h> | ||
| 31 | |||
| 32 | struct partial_page { | ||
| 33 | unsigned int offset; | ||
| 34 | unsigned int len; | ||
| 35 | }; | ||
| 30 | 36 | ||
| 31 | /* | 37 | /* |
| 32 | * Passed to the actors | 38 | * Passed to splice_to_pipe |
| 33 | */ | 39 | */ |
| 34 | struct splice_desc { | 40 | struct splice_pipe_desc { |
| 35 | unsigned int len, total_len; /* current and remaining length */ | 41 | struct page **pages; /* page map */ |
| 42 | struct partial_page *partial; /* pages[] may not be contig */ | ||
| 43 | int nr_pages; /* number of pages in map */ | ||
| 36 | unsigned int flags; /* splice flags */ | 44 | unsigned int flags; /* splice flags */ |
| 37 | struct file *file; /* file to read/write */ | 45 | struct pipe_buf_operations *ops;/* ops associated with output pipe */ |
| 38 | loff_t pos; /* file position */ | ||
| 39 | }; | 46 | }; |
| 40 | 47 | ||
| 41 | /* | 48 | /* |
| @@ -128,6 +135,19 @@ static void page_cache_pipe_buf_unmap(struct pipe_inode_info *info, | |||
| 128 | kunmap(buf->page); | 135 | kunmap(buf->page); |
| 129 | } | 136 | } |
| 130 | 137 | ||
| 138 | static void *user_page_pipe_buf_map(struct file *file, | ||
| 139 | struct pipe_inode_info *pipe, | ||
| 140 | struct pipe_buffer *buf) | ||
| 141 | { | ||
| 142 | return kmap(buf->page); | ||
| 143 | } | ||
| 144 | |||
| 145 | static void user_page_pipe_buf_unmap(struct pipe_inode_info *pipe, | ||
| 146 | struct pipe_buffer *buf) | ||
| 147 | { | ||
| 148 | kunmap(buf->page); | ||
| 149 | } | ||
| 150 | |||
| 131 | static void page_cache_pipe_buf_get(struct pipe_inode_info *info, | 151 | static void page_cache_pipe_buf_get(struct pipe_inode_info *info, |
| 132 | struct pipe_buffer *buf) | 152 | struct pipe_buffer *buf) |
| 133 | { | 153 | { |
| @@ -143,19 +163,33 @@ static struct pipe_buf_operations page_cache_pipe_buf_ops = { | |||
| 143 | .get = page_cache_pipe_buf_get, | 163 | .get = page_cache_pipe_buf_get, |
| 144 | }; | 164 | }; |
| 145 | 165 | ||
| 166 | static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe, | ||
| 167 | struct pipe_buffer *buf) | ||
| 168 | { | ||
| 169 | return 1; | ||
| 170 | } | ||
| 171 | |||
| 172 | static struct pipe_buf_operations user_page_pipe_buf_ops = { | ||
| 173 | .can_merge = 0, | ||
| 174 | .map = user_page_pipe_buf_map, | ||
| 175 | .unmap = user_page_pipe_buf_unmap, | ||
| 176 | .release = page_cache_pipe_buf_release, | ||
| 177 | .steal = user_page_pipe_buf_steal, | ||
| 178 | .get = page_cache_pipe_buf_get, | ||
| 179 | }; | ||
| 180 | |||
| 146 | /* | 181 | /* |
| 147 | * Pipe output worker. This sets up our pipe format with the page cache | 182 | * Pipe output worker. This sets up our pipe format with the page cache |
| 148 | * pipe buffer operations. Otherwise very similar to the regular pipe_writev(). | 183 | * pipe buffer operations. Otherwise very similar to the regular pipe_writev(). |
| 149 | */ | 184 | */ |
| 150 | static ssize_t move_to_pipe(struct pipe_inode_info *pipe, struct page **pages, | 185 | static ssize_t splice_to_pipe(struct pipe_inode_info *pipe, |
| 151 | int nr_pages, unsigned long len, | 186 | struct splice_pipe_desc *spd) |
| 152 | unsigned int offset, unsigned int flags) | ||
| 153 | { | 187 | { |
| 154 | int ret, do_wakeup, i; | 188 | int ret, do_wakeup, page_nr; |
| 155 | 189 | ||
| 156 | ret = 0; | 190 | ret = 0; |
| 157 | do_wakeup = 0; | 191 | do_wakeup = 0; |
| 158 | i = 0; | 192 | page_nr = 0; |
| 159 | 193 | ||
| 160 | if (pipe->inode) | 194 | if (pipe->inode) |
| 161 | mutex_lock(&pipe->inode->i_mutex); | 195 | mutex_lock(&pipe->inode->i_mutex); |
| @@ -171,27 +205,19 @@ static ssize_t move_to_pipe(struct pipe_inode_info *pipe, struct page **pages, | |||
| 171 | if (pipe->nrbufs < PIPE_BUFFERS) { | 205 | if (pipe->nrbufs < PIPE_BUFFERS) { |
| 172 | int newbuf = (pipe->curbuf + pipe->nrbufs) & (PIPE_BUFFERS - 1); | 206 | int newbuf = (pipe->curbuf + pipe->nrbufs) & (PIPE_BUFFERS - 1); |
| 173 | struct pipe_buffer *buf = pipe->bufs + newbuf; | 207 | struct pipe_buffer *buf = pipe->bufs + newbuf; |
| 174 | struct page *page = pages[i++]; | ||
| 175 | unsigned long this_len; | ||
| 176 | |||
| 177 | this_len = PAGE_CACHE_SIZE - offset; | ||
| 178 | if (this_len > len) | ||
| 179 | this_len = len; | ||
| 180 | 208 | ||
| 181 | buf->page = page; | 209 | buf->page = spd->pages[page_nr]; |
| 182 | buf->offset = offset; | 210 | buf->offset = spd->partial[page_nr].offset; |
| 183 | buf->len = this_len; | 211 | buf->len = spd->partial[page_nr].len; |
| 184 | buf->ops = &page_cache_pipe_buf_ops; | 212 | buf->ops = spd->ops; |
| 185 | pipe->nrbufs++; | 213 | pipe->nrbufs++; |
| 214 | page_nr++; | ||
| 215 | ret += buf->len; | ||
| 216 | |||
| 186 | if (pipe->inode) | 217 | if (pipe->inode) |
| 187 | do_wakeup = 1; | 218 | do_wakeup = 1; |
| 188 | 219 | ||
| 189 | ret += this_len; | 220 | if (!--spd->nr_pages) |
| 190 | len -= this_len; | ||
| 191 | offset = 0; | ||
| 192 | if (!--nr_pages) | ||
| 193 | break; | ||
| 194 | if (!len) | ||
| 195 | break; | 221 | break; |
| 196 | if (pipe->nrbufs < PIPE_BUFFERS) | 222 | if (pipe->nrbufs < PIPE_BUFFERS) |
| 197 | continue; | 223 | continue; |
| @@ -199,7 +225,7 @@ static ssize_t move_to_pipe(struct pipe_inode_info *pipe, struct page **pages, | |||
| 199 | break; | 225 | break; |
| 200 | } | 226 | } |
| 201 | 227 | ||
| 202 | if (flags & SPLICE_F_NONBLOCK) { | 228 | if (spd->flags & SPLICE_F_NONBLOCK) { |
| 203 | if (!ret) | 229 | if (!ret) |
| 204 | ret = -EAGAIN; | 230 | ret = -EAGAIN; |
| 205 | break; | 231 | break; |
| @@ -234,8 +260,8 @@ static ssize_t move_to_pipe(struct pipe_inode_info *pipe, struct page **pages, | |||
| 234 | kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN); | 260 | kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN); |
| 235 | } | 261 | } |
| 236 | 262 | ||
| 237 | while (i < nr_pages) | 263 | while (page_nr < spd->nr_pages) |
| 238 | page_cache_release(pages[i++]); | 264 | page_cache_release(spd->pages[page_nr++]); |
| 239 | 265 | ||
| 240 | return ret; | 266 | return ret; |
| 241 | } | 267 | } |
| @@ -246,17 +272,24 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, | |||
| 246 | unsigned int flags) | 272 | unsigned int flags) |
| 247 | { | 273 | { |
| 248 | struct address_space *mapping = in->f_mapping; | 274 | struct address_space *mapping = in->f_mapping; |
| 249 | unsigned int loff, offset, nr_pages; | 275 | unsigned int loff, nr_pages; |
| 250 | struct page *pages[PIPE_BUFFERS]; | 276 | struct page *pages[PIPE_BUFFERS]; |
| 277 | struct partial_page partial[PIPE_BUFFERS]; | ||
| 251 | struct page *page; | 278 | struct page *page; |
| 252 | pgoff_t index, end_index; | 279 | pgoff_t index, end_index; |
| 253 | loff_t isize; | 280 | loff_t isize; |
| 254 | size_t bytes; | 281 | size_t total_len; |
| 255 | int i, error; | 282 | int error, page_nr; |
| 283 | struct splice_pipe_desc spd = { | ||
| 284 | .pages = pages, | ||
| 285 | .partial = partial, | ||
| 286 | .flags = flags, | ||
| 287 | .ops = &page_cache_pipe_buf_ops, | ||
| 288 | }; | ||
| 256 | 289 | ||
| 257 | index = *ppos >> PAGE_CACHE_SHIFT; | 290 | index = *ppos >> PAGE_CACHE_SHIFT; |
| 258 | loff = offset = *ppos & ~PAGE_CACHE_MASK; | 291 | loff = *ppos & ~PAGE_CACHE_MASK; |
| 259 | nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; | 292 | nr_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; |
| 260 | 293 | ||
| 261 | if (nr_pages > PIPE_BUFFERS) | 294 | if (nr_pages > PIPE_BUFFERS) |
| 262 | nr_pages = PIPE_BUFFERS; | 295 | nr_pages = PIPE_BUFFERS; |
| @@ -266,47 +299,75 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, | |||
| 266 | * read-ahead if this is a non-zero offset (we are likely doing small | 299 | * read-ahead if this is a non-zero offset (we are likely doing small |
| 267 | * chunk splice and the page is already there) for a single page. | 300 | * chunk splice and the page is already there) for a single page. |
| 268 | */ | 301 | */ |
| 269 | if (!offset || nr_pages > 1) | 302 | if (!loff || nr_pages > 1) |
| 270 | do_page_cache_readahead(mapping, in, index, nr_pages); | 303 | page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages); |
| 271 | 304 | ||
| 272 | /* | 305 | /* |
| 273 | * Now fill in the holes: | 306 | * Now fill in the holes: |
| 274 | */ | 307 | */ |
| 275 | error = 0; | 308 | error = 0; |
| 276 | bytes = 0; | 309 | total_len = 0; |
| 277 | for (i = 0; i < nr_pages; i++, index++) { | ||
| 278 | unsigned int this_len; | ||
| 279 | 310 | ||
| 280 | if (!len) | 311 | /* |
| 281 | break; | 312 | * Lookup the (hopefully) full range of pages we need. |
| 313 | */ | ||
| 314 | spd.nr_pages = find_get_pages_contig(mapping, index, nr_pages, pages); | ||
| 282 | 315 | ||
| 316 | /* | ||
| 317 | * If find_get_pages_contig() returned fewer pages than we needed, | ||
| 318 | * allocate the rest. | ||
| 319 | */ | ||
| 320 | index += spd.nr_pages; | ||
| 321 | while (spd.nr_pages < nr_pages) { | ||
| 283 | /* | 322 | /* |
| 284 | * this_len is the max we'll use from this page | 323 | * Page could be there, find_get_pages_contig() breaks on |
| 285 | */ | 324 | * the first hole. |
| 286 | this_len = min(len, PAGE_CACHE_SIZE - loff); | ||
| 287 | find_page: | ||
| 288 | /* | ||
| 289 | * lookup the page for this index | ||
| 290 | */ | 325 | */ |
| 291 | page = find_get_page(mapping, index); | 326 | page = find_get_page(mapping, index); |
| 292 | if (!page) { | 327 | if (!page) { |
| 293 | /* | 328 | /* |
| 294 | * page didn't exist, allocate one | 329 | * page didn't exist, allocate one. |
| 295 | */ | 330 | */ |
| 296 | page = page_cache_alloc_cold(mapping); | 331 | page = page_cache_alloc_cold(mapping); |
| 297 | if (!page) | 332 | if (!page) |
| 298 | break; | 333 | break; |
| 299 | 334 | ||
| 300 | error = add_to_page_cache_lru(page, mapping, index, | 335 | error = add_to_page_cache_lru(page, mapping, index, |
| 301 | mapping_gfp_mask(mapping)); | 336 | mapping_gfp_mask(mapping)); |
| 302 | if (unlikely(error)) { | 337 | if (unlikely(error)) { |
| 303 | page_cache_release(page); | 338 | page_cache_release(page); |
| 304 | break; | 339 | break; |
| 305 | } | 340 | } |
| 306 | 341 | /* | |
| 307 | goto readpage; | 342 | * add_to_page_cache() locks the page, unlock it |
| 343 | * to avoid convoluting the logic below even more. | ||
| 344 | */ | ||
| 345 | unlock_page(page); | ||
| 308 | } | 346 | } |
| 309 | 347 | ||
| 348 | pages[spd.nr_pages++] = page; | ||
| 349 | index++; | ||
| 350 | } | ||
| 351 | |||
| 352 | /* | ||
| 353 | * Now loop over the map and see if we need to start IO on any | ||
| 354 | * pages, fill in the partial map, etc. | ||
| 355 | */ | ||
| 356 | index = *ppos >> PAGE_CACHE_SHIFT; | ||
| 357 | nr_pages = spd.nr_pages; | ||
| 358 | spd.nr_pages = 0; | ||
| 359 | for (page_nr = 0; page_nr < nr_pages; page_nr++) { | ||
| 360 | unsigned int this_len; | ||
| 361 | |||
| 362 | if (!len) | ||
| 363 | break; | ||
| 364 | |||
| 365 | /* | ||
| 366 | * this_len is the max we'll use from this page | ||
| 367 | */ | ||
| 368 | this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff); | ||
| 369 | page = pages[page_nr]; | ||
| 370 | |||
| 310 | /* | 371 | /* |
| 311 | * If the page isn't uptodate, we may need to start io on it | 372 | * If the page isn't uptodate, we may need to start io on it |
| 312 | */ | 373 | */ |
| @@ -327,7 +388,6 @@ find_page: | |||
| 327 | */ | 388 | */ |
| 328 | if (!page->mapping) { | 389 | if (!page->mapping) { |
| 329 | unlock_page(page); | 390 | unlock_page(page); |
| 330 | page_cache_release(page); | ||
| 331 | break; | 391 | break; |
| 332 | } | 392 | } |
| 333 | /* | 393 | /* |
| @@ -338,16 +398,20 @@ find_page: | |||
| 338 | goto fill_it; | 398 | goto fill_it; |
| 339 | } | 399 | } |
| 340 | 400 | ||
| 341 | readpage: | ||
| 342 | /* | 401 | /* |
| 343 | * need to read in the page | 402 | * need to read in the page |
| 344 | */ | 403 | */ |
| 345 | error = mapping->a_ops->readpage(in, page); | 404 | error = mapping->a_ops->readpage(in, page); |
| 346 | |||
| 347 | if (unlikely(error)) { | 405 | if (unlikely(error)) { |
| 348 | page_cache_release(page); | 406 | /* |
| 407 | * We really should re-lookup the page here, | ||
| 408 | * but it complicates things a lot. Instead | ||
| 409 | * lets just do what we already stored, and | ||
| 410 | * we'll get it the next time we are called. | ||
| 411 | */ | ||
| 349 | if (error == AOP_TRUNCATED_PAGE) | 412 | if (error == AOP_TRUNCATED_PAGE) |
| 350 | goto find_page; | 413 | error = 0; |
| 414 | |||
| 351 | break; | 415 | break; |
| 352 | } | 416 | } |
| 353 | 417 | ||
| @@ -356,10 +420,8 @@ readpage: | |||
| 356 | */ | 420 | */ |
| 357 | isize = i_size_read(mapping->host); | 421 | isize = i_size_read(mapping->host); |
| 358 | end_index = (isize - 1) >> PAGE_CACHE_SHIFT; | 422 | end_index = (isize - 1) >> PAGE_CACHE_SHIFT; |
| 359 | if (unlikely(!isize || index > end_index)) { | 423 | if (unlikely(!isize || index > end_index)) |
| 360 | page_cache_release(page); | ||
| 361 | break; | 424 | break; |
| 362 | } | ||
| 363 | 425 | ||
| 364 | /* | 426 | /* |
| 365 | * if this is the last page, see if we need to shrink | 427 | * if this is the last page, see if we need to shrink |
| @@ -367,26 +429,35 @@ readpage: | |||
| 367 | */ | 429 | */ |
| 368 | if (end_index == index) { | 430 | if (end_index == index) { |
| 369 | loff = PAGE_CACHE_SIZE - (isize & ~PAGE_CACHE_MASK); | 431 | loff = PAGE_CACHE_SIZE - (isize & ~PAGE_CACHE_MASK); |
| 370 | if (bytes + loff > isize) { | 432 | if (total_len + loff > isize) |
| 371 | page_cache_release(page); | ||
| 372 | break; | 433 | break; |
| 373 | } | ||
| 374 | /* | 434 | /* |
| 375 | * force quit after adding this page | 435 | * force quit after adding this page |
| 376 | */ | 436 | */ |
| 377 | nr_pages = i; | 437 | len = this_len; |
| 378 | this_len = min(this_len, loff); | 438 | this_len = min(this_len, loff); |
| 439 | loff = 0; | ||
| 379 | } | 440 | } |
| 380 | } | 441 | } |
| 381 | fill_it: | 442 | fill_it: |
| 382 | pages[i] = page; | 443 | partial[page_nr].offset = loff; |
| 383 | bytes += this_len; | 444 | partial[page_nr].len = this_len; |
| 384 | len -= this_len; | 445 | len -= this_len; |
| 446 | total_len += this_len; | ||
| 385 | loff = 0; | 447 | loff = 0; |
| 448 | spd.nr_pages++; | ||
| 449 | index++; | ||
| 386 | } | 450 | } |
| 387 | 451 | ||
| 388 | if (i) | 452 | /* |
| 389 | return move_to_pipe(pipe, pages, i, bytes, offset, flags); | 453 | * Release any pages at the end, if we quit early. 'i' is how far |
| 454 | * we got, 'nr_pages' is how many pages are in the map. | ||
| 455 | */ | ||
| 456 | while (page_nr < nr_pages) | ||
| 457 | page_cache_release(pages[page_nr++]); | ||
| 458 | |||
| 459 | if (spd.nr_pages) | ||
| 460 | return splice_to_pipe(pipe, &spd); | ||
| 390 | 461 | ||
| 391 | return error; | 462 | return error; |
| 392 | } | 463 | } |
| @@ -439,14 +510,13 @@ EXPORT_SYMBOL(generic_file_splice_read); | |||
| 439 | 510 | ||
| 440 | /* | 511 | /* |
| 441 | * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' | 512 | * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' |
| 442 | * using sendpage(). | 513 | * using sendpage(). Return the number of bytes sent. |
| 443 | */ | 514 | */ |
| 444 | static int pipe_to_sendpage(struct pipe_inode_info *info, | 515 | static int pipe_to_sendpage(struct pipe_inode_info *info, |
| 445 | struct pipe_buffer *buf, struct splice_desc *sd) | 516 | struct pipe_buffer *buf, struct splice_desc *sd) |
| 446 | { | 517 | { |
| 447 | struct file *file = sd->file; | 518 | struct file *file = sd->file; |
| 448 | loff_t pos = sd->pos; | 519 | loff_t pos = sd->pos; |
| 449 | unsigned int offset; | ||
| 450 | ssize_t ret; | 520 | ssize_t ret; |
| 451 | void *ptr; | 521 | void *ptr; |
| 452 | int more; | 522 | int more; |
| @@ -461,16 +531,13 @@ static int pipe_to_sendpage(struct pipe_inode_info *info, | |||
| 461 | if (IS_ERR(ptr)) | 531 | if (IS_ERR(ptr)) |
| 462 | return PTR_ERR(ptr); | 532 | return PTR_ERR(ptr); |
| 463 | 533 | ||
| 464 | offset = pos & ~PAGE_CACHE_MASK; | ||
| 465 | more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len; | 534 | more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len; |
| 466 | 535 | ||
| 467 | ret = file->f_op->sendpage(file, buf->page, offset, sd->len, &pos,more); | 536 | ret = file->f_op->sendpage(file, buf->page, buf->offset, sd->len, |
| 537 | &pos, more); | ||
| 468 | 538 | ||
| 469 | buf->ops->unmap(info, buf); | 539 | buf->ops->unmap(info, buf); |
| 470 | if (ret == sd->len) | 540 | return ret; |
| 471 | return 0; | ||
| 472 | |||
| 473 | return -EIO; | ||
| 474 | } | 541 | } |
| 475 | 542 | ||
| 476 | /* | 543 | /* |
| @@ -499,7 +566,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, | |||
| 499 | struct file *file = sd->file; | 566 | struct file *file = sd->file; |
| 500 | struct address_space *mapping = file->f_mapping; | 567 | struct address_space *mapping = file->f_mapping; |
| 501 | gfp_t gfp_mask = mapping_gfp_mask(mapping); | 568 | gfp_t gfp_mask = mapping_gfp_mask(mapping); |
| 502 | unsigned int offset; | 569 | unsigned int offset, this_len; |
| 503 | struct page *page; | 570 | struct page *page; |
| 504 | pgoff_t index; | 571 | pgoff_t index; |
| 505 | char *src; | 572 | char *src; |
| @@ -515,6 +582,10 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, | |||
| 515 | index = sd->pos >> PAGE_CACHE_SHIFT; | 582 | index = sd->pos >> PAGE_CACHE_SHIFT; |
| 516 | offset = sd->pos & ~PAGE_CACHE_MASK; | 583 | offset = sd->pos & ~PAGE_CACHE_MASK; |
| 517 | 584 | ||
| 585 | this_len = sd->len; | ||
| 586 | if (this_len + offset > PAGE_CACHE_SIZE) | ||
| 587 | this_len = PAGE_CACHE_SIZE - offset; | ||
| 588 | |||
| 518 | /* | 589 | /* |
| 519 | * Reuse buf page, if SPLICE_F_MOVE is set. | 590 | * Reuse buf page, if SPLICE_F_MOVE is set. |
| 520 | */ | 591 | */ |
| @@ -558,7 +629,7 @@ find_page: | |||
| 558 | * the full page. | 629 | * the full page. |
| 559 | */ | 630 | */ |
| 560 | if (!PageUptodate(page)) { | 631 | if (!PageUptodate(page)) { |
| 561 | if (sd->len < PAGE_CACHE_SIZE) { | 632 | if (this_len < PAGE_CACHE_SIZE) { |
| 562 | ret = mapping->a_ops->readpage(file, page); | 633 | ret = mapping->a_ops->readpage(file, page); |
| 563 | if (unlikely(ret)) | 634 | if (unlikely(ret)) |
| 564 | goto out; | 635 | goto out; |
| @@ -582,7 +653,7 @@ find_page: | |||
| 582 | } | 653 | } |
| 583 | } | 654 | } |
| 584 | 655 | ||
| 585 | ret = mapping->a_ops->prepare_write(file, page, 0, sd->len); | 656 | ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len); |
| 586 | if (ret == AOP_TRUNCATED_PAGE) { | 657 | if (ret == AOP_TRUNCATED_PAGE) { |
| 587 | page_cache_release(page); | 658 | page_cache_release(page); |
| 588 | goto find_page; | 659 | goto find_page; |
| @@ -592,18 +663,22 @@ find_page: | |||
| 592 | if (!(buf->flags & PIPE_BUF_FLAG_STOLEN)) { | 663 | if (!(buf->flags & PIPE_BUF_FLAG_STOLEN)) { |
| 593 | char *dst = kmap_atomic(page, KM_USER0); | 664 | char *dst = kmap_atomic(page, KM_USER0); |
| 594 | 665 | ||
| 595 | memcpy(dst + offset, src + buf->offset, sd->len); | 666 | memcpy(dst + offset, src + buf->offset, this_len); |
| 596 | flush_dcache_page(page); | 667 | flush_dcache_page(page); |
| 597 | kunmap_atomic(dst, KM_USER0); | 668 | kunmap_atomic(dst, KM_USER0); |
| 598 | } | 669 | } |
| 599 | 670 | ||
| 600 | ret = mapping->a_ops->commit_write(file, page, 0, sd->len); | 671 | ret = mapping->a_ops->commit_write(file, page, offset, offset+this_len); |
| 601 | if (ret == AOP_TRUNCATED_PAGE) { | 672 | if (ret == AOP_TRUNCATED_PAGE) { |
| 602 | page_cache_release(page); | 673 | page_cache_release(page); |
| 603 | goto find_page; | 674 | goto find_page; |
| 604 | } else if (ret) | 675 | } else if (ret) |
| 605 | goto out; | 676 | goto out; |
| 606 | 677 | ||
| 678 | /* | ||
| 679 | * Return the number of bytes written. | ||
| 680 | */ | ||
| 681 | ret = this_len; | ||
| 607 | mark_page_accessed(page); | 682 | mark_page_accessed(page); |
| 608 | balance_dirty_pages_ratelimited(mapping); | 683 | balance_dirty_pages_ratelimited(mapping); |
| 609 | out: | 684 | out: |
| @@ -616,17 +691,14 @@ out_nomem: | |||
| 616 | return ret; | 691 | return ret; |
| 617 | } | 692 | } |
| 618 | 693 | ||
| 619 | typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *, | ||
| 620 | struct splice_desc *); | ||
| 621 | |||
| 622 | /* | 694 | /* |
| 623 | * Pipe input worker. Most of this logic works like a regular pipe, the | 695 | * Pipe input worker. Most of this logic works like a regular pipe, the |
| 624 | * key here is the 'actor' worker passed in that actually moves the data | 696 | * key here is the 'actor' worker passed in that actually moves the data |
| 625 | * to the wanted destination. See pipe_to_file/pipe_to_sendpage above. | 697 | * to the wanted destination. See pipe_to_file/pipe_to_sendpage above. |
| 626 | */ | 698 | */ |
| 627 | static ssize_t move_from_pipe(struct pipe_inode_info *pipe, struct file *out, | 699 | ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out, |
| 628 | loff_t *ppos, size_t len, unsigned int flags, | 700 | loff_t *ppos, size_t len, unsigned int flags, |
| 629 | splice_actor *actor) | 701 | splice_actor *actor) |
| 630 | { | 702 | { |
| 631 | int ret, do_wakeup, err; | 703 | int ret, do_wakeup, err; |
| 632 | struct splice_desc sd; | 704 | struct splice_desc sd; |
| @@ -652,16 +724,22 @@ static ssize_t move_from_pipe(struct pipe_inode_info *pipe, struct file *out, | |||
| 652 | sd.len = sd.total_len; | 724 | sd.len = sd.total_len; |
| 653 | 725 | ||
| 654 | err = actor(pipe, buf, &sd); | 726 | err = actor(pipe, buf, &sd); |
| 655 | if (err) { | 727 | if (err <= 0) { |
| 656 | if (!ret && err != -ENODATA) | 728 | if (!ret && err != -ENODATA) |
| 657 | ret = err; | 729 | ret = err; |
| 658 | 730 | ||
| 659 | break; | 731 | break; |
| 660 | } | 732 | } |
| 661 | 733 | ||
| 662 | ret += sd.len; | 734 | ret += err; |
| 663 | buf->offset += sd.len; | 735 | buf->offset += err; |
| 664 | buf->len -= sd.len; | 736 | buf->len -= err; |
| 737 | |||
| 738 | sd.len -= err; | ||
| 739 | sd.pos += err; | ||
| 740 | sd.total_len -= err; | ||
| 741 | if (sd.len) | ||
| 742 | continue; | ||
| 665 | 743 | ||
| 666 | if (!buf->len) { | 744 | if (!buf->len) { |
| 667 | buf->ops = NULL; | 745 | buf->ops = NULL; |
| @@ -672,8 +750,6 @@ static ssize_t move_from_pipe(struct pipe_inode_info *pipe, struct file *out, | |||
| 672 | do_wakeup = 1; | 750 | do_wakeup = 1; |
| 673 | } | 751 | } |
| 674 | 752 | ||
| 675 | sd.pos += sd.len; | ||
| 676 | sd.total_len -= sd.len; | ||
| 677 | if (!sd.total_len) | 753 | if (!sd.total_len) |
| 678 | break; | 754 | break; |
| 679 | } | 755 | } |
| @@ -741,7 +817,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, | |||
| 741 | struct address_space *mapping = out->f_mapping; | 817 | struct address_space *mapping = out->f_mapping; |
| 742 | ssize_t ret; | 818 | ssize_t ret; |
| 743 | 819 | ||
| 744 | ret = move_from_pipe(pipe, out, ppos, len, flags, pipe_to_file); | 820 | ret = splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file); |
| 745 | if (ret > 0) { | 821 | if (ret > 0) { |
| 746 | struct inode *inode = mapping->host; | 822 | struct inode *inode = mapping->host; |
| 747 | 823 | ||
| @@ -783,7 +859,7 @@ EXPORT_SYMBOL(generic_file_splice_write); | |||
| 783 | ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, struct file *out, | 859 | ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, struct file *out, |
| 784 | loff_t *ppos, size_t len, unsigned int flags) | 860 | loff_t *ppos, size_t len, unsigned int flags) |
| 785 | { | 861 | { |
| 786 | return move_from_pipe(pipe, out, ppos, len, flags, pipe_to_sendpage); | 862 | return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_sendpage); |
| 787 | } | 863 | } |
| 788 | 864 | ||
| 789 | EXPORT_SYMBOL(generic_splice_sendpage); | 865 | EXPORT_SYMBOL(generic_splice_sendpage); |
| @@ -870,7 +946,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, | |||
| 870 | 946 | ||
| 871 | /* | 947 | /* |
| 872 | * We don't have an immediate reader, but we'll read the stuff | 948 | * We don't have an immediate reader, but we'll read the stuff |
| 873 | * out of the pipe right after the move_to_pipe(). So set | 949 | * out of the pipe right after the splice_to_pipe(). So set |
| 874 | * PIPE_READERS appropriately. | 950 | * PIPE_READERS appropriately. |
| 875 | */ | 951 | */ |
| 876 | pipe->readers = 1; | 952 | pipe->readers = 1; |
| @@ -1010,6 +1086,174 @@ static long do_splice(struct file *in, loff_t __user *off_in, | |||
| 1010 | return -EINVAL; | 1086 | return -EINVAL; |
| 1011 | } | 1087 | } |
| 1012 | 1088 | ||
| 1089 | /* | ||
| 1090 | * Map an iov into an array of pages and offset/length tupples. With the | ||
| 1091 | * partial_page structure, we can map several non-contiguous ranges into | ||
| 1092 | * our ones pages[] map instead of splitting that operation into pieces. | ||
| 1093 | * Could easily be exported as a generic helper for other users, in which | ||
| 1094 | * case one would probably want to add a 'max_nr_pages' parameter as well. | ||
| 1095 | */ | ||
| 1096 | static int get_iovec_page_array(const struct iovec __user *iov, | ||
| 1097 | unsigned int nr_vecs, struct page **pages, | ||
| 1098 | struct partial_page *partial) | ||
| 1099 | { | ||
| 1100 | int buffers = 0, error = 0; | ||
| 1101 | |||
| 1102 | /* | ||
| 1103 | * It's ok to take the mmap_sem for reading, even | ||
| 1104 | * across a "get_user()". | ||
| 1105 | */ | ||
| 1106 | down_read(¤t->mm->mmap_sem); | ||
| 1107 | |||
| 1108 | while (nr_vecs) { | ||
| 1109 | unsigned long off, npages; | ||
| 1110 | void __user *base; | ||
| 1111 | size_t len; | ||
| 1112 | int i; | ||
| 1113 | |||
| 1114 | /* | ||
| 1115 | * Get user address base and length for this iovec. | ||
| 1116 | */ | ||
| 1117 | error = get_user(base, &iov->iov_base); | ||
| 1118 | if (unlikely(error)) | ||
| 1119 | break; | ||
| 1120 | error = get_user(len, &iov->iov_len); | ||
| 1121 | if (unlikely(error)) | ||
| 1122 | break; | ||
| 1123 | |||
| 1124 | /* | ||
| 1125 | * Sanity check this iovec. 0 read succeeds. | ||
| 1126 | */ | ||
| 1127 | if (unlikely(!len)) | ||
| 1128 | break; | ||
| 1129 | error = -EFAULT; | ||
| 1130 | if (unlikely(!base)) | ||
| 1131 | break; | ||
| 1132 | |||
| 1133 | /* | ||
| 1134 | * Get this base offset and number of pages, then map | ||
| 1135 | * in the user pages. | ||
| 1136 | */ | ||
| 1137 | off = (unsigned long) base & ~PAGE_MASK; | ||
| 1138 | npages = (off + len + PAGE_SIZE - 1) >> PAGE_SHIFT; | ||
| 1139 | if (npages > PIPE_BUFFERS - buffers) | ||
| 1140 | npages = PIPE_BUFFERS - buffers; | ||
| 1141 | |||
| 1142 | error = get_user_pages(current, current->mm, | ||
| 1143 | (unsigned long) base, npages, 0, 0, | ||
| 1144 | &pages[buffers], NULL); | ||
| 1145 | |||
| 1146 | if (unlikely(error <= 0)) | ||
| 1147 | break; | ||
| 1148 | |||
| 1149 | /* | ||
| 1150 | * Fill this contiguous range into the partial page map. | ||
| 1151 | */ | ||
| 1152 | for (i = 0; i < error; i++) { | ||
| 1153 | const int plen = min_t(size_t, len, PAGE_SIZE) - off; | ||
| 1154 | |||
| 1155 | partial[buffers].offset = off; | ||
| 1156 | partial[buffers].len = plen; | ||
| 1157 | |||
| 1158 | off = 0; | ||
| 1159 | len -= plen; | ||
| 1160 | buffers++; | ||
| 1161 | } | ||
| 1162 | |||
| 1163 | /* | ||
| 1164 | * We didn't complete this iov, stop here since it probably | ||
| 1165 | * means we have to move some of this into a pipe to | ||
| 1166 | * be able to continue. | ||
| 1167 | */ | ||
| 1168 | if (len) | ||
| 1169 | break; | ||
| 1170 | |||
| 1171 | /* | ||
| 1172 | * Don't continue if we mapped fewer pages than we asked for, | ||
| 1173 | * or if we mapped the max number of pages that we have | ||
| 1174 | * room for. | ||
| 1175 | */ | ||
| 1176 | if (error < npages || buffers == PIPE_BUFFERS) | ||
| 1177 | break; | ||
| 1178 | |||
| 1179 | nr_vecs--; | ||
| 1180 | iov++; | ||
| 1181 | } | ||
| 1182 | |||
| 1183 | up_read(¤t->mm->mmap_sem); | ||
| 1184 | |||
| 1185 | if (buffers) | ||
| 1186 | return buffers; | ||
| 1187 | |||
| 1188 | return error; | ||
| 1189 | } | ||
| 1190 | |||
| 1191 | /* | ||
| 1192 | * vmsplice splices a user address range into a pipe. It can be thought of | ||
| 1193 | * as splice-from-memory, where the regular splice is splice-from-file (or | ||
| 1194 | * to file). In both cases the output is a pipe, naturally. | ||
| 1195 | * | ||
| 1196 | * Note that vmsplice only supports splicing _from_ user memory to a pipe, | ||
| 1197 | * not the other way around. Splicing from user memory is a simple operation | ||
| 1198 | * that can be supported without any funky alignment restrictions or nasty | ||
| 1199 | * vm tricks. We simply map in the user memory and fill them into a pipe. | ||
| 1200 | * The reverse isn't quite as easy, though. There are two possible solutions | ||
| 1201 | * for that: | ||
| 1202 | * | ||
| 1203 | * - memcpy() the data internally, at which point we might as well just | ||
| 1204 | * do a regular read() on the buffer anyway. | ||
| 1205 | * - Lots of nasty vm tricks, that are neither fast nor flexible (it | ||
| 1206 | * has restriction limitations on both ends of the pipe). | ||
| 1207 | * | ||
| 1208 | * Alas, it isn't here. | ||
| 1209 | * | ||
| 1210 | */ | ||
| 1211 | static long do_vmsplice(struct file *file, const struct iovec __user *iov, | ||
| 1212 | unsigned long nr_segs, unsigned int flags) | ||
| 1213 | { | ||
| 1214 | struct pipe_inode_info *pipe = file->f_dentry->d_inode->i_pipe; | ||
| 1215 | struct page *pages[PIPE_BUFFERS]; | ||
| 1216 | struct partial_page partial[PIPE_BUFFERS]; | ||
| 1217 | struct splice_pipe_desc spd = { | ||
| 1218 | .pages = pages, | ||
| 1219 | .partial = partial, | ||
| 1220 | .flags = flags, | ||
| 1221 | .ops = &user_page_pipe_buf_ops, | ||
| 1222 | }; | ||
| 1223 | |||
| 1224 | if (unlikely(!pipe)) | ||
| 1225 | return -EBADF; | ||
| 1226 | if (unlikely(nr_segs > UIO_MAXIOV)) | ||
| 1227 | return -EINVAL; | ||
| 1228 | else if (unlikely(!nr_segs)) | ||
| 1229 | return 0; | ||
| 1230 | |||
| 1231 | spd.nr_pages = get_iovec_page_array(iov, nr_segs, pages, partial); | ||
| 1232 | if (spd.nr_pages <= 0) | ||
| 1233 | return spd.nr_pages; | ||
| 1234 | |||
| 1235 | return splice_to_pipe(pipe, &spd); | ||
| 1236 | } | ||
| 1237 | |||
| 1238 | asmlinkage long sys_vmsplice(int fd, const struct iovec __user *iov, | ||
| 1239 | unsigned long nr_segs, unsigned int flags) | ||
| 1240 | { | ||
| 1241 | struct file *file; | ||
| 1242 | long error; | ||
| 1243 | int fput; | ||
| 1244 | |||
| 1245 | error = -EBADF; | ||
| 1246 | file = fget_light(fd, &fput); | ||
| 1247 | if (file) { | ||
| 1248 | if (file->f_mode & FMODE_WRITE) | ||
| 1249 | error = do_vmsplice(file, iov, nr_segs, flags); | ||
| 1250 | |||
| 1251 | fput_light(file, fput); | ||
| 1252 | } | ||
| 1253 | |||
| 1254 | return error; | ||
| 1255 | } | ||
| 1256 | |||
| 1013 | asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, | 1257 | asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, |
| 1014 | int fd_out, loff_t __user *off_out, | 1258 | int fd_out, loff_t __user *off_out, |
| 1015 | size_t len, unsigned int flags) | 1259 | size_t len, unsigned int flags) |
| @@ -261,7 +261,7 @@ asmlinkage long sys_newlstat(char __user *filename, struct stat __user *statbuf) | |||
| 261 | return error; | 261 | return error; |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | #ifndef __ARCH_WANT_STAT64 | 264 | #if !defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_SYS_NEWFSTATAT) |
| 265 | asmlinkage long sys_newfstatat(int dfd, char __user *filename, | 265 | asmlinkage long sys_newfstatat(int dfd, char __user *filename, |
| 266 | struct stat __user *statbuf, int flag) | 266 | struct stat __user *statbuf, int flag) |
| 267 | { | 267 | { |
diff --git a/include/asm-i386/pgtable-2level.h b/include/asm-i386/pgtable-2level.h index 27bde973abc7..2756d4b04c27 100644 --- a/include/asm-i386/pgtable-2level.h +++ b/include/asm-i386/pgtable-2level.h | |||
| @@ -18,6 +18,9 @@ | |||
| 18 | #define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval) | 18 | #define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval) |
| 19 | #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval)) | 19 | #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval)) |
| 20 | 20 | ||
| 21 | #define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0) | ||
| 22 | #define pmd_clear(xp) do { set_pmd(xp, __pmd(0)); } while (0) | ||
| 23 | |||
| 21 | #define ptep_get_and_clear(mm,addr,xp) __pte(xchg(&(xp)->pte_low, 0)) | 24 | #define ptep_get_and_clear(mm,addr,xp) __pte(xchg(&(xp)->pte_low, 0)) |
| 22 | #define pte_same(a, b) ((a).pte_low == (b).pte_low) | 25 | #define pte_same(a, b) ((a).pte_low == (b).pte_low) |
| 23 | #define pte_page(x) pfn_to_page(pte_pfn(x)) | 26 | #define pte_page(x) pfn_to_page(pte_pfn(x)) |
diff --git a/include/asm-i386/pgtable-3level.h b/include/asm-i386/pgtable-3level.h index 36a5aa63cbbf..dccb1b3337ad 100644 --- a/include/asm-i386/pgtable-3level.h +++ b/include/asm-i386/pgtable-3level.h | |||
| @@ -85,6 +85,26 @@ static inline void pud_clear (pud_t * pud) { } | |||
| 85 | #define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \ | 85 | #define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \ |
| 86 | pmd_index(address)) | 86 | pmd_index(address)) |
| 87 | 87 | ||
| 88 | /* | ||
| 89 | * For PTEs and PDEs, we must clear the P-bit first when clearing a page table | ||
| 90 | * entry, so clear the bottom half first and enforce ordering with a compiler | ||
| 91 | * barrier. | ||
| 92 | */ | ||
| 93 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | ||
| 94 | { | ||
| 95 | ptep->pte_low = 0; | ||
| 96 | smp_wmb(); | ||
| 97 | ptep->pte_high = 0; | ||
| 98 | } | ||
| 99 | |||
| 100 | static inline void pmd_clear(pmd_t *pmd) | ||
| 101 | { | ||
| 102 | u32 *tmp = (u32 *)pmd; | ||
| 103 | *tmp = 0; | ||
| 104 | smp_wmb(); | ||
| 105 | *(tmp + 1) = 0; | ||
| 106 | } | ||
| 107 | |||
| 88 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | 108 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) |
| 89 | { | 109 | { |
| 90 | pte_t res; | 110 | pte_t res; |
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index ee056c41a9fb..672c3f76b9df 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h | |||
| @@ -204,12 +204,10 @@ extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC; | |||
| 204 | extern unsigned long pg0[]; | 204 | extern unsigned long pg0[]; |
| 205 | 205 | ||
| 206 | #define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE)) | 206 | #define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE)) |
| 207 | #define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0) | ||
| 208 | 207 | ||
| 209 | /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */ | 208 | /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */ |
| 210 | #define pmd_none(x) (!(unsigned long)pmd_val(x)) | 209 | #define pmd_none(x) (!(unsigned long)pmd_val(x)) |
| 211 | #define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT) | 210 | #define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT) |
| 212 | #define pmd_clear(xp) do { set_pmd(xp, __pmd(0)); } while (0) | ||
| 213 | #define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) | 211 | #define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) |
| 214 | 212 | ||
| 215 | 213 | ||
| @@ -268,7 +266,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long | |||
| 268 | pte_t pte; | 266 | pte_t pte; |
| 269 | if (full) { | 267 | if (full) { |
| 270 | pte = *ptep; | 268 | pte = *ptep; |
| 271 | *ptep = __pte(0); | 269 | pte_clear(mm, addr, ptep); |
| 272 | } else { | 270 | } else { |
| 273 | pte = ptep_get_and_clear(mm, addr, ptep); | 271 | pte = ptep_get_and_clear(mm, addr, ptep); |
| 274 | } | 272 | } |
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index d81d6cfc1bb4..eb4b152c82fc 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
| @@ -321,8 +321,9 @@ | |||
| 321 | #define __NR_splice 313 | 321 | #define __NR_splice 313 |
| 322 | #define __NR_sync_file_range 314 | 322 | #define __NR_sync_file_range 314 |
| 323 | #define __NR_tee 315 | 323 | #define __NR_tee 315 |
| 324 | #define __NR_vmsplice 316 | ||
| 324 | 325 | ||
| 325 | #define NR_syscalls 316 | 326 | #define NR_syscalls 317 |
| 326 | 327 | ||
| 327 | /* | 328 | /* |
| 328 | * user-visible error numbers are in the range -1 - -128: see | 329 | * user-visible error numbers are in the range -1 - -128: see |
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index d734585a23cf..09a5dd0e44a8 100644 --- a/include/asm-ia64/acpi.h +++ b/include/asm-ia64/acpi.h | |||
| @@ -110,9 +110,8 @@ extern void prefill_possible_map(void); | |||
| 110 | extern int additional_cpus; | 110 | extern int additional_cpus; |
| 111 | 111 | ||
| 112 | #ifdef CONFIG_ACPI_NUMA | 112 | #ifdef CONFIG_ACPI_NUMA |
| 113 | /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/ | 113 | #if MAX_NUMNODES > 256 |
| 114 | #ifdef CONFIG_IA64_NR_NODES | 114 | #define MAX_PXM_DOMAINS MAX_NUMNODES |
| 115 | #define MAX_PXM_DOMAINS CONFIG_IA64_NR_NODES | ||
| 116 | #else | 115 | #else |
| 117 | #define MAX_PXM_DOMAINS (256) | 116 | #define MAX_PXM_DOMAINS (256) |
| 118 | #endif | 117 | #endif |
diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h index c3e4ed8a3e17..a9c995a86c21 100644 --- a/include/asm-ia64/machvec.h +++ b/include/asm-ia64/machvec.h | |||
| @@ -347,9 +347,11 @@ extern ia64_mv_dma_supported swiotlb_dma_supported; | |||
| 347 | #endif | 347 | #endif |
| 348 | #ifndef platform_pci_legacy_read | 348 | #ifndef platform_pci_legacy_read |
| 349 | # define platform_pci_legacy_read ia64_pci_legacy_read | 349 | # define platform_pci_legacy_read ia64_pci_legacy_read |
| 350 | extern int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size); | ||
| 350 | #endif | 351 | #endif |
| 351 | #ifndef platform_pci_legacy_write | 352 | #ifndef platform_pci_legacy_write |
| 352 | # define platform_pci_legacy_write ia64_pci_legacy_write | 353 | # define platform_pci_legacy_write ia64_pci_legacy_write |
| 354 | extern int ia64_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size); | ||
| 353 | #endif | 355 | #endif |
| 354 | #ifndef platform_inb | 356 | #ifndef platform_inb |
| 355 | # define platform_inb __ia64_inb | 357 | # define platform_inb __ia64_inb |
diff --git a/include/asm-ia64/sn/sn2/sn_hwperf.h b/include/asm-ia64/sn/sn2/sn_hwperf.h index 291ef3d69da2..e61ebac38cdd 100644 --- a/include/asm-ia64/sn/sn2/sn_hwperf.h +++ b/include/asm-ia64/sn/sn2/sn_hwperf.h | |||
| @@ -45,8 +45,12 @@ struct sn_hwperf_object_info { | |||
| 45 | #define SN_HWPERF_IS_NODE(x) ((x) && strstr((x)->name, "SHub")) | 45 | #define SN_HWPERF_IS_NODE(x) ((x) && strstr((x)->name, "SHub")) |
| 46 | #define SN_HWPERF_IS_NODE_SHUB2(x) ((x) && strstr((x)->name, "SHub 2.")) | 46 | #define SN_HWPERF_IS_NODE_SHUB2(x) ((x) && strstr((x)->name, "SHub 2.")) |
| 47 | #define SN_HWPERF_IS_IONODE(x) ((x) && strstr((x)->name, "TIO")) | 47 | #define SN_HWPERF_IS_IONODE(x) ((x) && strstr((x)->name, "TIO")) |
| 48 | #define SN_HWPERF_IS_ROUTER(x) ((x) && strstr((x)->name, "Router")) | ||
| 49 | #define SN_HWPERF_IS_NL3ROUTER(x) ((x) && strstr((x)->name, "NL3Router")) | 48 | #define SN_HWPERF_IS_NL3ROUTER(x) ((x) && strstr((x)->name, "NL3Router")) |
| 49 | #define SN_HWPERF_IS_NL4ROUTER(x) ((x) && strstr((x)->name, "NL4Router")) | ||
| 50 | #define SN_HWPERF_IS_OLDROUTER(x) ((x) && strstr((x)->name, "Router")) | ||
| 51 | #define SN_HWPERF_IS_ROUTER(x) (SN_HWPERF_IS_NL3ROUTER(x) || \ | ||
| 52 | SN_HWPERF_IS_NL4ROUTER(x) || \ | ||
| 53 | SN_HWPERF_IS_OLDROUTER(x)) | ||
| 50 | #define SN_HWPERF_FOREIGN(x) ((x) && !(x)->sn_hwp_this_part && !(x)->sn_hwp_is_shared) | 54 | #define SN_HWPERF_FOREIGN(x) ((x) && !(x)->sn_hwp_this_part && !(x)->sn_hwp_is_shared) |
| 51 | #define SN_HWPERF_SAME_OBJTYPE(x,y) ((SN_HWPERF_IS_NODE(x) && SN_HWPERF_IS_NODE(y)) ||\ | 55 | #define SN_HWPERF_SAME_OBJTYPE(x,y) ((SN_HWPERF_IS_NODE(x) && SN_HWPERF_IS_NODE(y)) ||\ |
| 52 | (SN_HWPERF_IS_IONODE(x) && SN_HWPERF_IS_IONODE(y)) ||\ | 56 | (SN_HWPERF_IS_IONODE(x) && SN_HWPERF_IS_IONODE(y)) ||\ |
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h index bf4cc867a698..51aca022cf39 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * License. See the file "COPYING" in the main directory of this archive | 8 | * License. See the file "COPYING" in the main directory of this archive |
| 9 | * for more details. | 9 | * for more details. |
| 10 | * | 10 | * |
| 11 | * Copyright (c) 2000-2005 Silicon Graphics, Inc. All rights reserved. | 11 | * Copyright (c) 2000-2006 Silicon Graphics, Inc. All rights reserved. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | 14 | ||
| @@ -85,6 +85,7 @@ | |||
| 85 | 85 | ||
| 86 | #define SN_SAL_GET_PROM_FEATURE_SET 0x02000065 | 86 | #define SN_SAL_GET_PROM_FEATURE_SET 0x02000065 |
| 87 | #define SN_SAL_SET_OS_FEATURE_SET 0x02000066 | 87 | #define SN_SAL_SET_OS_FEATURE_SET 0x02000066 |
| 88 | #define SN_SAL_INJECT_ERROR 0x02000067 | ||
| 88 | 89 | ||
| 89 | /* | 90 | /* |
| 90 | * Service-specific constants | 91 | * Service-specific constants |
| @@ -705,10 +706,8 @@ static inline int | |||
| 705 | sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array) | 706 | sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array) |
| 706 | { | 707 | { |
| 707 | struct ia64_sal_retval ret_stuff; | 708 | struct ia64_sal_retval ret_stuff; |
| 708 | int cnodeid; | ||
| 709 | unsigned long irq_flags; | 709 | unsigned long irq_flags; |
| 710 | 710 | ||
| 711 | cnodeid = nasid_to_cnodeid(get_node_number(paddr)); | ||
| 712 | local_irq_save(irq_flags); | 711 | local_irq_save(irq_flags); |
| 713 | ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len, | 712 | ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len, |
| 714 | (u64)nasid_array, perms, 0, 0, 0); | 713 | (u64)nasid_array, perms, 0, 0, 0); |
| @@ -1140,4 +1139,16 @@ ia64_sn_set_os_feature(int feature) | |||
| 1140 | return rv.status; | 1139 | return rv.status; |
| 1141 | } | 1140 | } |
| 1142 | 1141 | ||
| 1142 | static inline int | ||
| 1143 | sn_inject_error(u64 paddr, u64 *data, u64 *ecc) | ||
| 1144 | { | ||
| 1145 | struct ia64_sal_retval ret_stuff; | ||
| 1146 | unsigned long irq_flags; | ||
| 1147 | |||
| 1148 | local_irq_save(irq_flags); | ||
| 1149 | ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_INJECT_ERROR, paddr, (u64)data, | ||
| 1150 | (u64)ecc, 0, 0, 0, 0); | ||
| 1151 | local_irq_restore(irq_flags); | ||
| 1152 | return ret_stuff.status; | ||
| 1153 | } | ||
| 1143 | #endif /* _ASM_IA64_SN_SN_SAL_H */ | 1154 | #endif /* _ASM_IA64_SN_SN_SAL_H */ |
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h index 56394a2c7055..e5392c4d30c6 100644 --- a/include/asm-ia64/thread_info.h +++ b/include/asm-ia64/thread_info.h | |||
| @@ -67,7 +67,7 @@ struct thread_info { | |||
| 67 | #define end_of_stack(p) (unsigned long *)((void *)(p) + IA64_RBS_OFFSET) | 67 | #define end_of_stack(p) (unsigned long *)((void *)(p) + IA64_RBS_OFFSET) |
| 68 | 68 | ||
| 69 | #define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR | 69 | #define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR |
| 70 | #define alloc_task_struct() ((task_t *)__get_free_pages(GFP_KERNEL, KERNEL_STACK_SIZE_ORDER)) | 70 | #define alloc_task_struct() ((task_t *)__get_free_pages(GFP_KERNEL | __GFP_COMP, KERNEL_STACK_SIZE_ORDER)) |
| 71 | #define free_task_struct(tsk) free_pages((unsigned long) (tsk), KERNEL_STACK_SIZE_ORDER) | 71 | #define free_task_struct(tsk) free_pages((unsigned long) (tsk), KERNEL_STACK_SIZE_ORDER) |
| 72 | 72 | ||
| 73 | #endif /* !__ASSEMBLY */ | 73 | #endif /* !__ASSEMBLY */ |
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h index 3ee19dfa46df..616b5ed2aa72 100644 --- a/include/asm-ia64/topology.h +++ b/include/asm-ia64/topology.h | |||
| @@ -23,6 +23,11 @@ | |||
| 23 | #define PENALTY_FOR_NODE_WITH_CPUS 255 | 23 | #define PENALTY_FOR_NODE_WITH_CPUS 255 |
| 24 | 24 | ||
| 25 | /* | 25 | /* |
| 26 | * Distance above which we begin to use zone reclaim | ||
| 27 | */ | ||
| 28 | #define RECLAIM_DISTANCE 15 | ||
| 29 | |||
| 30 | /* | ||
| 26 | * Returns the number of the node containing CPU 'cpu' | 31 | * Returns the number of the node containing CPU 'cpu' |
| 27 | */ | 32 | */ |
| 28 | #define cpu_to_node(cpu) (int)(cpu_to_node_map[cpu]) | 33 | #define cpu_to_node(cpu) (int)(cpu_to_node_map[cpu]) |
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index a40ebec6aeeb..7107763168bf 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -290,12 +290,13 @@ | |||
| 290 | #define __NR_get_robust_list 1299 | 290 | #define __NR_get_robust_list 1299 |
| 291 | #define __NR_sync_file_range 1300 | 291 | #define __NR_sync_file_range 1300 |
| 292 | #define __NR_tee 1301 | 292 | #define __NR_tee 1301 |
| 293 | #define __NR_vmsplice 1302 | ||
| 293 | 294 | ||
| 294 | #ifdef __KERNEL__ | 295 | #ifdef __KERNEL__ |
| 295 | 296 | ||
| 296 | #include <linux/config.h> | 297 | #include <linux/config.h> |
| 297 | 298 | ||
| 298 | #define NR_syscalls 278 /* length of syscall table */ | 299 | #define NR_syscalls 279 /* length of syscall table */ |
| 299 | 300 | ||
| 300 | #define __ARCH_WANT_SYS_RT_SIGACTION | 301 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 301 | 302 | ||
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index a1728f8c0705..d2f444537e4b 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
| @@ -467,64 +467,56 @@ static inline unsigned long __ffs(unsigned long word) | |||
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | /* | 469 | /* |
| 470 | * ffs - find first bit set. | 470 | * fls - find last bit set. |
| 471 | * @word: The word to search | 471 | * @word: The word to search |
| 472 | * | 472 | * |
| 473 | * Returns 1..SZLONG | 473 | * This is defined the same way as ffs. |
| 474 | * Returns 0 if no bit exists | 474 | * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. |
| 475 | */ | 475 | */ |
| 476 | 476 | static inline int fls(int word) | |
| 477 | static inline unsigned long ffs(unsigned long word) | ||
| 478 | { | 477 | { |
| 479 | if (!word) | 478 | __asm__ ("clz %0, %1" : "=r" (word) : "r" (word)); |
| 480 | return 0; | ||
| 481 | 479 | ||
| 482 | return __ffs(word) + 1; | 480 | return 32 - word; |
| 483 | } | 481 | } |
| 484 | 482 | ||
| 485 | /* | 483 | #if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64) |
| 486 | * ffz - find first zero in word. | 484 | static inline int fls64(__u64 word) |
| 487 | * @word: The word to search | ||
| 488 | * | ||
| 489 | * Undefined if no zero exists, so code should check against ~0UL first. | ||
| 490 | */ | ||
| 491 | static inline unsigned long ffz(unsigned long word) | ||
| 492 | { | 485 | { |
| 493 | return __ffs (~word); | 486 | __asm__ ("dclz %0, %1" : "=r" (word) : "r" (word)); |
| 487 | |||
| 488 | return 64 - word; | ||
| 494 | } | 489 | } |
| 490 | #else | ||
| 491 | #include <asm-generic/bitops/fls64.h> | ||
| 492 | #endif | ||
| 495 | 493 | ||
| 496 | /* | 494 | /* |
| 497 | * fls - find last bit set. | 495 | * ffs - find first bit set. |
| 498 | * @word: The word to search | 496 | * @word: The word to search |
| 499 | * | 497 | * |
| 500 | * Returns 1..SZLONG | 498 | * This is defined the same way as |
| 501 | * Returns 0 if no bit exists | 499 | * the libc and compiler builtin ffs routines, therefore |
| 500 | * differs in spirit from the above ffz (man ffs). | ||
| 502 | */ | 501 | */ |
| 503 | static inline unsigned long fls(unsigned long word) | 502 | static inline int ffs(int word) |
| 504 | { | 503 | { |
| 505 | #ifdef CONFIG_CPU_MIPS32 | 504 | if (!word) |
| 506 | __asm__ ("clz %0, %1" : "=r" (word) : "r" (word)); | 505 | return 0; |
| 507 | |||
| 508 | return 32 - word; | ||
| 509 | #endif | ||
| 510 | |||
| 511 | #ifdef CONFIG_CPU_MIPS64 | ||
| 512 | __asm__ ("dclz %0, %1" : "=r" (word) : "r" (word)); | ||
| 513 | 506 | ||
| 514 | return 64 - word; | 507 | return fls(word & -word); |
| 515 | #endif | ||
| 516 | } | 508 | } |
| 517 | 509 | ||
| 518 | #else | 510 | #else |
| 519 | 511 | ||
| 520 | #include <asm-generic/bitops/__ffs.h> | 512 | #include <asm-generic/bitops/__ffs.h> |
| 521 | #include <asm-generic/bitops/ffs.h> | 513 | #include <asm-generic/bitops/ffs.h> |
| 522 | #include <asm-generic/bitops/ffz.h> | ||
| 523 | #include <asm-generic/bitops/fls.h> | 514 | #include <asm-generic/bitops/fls.h> |
| 515 | #include <asm-generic/bitops/fls64.h> | ||
| 524 | 516 | ||
| 525 | #endif /*defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) */ | 517 | #endif /*defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) */ |
| 526 | 518 | ||
| 527 | #include <asm-generic/bitops/fls64.h> | 519 | #include <asm-generic/bitops/ffz.h> |
| 528 | #include <asm-generic/bitops/find.h> | 520 | #include <asm-generic/bitops/find.h> |
| 529 | 521 | ||
| 530 | #ifdef __KERNEL__ | 522 | #ifdef __KERNEL__ |
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h index 25b6ffc26623..fa8b913cc3e0 100644 --- a/include/asm-mips/mips-boards/generic.h +++ b/include/asm-mips/mips-boards/generic.h | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | #define MIPS_REVISION_CORID_CORE_FPGA2 7 | 67 | #define MIPS_REVISION_CORID_CORE_FPGA2 7 |
| 68 | #define MIPS_REVISION_CORID_CORE_FPGAR2 8 | 68 | #define MIPS_REVISION_CORID_CORE_FPGAR2 8 |
| 69 | #define MIPS_REVISION_CORID_CORE_FPGA3 9 | 69 | #define MIPS_REVISION_CORID_CORE_FPGA3 9 |
| 70 | #define MIPS_REVISION_CORID_CORE_24K 10 | ||
| 70 | 71 | ||
| 71 | /**** Artificial corid defines ****/ | 72 | /**** Artificial corid defines ****/ |
| 72 | /* | 73 | /* |
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h index 29da31194b91..244f6b8883f4 100644 --- a/include/asm-parisc/io.h +++ b/include/asm-parisc/io.h | |||
| @@ -126,24 +126,17 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr) | |||
| 126 | 126 | ||
| 127 | extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); | 127 | extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); |
| 128 | 128 | ||
| 129 | extern inline void __iomem * ioremap(unsigned long offset, unsigned long size) | 129 | /* Most machines react poorly to I/O-space being cacheable... Instead let's |
| 130 | { | 130 | * define ioremap() in terms of ioremap_nocache(). |
| 131 | return __ioremap(offset, size, 0); | ||
| 132 | } | ||
| 133 | |||
| 134 | /* | ||
| 135 | * This one maps high address device memory and turns off caching for that area. | ||
| 136 | * it's useful if some control registers are in such an area and write combining | ||
| 137 | * or read caching is not desirable: | ||
| 138 | */ | 131 | */ |
| 139 | extern inline void * ioremap_nocache(unsigned long offset, unsigned long size) | 132 | extern inline void __iomem * ioremap(unsigned long offset, unsigned long size) |
| 140 | { | 133 | { |
| 141 | return __ioremap(offset, size, _PAGE_NO_CACHE /* _PAGE_PCD */); | 134 | return __ioremap(offset, size, _PAGE_NO_CACHE); |
| 142 | } | 135 | } |
| 136 | #define ioremap_nocache(off, sz) ioremap((off), (sz)) | ||
| 143 | 137 | ||
| 144 | extern void iounmap(void __iomem *addr); | 138 | extern void iounmap(void __iomem *addr); |
| 145 | 139 | ||
| 146 | |||
| 147 | static inline unsigned char __raw_readb(const volatile void __iomem *addr) | 140 | static inline unsigned char __raw_readb(const volatile void __iomem *addr) |
| 148 | { | 141 | { |
| 149 | return (*(volatile unsigned char __force *) (addr)); | 142 | return (*(volatile unsigned char __force *) (addr)); |
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index 45e02aa5bf4b..c0dd461fb8f1 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h | |||
| @@ -1,13 +1,30 @@ | |||
| 1 | #ifndef _PARISC_PAGE_H | 1 | #ifndef _PARISC_PAGE_H |
| 2 | #define _PARISC_PAGE_H | 2 | #define _PARISC_PAGE_H |
| 3 | 3 | ||
| 4 | /* PAGE_SHIFT determines the page size */ | 4 | #if !defined(__KERNEL__) |
| 5 | #define PAGE_SHIFT 12 | 5 | /* this is for userspace applications (4k page size) */ |
| 6 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 6 | # define PAGE_SHIFT 12 /* 4k */ |
| 7 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 7 | # define PAGE_SIZE (1UL << PAGE_SHIFT) |
| 8 | # define PAGE_MASK (~(PAGE_SIZE-1)) | ||
| 9 | #endif | ||
| 10 | |||
| 8 | 11 | ||
| 9 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 10 | #include <linux/config.h> | 13 | #include <linux/config.h> |
| 14 | |||
| 15 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) | ||
| 16 | # define PAGE_SHIFT 12 /* 4k */ | ||
| 17 | #elif defined(CONFIG_PARISC_PAGE_SIZE_16KB) | ||
| 18 | # define PAGE_SHIFT 14 /* 16k */ | ||
| 19 | #elif defined(CONFIG_PARISC_PAGE_SIZE_64KB) | ||
| 20 | # define PAGE_SHIFT 16 /* 64k */ | ||
| 21 | #else | ||
| 22 | # error "unknown default kernel page size" | ||
| 23 | #endif | ||
| 24 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | ||
| 25 | #define PAGE_MASK (~(PAGE_SIZE-1)) | ||
| 26 | |||
| 27 | |||
| 11 | #ifndef __ASSEMBLY__ | 28 | #ifndef __ASSEMBLY__ |
| 12 | 29 | ||
| 13 | #include <asm/types.h> | 30 | #include <asm/types.h> |
diff --git a/include/asm-parisc/pgtable.h b/include/asm-parisc/pgtable.h index 4e34c6b44059..aec089eb8b85 100644 --- a/include/asm-parisc/pgtable.h +++ b/include/asm-parisc/pgtable.h | |||
| @@ -59,16 +59,15 @@ | |||
| 59 | #define ISTACK_SIZE 32768 /* Interrupt Stack Size */ | 59 | #define ISTACK_SIZE 32768 /* Interrupt Stack Size */ |
| 60 | #define ISTACK_ORDER 3 | 60 | #define ISTACK_ORDER 3 |
| 61 | 61 | ||
| 62 | /* This is the size of the initially mapped kernel memory (i.e. currently | 62 | /* This is the size of the initially mapped kernel memory */ |
| 63 | * 0 to 1<<23 == 8MB */ | ||
| 64 | #ifdef CONFIG_64BIT | 63 | #ifdef CONFIG_64BIT |
| 65 | #define KERNEL_INITIAL_ORDER 24 | 64 | #define KERNEL_INITIAL_ORDER 24 /* 0 to 1<<24 = 16MB */ |
| 66 | #else | 65 | #else |
| 67 | #define KERNEL_INITIAL_ORDER 23 | 66 | #define KERNEL_INITIAL_ORDER 23 /* 0 to 1<<23 = 8MB */ |
| 68 | #endif | 67 | #endif |
| 69 | #define KERNEL_INITIAL_SIZE (1 << KERNEL_INITIAL_ORDER) | 68 | #define KERNEL_INITIAL_SIZE (1 << KERNEL_INITIAL_ORDER) |
| 70 | 69 | ||
| 71 | #ifdef CONFIG_64BIT | 70 | #if defined(CONFIG_64BIT) && defined(CONFIG_PARISC_PAGE_SIZE_4KB) |
| 72 | #define PT_NLEVELS 3 | 71 | #define PT_NLEVELS 3 |
| 73 | #define PGD_ORDER 1 /* Number of pages per pgd */ | 72 | #define PGD_ORDER 1 /* Number of pages per pgd */ |
| 74 | #define PMD_ORDER 1 /* Number of pages per pmd */ | 73 | #define PMD_ORDER 1 /* Number of pages per pmd */ |
| @@ -111,11 +110,15 @@ | |||
| 111 | #define MAX_ADDRBITS (PGDIR_SHIFT + BITS_PER_PGD) | 110 | #define MAX_ADDRBITS (PGDIR_SHIFT + BITS_PER_PGD) |
| 112 | #define MAX_ADDRESS (1UL << MAX_ADDRBITS) | 111 | #define MAX_ADDRESS (1UL << MAX_ADDRBITS) |
| 113 | 112 | ||
| 114 | #define SPACEID_SHIFT (MAX_ADDRBITS - 32) | 113 | #define SPACEID_SHIFT (MAX_ADDRBITS - 32) |
| 115 | 114 | ||
| 116 | /* This calculates the number of initial pages we need for the initial | 115 | /* This calculates the number of initial pages we need for the initial |
| 117 | * page tables */ | 116 | * page tables */ |
| 118 | #define PT_INITIAL (1 << (KERNEL_INITIAL_ORDER - PMD_SHIFT)) | 117 | #if (KERNEL_INITIAL_ORDER) >= (PMD_SHIFT) |
| 118 | # define PT_INITIAL (1 << (KERNEL_INITIAL_ORDER - PMD_SHIFT)) | ||
| 119 | #else | ||
| 120 | # define PT_INITIAL (1) /* all initial PTEs fit into one page */ | ||
| 121 | #endif | ||
| 119 | 122 | ||
| 120 | /* | 123 | /* |
| 121 | * pgd entries used up by user/kernel: | 124 | * pgd entries used up by user/kernel: |
| @@ -160,6 +163,10 @@ extern void *vmalloc_start; | |||
| 160 | * to zero */ | 163 | * to zero */ |
| 161 | #define PTE_SHIFT xlate_pabit(_PAGE_USER_BIT) | 164 | #define PTE_SHIFT xlate_pabit(_PAGE_USER_BIT) |
| 162 | 165 | ||
| 166 | /* PFN_PTE_SHIFT defines the shift of a PTE value to access the PFN field */ | ||
| 167 | #define PFN_PTE_SHIFT 12 | ||
| 168 | |||
| 169 | |||
| 163 | /* this is how many bits may be used by the file functions */ | 170 | /* this is how many bits may be used by the file functions */ |
| 164 | #define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_SHIFT) | 171 | #define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_SHIFT) |
| 165 | 172 | ||
| @@ -188,7 +195,8 @@ extern void *vmalloc_start; | |||
| 188 | /* The pgd/pmd contains a ptr (in phys addr space); since all pgds/pmds | 195 | /* The pgd/pmd contains a ptr (in phys addr space); since all pgds/pmds |
| 189 | * are page-aligned, we don't care about the PAGE_OFFSET bits, except | 196 | * are page-aligned, we don't care about the PAGE_OFFSET bits, except |
| 190 | * for a few meta-information bits, so we shift the address to be | 197 | * for a few meta-information bits, so we shift the address to be |
| 191 | * able to effectively address 40-bits of physical address space. */ | 198 | * able to effectively address 40/42/44-bits of physical address space |
| 199 | * depending on 4k/16k/64k PAGE_SIZE */ | ||
| 192 | #define _PxD_PRESENT_BIT 31 | 200 | #define _PxD_PRESENT_BIT 31 |
| 193 | #define _PxD_ATTACHED_BIT 30 | 201 | #define _PxD_ATTACHED_BIT 30 |
| 194 | #define _PxD_VALID_BIT 29 | 202 | #define _PxD_VALID_BIT 29 |
| @@ -198,7 +206,7 @@ extern void *vmalloc_start; | |||
| 198 | #define PxD_FLAG_VALID (1 << xlate_pabit(_PxD_VALID_BIT)) | 206 | #define PxD_FLAG_VALID (1 << xlate_pabit(_PxD_VALID_BIT)) |
| 199 | #define PxD_FLAG_MASK (0xf) | 207 | #define PxD_FLAG_MASK (0xf) |
| 200 | #define PxD_FLAG_SHIFT (4) | 208 | #define PxD_FLAG_SHIFT (4) |
| 201 | #define PxD_VALUE_SHIFT (8) | 209 | #define PxD_VALUE_SHIFT (8) /* (PAGE_SHIFT-PxD_FLAG_SHIFT) */ |
| 202 | 210 | ||
| 203 | #ifndef __ASSEMBLY__ | 211 | #ifndef __ASSEMBLY__ |
| 204 | 212 | ||
| @@ -246,6 +254,7 @@ extern void *vmalloc_start; | |||
| 246 | #define __S110 PAGE_RWX | 254 | #define __S110 PAGE_RWX |
| 247 | #define __S111 PAGE_RWX | 255 | #define __S111 PAGE_RWX |
| 248 | 256 | ||
| 257 | |||
| 249 | extern pgd_t swapper_pg_dir[]; /* declared in init_task.c */ | 258 | extern pgd_t swapper_pg_dir[]; /* declared in init_task.c */ |
| 250 | 259 | ||
| 251 | /* initial page tables for 0-8MB for kernel */ | 260 | /* initial page tables for 0-8MB for kernel */ |
| @@ -272,7 +281,7 @@ extern unsigned long *empty_zero_page; | |||
| 272 | #define pgd_flag(x) (pgd_val(x) & PxD_FLAG_MASK) | 281 | #define pgd_flag(x) (pgd_val(x) & PxD_FLAG_MASK) |
| 273 | #define pgd_address(x) ((unsigned long)(pgd_val(x) &~ PxD_FLAG_MASK) << PxD_VALUE_SHIFT) | 282 | #define pgd_address(x) ((unsigned long)(pgd_val(x) &~ PxD_FLAG_MASK) << PxD_VALUE_SHIFT) |
| 274 | 283 | ||
| 275 | #ifdef CONFIG_64BIT | 284 | #if PT_NLEVELS == 3 |
| 276 | /* The first entry of the permanent pmd is not there if it contains | 285 | /* The first entry of the permanent pmd is not there if it contains |
| 277 | * the gateway marker */ | 286 | * the gateway marker */ |
| 278 | #define pmd_none(x) (!pmd_val(x) || pmd_flag(x) == PxD_FLAG_ATTACHED) | 287 | #define pmd_none(x) (!pmd_val(x) || pmd_flag(x) == PxD_FLAG_ATTACHED) |
| @@ -282,7 +291,7 @@ extern unsigned long *empty_zero_page; | |||
| 282 | #define pmd_bad(x) (!(pmd_flag(x) & PxD_FLAG_VALID)) | 291 | #define pmd_bad(x) (!(pmd_flag(x) & PxD_FLAG_VALID)) |
| 283 | #define pmd_present(x) (pmd_flag(x) & PxD_FLAG_PRESENT) | 292 | #define pmd_present(x) (pmd_flag(x) & PxD_FLAG_PRESENT) |
| 284 | static inline void pmd_clear(pmd_t *pmd) { | 293 | static inline void pmd_clear(pmd_t *pmd) { |
| 285 | #ifdef CONFIG_64BIT | 294 | #if PT_NLEVELS == 3 |
| 286 | if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) | 295 | if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) |
| 287 | /* This is the entry pointing to the permanent pmd | 296 | /* This is the entry pointing to the permanent pmd |
| 288 | * attached to the pgd; cannot clear it */ | 297 | * attached to the pgd; cannot clear it */ |
| @@ -303,7 +312,7 @@ static inline void pmd_clear(pmd_t *pmd) { | |||
| 303 | #define pgd_bad(x) (!(pgd_flag(x) & PxD_FLAG_VALID)) | 312 | #define pgd_bad(x) (!(pgd_flag(x) & PxD_FLAG_VALID)) |
| 304 | #define pgd_present(x) (pgd_flag(x) & PxD_FLAG_PRESENT) | 313 | #define pgd_present(x) (pgd_flag(x) & PxD_FLAG_PRESENT) |
| 305 | static inline void pgd_clear(pgd_t *pgd) { | 314 | static inline void pgd_clear(pgd_t *pgd) { |
| 306 | #ifdef CONFIG_64BIT | 315 | #if PT_NLEVELS == 3 |
| 307 | if(pgd_flag(*pgd) & PxD_FLAG_ATTACHED) | 316 | if(pgd_flag(*pgd) & PxD_FLAG_ATTACHED) |
| 308 | /* This is the permanent pmd attached to the pgd; cannot | 317 | /* This is the permanent pmd attached to the pgd; cannot |
| 309 | * free it */ | 318 | * free it */ |
| @@ -351,7 +360,7 @@ extern inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= _PAGE_WRITE; return | |||
| 351 | ({ \ | 360 | ({ \ |
| 352 | pte_t __pte; \ | 361 | pte_t __pte; \ |
| 353 | \ | 362 | \ |
| 354 | pte_val(__pte) = ((addr)+pgprot_val(pgprot)); \ | 363 | pte_val(__pte) = ((((addr)>>PAGE_SHIFT)<<PFN_PTE_SHIFT) + pgprot_val(pgprot)); \ |
| 355 | \ | 364 | \ |
| 356 | __pte; \ | 365 | __pte; \ |
| 357 | }) | 366 | }) |
| @@ -361,20 +370,16 @@ extern inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= _PAGE_WRITE; return | |||
| 361 | static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) | 370 | static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) |
| 362 | { | 371 | { |
| 363 | pte_t pte; | 372 | pte_t pte; |
| 364 | pte_val(pte) = (pfn << PAGE_SHIFT) | pgprot_val(pgprot); | 373 | pte_val(pte) = (pfn << PFN_PTE_SHIFT) | pgprot_val(pgprot); |
| 365 | return pte; | 374 | return pte; |
| 366 | } | 375 | } |
| 367 | 376 | ||
| 368 | /* This takes a physical page address that is used by the remapping functions */ | ||
| 369 | #define mk_pte_phys(physpage, pgprot) \ | ||
| 370 | ({ pte_t __pte; pte_val(__pte) = physpage + pgprot_val(pgprot); __pte; }) | ||
| 371 | |||
| 372 | extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | 377 | extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot) |
| 373 | { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } | 378 | { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } |
| 374 | 379 | ||
| 375 | /* Permanent address of a page. On parisc we don't have highmem. */ | 380 | /* Permanent address of a page. On parisc we don't have highmem. */ |
| 376 | 381 | ||
| 377 | #define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT) | 382 | #define pte_pfn(x) (pte_val(x) >> PFN_PTE_SHIFT) |
| 378 | 383 | ||
| 379 | #define pte_page(pte) (pfn_to_page(pte_pfn(pte))) | 384 | #define pte_page(pte) (pfn_to_page(pte_pfn(pte))) |
| 380 | 385 | ||
| @@ -499,6 +504,26 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, | |||
| 499 | 504 | ||
| 500 | #endif /* !__ASSEMBLY__ */ | 505 | #endif /* !__ASSEMBLY__ */ |
| 501 | 506 | ||
| 507 | |||
| 508 | /* TLB page size encoding - see table 3-1 in parisc20.pdf */ | ||
| 509 | #define _PAGE_SIZE_ENCODING_4K 0 | ||
| 510 | #define _PAGE_SIZE_ENCODING_16K 1 | ||
| 511 | #define _PAGE_SIZE_ENCODING_64K 2 | ||
| 512 | #define _PAGE_SIZE_ENCODING_256K 3 | ||
| 513 | #define _PAGE_SIZE_ENCODING_1M 4 | ||
| 514 | #define _PAGE_SIZE_ENCODING_4M 5 | ||
| 515 | #define _PAGE_SIZE_ENCODING_16M 6 | ||
| 516 | #define _PAGE_SIZE_ENCODING_64M 7 | ||
| 517 | |||
| 518 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) | ||
| 519 | # define _PAGE_SIZE_ENCODING_DEFAULT _PAGE_SIZE_ENCODING_4K | ||
| 520 | #elif defined(CONFIG_PARISC_PAGE_SIZE_16KB) | ||
| 521 | # define _PAGE_SIZE_ENCODING_DEFAULT _PAGE_SIZE_ENCODING_16K | ||
| 522 | #elif defined(CONFIG_PARISC_PAGE_SIZE_64KB) | ||
| 523 | # define _PAGE_SIZE_ENCODING_DEFAULT _PAGE_SIZE_ENCODING_64K | ||
| 524 | #endif | ||
| 525 | |||
| 526 | |||
| 502 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 527 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
| 503 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 528 | remap_pfn_range(vma, vaddr, pfn, size, prot) |
| 504 | 529 | ||
diff --git a/include/asm-parisc/unistd.h b/include/asm-parisc/unistd.h index c56fccbf34ad..0e1a30be2e30 100644 --- a/include/asm-parisc/unistd.h +++ b/include/asm-parisc/unistd.h | |||
| @@ -780,8 +780,14 @@ | |||
| 780 | #define __NR_readlinkat (__NR_Linux + 285) | 780 | #define __NR_readlinkat (__NR_Linux + 285) |
| 781 | #define __NR_fchmodat (__NR_Linux + 286) | 781 | #define __NR_fchmodat (__NR_Linux + 286) |
| 782 | #define __NR_faccessat (__NR_Linux + 287) | 782 | #define __NR_faccessat (__NR_Linux + 287) |
| 783 | #define __NR_unshare (__NR_Linux + 288) | ||
| 784 | #define __NR_set_robust_list (__NR_Linux + 289) | ||
| 785 | #define __NR_get_robust_list (__NR_Linux + 290) | ||
| 786 | #define __NR_splice (__NR_Linux + 291) | ||
| 787 | #define __NR_sync_file_range (__NR_Linux + 292) | ||
| 788 | #define __NR_tee (__NR_Linux + 293) | ||
| 783 | 789 | ||
| 784 | #define __NR_Linux_syscalls 288 | 790 | #define __NR_Linux_syscalls 294 |
| 785 | 791 | ||
| 786 | #define HPUX_GATEWAY_ADDR 0xC0000004 | 792 | #define HPUX_GATEWAY_ADDR 0xC0000004 |
| 787 | #define LINUX_GATEWAY_ADDR 0x100 | 793 | #define LINUX_GATEWAY_ADDR 0x100 |
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 4321483cce51..9fcf0162d859 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define PPC_FEATURE_BOOKE 0x00008000 | 22 | #define PPC_FEATURE_BOOKE 0x00008000 |
| 23 | #define PPC_FEATURE_SMT 0x00004000 | 23 | #define PPC_FEATURE_SMT 0x00004000 |
| 24 | #define PPC_FEATURE_ICACHE_SNOOP 0x00002000 | 24 | #define PPC_FEATURE_ICACHE_SNOOP 0x00002000 |
| 25 | #define PPC_FEATURE_ARCH_2_05 0x00001000 | ||
| 25 | 26 | ||
| 26 | #ifdef __KERNEL__ | 27 | #ifdef __KERNEL__ |
| 27 | #ifndef __ASSEMBLY__ | 28 | #ifndef __ASSEMBLY__ |
| @@ -320,6 +321,11 @@ extern void do_cpu_ftr_fixups(unsigned long offset); | |||
| 320 | CPU_FTR_MMCRA | CPU_FTR_SMT | \ | 321 | CPU_FTR_MMCRA | CPU_FTR_SMT | \ |
| 321 | CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \ | 322 | CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \ |
| 322 | CPU_FTR_MMCRA_SIHV | CPU_FTR_PURR) | 323 | CPU_FTR_MMCRA_SIHV | CPU_FTR_PURR) |
| 324 | #define CPU_FTRS_POWER6 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | ||
| 325 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \ | ||
| 326 | CPU_FTR_MMCRA | CPU_FTR_SMT | \ | ||
| 327 | CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \ | ||
| 328 | CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE) | ||
| 323 | #define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ | 329 | #define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ |
| 324 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \ | 330 | CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \ |
| 325 | CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ | 331 | CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ |
| @@ -331,8 +337,8 @@ extern void do_cpu_ftr_fixups(unsigned long offset); | |||
| 331 | #ifdef __powerpc64__ | 337 | #ifdef __powerpc64__ |
| 332 | #define CPU_FTRS_POSSIBLE \ | 338 | #define CPU_FTRS_POSSIBLE \ |
| 333 | (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 | \ | 339 | (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 | \ |
| 334 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL | \ | 340 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 | \ |
| 335 | CPU_FTR_CI_LARGE_PAGE) | 341 | CPU_FTRS_CELL | CPU_FTR_CI_LARGE_PAGE) |
| 336 | #else | 342 | #else |
| 337 | enum { | 343 | enum { |
| 338 | CPU_FTRS_POSSIBLE = | 344 | CPU_FTRS_POSSIBLE = |
| @@ -376,8 +382,8 @@ enum { | |||
| 376 | #ifdef __powerpc64__ | 382 | #ifdef __powerpc64__ |
| 377 | #define CPU_FTRS_ALWAYS \ | 383 | #define CPU_FTRS_ALWAYS \ |
| 378 | (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 & \ | 384 | (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 & \ |
| 379 | CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_CELL & \ | 385 | CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_POWER6 & \ |
| 380 | CPU_FTRS_POSSIBLE) | 386 | CPU_FTRS_CELL & CPU_FTRS_POSSIBLE) |
| 381 | #else | 387 | #else |
| 382 | enum { | 388 | enum { |
| 383 | CPU_FTRS_ALWAYS = | 389 | CPU_FTRS_ALWAYS = |
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h index 4840fbf89c32..a9496f34b048 100644 --- a/include/asm-powerpc/io.h +++ b/include/asm-powerpc/io.h | |||
| @@ -9,6 +9,9 @@ | |||
| 9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | /* Check of existence of legacy devices */ | ||
| 13 | extern int check_legacy_ioport(unsigned long base_port); | ||
| 14 | |||
| 12 | #ifndef CONFIG_PPC64 | 15 | #ifndef CONFIG_PPC64 |
| 13 | #include <asm-ppc/io.h> | 16 | #include <asm-ppc/io.h> |
| 14 | #else | 17 | #else |
| @@ -431,9 +434,6 @@ out: | |||
| 431 | #define dma_cache_wback(_start,_size) do { } while (0) | 434 | #define dma_cache_wback(_start,_size) do { } while (0) |
| 432 | #define dma_cache_wback_inv(_start,_size) do { } while (0) | 435 | #define dma_cache_wback_inv(_start,_size) do { } while (0) |
| 433 | 436 | ||
| 434 | /* Check of existence of legacy devices */ | ||
| 435 | extern int check_legacy_ioport(unsigned long base_port); | ||
| 436 | |||
| 437 | 437 | ||
| 438 | /* | 438 | /* |
| 439 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | 439 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem |
diff --git a/include/asm-powerpc/page_64.h b/include/asm-powerpc/page_64.h index 3fb061bab9ec..eab779c21995 100644 --- a/include/asm-powerpc/page_64.h +++ b/include/asm-powerpc/page_64.h | |||
| @@ -101,6 +101,7 @@ extern unsigned int HPAGE_SHIFT; | |||
| 101 | - (1U << GET_HTLB_AREA(addr))) & 0xffff) | 101 | - (1U << GET_HTLB_AREA(addr))) & 0xffff) |
| 102 | 102 | ||
| 103 | #define ARCH_HAS_HUGEPAGE_ONLY_RANGE | 103 | #define ARCH_HAS_HUGEPAGE_ONLY_RANGE |
| 104 | #define ARCH_HAS_HUGETLB_FREE_PGD_RANGE | ||
| 104 | #define ARCH_HAS_PREPARE_HUGEPAGE_RANGE | 105 | #define ARCH_HAS_PREPARE_HUGEPAGE_RANGE |
| 105 | #define ARCH_HAS_SETCLEAR_HUGE_PTE | 106 | #define ARCH_HAS_SETCLEAR_HUGE_PTE |
| 106 | 107 | ||
diff --git a/include/asm-powerpc/pgalloc.h b/include/asm-powerpc/pgalloc.h index a00ee002cd11..9f0917c68659 100644 --- a/include/asm-powerpc/pgalloc.h +++ b/include/asm-powerpc/pgalloc.h | |||
| @@ -17,11 +17,13 @@ extern kmem_cache_t *pgtable_cache[]; | |||
| 17 | #define PTE_CACHE_NUM 0 | 17 | #define PTE_CACHE_NUM 0 |
| 18 | #define PMD_CACHE_NUM 1 | 18 | #define PMD_CACHE_NUM 1 |
| 19 | #define PGD_CACHE_NUM 2 | 19 | #define PGD_CACHE_NUM 2 |
| 20 | #define HUGEPTE_CACHE_NUM 3 | ||
| 20 | #else | 21 | #else |
| 21 | #define PTE_CACHE_NUM 0 | 22 | #define PTE_CACHE_NUM 0 |
| 22 | #define PMD_CACHE_NUM 1 | 23 | #define PMD_CACHE_NUM 1 |
| 23 | #define PUD_CACHE_NUM 1 | 24 | #define PUD_CACHE_NUM 1 |
| 24 | #define PGD_CACHE_NUM 0 | 25 | #define PGD_CACHE_NUM 0 |
| 26 | #define HUGEPTE_CACHE_NUM 2 | ||
| 25 | #endif | 27 | #endif |
| 26 | 28 | ||
| 27 | /* | 29 | /* |
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index c612f1a62772..908acb44cb8a 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h | |||
| @@ -303,8 +303,26 @@ | |||
| 303 | #define __NR_unshare 282 | 303 | #define __NR_unshare 282 |
| 304 | #define __NR_splice 283 | 304 | #define __NR_splice 283 |
| 305 | #define __NR_tee 284 | 305 | #define __NR_tee 284 |
| 306 | #define __NR_vmsplice 285 | ||
| 307 | #define __NR_openat 286 | ||
| 308 | #define __NR_mkdirat 287 | ||
| 309 | #define __NR_mknodat 288 | ||
| 310 | #define __NR_fchownat 289 | ||
| 311 | #define __NR_futimesat 290 | ||
| 312 | #ifdef __powerpc64__ | ||
| 313 | #define __NR_newfstatat 291 | ||
| 314 | #else | ||
| 315 | #define __NR_fstatat64 291 | ||
| 316 | #endif | ||
| 317 | #define __NR_unlinkat 292 | ||
| 318 | #define __NR_renameat 293 | ||
| 319 | #define __NR_linkat 294 | ||
| 320 | #define __NR_symlinkat 295 | ||
| 321 | #define __NR_readlinkat 296 | ||
| 322 | #define __NR_fchmodat 297 | ||
| 323 | #define __NR_faccessat 298 | ||
| 306 | 324 | ||
| 307 | #define __NR_syscalls 285 | 325 | #define __NR_syscalls 299 |
| 308 | 326 | ||
| 309 | #ifdef __KERNEL__ | 327 | #ifdef __KERNEL__ |
| 310 | #define __NR__exit __NR_exit | 328 | #define __NR__exit __NR_exit |
| @@ -457,6 +475,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
| 457 | #ifdef CONFIG_PPC64 | 475 | #ifdef CONFIG_PPC64 |
| 458 | #define __ARCH_WANT_COMPAT_SYS_TIME | 476 | #define __ARCH_WANT_COMPAT_SYS_TIME |
| 459 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | 477 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND |
| 478 | #define __ARCH_WANT_SYS_NEWFSTATAT | ||
| 460 | #endif | 479 | #endif |
| 461 | 480 | ||
| 462 | /* | 481 | /* |
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h index 4b94f7059ebe..40f197af6508 100644 --- a/include/asm-ppc/ppc_sys.h +++ b/include/asm-ppc/ppc_sys.h | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | #error "need definition of ppc_sys_devices" | 39 | #error "need definition of ppc_sys_devices" |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | #define PPC_SYS_IORESOURCE_FIXUPPED 0x00000001 | ||
| 43 | |||
| 42 | struct ppc_sys_spec { | 44 | struct ppc_sys_spec { |
| 43 | /* PPC sys is matched via (ID & mask) == value, id could be | 45 | /* PPC sys is matched via (ID & mask) == value, id could be |
| 44 | * PVR, SVR, IMMR, * etc. */ | 46 | * PVR, SVR, IMMR, * etc. */ |
diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h index 00ad9c754c78..4944c0fb8bea 100644 --- a/include/asm-ppc/reg_booke.h +++ b/include/asm-ppc/reg_booke.h | |||
| @@ -237,6 +237,7 @@ do { \ | |||
| 237 | #endif | 237 | #endif |
| 238 | 238 | ||
| 239 | /* Bit definitions for CCR1. */ | 239 | /* Bit definitions for CCR1. */ |
| 240 | #define CCR1_DPC 0x00000100 /* Disable L1 I-Cache/D-Cache parity checking */ | ||
| 240 | #define CCR1_TCS 0x00000080 /* Timer Clock Select */ | 241 | #define CCR1_TCS 0x00000080 /* Timer Clock Select */ |
| 241 | 242 | ||
| 242 | /* Bit definitions for the MCSR. */ | 243 | /* Bit definitions for the MCSR. */ |
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 45feff893b8e..32a48f623e2b 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -271,7 +271,7 @@ | |||
| 271 | #define __NR_getsid 252 | 271 | #define __NR_getsid 252 |
| 272 | #define __NR_fdatasync 253 | 272 | #define __NR_fdatasync 253 |
| 273 | #define __NR_nfsservctl 254 | 273 | #define __NR_nfsservctl 254 |
| 274 | #define __NR_sys_sync_file_range 255 | 274 | #define __NR_sync_file_range 255 |
| 275 | #define __NR_clock_settime 256 | 275 | #define __NR_clock_settime 256 |
| 276 | #define __NR_clock_gettime 257 | 276 | #define __NR_clock_gettime 257 |
| 277 | #define __NR_clock_getres 258 | 277 | #define __NR_clock_getres 258 |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 597f6923a46e..ca80e8aca128 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -273,7 +273,7 @@ | |||
| 273 | #define __NR_getsid 252 | 273 | #define __NR_getsid 252 |
| 274 | #define __NR_fdatasync 253 | 274 | #define __NR_fdatasync 253 |
| 275 | #define __NR_nfsservctl 254 | 275 | #define __NR_nfsservctl 254 |
| 276 | #define __NR_sys_sync_file_range 255 | 276 | #define __NR_sync_file_range 255 |
| 277 | #define __NR_clock_settime 256 | 277 | #define __NR_clock_settime 256 |
| 278 | #define __NR_clock_gettime 257 | 278 | #define __NR_clock_gettime 257 |
| 279 | #define __NR_clock_getres 258 | 279 | #define __NR_clock_getres 258 |
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 98c36eae567c..feb77cb8c044 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h | |||
| @@ -615,8 +615,10 @@ __SYSCALL(__NR_splice, sys_splice) | |||
| 615 | __SYSCALL(__NR_tee, sys_tee) | 615 | __SYSCALL(__NR_tee, sys_tee) |
| 616 | #define __NR_sync_file_range 277 | 616 | #define __NR_sync_file_range 277 |
| 617 | __SYSCALL(__NR_sync_file_range, sys_sync_file_range) | 617 | __SYSCALL(__NR_sync_file_range, sys_sync_file_range) |
| 618 | #define __NR_vmsplice 278 | ||
| 619 | __SYSCALL(__NR_vmsplice, sys_vmsplice) | ||
| 618 | 620 | ||
| 619 | #define __NR_syscall_max __NR_sync_file_range | 621 | #define __NR_syscall_max __NR_vmsplice |
| 620 | 622 | ||
| 621 | #ifndef __NO_STUBS | 623 | #ifndef __NO_STUBS |
| 622 | 624 | ||
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index 176e2d371577..047567d34ca7 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h | |||
| @@ -58,9 +58,8 @@ struct dentry *debugfs_create_blob(const char *name, mode_t mode, | |||
| 58 | */ | 58 | */ |
| 59 | 59 | ||
| 60 | static inline struct dentry *debugfs_create_file(const char *name, mode_t mode, | 60 | static inline struct dentry *debugfs_create_file(const char *name, mode_t mode, |
| 61 | struct dentry *parent, | 61 | struct dentry *parent, void *data, |
| 62 | void *data, | 62 | const struct file_operations *fops) |
| 63 | struct file_operations *fops) | ||
| 64 | { | 63 | { |
| 65 | return ERR_PTR(-ENODEV); | 64 | return ERR_PTR(-ENODEV); |
| 66 | } | 65 | } |
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index dcd0623be892..c187c53cecd0 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -257,9 +257,8 @@ struct subsys_attribute { | |||
| 257 | }; | 257 | }; |
| 258 | 258 | ||
| 259 | extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); | 259 | extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); |
| 260 | extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *); | ||
| 261 | 260 | ||
| 262 | #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) | 261 | #if defined(CONFIG_HOTPLUG) |
| 263 | void kobject_uevent(struct kobject *kobj, enum kobject_action action); | 262 | void kobject_uevent(struct kobject *kobj, enum kobject_action action); |
| 264 | 263 | ||
| 265 | int add_uevent_var(char **envp, int num_envp, int *cur_index, | 264 | int add_uevent_var(char **envp, int num_envp, int *cur_index, |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 40ccf8cc4239..01db7b88a2b1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -829,19 +829,21 @@ static inline void netif_rx_schedule(struct net_device *dev) | |||
| 829 | __netif_rx_schedule(dev); | 829 | __netif_rx_schedule(dev); |
| 830 | } | 830 | } |
| 831 | 831 | ||
| 832 | /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). | 832 | |
| 833 | * Do not inline this? | 833 | static inline void __netif_rx_reschedule(struct net_device *dev, int undo) |
| 834 | */ | 834 | { |
| 835 | dev->quota += undo; | ||
| 836 | list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list); | ||
| 837 | __raise_softirq_irqoff(NET_RX_SOFTIRQ); | ||
| 838 | } | ||
| 839 | |||
| 840 | /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). */ | ||
| 835 | static inline int netif_rx_reschedule(struct net_device *dev, int undo) | 841 | static inline int netif_rx_reschedule(struct net_device *dev, int undo) |
| 836 | { | 842 | { |
| 837 | if (netif_rx_schedule_prep(dev)) { | 843 | if (netif_rx_schedule_prep(dev)) { |
| 838 | unsigned long flags; | 844 | unsigned long flags; |
| 839 | |||
| 840 | dev->quota += undo; | ||
| 841 | |||
| 842 | local_irq_save(flags); | 845 | local_irq_save(flags); |
| 843 | list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list); | 846 | __netif_rx_reschedule(dev, undo); |
| 844 | __raise_softirq_irqoff(NET_RX_SOFTIRQ); | ||
| 845 | local_irq_restore(flags); | 847 | local_irq_restore(flags); |
| 846 | return 1; | 848 | return 1; |
| 847 | } | 849 | } |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index f6bdef82a322..38701454e197 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
| @@ -361,7 +361,11 @@ struct compat_xt_entry_target | |||
| 361 | 361 | ||
| 362 | struct compat_xt_counters | 362 | struct compat_xt_counters |
| 363 | { | 363 | { |
| 364 | #if defined(CONFIG_X86_64) || defined(CONFIG_IA64) | ||
| 364 | u_int32_t cnt[4]; | 365 | u_int32_t cnt[4]; |
| 366 | #else | ||
| 367 | u_int64_t cnt[2]; | ||
| 368 | #endif | ||
| 365 | }; | 369 | }; |
| 366 | 370 | ||
| 367 | struct compat_xt_counters_info | 371 | struct compat_xt_counters_info |
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 9539efd4f7e6..7a1af574dedf 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
| @@ -78,6 +78,8 @@ extern struct page * find_or_create_page(struct address_space *mapping, | |||
| 78 | unsigned long index, gfp_t gfp_mask); | 78 | unsigned long index, gfp_t gfp_mask); |
| 79 | unsigned find_get_pages(struct address_space *mapping, pgoff_t start, | 79 | unsigned find_get_pages(struct address_space *mapping, pgoff_t start, |
| 80 | unsigned int nr_pages, struct page **pages); | 80 | unsigned int nr_pages, struct page **pages); |
| 81 | unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t start, | ||
| 82 | unsigned int nr_pages, struct page **pages); | ||
| 81 | unsigned find_get_pages_tag(struct address_space *mapping, pgoff_t *index, | 83 | unsigned find_get_pages_tag(struct address_space *mapping, pgoff_t *index, |
| 82 | int tag, unsigned int nr_pages, struct page **pages); | 84 | int tag, unsigned int nr_pages, struct page **pages); |
| 83 | 85 | ||
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index ef7f33c0be19..0008d4bd4059 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h | |||
| @@ -61,4 +61,21 @@ void __free_pipe_info(struct pipe_inode_info *); | |||
| 61 | /* from/to, of course */ | 61 | /* from/to, of course */ |
| 62 | #define SPLICE_F_MORE (0x04) /* expect more data */ | 62 | #define SPLICE_F_MORE (0x04) /* expect more data */ |
| 63 | 63 | ||
| 64 | /* | ||
| 65 | * Passed to the actors | ||
| 66 | */ | ||
| 67 | struct splice_desc { | ||
| 68 | unsigned int len, total_len; /* current and remaining length */ | ||
| 69 | unsigned int flags; /* splice flags */ | ||
| 70 | struct file *file; /* file to read/write */ | ||
| 71 | loff_t pos; /* file position */ | ||
| 72 | }; | ||
| 73 | |||
| 74 | typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *, | ||
| 75 | struct splice_desc *); | ||
| 76 | |||
| 77 | extern ssize_t splice_from_pipe(struct pipe_inode_info *, struct file *, | ||
| 78 | loff_t *, size_t, unsigned int, | ||
| 79 | splice_actor *); | ||
| 80 | |||
| 64 | #endif | 81 | #endif |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index d3ebc0e68b2b..3996960fc565 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -574,6 +574,9 @@ asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, | |||
| 574 | int fd_out, loff_t __user *off_out, | 574 | int fd_out, loff_t __user *off_out, |
| 575 | size_t len, unsigned int flags); | 575 | size_t len, unsigned int flags); |
| 576 | 576 | ||
| 577 | asmlinkage long sys_vmsplice(int fd, const struct iovec __user *iov, | ||
| 578 | unsigned long nr_segs, unsigned int flags); | ||
| 579 | |||
| 577 | asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags); | 580 | asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags); |
| 578 | 581 | ||
| 579 | asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, | 582 | asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, |
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index 6b3693f05ca0..b1ebfbae397f 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h | |||
| @@ -96,10 +96,13 @@ struct ieee80211softmac_assoc_info { | |||
| 96 | * | 96 | * |
| 97 | * bssvalid is true if we found a matching network | 97 | * bssvalid is true if we found a matching network |
| 98 | * and saved it's BSSID into the bssid above. | 98 | * and saved it's BSSID into the bssid above. |
| 99 | * | ||
| 100 | * bssfixed is used for SIOCSIWAP. | ||
| 99 | */ | 101 | */ |
| 100 | u8 static_essid:1, | 102 | u8 static_essid:1, |
| 101 | associating:1, | 103 | associating:1, |
| 102 | bssvalid:1; | 104 | bssvalid:1, |
| 105 | bssfixed:1; | ||
| 103 | 106 | ||
| 104 | /* Scan retries remaining */ | 107 | /* Scan retries remaining */ |
| 105 | int scan_retry; | 108 | int scan_retry; |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index d2a7296c8251..b7f0388bd71c 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -836,7 +836,7 @@ static void migrate_hrtimers(int cpu) | |||
| 836 | } | 836 | } |
| 837 | #endif /* CONFIG_HOTPLUG_CPU */ | 837 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 838 | 838 | ||
| 839 | static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | 839 | static int hrtimer_cpu_notify(struct notifier_block *self, |
| 840 | unsigned long action, void *hcpu) | 840 | unsigned long action, void *hcpu) |
| 841 | { | 841 | { |
| 842 | long cpu = (long)hcpu; | 842 | long cpu = (long)hcpu; |
| @@ -860,7 +860,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | |||
| 860 | return NOTIFY_OK; | 860 | return NOTIFY_OK; |
| 861 | } | 861 | } |
| 862 | 862 | ||
| 863 | static struct notifier_block __devinitdata hrtimers_nb = { | 863 | static struct notifier_block hrtimers_nb = { |
| 864 | .notifier_call = hrtimer_cpu_notify, | 864 | .notifier_call = hrtimer_cpu_notify, |
| 865 | }; | 865 | }; |
| 866 | 866 | ||
diff --git a/kernel/profile.c b/kernel/profile.c index 5a730fdb1a2c..68afe121e507 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -299,7 +299,7 @@ out: | |||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | #ifdef CONFIG_HOTPLUG_CPU | 301 | #ifdef CONFIG_HOTPLUG_CPU |
| 302 | static int __devinit profile_cpu_callback(struct notifier_block *info, | 302 | static int profile_cpu_callback(struct notifier_block *info, |
| 303 | unsigned long action, void *__cpu) | 303 | unsigned long action, void *__cpu) |
| 304 | { | 304 | { |
| 305 | int node, cpu = (unsigned long)__cpu; | 305 | int node, cpu = (unsigned long)__cpu; |
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 13458bbaa1be..6d32ff26f948 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
| @@ -520,7 +520,7 @@ static void __devinit rcu_online_cpu(int cpu) | |||
| 520 | tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL); | 520 | tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL); |
| 521 | } | 521 | } |
| 522 | 522 | ||
| 523 | static int __devinit rcu_cpu_notify(struct notifier_block *self, | 523 | static int rcu_cpu_notify(struct notifier_block *self, |
| 524 | unsigned long action, void *hcpu) | 524 | unsigned long action, void *hcpu) |
| 525 | { | 525 | { |
| 526 | long cpu = (long)hcpu; | 526 | long cpu = (long)hcpu; |
| @@ -537,7 +537,7 @@ static int __devinit rcu_cpu_notify(struct notifier_block *self, | |||
| 537 | return NOTIFY_OK; | 537 | return NOTIFY_OK; |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | static struct notifier_block __devinitdata rcu_nb = { | 540 | static struct notifier_block rcu_nb = { |
| 541 | .notifier_call = rcu_cpu_notify, | 541 | .notifier_call = rcu_cpu_notify, |
| 542 | }; | 542 | }; |
| 543 | 543 | ||
diff --git a/kernel/sched.c b/kernel/sched.c index 365f0b90b4de..4c64f85698ae 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -4814,7 +4814,7 @@ static int migration_call(struct notifier_block *nfb, unsigned long action, | |||
| 4814 | /* Register at highest priority so that task migration (migrate_all_tasks) | 4814 | /* Register at highest priority so that task migration (migrate_all_tasks) |
| 4815 | * happens before everything else. | 4815 | * happens before everything else. |
| 4816 | */ | 4816 | */ |
| 4817 | static struct notifier_block __devinitdata migration_notifier = { | 4817 | static struct notifier_block migration_notifier = { |
| 4818 | .notifier_call = migration_call, | 4818 | .notifier_call = migration_call, |
| 4819 | .priority = 10 | 4819 | .priority = 10 |
| 4820 | }; | 4820 | }; |
diff --git a/kernel/softirq.c b/kernel/softirq.c index ec8fed42a86f..336f92d64e2e 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -446,7 +446,7 @@ static void takeover_tasklets(unsigned int cpu) | |||
| 446 | } | 446 | } |
| 447 | #endif /* CONFIG_HOTPLUG_CPU */ | 447 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 448 | 448 | ||
| 449 | static int __devinit cpu_callback(struct notifier_block *nfb, | 449 | static int cpu_callback(struct notifier_block *nfb, |
| 450 | unsigned long action, | 450 | unsigned long action, |
| 451 | void *hcpu) | 451 | void *hcpu) |
| 452 | { | 452 | { |
| @@ -484,7 +484,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb, | |||
| 484 | return NOTIFY_OK; | 484 | return NOTIFY_OK; |
| 485 | } | 485 | } |
| 486 | 486 | ||
| 487 | static struct notifier_block __devinitdata cpu_nfb = { | 487 | static struct notifier_block cpu_nfb = { |
| 488 | .notifier_call = cpu_callback | 488 | .notifier_call = cpu_callback |
| 489 | }; | 489 | }; |
| 490 | 490 | ||
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index ced91e1ff564..14c7faf02909 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -104,7 +104,7 @@ static int watchdog(void * __bind_cpu) | |||
| 104 | /* | 104 | /* |
| 105 | * Create/destroy watchdog threads as CPUs come and go: | 105 | * Create/destroy watchdog threads as CPUs come and go: |
| 106 | */ | 106 | */ |
| 107 | static int __devinit | 107 | static int |
| 108 | cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | 108 | cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) |
| 109 | { | 109 | { |
| 110 | int hotcpu = (unsigned long)hcpu; | 110 | int hotcpu = (unsigned long)hcpu; |
| @@ -140,7 +140,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 140 | return NOTIFY_OK; | 140 | return NOTIFY_OK; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | static struct notifier_block __devinitdata cpu_nfb = { | 143 | static struct notifier_block cpu_nfb = { |
| 144 | .notifier_call = cpu_callback | 144 | .notifier_call = cpu_callback |
| 145 | }; | 145 | }; |
| 146 | 146 | ||
diff --git a/kernel/timer.c b/kernel/timer.c index 883773788836..67eaf0f54096 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -1314,7 +1314,7 @@ static void __devinit migrate_timers(int cpu) | |||
| 1314 | } | 1314 | } |
| 1315 | #endif /* CONFIG_HOTPLUG_CPU */ | 1315 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 1316 | 1316 | ||
| 1317 | static int __devinit timer_cpu_notify(struct notifier_block *self, | 1317 | static int timer_cpu_notify(struct notifier_block *self, |
| 1318 | unsigned long action, void *hcpu) | 1318 | unsigned long action, void *hcpu) |
| 1319 | { | 1319 | { |
| 1320 | long cpu = (long)hcpu; | 1320 | long cpu = (long)hcpu; |
| @@ -1334,7 +1334,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self, | |||
| 1334 | return NOTIFY_OK; | 1334 | return NOTIFY_OK; |
| 1335 | } | 1335 | } |
| 1336 | 1336 | ||
| 1337 | static struct notifier_block __devinitdata timers_nb = { | 1337 | static struct notifier_block timers_nb = { |
| 1338 | .notifier_call = timer_cpu_notify, | 1338 | .notifier_call = timer_cpu_notify, |
| 1339 | }; | 1339 | }; |
| 1340 | 1340 | ||
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e9e464a90376..880fb415a8f6 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -547,7 +547,7 @@ static void take_over_work(struct workqueue_struct *wq, unsigned int cpu) | |||
| 547 | } | 547 | } |
| 548 | 548 | ||
| 549 | /* We're holding the cpucontrol mutex here */ | 549 | /* We're holding the cpucontrol mutex here */ |
| 550 | static int __devinit workqueue_cpu_callback(struct notifier_block *nfb, | 550 | static int workqueue_cpu_callback(struct notifier_block *nfb, |
| 551 | unsigned long action, | 551 | unsigned long action, |
| 552 | void *hcpu) | 552 | void *hcpu) |
| 553 | { | 553 | { |
diff --git a/lib/kobject.c b/lib/kobject.c index 01d957513940..b46350c27837 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -422,7 +422,6 @@ struct kobject *kobject_add_dir(struct kobject *parent, const char *name) | |||
| 422 | 422 | ||
| 423 | return k; | 423 | return k; |
| 424 | } | 424 | } |
| 425 | EXPORT_SYMBOL_GPL(kobject_add_dir); | ||
| 426 | 425 | ||
| 427 | /** | 426 | /** |
| 428 | * kset_init - initialize a kset for use | 427 | * kset_init - initialize a kset for use |
| @@ -569,7 +568,7 @@ int subsys_create_file(struct subsystem * s, struct subsys_attribute * a) | |||
| 569 | * @s: subsystem. | 568 | * @s: subsystem. |
| 570 | * @a: attribute desciptor. | 569 | * @a: attribute desciptor. |
| 571 | */ | 570 | */ |
| 572 | 571 | #if 0 | |
| 573 | void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a) | 572 | void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a) |
| 574 | { | 573 | { |
| 575 | if (subsys_get(s)) { | 574 | if (subsys_get(s)) { |
| @@ -577,6 +576,7 @@ void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a) | |||
| 577 | subsys_put(s); | 576 | subsys_put(s); |
| 578 | } | 577 | } |
| 579 | } | 578 | } |
| 579 | #endif /* 0 */ | ||
| 580 | 580 | ||
| 581 | EXPORT_SYMBOL(kobject_init); | 581 | EXPORT_SYMBOL(kobject_init); |
| 582 | EXPORT_SYMBOL(kobject_register); | 582 | EXPORT_SYMBOL(kobject_register); |
| @@ -588,10 +588,7 @@ EXPORT_SYMBOL(kobject_del); | |||
| 588 | 588 | ||
| 589 | EXPORT_SYMBOL(kset_register); | 589 | EXPORT_SYMBOL(kset_register); |
| 590 | EXPORT_SYMBOL(kset_unregister); | 590 | EXPORT_SYMBOL(kset_unregister); |
| 591 | EXPORT_SYMBOL(kset_find_obj); | ||
| 592 | 591 | ||
| 593 | EXPORT_SYMBOL(subsystem_init); | ||
| 594 | EXPORT_SYMBOL(subsystem_register); | 592 | EXPORT_SYMBOL(subsystem_register); |
| 595 | EXPORT_SYMBOL(subsystem_unregister); | 593 | EXPORT_SYMBOL(subsystem_unregister); |
| 596 | EXPORT_SYMBOL(subsys_create_file); | 594 | EXPORT_SYMBOL(subsys_create_file); |
| 597 | EXPORT_SYMBOL(subsys_remove_file); | ||
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 982226daf939..7f20e7b857cb 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
| @@ -25,11 +25,13 @@ | |||
| 25 | #define BUFFER_SIZE 2048 /* buffer for the variables */ | 25 | #define BUFFER_SIZE 2048 /* buffer for the variables */ |
| 26 | #define NUM_ENVP 32 /* number of env pointers */ | 26 | #define NUM_ENVP 32 /* number of env pointers */ |
| 27 | 27 | ||
| 28 | #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) | 28 | #if defined(CONFIG_HOTPLUG) |
| 29 | u64 uevent_seqnum; | 29 | u64 uevent_seqnum; |
| 30 | char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; | 30 | char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; |
| 31 | static DEFINE_SPINLOCK(sequence_lock); | 31 | static DEFINE_SPINLOCK(sequence_lock); |
| 32 | #if defined(CONFIG_NET) | ||
| 32 | static struct sock *uevent_sock; | 33 | static struct sock *uevent_sock; |
| 34 | #endif | ||
| 33 | 35 | ||
| 34 | static char *action_to_string(enum kobject_action action) | 36 | static char *action_to_string(enum kobject_action action) |
| 35 | { | 37 | { |
| @@ -155,6 +157,7 @@ void kobject_uevent(struct kobject *kobj, enum kobject_action action) | |||
| 155 | spin_unlock(&sequence_lock); | 157 | spin_unlock(&sequence_lock); |
| 156 | sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq); | 158 | sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq); |
| 157 | 159 | ||
| 160 | #if defined(CONFIG_NET) | ||
| 158 | /* send netlink message */ | 161 | /* send netlink message */ |
| 159 | if (uevent_sock) { | 162 | if (uevent_sock) { |
| 160 | struct sk_buff *skb; | 163 | struct sk_buff *skb; |
| @@ -179,6 +182,7 @@ void kobject_uevent(struct kobject *kobj, enum kobject_action action) | |||
| 179 | netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL); | 182 | netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL); |
| 180 | } | 183 | } |
| 181 | } | 184 | } |
| 185 | #endif | ||
| 182 | 186 | ||
| 183 | /* call uevent_helper, usually only enabled during early boot */ | 187 | /* call uevent_helper, usually only enabled during early boot */ |
| 184 | if (uevent_helper[0]) { | 188 | if (uevent_helper[0]) { |
| @@ -249,6 +253,7 @@ int add_uevent_var(char **envp, int num_envp, int *cur_index, | |||
| 249 | } | 253 | } |
| 250 | EXPORT_SYMBOL_GPL(add_uevent_var); | 254 | EXPORT_SYMBOL_GPL(add_uevent_var); |
| 251 | 255 | ||
| 256 | #if defined(CONFIG_NET) | ||
| 252 | static int __init kobject_uevent_init(void) | 257 | static int __init kobject_uevent_init(void) |
| 253 | { | 258 | { |
| 254 | uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL, | 259 | uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL, |
| @@ -264,5 +269,6 @@ static int __init kobject_uevent_init(void) | |||
| 264 | } | 269 | } |
| 265 | 270 | ||
| 266 | postcore_initcall(kobject_uevent_init); | 271 | postcore_initcall(kobject_uevent_init); |
| 272 | #endif | ||
| 267 | 273 | ||
| 268 | #endif /* CONFIG_HOTPLUG */ | 274 | #endif /* CONFIG_HOTPLUG */ |
diff --git a/mm/filemap.c b/mm/filemap.c index 3ef20739e725..fd57442186cb 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -697,6 +697,38 @@ unsigned find_get_pages(struct address_space *mapping, pgoff_t start, | |||
| 697 | return ret; | 697 | return ret; |
| 698 | } | 698 | } |
| 699 | 699 | ||
| 700 | /** | ||
| 701 | * find_get_pages_contig - gang contiguous pagecache lookup | ||
| 702 | * @mapping: The address_space to search | ||
| 703 | * @index: The starting page index | ||
| 704 | * @nr_pages: The maximum number of pages | ||
| 705 | * @pages: Where the resulting pages are placed | ||
| 706 | * | ||
| 707 | * find_get_pages_contig() works exactly like find_get_pages(), except | ||
| 708 | * that the returned number of pages are guaranteed to be contiguous. | ||
| 709 | * | ||
| 710 | * find_get_pages_contig() returns the number of pages which were found. | ||
| 711 | */ | ||
| 712 | unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t index, | ||
| 713 | unsigned int nr_pages, struct page **pages) | ||
| 714 | { | ||
| 715 | unsigned int i; | ||
| 716 | unsigned int ret; | ||
| 717 | |||
| 718 | read_lock_irq(&mapping->tree_lock); | ||
| 719 | ret = radix_tree_gang_lookup(&mapping->page_tree, | ||
| 720 | (void **)pages, index, nr_pages); | ||
| 721 | for (i = 0; i < ret; i++) { | ||
| 722 | if (pages[i]->mapping == NULL || pages[i]->index != index) | ||
| 723 | break; | ||
| 724 | |||
| 725 | page_cache_get(pages[i]); | ||
| 726 | index++; | ||
| 727 | } | ||
| 728 | read_unlock_irq(&mapping->tree_lock); | ||
| 729 | return i; | ||
| 730 | } | ||
| 731 | |||
| 700 | /* | 732 | /* |
| 701 | * Like find_get_pages, except we only return pages which are tagged with | 733 | * Like find_get_pages, except we only return pages which are tagged with |
| 702 | * `tag'. We update *index to index the next page for the traversal. | 734 | * `tag'. We update *index to index the next page for the traversal. |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 123c60586740..ea77c999047e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -1962,7 +1962,7 @@ static inline void free_zone_pagesets(int cpu) | |||
| 1962 | } | 1962 | } |
| 1963 | } | 1963 | } |
| 1964 | 1964 | ||
| 1965 | static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb, | 1965 | static int pageset_cpuup_callback(struct notifier_block *nfb, |
| 1966 | unsigned long action, | 1966 | unsigned long action, |
| 1967 | void *hcpu) | 1967 | void *hcpu) |
| 1968 | { | 1968 | { |
diff --git a/mm/shmem.c b/mm/shmem.c index 37eaf42ed2c6..4c5e68e4e9ae 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -46,6 +46,8 @@ | |||
| 46 | #include <linux/mempolicy.h> | 46 | #include <linux/mempolicy.h> |
| 47 | #include <linux/namei.h> | 47 | #include <linux/namei.h> |
| 48 | #include <linux/ctype.h> | 48 | #include <linux/ctype.h> |
| 49 | #include <linux/migrate.h> | ||
| 50 | |||
| 49 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
| 50 | #include <asm/div64.h> | 52 | #include <asm/div64.h> |
| 51 | #include <asm/pgtable.h> | 53 | #include <asm/pgtable.h> |
| @@ -2173,6 +2175,7 @@ static struct address_space_operations shmem_aops = { | |||
| 2173 | .prepare_write = shmem_prepare_write, | 2175 | .prepare_write = shmem_prepare_write, |
| 2174 | .commit_write = simple_commit_write, | 2176 | .commit_write = simple_commit_write, |
| 2175 | #endif | 2177 | #endif |
| 2178 | .migratepage = migrate_page, | ||
| 2176 | }; | 2179 | }; |
| 2177 | 2180 | ||
| 2178 | static struct file_operations shmem_file_operations = { | 2181 | static struct file_operations shmem_file_operations = { |
| @@ -1036,7 +1036,7 @@ static inline void free_alien_cache(struct array_cache **ac_ptr) | |||
| 1036 | 1036 | ||
| 1037 | #endif | 1037 | #endif |
| 1038 | 1038 | ||
| 1039 | static int __devinit cpuup_callback(struct notifier_block *nfb, | 1039 | static int cpuup_callback(struct notifier_block *nfb, |
| 1040 | unsigned long action, void *hcpu) | 1040 | unsigned long action, void *hcpu) |
| 1041 | { | 1041 | { |
| 1042 | long cpu = (long)hcpu; | 1042 | long cpu = (long)hcpu; |
diff --git a/mm/vmscan.c b/mm/vmscan.c index acdf001d6941..4649a63a8cb6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1328,7 +1328,7 @@ repeat: | |||
| 1328 | not required for correctness. So if the last cpu in a node goes | 1328 | not required for correctness. So if the last cpu in a node goes |
| 1329 | away, we get changed to run anywhere: as the first one comes back, | 1329 | away, we get changed to run anywhere: as the first one comes back, |
| 1330 | restore their cpu bindings. */ | 1330 | restore their cpu bindings. */ |
| 1331 | static int __devinit cpu_callback(struct notifier_block *nfb, | 1331 | static int cpu_callback(struct notifier_block *nfb, |
| 1332 | unsigned long action, void *hcpu) | 1332 | unsigned long action, void *hcpu) |
| 1333 | { | 1333 | { |
| 1334 | pg_data_t *pgdat; | 1334 | pg_data_t *pgdat; |
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 2d24fb400e0c..56f3aa47e758 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/netdevice.h> | 17 | #include <linux/netdevice.h> |
| 18 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 19 | #include <linux/if_vlan.h> | ||
| 19 | #include <linux/netfilter_bridge.h> | 20 | #include <linux/netfilter_bridge.h> |
| 20 | #include "br_private.h" | 21 | #include "br_private.h" |
| 21 | 22 | ||
| @@ -29,10 +30,15 @@ static inline int should_deliver(const struct net_bridge_port *p, | |||
| 29 | return 1; | 30 | return 1; |
| 30 | } | 31 | } |
| 31 | 32 | ||
| 33 | static inline unsigned packet_length(const struct sk_buff *skb) | ||
| 34 | { | ||
| 35 | return skb->len - (skb->protocol == htons(ETH_P_8021Q) ? VLAN_HLEN : 0); | ||
| 36 | } | ||
| 37 | |||
| 32 | int br_dev_queue_push_xmit(struct sk_buff *skb) | 38 | int br_dev_queue_push_xmit(struct sk_buff *skb) |
| 33 | { | 39 | { |
| 34 | /* drop mtu oversized packets except tso */ | 40 | /* drop mtu oversized packets except tso */ |
| 35 | if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->tso_size) | 41 | if (packet_length(skb) > skb->dev->mtu && !skb_shinfo(skb)->tso_size) |
| 36 | kfree_skb(skb); | 42 | kfree_skb(skb); |
| 37 | else { | 43 | else { |
| 38 | #ifdef CONFIG_BRIDGE_NETFILTER | 44 | #ifdef CONFIG_BRIDGE_NETFILTER |
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index 4498023841dc..fb79ce7d6439 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c | |||
| @@ -144,6 +144,12 @@ network_matches_request(struct ieee80211softmac_device *mac, struct ieee80211_ne | |||
| 144 | if (!we_support_all_basic_rates(mac, net->rates_ex, net->rates_ex_len)) | 144 | if (!we_support_all_basic_rates(mac, net->rates_ex, net->rates_ex_len)) |
| 145 | return 0; | 145 | return 0; |
| 146 | 146 | ||
| 147 | /* assume that users know what they're doing ... | ||
| 148 | * (note we don't let them select a net we're incompatible with) */ | ||
| 149 | if (mac->associnfo.bssfixed) { | ||
| 150 | return !memcmp(mac->associnfo.bssid, net->bssid, ETH_ALEN); | ||
| 151 | } | ||
| 152 | |||
| 147 | /* if 'ANY' network requested, take any that doesn't have privacy enabled */ | 153 | /* if 'ANY' network requested, take any that doesn't have privacy enabled */ |
| 148 | if (mac->associnfo.req_essid.len == 0 | 154 | if (mac->associnfo.req_essid.len == 0 |
| 149 | && !(net->capability & WLAN_CAPABILITY_PRIVACY)) | 155 | && !(net->capability & WLAN_CAPABILITY_PRIVACY)) |
| @@ -176,7 +182,7 @@ ieee80211softmac_assoc_work(void *d) | |||
| 176 | ieee80211softmac_disassoc(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); | 182 | ieee80211softmac_disassoc(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); |
| 177 | 183 | ||
| 178 | /* try to find the requested network in our list, if we found one already */ | 184 | /* try to find the requested network in our list, if we found one already */ |
| 179 | if (mac->associnfo.bssvalid) | 185 | if (mac->associnfo.bssvalid || mac->associnfo.bssfixed) |
| 180 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); | 186 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); |
| 181 | 187 | ||
| 182 | /* Search the ieee80211 networks for this network if we didn't find it by bssid, | 188 | /* Search the ieee80211 networks for this network if we didn't find it by bssid, |
| @@ -241,19 +247,25 @@ ieee80211softmac_assoc_work(void *d) | |||
| 241 | if (ieee80211softmac_start_scan(mac)) | 247 | if (ieee80211softmac_start_scan(mac)) |
| 242 | dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); | 248 | dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); |
| 243 | return; | 249 | return; |
| 244 | } | 250 | } else { |
| 245 | else { | ||
| 246 | spin_lock_irqsave(&mac->lock, flags); | 251 | spin_lock_irqsave(&mac->lock, flags); |
| 247 | mac->associnfo.associating = 0; | 252 | mac->associnfo.associating = 0; |
| 248 | mac->associated = 0; | 253 | mac->associated = 0; |
| 249 | spin_unlock_irqrestore(&mac->lock, flags); | 254 | spin_unlock_irqrestore(&mac->lock, flags); |
| 250 | 255 | ||
| 251 | dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); | 256 | dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); |
| 257 | /* reset the retry counter for the next user request since we | ||
| 258 | * break out and don't reschedule ourselves after this point. */ | ||
| 259 | mac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; | ||
| 252 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL); | 260 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL); |
| 253 | return; | 261 | return; |
| 254 | } | 262 | } |
| 255 | } | 263 | } |
| 256 | 264 | ||
| 265 | /* reset the retry counter for the next user request since we | ||
| 266 | * now found a net and will try to associate to it, but not | ||
| 267 | * schedule this function again. */ | ||
| 268 | mac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; | ||
| 257 | mac->associnfo.bssvalid = 1; | 269 | mac->associnfo.bssvalid = 1; |
| 258 | memcpy(mac->associnfo.bssid, found->bssid, ETH_ALEN); | 270 | memcpy(mac->associnfo.bssid, found->bssid, ETH_ALEN); |
| 259 | /* copy the ESSID for displaying it */ | 271 | /* copy the ESSID for displaying it */ |
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index 60f06a31f0d1..be83bdc1644a 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c | |||
| @@ -45,6 +45,8 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv) | |||
| 45 | softmac->ieee->handle_disassoc = ieee80211softmac_handle_disassoc; | 45 | softmac->ieee->handle_disassoc = ieee80211softmac_handle_disassoc; |
| 46 | softmac->scaninfo = NULL; | 46 | softmac->scaninfo = NULL; |
| 47 | 47 | ||
| 48 | softmac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; | ||
| 49 | |||
| 48 | /* TODO: initialise all the other callbacks in the ieee struct | 50 | /* TODO: initialise all the other callbacks in the ieee struct |
| 49 | * (once they're written) | 51 | * (once they're written) |
| 50 | */ | 52 | */ |
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index 00f0d4f71897..27edb2b5581a 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c | |||
| @@ -27,7 +27,8 @@ | |||
| 27 | #include "ieee80211softmac_priv.h" | 27 | #include "ieee80211softmac_priv.h" |
| 28 | 28 | ||
| 29 | #include <net/iw_handler.h> | 29 | #include <net/iw_handler.h> |
| 30 | 30 | /* for is_broadcast_ether_addr and is_zero_ether_addr */ | |
| 31 | #include <linux/etherdevice.h> | ||
| 31 | 32 | ||
| 32 | int | 33 | int |
| 33 | ieee80211softmac_wx_trigger_scan(struct net_device *net_dev, | 34 | ieee80211softmac_wx_trigger_scan(struct net_device *net_dev, |
| @@ -83,7 +84,6 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
| 83 | sm->associnfo.static_essid = 1; | 84 | sm->associnfo.static_essid = 1; |
| 84 | } | 85 | } |
| 85 | } | 86 | } |
| 86 | sm->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; | ||
| 87 | 87 | ||
| 88 | /* set our requested ESSID length. | 88 | /* set our requested ESSID length. |
| 89 | * If applicable, we have already copied the data in */ | 89 | * If applicable, we have already copied the data in */ |
| @@ -310,8 +310,6 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
| 310 | char *extra) | 310 | char *extra) |
| 311 | { | 311 | { |
| 312 | struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); | 312 | struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); |
| 313 | static const unsigned char any[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; | ||
| 314 | static const unsigned char off[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; | ||
| 315 | unsigned long flags; | 313 | unsigned long flags; |
| 316 | 314 | ||
| 317 | /* sanity check */ | 315 | /* sanity check */ |
| @@ -320,10 +318,17 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
| 320 | } | 318 | } |
| 321 | 319 | ||
| 322 | spin_lock_irqsave(&mac->lock, flags); | 320 | spin_lock_irqsave(&mac->lock, flags); |
| 323 | if (!memcmp(any, data->ap_addr.sa_data, ETH_ALEN) || | 321 | if (is_broadcast_ether_addr(data->ap_addr.sa_data)) { |
| 324 | !memcmp(off, data->ap_addr.sa_data, ETH_ALEN)) { | 322 | /* the bssid we have is not to be fixed any longer, |
| 325 | schedule_work(&mac->associnfo.work); | 323 | * and we should reassociate to the best AP. */ |
| 326 | goto out; | 324 | mac->associnfo.bssfixed = 0; |
| 325 | /* force reassociation */ | ||
| 326 | mac->associnfo.bssvalid = 0; | ||
| 327 | if (mac->associated) | ||
| 328 | schedule_work(&mac->associnfo.work); | ||
| 329 | } else if (is_zero_ether_addr(data->ap_addr.sa_data)) { | ||
| 330 | /* the bssid we have is no longer fixed */ | ||
| 331 | mac->associnfo.bssfixed = 0; | ||
| 327 | } else { | 332 | } else { |
| 328 | if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { | 333 | if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { |
| 329 | if (mac->associnfo.associating || mac->associated) { | 334 | if (mac->associnfo.associating || mac->associated) { |
| @@ -333,12 +338,14 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
| 333 | } else { | 338 | } else { |
| 334 | /* copy new value in data->ap_addr.sa_data to bssid */ | 339 | /* copy new value in data->ap_addr.sa_data to bssid */ |
| 335 | memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); | 340 | memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); |
| 336 | } | 341 | } |
| 342 | /* tell the other code that this bssid should be used no matter what */ | ||
| 343 | mac->associnfo.bssfixed = 1; | ||
| 337 | /* queue associate if new bssid or (old one again and not associated) */ | 344 | /* queue associate if new bssid or (old one again and not associated) */ |
| 338 | schedule_work(&mac->associnfo.work); | 345 | schedule_work(&mac->associnfo.work); |
| 339 | } | 346 | } |
| 340 | 347 | ||
| 341 | out: | 348 | out: |
| 342 | spin_unlock_irqrestore(&mac->lock, flags); | 349 | spin_unlock_irqrestore(&mac->lock, flags); |
| 343 | return 0; | 350 | return 0; |
| 344 | } | 351 | } |
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index c60fd5c4ea1e..3d560dec63ab 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
| @@ -345,7 +345,7 @@ config IP_NF_TARGET_LOG | |||
| 345 | To compile it as a module, choose M here. If unsure, say N. | 345 | To compile it as a module, choose M here. If unsure, say N. |
| 346 | 346 | ||
| 347 | config IP_NF_TARGET_ULOG | 347 | config IP_NF_TARGET_ULOG |
| 348 | tristate "ULOG target support (OBSOLETE)" | 348 | tristate "ULOG target support" |
| 349 | depends on IP_NF_IPTABLES | 349 | depends on IP_NF_IPTABLES |
| 350 | ---help--- | 350 | ---help--- |
| 351 | 351 | ||
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 642b4b11464f..0a673038344f 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
| @@ -288,19 +288,6 @@ ip6t_do_table(struct sk_buff **pskb, | |||
| 288 | table_base = (void *)private->entries[smp_processor_id()]; | 288 | table_base = (void *)private->entries[smp_processor_id()]; |
| 289 | e = get_entry(table_base, private->hook_entry[hook]); | 289 | e = get_entry(table_base, private->hook_entry[hook]); |
| 290 | 290 | ||
| 291 | #ifdef CONFIG_NETFILTER_DEBUG | ||
| 292 | /* Check noone else using our table */ | ||
| 293 | if (((struct ip6t_entry *)table_base)->comefrom != 0xdead57ac | ||
| 294 | && ((struct ip6t_entry *)table_base)->comefrom != 0xeeeeeeec) { | ||
| 295 | printk("ASSERT: CPU #%u, %s comefrom(%p) = %X\n", | ||
| 296 | smp_processor_id(), | ||
| 297 | table->name, | ||
| 298 | &((struct ip6t_entry *)table_base)->comefrom, | ||
| 299 | ((struct ip6t_entry *)table_base)->comefrom); | ||
| 300 | } | ||
| 301 | ((struct ip6t_entry *)table_base)->comefrom = 0x57acc001; | ||
| 302 | #endif | ||
| 303 | |||
| 304 | /* For return from builtin chain */ | 291 | /* For return from builtin chain */ |
| 305 | back = get_entry(table_base, private->underflow[hook]); | 292 | back = get_entry(table_base, private->underflow[hook]); |
| 306 | 293 | ||
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index e581190fb6c3..f9b83f91371a 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
| @@ -178,9 +178,6 @@ static struct { | |||
| 178 | /* allocated slab cache + modules which uses this slab cache */ | 178 | /* allocated slab cache + modules which uses this slab cache */ |
| 179 | int use; | 179 | int use; |
| 180 | 180 | ||
| 181 | /* Initialization */ | ||
| 182 | int (*init_conntrack)(struct nf_conn *, u_int32_t); | ||
| 183 | |||
| 184 | } nf_ct_cache[NF_CT_F_NUM]; | 181 | } nf_ct_cache[NF_CT_F_NUM]; |
| 185 | 182 | ||
| 186 | /* protect members of nf_ct_cache except of "use" */ | 183 | /* protect members of nf_ct_cache except of "use" */ |
| @@ -208,10 +205,8 @@ nf_ct_proto_find_get(u_int16_t l3proto, u_int8_t protocol) | |||
| 208 | 205 | ||
| 209 | preempt_disable(); | 206 | preempt_disable(); |
| 210 | p = __nf_ct_proto_find(l3proto, protocol); | 207 | p = __nf_ct_proto_find(l3proto, protocol); |
| 211 | if (p) { | 208 | if (!try_module_get(p->me)) |
| 212 | if (!try_module_get(p->me)) | 209 | p = &nf_conntrack_generic_protocol; |
| 213 | p = &nf_conntrack_generic_protocol; | ||
| 214 | } | ||
| 215 | preempt_enable(); | 210 | preempt_enable(); |
| 216 | 211 | ||
| 217 | return p; | 212 | return p; |
| @@ -229,10 +224,8 @@ nf_ct_l3proto_find_get(u_int16_t l3proto) | |||
| 229 | 224 | ||
| 230 | preempt_disable(); | 225 | preempt_disable(); |
| 231 | p = __nf_ct_l3proto_find(l3proto); | 226 | p = __nf_ct_l3proto_find(l3proto); |
| 232 | if (p) { | 227 | if (!try_module_get(p->me)) |
| 233 | if (!try_module_get(p->me)) | 228 | p = &nf_conntrack_generic_l3proto; |
| 234 | p = &nf_conntrack_generic_l3proto; | ||
| 235 | } | ||
| 236 | preempt_enable(); | 229 | preempt_enable(); |
| 237 | 230 | ||
| 238 | return p; | 231 | return p; |
diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c index 7de4f06c63c5..3fc58e454d4e 100644 --- a/net/netfilter/nf_conntrack_l3proto_generic.c +++ b/net/netfilter/nf_conntrack_l3proto_generic.c | |||
| @@ -94,5 +94,4 @@ struct nf_conntrack_l3proto nf_conntrack_generic_l3proto = { | |||
| 94 | .print_conntrack = generic_print_conntrack, | 94 | .print_conntrack = generic_print_conntrack, |
| 95 | .prepare = generic_prepare, | 95 | .prepare = generic_prepare, |
| 96 | .get_features = generic_get_features, | 96 | .get_features = generic_get_features, |
| 97 | .me = THIS_MODULE, | ||
| 98 | }; | 97 | }; |
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 00cf0a4f4d92..17abf60f9570 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
| @@ -529,6 +529,7 @@ int xt_register_table(struct xt_table *table, | |||
| 529 | 529 | ||
| 530 | /* Simplifies replace_table code. */ | 530 | /* Simplifies replace_table code. */ |
| 531 | table->private = bootstrap; | 531 | table->private = bootstrap; |
| 532 | rwlock_init(&table->lock); | ||
| 532 | if (!xt_replace_table(table, 0, newinfo, &ret)) | 533 | if (!xt_replace_table(table, 0, newinfo, &ret)) |
| 533 | goto unlock; | 534 | goto unlock; |
| 534 | 535 | ||
| @@ -538,7 +539,6 @@ int xt_register_table(struct xt_table *table, | |||
| 538 | /* save number of initial entries */ | 539 | /* save number of initial entries */ |
| 539 | private->initial_entries = private->number; | 540 | private->initial_entries = private->number; |
| 540 | 541 | ||
| 541 | rwlock_init(&table->lock); | ||
| 542 | list_prepend(&xt[table->af].tables, table); | 542 | list_prepend(&xt[table->af].tables, table); |
| 543 | 543 | ||
| 544 | ret = 0; | 544 | ret = 0; |
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 6056d20ef429..37640c6fc014 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c | |||
| @@ -69,6 +69,11 @@ ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int hook) | |||
| 69 | DPRINTK("ipt_init_target: found %s\n", target->name); | 69 | DPRINTK("ipt_init_target: found %s\n", target->name); |
| 70 | t->u.kernel.target = target; | 70 | t->u.kernel.target = target; |
| 71 | 71 | ||
| 72 | ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t), | ||
| 73 | table, hook, 0, 0); | ||
| 74 | if (ret) | ||
| 75 | return ret; | ||
| 76 | |||
| 72 | if (t->u.kernel.target->checkentry | 77 | if (t->u.kernel.target->checkentry |
| 73 | && !t->u.kernel.target->checkentry(table, NULL, | 78 | && !t->u.kernel.target->checkentry(table, NULL, |
| 74 | t->u.kernel.target, t->data, | 79 | t->u.kernel.target, t->data, |
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c index 54dabf862802..a4ca7569e700 100644 --- a/sound/oss/ad1889.c +++ b/sound/oss/ad1889.c | |||
| @@ -75,7 +75,7 @@ static inline void ad1889_set_wav_rate(ad1889_dev_t *dev, int rate) | |||
| 75 | 75 | ||
| 76 | DBG("Setting WAV rate to %d\n", rate); | 76 | DBG("Setting WAV rate to %d\n", rate); |
| 77 | dev->state[AD_WAV_STATE].dmabuf.rate = rate; | 77 | dev->state[AD_WAV_STATE].dmabuf.rate = rate; |
| 78 | AD1889_WRITEW(dev, AD_DSWAS, rate); | 78 | AD1889_WRITEW(dev, AD_DS_WAS, rate); |
| 79 | 79 | ||
| 80 | /* Cycle the DAC to enable the new rate */ | 80 | /* Cycle the DAC to enable the new rate */ |
| 81 | ac97_codec->codec_write(dev->ac97_codec, AC97_POWER_CONTROL, 0x0200); | 81 | ac97_codec->codec_write(dev->ac97_codec, AC97_POWER_CONTROL, 0x0200); |
| @@ -89,14 +89,14 @@ static inline void ad1889_set_wav_fmt(ad1889_dev_t *dev, int fmt) | |||
| 89 | 89 | ||
| 90 | DBG("Setting WAV format to 0x%x\n", fmt); | 90 | DBG("Setting WAV format to 0x%x\n", fmt); |
| 91 | 91 | ||
| 92 | tmp = AD1889_READW(ad1889_dev, AD_DSWSMC); | 92 | tmp = AD1889_READW(ad1889_dev, AD_DS_WSMC); |
| 93 | if (fmt & AFMT_S16_LE) { | 93 | if (fmt & AFMT_S16_LE) { |
| 94 | //tmp |= 0x0100; /* set WA16 */ | 94 | //tmp |= 0x0100; /* set WA16 */ |
| 95 | tmp |= 0x0300; /* set WA16 stereo */ | 95 | tmp |= 0x0300; /* set WA16 stereo */ |
| 96 | } else if (fmt & AFMT_U8) { | 96 | } else if (fmt & AFMT_U8) { |
| 97 | tmp &= ~0x0100; /* clear WA16 */ | 97 | tmp &= ~0x0100; /* clear WA16 */ |
| 98 | } | 98 | } |
| 99 | AD1889_WRITEW(ad1889_dev, AD_DSWSMC, tmp); | 99 | AD1889_WRITEW(ad1889_dev, AD_DS_WSMC, tmp); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | static inline void ad1889_set_adc_fmt(ad1889_dev_t *dev, int fmt) | 102 | static inline void ad1889_set_adc_fmt(ad1889_dev_t *dev, int fmt) |
| @@ -105,13 +105,13 @@ static inline void ad1889_set_adc_fmt(ad1889_dev_t *dev, int fmt) | |||
| 105 | 105 | ||
| 106 | DBG("Setting ADC format to 0x%x\n", fmt); | 106 | DBG("Setting ADC format to 0x%x\n", fmt); |
| 107 | 107 | ||
| 108 | tmp = AD1889_READW(ad1889_dev, AD_DSRAMC); | 108 | tmp = AD1889_READW(ad1889_dev, AD_DS_RAMC); |
| 109 | if (fmt & AFMT_S16_LE) { | 109 | if (fmt & AFMT_S16_LE) { |
| 110 | tmp |= 0x0100; /* set WA16 */ | 110 | tmp |= 0x0100; /* set WA16 */ |
| 111 | } else if (fmt & AFMT_U8) { | 111 | } else if (fmt & AFMT_U8) { |
| 112 | tmp &= ~0x0100; /* clear WA16 */ | 112 | tmp &= ~0x0100; /* clear WA16 */ |
| 113 | } | 113 | } |
| 114 | AD1889_WRITEW(ad1889_dev, AD_DSRAMC, tmp); | 114 | AD1889_WRITEW(ad1889_dev, AD_DS_RAMC, tmp); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | static void ad1889_start_wav(ad1889_state_t *state) | 117 | static void ad1889_start_wav(ad1889_state_t *state) |
| @@ -145,21 +145,21 @@ static void ad1889_start_wav(ad1889_state_t *state) | |||
| 145 | dmabuf->rd_ptr, dmabuf->dma_len); | 145 | dmabuf->rd_ptr, dmabuf->dma_len); |
| 146 | 146 | ||
| 147 | /* load up the current register set */ | 147 | /* load up the current register set */ |
| 148 | AD1889_WRITEL(ad1889_dev, AD_DMAWAVCC, cnt); | 148 | AD1889_WRITEL(ad1889_dev, AD_DMA_WAVCC, cnt); |
| 149 | AD1889_WRITEL(ad1889_dev, AD_DMAWAVICC, cnt); | 149 | AD1889_WRITEL(ad1889_dev, AD_DMA_WAVICC, cnt); |
| 150 | AD1889_WRITEL(ad1889_dev, AD_DMAWAVCA, dmabuf->dma_handle); | 150 | AD1889_WRITEL(ad1889_dev, AD_DMA_WAVCA, dmabuf->dma_handle); |
| 151 | 151 | ||
| 152 | /* TODO: for now we load the base registers with the same thing */ | 152 | /* TODO: for now we load the base registers with the same thing */ |
| 153 | AD1889_WRITEL(ad1889_dev, AD_DMAWAVBC, cnt); | 153 | AD1889_WRITEL(ad1889_dev, AD_DMA_WAVBC, cnt); |
| 154 | AD1889_WRITEL(ad1889_dev, AD_DMAWAVIBC, cnt); | 154 | AD1889_WRITEL(ad1889_dev, AD_DMA_WAVIBC, cnt); |
| 155 | AD1889_WRITEL(ad1889_dev, AD_DMAWAVBA, dmabuf->dma_handle); | 155 | AD1889_WRITEL(ad1889_dev, AD_DMA_WAVBA, dmabuf->dma_handle); |
| 156 | 156 | ||
| 157 | /* and we're off to the races... */ | 157 | /* and we're off to the races... */ |
| 158 | AD1889_WRITEL(ad1889_dev, AD_DMACHSS, 0x8); | 158 | AD1889_WRITEL(ad1889_dev, AD_DMA_CHSS, 0x8); |
| 159 | tmp = AD1889_READW(ad1889_dev, AD_DSWSMC); | 159 | tmp = AD1889_READW(ad1889_dev, AD_DS_WSMC); |
| 160 | tmp |= 0x0400; /* set WAEN */ | 160 | tmp |= 0x0400; /* set WAEN */ |
| 161 | AD1889_WRITEW(ad1889_dev, AD_DSWSMC, tmp); | 161 | AD1889_WRITEW(ad1889_dev, AD_DS_WSMC, tmp); |
| 162 | (void) AD1889_READW(ad1889_dev, AD_DSWSMC); /* flush posted PCI write */ | 162 | (void) AD1889_READW(ad1889_dev, AD_DS_WSMC); /* flush posted PCI write */ |
| 163 | 163 | ||
| 164 | dmabuf->enable |= DAC_RUNNING; | 164 | dmabuf->enable |= DAC_RUNNING; |
| 165 | 165 | ||
| @@ -179,10 +179,10 @@ static void ad1889_stop_wav(ad1889_state_t *state) | |||
| 179 | u16 tmp; | 179 | u16 tmp; |
| 180 | unsigned long cnt = dmabuf->dma_len; | 180 | unsigned long cnt = dmabuf->dma_len; |
| 181 | 181 | ||
| 182 | tmp = AD1889_READW(ad1889_dev, AD_DSWSMC); | 182 | tmp = AD1889_READW(ad1889_dev, AD_DS_WSMC); |
| 183 | tmp &= ~0x0400; /* clear WAEN */ | 183 | tmp &= ~0x0400; /* clear WAEN */ |
| 184 | AD1889_WRITEW(ad1889_dev, AD_DSWSMC, tmp); | 184 | AD1889_WRITEW(ad1889_dev, AD_DS_WSMC, tmp); |
| 185 | (void) AD1889_READW(ad1889_dev, AD_DSWSMC); /* flush posted PCI write */ | 185 | (void) AD1889_READW(ad1889_dev, AD_DS_WSMC); /* flush posted PCI write */ |
| 186 | pci_unmap_single(ad1889_dev->pci, dmabuf->dma_handle, | 186 | pci_unmap_single(ad1889_dev->pci, dmabuf->dma_handle, |
| 187 | cnt, PCI_DMA_TODEVICE); | 187 | cnt, PCI_DMA_TODEVICE); |
| 188 | 188 | ||
| @@ -211,7 +211,7 @@ static void ad1889_startstop_adc(ad1889_state_t *state, int start) | |||
| 211 | 211 | ||
| 212 | spin_lock_irqsave(&state->card->lock, flags); | 212 | spin_lock_irqsave(&state->card->lock, flags); |
| 213 | 213 | ||
| 214 | tmp = AD1889_READW(ad1889_dev, AD_DSRAMC); | 214 | tmp = AD1889_READW(ad1889_dev, AD_DS_RAMC); |
| 215 | if (start) { | 215 | if (start) { |
| 216 | state->dmabuf.enable |= ADC_RUNNING; | 216 | state->dmabuf.enable |= ADC_RUNNING; |
| 217 | tmp |= 0x0004; /* set ADEN */ | 217 | tmp |= 0x0004; /* set ADEN */ |
| @@ -219,7 +219,7 @@ static void ad1889_startstop_adc(ad1889_state_t *state, int start) | |||
| 219 | state->dmabuf.enable &= ~ADC_RUNNING; | 219 | state->dmabuf.enable &= ~ADC_RUNNING; |
| 220 | tmp &= ~0x0004; /* clear ADEN */ | 220 | tmp &= ~0x0004; /* clear ADEN */ |
| 221 | } | 221 | } |
| 222 | AD1889_WRITEW(ad1889_dev, AD_DSRAMC, tmp); | 222 | AD1889_WRITEW(ad1889_dev, AD_DS_RAMC, tmp); |
| 223 | 223 | ||
| 224 | spin_unlock_irqrestore(&state->card->lock, flags); | 224 | spin_unlock_irqrestore(&state->card->lock, flags); |
| 225 | } | 225 | } |
| @@ -301,53 +301,53 @@ static int ad1889_read_proc (char *page, char **start, off_t off, | |||
| 301 | int len, i; | 301 | int len, i; |
| 302 | ad1889_dev_t *dev = data; | 302 | ad1889_dev_t *dev = data; |
| 303 | ad1889_reg_t regs[] = { | 303 | ad1889_reg_t regs[] = { |
| 304 | { "WSMC", AD_DSWSMC, 16 }, | 304 | { "WSMC", AD_DS_WSMC, 16 }, |
| 305 | { "RAMC", AD_DSRAMC, 16 }, | 305 | { "RAMC", AD_DS_RAMC, 16 }, |
| 306 | { "WADA", AD_DSWADA, 16 }, | 306 | { "WADA", AD_DS_WADA, 16 }, |
| 307 | { "SYDA", AD_DSSYDA, 16 }, | 307 | { "SYDA", AD_DS_SYDA, 16 }, |
| 308 | { "WAS", AD_DSWAS, 16 }, | 308 | { "WAS", AD_DS_WAS, 16 }, |
| 309 | { "RES", AD_DSRES, 16 }, | 309 | { "RES", AD_DS_RES, 16 }, |
| 310 | { "CCS", AD_DSCCS, 16 }, | 310 | { "CCS", AD_DS_CCS, 16 }, |
| 311 | { "ADCBA", AD_DMAADCBA, 32 }, | 311 | { "ADCBA", AD_DMA_ADCBA, 32 }, |
| 312 | { "ADCCA", AD_DMAADCCA, 32 }, | 312 | { "ADCCA", AD_DMA_ADCCA, 32 }, |
| 313 | { "ADCBC", AD_DMAADCBC, 32 }, | 313 | { "ADCBC", AD_DMA_ADCBC, 32 }, |
| 314 | { "ADCCC", AD_DMAADCCC, 32 }, | 314 | { "ADCCC", AD_DMA_ADCCC, 32 }, |
| 315 | { "ADCIBC", AD_DMAADCIBC, 32 }, | 315 | { "ADCIBC", AD_DMA_ADCIBC, 32 }, |
| 316 | { "ADCICC", AD_DMAADCICC, 32 }, | 316 | { "ADCICC", AD_DMA_ADCICC, 32 }, |
| 317 | { "ADCCTRL", AD_DMAADCCTRL, 16 }, | 317 | { "ADCCTRL", AD_DMA_ADCCTRL, 16 }, |
| 318 | { "WAVBA", AD_DMAWAVBA, 32 }, | 318 | { "WAVBA", AD_DMA_WAVBA, 32 }, |
| 319 | { "WAVCA", AD_DMAWAVCA, 32 }, | 319 | { "WAVCA", AD_DMA_WAVCA, 32 }, |
| 320 | { "WAVBC", AD_DMAWAVBC, 32 }, | 320 | { "WAVBC", AD_DMA_WAVBC, 32 }, |
| 321 | { "WAVCC", AD_DMAWAVCC, 32 }, | 321 | { "WAVCC", AD_DMA_WAVCC, 32 }, |
| 322 | { "WAVIBC", AD_DMAWAVIBC, 32 }, | 322 | { "WAVIBC", AD_DMA_WAVIBC, 32 }, |
| 323 | { "WAVICC", AD_DMAWAVICC, 32 }, | 323 | { "WAVICC", AD_DMA_WAVICC, 32 }, |
| 324 | { "WAVCTRL", AD_DMAWAVCTRL, 16 }, | 324 | { "WAVCTRL", AD_DMA_WAVCTRL, 16 }, |
| 325 | { "DISR", AD_DMADISR, 32 }, | 325 | { "DISR", AD_DMA_DISR, 32 }, |
| 326 | { "CHSS", AD_DMACHSS, 32 }, | 326 | { "CHSS", AD_DMA_CHSS, 32 }, |
| 327 | { "IPC", AD_GPIOIPC, 16 }, | 327 | { "IPC", AD_GPIO_IPC, 16 }, |
| 328 | { "OP", AD_GPIOOP, 16 }, | 328 | { "OP", AD_GPIO_OP, 16 }, |
| 329 | { "IP", AD_GPIOIP, 16 }, | 329 | { "IP", AD_GPIO_IP, 16 }, |
| 330 | { "ACIC", AD_ACIC, 16 }, | 330 | { "ACIC", AD_AC97_ACIC, 16 }, |
| 331 | { "AC97_RESET", 0x100 + AC97_RESET, 16 }, | 331 | { "AC97_RESET", AD_AC97_BASE + AC97_RESET, 16 }, |
| 332 | { "AC97_MASTER_VOL_STEREO", 0x100 + AC97_MASTER_VOL_STEREO, 16 }, | 332 | { "AC97_MASTER_VOL_STEREO", AD_AC97_BASE + AC97_MASTER_VOL_STEREO, 16 }, |
| 333 | { "AC97_HEADPHONE_VOL", 0x100 + AC97_HEADPHONE_VOL, 16 }, | 333 | { "AC97_HEADPHONE_VOL", AD_AC97_BASE + AC97_HEADPHONE_VOL, 16 }, |
| 334 | { "AC97_MASTER_VOL_MONO", 0x100 + AC97_MASTER_VOL_MONO, 16 }, | 334 | { "AC97_MASTER_VOL_MONO", AD_AC97_BASE + AC97_MASTER_VOL_MONO, 16 }, |
| 335 | { "AC97_MASTER_TONE", 0x100 + AC97_MASTER_TONE, 16 }, | 335 | { "AC97_MASTER_TONE", AD_AC97_BASE + AC97_MASTER_TONE, 16 }, |
| 336 | { "AC97_PCBEEP_VOL", 0x100 + AC97_PCBEEP_VOL, 16 }, | 336 | { "AC97_PCBEEP_VOL", AD_AC97_BASE + AC97_PCBEEP_VOL, 16 }, |
| 337 | { "AC97_PHONE_VOL", 0x100 + AC97_PHONE_VOL, 16 }, | 337 | { "AC97_PHONE_VOL", AD_AC97_BASE + AC97_PHONE_VOL, 16 }, |
| 338 | { "AC97_MIC_VOL", 0x100 + AC97_MIC_VOL, 16 }, | 338 | { "AC97_MIC_VOL", AD_AC97_BASE + AC97_MIC_VOL, 16 }, |
| 339 | { "AC97_LINEIN_VOL", 0x100 + AC97_LINEIN_VOL, 16 }, | 339 | { "AC97_LINEIN_VOL", AD_AC97_BASE + AC97_LINEIN_VOL, 16 }, |
| 340 | { "AC97_CD_VOL", 0x100 + AC97_CD_VOL, 16 }, | 340 | { "AC97_CD_VOL", AD_AC97_BASE + AC97_CD_VOL, 16 }, |
| 341 | { "AC97_VIDEO_VOL", 0x100 + AC97_VIDEO_VOL, 16 }, | 341 | { "AC97_VIDEO_VOL", AD_AC97_BASE + AC97_VIDEO_VOL, 16 }, |
| 342 | { "AC97_AUX_VOL", 0x100 + AC97_AUX_VOL, 16 }, | 342 | { "AC97_AUX_VOL", AD_AC97_BASE + AC97_AUX_VOL, 16 }, |
| 343 | { "AC97_PCMOUT_VOL", 0x100 + AC97_PCMOUT_VOL, 16 }, | 343 | { "AC97_PCMOUT_VOL", AD_AC97_BASE + AC97_PCMOUT_VOL, 16 }, |
| 344 | { "AC97_RECORD_SELECT", 0x100 + AC97_RECORD_SELECT, 16 }, | 344 | { "AC97_RECORD_SELECT", AD_AC97_BASE + AC97_RECORD_SELECT, 16 }, |
| 345 | { "AC97_RECORD_GAIN", 0x100 + AC97_RECORD_GAIN, 16 }, | 345 | { "AC97_RECORD_GAIN", AD_AC97_BASE + AC97_RECORD_GAIN, 16 }, |
| 346 | { "AC97_RECORD_GAIN_MIC", 0x100 + AC97_RECORD_GAIN_MIC, 16 }, | 346 | { "AC97_RECORD_GAIN_MIC", AD_AC97_BASE + AC97_RECORD_GAIN_MIC, 16 }, |
| 347 | { "AC97_GENERAL_PURPOSE", 0x100 + AC97_GENERAL_PURPOSE, 16 }, | 347 | { "AC97_GENERAL_PURPOSE", AD_AC97_BASE + AC97_GENERAL_PURPOSE, 16 }, |
| 348 | { "AC97_3D_CONTROL", 0x100 + AC97_3D_CONTROL, 16 }, | 348 | { "AC97_3D_CONTROL", AD_AC97_BASE + AC97_3D_CONTROL, 16 }, |
| 349 | { "AC97_MODEM_RATE", 0x100 + AC97_MODEM_RATE, 16 }, | 349 | { "AC97_MODEM_RATE", AD_AC97_BASE + AC97_MODEM_RATE, 16 }, |
| 350 | { "AC97_POWER_CONTROL", 0x100 + AC97_POWER_CONTROL, 16 }, | 350 | { "AC97_POWER_CONTROL", AD_AC97_BASE + AC97_POWER_CONTROL, 16 }, |
| 351 | { NULL } | 351 | { NULL } |
| 352 | }; | 352 | }; |
| 353 | 353 | ||
| @@ -400,9 +400,9 @@ static inline unsigned long ad1889_get_dma_addr(ad1889_state_t *state) | |||
| 400 | } | 400 | } |
| 401 | 401 | ||
| 402 | if (dmabuf->enable & DAC_RUNNING) | 402 | if (dmabuf->enable & DAC_RUNNING) |
| 403 | offset = le32_to_cpu(AD1889_READL(state->card, AD_DMAWAVBA)); | 403 | offset = le32_to_cpu(AD1889_READL(state->card, AD_DMA_WAVBA)); |
| 404 | else | 404 | else |
| 405 | offset = le32_to_cpu(AD1889_READL(state->card, AD_DMAADCBA)); | 405 | offset = le32_to_cpu(AD1889_READL(state->card, AD_DMA_ADCBA)); |
| 406 | 406 | ||
| 407 | return (unsigned long)bus_to_virt((unsigned long)offset) - (unsigned long)dmabuf->rawbuf; | 407 | return (unsigned long)bus_to_virt((unsigned long)offset) - (unsigned long)dmabuf->rawbuf; |
| 408 | } | 408 | } |
| @@ -639,9 +639,9 @@ static int ad1889_ioctl(struct inode *inode, struct file *file, unsigned int cmd | |||
| 639 | if (val > 5400 && val < 48000) | 639 | if (val > 5400 && val < 48000) |
| 640 | { | 640 | { |
| 641 | if (file->f_mode & FMODE_WRITE) | 641 | if (file->f_mode & FMODE_WRITE) |
| 642 | AD1889_WRITEW(ad1889_dev, AD_DSWAS, val); | 642 | AD1889_WRITEW(ad1889_dev, AD_DS_WAS, val); |
| 643 | if (file->f_mode & FMODE_READ) | 643 | if (file->f_mode & FMODE_READ) |
| 644 | AD1889_WRITEW(ad1889_dev, AD_DSRES, val); | 644 | AD1889_WRITEW(ad1889_dev, AD_DS_RES, val); |
| 645 | } | 645 | } |
| 646 | return 0; | 646 | return 0; |
| 647 | 647 | ||
| @@ -649,22 +649,22 @@ static int ad1889_ioctl(struct inode *inode, struct file *file, unsigned int cmd | |||
| 649 | if (get_user(val, p)) | 649 | if (get_user(val, p)) |
| 650 | return -EFAULT; | 650 | return -EFAULT; |
| 651 | if (file->f_mode & FMODE_READ) { | 651 | if (file->f_mode & FMODE_READ) { |
| 652 | val = AD1889_READW(ad1889_dev, AD_DSWSMC); | 652 | val = AD1889_READW(ad1889_dev, AD_DS_WSMC); |
| 653 | if (val) { | 653 | if (val) { |
| 654 | val |= 0x0200; /* set WAST */ | 654 | val |= 0x0200; /* set WAST */ |
| 655 | } else { | 655 | } else { |
| 656 | val &= ~0x0200; /* clear WAST */ | 656 | val &= ~0x0200; /* clear WAST */ |
| 657 | } | 657 | } |
| 658 | AD1889_WRITEW(ad1889_dev, AD_DSWSMC, val); | 658 | AD1889_WRITEW(ad1889_dev, AD_DS_WSMC, val); |
| 659 | } | 659 | } |
| 660 | if (file->f_mode & FMODE_WRITE) { | 660 | if (file->f_mode & FMODE_WRITE) { |
| 661 | val = AD1889_READW(ad1889_dev, AD_DSRAMC); | 661 | val = AD1889_READW(ad1889_dev, AD_DS_RAMC); |
| 662 | if (val) { | 662 | if (val) { |
| 663 | val |= 0x0002; /* set ADST */ | 663 | val |= 0x0002; /* set ADST */ |
| 664 | } else { | 664 | } else { |
| 665 | val &= ~0x0002; /* clear ADST */ | 665 | val &= ~0x0002; /* clear ADST */ |
| 666 | } | 666 | } |
| 667 | AD1889_WRITEW(ad1889_dev, AD_DSRAMC, val); | 667 | AD1889_WRITEW(ad1889_dev, AD_DS_RAMC, val); |
| 668 | } | 668 | } |
| 669 | 669 | ||
| 670 | return 0; | 670 | return 0; |
| @@ -739,7 +739,7 @@ static int ad1889_ioctl(struct inode *inode, struct file *file, unsigned int cmd | |||
| 739 | break; | 739 | break; |
| 740 | 740 | ||
| 741 | case SOUND_PCM_READ_RATE: | 741 | case SOUND_PCM_READ_RATE: |
| 742 | return put_user(AD1889_READW(ad1889_dev, AD_DSWAS), p); | 742 | return put_user(AD1889_READW(ad1889_dev, AD_DS_WAS), p); |
| 743 | 743 | ||
| 744 | case SOUND_PCM_READ_CHANNELS: | 744 | case SOUND_PCM_READ_CHANNELS: |
| 745 | case SOUND_PCM_READ_BITS: | 745 | case SOUND_PCM_READ_BITS: |
| @@ -769,7 +769,7 @@ static int ad1889_open(struct inode *inode, struct file *file) | |||
| 769 | 769 | ||
| 770 | ad1889_set_wav_rate(ad1889_dev, 48000); | 770 | ad1889_set_wav_rate(ad1889_dev, 48000); |
| 771 | ad1889_set_wav_fmt(ad1889_dev, AFMT_S16_LE); | 771 | ad1889_set_wav_fmt(ad1889_dev, AFMT_S16_LE); |
| 772 | AD1889_WRITEW(ad1889_dev, AD_DSWADA, 0x0404); /* attenuation */ | 772 | AD1889_WRITEW(ad1889_dev, AD_DS_WADA, 0x0404); /* attenuation */ |
| 773 | return nonseekable_open(inode, file); | 773 | return nonseekable_open(inode, file); |
| 774 | } | 774 | } |
| 775 | 775 | ||
| @@ -826,15 +826,15 @@ static void ad1889_codec_write(struct ac97_codec *ac97, u8 reg, u16 val) | |||
| 826 | { | 826 | { |
| 827 | ad1889_dev_t *dev = ac97->private_data; | 827 | ad1889_dev_t *dev = ac97->private_data; |
| 828 | 828 | ||
| 829 | //DBG("Writing 0x%x to 0x%lx\n", val, dev->regbase + 0x100 + reg); | 829 | //DBG("Writing 0x%x to 0x%lx\n", val, dev->regbase + AD_AC97_BASE + reg); |
| 830 | AD1889_WRITEW(dev, 0x100 + reg, val); | 830 | AD1889_WRITEW(dev, AD_AC97_BASE + reg, val); |
| 831 | } | 831 | } |
| 832 | 832 | ||
| 833 | static u16 ad1889_codec_read(struct ac97_codec *ac97, u8 reg) | 833 | static u16 ad1889_codec_read(struct ac97_codec *ac97, u8 reg) |
| 834 | { | 834 | { |
| 835 | ad1889_dev_t *dev = ac97->private_data; | 835 | ad1889_dev_t *dev = ac97->private_data; |
| 836 | //DBG("Reading from 0x%lx\n", dev->regbase + 0x100 + reg); | 836 | //DBG("Reading from 0x%lx\n", dev->regbase + AD_AC97_BASE + reg); |
| 837 | return AD1889_READW(dev, 0x100 + reg); | 837 | return AD1889_READW(dev, AD_AC97_BASE + reg); |
| 838 | } | 838 | } |
| 839 | 839 | ||
| 840 | static int ad1889_ac97_init(ad1889_dev_t *dev, int id) | 840 | static int ad1889_ac97_init(ad1889_dev_t *dev, int id) |
| @@ -883,24 +883,24 @@ static int ad1889_aclink_reset(struct pci_dev * pcidev) | |||
| 883 | int retry = 200; | 883 | int retry = 200; |
| 884 | ad1889_dev_t *dev = pci_get_drvdata(pcidev); | 884 | ad1889_dev_t *dev = pci_get_drvdata(pcidev); |
| 885 | 885 | ||
| 886 | AD1889_WRITEW(dev, AD_DSCCS, 0x8000); /* turn on clock */ | 886 | AD1889_WRITEW(dev, AD_DS_CCS, 0x8000); /* turn on clock */ |
| 887 | AD1889_READW(dev, AD_DSCCS); | 887 | AD1889_READW(dev, AD_DS_CCS); |
| 888 | 888 | ||
| 889 | WAIT_10MS(); | 889 | WAIT_10MS(); |
| 890 | 890 | ||
| 891 | stat = AD1889_READW(dev, AD_ACIC); | 891 | stat = AD1889_READW(dev, AD_AC97_ACIC); |
| 892 | stat |= 0x0002; /* Reset Disable */ | 892 | stat |= 0x0002; /* Reset Disable */ |
| 893 | AD1889_WRITEW(dev, AD_ACIC, stat); | 893 | AD1889_WRITEW(dev, AD_AC97_ACIC, stat); |
| 894 | (void) AD1889_READW(dev, AD_ACIC); /* flush posted write */ | 894 | (void) AD1889_READW(dev, AD_AC97_ACIC); /* flush posted write */ |
| 895 | 895 | ||
| 896 | udelay(10); | 896 | udelay(10); |
| 897 | 897 | ||
| 898 | stat = AD1889_READW(dev, AD_ACIC); | 898 | stat = AD1889_READW(dev, AD_AC97_ACIC); |
| 899 | stat |= 0x0001; /* Interface Enable */ | 899 | stat |= 0x0001; /* Interface Enable */ |
| 900 | AD1889_WRITEW(dev, AD_ACIC, stat); | 900 | AD1889_WRITEW(dev, AD_AC97_ACIC, stat); |
| 901 | 901 | ||
| 902 | do { | 902 | do { |
| 903 | if (AD1889_READW(dev, AD_ACIC) & 0x8000) /* Ready */ | 903 | if (AD1889_READW(dev, AD_AC97_ACIC) & 0x8000) /* Ready */ |
| 904 | break; | 904 | break; |
| 905 | WAIT_10MS(); | 905 | WAIT_10MS(); |
| 906 | retry--; | 906 | retry--; |
| @@ -908,16 +908,16 @@ static int ad1889_aclink_reset(struct pci_dev * pcidev) | |||
| 908 | 908 | ||
| 909 | if (!retry) { | 909 | if (!retry) { |
| 910 | printk(KERN_ERR "ad1889_aclink_reset: codec is not ready [0x%x]\n", | 910 | printk(KERN_ERR "ad1889_aclink_reset: codec is not ready [0x%x]\n", |
| 911 | AD1889_READW(dev, AD_ACIC)); | 911 | AD1889_READW(dev, AD_AC97_ACIC)); |
| 912 | return -EBUSY; | 912 | return -EBUSY; |
| 913 | } | 913 | } |
| 914 | 914 | ||
| 915 | /* TODO reset AC97 codec */ | 915 | /* TODO reset AC97 codec */ |
| 916 | /* TODO set wave/adc pci ctrl status */ | 916 | /* TODO set wave/adc pci ctrl status */ |
| 917 | 917 | ||
| 918 | stat = AD1889_READW(dev, AD_ACIC); | 918 | stat = AD1889_READW(dev, AD_AC97_ACIC); |
| 919 | stat |= 0x0004; /* Audio Stream Output Enable */ | 919 | stat |= 0x0004; /* Audio Stream Output Enable */ |
| 920 | AD1889_WRITEW(dev, AD_ACIC, stat); | 920 | AD1889_WRITEW(dev, AD_AC97_ACIC, stat); |
| 921 | return 0; | 921 | return 0; |
| 922 | } | 922 | } |
| 923 | 923 | ||
| @@ -935,10 +935,10 @@ static irqreturn_t ad1889_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 935 | u32 stat; | 935 | u32 stat; |
| 936 | ad1889_dev_t *dev = (ad1889_dev_t *)dev_id; | 936 | ad1889_dev_t *dev = (ad1889_dev_t *)dev_id; |
| 937 | 937 | ||
| 938 | stat = AD1889_READL(dev, AD_DMADISR); | 938 | stat = AD1889_READL(dev, AD_DMA_DISR); |
| 939 | 939 | ||
| 940 | /* clear ISR */ | 940 | /* clear ISR */ |
| 941 | AD1889_WRITEL(dev, AD_DMADISR, stat); | 941 | AD1889_WRITEL(dev, AD_DMA_DISR, stat); |
| 942 | 942 | ||
| 943 | if (stat & 0x8) { /* WAVI */ | 943 | if (stat & 0x8) { /* WAVI */ |
| 944 | DBG("WAV interrupt\n"); | 944 | DBG("WAV interrupt\n"); |
| @@ -964,15 +964,15 @@ static void ad1889_initcfg(ad1889_dev_t *dev) | |||
| 964 | u32 tmp32; | 964 | u32 tmp32; |
| 965 | 965 | ||
| 966 | /* make sure the interrupt bits are setup the way we want */ | 966 | /* make sure the interrupt bits are setup the way we want */ |
| 967 | tmp32 = AD1889_READL(dev, AD_DMAWAVCTRL); | 967 | tmp32 = AD1889_READL(dev, AD_DMA_WAVCTRL); |
| 968 | tmp32 &= ~0xff; /* flat dma, no sg, mask out the intr bits */ | 968 | tmp32 &= ~0xff; /* flat dma, no sg, mask out the intr bits */ |
| 969 | tmp32 |= 0x6; /* intr on count, loop */ | 969 | tmp32 |= 0x6; /* intr on count, loop */ |
| 970 | AD1889_WRITEL(dev, AD_DMAWAVCTRL, tmp32); | 970 | AD1889_WRITEL(dev, AD_DMA_WAVCTRL, tmp32); |
| 971 | 971 | ||
| 972 | /* unmute... */ | 972 | /* unmute... */ |
| 973 | tmp16 = AD1889_READW(dev, AD_DSWADA); | 973 | tmp16 = AD1889_READW(dev, AD_DS_WADA); |
| 974 | tmp16 &= ~0x8080; | 974 | tmp16 &= ~0x8080; |
| 975 | AD1889_WRITEW(dev, AD_DSWADA, tmp16); | 975 | AD1889_WRITEW(dev, AD_DS_WADA, tmp16); |
| 976 | } | 976 | } |
| 977 | 977 | ||
| 978 | static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) | 978 | static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) |
| @@ -1005,7 +1005,7 @@ static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_devic | |||
| 1005 | goto out1; | 1005 | goto out1; |
| 1006 | } | 1006 | } |
| 1007 | 1007 | ||
| 1008 | dev->regbase = ioremap_nocache(bar, AD_DSIOMEMSIZE); | 1008 | dev->regbase = ioremap_nocache(bar, AD_DS_IOMEMSIZE); |
| 1009 | if (!dev->regbase) { | 1009 | if (!dev->regbase) { |
| 1010 | printk(KERN_ERR DEVNAME ": unable to remap iomem\n"); | 1010 | printk(KERN_ERR DEVNAME ": unable to remap iomem\n"); |
| 1011 | goto out2; | 1011 | goto out2; |
diff --git a/sound/oss/ad1889.h b/sound/oss/ad1889.h index 861b3213f30b..09913765967a 100644 --- a/sound/oss/ad1889.h +++ b/sound/oss/ad1889.h | |||
| @@ -1,57 +1,58 @@ | |||
| 1 | #ifndef _AD1889_H_ | 1 | #ifndef _AD1889_H_ |
| 2 | #define _AD1889_H_ | 2 | #define _AD1889_H_ |
| 3 | 3 | ||
| 4 | #define AD_DSWSMC 0x00 /* DMA input wave/syn mixer control */ | 4 | #define AD_DS_WSMC 0x00 /* DMA input wave/syn mixer control */ |
| 5 | #define AD_DSRAMC 0x02 /* DMA output resamp/ADC mixer control */ | 5 | #define AD_DS_RAMC 0x02 /* DMA output resamp/ADC mixer control */ |
| 6 | #define AD_DSWADA 0x04 /* DMA input wave attenuation */ | 6 | #define AD_DS_WADA 0x04 /* DMA input wave attenuation */ |
| 7 | #define AD_DSSYDA 0x06 /* DMA input syn attentuation */ | 7 | #define AD_DS_SYDA 0x06 /* DMA input syn attentuation */ |
| 8 | #define AD_DSWAS 0x08 /* wave input sample rate */ | 8 | #define AD_DS_WAS 0x08 /* wave input sample rate */ |
| 9 | #define AD_DSRES 0x0a /* resampler output sample rate */ | 9 | #define AD_DS_RES 0x0a /* resampler output sample rate */ |
| 10 | #define AD_DSCCS 0x0c /* chip control/status */ | 10 | #define AD_DS_CCS 0x0c /* chip control/status */ |
| 11 | 11 | ||
| 12 | #define AD_DMARESBA 0x40 /* RES base addr */ | 12 | #define AD_DMA_RESBA 0x40 /* RES base addr */ |
| 13 | #define AD_DMARESCA 0x44 /* RES current addr */ | 13 | #define AD_DMA_RESCA 0x44 /* RES current addr */ |
| 14 | #define AD_DMARESBC 0x48 /* RES base cnt */ | 14 | #define AD_DMA_RESBC 0x48 /* RES base cnt */ |
| 15 | #define AD_DMARESCC 0x4c /* RES current count */ | 15 | #define AD_DMA_RESCC 0x4c /* RES current count */ |
| 16 | #define AD_DMAADCBA 0x50 /* ADC */ | 16 | #define AD_DMA_ADCBA 0x50 /* ADC */ |
| 17 | #define AD_DMAADCCA 0x54 | 17 | #define AD_DMA_ADCCA 0x54 |
| 18 | #define AD_DMAADCBC 0x58 | 18 | #define AD_DMA_ADCBC 0x58 |
| 19 | #define AD_DMAADCCC 0x5c | 19 | #define AD_DMA_ADCCC 0x5c |
| 20 | #define AD_DMASYNBA 0x60 /* SYN */ | 20 | #define AD_DMA_SYNBA 0x60 /* SYN */ |
| 21 | #define AD_DMASYNCA 0x64 | 21 | #define AD_DMA_SYNCA 0x64 |
| 22 | #define AD_DMASYNBC 0x68 | 22 | #define AD_DMA_SYNBC 0x68 |
| 23 | #define AD_DMASYNCC 0x6c | 23 | #define AD_DMA_SYNCC 0x6c |
| 24 | #define AD_DMAWAVBA 0x70 /* WAV */ | 24 | #define AD_DMA_WAVBA 0x70 /* WAV */ |
| 25 | #define AD_DMAWAVCA 0x74 | 25 | #define AD_DMA_WAVCA 0x74 |
| 26 | #define AD_DMAWAVBC 0x78 | 26 | #define AD_DMA_WAVBC 0x78 |
| 27 | #define AD_DMAWAVCC 0x7c | 27 | #define AD_DMA_WAVCC 0x7c |
| 28 | #define AD_DMARESICC 0x80 /* RES interrupt current count */ | 28 | #define AD_DMA_RESICC 0x80 /* RES interrupt current count */ |
| 29 | #define AD_DMARESIBC 0x84 /* RES interrupt base count */ | 29 | #define AD_DMA_RESIBC 0x84 /* RES interrupt base count */ |
| 30 | #define AD_DMAADCICC 0x88 /* ADC interrupt current count */ | 30 | #define AD_DMA_ADCICC 0x88 /* ADC interrupt current count */ |
| 31 | #define AD_DMAADCIBC 0x8c /* ADC interrupt base count */ | 31 | #define AD_DMA_ADCIBC 0x8c /* ADC interrupt base count */ |
| 32 | #define AD_DMASYNICC 0x90 /* SYN interrupt current count */ | 32 | #define AD_DMA_SYNICC 0x90 /* SYN interrupt current count */ |
| 33 | #define AD_DMASYNIBC 0x94 /* SYN interrupt base count */ | 33 | #define AD_DMA_SYNIBC 0x94 /* SYN interrupt base count */ |
| 34 | #define AD_DMAWAVICC 0x98 /* WAV interrupt current count */ | 34 | #define AD_DMA_WAVICC 0x98 /* WAV interrupt current count */ |
| 35 | #define AD_DMAWAVIBC 0x9c /* WAV interrupt base count */ | 35 | #define AD_DMA_WAVIBC 0x9c /* WAV interrupt base count */ |
| 36 | #define AD_DMARESCTRL 0xa0 /* RES PCI control/status */ | 36 | #define AD_DMA_RESCTRL 0xa0 /* RES PCI control/status */ |
| 37 | #define AD_DMAADCCTRL 0xa8 /* ADC PCI control/status */ | 37 | #define AD_DMA_ADCCTRL 0xa8 /* ADC PCI control/status */ |
| 38 | #define AD_DMASYNCTRL 0xb0 /* SYN PCI control/status */ | 38 | #define AD_DMA_SYNCTRL 0xb0 /* SYN PCI control/status */ |
| 39 | #define AD_DMAWAVCTRL 0xb8 /* WAV PCI control/status */ | 39 | #define AD_DMA_WAVCTRL 0xb8 /* WAV PCI control/status */ |
| 40 | #define AD_DMADISR 0xc0 /* PCI DMA intr status */ | 40 | #define AD_DMA_DISR 0xc0 /* PCI DMA intr status */ |
| 41 | #define AD_DMACHSS 0xc4 /* PCI DMA channel stop status */ | 41 | #define AD_DMA_CHSS 0xc4 /* PCI DMA channel stop status */ |
| 42 | 42 | ||
| 43 | #define AD_GPIOIPC 0xc8 /* IO port ctrl */ | 43 | #define AD_GPIO_IPC 0xc8 /* IO port ctrl */ |
| 44 | #define AD_GPIOOP 0xca /* IO output status */ | 44 | #define AD_GPIO_OP 0xca /* IO output status */ |
| 45 | #define AD_GPIOIP 0xcc /* IO input status */ | 45 | #define AD_GPIO_IP 0xcc /* IO input status */ |
| 46 | 46 | ||
| 47 | /* AC97 registers, 0x100 - 0x17f; see ac97.h */ | 47 | /* AC97 registers, 0x100 - 0x17f; see ac97.h */ |
| 48 | #define AD_ACIC 0x180 /* AC Link interface ctrl */ | 48 | #define AD_AC97_BASE 0x100 /* ac97 base register */ |
| 49 | #define AD_AC97_ACIC 0x180 /* AC Link interface ctrl */ | ||
| 49 | 50 | ||
| 50 | /* OPL3; BAR1 */ | 51 | /* OPL3; BAR1 */ |
| 51 | #define AD_OPLM0AS 0x00 /* Music0 address/status */ | 52 | #define AD_OPL_M0AS 0x00 /* Music0 address/status */ |
| 52 | #define AD_OPLM0DATA 0x01 /* Music0 data */ | 53 | #define AD_OPL_M0DATA 0x01 /* Music0 data */ |
| 53 | #define AD_OPLM1A 0x02 /* Music1 address */ | 54 | #define AD_OPL_M1A 0x02 /* Music1 address */ |
| 54 | #define AD_OPLM1DATA 0x03 /* Music1 data */ | 55 | #define AD_OPL_M1DATA 0x03 /* Music1 data */ |
| 55 | /* 0x04-0x0f reserved */ | 56 | /* 0x04-0x0f reserved */ |
| 56 | 57 | ||
| 57 | /* MIDI; BAR2 */ | 58 | /* MIDI; BAR2 */ |
| @@ -59,9 +60,9 @@ | |||
| 59 | #define AD_MISC 0x01 /* MIDI status/cmd */ | 60 | #define AD_MISC 0x01 /* MIDI status/cmd */ |
| 60 | /* 0x02-0xff reserved */ | 61 | /* 0x02-0xff reserved */ |
| 61 | 62 | ||
| 62 | #define AD_DSIOMEMSIZE 512 | 63 | #define AD_DS_IOMEMSIZE 512 |
| 63 | #define AD_OPLMEMSIZE 16 | 64 | #define AD_OPL_MEMSIZE 16 |
| 64 | #define AD_MIDIMEMSIZE 16 | 65 | #define AD_MIDI_MEMSIZE 16 |
| 65 | 66 | ||
| 66 | #define AD_WAV_STATE 0 | 67 | #define AD_WAV_STATE 0 |
| 67 | #define AD_ADC_STATE 1 | 68 | #define AD_ADC_STATE 1 |
diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c index 4e595172e423..1ac7c8552f50 100644 --- a/sound/ppc/toonie.c +++ b/sound/ppc/toonie.c | |||
| @@ -335,7 +335,7 @@ static void toonie_cleanup(struct snd_pmac *chip) | |||
| 335 | chip->mixer_data = NULL; | 335 | chip->mixer_data = NULL; |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | int snd_pmac_toonie_init(struct snd_pmac *chip) | 338 | int __init snd_pmac_toonie_init(struct snd_pmac *chip) |
| 339 | { | 339 | { |
| 340 | struct pmac_toonie *mix; | 340 | struct pmac_toonie *mix; |
| 341 | 341 | ||