diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-05 14:15:30 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-05 14:15:30 -0500 |
| commit | c89a86bb96307019867d11874ef0b86adaa0598e (patch) | |
| tree | c44c1a825e8a143a4c52bcb8692292aeb77fa64e | |
| parent | 07475ffba5800c53573180dd521273642adcd0e9 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
183 files changed, 4564 insertions, 4997 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a74a0c726134..77bb08606912 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -536,6 +536,7 @@ P: Mauro Carvalho Chehab | |||
| 536 | M: mchehab@brturbo.com.br | 536 | M: mchehab@brturbo.com.br |
| 537 | L: video4linux-list@redhat.com | 537 | L: video4linux-list@redhat.com |
| 538 | W: http://linuxtv.org | 538 | W: http://linuxtv.org |
| 539 | T: quilt http://www.linuxtv.org/download/quilt/ | ||
| 539 | S: Maintained | 540 | S: Maintained |
| 540 | 541 | ||
| 541 | BUSLOGIC SCSI DRIVER | 542 | BUSLOGIC SCSI DRIVER |
| @@ -833,6 +834,7 @@ P: LinuxTV.org Project | |||
| 833 | M: linux-dvb-maintainer@linuxtv.org | 834 | M: linux-dvb-maintainer@linuxtv.org |
| 834 | L: linux-dvb@linuxtv.org (subscription required) | 835 | L: linux-dvb@linuxtv.org (subscription required) |
| 835 | W: http://linuxtv.org/ | 836 | W: http://linuxtv.org/ |
| 837 | T: quilt http://www.linuxtv.org/download/quilt/ | ||
| 836 | S: Supported | 838 | S: Supported |
| 837 | 839 | ||
| 838 | EATA-DMA SCSI DRIVER | 840 | EATA-DMA SCSI DRIVER |
| @@ -1634,6 +1636,15 @@ L: ldm-devel@lists.sourceforge.net | |||
| 1634 | W: http://ldm.sourceforge.net | 1636 | W: http://ldm.sourceforge.net |
| 1635 | S: Maintained | 1637 | S: Maintained |
| 1636 | 1638 | ||
| 1639 | LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) | ||
| 1640 | P: Eric Moore | ||
| 1641 | M: Eric.Moore@lsil.com | ||
| 1642 | M: support@lsil.com | ||
| 1643 | L: mpt_linux_developer@lsil.com | ||
| 1644 | L: linux-scsi@vger.kernel.org | ||
| 1645 | W: http://www.lsilogic.com/support | ||
| 1646 | S: Supported | ||
| 1647 | |||
| 1637 | LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers | 1648 | LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers |
| 1638 | P: Matthew Wilcox | 1649 | P: Matthew Wilcox |
| 1639 | M: matthew@wil.cx | 1650 | M: matthew@wil.cx |
| @@ -2885,6 +2896,7 @@ P: Mauro Carvalho Chehab | |||
| 2885 | M: mchehab@brturbo.com.br | 2896 | M: mchehab@brturbo.com.br |
| 2886 | L: video4linux-list@redhat.com | 2897 | L: video4linux-list@redhat.com |
| 2887 | W: http://linuxtv.org | 2898 | W: http://linuxtv.org |
| 2899 | T: quilt http://www.linuxtv.org/download/quilt/ | ||
| 2888 | S: Maintained | 2900 | S: Maintained |
| 2889 | 2901 | ||
| 2890 | W1 DALLAS'S 1-WIRE BUS | 2902 | W1 DALLAS'S 1-WIRE BUS |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 15 | 3 | SUBLEVEL = 15 |
| 4 | EXTRAVERSION =-rc4 | 4 | EXTRAVERSION =-rc5 |
| 5 | NAME=Affluent Albatross | 5 | NAME=Affluent Albatross |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index 18e9beaec465..9895539533d6 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
| @@ -897,7 +897,24 @@ CONFIG_UNIX98_PTYS=y | |||
| 897 | # | 897 | # |
| 898 | # I2C support | 898 | # I2C support |
| 899 | # | 899 | # |
| 900 | # CONFIG_I2C is not set | 900 | CONFIG_I2C=y |
| 901 | # CONFIG_I2C_CHARDEV is not set | ||
| 902 | |||
| 903 | # | ||
| 904 | # I2C Algorithms | ||
| 905 | # | ||
| 906 | # CONFIG_I2C_ALGOBIT is not set | ||
| 907 | # CONFIG_I2C_ALGOPCF is not set | ||
| 908 | # CONFIG_I2C_ALGOPCA is not set | ||
| 909 | |||
| 910 | # | ||
| 911 | # I2C Hardware Bus support | ||
| 912 | # | ||
| 913 | CONFIG_I2C_PXA=y | ||
| 914 | # CONFIG_I2C_PXA_SLAVE is not set | ||
| 915 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 916 | # CONFIG_I2C_STUB is not set | ||
| 917 | # CONFIG_I2C_PCA_ISA is not set | ||
| 901 | 918 | ||
| 902 | # | 919 | # |
| 903 | # Hardware Monitoring support | 920 | # Hardware Monitoring support |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 0a41080d2266..3a22d84e1047 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
| @@ -85,7 +85,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
| 85 | { | 85 | { |
| 86 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 86 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 87 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 87 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 88 | .irq = IRQ_IXP4XX_UART1, | 88 | .irq = IRQ_IXP4XX_UART2, |
| 89 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, | 89 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 90 | .iotype = UPIO_MEM, | 90 | .iotype = UPIO_MEM, |
| 91 | .regshift = 2, | 91 | .regshift = 2, |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 526acbc32067..2a58499c0968 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -77,6 +77,8 @@ config MACH_AKITA | |||
| 77 | depends PXA_SHARPSL_27x | 77 | depends PXA_SHARPSL_27x |
| 78 | select PXA_SHARP_Cxx00 | 78 | select PXA_SHARP_Cxx00 |
| 79 | select MACH_SPITZ | 79 | select MACH_SPITZ |
| 80 | select I2C | ||
| 81 | select I2C_PXA | ||
| 80 | 82 | ||
| 81 | config MACH_SPITZ | 83 | config MACH_SPITZ |
| 82 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | 84 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" |
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index c9a03981b785..330695b6b19d 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c | |||
| @@ -155,14 +155,19 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p | |||
| 155 | * space mappings, we can be lazy and remember that we may have dirty | 155 | * space mappings, we can be lazy and remember that we may have dirty |
| 156 | * kernel cache lines for later. Otherwise, we assume we have | 156 | * kernel cache lines for later. Otherwise, we assume we have |
| 157 | * aliasing mappings. | 157 | * aliasing mappings. |
| 158 | * | ||
| 159 | * Note that we disable the lazy flush for SMP. | ||
| 158 | */ | 160 | */ |
| 159 | void flush_dcache_page(struct page *page) | 161 | void flush_dcache_page(struct page *page) |
| 160 | { | 162 | { |
| 161 | struct address_space *mapping = page_mapping(page); | 163 | struct address_space *mapping = page_mapping(page); |
| 162 | 164 | ||
| 165 | #ifndef CONFIG_SMP | ||
| 163 | if (mapping && !mapping_mapped(mapping)) | 166 | if (mapping && !mapping_mapped(mapping)) |
| 164 | set_bit(PG_dcache_dirty, &page->flags); | 167 | set_bit(PG_dcache_dirty, &page->flags); |
| 165 | else { | 168 | else |
| 169 | #endif | ||
| 170 | { | ||
| 166 | __flush_dcache_page(mapping, page); | 171 | __flush_dcache_page(mapping, page); |
| 167 | if (mapping && cache_is_vivt()) | 172 | if (mapping && cache_is_vivt()) |
| 168 | __flush_dcache_aliases(mapping, page); | 173 | __flush_dcache_aliases(mapping, page); |
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 76b1135d401a..447fa9e33ffb 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
| @@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) | |||
| 638 | return 0; | 638 | return 0; |
| 639 | 639 | ||
| 640 | pmtmr_ioport = fadt->xpm_tmr_blk.address; | 640 | pmtmr_ioport = fadt->xpm_tmr_blk.address; |
| 641 | /* | ||
| 642 | * "X" fields are optional extensions to the original V1.0 | ||
| 643 | * fields, so we must selectively expand V1.0 fields if the | ||
| 644 | * corresponding X field is zero. | ||
| 645 | */ | ||
| 646 | if (!pmtmr_ioport) | ||
| 647 | pmtmr_ioport = fadt->V1_pm_tmr_blk; | ||
| 641 | } else { | 648 | } else { |
| 642 | /* FADT rev. 1 */ | 649 | /* FADT rev. 1 */ |
| 643 | pmtmr_ioport = fadt->V1_pm_tmr_blk; | 650 | pmtmr_ioport = fadt->V1_pm_tmr_blk; |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e380a8322a94..b50be449d3f5 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -6,8 +6,6 @@ config MIPS | |||
| 6 | 6 | ||
| 7 | mainmenu "Linux/MIPS Kernel Configuration" | 7 | mainmenu "Linux/MIPS Kernel Configuration" |
| 8 | 8 | ||
| 9 | source "init/Kconfig" | ||
| 10 | |||
| 11 | menu "Machine selection" | 9 | menu "Machine selection" |
| 12 | 10 | ||
| 13 | choice | 11 | choice |
| @@ -1643,6 +1641,8 @@ config RWSEM_GENERIC_SPINLOCK | |||
| 1643 | bool | 1641 | bool |
| 1644 | default y | 1642 | default y |
| 1645 | 1643 | ||
| 1644 | source "init/Kconfig" | ||
| 1645 | |||
| 1646 | menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" | 1646 | menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" |
| 1647 | 1647 | ||
| 1648 | config HW_HAS_EISA | 1648 | config HW_HAS_EISA |
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c index ac05ba0ff63f..f00ec3b175d8 100644 --- a/arch/mips/au1000/db1x00/board_setup.c +++ b/arch/mips/au1000/db1x00/board_setup.c | |||
| @@ -45,13 +45,12 @@ | |||
| 45 | #include <asm/mach-au1x00/au1000.h> | 45 | #include <asm/mach-au1x00/au1000.h> |
| 46 | #include <asm/mach-db1x00/db1x00.h> | 46 | #include <asm/mach-db1x00/db1x00.h> |
| 47 | 47 | ||
| 48 | /* not correct for db1550 */ | 48 | static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; |
| 49 | static BCSR * const bcsr = (BCSR *)0xAE000000; | ||
| 50 | 49 | ||
| 51 | void board_reset (void) | 50 | void board_reset (void) |
| 52 | { | 51 | { |
| 53 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 52 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
| 54 | au_writel(0x00000000, 0xAE00001C); | 53 | bcsr->swreset = 0x0000; |
| 55 | } | 54 | } |
| 56 | 55 | ||
| 57 | void __init board_setup(void) | 56 | void __init board_setup(void) |
| @@ -75,7 +74,7 @@ void __init board_setup(void) | |||
| 75 | bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF; | 74 | bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF; |
| 76 | au_sync(); | 75 | au_sync(); |
| 77 | #endif | 76 | #endif |
| 78 | au_writel(0, 0xAE000010); /* turn off pcmcia power */ | 77 | bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */ |
| 79 | 78 | ||
| 80 | #ifdef CONFIG_MIPS_MIRAGE | 79 | #ifdef CONFIG_MIPS_MIRAGE |
| 81 | /* enable GPIO[31:0] inputs */ | 80 | /* enable GPIO[31:0] inputs */ |
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 4b9d5e46edbb..41e0522f3cf1 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
| @@ -61,7 +61,17 @@ void __init prom_init(void) | |||
| 61 | prom_envp = (char **) fw_arg2; | 61 | prom_envp = (char **) fw_arg2; |
| 62 | 62 | ||
| 63 | mips_machgroup = MACH_GROUP_ALCHEMY; | 63 | mips_machgroup = MACH_GROUP_ALCHEMY; |
| 64 | mips_machtype = MACH_DB1000; /* set the platform # */ | 64 | |
| 65 | /* Set the platform # */ | ||
| 66 | #if defined (CONFIG_MIPS_DB1550) | ||
| 67 | mips_machtype = MACH_DB1550; | ||
| 68 | #elif defined (CONFIG_MIPS_DB1500) | ||
| 69 | mips_machtype = MACH_DB1500; | ||
| 70 | #elif defined (CONFIG_MIPS_DB1100) | ||
| 71 | mips_machtype = MACH_DB1100; | ||
| 72 | #else | ||
| 73 | mips_machtype = MACH_DB1000; | ||
| 74 | #endif | ||
| 65 | 75 | ||
| 66 | prom_init_cmdline(); | 76 | prom_init_cmdline(); |
| 67 | 77 | ||
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 74990758154b..89c21572a59c 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 12:14:02 2005 | 4 | # Thu Nov 24 01:05:52 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -215,6 +146,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 215 | # CONFIG_PREEMPT is not set | 146 | # CONFIG_PREEMPT is not set |
| 216 | 147 | ||
| 217 | # | 148 | # |
| 149 | # Code maturity level options | ||
| 150 | # | ||
| 151 | CONFIG_EXPERIMENTAL=y | ||
| 152 | CONFIG_CLEAN_COMPILE=y | ||
| 153 | CONFIG_BROKEN_ON_SMP=y | ||
| 154 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 155 | |||
| 156 | # | ||
| 157 | # General setup | ||
| 158 | # | ||
| 159 | CONFIG_LOCALVERSION="" | ||
| 160 | CONFIG_LOCALVERSION_AUTO=y | ||
| 161 | CONFIG_SWAP=y | ||
| 162 | CONFIG_SYSVIPC=y | ||
| 163 | # CONFIG_POSIX_MQUEUE is not set | ||
| 164 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 165 | CONFIG_SYSCTL=y | ||
| 166 | # CONFIG_AUDIT is not set | ||
| 167 | CONFIG_HOTPLUG=y | ||
| 168 | CONFIG_KOBJECT_UEVENT=y | ||
| 169 | # CONFIG_IKCONFIG is not set | ||
| 170 | CONFIG_INITRAMFS_SOURCE="" | ||
| 171 | CONFIG_EMBEDDED=y | ||
| 172 | CONFIG_KALLSYMS=y | ||
| 173 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 174 | CONFIG_PRINTK=y | ||
| 175 | CONFIG_BUG=y | ||
| 176 | CONFIG_BASE_FULL=y | ||
| 177 | CONFIG_FUTEX=y | ||
| 178 | CONFIG_EPOLL=y | ||
| 179 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 180 | 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_TINY_SHMEM is not set | ||
| 186 | CONFIG_BASE_SMALL=0 | ||
| 187 | |||
| 188 | # | ||
| 189 | # Loadable module support | ||
| 190 | # | ||
| 191 | CONFIG_MODULES=y | ||
| 192 | CONFIG_MODULE_UNLOAD=y | ||
| 193 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 194 | CONFIG_OBSOLETE_MODPARM=y | ||
| 195 | CONFIG_MODVERSIONS=y | ||
| 196 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 197 | CONFIG_KMOD=y | ||
| 198 | |||
| 199 | # | ||
| 200 | # Block layer | ||
| 201 | # | ||
| 202 | # CONFIG_LBD is not set | ||
| 203 | |||
| 204 | # | ||
| 205 | # IO Schedulers | ||
| 206 | # | ||
| 207 | CONFIG_IOSCHED_NOOP=y | ||
| 208 | CONFIG_IOSCHED_AS=y | ||
| 209 | CONFIG_IOSCHED_DEADLINE=y | ||
| 210 | CONFIG_IOSCHED_CFQ=y | ||
| 211 | CONFIG_DEFAULT_AS=y | ||
| 212 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 213 | # CONFIG_DEFAULT_CFQ is not set | ||
| 214 | # CONFIG_DEFAULT_NOOP is not set | ||
| 215 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 216 | |||
| 217 | # | ||
| 218 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 218 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 219 | # | 219 | # |
| 220 | CONFIG_HW_HAS_PCI=y | 220 | CONFIG_HW_HAS_PCI=y |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index ea4b75604c23..069f9d14983e 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
| @@ -1,83 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:04:36 2005 | 4 | # Thu Nov 24 01:05:54 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | # CONFIG_CPUSETS is not set | ||
| 32 | CONFIG_INITRAMFS_SOURCE="" | ||
| 33 | CONFIG_EMBEDDED=y | ||
| 34 | CONFIG_KALLSYMS=y | ||
| 35 | # CONFIG_KALLSYMS_ALL is not set | ||
| 36 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 37 | CONFIG_PRINTK=y | ||
| 38 | CONFIG_BUG=y | ||
| 39 | CONFIG_BASE_FULL=y | ||
| 40 | CONFIG_FUTEX=y | ||
| 41 | CONFIG_EPOLL=y | ||
| 42 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 43 | CONFIG_SHMEM=y | ||
| 44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 45 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 46 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 47 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 48 | # CONFIG_TINY_SHMEM is not set | ||
| 49 | CONFIG_BASE_SMALL=0 | ||
| 50 | |||
| 51 | # | ||
| 52 | # Loadable module support | ||
| 53 | # | ||
| 54 | CONFIG_MODULES=y | ||
| 55 | CONFIG_MODULE_UNLOAD=y | ||
| 56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 57 | CONFIG_OBSOLETE_MODPARM=y | ||
| 58 | CONFIG_MODVERSIONS=y | ||
| 59 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 60 | CONFIG_KMOD=y | ||
| 61 | CONFIG_STOP_MACHINE=y | ||
| 62 | |||
| 63 | # | ||
| 64 | # Block layer | ||
| 65 | # | ||
| 66 | |||
| 67 | # | ||
| 68 | # IO Schedulers | ||
| 69 | # | ||
| 70 | CONFIG_IOSCHED_NOOP=y | ||
| 71 | CONFIG_IOSCHED_AS=y | ||
| 72 | CONFIG_IOSCHED_DEADLINE=y | ||
| 73 | CONFIG_IOSCHED_CFQ=y | ||
| 74 | CONFIG_DEFAULT_AS=y | ||
| 75 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 76 | # CONFIG_DEFAULT_CFQ is not set | ||
| 77 | # CONFIG_DEFAULT_NOOP is not set | ||
| 78 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 79 | |||
| 80 | # | ||
| 81 | # Machine selection | 9 | # Machine selection |
| 82 | # | 10 | # |
| 83 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -224,6 +152,78 @@ CONFIG_PREEMPT_NONE=y | |||
| 224 | # CONFIG_PREEMPT_BKL is not set | 152 | # CONFIG_PREEMPT_BKL is not set |
| 225 | 153 | ||
| 226 | # | 154 | # |
| 155 | # Code maturity level options | ||
| 156 | # | ||
| 157 | CONFIG_EXPERIMENTAL=y | ||
| 158 | CONFIG_CLEAN_COMPILE=y | ||
| 159 | CONFIG_LOCK_KERNEL=y | ||
| 160 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 161 | |||
| 162 | # | ||
| 163 | # General setup | ||
| 164 | # | ||
| 165 | CONFIG_LOCALVERSION="" | ||
| 166 | CONFIG_LOCALVERSION_AUTO=y | ||
| 167 | CONFIG_SWAP=y | ||
| 168 | CONFIG_SYSVIPC=y | ||
| 169 | # CONFIG_POSIX_MQUEUE is not set | ||
| 170 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 171 | CONFIG_SYSCTL=y | ||
| 172 | # CONFIG_AUDIT is not set | ||
| 173 | # CONFIG_HOTPLUG is not set | ||
| 174 | CONFIG_KOBJECT_UEVENT=y | ||
| 175 | CONFIG_IKCONFIG=y | ||
| 176 | CONFIG_IKCONFIG_PROC=y | ||
| 177 | # CONFIG_CPUSETS is not set | ||
| 178 | CONFIG_INITRAMFS_SOURCE="" | ||
| 179 | CONFIG_EMBEDDED=y | ||
| 180 | CONFIG_KALLSYMS=y | ||
| 181 | # CONFIG_KALLSYMS_ALL is not set | ||
| 182 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 183 | CONFIG_PRINTK=y | ||
| 184 | CONFIG_BUG=y | ||
| 185 | CONFIG_BASE_FULL=y | ||
| 186 | CONFIG_FUTEX=y | ||
| 187 | CONFIG_EPOLL=y | ||
| 188 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 189 | CONFIG_SHMEM=y | ||
| 190 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 191 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 192 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 193 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 194 | # CONFIG_TINY_SHMEM is not set | ||
| 195 | CONFIG_BASE_SMALL=0 | ||
| 196 | |||
| 197 | # | ||
| 198 | # Loadable module support | ||
| 199 | # | ||
| 200 | CONFIG_MODULES=y | ||
| 201 | CONFIG_MODULE_UNLOAD=y | ||
| 202 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 203 | CONFIG_OBSOLETE_MODPARM=y | ||
| 204 | CONFIG_MODVERSIONS=y | ||
| 205 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 206 | CONFIG_KMOD=y | ||
| 207 | CONFIG_STOP_MACHINE=y | ||
| 208 | |||
| 209 | # | ||
| 210 | # Block layer | ||
| 211 | # | ||
| 212 | |||
| 213 | # | ||
| 214 | # IO Schedulers | ||
| 215 | # | ||
| 216 | CONFIG_IOSCHED_NOOP=y | ||
| 217 | CONFIG_IOSCHED_AS=y | ||
| 218 | CONFIG_IOSCHED_DEADLINE=y | ||
| 219 | CONFIG_IOSCHED_CFQ=y | ||
| 220 | CONFIG_DEFAULT_AS=y | ||
| 221 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 222 | # CONFIG_DEFAULT_CFQ is not set | ||
| 223 | # CONFIG_DEFAULT_NOOP is not set | ||
| 224 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 225 | |||
| 226 | # | ||
| 227 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 227 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 228 | # | 228 | # |
| 229 | CONFIG_HW_HAS_PCI=y | 229 | CONFIG_HW_HAS_PCI=y |
| @@ -318,7 +318,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 318 | # QoS and/or fair queueing | 318 | # QoS and/or fair queueing |
| 319 | # | 319 | # |
| 320 | # CONFIG_NET_SCHED is not set | 320 | # CONFIG_NET_SCHED is not set |
| 321 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 322 | 321 | ||
| 323 | # | 322 | # |
| 324 | # Network testing | 323 | # Network testing |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index a86cc9d9bdae..5261e29ccf37 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:04:39 2005 | 4 | # Thu Nov 24 01:05:55 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -206,6 +137,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 206 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 207 | 138 | ||
| 208 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | CONFIG_SWAP=y | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_POSIX_MQUEUE is not set | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | # CONFIG_IKCONFIG is not set | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | ||
| 162 | CONFIG_EMBEDDED=y | ||
| 163 | CONFIG_KALLSYMS=y | ||
| 164 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 165 | CONFIG_PRINTK=y | ||
| 166 | CONFIG_BUG=y | ||
| 167 | CONFIG_BASE_FULL=y | ||
| 168 | CONFIG_FUTEX=y | ||
| 169 | CONFIG_EPOLL=y | ||
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 171 | CONFIG_SHMEM=y | ||
| 172 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 173 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 174 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 175 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 176 | # CONFIG_TINY_SHMEM is not set | ||
| 177 | CONFIG_BASE_SMALL=0 | ||
| 178 | |||
| 179 | # | ||
| 180 | # Loadable module support | ||
| 181 | # | ||
| 182 | CONFIG_MODULES=y | ||
| 183 | CONFIG_MODULE_UNLOAD=y | ||
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | ||
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 188 | CONFIG_KMOD=y | ||
| 189 | |||
| 190 | # | ||
| 191 | # Block layer | ||
| 192 | # | ||
| 193 | # CONFIG_LBD is not set | ||
| 194 | |||
| 195 | # | ||
| 196 | # IO Schedulers | ||
| 197 | # | ||
| 198 | CONFIG_IOSCHED_NOOP=y | ||
| 199 | CONFIG_IOSCHED_AS=y | ||
| 200 | CONFIG_IOSCHED_DEADLINE=y | ||
| 201 | CONFIG_IOSCHED_CFQ=y | ||
| 202 | CONFIG_DEFAULT_AS=y | ||
| 203 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 204 | # CONFIG_DEFAULT_CFQ is not set | ||
| 205 | # CONFIG_DEFAULT_NOOP is not set | ||
| 206 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 207 | |||
| 208 | # | ||
| 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 210 | # | 210 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 211 | CONFIG_HW_HAS_PCI=y |
| @@ -294,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 294 | # QoS and/or fair queueing | 294 | # QoS and/or fair queueing |
| 295 | # | 295 | # |
| 296 | # CONFIG_NET_SCHED is not set | 296 | # CONFIG_NET_SCHED is not set |
| 297 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 298 | 297 | ||
| 299 | # | 298 | # |
| 300 | # Network testing | 299 | # Network testing |
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 3558c79b0eb7..216f4023a81b 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:04:42 2005 | 4 | # Thu Nov 24 01:05:57 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -196,6 +133,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 196 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 197 | 134 | ||
| 198 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | 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_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | # CONFIG_MODULES is not set | ||
| 179 | |||
| 180 | # | ||
| 181 | # Block layer | ||
| 182 | # | ||
| 183 | # CONFIG_LBD is not set | ||
| 184 | |||
| 185 | # | ||
| 186 | # IO Schedulers | ||
| 187 | # | ||
| 188 | CONFIG_IOSCHED_NOOP=y | ||
| 189 | CONFIG_IOSCHED_AS=y | ||
| 190 | CONFIG_IOSCHED_DEADLINE=y | ||
| 191 | CONFIG_IOSCHED_CFQ=y | ||
| 192 | CONFIG_DEFAULT_AS=y | ||
| 193 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 194 | # CONFIG_DEFAULT_CFQ is not set | ||
| 195 | # CONFIG_DEFAULT_NOOP is not set | ||
| 196 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 197 | |||
| 198 | # | ||
| 199 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 199 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 200 | # | 200 | # |
| 201 | CONFIG_HW_HAS_PCI=y | 201 | CONFIG_HW_HAS_PCI=y |
| @@ -280,7 +280,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # QoS and/or fair queueing | 280 | # QoS and/or fair queueing |
| 281 | # | 281 | # |
| 282 | # CONFIG_NET_SCHED is not set | 282 | # CONFIG_NET_SCHED is not set |
| 283 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 284 | 283 | ||
| 285 | # | 284 | # |
| 286 | # Network testing | 285 | # Network testing |
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 3b103fec7b86..18ac7926c058 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:04 2005 | 4 | # Thu Nov 24 01:05:59 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +133,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 203 | 134 | ||
| 204 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | 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_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | CONFIG_MODVERSIONS=y | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -320,7 +320,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 320 | # QoS and/or fair queueing | 320 | # QoS and/or fair queueing |
| 321 | # | 321 | # |
| 322 | # CONFIG_NET_SCHED is not set | 322 | # CONFIG_NET_SCHED is not set |
| 323 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 324 | 323 | ||
| 325 | # | 324 | # |
| 326 | # Network testing | 325 | # Network testing |
| @@ -668,6 +667,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 668 | # | 667 | # |
| 669 | # TPM devices | 668 | # TPM devices |
| 670 | # | 669 | # |
| 670 | # CONFIG_TCG_TPM is not set | ||
| 671 | # CONFIG_TELCLOCK is not set | 671 | # CONFIG_TELCLOCK is not set |
| 672 | 672 | ||
| 673 | # | 673 | # |
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index 79cdd940c6a8..4f55f7414c9c 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:07 2005 | 4 | # Thu Nov 24 01:06:00 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +133,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 203 | 134 | ||
| 204 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | 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_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | CONFIG_MODVERSIONS=y | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_MMU=y | 207 | CONFIG_MMU=y |
| @@ -309,7 +309,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 309 | # QoS and/or fair queueing | 309 | # QoS and/or fair queueing |
| 310 | # | 310 | # |
| 311 | # CONFIG_NET_SCHED is not set | 311 | # CONFIG_NET_SCHED is not set |
| 312 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 313 | 312 | ||
| 314 | # | 313 | # |
| 315 | # Network testing | 314 | # Network testing |
| @@ -636,6 +635,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 636 | # | 635 | # |
| 637 | # TPM devices | 636 | # TPM devices |
| 638 | # | 637 | # |
| 638 | # CONFIG_TCG_TPM is not set | ||
| 639 | # CONFIG_TELCLOCK is not set | 639 | # CONFIG_TELCLOCK is not set |
| 640 | 640 | ||
| 641 | # | 641 | # |
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index b6bad69398e1..0e5de7d05f23 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:10 2005 | 4 | # Thu Nov 24 01:06:03 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +133,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 204 | 134 | ||
| 205 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | CONFIG_IKCONFIG=y | ||
| 157 | CONFIG_IKCONFIG_PROC=y | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_MMU=y | 208 | CONFIG_MMU=y |
| @@ -314,7 +314,6 @@ CONFIG_NETFILTER=y | |||
| 314 | # QoS and/or fair queueing | 314 | # QoS and/or fair queueing |
| 315 | # | 315 | # |
| 316 | # CONFIG_NET_SCHED is not set | 316 | # CONFIG_NET_SCHED is not set |
| 317 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 318 | 317 | ||
| 319 | # | 318 | # |
| 320 | # Network testing | 319 | # Network testing |
| @@ -475,7 +474,6 @@ CONFIG_IDE_GENERIC=y | |||
| 475 | CONFIG_BLK_DEV_IDE_AU1XXX=y | 474 | CONFIG_BLK_DEV_IDE_AU1XXX=y |
| 476 | CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA=y | 475 | CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA=y |
| 477 | # CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is not set | 476 | # CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is not set |
| 478 | # CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON is not set | ||
| 479 | CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128 | 477 | CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128 |
| 480 | # CONFIG_IDE_ARM is not set | 478 | # CONFIG_IDE_ARM is not set |
| 481 | # CONFIG_BLK_DEV_IDEDMA is not set | 479 | # CONFIG_BLK_DEV_IDEDMA is not set |
| @@ -709,6 +707,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 709 | # | 707 | # |
| 710 | # TPM devices | 708 | # TPM devices |
| 711 | # | 709 | # |
| 710 | # CONFIG_TCG_TPM is not set | ||
| 712 | # CONFIG_TELCLOCK is not set | 711 | # CONFIG_TELCLOCK is not set |
| 713 | 712 | ||
| 714 | # | 713 | # |
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index dbaf189fc9c0..86e7be8412f3 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:15 2005 | 4 | # Thu Nov 24 01:06:05 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | CONFIG_HOTPLUG=y | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | 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_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 328 | # QoS and/or fair queueing | 328 | # QoS and/or fair queueing |
| 329 | # | 329 | # |
| 330 | # CONFIG_NET_SCHED is not set | 330 | # CONFIG_NET_SCHED is not set |
| 331 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 332 | 331 | ||
| 333 | # | 332 | # |
| 334 | # Network testing | 333 | # Network testing |
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 59c1ef214fc0..ea5ab0ca5774 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:18 2005 | 4 | # Thu Nov 24 01:06:07 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +134,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 204 | 135 | ||
| 205 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -327,7 +327,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 327 | # QoS and/or fair queueing | 327 | # QoS and/or fair queueing |
| 328 | # | 328 | # |
| 329 | # CONFIG_NET_SCHED is not set | 329 | # CONFIG_NET_SCHED is not set |
| 330 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 331 | 330 | ||
| 332 | # | 331 | # |
| 333 | # Network testing | 332 | # Network testing |
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 4ba29e612bdf..bea00a9e9269 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:04 2005 | 4 | # Thu Nov 24 01:06:09 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -197,6 +134,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 198 | 135 | ||
| 199 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | # CONFIG_MODULES is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # Block layer | ||
| 183 | # | ||
| 184 | # CONFIG_LBD is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # IO Schedulers | ||
| 188 | # | ||
| 189 | CONFIG_IOSCHED_NOOP=y | ||
| 190 | CONFIG_IOSCHED_AS=y | ||
| 191 | CONFIG_IOSCHED_DEADLINE=y | ||
| 192 | CONFIG_IOSCHED_CFQ=y | ||
| 193 | CONFIG_DEFAULT_AS=y | ||
| 194 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 195 | # CONFIG_DEFAULT_CFQ is not set | ||
| 196 | # CONFIG_DEFAULT_NOOP is not set | ||
| 197 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 198 | |||
| 199 | # | ||
| 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 201 | # | 201 | # |
| 202 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| @@ -285,7 +285,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 285 | # QoS and/or fair queueing | 285 | # QoS and/or fair queueing |
| 286 | # | 286 | # |
| 287 | # CONFIG_NET_SCHED is not set | 287 | # CONFIG_NET_SCHED is not set |
| 288 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 289 | 288 | ||
| 290 | # | 289 | # |
| 291 | # Network testing | 290 | # Network testing |
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index ea4e9046bbee..61f7171ca7ed 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:08 2005 | 4 | # Thu Nov 24 01:06:11 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -197,6 +134,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 198 | 135 | ||
| 199 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | # CONFIG_MODULES is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # Block layer | ||
| 183 | # | ||
| 184 | # CONFIG_LBD is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # IO Schedulers | ||
| 188 | # | ||
| 189 | CONFIG_IOSCHED_NOOP=y | ||
| 190 | CONFIG_IOSCHED_AS=y | ||
| 191 | CONFIG_IOSCHED_DEADLINE=y | ||
| 192 | CONFIG_IOSCHED_CFQ=y | ||
| 193 | CONFIG_DEFAULT_AS=y | ||
| 194 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 195 | # CONFIG_DEFAULT_CFQ is not set | ||
| 196 | # CONFIG_DEFAULT_NOOP is not set | ||
| 197 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 198 | |||
| 199 | # | ||
| 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 201 | # | 201 | # |
| 202 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| @@ -284,7 +284,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 284 | # QoS and/or fair queueing | 284 | # QoS and/or fair queueing |
| 285 | # | 285 | # |
| 286 | # CONFIG_NET_SCHED is not set | 286 | # CONFIG_NET_SCHED is not set |
| 287 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 288 | 287 | ||
| 289 | # | 288 | # |
| 290 | # Network testing | 289 | # Network testing |
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 1ac6c9b7ef96..08a4de6ec4a6 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Fri Nov 11 13:29:30 2005 | 4 | # Thu Nov 24 01:06:13 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_ALL is not set | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODVERSIONS is not set | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +132,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 132 | # CONFIG_PREEMPT is not set |
| 203 | 133 | ||
| 204 | # | 134 | # |
| 135 | # Code maturity level options | ||
| 136 | # | ||
| 137 | CONFIG_EXPERIMENTAL=y | ||
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | ||
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 141 | |||
| 142 | # | ||
| 143 | # General setup | ||
| 144 | # | ||
| 145 | CONFIG_LOCALVERSION="" | ||
| 146 | CONFIG_LOCALVERSION_AUTO=y | ||
| 147 | CONFIG_SWAP=y | ||
| 148 | CONFIG_SYSVIPC=y | ||
| 149 | # CONFIG_POSIX_MQUEUE is not set | ||
| 150 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 151 | CONFIG_SYSCTL=y | ||
| 152 | # CONFIG_AUDIT is not set | ||
| 153 | # CONFIG_HOTPLUG is not set | ||
| 154 | CONFIG_KOBJECT_UEVENT=y | ||
| 155 | # CONFIG_IKCONFIG is not set | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | ||
| 157 | CONFIG_EMBEDDED=y | ||
| 158 | CONFIG_KALLSYMS=y | ||
| 159 | # CONFIG_KALLSYMS_ALL is not set | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | 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_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | # CONFIG_MODVERSIONS is not set | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_TC=y | 207 | CONFIG_TC=y |
| @@ -286,7 +286,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # QoS and/or fair queueing | 286 | # QoS and/or fair queueing |
| 287 | # | 287 | # |
| 288 | # CONFIG_NET_SCHED is not set | 288 | # CONFIG_NET_SCHED is not set |
| 289 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 290 | 289 | ||
| 291 | # | 290 | # |
| 292 | # Network testing | 291 | # Network testing |
| @@ -531,6 +530,7 @@ CONFIG_RTC=y | |||
| 531 | # | 530 | # |
| 532 | # TPM devices | 531 | # TPM devices |
| 533 | # | 532 | # |
| 533 | # CONFIG_TCG_TPM is not set | ||
| 534 | # CONFIG_TELCLOCK is not set | 534 | # CONFIG_TELCLOCK is not set |
| 535 | 535 | ||
| 536 | # | 536 | # |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index a89d2f66cdfa..c9070cef08b1 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:15 2005 | 4 | # Thu Nov 24 01:06:14 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | # CONFIG_HOTPLUG is not set | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | 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_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_ISA=y | 209 | CONFIG_ISA=y |
| @@ -286,7 +286,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # QoS and/or fair queueing | 286 | # QoS and/or fair queueing |
| 287 | # | 287 | # |
| 288 | # CONFIG_NET_SCHED is not set | 288 | # CONFIG_NET_SCHED is not set |
| 289 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 290 | 289 | ||
| 291 | # | 290 | # |
| 292 | # Network testing | 291 | # Network testing |
| @@ -577,6 +576,7 @@ CONFIG_GPIO_VR41XX=y | |||
| 577 | # | 576 | # |
| 578 | # TPM devices | 577 | # TPM devices |
| 579 | # | 578 | # |
| 579 | # CONFIG_TCG_TPM is not set | ||
| 580 | # CONFIG_TELCLOCK is not set | 580 | # CONFIG_TELCLOCK is not set |
| 581 | 581 | ||
| 582 | # | 582 | # |
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index e6c3c27f41fe..14e3815f11e6 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Wed Nov 9 11:05:12 2005 | 4 | # Thu Nov 24 01:06:16 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | # CONFIG_KMOD is not set | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -205,6 +136,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 205 | # CONFIG_PREEMPT is not set | 136 | # CONFIG_PREEMPT is not set |
| 206 | 137 | ||
| 207 | # | 138 | # |
| 139 | # Code maturity level options | ||
| 140 | # | ||
| 141 | CONFIG_EXPERIMENTAL=y | ||
| 142 | CONFIG_CLEAN_COMPILE=y | ||
| 143 | CONFIG_BROKEN_ON_SMP=y | ||
| 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 145 | |||
| 146 | # | ||
| 147 | # General setup | ||
| 148 | # | ||
| 149 | CONFIG_LOCALVERSION="" | ||
| 150 | CONFIG_LOCALVERSION_AUTO=y | ||
| 151 | CONFIG_SWAP=y | ||
| 152 | CONFIG_SYSVIPC=y | ||
| 153 | # CONFIG_POSIX_MQUEUE is not set | ||
| 154 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 155 | CONFIG_SYSCTL=y | ||
| 156 | # CONFIG_AUDIT is not set | ||
| 157 | CONFIG_HOTPLUG=y | ||
| 158 | CONFIG_KOBJECT_UEVENT=y | ||
| 159 | # CONFIG_IKCONFIG is not set | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | ||
| 161 | CONFIG_EMBEDDED=y | ||
| 162 | CONFIG_KALLSYMS=y | ||
| 163 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 164 | CONFIG_PRINTK=y | ||
| 165 | CONFIG_BUG=y | ||
| 166 | CONFIG_BASE_FULL=y | ||
| 167 | CONFIG_FUTEX=y | ||
| 168 | CONFIG_EPOLL=y | ||
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 170 | 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_TINY_SHMEM is not set | ||
| 176 | CONFIG_BASE_SMALL=0 | ||
| 177 | |||
| 178 | # | ||
| 179 | # Loadable module support | ||
| 180 | # | ||
| 181 | CONFIG_MODULES=y | ||
| 182 | CONFIG_MODULE_UNLOAD=y | ||
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | ||
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 187 | # CONFIG_KMOD is not set | ||
| 188 | |||
| 189 | # | ||
| 190 | # Block layer | ||
| 191 | # | ||
| 192 | # CONFIG_LBD is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # IO Schedulers | ||
| 196 | # | ||
| 197 | CONFIG_IOSCHED_NOOP=y | ||
| 198 | CONFIG_IOSCHED_AS=y | ||
| 199 | CONFIG_IOSCHED_DEADLINE=y | ||
| 200 | CONFIG_IOSCHED_CFQ=y | ||
| 201 | CONFIG_DEFAULT_AS=y | ||
| 202 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 203 | # CONFIG_DEFAULT_CFQ is not set | ||
| 204 | # CONFIG_DEFAULT_NOOP is not set | ||
| 205 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 206 | |||
| 207 | # | ||
| 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 209 | # | 209 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| @@ -291,7 +291,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 291 | # QoS and/or fair queueing | 291 | # QoS and/or fair queueing |
| 292 | # | 292 | # |
| 293 | # CONFIG_NET_SCHED is not set | 293 | # CONFIG_NET_SCHED is not set |
| 294 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 295 | 294 | ||
| 296 | # | 295 | # |
| 297 | # Network testing | 296 | # Network testing |
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 52ca6bf5be66..510819581d8a 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:22 2005 | 4 | # Thu Nov 24 01:06:18 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | # CONFIG_KMOD is not set | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -209,6 +140,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 209 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
| 210 | 141 | ||
| 211 | # | 142 | # |
| 143 | # Code maturity level options | ||
| 144 | # | ||
| 145 | CONFIG_EXPERIMENTAL=y | ||
| 146 | CONFIG_CLEAN_COMPILE=y | ||
| 147 | CONFIG_BROKEN_ON_SMP=y | ||
| 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 149 | |||
| 150 | # | ||
| 151 | # General setup | ||
| 152 | # | ||
| 153 | CONFIG_LOCALVERSION="" | ||
| 154 | CONFIG_LOCALVERSION_AUTO=y | ||
| 155 | CONFIG_SWAP=y | ||
| 156 | CONFIG_SYSVIPC=y | ||
| 157 | # CONFIG_POSIX_MQUEUE is not set | ||
| 158 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 159 | CONFIG_SYSCTL=y | ||
| 160 | # CONFIG_AUDIT is not set | ||
| 161 | # CONFIG_HOTPLUG is not set | ||
| 162 | CONFIG_KOBJECT_UEVENT=y | ||
| 163 | # CONFIG_IKCONFIG is not set | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | ||
| 165 | CONFIG_EMBEDDED=y | ||
| 166 | CONFIG_KALLSYMS=y | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | 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_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | CONFIG_MODULES=y | ||
| 186 | CONFIG_MODULE_UNLOAD=y | ||
| 187 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 188 | CONFIG_OBSOLETE_MODPARM=y | ||
| 189 | CONFIG_MODVERSIONS=y | ||
| 190 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 191 | # CONFIG_KMOD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # Block layer | ||
| 195 | # | ||
| 196 | # CONFIG_LBD is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # IO Schedulers | ||
| 200 | # | ||
| 201 | CONFIG_IOSCHED_NOOP=y | ||
| 202 | CONFIG_IOSCHED_AS=y | ||
| 203 | CONFIG_IOSCHED_DEADLINE=y | ||
| 204 | CONFIG_IOSCHED_CFQ=y | ||
| 205 | CONFIG_DEFAULT_AS=y | ||
| 206 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 207 | # CONFIG_DEFAULT_CFQ is not set | ||
| 208 | # CONFIG_DEFAULT_NOOP is not set | ||
| 209 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 210 | |||
| 211 | # | ||
| 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 213 | # | 213 | # |
| 214 | CONFIG_HW_HAS_PCI=y | 214 | CONFIG_HW_HAS_PCI=y |
| @@ -293,7 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 293 | # QoS and/or fair queueing | 293 | # QoS and/or fair queueing |
| 294 | # | 294 | # |
| 295 | # CONFIG_NET_SCHED is not set | 295 | # CONFIG_NET_SCHED is not set |
| 296 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 297 | 296 | ||
| 298 | # | 297 | # |
| 299 | # Network testing | 298 | # Network testing |
| @@ -531,6 +530,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 531 | # | 530 | # |
| 532 | # TPM devices | 531 | # TPM devices |
| 533 | # | 532 | # |
| 533 | # CONFIG_TCG_TPM is not set | ||
| 534 | # CONFIG_TELCLOCK is not set | 534 | # CONFIG_TELCLOCK is not set |
| 535 | 535 | ||
| 536 | # | 536 | # |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 79e3fe7e2d54..67979e3e606e 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 13:38:41 2005 | 4 | # Thu Nov 24 01:06:20 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -211,6 +141,76 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 211 | # CONFIG_PREEMPT is not set | 141 | # CONFIG_PREEMPT is not set |
| 212 | 142 | ||
| 213 | # | 143 | # |
| 144 | # Code maturity level options | ||
| 145 | # | ||
| 146 | CONFIG_EXPERIMENTAL=y | ||
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | ||
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 150 | |||
| 151 | # | ||
| 152 | # General setup | ||
| 153 | # | ||
| 154 | CONFIG_LOCALVERSION="" | ||
| 155 | CONFIG_LOCALVERSION_AUTO=y | ||
| 156 | CONFIG_SWAP=y | ||
| 157 | CONFIG_SYSVIPC=y | ||
| 158 | # CONFIG_POSIX_MQUEUE is not set | ||
| 159 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 160 | CONFIG_SYSCTL=y | ||
| 161 | # CONFIG_AUDIT is not set | ||
| 162 | # CONFIG_HOTPLUG is not set | ||
| 163 | CONFIG_KOBJECT_UEVENT=y | ||
| 164 | CONFIG_IKCONFIG=y | ||
| 165 | CONFIG_IKCONFIG_PROC=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | 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_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | CONFIG_MODULES=y | ||
| 188 | CONFIG_MODULE_UNLOAD=y | ||
| 189 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 190 | CONFIG_OBSOLETE_MODPARM=y | ||
| 191 | CONFIG_MODVERSIONS=y | ||
| 192 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 193 | CONFIG_KMOD=y | ||
| 194 | |||
| 195 | # | ||
| 196 | # Block layer | ||
| 197 | # | ||
| 198 | # CONFIG_LBD is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # IO Schedulers | ||
| 202 | # | ||
| 203 | CONFIG_IOSCHED_NOOP=y | ||
| 204 | CONFIG_IOSCHED_AS=y | ||
| 205 | CONFIG_IOSCHED_DEADLINE=y | ||
| 206 | CONFIG_IOSCHED_CFQ=y | ||
| 207 | CONFIG_DEFAULT_AS=y | ||
| 208 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 209 | # CONFIG_DEFAULT_CFQ is not set | ||
| 210 | # CONFIG_DEFAULT_NOOP is not set | ||
| 211 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 212 | |||
| 213 | # | ||
| 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 215 | # | 215 | # |
| 216 | CONFIG_HW_HAS_EISA=y | 216 | CONFIG_HW_HAS_EISA=y |
| @@ -779,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 779 | # | 779 | # |
| 780 | # TPM devices | 780 | # TPM devices |
| 781 | # | 781 | # |
| 782 | # CONFIG_TCG_TPM is not set | ||
| 782 | # CONFIG_TELCLOCK is not set | 783 | # CONFIG_TELCLOCK is not set |
| 783 | 784 | ||
| 784 | # | 785 | # |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 72998ec35b0b..03af44d1d846 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
| @@ -1,82 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Sun Nov 13 23:56:52 2005 | 4 | # Thu Nov 24 01:06:21 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | CONFIG_POSIX_MQUEUE=y | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_CPUSETS=y | ||
| 32 | CONFIG_INITRAMFS_SOURCE="" | ||
| 33 | CONFIG_EMBEDDED=y | ||
| 34 | CONFIG_KALLSYMS=y | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | CONFIG_MODULE_UNLOAD=y | ||
| 55 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 56 | CONFIG_OBSOLETE_MODPARM=y | ||
| 57 | # CONFIG_MODVERSIONS is not set | ||
| 58 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 59 | CONFIG_KMOD=y | ||
| 60 | CONFIG_STOP_MACHINE=y | ||
| 61 | |||
| 62 | # | ||
| 63 | # Block layer | ||
| 64 | # | ||
| 65 | |||
| 66 | # | ||
| 67 | # IO Schedulers | ||
| 68 | # | ||
| 69 | CONFIG_IOSCHED_NOOP=y | ||
| 70 | CONFIG_IOSCHED_AS=y | ||
| 71 | CONFIG_IOSCHED_DEADLINE=y | ||
| 72 | CONFIG_IOSCHED_CFQ=y | ||
| 73 | CONFIG_DEFAULT_AS=y | ||
| 74 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 75 | # CONFIG_DEFAULT_CFQ is not set | ||
| 76 | # CONFIG_DEFAULT_NOOP is not set | ||
| 77 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 78 | |||
| 79 | # | ||
| 80 | # Machine selection | 9 | # Machine selection |
| 81 | # | 10 | # |
| 82 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -213,6 +142,77 @@ CONFIG_PREEMPT_BKL=y | |||
| 213 | # CONFIG_MIPS_INSANE_LARGE is not set | 142 | # CONFIG_MIPS_INSANE_LARGE is not set |
| 214 | 143 | ||
| 215 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | CONFIG_EXPERIMENTAL=y | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_LOCK_KERNEL=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | CONFIG_POSIX_MQUEUE=y | ||
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 161 | CONFIG_SYSCTL=y | ||
| 162 | # CONFIG_AUDIT is not set | ||
| 163 | CONFIG_HOTPLUG=y | ||
| 164 | CONFIG_KOBJECT_UEVENT=y | ||
| 165 | CONFIG_IKCONFIG=y | ||
| 166 | CONFIG_IKCONFIG_PROC=y | ||
| 167 | CONFIG_CPUSETS=y | ||
| 168 | CONFIG_INITRAMFS_SOURCE="" | ||
| 169 | CONFIG_EMBEDDED=y | ||
| 170 | CONFIG_KALLSYMS=y | ||
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 172 | CONFIG_PRINTK=y | ||
| 173 | CONFIG_BUG=y | ||
| 174 | CONFIG_BASE_FULL=y | ||
| 175 | CONFIG_FUTEX=y | ||
| 176 | CONFIG_EPOLL=y | ||
| 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 178 | 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_TINY_SHMEM is not set | ||
| 184 | CONFIG_BASE_SMALL=0 | ||
| 185 | |||
| 186 | # | ||
| 187 | # Loadable module support | ||
| 188 | # | ||
| 189 | CONFIG_MODULES=y | ||
| 190 | CONFIG_MODULE_UNLOAD=y | ||
| 191 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 192 | CONFIG_OBSOLETE_MODPARM=y | ||
| 193 | # CONFIG_MODVERSIONS is not set | ||
| 194 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 195 | CONFIG_KMOD=y | ||
| 196 | CONFIG_STOP_MACHINE=y | ||
| 197 | |||
| 198 | # | ||
| 199 | # Block layer | ||
| 200 | # | ||
| 201 | |||
| 202 | # | ||
| 203 | # IO Schedulers | ||
| 204 | # | ||
| 205 | CONFIG_IOSCHED_NOOP=y | ||
| 206 | CONFIG_IOSCHED_AS=y | ||
| 207 | CONFIG_IOSCHED_DEADLINE=y | ||
| 208 | CONFIG_IOSCHED_CFQ=y | ||
| 209 | CONFIG_DEFAULT_AS=y | ||
| 210 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 211 | # CONFIG_DEFAULT_CFQ is not set | ||
| 212 | # CONFIG_DEFAULT_NOOP is not set | ||
| 213 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 214 | |||
| 215 | # | ||
| 216 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 216 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 217 | # | 217 | # |
| 218 | CONFIG_HW_HAS_PCI=y | 218 | CONFIG_HW_HAS_PCI=y |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 955e30f1b1ad..cba2a49cceb1 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:32 2005 | 4 | # Thu Nov 24 01:06:24 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | CONFIG_HOTPLUG=y | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | # CONFIG_IKCONFIG is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | # CONFIG_MODULES is not set | ||
| 53 | |||
| 54 | # | ||
| 55 | # Block layer | ||
| 56 | # | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +139,69 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 202 | # CONFIG_PREEMPT is not set | 139 | # CONFIG_PREEMPT is not set |
| 203 | 140 | ||
| 204 | # | 141 | # |
| 142 | # Code maturity level options | ||
| 143 | # | ||
| 144 | CONFIG_EXPERIMENTAL=y | ||
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | ||
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 148 | |||
| 149 | # | ||
| 150 | # General setup | ||
| 151 | # | ||
| 152 | CONFIG_LOCALVERSION="" | ||
| 153 | CONFIG_LOCALVERSION_AUTO=y | ||
| 154 | CONFIG_SWAP=y | ||
| 155 | CONFIG_SYSVIPC=y | ||
| 156 | # CONFIG_POSIX_MQUEUE is not set | ||
| 157 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 158 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 159 | CONFIG_SYSCTL=y | ||
| 160 | # CONFIG_AUDIT is not set | ||
| 161 | CONFIG_HOTPLUG=y | ||
| 162 | CONFIG_KOBJECT_UEVENT=y | ||
| 163 | # CONFIG_IKCONFIG is not set | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | ||
| 165 | CONFIG_EMBEDDED=y | ||
| 166 | CONFIG_KALLSYMS=y | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | 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_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | # CONFIG_MODULES is not set | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -294,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 294 | # QoS and/or fair queueing | 294 | # QoS and/or fair queueing |
| 295 | # | 295 | # |
| 296 | # CONFIG_NET_SCHED is not set | 296 | # CONFIG_NET_SCHED is not set |
| 297 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 298 | 297 | ||
| 299 | # | 298 | # |
| 300 | # Network testing | 299 | # Network testing |
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index f631385217db..e7ee1679af90 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 13:42:45 2005 | 4 | # Thu Nov 24 01:06:26 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | # CONFIG_HOTPLUG is not set | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | # CONFIG_IKCONFIG is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -205,6 +135,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 205 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 206 | 136 | ||
| 207 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 154 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 155 | CONFIG_SYSCTL=y | ||
| 156 | # CONFIG_AUDIT is not set | ||
| 157 | # CONFIG_HOTPLUG is not set | ||
| 158 | CONFIG_KOBJECT_UEVENT=y | ||
| 159 | # CONFIG_IKCONFIG is not set | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | ||
| 161 | CONFIG_EMBEDDED=y | ||
| 162 | CONFIG_KALLSYMS=y | ||
| 163 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 164 | CONFIG_PRINTK=y | ||
| 165 | CONFIG_BUG=y | ||
| 166 | CONFIG_BASE_FULL=y | ||
| 167 | CONFIG_FUTEX=y | ||
| 168 | CONFIG_EPOLL=y | ||
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 170 | 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_TINY_SHMEM is not set | ||
| 176 | CONFIG_BASE_SMALL=0 | ||
| 177 | |||
| 178 | # | ||
| 179 | # Loadable module support | ||
| 180 | # | ||
| 181 | CONFIG_MODULES=y | ||
| 182 | CONFIG_MODULE_UNLOAD=y | ||
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | ||
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 187 | CONFIG_KMOD=y | ||
| 188 | |||
| 189 | # | ||
| 190 | # Block layer | ||
| 191 | # | ||
| 192 | # CONFIG_LBD is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # IO Schedulers | ||
| 196 | # | ||
| 197 | CONFIG_IOSCHED_NOOP=y | ||
| 198 | CONFIG_IOSCHED_AS=y | ||
| 199 | CONFIG_IOSCHED_DEADLINE=y | ||
| 200 | CONFIG_IOSCHED_CFQ=y | ||
| 201 | CONFIG_DEFAULT_AS=y | ||
| 202 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 203 | # CONFIG_DEFAULT_CFQ is not set | ||
| 204 | # CONFIG_DEFAULT_NOOP is not set | ||
| 205 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 206 | |||
| 207 | # | ||
| 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 209 | # | 209 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| @@ -290,7 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 290 | # QoS and/or fair queueing | 290 | # QoS and/or fair queueing |
| 291 | # | 291 | # |
| 292 | # CONFIG_NET_SCHED is not set | 292 | # CONFIG_NET_SCHED is not set |
| 293 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 294 | 293 | ||
| 295 | # | 294 | # |
| 296 | # Network testing | 295 | # Network testing |
| @@ -628,6 +627,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 628 | # | 627 | # |
| 629 | # TPM devices | 628 | # TPM devices |
| 630 | # | 629 | # |
| 630 | # CONFIG_TCG_TPM is not set | ||
| 631 | # CONFIG_TELCLOCK is not set | 631 | # CONFIG_TELCLOCK is not set |
| 632 | 632 | ||
| 633 | # | 633 | # |
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 8d94ac753e78..138c8a60a4dc 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:38 2005 | 4 | # Thu Nov 24 01:06:27 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | CONFIG_HOTPLUG=y | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | # CONFIG_IKCONFIG is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +132,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 132 | # CONFIG_PREEMPT is not set |
| 203 | 133 | ||
| 204 | # | 134 | # |
| 135 | # Code maturity level options | ||
| 136 | # | ||
| 137 | CONFIG_EXPERIMENTAL=y | ||
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | ||
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 141 | |||
| 142 | # | ||
| 143 | # General setup | ||
| 144 | # | ||
| 145 | CONFIG_LOCALVERSION="" | ||
| 146 | CONFIG_LOCALVERSION_AUTO=y | ||
| 147 | CONFIG_SWAP=y | ||
| 148 | CONFIG_SYSVIPC=y | ||
| 149 | # CONFIG_POSIX_MQUEUE is not set | ||
| 150 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | 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_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | CONFIG_MODVERSIONS=y | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -289,7 +289,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # QoS and/or fair queueing | 289 | # QoS and/or fair queueing |
| 290 | # | 290 | # |
| 291 | # CONFIG_NET_SCHED is not set | 291 | # CONFIG_NET_SCHED is not set |
| 292 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 293 | 292 | ||
| 294 | # | 293 | # |
| 295 | # Network testing | 294 | # Network testing |
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index a8b4c9a9a63b..6238e0d6a430 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig | |||
| @@ -1,78 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:41 2005 | 4 | # Thu Nov 24 01:06:29 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | # CONFIG_EXPERIMENTAL is not set | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | CONFIG_SYSCTL=y | ||
| 25 | # CONFIG_AUDIT is not set | ||
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | ||
| 29 | CONFIG_IKCONFIG_PROC=y | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | CONFIG_OBSOLETE_MODPARM=y | ||
| 54 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 55 | CONFIG_KMOD=y | ||
| 56 | |||
| 57 | # | ||
| 58 | # Block layer | ||
| 59 | # | ||
| 60 | # CONFIG_LBD is not set | ||
| 61 | |||
| 62 | # | ||
| 63 | # IO Schedulers | ||
| 64 | # | ||
| 65 | CONFIG_IOSCHED_NOOP=y | ||
| 66 | CONFIG_IOSCHED_AS=y | ||
| 67 | CONFIG_IOSCHED_DEADLINE=y | ||
| 68 | CONFIG_IOSCHED_CFQ=y | ||
| 69 | CONFIG_DEFAULT_AS=y | ||
| 70 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 71 | # CONFIG_DEFAULT_CFQ is not set | ||
| 72 | # CONFIG_DEFAULT_NOOP is not set | ||
| 73 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 74 | |||
| 75 | # | ||
| 76 | # Machine selection | 9 | # Machine selection |
| 77 | # | 10 | # |
| 78 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -209,6 +142,73 @@ CONFIG_PREEMPT_NONE=y | |||
| 209 | # CONFIG_PREEMPT is not set | 142 | # CONFIG_PREEMPT is not set |
| 210 | 143 | ||
| 211 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | # CONFIG_EXPERIMENTAL is not set | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 160 | CONFIG_SYSCTL=y | ||
| 161 | # CONFIG_AUDIT is not set | ||
| 162 | CONFIG_HOTPLUG=y | ||
| 163 | CONFIG_KOBJECT_UEVENT=y | ||
| 164 | CONFIG_IKCONFIG=y | ||
| 165 | CONFIG_IKCONFIG_PROC=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | 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_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | CONFIG_MODULES=y | ||
| 188 | CONFIG_MODULE_UNLOAD=y | ||
| 189 | CONFIG_OBSOLETE_MODPARM=y | ||
| 190 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 191 | CONFIG_KMOD=y | ||
| 192 | |||
| 193 | # | ||
| 194 | # Block layer | ||
| 195 | # | ||
| 196 | # CONFIG_LBD is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # IO Schedulers | ||
| 200 | # | ||
| 201 | CONFIG_IOSCHED_NOOP=y | ||
| 202 | CONFIG_IOSCHED_AS=y | ||
| 203 | CONFIG_IOSCHED_DEADLINE=y | ||
| 204 | CONFIG_IOSCHED_CFQ=y | ||
| 205 | CONFIG_DEFAULT_AS=y | ||
| 206 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 207 | # CONFIG_DEFAULT_CFQ is not set | ||
| 208 | # CONFIG_DEFAULT_NOOP is not set | ||
| 209 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 210 | |||
| 211 | # | ||
| 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 213 | # | 213 | # |
| 214 | CONFIG_HW_HAS_PCI=y | 214 | CONFIG_HW_HAS_PCI=y |
| @@ -283,7 +283,6 @@ CONFIG_IPV6_TUNNEL=m | |||
| 283 | # QoS and/or fair queueing | 283 | # QoS and/or fair queueing |
| 284 | # | 284 | # |
| 285 | # CONFIG_NET_SCHED is not set | 285 | # CONFIG_NET_SCHED is not set |
| 286 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 287 | 286 | ||
| 288 | # | 287 | # |
| 289 | # Network testing | 288 | # Network testing |
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index c0ac5c793ec7..a8ded3d74152 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:44 2005 | 4 | # Thu Nov 24 01:06:31 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -193,6 +130,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 193 | CONFIG_RTC_DS1742=y | 130 | CONFIG_RTC_DS1742=y |
| 194 | 131 | ||
| 195 | # | 132 | # |
| 133 | # Code maturity level options | ||
| 134 | # | ||
| 135 | CONFIG_EXPERIMENTAL=y | ||
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | ||
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 139 | |||
| 140 | # | ||
| 141 | # General setup | ||
| 142 | # | ||
| 143 | CONFIG_LOCALVERSION="" | ||
| 144 | CONFIG_LOCALVERSION_AUTO=y | ||
| 145 | CONFIG_SWAP=y | ||
| 146 | CONFIG_SYSVIPC=y | ||
| 147 | # CONFIG_POSIX_MQUEUE is not set | ||
| 148 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 149 | CONFIG_SYSCTL=y | ||
| 150 | # CONFIG_AUDIT is not set | ||
| 151 | CONFIG_HOTPLUG=y | ||
| 152 | CONFIG_KOBJECT_UEVENT=y | ||
| 153 | # CONFIG_IKCONFIG is not set | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | ||
| 155 | CONFIG_EMBEDDED=y | ||
| 156 | CONFIG_KALLSYMS=y | ||
| 157 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 158 | CONFIG_PRINTK=y | ||
| 159 | CONFIG_BUG=y | ||
| 160 | CONFIG_BASE_FULL=y | ||
| 161 | CONFIG_FUTEX=y | ||
| 162 | CONFIG_EPOLL=y | ||
| 163 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 164 | 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_TINY_SHMEM is not set | ||
| 170 | CONFIG_BASE_SMALL=0 | ||
| 171 | |||
| 172 | # | ||
| 173 | # Loadable module support | ||
| 174 | # | ||
| 175 | # CONFIG_MODULES is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Block layer | ||
| 179 | # | ||
| 180 | # CONFIG_LBD is not set | ||
| 181 | |||
| 182 | # | ||
| 183 | # IO Schedulers | ||
| 184 | # | ||
| 185 | CONFIG_IOSCHED_NOOP=y | ||
| 186 | CONFIG_IOSCHED_AS=y | ||
| 187 | CONFIG_IOSCHED_DEADLINE=y | ||
| 188 | CONFIG_IOSCHED_CFQ=y | ||
| 189 | CONFIG_DEFAULT_AS=y | ||
| 190 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 191 | # CONFIG_DEFAULT_CFQ is not set | ||
| 192 | # CONFIG_DEFAULT_NOOP is not set | ||
| 193 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 194 | |||
| 195 | # | ||
| 196 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 196 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 197 | # | 197 | # |
| 198 | CONFIG_HW_HAS_PCI=y | 198 | CONFIG_HW_HAS_PCI=y |
| @@ -280,7 +280,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # QoS and/or fair queueing | 280 | # QoS and/or fair queueing |
| 281 | # | 281 | # |
| 282 | # CONFIG_NET_SCHED is not set | 282 | # CONFIG_NET_SCHED is not set |
| 283 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 284 | 283 | ||
| 285 | # | 284 | # |
| 286 | # Network testing | 285 | # Network testing |
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index f2bd620ff0fa..a7ad99b12fe5 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:47 2005 | 4 | # Thu Nov 24 01:06:33 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -208,6 +139,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 208 | # CONFIG_PREEMPT is not set | 139 | # CONFIG_PREEMPT is not set |
| 209 | 140 | ||
| 210 | # | 141 | # |
| 142 | # Code maturity level options | ||
| 143 | # | ||
| 144 | CONFIG_EXPERIMENTAL=y | ||
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | ||
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 148 | |||
| 149 | # | ||
| 150 | # General setup | ||
| 151 | # | ||
| 152 | CONFIG_LOCALVERSION="" | ||
| 153 | CONFIG_LOCALVERSION_AUTO=y | ||
| 154 | CONFIG_SWAP=y | ||
| 155 | CONFIG_SYSVIPC=y | ||
| 156 | # CONFIG_POSIX_MQUEUE is not set | ||
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 158 | CONFIG_SYSCTL=y | ||
| 159 | # CONFIG_AUDIT is not set | ||
| 160 | CONFIG_HOTPLUG=y | ||
| 161 | CONFIG_KOBJECT_UEVENT=y | ||
| 162 | # CONFIG_IKCONFIG is not set | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | ||
| 164 | CONFIG_EMBEDDED=y | ||
| 165 | CONFIG_KALLSYMS=y | ||
| 166 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 167 | CONFIG_PRINTK=y | ||
| 168 | CONFIG_BUG=y | ||
| 169 | CONFIG_BASE_FULL=y | ||
| 170 | CONFIG_FUTEX=y | ||
| 171 | CONFIG_EPOLL=y | ||
| 172 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 173 | 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_TINY_SHMEM is not set | ||
| 179 | CONFIG_BASE_SMALL=0 | ||
| 180 | |||
| 181 | # | ||
| 182 | # Loadable module support | ||
| 183 | # | ||
| 184 | CONFIG_MODULES=y | ||
| 185 | CONFIG_MODULE_UNLOAD=y | ||
| 186 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | CONFIG_MODVERSIONS=y | ||
| 189 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 190 | CONFIG_KMOD=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Block layer | ||
| 194 | # | ||
| 195 | # CONFIG_LBD is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # IO Schedulers | ||
| 199 | # | ||
| 200 | CONFIG_IOSCHED_NOOP=y | ||
| 201 | CONFIG_IOSCHED_AS=y | ||
| 202 | CONFIG_IOSCHED_DEADLINE=y | ||
| 203 | CONFIG_IOSCHED_CFQ=y | ||
| 204 | CONFIG_DEFAULT_AS=y | ||
| 205 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 206 | # CONFIG_DEFAULT_CFQ is not set | ||
| 207 | # CONFIG_DEFAULT_NOOP is not set | ||
| 208 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 209 | |||
| 210 | # | ||
| 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 212 | # | 212 | # |
| 213 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| @@ -291,7 +291,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 291 | # QoS and/or fair queueing | 291 | # QoS and/or fair queueing |
| 292 | # | 292 | # |
| 293 | # CONFIG_NET_SCHED is not set | 293 | # CONFIG_NET_SCHED is not set |
| 294 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 295 | 294 | ||
| 296 | # | 295 | # |
| 297 | # Network testing | 296 | # Network testing |
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index e48e1de442b4..d1c44216f1c1 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 13:42:55 2005 | 4 | # Thu Nov 24 01:06:35 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -221,6 +152,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 221 | # CONFIG_PREEMPT is not set | 152 | # CONFIG_PREEMPT is not set |
| 222 | 153 | ||
| 223 | # | 154 | # |
| 155 | # Code maturity level options | ||
| 156 | # | ||
| 157 | CONFIG_EXPERIMENTAL=y | ||
| 158 | CONFIG_CLEAN_COMPILE=y | ||
| 159 | CONFIG_BROKEN_ON_SMP=y | ||
| 160 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 161 | |||
| 162 | # | ||
| 163 | # General setup | ||
| 164 | # | ||
| 165 | CONFIG_LOCALVERSION="" | ||
| 166 | CONFIG_LOCALVERSION_AUTO=y | ||
| 167 | CONFIG_SWAP=y | ||
| 168 | CONFIG_SYSVIPC=y | ||
| 169 | # CONFIG_POSIX_MQUEUE is not set | ||
| 170 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 171 | CONFIG_SYSCTL=y | ||
| 172 | # CONFIG_AUDIT is not set | ||
| 173 | CONFIG_HOTPLUG=y | ||
| 174 | CONFIG_KOBJECT_UEVENT=y | ||
| 175 | # CONFIG_IKCONFIG is not set | ||
| 176 | CONFIG_INITRAMFS_SOURCE="" | ||
| 177 | CONFIG_EMBEDDED=y | ||
| 178 | CONFIG_KALLSYMS=y | ||
| 179 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 180 | CONFIG_PRINTK=y | ||
| 181 | CONFIG_BUG=y | ||
| 182 | CONFIG_BASE_FULL=y | ||
| 183 | CONFIG_FUTEX=y | ||
| 184 | CONFIG_EPOLL=y | ||
| 185 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 186 | 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_TINY_SHMEM is not set | ||
| 192 | CONFIG_BASE_SMALL=0 | ||
| 193 | |||
| 194 | # | ||
| 195 | # Loadable module support | ||
| 196 | # | ||
| 197 | CONFIG_MODULES=y | ||
| 198 | CONFIG_MODULE_UNLOAD=y | ||
| 199 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 200 | CONFIG_OBSOLETE_MODPARM=y | ||
| 201 | CONFIG_MODVERSIONS=y | ||
| 202 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 203 | CONFIG_KMOD=y | ||
| 204 | |||
| 205 | # | ||
| 206 | # Block layer | ||
| 207 | # | ||
| 208 | # CONFIG_LBD is not set | ||
| 209 | |||
| 210 | # | ||
| 211 | # IO Schedulers | ||
| 212 | # | ||
| 213 | CONFIG_IOSCHED_NOOP=y | ||
| 214 | CONFIG_IOSCHED_AS=y | ||
| 215 | CONFIG_IOSCHED_DEADLINE=y | ||
| 216 | CONFIG_IOSCHED_CFQ=y | ||
| 217 | CONFIG_DEFAULT_AS=y | ||
| 218 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 219 | # CONFIG_DEFAULT_CFQ is not set | ||
| 220 | # CONFIG_DEFAULT_NOOP is not set | ||
| 221 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 222 | |||
| 223 | # | ||
| 224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 225 | # | 225 | # |
| 226 | CONFIG_HW_HAS_PCI=y | 226 | CONFIG_HW_HAS_PCI=y |
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 04abd1b3202b..ac39ab7feeb7 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:55 2005 | 4 | # Thu Nov 24 01:06:37 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_ALL is not set | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -208,6 +138,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 208 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
| 209 | 139 | ||
| 210 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | CONFIG_EXPERIMENTAL=y | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_POSIX_MQUEUE is not set | ||
| 156 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 157 | CONFIG_SYSCTL=y | ||
| 158 | # CONFIG_AUDIT is not set | ||
| 159 | CONFIG_HOTPLUG=y | ||
| 160 | CONFIG_KOBJECT_UEVENT=y | ||
| 161 | # CONFIG_IKCONFIG is not set | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | ||
| 163 | CONFIG_EMBEDDED=y | ||
| 164 | CONFIG_KALLSYMS=y | ||
| 165 | # CONFIG_KALLSYMS_ALL is not set | ||
| 166 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 167 | CONFIG_PRINTK=y | ||
| 168 | CONFIG_BUG=y | ||
| 169 | CONFIG_BASE_FULL=y | ||
| 170 | CONFIG_FUTEX=y | ||
| 171 | CONFIG_EPOLL=y | ||
| 172 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 173 | 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_TINY_SHMEM is not set | ||
| 179 | CONFIG_BASE_SMALL=0 | ||
| 180 | |||
| 181 | # | ||
| 182 | # Loadable module support | ||
| 183 | # | ||
| 184 | CONFIG_MODULES=y | ||
| 185 | CONFIG_MODULE_UNLOAD=y | ||
| 186 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | CONFIG_MODVERSIONS=y | ||
| 189 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 190 | CONFIG_KMOD=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Block layer | ||
| 194 | # | ||
| 195 | # CONFIG_LBD is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # IO Schedulers | ||
| 199 | # | ||
| 200 | CONFIG_IOSCHED_NOOP=y | ||
| 201 | CONFIG_IOSCHED_AS=y | ||
| 202 | CONFIG_IOSCHED_DEADLINE=y | ||
| 203 | CONFIG_IOSCHED_CFQ=y | ||
| 204 | CONFIG_DEFAULT_AS=y | ||
| 205 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 206 | # CONFIG_DEFAULT_CFQ is not set | ||
| 207 | # CONFIG_DEFAULT_NOOP is not set | ||
| 208 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 209 | |||
| 210 | # | ||
| 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 212 | # | 212 | # |
| 213 | CONFIG_MMU=y | 213 | CONFIG_MMU=y |
| @@ -558,6 +558,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 558 | # | 558 | # |
| 559 | # TPM devices | 559 | # TPM devices |
| 560 | # | 560 | # |
| 561 | # CONFIG_TCG_TPM is not set | ||
| 561 | # CONFIG_TELCLOCK is not set | 562 | # CONFIG_TELCLOCK is not set |
| 562 | 563 | ||
| 563 | # | 564 | # |
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 46814be0ac38..2b5ea37484e4 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:12:01 2005 | 4 | # Thu Nov 24 01:06:39 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -206,6 +137,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 206 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 207 | 138 | ||
| 208 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | CONFIG_SWAP=y | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_POSIX_MQUEUE is not set | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | # CONFIG_IKCONFIG is not set | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | ||
| 162 | CONFIG_EMBEDDED=y | ||
| 163 | CONFIG_KALLSYMS=y | ||
| 164 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 165 | CONFIG_PRINTK=y | ||
| 166 | CONFIG_BUG=y | ||
| 167 | CONFIG_BASE_FULL=y | ||
| 168 | CONFIG_FUTEX=y | ||
| 169 | CONFIG_EPOLL=y | ||
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 171 | CONFIG_SHMEM=y | ||
| 172 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 173 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 174 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 175 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 176 | # CONFIG_TINY_SHMEM is not set | ||
| 177 | CONFIG_BASE_SMALL=0 | ||
| 178 | |||
| 179 | # | ||
| 180 | # Loadable module support | ||
| 181 | # | ||
| 182 | CONFIG_MODULES=y | ||
| 183 | CONFIG_MODULE_UNLOAD=y | ||
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | ||
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 188 | CONFIG_KMOD=y | ||
| 189 | |||
| 190 | # | ||
| 191 | # Block layer | ||
| 192 | # | ||
| 193 | # CONFIG_LBD is not set | ||
| 194 | |||
| 195 | # | ||
| 196 | # IO Schedulers | ||
| 197 | # | ||
| 198 | CONFIG_IOSCHED_NOOP=y | ||
| 199 | CONFIG_IOSCHED_AS=y | ||
| 200 | CONFIG_IOSCHED_DEADLINE=y | ||
| 201 | CONFIG_IOSCHED_CFQ=y | ||
| 202 | CONFIG_DEFAULT_AS=y | ||
| 203 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 204 | # CONFIG_DEFAULT_CFQ is not set | ||
| 205 | # CONFIG_DEFAULT_NOOP is not set | ||
| 206 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 207 | |||
| 208 | # | ||
| 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 210 | # | 210 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 211 | CONFIG_HW_HAS_PCI=y |
| @@ -304,7 +304,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 304 | # QoS and/or fair queueing | 304 | # QoS and/or fair queueing |
| 305 | # | 305 | # |
| 306 | # CONFIG_NET_SCHED is not set | 306 | # CONFIG_NET_SCHED is not set |
| 307 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 308 | 307 | ||
| 309 | # | 308 | # |
| 310 | # Network testing | 309 | # Network testing |
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index e12118c30db4..9081ea5a9dbd 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:01:36 2005 | 4 | # Thu Nov 24 01:06:41 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -212,6 +142,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 212 | # CONFIG_PREEMPT is not set | 142 | # CONFIG_PREEMPT is not set |
| 213 | 143 | ||
| 214 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | CONFIG_EXPERIMENTAL=y | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | # CONFIG_POSIX_MQUEUE is not set | ||
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 161 | CONFIG_SYSCTL=y | ||
| 162 | # CONFIG_AUDIT is not set | ||
| 163 | CONFIG_HOTPLUG=y | ||
| 164 | CONFIG_KOBJECT_UEVENT=y | ||
| 165 | CONFIG_IKCONFIG=y | ||
| 166 | CONFIG_IKCONFIG_PROC=y | ||
| 167 | CONFIG_INITRAMFS_SOURCE="" | ||
| 168 | CONFIG_EMBEDDED=y | ||
| 169 | CONFIG_KALLSYMS=y | ||
| 170 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 171 | CONFIG_PRINTK=y | ||
| 172 | CONFIG_BUG=y | ||
| 173 | CONFIG_BASE_FULL=y | ||
| 174 | CONFIG_FUTEX=y | ||
| 175 | CONFIG_EPOLL=y | ||
| 176 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 177 | 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_TINY_SHMEM is not set | ||
| 183 | CONFIG_BASE_SMALL=0 | ||
| 184 | |||
| 185 | # | ||
| 186 | # Loadable module support | ||
| 187 | # | ||
| 188 | CONFIG_MODULES=y | ||
| 189 | CONFIG_MODULE_UNLOAD=y | ||
| 190 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 191 | CONFIG_OBSOLETE_MODPARM=y | ||
| 192 | CONFIG_MODVERSIONS=y | ||
| 193 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 194 | CONFIG_KMOD=y | ||
| 195 | |||
| 196 | # | ||
| 197 | # Block layer | ||
| 198 | # | ||
| 199 | # CONFIG_LBD is not set | ||
| 200 | |||
| 201 | # | ||
| 202 | # IO Schedulers | ||
| 203 | # | ||
| 204 | CONFIG_IOSCHED_NOOP=y | ||
| 205 | CONFIG_IOSCHED_AS=y | ||
| 206 | CONFIG_IOSCHED_DEADLINE=y | ||
| 207 | CONFIG_IOSCHED_CFQ=y | ||
| 208 | CONFIG_DEFAULT_AS=y | ||
| 209 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 210 | # CONFIG_DEFAULT_CFQ is not set | ||
| 211 | # CONFIG_DEFAULT_NOOP is not set | ||
| 212 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 213 | |||
| 214 | # | ||
| 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 216 | # | 216 | # |
| 217 | CONFIG_HW_HAS_PCI=y | 217 | CONFIG_HW_HAS_PCI=y |
| @@ -333,7 +333,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 333 | # QoS and/or fair queueing | 333 | # QoS and/or fair queueing |
| 334 | # | 334 | # |
| 335 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 336 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 337 | 336 | ||
| 338 | # | 337 | # |
| 339 | # Network testing | 338 | # Network testing |
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index 99f0c980aee7..570fc4d18166 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig | |||
| @@ -1,73 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:05 2005 | 4 | # Thu Nov 24 01:06:43 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | |||
| 57 | # | ||
| 58 | # IO Schedulers | ||
| 59 | # | ||
| 60 | CONFIG_IOSCHED_NOOP=y | ||
| 61 | CONFIG_IOSCHED_AS=y | ||
| 62 | CONFIG_IOSCHED_DEADLINE=y | ||
| 63 | CONFIG_IOSCHED_CFQ=y | ||
| 64 | CONFIG_DEFAULT_AS=y | ||
| 65 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 66 | # CONFIG_DEFAULT_CFQ is not set | ||
| 67 | # CONFIG_DEFAULT_NOOP is not set | ||
| 68 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 69 | |||
| 70 | # | ||
| 71 | # Machine selection | 9 | # Machine selection |
| 72 | # | 10 | # |
| 73 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -199,6 +137,68 @@ CONFIG_PREEMPT_NONE=y | |||
| 199 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 200 | 138 | ||
| 201 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | CONFIG_SWAP=y | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_POSIX_MQUEUE is not set | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | # CONFIG_IKCONFIG is not set | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | ||
| 162 | CONFIG_EMBEDDED=y | ||
| 163 | CONFIG_KALLSYMS=y | ||
| 164 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 165 | CONFIG_PRINTK=y | ||
| 166 | CONFIG_BUG=y | ||
| 167 | CONFIG_BASE_FULL=y | ||
| 168 | CONFIG_FUTEX=y | ||
| 169 | CONFIG_EPOLL=y | ||
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 171 | CONFIG_SHMEM=y | ||
| 172 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 173 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 174 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 175 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 176 | # CONFIG_TINY_SHMEM is not set | ||
| 177 | CONFIG_BASE_SMALL=0 | ||
| 178 | |||
| 179 | # | ||
| 180 | # Loadable module support | ||
| 181 | # | ||
| 182 | # CONFIG_MODULES is not set | ||
| 183 | |||
| 184 | # | ||
| 185 | # Block layer | ||
| 186 | # | ||
| 187 | |||
| 188 | # | ||
| 189 | # IO Schedulers | ||
| 190 | # | ||
| 191 | CONFIG_IOSCHED_NOOP=y | ||
| 192 | CONFIG_IOSCHED_AS=y | ||
| 193 | CONFIG_IOSCHED_DEADLINE=y | ||
| 194 | CONFIG_IOSCHED_CFQ=y | ||
| 195 | CONFIG_DEFAULT_AS=y | ||
| 196 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 197 | # CONFIG_DEFAULT_CFQ is not set | ||
| 198 | # CONFIG_DEFAULT_NOOP is not set | ||
| 199 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 200 | |||
| 201 | # | ||
| 202 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 202 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 203 | # | 203 | # |
| 204 | CONFIG_HW_HAS_PCI=y | 204 | CONFIG_HW_HAS_PCI=y |
| @@ -290,7 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 290 | # QoS and/or fair queueing | 290 | # QoS and/or fair queueing |
| 291 | # | 291 | # |
| 292 | # CONFIG_NET_SCHED is not set | 292 | # CONFIG_NET_SCHED is not set |
| 293 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 294 | 293 | ||
| 295 | # | 294 | # |
| 296 | # Network testing | 295 | # Network testing |
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 11c7d74ee1e5..6634ab24715c 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:08 2005 | 4 | # Thu Nov 24 01:06:44 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -205,6 +142,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 205 | # CONFIG_PREEMPT is not set | 142 | # CONFIG_PREEMPT is not set |
| 206 | 143 | ||
| 207 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | CONFIG_EXPERIMENTAL=y | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | # CONFIG_POSIX_MQUEUE is not set | ||
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 161 | CONFIG_SYSCTL=y | ||
| 162 | # CONFIG_AUDIT is not set | ||
| 163 | # CONFIG_HOTPLUG is not set | ||
| 164 | CONFIG_KOBJECT_UEVENT=y | ||
| 165 | # CONFIG_IKCONFIG is not set | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | 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_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | # CONFIG_MODULES is not set | ||
| 188 | |||
| 189 | # | ||
| 190 | # Block layer | ||
| 191 | # | ||
| 192 | # CONFIG_LBD is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # IO Schedulers | ||
| 196 | # | ||
| 197 | CONFIG_IOSCHED_NOOP=y | ||
| 198 | CONFIG_IOSCHED_AS=y | ||
| 199 | CONFIG_IOSCHED_DEADLINE=y | ||
| 200 | CONFIG_IOSCHED_CFQ=y | ||
| 201 | CONFIG_DEFAULT_AS=y | ||
| 202 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 203 | # CONFIG_DEFAULT_CFQ is not set | ||
| 204 | # CONFIG_DEFAULT_NOOP is not set | ||
| 205 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 206 | |||
| 207 | # | ||
| 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 209 | # | 209 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| @@ -289,7 +289,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # QoS and/or fair queueing | 289 | # QoS and/or fair queueing |
| 290 | # | 290 | # |
| 291 | # CONFIG_NET_SCHED is not set | 291 | # CONFIG_NET_SCHED is not set |
| 292 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 293 | 292 | ||
| 294 | # | 293 | # |
| 295 | # Network testing | 294 | # Network testing |
| @@ -527,6 +526,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 527 | # | 526 | # |
| 528 | # TPM devices | 527 | # TPM devices |
| 529 | # | 528 | # |
| 529 | # CONFIG_TCG_TPM is not set | ||
| 530 | # CONFIG_TELCLOCK is not set | 530 | # CONFIG_TELCLOCK is not set |
| 531 | 531 | ||
| 532 | # | 532 | # |
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index 9ced1a9029d4..4c396e1e2f0a 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig | |||
| @@ -1,73 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:11 2005 | 4 | # Thu Nov 24 01:06:46 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | |||
| 57 | # | ||
| 58 | # IO Schedulers | ||
| 59 | # | ||
| 60 | CONFIG_IOSCHED_NOOP=y | ||
| 61 | CONFIG_IOSCHED_AS=y | ||
| 62 | CONFIG_IOSCHED_DEADLINE=y | ||
| 63 | CONFIG_IOSCHED_CFQ=y | ||
| 64 | CONFIG_DEFAULT_AS=y | ||
| 65 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 66 | # CONFIG_DEFAULT_CFQ is not set | ||
| 67 | # CONFIG_DEFAULT_NOOP is not set | ||
| 68 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 69 | |||
| 70 | # | ||
| 71 | # Machine selection | 9 | # Machine selection |
| 72 | # | 10 | # |
| 73 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +140,68 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
| 203 | 141 | ||
| 204 | # | 142 | # |
| 143 | # Code maturity level options | ||
| 144 | # | ||
| 145 | CONFIG_EXPERIMENTAL=y | ||
| 146 | CONFIG_CLEAN_COMPILE=y | ||
| 147 | CONFIG_BROKEN_ON_SMP=y | ||
| 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 149 | |||
| 150 | # | ||
| 151 | # General setup | ||
| 152 | # | ||
| 153 | CONFIG_LOCALVERSION="" | ||
| 154 | CONFIG_LOCALVERSION_AUTO=y | ||
| 155 | CONFIG_SWAP=y | ||
| 156 | CONFIG_SYSVIPC=y | ||
| 157 | # CONFIG_POSIX_MQUEUE is not set | ||
| 158 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 159 | CONFIG_SYSCTL=y | ||
| 160 | # CONFIG_AUDIT is not set | ||
| 161 | CONFIG_HOTPLUG=y | ||
| 162 | CONFIG_KOBJECT_UEVENT=y | ||
| 163 | # CONFIG_IKCONFIG is not set | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | ||
| 165 | CONFIG_EMBEDDED=y | ||
| 166 | CONFIG_KALLSYMS=y | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | 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_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | # CONFIG_MODULES is not set | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -293,7 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 293 | # QoS and/or fair queueing | 293 | # QoS and/or fair queueing |
| 294 | # | 294 | # |
| 295 | # CONFIG_NET_SCHED is not set | 295 | # CONFIG_NET_SCHED is not set |
| 296 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 297 | 296 | ||
| 298 | # | 297 | # |
| 299 | # Network testing | 298 | # Network testing |
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index dbcaa77add7c..883626afc47d 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:12:31 2005 | 4 | # Thu Nov 24 01:06:48 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | CONFIG_HOTPLUG=y | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | 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_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| @@ -322,7 +322,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 322 | # QoS and/or fair queueing | 322 | # QoS and/or fair queueing |
| 323 | # | 323 | # |
| 324 | # CONFIG_NET_SCHED is not set | 324 | # CONFIG_NET_SCHED is not set |
| 325 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 326 | 325 | ||
| 327 | # | 326 | # |
| 328 | # Network testing | 327 | # Network testing |
| @@ -662,6 +661,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 662 | # | 661 | # |
| 663 | # TPM devices | 662 | # TPM devices |
| 664 | # | 663 | # |
| 664 | # CONFIG_TCG_TPM is not set | ||
| 665 | # CONFIG_TELCLOCK is not set | 665 | # CONFIG_TELCLOCK is not set |
| 666 | 666 | ||
| 667 | # | 667 | # |
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index 5b685ceb6fde..f8fbc77f924e 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:14:25 2005 | 4 | # Thu Nov 24 01:06:50 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +134,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 204 | 135 | ||
| 205 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 328 | # QoS and/or fair queueing | 328 | # QoS and/or fair queueing |
| 329 | # | 329 | # |
| 330 | # CONFIG_NET_SCHED is not set | 330 | # CONFIG_NET_SCHED is not set |
| 331 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 332 | 331 | ||
| 333 | # | 332 | # |
| 334 | # Network testing | 333 | # Network testing |
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index f8f32e99f72d..3d694cd68d38 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:15:34 2005 | 4 | # Thu Nov 24 01:06:52 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +134,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 204 | 135 | ||
| 205 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 328 | # QoS and/or fair queueing | 328 | # QoS and/or fair queueing |
| 329 | # | 329 | # |
| 330 | # CONFIG_NET_SCHED is not set | 330 | # CONFIG_NET_SCHED is not set |
| 331 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 332 | 331 | ||
| 333 | # | 332 | # |
| 334 | # Network testing | 333 | # Network testing |
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 5820e5f2295e..fba624a792a9 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:25 2005 | 4 | # Thu Nov 24 01:06:54 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_ALL is not set | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | # CONFIG_MODULE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODVERSIONS is not set | ||
| 57 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +133,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 204 | 134 | ||
| 205 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | # CONFIG_HOTPLUG is not set | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | CONFIG_IKCONFIG=y | ||
| 157 | CONFIG_IKCONFIG_PROC=y | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_ALL is not set | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | 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_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | # CONFIG_MODULE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | # CONFIG_MODVERSIONS is not set | ||
| 184 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -289,7 +289,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # QoS and/or fair queueing | 289 | # QoS and/or fair queueing |
| 290 | # | 290 | # |
| 291 | # CONFIG_NET_SCHED is not set | 291 | # CONFIG_NET_SCHED is not set |
| 292 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 293 | 292 | ||
| 294 | # | 293 | # |
| 295 | # Network testing | 294 | # Network testing |
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index a4ebb538e15c..d9a0d2fdba4f 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:02:38 2005 | 4 | # Thu Nov 24 01:06:58 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | # CONFIG_MODULE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | # CONFIG_MODVERSIONS is not set | ||
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | # CONFIG_HOTPLUG is not set | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | CONFIG_IKCONFIG=y | ||
| 159 | CONFIG_IKCONFIG_PROC=y | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | ||
| 161 | CONFIG_EMBEDDED=y | ||
| 162 | CONFIG_KALLSYMS=y | ||
| 163 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 164 | CONFIG_PRINTK=y | ||
| 165 | CONFIG_BUG=y | ||
| 166 | CONFIG_BASE_FULL=y | ||
| 167 | CONFIG_FUTEX=y | ||
| 168 | CONFIG_EPOLL=y | ||
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 170 | 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_TINY_SHMEM is not set | ||
| 176 | CONFIG_BASE_SMALL=0 | ||
| 177 | |||
| 178 | # | ||
| 179 | # Loadable module support | ||
| 180 | # | ||
| 181 | CONFIG_MODULES=y | ||
| 182 | # CONFIG_MODULE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | # CONFIG_MODVERSIONS is not set | ||
| 185 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| @@ -321,7 +321,6 @@ CONFIG_NETFILTER=y | |||
| 321 | # QoS and/or fair queueing | 321 | # QoS and/or fair queueing |
| 322 | # | 322 | # |
| 323 | # CONFIG_NET_SCHED is not set | 323 | # CONFIG_NET_SCHED is not set |
| 324 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 325 | 324 | ||
| 326 | # | 325 | # |
| 327 | # Network testing | 326 | # Network testing |
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 5d39162077f4..dee44606164c 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig | |||
| @@ -1,73 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:31 2005 | 4 | # Thu Nov 24 01:07:00 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | # CONFIG_EXPERIMENTAL is not set | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | # CONFIG_SWAP is not set | ||
| 22 | # CONFIG_SYSVIPC is not set | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | # CONFIG_SYSCTL is not set | ||
| 25 | # CONFIG_AUDIT is not set | ||
| 26 | # CONFIG_HOTPLUG is not set | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | # CONFIG_IKCONFIG is not set | ||
| 29 | CONFIG_INITRAMFS_SOURCE="" | ||
| 30 | CONFIG_EMBEDDED=y | ||
| 31 | CONFIG_KALLSYMS=y | ||
| 32 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 33 | CONFIG_PRINTK=y | ||
| 34 | # CONFIG_BUG is not set | ||
| 35 | # CONFIG_BASE_FULL is not set | ||
| 36 | # CONFIG_FUTEX is not set | ||
| 37 | # CONFIG_EPOLL is not set | ||
| 38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 39 | # CONFIG_SHMEM is not set | ||
| 40 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 41 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 42 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 43 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 44 | CONFIG_TINY_SHMEM=y | ||
| 45 | CONFIG_BASE_SMALL=1 | ||
| 46 | |||
| 47 | # | ||
| 48 | # Loadable module support | ||
| 49 | # | ||
| 50 | # CONFIG_MODULES is not set | ||
| 51 | |||
| 52 | # | ||
| 53 | # Block layer | ||
| 54 | # | ||
| 55 | # CONFIG_LBD is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # IO Schedulers | ||
| 59 | # | ||
| 60 | CONFIG_IOSCHED_NOOP=y | ||
| 61 | # CONFIG_IOSCHED_AS is not set | ||
| 62 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 63 | # CONFIG_IOSCHED_CFQ is not set | ||
| 64 | # CONFIG_DEFAULT_AS is not set | ||
| 65 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 66 | # CONFIG_DEFAULT_CFQ is not set | ||
| 67 | CONFIG_DEFAULT_NOOP=y | ||
| 68 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 69 | |||
| 70 | # | ||
| 71 | # Machine selection | 9 | # Machine selection |
| 72 | # | 10 | # |
| 73 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -192,6 +130,68 @@ CONFIG_PREEMPT_NONE=y | |||
| 192 | # CONFIG_PREEMPT is not set | 130 | # CONFIG_PREEMPT is not set |
| 193 | 131 | ||
| 194 | # | 132 | # |
| 133 | # Code maturity level options | ||
| 134 | # | ||
| 135 | # CONFIG_EXPERIMENTAL is not set | ||
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | ||
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 139 | |||
| 140 | # | ||
| 141 | # General setup | ||
| 142 | # | ||
| 143 | CONFIG_LOCALVERSION="" | ||
| 144 | CONFIG_LOCALVERSION_AUTO=y | ||
| 145 | # CONFIG_SWAP is not set | ||
| 146 | # CONFIG_SYSVIPC is not set | ||
| 147 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 148 | # CONFIG_SYSCTL is not set | ||
| 149 | # CONFIG_AUDIT is not set | ||
| 150 | # CONFIG_HOTPLUG is not set | ||
| 151 | CONFIG_KOBJECT_UEVENT=y | ||
| 152 | # CONFIG_IKCONFIG is not set | ||
| 153 | CONFIG_INITRAMFS_SOURCE="" | ||
| 154 | CONFIG_EMBEDDED=y | ||
| 155 | CONFIG_KALLSYMS=y | ||
| 156 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 157 | CONFIG_PRINTK=y | ||
| 158 | # CONFIG_BUG is not set | ||
| 159 | # CONFIG_BASE_FULL is not set | ||
| 160 | # CONFIG_FUTEX is not set | ||
| 161 | # CONFIG_EPOLL is not set | ||
| 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 163 | # CONFIG_SHMEM is not set | ||
| 164 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 165 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 166 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 167 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 168 | CONFIG_TINY_SHMEM=y | ||
| 169 | CONFIG_BASE_SMALL=1 | ||
| 170 | |||
| 171 | # | ||
| 172 | # Loadable module support | ||
| 173 | # | ||
| 174 | # CONFIG_MODULES is not set | ||
| 175 | |||
| 176 | # | ||
| 177 | # Block layer | ||
| 178 | # | ||
| 179 | # CONFIG_LBD is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # IO Schedulers | ||
| 183 | # | ||
| 184 | CONFIG_IOSCHED_NOOP=y | ||
| 185 | # CONFIG_IOSCHED_AS is not set | ||
| 186 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 187 | # CONFIG_IOSCHED_CFQ is not set | ||
| 188 | # CONFIG_DEFAULT_AS is not set | ||
| 189 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 190 | # CONFIG_DEFAULT_CFQ is not set | ||
| 191 | CONFIG_DEFAULT_NOOP=y | ||
| 192 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 193 | |||
| 194 | # | ||
| 195 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 195 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 196 | # | 196 | # |
| 197 | CONFIG_ISA=y | 197 | CONFIG_ISA=y |
| @@ -258,7 +258,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 258 | # QoS and/or fair queueing | 258 | # QoS and/or fair queueing |
| 259 | # | 259 | # |
| 260 | # CONFIG_NET_SCHED is not set | 260 | # CONFIG_NET_SCHED is not set |
| 261 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 262 | 261 | ||
| 263 | # | 262 | # |
| 264 | # Network testing | 263 | # Network testing |
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 047e0b4236f8..1cc145023584 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:02:45 2005 | 4 | # Thu Nov 24 01:07:03 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | # CONFIG_KOBJECT_UEVENT is not set | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | # CONFIG_FUTEX is not set | ||
| 39 | # CONFIG_EPOLL is not set | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | # CONFIG_MODULE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | # CONFIG_MODVERSIONS is not set | ||
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -212,6 +143,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 212 | # CONFIG_PREEMPT is not set | 143 | # CONFIG_PREEMPT is not set |
| 213 | 144 | ||
| 214 | # | 145 | # |
| 146 | # Code maturity level options | ||
| 147 | # | ||
| 148 | CONFIG_EXPERIMENTAL=y | ||
| 149 | CONFIG_CLEAN_COMPILE=y | ||
| 150 | CONFIG_BROKEN_ON_SMP=y | ||
| 151 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 152 | |||
| 153 | # | ||
| 154 | # General setup | ||
| 155 | # | ||
| 156 | CONFIG_LOCALVERSION="" | ||
| 157 | CONFIG_LOCALVERSION_AUTO=y | ||
| 158 | CONFIG_SWAP=y | ||
| 159 | CONFIG_SYSVIPC=y | ||
| 160 | # CONFIG_POSIX_MQUEUE is not set | ||
| 161 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 162 | CONFIG_SYSCTL=y | ||
| 163 | # CONFIG_AUDIT is not set | ||
| 164 | CONFIG_HOTPLUG=y | ||
| 165 | # CONFIG_KOBJECT_UEVENT is not set | ||
| 166 | CONFIG_IKCONFIG=y | ||
| 167 | CONFIG_IKCONFIG_PROC=y | ||
| 168 | CONFIG_INITRAMFS_SOURCE="" | ||
| 169 | CONFIG_EMBEDDED=y | ||
| 170 | CONFIG_KALLSYMS=y | ||
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 172 | CONFIG_PRINTK=y | ||
| 173 | CONFIG_BUG=y | ||
| 174 | CONFIG_BASE_FULL=y | ||
| 175 | # CONFIG_FUTEX is not set | ||
| 176 | # CONFIG_EPOLL is not set | ||
| 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 178 | 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_TINY_SHMEM is not set | ||
| 184 | CONFIG_BASE_SMALL=0 | ||
| 185 | |||
| 186 | # | ||
| 187 | # Loadable module support | ||
| 188 | # | ||
| 189 | CONFIG_MODULES=y | ||
| 190 | # CONFIG_MODULE_UNLOAD is not set | ||
| 191 | CONFIG_OBSOLETE_MODPARM=y | ||
| 192 | # CONFIG_MODVERSIONS is not set | ||
| 193 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 194 | CONFIG_KMOD=y | ||
| 195 | |||
| 196 | # | ||
| 197 | # Block layer | ||
| 198 | # | ||
| 199 | # CONFIG_LBD is not set | ||
| 200 | |||
| 201 | # | ||
| 202 | # IO Schedulers | ||
| 203 | # | ||
| 204 | CONFIG_IOSCHED_NOOP=y | ||
| 205 | CONFIG_IOSCHED_AS=y | ||
| 206 | CONFIG_IOSCHED_DEADLINE=y | ||
| 207 | CONFIG_IOSCHED_CFQ=y | ||
| 208 | CONFIG_DEFAULT_AS=y | ||
| 209 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 210 | # CONFIG_DEFAULT_CFQ is not set | ||
| 211 | # CONFIG_DEFAULT_NOOP is not set | ||
| 212 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 213 | |||
| 214 | # | ||
| 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 216 | # | 216 | # |
| 217 | CONFIG_HW_HAS_PCI=y | 217 | CONFIG_HW_HAS_PCI=y |
| @@ -333,7 +333,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 333 | # QoS and/or fair queueing | 333 | # QoS and/or fair queueing |
| 334 | # | 334 | # |
| 335 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 336 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 337 | 336 | ||
| 338 | # | 337 | # |
| 339 | # Network testing | 338 | # Network testing |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 55458062352e..30975b305ae5 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
| @@ -1,82 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:02:50 2005 | 4 | # Thu Nov 24 01:07:06 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | CONFIG_POSIX_MQUEUE=y | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | CONFIG_HOTPLUG=y | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | CONFIG_IKCONFIG=y | ||
| 31 | CONFIG_IKCONFIG_PROC=y | ||
| 32 | CONFIG_INITRAMFS_SOURCE="" | ||
| 33 | CONFIG_EMBEDDED=y | ||
| 34 | CONFIG_KALLSYMS=y | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | CONFIG_MODULE_UNLOAD=y | ||
| 55 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 56 | CONFIG_OBSOLETE_MODPARM=y | ||
| 57 | CONFIG_MODVERSIONS=y | ||
| 58 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 59 | CONFIG_KMOD=y | ||
| 60 | |||
| 61 | # | ||
| 62 | # Block layer | ||
| 63 | # | ||
| 64 | # CONFIG_LBD is not set | ||
| 65 | |||
| 66 | # | ||
| 67 | # IO Schedulers | ||
| 68 | # | ||
| 69 | CONFIG_IOSCHED_NOOP=y | ||
| 70 | CONFIG_IOSCHED_AS=y | ||
| 71 | CONFIG_IOSCHED_DEADLINE=y | ||
| 72 | CONFIG_IOSCHED_CFQ=y | ||
| 73 | CONFIG_DEFAULT_AS=y | ||
| 74 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 75 | # CONFIG_DEFAULT_CFQ is not set | ||
| 76 | # CONFIG_DEFAULT_NOOP is not set | ||
| 77 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 78 | |||
| 79 | # | ||
| 80 | # Machine selection | 9 | # Machine selection |
| 81 | # | 10 | # |
| 82 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -214,6 +143,77 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 214 | # CONFIG_PREEMPT is not set | 143 | # CONFIG_PREEMPT is not set |
| 215 | 144 | ||
| 216 | # | 145 | # |
| 146 | # Code maturity level options | ||
| 147 | # | ||
| 148 | CONFIG_EXPERIMENTAL=y | ||
| 149 | CONFIG_CLEAN_COMPILE=y | ||
| 150 | CONFIG_BROKEN_ON_SMP=y | ||
| 151 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 152 | |||
| 153 | # | ||
| 154 | # General setup | ||
| 155 | # | ||
| 156 | CONFIG_LOCALVERSION="" | ||
| 157 | CONFIG_LOCALVERSION_AUTO=y | ||
| 158 | CONFIG_SWAP=y | ||
| 159 | CONFIG_SYSVIPC=y | ||
| 160 | CONFIG_POSIX_MQUEUE=y | ||
| 161 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 162 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 163 | CONFIG_SYSCTL=y | ||
| 164 | # CONFIG_AUDIT is not set | ||
| 165 | CONFIG_HOTPLUG=y | ||
| 166 | CONFIG_KOBJECT_UEVENT=y | ||
| 167 | CONFIG_IKCONFIG=y | ||
| 168 | CONFIG_IKCONFIG_PROC=y | ||
| 169 | CONFIG_INITRAMFS_SOURCE="" | ||
| 170 | CONFIG_EMBEDDED=y | ||
| 171 | CONFIG_KALLSYMS=y | ||
| 172 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 173 | CONFIG_PRINTK=y | ||
| 174 | CONFIG_BUG=y | ||
| 175 | CONFIG_BASE_FULL=y | ||
| 176 | CONFIG_FUTEX=y | ||
| 177 | CONFIG_EPOLL=y | ||
| 178 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 179 | CONFIG_SHMEM=y | ||
| 180 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 181 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 182 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 183 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 184 | # CONFIG_TINY_SHMEM is not set | ||
| 185 | CONFIG_BASE_SMALL=0 | ||
| 186 | |||
| 187 | # | ||
| 188 | # Loadable module support | ||
| 189 | # | ||
| 190 | CONFIG_MODULES=y | ||
| 191 | CONFIG_MODULE_UNLOAD=y | ||
| 192 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 193 | CONFIG_OBSOLETE_MODPARM=y | ||
| 194 | CONFIG_MODVERSIONS=y | ||
| 195 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 196 | CONFIG_KMOD=y | ||
| 197 | |||
| 198 | # | ||
| 199 | # Block layer | ||
| 200 | # | ||
| 201 | # CONFIG_LBD is not set | ||
| 202 | |||
| 203 | # | ||
| 204 | # IO Schedulers | ||
| 205 | # | ||
| 206 | CONFIG_IOSCHED_NOOP=y | ||
| 207 | CONFIG_IOSCHED_AS=y | ||
| 208 | CONFIG_IOSCHED_DEADLINE=y | ||
| 209 | CONFIG_IOSCHED_CFQ=y | ||
| 210 | CONFIG_DEFAULT_AS=y | ||
| 211 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 212 | # CONFIG_DEFAULT_CFQ is not set | ||
| 213 | # CONFIG_DEFAULT_NOOP is not set | ||
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 215 | |||
| 216 | # | ||
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 218 | # |
| 219 | CONFIG_HW_HAS_EISA=y | 219 | CONFIG_HW_HAS_EISA=y |
| @@ -1199,6 +1199,7 @@ CONFIG_USB_USS720=m | |||
| 1199 | CONFIG_USB_SERIAL=m | 1199 | CONFIG_USB_SERIAL=m |
| 1200 | CONFIG_USB_SERIAL_GENERIC=y | 1200 | CONFIG_USB_SERIAL_GENERIC=y |
| 1201 | CONFIG_USB_SERIAL_AIRPRIME=m | 1201 | CONFIG_USB_SERIAL_AIRPRIME=m |
| 1202 | CONFIG_USB_SERIAL_ANYDATA=m | ||
| 1202 | CONFIG_USB_SERIAL_BELKIN=m | 1203 | CONFIG_USB_SERIAL_BELKIN=m |
| 1203 | CONFIG_USB_SERIAL_WHITEHEAT=m | 1204 | CONFIG_USB_SERIAL_WHITEHEAT=m |
| 1204 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m | 1205 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m |
| @@ -1230,7 +1231,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1230 | CONFIG_USB_SERIAL_KLSI=m | 1231 | CONFIG_USB_SERIAL_KLSI=m |
| 1231 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 1232 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
| 1232 | CONFIG_USB_SERIAL_MCT_U232=m | 1233 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1233 | # CONFIG_USB_SERIAL_NOKIA_DKU2 is not set | ||
| 1234 | CONFIG_USB_SERIAL_PL2303=m | 1234 | CONFIG_USB_SERIAL_PL2303=m |
| 1235 | CONFIG_USB_SERIAL_HP4X=m | 1235 | CONFIG_USB_SERIAL_HP4X=m |
| 1236 | CONFIG_USB_SERIAL_SAFE=m | 1236 | CONFIG_USB_SERIAL_SAFE=m |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index dc453a1e4806..63f1be18e9bf 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:43 2005 | 4 | # Thu Nov 24 01:07:09 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_CPUSETS=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | CONFIG_STOP_MACHINE=y | ||
| 60 | |||
| 61 | # | ||
| 62 | # Block layer | ||
| 63 | # | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -226,6 +156,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 226 | CONFIG_PREEMPT_BKL=y | 156 | CONFIG_PREEMPT_BKL=y |
| 227 | 157 | ||
| 228 | # | 158 | # |
| 159 | # Code maturity level options | ||
| 160 | # | ||
| 161 | CONFIG_EXPERIMENTAL=y | ||
| 162 | CONFIG_CLEAN_COMPILE=y | ||
| 163 | CONFIG_LOCK_KERNEL=y | ||
| 164 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 165 | |||
| 166 | # | ||
| 167 | # General setup | ||
| 168 | # | ||
| 169 | CONFIG_LOCALVERSION="" | ||
| 170 | CONFIG_LOCALVERSION_AUTO=y | ||
| 171 | CONFIG_SWAP=y | ||
| 172 | CONFIG_SYSVIPC=y | ||
| 173 | # CONFIG_POSIX_MQUEUE is not set | ||
| 174 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 175 | CONFIG_SYSCTL=y | ||
| 176 | # CONFIG_AUDIT is not set | ||
| 177 | CONFIG_HOTPLUG=y | ||
| 178 | CONFIG_KOBJECT_UEVENT=y | ||
| 179 | # CONFIG_IKCONFIG is not set | ||
| 180 | CONFIG_CPUSETS=y | ||
| 181 | CONFIG_INITRAMFS_SOURCE="" | ||
| 182 | CONFIG_EMBEDDED=y | ||
| 183 | CONFIG_KALLSYMS=y | ||
| 184 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 185 | CONFIG_PRINTK=y | ||
| 186 | CONFIG_BUG=y | ||
| 187 | CONFIG_BASE_FULL=y | ||
| 188 | CONFIG_FUTEX=y | ||
| 189 | CONFIG_EPOLL=y | ||
| 190 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 191 | CONFIG_SHMEM=y | ||
| 192 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 193 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 194 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 195 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 196 | # CONFIG_TINY_SHMEM is not set | ||
| 197 | CONFIG_BASE_SMALL=0 | ||
| 198 | |||
| 199 | # | ||
| 200 | # Loadable module support | ||
| 201 | # | ||
| 202 | CONFIG_MODULES=y | ||
| 203 | CONFIG_MODULE_UNLOAD=y | ||
| 204 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 205 | CONFIG_OBSOLETE_MODPARM=y | ||
| 206 | CONFIG_MODVERSIONS=y | ||
| 207 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 208 | CONFIG_KMOD=y | ||
| 209 | CONFIG_STOP_MACHINE=y | ||
| 210 | |||
| 211 | # | ||
| 212 | # Block layer | ||
| 213 | # | ||
| 214 | |||
| 215 | # | ||
| 216 | # IO Schedulers | ||
| 217 | # | ||
| 218 | CONFIG_IOSCHED_NOOP=y | ||
| 219 | CONFIG_IOSCHED_AS=y | ||
| 220 | CONFIG_IOSCHED_DEADLINE=y | ||
| 221 | CONFIG_IOSCHED_CFQ=y | ||
| 222 | CONFIG_DEFAULT_AS=y | ||
| 223 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 224 | # CONFIG_DEFAULT_CFQ is not set | ||
| 225 | # CONFIG_DEFAULT_NOOP is not set | ||
| 226 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 227 | |||
| 228 | # | ||
| 229 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 229 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 230 | # | 230 | # |
| 231 | CONFIG_HW_HAS_PCI=y | 231 | CONFIG_HW_HAS_PCI=y |
| @@ -318,7 +318,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 318 | # QoS and/or fair queueing | 318 | # QoS and/or fair queueing |
| 319 | # | 319 | # |
| 320 | # CONFIG_NET_SCHED is not set | 320 | # CONFIG_NET_SCHED is not set |
| 321 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 322 | 321 | ||
| 323 | # | 322 | # |
| 324 | # Network testing | 323 | # Network testing |
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index aa27d583162d..41dd70824976 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig | |||
| @@ -1,71 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:45 2005 | 4 | # Thu Nov 24 01:07:10 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | # CONFIG_SWAP is not set | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | CONFIG_SYSCTL=y | ||
| 25 | # CONFIG_HOTPLUG is not set | ||
| 26 | # CONFIG_IKCONFIG is not set | ||
| 27 | CONFIG_INITRAMFS_SOURCE="" | ||
| 28 | CONFIG_EMBEDDED=y | ||
| 29 | CONFIG_KALLSYMS=y | ||
| 30 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 31 | CONFIG_PRINTK=y | ||
| 32 | CONFIG_BUG=y | ||
| 33 | CONFIG_BASE_FULL=y | ||
| 34 | CONFIG_FUTEX=y | ||
| 35 | CONFIG_EPOLL=y | ||
| 36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 37 | CONFIG_SHMEM=y | ||
| 38 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 39 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 40 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 41 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 42 | # CONFIG_TINY_SHMEM is not set | ||
| 43 | CONFIG_BASE_SMALL=0 | ||
| 44 | |||
| 45 | # | ||
| 46 | # Loadable module support | ||
| 47 | # | ||
| 48 | # CONFIG_MODULES is not set | ||
| 49 | |||
| 50 | # | ||
| 51 | # Block layer | ||
| 52 | # | ||
| 53 | # CONFIG_LBD is not set | ||
| 54 | |||
| 55 | # | ||
| 56 | # IO Schedulers | ||
| 57 | # | ||
| 58 | CONFIG_IOSCHED_NOOP=y | ||
| 59 | CONFIG_IOSCHED_AS=y | ||
| 60 | CONFIG_IOSCHED_DEADLINE=y | ||
| 61 | CONFIG_IOSCHED_CFQ=y | ||
| 62 | CONFIG_DEFAULT_AS=y | ||
| 63 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 64 | # CONFIG_DEFAULT_CFQ is not set | ||
| 65 | # CONFIG_DEFAULT_NOOP is not set | ||
| 66 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 67 | |||
| 68 | # | ||
| 69 | # Machine selection | 9 | # Machine selection |
| 70 | # | 10 | # |
| 71 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -197,6 +137,66 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 198 | 138 | ||
| 199 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | # CONFIG_SWAP is not set | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 155 | CONFIG_SYSCTL=y | ||
| 156 | # CONFIG_HOTPLUG is not set | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | 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_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | # CONFIG_MODULES is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # Block layer | ||
| 183 | # | ||
| 184 | # CONFIG_LBD is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # IO Schedulers | ||
| 188 | # | ||
| 189 | CONFIG_IOSCHED_NOOP=y | ||
| 190 | CONFIG_IOSCHED_AS=y | ||
| 191 | CONFIG_IOSCHED_DEADLINE=y | ||
| 192 | CONFIG_IOSCHED_CFQ=y | ||
| 193 | CONFIG_DEFAULT_AS=y | ||
| 194 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 195 | # CONFIG_DEFAULT_CFQ is not set | ||
| 196 | # CONFIG_DEFAULT_NOOP is not set | ||
| 197 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 198 | |||
| 199 | # | ||
| 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 201 | # | 201 | # |
| 202 | CONFIG_MMU=y | 202 | CONFIG_MMU=y |
| @@ -363,6 +363,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 363 | # | 363 | # |
| 364 | # TPM devices | 364 | # TPM devices |
| 365 | # | 365 | # |
| 366 | # CONFIG_TCG_TPM is not set | ||
| 366 | # CONFIG_TELCLOCK is not set | 367 | # CONFIG_TELCLOCK is not set |
| 367 | 368 | ||
| 368 | # | 369 | # |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index ddc7e45996f2..83969466ecf6 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:49 2005 | 4 | # Thu Nov 24 01:07:12 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -207,6 +138,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 207 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
| 208 | 139 | ||
| 209 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | CONFIG_EXPERIMENTAL=y | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_POSIX_MQUEUE is not set | ||
| 156 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 157 | CONFIG_SYSCTL=y | ||
| 158 | # CONFIG_AUDIT is not set | ||
| 159 | # CONFIG_HOTPLUG is not set | ||
| 160 | CONFIG_KOBJECT_UEVENT=y | ||
| 161 | # CONFIG_IKCONFIG is not set | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | ||
| 163 | CONFIG_EMBEDDED=y | ||
| 164 | CONFIG_KALLSYMS=y | ||
| 165 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 166 | CONFIG_PRINTK=y | ||
| 167 | CONFIG_BUG=y | ||
| 168 | CONFIG_BASE_FULL=y | ||
| 169 | CONFIG_FUTEX=y | ||
| 170 | CONFIG_EPOLL=y | ||
| 171 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 172 | 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_TINY_SHMEM is not set | ||
| 178 | CONFIG_BASE_SMALL=0 | ||
| 179 | |||
| 180 | # | ||
| 181 | # Loadable module support | ||
| 182 | # | ||
| 183 | CONFIG_MODULES=y | ||
| 184 | CONFIG_MODULE_UNLOAD=y | ||
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | ||
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 189 | CONFIG_KMOD=y | ||
| 190 | |||
| 191 | # | ||
| 192 | # Block layer | ||
| 193 | # | ||
| 194 | # CONFIG_LBD is not set | ||
| 195 | |||
| 196 | # | ||
| 197 | # IO Schedulers | ||
| 198 | # | ||
| 199 | CONFIG_IOSCHED_NOOP=y | ||
| 200 | CONFIG_IOSCHED_AS=y | ||
| 201 | CONFIG_IOSCHED_DEADLINE=y | ||
| 202 | CONFIG_IOSCHED_CFQ=y | ||
| 203 | CONFIG_DEFAULT_AS=y | ||
| 204 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 205 | # CONFIG_DEFAULT_CFQ is not set | ||
| 206 | # CONFIG_DEFAULT_NOOP is not set | ||
| 207 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 208 | |||
| 209 | # | ||
| 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 211 | # | 211 | # |
| 212 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| @@ -301,7 +301,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 301 | # QoS and/or fair queueing | 301 | # QoS and/or fair queueing |
| 302 | # | 302 | # |
| 303 | # CONFIG_NET_SCHED is not set | 303 | # CONFIG_NET_SCHED is not set |
| 304 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 305 | 304 | ||
| 306 | # | 305 | # |
| 307 | # Network testing | 306 | # Network testing |
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index e8c82f011e98..ce7b9ed44432 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Wed Nov 9 11:11:47 2005 | 4 | # Thu Nov 24 01:07:15 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -207,6 +138,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 207 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
| 208 | 139 | ||
| 209 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | CONFIG_EXPERIMENTAL=y | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_POSIX_MQUEUE is not set | ||
| 156 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 157 | CONFIG_SYSCTL=y | ||
| 158 | # CONFIG_AUDIT is not set | ||
| 159 | CONFIG_HOTPLUG=y | ||
| 160 | CONFIG_KOBJECT_UEVENT=y | ||
| 161 | # CONFIG_IKCONFIG is not set | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | ||
| 163 | CONFIG_EMBEDDED=y | ||
| 164 | CONFIG_KALLSYMS=y | ||
| 165 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 166 | CONFIG_PRINTK=y | ||
| 167 | CONFIG_BUG=y | ||
| 168 | CONFIG_BASE_FULL=y | ||
| 169 | CONFIG_FUTEX=y | ||
| 170 | CONFIG_EPOLL=y | ||
| 171 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 172 | 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_TINY_SHMEM is not set | ||
| 178 | CONFIG_BASE_SMALL=0 | ||
| 179 | |||
| 180 | # | ||
| 181 | # Loadable module support | ||
| 182 | # | ||
| 183 | CONFIG_MODULES=y | ||
| 184 | CONFIG_MODULE_UNLOAD=y | ||
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | ||
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 189 | CONFIG_KMOD=y | ||
| 190 | |||
| 191 | # | ||
| 192 | # Block layer | ||
| 193 | # | ||
| 194 | # CONFIG_LBD is not set | ||
| 195 | |||
| 196 | # | ||
| 197 | # IO Schedulers | ||
| 198 | # | ||
| 199 | CONFIG_IOSCHED_NOOP=y | ||
| 200 | CONFIG_IOSCHED_AS=y | ||
| 201 | CONFIG_IOSCHED_DEADLINE=y | ||
| 202 | CONFIG_IOSCHED_CFQ=y | ||
| 203 | CONFIG_DEFAULT_AS=y | ||
| 204 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 205 | # CONFIG_DEFAULT_CFQ is not set | ||
| 206 | # CONFIG_DEFAULT_NOOP is not set | ||
| 207 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 208 | |||
| 209 | # | ||
| 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 211 | # | 211 | # |
| 212 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| @@ -302,7 +302,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 302 | # QoS and/or fair queueing | 302 | # QoS and/or fair queueing |
| 303 | # | 303 | # |
| 304 | # CONFIG_NET_SCHED is not set | 304 | # CONFIG_NET_SCHED is not set |
| 305 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 306 | 305 | ||
| 307 | # | 306 | # |
| 308 | # Network testing | 307 | # Network testing |
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index 125b2997abfe..02b2551023d4 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:17:02 2005 | 4 | # Thu Nov 24 01:07:17 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | 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_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | CONFIG_HOTPLUG=y | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | 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_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_ISA=y | 209 | CONFIG_ISA=y |
| @@ -297,7 +297,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 297 | # QoS and/or fair queueing | 297 | # QoS and/or fair queueing |
| 298 | # | 298 | # |
| 299 | # CONFIG_NET_SCHED is not set | 299 | # CONFIG_NET_SCHED is not set |
| 300 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 301 | 300 | ||
| 302 | # | 301 | # |
| 303 | # Network testing | 302 | # Network testing |
| @@ -609,6 +608,7 @@ CONFIG_WATCHDOG=y | |||
| 609 | # | 608 | # |
| 610 | # TPM devices | 609 | # TPM devices |
| 611 | # | 610 | # |
| 611 | # CONFIG_TCG_TPM is not set | ||
| 612 | # CONFIG_TELCLOCK is not set | 612 | # CONFIG_TELCLOCK is not set |
| 613 | 613 | ||
| 614 | # | 614 | # |
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index d90790b2ab30..d51d5d16297c 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:59 2005 | 4 | # Thu Nov 24 01:07:19 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | # CONFIG_EXPERIMENTAL is not set | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | CONFIG_SYSCTL=y | ||
| 25 | # CONFIG_AUDIT is not set | ||
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | ||
| 29 | CONFIG_IKCONFIG_PROC=y | ||
| 30 | # CONFIG_CPUSETS is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_ALL is not set | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | CONFIG_MODULE_UNLOAD=y | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | CONFIG_STOP_MACHINE=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -208,6 +138,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 208 | CONFIG_PREEMPT_BKL=y | 138 | CONFIG_PREEMPT_BKL=y |
| 209 | 139 | ||
| 210 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | # CONFIG_EXPERIMENTAL is not set | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_LOCK_KERNEL=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | CONFIG_IKCONFIG=y | ||
| 161 | CONFIG_IKCONFIG_PROC=y | ||
| 162 | # CONFIG_CPUSETS is not set | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | ||
| 164 | CONFIG_EMBEDDED=y | ||
| 165 | CONFIG_KALLSYMS=y | ||
| 166 | # CONFIG_KALLSYMS_ALL is not set | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | 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_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | CONFIG_MODULES=y | ||
| 186 | CONFIG_MODULE_UNLOAD=y | ||
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 189 | CONFIG_KMOD=y | ||
| 190 | CONFIG_STOP_MACHINE=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Block layer | ||
| 194 | # | ||
| 195 | # CONFIG_LBD is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # IO Schedulers | ||
| 199 | # | ||
| 200 | CONFIG_IOSCHED_NOOP=y | ||
| 201 | CONFIG_IOSCHED_AS=y | ||
| 202 | CONFIG_IOSCHED_DEADLINE=y | ||
| 203 | CONFIG_IOSCHED_CFQ=y | ||
| 204 | CONFIG_DEFAULT_AS=y | ||
| 205 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 206 | # CONFIG_DEFAULT_CFQ is not set | ||
| 207 | # CONFIG_DEFAULT_NOOP is not set | ||
| 208 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 209 | |||
| 210 | # | ||
| 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 212 | # | 212 | # |
| 213 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| @@ -284,7 +284,6 @@ CONFIG_IPV6_TUNNEL=m | |||
| 284 | # QoS and/or fair queueing | 284 | # QoS and/or fair queueing |
| 285 | # | 285 | # |
| 286 | # CONFIG_NET_SCHED is not set | 286 | # CONFIG_NET_SCHED is not set |
| 287 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 288 | 287 | ||
| 289 | # | 288 | # |
| 290 | # Network testing | 289 | # Network testing |
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index e9086da02e48..2a1b844da43f 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 12:13:58 2005 | 4 | # Thu Nov 24 01:05:49 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -211,6 +141,76 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 211 | # CONFIG_PREEMPT is not set | 141 | # CONFIG_PREEMPT is not set |
| 212 | 142 | ||
| 213 | # | 143 | # |
| 144 | # Code maturity level options | ||
| 145 | # | ||
| 146 | CONFIG_EXPERIMENTAL=y | ||
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | ||
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 150 | |||
| 151 | # | ||
| 152 | # General setup | ||
| 153 | # | ||
| 154 | CONFIG_LOCALVERSION="" | ||
| 155 | CONFIG_LOCALVERSION_AUTO=y | ||
| 156 | CONFIG_SWAP=y | ||
| 157 | CONFIG_SYSVIPC=y | ||
| 158 | # CONFIG_POSIX_MQUEUE is not set | ||
| 159 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 160 | CONFIG_SYSCTL=y | ||
| 161 | # CONFIG_AUDIT is not set | ||
| 162 | # CONFIG_HOTPLUG is not set | ||
| 163 | CONFIG_KOBJECT_UEVENT=y | ||
| 164 | CONFIG_IKCONFIG=y | ||
| 165 | CONFIG_IKCONFIG_PROC=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | 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_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | CONFIG_MODULES=y | ||
| 188 | CONFIG_MODULE_UNLOAD=y | ||
| 189 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 190 | CONFIG_OBSOLETE_MODPARM=y | ||
| 191 | CONFIG_MODVERSIONS=y | ||
| 192 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 193 | CONFIG_KMOD=y | ||
| 194 | |||
| 195 | # | ||
| 196 | # Block layer | ||
| 197 | # | ||
| 198 | # CONFIG_LBD is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # IO Schedulers | ||
| 202 | # | ||
| 203 | CONFIG_IOSCHED_NOOP=y | ||
| 204 | CONFIG_IOSCHED_AS=y | ||
| 205 | CONFIG_IOSCHED_DEADLINE=y | ||
| 206 | CONFIG_IOSCHED_CFQ=y | ||
| 207 | CONFIG_DEFAULT_AS=y | ||
| 208 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 209 | # CONFIG_DEFAULT_CFQ is not set | ||
| 210 | # CONFIG_DEFAULT_NOOP is not set | ||
| 211 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 212 | |||
| 213 | # | ||
| 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 215 | # | 215 | # |
| 216 | CONFIG_HW_HAS_EISA=y | 216 | CONFIG_HW_HAS_EISA=y |
| @@ -779,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 779 | # | 779 | # |
| 780 | # TPM devices | 780 | # TPM devices |
| 781 | # | 781 | # |
| 782 | # CONFIG_TCG_TPM is not set | ||
| 782 | # CONFIG_TELCLOCK is not set | 783 | # CONFIG_TELCLOCK is not set |
| 783 | 784 | ||
| 784 | # | 785 | # |
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c index 7cbe14483f13..2810727f1d4e 100644 --- a/arch/mips/jmr3927/rbhma3100/irq.c +++ b/arch/mips/jmr3927/rbhma3100/irq.c | |||
| @@ -113,7 +113,8 @@ static void jmr3927_irq_ack(unsigned int irq) | |||
| 113 | 113 | ||
| 114 | static void jmr3927_irq_end(unsigned int irq) | 114 | static void jmr3927_irq_end(unsigned int irq) |
| 115 | { | 115 | { |
| 116 | jmr3927_irq_enable(irq); | 116 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) |
| 117 | jmr3927_irq_enable(irq); | ||
| 117 | } | 118 | } |
| 118 | 119 | ||
| 119 | static void jmr3927_irq_disable(unsigned int irq_nr) | 120 | static void jmr3927_irq_disable(unsigned int irq_nr) |
| @@ -121,7 +122,7 @@ static void jmr3927_irq_disable(unsigned int irq_nr) | |||
| 121 | struct tb_irq_space* sp; | 122 | struct tb_irq_space* sp; |
| 122 | unsigned long flags; | 123 | unsigned long flags; |
| 123 | 124 | ||
| 124 | spinlock_irqsave(&jmr3927_irq_lock, flags); | 125 | spin_lock_irqsave(&jmr3927_irq_lock, flags); |
| 125 | for (sp = tb_irq_spaces; sp; sp = sp->next) { | 126 | for (sp = tb_irq_spaces; sp; sp = sp->next) { |
| 126 | if (sp->start_irqno <= irq_nr && | 127 | if (sp->start_irqno <= irq_nr && |
| 127 | irq_nr < sp->start_irqno + sp->nr_irqs) { | 128 | irq_nr < sp->start_irqno + sp->nr_irqs) { |
| @@ -131,7 +132,7 @@ static void jmr3927_irq_disable(unsigned int irq_nr) | |||
| 131 | break; | 132 | break; |
| 132 | } | 133 | } |
| 133 | } | 134 | } |
| 134 | spinlock_irqrestore(&jmr3927_irq_lock, flags); | 135 | spin_unlock_irqrestore(&jmr3927_irq_lock, flags); |
| 135 | } | 136 | } |
| 136 | 137 | ||
| 137 | static void jmr3927_irq_enable(unsigned int irq_nr) | 138 | static void jmr3927_irq_enable(unsigned int irq_nr) |
| @@ -139,7 +140,7 @@ static void jmr3927_irq_enable(unsigned int irq_nr) | |||
| 139 | struct tb_irq_space* sp; | 140 | struct tb_irq_space* sp; |
| 140 | unsigned long flags; | 141 | unsigned long flags; |
| 141 | 142 | ||
| 142 | spinlock_irqsave(&jmr3927_irq_lock, flags); | 143 | spin_lock_irqsave(&jmr3927_irq_lock, flags); |
| 143 | for (sp = tb_irq_spaces; sp; sp = sp->next) { | 144 | for (sp = tb_irq_spaces; sp; sp = sp->next) { |
| 144 | if (sp->start_irqno <= irq_nr && | 145 | if (sp->start_irqno <= irq_nr && |
| 145 | irq_nr < sp->start_irqno + sp->nr_irqs) { | 146 | irq_nr < sp->start_irqno + sp->nr_irqs) { |
| @@ -149,7 +150,7 @@ static void jmr3927_irq_enable(unsigned int irq_nr) | |||
| 149 | break; | 150 | break; |
| 150 | } | 151 | } |
| 151 | } | 152 | } |
| 152 | spinlock_irqrestore(&jmr3927_irq_lock, flags); | 153 | spin_unlock_irqrestore(&jmr3927_irq_lock, flags); |
| 153 | } | 154 | } |
| 154 | 155 | ||
| 155 | /* | 156 | /* |
| @@ -205,7 +206,10 @@ static void mask_irq_irc(int irq_nr, int space_id) | |||
| 205 | /* update IRCSR */ | 206 | /* update IRCSR */ |
| 206 | tx3927_ircptr->imr = 0; | 207 | tx3927_ircptr->imr = 0; |
| 207 | tx3927_ircptr->imr = irc_elevel; | 208 | tx3927_ircptr->imr = irc_elevel; |
| 209 | /* flush write buffer */ | ||
| 210 | (void)tx3927_ircptr->ssr; | ||
| 208 | } | 211 | } |
| 212 | |||
| 209 | static void unmask_irq_irc(int irq_nr, int space_id) | 213 | static void unmask_irq_irc(int irq_nr, int space_id) |
| 210 | { | 214 | { |
| 211 | volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; | 215 | volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; |
| @@ -276,7 +280,7 @@ void jmr3927_irc_irqdispatch(struct pt_regs *regs) | |||
| 276 | do_IRQ(irq + JMR3927_IRQ_IRC, regs); | 280 | do_IRQ(irq + JMR3927_IRQ_IRC, regs); |
| 277 | } | 281 | } |
| 278 | 282 | ||
| 279 | static void jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 283 | static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
| 280 | { | 284 | { |
| 281 | unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR); | 285 | unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR); |
| 282 | int i; | 286 | int i; |
| @@ -287,13 +291,14 @@ static void jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 287 | do_IRQ(irq, regs); | 291 | do_IRQ(irq, regs); |
| 288 | } | 292 | } |
| 289 | } | 293 | } |
| 294 | return IRQ_HANDLED; | ||
| 290 | } | 295 | } |
| 291 | 296 | ||
| 292 | static struct irqaction ioc_action = { | 297 | static struct irqaction ioc_action = { |
| 293 | jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, | 298 | jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, |
| 294 | }; | 299 | }; |
| 295 | 300 | ||
| 296 | static void jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 301 | static irqreturn_t jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
| 297 | { | 302 | { |
| 298 | unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR); | 303 | unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR); |
| 299 | int i; | 304 | int i; |
| @@ -304,6 +309,7 @@ static void jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 304 | do_IRQ(irq, regs); | 309 | do_IRQ(irq, regs); |
| 305 | } | 310 | } |
| 306 | } | 311 | } |
| 312 | return IRQ_HANDLED; | ||
| 307 | } | 313 | } |
| 308 | 314 | ||
| 309 | static struct irqaction isac_action = { | 315 | static struct irqaction isac_action = { |
| @@ -311,19 +317,23 @@ static struct irqaction isac_action = { | |||
| 311 | }; | 317 | }; |
| 312 | 318 | ||
| 313 | 319 | ||
| 314 | static void jmr3927_isaerr_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 320 | static irqreturn_t jmr3927_isaerr_interrupt(int irq, void * dev_id, struct pt_regs * regs) |
| 315 | { | 321 | { |
| 316 | printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq); | 322 | printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq); |
| 323 | |||
| 324 | return IRQ_HANDLED; | ||
| 317 | } | 325 | } |
| 318 | static struct irqaction isaerr_action = { | 326 | static struct irqaction isaerr_action = { |
| 319 | jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL, | 327 | jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL, |
| 320 | }; | 328 | }; |
| 321 | 329 | ||
| 322 | static void jmr3927_pcierr_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 330 | static irqreturn_t jmr3927_pcierr_interrupt(int irq, void * dev_id, struct pt_regs * regs) |
| 323 | { | 331 | { |
| 324 | printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq); | 332 | printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq); |
| 325 | printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n", | 333 | printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n", |
| 326 | tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat); | 334 | tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat); |
| 335 | |||
| 336 | return IRQ_HANDLED; | ||
| 327 | } | 337 | } |
| 328 | static struct irqaction pcierr_action = { | 338 | static struct irqaction pcierr_action = { |
| 329 | jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, | 339 | jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, |
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 55ad0a578794..4763957df8fc 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c | |||
| @@ -60,6 +60,8 @@ | |||
| 60 | #include <asm/mipsregs.h> | 60 | #include <asm/mipsregs.h> |
| 61 | #include <asm/traps.h> | 61 | #include <asm/traps.h> |
| 62 | 62 | ||
| 63 | extern void puts(unsigned char *cp); | ||
| 64 | |||
| 63 | /* Tick Timer divider */ | 65 | /* Tick Timer divider */ |
| 64 | #define JMR3927_TIMER_CCD 0 /* 1/2 */ | 66 | #define JMR3927_TIMER_CCD 0 /* 1/2 */ |
| 65 | #define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) | 67 | #define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index a263fb7a3971..5e1b08b00a33 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -417,7 +417,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) | |||
| 417 | case PRID_IMP_R10000: | 417 | case PRID_IMP_R10000: |
| 418 | c->cputype = CPU_R10000; | 418 | c->cputype = CPU_R10000; |
| 419 | c->isa_level = MIPS_CPU_ISA_IV; | 419 | c->isa_level = MIPS_CPU_ISA_IV; |
| 420 | c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | | 420 | c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX | |
| 421 | MIPS_CPU_FPU | MIPS_CPU_32FPR | | 421 | MIPS_CPU_FPU | MIPS_CPU_32FPR | |
| 422 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | | 422 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | |
| 423 | MIPS_CPU_LLSC; | 423 | MIPS_CPU_LLSC; |
| @@ -426,7 +426,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) | |||
| 426 | case PRID_IMP_R12000: | 426 | case PRID_IMP_R12000: |
| 427 | c->cputype = CPU_R12000; | 427 | c->cputype = CPU_R12000; |
| 428 | c->isa_level = MIPS_CPU_ISA_IV; | 428 | c->isa_level = MIPS_CPU_ISA_IV; |
| 429 | c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | | 429 | c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX | |
| 430 | MIPS_CPU_FPU | MIPS_CPU_32FPR | | 430 | MIPS_CPU_FPU | MIPS_CPU_32FPR | |
| 431 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | | 431 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | |
| 432 | MIPS_CPU_LLSC; | 432 | MIPS_CPU_LLSC; |
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index dd118c60bcd0..08273a2a501d 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
| @@ -279,8 +279,6 @@ irix_sigreturn(struct pt_regs *regs) | |||
| 279 | /* | 279 | /* |
| 280 | * Don't let your children do this ... | 280 | * Don't let your children do this ... |
| 281 | */ | 281 | */ |
| 282 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 283 | do_syscall_trace(regs, 1); | ||
| 284 | __asm__ __volatile__( | 282 | __asm__ __volatile__( |
| 285 | "move\t$29,%0\n\t" | 283 | "move\t$29,%0\n\t" |
| 286 | "j\tsyscall_exit" | 284 | "j\tsyscall_exit" |
| @@ -783,8 +781,6 @@ asmlinkage void irix_setcontext(struct pt_regs *regs) | |||
| 783 | /* | 781 | /* |
| 784 | * Don't let your children do this ... | 782 | * Don't let your children do this ... |
| 785 | */ | 783 | */ |
| 786 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 787 | do_syscall_trace(regs, 1); | ||
| 788 | __asm__ __volatile__( | 784 | __asm__ __volatile__( |
| 789 | "move\t$29,%0\n\t" | 785 | "move\t$29,%0\n\t" |
| 790 | "j\tsyscall_exit" | 786 | "j\tsyscall_exit" |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 4dd8e8b4fbc2..a42e0e8caa7b 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -94,11 +94,13 @@ syscall_trace_entry: | |||
| 94 | li a1, 0 | 94 | li a1, 0 |
| 95 | jal do_syscall_trace | 95 | jal do_syscall_trace |
| 96 | 96 | ||
| 97 | move t0, s0 | ||
| 98 | RESTORE_STATIC | ||
| 97 | lw a0, PT_R4(sp) # Restore argument registers | 99 | lw a0, PT_R4(sp) # Restore argument registers |
| 98 | lw a1, PT_R5(sp) | 100 | lw a1, PT_R5(sp) |
| 99 | lw a2, PT_R6(sp) | 101 | lw a2, PT_R6(sp) |
| 100 | lw a3, PT_R7(sp) | 102 | lw a3, PT_R7(sp) |
| 101 | jalr s0 | 103 | jalr t0 |
| 102 | 104 | ||
| 103 | li t0, -EMAXERRNO - 1 # error? | 105 | li t0, -EMAXERRNO - 1 # error? |
| 104 | sltu t0, t0, v0 | 106 | sltu t0, t0, v0 |
| @@ -241,19 +243,7 @@ illegal_syscall: | |||
| 241 | sw zero, PT_R7(sp) # success | 243 | sw zero, PT_R7(sp) # success |
| 242 | sw v0, PT_R2(sp) # result | 244 | sw v0, PT_R2(sp) # result |
| 243 | 245 | ||
| 244 | /* Success, so skip usual error handling garbage. */ | 246 | j o32_syscall_exit # continue like a normal syscall |
| 245 | lw a2, TI_FLAGS($28) # syscall tracing enabled? | ||
| 246 | li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | ||
| 247 | and t0, a2, t0 | ||
| 248 | bnez t0, 1f | ||
| 249 | |||
| 250 | j o32_syscall_exit | ||
| 251 | |||
| 252 | 1: SAVE_STATIC | ||
| 253 | move a0, sp | ||
| 254 | li a1, 1 | ||
| 255 | jal do_syscall_trace | ||
| 256 | j syscall_exit | ||
| 257 | 247 | ||
| 258 | no_mem: li v0, -ENOMEM | 248 | no_mem: li v0, -ENOMEM |
| 259 | jr ra | 249 | jr ra |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 9085838d6ce3..47bfbd416709 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -93,13 +93,15 @@ syscall_trace_entry: | |||
| 93 | li a1, 0 | 93 | li a1, 0 |
| 94 | jal do_syscall_trace | 94 | jal do_syscall_trace |
| 95 | 95 | ||
| 96 | move t0, s0 | ||
| 97 | RESTORE_STATIC | ||
| 96 | ld a0, PT_R4(sp) # Restore argument registers | 98 | ld a0, PT_R4(sp) # Restore argument registers |
| 97 | ld a1, PT_R5(sp) | 99 | ld a1, PT_R5(sp) |
| 98 | ld a2, PT_R6(sp) | 100 | ld a2, PT_R6(sp) |
| 99 | ld a3, PT_R7(sp) | 101 | ld a3, PT_R7(sp) |
| 100 | ld a4, PT_R8(sp) | 102 | ld a4, PT_R8(sp) |
| 101 | ld a5, PT_R9(sp) | 103 | ld a5, PT_R9(sp) |
| 102 | jalr s0 | 104 | jalr t0 |
| 103 | 105 | ||
| 104 | li t0, -EMAXERRNO - 1 # error? | 106 | li t0, -EMAXERRNO - 1 # error? |
| 105 | sltu t0, t0, v0 | 107 | sltu t0, t0, v0 |
| @@ -174,19 +176,7 @@ illegal_syscall: | |||
| 174 | sd zero, PT_R7(sp) # success | 176 | sd zero, PT_R7(sp) # success |
| 175 | sd v0, PT_R2(sp) # result | 177 | sd v0, PT_R2(sp) # result |
| 176 | 178 | ||
| 177 | /* Success, so skip usual error handling garbage. */ | 179 | j n64_syscall_exit # continue like a normal syscall |
| 178 | li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | ||
| 179 | LONG_L a2, TI_FLAGS($28) # syscall tracing enabled? | ||
| 180 | and t0, a2, t0 | ||
| 181 | bnez t0, 1f | ||
| 182 | |||
| 183 | j n64_syscall_exit | ||
| 184 | |||
| 185 | 1: SAVE_STATIC | ||
| 186 | move a0, sp | ||
| 187 | li a1, 1 | ||
| 188 | jal do_syscall_trace | ||
| 189 | j syscall_exit | ||
| 190 | 180 | ||
| 191 | no_mem: li v0, -ENOMEM | 181 | no_mem: li v0, -ENOMEM |
| 192 | jr ra | 182 | jr ra |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 7e66eb823bf6..b465ced1758f 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -90,13 +90,15 @@ n32_syscall_trace_entry: | |||
| 90 | li a1, 0 | 90 | li a1, 0 |
| 91 | jal do_syscall_trace | 91 | jal do_syscall_trace |
| 92 | 92 | ||
| 93 | move t0, s0 | ||
| 94 | RESTORE_STATIC | ||
| 93 | ld a0, PT_R4(sp) # Restore argument registers | 95 | ld a0, PT_R4(sp) # Restore argument registers |
| 94 | ld a1, PT_R5(sp) | 96 | ld a1, PT_R5(sp) |
| 95 | ld a2, PT_R6(sp) | 97 | ld a2, PT_R6(sp) |
| 96 | ld a3, PT_R7(sp) | 98 | ld a3, PT_R7(sp) |
| 97 | ld a4, PT_R8(sp) | 99 | ld a4, PT_R8(sp) |
| 98 | ld a5, PT_R9(sp) | 100 | ld a5, PT_R9(sp) |
| 99 | jalr s0 | 101 | jalr t0 |
| 100 | 102 | ||
| 101 | li t0, -EMAXERRNO - 1 # error? | 103 | li t0, -EMAXERRNO - 1 # error? |
| 102 | sltu t0, t0, v0 | 104 | sltu t0, t0, v0 |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 5a16401e443a..3d338ca7eeeb 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -124,6 +124,8 @@ trace_a_syscall: | |||
| 124 | li a1, 0 | 124 | li a1, 0 |
| 125 | jal do_syscall_trace | 125 | jal do_syscall_trace |
| 126 | 126 | ||
| 127 | move t0, s0 | ||
| 128 | RESTORE_STATIC | ||
| 127 | ld a0, PT_R4(sp) # Restore argument registers | 129 | ld a0, PT_R4(sp) # Restore argument registers |
| 128 | ld a1, PT_R5(sp) | 130 | ld a1, PT_R5(sp) |
| 129 | ld a2, PT_R6(sp) | 131 | ld a2, PT_R6(sp) |
| @@ -132,7 +134,7 @@ trace_a_syscall: | |||
| 132 | ld a5, PT_R9(sp) | 134 | ld a5, PT_R9(sp) |
| 133 | ld a6, PT_R10(sp) | 135 | ld a6, PT_R10(sp) |
| 134 | ld a7, PT_R11(sp) # For indirect syscalls | 136 | ld a7, PT_R11(sp) # For indirect syscalls |
| 135 | jalr s0 | 137 | jalr t0 |
| 136 | 138 | ||
| 137 | li t0, -EMAXERRNO - 1 # error? | 139 | li t0, -EMAXERRNO - 1 # error? |
| 138 | sltu t0, t0, v0 | 140 | sltu t0, t0, v0 |
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 05e09eedabff..7d1800fe7038 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
| @@ -220,8 +220,6 @@ _sys_sigreturn(nabi_no_regargs struct pt_regs regs) | |||
| 220 | /* | 220 | /* |
| 221 | * Don't let your children do this ... | 221 | * Don't let your children do this ... |
| 222 | */ | 222 | */ |
| 223 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 224 | do_syscall_trace(®s, 1); | ||
| 225 | __asm__ __volatile__( | 223 | __asm__ __volatile__( |
| 226 | "move\t$29, %0\n\t" | 224 | "move\t$29, %0\n\t" |
| 227 | "j\tsyscall_exit" | 225 | "j\tsyscall_exit" |
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index e315d3f6aa6e..c856dbc52abb 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
| @@ -497,8 +497,6 @@ _sys32_sigreturn(nabi_no_regargs struct pt_regs regs) | |||
| 497 | /* | 497 | /* |
| 498 | * Don't let your children do this ... | 498 | * Don't let your children do this ... |
| 499 | */ | 499 | */ |
| 500 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 501 | do_syscall_trace(®s, 1); | ||
| 502 | __asm__ __volatile__( | 500 | __asm__ __volatile__( |
| 503 | "move\t$29, %0\n\t" | 501 | "move\t$29, %0\n\t" |
| 504 | "j\tsyscall_exit" | 502 | "j\tsyscall_exit" |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 6f3ff9690686..7058893d5ad2 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -534,13 +534,14 @@ static inline int simulate_rdhwr(struct pt_regs *regs) | |||
| 534 | switch (rd) { | 534 | switch (rd) { |
| 535 | case 29: | 535 | case 29: |
| 536 | regs->regs[rt] = ti->tp_value; | 536 | regs->regs[rt] = ti->tp_value; |
| 537 | break; | 537 | return 0; |
| 538 | default: | 538 | default: |
| 539 | return -EFAULT; | 539 | return -EFAULT; |
| 540 | } | 540 | } |
| 541 | } | 541 | } |
| 542 | 542 | ||
| 543 | return 0; | 543 | /* Not ours. */ |
| 544 | return -EFAULT; | ||
| 544 | } | 545 | } |
| 545 | 546 | ||
| 546 | asmlinkage void do_ov(struct pt_regs *regs) | 547 | asmlinkage void do_ov(struct pt_regs *regs) |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index f75ab748e8cd..3a49036e0ae8 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -68,7 +68,7 @@ unsigned long setup_zero_pages(void) | |||
| 68 | page = virt_to_page(empty_zero_page); | 68 | page = virt_to_page(empty_zero_page); |
| 69 | while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { | 69 | while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { |
| 70 | set_bit(PG_reserved, &page->flags); | 70 | set_bit(PG_reserved, &page->flags); |
| 71 | set_page_count(page, 0); | 71 | reset_page_mapcount(page); |
| 72 | page++; | 72 | page++; |
| 73 | } | 73 | } |
| 74 | 74 | ||
diff --git a/arch/mips/qemu/q-firmware.c b/arch/mips/qemu/q-firmware.c index 5980f02b2df9..fb2a8673a6bf 100644 --- a/arch/mips/qemu/q-firmware.c +++ b/arch/mips/qemu/q-firmware.c | |||
| @@ -1,7 +1,18 @@ | |||
| 1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 2 | #include <linux/string.h> | ||
| 3 | #include <asm/addrspace.h> | ||
| 2 | #include <asm/bootinfo.h> | 4 | #include <asm/bootinfo.h> |
| 3 | 5 | ||
| 4 | void __init prom_init(void) | 6 | void __init prom_init(void) |
| 5 | { | 7 | { |
| 6 | add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM); | 8 | int *cmdline; |
| 9 | |||
| 10 | cmdline = (int *) (CKSEG0 + (0x10 << 20) - 260); | ||
| 11 | if (*cmdline == 0x12345678) { | ||
| 12 | if (*(char *)(cmdline + 1)) | ||
| 13 | strcpy (arcs_cmdline, (char *)(cmdline + 1)); | ||
| 14 | add_memory_region(0x0<<20, cmdline[-1], BOOT_MEM_RAM); | ||
| 15 | } else { | ||
| 16 | add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM); | ||
| 17 | } | ||
| 7 | } | 18 | } |
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index 82df88b01bbe..f3e9c534aa82 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile | |||
| @@ -262,11 +262,11 @@ $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd | |||
| 262 | skip=64 bs=1k | 262 | skip=64 bs=1k |
| 263 | 263 | ||
| 264 | $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE) | 264 | $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE) |
| 265 | $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT) | 265 | $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y) |
| 266 | 266 | ||
| 267 | $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) | 267 | $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) |
| 268 | $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \ | 268 | $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \ |
| 269 | $(ENTRYPOINT) | 269 | $(entrypoint-y) |
| 270 | 270 | ||
| 271 | $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT) | 271 | $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT) |
| 272 | $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y) | 272 | $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y) |
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c index 1d1c3956c1ae..1941a8c7ca9a 100644 --- a/arch/ppc/syslib/m82xx_pci.c +++ b/arch/ppc/syslib/m82xx_pci.c | |||
| @@ -248,7 +248,8 @@ pq2ads_setup_pci(struct pci_controller *hose) | |||
| 248 | pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) * | 248 | pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) * |
| 249 | ( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1); | 249 | ( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1); |
| 250 | freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div)); | 250 | freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div)); |
| 251 | time = (int)666666/freq; | 251 | time = (int)66666666/freq; |
| 252 | |||
| 252 | /* due to PCI Local Bus spec, some devices needs to wait such a long | 253 | /* due to PCI Local Bus spec, some devices needs to wait such a long |
| 253 | time after RST deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */ | 254 | time after RST deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */ |
| 254 | printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq, | 255 | printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq, |
diff --git a/drivers/Makefile b/drivers/Makefile index fac1e1603097..ea410b6b7644 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | # Rewritten to use lists instead of if-statements. | 5 | # Rewritten to use lists instead of if-statements. |
| 6 | # | 6 | # |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_PCI) += pci/ usb/ | 8 | obj-$(CONFIG_PCI) += pci/ |
| 9 | obj-$(CONFIG_PARISC) += parisc/ | 9 | obj-$(CONFIG_PARISC) += parisc/ |
| 10 | obj-$(CONFIG_RAPIDIO) += rapidio/ | 10 | obj-$(CONFIG_RAPIDIO) += rapidio/ |
| 11 | obj-y += video/ | 11 | obj-y += video/ |
| @@ -49,6 +49,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ | |||
| 49 | obj-$(CONFIG_PARIDE) += block/paride/ | 49 | obj-$(CONFIG_PARIDE) += block/paride/ |
| 50 | obj-$(CONFIG_TC) += tc/ | 50 | obj-$(CONFIG_TC) += tc/ |
| 51 | obj-$(CONFIG_USB) += usb/ | 51 | obj-$(CONFIG_USB) += usb/ |
| 52 | obj-$(CONFIG_PCI) += usb/ | ||
| 52 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ | 53 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ |
| 53 | obj-$(CONFIG_GAMEPORT) += input/gameport/ | 54 | obj-$(CONFIG_GAMEPORT) += input/gameport/ |
| 54 | obj-$(CONFIG_INPUT) += input/ | 55 | obj-$(CONFIG_INPUT) += input/ |
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index fe1e8126fbae..fce21c257523 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -197,7 +197,6 @@ config ACPI_ASUS | |||
| 197 | config ACPI_IBM | 197 | config ACPI_IBM |
| 198 | tristate "IBM ThinkPad Laptop Extras" | 198 | tristate "IBM ThinkPad Laptop Extras" |
| 199 | depends on X86 | 199 | depends on X86 |
| 200 | default y | ||
| 201 | ---help--- | 200 | ---help--- |
| 202 | This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds | 201 | This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds |
| 203 | support for Fn-Fx key combinations, Bluetooth control, video | 202 | support for Fn-Fx key combinations, Bluetooth control, video |
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index a18243488c66..5984b4f6715a 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -16,7 +16,7 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS) | |||
| 16 | # ACPI Boot-Time Table Parsing | 16 | # ACPI Boot-Time Table Parsing |
| 17 | # | 17 | # |
| 18 | obj-y += tables.o | 18 | obj-y += tables.o |
| 19 | obj-y += blacklist.o | 19 | obj-$(CONFIG_X86) += blacklist.o |
| 20 | 20 | ||
| 21 | # | 21 | # |
| 22 | # ACPI Core Subsystem (Interpreter) | 22 | # ACPI Core Subsystem (Interpreter) |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 421792562642..0c561c571f29 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -543,6 +543,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr) | |||
| 543 | return_VALUE(0); | 543 | return_VALUE(0); |
| 544 | } | 544 | } |
| 545 | 545 | ||
| 546 | static void *processor_device_array[NR_CPUS]; | ||
| 547 | |||
| 546 | static int acpi_processor_start(struct acpi_device *device) | 548 | static int acpi_processor_start(struct acpi_device *device) |
| 547 | { | 549 | { |
| 548 | int result = 0; | 550 | int result = 0; |
| @@ -561,6 +563,19 @@ static int acpi_processor_start(struct acpi_device *device) | |||
| 561 | 563 | ||
| 562 | BUG_ON((pr->id >= NR_CPUS) || (pr->id < 0)); | 564 | BUG_ON((pr->id >= NR_CPUS) || (pr->id < 0)); |
| 563 | 565 | ||
| 566 | /* | ||
| 567 | * Buggy BIOS check | ||
| 568 | * ACPI id of processors can be reported wrongly by the BIOS. | ||
| 569 | * Don't trust it blindly | ||
| 570 | */ | ||
| 571 | if (processor_device_array[pr->id] != NULL && | ||
| 572 | processor_device_array[pr->id] != (void *)device) { | ||
| 573 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id" | ||
| 574 | "for the processor\n")); | ||
| 575 | return_VALUE(-ENODEV); | ||
| 576 | } | ||
| 577 | processor_device_array[pr->id] = (void *)device; | ||
| 578 | |||
| 564 | processors[pr->id] = pr; | 579 | processors[pr->id] = pr; |
| 565 | 580 | ||
| 566 | result = acpi_processor_add_fs(device); | 581 | result = acpi_processor_add_fs(device); |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 70d8a6ec0920..5f51057518b0 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -169,15 +169,11 @@ acpi_processor_power_activate(struct acpi_processor *pr, | |||
| 169 | 169 | ||
| 170 | static void acpi_safe_halt(void) | 170 | static void acpi_safe_halt(void) |
| 171 | { | 171 | { |
| 172 | int polling = test_thread_flag(TIF_POLLING_NRFLAG); | 172 | clear_thread_flag(TIF_POLLING_NRFLAG); |
| 173 | if (polling) { | 173 | smp_mb__after_clear_bit(); |
| 174 | clear_thread_flag(TIF_POLLING_NRFLAG); | ||
| 175 | smp_mb__after_clear_bit(); | ||
| 176 | } | ||
| 177 | if (!need_resched()) | 174 | if (!need_resched()) |
| 178 | safe_halt(); | 175 | safe_halt(); |
| 179 | if (polling) | 176 | set_thread_flag(TIF_POLLING_NRFLAG); |
| 180 | set_thread_flag(TIF_POLLING_NRFLAG); | ||
| 181 | } | 177 | } |
| 182 | 178 | ||
| 183 | static atomic_t c3_cpu_count; | 179 | static atomic_t c3_cpu_count; |
| @@ -280,11 +276,31 @@ static void acpi_processor_idle(void) | |||
| 280 | 276 | ||
| 281 | cx->usage++; | 277 | cx->usage++; |
| 282 | 278 | ||
| 279 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 280 | /* | ||
| 281 | * Check for P_LVL2_UP flag before entering C2 and above on | ||
| 282 | * an SMP system. We do it here instead of doing it at _CST/P_LVL | ||
| 283 | * detection phase, to work cleanly with logical CPU hotplug. | ||
| 284 | */ | ||
| 285 | if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && | ||
| 286 | !pr->flags.has_cst && acpi_fadt.plvl2_up) | ||
| 287 | cx->type = ACPI_STATE_C1; | ||
| 288 | #endif | ||
| 283 | /* | 289 | /* |
| 284 | * Sleep: | 290 | * Sleep: |
| 285 | * ------ | 291 | * ------ |
| 286 | * Invoke the current Cx state to put the processor to sleep. | 292 | * Invoke the current Cx state to put the processor to sleep. |
| 287 | */ | 293 | */ |
| 294 | if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) { | ||
| 295 | clear_thread_flag(TIF_POLLING_NRFLAG); | ||
| 296 | smp_mb__after_clear_bit(); | ||
| 297 | if (need_resched()) { | ||
| 298 | set_thread_flag(TIF_POLLING_NRFLAG); | ||
| 299 | local_irq_enable(); | ||
| 300 | return; | ||
| 301 | } | ||
| 302 | } | ||
| 303 | |||
| 288 | switch (cx->type) { | 304 | switch (cx->type) { |
| 289 | 305 | ||
| 290 | case ACPI_STATE_C1: | 306 | case ACPI_STATE_C1: |
| @@ -317,6 +333,7 @@ static void acpi_processor_idle(void) | |||
| 317 | t2 = inl(acpi_fadt.xpm_tmr_blk.address); | 333 | t2 = inl(acpi_fadt.xpm_tmr_blk.address); |
| 318 | /* Re-enable interrupts */ | 334 | /* Re-enable interrupts */ |
| 319 | local_irq_enable(); | 335 | local_irq_enable(); |
| 336 | set_thread_flag(TIF_POLLING_NRFLAG); | ||
| 320 | /* Compute time (ticks) that we were actually asleep */ | 337 | /* Compute time (ticks) that we were actually asleep */ |
| 321 | sleep_ticks = | 338 | sleep_ticks = |
| 322 | ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD; | 339 | ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD; |
| @@ -356,6 +373,7 @@ static void acpi_processor_idle(void) | |||
| 356 | 373 | ||
| 357 | /* Re-enable interrupts */ | 374 | /* Re-enable interrupts */ |
| 358 | local_irq_enable(); | 375 | local_irq_enable(); |
| 376 | set_thread_flag(TIF_POLLING_NRFLAG); | ||
| 359 | /* Compute time (ticks) that we were actually asleep */ | 377 | /* Compute time (ticks) that we were actually asleep */ |
| 360 | sleep_ticks = | 378 | sleep_ticks = |
| 361 | ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD; | 379 | ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD; |
| @@ -534,6 +552,15 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) | |||
| 534 | pr->power.states[ACPI_STATE_C0].valid = 1; | 552 | pr->power.states[ACPI_STATE_C0].valid = 1; |
| 535 | pr->power.states[ACPI_STATE_C1].valid = 1; | 553 | pr->power.states[ACPI_STATE_C1].valid = 1; |
| 536 | 554 | ||
| 555 | #ifndef CONFIG_HOTPLUG_CPU | ||
| 556 | /* | ||
| 557 | * Check for P_LVL2_UP flag before entering C2 and above on | ||
| 558 | * an SMP system. | ||
| 559 | */ | ||
| 560 | if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up) | ||
| 561 | return_VALUE(-ENODEV); | ||
| 562 | #endif | ||
| 563 | |||
| 537 | /* determine C2 and C3 address from pblk */ | 564 | /* determine C2 and C3 address from pblk */ |
| 538 | pr->power.states[ACPI_STATE_C2].address = pr->pblk + 4; | 565 | pr->power.states[ACPI_STATE_C2].address = pr->pblk + 4; |
| 539 | pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5; | 566 | pr->power.states[ACPI_STATE_C3].address = pr->pblk + 5; |
| @@ -690,7 +717,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | |||
| 690 | 717 | ||
| 691 | /* Validate number of power states discovered */ | 718 | /* Validate number of power states discovered */ |
| 692 | if (pr->power.count < 2) | 719 | if (pr->power.count < 2) |
| 693 | status = -ENODEV; | 720 | status = -EFAULT; |
| 694 | 721 | ||
| 695 | end: | 722 | end: |
| 696 | acpi_os_free(buffer.pointer); | 723 | acpi_os_free(buffer.pointer); |
| @@ -841,11 +868,11 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr) | |||
| 841 | * this function */ | 868 | * this function */ |
| 842 | 869 | ||
| 843 | result = acpi_processor_get_power_info_cst(pr); | 870 | result = acpi_processor_get_power_info_cst(pr); |
| 844 | if ((result) || (acpi_processor_power_verify(pr) < 2)) { | 871 | if (result == -ENODEV) |
| 845 | result = acpi_processor_get_power_info_fadt(pr); | 872 | result = acpi_processor_get_power_info_fadt(pr); |
| 846 | if ((result) || (acpi_processor_power_verify(pr) < 2)) | 873 | |
| 847 | result = acpi_processor_get_power_info_default_c1(pr); | 874 | if ((result) || (acpi_processor_power_verify(pr) < 2)) |
| 848 | } | 875 | result = acpi_processor_get_power_info_default_c1(pr); |
| 849 | 876 | ||
| 850 | /* | 877 | /* |
| 851 | * Set Default Policy | 878 | * Set Default Policy |
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index 37528c3b64b0..f37584015324 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c | |||
| @@ -101,9 +101,7 @@ static unsigned int acpi_thermal_cpufreq_is_init = 0; | |||
| 101 | static int cpu_has_cpufreq(unsigned int cpu) | 101 | static int cpu_has_cpufreq(unsigned int cpu) |
| 102 | { | 102 | { |
| 103 | struct cpufreq_policy policy; | 103 | struct cpufreq_policy policy; |
| 104 | if (!acpi_thermal_cpufreq_is_init) | 104 | if (!acpi_thermal_cpufreq_is_init || cpufreq_get_policy(&policy, cpu)) |
| 105 | return -ENODEV; | ||
| 106 | if (!cpufreq_get_policy(&policy, cpu)) | ||
| 107 | return -ENODEV; | 105 | return -ENODEV; |
| 108 | return 0; | 106 | return 0; |
| 109 | } | 107 | } |
| @@ -127,13 +125,13 @@ static int acpi_thermal_cpufreq_decrease(unsigned int cpu) | |||
| 127 | if (!cpu_has_cpufreq(cpu)) | 125 | if (!cpu_has_cpufreq(cpu)) |
| 128 | return -ENODEV; | 126 | return -ENODEV; |
| 129 | 127 | ||
| 130 | if (cpufreq_thermal_reduction_pctg[cpu] >= 20) { | 128 | if (cpufreq_thermal_reduction_pctg[cpu] > 20) |
| 131 | cpufreq_thermal_reduction_pctg[cpu] -= 20; | 129 | cpufreq_thermal_reduction_pctg[cpu] -= 20; |
| 132 | cpufreq_update_policy(cpu); | 130 | else |
| 133 | return 0; | 131 | cpufreq_thermal_reduction_pctg[cpu] = 0; |
| 134 | } | 132 | cpufreq_update_policy(cpu); |
| 135 | 133 | /* We reached max freq again and can leave passive mode */ | |
| 136 | return -ERANGE; | 134 | return !cpufreq_thermal_reduction_pctg[cpu]; |
| 137 | } | 135 | } |
| 138 | 136 | ||
| 139 | static int acpi_thermal_cpufreq_notifier(struct notifier_block *nb, | 137 | static int acpi_thermal_cpufreq_notifier(struct notifier_block *nb, |
| @@ -200,7 +198,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type) | |||
| 200 | int result = 0; | 198 | int result = 0; |
| 201 | struct acpi_processor *pr = NULL; | 199 | struct acpi_processor *pr = NULL; |
| 202 | struct acpi_device *device = NULL; | 200 | struct acpi_device *device = NULL; |
| 203 | int tx = 0; | 201 | int tx = 0, max_tx_px = 0; |
| 204 | 202 | ||
| 205 | ACPI_FUNCTION_TRACE("acpi_processor_set_thermal_limit"); | 203 | ACPI_FUNCTION_TRACE("acpi_processor_set_thermal_limit"); |
| 206 | 204 | ||
| @@ -259,19 +257,27 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type) | |||
| 259 | /* if going down: T-states first, P-states later */ | 257 | /* if going down: T-states first, P-states later */ |
| 260 | 258 | ||
| 261 | if (pr->flags.throttling) { | 259 | if (pr->flags.throttling) { |
| 262 | if (tx == 0) | 260 | if (tx == 0) { |
| 261 | max_tx_px = 1; | ||
| 263 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 262 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 264 | "At minimum throttling state\n")); | 263 | "At minimum throttling state\n")); |
| 265 | else { | 264 | } else { |
| 266 | tx--; | 265 | tx--; |
| 267 | goto end; | 266 | goto end; |
| 268 | } | 267 | } |
| 269 | } | 268 | } |
| 270 | 269 | ||
| 271 | result = acpi_thermal_cpufreq_decrease(pr->id); | 270 | result = acpi_thermal_cpufreq_decrease(pr->id); |
| 272 | if (result == -ERANGE) | 271 | if (result) { |
| 272 | /* | ||
| 273 | * We only could get -ERANGE, 1 or 0. | ||
| 274 | * In the first two cases we reached max freq again. | ||
| 275 | */ | ||
| 273 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 276 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 274 | "At minimum performance state\n")); | 277 | "At minimum performance state\n")); |
| 278 | max_tx_px = 1; | ||
| 279 | } else | ||
| 280 | max_tx_px = 0; | ||
| 275 | 281 | ||
| 276 | break; | 282 | break; |
| 277 | } | 283 | } |
| @@ -290,8 +296,10 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type) | |||
| 290 | pr->limit.thermal.px, pr->limit.thermal.tx)); | 296 | pr->limit.thermal.px, pr->limit.thermal.tx)); |
| 291 | } else | 297 | } else |
| 292 | result = 0; | 298 | result = 0; |
| 293 | 299 | if (max_tx_px) | |
| 294 | return_VALUE(result); | 300 | return_VALUE(1); |
| 301 | else | ||
| 302 | return_VALUE(result); | ||
| 295 | } | 303 | } |
| 296 | 304 | ||
| 297 | int acpi_processor_get_limit_info(struct acpi_processor *pr) | 305 | int acpi_processor_get_limit_info(struct acpi_processor *pr) |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 23e2c6968a11..31218e1d2a18 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -1110,7 +1110,7 @@ acpi_add_single_object(struct acpi_device **child, | |||
| 1110 | * | 1110 | * |
| 1111 | * TBD: Assumes LDM provides driver hot-plug capability. | 1111 | * TBD: Assumes LDM provides driver hot-plug capability. |
| 1112 | */ | 1112 | */ |
| 1113 | result = acpi_bus_find_driver(device); | 1113 | acpi_bus_find_driver(device); |
| 1114 | 1114 | ||
| 1115 | end: | 1115 | end: |
| 1116 | if (!result) | 1116 | if (!result) |
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index a24847c08f7f..19f3ea48475e 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | #define _COMPONENT ACPI_THERMAL_COMPONENT | 72 | #define _COMPONENT ACPI_THERMAL_COMPONENT |
| 73 | ACPI_MODULE_NAME("acpi_thermal") | 73 | ACPI_MODULE_NAME("acpi_thermal") |
| 74 | 74 | ||
| 75 | MODULE_AUTHOR("Paul Diefenbaugh"); | 75 | MODULE_AUTHOR("Paul Diefenbaugh"); |
| 76 | MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME); | 76 | MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME); |
| 77 | MODULE_LICENSE("GPL"); | 77 | MODULE_LICENSE("GPL"); |
| 78 | 78 | ||
| @@ -517,9 +517,9 @@ static int acpi_thermal_hot(struct acpi_thermal *tz) | |||
| 517 | return_VALUE(0); | 517 | return_VALUE(0); |
| 518 | } | 518 | } |
| 519 | 519 | ||
| 520 | static int acpi_thermal_passive(struct acpi_thermal *tz) | 520 | static void acpi_thermal_passive(struct acpi_thermal *tz) |
| 521 | { | 521 | { |
| 522 | int result = 0; | 522 | int result = 1; |
| 523 | struct acpi_thermal_passive *passive = NULL; | 523 | struct acpi_thermal_passive *passive = NULL; |
| 524 | int trend = 0; | 524 | int trend = 0; |
| 525 | int i = 0; | 525 | int i = 0; |
| @@ -527,7 +527,7 @@ static int acpi_thermal_passive(struct acpi_thermal *tz) | |||
| 527 | ACPI_FUNCTION_TRACE("acpi_thermal_passive"); | 527 | ACPI_FUNCTION_TRACE("acpi_thermal_passive"); |
| 528 | 528 | ||
| 529 | if (!tz || !tz->trips.passive.flags.valid) | 529 | if (!tz || !tz->trips.passive.flags.valid) |
| 530 | return_VALUE(-EINVAL); | 530 | return; |
| 531 | 531 | ||
| 532 | passive = &(tz->trips.passive); | 532 | passive = &(tz->trips.passive); |
| 533 | 533 | ||
| @@ -547,7 +547,7 @@ static int acpi_thermal_passive(struct acpi_thermal *tz) | |||
| 547 | trend, passive->tc1, tz->temperature, | 547 | trend, passive->tc1, tz->temperature, |
| 548 | tz->last_temperature, passive->tc2, | 548 | tz->last_temperature, passive->tc2, |
| 549 | tz->temperature, passive->temperature)); | 549 | tz->temperature, passive->temperature)); |
| 550 | tz->trips.passive.flags.enabled = 1; | 550 | passive->flags.enabled = 1; |
| 551 | /* Heating up? */ | 551 | /* Heating up? */ |
| 552 | if (trend > 0) | 552 | if (trend > 0) |
| 553 | for (i = 0; i < passive->devices.count; i++) | 553 | for (i = 0; i < passive->devices.count; i++) |
| @@ -556,12 +556,32 @@ static int acpi_thermal_passive(struct acpi_thermal *tz) | |||
| 556 | handles[i], | 556 | handles[i], |
| 557 | ACPI_PROCESSOR_LIMIT_INCREMENT); | 557 | ACPI_PROCESSOR_LIMIT_INCREMENT); |
| 558 | /* Cooling off? */ | 558 | /* Cooling off? */ |
| 559 | else if (trend < 0) | 559 | else if (trend < 0) { |
| 560 | for (i = 0; i < passive->devices.count; i++) | 560 | for (i = 0; i < passive->devices.count; i++) |
| 561 | acpi_processor_set_thermal_limit(passive-> | 561 | /* |
| 562 | devices. | 562 | * assume that we are on highest |
| 563 | handles[i], | 563 | * freq/lowest thrott and can leave |
| 564 | ACPI_PROCESSOR_LIMIT_DECREMENT); | 564 | * passive mode, even in error case |
| 565 | */ | ||
| 566 | if (!acpi_processor_set_thermal_limit | ||
| 567 | (passive->devices.handles[i], | ||
| 568 | ACPI_PROCESSOR_LIMIT_DECREMENT)) | ||
| 569 | result = 0; | ||
| 570 | /* | ||
| 571 | * Leave cooling mode, even if the temp might | ||
| 572 | * higher than trip point This is because some | ||
| 573 | * machines might have long thermal polling | ||
| 574 | * frequencies (tsp) defined. We will fall back | ||
| 575 | * into passive mode in next cycle (probably quicker) | ||
| 576 | */ | ||
| 577 | if (result) { | ||
| 578 | passive->flags.enabled = 0; | ||
| 579 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
| 580 | "Disabling passive cooling, still above threshold," | ||
| 581 | " but we are cooling down\n")); | ||
| 582 | } | ||
| 583 | } | ||
| 584 | return; | ||
| 565 | } | 585 | } |
| 566 | 586 | ||
| 567 | /* | 587 | /* |
| @@ -571,23 +591,21 @@ static int acpi_thermal_passive(struct acpi_thermal *tz) | |||
| 571 | * and avoid thrashing around the passive trip point. Note that we | 591 | * and avoid thrashing around the passive trip point. Note that we |
| 572 | * assume symmetry. | 592 | * assume symmetry. |
| 573 | */ | 593 | */ |
| 574 | else if (tz->trips.passive.flags.enabled) { | 594 | if (!passive->flags.enabled) |
| 575 | for (i = 0; i < passive->devices.count; i++) | 595 | return; |
| 576 | result = | 596 | for (i = 0; i < passive->devices.count; i++) |
| 577 | acpi_processor_set_thermal_limit(passive->devices. | 597 | if (!acpi_processor_set_thermal_limit |
| 578 | handles[i], | 598 | (passive->devices.handles[i], |
| 579 | ACPI_PROCESSOR_LIMIT_DECREMENT); | 599 | ACPI_PROCESSOR_LIMIT_DECREMENT)) |
| 580 | if (result == 1) { | 600 | result = 0; |
| 581 | tz->trips.passive.flags.enabled = 0; | 601 | if (result) { |
| 582 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 602 | passive->flags.enabled = 0; |
| 583 | "Disabling passive cooling (zone is cool)\n")); | 603 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 584 | } | 604 | "Disabling passive cooling (zone is cool)\n")); |
| 585 | } | 605 | } |
| 586 | |||
| 587 | return_VALUE(0); | ||
| 588 | } | 606 | } |
| 589 | 607 | ||
| 590 | static int acpi_thermal_active(struct acpi_thermal *tz) | 608 | static void acpi_thermal_active(struct acpi_thermal *tz) |
| 591 | { | 609 | { |
| 592 | int result = 0; | 610 | int result = 0; |
| 593 | struct acpi_thermal_active *active = NULL; | 611 | struct acpi_thermal_active *active = NULL; |
| @@ -598,74 +616,66 @@ static int acpi_thermal_active(struct acpi_thermal *tz) | |||
| 598 | ACPI_FUNCTION_TRACE("acpi_thermal_active"); | 616 | ACPI_FUNCTION_TRACE("acpi_thermal_active"); |
| 599 | 617 | ||
| 600 | if (!tz) | 618 | if (!tz) |
| 601 | return_VALUE(-EINVAL); | 619 | return; |
| 602 | 620 | ||
| 603 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) { | 621 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) { |
| 604 | |||
| 605 | active = &(tz->trips.active[i]); | 622 | active = &(tz->trips.active[i]); |
| 606 | if (!active || !active->flags.valid) | 623 | if (!active || !active->flags.valid) |
| 607 | break; | 624 | break; |
| 608 | |||
| 609 | /* | ||
| 610 | * Above Threshold? | ||
| 611 | * ---------------- | ||
| 612 | * If not already enabled, turn ON all cooling devices | ||
| 613 | * associated with this active threshold. | ||
| 614 | */ | ||
| 615 | if (tz->temperature >= active->temperature) { | 625 | if (tz->temperature >= active->temperature) { |
| 626 | /* | ||
| 627 | * Above Threshold? | ||
| 628 | * ---------------- | ||
| 629 | * If not already enabled, turn ON all cooling devices | ||
| 630 | * associated with this active threshold. | ||
| 631 | */ | ||
| 616 | if (active->temperature > maxtemp) | 632 | if (active->temperature > maxtemp) |
| 617 | tz->state.active_index = i, maxtemp = | 633 | tz->state.active_index = i; |
| 618 | active->temperature; | 634 | maxtemp = active->temperature; |
| 619 | if (!active->flags.enabled) { | 635 | if (active->flags.enabled) |
| 620 | for (j = 0; j < active->devices.count; j++) { | 636 | continue; |
| 621 | result = | ||
| 622 | acpi_bus_set_power(active->devices. | ||
| 623 | handles[j], | ||
| 624 | ACPI_STATE_D0); | ||
| 625 | if (result) { | ||
| 626 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | ||
| 627 | "Unable to turn cooling device [%p] 'on'\n", | ||
| 628 | active-> | ||
| 629 | devices. | ||
| 630 | handles[j])); | ||
| 631 | continue; | ||
| 632 | } | ||
| 633 | active->flags.enabled = 1; | ||
| 634 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
| 635 | "Cooling device [%p] now 'on'\n", | ||
| 636 | active->devices. | ||
| 637 | handles[j])); | ||
| 638 | } | ||
| 639 | } | ||
| 640 | } | ||
| 641 | /* | ||
| 642 | * Below Threshold? | ||
| 643 | * ---------------- | ||
| 644 | * Turn OFF all cooling devices associated with this | ||
| 645 | * threshold. | ||
| 646 | */ | ||
| 647 | else if (active->flags.enabled) { | ||
| 648 | for (j = 0; j < active->devices.count; j++) { | 637 | for (j = 0; j < active->devices.count; j++) { |
| 649 | result = | 638 | result = |
| 650 | acpi_bus_set_power(active->devices. | 639 | acpi_bus_set_power(active->devices. |
| 651 | handles[j], | 640 | handles[j], |
| 652 | ACPI_STATE_D3); | 641 | ACPI_STATE_D0); |
| 653 | if (result) { | 642 | if (result) { |
| 654 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | 643 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, |
| 655 | "Unable to turn cooling device [%p] 'off'\n", | 644 | "Unable to turn cooling device [%p] 'on'\n", |
| 656 | active->devices. | 645 | active->devices. |
| 657 | handles[j])); | 646 | handles[j])); |
| 658 | continue; | 647 | continue; |
| 659 | } | 648 | } |
| 660 | active->flags.enabled = 0; | 649 | active->flags.enabled = 1; |
| 661 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 650 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 662 | "Cooling device [%p] now 'off'\n", | 651 | "Cooling device [%p] now 'on'\n", |
| 663 | active->devices.handles[j])); | 652 | active->devices.handles[j])); |
| 664 | } | 653 | } |
| 654 | continue; | ||
| 655 | } | ||
| 656 | if (!active->flags.enabled) | ||
| 657 | continue; | ||
| 658 | /* | ||
| 659 | * Below Threshold? | ||
| 660 | * ---------------- | ||
| 661 | * Turn OFF all cooling devices associated with this | ||
| 662 | * threshold. | ||
| 663 | */ | ||
| 664 | for (j = 0; j < active->devices.count; j++) { | ||
| 665 | result = acpi_bus_set_power(active->devices.handles[j], | ||
| 666 | ACPI_STATE_D3); | ||
| 667 | if (result) { | ||
| 668 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | ||
| 669 | "Unable to turn cooling device [%p] 'off'\n", | ||
| 670 | active->devices.handles[j])); | ||
| 671 | continue; | ||
| 672 | } | ||
| 673 | active->flags.enabled = 0; | ||
| 674 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
| 675 | "Cooling device [%p] now 'off'\n", | ||
| 676 | active->devices.handles[j])); | ||
| 665 | } | 677 | } |
| 666 | } | 678 | } |
| 667 | |||
| 668 | return_VALUE(0); | ||
| 669 | } | 679 | } |
| 670 | 680 | ||
| 671 | static void acpi_thermal_check(void *context); | 681 | static void acpi_thermal_check(void *context); |
| @@ -744,15 +754,12 @@ static void acpi_thermal_check(void *data) | |||
| 744 | * Again, separated from the above two to allow independent policy | 754 | * Again, separated from the above two to allow independent policy |
| 745 | * decisions. | 755 | * decisions. |
| 746 | */ | 756 | */ |
| 747 | if (tz->trips.critical.flags.enabled) | 757 | tz->state.critical = tz->trips.critical.flags.enabled; |
| 748 | tz->state.critical = 1; | 758 | tz->state.hot = tz->trips.hot.flags.enabled; |
| 749 | if (tz->trips.hot.flags.enabled) | 759 | tz->state.passive = tz->trips.passive.flags.enabled; |
| 750 | tz->state.hot = 1; | 760 | tz->state.active = 0; |
| 751 | if (tz->trips.passive.flags.enabled) | ||
| 752 | tz->state.passive = 1; | ||
| 753 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) | 761 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) |
| 754 | if (tz->trips.active[i].flags.enabled) | 762 | tz->state.active |= tz->trips.active[i].flags.enabled; |
| 755 | tz->state.active = 1; | ||
| 756 | 763 | ||
| 757 | /* | 764 | /* |
| 758 | * Calculate Sleep Time | 765 | * Calculate Sleep Time |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index f051b151580d..d10668f14699 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -812,7 +812,7 @@ acpi_video_device_write_brightness(struct file *file, | |||
| 812 | 812 | ||
| 813 | ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness"); | 813 | ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness"); |
| 814 | 814 | ||
| 815 | if (!dev || count + 1 > sizeof str) | 815 | if (!dev || !dev->brightness || count + 1 > sizeof str) |
| 816 | return_VALUE(-EINVAL); | 816 | return_VALUE(-EINVAL); |
| 817 | 817 | ||
| 818 | if (copy_from_user(str, buffer, count)) | 818 | if (copy_from_user(str, buffer, count)) |
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index e73f81c22381..eb7f52537ccc 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c | |||
| @@ -310,7 +310,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, | |||
| 310 | u8 method; | 310 | u8 method; |
| 311 | __be64 *tid; | 311 | __be64 *tid; |
| 312 | int ret, length, hdr_len, copy_offset; | 312 | int ret, length, hdr_len, copy_offset; |
| 313 | int rmpp_active = 0; | 313 | int rmpp_active, has_rmpp_header; |
| 314 | 314 | ||
| 315 | if (count < sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR) | 315 | if (count < sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR) |
| 316 | return -EINVAL; | 316 | return -EINVAL; |
| @@ -360,28 +360,31 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, | |||
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | rmpp_mad = (struct ib_rmpp_mad *) packet->mad.data; | 362 | rmpp_mad = (struct ib_rmpp_mad *) packet->mad.data; |
| 363 | if (ib_get_rmpp_flags(&rmpp_mad->rmpp_hdr) & IB_MGMT_RMPP_FLAG_ACTIVE) { | 363 | if (rmpp_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_ADM) { |
| 364 | /* RMPP active */ | 364 | hdr_len = IB_MGMT_SA_HDR; |
| 365 | if (!agent->rmpp_version) { | ||
| 366 | ret = -EINVAL; | ||
| 367 | goto err_ah; | ||
| 368 | } | ||
| 369 | |||
| 370 | /* Validate that the management class can support RMPP */ | ||
| 371 | if (rmpp_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_ADM) { | ||
| 372 | hdr_len = IB_MGMT_SA_HDR; | ||
| 373 | } else if ((rmpp_mad->mad_hdr.mgmt_class >= IB_MGMT_CLASS_VENDOR_RANGE2_START) && | ||
| 374 | (rmpp_mad->mad_hdr.mgmt_class <= IB_MGMT_CLASS_VENDOR_RANGE2_END)) { | ||
| 375 | hdr_len = IB_MGMT_VENDOR_HDR; | ||
| 376 | } else { | ||
| 377 | ret = -EINVAL; | ||
| 378 | goto err_ah; | ||
| 379 | } | ||
| 380 | rmpp_active = 1; | ||
| 381 | copy_offset = IB_MGMT_RMPP_HDR; | 365 | copy_offset = IB_MGMT_RMPP_HDR; |
| 366 | has_rmpp_header = 1; | ||
| 367 | } else if (rmpp_mad->mad_hdr.mgmt_class >= IB_MGMT_CLASS_VENDOR_RANGE2_START && | ||
| 368 | rmpp_mad->mad_hdr.mgmt_class <= IB_MGMT_CLASS_VENDOR_RANGE2_END) { | ||
| 369 | hdr_len = IB_MGMT_VENDOR_HDR; | ||
| 370 | copy_offset = IB_MGMT_RMPP_HDR; | ||
| 371 | has_rmpp_header = 1; | ||
| 382 | } else { | 372 | } else { |
| 383 | hdr_len = IB_MGMT_MAD_HDR; | 373 | hdr_len = IB_MGMT_MAD_HDR; |
| 384 | copy_offset = IB_MGMT_MAD_HDR; | 374 | copy_offset = IB_MGMT_MAD_HDR; |
| 375 | has_rmpp_header = 0; | ||
| 376 | } | ||
| 377 | |||
| 378 | if (has_rmpp_header) | ||
| 379 | rmpp_active = ib_get_rmpp_flags(&rmpp_mad->rmpp_hdr) & | ||
| 380 | IB_MGMT_RMPP_FLAG_ACTIVE; | ||
| 381 | else | ||
| 382 | rmpp_active = 0; | ||
| 383 | |||
| 384 | /* Validate that the management class can support RMPP */ | ||
| 385 | if (rmpp_active && !agent->rmpp_version) { | ||
| 386 | ret = -EINVAL; | ||
| 387 | goto err_ah; | ||
| 385 | } | 388 | } |
| 386 | 389 | ||
| 387 | packet->msg = ib_create_send_mad(agent, | 390 | packet->msg = ib_create_send_mad(agent, |
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h index ecb830127865..7114e3fbab00 100644 --- a/drivers/infiniband/core/uverbs.h +++ b/drivers/infiniband/core/uverbs.h | |||
| @@ -105,12 +105,23 @@ struct ib_uverbs_event { | |||
| 105 | u32 *counter; | 105 | u32 *counter; |
| 106 | }; | 106 | }; |
| 107 | 107 | ||
| 108 | struct ib_uverbs_mcast_entry { | ||
| 109 | struct list_head list; | ||
| 110 | union ib_gid gid; | ||
| 111 | u16 lid; | ||
| 112 | }; | ||
| 113 | |||
| 108 | struct ib_uevent_object { | 114 | struct ib_uevent_object { |
| 109 | struct ib_uobject uobject; | 115 | struct ib_uobject uobject; |
| 110 | struct list_head event_list; | 116 | struct list_head event_list; |
| 111 | u32 events_reported; | 117 | u32 events_reported; |
| 112 | }; | 118 | }; |
| 113 | 119 | ||
| 120 | struct ib_uqp_object { | ||
| 121 | struct ib_uevent_object uevent; | ||
| 122 | struct list_head mcast_list; | ||
| 123 | }; | ||
| 124 | |||
| 114 | struct ib_ucq_object { | 125 | struct ib_ucq_object { |
| 115 | struct ib_uobject uobject; | 126 | struct ib_uobject uobject; |
| 116 | struct ib_uverbs_file *uverbs_file; | 127 | struct ib_uverbs_file *uverbs_file; |
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index ed45da892b1c..a57d021d435a 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c | |||
| @@ -815,7 +815,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, | |||
| 815 | struct ib_uverbs_create_qp cmd; | 815 | struct ib_uverbs_create_qp cmd; |
| 816 | struct ib_uverbs_create_qp_resp resp; | 816 | struct ib_uverbs_create_qp_resp resp; |
| 817 | struct ib_udata udata; | 817 | struct ib_udata udata; |
| 818 | struct ib_uevent_object *uobj; | 818 | struct ib_uqp_object *uobj; |
| 819 | struct ib_pd *pd; | 819 | struct ib_pd *pd; |
| 820 | struct ib_cq *scq, *rcq; | 820 | struct ib_cq *scq, *rcq; |
| 821 | struct ib_srq *srq; | 821 | struct ib_srq *srq; |
| @@ -866,10 +866,11 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, | |||
| 866 | attr.cap.max_recv_sge = cmd.max_recv_sge; | 866 | attr.cap.max_recv_sge = cmd.max_recv_sge; |
| 867 | attr.cap.max_inline_data = cmd.max_inline_data; | 867 | attr.cap.max_inline_data = cmd.max_inline_data; |
| 868 | 868 | ||
| 869 | uobj->uobject.user_handle = cmd.user_handle; | 869 | uobj->uevent.uobject.user_handle = cmd.user_handle; |
| 870 | uobj->uobject.context = file->ucontext; | 870 | uobj->uevent.uobject.context = file->ucontext; |
| 871 | uobj->events_reported = 0; | 871 | uobj->uevent.events_reported = 0; |
| 872 | INIT_LIST_HEAD(&uobj->event_list); | 872 | INIT_LIST_HEAD(&uobj->uevent.event_list); |
| 873 | INIT_LIST_HEAD(&uobj->mcast_list); | ||
| 873 | 874 | ||
| 874 | qp = pd->device->create_qp(pd, &attr, &udata); | 875 | qp = pd->device->create_qp(pd, &attr, &udata); |
| 875 | if (IS_ERR(qp)) { | 876 | if (IS_ERR(qp)) { |
| @@ -882,7 +883,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, | |||
| 882 | qp->send_cq = attr.send_cq; | 883 | qp->send_cq = attr.send_cq; |
| 883 | qp->recv_cq = attr.recv_cq; | 884 | qp->recv_cq = attr.recv_cq; |
| 884 | qp->srq = attr.srq; | 885 | qp->srq = attr.srq; |
| 885 | qp->uobject = &uobj->uobject; | 886 | qp->uobject = &uobj->uevent.uobject; |
| 886 | qp->event_handler = attr.event_handler; | 887 | qp->event_handler = attr.event_handler; |
| 887 | qp->qp_context = attr.qp_context; | 888 | qp->qp_context = attr.qp_context; |
| 888 | qp->qp_type = attr.qp_type; | 889 | qp->qp_type = attr.qp_type; |
| @@ -901,14 +902,14 @@ retry: | |||
| 901 | goto err_destroy; | 902 | goto err_destroy; |
| 902 | } | 903 | } |
| 903 | 904 | ||
| 904 | ret = idr_get_new(&ib_uverbs_qp_idr, qp, &uobj->uobject.id); | 905 | ret = idr_get_new(&ib_uverbs_qp_idr, qp, &uobj->uevent.uobject.id); |
| 905 | 906 | ||
| 906 | if (ret == -EAGAIN) | 907 | if (ret == -EAGAIN) |
| 907 | goto retry; | 908 | goto retry; |
| 908 | if (ret) | 909 | if (ret) |
| 909 | goto err_destroy; | 910 | goto err_destroy; |
| 910 | 911 | ||
| 911 | resp.qp_handle = uobj->uobject.id; | 912 | resp.qp_handle = uobj->uevent.uobject.id; |
| 912 | resp.max_recv_sge = attr.cap.max_recv_sge; | 913 | resp.max_recv_sge = attr.cap.max_recv_sge; |
| 913 | resp.max_send_sge = attr.cap.max_send_sge; | 914 | resp.max_send_sge = attr.cap.max_send_sge; |
| 914 | resp.max_recv_wr = attr.cap.max_recv_wr; | 915 | resp.max_recv_wr = attr.cap.max_recv_wr; |
| @@ -922,7 +923,7 @@ retry: | |||
| 922 | } | 923 | } |
| 923 | 924 | ||
| 924 | down(&file->mutex); | 925 | down(&file->mutex); |
| 925 | list_add_tail(&uobj->uobject.list, &file->ucontext->qp_list); | 926 | list_add_tail(&uobj->uevent.uobject.list, &file->ucontext->qp_list); |
| 926 | up(&file->mutex); | 927 | up(&file->mutex); |
| 927 | 928 | ||
| 928 | up(&ib_uverbs_idr_mutex); | 929 | up(&ib_uverbs_idr_mutex); |
| @@ -930,7 +931,7 @@ retry: | |||
| 930 | return in_len; | 931 | return in_len; |
| 931 | 932 | ||
| 932 | err_idr: | 933 | err_idr: |
| 933 | idr_remove(&ib_uverbs_qp_idr, uobj->uobject.id); | 934 | idr_remove(&ib_uverbs_qp_idr, uobj->uevent.uobject.id); |
| 934 | 935 | ||
| 935 | err_destroy: | 936 | err_destroy: |
| 936 | ib_destroy_qp(qp); | 937 | ib_destroy_qp(qp); |
| @@ -1032,7 +1033,7 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, | |||
| 1032 | struct ib_uverbs_destroy_qp cmd; | 1033 | struct ib_uverbs_destroy_qp cmd; |
| 1033 | struct ib_uverbs_destroy_qp_resp resp; | 1034 | struct ib_uverbs_destroy_qp_resp resp; |
| 1034 | struct ib_qp *qp; | 1035 | struct ib_qp *qp; |
| 1035 | struct ib_uevent_object *uobj; | 1036 | struct ib_uqp_object *uobj; |
| 1036 | int ret = -EINVAL; | 1037 | int ret = -EINVAL; |
| 1037 | 1038 | ||
| 1038 | if (copy_from_user(&cmd, buf, sizeof cmd)) | 1039 | if (copy_from_user(&cmd, buf, sizeof cmd)) |
| @@ -1046,7 +1047,12 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, | |||
| 1046 | if (!qp || qp->uobject->context != file->ucontext) | 1047 | if (!qp || qp->uobject->context != file->ucontext) |
| 1047 | goto out; | 1048 | goto out; |
| 1048 | 1049 | ||
| 1049 | uobj = container_of(qp->uobject, struct ib_uevent_object, uobject); | 1050 | uobj = container_of(qp->uobject, struct ib_uqp_object, uevent.uobject); |
| 1051 | |||
| 1052 | if (!list_empty(&uobj->mcast_list)) { | ||
| 1053 | ret = -EBUSY; | ||
| 1054 | goto out; | ||
| 1055 | } | ||
| 1050 | 1056 | ||
| 1051 | ret = ib_destroy_qp(qp); | 1057 | ret = ib_destroy_qp(qp); |
| 1052 | if (ret) | 1058 | if (ret) |
| @@ -1055,12 +1061,12 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, | |||
| 1055 | idr_remove(&ib_uverbs_qp_idr, cmd.qp_handle); | 1061 | idr_remove(&ib_uverbs_qp_idr, cmd.qp_handle); |
| 1056 | 1062 | ||
| 1057 | down(&file->mutex); | 1063 | down(&file->mutex); |
| 1058 | list_del(&uobj->uobject.list); | 1064 | list_del(&uobj->uevent.uobject.list); |
| 1059 | up(&file->mutex); | 1065 | up(&file->mutex); |
| 1060 | 1066 | ||
| 1061 | ib_uverbs_release_uevent(file, uobj); | 1067 | ib_uverbs_release_uevent(file, &uobj->uevent); |
| 1062 | 1068 | ||
| 1063 | resp.events_reported = uobj->events_reported; | 1069 | resp.events_reported = uobj->uevent.events_reported; |
| 1064 | 1070 | ||
| 1065 | kfree(uobj); | 1071 | kfree(uobj); |
| 1066 | 1072 | ||
| @@ -1542,6 +1548,8 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file, | |||
| 1542 | { | 1548 | { |
| 1543 | struct ib_uverbs_attach_mcast cmd; | 1549 | struct ib_uverbs_attach_mcast cmd; |
| 1544 | struct ib_qp *qp; | 1550 | struct ib_qp *qp; |
| 1551 | struct ib_uqp_object *uobj; | ||
| 1552 | struct ib_uverbs_mcast_entry *mcast; | ||
| 1545 | int ret = -EINVAL; | 1553 | int ret = -EINVAL; |
| 1546 | 1554 | ||
| 1547 | if (copy_from_user(&cmd, buf, sizeof cmd)) | 1555 | if (copy_from_user(&cmd, buf, sizeof cmd)) |
| @@ -1550,9 +1558,36 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file, | |||
| 1550 | down(&ib_uverbs_idr_mutex); | 1558 | down(&ib_uverbs_idr_mutex); |
| 1551 | 1559 | ||
| 1552 | qp = idr_find(&ib_uverbs_qp_idr, cmd.qp_handle); | 1560 | qp = idr_find(&ib_uverbs_qp_idr, cmd.qp_handle); |
| 1553 | if (qp && qp->uobject->context == file->ucontext) | 1561 | if (!qp || qp->uobject->context != file->ucontext) |
| 1554 | ret = ib_attach_mcast(qp, (union ib_gid *) cmd.gid, cmd.mlid); | 1562 | goto out; |
| 1563 | |||
| 1564 | uobj = container_of(qp->uobject, struct ib_uqp_object, uevent.uobject); | ||
| 1565 | |||
| 1566 | list_for_each_entry(mcast, &uobj->mcast_list, list) | ||
| 1567 | if (cmd.mlid == mcast->lid && | ||
| 1568 | !memcmp(cmd.gid, mcast->gid.raw, sizeof mcast->gid.raw)) { | ||
| 1569 | ret = 0; | ||
| 1570 | goto out; | ||
| 1571 | } | ||
| 1555 | 1572 | ||
| 1573 | mcast = kmalloc(sizeof *mcast, GFP_KERNEL); | ||
| 1574 | if (!mcast) { | ||
| 1575 | ret = -ENOMEM; | ||
| 1576 | goto out; | ||
| 1577 | } | ||
| 1578 | |||
| 1579 | mcast->lid = cmd.mlid; | ||
| 1580 | memcpy(mcast->gid.raw, cmd.gid, sizeof mcast->gid.raw); | ||
| 1581 | |||
| 1582 | ret = ib_attach_mcast(qp, &mcast->gid, cmd.mlid); | ||
| 1583 | if (!ret) { | ||
| 1584 | uobj = container_of(qp->uobject, struct ib_uqp_object, | ||
| 1585 | uevent.uobject); | ||
| 1586 | list_add_tail(&mcast->list, &uobj->mcast_list); | ||
| 1587 | } else | ||
| 1588 | kfree(mcast); | ||
| 1589 | |||
| 1590 | out: | ||
| 1556 | up(&ib_uverbs_idr_mutex); | 1591 | up(&ib_uverbs_idr_mutex); |
| 1557 | 1592 | ||
| 1558 | return ret ? ret : in_len; | 1593 | return ret ? ret : in_len; |
| @@ -1563,7 +1598,9 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file, | |||
| 1563 | int out_len) | 1598 | int out_len) |
| 1564 | { | 1599 | { |
| 1565 | struct ib_uverbs_detach_mcast cmd; | 1600 | struct ib_uverbs_detach_mcast cmd; |
| 1601 | struct ib_uqp_object *uobj; | ||
| 1566 | struct ib_qp *qp; | 1602 | struct ib_qp *qp; |
| 1603 | struct ib_uverbs_mcast_entry *mcast; | ||
| 1567 | int ret = -EINVAL; | 1604 | int ret = -EINVAL; |
| 1568 | 1605 | ||
| 1569 | if (copy_from_user(&cmd, buf, sizeof cmd)) | 1606 | if (copy_from_user(&cmd, buf, sizeof cmd)) |
| @@ -1572,9 +1609,24 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file, | |||
| 1572 | down(&ib_uverbs_idr_mutex); | 1609 | down(&ib_uverbs_idr_mutex); |
| 1573 | 1610 | ||
| 1574 | qp = idr_find(&ib_uverbs_qp_idr, cmd.qp_handle); | 1611 | qp = idr_find(&ib_uverbs_qp_idr, cmd.qp_handle); |
| 1575 | if (qp && qp->uobject->context == file->ucontext) | 1612 | if (!qp || qp->uobject->context != file->ucontext) |
| 1576 | ret = ib_detach_mcast(qp, (union ib_gid *) cmd.gid, cmd.mlid); | 1613 | goto out; |
| 1614 | |||
| 1615 | ret = ib_detach_mcast(qp, (union ib_gid *) cmd.gid, cmd.mlid); | ||
| 1616 | if (ret) | ||
| 1617 | goto out; | ||
| 1577 | 1618 | ||
| 1619 | uobj = container_of(qp->uobject, struct ib_uqp_object, uevent.uobject); | ||
| 1620 | |||
| 1621 | list_for_each_entry(mcast, &uobj->mcast_list, list) | ||
| 1622 | if (cmd.mlid == mcast->lid && | ||
| 1623 | !memcmp(cmd.gid, mcast->gid.raw, sizeof mcast->gid.raw)) { | ||
| 1624 | list_del(&mcast->list); | ||
| 1625 | kfree(mcast); | ||
| 1626 | break; | ||
| 1627 | } | ||
| 1628 | |||
| 1629 | out: | ||
| 1578 | up(&ib_uverbs_idr_mutex); | 1630 | up(&ib_uverbs_idr_mutex); |
| 1579 | 1631 | ||
| 1580 | return ret ? ret : in_len; | 1632 | return ret ? ret : in_len; |
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index de6581d7cb8d..81737bd6faea 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
| @@ -160,6 +160,18 @@ void ib_uverbs_release_uevent(struct ib_uverbs_file *file, | |||
| 160 | spin_unlock_irq(&file->async_file->lock); | 160 | spin_unlock_irq(&file->async_file->lock); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | static void ib_uverbs_detach_umcast(struct ib_qp *qp, | ||
| 164 | struct ib_uqp_object *uobj) | ||
| 165 | { | ||
| 166 | struct ib_uverbs_mcast_entry *mcast, *tmp; | ||
| 167 | |||
| 168 | list_for_each_entry_safe(mcast, tmp, &uobj->mcast_list, list) { | ||
| 169 | ib_detach_mcast(qp, &mcast->gid, mcast->lid); | ||
| 170 | list_del(&mcast->list); | ||
| 171 | kfree(mcast); | ||
| 172 | } | ||
| 173 | } | ||
| 174 | |||
| 163 | static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, | 175 | static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, |
| 164 | struct ib_ucontext *context) | 176 | struct ib_ucontext *context) |
| 165 | { | 177 | { |
| @@ -180,13 +192,14 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, | |||
| 180 | 192 | ||
| 181 | list_for_each_entry_safe(uobj, tmp, &context->qp_list, list) { | 193 | list_for_each_entry_safe(uobj, tmp, &context->qp_list, list) { |
| 182 | struct ib_qp *qp = idr_find(&ib_uverbs_qp_idr, uobj->id); | 194 | struct ib_qp *qp = idr_find(&ib_uverbs_qp_idr, uobj->id); |
| 183 | struct ib_uevent_object *uevent = | 195 | struct ib_uqp_object *uqp = |
| 184 | container_of(uobj, struct ib_uevent_object, uobject); | 196 | container_of(uobj, struct ib_uqp_object, uevent.uobject); |
| 185 | idr_remove(&ib_uverbs_qp_idr, uobj->id); | 197 | idr_remove(&ib_uverbs_qp_idr, uobj->id); |
| 198 | ib_uverbs_detach_umcast(qp, uqp); | ||
| 186 | ib_destroy_qp(qp); | 199 | ib_destroy_qp(qp); |
| 187 | list_del(&uobj->list); | 200 | list_del(&uobj->list); |
| 188 | ib_uverbs_release_uevent(file, uevent); | 201 | ib_uverbs_release_uevent(file, &uqp->uevent); |
| 189 | kfree(uevent); | 202 | kfree(uqp); |
| 190 | } | 203 | } |
| 191 | 204 | ||
| 192 | list_for_each_entry_safe(uobj, tmp, &context->cq_list, list) { | 205 | list_for_each_entry_safe(uobj, tmp, &context->cq_list, list) { |
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c index dd4e13303e96..7450550db736 100644 --- a/drivers/infiniband/hw/mthca/mthca_qp.c +++ b/drivers/infiniband/hw/mthca/mthca_qp.c | |||
| @@ -871,7 +871,10 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask) | |||
| 871 | qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL); | 871 | qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL); |
| 872 | 872 | ||
| 873 | mthca_wq_init(&qp->sq); | 873 | mthca_wq_init(&qp->sq); |
| 874 | qp->sq.last = get_send_wqe(qp, qp->sq.max - 1); | ||
| 875 | |||
| 874 | mthca_wq_init(&qp->rq); | 876 | mthca_wq_init(&qp->rq); |
| 877 | qp->rq.last = get_recv_wqe(qp, qp->rq.max - 1); | ||
| 875 | 878 | ||
| 876 | if (mthca_is_memfree(dev)) { | 879 | if (mthca_is_memfree(dev)) { |
| 877 | *qp->sq.db = 0; | 880 | *qp->sq.db = 0; |
| @@ -1819,6 +1822,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
| 1819 | { | 1822 | { |
| 1820 | struct mthca_dev *dev = to_mdev(ibqp->device); | 1823 | struct mthca_dev *dev = to_mdev(ibqp->device); |
| 1821 | struct mthca_qp *qp = to_mqp(ibqp); | 1824 | struct mthca_qp *qp = to_mqp(ibqp); |
| 1825 | __be32 doorbell[2]; | ||
| 1822 | void *wqe; | 1826 | void *wqe; |
| 1823 | void *prev_wqe; | 1827 | void *prev_wqe; |
| 1824 | unsigned long flags; | 1828 | unsigned long flags; |
| @@ -1838,6 +1842,34 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
| 1838 | ind = qp->sq.head & (qp->sq.max - 1); | 1842 | ind = qp->sq.head & (qp->sq.max - 1); |
| 1839 | 1843 | ||
| 1840 | for (nreq = 0; wr; ++nreq, wr = wr->next) { | 1844 | for (nreq = 0; wr; ++nreq, wr = wr->next) { |
| 1845 | if (unlikely(nreq == MTHCA_ARBEL_MAX_WQES_PER_SEND_DB)) { | ||
| 1846 | nreq = 0; | ||
| 1847 | |||
| 1848 | doorbell[0] = cpu_to_be32((MTHCA_ARBEL_MAX_WQES_PER_SEND_DB << 24) | | ||
| 1849 | ((qp->sq.head & 0xffff) << 8) | | ||
| 1850 | f0 | op0); | ||
| 1851 | doorbell[1] = cpu_to_be32((qp->qpn << 8) | size0); | ||
| 1852 | |||
| 1853 | qp->sq.head += MTHCA_ARBEL_MAX_WQES_PER_SEND_DB; | ||
| 1854 | size0 = 0; | ||
| 1855 | |||
| 1856 | /* | ||
| 1857 | * Make sure that descriptors are written before | ||
| 1858 | * doorbell record. | ||
| 1859 | */ | ||
| 1860 | wmb(); | ||
| 1861 | *qp->sq.db = cpu_to_be32(qp->sq.head & 0xffff); | ||
| 1862 | |||
| 1863 | /* | ||
| 1864 | * Make sure doorbell record is written before we | ||
| 1865 | * write MMIO send doorbell. | ||
| 1866 | */ | ||
| 1867 | wmb(); | ||
| 1868 | mthca_write64(doorbell, | ||
| 1869 | dev->kar + MTHCA_SEND_DOORBELL, | ||
| 1870 | MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock)); | ||
| 1871 | } | ||
| 1872 | |||
| 1841 | if (mthca_wq_overflow(&qp->sq, nreq, qp->ibqp.send_cq)) { | 1873 | if (mthca_wq_overflow(&qp->sq, nreq, qp->ibqp.send_cq)) { |
| 1842 | mthca_err(dev, "SQ %06x full (%u head, %u tail," | 1874 | mthca_err(dev, "SQ %06x full (%u head, %u tail," |
| 1843 | " %d max, %d nreq)\n", qp->qpn, | 1875 | " %d max, %d nreq)\n", qp->qpn, |
| @@ -2014,8 +2046,6 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
| 2014 | 2046 | ||
| 2015 | out: | 2047 | out: |
| 2016 | if (likely(nreq)) { | 2048 | if (likely(nreq)) { |
| 2017 | __be32 doorbell[2]; | ||
| 2018 | |||
| 2019 | doorbell[0] = cpu_to_be32((nreq << 24) | | 2049 | doorbell[0] = cpu_to_be32((nreq << 24) | |
| 2020 | ((qp->sq.head & 0xffff) << 8) | | 2050 | ((qp->sq.head & 0xffff) << 8) | |
| 2021 | f0 | op0); | 2051 | f0 | op0); |
diff --git a/drivers/infiniband/hw/mthca/mthca_wqe.h b/drivers/infiniband/hw/mthca/mthca_wqe.h index 73f1c0b9021e..e7d2c1e86199 100644 --- a/drivers/infiniband/hw/mthca/mthca_wqe.h +++ b/drivers/infiniband/hw/mthca/mthca_wqe.h | |||
| @@ -50,7 +50,8 @@ enum { | |||
| 50 | 50 | ||
| 51 | enum { | 51 | enum { |
| 52 | MTHCA_INVAL_LKEY = 0x100, | 52 | MTHCA_INVAL_LKEY = 0x100, |
| 53 | MTHCA_TAVOR_MAX_WQES_PER_RECV_DB = 256 | 53 | MTHCA_TAVOR_MAX_WQES_PER_RECV_DB = 256, |
| 54 | MTHCA_ARBEL_MAX_WQES_PER_SEND_DB = 255 | ||
| 54 | }; | 55 | }; |
| 55 | 56 | ||
| 56 | struct mthca_next_seg { | 57 | struct mthca_next_seg { |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index 54ef2fea530f..23885801b6d2 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c | |||
| @@ -608,9 +608,13 @@ void ipoib_ib_dev_flush(void *_dev) | |||
| 608 | if (test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags)) | 608 | if (test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags)) |
| 609 | ipoib_ib_dev_up(dev); | 609 | ipoib_ib_dev_up(dev); |
| 610 | 610 | ||
| 611 | down(&priv->vlan_mutex); | ||
| 612 | |||
| 611 | /* Flush any child interfaces too */ | 613 | /* Flush any child interfaces too */ |
| 612 | list_for_each_entry(cpriv, &priv->child_intfs, list) | 614 | list_for_each_entry(cpriv, &priv->child_intfs, list) |
| 613 | ipoib_ib_dev_flush(&cpriv->dev); | 615 | ipoib_ib_dev_flush(&cpriv->dev); |
| 616 | |||
| 617 | up(&priv->vlan_mutex); | ||
| 614 | } | 618 | } |
| 615 | 619 | ||
| 616 | void ipoib_ib_dev_cleanup(struct net_device *dev) | 620 | void ipoib_ib_dev_cleanup(struct net_device *dev) |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 2fa30751f362..475d98fa9e26 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
| @@ -94,8 +94,10 @@ int ipoib_open(struct net_device *dev) | |||
| 94 | if (ipoib_ib_dev_open(dev)) | 94 | if (ipoib_ib_dev_open(dev)) |
| 95 | return -EINVAL; | 95 | return -EINVAL; |
| 96 | 96 | ||
| 97 | if (ipoib_ib_dev_up(dev)) | 97 | if (ipoib_ib_dev_up(dev)) { |
| 98 | ipoib_ib_dev_stop(dev); | ||
| 98 | return -EINVAL; | 99 | return -EINVAL; |
| 100 | } | ||
| 99 | 101 | ||
| 100 | if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) { | 102 | if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) { |
| 101 | struct ipoib_dev_priv *cpriv; | 103 | struct ipoib_dev_priv *cpriv; |
| @@ -398,9 +400,9 @@ static void path_rec_completion(int status, | |||
| 398 | while ((skb = __skb_dequeue(&neigh->queue))) | 400 | while ((skb = __skb_dequeue(&neigh->queue))) |
| 399 | __skb_queue_tail(&skqueue, skb); | 401 | __skb_queue_tail(&skqueue, skb); |
| 400 | } | 402 | } |
| 401 | } else | 403 | } |
| 402 | path->query = NULL; | ||
| 403 | 404 | ||
| 405 | path->query = NULL; | ||
| 404 | complete(&path->done); | 406 | complete(&path->done); |
| 405 | 407 | ||
| 406 | spin_unlock_irqrestore(&priv->lock, flags); | 408 | spin_unlock_irqrestore(&priv->lock, flags); |
| @@ -428,7 +430,6 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, | |||
| 428 | skb_queue_head_init(&path->queue); | 430 | skb_queue_head_init(&path->queue); |
| 429 | 431 | ||
| 430 | INIT_LIST_HEAD(&path->neigh_list); | 432 | INIT_LIST_HEAD(&path->neigh_list); |
| 431 | init_completion(&path->done); | ||
| 432 | 433 | ||
| 433 | memcpy(path->pathrec.dgid.raw, gid->raw, sizeof (union ib_gid)); | 434 | memcpy(path->pathrec.dgid.raw, gid->raw, sizeof (union ib_gid)); |
| 434 | path->pathrec.sgid = priv->local_gid; | 435 | path->pathrec.sgid = priv->local_gid; |
| @@ -446,6 +447,8 @@ static int path_rec_start(struct net_device *dev, | |||
| 446 | ipoib_dbg(priv, "Start path record lookup for " IPOIB_GID_FMT "\n", | 447 | ipoib_dbg(priv, "Start path record lookup for " IPOIB_GID_FMT "\n", |
| 447 | IPOIB_GID_ARG(path->pathrec.dgid)); | 448 | IPOIB_GID_ARG(path->pathrec.dgid)); |
| 448 | 449 | ||
| 450 | init_completion(&path->done); | ||
| 451 | |||
| 449 | path->query_id = | 452 | path->query_id = |
| 450 | ib_sa_path_rec_get(priv->ca, priv->port, | 453 | ib_sa_path_rec_get(priv->ca, priv->port, |
| 451 | &path->pathrec, | 454 | &path->pathrec, |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index c33ed87f9dff..ef3ee035bbc8 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
| @@ -135,20 +135,14 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev, | |||
| 135 | if (!mcast) | 135 | if (!mcast) |
| 136 | return NULL; | 136 | return NULL; |
| 137 | 137 | ||
| 138 | init_completion(&mcast->done); | ||
| 139 | |||
| 140 | mcast->dev = dev; | 138 | mcast->dev = dev; |
| 141 | mcast->created = jiffies; | 139 | mcast->created = jiffies; |
| 142 | mcast->backoff = 1; | 140 | mcast->backoff = 1; |
| 143 | mcast->logcount = 0; | ||
| 144 | 141 | ||
| 145 | INIT_LIST_HEAD(&mcast->list); | 142 | INIT_LIST_HEAD(&mcast->list); |
| 146 | INIT_LIST_HEAD(&mcast->neigh_list); | 143 | INIT_LIST_HEAD(&mcast->neigh_list); |
| 147 | skb_queue_head_init(&mcast->pkt_queue); | 144 | skb_queue_head_init(&mcast->pkt_queue); |
| 148 | 145 | ||
| 149 | mcast->ah = NULL; | ||
| 150 | mcast->query = NULL; | ||
| 151 | |||
| 152 | return mcast; | 146 | return mcast; |
| 153 | } | 147 | } |
| 154 | 148 | ||
| @@ -350,6 +344,8 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast) | |||
| 350 | rec.port_gid = priv->local_gid; | 344 | rec.port_gid = priv->local_gid; |
| 351 | rec.pkey = cpu_to_be16(priv->pkey); | 345 | rec.pkey = cpu_to_be16(priv->pkey); |
| 352 | 346 | ||
| 347 | init_completion(&mcast->done); | ||
| 348 | |||
| 353 | ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, | 349 | ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, |
| 354 | IB_SA_MCMEMBER_REC_MGID | | 350 | IB_SA_MCMEMBER_REC_MGID | |
| 355 | IB_SA_MCMEMBER_REC_PORT_GID | | 351 | IB_SA_MCMEMBER_REC_PORT_GID | |
| @@ -469,6 +465,8 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast, | |||
| 469 | rec.traffic_class = priv->broadcast->mcmember.traffic_class; | 465 | rec.traffic_class = priv->broadcast->mcmember.traffic_class; |
| 470 | } | 466 | } |
| 471 | 467 | ||
| 468 | init_completion(&mcast->done); | ||
| 469 | |||
| 472 | ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, comp_mask, | 470 | ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, comp_mask, |
| 473 | mcast->backoff * 1000, GFP_ATOMIC, | 471 | mcast->backoff * 1000, GFP_ATOMIC, |
| 474 | ipoib_mcast_join_complete, | 472 | ipoib_mcast_join_complete, |
diff --git a/drivers/media/dvb/b2c2/flexcop-hw-filter.c b/drivers/media/dvb/b2c2/flexcop-hw-filter.c index 75cf237196eb..b386cc66c6b3 100644 --- a/drivers/media/dvb/b2c2/flexcop-hw-filter.c +++ b/drivers/media/dvb/b2c2/flexcop-hw-filter.c | |||
| @@ -19,7 +19,7 @@ void flexcop_smc_ctrl(struct flexcop_device *fc, int onoff) | |||
| 19 | flexcop_set_ibi_value(ctrl_208,SMC_Enable_sig,onoff); | 19 | flexcop_set_ibi_value(ctrl_208,SMC_Enable_sig,onoff); |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff) | 22 | static void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff) |
| 23 | { | 23 | { |
| 24 | flexcop_set_ibi_value(ctrl_208,Null_filter_sig,onoff); | 24 | flexcop_set_ibi_value(ctrl_208,Null_filter_sig,onoff); |
| 25 | } | 25 | } |
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 2aa767f9bd7d..cb2e7d6ba283 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 36 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/rwsem.h> | 38 | #include <linux/spinlock.h> |
| 39 | #include <linux/sched.h> | 39 | #include <linux/sched.h> |
| 40 | 40 | ||
| 41 | #include "dvb_ca_en50221.h" | 41 | #include "dvb_ca_en50221.h" |
| @@ -111,9 +111,6 @@ struct dvb_ca_slot { | |||
| 111 | /* size of the buffer to use when talking to the CAM */ | 111 | /* size of the buffer to use when talking to the CAM */ |
| 112 | int link_buf_size; | 112 | int link_buf_size; |
| 113 | 113 | ||
| 114 | /* semaphore for syncing access to slot structure */ | ||
| 115 | struct rw_semaphore sem; | ||
| 116 | |||
| 117 | /* buffer for incoming packets */ | 114 | /* buffer for incoming packets */ |
| 118 | struct dvb_ringbuffer rx_buffer; | 115 | struct dvb_ringbuffer rx_buffer; |
| 119 | 116 | ||
| @@ -602,14 +599,11 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb | |||
| 602 | if (ebuf == NULL) { | 599 | if (ebuf == NULL) { |
| 603 | int buf_free; | 600 | int buf_free; |
| 604 | 601 | ||
| 605 | down_read(&ca->slot_info[slot].sem); | ||
| 606 | if (ca->slot_info[slot].rx_buffer.data == NULL) { | 602 | if (ca->slot_info[slot].rx_buffer.data == NULL) { |
| 607 | up_read(&ca->slot_info[slot].sem); | ||
| 608 | status = -EIO; | 603 | status = -EIO; |
| 609 | goto exit; | 604 | goto exit; |
| 610 | } | 605 | } |
| 611 | buf_free = dvb_ringbuffer_free(&ca->slot_info[slot].rx_buffer); | 606 | buf_free = dvb_ringbuffer_free(&ca->slot_info[slot].rx_buffer); |
| 612 | up_read(&ca->slot_info[slot].sem); | ||
| 613 | 607 | ||
| 614 | if (buf_free < (ca->slot_info[slot].link_buf_size + DVB_RINGBUFFER_PKTHDRSIZE)) { | 608 | if (buf_free < (ca->slot_info[slot].link_buf_size + DVB_RINGBUFFER_PKTHDRSIZE)) { |
| 615 | status = -EAGAIN; | 609 | status = -EAGAIN; |
| @@ -680,14 +674,11 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb | |||
| 680 | 674 | ||
| 681 | /* OK, add it to the receive buffer, or copy into external buffer if supplied */ | 675 | /* OK, add it to the receive buffer, or copy into external buffer if supplied */ |
| 682 | if (ebuf == NULL) { | 676 | if (ebuf == NULL) { |
| 683 | down_read(&ca->slot_info[slot].sem); | ||
| 684 | if (ca->slot_info[slot].rx_buffer.data == NULL) { | 677 | if (ca->slot_info[slot].rx_buffer.data == NULL) { |
| 685 | up_read(&ca->slot_info[slot].sem); | ||
| 686 | status = -EIO; | 678 | status = -EIO; |
| 687 | goto exit; | 679 | goto exit; |
| 688 | } | 680 | } |
| 689 | dvb_ringbuffer_pkt_write(&ca->slot_info[slot].rx_buffer, buf, bytes_read); | 681 | dvb_ringbuffer_pkt_write(&ca->slot_info[slot].rx_buffer, buf, bytes_read); |
| 690 | up_read(&ca->slot_info[slot].sem); | ||
| 691 | } else { | 682 | } else { |
| 692 | memcpy(ebuf, buf, bytes_read); | 683 | memcpy(ebuf, buf, bytes_read); |
| 693 | } | 684 | } |
| @@ -802,12 +793,8 @@ static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot) | |||
| 802 | { | 793 | { |
| 803 | dprintk("%s\n", __FUNCTION__); | 794 | dprintk("%s\n", __FUNCTION__); |
| 804 | 795 | ||
| 805 | down_write(&ca->slot_info[slot].sem); | ||
| 806 | ca->pub->slot_shutdown(ca->pub, slot); | 796 | ca->pub->slot_shutdown(ca->pub, slot); |
| 807 | ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE; | 797 | ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE; |
| 808 | vfree(ca->slot_info[slot].rx_buffer.data); | ||
| 809 | ca->slot_info[slot].rx_buffer.data = NULL; | ||
| 810 | up_write(&ca->slot_info[slot].sem); | ||
| 811 | 798 | ||
| 812 | /* need to wake up all processes to check if they're now | 799 | /* need to wake up all processes to check if they're now |
| 813 | trying to write to a defunct CAM */ | 800 | trying to write to a defunct CAM */ |
| @@ -893,7 +880,7 @@ void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot) | |||
| 893 | 880 | ||
| 894 | case DVB_CA_SLOTSTATE_RUNNING: | 881 | case DVB_CA_SLOTSTATE_RUNNING: |
| 895 | if (ca->open) | 882 | if (ca->open) |
| 896 | dvb_ca_en50221_read_data(ca, slot, NULL, 0); | 883 | dvb_ca_en50221_thread_wakeup(ca); |
| 897 | break; | 884 | break; |
| 898 | } | 885 | } |
| 899 | } | 886 | } |
| @@ -1127,16 +1114,16 @@ static int dvb_ca_en50221_thread(void *data) | |||
| 1127 | break; | 1114 | break; |
| 1128 | } | 1115 | } |
| 1129 | 1116 | ||
| 1130 | rxbuf = vmalloc(RX_BUFFER_SIZE); | 1117 | if (ca->slot_info[slot].rx_buffer.data == NULL) { |
| 1131 | if (rxbuf == NULL) { | 1118 | rxbuf = vmalloc(RX_BUFFER_SIZE); |
| 1132 | printk("dvb_ca adapter %d: Unable to allocate CAM rx buffer :(\n", ca->dvbdev->adapter->num); | 1119 | if (rxbuf == NULL) { |
| 1133 | ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID; | 1120 | printk("dvb_ca adapter %d: Unable to allocate CAM rx buffer :(\n", ca->dvbdev->adapter->num); |
| 1134 | dvb_ca_en50221_thread_update_delay(ca); | 1121 | ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID; |
| 1135 | break; | 1122 | dvb_ca_en50221_thread_update_delay(ca); |
| 1123 | break; | ||
| 1124 | } | ||
| 1125 | dvb_ringbuffer_init(&ca->slot_info[slot].rx_buffer, rxbuf, RX_BUFFER_SIZE); | ||
| 1136 | } | 1126 | } |
| 1137 | down_write(&ca->slot_info[slot].sem); | ||
| 1138 | dvb_ringbuffer_init(&ca->slot_info[slot].rx_buffer, rxbuf, RX_BUFFER_SIZE); | ||
| 1139 | up_write(&ca->slot_info[slot].sem); | ||
| 1140 | 1127 | ||
| 1141 | ca->pub->slot_ts_enable(ca->pub, slot); | 1128 | ca->pub->slot_ts_enable(ca->pub, slot); |
| 1142 | ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_RUNNING; | 1129 | ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_RUNNING; |
| @@ -1148,11 +1135,7 @@ static int dvb_ca_en50221_thread(void *data) | |||
| 1148 | if (!ca->open) | 1135 | if (!ca->open) |
| 1149 | continue; | 1136 | continue; |
| 1150 | 1137 | ||
| 1151 | // no need to poll if the CAM supports IRQs | 1138 | // poll slots for data |
| 1152 | if (ca->slot_info[slot].da_irq_supported) | ||
| 1153 | break; | ||
| 1154 | |||
| 1155 | // poll mode | ||
| 1156 | pktcount = 0; | 1139 | pktcount = 0; |
| 1157 | while ((status = dvb_ca_en50221_read_data(ca, slot, NULL, 0)) > 0) { | 1140 | while ((status = dvb_ca_en50221_read_data(ca, slot, NULL, 0)) > 0) { |
| 1158 | if (!ca->open) | 1141 | if (!ca->open) |
| @@ -1367,12 +1350,13 @@ exit: | |||
| 1367 | /** | 1350 | /** |
| 1368 | * Condition for waking up in dvb_ca_en50221_io_read_condition | 1351 | * Condition for waking up in dvb_ca_en50221_io_read_condition |
| 1369 | */ | 1352 | */ |
| 1370 | static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *result, int *_slot) | 1353 | static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, |
| 1354 | int *result, int *_slot) | ||
| 1371 | { | 1355 | { |
| 1372 | int slot; | 1356 | int slot; |
| 1373 | int slot_count = 0; | 1357 | int slot_count = 0; |
| 1374 | int idx; | 1358 | int idx; |
| 1375 | int fraglen; | 1359 | size_t fraglen; |
| 1376 | int connection_id = -1; | 1360 | int connection_id = -1; |
| 1377 | int found = 0; | 1361 | int found = 0; |
| 1378 | u8 hdr[2]; | 1362 | u8 hdr[2]; |
| @@ -1382,10 +1366,7 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu | |||
| 1382 | if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_RUNNING) | 1366 | if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_RUNNING) |
| 1383 | goto nextslot; | 1367 | goto nextslot; |
| 1384 | 1368 | ||
| 1385 | down_read(&ca->slot_info[slot].sem); | ||
| 1386 | |||
| 1387 | if (ca->slot_info[slot].rx_buffer.data == NULL) { | 1369 | if (ca->slot_info[slot].rx_buffer.data == NULL) { |
| 1388 | up_read(&ca->slot_info[slot].sem); | ||
| 1389 | return 0; | 1370 | return 0; |
| 1390 | } | 1371 | } |
| 1391 | 1372 | ||
| @@ -1403,10 +1384,7 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu | |||
| 1403 | idx = dvb_ringbuffer_pkt_next(&ca->slot_info[slot].rx_buffer, idx, &fraglen); | 1384 | idx = dvb_ringbuffer_pkt_next(&ca->slot_info[slot].rx_buffer, idx, &fraglen); |
| 1404 | } | 1385 | } |
| 1405 | 1386 | ||
| 1406 | if (!found) | 1387 | nextslot: |
| 1407 | up_read(&ca->slot_info[slot].sem); | ||
| 1408 | |||
| 1409 | nextslot: | ||
| 1410 | slot = (slot + 1) % ca->slot_count; | 1388 | slot = (slot + 1) % ca->slot_count; |
| 1411 | slot_count++; | 1389 | slot_count++; |
| 1412 | } | 1390 | } |
| @@ -1511,8 +1489,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf, | |||
| 1511 | goto exit; | 1489 | goto exit; |
| 1512 | status = pktlen; | 1490 | status = pktlen; |
| 1513 | 1491 | ||
| 1514 | exit: | 1492 | exit: |
| 1515 | up_read(&ca->slot_info[slot].sem); | ||
| 1516 | return status; | 1493 | return status; |
| 1517 | } | 1494 | } |
| 1518 | 1495 | ||
| @@ -1544,11 +1521,11 @@ static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file) | |||
| 1544 | for (i = 0; i < ca->slot_count; i++) { | 1521 | for (i = 0; i < ca->slot_count; i++) { |
| 1545 | 1522 | ||
| 1546 | if (ca->slot_info[i].slot_state == DVB_CA_SLOTSTATE_RUNNING) { | 1523 | if (ca->slot_info[i].slot_state == DVB_CA_SLOTSTATE_RUNNING) { |
| 1547 | down_write(&ca->slot_info[i].sem); | ||
| 1548 | if (ca->slot_info[i].rx_buffer.data != NULL) { | 1524 | if (ca->slot_info[i].rx_buffer.data != NULL) { |
| 1525 | /* it is safe to call this here without locks because | ||
| 1526 | * ca->open == 0. Data is not read in this case */ | ||
| 1549 | dvb_ringbuffer_flush(&ca->slot_info[i].rx_buffer); | 1527 | dvb_ringbuffer_flush(&ca->slot_info[i].rx_buffer); |
| 1550 | } | 1528 | } |
| 1551 | up_write(&ca->slot_info[i].sem); | ||
| 1552 | } | 1529 | } |
| 1553 | } | 1530 | } |
| 1554 | 1531 | ||
| @@ -1607,7 +1584,6 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait) | |||
| 1607 | dprintk("%s\n", __FUNCTION__); | 1584 | dprintk("%s\n", __FUNCTION__); |
| 1608 | 1585 | ||
| 1609 | if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) { | 1586 | if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) { |
| 1610 | up_read(&ca->slot_info[slot].sem); | ||
| 1611 | mask |= POLLIN; | 1587 | mask |= POLLIN; |
| 1612 | } | 1588 | } |
| 1613 | 1589 | ||
| @@ -1619,7 +1595,6 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait) | |||
| 1619 | poll_wait(file, &ca->wait_queue, wait); | 1595 | poll_wait(file, &ca->wait_queue, wait); |
| 1620 | 1596 | ||
| 1621 | if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) { | 1597 | if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1) { |
| 1622 | up_read(&ca->slot_info[slot].sem); | ||
| 1623 | mask |= POLLIN; | 1598 | mask |= POLLIN; |
| 1624 | } | 1599 | } |
| 1625 | 1600 | ||
| @@ -1709,7 +1684,6 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, | |||
| 1709 | ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE; | 1684 | ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE; |
| 1710 | atomic_set(&ca->slot_info[i].camchange_count, 0); | 1685 | atomic_set(&ca->slot_info[i].camchange_count, 0); |
| 1711 | ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED; | 1686 | ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED; |
| 1712 | init_rwsem(&ca->slot_info[i].sem); | ||
| 1713 | } | 1687 | } |
| 1714 | 1688 | ||
| 1715 | if (signal_pending(current)) { | 1689 | if (signal_pending(current)) { |
| @@ -1729,7 +1703,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, | |||
| 1729 | ca->thread_pid = ret; | 1703 | ca->thread_pid = ret; |
| 1730 | return 0; | 1704 | return 0; |
| 1731 | 1705 | ||
| 1732 | error: | 1706 | error: |
| 1733 | if (ca != NULL) { | 1707 | if (ca != NULL) { |
| 1734 | if (ca->dvbdev != NULL) | 1708 | if (ca->dvbdev != NULL) |
| 1735 | dvb_unregister_device(ca->dvbdev); | 1709 | dvb_unregister_device(ca->dvbdev); |
| @@ -1771,6 +1745,9 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca) | |||
| 1771 | 1745 | ||
| 1772 | for (i = 0; i < ca->slot_count; i++) { | 1746 | for (i = 0; i < ca->slot_count; i++) { |
| 1773 | dvb_ca_en50221_slot_shutdown(ca, i); | 1747 | dvb_ca_en50221_slot_shutdown(ca, i); |
| 1748 | if (ca->slot_info[i].rx_buffer.data != NULL) { | ||
| 1749 | vfree(ca->slot_info[i].rx_buffer.data); | ||
| 1750 | } | ||
| 1774 | } | 1751 | } |
| 1775 | kfree(ca->slot_info); | 1752 | kfree(ca->slot_info); |
| 1776 | dvb_unregister_device(ca->dvbdev); | 1753 | dvb_unregister_device(ca->dvbdev); |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index 87935490bfb2..df536bd2e103 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
| @@ -151,6 +151,8 @@ struct dvb_net_priv { | |||
| 151 | unsigned char ule_bridged; /* Whether the ULE_BRIDGED extension header was found. */ | 151 | unsigned char ule_bridged; /* Whether the ULE_BRIDGED extension header was found. */ |
| 152 | int ule_sndu_remain; /* Nr. of bytes still required for current ULE SNDU. */ | 152 | int ule_sndu_remain; /* Nr. of bytes still required for current ULE SNDU. */ |
| 153 | unsigned long ts_count; /* Current ts cell counter. */ | 153 | unsigned long ts_count; /* Current ts cell counter. */ |
| 154 | |||
| 155 | struct semaphore mutex; | ||
| 154 | }; | 156 | }; |
| 155 | 157 | ||
| 156 | 158 | ||
| @@ -881,12 +883,13 @@ static int dvb_net_filter_sec_set(struct net_device *dev, | |||
| 881 | 883 | ||
| 882 | static int dvb_net_feed_start(struct net_device *dev) | 884 | static int dvb_net_feed_start(struct net_device *dev) |
| 883 | { | 885 | { |
| 884 | int ret, i; | 886 | int ret = 0, i; |
| 885 | struct dvb_net_priv *priv = dev->priv; | 887 | struct dvb_net_priv *priv = dev->priv; |
| 886 | struct dmx_demux *demux = priv->demux; | 888 | struct dmx_demux *demux = priv->demux; |
| 887 | unsigned char *mac = (unsigned char *) dev->dev_addr; | 889 | unsigned char *mac = (unsigned char *) dev->dev_addr; |
| 888 | 890 | ||
| 889 | dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode); | 891 | dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode); |
| 892 | down(&priv->mutex); | ||
| 890 | if (priv->tsfeed || priv->secfeed || priv->secfilter || priv->multi_secfilter[0]) | 893 | if (priv->tsfeed || priv->secfeed || priv->secfilter || priv->multi_secfilter[0]) |
| 891 | printk("%s: BUG %d\n", __FUNCTION__, __LINE__); | 894 | printk("%s: BUG %d\n", __FUNCTION__, __LINE__); |
| 892 | 895 | ||
| @@ -900,7 +903,7 @@ static int dvb_net_feed_start(struct net_device *dev) | |||
| 900 | dvb_net_sec_callback); | 903 | dvb_net_sec_callback); |
| 901 | if (ret<0) { | 904 | if (ret<0) { |
| 902 | printk("%s: could not allocate section feed\n", dev->name); | 905 | printk("%s: could not allocate section feed\n", dev->name); |
| 903 | return ret; | 906 | goto error; |
| 904 | } | 907 | } |
| 905 | 908 | ||
| 906 | ret = priv->secfeed->set(priv->secfeed, priv->pid, 32768, 1); | 909 | ret = priv->secfeed->set(priv->secfeed, priv->pid, 32768, 1); |
| @@ -909,7 +912,7 @@ static int dvb_net_feed_start(struct net_device *dev) | |||
| 909 | printk("%s: could not set section feed\n", dev->name); | 912 | printk("%s: could not set section feed\n", dev->name); |
| 910 | priv->demux->release_section_feed(priv->demux, priv->secfeed); | 913 | priv->demux->release_section_feed(priv->demux, priv->secfeed); |
| 911 | priv->secfeed=NULL; | 914 | priv->secfeed=NULL; |
| 912 | return ret; | 915 | goto error; |
| 913 | } | 916 | } |
| 914 | 917 | ||
| 915 | if (priv->rx_mode != RX_MODE_PROMISC) { | 918 | if (priv->rx_mode != RX_MODE_PROMISC) { |
| @@ -948,7 +951,7 @@ static int dvb_net_feed_start(struct net_device *dev) | |||
| 948 | ret = demux->allocate_ts_feed(demux, &priv->tsfeed, dvb_net_ts_callback); | 951 | ret = demux->allocate_ts_feed(demux, &priv->tsfeed, dvb_net_ts_callback); |
| 949 | if (ret < 0) { | 952 | if (ret < 0) { |
| 950 | printk("%s: could not allocate ts feed\n", dev->name); | 953 | printk("%s: could not allocate ts feed\n", dev->name); |
| 951 | return ret; | 954 | goto error; |
| 952 | } | 955 | } |
| 953 | 956 | ||
| 954 | /* Set netdevice pointer for ts decaps callback. */ | 957 | /* Set netdevice pointer for ts decaps callback. */ |
| @@ -962,23 +965,26 @@ static int dvb_net_feed_start(struct net_device *dev) | |||
| 962 | printk("%s: could not set ts feed\n", dev->name); | 965 | printk("%s: could not set ts feed\n", dev->name); |
| 963 | priv->demux->release_ts_feed(priv->demux, priv->tsfeed); | 966 | priv->demux->release_ts_feed(priv->demux, priv->tsfeed); |
| 964 | priv->tsfeed = NULL; | 967 | priv->tsfeed = NULL; |
| 965 | return ret; | 968 | goto error; |
| 966 | } | 969 | } |
| 967 | 970 | ||
| 968 | dprintk("%s: start filtering\n", __FUNCTION__); | 971 | dprintk("%s: start filtering\n", __FUNCTION__); |
| 969 | priv->tsfeed->start_filtering(priv->tsfeed); | 972 | priv->tsfeed->start_filtering(priv->tsfeed); |
| 970 | } else | 973 | } else |
| 971 | return -EINVAL; | 974 | ret = -EINVAL; |
| 972 | 975 | ||
| 973 | return 0; | 976 | error: |
| 977 | up(&priv->mutex); | ||
| 978 | return ret; | ||
| 974 | } | 979 | } |
| 975 | 980 | ||
| 976 | static int dvb_net_feed_stop(struct net_device *dev) | 981 | static int dvb_net_feed_stop(struct net_device *dev) |
| 977 | { | 982 | { |
| 978 | struct dvb_net_priv *priv = dev->priv; | 983 | struct dvb_net_priv *priv = dev->priv; |
| 979 | int i; | 984 | int i, ret = 0; |
| 980 | 985 | ||
| 981 | dprintk("%s\n", __FUNCTION__); | 986 | dprintk("%s\n", __FUNCTION__); |
| 987 | down(&priv->mutex); | ||
| 982 | if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) { | 988 | if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) { |
| 983 | if (priv->secfeed) { | 989 | if (priv->secfeed) { |
| 984 | if (priv->secfeed->is_filtering) { | 990 | if (priv->secfeed->is_filtering) { |
| @@ -1019,8 +1025,9 @@ static int dvb_net_feed_stop(struct net_device *dev) | |||
| 1019 | else | 1025 | else |
| 1020 | printk("%s: no ts feed to stop\n", dev->name); | 1026 | printk("%s: no ts feed to stop\n", dev->name); |
| 1021 | } else | 1027 | } else |
| 1022 | return -EINVAL; | 1028 | ret = -EINVAL; |
| 1023 | return 0; | 1029 | up(&priv->mutex); |
| 1030 | return ret; | ||
| 1024 | } | 1031 | } |
| 1025 | 1032 | ||
| 1026 | 1033 | ||
| @@ -1044,8 +1051,8 @@ static void wq_set_multicast_list (void *data) | |||
| 1044 | struct dvb_net_priv *priv = dev->priv; | 1051 | struct dvb_net_priv *priv = dev->priv; |
| 1045 | 1052 | ||
| 1046 | dvb_net_feed_stop(dev); | 1053 | dvb_net_feed_stop(dev); |
| 1047 | |||
| 1048 | priv->rx_mode = RX_MODE_UNI; | 1054 | priv->rx_mode = RX_MODE_UNI; |
| 1055 | spin_lock_bh(&dev->xmit_lock); | ||
| 1049 | 1056 | ||
| 1050 | if (dev->flags & IFF_PROMISC) { | 1057 | if (dev->flags & IFF_PROMISC) { |
| 1051 | dprintk("%s: promiscuous mode\n", dev->name); | 1058 | dprintk("%s: promiscuous mode\n", dev->name); |
| @@ -1070,6 +1077,7 @@ static void wq_set_multicast_list (void *data) | |||
| 1070 | } | 1077 | } |
| 1071 | } | 1078 | } |
| 1072 | 1079 | ||
| 1080 | spin_unlock_bh(&dev->xmit_lock); | ||
| 1073 | dvb_net_feed_start(dev); | 1081 | dvb_net_feed_start(dev); |
| 1074 | } | 1082 | } |
| 1075 | 1083 | ||
| @@ -1200,6 +1208,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype) | |||
| 1200 | 1208 | ||
| 1201 | INIT_WORK(&priv->set_multicast_list_wq, wq_set_multicast_list, net); | 1209 | INIT_WORK(&priv->set_multicast_list_wq, wq_set_multicast_list, net); |
| 1202 | INIT_WORK(&priv->restart_net_feed_wq, wq_restart_net_feed, net); | 1210 | INIT_WORK(&priv->restart_net_feed_wq, wq_restart_net_feed, net); |
| 1211 | init_MUTEX(&priv->mutex); | ||
| 1203 | 1212 | ||
| 1204 | net->base_addr = pid; | 1213 | net->base_addr = pid; |
| 1205 | 1214 | ||
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c index 49f541d9a042..8c7beffb045f 100644 --- a/drivers/media/dvb/dvb-usb/a800.c +++ b/drivers/media/dvb/dvb-usb/a800.c | |||
| @@ -65,7 +65,7 @@ static struct dvb_usb_rc_key a800_rc_keys[] = { | |||
| 65 | 65 | ||
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | 68 | static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state) |
| 69 | { | 69 | { |
| 70 | u8 key[5]; | 70 | u8 key[5]; |
| 71 | if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0), | 71 | if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0), |
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c index 00b946419b40..269d899da488 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/drivers/media/dvb/dvb-usb/dibusb-common.c | |||
| @@ -21,9 +21,9 @@ MODULE_LICENSE("GPL"); | |||
| 21 | int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) | 21 | int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) |
| 22 | { | 22 | { |
| 23 | if (d->priv != NULL) { | 23 | if (d->priv != NULL) { |
| 24 | struct dib_fe_xfer_ops *ops = d->priv; | 24 | struct dibusb_state *st = d->priv; |
| 25 | if (ops->fifo_ctrl != NULL) | 25 | if (st->ops.fifo_ctrl != NULL) |
| 26 | if (ops->fifo_ctrl(d->fe,onoff)) { | 26 | if (st->ops.fifo_ctrl(d->fe,onoff)) { |
| 27 | err("error while controlling the fifo of the demod."); | 27 | err("error while controlling the fifo of the demod."); |
| 28 | return -ENODEV; | 28 | return -ENODEV; |
| 29 | } | 29 | } |
| @@ -35,9 +35,9 @@ EXPORT_SYMBOL(dibusb_streaming_ctrl); | |||
| 35 | int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) | 35 | int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) |
| 36 | { | 36 | { |
| 37 | if (d->priv != NULL) { | 37 | if (d->priv != NULL) { |
| 38 | struct dib_fe_xfer_ops *ops = d->priv; | 38 | struct dibusb_state *st = d->priv; |
| 39 | if (d->pid_filtering && ops->pid_ctrl != NULL) | 39 | if (st->ops.pid_ctrl != NULL) |
| 40 | ops->pid_ctrl(d->fe,index,pid,onoff); | 40 | st->ops.pid_ctrl(d->fe,index,pid,onoff); |
| 41 | } | 41 | } |
| 42 | return 0; | 42 | return 0; |
| 43 | } | 43 | } |
| @@ -46,9 +46,9 @@ EXPORT_SYMBOL(dibusb_pid_filter); | |||
| 46 | int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff) | 46 | int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff) |
| 47 | { | 47 | { |
| 48 | if (d->priv != NULL) { | 48 | if (d->priv != NULL) { |
| 49 | struct dib_fe_xfer_ops *ops = d->priv; | 49 | struct dibusb_state *st = d->priv; |
| 50 | if (ops->pid_parse != NULL) | 50 | if (st->ops.pid_parse != NULL) |
| 51 | if (ops->pid_parse(d->fe,onoff) < 0) | 51 | if (st->ops.pid_parse(d->fe,onoff) < 0) |
| 52 | err("could not handle pid_parser"); | 52 | err("could not handle pid_parser"); |
| 53 | } | 53 | } |
| 54 | return 0; | 54 | return 0; |
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 74545f82eff1..f98e306a5759 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
| @@ -148,7 +148,7 @@ static struct dvb_usb_rc_key digitv_rc_keys[] = { | |||
| 148 | }; | 148 | }; |
| 149 | 149 | ||
| 150 | /* TODO is it really the NEC protocol ? */ | 150 | /* TODO is it really the NEC protocol ? */ |
| 151 | int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | 151 | static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state) |
| 152 | { | 152 | { |
| 153 | u8 key[5]; | 153 | u8 key[5]; |
| 154 | 154 | ||
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c index a902059812a2..dd8e0b94edba 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c | |||
| @@ -23,7 +23,7 @@ module_param_named(disable_rc_polling, dvb_usb_disable_rc_polling, int, 0644); | |||
| 23 | MODULE_PARM_DESC(disable_rc_polling, "disable remote control polling (default: 0)."); | 23 | MODULE_PARM_DESC(disable_rc_polling, "disable remote control polling (default: 0)."); |
| 24 | 24 | ||
| 25 | /* general initialization functions */ | 25 | /* general initialization functions */ |
| 26 | int dvb_usb_exit(struct dvb_usb_device *d) | 26 | static int dvb_usb_exit(struct dvb_usb_device *d) |
| 27 | { | 27 | { |
| 28 | deb_info("state before exiting everything: %x\n",d->state); | 28 | deb_info("state before exiting everything: %x\n",d->state); |
| 29 | dvb_usb_remote_exit(d); | 29 | dvb_usb_remote_exit(d); |
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index 9f639297a9f2..d9a8ede14b45 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH | 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH |
| 8 | Holger Waechtler <holger@convergence.de> | 8 | Holger Waechtler <holger@convergence.de> |
| 9 | 9 | ||
| 10 | Copyright (C) 2004 Steven Toth <steve@toth.demon.co.uk> | 10 | Copyright (C) 2004 Steven Toth <stoth@hauppauge.com> |
| 11 | 11 | ||
| 12 | 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 |
| 13 | it under the terms of the GNU General Public License as published by | 13 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h index 11f86806756e..1f250885d2ce 100644 --- a/drivers/media/dvb/frontends/cx22702.h +++ b/drivers/media/dvb/frontends/cx22702.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH | 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH |
| 8 | Holger Waechtler <holger@convergence.de> | 8 | Holger Waechtler <holger@convergence.de> |
| 9 | 9 | ||
| 10 | Copyright (C) 2004 Steven Toth <steve@toth.demon.co.uk> | 10 | Copyright (C) 2004 Steven Toth <stoth@hauppauge.com> |
| 11 | 11 | ||
| 12 | 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 |
| 13 | it under the terms of the GNU General Public License as published by | 13 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c index bad0933eb714..84b62881cea7 100644 --- a/drivers/media/dvb/frontends/nxt200x.c +++ b/drivers/media/dvb/frontends/nxt200x.c | |||
| @@ -44,6 +44,8 @@ | |||
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 46 | #include <linux/moduleparam.h> | 46 | #include <linux/moduleparam.h> |
| 47 | #include <linux/slab.h> | ||
| 48 | #include <linux/string.h> | ||
| 47 | 49 | ||
| 48 | #include "dvb_frontend.h" | 50 | #include "dvb_frontend.h" |
| 49 | #include "dvb-pll.h" | 51 | #include "dvb-pll.h" |
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c index c6d276618e86..ad8647a3c85e 100644 --- a/drivers/media/dvb/frontends/ves1820.c +++ b/drivers/media/dvb/frontends/ves1820.c | |||
| @@ -140,25 +140,25 @@ static int ves1820_set_symbolrate(struct ves1820_state *state, u32 symbolrate) | |||
| 140 | /* yeuch! */ | 140 | /* yeuch! */ |
| 141 | fpxin = state->config->xin * 10; | 141 | fpxin = state->config->xin * 10; |
| 142 | fptmp = fpxin; do_div(fptmp, 123); | 142 | fptmp = fpxin; do_div(fptmp, 123); |
| 143 | if (symbolrate < fptmp); | 143 | if (symbolrate < fptmp) |
| 144 | SFIL = 1; | 144 | SFIL = 1; |
| 145 | fptmp = fpxin; do_div(fptmp, 160); | 145 | fptmp = fpxin; do_div(fptmp, 160); |
| 146 | if (symbolrate < fptmp); | 146 | if (symbolrate < fptmp) |
| 147 | SFIL = 0; | 147 | SFIL = 0; |
| 148 | fptmp = fpxin; do_div(fptmp, 246); | 148 | fptmp = fpxin; do_div(fptmp, 246); |
| 149 | if (symbolrate < fptmp); | 149 | if (symbolrate < fptmp) |
| 150 | SFIL = 1; | 150 | SFIL = 1; |
| 151 | fptmp = fpxin; do_div(fptmp, 320); | 151 | fptmp = fpxin; do_div(fptmp, 320); |
| 152 | if (symbolrate < fptmp); | 152 | if (symbolrate < fptmp) |
| 153 | SFIL = 0; | 153 | SFIL = 0; |
| 154 | fptmp = fpxin; do_div(fptmp, 492); | 154 | fptmp = fpxin; do_div(fptmp, 492); |
| 155 | if (symbolrate < fptmp); | 155 | if (symbolrate < fptmp) |
| 156 | SFIL = 1; | 156 | SFIL = 1; |
| 157 | fptmp = fpxin; do_div(fptmp, 640); | 157 | fptmp = fpxin; do_div(fptmp, 640); |
| 158 | if (symbolrate < fptmp); | 158 | if (symbolrate < fptmp) |
| 159 | SFIL = 0; | 159 | SFIL = 0; |
| 160 | fptmp = fpxin; do_div(fptmp, 984); | 160 | fptmp = fpxin; do_div(fptmp, 984); |
| 161 | if (symbolrate < fptmp); | 161 | if (symbolrate < fptmp) |
| 162 | SFIL = 1; | 162 | SFIL = 1; |
| 163 | 163 | ||
| 164 | fin = state->config->xin >> 4; | 164 | fin = state->config->xin >> 4; |
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index d8bf65877897..fa5034a9ecf5 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -81,6 +81,7 @@ config DVB_BUDGET_CI | |||
| 81 | tristate "Budget cards with onboard CI connector" | 81 | tristate "Budget cards with onboard CI connector" |
| 82 | depends on DVB_CORE && PCI | 82 | depends on DVB_CORE && PCI |
| 83 | select VIDEO_SAA7146 | 83 | select VIDEO_SAA7146 |
| 84 | select DVB_STV0297 | ||
| 84 | select DVB_STV0299 | 85 | select DVB_STV0299 |
| 85 | select DVB_TDA1004X | 86 | select DVB_TDA1004X |
| 86 | help | 87 | help |
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c index c3801e328fe9..6079e8865d5b 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.c +++ b/drivers/media/dvb/ttpci/av7110_ca.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | 40 | ||
| 41 | #include "av7110.h" | 41 | #include "av7110.h" |
| 42 | #include "av7110_hw.h" | 42 | #include "av7110_hw.h" |
| 43 | #include "av7110_ca.h" | ||
| 43 | 44 | ||
| 44 | 45 | ||
| 45 | void CI_handle(struct av7110 *av7110, u8 *data, u16 len) | 46 | void CI_handle(struct av7110 *av7110, u8 *data, u16 len) |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index aa75dc03a0b3..9f51bae7194c 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
| @@ -1020,6 +1020,8 @@ MODULE_DEVICE_TABLE(pci, pci_tbl); | |||
| 1020 | 1020 | ||
| 1021 | static struct saa7146_extension budget_extension = { | 1021 | static struct saa7146_extension budget_extension = { |
| 1022 | .name = "budget_av", | 1022 | .name = "budget_av", |
| 1023 | .flags = SAA7146_I2C_SHORT_DELAY, | ||
| 1024 | |||
| 1023 | .pci_tbl = pci_tbl, | 1025 | .pci_tbl = pci_tbl, |
| 1024 | 1026 | ||
| 1025 | .module = THIS_MODULE, | 1027 | .module = THIS_MODULE, |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 75fb92d60998..b9b3cd9c0369 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
| @@ -1166,7 +1166,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl); | |||
| 1166 | 1166 | ||
| 1167 | static struct saa7146_extension budget_extension = { | 1167 | static struct saa7146_extension budget_extension = { |
| 1168 | .name = "budget_ci dvb\0", | 1168 | .name = "budget_ci dvb\0", |
| 1169 | .flags = 0, | 1169 | .flags = SAA7146_I2C_SHORT_DELAY, |
| 1170 | 1170 | ||
| 1171 | .module = THIS_MODULE, | 1171 | .module = THIS_MODULE, |
| 1172 | .pci_tbl = &pci_tbl[0], | 1172 | .pci_tbl = &pci_tbl[0], |
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index 4fd8bbc47037..bc4ce7559cbe 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
| @@ -738,7 +738,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl); | |||
| 738 | 738 | ||
| 739 | static struct saa7146_extension budget_extension = { | 739 | static struct saa7146_extension budget_extension = { |
| 740 | .name = "budget dvb\0", | 740 | .name = "budget dvb\0", |
| 741 | .flags = 0, | 741 | .flags = SAA7146_I2C_SHORT_DELAY, |
| 742 | 742 | ||
| 743 | .module = THIS_MODULE, | 743 | .module = THIS_MODULE, |
| 744 | .pci_tbl = pci_tbl, | 744 | .pci_tbl = pci_tbl, |
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c index e9a8457b0727..ac79ef178c05 100644 --- a/drivers/media/dvb/ttpci/ttpci-eeprom.c +++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| 38 | #include <linux/i2c.h> | 38 | #include <linux/i2c.h> |
| 39 | 39 | ||
| 40 | #include "ttpci-eeprom.h" | ||
| 40 | 41 | ||
| 41 | #if 1 | 42 | #if 1 |
| 42 | #define dprintk(x...) do { printk(x); } while (0) | 43 | #define dprintk(x...) do { printk(x); } while (0) |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index ecb9a31dd003..cc4a723e24db 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -32,9 +32,6 @@ config VIDEO_BT848_DVB | |||
| 32 | ---help--- | 32 | ---help--- |
| 33 | This adds support for DVB/ATSC cards based on the BT878 chip. | 33 | This adds support for DVB/ATSC cards based on the BT878 chip. |
| 34 | 34 | ||
| 35 | To compile this driver as a module, choose M here: the | ||
| 36 | module will be called dvb-bt8xx. | ||
| 37 | |||
| 38 | config VIDEO_SAA6588 | 35 | config VIDEO_SAA6588 |
| 39 | tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" | 36 | tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" |
| 40 | depends on VIDEO_DEV && I2C && VIDEO_BT848 | 37 | depends on VIDEO_DEV && I2C && VIDEO_BT848 |
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index e31ebb11c468..012be639aa18 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
| @@ -2904,7 +2904,7 @@ void __devinit bttv_idcard(struct bttv *btv) | |||
| 2904 | */ | 2904 | */ |
| 2905 | 2905 | ||
| 2906 | /* Some Modular Technology cards have an eeprom, but no subsystem ID */ | 2906 | /* Some Modular Technology cards have an eeprom, but no subsystem ID */ |
| 2907 | void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256]) | 2907 | static void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256]) |
| 2908 | { | 2908 | { |
| 2909 | int type = -1; | 2909 | int type = -1; |
| 2910 | 2910 | ||
| @@ -3879,7 +3879,7 @@ static void __devinit init_PXC200(struct bttv *btv) | |||
| 3879 | * error. ERROR_CPLD_Check_Failed. | 3879 | * error. ERROR_CPLD_Check_Failed. |
| 3880 | */ | 3880 | */ |
| 3881 | /* ----------------------------------------------------------------------- */ | 3881 | /* ----------------------------------------------------------------------- */ |
| 3882 | void | 3882 | static void |
| 3883 | init_RTV24 (struct bttv *btv) | 3883 | init_RTV24 (struct bttv *btv) |
| 3884 | { | 3884 | { |
| 3885 | uint32_t dataRead = 0; | 3885 | uint32_t dataRead = 0; |
| @@ -4103,7 +4103,7 @@ void tea5757_set_freq(struct bttv *btv, unsigned short freq) | |||
| 4103 | /* ----------------------------------------------------------------------- */ | 4103 | /* ----------------------------------------------------------------------- */ |
| 4104 | /* winview */ | 4104 | /* winview */ |
| 4105 | 4105 | ||
| 4106 | void winview_audio(struct bttv *btv, struct video_audio *v, int set) | 4106 | static void winview_audio(struct bttv *btv, struct video_audio *v, int set) |
| 4107 | { | 4107 | { |
| 4108 | /* PT2254A programming Jon Tombs, jon@gte.esi.us.es */ | 4108 | /* PT2254A programming Jon Tombs, jon@gte.esi.us.es */ |
| 4109 | int bits_out, loops, vol, data; | 4109 | int bits_out, loops, vol, data; |
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index 709099f03bd2..3c58a2a68906 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
| @@ -1720,7 +1720,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg) | |||
| 1720 | memset(i,0,sizeof(*i)); | 1720 | memset(i,0,sizeof(*i)); |
| 1721 | i->index = n; | 1721 | i->index = n; |
| 1722 | i->type = V4L2_INPUT_TYPE_CAMERA; | 1722 | i->type = V4L2_INPUT_TYPE_CAMERA; |
| 1723 | i->audioset = 1; | 1723 | i->audioset = 0; |
| 1724 | if (i->index == bttv_tvcards[btv->c.type].tuner) { | 1724 | if (i->index == bttv_tvcards[btv->c.type].tuner) { |
| 1725 | sprintf(i->name, "Television"); | 1725 | sprintf(i->name, "Television"); |
| 1726 | i->type = V4L2_INPUT_TYPE_TUNER; | 1726 | i->type = V4L2_INPUT_TYPE_TUNER; |
| @@ -1771,12 +1771,20 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg) | |||
| 1771 | memset(t,0,sizeof(*t)); | 1771 | memset(t,0,sizeof(*t)); |
| 1772 | strcpy(t->name, "Television"); | 1772 | strcpy(t->name, "Television"); |
| 1773 | t->type = V4L2_TUNER_ANALOG_TV; | 1773 | t->type = V4L2_TUNER_ANALOG_TV; |
| 1774 | t->rangehigh = 0xffffffffUL; | ||
| 1775 | t->capability = V4L2_TUNER_CAP_NORM; | 1774 | t->capability = V4L2_TUNER_CAP_NORM; |
| 1776 | t->rxsubchans = V4L2_TUNER_SUB_MONO; | 1775 | t->rxsubchans = V4L2_TUNER_SUB_MONO; |
| 1777 | if (btread(BT848_DSTATUS)&BT848_DSTATUS_HLOC) | 1776 | if (btread(BT848_DSTATUS)&BT848_DSTATUS_HLOC) |
| 1778 | t->signal = 0xffff; | 1777 | t->signal = 0xffff; |
| 1779 | { | 1778 | { |
| 1779 | struct video_tuner tuner; | ||
| 1780 | |||
| 1781 | memset(&tuner, 0, sizeof (tuner)); | ||
| 1782 | tuner.rangehigh = 0xffffffffUL; | ||
| 1783 | bttv_call_i2c_clients(btv, VIDIOCGTUNER, &tuner); | ||
| 1784 | t->rangelow = tuner.rangelow; | ||
| 1785 | t->rangehigh = tuner.rangehigh; | ||
| 1786 | } | ||
| 1787 | { | ||
| 1780 | /* Hmmm ... */ | 1788 | /* Hmmm ... */ |
| 1781 | struct video_audio va; | 1789 | struct video_audio va; |
| 1782 | memset(&va, 0, sizeof(struct video_audio)); | 1790 | memset(&va, 0, sizeof(struct video_audio)); |
| @@ -1853,7 +1861,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg) | |||
| 1853 | } | 1861 | } |
| 1854 | case VIDIOC_LOG_STATUS: | 1862 | case VIDIOC_LOG_STATUS: |
| 1855 | { | 1863 | { |
| 1856 | bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, 0); | 1864 | bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, NULL); |
| 1857 | return 0; | 1865 | return 0; |
| 1858 | } | 1866 | } |
| 1859 | 1867 | ||
| @@ -2029,19 +2037,33 @@ static int bttv_switch_type(struct bttv_fh *fh, enum v4l2_buf_type type) | |||
| 2029 | return 0; | 2037 | return 0; |
| 2030 | } | 2038 | } |
| 2031 | 2039 | ||
| 2040 | static void | ||
| 2041 | pix_format_set_size (struct v4l2_pix_format * f, | ||
| 2042 | const struct bttv_format * fmt, | ||
| 2043 | unsigned int width, | ||
| 2044 | unsigned int height) | ||
| 2045 | { | ||
| 2046 | f->width = width; | ||
| 2047 | f->height = height; | ||
| 2048 | |||
| 2049 | if (fmt->flags & FORMAT_FLAGS_PLANAR) { | ||
| 2050 | f->bytesperline = width; /* Y plane */ | ||
| 2051 | f->sizeimage = (width * height * fmt->depth) >> 3; | ||
| 2052 | } else { | ||
| 2053 | f->bytesperline = (width * fmt->depth) >> 3; | ||
| 2054 | f->sizeimage = height * f->bytesperline; | ||
| 2055 | } | ||
| 2056 | } | ||
| 2057 | |||
| 2032 | static int bttv_g_fmt(struct bttv_fh *fh, struct v4l2_format *f) | 2058 | static int bttv_g_fmt(struct bttv_fh *fh, struct v4l2_format *f) |
| 2033 | { | 2059 | { |
| 2034 | switch (f->type) { | 2060 | switch (f->type) { |
| 2035 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 2061 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
| 2036 | memset(&f->fmt.pix,0,sizeof(struct v4l2_pix_format)); | 2062 | memset(&f->fmt.pix,0,sizeof(struct v4l2_pix_format)); |
| 2037 | f->fmt.pix.width = fh->width; | 2063 | pix_format_set_size (&f->fmt.pix, fh->fmt, |
| 2038 | f->fmt.pix.height = fh->height; | 2064 | fh->width, fh->height); |
| 2039 | f->fmt.pix.field = fh->cap.field; | 2065 | f->fmt.pix.field = fh->cap.field; |
| 2040 | f->fmt.pix.pixelformat = fh->fmt->fourcc; | 2066 | f->fmt.pix.pixelformat = fh->fmt->fourcc; |
| 2041 | f->fmt.pix.bytesperline = | ||
| 2042 | (f->fmt.pix.width * fh->fmt->depth) >> 3; | ||
| 2043 | f->fmt.pix.sizeimage = | ||
| 2044 | f->fmt.pix.height * f->fmt.pix.bytesperline; | ||
| 2045 | return 0; | 2067 | return 0; |
| 2046 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 2068 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
| 2047 | memset(&f->fmt.win,0,sizeof(struct v4l2_window)); | 2069 | memset(&f->fmt.win,0,sizeof(struct v4l2_window)); |
| @@ -2106,11 +2128,9 @@ static int bttv_try_fmt(struct bttv_fh *fh, struct bttv *btv, | |||
| 2106 | f->fmt.pix.width = maxw; | 2128 | f->fmt.pix.width = maxw; |
| 2107 | if (f->fmt.pix.height > maxh) | 2129 | if (f->fmt.pix.height > maxh) |
| 2108 | f->fmt.pix.height = maxh; | 2130 | f->fmt.pix.height = maxh; |
| 2109 | f->fmt.pix.width &= ~0x03; | 2131 | pix_format_set_size (&f->fmt.pix, fmt, |
| 2110 | f->fmt.pix.bytesperline = | 2132 | f->fmt.pix.width & ~3, |
| 2111 | (f->fmt.pix.width * fmt->depth) >> 3; | 2133 | f->fmt.pix.height); |
| 2112 | f->fmt.pix.sizeimage = | ||
| 2113 | f->fmt.pix.height * f->fmt.pix.bytesperline; | ||
| 2114 | 2134 | ||
| 2115 | return 0; | 2135 | return 0; |
| 2116 | } | 2136 | } |
| @@ -2278,6 +2298,15 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, | |||
| 2278 | retval = -EINVAL; | 2298 | retval = -EINVAL; |
| 2279 | goto fh_unlock_and_return; | 2299 | goto fh_unlock_and_return; |
| 2280 | } | 2300 | } |
| 2301 | if (fmt->flags & FORMAT_FLAGS_RAW) { | ||
| 2302 | /* VIDIOCMCAPTURE uses gbufsize, not RAW_BPL * | ||
| 2303 | RAW_LINES * 2. F1 is stored at offset 0, F2 | ||
| 2304 | at buffer size / 2. */ | ||
| 2305 | fh->width = RAW_BPL; | ||
| 2306 | fh->height = gbufsize / RAW_BPL; | ||
| 2307 | btv->init.width = RAW_BPL; | ||
| 2308 | btv->init.height = gbufsize / RAW_BPL; | ||
| 2309 | } | ||
| 2281 | fh->ovfmt = fmt; | 2310 | fh->ovfmt = fmt; |
| 2282 | fh->fmt = fmt; | 2311 | fh->fmt = fmt; |
| 2283 | btv->init.ovfmt = fmt; | 2312 | btv->init.ovfmt = fmt; |
| @@ -2589,9 +2618,11 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, | |||
| 2589 | 2618 | ||
| 2590 | if (0 == v4l2) | 2619 | if (0 == v4l2) |
| 2591 | return -EINVAL; | 2620 | return -EINVAL; |
| 2592 | strcpy(cap->driver,"bttv"); | 2621 | memset(cap, 0, sizeof (*cap)); |
| 2593 | strlcpy(cap->card,btv->video_dev->name,sizeof(cap->card)); | 2622 | strlcpy(cap->driver, "bttv", sizeof (cap->driver)); |
| 2594 | sprintf(cap->bus_info,"PCI:%s",pci_name(btv->c.pci)); | 2623 | strlcpy(cap->card, btv->video_dev->name, sizeof (cap->card)); |
| 2624 | snprintf(cap->bus_info, sizeof (cap->bus_info), | ||
| 2625 | "PCI:%s", pci_name(btv->c.pci)); | ||
| 2595 | cap->version = BTTV_VERSION_CODE; | 2626 | cap->version = BTTV_VERSION_CODE; |
| 2596 | cap->capabilities = | 2627 | cap->capabilities = |
| 2597 | V4L2_CAP_VIDEO_CAPTURE | | 2628 | V4L2_CAP_VIDEO_CAPTURE | |
| @@ -2952,6 +2983,8 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) | |||
| 2952 | fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR; | 2983 | fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR; |
| 2953 | field = videobuf_next_field(&fh->cap); | 2984 | field = videobuf_next_field(&fh->cap); |
| 2954 | if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) { | 2985 | if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) { |
| 2986 | kfree (fh->cap.read_buf); | ||
| 2987 | fh->cap.read_buf = NULL; | ||
| 2955 | up(&fh->cap.lock); | 2988 | up(&fh->cap.lock); |
| 2956 | return POLLERR; | 2989 | return POLLERR; |
| 2957 | } | 2990 | } |
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index f6afeec499c5..aea3f038cff6 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c | |||
| @@ -208,8 +208,11 @@ static void cx25840_initialize(struct i2c_client *client, int loadfw) | |||
| 208 | 208 | ||
| 209 | static void input_change(struct i2c_client *client) | 209 | static void input_change(struct i2c_client *client) |
| 210 | { | 210 | { |
| 211 | struct cx25840_state *state = i2c_get_clientdata(client); | ||
| 211 | v4l2_std_id std = cx25840_get_v4lstd(client); | 212 | v4l2_std_id std = cx25840_get_v4lstd(client); |
| 212 | 213 | ||
| 214 | /* Note: perhaps V4L2_STD_PAL_M should be handled as V4L2_STD_NTSC | ||
| 215 | instead of V4L2_STD_PAL. Someone needs to test this. */ | ||
| 213 | if (std & V4L2_STD_PAL) { | 216 | if (std & V4L2_STD_PAL) { |
| 214 | /* Follow tuner change procedure for PAL */ | 217 | /* Follow tuner change procedure for PAL */ |
| 215 | cx25840_write(client, 0x808, 0xff); | 218 | cx25840_write(client, 0x808, 0xff); |
| @@ -220,7 +223,32 @@ static void input_change(struct i2c_client *client) | |||
| 220 | cx25840_write(client, 0x80b, 0x10); | 223 | cx25840_write(client, 0x80b, 0x10); |
| 221 | } else if (std & V4L2_STD_NTSC) { | 224 | } else if (std & V4L2_STD_NTSC) { |
| 222 | /* NTSC */ | 225 | /* NTSC */ |
| 223 | cx25840_write(client, 0x808, 0xf6); | 226 | if (state->cardtype == CARDTYPE_PVR150_WORKAROUND) { |
| 227 | /* Certain Hauppauge PVR150 models have a hardware bug | ||
| 228 | that causes audio to drop out. For these models the | ||
| 229 | audio standard must be set explicitly. | ||
| 230 | To be precise: it affects cards with tuner models | ||
| 231 | 85, 99 and 112 (model numbers from tveeprom). */ | ||
| 232 | if (std == V4L2_STD_NTSC_M_JP) { | ||
| 233 | /* Japan uses EIAJ audio standard */ | ||
| 234 | cx25840_write(client, 0x808, 0x2f); | ||
| 235 | } else { | ||
| 236 | /* Others use the BTSC audio standard */ | ||
| 237 | cx25840_write(client, 0x808, 0x1f); | ||
| 238 | } | ||
| 239 | /* South Korea uses the A2-M (aka Zweiton M) audio | ||
| 240 | standard, and should set 0x808 to 0x3f, but I don't | ||
| 241 | know how to detect this. */ | ||
| 242 | } else if (std == V4L2_STD_NTSC_M_JP) { | ||
| 243 | /* Japan uses EIAJ audio standard */ | ||
| 244 | cx25840_write(client, 0x808, 0xf7); | ||
| 245 | } else { | ||
| 246 | /* Others use the BTSC audio standard */ | ||
| 247 | cx25840_write(client, 0x808, 0xf6); | ||
| 248 | } | ||
| 249 | /* South Korea uses the A2-M (aka Zweiton M) audio standard, | ||
| 250 | and should set 0x808 to 0xf8, but I don't know how to | ||
| 251 | detect this. */ | ||
| 224 | cx25840_write(client, 0x80b, 0x00); | 252 | cx25840_write(client, 0x80b, 0x00); |
| 225 | } | 253 | } |
| 226 | 254 | ||
| @@ -241,7 +269,8 @@ static int set_input(struct i2c_client *client, enum cx25840_input input) | |||
| 241 | case CX25840_TUNER: | 269 | case CX25840_TUNER: |
| 242 | cx25840_dbg("now setting Tuner input\n"); | 270 | cx25840_dbg("now setting Tuner input\n"); |
| 243 | 271 | ||
| 244 | if (state->cardtype == CARDTYPE_PVR150) { | 272 | if (state->cardtype == CARDTYPE_PVR150 || |
| 273 | state->cardtype == CARDTYPE_PVR150_WORKAROUND) { | ||
| 245 | /* CH_SEL_ADC2=1 */ | 274 | /* CH_SEL_ADC2=1 */ |
| 246 | cx25840_and_or(client, 0x102, ~0x2, 0x02); | 275 | cx25840_and_or(client, 0x102, ~0x2, 0x02); |
| 247 | } | 276 | } |
| @@ -363,6 +392,7 @@ static int set_v4lctrl(struct i2c_client *client, struct v4l2_control *ctrl) | |||
| 363 | case CX25840_CID_CARDTYPE: | 392 | case CX25840_CID_CARDTYPE: |
| 364 | switch (ctrl->value) { | 393 | switch (ctrl->value) { |
| 365 | case CARDTYPE_PVR150: | 394 | case CARDTYPE_PVR150: |
| 395 | case CARDTYPE_PVR150_WORKAROUND: | ||
| 366 | case CARDTYPE_PG600: | 396 | case CARDTYPE_PG600: |
| 367 | state->cardtype = ctrl->value; | 397 | state->cardtype = ctrl->value; |
| 368 | break; | 398 | break; |
| @@ -714,7 +744,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, | |||
| 714 | 744 | ||
| 715 | /* ----------------------------------------------------------------------- */ | 745 | /* ----------------------------------------------------------------------- */ |
| 716 | 746 | ||
| 717 | struct i2c_driver i2c_driver_cx25840; | 747 | static struct i2c_driver i2c_driver_cx25840; |
| 718 | 748 | ||
| 719 | static int cx25840_detect_client(struct i2c_adapter *adapter, int address, | 749 | static int cx25840_detect_client(struct i2c_adapter *adapter, int address, |
| 720 | int kind) | 750 | int kind) |
| @@ -807,7 +837,7 @@ static int cx25840_detach_client(struct i2c_client *client) | |||
| 807 | 837 | ||
| 808 | /* ----------------------------------------------------------------------- */ | 838 | /* ----------------------------------------------------------------------- */ |
| 809 | 839 | ||
| 810 | struct i2c_driver i2c_driver_cx25840 = { | 840 | static struct i2c_driver i2c_driver_cx25840 = { |
| 811 | .name = "cx25840", | 841 | .name = "cx25840", |
| 812 | 842 | ||
| 813 | .id = I2C_DRIVERID_CX25840, | 843 | .id = I2C_DRIVERID_CX25840, |
diff --git a/drivers/media/video/cx25840/cx25840.h b/drivers/media/video/cx25840/cx25840.h index 5c3f0639fb77..4932ed1c9b19 100644 --- a/drivers/media/video/cx25840/cx25840.h +++ b/drivers/media/video/cx25840/cx25840.h | |||
| @@ -40,9 +40,16 @@ extern int cx25840_debug; | |||
| 40 | 40 | ||
| 41 | #define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0) | 41 | #define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0) |
| 42 | 42 | ||
| 43 | /* The CARDTYPE_PVR150_WORKAROUND cardtype activates a workaround for a | ||
| 44 | hardware bug that is present in PVR150 (and possible PVR500) cards that | ||
| 45 | have certain NTSC tuners (tveeprom model numbers 85, 99 and 112). The | ||
| 46 | audio autodetect fails on some channels for these models and the workaround | ||
| 47 | is to select the audio standard explicitly. Many thanks to Hauppauge for | ||
| 48 | providing this information. */ | ||
| 43 | enum cx25840_cardtype { | 49 | enum cx25840_cardtype { |
| 44 | CARDTYPE_PVR150, | 50 | CARDTYPE_PVR150, |
| 45 | CARDTYPE_PG600 | 51 | CARDTYPE_PG600, |
| 52 | CARDTYPE_PVR150_WORKAROUND, | ||
| 46 | }; | 53 | }; |
| 47 | 54 | ||
| 48 | enum cx25840_input { | 55 | enum cx25840_input { |
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index f2268631b7c0..951709aa88ba 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
| @@ -567,6 +567,7 @@ struct cx88_board cx88_boards[] = { | |||
| 567 | .radio_type = UNSET, | 567 | .radio_type = UNSET, |
| 568 | .tuner_addr = ADDR_UNSET, | 568 | .tuner_addr = ADDR_UNSET, |
| 569 | .radio_addr = ADDR_UNSET, | 569 | .radio_addr = ADDR_UNSET, |
| 570 | .tda9887_conf = TDA9887_PRESENT, | ||
| 570 | .input = {{ | 571 | .input = {{ |
| 571 | .type = CX88_VMUX_TELEVISION, | 572 | .type = CX88_VMUX_TELEVISION, |
| 572 | .vmux = 0, | 573 | .vmux = 0, |
| @@ -711,6 +712,7 @@ struct cx88_board cx88_boards[] = { | |||
| 711 | .radio_type = UNSET, | 712 | .radio_type = UNSET, |
| 712 | .tuner_addr = ADDR_UNSET, | 713 | .tuner_addr = ADDR_UNSET, |
| 713 | .radio_addr = ADDR_UNSET, | 714 | .radio_addr = ADDR_UNSET, |
| 715 | .tda9887_conf = TDA9887_PRESENT, | ||
| 714 | .input = {{ | 716 | .input = {{ |
| 715 | .type = CX88_VMUX_TELEVISION, | 717 | .type = CX88_VMUX_TELEVISION, |
| 716 | .vmux = 0, | 718 | .vmux = 0, |
| @@ -1083,41 +1085,28 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) | |||
| 1083 | tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data); | 1085 | tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data); |
| 1084 | core->tuner_type = tv.tuner_type; | 1086 | core->tuner_type = tv.tuner_type; |
| 1085 | core->has_radio = tv.has_radio; | 1087 | core->has_radio = tv.has_radio; |
| 1086 | } | ||
| 1087 | |||
| 1088 | static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee) | ||
| 1089 | { | ||
| 1090 | int model; | ||
| 1091 | int tuner; | ||
| 1092 | 1088 | ||
| 1093 | /* Make sure we support the board model */ | 1089 | /* Make sure we support the board model */ |
| 1094 | model = ee[0x1f] << 24 | ee[0x1e] << 16 | ee[0x1d] << 8 | ee[0x1c]; | 1090 | switch (tv.model) |
| 1095 | switch(model) { | 1091 | { |
| 1096 | case 90002: | 1092 | case 90002: /* Nova-T-PCI (9002) */ |
| 1097 | case 90500: | 1093 | case 92001: /* Nova-S-Plus (Video and IR) */ |
| 1098 | case 90501: | 1094 | case 92002: /* Nova-S-Plus (Video and IR) */ |
| 1095 | case 90003: /* Nova-T-PCI (9002 No RF out) */ | ||
| 1096 | case 90500: /* Nova-T-PCI (oem) */ | ||
| 1097 | case 90501: /* Nova-T-PCI (oem/IR) */ | ||
| 1098 | case 92000: /* Nova-SE2 (OEM, No Video or IR) */ | ||
| 1099 | |||
| 1099 | /* known */ | 1100 | /* known */ |
| 1100 | break; | 1101 | break; |
| 1101 | default: | 1102 | default: |
| 1102 | printk("%s: warning: unknown hauppauge model #%d\n", | 1103 | printk("%s: warning: unknown hauppauge model #%d\n", |
| 1103 | core->name, model); | 1104 | core->name, tv.model); |
| 1104 | break; | 1105 | break; |
| 1105 | } | 1106 | } |
| 1106 | 1107 | ||
| 1107 | /* Make sure we support the tuner */ | 1108 | printk(KERN_INFO "%s: hauppauge eeprom: model=%d\n", |
| 1108 | tuner = ee[0x2d]; | 1109 | core->name, tv.model); |
| 1109 | switch(tuner) { | ||
| 1110 | case 0x4B: /* dtt 7595 */ | ||
| 1111 | case 0x4C: /* dtt 7592 */ | ||
| 1112 | break; | ||
| 1113 | default: | ||
| 1114 | printk("%s: error: unknown hauppauge tuner 0x%02x\n", | ||
| 1115 | core->name, tuner); | ||
| 1116 | return -ENODEV; | ||
| 1117 | } | ||
| 1118 | printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d\n", | ||
| 1119 | core->name, model, tuner); | ||
| 1120 | return 0; | ||
| 1121 | } | 1110 | } |
| 1122 | 1111 | ||
| 1123 | /* ----------------------------------------------------------------------- */ | 1112 | /* ----------------------------------------------------------------------- */ |
| @@ -1201,7 +1190,7 @@ void cx88_card_list(struct cx88_core *core, struct pci_dev *pci) | |||
| 1201 | 1190 | ||
| 1202 | void cx88_card_setup(struct cx88_core *core) | 1191 | void cx88_card_setup(struct cx88_core *core) |
| 1203 | { | 1192 | { |
| 1204 | static u8 eeprom[128]; | 1193 | static u8 eeprom[256]; |
| 1205 | 1194 | ||
| 1206 | if (0 == core->i2c_rc) { | 1195 | if (0 == core->i2c_rc) { |
| 1207 | core->i2c_client.addr = 0xa0 >> 1; | 1196 | core->i2c_client.addr = 0xa0 >> 1; |
| @@ -1224,7 +1213,7 @@ void cx88_card_setup(struct cx88_core *core) | |||
| 1224 | break; | 1213 | break; |
| 1225 | case CX88_BOARD_HAUPPAUGE_DVB_T1: | 1214 | case CX88_BOARD_HAUPPAUGE_DVB_T1: |
| 1226 | if (0 == core->i2c_rc) | 1215 | if (0 == core->i2c_rc) |
| 1227 | hauppauge_eeprom_dvb(core,eeprom); | 1216 | hauppauge_eeprom(core,eeprom); |
| 1228 | break; | 1217 | break; |
| 1229 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: | 1218 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: |
| 1230 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: | 1219 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: |
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index eb806af17182..bb6eb54e19ce 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
| @@ -837,6 +837,29 @@ static int set_pll(struct cx88_core *core, int prescale, u32 ofreq) | |||
| 837 | return -1; | 837 | return -1; |
| 838 | } | 838 | } |
| 839 | 839 | ||
| 840 | int cx88_start_audio_dma(struct cx88_core *core) | ||
| 841 | { | ||
| 842 | /* setup fifo + format */ | ||
| 843 | cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH25], 128, 0); | ||
| 844 | cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH26], 128, 0); | ||
| 845 | |||
| 846 | cx_write(MO_AUDD_LNGTH, 128); /* fifo bpl size */ | ||
| 847 | cx_write(MO_AUDR_LNGTH, 128); /* fifo bpl size */ | ||
| 848 | |||
| 849 | /* start dma */ | ||
| 850 | cx_write(MO_AUD_DMACNTRL, 0x0003); /* Up and Down fifo enable */ | ||
| 851 | |||
| 852 | return 0; | ||
| 853 | } | ||
| 854 | |||
| 855 | int cx88_stop_audio_dma(struct cx88_core *core) | ||
| 856 | { | ||
| 857 | /* stop dma */ | ||
| 858 | cx_write(MO_AUD_DMACNTRL, 0x0000); | ||
| 859 | |||
| 860 | return 0; | ||
| 861 | } | ||
| 862 | |||
| 840 | static int set_tvaudio(struct cx88_core *core) | 863 | static int set_tvaudio(struct cx88_core *core) |
| 841 | { | 864 | { |
| 842 | struct cx88_tvnorm *norm = core->tvnorm; | 865 | struct cx88_tvnorm *norm = core->tvnorm; |
| @@ -877,12 +900,16 @@ static int set_tvaudio(struct cx88_core *core) | |||
| 877 | cx88_set_tvaudio(core); | 900 | cx88_set_tvaudio(core); |
| 878 | /* cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); */ | 901 | /* cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); */ |
| 879 | 902 | ||
| 880 | cx_write(MO_AUDD_LNGTH, 128); /* fifo size */ | 903 | /* |
| 881 | cx_write(MO_AUDR_LNGTH, 128); /* fifo size */ | 904 | This should be needed only on cx88-alsa. It seems that some cx88 chips have |
| 882 | cx_write(MO_AUD_DMACNTRL, 0x03); /* need audio fifo */ | 905 | bugs and does require DMA enabled for it to work. |
| 906 | */ | ||
| 907 | cx88_start_audio_dma(core); | ||
| 883 | return 0; | 908 | return 0; |
| 884 | } | 909 | } |
| 885 | 910 | ||
| 911 | |||
| 912 | |||
| 886 | int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm) | 913 | int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm) |
| 887 | { | 914 | { |
| 888 | u32 fsc8; | 915 | u32 fsc8; |
| @@ -1204,6 +1231,8 @@ EXPORT_SYMBOL(cx88_set_scale); | |||
| 1204 | EXPORT_SYMBOL(cx88_vdev_init); | 1231 | EXPORT_SYMBOL(cx88_vdev_init); |
| 1205 | EXPORT_SYMBOL(cx88_core_get); | 1232 | EXPORT_SYMBOL(cx88_core_get); |
| 1206 | EXPORT_SYMBOL(cx88_core_put); | 1233 | EXPORT_SYMBOL(cx88_core_put); |
| 1234 | EXPORT_SYMBOL(cx88_start_audio_dma); | ||
| 1235 | EXPORT_SYMBOL(cx88_stop_audio_dma); | ||
| 1207 | 1236 | ||
| 1208 | /* | 1237 | /* |
| 1209 | * Local variables: | 1238 | * Local variables: |
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 6d9bec1c583b..a1b120c8a9b5 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
| @@ -119,13 +119,10 @@ static void set_audio_registers(struct cx88_core *core, const struct rlist *l) | |||
| 119 | 119 | ||
| 120 | static void set_audio_start(struct cx88_core *core, u32 mode) | 120 | static void set_audio_start(struct cx88_core *core, u32 mode) |
| 121 | { | 121 | { |
| 122 | // mute | 122 | /* mute */ |
| 123 | cx_write(AUD_VOL_CTL, (1 << 6)); | 123 | cx_write(AUD_VOL_CTL, (1 << 6)); |
| 124 | 124 | ||
| 125 | // start programming | 125 | /* start programming */ |
| 126 | cx_write(MO_AUD_DMACNTRL, 0x0000); | ||
| 127 | msleep(100); | ||
| 128 | //cx_write(AUD_CTL, 0x0000); | ||
| 129 | cx_write(AUD_INIT, mode); | 126 | cx_write(AUD_INIT, mode); |
| 130 | cx_write(AUD_INIT_LD, 0x0001); | 127 | cx_write(AUD_INIT_LD, 0x0001); |
| 131 | cx_write(AUD_SOFT_RESET, 0x0001); | 128 | cx_write(AUD_SOFT_RESET, 0x0001); |
| @@ -135,17 +132,21 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) | |||
| 135 | { | 132 | { |
| 136 | u32 volume; | 133 | u32 volume; |
| 137 | 134 | ||
| 135 | /* restart dma; This avoids buzz in NICAM and is good in others */ | ||
| 136 | cx88_stop_audio_dma(core); | ||
| 137 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); | ||
| 138 | cx88_start_audio_dma(core); | ||
| 139 | |||
| 138 | if (cx88_boards[core->board].blackbird) { | 140 | if (cx88_boards[core->board].blackbird) { |
| 139 | // sets sound input from external adc | 141 | /* sets sound input from external adc */ |
| 140 | cx_set(AUD_CTL, EN_I2SIN_ENABLE); | 142 | cx_set(AUD_CTL, EN_I2SIN_ENABLE); |
| 141 | //cx_write(AUD_I2SINPUTCNTL, 0); | ||
| 142 | cx_write(AUD_I2SINPUTCNTL, 4); | 143 | cx_write(AUD_I2SINPUTCNTL, 4); |
| 143 | cx_write(AUD_BAUDRATE, 1); | 144 | cx_write(AUD_BAUDRATE, 1); |
| 144 | // 'pass-thru mode': this enables the i2s output to the mpeg encoder | 145 | /* 'pass-thru mode': this enables the i2s output to the mpeg encoder */ |
| 145 | cx_set(AUD_CTL, EN_I2SOUT_ENABLE); | 146 | cx_set(AUD_CTL, EN_I2SOUT_ENABLE); |
| 146 | cx_write(AUD_I2SOUTPUTCNTL, 1); | 147 | cx_write(AUD_I2SOUTPUTCNTL, 1); |
| 147 | cx_write(AUD_I2SCNTL, 0); | 148 | cx_write(AUD_I2SCNTL, 0); |
| 148 | //cx_write(AUD_APB_IN_RATE_ADJ, 0); | 149 | /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */ |
| 149 | } else { | 150 | } else { |
| 150 | ctl |= EN_DAC_ENABLE; | 151 | ctl |= EN_DAC_ENABLE; |
| 151 | cx_write(AUD_CTL, ctl); | 152 | cx_write(AUD_CTL, ctl); |
| @@ -153,7 +154,6 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) | |||
| 153 | 154 | ||
| 154 | /* finish programming */ | 155 | /* finish programming */ |
| 155 | cx_write(AUD_SOFT_RESET, 0x0000); | 156 | cx_write(AUD_SOFT_RESET, 0x0000); |
| 156 | cx_write(MO_AUD_DMACNTRL, 0x0003); | ||
| 157 | 157 | ||
| 158 | /* unmute */ | 158 | /* unmute */ |
| 159 | volume = cx_sread(SHADOW_AUD_VOL_CTL); | 159 | volume = cx_sread(SHADOW_AUD_VOL_CTL); |
| @@ -313,7 +313,6 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode) | |||
| 313 | {AUD_RATE_ADJ3, 0x00000100}, | 313 | {AUD_RATE_ADJ3, 0x00000100}, |
| 314 | {AUD_RATE_ADJ4, 0x00000400}, | 314 | {AUD_RATE_ADJ4, 0x00000400}, |
| 315 | {AUD_RATE_ADJ5, 0x00001000}, | 315 | {AUD_RATE_ADJ5, 0x00001000}, |
| 316 | //{ AUD_DMD_RA_DDS, 0x00c0d5ce }, | ||
| 317 | {AUD_ERRLOGPERIOD_R, 0x00000fff}, | 316 | {AUD_ERRLOGPERIOD_R, 0x00000fff}, |
| 318 | {AUD_ERRINTRPTTHSHLD1_R, 0x000003ff}, | 317 | {AUD_ERRINTRPTTHSHLD1_R, 0x000003ff}, |
| 319 | {AUD_ERRINTRPTTHSHLD2_R, 0x000000ff}, | 318 | {AUD_ERRINTRPTTHSHLD2_R, 0x000000ff}, |
| @@ -351,12 +350,12 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode) | |||
| 351 | set_audio_registers(core, nicam_l); | 350 | set_audio_registers(core, nicam_l); |
| 352 | break; | 351 | break; |
| 353 | case WW_I: | 352 | case WW_I: |
| 354 | dprintk("%s PAL-I NICAM (status: devel)\n", __FUNCTION__); | 353 | dprintk("%s PAL-I NICAM (status: known-good)\n", __FUNCTION__); |
| 355 | set_audio_registers(core, nicam_bgdki_common); | 354 | set_audio_registers(core, nicam_bgdki_common); |
| 356 | set_audio_registers(core, nicam_i); | 355 | set_audio_registers(core, nicam_i); |
| 357 | break; | 356 | break; |
| 358 | default: | 357 | default: |
| 359 | dprintk("%s PAL-BGDK NICAM (status: unknown)\n", __FUNCTION__); | 358 | dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __FUNCTION__); |
| 360 | set_audio_registers(core, nicam_bgdki_common); | 359 | set_audio_registers(core, nicam_bgdki_common); |
| 361 | set_audio_registers(core, nicam_default); | 360 | set_audio_registers(core, nicam_default); |
| 362 | break; | 361 | break; |
| @@ -715,8 +714,7 @@ int cx88_detect_nicam(struct cx88_core *core) | |||
| 715 | /* if bit1=1 then nicam is detected */ | 714 | /* if bit1=1 then nicam is detected */ |
| 716 | j += ((cx_read(AUD_NICAM_STATUS2) & 0x02) >> 1); | 715 | j += ((cx_read(AUD_NICAM_STATUS2) & 0x02) >> 1); |
| 717 | 716 | ||
| 718 | /* 3x detected: absolutly sure now */ | 717 | if (j == 1) { |
| 719 | if (j == 3) { | ||
| 720 | dprintk("nicam is detected.\n"); | 718 | dprintk("nicam is detected.\n"); |
| 721 | return 1; | 719 | return 1; |
| 722 | } | 720 | } |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index b19d3a9e2298..27fb080fd7aa 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
| @@ -491,6 +491,10 @@ extern struct cx88_core* cx88_core_get(struct pci_dev *pci); | |||
| 491 | extern void cx88_core_put(struct cx88_core *core, | 491 | extern void cx88_core_put(struct cx88_core *core, |
| 492 | struct pci_dev *pci); | 492 | struct pci_dev *pci); |
| 493 | 493 | ||
| 494 | extern int cx88_start_audio_dma(struct cx88_core *core); | ||
| 495 | extern int cx88_stop_audio_dma(struct cx88_core *core); | ||
| 496 | |||
| 497 | |||
| 494 | /* ----------------------------------------------------------- */ | 498 | /* ----------------------------------------------------------- */ |
| 495 | /* cx88-vbi.c */ | 499 | /* cx88-vbi.c */ |
| 496 | 500 | ||
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index d54bc0127484..9f6e5e5355a1 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | /* #define ENABLE_DEBUG_ISOC_FRAMES */ | 33 | /* #define ENABLE_DEBUG_ISOC_FRAMES */ |
| 34 | 34 | ||
| 35 | unsigned int core_debug; | 35 | static unsigned int core_debug; |
| 36 | module_param(core_debug,int,0644); | 36 | module_param(core_debug,int,0644); |
| 37 | MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); | 37 | MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); |
| 38 | 38 | ||
| @@ -41,7 +41,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); | |||
| 41 | printk(KERN_INFO "%s %s :"fmt, \ | 41 | printk(KERN_INFO "%s %s :"fmt, \ |
| 42 | dev->name, __FUNCTION__ , ##arg); } while (0) | 42 | dev->name, __FUNCTION__ , ##arg); } while (0) |
| 43 | 43 | ||
| 44 | unsigned int reg_debug; | 44 | static unsigned int reg_debug; |
| 45 | module_param(reg_debug,int,0644); | 45 | module_param(reg_debug,int,0644); |
| 46 | MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]"); | 46 | MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]"); |
| 47 | 47 | ||
| @@ -50,7 +50,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]"); | |||
| 50 | printk(KERN_INFO "%s %s :"fmt, \ | 50 | printk(KERN_INFO "%s %s :"fmt, \ |
| 51 | dev->name, __FUNCTION__ , ##arg); } while (0) | 51 | dev->name, __FUNCTION__ , ##arg); } while (0) |
| 52 | 52 | ||
| 53 | unsigned int isoc_debug; | 53 | static unsigned int isoc_debug; |
| 54 | module_param(isoc_debug,int,0644); | 54 | module_param(isoc_debug,int,0644); |
| 55 | MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]"); | 55 | MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]"); |
| 56 | 56 | ||
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 57c1826b928e..abec32c175aa 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -226,7 +226,7 @@ static int em28xx_config(struct em28xx *dev) | |||
| 226 | * em28xx_config_i2c() | 226 | * em28xx_config_i2c() |
| 227 | * configure i2c attached devices | 227 | * configure i2c attached devices |
| 228 | */ | 228 | */ |
| 229 | void em28xx_config_i2c(struct em28xx *dev) | 229 | static void em28xx_config_i2c(struct em28xx *dev) |
| 230 | { | 230 | { |
| 231 | struct v4l2_frequency f; | 231 | struct v4l2_frequency f; |
| 232 | struct video_decoder_init em28xx_vdi = {.data = NULL }; | 232 | struct video_decoder_init em28xx_vdi = {.data = NULL }; |
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 801c736e9328..124c502ea1f3 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
| @@ -278,7 +278,7 @@ static int ir_probe(struct i2c_adapter *adap); | |||
| 278 | 278 | ||
| 279 | static struct i2c_driver driver = { | 279 | static struct i2c_driver driver = { |
| 280 | .name = "ir remote kbd driver", | 280 | .name = "ir remote kbd driver", |
| 281 | .id = I2C_DRIVERID_EXP3, /* FIXME */ | 281 | .id = I2C_DRIVERID_I2C_IR, |
| 282 | .flags = I2C_DF_NOTIFY, | 282 | .flags = I2C_DF_NOTIFY, |
| 283 | .attach_adapter = ir_probe, | 283 | .attach_adapter = ir_probe, |
| 284 | .detach_client = ir_detach, | 284 | .detach_client = ir_detach, |
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index 0235cef07b31..e717e30d8187 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
| @@ -771,17 +771,19 @@ static v4l2_std_id saa7115_get_v4lstd(struct i2c_client *client) | |||
| 771 | 771 | ||
| 772 | static void saa7115_log_status(struct i2c_client *client) | 772 | static void saa7115_log_status(struct i2c_client *client) |
| 773 | { | 773 | { |
| 774 | static const char * const audclk_freq_strs[] = { | ||
| 775 | "44.1 kHz", | ||
| 776 | "48 kHz", | ||
| 777 | "32 kHz" | ||
| 778 | }; | ||
| 779 | struct saa7115_state *state = i2c_get_clientdata(client); | 774 | struct saa7115_state *state = i2c_get_clientdata(client); |
| 775 | char *audfreq = "undefined"; | ||
| 780 | int reg1e, reg1f; | 776 | int reg1e, reg1f; |
| 781 | int signalOk; | 777 | int signalOk; |
| 782 | int vcr; | 778 | int vcr; |
| 783 | 779 | ||
| 784 | saa7115_info("Audio frequency: %s\n", audclk_freq_strs[state->audclk_freq]); | 780 | switch (state->audclk_freq) { |
| 781 | case V4L2_AUDCLK_32_KHZ: audfreq = "32 kHz"; break; | ||
| 782 | case V4L2_AUDCLK_441_KHZ: audfreq = "44.1 kHz"; break; | ||
| 783 | case V4L2_AUDCLK_48_KHZ: audfreq = "48 kHz"; break; | ||
| 784 | } | ||
| 785 | |||
| 786 | saa7115_info("Audio frequency: %s\n", audfreq); | ||
| 785 | if (client->name[6] == '4') { | 787 | if (client->name[6] == '4') { |
| 786 | /* status for the saa7114 */ | 788 | /* status for the saa7114 */ |
| 787 | reg1f = saa7115_read(client, 0x1f); | 789 | reg1f = saa7115_read(client, 0x1f); |
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c index 25b30f352d84..59e13fdea780 100644 --- a/drivers/media/video/saa711x.c +++ b/drivers/media/video/saa711x.c | |||
| @@ -323,7 +323,7 @@ saa711x_command (struct i2c_client *client, | |||
| 323 | 323 | ||
| 324 | case VIDEO_MODE_SECAM: | 324 | case VIDEO_MODE_SECAM: |
| 325 | saa711x_write(client, 0x08, | 325 | saa711x_write(client, 0x08, |
| 326 | (decoder->reg[0x0e] & 0x3f) | 0x00); | 326 | (decoder->reg[0x08] & 0x3f) | 0x00); |
| 327 | saa711x_write(client, 0x0e, | 327 | saa711x_write(client, 0x0e, |
| 328 | (decoder->reg[0x0e] & 0x8f) | 0x50); | 328 | (decoder->reg[0x0e] & 0x8f) | 0x50); |
| 329 | break; | 329 | break; |
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c index 843431f10e3b..3428e1ed0032 100644 --- a/drivers/media/video/saa7127.c +++ b/drivers/media/video/saa7127.c | |||
| @@ -223,7 +223,7 @@ static const struct i2c_reg_value saa7127_init_config_60hz[] = { | |||
| 223 | }; | 223 | }; |
| 224 | 224 | ||
| 225 | #define SAA7127_50HZ_DAC_CONTROL 0x02 | 225 | #define SAA7127_50HZ_DAC_CONTROL 0x02 |
| 226 | struct i2c_reg_value saa7127_init_config_50hz[] = { | 226 | static struct i2c_reg_value saa7127_init_config_50hz[] = { |
| 227 | { SAA7127_REG_BURST_START, 0x21 }, | 227 | { SAA7127_REG_BURST_START, 0x21 }, |
| 228 | /* BURST_END is also used as a chip ID in saa7127_detect_client */ | 228 | /* BURST_END is also used as a chip ID in saa7127_detect_client */ |
| 229 | { SAA7127_REG_BURST_END, 0x1d }, | 229 | { SAA7127_REG_BURST_END, 0x1d }, |
| @@ -696,7 +696,7 @@ static int saa7127_command(struct i2c_client *client, | |||
| 696 | 696 | ||
| 697 | /* ----------------------------------------------------------------------- */ | 697 | /* ----------------------------------------------------------------------- */ |
| 698 | 698 | ||
| 699 | struct i2c_driver i2c_driver_saa7127; | 699 | static struct i2c_driver i2c_driver_saa7127; |
| 700 | 700 | ||
| 701 | /* ----------------------------------------------------------------------- */ | 701 | /* ----------------------------------------------------------------------- */ |
| 702 | 702 | ||
| @@ -818,7 +818,7 @@ static int saa7127_detach(struct i2c_client *client) | |||
| 818 | 818 | ||
| 819 | /* ----------------------------------------------------------------------- */ | 819 | /* ----------------------------------------------------------------------- */ |
| 820 | 820 | ||
| 821 | struct i2c_driver i2c_driver_saa7127 = { | 821 | static struct i2c_driver i2c_driver_saa7127 = { |
| 822 | .name = "saa7127", | 822 | .name = "saa7127", |
| 823 | .id = I2C_DRIVERID_SAA7127, | 823 | .id = I2C_DRIVERID_SAA7127, |
| 824 | .flags = I2C_DF_NOTIFY, | 824 | .flags = I2C_DF_NOTIFY, |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index 5707c666660b..263c6e2e3e8e 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
| @@ -58,8 +58,6 @@ static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; | |||
| 58 | module_param_array(index, int, NULL, 0444); | 58 | module_param_array(index, int, NULL, 0444); |
| 59 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); | 59 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); |
| 60 | 60 | ||
| 61 | int position; | ||
| 62 | |||
| 63 | #define dprintk(fmt, arg...) if (debug) \ | 61 | #define dprintk(fmt, arg...) if (debug) \ |
| 64 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) | 62 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) |
| 65 | 63 | ||
| @@ -140,7 +138,8 @@ static void saa7134_dma_start(struct saa7134_dev *dev) | |||
| 140 | * | 138 | * |
| 141 | */ | 139 | */ |
| 142 | 140 | ||
| 143 | void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status) | 141 | static void saa7134_irq_alsa_done(struct saa7134_dev *dev, |
| 142 | unsigned long status) | ||
| 144 | { | 143 | { |
| 145 | int next_blk, reg = 0; | 144 | int next_blk, reg = 0; |
| 146 | 145 | ||
| @@ -881,7 +880,7 @@ static void snd_saa7134_free(snd_card_t * card) | |||
| 881 | * | 880 | * |
| 882 | */ | 881 | */ |
| 883 | 882 | ||
| 884 | int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) | 883 | static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) |
| 885 | { | 884 | { |
| 886 | 885 | ||
| 887 | snd_card_t *card; | 886 | snd_card_t *card; |
| @@ -945,6 +944,8 @@ int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) | |||
| 945 | sprintf(card->longname, "%s at 0x%lx irq %d", | 944 | sprintf(card->longname, "%s at 0x%lx irq %d", |
| 946 | chip->dev->name, chip->iobase, chip->irq); | 945 | chip->dev->name, chip->iobase, chip->irq); |
| 947 | 946 | ||
| 947 | printk(KERN_INFO "%s/alsa: %s registered as card %d\n",dev->name,card->longname,index[devnum]); | ||
| 948 | |||
| 948 | if ((err = snd_card_register(card)) == 0) { | 949 | if ((err = snd_card_register(card)) == 0) { |
| 949 | snd_saa7134_cards[devnum] = card; | 950 | snd_saa7134_cards[devnum] = card; |
| 950 | return 0; | 951 | return 0; |
| @@ -955,6 +956,22 @@ __nodev: | |||
| 955 | return err; | 956 | return err; |
| 956 | } | 957 | } |
| 957 | 958 | ||
| 959 | |||
| 960 | static int alsa_device_init(struct saa7134_dev *dev) | ||
| 961 | { | ||
| 962 | dev->dmasound.priv_data = dev; | ||
| 963 | alsa_card_saa7134_create(dev,dev->nr); | ||
| 964 | return 1; | ||
| 965 | } | ||
| 966 | |||
| 967 | static int alsa_device_exit(struct saa7134_dev *dev) | ||
| 968 | { | ||
| 969 | |||
| 970 | snd_card_free(snd_saa7134_cards[dev->nr]); | ||
| 971 | snd_saa7134_cards[dev->nr] = NULL; | ||
| 972 | return 1; | ||
| 973 | } | ||
| 974 | |||
| 958 | /* | 975 | /* |
| 959 | * Module initializer | 976 | * Module initializer |
| 960 | * | 977 | * |
| @@ -968,22 +985,21 @@ static int saa7134_alsa_init(void) | |||
| 968 | struct saa7134_dev *dev = NULL; | 985 | struct saa7134_dev *dev = NULL; |
| 969 | struct list_head *list; | 986 | struct list_head *list; |
| 970 | 987 | ||
| 971 | position = 0; | ||
| 972 | |||
| 973 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); | 988 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); |
| 974 | 989 | ||
| 975 | list_for_each(list,&saa7134_devlist) { | 990 | list_for_each(list,&saa7134_devlist) { |
| 976 | dev = list_entry(list, struct saa7134_dev, devlist); | 991 | dev = list_entry(list, struct saa7134_dev, devlist); |
| 977 | if (dev->dmasound.priv_data == NULL) { | 992 | if (dev->dmasound.priv_data == NULL) { |
| 978 | dev->dmasound.priv_data = dev; | 993 | alsa_device_init(dev); |
| 979 | alsa_card_saa7134_create(dev,position); | ||
| 980 | position++; | ||
| 981 | } else { | 994 | } else { |
| 982 | printk(KERN_ERR "saa7134 ALSA: DMA sound is being handled by OSS. ignoring %s\n",dev->name); | 995 | printk(KERN_ERR "saa7134 ALSA: DMA sound is being handled by OSS. ignoring %s\n",dev->name); |
| 983 | return -EBUSY; | 996 | return -EBUSY; |
| 984 | } | 997 | } |
| 985 | } | 998 | } |
| 986 | 999 | ||
| 1000 | dmasound_init = alsa_device_init; | ||
| 1001 | dmasound_exit = alsa_device_exit; | ||
| 1002 | |||
| 987 | if (dev == NULL) | 1003 | if (dev == NULL) |
| 988 | printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n"); | 1004 | printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n"); |
| 989 | 1005 | ||
| @@ -994,7 +1010,7 @@ static int saa7134_alsa_init(void) | |||
| 994 | * Module destructor | 1010 | * Module destructor |
| 995 | */ | 1011 | */ |
| 996 | 1012 | ||
| 997 | void saa7134_alsa_exit(void) | 1013 | static void saa7134_alsa_exit(void) |
| 998 | { | 1014 | { |
| 999 | int idx; | 1015 | int idx; |
| 1000 | 1016 | ||
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 4275d2ddb864..1a093bf176f3 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
| @@ -88,6 +88,9 @@ LIST_HEAD(saa7134_devlist); | |||
| 88 | static LIST_HEAD(mops_list); | 88 | static LIST_HEAD(mops_list); |
| 89 | static unsigned int saa7134_devcount; | 89 | static unsigned int saa7134_devcount; |
| 90 | 90 | ||
| 91 | int (*dmasound_init)(struct saa7134_dev *dev); | ||
| 92 | int (*dmasound_exit)(struct saa7134_dev *dev); | ||
| 93 | |||
| 91 | #define dprintk(fmt, arg...) if (core_debug) \ | 94 | #define dprintk(fmt, arg...) if (core_debug) \ |
| 92 | printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg) | 95 | printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg) |
| 93 | 96 | ||
| @@ -184,8 +187,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) | |||
| 184 | /* ----------------------------------------------------------- */ | 187 | /* ----------------------------------------------------------- */ |
| 185 | /* delayed request_module */ | 188 | /* delayed request_module */ |
| 186 | 189 | ||
| 187 | #ifdef CONFIG_MODULES | 190 | #if defined(CONFIG_MODULES) && defined(MODULE) |
| 188 | |||
| 189 | static int need_empress; | 191 | static int need_empress; |
| 190 | static int need_dvb; | 192 | static int need_dvb; |
| 191 | static int need_alsa; | 193 | static int need_alsa; |
| @@ -234,9 +236,7 @@ static void request_module_depend(char *name, int *flag) | |||
| 234 | } | 236 | } |
| 235 | 237 | ||
| 236 | #else | 238 | #else |
| 237 | |||
| 238 | #define request_module_depend(name,flag) | 239 | #define request_module_depend(name,flag) |
| 239 | |||
| 240 | #endif /* CONFIG_MODULES */ | 240 | #endif /* CONFIG_MODULES */ |
| 241 | 241 | ||
| 242 | /* ------------------------------------------------------------------ */ | 242 | /* ------------------------------------------------------------------ */ |
| @@ -1017,6 +1017,10 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
| 1017 | /* check for signal */ | 1017 | /* check for signal */ |
| 1018 | saa7134_irq_video_intl(dev); | 1018 | saa7134_irq_video_intl(dev); |
| 1019 | 1019 | ||
| 1020 | if (dmasound_init && !dev->dmasound.priv_data) { | ||
| 1021 | dmasound_init(dev); | ||
| 1022 | } | ||
| 1023 | |||
| 1020 | return 0; | 1024 | return 0; |
| 1021 | 1025 | ||
| 1022 | fail4: | 1026 | fail4: |
| @@ -1040,6 +1044,11 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev) | |||
| 1040 | struct list_head *item; | 1044 | struct list_head *item; |
| 1041 | struct saa7134_mpeg_ops *mops; | 1045 | struct saa7134_mpeg_ops *mops; |
| 1042 | 1046 | ||
| 1047 | /* Release DMA sound modules if present */ | ||
| 1048 | if (dmasound_exit && dev->dmasound.priv_data) { | ||
| 1049 | dmasound_exit(dev); | ||
| 1050 | } | ||
| 1051 | |||
| 1043 | /* debugging ... */ | 1052 | /* debugging ... */ |
| 1044 | if (irq_debug) { | 1053 | if (irq_debug) { |
| 1045 | u32 report = saa_readl(SAA7134_IRQ_REPORT); | 1054 | u32 report = saa_readl(SAA7134_IRQ_REPORT); |
| @@ -1071,6 +1080,7 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev) | |||
| 1071 | saa7134_i2c_unregister(dev); | 1080 | saa7134_i2c_unregister(dev); |
| 1072 | saa7134_unregister_video(dev); | 1081 | saa7134_unregister_video(dev); |
| 1073 | 1082 | ||
| 1083 | |||
| 1074 | /* the DMA sound modules should be unloaded before reaching | 1084 | /* the DMA sound modules should be unloaded before reaching |
| 1075 | this, but just in case they are still present... */ | 1085 | this, but just in case they are still present... */ |
| 1076 | if (dev->dmasound.priv_data != NULL) { | 1086 | if (dev->dmasound.priv_data != NULL) { |
| @@ -1078,6 +1088,7 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev) | |||
| 1078 | dev->dmasound.priv_data = NULL; | 1088 | dev->dmasound.priv_data = NULL; |
| 1079 | } | 1089 | } |
| 1080 | 1090 | ||
| 1091 | |||
| 1081 | /* release resources */ | 1092 | /* release resources */ |
| 1082 | free_irq(pci_dev->irq, dev); | 1093 | free_irq(pci_dev->irq, dev); |
| 1083 | iounmap(dev->lmmio); | 1094 | iounmap(dev->lmmio); |
| @@ -1149,10 +1160,10 @@ static int saa7134_init(void) | |||
| 1149 | 1160 | ||
| 1150 | static void saa7134_fini(void) | 1161 | static void saa7134_fini(void) |
| 1151 | { | 1162 | { |
| 1152 | #ifdef CONFIG_MODULES | 1163 | #if defined(CONFIG_MODULES) && defined(MODULE) |
| 1153 | if (pending_registered) | 1164 | if (pending_registered) |
| 1154 | unregister_module_notifier(&pending_notifier); | 1165 | unregister_module_notifier(&pending_notifier); |
| 1155 | #endif | 1166 | #endif /* CONFIG_MODULES */ |
| 1156 | pci_unregister_driver(&saa7134_pci_driver); | 1167 | pci_unregister_driver(&saa7134_pci_driver); |
| 1157 | } | 1168 | } |
| 1158 | 1169 | ||
| @@ -1168,6 +1179,8 @@ EXPORT_SYMBOL(saa7134_boards); | |||
| 1168 | 1179 | ||
| 1169 | /* ----------------- for the DMA sound modules --------------- */ | 1180 | /* ----------------- for the DMA sound modules --------------- */ |
| 1170 | 1181 | ||
| 1182 | EXPORT_SYMBOL(dmasound_init); | ||
| 1183 | EXPORT_SYMBOL(dmasound_exit); | ||
| 1171 | EXPORT_SYMBOL(saa7134_pgtable_free); | 1184 | EXPORT_SYMBOL(saa7134_pgtable_free); |
| 1172 | EXPORT_SYMBOL(saa7134_pgtable_build); | 1185 | EXPORT_SYMBOL(saa7134_pgtable_build); |
| 1173 | EXPORT_SYMBOL(saa7134_pgtable_alloc); | 1186 | EXPORT_SYMBOL(saa7134_pgtable_alloc); |
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index fd9ed11ab1e2..5a579194e455 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
| @@ -899,26 +899,26 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status) | |||
| 899 | spin_unlock(&dev->slock); | 899 | spin_unlock(&dev->slock); |
| 900 | } | 900 | } |
| 901 | 901 | ||
| 902 | int saa7134_dsp_create(struct saa7134_dev *dev) | 902 | static int saa7134_dsp_create(struct saa7134_dev *dev) |
| 903 | { | 903 | { |
| 904 | int err; | 904 | int err; |
| 905 | 905 | ||
| 906 | err = dev->dmasound.minor_dsp = | 906 | err = dev->dmasound.minor_dsp = |
| 907 | register_sound_dsp(&saa7134_dsp_fops, | 907 | register_sound_dsp(&saa7134_dsp_fops, |
| 908 | dsp_nr[dev->nr]); | 908 | dsp_nr[dev->nr]); |
| 909 | if (err < 0) { | 909 | if (err < 0) { |
| 910 | goto fail; | 910 | goto fail; |
| 911 | } | 911 | } |
| 912 | printk(KERN_INFO "%s: registered device dsp%d\n", | 912 | printk(KERN_INFO "%s: registered device dsp%d\n", |
| 913 | dev->name,dev->dmasound.minor_dsp >> 4); | 913 | dev->name,dev->dmasound.minor_dsp >> 4); |
| 914 | 914 | ||
| 915 | err = dev->dmasound.minor_mixer = | 915 | err = dev->dmasound.minor_mixer = |
| 916 | register_sound_mixer(&saa7134_mixer_fops, | 916 | register_sound_mixer(&saa7134_mixer_fops, |
| 917 | mixer_nr[dev->nr]); | 917 | mixer_nr[dev->nr]); |
| 918 | if (err < 0) | 918 | if (err < 0) |
| 919 | goto fail; | 919 | goto fail; |
| 920 | printk(KERN_INFO "%s: registered device mixer%d\n", | 920 | printk(KERN_INFO "%s: registered device mixer%d\n", |
| 921 | dev->name,dev->dmasound.minor_mixer >> 4); | 921 | dev->name,dev->dmasound.minor_mixer >> 4); |
| 922 | 922 | ||
| 923 | return 0; | 923 | return 0; |
| 924 | 924 | ||
| @@ -929,6 +929,31 @@ fail: | |||
| 929 | 929 | ||
| 930 | } | 930 | } |
| 931 | 931 | ||
| 932 | static int oss_device_init(struct saa7134_dev *dev) | ||
| 933 | { | ||
| 934 | dev->dmasound.priv_data = dev; | ||
| 935 | saa7134_oss_init1(dev); | ||
| 936 | saa7134_dsp_create(dev); | ||
| 937 | return 1; | ||
| 938 | } | ||
| 939 | |||
| 940 | static int oss_device_exit(struct saa7134_dev *dev) | ||
| 941 | { | ||
| 942 | |||
| 943 | unregister_sound_mixer(dev->dmasound.minor_mixer); | ||
| 944 | unregister_sound_dsp(dev->dmasound.minor_dsp); | ||
| 945 | |||
| 946 | saa7134_oss_fini(dev); | ||
| 947 | |||
| 948 | if (dev->pci->irq > 0) { | ||
| 949 | synchronize_irq(dev->pci->irq); | ||
| 950 | free_irq(dev->pci->irq,&dev->dmasound); | ||
| 951 | } | ||
| 952 | |||
| 953 | dev->dmasound.priv_data = NULL; | ||
| 954 | return 1; | ||
| 955 | } | ||
| 956 | |||
| 932 | static int saa7134_oss_init(void) | 957 | static int saa7134_oss_init(void) |
| 933 | { | 958 | { |
| 934 | struct saa7134_dev *dev = NULL; | 959 | struct saa7134_dev *dev = NULL; |
| @@ -939,9 +964,7 @@ static int saa7134_oss_init(void) | |||
| 939 | list_for_each(list,&saa7134_devlist) { | 964 | list_for_each(list,&saa7134_devlist) { |
| 940 | dev = list_entry(list, struct saa7134_dev, devlist); | 965 | dev = list_entry(list, struct saa7134_dev, devlist); |
| 941 | if (dev->dmasound.priv_data == NULL) { | 966 | if (dev->dmasound.priv_data == NULL) { |
| 942 | dev->dmasound.priv_data = dev; | 967 | oss_device_init(dev); |
| 943 | saa7134_oss_init1(dev); | ||
| 944 | saa7134_dsp_create(dev); | ||
| 945 | } else { | 968 | } else { |
| 946 | printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); | 969 | printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); |
| 947 | return -EBUSY; | 970 | return -EBUSY; |
| @@ -951,11 +974,14 @@ static int saa7134_oss_init(void) | |||
| 951 | if (dev == NULL) | 974 | if (dev == NULL) |
| 952 | printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); | 975 | printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); |
| 953 | 976 | ||
| 977 | dmasound_init = oss_device_init; | ||
| 978 | dmasound_exit = oss_device_exit; | ||
| 979 | |||
| 954 | return 0; | 980 | return 0; |
| 955 | 981 | ||
| 956 | } | 982 | } |
| 957 | 983 | ||
| 958 | void saa7134_oss_exit(void) | 984 | static void saa7134_oss_exit(void) |
| 959 | { | 985 | { |
| 960 | struct saa7134_dev *dev = NULL; | 986 | struct saa7134_dev *dev = NULL; |
| 961 | struct list_head *list; | 987 | struct list_head *list; |
| @@ -967,18 +993,7 @@ void saa7134_oss_exit(void) | |||
| 967 | if (!dev->dmasound.minor_dsp) | 993 | if (!dev->dmasound.minor_dsp) |
| 968 | continue; | 994 | continue; |
| 969 | 995 | ||
| 970 | unregister_sound_mixer(dev->dmasound.minor_mixer); | 996 | oss_device_exit(dev); |
| 971 | unregister_sound_dsp(dev->dmasound.minor_dsp); | ||
| 972 | |||
| 973 | saa7134_oss_fini(dev); | ||
| 974 | |||
| 975 | if (dev->pci->irq > 0) { | ||
| 976 | synchronize_irq(dev->pci->irq); | ||
| 977 | free_irq(dev->pci->irq,&dev->dmasound); | ||
| 978 | } | ||
| 979 | |||
| 980 | dev->dmasound.priv_data = NULL; | ||
| 981 | |||
| 982 | } | 997 | } |
| 983 | 998 | ||
| 984 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); | 999 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 244e1973081c..add49db1ad41 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
| @@ -571,6 +571,10 @@ void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf); | |||
| 571 | 571 | ||
| 572 | int saa7134_set_dmabits(struct saa7134_dev *dev); | 572 | int saa7134_set_dmabits(struct saa7134_dev *dev); |
| 573 | 573 | ||
| 574 | extern int (*dmasound_init)(struct saa7134_dev *dev); | ||
| 575 | extern int (*dmasound_exit)(struct saa7134_dev *dev); | ||
| 576 | |||
| 577 | |||
| 574 | /* ----------------------------------------------------------- */ | 578 | /* ----------------------------------------------------------- */ |
| 575 | /* saa7134-cards.c */ | 579 | /* saa7134-cards.c */ |
| 576 | 580 | ||
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 72e8741e8b59..d95aecebbda3 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
| @@ -81,7 +81,7 @@ hauppauge_tuner_fmt[] = | |||
| 81 | { 0x00000010, " PAL(I)" }, | 81 | { 0x00000010, " PAL(I)" }, |
| 82 | { 0x00400000, " SECAM(L/L')" }, | 82 | { 0x00400000, " SECAM(L/L')" }, |
| 83 | { 0x00000e00, " PAL(D/K)" }, | 83 | { 0x00000e00, " PAL(D/K)" }, |
| 84 | { 0x03000000, " ATSC Digital" }, | 84 | { 0x03000000, " ATSC/DVB Digital" }, |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | /* This is the full list of possible tuners. Many thanks to Hauppauge for | 87 | /* This is the full list of possible tuners. Many thanks to Hauppauge for |
| @@ -209,13 +209,27 @@ hauppauge_tuner[] = | |||
| 209 | { TUNER_ABSENT, "Philips FMD1216ME"}, | 209 | { TUNER_ABSENT, "Philips FMD1216ME"}, |
| 210 | { TUNER_TEA5767, "Philips TEA5768HL FM Radio"}, | 210 | { TUNER_TEA5767, "Philips TEA5768HL FM Radio"}, |
| 211 | { TUNER_ABSENT, "Panasonic ENV57H12D5"}, | 211 | { TUNER_ABSENT, "Panasonic ENV57H12D5"}, |
| 212 | { TUNER_ABSENT, "TCL MFNM05-4"}, | 212 | { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"}, |
| 213 | { TUNER_ABSENT, "TCL MNM05-4"}, | 213 | { TUNER_ABSENT, "TCL MNM05-4"}, |
| 214 | { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"}, | 214 | { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"}, |
| 215 | { TUNER_ABSENT, "TCL MQNM05-4"}, | 215 | { TUNER_ABSENT, "TCL MQNM05-4"}, |
| 216 | { TUNER_ABSENT, "LG TAPC-W701D"}, | 216 | { TUNER_ABSENT, "LG TAPC-W701D"}, |
| 217 | { TUNER_ABSENT, "TCL 9886P-WM"}, | 217 | { TUNER_ABSENT, "TCL 9886P-WM"}, |
| 218 | { TUNER_ABSENT, "TCL 1676NM-WM"}, | 218 | { TUNER_ABSENT, "TCL 1676NM-WM"}, |
| 219 | /* 110-119 */ | ||
| 220 | { TUNER_ABSENT, "Thompson DTT75105"}, | ||
| 221 | { TUNER_ABSENT, "Conexant_CX24109"}, | ||
| 222 | { TUNER_ABSENT, "TCL M2523_5N_E"}, | ||
| 223 | { TUNER_ABSENT, "TCL M2523_3DB_E"}, | ||
| 224 | { TUNER_ABSENT, "Philips 8275A"}, | ||
| 225 | { TUNER_ABSENT, "Microtune MT2060"}, | ||
| 226 | { TUNER_ABSENT, "Philips FM1236 MK5"}, | ||
| 227 | { TUNER_ABSENT, "Philips FM1216ME MK5"}, | ||
| 228 | { TUNER_ABSENT, "TCL M2523_3DI_E"}, | ||
| 229 | { TUNER_ABSENT, "Samsung THPD5222FG30A"}, | ||
| 230 | /* 120-129 */ | ||
| 231 | { TUNER_ABSENT, "Xceive XC3028"}, | ||
| 232 | { TUNER_ABSENT, "Philips FQ1216LME MK5"}, | ||
| 219 | }; | 233 | }; |
| 220 | 234 | ||
| 221 | static struct HAUPPAUGE_AUDIOIC | 235 | static struct HAUPPAUGE_AUDIOIC |
| @@ -325,6 +339,7 @@ static int hasRadioTuner(int tunerType) | |||
| 325 | case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM: | 339 | case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM: |
| 326 | case 89: //PNPEnv_TUNER_TCL_MFPE05_2: | 340 | case 89: //PNPEnv_TUNER_TCL_MFPE05_2: |
| 327 | case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4: | 341 | case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4: |
| 342 | case 105: | ||
| 328 | return 1; | 343 | return 1; |
| 329 | } | 344 | } |
| 330 | return 0; | 345 | return 0; |
| @@ -368,10 +383,15 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | |||
| 368 | memset(tvee, 0, sizeof(*tvee)); | 383 | memset(tvee, 0, sizeof(*tvee)); |
| 369 | done = len = beenhere = 0; | 384 | done = len = beenhere = 0; |
| 370 | 385 | ||
| 371 | /* Hack for processing eeprom for em28xx */ | 386 | /* Hack for processing eeprom for em28xx and cx 2388x*/ |
| 372 | if ((eeprom_data[0]==0x1a)&&(eeprom_data[1]==0xeb)&& | 387 | if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) && |
| 373 | (eeprom_data[2]==0x67)&&(eeprom_data[3]==0x95)) | 388 | (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95)) |
| 374 | start=0xa0; | 389 | start=0xa0; /* Generic em28xx offset */ |
| 390 | else if (((eeprom_data[0] & 0xf0) == 0x10) && | ||
| 391 | (eeprom_data[1] == 0x00) && | ||
| 392 | (eeprom_data[2] == 0x00) && | ||
| 393 | (eeprom_data[8] == 0x84)) | ||
| 394 | start=8; /* Generic cx2388x offset */ | ||
| 375 | else | 395 | else |
| 376 | start=0; | 396 | start=0; |
| 377 | 397 | ||
| @@ -448,6 +468,17 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | |||
| 448 | eeprom_data[i+5] + | 468 | eeprom_data[i+5] + |
| 449 | (eeprom_data[i+6] << 8) + | 469 | (eeprom_data[i+6] << 8) + |
| 450 | (eeprom_data[i+7] << 16); | 470 | (eeprom_data[i+7] << 16); |
| 471 | |||
| 472 | if ( (eeprom_data[i + 8] && 0xf0) && | ||
| 473 | (tvee->serial_number < 0xffffff) ) { | ||
| 474 | tvee->MAC_address[0] = 0x00; | ||
| 475 | tvee->MAC_address[1] = 0x0D; | ||
| 476 | tvee->MAC_address[2] = 0xFE; | ||
| 477 | tvee->MAC_address[3] = eeprom_data[i + 7]; | ||
| 478 | tvee->MAC_address[4] = eeprom_data[i + 6]; | ||
| 479 | tvee->MAC_address[5] = eeprom_data[i + 5]; | ||
| 480 | tvee->has_MAC_address = 1; | ||
| 481 | } | ||
| 451 | break; | 482 | break; |
| 452 | 483 | ||
| 453 | case 0x05: | 484 | case 0x05: |
| @@ -466,11 +497,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | |||
| 466 | case 0x06: | 497 | case 0x06: |
| 467 | /* tag 'ModelRev' */ | 498 | /* tag 'ModelRev' */ |
| 468 | tvee->model = | 499 | tvee->model = |
| 469 | eeprom_data[i+1] + | 500 | eeprom_data[i + 1] + |
| 470 | (eeprom_data[i+2] << 8); | 501 | (eeprom_data[i + 2] << 8) + |
| 471 | tvee->revision = eeprom_data[i+5] + | 502 | (eeprom_data[i + 3] << 16) + |
| 472 | (eeprom_data[i+6] << 8) + | 503 | (eeprom_data[i + 4] << 24); |
| 473 | (eeprom_data[i+7] << 16); | 504 | tvee->revision = |
| 505 | eeprom_data[i +5 ] + | ||
| 506 | (eeprom_data[i + 6] << 8) + | ||
| 507 | (eeprom_data[i + 7] << 16); | ||
| 474 | break; | 508 | break; |
| 475 | 509 | ||
| 476 | case 0x07: | 510 | case 0x07: |
| @@ -563,6 +597,8 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | |||
| 563 | t_name2 = "unknown"; | 597 | t_name2 = "unknown"; |
| 564 | } | 598 | } |
| 565 | 599 | ||
| 600 | tvee->tuner_hauppauge_model = tuner1; | ||
| 601 | tvee->tuner2_hauppauge_model = tuner2; | ||
| 566 | tvee->tuner_formats = 0; | 602 | tvee->tuner_formats = 0; |
| 567 | tvee->tuner2_formats = 0; | 603 | tvee->tuner2_formats = 0; |
| 568 | for (i = j = 0; i < 8; i++) { | 604 | for (i = j = 0; i < 8; i++) { |
| @@ -578,6 +614,12 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | |||
| 578 | 614 | ||
| 579 | tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n", | 615 | tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n", |
| 580 | tvee->model, tvee->rev_str, tvee->serial_number); | 616 | tvee->model, tvee->rev_str, tvee->serial_number); |
| 617 | if (tvee->has_MAC_address == 1) { | ||
| 618 | tveeprom_info("MAC address is %02X-%02X-%02X-%02X-%02X-%02X\n", | ||
| 619 | tvee->MAC_address[0], tvee->MAC_address[1], | ||
| 620 | tvee->MAC_address[2], tvee->MAC_address[3], | ||
| 621 | tvee->MAC_address[4], tvee->MAC_address[5]); | ||
| 622 | } | ||
| 581 | tveeprom_info("tuner model is %s (idx %d, type %d)\n", | 623 | tveeprom_info("tuner model is %s (idx %d, type %d)\n", |
| 582 | t_name1, tuner1, tvee->tuner_type); | 624 | t_name1, tuner1, tvee->tuner_type); |
| 583 | tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n", | 625 | tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n", |
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index acfd3a103f35..9a6bf287e26a 100644 --- a/drivers/media/video/video-buf.c +++ b/drivers/media/video/video-buf.c | |||
| @@ -753,10 +753,9 @@ videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data, | |||
| 753 | int retval; | 753 | int retval; |
| 754 | 754 | ||
| 755 | /* setup stuff */ | 755 | /* setup stuff */ |
| 756 | retval = -ENOMEM; | ||
| 757 | q->read_buf = videobuf_alloc(q->msize); | 756 | q->read_buf = videobuf_alloc(q->msize); |
| 758 | if (NULL == q->read_buf) | 757 | if (NULL == q->read_buf) |
| 759 | goto done; | 758 | return -ENOMEM; |
| 760 | 759 | ||
| 761 | q->read_buf->memory = V4L2_MEMORY_USERPTR; | 760 | q->read_buf->memory = V4L2_MEMORY_USERPTR; |
| 762 | q->read_buf->baddr = (unsigned long)data; | 761 | q->read_buf->baddr = (unsigned long)data; |
| @@ -817,10 +816,14 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, | |||
| 817 | if (NULL == q->read_buf) | 816 | if (NULL == q->read_buf) |
| 818 | goto done; | 817 | goto done; |
| 819 | q->read_buf->memory = V4L2_MEMORY_USERPTR; | 818 | q->read_buf->memory = V4L2_MEMORY_USERPTR; |
| 819 | q->read_buf->bsize = count; /* preferred size */ | ||
| 820 | field = videobuf_next_field(q); | 820 | field = videobuf_next_field(q); |
| 821 | retval = q->ops->buf_prepare(q,q->read_buf,field); | 821 | retval = q->ops->buf_prepare(q,q->read_buf,field); |
| 822 | if (0 != retval) | 822 | if (0 != retval) { |
| 823 | kfree (q->read_buf); | ||
| 824 | q->read_buf = NULL; | ||
| 823 | goto done; | 825 | goto done; |
| 826 | } | ||
| 824 | spin_lock_irqsave(q->irqlock,flags); | 827 | spin_lock_irqsave(q->irqlock,flags); |
| 825 | q->ops->buf_queue(q,q->read_buf); | 828 | q->ops->buf_queue(q,q->read_buf); |
| 826 | spin_unlock_irqrestore(q->irqlock,flags); | 829 | spin_unlock_irqrestore(q->irqlock,flags); |
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 83c49f9610d0..6de5b0094b82 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
| @@ -76,14 +76,14 @@ static void video_release(struct class_device *cd) | |||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | static struct class video_class = { | 78 | static struct class video_class = { |
| 79 | .name = VIDEO_NAME, | 79 | .name = VIDEO_NAME, |
| 80 | .release = video_release, | 80 | .release = video_release, |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | /* | 83 | /* |
| 84 | * Active devices | 84 | * Active devices |
| 85 | */ | 85 | */ |
| 86 | 86 | ||
| 87 | static struct video_device *video_device[VIDEO_NUM_DEVICES]; | 87 | static struct video_device *video_device[VIDEO_NUM_DEVICES]; |
| 88 | static DECLARE_MUTEX(videodev_lock); | 88 | static DECLARE_MUTEX(videodev_lock); |
| 89 | 89 | ||
| @@ -101,7 +101,7 @@ static int video_open(struct inode *inode, struct file *file) | |||
| 101 | int err = 0; | 101 | int err = 0; |
| 102 | struct video_device *vfl; | 102 | struct video_device *vfl; |
| 103 | struct file_operations *old_fops; | 103 | struct file_operations *old_fops; |
| 104 | 104 | ||
| 105 | if(minor>=VIDEO_NUM_DEVICES) | 105 | if(minor>=VIDEO_NUM_DEVICES) |
| 106 | return -ENODEV; | 106 | return -ENODEV; |
| 107 | down(&videodev_lock); | 107 | down(&videodev_lock); |
| @@ -189,7 +189,7 @@ video_usercopy(struct inode *inode, struct file *file, | |||
| 189 | return -ENOMEM; | 189 | return -ENOMEM; |
| 190 | parg = mbuf; | 190 | parg = mbuf; |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | err = -EFAULT; | 193 | err = -EFAULT; |
| 194 | if (_IOC_DIR(cmd) & _IOC_WRITE) | 194 | if (_IOC_DIR(cmd) & _IOC_WRITE) |
| 195 | if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd))) | 195 | if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd))) |
| @@ -240,7 +240,7 @@ int video_exclusive_open(struct inode *inode, struct file *file) | |||
| 240 | int video_exclusive_release(struct inode *inode, struct file *file) | 240 | int video_exclusive_release(struct inode *inode, struct file *file) |
| 241 | { | 241 | { |
| 242 | struct video_device *vfl = video_devdata(file); | 242 | struct video_device *vfl = video_devdata(file); |
| 243 | 243 | ||
| 244 | vfl->users--; | 244 | vfl->users--; |
| 245 | return 0; | 245 | return 0; |
| 246 | } | 246 | } |
| @@ -253,7 +253,7 @@ static struct file_operations video_fops; | |||
| 253 | * @type: type of device to register | 253 | * @type: type of device to register |
| 254 | * @nr: which device number (0 == /dev/video0, 1 == /dev/video1, ... | 254 | * @nr: which device number (0 == /dev/video0, 1 == /dev/video1, ... |
| 255 | * -1 == first free) | 255 | * -1 == first free) |
| 256 | * | 256 | * |
| 257 | * The registration code assigns minor numbers based on the type | 257 | * The registration code assigns minor numbers based on the type |
| 258 | * requested. -ENFILE is returned in all the device slots for this | 258 | * requested. -ENFILE is returned in all the device slots for this |
| 259 | * category are full. If not then the minor field is set and the | 259 | * category are full. If not then the minor field is set and the |
| @@ -269,7 +269,7 @@ static struct file_operations video_fops; | |||
| 269 | * | 269 | * |
| 270 | * %VFL_TYPE_VBI - Vertical blank data (undecoded) | 270 | * %VFL_TYPE_VBI - Vertical blank data (undecoded) |
| 271 | * | 271 | * |
| 272 | * %VFL_TYPE_RADIO - A radio card | 272 | * %VFL_TYPE_RADIO - A radio card |
| 273 | */ | 273 | */ |
| 274 | 274 | ||
| 275 | int video_register_device(struct video_device *vfd, int type, int nr) | 275 | int video_register_device(struct video_device *vfd, int type, int nr) |
| @@ -278,7 +278,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
| 278 | int base; | 278 | int base; |
| 279 | int end; | 279 | int end; |
| 280 | char *name_base; | 280 | char *name_base; |
| 281 | 281 | ||
| 282 | switch(type) | 282 | switch(type) |
| 283 | { | 283 | { |
| 284 | case VFL_TYPE_GRABBER: | 284 | case VFL_TYPE_GRABBER: |
| @@ -293,7 +293,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
| 293 | break; | 293 | break; |
| 294 | case VFL_TYPE_VBI: | 294 | case VFL_TYPE_VBI: |
| 295 | base=224; | 295 | base=224; |
| 296 | end=240; | 296 | end=256; |
| 297 | name_base = "vbi"; | 297 | name_base = "vbi"; |
| 298 | break; | 298 | break; |
| 299 | case VFL_TYPE_RADIO: | 299 | case VFL_TYPE_RADIO: |
| @@ -334,7 +334,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
| 334 | init_MUTEX(&vfd->lock); | 334 | init_MUTEX(&vfd->lock); |
| 335 | 335 | ||
| 336 | /* sysfs class */ | 336 | /* sysfs class */ |
| 337 | memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev)); | 337 | memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev)); |
| 338 | if (vfd->dev) | 338 | if (vfd->dev) |
| 339 | vfd->class_dev.dev = vfd->dev; | 339 | vfd->class_dev.dev = vfd->dev; |
| 340 | vfd->class_dev.class = &video_class; | 340 | vfd->class_dev.class = &video_class; |
| @@ -360,7 +360,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
| 360 | * This unregisters the passed device and deassigns the minor | 360 | * This unregisters the passed device and deassigns the minor |
| 361 | * number. Future open calls will be met with errors. | 361 | * number. Future open calls will be met with errors. |
| 362 | */ | 362 | */ |
| 363 | 363 | ||
| 364 | void video_unregister_device(struct video_device *vfd) | 364 | void video_unregister_device(struct video_device *vfd) |
| 365 | { | 365 | { |
| 366 | down(&videodev_lock); | 366 | down(&videodev_lock); |
| @@ -384,7 +384,7 @@ static struct file_operations video_fops= | |||
| 384 | /* | 384 | /* |
| 385 | * Initialise video for linux | 385 | * Initialise video for linux |
| 386 | */ | 386 | */ |
| 387 | 387 | ||
| 388 | static int __init videodev_init(void) | 388 | static int __init videodev_init(void) |
| 389 | { | 389 | { |
| 390 | int ret; | 390 | int ret; |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 65c2ec5c421b..4262a22adc22 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -1118,6 +1118,65 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp) | |||
| 1118 | return -1; | 1118 | return -1; |
| 1119 | } | 1119 | } |
| 1120 | 1120 | ||
| 1121 | int | ||
| 1122 | mpt_alt_ioc_wait(MPT_ADAPTER *ioc) | ||
| 1123 | { | ||
| 1124 | int loop_count = 30 * 4; /* Wait 30 seconds */ | ||
| 1125 | int status = -1; /* -1 means failed to get board READY */ | ||
| 1126 | |||
| 1127 | do { | ||
| 1128 | spin_lock(&ioc->initializing_hba_lock); | ||
| 1129 | if (ioc->initializing_hba_lock_flag == 0) { | ||
| 1130 | ioc->initializing_hba_lock_flag=1; | ||
| 1131 | spin_unlock(&ioc->initializing_hba_lock); | ||
| 1132 | status = 0; | ||
| 1133 | break; | ||
| 1134 | } | ||
| 1135 | spin_unlock(&ioc->initializing_hba_lock); | ||
| 1136 | set_current_state(TASK_INTERRUPTIBLE); | ||
| 1137 | schedule_timeout(HZ/4); | ||
| 1138 | } while (--loop_count); | ||
| 1139 | |||
| 1140 | return status; | ||
| 1141 | } | ||
| 1142 | |||
| 1143 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | ||
| 1144 | /* | ||
| 1145 | * mpt_bringup_adapter - This is a wrapper function for mpt_do_ioc_recovery | ||
| 1146 | * @ioc: Pointer to MPT adapter structure | ||
| 1147 | * @sleepFlag: Use schedule if CAN_SLEEP else use udelay. | ||
| 1148 | * | ||
| 1149 | * This routine performs all the steps necessary to bring the IOC | ||
| 1150 | * to a OPERATIONAL state. | ||
| 1151 | * | ||
| 1152 | * Special Note: This function was added with spin lock's so as to allow | ||
| 1153 | * the dv(domain validation) work thread to succeed on the other channel | ||
| 1154 | * that maybe occuring at the same time when this function is called. | ||
| 1155 | * Without this lock, the dv would fail when message frames were | ||
| 1156 | * requested during hba bringup on the alternate ioc. | ||
| 1157 | */ | ||
| 1158 | static int | ||
| 1159 | mpt_bringup_adapter(MPT_ADAPTER *ioc, int sleepFlag) | ||
| 1160 | { | ||
| 1161 | int r; | ||
| 1162 | |||
| 1163 | if(ioc->alt_ioc) { | ||
| 1164 | if((r=mpt_alt_ioc_wait(ioc->alt_ioc)!=0)) | ||
| 1165 | return r; | ||
| 1166 | } | ||
| 1167 | |||
| 1168 | r = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP, | ||
| 1169 | CAN_SLEEP); | ||
| 1170 | |||
| 1171 | if(ioc->alt_ioc) { | ||
| 1172 | spin_lock(&ioc->alt_ioc->initializing_hba_lock); | ||
| 1173 | ioc->alt_ioc->initializing_hba_lock_flag=0; | ||
| 1174 | spin_unlock(&ioc->alt_ioc->initializing_hba_lock); | ||
| 1175 | } | ||
| 1176 | |||
| 1177 | return r; | ||
| 1178 | } | ||
| 1179 | |||
| 1121 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1180 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 1122 | /* | 1181 | /* |
| 1123 | * mpt_attach - Install a PCI intelligent MPT adapter. | 1182 | * mpt_attach - Install a PCI intelligent MPT adapter. |
| @@ -1186,6 +1245,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1186 | ioc->pcidev = pdev; | 1245 | ioc->pcidev = pdev; |
| 1187 | ioc->diagPending = 0; | 1246 | ioc->diagPending = 0; |
| 1188 | spin_lock_init(&ioc->diagLock); | 1247 | spin_lock_init(&ioc->diagLock); |
| 1248 | spin_lock_init(&ioc->initializing_hba_lock); | ||
| 1189 | 1249 | ||
| 1190 | /* Initialize the event logging. | 1250 | /* Initialize the event logging. |
| 1191 | */ | 1251 | */ |
| @@ -1408,8 +1468,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1408 | */ | 1468 | */ |
| 1409 | mpt_detect_bound_ports(ioc, pdev); | 1469 | mpt_detect_bound_ports(ioc, pdev); |
| 1410 | 1470 | ||
| 1411 | if ((r = mpt_do_ioc_recovery(ioc, | 1471 | if ((r = mpt_bringup_adapter(ioc, CAN_SLEEP)) != 0){ |
| 1412 | MPT_HOSTEVENT_IOC_BRINGUP, CAN_SLEEP)) != 0) { | ||
| 1413 | printk(KERN_WARNING MYNAM | 1472 | printk(KERN_WARNING MYNAM |
| 1414 | ": WARNING - %s did not initialize properly! (%d)\n", | 1473 | ": WARNING - %s did not initialize properly! (%d)\n", |
| 1415 | ioc->name, r); | 1474 | ioc->name, r); |
| @@ -6298,6 +6357,7 @@ EXPORT_SYMBOL(mpt_read_ioc_pg_3); | |||
| 6298 | EXPORT_SYMBOL(mpt_alloc_fw_memory); | 6357 | EXPORT_SYMBOL(mpt_alloc_fw_memory); |
| 6299 | EXPORT_SYMBOL(mpt_free_fw_memory); | 6358 | EXPORT_SYMBOL(mpt_free_fw_memory); |
| 6300 | EXPORT_SYMBOL(mptbase_sas_persist_operation); | 6359 | EXPORT_SYMBOL(mptbase_sas_persist_operation); |
| 6360 | EXPORT_SYMBOL(mpt_alt_ioc_wait); | ||
| 6301 | 6361 | ||
| 6302 | 6362 | ||
| 6303 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 6363 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index 5f5b3fb5b4d7..bac8eb4186d2 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
| @@ -611,6 +611,8 @@ typedef struct _MPT_ADAPTER | |||
| 611 | int DoneCtx; | 611 | int DoneCtx; |
| 612 | int TaskCtx; | 612 | int TaskCtx; |
| 613 | int InternalCtx; | 613 | int InternalCtx; |
| 614 | spinlock_t initializing_hba_lock; | ||
| 615 | int initializing_hba_lock_flag; | ||
| 614 | struct list_head list; | 616 | struct list_head list; |
| 615 | struct net_device *netdev; | 617 | struct net_device *netdev; |
| 616 | struct list_head sas_topology; | 618 | struct list_head sas_topology; |
| @@ -1001,6 +1003,7 @@ extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); | |||
| 1001 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); | 1003 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); |
| 1002 | extern int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc); | 1004 | extern int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc); |
| 1003 | extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); | 1005 | extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); |
| 1006 | extern int mpt_alt_ioc_wait(MPT_ADAPTER *ioc); | ||
| 1004 | 1007 | ||
| 1005 | /* | 1008 | /* |
| 1006 | * Public data decl's... | 1009 | * Public data decl's... |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 4330ed0cedaa..b7b9846ff3fd 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -4162,6 +4162,12 @@ mptscsih_domainValidation(void *arg) | |||
| 4162 | } | 4162 | } |
| 4163 | } | 4163 | } |
| 4164 | 4164 | ||
| 4165 | if(mpt_alt_ioc_wait(hd->ioc)!=0) { | ||
| 4166 | ddvprintk((MYIOC_s_WARN_FMT "alt_ioc busy!\n", | ||
| 4167 | hd->ioc->name)); | ||
| 4168 | continue; | ||
| 4169 | } | ||
| 4170 | |||
| 4165 | if (mptscsih_doDv(hd, 0, id) == 1) { | 4171 | if (mptscsih_doDv(hd, 0, id) == 1) { |
| 4166 | /* Untagged device was busy, try again | 4172 | /* Untagged device was busy, try again |
| 4167 | */ | 4173 | */ |
| @@ -4173,6 +4179,10 @@ mptscsih_domainValidation(void *arg) | |||
| 4173 | hd->ioc->spi_data.dvStatus[id] &= ~(MPT_SCSICFG_DV_NOT_DONE | MPT_SCSICFG_DV_PENDING); | 4179 | hd->ioc->spi_data.dvStatus[id] &= ~(MPT_SCSICFG_DV_NOT_DONE | MPT_SCSICFG_DV_PENDING); |
| 4174 | } | 4180 | } |
| 4175 | 4181 | ||
| 4182 | spin_lock(&hd->ioc->initializing_hba_lock); | ||
| 4183 | hd->ioc->initializing_hba_lock_flag=0; | ||
| 4184 | spin_unlock(&hd->ioc->initializing_hba_lock); | ||
| 4185 | |||
| 4176 | if (isPhysDisk) { | 4186 | if (isPhysDisk) { |
| 4177 | for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++) { | 4187 | for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++) { |
| 4178 | if (hd->ioc->raid_data.isRaid & (1 << ii)) { | 4188 | if (hd->ioc->raid_data.isRaid & (1 << ii)) { |
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index c53848f787eb..7aa49b974dc5 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -28,8 +28,8 @@ | |||
| 28 | 28 | ||
| 29 | #define DRV_MODULE_NAME "b44" | 29 | #define DRV_MODULE_NAME "b44" |
| 30 | #define PFX DRV_MODULE_NAME ": " | 30 | #define PFX DRV_MODULE_NAME ": " |
| 31 | #define DRV_MODULE_VERSION "0.96" | 31 | #define DRV_MODULE_VERSION "0.97" |
| 32 | #define DRV_MODULE_RELDATE "Nov 8, 2005" | 32 | #define DRV_MODULE_RELDATE "Nov 30, 2005" |
| 33 | 33 | ||
| 34 | #define B44_DEF_MSG_ENABLE \ | 34 | #define B44_DEF_MSG_ENABLE \ |
| 35 | (NETIF_MSG_DRV | \ | 35 | (NETIF_MSG_DRV | \ |
| @@ -1417,6 +1417,7 @@ static int b44_open(struct net_device *dev) | |||
| 1417 | add_timer(&bp->timer); | 1417 | add_timer(&bp->timer); |
| 1418 | 1418 | ||
| 1419 | b44_enable_ints(bp); | 1419 | b44_enable_ints(bp); |
| 1420 | netif_start_queue(dev); | ||
| 1420 | out: | 1421 | out: |
| 1421 | return err; | 1422 | return err; |
| 1422 | } | 1423 | } |
| @@ -1837,12 +1838,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 1837 | { | 1838 | { |
| 1838 | struct mii_ioctl_data *data = if_mii(ifr); | 1839 | struct mii_ioctl_data *data = if_mii(ifr); |
| 1839 | struct b44 *bp = netdev_priv(dev); | 1840 | struct b44 *bp = netdev_priv(dev); |
| 1840 | int err; | 1841 | int err = -EINVAL; |
| 1842 | |||
| 1843 | if (!netif_running(dev)) | ||
| 1844 | goto out; | ||
| 1841 | 1845 | ||
| 1842 | spin_lock_irq(&bp->lock); | 1846 | spin_lock_irq(&bp->lock); |
| 1843 | err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL); | 1847 | err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL); |
| 1844 | spin_unlock_irq(&bp->lock); | 1848 | spin_unlock_irq(&bp->lock); |
| 1845 | 1849 | out: | |
| 1846 | return err; | 1850 | return err; |
| 1847 | } | 1851 | } |
| 1848 | 1852 | ||
| @@ -2113,6 +2117,7 @@ static int b44_resume(struct pci_dev *pdev) | |||
| 2113 | add_timer(&bp->timer); | 2117 | add_timer(&bp->timer); |
| 2114 | 2118 | ||
| 2115 | b44_enable_ints(bp); | 2119 | b44_enable_ints(bp); |
| 2120 | netif_wake_queue(dev); | ||
| 2116 | return 0; | 2121 | return 0; |
| 2117 | } | 2122 | } |
| 2118 | 2123 | ||
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 8b207f0e139e..e0ae248b4313 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -2621,19 +2621,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb) | |||
| 2621 | E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) ) | 2621 | E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) ) |
| 2622 | return 0; | 2622 | return 0; |
| 2623 | } | 2623 | } |
| 2624 | if(htons(ETH_P_IP) == skb->protocol) { | 2624 | if ((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) { |
| 2625 | const struct iphdr *ip = skb->nh.iph; | ||
| 2626 | if(IPPROTO_UDP == ip->protocol) { | ||
| 2627 | struct udphdr *udp = (struct udphdr *)(skb->h.uh); | ||
| 2628 | if(ntohs(udp->dest) == 67) { | ||
| 2629 | offset = (uint8_t *)udp + 8 - skb->data; | ||
| 2630 | length = skb->len - offset; | ||
| 2631 | |||
| 2632 | return e1000_mng_write_dhcp_info(hw, | ||
| 2633 | (uint8_t *)udp + 8, length); | ||
| 2634 | } | ||
| 2635 | } | ||
| 2636 | } else if((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) { | ||
| 2637 | struct ethhdr *eth = (struct ethhdr *) skb->data; | 2625 | struct ethhdr *eth = (struct ethhdr *) skb->data; |
| 2638 | if((htons(ETH_P_IP) == eth->h_proto)) { | 2626 | if((htons(ETH_P_IP) == eth->h_proto)) { |
| 2639 | const struct iphdr *ip = | 2627 | const struct iphdr *ip = |
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c index eb7d69478715..1da8a66f91e1 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.c +++ b/drivers/net/ibm_emac/ibm_emac_core.c | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #define DRV_NAME "emac" | 67 | #define DRV_NAME "emac" |
| 68 | #define DRV_VERSION "3.53" | 68 | #define DRV_VERSION "3.54" |
| 69 | #define DRV_DESC "PPC 4xx OCP EMAC driver" | 69 | #define DRV_DESC "PPC 4xx OCP EMAC driver" |
| 70 | 70 | ||
| 71 | MODULE_DESCRIPTION(DRV_DESC); | 71 | MODULE_DESCRIPTION(DRV_DESC); |
| @@ -158,6 +158,14 @@ static inline void emac_report_timeout_error(struct ocp_enet_private *dev, | |||
| 158 | #define PHY_POLL_LINK_ON HZ | 158 | #define PHY_POLL_LINK_ON HZ |
| 159 | #define PHY_POLL_LINK_OFF (HZ / 5) | 159 | #define PHY_POLL_LINK_OFF (HZ / 5) |
| 160 | 160 | ||
| 161 | /* Graceful stop timeouts in us. | ||
| 162 | * We should allow up to 1 frame time (full-duplex, ignoring collisions) | ||
| 163 | */ | ||
| 164 | #define STOP_TIMEOUT_10 1230 | ||
| 165 | #define STOP_TIMEOUT_100 124 | ||
| 166 | #define STOP_TIMEOUT_1000 13 | ||
| 167 | #define STOP_TIMEOUT_1000_JUMBO 73 | ||
| 168 | |||
| 161 | /* Please, keep in sync with struct ibm_emac_stats/ibm_emac_error_stats */ | 169 | /* Please, keep in sync with struct ibm_emac_stats/ibm_emac_error_stats */ |
| 162 | static const char emac_stats_keys[EMAC_ETHTOOL_STATS_COUNT][ETH_GSTRING_LEN] = { | 170 | static const char emac_stats_keys[EMAC_ETHTOOL_STATS_COUNT][ETH_GSTRING_LEN] = { |
| 163 | "rx_packets", "rx_bytes", "tx_packets", "tx_bytes", "rx_packets_csum", | 171 | "rx_packets", "rx_bytes", "tx_packets", "tx_bytes", "rx_packets_csum", |
| @@ -222,10 +230,12 @@ static void emac_tx_disable(struct ocp_enet_private *dev) | |||
| 222 | 230 | ||
| 223 | r = in_be32(&p->mr0); | 231 | r = in_be32(&p->mr0); |
| 224 | if (r & EMAC_MR0_TXE) { | 232 | if (r & EMAC_MR0_TXE) { |
| 225 | int n = 300; | 233 | int n = dev->stop_timeout; |
| 226 | out_be32(&p->mr0, r & ~EMAC_MR0_TXE); | 234 | out_be32(&p->mr0, r & ~EMAC_MR0_TXE); |
| 227 | while (!(in_be32(&p->mr0) & EMAC_MR0_TXI) && n) | 235 | while (!(in_be32(&p->mr0) & EMAC_MR0_TXI) && n) { |
| 236 | udelay(1); | ||
| 228 | --n; | 237 | --n; |
| 238 | } | ||
| 229 | if (unlikely(!n)) | 239 | if (unlikely(!n)) |
| 230 | emac_report_timeout_error(dev, "TX disable timeout"); | 240 | emac_report_timeout_error(dev, "TX disable timeout"); |
| 231 | } | 241 | } |
| @@ -248,9 +258,11 @@ static void emac_rx_enable(struct ocp_enet_private *dev) | |||
| 248 | if (!(r & EMAC_MR0_RXE)) { | 258 | if (!(r & EMAC_MR0_RXE)) { |
| 249 | if (unlikely(!(r & EMAC_MR0_RXI))) { | 259 | if (unlikely(!(r & EMAC_MR0_RXI))) { |
| 250 | /* Wait if previous async disable is still in progress */ | 260 | /* Wait if previous async disable is still in progress */ |
| 251 | int n = 100; | 261 | int n = dev->stop_timeout; |
| 252 | while (!(r = in_be32(&p->mr0) & EMAC_MR0_RXI) && n) | 262 | while (!(r = in_be32(&p->mr0) & EMAC_MR0_RXI) && n) { |
| 263 | udelay(1); | ||
| 253 | --n; | 264 | --n; |
| 265 | } | ||
| 254 | if (unlikely(!n)) | 266 | if (unlikely(!n)) |
| 255 | emac_report_timeout_error(dev, | 267 | emac_report_timeout_error(dev, |
| 256 | "RX disable timeout"); | 268 | "RX disable timeout"); |
| @@ -273,10 +285,12 @@ static void emac_rx_disable(struct ocp_enet_private *dev) | |||
| 273 | 285 | ||
| 274 | r = in_be32(&p->mr0); | 286 | r = in_be32(&p->mr0); |
| 275 | if (r & EMAC_MR0_RXE) { | 287 | if (r & EMAC_MR0_RXE) { |
| 276 | int n = 300; | 288 | int n = dev->stop_timeout; |
| 277 | out_be32(&p->mr0, r & ~EMAC_MR0_RXE); | 289 | out_be32(&p->mr0, r & ~EMAC_MR0_RXE); |
| 278 | while (!(in_be32(&p->mr0) & EMAC_MR0_RXI) && n) | 290 | while (!(in_be32(&p->mr0) & EMAC_MR0_RXI) && n) { |
| 291 | udelay(1); | ||
| 279 | --n; | 292 | --n; |
| 293 | } | ||
| 280 | if (unlikely(!n)) | 294 | if (unlikely(!n)) |
| 281 | emac_report_timeout_error(dev, "RX disable timeout"); | 295 | emac_report_timeout_error(dev, "RX disable timeout"); |
| 282 | } | 296 | } |
| @@ -395,6 +409,7 @@ static int emac_configure(struct ocp_enet_private *dev) | |||
| 395 | r = EMAC_MR1_BASE(emac_opb_mhz()) | EMAC_MR1_VLE | EMAC_MR1_IST; | 409 | r = EMAC_MR1_BASE(emac_opb_mhz()) | EMAC_MR1_VLE | EMAC_MR1_IST; |
| 396 | if (dev->phy.duplex == DUPLEX_FULL) | 410 | if (dev->phy.duplex == DUPLEX_FULL) |
| 397 | r |= EMAC_MR1_FDE; | 411 | r |= EMAC_MR1_FDE; |
| 412 | dev->stop_timeout = STOP_TIMEOUT_10; | ||
| 398 | switch (dev->phy.speed) { | 413 | switch (dev->phy.speed) { |
| 399 | case SPEED_1000: | 414 | case SPEED_1000: |
| 400 | if (emac_phy_gpcs(dev->phy.mode)) { | 415 | if (emac_phy_gpcs(dev->phy.mode)) { |
| @@ -409,12 +424,16 @@ static int emac_configure(struct ocp_enet_private *dev) | |||
| 409 | r |= EMAC_MR1_MF_1000; | 424 | r |= EMAC_MR1_MF_1000; |
| 410 | r |= EMAC_MR1_RFS_16K; | 425 | r |= EMAC_MR1_RFS_16K; |
| 411 | gige = 1; | 426 | gige = 1; |
| 412 | 427 | ||
| 413 | if (dev->ndev->mtu > ETH_DATA_LEN) | 428 | if (dev->ndev->mtu > ETH_DATA_LEN) { |
| 414 | r |= EMAC_MR1_JPSM; | 429 | r |= EMAC_MR1_JPSM; |
| 430 | dev->stop_timeout = STOP_TIMEOUT_1000_JUMBO; | ||
| 431 | } else | ||
| 432 | dev->stop_timeout = STOP_TIMEOUT_1000; | ||
| 415 | break; | 433 | break; |
| 416 | case SPEED_100: | 434 | case SPEED_100: |
| 417 | r |= EMAC_MR1_MF_100; | 435 | r |= EMAC_MR1_MF_100; |
| 436 | dev->stop_timeout = STOP_TIMEOUT_100; | ||
| 418 | /* Fall through */ | 437 | /* Fall through */ |
| 419 | default: | 438 | default: |
| 420 | r |= EMAC_MR1_RFS_4K; | 439 | r |= EMAC_MR1_RFS_4K; |
| @@ -2048,6 +2067,7 @@ static int __init emac_probe(struct ocp_device *ocpdev) | |||
| 2048 | dev->phy.duplex = DUPLEX_FULL; | 2067 | dev->phy.duplex = DUPLEX_FULL; |
| 2049 | dev->phy.autoneg = AUTONEG_DISABLE; | 2068 | dev->phy.autoneg = AUTONEG_DISABLE; |
| 2050 | dev->phy.pause = dev->phy.asym_pause = 0; | 2069 | dev->phy.pause = dev->phy.asym_pause = 0; |
| 2070 | dev->stop_timeout = STOP_TIMEOUT_100; | ||
| 2051 | init_timer(&dev->link_timer); | 2071 | init_timer(&dev->link_timer); |
| 2052 | dev->link_timer.function = emac_link_timer; | 2072 | dev->link_timer.function = emac_link_timer; |
| 2053 | dev->link_timer.data = (unsigned long)dev; | 2073 | dev->link_timer.data = (unsigned long)dev; |
diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h index e9b44d030ac3..911abbaf471b 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.h +++ b/drivers/net/ibm_emac/ibm_emac_core.h | |||
| @@ -189,6 +189,8 @@ struct ocp_enet_private { | |||
| 189 | struct timer_list link_timer; | 189 | struct timer_list link_timer; |
| 190 | int reset_failed; | 190 | int reset_failed; |
| 191 | 191 | ||
| 192 | int stop_timeout; /* in us */ | ||
| 193 | |||
| 192 | struct ibm_emac_error_stats estats; | 194 | struct ibm_emac_error_stats estats; |
| 193 | struct net_device_stats nstats; | 195 | struct net_device_stats nstats; |
| 194 | 196 | ||
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index b039bd89ceb9..272d331d29cd 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
| @@ -296,7 +296,7 @@ static int __init jazz_sonic_init_module(void) | |||
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | jazz_sonic_device = platform_device_alloc(jazz_sonic_string, 0); | 298 | jazz_sonic_device = platform_device_alloc(jazz_sonic_string, 0); |
| 299 | if (!jazz_sonnic_device) | 299 | if (!jazz_sonic_device) |
| 300 | goto out_unregister; | 300 | goto out_unregister; |
| 301 | 301 | ||
| 302 | if (platform_device_add(jazz_sonic_device)) { | 302 | if (platform_device_add(jazz_sonic_device)) { |
| @@ -307,7 +307,7 @@ static int __init jazz_sonic_init_module(void) | |||
| 307 | return 0; | 307 | return 0; |
| 308 | 308 | ||
| 309 | out_unregister: | 309 | out_unregister: |
| 310 | driver_unregister(&jazz_sonic_driver); | 310 | platform_driver_unregister(&jazz_sonic_driver); |
| 311 | 311 | ||
| 312 | return -ENOMEM; | 312 | return -ENOMEM; |
| 313 | } | 313 | } |
diff --git a/drivers/net/mipsnet.h b/drivers/net/mipsnet.h index 878535953cb1..026c732024c9 100644 --- a/drivers/net/mipsnet.h +++ b/drivers/net/mipsnet.h | |||
| @@ -1,28 +1,8 @@ | |||
| 1 | // | 1 | /* |
| 2 | // <COPYRIGHT CLASS="1B" YEAR="2005"> | 2 | * This file is subject to the terms and conditions of the GNU General Public |
| 3 | // Unpublished work (c) MIPS Technologies, Inc. All rights reserved. | 3 | * License. See the file "COPYING" in the main directory of this archive |
| 4 | // Unpublished rights reserved under the copyright laws of the U.S.A. and | 4 | * for more details. |
| 5 | // other countries. | 5 | */ |
| 6 | // | ||
| 7 | // PROPRIETARY / SECRET CONFIDENTIAL INFORMATION OF MIPS TECHNOLOGIES, INC. | ||
| 8 | // FOR INTERNAL USE ONLY. | ||
| 9 | // | ||
| 10 | // Under no circumstances (contract or otherwise) may this information be | ||
| 11 | // disclosed to, or copied, modified or used by anyone other than employees | ||
| 12 | // or contractors of MIPS Technologies having a need to know. | ||
| 13 | // </COPYRIGHT> | ||
| 14 | // | ||
| 15 | //++ | ||
| 16 | // File: MIPS_Net.h | ||
| 17 | // | ||
| 18 | // Description: | ||
| 19 | // The definition of the emulated MIPSNET device's interface. | ||
| 20 | // | ||
| 21 | // Notes: This include file needs to work from a Linux device drivers. | ||
| 22 | // | ||
| 23 | //-- | ||
| 24 | // | ||
| 25 | |||
| 26 | #ifndef __MIPSNET_H | 6 | #ifndef __MIPSNET_H |
| 27 | #define __MIPSNET_H | 7 | #define __MIPSNET_H |
| 28 | 8 | ||
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 384a736a0d2f..356f50909222 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
| @@ -131,10 +131,9 @@ typedef struct local_info_t { | |||
| 131 | u_short tx_queue_len; | 131 | u_short tx_queue_len; |
| 132 | cardtype_t cardtype; | 132 | cardtype_t cardtype; |
| 133 | u_short sent; | 133 | u_short sent; |
| 134 | u_char mc_filter[8]; | ||
| 135 | } local_info_t; | 134 | } local_info_t; |
| 136 | 135 | ||
| 137 | #define MC_FILTERBREAK 8 | 136 | #define MC_FILTERBREAK 64 |
| 138 | 137 | ||
| 139 | /*====================================================================*/ | 138 | /*====================================================================*/ |
| 140 | /* | 139 | /* |
| @@ -1005,15 +1004,8 @@ static void fjn_reset(struct net_device *dev) | |||
| 1005 | for (i = 0; i < 6; i++) | 1004 | for (i = 0; i < 6; i++) |
| 1006 | outb(dev->dev_addr[i], ioaddr + NODE_ID + i); | 1005 | outb(dev->dev_addr[i], ioaddr + NODE_ID + i); |
| 1007 | 1006 | ||
| 1008 | /* Switch to bank 1 */ | 1007 | /* (re)initialize the multicast table */ |
| 1009 | if (lp->cardtype == MBH10302) | 1008 | set_rx_mode(dev); |
| 1010 | outb(BANK_1, ioaddr + CONFIG_1); | ||
| 1011 | else | ||
| 1012 | outb(BANK_1U, ioaddr + CONFIG_1); | ||
| 1013 | |||
| 1014 | /* set the multicast table to accept none. */ | ||
| 1015 | for (i = 0; i < 8; i++) | ||
| 1016 | outb(0x00, ioaddr + MAR_ADR + i); | ||
| 1017 | 1009 | ||
| 1018 | /* Switch to bank 2 (runtime mode) */ | 1010 | /* Switch to bank 2 (runtime mode) */ |
| 1019 | if (lp->cardtype == MBH10302) | 1011 | if (lp->cardtype == MBH10302) |
| @@ -1264,11 +1256,11 @@ static struct net_device_stats *fjn_get_stats(struct net_device *dev) | |||
| 1264 | static void set_rx_mode(struct net_device *dev) | 1256 | static void set_rx_mode(struct net_device *dev) |
| 1265 | { | 1257 | { |
| 1266 | kio_addr_t ioaddr = dev->base_addr; | 1258 | kio_addr_t ioaddr = dev->base_addr; |
| 1267 | struct local_info_t *lp = netdev_priv(dev); | ||
| 1268 | u_char mc_filter[8]; /* Multicast hash filter */ | 1259 | u_char mc_filter[8]; /* Multicast hash filter */ |
| 1269 | u_long flags; | 1260 | u_long flags; |
| 1270 | int i; | 1261 | int i; |
| 1271 | 1262 | ||
| 1263 | int saved_bank; | ||
| 1272 | int saved_config_0 = inb(ioaddr + CONFIG_0); | 1264 | int saved_config_0 = inb(ioaddr + CONFIG_0); |
| 1273 | 1265 | ||
| 1274 | local_irq_save(flags); | 1266 | local_irq_save(flags); |
| @@ -1306,15 +1298,13 @@ static void set_rx_mode(struct net_device *dev) | |||
| 1306 | outb(2, ioaddr + RX_MODE); /* Use normal mode. */ | 1298 | outb(2, ioaddr + RX_MODE); /* Use normal mode. */ |
| 1307 | } | 1299 | } |
| 1308 | 1300 | ||
| 1309 | if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) { | 1301 | /* Switch to bank 1 and set the multicast table. */ |
| 1310 | int saved_bank = inb(ioaddr + CONFIG_1); | 1302 | saved_bank = inb(ioaddr + CONFIG_1); |
| 1311 | /* Switch to bank 1 and set the multicast table. */ | 1303 | outb(0xe4, ioaddr + CONFIG_1); |
| 1312 | outb(0xe4, ioaddr + CONFIG_1); | 1304 | |
| 1313 | for (i = 0; i < 8; i++) | 1305 | for (i = 0; i < 8; i++) |
| 1314 | outb(mc_filter[i], ioaddr + MAR_ADR + i); | 1306 | outb(mc_filter[i], ioaddr + MAR_ADR + i); |
| 1315 | memcpy(lp->mc_filter, mc_filter, sizeof(mc_filter)); | 1307 | outb(saved_bank, ioaddr + CONFIG_1); |
| 1316 | outb(saved_bank, ioaddr + CONFIG_1); | ||
| 1317 | } | ||
| 1318 | 1308 | ||
| 1319 | outb(saved_config_0, ioaddr + CONFIG_0); | 1309 | outb(saved_config_0, ioaddr + CONFIG_0); |
| 1320 | 1310 | ||
diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile index 6783039ffb75..7653d6e33aa2 100644 --- a/drivers/net/sk98lin/Makefile +++ b/drivers/net/sk98lin/Makefile | |||
| @@ -27,8 +27,7 @@ sk98lin-objs := \ | |||
| 27 | sktimer.o \ | 27 | sktimer.o \ |
| 28 | skvpd.o \ | 28 | skvpd.o \ |
| 29 | skxmac2.o \ | 29 | skxmac2.o \ |
| 30 | skproc.o \ | 30 | skproc.o |
| 31 | skcsum.o | ||
| 32 | 31 | ||
| 33 | # DBGDEF = \ | 32 | # DBGDEF = \ |
| 34 | # -DDEBUG | 33 | # -DDEBUG |
| @@ -77,7 +76,7 @@ endif | |||
| 77 | # SK_DBGCAT_DRV_INT_SRC 0x04000000 interrupts sources | 76 | # SK_DBGCAT_DRV_INT_SRC 0x04000000 interrupts sources |
| 78 | # SK_DBGCAT_DRV_EVENT 0x08000000 driver events | 77 | # SK_DBGCAT_DRV_EVENT 0x08000000 driver events |
| 79 | 78 | ||
| 80 | EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM) | 79 | EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM) |
| 81 | 80 | ||
| 82 | clean: | 81 | clean: |
| 83 | rm -f core *.o *.a *.s | 82 | rm -f core *.o *.a *.s |
diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h index 542cec57f86a..2dc5728e3ef6 100644 --- a/drivers/net/sk98lin/h/skdrv2nd.h +++ b/drivers/net/sk98lin/h/skdrv2nd.h | |||
| @@ -425,10 +425,6 @@ struct s_AC { | |||
| 425 | TX_PORT TxPort[SK_MAX_MACS][2]; | 425 | TX_PORT TxPort[SK_MAX_MACS][2]; |
| 426 | RX_PORT RxPort[SK_MAX_MACS]; | 426 | RX_PORT RxPort[SK_MAX_MACS]; |
| 427 | 427 | ||
| 428 | unsigned int CsOfs1; /* for checksum calculation */ | ||
| 429 | unsigned int CsOfs2; /* for checksum calculation */ | ||
| 430 | SK_U32 CsOfs; /* for checksum calculation */ | ||
| 431 | |||
| 432 | SK_BOOL CheckQueue; /* check event queue soon */ | 428 | SK_BOOL CheckQueue; /* check event queue soon */ |
| 433 | SK_TIMER DrvCleanupTimer;/* to check for pending descriptors */ | 429 | SK_TIMER DrvCleanupTimer;/* to check for pending descriptors */ |
| 434 | DIM_INFO DynIrqModInfo; /* all data related to DIM */ | 430 | DIM_INFO DynIrqModInfo; /* all data related to DIM */ |
diff --git a/drivers/net/sk98lin/skcsum.c b/drivers/net/sk98lin/skcsum.c deleted file mode 100644 index 38a6e7a631f3..000000000000 --- a/drivers/net/sk98lin/skcsum.c +++ /dev/null | |||
| @@ -1,871 +0,0 @@ | |||
| 1 | /****************************************************************************** | ||
| 2 | * | ||
| 3 | * Name: skcsum.c | ||
| 4 | * Project: GEnesis, PCI Gigabit Ethernet Adapter | ||
| 5 | * Version: $Revision: 1.12 $ | ||
| 6 | * Date: $Date: 2003/08/20 13:55:53 $ | ||
| 7 | * Purpose: Store/verify Internet checksum in send/receive packets. | ||
| 8 | * | ||
| 9 | ******************************************************************************/ | ||
| 10 | |||
| 11 | /****************************************************************************** | ||
| 12 | * | ||
| 13 | * (C)Copyright 1998-2003 SysKonnect GmbH. | ||
| 14 | * | ||
| 15 | * This program is free software; you can redistribute it and/or modify | ||
| 16 | * it under the terms of the GNU General Public License as published by | ||
| 17 | * the Free Software Foundation; either version 2 of the License, or | ||
| 18 | * (at your option) any later version. | ||
| 19 | * | ||
| 20 | * The information in this file is provided "AS IS" without warranty. | ||
| 21 | * | ||
| 22 | ******************************************************************************/ | ||
| 23 | |||
| 24 | #ifdef SK_USE_CSUM /* Check if CSUM is to be used. */ | ||
| 25 | |||
| 26 | #ifndef lint | ||
| 27 | static const char SysKonnectFileId[] = | ||
| 28 | "@(#) $Id: skcsum.c,v 1.12 2003/08/20 13:55:53 mschmid Exp $ (C) SysKonnect."; | ||
| 29 | #endif /* !lint */ | ||
| 30 | |||
| 31 | /****************************************************************************** | ||
| 32 | * | ||
| 33 | * Description: | ||
| 34 | * | ||
| 35 | * This is the "GEnesis" common module "CSUM". | ||
| 36 | * | ||
| 37 | * This module contains the code necessary to calculate, store, and verify the | ||
| 38 | * Internet Checksum of IP, TCP, and UDP frames. | ||
| 39 | * | ||
| 40 | * "GEnesis" is an abbreviation of "Gigabit Ethernet Network System in Silicon" | ||
| 41 | * and is the code name of this SysKonnect project. | ||
| 42 | * | ||
| 43 | * Compilation Options: | ||
| 44 | * | ||
| 45 | * SK_USE_CSUM - Define if CSUM is to be used. Otherwise, CSUM will be an | ||
| 46 | * empty module. | ||
| 47 | * | ||
| 48 | * SKCS_OVERWRITE_PROTO - Define to overwrite the default protocol id | ||
| 49 | * definitions. In this case, all SKCS_PROTO_xxx definitions must be made | ||
| 50 | * external. | ||
| 51 | * | ||
| 52 | * SKCS_OVERWRITE_STATUS - Define to overwrite the default return status | ||
| 53 | * definitions. In this case, all SKCS_STATUS_xxx definitions must be made | ||
| 54 | * external. | ||
| 55 | * | ||
| 56 | * Include File Hierarchy: | ||
| 57 | * | ||
| 58 | * "h/skdrv1st.h" | ||
| 59 | * "h/skcsum.h" | ||
| 60 | * "h/sktypes.h" | ||
| 61 | * "h/skqueue.h" | ||
| 62 | * "h/skdrv2nd.h" | ||
| 63 | * | ||
| 64 | ******************************************************************************/ | ||
| 65 | |||
| 66 | #include "h/skdrv1st.h" | ||
| 67 | #include "h/skcsum.h" | ||
| 68 | #include "h/skdrv2nd.h" | ||
| 69 | |||
| 70 | /* defines ********************************************************************/ | ||
| 71 | |||
| 72 | /* The size of an Ethernet MAC header. */ | ||
| 73 | #define SKCS_ETHERNET_MAC_HEADER_SIZE (6+6+2) | ||
| 74 | |||
| 75 | /* The size of the used topology's MAC header. */ | ||
| 76 | #define SKCS_MAC_HEADER_SIZE SKCS_ETHERNET_MAC_HEADER_SIZE | ||
| 77 | |||
| 78 | /* The size of the IP header without any option fields. */ | ||
| 79 | #define SKCS_IP_HEADER_SIZE 20 | ||
| 80 | |||
| 81 | /* | ||
| 82 | * Field offsets within the IP header. | ||
| 83 | */ | ||
| 84 | |||
| 85 | /* "Internet Header Version" and "Length". */ | ||
| 86 | #define SKCS_OFS_IP_HEADER_VERSION_AND_LENGTH 0 | ||
| 87 | |||
| 88 | /* "Total Length". */ | ||
| 89 | #define SKCS_OFS_IP_TOTAL_LENGTH 2 | ||
| 90 | |||
| 91 | /* "Flags" "Fragment Offset". */ | ||
| 92 | #define SKCS_OFS_IP_FLAGS_AND_FRAGMENT_OFFSET 6 | ||
| 93 | |||
| 94 | /* "Next Level Protocol" identifier. */ | ||
| 95 | #define SKCS_OFS_IP_NEXT_LEVEL_PROTOCOL 9 | ||
| 96 | |||
| 97 | /* Source IP address. */ | ||
| 98 | #define SKCS_OFS_IP_SOURCE_ADDRESS 12 | ||
| 99 | |||
| 100 | /* Destination IP address. */ | ||
| 101 | #define SKCS_OFS_IP_DESTINATION_ADDRESS 16 | ||
| 102 | |||
| 103 | |||
| 104 | /* | ||
| 105 | * Field offsets within the UDP header. | ||
| 106 | */ | ||
| 107 | |||
| 108 | /* UDP checksum. */ | ||
| 109 | #define SKCS_OFS_UDP_CHECKSUM 6 | ||
| 110 | |||
| 111 | /* IP "Next Level Protocol" identifiers (see RFC 790). */ | ||
| 112 | #define SKCS_PROTO_ID_TCP 6 /* Transport Control Protocol */ | ||
| 113 | #define SKCS_PROTO_ID_UDP 17 /* User Datagram Protocol */ | ||
| 114 | |||
| 115 | /* IP "Don't Fragment" bit. */ | ||
| 116 | #define SKCS_IP_DONT_FRAGMENT SKCS_HTON16(0x4000) | ||
| 117 | |||
| 118 | /* Add a byte offset to a pointer. */ | ||
| 119 | #define SKCS_IDX(pPtr, Ofs) ((void *) ((char *) (pPtr) + (Ofs))) | ||
| 120 | |||
| 121 | /* | ||
| 122 | * Macros that convert host to network representation and vice versa, i.e. | ||
| 123 | * little/big endian conversion on little endian machines only. | ||
| 124 | */ | ||
| 125 | #ifdef SK_LITTLE_ENDIAN | ||
| 126 | #define SKCS_HTON16(Val16) (((unsigned) (Val16) >> 8) | (((Val16) & 0xff) << 8)) | ||
| 127 | #endif /* SK_LITTLE_ENDIAN */ | ||
| 128 | #ifdef SK_BIG_ENDIAN | ||
| 129 | #define SKCS_HTON16(Val16) (Val16) | ||
| 130 | #endif /* SK_BIG_ENDIAN */ | ||
| 131 | #define SKCS_NTOH16(Val16) SKCS_HTON16(Val16) | ||
| 132 | |||
| 133 | /* typedefs *******************************************************************/ | ||
| 134 | |||
| 135 | /* function prototypes ********************************************************/ | ||
| 136 | |||
| 137 | /****************************************************************************** | ||
| 138 | * | ||
| 139 | * SkCsGetSendInfo - get checksum information for a send packet | ||
| 140 | * | ||
| 141 | * Description: | ||
| 142 | * Get all checksum information necessary to send a TCP or UDP packet. The | ||
| 143 | * function checks the IP header passed to it. If the high-level protocol | ||
| 144 | * is either TCP or UDP the pseudo header checksum is calculated and | ||
| 145 | * returned. | ||
| 146 | * | ||
| 147 | * The function returns the total length of the IP header (including any | ||
| 148 | * IP option fields), which is the same as the start offset of the IP data | ||
| 149 | * which in turn is the start offset of the TCP or UDP header. | ||
| 150 | * | ||
| 151 | * The function also returns the TCP or UDP pseudo header checksum, which | ||
| 152 | * should be used as the start value for the hardware checksum calculation. | ||
| 153 | * (Note that any actual pseudo header checksum can never calculate to | ||
| 154 | * zero.) | ||
| 155 | * | ||
| 156 | * Note: | ||
| 157 | * There is a bug in the GENESIS ASIC which may lead to wrong checksums. | ||
| 158 | * | ||
| 159 | * Arguments: | ||
| 160 | * pAc - A pointer to the adapter context struct. | ||
| 161 | * | ||
| 162 | * pIpHeader - Pointer to IP header. Must be at least the IP header *not* | ||
| 163 | * including any option fields, i.e. at least 20 bytes. | ||
| 164 | * | ||
| 165 | * Note: This pointer will be used to address 8-, 16-, and 32-bit | ||
| 166 | * variables with the respective alignment offsets relative to the pointer. | ||
| 167 | * Thus, the pointer should point to a 32-bit aligned address. If the | ||
| 168 | * target system cannot address 32-bit variables on non 32-bit aligned | ||
| 169 | * addresses, then the pointer *must* point to a 32-bit aligned address. | ||
| 170 | * | ||
| 171 | * pPacketInfo - A pointer to the packet information structure for this | ||
| 172 | * packet. Before calling this SkCsGetSendInfo(), the following field must | ||
| 173 | * be initialized: | ||
| 174 | * | ||
| 175 | * ProtocolFlags - Initialize with any combination of | ||
| 176 | * SKCS_PROTO_XXX bit flags. SkCsGetSendInfo() will only work on | ||
| 177 | * the protocols specified here. Any protocol(s) not specified | ||
| 178 | * here will be ignored. | ||
| 179 | * | ||
| 180 | * Note: Only one checksum can be calculated in hardware. Thus, if | ||
| 181 | * SKCS_PROTO_IP is specified in the 'ProtocolFlags', | ||
| 182 | * SkCsGetSendInfo() must calculate the IP header checksum in | ||
| 183 | * software. It might be a better idea to have the calling | ||
| 184 | * protocol stack calculate the IP header checksum. | ||
| 185 | * | ||
| 186 | * Returns: N/A | ||
| 187 | * On return, the following fields in 'pPacketInfo' may or may not have | ||
| 188 | * been filled with information, depending on the protocol(s) found in the | ||
| 189 | * packet: | ||
| 190 | * | ||
| 191 | * ProtocolFlags - Returns the SKCS_PROTO_XXX bit flags of the protocol(s) | ||
| 192 | * that were both requested by the caller and actually found in the packet. | ||
| 193 | * Protocol(s) not specified by the caller and/or not found in the packet | ||
| 194 | * will have their respective SKCS_PROTO_XXX bit flags reset. | ||
| 195 | * | ||
| 196 | * Note: For IP fragments, TCP and UDP packet information is ignored. | ||
| 197 | * | ||
| 198 | * IpHeaderLength - The total length in bytes of the complete IP header | ||
| 199 | * including any option fields is returned here. This is the start offset | ||
| 200 | * of the IP data, i.e. the TCP or UDP header if present. | ||
| 201 | * | ||
| 202 | * IpHeaderChecksum - If IP has been specified in the 'ProtocolFlags', the | ||
| 203 | * 16-bit Internet Checksum of the IP header is returned here. This value | ||
| 204 | * is to be stored into the packet's 'IP Header Checksum' field. | ||
| 205 | * | ||
| 206 | * PseudoHeaderChecksum - If this is a TCP or UDP packet and if TCP or UDP | ||
| 207 | * has been specified in the 'ProtocolFlags', the 16-bit Internet Checksum | ||
| 208 | * of the TCP or UDP pseudo header is returned here. | ||
| 209 | */ | ||
| 210 | void SkCsGetSendInfo( | ||
| 211 | SK_AC *pAc, /* Adapter context struct. */ | ||
| 212 | void *pIpHeader, /* IP header. */ | ||
| 213 | SKCS_PACKET_INFO *pPacketInfo, /* Packet information struct. */ | ||
| 214 | int NetNumber) /* Net number */ | ||
| 215 | { | ||
| 216 | /* Internet Header Version found in IP header. */ | ||
| 217 | unsigned InternetHeaderVersion; | ||
| 218 | |||
| 219 | /* Length of the IP header as found in IP header. */ | ||
| 220 | unsigned IpHeaderLength; | ||
| 221 | |||
| 222 | /* Bit field specifiying the desired/found protocols. */ | ||
| 223 | unsigned ProtocolFlags; | ||
| 224 | |||
| 225 | /* Next level protocol identifier found in IP header. */ | ||
| 226 | unsigned NextLevelProtocol; | ||
| 227 | |||
| 228 | /* Length of IP data portion. */ | ||
| 229 | unsigned IpDataLength; | ||
| 230 | |||
| 231 | /* TCP/UDP pseudo header checksum. */ | ||
| 232 | unsigned long PseudoHeaderChecksum; | ||
| 233 | |||
| 234 | /* Pointer to next level protocol statistics structure. */ | ||
| 235 | SKCS_PROTO_STATS *NextLevelProtoStats; | ||
| 236 | |||
| 237 | /* Temporary variable. */ | ||
| 238 | unsigned Tmp; | ||
| 239 | |||
| 240 | Tmp = *(SK_U8 *) | ||
| 241 | SKCS_IDX(pIpHeader, SKCS_OFS_IP_HEADER_VERSION_AND_LENGTH); | ||
| 242 | |||
| 243 | /* Get the Internet Header Version (IHV). */ | ||
| 244 | /* Note: The IHV is stored in the upper four bits. */ | ||
| 245 | |||
| 246 | InternetHeaderVersion = Tmp >> 4; | ||
| 247 | |||
| 248 | /* Check the Internet Header Version. */ | ||
| 249 | /* Note: We currently only support IP version 4. */ | ||
| 250 | |||
| 251 | if (InternetHeaderVersion != 4) { /* IPv4? */ | ||
| 252 | SK_DBG_MSG(pAc, SK_DBGMOD_CSUM, SK_DBGCAT_ERR | SK_DBGCAT_TX, | ||
| 253 | ("Tx: Unknown Internet Header Version %u.\n", | ||
| 254 | InternetHeaderVersion)); | ||
| 255 | pPacketInfo->ProtocolFlags = 0; | ||
| 256 | pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].TxUnableCts++; | ||
| 257 | return; | ||
| 258 | } | ||
| 259 | |||
| 260 | /* Get the IP header length (IHL). */ | ||
| 261 | /* | ||
| 262 | * Note: The IHL is stored in the lower four bits as the number of | ||
| 263 | * 4-byte words. | ||
| 264 | */ | ||
| 265 | |||
| 266 | IpHeaderLength = (Tmp & 0xf) * 4; | ||
| 267 | pPacketInfo->IpHeaderLength = IpHeaderLength; | ||
| 268 | |||
| 269 | /* Check the IP header length. */ | ||
| 270 | |||
| 271 | /* 04-Aug-1998 sw - Really check the IHL? Necessary? */ | ||
| 272 | |||
| 273 | if (IpHeaderLength < 5*4) { | ||
| 274 | SK_DBG_MSG(pAc, SK_DBGMOD_CSUM, SK_DBGCAT_ERR | SK_DBGCAT_TX, | ||
| 275 | ("Tx: Invalid IP Header Length %u.\n", IpHeaderLength)); | ||
| 276 | pPacketInfo->ProtocolFlags = 0; | ||
| 277 | pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].TxUnableCts++; | ||
| 278 | return; | ||
| 279 | } | ||
| 280 | |||
| 281 | /* This is an IPv4 frame with a header of valid length. */ | ||
| 282 | |||
| 283 | pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].TxOkCts++; | ||
| 284 | |||
| 285 | /* Check if we should calculate the IP header checksum. */ | ||
| 286 | |||
| 287 | ProtocolFlags = pPacketInfo->ProtocolFlags; | ||
| 288 | |||
| 289 | if (ProtocolFlags & SKCS_PROTO_IP) { | ||
| 290 | pPacketInfo->IpHeaderChecksum = | ||
| 291 | SkCsCalculateChecksum(pIpHeader, IpHeaderLength); | ||
| 292 | } | ||
| 293 | |||
| 294 | /* Get the next level protocol identifier. */ | ||
| 295 | |||
| 296 | NextLevelProtocol = | ||
| 297 | *(SK_U8 *) SKCS_IDX(pIpHeader, SKCS_OFS_IP_NEXT_LEVEL_PROTOCOL); | ||
| 298 | |||
| 299 | /* | ||
| 300 | * Check if this is a TCP or UDP frame and if we should calculate the | ||
| 301 | * TCP/UDP pseudo header checksum. | ||
| 302 | * | ||
| 303 | * Also clear all protocol bit flags of protocols not present in the | ||
| 304 | * frame. | ||
| 305 | */ | ||
| 306 | |||
| 307 | if ((ProtocolFlags & SKCS_PROTO_TCP) != 0 && | ||
| 308 | NextLevelProtocol == SKCS_PROTO_ID_TCP) { | ||
| 309 | /* TCP/IP frame. */ | ||
| 310 | ProtocolFlags &= SKCS_PROTO_TCP | SKCS_PROTO_IP; | ||
| 311 | NextLevelProtoStats = | ||
| 312 | &pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_TCP]; | ||
| 313 | } | ||
| 314 | else if ((ProtocolFlags & SKCS_PROTO_UDP) != 0 && | ||
| 315 | NextLevelProtocol == SKCS_PROTO_ID_UDP) { | ||
| 316 | /* UDP/IP frame. */ | ||
| 317 | ProtocolFlags &= SKCS_PROTO_UDP | SKCS_PROTO_IP; | ||
| 318 | NextLevelProtoStats = | ||
| 319 | &pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_UDP]; | ||
| 320 | } | ||
| 321 | else { | ||
| 322 | /* | ||
| 323 | * Either not a TCP or UDP frame and/or TCP/UDP processing not | ||
| 324 | * specified. | ||
| 325 | */ | ||
| 326 | pPacketInfo->ProtocolFlags = ProtocolFlags & SKCS_PROTO_IP; | ||
| 327 | return; | ||
| 328 | } | ||
| 329 | |||
| 330 | /* Check if this is an IP fragment. */ | ||
| 331 | |||
| 332 | /* | ||
| 333 | * Note: An IP fragment has a non-zero "Fragment Offset" field and/or | ||
| 334 | * the "More Fragments" bit set. Thus, if both the "Fragment Offset" | ||
| 335 | * and the "More Fragments" are zero, it is *not* a fragment. We can | ||
| 336 | * easily check both at the same time since they are in the same 16-bit | ||
| 337 | * word. | ||
| 338 | */ | ||
| 339 | |||
| 340 | if ((*(SK_U16 *) | ||
| 341 | SKCS_IDX(pIpHeader, SKCS_OFS_IP_FLAGS_AND_FRAGMENT_OFFSET) & | ||
| 342 | ~SKCS_IP_DONT_FRAGMENT) != 0) { | ||
| 343 | /* IP fragment; ignore all other protocols. */ | ||
| 344 | pPacketInfo->ProtocolFlags = ProtocolFlags & SKCS_PROTO_IP; | ||
| 345 | NextLevelProtoStats->TxUnableCts++; | ||
| 346 | return; | ||
| 347 | } | ||
| 348 | |||
| 349 | /* | ||
| 350 | * Calculate the TCP/UDP pseudo header checksum. | ||
| 351 | */ | ||
| 352 | |||
| 353 | /* Get total length of IP header and data. */ | ||
| 354 | |||
| 355 | IpDataLength = | ||
| 356 | *(SK_U16 *) SKCS_IDX(pIpHeader, SKCS_OFS_IP_TOTAL_LENGTH); | ||
| 357 | |||
| 358 | /* Get length of IP data portion. */ | ||
| 359 | |||
| 360 | IpDataLength = SKCS_NTOH16(IpDataLength) - IpHeaderLength; | ||
| 361 | |||
| 362 | /* Calculate the sum of all pseudo header fields (16-bit). */ | ||
| 363 | |||
| 364 | PseudoHeaderChecksum = | ||
| 365 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 366 | SKCS_OFS_IP_SOURCE_ADDRESS + 0) + | ||
| 367 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 368 | SKCS_OFS_IP_SOURCE_ADDRESS + 2) + | ||
| 369 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 370 | SKCS_OFS_IP_DESTINATION_ADDRESS + 0) + | ||
| 371 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 372 | SKCS_OFS_IP_DESTINATION_ADDRESS + 2) + | ||
| 373 | (unsigned long) SKCS_HTON16(NextLevelProtocol) + | ||
| 374 | (unsigned long) SKCS_HTON16(IpDataLength); | ||
| 375 | |||
| 376 | /* Add-in any carries. */ | ||
| 377 | |||
| 378 | SKCS_OC_ADD(PseudoHeaderChecksum, PseudoHeaderChecksum, 0); | ||
| 379 | |||
| 380 | /* Add-in any new carry. */ | ||
| 381 | |||
| 382 | SKCS_OC_ADD(pPacketInfo->PseudoHeaderChecksum, PseudoHeaderChecksum, 0); | ||
| 383 | |||
| 384 | pPacketInfo->ProtocolFlags = ProtocolFlags; | ||
| 385 | NextLevelProtoStats->TxOkCts++; /* Success. */ | ||
| 386 | } /* SkCsGetSendInfo */ | ||
| 387 | |||
| 388 | |||
| 389 | /****************************************************************************** | ||
| 390 | * | ||
| 391 | * SkCsGetReceiveInfo - verify checksum information for a received packet | ||
| 392 | * | ||
| 393 | * Description: | ||
| 394 | * Verify a received frame's checksum. The function returns a status code | ||
| 395 | * reflecting the result of the verification. | ||
| 396 | * | ||
| 397 | * Note: | ||
| 398 | * Before calling this function you have to verify that the frame is | ||
| 399 | * not padded and Checksum1 and Checksum2 are bigger than 1. | ||
| 400 | * | ||
| 401 | * Arguments: | ||
| 402 | * pAc - Pointer to adapter context struct. | ||
| 403 | * | ||
| 404 | * pIpHeader - Pointer to IP header. Must be at least the length in bytes | ||
| 405 | * of the received IP header including any option fields. For UDP packets, | ||
| 406 | * 8 additional bytes are needed to access the UDP checksum. | ||
| 407 | * | ||
| 408 | * Note: The actual length of the IP header is stored in the lower four | ||
| 409 | * bits of the first octet of the IP header as the number of 4-byte words, | ||
| 410 | * so it must be multiplied by four to get the length in bytes. Thus, the | ||
| 411 | * maximum IP header length is 15 * 4 = 60 bytes. | ||
| 412 | * | ||
| 413 | * Checksum1 - The first 16-bit Internet Checksum calculated by the | ||
| 414 | * hardware starting at the offset returned by SkCsSetReceiveFlags(). | ||
| 415 | * | ||
| 416 | * Checksum2 - The second 16-bit Internet Checksum calculated by the | ||
| 417 | * hardware starting at the offset returned by SkCsSetReceiveFlags(). | ||
| 418 | * | ||
| 419 | * Returns: | ||
| 420 | * SKCS_STATUS_UNKNOWN_IP_VERSION - Not an IP v4 frame. | ||
| 421 | * SKCS_STATUS_IP_CSUM_ERROR - IP checksum error. | ||
| 422 | * SKCS_STATUS_IP_CSUM_ERROR_TCP - IP checksum error in TCP frame. | ||
| 423 | * SKCS_STATUS_IP_CSUM_ERROR_UDP - IP checksum error in UDP frame | ||
| 424 | * SKCS_STATUS_IP_FRAGMENT - IP fragment (IP checksum ok). | ||
| 425 | * SKCS_STATUS_IP_CSUM_OK - IP checksum ok (not a TCP or UDP frame). | ||
| 426 | * SKCS_STATUS_TCP_CSUM_ERROR - TCP checksum error (IP checksum ok). | ||
| 427 | * SKCS_STATUS_UDP_CSUM_ERROR - UDP checksum error (IP checksum ok). | ||
| 428 | * SKCS_STATUS_TCP_CSUM_OK - IP and TCP checksum ok. | ||
| 429 | * SKCS_STATUS_UDP_CSUM_OK - IP and UDP checksum ok. | ||
| 430 | * SKCS_STATUS_IP_CSUM_OK_NO_UDP - IP checksum OK and no UDP checksum. | ||
| 431 | * | ||
| 432 | * Note: If SKCS_OVERWRITE_STATUS is defined, the SKCS_STATUS_XXX values | ||
| 433 | * returned here can be defined in some header file by the module using CSUM. | ||
| 434 | * In this way, the calling module can assign return values for its own needs, | ||
| 435 | * e.g. by assigning bit flags to the individual protocols. | ||
| 436 | */ | ||
| 437 | SKCS_STATUS SkCsGetReceiveInfo( | ||
| 438 | SK_AC *pAc, /* Adapter context struct. */ | ||
| 439 | void *pIpHeader, /* IP header. */ | ||
| 440 | unsigned Checksum1, /* Hardware checksum 1. */ | ||
| 441 | unsigned Checksum2, /* Hardware checksum 2. */ | ||
| 442 | int NetNumber) /* Net number */ | ||
| 443 | { | ||
| 444 | /* Internet Header Version found in IP header. */ | ||
| 445 | unsigned InternetHeaderVersion; | ||
| 446 | |||
| 447 | /* Length of the IP header as found in IP header. */ | ||
| 448 | unsigned IpHeaderLength; | ||
| 449 | |||
| 450 | /* Length of IP data portion. */ | ||
| 451 | unsigned IpDataLength; | ||
| 452 | |||
| 453 | /* IP header checksum. */ | ||
| 454 | unsigned IpHeaderChecksum; | ||
| 455 | |||
| 456 | /* IP header options checksum, if any. */ | ||
| 457 | unsigned IpOptionsChecksum; | ||
| 458 | |||
| 459 | /* IP data checksum, i.e. TCP/UDP checksum. */ | ||
| 460 | unsigned IpDataChecksum; | ||
| 461 | |||
| 462 | /* Next level protocol identifier found in IP header. */ | ||
| 463 | unsigned NextLevelProtocol; | ||
| 464 | |||
| 465 | /* The checksum of the "next level protocol", i.e. TCP or UDP. */ | ||
| 466 | unsigned long NextLevelProtocolChecksum; | ||
| 467 | |||
| 468 | /* Pointer to next level protocol statistics structure. */ | ||
| 469 | SKCS_PROTO_STATS *NextLevelProtoStats; | ||
| 470 | |||
| 471 | /* Temporary variable. */ | ||
| 472 | unsigned Tmp; | ||
| 473 | |||
| 474 | Tmp = *(SK_U8 *) | ||
| 475 | SKCS_IDX(pIpHeader, SKCS_OFS_IP_HEADER_VERSION_AND_LENGTH); | ||
| 476 | |||
| 477 | /* Get the Internet Header Version (IHV). */ | ||
| 478 | /* Note: The IHV is stored in the upper four bits. */ | ||
| 479 | |||
| 480 | InternetHeaderVersion = Tmp >> 4; | ||
| 481 | |||
| 482 | /* Check the Internet Header Version. */ | ||
| 483 | /* Note: We currently only support IP version 4. */ | ||
| 484 | |||
| 485 | if (InternetHeaderVersion != 4) { /* IPv4? */ | ||
| 486 | SK_DBG_MSG(pAc, SK_DBGMOD_CSUM, SK_DBGCAT_ERR | SK_DBGCAT_RX, | ||
| 487 | ("Rx: Unknown Internet Header Version %u.\n", | ||
| 488 | InternetHeaderVersion)); | ||
| 489 | pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].RxUnableCts++; | ||
| 490 | return (SKCS_STATUS_UNKNOWN_IP_VERSION); | ||
| 491 | } | ||
| 492 | |||
| 493 | /* Get the IP header length (IHL). */ | ||
| 494 | /* | ||
| 495 | * Note: The IHL is stored in the lower four bits as the number of | ||
| 496 | * 4-byte words. | ||
| 497 | */ | ||
| 498 | |||
| 499 | IpHeaderLength = (Tmp & 0xf) * 4; | ||
| 500 | |||
| 501 | /* Check the IP header length. */ | ||
| 502 | |||
| 503 | /* 04-Aug-1998 sw - Really check the IHL? Necessary? */ | ||
| 504 | |||
| 505 | if (IpHeaderLength < 5*4) { | ||
| 506 | SK_DBG_MSG(pAc, SK_DBGMOD_CSUM, SK_DBGCAT_ERR | SK_DBGCAT_RX, | ||
| 507 | ("Rx: Invalid IP Header Length %u.\n", IpHeaderLength)); | ||
| 508 | pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].RxErrCts++; | ||
| 509 | return (SKCS_STATUS_IP_CSUM_ERROR); | ||
| 510 | } | ||
| 511 | |||
| 512 | /* This is an IPv4 frame with a header of valid length. */ | ||
| 513 | |||
| 514 | /* Get the IP header and data checksum. */ | ||
| 515 | |||
| 516 | IpDataChecksum = Checksum2; | ||
| 517 | |||
| 518 | /* | ||
| 519 | * The IP header checksum is calculated as follows: | ||
| 520 | * | ||
| 521 | * IpHeaderChecksum = Checksum1 - Checksum2 | ||
| 522 | */ | ||
| 523 | |||
| 524 | SKCS_OC_SUB(IpHeaderChecksum, Checksum1, Checksum2); | ||
| 525 | |||
| 526 | /* Check if any IP header options. */ | ||
| 527 | |||
| 528 | if (IpHeaderLength > SKCS_IP_HEADER_SIZE) { | ||
| 529 | |||
| 530 | /* Get the IP options checksum. */ | ||
| 531 | |||
| 532 | IpOptionsChecksum = SkCsCalculateChecksum( | ||
| 533 | SKCS_IDX(pIpHeader, SKCS_IP_HEADER_SIZE), | ||
| 534 | IpHeaderLength - SKCS_IP_HEADER_SIZE); | ||
| 535 | |||
| 536 | /* Adjust the IP header and IP data checksums. */ | ||
| 537 | |||
| 538 | SKCS_OC_ADD(IpHeaderChecksum, IpHeaderChecksum, IpOptionsChecksum); | ||
| 539 | |||
| 540 | SKCS_OC_SUB(IpDataChecksum, IpDataChecksum, IpOptionsChecksum); | ||
| 541 | } | ||
| 542 | |||
| 543 | /* | ||
| 544 | * Check if the IP header checksum is ok. | ||
| 545 | * | ||
| 546 | * NOTE: We must check the IP header checksum even if the caller just wants | ||
| 547 | * us to check upper-layer checksums, because we cannot do any further | ||
| 548 | * processing of the packet without a valid IP checksum. | ||
| 549 | */ | ||
| 550 | |||
| 551 | /* Get the next level protocol identifier. */ | ||
| 552 | |||
| 553 | NextLevelProtocol = *(SK_U8 *) | ||
| 554 | SKCS_IDX(pIpHeader, SKCS_OFS_IP_NEXT_LEVEL_PROTOCOL); | ||
| 555 | |||
| 556 | if (IpHeaderChecksum != 0xffff) { | ||
| 557 | pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].RxErrCts++; | ||
| 558 | /* the NDIS tester wants to know the upper level protocol too */ | ||
| 559 | if (NextLevelProtocol == SKCS_PROTO_ID_TCP) { | ||
| 560 | return(SKCS_STATUS_IP_CSUM_ERROR_TCP); | ||
| 561 | } | ||
| 562 | else if (NextLevelProtocol == SKCS_PROTO_ID_UDP) { | ||
| 563 | return(SKCS_STATUS_IP_CSUM_ERROR_UDP); | ||
| 564 | } | ||
| 565 | return (SKCS_STATUS_IP_CSUM_ERROR); | ||
| 566 | } | ||
| 567 | |||
| 568 | /* | ||
| 569 | * Check if this is a TCP or UDP frame and if we should calculate the | ||
| 570 | * TCP/UDP pseudo header checksum. | ||
| 571 | * | ||
| 572 | * Also clear all protocol bit flags of protocols not present in the | ||
| 573 | * frame. | ||
| 574 | */ | ||
| 575 | |||
| 576 | if ((pAc->Csum.ReceiveFlags[NetNumber] & SKCS_PROTO_TCP) != 0 && | ||
| 577 | NextLevelProtocol == SKCS_PROTO_ID_TCP) { | ||
| 578 | /* TCP/IP frame. */ | ||
| 579 | NextLevelProtoStats = | ||
| 580 | &pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_TCP]; | ||
| 581 | } | ||
| 582 | else if ((pAc->Csum.ReceiveFlags[NetNumber] & SKCS_PROTO_UDP) != 0 && | ||
| 583 | NextLevelProtocol == SKCS_PROTO_ID_UDP) { | ||
| 584 | /* UDP/IP frame. */ | ||
| 585 | NextLevelProtoStats = | ||
| 586 | &pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_UDP]; | ||
| 587 | } | ||
| 588 | else { | ||
| 589 | /* | ||
| 590 | * Either not a TCP or UDP frame and/or TCP/UDP processing not | ||
| 591 | * specified. | ||
| 592 | */ | ||
| 593 | return (SKCS_STATUS_IP_CSUM_OK); | ||
| 594 | } | ||
| 595 | |||
| 596 | /* Check if this is an IP fragment. */ | ||
| 597 | |||
| 598 | /* | ||
| 599 | * Note: An IP fragment has a non-zero "Fragment Offset" field and/or | ||
| 600 | * the "More Fragments" bit set. Thus, if both the "Fragment Offset" | ||
| 601 | * and the "More Fragments" are zero, it is *not* a fragment. We can | ||
| 602 | * easily check both at the same time since they are in the same 16-bit | ||
| 603 | * word. | ||
| 604 | */ | ||
| 605 | |||
| 606 | if ((*(SK_U16 *) | ||
| 607 | SKCS_IDX(pIpHeader, SKCS_OFS_IP_FLAGS_AND_FRAGMENT_OFFSET) & | ||
| 608 | ~SKCS_IP_DONT_FRAGMENT) != 0) { | ||
| 609 | /* IP fragment; ignore all other protocols. */ | ||
| 610 | NextLevelProtoStats->RxUnableCts++; | ||
| 611 | return (SKCS_STATUS_IP_FRAGMENT); | ||
| 612 | } | ||
| 613 | |||
| 614 | /* | ||
| 615 | * 08-May-2000 ra | ||
| 616 | * | ||
| 617 | * From RFC 768 (UDP) | ||
| 618 | * If the computed checksum is zero, it is transmitted as all ones (the | ||
| 619 | * equivalent in one's complement arithmetic). An all zero transmitted | ||
| 620 | * checksum value means that the transmitter generated no checksum (for | ||
| 621 | * debugging or for higher level protocols that don't care). | ||
| 622 | */ | ||
| 623 | |||
| 624 | if (NextLevelProtocol == SKCS_PROTO_ID_UDP && | ||
| 625 | *(SK_U16*)SKCS_IDX(pIpHeader, IpHeaderLength + 6) == 0x0000) { | ||
| 626 | |||
| 627 | NextLevelProtoStats->RxOkCts++; | ||
| 628 | |||
| 629 | return (SKCS_STATUS_IP_CSUM_OK_NO_UDP); | ||
| 630 | } | ||
| 631 | |||
| 632 | /* | ||
| 633 | * Calculate the TCP/UDP checksum. | ||
| 634 | */ | ||
| 635 | |||
| 636 | /* Get total length of IP header and data. */ | ||
| 637 | |||
| 638 | IpDataLength = | ||
| 639 | *(SK_U16 *) SKCS_IDX(pIpHeader, SKCS_OFS_IP_TOTAL_LENGTH); | ||
| 640 | |||
| 641 | /* Get length of IP data portion. */ | ||
| 642 | |||
| 643 | IpDataLength = SKCS_NTOH16(IpDataLength) - IpHeaderLength; | ||
| 644 | |||
| 645 | NextLevelProtocolChecksum = | ||
| 646 | |||
| 647 | /* Calculate the pseudo header checksum. */ | ||
| 648 | |||
| 649 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 650 | SKCS_OFS_IP_SOURCE_ADDRESS + 0) + | ||
| 651 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 652 | SKCS_OFS_IP_SOURCE_ADDRESS + 2) + | ||
| 653 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 654 | SKCS_OFS_IP_DESTINATION_ADDRESS + 0) + | ||
| 655 | (unsigned long) *(SK_U16 *) SKCS_IDX(pIpHeader, | ||
| 656 | SKCS_OFS_IP_DESTINATION_ADDRESS + 2) + | ||
| 657 | (unsigned long) SKCS_HTON16(NextLevelProtocol) + | ||
| 658 | (unsigned long) SKCS_HTON16(IpDataLength) + | ||
| 659 | |||
| 660 | /* Add the TCP/UDP header checksum. */ | ||
| 661 | |||
| 662 | (unsigned long) IpDataChecksum; | ||
| 663 | |||
| 664 | /* Add-in any carries. */ | ||
| 665 | |||
| 666 | SKCS_OC_ADD(NextLevelProtocolChecksum, NextLevelProtocolChecksum, 0); | ||
| 667 | |||
| 668 | /* Add-in any new carry. */ | ||
| 669 | |||
| 670 | SKCS_OC_ADD(NextLevelProtocolChecksum, NextLevelProtocolChecksum, 0); | ||
| 671 | |||
| 672 | /* Check if the TCP/UDP checksum is ok. */ | ||
| 673 | |||
| 674 | if ((unsigned) NextLevelProtocolChecksum == 0xffff) { | ||
| 675 | |||
| 676 | /* TCP/UDP checksum ok. */ | ||
| 677 | |||
| 678 | NextLevelProtoStats->RxOkCts++; | ||
| 679 | |||
| 680 | return (NextLevelProtocol == SKCS_PROTO_ID_TCP ? | ||
| 681 | SKCS_STATUS_TCP_CSUM_OK : SKCS_STATUS_UDP_CSUM_OK); | ||
| 682 | } | ||
| 683 | |||
| 684 | /* TCP/UDP checksum error. */ | ||
| 685 | |||
| 686 | NextLevelProtoStats->RxErrCts++; | ||
| 687 | |||
| 688 | return (NextLevelProtocol == SKCS_PROTO_ID_TCP ? | ||
| 689 | SKCS_STATUS_TCP_CSUM_ERROR : SKCS_STATUS_UDP_CSUM_ERROR); | ||
| 690 | } /* SkCsGetReceiveInfo */ | ||
| 691 | |||
| 692 | |||
| 693 | /****************************************************************************** | ||
| 694 | * | ||
| 695 | * SkCsSetReceiveFlags - set checksum receive flags | ||
| 696 | * | ||
| 697 | * Description: | ||
| 698 | * Use this function to set the various receive flags. According to the | ||
| 699 | * protocol flags set by the caller, the start offsets within received | ||
| 700 | * packets of the two hardware checksums are returned. These offsets must | ||
| 701 | * be stored in all receive descriptors. | ||
| 702 | * | ||
| 703 | * Arguments: | ||
| 704 | * pAc - Pointer to adapter context struct. | ||
| 705 | * | ||
| 706 | * ReceiveFlags - Any combination of SK_PROTO_XXX flags of the protocols | ||
| 707 | * for which the caller wants checksum information on received frames. | ||
| 708 | * | ||
| 709 | * pChecksum1Offset - The start offset of the first receive descriptor | ||
| 710 | * hardware checksum to be calculated for received frames is returned | ||
| 711 | * here. | ||
| 712 | * | ||
| 713 | * pChecksum2Offset - The start offset of the second receive descriptor | ||
| 714 | * hardware checksum to be calculated for received frames is returned | ||
| 715 | * here. | ||
| 716 | * | ||
| 717 | * Returns: N/A | ||
| 718 | * Returns the two hardware checksum start offsets. | ||
| 719 | */ | ||
| 720 | void SkCsSetReceiveFlags( | ||
| 721 | SK_AC *pAc, /* Adapter context struct. */ | ||
| 722 | unsigned ReceiveFlags, /* New receive flags. */ | ||
| 723 | unsigned *pChecksum1Offset, /* Offset for hardware checksum 1. */ | ||
| 724 | unsigned *pChecksum2Offset, /* Offset for hardware checksum 2. */ | ||
| 725 | int NetNumber) | ||
| 726 | { | ||
| 727 | /* Save the receive flags. */ | ||
| 728 | |||
| 729 | pAc->Csum.ReceiveFlags[NetNumber] = ReceiveFlags; | ||
| 730 | |||
| 731 | /* First checksum start offset is the IP header. */ | ||
| 732 | *pChecksum1Offset = SKCS_MAC_HEADER_SIZE; | ||
| 733 | |||
| 734 | /* | ||
| 735 | * Second checksum start offset is the IP data. Note that this may vary | ||
| 736 | * if there are any IP header options in the actual packet. | ||
| 737 | */ | ||
| 738 | *pChecksum2Offset = SKCS_MAC_HEADER_SIZE + SKCS_IP_HEADER_SIZE; | ||
| 739 | } /* SkCsSetReceiveFlags */ | ||
| 740 | |||
| 741 | #ifndef SK_CS_CALCULATE_CHECKSUM | ||
| 742 | |||
| 743 | /****************************************************************************** | ||
| 744 | * | ||
| 745 | * SkCsCalculateChecksum - calculate checksum for specified data | ||
| 746 | * | ||
| 747 | * Description: | ||
| 748 | * Calculate and return the 16-bit Internet Checksum for the specified | ||
| 749 | * data. | ||
| 750 | * | ||
| 751 | * Arguments: | ||
| 752 | * pData - Pointer to data for which the checksum shall be calculated. | ||
| 753 | * Note: The pointer should be aligned on a 16-bit boundary. | ||
| 754 | * | ||
| 755 | * Length - Length in bytes of data to checksum. | ||
| 756 | * | ||
| 757 | * Returns: | ||
| 758 | * The 16-bit Internet Checksum for the specified data. | ||
| 759 | * | ||
| 760 | * Note: The checksum is calculated in the machine's natural byte order, | ||
| 761 | * i.e. little vs. big endian. Thus, the resulting checksum is different | ||
| 762 | * for the same input data on little and big endian machines. | ||
| 763 | * | ||
| 764 | * However, when written back to the network packet, the byte order is | ||
| 765 | * always in correct network order. | ||
| 766 | */ | ||
| 767 | unsigned SkCsCalculateChecksum( | ||
| 768 | void *pData, /* Data to checksum. */ | ||
| 769 | unsigned Length) /* Length of data. */ | ||
| 770 | { | ||
| 771 | SK_U16 *pU16; /* Pointer to the data as 16-bit words. */ | ||
| 772 | unsigned long Checksum; /* Checksum; must be at least 32 bits. */ | ||
| 773 | |||
| 774 | /* Sum up all 16-bit words. */ | ||
| 775 | |||
| 776 | pU16 = (SK_U16 *) pData; | ||
| 777 | for (Checksum = 0; Length > 1; Length -= 2) { | ||
| 778 | Checksum += *pU16++; | ||
| 779 | } | ||
| 780 | |||
| 781 | /* If this is an odd number of bytes, add-in the last byte. */ | ||
| 782 | |||
| 783 | if (Length > 0) { | ||
| 784 | #ifdef SK_BIG_ENDIAN | ||
| 785 | /* Add the last byte as the high byte. */ | ||
| 786 | Checksum += ((unsigned) *(SK_U8 *) pU16) << 8; | ||
| 787 | #else /* !SK_BIG_ENDIAN */ | ||
| 788 | /* Add the last byte as the low byte. */ | ||
| 789 | Checksum += *(SK_U8 *) pU16; | ||
| 790 | #endif /* !SK_BIG_ENDIAN */ | ||
| 791 | } | ||
| 792 | |||
| 793 | /* Add-in any carries. */ | ||
| 794 | |||
| 795 | SKCS_OC_ADD(Checksum, Checksum, 0); | ||
| 796 | |||
| 797 | /* Add-in any new carry. */ | ||
| 798 | |||
| 799 | SKCS_OC_ADD(Checksum, Checksum, 0); | ||
| 800 | |||
| 801 | /* Note: All bits beyond the 16-bit limit are now zero. */ | ||
| 802 | |||
| 803 | return ((unsigned) Checksum); | ||
| 804 | } /* SkCsCalculateChecksum */ | ||
| 805 | |||
| 806 | #endif /* SK_CS_CALCULATE_CHECKSUM */ | ||
| 807 | |||
| 808 | /****************************************************************************** | ||
| 809 | * | ||
| 810 | * SkCsEvent - the CSUM event dispatcher | ||
| 811 | * | ||
| 812 | * Description: | ||
| 813 | * This is the event handler for the CSUM module. | ||
| 814 | * | ||
| 815 | * Arguments: | ||
| 816 | * pAc - Pointer to adapter context. | ||
| 817 | * | ||
| 818 | * Ioc - I/O context. | ||
| 819 | * | ||
| 820 | * Event - Event id. | ||
| 821 | * | ||
| 822 | * Param - Event dependent parameter. | ||
| 823 | * | ||
| 824 | * Returns: | ||
| 825 | * The 16-bit Internet Checksum for the specified data. | ||
| 826 | * | ||
| 827 | * Note: The checksum is calculated in the machine's natural byte order, | ||
| 828 | * i.e. little vs. big endian. Thus, the resulting checksum is different | ||
| 829 | * for the same input data on little and big endian machines. | ||
| 830 | * | ||
| 831 | * However, when written back to the network packet, the byte order is | ||
| 832 | * always in correct network order. | ||
| 833 | */ | ||
| 834 | int SkCsEvent( | ||
| 835 | SK_AC *pAc, /* Pointer to adapter context. */ | ||
| 836 | SK_IOC Ioc, /* I/O context. */ | ||
| 837 | SK_U32 Event, /* Event id. */ | ||
| 838 | SK_EVPARA Param) /* Event dependent parameter. */ | ||
| 839 | { | ||
| 840 | int ProtoIndex; | ||
| 841 | int NetNumber; | ||
| 842 | |||
| 843 | switch (Event) { | ||
| 844 | /* | ||
| 845 | * Clear protocol statistics. | ||
| 846 | * | ||
| 847 | * Param - Protocol index, or -1 for all protocols. | ||
| 848 | * - Net number. | ||
| 849 | */ | ||
| 850 | case SK_CSUM_EVENT_CLEAR_PROTO_STATS: | ||
| 851 | |||
| 852 | ProtoIndex = (int)Param.Para32[1]; | ||
| 853 | NetNumber = (int)Param.Para32[0]; | ||
| 854 | if (ProtoIndex < 0) { /* Clear for all protocols. */ | ||
| 855 | if (NetNumber >= 0) { | ||
| 856 | SK_MEMSET(&pAc->Csum.ProtoStats[NetNumber][0], 0, | ||
| 857 | sizeof(pAc->Csum.ProtoStats[NetNumber])); | ||
| 858 | } | ||
| 859 | } | ||
| 860 | else { /* Clear for individual protocol. */ | ||
| 861 | SK_MEMSET(&pAc->Csum.ProtoStats[NetNumber][ProtoIndex], 0, | ||
| 862 | sizeof(pAc->Csum.ProtoStats[NetNumber][ProtoIndex])); | ||
| 863 | } | ||
| 864 | break; | ||
| 865 | default: | ||
| 866 | break; | ||
| 867 | } | ||
| 868 | return (0); /* Success. */ | ||
| 869 | } /* SkCsEvent */ | ||
| 870 | |||
| 871 | #endif /* SK_USE_CSUM */ | ||
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c index fb639959292b..b71769ae4603 100644 --- a/drivers/net/sk98lin/skethtool.c +++ b/drivers/net/sk98lin/skethtool.c | |||
| @@ -549,4 +549,6 @@ struct ethtool_ops SkGeEthtoolOps = { | |||
| 549 | .phys_id = locateDevice, | 549 | .phys_id = locateDevice, |
| 550 | .get_pauseparam = getPauseParams, | 550 | .get_pauseparam = getPauseParams, |
| 551 | .set_pauseparam = setPauseParams, | 551 | .set_pauseparam = setPauseParams, |
| 552 | .get_link = ethtool_op_get_link, | ||
| 553 | .get_perm_addr = ethtool_op_get_perm_addr, | ||
| 552 | }; | 554 | }; |
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index b18c92cb629e..00c5d7f04c68 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c | |||
| @@ -101,7 +101,6 @@ | |||
| 101 | * "h/skgeinit.h" | 101 | * "h/skgeinit.h" |
| 102 | * "h/skaddr.h" | 102 | * "h/skaddr.h" |
| 103 | * "h/skgesirq.h" | 103 | * "h/skgesirq.h" |
| 104 | * "h/skcsum.h" | ||
| 105 | * "h/skrlmt.h" | 104 | * "h/skrlmt.h" |
| 106 | * | 105 | * |
| 107 | ******************************************************************************/ | 106 | ******************************************************************************/ |
| @@ -113,6 +112,7 @@ | |||
| 113 | #include <linux/init.h> | 112 | #include <linux/init.h> |
| 114 | #include <linux/proc_fs.h> | 113 | #include <linux/proc_fs.h> |
| 115 | #include <linux/dma-mapping.h> | 114 | #include <linux/dma-mapping.h> |
| 115 | #include <linux/ip.h> | ||
| 116 | 116 | ||
| 117 | #include "h/skdrv1st.h" | 117 | #include "h/skdrv1st.h" |
| 118 | #include "h/skdrv2nd.h" | 118 | #include "h/skdrv2nd.h" |
| @@ -601,11 +601,6 @@ SK_BOOL DualNet; | |||
| 601 | return(-EAGAIN); | 601 | return(-EAGAIN); |
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | SkCsSetReceiveFlags(pAC, | ||
| 605 | SKCS_PROTO_IP | SKCS_PROTO_TCP | SKCS_PROTO_UDP, | ||
| 606 | &pAC->CsOfs1, &pAC->CsOfs2, 0); | ||
| 607 | pAC->CsOfs = (pAC->CsOfs2 << 16) | pAC->CsOfs1; | ||
| 608 | |||
| 609 | BoardInitMem(pAC); | 604 | BoardInitMem(pAC); |
| 610 | /* tschilling: New common function with minimum size check. */ | 605 | /* tschilling: New common function with minimum size check. */ |
| 611 | DualNet = SK_FALSE; | 606 | DualNet = SK_FALSE; |
| @@ -823,7 +818,7 @@ uintptr_t VNextDescr; /* the virtual bus address of the next descriptor */ | |||
| 823 | /* set the pointers right */ | 818 | /* set the pointers right */ |
| 824 | pDescr->VNextRxd = VNextDescr & 0xffffffffULL; | 819 | pDescr->VNextRxd = VNextDescr & 0xffffffffULL; |
| 825 | pDescr->pNextRxd = pNextDescr; | 820 | pDescr->pNextRxd = pNextDescr; |
| 826 | pDescr->TcpSumStarts = pAC->CsOfs; | 821 | pDescr->TcpSumStarts = 0; |
| 827 | 822 | ||
| 828 | /* advance one step */ | 823 | /* advance one step */ |
| 829 | pPrevDescr = pDescr; | 824 | pPrevDescr = pDescr; |
| @@ -1505,8 +1500,6 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1505 | TXD *pOldTxd; | 1500 | TXD *pOldTxd; |
| 1506 | unsigned long Flags; | 1501 | unsigned long Flags; |
| 1507 | SK_U64 PhysAddr; | 1502 | SK_U64 PhysAddr; |
| 1508 | int Protocol; | ||
| 1509 | int IpHeaderLength; | ||
| 1510 | int BytesSend = pMessage->len; | 1503 | int BytesSend = pMessage->len; |
| 1511 | 1504 | ||
| 1512 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS, ("X")); | 1505 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS, ("X")); |
| @@ -1579,8 +1572,10 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1579 | pTxd->pMBuf = pMessage; | 1572 | pTxd->pMBuf = pMessage; |
| 1580 | 1573 | ||
| 1581 | if (pMessage->ip_summed == CHECKSUM_HW) { | 1574 | if (pMessage->ip_summed == CHECKSUM_HW) { |
| 1582 | Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff); | 1575 | u16 hdrlen = pMessage->h.raw - pMessage->data; |
| 1583 | if ((Protocol == C_PROTO_ID_UDP) && | 1576 | u16 offset = hdrlen + pMessage->csum; |
| 1577 | |||
| 1578 | if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) && | ||
| 1584 | (pAC->GIni.GIChipRev == 0) && | 1579 | (pAC->GIni.GIChipRev == 0) && |
| 1585 | (pAC->GIni.GIChipId == CHIP_ID_YUKON)) { | 1580 | (pAC->GIni.GIChipId == CHIP_ID_YUKON)) { |
| 1586 | pTxd->TBControl = BMU_TCP_CHECK; | 1581 | pTxd->TBControl = BMU_TCP_CHECK; |
| @@ -1588,14 +1583,9 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1588 | pTxd->TBControl = BMU_UDP_CHECK; | 1583 | pTxd->TBControl = BMU_UDP_CHECK; |
| 1589 | } | 1584 | } |
| 1590 | 1585 | ||
| 1591 | IpHeaderLength = (SK_U8)pMessage->data[C_OFFSET_IPHEADER]; | 1586 | pTxd->TcpSumOfs = 0; |
| 1592 | IpHeaderLength = (IpHeaderLength & 0xf) * 4; | 1587 | pTxd->TcpSumSt = hdrlen; |
| 1593 | pTxd->TcpSumOfs = 0; /* PH-Checksum already calculated */ | 1588 | pTxd->TcpSumWr = offset; |
| 1594 | pTxd->TcpSumSt = C_LEN_ETHERMAC_HEADER + IpHeaderLength + | ||
| 1595 | (Protocol == C_PROTO_ID_UDP ? | ||
| 1596 | C_OFFSET_UDPHEADER_UDPCS : | ||
| 1597 | C_OFFSET_TCPHEADER_TCPCS); | ||
| 1598 | pTxd->TcpSumWr = C_LEN_ETHERMAC_HEADER + IpHeaderLength; | ||
| 1599 | 1589 | ||
| 1600 | pTxd->TBControl |= BMU_OWN | BMU_STF | | 1590 | pTxd->TBControl |= BMU_OWN | BMU_STF | |
| 1601 | BMU_SW | BMU_EOF | | 1591 | BMU_SW | BMU_EOF | |
| @@ -1658,11 +1648,10 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1658 | TXD *pTxdLst; | 1648 | TXD *pTxdLst; |
| 1659 | int CurrFrag; | 1649 | int CurrFrag; |
| 1660 | int BytesSend; | 1650 | int BytesSend; |
| 1661 | int IpHeaderLength; | ||
| 1662 | int Protocol; | ||
| 1663 | skb_frag_t *sk_frag; | 1651 | skb_frag_t *sk_frag; |
| 1664 | SK_U64 PhysAddr; | 1652 | SK_U64 PhysAddr; |
| 1665 | unsigned long Flags; | 1653 | unsigned long Flags; |
| 1654 | SK_U32 Control; | ||
| 1666 | 1655 | ||
| 1667 | spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags); | 1656 | spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags); |
| 1668 | #ifndef USE_TX_COMPLETE | 1657 | #ifndef USE_TX_COMPLETE |
| @@ -1685,7 +1674,6 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1685 | pTxdFst = pTxd; | 1674 | pTxdFst = pTxd; |
| 1686 | pTxdLst = pTxd; | 1675 | pTxdLst = pTxd; |
| 1687 | BytesSend = 0; | 1676 | BytesSend = 0; |
| 1688 | Protocol = 0; | ||
| 1689 | 1677 | ||
| 1690 | /* | 1678 | /* |
| 1691 | ** Map the first fragment (header) into the DMA-space | 1679 | ** Map the first fragment (header) into the DMA-space |
| @@ -1703,32 +1691,31 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1703 | ** Does the HW need to evaluate checksum for TCP or UDP packets? | 1691 | ** Does the HW need to evaluate checksum for TCP or UDP packets? |
| 1704 | */ | 1692 | */ |
| 1705 | if (pMessage->ip_summed == CHECKSUM_HW) { | 1693 | if (pMessage->ip_summed == CHECKSUM_HW) { |
| 1706 | pTxd->TBControl = BMU_STF | BMU_STFWD | skb_headlen(pMessage); | 1694 | u16 hdrlen = pMessage->h.raw - pMessage->data; |
| 1695 | u16 offset = hdrlen + pMessage->csum; | ||
| 1696 | |||
| 1697 | Control = BMU_STFWD; | ||
| 1698 | |||
| 1707 | /* | 1699 | /* |
| 1708 | ** We have to use the opcode for tcp here, because the | 1700 | ** We have to use the opcode for tcp here, because the |
| 1709 | ** opcode for udp is not working in the hardware yet | 1701 | ** opcode for udp is not working in the hardware yet |
| 1710 | ** (Revision 2.0) | 1702 | ** (Revision 2.0) |
| 1711 | */ | 1703 | */ |
| 1712 | Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff); | 1704 | if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) && |
| 1713 | if ((Protocol == C_PROTO_ID_UDP) && | ||
| 1714 | (pAC->GIni.GIChipRev == 0) && | 1705 | (pAC->GIni.GIChipRev == 0) && |
| 1715 | (pAC->GIni.GIChipId == CHIP_ID_YUKON)) { | 1706 | (pAC->GIni.GIChipId == CHIP_ID_YUKON)) { |
| 1716 | pTxd->TBControl |= BMU_TCP_CHECK; | 1707 | Control |= BMU_TCP_CHECK; |
| 1717 | } else { | 1708 | } else { |
| 1718 | pTxd->TBControl |= BMU_UDP_CHECK; | 1709 | Control |= BMU_UDP_CHECK; |
| 1719 | } | 1710 | } |
| 1720 | 1711 | ||
| 1721 | IpHeaderLength = ((SK_U8)pMessage->data[C_OFFSET_IPHEADER] & 0xf)*4; | 1712 | pTxd->TcpSumOfs = 0; |
| 1722 | pTxd->TcpSumOfs = 0; /* PH-Checksum already claculated */ | 1713 | pTxd->TcpSumSt = hdrlen; |
| 1723 | pTxd->TcpSumSt = C_LEN_ETHERMAC_HEADER + IpHeaderLength + | 1714 | pTxd->TcpSumWr = offset; |
| 1724 | (Protocol == C_PROTO_ID_UDP ? | 1715 | } else |
| 1725 | C_OFFSET_UDPHEADER_UDPCS : | 1716 | Control = BMU_CHECK | BMU_SW; |
| 1726 | C_OFFSET_TCPHEADER_TCPCS); | 1717 | |
| 1727 | pTxd->TcpSumWr = C_LEN_ETHERMAC_HEADER + IpHeaderLength; | 1718 | pTxd->TBControl = BMU_STF | Control | skb_headlen(pMessage); |
| 1728 | } else { | ||
| 1729 | pTxd->TBControl = BMU_CHECK | BMU_SW | BMU_STF | | ||
| 1730 | skb_headlen(pMessage); | ||
| 1731 | } | ||
| 1732 | 1719 | ||
| 1733 | pTxd = pTxd->pNextTxd; | 1720 | pTxd = pTxd->pNextTxd; |
| 1734 | pTxPort->TxdRingFree--; | 1721 | pTxPort->TxdRingFree--; |
| @@ -1752,40 +1739,18 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
| 1752 | pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32); | 1739 | pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32); |
| 1753 | pTxd->pMBuf = pMessage; | 1740 | pTxd->pMBuf = pMessage; |
| 1754 | 1741 | ||
| 1755 | /* | 1742 | pTxd->TBControl = Control | BMU_OWN | sk_frag->size;; |
| 1756 | ** Does the HW need to evaluate checksum for TCP or UDP packets? | ||
| 1757 | */ | ||
| 1758 | if (pMessage->ip_summed == CHECKSUM_HW) { | ||
| 1759 | pTxd->TBControl = BMU_OWN | BMU_SW | BMU_STFWD; | ||
| 1760 | /* | ||
| 1761 | ** We have to use the opcode for tcp here because the | ||
| 1762 | ** opcode for udp is not working in the hardware yet | ||
| 1763 | ** (revision 2.0) | ||
| 1764 | */ | ||
| 1765 | if ((Protocol == C_PROTO_ID_UDP) && | ||
| 1766 | (pAC->GIni.GIChipRev == 0) && | ||
| 1767 | (pAC->GIni.GIChipId == CHIP_ID_YUKON)) { | ||
| 1768 | pTxd->TBControl |= BMU_TCP_CHECK; | ||
| 1769 | } else { | ||
| 1770 | pTxd->TBControl |= BMU_UDP_CHECK; | ||
| 1771 | } | ||
| 1772 | } else { | ||
| 1773 | pTxd->TBControl = BMU_CHECK | BMU_SW | BMU_OWN; | ||
| 1774 | } | ||
| 1775 | 1743 | ||
| 1776 | /* | 1744 | /* |
| 1777 | ** Do we have the last fragment? | 1745 | ** Do we have the last fragment? |
| 1778 | */ | 1746 | */ |
| 1779 | if( (CurrFrag+1) == skb_shinfo(pMessage)->nr_frags ) { | 1747 | if( (CurrFrag+1) == skb_shinfo(pMessage)->nr_frags ) { |
| 1780 | #ifdef USE_TX_COMPLETE | 1748 | #ifdef USE_TX_COMPLETE |
| 1781 | pTxd->TBControl |= BMU_EOF | BMU_IRQ_EOF | sk_frag->size; | 1749 | pTxd->TBControl |= BMU_EOF | BMU_IRQ_EOF; |
| 1782 | #else | 1750 | #else |
| 1783 | pTxd->TBControl |= BMU_EOF | sk_frag->size; | 1751 | pTxd->TBControl |= BMU_EOF; |
| 1784 | #endif | 1752 | #endif |
| 1785 | pTxdFst->TBControl |= BMU_OWN | BMU_SW; | 1753 | pTxdFst->TBControl |= BMU_OWN | BMU_SW; |
| 1786 | |||
| 1787 | } else { | ||
| 1788 | pTxd->TBControl |= sk_frag->size; | ||
| 1789 | } | 1754 | } |
| 1790 | pTxdLst = pTxd; | 1755 | pTxdLst = pTxd; |
| 1791 | pTxd = pTxd->pNextTxd; | 1756 | pTxd = pTxd->pNextTxd; |
| @@ -2032,7 +1997,6 @@ SK_U32 Control; /* control field of descriptor */ | |||
| 2032 | struct sk_buff *pMsg; /* pointer to message holding frame */ | 1997 | struct sk_buff *pMsg; /* pointer to message holding frame */ |
| 2033 | struct sk_buff *pNewMsg; /* pointer to a new message for copying frame */ | 1998 | struct sk_buff *pNewMsg; /* pointer to a new message for copying frame */ |
| 2034 | int FrameLength; /* total length of received frame */ | 1999 | int FrameLength; /* total length of received frame */ |
| 2035 | int IpFrameLength; | ||
| 2036 | SK_MBUF *pRlmtMbuf; /* ptr to a buffer for giving a frame to rlmt */ | 2000 | SK_MBUF *pRlmtMbuf; /* ptr to a buffer for giving a frame to rlmt */ |
| 2037 | SK_EVPARA EvPara; /* an event parameter union */ | 2001 | SK_EVPARA EvPara; /* an event parameter union */ |
| 2038 | unsigned long Flags; /* for spin lock */ | 2002 | unsigned long Flags; /* for spin lock */ |
| @@ -2045,10 +2009,6 @@ SK_BOOL IsMc; | |||
| 2045 | SK_BOOL IsBadFrame; /* Bad frame */ | 2009 | SK_BOOL IsBadFrame; /* Bad frame */ |
| 2046 | 2010 | ||
| 2047 | SK_U32 FrameStat; | 2011 | SK_U32 FrameStat; |
| 2048 | unsigned short Csum1; | ||
| 2049 | unsigned short Csum2; | ||
| 2050 | unsigned short Type; | ||
| 2051 | int Result; | ||
| 2052 | SK_U64 PhysAddr; | 2012 | SK_U64 PhysAddr; |
| 2053 | 2013 | ||
| 2054 | rx_start: | 2014 | rx_start: |
| @@ -2177,8 +2137,8 @@ rx_start: | |||
| 2177 | (dma_addr_t) PhysAddr, | 2137 | (dma_addr_t) PhysAddr, |
| 2178 | FrameLength, | 2138 | FrameLength, |
| 2179 | PCI_DMA_FROMDEVICE); | 2139 | PCI_DMA_FROMDEVICE); |
| 2180 | eth_copy_and_sum(pNewMsg, pMsg->data, | 2140 | memcpy(pNewMsg->data, pMsg, FrameLength); |
| 2181 | FrameLength, 0); | 2141 | |
| 2182 | pci_dma_sync_single_for_device(pAC->PciDev, | 2142 | pci_dma_sync_single_for_device(pAC->PciDev, |
| 2183 | (dma_addr_t) PhysAddr, | 2143 | (dma_addr_t) PhysAddr, |
| 2184 | FrameLength, | 2144 | FrameLength, |
| @@ -2206,69 +2166,16 @@ rx_start: | |||
| 2206 | 2166 | ||
| 2207 | /* set length in message */ | 2167 | /* set length in message */ |
| 2208 | skb_put(pMsg, FrameLength); | 2168 | skb_put(pMsg, FrameLength); |
| 2209 | /* hardware checksum */ | 2169 | } /* frame > SK_COPY_TRESHOLD */ |
| 2210 | Type = ntohs(*((short*)&pMsg->data[12])); | ||
| 2211 | 2170 | ||
| 2212 | #ifdef USE_SK_RX_CHECKSUM | 2171 | #ifdef USE_SK_RX_CHECKSUM |
| 2213 | if (Type == 0x800) { | 2172 | pMsg->csum = pRxd->TcpSums; |
| 2214 | Csum1=le16_to_cpu(pRxd->TcpSums & 0xffff); | 2173 | pMsg->ip_summed = CHECKSUM_HW; |
| 2215 | Csum2=le16_to_cpu((pRxd->TcpSums >> 16) & 0xffff); | ||
| 2216 | IpFrameLength = (int) ntohs((unsigned short) | ||
| 2217 | ((unsigned short *) pMsg->data)[8]); | ||
| 2218 | |||
| 2219 | /* | ||
| 2220 | * Test: If frame is padded, a check is not possible! | ||
| 2221 | * Frame not padded? Length difference must be 14 (0xe)! | ||
| 2222 | */ | ||
| 2223 | if ((FrameLength - IpFrameLength) != 0xe) { | ||
| 2224 | /* Frame padded => TCP offload not possible! */ | ||
| 2225 | pMsg->ip_summed = CHECKSUM_NONE; | ||
| 2226 | } else { | ||
| 2227 | /* Frame not padded => TCP offload! */ | ||
| 2228 | if ((((Csum1 & 0xfffe) && (Csum2 & 0xfffe)) && | ||
| 2229 | (pAC->GIni.GIChipId == CHIP_ID_GENESIS)) || | ||
| 2230 | (pAC->ChipsetType)) { | ||
| 2231 | Result = SkCsGetReceiveInfo(pAC, | ||
| 2232 | &pMsg->data[14], | ||
| 2233 | Csum1, Csum2, pRxPort->PortIndex); | ||
| 2234 | if (Result == | ||
| 2235 | SKCS_STATUS_IP_FRAGMENT || | ||
| 2236 | Result == | ||
| 2237 | SKCS_STATUS_IP_CSUM_OK || | ||
| 2238 | Result == | ||
| 2239 | SKCS_STATUS_TCP_CSUM_OK || | ||
| 2240 | Result == | ||
| 2241 | SKCS_STATUS_UDP_CSUM_OK) { | ||
| 2242 | pMsg->ip_summed = | ||
| 2243 | CHECKSUM_UNNECESSARY; | ||
| 2244 | } | ||
| 2245 | else if (Result == | ||
| 2246 | SKCS_STATUS_TCP_CSUM_ERROR || | ||
| 2247 | Result == | ||
| 2248 | SKCS_STATUS_UDP_CSUM_ERROR || | ||
| 2249 | Result == | ||
| 2250 | SKCS_STATUS_IP_CSUM_ERROR_UDP || | ||
| 2251 | Result == | ||
| 2252 | SKCS_STATUS_IP_CSUM_ERROR_TCP || | ||
| 2253 | Result == | ||
| 2254 | SKCS_STATUS_IP_CSUM_ERROR ) { | ||
| 2255 | /* HW Checksum error */ | ||
| 2256 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, | ||
| 2257 | SK_DBGCAT_DRV_RX_PROGRESS, | ||
| 2258 | ("skge: CRC error. Frame dropped!\n")); | ||
| 2259 | goto rx_failed; | ||
| 2260 | } else { | ||
| 2261 | pMsg->ip_summed = | ||
| 2262 | CHECKSUM_NONE; | ||
| 2263 | } | ||
| 2264 | }/* checksumControl calculation valid */ | ||
| 2265 | } /* Frame length check */ | ||
| 2266 | } /* IP frame */ | ||
| 2267 | #else | 2174 | #else |
| 2268 | pMsg->ip_summed = CHECKSUM_NONE; | 2175 | pMsg->ip_summed = CHECKSUM_NONE; |
| 2269 | #endif | 2176 | #endif |
| 2270 | } /* frame > SK_COPY_TRESHOLD */ | 2177 | |
| 2271 | 2178 | ||
| 2272 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("V")); | 2179 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("V")); |
| 2273 | ForRlmt = SK_RLMT_RX_PROTOCOL; | 2180 | ForRlmt = SK_RLMT_RX_PROTOCOL; |
| 2274 | #if 0 | 2181 | #if 0 |
| @@ -4946,7 +4853,7 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
| 4946 | dev->irq = pdev->irq; | 4853 | dev->irq = pdev->irq; |
| 4947 | error = SkGeInitPCI(pAC); | 4854 | error = SkGeInitPCI(pAC); |
| 4948 | if (error) { | 4855 | if (error) { |
| 4949 | printk("SKGE: PCI setup failed: %i\n", error); | 4856 | printk(KERN_ERR "sk98lin: PCI setup failed: %i\n", error); |
| 4950 | goto out_free_netdev; | 4857 | goto out_free_netdev; |
| 4951 | } | 4858 | } |
| 4952 | 4859 | ||
| @@ -4982,7 +4889,7 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
| 4982 | 4889 | ||
| 4983 | /* Register net device */ | 4890 | /* Register net device */ |
| 4984 | if (register_netdev(dev)) { | 4891 | if (register_netdev(dev)) { |
| 4985 | printk(KERN_ERR "SKGE: Could not register device.\n"); | 4892 | printk(KERN_ERR "sk98lin: Could not register device.\n"); |
| 4986 | goto out_free_resources; | 4893 | goto out_free_resources; |
| 4987 | } | 4894 | } |
| 4988 | 4895 | ||
| @@ -5001,8 +4908,8 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
| 5001 | 4908 | ||
| 5002 | SkGeYellowLED(pAC, pAC->IoBase, 1); | 4909 | SkGeYellowLED(pAC, pAC->IoBase, 1); |
| 5003 | 4910 | ||
| 5004 | |||
| 5005 | memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6); | 4911 | memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6); |
| 4912 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
| 5006 | 4913 | ||
| 5007 | SkGeProcCreate(dev); | 4914 | SkGeProcCreate(dev); |
| 5008 | 4915 | ||
| @@ -5048,13 +4955,14 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
| 5048 | #endif | 4955 | #endif |
| 5049 | 4956 | ||
| 5050 | if (register_netdev(dev)) { | 4957 | if (register_netdev(dev)) { |
| 5051 | printk(KERN_ERR "SKGE: Could not register device.\n"); | 4958 | printk(KERN_ERR "sk98lin: Could not register device for seconf port.\n"); |
| 5052 | free_netdev(dev); | 4959 | free_netdev(dev); |
| 5053 | pAC->dev[1] = pAC->dev[0]; | 4960 | pAC->dev[1] = pAC->dev[0]; |
| 5054 | } else { | 4961 | } else { |
| 5055 | SkGeProcCreate(dev); | 4962 | SkGeProcCreate(dev); |
| 5056 | memcpy(&dev->dev_addr, | 4963 | memcpy(&dev->dev_addr, |
| 5057 | &pAC->Addr.Net[1].CurrentMacAddress, 6); | 4964 | &pAC->Addr.Net[1].CurrentMacAddress, 6); |
| 4965 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
| 5058 | 4966 | ||
| 5059 | printk("%s: %s\n", dev->name, pAC->DeviceStr); | 4967 | printk("%s: %s\n", dev->name, pAC->DeviceStr); |
| 5060 | printk(" PrefPort:B RlmtMode:Dual Check Link State\n"); | 4968 | printk(" PrefPort:B RlmtMode:Dual Check Link State\n"); |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 596c93b12daa..716467879b9c 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -2300,14 +2300,12 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) | |||
| 2300 | td->dma_hi = map >> 32; | 2300 | td->dma_hi = map >> 32; |
| 2301 | 2301 | ||
| 2302 | if (skb->ip_summed == CHECKSUM_HW) { | 2302 | if (skb->ip_summed == CHECKSUM_HW) { |
| 2303 | const struct iphdr *ip | ||
| 2304 | = (const struct iphdr *) (skb->data + ETH_HLEN); | ||
| 2305 | int offset = skb->h.raw - skb->data; | 2303 | int offset = skb->h.raw - skb->data; |
| 2306 | 2304 | ||
| 2307 | /* This seems backwards, but it is what the sk98lin | 2305 | /* This seems backwards, but it is what the sk98lin |
| 2308 | * does. Looks like hardware is wrong? | 2306 | * does. Looks like hardware is wrong? |
| 2309 | */ | 2307 | */ |
| 2310 | if (ip->protocol == IPPROTO_UDP | 2308 | if (skb->h.ipiph->protocol == IPPROTO_UDP |
| 2311 | && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON) | 2309 | && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON) |
| 2312 | control = BMU_TCP_CHECK; | 2310 | control = BMU_TCP_CHECK; |
| 2313 | else | 2311 | else |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 340ab4ee4b67..7a92b1cbd6aa 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -2755,8 +2755,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, | |||
| 2755 | SET_NETDEV_DEV(dev, dmdev); | 2755 | SET_NETDEV_DEV(dev, dmdev); |
| 2756 | 2756 | ||
| 2757 | 2757 | ||
| 2758 | if (test_bit(FLAG_MPI,&ai->flags)) | 2758 | reset_card (dev, 1); |
| 2759 | reset_card (dev, 1); | 2759 | msleep(400); |
| 2760 | 2760 | ||
| 2761 | rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); | 2761 | rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); |
| 2762 | if (rc) { | 2762 | if (rc) { |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 488ab06fb79f..6fd0bf736830 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
| @@ -3512,9 +3512,8 @@ static int orinoco_ioctl_setpower(struct net_device *dev, | |||
| 3512 | break; | 3512 | break; |
| 3513 | default: | 3513 | default: |
| 3514 | err = -EINVAL; | 3514 | err = -EINVAL; |
| 3515 | } | ||
| 3516 | if (err) | ||
| 3517 | goto out; | 3515 | goto out; |
| 3516 | } | ||
| 3518 | 3517 | ||
| 3519 | if (prq->flags & IW_POWER_TIMEOUT) { | 3518 | if (prq->flags & IW_POWER_TIMEOUT) { |
| 3520 | priv->pm_on = 1; | 3519 | priv->pm_on = 1; |
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index c218b5c944a6..5e84c5aa7779 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
| @@ -996,6 +996,20 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device) | |||
| 996 | spin_lock_init(&adapter->fsf_req_list_lock); | 996 | spin_lock_init(&adapter->fsf_req_list_lock); |
| 997 | INIT_LIST_HEAD(&adapter->fsf_req_list_head); | 997 | INIT_LIST_HEAD(&adapter->fsf_req_list_head); |
| 998 | 998 | ||
| 999 | /* initialize debug locks */ | ||
| 1000 | |||
| 1001 | spin_lock_init(&adapter->erp_dbf_lock); | ||
| 1002 | spin_lock_init(&adapter->hba_dbf_lock); | ||
| 1003 | spin_lock_init(&adapter->san_dbf_lock); | ||
| 1004 | spin_lock_init(&adapter->scsi_dbf_lock); | ||
| 1005 | |||
| 1006 | /* initialize error recovery stuff */ | ||
| 1007 | |||
| 1008 | rwlock_init(&adapter->erp_lock); | ||
| 1009 | sema_init(&adapter->erp_ready_sem, 0); | ||
| 1010 | INIT_LIST_HEAD(&adapter->erp_ready_head); | ||
| 1011 | INIT_LIST_HEAD(&adapter->erp_running_head); | ||
| 1012 | |||
| 999 | /* initialize abort lock */ | 1013 | /* initialize abort lock */ |
| 1000 | rwlock_init(&adapter->abort_lock); | 1014 | rwlock_init(&adapter->abort_lock); |
| 1001 | 1015 | ||
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 826fb3b00605..95599719f8ab 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
| @@ -926,7 +926,6 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) | |||
| 926 | char dbf_name[DEBUG_MAX_NAME_LEN]; | 926 | char dbf_name[DEBUG_MAX_NAME_LEN]; |
| 927 | 927 | ||
| 928 | /* debug feature area which records recovery activity */ | 928 | /* debug feature area which records recovery activity */ |
| 929 | spin_lock_init(&adapter->erp_dbf_lock); | ||
| 930 | sprintf(dbf_name, "zfcp_%s_erp", zfcp_get_busid_by_adapter(adapter)); | 929 | sprintf(dbf_name, "zfcp_%s_erp", zfcp_get_busid_by_adapter(adapter)); |
| 931 | adapter->erp_dbf = debug_register(dbf_name, dbfsize, 2, | 930 | adapter->erp_dbf = debug_register(dbf_name, dbfsize, 2, |
| 932 | sizeof(struct zfcp_erp_dbf_record)); | 931 | sizeof(struct zfcp_erp_dbf_record)); |
| @@ -936,7 +935,6 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) | |||
| 936 | debug_set_level(adapter->erp_dbf, 3); | 935 | debug_set_level(adapter->erp_dbf, 3); |
| 937 | 936 | ||
| 938 | /* debug feature area which records HBA (FSF and QDIO) conditions */ | 937 | /* debug feature area which records HBA (FSF and QDIO) conditions */ |
| 939 | spin_lock_init(&adapter->hba_dbf_lock); | ||
| 940 | sprintf(dbf_name, "zfcp_%s_hba", zfcp_get_busid_by_adapter(adapter)); | 938 | sprintf(dbf_name, "zfcp_%s_hba", zfcp_get_busid_by_adapter(adapter)); |
| 941 | adapter->hba_dbf = debug_register(dbf_name, dbfsize, 1, | 939 | adapter->hba_dbf = debug_register(dbf_name, dbfsize, 1, |
| 942 | sizeof(struct zfcp_hba_dbf_record)); | 940 | sizeof(struct zfcp_hba_dbf_record)); |
| @@ -947,7 +945,6 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) | |||
| 947 | debug_set_level(adapter->hba_dbf, 3); | 945 | debug_set_level(adapter->hba_dbf, 3); |
| 948 | 946 | ||
| 949 | /* debug feature area which records SAN command failures and recovery */ | 947 | /* debug feature area which records SAN command failures and recovery */ |
| 950 | spin_lock_init(&adapter->san_dbf_lock); | ||
| 951 | sprintf(dbf_name, "zfcp_%s_san", zfcp_get_busid_by_adapter(adapter)); | 948 | sprintf(dbf_name, "zfcp_%s_san", zfcp_get_busid_by_adapter(adapter)); |
| 952 | adapter->san_dbf = debug_register(dbf_name, dbfsize, 1, | 949 | adapter->san_dbf = debug_register(dbf_name, dbfsize, 1, |
| 953 | sizeof(struct zfcp_san_dbf_record)); | 950 | sizeof(struct zfcp_san_dbf_record)); |
| @@ -958,7 +955,6 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) | |||
| 958 | debug_set_level(adapter->san_dbf, 6); | 955 | debug_set_level(adapter->san_dbf, 6); |
| 959 | 956 | ||
| 960 | /* debug feature area which records SCSI command failures and recovery */ | 957 | /* debug feature area which records SCSI command failures and recovery */ |
| 961 | spin_lock_init(&adapter->scsi_dbf_lock); | ||
| 962 | sprintf(dbf_name, "zfcp_%s_scsi", zfcp_get_busid_by_adapter(adapter)); | 958 | sprintf(dbf_name, "zfcp_%s_scsi", zfcp_get_busid_by_adapter(adapter)); |
| 963 | adapter->scsi_dbf = debug_register(dbf_name, dbfsize, 1, | 959 | adapter->scsi_dbf = debug_register(dbf_name, dbfsize, 1, |
| 964 | sizeof(struct zfcp_scsi_dbf_record)); | 960 | sizeof(struct zfcp_scsi_dbf_record)); |
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 023f4e558ae4..ee7314d8c2da 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
| @@ -1071,11 +1071,6 @@ zfcp_erp_thread_setup(struct zfcp_adapter *adapter) | |||
| 1071 | 1071 | ||
| 1072 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status); | 1072 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status); |
| 1073 | 1073 | ||
| 1074 | rwlock_init(&adapter->erp_lock); | ||
| 1075 | INIT_LIST_HEAD(&adapter->erp_ready_head); | ||
| 1076 | INIT_LIST_HEAD(&adapter->erp_running_head); | ||
| 1077 | sema_init(&adapter->erp_ready_sem, 0); | ||
| 1078 | |||
| 1079 | retval = kernel_thread(zfcp_erp_thread, adapter, SIGCHLD); | 1074 | retval = kernel_thread(zfcp_erp_thread, adapter, SIGCHLD); |
| 1080 | if (retval < 0) { | 1075 | if (retval < 0) { |
| 1081 | ZFCP_LOG_NORMAL("error: creation of erp thread failed for " | 1076 | ZFCP_LOG_NORMAL("error: creation of erp thread failed for " |
| @@ -2248,29 +2243,26 @@ zfcp_erp_adapter_strategy_close_qdio(struct zfcp_erp_action *erp_action) | |||
| 2248 | return retval; | 2243 | return retval; |
| 2249 | } | 2244 | } |
| 2250 | 2245 | ||
| 2251 | /* | ||
| 2252 | * function: zfcp_fsf_init | ||
| 2253 | * | ||
| 2254 | * purpose: initializes FSF operation for the specified adapter | ||
| 2255 | * | ||
| 2256 | * returns: 0 - succesful initialization of FSF operation | ||
| 2257 | * !0 - failed to initialize FSF operation | ||
| 2258 | */ | ||
| 2259 | static int | 2246 | static int |
| 2260 | zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *erp_action) | 2247 | zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *erp_action) |
| 2261 | { | 2248 | { |
| 2262 | int xconfig, xport; | 2249 | int retval; |
| 2263 | 2250 | ||
| 2264 | if (atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 2251 | if ((atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, |
| 2265 | &erp_action->adapter->status)) { | 2252 | &erp_action->adapter->status)) && |
| 2253 | (erp_action->adapter->adapter_features & | ||
| 2254 | FSF_FEATURE_HBAAPI_MANAGEMENT)) { | ||
| 2266 | zfcp_erp_adapter_strategy_open_fsf_xport(erp_action); | 2255 | zfcp_erp_adapter_strategy_open_fsf_xport(erp_action); |
| 2267 | atomic_set(&erp_action->adapter->erp_counter, 0); | 2256 | atomic_set(&erp_action->adapter->erp_counter, 0); |
| 2268 | return ZFCP_ERP_FAILED; | 2257 | return ZFCP_ERP_FAILED; |
| 2269 | } | 2258 | } |
| 2270 | 2259 | ||
| 2271 | xconfig = zfcp_erp_adapter_strategy_open_fsf_xconfig(erp_action); | 2260 | retval = zfcp_erp_adapter_strategy_open_fsf_xconfig(erp_action); |
| 2272 | xport = zfcp_erp_adapter_strategy_open_fsf_xport(erp_action); | 2261 | if (retval == ZFCP_ERP_FAILED) |
| 2273 | if ((xconfig == ZFCP_ERP_FAILED) || (xport == ZFCP_ERP_FAILED)) | 2262 | return ZFCP_ERP_FAILED; |
| 2263 | |||
| 2264 | retval = zfcp_erp_adapter_strategy_open_fsf_xport(erp_action); | ||
| 2265 | if (retval == ZFCP_ERP_FAILED) | ||
| 2274 | return ZFCP_ERP_FAILED; | 2266 | return ZFCP_ERP_FAILED; |
| 2275 | 2267 | ||
| 2276 | return zfcp_erp_adapter_strategy_open_fsf_statusread(erp_action); | 2268 | return zfcp_erp_adapter_strategy_open_fsf_statusread(erp_action); |
| @@ -2359,41 +2351,29 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action) | |||
| 2359 | static int | 2351 | static int |
| 2360 | zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action) | 2352 | zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action) |
| 2361 | { | 2353 | { |
| 2362 | int retval = ZFCP_ERP_SUCCEEDED; | 2354 | int ret; |
| 2363 | int retries; | 2355 | int retries; |
| 2364 | int sleep; | 2356 | int sleep; |
| 2365 | struct zfcp_adapter *adapter = erp_action->adapter; | 2357 | struct zfcp_adapter *adapter = erp_action->adapter; |
| 2366 | 2358 | ||
| 2367 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); | 2359 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); |
| 2368 | 2360 | ||
| 2369 | for (retries = 0; ; retries++) { | 2361 | retries = 0; |
| 2370 | ZFCP_LOG_DEBUG("Doing exchange port data\n"); | 2362 | do { |
| 2363 | write_lock(&adapter->erp_lock); | ||
| 2371 | zfcp_erp_action_to_running(erp_action); | 2364 | zfcp_erp_action_to_running(erp_action); |
| 2365 | write_unlock(&adapter->erp_lock); | ||
| 2372 | zfcp_erp_timeout_init(erp_action); | 2366 | zfcp_erp_timeout_init(erp_action); |
| 2373 | if (zfcp_fsf_exchange_port_data(erp_action, adapter, NULL)) { | 2367 | ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL); |
| 2374 | retval = ZFCP_ERP_FAILED; | 2368 | if (ret == -EOPNOTSUPP) { |
| 2375 | debug_text_event(adapter->erp_dbf, 5, "a_fstx_xf"); | 2369 | debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp"); |
| 2376 | ZFCP_LOG_INFO("error: initiation of exchange of " | 2370 | return ZFCP_ERP_SUCCEEDED; |
| 2377 | "port data failed for adapter %s\n", | 2371 | } else if (ret) { |
| 2378 | zfcp_get_busid_by_adapter(adapter)); | 2372 | debug_text_event(adapter->erp_dbf, 3, "a_xport_failed"); |
| 2379 | break; | 2373 | return ZFCP_ERP_FAILED; |
| 2380 | } | 2374 | } |
| 2381 | debug_text_event(adapter->erp_dbf, 6, "a_fstx_xok"); | 2375 | debug_text_event(adapter->erp_dbf, 6, "a_xport_ok"); |
| 2382 | ZFCP_LOG_DEBUG("Xchange underway\n"); | ||
| 2383 | 2376 | ||
| 2384 | /* | ||
| 2385 | * Why this works: | ||
| 2386 | * Both the normal completion handler as well as the timeout | ||
| 2387 | * handler will do an 'up' when the 'exchange port data' | ||
| 2388 | * request completes or times out. Thus, the signal to go on | ||
| 2389 | * won't be lost utilizing this semaphore. | ||
| 2390 | * Furthermore, this 'adapter_reopen' action is | ||
| 2391 | * guaranteed to be the only action being there (highest action | ||
| 2392 | * which prevents other actions from being created). | ||
| 2393 | * Resulting from that, the wake signal recognized here | ||
| 2394 | * _must_ be the one belonging to the 'exchange port | ||
| 2395 | * data' request. | ||
| 2396 | */ | ||
| 2397 | down(&adapter->erp_ready_sem); | 2377 | down(&adapter->erp_ready_sem); |
| 2398 | if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) { | 2378 | if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) { |
| 2399 | ZFCP_LOG_INFO("error: exchange of port data " | 2379 | ZFCP_LOG_INFO("error: exchange of port data " |
| @@ -2401,29 +2381,19 @@ zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action) | |||
| 2401 | zfcp_get_busid_by_adapter(adapter)); | 2381 | zfcp_get_busid_by_adapter(adapter)); |
| 2402 | break; | 2382 | break; |
| 2403 | } | 2383 | } |
| 2404 | |||
| 2405 | if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 2384 | if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, |
| 2406 | &adapter->status)) | 2385 | &adapter->status)) |
| 2407 | break; | 2386 | break; |
| 2408 | 2387 | ||
| 2409 | ZFCP_LOG_DEBUG("host connection still initialising... " | 2388 | if (retries < ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES) { |
| 2410 | "waiting and retrying...\n"); | 2389 | sleep = ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP; |
| 2411 | /* sleep a little bit before retry */ | 2390 | retries++; |
| 2412 | sleep = retries < ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES ? | 2391 | } else |
| 2413 | ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP : | 2392 | sleep = ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP; |
| 2414 | ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP; | 2393 | schedule_timeout(sleep); |
| 2415 | msleep(jiffies_to_msecs(sleep)); | 2394 | } while (1); |
| 2416 | } | ||
| 2417 | |||
| 2418 | if (atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | ||
| 2419 | &adapter->status)) { | ||
| 2420 | ZFCP_LOG_INFO("error: exchange of port data for " | ||
| 2421 | "adapter %s failed\n", | ||
| 2422 | zfcp_get_busid_by_adapter(adapter)); | ||
| 2423 | retval = ZFCP_ERP_FAILED; | ||
| 2424 | } | ||
| 2425 | 2395 | ||
| 2426 | return retval; | 2396 | return ZFCP_ERP_SUCCEEDED; |
| 2427 | } | 2397 | } |
| 2428 | 2398 | ||
| 2429 | /* | 2399 | /* |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 3b0fc1163f5f..59587951c847 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
| @@ -554,6 +554,17 @@ static void | |||
| 554 | zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, | 554 | zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, |
| 555 | struct fsf_link_down_info *link_down) | 555 | struct fsf_link_down_info *link_down) |
| 556 | { | 556 | { |
| 557 | if (atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | ||
| 558 | &adapter->status)) | ||
| 559 | return; | ||
| 560 | |||
| 561 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); | ||
| 562 | |||
| 563 | if (link_down == NULL) { | ||
| 564 | zfcp_erp_adapter_reopen(adapter, 0); | ||
| 565 | return; | ||
| 566 | } | ||
| 567 | |||
| 557 | switch (link_down->error_code) { | 568 | switch (link_down->error_code) { |
| 558 | case FSF_PSQ_LINK_NO_LIGHT: | 569 | case FSF_PSQ_LINK_NO_LIGHT: |
| 559 | ZFCP_LOG_NORMAL("The local link to adapter %s is down " | 570 | ZFCP_LOG_NORMAL("The local link to adapter %s is down " |
| @@ -634,20 +645,15 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, | |||
| 634 | link_down->explanation_code, | 645 | link_down->explanation_code, |
| 635 | link_down->vendor_specific_code); | 646 | link_down->vendor_specific_code); |
| 636 | 647 | ||
| 637 | if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 648 | switch (link_down->error_code) { |
| 638 | &adapter->status)) { | 649 | case FSF_PSQ_LINK_NO_LIGHT: |
| 639 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 650 | case FSF_PSQ_LINK_WRAP_PLUG: |
| 640 | &adapter->status); | 651 | case FSF_PSQ_LINK_NO_FCP: |
| 641 | switch (link_down->error_code) { | 652 | case FSF_PSQ_LINK_FIRMWARE_UPDATE: |
| 642 | case FSF_PSQ_LINK_NO_LIGHT: | 653 | zfcp_erp_adapter_reopen(adapter, 0); |
| 643 | case FSF_PSQ_LINK_WRAP_PLUG: | 654 | break; |
| 644 | case FSF_PSQ_LINK_NO_FCP: | 655 | default: |
| 645 | case FSF_PSQ_LINK_FIRMWARE_UPDATE: | 656 | zfcp_erp_adapter_failed(adapter); |
| 646 | zfcp_erp_adapter_reopen(adapter, 0); | ||
| 647 | break; | ||
| 648 | default: | ||
| 649 | zfcp_erp_adapter_failed(adapter); | ||
| 650 | } | ||
| 651 | } | 657 | } |
| 652 | } | 658 | } |
| 653 | 659 | ||
| @@ -919,30 +925,36 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req) | |||
| 919 | case FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK: | 925 | case FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK: |
| 920 | ZFCP_LOG_INFO("Physical link to adapter %s is down\n", | 926 | ZFCP_LOG_INFO("Physical link to adapter %s is down\n", |
| 921 | zfcp_get_busid_by_adapter(adapter)); | 927 | zfcp_get_busid_by_adapter(adapter)); |
| 928 | zfcp_fsf_link_down_info_eval(adapter, | ||
| 929 | (struct fsf_link_down_info *) | ||
| 930 | &status_buffer->payload); | ||
| 922 | break; | 931 | break; |
| 923 | case FSF_STATUS_READ_SUB_FDISC_FAILED: | 932 | case FSF_STATUS_READ_SUB_FDISC_FAILED: |
| 924 | ZFCP_LOG_INFO("Local link to adapter %s is down " | 933 | ZFCP_LOG_INFO("Local link to adapter %s is down " |
| 925 | "due to failed FDISC login\n", | 934 | "due to failed FDISC login\n", |
| 926 | zfcp_get_busid_by_adapter(adapter)); | 935 | zfcp_get_busid_by_adapter(adapter)); |
| 936 | zfcp_fsf_link_down_info_eval(adapter, | ||
| 937 | (struct fsf_link_down_info *) | ||
| 938 | &status_buffer->payload); | ||
| 927 | break; | 939 | break; |
| 928 | case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE: | 940 | case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE: |
| 929 | ZFCP_LOG_INFO("Local link to adapter %s is down " | 941 | ZFCP_LOG_INFO("Local link to adapter %s is down " |
| 930 | "due to firmware update on adapter\n", | 942 | "due to firmware update on adapter\n", |
| 931 | zfcp_get_busid_by_adapter(adapter)); | 943 | zfcp_get_busid_by_adapter(adapter)); |
| 944 | zfcp_fsf_link_down_info_eval(adapter, NULL); | ||
| 932 | break; | 945 | break; |
| 933 | default: | 946 | default: |
| 934 | ZFCP_LOG_INFO("Local link to adapter %s is down " | 947 | ZFCP_LOG_INFO("Local link to adapter %s is down " |
| 935 | "due to unknown reason\n", | 948 | "due to unknown reason\n", |
| 936 | zfcp_get_busid_by_adapter(adapter)); | 949 | zfcp_get_busid_by_adapter(adapter)); |
| 950 | zfcp_fsf_link_down_info_eval(adapter, NULL); | ||
| 937 | }; | 951 | }; |
| 938 | zfcp_fsf_link_down_info_eval(adapter, | ||
| 939 | (struct fsf_link_down_info *) &status_buffer->payload); | ||
| 940 | break; | 952 | break; |
| 941 | 953 | ||
| 942 | case FSF_STATUS_READ_LINK_UP: | 954 | case FSF_STATUS_READ_LINK_UP: |
| 943 | ZFCP_LOG_NORMAL("Local link to adapter %s was replugged. " | 955 | ZFCP_LOG_NORMAL("Local link to adapter %s was replugged. " |
| 944 | "Restarting operations on this adapter\n", | 956 | "Restarting operations on this adapter\n", |
| 945 | zfcp_get_busid_by_adapter(adapter)); | 957 | zfcp_get_busid_by_adapter(adapter)); |
| 946 | /* All ports should be marked as ready to run again */ | 958 | /* All ports should be marked as ready to run again */ |
| 947 | zfcp_erp_modify_adapter_status(adapter, | 959 | zfcp_erp_modify_adapter_status(adapter, |
| 948 | ZFCP_STATUS_COMMON_RUNNING, | 960 | ZFCP_STATUS_COMMON_RUNNING, |
| @@ -2191,13 +2203,10 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
| 2191 | return -EOPNOTSUPP; | 2203 | return -EOPNOTSUPP; |
| 2192 | } | 2204 | } |
| 2193 | 2205 | ||
| 2194 | timer = kmalloc(sizeof(struct timer_list), GFP_KERNEL); | ||
| 2195 | if (!timer) | ||
| 2196 | return -ENOMEM; | ||
| 2197 | |||
| 2198 | /* setup new FSF request */ | 2206 | /* setup new FSF request */ |
| 2199 | retval = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, | 2207 | retval = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, |
| 2200 | 0, 0, &lock_flags, &fsf_req); | 2208 | erp_action ? ZFCP_REQ_AUTO_CLEANUP : 0, |
| 2209 | 0, &lock_flags, &fsf_req); | ||
| 2201 | if (retval < 0) { | 2210 | if (retval < 0) { |
| 2202 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " | 2211 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " |
| 2203 | "exchange port data request for" | 2212 | "exchange port data request for" |
| @@ -2205,25 +2214,33 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
| 2205 | zfcp_get_busid_by_adapter(adapter)); | 2214 | zfcp_get_busid_by_adapter(adapter)); |
| 2206 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | 2215 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, |
| 2207 | lock_flags); | 2216 | lock_flags); |
| 2208 | goto out; | 2217 | return retval; |
| 2209 | } | ||
| 2210 | |||
| 2211 | if (erp_action) { | ||
| 2212 | erp_action->fsf_req = fsf_req; | ||
| 2213 | fsf_req->erp_action = erp_action; | ||
| 2214 | } | 2218 | } |
| 2215 | 2219 | ||
| 2216 | if (data) | 2220 | if (data) |
| 2217 | fsf_req->data = (unsigned long) data; | 2221 | fsf_req->data = (unsigned long) data; |
| 2218 | 2222 | ||
| 2219 | sbale = zfcp_qdio_sbale_req(fsf_req, fsf_req->sbal_curr, 0); | 2223 | sbale = zfcp_qdio_sbale_req(fsf_req, fsf_req->sbal_curr, 0); |
| 2220 | sbale[0].flags |= SBAL_FLAGS0_TYPE_READ; | 2224 | sbale[0].flags |= SBAL_FLAGS0_TYPE_READ; |
| 2221 | sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY; | 2225 | sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY; |
| 2222 | 2226 | ||
| 2223 | init_timer(timer); | 2227 | if (erp_action) { |
| 2224 | timer->function = zfcp_fsf_request_timeout_handler; | 2228 | erp_action->fsf_req = fsf_req; |
| 2225 | timer->data = (unsigned long) adapter; | 2229 | fsf_req->erp_action = erp_action; |
| 2226 | timer->expires = ZFCP_FSF_REQUEST_TIMEOUT; | 2230 | timer = &erp_action->timer; |
| 2231 | } else { | ||
| 2232 | timer = kmalloc(sizeof(struct timer_list), GFP_ATOMIC); | ||
| 2233 | if (!timer) { | ||
| 2234 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | ||
| 2235 | lock_flags); | ||
| 2236 | zfcp_fsf_req_free(fsf_req); | ||
| 2237 | return -ENOMEM; | ||
| 2238 | } | ||
| 2239 | init_timer(timer); | ||
| 2240 | timer->function = zfcp_fsf_request_timeout_handler; | ||
| 2241 | timer->data = (unsigned long) adapter; | ||
| 2242 | timer->expires = ZFCP_FSF_REQUEST_TIMEOUT; | ||
| 2243 | } | ||
| 2227 | 2244 | ||
| 2228 | retval = zfcp_fsf_req_send(fsf_req, timer); | 2245 | retval = zfcp_fsf_req_send(fsf_req, timer); |
| 2229 | if (retval) { | 2246 | if (retval) { |
| @@ -2233,23 +2250,22 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
| 2233 | zfcp_fsf_req_free(fsf_req); | 2250 | zfcp_fsf_req_free(fsf_req); |
| 2234 | if (erp_action) | 2251 | if (erp_action) |
| 2235 | erp_action->fsf_req = NULL; | 2252 | erp_action->fsf_req = NULL; |
| 2253 | else | ||
| 2254 | kfree(timer); | ||
| 2236 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | 2255 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, |
| 2237 | lock_flags); | 2256 | lock_flags); |
| 2238 | goto out; | 2257 | return retval; |
| 2239 | } | 2258 | } |
| 2240 | 2259 | ||
| 2241 | ZFCP_LOG_DEBUG("Exchange Port Data request initiated (adapter %s)\n", | 2260 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, lock_flags); |
| 2242 | zfcp_get_busid_by_adapter(adapter)); | ||
| 2243 | |||
| 2244 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | ||
| 2245 | lock_flags); | ||
| 2246 | 2261 | ||
| 2247 | wait_event(fsf_req->completion_wq, | 2262 | if (!erp_action) { |
| 2248 | fsf_req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 2263 | wait_event(fsf_req->completion_wq, |
| 2249 | del_timer_sync(timer); | 2264 | fsf_req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
| 2250 | zfcp_fsf_req_free(fsf_req); | 2265 | del_timer_sync(timer); |
| 2251 | out: | 2266 | zfcp_fsf_req_free(fsf_req); |
| 2252 | kfree(timer); | 2267 | kfree(timer); |
| 2268 | } | ||
| 2253 | return retval; | 2269 | return retval; |
| 2254 | } | 2270 | } |
| 2255 | 2271 | ||
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 3dcd1bfba3b4..66608d13a634 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
| @@ -179,7 +179,7 @@ zfcp_scsi_slave_alloc(struct scsi_device *sdp) | |||
| 179 | struct zfcp_adapter *adapter; | 179 | struct zfcp_adapter *adapter; |
| 180 | struct zfcp_unit *unit; | 180 | struct zfcp_unit *unit; |
| 181 | unsigned long flags; | 181 | unsigned long flags; |
| 182 | int retval = -ENODEV; | 182 | int retval = -ENXIO; |
| 183 | 183 | ||
| 184 | adapter = (struct zfcp_adapter *) sdp->host->hostdata[0]; | 184 | adapter = (struct zfcp_adapter *) sdp->host->hostdata[0]; |
| 185 | if (!adapter) | 185 | if (!adapter) |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index ab383d1f59e2..3cb68af90456 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
| @@ -325,6 +325,8 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev, | |||
| 325 | * translations ( 64/32, 128/32, 255/63 ). | 325 | * translations ( 64/32, 128/32, 255/63 ). |
| 326 | */ | 326 | */ |
| 327 | buf = scsi_bios_ptable(bdev); | 327 | buf = scsi_bios_ptable(bdev); |
| 328 | if (!buf) | ||
| 329 | return 0; | ||
| 328 | if(*(__le16 *)(buf + 0x40) == cpu_to_le16(0xaa55)) { | 330 | if(*(__le16 *)(buf + 0x40) == cpu_to_le16(0xaa55)) { |
| 329 | struct partition *first = (struct partition * )buf; | 331 | struct partition *first = (struct partition * )buf; |
| 330 | struct partition *entry = first; | 332 | struct partition *entry = first; |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 31e9f40e79a2..6aab9dacdeea 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
| @@ -2105,7 +2105,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) | |||
| 2105 | scmd_id(cmd), | 2105 | scmd_id(cmd), |
| 2106 | scmd_channel(cmd) + 'A', | 2106 | scmd_channel(cmd) + 'A', |
| 2107 | CAM_LUN_WILDCARD, | 2107 | CAM_LUN_WILDCARD, |
| 2108 | SCB_LIST_NULL, ROLE_INITIATOR) == 0) | 2108 | SCB_LIST_NULL, ROLE_INITIATOR)) |
| 2109 | break; | 2109 | break; |
| 2110 | } | 2110 | } |
| 2111 | } | 2111 | } |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 7fc6454068e4..d866213f42b8 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
| @@ -2169,7 +2169,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) | |||
| 2169 | if (ahc_match_scb(ahc, pending_scb, scmd_id(cmd), | 2169 | if (ahc_match_scb(ahc, pending_scb, scmd_id(cmd), |
| 2170 | scmd_channel(cmd) + 'A', | 2170 | scmd_channel(cmd) + 'A', |
| 2171 | CAM_LUN_WILDCARD, | 2171 | CAM_LUN_WILDCARD, |
| 2172 | SCB_LIST_NULL, ROLE_INITIATOR) == 0) | 2172 | SCB_LIST_NULL, ROLE_INITIATOR)) |
| 2173 | break; | 2173 | break; |
| 2174 | } | 2174 | } |
| 2175 | } | 2175 | } |
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 3b4ca55a3332..379e87089764 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
| @@ -2239,7 +2239,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) | |||
| 2239 | struct scsi_cmnd *cmd = qc->scsicmd; | 2239 | struct scsi_cmnd *cmd = qc->scsicmd; |
| 2240 | 2240 | ||
| 2241 | if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) | 2241 | if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) |
| 2242 | return 1; | 2242 | goto invalid_fld; |
| 2243 | 2243 | ||
| 2244 | /* | 2244 | /* |
| 2245 | * 12 and 16 byte CDBs use different offsets to | 2245 | * 12 and 16 byte CDBs use different offsets to |
| @@ -2301,7 +2301,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) | |||
| 2301 | */ | 2301 | */ |
| 2302 | if ((tf->command == ATA_CMD_SET_FEATURES) | 2302 | if ((tf->command == ATA_CMD_SET_FEATURES) |
| 2303 | && (tf->feature == SETFEATURES_XFER)) | 2303 | && (tf->feature == SETFEATURES_XFER)) |
| 2304 | return 1; | 2304 | goto invalid_fld; |
| 2305 | 2305 | ||
| 2306 | /* | 2306 | /* |
| 2307 | * Set flags so that all registers will be written, | 2307 | * Set flags so that all registers will be written, |
| @@ -2322,6 +2322,11 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) | |||
| 2322 | qc->nsect = cmd->bufflen / ATA_SECT_SIZE; | 2322 | qc->nsect = cmd->bufflen / ATA_SECT_SIZE; |
| 2323 | 2323 | ||
| 2324 | return 0; | 2324 | return 0; |
| 2325 | |||
| 2326 | invalid_fld: | ||
| 2327 | ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x00); | ||
| 2328 | /* "Invalid field in cdb" */ | ||
| 2329 | return 1; | ||
| 2325 | } | 2330 | } |
| 2326 | 2331 | ||
| 2327 | /** | 2332 | /** |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index ce9d73a292e2..4afef5cdcb17 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -542,17 +542,10 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) | |||
| 542 | 542 | ||
| 543 | void scsi_next_command(struct scsi_cmnd *cmd) | 543 | void scsi_next_command(struct scsi_cmnd *cmd) |
| 544 | { | 544 | { |
| 545 | struct scsi_device *sdev = cmd->device; | 545 | struct request_queue *q = cmd->device->request_queue; |
| 546 | struct request_queue *q = sdev->request_queue; | ||
| 547 | |||
| 548 | /* need to hold a reference on the device before we let go of the cmd */ | ||
| 549 | get_device(&sdev->sdev_gendev); | ||
| 550 | 546 | ||
| 551 | scsi_put_command(cmd); | 547 | scsi_put_command(cmd); |
| 552 | scsi_run_queue(q); | 548 | scsi_run_queue(q); |
| 553 | |||
| 554 | /* ok to remove device now */ | ||
| 555 | put_device(&sdev->sdev_gendev); | ||
| 556 | } | 549 | } |
| 557 | 550 | ||
| 558 | void scsi_run_host_queues(struct Scsi_Host *shost) | 551 | void scsi_run_host_queues(struct Scsi_Host *shost) |
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index 718a2bc4ed5e..38a53b5f9e9a 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c | |||
| @@ -812,12 +812,10 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer) | |||
| 812 | if (!scsi_device_sync(sdev) && !scsi_device_dt(sdev)) | 812 | if (!scsi_device_sync(sdev) && !scsi_device_dt(sdev)) |
| 813 | return; | 813 | return; |
| 814 | 814 | ||
| 815 | /* see if the device has an echo buffer. If it does we can | 815 | /* len == -1 is the signal that we need to ascertain the |
| 816 | * do the SPI pattern write tests */ | 816 | * presence of an echo buffer before trying to use it. len == |
| 817 | 817 | * 0 means we don't have an echo buffer */ | |
| 818 | len = 0; | 818 | len = -1; |
| 819 | if (scsi_device_dt(sdev)) | ||
| 820 | len = spi_dv_device_get_echo_buffer(sdev, buffer); | ||
| 821 | 819 | ||
| 822 | retry: | 820 | retry: |
| 823 | 821 | ||
| @@ -840,11 +838,23 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer) | |||
| 840 | if (spi_min_period(starget) == 8) | 838 | if (spi_min_period(starget) == 8) |
| 841 | DV_SET(pcomp_en, 1); | 839 | DV_SET(pcomp_en, 1); |
| 842 | } | 840 | } |
| 841 | /* Do the read only INQUIRY tests */ | ||
| 842 | spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len, | ||
| 843 | spi_dv_device_compare_inquiry); | ||
| 844 | /* See if we actually managed to negotiate and sustain DT */ | ||
| 845 | if (i->f->get_dt) | ||
| 846 | i->f->get_dt(starget); | ||
| 847 | |||
| 848 | /* see if the device has an echo buffer. If it does we can do | ||
| 849 | * the SPI pattern write tests. Because of some broken | ||
| 850 | * devices, we *only* try this on a device that has actually | ||
| 851 | * negotiated DT */ | ||
| 852 | |||
| 853 | if (len == -1 && spi_dt(starget)) | ||
| 854 | len = spi_dv_device_get_echo_buffer(sdev, buffer); | ||
| 843 | 855 | ||
| 844 | if (len == 0) { | 856 | if (len <= 0) { |
| 845 | starget_printk(KERN_INFO, starget, "Domain Validation skipping write tests\n"); | 857 | starget_printk(KERN_INFO, starget, "Domain Validation skipping write tests\n"); |
| 846 | spi_dv_retrain(sdev, buffer, buffer + len, | ||
| 847 | spi_dv_device_compare_inquiry); | ||
| 848 | return; | 858 | return; |
| 849 | } | 859 | } |
| 850 | 860 | ||
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 72ec59456e69..b55c2a8a547c 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -1860,9 +1860,11 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, | |||
| 1860 | unlock_page(pages[j]); */ | 1860 | unlock_page(pages[j]); */ |
| 1861 | res = 0; | 1861 | res = 0; |
| 1862 | out_unmap: | 1862 | out_unmap: |
| 1863 | if (res > 0) | 1863 | if (res > 0) { |
| 1864 | for (j=0; j < res; j++) | 1864 | for (j=0; j < res; j++) |
| 1865 | page_cache_release(pages[j]); | 1865 | page_cache_release(pages[j]); |
| 1866 | res = 0; | ||
| 1867 | } | ||
| 1866 | kfree(pages); | 1868 | kfree(pages); |
| 1867 | return res; | 1869 | return res; |
| 1868 | } | 1870 | } |
| @@ -1878,8 +1880,6 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages, | |||
| 1878 | for (i=0; i < nr_pages; i++) { | 1880 | for (i=0; i < nr_pages; i++) { |
| 1879 | struct page *page = sgl[i].page; | 1881 | struct page *page = sgl[i].page; |
| 1880 | 1882 | ||
| 1881 | /* XXX: just for debug. Remove when PageReserved is removed */ | ||
| 1882 | BUG_ON(PageReserved(page)); | ||
| 1883 | if (dirtied) | 1883 | if (dirtied) |
| 1884 | SetPageDirty(page); | 1884 | SetPageDirty(page); |
| 1885 | /* unlock_page(page); */ | 1885 | /* unlock_page(page); */ |
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 770c4324f3d5..7ac6ea141fff 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
| @@ -4509,6 +4509,7 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa | |||
| 4509 | if (res > 0) { | 4509 | if (res > 0) { |
| 4510 | for (j=0; j < res; j++) | 4510 | for (j=0; j < res; j++) |
| 4511 | page_cache_release(pages[j]); | 4511 | page_cache_release(pages[j]); |
| 4512 | res = 0; | ||
| 4512 | } | 4513 | } |
| 4513 | kfree(pages); | 4514 | kfree(pages); |
| 4514 | return res; | 4515 | return res; |
| @@ -4524,8 +4525,6 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_p | |||
| 4524 | for (i=0; i < nr_pages; i++) { | 4525 | for (i=0; i < nr_pages; i++) { |
| 4525 | struct page *page = sgl[i].page; | 4526 | struct page *page = sgl[i].page; |
| 4526 | 4527 | ||
| 4527 | /* XXX: just for debug. Remove when PageReserved is removed */ | ||
| 4528 | BUG_ON(PageReserved(page)); | ||
| 4529 | if (dirtied) | 4528 | if (dirtied) |
| 4530 | SetPageDirty(page); | 4529 | SetPageDirty(page); |
| 4531 | /* FIXME: cache flush missing for rw==READ | 4530 | /* FIXME: cache flush missing for rw==READ |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index d76766c3ce16..7fc0b97173e1 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
| @@ -2086,6 +2086,7 @@ static void sym2_set_dt(struct scsi_target *starget, int dt) | |||
| 2086 | tp->tgoal.check_nego = 1; | 2086 | tp->tgoal.check_nego = 1; |
| 2087 | } | 2087 | } |
| 2088 | 2088 | ||
| 2089 | #if 0 | ||
| 2089 | static void sym2_set_iu(struct scsi_target *starget, int iu) | 2090 | static void sym2_set_iu(struct scsi_target *starget, int iu) |
| 2090 | { | 2091 | { |
| 2091 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); | 2092 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); |
| @@ -2111,7 +2112,7 @@ static void sym2_set_qas(struct scsi_target *starget, int qas) | |||
| 2111 | tp->tgoal.qas = 0; | 2112 | tp->tgoal.qas = 0; |
| 2112 | tp->tgoal.check_nego = 1; | 2113 | tp->tgoal.check_nego = 1; |
| 2113 | } | 2114 | } |
| 2114 | 2115 | #endif | |
| 2115 | 2116 | ||
| 2116 | static struct spi_function_template sym2_transport_functions = { | 2117 | static struct spi_function_template sym2_transport_functions = { |
| 2117 | .set_offset = sym2_set_offset, | 2118 | .set_offset = sym2_set_offset, |
| @@ -2122,10 +2123,12 @@ static struct spi_function_template sym2_transport_functions = { | |||
| 2122 | .show_width = 1, | 2123 | .show_width = 1, |
| 2123 | .set_dt = sym2_set_dt, | 2124 | .set_dt = sym2_set_dt, |
| 2124 | .show_dt = 1, | 2125 | .show_dt = 1, |
| 2126 | #if 0 | ||
| 2125 | .set_iu = sym2_set_iu, | 2127 | .set_iu = sym2_set_iu, |
| 2126 | .show_iu = 1, | 2128 | .show_iu = 1, |
| 2127 | .set_qas = sym2_set_qas, | 2129 | .set_qas = sym2_set_qas, |
| 2128 | .show_qas = 1, | 2130 | .show_qas = 1, |
| 2131 | #endif | ||
| 2129 | .get_signalling = sym2_get_signalling, | 2132 | .get_signalling = sym2_get_signalling, |
| 2130 | }; | 2133 | }; |
| 2131 | 2134 | ||
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 7370583b61e5..c0d1a214572c 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -1287,6 +1287,7 @@ dentry->d_parent->d_name.name, dentry->d_name.name); | |||
| 1287 | nfs_begin_data_update(dentry->d_inode); | 1287 | nfs_begin_data_update(dentry->d_inode); |
| 1288 | error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, | 1288 | error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, |
| 1289 | dir, &qsilly); | 1289 | dir, &qsilly); |
| 1290 | nfs_mark_for_revalidate(dentry->d_inode); | ||
| 1290 | nfs_end_data_update(dentry->d_inode); | 1291 | nfs_end_data_update(dentry->d_inode); |
| 1291 | } else | 1292 | } else |
| 1292 | error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, | 1293 | error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, |
| @@ -1334,6 +1335,7 @@ static int nfs_safe_remove(struct dentry *dentry) | |||
| 1334 | /* The VFS may want to delete this inode */ | 1335 | /* The VFS may want to delete this inode */ |
| 1335 | if (error == 0) | 1336 | if (error == 0) |
| 1336 | inode->i_nlink--; | 1337 | inode->i_nlink--; |
| 1338 | nfs_mark_for_revalidate(inode); | ||
| 1337 | nfs_end_data_update(inode); | 1339 | nfs_end_data_update(inode); |
| 1338 | } else | 1340 | } else |
| 1339 | error = NFS_PROTO(dir)->remove(dir, &dentry->d_name); | 1341 | error = NFS_PROTO(dir)->remove(dir, &dentry->d_name); |
| @@ -1556,6 +1558,7 @@ go_ahead: | |||
| 1556 | nfs_begin_data_update(old_inode); | 1558 | nfs_begin_data_update(old_inode); |
| 1557 | error = NFS_PROTO(old_dir)->rename(old_dir, &old_dentry->d_name, | 1559 | error = NFS_PROTO(old_dir)->rename(old_dir, &old_dentry->d_name, |
| 1558 | new_dir, &new_dentry->d_name); | 1560 | new_dir, &new_dentry->d_name); |
| 1561 | nfs_mark_for_revalidate(old_inode); | ||
| 1559 | nfs_end_data_update(old_inode); | 1562 | nfs_end_data_update(old_inode); |
| 1560 | nfs_end_data_update(new_dir); | 1563 | nfs_end_data_update(new_dir); |
| 1561 | nfs_end_data_update(old_dir); | 1564 | nfs_end_data_update(old_dir); |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index aaab1a5ac461..afd75d0463fd 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | #define NFS_MAX_READAHEAD (RPC_DEF_SLOT_TABLE - 1) | 54 | #define NFS_MAX_READAHEAD (RPC_DEF_SLOT_TABLE - 1) |
| 55 | 55 | ||
| 56 | static void nfs_invalidate_inode(struct inode *); | 56 | static void nfs_invalidate_inode(struct inode *); |
| 57 | static int nfs_update_inode(struct inode *, struct nfs_fattr *, unsigned long); | 57 | static int nfs_update_inode(struct inode *, struct nfs_fattr *); |
| 58 | 58 | ||
| 59 | static struct inode *nfs_alloc_inode(struct super_block *sb); | 59 | static struct inode *nfs_alloc_inode(struct super_block *sb); |
| 60 | static void nfs_destroy_inode(struct inode *); | 60 | static void nfs_destroy_inode(struct inode *); |
| @@ -1080,8 +1080,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
| 1080 | int status = -ESTALE; | 1080 | int status = -ESTALE; |
| 1081 | struct nfs_fattr fattr; | 1081 | struct nfs_fattr fattr; |
| 1082 | struct nfs_inode *nfsi = NFS_I(inode); | 1082 | struct nfs_inode *nfsi = NFS_I(inode); |
| 1083 | unsigned long verifier; | ||
| 1084 | unsigned long cache_validity; | ||
| 1085 | 1083 | ||
| 1086 | dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n", | 1084 | dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n", |
| 1087 | inode->i_sb->s_id, (long long)NFS_FILEID(inode)); | 1085 | inode->i_sb->s_id, (long long)NFS_FILEID(inode)); |
| @@ -1106,8 +1104,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
| 1106 | } | 1104 | } |
| 1107 | } | 1105 | } |
| 1108 | 1106 | ||
| 1109 | /* Protect against RPC races by saving the change attribute */ | ||
| 1110 | verifier = nfs_save_change_attribute(inode); | ||
| 1111 | status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), &fattr); | 1107 | status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), &fattr); |
| 1112 | if (status != 0) { | 1108 | if (status != 0) { |
| 1113 | dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n", | 1109 | dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n", |
| @@ -1122,7 +1118,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
| 1122 | } | 1118 | } |
| 1123 | 1119 | ||
| 1124 | spin_lock(&inode->i_lock); | 1120 | spin_lock(&inode->i_lock); |
| 1125 | status = nfs_update_inode(inode, &fattr, verifier); | 1121 | status = nfs_update_inode(inode, &fattr); |
| 1126 | if (status) { | 1122 | if (status) { |
| 1127 | spin_unlock(&inode->i_lock); | 1123 | spin_unlock(&inode->i_lock); |
| 1128 | dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n", | 1124 | dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n", |
| @@ -1130,20 +1126,11 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
| 1130 | (long long)NFS_FILEID(inode), status); | 1126 | (long long)NFS_FILEID(inode), status); |
| 1131 | goto out; | 1127 | goto out; |
| 1132 | } | 1128 | } |
| 1133 | cache_validity = nfsi->cache_validity; | ||
| 1134 | nfsi->cache_validity &= ~NFS_INO_REVAL_PAGECACHE; | ||
| 1135 | |||
| 1136 | /* | ||
| 1137 | * We may need to keep the attributes marked as invalid if | ||
| 1138 | * we raced with nfs_end_attr_update(). | ||
| 1139 | */ | ||
| 1140 | if (time_after_eq(verifier, nfsi->cache_change_attribute)) | ||
| 1141 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME); | ||
| 1142 | spin_unlock(&inode->i_lock); | 1129 | spin_unlock(&inode->i_lock); |
| 1143 | 1130 | ||
| 1144 | nfs_revalidate_mapping(inode, inode->i_mapping); | 1131 | nfs_revalidate_mapping(inode, inode->i_mapping); |
| 1145 | 1132 | ||
| 1146 | if (cache_validity & NFS_INO_INVALID_ACL) | 1133 | if (nfsi->cache_validity & NFS_INO_INVALID_ACL) |
| 1147 | nfs_zap_acl_cache(inode); | 1134 | nfs_zap_acl_cache(inode); |
| 1148 | 1135 | ||
| 1149 | dfprintk(PAGECACHE, "NFS: (%s/%Ld) revalidation complete\n", | 1136 | dfprintk(PAGECACHE, "NFS: (%s/%Ld) revalidation complete\n", |
| @@ -1346,10 +1333,8 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr) | |||
| 1346 | return 0; | 1333 | return 0; |
| 1347 | spin_lock(&inode->i_lock); | 1334 | spin_lock(&inode->i_lock); |
| 1348 | nfsi->cache_validity &= ~NFS_INO_REVAL_PAGECACHE; | 1335 | nfsi->cache_validity &= ~NFS_INO_REVAL_PAGECACHE; |
| 1349 | if (nfs_verify_change_attribute(inode, fattr->time_start)) | ||
| 1350 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME); | ||
| 1351 | if (time_after(fattr->time_start, nfsi->last_updated)) | 1336 | if (time_after(fattr->time_start, nfsi->last_updated)) |
| 1352 | status = nfs_update_inode(inode, fattr, fattr->time_start); | 1337 | status = nfs_update_inode(inode, fattr); |
| 1353 | else | 1338 | else |
| 1354 | status = nfs_check_inode_attributes(inode, fattr); | 1339 | status = nfs_check_inode_attributes(inode, fattr); |
| 1355 | 1340 | ||
| @@ -1375,10 +1360,7 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr) | |||
| 1375 | nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS; | 1360 | nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS; |
| 1376 | goto out; | 1361 | goto out; |
| 1377 | } | 1362 | } |
| 1378 | status = nfs_update_inode(inode, fattr, fattr->time_start); | 1363 | status = nfs_update_inode(inode, fattr); |
| 1379 | if (time_after_eq(fattr->time_start, nfsi->cache_change_attribute)) | ||
| 1380 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME|NFS_INO_REVAL_PAGECACHE); | ||
| 1381 | nfsi->cache_change_attribute = jiffies; | ||
| 1382 | out: | 1364 | out: |
| 1383 | spin_unlock(&inode->i_lock); | 1365 | spin_unlock(&inode->i_lock); |
| 1384 | return status; | 1366 | return status; |
| @@ -1396,12 +1378,12 @@ out: | |||
| 1396 | * | 1378 | * |
| 1397 | * A very similar scenario holds for the dir cache. | 1379 | * A very similar scenario holds for the dir cache. |
| 1398 | */ | 1380 | */ |
| 1399 | static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsigned long verifier) | 1381 | static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) |
| 1400 | { | 1382 | { |
| 1401 | struct nfs_inode *nfsi = NFS_I(inode); | 1383 | struct nfs_inode *nfsi = NFS_I(inode); |
| 1402 | loff_t cur_isize, new_isize; | 1384 | loff_t cur_isize, new_isize; |
| 1403 | unsigned int invalid = 0; | 1385 | unsigned int invalid = 0; |
| 1404 | int data_unstable; | 1386 | int data_stable; |
| 1405 | 1387 | ||
| 1406 | dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n", | 1388 | dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n", |
| 1407 | __FUNCTION__, inode->i_sb->s_id, inode->i_ino, | 1389 | __FUNCTION__, inode->i_sb->s_id, inode->i_ino, |
| @@ -1432,8 +1414,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
| 1432 | nfsi->last_updated = jiffies; | 1414 | nfsi->last_updated = jiffies; |
| 1433 | 1415 | ||
| 1434 | /* Are we racing with known updates of the metadata on the server? */ | 1416 | /* Are we racing with known updates of the metadata on the server? */ |
| 1435 | data_unstable = ! (nfs_verify_change_attribute(inode, verifier) || | 1417 | data_stable = nfs_verify_change_attribute(inode, fattr->time_start); |
| 1436 | (nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE)); | 1418 | if (data_stable) |
| 1419 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME); | ||
| 1437 | 1420 | ||
| 1438 | /* Check if our cached file size is stale */ | 1421 | /* Check if our cached file size is stale */ |
| 1439 | new_isize = nfs_size_to_loff_t(fattr->size); | 1422 | new_isize = nfs_size_to_loff_t(fattr->size); |
| @@ -1442,7 +1425,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
| 1442 | /* Do we perhaps have any outstanding writes? */ | 1425 | /* Do we perhaps have any outstanding writes? */ |
| 1443 | if (nfsi->npages == 0) { | 1426 | if (nfsi->npages == 0) { |
| 1444 | /* No, but did we race with nfs_end_data_update()? */ | 1427 | /* No, but did we race with nfs_end_data_update()? */ |
| 1445 | if (time_after_eq(verifier, nfsi->cache_change_attribute)) { | 1428 | if (data_stable) { |
| 1446 | inode->i_size = new_isize; | 1429 | inode->i_size = new_isize; |
| 1447 | invalid |= NFS_INO_INVALID_DATA; | 1430 | invalid |= NFS_INO_INVALID_DATA; |
| 1448 | } | 1431 | } |
| @@ -1451,6 +1434,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
| 1451 | inode->i_size = new_isize; | 1434 | inode->i_size = new_isize; |
| 1452 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA; | 1435 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA; |
| 1453 | } | 1436 | } |
| 1437 | nfsi->cache_change_attribute = jiffies; | ||
| 1454 | dprintk("NFS: isize change on server for file %s/%ld\n", | 1438 | dprintk("NFS: isize change on server for file %s/%ld\n", |
| 1455 | inode->i_sb->s_id, inode->i_ino); | 1439 | inode->i_sb->s_id, inode->i_ino); |
| 1456 | } | 1440 | } |
| @@ -1460,8 +1444,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
| 1460 | memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime)); | 1444 | memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime)); |
| 1461 | dprintk("NFS: mtime change on server for file %s/%ld\n", | 1445 | dprintk("NFS: mtime change on server for file %s/%ld\n", |
| 1462 | inode->i_sb->s_id, inode->i_ino); | 1446 | inode->i_sb->s_id, inode->i_ino); |
| 1463 | if (!data_unstable) | 1447 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA; |
| 1464 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA; | 1448 | nfsi->cache_change_attribute = jiffies; |
| 1465 | } | 1449 | } |
| 1466 | 1450 | ||
| 1467 | if ((fattr->valid & NFS_ATTR_FATTR_V4) | 1451 | if ((fattr->valid & NFS_ATTR_FATTR_V4) |
| @@ -1469,15 +1453,15 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
| 1469 | dprintk("NFS: change_attr change on server for file %s/%ld\n", | 1453 | dprintk("NFS: change_attr change on server for file %s/%ld\n", |
| 1470 | inode->i_sb->s_id, inode->i_ino); | 1454 | inode->i_sb->s_id, inode->i_ino); |
| 1471 | nfsi->change_attr = fattr->change_attr; | 1455 | nfsi->change_attr = fattr->change_attr; |
| 1472 | if (!data_unstable) | 1456 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; |
| 1473 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; | 1457 | nfsi->cache_change_attribute = jiffies; |
| 1474 | } | 1458 | } |
| 1475 | 1459 | ||
| 1476 | /* If ctime has changed we should definitely clear access+acl caches */ | 1460 | /* If ctime has changed we should definitely clear access+acl caches */ |
| 1477 | if (!timespec_equal(&inode->i_ctime, &fattr->ctime)) { | 1461 | if (!timespec_equal(&inode->i_ctime, &fattr->ctime)) { |
| 1478 | if (!data_unstable) | 1462 | invalid |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; |
| 1479 | invalid |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; | ||
| 1480 | memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime)); | 1463 | memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime)); |
| 1464 | nfsi->cache_change_attribute = jiffies; | ||
| 1481 | } | 1465 | } |
| 1482 | memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); | 1466 | memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); |
| 1483 | 1467 | ||
| @@ -1515,6 +1499,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
| 1515 | if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) | 1499 | if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) |
| 1516 | || S_ISLNK(inode->i_mode))) | 1500 | || S_ISLNK(inode->i_mode))) |
| 1517 | invalid &= ~NFS_INO_INVALID_DATA; | 1501 | invalid &= ~NFS_INO_INVALID_DATA; |
| 1502 | if (data_stable) | ||
| 1503 | invalid &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME|NFS_INO_REVAL_PAGECACHE); | ||
| 1518 | if (!nfs_have_delegation(inode, FMODE_READ)) | 1504 | if (!nfs_have_delegation(inode, FMODE_READ)) |
| 1519 | nfsi->cache_validity |= invalid; | 1505 | nfsi->cache_validity |= invalid; |
| 1520 | 1506 | ||
| @@ -2066,6 +2052,7 @@ static struct inode *nfs_alloc_inode(struct super_block *sb) | |||
| 2066 | return NULL; | 2052 | return NULL; |
| 2067 | nfsi->flags = 0UL; | 2053 | nfsi->flags = 0UL; |
| 2068 | nfsi->cache_validity = 0UL; | 2054 | nfsi->cache_validity = 0UL; |
| 2055 | nfsi->cache_change_attribute = jiffies; | ||
| 2069 | #ifdef CONFIG_NFS_V3_ACL | 2056 | #ifdef CONFIG_NFS_V3_ACL |
| 2070 | nfsi->acl_access = ERR_PTR(-EAGAIN); | 2057 | nfsi->acl_access = ERR_PTR(-EAGAIN); |
| 2071 | nfsi->acl_default = ERR_PTR(-EAGAIN); | 2058 | nfsi->acl_default = ERR_PTR(-EAGAIN); |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 60e0dd800cc3..f988a9417b13 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -1506,10 +1506,15 @@ static int _nfs4_proc_write(struct nfs_write_data *wdata) | |||
| 1506 | dprintk("NFS call write %d @ %Ld\n", wdata->args.count, | 1506 | dprintk("NFS call write %d @ %Ld\n", wdata->args.count, |
| 1507 | (long long) wdata->args.offset); | 1507 | (long long) wdata->args.offset); |
| 1508 | 1508 | ||
| 1509 | wdata->args.bitmask = server->attr_bitmask; | ||
| 1510 | wdata->res.server = server; | ||
| 1509 | nfs_fattr_init(fattr); | 1511 | nfs_fattr_init(fattr); |
| 1510 | status = rpc_call_sync(server->client, &msg, rpcflags); | 1512 | status = rpc_call_sync(server->client, &msg, rpcflags); |
| 1511 | dprintk("NFS reply write: %d\n", status); | 1513 | dprintk("NFS reply write: %d\n", status); |
| 1512 | return status; | 1514 | if (status < 0) |
| 1515 | return status; | ||
| 1516 | nfs_post_op_update_inode(inode, fattr); | ||
| 1517 | return wdata->res.count; | ||
| 1513 | } | 1518 | } |
| 1514 | 1519 | ||
| 1515 | static int nfs4_proc_write(struct nfs_write_data *wdata) | 1520 | static int nfs4_proc_write(struct nfs_write_data *wdata) |
| @@ -1540,9 +1545,13 @@ static int _nfs4_proc_commit(struct nfs_write_data *cdata) | |||
| 1540 | dprintk("NFS call commit %d @ %Ld\n", cdata->args.count, | 1545 | dprintk("NFS call commit %d @ %Ld\n", cdata->args.count, |
| 1541 | (long long) cdata->args.offset); | 1546 | (long long) cdata->args.offset); |
| 1542 | 1547 | ||
| 1548 | cdata->args.bitmask = server->attr_bitmask; | ||
| 1549 | cdata->res.server = server; | ||
| 1543 | nfs_fattr_init(fattr); | 1550 | nfs_fattr_init(fattr); |
| 1544 | status = rpc_call_sync(server->client, &msg, 0); | 1551 | status = rpc_call_sync(server->client, &msg, 0); |
| 1545 | dprintk("NFS reply commit: %d\n", status); | 1552 | dprintk("NFS reply commit: %d\n", status); |
| 1553 | if (status >= 0) | ||
| 1554 | nfs_post_op_update_inode(inode, fattr); | ||
| 1546 | return status; | 1555 | return status; |
| 1547 | } | 1556 | } |
| 1548 | 1557 | ||
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index a48a003242c0..e1e3ca5d746b 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c | |||
| @@ -375,6 +375,7 @@ nfs_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) | |||
| 375 | 375 | ||
| 376 | dprintk("NFS call link %s\n", name->name); | 376 | dprintk("NFS call link %s\n", name->name); |
| 377 | status = rpc_call(NFS_CLIENT(inode), NFSPROC_LINK, &arg, NULL, 0); | 377 | status = rpc_call(NFS_CLIENT(inode), NFSPROC_LINK, &arg, NULL, 0); |
| 378 | nfs_mark_for_revalidate(inode); | ||
| 378 | nfs_mark_for_revalidate(dir); | 379 | nfs_mark_for_revalidate(dir); |
| 379 | dprintk("NFS reply link: %d\n", status); | 380 | dprintk("NFS reply link: %d\n", status); |
| 380 | return status; | 381 | return status; |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 8f71e766cc5d..3107908e5f3f 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -189,6 +189,7 @@ static int nfs_writepage_sync(struct nfs_open_context *ctx, struct inode *inode, | |||
| 189 | (long long)NFS_FILEID(inode), | 189 | (long long)NFS_FILEID(inode), |
| 190 | count, (long long)(page_offset(page) + offset)); | 190 | count, (long long)(page_offset(page) + offset)); |
| 191 | 191 | ||
| 192 | set_page_writeback(page); | ||
| 192 | nfs_begin_data_update(inode); | 193 | nfs_begin_data_update(inode); |
| 193 | do { | 194 | do { |
| 194 | if (count < wsize) | 195 | if (count < wsize) |
| @@ -221,6 +222,7 @@ static int nfs_writepage_sync(struct nfs_open_context *ctx, struct inode *inode, | |||
| 221 | 222 | ||
| 222 | io_error: | 223 | io_error: |
| 223 | nfs_end_data_update(inode); | 224 | nfs_end_data_update(inode); |
| 225 | end_page_writeback(page); | ||
| 224 | nfs_writedata_free(wdata); | 226 | nfs_writedata_free(wdata); |
| 225 | return written ? written : result; | 227 | return written ? written : result; |
| 226 | } | 228 | } |
| @@ -929,7 +931,7 @@ static int nfs_flush_multi(struct list_head *head, struct inode *inode, int how) | |||
| 929 | atomic_set(&req->wb_complete, requests); | 931 | atomic_set(&req->wb_complete, requests); |
| 930 | 932 | ||
| 931 | ClearPageError(page); | 933 | ClearPageError(page); |
| 932 | SetPageWriteback(page); | 934 | set_page_writeback(page); |
| 933 | offset = 0; | 935 | offset = 0; |
| 934 | nbytes = req->wb_bytes; | 936 | nbytes = req->wb_bytes; |
| 935 | do { | 937 | do { |
| @@ -992,7 +994,7 @@ static int nfs_flush_one(struct list_head *head, struct inode *inode, int how) | |||
| 992 | nfs_list_remove_request(req); | 994 | nfs_list_remove_request(req); |
| 993 | nfs_list_add_request(req, &data->pages); | 995 | nfs_list_add_request(req, &data->pages); |
| 994 | ClearPageError(req->wb_page); | 996 | ClearPageError(req->wb_page); |
| 995 | SetPageWriteback(req->wb_page); | 997 | set_page_writeback(req->wb_page); |
| 996 | *pages++ = req->wb_page; | 998 | *pages++ = req->wb_page; |
| 997 | count += req->wb_bytes; | 999 | count += req->wb_bytes; |
| 998 | } | 1000 | } |
diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h index 71ca7d412687..d5dc624f452a 100644 --- a/include/asm-arm/semaphore.h +++ b/include/asm-arm/semaphore.h | |||
| @@ -47,11 +47,6 @@ static inline void init_MUTEX_LOCKED(struct semaphore *sem) | |||
| 47 | sema_init(sem, 0); | 47 | sema_init(sem, 0); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | static inline int sema_count(struct semaphore *sem) | ||
| 51 | { | ||
| 52 | return atomic_read(&sem->count); | ||
| 53 | } | ||
| 54 | |||
| 55 | /* | 50 | /* |
| 56 | * special register calling convention | 51 | * special register calling convention |
| 57 | */ | 52 | */ |
diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h index 6ed4f916b166..43ad4e55878c 100644 --- a/include/asm-arm/spinlock.h +++ b/include/asm-arm/spinlock.h | |||
| @@ -30,6 +30,9 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock) | |||
| 30 | __asm__ __volatile__( | 30 | __asm__ __volatile__( |
| 31 | "1: ldrex %0, [%1]\n" | 31 | "1: ldrex %0, [%1]\n" |
| 32 | " teq %0, #0\n" | 32 | " teq %0, #0\n" |
| 33 | #ifdef CONFIG_CPU_32v6K | ||
| 34 | " wfene\n" | ||
| 35 | #endif | ||
| 33 | " strexeq %0, %2, [%1]\n" | 36 | " strexeq %0, %2, [%1]\n" |
| 34 | " teqeq %0, #0\n" | 37 | " teqeq %0, #0\n" |
| 35 | " bne 1b" | 38 | " bne 1b" |
| @@ -65,7 +68,11 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock) | |||
| 65 | smp_mb(); | 68 | smp_mb(); |
| 66 | 69 | ||
| 67 | __asm__ __volatile__( | 70 | __asm__ __volatile__( |
| 68 | " str %1, [%0]" | 71 | " str %1, [%0]\n" |
| 72 | #ifdef CONFIG_CPU_32v6K | ||
| 73 | " mcr p15, 0, %1, c7, c10, 4\n" /* DSB */ | ||
| 74 | " sev" | ||
| 75 | #endif | ||
| 69 | : | 76 | : |
| 70 | : "r" (&lock->lock), "r" (0) | 77 | : "r" (&lock->lock), "r" (0) |
| 71 | : "cc"); | 78 | : "cc"); |
| @@ -87,6 +94,9 @@ static inline void __raw_write_lock(raw_rwlock_t *rw) | |||
| 87 | __asm__ __volatile__( | 94 | __asm__ __volatile__( |
| 88 | "1: ldrex %0, [%1]\n" | 95 | "1: ldrex %0, [%1]\n" |
| 89 | " teq %0, #0\n" | 96 | " teq %0, #0\n" |
| 97 | #ifdef CONFIG_CPU_32v6K | ||
| 98 | " wfene\n" | ||
| 99 | #endif | ||
| 90 | " strexeq %0, %2, [%1]\n" | 100 | " strexeq %0, %2, [%1]\n" |
| 91 | " teq %0, #0\n" | 101 | " teq %0, #0\n" |
| 92 | " bne 1b" | 102 | " bne 1b" |
| @@ -122,7 +132,11 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) | |||
| 122 | smp_mb(); | 132 | smp_mb(); |
| 123 | 133 | ||
| 124 | __asm__ __volatile__( | 134 | __asm__ __volatile__( |
| 125 | "str %1, [%0]" | 135 | "str %1, [%0]\n" |
| 136 | #ifdef CONFIG_CPU_32v6K | ||
| 137 | " mcr p15, 0, %1, c7, c10, 4\n" /* DSB */ | ||
| 138 | " sev\n" | ||
| 139 | #endif | ||
| 126 | : | 140 | : |
| 127 | : "r" (&rw->lock), "r" (0) | 141 | : "r" (&rw->lock), "r" (0) |
| 128 | : "cc"); | 142 | : "cc"); |
| @@ -148,6 +162,9 @@ static inline void __raw_read_lock(raw_rwlock_t *rw) | |||
| 148 | "1: ldrex %0, [%2]\n" | 162 | "1: ldrex %0, [%2]\n" |
| 149 | " adds %0, %0, #1\n" | 163 | " adds %0, %0, #1\n" |
| 150 | " strexpl %1, %0, [%2]\n" | 164 | " strexpl %1, %0, [%2]\n" |
| 165 | #ifdef CONFIG_CPU_32v6K | ||
| 166 | " wfemi\n" | ||
| 167 | #endif | ||
| 151 | " rsbpls %0, %1, #0\n" | 168 | " rsbpls %0, %1, #0\n" |
| 152 | " bmi 1b" | 169 | " bmi 1b" |
| 153 | : "=&r" (tmp), "=&r" (tmp2) | 170 | : "=&r" (tmp), "=&r" (tmp2) |
| @@ -169,6 +186,11 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw) | |||
| 169 | " strex %1, %0, [%2]\n" | 186 | " strex %1, %0, [%2]\n" |
| 170 | " teq %1, #0\n" | 187 | " teq %1, #0\n" |
| 171 | " bne 1b" | 188 | " bne 1b" |
| 189 | #ifdef CONFIG_CPU_32v6K | ||
| 190 | "\n cmp %0, #0\n" | ||
| 191 | " mcreq p15, 0, %0, c7, c10, 4\n" | ||
| 192 | " seveq" | ||
| 193 | #endif | ||
| 172 | : "=&r" (tmp), "=&r" (tmp2) | 194 | : "=&r" (tmp), "=&r" (tmp2) |
| 173 | : "r" (&rw->lock) | 195 | : "r" (&rw->lock) |
| 174 | : "cc"); | 196 | : "cc"); |
diff --git a/include/asm-mips/mach-qemu/timex.h b/include/asm-mips/mach-qemu/timex.h new file mode 100644 index 000000000000..cd543693fb0a --- /dev/null +++ b/include/asm-mips/mach-qemu/timex.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | /* | ||
| 2 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | * License. See the file "COPYING" in the main directory of this archive | ||
| 4 | * for more details. | ||
| 5 | * | ||
| 6 | * Copyright (C) 2005 Daniel Jacobowitz | ||
| 7 | */ | ||
| 8 | #ifndef __ASM_MACH_QEMU_TIMEX_H | ||
| 9 | #define __ASM_MACH_QEMU_TIMEX_H | ||
| 10 | |||
| 11 | /* | ||
| 12 | * We use a simulated i8254 PIC... | ||
| 13 | */ | ||
| 14 | #define CLOCK_TICK_RATE 1193182 | ||
| 15 | |||
| 16 | #endif /* __ASM_MACH_QEMU_TIMEX_H */ | ||
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 1543daaa9c5e..ef3b5632e63a 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
| @@ -108,6 +108,7 @@ | |||
| 108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ | 108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ |
| 109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ | 109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ |
| 110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ | 110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ |
| 111 | #define I2C_DRIVERID_I2C_IR 75 /* I2C InfraRed on Video boards */ | ||
| 111 | 112 | ||
| 112 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ | 113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ |
| 113 | #define I2C_DRIVERID_EXP1 0xF1 | 114 | #define I2C_DRIVERID_EXP1 0xF1 |
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h index e2035c7da094..e9fc1a785497 100644 --- a/include/media/tveeprom.h +++ b/include/media/tveeprom.h | |||
| @@ -4,12 +4,15 @@ | |||
| 4 | struct tveeprom { | 4 | struct tveeprom { |
| 5 | u32 has_radio; | 5 | u32 has_radio; |
| 6 | u32 has_ir; /* 0: no IR, 1: IR present, 2: unknown */ | 6 | u32 has_ir; /* 0: no IR, 1: IR present, 2: unknown */ |
| 7 | u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */ | ||
| 7 | 8 | ||
| 8 | u32 tuner_type; | 9 | u32 tuner_type; |
| 9 | u32 tuner_formats; | 10 | u32 tuner_formats; |
| 11 | u32 tuner_hauppauge_model; | ||
| 10 | 12 | ||
| 11 | u32 tuner2_type; | 13 | u32 tuner2_type; |
| 12 | u32 tuner2_formats; | 14 | u32 tuner2_formats; |
| 15 | u32 tuner2_hauppauge_model; | ||
| 13 | 16 | ||
| 14 | u32 digitizer; | 17 | u32 digitizer; |
| 15 | u32 digitizer_formats; | 18 | u32 digitizer_formats; |
| @@ -21,6 +24,7 @@ struct tveeprom { | |||
| 21 | u32 revision; | 24 | u32 revision; |
| 22 | u32 serial_number; | 25 | u32 serial_number; |
| 23 | char rev_str[5]; | 26 | char rev_str[5]; |
| 27 | u8 MAC_address[6]; | ||
| 24 | }; | 28 | }; |
| 25 | 29 | ||
| 26 | void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | 30 | void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, |
diff --git a/mm/memory.c b/mm/memory.c index 4b4fc3a7ea48..aa8af0e20269 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1223,7 +1223,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page * | |||
| 1223 | return -EINVAL; | 1223 | return -EINVAL; |
| 1224 | return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); | 1224 | return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); |
| 1225 | } | 1225 | } |
| 1226 | EXPORT_SYMBOL_GPL(vm_insert_page); | 1226 | EXPORT_SYMBOL(vm_insert_page); |
| 1227 | 1227 | ||
| 1228 | /* | 1228 | /* |
| 1229 | * Somebody does a pfn remapping that doesn't actually work as a vma. | 1229 | * Somebody does a pfn remapping that doesn't actually work as a vma. |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b257720edfc8..3b21a13d841c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -1772,16 +1772,16 @@ static int __devinit zone_batchsize(struct zone *zone) | |||
| 1772 | batch = 1; | 1772 | batch = 1; |
| 1773 | 1773 | ||
| 1774 | /* | 1774 | /* |
| 1775 | * We will be trying to allcoate bigger chunks of contiguous | 1775 | * Clamp the batch to a 2^n - 1 value. Having a power |
| 1776 | * memory of the order of fls(batch). This should result in | 1776 | * of 2 value was found to be more likely to have |
| 1777 | * better cache coloring. | 1777 | * suboptimal cache aliasing properties in some cases. |
| 1778 | * | 1778 | * |
| 1779 | * A sanity check also to ensure that batch is still in limits. | 1779 | * For example if 2 tasks are alternately allocating |
| 1780 | * batches of pages, one task can end up with a lot | ||
| 1781 | * of pages of one half of the possible page colors | ||
| 1782 | * and the other with pages of the other colors. | ||
| 1780 | */ | 1783 | */ |
| 1781 | batch = (1 << fls(batch + batch/2)); | 1784 | batch = (1 << (fls(batch + batch/2)-1)) - 1; |
| 1782 | |||
| 1783 | if (fls(batch) >= (PAGE_SHIFT + MAX_ORDER - 2)) | ||
| 1784 | batch = PAGE_SHIFT + ((MAX_ORDER - 1 - PAGE_SHIFT)/2); | ||
| 1785 | 1785 | ||
| 1786 | return batch; | 1786 | return batch; |
| 1787 | } | 1787 | } |
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index eaa150c33b04..d368cf249000 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -228,13 +228,14 @@ static int inet_create(struct socket *sock, int protocol) | |||
| 228 | unsigned char answer_flags; | 228 | unsigned char answer_flags; |
| 229 | char answer_no_check; | 229 | char answer_no_check; |
| 230 | int try_loading_module = 0; | 230 | int try_loading_module = 0; |
| 231 | int err = -ESOCKTNOSUPPORT; | 231 | int err; |
| 232 | 232 | ||
| 233 | sock->state = SS_UNCONNECTED; | 233 | sock->state = SS_UNCONNECTED; |
| 234 | 234 | ||
| 235 | /* Look for the requested type/protocol pair. */ | 235 | /* Look for the requested type/protocol pair. */ |
| 236 | answer = NULL; | 236 | answer = NULL; |
| 237 | lookup_protocol: | 237 | lookup_protocol: |
| 238 | err = -ESOCKTNOSUPPORT; | ||
| 238 | rcu_read_lock(); | 239 | rcu_read_lock(); |
| 239 | list_for_each_rcu(p, &inetsw[sock->type]) { | 240 | list_for_each_rcu(p, &inetsw[sock->type]) { |
| 240 | answer = list_entry(p, struct inet_protosw, list); | 241 | answer = list_entry(p, struct inet_protosw, list); |
| @@ -252,6 +253,7 @@ lookup_protocol: | |||
| 252 | if (IPPROTO_IP == answer->protocol) | 253 | if (IPPROTO_IP == answer->protocol) |
| 253 | break; | 254 | break; |
| 254 | } | 255 | } |
| 256 | err = -EPROTONOSUPPORT; | ||
| 255 | answer = NULL; | 257 | answer = NULL; |
| 256 | } | 258 | } |
| 257 | 259 | ||
| @@ -280,9 +282,6 @@ lookup_protocol: | |||
| 280 | err = -EPERM; | 282 | err = -EPERM; |
| 281 | if (answer->capability > 0 && !capable(answer->capability)) | 283 | if (answer->capability > 0 && !capable(answer->capability)) |
| 282 | goto out_rcu_unlock; | 284 | goto out_rcu_unlock; |
| 283 | err = -EPROTONOSUPPORT; | ||
| 284 | if (!protocol) | ||
| 285 | goto out_rcu_unlock; | ||
| 286 | 285 | ||
| 287 | sock->ops = answer->ops; | 286 | sock->ops = answer->ops; |
| 288 | answer_prot = answer->prot; | 287 | answer_prot = answer->prot; |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 882f88f6d13b..19b1b984d687 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
| @@ -544,12 +544,16 @@ static void nl_fib_input(struct sock *sk, int len) | |||
| 544 | struct sk_buff *skb = NULL; | 544 | struct sk_buff *skb = NULL; |
| 545 | struct nlmsghdr *nlh = NULL; | 545 | struct nlmsghdr *nlh = NULL; |
| 546 | struct fib_result_nl *frn; | 546 | struct fib_result_nl *frn; |
| 547 | int err; | ||
| 548 | u32 pid; | 547 | u32 pid; |
| 549 | struct fib_table *tb; | 548 | struct fib_table *tb; |
| 550 | 549 | ||
| 551 | skb = skb_recv_datagram(sk, 0, 0, &err); | 550 | skb = skb_dequeue(&sk->sk_receive_queue); |
| 552 | nlh = (struct nlmsghdr *)skb->data; | 551 | nlh = (struct nlmsghdr *)skb->data; |
| 552 | if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len || | ||
| 553 | nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) { | ||
| 554 | kfree_skb(skb); | ||
| 555 | return; | ||
| 556 | } | ||
| 553 | 557 | ||
| 554 | frn = (struct fib_result_nl *) NLMSG_DATA(nlh); | 558 | frn = (struct fib_result_nl *) NLMSG_DATA(nlh); |
| 555 | tb = fib_get_table(frn->tb_id_in); | 559 | tb = fib_get_table(frn->tb_id_in); |
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index c04607b49212..4a195c724f01 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
| @@ -897,7 +897,10 @@ int igmp_rcv(struct sk_buff *skb) | |||
| 897 | /* Is it our report looped back? */ | 897 | /* Is it our report looped back? */ |
| 898 | if (((struct rtable*)skb->dst)->fl.iif == 0) | 898 | if (((struct rtable*)skb->dst)->fl.iif == 0) |
| 899 | break; | 899 | break; |
| 900 | igmp_heard_report(in_dev, ih->group); | 900 | /* don't rely on MC router hearing unicast reports */ |
| 901 | if (skb->pkt_type == PACKET_MULTICAST || | ||
| 902 | skb->pkt_type == PACKET_BROADCAST) | ||
| 903 | igmp_heard_report(in_dev, ih->group); | ||
| 901 | break; | 904 | break; |
| 902 | case IGMP_PIM: | 905 | case IGMP_PIM: |
| 903 | #ifdef CONFIG_IP_PIMSM_V1 | 906 | #ifdef CONFIG_IP_PIMSM_V1 |
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index 625981676776..aeb7353d4777 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | |||
| @@ -272,9 +272,9 @@ static const enum tcp_conntrack tcp_conntracks[2][6][TCP_CONNTRACK_MAX] = { | |||
| 272 | * sCL -> sCL | 272 | * sCL -> sCL |
| 273 | */ | 273 | */ |
| 274 | /* sNO, sSS, sSR, sES, sFW, sCW, sLA, sTW, sCL, sLI */ | 274 | /* sNO, sSS, sSR, sES, sFW, sCW, sLA, sTW, sCL, sLI */ |
| 275 | /*ack*/ { sIV, sIV, sSR, sES, sCW, sCW, sTW, sTW, sCL, sIV }, | 275 | /*ack*/ { sIV, sIG, sSR, sES, sCW, sCW, sTW, sTW, sCL, sIV }, |
| 276 | /* | 276 | /* |
| 277 | * sSS -> sIV Might be a half-open connection. | 277 | * sSS -> sIG Might be a half-open connection. |
| 278 | * sSR -> sSR Might answer late resent SYN. | 278 | * sSR -> sSR Might answer late resent SYN. |
| 279 | * sES -> sES :-) | 279 | * sES -> sES :-) |
| 280 | * sFW -> sCW Normal close request answered by ACK. | 280 | * sFW -> sCW Normal close request answered by ACK. |
| @@ -917,8 +917,12 @@ static int tcp_packet(struct ip_conntrack *conntrack, | |||
| 917 | 917 | ||
| 918 | switch (new_state) { | 918 | switch (new_state) { |
| 919 | case TCP_CONNTRACK_IGNORE: | 919 | case TCP_CONNTRACK_IGNORE: |
| 920 | /* Either SYN in ORIGINAL | 920 | /* Ignored packets: |
| 921 | * or SYN/ACK in REPLY. */ | 921 | * |
| 922 | * a) SYN in ORIGINAL | ||
| 923 | * b) SYN/ACK in REPLY | ||
| 924 | * c) ACK in reply direction after initial SYN in original. | ||
| 925 | */ | ||
| 922 | if (index == TCP_SYNACK_SET | 926 | if (index == TCP_SYNACK_SET |
| 923 | && conntrack->proto.tcp.last_index == TCP_SYN_SET | 927 | && conntrack->proto.tcp.last_index == TCP_SYN_SET |
| 924 | && conntrack->proto.tcp.last_dir != dir | 928 | && conntrack->proto.tcp.last_dir != dir |
| @@ -985,13 +989,20 @@ static int tcp_packet(struct ip_conntrack *conntrack, | |||
| 985 | } | 989 | } |
| 986 | case TCP_CONNTRACK_CLOSE: | 990 | case TCP_CONNTRACK_CLOSE: |
| 987 | if (index == TCP_RST_SET | 991 | if (index == TCP_RST_SET |
| 988 | && test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status) | 992 | && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status) |
| 989 | && conntrack->proto.tcp.last_index == TCP_SYN_SET | 993 | && conntrack->proto.tcp.last_index == TCP_SYN_SET) |
| 994 | || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) | ||
| 995 | && conntrack->proto.tcp.last_index == TCP_ACK_SET)) | ||
| 990 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { | 996 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { |
| 991 | /* RST sent to invalid SYN we had let trough | 997 | /* RST sent to invalid SYN or ACK we had let trough |
| 992 | * SYN was in window then, tear down connection. | 998 | * at a) and c) above: |
| 999 | * | ||
| 1000 | * a) SYN was in window then | ||
| 1001 | * c) we hold a half-open connection. | ||
| 1002 | * | ||
| 1003 | * Delete our connection entry. | ||
| 993 | * We skip window checking, because packet might ACK | 1004 | * We skip window checking, because packet might ACK |
| 994 | * segments we ignored in the SYN. */ | 1005 | * segments we ignored. */ |
| 995 | goto in_window; | 1006 | goto in_window; |
| 996 | } | 1007 | } |
| 997 | /* Just fall trough */ | 1008 | /* Just fall trough */ |
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c index 2d44b07688af..261cbb4d4c49 100644 --- a/net/ipv4/netfilter/ipt_recent.c +++ b/net/ipv4/netfilter/ipt_recent.c | |||
| @@ -532,6 +532,7 @@ match(const struct sk_buff *skb, | |||
| 532 | } | 532 | } |
| 533 | if(info->seconds && info->hit_count) { | 533 | if(info->seconds && info->hit_count) { |
| 534 | for(pkt_count = 0, hits_found = 0; pkt_count < ip_pkt_list_tot; pkt_count++) { | 534 | for(pkt_count = 0, hits_found = 0; pkt_count < ip_pkt_list_tot; pkt_count++) { |
| 535 | if(r_list[location].last_pkts[pkt_count] == 0) break; | ||
| 535 | if(time_before_eq(now,r_list[location].last_pkts[pkt_count]+info->seconds*HZ)) hits_found++; | 536 | if(time_before_eq(now,r_list[location].last_pkts[pkt_count]+info->seconds*HZ)) hits_found++; |
| 536 | } | 537 | } |
| 537 | if(hits_found >= info->hit_count) ans = !info->invert; else ans = info->invert; | 538 | if(hits_found >= info->hit_count) ans = !info->invert; else ans = info->invert; |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index c63b8ce0e1b5..d9546380fa04 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -92,10 +92,13 @@ static int inet6_create(struct socket *sock, int protocol) | |||
| 92 | struct proto *answer_prot; | 92 | struct proto *answer_prot; |
| 93 | unsigned char answer_flags; | 93 | unsigned char answer_flags; |
| 94 | char answer_no_check; | 94 | char answer_no_check; |
| 95 | int rc; | 95 | int try_loading_module = 0; |
| 96 | int err; | ||
| 96 | 97 | ||
| 97 | /* Look for the requested type/protocol pair. */ | 98 | /* Look for the requested type/protocol pair. */ |
| 98 | answer = NULL; | 99 | answer = NULL; |
| 100 | lookup_protocol: | ||
| 101 | err = -ESOCKTNOSUPPORT; | ||
| 99 | rcu_read_lock(); | 102 | rcu_read_lock(); |
| 100 | list_for_each_rcu(p, &inetsw6[sock->type]) { | 103 | list_for_each_rcu(p, &inetsw6[sock->type]) { |
| 101 | answer = list_entry(p, struct inet_protosw, list); | 104 | answer = list_entry(p, struct inet_protosw, list); |
| @@ -113,21 +116,37 @@ static int inet6_create(struct socket *sock, int protocol) | |||
| 113 | if (IPPROTO_IP == answer->protocol) | 116 | if (IPPROTO_IP == answer->protocol) |
| 114 | break; | 117 | break; |
| 115 | } | 118 | } |
| 119 | err = -EPROTONOSUPPORT; | ||
| 116 | answer = NULL; | 120 | answer = NULL; |
| 117 | } | 121 | } |
| 118 | 122 | ||
| 119 | rc = -ESOCKTNOSUPPORT; | 123 | if (!answer) { |
| 120 | if (!answer) | 124 | if (try_loading_module < 2) { |
| 121 | goto out_rcu_unlock; | 125 | rcu_read_unlock(); |
| 122 | rc = -EPERM; | 126 | /* |
| 127 | * Be more specific, e.g. net-pf-10-proto-132-type-1 | ||
| 128 | * (net-pf-PF_INET6-proto-IPPROTO_SCTP-type-SOCK_STREAM) | ||
| 129 | */ | ||
| 130 | if (++try_loading_module == 1) | ||
| 131 | request_module("net-pf-%d-proto-%d-type-%d", | ||
| 132 | PF_INET6, protocol, sock->type); | ||
| 133 | /* | ||
| 134 | * Fall back to generic, e.g. net-pf-10-proto-132 | ||
| 135 | * (net-pf-PF_INET6-proto-IPPROTO_SCTP) | ||
| 136 | */ | ||
| 137 | else | ||
| 138 | request_module("net-pf-%d-proto-%d", | ||
| 139 | PF_INET6, protocol); | ||
| 140 | goto lookup_protocol; | ||
| 141 | } else | ||
| 142 | goto out_rcu_unlock; | ||
| 143 | } | ||
| 144 | |||
| 145 | err = -EPERM; | ||
| 123 | if (answer->capability > 0 && !capable(answer->capability)) | 146 | if (answer->capability > 0 && !capable(answer->capability)) |
| 124 | goto out_rcu_unlock; | 147 | goto out_rcu_unlock; |
| 125 | rc = -EPROTONOSUPPORT; | ||
| 126 | if (!protocol) | ||
| 127 | goto out_rcu_unlock; | ||
| 128 | 148 | ||
| 129 | sock->ops = answer->ops; | 149 | sock->ops = answer->ops; |
| 130 | |||
| 131 | answer_prot = answer->prot; | 150 | answer_prot = answer->prot; |
| 132 | answer_no_check = answer->no_check; | 151 | answer_no_check = answer->no_check; |
| 133 | answer_flags = answer->flags; | 152 | answer_flags = answer->flags; |
| @@ -135,14 +154,14 @@ static int inet6_create(struct socket *sock, int protocol) | |||
| 135 | 154 | ||
| 136 | BUG_TRAP(answer_prot->slab != NULL); | 155 | BUG_TRAP(answer_prot->slab != NULL); |
| 137 | 156 | ||
| 138 | rc = -ENOBUFS; | 157 | err = -ENOBUFS; |
| 139 | sk = sk_alloc(PF_INET6, GFP_KERNEL, answer_prot, 1); | 158 | sk = sk_alloc(PF_INET6, GFP_KERNEL, answer_prot, 1); |
| 140 | if (sk == NULL) | 159 | if (sk == NULL) |
| 141 | goto out; | 160 | goto out; |
| 142 | 161 | ||
| 143 | sock_init_data(sock, sk); | 162 | sock_init_data(sock, sk); |
| 144 | 163 | ||
| 145 | rc = 0; | 164 | err = 0; |
| 146 | sk->sk_no_check = answer_no_check; | 165 | sk->sk_no_check = answer_no_check; |
| 147 | if (INET_PROTOSW_REUSE & answer_flags) | 166 | if (INET_PROTOSW_REUSE & answer_flags) |
| 148 | sk->sk_reuse = 1; | 167 | sk->sk_reuse = 1; |
| @@ -202,14 +221,14 @@ static int inet6_create(struct socket *sock, int protocol) | |||
| 202 | sk->sk_prot->hash(sk); | 221 | sk->sk_prot->hash(sk); |
| 203 | } | 222 | } |
| 204 | if (sk->sk_prot->init) { | 223 | if (sk->sk_prot->init) { |
| 205 | rc = sk->sk_prot->init(sk); | 224 | err = sk->sk_prot->init(sk); |
| 206 | if (rc) { | 225 | if (err) { |
| 207 | sk_common_release(sk); | 226 | sk_common_release(sk); |
| 208 | goto out; | 227 | goto out; |
| 209 | } | 228 | } |
| 210 | } | 229 | } |
| 211 | out: | 230 | out: |
| 212 | return rc; | 231 | return err; |
| 213 | out_rcu_unlock: | 232 | out_rcu_unlock: |
| 214 | rcu_read_unlock(); | 233 | rcu_read_unlock(); |
| 215 | goto out; | 234 | goto out; |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index f15e04ad026e..fd939da090c4 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
| @@ -1231,6 +1231,11 @@ int igmp6_event_report(struct sk_buff *skb) | |||
| 1231 | if (skb->pkt_type == PACKET_LOOPBACK) | 1231 | if (skb->pkt_type == PACKET_LOOPBACK) |
| 1232 | return 0; | 1232 | return 0; |
| 1233 | 1233 | ||
| 1234 | /* send our report if the MC router may not have heard this report */ | ||
| 1235 | if (skb->pkt_type != PACKET_MULTICAST && | ||
| 1236 | skb->pkt_type != PACKET_BROADCAST) | ||
| 1237 | return 0; | ||
| 1238 | |||
| 1234 | if (!pskb_may_pull(skb, sizeof(struct in6_addr))) | 1239 | if (!pskb_may_pull(skb, sizeof(struct in6_addr))) |
| 1235 | return -EINVAL; | 1240 | return -EINVAL; |
| 1236 | 1241 | ||
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 5a6fcf349bdf..6035633d8225 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c | |||
| @@ -280,9 +280,9 @@ static enum tcp_conntrack tcp_conntracks[2][6][TCP_CONNTRACK_MAX] = { | |||
| 280 | * sCL -> sCL | 280 | * sCL -> sCL |
| 281 | */ | 281 | */ |
| 282 | /* sNO, sSS, sSR, sES, sFW, sCW, sLA, sTW, sCL, sLI */ | 282 | /* sNO, sSS, sSR, sES, sFW, sCW, sLA, sTW, sCL, sLI */ |
| 283 | /*ack*/ { sIV, sIV, sSR, sES, sCW, sCW, sTW, sTW, sCL, sIV }, | 283 | /*ack*/ { sIV, sIG, sSR, sES, sCW, sCW, sTW, sTW, sCL, sIV }, |
| 284 | /* | 284 | /* |
| 285 | * sSS -> sIV Might be a half-open connection. | 285 | * sSS -> sIG Might be a half-open connection. |
| 286 | * sSR -> sSR Might answer late resent SYN. | 286 | * sSR -> sSR Might answer late resent SYN. |
| 287 | * sES -> sES :-) | 287 | * sES -> sES :-) |
| 288 | * sFW -> sCW Normal close request answered by ACK. | 288 | * sFW -> sCW Normal close request answered by ACK. |
| @@ -912,8 +912,12 @@ static int tcp_packet(struct nf_conn *conntrack, | |||
| 912 | 912 | ||
| 913 | switch (new_state) { | 913 | switch (new_state) { |
| 914 | case TCP_CONNTRACK_IGNORE: | 914 | case TCP_CONNTRACK_IGNORE: |
| 915 | /* Either SYN in ORIGINAL | 915 | /* Ignored packets: |
| 916 | * or SYN/ACK in REPLY. */ | 916 | * |
| 917 | * a) SYN in ORIGINAL | ||
| 918 | * b) SYN/ACK in REPLY | ||
| 919 | * c) ACK in reply direction after initial SYN in original. | ||
| 920 | */ | ||
| 917 | if (index == TCP_SYNACK_SET | 921 | if (index == TCP_SYNACK_SET |
| 918 | && conntrack->proto.tcp.last_index == TCP_SYN_SET | 922 | && conntrack->proto.tcp.last_index == TCP_SYN_SET |
| 919 | && conntrack->proto.tcp.last_dir != dir | 923 | && conntrack->proto.tcp.last_dir != dir |
| @@ -979,13 +983,20 @@ static int tcp_packet(struct nf_conn *conntrack, | |||
| 979 | } | 983 | } |
| 980 | case TCP_CONNTRACK_CLOSE: | 984 | case TCP_CONNTRACK_CLOSE: |
| 981 | if (index == TCP_RST_SET | 985 | if (index == TCP_RST_SET |
| 982 | && test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status) | 986 | && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status) |
| 983 | && conntrack->proto.tcp.last_index == TCP_SYN_SET | 987 | && conntrack->proto.tcp.last_index == TCP_SYN_SET) |
| 988 | || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) | ||
| 989 | && conntrack->proto.tcp.last_index == TCP_ACK_SET)) | ||
| 984 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { | 990 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { |
| 985 | /* RST sent to invalid SYN we had let trough | 991 | /* RST sent to invalid SYN or ACK we had let trough |
| 986 | * SYN was in window then, tear down connection. | 992 | * at a) and c) above: |
| 993 | * | ||
| 994 | * a) SYN was in window then | ||
| 995 | * c) we hold a half-open connection. | ||
| 996 | * | ||
| 997 | * Delete our connection entry. | ||
| 987 | * We skip window checking, because packet might ACK | 998 | * We skip window checking, because packet might ACK |
| 988 | * segments we ignored in the SYN. */ | 999 | * segments we ignored. */ |
| 989 | goto in_window; | 1000 | goto in_window; |
| 990 | } | 1001 | } |
| 991 | /* Just fall trough */ | 1002 | /* Just fall trough */ |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index abab81f3818f..d890dfa8818f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -4743,11 +4743,6 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, | |||
| 4743 | struct sk_buff *skb; | 4743 | struct sk_buff *skb; |
| 4744 | long timeo; | 4744 | long timeo; |
| 4745 | 4745 | ||
| 4746 | /* Caller is allowed not to check sk->sk_err before calling. */ | ||
| 4747 | error = sock_error(sk); | ||
| 4748 | if (error) | ||
| 4749 | goto no_packet; | ||
| 4750 | |||
| 4751 | timeo = sock_rcvtimeo(sk, noblock); | 4746 | timeo = sock_rcvtimeo(sk, noblock); |
| 4752 | 4747 | ||
| 4753 | SCTP_DEBUG_PRINTK("Timeout: timeo: %ld, MAX: %ld.\n", | 4748 | SCTP_DEBUG_PRINTK("Timeout: timeo: %ld, MAX: %ld.\n", |
| @@ -4774,6 +4769,11 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, | |||
| 4774 | if (skb) | 4769 | if (skb) |
| 4775 | return skb; | 4770 | return skb; |
| 4776 | 4771 | ||
| 4772 | /* Caller is allowed not to check sk->sk_err before calling. */ | ||
| 4773 | error = sock_error(sk); | ||
| 4774 | if (error) | ||
| 4775 | goto no_packet; | ||
| 4776 | |||
| 4777 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 4777 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
| 4778 | break; | 4778 | break; |
| 4779 | 4779 | ||
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 6bc27200e6ca..268ddaf2dc0f 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c | |||
| @@ -261,7 +261,8 @@ void sctp_transport_route(struct sctp_transport *transport, | |||
| 261 | * association's active path for getsockname(). | 261 | * association's active path for getsockname(). |
| 262 | */ | 262 | */ |
| 263 | if (asoc && (transport == asoc->peer.active_path)) | 263 | if (asoc && (transport == asoc->peer.active_path)) |
| 264 | af->to_sk_saddr(&transport->saddr, asoc->base.sk); | 264 | opt->pf->af->to_sk_saddr(&transport->saddr, |
| 265 | asoc->base.sk); | ||
| 265 | } else | 266 | } else |
| 266 | transport->pmtu = SCTP_DEFAULT_MAXSEGMENT; | 267 | transport->pmtu = SCTP_DEFAULT_MAXSEGMENT; |
| 267 | } | 268 | } |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index e3b242daf53c..c76ea221798c 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
| @@ -59,7 +59,6 @@ __rpc_purge_upcall(struct inode *inode, int err) | |||
| 59 | struct rpc_inode *rpci = RPC_I(inode); | 59 | struct rpc_inode *rpci = RPC_I(inode); |
| 60 | 60 | ||
| 61 | __rpc_purge_list(rpci, &rpci->pipe, err); | 61 | __rpc_purge_list(rpci, &rpci->pipe, err); |
| 62 | __rpc_purge_list(rpci, &rpci->in_upcall, err); | ||
| 63 | rpci->pipelen = 0; | 62 | rpci->pipelen = 0; |
| 64 | wake_up(&rpci->waitq); | 63 | wake_up(&rpci->waitq); |
| 65 | } | 64 | } |
| @@ -119,6 +118,7 @@ rpc_close_pipes(struct inode *inode) | |||
| 119 | down(&inode->i_sem); | 118 | down(&inode->i_sem); |
| 120 | if (rpci->ops != NULL) { | 119 | if (rpci->ops != NULL) { |
| 121 | rpci->nreaders = 0; | 120 | rpci->nreaders = 0; |
| 121 | __rpc_purge_list(rpci, &rpci->in_upcall, -EPIPE); | ||
| 122 | __rpc_purge_upcall(inode, -EPIPE); | 122 | __rpc_purge_upcall(inode, -EPIPE); |
| 123 | rpci->nwriters = 0; | 123 | rpci->nwriters = 0; |
| 124 | if (rpci->ops->release_pipe) | 124 | if (rpci->ops->release_pipe) |
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index c7a0ab1cfda3..4e9fa8be44b8 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
| @@ -526,7 +526,7 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref, | |||
| 526 | (!key->type->match || | 526 | (!key->type->match || |
| 527 | key->type->match(key, description)) && | 527 | key->type->match(key, description)) && |
| 528 | key_permission(make_key_ref(key, possessed), | 528 | key_permission(make_key_ref(key, possessed), |
| 529 | perm) < 0 && | 529 | perm) == 0 && |
| 530 | !test_bit(KEY_FLAG_REVOKED, &key->flags) | 530 | !test_bit(KEY_FLAG_REVOKED, &key->flags) |
| 531 | ) | 531 | ) |
| 532 | goto found; | 532 | goto found; |