diff options
517 files changed, 8019 insertions, 3117 deletions
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index ba9975771503..ff3e5bec1c24 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl | |||
| @@ -107,10 +107,6 @@ void (*dev_config) (struct ata_port *, struct ata_device *); | |||
| 107 | issue of SET FEATURES - XFER MODE, and prior to operation. | 107 | issue of SET FEATURES - XFER MODE, and prior to operation. |
| 108 | </para> | 108 | </para> |
| 109 | <para> | 109 | <para> |
| 110 | Called by ata_device_add() after ata_dev_identify() determines | ||
| 111 | a device is present. | ||
| 112 | </para> | ||
| 113 | <para> | ||
| 114 | This entry may be specified as NULL in ata_port_operations. | 110 | This entry may be specified as NULL in ata_port_operations. |
| 115 | </para> | 111 | </para> |
| 116 | 112 | ||
| @@ -154,8 +150,8 @@ unsigned int (*mode_filter) (struct ata_port *, struct ata_device *, unsigned in | |||
| 154 | 150 | ||
| 155 | <sect2><title>Taskfile read/write</title> | 151 | <sect2><title>Taskfile read/write</title> |
| 156 | <programlisting> | 152 | <programlisting> |
| 157 | void (*tf_load) (struct ata_port *ap, struct ata_taskfile *tf); | 153 | void (*sff_tf_load) (struct ata_port *ap, struct ata_taskfile *tf); |
| 158 | void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); | 154 | void (*sff_tf_read) (struct ata_port *ap, struct ata_taskfile *tf); |
| 159 | </programlisting> | 155 | </programlisting> |
| 160 | 156 | ||
| 161 | <para> | 157 | <para> |
| @@ -164,36 +160,35 @@ void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); | |||
| 164 | hardware registers / DMA buffers, to obtain the current set of | 160 | hardware registers / DMA buffers, to obtain the current set of |
| 165 | taskfile register values. | 161 | taskfile register values. |
| 166 | Most drivers for taskfile-based hardware (PIO or MMIO) use | 162 | Most drivers for taskfile-based hardware (PIO or MMIO) use |
| 167 | ata_tf_load() and ata_tf_read() for these hooks. | 163 | ata_sff_tf_load() and ata_sff_tf_read() for these hooks. |
| 168 | </para> | 164 | </para> |
| 169 | 165 | ||
| 170 | </sect2> | 166 | </sect2> |
| 171 | 167 | ||
| 172 | <sect2><title>PIO data read/write</title> | 168 | <sect2><title>PIO data read/write</title> |
| 173 | <programlisting> | 169 | <programlisting> |
| 174 | void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int); | 170 | void (*sff_data_xfer) (struct ata_device *, unsigned char *, unsigned int, int); |
| 175 | </programlisting> | 171 | </programlisting> |
| 176 | 172 | ||
| 177 | <para> | 173 | <para> |
| 178 | All bmdma-style drivers must implement this hook. This is the low-level | 174 | All bmdma-style drivers must implement this hook. This is the low-level |
| 179 | operation that actually copies the data bytes during a PIO data | 175 | operation that actually copies the data bytes during a PIO data |
| 180 | transfer. | 176 | transfer. |
| 181 | Typically the driver | 177 | Typically the driver will choose one of ata_sff_data_xfer_noirq(), |
| 182 | will choose one of ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), or | 178 | ata_sff_data_xfer(), or ata_sff_data_xfer32(). |
| 183 | ata_mmio_data_xfer(). | ||
| 184 | </para> | 179 | </para> |
| 185 | 180 | ||
| 186 | </sect2> | 181 | </sect2> |
| 187 | 182 | ||
| 188 | <sect2><title>ATA command execute</title> | 183 | <sect2><title>ATA command execute</title> |
| 189 | <programlisting> | 184 | <programlisting> |
| 190 | void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf); | 185 | void (*sff_exec_command)(struct ata_port *ap, struct ata_taskfile *tf); |
| 191 | </programlisting> | 186 | </programlisting> |
| 192 | 187 | ||
| 193 | <para> | 188 | <para> |
| 194 | causes an ATA command, previously loaded with | 189 | causes an ATA command, previously loaded with |
| 195 | ->tf_load(), to be initiated in hardware. | 190 | ->tf_load(), to be initiated in hardware. |
| 196 | Most drivers for taskfile-based hardware use ata_exec_command() | 191 | Most drivers for taskfile-based hardware use ata_sff_exec_command() |
| 197 | for this hook. | 192 | for this hook. |
| 198 | </para> | 193 | </para> |
| 199 | 194 | ||
| @@ -218,8 +213,8 @@ command. | |||
| 218 | 213 | ||
| 219 | <sect2><title>Read specific ATA shadow registers</title> | 214 | <sect2><title>Read specific ATA shadow registers</title> |
| 220 | <programlisting> | 215 | <programlisting> |
| 221 | u8 (*check_status)(struct ata_port *ap); | 216 | u8 (*sff_check_status)(struct ata_port *ap); |
| 222 | u8 (*check_altstatus)(struct ata_port *ap); | 217 | u8 (*sff_check_altstatus)(struct ata_port *ap); |
| 223 | </programlisting> | 218 | </programlisting> |
| 224 | 219 | ||
| 225 | <para> | 220 | <para> |
| @@ -227,20 +222,14 @@ u8 (*check_altstatus)(struct ata_port *ap); | |||
| 227 | hardware. On some hardware, reading the Status register has | 222 | hardware. On some hardware, reading the Status register has |
| 228 | the side effect of clearing the interrupt condition. | 223 | the side effect of clearing the interrupt condition. |
| 229 | Most drivers for taskfile-based hardware use | 224 | Most drivers for taskfile-based hardware use |
| 230 | ata_check_status() for this hook. | 225 | ata_sff_check_status() for this hook. |
| 231 | </para> | ||
| 232 | <para> | ||
| 233 | Note that because this is called from ata_device_add(), at | ||
| 234 | least a dummy function that clears device interrupts must be | ||
| 235 | provided for all drivers, even if the controller doesn't | ||
| 236 | actually have a taskfile status register. | ||
| 237 | </para> | 226 | </para> |
| 238 | 227 | ||
| 239 | </sect2> | 228 | </sect2> |
| 240 | 229 | ||
| 241 | <sect2><title>Select ATA device on bus</title> | 230 | <sect2><title>Select ATA device on bus</title> |
| 242 | <programlisting> | 231 | <programlisting> |
| 243 | void (*dev_select)(struct ata_port *ap, unsigned int device); | 232 | void (*sff_dev_select)(struct ata_port *ap, unsigned int device); |
| 244 | </programlisting> | 233 | </programlisting> |
| 245 | 234 | ||
| 246 | <para> | 235 | <para> |
| @@ -251,9 +240,7 @@ void (*dev_select)(struct ata_port *ap, unsigned int device); | |||
| 251 | </para> | 240 | </para> |
| 252 | <para> | 241 | <para> |
| 253 | Most drivers for taskfile-based hardware use | 242 | Most drivers for taskfile-based hardware use |
| 254 | ata_std_dev_select() for this hook. Controllers which do not | 243 | ata_sff_dev_select() for this hook. |
| 255 | support second drives on a port (such as SATA contollers) will | ||
| 256 | use ata_noop_dev_select(). | ||
| 257 | </para> | 244 | </para> |
| 258 | 245 | ||
| 259 | </sect2> | 246 | </sect2> |
| @@ -441,13 +428,13 @@ void (*irq_clear) (struct ata_port *); | |||
| 441 | to struct ata_host_set. | 428 | to struct ata_host_set. |
| 442 | </para> | 429 | </para> |
| 443 | <para> | 430 | <para> |
| 444 | Most legacy IDE drivers use ata_interrupt() for the | 431 | Most legacy IDE drivers use ata_sff_interrupt() for the |
| 445 | irq_handler hook, which scans all ports in the host_set, | 432 | irq_handler hook, which scans all ports in the host_set, |
| 446 | determines which queued command was active (if any), and calls | 433 | determines which queued command was active (if any), and calls |
| 447 | ata_host_intr(ap,qc). | 434 | ata_sff_host_intr(ap,qc). |
| 448 | </para> | 435 | </para> |
| 449 | <para> | 436 | <para> |
| 450 | Most legacy IDE drivers use ata_bmdma_irq_clear() for the | 437 | Most legacy IDE drivers use ata_sff_irq_clear() for the |
| 451 | irq_clear() hook, which simply clears the interrupt and error | 438 | irq_clear() hook, which simply clears the interrupt and error |
| 452 | flags in the DMA status register. | 439 | flags in the DMA status register. |
| 453 | </para> | 440 | </para> |
| @@ -496,10 +483,6 @@ void (*host_stop) (struct ata_host_set *host_set); | |||
| 496 | data from port at this time. | 483 | data from port at this time. |
| 497 | </para> | 484 | </para> |
| 498 | <para> | 485 | <para> |
| 499 | Many drivers use ata_port_stop() as this hook, which frees the | ||
| 500 | PRD table. | ||
| 501 | </para> | ||
| 502 | <para> | ||
| 503 | ->host_stop() is called after all ->port_stop() calls | 486 | ->host_stop() is called after all ->port_stop() calls |
| 504 | have completed. The hook must finalize hardware shutdown, release DMA | 487 | have completed. The hook must finalize hardware shutdown, release DMA |
| 505 | and other resources, etc. | 488 | and other resources, etc. |
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt index fd588ff0e296..a1ca5924faff 100644 --- a/Documentation/cgroups/cgroups.txt +++ b/Documentation/cgroups/cgroups.txt | |||
| @@ -235,8 +235,7 @@ containing the following files describing that cgroup: | |||
| 235 | - cgroup.procs: list of tgids in the cgroup. This list is not | 235 | - cgroup.procs: list of tgids in the cgroup. This list is not |
| 236 | guaranteed to be sorted or free of duplicate tgids, and userspace | 236 | guaranteed to be sorted or free of duplicate tgids, and userspace |
| 237 | should sort/uniquify the list if this property is required. | 237 | should sort/uniquify the list if this property is required. |
| 238 | Writing a tgid into this file moves all threads with that tgid into | 238 | This is a read-only file, for now. |
| 239 | this cgroup. | ||
| 240 | - notify_on_release flag: run the release agent on exit? | 239 | - notify_on_release flag: run the release agent on exit? |
| 241 | - release_agent: the path to use for release notifications (this file | 240 | - release_agent: the path to use for release notifications (this file |
| 242 | exists in the top cgroup only) | 241 | exists in the top cgroup only) |
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index 3219ee0dbfef..5ebf5af1d716 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients | |||
| @@ -74,6 +74,11 @@ structure at all. You should use this to keep device-specific data. | |||
| 74 | /* retrieve the value */ | 74 | /* retrieve the value */ |
| 75 | void *i2c_get_clientdata(const struct i2c_client *client); | 75 | void *i2c_get_clientdata(const struct i2c_client *client); |
| 76 | 76 | ||
| 77 | Note that starting with kernel 2.6.34, you don't have to set the `data' field | ||
| 78 | to NULL in remove() or if probe() failed anymore. The i2c-core does this | ||
| 79 | automatically on these occasions. Those are also the only times the core will | ||
| 80 | touch this field. | ||
| 81 | |||
| 77 | 82 | ||
| 78 | Accessing the client | 83 | Accessing the client |
| 79 | ==================== | 84 | ==================== |
diff --git a/Documentation/input/elantech.txt b/Documentation/input/elantech.txt index a10c3b6ba7c4..56941ae1f5db 100644 --- a/Documentation/input/elantech.txt +++ b/Documentation/input/elantech.txt | |||
| @@ -333,14 +333,14 @@ byte 0: | |||
| 333 | byte 1: | 333 | byte 1: |
| 334 | 334 | ||
| 335 | bit 7 6 5 4 3 2 1 0 | 335 | bit 7 6 5 4 3 2 1 0 |
| 336 | x15 x14 x13 x12 x11 x10 x9 x8 | 336 | . . . . . x10 x9 x8 |
| 337 | 337 | ||
| 338 | byte 2: | 338 | byte 2: |
| 339 | 339 | ||
| 340 | bit 7 6 5 4 3 2 1 0 | 340 | bit 7 6 5 4 3 2 1 0 |
| 341 | x7 x6 x5 x4 x4 x2 x1 x0 | 341 | x7 x6 x5 x4 x4 x2 x1 x0 |
| 342 | 342 | ||
| 343 | x15..x0 = absolute x value (horizontal) | 343 | x10..x0 = absolute x value (horizontal) |
| 344 | 344 | ||
| 345 | byte 3: | 345 | byte 3: |
| 346 | 346 | ||
| @@ -350,14 +350,14 @@ byte 3: | |||
| 350 | byte 4: | 350 | byte 4: |
| 351 | 351 | ||
| 352 | bit 7 6 5 4 3 2 1 0 | 352 | bit 7 6 5 4 3 2 1 0 |
| 353 | y15 y14 y13 y12 y11 y10 y8 y8 | 353 | . . . . . . y9 y8 |
| 354 | 354 | ||
| 355 | byte 5: | 355 | byte 5: |
| 356 | 356 | ||
| 357 | bit 7 6 5 4 3 2 1 0 | 357 | bit 7 6 5 4 3 2 1 0 |
| 358 | y7 y6 y5 y4 y3 y2 y1 y0 | 358 | y7 y6 y5 y4 y3 y2 y1 y0 |
| 359 | 359 | ||
| 360 | y15..y0 = absolute y value (vertical) | 360 | y9..y0 = absolute y value (vertical) |
| 361 | 361 | ||
| 362 | 362 | ||
| 363 | 4.2.2 Two finger touch | 363 | 4.2.2 Two finger touch |
diff --git a/Documentation/spi/spidev_test.c b/Documentation/spi/spidev_test.c index 10abd3773e49..16feda901469 100644 --- a/Documentation/spi/spidev_test.c +++ b/Documentation/spi/spidev_test.c | |||
| @@ -58,7 +58,7 @@ static void transfer(int fd) | |||
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr); | 60 | ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr); |
| 61 | if (ret == 1) | 61 | if (ret < 1) |
| 62 | pabort("can't send spi message"); | 62 | pabort("can't send spi message"); |
| 63 | 63 | ||
| 64 | for (ret = 0; ret < ARRAY_SIZE(tx); ret++) { | 64 | for (ret = 0; ret < ARRAY_SIZE(tx); ret++) { |
diff --git a/MAINTAINERS b/MAINTAINERS index 183887518fe3..d5b0b1b6dc52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4482,17 +4482,17 @@ S: Maintained | |||
| 4482 | F: drivers/ata/sata_promise.* | 4482 | F: drivers/ata/sata_promise.* |
| 4483 | 4483 | ||
| 4484 | PS3 NETWORK SUPPORT | 4484 | PS3 NETWORK SUPPORT |
| 4485 | M: Geoff Levand <geoffrey.levand@am.sony.com> | 4485 | M: Geoff Levand <geoff@infradead.org> |
| 4486 | L: netdev@vger.kernel.org | 4486 | L: netdev@vger.kernel.org |
| 4487 | L: cbe-oss-dev@ozlabs.org | 4487 | L: cbe-oss-dev@ozlabs.org |
| 4488 | S: Supported | 4488 | S: Maintained |
| 4489 | F: drivers/net/ps3_gelic_net.* | 4489 | F: drivers/net/ps3_gelic_net.* |
| 4490 | 4490 | ||
| 4491 | PS3 PLATFORM SUPPORT | 4491 | PS3 PLATFORM SUPPORT |
| 4492 | M: Geoff Levand <geoffrey.levand@am.sony.com> | 4492 | M: Geoff Levand <geoff@infradead.org> |
| 4493 | L: linuxppc-dev@ozlabs.org | 4493 | L: linuxppc-dev@ozlabs.org |
| 4494 | L: cbe-oss-dev@ozlabs.org | 4494 | L: cbe-oss-dev@ozlabs.org |
| 4495 | S: Supported | 4495 | S: Maintained |
| 4496 | F: arch/powerpc/boot/ps3* | 4496 | F: arch/powerpc/boot/ps3* |
| 4497 | F: arch/powerpc/include/asm/lv1call.h | 4497 | F: arch/powerpc/include/asm/lv1call.h |
| 4498 | F: arch/powerpc/include/asm/ps3*.h | 4498 | F: arch/powerpc/include/asm/ps3*.h |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 34 | 3 | SUBLEVEL = 34 |
| 4 | EXTRAVERSION = -rc5 | 4 | EXTRAVERSION = -rc6 |
| 5 | NAME = Sheep on Meth | 5 | NAME = Sheep on Meth |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c5408bf1bf43..92622eb5cc0d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -253,6 +253,7 @@ config ARCH_REALVIEW | |||
| 253 | select GENERIC_TIME | 253 | select GENERIC_TIME |
| 254 | select GENERIC_CLOCKEVENTS | 254 | select GENERIC_CLOCKEVENTS |
| 255 | select ARCH_WANT_OPTIONAL_GPIOLIB | 255 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 256 | select GPIO_PL061 if GPIOLIB | ||
| 256 | help | 257 | help |
| 257 | This enables support for ARM Ltd RealView boards. | 258 | This enables support for ARM Ltd RealView boards. |
| 258 | 259 | ||
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 6ab6b337a913..c5191b1532e8 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -685,8 +685,8 @@ proc_types: | |||
| 685 | W(b) __armv4_mmu_cache_off | 685 | W(b) __armv4_mmu_cache_off |
| 686 | W(b) __armv4_mmu_cache_flush | 686 | W(b) __armv4_mmu_cache_flush |
| 687 | 687 | ||
| 688 | .word 0x56056930 | 688 | .word 0x56056900 |
| 689 | .word 0xff0ffff0 @ PXA935 | 689 | .word 0xffffff00 @ PXA9xx |
| 690 | W(b) __armv4_mmu_cache_on | 690 | W(b) __armv4_mmu_cache_on |
| 691 | W(b) __armv4_mmu_cache_off | 691 | W(b) __armv4_mmu_cache_off |
| 692 | W(b) __armv4_mmu_cache_flush | 692 | W(b) __armv4_mmu_cache_flush |
| @@ -697,12 +697,6 @@ proc_types: | |||
| 697 | W(b) __armv4_mmu_cache_off | 697 | W(b) __armv4_mmu_cache_off |
| 698 | W(b) __armv5tej_mmu_cache_flush | 698 | W(b) __armv5tej_mmu_cache_flush |
| 699 | 699 | ||
| 700 | .word 0x56056930 | ||
| 701 | .word 0xff0ffff0 @ PXA935 | ||
| 702 | W(b) __armv4_mmu_cache_on | ||
| 703 | W(b) __armv4_mmu_cache_off | ||
| 704 | W(b) __armv4_mmu_cache_flush | ||
| 705 | |||
| 706 | .word 0x56050000 @ Feroceon | 700 | .word 0x56050000 @ Feroceon |
| 707 | .word 0xff0f0000 | 701 | .word 0xff0f0000 |
| 708 | W(b) __armv4_mmu_cache_on | 702 | W(b) __armv4_mmu_cache_on |
diff --git a/arch/arm/configs/bcmring_defconfig b/arch/arm/configs/bcmring_defconfig index 1e12167c89b7..6ac6693299bc 100644 --- a/arch/arm/configs/bcmring_defconfig +++ b/arch/arm/configs/bcmring_defconfig | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.31-rc3 | 3 | # Linux kernel version: 2.6.34-rc2 |
| 4 | # Fri Jul 17 12:07:28 2009 | 4 | # Mon Mar 29 12:01:41 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 8 | CONFIG_GENERIC_TIME=y | 8 | CONFIG_GENERIC_TIME=y |
| 9 | CONFIG_GENERIC_CLOCKEVENTS=y | 9 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 10 | CONFIG_MMU=y | 10 | CONFIG_HAVE_PROC_CPU=y |
| 11 | CONFIG_GENERIC_HARDIRQS=y | 11 | CONFIG_GENERIC_HARDIRQS=y |
| 12 | CONFIG_STACKTRACE_SUPPORT=y | 12 | CONFIG_STACKTRACE_SUPPORT=y |
| 13 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 13 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| @@ -18,6 +18,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
| 18 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 18 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 19 | CONFIG_GENERIC_HWEIGHT=y | 19 | CONFIG_GENERIC_HWEIGHT=y |
| 20 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 20 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 21 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 21 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 22 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 22 | CONFIG_VECTORS_BASE=0xffff0000 | 23 | CONFIG_VECTORS_BASE=0xffff0000 |
| 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -32,6 +33,12 @@ CONFIG_LOCK_KERNEL=y | |||
| 32 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 33 | CONFIG_LOCALVERSION="" | 34 | CONFIG_LOCALVERSION="" |
| 34 | # CONFIG_LOCALVERSION_AUTO is not set | 35 | # CONFIG_LOCALVERSION_AUTO is not set |
| 36 | CONFIG_HAVE_KERNEL_GZIP=y | ||
| 37 | CONFIG_HAVE_KERNEL_LZO=y | ||
| 38 | CONFIG_KERNEL_GZIP=y | ||
| 39 | # CONFIG_KERNEL_BZIP2 is not set | ||
| 40 | # CONFIG_KERNEL_LZMA is not set | ||
| 41 | # CONFIG_KERNEL_LZO is not set | ||
| 35 | # CONFIG_SWAP is not set | 42 | # CONFIG_SWAP is not set |
| 36 | CONFIG_SYSVIPC=y | 43 | CONFIG_SYSVIPC=y |
| 37 | CONFIG_SYSVIPC_SYSCTL=y | 44 | CONFIG_SYSVIPC_SYSCTL=y |
| @@ -43,21 +50,22 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 43 | # | 50 | # |
| 44 | # RCU Subsystem | 51 | # RCU Subsystem |
| 45 | # | 52 | # |
| 46 | CONFIG_CLASSIC_RCU=y | 53 | CONFIG_TREE_RCU=y |
| 47 | # CONFIG_TREE_RCU is not set | 54 | # CONFIG_TREE_PREEMPT_RCU is not set |
| 48 | # CONFIG_PREEMPT_RCU is not set | 55 | # CONFIG_TINY_RCU is not set |
| 56 | # CONFIG_RCU_TRACE is not set | ||
| 57 | CONFIG_RCU_FANOUT=32 | ||
| 58 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
| 49 | # CONFIG_TREE_RCU_TRACE is not set | 59 | # CONFIG_TREE_RCU_TRACE is not set |
| 50 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 51 | # CONFIG_IKCONFIG is not set | 60 | # CONFIG_IKCONFIG is not set |
| 52 | CONFIG_LOG_BUF_SHIFT=17 | 61 | CONFIG_LOG_BUF_SHIFT=17 |
| 53 | # CONFIG_GROUP_SCHED is not set | ||
| 54 | # CONFIG_CGROUPS is not set | ||
| 55 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 62 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 56 | # CONFIG_RELAY is not set | 63 | # CONFIG_RELAY is not set |
| 57 | # CONFIG_NAMESPACES is not set | 64 | # CONFIG_NAMESPACES is not set |
| 58 | # CONFIG_BLK_DEV_INITRD is not set | 65 | # CONFIG_BLK_DEV_INITRD is not set |
| 59 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 66 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 60 | CONFIG_SYSCTL=y | 67 | CONFIG_SYSCTL=y |
| 68 | CONFIG_ANON_INODES=y | ||
| 61 | CONFIG_EMBEDDED=y | 69 | CONFIG_EMBEDDED=y |
| 62 | CONFIG_UID16=y | 70 | CONFIG_UID16=y |
| 63 | CONFIG_SYSCTL_SYSCALL=y | 71 | CONFIG_SYSCTL_SYSCALL=y |
| @@ -75,19 +83,21 @@ CONFIG_FUTEX=y | |||
| 75 | # CONFIG_EVENTFD is not set | 83 | # CONFIG_EVENTFD is not set |
| 76 | CONFIG_SHMEM=y | 84 | CONFIG_SHMEM=y |
| 77 | # CONFIG_AIO is not set | 85 | # CONFIG_AIO is not set |
| 86 | CONFIG_HAVE_PERF_EVENTS=y | ||
| 87 | CONFIG_PERF_USE_VMALLOC=y | ||
| 78 | 88 | ||
| 79 | # | 89 | # |
| 80 | # Performance Counters | 90 | # Kernel Performance Events And Counters |
| 81 | # | 91 | # |
| 92 | CONFIG_PERF_EVENTS=y | ||
| 93 | CONFIG_PERF_COUNTERS=y | ||
| 82 | # CONFIG_VM_EVENT_COUNTERS is not set | 94 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 83 | # CONFIG_SLUB_DEBUG is not set | 95 | # CONFIG_SLUB_DEBUG is not set |
| 84 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 85 | # CONFIG_COMPAT_BRK is not set | 96 | # CONFIG_COMPAT_BRK is not set |
| 86 | # CONFIG_SLAB is not set | 97 | # CONFIG_SLAB is not set |
| 87 | CONFIG_SLUB=y | 98 | CONFIG_SLUB=y |
| 88 | # CONFIG_SLOB is not set | 99 | # CONFIG_SLOB is not set |
| 89 | # CONFIG_PROFILING is not set | 100 | # CONFIG_PROFILING is not set |
| 90 | # CONFIG_MARKERS is not set | ||
| 91 | CONFIG_HAVE_OPROFILE=y | 101 | CONFIG_HAVE_OPROFILE=y |
| 92 | # CONFIG_KPROBES is not set | 102 | # CONFIG_KPROBES is not set |
| 93 | CONFIG_HAVE_KPROBES=y | 103 | CONFIG_HAVE_KPROBES=y |
| @@ -115,24 +125,53 @@ CONFIG_LBDAF=y | |||
| 115 | # IO Schedulers | 125 | # IO Schedulers |
| 116 | # | 126 | # |
| 117 | CONFIG_IOSCHED_NOOP=y | 127 | CONFIG_IOSCHED_NOOP=y |
| 118 | # CONFIG_IOSCHED_AS is not set | ||
| 119 | # CONFIG_IOSCHED_DEADLINE is not set | 128 | # CONFIG_IOSCHED_DEADLINE is not set |
| 120 | # CONFIG_IOSCHED_CFQ is not set | 129 | # CONFIG_IOSCHED_CFQ is not set |
| 121 | # CONFIG_DEFAULT_AS is not set | ||
| 122 | # CONFIG_DEFAULT_DEADLINE is not set | 130 | # CONFIG_DEFAULT_DEADLINE is not set |
| 123 | # CONFIG_DEFAULT_CFQ is not set | 131 | # CONFIG_DEFAULT_CFQ is not set |
| 124 | CONFIG_DEFAULT_NOOP=y | 132 | CONFIG_DEFAULT_NOOP=y |
| 125 | CONFIG_DEFAULT_IOSCHED="noop" | 133 | CONFIG_DEFAULT_IOSCHED="noop" |
| 134 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
| 135 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
| 136 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
| 137 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
| 138 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
| 139 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
| 140 | # CONFIG_INLINE_SPIN_UNLOCK is not set | ||
| 141 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
| 142 | # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set | ||
| 143 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
| 144 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
| 145 | # CONFIG_INLINE_READ_LOCK is not set | ||
| 146 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
| 147 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
| 148 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
| 149 | # CONFIG_INLINE_READ_UNLOCK is not set | ||
| 150 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
| 151 | # CONFIG_INLINE_READ_UNLOCK_IRQ is not set | ||
| 152 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
| 153 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
| 154 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
| 155 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
| 156 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
| 157 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
| 158 | # CONFIG_INLINE_WRITE_UNLOCK is not set | ||
| 159 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
| 160 | # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set | ||
| 161 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
| 162 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
| 126 | # CONFIG_FREEZER is not set | 163 | # CONFIG_FREEZER is not set |
| 127 | 164 | ||
| 128 | # | 165 | # |
| 129 | # System Type | 166 | # System Type |
| 130 | # | 167 | # |
| 168 | CONFIG_MMU=y | ||
| 131 | # CONFIG_ARCH_AAEC2000 is not set | 169 | # CONFIG_ARCH_AAEC2000 is not set |
| 132 | # CONFIG_ARCH_INTEGRATOR is not set | 170 | # CONFIG_ARCH_INTEGRATOR is not set |
| 133 | # CONFIG_ARCH_REALVIEW is not set | 171 | # CONFIG_ARCH_REALVIEW is not set |
| 134 | # CONFIG_ARCH_VERSATILE is not set | 172 | # CONFIG_ARCH_VERSATILE is not set |
| 135 | # CONFIG_ARCH_AT91 is not set | 173 | # CONFIG_ARCH_AT91 is not set |
| 174 | CONFIG_ARCH_BCMRING=y | ||
| 136 | # CONFIG_ARCH_CLPS711X is not set | 175 | # CONFIG_ARCH_CLPS711X is not set |
| 137 | # CONFIG_ARCH_GEMINI is not set | 176 | # CONFIG_ARCH_GEMINI is not set |
| 138 | # CONFIG_ARCH_EBSA110 is not set | 177 | # CONFIG_ARCH_EBSA110 is not set |
| @@ -149,6 +188,7 @@ CONFIG_DEFAULT_IOSCHED="noop" | |||
| 149 | # CONFIG_ARCH_IXP2000 is not set | 188 | # CONFIG_ARCH_IXP2000 is not set |
| 150 | # CONFIG_ARCH_IXP4XX is not set | 189 | # CONFIG_ARCH_IXP4XX is not set |
| 151 | # CONFIG_ARCH_L7200 is not set | 190 | # CONFIG_ARCH_L7200 is not set |
| 191 | # CONFIG_ARCH_DOVE is not set | ||
| 152 | # CONFIG_ARCH_KIRKWOOD is not set | 192 | # CONFIG_ARCH_KIRKWOOD is not set |
| 153 | # CONFIG_ARCH_LOKI is not set | 193 | # CONFIG_ARCH_LOKI is not set |
| 154 | # CONFIG_ARCH_MV78XX0 is not set | 194 | # CONFIG_ARCH_MV78XX0 is not set |
| @@ -157,19 +197,26 @@ CONFIG_DEFAULT_IOSCHED="noop" | |||
| 157 | # CONFIG_ARCH_KS8695 is not set | 197 | # CONFIG_ARCH_KS8695 is not set |
| 158 | # CONFIG_ARCH_NS9XXX is not set | 198 | # CONFIG_ARCH_NS9XXX is not set |
| 159 | # CONFIG_ARCH_W90X900 is not set | 199 | # CONFIG_ARCH_W90X900 is not set |
| 200 | # CONFIG_ARCH_NUC93X is not set | ||
| 160 | # CONFIG_ARCH_PNX4008 is not set | 201 | # CONFIG_ARCH_PNX4008 is not set |
| 161 | # CONFIG_ARCH_PXA is not set | 202 | # CONFIG_ARCH_PXA is not set |
| 162 | # CONFIG_ARCH_MSM is not set | 203 | # CONFIG_ARCH_MSM is not set |
| 204 | # CONFIG_ARCH_SHMOBILE is not set | ||
| 163 | # CONFIG_ARCH_RPC is not set | 205 | # CONFIG_ARCH_RPC is not set |
| 164 | # CONFIG_ARCH_SA1100 is not set | 206 | # CONFIG_ARCH_SA1100 is not set |
| 165 | # CONFIG_ARCH_S3C2410 is not set | 207 | # CONFIG_ARCH_S3C2410 is not set |
| 166 | # CONFIG_ARCH_S3C64XX is not set | 208 | # CONFIG_ARCH_S3C64XX is not set |
| 209 | # CONFIG_ARCH_S5P6440 is not set | ||
| 210 | # CONFIG_ARCH_S5P6442 is not set | ||
| 211 | # CONFIG_ARCH_S5PC1XX is not set | ||
| 212 | # CONFIG_ARCH_S5PV210 is not set | ||
| 167 | # CONFIG_ARCH_SHARK is not set | 213 | # CONFIG_ARCH_SHARK is not set |
| 168 | # CONFIG_ARCH_LH7A40X is not set | 214 | # CONFIG_ARCH_LH7A40X is not set |
| 169 | # CONFIG_ARCH_U300 is not set | 215 | # CONFIG_ARCH_U300 is not set |
| 216 | # CONFIG_ARCH_U8500 is not set | ||
| 217 | # CONFIG_ARCH_NOMADIK is not set | ||
| 170 | # CONFIG_ARCH_DAVINCI is not set | 218 | # CONFIG_ARCH_DAVINCI is not set |
| 171 | # CONFIG_ARCH_OMAP is not set | 219 | # CONFIG_ARCH_OMAP is not set |
| 172 | CONFIG_ARCH_BCMRING=y | ||
| 173 | # CONFIG_ARCH_FPGA11107 is not set | 220 | # CONFIG_ARCH_FPGA11107 is not set |
| 174 | CONFIG_ARCH_BCM11107=y | 221 | CONFIG_ARCH_BCM11107=y |
| 175 | 222 | ||
| @@ -185,7 +232,7 @@ CONFIG_CPU_V6=y | |||
| 185 | CONFIG_CPU_32v6K=y | 232 | CONFIG_CPU_32v6K=y |
| 186 | CONFIG_CPU_32v6=y | 233 | CONFIG_CPU_32v6=y |
| 187 | CONFIG_CPU_ABRT_EV6=y | 234 | CONFIG_CPU_ABRT_EV6=y |
| 188 | CONFIG_CPU_PABRT_NOIFAR=y | 235 | CONFIG_CPU_PABRT_V6=y |
| 189 | CONFIG_CPU_CACHE_V6=y | 236 | CONFIG_CPU_CACHE_V6=y |
| 190 | CONFIG_CPU_CACHE_VIPT=y | 237 | CONFIG_CPU_CACHE_VIPT=y |
| 191 | CONFIG_CPU_COPY_V6=y | 238 | CONFIG_CPU_COPY_V6=y |
| @@ -201,6 +248,8 @@ CONFIG_ARM_THUMB=y | |||
| 201 | # CONFIG_CPU_ICACHE_DISABLE is not set | 248 | # CONFIG_CPU_ICACHE_DISABLE is not set |
| 202 | # CONFIG_CPU_DCACHE_DISABLE is not set | 249 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 203 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 250 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
| 251 | CONFIG_ARM_L1_CACHE_SHIFT=5 | ||
| 252 | CONFIG_CPU_HAS_PMU=y | ||
| 204 | # CONFIG_ARM_ERRATA_411920 is not set | 253 | # CONFIG_ARM_ERRATA_411920 is not set |
| 205 | CONFIG_COMMON_CLKDEV=y | 254 | CONFIG_COMMON_CLKDEV=y |
| 206 | 255 | ||
| @@ -222,6 +271,8 @@ CONFIG_VMSPLIT_3G=y | |||
| 222 | # CONFIG_VMSPLIT_2G is not set | 271 | # CONFIG_VMSPLIT_2G is not set |
| 223 | # CONFIG_VMSPLIT_1G is not set | 272 | # CONFIG_VMSPLIT_1G is not set |
| 224 | CONFIG_PAGE_OFFSET=0xC0000000 | 273 | CONFIG_PAGE_OFFSET=0xC0000000 |
| 274 | # CONFIG_PREEMPT_NONE is not set | ||
| 275 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 225 | CONFIG_PREEMPT=y | 276 | CONFIG_PREEMPT=y |
| 226 | CONFIG_HZ=100 | 277 | CONFIG_HZ=100 |
| 227 | CONFIG_AEABI=y | 278 | CONFIG_AEABI=y |
| @@ -229,6 +280,7 @@ CONFIG_AEABI=y | |||
| 229 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | 280 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
| 230 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | 281 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
| 231 | # CONFIG_HIGHMEM is not set | 282 | # CONFIG_HIGHMEM is not set |
| 283 | CONFIG_HW_PERF_EVENTS=y | ||
| 232 | CONFIG_SELECT_MEMORY_MODEL=y | 284 | CONFIG_SELECT_MEMORY_MODEL=y |
| 233 | CONFIG_FLATMEM_MANUAL=y | 285 | CONFIG_FLATMEM_MANUAL=y |
| 234 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 286 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -240,8 +292,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 240 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 292 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 241 | CONFIG_ZONE_DMA_FLAG=0 | 293 | CONFIG_ZONE_DMA_FLAG=0 |
| 242 | CONFIG_VIRT_TO_BUS=y | 294 | CONFIG_VIRT_TO_BUS=y |
| 243 | CONFIG_HAVE_MLOCK=y | 295 | # CONFIG_KSM is not set |
| 244 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 245 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 296 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
| 246 | CONFIG_ALIGNMENT_TRAP=y | 297 | CONFIG_ALIGNMENT_TRAP=y |
| 247 | CONFIG_UACCESS_WITH_MEMCPY=y | 298 | CONFIG_UACCESS_WITH_MEMCPY=y |
| @@ -335,9 +386,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 335 | # CONFIG_CONNECTOR is not set | 386 | # CONFIG_CONNECTOR is not set |
| 336 | CONFIG_MTD=y | 387 | CONFIG_MTD=y |
| 337 | # CONFIG_MTD_DEBUG is not set | 388 | # CONFIG_MTD_DEBUG is not set |
| 389 | # CONFIG_MTD_TESTS is not set | ||
| 338 | CONFIG_MTD_CONCAT=y | 390 | CONFIG_MTD_CONCAT=y |
| 339 | CONFIG_MTD_PARTITIONS=y | 391 | CONFIG_MTD_PARTITIONS=y |
| 340 | # CONFIG_MTD_TESTS is not set | ||
| 341 | # CONFIG_MTD_REDBOOT_PARTS is not set | 392 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 342 | CONFIG_MTD_CMDLINE_PARTS=y | 393 | CONFIG_MTD_CMDLINE_PARTS=y |
| 343 | # CONFIG_MTD_AFS_PARTS is not set | 394 | # CONFIG_MTD_AFS_PARTS is not set |
| @@ -433,6 +484,10 @@ CONFIG_MTD_NAND_BCM_UMI_HWCS=y | |||
| 433 | CONFIG_BLK_DEV=y | 484 | CONFIG_BLK_DEV=y |
| 434 | # CONFIG_BLK_DEV_COW_COMMON is not set | 485 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 435 | # CONFIG_BLK_DEV_LOOP is not set | 486 | # CONFIG_BLK_DEV_LOOP is not set |
| 487 | |||
| 488 | # | ||
| 489 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | ||
| 490 | # | ||
| 436 | # CONFIG_BLK_DEV_NBD is not set | 491 | # CONFIG_BLK_DEV_NBD is not set |
| 437 | # CONFIG_BLK_DEV_RAM is not set | 492 | # CONFIG_BLK_DEV_RAM is not set |
| 438 | # CONFIG_CDROM_PKTCDVD is not set | 493 | # CONFIG_CDROM_PKTCDVD is not set |
| @@ -444,6 +499,7 @@ CONFIG_HAVE_IDE=y | |||
| 444 | # | 499 | # |
| 445 | # SCSI device support | 500 | # SCSI device support |
| 446 | # | 501 | # |
| 502 | CONFIG_SCSI_MOD=y | ||
| 447 | # CONFIG_RAID_ATTRS is not set | 503 | # CONFIG_RAID_ATTRS is not set |
| 448 | # CONFIG_SCSI is not set | 504 | # CONFIG_SCSI is not set |
| 449 | # CONFIG_SCSI_DMA is not set | 505 | # CONFIG_SCSI_DMA is not set |
| @@ -452,6 +508,7 @@ CONFIG_HAVE_IDE=y | |||
| 452 | # CONFIG_MD is not set | 508 | # CONFIG_MD is not set |
| 453 | # CONFIG_NETDEVICES is not set | 509 | # CONFIG_NETDEVICES is not set |
| 454 | # CONFIG_ISDN is not set | 510 | # CONFIG_ISDN is not set |
| 511 | # CONFIG_PHONE is not set | ||
| 455 | 512 | ||
| 456 | # | 513 | # |
| 457 | # Input device support | 514 | # Input device support |
| @@ -459,6 +516,7 @@ CONFIG_HAVE_IDE=y | |||
| 459 | CONFIG_INPUT=y | 516 | CONFIG_INPUT=y |
| 460 | # CONFIG_INPUT_FF_MEMLESS is not set | 517 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 461 | # CONFIG_INPUT_POLLDEV is not set | 518 | # CONFIG_INPUT_POLLDEV is not set |
| 519 | # CONFIG_INPUT_SPARSEKMAP is not set | ||
| 462 | 520 | ||
| 463 | # | 521 | # |
| 464 | # Userland interfaces | 522 | # Userland interfaces |
| @@ -508,6 +566,7 @@ CONFIG_SERIAL_AMBA_PL011=y | |||
| 508 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 566 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
| 509 | CONFIG_SERIAL_CORE=y | 567 | CONFIG_SERIAL_CORE=y |
| 510 | CONFIG_SERIAL_CORE_CONSOLE=y | 568 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 569 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 511 | CONFIG_UNIX98_PTYS=y | 570 | CONFIG_UNIX98_PTYS=y |
| 512 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 571 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 513 | CONFIG_LEGACY_PTYS=y | 572 | CONFIG_LEGACY_PTYS=y |
| @@ -519,13 +578,17 @@ CONFIG_LEGACY_PTY_COUNT=64 | |||
| 519 | # CONFIG_TCG_TPM is not set | 578 | # CONFIG_TCG_TPM is not set |
| 520 | # CONFIG_I2C is not set | 579 | # CONFIG_I2C is not set |
| 521 | # CONFIG_SPI is not set | 580 | # CONFIG_SPI is not set |
| 581 | |||
| 582 | # | ||
| 583 | # PPS support | ||
| 584 | # | ||
| 585 | # CONFIG_PPS is not set | ||
| 522 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 586 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 523 | # CONFIG_GPIOLIB is not set | 587 | # CONFIG_GPIOLIB is not set |
| 524 | # CONFIG_W1 is not set | 588 | # CONFIG_W1 is not set |
| 525 | # CONFIG_POWER_SUPPLY is not set | 589 | # CONFIG_POWER_SUPPLY is not set |
| 526 | # CONFIG_HWMON is not set | 590 | # CONFIG_HWMON is not set |
| 527 | # CONFIG_THERMAL is not set | 591 | # CONFIG_THERMAL is not set |
| 528 | # CONFIG_THERMAL_HWMON is not set | ||
| 529 | # CONFIG_WATCHDOG is not set | 592 | # CONFIG_WATCHDOG is not set |
| 530 | CONFIG_SSB_POSSIBLE=y | 593 | CONFIG_SSB_POSSIBLE=y |
| 531 | 594 | ||
| @@ -541,6 +604,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 541 | # CONFIG_MFD_SM501 is not set | 604 | # CONFIG_MFD_SM501 is not set |
| 542 | # CONFIG_HTC_PASIC3 is not set | 605 | # CONFIG_HTC_PASIC3 is not set |
| 543 | # CONFIG_MFD_TMIO is not set | 606 | # CONFIG_MFD_TMIO is not set |
| 607 | # CONFIG_REGULATOR is not set | ||
| 544 | # CONFIG_MEDIA_SUPPORT is not set | 608 | # CONFIG_MEDIA_SUPPORT is not set |
| 545 | 609 | ||
| 546 | # | 610 | # |
| @@ -566,14 +630,17 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 566 | # CONFIG_USB_SUPPORT is not set | 630 | # CONFIG_USB_SUPPORT is not set |
| 567 | # CONFIG_MMC is not set | 631 | # CONFIG_MMC is not set |
| 568 | # CONFIG_MEMSTICK is not set | 632 | # CONFIG_MEMSTICK is not set |
| 569 | # CONFIG_ACCESSIBILITY is not set | ||
| 570 | # CONFIG_NEW_LEDS is not set | 633 | # CONFIG_NEW_LEDS is not set |
| 634 | # CONFIG_ACCESSIBILITY is not set | ||
| 571 | CONFIG_RTC_LIB=y | 635 | CONFIG_RTC_LIB=y |
| 572 | # CONFIG_RTC_CLASS is not set | 636 | # CONFIG_RTC_CLASS is not set |
| 573 | # CONFIG_DMADEVICES is not set | 637 | # CONFIG_DMADEVICES is not set |
| 574 | # CONFIG_AUXDISPLAY is not set | 638 | # CONFIG_AUXDISPLAY is not set |
| 575 | # CONFIG_REGULATOR is not set | ||
| 576 | # CONFIG_UIO is not set | 639 | # CONFIG_UIO is not set |
| 640 | |||
| 641 | # | ||
| 642 | # TI VLYNQ | ||
| 643 | # | ||
| 577 | # CONFIG_STAGING is not set | 644 | # CONFIG_STAGING is not set |
| 578 | 645 | ||
| 579 | # | 646 | # |
| @@ -589,9 +656,12 @@ CONFIG_FS_POSIX_ACL=y | |||
| 589 | # CONFIG_GFS2_FS is not set | 656 | # CONFIG_GFS2_FS is not set |
| 590 | # CONFIG_OCFS2_FS is not set | 657 | # CONFIG_OCFS2_FS is not set |
| 591 | # CONFIG_BTRFS_FS is not set | 658 | # CONFIG_BTRFS_FS is not set |
| 659 | # CONFIG_NILFS2_FS is not set | ||
| 592 | # CONFIG_FILE_LOCKING is not set | 660 | # CONFIG_FILE_LOCKING is not set |
| 593 | # CONFIG_FSNOTIFY is not set | 661 | # CONFIG_FSNOTIFY is not set |
| 662 | # CONFIG_DNOTIFY is not set | ||
| 594 | # CONFIG_INOTIFY is not set | 663 | # CONFIG_INOTIFY is not set |
| 664 | # CONFIG_INOTIFY_USER is not set | ||
| 595 | # CONFIG_QUOTA is not set | 665 | # CONFIG_QUOTA is not set |
| 596 | # CONFIG_AUTOFS_FS is not set | 666 | # CONFIG_AUTOFS_FS is not set |
| 597 | # CONFIG_AUTOFS4_FS is not set | 667 | # CONFIG_AUTOFS4_FS is not set |
| @@ -647,6 +717,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 647 | # CONFIG_JFFS2_LZO is not set | 717 | # CONFIG_JFFS2_LZO is not set |
| 648 | CONFIG_JFFS2_RTIME=y | 718 | CONFIG_JFFS2_RTIME=y |
| 649 | # CONFIG_JFFS2_RUBIN is not set | 719 | # CONFIG_JFFS2_RUBIN is not set |
| 720 | # CONFIG_LOGFS is not set | ||
| 650 | # CONFIG_CRAMFS is not set | 721 | # CONFIG_CRAMFS is not set |
| 651 | # CONFIG_SQUASHFS is not set | 722 | # CONFIG_SQUASHFS is not set |
| 652 | # CONFIG_VXFS_FS is not set | 723 | # CONFIG_VXFS_FS is not set |
| @@ -657,7 +728,6 @@ CONFIG_JFFS2_RTIME=y | |||
| 657 | # CONFIG_ROMFS_FS is not set | 728 | # CONFIG_ROMFS_FS is not set |
| 658 | # CONFIG_SYSV_FS is not set | 729 | # CONFIG_SYSV_FS is not set |
| 659 | # CONFIG_UFS_FS is not set | 730 | # CONFIG_UFS_FS is not set |
| 660 | # CONFIG_NILFS2_FS is not set | ||
| 661 | # CONFIG_NETWORK_FILESYSTEMS is not set | 731 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 662 | 732 | ||
| 663 | # | 733 | # |
| @@ -675,11 +745,12 @@ CONFIG_MSDOS_PARTITION=y | |||
| 675 | CONFIG_ENABLE_MUST_CHECK=y | 745 | CONFIG_ENABLE_MUST_CHECK=y |
| 676 | CONFIG_FRAME_WARN=1024 | 746 | CONFIG_FRAME_WARN=1024 |
| 677 | CONFIG_MAGIC_SYSRQ=y | 747 | CONFIG_MAGIC_SYSRQ=y |
| 748 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 678 | # CONFIG_UNUSED_SYMBOLS is not set | 749 | # CONFIG_UNUSED_SYMBOLS is not set |
| 679 | # CONFIG_DEBUG_FS is not set | 750 | # CONFIG_DEBUG_FS is not set |
| 680 | CONFIG_HEADERS_CHECK=y | 751 | CONFIG_HEADERS_CHECK=y |
| 681 | # CONFIG_DEBUG_KERNEL is not set | 752 | # CONFIG_DEBUG_KERNEL is not set |
| 682 | # CONFIG_DEBUG_BUGVERBOSE is not set | 753 | CONFIG_DEBUG_BUGVERBOSE=y |
| 683 | # CONFIG_DEBUG_MEMORY_INIT is not set | 754 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 684 | CONFIG_FRAME_POINTER=y | 755 | CONFIG_FRAME_POINTER=y |
| 685 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 756 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| @@ -693,6 +764,7 @@ CONFIG_TRACING_SUPPORT=y | |||
| 693 | CONFIG_HAVE_ARCH_KGDB=y | 764 | CONFIG_HAVE_ARCH_KGDB=y |
| 694 | # CONFIG_ARM_UNWIND is not set | 765 | # CONFIG_ARM_UNWIND is not set |
| 695 | # CONFIG_DEBUG_USER is not set | 766 | # CONFIG_DEBUG_USER is not set |
| 767 | # CONFIG_OC_ETM is not set | ||
| 696 | 768 | ||
| 697 | # | 769 | # |
| 698 | # Security options | 770 | # Security options |
| @@ -700,7 +772,11 @@ CONFIG_HAVE_ARCH_KGDB=y | |||
| 700 | # CONFIG_KEYS is not set | 772 | # CONFIG_KEYS is not set |
| 701 | # CONFIG_SECURITY is not set | 773 | # CONFIG_SECURITY is not set |
| 702 | # CONFIG_SECURITYFS is not set | 774 | # CONFIG_SECURITYFS is not set |
| 703 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 775 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
| 776 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
| 777 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
| 778 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
| 779 | CONFIG_DEFAULT_SECURITY="" | ||
| 704 | # CONFIG_CRYPTO is not set | 780 | # CONFIG_CRYPTO is not set |
| 705 | # CONFIG_BINARY_PRINTF is not set | 781 | # CONFIG_BINARY_PRINTF is not set |
| 706 | 782 | ||
diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index 95d2becfc664..21f2bff8a363 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig | |||
| @@ -1,13 +1,14 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc8 | 3 | # Linux kernel version: 2.6.34-rc2 |
| 4 | # Sat Feb 13 21:48:53 2010 | 4 | # Thu Apr 8 14:49:08 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 8 | CONFIG_GENERIC_GPIO=y | 8 | CONFIG_GENERIC_GPIO=y |
| 9 | CONFIG_GENERIC_TIME=y | 9 | CONFIG_GENERIC_TIME=y |
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | 10 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 11 | CONFIG_HAVE_PROC_CPU=y | ||
| 11 | CONFIG_GENERIC_HARDIRQS=y | 12 | CONFIG_GENERIC_HARDIRQS=y |
| 12 | CONFIG_STACKTRACE_SUPPORT=y | 13 | CONFIG_STACKTRACE_SUPPORT=y |
| 13 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 14 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| @@ -19,6 +20,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 19 | CONFIG_ARCH_HAS_CPUFREQ=y | 20 | CONFIG_ARCH_HAS_CPUFREQ=y |
| 20 | CONFIG_GENERIC_HWEIGHT=y | 21 | CONFIG_GENERIC_HWEIGHT=y |
| 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 22 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 23 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 22 | CONFIG_ARCH_MTD_XIP=y | 24 | CONFIG_ARCH_MTD_XIP=y |
| 23 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 25 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 24 | CONFIG_VECTORS_BASE=0xffff0000 | 26 | CONFIG_VECTORS_BASE=0xffff0000 |
| @@ -60,11 +62,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 60 | # CONFIG_TREE_RCU_TRACE is not set | 62 | # CONFIG_TREE_RCU_TRACE is not set |
| 61 | # CONFIG_IKCONFIG is not set | 63 | # CONFIG_IKCONFIG is not set |
| 62 | CONFIG_LOG_BUF_SHIFT=14 | 64 | CONFIG_LOG_BUF_SHIFT=14 |
| 63 | CONFIG_GROUP_SCHED=y | ||
| 64 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 65 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 66 | CONFIG_USER_SCHED=y | ||
| 67 | # CONFIG_CGROUP_SCHED is not set | ||
| 68 | # CONFIG_CGROUPS is not set | 65 | # CONFIG_CGROUPS is not set |
| 69 | CONFIG_SYSFS_DEPRECATED=y | 66 | CONFIG_SYSFS_DEPRECATED=y |
| 70 | CONFIG_SYSFS_DEPRECATED_V2=y | 67 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -97,10 +94,14 @@ CONFIG_TIMERFD=y | |||
| 97 | CONFIG_EVENTFD=y | 94 | CONFIG_EVENTFD=y |
| 98 | CONFIG_SHMEM=y | 95 | CONFIG_SHMEM=y |
| 99 | CONFIG_AIO=y | 96 | CONFIG_AIO=y |
| 97 | CONFIG_HAVE_PERF_EVENTS=y | ||
| 98 | CONFIG_PERF_USE_VMALLOC=y | ||
| 100 | 99 | ||
| 101 | # | 100 | # |
| 102 | # Kernel Performance Events And Counters | 101 | # Kernel Performance Events And Counters |
| 103 | # | 102 | # |
| 103 | # CONFIG_PERF_EVENTS is not set | ||
| 104 | # CONFIG_PERF_COUNTERS is not set | ||
| 104 | CONFIG_VM_EVENT_COUNTERS=y | 105 | CONFIG_VM_EVENT_COUNTERS=y |
| 105 | # CONFIG_COMPAT_BRK is not set | 106 | # CONFIG_COMPAT_BRK is not set |
| 106 | CONFIG_SLAB=y | 107 | CONFIG_SLAB=y |
| @@ -184,6 +185,7 @@ CONFIG_MMU=y | |||
| 184 | # CONFIG_ARCH_REALVIEW is not set | 185 | # CONFIG_ARCH_REALVIEW is not set |
| 185 | # CONFIG_ARCH_VERSATILE is not set | 186 | # CONFIG_ARCH_VERSATILE is not set |
| 186 | # CONFIG_ARCH_AT91 is not set | 187 | # CONFIG_ARCH_AT91 is not set |
| 188 | # CONFIG_ARCH_BCMRING is not set | ||
| 187 | # CONFIG_ARCH_CLPS711X is not set | 189 | # CONFIG_ARCH_CLPS711X is not set |
| 188 | # CONFIG_ARCH_GEMINI is not set | 190 | # CONFIG_ARCH_GEMINI is not set |
| 189 | # CONFIG_ARCH_EBSA110 is not set | 191 | # CONFIG_ARCH_EBSA110 is not set |
| @@ -193,7 +195,6 @@ CONFIG_MMU=y | |||
| 193 | # CONFIG_ARCH_STMP3XXX is not set | 195 | # CONFIG_ARCH_STMP3XXX is not set |
| 194 | # CONFIG_ARCH_NETX is not set | 196 | # CONFIG_ARCH_NETX is not set |
| 195 | # CONFIG_ARCH_H720X is not set | 197 | # CONFIG_ARCH_H720X is not set |
| 196 | # CONFIG_ARCH_NOMADIK is not set | ||
| 197 | # CONFIG_ARCH_IOP13XX is not set | 198 | # CONFIG_ARCH_IOP13XX is not set |
| 198 | # CONFIG_ARCH_IOP32X is not set | 199 | # CONFIG_ARCH_IOP32X is not set |
| 199 | # CONFIG_ARCH_IOP33X is not set | 200 | # CONFIG_ARCH_IOP33X is not set |
| @@ -210,21 +211,26 @@ CONFIG_MMU=y | |||
| 210 | # CONFIG_ARCH_KS8695 is not set | 211 | # CONFIG_ARCH_KS8695 is not set |
| 211 | # CONFIG_ARCH_NS9XXX is not set | 212 | # CONFIG_ARCH_NS9XXX is not set |
| 212 | # CONFIG_ARCH_W90X900 is not set | 213 | # CONFIG_ARCH_W90X900 is not set |
| 214 | # CONFIG_ARCH_NUC93X is not set | ||
| 213 | # CONFIG_ARCH_PNX4008 is not set | 215 | # CONFIG_ARCH_PNX4008 is not set |
| 214 | CONFIG_ARCH_PXA=y | 216 | CONFIG_ARCH_PXA=y |
| 215 | # CONFIG_ARCH_MSM is not set | 217 | # CONFIG_ARCH_MSM is not set |
| 218 | # CONFIG_ARCH_SHMOBILE is not set | ||
| 216 | # CONFIG_ARCH_RPC is not set | 219 | # CONFIG_ARCH_RPC is not set |
| 217 | # CONFIG_ARCH_SA1100 is not set | 220 | # CONFIG_ARCH_SA1100 is not set |
| 218 | # CONFIG_ARCH_S3C2410 is not set | 221 | # CONFIG_ARCH_S3C2410 is not set |
| 219 | # CONFIG_ARCH_S3C64XX is not set | 222 | # CONFIG_ARCH_S3C64XX is not set |
| 223 | # CONFIG_ARCH_S5P6440 is not set | ||
| 224 | # CONFIG_ARCH_S5P6442 is not set | ||
| 220 | # CONFIG_ARCH_S5PC1XX is not set | 225 | # CONFIG_ARCH_S5PC1XX is not set |
| 226 | # CONFIG_ARCH_S5PV210 is not set | ||
| 221 | # CONFIG_ARCH_SHARK is not set | 227 | # CONFIG_ARCH_SHARK is not set |
| 222 | # CONFIG_ARCH_LH7A40X is not set | 228 | # CONFIG_ARCH_LH7A40X is not set |
| 223 | # CONFIG_ARCH_U300 is not set | 229 | # CONFIG_ARCH_U300 is not set |
| 230 | # CONFIG_ARCH_U8500 is not set | ||
| 231 | # CONFIG_ARCH_NOMADIK is not set | ||
| 224 | # CONFIG_ARCH_DAVINCI is not set | 232 | # CONFIG_ARCH_DAVINCI is not set |
| 225 | # CONFIG_ARCH_OMAP is not set | 233 | # CONFIG_ARCH_OMAP is not set |
| 226 | # CONFIG_ARCH_BCMRING is not set | ||
| 227 | # CONFIG_ARCH_U8500 is not set | ||
| 228 | 234 | ||
| 229 | # | 235 | # |
| 230 | # Intel PXA2xx/PXA3xx Implementations | 236 | # Intel PXA2xx/PXA3xx Implementations |
| @@ -253,6 +259,7 @@ CONFIG_ARCH_PXA=y | |||
| 253 | # CONFIG_MACH_EM_X270 is not set | 259 | # CONFIG_MACH_EM_X270 is not set |
| 254 | # CONFIG_MACH_EXEDA is not set | 260 | # CONFIG_MACH_EXEDA is not set |
| 255 | # CONFIG_MACH_CM_X300 is not set | 261 | # CONFIG_MACH_CM_X300 is not set |
| 262 | # CONFIG_MACH_CAPC7117 is not set | ||
| 256 | # CONFIG_ARCH_GUMSTIX is not set | 263 | # CONFIG_ARCH_GUMSTIX is not set |
| 257 | CONFIG_MACH_INTELMOTE2=y | 264 | CONFIG_MACH_INTELMOTE2=y |
| 258 | # CONFIG_MACH_STARGATE2 is not set | 265 | # CONFIG_MACH_STARGATE2 is not set |
| @@ -275,7 +282,11 @@ CONFIG_MACH_INTELMOTE2=y | |||
| 275 | # CONFIG_PXA_EZX is not set | 282 | # CONFIG_PXA_EZX is not set |
| 276 | # CONFIG_MACH_MP900C is not set | 283 | # CONFIG_MACH_MP900C is not set |
| 277 | # CONFIG_ARCH_PXA_PALM is not set | 284 | # CONFIG_ARCH_PXA_PALM is not set |
| 285 | # CONFIG_MACH_RAUMFELD_RC is not set | ||
| 286 | # CONFIG_MACH_RAUMFELD_CONNECTOR is not set | ||
| 287 | # CONFIG_MACH_RAUMFELD_SPEAKER is not set | ||
| 278 | # CONFIG_PXA_SHARPSL is not set | 288 | # CONFIG_PXA_SHARPSL is not set |
| 289 | # CONFIG_MACH_ICONTROL is not set | ||
| 279 | # CONFIG_ARCH_PXA_ESERIES is not set | 290 | # CONFIG_ARCH_PXA_ESERIES is not set |
| 280 | CONFIG_PXA27x=y | 291 | CONFIG_PXA27x=y |
| 281 | CONFIG_PXA_SSP=y | 292 | CONFIG_PXA_SSP=y |
| @@ -302,6 +313,7 @@ CONFIG_ARM_THUMB=y | |||
| 302 | CONFIG_ARM_L1_CACHE_SHIFT=5 | 313 | CONFIG_ARM_L1_CACHE_SHIFT=5 |
| 303 | CONFIG_IWMMXT=y | 314 | CONFIG_IWMMXT=y |
| 304 | CONFIG_XSCALE_PMU=y | 315 | CONFIG_XSCALE_PMU=y |
| 316 | CONFIG_CPU_HAS_PMU=y | ||
| 305 | CONFIG_COMMON_CLKDEV=y | 317 | CONFIG_COMMON_CLKDEV=y |
| 306 | 318 | ||
| 307 | # | 319 | # |
| @@ -352,7 +364,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 352 | # | 364 | # |
| 353 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 365 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 354 | CONFIG_ZBOOT_ROM_BSS=0x0 | 366 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 355 | CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug" | 367 | CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M" |
| 356 | # CONFIG_XIP_KERNEL is not set | 368 | # CONFIG_XIP_KERNEL is not set |
| 357 | CONFIG_KEXEC=y | 369 | CONFIG_KEXEC=y |
| 358 | CONFIG_ATAGS_PROC=y | 370 | CONFIG_ATAGS_PROC=y |
| @@ -360,24 +372,8 @@ CONFIG_ATAGS_PROC=y | |||
| 360 | # | 372 | # |
| 361 | # CPU Power Management | 373 | # CPU Power Management |
| 362 | # | 374 | # |
| 363 | CONFIG_CPU_FREQ=y | 375 | # CONFIG_CPU_FREQ is not set |
| 364 | CONFIG_CPU_FREQ_TABLE=y | 376 | # CONFIG_CPU_IDLE is not set |
| 365 | CONFIG_CPU_FREQ_DEBUG=y | ||
| 366 | CONFIG_CPU_FREQ_STAT=y | ||
| 367 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
| 368 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
| 369 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 370 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
| 371 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 372 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 373 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
| 374 | CONFIG_CPU_FREQ_GOV_POWERSAVE=m | ||
| 375 | CONFIG_CPU_FREQ_GOV_USERSPACE=m | ||
| 376 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m | ||
| 377 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m | ||
| 378 | CONFIG_CPU_IDLE=y | ||
| 379 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
| 380 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
| 381 | 377 | ||
| 382 | # | 378 | # |
| 383 | # Floating point emulation | 379 | # Floating point emulation |
| @@ -409,6 +405,7 @@ CONFIG_SUSPEND=y | |||
| 409 | CONFIG_SUSPEND_FREEZER=y | 405 | CONFIG_SUSPEND_FREEZER=y |
| 410 | CONFIG_APM_EMULATION=y | 406 | CONFIG_APM_EMULATION=y |
| 411 | CONFIG_PM_RUNTIME=y | 407 | CONFIG_PM_RUNTIME=y |
| 408 | CONFIG_PM_OPS=y | ||
| 412 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 409 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 413 | CONFIG_NET=y | 410 | CONFIG_NET=y |
| 414 | 411 | ||
| @@ -416,7 +413,6 @@ CONFIG_NET=y | |||
| 416 | # Networking options | 413 | # Networking options |
| 417 | # | 414 | # |
| 418 | CONFIG_PACKET=y | 415 | CONFIG_PACKET=y |
| 419 | CONFIG_PACKET_MMAP=y | ||
| 420 | CONFIG_UNIX=y | 416 | CONFIG_UNIX=y |
| 421 | CONFIG_XFRM=y | 417 | CONFIG_XFRM=y |
| 422 | # CONFIG_XFRM_USER is not set | 418 | # CONFIG_XFRM_USER is not set |
| @@ -506,6 +502,7 @@ CONFIG_NF_CT_NETLINK=m | |||
| 506 | CONFIG_NETFILTER_XTABLES=m | 502 | CONFIG_NETFILTER_XTABLES=m |
| 507 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 503 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 508 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set | 504 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set |
| 505 | # CONFIG_NETFILTER_XT_TARGET_CT is not set | ||
| 509 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 506 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 510 | CONFIG_NETFILTER_XT_TARGET_HL=m | 507 | CONFIG_NETFILTER_XT_TARGET_HL=m |
| 511 | CONFIG_NETFILTER_XT_TARGET_LED=m | 508 | CONFIG_NETFILTER_XT_TARGET_LED=m |
| @@ -622,6 +619,7 @@ CONFIG_IP6_NF_RAW=m | |||
| 622 | # CONFIG_ATM is not set | 619 | # CONFIG_ATM is not set |
| 623 | CONFIG_STP=m | 620 | CONFIG_STP=m |
| 624 | CONFIG_BRIDGE=m | 621 | CONFIG_BRIDGE=m |
| 622 | # CONFIG_BRIDGE_IGMP_SNOOPING is not set | ||
| 625 | # CONFIG_NET_DSA is not set | 623 | # CONFIG_NET_DSA is not set |
| 626 | # CONFIG_VLAN_8021Q is not set | 624 | # CONFIG_VLAN_8021Q is not set |
| 627 | # CONFIG_DECNET is not set | 625 | # CONFIG_DECNET is not set |
| @@ -646,32 +644,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 646 | # CONFIG_HAMRADIO is not set | 644 | # CONFIG_HAMRADIO is not set |
| 647 | # CONFIG_CAN is not set | 645 | # CONFIG_CAN is not set |
| 648 | # CONFIG_IRDA is not set | 646 | # CONFIG_IRDA is not set |
| 649 | CONFIG_BT=y | 647 | # CONFIG_BT is not set |
| 650 | CONFIG_BT_L2CAP=y | ||
| 651 | CONFIG_BT_SCO=y | ||
| 652 | CONFIG_BT_RFCOMM=y | ||
| 653 | CONFIG_BT_RFCOMM_TTY=y | ||
| 654 | CONFIG_BT_BNEP=y | ||
| 655 | CONFIG_BT_BNEP_MC_FILTER=y | ||
| 656 | CONFIG_BT_BNEP_PROTO_FILTER=y | ||
| 657 | CONFIG_BT_HIDP=y | ||
| 658 | |||
| 659 | # | ||
| 660 | # Bluetooth device drivers | ||
| 661 | # | ||
| 662 | CONFIG_BT_HCIBTUSB=m | ||
| 663 | CONFIG_BT_HCIBTSDIO=m | ||
| 664 | CONFIG_BT_HCIUART=y | ||
| 665 | CONFIG_BT_HCIUART_H4=y | ||
| 666 | # CONFIG_BT_HCIUART_BCSP is not set | ||
| 667 | # CONFIG_BT_HCIUART_LL is not set | ||
| 668 | CONFIG_BT_HCIBCM203X=m | ||
| 669 | CONFIG_BT_HCIBPA10X=m | ||
| 670 | CONFIG_BT_HCIBFUSB=m | ||
| 671 | CONFIG_BT_HCIVHCI=m | ||
| 672 | CONFIG_BT_MRVL=m | ||
| 673 | CONFIG_BT_MRVL_SDIO=m | ||
| 674 | # CONFIG_BT_ATH3K is not set | ||
| 675 | # CONFIG_AF_RXRPC is not set | 648 | # CONFIG_AF_RXRPC is not set |
| 676 | CONFIG_FIB_RULES=y | 649 | CONFIG_FIB_RULES=y |
| 677 | # CONFIG_WIRELESS is not set | 650 | # CONFIG_WIRELESS is not set |
| @@ -687,7 +660,8 @@ CONFIG_FIB_RULES=y | |||
| 687 | # Generic Driver Options | 660 | # Generic Driver Options |
| 688 | # | 661 | # |
| 689 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 662 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 690 | # CONFIG_DEVTMPFS is not set | 663 | CONFIG_DEVTMPFS=y |
| 664 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 691 | CONFIG_STANDALONE=y | 665 | CONFIG_STANDALONE=y |
| 692 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 666 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 693 | CONFIG_FW_LOADER=m | 667 | CONFIG_FW_LOADER=m |
| @@ -703,9 +677,9 @@ CONFIG_MTD=y | |||
| 703 | # CONFIG_MTD_CONCAT is not set | 677 | # CONFIG_MTD_CONCAT is not set |
| 704 | CONFIG_MTD_PARTITIONS=y | 678 | CONFIG_MTD_PARTITIONS=y |
| 705 | # CONFIG_MTD_REDBOOT_PARTS is not set | 679 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 706 | # CONFIG_MTD_CMDLINE_PARTS is not set | 680 | CONFIG_MTD_CMDLINE_PARTS=y |
| 707 | # CONFIG_MTD_AFS_PARTS is not set | 681 | CONFIG_MTD_AFS_PARTS=y |
| 708 | # CONFIG_MTD_AR7_PARTS is not set | 682 | CONFIG_MTD_AR7_PARTS=y |
| 709 | 683 | ||
| 710 | # | 684 | # |
| 711 | # User Modules And Translation Layers | 685 | # User Modules And Translation Layers |
| @@ -812,6 +786,7 @@ CONFIG_HAVE_IDE=y | |||
| 812 | # | 786 | # |
| 813 | # SCSI device support | 787 | # SCSI device support |
| 814 | # | 788 | # |
| 789 | CONFIG_SCSI_MOD=y | ||
| 815 | # CONFIG_RAID_ATTRS is not set | 790 | # CONFIG_RAID_ATTRS is not set |
| 816 | # CONFIG_SCSI is not set | 791 | # CONFIG_SCSI is not set |
| 817 | # CONFIG_SCSI_DMA is not set | 792 | # CONFIG_SCSI_DMA is not set |
| @@ -965,6 +940,7 @@ CONFIG_SERIAL_PXA=y | |||
| 965 | CONFIG_SERIAL_PXA_CONSOLE=y | 940 | CONFIG_SERIAL_PXA_CONSOLE=y |
| 966 | CONFIG_SERIAL_CORE=y | 941 | CONFIG_SERIAL_CORE=y |
| 967 | CONFIG_SERIAL_CORE_CONSOLE=y | 942 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 943 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 968 | CONFIG_UNIX98_PTYS=y | 944 | CONFIG_UNIX98_PTYS=y |
| 969 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 945 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 970 | CONFIG_LEGACY_PTYS=y | 946 | CONFIG_LEGACY_PTYS=y |
| @@ -993,6 +969,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 993 | CONFIG_I2C_PXA=y | 969 | CONFIG_I2C_PXA=y |
| 994 | # CONFIG_I2C_PXA_SLAVE is not set | 970 | # CONFIG_I2C_PXA_SLAVE is not set |
| 995 | # CONFIG_I2C_SIMTEC is not set | 971 | # CONFIG_I2C_SIMTEC is not set |
| 972 | # CONFIG_I2C_XILINX is not set | ||
| 996 | 973 | ||
| 997 | # | 974 | # |
| 998 | # External I2C/SMBus adapter drivers | 975 | # External I2C/SMBus adapter drivers |
| @@ -1006,15 +983,9 @@ CONFIG_I2C_PXA=y | |||
| 1006 | # | 983 | # |
| 1007 | # CONFIG_I2C_PCA_PLATFORM is not set | 984 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1008 | # CONFIG_I2C_STUB is not set | 985 | # CONFIG_I2C_STUB is not set |
| 1009 | |||
| 1010 | # | ||
| 1011 | # Miscellaneous I2C Chip support | ||
| 1012 | # | ||
| 1013 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1014 | # CONFIG_I2C_DEBUG_CORE is not set | 986 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1015 | # CONFIG_I2C_DEBUG_ALGO is not set | 987 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1016 | # CONFIG_I2C_DEBUG_BUS is not set | 988 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1017 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1018 | CONFIG_SPI=y | 989 | CONFIG_SPI=y |
| 1019 | # CONFIG_SPI_DEBUG is not set | 990 | # CONFIG_SPI_DEBUG is not set |
| 1020 | CONFIG_SPI_MASTER=y | 991 | CONFIG_SPI_MASTER=y |
| @@ -1046,10 +1017,12 @@ CONFIG_GPIO_SYSFS=y | |||
| 1046 | # | 1017 | # |
| 1047 | # Memory mapped GPIO expanders: | 1018 | # Memory mapped GPIO expanders: |
| 1048 | # | 1019 | # |
| 1020 | # CONFIG_GPIO_IT8761E is not set | ||
| 1049 | 1021 | ||
| 1050 | # | 1022 | # |
| 1051 | # I2C GPIO expanders: | 1023 | # I2C GPIO expanders: |
| 1052 | # | 1024 | # |
| 1025 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1053 | # CONFIG_GPIO_MAX732X is not set | 1026 | # CONFIG_GPIO_MAX732X is not set |
| 1054 | # CONFIG_GPIO_PCA953X is not set | 1027 | # CONFIG_GPIO_PCA953X is not set |
| 1055 | # CONFIG_GPIO_PCF857X is not set | 1028 | # CONFIG_GPIO_PCF857X is not set |
| @@ -1093,10 +1066,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1093 | # Multifunction device drivers | 1066 | # Multifunction device drivers |
| 1094 | # | 1067 | # |
| 1095 | # CONFIG_MFD_CORE is not set | 1068 | # CONFIG_MFD_CORE is not set |
| 1069 | # CONFIG_MFD_88PM860X is not set | ||
| 1096 | # CONFIG_MFD_SM501 is not set | 1070 | # CONFIG_MFD_SM501 is not set |
| 1097 | # CONFIG_MFD_ASIC3 is not set | 1071 | # CONFIG_MFD_ASIC3 is not set |
| 1098 | # CONFIG_HTC_EGPIO is not set | 1072 | # CONFIG_HTC_EGPIO is not set |
| 1099 | # CONFIG_HTC_PASIC3 is not set | 1073 | # CONFIG_HTC_PASIC3 is not set |
| 1074 | # CONFIG_HTC_I2CPLD is not set | ||
| 1100 | # CONFIG_TPS65010 is not set | 1075 | # CONFIG_TPS65010 is not set |
| 1101 | # CONFIG_TWL4030_CORE is not set | 1076 | # CONFIG_TWL4030_CORE is not set |
| 1102 | # CONFIG_MFD_TMIO is not set | 1077 | # CONFIG_MFD_TMIO is not set |
| @@ -1105,22 +1080,25 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1105 | # CONFIG_MFD_TC6393XB is not set | 1080 | # CONFIG_MFD_TC6393XB is not set |
| 1106 | CONFIG_PMIC_DA903X=y | 1081 | CONFIG_PMIC_DA903X=y |
| 1107 | # CONFIG_PMIC_ADP5520 is not set | 1082 | # CONFIG_PMIC_ADP5520 is not set |
| 1083 | # CONFIG_MFD_MAX8925 is not set | ||
| 1108 | # CONFIG_MFD_WM8400 is not set | 1084 | # CONFIG_MFD_WM8400 is not set |
| 1109 | # CONFIG_MFD_WM831X is not set | 1085 | # CONFIG_MFD_WM831X is not set |
| 1110 | # CONFIG_MFD_WM8350_I2C is not set | 1086 | # CONFIG_MFD_WM8350_I2C is not set |
| 1087 | # CONFIG_MFD_WM8994 is not set | ||
| 1111 | # CONFIG_MFD_PCF50633 is not set | 1088 | # CONFIG_MFD_PCF50633 is not set |
| 1112 | # CONFIG_MFD_MC13783 is not set | 1089 | # CONFIG_MFD_MC13783 is not set |
| 1113 | # CONFIG_AB3100_CORE is not set | 1090 | # CONFIG_AB3100_CORE is not set |
| 1114 | # CONFIG_EZX_PCAP is not set | 1091 | # CONFIG_EZX_PCAP is not set |
| 1115 | # CONFIG_MFD_88PM8607 is not set | ||
| 1116 | # CONFIG_AB4500_CORE is not set | 1092 | # CONFIG_AB4500_CORE is not set |
| 1117 | CONFIG_REGULATOR=y | 1093 | CONFIG_REGULATOR=y |
| 1118 | CONFIG_REGULATOR_DEBUG=y | 1094 | CONFIG_REGULATOR_DEBUG=y |
| 1095 | # CONFIG_REGULATOR_DUMMY is not set | ||
| 1119 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | 1096 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set |
| 1120 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y | 1097 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y |
| 1121 | CONFIG_REGULATOR_USERSPACE_CONSUMER=y | 1098 | CONFIG_REGULATOR_USERSPACE_CONSUMER=y |
| 1122 | # CONFIG_REGULATOR_BQ24022 is not set | 1099 | # CONFIG_REGULATOR_BQ24022 is not set |
| 1123 | # CONFIG_REGULATOR_MAX1586 is not set | 1100 | # CONFIG_REGULATOR_MAX1586 is not set |
| 1101 | # CONFIG_REGULATOR_MAX8649 is not set | ||
| 1124 | # CONFIG_REGULATOR_MAX8660 is not set | 1102 | # CONFIG_REGULATOR_MAX8660 is not set |
| 1125 | CONFIG_REGULATOR_DA903X=y | 1103 | CONFIG_REGULATOR_DA903X=y |
| 1126 | # CONFIG_REGULATOR_LP3971 is not set | 1104 | # CONFIG_REGULATOR_LP3971 is not set |
| @@ -1218,6 +1196,7 @@ CONFIG_VIDEO_IR_I2C=y | |||
| 1218 | # CONFIG_VIDEO_SAA7191 is not set | 1196 | # CONFIG_VIDEO_SAA7191 is not set |
| 1219 | # CONFIG_VIDEO_TVP514X is not set | 1197 | # CONFIG_VIDEO_TVP514X is not set |
| 1220 | # CONFIG_VIDEO_TVP5150 is not set | 1198 | # CONFIG_VIDEO_TVP5150 is not set |
| 1199 | # CONFIG_VIDEO_TVP7002 is not set | ||
| 1221 | # CONFIG_VIDEO_VPX3220 is not set | 1200 | # CONFIG_VIDEO_VPX3220 is not set |
| 1222 | 1201 | ||
| 1223 | # | 1202 | # |
| @@ -1264,15 +1243,7 @@ CONFIG_SOC_CAMERA_MT9M111=y | |||
| 1264 | CONFIG_VIDEO_PXA27x=y | 1243 | CONFIG_VIDEO_PXA27x=y |
| 1265 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set | 1244 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set |
| 1266 | # CONFIG_V4L_USB_DRIVERS is not set | 1245 | # CONFIG_V4L_USB_DRIVERS is not set |
| 1267 | CONFIG_RADIO_ADAPTERS=y | 1246 | # CONFIG_RADIO_ADAPTERS is not set |
| 1268 | # CONFIG_I2C_SI4713 is not set | ||
| 1269 | # CONFIG_RADIO_SI4713 is not set | ||
| 1270 | # CONFIG_USB_DSBR is not set | ||
| 1271 | # CONFIG_RADIO_SI470X is not set | ||
| 1272 | # CONFIG_USB_MR800 is not set | ||
| 1273 | CONFIG_RADIO_TEA5764=y | ||
| 1274 | CONFIG_RADIO_TEA5764_XTAL=y | ||
| 1275 | # CONFIG_RADIO_TEF6862 is not set | ||
| 1276 | # CONFIG_DAB is not set | 1247 | # CONFIG_DAB is not set |
| 1277 | 1248 | ||
| 1278 | # | 1249 | # |
| @@ -1398,8 +1369,6 @@ CONFIG_HID=y | |||
| 1398 | # | 1369 | # |
| 1399 | # Special HID drivers | 1370 | # Special HID drivers |
| 1400 | # | 1371 | # |
| 1401 | CONFIG_HID_APPLE=m | ||
| 1402 | # CONFIG_HID_WACOM is not set | ||
| 1403 | CONFIG_USB_SUPPORT=y | 1372 | CONFIG_USB_SUPPORT=y |
| 1404 | CONFIG_USB_ARCH_HAS_HCD=y | 1373 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1405 | CONFIG_USB_ARCH_HAS_OHCI=y | 1374 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -1477,7 +1446,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1477 | # CONFIG_USB_RIO500 is not set | 1446 | # CONFIG_USB_RIO500 is not set |
| 1478 | # CONFIG_USB_LEGOTOWER is not set | 1447 | # CONFIG_USB_LEGOTOWER is not set |
| 1479 | # CONFIG_USB_LCD is not set | 1448 | # CONFIG_USB_LCD is not set |
| 1480 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1481 | # CONFIG_USB_LED is not set | 1449 | # CONFIG_USB_LED is not set |
| 1482 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1450 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1483 | # CONFIG_USB_CYTHERM is not set | 1451 | # CONFIG_USB_CYTHERM is not set |
| @@ -1489,7 +1457,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1489 | # CONFIG_USB_IOWARRIOR is not set | 1457 | # CONFIG_USB_IOWARRIOR is not set |
| 1490 | # CONFIG_USB_TEST is not set | 1458 | # CONFIG_USB_TEST is not set |
| 1491 | # CONFIG_USB_ISIGHTFW is not set | 1459 | # CONFIG_USB_ISIGHTFW is not set |
| 1492 | # CONFIG_USB_VST is not set | ||
| 1493 | CONFIG_USB_GADGET=y | 1460 | CONFIG_USB_GADGET=y |
| 1494 | # CONFIG_USB_GADGET_DEBUG is not set | 1461 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1495 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1462 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1529,6 +1496,7 @@ CONFIG_USB_ETH=y | |||
| 1529 | # CONFIG_USB_MIDI_GADGET is not set | 1496 | # CONFIG_USB_MIDI_GADGET is not set |
| 1530 | # CONFIG_USB_G_PRINTER is not set | 1497 | # CONFIG_USB_G_PRINTER is not set |
| 1531 | # CONFIG_USB_CDC_COMPOSITE is not set | 1498 | # CONFIG_USB_CDC_COMPOSITE is not set |
| 1499 | # CONFIG_USB_G_NOKIA is not set | ||
| 1532 | # CONFIG_USB_G_MULTI is not set | 1500 | # CONFIG_USB_G_MULTI is not set |
| 1533 | 1501 | ||
| 1534 | # | 1502 | # |
| @@ -1555,8 +1523,6 @@ CONFIG_SDIO_UART=m | |||
| 1555 | # | 1523 | # |
| 1556 | CONFIG_MMC_PXA=y | 1524 | CONFIG_MMC_PXA=y |
| 1557 | # CONFIG_MMC_SDHCI is not set | 1525 | # CONFIG_MMC_SDHCI is not set |
| 1558 | # CONFIG_MMC_AT91 is not set | ||
| 1559 | # CONFIG_MMC_ATMELMCI is not set | ||
| 1560 | CONFIG_MMC_SPI=y | 1526 | CONFIG_MMC_SPI=y |
| 1561 | # CONFIG_MEMSTICK is not set | 1527 | # CONFIG_MEMSTICK is not set |
| 1562 | CONFIG_NEW_LEDS=y | 1528 | CONFIG_NEW_LEDS=y |
| @@ -1574,11 +1540,11 @@ CONFIG_LEDS_LP3944=y | |||
| 1574 | # CONFIG_LEDS_REGULATOR is not set | 1540 | # CONFIG_LEDS_REGULATOR is not set |
| 1575 | # CONFIG_LEDS_BD2802 is not set | 1541 | # CONFIG_LEDS_BD2802 is not set |
| 1576 | # CONFIG_LEDS_LT3593 is not set | 1542 | # CONFIG_LEDS_LT3593 is not set |
| 1543 | CONFIG_LEDS_TRIGGERS=y | ||
| 1577 | 1544 | ||
| 1578 | # | 1545 | # |
| 1579 | # LED Triggers | 1546 | # LED Triggers |
| 1580 | # | 1547 | # |
| 1581 | CONFIG_LEDS_TRIGGERS=y | ||
| 1582 | CONFIG_LEDS_TRIGGER_TIMER=y | 1548 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 1583 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1549 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 1584 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y | 1550 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y |
| @@ -1656,7 +1622,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1656 | # on-CPU RTC drivers | 1622 | # on-CPU RTC drivers |
| 1657 | # | 1623 | # |
| 1658 | # CONFIG_RTC_DRV_SA1100 is not set | 1624 | # CONFIG_RTC_DRV_SA1100 is not set |
| 1659 | # CONFIG_RTC_DRV_PXA is not set | 1625 | CONFIG_RTC_DRV_PXA=y |
| 1660 | # CONFIG_DMADEVICES is not set | 1626 | # CONFIG_DMADEVICES is not set |
| 1661 | # CONFIG_AUXDISPLAY is not set | 1627 | # CONFIG_AUXDISPLAY is not set |
| 1662 | # CONFIG_UIO is not set | 1628 | # CONFIG_UIO is not set |
| @@ -1681,19 +1647,10 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 1681 | CONFIG_JBD=m | 1647 | CONFIG_JBD=m |
| 1682 | # CONFIG_JBD_DEBUG is not set | 1648 | # CONFIG_JBD_DEBUG is not set |
| 1683 | CONFIG_FS_MBCACHE=m | 1649 | CONFIG_FS_MBCACHE=m |
| 1684 | CONFIG_REISERFS_FS=m | 1650 | # CONFIG_REISERFS_FS is not set |
| 1685 | # CONFIG_REISERFS_CHECK is not set | ||
| 1686 | # CONFIG_REISERFS_PROC_INFO is not set | ||
| 1687 | CONFIG_REISERFS_FS_XATTR=y | ||
| 1688 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
| 1689 | CONFIG_REISERFS_FS_SECURITY=y | ||
| 1690 | # CONFIG_JFS_FS is not set | 1651 | # CONFIG_JFS_FS is not set |
| 1691 | CONFIG_FS_POSIX_ACL=y | 1652 | CONFIG_FS_POSIX_ACL=y |
| 1692 | CONFIG_XFS_FS=m | 1653 | # CONFIG_XFS_FS is not set |
| 1693 | # CONFIG_XFS_QUOTA is not set | ||
| 1694 | # CONFIG_XFS_POSIX_ACL is not set | ||
| 1695 | # CONFIG_XFS_RT is not set | ||
| 1696 | # CONFIG_XFS_DEBUG is not set | ||
| 1697 | # CONFIG_OCFS2_FS is not set | 1654 | # CONFIG_OCFS2_FS is not set |
| 1698 | # CONFIG_BTRFS_FS is not set | 1655 | # CONFIG_BTRFS_FS is not set |
| 1699 | # CONFIG_NILFS2_FS is not set | 1656 | # CONFIG_NILFS2_FS is not set |
| @@ -1716,9 +1673,7 @@ CONFIG_CUSE=m | |||
| 1716 | # | 1673 | # |
| 1717 | # CD-ROM/DVD Filesystems | 1674 | # CD-ROM/DVD Filesystems |
| 1718 | # | 1675 | # |
| 1719 | CONFIG_ISO9660_FS=m | 1676 | # CONFIG_ISO9660_FS is not set |
| 1720 | CONFIG_JOLIET=y | ||
| 1721 | CONFIG_ZISOFS=y | ||
| 1722 | # CONFIG_UDF_FS is not set | 1677 | # CONFIG_UDF_FS is not set |
| 1723 | 1678 | ||
| 1724 | # | 1679 | # |
| @@ -1750,12 +1705,14 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1750 | # CONFIG_BEFS_FS is not set | 1705 | # CONFIG_BEFS_FS is not set |
| 1751 | # CONFIG_BFS_FS is not set | 1706 | # CONFIG_BFS_FS is not set |
| 1752 | # CONFIG_EFS_FS is not set | 1707 | # CONFIG_EFS_FS is not set |
| 1753 | CONFIG_JFFS2_FS=m | 1708 | CONFIG_JFFS2_FS=y |
| 1754 | CONFIG_JFFS2_FS_DEBUG=0 | 1709 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1755 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1710 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1756 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | 1711 | CONFIG_JFFS2_FS_WBUF_VERIFY=y |
| 1757 | # CONFIG_JFFS2_SUMMARY is not set | 1712 | CONFIG_JFFS2_SUMMARY=y |
| 1758 | # CONFIG_JFFS2_FS_XATTR is not set | 1713 | CONFIG_JFFS2_FS_XATTR=y |
| 1714 | CONFIG_JFFS2_FS_POSIX_ACL=y | ||
| 1715 | CONFIG_JFFS2_FS_SECURITY=y | ||
| 1759 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | 1716 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y |
| 1760 | CONFIG_JFFS2_ZLIB=y | 1717 | CONFIG_JFFS2_ZLIB=y |
| 1761 | CONFIG_JFFS2_LZO=y | 1718 | CONFIG_JFFS2_LZO=y |
| @@ -1765,6 +1722,7 @@ CONFIG_JFFS2_RUBIN=y | |||
| 1765 | CONFIG_JFFS2_CMODE_PRIORITY=y | 1722 | CONFIG_JFFS2_CMODE_PRIORITY=y |
| 1766 | # CONFIG_JFFS2_CMODE_SIZE is not set | 1723 | # CONFIG_JFFS2_CMODE_SIZE is not set |
| 1767 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | 1724 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set |
| 1725 | # CONFIG_LOGFS is not set | ||
| 1768 | CONFIG_CRAMFS=m | 1726 | CONFIG_CRAMFS=m |
| 1769 | CONFIG_SQUASHFS=m | 1727 | CONFIG_SQUASHFS=m |
| 1770 | # CONFIG_SQUASHFS_EMBEDDED is not set | 1728 | # CONFIG_SQUASHFS_EMBEDDED is not set |
| @@ -1802,6 +1760,7 @@ CONFIG_SUNRPC=y | |||
| 1802 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1760 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1803 | CONFIG_SMB_FS=m | 1761 | CONFIG_SMB_FS=m |
| 1804 | # CONFIG_SMB_NLS_DEFAULT is not set | 1762 | # CONFIG_SMB_NLS_DEFAULT is not set |
| 1763 | # CONFIG_CEPH_FS is not set | ||
| 1805 | CONFIG_CIFS=m | 1764 | CONFIG_CIFS=m |
| 1806 | CONFIG_CIFS_STATS=y | 1765 | CONFIG_CIFS_STATS=y |
| 1807 | # CONFIG_CIFS_STATS2 is not set | 1766 | # CONFIG_CIFS_STATS2 is not set |
| @@ -1895,6 +1854,7 @@ CONFIG_DEBUG_SPINLOCK=y | |||
| 1895 | CONFIG_DEBUG_MUTEXES=y | 1854 | CONFIG_DEBUG_MUTEXES=y |
| 1896 | CONFIG_DEBUG_LOCK_ALLOC=y | 1855 | CONFIG_DEBUG_LOCK_ALLOC=y |
| 1897 | CONFIG_PROVE_LOCKING=y | 1856 | CONFIG_PROVE_LOCKING=y |
| 1857 | # CONFIG_PROVE_RCU is not set | ||
| 1898 | CONFIG_LOCKDEP=y | 1858 | CONFIG_LOCKDEP=y |
| 1899 | # CONFIG_LOCK_STAT is not set | 1859 | # CONFIG_LOCK_STAT is not set |
| 1900 | # CONFIG_DEBUG_LOCKDEP is not set | 1860 | # CONFIG_DEBUG_LOCKDEP is not set |
| @@ -1918,6 +1878,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1918 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1878 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1919 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1879 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1920 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 1880 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 1881 | # CONFIG_LKDTM is not set | ||
| 1921 | # CONFIG_FAULT_INJECTION is not set | 1882 | # CONFIG_FAULT_INJECTION is not set |
| 1922 | # CONFIG_LATENCYTOP is not set | 1883 | # CONFIG_LATENCYTOP is not set |
| 1923 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | 1884 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
| @@ -2061,9 +2022,9 @@ CONFIG_CRC32=y | |||
| 2061 | CONFIG_CRC7=y | 2022 | CONFIG_CRC7=y |
| 2062 | CONFIG_LIBCRC32C=m | 2023 | CONFIG_LIBCRC32C=m |
| 2063 | CONFIG_ZLIB_INFLATE=y | 2024 | CONFIG_ZLIB_INFLATE=y |
| 2064 | CONFIG_ZLIB_DEFLATE=m | 2025 | CONFIG_ZLIB_DEFLATE=y |
| 2065 | CONFIG_LZO_COMPRESS=m | 2026 | CONFIG_LZO_COMPRESS=y |
| 2066 | CONFIG_LZO_DECOMPRESS=m | 2027 | CONFIG_LZO_DECOMPRESS=y |
| 2067 | CONFIG_DECOMPRESS_GZIP=y | 2028 | CONFIG_DECOMPRESS_GZIP=y |
| 2068 | CONFIG_DECOMPRESS_BZIP2=y | 2029 | CONFIG_DECOMPRESS_BZIP2=y |
| 2069 | CONFIG_DECOMPRESS_LZMA=y | 2030 | CONFIG_DECOMPRESS_LZMA=y |
| @@ -2075,3 +2036,4 @@ CONFIG_HAS_IOMEM=y | |||
| 2075 | CONFIG_HAS_IOPORT=y | 2036 | CONFIG_HAS_IOPORT=y |
| 2076 | CONFIG_HAS_DMA=y | 2037 | CONFIG_HAS_DMA=y |
| 2077 | CONFIG_NLATTR=y | 2038 | CONFIG_NLATTR=y |
| 2039 | CONFIG_GENERIC_ATOMIC64=y | ||
diff --git a/arch/arm/configs/n8x0_defconfig b/arch/arm/configs/n8x0_defconfig index 216ad00948af..9405e32783de 100644 --- a/arch/arm/configs/n8x0_defconfig +++ b/arch/arm/configs/n8x0_defconfig | |||
| @@ -1058,7 +1058,6 @@ CONFIG_JFFS2_CMODE_PRIORITY=y | |||
| 1058 | # CONFIG_ROMFS_FS is not set | 1058 | # CONFIG_ROMFS_FS is not set |
| 1059 | # CONFIG_SYSV_FS is not set | 1059 | # CONFIG_SYSV_FS is not set |
| 1060 | # CONFIG_UFS_FS is not set | 1060 | # CONFIG_UFS_FS is not set |
| 1061 | # CONFIG_NILFS2_FS is not set | ||
| 1062 | CONFIG_NETWORK_FILESYSTEMS=y | 1061 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1063 | # CONFIG_NFS_FS is not set | 1062 | # CONFIG_NFS_FS is not set |
| 1064 | # CONFIG_NFSD is not set | 1063 | # CONFIG_NFSD is not set |
diff --git a/arch/arm/configs/omap_zoom2_defconfig b/arch/arm/configs/omap_zoom2_defconfig index f5c6e11cf189..881faea03d79 100644 --- a/arch/arm/configs/omap_zoom2_defconfig +++ b/arch/arm/configs/omap_zoom2_defconfig | |||
| @@ -661,7 +661,7 @@ CONFIG_DEVKMEM=y | |||
| 661 | CONFIG_SERIAL_8250=y | 661 | CONFIG_SERIAL_8250=y |
| 662 | CONFIG_SERIAL_8250_CONSOLE=y | 662 | CONFIG_SERIAL_8250_CONSOLE=y |
| 663 | CONFIG_SERIAL_8250_NR_UARTS=32 | 663 | CONFIG_SERIAL_8250_NR_UARTS=32 |
| 664 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 664 | CONFIG_SERIAL_8250_RUNTIME_UARTS=1 |
| 665 | CONFIG_SERIAL_8250_EXTENDED=y | 665 | CONFIG_SERIAL_8250_EXTENDED=y |
| 666 | CONFIG_SERIAL_8250_MANY_PORTS=y | 666 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 667 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 667 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
diff --git a/arch/arm/configs/omap_zoom3_defconfig b/arch/arm/configs/omap_zoom3_defconfig index ea9a5012d332..5e55b550a408 100644 --- a/arch/arm/configs/omap_zoom3_defconfig +++ b/arch/arm/configs/omap_zoom3_defconfig | |||
| @@ -680,7 +680,7 @@ CONFIG_DEVKMEM=y | |||
| 680 | CONFIG_SERIAL_8250=y | 680 | CONFIG_SERIAL_8250=y |
| 681 | CONFIG_SERIAL_8250_CONSOLE=y | 681 | CONFIG_SERIAL_8250_CONSOLE=y |
| 682 | CONFIG_SERIAL_8250_NR_UARTS=32 | 682 | CONFIG_SERIAL_8250_NR_UARTS=32 |
| 683 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 683 | CONFIG_SERIAL_8250_RUNTIME_UARTS=1 |
| 684 | CONFIG_SERIAL_8250_EXTENDED=y | 684 | CONFIG_SERIAL_8250_EXTENDED=y |
| 685 | CONFIG_SERIAL_8250_MANY_PORTS=y | 685 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 686 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 686 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index 45135ffadc57..473f9e13f08b 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
| @@ -59,8 +59,6 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 59 | CONFIG_USER_SCHED=y | 59 | CONFIG_USER_SCHED=y |
| 60 | # CONFIG_CGROUP_SCHED is not set | 60 | # CONFIG_CGROUP_SCHED is not set |
| 61 | # CONFIG_CGROUPS is not set | 61 | # CONFIG_CGROUPS is not set |
| 62 | CONFIG_SYSFS_DEPRECATED=y | ||
| 63 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 64 | # CONFIG_RELAY is not set | 62 | # CONFIG_RELAY is not set |
| 65 | # CONFIG_NAMESPACES is not set | 63 | # CONFIG_NAMESPACES is not set |
| 66 | CONFIG_BLK_DEV_INITRD=y | 64 | CONFIG_BLK_DEV_INITRD=y |
| @@ -480,7 +478,6 @@ CONFIG_BT_HIDP=m | |||
| 480 | # CONFIG_BT_HCIBFUSB is not set | 478 | # CONFIG_BT_HCIBFUSB is not set |
| 481 | # CONFIG_BT_HCIVHCI is not set | 479 | # CONFIG_BT_HCIVHCI is not set |
| 482 | # CONFIG_AF_RXRPC is not set | 480 | # CONFIG_AF_RXRPC is not set |
| 483 | # CONFIG_PHONET is not set | ||
| 484 | CONFIG_WIRELESS=y | 481 | CONFIG_WIRELESS=y |
| 485 | CONFIG_CFG80211=y | 482 | CONFIG_CFG80211=y |
| 486 | # CONFIG_CFG80211_REG_DEBUG is not set | 483 | # CONFIG_CFG80211_REG_DEBUG is not set |
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 00f46d9ce299..6e8f05c8a1c8 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h | |||
| @@ -149,10 +149,10 @@ | |||
| 149 | 149 | ||
| 150 | #define USER(x...) \ | 150 | #define USER(x...) \ |
| 151 | 9999: x; \ | 151 | 9999: x; \ |
| 152 | .section __ex_table,"a"; \ | 152 | .pushsection __ex_table,"a"; \ |
| 153 | .align 3; \ | 153 | .align 3; \ |
| 154 | .long 9999b,9001f; \ | 154 | .long 9999b,9001f; \ |
| 155 | .previous | 155 | .popsection |
| 156 | 156 | ||
| 157 | /* | 157 | /* |
| 158 | * SMP data memory barrier | 158 | * SMP data memory barrier |
| @@ -193,10 +193,10 @@ | |||
| 193 | .error "Unsupported inc macro argument" | 193 | .error "Unsupported inc macro argument" |
| 194 | .endif | 194 | .endif |
| 195 | 195 | ||
| 196 | .section __ex_table,"a" | 196 | .pushsection __ex_table,"a" |
| 197 | .align 3 | 197 | .align 3 |
| 198 | .long 9999b, \abort | 198 | .long 9999b, \abort |
| 199 | .previous | 199 | .popsection |
| 200 | .endm | 200 | .endm |
| 201 | 201 | ||
| 202 | .macro usracc, instr, reg, ptr, inc, cond, rept, abort | 202 | .macro usracc, instr, reg, ptr, inc, cond, rept, abort |
| @@ -234,10 +234,10 @@ | |||
| 234 | .error "Unsupported inc macro argument" | 234 | .error "Unsupported inc macro argument" |
| 235 | .endif | 235 | .endif |
| 236 | 236 | ||
| 237 | .section __ex_table,"a" | 237 | .pushsection __ex_table,"a" |
| 238 | .align 3 | 238 | .align 3 |
| 239 | .long 9999b, \abort | 239 | .long 9999b, \abort |
| 240 | .previous | 240 | .popsection |
| 241 | .endr | 241 | .endr |
| 242 | .endm | 242 | .endm |
| 243 | 243 | ||
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index bff056489cc1..51662feb9f1d 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 10 | #include <asm/user.h> | 10 | #include <asm/user.h> |
| 11 | 11 | ||
| 12 | struct task_struct; | ||
| 13 | |||
| 12 | typedef unsigned long elf_greg_t; | 14 | typedef unsigned long elf_greg_t; |
| 13 | typedef unsigned long elf_freg_t[3]; | 15 | typedef unsigned long elf_freg_t[3]; |
| 14 | 16 | ||
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h index bfcc15929a7f..540a044153a5 100644 --- a/arch/arm/include/asm/futex.h +++ b/arch/arm/include/asm/futex.h | |||
| @@ -21,14 +21,14 @@ | |||
| 21 | "2: strt %0, [%2]\n" \ | 21 | "2: strt %0, [%2]\n" \ |
| 22 | " mov %0, #0\n" \ | 22 | " mov %0, #0\n" \ |
| 23 | "3:\n" \ | 23 | "3:\n" \ |
| 24 | " .section __ex_table,\"a\"\n" \ | 24 | " .pushsection __ex_table,\"a\"\n" \ |
| 25 | " .align 3\n" \ | 25 | " .align 3\n" \ |
| 26 | " .long 1b, 4f, 2b, 4f\n" \ | 26 | " .long 1b, 4f, 2b, 4f\n" \ |
| 27 | " .previous\n" \ | 27 | " .popsection\n" \ |
| 28 | " .section .fixup,\"ax\"\n" \ | 28 | " .pushsection .fixup,\"ax\"\n" \ |
| 29 | "4: mov %0, %4\n" \ | 29 | "4: mov %0, %4\n" \ |
| 30 | " b 3b\n" \ | 30 | " b 3b\n" \ |
| 31 | " .previous" \ | 31 | " .popsection" \ |
| 32 | : "=&r" (ret), "=&r" (oldval) \ | 32 | : "=&r" (ret), "=&r" (oldval) \ |
| 33 | : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \ | 33 | : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \ |
| 34 | : "cc", "memory") | 34 | : "cc", "memory") |
| @@ -102,14 +102,14 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) | |||
| 102 | " it eq @ explicit IT needed for the 2b label\n" | 102 | " it eq @ explicit IT needed for the 2b label\n" |
| 103 | "2: streqt %2, [%3]\n" | 103 | "2: streqt %2, [%3]\n" |
| 104 | "3:\n" | 104 | "3:\n" |
| 105 | " .section __ex_table,\"a\"\n" | 105 | " .pushsection __ex_table,\"a\"\n" |
| 106 | " .align 3\n" | 106 | " .align 3\n" |
| 107 | " .long 1b, 4f, 2b, 4f\n" | 107 | " .long 1b, 4f, 2b, 4f\n" |
| 108 | " .previous\n" | 108 | " .popsection\n" |
| 109 | " .section .fixup,\"ax\"\n" | 109 | " .pushsection .fixup,\"ax\"\n" |
| 110 | "4: mov %0, %4\n" | 110 | "4: mov %0, %4\n" |
| 111 | " b 3b\n" | 111 | " b 3b\n" |
| 112 | " .previous" | 112 | " .popsection" |
| 113 | : "=&r" (val) | 113 | : "=&r" (val) |
| 114 | : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT) | 114 | : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT) |
| 115 | : "cc", "memory"); | 115 | : "cc", "memory"); |
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 1d6bd40a4322..33e4a48fe103 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h | |||
| @@ -229,16 +229,16 @@ do { \ | |||
| 229 | __asm__ __volatile__( \ | 229 | __asm__ __volatile__( \ |
| 230 | "1: ldrbt %1,[%2]\n" \ | 230 | "1: ldrbt %1,[%2]\n" \ |
| 231 | "2:\n" \ | 231 | "2:\n" \ |
| 232 | " .section .fixup,\"ax\"\n" \ | 232 | " .pushsection .fixup,\"ax\"\n" \ |
| 233 | " .align 2\n" \ | 233 | " .align 2\n" \ |
| 234 | "3: mov %0, %3\n" \ | 234 | "3: mov %0, %3\n" \ |
| 235 | " mov %1, #0\n" \ | 235 | " mov %1, #0\n" \ |
| 236 | " b 2b\n" \ | 236 | " b 2b\n" \ |
| 237 | " .previous\n" \ | 237 | " .popsection\n" \ |
| 238 | " .section __ex_table,\"a\"\n" \ | 238 | " .pushsection __ex_table,\"a\"\n" \ |
| 239 | " .align 3\n" \ | 239 | " .align 3\n" \ |
| 240 | " .long 1b, 3b\n" \ | 240 | " .long 1b, 3b\n" \ |
| 241 | " .previous" \ | 241 | " .popsection" \ |
| 242 | : "+r" (err), "=&r" (x) \ | 242 | : "+r" (err), "=&r" (x) \ |
| 243 | : "r" (addr), "i" (-EFAULT) \ | 243 | : "r" (addr), "i" (-EFAULT) \ |
| 244 | : "cc") | 244 | : "cc") |
| @@ -265,16 +265,16 @@ do { \ | |||
| 265 | __asm__ __volatile__( \ | 265 | __asm__ __volatile__( \ |
| 266 | "1: ldrt %1,[%2]\n" \ | 266 | "1: ldrt %1,[%2]\n" \ |
| 267 | "2:\n" \ | 267 | "2:\n" \ |
| 268 | " .section .fixup,\"ax\"\n" \ | 268 | " .pushsection .fixup,\"ax\"\n" \ |
| 269 | " .align 2\n" \ | 269 | " .align 2\n" \ |
| 270 | "3: mov %0, %3\n" \ | 270 | "3: mov %0, %3\n" \ |
| 271 | " mov %1, #0\n" \ | 271 | " mov %1, #0\n" \ |
| 272 | " b 2b\n" \ | 272 | " b 2b\n" \ |
| 273 | " .previous\n" \ | 273 | " .popsection\n" \ |
| 274 | " .section __ex_table,\"a\"\n" \ | 274 | " .pushsection __ex_table,\"a\"\n" \ |
| 275 | " .align 3\n" \ | 275 | " .align 3\n" \ |
| 276 | " .long 1b, 3b\n" \ | 276 | " .long 1b, 3b\n" \ |
| 277 | " .previous" \ | 277 | " .popsection" \ |
| 278 | : "+r" (err), "=&r" (x) \ | 278 | : "+r" (err), "=&r" (x) \ |
| 279 | : "r" (addr), "i" (-EFAULT) \ | 279 | : "r" (addr), "i" (-EFAULT) \ |
| 280 | : "cc") | 280 | : "cc") |
| @@ -310,15 +310,15 @@ do { \ | |||
| 310 | __asm__ __volatile__( \ | 310 | __asm__ __volatile__( \ |
| 311 | "1: strbt %1,[%2]\n" \ | 311 | "1: strbt %1,[%2]\n" \ |
| 312 | "2:\n" \ | 312 | "2:\n" \ |
| 313 | " .section .fixup,\"ax\"\n" \ | 313 | " .pushsection .fixup,\"ax\"\n" \ |
| 314 | " .align 2\n" \ | 314 | " .align 2\n" \ |
| 315 | "3: mov %0, %3\n" \ | 315 | "3: mov %0, %3\n" \ |
| 316 | " b 2b\n" \ | 316 | " b 2b\n" \ |
| 317 | " .previous\n" \ | 317 | " .popsection\n" \ |
| 318 | " .section __ex_table,\"a\"\n" \ | 318 | " .pushsection __ex_table,\"a\"\n" \ |
| 319 | " .align 3\n" \ | 319 | " .align 3\n" \ |
| 320 | " .long 1b, 3b\n" \ | 320 | " .long 1b, 3b\n" \ |
| 321 | " .previous" \ | 321 | " .popsection" \ |
| 322 | : "+r" (err) \ | 322 | : "+r" (err) \ |
| 323 | : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ | 323 | : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ |
| 324 | : "cc") | 324 | : "cc") |
| @@ -343,15 +343,15 @@ do { \ | |||
| 343 | __asm__ __volatile__( \ | 343 | __asm__ __volatile__( \ |
| 344 | "1: strt %1,[%2]\n" \ | 344 | "1: strt %1,[%2]\n" \ |
| 345 | "2:\n" \ | 345 | "2:\n" \ |
| 346 | " .section .fixup,\"ax\"\n" \ | 346 | " .pushsection .fixup,\"ax\"\n" \ |
| 347 | " .align 2\n" \ | 347 | " .align 2\n" \ |
| 348 | "3: mov %0, %3\n" \ | 348 | "3: mov %0, %3\n" \ |
| 349 | " b 2b\n" \ | 349 | " b 2b\n" \ |
| 350 | " .previous\n" \ | 350 | " .popsection\n" \ |
| 351 | " .section __ex_table,\"a\"\n" \ | 351 | " .pushsection __ex_table,\"a\"\n" \ |
| 352 | " .align 3\n" \ | 352 | " .align 3\n" \ |
| 353 | " .long 1b, 3b\n" \ | 353 | " .long 1b, 3b\n" \ |
| 354 | " .previous" \ | 354 | " .popsection" \ |
| 355 | : "+r" (err) \ | 355 | : "+r" (err) \ |
| 356 | : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ | 356 | : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ |
| 357 | : "cc") | 357 | : "cc") |
| @@ -371,16 +371,16 @@ do { \ | |||
| 371 | THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \ | 371 | THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \ |
| 372 | THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \ | 372 | THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \ |
| 373 | "3:\n" \ | 373 | "3:\n" \ |
| 374 | " .section .fixup,\"ax\"\n" \ | 374 | " .pushsection .fixup,\"ax\"\n" \ |
| 375 | " .align 2\n" \ | 375 | " .align 2\n" \ |
| 376 | "4: mov %0, %3\n" \ | 376 | "4: mov %0, %3\n" \ |
| 377 | " b 3b\n" \ | 377 | " b 3b\n" \ |
| 378 | " .previous\n" \ | 378 | " .popsection\n" \ |
| 379 | " .section __ex_table,\"a\"\n" \ | 379 | " .pushsection __ex_table,\"a\"\n" \ |
| 380 | " .align 3\n" \ | 380 | " .align 3\n" \ |
| 381 | " .long 1b, 4b\n" \ | 381 | " .long 1b, 4b\n" \ |
| 382 | " .long 2b, 4b\n" \ | 382 | " .long 2b, 4b\n" \ |
| 383 | " .previous" \ | 383 | " .popsection" \ |
| 384 | : "+r" (err), "+r" (__pu_addr) \ | 384 | : "+r" (err), "+r" (__pu_addr) \ |
| 385 | : "r" (x), "i" (-EFAULT) \ | 385 | : "r" (x), "i" (-EFAULT) \ |
| 386 | : "cc") | 386 | : "cc") |
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 6c5cf369183b..7ee48e7f8f31 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -523,16 +523,16 @@ ENDPROC(__und_usr) | |||
| 523 | /* | 523 | /* |
| 524 | * The out of line fixup for the ldrt above. | 524 | * The out of line fixup for the ldrt above. |
| 525 | */ | 525 | */ |
| 526 | .section .fixup, "ax" | 526 | .pushsection .fixup, "ax" |
| 527 | 4: mov pc, r9 | 527 | 4: mov pc, r9 |
| 528 | .previous | 528 | .popsection |
| 529 | .section __ex_table,"a" | 529 | .pushsection __ex_table,"a" |
| 530 | .long 1b, 4b | 530 | .long 1b, 4b |
| 531 | #if __LINUX_ARM_ARCH__ >= 7 | 531 | #if __LINUX_ARM_ARCH__ >= 7 |
| 532 | .long 2b, 4b | 532 | .long 2b, 4b |
| 533 | .long 3b, 4b | 533 | .long 3b, 4b |
| 534 | #endif | 534 | #endif |
| 535 | .previous | 535 | .popsection |
| 536 | 536 | ||
| 537 | /* | 537 | /* |
| 538 | * Check whether the instruction is a co-processor instruction. | 538 | * Check whether the instruction is a co-processor instruction. |
| @@ -676,10 +676,10 @@ do_fpe: | |||
| 676 | * lr = unrecognised FP instruction return address | 676 | * lr = unrecognised FP instruction return address |
| 677 | */ | 677 | */ |
| 678 | 678 | ||
| 679 | .data | 679 | .pushsection .data |
| 680 | ENTRY(fp_enter) | 680 | ENTRY(fp_enter) |
| 681 | .word no_fp | 681 | .word no_fp |
| 682 | .previous | 682 | .popsection |
| 683 | 683 | ||
| 684 | ENTRY(no_fp) | 684 | ENTRY(no_fp) |
| 685 | mov pc, lr | 685 | mov pc, lr |
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index c63842766229..0298286ad4ad 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c | |||
| @@ -62,15 +62,15 @@ int ftrace_modify_code(unsigned long pc, unsigned char *old_code, | |||
| 62 | " movne %0, #2 \n" | 62 | " movne %0, #2 \n" |
| 63 | "3:\n" | 63 | "3:\n" |
| 64 | 64 | ||
| 65 | ".section .fixup, \"ax\"\n" | 65 | ".pushsection .fixup, \"ax\"\n" |
| 66 | "4: mov %0, #1 \n" | 66 | "4: mov %0, #1 \n" |
| 67 | " b 3b \n" | 67 | " b 3b \n" |
| 68 | ".previous\n" | 68 | ".popsection\n" |
| 69 | 69 | ||
| 70 | ".section __ex_table, \"a\"\n" | 70 | ".pushsection __ex_table, \"a\"\n" |
| 71 | " .long 1b, 4b \n" | 71 | " .long 1b, 4b \n" |
| 72 | " .long 2b, 4b \n" | 72 | " .long 2b, 4b \n" |
| 73 | ".previous\n" | 73 | ".popsection\n" |
| 74 | 74 | ||
| 75 | : "=r"(err), "=r"(replaced) | 75 | : "=r"(err), "=r"(replaced) |
| 76 | : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced) | 76 | : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced) |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 0e12e0acbf26..acf5e6fdb6dc 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
| @@ -355,7 +355,7 @@ EXPORT_SYMBOL(dump_fpu); | |||
| 355 | * the thread function, and r3 points to the exit function. | 355 | * the thread function, and r3 points to the exit function. |
| 356 | */ | 356 | */ |
| 357 | extern void kernel_thread_helper(void); | 357 | extern void kernel_thread_helper(void); |
| 358 | asm( ".section .text\n" | 358 | asm( ".pushsection .text\n" |
| 359 | " .align\n" | 359 | " .align\n" |
| 360 | " .type kernel_thread_helper, #function\n" | 360 | " .type kernel_thread_helper, #function\n" |
| 361 | "kernel_thread_helper:\n" | 361 | "kernel_thread_helper:\n" |
| @@ -363,11 +363,11 @@ asm( ".section .text\n" | |||
| 363 | " mov lr, r3\n" | 363 | " mov lr, r3\n" |
| 364 | " mov pc, r2\n" | 364 | " mov pc, r2\n" |
| 365 | " .size kernel_thread_helper, . - kernel_thread_helper\n" | 365 | " .size kernel_thread_helper, . - kernel_thread_helper\n" |
| 366 | " .previous"); | 366 | " .popsection"); |
| 367 | 367 | ||
| 368 | #ifdef CONFIG_ARM_UNWIND | 368 | #ifdef CONFIG_ARM_UNWIND |
| 369 | extern void kernel_thread_exit(long code); | 369 | extern void kernel_thread_exit(long code); |
| 370 | asm( ".section .text\n" | 370 | asm( ".pushsection .text\n" |
| 371 | " .align\n" | 371 | " .align\n" |
| 372 | " .type kernel_thread_exit, #function\n" | 372 | " .type kernel_thread_exit, #function\n" |
| 373 | "kernel_thread_exit:\n" | 373 | "kernel_thread_exit:\n" |
| @@ -377,7 +377,7 @@ asm( ".section .text\n" | |||
| 377 | " nop\n" | 377 | " nop\n" |
| 378 | " .fnend\n" | 378 | " .fnend\n" |
| 379 | " .size kernel_thread_exit, . - kernel_thread_exit\n" | 379 | " .size kernel_thread_exit, . - kernel_thread_exit\n" |
| 380 | " .previous"); | 380 | " .popsection"); |
| 381 | #else | 381 | #else |
| 382 | #define kernel_thread_exit do_exit | 382 | #define kernel_thread_exit do_exit |
| 383 | #endif | 383 | #endif |
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 577543f3857f..a01194e583ff 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -86,6 +86,12 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
| 86 | return PTR_ERR(idle); | 86 | return PTR_ERR(idle); |
| 87 | } | 87 | } |
| 88 | ci->idle = idle; | 88 | ci->idle = idle; |
| 89 | } else { | ||
| 90 | /* | ||
| 91 | * Since this idle thread is being re-used, call | ||
| 92 | * init_idle() to reinitialize the thread structure. | ||
| 93 | */ | ||
| 94 | init_idle(idle, cpu); | ||
| 89 | } | 95 | } |
| 90 | 96 | ||
| 91 | /* | 97 | /* |
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S index aaf7220d9e30..a673297b0cf1 100644 --- a/arch/arm/lib/backtrace.S +++ b/arch/arm/lib/backtrace.S | |||
| @@ -110,13 +110,13 @@ no_frame: ldmfd sp!, {r4 - r8, pc} | |||
| 110 | ENDPROC(__backtrace) | 110 | ENDPROC(__backtrace) |
| 111 | ENDPROC(c_backtrace) | 111 | ENDPROC(c_backtrace) |
| 112 | 112 | ||
| 113 | .section __ex_table,"a" | 113 | .pushsection __ex_table,"a" |
| 114 | .align 3 | 114 | .align 3 |
| 115 | .long 1001b, 1006b | 115 | .long 1001b, 1006b |
| 116 | .long 1002b, 1006b | 116 | .long 1002b, 1006b |
| 117 | .long 1003b, 1006b | 117 | .long 1003b, 1006b |
| 118 | .long 1004b, 1006b | 118 | .long 1004b, 1006b |
| 119 | .previous | 119 | .popsection |
| 120 | 120 | ||
| 121 | #define instr r4 | 121 | #define instr r4 |
| 122 | #define reg r5 | 122 | #define reg r5 |
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S index 1279abd8b886..5e3f99620c04 100644 --- a/arch/arm/lib/clear_user.S +++ b/arch/arm/lib/clear_user.S | |||
| @@ -46,8 +46,8 @@ USER( strnebt r2, [r0]) | |||
| 46 | ldmfd sp!, {r1, pc} | 46 | ldmfd sp!, {r1, pc} |
| 47 | ENDPROC(__clear_user) | 47 | ENDPROC(__clear_user) |
| 48 | 48 | ||
| 49 | .section .fixup,"ax" | 49 | .pushsection .fixup,"ax" |
| 50 | .align 0 | 50 | .align 0 |
| 51 | 9001: ldmfd sp!, {r0, pc} | 51 | 9001: ldmfd sp!, {r0, pc} |
| 52 | .previous | 52 | .popsection |
| 53 | 53 | ||
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S index e4fe124acedc..66a477a3e3cc 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S | |||
| @@ -90,7 +90,7 @@ ENTRY(__copy_from_user) | |||
| 90 | 90 | ||
| 91 | ENDPROC(__copy_from_user) | 91 | ENDPROC(__copy_from_user) |
| 92 | 92 | ||
| 93 | .section .fixup,"ax" | 93 | .pushsection .fixup,"ax" |
| 94 | .align 0 | 94 | .align 0 |
| 95 | copy_abort_preamble | 95 | copy_abort_preamble |
| 96 | ldmfd sp!, {r1, r2} | 96 | ldmfd sp!, {r1, r2} |
| @@ -100,5 +100,5 @@ ENDPROC(__copy_from_user) | |||
| 100 | bl __memzero | 100 | bl __memzero |
| 101 | ldr r0, [sp], #4 | 101 | ldr r0, [sp], #4 |
| 102 | copy_abort_end | 102 | copy_abort_end |
| 103 | .previous | 103 | .popsection |
| 104 | 104 | ||
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S index 1a71e1584442..027b69bdbad1 100644 --- a/arch/arm/lib/copy_to_user.S +++ b/arch/arm/lib/copy_to_user.S | |||
| @@ -94,12 +94,12 @@ WEAK(__copy_to_user) | |||
| 94 | 94 | ||
| 95 | ENDPROC(__copy_to_user) | 95 | ENDPROC(__copy_to_user) |
| 96 | 96 | ||
| 97 | .section .fixup,"ax" | 97 | .pushsection .fixup,"ax" |
| 98 | .align 0 | 98 | .align 0 |
| 99 | copy_abort_preamble | 99 | copy_abort_preamble |
| 100 | ldmfd sp!, {r1, r2, r3} | 100 | ldmfd sp!, {r1, r2, r3} |
| 101 | sub r0, r0, r1 | 101 | sub r0, r0, r1 |
| 102 | rsb r0, r0, r2 | 102 | rsb r0, r0, r2 |
| 103 | copy_abort_end | 103 | copy_abort_end |
| 104 | .previous | 104 | .popsection |
| 105 | 105 | ||
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index fd0e9dcd9fdc..59ff6fdc1e63 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | * so properly, we would have to add in whatever registers were loaded before | 68 | * so properly, we would have to add in whatever registers were loaded before |
| 69 | * the fault, which, with the current asm above is not predictable. | 69 | * the fault, which, with the current asm above is not predictable. |
| 70 | */ | 70 | */ |
| 71 | .section .fixup,"ax" | 71 | .pushsection .fixup,"ax" |
| 72 | .align 4 | 72 | .align 4 |
| 73 | 9001: mov r4, #-EFAULT | 73 | 9001: mov r4, #-EFAULT |
| 74 | ldr r5, [fp, #4] @ *err_ptr | 74 | ldr r5, [fp, #4] @ *err_ptr |
| @@ -80,4 +80,4 @@ | |||
| 80 | strneb r0, [r1], #1 | 80 | strneb r0, [r1], #1 |
| 81 | bne 9002b | 81 | bne 9002b |
| 82 | load_regs | 82 | load_regs |
| 83 | .previous | 83 | .popsection |
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index a1814d927122..b1631a7dbe75 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S | |||
| @@ -64,9 +64,9 @@ __get_user_bad: | |||
| 64 | mov pc, lr | 64 | mov pc, lr |
| 65 | ENDPROC(__get_user_bad) | 65 | ENDPROC(__get_user_bad) |
| 66 | 66 | ||
| 67 | .section __ex_table, "a" | 67 | .pushsection __ex_table, "a" |
| 68 | .long 1b, __get_user_bad | 68 | .long 1b, __get_user_bad |
| 69 | .long 2b, __get_user_bad | 69 | .long 2b, __get_user_bad |
| 70 | .long 3b, __get_user_bad | 70 | .long 3b, __get_user_bad |
| 71 | .long 4b, __get_user_bad | 71 | .long 4b, __get_user_bad |
| 72 | .previous | 72 | .popsection |
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S index 02fedbf07c0d..5a01a23c6c06 100644 --- a/arch/arm/lib/putuser.S +++ b/arch/arm/lib/putuser.S | |||
| @@ -81,11 +81,11 @@ __put_user_bad: | |||
| 81 | mov pc, lr | 81 | mov pc, lr |
| 82 | ENDPROC(__put_user_bad) | 82 | ENDPROC(__put_user_bad) |
| 83 | 83 | ||
| 84 | .section __ex_table, "a" | 84 | .pushsection __ex_table, "a" |
| 85 | .long 1b, __put_user_bad | 85 | .long 1b, __put_user_bad |
| 86 | .long 2b, __put_user_bad | 86 | .long 2b, __put_user_bad |
| 87 | .long 3b, __put_user_bad | 87 | .long 3b, __put_user_bad |
| 88 | .long 4b, __put_user_bad | 88 | .long 4b, __put_user_bad |
| 89 | .long 5b, __put_user_bad | 89 | .long 5b, __put_user_bad |
| 90 | .long 6b, __put_user_bad | 90 | .long 6b, __put_user_bad |
| 91 | .previous | 91 | .popsection |
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S index 1c9814f346c6..f202d7bd1647 100644 --- a/arch/arm/lib/strncpy_from_user.S +++ b/arch/arm/lib/strncpy_from_user.S | |||
| @@ -33,11 +33,11 @@ ENTRY(__strncpy_from_user) | |||
| 33 | mov pc, lr | 33 | mov pc, lr |
| 34 | ENDPROC(__strncpy_from_user) | 34 | ENDPROC(__strncpy_from_user) |
| 35 | 35 | ||
| 36 | .section .fixup,"ax" | 36 | .pushsection .fixup,"ax" |
| 37 | .align 0 | 37 | .align 0 |
| 38 | 9001: mov r3, #0 | 38 | 9001: mov r3, #0 |
| 39 | strb r3, [r0, #0] @ null terminate | 39 | strb r3, [r0, #0] @ null terminate |
| 40 | mov r0, #-EFAULT | 40 | mov r0, #-EFAULT |
| 41 | mov pc, lr | 41 | mov pc, lr |
| 42 | .previous | 42 | .popsection |
| 43 | 43 | ||
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S index 7855b2906659..0ecbb459c4f1 100644 --- a/arch/arm/lib/strnlen_user.S +++ b/arch/arm/lib/strnlen_user.S | |||
| @@ -33,8 +33,8 @@ ENTRY(__strnlen_user) | |||
| 33 | mov pc, lr | 33 | mov pc, lr |
| 34 | ENDPROC(__strnlen_user) | 34 | ENDPROC(__strnlen_user) |
| 35 | 35 | ||
| 36 | .section .fixup,"ax" | 36 | .pushsection .fixup,"ax" |
| 37 | .align 0 | 37 | .align 0 |
| 38 | 9001: mov r0, #0 | 38 | 9001: mov r0, #0 |
| 39 | mov pc, lr | 39 | mov pc, lr |
| 40 | .previous | 40 | .popsection |
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S index ffdd27498cee..fee9f6f88adb 100644 --- a/arch/arm/lib/uaccess.S +++ b/arch/arm/lib/uaccess.S | |||
| @@ -279,10 +279,10 @@ USER( strgtbt r3, [r0], #1) @ May fault | |||
| 279 | b .Lc2u_finished | 279 | b .Lc2u_finished |
| 280 | ENDPROC(__copy_to_user) | 280 | ENDPROC(__copy_to_user) |
| 281 | 281 | ||
| 282 | .section .fixup,"ax" | 282 | .pushsection .fixup,"ax" |
| 283 | .align 0 | 283 | .align 0 |
| 284 | 9001: ldmfd sp!, {r0, r4 - r7, pc} | 284 | 9001: ldmfd sp!, {r0, r4 - r7, pc} |
| 285 | .previous | 285 | .popsection |
| 286 | 286 | ||
| 287 | /* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n); | 287 | /* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n); |
| 288 | * Purpose : copy a block from user memory to kernel memory | 288 | * Purpose : copy a block from user memory to kernel memory |
| @@ -545,7 +545,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault | |||
| 545 | b .Lcfu_finished | 545 | b .Lcfu_finished |
| 546 | ENDPROC(__copy_from_user) | 546 | ENDPROC(__copy_from_user) |
| 547 | 547 | ||
| 548 | .section .fixup,"ax" | 548 | .pushsection .fixup,"ax" |
| 549 | .align 0 | 549 | .align 0 |
| 550 | /* | 550 | /* |
| 551 | * We took an exception. r0 contains a pointer to | 551 | * We took an exception. r0 contains a pointer to |
| @@ -559,5 +559,5 @@ ENDPROC(__copy_from_user) | |||
| 559 | blne __memzero | 559 | blne __memzero |
| 560 | mov r0, r4 | 560 | mov r0, r4 |
| 561 | ldmfd sp!, {r4 - r7, pc} | 561 | ldmfd sp!, {r4 - r7, pc} |
| 562 | .previous | 562 | .popsection |
| 563 | 563 | ||
diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c index 8f85f73b83a8..1ee6ce4087b8 100644 --- a/arch/arm/mach-mx5/clock-mx51.c +++ b/arch/arm/mach-mx5/clock-mx51.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | 17 | ||
| 18 | #include <asm/clkdev.h> | 18 | #include <asm/clkdev.h> |
| 19 | #include <asm/div64.h> | ||
| 19 | 20 | ||
| 20 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
| 21 | #include <mach/common.h> | 22 | #include <mach/common.h> |
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 9ad118563f7d..20cfbcc6c60c 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c | |||
| @@ -68,12 +68,6 @@ struct sys_timer omap_timer; | |||
| 68 | * --------------------------------------------------------------------------- | 68 | * --------------------------------------------------------------------------- |
| 69 | */ | 69 | */ |
| 70 | 70 | ||
| 71 | #if defined(CONFIG_ARCH_OMAP16XX) | ||
| 72 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 | ||
| 73 | #else | ||
| 74 | #error OMAP 32KHz timer does not currently work on 15XX! | ||
| 75 | #endif | ||
| 76 | |||
| 77 | /* 16xx specific defines */ | 71 | /* 16xx specific defines */ |
| 78 | #define OMAP1_32K_TIMER_BASE 0xfffb9000 | 72 | #define OMAP1_32K_TIMER_BASE 0xfffb9000 |
| 79 | #define OMAP1_32K_TIMER_CR 0x08 | 73 | #define OMAP1_32K_TIMER_CR 0x08 |
| @@ -150,15 +144,6 @@ static struct clock_event_device clockevent_32k_timer = { | |||
| 150 | .set_mode = omap_32k_timer_set_mode, | 144 | .set_mode = omap_32k_timer_set_mode, |
| 151 | }; | 145 | }; |
| 152 | 146 | ||
| 153 | /* | ||
| 154 | * The 32KHz synchronized timer is an additional timer on 16xx. | ||
| 155 | * It is always running. | ||
| 156 | */ | ||
| 157 | static inline unsigned long omap_32k_sync_timer_read(void) | ||
| 158 | { | ||
| 159 | return omap_readl(TIMER_32K_SYNCHRONIZED); | ||
| 160 | } | ||
| 161 | |||
| 162 | static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id) | 147 | static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id) |
| 163 | { | 148 | { |
| 164 | struct clock_event_device *evt = &clockevent_32k_timer; | 149 | struct clock_event_device *evt = &clockevent_32k_timer; |
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index a8a3d1e23e26..2455dcc744a0 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -59,8 +59,10 @@ config MACH_OMAP3_BEAGLE | |||
| 59 | select OMAP_PACKAGE_CBB | 59 | select OMAP_PACKAGE_CBB |
| 60 | 60 | ||
| 61 | config MACH_DEVKIT8000 | 61 | config MACH_DEVKIT8000 |
| 62 | bool "DEVKIT8000 board" | 62 | bool "DEVKIT8000 board" |
| 63 | depends on ARCH_OMAP3 | 63 | depends on ARCH_OMAP3 |
| 64 | select OMAP_PACKAGE_CUS | ||
| 65 | select OMAP_MUX | ||
| 64 | 66 | ||
| 65 | config MACH_OMAP_LDP | 67 | config MACH_OMAP_LDP |
| 66 | bool "OMAP3 LDP board" | 68 | bool "OMAP3 LDP board" |
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index a0a2a113465c..504d2bd222fe 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
| @@ -96,6 +96,7 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 96 | static void __init omap_sdp_init(void) | 96 | static void __init omap_sdp_init(void) |
| 97 | { | 97 | { |
| 98 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); | 98 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); |
| 99 | omap_serial_init(); | ||
| 99 | zoom_peripherals_init(); | 100 | zoom_peripherals_init(); |
| 100 | board_smc91x_init(); | 101 | board_smc91x_init(); |
| 101 | enable_board_wakeup_source(); | 102 | enable_board_wakeup_source(); |
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 6ae880585d54..c1c4389fbd8f 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
| @@ -294,9 +294,9 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 294 | 294 | ||
| 295 | static void __init am3517_evm_init(void) | 295 | static void __init am3517_evm_init(void) |
| 296 | { | 296 | { |
| 297 | am3517_evm_i2c_init(); | ||
| 298 | |||
| 299 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 297 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
| 298 | |||
| 299 | am3517_evm_i2c_init(); | ||
| 300 | platform_add_devices(am3517_evm_devices, | 300 | platform_add_devices(am3517_evm_devices, |
| 301 | ARRAY_SIZE(am3517_evm_devices)); | 301 | ARRAY_SIZE(am3517_evm_devices)); |
| 302 | 302 | ||
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 5bfc13b3176c..47e3af2166d4 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <linux/input/matrix_keypad.h> | 50 | #include <linux/input/matrix_keypad.h> |
| 51 | #include <linux/spi/spi.h> | 51 | #include <linux/spi/spi.h> |
| 52 | #include <linux/spi/ads7846.h> | 52 | #include <linux/spi/ads7846.h> |
| 53 | #include <linux/usb/otg.h> | ||
| 54 | #include <linux/dm9000.h> | 53 | #include <linux/dm9000.h> |
| 55 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
| 56 | 55 | ||
| @@ -269,20 +268,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, | |||
| 269 | devkit8000_vmmc1_supply.dev = mmc[0].dev; | 268 | devkit8000_vmmc1_supply.dev = mmc[0].dev; |
| 270 | devkit8000_vsim_supply.dev = mmc[0].dev; | 269 | devkit8000_vsim_supply.dev = mmc[0].dev; |
| 271 | 270 | ||
| 272 | /* REVISIT: need ehci-omap hooks for external VBUS | ||
| 273 | * power switch and overcurrent detect | ||
| 274 | */ | ||
| 275 | |||
| 276 | gpio_request(gpio + 1, "EHCI_nOC"); | ||
| 277 | gpio_direction_input(gpio + 1); | ||
| 278 | |||
| 279 | /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ | ||
| 280 | gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); | ||
| 281 | gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); | ||
| 282 | |||
| 283 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ | ||
| 284 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; | ||
| 285 | |||
| 286 | return 0; | 271 | return 0; |
| 287 | } | 272 | } |
| 288 | 273 | ||
| @@ -303,7 +288,7 @@ static struct regulator_consumer_supply devkit8000_vpll2_supplies[] = { | |||
| 303 | .dev = &devkit8000_lcd_device.dev, | 288 | .dev = &devkit8000_lcd_device.dev, |
| 304 | }, | 289 | }, |
| 305 | { | 290 | { |
| 306 | .supply = "vdss_dsi", | 291 | .supply = "vdds_dsi", |
| 307 | .dev = &devkit8000_dss_device.dev, | 292 | .dev = &devkit8000_dss_device.dev, |
| 308 | } | 293 | } |
| 309 | }; | 294 | }; |
| @@ -639,17 +624,21 @@ static struct omap_musb_board_data musb_board_data = { | |||
| 639 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 624 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { |
| 640 | 625 | ||
| 641 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, | 626 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, |
| 642 | .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, | 627 | .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN, |
| 643 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 628 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, |
| 644 | 629 | ||
| 645 | .phy_reset = true, | 630 | .phy_reset = true, |
| 646 | .reset_gpio_port[0] = -EINVAL, | 631 | .reset_gpio_port[0] = -EINVAL, |
| 647 | .reset_gpio_port[1] = 147, | 632 | .reset_gpio_port[1] = -EINVAL, |
| 648 | .reset_gpio_port[2] = -EINVAL | 633 | .reset_gpio_port[2] = -EINVAL |
| 649 | }; | 634 | }; |
| 650 | 635 | ||
| 651 | static void __init devkit8000_init(void) | 636 | static void __init devkit8000_init(void) |
| 652 | { | 637 | { |
| 638 | omap_serial_init(); | ||
| 639 | |||
| 640 | omap_dm9000_init(); | ||
| 641 | |||
| 653 | devkit8000_i2c_init(); | 642 | devkit8000_i2c_init(); |
| 654 | platform_add_devices(devkit8000_devices, | 643 | platform_add_devices(devkit8000_devices, |
| 655 | ARRAY_SIZE(devkit8000_devices)); | 644 | ARRAY_SIZE(devkit8000_devices)); |
| @@ -659,25 +648,15 @@ static void __init devkit8000_init(void) | |||
| 659 | spi_register_board_info(devkit8000_spi_board_info, | 648 | spi_register_board_info(devkit8000_spi_board_info, |
| 660 | ARRAY_SIZE(devkit8000_spi_board_info)); | 649 | ARRAY_SIZE(devkit8000_spi_board_info)); |
| 661 | 650 | ||
| 662 | omap_serial_init(); | ||
| 663 | |||
| 664 | omap_dm9000_init(); | ||
| 665 | |||
| 666 | devkit8000_ads7846_init(); | 651 | devkit8000_ads7846_init(); |
| 667 | 652 | ||
| 668 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); | ||
| 669 | |||
| 670 | gpio_request(170, "DVI_nPD"); | ||
| 671 | /* REVISIT leave DVI powered down until it's needed ... */ | ||
| 672 | gpio_direction_output(170, true); | ||
| 673 | |||
| 674 | usb_musb_init(&musb_board_data); | 653 | usb_musb_init(&musb_board_data); |
| 675 | usb_ehci_init(&ehci_pdata); | 654 | usb_ehci_init(&ehci_pdata); |
| 676 | devkit8000_flash_init(); | 655 | devkit8000_flash_init(); |
| 677 | 656 | ||
| 678 | /* Ensure SDRC pins are mux'd for self-refresh */ | 657 | /* Ensure SDRC pins are mux'd for self-refresh */ |
| 679 | omap_mux_init_signal("sdr_cke0", OMAP_PIN_OUTPUT); | 658 | omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); |
| 680 | omap_mux_init_signal("sdr_cke1", OMAP_PIN_OUTPUT); | 659 | omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); |
| 681 | } | 660 | } |
| 682 | 661 | ||
| 683 | static void __init devkit8000_map_io(void) | 662 | static void __init devkit8000_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 3c7789d45051..d55c57b761a9 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
| @@ -458,13 +458,13 @@ static struct omap_musb_board_data musb_board_data = { | |||
| 458 | }; | 458 | }; |
| 459 | 459 | ||
| 460 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 460 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { |
| 461 | .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 461 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, |
| 462 | .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, | 462 | .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN, |
| 463 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 463 | .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, |
| 464 | 464 | ||
| 465 | .phy_reset = true, | 465 | .phy_reset = true, |
| 466 | .reset_gpio_port[0] = -EINVAL, | 466 | .reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET, |
| 467 | .reset_gpio_port[1] = IGEP2_GPIO_USBH_NRESET, | 467 | .reset_gpio_port[1] = -EINVAL, |
| 468 | .reset_gpio_port[2] = -EINVAL, | 468 | .reset_gpio_port[2] = -EINVAL, |
| 469 | }; | 469 | }; |
| 470 | 470 | ||
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index da9bcb898991..3ccc34ebdcc7 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
| @@ -216,7 +216,7 @@ static void __init n8x0_onenand_init(void) {} | |||
| 216 | */ | 216 | */ |
| 217 | #define N8X0_SLOT_SWITCH_GPIO 96 | 217 | #define N8X0_SLOT_SWITCH_GPIO 96 |
| 218 | #define N810_EMMC_VSD_GPIO 23 | 218 | #define N810_EMMC_VSD_GPIO 23 |
| 219 | #define NN810_EMMC_VIO_GPIO 9 | 219 | #define N810_EMMC_VIO_GPIO 9 |
| 220 | 220 | ||
| 221 | static int n8x0_mmc_switch_slot(struct device *dev, int slot) | 221 | static int n8x0_mmc_switch_slot(struct device *dev, int slot) |
| 222 | { | 222 | { |
| @@ -304,10 +304,10 @@ static void n810_set_power_emmc(struct device *dev, | |||
| 304 | if (power_on) { | 304 | if (power_on) { |
| 305 | gpio_set_value(N810_EMMC_VSD_GPIO, 1); | 305 | gpio_set_value(N810_EMMC_VSD_GPIO, 1); |
| 306 | msleep(1); | 306 | msleep(1); |
| 307 | gpio_set_value(NN810_EMMC_VIO_GPIO, 1); | 307 | gpio_set_value(N810_EMMC_VIO_GPIO, 1); |
| 308 | msleep(1); | 308 | msleep(1); |
| 309 | } else { | 309 | } else { |
| 310 | gpio_set_value(NN810_EMMC_VIO_GPIO, 0); | 310 | gpio_set_value(N810_EMMC_VIO_GPIO, 0); |
| 311 | msleep(50); | 311 | msleep(50); |
| 312 | gpio_set_value(N810_EMMC_VSD_GPIO, 0); | 312 | gpio_set_value(N810_EMMC_VSD_GPIO, 0); |
| 313 | msleep(50); | 313 | msleep(50); |
| @@ -468,7 +468,7 @@ static void n8x0_mmc_cleanup(struct device *dev) | |||
| 468 | 468 | ||
| 469 | if (machine_is_nokia_n810()) { | 469 | if (machine_is_nokia_n810()) { |
| 470 | gpio_free(N810_EMMC_VSD_GPIO); | 470 | gpio_free(N810_EMMC_VSD_GPIO); |
| 471 | gpio_free(NN810_EMMC_VIO_GPIO); | 471 | gpio_free(N810_EMMC_VIO_GPIO); |
| 472 | } | 472 | } |
| 473 | } | 473 | } |
| 474 | 474 | ||
| @@ -529,7 +529,7 @@ void __init n8x0_mmc_init(void) | |||
| 529 | 529 | ||
| 530 | err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch"); | 530 | err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch"); |
| 531 | if (err) | 531 | if (err) |
| 532 | return err; | 532 | return; |
| 533 | 533 | ||
| 534 | gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0); | 534 | gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0); |
| 535 | 535 | ||
| @@ -537,17 +537,17 @@ void __init n8x0_mmc_init(void) | |||
| 537 | err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf"); | 537 | err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf"); |
| 538 | if (err) { | 538 | if (err) { |
| 539 | gpio_free(N8X0_SLOT_SWITCH_GPIO); | 539 | gpio_free(N8X0_SLOT_SWITCH_GPIO); |
| 540 | return err; | 540 | return; |
| 541 | } | 541 | } |
| 542 | gpio_direction_output(N810_EMMC_VSD_GPIO, 0); | 542 | gpio_direction_output(N810_EMMC_VSD_GPIO, 0); |
| 543 | 543 | ||
| 544 | err = gpio_request(NN810_EMMC_VIO_GPIO, "MMC slot 2 Vdd"); | 544 | err = gpio_request(N810_EMMC_VIO_GPIO, "MMC slot 2 Vdd"); |
| 545 | if (err) { | 545 | if (err) { |
| 546 | gpio_free(N8X0_SLOT_SWITCH_GPIO); | 546 | gpio_free(N8X0_SLOT_SWITCH_GPIO); |
| 547 | gpio_free(N810_EMMC_VSD_GPIO); | 547 | gpio_free(N810_EMMC_VSD_GPIO); |
| 548 | return err; | 548 | return; |
| 549 | } | 549 | } |
| 550 | gpio_direction_output(NN810_EMMC_VIO_GPIO, 0); | 550 | gpio_direction_output(N810_EMMC_VIO_GPIO, 0); |
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | mmc_data[0] = &mmc1_data; | 553 | mmc_data[0] = &mmc1_data; |
diff --git a/arch/arm/mach-omap2/board-sdp-flash.c b/arch/arm/mach-omap2/board-sdp-flash.c index b1b88deec7f2..2d026328e385 100644 --- a/arch/arm/mach-omap2/board-sdp-flash.c +++ b/arch/arm/mach-omap2/board-sdp-flash.c | |||
| @@ -253,20 +253,20 @@ void __init sdp_flash_init(struct flash_partitions sdp_partition_info[]) | |||
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | if (norcs > GPMC_CS_NUM) | 255 | if (norcs > GPMC_CS_NUM) |
| 256 | printk(KERN_INFO "OneNAND: Unable to find configuration " | 256 | printk(KERN_INFO "NOR: Unable to find configuration " |
| 257 | " in GPMC\n "); | 257 | "in GPMC\n"); |
| 258 | else | 258 | else |
| 259 | board_nor_init(sdp_partition_info[0], norcs); | 259 | board_nor_init(sdp_partition_info[0], norcs); |
| 260 | 260 | ||
| 261 | if (onenandcs > GPMC_CS_NUM) | 261 | if (onenandcs > GPMC_CS_NUM) |
| 262 | printk(KERN_INFO "OneNAND: Unable to find configuration " | 262 | printk(KERN_INFO "OneNAND: Unable to find configuration " |
| 263 | " in GPMC\n "); | 263 | "in GPMC\n"); |
| 264 | else | 264 | else |
| 265 | board_onenand_init(sdp_partition_info[1], onenandcs); | 265 | board_onenand_init(sdp_partition_info[1], onenandcs); |
| 266 | 266 | ||
| 267 | if (nandcs > GPMC_CS_NUM) | 267 | if (nandcs > GPMC_CS_NUM) |
| 268 | printk(KERN_INFO "NAND: Unable to find configuration " | 268 | printk(KERN_INFO "NAND: Unable to find configuration " |
| 269 | " in GPMC\n "); | 269 | "in GPMC\n"); |
| 270 | else | 270 | else |
| 271 | board_nand_init(sdp_partition_info[2], nandcs); | 271 | board_nand_init(sdp_partition_info[2], nandcs); |
| 272 | } | 272 | } |
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bb4018b60642..e15d2e87cfc1 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
| @@ -96,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
| 96 | 96 | ||
| 97 | static struct platform_device zoom_debugboard_serial_device = { | 97 | static struct platform_device zoom_debugboard_serial_device = { |
| 98 | .name = "serial8250", | 98 | .name = "serial8250", |
| 99 | .id = 3, | 99 | .id = PLAT8250_DEV_PLATFORM, |
| 100 | .dev = { | 100 | .dev = { |
| 101 | .platform_data = serial_platform_data, | 101 | .platform_data = serial_platform_data, |
| 102 | }, | 102 | }, |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index ca95d8d64136..6b3984964cc5 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
| @@ -280,7 +280,6 @@ static void enable_board_wakeup_source(void) | |||
| 280 | void __init zoom_peripherals_init(void) | 280 | void __init zoom_peripherals_init(void) |
| 281 | { | 281 | { |
| 282 | omap_i2c_init(); | 282 | omap_i2c_init(); |
| 283 | omap_serial_init(); | ||
| 284 | usb_musb_init(&musb_board_data); | 283 | usb_musb_init(&musb_board_data); |
| 285 | enable_board_wakeup_source(); | 284 | enable_board_wakeup_source(); |
| 286 | } | 285 | } |
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index d5153b6bd6cb..9cba5560519b 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
| @@ -895,7 +895,7 @@ static struct clk dpll4_m4x2_ck = { | |||
| 895 | .ops = &clkops_omap2_dflt_wait, | 895 | .ops = &clkops_omap2_dflt_wait, |
| 896 | .parent = &dpll4_m4_ck, | 896 | .parent = &dpll4_m4_ck, |
| 897 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), | 897 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), |
| 898 | .enable_bit = OMAP3430_PWRDN_CAM_SHIFT, | 898 | .enable_bit = OMAP3430_PWRDN_DSS1_SHIFT, |
| 899 | .flags = INVERT_ENABLE, | 899 | .flags = INVERT_ENABLE, |
| 900 | .clkdm_name = "dpll4_clkdm", | 900 | .clkdm_name = "dpll4_clkdm", |
| 901 | .recalc = &omap3_clkoutx2_recalc, | 901 | .recalc = &omap3_clkoutx2_recalc, |
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 28b107967c86..a5c0c9c8e496 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
| @@ -2671,10 +2671,10 @@ static struct omap_clk omap44xx_clks[] = { | |||
| 2671 | CLK("omap-mcbsp.2", "ick", &dummy_ck, CK_443X), | 2671 | CLK("omap-mcbsp.2", "ick", &dummy_ck, CK_443X), |
| 2672 | CLK("omap-mcbsp.3", "ick", &dummy_ck, CK_443X), | 2672 | CLK("omap-mcbsp.3", "ick", &dummy_ck, CK_443X), |
| 2673 | CLK("omap-mcbsp.4", "ick", &dummy_ck, CK_443X), | 2673 | CLK("omap-mcbsp.4", "ick", &dummy_ck, CK_443X), |
| 2674 | CLK("omap-mcspi.1", "ick", &dummy_ck, CK_443X), | 2674 | CLK("omap2_mcspi.1", "ick", &dummy_ck, CK_443X), |
| 2675 | CLK("omap-mcspi.2", "ick", &dummy_ck, CK_443X), | 2675 | CLK("omap2_mcspi.2", "ick", &dummy_ck, CK_443X), |
| 2676 | CLK("omap-mcspi.3", "ick", &dummy_ck, CK_443X), | 2676 | CLK("omap2_mcspi.3", "ick", &dummy_ck, CK_443X), |
| 2677 | CLK("omap-mcspi.4", "ick", &dummy_ck, CK_443X), | 2677 | CLK("omap2_mcspi.4", "ick", &dummy_ck, CK_443X), |
| 2678 | CLK(NULL, "uart1_ick", &dummy_ck, CK_443X), | 2678 | CLK(NULL, "uart1_ick", &dummy_ck, CK_443X), |
| 2679 | CLK(NULL, "uart2_ick", &dummy_ck, CK_443X), | 2679 | CLK(NULL, "uart2_ick", &dummy_ck, CK_443X), |
| 2680 | CLK(NULL, "uart3_ick", &dummy_ck, CK_443X), | 2680 | CLK(NULL, "uart3_ick", &dummy_ck, CK_443X), |
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c index b87ad66f083e..6e568ec995ee 100644 --- a/arch/arm/mach-omap2/clockdomain.c +++ b/arch/arm/mach-omap2/clockdomain.c | |||
| @@ -240,7 +240,7 @@ static void _omap2_clkdm_set_hwsup(struct clockdomain *clkdm, int enable) | |||
| 240 | bits = OMAP24XX_CLKSTCTRL_ENABLE_AUTO; | 240 | bits = OMAP24XX_CLKSTCTRL_ENABLE_AUTO; |
| 241 | else | 241 | else |
| 242 | bits = OMAP24XX_CLKSTCTRL_DISABLE_AUTO; | 242 | bits = OMAP24XX_CLKSTCTRL_DISABLE_AUTO; |
| 243 | } else if (cpu_is_omap34xx() | cpu_is_omap44xx()) { | 243 | } else if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
| 244 | if (enable) | 244 | if (enable) |
| 245 | bits = OMAP34XX_CLKSTCTRL_ENABLE_AUTO; | 245 | bits = OMAP34XX_CLKSTCTRL_ENABLE_AUTO; |
| 246 | else | 246 | else |
| @@ -812,7 +812,7 @@ int omap2_clkdm_sleep(struct clockdomain *clkdm) | |||
| 812 | cm_set_mod_reg_bits(OMAP24XX_FORCESTATE, | 812 | cm_set_mod_reg_bits(OMAP24XX_FORCESTATE, |
| 813 | clkdm->pwrdm.ptr->prcm_offs, OMAP2_PM_PWSTCTRL); | 813 | clkdm->pwrdm.ptr->prcm_offs, OMAP2_PM_PWSTCTRL); |
| 814 | 814 | ||
| 815 | } else if (cpu_is_omap34xx() | cpu_is_omap44xx()) { | 815 | } else if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
| 816 | 816 | ||
| 817 | u32 bits = (OMAP34XX_CLKSTCTRL_FORCE_SLEEP << | 817 | u32 bits = (OMAP34XX_CLKSTCTRL_FORCE_SLEEP << |
| 818 | __ffs(clkdm->clktrctrl_mask)); | 818 | __ffs(clkdm->clktrctrl_mask)); |
| @@ -856,7 +856,7 @@ int omap2_clkdm_wakeup(struct clockdomain *clkdm) | |||
| 856 | cm_clear_mod_reg_bits(OMAP24XX_FORCESTATE, | 856 | cm_clear_mod_reg_bits(OMAP24XX_FORCESTATE, |
| 857 | clkdm->pwrdm.ptr->prcm_offs, OMAP2_PM_PWSTCTRL); | 857 | clkdm->pwrdm.ptr->prcm_offs, OMAP2_PM_PWSTCTRL); |
| 858 | 858 | ||
| 859 | } else if (cpu_is_omap34xx() | cpu_is_omap44xx()) { | 859 | } else if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
| 860 | 860 | ||
| 861 | u32 bits = (OMAP34XX_CLKSTCTRL_FORCE_WAKEUP << | 861 | u32 bits = (OMAP34XX_CLKSTCTRL_FORCE_WAKEUP << |
| 862 | __ffs(clkdm->clktrctrl_mask)); | 862 | __ffs(clkdm->clktrctrl_mask)); |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 23e4d7733610..2271b9bd1f50 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -726,7 +726,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
| 726 | if (!cpu_is_omap44xx()) | 726 | if (!cpu_is_omap44xx()) |
| 727 | return; | 727 | return; |
| 728 | base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET; | 728 | base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET; |
| 729 | irq = OMAP44XX_IRQ_MMC4; | 729 | irq = OMAP44XX_IRQ_MMC5; |
| 730 | break; | 730 | break; |
| 731 | default: | 731 | default: |
| 732 | continue; | 732 | continue; |
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c index 64d74f05abbe..e57fb29ff855 100644 --- a/arch/arm/mach-omap2/gpmc-nand.c +++ b/arch/arm/mach-omap2/gpmc-nand.c | |||
| @@ -39,6 +39,9 @@ static int omap2_nand_gpmc_retime(void) | |||
| 39 | struct gpmc_timings t; | 39 | struct gpmc_timings t; |
| 40 | int err; | 40 | int err; |
| 41 | 41 | ||
| 42 | if (!gpmc_nand_data->gpmc_t) | ||
| 43 | return 0; | ||
| 44 | |||
| 42 | memset(&t, 0, sizeof(t)); | 45 | memset(&t, 0, sizeof(t)); |
| 43 | t.sync_clk = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->sync_clk); | 46 | t.sync_clk = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->sync_clk); |
| 44 | t.cs_on = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->cs_on); | 47 | t.cs_on = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->cs_on); |
diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S index ff25c7e4e606..50fd74916643 100644 --- a/arch/arm/mach-omap2/include/mach/entry-macro.S +++ b/arch/arm/mach-omap2/include/mach/entry-macro.S | |||
| @@ -52,7 +52,7 @@ omap_irq_base: .word 0 | |||
| 52 | 52 | ||
| 53 | mrc p15, 0, \tmp, c0, c0, 0 @ get processor revision | 53 | mrc p15, 0, \tmp, c0, c0, 0 @ get processor revision |
| 54 | and \tmp, \tmp, #0x000f0000 @ only check architecture | 54 | and \tmp, \tmp, #0x000f0000 @ only check architecture |
| 55 | cmp \tmp, #0x00060000 @ is v6? | 55 | cmp \tmp, #0x00070000 @ is v6? |
| 56 | beq 2400f @ found v6 so it's omap24xx | 56 | beq 2400f @ found v6 so it's omap24xx |
| 57 | mrc p15, 0, \tmp, c0, c0, 0 @ get processor revision | 57 | mrc p15, 0, \tmp, c0, c0, 0 @ get processor revision |
| 58 | and \tmp, \tmp, #0x000000f0 @ check cortex 8 or 9 | 58 | and \tmp, \tmp, #0x000000f0 @ check cortex 8 or 9 |
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S index aa3f65c2ac97..ef0e7a00dd6c 100644 --- a/arch/arm/mach-omap2/omap-headsmp.S +++ b/arch/arm/mach-omap2/omap-headsmp.S | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | ENTRY(omap_secondary_startup) | 33 | ENTRY(omap_secondary_startup) |
| 34 | hold: ldr r12,=0x103 | 34 | hold: ldr r12,=0x103 |
| 35 | dsb | 35 | dsb |
| 36 | smc @ read from AuxCoreBoot0 | 36 | smc #0 @ read from AuxCoreBoot0 |
| 37 | mov r0, r0, lsr #9 | 37 | mov r0, r0, lsr #9 |
| 38 | mrc p15, 0, r4, c0, c0, 5 | 38 | mrc p15, 0, r4, c0, c0, 5 |
| 39 | and r4, r4, #0x0f | 39 | and r4, r4, #0x0f |
| @@ -52,7 +52,7 @@ ENTRY(omap_modify_auxcoreboot0) | |||
| 52 | stmfd sp!, {r1-r12, lr} | 52 | stmfd sp!, {r1-r12, lr} |
| 53 | ldr r12, =0x104 | 53 | ldr r12, =0x104 |
| 54 | dsb | 54 | dsb |
| 55 | smc | 55 | smc #0 |
| 56 | ldmfd sp!, {r1-r12, pc} | 56 | ldmfd sp!, {r1-r12, pc} |
| 57 | END(omap_modify_auxcoreboot0) | 57 | END(omap_modify_auxcoreboot0) |
| 58 | 58 | ||
| @@ -60,6 +60,6 @@ ENTRY(omap_auxcoreboot_addr) | |||
| 60 | stmfd sp!, {r2-r12, lr} | 60 | stmfd sp!, {r2-r12, lr} |
| 61 | ldr r12, =0x105 | 61 | ldr r12, =0x105 |
| 62 | dsb | 62 | dsb |
| 63 | smc | 63 | smc #0 |
| 64 | ldmfd sp!, {r2-r12, pc} | 64 | ldmfd sp!, {r2-r12, pc} |
| 65 | END(omap_auxcoreboot_addr) | 65 | END(omap_auxcoreboot_addr) |
diff --git a/arch/arm/mach-omap2/omap44xx-smc.S b/arch/arm/mach-omap2/omap44xx-smc.S index 89bb2b141473..f61c7771ca47 100644 --- a/arch/arm/mach-omap2/omap44xx-smc.S +++ b/arch/arm/mach-omap2/omap44xx-smc.S | |||
| @@ -27,6 +27,6 @@ ENTRY(omap_smc1) | |||
| 27 | mov r12, r0 | 27 | mov r12, r0 |
| 28 | mov r0, r1 | 28 | mov r0, r1 |
| 29 | dsb | 29 | dsb |
| 30 | smc | 30 | smc #0 |
| 31 | ldmfd sp!, {r2-r12, pc} | 31 | ldmfd sp!, {r2-r12, pc} |
| 32 | END(omap_smc1) | 32 | END(omap_smc1) |
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index c6649472ce0d..e436dcb19795 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
| @@ -1511,6 +1511,9 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) | |||
| 1511 | c = oh->slaves[oh->_mpu_port_index]->_clk; | 1511 | c = oh->slaves[oh->_mpu_port_index]->_clk; |
| 1512 | } | 1512 | } |
| 1513 | 1513 | ||
| 1514 | if (!c->clkdm) | ||
| 1515 | return NULL; | ||
| 1516 | |||
| 1514 | return c->clkdm->pwrdm.ptr; | 1517 | return c->clkdm->pwrdm.ptr; |
| 1515 | 1518 | ||
| 1516 | } | 1519 | } |
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 9a0fb385622b..ebfce7d1a5d3 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c | |||
| @@ -222,7 +222,7 @@ void pwrdm_init(struct powerdomain **pwrdm_list) | |||
| 222 | { | 222 | { |
| 223 | struct powerdomain **p = NULL; | 223 | struct powerdomain **p = NULL; |
| 224 | 224 | ||
| 225 | if (cpu_is_omap24xx() | cpu_is_omap34xx()) { | 225 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) { |
| 226 | pwrstctrl_reg_offs = OMAP2_PM_PWSTCTRL; | 226 | pwrstctrl_reg_offs = OMAP2_PM_PWSTCTRL; |
| 227 | pwrstst_reg_offs = OMAP2_PM_PWSTST; | 227 | pwrstst_reg_offs = OMAP2_PM_PWSTST; |
| 228 | } else if (cpu_is_omap44xx()) { | 228 | } else if (cpu_is_omap44xx()) { |
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 9537f6f2352d..07a60f1204ca 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
| @@ -123,7 +123,7 @@ struct omap3_prcm_regs prcm_context; | |||
| 123 | u32 omap_prcm_get_reset_sources(void) | 123 | u32 omap_prcm_get_reset_sources(void) |
| 124 | { | 124 | { |
| 125 | /* XXX This presumably needs modification for 34XX */ | 125 | /* XXX This presumably needs modification for 34XX */ |
| 126 | if (cpu_is_omap24xx() | cpu_is_omap34xx()) | 126 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) |
| 127 | return prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f; | 127 | return prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f; |
| 128 | if (cpu_is_omap44xx()) | 128 | if (cpu_is_omap44xx()) |
| 129 | return prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f; | 129 | return prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f; |
| @@ -157,7 +157,7 @@ void omap_prcm_arch_reset(char mode, const char *cmd) | |||
| 157 | else | 157 | else |
| 158 | WARN_ON(1); | 158 | WARN_ON(1); |
| 159 | 159 | ||
| 160 | if (cpu_is_omap24xx() | cpu_is_omap34xx()) | 160 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) |
| 161 | prm_set_mod_reg_bits(OMAP_RST_DPLL3, prcm_offs, | 161 | prm_set_mod_reg_bits(OMAP_RST_DPLL3, prcm_offs, |
| 162 | OMAP2_RM_RSTCTRL); | 162 | OMAP2_RM_RSTCTRL); |
| 163 | if (cpu_is_omap44xx()) | 163 | if (cpu_is_omap44xx()) |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index da77930480e9..3771254dfa81 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -115,7 +115,6 @@ static struct plat_serial8250_port serial_platform_data2[] = { | |||
| 115 | } | 115 | } |
| 116 | }; | 116 | }; |
| 117 | 117 | ||
| 118 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) | ||
| 119 | static struct plat_serial8250_port serial_platform_data3[] = { | 118 | static struct plat_serial8250_port serial_platform_data3[] = { |
| 120 | { | 119 | { |
| 121 | .irq = 70, | 120 | .irq = 70, |
| @@ -128,23 +127,12 @@ static struct plat_serial8250_port serial_platform_data3[] = { | |||
| 128 | } | 127 | } |
| 129 | }; | 128 | }; |
| 130 | 129 | ||
| 131 | static inline void omap2_set_globals_uart4(struct omap_globals *omap2_globals) | ||
| 132 | { | ||
| 133 | serial_platform_data3[0].mapbase = omap2_globals->uart4_phys; | ||
| 134 | } | ||
| 135 | #else | ||
| 136 | static inline void omap2_set_globals_uart4(struct omap_globals *omap2_globals) | ||
| 137 | { | ||
| 138 | } | ||
| 139 | #endif | ||
| 140 | |||
| 141 | void __init omap2_set_globals_uart(struct omap_globals *omap2_globals) | 130 | void __init omap2_set_globals_uart(struct omap_globals *omap2_globals) |
| 142 | { | 131 | { |
| 143 | serial_platform_data0[0].mapbase = omap2_globals->uart1_phys; | 132 | serial_platform_data0[0].mapbase = omap2_globals->uart1_phys; |
| 144 | serial_platform_data1[0].mapbase = omap2_globals->uart2_phys; | 133 | serial_platform_data1[0].mapbase = omap2_globals->uart2_phys; |
| 145 | serial_platform_data2[0].mapbase = omap2_globals->uart3_phys; | 134 | serial_platform_data2[0].mapbase = omap2_globals->uart3_phys; |
| 146 | if (cpu_is_omap3630() || cpu_is_omap44xx()) | 135 | serial_platform_data3[0].mapbase = omap2_globals->uart4_phys; |
| 147 | omap2_set_globals_uart4(omap2_globals); | ||
| 148 | } | 136 | } |
| 149 | 137 | ||
| 150 | static inline unsigned int __serial_read_reg(struct uart_port *up, | 138 | static inline unsigned int __serial_read_reg(struct uart_port *up, |
| @@ -550,7 +538,7 @@ static ssize_t sleep_timeout_store(struct device *dev, | |||
| 550 | unsigned int value; | 538 | unsigned int value; |
| 551 | 539 | ||
| 552 | if (sscanf(buf, "%u", &value) != 1) { | 540 | if (sscanf(buf, "%u", &value) != 1) { |
| 553 | printk(KERN_ERR "sleep_timeout_store: Invalid value\n"); | 541 | dev_err(dev, "sleep_timeout_store: Invalid value\n"); |
| 554 | return -EINVAL; | 542 | return -EINVAL; |
| 555 | } | 543 | } |
| 556 | 544 | ||
| @@ -664,27 +652,33 @@ void __init omap_serial_early_init(void) | |||
| 664 | struct device *dev = &pdev->dev; | 652 | struct device *dev = &pdev->dev; |
| 665 | struct plat_serial8250_port *p = dev->platform_data; | 653 | struct plat_serial8250_port *p = dev->platform_data; |
| 666 | 654 | ||
| 655 | /* Don't map zero-based physical address */ | ||
| 656 | if (p->mapbase == 0) { | ||
| 657 | dev_warn(dev, "no physical address for uart#%d," | ||
| 658 | " so skipping early_init...\n", i); | ||
| 659 | continue; | ||
| 660 | } | ||
| 667 | /* | 661 | /* |
| 668 | * Module 4KB + L4 interconnect 4KB | 662 | * Module 4KB + L4 interconnect 4KB |
| 669 | * Static mapping, never released | 663 | * Static mapping, never released |
| 670 | */ | 664 | */ |
| 671 | p->membase = ioremap(p->mapbase, SZ_8K); | 665 | p->membase = ioremap(p->mapbase, SZ_8K); |
| 672 | if (!p->membase) { | 666 | if (!p->membase) { |
| 673 | printk(KERN_ERR "ioremap failed for uart%i\n", i + 1); | 667 | dev_err(dev, "ioremap failed for uart%i\n", i + 1); |
| 674 | continue; | 668 | continue; |
| 675 | } | 669 | } |
| 676 | 670 | ||
| 677 | sprintf(name, "uart%d_ick", i + 1); | 671 | sprintf(name, "uart%d_ick", i + 1); |
| 678 | uart->ick = clk_get(NULL, name); | 672 | uart->ick = clk_get(NULL, name); |
| 679 | if (IS_ERR(uart->ick)) { | 673 | if (IS_ERR(uart->ick)) { |
| 680 | printk(KERN_ERR "Could not get uart%d_ick\n", i + 1); | 674 | dev_err(dev, "Could not get uart%d_ick\n", i + 1); |
| 681 | uart->ick = NULL; | 675 | uart->ick = NULL; |
| 682 | } | 676 | } |
| 683 | 677 | ||
| 684 | sprintf(name, "uart%d_fck", i+1); | 678 | sprintf(name, "uart%d_fck", i+1); |
| 685 | uart->fck = clk_get(NULL, name); | 679 | uart->fck = clk_get(NULL, name); |
| 686 | if (IS_ERR(uart->fck)) { | 680 | if (IS_ERR(uart->fck)) { |
| 687 | printk(KERN_ERR "Could not get uart%d_fck\n", i + 1); | 681 | dev_err(dev, "Could not get uart%d_fck\n", i + 1); |
| 688 | uart->fck = NULL; | 682 | uart->fck = NULL; |
| 689 | } | 683 | } |
| 690 | 684 | ||
| @@ -727,6 +721,13 @@ void __init omap_serial_init_port(int port) | |||
| 727 | pdev = &uart->pdev; | 721 | pdev = &uart->pdev; |
| 728 | dev = &pdev->dev; | 722 | dev = &pdev->dev; |
| 729 | 723 | ||
| 724 | /* Don't proceed if there's no clocks available */ | ||
| 725 | if (unlikely(!uart->ick || !uart->fck)) { | ||
| 726 | WARN(1, "%s: can't init uart%d, no clocks available\n", | ||
| 727 | kobject_name(&dev->kobj), port); | ||
| 728 | return; | ||
| 729 | } | ||
| 730 | |||
| 730 | omap_uart_enable_clocks(uart); | 731 | omap_uart_enable_clocks(uart); |
| 731 | 732 | ||
| 732 | omap_uart_reset(uart); | 733 | omap_uart_reset(uart); |
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 811743c56147..5f2ba8d9015c 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _COLIBRI_H_ | 2 | #define _COLIBRI_H_ |
| 3 | 3 | ||
| 4 | #include <net/ax88796.h> | 4 | #include <net/ax88796.h> |
| 5 | #include <mach/mfp.h> | ||
| 5 | 6 | ||
| 6 | /* | 7 | /* |
| 7 | * common settings for all modules | 8 | * common settings for all modules |
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 7515757d6911..3d8d8cb09685 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h | |||
| @@ -202,7 +202,7 @@ | |||
| 202 | #define __cpu_is_pxa950(id) \ | 202 | #define __cpu_is_pxa950(id) \ |
| 203 | ({ \ | 203 | ({ \ |
| 204 | unsigned int _id = (id) >> 4 & 0xfff; \ | 204 | unsigned int _id = (id) >> 4 & 0xfff; \ |
| 205 | id == 0x697; \ | 205 | _id == 0x697; \ |
| 206 | }) | 206 | }) |
| 207 | #else | 207 | #else |
| 208 | #define __cpu_is_pxa950(id) (0) | 208 | #define __cpu_is_pxa950(id) (0) |
diff --git a/arch/arm/mach-pxa/include/mach/regs-u2d.h b/arch/arm/mach-pxa/include/mach/regs-u2d.h index 44b0b20b69a4..c15c0c57de08 100644 --- a/arch/arm/mach-pxa/include/mach/regs-u2d.h +++ b/arch/arm/mach-pxa/include/mach/regs-u2d.h | |||
| @@ -166,7 +166,8 @@ | |||
| 166 | #define U2DMACSR_BUSERRTYPE (7 << 10) /* PX Bus Error Type */ | 166 | #define U2DMACSR_BUSERRTYPE (7 << 10) /* PX Bus Error Type */ |
| 167 | #define U2DMACSR_EORINTR (1 << 9) /* End Of Receive */ | 167 | #define U2DMACSR_EORINTR (1 << 9) /* End Of Receive */ |
| 168 | #define U2DMACSR_REQPEND (1 << 8) /* Request Pending */ | 168 | #define U2DMACSR_REQPEND (1 << 8) /* Request Pending */ |
| 169 | #define U2DMACSR_RASINTR (1 << 4) /* Request After Channel Stopped (read / write 1 clear) */#define U2DMACSR_STOPINTR (1 << 3) /* Stop Interrupt (read only) */ | 169 | #define U2DMACSR_RASINTR (1 << 4) /* Request After Channel Stopped (read / write 1 clear) */ |
| 170 | #define U2DMACSR_STOPINTR (1 << 3) /* Stop Interrupt (read only) */ | ||
| 170 | #define U2DMACSR_ENDINTR (1 << 2) /* End Interrupt (read / write 1 clear) */ | 171 | #define U2DMACSR_ENDINTR (1 << 2) /* End Interrupt (read / write 1 clear) */ |
| 171 | #define U2DMACSR_STARTINTR (1 << 1) /* Start Interrupt (read / write 1 clear) */ | 172 | #define U2DMACSR_STARTINTR (1 << 1) /* Start Interrupt (read / write 1 clear) */ |
| 172 | #define U2DMACSR_BUSERRINTR (1 << 0) /* Bus Error Interrupt (read / write 1 clear) */ | 173 | #define U2DMACSR_BUSERRINTR (1 << 0) /* Bus Error Interrupt (read / write 1 clear) */ |
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index 44bb675e47f1..d12667bd9ebe 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c | |||
| @@ -983,7 +983,7 @@ static void __init raumfeld_common_init(void) | |||
| 983 | int i; | 983 | int i; |
| 984 | 984 | ||
| 985 | for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++) | 985 | for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++) |
| 986 | if (!strcmp(gpio_keys_button[i].desc, "on/off button")) | 986 | if (!strcmp(gpio_keys_button[i].desc, "on_off button")) |
| 987 | gpio_keys_button[i].active_low = 1; | 987 | gpio_keys_button[i].active_low = 1; |
| 988 | } | 988 | } |
| 989 | 989 | ||
| @@ -1009,8 +1009,7 @@ static void __init raumfeld_common_init(void) | |||
| 1009 | gpio_direction_output(GPIO_W2W_PDN, 0); | 1009 | gpio_direction_output(GPIO_W2W_PDN, 0); |
| 1010 | 1010 | ||
| 1011 | /* this can be used to switch off the device */ | 1011 | /* this can be used to switch off the device */ |
| 1012 | ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, | 1012 | ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown"); |
| 1013 | "supply shutdown"); | ||
| 1014 | if (ret < 0) | 1013 | if (ret < 0) |
| 1015 | pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n"); | 1014 | pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n"); |
| 1016 | else | 1015 | else |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 19b5109d9808..01bdd7500df4 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -363,7 +363,7 @@ static struct gpio_keys_button spitz_gpio_keys[] = { | |||
| 363 | .type = EV_PWR, | 363 | .type = EV_PWR, |
| 364 | .code = KEY_SUSPEND, | 364 | .code = KEY_SUSPEND, |
| 365 | .gpio = SPITZ_GPIO_ON_KEY, | 365 | .gpio = SPITZ_GPIO_ON_KEY, |
| 366 | .desc = "On/Off", | 366 | .desc = "On Off", |
| 367 | .wakeup = 1, | 367 | .wakeup = 1, |
| 368 | }, | 368 | }, |
| 369 | /* Two buttons detecting the lid state */ | 369 | /* Two buttons detecting the lid state */ |
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 9e0c5c3988a1..e90114a7e246 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/pm.h> | 34 | #include <linux/pm.h> |
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/gpio.h> | 36 | #include <linux/gpio.h> |
| 37 | #include <linux/jiffies.h> | ||
| 37 | #include <linux/i2c-gpio.h> | 38 | #include <linux/i2c-gpio.h> |
| 38 | #include <linux/serial_8250.h> | 39 | #include <linux/serial_8250.h> |
| 39 | #include <linux/smc91x.h> | 40 | #include <linux/smc91x.h> |
| @@ -454,7 +455,7 @@ static struct i2c_gpio_platform_data i2c_bus_data = { | |||
| 454 | .sda_pin = VIPER_RTC_I2C_SDA_GPIO, | 455 | .sda_pin = VIPER_RTC_I2C_SDA_GPIO, |
| 455 | .scl_pin = VIPER_RTC_I2C_SCL_GPIO, | 456 | .scl_pin = VIPER_RTC_I2C_SCL_GPIO, |
| 456 | .udelay = 10, | 457 | .udelay = 10, |
| 457 | .timeout = 100, | 458 | .timeout = HZ, |
| 458 | }; | 459 | }; |
| 459 | 460 | ||
| 460 | static struct platform_device i2c_bus_device = { | 461 | static struct platform_device i2c_bus_device = { |
| @@ -779,7 +780,7 @@ static void __init viper_tpm_init(void) | |||
| 779 | .sda_pin = VIPER_TPM_I2C_SDA_GPIO, | 780 | .sda_pin = VIPER_TPM_I2C_SDA_GPIO, |
| 780 | .scl_pin = VIPER_TPM_I2C_SCL_GPIO, | 781 | .scl_pin = VIPER_TPM_I2C_SCL_GPIO, |
| 781 | .udelay = 10, | 782 | .udelay = 10, |
| 782 | .timeout = 100, | 783 | .timeout = HZ, |
| 783 | }; | 784 | }; |
| 784 | char *errstr; | 785 | char *errstr; |
| 785 | 786 | ||
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index f2dbce5f3cd4..d5a95738f85b 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
| @@ -254,7 +254,7 @@ static unsigned int realview_mmc_status(struct device *dev) | |||
| 254 | else | 254 | else |
| 255 | mask = 2; | 255 | mask = 2; |
| 256 | 256 | ||
| 257 | return readl(REALVIEW_SYSMCI) & mask; | 257 | return !(readl(REALVIEW_SYSMCI) & mask); |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | struct mmci_platform_data realview_mmc0_plat_data = { | 260 | struct mmci_platform_data realview_mmc0_plat_data = { |
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index b17d52f7cc48..fd4c52b7ccb6 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig | |||
| @@ -57,7 +57,7 @@ config SA1100_COLLIE | |||
| 57 | config SA1100_H3100 | 57 | config SA1100_H3100 |
| 58 | bool "Compaq iPAQ H3100" | 58 | bool "Compaq iPAQ H3100" |
| 59 | select HTC_EGPIO | 59 | select HTC_EGPIO |
| 60 | select CPU_FREQ_SA1100 | 60 | select CPU_FREQ_SA1110 |
| 61 | help | 61 | help |
| 62 | Say Y here if you intend to run this kernel on the Compaq iPAQ | 62 | Say Y here if you intend to run this kernel on the Compaq iPAQ |
| 63 | H3100 handheld computer. Information about this machine and the | 63 | H3100 handheld computer. Information about this machine and the |
| @@ -68,7 +68,7 @@ config SA1100_H3100 | |||
| 68 | config SA1100_H3600 | 68 | config SA1100_H3600 |
| 69 | bool "Compaq iPAQ H3600/H3700" | 69 | bool "Compaq iPAQ H3600/H3700" |
| 70 | select HTC_EGPIO | 70 | select HTC_EGPIO |
| 71 | select CPU_FREQ_SA1100 | 71 | select CPU_FREQ_SA1110 |
| 72 | help | 72 | help |
| 73 | Say Y here if you intend to run this kernel on the Compaq iPAQ | 73 | Say Y here if you intend to run this kernel on the Compaq iPAQ |
| 74 | H3600 handheld computer. Information about this machine and the | 74 | H3600 handheld computer. Information about this machine and the |
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c index 63b32b68b296..7252874d328b 100644 --- a/arch/arm/mach-sa1100/cpu-sa1110.c +++ b/arch/arm/mach-sa1100/cpu-sa1110.c | |||
| @@ -363,6 +363,9 @@ static int __init sa1110_clk_init(void) | |||
| 363 | struct sdram_params *sdram; | 363 | struct sdram_params *sdram; |
| 364 | const char *name = sdram_name; | 364 | const char *name = sdram_name; |
| 365 | 365 | ||
| 366 | if (!cpu_is_sa1110()) | ||
| 367 | return -ENODEV; | ||
| 368 | |||
| 366 | if (!name[0]) { | 369 | if (!name[0]) { |
| 367 | if (machine_is_assabet()) | 370 | if (machine_is_assabet()) |
| 368 | name = "TC59SM716-CL3"; | 371 | name = "TC59SM716-CL3"; |
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index edddd66faac6..a2ab51fa73e2 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
| @@ -166,15 +166,15 @@ union offset_union { | |||
| 166 | THUMB( "1: "ins" %1, [%2]\n" ) \ | 166 | THUMB( "1: "ins" %1, [%2]\n" ) \ |
| 167 | THUMB( " add %2, %2, #1\n" ) \ | 167 | THUMB( " add %2, %2, #1\n" ) \ |
| 168 | "2:\n" \ | 168 | "2:\n" \ |
| 169 | " .section .fixup,\"ax\"\n" \ | 169 | " .pushsection .fixup,\"ax\"\n" \ |
| 170 | " .align 2\n" \ | 170 | " .align 2\n" \ |
| 171 | "3: mov %0, #1\n" \ | 171 | "3: mov %0, #1\n" \ |
| 172 | " b 2b\n" \ | 172 | " b 2b\n" \ |
| 173 | " .previous\n" \ | 173 | " .popsection\n" \ |
| 174 | " .section __ex_table,\"a\"\n" \ | 174 | " .pushsection __ex_table,\"a\"\n" \ |
| 175 | " .align 3\n" \ | 175 | " .align 3\n" \ |
| 176 | " .long 1b, 3b\n" \ | 176 | " .long 1b, 3b\n" \ |
| 177 | " .previous\n" \ | 177 | " .popsection\n" \ |
| 178 | : "=r" (err), "=&r" (val), "=r" (addr) \ | 178 | : "=r" (err), "=&r" (val), "=r" (addr) \ |
| 179 | : "0" (err), "2" (addr)) | 179 | : "0" (err), "2" (addr)) |
| 180 | 180 | ||
| @@ -226,16 +226,16 @@ union offset_union { | |||
| 226 | " mov %1, %1, "NEXT_BYTE"\n" \ | 226 | " mov %1, %1, "NEXT_BYTE"\n" \ |
| 227 | "2: "ins" %1, [%2]\n" \ | 227 | "2: "ins" %1, [%2]\n" \ |
| 228 | "3:\n" \ | 228 | "3:\n" \ |
| 229 | " .section .fixup,\"ax\"\n" \ | 229 | " .pushsection .fixup,\"ax\"\n" \ |
| 230 | " .align 2\n" \ | 230 | " .align 2\n" \ |
| 231 | "4: mov %0, #1\n" \ | 231 | "4: mov %0, #1\n" \ |
| 232 | " b 3b\n" \ | 232 | " b 3b\n" \ |
| 233 | " .previous\n" \ | 233 | " .popsection\n" \ |
| 234 | " .section __ex_table,\"a\"\n" \ | 234 | " .pushsection __ex_table,\"a\"\n" \ |
| 235 | " .align 3\n" \ | 235 | " .align 3\n" \ |
| 236 | " .long 1b, 4b\n" \ | 236 | " .long 1b, 4b\n" \ |
| 237 | " .long 2b, 4b\n" \ | 237 | " .long 2b, 4b\n" \ |
| 238 | " .previous\n" \ | 238 | " .popsection\n" \ |
| 239 | : "=r" (err), "=&r" (v), "=&r" (a) \ | 239 | : "=r" (err), "=&r" (v), "=&r" (a) \ |
| 240 | : "0" (err), "1" (v), "2" (a)); \ | 240 | : "0" (err), "1" (v), "2" (a)); \ |
| 241 | if (err) \ | 241 | if (err) \ |
| @@ -266,18 +266,18 @@ union offset_union { | |||
| 266 | " mov %1, %1, "NEXT_BYTE"\n" \ | 266 | " mov %1, %1, "NEXT_BYTE"\n" \ |
| 267 | "4: "ins" %1, [%2]\n" \ | 267 | "4: "ins" %1, [%2]\n" \ |
| 268 | "5:\n" \ | 268 | "5:\n" \ |
| 269 | " .section .fixup,\"ax\"\n" \ | 269 | " .pushsection .fixup,\"ax\"\n" \ |
| 270 | " .align 2\n" \ | 270 | " .align 2\n" \ |
| 271 | "6: mov %0, #1\n" \ | 271 | "6: mov %0, #1\n" \ |
| 272 | " b 5b\n" \ | 272 | " b 5b\n" \ |
| 273 | " .previous\n" \ | 273 | " .popsection\n" \ |
| 274 | " .section __ex_table,\"a\"\n" \ | 274 | " .pushsection __ex_table,\"a\"\n" \ |
| 275 | " .align 3\n" \ | 275 | " .align 3\n" \ |
| 276 | " .long 1b, 6b\n" \ | 276 | " .long 1b, 6b\n" \ |
| 277 | " .long 2b, 6b\n" \ | 277 | " .long 2b, 6b\n" \ |
| 278 | " .long 3b, 6b\n" \ | 278 | " .long 3b, 6b\n" \ |
| 279 | " .long 4b, 6b\n" \ | 279 | " .long 4b, 6b\n" \ |
| 280 | " .previous\n" \ | 280 | " .popsection\n" \ |
| 281 | : "=r" (err), "=&r" (v), "=&r" (a) \ | 281 | : "=r" (err), "=&r" (v), "=&r" (a) \ |
| 282 | : "0" (err), "1" (v), "2" (a)); \ | 282 | : "0" (err), "1" (v), "2" (a)); \ |
| 283 | if (err) \ | 283 | if (err) \ |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 83db12a68d56..0ed29bfeba1c 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -86,9 +86,6 @@ void show_mem(void) | |||
| 86 | printk("Mem-info:\n"); | 86 | printk("Mem-info:\n"); |
| 87 | show_free_areas(); | 87 | show_free_areas(); |
| 88 | for_each_online_node(node) { | 88 | for_each_online_node(node) { |
| 89 | pg_data_t *n = NODE_DATA(node); | ||
| 90 | struct page *map = pgdat_page_nr(n, 0) - n->node_start_pfn; | ||
| 91 | |||
| 92 | for_each_nodebank (i,mi,node) { | 89 | for_each_nodebank (i,mi,node) { |
| 93 | struct membank *bank = &mi->bank[i]; | 90 | struct membank *bank = &mi->bank[i]; |
| 94 | unsigned int pfn1, pfn2; | 91 | unsigned int pfn1, pfn2; |
| @@ -97,8 +94,8 @@ void show_mem(void) | |||
| 97 | pfn1 = bank_pfn_start(bank); | 94 | pfn1 = bank_pfn_start(bank); |
| 98 | pfn2 = bank_pfn_end(bank); | 95 | pfn2 = bank_pfn_end(bank); |
| 99 | 96 | ||
| 100 | page = map + pfn1; | 97 | page = pfn_to_page(pfn1); |
| 101 | end = map + pfn2; | 98 | end = pfn_to_page(pfn2 - 1) + 1; |
| 102 | 99 | ||
| 103 | do { | 100 | do { |
| 104 | total++; | 101 | total++; |
| @@ -603,9 +600,6 @@ void __init mem_init(void) | |||
| 603 | reserved_pages = free_pages = 0; | 600 | reserved_pages = free_pages = 0; |
| 604 | 601 | ||
| 605 | for_each_online_node(node) { | 602 | for_each_online_node(node) { |
| 606 | pg_data_t *n = NODE_DATA(node); | ||
| 607 | struct page *map = pgdat_page_nr(n, 0) - n->node_start_pfn; | ||
| 608 | |||
| 609 | for_each_nodebank(i, &meminfo, node) { | 603 | for_each_nodebank(i, &meminfo, node) { |
| 610 | struct membank *bank = &meminfo.bank[i]; | 604 | struct membank *bank = &meminfo.bank[i]; |
| 611 | unsigned int pfn1, pfn2; | 605 | unsigned int pfn1, pfn2; |
| @@ -614,8 +608,8 @@ void __init mem_init(void) | |||
| 614 | pfn1 = bank_pfn_start(bank); | 608 | pfn1 = bank_pfn_start(bank); |
| 615 | pfn2 = bank_pfn_end(bank); | 609 | pfn2 = bank_pfn_end(bank); |
| 616 | 610 | ||
| 617 | page = map + pfn1; | 611 | page = pfn_to_page(pfn1); |
| 618 | end = map + pfn2; | 612 | end = pfn_to_page(pfn2 - 1) + 1; |
| 619 | 613 | ||
| 620 | do { | 614 | do { |
| 621 | if (PageReserved(page)) | 615 | if (PageReserved(page)) |
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index ee7700242c19..5c47760c2064 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S | |||
| @@ -45,7 +45,7 @@ ENTRY(cpu_sa1100_proc_init) | |||
| 45 | mcr p15, 0, r0, c9, c0, 5 @ Allow read-buffer operations from userland | 45 | mcr p15, 0, r0, c9, c0, 5 @ Allow read-buffer operations from userland |
| 46 | mov pc, lr | 46 | mov pc, lr |
| 47 | 47 | ||
| 48 | .previous | 48 | .section .text |
| 49 | 49 | ||
| 50 | /* | 50 | /* |
| 51 | * cpu_sa1100_proc_fin() | 51 | * cpu_sa1100_proc_fin() |
diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S index 48bca0db4607..cafa18354339 100644 --- a/arch/arm/nwfpe/entry.S +++ b/arch/arm/nwfpe/entry.S | |||
| @@ -111,12 +111,12 @@ next: | |||
| 111 | @ to fault. Emit the appropriate exception gunk to fix things up. | 111 | @ to fault. Emit the appropriate exception gunk to fix things up. |
| 112 | @ ??? For some reason, faults can happen at .Lx2 even with a | 112 | @ ??? For some reason, faults can happen at .Lx2 even with a |
| 113 | @ plain LDR instruction. Weird, but it seems harmless. | 113 | @ plain LDR instruction. Weird, but it seems harmless. |
| 114 | .section .fixup,"ax" | 114 | .pushsection .fixup,"ax" |
| 115 | .align 2 | 115 | .align 2 |
| 116 | .Lfix: mov pc, r9 @ let the user eat segfaults | 116 | .Lfix: mov pc, r9 @ let the user eat segfaults |
| 117 | .previous | 117 | .popsection |
| 118 | 118 | ||
| 119 | .section __ex_table,"a" | 119 | .pushsection __ex_table,"a" |
| 120 | .align 3 | 120 | .align 3 |
| 121 | .long .Lx1, .Lfix | 121 | .long .Lx1, .Lfix |
| 122 | .previous | 122 | .popsection |
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 088c1a03b946..f12f0e39ddf2 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -44,9 +44,6 @@ | |||
| 44 | 44 | ||
| 45 | #define NO_LENGTH_CHECK 0xffffffff | 45 | #define NO_LENGTH_CHECK 0xffffffff |
| 46 | 46 | ||
| 47 | unsigned char omap_bootloader_tag[512]; | ||
| 48 | int omap_bootloader_tag_len; | ||
| 49 | |||
| 50 | struct omap_board_config_kernel *omap_board_config; | 47 | struct omap_board_config_kernel *omap_board_config; |
| 51 | int omap_board_config_size; | 48 | int omap_board_config_size; |
| 52 | 49 | ||
| @@ -100,10 +97,17 @@ EXPORT_SYMBOL(omap_get_var_config); | |||
| 100 | 97 | ||
| 101 | #include <linux/clocksource.h> | 98 | #include <linux/clocksource.h> |
| 102 | 99 | ||
| 100 | /* | ||
| 101 | * offset_32k holds the init time counter value. It is then subtracted | ||
| 102 | * from every counter read to achieve a counter that counts time from the | ||
| 103 | * kernel boot (needed for sched_clock()). | ||
| 104 | */ | ||
| 105 | static u32 offset_32k __read_mostly; | ||
| 106 | |||
| 103 | #ifdef CONFIG_ARCH_OMAP16XX | 107 | #ifdef CONFIG_ARCH_OMAP16XX |
| 104 | static cycle_t omap16xx_32k_read(struct clocksource *cs) | 108 | static cycle_t omap16xx_32k_read(struct clocksource *cs) |
| 105 | { | 109 | { |
| 106 | return omap_readl(OMAP16XX_TIMER_32K_SYNCHRONIZED); | 110 | return omap_readl(OMAP16XX_TIMER_32K_SYNCHRONIZED) - offset_32k; |
| 107 | } | 111 | } |
| 108 | #else | 112 | #else |
| 109 | #define omap16xx_32k_read NULL | 113 | #define omap16xx_32k_read NULL |
| @@ -112,7 +116,7 @@ static cycle_t omap16xx_32k_read(struct clocksource *cs) | |||
| 112 | #ifdef CONFIG_ARCH_OMAP2420 | 116 | #ifdef CONFIG_ARCH_OMAP2420 |
| 113 | static cycle_t omap2420_32k_read(struct clocksource *cs) | 117 | static cycle_t omap2420_32k_read(struct clocksource *cs) |
| 114 | { | 118 | { |
| 115 | return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10); | 119 | return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k; |
| 116 | } | 120 | } |
| 117 | #else | 121 | #else |
| 118 | #define omap2420_32k_read NULL | 122 | #define omap2420_32k_read NULL |
| @@ -121,7 +125,7 @@ static cycle_t omap2420_32k_read(struct clocksource *cs) | |||
| 121 | #ifdef CONFIG_ARCH_OMAP2430 | 125 | #ifdef CONFIG_ARCH_OMAP2430 |
| 122 | static cycle_t omap2430_32k_read(struct clocksource *cs) | 126 | static cycle_t omap2430_32k_read(struct clocksource *cs) |
| 123 | { | 127 | { |
| 124 | return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10); | 128 | return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k; |
| 125 | } | 129 | } |
| 126 | #else | 130 | #else |
| 127 | #define omap2430_32k_read NULL | 131 | #define omap2430_32k_read NULL |
| @@ -130,7 +134,7 @@ static cycle_t omap2430_32k_read(struct clocksource *cs) | |||
| 130 | #ifdef CONFIG_ARCH_OMAP3 | 134 | #ifdef CONFIG_ARCH_OMAP3 |
| 131 | static cycle_t omap34xx_32k_read(struct clocksource *cs) | 135 | static cycle_t omap34xx_32k_read(struct clocksource *cs) |
| 132 | { | 136 | { |
| 133 | return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10); | 137 | return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10) - offset_32k; |
| 134 | } | 138 | } |
| 135 | #else | 139 | #else |
| 136 | #define omap34xx_32k_read NULL | 140 | #define omap34xx_32k_read NULL |
| @@ -139,7 +143,7 @@ static cycle_t omap34xx_32k_read(struct clocksource *cs) | |||
| 139 | #ifdef CONFIG_ARCH_OMAP4 | 143 | #ifdef CONFIG_ARCH_OMAP4 |
| 140 | static cycle_t omap44xx_32k_read(struct clocksource *cs) | 144 | static cycle_t omap44xx_32k_read(struct clocksource *cs) |
| 141 | { | 145 | { |
| 142 | return omap_readl(OMAP4430_32KSYNCT_BASE + 0x10); | 146 | return omap_readl(OMAP4430_32KSYNCT_BASE + 0x10) - offset_32k; |
| 143 | } | 147 | } |
| 144 | #else | 148 | #else |
| 145 | #define omap44xx_32k_read NULL | 149 | #define omap44xx_32k_read NULL |
| @@ -227,6 +231,8 @@ static int __init omap_init_clocksource_32k(void) | |||
| 227 | clocksource_32k.mult = clocksource_hz2mult(32768, | 231 | clocksource_32k.mult = clocksource_hz2mult(32768, |
| 228 | clocksource_32k.shift); | 232 | clocksource_32k.shift); |
| 229 | 233 | ||
| 234 | offset_32k = clocksource_32k.read(&clocksource_32k); | ||
| 235 | |||
| 230 | if (clocksource_register(&clocksource_32k)) | 236 | if (clocksource_register(&clocksource_32k)) |
| 231 | printk(err, clocksource_32k.name); | 237 | printk(err, clocksource_32k.name); |
| 232 | } | 238 | } |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 5c6c342c53f5..1d959965ff52 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -937,6 +937,15 @@ void omap_start_dma(int lch) | |||
| 937 | { | 937 | { |
| 938 | u32 l; | 938 | u32 l; |
| 939 | 939 | ||
| 940 | /* | ||
| 941 | * The CPC/CDAC register needs to be initialized to zero | ||
| 942 | * before starting dma transfer. | ||
| 943 | */ | ||
| 944 | if (cpu_is_omap15xx()) | ||
| 945 | dma_write(0, CPC(lch)); | ||
| 946 | else | ||
| 947 | dma_write(0, CDAC(lch)); | ||
| 948 | |||
| 940 | if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) { | 949 | if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) { |
| 941 | int next_lch, cur_lch; | 950 | int next_lch, cur_lch; |
| 942 | char dma_chan_link_map[OMAP_DMA4_LOGICAL_DMA_CH_COUNT]; | 951 | char dma_chan_link_map[OMAP_DMA4_LOGICAL_DMA_CH_COUNT]; |
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 76a347b3ce07..45a225d09125 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
| @@ -798,7 +798,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) | |||
| 798 | case METHOD_MPUIO: | 798 | case METHOD_MPUIO: |
| 799 | reg += OMAP_MPUIO_GPIO_INT_EDGE; | 799 | reg += OMAP_MPUIO_GPIO_INT_EDGE; |
| 800 | l = __raw_readl(reg); | 800 | l = __raw_readl(reg); |
| 801 | if (trigger & IRQ_TYPE_EDGE_BOTH) | 801 | if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) |
| 802 | bank->toggle_mask |= 1 << gpio; | 802 | bank->toggle_mask |= 1 << gpio; |
| 803 | if (trigger & IRQ_TYPE_EDGE_RISING) | 803 | if (trigger & IRQ_TYPE_EDGE_RISING) |
| 804 | l |= 1 << gpio; | 804 | l |= 1 << gpio; |
| @@ -812,7 +812,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) | |||
| 812 | case METHOD_GPIO_1510: | 812 | case METHOD_GPIO_1510: |
| 813 | reg += OMAP1510_GPIO_INT_CONTROL; | 813 | reg += OMAP1510_GPIO_INT_CONTROL; |
| 814 | l = __raw_readl(reg); | 814 | l = __raw_readl(reg); |
| 815 | if (trigger & IRQ_TYPE_EDGE_BOTH) | 815 | if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) |
| 816 | bank->toggle_mask |= 1 << gpio; | 816 | bank->toggle_mask |= 1 << gpio; |
| 817 | if (trigger & IRQ_TYPE_EDGE_RISING) | 817 | if (trigger & IRQ_TYPE_EDGE_RISING) |
| 818 | l |= 1 << gpio; | 818 | l |= 1 << gpio; |
| @@ -846,7 +846,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) | |||
| 846 | case METHOD_GPIO_7XX: | 846 | case METHOD_GPIO_7XX: |
| 847 | reg += OMAP7XX_GPIO_INT_CONTROL; | 847 | reg += OMAP7XX_GPIO_INT_CONTROL; |
| 848 | l = __raw_readl(reg); | 848 | l = __raw_readl(reg); |
| 849 | if (trigger & IRQ_TYPE_EDGE_BOTH) | 849 | if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) |
| 850 | bank->toggle_mask |= 1 << gpio; | 850 | bank->toggle_mask |= 1 << gpio; |
| 851 | if (trigger & IRQ_TYPE_EDGE_RISING) | 851 | if (trigger & IRQ_TYPE_EDGE_RISING) |
| 852 | l |= 1 << gpio; | 852 | l |= 1 << gpio; |
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index b65088a869e9..401701977dbb 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h | |||
| @@ -345,8 +345,6 @@ | |||
| 345 | #define INT_34XX_MMC3_IRQ 94 | 345 | #define INT_34XX_MMC3_IRQ 94 |
| 346 | #define INT_34XX_GPT12_IRQ 95 | 346 | #define INT_34XX_GPT12_IRQ 95 |
| 347 | 347 | ||
| 348 | #define INT_34XX_BENCH_MPU_EMUL 3 | ||
| 349 | |||
| 350 | #define INT_35XX_HECC0_IRQ 24 | 348 | #define INT_35XX_HECC0_IRQ 24 |
| 351 | #define INT_35XX_HECC1_IRQ 28 | 349 | #define INT_35XX_HECC1_IRQ 28 |
| 352 | #define INT_35XX_EMAC_C0_RXTHRESH_IRQ 67 | 350 | #define INT_35XX_EMAC_C0_RXTHRESH_IRQ 67 |
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index 39748354ce45..7de903d7c1ce 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define OMAP44XX_MCBSP1_BASE 0x49022000 | 59 | #define OMAP44XX_MCBSP1_BASE 0x49022000 |
| 60 | #define OMAP44XX_MCBSP2_BASE 0x49024000 | 60 | #define OMAP44XX_MCBSP2_BASE 0x49024000 |
| 61 | #define OMAP44XX_MCBSP3_BASE 0x49026000 | 61 | #define OMAP44XX_MCBSP3_BASE 0x49026000 |
| 62 | #define OMAP44XX_MCBSP4_BASE 0x48074000 | 62 | #define OMAP44XX_MCBSP4_BASE 0x48096000 |
| 63 | 63 | ||
| 64 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) | 64 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) |
| 65 | 65 | ||
diff --git a/arch/arm/plat-omap/include/plat/nand.h b/arch/arm/plat-omap/include/plat/nand.h index 6ba88d2630d9..f8efd5466b1d 100644 --- a/arch/arm/plat-omap/include/plat/nand.h +++ b/arch/arm/plat-omap/include/plat/nand.h | |||
| @@ -29,4 +29,11 @@ struct omap_nand_platform_data { | |||
| 29 | /* size (4 KiB) for IO mapping */ | 29 | /* size (4 KiB) for IO mapping */ |
| 30 | #define NAND_IO_SIZE SZ_4K | 30 | #define NAND_IO_SIZE SZ_4K |
| 31 | 31 | ||
| 32 | #if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE) | ||
| 32 | extern int gpmc_nand_init(struct omap_nand_platform_data *d); | 33 | extern int gpmc_nand_init(struct omap_nand_platform_data *d); |
| 34 | #else | ||
| 35 | static inline int gpmc_nand_init(struct omap_nand_platform_data *d) | ||
| 36 | { | ||
| 37 | return 0; | ||
| 38 | } | ||
| 39 | #endif | ||
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h index 2302474a3748..b3ef1a7f53cc 100644 --- a/arch/arm/plat-omap/include/plat/omap44xx.h +++ b/arch/arm/plat-omap/include/plat/omap44xx.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define OMAP4430_PRM_BASE 0x4a306000 | 32 | #define OMAP4430_PRM_BASE 0x4a306000 |
| 33 | #define OMAP44XX_GPMC_BASE 0x50000000 | 33 | #define OMAP44XX_GPMC_BASE 0x50000000 |
| 34 | #define OMAP443X_SCM_BASE 0x4a002000 | 34 | #define OMAP443X_SCM_BASE 0x4a002000 |
| 35 | #define OMAP443X_CTRL_BASE OMAP443X_SCM_BASE | 35 | #define OMAP443X_CTRL_BASE 0x4a100000 |
| 36 | #define OMAP44XX_IC_BASE 0x48200000 | 36 | #define OMAP44XX_IC_BASE 0x48200000 |
| 37 | #define OMAP44XX_IVA_INTC_BASE 0x40000000 | 37 | #define OMAP44XX_IVA_INTC_BASE 0x40000000 |
| 38 | #define IRQ_SIR_IRQ 0x0040 | 38 | #define IRQ_SIR_IRQ 0x0040 |
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 440b4164f2f6..36d6ea56ab51 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h | |||
| @@ -294,8 +294,8 @@ struct omap_hwmod_class_sysconfig { | |||
| 294 | u16 rev_offs; | 294 | u16 rev_offs; |
| 295 | u16 sysc_offs; | 295 | u16 sysc_offs; |
| 296 | u16 syss_offs; | 296 | u16 syss_offs; |
| 297 | u16 sysc_flags; | ||
| 297 | u8 idlemodes; | 298 | u8 idlemodes; |
| 298 | u8 sysc_flags; | ||
| 299 | u8 clockact; | 299 | u8 clockact; |
| 300 | struct omap_hwmod_sysc_fields *sysc_fields; | 300 | struct omap_hwmod_sysc_fields *sysc_fields; |
| 301 | }; | 301 | }; |
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 568578db93b6..876ca8d5e927 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h | |||
| @@ -46,7 +46,7 @@ struct ehci_hcd_omap_platform_data { | |||
| 46 | struct omap_musb_board_data { | 46 | struct omap_musb_board_data { |
| 47 | u8 interface_type; | 47 | u8 interface_type; |
| 48 | u8 mode; | 48 | u8 mode; |
| 49 | u8 power; | 49 | u16 power; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; | 52 | enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; |
diff --git a/arch/arm/plat-pxa/dma.c b/arch/arm/plat-pxa/dma.c index 742350e0f2a7..2d3c19d7c7b1 100644 --- a/arch/arm/plat-pxa/dma.c +++ b/arch/arm/plat-pxa/dma.c | |||
| @@ -245,7 +245,7 @@ static void pxa_dma_init_debugfs(void) | |||
| 245 | 245 | ||
| 246 | dbgfs_chan = kmalloc(sizeof(*dbgfs_state) * num_dma_channels, | 246 | dbgfs_chan = kmalloc(sizeof(*dbgfs_state) * num_dma_channels, |
| 247 | GFP_KERNEL); | 247 | GFP_KERNEL); |
| 248 | if (!dbgfs_state) | 248 | if (!dbgfs_chan) |
| 249 | goto err_alloc; | 249 | goto err_alloc; |
| 250 | 250 | ||
| 251 | chandir = debugfs_create_dir("channels", dbgfs_root); | 251 | chandir = debugfs_create_dir("channels", dbgfs_root); |
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 1536f1784cac..8f10d24ae625 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # | 12 | # |
| 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new | 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new |
| 14 | # | 14 | # |
| 15 | # Last update: Sat Mar 20 15:35:41 2010 | 15 | # Last update: Sat May 1 10:36:42 2010 |
| 16 | # | 16 | # |
| 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number | 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number |
| 18 | # | 18 | # |
| @@ -2749,3 +2749,58 @@ stamp9g45 MACH_STAMP9G45 STAMP9G45 2761 | |||
| 2749 | h6053 MACH_H6053 H6053 2762 | 2749 | h6053 MACH_H6053 H6053 2762 |
| 2750 | smint01 MACH_SMINT01 SMINT01 2763 | 2750 | smint01 MACH_SMINT01 SMINT01 2763 |
| 2751 | prtlvt2 MACH_PRTLVT2 PRTLVT2 2764 | 2751 | prtlvt2 MACH_PRTLVT2 PRTLVT2 2764 |
| 2752 | ap420 MACH_AP420 AP420 2765 | ||
| 2753 | htcshift MACH_HTCSHIFT HTCSHIFT 2766 | ||
| 2754 | davinci_dm365_fc MACH_DAVINCI_DM365_FC DAVINCI_DM365_FC 2767 | ||
| 2755 | msm8x55_surf MACH_MSM8X55_SURF MSM8X55_SURF 2768 | ||
| 2756 | msm8x55_ffa MACH_MSM8X55_FFA MSM8X55_FFA 2769 | ||
| 2757 | esl_vamana MACH_ESL_VAMANA ESL_VAMANA 2770 | ||
| 2758 | sbc35 MACH_SBC35 SBC35 2771 | ||
| 2759 | mpx6446 MACH_MPX6446 MPX6446 2772 | ||
| 2760 | oreo_controller MACH_OREO_CONTROLLER OREO_CONTROLLER 2773 | ||
| 2761 | kopin_models MACH_KOPIN_MODELS KOPIN_MODELS 2774 | ||
| 2762 | ttc_vision2 MACH_TTC_VISION2 TTC_VISION2 2775 | ||
| 2763 | cns3420vb MACH_CNS3420VB CNS3420VB 2776 | ||
| 2764 | lpc2 MACH_LPC2 LPC2 2777 | ||
| 2765 | olympus MACH_OLYMPUS OLYMPUS 2778 | ||
| 2766 | vortex MACH_VORTEX VORTEX 2779 | ||
| 2767 | s5pc200 MACH_S5PC200 S5PC200 2780 | ||
| 2768 | ecucore_9263 MACH_ECUCORE_9263 ECUCORE_9263 2781 | ||
| 2769 | smdkc200 MACH_SMDKC200 SMDKC200 2782 | ||
| 2770 | emsiso_sx27 MACH_EMSISO_SX27 EMSISO_SX27 2783 | ||
| 2771 | apx_som9g45_ek MACH_APX_SOM9G45_EK APX_SOM9G45_EK 2784 | ||
| 2772 | songshan MACH_SONGSHAN SONGSHAN 2785 | ||
| 2773 | tianshan MACH_TIANSHAN TIANSHAN 2786 | ||
| 2774 | vpx500 MACH_VPX500 VPX500 2787 | ||
| 2775 | am3517sam MACH_AM3517SAM AM3517SAM 2788 | ||
| 2776 | skat91_sim508 MACH_SKAT91_SIM508 SKAT91_SIM508 2789 | ||
| 2777 | skat91_s3e MACH_SKAT91_S3E SKAT91_S3E 2790 | ||
| 2778 | omap4_panda MACH_OMAP4_PANDA OMAP4_PANDA 2791 | ||
| 2779 | df7220 MACH_DF7220 DF7220 2792 | ||
| 2780 | nemini MACH_NEMINI NEMINI 2793 | ||
| 2781 | t8200 MACH_T8200 T8200 2794 | ||
| 2782 | apf51 MACH_APF51 APF51 2795 | ||
| 2783 | dr_rc_unit MACH_DR_RC_UNIT DR_RC_UNIT 2796 | ||
| 2784 | bordeaux MACH_BORDEAUX BORDEAUX 2797 | ||
| 2785 | catania_b MACH_CATANIA_B CATANIA_B 2798 | ||
| 2786 | mx51_ocean MACH_MX51_OCEAN MX51_OCEAN 2799 | ||
| 2787 | ti8168evm MACH_TI8168EVM TI8168EVM 2800 | ||
| 2788 | neocoreomap MACH_NEOCOREOMAP NEOCOREOMAP 2801 | ||
| 2789 | withings_wbp MACH_WITHINGS_WBP WITHINGS_WBP 2802 | ||
| 2790 | dbps MACH_DBPS DBPS 2803 | ||
| 2791 | sbc9261 MACH_SBC9261 SBC9261 2804 | ||
| 2792 | pcbfp0001 MACH_PCBFP0001 PCBFP0001 2805 | ||
| 2793 | speedy MACH_SPEEDY SPEEDY 2806 | ||
| 2794 | chrysaor MACH_CHRYSAOR CHRYSAOR 2807 | ||
| 2795 | tango MACH_TANGO TANGO 2808 | ||
| 2796 | synology_dsx11 MACH_SYNOLOGY_DSX11 SYNOLOGY_DSX11 2809 | ||
| 2797 | hanlin_v3ext MACH_HANLIN_V3EXT HANLIN_V3EXT 2810 | ||
| 2798 | hanlin_v5 MACH_HANLIN_V5 HANLIN_V5 2811 | ||
| 2799 | hanlin_v3plus MACH_HANLIN_V3PLUS HANLIN_V3PLUS 2812 | ||
| 2800 | iriver_story MACH_IRIVER_STORY IRIVER_STORY 2813 | ||
| 2801 | irex_iliad MACH_IREX_ILIAD IREX_ILIAD 2814 | ||
| 2802 | irex_dr1000 MACH_IREX_DR1000 IREX_DR1000 2815 | ||
| 2803 | teton_bga MACH_TETON_BGA TETON_BGA 2816 | ||
| 2804 | snapper9g45 MACH_SNAPPER9G45 SNAPPER9G45 2817 | ||
| 2805 | tam3517 MACH_TAM3517 TAM3517 2818 | ||
| 2806 | pdc100 MACH_PDC100 PDC100 2819 | ||
diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c index dd5b882aab40..5e73c25f8f85 100644 --- a/arch/avr32/kernel/ptrace.c +++ b/arch/avr32/kernel/ptrace.c | |||
| @@ -28,7 +28,7 @@ static struct pt_regs *get_user_regs(struct task_struct *tsk) | |||
| 28 | THREAD_SIZE - sizeof(struct pt_regs)); | 28 | THREAD_SIZE - sizeof(struct pt_regs)); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | static void user_enable_single_step(struct task_struct *tsk) | 31 | void user_enable_single_step(struct task_struct *tsk) |
| 32 | { | 32 | { |
| 33 | pr_debug("user_enable_single_step: pid=%u, PC=0x%08lx, SR=0x%08lx\n", | 33 | pr_debug("user_enable_single_step: pid=%u, PC=0x%08lx, SR=0x%08lx\n", |
| 34 | tsk->pid, task_pt_regs(tsk)->pc, task_pt_regs(tsk)->sr); | 34 | tsk->pid, task_pt_regs(tsk)->pc, task_pt_regs(tsk)->sr); |
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index 6fced1fe3bf0..3c91cf6192c6 100644 --- a/arch/microblaze/configs/mmu_defconfig +++ b/arch/microblaze/configs/mmu_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc6 | 3 | # Linux kernel version: 2.6.34-rc6 |
| 4 | # Wed Feb 3 10:02:59 2010 | 4 | # Thu May 6 11:22:14 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_MICROBLAZE=y | 6 | CONFIG_MICROBLAZE=y |
| 7 | # CONFIG_SWAP is not set | 7 | # CONFIG_SWAP is not set |
| @@ -22,8 +22,6 @@ CONFIG_GENERIC_CSUM=y | |||
| 22 | CONFIG_STACKTRACE_SUPPORT=y | 22 | CONFIG_STACKTRACE_SUPPORT=y |
| 23 | CONFIG_LOCKDEP_SUPPORT=y | 23 | CONFIG_LOCKDEP_SUPPORT=y |
| 24 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 24 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 25 | # CONFIG_PCI is not set | ||
| 26 | CONFIG_NO_DMA=y | ||
| 27 | CONFIG_DTC=y | 25 | CONFIG_DTC=y |
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 29 | CONFIG_CONSTRUCTORS=y | 27 | CONFIG_CONSTRUCTORS=y |
| @@ -56,7 +54,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 56 | CONFIG_IKCONFIG=y | 54 | CONFIG_IKCONFIG=y |
| 57 | CONFIG_IKCONFIG_PROC=y | 55 | CONFIG_IKCONFIG_PROC=y |
| 58 | CONFIG_LOG_BUF_SHIFT=17 | 56 | CONFIG_LOG_BUF_SHIFT=17 |
| 59 | # CONFIG_GROUP_SCHED is not set | ||
| 60 | # CONFIG_CGROUPS is not set | 57 | # CONFIG_CGROUPS is not set |
| 61 | CONFIG_SYSFS_DEPRECATED=y | 58 | CONFIG_SYSFS_DEPRECATED=y |
| 62 | CONFIG_SYSFS_DEPRECATED_V2=y | 59 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -106,6 +103,8 @@ CONFIG_SLAB=y | |||
| 106 | # CONFIG_SLOB is not set | 103 | # CONFIG_SLOB is not set |
| 107 | # CONFIG_PROFILING is not set | 104 | # CONFIG_PROFILING is not set |
| 108 | CONFIG_HAVE_OPROFILE=y | 105 | CONFIG_HAVE_OPROFILE=y |
| 106 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 107 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
| 109 | 108 | ||
| 110 | # | 109 | # |
| 111 | # GCOV-based kernel profiling | 110 | # GCOV-based kernel profiling |
| @@ -245,13 +244,20 @@ CONFIG_BINFMT_ELF=y | |||
| 245 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 244 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 246 | # CONFIG_HAVE_AOUT is not set | 245 | # CONFIG_HAVE_AOUT is not set |
| 247 | # CONFIG_BINFMT_MISC is not set | 246 | # CONFIG_BINFMT_MISC is not set |
| 247 | |||
| 248 | # | ||
| 249 | # Bus Options | ||
| 250 | # | ||
| 251 | # CONFIG_PCI is not set | ||
| 252 | # CONFIG_PCI_DOMAINS is not set | ||
| 253 | # CONFIG_PCI_SYSCALL is not set | ||
| 254 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 248 | CONFIG_NET=y | 255 | CONFIG_NET=y |
| 249 | 256 | ||
| 250 | # | 257 | # |
| 251 | # Networking options | 258 | # Networking options |
| 252 | # | 259 | # |
| 253 | CONFIG_PACKET=y | 260 | CONFIG_PACKET=y |
| 254 | # CONFIG_PACKET_MMAP is not set | ||
| 255 | CONFIG_UNIX=y | 261 | CONFIG_UNIX=y |
| 256 | CONFIG_XFRM=y | 262 | CONFIG_XFRM=y |
| 257 | # CONFIG_XFRM_USER is not set | 263 | # CONFIG_XFRM_USER is not set |
| @@ -341,7 +347,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 341 | # CONFIG_SYS_HYPERVISOR is not set | 347 | # CONFIG_SYS_HYPERVISOR is not set |
| 342 | # CONFIG_CONNECTOR is not set | 348 | # CONFIG_CONNECTOR is not set |
| 343 | # CONFIG_MTD is not set | 349 | # CONFIG_MTD is not set |
| 350 | CONFIG_OF_FLATTREE=y | ||
| 344 | CONFIG_OF_DEVICE=y | 351 | CONFIG_OF_DEVICE=y |
| 352 | CONFIG_OF_MDIO=y | ||
| 345 | # CONFIG_PARPORT is not set | 353 | # CONFIG_PARPORT is not set |
| 346 | CONFIG_BLK_DEV=y | 354 | CONFIG_BLK_DEV=y |
| 347 | # CONFIG_BLK_DEV_COW_COMMON is not set | 355 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| @@ -370,6 +378,7 @@ CONFIG_MISC_DEVICES=y | |||
| 370 | # | 378 | # |
| 371 | # SCSI device support | 379 | # SCSI device support |
| 372 | # | 380 | # |
| 381 | CONFIG_SCSI_MOD=y | ||
| 373 | # CONFIG_RAID_ATTRS is not set | 382 | # CONFIG_RAID_ATTRS is not set |
| 374 | # CONFIG_SCSI is not set | 383 | # CONFIG_SCSI is not set |
| 375 | # CONFIG_SCSI_DMA is not set | 384 | # CONFIG_SCSI_DMA is not set |
| @@ -383,9 +392,30 @@ CONFIG_NETDEVICES=y | |||
| 383 | # CONFIG_EQUALIZER is not set | 392 | # CONFIG_EQUALIZER is not set |
| 384 | # CONFIG_TUN is not set | 393 | # CONFIG_TUN is not set |
| 385 | # CONFIG_VETH is not set | 394 | # CONFIG_VETH is not set |
| 386 | # CONFIG_PHYLIB is not set | 395 | CONFIG_PHYLIB=y |
| 396 | |||
| 397 | # | ||
| 398 | # MII PHY device drivers | ||
| 399 | # | ||
| 400 | # CONFIG_MARVELL_PHY is not set | ||
| 401 | # CONFIG_DAVICOM_PHY is not set | ||
| 402 | # CONFIG_QSEMI_PHY is not set | ||
| 403 | # CONFIG_LXT_PHY is not set | ||
| 404 | # CONFIG_CICADA_PHY is not set | ||
| 405 | # CONFIG_VITESSE_PHY is not set | ||
| 406 | # CONFIG_SMSC_PHY is not set | ||
| 407 | # CONFIG_BROADCOM_PHY is not set | ||
| 408 | # CONFIG_ICPLUS_PHY is not set | ||
| 409 | # CONFIG_REALTEK_PHY is not set | ||
| 410 | # CONFIG_NATIONAL_PHY is not set | ||
| 411 | # CONFIG_STE10XP is not set | ||
| 412 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 413 | # CONFIG_MICREL_PHY is not set | ||
| 414 | # CONFIG_FIXED_PHY is not set | ||
| 415 | # CONFIG_MDIO_BITBANG is not set | ||
| 387 | CONFIG_NET_ETHERNET=y | 416 | CONFIG_NET_ETHERNET=y |
| 388 | # CONFIG_MII is not set | 417 | # CONFIG_MII is not set |
| 418 | # CONFIG_ETHOC is not set | ||
| 389 | # CONFIG_DNET is not set | 419 | # CONFIG_DNET is not set |
| 390 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 420 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 391 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 421 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| @@ -394,6 +424,7 @@ CONFIG_NET_ETHERNET=y | |||
| 394 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | 424 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
| 395 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 425 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
| 396 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 426 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
| 427 | # CONFIG_B44 is not set | ||
| 397 | # CONFIG_KS8842 is not set | 428 | # CONFIG_KS8842 is not set |
| 398 | # CONFIG_KS8851_MLL is not set | 429 | # CONFIG_KS8851_MLL is not set |
| 399 | CONFIG_XILINX_EMACLITE=y | 430 | CONFIG_XILINX_EMACLITE=y |
| @@ -444,6 +475,7 @@ CONFIG_SERIAL_UARTLITE=y | |||
| 444 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | 475 | CONFIG_SERIAL_UARTLITE_CONSOLE=y |
| 445 | CONFIG_SERIAL_CORE=y | 476 | CONFIG_SERIAL_CORE=y |
| 446 | CONFIG_SERIAL_CORE_CONSOLE=y | 477 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 478 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 447 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 479 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 448 | CONFIG_UNIX98_PTYS=y | 480 | CONFIG_UNIX98_PTYS=y |
| 449 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 481 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -471,6 +503,12 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
| 471 | # CONFIG_HWMON is not set | 503 | # CONFIG_HWMON is not set |
| 472 | # CONFIG_THERMAL is not set | 504 | # CONFIG_THERMAL is not set |
| 473 | # CONFIG_WATCHDOG is not set | 505 | # CONFIG_WATCHDOG is not set |
| 506 | CONFIG_SSB_POSSIBLE=y | ||
| 507 | |||
| 508 | # | ||
| 509 | # Sonics Silicon Backplane | ||
| 510 | # | ||
| 511 | # CONFIG_SSB is not set | ||
| 474 | 512 | ||
| 475 | # | 513 | # |
| 476 | # Multifunction device drivers | 514 | # Multifunction device drivers |
| @@ -502,6 +540,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 502 | # CONFIG_NEW_LEDS is not set | 540 | # CONFIG_NEW_LEDS is not set |
| 503 | # CONFIG_ACCESSIBILITY is not set | 541 | # CONFIG_ACCESSIBILITY is not set |
| 504 | # CONFIG_RTC_CLASS is not set | 542 | # CONFIG_RTC_CLASS is not set |
| 543 | # CONFIG_DMADEVICES is not set | ||
| 505 | # CONFIG_AUXDISPLAY is not set | 544 | # CONFIG_AUXDISPLAY is not set |
| 506 | # CONFIG_UIO is not set | 545 | # CONFIG_UIO is not set |
| 507 | 546 | ||
| @@ -572,6 +611,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 572 | # CONFIG_BEFS_FS is not set | 611 | # CONFIG_BEFS_FS is not set |
| 573 | # CONFIG_BFS_FS is not set | 612 | # CONFIG_BFS_FS is not set |
| 574 | # CONFIG_EFS_FS is not set | 613 | # CONFIG_EFS_FS is not set |
| 614 | # CONFIG_LOGFS is not set | ||
| 575 | # CONFIG_CRAMFS is not set | 615 | # CONFIG_CRAMFS is not set |
| 576 | # CONFIG_SQUASHFS is not set | 616 | # CONFIG_SQUASHFS is not set |
| 577 | # CONFIG_VXFS_FS is not set | 617 | # CONFIG_VXFS_FS is not set |
| @@ -595,6 +635,7 @@ CONFIG_SUNRPC=y | |||
| 595 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 635 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 596 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 636 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 597 | # CONFIG_SMB_FS is not set | 637 | # CONFIG_SMB_FS is not set |
| 638 | # CONFIG_CEPH_FS is not set | ||
| 598 | CONFIG_CIFS=y | 639 | CONFIG_CIFS=y |
| 599 | CONFIG_CIFS_STATS=y | 640 | CONFIG_CIFS_STATS=y |
| 600 | CONFIG_CIFS_STATS2=y | 641 | CONFIG_CIFS_STATS2=y |
| @@ -696,6 +737,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 696 | # CONFIG_DEBUG_OBJECTS is not set | 737 | # CONFIG_DEBUG_OBJECTS is not set |
| 697 | CONFIG_DEBUG_SLAB=y | 738 | CONFIG_DEBUG_SLAB=y |
| 698 | # CONFIG_DEBUG_SLAB_LEAK is not set | 739 | # CONFIG_DEBUG_SLAB_LEAK is not set |
| 740 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
| 699 | CONFIG_DEBUG_SPINLOCK=y | 741 | CONFIG_DEBUG_SPINLOCK=y |
| 700 | # CONFIG_DEBUG_MUTEXES is not set | 742 | # CONFIG_DEBUG_MUTEXES is not set |
| 701 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 743 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
| @@ -741,6 +783,7 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
| 741 | # CONFIG_KMEMTRACE is not set | 783 | # CONFIG_KMEMTRACE is not set |
| 742 | # CONFIG_WORKQUEUE_TRACER is not set | 784 | # CONFIG_WORKQUEUE_TRACER is not set |
| 743 | # CONFIG_BLK_DEV_IO_TRACE is not set | 785 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 786 | # CONFIG_DMA_API_DEBUG is not set | ||
| 744 | # CONFIG_SAMPLES is not set | 787 | # CONFIG_SAMPLES is not set |
| 745 | CONFIG_EARLY_PRINTK=y | 788 | CONFIG_EARLY_PRINTK=y |
| 746 | # CONFIG_HEART_BEAT is not set | 789 | # CONFIG_HEART_BEAT is not set |
| @@ -862,5 +905,6 @@ CONFIG_ZLIB_INFLATE=y | |||
| 862 | CONFIG_DECOMPRESS_GZIP=y | 905 | CONFIG_DECOMPRESS_GZIP=y |
| 863 | CONFIG_HAS_IOMEM=y | 906 | CONFIG_HAS_IOMEM=y |
| 864 | CONFIG_HAS_IOPORT=y | 907 | CONFIG_HAS_IOPORT=y |
| 908 | CONFIG_HAS_DMA=y | ||
| 865 | CONFIG_HAVE_LMB=y | 909 | CONFIG_HAVE_LMB=y |
| 866 | CONFIG_NLATTR=y | 910 | CONFIG_NLATTR=y |
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig index ce2da535246a..dd3a494257f4 100644 --- a/arch/microblaze/configs/nommu_defconfig +++ b/arch/microblaze/configs/nommu_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc6 | 3 | # Linux kernel version: 2.6.34-rc6 |
| 4 | # Wed Feb 3 10:03:21 2010 | 4 | # Thu May 6 11:25:12 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_MICROBLAZE=y | 6 | CONFIG_MICROBLAZE=y |
| 7 | # CONFIG_SWAP is not set | 7 | # CONFIG_SWAP is not set |
| @@ -22,8 +22,6 @@ CONFIG_GENERIC_CSUM=y | |||
| 22 | CONFIG_STACKTRACE_SUPPORT=y | 22 | CONFIG_STACKTRACE_SUPPORT=y |
| 23 | CONFIG_LOCKDEP_SUPPORT=y | 23 | CONFIG_LOCKDEP_SUPPORT=y |
| 24 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 24 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 25 | # CONFIG_PCI is not set | ||
| 26 | CONFIG_NO_DMA=y | ||
| 27 | CONFIG_DTC=y | 25 | CONFIG_DTC=y |
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 29 | CONFIG_CONSTRUCTORS=y | 27 | CONFIG_CONSTRUCTORS=y |
| @@ -58,7 +56,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 58 | CONFIG_IKCONFIG=y | 56 | CONFIG_IKCONFIG=y |
| 59 | CONFIG_IKCONFIG_PROC=y | 57 | CONFIG_IKCONFIG_PROC=y |
| 60 | CONFIG_LOG_BUF_SHIFT=17 | 58 | CONFIG_LOG_BUF_SHIFT=17 |
| 61 | # CONFIG_GROUP_SCHED is not set | ||
| 62 | # CONFIG_CGROUPS is not set | 59 | # CONFIG_CGROUPS is not set |
| 63 | CONFIG_SYSFS_DEPRECATED=y | 60 | CONFIG_SYSFS_DEPRECATED=y |
| 64 | CONFIG_SYSFS_DEPRECATED_V2=y | 61 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -96,6 +93,8 @@ CONFIG_SLAB=y | |||
| 96 | # CONFIG_MMAP_ALLOW_UNINITIALIZED is not set | 93 | # CONFIG_MMAP_ALLOW_UNINITIALIZED is not set |
| 97 | # CONFIG_PROFILING is not set | 94 | # CONFIG_PROFILING is not set |
| 98 | CONFIG_HAVE_OPROFILE=y | 95 | CONFIG_HAVE_OPROFILE=y |
| 96 | CONFIG_HAVE_DMA_ATTRS=y | ||
| 97 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
| 99 | 98 | ||
| 100 | # | 99 | # |
| 101 | # GCOV-based kernel profiling | 100 | # GCOV-based kernel profiling |
| @@ -209,11 +208,14 @@ CONFIG_PROC_DEVICETREE=y | |||
| 209 | # | 208 | # |
| 210 | # Advanced setup | 209 | # Advanced setup |
| 211 | # | 210 | # |
| 211 | # CONFIG_ADVANCED_OPTIONS is not set | ||
| 212 | 212 | ||
| 213 | # | 213 | # |
| 214 | # Default settings for advanced configuration options are used | 214 | # Default settings for advanced configuration options are used |
| 215 | # | 215 | # |
| 216 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
| 216 | CONFIG_KERNEL_START=0x90000000 | 217 | CONFIG_KERNEL_START=0x90000000 |
| 218 | CONFIG_TASK_SIZE=0x80000000 | ||
| 217 | CONFIG_SELECT_MEMORY_MODEL=y | 219 | CONFIG_SELECT_MEMORY_MODEL=y |
| 218 | CONFIG_FLATMEM_MANUAL=y | 220 | CONFIG_FLATMEM_MANUAL=y |
| 219 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 221 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -235,13 +237,20 @@ CONFIG_BINFMT_FLAT=y | |||
| 235 | # CONFIG_BINFMT_SHARED_FLAT is not set | 237 | # CONFIG_BINFMT_SHARED_FLAT is not set |
| 236 | # CONFIG_HAVE_AOUT is not set | 238 | # CONFIG_HAVE_AOUT is not set |
| 237 | # CONFIG_BINFMT_MISC is not set | 239 | # CONFIG_BINFMT_MISC is not set |
| 240 | |||
| 241 | # | ||
| 242 | # Bus Options | ||
| 243 | # | ||
| 244 | # CONFIG_PCI is not set | ||
| 245 | # CONFIG_PCI_DOMAINS is not set | ||
| 246 | # CONFIG_PCI_SYSCALL is not set | ||
| 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 238 | CONFIG_NET=y | 248 | CONFIG_NET=y |
| 239 | 249 | ||
| 240 | # | 250 | # |
| 241 | # Networking options | 251 | # Networking options |
| 242 | # | 252 | # |
| 243 | CONFIG_PACKET=y | 253 | CONFIG_PACKET=y |
| 244 | # CONFIG_PACKET_MMAP is not set | ||
| 245 | CONFIG_UNIX=y | 254 | CONFIG_UNIX=y |
| 246 | CONFIG_XFRM=y | 255 | CONFIG_XFRM=y |
| 247 | # CONFIG_XFRM_USER is not set | 256 | # CONFIG_XFRM_USER is not set |
| @@ -413,6 +422,7 @@ CONFIG_MTD_UCLINUX=y | |||
| 413 | # UBI - Unsorted block images | 422 | # UBI - Unsorted block images |
| 414 | # | 423 | # |
| 415 | # CONFIG_MTD_UBI is not set | 424 | # CONFIG_MTD_UBI is not set |
| 425 | CONFIG_OF_FLATTREE=y | ||
| 416 | CONFIG_OF_DEVICE=y | 426 | CONFIG_OF_DEVICE=y |
| 417 | # CONFIG_PARPORT is not set | 427 | # CONFIG_PARPORT is not set |
| 418 | CONFIG_BLK_DEV=y | 428 | CONFIG_BLK_DEV=y |
| @@ -442,6 +452,7 @@ CONFIG_MISC_DEVICES=y | |||
| 442 | # | 452 | # |
| 443 | # SCSI device support | 453 | # SCSI device support |
| 444 | # | 454 | # |
| 455 | CONFIG_SCSI_MOD=y | ||
| 445 | # CONFIG_RAID_ATTRS is not set | 456 | # CONFIG_RAID_ATTRS is not set |
| 446 | # CONFIG_SCSI is not set | 457 | # CONFIG_SCSI is not set |
| 447 | # CONFIG_SCSI_DMA is not set | 458 | # CONFIG_SCSI_DMA is not set |
| @@ -458,6 +469,7 @@ CONFIG_NETDEVICES=y | |||
| 458 | # CONFIG_PHYLIB is not set | 469 | # CONFIG_PHYLIB is not set |
| 459 | CONFIG_NET_ETHERNET=y | 470 | CONFIG_NET_ETHERNET=y |
| 460 | # CONFIG_MII is not set | 471 | # CONFIG_MII is not set |
| 472 | # CONFIG_ETHOC is not set | ||
| 461 | # CONFIG_DNET is not set | 473 | # CONFIG_DNET is not set |
| 462 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 474 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 463 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 475 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| @@ -466,6 +478,7 @@ CONFIG_NET_ETHERNET=y | |||
| 466 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | 478 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
| 467 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 479 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
| 468 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 480 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
| 481 | # CONFIG_B44 is not set | ||
| 469 | # CONFIG_KS8842 is not set | 482 | # CONFIG_KS8842 is not set |
| 470 | # CONFIG_KS8851_MLL is not set | 483 | # CONFIG_KS8851_MLL is not set |
| 471 | # CONFIG_XILINX_EMACLITE is not set | 484 | # CONFIG_XILINX_EMACLITE is not set |
| @@ -516,6 +529,7 @@ CONFIG_SERIAL_UARTLITE=y | |||
| 516 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | 529 | CONFIG_SERIAL_UARTLITE_CONSOLE=y |
| 517 | CONFIG_SERIAL_CORE=y | 530 | CONFIG_SERIAL_CORE=y |
| 518 | CONFIG_SERIAL_CORE_CONSOLE=y | 531 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 532 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 519 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 533 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 520 | CONFIG_UNIX98_PTYS=y | 534 | CONFIG_UNIX98_PTYS=y |
| 521 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 535 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -544,6 +558,12 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
| 544 | # CONFIG_HWMON is not set | 558 | # CONFIG_HWMON is not set |
| 545 | # CONFIG_THERMAL is not set | 559 | # CONFIG_THERMAL is not set |
| 546 | # CONFIG_WATCHDOG is not set | 560 | # CONFIG_WATCHDOG is not set |
| 561 | CONFIG_SSB_POSSIBLE=y | ||
| 562 | |||
| 563 | # | ||
| 564 | # Sonics Silicon Backplane | ||
| 565 | # | ||
| 566 | # CONFIG_SSB is not set | ||
| 547 | 567 | ||
| 548 | # | 568 | # |
| 549 | # Multifunction device drivers | 569 | # Multifunction device drivers |
| @@ -593,6 +613,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 593 | # CONFIG_NEW_LEDS is not set | 613 | # CONFIG_NEW_LEDS is not set |
| 594 | # CONFIG_ACCESSIBILITY is not set | 614 | # CONFIG_ACCESSIBILITY is not set |
| 595 | # CONFIG_RTC_CLASS is not set | 615 | # CONFIG_RTC_CLASS is not set |
| 616 | # CONFIG_DMADEVICES is not set | ||
| 596 | # CONFIG_AUXDISPLAY is not set | 617 | # CONFIG_AUXDISPLAY is not set |
| 597 | # CONFIG_UIO is not set | 618 | # CONFIG_UIO is not set |
| 598 | 619 | ||
| @@ -661,6 +682,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 661 | # CONFIG_BFS_FS is not set | 682 | # CONFIG_BFS_FS is not set |
| 662 | # CONFIG_EFS_FS is not set | 683 | # CONFIG_EFS_FS is not set |
| 663 | # CONFIG_JFFS2_FS is not set | 684 | # CONFIG_JFFS2_FS is not set |
| 685 | # CONFIG_LOGFS is not set | ||
| 664 | CONFIG_CRAMFS=y | 686 | CONFIG_CRAMFS=y |
| 665 | # CONFIG_SQUASHFS is not set | 687 | # CONFIG_SQUASHFS is not set |
| 666 | # CONFIG_VXFS_FS is not set | 688 | # CONFIG_VXFS_FS is not set |
| @@ -689,6 +711,7 @@ CONFIG_SUNRPC=y | |||
| 689 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 711 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 690 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 712 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 691 | # CONFIG_SMB_FS is not set | 713 | # CONFIG_SMB_FS is not set |
| 714 | # CONFIG_CEPH_FS is not set | ||
| 692 | # CONFIG_CIFS is not set | 715 | # CONFIG_CIFS is not set |
| 693 | # CONFIG_NCP_FS is not set | 716 | # CONFIG_NCP_FS is not set |
| 694 | # CONFIG_CODA_FS is not set | 717 | # CONFIG_CODA_FS is not set |
| @@ -733,6 +756,7 @@ CONFIG_DEBUG_OBJECTS_TIMERS=y | |||
| 733 | # CONFIG_DEBUG_OBJECTS_WORK is not set | 756 | # CONFIG_DEBUG_OBJECTS_WORK is not set |
| 734 | CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 | 757 | CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 |
| 735 | # CONFIG_DEBUG_SLAB is not set | 758 | # CONFIG_DEBUG_SLAB is not set |
| 759 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
| 736 | # CONFIG_DEBUG_RT_MUTEXES is not set | 760 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 737 | # CONFIG_RT_MUTEX_TESTER is not set | 761 | # CONFIG_RT_MUTEX_TESTER is not set |
| 738 | # CONFIG_DEBUG_SPINLOCK is not set | 762 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -758,6 +782,7 @@ CONFIG_DEBUG_SG=y | |||
| 758 | # CONFIG_BACKTRACE_SELF_TEST is not set | 782 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 759 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 783 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 760 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 784 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 785 | # CONFIG_LKDTM is not set | ||
| 761 | # CONFIG_FAULT_INJECTION is not set | 786 | # CONFIG_FAULT_INJECTION is not set |
| 762 | # CONFIG_LATENCYTOP is not set | 787 | # CONFIG_LATENCYTOP is not set |
| 763 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 788 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| @@ -782,6 +807,7 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
| 782 | # CONFIG_WORKQUEUE_TRACER is not set | 807 | # CONFIG_WORKQUEUE_TRACER is not set |
| 783 | # CONFIG_BLK_DEV_IO_TRACE is not set | 808 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 784 | # CONFIG_DYNAMIC_DEBUG is not set | 809 | # CONFIG_DYNAMIC_DEBUG is not set |
| 810 | # CONFIG_DMA_API_DEBUG is not set | ||
| 785 | # CONFIG_SAMPLES is not set | 811 | # CONFIG_SAMPLES is not set |
| 786 | CONFIG_EARLY_PRINTK=y | 812 | CONFIG_EARLY_PRINTK=y |
| 787 | # CONFIG_HEART_BEAT is not set | 813 | # CONFIG_HEART_BEAT is not set |
| @@ -901,5 +927,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y | |||
| 901 | CONFIG_ZLIB_INFLATE=y | 927 | CONFIG_ZLIB_INFLATE=y |
| 902 | CONFIG_HAS_IOMEM=y | 928 | CONFIG_HAS_IOMEM=y |
| 903 | CONFIG_HAS_IOPORT=y | 929 | CONFIG_HAS_IOPORT=y |
| 930 | CONFIG_HAS_DMA=y | ||
| 904 | CONFIG_HAVE_LMB=y | 931 | CONFIG_HAVE_LMB=y |
| 905 | CONFIG_NLATTR=y | 932 | CONFIG_NLATTR=y |
diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h index e52210891d78..4efe96a036f7 100644 --- a/arch/microblaze/include/asm/cache.h +++ b/arch/microblaze/include/asm/cache.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <asm/registers.h> | 16 | #include <asm/registers.h> |
| 17 | 17 | ||
| 18 | #define L1_CACHE_SHIFT 2 | 18 | #define L1_CACHE_SHIFT 5 |
| 19 | /* word-granular cache in microblaze */ | 19 | /* word-granular cache in microblaze */ |
| 20 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | 20 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
| 21 | 21 | ||
diff --git a/arch/microblaze/include/asm/dma.h b/arch/microblaze/include/asm/dma.h index 08c073badf19..0d73d0c6de37 100644 --- a/arch/microblaze/include/asm/dma.h +++ b/arch/microblaze/include/asm/dma.h | |||
| @@ -18,4 +18,10 @@ | |||
| 18 | #define MAX_DMA_ADDRESS (CONFIG_KERNEL_START + memory_size - 1) | 18 | #define MAX_DMA_ADDRESS (CONFIG_KERNEL_START + memory_size - 1) |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| 21 | #ifdef CONFIG_PCI | ||
| 22 | extern int isa_dma_bridge_buggy; | ||
| 23 | #else | ||
| 24 | #define isa_dma_bridge_buggy (0) | ||
| 25 | #endif | ||
| 26 | |||
| 21 | #endif /* _ASM_MICROBLAZE_DMA_H */ | 27 | #endif /* _ASM_MICROBLAZE_DMA_H */ |
diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h index 90731df9e574..4c7b5d037c88 100644 --- a/arch/microblaze/include/asm/exceptions.h +++ b/arch/microblaze/include/asm/exceptions.h | |||
| @@ -64,12 +64,6 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type, | |||
| 64 | void die(const char *str, struct pt_regs *fp, long err); | 64 | void die(const char *str, struct pt_regs *fp, long err); |
| 65 | void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr); | 65 | void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr); |
| 66 | 66 | ||
| 67 | #ifdef CONFIG_MMU | ||
| 68 | void __bug(const char *file, int line, void *data); | ||
| 69 | int bad_trap(int trap_num, struct pt_regs *regs); | ||
| 70 | int debug_trap(struct pt_regs *regs); | ||
| 71 | #endif /* CONFIG_MMU */ | ||
| 72 | |||
| 73 | #if defined(CONFIG_KGDB) | 67 | #if defined(CONFIG_KGDB) |
| 74 | void (*debugger)(struct pt_regs *regs); | 68 | void (*debugger)(struct pt_regs *regs); |
| 75 | int (*debugger_bpt)(struct pt_regs *regs); | 69 | int (*debugger_bpt)(struct pt_regs *regs); |
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index e45a6eea92e0..00b5398d08c7 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
| @@ -139,8 +139,6 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) | |||
| 139 | 139 | ||
| 140 | #ifdef CONFIG_MMU | 140 | #ifdef CONFIG_MMU |
| 141 | 141 | ||
| 142 | #define mm_ptov(addr) ((void *)__phys_to_virt(addr)) | ||
| 143 | #define mm_vtop(addr) ((unsigned long)__virt_to_phys(addr)) | ||
| 144 | #define phys_to_virt(addr) ((void *)__phys_to_virt(addr)) | 142 | #define phys_to_virt(addr) ((void *)__phys_to_virt(addr)) |
| 145 | #define virt_to_phys(addr) ((unsigned long)__virt_to_phys(addr)) | 143 | #define virt_to_phys(addr) ((unsigned long)__virt_to_phys(addr)) |
| 146 | #define virt_to_bus(addr) ((unsigned long)__virt_to_phys(addr)) | 144 | #define virt_to_bus(addr) ((unsigned long)__virt_to_phys(addr)) |
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index 2dd1d04129e0..de493f86d28f 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h | |||
| @@ -31,6 +31,9 @@ | |||
| 31 | 31 | ||
| 32 | #ifndef __ASSEMBLY__ | 32 | #ifndef __ASSEMBLY__ |
| 33 | 33 | ||
| 34 | /* MS be sure that SLAB allocates aligned objects */ | ||
| 35 | #define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES | ||
| 36 | |||
| 34 | #define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1))) | 37 | #define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1))) |
| 35 | #define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1))) | 38 | #define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1))) |
| 36 | 39 | ||
| @@ -70,14 +73,7 @@ typedef unsigned long pte_basic_t; | |||
| 70 | 73 | ||
| 71 | #endif /* CONFIG_MMU */ | 74 | #endif /* CONFIG_MMU */ |
| 72 | 75 | ||
| 73 | # ifndef CONFIG_MMU | 76 | # define copy_page(to, from) memcpy((to), (from), PAGE_SIZE) |
| 74 | # define copy_page(to, from) memcpy((to), (from), PAGE_SIZE) | ||
| 75 | # define get_user_page(vaddr) __get_free_page(GFP_KERNEL) | ||
| 76 | # define free_user_page(page, addr) free_page(addr) | ||
| 77 | # else /* CONFIG_MMU */ | ||
| 78 | extern void copy_page(void *to, void *from); | ||
| 79 | # endif /* CONFIG_MMU */ | ||
| 80 | |||
| 81 | # define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE) | 77 | # define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE) |
| 82 | 78 | ||
| 83 | # define clear_user_page(pgaddr, vaddr, page) memset((pgaddr), 0, PAGE_SIZE) | 79 | # define clear_user_page(pgaddr, vaddr, page) memset((pgaddr), 0, PAGE_SIZE) |
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index bdd65aaee30d..5a388eeeb28f 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h | |||
| @@ -94,14 +94,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, | |||
| 94 | 94 | ||
| 95 | #define HAVE_PCI_LEGACY 1 | 95 | #define HAVE_PCI_LEGACY 1 |
| 96 | 96 | ||
| 97 | /* pci_unmap_{page,single} is a nop so... */ | ||
| 98 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | ||
| 99 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | ||
| 100 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | ||
| 101 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
| 102 | #define pci_unmap_len(PTR, LEN_NAME) (0) | ||
| 103 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
| 104 | |||
| 105 | /* The PCI address space does equal the physical memory | 97 | /* The PCI address space does equal the physical memory |
| 106 | * address space (no IOMMU). The IDE and SCSI device layers use | 98 | * address space (no IOMMU). The IDE and SCSI device layers use |
| 107 | * this boolean for bounce buffer decisions. | 99 | * this boolean for bounce buffer decisions. |
diff --git a/arch/microblaze/include/asm/pgalloc.h b/arch/microblaze/include/asm/pgalloc.h index f44b0d696fe2..c614a893f8a3 100644 --- a/arch/microblaze/include/asm/pgalloc.h +++ b/arch/microblaze/include/asm/pgalloc.h | |||
| @@ -108,21 +108,7 @@ extern inline void free_pgd_slow(pgd_t *pgd) | |||
| 108 | #define pmd_alloc_one_fast(mm, address) ({ BUG(); ((pmd_t *)1); }) | 108 | #define pmd_alloc_one_fast(mm, address) ({ BUG(); ((pmd_t *)1); }) |
| 109 | #define pmd_alloc_one(mm, address) ({ BUG(); ((pmd_t *)2); }) | 109 | #define pmd_alloc_one(mm, address) ({ BUG(); ((pmd_t *)2); }) |
| 110 | 110 | ||
| 111 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | 111 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); |
| 112 | unsigned long address) | ||
| 113 | { | ||
| 114 | pte_t *pte; | ||
| 115 | extern void *early_get_page(void); | ||
| 116 | if (mem_init_done) { | ||
| 117 | pte = (pte_t *)__get_free_page(GFP_KERNEL | | ||
| 118 | __GFP_REPEAT | __GFP_ZERO); | ||
| 119 | } else { | ||
| 120 | pte = (pte_t *)early_get_page(); | ||
| 121 | if (pte) | ||
| 122 | clear_page(pte); | ||
| 123 | } | ||
| 124 | return pte; | ||
| 125 | } | ||
| 126 | 112 | ||
| 127 | static inline struct page *pte_alloc_one(struct mm_struct *mm, | 113 | static inline struct page *pte_alloc_one(struct mm_struct *mm, |
| 128 | unsigned long address) | 114 | unsigned long address) |
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index dd2bb60651c7..ca2d92871545 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h | |||
| @@ -512,15 +512,6 @@ static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address) | |||
| 512 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 512 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
| 513 | 513 | ||
| 514 | /* | 514 | /* |
| 515 | * When flushing the tlb entry for a page, we also need to flush the hash | ||
| 516 | * table entry. flush_hash_page is assembler (for speed) in hashtable.S. | ||
| 517 | */ | ||
| 518 | extern int flush_hash_page(unsigned context, unsigned long va, pte_t *ptep); | ||
| 519 | |||
| 520 | /* Add an HPTE to the hash table */ | ||
| 521 | extern void add_hash_page(unsigned context, unsigned long va, pte_t *ptep); | ||
| 522 | |||
| 523 | /* | ||
| 524 | * Encode and decode a swap entry. | 515 | * Encode and decode a swap entry. |
| 525 | * Note that the bits we use in a PTE for representing a swap entry | 516 | * Note that the bits we use in a PTE for representing a swap entry |
| 526 | * must not include the _PAGE_PRESENT bit, or the _PAGE_HASHPTE bit | 517 | * must not include the _PAGE_PRESENT bit, or the _PAGE_HASHPTE bit |
| @@ -533,15 +524,7 @@ extern void add_hash_page(unsigned context, unsigned long va, pte_t *ptep); | |||
| 533 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) >> 2 }) | 524 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) >> 2 }) |
| 534 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val << 2 }) | 525 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val << 2 }) |
| 535 | 526 | ||
| 536 | |||
| 537 | /* CONFIG_APUS */ | ||
| 538 | /* For virtual address to physical address conversion */ | ||
| 539 | extern void cache_clear(__u32 addr, int length); | ||
| 540 | extern void cache_push(__u32 addr, int length); | ||
| 541 | extern int mm_end_of_chunk(unsigned long addr, int len); | ||
| 542 | extern unsigned long iopa(unsigned long addr); | 527 | extern unsigned long iopa(unsigned long addr); |
| 543 | /* extern unsigned long mm_ptov(unsigned long addr) \ | ||
| 544 | __attribute__ ((const)); TBD */ | ||
| 545 | 528 | ||
| 546 | /* Values for nocacheflag and cmode */ | 529 | /* Values for nocacheflag and cmode */ |
| 547 | /* These are not used by the APUS kernel_map, but prevents | 530 | /* These are not used by the APUS kernel_map, but prevents |
| @@ -552,18 +535,6 @@ extern unsigned long iopa(unsigned long addr); | |||
| 552 | #define IOMAP_NOCACHE_NONSER 2 | 535 | #define IOMAP_NOCACHE_NONSER 2 |
| 553 | #define IOMAP_NO_COPYBACK 3 | 536 | #define IOMAP_NO_COPYBACK 3 |
| 554 | 537 | ||
| 555 | /* | ||
| 556 | * Map some physical address range into the kernel address space. | ||
| 557 | */ | ||
| 558 | extern unsigned long kernel_map(unsigned long paddr, unsigned long size, | ||
| 559 | int nocacheflag, unsigned long *memavailp); | ||
| 560 | |||
| 561 | /* | ||
| 562 | * Set cache mode of (kernel space) address range. | ||
| 563 | */ | ||
| 564 | extern void kernel_set_cachemode(unsigned long address, unsigned long size, | ||
| 565 | unsigned int cmode); | ||
| 566 | |||
| 567 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ | 538 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ |
| 568 | #define kern_addr_valid(addr) (1) | 539 | #define kern_addr_valid(addr) (1) |
| 569 | 540 | ||
| @@ -577,10 +548,6 @@ extern void kernel_set_cachemode(unsigned long address, unsigned long size, | |||
| 577 | void do_page_fault(struct pt_regs *regs, unsigned long address, | 548 | void do_page_fault(struct pt_regs *regs, unsigned long address, |
| 578 | unsigned long error_code); | 549 | unsigned long error_code); |
| 579 | 550 | ||
| 580 | void __init io_block_mapping(unsigned long virt, phys_addr_t phys, | ||
| 581 | unsigned int size, int flags); | ||
| 582 | |||
| 583 | void __init adjust_total_lowmem(void); | ||
| 584 | void mapin_ram(void); | 551 | void mapin_ram(void); |
| 585 | int map_page(unsigned long va, phys_addr_t pa, int flags); | 552 | int map_page(unsigned long va, phys_addr_t pa, int flags); |
| 586 | 553 | ||
| @@ -601,7 +568,7 @@ void __init *early_get_page(void); | |||
| 601 | extern unsigned long ioremap_bot, ioremap_base; | 568 | extern unsigned long ioremap_bot, ioremap_base; |
| 602 | 569 | ||
| 603 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle); | 570 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle); |
| 604 | void consistent_free(void *vaddr); | 571 | void consistent_free(size_t size, void *vaddr); |
| 605 | void consistent_sync(void *vaddr, size_t size, int direction); | 572 | void consistent_sync(void *vaddr, size_t size, int direction); |
| 606 | void consistent_sync_page(struct page *page, unsigned long offset, | 573 | void consistent_sync_page(struct page *page, unsigned long offset, |
| 607 | size_t size, int direction); | 574 | size_t size, int direction); |
diff --git a/arch/microblaze/kernel/asm-offsets.c b/arch/microblaze/kernel/asm-offsets.c index 0071260a672c..c1b459c97571 100644 --- a/arch/microblaze/kernel/asm-offsets.c +++ b/arch/microblaze/kernel/asm-offsets.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/hardirq.h> | 16 | #include <linux/hardirq.h> |
| 17 | #include <linux/thread_info.h> | 17 | #include <linux/thread_info.h> |
| 18 | #include <linux/kbuild.h> | 18 | #include <linux/kbuild.h> |
| 19 | #include <asm/cpuinfo.h> | ||
| 19 | 20 | ||
| 20 | int main(int argc, char *argv[]) | 21 | int main(int argc, char *argv[]) |
| 21 | { | 22 | { |
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index f04d8a86dead..21c3a92394de 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c | |||
| @@ -96,13 +96,16 @@ static inline void __disable_dcache_nomsr(void) | |||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | 98 | ||
| 99 | /* Helper macro for computing the limits of cache range loops */ | 99 | /* Helper macro for computing the limits of cache range loops |
| 100 | * | ||
| 101 | * End address can be unaligned which is OK for C implementation. | ||
| 102 | * ASM implementation align it in ASM macros | ||
| 103 | */ | ||
| 100 | #define CACHE_LOOP_LIMITS(start, end, cache_line_length, cache_size) \ | 104 | #define CACHE_LOOP_LIMITS(start, end, cache_line_length, cache_size) \ |
| 101 | do { \ | 105 | do { \ |
| 102 | int align = ~(cache_line_length - 1); \ | 106 | int align = ~(cache_line_length - 1); \ |
| 103 | end = min(start + cache_size, end); \ | 107 | end = min(start + cache_size, end); \ |
| 104 | start &= align; \ | 108 | start &= align; \ |
| 105 | end = ((end & align) + cache_line_length); \ | ||
| 106 | } while (0); | 109 | } while (0); |
| 107 | 110 | ||
| 108 | /* | 111 | /* |
| @@ -111,9 +114,9 @@ do { \ | |||
| 111 | */ | 114 | */ |
| 112 | #define CACHE_ALL_LOOP(cache_size, line_length, op) \ | 115 | #define CACHE_ALL_LOOP(cache_size, line_length, op) \ |
| 113 | do { \ | 116 | do { \ |
| 114 | unsigned int len = cache_size; \ | 117 | unsigned int len = cache_size - line_length; \ |
| 115 | int step = -line_length; \ | 118 | int step = -line_length; \ |
| 116 | BUG_ON(step >= 0); \ | 119 | WARN_ON(step >= 0); \ |
| 117 | \ | 120 | \ |
| 118 | __asm__ __volatile__ (" 1: " #op " %0, r0; \ | 121 | __asm__ __volatile__ (" 1: " #op " %0, r0; \ |
| 119 | bgtid %0, 1b; \ | 122 | bgtid %0, 1b; \ |
| @@ -122,26 +125,21 @@ do { \ | |||
| 122 | : "memory"); \ | 125 | : "memory"); \ |
| 123 | } while (0); | 126 | } while (0); |
| 124 | 127 | ||
| 125 | 128 | /* Used for wdc.flush/clear which can use rB for offset which is not possible | |
| 126 | #define CACHE_ALL_LOOP2(cache_size, line_length, op) \ | 129 | * to use for simple wdc or wic. |
| 127 | do { \ | 130 | * |
| 128 | unsigned int len = cache_size; \ | 131 | * start address is cache aligned |
| 129 | int step = -line_length; \ | 132 | * end address is not aligned, if end is aligned then I have to substract |
| 130 | BUG_ON(step >= 0); \ | 133 | * cacheline length because I can't flush/invalidate the next cacheline. |
| 131 | \ | 134 | * If is not, I align it because I will flush/invalidate whole line. |
| 132 | __asm__ __volatile__ (" 1: " #op " r0, %0; \ | 135 | */ |
| 133 | bgtid %0, 1b; \ | ||
| 134 | addk %0, %0, %1; \ | ||
| 135 | " : : "r" (len), "r" (step) \ | ||
| 136 | : "memory"); \ | ||
| 137 | } while (0); | ||
| 138 | |||
| 139 | /* for wdc.flush/clear */ | ||
| 140 | #define CACHE_RANGE_LOOP_2(start, end, line_length, op) \ | 136 | #define CACHE_RANGE_LOOP_2(start, end, line_length, op) \ |
| 141 | do { \ | 137 | do { \ |
| 142 | int step = -line_length; \ | 138 | int step = -line_length; \ |
| 139 | int align = ~(line_length - 1); \ | ||
| 140 | end = ((end & align) == end) ? end - line_length : end & align; \ | ||
| 143 | int count = end - start; \ | 141 | int count = end - start; \ |
| 144 | BUG_ON(count <= 0); \ | 142 | WARN_ON(count < 0); \ |
| 145 | \ | 143 | \ |
| 146 | __asm__ __volatile__ (" 1: " #op " %0, %1; \ | 144 | __asm__ __volatile__ (" 1: " #op " %0, %1; \ |
| 147 | bgtid %1, 1b; \ | 145 | bgtid %1, 1b; \ |
| @@ -154,7 +152,9 @@ do { \ | |||
| 154 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ | 152 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ |
| 155 | do { \ | 153 | do { \ |
| 156 | int volatile temp; \ | 154 | int volatile temp; \ |
| 157 | BUG_ON(end - start <= 0); \ | 155 | int align = ~(line_length - 1); \ |
| 156 | end = ((end & align) == end) ? end - line_length : end & align; \ | ||
| 157 | WARN_ON(end - start < 0); \ | ||
| 158 | \ | 158 | \ |
| 159 | __asm__ __volatile__ (" 1: " #op " %1, r0; \ | 159 | __asm__ __volatile__ (" 1: " #op " %1, r0; \ |
| 160 | cmpu %0, %1, %2; \ | 160 | cmpu %0, %1, %2; \ |
| @@ -360,8 +360,12 @@ static void __invalidate_dcache_all_noirq_wt(void) | |||
| 360 | #endif | 360 | #endif |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | /* FIXME this is weird - should be only wdc but not work | 363 | /* FIXME It is blindly invalidation as is expected |
| 364 | * MS: I am getting bus errors and other weird things */ | 364 | * but can't be called on noMMU in microblaze_cache_init below |
| 365 | * | ||
| 366 | * MS: noMMU kernel won't boot if simple wdc is used | ||
| 367 | * The reason should be that there are discared data which kernel needs | ||
| 368 | */ | ||
| 365 | static void __invalidate_dcache_all_wb(void) | 369 | static void __invalidate_dcache_all_wb(void) |
| 366 | { | 370 | { |
| 367 | #ifndef ASM_LOOP | 371 | #ifndef ASM_LOOP |
| @@ -369,12 +373,12 @@ static void __invalidate_dcache_all_wb(void) | |||
| 369 | #endif | 373 | #endif |
| 370 | pr_debug("%s\n", __func__); | 374 | pr_debug("%s\n", __func__); |
| 371 | #ifdef ASM_LOOP | 375 | #ifdef ASM_LOOP |
| 372 | CACHE_ALL_LOOP2(cpuinfo.dcache_size, cpuinfo.dcache_line_length, | 376 | CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, |
| 373 | wdc.clear) | 377 | wdc) |
| 374 | #else | 378 | #else |
| 375 | for (i = 0; i < cpuinfo.dcache_size; | 379 | for (i = 0; i < cpuinfo.dcache_size; |
| 376 | i += cpuinfo.dcache_line_length) | 380 | i += cpuinfo.dcache_line_length) |
| 377 | __asm__ __volatile__ ("wdc.clear %0, r0;" \ | 381 | __asm__ __volatile__ ("wdc %0, r0;" \ |
| 378 | : : "r" (i)); | 382 | : : "r" (i)); |
| 379 | #endif | 383 | #endif |
| 380 | } | 384 | } |
| @@ -393,7 +397,7 @@ static void __invalidate_dcache_range_wb(unsigned long start, | |||
| 393 | #ifdef ASM_LOOP | 397 | #ifdef ASM_LOOP |
| 394 | CACHE_RANGE_LOOP_2(start, end, cpuinfo.dcache_line_length, wdc.clear); | 398 | CACHE_RANGE_LOOP_2(start, end, cpuinfo.dcache_line_length, wdc.clear); |
| 395 | #else | 399 | #else |
| 396 | for (i = start; i < end; i += cpuinfo.icache_line_length) | 400 | for (i = start; i < end; i += cpuinfo.dcache_line_length) |
| 397 | __asm__ __volatile__ ("wdc.clear %0, r0;" \ | 401 | __asm__ __volatile__ ("wdc.clear %0, r0;" \ |
| 398 | : : "r" (i)); | 402 | : : "r" (i)); |
| 399 | #endif | 403 | #endif |
| @@ -413,7 +417,7 @@ static void __invalidate_dcache_range_nomsr_wt(unsigned long start, | |||
| 413 | #ifdef ASM_LOOP | 417 | #ifdef ASM_LOOP |
| 414 | CACHE_RANGE_LOOP_1(start, end, cpuinfo.dcache_line_length, wdc); | 418 | CACHE_RANGE_LOOP_1(start, end, cpuinfo.dcache_line_length, wdc); |
| 415 | #else | 419 | #else |
| 416 | for (i = start; i < end; i += cpuinfo.icache_line_length) | 420 | for (i = start; i < end; i += cpuinfo.dcache_line_length) |
| 417 | __asm__ __volatile__ ("wdc %0, r0;" \ | 421 | __asm__ __volatile__ ("wdc %0, r0;" \ |
| 418 | : : "r" (i)); | 422 | : : "r" (i)); |
| 419 | #endif | 423 | #endif |
| @@ -437,7 +441,7 @@ static void __invalidate_dcache_range_msr_irq_wt(unsigned long start, | |||
| 437 | #ifdef ASM_LOOP | 441 | #ifdef ASM_LOOP |
| 438 | CACHE_RANGE_LOOP_1(start, end, cpuinfo.dcache_line_length, wdc); | 442 | CACHE_RANGE_LOOP_1(start, end, cpuinfo.dcache_line_length, wdc); |
| 439 | #else | 443 | #else |
| 440 | for (i = start; i < end; i += cpuinfo.icache_line_length) | 444 | for (i = start; i < end; i += cpuinfo.dcache_line_length) |
| 441 | __asm__ __volatile__ ("wdc %0, r0;" \ | 445 | __asm__ __volatile__ ("wdc %0, r0;" \ |
| 442 | : : "r" (i)); | 446 | : : "r" (i)); |
| 443 | #endif | 447 | #endif |
| @@ -465,7 +469,7 @@ static void __invalidate_dcache_range_nomsr_irq(unsigned long start, | |||
| 465 | #ifdef ASM_LOOP | 469 | #ifdef ASM_LOOP |
| 466 | CACHE_RANGE_LOOP_1(start, end, cpuinfo.dcache_line_length, wdc); | 470 | CACHE_RANGE_LOOP_1(start, end, cpuinfo.dcache_line_length, wdc); |
| 467 | #else | 471 | #else |
| 468 | for (i = start; i < end; i += cpuinfo.icache_line_length) | 472 | for (i = start; i < end; i += cpuinfo.dcache_line_length) |
| 469 | __asm__ __volatile__ ("wdc %0, r0;" \ | 473 | __asm__ __volatile__ ("wdc %0, r0;" \ |
| 470 | : : "r" (i)); | 474 | : : "r" (i)); |
| 471 | #endif | 475 | #endif |
| @@ -504,7 +508,7 @@ static void __flush_dcache_range_wb(unsigned long start, unsigned long end) | |||
| 504 | #ifdef ASM_LOOP | 508 | #ifdef ASM_LOOP |
| 505 | CACHE_RANGE_LOOP_2(start, end, cpuinfo.dcache_line_length, wdc.flush); | 509 | CACHE_RANGE_LOOP_2(start, end, cpuinfo.dcache_line_length, wdc.flush); |
| 506 | #else | 510 | #else |
| 507 | for (i = start; i < end; i += cpuinfo.icache_line_length) | 511 | for (i = start; i < end; i += cpuinfo.dcache_line_length) |
| 508 | __asm__ __volatile__ ("wdc.flush %0, r0;" \ | 512 | __asm__ __volatile__ ("wdc.flush %0, r0;" \ |
| 509 | : : "r" (i)); | 513 | : : "r" (i)); |
| 510 | #endif | 514 | #endif |
| @@ -650,7 +654,11 @@ void microblaze_cache_init(void) | |||
| 650 | } | 654 | } |
| 651 | } | 655 | } |
| 652 | } | 656 | } |
| 653 | invalidate_dcache(); | 657 | /* FIXME Invalidation is done in U-BOOT |
| 658 | * WT cache: Data is already written to main memory | ||
| 659 | * WB cache: Discard data on noMMU which caused that kernel doesn't boot | ||
| 660 | */ | ||
| 661 | /* invalidate_dcache(); */ | ||
| 654 | enable_dcache(); | 662 | enable_dcache(); |
| 655 | 663 | ||
| 656 | invalidate_icache(); | 664 | invalidate_icache(); |
diff --git a/arch/microblaze/kernel/cpu/mb.c b/arch/microblaze/kernel/cpu/mb.c index 0c912b2a8e03..4216eb1eaa32 100644 --- a/arch/microblaze/kernel/cpu/mb.c +++ b/arch/microblaze/kernel/cpu/mb.c | |||
| @@ -98,15 +98,17 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 98 | 98 | ||
| 99 | if (cpuinfo.use_icache) | 99 | if (cpuinfo.use_icache) |
| 100 | count += seq_printf(m, | 100 | count += seq_printf(m, |
| 101 | "Icache:\t\t%ukB\n", | 101 | "Icache:\t\t%ukB\tline length:\t%dB\n", |
| 102 | cpuinfo.icache_size >> 10); | 102 | cpuinfo.icache_size >> 10, |
| 103 | cpuinfo.icache_line_length); | ||
| 103 | else | 104 | else |
| 104 | count += seq_printf(m, "Icache:\t\tno\n"); | 105 | count += seq_printf(m, "Icache:\t\tno\n"); |
| 105 | 106 | ||
| 106 | if (cpuinfo.use_dcache) { | 107 | if (cpuinfo.use_dcache) { |
| 107 | count += seq_printf(m, | 108 | count += seq_printf(m, |
| 108 | "Dcache:\t\t%ukB\n", | 109 | "Dcache:\t\t%ukB\tline length:\t%dB\n", |
| 109 | cpuinfo.dcache_size >> 10); | 110 | cpuinfo.dcache_size >> 10, |
| 111 | cpuinfo.dcache_line_length); | ||
| 110 | if (cpuinfo.dcache_wb) | 112 | if (cpuinfo.dcache_wb) |
| 111 | count += seq_printf(m, "\t\twrite-back\n"); | 113 | count += seq_printf(m, "\t\twrite-back\n"); |
| 112 | else | 114 | else |
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c index ce72dd4967cf..9dcd90b5df55 100644 --- a/arch/microblaze/kernel/dma.c +++ b/arch/microblaze/kernel/dma.c | |||
| @@ -74,7 +74,7 @@ static void dma_direct_free_coherent(struct device *dev, size_t size, | |||
| 74 | void *vaddr, dma_addr_t dma_handle) | 74 | void *vaddr, dma_addr_t dma_handle) |
| 75 | { | 75 | { |
| 76 | #ifdef NOT_COHERENT_CACHE | 76 | #ifdef NOT_COHERENT_CACHE |
| 77 | consistent_free(vaddr); | 77 | consistent_free(size, vaddr); |
| 78 | #else | 78 | #else |
| 79 | free_pages((unsigned long)vaddr, get_order(size)); | 79 | free_pages((unsigned long)vaddr, get_order(size)); |
| 80 | #endif | 80 | #endif |
diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c index d9f70f83097f..02cbdfe5aa8d 100644 --- a/arch/microblaze/kernel/exceptions.c +++ b/arch/microblaze/kernel/exceptions.c | |||
| @@ -121,7 +121,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type, | |||
| 121 | } | 121 | } |
| 122 | printk(KERN_WARNING "Divide by zero exception " \ | 122 | printk(KERN_WARNING "Divide by zero exception " \ |
| 123 | "in kernel mode.\n"); | 123 | "in kernel mode.\n"); |
| 124 | die("Divide by exception", regs, SIGBUS); | 124 | die("Divide by zero exception", regs, SIGBUS); |
| 125 | break; | 125 | break; |
| 126 | case MICROBLAZE_FPU_EXCEPTION: | 126 | case MICROBLAZE_FPU_EXCEPTION: |
| 127 | pr_debug(KERN_WARNING "FPU exception\n"); | 127 | pr_debug(KERN_WARNING "FPU exception\n"); |
diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S index da6a5f5dc766..1bf739888260 100644 --- a/arch/microblaze/kernel/head.S +++ b/arch/microblaze/kernel/head.S | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | * for more details. | 28 | * for more details. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/init.h> | ||
| 31 | #include <linux/linkage.h> | 32 | #include <linux/linkage.h> |
| 32 | #include <asm/thread_info.h> | 33 | #include <asm/thread_info.h> |
| 33 | #include <asm/page.h> | 34 | #include <asm/page.h> |
| @@ -49,7 +50,7 @@ swapper_pg_dir: | |||
| 49 | 50 | ||
| 50 | #endif /* CONFIG_MMU */ | 51 | #endif /* CONFIG_MMU */ |
| 51 | 52 | ||
| 52 | .text | 53 | __HEAD |
| 53 | ENTRY(_start) | 54 | ENTRY(_start) |
| 54 | #if CONFIG_KERNEL_BASE_ADDR == 0 | 55 | #if CONFIG_KERNEL_BASE_ADDR == 0 |
| 55 | brai TOPHYS(real_start) | 56 | brai TOPHYS(real_start) |
diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index 6f39e2c001f3..8f120aca123d 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/ftrace.h> | ||
| 12 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 13 | #include <linux/hardirq.h> | 14 | #include <linux/hardirq.h> |
| 14 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| @@ -32,7 +33,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); | |||
| 32 | 33 | ||
| 33 | static u32 concurrent_irq; | 34 | static u32 concurrent_irq; |
| 34 | 35 | ||
| 35 | void do_IRQ(struct pt_regs *regs) | 36 | void __irq_entry do_IRQ(struct pt_regs *regs) |
| 36 | { | 37 | { |
| 37 | unsigned int irq; | 38 | unsigned int irq; |
| 38 | struct pt_regs *old_regs = set_irq_regs(regs); | 39 | struct pt_regs *old_regs = set_irq_regs(regs); |
diff --git a/arch/microblaze/kernel/misc.S b/arch/microblaze/kernel/misc.S index 7cf86498326c..0fb5fc6c1fc2 100644 --- a/arch/microblaze/kernel/misc.S +++ b/arch/microblaze/kernel/misc.S | |||
| @@ -93,39 +93,3 @@ early_console_reg_tlb_alloc: | |||
| 93 | nop | 93 | nop |
| 94 | 94 | ||
| 95 | .size early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc | 95 | .size early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc |
| 96 | |||
| 97 | /* | ||
| 98 | * Copy a whole page (4096 bytes). | ||
| 99 | */ | ||
| 100 | #define COPY_16_BYTES \ | ||
| 101 | lwi r7, r6, 0; \ | ||
| 102 | lwi r8, r6, 4; \ | ||
| 103 | lwi r9, r6, 8; \ | ||
| 104 | lwi r10, r6, 12; \ | ||
| 105 | swi r7, r5, 0; \ | ||
| 106 | swi r8, r5, 4; \ | ||
| 107 | swi r9, r5, 8; \ | ||
| 108 | swi r10, r5, 12 | ||
| 109 | |||
| 110 | |||
| 111 | /* FIXME DCACHE_LINE_BYTES (CONFIG_XILINX_MICROBLAZE0_DCACHE_LINE_LEN * 4)*/ | ||
| 112 | #define DCACHE_LINE_BYTES (4 * 4) | ||
| 113 | |||
| 114 | .globl copy_page; | ||
| 115 | .type copy_page, @function | ||
| 116 | .align 4; | ||
| 117 | copy_page: | ||
| 118 | ori r11, r0, (PAGE_SIZE/DCACHE_LINE_BYTES) - 1 | ||
| 119 | _copy_page_loop: | ||
| 120 | COPY_16_BYTES | ||
| 121 | #if DCACHE_LINE_BYTES >= 32 | ||
| 122 | COPY_16_BYTES | ||
| 123 | #endif | ||
| 124 | addik r6, r6, DCACHE_LINE_BYTES | ||
| 125 | addik r5, r5, DCACHE_LINE_BYTES | ||
| 126 | bneid r11, _copy_page_loop | ||
| 127 | addik r11, r11, -1 | ||
| 128 | rtsd r15, 8 | ||
| 129 | nop | ||
| 130 | |||
| 131 | .size copy_page, . - copy_page | ||
diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c index 5e4570ef515c..75e49202a5ed 100644 --- a/arch/microblaze/kernel/traps.c +++ b/arch/microblaze/kernel/traps.c | |||
| @@ -95,37 +95,3 @@ void dump_stack(void) | |||
| 95 | show_stack(NULL, NULL); | 95 | show_stack(NULL, NULL); |
| 96 | } | 96 | } |
| 97 | EXPORT_SYMBOL(dump_stack); | 97 | EXPORT_SYMBOL(dump_stack); |
| 98 | |||
| 99 | #ifdef CONFIG_MMU | ||
| 100 | void __bug(const char *file, int line, void *data) | ||
| 101 | { | ||
| 102 | if (data) | ||
| 103 | printk(KERN_CRIT "kernel BUG at %s:%d (data = %p)!\n", | ||
| 104 | file, line, data); | ||
| 105 | else | ||
| 106 | printk(KERN_CRIT "kernel BUG at %s:%d!\n", file, line); | ||
| 107 | |||
| 108 | machine_halt(); | ||
| 109 | } | ||
| 110 | |||
| 111 | int bad_trap(int trap_num, struct pt_regs *regs) | ||
| 112 | { | ||
| 113 | printk(KERN_CRIT | ||
| 114 | "unimplemented trap %d called at 0x%08lx, pid %d!\n", | ||
| 115 | trap_num, regs->pc, current->pid); | ||
| 116 | return -ENOSYS; | ||
| 117 | } | ||
| 118 | |||
| 119 | int debug_trap(struct pt_regs *regs) | ||
| 120 | { | ||
| 121 | int i; | ||
| 122 | printk(KERN_CRIT "debug trap\n"); | ||
| 123 | for (i = 0; i < 32; i++) { | ||
| 124 | /* printk("r%i:%08X\t",i,regs->gpr[i]); */ | ||
| 125 | if ((i % 4) == 3) | ||
| 126 | printk(KERN_CRIT "\n"); | ||
| 127 | } | ||
| 128 | printk(KERN_CRIT "pc:%08lX\tmsr:%08lX\n", regs->pc, regs->msr); | ||
| 129 | return -ENOSYS; | ||
| 130 | } | ||
| 131 | #endif | ||
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S index 5ef619aad634..db72d7124602 100644 --- a/arch/microblaze/kernel/vmlinux.lds.S +++ b/arch/microblaze/kernel/vmlinux.lds.S | |||
| @@ -24,7 +24,8 @@ SECTIONS { | |||
| 24 | .text : AT(ADDR(.text) - LOAD_OFFSET) { | 24 | .text : AT(ADDR(.text) - LOAD_OFFSET) { |
| 25 | _text = . ; | 25 | _text = . ; |
| 26 | _stext = . ; | 26 | _stext = . ; |
| 27 | *(.text .text.*) | 27 | HEAD_TEXT |
| 28 | TEXT_TEXT | ||
| 28 | *(.fixup) | 29 | *(.fixup) |
| 29 | EXIT_TEXT | 30 | EXIT_TEXT |
| 30 | EXIT_CALL | 31 | EXIT_CALL |
diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c index f956e24fe49c..5a59dad62bd2 100644 --- a/arch/microblaze/mm/consistent.c +++ b/arch/microblaze/mm/consistent.c | |||
| @@ -42,11 +42,12 @@ | |||
| 42 | #include <linux/uaccess.h> | 42 | #include <linux/uaccess.h> |
| 43 | #include <asm/pgtable.h> | 43 | #include <asm/pgtable.h> |
| 44 | #include <asm/cpuinfo.h> | 44 | #include <asm/cpuinfo.h> |
| 45 | #include <asm/tlbflush.h> | ||
| 45 | 46 | ||
| 46 | #ifndef CONFIG_MMU | 47 | #ifndef CONFIG_MMU |
| 47 | |||
| 48 | /* I have to use dcache values because I can't relate on ram size */ | 48 | /* I have to use dcache values because I can't relate on ram size */ |
| 49 | #define UNCACHED_SHADOW_MASK (cpuinfo.dcache_high - cpuinfo.dcache_base + 1) | 49 | # define UNCACHED_SHADOW_MASK (cpuinfo.dcache_high - cpuinfo.dcache_base + 1) |
| 50 | #endif | ||
| 50 | 51 | ||
| 51 | /* | 52 | /* |
| 52 | * Consistent memory allocators. Used for DMA devices that want to | 53 | * Consistent memory allocators. Used for DMA devices that want to |
| @@ -60,71 +61,16 @@ | |||
| 60 | */ | 61 | */ |
| 61 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) | 62 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) |
| 62 | { | 63 | { |
| 63 | struct page *page, *end, *free; | 64 | unsigned long order, vaddr; |
| 64 | unsigned long order; | 65 | void *ret; |
| 65 | void *ret, *virt; | 66 | unsigned int i, err = 0; |
| 66 | 67 | struct page *page, *end; | |
| 67 | if (in_interrupt()) | ||
| 68 | BUG(); | ||
| 69 | |||
| 70 | size = PAGE_ALIGN(size); | ||
| 71 | order = get_order(size); | ||
| 72 | |||
| 73 | page = alloc_pages(gfp, order); | ||
| 74 | if (!page) | ||
| 75 | goto no_page; | ||
| 76 | |||
| 77 | /* We could do with a page_to_phys and page_to_bus here. */ | ||
| 78 | virt = page_address(page); | ||
| 79 | ret = ioremap(virt_to_phys(virt), size); | ||
| 80 | if (!ret) | ||
| 81 | goto no_remap; | ||
| 82 | |||
| 83 | /* | ||
| 84 | * Here's the magic! Note if the uncached shadow is not implemented, | ||
| 85 | * it's up to the calling code to also test that condition and make | ||
| 86 | * other arranegments, such as manually flushing the cache and so on. | ||
| 87 | */ | ||
| 88 | #ifdef CONFIG_XILINX_UNCACHED_SHADOW | ||
| 89 | ret = (void *)((unsigned) ret | UNCACHED_SHADOW_MASK); | ||
| 90 | #endif | ||
| 91 | /* dma_handle is same as physical (shadowed) address */ | ||
| 92 | *dma_handle = (dma_addr_t)ret; | ||
| 93 | |||
| 94 | /* | ||
| 95 | * free wasted pages. We skip the first page since we know | ||
| 96 | * that it will have count = 1 and won't require freeing. | ||
| 97 | * We also mark the pages in use as reserved so that | ||
| 98 | * remap_page_range works. | ||
| 99 | */ | ||
| 100 | page = virt_to_page(virt); | ||
| 101 | free = page + (size >> PAGE_SHIFT); | ||
| 102 | end = page + (1 << order); | ||
| 103 | |||
| 104 | for (; page < end; page++) { | ||
| 105 | init_page_count(page); | ||
| 106 | if (page >= free) | ||
| 107 | __free_page(page); | ||
| 108 | else | ||
| 109 | SetPageReserved(page); | ||
| 110 | } | ||
| 111 | |||
| 112 | return ret; | ||
| 113 | no_remap: | ||
| 114 | __free_pages(page, order); | ||
| 115 | no_page: | ||
| 116 | return NULL; | ||
| 117 | } | ||
| 118 | |||
| 119 | #else | ||
| 120 | 68 | ||
| 121 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) | 69 | #ifdef CONFIG_MMU |
| 122 | { | ||
| 123 | int order, err, i; | ||
| 124 | unsigned long page, va, flags; | ||
| 125 | phys_addr_t pa; | 70 | phys_addr_t pa; |
| 126 | struct vm_struct *area; | 71 | struct vm_struct *area; |
| 127 | void *ret; | 72 | unsigned long va; |
| 73 | #endif | ||
| 128 | 74 | ||
| 129 | if (in_interrupt()) | 75 | if (in_interrupt()) |
| 130 | BUG(); | 76 | BUG(); |
| @@ -133,71 +79,133 @@ void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) | |||
| 133 | size = PAGE_ALIGN(size); | 79 | size = PAGE_ALIGN(size); |
| 134 | order = get_order(size); | 80 | order = get_order(size); |
| 135 | 81 | ||
| 136 | page = __get_free_pages(gfp, order); | 82 | vaddr = __get_free_pages(gfp, order); |
| 137 | if (!page) { | 83 | if (!vaddr) |
| 138 | BUG(); | ||
| 139 | return NULL; | 84 | return NULL; |
| 140 | } | ||
| 141 | 85 | ||
| 142 | /* | 86 | /* |
| 143 | * we need to ensure that there are no cachelines in use, | 87 | * we need to ensure that there are no cachelines in use, |
| 144 | * or worse dirty in this area. | 88 | * or worse dirty in this area. |
| 145 | */ | 89 | */ |
| 146 | flush_dcache_range(virt_to_phys(page), virt_to_phys(page) + size); | 90 | flush_dcache_range(virt_to_phys((void *)vaddr), |
| 91 | virt_to_phys((void *)vaddr) + size); | ||
| 147 | 92 | ||
| 93 | #ifndef CONFIG_MMU | ||
| 94 | ret = (void *)vaddr; | ||
| 95 | /* | ||
| 96 | * Here's the magic! Note if the uncached shadow is not implemented, | ||
| 97 | * it's up to the calling code to also test that condition and make | ||
| 98 | * other arranegments, such as manually flushing the cache and so on. | ||
| 99 | */ | ||
| 100 | # ifdef CONFIG_XILINX_UNCACHED_SHADOW | ||
| 101 | ret = (void *)((unsigned) ret | UNCACHED_SHADOW_MASK); | ||
| 102 | # endif | ||
| 103 | if ((unsigned int)ret > cpuinfo.dcache_base && | ||
| 104 | (unsigned int)ret < cpuinfo.dcache_high) | ||
| 105 | printk(KERN_WARNING | ||
| 106 | "ERROR: Your cache coherent area is CACHED!!!\n"); | ||
| 107 | |||
| 108 | /* dma_handle is same as physical (shadowed) address */ | ||
| 109 | *dma_handle = (dma_addr_t)ret; | ||
| 110 | #else | ||
| 148 | /* Allocate some common virtual space to map the new pages. */ | 111 | /* Allocate some common virtual space to map the new pages. */ |
| 149 | area = get_vm_area(size, VM_ALLOC); | 112 | area = get_vm_area(size, VM_ALLOC); |
| 150 | if (area == NULL) { | 113 | if (!area) { |
| 151 | free_pages(page, order); | 114 | free_pages(vaddr, order); |
| 152 | return NULL; | 115 | return NULL; |
| 153 | } | 116 | } |
| 154 | va = (unsigned long) area->addr; | 117 | va = (unsigned long) area->addr; |
| 155 | ret = (void *)va; | 118 | ret = (void *)va; |
| 156 | 119 | ||
| 157 | /* This gives us the real physical address of the first page. */ | 120 | /* This gives us the real physical address of the first page. */ |
| 158 | *dma_handle = pa = virt_to_bus((void *)page); | 121 | *dma_handle = pa = virt_to_bus((void *)vaddr); |
| 159 | 122 | #endif | |
| 160 | /* MS: This is the whole magic - use cache inhibit pages */ | ||
| 161 | flags = _PAGE_KERNEL | _PAGE_NO_CACHE; | ||
| 162 | 123 | ||
| 163 | /* | 124 | /* |
| 164 | * Set refcount=1 on all pages in an order>0 | 125 | * free wasted pages. We skip the first page since we know |
| 165 | * allocation so that vfree() will actually | 126 | * that it will have count = 1 and won't require freeing. |
| 166 | * free all pages that were allocated. | 127 | * We also mark the pages in use as reserved so that |
| 128 | * remap_page_range works. | ||
| 167 | */ | 129 | */ |
| 168 | if (order > 0) { | 130 | page = virt_to_page(vaddr); |
| 169 | struct page *rpage = virt_to_page(page); | 131 | end = page + (1 << order); |
| 170 | for (i = 1; i < (1 << order); i++) | 132 | |
| 171 | init_page_count(rpage+i); | 133 | split_page(page, order); |
| 134 | |||
| 135 | for (i = 0; i < size && err == 0; i += PAGE_SIZE) { | ||
| 136 | #ifdef CONFIG_MMU | ||
| 137 | /* MS: This is the whole magic - use cache inhibit pages */ | ||
| 138 | err = map_page(va + i, pa + i, _PAGE_KERNEL | _PAGE_NO_CACHE); | ||
| 139 | #endif | ||
| 140 | |||
| 141 | SetPageReserved(page); | ||
| 142 | page++; | ||
| 172 | } | 143 | } |
| 173 | 144 | ||
| 174 | err = 0; | 145 | /* Free the otherwise unused pages. */ |
| 175 | for (i = 0; i < size && err == 0; i += PAGE_SIZE) | 146 | while (page < end) { |
| 176 | err = map_page(va+i, pa+i, flags); | 147 | __free_page(page); |
| 148 | page++; | ||
| 149 | } | ||
| 177 | 150 | ||
| 178 | if (err) { | 151 | if (err) { |
| 179 | vfree((void *)va); | 152 | free_pages(vaddr, order); |
| 180 | return NULL; | 153 | return NULL; |
| 181 | } | 154 | } |
| 182 | 155 | ||
| 183 | return ret; | 156 | return ret; |
| 184 | } | 157 | } |
| 185 | #endif /* CONFIG_MMU */ | ||
| 186 | EXPORT_SYMBOL(consistent_alloc); | 158 | EXPORT_SYMBOL(consistent_alloc); |
| 187 | 159 | ||
| 188 | /* | 160 | /* |
| 189 | * free page(s) as defined by the above mapping. | 161 | * free page(s) as defined by the above mapping. |
| 190 | */ | 162 | */ |
| 191 | void consistent_free(void *vaddr) | 163 | void consistent_free(size_t size, void *vaddr) |
| 192 | { | 164 | { |
| 165 | struct page *page; | ||
| 166 | |||
| 193 | if (in_interrupt()) | 167 | if (in_interrupt()) |
| 194 | BUG(); | 168 | BUG(); |
| 195 | 169 | ||
| 170 | size = PAGE_ALIGN(size); | ||
| 171 | |||
| 172 | #ifndef CONFIG_MMU | ||
| 196 | /* Clear SHADOW_MASK bit in address, and free as per usual */ | 173 | /* Clear SHADOW_MASK bit in address, and free as per usual */ |
| 197 | #ifdef CONFIG_XILINX_UNCACHED_SHADOW | 174 | # ifdef CONFIG_XILINX_UNCACHED_SHADOW |
| 198 | vaddr = (void *)((unsigned)vaddr & ~UNCACHED_SHADOW_MASK); | 175 | vaddr = (void *)((unsigned)vaddr & ~UNCACHED_SHADOW_MASK); |
| 176 | # endif | ||
| 177 | page = virt_to_page(vaddr); | ||
| 178 | |||
| 179 | do { | ||
| 180 | ClearPageReserved(page); | ||
| 181 | __free_page(page); | ||
| 182 | page++; | ||
| 183 | } while (size -= PAGE_SIZE); | ||
| 184 | #else | ||
| 185 | do { | ||
| 186 | pte_t *ptep; | ||
| 187 | unsigned long pfn; | ||
| 188 | |||
| 189 | ptep = pte_offset_kernel(pmd_offset(pgd_offset_k( | ||
| 190 | (unsigned int)vaddr), | ||
| 191 | (unsigned int)vaddr), | ||
| 192 | (unsigned int)vaddr); | ||
| 193 | if (!pte_none(*ptep) && pte_present(*ptep)) { | ||
| 194 | pfn = pte_pfn(*ptep); | ||
| 195 | pte_clear(&init_mm, (unsigned int)vaddr, ptep); | ||
| 196 | if (pfn_valid(pfn)) { | ||
| 197 | page = pfn_to_page(pfn); | ||
| 198 | |||
| 199 | ClearPageReserved(page); | ||
| 200 | __free_page(page); | ||
| 201 | } | ||
| 202 | } | ||
| 203 | vaddr += PAGE_SIZE; | ||
| 204 | } while (size -= PAGE_SIZE); | ||
| 205 | |||
| 206 | /* flush tlb */ | ||
| 207 | flush_tlb_all(); | ||
| 199 | #endif | 208 | #endif |
| 200 | vfree(vaddr); | ||
| 201 | } | 209 | } |
| 202 | EXPORT_SYMBOL(consistent_free); | 210 | EXPORT_SYMBOL(consistent_free); |
| 203 | 211 | ||
| @@ -221,7 +229,7 @@ void consistent_sync(void *vaddr, size_t size, int direction) | |||
| 221 | case PCI_DMA_NONE: | 229 | case PCI_DMA_NONE: |
| 222 | BUG(); | 230 | BUG(); |
| 223 | case PCI_DMA_FROMDEVICE: /* invalidate only */ | 231 | case PCI_DMA_FROMDEVICE: /* invalidate only */ |
| 224 | flush_dcache_range(start, end); | 232 | invalidate_dcache_range(start, end); |
| 225 | break; | 233 | break; |
| 226 | case PCI_DMA_TODEVICE: /* writeback only */ | 234 | case PCI_DMA_TODEVICE: /* writeback only */ |
| 227 | flush_dcache_range(start, end); | 235 | flush_dcache_range(start, end); |
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index 7af87f4b2c2c..bab922993185 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c | |||
| @@ -273,16 +273,11 @@ bad_area_nosemaphore: | |||
| 273 | * us unable to handle the page fault gracefully. | 273 | * us unable to handle the page fault gracefully. |
| 274 | */ | 274 | */ |
| 275 | out_of_memory: | 275 | out_of_memory: |
| 276 | if (current->pid == 1) { | ||
| 277 | yield(); | ||
| 278 | down_read(&mm->mmap_sem); | ||
| 279 | goto survive; | ||
| 280 | } | ||
| 281 | up_read(&mm->mmap_sem); | 276 | up_read(&mm->mmap_sem); |
| 282 | printk(KERN_WARNING "VM: killing process %s\n", current->comm); | 277 | if (!user_mode(regs)) |
| 283 | if (user_mode(regs)) | 278 | bad_page_fault(regs, address, SIGKILL); |
| 284 | do_exit(SIGKILL); | 279 | else |
| 285 | bad_page_fault(regs, address, SIGKILL); | 280 | pagefault_out_of_memory(); |
| 286 | return; | 281 | return; |
| 287 | 282 | ||
| 288 | do_sigbus: | 283 | do_sigbus: |
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c index d31312cde6ea..784557fb28cf 100644 --- a/arch/microblaze/mm/pgtable.c +++ b/arch/microblaze/mm/pgtable.c | |||
| @@ -161,24 +161,6 @@ int map_page(unsigned long va, phys_addr_t pa, int flags) | |||
| 161 | return err; | 161 | return err; |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | void __init adjust_total_lowmem(void) | ||
| 165 | { | ||
| 166 | /* TBD */ | ||
| 167 | #if 0 | ||
| 168 | unsigned long max_low_mem = MAX_LOW_MEM; | ||
| 169 | |||
| 170 | if (total_lowmem > max_low_mem) { | ||
| 171 | total_lowmem = max_low_mem; | ||
| 172 | #ifndef CONFIG_HIGHMEM | ||
| 173 | printk(KERN_INFO "Warning, memory limited to %ld Mb, use " | ||
| 174 | "CONFIG_HIGHMEM to reach %ld Mb\n", | ||
| 175 | max_low_mem >> 20, total_memory >> 20); | ||
| 176 | total_memory = total_lowmem; | ||
| 177 | #endif /* CONFIG_HIGHMEM */ | ||
| 178 | } | ||
| 179 | #endif | ||
| 180 | } | ||
| 181 | |||
| 182 | /* | 164 | /* |
| 183 | * Map in all of physical memory starting at CONFIG_KERNEL_START. | 165 | * Map in all of physical memory starting at CONFIG_KERNEL_START. |
| 184 | */ | 166 | */ |
| @@ -206,24 +188,6 @@ void __init mapin_ram(void) | |||
| 206 | /* is x a power of 2? */ | 188 | /* is x a power of 2? */ |
| 207 | #define is_power_of_2(x) ((x) != 0 && (((x) & ((x) - 1)) == 0)) | 189 | #define is_power_of_2(x) ((x) != 0 && (((x) & ((x) - 1)) == 0)) |
| 208 | 190 | ||
| 209 | /* | ||
| 210 | * Set up a mapping for a block of I/O. | ||
| 211 | * virt, phys, size must all be page-aligned. | ||
| 212 | * This should only be called before ioremap is called. | ||
| 213 | */ | ||
| 214 | void __init io_block_mapping(unsigned long virt, phys_addr_t phys, | ||
| 215 | unsigned int size, int flags) | ||
| 216 | { | ||
| 217 | int i; | ||
| 218 | |||
| 219 | if (virt > CONFIG_KERNEL_START && virt < ioremap_bot) | ||
| 220 | ioremap_bot = ioremap_base = virt; | ||
| 221 | |||
| 222 | /* Put it in the page tables. */ | ||
| 223 | for (i = 0; i < size; i += PAGE_SIZE) | ||
| 224 | map_page(virt + i, phys + i, flags); | ||
| 225 | } | ||
| 226 | |||
| 227 | /* Scan the real Linux page tables and return a PTE pointer for | 191 | /* Scan the real Linux page tables and return a PTE pointer for |
| 228 | * a virtual address in a context. | 192 | * a virtual address in a context. |
| 229 | * Returns true (1) if PTE was found, zero otherwise. The pointer to | 193 | * Returns true (1) if PTE was found, zero otherwise. The pointer to |
| @@ -274,3 +238,18 @@ unsigned long iopa(unsigned long addr) | |||
| 274 | 238 | ||
| 275 | return pa; | 239 | return pa; |
| 276 | } | 240 | } |
| 241 | |||
| 242 | __init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | ||
| 243 | unsigned long address) | ||
| 244 | { | ||
| 245 | pte_t *pte; | ||
| 246 | if (mem_init_done) { | ||
| 247 | pte = (pte_t *)__get_free_page(GFP_KERNEL | | ||
| 248 | __GFP_REPEAT | __GFP_ZERO); | ||
| 249 | } else { | ||
| 250 | pte = (pte_t *)early_get_page(); | ||
| 251 | if (pte) | ||
| 252 | clear_page(pte); | ||
| 253 | } | ||
| 254 | return pte; | ||
| 255 | } | ||
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 740bb32ec57e..01c8c97c15b7 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
| @@ -1025,7 +1025,7 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) | |||
| 1025 | 1025 | ||
| 1026 | struct pci_dev *dev = bus->self; | 1026 | struct pci_dev *dev = bus->self; |
| 1027 | 1027 | ||
| 1028 | for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) { | 1028 | pci_bus_for_each_resource(bus, res, i) { |
| 1029 | res = bus->resource[i]; | 1029 | res = bus->resource[i]; |
| 1030 | if (!res) | 1030 | if (!res) |
| 1031 | continue; | 1031 | continue; |
| @@ -1131,21 +1131,20 @@ static int skip_isa_ioresource_align(struct pci_dev *dev) | |||
| 1131 | * but we want to try to avoid allocating at 0x2900-0x2bff | 1131 | * but we want to try to avoid allocating at 0x2900-0x2bff |
| 1132 | * which might have be mirrored at 0x0100-0x03ff.. | 1132 | * which might have be mirrored at 0x0100-0x03ff.. |
| 1133 | */ | 1133 | */ |
| 1134 | void pcibios_align_resource(void *data, struct resource *res, | 1134 | resource_size_t pcibios_align_resource(void *data, const struct resource *res, |
| 1135 | resource_size_t size, resource_size_t align) | 1135 | resource_size_t size, resource_size_t align) |
| 1136 | { | 1136 | { |
| 1137 | struct pci_dev *dev = data; | 1137 | struct pci_dev *dev = data; |
| 1138 | resource_size_t start = res->start; | ||
| 1138 | 1139 | ||
| 1139 | if (res->flags & IORESOURCE_IO) { | 1140 | if (res->flags & IORESOURCE_IO) { |
| 1140 | resource_size_t start = res->start; | ||
| 1141 | |||
| 1142 | if (skip_isa_ioresource_align(dev)) | 1141 | if (skip_isa_ioresource_align(dev)) |
| 1143 | return; | 1142 | return start; |
| 1144 | if (start & 0x300) { | 1143 | if (start & 0x300) |
| 1145 | start = (start + 0x3ff) & ~0x3ff; | 1144 | start = (start + 0x3ff) & ~0x3ff; |
| 1146 | res->start = start; | ||
| 1147 | } | ||
| 1148 | } | 1145 | } |
| 1146 | |||
| 1147 | return start; | ||
| 1149 | } | 1148 | } |
| 1150 | EXPORT_SYMBOL(pcibios_align_resource); | 1149 | EXPORT_SYMBOL(pcibios_align_resource); |
| 1151 | 1150 | ||
| @@ -1228,7 +1227,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus) | |||
| 1228 | pr_debug("PCI: Allocating bus resources for %04x:%02x...\n", | 1227 | pr_debug("PCI: Allocating bus resources for %04x:%02x...\n", |
| 1229 | pci_domain_nr(bus), bus->number); | 1228 | pci_domain_nr(bus), bus->number); |
| 1230 | 1229 | ||
| 1231 | for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) { | 1230 | pci_bus_for_each_resource(bus, res, i) { |
| 1232 | res = bus->resource[i]; | 1231 | res = bus->resource[i]; |
| 1233 | if (!res || !res->flags | 1232 | if (!res || !res->flags |
| 1234 | || res->start > res->end || res->parent) | 1233 | || res->start > res->end || res->parent) |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 29e86923d1bf..7e6fd1cbd3f8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -49,7 +49,7 @@ config AR7 | |||
| 49 | family: TNETD7100, 7200 and 7300. | 49 | family: TNETD7100, 7200 and 7300. |
| 50 | 50 | ||
| 51 | config BCM47XX | 51 | config BCM47XX |
| 52 | bool "BCM47XX based boards" | 52 | bool "Broadcom BCM47XX based boards" |
| 53 | select CEVT_R4K | 53 | select CEVT_R4K |
| 54 | select CSRC_R4K | 54 | select CSRC_R4K |
| 55 | select DMA_NONCOHERENT | 55 | select DMA_NONCOHERENT |
| @@ -509,6 +509,7 @@ config SIBYTE_SWARM | |||
| 509 | bool "Sibyte BCM91250A-SWARM" | 509 | bool "Sibyte BCM91250A-SWARM" |
| 510 | select BOOT_ELF32 | 510 | select BOOT_ELF32 |
| 511 | select DMA_COHERENT | 511 | select DMA_COHERENT |
| 512 | select HAVE_PATA_PLATFORM | ||
| 512 | select NR_CPUS_DEFAULT_2 | 513 | select NR_CPUS_DEFAULT_2 |
| 513 | select SIBYTE_SB1250 | 514 | select SIBYTE_SB1250 |
| 514 | select SWAP_IO_SPACE | 515 | select SWAP_IO_SPACE |
| @@ -523,6 +524,7 @@ config SIBYTE_LITTLESUR | |||
| 523 | depends on EXPERIMENTAL | 524 | depends on EXPERIMENTAL |
| 524 | select BOOT_ELF32 | 525 | select BOOT_ELF32 |
| 525 | select DMA_COHERENT | 526 | select DMA_COHERENT |
| 527 | select HAVE_PATA_PLATFORM | ||
| 526 | select NR_CPUS_DEFAULT_2 | 528 | select NR_CPUS_DEFAULT_2 |
| 527 | select SIBYTE_SB1250 | 529 | select SIBYTE_SB1250 |
| 528 | select SWAP_IO_SPACE | 530 | select SWAP_IO_SPACE |
| @@ -1305,6 +1307,33 @@ config CPU_CAVIUM_OCTEON | |||
| 1305 | 1307 | ||
| 1306 | endchoice | 1308 | endchoice |
| 1307 | 1309 | ||
| 1310 | if CPU_LOONGSON2F | ||
| 1311 | config CPU_NOP_WORKAROUNDS | ||
| 1312 | bool | ||
| 1313 | |||
| 1314 | config CPU_JUMP_WORKAROUNDS | ||
| 1315 | bool | ||
| 1316 | |||
| 1317 | config CPU_LOONGSON2F_WORKAROUNDS | ||
| 1318 | bool "Loongson 2F Workarounds" | ||
| 1319 | default y | ||
| 1320 | select CPU_NOP_WORKAROUNDS | ||
| 1321 | select CPU_JUMP_WORKAROUNDS | ||
| 1322 | help | ||
| 1323 | Loongson 2F01 / 2F02 processors have the NOP & JUMP issues which | ||
| 1324 | require workarounds. Without workarounds the system may hang | ||
| 1325 | unexpectedly. For more information please refer to the gas | ||
| 1326 | -mfix-loongson2f-nop and -mfix-loongson2f-jump options. | ||
| 1327 | |||
| 1328 | Loongson 2F03 and later have fixed these issues and no workarounds | ||
| 1329 | are needed. The workarounds have no significant side effect on them | ||
| 1330 | but may decrease the performance of the system so this option should | ||
| 1331 | be disabled unless the kernel is intended to be run on 2F01 or 2F02 | ||
| 1332 | systems. | ||
| 1333 | |||
| 1334 | If unsure, please say Y. | ||
| 1335 | endif # CPU_LOONGSON2F | ||
| 1336 | |||
| 1308 | config SYS_SUPPORTS_ZBOOT | 1337 | config SYS_SUPPORTS_ZBOOT |
| 1309 | bool | 1338 | bool |
| 1310 | select HAVE_KERNEL_GZIP | 1339 | select HAVE_KERNEL_GZIP |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 2f2eac233322..0b9c01add0a0 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -136,6 +136,19 @@ cflags-$(CONFIG_CPU_LOONGSON2E) += \ | |||
| 136 | $(call cc-option,-march=loongson2e,-march=r4600) | 136 | $(call cc-option,-march=loongson2e,-march=r4600) |
| 137 | cflags-$(CONFIG_CPU_LOONGSON2F) += \ | 137 | cflags-$(CONFIG_CPU_LOONGSON2F) += \ |
| 138 | $(call cc-option,-march=loongson2f,-march=r4600) | 138 | $(call cc-option,-march=loongson2f,-march=r4600) |
| 139 | # enable the workarounds for loongson2f | ||
| 140 | ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS | ||
| 141 | ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),) | ||
| 142 | $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop) | ||
| 143 | else | ||
| 144 | cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-nop | ||
| 145 | endif | ||
| 146 | ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-jump,),) | ||
| 147 | $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-jump) | ||
| 148 | else | ||
| 149 | cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump | ||
| 150 | endif | ||
| 151 | endif | ||
| 139 | 152 | ||
| 140 | cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ | 153 | cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ |
| 141 | -Wa,-mips32 -Wa,--trap | 154 | -Wa,-mips32 -Wa,--trap |
diff --git a/arch/mips/alchemy/devboards/db1200/setup.c b/arch/mips/alchemy/devboards/db1200/setup.c index be7e92ea01f3..887619547553 100644 --- a/arch/mips/alchemy/devboards/db1200/setup.c +++ b/arch/mips/alchemy/devboards/db1200/setup.c | |||
| @@ -66,12 +66,16 @@ static int __init db1200_arch_init(void) | |||
| 66 | set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW); | 66 | set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW); |
| 67 | bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT); | 67 | bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT); |
| 68 | 68 | ||
| 69 | /* do not autoenable these: CPLD has broken edge int handling, | 69 | /* insert/eject pairs: one of both is always screaming. To avoid |
| 70 | * and the CD handler setup requires manual enabling to work | 70 | * issues they must not be automatically enabled when initially |
| 71 | * around that. | 71 | * requested. |
| 72 | */ | 72 | */ |
| 73 | irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN; | 73 | irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN; |
| 74 | irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN; | 74 | irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN; |
| 75 | irq_to_desc(DB1200_PC0_INSERT_INT)->status |= IRQ_NOAUTOEN; | ||
| 76 | irq_to_desc(DB1200_PC0_EJECT_INT)->status |= IRQ_NOAUTOEN; | ||
| 77 | irq_to_desc(DB1200_PC1_INSERT_INT)->status |= IRQ_NOAUTOEN; | ||
| 78 | irq_to_desc(DB1200_PC1_EJECT_INT)->status |= IRQ_NOAUTOEN; | ||
| 75 | 79 | ||
| 76 | return 0; | 80 | return 0; |
| 77 | } | 81 | } |
diff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63xx_defconfig index 7fee0273c829..6389ca0fdc6c 100644 --- a/arch/mips/configs/bcm63xx_defconfig +++ b/arch/mips/configs/bcm63xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.30-rc6 | 3 | # Linux kernel version: 2.6.34-rc2 |
| 4 | # Sun May 31 20:17:18 2009 | 4 | # Tue Mar 23 10:36:32 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -9,13 +9,14 @@ CONFIG_MIPS=y | |||
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_AR7 is not set | ||
| 12 | # CONFIG_BCM47XX is not set | 13 | # CONFIG_BCM47XX is not set |
| 13 | CONFIG_BCM63XX=y | 14 | CONFIG_BCM63XX=y |
| 14 | # CONFIG_MIPS_COBALT is not set | 15 | # CONFIG_MIPS_COBALT is not set |
| 15 | # CONFIG_MACH_DECSTATION is not set | 16 | # CONFIG_MACH_DECSTATION is not set |
| 16 | # CONFIG_MACH_JAZZ is not set | 17 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | 18 | # CONFIG_LASAT is not set |
| 18 | # CONFIG_LEMOTE_FULONG is not set | 19 | # CONFIG_MACH_LOONGSON is not set |
| 19 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| 20 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
| 21 | # CONFIG_NEC_MARKEINS is not set | 22 | # CONFIG_NEC_MARKEINS is not set |
| @@ -26,6 +27,7 @@ CONFIG_BCM63XX=y | |||
| 26 | # CONFIG_PNX8550_STB810 is not set | 27 | # CONFIG_PNX8550_STB810 is not set |
| 27 | # CONFIG_PMC_MSP is not set | 28 | # CONFIG_PMC_MSP is not set |
| 28 | # CONFIG_PMC_YOSEMITE is not set | 29 | # CONFIG_PMC_YOSEMITE is not set |
| 30 | # CONFIG_POWERTV is not set | ||
| 29 | # CONFIG_SGI_IP22 is not set | 31 | # CONFIG_SGI_IP22 is not set |
| 30 | # CONFIG_SGI_IP27 is not set | 32 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | 33 | # CONFIG_SGI_IP28 is not set |
| @@ -45,13 +47,17 @@ CONFIG_BCM63XX=y | |||
| 45 | # CONFIG_WR_PPMC is not set | 47 | # CONFIG_WR_PPMC is not set |
| 46 | # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set | 48 | # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set |
| 47 | # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set | 49 | # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set |
| 50 | # CONFIG_ALCHEMY_GPIO_INDIRECT is not set | ||
| 48 | 51 | ||
| 49 | # | 52 | # |
| 50 | # CPU support | 53 | # CPU support |
| 51 | # | 54 | # |
| 55 | CONFIG_BCM63XX_CPU_6338=y | ||
| 56 | CONFIG_BCM63XX_CPU_6345=y | ||
| 52 | CONFIG_BCM63XX_CPU_6348=y | 57 | CONFIG_BCM63XX_CPU_6348=y |
| 53 | CONFIG_BCM63XX_CPU_6358=y | 58 | CONFIG_BCM63XX_CPU_6358=y |
| 54 | CONFIG_BOARD_BCM963XX=y | 59 | CONFIG_BOARD_BCM963XX=y |
| 60 | CONFIG_LOONGSON_UART_BASE=y | ||
| 55 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 61 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 56 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 62 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 57 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 63 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| @@ -69,10 +75,8 @@ CONFIG_CEVT_R4K=y | |||
| 69 | CONFIG_CSRC_R4K_LIB=y | 75 | CONFIG_CSRC_R4K_LIB=y |
| 70 | CONFIG_CSRC_R4K=y | 76 | CONFIG_CSRC_R4K=y |
| 71 | CONFIG_DMA_NONCOHERENT=y | 77 | CONFIG_DMA_NONCOHERENT=y |
| 72 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 78 | CONFIG_NEED_DMA_MAP_STATE=y |
| 73 | CONFIG_EARLY_PRINTK=y | ||
| 74 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 79 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
| 75 | # CONFIG_HOTPLUG_CPU is not set | ||
| 76 | # CONFIG_NO_IOPORT is not set | 80 | # CONFIG_NO_IOPORT is not set |
| 77 | CONFIG_GENERIC_GPIO=y | 81 | CONFIG_GENERIC_GPIO=y |
| 78 | CONFIG_CPU_BIG_ENDIAN=y | 82 | CONFIG_CPU_BIG_ENDIAN=y |
| @@ -85,7 +89,8 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 85 | # | 89 | # |
| 86 | # CPU selection | 90 | # CPU selection |
| 87 | # | 91 | # |
| 88 | # CONFIG_CPU_LOONGSON2 is not set | 92 | # CONFIG_CPU_LOONGSON2E is not set |
| 93 | # CONFIG_CPU_LOONGSON2F is not set | ||
| 89 | CONFIG_CPU_MIPS32_R1=y | 94 | CONFIG_CPU_MIPS32_R1=y |
| 90 | # CONFIG_CPU_MIPS32_R2 is not set | 95 | # CONFIG_CPU_MIPS32_R2 is not set |
| 91 | # CONFIG_CPU_MIPS64_R1 is not set | 96 | # CONFIG_CPU_MIPS64_R1 is not set |
| @@ -128,7 +133,7 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
| 128 | CONFIG_MIPS_MT_DISABLED=y | 133 | CONFIG_MIPS_MT_DISABLED=y |
| 129 | # CONFIG_MIPS_MT_SMP is not set | 134 | # CONFIG_MIPS_MT_SMP is not set |
| 130 | # CONFIG_MIPS_MT_SMTC is not set | 135 | # CONFIG_MIPS_MT_SMTC is not set |
| 131 | CONFIG_CPU_HAS_LLSC=y | 136 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 132 | CONFIG_CPU_HAS_SYNC=y | 137 | CONFIG_CPU_HAS_SYNC=y |
| 133 | CONFIG_GENERIC_HARDIRQS=y | 138 | CONFIG_GENERIC_HARDIRQS=y |
| 134 | CONFIG_GENERIC_IRQ_PROBE=y | 139 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -146,9 +151,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 146 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 151 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 147 | CONFIG_ZONE_DMA_FLAG=0 | 152 | CONFIG_ZONE_DMA_FLAG=0 |
| 148 | CONFIG_VIRT_TO_BUS=y | 153 | CONFIG_VIRT_TO_BUS=y |
| 149 | CONFIG_UNEVICTABLE_LRU=y | 154 | # CONFIG_KSM is not set |
| 150 | CONFIG_HAVE_MLOCK=y | 155 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
| 151 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 152 | CONFIG_TICK_ONESHOT=y | 156 | CONFIG_TICK_ONESHOT=y |
| 153 | CONFIG_NO_HZ=y | 157 | CONFIG_NO_HZ=y |
| 154 | # CONFIG_HIGH_RES_TIMERS is not set | 158 | # CONFIG_HIGH_RES_TIMERS is not set |
| @@ -170,6 +174,7 @@ CONFIG_PREEMPT_NONE=y | |||
| 170 | CONFIG_LOCKDEP_SUPPORT=y | 174 | CONFIG_LOCKDEP_SUPPORT=y |
| 171 | CONFIG_STACKTRACE_SUPPORT=y | 175 | CONFIG_STACKTRACE_SUPPORT=y |
| 172 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 176 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 177 | CONFIG_CONSTRUCTORS=y | ||
| 173 | 178 | ||
| 174 | # | 179 | # |
| 175 | # General setup | 180 | # General setup |
| @@ -189,15 +194,12 @@ CONFIG_LOCALVERSION="" | |||
| 189 | # | 194 | # |
| 190 | # RCU Subsystem | 195 | # RCU Subsystem |
| 191 | # | 196 | # |
| 192 | CONFIG_CLASSIC_RCU=y | ||
| 193 | # CONFIG_TREE_RCU is not set | 197 | # CONFIG_TREE_RCU is not set |
| 194 | # CONFIG_PREEMPT_RCU is not set | 198 | # CONFIG_TREE_PREEMPT_RCU is not set |
| 199 | CONFIG_TINY_RCU=y | ||
| 195 | # CONFIG_TREE_RCU_TRACE is not set | 200 | # CONFIG_TREE_RCU_TRACE is not set |
| 196 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 197 | # CONFIG_IKCONFIG is not set | 201 | # CONFIG_IKCONFIG is not set |
| 198 | CONFIG_LOG_BUF_SHIFT=17 | 202 | CONFIG_LOG_BUF_SHIFT=17 |
| 199 | # CONFIG_GROUP_SCHED is not set | ||
| 200 | # CONFIG_CGROUPS is not set | ||
| 201 | CONFIG_SYSFS_DEPRECATED=y | 203 | CONFIG_SYSFS_DEPRECATED=y |
| 202 | CONFIG_SYSFS_DEPRECATED_V2=y | 204 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 203 | # CONFIG_RELAY is not set | 205 | # CONFIG_RELAY is not set |
| @@ -205,11 +207,11 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 205 | # CONFIG_BLK_DEV_INITRD is not set | 207 | # CONFIG_BLK_DEV_INITRD is not set |
| 206 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 208 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 207 | CONFIG_SYSCTL=y | 209 | CONFIG_SYSCTL=y |
| 210 | CONFIG_ANON_INODES=y | ||
| 208 | CONFIG_EMBEDDED=y | 211 | CONFIG_EMBEDDED=y |
| 209 | CONFIG_SYSCTL_SYSCALL=y | 212 | CONFIG_SYSCTL_SYSCALL=y |
| 210 | CONFIG_KALLSYMS=y | 213 | CONFIG_KALLSYMS=y |
| 211 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 214 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 212 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 213 | CONFIG_HOTPLUG=y | 215 | CONFIG_HOTPLUG=y |
| 214 | CONFIG_PRINTK=y | 216 | CONFIG_PRINTK=y |
| 215 | CONFIG_BUG=y | 217 | CONFIG_BUG=y |
| @@ -223,6 +225,10 @@ CONFIG_BASE_FULL=y | |||
| 223 | # CONFIG_EVENTFD is not set | 225 | # CONFIG_EVENTFD is not set |
| 224 | # CONFIG_SHMEM is not set | 226 | # CONFIG_SHMEM is not set |
| 225 | # CONFIG_AIO is not set | 227 | # CONFIG_AIO is not set |
| 228 | |||
| 229 | # | ||
| 230 | # Kernel Performance Events And Counters | ||
| 231 | # | ||
| 226 | # CONFIG_VM_EVENT_COUNTERS is not set | 232 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 227 | CONFIG_PCI_QUIRKS=y | 233 | CONFIG_PCI_QUIRKS=y |
| 228 | # CONFIG_SLUB_DEBUG is not set | 234 | # CONFIG_SLUB_DEBUG is not set |
| @@ -231,14 +237,17 @@ CONFIG_COMPAT_BRK=y | |||
| 231 | CONFIG_SLUB=y | 237 | CONFIG_SLUB=y |
| 232 | # CONFIG_SLOB is not set | 238 | # CONFIG_SLOB is not set |
| 233 | # CONFIG_PROFILING is not set | 239 | # CONFIG_PROFILING is not set |
| 234 | # CONFIG_MARKERS is not set | ||
| 235 | CONFIG_HAVE_OPROFILE=y | 240 | CONFIG_HAVE_OPROFILE=y |
| 241 | |||
| 242 | # | ||
| 243 | # GCOV-based kernel profiling | ||
| 244 | # | ||
| 236 | # CONFIG_SLOW_WORK is not set | 245 | # CONFIG_SLOW_WORK is not set |
| 237 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 246 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
| 238 | CONFIG_BASE_SMALL=0 | 247 | CONFIG_BASE_SMALL=0 |
| 239 | # CONFIG_MODULES is not set | 248 | # CONFIG_MODULES is not set |
| 240 | CONFIG_BLOCK=y | 249 | CONFIG_BLOCK=y |
| 241 | # CONFIG_LBD is not set | 250 | CONFIG_LBDAF=y |
| 242 | # CONFIG_BLK_DEV_BSG is not set | 251 | # CONFIG_BLK_DEV_BSG is not set |
| 243 | # CONFIG_BLK_DEV_INTEGRITY is not set | 252 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 244 | 253 | ||
| @@ -246,14 +255,41 @@ CONFIG_BLOCK=y | |||
| 246 | # IO Schedulers | 255 | # IO Schedulers |
| 247 | # | 256 | # |
| 248 | CONFIG_IOSCHED_NOOP=y | 257 | CONFIG_IOSCHED_NOOP=y |
| 249 | # CONFIG_IOSCHED_AS is not set | ||
| 250 | # CONFIG_IOSCHED_DEADLINE is not set | 258 | # CONFIG_IOSCHED_DEADLINE is not set |
| 251 | # CONFIG_IOSCHED_CFQ is not set | 259 | # CONFIG_IOSCHED_CFQ is not set |
| 252 | # CONFIG_DEFAULT_AS is not set | ||
| 253 | # CONFIG_DEFAULT_DEADLINE is not set | 260 | # CONFIG_DEFAULT_DEADLINE is not set |
| 254 | # CONFIG_DEFAULT_CFQ is not set | 261 | # CONFIG_DEFAULT_CFQ is not set |
| 255 | CONFIG_DEFAULT_NOOP=y | 262 | CONFIG_DEFAULT_NOOP=y |
| 256 | CONFIG_DEFAULT_IOSCHED="noop" | 263 | CONFIG_DEFAULT_IOSCHED="noop" |
| 264 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
| 265 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
| 266 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
| 267 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
| 268 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
| 269 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
| 270 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
| 271 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
| 272 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
| 273 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
| 274 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
| 275 | # CONFIG_INLINE_READ_LOCK is not set | ||
| 276 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
| 277 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
| 278 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
| 279 | CONFIG_INLINE_READ_UNLOCK=y | ||
| 280 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
| 281 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
| 282 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
| 283 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
| 284 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
| 285 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
| 286 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
| 287 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
| 288 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
| 289 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
| 290 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
| 291 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
| 292 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
| 257 | # CONFIG_FREEZER is not set | 293 | # CONFIG_FREEZER is not set |
| 258 | 294 | ||
| 259 | # | 295 | # |
| @@ -263,15 +299,12 @@ CONFIG_HW_HAS_PCI=y | |||
| 263 | CONFIG_PCI=y | 299 | CONFIG_PCI=y |
| 264 | CONFIG_PCI_DOMAINS=y | 300 | CONFIG_PCI_DOMAINS=y |
| 265 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 301 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 266 | # CONFIG_PCI_LEGACY is not set | ||
| 267 | # CONFIG_PCI_STUB is not set | 302 | # CONFIG_PCI_STUB is not set |
| 268 | # CONFIG_PCI_IOV is not set | 303 | # CONFIG_PCI_IOV is not set |
| 269 | CONFIG_MMU=y | 304 | CONFIG_MMU=y |
| 270 | CONFIG_PCCARD=y | 305 | CONFIG_PCCARD=y |
| 271 | # CONFIG_PCMCIA_DEBUG is not set | ||
| 272 | CONFIG_PCMCIA=y | 306 | CONFIG_PCMCIA=y |
| 273 | CONFIG_PCMCIA_LOAD_CIS=y | 307 | CONFIG_PCMCIA_LOAD_CIS=y |
| 274 | CONFIG_PCMCIA_IOCTL=y | ||
| 275 | CONFIG_CARDBUS=y | 308 | CONFIG_CARDBUS=y |
| 276 | 309 | ||
| 277 | # | 310 | # |
| @@ -295,6 +328,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 295 | # | 328 | # |
| 296 | # Power management options | 329 | # Power management options |
| 297 | # | 330 | # |
| 331 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 298 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 332 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 299 | # CONFIG_PM is not set | 333 | # CONFIG_PM is not set |
| 300 | CONFIG_NET=y | 334 | CONFIG_NET=y |
| @@ -333,6 +367,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 333 | # CONFIG_NETFILTER is not set | 367 | # CONFIG_NETFILTER is not set |
| 334 | # CONFIG_IP_DCCP is not set | 368 | # CONFIG_IP_DCCP is not set |
| 335 | # CONFIG_IP_SCTP is not set | 369 | # CONFIG_IP_SCTP is not set |
| 370 | # CONFIG_RDS is not set | ||
| 336 | # CONFIG_TIPC is not set | 371 | # CONFIG_TIPC is not set |
| 337 | # CONFIG_ATM is not set | 372 | # CONFIG_ATM is not set |
| 338 | # CONFIG_BRIDGE is not set | 373 | # CONFIG_BRIDGE is not set |
| @@ -347,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 347 | # CONFIG_ECONET is not set | 382 | # CONFIG_ECONET is not set |
| 348 | # CONFIG_WAN_ROUTER is not set | 383 | # CONFIG_WAN_ROUTER is not set |
| 349 | # CONFIG_PHONET is not set | 384 | # CONFIG_PHONET is not set |
| 385 | # CONFIG_IEEE802154 is not set | ||
| 350 | # CONFIG_NET_SCHED is not set | 386 | # CONFIG_NET_SCHED is not set |
| 351 | # CONFIG_DCB is not set | 387 | # CONFIG_DCB is not set |
| 352 | 388 | ||
| @@ -359,7 +395,27 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 359 | # CONFIG_IRDA is not set | 395 | # CONFIG_IRDA is not set |
| 360 | # CONFIG_BT is not set | 396 | # CONFIG_BT is not set |
| 361 | # CONFIG_AF_RXRPC is not set | 397 | # CONFIG_AF_RXRPC is not set |
| 362 | # CONFIG_WIRELESS is not set | 398 | CONFIG_WIRELESS=y |
| 399 | CONFIG_WEXT_CORE=y | ||
| 400 | CONFIG_WEXT_PROC=y | ||
| 401 | CONFIG_CFG80211=y | ||
| 402 | CONFIG_NL80211_TESTMODE=y | ||
| 403 | # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set | ||
| 404 | # CONFIG_CFG80211_REG_DEBUG is not set | ||
| 405 | CONFIG_CFG80211_DEFAULT_PS=y | ||
| 406 | # CONFIG_CFG80211_INTERNAL_REGDB is not set | ||
| 407 | CONFIG_CFG80211_WEXT=y | ||
| 408 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 409 | # CONFIG_LIB80211 is not set | ||
| 410 | CONFIG_MAC80211=y | ||
| 411 | # CONFIG_MAC80211_RC_PID is not set | ||
| 412 | CONFIG_MAC80211_RC_MINSTREL=y | ||
| 413 | # CONFIG_MAC80211_RC_DEFAULT_PID is not set | ||
| 414 | CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y | ||
| 415 | CONFIG_MAC80211_RC_DEFAULT="minstrel" | ||
| 416 | # CONFIG_MAC80211_MESH is not set | ||
| 417 | CONFIG_MAC80211_LEDS=y | ||
| 418 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
| 363 | # CONFIG_WIMAX is not set | 419 | # CONFIG_WIMAX is not set |
| 364 | # CONFIG_RFKILL is not set | 420 | # CONFIG_RFKILL is not set |
| 365 | # CONFIG_NET_9P is not set | 421 | # CONFIG_NET_9P is not set |
| @@ -471,6 +527,7 @@ CONFIG_HAVE_IDE=y | |||
| 471 | # | 527 | # |
| 472 | # SCSI device support | 528 | # SCSI device support |
| 473 | # | 529 | # |
| 530 | CONFIG_SCSI_MOD=y | ||
| 474 | # CONFIG_RAID_ATTRS is not set | 531 | # CONFIG_RAID_ATTRS is not set |
| 475 | # CONFIG_SCSI is not set | 532 | # CONFIG_SCSI is not set |
| 476 | # CONFIG_SCSI_DMA is not set | 533 | # CONFIG_SCSI_DMA is not set |
| @@ -484,13 +541,16 @@ CONFIG_HAVE_IDE=y | |||
| 484 | # | 541 | # |
| 485 | 542 | ||
| 486 | # | 543 | # |
| 487 | # Enable only one of the two stacks, unless you know what you are doing | 544 | # You can enable one or both FireWire driver stacks. |
| 545 | # | ||
| 546 | |||
| 547 | # | ||
| 548 | # The newer stack is recommended. | ||
| 488 | # | 549 | # |
| 489 | # CONFIG_FIREWIRE is not set | 550 | # CONFIG_FIREWIRE is not set |
| 490 | # CONFIG_IEEE1394 is not set | 551 | # CONFIG_IEEE1394 is not set |
| 491 | # CONFIG_I2O is not set | 552 | # CONFIG_I2O is not set |
| 492 | CONFIG_NETDEVICES=y | 553 | CONFIG_NETDEVICES=y |
| 493 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 494 | # CONFIG_DUMMY is not set | 554 | # CONFIG_DUMMY is not set |
| 495 | # CONFIG_BONDING is not set | 555 | # CONFIG_BONDING is not set |
| 496 | # CONFIG_MACVLAN is not set | 556 | # CONFIG_MACVLAN is not set |
| @@ -529,6 +589,7 @@ CONFIG_MII=y | |||
| 529 | # CONFIG_SMC91X is not set | 589 | # CONFIG_SMC91X is not set |
| 530 | # CONFIG_DM9000 is not set | 590 | # CONFIG_DM9000 is not set |
| 531 | # CONFIG_ETHOC is not set | 591 | # CONFIG_ETHOC is not set |
| 592 | # CONFIG_SMSC911X is not set | ||
| 532 | # CONFIG_DNET is not set | 593 | # CONFIG_DNET is not set |
| 533 | # CONFIG_NET_TULIP is not set | 594 | # CONFIG_NET_TULIP is not set |
| 534 | # CONFIG_HP100 is not set | 595 | # CONFIG_HP100 is not set |
| @@ -541,17 +602,48 @@ CONFIG_MII=y | |||
| 541 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 602 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
| 542 | # CONFIG_NET_PCI is not set | 603 | # CONFIG_NET_PCI is not set |
| 543 | # CONFIG_B44 is not set | 604 | # CONFIG_B44 is not set |
| 605 | # CONFIG_KS8842 is not set | ||
| 606 | # CONFIG_KS8851_MLL is not set | ||
| 544 | # CONFIG_ATL2 is not set | 607 | # CONFIG_ATL2 is not set |
| 545 | CONFIG_BCM63XX_ENET=y | 608 | CONFIG_BCM63XX_ENET=y |
| 546 | # CONFIG_NETDEV_1000 is not set | 609 | # CONFIG_NETDEV_1000 is not set |
| 547 | # CONFIG_NETDEV_10000 is not set | 610 | # CONFIG_NETDEV_10000 is not set |
| 548 | # CONFIG_TR is not set | 611 | # CONFIG_TR is not set |
| 549 | 612 | CONFIG_WLAN=y | |
| 550 | # | 613 | # CONFIG_PCMCIA_RAYCS is not set |
| 551 | # Wireless LAN | 614 | # CONFIG_LIBERTAS_THINFIRM is not set |
| 552 | # | 615 | # CONFIG_ATMEL is not set |
| 553 | # CONFIG_WLAN_PRE80211 is not set | 616 | # CONFIG_AT76C50X_USB is not set |
| 554 | # CONFIG_WLAN_80211 is not set | 617 | # CONFIG_AIRO_CS is not set |
| 618 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 619 | # CONFIG_PRISM54 is not set | ||
| 620 | # CONFIG_USB_ZD1201 is not set | ||
| 621 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 622 | # CONFIG_RTL8180 is not set | ||
| 623 | # CONFIG_RTL8187 is not set | ||
| 624 | # CONFIG_ADM8211 is not set | ||
| 625 | # CONFIG_MAC80211_HWSIM is not set | ||
| 626 | # CONFIG_MWL8K is not set | ||
| 627 | # CONFIG_ATH_COMMON is not set | ||
| 628 | CONFIG_B43=y | ||
| 629 | CONFIG_B43_PCI_AUTOSELECT=y | ||
| 630 | CONFIG_B43_PCICORE_AUTOSELECT=y | ||
| 631 | # CONFIG_B43_PCMCIA is not set | ||
| 632 | CONFIG_B43_PIO=y | ||
| 633 | # CONFIG_B43_PHY_LP is not set | ||
| 634 | CONFIG_B43_LEDS=y | ||
| 635 | # CONFIG_B43_DEBUG is not set | ||
| 636 | # CONFIG_B43LEGACY is not set | ||
| 637 | # CONFIG_HOSTAP is not set | ||
| 638 | # CONFIG_IPW2100 is not set | ||
| 639 | # CONFIG_IPW2200 is not set | ||
| 640 | # CONFIG_IWLWIFI is not set | ||
| 641 | # CONFIG_LIBERTAS is not set | ||
| 642 | # CONFIG_HERMES is not set | ||
| 643 | # CONFIG_P54_COMMON is not set | ||
| 644 | # CONFIG_RT2X00 is not set | ||
| 645 | # CONFIG_WL12XX is not set | ||
| 646 | # CONFIG_ZD1211RW is not set | ||
| 555 | 647 | ||
| 556 | # | 648 | # |
| 557 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 649 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -574,6 +666,7 @@ CONFIG_BCM63XX_ENET=y | |||
| 574 | # CONFIG_NETCONSOLE is not set | 666 | # CONFIG_NETCONSOLE is not set |
| 575 | # CONFIG_NETPOLL is not set | 667 | # CONFIG_NETPOLL is not set |
| 576 | # CONFIG_NET_POLL_CONTROLLER is not set | 668 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 669 | # CONFIG_VMXNET3 is not set | ||
| 577 | # CONFIG_ISDN is not set | 670 | # CONFIG_ISDN is not set |
| 578 | # CONFIG_PHONE is not set | 671 | # CONFIG_PHONE is not set |
| 579 | 672 | ||
| @@ -607,6 +700,7 @@ CONFIG_BCM63XX_ENET=y | |||
| 607 | CONFIG_SERIAL_CORE=y | 700 | CONFIG_SERIAL_CORE=y |
| 608 | CONFIG_SERIAL_CORE_CONSOLE=y | 701 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 609 | # CONFIG_SERIAL_JSM is not set | 702 | # CONFIG_SERIAL_JSM is not set |
| 703 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 610 | CONFIG_SERIAL_BCM63XX=y | 704 | CONFIG_SERIAL_BCM63XX=y |
| 611 | CONFIG_SERIAL_BCM63XX_CONSOLE=y | 705 | CONFIG_SERIAL_BCM63XX_CONSOLE=y |
| 612 | # CONFIG_UNIX98_PTYS is not set | 706 | # CONFIG_UNIX98_PTYS is not set |
| @@ -629,6 +723,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 629 | CONFIG_DEVPORT=y | 723 | CONFIG_DEVPORT=y |
| 630 | # CONFIG_I2C is not set | 724 | # CONFIG_I2C is not set |
| 631 | # CONFIG_SPI is not set | 725 | # CONFIG_SPI is not set |
| 726 | |||
| 727 | # | ||
| 728 | # PPS support | ||
| 729 | # | ||
| 730 | # CONFIG_PPS is not set | ||
| 632 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 731 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
| 633 | CONFIG_GPIOLIB=y | 732 | CONFIG_GPIOLIB=y |
| 634 | # CONFIG_GPIO_SYSFS is not set | 733 | # CONFIG_GPIO_SYSFS is not set |
| @@ -636,6 +735,8 @@ CONFIG_GPIOLIB=y | |||
| 636 | # | 735 | # |
| 637 | # Memory mapped GPIO expanders: | 736 | # Memory mapped GPIO expanders: |
| 638 | # | 737 | # |
| 738 | # CONFIG_GPIO_IT8761E is not set | ||
| 739 | # CONFIG_GPIO_SCH is not set | ||
| 639 | 740 | ||
| 640 | # | 741 | # |
| 641 | # I2C GPIO expanders: | 742 | # I2C GPIO expanders: |
| @@ -644,16 +745,21 @@ CONFIG_GPIOLIB=y | |||
| 644 | # | 745 | # |
| 645 | # PCI GPIO expanders: | 746 | # PCI GPIO expanders: |
| 646 | # | 747 | # |
| 748 | # CONFIG_GPIO_CS5535 is not set | ||
| 647 | # CONFIG_GPIO_BT8XX is not set | 749 | # CONFIG_GPIO_BT8XX is not set |
| 750 | # CONFIG_GPIO_LANGWELL is not set | ||
| 648 | 751 | ||
| 649 | # | 752 | # |
| 650 | # SPI GPIO expanders: | 753 | # SPI GPIO expanders: |
| 651 | # | 754 | # |
| 755 | |||
| 756 | # | ||
| 757 | # AC97 GPIO expanders: | ||
| 758 | # | ||
| 652 | # CONFIG_W1 is not set | 759 | # CONFIG_W1 is not set |
| 653 | # CONFIG_POWER_SUPPLY is not set | 760 | # CONFIG_POWER_SUPPLY is not set |
| 654 | # CONFIG_HWMON is not set | 761 | # CONFIG_HWMON is not set |
| 655 | # CONFIG_THERMAL is not set | 762 | # CONFIG_THERMAL is not set |
| 656 | # CONFIG_THERMAL_HWMON is not set | ||
| 657 | # CONFIG_WATCHDOG is not set | 763 | # CONFIG_WATCHDOG is not set |
| 658 | CONFIG_SSB_POSSIBLE=y | 764 | CONFIG_SSB_POSSIBLE=y |
| 659 | 765 | ||
| @@ -662,15 +768,16 @@ CONFIG_SSB_POSSIBLE=y | |||
| 662 | # | 768 | # |
| 663 | CONFIG_SSB=y | 769 | CONFIG_SSB=y |
| 664 | CONFIG_SSB_SPROM=y | 770 | CONFIG_SSB_SPROM=y |
| 771 | CONFIG_SSB_BLOCKIO=y | ||
| 665 | CONFIG_SSB_PCIHOST_POSSIBLE=y | 772 | CONFIG_SSB_PCIHOST_POSSIBLE=y |
| 666 | CONFIG_SSB_PCIHOST=y | 773 | CONFIG_SSB_PCIHOST=y |
| 667 | # CONFIG_SSB_B43_PCI_BRIDGE is not set | 774 | CONFIG_SSB_B43_PCI_BRIDGE=y |
| 668 | CONFIG_SSB_PCMCIAHOST_POSSIBLE=y | 775 | CONFIG_SSB_PCMCIAHOST_POSSIBLE=y |
| 669 | # CONFIG_SSB_PCMCIAHOST is not set | 776 | # CONFIG_SSB_PCMCIAHOST is not set |
| 670 | # CONFIG_SSB_SILENT is not set | 777 | # CONFIG_SSB_SILENT is not set |
| 671 | # CONFIG_SSB_DEBUG is not set | 778 | # CONFIG_SSB_DEBUG is not set |
| 672 | CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y | 779 | CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y |
| 673 | # CONFIG_SSB_DRIVER_PCICORE is not set | 780 | CONFIG_SSB_DRIVER_PCICORE=y |
| 674 | # CONFIG_SSB_DRIVER_MIPS is not set | 781 | # CONFIG_SSB_DRIVER_MIPS is not set |
| 675 | 782 | ||
| 676 | # | 783 | # |
| @@ -680,27 +787,15 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y | |||
| 680 | # CONFIG_MFD_SM501 is not set | 787 | # CONFIG_MFD_SM501 is not set |
| 681 | # CONFIG_HTC_PASIC3 is not set | 788 | # CONFIG_HTC_PASIC3 is not set |
| 682 | # CONFIG_MFD_TMIO is not set | 789 | # CONFIG_MFD_TMIO is not set |
| 790 | # CONFIG_MFD_TIMBERDALE is not set | ||
| 791 | # CONFIG_LPC_SCH is not set | ||
| 683 | # CONFIG_REGULATOR is not set | 792 | # CONFIG_REGULATOR is not set |
| 684 | 793 | # CONFIG_MEDIA_SUPPORT is not set | |
| 685 | # | ||
| 686 | # Multimedia devices | ||
| 687 | # | ||
| 688 | |||
| 689 | # | ||
| 690 | # Multimedia core support | ||
| 691 | # | ||
| 692 | # CONFIG_VIDEO_DEV is not set | ||
| 693 | # CONFIG_DVB_CORE is not set | ||
| 694 | # CONFIG_VIDEO_MEDIA is not set | ||
| 695 | |||
| 696 | # | ||
| 697 | # Multimedia drivers | ||
| 698 | # | ||
| 699 | # CONFIG_DAB is not set | ||
| 700 | 794 | ||
| 701 | # | 795 | # |
| 702 | # Graphics support | 796 | # Graphics support |
| 703 | # | 797 | # |
| 798 | # CONFIG_VGA_ARB is not set | ||
| 704 | # CONFIG_DRM is not set | 799 | # CONFIG_DRM is not set |
| 705 | # CONFIG_VGASTATE is not set | 800 | # CONFIG_VGASTATE is not set |
| 706 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 801 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -710,11 +805,7 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y | |||
| 710 | # | 805 | # |
| 711 | # Display device support | 806 | # Display device support |
| 712 | # | 807 | # |
| 713 | CONFIG_DISPLAY_SUPPORT=y | 808 | # CONFIG_DISPLAY_SUPPORT is not set |
| 714 | |||
| 715 | # | ||
| 716 | # Display hardware drivers | ||
| 717 | # | ||
| 718 | # CONFIG_SOUND is not set | 809 | # CONFIG_SOUND is not set |
| 719 | CONFIG_USB_SUPPORT=y | 810 | CONFIG_USB_SUPPORT=y |
| 720 | CONFIG_USB_ARCH_HAS_HCD=y | 811 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -741,13 +832,14 @@ CONFIG_USB=y | |||
| 741 | # USB Host Controller Drivers | 832 | # USB Host Controller Drivers |
| 742 | # | 833 | # |
| 743 | # CONFIG_USB_C67X00_HCD is not set | 834 | # CONFIG_USB_C67X00_HCD is not set |
| 835 | # CONFIG_USB_XHCI_HCD is not set | ||
| 744 | CONFIG_USB_EHCI_HCD=y | 836 | CONFIG_USB_EHCI_HCD=y |
| 745 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 837 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 746 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 838 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 747 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | ||
| 748 | # CONFIG_USB_OXU210HP_HCD is not set | 839 | # CONFIG_USB_OXU210HP_HCD is not set |
| 749 | # CONFIG_USB_ISP116X_HCD is not set | 840 | # CONFIG_USB_ISP116X_HCD is not set |
| 750 | # CONFIG_USB_ISP1760_HCD is not set | 841 | # CONFIG_USB_ISP1760_HCD is not set |
| 842 | # CONFIG_USB_ISP1362_HCD is not set | ||
| 751 | CONFIG_USB_OHCI_HCD=y | 843 | CONFIG_USB_OHCI_HCD=y |
| 752 | # CONFIG_USB_OHCI_HCD_SSB is not set | 844 | # CONFIG_USB_OHCI_HCD_SSB is not set |
| 753 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 845 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
| @@ -796,7 +888,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 796 | # CONFIG_USB_RIO500 is not set | 888 | # CONFIG_USB_RIO500 is not set |
| 797 | # CONFIG_USB_LEGOTOWER is not set | 889 | # CONFIG_USB_LEGOTOWER is not set |
| 798 | # CONFIG_USB_LCD is not set | 890 | # CONFIG_USB_LCD is not set |
| 799 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 800 | # CONFIG_USB_LED is not set | 891 | # CONFIG_USB_LED is not set |
| 801 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 892 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 802 | # CONFIG_USB_CYTHERM is not set | 893 | # CONFIG_USB_CYTHERM is not set |
| @@ -807,8 +898,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 807 | # CONFIG_USB_LD is not set | 898 | # CONFIG_USB_LD is not set |
| 808 | # CONFIG_USB_TRANCEVIBRATOR is not set | 899 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 809 | # CONFIG_USB_IOWARRIOR is not set | 900 | # CONFIG_USB_IOWARRIOR is not set |
| 901 | # CONFIG_USB_TEST is not set | ||
| 810 | # CONFIG_USB_ISIGHTFW is not set | 902 | # CONFIG_USB_ISIGHTFW is not set |
| 811 | # CONFIG_USB_VST is not set | ||
| 812 | # CONFIG_USB_GADGET is not set | 903 | # CONFIG_USB_GADGET is not set |
| 813 | 904 | ||
| 814 | # | 905 | # |
| @@ -819,7 +910,29 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 819 | # CONFIG_UWB is not set | 910 | # CONFIG_UWB is not set |
| 820 | # CONFIG_MMC is not set | 911 | # CONFIG_MMC is not set |
| 821 | # CONFIG_MEMSTICK is not set | 912 | # CONFIG_MEMSTICK is not set |
| 822 | # CONFIG_NEW_LEDS is not set | 913 | CONFIG_NEW_LEDS=y |
| 914 | CONFIG_LEDS_CLASS=y | ||
| 915 | |||
| 916 | # | ||
| 917 | # LED drivers | ||
| 918 | # | ||
| 919 | CONFIG_LEDS_GPIO=y | ||
| 920 | CONFIG_LEDS_GPIO_PLATFORM=y | ||
| 921 | # CONFIG_LEDS_LT3593 is not set | ||
| 922 | CONFIG_LEDS_TRIGGERS=y | ||
| 923 | |||
| 924 | # | ||
| 925 | # LED Triggers | ||
| 926 | # | ||
| 927 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
| 928 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
| 929 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
| 930 | CONFIG_LEDS_TRIGGER_GPIO=y | ||
| 931 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
| 932 | |||
| 933 | # | ||
| 934 | # iptables trigger is under Netfilter config (LED target) | ||
| 935 | # | ||
| 823 | # CONFIG_ACCESSIBILITY is not set | 936 | # CONFIG_ACCESSIBILITY is not set |
| 824 | # CONFIG_INFINIBAND is not set | 937 | # CONFIG_INFINIBAND is not set |
| 825 | CONFIG_RTC_LIB=y | 938 | CONFIG_RTC_LIB=y |
| @@ -827,6 +940,10 @@ CONFIG_RTC_LIB=y | |||
| 827 | # CONFIG_DMADEVICES is not set | 940 | # CONFIG_DMADEVICES is not set |
| 828 | # CONFIG_AUXDISPLAY is not set | 941 | # CONFIG_AUXDISPLAY is not set |
| 829 | # CONFIG_UIO is not set | 942 | # CONFIG_UIO is not set |
| 943 | |||
| 944 | # | ||
| 945 | # TI VLYNQ | ||
| 946 | # | ||
| 830 | # CONFIG_STAGING is not set | 947 | # CONFIG_STAGING is not set |
| 831 | 948 | ||
| 832 | # | 949 | # |
| @@ -838,12 +955,16 @@ CONFIG_RTC_LIB=y | |||
| 838 | # CONFIG_REISERFS_FS is not set | 955 | # CONFIG_REISERFS_FS is not set |
| 839 | # CONFIG_JFS_FS is not set | 956 | # CONFIG_JFS_FS is not set |
| 840 | # CONFIG_FS_POSIX_ACL is not set | 957 | # CONFIG_FS_POSIX_ACL is not set |
| 841 | # CONFIG_FILE_LOCKING is not set | ||
| 842 | # CONFIG_XFS_FS is not set | 958 | # CONFIG_XFS_FS is not set |
| 959 | # CONFIG_GFS2_FS is not set | ||
| 843 | # CONFIG_OCFS2_FS is not set | 960 | # CONFIG_OCFS2_FS is not set |
| 844 | # CONFIG_BTRFS_FS is not set | 961 | # CONFIG_BTRFS_FS is not set |
| 962 | # CONFIG_NILFS2_FS is not set | ||
| 963 | # CONFIG_FILE_LOCKING is not set | ||
| 964 | CONFIG_FSNOTIFY=y | ||
| 845 | # CONFIG_DNOTIFY is not set | 965 | # CONFIG_DNOTIFY is not set |
| 846 | # CONFIG_INOTIFY is not set | 966 | # CONFIG_INOTIFY is not set |
| 967 | CONFIG_INOTIFY_USER=y | ||
| 847 | # CONFIG_QUOTA is not set | 968 | # CONFIG_QUOTA is not set |
| 848 | # CONFIG_AUTOFS_FS is not set | 969 | # CONFIG_AUTOFS_FS is not set |
| 849 | # CONFIG_AUTOFS4_FS is not set | 970 | # CONFIG_AUTOFS4_FS is not set |
| @@ -875,8 +996,6 @@ CONFIG_PROC_KCORE=y | |||
| 875 | CONFIG_PROC_SYSCTL=y | 996 | CONFIG_PROC_SYSCTL=y |
| 876 | CONFIG_PROC_PAGE_MONITOR=y | 997 | CONFIG_PROC_PAGE_MONITOR=y |
| 877 | CONFIG_SYSFS=y | 998 | CONFIG_SYSFS=y |
| 878 | CONFIG_TMPFS=y | ||
| 879 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 880 | # CONFIG_HUGETLB_PAGE is not set | 999 | # CONFIG_HUGETLB_PAGE is not set |
| 881 | # CONFIG_CONFIGFS_FS is not set | 1000 | # CONFIG_CONFIGFS_FS is not set |
| 882 | CONFIG_MISC_FILESYSTEMS=y | 1001 | CONFIG_MISC_FILESYSTEMS=y |
| @@ -888,6 +1007,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 888 | # CONFIG_BFS_FS is not set | 1007 | # CONFIG_BFS_FS is not set |
| 889 | # CONFIG_EFS_FS is not set | 1008 | # CONFIG_EFS_FS is not set |
| 890 | # CONFIG_JFFS2_FS is not set | 1009 | # CONFIG_JFFS2_FS is not set |
| 1010 | # CONFIG_LOGFS is not set | ||
| 891 | # CONFIG_CRAMFS is not set | 1011 | # CONFIG_CRAMFS is not set |
| 892 | # CONFIG_SQUASHFS is not set | 1012 | # CONFIG_SQUASHFS is not set |
| 893 | # CONFIG_VXFS_FS is not set | 1013 | # CONFIG_VXFS_FS is not set |
| @@ -898,7 +1018,6 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 898 | # CONFIG_ROMFS_FS is not set | 1018 | # CONFIG_ROMFS_FS is not set |
| 899 | # CONFIG_SYSV_FS is not set | 1019 | # CONFIG_SYSV_FS is not set |
| 900 | # CONFIG_UFS_FS is not set | 1020 | # CONFIG_UFS_FS is not set |
| 901 | # CONFIG_NILFS2_FS is not set | ||
| 902 | # CONFIG_NETWORK_FILESYSTEMS is not set | 1021 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 903 | 1022 | ||
| 904 | # | 1023 | # |
| @@ -906,7 +1025,46 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 906 | # | 1025 | # |
| 907 | # CONFIG_PARTITION_ADVANCED is not set | 1026 | # CONFIG_PARTITION_ADVANCED is not set |
| 908 | CONFIG_MSDOS_PARTITION=y | 1027 | CONFIG_MSDOS_PARTITION=y |
| 909 | # CONFIG_NLS is not set | 1028 | CONFIG_NLS=y |
| 1029 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1030 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1031 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1032 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1033 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1034 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1035 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1036 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1037 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1038 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1039 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1040 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1041 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1042 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1043 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1044 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1045 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1046 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1047 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1048 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1049 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1050 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1051 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1052 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1053 | # CONFIG_NLS_ASCII is not set | ||
| 1054 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1055 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1056 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1057 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1058 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1059 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1060 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1061 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1062 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1063 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1064 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1065 | # CONFIG_NLS_KOI8_R is not set | ||
| 1066 | # CONFIG_NLS_KOI8_U is not set | ||
| 1067 | # CONFIG_NLS_UTF8 is not set | ||
| 910 | # CONFIG_DLM is not set | 1068 | # CONFIG_DLM is not set |
| 911 | 1069 | ||
| 912 | # | 1070 | # |
| @@ -918,29 +1076,23 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
| 918 | CONFIG_ENABLE_MUST_CHECK=y | 1076 | CONFIG_ENABLE_MUST_CHECK=y |
| 919 | CONFIG_FRAME_WARN=1024 | 1077 | CONFIG_FRAME_WARN=1024 |
| 920 | CONFIG_MAGIC_SYSRQ=y | 1078 | CONFIG_MAGIC_SYSRQ=y |
| 1079 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 921 | # CONFIG_UNUSED_SYMBOLS is not set | 1080 | # CONFIG_UNUSED_SYMBOLS is not set |
| 922 | # CONFIG_DEBUG_FS is not set | 1081 | # CONFIG_DEBUG_FS is not set |
| 923 | # CONFIG_HEADERS_CHECK is not set | 1082 | # CONFIG_HEADERS_CHECK is not set |
| 924 | # CONFIG_DEBUG_KERNEL is not set | 1083 | # CONFIG_DEBUG_KERNEL is not set |
| 925 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1084 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 926 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 927 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1085 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1086 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1087 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1088 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | ||
| 1089 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1090 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 928 | CONFIG_TRACING_SUPPORT=y | 1091 | CONFIG_TRACING_SUPPORT=y |
| 929 | 1092 | # CONFIG_FTRACE is not set | |
| 930 | # | ||
| 931 | # Tracers | ||
| 932 | # | ||
| 933 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 934 | # CONFIG_SCHED_TRACER is not set | ||
| 935 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 936 | # CONFIG_EVENT_TRACER is not set | ||
| 937 | # CONFIG_BOOT_TRACER is not set | ||
| 938 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 939 | # CONFIG_KMEMTRACE is not set | ||
| 940 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 941 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 942 | # CONFIG_SAMPLES is not set | 1093 | # CONFIG_SAMPLES is not set |
| 943 | CONFIG_HAVE_ARCH_KGDB=y | 1094 | CONFIG_HAVE_ARCH_KGDB=y |
| 1095 | CONFIG_EARLY_PRINTK=y | ||
| 944 | CONFIG_CMDLINE_BOOL=y | 1096 | CONFIG_CMDLINE_BOOL=y |
| 945 | CONFIG_CMDLINE="console=ttyS0,115200" | 1097 | CONFIG_CMDLINE="console=ttyS0,115200" |
| 946 | # CONFIG_CMDLINE_OVERRIDE is not set | 1098 | # CONFIG_CMDLINE_OVERRIDE is not set |
| @@ -951,8 +1103,108 @@ CONFIG_CMDLINE="console=ttyS0,115200" | |||
| 951 | # CONFIG_KEYS is not set | 1103 | # CONFIG_KEYS is not set |
| 952 | # CONFIG_SECURITY is not set | 1104 | # CONFIG_SECURITY is not set |
| 953 | # CONFIG_SECURITYFS is not set | 1105 | # CONFIG_SECURITYFS is not set |
| 954 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1106 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
| 955 | # CONFIG_CRYPTO is not set | 1107 | # CONFIG_DEFAULT_SECURITY_SMACK is not set |
| 1108 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
| 1109 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
| 1110 | CONFIG_DEFAULT_SECURITY="" | ||
| 1111 | CONFIG_CRYPTO=y | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Crypto core or helper | ||
| 1115 | # | ||
| 1116 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1117 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1118 | CONFIG_CRYPTO_ALGAPI2=y | ||
| 1119 | CONFIG_CRYPTO_AEAD2=y | ||
| 1120 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1121 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1122 | CONFIG_CRYPTO_HASH2=y | ||
| 1123 | CONFIG_CRYPTO_RNG=y | ||
| 1124 | CONFIG_CRYPTO_RNG2=y | ||
| 1125 | CONFIG_CRYPTO_PCOMP=y | ||
| 1126 | CONFIG_CRYPTO_MANAGER=y | ||
| 1127 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1128 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1129 | # CONFIG_CRYPTO_NULL is not set | ||
| 1130 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1131 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1132 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1133 | |||
| 1134 | # | ||
| 1135 | # Authenticated Encryption with Associated Data | ||
| 1136 | # | ||
| 1137 | # CONFIG_CRYPTO_CCM is not set | ||
| 1138 | # CONFIG_CRYPTO_GCM is not set | ||
| 1139 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1140 | |||
| 1141 | # | ||
| 1142 | # Block modes | ||
| 1143 | # | ||
| 1144 | # CONFIG_CRYPTO_CBC is not set | ||
| 1145 | # CONFIG_CRYPTO_CTR is not set | ||
| 1146 | # CONFIG_CRYPTO_CTS is not set | ||
| 1147 | CONFIG_CRYPTO_ECB=y | ||
| 1148 | # CONFIG_CRYPTO_LRW is not set | ||
| 1149 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1150 | # CONFIG_CRYPTO_XTS is not set | ||
| 1151 | |||
| 1152 | # | ||
| 1153 | # Hash modes | ||
| 1154 | # | ||
| 1155 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1156 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1157 | # CONFIG_CRYPTO_VMAC is not set | ||
| 1158 | |||
| 1159 | # | ||
| 1160 | # Digest | ||
| 1161 | # | ||
| 1162 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1163 | # CONFIG_CRYPTO_GHASH is not set | ||
| 1164 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1165 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1166 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1167 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1168 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1169 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1170 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1171 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1172 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1173 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1174 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1175 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1176 | |||
| 1177 | # | ||
| 1178 | # Ciphers | ||
| 1179 | # | ||
| 1180 | CONFIG_CRYPTO_AES=y | ||
| 1181 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1182 | CONFIG_CRYPTO_ARC4=y | ||
| 1183 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1184 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1185 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1186 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1187 | # CONFIG_CRYPTO_DES is not set | ||
| 1188 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1189 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1190 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1191 | # CONFIG_CRYPTO_SEED is not set | ||
| 1192 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1193 | # CONFIG_CRYPTO_TEA is not set | ||
| 1194 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1195 | |||
| 1196 | # | ||
| 1197 | # Compression | ||
| 1198 | # | ||
| 1199 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1200 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1201 | # CONFIG_CRYPTO_LZO is not set | ||
| 1202 | |||
| 1203 | # | ||
| 1204 | # Random Number Generation | ||
| 1205 | # | ||
| 1206 | CONFIG_CRYPTO_ANSI_CPRNG=y | ||
| 1207 | # CONFIG_CRYPTO_HW is not set | ||
| 956 | # CONFIG_BINARY_PRINTF is not set | 1208 | # CONFIG_BINARY_PRINTF is not set |
| 957 | 1209 | ||
| 958 | # | 1210 | # |
diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h index ed9aaaaf0749..2d28017e95d0 100644 --- a/arch/mips/include/asm/cmpxchg.h +++ b/arch/mips/include/asm/cmpxchg.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | ({ \ | 16 | ({ \ |
| 17 | __typeof(*(m)) __ret; \ | 17 | __typeof(*(m)) __ret; \ |
| 18 | \ | 18 | \ |
| 19 | if (kernel_uses_llsc && R10000_LLSC_WAR) { \ | 19 | if (kernel_uses_llsc && R10000_LLSC_WAR) { \ |
| 20 | __asm__ __volatile__( \ | 20 | __asm__ __volatile__( \ |
| 21 | " .set push \n" \ | 21 | " .set push \n" \ |
| 22 | " .set noat \n" \ | 22 | " .set noat \n" \ |
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h index 1cf7b1401ee4..fcdbe3a4ce1f 100644 --- a/arch/mips/include/asm/mach-loongson/loongson.h +++ b/arch/mips/include/asm/mach-loongson/loongson.h | |||
| @@ -307,7 +307,7 @@ extern unsigned long _loongson_addrwincfg_base; | |||
| 307 | */ | 307 | */ |
| 308 | #define LOONGSON_ADDRWIN_CFG(s, d, w, src, dst, size) do {\ | 308 | #define LOONGSON_ADDRWIN_CFG(s, d, w, src, dst, size) do {\ |
| 309 | s##_WIN##w##_BASE = (src); \ | 309 | s##_WIN##w##_BASE = (src); \ |
| 310 | s##_WIN##w##_MMAP = (src) | ADDRWIN_MAP_DST_##d; \ | 310 | s##_WIN##w##_MMAP = (dst) | ADDRWIN_MAP_DST_##d; \ |
| 311 | s##_WIN##w##_MASK = ~(size-1); \ | 311 | s##_WIN##w##_MASK = ~(size-1); \ |
| 312 | } while (0) | 312 | } while (0) |
| 313 | 313 | ||
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 26dc69d792a6..1be4b0fa30da 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h | |||
| @@ -120,9 +120,14 @@ | |||
| 120 | #endif | 120 | #endif |
| 121 | #define FIRST_USER_ADDRESS 0UL | 121 | #define FIRST_USER_ADDRESS 0UL |
| 122 | 122 | ||
| 123 | #define VMALLOC_START MAP_BASE | 123 | /* |
| 124 | * TLB refill handlers also map the vmalloc area into xuseg. Avoid | ||
| 125 | * the first couple of pages so NULL pointer dereferences will still | ||
| 126 | * reliably trap. | ||
| 127 | */ | ||
| 128 | #define VMALLOC_START (MAP_BASE + (2 * PAGE_SIZE)) | ||
| 124 | #define VMALLOC_END \ | 129 | #define VMALLOC_END \ |
| 125 | (VMALLOC_START + \ | 130 | (MAP_BASE + \ |
| 126 | min(PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, \ | 131 | min(PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, \ |
| 127 | (1UL << cpu_vmbits)) - (1UL << 32)) | 132 | (1UL << cpu_vmbits)) - (1UL << 32)) |
| 128 | 133 | ||
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index ce47118e52b7..cdc6a46efd98 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h | |||
| @@ -142,9 +142,9 @@ extern int ptrace_set_watch_regs(struct task_struct *child, | |||
| 142 | 142 | ||
| 143 | extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit); | 143 | extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit); |
| 144 | 144 | ||
| 145 | extern NORET_TYPE void die(const char *, const struct pt_regs *) ATTRIB_NORET; | 145 | extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET; |
| 146 | 146 | ||
| 147 | static inline void die_if_kernel(const char *str, const struct pt_regs *regs) | 147 | static inline void die_if_kernel(const char *str, struct pt_regs *regs) |
| 148 | { | 148 | { |
| 149 | if (unlikely(!user_mode(regs))) | 149 | if (unlikely(!user_mode(regs))) |
| 150 | die(str, regs); | 150 | die(str, regs); |
diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h index c8419129e770..58730c5ce4bf 100644 --- a/arch/mips/include/asm/stackframe.h +++ b/arch/mips/include/asm/stackframe.h | |||
| @@ -121,7 +121,7 @@ | |||
| 121 | .endm | 121 | .endm |
| 122 | #else | 122 | #else |
| 123 | .macro get_saved_sp /* Uniprocessor variation */ | 123 | .macro get_saved_sp /* Uniprocessor variation */ |
| 124 | #ifdef CONFIG_CPU_LOONGSON2F | 124 | #ifdef CONFIG_CPU_JUMP_WORKAROUNDS |
| 125 | /* | 125 | /* |
| 126 | * Clear BTB (branch target buffer), forbid RAS (return address | 126 | * Clear BTB (branch target buffer), forbid RAS (return address |
| 127 | * stack) to workaround the Out-of-order Issue in Loongson2F | 127 | * stack) to workaround the Out-of-order Issue in Loongson2F |
diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h index 11a8b5252549..697e40c06497 100644 --- a/arch/mips/include/asm/uasm.h +++ b/arch/mips/include/asm/uasm.h | |||
| @@ -167,6 +167,24 @@ static inline void __cpuinit uasm_l##lb(struct uasm_label **lab, u32 *addr) \ | |||
| 167 | #define uasm_i_ssnop(buf) uasm_i_sll(buf, 0, 0, 1) | 167 | #define uasm_i_ssnop(buf) uasm_i_sll(buf, 0, 0, 1) |
| 168 | #define uasm_i_ehb(buf) uasm_i_sll(buf, 0, 0, 3) | 168 | #define uasm_i_ehb(buf) uasm_i_sll(buf, 0, 0, 3) |
| 169 | 169 | ||
| 170 | static inline void uasm_i_dsrl_safe(u32 **p, unsigned int a1, | ||
| 171 | unsigned int a2, unsigned int a3) | ||
| 172 | { | ||
| 173 | if (a3 < 32) | ||
| 174 | uasm_i_dsrl(p, a1, a2, a3); | ||
| 175 | else | ||
| 176 | uasm_i_dsrl32(p, a1, a2, a3 - 32); | ||
| 177 | } | ||
| 178 | |||
| 179 | static inline void uasm_i_dsll_safe(u32 **p, unsigned int a1, | ||
| 180 | unsigned int a2, unsigned int a3) | ||
| 181 | { | ||
| 182 | if (a3 < 32) | ||
| 183 | uasm_i_dsll(p, a1, a2, a3); | ||
| 184 | else | ||
| 185 | uasm_i_dsll32(p, a1, a2, a3 - 32); | ||
| 186 | } | ||
| 187 | |||
| 170 | /* Handle relocations. */ | 188 | /* Handle relocations. */ |
| 171 | struct uasm_reloc { | 189 | struct uasm_reloc { |
| 172 | u32 *addr; | 190 | u32 *addr; |
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 7043f6b9ff3c..0d0f054a02f4 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
| @@ -76,15 +76,9 @@ void __init plat_mem_setup(void) | |||
| 76 | 76 | ||
| 77 | #ifdef CONFIG_VT | 77 | #ifdef CONFIG_VT |
| 78 | screen_info = (struct screen_info) { | 78 | screen_info = (struct screen_info) { |
| 79 | 0, 0, /* orig-x, orig-y */ | 79 | .orig_video_cols = 160, |
| 80 | 0, /* unused */ | 80 | .orig_video_lines = 64, |
| 81 | 0, /* orig_video_page */ | 81 | .orig_video_points = 16, |
| 82 | 0, /* orig_video_mode */ | ||
| 83 | 160, /* orig_video_cols */ | ||
| 84 | 0, 0, 0, /* unused, ega_bx, unused */ | ||
| 85 | 64, /* orig_video_lines */ | ||
| 86 | 0, /* orig_video_isVGA */ | ||
| 87 | 16 /* orig_video_points */ | ||
| 88 | }; | 82 | }; |
| 89 | #endif | 83 | #endif |
| 90 | 84 | ||
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 1a4dd657ccb9..d612c6dcb746 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -352,9 +352,10 @@ void show_registers(const struct pt_regs *regs) | |||
| 352 | 352 | ||
| 353 | static DEFINE_SPINLOCK(die_lock); | 353 | static DEFINE_SPINLOCK(die_lock); |
| 354 | 354 | ||
| 355 | void __noreturn die(const char * str, const struct pt_regs * regs) | 355 | void __noreturn die(const char * str, struct pt_regs * regs) |
| 356 | { | 356 | { |
| 357 | static int die_counter; | 357 | static int die_counter; |
| 358 | int sig = SIGSEGV; | ||
| 358 | #ifdef CONFIG_MIPS_MT_SMTC | 359 | #ifdef CONFIG_MIPS_MT_SMTC |
| 359 | unsigned long dvpret = dvpe(); | 360 | unsigned long dvpret = dvpe(); |
| 360 | #endif /* CONFIG_MIPS_MT_SMTC */ | 361 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| @@ -365,6 +366,10 @@ void __noreturn die(const char * str, const struct pt_regs * regs) | |||
| 365 | #ifdef CONFIG_MIPS_MT_SMTC | 366 | #ifdef CONFIG_MIPS_MT_SMTC |
| 366 | mips_mt_regdump(dvpret); | 367 | mips_mt_regdump(dvpret); |
| 367 | #endif /* CONFIG_MIPS_MT_SMTC */ | 368 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| 369 | |||
| 370 | if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) | ||
| 371 | sig = 0; | ||
| 372 | |||
| 368 | printk("%s[#%d]:\n", str, ++die_counter); | 373 | printk("%s[#%d]:\n", str, ++die_counter); |
| 369 | show_registers(regs); | 374 | show_registers(regs); |
| 370 | add_taint(TAINT_DIE); | 375 | add_taint(TAINT_DIE); |
| @@ -379,7 +384,7 @@ void __noreturn die(const char * str, const struct pt_regs * regs) | |||
| 379 | panic("Fatal exception"); | 384 | panic("Fatal exception"); |
| 380 | } | 385 | } |
| 381 | 386 | ||
| 382 | do_exit(SIGSEGV); | 387 | do_exit(sig); |
| 383 | } | 388 | } |
| 384 | 389 | ||
| 385 | extern struct exception_table_entry __start___dbe_table[]; | 390 | extern struct exception_table_entry __start___dbe_table[]; |
| @@ -1557,12 +1562,7 @@ static char panic_null_cerr[] __cpuinitdata = | |||
| 1557 | void __cpuinit set_uncached_handler(unsigned long offset, void *addr, | 1562 | void __cpuinit set_uncached_handler(unsigned long offset, void *addr, |
| 1558 | unsigned long size) | 1563 | unsigned long size) |
| 1559 | { | 1564 | { |
| 1560 | #ifdef CONFIG_32BIT | 1565 | unsigned long uncached_ebase = CKSEG1ADDR(ebase); |
| 1561 | unsigned long uncached_ebase = KSEG1ADDR(ebase); | ||
| 1562 | #endif | ||
| 1563 | #ifdef CONFIG_64BIT | ||
| 1564 | unsigned long uncached_ebase = TO_UNCAC(ebase); | ||
| 1565 | #endif | ||
| 1566 | 1566 | ||
| 1567 | if (!addr) | 1567 | if (!addr) |
| 1568 | panic(panic_null_cerr); | 1568 | panic(panic_null_cerr); |
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c index 853f184b793e..81fbe6b73f91 100644 --- a/arch/mips/loongson/common/machtype.c +++ b/arch/mips/loongson/common/machtype.c | |||
| @@ -24,7 +24,7 @@ static const char *system_types[] = { | |||
| 24 | [MACH_LEMOTE_FL2F] "lemote-fuloong-2f-box", | 24 | [MACH_LEMOTE_FL2F] "lemote-fuloong-2f-box", |
| 25 | [MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches", | 25 | [MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches", |
| 26 | [MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches", | 26 | [MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches", |
| 27 | [MACH_DEXXON_GDIUM2F10] "dexxon-gidum-2f-10inches", | 27 | [MACH_DEXXON_GDIUM2F10] "dexxon-gdium-2f", |
| 28 | [MACH_LEMOTE_NAS] "lemote-nas-2f", | 28 | [MACH_LEMOTE_NAS] "lemote-nas-2f", |
| 29 | [MACH_LEMOTE_LL2F] "lemote-lynloong-2f", | 29 | [MACH_LEMOTE_LL2F] "lemote-lynloong-2f", |
| 30 | [MACH_LOONGSON_END] NULL, | 30 | [MACH_LOONGSON_END] NULL, |
diff --git a/arch/mips/loongson/common/mem.c b/arch/mips/loongson/common/mem.c index ec2f7964a0b0..30eba6001205 100644 --- a/arch/mips/loongson/common/mem.c +++ b/arch/mips/loongson/common/mem.c | |||
| @@ -75,7 +75,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | |||
| 75 | unsigned long end = offset + size; | 75 | unsigned long end = offset + size; |
| 76 | 76 | ||
| 77 | if (__uncached_access(file, offset)) { | 77 | if (__uncached_access(file, offset)) { |
| 78 | if (((uca_start && offset) >= uca_start) && | 78 | if (uca_start && (offset >= uca_start) && |
| 79 | (end <= uca_end)) | 79 | (end <= uca_end)) |
| 80 | return __pgprot((pgprot_val(vma_prot) & | 80 | return __pgprot((pgprot_val(vma_prot) & |
| 81 | ~_CACHE_MASK) | | 81 | ~_CACHE_MASK) | |
| @@ -96,7 +96,7 @@ static int __init find_vga_mem_init(void) | |||
| 96 | return 0; | 96 | return 0; |
| 97 | 97 | ||
| 98 | for_each_pci_dev(dev) { | 98 | for_each_pci_dev(dev) { |
| 99 | if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) { | 99 | if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) { |
| 100 | for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) { | 100 | for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) { |
| 101 | r = &dev->resource[idx]; | 101 | r = &dev->resource[idx]; |
| 102 | if (!r->start && r->end) | 102 | if (!r->start && r->end) |
diff --git a/arch/mips/loongson/common/reset.c b/arch/mips/loongson/common/reset.c index 4bd9c18b07a5..9e10d6225d9b 100644 --- a/arch/mips/loongson/common/reset.c +++ b/arch/mips/loongson/common/reset.c | |||
| @@ -16,13 +16,31 @@ | |||
| 16 | 16 | ||
| 17 | #include <loongson.h> | 17 | #include <loongson.h> |
| 18 | 18 | ||
| 19 | static inline void loongson_reboot(void) | ||
| 20 | { | ||
| 21 | #ifndef CONFIG_CPU_JUMP_WORKAROUNDS | ||
| 22 | ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) (); | ||
| 23 | #else | ||
| 24 | void (*func)(void); | ||
| 25 | |||
| 26 | func = (void *)ioremap_nocache(LOONGSON_BOOT_BASE, 4); | ||
| 27 | |||
| 28 | __asm__ __volatile__( | ||
| 29 | " .set noat \n" | ||
| 30 | " jr %[func] \n" | ||
| 31 | " .set at \n" | ||
| 32 | : /* No outputs */ | ||
| 33 | : [func] "r" (func)); | ||
| 34 | #endif | ||
| 35 | } | ||
| 36 | |||
| 19 | static void loongson_restart(char *command) | 37 | static void loongson_restart(char *command) |
| 20 | { | 38 | { |
| 21 | /* do preparation for reboot */ | 39 | /* do preparation for reboot */ |
| 22 | mach_prepare_reboot(); | 40 | mach_prepare_reboot(); |
| 23 | 41 | ||
| 24 | /* reboot via jumping to boot base address */ | 42 | /* reboot via jumping to boot base address */ |
| 25 | ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) (); | 43 | loongson_reboot(); |
| 26 | } | 44 | } |
| 27 | 45 | ||
| 28 | static void loongson_poweroff(void) | 46 | static void loongson_poweroff(void) |
diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c index 4cd2aa9a342c..27d826bc7103 100644 --- a/arch/mips/loongson/common/setup.c +++ b/arch/mips/loongson/common/setup.c | |||
| @@ -41,15 +41,12 @@ void __init plat_mem_setup(void) | |||
| 41 | conswitchp = &vga_con; | 41 | conswitchp = &vga_con; |
| 42 | 42 | ||
| 43 | screen_info = (struct screen_info) { | 43 | screen_info = (struct screen_info) { |
| 44 | 0, 25, /* orig-x, orig-y */ | 44 | .orig_x = 0, |
| 45 | 0, /* unused */ | 45 | .orig_y = 25, |
| 46 | 0, /* orig-video-page */ | 46 | .orig_video_cols = 80, |
| 47 | 0, /* orig-video-mode */ | 47 | .orig_video_lines = 25, |
| 48 | 80, /* orig-video-cols */ | 48 | .orig_video_isVGA = VIDEO_TYPE_VGAC, |
| 49 | 0, 0, 0, /* ega_ax, ega_bx, ega_cx */ | 49 | .orig_video_points = 16, |
| 50 | 25, /* orig-video-lines */ | ||
| 51 | VIDEO_TYPE_VGAC, /* orig-video-isVGA */ | ||
| 52 | 16 /* orig-video-points */ | ||
| 53 | }; | 50 | }; |
| 54 | #elif defined(CONFIG_DUMMY_CONSOLE) | 51 | #elif defined(CONFIG_DUMMY_CONSOLE) |
| 55 | conswitchp = &dummy_con; | 52 | conswitchp = &dummy_con; |
diff --git a/arch/mips/loongson/lemote-2f/irq.c b/arch/mips/loongson/lemote-2f/irq.c index 882dfcd42c00..1d8b4d28a058 100644 --- a/arch/mips/loongson/lemote-2f/irq.c +++ b/arch/mips/loongson/lemote-2f/irq.c | |||
| @@ -79,7 +79,7 @@ void mach_irq_dispatch(unsigned int pending) | |||
| 79 | if (pending & CAUSEF_IP7) | 79 | if (pending & CAUSEF_IP7) |
| 80 | do_IRQ(LOONGSON_TIMER_IRQ); | 80 | do_IRQ(LOONGSON_TIMER_IRQ); |
| 81 | else if (pending & CAUSEF_IP6) { /* North Bridge, Perf counter */ | 81 | else if (pending & CAUSEF_IP6) { /* North Bridge, Perf counter */ |
| 82 | #ifdef CONFIG_OPROFILE | 82 | #if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE) |
| 83 | do_IRQ(LOONGSON2_PERFCNT_IRQ); | 83 | do_IRQ(LOONGSON2_PERFCNT_IRQ); |
| 84 | #endif | 84 | #endif |
| 85 | bonito_irqdispatch(); | 85 | bonito_irqdispatch(); |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index d1f68aadbc4c..86f004dc8355 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
| @@ -31,6 +31,16 @@ | |||
| 31 | #include <asm/war.h> | 31 | #include <asm/war.h> |
| 32 | #include <asm/uasm.h> | 32 | #include <asm/uasm.h> |
| 33 | 33 | ||
| 34 | /* | ||
| 35 | * TLB load/store/modify handlers. | ||
| 36 | * | ||
| 37 | * Only the fastpath gets synthesized at runtime, the slowpath for | ||
| 38 | * do_page_fault remains normal asm. | ||
| 39 | */ | ||
| 40 | extern void tlb_do_page_fault_0(void); | ||
| 41 | extern void tlb_do_page_fault_1(void); | ||
| 42 | |||
| 43 | |||
| 34 | static inline int r45k_bvahwbug(void) | 44 | static inline int r45k_bvahwbug(void) |
| 35 | { | 45 | { |
| 36 | /* XXX: We should probe for the presence of this bug, but we don't. */ | 46 | /* XXX: We should probe for the presence of this bug, but we don't. */ |
| @@ -83,6 +93,7 @@ enum label_id { | |||
| 83 | label_nopage_tlbm, | 93 | label_nopage_tlbm, |
| 84 | label_smp_pgtable_change, | 94 | label_smp_pgtable_change, |
| 85 | label_r3000_write_probe_fail, | 95 | label_r3000_write_probe_fail, |
| 96 | label_large_segbits_fault, | ||
| 86 | #ifdef CONFIG_HUGETLB_PAGE | 97 | #ifdef CONFIG_HUGETLB_PAGE |
| 87 | label_tlb_huge_update, | 98 | label_tlb_huge_update, |
| 88 | #endif | 99 | #endif |
| @@ -101,6 +112,7 @@ UASM_L_LA(_nopage_tlbs) | |||
| 101 | UASM_L_LA(_nopage_tlbm) | 112 | UASM_L_LA(_nopage_tlbm) |
| 102 | UASM_L_LA(_smp_pgtable_change) | 113 | UASM_L_LA(_smp_pgtable_change) |
| 103 | UASM_L_LA(_r3000_write_probe_fail) | 114 | UASM_L_LA(_r3000_write_probe_fail) |
| 115 | UASM_L_LA(_large_segbits_fault) | ||
| 104 | #ifdef CONFIG_HUGETLB_PAGE | 116 | #ifdef CONFIG_HUGETLB_PAGE |
| 105 | UASM_L_LA(_tlb_huge_update) | 117 | UASM_L_LA(_tlb_huge_update) |
| 106 | #endif | 118 | #endif |
| @@ -157,6 +169,10 @@ static u32 tlb_handler[128] __cpuinitdata; | |||
| 157 | static struct uasm_label labels[128] __cpuinitdata; | 169 | static struct uasm_label labels[128] __cpuinitdata; |
| 158 | static struct uasm_reloc relocs[128] __cpuinitdata; | 170 | static struct uasm_reloc relocs[128] __cpuinitdata; |
| 159 | 171 | ||
| 172 | #ifdef CONFIG_64BIT | ||
| 173 | static int check_for_high_segbits __cpuinitdata; | ||
| 174 | #endif | ||
| 175 | |||
| 160 | #ifndef CONFIG_MIPS_PGD_C0_CONTEXT | 176 | #ifndef CONFIG_MIPS_PGD_C0_CONTEXT |
| 161 | /* | 177 | /* |
| 162 | * CONFIG_MIPS_PGD_C0_CONTEXT implies 64 bit and lack of pgd_current, | 178 | * CONFIG_MIPS_PGD_C0_CONTEXT implies 64 bit and lack of pgd_current, |
| @@ -408,7 +424,7 @@ static __cpuinit __maybe_unused void build_convert_pte_to_entrylo(u32 **p, | |||
| 408 | UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC)); | 424 | UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC)); |
| 409 | } else { | 425 | } else { |
| 410 | #ifdef CONFIG_64BIT_PHYS_ADDR | 426 | #ifdef CONFIG_64BIT_PHYS_ADDR |
| 411 | uasm_i_dsrl(p, reg, reg, ilog2(_PAGE_GLOBAL)); | 427 | uasm_i_dsrl_safe(p, reg, reg, ilog2(_PAGE_GLOBAL)); |
| 412 | #else | 428 | #else |
| 413 | UASM_i_SRL(p, reg, reg, ilog2(_PAGE_GLOBAL)); | 429 | UASM_i_SRL(p, reg, reg, ilog2(_PAGE_GLOBAL)); |
| 414 | #endif | 430 | #endif |
| @@ -532,7 +548,24 @@ build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, | |||
| 532 | * The vmalloc handling is not in the hotpath. | 548 | * The vmalloc handling is not in the hotpath. |
| 533 | */ | 549 | */ |
| 534 | uasm_i_dmfc0(p, tmp, C0_BADVADDR); | 550 | uasm_i_dmfc0(p, tmp, C0_BADVADDR); |
| 535 | uasm_il_bltz(p, r, tmp, label_vmalloc); | 551 | |
| 552 | if (check_for_high_segbits) { | ||
| 553 | /* | ||
| 554 | * The kernel currently implicitely assumes that the | ||
| 555 | * MIPS SEGBITS parameter for the processor is | ||
| 556 | * (PGDIR_SHIFT+PGDIR_BITS) or less, and will never | ||
| 557 | * allocate virtual addresses outside the maximum | ||
| 558 | * range for SEGBITS = (PGDIR_SHIFT+PGDIR_BITS). But | ||
| 559 | * that doesn't prevent user code from accessing the | ||
| 560 | * higher xuseg addresses. Here, we make sure that | ||
| 561 | * everything but the lower xuseg addresses goes down | ||
| 562 | * the module_alloc/vmalloc path. | ||
| 563 | */ | ||
| 564 | uasm_i_dsrl_safe(p, ptr, tmp, PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3); | ||
| 565 | uasm_il_bnez(p, r, ptr, label_vmalloc); | ||
| 566 | } else { | ||
| 567 | uasm_il_bltz(p, r, tmp, label_vmalloc); | ||
| 568 | } | ||
| 536 | /* No uasm_i_nop needed here, since the next insn doesn't touch TMP. */ | 569 | /* No uasm_i_nop needed here, since the next insn doesn't touch TMP. */ |
| 537 | 570 | ||
| 538 | #ifdef CONFIG_MIPS_PGD_C0_CONTEXT | 571 | #ifdef CONFIG_MIPS_PGD_C0_CONTEXT |
| @@ -549,14 +582,14 @@ build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, | |||
| 549 | * SMTC uses TCBind value as "CPU" index | 582 | * SMTC uses TCBind value as "CPU" index |
| 550 | */ | 583 | */ |
| 551 | uasm_i_mfc0(p, ptr, C0_TCBIND); | 584 | uasm_i_mfc0(p, ptr, C0_TCBIND); |
| 552 | uasm_i_dsrl(p, ptr, ptr, 19); | 585 | uasm_i_dsrl_safe(p, ptr, ptr, 19); |
| 553 | # else | 586 | # else |
| 554 | /* | 587 | /* |
| 555 | * 64 bit SMP running in XKPHYS has smp_processor_id() << 3 | 588 | * 64 bit SMP running in XKPHYS has smp_processor_id() << 3 |
| 556 | * stored in CONTEXT. | 589 | * stored in CONTEXT. |
| 557 | */ | 590 | */ |
| 558 | uasm_i_dmfc0(p, ptr, C0_CONTEXT); | 591 | uasm_i_dmfc0(p, ptr, C0_CONTEXT); |
| 559 | uasm_i_dsrl(p, ptr, ptr, 23); | 592 | uasm_i_dsrl_safe(p, ptr, ptr, 23); |
| 560 | # endif | 593 | # endif |
| 561 | UASM_i_LA_mostly(p, tmp, pgdc); | 594 | UASM_i_LA_mostly(p, tmp, pgdc); |
| 562 | uasm_i_daddu(p, ptr, ptr, tmp); | 595 | uasm_i_daddu(p, ptr, ptr, tmp); |
| @@ -569,44 +602,78 @@ build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, | |||
| 569 | 602 | ||
| 570 | uasm_l_vmalloc_done(l, *p); | 603 | uasm_l_vmalloc_done(l, *p); |
| 571 | 604 | ||
| 572 | if (PGDIR_SHIFT - 3 < 32) /* get pgd offset in bytes */ | 605 | /* get pgd offset in bytes */ |
| 573 | uasm_i_dsrl(p, tmp, tmp, PGDIR_SHIFT-3); | 606 | uasm_i_dsrl_safe(p, tmp, tmp, PGDIR_SHIFT - 3); |
| 574 | else | ||
| 575 | uasm_i_dsrl32(p, tmp, tmp, PGDIR_SHIFT - 3 - 32); | ||
| 576 | 607 | ||
| 577 | uasm_i_andi(p, tmp, tmp, (PTRS_PER_PGD - 1)<<3); | 608 | uasm_i_andi(p, tmp, tmp, (PTRS_PER_PGD - 1)<<3); |
| 578 | uasm_i_daddu(p, ptr, ptr, tmp); /* add in pgd offset */ | 609 | uasm_i_daddu(p, ptr, ptr, tmp); /* add in pgd offset */ |
| 579 | #ifndef __PAGETABLE_PMD_FOLDED | 610 | #ifndef __PAGETABLE_PMD_FOLDED |
| 580 | uasm_i_dmfc0(p, tmp, C0_BADVADDR); /* get faulting address */ | 611 | uasm_i_dmfc0(p, tmp, C0_BADVADDR); /* get faulting address */ |
| 581 | uasm_i_ld(p, ptr, 0, ptr); /* get pmd pointer */ | 612 | uasm_i_ld(p, ptr, 0, ptr); /* get pmd pointer */ |
| 582 | uasm_i_dsrl(p, tmp, tmp, PMD_SHIFT-3); /* get pmd offset in bytes */ | 613 | uasm_i_dsrl_safe(p, tmp, tmp, PMD_SHIFT-3); /* get pmd offset in bytes */ |
| 583 | uasm_i_andi(p, tmp, tmp, (PTRS_PER_PMD - 1)<<3); | 614 | uasm_i_andi(p, tmp, tmp, (PTRS_PER_PMD - 1)<<3); |
| 584 | uasm_i_daddu(p, ptr, ptr, tmp); /* add in pmd offset */ | 615 | uasm_i_daddu(p, ptr, ptr, tmp); /* add in pmd offset */ |
| 585 | #endif | 616 | #endif |
| 586 | } | 617 | } |
| 587 | 618 | ||
| 619 | enum vmalloc64_mode {not_refill, refill}; | ||
| 588 | /* | 620 | /* |
| 589 | * BVADDR is the faulting address, PTR is scratch. | 621 | * BVADDR is the faulting address, PTR is scratch. |
| 590 | * PTR will hold the pgd for vmalloc. | 622 | * PTR will hold the pgd for vmalloc. |
| 591 | */ | 623 | */ |
| 592 | static void __cpuinit | 624 | static void __cpuinit |
| 593 | build_get_pgd_vmalloc64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, | 625 | build_get_pgd_vmalloc64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, |
| 594 | unsigned int bvaddr, unsigned int ptr) | 626 | unsigned int bvaddr, unsigned int ptr, |
| 627 | enum vmalloc64_mode mode) | ||
| 595 | { | 628 | { |
| 596 | long swpd = (long)swapper_pg_dir; | 629 | long swpd = (long)swapper_pg_dir; |
| 630 | int single_insn_swpd; | ||
| 631 | int did_vmalloc_branch = 0; | ||
| 632 | |||
| 633 | single_insn_swpd = uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd); | ||
| 597 | 634 | ||
| 598 | uasm_l_vmalloc(l, *p); | 635 | uasm_l_vmalloc(l, *p); |
| 599 | 636 | ||
| 600 | if (uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd)) { | 637 | if (mode == refill && check_for_high_segbits) { |
| 601 | uasm_il_b(p, r, label_vmalloc_done); | 638 | if (single_insn_swpd) { |
| 602 | uasm_i_lui(p, ptr, uasm_rel_hi(swpd)); | 639 | uasm_il_bltz(p, r, bvaddr, label_vmalloc_done); |
| 603 | } else { | 640 | uasm_i_lui(p, ptr, uasm_rel_hi(swpd)); |
| 604 | UASM_i_LA_mostly(p, ptr, swpd); | 641 | did_vmalloc_branch = 1; |
| 605 | uasm_il_b(p, r, label_vmalloc_done); | 642 | /* fall through */ |
| 606 | if (uasm_in_compat_space_p(swpd)) | 643 | } else { |
| 607 | uasm_i_addiu(p, ptr, ptr, uasm_rel_lo(swpd)); | 644 | uasm_il_bgez(p, r, bvaddr, label_large_segbits_fault); |
| 608 | else | 645 | } |
| 609 | uasm_i_daddiu(p, ptr, ptr, uasm_rel_lo(swpd)); | 646 | } |
| 647 | if (!did_vmalloc_branch) { | ||
| 648 | if (uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd)) { | ||
| 649 | uasm_il_b(p, r, label_vmalloc_done); | ||
| 650 | uasm_i_lui(p, ptr, uasm_rel_hi(swpd)); | ||
| 651 | } else { | ||
| 652 | UASM_i_LA_mostly(p, ptr, swpd); | ||
| 653 | uasm_il_b(p, r, label_vmalloc_done); | ||
| 654 | if (uasm_in_compat_space_p(swpd)) | ||
| 655 | uasm_i_addiu(p, ptr, ptr, uasm_rel_lo(swpd)); | ||
| 656 | else | ||
| 657 | uasm_i_daddiu(p, ptr, ptr, uasm_rel_lo(swpd)); | ||
| 658 | } | ||
| 659 | } | ||
| 660 | if (mode == refill && check_for_high_segbits) { | ||
| 661 | uasm_l_large_segbits_fault(l, *p); | ||
| 662 | /* | ||
| 663 | * We get here if we are an xsseg address, or if we are | ||
| 664 | * an xuseg address above (PGDIR_SHIFT+PGDIR_BITS) boundary. | ||
| 665 | * | ||
| 666 | * Ignoring xsseg (assume disabled so would generate | ||
| 667 | * (address errors?), the only remaining possibility | ||
| 668 | * is the upper xuseg addresses. On processors with | ||
| 669 | * TLB_SEGBITS <= PGDIR_SHIFT+PGDIR_BITS, these | ||
| 670 | * addresses would have taken an address error. We try | ||
| 671 | * to mimic that here by taking a load/istream page | ||
| 672 | * fault. | ||
| 673 | */ | ||
| 674 | UASM_i_LA(p, ptr, (unsigned long)tlb_do_page_fault_0); | ||
| 675 | uasm_i_jr(p, ptr); | ||
| 676 | uasm_i_nop(p); | ||
| 610 | } | 677 | } |
| 611 | } | 678 | } |
| 612 | 679 | ||
| @@ -720,9 +787,9 @@ static void __cpuinit build_update_entries(u32 **p, unsigned int tmp, | |||
| 720 | UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */ | 787 | UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */ |
| 721 | UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC)); | 788 | UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC)); |
| 722 | } else { | 789 | } else { |
| 723 | uasm_i_dsrl(p, tmp, tmp, ilog2(_PAGE_GLOBAL)); /* convert to entrylo0 */ | 790 | uasm_i_dsrl_safe(p, tmp, tmp, ilog2(_PAGE_GLOBAL)); /* convert to entrylo0 */ |
| 724 | UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */ | 791 | UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */ |
| 725 | uasm_i_dsrl(p, ptep, ptep, ilog2(_PAGE_GLOBAL)); /* convert to entrylo1 */ | 792 | uasm_i_dsrl_safe(p, ptep, ptep, ilog2(_PAGE_GLOBAL)); /* convert to entrylo1 */ |
| 726 | } | 793 | } |
| 727 | UASM_i_MTC0(p, ptep, C0_ENTRYLO1); /* load it */ | 794 | UASM_i_MTC0(p, ptep, C0_ENTRYLO1); /* load it */ |
| 728 | } else { | 795 | } else { |
| @@ -793,9 +860,9 @@ static void __cpuinit build_r4000_tlb_refill_handler(void) | |||
| 793 | uasm_i_dmfc0(&p, K0, C0_BADVADDR); | 860 | uasm_i_dmfc0(&p, K0, C0_BADVADDR); |
| 794 | uasm_i_dmfc0(&p, K1, C0_ENTRYHI); | 861 | uasm_i_dmfc0(&p, K1, C0_ENTRYHI); |
| 795 | uasm_i_xor(&p, K0, K0, K1); | 862 | uasm_i_xor(&p, K0, K0, K1); |
| 796 | uasm_i_dsrl32(&p, K1, K0, 62 - 32); | 863 | uasm_i_dsrl_safe(&p, K1, K0, 62); |
| 797 | uasm_i_dsrl(&p, K0, K0, 12 + 1); | 864 | uasm_i_dsrl_safe(&p, K0, K0, 12 + 1); |
| 798 | uasm_i_dsll32(&p, K0, K0, 64 + 12 + 1 - segbits - 32); | 865 | uasm_i_dsll_safe(&p, K0, K0, 64 + 12 + 1 - segbits); |
| 799 | uasm_i_or(&p, K0, K0, K1); | 866 | uasm_i_or(&p, K0, K0, K1); |
| 800 | uasm_il_bnez(&p, &r, K0, label_leave); | 867 | uasm_il_bnez(&p, &r, K0, label_leave); |
| 801 | /* No need for uasm_i_nop */ | 868 | /* No need for uasm_i_nop */ |
| @@ -825,7 +892,7 @@ static void __cpuinit build_r4000_tlb_refill_handler(void) | |||
| 825 | #endif | 892 | #endif |
| 826 | 893 | ||
| 827 | #ifdef CONFIG_64BIT | 894 | #ifdef CONFIG_64BIT |
| 828 | build_get_pgd_vmalloc64(&p, &l, &r, K0, K1); | 895 | build_get_pgd_vmalloc64(&p, &l, &r, K0, K1, refill); |
| 829 | #endif | 896 | #endif |
| 830 | 897 | ||
| 831 | /* | 898 | /* |
| @@ -935,15 +1002,6 @@ static void __cpuinit build_r4000_tlb_refill_handler(void) | |||
| 935 | } | 1002 | } |
| 936 | 1003 | ||
| 937 | /* | 1004 | /* |
| 938 | * TLB load/store/modify handlers. | ||
| 939 | * | ||
| 940 | * Only the fastpath gets synthesized at runtime, the slowpath for | ||
| 941 | * do_page_fault remains normal asm. | ||
| 942 | */ | ||
| 943 | extern void tlb_do_page_fault_0(void); | ||
| 944 | extern void tlb_do_page_fault_1(void); | ||
| 945 | |||
| 946 | /* | ||
| 947 | * 128 instructions for the fastpath handler is generous and should | 1005 | * 128 instructions for the fastpath handler is generous and should |
| 948 | * never be exceeded. | 1006 | * never be exceeded. |
| 949 | */ | 1007 | */ |
| @@ -1302,7 +1360,7 @@ build_r4000_tlbchange_handler_tail(u32 **p, struct uasm_label **l, | |||
| 1302 | uasm_i_eret(p); /* return from trap */ | 1360 | uasm_i_eret(p); /* return from trap */ |
| 1303 | 1361 | ||
| 1304 | #ifdef CONFIG_64BIT | 1362 | #ifdef CONFIG_64BIT |
| 1305 | build_get_pgd_vmalloc64(p, l, r, tmp, ptr); | 1363 | build_get_pgd_vmalloc64(p, l, r, tmp, ptr, not_refill); |
| 1306 | #endif | 1364 | #endif |
| 1307 | } | 1365 | } |
| 1308 | 1366 | ||
| @@ -1322,9 +1380,9 @@ static void __cpuinit build_r4000_tlb_load_handler(void) | |||
| 1322 | uasm_i_dmfc0(&p, K0, C0_BADVADDR); | 1380 | uasm_i_dmfc0(&p, K0, C0_BADVADDR); |
| 1323 | uasm_i_dmfc0(&p, K1, C0_ENTRYHI); | 1381 | uasm_i_dmfc0(&p, K1, C0_ENTRYHI); |
| 1324 | uasm_i_xor(&p, K0, K0, K1); | 1382 | uasm_i_xor(&p, K0, K0, K1); |
| 1325 | uasm_i_dsrl32(&p, K1, K0, 62 - 32); | 1383 | uasm_i_dsrl_safe(&p, K1, K0, 62); |
| 1326 | uasm_i_dsrl(&p, K0, K0, 12 + 1); | 1384 | uasm_i_dsrl_safe(&p, K0, K0, 12 + 1); |
| 1327 | uasm_i_dsll32(&p, K0, K0, 64 + 12 + 1 - segbits - 32); | 1385 | uasm_i_dsll_safe(&p, K0, K0, 64 + 12 + 1 - segbits); |
| 1328 | uasm_i_or(&p, K0, K0, K1); | 1386 | uasm_i_or(&p, K0, K0, K1); |
| 1329 | uasm_il_bnez(&p, &r, K0, label_leave); | 1387 | uasm_il_bnez(&p, &r, K0, label_leave); |
| 1330 | /* No need for uasm_i_nop */ | 1388 | /* No need for uasm_i_nop */ |
| @@ -1526,6 +1584,10 @@ void __cpuinit build_tlb_refill_handler(void) | |||
| 1526 | */ | 1584 | */ |
| 1527 | static int run_once = 0; | 1585 | static int run_once = 0; |
| 1528 | 1586 | ||
| 1587 | #ifdef CONFIG_64BIT | ||
| 1588 | check_for_high_segbits = current_cpu_data.vmbits > (PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3); | ||
| 1589 | #endif | ||
| 1590 | |||
| 1529 | switch (current_cpu_type()) { | 1591 | switch (current_cpu_type()) { |
| 1530 | case CPU_R2000: | 1592 | case CPU_R2000: |
| 1531 | case CPU_R3000: | 1593 | case CPU_R3000: |
diff --git a/arch/mips/nxp/pnx8550/common/reset.c b/arch/mips/nxp/pnx8550/common/reset.c index 76bc3ec634ee..fadd8744a6bc 100644 --- a/arch/mips/nxp/pnx8550/common/reset.c +++ b/arch/mips/nxp/pnx8550/common/reset.c | |||
| @@ -20,6 +20,8 @@ | |||
| 20 | * Reset the PNX8550 board. | 20 | * Reset the PNX8550 board. |
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #include <linux/kernel.h> | ||
| 24 | |||
| 23 | #include <asm/reboot.h> | 25 | #include <asm/reboot.h> |
| 24 | #include <glb.h> | 26 | #include <glb.h> |
| 25 | 27 | ||
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index ada24e6f951f..1711e8e101bc 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
| 38 | #include <linux/console.h> | 38 | #include <linux/console.h> |
| 39 | #include <linux/tty.h> | 39 | #include <linux/tty.h> |
| 40 | #include <linux/vt.h> | ||
| 40 | 41 | ||
| 41 | #include <asm/io.h> | 42 | #include <asm/io.h> |
| 42 | 43 | ||
| @@ -254,7 +255,7 @@ static int __init sb1250_pcibios_init(void) | |||
| 254 | * XXX ehs: Should this happen in PCI Device mode? | 255 | * XXX ehs: Should this happen in PCI Device mode? |
| 255 | */ | 256 | */ |
| 256 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); | 257 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); |
| 257 | sb1250_controller.io_map_base = io_map_base; | 258 | sb1250_controller.io_map_base = (unsigned long)io_map_base; |
| 258 | set_io_port_base((unsigned long)io_map_base); | 259 | set_io_port_base((unsigned long)io_map_base); |
| 259 | 260 | ||
| 260 | #ifdef CONFIG_SIBYTE_HAS_LDT | 261 | #ifdef CONFIG_SIBYTE_HAS_LDT |
diff --git a/arch/mips/sgi-ip22/ip22-berr.c b/arch/mips/sgi-ip22/ip22-berr.c index de6a0cc32fea..911d3999c0c7 100644 --- a/arch/mips/sgi-ip22/ip22-berr.c +++ b/arch/mips/sgi-ip22/ip22-berr.c | |||
| @@ -89,7 +89,7 @@ static void print_buserr(void) | |||
| 89 | void ip22_be_interrupt(int irq) | 89 | void ip22_be_interrupt(int irq) |
| 90 | { | 90 | { |
| 91 | const int field = 2 * sizeof(unsigned long); | 91 | const int field = 2 * sizeof(unsigned long); |
| 92 | const struct pt_regs *regs = get_irq_regs(); | 92 | struct pt_regs *regs = get_irq_regs(); |
| 93 | 93 | ||
| 94 | save_and_clear_buserr(); | 94 | save_and_clear_buserr(); |
| 95 | print_buserr(); | 95 | print_buserr(); |
diff --git a/arch/mips/sgi-ip22/ip28-berr.c b/arch/mips/sgi-ip22/ip28-berr.c index 30e12e2ec4b5..88c684e05a3d 100644 --- a/arch/mips/sgi-ip22/ip28-berr.c +++ b/arch/mips/sgi-ip22/ip28-berr.c | |||
| @@ -453,7 +453,7 @@ mips_be_fatal: | |||
| 453 | 453 | ||
| 454 | void ip22_be_interrupt(int irq) | 454 | void ip22_be_interrupt(int irq) |
| 455 | { | 455 | { |
| 456 | const struct pt_regs *regs = get_irq_regs(); | 456 | struct pt_regs *regs = get_irq_regs(); |
| 457 | 457 | ||
| 458 | count_be_interrupt++; | 458 | count_be_interrupt++; |
| 459 | 459 | ||
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 5277aac96b0f..c308989fc464 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c | |||
| @@ -145,15 +145,14 @@ void __init plat_mem_setup(void) | |||
| 145 | 145 | ||
| 146 | #ifdef CONFIG_VT | 146 | #ifdef CONFIG_VT |
| 147 | screen_info = (struct screen_info) { | 147 | screen_info = (struct screen_info) { |
| 148 | 0, 0, /* orig-x, orig-y */ | 148 | .orig_video_page = 52, |
| 149 | 0, /* unused */ | 149 | .orig_video_mode = 3, |
| 150 | 52, /* orig_video_page */ | 150 | .orig_video_cols = 80, |
| 151 | 3, /* orig_video_mode */ | 151 | .flags = 12, |
| 152 | 80, /* orig_video_cols */ | 152 | .orig_video_ega_bx = 3, |
| 153 | 4626, 3, 9, /* unused, ega_bx, unused */ | 153 | .orig_video_lines = 25, |
| 154 | 25, /* orig_video_lines */ | 154 | .orig_video_isVGA = 0x22, |
| 155 | 0x22, /* orig_video_isVGA */ | 155 | .orig_video_points = 16, |
| 156 | 16 /* orig_video_points */ | ||
| 157 | }; | 156 | }; |
| 158 | /* XXXKW for CFE, get lines/cols from environment */ | 157 | /* XXXKW for CFE, get lines/cols from environment */ |
| 159 | #endif | 158 | #endif |
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig index baa2bbb6c096..04f16268e1c3 100644 --- a/arch/powerpc/configs/83xx/asp8347_defconfig +++ b/arch/powerpc/configs/83xx/asp8347_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:14 2010 | 4 | # Mon Apr 19 23:16:38 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -97,14 +97,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 97 | # CONFIG_TREE_RCU_TRACE is not set | 97 | # CONFIG_TREE_RCU_TRACE is not set |
| 98 | # CONFIG_IKCONFIG is not set | 98 | # CONFIG_IKCONFIG is not set |
| 99 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
| 100 | CONFIG_GROUP_SCHED=y | ||
| 101 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 102 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 103 | CONFIG_USER_SCHED=y | ||
| 104 | # CONFIG_CGROUP_SCHED is not set | ||
| 105 | # CONFIG_CGROUPS is not set | 100 | # CONFIG_CGROUPS is not set |
| 106 | CONFIG_SYSFS_DEPRECATED=y | 101 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 107 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 108 | # CONFIG_RELAY is not set | 102 | # CONFIG_RELAY is not set |
| 109 | # CONFIG_NAMESPACES is not set | 103 | # CONFIG_NAMESPACES is not set |
| 110 | CONFIG_BLK_DEV_INITRD=y | 104 | CONFIG_BLK_DEV_INITRD=y |
| @@ -112,6 +106,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 112 | CONFIG_RD_GZIP=y | 106 | CONFIG_RD_GZIP=y |
| 113 | # CONFIG_RD_BZIP2 is not set | 107 | # CONFIG_RD_BZIP2 is not set |
| 114 | # CONFIG_RD_LZMA is not set | 108 | # CONFIG_RD_LZMA is not set |
| 109 | # CONFIG_RD_LZO is not set | ||
| 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 116 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
| 117 | CONFIG_ANON_INODES=y | 112 | CONFIG_ANON_INODES=y |
| @@ -124,7 +119,7 @@ CONFIG_BUG=y | |||
| 124 | CONFIG_ELF_CORE=y | 119 | CONFIG_ELF_CORE=y |
| 125 | CONFIG_BASE_FULL=y | 120 | CONFIG_BASE_FULL=y |
| 126 | CONFIG_FUTEX=y | 121 | CONFIG_FUTEX=y |
| 127 | # CONFIG_EPOLL is not set | 122 | CONFIG_EPOLL=y |
| 128 | CONFIG_SIGNALFD=y | 123 | CONFIG_SIGNALFD=y |
| 129 | CONFIG_TIMERFD=y | 124 | CONFIG_TIMERFD=y |
| 130 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
| @@ -325,6 +320,7 @@ CONFIG_ISA_DMA_API=y | |||
| 325 | # Bus options | 320 | # Bus options |
| 326 | # | 321 | # |
| 327 | CONFIG_ZONE_DMA=y | 322 | CONFIG_ZONE_DMA=y |
| 323 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 328 | CONFIG_GENERIC_ISA_DMA=y | 324 | CONFIG_GENERIC_ISA_DMA=y |
| 329 | CONFIG_PPC_INDIRECT_PCI=y | 325 | CONFIG_PPC_INDIRECT_PCI=y |
| 330 | CONFIG_FSL_SOC=y | 326 | CONFIG_FSL_SOC=y |
| @@ -336,7 +332,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 336 | # CONFIG_PCIEPORTBUS is not set | 332 | # CONFIG_PCIEPORTBUS is not set |
| 337 | CONFIG_ARCH_SUPPORTS_MSI=y | 333 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 338 | # CONFIG_PCI_MSI is not set | 334 | # CONFIG_PCI_MSI is not set |
| 339 | # CONFIG_PCI_LEGACY is not set | ||
| 340 | # CONFIG_PCI_STUB is not set | 335 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 336 | # CONFIG_PCI_IOV is not set |
| 342 | # CONFIG_PCCARD is not set | 337 | # CONFIG_PCCARD is not set |
| @@ -362,7 +357,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 357 | # Networking options |
| 363 | # | 358 | # |
| 364 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 368 | CONFIG_XFRM_USER=m | 362 | CONFIG_XFRM_USER=m |
| @@ -543,6 +537,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 543 | # UBI - Unsorted block images | 537 | # UBI - Unsorted block images |
| 544 | # | 538 | # |
| 545 | # CONFIG_MTD_UBI is not set | 539 | # CONFIG_MTD_UBI is not set |
| 540 | CONFIG_OF_FLATTREE=y | ||
| 541 | CONFIG_OF_DYNAMIC=y | ||
| 546 | CONFIG_OF_DEVICE=y | 542 | CONFIG_OF_DEVICE=y |
| 547 | CONFIG_OF_I2C=y | 543 | CONFIG_OF_I2C=y |
| 548 | CONFIG_OF_MDIO=y | 544 | CONFIG_OF_MDIO=y |
| @@ -579,6 +575,7 @@ CONFIG_MISC_DEVICES=y | |||
| 579 | # CONFIG_ENCLOSURE_SERVICES is not set | 575 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 580 | # CONFIG_HP_ILO is not set | 576 | # CONFIG_HP_ILO is not set |
| 581 | # CONFIG_ISL29003 is not set | 577 | # CONFIG_ISL29003 is not set |
| 578 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 582 | # CONFIG_DS1682 is not set | 579 | # CONFIG_DS1682 is not set |
| 583 | # CONFIG_C2PORT is not set | 580 | # CONFIG_C2PORT is not set |
| 584 | 581 | ||
| @@ -596,6 +593,7 @@ CONFIG_HAVE_IDE=y | |||
| 596 | # | 593 | # |
| 597 | # SCSI device support | 594 | # SCSI device support |
| 598 | # | 595 | # |
| 596 | CONFIG_SCSI_MOD=y | ||
| 599 | # CONFIG_RAID_ATTRS is not set | 597 | # CONFIG_RAID_ATTRS is not set |
| 600 | # CONFIG_SCSI is not set | 598 | # CONFIG_SCSI is not set |
| 601 | # CONFIG_SCSI_DMA is not set | 599 | # CONFIG_SCSI_DMA is not set |
| @@ -788,6 +786,7 @@ CONFIG_SERIAL_CORE=y | |||
| 788 | CONFIG_SERIAL_CORE_CONSOLE=y | 786 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 789 | # CONFIG_SERIAL_JSM is not set | 787 | # CONFIG_SERIAL_JSM is not set |
| 790 | # CONFIG_SERIAL_OF_PLATFORM is not set | 788 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 789 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 791 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 790 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 792 | CONFIG_UNIX98_PTYS=y | 791 | CONFIG_UNIX98_PTYS=y |
| 793 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 792 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -836,6 +835,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 836 | CONFIG_I2C_MPC=y | 835 | CONFIG_I2C_MPC=y |
| 837 | # CONFIG_I2C_OCORES is not set | 836 | # CONFIG_I2C_OCORES is not set |
| 838 | # CONFIG_I2C_SIMTEC is not set | 837 | # CONFIG_I2C_SIMTEC is not set |
| 838 | # CONFIG_I2C_XILINX is not set | ||
| 839 | 839 | ||
| 840 | # | 840 | # |
| 841 | # External I2C/SMBus adapter drivers | 841 | # External I2C/SMBus adapter drivers |
| @@ -849,15 +849,9 @@ CONFIG_I2C_MPC=y | |||
| 849 | # | 849 | # |
| 850 | # CONFIG_I2C_PCA_PLATFORM is not set | 850 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 851 | # CONFIG_I2C_STUB is not set | 851 | # CONFIG_I2C_STUB is not set |
| 852 | |||
| 853 | # | ||
| 854 | # Miscellaneous I2C Chip support | ||
| 855 | # | ||
| 856 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 857 | # CONFIG_I2C_DEBUG_CORE is not set | 852 | # CONFIG_I2C_DEBUG_CORE is not set |
| 858 | # CONFIG_I2C_DEBUG_ALGO is not set | 853 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 859 | # CONFIG_I2C_DEBUG_BUS is not set | 854 | # CONFIG_I2C_DEBUG_BUS is not set |
| 860 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 861 | # CONFIG_SPI is not set | 855 | # CONFIG_SPI is not set |
| 862 | 856 | ||
| 863 | # | 857 | # |
| @@ -883,10 +877,11 @@ CONFIG_HWMON=y | |||
| 883 | # CONFIG_SENSORS_ADM1029 is not set | 877 | # CONFIG_SENSORS_ADM1029 is not set |
| 884 | # CONFIG_SENSORS_ADM1031 is not set | 878 | # CONFIG_SENSORS_ADM1031 is not set |
| 885 | # CONFIG_SENSORS_ADM9240 is not set | 879 | # CONFIG_SENSORS_ADM9240 is not set |
| 880 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 886 | # CONFIG_SENSORS_ADT7462 is not set | 881 | # CONFIG_SENSORS_ADT7462 is not set |
| 887 | # CONFIG_SENSORS_ADT7470 is not set | 882 | # CONFIG_SENSORS_ADT7470 is not set |
| 888 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 889 | # CONFIG_SENSORS_ADT7475 is not set | 883 | # CONFIG_SENSORS_ADT7475 is not set |
| 884 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 890 | # CONFIG_SENSORS_ATXP1 is not set | 885 | # CONFIG_SENSORS_ATXP1 is not set |
| 891 | # CONFIG_SENSORS_DS1621 is not set | 886 | # CONFIG_SENSORS_DS1621 is not set |
| 892 | # CONFIG_SENSORS_I5K_AMB is not set | 887 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -923,6 +918,7 @@ CONFIG_HWMON=y | |||
| 923 | # CONFIG_SENSORS_SMSC47M192 is not set | 918 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 924 | # CONFIG_SENSORS_SMSC47B397 is not set | 919 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 925 | # CONFIG_SENSORS_ADS7828 is not set | 920 | # CONFIG_SENSORS_ADS7828 is not set |
| 921 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 926 | # CONFIG_SENSORS_THMC50 is not set | 922 | # CONFIG_SENSORS_THMC50 is not set |
| 927 | # CONFIG_SENSORS_TMP401 is not set | 923 | # CONFIG_SENSORS_TMP401 is not set |
| 928 | # CONFIG_SENSORS_TMP421 is not set | 924 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -971,18 +967,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 971 | # Multifunction device drivers | 967 | # Multifunction device drivers |
| 972 | # | 968 | # |
| 973 | # CONFIG_MFD_CORE is not set | 969 | # CONFIG_MFD_CORE is not set |
| 970 | # CONFIG_MFD_88PM860X is not set | ||
| 974 | # CONFIG_MFD_SM501 is not set | 971 | # CONFIG_MFD_SM501 is not set |
| 975 | # CONFIG_HTC_PASIC3 is not set | 972 | # CONFIG_HTC_PASIC3 is not set |
| 976 | # CONFIG_TWL4030_CORE is not set | 973 | # CONFIG_TWL4030_CORE is not set |
| 977 | # CONFIG_MFD_TMIO is not set | 974 | # CONFIG_MFD_TMIO is not set |
| 978 | # CONFIG_PMIC_DA903X is not set | 975 | # CONFIG_PMIC_DA903X is not set |
| 979 | # CONFIG_PMIC_ADP5520 is not set | 976 | # CONFIG_PMIC_ADP5520 is not set |
| 977 | # CONFIG_MFD_MAX8925 is not set | ||
| 980 | # CONFIG_MFD_WM8400 is not set | 978 | # CONFIG_MFD_WM8400 is not set |
| 981 | # CONFIG_MFD_WM831X is not set | 979 | # CONFIG_MFD_WM831X is not set |
| 982 | # CONFIG_MFD_WM8350_I2C is not set | 980 | # CONFIG_MFD_WM8350_I2C is not set |
| 981 | # CONFIG_MFD_WM8994 is not set | ||
| 983 | # CONFIG_MFD_PCF50633 is not set | 982 | # CONFIG_MFD_PCF50633 is not set |
| 984 | # CONFIG_AB3100_CORE is not set | 983 | # CONFIG_AB3100_CORE is not set |
| 985 | # CONFIG_MFD_88PM8607 is not set | 984 | # CONFIG_LPC_SCH is not set |
| 986 | # CONFIG_REGULATOR is not set | 985 | # CONFIG_REGULATOR is not set |
| 987 | # CONFIG_MEDIA_SUPPORT is not set | 986 | # CONFIG_MEDIA_SUPPORT is not set |
| 988 | 987 | ||
| @@ -991,6 +990,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 991 | # | 990 | # |
| 992 | # CONFIG_AGP is not set | 991 | # CONFIG_AGP is not set |
| 993 | CONFIG_VGA_ARB=y | 992 | CONFIG_VGA_ARB=y |
| 993 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 994 | # CONFIG_DRM is not set | 994 | # CONFIG_DRM is not set |
| 995 | # CONFIG_VGASTATE is not set | 995 | # CONFIG_VGASTATE is not set |
| 996 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 996 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1083,7 +1083,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1083 | # CONFIG_USB_RIO500 is not set | 1083 | # CONFIG_USB_RIO500 is not set |
| 1084 | # CONFIG_USB_LEGOTOWER is not set | 1084 | # CONFIG_USB_LEGOTOWER is not set |
| 1085 | # CONFIG_USB_LCD is not set | 1085 | # CONFIG_USB_LCD is not set |
| 1086 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1087 | # CONFIG_USB_LED is not set | 1086 | # CONFIG_USB_LED is not set |
| 1088 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1087 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1089 | # CONFIG_USB_CYTHERM is not set | 1088 | # CONFIG_USB_CYTHERM is not set |
| @@ -1096,7 +1095,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1096 | # CONFIG_USB_IOWARRIOR is not set | 1095 | # CONFIG_USB_IOWARRIOR is not set |
| 1097 | # CONFIG_USB_TEST is not set | 1096 | # CONFIG_USB_TEST is not set |
| 1098 | # CONFIG_USB_ISIGHTFW is not set | 1097 | # CONFIG_USB_ISIGHTFW is not set |
| 1099 | # CONFIG_USB_VST is not set | ||
| 1100 | # CONFIG_USB_GADGET is not set | 1098 | # CONFIG_USB_GADGET is not set |
| 1101 | 1099 | ||
| 1102 | # | 1100 | # |
| @@ -1259,6 +1257,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1259 | # CONFIG_JFFS2_LZO is not set | 1257 | # CONFIG_JFFS2_LZO is not set |
| 1260 | CONFIG_JFFS2_RTIME=y | 1258 | CONFIG_JFFS2_RTIME=y |
| 1261 | # CONFIG_JFFS2_RUBIN is not set | 1259 | # CONFIG_JFFS2_RUBIN is not set |
| 1260 | # CONFIG_LOGFS is not set | ||
| 1262 | # CONFIG_CRAMFS is not set | 1261 | # CONFIG_CRAMFS is not set |
| 1263 | # CONFIG_SQUASHFS is not set | 1262 | # CONFIG_SQUASHFS is not set |
| 1264 | # CONFIG_VXFS_FS is not set | 1263 | # CONFIG_VXFS_FS is not set |
| @@ -1285,6 +1284,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1285 | CONFIG_RPCSEC_GSS_KRB5=y | 1284 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1286 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1285 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1287 | # CONFIG_SMB_FS is not set | 1286 | # CONFIG_SMB_FS is not set |
| 1287 | # CONFIG_CEPH_FS is not set | ||
| 1288 | # CONFIG_CIFS is not set | 1288 | # CONFIG_CIFS is not set |
| 1289 | # CONFIG_NCP_FS is not set | 1289 | # CONFIG_NCP_FS is not set |
| 1290 | # CONFIG_CODA_FS is not set | 1290 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig index 8b1aa806e548..1843ee11823b 100644 --- a/arch/powerpc/configs/83xx/kmeter1_defconfig +++ b/arch/powerpc/configs/83xx/kmeter1_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:14 2010 | 4 | # Mon Apr 19 23:16:39 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -98,7 +98,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 98 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 99 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 100 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | # CONFIG_GROUP_SCHED is not set | ||
| 102 | # CONFIG_CGROUPS is not set | 101 | # CONFIG_CGROUPS is not set |
| 103 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 102 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 104 | # CONFIG_RELAY is not set | 103 | # CONFIG_RELAY is not set |
| @@ -318,6 +317,7 @@ CONFIG_ISA_DMA_API=y | |||
| 318 | # Bus options | 317 | # Bus options |
| 319 | # | 318 | # |
| 320 | CONFIG_ZONE_DMA=y | 319 | CONFIG_ZONE_DMA=y |
| 320 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 321 | CONFIG_GENERIC_ISA_DMA=y | 321 | CONFIG_GENERIC_ISA_DMA=y |
| 322 | CONFIG_FSL_SOC=y | 322 | CONFIG_FSL_SOC=y |
| 323 | CONFIG_PPC_PCI_CHOICE=y | 323 | CONFIG_PPC_PCI_CHOICE=y |
| @@ -346,7 +346,6 @@ CONFIG_NET=y | |||
| 346 | # Networking options | 346 | # Networking options |
| 347 | # | 347 | # |
| 348 | CONFIG_PACKET=y | 348 | CONFIG_PACKET=y |
| 349 | # CONFIG_PACKET_MMAP is not set | ||
| 350 | CONFIG_UNIX=y | 349 | CONFIG_UNIX=y |
| 351 | # CONFIG_NET_KEY is not set | 350 | # CONFIG_NET_KEY is not set |
| 352 | CONFIG_INET=y | 351 | CONFIG_INET=y |
| @@ -387,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 387 | # CONFIG_ATM is not set | 386 | # CONFIG_ATM is not set |
| 388 | CONFIG_STP=m | 387 | CONFIG_STP=m |
| 389 | CONFIG_BRIDGE=m | 388 | CONFIG_BRIDGE=m |
| 389 | CONFIG_BRIDGE_IGMP_SNOOPING=y | ||
| 390 | # CONFIG_NET_DSA is not set | 390 | # CONFIG_NET_DSA is not set |
| 391 | CONFIG_VLAN_8021Q=y | 391 | CONFIG_VLAN_8021Q=y |
| 392 | # CONFIG_VLAN_8021Q_GVRP is not set | 392 | # CONFIG_VLAN_8021Q_GVRP is not set |
| @@ -539,6 +539,8 @@ CONFIG_MTD_UBI_DEBUG=y | |||
| 539 | # CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set | 539 | # CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set |
| 540 | # CONFIG_MTD_UBI_DEBUG_MSG_WL is not set | 540 | # CONFIG_MTD_UBI_DEBUG_MSG_WL is not set |
| 541 | # CONFIG_MTD_UBI_DEBUG_MSG_IO is not set | 541 | # CONFIG_MTD_UBI_DEBUG_MSG_IO is not set |
| 542 | CONFIG_OF_FLATTREE=y | ||
| 543 | CONFIG_OF_DYNAMIC=y | ||
| 542 | CONFIG_OF_DEVICE=y | 544 | CONFIG_OF_DEVICE=y |
| 543 | CONFIG_OF_I2C=y | 545 | CONFIG_OF_I2C=y |
| 544 | CONFIG_OF_MDIO=y | 546 | CONFIG_OF_MDIO=y |
| @@ -563,6 +565,7 @@ CONFIG_HAVE_IDE=y | |||
| 563 | # | 565 | # |
| 564 | # SCSI device support | 566 | # SCSI device support |
| 565 | # | 567 | # |
| 568 | CONFIG_SCSI_MOD=y | ||
| 566 | # CONFIG_RAID_ATTRS is not set | 569 | # CONFIG_RAID_ATTRS is not set |
| 567 | # CONFIG_SCSI is not set | 570 | # CONFIG_SCSI is not set |
| 568 | # CONFIG_SCSI_DMA is not set | 571 | # CONFIG_SCSI_DMA is not set |
| @@ -690,6 +693,7 @@ CONFIG_SERIAL_CORE=y | |||
| 690 | CONFIG_SERIAL_CORE_CONSOLE=y | 693 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 691 | # CONFIG_SERIAL_OF_PLATFORM is not set | 694 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 692 | # CONFIG_SERIAL_QE is not set | 695 | # CONFIG_SERIAL_QE is not set |
| 696 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 693 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 697 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 694 | CONFIG_UNIX98_PTYS=y | 698 | CONFIG_UNIX98_PTYS=y |
| 695 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 699 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -720,6 +724,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 720 | CONFIG_I2C_MPC=y | 724 | CONFIG_I2C_MPC=y |
| 721 | # CONFIG_I2C_OCORES is not set | 725 | # CONFIG_I2C_OCORES is not set |
| 722 | # CONFIG_I2C_SIMTEC is not set | 726 | # CONFIG_I2C_SIMTEC is not set |
| 727 | # CONFIG_I2C_XILINX is not set | ||
| 723 | 728 | ||
| 724 | # | 729 | # |
| 725 | # External I2C/SMBus adapter drivers | 730 | # External I2C/SMBus adapter drivers |
| @@ -732,15 +737,9 @@ CONFIG_I2C_MPC=y | |||
| 732 | # | 737 | # |
| 733 | # CONFIG_I2C_PCA_PLATFORM is not set | 738 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 734 | # CONFIG_I2C_STUB is not set | 739 | # CONFIG_I2C_STUB is not set |
| 735 | |||
| 736 | # | ||
| 737 | # Miscellaneous I2C Chip support | ||
| 738 | # | ||
| 739 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 740 | # CONFIG_I2C_DEBUG_CORE is not set | 740 | # CONFIG_I2C_DEBUG_CORE is not set |
| 741 | # CONFIG_I2C_DEBUG_ALGO is not set | 741 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 742 | # CONFIG_I2C_DEBUG_BUS is not set | 742 | # CONFIG_I2C_DEBUG_BUS is not set |
| 743 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 744 | # CONFIG_SPI is not set | 743 | # CONFIG_SPI is not set |
| 745 | 744 | ||
| 746 | # | 745 | # |
| @@ -765,18 +764,20 @@ CONFIG_SSB_POSSIBLE=y | |||
| 765 | # Multifunction device drivers | 764 | # Multifunction device drivers |
| 766 | # | 765 | # |
| 767 | # CONFIG_MFD_CORE is not set | 766 | # CONFIG_MFD_CORE is not set |
| 767 | # CONFIG_MFD_88PM860X is not set | ||
| 768 | # CONFIG_MFD_SM501 is not set | 768 | # CONFIG_MFD_SM501 is not set |
| 769 | # CONFIG_HTC_PASIC3 is not set | 769 | # CONFIG_HTC_PASIC3 is not set |
| 770 | # CONFIG_TWL4030_CORE is not set | 770 | # CONFIG_TWL4030_CORE is not set |
| 771 | # CONFIG_MFD_TMIO is not set | 771 | # CONFIG_MFD_TMIO is not set |
| 772 | # CONFIG_PMIC_DA903X is not set | 772 | # CONFIG_PMIC_DA903X is not set |
| 773 | # CONFIG_PMIC_ADP5520 is not set | 773 | # CONFIG_PMIC_ADP5520 is not set |
| 774 | # CONFIG_MFD_MAX8925 is not set | ||
| 774 | # CONFIG_MFD_WM8400 is not set | 775 | # CONFIG_MFD_WM8400 is not set |
| 775 | # CONFIG_MFD_WM831X is not set | 776 | # CONFIG_MFD_WM831X is not set |
| 776 | # CONFIG_MFD_WM8350_I2C is not set | 777 | # CONFIG_MFD_WM8350_I2C is not set |
| 778 | # CONFIG_MFD_WM8994 is not set | ||
| 777 | # CONFIG_MFD_PCF50633 is not set | 779 | # CONFIG_MFD_PCF50633 is not set |
| 778 | # CONFIG_AB3100_CORE is not set | 780 | # CONFIG_AB3100_CORE is not set |
| 779 | # CONFIG_MFD_88PM8607 is not set | ||
| 780 | # CONFIG_REGULATOR is not set | 781 | # CONFIG_REGULATOR is not set |
| 781 | # CONFIG_MEDIA_SUPPORT is not set | 782 | # CONFIG_MEDIA_SUPPORT is not set |
| 782 | 783 | ||
| @@ -805,8 +806,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 805 | CONFIG_UIO=y | 806 | CONFIG_UIO=y |
| 806 | # CONFIG_UIO_PDRV is not set | 807 | # CONFIG_UIO_PDRV is not set |
| 807 | # CONFIG_UIO_PDRV_GENIRQ is not set | 808 | # CONFIG_UIO_PDRV_GENIRQ is not set |
| 808 | # CONFIG_UIO_SMX is not set | ||
| 809 | # CONFIG_UIO_SERCOS3 is not set | ||
| 810 | 809 | ||
| 811 | # | 810 | # |
| 812 | # TI VLYNQ | 811 | # TI VLYNQ |
| @@ -887,6 +886,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 887 | CONFIG_JFFS2_RTIME=y | 886 | CONFIG_JFFS2_RTIME=y |
| 888 | # CONFIG_JFFS2_RUBIN is not set | 887 | # CONFIG_JFFS2_RUBIN is not set |
| 889 | # CONFIG_UBIFS_FS is not set | 888 | # CONFIG_UBIFS_FS is not set |
| 889 | # CONFIG_LOGFS is not set | ||
| 890 | # CONFIG_CRAMFS is not set | 890 | # CONFIG_CRAMFS is not set |
| 891 | # CONFIG_SQUASHFS is not set | 891 | # CONFIG_SQUASHFS is not set |
| 892 | # CONFIG_VXFS_FS is not set | 892 | # CONFIG_VXFS_FS is not set |
| @@ -911,6 +911,7 @@ CONFIG_SUNRPC=y | |||
| 911 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 911 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 912 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 912 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 913 | # CONFIG_SMB_FS is not set | 913 | # CONFIG_SMB_FS is not set |
| 914 | # CONFIG_CEPH_FS is not set | ||
| 914 | # CONFIG_CIFS is not set | 915 | # CONFIG_CIFS is not set |
| 915 | # CONFIG_NCP_FS is not set | 916 | # CONFIG_NCP_FS is not set |
| 916 | # CONFIG_CODA_FS is not set | 917 | # CONFIG_CODA_FS is not set |
| @@ -976,6 +977,7 @@ CONFIG_DEBUG_FS=y | |||
| 976 | CONFIG_DEBUG_BUGVERBOSE=y | 977 | CONFIG_DEBUG_BUGVERBOSE=y |
| 977 | # CONFIG_DEBUG_MEMORY_INIT is not set | 978 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 978 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 979 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 980 | # CONFIG_LKDTM is not set | ||
| 979 | # CONFIG_LATENCYTOP is not set | 981 | # CONFIG_LATENCYTOP is not set |
| 980 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 982 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 981 | CONFIG_HAVE_FUNCTION_TRACER=y | 983 | CONFIG_HAVE_FUNCTION_TRACER=y |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 2f2d98558e44..78ae3bf1e9c5 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:15 2010 | 4 | # Mon Apr 19 23:16:40 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_DEBUG is not set | 334 | # CONFIG_PCI_DEBUG is not set |
| 340 | # CONFIG_PCI_STUB is not set | 335 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 336 | # CONFIG_PCI_IOV is not set |
| @@ -362,7 +357,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 357 | # Networking options |
| 363 | # | 358 | # |
| 364 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 368 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| @@ -556,6 +550,8 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 556 | # UBI - Unsorted block images | 550 | # UBI - Unsorted block images |
| 557 | # | 551 | # |
| 558 | # CONFIG_MTD_UBI is not set | 552 | # CONFIG_MTD_UBI is not set |
| 553 | CONFIG_OF_FLATTREE=y | ||
| 554 | CONFIG_OF_DYNAMIC=y | ||
| 559 | CONFIG_OF_DEVICE=y | 555 | CONFIG_OF_DEVICE=y |
| 560 | CONFIG_OF_I2C=y | 556 | CONFIG_OF_I2C=y |
| 561 | CONFIG_OF_SPI=y | 557 | CONFIG_OF_SPI=y |
| @@ -593,6 +589,7 @@ CONFIG_MISC_DEVICES=y | |||
| 593 | # CONFIG_ENCLOSURE_SERVICES is not set | 589 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 594 | # CONFIG_HP_ILO is not set | 590 | # CONFIG_HP_ILO is not set |
| 595 | # CONFIG_ISL29003 is not set | 591 | # CONFIG_ISL29003 is not set |
| 592 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 596 | # CONFIG_DS1682 is not set | 593 | # CONFIG_DS1682 is not set |
| 597 | # CONFIG_TI_DAC7512 is not set | 594 | # CONFIG_TI_DAC7512 is not set |
| 598 | # CONFIG_C2PORT is not set | 595 | # CONFIG_C2PORT is not set |
| @@ -612,6 +609,7 @@ CONFIG_HAVE_IDE=y | |||
| 612 | # | 609 | # |
| 613 | # SCSI device support | 610 | # SCSI device support |
| 614 | # | 611 | # |
| 612 | CONFIG_SCSI_MOD=y | ||
| 615 | # CONFIG_RAID_ATTRS is not set | 613 | # CONFIG_RAID_ATTRS is not set |
| 616 | CONFIG_SCSI=y | 614 | CONFIG_SCSI=y |
| 617 | CONFIG_SCSI_DMA=y | 615 | CONFIG_SCSI_DMA=y |
| @@ -772,6 +770,7 @@ CONFIG_NET_PCI=y | |||
| 772 | # CONFIG_PCNET32 is not set | 770 | # CONFIG_PCNET32 is not set |
| 773 | # CONFIG_AMD8111_ETH is not set | 771 | # CONFIG_AMD8111_ETH is not set |
| 774 | # CONFIG_ADAPTEC_STARFIRE is not set | 772 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 773 | # CONFIG_KSZ884X_PCI is not set | ||
| 775 | # CONFIG_B44 is not set | 774 | # CONFIG_B44 is not set |
| 776 | # CONFIG_FORCEDETH is not set | 775 | # CONFIG_FORCEDETH is not set |
| 777 | CONFIG_E100=y | 776 | CONFIG_E100=y |
| @@ -824,6 +823,8 @@ CONFIG_NETDEV_10000=y | |||
| 824 | # CONFIG_CHELSIO_T1 is not set | 823 | # CONFIG_CHELSIO_T1 is not set |
| 825 | CONFIG_CHELSIO_T3_DEPENDS=y | 824 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 826 | # CONFIG_CHELSIO_T3 is not set | 825 | # CONFIG_CHELSIO_T3 is not set |
| 826 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 827 | # CONFIG_CHELSIO_T4 is not set | ||
| 827 | # CONFIG_ENIC is not set | 828 | # CONFIG_ENIC is not set |
| 828 | # CONFIG_IXGBE is not set | 829 | # CONFIG_IXGBE is not set |
| 829 | # CONFIG_IXGB is not set | 830 | # CONFIG_IXGB is not set |
| @@ -836,6 +837,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 836 | # CONFIG_MLX4_CORE is not set | 837 | # CONFIG_MLX4_CORE is not set |
| 837 | # CONFIG_TEHUTI is not set | 838 | # CONFIG_TEHUTI is not set |
| 838 | # CONFIG_BNX2X is not set | 839 | # CONFIG_BNX2X is not set |
| 840 | # CONFIG_QLCNIC is not set | ||
| 839 | # CONFIG_QLGE is not set | 841 | # CONFIG_QLGE is not set |
| 840 | # CONFIG_SFC is not set | 842 | # CONFIG_SFC is not set |
| 841 | # CONFIG_BE2NET is not set | 843 | # CONFIG_BE2NET is not set |
| @@ -931,6 +933,7 @@ CONFIG_SERIAL_CORE=y | |||
| 931 | CONFIG_SERIAL_CORE_CONSOLE=y | 933 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 932 | # CONFIG_SERIAL_JSM is not set | 934 | # CONFIG_SERIAL_JSM is not set |
| 933 | # CONFIG_SERIAL_OF_PLATFORM is not set | 935 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 936 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 934 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 937 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 935 | CONFIG_UNIX98_PTYS=y | 938 | CONFIG_UNIX98_PTYS=y |
| 936 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 939 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -980,6 +983,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 980 | CONFIG_I2C_MPC=y | 983 | CONFIG_I2C_MPC=y |
| 981 | # CONFIG_I2C_OCORES is not set | 984 | # CONFIG_I2C_OCORES is not set |
| 982 | # CONFIG_I2C_SIMTEC is not set | 985 | # CONFIG_I2C_SIMTEC is not set |
| 986 | # CONFIG_I2C_XILINX is not set | ||
| 983 | 987 | ||
| 984 | # | 988 | # |
| 985 | # External I2C/SMBus adapter drivers | 989 | # External I2C/SMBus adapter drivers |
| @@ -993,15 +997,9 @@ CONFIG_I2C_MPC=y | |||
| 993 | # | 997 | # |
| 994 | # CONFIG_I2C_PCA_PLATFORM is not set | 998 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 995 | # CONFIG_I2C_STUB is not set | 999 | # CONFIG_I2C_STUB is not set |
| 996 | |||
| 997 | # | ||
| 998 | # Miscellaneous I2C Chip support | ||
| 999 | # | ||
| 1000 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1001 | # CONFIG_I2C_DEBUG_CORE is not set | 1000 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1002 | # CONFIG_I2C_DEBUG_ALGO is not set | 1001 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1003 | # CONFIG_I2C_DEBUG_BUS is not set | 1002 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1004 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1005 | CONFIG_SPI=y | 1003 | CONFIG_SPI=y |
| 1006 | # CONFIG_SPI_DEBUG is not set | 1004 | # CONFIG_SPI_DEBUG is not set |
| 1007 | CONFIG_SPI_MASTER=y | 1005 | CONFIG_SPI_MASTER=y |
| @@ -1044,10 +1042,11 @@ CONFIG_HWMON=y | |||
| 1044 | # CONFIG_SENSORS_ADM1029 is not set | 1042 | # CONFIG_SENSORS_ADM1029 is not set |
| 1045 | # CONFIG_SENSORS_ADM1031 is not set | 1043 | # CONFIG_SENSORS_ADM1031 is not set |
| 1046 | # CONFIG_SENSORS_ADM9240 is not set | 1044 | # CONFIG_SENSORS_ADM9240 is not set |
| 1045 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1047 | # CONFIG_SENSORS_ADT7462 is not set | 1046 | # CONFIG_SENSORS_ADT7462 is not set |
| 1048 | # CONFIG_SENSORS_ADT7470 is not set | 1047 | # CONFIG_SENSORS_ADT7470 is not set |
| 1049 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1050 | # CONFIG_SENSORS_ADT7475 is not set | 1048 | # CONFIG_SENSORS_ADT7475 is not set |
| 1049 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1051 | # CONFIG_SENSORS_ATXP1 is not set | 1050 | # CONFIG_SENSORS_ATXP1 is not set |
| 1052 | # CONFIG_SENSORS_DS1621 is not set | 1051 | # CONFIG_SENSORS_DS1621 is not set |
| 1053 | # CONFIG_SENSORS_I5K_AMB is not set | 1052 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1086,6 +1085,7 @@ CONFIG_HWMON=y | |||
| 1086 | # CONFIG_SENSORS_SMSC47M192 is not set | 1085 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1087 | # CONFIG_SENSORS_SMSC47B397 is not set | 1086 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1088 | # CONFIG_SENSORS_ADS7828 is not set | 1087 | # CONFIG_SENSORS_ADS7828 is not set |
| 1088 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1089 | # CONFIG_SENSORS_THMC50 is not set | 1089 | # CONFIG_SENSORS_THMC50 is not set |
| 1090 | # CONFIG_SENSORS_TMP401 is not set | 1090 | # CONFIG_SENSORS_TMP401 is not set |
| 1091 | # CONFIG_SENSORS_TMP421 is not set | 1091 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1134,21 +1134,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1134 | # Multifunction device drivers | 1134 | # Multifunction device drivers |
| 1135 | # | 1135 | # |
| 1136 | # CONFIG_MFD_CORE is not set | 1136 | # CONFIG_MFD_CORE is not set |
| 1137 | # CONFIG_MFD_88PM860X is not set | ||
| 1137 | # CONFIG_MFD_SM501 is not set | 1138 | # CONFIG_MFD_SM501 is not set |
| 1138 | # CONFIG_HTC_PASIC3 is not set | 1139 | # CONFIG_HTC_PASIC3 is not set |
| 1139 | # CONFIG_TWL4030_CORE is not set | 1140 | # CONFIG_TWL4030_CORE is not set |
| 1140 | # CONFIG_MFD_TMIO is not set | 1141 | # CONFIG_MFD_TMIO is not set |
| 1141 | # CONFIG_PMIC_DA903X is not set | 1142 | # CONFIG_PMIC_DA903X is not set |
| 1142 | # CONFIG_PMIC_ADP5520 is not set | 1143 | # CONFIG_PMIC_ADP5520 is not set |
| 1144 | # CONFIG_MFD_MAX8925 is not set | ||
| 1143 | # CONFIG_MFD_WM8400 is not set | 1145 | # CONFIG_MFD_WM8400 is not set |
| 1144 | # CONFIG_MFD_WM831X is not set | 1146 | # CONFIG_MFD_WM831X is not set |
| 1145 | # CONFIG_MFD_WM8350_I2C is not set | 1147 | # CONFIG_MFD_WM8350_I2C is not set |
| 1148 | # CONFIG_MFD_WM8994 is not set | ||
| 1146 | # CONFIG_MFD_PCF50633 is not set | 1149 | # CONFIG_MFD_PCF50633 is not set |
| 1147 | # CONFIG_MFD_MC13783 is not set | 1150 | # CONFIG_MFD_MC13783 is not set |
| 1148 | # CONFIG_AB3100_CORE is not set | 1151 | # CONFIG_AB3100_CORE is not set |
| 1149 | # CONFIG_EZX_PCAP is not set | 1152 | # CONFIG_EZX_PCAP is not set |
| 1150 | # CONFIG_MFD_88PM8607 is not set | ||
| 1151 | # CONFIG_AB4500_CORE is not set | 1153 | # CONFIG_AB4500_CORE is not set |
| 1154 | # CONFIG_LPC_SCH is not set | ||
| 1152 | # CONFIG_REGULATOR is not set | 1155 | # CONFIG_REGULATOR is not set |
| 1153 | # CONFIG_MEDIA_SUPPORT is not set | 1156 | # CONFIG_MEDIA_SUPPORT is not set |
| 1154 | 1157 | ||
| @@ -1157,6 +1160,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1157 | # | 1160 | # |
| 1158 | # CONFIG_AGP is not set | 1161 | # CONFIG_AGP is not set |
| 1159 | CONFIG_VGA_ARB=y | 1162 | CONFIG_VGA_ARB=y |
| 1163 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1160 | # CONFIG_DRM is not set | 1164 | # CONFIG_DRM is not set |
| 1161 | # CONFIG_VGASTATE is not set | 1165 | # CONFIG_VGASTATE is not set |
| 1162 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1166 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1289,7 +1293,6 @@ CONFIG_USB_STORAGE=y | |||
| 1289 | # CONFIG_USB_RIO500 is not set | 1293 | # CONFIG_USB_RIO500 is not set |
| 1290 | # CONFIG_USB_LEGOTOWER is not set | 1294 | # CONFIG_USB_LEGOTOWER is not set |
| 1291 | # CONFIG_USB_LCD is not set | 1295 | # CONFIG_USB_LCD is not set |
| 1292 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1293 | # CONFIG_USB_LED is not set | 1296 | # CONFIG_USB_LED is not set |
| 1294 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1297 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1295 | # CONFIG_USB_CYTHERM is not set | 1298 | # CONFIG_USB_CYTHERM is not set |
| @@ -1302,7 +1305,6 @@ CONFIG_USB_STORAGE=y | |||
| 1302 | # CONFIG_USB_IOWARRIOR is not set | 1305 | # CONFIG_USB_IOWARRIOR is not set |
| 1303 | # CONFIG_USB_TEST is not set | 1306 | # CONFIG_USB_TEST is not set |
| 1304 | # CONFIG_USB_ISIGHTFW is not set | 1307 | # CONFIG_USB_ISIGHTFW is not set |
| 1305 | # CONFIG_USB_VST is not set | ||
| 1306 | CONFIG_USB_GADGET=y | 1308 | CONFIG_USB_GADGET=y |
| 1307 | # CONFIG_USB_GADGET_DEBUG is not set | 1309 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1308 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1310 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1341,6 +1343,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1341 | # CONFIG_USB_MIDI_GADGET is not set | 1343 | # CONFIG_USB_MIDI_GADGET is not set |
| 1342 | # CONFIG_USB_G_PRINTER is not set | 1344 | # CONFIG_USB_G_PRINTER is not set |
| 1343 | # CONFIG_USB_CDC_COMPOSITE is not set | 1345 | # CONFIG_USB_CDC_COMPOSITE is not set |
| 1346 | # CONFIG_USB_G_NOKIA is not set | ||
| 1344 | # CONFIG_USB_G_MULTI is not set | 1347 | # CONFIG_USB_G_MULTI is not set |
| 1345 | 1348 | ||
| 1346 | # | 1349 | # |
| @@ -1511,6 +1514,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1511 | # CONFIG_JFFS2_LZO is not set | 1514 | # CONFIG_JFFS2_LZO is not set |
| 1512 | CONFIG_JFFS2_RTIME=y | 1515 | CONFIG_JFFS2_RTIME=y |
| 1513 | # CONFIG_JFFS2_RUBIN is not set | 1516 | # CONFIG_JFFS2_RUBIN is not set |
| 1517 | # CONFIG_LOGFS is not set | ||
| 1514 | # CONFIG_CRAMFS is not set | 1518 | # CONFIG_CRAMFS is not set |
| 1515 | # CONFIG_SQUASHFS is not set | 1519 | # CONFIG_SQUASHFS is not set |
| 1516 | # CONFIG_VXFS_FS is not set | 1520 | # CONFIG_VXFS_FS is not set |
| @@ -1537,6 +1541,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1537 | CONFIG_RPCSEC_GSS_KRB5=y | 1541 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1538 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1542 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1539 | # CONFIG_SMB_FS is not set | 1543 | # CONFIG_SMB_FS is not set |
| 1544 | # CONFIG_CEPH_FS is not set | ||
| 1540 | # CONFIG_CIFS is not set | 1545 | # CONFIG_CIFS is not set |
| 1541 | # CONFIG_NCP_FS is not set | 1546 | # CONFIG_NCP_FS is not set |
| 1542 | # CONFIG_CODA_FS is not set | 1547 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 633e61194603..cccb71393aca 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:16 2010 | 4 | # Mon Apr 19 23:16:40 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_DEBUG is not set | 334 | # CONFIG_PCI_DEBUG is not set |
| 340 | # CONFIG_PCI_STUB is not set | 335 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 336 | # CONFIG_PCI_IOV is not set |
| @@ -362,7 +357,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 357 | # Networking options |
| 363 | # | 358 | # |
| 364 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 368 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| @@ -556,6 +550,8 @@ CONFIG_MTD_NAND_IDS=y | |||
| 556 | # UBI - Unsorted block images | 550 | # UBI - Unsorted block images |
| 557 | # | 551 | # |
| 558 | # CONFIG_MTD_UBI is not set | 552 | # CONFIG_MTD_UBI is not set |
| 553 | CONFIG_OF_FLATTREE=y | ||
| 554 | CONFIG_OF_DYNAMIC=y | ||
| 559 | CONFIG_OF_DEVICE=y | 555 | CONFIG_OF_DEVICE=y |
| 560 | CONFIG_OF_I2C=y | 556 | CONFIG_OF_I2C=y |
| 561 | CONFIG_OF_SPI=y | 557 | CONFIG_OF_SPI=y |
| @@ -593,6 +589,7 @@ CONFIG_MISC_DEVICES=y | |||
| 593 | # CONFIG_ENCLOSURE_SERVICES is not set | 589 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 594 | # CONFIG_HP_ILO is not set | 590 | # CONFIG_HP_ILO is not set |
| 595 | # CONFIG_ISL29003 is not set | 591 | # CONFIG_ISL29003 is not set |
| 592 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 596 | # CONFIG_DS1682 is not set | 593 | # CONFIG_DS1682 is not set |
| 597 | # CONFIG_TI_DAC7512 is not set | 594 | # CONFIG_TI_DAC7512 is not set |
| 598 | # CONFIG_C2PORT is not set | 595 | # CONFIG_C2PORT is not set |
| @@ -612,6 +609,7 @@ CONFIG_HAVE_IDE=y | |||
| 612 | # | 609 | # |
| 613 | # SCSI device support | 610 | # SCSI device support |
| 614 | # | 611 | # |
| 612 | CONFIG_SCSI_MOD=y | ||
| 615 | # CONFIG_RAID_ATTRS is not set | 613 | # CONFIG_RAID_ATTRS is not set |
| 616 | CONFIG_SCSI=y | 614 | CONFIG_SCSI=y |
| 617 | CONFIG_SCSI_DMA=y | 615 | CONFIG_SCSI_DMA=y |
| @@ -735,6 +733,7 @@ CONFIG_ATA_SFF=y | |||
| 735 | # CONFIG_PATA_IT821X is not set | 733 | # CONFIG_PATA_IT821X is not set |
| 736 | # CONFIG_PATA_IT8213 is not set | 734 | # CONFIG_PATA_IT8213 is not set |
| 737 | # CONFIG_PATA_JMICRON is not set | 735 | # CONFIG_PATA_JMICRON is not set |
| 736 | # CONFIG_PATA_LEGACY is not set | ||
| 738 | # CONFIG_PATA_TRIFLEX is not set | 737 | # CONFIG_PATA_TRIFLEX is not set |
| 739 | # CONFIG_PATA_MARVELL is not set | 738 | # CONFIG_PATA_MARVELL is not set |
| 740 | # CONFIG_PATA_MPIIX is not set | 739 | # CONFIG_PATA_MPIIX is not set |
| @@ -837,6 +836,7 @@ CONFIG_NET_PCI=y | |||
| 837 | # CONFIG_PCNET32 is not set | 836 | # CONFIG_PCNET32 is not set |
| 838 | # CONFIG_AMD8111_ETH is not set | 837 | # CONFIG_AMD8111_ETH is not set |
| 839 | # CONFIG_ADAPTEC_STARFIRE is not set | 838 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 839 | # CONFIG_KSZ884X_PCI is not set | ||
| 840 | # CONFIG_B44 is not set | 840 | # CONFIG_B44 is not set |
| 841 | # CONFIG_FORCEDETH is not set | 841 | # CONFIG_FORCEDETH is not set |
| 842 | CONFIG_E100=y | 842 | CONFIG_E100=y |
| @@ -889,6 +889,8 @@ CONFIG_NETDEV_10000=y | |||
| 889 | # CONFIG_CHELSIO_T1 is not set | 889 | # CONFIG_CHELSIO_T1 is not set |
| 890 | CONFIG_CHELSIO_T3_DEPENDS=y | 890 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 891 | # CONFIG_CHELSIO_T3 is not set | 891 | # CONFIG_CHELSIO_T3 is not set |
| 892 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 893 | # CONFIG_CHELSIO_T4 is not set | ||
| 892 | # CONFIG_ENIC is not set | 894 | # CONFIG_ENIC is not set |
| 893 | # CONFIG_IXGBE is not set | 895 | # CONFIG_IXGBE is not set |
| 894 | # CONFIG_IXGB is not set | 896 | # CONFIG_IXGB is not set |
| @@ -901,6 +903,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 901 | # CONFIG_MLX4_CORE is not set | 903 | # CONFIG_MLX4_CORE is not set |
| 902 | # CONFIG_TEHUTI is not set | 904 | # CONFIG_TEHUTI is not set |
| 903 | # CONFIG_BNX2X is not set | 905 | # CONFIG_BNX2X is not set |
| 906 | # CONFIG_QLCNIC is not set | ||
| 904 | # CONFIG_QLGE is not set | 907 | # CONFIG_QLGE is not set |
| 905 | # CONFIG_SFC is not set | 908 | # CONFIG_SFC is not set |
| 906 | # CONFIG_BE2NET is not set | 909 | # CONFIG_BE2NET is not set |
| @@ -996,6 +999,7 @@ CONFIG_SERIAL_CORE=y | |||
| 996 | CONFIG_SERIAL_CORE_CONSOLE=y | 999 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 997 | # CONFIG_SERIAL_JSM is not set | 1000 | # CONFIG_SERIAL_JSM is not set |
| 998 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1001 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1002 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 999 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1003 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1000 | CONFIG_UNIX98_PTYS=y | 1004 | CONFIG_UNIX98_PTYS=y |
| 1001 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1005 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1045,6 +1049,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1045 | CONFIG_I2C_MPC=y | 1049 | CONFIG_I2C_MPC=y |
| 1046 | # CONFIG_I2C_OCORES is not set | 1050 | # CONFIG_I2C_OCORES is not set |
| 1047 | # CONFIG_I2C_SIMTEC is not set | 1051 | # CONFIG_I2C_SIMTEC is not set |
| 1052 | # CONFIG_I2C_XILINX is not set | ||
| 1048 | 1053 | ||
| 1049 | # | 1054 | # |
| 1050 | # External I2C/SMBus adapter drivers | 1055 | # External I2C/SMBus adapter drivers |
| @@ -1058,15 +1063,9 @@ CONFIG_I2C_MPC=y | |||
| 1058 | # | 1063 | # |
| 1059 | # CONFIG_I2C_PCA_PLATFORM is not set | 1064 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1060 | # CONFIG_I2C_STUB is not set | 1065 | # CONFIG_I2C_STUB is not set |
| 1061 | |||
| 1062 | # | ||
| 1063 | # Miscellaneous I2C Chip support | ||
| 1064 | # | ||
| 1065 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1066 | # CONFIG_I2C_DEBUG_CORE is not set | 1066 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1067 | # CONFIG_I2C_DEBUG_ALGO is not set | 1067 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1068 | # CONFIG_I2C_DEBUG_BUS is not set | 1068 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1069 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1070 | CONFIG_SPI=y | 1069 | CONFIG_SPI=y |
| 1071 | # CONFIG_SPI_DEBUG is not set | 1070 | # CONFIG_SPI_DEBUG is not set |
| 1072 | CONFIG_SPI_MASTER=y | 1071 | CONFIG_SPI_MASTER=y |
| @@ -1109,10 +1108,11 @@ CONFIG_HWMON=y | |||
| 1109 | # CONFIG_SENSORS_ADM1029 is not set | 1108 | # CONFIG_SENSORS_ADM1029 is not set |
| 1110 | # CONFIG_SENSORS_ADM1031 is not set | 1109 | # CONFIG_SENSORS_ADM1031 is not set |
| 1111 | # CONFIG_SENSORS_ADM9240 is not set | 1110 | # CONFIG_SENSORS_ADM9240 is not set |
| 1111 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1112 | # CONFIG_SENSORS_ADT7462 is not set | 1112 | # CONFIG_SENSORS_ADT7462 is not set |
| 1113 | # CONFIG_SENSORS_ADT7470 is not set | 1113 | # CONFIG_SENSORS_ADT7470 is not set |
| 1114 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1115 | # CONFIG_SENSORS_ADT7475 is not set | 1114 | # CONFIG_SENSORS_ADT7475 is not set |
| 1115 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1116 | # CONFIG_SENSORS_ATXP1 is not set | 1116 | # CONFIG_SENSORS_ATXP1 is not set |
| 1117 | # CONFIG_SENSORS_DS1621 is not set | 1117 | # CONFIG_SENSORS_DS1621 is not set |
| 1118 | # CONFIG_SENSORS_I5K_AMB is not set | 1118 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1151,6 +1151,7 @@ CONFIG_HWMON=y | |||
| 1151 | # CONFIG_SENSORS_SMSC47M192 is not set | 1151 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1152 | # CONFIG_SENSORS_SMSC47B397 is not set | 1152 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1153 | # CONFIG_SENSORS_ADS7828 is not set | 1153 | # CONFIG_SENSORS_ADS7828 is not set |
| 1154 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1154 | # CONFIG_SENSORS_THMC50 is not set | 1155 | # CONFIG_SENSORS_THMC50 is not set |
| 1155 | # CONFIG_SENSORS_TMP401 is not set | 1156 | # CONFIG_SENSORS_TMP401 is not set |
| 1156 | # CONFIG_SENSORS_TMP421 is not set | 1157 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1199,21 +1200,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1199 | # Multifunction device drivers | 1200 | # Multifunction device drivers |
| 1200 | # | 1201 | # |
| 1201 | # CONFIG_MFD_CORE is not set | 1202 | # CONFIG_MFD_CORE is not set |
| 1203 | # CONFIG_MFD_88PM860X is not set | ||
| 1202 | # CONFIG_MFD_SM501 is not set | 1204 | # CONFIG_MFD_SM501 is not set |
| 1203 | # CONFIG_HTC_PASIC3 is not set | 1205 | # CONFIG_HTC_PASIC3 is not set |
| 1204 | # CONFIG_TWL4030_CORE is not set | 1206 | # CONFIG_TWL4030_CORE is not set |
| 1205 | # CONFIG_MFD_TMIO is not set | 1207 | # CONFIG_MFD_TMIO is not set |
| 1206 | # CONFIG_PMIC_DA903X is not set | 1208 | # CONFIG_PMIC_DA903X is not set |
| 1207 | # CONFIG_PMIC_ADP5520 is not set | 1209 | # CONFIG_PMIC_ADP5520 is not set |
| 1210 | # CONFIG_MFD_MAX8925 is not set | ||
| 1208 | # CONFIG_MFD_WM8400 is not set | 1211 | # CONFIG_MFD_WM8400 is not set |
| 1209 | # CONFIG_MFD_WM831X is not set | 1212 | # CONFIG_MFD_WM831X is not set |
| 1210 | # CONFIG_MFD_WM8350_I2C is not set | 1213 | # CONFIG_MFD_WM8350_I2C is not set |
| 1214 | # CONFIG_MFD_WM8994 is not set | ||
| 1211 | # CONFIG_MFD_PCF50633 is not set | 1215 | # CONFIG_MFD_PCF50633 is not set |
| 1212 | # CONFIG_MFD_MC13783 is not set | 1216 | # CONFIG_MFD_MC13783 is not set |
| 1213 | # CONFIG_AB3100_CORE is not set | 1217 | # CONFIG_AB3100_CORE is not set |
| 1214 | # CONFIG_EZX_PCAP is not set | 1218 | # CONFIG_EZX_PCAP is not set |
| 1215 | # CONFIG_MFD_88PM8607 is not set | ||
| 1216 | # CONFIG_AB4500_CORE is not set | 1219 | # CONFIG_AB4500_CORE is not set |
| 1220 | # CONFIG_LPC_SCH is not set | ||
| 1217 | # CONFIG_REGULATOR is not set | 1221 | # CONFIG_REGULATOR is not set |
| 1218 | # CONFIG_MEDIA_SUPPORT is not set | 1222 | # CONFIG_MEDIA_SUPPORT is not set |
| 1219 | 1223 | ||
| @@ -1222,6 +1226,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1222 | # | 1226 | # |
| 1223 | # CONFIG_AGP is not set | 1227 | # CONFIG_AGP is not set |
| 1224 | CONFIG_VGA_ARB=y | 1228 | CONFIG_VGA_ARB=y |
| 1229 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1225 | # CONFIG_DRM is not set | 1230 | # CONFIG_DRM is not set |
| 1226 | # CONFIG_VGASTATE is not set | 1231 | # CONFIG_VGASTATE is not set |
| 1227 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1232 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1354,7 +1359,6 @@ CONFIG_USB_STORAGE=y | |||
| 1354 | # CONFIG_USB_RIO500 is not set | 1359 | # CONFIG_USB_RIO500 is not set |
| 1355 | # CONFIG_USB_LEGOTOWER is not set | 1360 | # CONFIG_USB_LEGOTOWER is not set |
| 1356 | # CONFIG_USB_LCD is not set | 1361 | # CONFIG_USB_LCD is not set |
| 1357 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1358 | # CONFIG_USB_LED is not set | 1362 | # CONFIG_USB_LED is not set |
| 1359 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1363 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1360 | # CONFIG_USB_CYTHERM is not set | 1364 | # CONFIG_USB_CYTHERM is not set |
| @@ -1367,7 +1371,6 @@ CONFIG_USB_STORAGE=y | |||
| 1367 | # CONFIG_USB_IOWARRIOR is not set | 1371 | # CONFIG_USB_IOWARRIOR is not set |
| 1368 | # CONFIG_USB_TEST is not set | 1372 | # CONFIG_USB_TEST is not set |
| 1369 | # CONFIG_USB_ISIGHTFW is not set | 1373 | # CONFIG_USB_ISIGHTFW is not set |
| 1370 | # CONFIG_USB_VST is not set | ||
| 1371 | CONFIG_USB_GADGET=y | 1374 | CONFIG_USB_GADGET=y |
| 1372 | # CONFIG_USB_GADGET_DEBUG is not set | 1375 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1373 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1376 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1406,6 +1409,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1406 | # CONFIG_USB_MIDI_GADGET is not set | 1409 | # CONFIG_USB_MIDI_GADGET is not set |
| 1407 | # CONFIG_USB_G_PRINTER is not set | 1410 | # CONFIG_USB_G_PRINTER is not set |
| 1408 | # CONFIG_USB_CDC_COMPOSITE is not set | 1411 | # CONFIG_USB_CDC_COMPOSITE is not set |
| 1412 | # CONFIG_USB_G_NOKIA is not set | ||
| 1409 | # CONFIG_USB_G_MULTI is not set | 1413 | # CONFIG_USB_G_MULTI is not set |
| 1410 | 1414 | ||
| 1411 | # | 1415 | # |
| @@ -1576,6 +1580,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1576 | # CONFIG_JFFS2_LZO is not set | 1580 | # CONFIG_JFFS2_LZO is not set |
| 1577 | CONFIG_JFFS2_RTIME=y | 1581 | CONFIG_JFFS2_RTIME=y |
| 1578 | # CONFIG_JFFS2_RUBIN is not set | 1582 | # CONFIG_JFFS2_RUBIN is not set |
| 1583 | # CONFIG_LOGFS is not set | ||
| 1579 | # CONFIG_CRAMFS is not set | 1584 | # CONFIG_CRAMFS is not set |
| 1580 | # CONFIG_SQUASHFS is not set | 1585 | # CONFIG_SQUASHFS is not set |
| 1581 | # CONFIG_VXFS_FS is not set | 1586 | # CONFIG_VXFS_FS is not set |
| @@ -1602,6 +1607,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1602 | CONFIG_RPCSEC_GSS_KRB5=y | 1607 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1603 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1608 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1604 | # CONFIG_SMB_FS is not set | 1609 | # CONFIG_SMB_FS is not set |
| 1610 | # CONFIG_CEPH_FS is not set | ||
| 1605 | # CONFIG_CIFS is not set | 1611 | # CONFIG_CIFS is not set |
| 1606 | # CONFIG_NCP_FS is not set | 1612 | # CONFIG_NCP_FS is not set |
| 1607 | # CONFIG_CODA_FS is not set | 1613 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 0b4262bd4917..74cb27aa9d17 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:17 2010 | 4 | # Mon Apr 19 23:16:41 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -325,6 +320,7 @@ CONFIG_ISA_DMA_API=y | |||
| 325 | # Bus options | 320 | # Bus options |
| 326 | # | 321 | # |
| 327 | CONFIG_ZONE_DMA=y | 322 | CONFIG_ZONE_DMA=y |
| 323 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 328 | CONFIG_GENERIC_ISA_DMA=y | 324 | CONFIG_GENERIC_ISA_DMA=y |
| 329 | CONFIG_PPC_INDIRECT_PCI=y | 325 | CONFIG_PPC_INDIRECT_PCI=y |
| 330 | CONFIG_FSL_SOC=y | 326 | CONFIG_FSL_SOC=y |
| @@ -336,7 +332,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 336 | # CONFIG_PCIEPORTBUS is not set | 332 | # CONFIG_PCIEPORTBUS is not set |
| 337 | CONFIG_ARCH_SUPPORTS_MSI=y | 333 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 338 | # CONFIG_PCI_MSI is not set | 334 | # CONFIG_PCI_MSI is not set |
| 339 | # CONFIG_PCI_LEGACY is not set | ||
| 340 | # CONFIG_PCI_STUB is not set | 335 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 336 | # CONFIG_PCI_IOV is not set |
| 342 | # CONFIG_PCCARD is not set | 337 | # CONFIG_PCCARD is not set |
| @@ -362,7 +357,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 357 | # Networking options |
| 363 | # | 358 | # |
| 364 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 368 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| @@ -457,6 +451,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 457 | # CONFIG_SYS_HYPERVISOR is not set | 451 | # CONFIG_SYS_HYPERVISOR is not set |
| 458 | # CONFIG_CONNECTOR is not set | 452 | # CONFIG_CONNECTOR is not set |
| 459 | # CONFIG_MTD is not set | 453 | # CONFIG_MTD is not set |
| 454 | CONFIG_OF_FLATTREE=y | ||
| 455 | CONFIG_OF_DYNAMIC=y | ||
| 460 | CONFIG_OF_DEVICE=y | 456 | CONFIG_OF_DEVICE=y |
| 461 | CONFIG_OF_I2C=y | 457 | CONFIG_OF_I2C=y |
| 462 | CONFIG_OF_MDIO=y | 458 | CONFIG_OF_MDIO=y |
| @@ -492,6 +488,7 @@ CONFIG_MISC_DEVICES=y | |||
| 492 | # CONFIG_ENCLOSURE_SERVICES is not set | 488 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 493 | # CONFIG_HP_ILO is not set | 489 | # CONFIG_HP_ILO is not set |
| 494 | # CONFIG_ISL29003 is not set | 490 | # CONFIG_ISL29003 is not set |
| 491 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 495 | # CONFIG_DS1682 is not set | 492 | # CONFIG_DS1682 is not set |
| 496 | # CONFIG_C2PORT is not set | 493 | # CONFIG_C2PORT is not set |
| 497 | 494 | ||
| @@ -509,6 +506,7 @@ CONFIG_HAVE_IDE=y | |||
| 509 | # | 506 | # |
| 510 | # SCSI device support | 507 | # SCSI device support |
| 511 | # | 508 | # |
| 509 | CONFIG_SCSI_MOD=y | ||
| 512 | # CONFIG_RAID_ATTRS is not set | 510 | # CONFIG_RAID_ATTRS is not set |
| 513 | CONFIG_SCSI=y | 511 | CONFIG_SCSI=y |
| 514 | CONFIG_SCSI_DMA=y | 512 | CONFIG_SCSI_DMA=y |
| @@ -693,6 +691,8 @@ CONFIG_NETDEV_10000=y | |||
| 693 | # CONFIG_CHELSIO_T1 is not set | 691 | # CONFIG_CHELSIO_T1 is not set |
| 694 | CONFIG_CHELSIO_T3_DEPENDS=y | 692 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 695 | # CONFIG_CHELSIO_T3 is not set | 693 | # CONFIG_CHELSIO_T3 is not set |
| 694 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 695 | # CONFIG_CHELSIO_T4 is not set | ||
| 696 | # CONFIG_ENIC is not set | 696 | # CONFIG_ENIC is not set |
| 697 | # CONFIG_IXGBE is not set | 697 | # CONFIG_IXGBE is not set |
| 698 | # CONFIG_IXGB is not set | 698 | # CONFIG_IXGB is not set |
| @@ -705,6 +705,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 705 | # CONFIG_MLX4_CORE is not set | 705 | # CONFIG_MLX4_CORE is not set |
| 706 | # CONFIG_TEHUTI is not set | 706 | # CONFIG_TEHUTI is not set |
| 707 | # CONFIG_BNX2X is not set | 707 | # CONFIG_BNX2X is not set |
| 708 | # CONFIG_QLCNIC is not set | ||
| 708 | # CONFIG_QLGE is not set | 709 | # CONFIG_QLGE is not set |
| 709 | # CONFIG_SFC is not set | 710 | # CONFIG_SFC is not set |
| 710 | # CONFIG_BE2NET is not set | 711 | # CONFIG_BE2NET is not set |
| @@ -790,6 +791,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 790 | # CONFIG_SERIAL_JSM is not set | 791 | # CONFIG_SERIAL_JSM is not set |
| 791 | # CONFIG_SERIAL_OF_PLATFORM is not set | 792 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 792 | # CONFIG_SERIAL_QE is not set | 793 | # CONFIG_SERIAL_QE is not set |
| 794 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 793 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 795 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 794 | CONFIG_UNIX98_PTYS=y | 796 | CONFIG_UNIX98_PTYS=y |
| 795 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 797 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -839,6 +841,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 839 | CONFIG_I2C_MPC=y | 841 | CONFIG_I2C_MPC=y |
| 840 | # CONFIG_I2C_OCORES is not set | 842 | # CONFIG_I2C_OCORES is not set |
| 841 | # CONFIG_I2C_SIMTEC is not set | 843 | # CONFIG_I2C_SIMTEC is not set |
| 844 | # CONFIG_I2C_XILINX is not set | ||
| 842 | 845 | ||
| 843 | # | 846 | # |
| 844 | # External I2C/SMBus adapter drivers | 847 | # External I2C/SMBus adapter drivers |
| @@ -851,15 +854,9 @@ CONFIG_I2C_MPC=y | |||
| 851 | # | 854 | # |
| 852 | # CONFIG_I2C_PCA_PLATFORM is not set | 855 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 853 | # CONFIG_I2C_STUB is not set | 856 | # CONFIG_I2C_STUB is not set |
| 854 | |||
| 855 | # | ||
| 856 | # Miscellaneous I2C Chip support | ||
| 857 | # | ||
| 858 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 859 | # CONFIG_I2C_DEBUG_CORE is not set | 857 | # CONFIG_I2C_DEBUG_CORE is not set |
| 860 | # CONFIG_I2C_DEBUG_ALGO is not set | 858 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 861 | # CONFIG_I2C_DEBUG_BUS is not set | 859 | # CONFIG_I2C_DEBUG_BUS is not set |
| 862 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 863 | # CONFIG_SPI is not set | 860 | # CONFIG_SPI is not set |
| 864 | 861 | ||
| 865 | # | 862 | # |
| @@ -885,10 +882,11 @@ CONFIG_HWMON=y | |||
| 885 | # CONFIG_SENSORS_ADM1029 is not set | 882 | # CONFIG_SENSORS_ADM1029 is not set |
| 886 | # CONFIG_SENSORS_ADM1031 is not set | 883 | # CONFIG_SENSORS_ADM1031 is not set |
| 887 | # CONFIG_SENSORS_ADM9240 is not set | 884 | # CONFIG_SENSORS_ADM9240 is not set |
| 885 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 888 | # CONFIG_SENSORS_ADT7462 is not set | 886 | # CONFIG_SENSORS_ADT7462 is not set |
| 889 | # CONFIG_SENSORS_ADT7470 is not set | 887 | # CONFIG_SENSORS_ADT7470 is not set |
| 890 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 891 | # CONFIG_SENSORS_ADT7475 is not set | 888 | # CONFIG_SENSORS_ADT7475 is not set |
| 889 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 892 | # CONFIG_SENSORS_ATXP1 is not set | 890 | # CONFIG_SENSORS_ATXP1 is not set |
| 893 | # CONFIG_SENSORS_DS1621 is not set | 891 | # CONFIG_SENSORS_DS1621 is not set |
| 894 | # CONFIG_SENSORS_I5K_AMB is not set | 892 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -925,6 +923,7 @@ CONFIG_HWMON=y | |||
| 925 | # CONFIG_SENSORS_SMSC47M192 is not set | 923 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 926 | # CONFIG_SENSORS_SMSC47B397 is not set | 924 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 927 | # CONFIG_SENSORS_ADS7828 is not set | 925 | # CONFIG_SENSORS_ADS7828 is not set |
| 926 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 928 | # CONFIG_SENSORS_THMC50 is not set | 927 | # CONFIG_SENSORS_THMC50 is not set |
| 929 | # CONFIG_SENSORS_TMP401 is not set | 928 | # CONFIG_SENSORS_TMP401 is not set |
| 930 | # CONFIG_SENSORS_TMP421 is not set | 929 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -967,18 +966,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 967 | # Multifunction device drivers | 966 | # Multifunction device drivers |
| 968 | # | 967 | # |
| 969 | # CONFIG_MFD_CORE is not set | 968 | # CONFIG_MFD_CORE is not set |
| 969 | # CONFIG_MFD_88PM860X is not set | ||
| 970 | # CONFIG_MFD_SM501 is not set | 970 | # CONFIG_MFD_SM501 is not set |
| 971 | # CONFIG_HTC_PASIC3 is not set | 971 | # CONFIG_HTC_PASIC3 is not set |
| 972 | # CONFIG_TWL4030_CORE is not set | 972 | # CONFIG_TWL4030_CORE is not set |
| 973 | # CONFIG_MFD_TMIO is not set | 973 | # CONFIG_MFD_TMIO is not set |
| 974 | # CONFIG_PMIC_DA903X is not set | 974 | # CONFIG_PMIC_DA903X is not set |
| 975 | # CONFIG_PMIC_ADP5520 is not set | 975 | # CONFIG_PMIC_ADP5520 is not set |
| 976 | # CONFIG_MFD_MAX8925 is not set | ||
| 976 | # CONFIG_MFD_WM8400 is not set | 977 | # CONFIG_MFD_WM8400 is not set |
| 977 | # CONFIG_MFD_WM831X is not set | 978 | # CONFIG_MFD_WM831X is not set |
| 978 | # CONFIG_MFD_WM8350_I2C is not set | 979 | # CONFIG_MFD_WM8350_I2C is not set |
| 980 | # CONFIG_MFD_WM8994 is not set | ||
| 979 | # CONFIG_MFD_PCF50633 is not set | 981 | # CONFIG_MFD_PCF50633 is not set |
| 980 | # CONFIG_AB3100_CORE is not set | 982 | # CONFIG_AB3100_CORE is not set |
| 981 | # CONFIG_MFD_88PM8607 is not set | 983 | # CONFIG_LPC_SCH is not set |
| 982 | # CONFIG_REGULATOR is not set | 984 | # CONFIG_REGULATOR is not set |
| 983 | # CONFIG_MEDIA_SUPPORT is not set | 985 | # CONFIG_MEDIA_SUPPORT is not set |
| 984 | 986 | ||
| @@ -987,6 +989,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 987 | # | 989 | # |
| 988 | # CONFIG_AGP is not set | 990 | # CONFIG_AGP is not set |
| 989 | CONFIG_VGA_ARB=y | 991 | CONFIG_VGA_ARB=y |
| 992 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 990 | # CONFIG_DRM is not set | 993 | # CONFIG_DRM is not set |
| 991 | # CONFIG_VGASTATE is not set | 994 | # CONFIG_VGASTATE is not set |
| 992 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 995 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1171,6 +1174,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1171 | # CONFIG_BEFS_FS is not set | 1174 | # CONFIG_BEFS_FS is not set |
| 1172 | # CONFIG_BFS_FS is not set | 1175 | # CONFIG_BFS_FS is not set |
| 1173 | # CONFIG_EFS_FS is not set | 1176 | # CONFIG_EFS_FS is not set |
| 1177 | # CONFIG_LOGFS is not set | ||
| 1174 | # CONFIG_CRAMFS is not set | 1178 | # CONFIG_CRAMFS is not set |
| 1175 | # CONFIG_SQUASHFS is not set | 1179 | # CONFIG_SQUASHFS is not set |
| 1176 | # CONFIG_VXFS_FS is not set | 1180 | # CONFIG_VXFS_FS is not set |
| @@ -1197,6 +1201,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1197 | CONFIG_RPCSEC_GSS_KRB5=y | 1201 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1198 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1202 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1199 | # CONFIG_SMB_FS is not set | 1203 | # CONFIG_SMB_FS is not set |
| 1204 | # CONFIG_CEPH_FS is not set | ||
| 1200 | # CONFIG_CIFS is not set | 1205 | # CONFIG_CIFS is not set |
| 1201 | # CONFIG_NCP_FS is not set | 1206 | # CONFIG_NCP_FS is not set |
| 1202 | # CONFIG_CODA_FS is not set | 1207 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index 155af009f7b5..10412a9c7f90 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:18 2010 | 4 | # Mon Apr 19 23:16:42 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -325,6 +320,7 @@ CONFIG_ISA_DMA_API=y | |||
| 325 | # Bus options | 320 | # Bus options |
| 326 | # | 321 | # |
| 327 | CONFIG_ZONE_DMA=y | 322 | CONFIG_ZONE_DMA=y |
| 323 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 328 | CONFIG_GENERIC_ISA_DMA=y | 324 | CONFIG_GENERIC_ISA_DMA=y |
| 329 | CONFIG_PPC_INDIRECT_PCI=y | 325 | CONFIG_PPC_INDIRECT_PCI=y |
| 330 | CONFIG_FSL_SOC=y | 326 | CONFIG_FSL_SOC=y |
| @@ -336,7 +332,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 336 | # CONFIG_PCIEPORTBUS is not set | 332 | # CONFIG_PCIEPORTBUS is not set |
| 337 | CONFIG_ARCH_SUPPORTS_MSI=y | 333 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 338 | # CONFIG_PCI_MSI is not set | 334 | # CONFIG_PCI_MSI is not set |
| 339 | # CONFIG_PCI_LEGACY is not set | ||
| 340 | # CONFIG_PCI_STUB is not set | 335 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 336 | # CONFIG_PCI_IOV is not set |
| 342 | # CONFIG_PCCARD is not set | 337 | # CONFIG_PCCARD is not set |
| @@ -362,7 +357,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 357 | # Networking options |
| 363 | # | 358 | # |
| 364 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 368 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| @@ -457,6 +451,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 457 | # CONFIG_SYS_HYPERVISOR is not set | 451 | # CONFIG_SYS_HYPERVISOR is not set |
| 458 | # CONFIG_CONNECTOR is not set | 452 | # CONFIG_CONNECTOR is not set |
| 459 | # CONFIG_MTD is not set | 453 | # CONFIG_MTD is not set |
| 454 | CONFIG_OF_FLATTREE=y | ||
| 455 | CONFIG_OF_DYNAMIC=y | ||
| 460 | CONFIG_OF_DEVICE=y | 456 | CONFIG_OF_DEVICE=y |
| 461 | CONFIG_OF_I2C=y | 457 | CONFIG_OF_I2C=y |
| 462 | CONFIG_OF_SPI=y | 458 | CONFIG_OF_SPI=y |
| @@ -494,6 +490,7 @@ CONFIG_MISC_DEVICES=y | |||
| 494 | # CONFIG_ENCLOSURE_SERVICES is not set | 490 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 495 | # CONFIG_HP_ILO is not set | 491 | # CONFIG_HP_ILO is not set |
| 496 | # CONFIG_ISL29003 is not set | 492 | # CONFIG_ISL29003 is not set |
| 493 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 497 | # CONFIG_DS1682 is not set | 494 | # CONFIG_DS1682 is not set |
| 498 | # CONFIG_TI_DAC7512 is not set | 495 | # CONFIG_TI_DAC7512 is not set |
| 499 | # CONFIG_C2PORT is not set | 496 | # CONFIG_C2PORT is not set |
| @@ -514,6 +511,7 @@ CONFIG_HAVE_IDE=y | |||
| 514 | # | 511 | # |
| 515 | # SCSI device support | 512 | # SCSI device support |
| 516 | # | 513 | # |
| 514 | CONFIG_SCSI_MOD=y | ||
| 517 | # CONFIG_RAID_ATTRS is not set | 515 | # CONFIG_RAID_ATTRS is not set |
| 518 | CONFIG_SCSI=y | 516 | CONFIG_SCSI=y |
| 519 | CONFIG_SCSI_DMA=y | 517 | CONFIG_SCSI_DMA=y |
| @@ -700,6 +698,8 @@ CONFIG_NETDEV_10000=y | |||
| 700 | # CONFIG_CHELSIO_T1 is not set | 698 | # CONFIG_CHELSIO_T1 is not set |
| 701 | CONFIG_CHELSIO_T3_DEPENDS=y | 699 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 702 | # CONFIG_CHELSIO_T3 is not set | 700 | # CONFIG_CHELSIO_T3 is not set |
| 701 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 702 | # CONFIG_CHELSIO_T4 is not set | ||
| 703 | # CONFIG_ENIC is not set | 703 | # CONFIG_ENIC is not set |
| 704 | # CONFIG_IXGBE is not set | 704 | # CONFIG_IXGBE is not set |
| 705 | # CONFIG_IXGB is not set | 705 | # CONFIG_IXGB is not set |
| @@ -712,6 +712,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 712 | # CONFIG_MLX4_CORE is not set | 712 | # CONFIG_MLX4_CORE is not set |
| 713 | # CONFIG_TEHUTI is not set | 713 | # CONFIG_TEHUTI is not set |
| 714 | # CONFIG_BNX2X is not set | 714 | # CONFIG_BNX2X is not set |
| 715 | # CONFIG_QLCNIC is not set | ||
| 715 | # CONFIG_QLGE is not set | 716 | # CONFIG_QLGE is not set |
| 716 | # CONFIG_SFC is not set | 717 | # CONFIG_SFC is not set |
| 717 | # CONFIG_BE2NET is not set | 718 | # CONFIG_BE2NET is not set |
| @@ -808,6 +809,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 808 | # CONFIG_SERIAL_JSM is not set | 809 | # CONFIG_SERIAL_JSM is not set |
| 809 | # CONFIG_SERIAL_OF_PLATFORM is not set | 810 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 810 | # CONFIG_SERIAL_QE is not set | 811 | # CONFIG_SERIAL_QE is not set |
| 812 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 811 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 813 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 812 | CONFIG_UNIX98_PTYS=y | 814 | CONFIG_UNIX98_PTYS=y |
| 813 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 815 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -859,6 +861,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 859 | CONFIG_I2C_MPC=y | 861 | CONFIG_I2C_MPC=y |
| 860 | # CONFIG_I2C_OCORES is not set | 862 | # CONFIG_I2C_OCORES is not set |
| 861 | # CONFIG_I2C_SIMTEC is not set | 863 | # CONFIG_I2C_SIMTEC is not set |
| 864 | # CONFIG_I2C_XILINX is not set | ||
| 862 | 865 | ||
| 863 | # | 866 | # |
| 864 | # External I2C/SMBus adapter drivers | 867 | # External I2C/SMBus adapter drivers |
| @@ -872,15 +875,9 @@ CONFIG_I2C_MPC=y | |||
| 872 | # | 875 | # |
| 873 | # CONFIG_I2C_PCA_PLATFORM is not set | 876 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 874 | # CONFIG_I2C_STUB is not set | 877 | # CONFIG_I2C_STUB is not set |
| 875 | |||
| 876 | # | ||
| 877 | # Miscellaneous I2C Chip support | ||
| 878 | # | ||
| 879 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 880 | # CONFIG_I2C_DEBUG_CORE is not set | 878 | # CONFIG_I2C_DEBUG_CORE is not set |
| 881 | # CONFIG_I2C_DEBUG_ALGO is not set | 879 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 882 | # CONFIG_I2C_DEBUG_BUS is not set | 880 | # CONFIG_I2C_DEBUG_BUS is not set |
| 883 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 884 | CONFIG_SPI=y | 881 | CONFIG_SPI=y |
| 885 | CONFIG_SPI_MASTER=y | 882 | CONFIG_SPI_MASTER=y |
| 886 | 883 | ||
| @@ -922,10 +919,11 @@ CONFIG_HWMON=y | |||
| 922 | # CONFIG_SENSORS_ADM1029 is not set | 919 | # CONFIG_SENSORS_ADM1029 is not set |
| 923 | # CONFIG_SENSORS_ADM1031 is not set | 920 | # CONFIG_SENSORS_ADM1031 is not set |
| 924 | # CONFIG_SENSORS_ADM9240 is not set | 921 | # CONFIG_SENSORS_ADM9240 is not set |
| 922 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 925 | # CONFIG_SENSORS_ADT7462 is not set | 923 | # CONFIG_SENSORS_ADT7462 is not set |
| 926 | # CONFIG_SENSORS_ADT7470 is not set | 924 | # CONFIG_SENSORS_ADT7470 is not set |
| 927 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 928 | # CONFIG_SENSORS_ADT7475 is not set | 925 | # CONFIG_SENSORS_ADT7475 is not set |
| 926 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 929 | # CONFIG_SENSORS_ATXP1 is not set | 927 | # CONFIG_SENSORS_ATXP1 is not set |
| 930 | # CONFIG_SENSORS_DS1621 is not set | 928 | # CONFIG_SENSORS_DS1621 is not set |
| 931 | # CONFIG_SENSORS_I5K_AMB is not set | 929 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -964,6 +962,7 @@ CONFIG_HWMON=y | |||
| 964 | # CONFIG_SENSORS_SMSC47M192 is not set | 962 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 965 | # CONFIG_SENSORS_SMSC47B397 is not set | 963 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 966 | # CONFIG_SENSORS_ADS7828 is not set | 964 | # CONFIG_SENSORS_ADS7828 is not set |
| 965 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 967 | # CONFIG_SENSORS_THMC50 is not set | 966 | # CONFIG_SENSORS_THMC50 is not set |
| 968 | # CONFIG_SENSORS_TMP401 is not set | 967 | # CONFIG_SENSORS_TMP401 is not set |
| 969 | # CONFIG_SENSORS_TMP421 is not set | 968 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1012,21 +1011,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1012 | # Multifunction device drivers | 1011 | # Multifunction device drivers |
| 1013 | # | 1012 | # |
| 1014 | # CONFIG_MFD_CORE is not set | 1013 | # CONFIG_MFD_CORE is not set |
| 1014 | # CONFIG_MFD_88PM860X is not set | ||
| 1015 | # CONFIG_MFD_SM501 is not set | 1015 | # CONFIG_MFD_SM501 is not set |
| 1016 | # CONFIG_HTC_PASIC3 is not set | 1016 | # CONFIG_HTC_PASIC3 is not set |
| 1017 | # CONFIG_TWL4030_CORE is not set | 1017 | # CONFIG_TWL4030_CORE is not set |
| 1018 | # CONFIG_MFD_TMIO is not set | 1018 | # CONFIG_MFD_TMIO is not set |
| 1019 | # CONFIG_PMIC_DA903X is not set | 1019 | # CONFIG_PMIC_DA903X is not set |
| 1020 | # CONFIG_PMIC_ADP5520 is not set | 1020 | # CONFIG_PMIC_ADP5520 is not set |
| 1021 | # CONFIG_MFD_MAX8925 is not set | ||
| 1021 | # CONFIG_MFD_WM8400 is not set | 1022 | # CONFIG_MFD_WM8400 is not set |
| 1022 | # CONFIG_MFD_WM831X is not set | 1023 | # CONFIG_MFD_WM831X is not set |
| 1023 | # CONFIG_MFD_WM8350_I2C is not set | 1024 | # CONFIG_MFD_WM8350_I2C is not set |
| 1025 | # CONFIG_MFD_WM8994 is not set | ||
| 1024 | # CONFIG_MFD_PCF50633 is not set | 1026 | # CONFIG_MFD_PCF50633 is not set |
| 1025 | # CONFIG_MFD_MC13783 is not set | 1027 | # CONFIG_MFD_MC13783 is not set |
| 1026 | # CONFIG_AB3100_CORE is not set | 1028 | # CONFIG_AB3100_CORE is not set |
| 1027 | # CONFIG_EZX_PCAP is not set | 1029 | # CONFIG_EZX_PCAP is not set |
| 1028 | # CONFIG_MFD_88PM8607 is not set | ||
| 1029 | # CONFIG_AB4500_CORE is not set | 1030 | # CONFIG_AB4500_CORE is not set |
| 1031 | # CONFIG_LPC_SCH is not set | ||
| 1030 | # CONFIG_REGULATOR is not set | 1032 | # CONFIG_REGULATOR is not set |
| 1031 | # CONFIG_MEDIA_SUPPORT is not set | 1033 | # CONFIG_MEDIA_SUPPORT is not set |
| 1032 | 1034 | ||
| @@ -1035,6 +1037,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1035 | # | 1037 | # |
| 1036 | # CONFIG_AGP is not set | 1038 | # CONFIG_AGP is not set |
| 1037 | CONFIG_VGA_ARB=y | 1039 | CONFIG_VGA_ARB=y |
| 1040 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1038 | # CONFIG_DRM is not set | 1041 | # CONFIG_DRM is not set |
| 1039 | # CONFIG_VGASTATE is not set | 1042 | # CONFIG_VGASTATE is not set |
| 1040 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1043 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1166,7 +1169,6 @@ CONFIG_USB_STORAGE=y | |||
| 1166 | # CONFIG_USB_RIO500 is not set | 1169 | # CONFIG_USB_RIO500 is not set |
| 1167 | # CONFIG_USB_LEGOTOWER is not set | 1170 | # CONFIG_USB_LEGOTOWER is not set |
| 1168 | # CONFIG_USB_LCD is not set | 1171 | # CONFIG_USB_LCD is not set |
| 1169 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1170 | # CONFIG_USB_LED is not set | 1172 | # CONFIG_USB_LED is not set |
| 1171 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1173 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1172 | # CONFIG_USB_CYTHERM is not set | 1174 | # CONFIG_USB_CYTHERM is not set |
| @@ -1179,7 +1181,6 @@ CONFIG_USB_STORAGE=y | |||
| 1179 | # CONFIG_USB_IOWARRIOR is not set | 1181 | # CONFIG_USB_IOWARRIOR is not set |
| 1180 | # CONFIG_USB_TEST is not set | 1182 | # CONFIG_USB_TEST is not set |
| 1181 | # CONFIG_USB_ISIGHTFW is not set | 1183 | # CONFIG_USB_ISIGHTFW is not set |
| 1182 | # CONFIG_USB_VST is not set | ||
| 1183 | # CONFIG_USB_GADGET is not set | 1184 | # CONFIG_USB_GADGET is not set |
| 1184 | 1185 | ||
| 1185 | # | 1186 | # |
| @@ -1204,8 +1205,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
| 1204 | # | 1205 | # |
| 1205 | # CONFIG_MMC_SDHCI is not set | 1206 | # CONFIG_MMC_SDHCI is not set |
| 1206 | # CONFIG_MMC_WBSD is not set | 1207 | # CONFIG_MMC_WBSD is not set |
| 1207 | # CONFIG_MMC_AT91 is not set | ||
| 1208 | # CONFIG_MMC_ATMELMCI is not set | ||
| 1209 | # CONFIG_MMC_TIFM_SD is not set | 1208 | # CONFIG_MMC_TIFM_SD is not set |
| 1210 | CONFIG_MMC_SPI=y | 1209 | CONFIG_MMC_SPI=y |
| 1211 | # CONFIG_MMC_CB710 is not set | 1210 | # CONFIG_MMC_CB710 is not set |
| @@ -1298,6 +1297,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1298 | # CONFIG_BEFS_FS is not set | 1297 | # CONFIG_BEFS_FS is not set |
| 1299 | # CONFIG_BFS_FS is not set | 1298 | # CONFIG_BFS_FS is not set |
| 1300 | # CONFIG_EFS_FS is not set | 1299 | # CONFIG_EFS_FS is not set |
| 1300 | # CONFIG_LOGFS is not set | ||
| 1301 | # CONFIG_CRAMFS is not set | 1301 | # CONFIG_CRAMFS is not set |
| 1302 | # CONFIG_SQUASHFS is not set | 1302 | # CONFIG_SQUASHFS is not set |
| 1303 | # CONFIG_VXFS_FS is not set | 1303 | # CONFIG_VXFS_FS is not set |
| @@ -1324,6 +1324,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1324 | CONFIG_RPCSEC_GSS_KRB5=y | 1324 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1325 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1325 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1326 | # CONFIG_SMB_FS is not set | 1326 | # CONFIG_SMB_FS is not set |
| 1327 | # CONFIG_CEPH_FS is not set | ||
| 1327 | # CONFIG_CIFS is not set | 1328 | # CONFIG_CIFS is not set |
| 1328 | # CONFIG_NCP_FS is not set | 1329 | # CONFIG_NCP_FS is not set |
| 1329 | # CONFIG_CODA_FS is not set | 1330 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index ff45f4904488..7b31fc3f3545 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:19 2010 | 4 | # Mon Apr 19 23:16:43 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_STUB is not set | 334 | # CONFIG_PCI_STUB is not set |
| 340 | # CONFIG_PCI_IOV is not set | 335 | # CONFIG_PCI_IOV is not set |
| 341 | # CONFIG_PCCARD is not set | 336 | # CONFIG_PCCARD is not set |
| @@ -361,7 +356,6 @@ CONFIG_NET=y | |||
| 361 | # Networking options | 356 | # Networking options |
| 362 | # | 357 | # |
| 363 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
| 364 | # CONFIG_PACKET_MMAP is not set | ||
| 365 | CONFIG_UNIX=y | 359 | CONFIG_UNIX=y |
| 366 | CONFIG_XFRM=y | 360 | CONFIG_XFRM=y |
| 367 | # CONFIG_XFRM_USER is not set | 361 | # CONFIG_XFRM_USER is not set |
| @@ -540,6 +534,8 @@ CONFIG_MTD_PHYSMAP=y | |||
| 540 | # UBI - Unsorted block images | 534 | # UBI - Unsorted block images |
| 541 | # | 535 | # |
| 542 | # CONFIG_MTD_UBI is not set | 536 | # CONFIG_MTD_UBI is not set |
| 537 | CONFIG_OF_FLATTREE=y | ||
| 538 | CONFIG_OF_DYNAMIC=y | ||
| 543 | CONFIG_OF_DEVICE=y | 539 | CONFIG_OF_DEVICE=y |
| 544 | CONFIG_OF_I2C=y | 540 | CONFIG_OF_I2C=y |
| 545 | CONFIG_OF_SPI=y | 541 | CONFIG_OF_SPI=y |
| @@ -577,6 +573,7 @@ CONFIG_MISC_DEVICES=y | |||
| 577 | # CONFIG_ENCLOSURE_SERVICES is not set | 573 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 578 | # CONFIG_HP_ILO is not set | 574 | # CONFIG_HP_ILO is not set |
| 579 | # CONFIG_ISL29003 is not set | 575 | # CONFIG_ISL29003 is not set |
| 576 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 580 | # CONFIG_DS1682 is not set | 577 | # CONFIG_DS1682 is not set |
| 581 | # CONFIG_TI_DAC7512 is not set | 578 | # CONFIG_TI_DAC7512 is not set |
| 582 | # CONFIG_C2PORT is not set | 579 | # CONFIG_C2PORT is not set |
| @@ -644,6 +641,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 644 | # | 641 | # |
| 645 | # SCSI device support | 642 | # SCSI device support |
| 646 | # | 643 | # |
| 644 | CONFIG_SCSI_MOD=y | ||
| 647 | # CONFIG_RAID_ATTRS is not set | 645 | # CONFIG_RAID_ATTRS is not set |
| 648 | CONFIG_SCSI=y | 646 | CONFIG_SCSI=y |
| 649 | CONFIG_SCSI_DMA=y | 647 | CONFIG_SCSI_DMA=y |
| @@ -767,6 +765,7 @@ CONFIG_SATA_SIL=y | |||
| 767 | # CONFIG_PATA_IT821X is not set | 765 | # CONFIG_PATA_IT821X is not set |
| 768 | # CONFIG_PATA_IT8213 is not set | 766 | # CONFIG_PATA_IT8213 is not set |
| 769 | # CONFIG_PATA_JMICRON is not set | 767 | # CONFIG_PATA_JMICRON is not set |
| 768 | # CONFIG_PATA_LEGACY is not set | ||
| 770 | # CONFIG_PATA_TRIFLEX is not set | 769 | # CONFIG_PATA_TRIFLEX is not set |
| 771 | # CONFIG_PATA_MARVELL is not set | 770 | # CONFIG_PATA_MARVELL is not set |
| 772 | # CONFIG_PATA_MPIIX is not set | 771 | # CONFIG_PATA_MPIIX is not set |
| @@ -880,6 +879,8 @@ CONFIG_NETDEV_10000=y | |||
| 880 | # CONFIG_CHELSIO_T1 is not set | 879 | # CONFIG_CHELSIO_T1 is not set |
| 881 | CONFIG_CHELSIO_T3_DEPENDS=y | 880 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 882 | # CONFIG_CHELSIO_T3 is not set | 881 | # CONFIG_CHELSIO_T3 is not set |
| 882 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 883 | # CONFIG_CHELSIO_T4 is not set | ||
| 883 | # CONFIG_ENIC is not set | 884 | # CONFIG_ENIC is not set |
| 884 | # CONFIG_IXGBE is not set | 885 | # CONFIG_IXGBE is not set |
| 885 | # CONFIG_IXGB is not set | 886 | # CONFIG_IXGB is not set |
| @@ -892,6 +893,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 892 | # CONFIG_MLX4_CORE is not set | 893 | # CONFIG_MLX4_CORE is not set |
| 893 | # CONFIG_TEHUTI is not set | 894 | # CONFIG_TEHUTI is not set |
| 894 | # CONFIG_BNX2X is not set | 895 | # CONFIG_BNX2X is not set |
| 896 | # CONFIG_QLCNIC is not set | ||
| 895 | # CONFIG_QLGE is not set | 897 | # CONFIG_QLGE is not set |
| 896 | # CONFIG_SFC is not set | 898 | # CONFIG_SFC is not set |
| 897 | # CONFIG_BE2NET is not set | 899 | # CONFIG_BE2NET is not set |
| @@ -966,6 +968,7 @@ CONFIG_SERIAL_CORE=y | |||
| 966 | CONFIG_SERIAL_CORE_CONSOLE=y | 968 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 967 | # CONFIG_SERIAL_JSM is not set | 969 | # CONFIG_SERIAL_JSM is not set |
| 968 | # CONFIG_SERIAL_OF_PLATFORM is not set | 970 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 971 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 969 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 972 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 970 | CONFIG_UNIX98_PTYS=y | 973 | CONFIG_UNIX98_PTYS=y |
| 971 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 974 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1015,6 +1018,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1015 | CONFIG_I2C_MPC=y | 1018 | CONFIG_I2C_MPC=y |
| 1016 | # CONFIG_I2C_OCORES is not set | 1019 | # CONFIG_I2C_OCORES is not set |
| 1017 | # CONFIG_I2C_SIMTEC is not set | 1020 | # CONFIG_I2C_SIMTEC is not set |
| 1021 | # CONFIG_I2C_XILINX is not set | ||
| 1018 | 1022 | ||
| 1019 | # | 1023 | # |
| 1020 | # External I2C/SMBus adapter drivers | 1024 | # External I2C/SMBus adapter drivers |
| @@ -1028,15 +1032,9 @@ CONFIG_I2C_MPC=y | |||
| 1028 | # | 1032 | # |
| 1029 | # CONFIG_I2C_PCA_PLATFORM is not set | 1033 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1030 | # CONFIG_I2C_STUB is not set | 1034 | # CONFIG_I2C_STUB is not set |
| 1031 | |||
| 1032 | # | ||
| 1033 | # Miscellaneous I2C Chip support | ||
| 1034 | # | ||
| 1035 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1036 | # CONFIG_I2C_DEBUG_CORE is not set | 1035 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1037 | # CONFIG_I2C_DEBUG_ALGO is not set | 1036 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1038 | # CONFIG_I2C_DEBUG_BUS is not set | 1037 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1039 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1040 | CONFIG_SPI=y | 1038 | CONFIG_SPI=y |
| 1041 | CONFIG_SPI_MASTER=y | 1039 | CONFIG_SPI_MASTER=y |
| 1042 | 1040 | ||
| @@ -1095,21 +1093,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1095 | # Multifunction device drivers | 1093 | # Multifunction device drivers |
| 1096 | # | 1094 | # |
| 1097 | # CONFIG_MFD_CORE is not set | 1095 | # CONFIG_MFD_CORE is not set |
| 1096 | # CONFIG_MFD_88PM860X is not set | ||
| 1098 | # CONFIG_MFD_SM501 is not set | 1097 | # CONFIG_MFD_SM501 is not set |
| 1099 | # CONFIG_HTC_PASIC3 is not set | 1098 | # CONFIG_HTC_PASIC3 is not set |
| 1100 | # CONFIG_TWL4030_CORE is not set | 1099 | # CONFIG_TWL4030_CORE is not set |
| 1101 | # CONFIG_MFD_TMIO is not set | 1100 | # CONFIG_MFD_TMIO is not set |
| 1102 | # CONFIG_PMIC_DA903X is not set | 1101 | # CONFIG_PMIC_DA903X is not set |
| 1103 | # CONFIG_PMIC_ADP5520 is not set | 1102 | # CONFIG_PMIC_ADP5520 is not set |
| 1103 | # CONFIG_MFD_MAX8925 is not set | ||
| 1104 | # CONFIG_MFD_WM8400 is not set | 1104 | # CONFIG_MFD_WM8400 is not set |
| 1105 | # CONFIG_MFD_WM831X is not set | 1105 | # CONFIG_MFD_WM831X is not set |
| 1106 | # CONFIG_MFD_WM8350_I2C is not set | 1106 | # CONFIG_MFD_WM8350_I2C is not set |
| 1107 | # CONFIG_MFD_WM8994 is not set | ||
| 1107 | # CONFIG_MFD_PCF50633 is not set | 1108 | # CONFIG_MFD_PCF50633 is not set |
| 1108 | # CONFIG_MFD_MC13783 is not set | 1109 | # CONFIG_MFD_MC13783 is not set |
| 1109 | # CONFIG_AB3100_CORE is not set | 1110 | # CONFIG_AB3100_CORE is not set |
| 1110 | # CONFIG_EZX_PCAP is not set | 1111 | # CONFIG_EZX_PCAP is not set |
| 1111 | # CONFIG_MFD_88PM8607 is not set | ||
| 1112 | # CONFIG_AB4500_CORE is not set | 1112 | # CONFIG_AB4500_CORE is not set |
| 1113 | # CONFIG_LPC_SCH is not set | ||
| 1113 | # CONFIG_REGULATOR is not set | 1114 | # CONFIG_REGULATOR is not set |
| 1114 | # CONFIG_MEDIA_SUPPORT is not set | 1115 | # CONFIG_MEDIA_SUPPORT is not set |
| 1115 | 1116 | ||
| @@ -1118,6 +1119,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1118 | # | 1119 | # |
| 1119 | # CONFIG_AGP is not set | 1120 | # CONFIG_AGP is not set |
| 1120 | CONFIG_VGA_ARB=y | 1121 | CONFIG_VGA_ARB=y |
| 1122 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1121 | # CONFIG_DRM is not set | 1123 | # CONFIG_DRM is not set |
| 1122 | # CONFIG_VGASTATE is not set | 1124 | # CONFIG_VGASTATE is not set |
| 1123 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1125 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1222,7 +1224,6 @@ CONFIG_USB_STORAGE=y | |||
| 1222 | # CONFIG_USB_RIO500 is not set | 1224 | # CONFIG_USB_RIO500 is not set |
| 1223 | # CONFIG_USB_LEGOTOWER is not set | 1225 | # CONFIG_USB_LEGOTOWER is not set |
| 1224 | # CONFIG_USB_LCD is not set | 1226 | # CONFIG_USB_LCD is not set |
| 1225 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1226 | # CONFIG_USB_LED is not set | 1227 | # CONFIG_USB_LED is not set |
| 1227 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1228 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1228 | # CONFIG_USB_CYTHERM is not set | 1229 | # CONFIG_USB_CYTHERM is not set |
| @@ -1235,7 +1236,6 @@ CONFIG_USB_STORAGE=y | |||
| 1235 | # CONFIG_USB_IOWARRIOR is not set | 1236 | # CONFIG_USB_IOWARRIOR is not set |
| 1236 | # CONFIG_USB_TEST is not set | 1237 | # CONFIG_USB_TEST is not set |
| 1237 | # CONFIG_USB_ISIGHTFW is not set | 1238 | # CONFIG_USB_ISIGHTFW is not set |
| 1238 | # CONFIG_USB_VST is not set | ||
| 1239 | # CONFIG_USB_GADGET is not set | 1239 | # CONFIG_USB_GADGET is not set |
| 1240 | 1240 | ||
| 1241 | # | 1241 | # |
| @@ -1399,6 +1399,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1399 | # CONFIG_BFS_FS is not set | 1399 | # CONFIG_BFS_FS is not set |
| 1400 | # CONFIG_EFS_FS is not set | 1400 | # CONFIG_EFS_FS is not set |
| 1401 | # CONFIG_JFFS2_FS is not set | 1401 | # CONFIG_JFFS2_FS is not set |
| 1402 | # CONFIG_LOGFS is not set | ||
| 1402 | # CONFIG_CRAMFS is not set | 1403 | # CONFIG_CRAMFS is not set |
| 1403 | # CONFIG_SQUASHFS is not set | 1404 | # CONFIG_SQUASHFS is not set |
| 1404 | # CONFIG_VXFS_FS is not set | 1405 | # CONFIG_VXFS_FS is not set |
| @@ -1425,6 +1426,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1425 | CONFIG_RPCSEC_GSS_KRB5=y | 1426 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1426 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1427 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1427 | # CONFIG_SMB_FS is not set | 1428 | # CONFIG_SMB_FS is not set |
| 1429 | # CONFIG_CEPH_FS is not set | ||
| 1428 | # CONFIG_CIFS is not set | 1430 | # CONFIG_CIFS is not set |
| 1429 | # CONFIG_NCP_FS is not set | 1431 | # CONFIG_NCP_FS is not set |
| 1430 | # CONFIG_CODA_FS is not set | 1432 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index 28d8ff3e8fca..41401a9b355e 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:20 2010 | 4 | # Mon Apr 19 23:16:44 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_STUB is not set | 334 | # CONFIG_PCI_STUB is not set |
| 340 | # CONFIG_PCI_IOV is not set | 335 | # CONFIG_PCI_IOV is not set |
| 341 | # CONFIG_PCCARD is not set | 336 | # CONFIG_PCCARD is not set |
| @@ -361,7 +356,6 @@ CONFIG_NET=y | |||
| 361 | # Networking options | 356 | # Networking options |
| 362 | # | 357 | # |
| 363 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
| 364 | # CONFIG_PACKET_MMAP is not set | ||
| 365 | CONFIG_UNIX=y | 359 | CONFIG_UNIX=y |
| 366 | CONFIG_XFRM=y | 360 | CONFIG_XFRM=y |
| 367 | # CONFIG_XFRM_USER is not set | 361 | # CONFIG_XFRM_USER is not set |
| @@ -540,6 +534,8 @@ CONFIG_MTD_PHYSMAP=y | |||
| 540 | # UBI - Unsorted block images | 534 | # UBI - Unsorted block images |
| 541 | # | 535 | # |
| 542 | # CONFIG_MTD_UBI is not set | 536 | # CONFIG_MTD_UBI is not set |
| 537 | CONFIG_OF_FLATTREE=y | ||
| 538 | CONFIG_OF_DYNAMIC=y | ||
| 543 | CONFIG_OF_DEVICE=y | 539 | CONFIG_OF_DEVICE=y |
| 544 | CONFIG_OF_I2C=y | 540 | CONFIG_OF_I2C=y |
| 545 | CONFIG_OF_SPI=y | 541 | CONFIG_OF_SPI=y |
| @@ -577,6 +573,7 @@ CONFIG_MISC_DEVICES=y | |||
| 577 | # CONFIG_ENCLOSURE_SERVICES is not set | 573 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 578 | # CONFIG_HP_ILO is not set | 574 | # CONFIG_HP_ILO is not set |
| 579 | # CONFIG_ISL29003 is not set | 575 | # CONFIG_ISL29003 is not set |
| 576 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 580 | # CONFIG_DS1682 is not set | 577 | # CONFIG_DS1682 is not set |
| 581 | # CONFIG_TI_DAC7512 is not set | 578 | # CONFIG_TI_DAC7512 is not set |
| 582 | # CONFIG_C2PORT is not set | 579 | # CONFIG_C2PORT is not set |
| @@ -596,6 +593,7 @@ CONFIG_HAVE_IDE=y | |||
| 596 | # | 593 | # |
| 597 | # SCSI device support | 594 | # SCSI device support |
| 598 | # | 595 | # |
| 596 | CONFIG_SCSI_MOD=y | ||
| 599 | # CONFIG_RAID_ATTRS is not set | 597 | # CONFIG_RAID_ATTRS is not set |
| 600 | CONFIG_SCSI=y | 598 | CONFIG_SCSI=y |
| 601 | CONFIG_SCSI_DMA=y | 599 | CONFIG_SCSI_DMA=y |
| @@ -756,6 +754,8 @@ CONFIG_NETDEV_10000=y | |||
| 756 | # CONFIG_CHELSIO_T1 is not set | 754 | # CONFIG_CHELSIO_T1 is not set |
| 757 | CONFIG_CHELSIO_T3_DEPENDS=y | 755 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 758 | # CONFIG_CHELSIO_T3 is not set | 756 | # CONFIG_CHELSIO_T3 is not set |
| 757 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 758 | # CONFIG_CHELSIO_T4 is not set | ||
| 759 | # CONFIG_ENIC is not set | 759 | # CONFIG_ENIC is not set |
| 760 | # CONFIG_IXGBE is not set | 760 | # CONFIG_IXGBE is not set |
| 761 | # CONFIG_IXGB is not set | 761 | # CONFIG_IXGB is not set |
| @@ -768,6 +768,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 768 | # CONFIG_MLX4_CORE is not set | 768 | # CONFIG_MLX4_CORE is not set |
| 769 | # CONFIG_TEHUTI is not set | 769 | # CONFIG_TEHUTI is not set |
| 770 | # CONFIG_BNX2X is not set | 770 | # CONFIG_BNX2X is not set |
| 771 | # CONFIG_QLCNIC is not set | ||
| 771 | # CONFIG_QLGE is not set | 772 | # CONFIG_QLGE is not set |
| 772 | # CONFIG_SFC is not set | 773 | # CONFIG_SFC is not set |
| 773 | # CONFIG_BE2NET is not set | 774 | # CONFIG_BE2NET is not set |
| @@ -842,6 +843,7 @@ CONFIG_SERIAL_CORE=y | |||
| 842 | CONFIG_SERIAL_CORE_CONSOLE=y | 843 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 843 | # CONFIG_SERIAL_JSM is not set | 844 | # CONFIG_SERIAL_JSM is not set |
| 844 | # CONFIG_SERIAL_OF_PLATFORM is not set | 845 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 846 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 845 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 847 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 846 | CONFIG_UNIX98_PTYS=y | 848 | CONFIG_UNIX98_PTYS=y |
| 847 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 849 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -891,6 +893,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 891 | CONFIG_I2C_MPC=y | 893 | CONFIG_I2C_MPC=y |
| 892 | # CONFIG_I2C_OCORES is not set | 894 | # CONFIG_I2C_OCORES is not set |
| 893 | # CONFIG_I2C_SIMTEC is not set | 895 | # CONFIG_I2C_SIMTEC is not set |
| 896 | # CONFIG_I2C_XILINX is not set | ||
| 894 | 897 | ||
| 895 | # | 898 | # |
| 896 | # External I2C/SMBus adapter drivers | 899 | # External I2C/SMBus adapter drivers |
| @@ -904,15 +907,9 @@ CONFIG_I2C_MPC=y | |||
| 904 | # | 907 | # |
| 905 | # CONFIG_I2C_PCA_PLATFORM is not set | 908 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 906 | # CONFIG_I2C_STUB is not set | 909 | # CONFIG_I2C_STUB is not set |
| 907 | |||
| 908 | # | ||
| 909 | # Miscellaneous I2C Chip support | ||
| 910 | # | ||
| 911 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 912 | # CONFIG_I2C_DEBUG_CORE is not set | 910 | # CONFIG_I2C_DEBUG_CORE is not set |
| 913 | # CONFIG_I2C_DEBUG_ALGO is not set | 911 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 914 | # CONFIG_I2C_DEBUG_BUS is not set | 912 | # CONFIG_I2C_DEBUG_BUS is not set |
| 915 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 916 | CONFIG_SPI=y | 913 | CONFIG_SPI=y |
| 917 | CONFIG_SPI_MASTER=y | 914 | CONFIG_SPI_MASTER=y |
| 918 | 915 | ||
| @@ -971,21 +968,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 971 | # Multifunction device drivers | 968 | # Multifunction device drivers |
| 972 | # | 969 | # |
| 973 | # CONFIG_MFD_CORE is not set | 970 | # CONFIG_MFD_CORE is not set |
| 971 | # CONFIG_MFD_88PM860X is not set | ||
| 974 | # CONFIG_MFD_SM501 is not set | 972 | # CONFIG_MFD_SM501 is not set |
| 975 | # CONFIG_HTC_PASIC3 is not set | 973 | # CONFIG_HTC_PASIC3 is not set |
| 976 | # CONFIG_TWL4030_CORE is not set | 974 | # CONFIG_TWL4030_CORE is not set |
| 977 | # CONFIG_MFD_TMIO is not set | 975 | # CONFIG_MFD_TMIO is not set |
| 978 | # CONFIG_PMIC_DA903X is not set | 976 | # CONFIG_PMIC_DA903X is not set |
| 979 | # CONFIG_PMIC_ADP5520 is not set | 977 | # CONFIG_PMIC_ADP5520 is not set |
| 978 | # CONFIG_MFD_MAX8925 is not set | ||
| 980 | # CONFIG_MFD_WM8400 is not set | 979 | # CONFIG_MFD_WM8400 is not set |
| 981 | # CONFIG_MFD_WM831X is not set | 980 | # CONFIG_MFD_WM831X is not set |
| 982 | # CONFIG_MFD_WM8350_I2C is not set | 981 | # CONFIG_MFD_WM8350_I2C is not set |
| 982 | # CONFIG_MFD_WM8994 is not set | ||
| 983 | # CONFIG_MFD_PCF50633 is not set | 983 | # CONFIG_MFD_PCF50633 is not set |
| 984 | # CONFIG_MFD_MC13783 is not set | 984 | # CONFIG_MFD_MC13783 is not set |
| 985 | # CONFIG_AB3100_CORE is not set | 985 | # CONFIG_AB3100_CORE is not set |
| 986 | # CONFIG_EZX_PCAP is not set | 986 | # CONFIG_EZX_PCAP is not set |
| 987 | # CONFIG_MFD_88PM8607 is not set | ||
| 988 | # CONFIG_AB4500_CORE is not set | 987 | # CONFIG_AB4500_CORE is not set |
| 988 | # CONFIG_LPC_SCH is not set | ||
| 989 | # CONFIG_REGULATOR is not set | 989 | # CONFIG_REGULATOR is not set |
| 990 | # CONFIG_MEDIA_SUPPORT is not set | 990 | # CONFIG_MEDIA_SUPPORT is not set |
| 991 | 991 | ||
| @@ -994,6 +994,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 994 | # | 994 | # |
| 995 | # CONFIG_AGP is not set | 995 | # CONFIG_AGP is not set |
| 996 | CONFIG_VGA_ARB=y | 996 | CONFIG_VGA_ARB=y |
| 997 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 997 | # CONFIG_DRM is not set | 998 | # CONFIG_DRM is not set |
| 998 | # CONFIG_VGASTATE is not set | 999 | # CONFIG_VGASTATE is not set |
| 999 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1000 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1098,7 +1099,6 @@ CONFIG_USB_STORAGE=y | |||
| 1098 | # CONFIG_USB_RIO500 is not set | 1099 | # CONFIG_USB_RIO500 is not set |
| 1099 | # CONFIG_USB_LEGOTOWER is not set | 1100 | # CONFIG_USB_LEGOTOWER is not set |
| 1100 | # CONFIG_USB_LCD is not set | 1101 | # CONFIG_USB_LCD is not set |
| 1101 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1102 | # CONFIG_USB_LED is not set | 1102 | # CONFIG_USB_LED is not set |
| 1103 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1103 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1104 | # CONFIG_USB_CYTHERM is not set | 1104 | # CONFIG_USB_CYTHERM is not set |
| @@ -1111,7 +1111,6 @@ CONFIG_USB_STORAGE=y | |||
| 1111 | # CONFIG_USB_IOWARRIOR is not set | 1111 | # CONFIG_USB_IOWARRIOR is not set |
| 1112 | # CONFIG_USB_TEST is not set | 1112 | # CONFIG_USB_TEST is not set |
| 1113 | # CONFIG_USB_ISIGHTFW is not set | 1113 | # CONFIG_USB_ISIGHTFW is not set |
| 1114 | # CONFIG_USB_VST is not set | ||
| 1115 | # CONFIG_USB_GADGET is not set | 1114 | # CONFIG_USB_GADGET is not set |
| 1116 | 1115 | ||
| 1117 | # | 1116 | # |
| @@ -1275,6 +1274,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1275 | # CONFIG_BFS_FS is not set | 1274 | # CONFIG_BFS_FS is not set |
| 1276 | # CONFIG_EFS_FS is not set | 1275 | # CONFIG_EFS_FS is not set |
| 1277 | # CONFIG_JFFS2_FS is not set | 1276 | # CONFIG_JFFS2_FS is not set |
| 1277 | # CONFIG_LOGFS is not set | ||
| 1278 | # CONFIG_CRAMFS is not set | 1278 | # CONFIG_CRAMFS is not set |
| 1279 | # CONFIG_SQUASHFS is not set | 1279 | # CONFIG_SQUASHFS is not set |
| 1280 | # CONFIG_VXFS_FS is not set | 1280 | # CONFIG_VXFS_FS is not set |
| @@ -1301,6 +1301,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1301 | CONFIG_RPCSEC_GSS_KRB5=y | 1301 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1302 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1302 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1303 | # CONFIG_SMB_FS is not set | 1303 | # CONFIG_SMB_FS is not set |
| 1304 | # CONFIG_CEPH_FS is not set | ||
| 1304 | # CONFIG_CIFS is not set | 1305 | # CONFIG_CIFS is not set |
| 1305 | # CONFIG_NCP_FS is not set | 1306 | # CONFIG_NCP_FS is not set |
| 1306 | # CONFIG_CODA_FS is not set | 1307 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index 6252ab5bf181..dc176b676dce 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:21 2010 | 4 | # Mon Apr 19 23:16:45 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_STUB is not set | 334 | # CONFIG_PCI_STUB is not set |
| 340 | # CONFIG_PCI_IOV is not set | 335 | # CONFIG_PCI_IOV is not set |
| 341 | # CONFIG_PCCARD is not set | 336 | # CONFIG_PCCARD is not set |
| @@ -361,7 +356,6 @@ CONFIG_NET=y | |||
| 361 | # Networking options | 356 | # Networking options |
| 362 | # | 357 | # |
| 363 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
| 364 | # CONFIG_PACKET_MMAP is not set | ||
| 365 | CONFIG_UNIX=y | 359 | CONFIG_UNIX=y |
| 366 | CONFIG_XFRM=y | 360 | CONFIG_XFRM=y |
| 367 | CONFIG_XFRM_USER=m | 361 | CONFIG_XFRM_USER=m |
| @@ -456,6 +450,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 456 | # CONFIG_SYS_HYPERVISOR is not set | 450 | # CONFIG_SYS_HYPERVISOR is not set |
| 457 | # CONFIG_CONNECTOR is not set | 451 | # CONFIG_CONNECTOR is not set |
| 458 | # CONFIG_MTD is not set | 452 | # CONFIG_MTD is not set |
| 453 | CONFIG_OF_FLATTREE=y | ||
| 454 | CONFIG_OF_DYNAMIC=y | ||
| 459 | CONFIG_OF_DEVICE=y | 455 | CONFIG_OF_DEVICE=y |
| 460 | CONFIG_OF_I2C=y | 456 | CONFIG_OF_I2C=y |
| 461 | CONFIG_OF_MDIO=y | 457 | CONFIG_OF_MDIO=y |
| @@ -491,6 +487,7 @@ CONFIG_MISC_DEVICES=y | |||
| 491 | # CONFIG_ENCLOSURE_SERVICES is not set | 487 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 492 | # CONFIG_HP_ILO is not set | 488 | # CONFIG_HP_ILO is not set |
| 493 | # CONFIG_ISL29003 is not set | 489 | # CONFIG_ISL29003 is not set |
| 490 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 494 | # CONFIG_DS1682 is not set | 491 | # CONFIG_DS1682 is not set |
| 495 | # CONFIG_C2PORT is not set | 492 | # CONFIG_C2PORT is not set |
| 496 | 493 | ||
| @@ -508,6 +505,7 @@ CONFIG_HAVE_IDE=y | |||
| 508 | # | 505 | # |
| 509 | # SCSI device support | 506 | # SCSI device support |
| 510 | # | 507 | # |
| 508 | CONFIG_SCSI_MOD=y | ||
| 511 | # CONFIG_RAID_ATTRS is not set | 509 | # CONFIG_RAID_ATTRS is not set |
| 512 | # CONFIG_SCSI is not set | 510 | # CONFIG_SCSI is not set |
| 513 | # CONFIG_SCSI_DMA is not set | 511 | # CONFIG_SCSI_DMA is not set |
| @@ -580,6 +578,7 @@ CONFIG_NET_PCI=y | |||
| 580 | # CONFIG_PCNET32 is not set | 578 | # CONFIG_PCNET32 is not set |
| 581 | # CONFIG_AMD8111_ETH is not set | 579 | # CONFIG_AMD8111_ETH is not set |
| 582 | # CONFIG_ADAPTEC_STARFIRE is not set | 580 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 581 | # CONFIG_KSZ884X_PCI is not set | ||
| 583 | # CONFIG_B44 is not set | 582 | # CONFIG_B44 is not set |
| 584 | # CONFIG_FORCEDETH is not set | 583 | # CONFIG_FORCEDETH is not set |
| 585 | CONFIG_E100=y | 584 | CONFIG_E100=y |
| @@ -631,6 +630,8 @@ CONFIG_NETDEV_10000=y | |||
| 631 | # CONFIG_CHELSIO_T1 is not set | 630 | # CONFIG_CHELSIO_T1 is not set |
| 632 | CONFIG_CHELSIO_T3_DEPENDS=y | 631 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 633 | # CONFIG_CHELSIO_T3 is not set | 632 | # CONFIG_CHELSIO_T3 is not set |
| 633 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 634 | # CONFIG_CHELSIO_T4 is not set | ||
| 634 | # CONFIG_ENIC is not set | 635 | # CONFIG_ENIC is not set |
| 635 | # CONFIG_IXGBE is not set | 636 | # CONFIG_IXGBE is not set |
| 636 | # CONFIG_IXGB is not set | 637 | # CONFIG_IXGB is not set |
| @@ -643,6 +644,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 643 | # CONFIG_MLX4_CORE is not set | 644 | # CONFIG_MLX4_CORE is not set |
| 644 | # CONFIG_TEHUTI is not set | 645 | # CONFIG_TEHUTI is not set |
| 645 | # CONFIG_BNX2X is not set | 646 | # CONFIG_BNX2X is not set |
| 647 | # CONFIG_QLCNIC is not set | ||
| 646 | # CONFIG_QLGE is not set | 648 | # CONFIG_QLGE is not set |
| 647 | # CONFIG_SFC is not set | 649 | # CONFIG_SFC is not set |
| 648 | # CONFIG_BE2NET is not set | 650 | # CONFIG_BE2NET is not set |
| @@ -726,6 +728,7 @@ CONFIG_SERIAL_CORE=y | |||
| 726 | CONFIG_SERIAL_CORE_CONSOLE=y | 728 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 727 | # CONFIG_SERIAL_JSM is not set | 729 | # CONFIG_SERIAL_JSM is not set |
| 728 | # CONFIG_SERIAL_OF_PLATFORM is not set | 730 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 731 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 729 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 732 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 730 | CONFIG_UNIX98_PTYS=y | 733 | CONFIG_UNIX98_PTYS=y |
| 731 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 734 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -774,6 +777,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 774 | CONFIG_I2C_MPC=y | 777 | CONFIG_I2C_MPC=y |
| 775 | # CONFIG_I2C_OCORES is not set | 778 | # CONFIG_I2C_OCORES is not set |
| 776 | # CONFIG_I2C_SIMTEC is not set | 779 | # CONFIG_I2C_SIMTEC is not set |
| 780 | # CONFIG_I2C_XILINX is not set | ||
| 777 | 781 | ||
| 778 | # | 782 | # |
| 779 | # External I2C/SMBus adapter drivers | 783 | # External I2C/SMBus adapter drivers |
| @@ -786,15 +790,9 @@ CONFIG_I2C_MPC=y | |||
| 786 | # | 790 | # |
| 787 | # CONFIG_I2C_PCA_PLATFORM is not set | 791 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 788 | # CONFIG_I2C_STUB is not set | 792 | # CONFIG_I2C_STUB is not set |
| 789 | |||
| 790 | # | ||
| 791 | # Miscellaneous I2C Chip support | ||
| 792 | # | ||
| 793 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 794 | # CONFIG_I2C_DEBUG_CORE is not set | 793 | # CONFIG_I2C_DEBUG_CORE is not set |
| 795 | # CONFIG_I2C_DEBUG_ALGO is not set | 794 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 796 | # CONFIG_I2C_DEBUG_BUS is not set | 795 | # CONFIG_I2C_DEBUG_BUS is not set |
| 797 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 798 | # CONFIG_SPI is not set | 796 | # CONFIG_SPI is not set |
| 799 | 797 | ||
| 800 | # | 798 | # |
| @@ -820,10 +818,11 @@ CONFIG_HWMON=y | |||
| 820 | # CONFIG_SENSORS_ADM1029 is not set | 818 | # CONFIG_SENSORS_ADM1029 is not set |
| 821 | # CONFIG_SENSORS_ADM1031 is not set | 819 | # CONFIG_SENSORS_ADM1031 is not set |
| 822 | # CONFIG_SENSORS_ADM9240 is not set | 820 | # CONFIG_SENSORS_ADM9240 is not set |
| 821 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 823 | # CONFIG_SENSORS_ADT7462 is not set | 822 | # CONFIG_SENSORS_ADT7462 is not set |
| 824 | # CONFIG_SENSORS_ADT7470 is not set | 823 | # CONFIG_SENSORS_ADT7470 is not set |
| 825 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 826 | # CONFIG_SENSORS_ADT7475 is not set | 824 | # CONFIG_SENSORS_ADT7475 is not set |
| 825 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 827 | # CONFIG_SENSORS_ATXP1 is not set | 826 | # CONFIG_SENSORS_ATXP1 is not set |
| 828 | # CONFIG_SENSORS_DS1621 is not set | 827 | # CONFIG_SENSORS_DS1621 is not set |
| 829 | # CONFIG_SENSORS_I5K_AMB is not set | 828 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -860,6 +859,7 @@ CONFIG_HWMON=y | |||
| 860 | # CONFIG_SENSORS_SMSC47M192 is not set | 859 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 861 | # CONFIG_SENSORS_SMSC47B397 is not set | 860 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 862 | # CONFIG_SENSORS_ADS7828 is not set | 861 | # CONFIG_SENSORS_ADS7828 is not set |
| 862 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 863 | # CONFIG_SENSORS_THMC50 is not set | 863 | # CONFIG_SENSORS_THMC50 is not set |
| 864 | # CONFIG_SENSORS_TMP401 is not set | 864 | # CONFIG_SENSORS_TMP401 is not set |
| 865 | # CONFIG_SENSORS_TMP421 is not set | 865 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -902,18 +902,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 902 | # Multifunction device drivers | 902 | # Multifunction device drivers |
| 903 | # | 903 | # |
| 904 | # CONFIG_MFD_CORE is not set | 904 | # CONFIG_MFD_CORE is not set |
| 905 | # CONFIG_MFD_88PM860X is not set | ||
| 905 | # CONFIG_MFD_SM501 is not set | 906 | # CONFIG_MFD_SM501 is not set |
| 906 | # CONFIG_HTC_PASIC3 is not set | 907 | # CONFIG_HTC_PASIC3 is not set |
| 907 | # CONFIG_TWL4030_CORE is not set | 908 | # CONFIG_TWL4030_CORE is not set |
| 908 | # CONFIG_MFD_TMIO is not set | 909 | # CONFIG_MFD_TMIO is not set |
| 909 | # CONFIG_PMIC_DA903X is not set | 910 | # CONFIG_PMIC_DA903X is not set |
| 910 | # CONFIG_PMIC_ADP5520 is not set | 911 | # CONFIG_PMIC_ADP5520 is not set |
| 912 | # CONFIG_MFD_MAX8925 is not set | ||
| 911 | # CONFIG_MFD_WM8400 is not set | 913 | # CONFIG_MFD_WM8400 is not set |
| 912 | # CONFIG_MFD_WM831X is not set | 914 | # CONFIG_MFD_WM831X is not set |
| 913 | # CONFIG_MFD_WM8350_I2C is not set | 915 | # CONFIG_MFD_WM8350_I2C is not set |
| 916 | # CONFIG_MFD_WM8994 is not set | ||
| 914 | # CONFIG_MFD_PCF50633 is not set | 917 | # CONFIG_MFD_PCF50633 is not set |
| 915 | # CONFIG_AB3100_CORE is not set | 918 | # CONFIG_AB3100_CORE is not set |
| 916 | # CONFIG_MFD_88PM8607 is not set | 919 | # CONFIG_LPC_SCH is not set |
| 917 | # CONFIG_REGULATOR is not set | 920 | # CONFIG_REGULATOR is not set |
| 918 | # CONFIG_MEDIA_SUPPORT is not set | 921 | # CONFIG_MEDIA_SUPPORT is not set |
| 919 | 922 | ||
| @@ -922,6 +925,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 922 | # | 925 | # |
| 923 | # CONFIG_AGP is not set | 926 | # CONFIG_AGP is not set |
| 924 | CONFIG_VGA_ARB=y | 927 | CONFIG_VGA_ARB=y |
| 928 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 925 | # CONFIG_DRM is not set | 929 | # CONFIG_DRM is not set |
| 926 | # CONFIG_VGASTATE is not set | 930 | # CONFIG_VGASTATE is not set |
| 927 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 931 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1106,6 +1110,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1106 | # CONFIG_BEFS_FS is not set | 1110 | # CONFIG_BEFS_FS is not set |
| 1107 | # CONFIG_BFS_FS is not set | 1111 | # CONFIG_BFS_FS is not set |
| 1108 | # CONFIG_EFS_FS is not set | 1112 | # CONFIG_EFS_FS is not set |
| 1113 | # CONFIG_LOGFS is not set | ||
| 1109 | # CONFIG_CRAMFS is not set | 1114 | # CONFIG_CRAMFS is not set |
| 1110 | # CONFIG_SQUASHFS is not set | 1115 | # CONFIG_SQUASHFS is not set |
| 1111 | # CONFIG_VXFS_FS is not set | 1116 | # CONFIG_VXFS_FS is not set |
| @@ -1132,6 +1137,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1132 | CONFIG_RPCSEC_GSS_KRB5=y | 1137 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1133 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1138 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1134 | # CONFIG_SMB_FS is not set | 1139 | # CONFIG_SMB_FS is not set |
| 1140 | # CONFIG_CEPH_FS is not set | ||
| 1135 | # CONFIG_CIFS is not set | 1141 | # CONFIG_CIFS is not set |
| 1136 | # CONFIG_NCP_FS is not set | 1142 | # CONFIG_NCP_FS is not set |
| 1137 | # CONFIG_CODA_FS is not set | 1143 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index 78227378e678..f512972c7176 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:21 2010 | 4 | # Mon Apr 19 23:16:46 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -323,6 +318,7 @@ CONFIG_ISA_DMA_API=y | |||
| 323 | # Bus options | 318 | # Bus options |
| 324 | # | 319 | # |
| 325 | CONFIG_ZONE_DMA=y | 320 | CONFIG_ZONE_DMA=y |
| 321 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 326 | CONFIG_GENERIC_ISA_DMA=y | 322 | CONFIG_GENERIC_ISA_DMA=y |
| 327 | CONFIG_PPC_INDIRECT_PCI=y | 323 | CONFIG_PPC_INDIRECT_PCI=y |
| 328 | CONFIG_FSL_SOC=y | 324 | CONFIG_FSL_SOC=y |
| @@ -334,7 +330,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 334 | # CONFIG_PCIEPORTBUS is not set | 330 | # CONFIG_PCIEPORTBUS is not set |
| 335 | CONFIG_ARCH_SUPPORTS_MSI=y | 331 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 336 | # CONFIG_PCI_MSI is not set | 332 | # CONFIG_PCI_MSI is not set |
| 337 | # CONFIG_PCI_LEGACY is not set | ||
| 338 | # CONFIG_PCI_STUB is not set | 333 | # CONFIG_PCI_STUB is not set |
| 339 | # CONFIG_PCI_IOV is not set | 334 | # CONFIG_PCI_IOV is not set |
| 340 | # CONFIG_PCCARD is not set | 335 | # CONFIG_PCCARD is not set |
| @@ -360,7 +355,6 @@ CONFIG_NET=y | |||
| 360 | # Networking options | 355 | # Networking options |
| 361 | # | 356 | # |
| 362 | CONFIG_PACKET=y | 357 | CONFIG_PACKET=y |
| 363 | # CONFIG_PACKET_MMAP is not set | ||
| 364 | CONFIG_UNIX=y | 358 | CONFIG_UNIX=y |
| 365 | CONFIG_XFRM=y | 359 | CONFIG_XFRM=y |
| 366 | # CONFIG_XFRM_USER is not set | 360 | # CONFIG_XFRM_USER is not set |
| @@ -538,6 +532,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 538 | # UBI - Unsorted block images | 532 | # UBI - Unsorted block images |
| 539 | # | 533 | # |
| 540 | # CONFIG_MTD_UBI is not set | 534 | # CONFIG_MTD_UBI is not set |
| 535 | CONFIG_OF_FLATTREE=y | ||
| 536 | CONFIG_OF_DYNAMIC=y | ||
| 541 | CONFIG_OF_DEVICE=y | 537 | CONFIG_OF_DEVICE=y |
| 542 | CONFIG_OF_I2C=y | 538 | CONFIG_OF_I2C=y |
| 543 | CONFIG_OF_MDIO=y | 539 | CONFIG_OF_MDIO=y |
| @@ -573,6 +569,7 @@ CONFIG_MISC_DEVICES=y | |||
| 573 | # CONFIG_ENCLOSURE_SERVICES is not set | 569 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 574 | # CONFIG_HP_ILO is not set | 570 | # CONFIG_HP_ILO is not set |
| 575 | # CONFIG_ISL29003 is not set | 571 | # CONFIG_ISL29003 is not set |
| 572 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 576 | # CONFIG_DS1682 is not set | 573 | # CONFIG_DS1682 is not set |
| 577 | # CONFIG_C2PORT is not set | 574 | # CONFIG_C2PORT is not set |
| 578 | 575 | ||
| @@ -590,6 +587,7 @@ CONFIG_HAVE_IDE=y | |||
| 590 | # | 587 | # |
| 591 | # SCSI device support | 588 | # SCSI device support |
| 592 | # | 589 | # |
| 590 | CONFIG_SCSI_MOD=y | ||
| 593 | # CONFIG_RAID_ATTRS is not set | 591 | # CONFIG_RAID_ATTRS is not set |
| 594 | CONFIG_SCSI=y | 592 | CONFIG_SCSI=y |
| 595 | CONFIG_SCSI_DMA=y | 593 | CONFIG_SCSI_DMA=y |
| @@ -774,6 +772,8 @@ CONFIG_NETDEV_10000=y | |||
| 774 | # CONFIG_CHELSIO_T1 is not set | 772 | # CONFIG_CHELSIO_T1 is not set |
| 775 | CONFIG_CHELSIO_T3_DEPENDS=y | 773 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 776 | # CONFIG_CHELSIO_T3 is not set | 774 | # CONFIG_CHELSIO_T3 is not set |
| 775 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 776 | # CONFIG_CHELSIO_T4 is not set | ||
| 777 | # CONFIG_ENIC is not set | 777 | # CONFIG_ENIC is not set |
| 778 | # CONFIG_IXGBE is not set | 778 | # CONFIG_IXGBE is not set |
| 779 | # CONFIG_IXGB is not set | 779 | # CONFIG_IXGB is not set |
| @@ -786,6 +786,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 786 | # CONFIG_MLX4_CORE is not set | 786 | # CONFIG_MLX4_CORE is not set |
| 787 | # CONFIG_TEHUTI is not set | 787 | # CONFIG_TEHUTI is not set |
| 788 | # CONFIG_BNX2X is not set | 788 | # CONFIG_BNX2X is not set |
| 789 | # CONFIG_QLCNIC is not set | ||
| 789 | # CONFIG_QLGE is not set | 790 | # CONFIG_QLGE is not set |
| 790 | # CONFIG_SFC is not set | 791 | # CONFIG_SFC is not set |
| 791 | # CONFIG_BE2NET is not set | 792 | # CONFIG_BE2NET is not set |
| @@ -871,6 +872,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 871 | # CONFIG_SERIAL_JSM is not set | 872 | # CONFIG_SERIAL_JSM is not set |
| 872 | # CONFIG_SERIAL_OF_PLATFORM is not set | 873 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 873 | # CONFIG_SERIAL_QE is not set | 874 | # CONFIG_SERIAL_QE is not set |
| 875 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 874 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 876 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 875 | CONFIG_UNIX98_PTYS=y | 877 | CONFIG_UNIX98_PTYS=y |
| 876 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 878 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -920,6 +922,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 920 | CONFIG_I2C_MPC=y | 922 | CONFIG_I2C_MPC=y |
| 921 | # CONFIG_I2C_OCORES is not set | 923 | # CONFIG_I2C_OCORES is not set |
| 922 | # CONFIG_I2C_SIMTEC is not set | 924 | # CONFIG_I2C_SIMTEC is not set |
| 925 | # CONFIG_I2C_XILINX is not set | ||
| 923 | 926 | ||
| 924 | # | 927 | # |
| 925 | # External I2C/SMBus adapter drivers | 928 | # External I2C/SMBus adapter drivers |
| @@ -932,15 +935,9 @@ CONFIG_I2C_MPC=y | |||
| 932 | # | 935 | # |
| 933 | # CONFIG_I2C_PCA_PLATFORM is not set | 936 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 934 | # CONFIG_I2C_STUB is not set | 937 | # CONFIG_I2C_STUB is not set |
| 935 | |||
| 936 | # | ||
| 937 | # Miscellaneous I2C Chip support | ||
| 938 | # | ||
| 939 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 940 | # CONFIG_I2C_DEBUG_CORE is not set | 938 | # CONFIG_I2C_DEBUG_CORE is not set |
| 941 | # CONFIG_I2C_DEBUG_ALGO is not set | 939 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 942 | # CONFIG_I2C_DEBUG_BUS is not set | 940 | # CONFIG_I2C_DEBUG_BUS is not set |
| 943 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 944 | # CONFIG_SPI is not set | 941 | # CONFIG_SPI is not set |
| 945 | 942 | ||
| 946 | # | 943 | # |
| @@ -966,10 +963,11 @@ CONFIG_HWMON=y | |||
| 966 | # CONFIG_SENSORS_ADM1029 is not set | 963 | # CONFIG_SENSORS_ADM1029 is not set |
| 967 | # CONFIG_SENSORS_ADM1031 is not set | 964 | # CONFIG_SENSORS_ADM1031 is not set |
| 968 | # CONFIG_SENSORS_ADM9240 is not set | 965 | # CONFIG_SENSORS_ADM9240 is not set |
| 966 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 969 | # CONFIG_SENSORS_ADT7462 is not set | 967 | # CONFIG_SENSORS_ADT7462 is not set |
| 970 | # CONFIG_SENSORS_ADT7470 is not set | 968 | # CONFIG_SENSORS_ADT7470 is not set |
| 971 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 972 | # CONFIG_SENSORS_ADT7475 is not set | 969 | # CONFIG_SENSORS_ADT7475 is not set |
| 970 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 973 | # CONFIG_SENSORS_ATXP1 is not set | 971 | # CONFIG_SENSORS_ATXP1 is not set |
| 974 | # CONFIG_SENSORS_DS1621 is not set | 972 | # CONFIG_SENSORS_DS1621 is not set |
| 975 | # CONFIG_SENSORS_I5K_AMB is not set | 973 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1006,6 +1004,7 @@ CONFIG_HWMON=y | |||
| 1006 | # CONFIG_SENSORS_SMSC47M192 is not set | 1004 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1007 | # CONFIG_SENSORS_SMSC47B397 is not set | 1005 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1008 | # CONFIG_SENSORS_ADS7828 is not set | 1006 | # CONFIG_SENSORS_ADS7828 is not set |
| 1007 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1009 | # CONFIG_SENSORS_THMC50 is not set | 1008 | # CONFIG_SENSORS_THMC50 is not set |
| 1010 | # CONFIG_SENSORS_TMP401 is not set | 1009 | # CONFIG_SENSORS_TMP401 is not set |
| 1011 | # CONFIG_SENSORS_TMP421 is not set | 1010 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1048,18 +1047,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1048 | # Multifunction device drivers | 1047 | # Multifunction device drivers |
| 1049 | # | 1048 | # |
| 1050 | # CONFIG_MFD_CORE is not set | 1049 | # CONFIG_MFD_CORE is not set |
| 1050 | # CONFIG_MFD_88PM860X is not set | ||
| 1051 | # CONFIG_MFD_SM501 is not set | 1051 | # CONFIG_MFD_SM501 is not set |
| 1052 | # CONFIG_HTC_PASIC3 is not set | 1052 | # CONFIG_HTC_PASIC3 is not set |
| 1053 | # CONFIG_TWL4030_CORE is not set | 1053 | # CONFIG_TWL4030_CORE is not set |
| 1054 | # CONFIG_MFD_TMIO is not set | 1054 | # CONFIG_MFD_TMIO is not set |
| 1055 | # CONFIG_PMIC_DA903X is not set | 1055 | # CONFIG_PMIC_DA903X is not set |
| 1056 | # CONFIG_PMIC_ADP5520 is not set | 1056 | # CONFIG_PMIC_ADP5520 is not set |
| 1057 | # CONFIG_MFD_MAX8925 is not set | ||
| 1057 | # CONFIG_MFD_WM8400 is not set | 1058 | # CONFIG_MFD_WM8400 is not set |
| 1058 | # CONFIG_MFD_WM831X is not set | 1059 | # CONFIG_MFD_WM831X is not set |
| 1059 | # CONFIG_MFD_WM8350_I2C is not set | 1060 | # CONFIG_MFD_WM8350_I2C is not set |
| 1061 | # CONFIG_MFD_WM8994 is not set | ||
| 1060 | # CONFIG_MFD_PCF50633 is not set | 1062 | # CONFIG_MFD_PCF50633 is not set |
| 1061 | # CONFIG_AB3100_CORE is not set | 1063 | # CONFIG_AB3100_CORE is not set |
| 1062 | # CONFIG_MFD_88PM8607 is not set | 1064 | # CONFIG_LPC_SCH is not set |
| 1063 | # CONFIG_REGULATOR is not set | 1065 | # CONFIG_REGULATOR is not set |
| 1064 | # CONFIG_MEDIA_SUPPORT is not set | 1066 | # CONFIG_MEDIA_SUPPORT is not set |
| 1065 | 1067 | ||
| @@ -1068,6 +1070,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1068 | # | 1070 | # |
| 1069 | # CONFIG_AGP is not set | 1071 | # CONFIG_AGP is not set |
| 1070 | CONFIG_VGA_ARB=y | 1072 | CONFIG_VGA_ARB=y |
| 1073 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1071 | # CONFIG_DRM is not set | 1074 | # CONFIG_DRM is not set |
| 1072 | # CONFIG_VGASTATE is not set | 1075 | # CONFIG_VGASTATE is not set |
| 1073 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1076 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1253,6 +1256,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1253 | # CONFIG_BFS_FS is not set | 1256 | # CONFIG_BFS_FS is not set |
| 1254 | # CONFIG_EFS_FS is not set | 1257 | # CONFIG_EFS_FS is not set |
| 1255 | # CONFIG_JFFS2_FS is not set | 1258 | # CONFIG_JFFS2_FS is not set |
| 1259 | # CONFIG_LOGFS is not set | ||
| 1256 | # CONFIG_CRAMFS is not set | 1260 | # CONFIG_CRAMFS is not set |
| 1257 | # CONFIG_SQUASHFS is not set | 1261 | # CONFIG_SQUASHFS is not set |
| 1258 | # CONFIG_VXFS_FS is not set | 1262 | # CONFIG_VXFS_FS is not set |
| @@ -1279,6 +1283,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1279 | CONFIG_RPCSEC_GSS_KRB5=y | 1283 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1280 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1284 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1281 | # CONFIG_SMB_FS is not set | 1285 | # CONFIG_SMB_FS is not set |
| 1286 | # CONFIG_CEPH_FS is not set | ||
| 1282 | # CONFIG_CIFS is not set | 1287 | # CONFIG_CIFS is not set |
| 1283 | # CONFIG_NCP_FS is not set | 1288 | # CONFIG_NCP_FS is not set |
| 1284 | # CONFIG_CODA_FS is not set | 1289 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig index 9451d6e5c802..77abfe8ff198 100644 --- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:23 2010 | 4 | # Mon Apr 19 23:16:47 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -97,14 +97,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 97 | # CONFIG_TREE_RCU_TRACE is not set | 97 | # CONFIG_TREE_RCU_TRACE is not set |
| 98 | # CONFIG_IKCONFIG is not set | 98 | # CONFIG_IKCONFIG is not set |
| 99 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
| 100 | CONFIG_GROUP_SCHED=y | ||
| 101 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 102 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 103 | CONFIG_USER_SCHED=y | ||
| 104 | # CONFIG_CGROUP_SCHED is not set | ||
| 105 | # CONFIG_CGROUPS is not set | 100 | # CONFIG_CGROUPS is not set |
| 106 | CONFIG_SYSFS_DEPRECATED=y | 101 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 107 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 108 | # CONFIG_RELAY is not set | 102 | # CONFIG_RELAY is not set |
| 109 | # CONFIG_NAMESPACES is not set | 103 | # CONFIG_NAMESPACES is not set |
| 110 | CONFIG_BLK_DEV_INITRD=y | 104 | CONFIG_BLK_DEV_INITRD=y |
| @@ -112,6 +106,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 112 | CONFIG_RD_GZIP=y | 106 | CONFIG_RD_GZIP=y |
| 113 | # CONFIG_RD_BZIP2 is not set | 107 | # CONFIG_RD_BZIP2 is not set |
| 114 | # CONFIG_RD_LZMA is not set | 108 | # CONFIG_RD_LZMA is not set |
| 109 | # CONFIG_RD_LZO is not set | ||
| 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 116 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
| 117 | CONFIG_ANON_INODES=y | 112 | CONFIG_ANON_INODES=y |
| @@ -124,7 +119,7 @@ CONFIG_BUG=y | |||
| 124 | CONFIG_ELF_CORE=y | 119 | CONFIG_ELF_CORE=y |
| 125 | CONFIG_BASE_FULL=y | 120 | CONFIG_BASE_FULL=y |
| 126 | CONFIG_FUTEX=y | 121 | CONFIG_FUTEX=y |
| 127 | # CONFIG_EPOLL is not set | 122 | CONFIG_EPOLL=y |
| 128 | CONFIG_SIGNALFD=y | 123 | CONFIG_SIGNALFD=y |
| 129 | CONFIG_TIMERFD=y | 124 | CONFIG_TIMERFD=y |
| 130 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
| @@ -323,6 +318,7 @@ CONFIG_ISA_DMA_API=y | |||
| 323 | # Bus options | 318 | # Bus options |
| 324 | # | 319 | # |
| 325 | CONFIG_ZONE_DMA=y | 320 | CONFIG_ZONE_DMA=y |
| 321 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 326 | CONFIG_GENERIC_ISA_DMA=y | 322 | CONFIG_GENERIC_ISA_DMA=y |
| 327 | CONFIG_PPC_INDIRECT_PCI=y | 323 | CONFIG_PPC_INDIRECT_PCI=y |
| 328 | CONFIG_FSL_SOC=y | 324 | CONFIG_FSL_SOC=y |
| @@ -336,7 +332,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 336 | # CONFIG_PCIEPORTBUS is not set | 332 | # CONFIG_PCIEPORTBUS is not set |
| 337 | CONFIG_ARCH_SUPPORTS_MSI=y | 333 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 338 | # CONFIG_PCI_MSI is not set | 334 | # CONFIG_PCI_MSI is not set |
| 339 | # CONFIG_PCI_LEGACY is not set | ||
| 340 | # CONFIG_PCI_STUB is not set | 335 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 336 | # CONFIG_PCI_IOV is not set |
| 342 | # CONFIG_PCCARD is not set | 337 | # CONFIG_PCCARD is not set |
| @@ -362,7 +357,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 357 | # Networking options |
| 363 | # | 358 | # |
| 364 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 368 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| @@ -550,6 +544,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 550 | # UBI - Unsorted block images | 544 | # UBI - Unsorted block images |
| 551 | # | 545 | # |
| 552 | # CONFIG_MTD_UBI is not set | 546 | # CONFIG_MTD_UBI is not set |
| 547 | CONFIG_OF_FLATTREE=y | ||
| 548 | CONFIG_OF_DYNAMIC=y | ||
| 553 | CONFIG_OF_DEVICE=y | 549 | CONFIG_OF_DEVICE=y |
| 554 | CONFIG_OF_GPIO=y | 550 | CONFIG_OF_GPIO=y |
| 555 | CONFIG_OF_I2C=y | 551 | CONFIG_OF_I2C=y |
| @@ -587,6 +583,7 @@ CONFIG_MISC_DEVICES=y | |||
| 587 | # CONFIG_ENCLOSURE_SERVICES is not set | 583 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 588 | # CONFIG_HP_ILO is not set | 584 | # CONFIG_HP_ILO is not set |
| 589 | # CONFIG_ISL29003 is not set | 585 | # CONFIG_ISL29003 is not set |
| 586 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 590 | # CONFIG_DS1682 is not set | 587 | # CONFIG_DS1682 is not set |
| 591 | # CONFIG_TI_DAC7512 is not set | 588 | # CONFIG_TI_DAC7512 is not set |
| 592 | # CONFIG_C2PORT is not set | 589 | # CONFIG_C2PORT is not set |
| @@ -606,6 +603,7 @@ CONFIG_HAVE_IDE=y | |||
| 606 | # | 603 | # |
| 607 | # SCSI device support | 604 | # SCSI device support |
| 608 | # | 605 | # |
| 606 | CONFIG_SCSI_MOD=y | ||
| 609 | # CONFIG_RAID_ATTRS is not set | 607 | # CONFIG_RAID_ATTRS is not set |
| 610 | # CONFIG_SCSI is not set | 608 | # CONFIG_SCSI is not set |
| 611 | # CONFIG_SCSI_DMA is not set | 609 | # CONFIG_SCSI_DMA is not set |
| @@ -774,6 +772,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 774 | # CONFIG_SERIAL_JSM is not set | 772 | # CONFIG_SERIAL_JSM is not set |
| 775 | # CONFIG_SERIAL_OF_PLATFORM is not set | 773 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 776 | CONFIG_SERIAL_QE=y | 774 | CONFIG_SERIAL_QE=y |
| 775 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 777 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 776 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 778 | CONFIG_UNIX98_PTYS=y | 777 | CONFIG_UNIX98_PTYS=y |
| 779 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 778 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -825,6 +824,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 825 | CONFIG_I2C_MPC=y | 824 | CONFIG_I2C_MPC=y |
| 826 | # CONFIG_I2C_OCORES is not set | 825 | # CONFIG_I2C_OCORES is not set |
| 827 | # CONFIG_I2C_SIMTEC is not set | 826 | # CONFIG_I2C_SIMTEC is not set |
| 827 | # CONFIG_I2C_XILINX is not set | ||
| 828 | 828 | ||
| 829 | # | 829 | # |
| 830 | # External I2C/SMBus adapter drivers | 830 | # External I2C/SMBus adapter drivers |
| @@ -837,15 +837,9 @@ CONFIG_I2C_MPC=y | |||
| 837 | # | 837 | # |
| 838 | # CONFIG_I2C_PCA_PLATFORM is not set | 838 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 839 | # CONFIG_I2C_STUB is not set | 839 | # CONFIG_I2C_STUB is not set |
| 840 | |||
| 841 | # | ||
| 842 | # Miscellaneous I2C Chip support | ||
| 843 | # | ||
| 844 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 845 | # CONFIG_I2C_DEBUG_CORE is not set | 840 | # CONFIG_I2C_DEBUG_CORE is not set |
| 846 | # CONFIG_I2C_DEBUG_ALGO is not set | 841 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 847 | # CONFIG_I2C_DEBUG_BUS is not set | 842 | # CONFIG_I2C_DEBUG_BUS is not set |
| 848 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 849 | CONFIG_SPI=y | 843 | CONFIG_SPI=y |
| 850 | CONFIG_SPI_MASTER=y | 844 | CONFIG_SPI_MASTER=y |
| 851 | 845 | ||
| @@ -876,14 +870,18 @@ CONFIG_GPIOLIB=y | |||
| 876 | # | 870 | # |
| 877 | # Memory mapped GPIO expanders: | 871 | # Memory mapped GPIO expanders: |
| 878 | # | 872 | # |
| 873 | # CONFIG_GPIO_IT8761E is not set | ||
| 879 | # CONFIG_GPIO_XILINX is not set | 874 | # CONFIG_GPIO_XILINX is not set |
| 875 | # CONFIG_GPIO_SCH is not set | ||
| 880 | 876 | ||
| 881 | # | 877 | # |
| 882 | # I2C GPIO expanders: | 878 | # I2C GPIO expanders: |
| 883 | # | 879 | # |
| 880 | # CONFIG_GPIO_MAX7300 is not set | ||
| 884 | # CONFIG_GPIO_MAX732X is not set | 881 | # CONFIG_GPIO_MAX732X is not set |
| 885 | # CONFIG_GPIO_PCA953X is not set | 882 | # CONFIG_GPIO_PCA953X is not set |
| 886 | # CONFIG_GPIO_PCF857X is not set | 883 | # CONFIG_GPIO_PCF857X is not set |
| 884 | # CONFIG_GPIO_ADP5588 is not set | ||
| 887 | 885 | ||
| 888 | # | 886 | # |
| 889 | # PCI GPIO expanders: | 887 | # PCI GPIO expanders: |
| @@ -932,22 +930,27 @@ CONFIG_SSB_POSSIBLE=y | |||
| 932 | # Multifunction device drivers | 930 | # Multifunction device drivers |
| 933 | # | 931 | # |
| 934 | # CONFIG_MFD_CORE is not set | 932 | # CONFIG_MFD_CORE is not set |
| 933 | # CONFIG_MFD_88PM860X is not set | ||
| 935 | # CONFIG_MFD_SM501 is not set | 934 | # CONFIG_MFD_SM501 is not set |
| 936 | # CONFIG_HTC_PASIC3 is not set | 935 | # CONFIG_HTC_PASIC3 is not set |
| 936 | # CONFIG_HTC_I2CPLD is not set | ||
| 937 | # CONFIG_TPS65010 is not set | 937 | # CONFIG_TPS65010 is not set |
| 938 | # CONFIG_TWL4030_CORE is not set | 938 | # CONFIG_TWL4030_CORE is not set |
| 939 | # CONFIG_MFD_TMIO is not set | 939 | # CONFIG_MFD_TMIO is not set |
| 940 | # CONFIG_PMIC_DA903X is not set | 940 | # CONFIG_PMIC_DA903X is not set |
| 941 | # CONFIG_PMIC_ADP5520 is not set | 941 | # CONFIG_PMIC_ADP5520 is not set |
| 942 | # CONFIG_MFD_MAX8925 is not set | ||
| 942 | # CONFIG_MFD_WM8400 is not set | 943 | # CONFIG_MFD_WM8400 is not set |
| 943 | # CONFIG_MFD_WM831X is not set | 944 | # CONFIG_MFD_WM831X is not set |
| 944 | # CONFIG_MFD_WM8350_I2C is not set | 945 | # CONFIG_MFD_WM8350_I2C is not set |
| 946 | # CONFIG_MFD_WM8994 is not set | ||
| 945 | # CONFIG_MFD_PCF50633 is not set | 947 | # CONFIG_MFD_PCF50633 is not set |
| 946 | # CONFIG_MFD_MC13783 is not set | 948 | # CONFIG_MFD_MC13783 is not set |
| 947 | # CONFIG_AB3100_CORE is not set | 949 | # CONFIG_AB3100_CORE is not set |
| 948 | # CONFIG_EZX_PCAP is not set | 950 | # CONFIG_EZX_PCAP is not set |
| 949 | # CONFIG_MFD_88PM8607 is not set | ||
| 950 | # CONFIG_AB4500_CORE is not set | 951 | # CONFIG_AB4500_CORE is not set |
| 952 | # CONFIG_MFD_TIMBERDALE is not set | ||
| 953 | # CONFIG_LPC_SCH is not set | ||
| 951 | # CONFIG_REGULATOR is not set | 954 | # CONFIG_REGULATOR is not set |
| 952 | # CONFIG_MEDIA_SUPPORT is not set | 955 | # CONFIG_MEDIA_SUPPORT is not set |
| 953 | 956 | ||
| @@ -956,6 +959,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 956 | # | 959 | # |
| 957 | # CONFIG_AGP is not set | 960 | # CONFIG_AGP is not set |
| 958 | CONFIG_VGA_ARB=y | 961 | CONFIG_VGA_ARB=y |
| 962 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 959 | # CONFIG_DRM is not set | 963 | # CONFIG_DRM is not set |
| 960 | # CONFIG_VGASTATE is not set | 964 | # CONFIG_VGASTATE is not set |
| 961 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 965 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1145,6 +1149,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1145 | # CONFIG_JFFS2_LZO is not set | 1149 | # CONFIG_JFFS2_LZO is not set |
| 1146 | CONFIG_JFFS2_RTIME=y | 1150 | CONFIG_JFFS2_RTIME=y |
| 1147 | # CONFIG_JFFS2_RUBIN is not set | 1151 | # CONFIG_JFFS2_RUBIN is not set |
| 1152 | # CONFIG_LOGFS is not set | ||
| 1148 | # CONFIG_CRAMFS is not set | 1153 | # CONFIG_CRAMFS is not set |
| 1149 | # CONFIG_SQUASHFS is not set | 1154 | # CONFIG_SQUASHFS is not set |
| 1150 | # CONFIG_VXFS_FS is not set | 1155 | # CONFIG_VXFS_FS is not set |
| @@ -1171,6 +1176,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1171 | CONFIG_RPCSEC_GSS_KRB5=y | 1176 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1172 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1177 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1173 | # CONFIG_SMB_FS is not set | 1178 | # CONFIG_SMB_FS is not set |
| 1179 | # CONFIG_CEPH_FS is not set | ||
| 1174 | # CONFIG_CIFS is not set | 1180 | # CONFIG_CIFS is not set |
| 1175 | # CONFIG_NCP_FS is not set | 1181 | # CONFIG_NCP_FS is not set |
| 1176 | # CONFIG_CODA_FS is not set | 1182 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index f67b70d0b292..0cdb41418d58 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:22 2010 | 4 | # Mon Apr 19 23:16:47 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -124,7 +119,7 @@ CONFIG_BUG=y | |||
| 124 | CONFIG_ELF_CORE=y | 119 | CONFIG_ELF_CORE=y |
| 125 | CONFIG_BASE_FULL=y | 120 | CONFIG_BASE_FULL=y |
| 126 | CONFIG_FUTEX=y | 121 | CONFIG_FUTEX=y |
| 127 | # CONFIG_EPOLL is not set | 122 | CONFIG_EPOLL=y |
| 128 | CONFIG_SIGNALFD=y | 123 | CONFIG_SIGNALFD=y |
| 129 | CONFIG_TIMERFD=y | 124 | CONFIG_TIMERFD=y |
| 130 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_STUB is not set | 334 | # CONFIG_PCI_STUB is not set |
| 340 | # CONFIG_PCI_IOV is not set | 335 | # CONFIG_PCI_IOV is not set |
| 341 | # CONFIG_PCCARD is not set | 336 | # CONFIG_PCCARD is not set |
| @@ -361,7 +356,6 @@ CONFIG_NET=y | |||
| 361 | # Networking options | 356 | # Networking options |
| 362 | # | 357 | # |
| 363 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
| 364 | # CONFIG_PACKET_MMAP is not set | ||
| 365 | CONFIG_UNIX=y | 359 | CONFIG_UNIX=y |
| 366 | CONFIG_XFRM=y | 360 | CONFIG_XFRM=y |
| 367 | CONFIG_XFRM_USER=m | 361 | CONFIG_XFRM_USER=m |
| @@ -456,6 +450,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 456 | # CONFIG_SYS_HYPERVISOR is not set | 450 | # CONFIG_SYS_HYPERVISOR is not set |
| 457 | # CONFIG_CONNECTOR is not set | 451 | # CONFIG_CONNECTOR is not set |
| 458 | # CONFIG_MTD is not set | 452 | # CONFIG_MTD is not set |
| 453 | CONFIG_OF_FLATTREE=y | ||
| 454 | CONFIG_OF_DYNAMIC=y | ||
| 459 | CONFIG_OF_DEVICE=y | 455 | CONFIG_OF_DEVICE=y |
| 460 | CONFIG_OF_I2C=y | 456 | CONFIG_OF_I2C=y |
| 461 | CONFIG_OF_MDIO=y | 457 | CONFIG_OF_MDIO=y |
| @@ -491,6 +487,7 @@ CONFIG_MISC_DEVICES=y | |||
| 491 | # CONFIG_ENCLOSURE_SERVICES is not set | 487 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 492 | # CONFIG_HP_ILO is not set | 488 | # CONFIG_HP_ILO is not set |
| 493 | # CONFIG_ISL29003 is not set | 489 | # CONFIG_ISL29003 is not set |
| 490 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 494 | # CONFIG_DS1682 is not set | 491 | # CONFIG_DS1682 is not set |
| 495 | # CONFIG_C2PORT is not set | 492 | # CONFIG_C2PORT is not set |
| 496 | 493 | ||
| @@ -508,6 +505,7 @@ CONFIG_HAVE_IDE=y | |||
| 508 | # | 505 | # |
| 509 | # SCSI device support | 506 | # SCSI device support |
| 510 | # | 507 | # |
| 508 | CONFIG_SCSI_MOD=y | ||
| 511 | # CONFIG_RAID_ATTRS is not set | 509 | # CONFIG_RAID_ATTRS is not set |
| 512 | CONFIG_SCSI=y | 510 | CONFIG_SCSI=y |
| 513 | CONFIG_SCSI_DMA=y | 511 | CONFIG_SCSI_DMA=y |
| @@ -631,6 +629,7 @@ CONFIG_ATA_SFF=y | |||
| 631 | # CONFIG_PATA_IT821X is not set | 629 | # CONFIG_PATA_IT821X is not set |
| 632 | # CONFIG_PATA_IT8213 is not set | 630 | # CONFIG_PATA_IT8213 is not set |
| 633 | # CONFIG_PATA_JMICRON is not set | 631 | # CONFIG_PATA_JMICRON is not set |
| 632 | # CONFIG_PATA_LEGACY is not set | ||
| 634 | # CONFIG_PATA_TRIFLEX is not set | 633 | # CONFIG_PATA_TRIFLEX is not set |
| 635 | # CONFIG_PATA_MARVELL is not set | 634 | # CONFIG_PATA_MARVELL is not set |
| 636 | # CONFIG_PATA_MPIIX is not set | 635 | # CONFIG_PATA_MPIIX is not set |
| @@ -755,6 +754,8 @@ CONFIG_NETDEV_10000=y | |||
| 755 | # CONFIG_CHELSIO_T1 is not set | 754 | # CONFIG_CHELSIO_T1 is not set |
| 756 | CONFIG_CHELSIO_T3_DEPENDS=y | 755 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 757 | # CONFIG_CHELSIO_T3 is not set | 756 | # CONFIG_CHELSIO_T3 is not set |
| 757 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 758 | # CONFIG_CHELSIO_T4 is not set | ||
| 758 | # CONFIG_ENIC is not set | 759 | # CONFIG_ENIC is not set |
| 759 | # CONFIG_IXGBE is not set | 760 | # CONFIG_IXGBE is not set |
| 760 | # CONFIG_IXGB is not set | 761 | # CONFIG_IXGB is not set |
| @@ -767,6 +768,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 767 | # CONFIG_MLX4_CORE is not set | 768 | # CONFIG_MLX4_CORE is not set |
| 768 | # CONFIG_TEHUTI is not set | 769 | # CONFIG_TEHUTI is not set |
| 769 | # CONFIG_BNX2X is not set | 770 | # CONFIG_BNX2X is not set |
| 771 | # CONFIG_QLCNIC is not set | ||
| 770 | # CONFIG_QLGE is not set | 772 | # CONFIG_QLGE is not set |
| 771 | # CONFIG_SFC is not set | 773 | # CONFIG_SFC is not set |
| 772 | # CONFIG_BE2NET is not set | 774 | # CONFIG_BE2NET is not set |
| @@ -851,6 +853,7 @@ CONFIG_SERIAL_CORE=y | |||
| 851 | CONFIG_SERIAL_CORE_CONSOLE=y | 853 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 852 | # CONFIG_SERIAL_JSM is not set | 854 | # CONFIG_SERIAL_JSM is not set |
| 853 | # CONFIG_SERIAL_OF_PLATFORM is not set | 855 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 856 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 854 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 857 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 855 | CONFIG_UNIX98_PTYS=y | 858 | CONFIG_UNIX98_PTYS=y |
| 856 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 859 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -901,6 +904,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 901 | CONFIG_I2C_MPC=y | 904 | CONFIG_I2C_MPC=y |
| 902 | # CONFIG_I2C_OCORES is not set | 905 | # CONFIG_I2C_OCORES is not set |
| 903 | # CONFIG_I2C_SIMTEC is not set | 906 | # CONFIG_I2C_SIMTEC is not set |
| 907 | # CONFIG_I2C_XILINX is not set | ||
| 904 | 908 | ||
| 905 | # | 909 | # |
| 906 | # External I2C/SMBus adapter drivers | 910 | # External I2C/SMBus adapter drivers |
| @@ -913,15 +917,9 @@ CONFIG_I2C_MPC=y | |||
| 913 | # | 917 | # |
| 914 | # CONFIG_I2C_PCA_PLATFORM is not set | 918 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 915 | # CONFIG_I2C_STUB is not set | 919 | # CONFIG_I2C_STUB is not set |
| 916 | |||
| 917 | # | ||
| 918 | # Miscellaneous I2C Chip support | ||
| 919 | # | ||
| 920 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 921 | # CONFIG_I2C_DEBUG_CORE is not set | 920 | # CONFIG_I2C_DEBUG_CORE is not set |
| 922 | # CONFIG_I2C_DEBUG_ALGO is not set | 921 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 923 | # CONFIG_I2C_DEBUG_BUS is not set | 922 | # CONFIG_I2C_DEBUG_BUS is not set |
| 924 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 925 | # CONFIG_SPI is not set | 923 | # CONFIG_SPI is not set |
| 926 | 924 | ||
| 927 | # | 925 | # |
| @@ -947,10 +945,11 @@ CONFIG_HWMON=y | |||
| 947 | # CONFIG_SENSORS_ADM1029 is not set | 945 | # CONFIG_SENSORS_ADM1029 is not set |
| 948 | # CONFIG_SENSORS_ADM1031 is not set | 946 | # CONFIG_SENSORS_ADM1031 is not set |
| 949 | # CONFIG_SENSORS_ADM9240 is not set | 947 | # CONFIG_SENSORS_ADM9240 is not set |
| 948 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 950 | # CONFIG_SENSORS_ADT7462 is not set | 949 | # CONFIG_SENSORS_ADT7462 is not set |
| 951 | # CONFIG_SENSORS_ADT7470 is not set | 950 | # CONFIG_SENSORS_ADT7470 is not set |
| 952 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 953 | # CONFIG_SENSORS_ADT7475 is not set | 951 | # CONFIG_SENSORS_ADT7475 is not set |
| 952 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 954 | # CONFIG_SENSORS_ATXP1 is not set | 953 | # CONFIG_SENSORS_ATXP1 is not set |
| 955 | # CONFIG_SENSORS_DS1621 is not set | 954 | # CONFIG_SENSORS_DS1621 is not set |
| 956 | # CONFIG_SENSORS_I5K_AMB is not set | 955 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -987,6 +986,7 @@ CONFIG_HWMON=y | |||
| 987 | # CONFIG_SENSORS_SMSC47M192 is not set | 986 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 988 | # CONFIG_SENSORS_SMSC47B397 is not set | 987 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 989 | # CONFIG_SENSORS_ADS7828 is not set | 988 | # CONFIG_SENSORS_ADS7828 is not set |
| 989 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 990 | # CONFIG_SENSORS_THMC50 is not set | 990 | # CONFIG_SENSORS_THMC50 is not set |
| 991 | # CONFIG_SENSORS_TMP401 is not set | 991 | # CONFIG_SENSORS_TMP401 is not set |
| 992 | # CONFIG_SENSORS_TMP421 is not set | 992 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1029,18 +1029,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1029 | # Multifunction device drivers | 1029 | # Multifunction device drivers |
| 1030 | # | 1030 | # |
| 1031 | # CONFIG_MFD_CORE is not set | 1031 | # CONFIG_MFD_CORE is not set |
| 1032 | # CONFIG_MFD_88PM860X is not set | ||
| 1032 | # CONFIG_MFD_SM501 is not set | 1033 | # CONFIG_MFD_SM501 is not set |
| 1033 | # CONFIG_HTC_PASIC3 is not set | 1034 | # CONFIG_HTC_PASIC3 is not set |
| 1034 | # CONFIG_TWL4030_CORE is not set | 1035 | # CONFIG_TWL4030_CORE is not set |
| 1035 | # CONFIG_MFD_TMIO is not set | 1036 | # CONFIG_MFD_TMIO is not set |
| 1036 | # CONFIG_PMIC_DA903X is not set | 1037 | # CONFIG_PMIC_DA903X is not set |
| 1037 | # CONFIG_PMIC_ADP5520 is not set | 1038 | # CONFIG_PMIC_ADP5520 is not set |
| 1039 | # CONFIG_MFD_MAX8925 is not set | ||
| 1038 | # CONFIG_MFD_WM8400 is not set | 1040 | # CONFIG_MFD_WM8400 is not set |
| 1039 | # CONFIG_MFD_WM831X is not set | 1041 | # CONFIG_MFD_WM831X is not set |
| 1040 | # CONFIG_MFD_WM8350_I2C is not set | 1042 | # CONFIG_MFD_WM8350_I2C is not set |
| 1043 | # CONFIG_MFD_WM8994 is not set | ||
| 1041 | # CONFIG_MFD_PCF50633 is not set | 1044 | # CONFIG_MFD_PCF50633 is not set |
| 1042 | # CONFIG_AB3100_CORE is not set | 1045 | # CONFIG_AB3100_CORE is not set |
| 1043 | # CONFIG_MFD_88PM8607 is not set | 1046 | # CONFIG_LPC_SCH is not set |
| 1044 | # CONFIG_REGULATOR is not set | 1047 | # CONFIG_REGULATOR is not set |
| 1045 | # CONFIG_MEDIA_SUPPORT is not set | 1048 | # CONFIG_MEDIA_SUPPORT is not set |
| 1046 | 1049 | ||
| @@ -1049,6 +1052,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1049 | # | 1052 | # |
| 1050 | # CONFIG_AGP is not set | 1053 | # CONFIG_AGP is not set |
| 1051 | CONFIG_VGA_ARB=y | 1054 | CONFIG_VGA_ARB=y |
| 1055 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1052 | # CONFIG_DRM is not set | 1056 | # CONFIG_DRM is not set |
| 1053 | # CONFIG_VGASTATE is not set | 1057 | # CONFIG_VGASTATE is not set |
| 1054 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1058 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1175,6 +1179,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1175 | # CONFIG_BEFS_FS is not set | 1179 | # CONFIG_BEFS_FS is not set |
| 1176 | # CONFIG_BFS_FS is not set | 1180 | # CONFIG_BFS_FS is not set |
| 1177 | # CONFIG_EFS_FS is not set | 1181 | # CONFIG_EFS_FS is not set |
| 1182 | # CONFIG_LOGFS is not set | ||
| 1178 | # CONFIG_CRAMFS is not set | 1183 | # CONFIG_CRAMFS is not set |
| 1179 | # CONFIG_SQUASHFS is not set | 1184 | # CONFIG_SQUASHFS is not set |
| 1180 | # CONFIG_VXFS_FS is not set | 1185 | # CONFIG_VXFS_FS is not set |
| @@ -1201,6 +1206,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1201 | CONFIG_RPCSEC_GSS_KRB5=y | 1206 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1202 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1207 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1203 | # CONFIG_SMB_FS is not set | 1208 | # CONFIG_SMB_FS is not set |
| 1209 | # CONFIG_CEPH_FS is not set | ||
| 1204 | # CONFIG_CIFS is not set | 1210 | # CONFIG_CIFS is not set |
| 1205 | # CONFIG_NCP_FS is not set | 1211 | # CONFIG_NCP_FS is not set |
| 1206 | # CONFIG_CODA_FS is not set | 1212 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index a84fd1194e2b..e69ed1b61425 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:24 2010 | 4 | # Mon Apr 19 23:16:48 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -124,7 +119,7 @@ CONFIG_BUG=y | |||
| 124 | CONFIG_ELF_CORE=y | 119 | CONFIG_ELF_CORE=y |
| 125 | CONFIG_BASE_FULL=y | 120 | CONFIG_BASE_FULL=y |
| 126 | CONFIG_FUTEX=y | 121 | CONFIG_FUTEX=y |
| 127 | # CONFIG_EPOLL is not set | 122 | CONFIG_EPOLL=y |
| 128 | CONFIG_SIGNALFD=y | 123 | CONFIG_SIGNALFD=y |
| 129 | CONFIG_TIMERFD=y | 124 | CONFIG_TIMERFD=y |
| 130 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
| @@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 319 | # Bus options |
| 325 | # | 320 | # |
| 326 | CONFIG_ZONE_DMA=y | 321 | CONFIG_ZONE_DMA=y |
| 322 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 323 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_INDIRECT_PCI=y | 324 | CONFIG_PPC_INDIRECT_PCI=y |
| 329 | CONFIG_FSL_SOC=y | 325 | CONFIG_FSL_SOC=y |
| @@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 335 | # CONFIG_PCIEPORTBUS is not set | 331 | # CONFIG_PCIEPORTBUS is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 332 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 333 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | # CONFIG_PCI_STUB is not set | 334 | # CONFIG_PCI_STUB is not set |
| 340 | # CONFIG_PCI_IOV is not set | 335 | # CONFIG_PCI_IOV is not set |
| 341 | # CONFIG_PCCARD is not set | 336 | # CONFIG_PCCARD is not set |
| @@ -361,7 +356,6 @@ CONFIG_NET=y | |||
| 361 | # Networking options | 356 | # Networking options |
| 362 | # | 357 | # |
| 363 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
| 364 | # CONFIG_PACKET_MMAP is not set | ||
| 365 | CONFIG_UNIX=y | 359 | CONFIG_UNIX=y |
| 366 | # CONFIG_NET_KEY is not set | 360 | # CONFIG_NET_KEY is not set |
| 367 | CONFIG_INET=y | 361 | CONFIG_INET=y |
| @@ -451,6 +445,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 451 | # CONFIG_SYS_HYPERVISOR is not set | 445 | # CONFIG_SYS_HYPERVISOR is not set |
| 452 | # CONFIG_CONNECTOR is not set | 446 | # CONFIG_CONNECTOR is not set |
| 453 | # CONFIG_MTD is not set | 447 | # CONFIG_MTD is not set |
| 448 | CONFIG_OF_FLATTREE=y | ||
| 449 | CONFIG_OF_DYNAMIC=y | ||
| 454 | CONFIG_OF_DEVICE=y | 450 | CONFIG_OF_DEVICE=y |
| 455 | CONFIG_OF_I2C=y | 451 | CONFIG_OF_I2C=y |
| 456 | CONFIG_OF_MDIO=y | 452 | CONFIG_OF_MDIO=y |
| @@ -487,6 +483,7 @@ CONFIG_MISC_DEVICES=y | |||
| 487 | # CONFIG_ENCLOSURE_SERVICES is not set | 483 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 488 | # CONFIG_HP_ILO is not set | 484 | # CONFIG_HP_ILO is not set |
| 489 | # CONFIG_ISL29003 is not set | 485 | # CONFIG_ISL29003 is not set |
| 486 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 490 | # CONFIG_DS1682 is not set | 487 | # CONFIG_DS1682 is not set |
| 491 | # CONFIG_C2PORT is not set | 488 | # CONFIG_C2PORT is not set |
| 492 | 489 | ||
| @@ -504,6 +501,7 @@ CONFIG_HAVE_IDE=y | |||
| 504 | # | 501 | # |
| 505 | # SCSI device support | 502 | # SCSI device support |
| 506 | # | 503 | # |
| 504 | CONFIG_SCSI_MOD=y | ||
| 507 | # CONFIG_RAID_ATTRS is not set | 505 | # CONFIG_RAID_ATTRS is not set |
| 508 | CONFIG_SCSI=y | 506 | CONFIG_SCSI=y |
| 509 | CONFIG_SCSI_DMA=y | 507 | CONFIG_SCSI_DMA=y |
| @@ -626,6 +624,7 @@ CONFIG_ATA_SFF=y | |||
| 626 | # CONFIG_PATA_IT821X is not set | 624 | # CONFIG_PATA_IT821X is not set |
| 627 | # CONFIG_PATA_IT8213 is not set | 625 | # CONFIG_PATA_IT8213 is not set |
| 628 | # CONFIG_PATA_JMICRON is not set | 626 | # CONFIG_PATA_JMICRON is not set |
| 627 | # CONFIG_PATA_LEGACY is not set | ||
| 629 | # CONFIG_PATA_TRIFLEX is not set | 628 | # CONFIG_PATA_TRIFLEX is not set |
| 630 | # CONFIG_PATA_MARVELL is not set | 629 | # CONFIG_PATA_MARVELL is not set |
| 631 | # CONFIG_PATA_MPIIX is not set | 630 | # CONFIG_PATA_MPIIX is not set |
| @@ -850,6 +849,7 @@ CONFIG_SERIAL_CORE=y | |||
| 850 | CONFIG_SERIAL_CORE_CONSOLE=y | 849 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 851 | # CONFIG_SERIAL_JSM is not set | 850 | # CONFIG_SERIAL_JSM is not set |
| 852 | # CONFIG_SERIAL_OF_PLATFORM is not set | 851 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 852 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 853 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 853 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 854 | CONFIG_UNIX98_PTYS=y | 854 | CONFIG_UNIX98_PTYS=y |
| 855 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 855 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -900,6 +900,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 900 | CONFIG_I2C_MPC=y | 900 | CONFIG_I2C_MPC=y |
| 901 | # CONFIG_I2C_OCORES is not set | 901 | # CONFIG_I2C_OCORES is not set |
| 902 | # CONFIG_I2C_SIMTEC is not set | 902 | # CONFIG_I2C_SIMTEC is not set |
| 903 | # CONFIG_I2C_XILINX is not set | ||
| 903 | 904 | ||
| 904 | # | 905 | # |
| 905 | # External I2C/SMBus adapter drivers | 906 | # External I2C/SMBus adapter drivers |
| @@ -913,15 +914,9 @@ CONFIG_I2C_MPC=y | |||
| 913 | # | 914 | # |
| 914 | # CONFIG_I2C_PCA_PLATFORM is not set | 915 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 915 | # CONFIG_I2C_STUB is not set | 916 | # CONFIG_I2C_STUB is not set |
| 916 | |||
| 917 | # | ||
| 918 | # Miscellaneous I2C Chip support | ||
| 919 | # | ||
| 920 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 921 | # CONFIG_I2C_DEBUG_CORE is not set | 917 | # CONFIG_I2C_DEBUG_CORE is not set |
| 922 | # CONFIG_I2C_DEBUG_ALGO is not set | 918 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 923 | # CONFIG_I2C_DEBUG_BUS is not set | 919 | # CONFIG_I2C_DEBUG_BUS is not set |
| 924 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 925 | # CONFIG_SPI is not set | 920 | # CONFIG_SPI is not set |
| 926 | 921 | ||
| 927 | # | 922 | # |
| @@ -947,10 +942,11 @@ CONFIG_HWMON=y | |||
| 947 | # CONFIG_SENSORS_ADM1029 is not set | 942 | # CONFIG_SENSORS_ADM1029 is not set |
| 948 | # CONFIG_SENSORS_ADM1031 is not set | 943 | # CONFIG_SENSORS_ADM1031 is not set |
| 949 | # CONFIG_SENSORS_ADM9240 is not set | 944 | # CONFIG_SENSORS_ADM9240 is not set |
| 945 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 950 | # CONFIG_SENSORS_ADT7462 is not set | 946 | # CONFIG_SENSORS_ADT7462 is not set |
| 951 | # CONFIG_SENSORS_ADT7470 is not set | 947 | # CONFIG_SENSORS_ADT7470 is not set |
| 952 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 953 | # CONFIG_SENSORS_ADT7475 is not set | 948 | # CONFIG_SENSORS_ADT7475 is not set |
| 949 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 954 | # CONFIG_SENSORS_ATXP1 is not set | 950 | # CONFIG_SENSORS_ATXP1 is not set |
| 955 | # CONFIG_SENSORS_DS1621 is not set | 951 | # CONFIG_SENSORS_DS1621 is not set |
| 956 | # CONFIG_SENSORS_I5K_AMB is not set | 952 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -987,6 +983,7 @@ CONFIG_HWMON=y | |||
| 987 | # CONFIG_SENSORS_SMSC47M192 is not set | 983 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 988 | # CONFIG_SENSORS_SMSC47B397 is not set | 984 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 989 | # CONFIG_SENSORS_ADS7828 is not set | 985 | # CONFIG_SENSORS_ADS7828 is not set |
| 986 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 990 | # CONFIG_SENSORS_THMC50 is not set | 987 | # CONFIG_SENSORS_THMC50 is not set |
| 991 | # CONFIG_SENSORS_TMP401 is not set | 988 | # CONFIG_SENSORS_TMP401 is not set |
| 992 | # CONFIG_SENSORS_TMP421 is not set | 989 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1034,18 +1031,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1034 | # Multifunction device drivers | 1031 | # Multifunction device drivers |
| 1035 | # | 1032 | # |
| 1036 | # CONFIG_MFD_CORE is not set | 1033 | # CONFIG_MFD_CORE is not set |
| 1034 | # CONFIG_MFD_88PM860X is not set | ||
| 1037 | # CONFIG_MFD_SM501 is not set | 1035 | # CONFIG_MFD_SM501 is not set |
| 1038 | # CONFIG_HTC_PASIC3 is not set | 1036 | # CONFIG_HTC_PASIC3 is not set |
| 1039 | # CONFIG_TWL4030_CORE is not set | 1037 | # CONFIG_TWL4030_CORE is not set |
| 1040 | # CONFIG_MFD_TMIO is not set | 1038 | # CONFIG_MFD_TMIO is not set |
| 1041 | # CONFIG_PMIC_DA903X is not set | 1039 | # CONFIG_PMIC_DA903X is not set |
| 1042 | # CONFIG_PMIC_ADP5520 is not set | 1040 | # CONFIG_PMIC_ADP5520 is not set |
| 1041 | # CONFIG_MFD_MAX8925 is not set | ||
| 1043 | # CONFIG_MFD_WM8400 is not set | 1042 | # CONFIG_MFD_WM8400 is not set |
| 1044 | # CONFIG_MFD_WM831X is not set | 1043 | # CONFIG_MFD_WM831X is not set |
| 1045 | # CONFIG_MFD_WM8350_I2C is not set | 1044 | # CONFIG_MFD_WM8350_I2C is not set |
| 1045 | # CONFIG_MFD_WM8994 is not set | ||
| 1046 | # CONFIG_MFD_PCF50633 is not set | 1046 | # CONFIG_MFD_PCF50633 is not set |
| 1047 | # CONFIG_AB3100_CORE is not set | 1047 | # CONFIG_AB3100_CORE is not set |
| 1048 | # CONFIG_MFD_88PM8607 is not set | 1048 | # CONFIG_LPC_SCH is not set |
| 1049 | # CONFIG_REGULATOR is not set | 1049 | # CONFIG_REGULATOR is not set |
| 1050 | # CONFIG_MEDIA_SUPPORT is not set | 1050 | # CONFIG_MEDIA_SUPPORT is not set |
| 1051 | 1051 | ||
| @@ -1054,6 +1054,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1054 | # | 1054 | # |
| 1055 | # CONFIG_AGP is not set | 1055 | # CONFIG_AGP is not set |
| 1056 | CONFIG_VGA_ARB=y | 1056 | CONFIG_VGA_ARB=y |
| 1057 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1057 | # CONFIG_DRM is not set | 1058 | # CONFIG_DRM is not set |
| 1058 | # CONFIG_VGASTATE is not set | 1059 | # CONFIG_VGASTATE is not set |
| 1059 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1060 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1079,6 +1080,7 @@ CONFIG_USB_HID=y | |||
| 1079 | # | 1080 | # |
| 1080 | # Special HID drivers | 1081 | # Special HID drivers |
| 1081 | # | 1082 | # |
| 1083 | # CONFIG_HID_3M_PCT is not set | ||
| 1082 | CONFIG_HID_A4TECH=y | 1084 | CONFIG_HID_A4TECH=y |
| 1083 | CONFIG_HID_APPLE=y | 1085 | CONFIG_HID_APPLE=y |
| 1084 | CONFIG_HID_BELKIN=y | 1086 | CONFIG_HID_BELKIN=y |
| @@ -1094,14 +1096,19 @@ CONFIG_HID_GYRATION=y | |||
| 1094 | CONFIG_HID_LOGITECH=y | 1096 | CONFIG_HID_LOGITECH=y |
| 1095 | # CONFIG_LOGITECH_FF is not set | 1097 | # CONFIG_LOGITECH_FF is not set |
| 1096 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1098 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1099 | # CONFIG_LOGIG940_FF is not set | ||
| 1097 | CONFIG_HID_MICROSOFT=y | 1100 | CONFIG_HID_MICROSOFT=y |
| 1101 | # CONFIG_HID_MOSART is not set | ||
| 1098 | CONFIG_HID_MONTEREY=y | 1102 | CONFIG_HID_MONTEREY=y |
| 1099 | # CONFIG_HID_NTRIG is not set | 1103 | # CONFIG_HID_NTRIG is not set |
| 1104 | # CONFIG_HID_ORTEK is not set | ||
| 1100 | CONFIG_HID_PANTHERLORD=y | 1105 | CONFIG_HID_PANTHERLORD=y |
| 1101 | # CONFIG_PANTHERLORD_FF is not set | 1106 | # CONFIG_PANTHERLORD_FF is not set |
| 1102 | CONFIG_HID_PETALYNX=y | 1107 | CONFIG_HID_PETALYNX=y |
| 1108 | # CONFIG_HID_QUANTA is not set | ||
| 1103 | CONFIG_HID_SAMSUNG=y | 1109 | CONFIG_HID_SAMSUNG=y |
| 1104 | CONFIG_HID_SONY=y | 1110 | CONFIG_HID_SONY=y |
| 1111 | # CONFIG_HID_STANTUM is not set | ||
| 1105 | CONFIG_HID_SUNPLUS=y | 1112 | CONFIG_HID_SUNPLUS=y |
| 1106 | # CONFIG_HID_GREENASIA is not set | 1113 | # CONFIG_HID_GREENASIA is not set |
| 1107 | # CONFIG_HID_SMARTJOYPLUS is not set | 1114 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1190,7 +1197,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1190 | # CONFIG_USB_RIO500 is not set | 1197 | # CONFIG_USB_RIO500 is not set |
| 1191 | # CONFIG_USB_LEGOTOWER is not set | 1198 | # CONFIG_USB_LEGOTOWER is not set |
| 1192 | # CONFIG_USB_LCD is not set | 1199 | # CONFIG_USB_LCD is not set |
| 1193 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1194 | # CONFIG_USB_LED is not set | 1200 | # CONFIG_USB_LED is not set |
| 1195 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1201 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1196 | # CONFIG_USB_CYTHERM is not set | 1202 | # CONFIG_USB_CYTHERM is not set |
| @@ -1203,7 +1209,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1203 | # CONFIG_USB_IOWARRIOR is not set | 1209 | # CONFIG_USB_IOWARRIOR is not set |
| 1204 | # CONFIG_USB_TEST is not set | 1210 | # CONFIG_USB_TEST is not set |
| 1205 | # CONFIG_USB_ISIGHTFW is not set | 1211 | # CONFIG_USB_ISIGHTFW is not set |
| 1206 | # CONFIG_USB_VST is not set | ||
| 1207 | # CONFIG_USB_GADGET is not set | 1212 | # CONFIG_USB_GADGET is not set |
| 1208 | 1213 | ||
| 1209 | # | 1214 | # |
| @@ -1297,6 +1302,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1297 | # CONFIG_BEFS_FS is not set | 1302 | # CONFIG_BEFS_FS is not set |
| 1298 | # CONFIG_BFS_FS is not set | 1303 | # CONFIG_BFS_FS is not set |
| 1299 | # CONFIG_EFS_FS is not set | 1304 | # CONFIG_EFS_FS is not set |
| 1305 | # CONFIG_LOGFS is not set | ||
| 1300 | # CONFIG_CRAMFS is not set | 1306 | # CONFIG_CRAMFS is not set |
| 1301 | # CONFIG_SQUASHFS is not set | 1307 | # CONFIG_SQUASHFS is not set |
| 1302 | # CONFIG_VXFS_FS is not set | 1308 | # CONFIG_VXFS_FS is not set |
| @@ -1323,6 +1329,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1323 | CONFIG_RPCSEC_GSS_KRB5=y | 1329 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1324 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1330 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1325 | # CONFIG_SMB_FS is not set | 1331 | # CONFIG_SMB_FS is not set |
| 1332 | # CONFIG_CEPH_FS is not set | ||
| 1326 | # CONFIG_CIFS is not set | 1333 | # CONFIG_CIFS is not set |
| 1327 | # CONFIG_NCP_FS is not set | 1334 | # CONFIG_NCP_FS is not set |
| 1328 | # CONFIG_CODA_FS is not set | 1335 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 72c2067137b9..56e3995d898f 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:25 2010 | 4 | # Mon Apr 19 23:16:49 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 107 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 108 | # CONFIG_NAMESPACES is not set | 102 | # CONFIG_NAMESPACES is not set |
| 109 | CONFIG_BLK_DEV_INITRD=y | 103 | CONFIG_BLK_DEV_INITRD=y |
| @@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 111 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 112 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 113 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 115 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 116 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -123,7 +118,7 @@ CONFIG_BUG=y | |||
| 123 | CONFIG_ELF_CORE=y | 118 | CONFIG_ELF_CORE=y |
| 124 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
| 125 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
| 126 | # CONFIG_EPOLL is not set | 121 | CONFIG_EPOLL=y |
| 127 | CONFIG_SIGNALFD=y | 122 | CONFIG_SIGNALFD=y |
| 128 | CONFIG_TIMERFD=y | 123 | CONFIG_TIMERFD=y |
| 129 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
| @@ -322,6 +317,7 @@ CONFIG_ISA_DMA_API=y | |||
| 322 | # Bus options | 317 | # Bus options |
| 323 | # | 318 | # |
| 324 | CONFIG_ZONE_DMA=y | 319 | CONFIG_ZONE_DMA=y |
| 320 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 325 | CONFIG_GENERIC_ISA_DMA=y | 321 | CONFIG_GENERIC_ISA_DMA=y |
| 326 | CONFIG_PPC_INDIRECT_PCI=y | 322 | CONFIG_PPC_INDIRECT_PCI=y |
| 327 | CONFIG_FSL_SOC=y | 323 | CONFIG_FSL_SOC=y |
| @@ -333,7 +329,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 333 | # CONFIG_PCIEPORTBUS is not set | 329 | # CONFIG_PCIEPORTBUS is not set |
| 334 | CONFIG_ARCH_SUPPORTS_MSI=y | 330 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 335 | # CONFIG_PCI_MSI is not set | 331 | # CONFIG_PCI_MSI is not set |
| 336 | # CONFIG_PCI_LEGACY is not set | ||
| 337 | # CONFIG_PCI_STUB is not set | 332 | # CONFIG_PCI_STUB is not set |
| 338 | # CONFIG_PCI_IOV is not set | 333 | # CONFIG_PCI_IOV is not set |
| 339 | # CONFIG_PCCARD is not set | 334 | # CONFIG_PCCARD is not set |
| @@ -359,7 +354,6 @@ CONFIG_NET=y | |||
| 359 | # Networking options | 354 | # Networking options |
| 360 | # | 355 | # |
| 361 | CONFIG_PACKET=y | 356 | CONFIG_PACKET=y |
| 362 | # CONFIG_PACKET_MMAP is not set | ||
| 363 | CONFIG_UNIX=y | 357 | CONFIG_UNIX=y |
| 364 | CONFIG_XFRM=y | 358 | CONFIG_XFRM=y |
| 365 | CONFIG_XFRM_USER=m | 359 | CONFIG_XFRM_USER=m |
| @@ -537,6 +531,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 537 | # UBI - Unsorted block images | 531 | # UBI - Unsorted block images |
| 538 | # | 532 | # |
| 539 | # CONFIG_MTD_UBI is not set | 533 | # CONFIG_MTD_UBI is not set |
| 534 | CONFIG_OF_FLATTREE=y | ||
| 535 | CONFIG_OF_DYNAMIC=y | ||
| 540 | CONFIG_OF_DEVICE=y | 536 | CONFIG_OF_DEVICE=y |
| 541 | CONFIG_OF_I2C=y | 537 | CONFIG_OF_I2C=y |
| 542 | CONFIG_OF_MDIO=y | 538 | CONFIG_OF_MDIO=y |
| @@ -573,6 +569,7 @@ CONFIG_MISC_DEVICES=y | |||
| 573 | # CONFIG_ENCLOSURE_SERVICES is not set | 569 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 574 | # CONFIG_HP_ILO is not set | 570 | # CONFIG_HP_ILO is not set |
| 575 | # CONFIG_ISL29003 is not set | 571 | # CONFIG_ISL29003 is not set |
| 572 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 576 | # CONFIG_DS1682 is not set | 573 | # CONFIG_DS1682 is not set |
| 577 | # CONFIG_C2PORT is not set | 574 | # CONFIG_C2PORT is not set |
| 578 | 575 | ||
| @@ -590,6 +587,7 @@ CONFIG_HAVE_IDE=y | |||
| 590 | # | 587 | # |
| 591 | # SCSI device support | 588 | # SCSI device support |
| 592 | # | 589 | # |
| 590 | CONFIG_SCSI_MOD=y | ||
| 593 | # CONFIG_RAID_ATTRS is not set | 591 | # CONFIG_RAID_ATTRS is not set |
| 594 | CONFIG_SCSI=y | 592 | CONFIG_SCSI=y |
| 595 | CONFIG_SCSI_DMA=y | 593 | CONFIG_SCSI_DMA=y |
| @@ -812,6 +810,7 @@ CONFIG_SERIAL_CORE=y | |||
| 812 | CONFIG_SERIAL_CORE_CONSOLE=y | 810 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 813 | # CONFIG_SERIAL_JSM is not set | 811 | # CONFIG_SERIAL_JSM is not set |
| 814 | # CONFIG_SERIAL_OF_PLATFORM is not set | 812 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 813 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 815 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 814 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 816 | CONFIG_UNIX98_PTYS=y | 815 | CONFIG_UNIX98_PTYS=y |
| 817 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 816 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -862,6 +861,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 862 | CONFIG_I2C_MPC=y | 861 | CONFIG_I2C_MPC=y |
| 863 | # CONFIG_I2C_OCORES is not set | 862 | # CONFIG_I2C_OCORES is not set |
| 864 | # CONFIG_I2C_SIMTEC is not set | 863 | # CONFIG_I2C_SIMTEC is not set |
| 864 | # CONFIG_I2C_XILINX is not set | ||
| 865 | 865 | ||
| 866 | # | 866 | # |
| 867 | # External I2C/SMBus adapter drivers | 867 | # External I2C/SMBus adapter drivers |
| @@ -875,15 +875,9 @@ CONFIG_I2C_MPC=y | |||
| 875 | # | 875 | # |
| 876 | # CONFIG_I2C_PCA_PLATFORM is not set | 876 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 877 | # CONFIG_I2C_STUB is not set | 877 | # CONFIG_I2C_STUB is not set |
| 878 | |||
| 879 | # | ||
| 880 | # Miscellaneous I2C Chip support | ||
| 881 | # | ||
| 882 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 883 | # CONFIG_I2C_DEBUG_CORE is not set | 878 | # CONFIG_I2C_DEBUG_CORE is not set |
| 884 | # CONFIG_I2C_DEBUG_ALGO is not set | 879 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 885 | # CONFIG_I2C_DEBUG_BUS is not set | 880 | # CONFIG_I2C_DEBUG_BUS is not set |
| 886 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 887 | # CONFIG_SPI is not set | 881 | # CONFIG_SPI is not set |
| 888 | 882 | ||
| 889 | # | 883 | # |
| @@ -909,10 +903,11 @@ CONFIG_HWMON=y | |||
| 909 | # CONFIG_SENSORS_ADM1029 is not set | 903 | # CONFIG_SENSORS_ADM1029 is not set |
| 910 | # CONFIG_SENSORS_ADM1031 is not set | 904 | # CONFIG_SENSORS_ADM1031 is not set |
| 911 | # CONFIG_SENSORS_ADM9240 is not set | 905 | # CONFIG_SENSORS_ADM9240 is not set |
| 906 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 912 | # CONFIG_SENSORS_ADT7462 is not set | 907 | # CONFIG_SENSORS_ADT7462 is not set |
| 913 | # CONFIG_SENSORS_ADT7470 is not set | 908 | # CONFIG_SENSORS_ADT7470 is not set |
| 914 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 915 | # CONFIG_SENSORS_ADT7475 is not set | 909 | # CONFIG_SENSORS_ADT7475 is not set |
| 910 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 916 | # CONFIG_SENSORS_ATXP1 is not set | 911 | # CONFIG_SENSORS_ATXP1 is not set |
| 917 | # CONFIG_SENSORS_DS1621 is not set | 912 | # CONFIG_SENSORS_DS1621 is not set |
| 918 | # CONFIG_SENSORS_I5K_AMB is not set | 913 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -949,6 +944,7 @@ CONFIG_HWMON=y | |||
| 949 | # CONFIG_SENSORS_SMSC47M192 is not set | 944 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 950 | # CONFIG_SENSORS_SMSC47B397 is not set | 945 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 951 | # CONFIG_SENSORS_ADS7828 is not set | 946 | # CONFIG_SENSORS_ADS7828 is not set |
| 947 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 952 | # CONFIG_SENSORS_THMC50 is not set | 948 | # CONFIG_SENSORS_THMC50 is not set |
| 953 | # CONFIG_SENSORS_TMP401 is not set | 949 | # CONFIG_SENSORS_TMP401 is not set |
| 954 | # CONFIG_SENSORS_TMP421 is not set | 950 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -996,18 +992,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 996 | # Multifunction device drivers | 992 | # Multifunction device drivers |
| 997 | # | 993 | # |
| 998 | # CONFIG_MFD_CORE is not set | 994 | # CONFIG_MFD_CORE is not set |
| 995 | # CONFIG_MFD_88PM860X is not set | ||
| 999 | # CONFIG_MFD_SM501 is not set | 996 | # CONFIG_MFD_SM501 is not set |
| 1000 | # CONFIG_HTC_PASIC3 is not set | 997 | # CONFIG_HTC_PASIC3 is not set |
| 1001 | # CONFIG_TWL4030_CORE is not set | 998 | # CONFIG_TWL4030_CORE is not set |
| 1002 | # CONFIG_MFD_TMIO is not set | 999 | # CONFIG_MFD_TMIO is not set |
| 1003 | # CONFIG_PMIC_DA903X is not set | 1000 | # CONFIG_PMIC_DA903X is not set |
| 1004 | # CONFIG_PMIC_ADP5520 is not set | 1001 | # CONFIG_PMIC_ADP5520 is not set |
| 1002 | # CONFIG_MFD_MAX8925 is not set | ||
| 1005 | # CONFIG_MFD_WM8400 is not set | 1003 | # CONFIG_MFD_WM8400 is not set |
| 1006 | # CONFIG_MFD_WM831X is not set | 1004 | # CONFIG_MFD_WM831X is not set |
| 1007 | # CONFIG_MFD_WM8350_I2C is not set | 1005 | # CONFIG_MFD_WM8350_I2C is not set |
| 1006 | # CONFIG_MFD_WM8994 is not set | ||
| 1008 | # CONFIG_MFD_PCF50633 is not set | 1007 | # CONFIG_MFD_PCF50633 is not set |
| 1009 | # CONFIG_AB3100_CORE is not set | 1008 | # CONFIG_AB3100_CORE is not set |
| 1010 | # CONFIG_MFD_88PM8607 is not set | 1009 | # CONFIG_LPC_SCH is not set |
| 1011 | # CONFIG_REGULATOR is not set | 1010 | # CONFIG_REGULATOR is not set |
| 1012 | # CONFIG_MEDIA_SUPPORT is not set | 1011 | # CONFIG_MEDIA_SUPPORT is not set |
| 1013 | 1012 | ||
| @@ -1016,6 +1015,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1016 | # | 1015 | # |
| 1017 | # CONFIG_AGP is not set | 1016 | # CONFIG_AGP is not set |
| 1018 | CONFIG_VGA_ARB=y | 1017 | CONFIG_VGA_ARB=y |
| 1018 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1019 | # CONFIG_DRM is not set | 1019 | # CONFIG_DRM is not set |
| 1020 | # CONFIG_VGASTATE is not set | 1020 | # CONFIG_VGASTATE is not set |
| 1021 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1021 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1140,7 +1140,6 @@ CONFIG_USB_STORAGE=y | |||
| 1140 | # CONFIG_USB_RIO500 is not set | 1140 | # CONFIG_USB_RIO500 is not set |
| 1141 | # CONFIG_USB_LEGOTOWER is not set | 1141 | # CONFIG_USB_LEGOTOWER is not set |
| 1142 | # CONFIG_USB_LCD is not set | 1142 | # CONFIG_USB_LCD is not set |
| 1143 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1144 | # CONFIG_USB_LED is not set | 1143 | # CONFIG_USB_LED is not set |
| 1145 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1144 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1146 | # CONFIG_USB_CYTHERM is not set | 1145 | # CONFIG_USB_CYTHERM is not set |
| @@ -1153,7 +1152,6 @@ CONFIG_USB_STORAGE=y | |||
| 1153 | # CONFIG_USB_IOWARRIOR is not set | 1152 | # CONFIG_USB_IOWARRIOR is not set |
| 1154 | # CONFIG_USB_TEST is not set | 1153 | # CONFIG_USB_TEST is not set |
| 1155 | # CONFIG_USB_ISIGHTFW is not set | 1154 | # CONFIG_USB_ISIGHTFW is not set |
| 1156 | # CONFIG_USB_VST is not set | ||
| 1157 | # CONFIG_USB_GADGET is not set | 1155 | # CONFIG_USB_GADGET is not set |
| 1158 | 1156 | ||
| 1159 | # | 1157 | # |
| @@ -1245,6 +1243,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1245 | # CONFIG_BFS_FS is not set | 1243 | # CONFIG_BFS_FS is not set |
| 1246 | # CONFIG_EFS_FS is not set | 1244 | # CONFIG_EFS_FS is not set |
| 1247 | # CONFIG_JFFS2_FS is not set | 1245 | # CONFIG_JFFS2_FS is not set |
| 1246 | # CONFIG_LOGFS is not set | ||
| 1248 | # CONFIG_CRAMFS is not set | 1247 | # CONFIG_CRAMFS is not set |
| 1249 | # CONFIG_SQUASHFS is not set | 1248 | # CONFIG_SQUASHFS is not set |
| 1250 | # CONFIG_VXFS_FS is not set | 1249 | # CONFIG_VXFS_FS is not set |
| @@ -1271,6 +1270,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1271 | CONFIG_RPCSEC_GSS_KRB5=y | 1270 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1272 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1271 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1273 | # CONFIG_SMB_FS is not set | 1272 | # CONFIG_SMB_FS is not set |
| 1273 | # CONFIG_CEPH_FS is not set | ||
| 1274 | # CONFIG_CIFS is not set | 1274 | # CONFIG_CIFS is not set |
| 1275 | # CONFIG_NCP_FS is not set | 1275 | # CONFIG_NCP_FS is not set |
| 1276 | # CONFIG_CODA_FS is not set | 1276 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 21dad38b156f..f67a8d1cd0b0 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:26 2010 | 4 | # Mon Apr 19 23:16:50 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -99,10 +103,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 99 | # CONFIG_TREE_RCU_TRACE is not set | 103 | # CONFIG_TREE_RCU_TRACE is not set |
| 100 | # CONFIG_IKCONFIG is not set | 104 | # CONFIG_IKCONFIG is not set |
| 101 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 102 | # CONFIG_GROUP_SCHED is not set | ||
| 103 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 104 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 105 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 106 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 107 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 108 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -110,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 110 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 111 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 112 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 113 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 114 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 115 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -315,6 +318,7 @@ CONFIG_ISA_DMA_API=y | |||
| 315 | # Bus options | 318 | # Bus options |
| 316 | # | 319 | # |
| 317 | CONFIG_ZONE_DMA=y | 320 | CONFIG_ZONE_DMA=y |
| 321 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 318 | CONFIG_FSL_SOC=y | 322 | CONFIG_FSL_SOC=y |
| 319 | CONFIG_PPC_PCI_CHOICE=y | 323 | CONFIG_PPC_PCI_CHOICE=y |
| 320 | # CONFIG_PCI is not set | 324 | # CONFIG_PCI is not set |
| @@ -345,7 +349,6 @@ CONFIG_NET=y | |||
| 345 | # Networking options | 349 | # Networking options |
| 346 | # | 350 | # |
| 347 | CONFIG_PACKET=y | 351 | CONFIG_PACKET=y |
| 348 | # CONFIG_PACKET_MMAP is not set | ||
| 349 | CONFIG_UNIX=y | 352 | CONFIG_UNIX=y |
| 350 | CONFIG_XFRM=y | 353 | CONFIG_XFRM=y |
| 351 | # CONFIG_XFRM_USER is not set | 354 | # CONFIG_XFRM_USER is not set |
| @@ -522,6 +525,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 522 | # UBI - Unsorted block images | 525 | # UBI - Unsorted block images |
| 523 | # | 526 | # |
| 524 | # CONFIG_MTD_UBI is not set | 527 | # CONFIG_MTD_UBI is not set |
| 528 | CONFIG_OF_FLATTREE=y | ||
| 529 | CONFIG_OF_DYNAMIC=y | ||
| 525 | CONFIG_OF_DEVICE=y | 530 | CONFIG_OF_DEVICE=y |
| 526 | CONFIG_OF_GPIO=y | 531 | CONFIG_OF_GPIO=y |
| 527 | CONFIG_OF_MDIO=y | 532 | CONFIG_OF_MDIO=y |
| @@ -575,6 +580,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 575 | # | 580 | # |
| 576 | # SCSI device support | 581 | # SCSI device support |
| 577 | # | 582 | # |
| 583 | CONFIG_SCSI_MOD=y | ||
| 578 | # CONFIG_RAID_ATTRS is not set | 584 | # CONFIG_RAID_ATTRS is not set |
| 579 | # CONFIG_SCSI is not set | 585 | # CONFIG_SCSI is not set |
| 580 | # CONFIG_SCSI_DMA is not set | 586 | # CONFIG_SCSI_DMA is not set |
| @@ -701,6 +707,7 @@ CONFIG_SERIAL_CORE=y | |||
| 701 | CONFIG_SERIAL_CORE_CONSOLE=y | 707 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 702 | CONFIG_SERIAL_CPM=y | 708 | CONFIG_SERIAL_CPM=y |
| 703 | CONFIG_SERIAL_CPM_CONSOLE=y | 709 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 710 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 704 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 711 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 705 | CONFIG_UNIX98_PTYS=y | 712 | CONFIG_UNIX98_PTYS=y |
| 706 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 713 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -732,6 +739,7 @@ CONFIG_GPIOLIB=y | |||
| 732 | # | 739 | # |
| 733 | # Memory mapped GPIO expanders: | 740 | # Memory mapped GPIO expanders: |
| 734 | # | 741 | # |
| 742 | # CONFIG_GPIO_IT8761E is not set | ||
| 735 | # CONFIG_GPIO_XILINX is not set | 743 | # CONFIG_GPIO_XILINX is not set |
| 736 | 744 | ||
| 737 | # | 745 | # |
| @@ -915,6 +923,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 915 | # CONFIG_BFS_FS is not set | 923 | # CONFIG_BFS_FS is not set |
| 916 | # CONFIG_EFS_FS is not set | 924 | # CONFIG_EFS_FS is not set |
| 917 | # CONFIG_JFFS2_FS is not set | 925 | # CONFIG_JFFS2_FS is not set |
| 926 | # CONFIG_LOGFS is not set | ||
| 918 | # CONFIG_CRAMFS is not set | 927 | # CONFIG_CRAMFS is not set |
| 919 | # CONFIG_SQUASHFS is not set | 928 | # CONFIG_SQUASHFS is not set |
| 920 | # CONFIG_VXFS_FS is not set | 929 | # CONFIG_VXFS_FS is not set |
| @@ -937,6 +946,7 @@ CONFIG_SUNRPC=y | |||
| 937 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 946 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 938 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 947 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 939 | # CONFIG_SMB_FS is not set | 948 | # CONFIG_SMB_FS is not set |
| 949 | # CONFIG_CEPH_FS is not set | ||
| 940 | # CONFIG_CIFS is not set | 950 | # CONFIG_CIFS is not set |
| 941 | # CONFIG_NCP_FS is not set | 951 | # CONFIG_NCP_FS is not set |
| 942 | # CONFIG_CODA_FS is not set | 952 | # CONFIG_CODA_FS is not set |
| @@ -1036,6 +1046,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 1036 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1046 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1037 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1047 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1038 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 1048 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 1049 | # CONFIG_LKDTM is not set | ||
| 1039 | # CONFIG_FAULT_INJECTION is not set | 1050 | # CONFIG_FAULT_INJECTION is not set |
| 1040 | # CONFIG_LATENCYTOP is not set | 1051 | # CONFIG_LATENCYTOP is not set |
| 1041 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1052 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index 5db54cd274c6..61b122a25cdb 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:27 2010 | 4 | # Mon Apr 19 23:16:51 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -316,6 +315,7 @@ CONFIG_ISA_DMA_API=y | |||
| 316 | # Bus options | 315 | # Bus options |
| 317 | # | 316 | # |
| 318 | CONFIG_ZONE_DMA=y | 317 | CONFIG_ZONE_DMA=y |
| 318 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 319 | CONFIG_FSL_SOC=y | 319 | CONFIG_FSL_SOC=y |
| 320 | CONFIG_PPC_PCI_CHOICE=y | 320 | CONFIG_PPC_PCI_CHOICE=y |
| 321 | # CONFIG_PCI is not set | 321 | # CONFIG_PCI is not set |
| @@ -346,7 +346,6 @@ CONFIG_NET=y | |||
| 346 | # Networking options | 346 | # Networking options |
| 347 | # | 347 | # |
| 348 | CONFIG_PACKET=y | 348 | CONFIG_PACKET=y |
| 349 | # CONFIG_PACKET_MMAP is not set | ||
| 350 | CONFIG_UNIX=y | 349 | CONFIG_UNIX=y |
| 351 | CONFIG_XFRM=y | 350 | CONFIG_XFRM=y |
| 352 | CONFIG_XFRM_USER=y | 351 | CONFIG_XFRM_USER=y |
| @@ -443,6 +442,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 443 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
| 444 | # CONFIG_CONNECTOR is not set | 443 | # CONFIG_CONNECTOR is not set |
| 445 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
| 445 | CONFIG_OF_FLATTREE=y | ||
| 446 | CONFIG_OF_DYNAMIC=y | ||
| 446 | CONFIG_OF_DEVICE=y | 447 | CONFIG_OF_DEVICE=y |
| 447 | CONFIG_OF_MDIO=y | 448 | CONFIG_OF_MDIO=y |
| 448 | # CONFIG_PARPORT is not set | 449 | # CONFIG_PARPORT is not set |
| @@ -477,6 +478,7 @@ CONFIG_HAVE_IDE=y | |||
| 477 | # | 478 | # |
| 478 | # SCSI device support | 479 | # SCSI device support |
| 479 | # | 480 | # |
| 481 | CONFIG_SCSI_MOD=y | ||
| 480 | # CONFIG_RAID_ATTRS is not set | 482 | # CONFIG_RAID_ATTRS is not set |
| 481 | # CONFIG_SCSI is not set | 483 | # CONFIG_SCSI is not set |
| 482 | # CONFIG_SCSI_DMA is not set | 484 | # CONFIG_SCSI_DMA is not set |
| @@ -602,6 +604,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 602 | CONFIG_SERIAL_CORE=y | 604 | CONFIG_SERIAL_CORE=y |
| 603 | CONFIG_SERIAL_CORE_CONSOLE=y | 605 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 604 | # CONFIG_SERIAL_OF_PLATFORM is not set | 606 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 607 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 605 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 608 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 606 | CONFIG_UNIX98_PTYS=y | 609 | CONFIG_UNIX98_PTYS=y |
| 607 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 610 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -788,6 +791,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 788 | # CONFIG_BEFS_FS is not set | 791 | # CONFIG_BEFS_FS is not set |
| 789 | # CONFIG_BFS_FS is not set | 792 | # CONFIG_BFS_FS is not set |
| 790 | # CONFIG_EFS_FS is not set | 793 | # CONFIG_EFS_FS is not set |
| 794 | # CONFIG_LOGFS is not set | ||
| 791 | # CONFIG_CRAMFS is not set | 795 | # CONFIG_CRAMFS is not set |
| 792 | # CONFIG_SQUASHFS is not set | 796 | # CONFIG_SQUASHFS is not set |
| 793 | # CONFIG_VXFS_FS is not set | 797 | # CONFIG_VXFS_FS is not set |
| @@ -810,6 +814,7 @@ CONFIG_SUNRPC=y | |||
| 810 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 814 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 811 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 815 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 812 | # CONFIG_SMB_FS is not set | 816 | # CONFIG_SMB_FS is not set |
| 817 | # CONFIG_CEPH_FS is not set | ||
| 813 | # CONFIG_CIFS is not set | 818 | # CONFIG_CIFS is not set |
| 814 | # CONFIG_NCP_FS is not set | 819 | # CONFIG_NCP_FS is not set |
| 815 | # CONFIG_CODA_FS is not set | 820 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index 76c7018c5cd2..a5ceaa4b5e42 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:28 2010 | 4 | # Mon Apr 19 23:16:52 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -99,14 +103,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 99 | # CONFIG_TREE_RCU_TRACE is not set | 103 | # CONFIG_TREE_RCU_TRACE is not set |
| 100 | # CONFIG_IKCONFIG is not set | 104 | # CONFIG_IKCONFIG is not set |
| 101 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 102 | CONFIG_GROUP_SCHED=y | ||
| 103 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 104 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 105 | CONFIG_USER_SCHED=y | ||
| 106 | # CONFIG_CGROUP_SCHED is not set | ||
| 107 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 108 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 109 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 110 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 111 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 112 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -114,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 114 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 115 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 116 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 117 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 118 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 119 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -319,6 +318,7 @@ CONFIG_ISA_DMA_API=y | |||
| 319 | # Bus options | 318 | # Bus options |
| 320 | # | 319 | # |
| 321 | CONFIG_ZONE_DMA=y | 320 | CONFIG_ZONE_DMA=y |
| 321 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 322 | CONFIG_PPC_INDIRECT_PCI=y | 322 | CONFIG_PPC_INDIRECT_PCI=y |
| 323 | CONFIG_FSL_SOC=y | 323 | CONFIG_FSL_SOC=y |
| 324 | CONFIG_FSL_PCI=y | 324 | CONFIG_FSL_PCI=y |
| @@ -329,7 +329,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 329 | # CONFIG_PCIEPORTBUS is not set | 329 | # CONFIG_PCIEPORTBUS is not set |
| 330 | CONFIG_ARCH_SUPPORTS_MSI=y | 330 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 331 | # CONFIG_PCI_MSI is not set | 331 | # CONFIG_PCI_MSI is not set |
| 332 | # CONFIG_PCI_LEGACY is not set | ||
| 333 | CONFIG_PCI_DEBUG=y | 332 | CONFIG_PCI_DEBUG=y |
| 334 | # CONFIG_PCI_STUB is not set | 333 | # CONFIG_PCI_STUB is not set |
| 335 | # CONFIG_PCI_IOV is not set | 334 | # CONFIG_PCI_IOV is not set |
| @@ -358,7 +357,6 @@ CONFIG_NET=y | |||
| 358 | # Networking options | 357 | # Networking options |
| 359 | # | 358 | # |
| 360 | CONFIG_PACKET=y | 359 | CONFIG_PACKET=y |
| 361 | # CONFIG_PACKET_MMAP is not set | ||
| 362 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 363 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 364 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| @@ -455,6 +453,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 455 | # CONFIG_SYS_HYPERVISOR is not set | 453 | # CONFIG_SYS_HYPERVISOR is not set |
| 456 | # CONFIG_CONNECTOR is not set | 454 | # CONFIG_CONNECTOR is not set |
| 457 | # CONFIG_MTD is not set | 455 | # CONFIG_MTD is not set |
| 456 | CONFIG_OF_FLATTREE=y | ||
| 457 | CONFIG_OF_DYNAMIC=y | ||
| 458 | CONFIG_OF_DEVICE=y | 458 | CONFIG_OF_DEVICE=y |
| 459 | CONFIG_OF_GPIO=y | 459 | CONFIG_OF_GPIO=y |
| 460 | CONFIG_OF_MDIO=y | 460 | CONFIG_OF_MDIO=y |
| @@ -500,6 +500,7 @@ CONFIG_HAVE_IDE=y | |||
| 500 | # | 500 | # |
| 501 | # SCSI device support | 501 | # SCSI device support |
| 502 | # | 502 | # |
| 503 | CONFIG_SCSI_MOD=y | ||
| 503 | # CONFIG_RAID_ATTRS is not set | 504 | # CONFIG_RAID_ATTRS is not set |
| 504 | # CONFIG_SCSI is not set | 505 | # CONFIG_SCSI is not set |
| 505 | # CONFIG_SCSI_DMA is not set | 506 | # CONFIG_SCSI_DMA is not set |
| @@ -609,6 +610,8 @@ CONFIG_NETDEV_10000=y | |||
| 609 | # CONFIG_CHELSIO_T1 is not set | 610 | # CONFIG_CHELSIO_T1 is not set |
| 610 | CONFIG_CHELSIO_T3_DEPENDS=y | 611 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 611 | # CONFIG_CHELSIO_T3 is not set | 612 | # CONFIG_CHELSIO_T3 is not set |
| 613 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 614 | # CONFIG_CHELSIO_T4 is not set | ||
| 612 | # CONFIG_ENIC is not set | 615 | # CONFIG_ENIC is not set |
| 613 | # CONFIG_IXGBE is not set | 616 | # CONFIG_IXGBE is not set |
| 614 | # CONFIG_IXGB is not set | 617 | # CONFIG_IXGB is not set |
| @@ -621,6 +624,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 621 | # CONFIG_MLX4_CORE is not set | 624 | # CONFIG_MLX4_CORE is not set |
| 622 | # CONFIG_TEHUTI is not set | 625 | # CONFIG_TEHUTI is not set |
| 623 | # CONFIG_BNX2X is not set | 626 | # CONFIG_BNX2X is not set |
| 627 | # CONFIG_QLCNIC is not set | ||
| 624 | # CONFIG_QLGE is not set | 628 | # CONFIG_QLGE is not set |
| 625 | # CONFIG_SFC is not set | 629 | # CONFIG_SFC is not set |
| 626 | # CONFIG_BE2NET is not set | 630 | # CONFIG_BE2NET is not set |
| @@ -700,6 +704,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 700 | CONFIG_SERIAL_CPM=y | 704 | CONFIG_SERIAL_CPM=y |
| 701 | CONFIG_SERIAL_CPM_CONSOLE=y | 705 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 702 | # CONFIG_SERIAL_JSM is not set | 706 | # CONFIG_SERIAL_JSM is not set |
| 707 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 703 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 708 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 704 | CONFIG_UNIX98_PTYS=y | 709 | CONFIG_UNIX98_PTYS=y |
| 705 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 710 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -733,7 +738,9 @@ CONFIG_GPIOLIB=y | |||
| 733 | # | 738 | # |
| 734 | # Memory mapped GPIO expanders: | 739 | # Memory mapped GPIO expanders: |
| 735 | # | 740 | # |
| 741 | # CONFIG_GPIO_IT8761E is not set | ||
| 736 | # CONFIG_GPIO_XILINX is not set | 742 | # CONFIG_GPIO_XILINX is not set |
| 743 | # CONFIG_GPIO_SCH is not set | ||
| 737 | 744 | ||
| 738 | # | 745 | # |
| 739 | # I2C GPIO expanders: | 746 | # I2C GPIO expanders: |
| @@ -793,6 +800,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 793 | # CONFIG_MFD_SM501 is not set | 800 | # CONFIG_MFD_SM501 is not set |
| 794 | # CONFIG_HTC_PASIC3 is not set | 801 | # CONFIG_HTC_PASIC3 is not set |
| 795 | # CONFIG_MFD_TMIO is not set | 802 | # CONFIG_MFD_TMIO is not set |
| 803 | # CONFIG_MFD_TIMBERDALE is not set | ||
| 804 | # CONFIG_LPC_SCH is not set | ||
| 796 | # CONFIG_REGULATOR is not set | 805 | # CONFIG_REGULATOR is not set |
| 797 | # CONFIG_MEDIA_SUPPORT is not set | 806 | # CONFIG_MEDIA_SUPPORT is not set |
| 798 | 807 | ||
| @@ -801,6 +810,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 801 | # | 810 | # |
| 802 | # CONFIG_AGP is not set | 811 | # CONFIG_AGP is not set |
| 803 | CONFIG_VGA_ARB=y | 812 | CONFIG_VGA_ARB=y |
| 813 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 804 | # CONFIG_DRM is not set | 814 | # CONFIG_DRM is not set |
| 805 | # CONFIG_VGASTATE is not set | 815 | # CONFIG_VGASTATE is not set |
| 806 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 816 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -927,6 +937,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 927 | # CONFIG_BEFS_FS is not set | 937 | # CONFIG_BEFS_FS is not set |
| 928 | # CONFIG_BFS_FS is not set | 938 | # CONFIG_BFS_FS is not set |
| 929 | # CONFIG_EFS_FS is not set | 939 | # CONFIG_EFS_FS is not set |
| 940 | # CONFIG_LOGFS is not set | ||
| 930 | # CONFIG_CRAMFS is not set | 941 | # CONFIG_CRAMFS is not set |
| 931 | # CONFIG_SQUASHFS is not set | 942 | # CONFIG_SQUASHFS is not set |
| 932 | # CONFIG_VXFS_FS is not set | 943 | # CONFIG_VXFS_FS is not set |
| @@ -949,6 +960,7 @@ CONFIG_SUNRPC=y | |||
| 949 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 960 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 950 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 961 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 951 | # CONFIG_SMB_FS is not set | 962 | # CONFIG_SMB_FS is not set |
| 963 | # CONFIG_CEPH_FS is not set | ||
| 952 | # CONFIG_CIFS is not set | 964 | # CONFIG_CIFS is not set |
| 953 | # CONFIG_NCP_FS is not set | 965 | # CONFIG_NCP_FS is not set |
| 954 | # CONFIG_CODA_FS is not set | 966 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index fab8adacbf79..4adb4eba2d4f 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:29 2010 | 4 | # Mon Apr 19 23:16:53 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -317,6 +316,7 @@ CONFIG_ISA_DMA_API=y | |||
| 317 | # Bus options | 316 | # Bus options |
| 318 | # | 317 | # |
| 319 | CONFIG_ZONE_DMA=y | 318 | CONFIG_ZONE_DMA=y |
| 319 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 320 | CONFIG_PPC_INDIRECT_PCI=y | 320 | CONFIG_PPC_INDIRECT_PCI=y |
| 321 | CONFIG_FSL_SOC=y | 321 | CONFIG_FSL_SOC=y |
| 322 | CONFIG_FSL_PCI=y | 322 | CONFIG_FSL_PCI=y |
| @@ -327,7 +327,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 327 | # CONFIG_PCIEPORTBUS is not set | 327 | # CONFIG_PCIEPORTBUS is not set |
| 328 | CONFIG_ARCH_SUPPORTS_MSI=y | 328 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 329 | # CONFIG_PCI_MSI is not set | 329 | # CONFIG_PCI_MSI is not set |
| 330 | # CONFIG_PCI_LEGACY is not set | ||
| 331 | # CONFIG_PCI_DEBUG is not set | 330 | # CONFIG_PCI_DEBUG is not set |
| 332 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
| 333 | # CONFIG_PCI_IOV is not set | 332 | # CONFIG_PCI_IOV is not set |
| @@ -356,7 +355,6 @@ CONFIG_NET=y | |||
| 356 | # Networking options | 355 | # Networking options |
| 357 | # | 356 | # |
| 358 | CONFIG_PACKET=y | 357 | CONFIG_PACKET=y |
| 359 | # CONFIG_PACKET_MMAP is not set | ||
| 360 | CONFIG_UNIX=y | 358 | CONFIG_UNIX=y |
| 361 | CONFIG_XFRM=y | 359 | CONFIG_XFRM=y |
| 362 | CONFIG_XFRM_USER=y | 360 | CONFIG_XFRM_USER=y |
| @@ -453,6 +451,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 453 | # CONFIG_SYS_HYPERVISOR is not set | 451 | # CONFIG_SYS_HYPERVISOR is not set |
| 454 | # CONFIG_CONNECTOR is not set | 452 | # CONFIG_CONNECTOR is not set |
| 455 | # CONFIG_MTD is not set | 453 | # CONFIG_MTD is not set |
| 454 | CONFIG_OF_FLATTREE=y | ||
| 455 | CONFIG_OF_DYNAMIC=y | ||
| 456 | CONFIG_OF_DEVICE=y | 456 | CONFIG_OF_DEVICE=y |
| 457 | CONFIG_OF_MDIO=y | 457 | CONFIG_OF_MDIO=y |
| 458 | # CONFIG_PARPORT is not set | 458 | # CONFIG_PARPORT is not set |
| @@ -552,6 +552,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 552 | # | 552 | # |
| 553 | # SCSI device support | 553 | # SCSI device support |
| 554 | # | 554 | # |
| 555 | CONFIG_SCSI_MOD=y | ||
| 555 | # CONFIG_RAID_ATTRS is not set | 556 | # CONFIG_RAID_ATTRS is not set |
| 556 | # CONFIG_SCSI is not set | 557 | # CONFIG_SCSI is not set |
| 557 | # CONFIG_SCSI_DMA is not set | 558 | # CONFIG_SCSI_DMA is not set |
| @@ -657,6 +658,8 @@ CONFIG_NETDEV_10000=y | |||
| 657 | # CONFIG_CHELSIO_T1 is not set | 658 | # CONFIG_CHELSIO_T1 is not set |
| 658 | CONFIG_CHELSIO_T3_DEPENDS=y | 659 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 659 | # CONFIG_CHELSIO_T3 is not set | 660 | # CONFIG_CHELSIO_T3 is not set |
| 661 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 662 | # CONFIG_CHELSIO_T4 is not set | ||
| 660 | # CONFIG_ENIC is not set | 663 | # CONFIG_ENIC is not set |
| 661 | # CONFIG_IXGBE is not set | 664 | # CONFIG_IXGBE is not set |
| 662 | # CONFIG_IXGB is not set | 665 | # CONFIG_IXGB is not set |
| @@ -669,6 +672,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 669 | # CONFIG_MLX4_CORE is not set | 672 | # CONFIG_MLX4_CORE is not set |
| 670 | # CONFIG_TEHUTI is not set | 673 | # CONFIG_TEHUTI is not set |
| 671 | # CONFIG_BNX2X is not set | 674 | # CONFIG_BNX2X is not set |
| 675 | # CONFIG_QLCNIC is not set | ||
| 672 | # CONFIG_QLGE is not set | 676 | # CONFIG_QLGE is not set |
| 673 | # CONFIG_SFC is not set | 677 | # CONFIG_SFC is not set |
| 674 | # CONFIG_BE2NET is not set | 678 | # CONFIG_BE2NET is not set |
| @@ -753,6 +757,7 @@ CONFIG_SERIAL_CORE=y | |||
| 753 | CONFIG_SERIAL_CORE_CONSOLE=y | 757 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 754 | # CONFIG_SERIAL_JSM is not set | 758 | # CONFIG_SERIAL_JSM is not set |
| 755 | # CONFIG_SERIAL_OF_PLATFORM is not set | 759 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 760 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 756 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 761 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 757 | CONFIG_UNIX98_PTYS=y | 762 | CONFIG_UNIX98_PTYS=y |
| 758 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 763 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -817,6 +822,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 817 | # CONFIG_MFD_SM501 is not set | 822 | # CONFIG_MFD_SM501 is not set |
| 818 | # CONFIG_HTC_PASIC3 is not set | 823 | # CONFIG_HTC_PASIC3 is not set |
| 819 | # CONFIG_MFD_TMIO is not set | 824 | # CONFIG_MFD_TMIO is not set |
| 825 | # CONFIG_LPC_SCH is not set | ||
| 820 | # CONFIG_REGULATOR is not set | 826 | # CONFIG_REGULATOR is not set |
| 821 | # CONFIG_MEDIA_SUPPORT is not set | 827 | # CONFIG_MEDIA_SUPPORT is not set |
| 822 | 828 | ||
| @@ -825,6 +831,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 825 | # | 831 | # |
| 826 | # CONFIG_AGP is not set | 832 | # CONFIG_AGP is not set |
| 827 | CONFIG_VGA_ARB=y | 833 | CONFIG_VGA_ARB=y |
| 834 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 828 | # CONFIG_DRM is not set | 835 | # CONFIG_DRM is not set |
| 829 | # CONFIG_VGASTATE is not set | 836 | # CONFIG_VGASTATE is not set |
| 830 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 837 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -951,6 +958,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 951 | # CONFIG_BEFS_FS is not set | 958 | # CONFIG_BEFS_FS is not set |
| 952 | # CONFIG_BFS_FS is not set | 959 | # CONFIG_BFS_FS is not set |
| 953 | # CONFIG_EFS_FS is not set | 960 | # CONFIG_EFS_FS is not set |
| 961 | # CONFIG_LOGFS is not set | ||
| 954 | # CONFIG_CRAMFS is not set | 962 | # CONFIG_CRAMFS is not set |
| 955 | # CONFIG_SQUASHFS is not set | 963 | # CONFIG_SQUASHFS is not set |
| 956 | # CONFIG_VXFS_FS is not set | 964 | # CONFIG_VXFS_FS is not set |
| @@ -973,6 +981,7 @@ CONFIG_SUNRPC=y | |||
| 973 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 981 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 974 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 982 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 975 | # CONFIG_SMB_FS is not set | 983 | # CONFIG_SMB_FS is not set |
| 984 | # CONFIG_CEPH_FS is not set | ||
| 976 | # CONFIG_CIFS is not set | 985 | # CONFIG_CIFS is not set |
| 977 | # CONFIG_NCP_FS is not set | 986 | # CONFIG_NCP_FS is not set |
| 978 | # CONFIG_CODA_FS is not set | 987 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 8290385e9b94..3de8450cd551 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:29 2010 | 4 | # Mon Apr 19 23:16:54 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -314,6 +313,7 @@ CONFIG_ISA_DMA_API=y | |||
| 314 | # Bus options | 313 | # Bus options |
| 315 | # | 314 | # |
| 316 | CONFIG_ZONE_DMA=y | 315 | CONFIG_ZONE_DMA=y |
| 316 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 317 | CONFIG_PPC_INDIRECT_PCI=y | 317 | CONFIG_PPC_INDIRECT_PCI=y |
| 318 | CONFIG_FSL_SOC=y | 318 | CONFIG_FSL_SOC=y |
| 319 | CONFIG_FSL_PCI=y | 319 | CONFIG_FSL_PCI=y |
| @@ -324,7 +324,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 324 | # CONFIG_PCIEPORTBUS is not set | 324 | # CONFIG_PCIEPORTBUS is not set |
| 325 | CONFIG_ARCH_SUPPORTS_MSI=y | 325 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 326 | # CONFIG_PCI_MSI is not set | 326 | # CONFIG_PCI_MSI is not set |
| 327 | # CONFIG_PCI_LEGACY is not set | ||
| 328 | # CONFIG_PCI_STUB is not set | 327 | # CONFIG_PCI_STUB is not set |
| 329 | # CONFIG_PCI_IOV is not set | 328 | # CONFIG_PCI_IOV is not set |
| 330 | # CONFIG_PCCARD is not set | 329 | # CONFIG_PCCARD is not set |
| @@ -352,7 +351,6 @@ CONFIG_NET=y | |||
| 352 | # Networking options | 351 | # Networking options |
| 353 | # | 352 | # |
| 354 | CONFIG_PACKET=y | 353 | CONFIG_PACKET=y |
| 355 | # CONFIG_PACKET_MMAP is not set | ||
| 356 | CONFIG_UNIX=y | 354 | CONFIG_UNIX=y |
| 357 | CONFIG_XFRM=y | 355 | CONFIG_XFRM=y |
| 358 | CONFIG_XFRM_USER=y | 356 | CONFIG_XFRM_USER=y |
| @@ -447,6 +445,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 447 | # CONFIG_SYS_HYPERVISOR is not set | 445 | # CONFIG_SYS_HYPERVISOR is not set |
| 448 | # CONFIG_CONNECTOR is not set | 446 | # CONFIG_CONNECTOR is not set |
| 449 | # CONFIG_MTD is not set | 447 | # CONFIG_MTD is not set |
| 448 | CONFIG_OF_FLATTREE=y | ||
| 449 | CONFIG_OF_DYNAMIC=y | ||
| 450 | CONFIG_OF_DEVICE=y | 450 | CONFIG_OF_DEVICE=y |
| 451 | CONFIG_OF_MDIO=y | 451 | CONFIG_OF_MDIO=y |
| 452 | # CONFIG_PARPORT is not set | 452 | # CONFIG_PARPORT is not set |
| @@ -491,6 +491,7 @@ CONFIG_HAVE_IDE=y | |||
| 491 | # | 491 | # |
| 492 | # SCSI device support | 492 | # SCSI device support |
| 493 | # | 493 | # |
| 494 | CONFIG_SCSI_MOD=y | ||
| 494 | # CONFIG_RAID_ATTRS is not set | 495 | # CONFIG_RAID_ATTRS is not set |
| 495 | # CONFIG_SCSI is not set | 496 | # CONFIG_SCSI is not set |
| 496 | # CONFIG_SCSI_DMA is not set | 497 | # CONFIG_SCSI_DMA is not set |
| @@ -596,6 +597,8 @@ CONFIG_NETDEV_10000=y | |||
| 596 | # CONFIG_CHELSIO_T1 is not set | 597 | # CONFIG_CHELSIO_T1 is not set |
| 597 | CONFIG_CHELSIO_T3_DEPENDS=y | 598 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 598 | # CONFIG_CHELSIO_T3 is not set | 599 | # CONFIG_CHELSIO_T3 is not set |
| 600 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 601 | # CONFIG_CHELSIO_T4 is not set | ||
| 599 | # CONFIG_ENIC is not set | 602 | # CONFIG_ENIC is not set |
| 600 | # CONFIG_IXGBE is not set | 603 | # CONFIG_IXGBE is not set |
| 601 | # CONFIG_IXGB is not set | 604 | # CONFIG_IXGB is not set |
| @@ -608,6 +611,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 608 | # CONFIG_MLX4_CORE is not set | 611 | # CONFIG_MLX4_CORE is not set |
| 609 | # CONFIG_TEHUTI is not set | 612 | # CONFIG_TEHUTI is not set |
| 610 | # CONFIG_BNX2X is not set | 613 | # CONFIG_BNX2X is not set |
| 614 | # CONFIG_QLCNIC is not set | ||
| 611 | # CONFIG_QLGE is not set | 615 | # CONFIG_QLGE is not set |
| 612 | # CONFIG_SFC is not set | 616 | # CONFIG_SFC is not set |
| 613 | # CONFIG_BE2NET is not set | 617 | # CONFIG_BE2NET is not set |
| @@ -692,6 +696,7 @@ CONFIG_SERIAL_CORE=y | |||
| 692 | CONFIG_SERIAL_CORE_CONSOLE=y | 696 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 693 | # CONFIG_SERIAL_JSM is not set | 697 | # CONFIG_SERIAL_JSM is not set |
| 694 | # CONFIG_SERIAL_OF_PLATFORM is not set | 698 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 699 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 695 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 700 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 696 | CONFIG_UNIX98_PTYS=y | 701 | CONFIG_UNIX98_PTYS=y |
| 697 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 702 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -756,6 +761,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 756 | # CONFIG_MFD_SM501 is not set | 761 | # CONFIG_MFD_SM501 is not set |
| 757 | # CONFIG_HTC_PASIC3 is not set | 762 | # CONFIG_HTC_PASIC3 is not set |
| 758 | # CONFIG_MFD_TMIO is not set | 763 | # CONFIG_MFD_TMIO is not set |
| 764 | # CONFIG_LPC_SCH is not set | ||
| 759 | # CONFIG_REGULATOR is not set | 765 | # CONFIG_REGULATOR is not set |
| 760 | # CONFIG_MEDIA_SUPPORT is not set | 766 | # CONFIG_MEDIA_SUPPORT is not set |
| 761 | 767 | ||
| @@ -764,6 +770,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 764 | # | 770 | # |
| 765 | # CONFIG_AGP is not set | 771 | # CONFIG_AGP is not set |
| 766 | CONFIG_VGA_ARB=y | 772 | CONFIG_VGA_ARB=y |
| 773 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 767 | # CONFIG_DRM is not set | 774 | # CONFIG_DRM is not set |
| 768 | # CONFIG_VGASTATE is not set | 775 | # CONFIG_VGASTATE is not set |
| 769 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 776 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -856,6 +863,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 856 | # CONFIG_BEFS_FS is not set | 863 | # CONFIG_BEFS_FS is not set |
| 857 | # CONFIG_BFS_FS is not set | 864 | # CONFIG_BFS_FS is not set |
| 858 | # CONFIG_EFS_FS is not set | 865 | # CONFIG_EFS_FS is not set |
| 866 | # CONFIG_LOGFS is not set | ||
| 859 | # CONFIG_CRAMFS is not set | 867 | # CONFIG_CRAMFS is not set |
| 860 | # CONFIG_SQUASHFS is not set | 868 | # CONFIG_SQUASHFS is not set |
| 861 | # CONFIG_VXFS_FS is not set | 869 | # CONFIG_VXFS_FS is not set |
| @@ -878,6 +886,7 @@ CONFIG_SUNRPC=y | |||
| 878 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 886 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 879 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 887 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 880 | # CONFIG_SMB_FS is not set | 888 | # CONFIG_SMB_FS is not set |
| 889 | # CONFIG_CEPH_FS is not set | ||
| 881 | # CONFIG_CIFS is not set | 890 | # CONFIG_CIFS is not set |
| 882 | # CONFIG_NCP_FS is not set | 891 | # CONFIG_NCP_FS is not set |
| 883 | # CONFIG_CODA_FS is not set | 892 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index 2499b5ba7141..bd467fe13932 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:30 2010 | 4 | # Mon Apr 19 23:16:54 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -314,6 +313,7 @@ CONFIG_ISA_DMA_API=y | |||
| 314 | # Bus options | 313 | # Bus options |
| 315 | # | 314 | # |
| 316 | CONFIG_ZONE_DMA=y | 315 | CONFIG_ZONE_DMA=y |
| 316 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 317 | CONFIG_FSL_SOC=y | 317 | CONFIG_FSL_SOC=y |
| 318 | CONFIG_PPC_PCI_CHOICE=y | 318 | CONFIG_PPC_PCI_CHOICE=y |
| 319 | # CONFIG_PCI is not set | 319 | # CONFIG_PCI is not set |
| @@ -344,7 +344,6 @@ CONFIG_NET=y | |||
| 344 | # Networking options | 344 | # Networking options |
| 345 | # | 345 | # |
| 346 | CONFIG_PACKET=y | 346 | CONFIG_PACKET=y |
| 347 | # CONFIG_PACKET_MMAP is not set | ||
| 348 | CONFIG_UNIX=y | 347 | CONFIG_UNIX=y |
| 349 | CONFIG_XFRM=y | 348 | CONFIG_XFRM=y |
| 350 | CONFIG_XFRM_USER=y | 349 | CONFIG_XFRM_USER=y |
| @@ -441,6 +440,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 441 | # CONFIG_SYS_HYPERVISOR is not set | 440 | # CONFIG_SYS_HYPERVISOR is not set |
| 442 | # CONFIG_CONNECTOR is not set | 441 | # CONFIG_CONNECTOR is not set |
| 443 | # CONFIG_MTD is not set | 442 | # CONFIG_MTD is not set |
| 443 | CONFIG_OF_FLATTREE=y | ||
| 444 | CONFIG_OF_DYNAMIC=y | ||
| 444 | CONFIG_OF_DEVICE=y | 445 | CONFIG_OF_DEVICE=y |
| 445 | CONFIG_OF_MDIO=y | 446 | CONFIG_OF_MDIO=y |
| 446 | # CONFIG_PARPORT is not set | 447 | # CONFIG_PARPORT is not set |
| @@ -475,6 +476,7 @@ CONFIG_HAVE_IDE=y | |||
| 475 | # | 476 | # |
| 476 | # SCSI device support | 477 | # SCSI device support |
| 477 | # | 478 | # |
| 479 | CONFIG_SCSI_MOD=y | ||
| 478 | # CONFIG_RAID_ATTRS is not set | 480 | # CONFIG_RAID_ATTRS is not set |
| 479 | # CONFIG_SCSI is not set | 481 | # CONFIG_SCSI is not set |
| 480 | # CONFIG_SCSI_DMA is not set | 482 | # CONFIG_SCSI_DMA is not set |
| @@ -600,6 +602,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 600 | CONFIG_SERIAL_CORE=y | 602 | CONFIG_SERIAL_CORE=y |
| 601 | CONFIG_SERIAL_CORE_CONSOLE=y | 603 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 602 | # CONFIG_SERIAL_OF_PLATFORM is not set | 604 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 605 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 603 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 606 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 604 | CONFIG_UNIX98_PTYS=y | 607 | CONFIG_UNIX98_PTYS=y |
| 605 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 608 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -815,6 +818,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 815 | # CONFIG_BEFS_FS is not set | 818 | # CONFIG_BEFS_FS is not set |
| 816 | # CONFIG_BFS_FS is not set | 819 | # CONFIG_BFS_FS is not set |
| 817 | # CONFIG_EFS_FS is not set | 820 | # CONFIG_EFS_FS is not set |
| 821 | # CONFIG_LOGFS is not set | ||
| 818 | # CONFIG_CRAMFS is not set | 822 | # CONFIG_CRAMFS is not set |
| 819 | # CONFIG_SQUASHFS is not set | 823 | # CONFIG_SQUASHFS is not set |
| 820 | # CONFIG_VXFS_FS is not set | 824 | # CONFIG_VXFS_FS is not set |
| @@ -837,6 +841,7 @@ CONFIG_SUNRPC=y | |||
| 837 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 841 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 838 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 842 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 839 | # CONFIG_SMB_FS is not set | 843 | # CONFIG_SMB_FS is not set |
| 844 | # CONFIG_CEPH_FS is not set | ||
| 840 | # CONFIG_CIFS is not set | 845 | # CONFIG_CIFS is not set |
| 841 | # CONFIG_NCP_FS is not set | 846 | # CONFIG_NCP_FS is not set |
| 842 | # CONFIG_CODA_FS is not set | 847 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig index e2edb79cfd1a..9803e031165c 100644 --- a/arch/powerpc/configs/85xx/socrates_defconfig +++ b/arch/powerpc/configs/85xx/socrates_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:31 2010 | 4 | # Mon Apr 19 23:16:55 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=16 | 104 | CONFIG_LOG_BUF_SHIFT=16 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -319,6 +318,7 @@ CONFIG_ISA_DMA_API=y | |||
| 319 | # Bus options | 318 | # Bus options |
| 320 | # | 319 | # |
| 321 | CONFIG_ZONE_DMA=y | 320 | CONFIG_ZONE_DMA=y |
| 321 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 322 | CONFIG_PPC_INDIRECT_PCI=y | 322 | CONFIG_PPC_INDIRECT_PCI=y |
| 323 | CONFIG_FSL_SOC=y | 323 | CONFIG_FSL_SOC=y |
| 324 | CONFIG_FSL_PCI=y | 324 | CONFIG_FSL_PCI=y |
| @@ -329,7 +329,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 329 | # CONFIG_PCIEPORTBUS is not set | 329 | # CONFIG_PCIEPORTBUS is not set |
| 330 | CONFIG_ARCH_SUPPORTS_MSI=y | 330 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 331 | # CONFIG_PCI_MSI is not set | 331 | # CONFIG_PCI_MSI is not set |
| 332 | CONFIG_PCI_LEGACY=y | ||
| 333 | # CONFIG_PCI_STUB is not set | 332 | # CONFIG_PCI_STUB is not set |
| 334 | # CONFIG_PCI_IOV is not set | 333 | # CONFIG_PCI_IOV is not set |
| 335 | # CONFIG_HAS_RAPIDIO is not set | 334 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -355,7 +354,6 @@ CONFIG_NET=y | |||
| 355 | # Networking options | 354 | # Networking options |
| 356 | # | 355 | # |
| 357 | CONFIG_PACKET=y | 356 | CONFIG_PACKET=y |
| 358 | # CONFIG_PACKET_MMAP is not set | ||
| 359 | CONFIG_UNIX=y | 357 | CONFIG_UNIX=y |
| 360 | CONFIG_XFRM=y | 358 | CONFIG_XFRM=y |
| 361 | # CONFIG_XFRM_USER is not set | 359 | # CONFIG_XFRM_USER is not set |
| @@ -554,6 +552,8 @@ CONFIG_MTD_NAND_SOCRATES=y | |||
| 554 | # UBI - Unsorted block images | 552 | # UBI - Unsorted block images |
| 555 | # | 553 | # |
| 556 | # CONFIG_MTD_UBI is not set | 554 | # CONFIG_MTD_UBI is not set |
| 555 | CONFIG_OF_FLATTREE=y | ||
| 556 | CONFIG_OF_DYNAMIC=y | ||
| 557 | CONFIG_OF_DEVICE=y | 557 | CONFIG_OF_DEVICE=y |
| 558 | CONFIG_OF_I2C=y | 558 | CONFIG_OF_I2C=y |
| 559 | CONFIG_OF_SPI=y | 559 | CONFIG_OF_SPI=y |
| @@ -591,6 +591,7 @@ CONFIG_MISC_DEVICES=y | |||
| 591 | # CONFIG_ENCLOSURE_SERVICES is not set | 591 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 592 | # CONFIG_HP_ILO is not set | 592 | # CONFIG_HP_ILO is not set |
| 593 | # CONFIG_ISL29003 is not set | 593 | # CONFIG_ISL29003 is not set |
| 594 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 594 | # CONFIG_DS1682 is not set | 595 | # CONFIG_DS1682 is not set |
| 595 | # CONFIG_TI_DAC7512 is not set | 596 | # CONFIG_TI_DAC7512 is not set |
| 596 | # CONFIG_C2PORT is not set | 597 | # CONFIG_C2PORT is not set |
| @@ -610,6 +611,7 @@ CONFIG_HAVE_IDE=y | |||
| 610 | # | 611 | # |
| 611 | # SCSI device support | 612 | # SCSI device support |
| 612 | # | 613 | # |
| 614 | CONFIG_SCSI_MOD=y | ||
| 613 | # CONFIG_RAID_ATTRS is not set | 615 | # CONFIG_RAID_ATTRS is not set |
| 614 | CONFIG_SCSI=y | 616 | CONFIG_SCSI=y |
| 615 | CONFIG_SCSI_DMA=y | 617 | CONFIG_SCSI_DMA=y |
| @@ -867,6 +869,7 @@ CONFIG_SERIAL_CORE=y | |||
| 867 | CONFIG_SERIAL_CORE_CONSOLE=y | 869 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 868 | # CONFIG_SERIAL_JSM is not set | 870 | # CONFIG_SERIAL_JSM is not set |
| 869 | # CONFIG_SERIAL_OF_PLATFORM is not set | 871 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 872 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 870 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 873 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 871 | CONFIG_UNIX98_PTYS=y | 874 | CONFIG_UNIX98_PTYS=y |
| 872 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 875 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -916,6 +919,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 916 | CONFIG_I2C_MPC=y | 919 | CONFIG_I2C_MPC=y |
| 917 | # CONFIG_I2C_OCORES is not set | 920 | # CONFIG_I2C_OCORES is not set |
| 918 | # CONFIG_I2C_SIMTEC is not set | 921 | # CONFIG_I2C_SIMTEC is not set |
| 922 | # CONFIG_I2C_XILINX is not set | ||
| 919 | 923 | ||
| 920 | # | 924 | # |
| 921 | # External I2C/SMBus adapter drivers | 925 | # External I2C/SMBus adapter drivers |
| @@ -929,15 +933,9 @@ CONFIG_I2C_MPC=y | |||
| 929 | # | 933 | # |
| 930 | # CONFIG_I2C_PCA_PLATFORM is not set | 934 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 931 | # CONFIG_I2C_STUB is not set | 935 | # CONFIG_I2C_STUB is not set |
| 932 | |||
| 933 | # | ||
| 934 | # Miscellaneous I2C Chip support | ||
| 935 | # | ||
| 936 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 937 | # CONFIG_I2C_DEBUG_CORE is not set | 936 | # CONFIG_I2C_DEBUG_CORE is not set |
| 938 | # CONFIG_I2C_DEBUG_ALGO is not set | 937 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 939 | # CONFIG_I2C_DEBUG_BUS is not set | 938 | # CONFIG_I2C_DEBUG_BUS is not set |
| 940 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 941 | CONFIG_SPI=y | 939 | CONFIG_SPI=y |
| 942 | CONFIG_SPI_MASTER=y | 940 | CONFIG_SPI_MASTER=y |
| 943 | 941 | ||
| @@ -979,10 +977,11 @@ CONFIG_HWMON_DEBUG_CHIP=y | |||
| 979 | # CONFIG_SENSORS_ADM1029 is not set | 977 | # CONFIG_SENSORS_ADM1029 is not set |
| 980 | # CONFIG_SENSORS_ADM1031 is not set | 978 | # CONFIG_SENSORS_ADM1031 is not set |
| 981 | # CONFIG_SENSORS_ADM9240 is not set | 979 | # CONFIG_SENSORS_ADM9240 is not set |
| 980 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 982 | # CONFIG_SENSORS_ADT7462 is not set | 981 | # CONFIG_SENSORS_ADT7462 is not set |
| 983 | # CONFIG_SENSORS_ADT7470 is not set | 982 | # CONFIG_SENSORS_ADT7470 is not set |
| 984 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 985 | # CONFIG_SENSORS_ADT7475 is not set | 983 | # CONFIG_SENSORS_ADT7475 is not set |
| 984 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 986 | # CONFIG_SENSORS_ATXP1 is not set | 985 | # CONFIG_SENSORS_ATXP1 is not set |
| 987 | # CONFIG_SENSORS_DS1621 is not set | 986 | # CONFIG_SENSORS_DS1621 is not set |
| 988 | # CONFIG_SENSORS_I5K_AMB is not set | 987 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1021,6 +1020,7 @@ CONFIG_SENSORS_LM75=y | |||
| 1021 | # CONFIG_SENSORS_SMSC47M192 is not set | 1020 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1022 | # CONFIG_SENSORS_SMSC47B397 is not set | 1021 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1023 | # CONFIG_SENSORS_ADS7828 is not set | 1022 | # CONFIG_SENSORS_ADS7828 is not set |
| 1023 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1024 | # CONFIG_SENSORS_THMC50 is not set | 1024 | # CONFIG_SENSORS_THMC50 is not set |
| 1025 | # CONFIG_SENSORS_TMP401 is not set | 1025 | # CONFIG_SENSORS_TMP401 is not set |
| 1026 | # CONFIG_SENSORS_TMP421 is not set | 1026 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1050,21 +1050,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1050 | # Multifunction device drivers | 1050 | # Multifunction device drivers |
| 1051 | # | 1051 | # |
| 1052 | # CONFIG_MFD_CORE is not set | 1052 | # CONFIG_MFD_CORE is not set |
| 1053 | # CONFIG_MFD_88PM860X is not set | ||
| 1053 | # CONFIG_MFD_SM501 is not set | 1054 | # CONFIG_MFD_SM501 is not set |
| 1054 | # CONFIG_HTC_PASIC3 is not set | 1055 | # CONFIG_HTC_PASIC3 is not set |
| 1055 | # CONFIG_TWL4030_CORE is not set | 1056 | # CONFIG_TWL4030_CORE is not set |
| 1056 | # CONFIG_MFD_TMIO is not set | 1057 | # CONFIG_MFD_TMIO is not set |
| 1057 | # CONFIG_PMIC_DA903X is not set | 1058 | # CONFIG_PMIC_DA903X is not set |
| 1058 | # CONFIG_PMIC_ADP5520 is not set | 1059 | # CONFIG_PMIC_ADP5520 is not set |
| 1060 | # CONFIG_MFD_MAX8925 is not set | ||
| 1059 | # CONFIG_MFD_WM8400 is not set | 1061 | # CONFIG_MFD_WM8400 is not set |
| 1060 | # CONFIG_MFD_WM831X is not set | 1062 | # CONFIG_MFD_WM831X is not set |
| 1061 | # CONFIG_MFD_WM8350_I2C is not set | 1063 | # CONFIG_MFD_WM8350_I2C is not set |
| 1064 | # CONFIG_MFD_WM8994 is not set | ||
| 1062 | # CONFIG_MFD_PCF50633 is not set | 1065 | # CONFIG_MFD_PCF50633 is not set |
| 1063 | # CONFIG_MFD_MC13783 is not set | 1066 | # CONFIG_MFD_MC13783 is not set |
| 1064 | # CONFIG_AB3100_CORE is not set | 1067 | # CONFIG_AB3100_CORE is not set |
| 1065 | # CONFIG_EZX_PCAP is not set | 1068 | # CONFIG_EZX_PCAP is not set |
| 1066 | # CONFIG_MFD_88PM8607 is not set | ||
| 1067 | # CONFIG_AB4500_CORE is not set | 1069 | # CONFIG_AB4500_CORE is not set |
| 1070 | # CONFIG_LPC_SCH is not set | ||
| 1068 | # CONFIG_REGULATOR is not set | 1071 | # CONFIG_REGULATOR is not set |
| 1069 | # CONFIG_MEDIA_SUPPORT is not set | 1072 | # CONFIG_MEDIA_SUPPORT is not set |
| 1070 | 1073 | ||
| @@ -1073,6 +1076,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1073 | # | 1076 | # |
| 1074 | # CONFIG_AGP is not set | 1077 | # CONFIG_AGP is not set |
| 1075 | CONFIG_VGA_ARB=y | 1078 | CONFIG_VGA_ARB=y |
| 1079 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1076 | # CONFIG_DRM is not set | 1080 | # CONFIG_DRM is not set |
| 1077 | # CONFIG_VGASTATE is not set | 1081 | # CONFIG_VGASTATE is not set |
| 1078 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1082 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1180,6 +1184,7 @@ CONFIG_USB_HID=y | |||
| 1180 | # | 1184 | # |
| 1181 | # Special HID drivers | 1185 | # Special HID drivers |
| 1182 | # | 1186 | # |
| 1187 | # CONFIG_HID_3M_PCT is not set | ||
| 1183 | # CONFIG_HID_A4TECH is not set | 1188 | # CONFIG_HID_A4TECH is not set |
| 1184 | # CONFIG_HID_APPLE is not set | 1189 | # CONFIG_HID_APPLE is not set |
| 1185 | # CONFIG_HID_BELKIN is not set | 1190 | # CONFIG_HID_BELKIN is not set |
| @@ -1194,12 +1199,16 @@ CONFIG_USB_HID=y | |||
| 1194 | # CONFIG_HID_KENSINGTON is not set | 1199 | # CONFIG_HID_KENSINGTON is not set |
| 1195 | # CONFIG_HID_LOGITECH is not set | 1200 | # CONFIG_HID_LOGITECH is not set |
| 1196 | # CONFIG_HID_MICROSOFT is not set | 1201 | # CONFIG_HID_MICROSOFT is not set |
| 1202 | # CONFIG_HID_MOSART is not set | ||
| 1197 | # CONFIG_HID_MONTEREY is not set | 1203 | # CONFIG_HID_MONTEREY is not set |
| 1198 | # CONFIG_HID_NTRIG is not set | 1204 | # CONFIG_HID_NTRIG is not set |
| 1205 | # CONFIG_HID_ORTEK is not set | ||
| 1199 | # CONFIG_HID_PANTHERLORD is not set | 1206 | # CONFIG_HID_PANTHERLORD is not set |
| 1200 | # CONFIG_HID_PETALYNX is not set | 1207 | # CONFIG_HID_PETALYNX is not set |
| 1208 | # CONFIG_HID_QUANTA is not set | ||
| 1201 | # CONFIG_HID_SAMSUNG is not set | 1209 | # CONFIG_HID_SAMSUNG is not set |
| 1202 | # CONFIG_HID_SONY is not set | 1210 | # CONFIG_HID_SONY is not set |
| 1211 | # CONFIG_HID_STANTUM is not set | ||
| 1203 | # CONFIG_HID_SUNPLUS is not set | 1212 | # CONFIG_HID_SUNPLUS is not set |
| 1204 | # CONFIG_HID_GREENASIA is not set | 1213 | # CONFIG_HID_GREENASIA is not set |
| 1205 | # CONFIG_HID_SMARTJOYPLUS is not set | 1214 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1307,7 +1316,6 @@ CONFIG_USB_STORAGE=y | |||
| 1307 | # CONFIG_USB_RIO500 is not set | 1316 | # CONFIG_USB_RIO500 is not set |
| 1308 | # CONFIG_USB_LEGOTOWER is not set | 1317 | # CONFIG_USB_LEGOTOWER is not set |
| 1309 | # CONFIG_USB_LCD is not set | 1318 | # CONFIG_USB_LCD is not set |
| 1310 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1311 | # CONFIG_USB_LED is not set | 1319 | # CONFIG_USB_LED is not set |
| 1312 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1320 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1313 | # CONFIG_USB_CYTHERM is not set | 1321 | # CONFIG_USB_CYTHERM is not set |
| @@ -1320,7 +1328,6 @@ CONFIG_USB_STORAGE=y | |||
| 1320 | # CONFIG_USB_IOWARRIOR is not set | 1328 | # CONFIG_USB_IOWARRIOR is not set |
| 1321 | # CONFIG_USB_TEST is not set | 1329 | # CONFIG_USB_TEST is not set |
| 1322 | # CONFIG_USB_ISIGHTFW is not set | 1330 | # CONFIG_USB_ISIGHTFW is not set |
| 1323 | # CONFIG_USB_VST is not set | ||
| 1324 | # CONFIG_USB_GADGET is not set | 1331 | # CONFIG_USB_GADGET is not set |
| 1325 | 1332 | ||
| 1326 | # | 1333 | # |
| @@ -1491,6 +1498,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1491 | # CONFIG_JFFS2_LZO is not set | 1498 | # CONFIG_JFFS2_LZO is not set |
| 1492 | CONFIG_JFFS2_RTIME=y | 1499 | CONFIG_JFFS2_RTIME=y |
| 1493 | # CONFIG_JFFS2_RUBIN is not set | 1500 | # CONFIG_JFFS2_RUBIN is not set |
| 1501 | # CONFIG_LOGFS is not set | ||
| 1494 | CONFIG_CRAMFS=y | 1502 | CONFIG_CRAMFS=y |
| 1495 | # CONFIG_SQUASHFS is not set | 1503 | # CONFIG_SQUASHFS is not set |
| 1496 | # CONFIG_VXFS_FS is not set | 1504 | # CONFIG_VXFS_FS is not set |
| @@ -1515,6 +1523,7 @@ CONFIG_SUNRPC=y | |||
| 1515 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1523 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1516 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1524 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1517 | # CONFIG_SMB_FS is not set | 1525 | # CONFIG_SMB_FS is not set |
| 1526 | # CONFIG_CEPH_FS is not set | ||
| 1518 | # CONFIG_CIFS is not set | 1527 | # CONFIG_CIFS is not set |
| 1519 | # CONFIG_NCP_FS is not set | 1528 | # CONFIG_NCP_FS is not set |
| 1520 | # CONFIG_CODA_FS is not set | 1529 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index ce313259df14..880ab7aaf202 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:32 2010 | 4 | # Mon Apr 19 23:16:56 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -99,14 +103,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 99 | # CONFIG_TREE_RCU_TRACE is not set | 103 | # CONFIG_TREE_RCU_TRACE is not set |
| 100 | # CONFIG_IKCONFIG is not set | 104 | # CONFIG_IKCONFIG is not set |
| 101 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 102 | CONFIG_GROUP_SCHED=y | ||
| 103 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 104 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 105 | CONFIG_USER_SCHED=y | ||
| 106 | # CONFIG_CGROUP_SCHED is not set | ||
| 107 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 108 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 109 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 110 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 111 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 112 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -114,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 114 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 115 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 116 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 117 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 118 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 119 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -324,6 +323,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 323 | # Bus options |
| 325 | # | 324 | # |
| 326 | CONFIG_ZONE_DMA=y | 325 | CONFIG_ZONE_DMA=y |
| 326 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_PPC_INDIRECT_PCI=y | 327 | CONFIG_PPC_INDIRECT_PCI=y |
| 328 | CONFIG_FSL_SOC=y | 328 | CONFIG_FSL_SOC=y |
| 329 | CONFIG_FSL_PCI=y | 329 | CONFIG_FSL_PCI=y |
| @@ -334,7 +334,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 334 | # CONFIG_PCIEPORTBUS is not set | 334 | # CONFIG_PCIEPORTBUS is not set |
| 335 | CONFIG_ARCH_SUPPORTS_MSI=y | 335 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 336 | # CONFIG_PCI_MSI is not set | 336 | # CONFIG_PCI_MSI is not set |
| 337 | # CONFIG_PCI_LEGACY is not set | ||
| 338 | # CONFIG_PCI_DEBUG is not set | 337 | # CONFIG_PCI_DEBUG is not set |
| 339 | # CONFIG_PCI_STUB is not set | 338 | # CONFIG_PCI_STUB is not set |
| 340 | # CONFIG_PCI_IOV is not set | 339 | # CONFIG_PCI_IOV is not set |
| @@ -363,7 +362,6 @@ CONFIG_NET=y | |||
| 363 | # Networking options | 362 | # Networking options |
| 364 | # | 363 | # |
| 365 | CONFIG_PACKET=y | 364 | CONFIG_PACKET=y |
| 366 | # CONFIG_PACKET_MMAP is not set | ||
| 367 | CONFIG_UNIX=y | 365 | CONFIG_UNIX=y |
| 368 | CONFIG_XFRM=y | 366 | CONFIG_XFRM=y |
| 369 | # CONFIG_XFRM_USER is not set | 367 | # CONFIG_XFRM_USER is not set |
| @@ -520,6 +518,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 520 | # CONFIG_SYS_HYPERVISOR is not set | 518 | # CONFIG_SYS_HYPERVISOR is not set |
| 521 | # CONFIG_CONNECTOR is not set | 519 | # CONFIG_CONNECTOR is not set |
| 522 | # CONFIG_MTD is not set | 520 | # CONFIG_MTD is not set |
| 521 | CONFIG_OF_FLATTREE=y | ||
| 522 | CONFIG_OF_DYNAMIC=y | ||
| 523 | CONFIG_OF_DEVICE=y | 523 | CONFIG_OF_DEVICE=y |
| 524 | CONFIG_OF_GPIO=y | 524 | CONFIG_OF_GPIO=y |
| 525 | CONFIG_OF_I2C=m | 525 | CONFIG_OF_I2C=m |
| @@ -563,6 +563,7 @@ CONFIG_MISC_DEVICES=y | |||
| 563 | # CONFIG_ENCLOSURE_SERVICES is not set | 563 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 564 | # CONFIG_HP_ILO is not set | 564 | # CONFIG_HP_ILO is not set |
| 565 | # CONFIG_ISL29003 is not set | 565 | # CONFIG_ISL29003 is not set |
| 566 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 566 | # CONFIG_DS1682 is not set | 567 | # CONFIG_DS1682 is not set |
| 567 | # CONFIG_C2PORT is not set | 568 | # CONFIG_C2PORT is not set |
| 568 | 569 | ||
| @@ -630,6 +631,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 630 | # | 631 | # |
| 631 | # SCSI device support | 632 | # SCSI device support |
| 632 | # | 633 | # |
| 634 | CONFIG_SCSI_MOD=m | ||
| 633 | # CONFIG_RAID_ATTRS is not set | 635 | # CONFIG_RAID_ATTRS is not set |
| 634 | CONFIG_SCSI=m | 636 | CONFIG_SCSI=m |
| 635 | CONFIG_SCSI_DMA=y | 637 | CONFIG_SCSI_DMA=y |
| @@ -817,6 +819,8 @@ CONFIG_NETDEV_10000=y | |||
| 817 | # CONFIG_CHELSIO_T1 is not set | 819 | # CONFIG_CHELSIO_T1 is not set |
| 818 | CONFIG_CHELSIO_T3_DEPENDS=y | 820 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 819 | # CONFIG_CHELSIO_T3 is not set | 821 | # CONFIG_CHELSIO_T3 is not set |
| 822 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 823 | # CONFIG_CHELSIO_T4 is not set | ||
| 820 | # CONFIG_ENIC is not set | 824 | # CONFIG_ENIC is not set |
| 821 | # CONFIG_IXGBE is not set | 825 | # CONFIG_IXGBE is not set |
| 822 | # CONFIG_IXGB is not set | 826 | # CONFIG_IXGB is not set |
| @@ -829,6 +833,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 829 | # CONFIG_MLX4_CORE is not set | 833 | # CONFIG_MLX4_CORE is not set |
| 830 | # CONFIG_TEHUTI is not set | 834 | # CONFIG_TEHUTI is not set |
| 831 | # CONFIG_BNX2X is not set | 835 | # CONFIG_BNX2X is not set |
| 836 | # CONFIG_QLCNIC is not set | ||
| 832 | # CONFIG_QLGE is not set | 837 | # CONFIG_QLGE is not set |
| 833 | # CONFIG_SFC is not set | 838 | # CONFIG_SFC is not set |
| 834 | # CONFIG_BE2NET is not set | 839 | # CONFIG_BE2NET is not set |
| @@ -947,6 +952,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 947 | CONFIG_SERIAL_CPM=y | 952 | CONFIG_SERIAL_CPM=y |
| 948 | CONFIG_SERIAL_CPM_CONSOLE=y | 953 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 949 | # CONFIG_SERIAL_JSM is not set | 954 | # CONFIG_SERIAL_JSM is not set |
| 955 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 950 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 956 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 951 | CONFIG_UNIX98_PTYS=y | 957 | CONFIG_UNIX98_PTYS=y |
| 952 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 958 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1004,6 +1010,7 @@ CONFIG_I2C_ALGOBIT=m | |||
| 1004 | # CONFIG_I2C_MPC is not set | 1010 | # CONFIG_I2C_MPC is not set |
| 1005 | # CONFIG_I2C_OCORES is not set | 1011 | # CONFIG_I2C_OCORES is not set |
| 1006 | # CONFIG_I2C_SIMTEC is not set | 1012 | # CONFIG_I2C_SIMTEC is not set |
| 1013 | # CONFIG_I2C_XILINX is not set | ||
| 1007 | 1014 | ||
| 1008 | # | 1015 | # |
| 1009 | # External I2C/SMBus adapter drivers | 1016 | # External I2C/SMBus adapter drivers |
| @@ -1017,15 +1024,9 @@ CONFIG_I2C_ALGOBIT=m | |||
| 1017 | # | 1024 | # |
| 1018 | # CONFIG_I2C_PCA_PLATFORM is not set | 1025 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1019 | # CONFIG_I2C_STUB is not set | 1026 | # CONFIG_I2C_STUB is not set |
| 1020 | |||
| 1021 | # | ||
| 1022 | # Miscellaneous I2C Chip support | ||
| 1023 | # | ||
| 1024 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1025 | # CONFIG_I2C_DEBUG_CORE is not set | 1027 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1026 | # CONFIG_I2C_DEBUG_ALGO is not set | 1028 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1027 | # CONFIG_I2C_DEBUG_BUS is not set | 1029 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1028 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1029 | # CONFIG_SPI is not set | 1030 | # CONFIG_SPI is not set |
| 1030 | 1031 | ||
| 1031 | # | 1032 | # |
| @@ -1041,14 +1042,18 @@ CONFIG_GPIOLIB=y | |||
| 1041 | # | 1042 | # |
| 1042 | # Memory mapped GPIO expanders: | 1043 | # Memory mapped GPIO expanders: |
| 1043 | # | 1044 | # |
| 1045 | # CONFIG_GPIO_IT8761E is not set | ||
| 1044 | # CONFIG_GPIO_XILINX is not set | 1046 | # CONFIG_GPIO_XILINX is not set |
| 1047 | # CONFIG_GPIO_SCH is not set | ||
| 1045 | 1048 | ||
| 1046 | # | 1049 | # |
| 1047 | # I2C GPIO expanders: | 1050 | # I2C GPIO expanders: |
| 1048 | # | 1051 | # |
| 1052 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1049 | # CONFIG_GPIO_MAX732X is not set | 1053 | # CONFIG_GPIO_MAX732X is not set |
| 1050 | # CONFIG_GPIO_PCA953X is not set | 1054 | # CONFIG_GPIO_PCA953X is not set |
| 1051 | # CONFIG_GPIO_PCF857X is not set | 1055 | # CONFIG_GPIO_PCF857X is not set |
| 1056 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1052 | 1057 | ||
| 1053 | # | 1058 | # |
| 1054 | # PCI GPIO expanders: | 1059 | # PCI GPIO expanders: |
| @@ -1081,10 +1086,11 @@ CONFIG_HWMON=y | |||
| 1081 | # CONFIG_SENSORS_ADM1029 is not set | 1086 | # CONFIG_SENSORS_ADM1029 is not set |
| 1082 | # CONFIG_SENSORS_ADM1031 is not set | 1087 | # CONFIG_SENSORS_ADM1031 is not set |
| 1083 | # CONFIG_SENSORS_ADM9240 is not set | 1088 | # CONFIG_SENSORS_ADM9240 is not set |
| 1089 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1084 | # CONFIG_SENSORS_ADT7462 is not set | 1090 | # CONFIG_SENSORS_ADT7462 is not set |
| 1085 | # CONFIG_SENSORS_ADT7470 is not set | 1091 | # CONFIG_SENSORS_ADT7470 is not set |
| 1086 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1087 | # CONFIG_SENSORS_ADT7475 is not set | 1092 | # CONFIG_SENSORS_ADT7475 is not set |
| 1093 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1088 | # CONFIG_SENSORS_ATXP1 is not set | 1094 | # CONFIG_SENSORS_ATXP1 is not set |
| 1089 | # CONFIG_SENSORS_DS1621 is not set | 1095 | # CONFIG_SENSORS_DS1621 is not set |
| 1090 | # CONFIG_SENSORS_I5K_AMB is not set | 1096 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1122,6 +1128,7 @@ CONFIG_HWMON=y | |||
| 1122 | # CONFIG_SENSORS_SMSC47M192 is not set | 1128 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1123 | # CONFIG_SENSORS_SMSC47B397 is not set | 1129 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1124 | # CONFIG_SENSORS_ADS7828 is not set | 1130 | # CONFIG_SENSORS_ADS7828 is not set |
| 1131 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1125 | # CONFIG_SENSORS_THMC50 is not set | 1132 | # CONFIG_SENSORS_THMC50 is not set |
| 1126 | # CONFIG_SENSORS_TMP401 is not set | 1133 | # CONFIG_SENSORS_TMP401 is not set |
| 1127 | # CONFIG_SENSORS_TMP421 is not set | 1134 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1155,9 +1162,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1155 | # CONFIG_TPS65010 is not set | 1162 | # CONFIG_TPS65010 is not set |
| 1156 | # CONFIG_MFD_TMIO is not set | 1163 | # CONFIG_MFD_TMIO is not set |
| 1157 | # CONFIG_MFD_WM8400 is not set | 1164 | # CONFIG_MFD_WM8400 is not set |
| 1158 | # CONFIG_MFD_WM8350_I2C is not set | 1165 | # CONFIG_MFD_WM8994 is not set |
| 1159 | # CONFIG_MFD_PCF50633 is not set | 1166 | # CONFIG_MFD_PCF50633 is not set |
| 1160 | # CONFIG_AB3100_CORE is not set | 1167 | # CONFIG_MFD_TIMBERDALE is not set |
| 1168 | # CONFIG_LPC_SCH is not set | ||
| 1161 | # CONFIG_REGULATOR is not set | 1169 | # CONFIG_REGULATOR is not set |
| 1162 | # CONFIG_MEDIA_SUPPORT is not set | 1170 | # CONFIG_MEDIA_SUPPORT is not set |
| 1163 | 1171 | ||
| @@ -1166,6 +1174,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1166 | # | 1174 | # |
| 1167 | CONFIG_AGP=m | 1175 | CONFIG_AGP=m |
| 1168 | CONFIG_VGA_ARB=y | 1176 | CONFIG_VGA_ARB=y |
| 1177 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1169 | CONFIG_DRM=m | 1178 | CONFIG_DRM=m |
| 1170 | # CONFIG_DRM_TDFX is not set | 1179 | # CONFIG_DRM_TDFX is not set |
| 1171 | # CONFIG_DRM_R128 is not set | 1180 | # CONFIG_DRM_R128 is not set |
| @@ -1308,6 +1317,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1308 | # CONFIG_BEFS_FS is not set | 1317 | # CONFIG_BEFS_FS is not set |
| 1309 | # CONFIG_BFS_FS is not set | 1318 | # CONFIG_BFS_FS is not set |
| 1310 | # CONFIG_EFS_FS is not set | 1319 | # CONFIG_EFS_FS is not set |
| 1320 | # CONFIG_LOGFS is not set | ||
| 1311 | CONFIG_CRAMFS=m | 1321 | CONFIG_CRAMFS=m |
| 1312 | # CONFIG_SQUASHFS is not set | 1322 | # CONFIG_SQUASHFS is not set |
| 1313 | # CONFIG_VXFS_FS is not set | 1323 | # CONFIG_VXFS_FS is not set |
| @@ -1333,6 +1343,7 @@ CONFIG_SUNRPC=y | |||
| 1333 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1343 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1334 | CONFIG_SMB_FS=m | 1344 | CONFIG_SMB_FS=m |
| 1335 | # CONFIG_SMB_NLS_DEFAULT is not set | 1345 | # CONFIG_SMB_NLS_DEFAULT is not set |
| 1346 | # CONFIG_CEPH_FS is not set | ||
| 1336 | # CONFIG_CIFS is not set | 1347 | # CONFIG_CIFS is not set |
| 1337 | # CONFIG_NCP_FS is not set | 1348 | # CONFIG_NCP_FS is not set |
| 1338 | # CONFIG_CODA_FS is not set | 1349 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index 0824b4667229..230aa2fc0629 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:33 2010 | 4 | # Mon Apr 19 23:16:57 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -315,6 +314,7 @@ CONFIG_ISA_DMA_API=y | |||
| 315 | # Bus options | 314 | # Bus options |
| 316 | # | 315 | # |
| 317 | CONFIG_ZONE_DMA=y | 316 | CONFIG_ZONE_DMA=y |
| 317 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 318 | CONFIG_PPC_INDIRECT_PCI=y | 318 | CONFIG_PPC_INDIRECT_PCI=y |
| 319 | CONFIG_FSL_SOC=y | 319 | CONFIG_FSL_SOC=y |
| 320 | CONFIG_FSL_PCI=y | 320 | CONFIG_FSL_PCI=y |
| @@ -325,7 +325,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 325 | # CONFIG_PCIEPORTBUS is not set | 325 | # CONFIG_PCIEPORTBUS is not set |
| 326 | CONFIG_ARCH_SUPPORTS_MSI=y | 326 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 327 | # CONFIG_PCI_MSI is not set | 327 | # CONFIG_PCI_MSI is not set |
| 328 | # CONFIG_PCI_LEGACY is not set | ||
| 329 | # CONFIG_PCI_STUB is not set | 328 | # CONFIG_PCI_STUB is not set |
| 330 | # CONFIG_PCI_IOV is not set | 329 | # CONFIG_PCI_IOV is not set |
| 331 | # CONFIG_HAS_RAPIDIO is not set | 330 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -351,7 +350,6 @@ CONFIG_NET=y | |||
| 351 | # Networking options | 350 | # Networking options |
| 352 | # | 351 | # |
| 353 | CONFIG_PACKET=y | 352 | CONFIG_PACKET=y |
| 354 | # CONFIG_PACKET_MMAP is not set | ||
| 355 | CONFIG_UNIX=y | 353 | CONFIG_UNIX=y |
| 356 | CONFIG_XFRM=y | 354 | CONFIG_XFRM=y |
| 357 | # CONFIG_XFRM_USER is not set | 355 | # CONFIG_XFRM_USER is not set |
| @@ -525,6 +523,8 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 525 | # UBI - Unsorted block images | 523 | # UBI - Unsorted block images |
| 526 | # | 524 | # |
| 527 | # CONFIG_MTD_UBI is not set | 525 | # CONFIG_MTD_UBI is not set |
| 526 | CONFIG_OF_FLATTREE=y | ||
| 527 | CONFIG_OF_DYNAMIC=y | ||
| 528 | CONFIG_OF_DEVICE=y | 528 | CONFIG_OF_DEVICE=y |
| 529 | CONFIG_OF_I2C=y | 529 | CONFIG_OF_I2C=y |
| 530 | CONFIG_OF_MDIO=y | 530 | CONFIG_OF_MDIO=y |
| @@ -560,6 +560,7 @@ CONFIG_MISC_DEVICES=y | |||
| 560 | # CONFIG_ENCLOSURE_SERVICES is not set | 560 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 561 | # CONFIG_HP_ILO is not set | 561 | # CONFIG_HP_ILO is not set |
| 562 | # CONFIG_ISL29003 is not set | 562 | # CONFIG_ISL29003 is not set |
| 563 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 563 | # CONFIG_DS1682 is not set | 564 | # CONFIG_DS1682 is not set |
| 564 | # CONFIG_C2PORT is not set | 565 | # CONFIG_C2PORT is not set |
| 565 | 566 | ||
| @@ -632,6 +633,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 632 | # | 633 | # |
| 633 | # SCSI device support | 634 | # SCSI device support |
| 634 | # | 635 | # |
| 636 | CONFIG_SCSI_MOD=y | ||
| 635 | # CONFIG_RAID_ATTRS is not set | 637 | # CONFIG_RAID_ATTRS is not set |
| 636 | # CONFIG_SCSI is not set | 638 | # CONFIG_SCSI is not set |
| 637 | # CONFIG_SCSI_DMA is not set | 639 | # CONFIG_SCSI_DMA is not set |
| @@ -704,6 +706,7 @@ CONFIG_NET_PCI=y | |||
| 704 | # CONFIG_PCNET32 is not set | 706 | # CONFIG_PCNET32 is not set |
| 705 | # CONFIG_AMD8111_ETH is not set | 707 | # CONFIG_AMD8111_ETH is not set |
| 706 | # CONFIG_ADAPTEC_STARFIRE is not set | 708 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 709 | # CONFIG_KSZ884X_PCI is not set | ||
| 707 | # CONFIG_B44 is not set | 710 | # CONFIG_B44 is not set |
| 708 | # CONFIG_FORCEDETH is not set | 711 | # CONFIG_FORCEDETH is not set |
| 709 | CONFIG_E100=y | 712 | CONFIG_E100=y |
| @@ -755,6 +758,8 @@ CONFIG_NETDEV_10000=y | |||
| 755 | # CONFIG_CHELSIO_T1 is not set | 758 | # CONFIG_CHELSIO_T1 is not set |
| 756 | CONFIG_CHELSIO_T3_DEPENDS=y | 759 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 757 | # CONFIG_CHELSIO_T3 is not set | 760 | # CONFIG_CHELSIO_T3 is not set |
| 761 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 762 | # CONFIG_CHELSIO_T4 is not set | ||
| 758 | # CONFIG_ENIC is not set | 763 | # CONFIG_ENIC is not set |
| 759 | # CONFIG_IXGBE is not set | 764 | # CONFIG_IXGBE is not set |
| 760 | # CONFIG_IXGB is not set | 765 | # CONFIG_IXGB is not set |
| @@ -767,6 +772,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 767 | # CONFIG_MLX4_CORE is not set | 772 | # CONFIG_MLX4_CORE is not set |
| 768 | # CONFIG_TEHUTI is not set | 773 | # CONFIG_TEHUTI is not set |
| 769 | # CONFIG_BNX2X is not set | 774 | # CONFIG_BNX2X is not set |
| 775 | # CONFIG_QLCNIC is not set | ||
| 770 | # CONFIG_QLGE is not set | 776 | # CONFIG_QLGE is not set |
| 771 | # CONFIG_SFC is not set | 777 | # CONFIG_SFC is not set |
| 772 | # CONFIG_BE2NET is not set | 778 | # CONFIG_BE2NET is not set |
| @@ -851,6 +857,7 @@ CONFIG_SERIAL_CORE=y | |||
| 851 | CONFIG_SERIAL_CORE_CONSOLE=y | 857 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 852 | # CONFIG_SERIAL_JSM is not set | 858 | # CONFIG_SERIAL_JSM is not set |
| 853 | # CONFIG_SERIAL_OF_PLATFORM is not set | 859 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 860 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 854 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 861 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 855 | CONFIG_UNIX98_PTYS=y | 862 | CONFIG_UNIX98_PTYS=y |
| 856 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 863 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -902,6 +909,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 902 | CONFIG_I2C_MPC=y | 909 | CONFIG_I2C_MPC=y |
| 903 | # CONFIG_I2C_OCORES is not set | 910 | # CONFIG_I2C_OCORES is not set |
| 904 | # CONFIG_I2C_SIMTEC is not set | 911 | # CONFIG_I2C_SIMTEC is not set |
| 912 | # CONFIG_I2C_XILINX is not set | ||
| 905 | 913 | ||
| 906 | # | 914 | # |
| 907 | # External I2C/SMBus adapter drivers | 915 | # External I2C/SMBus adapter drivers |
| @@ -913,15 +921,9 @@ CONFIG_I2C_MPC=y | |||
| 913 | # Other I2C/SMBus bus drivers | 921 | # Other I2C/SMBus bus drivers |
| 914 | # | 922 | # |
| 915 | # CONFIG_I2C_PCA_PLATFORM is not set | 923 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 916 | |||
| 917 | # | ||
| 918 | # Miscellaneous I2C Chip support | ||
| 919 | # | ||
| 920 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 921 | # CONFIG_I2C_DEBUG_CORE is not set | 924 | # CONFIG_I2C_DEBUG_CORE is not set |
| 922 | # CONFIG_I2C_DEBUG_ALGO is not set | 925 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 923 | # CONFIG_I2C_DEBUG_BUS is not set | 926 | # CONFIG_I2C_DEBUG_BUS is not set |
| 924 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 925 | # CONFIG_SPI is not set | 927 | # CONFIG_SPI is not set |
| 926 | 928 | ||
| 927 | # | 929 | # |
| @@ -947,10 +949,11 @@ CONFIG_HWMON_DEBUG_CHIP=y | |||
| 947 | # CONFIG_SENSORS_ADM1029 is not set | 949 | # CONFIG_SENSORS_ADM1029 is not set |
| 948 | # CONFIG_SENSORS_ADM1031 is not set | 950 | # CONFIG_SENSORS_ADM1031 is not set |
| 949 | # CONFIG_SENSORS_ADM9240 is not set | 951 | # CONFIG_SENSORS_ADM9240 is not set |
| 952 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 950 | # CONFIG_SENSORS_ADT7462 is not set | 953 | # CONFIG_SENSORS_ADT7462 is not set |
| 951 | # CONFIG_SENSORS_ADT7470 is not set | 954 | # CONFIG_SENSORS_ADT7470 is not set |
| 952 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 953 | # CONFIG_SENSORS_ADT7475 is not set | 955 | # CONFIG_SENSORS_ADT7475 is not set |
| 956 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 954 | # CONFIG_SENSORS_ATXP1 is not set | 957 | # CONFIG_SENSORS_ATXP1 is not set |
| 955 | # CONFIG_SENSORS_DS1621 is not set | 958 | # CONFIG_SENSORS_DS1621 is not set |
| 956 | # CONFIG_SENSORS_I5K_AMB is not set | 959 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -987,6 +990,7 @@ CONFIG_SENSORS_LM75=y | |||
| 987 | # CONFIG_SENSORS_SMSC47M192 is not set | 990 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 988 | # CONFIG_SENSORS_SMSC47B397 is not set | 991 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 989 | # CONFIG_SENSORS_ADS7828 is not set | 992 | # CONFIG_SENSORS_ADS7828 is not set |
| 993 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 990 | # CONFIG_SENSORS_THMC50 is not set | 994 | # CONFIG_SENSORS_THMC50 is not set |
| 991 | # CONFIG_SENSORS_TMP401 is not set | 995 | # CONFIG_SENSORS_TMP401 is not set |
| 992 | # CONFIG_SENSORS_TMP421 is not set | 996 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1015,18 +1019,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1015 | # Multifunction device drivers | 1019 | # Multifunction device drivers |
| 1016 | # | 1020 | # |
| 1017 | # CONFIG_MFD_CORE is not set | 1021 | # CONFIG_MFD_CORE is not set |
| 1022 | # CONFIG_MFD_88PM860X is not set | ||
| 1018 | # CONFIG_MFD_SM501 is not set | 1023 | # CONFIG_MFD_SM501 is not set |
| 1019 | # CONFIG_HTC_PASIC3 is not set | 1024 | # CONFIG_HTC_PASIC3 is not set |
| 1020 | # CONFIG_TWL4030_CORE is not set | 1025 | # CONFIG_TWL4030_CORE is not set |
| 1021 | # CONFIG_MFD_TMIO is not set | 1026 | # CONFIG_MFD_TMIO is not set |
| 1022 | # CONFIG_PMIC_DA903X is not set | 1027 | # CONFIG_PMIC_DA903X is not set |
| 1023 | # CONFIG_PMIC_ADP5520 is not set | 1028 | # CONFIG_PMIC_ADP5520 is not set |
| 1029 | # CONFIG_MFD_MAX8925 is not set | ||
| 1024 | # CONFIG_MFD_WM8400 is not set | 1030 | # CONFIG_MFD_WM8400 is not set |
| 1025 | # CONFIG_MFD_WM831X is not set | 1031 | # CONFIG_MFD_WM831X is not set |
| 1026 | # CONFIG_MFD_WM8350_I2C is not set | 1032 | # CONFIG_MFD_WM8350_I2C is not set |
| 1033 | # CONFIG_MFD_WM8994 is not set | ||
| 1027 | # CONFIG_MFD_PCF50633 is not set | 1034 | # CONFIG_MFD_PCF50633 is not set |
| 1028 | # CONFIG_AB3100_CORE is not set | 1035 | # CONFIG_AB3100_CORE is not set |
| 1029 | # CONFIG_MFD_88PM8607 is not set | 1036 | # CONFIG_LPC_SCH is not set |
| 1030 | # CONFIG_REGULATOR is not set | 1037 | # CONFIG_REGULATOR is not set |
| 1031 | # CONFIG_MEDIA_SUPPORT is not set | 1038 | # CONFIG_MEDIA_SUPPORT is not set |
| 1032 | 1039 | ||
| @@ -1035,6 +1042,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1035 | # | 1042 | # |
| 1036 | # CONFIG_AGP is not set | 1043 | # CONFIG_AGP is not set |
| 1037 | CONFIG_VGA_ARB=y | 1044 | CONFIG_VGA_ARB=y |
| 1045 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1038 | # CONFIG_DRM is not set | 1046 | # CONFIG_DRM is not set |
| 1039 | # CONFIG_VGASTATE is not set | 1047 | # CONFIG_VGASTATE is not set |
| 1040 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1048 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1172,6 +1180,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1172 | # CONFIG_JFFS2_LZO is not set | 1180 | # CONFIG_JFFS2_LZO is not set |
| 1173 | CONFIG_JFFS2_RTIME=y | 1181 | CONFIG_JFFS2_RTIME=y |
| 1174 | # CONFIG_JFFS2_RUBIN is not set | 1182 | # CONFIG_JFFS2_RUBIN is not set |
| 1183 | # CONFIG_LOGFS is not set | ||
| 1175 | CONFIG_CRAMFS=y | 1184 | CONFIG_CRAMFS=y |
| 1176 | # CONFIG_SQUASHFS is not set | 1185 | # CONFIG_SQUASHFS is not set |
| 1177 | # CONFIG_VXFS_FS is not set | 1186 | # CONFIG_VXFS_FS is not set |
| @@ -1194,6 +1203,7 @@ CONFIG_SUNRPC=y | |||
| 1194 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1203 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1195 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1204 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1196 | # CONFIG_SMB_FS is not set | 1205 | # CONFIG_SMB_FS is not set |
| 1206 | # CONFIG_CEPH_FS is not set | ||
| 1197 | # CONFIG_CIFS is not set | 1207 | # CONFIG_CIFS is not set |
| 1198 | # CONFIG_NCP_FS is not set | 1208 | # CONFIG_NCP_FS is not set |
| 1199 | # CONFIG_CODA_FS is not set | 1209 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index 2137be4100ed..dbe04b981b87 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:34 2010 | 4 | # Mon Apr 19 23:16:58 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -99,14 +103,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 99 | # CONFIG_TREE_RCU_TRACE is not set | 103 | # CONFIG_TREE_RCU_TRACE is not set |
| 100 | # CONFIG_IKCONFIG is not set | 104 | # CONFIG_IKCONFIG is not set |
| 101 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 102 | CONFIG_GROUP_SCHED=y | ||
| 103 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 104 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 105 | CONFIG_USER_SCHED=y | ||
| 106 | # CONFIG_CGROUP_SCHED is not set | ||
| 107 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 108 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 109 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 110 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 111 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 112 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -114,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 114 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 115 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 116 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 117 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 118 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 119 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -318,6 +317,7 @@ CONFIG_ISA_DMA_API=y | |||
| 318 | # Bus options | 317 | # Bus options |
| 319 | # | 318 | # |
| 320 | CONFIG_ZONE_DMA=y | 319 | CONFIG_ZONE_DMA=y |
| 320 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 321 | CONFIG_PPC_INDIRECT_PCI=y | 321 | CONFIG_PPC_INDIRECT_PCI=y |
| 322 | CONFIG_FSL_SOC=y | 322 | CONFIG_FSL_SOC=y |
| 323 | CONFIG_FSL_PCI=y | 323 | CONFIG_FSL_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 328 | # CONFIG_PCIEPORTBUS is not set | 328 | # CONFIG_PCIEPORTBUS is not set |
| 329 | CONFIG_ARCH_SUPPORTS_MSI=y | 329 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 330 | # CONFIG_PCI_MSI is not set | 330 | # CONFIG_PCI_MSI is not set |
| 331 | # CONFIG_PCI_LEGACY is not set | ||
| 332 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
| 333 | # CONFIG_PCI_IOV is not set | 332 | # CONFIG_PCI_IOV is not set |
| 334 | # CONFIG_HAS_RAPIDIO is not set | 333 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -354,7 +353,6 @@ CONFIG_NET=y | |||
| 354 | # Networking options | 353 | # Networking options |
| 355 | # | 354 | # |
| 356 | CONFIG_PACKET=y | 355 | CONFIG_PACKET=y |
| 357 | # CONFIG_PACKET_MMAP is not set | ||
| 358 | CONFIG_UNIX=y | 356 | CONFIG_UNIX=y |
| 359 | CONFIG_XFRM=y | 357 | CONFIG_XFRM=y |
| 360 | # CONFIG_XFRM_USER is not set | 358 | # CONFIG_XFRM_USER is not set |
| @@ -528,6 +526,8 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 528 | # UBI - Unsorted block images | 526 | # UBI - Unsorted block images |
| 529 | # | 527 | # |
| 530 | # CONFIG_MTD_UBI is not set | 528 | # CONFIG_MTD_UBI is not set |
| 529 | CONFIG_OF_FLATTREE=y | ||
| 530 | CONFIG_OF_DYNAMIC=y | ||
| 531 | CONFIG_OF_DEVICE=y | 531 | CONFIG_OF_DEVICE=y |
| 532 | CONFIG_OF_GPIO=y | 532 | CONFIG_OF_GPIO=y |
| 533 | CONFIG_OF_I2C=y | 533 | CONFIG_OF_I2C=y |
| @@ -564,6 +564,7 @@ CONFIG_MISC_DEVICES=y | |||
| 564 | # CONFIG_ENCLOSURE_SERVICES is not set | 564 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 565 | # CONFIG_HP_ILO is not set | 565 | # CONFIG_HP_ILO is not set |
| 566 | # CONFIG_ISL29003 is not set | 566 | # CONFIG_ISL29003 is not set |
| 567 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 567 | # CONFIG_DS1682 is not set | 568 | # CONFIG_DS1682 is not set |
| 568 | # CONFIG_C2PORT is not set | 569 | # CONFIG_C2PORT is not set |
| 569 | 570 | ||
| @@ -636,6 +637,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 636 | # | 637 | # |
| 637 | # SCSI device support | 638 | # SCSI device support |
| 638 | # | 639 | # |
| 640 | CONFIG_SCSI_MOD=y | ||
| 639 | # CONFIG_RAID_ATTRS is not set | 641 | # CONFIG_RAID_ATTRS is not set |
| 640 | # CONFIG_SCSI is not set | 642 | # CONFIG_SCSI is not set |
| 641 | # CONFIG_SCSI_DMA is not set | 643 | # CONFIG_SCSI_DMA is not set |
| @@ -708,6 +710,7 @@ CONFIG_NET_PCI=y | |||
| 708 | # CONFIG_PCNET32 is not set | 710 | # CONFIG_PCNET32 is not set |
| 709 | # CONFIG_AMD8111_ETH is not set | 711 | # CONFIG_AMD8111_ETH is not set |
| 710 | # CONFIG_ADAPTEC_STARFIRE is not set | 712 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 713 | # CONFIG_KSZ884X_PCI is not set | ||
| 711 | # CONFIG_B44 is not set | 714 | # CONFIG_B44 is not set |
| 712 | # CONFIG_FORCEDETH is not set | 715 | # CONFIG_FORCEDETH is not set |
| 713 | CONFIG_E100=y | 716 | CONFIG_E100=y |
| @@ -760,6 +763,8 @@ CONFIG_NETDEV_10000=y | |||
| 760 | # CONFIG_CHELSIO_T1 is not set | 763 | # CONFIG_CHELSIO_T1 is not set |
| 761 | CONFIG_CHELSIO_T3_DEPENDS=y | 764 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 762 | # CONFIG_CHELSIO_T3 is not set | 765 | # CONFIG_CHELSIO_T3 is not set |
| 766 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 767 | # CONFIG_CHELSIO_T4 is not set | ||
| 763 | # CONFIG_ENIC is not set | 768 | # CONFIG_ENIC is not set |
| 764 | # CONFIG_IXGBE is not set | 769 | # CONFIG_IXGBE is not set |
| 765 | # CONFIG_IXGB is not set | 770 | # CONFIG_IXGB is not set |
| @@ -772,6 +777,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 772 | # CONFIG_MLX4_CORE is not set | 777 | # CONFIG_MLX4_CORE is not set |
| 773 | # CONFIG_TEHUTI is not set | 778 | # CONFIG_TEHUTI is not set |
| 774 | # CONFIG_BNX2X is not set | 779 | # CONFIG_BNX2X is not set |
| 780 | # CONFIG_QLCNIC is not set | ||
| 775 | # CONFIG_QLGE is not set | 781 | # CONFIG_QLGE is not set |
| 776 | # CONFIG_SFC is not set | 782 | # CONFIG_SFC is not set |
| 777 | # CONFIG_BE2NET is not set | 783 | # CONFIG_BE2NET is not set |
| @@ -858,6 +864,7 @@ CONFIG_SERIAL_CPM=y | |||
| 858 | CONFIG_SERIAL_CPM_CONSOLE=y | 864 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 859 | # CONFIG_SERIAL_JSM is not set | 865 | # CONFIG_SERIAL_JSM is not set |
| 860 | # CONFIG_SERIAL_OF_PLATFORM is not set | 866 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 867 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 861 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 868 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 862 | CONFIG_UNIX98_PTYS=y | 869 | CONFIG_UNIX98_PTYS=y |
| 863 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 870 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -912,6 +919,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 912 | CONFIG_I2C_MPC=y | 919 | CONFIG_I2C_MPC=y |
| 913 | # CONFIG_I2C_OCORES is not set | 920 | # CONFIG_I2C_OCORES is not set |
| 914 | # CONFIG_I2C_SIMTEC is not set | 921 | # CONFIG_I2C_SIMTEC is not set |
| 922 | # CONFIG_I2C_XILINX is not set | ||
| 915 | 923 | ||
| 916 | # | 924 | # |
| 917 | # External I2C/SMBus adapter drivers | 925 | # External I2C/SMBus adapter drivers |
| @@ -923,15 +931,9 @@ CONFIG_I2C_MPC=y | |||
| 923 | # Other I2C/SMBus bus drivers | 931 | # Other I2C/SMBus bus drivers |
| 924 | # | 932 | # |
| 925 | # CONFIG_I2C_PCA_PLATFORM is not set | 933 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 926 | |||
| 927 | # | ||
| 928 | # Miscellaneous I2C Chip support | ||
| 929 | # | ||
| 930 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 931 | # CONFIG_I2C_DEBUG_CORE is not set | 934 | # CONFIG_I2C_DEBUG_CORE is not set |
| 932 | # CONFIG_I2C_DEBUG_ALGO is not set | 935 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 933 | # CONFIG_I2C_DEBUG_BUS is not set | 936 | # CONFIG_I2C_DEBUG_BUS is not set |
| 934 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 935 | # CONFIG_SPI is not set | 937 | # CONFIG_SPI is not set |
| 936 | 938 | ||
| 937 | # | 939 | # |
| @@ -946,14 +948,18 @@ CONFIG_GPIOLIB=y | |||
| 946 | # | 948 | # |
| 947 | # Memory mapped GPIO expanders: | 949 | # Memory mapped GPIO expanders: |
| 948 | # | 950 | # |
| 951 | # CONFIG_GPIO_IT8761E is not set | ||
| 949 | # CONFIG_GPIO_XILINX is not set | 952 | # CONFIG_GPIO_XILINX is not set |
| 953 | # CONFIG_GPIO_SCH is not set | ||
| 950 | 954 | ||
| 951 | # | 955 | # |
| 952 | # I2C GPIO expanders: | 956 | # I2C GPIO expanders: |
| 953 | # | 957 | # |
| 958 | # CONFIG_GPIO_MAX7300 is not set | ||
| 954 | # CONFIG_GPIO_MAX732X is not set | 959 | # CONFIG_GPIO_MAX732X is not set |
| 955 | # CONFIG_GPIO_PCA953X is not set | 960 | # CONFIG_GPIO_PCA953X is not set |
| 956 | # CONFIG_GPIO_PCF857X is not set | 961 | # CONFIG_GPIO_PCF857X is not set |
| 962 | # CONFIG_GPIO_ADP5588 is not set | ||
| 957 | 963 | ||
| 958 | # | 964 | # |
| 959 | # PCI GPIO expanders: | 965 | # PCI GPIO expanders: |
| @@ -986,10 +992,11 @@ CONFIG_HWMON_DEBUG_CHIP=y | |||
| 986 | # CONFIG_SENSORS_ADM1029 is not set | 992 | # CONFIG_SENSORS_ADM1029 is not set |
| 987 | # CONFIG_SENSORS_ADM1031 is not set | 993 | # CONFIG_SENSORS_ADM1031 is not set |
| 988 | # CONFIG_SENSORS_ADM9240 is not set | 994 | # CONFIG_SENSORS_ADM9240 is not set |
| 995 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 989 | # CONFIG_SENSORS_ADT7462 is not set | 996 | # CONFIG_SENSORS_ADT7462 is not set |
| 990 | # CONFIG_SENSORS_ADT7470 is not set | 997 | # CONFIG_SENSORS_ADT7470 is not set |
| 991 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 992 | # CONFIG_SENSORS_ADT7475 is not set | 998 | # CONFIG_SENSORS_ADT7475 is not set |
| 999 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 993 | # CONFIG_SENSORS_ATXP1 is not set | 1000 | # CONFIG_SENSORS_ATXP1 is not set |
| 994 | # CONFIG_SENSORS_DS1621 is not set | 1001 | # CONFIG_SENSORS_DS1621 is not set |
| 995 | # CONFIG_SENSORS_I5K_AMB is not set | 1002 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1027,6 +1034,7 @@ CONFIG_SENSORS_LM75=y | |||
| 1027 | # CONFIG_SENSORS_SMSC47M192 is not set | 1034 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1028 | # CONFIG_SENSORS_SMSC47B397 is not set | 1035 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1029 | # CONFIG_SENSORS_ADS7828 is not set | 1036 | # CONFIG_SENSORS_ADS7828 is not set |
| 1037 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1030 | # CONFIG_SENSORS_THMC50 is not set | 1038 | # CONFIG_SENSORS_THMC50 is not set |
| 1031 | # CONFIG_SENSORS_TMP401 is not set | 1039 | # CONFIG_SENSORS_TMP401 is not set |
| 1032 | # CONFIG_SENSORS_TMP421 is not set | 1040 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1055,19 +1063,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1055 | # Multifunction device drivers | 1063 | # Multifunction device drivers |
| 1056 | # | 1064 | # |
| 1057 | # CONFIG_MFD_CORE is not set | 1065 | # CONFIG_MFD_CORE is not set |
| 1066 | # CONFIG_MFD_88PM860X is not set | ||
| 1058 | # CONFIG_MFD_SM501 is not set | 1067 | # CONFIG_MFD_SM501 is not set |
| 1059 | # CONFIG_HTC_PASIC3 is not set | 1068 | # CONFIG_HTC_PASIC3 is not set |
| 1069 | # CONFIG_HTC_I2CPLD is not set | ||
| 1060 | # CONFIG_TPS65010 is not set | 1070 | # CONFIG_TPS65010 is not set |
| 1061 | # CONFIG_TWL4030_CORE is not set | 1071 | # CONFIG_TWL4030_CORE is not set |
| 1062 | # CONFIG_MFD_TMIO is not set | 1072 | # CONFIG_MFD_TMIO is not set |
| 1063 | # CONFIG_PMIC_DA903X is not set | 1073 | # CONFIG_PMIC_DA903X is not set |
| 1064 | # CONFIG_PMIC_ADP5520 is not set | 1074 | # CONFIG_PMIC_ADP5520 is not set |
| 1075 | # CONFIG_MFD_MAX8925 is not set | ||
| 1065 | # CONFIG_MFD_WM8400 is not set | 1076 | # CONFIG_MFD_WM8400 is not set |
| 1066 | # CONFIG_MFD_WM831X is not set | 1077 | # CONFIG_MFD_WM831X is not set |
| 1067 | # CONFIG_MFD_WM8350_I2C is not set | 1078 | # CONFIG_MFD_WM8350_I2C is not set |
| 1079 | # CONFIG_MFD_WM8994 is not set | ||
| 1068 | # CONFIG_MFD_PCF50633 is not set | 1080 | # CONFIG_MFD_PCF50633 is not set |
| 1069 | # CONFIG_AB3100_CORE is not set | 1081 | # CONFIG_AB3100_CORE is not set |
| 1070 | # CONFIG_MFD_88PM8607 is not set | 1082 | # CONFIG_MFD_TIMBERDALE is not set |
| 1083 | # CONFIG_LPC_SCH is not set | ||
| 1071 | # CONFIG_REGULATOR is not set | 1084 | # CONFIG_REGULATOR is not set |
| 1072 | # CONFIG_MEDIA_SUPPORT is not set | 1085 | # CONFIG_MEDIA_SUPPORT is not set |
| 1073 | 1086 | ||
| @@ -1076,6 +1089,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1076 | # | 1089 | # |
| 1077 | # CONFIG_AGP is not set | 1090 | # CONFIG_AGP is not set |
| 1078 | CONFIG_VGA_ARB=y | 1091 | CONFIG_VGA_ARB=y |
| 1092 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1079 | # CONFIG_DRM is not set | 1093 | # CONFIG_DRM is not set |
| 1080 | # CONFIG_VGASTATE is not set | 1094 | # CONFIG_VGASTATE is not set |
| 1081 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1095 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1213,6 +1227,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1213 | # CONFIG_JFFS2_LZO is not set | 1227 | # CONFIG_JFFS2_LZO is not set |
| 1214 | CONFIG_JFFS2_RTIME=y | 1228 | CONFIG_JFFS2_RTIME=y |
| 1215 | # CONFIG_JFFS2_RUBIN is not set | 1229 | # CONFIG_JFFS2_RUBIN is not set |
| 1230 | # CONFIG_LOGFS is not set | ||
| 1216 | CONFIG_CRAMFS=y | 1231 | CONFIG_CRAMFS=y |
| 1217 | # CONFIG_SQUASHFS is not set | 1232 | # CONFIG_SQUASHFS is not set |
| 1218 | # CONFIG_VXFS_FS is not set | 1233 | # CONFIG_VXFS_FS is not set |
| @@ -1235,6 +1250,7 @@ CONFIG_SUNRPC=y | |||
| 1235 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1250 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1236 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1251 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1237 | # CONFIG_SMB_FS is not set | 1252 | # CONFIG_SMB_FS is not set |
| 1253 | # CONFIG_CEPH_FS is not set | ||
| 1238 | # CONFIG_CIFS is not set | 1254 | # CONFIG_CIFS is not set |
| 1239 | # CONFIG_NCP_FS is not set | 1255 | # CONFIG_NCP_FS is not set |
| 1240 | # CONFIG_CODA_FS is not set | 1256 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig index 5cc89aac3fec..845efa79dd20 100644 --- a/arch/powerpc/configs/85xx/tqm8548_defconfig +++ b/arch/powerpc/configs/85xx/tqm8548_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:35 2010 | 4 | # Mon Apr 19 23:16:59 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -67,6 +67,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 67 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 68 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 70 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 71 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 72 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 70 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 74 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 71 | CONFIG_CONSTRUCTORS=y | 75 | CONFIG_CONSTRUCTORS=y |
| 72 | 76 | ||
| @@ -98,14 +102,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 103 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 107 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -324,6 +323,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 323 | # Bus options |
| 325 | # | 324 | # |
| 326 | CONFIG_ZONE_DMA=y | 325 | CONFIG_ZONE_DMA=y |
| 326 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 327 | CONFIG_PPC_INDIRECT_PCI=y | 327 | CONFIG_PPC_INDIRECT_PCI=y |
| 328 | CONFIG_FSL_SOC=y | 328 | CONFIG_FSL_SOC=y |
| 329 | CONFIG_FSL_PCI=y | 329 | CONFIG_FSL_PCI=y |
| @@ -339,7 +339,6 @@ CONFIG_PCIEAER=y | |||
| 339 | # CONFIG_PCIEASPM is not set | 339 | # CONFIG_PCIEASPM is not set |
| 340 | CONFIG_ARCH_SUPPORTS_MSI=y | 340 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 341 | # CONFIG_PCI_MSI is not set | 341 | # CONFIG_PCI_MSI is not set |
| 342 | # CONFIG_PCI_LEGACY is not set | ||
| 343 | # CONFIG_PCI_DEBUG is not set | 342 | # CONFIG_PCI_DEBUG is not set |
| 344 | # CONFIG_PCI_STUB is not set | 343 | # CONFIG_PCI_STUB is not set |
| 345 | # CONFIG_PCI_IOV is not set | 344 | # CONFIG_PCI_IOV is not set |
| @@ -368,7 +367,6 @@ CONFIG_NET=y | |||
| 368 | # Networking options | 367 | # Networking options |
| 369 | # | 368 | # |
| 370 | CONFIG_PACKET=y | 369 | CONFIG_PACKET=y |
| 371 | # CONFIG_PACKET_MMAP is not set | ||
| 372 | CONFIG_UNIX=y | 370 | CONFIG_UNIX=y |
| 373 | CONFIG_XFRM=y | 371 | CONFIG_XFRM=y |
| 374 | CONFIG_XFRM_USER=y | 372 | CONFIG_XFRM_USER=y |
| @@ -559,6 +557,8 @@ CONFIG_MTD_NAND_FSL_UPM=y | |||
| 559 | # UBI - Unsorted block images | 557 | # UBI - Unsorted block images |
| 560 | # | 558 | # |
| 561 | # CONFIG_MTD_UBI is not set | 559 | # CONFIG_MTD_UBI is not set |
| 560 | CONFIG_OF_FLATTREE=y | ||
| 561 | CONFIG_OF_DYNAMIC=y | ||
| 562 | CONFIG_OF_DEVICE=y | 562 | CONFIG_OF_DEVICE=y |
| 563 | CONFIG_OF_I2C=y | 563 | CONFIG_OF_I2C=y |
| 564 | CONFIG_OF_MDIO=y | 564 | CONFIG_OF_MDIO=y |
| @@ -594,6 +594,7 @@ CONFIG_MISC_DEVICES=y | |||
| 594 | # CONFIG_ENCLOSURE_SERVICES is not set | 594 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 595 | # CONFIG_HP_ILO is not set | 595 | # CONFIG_HP_ILO is not set |
| 596 | # CONFIG_ISL29003 is not set | 596 | # CONFIG_ISL29003 is not set |
| 597 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 597 | # CONFIG_DS1682 is not set | 598 | # CONFIG_DS1682 is not set |
| 598 | # CONFIG_C2PORT is not set | 599 | # CONFIG_C2PORT is not set |
| 599 | 600 | ||
| @@ -611,6 +612,7 @@ CONFIG_HAVE_IDE=y | |||
| 611 | # | 612 | # |
| 612 | # SCSI device support | 613 | # SCSI device support |
| 613 | # | 614 | # |
| 615 | CONFIG_SCSI_MOD=y | ||
| 614 | # CONFIG_RAID_ATTRS is not set | 616 | # CONFIG_RAID_ATTRS is not set |
| 615 | # CONFIG_SCSI is not set | 617 | # CONFIG_SCSI is not set |
| 616 | # CONFIG_SCSI_DMA is not set | 618 | # CONFIG_SCSI_DMA is not set |
| @@ -716,6 +718,8 @@ CONFIG_NETDEV_10000=y | |||
| 716 | # CONFIG_CHELSIO_T1 is not set | 718 | # CONFIG_CHELSIO_T1 is not set |
| 717 | CONFIG_CHELSIO_T3_DEPENDS=y | 719 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 718 | # CONFIG_CHELSIO_T3 is not set | 720 | # CONFIG_CHELSIO_T3 is not set |
| 721 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 722 | # CONFIG_CHELSIO_T4 is not set | ||
| 719 | # CONFIG_ENIC is not set | 723 | # CONFIG_ENIC is not set |
| 720 | # CONFIG_IXGBE is not set | 724 | # CONFIG_IXGBE is not set |
| 721 | # CONFIG_IXGB is not set | 725 | # CONFIG_IXGB is not set |
| @@ -728,6 +732,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 728 | # CONFIG_MLX4_CORE is not set | 732 | # CONFIG_MLX4_CORE is not set |
| 729 | # CONFIG_TEHUTI is not set | 733 | # CONFIG_TEHUTI is not set |
| 730 | # CONFIG_BNX2X is not set | 734 | # CONFIG_BNX2X is not set |
| 735 | # CONFIG_QLCNIC is not set | ||
| 731 | # CONFIG_QLGE is not set | 736 | # CONFIG_QLGE is not set |
| 732 | # CONFIG_SFC is not set | 737 | # CONFIG_SFC is not set |
| 733 | # CONFIG_BE2NET is not set | 738 | # CONFIG_BE2NET is not set |
| @@ -812,6 +817,7 @@ CONFIG_SERIAL_CORE=y | |||
| 812 | CONFIG_SERIAL_CORE_CONSOLE=y | 817 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 813 | # CONFIG_SERIAL_JSM is not set | 818 | # CONFIG_SERIAL_JSM is not set |
| 814 | # CONFIG_SERIAL_OF_PLATFORM is not set | 819 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 820 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 815 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 821 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 816 | CONFIG_UNIX98_PTYS=y | 822 | CONFIG_UNIX98_PTYS=y |
| 817 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 823 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -860,6 +866,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 860 | CONFIG_I2C_MPC=y | 866 | CONFIG_I2C_MPC=y |
| 861 | # CONFIG_I2C_OCORES is not set | 867 | # CONFIG_I2C_OCORES is not set |
| 862 | # CONFIG_I2C_SIMTEC is not set | 868 | # CONFIG_I2C_SIMTEC is not set |
| 869 | # CONFIG_I2C_XILINX is not set | ||
| 863 | 870 | ||
| 864 | # | 871 | # |
| 865 | # External I2C/SMBus adapter drivers | 872 | # External I2C/SMBus adapter drivers |
| @@ -872,15 +879,9 @@ CONFIG_I2C_MPC=y | |||
| 872 | # | 879 | # |
| 873 | # CONFIG_I2C_PCA_PLATFORM is not set | 880 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 874 | # CONFIG_I2C_STUB is not set | 881 | # CONFIG_I2C_STUB is not set |
| 875 | |||
| 876 | # | ||
| 877 | # Miscellaneous I2C Chip support | ||
| 878 | # | ||
| 879 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 880 | # CONFIG_I2C_DEBUG_CORE is not set | 882 | # CONFIG_I2C_DEBUG_CORE is not set |
| 881 | # CONFIG_I2C_DEBUG_ALGO is not set | 883 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 882 | # CONFIG_I2C_DEBUG_BUS is not set | 884 | # CONFIG_I2C_DEBUG_BUS is not set |
| 883 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 884 | # CONFIG_SPI is not set | 885 | # CONFIG_SPI is not set |
| 885 | 886 | ||
| 886 | # | 887 | # |
| @@ -906,10 +907,11 @@ CONFIG_HWMON=y | |||
| 906 | # CONFIG_SENSORS_ADM1029 is not set | 907 | # CONFIG_SENSORS_ADM1029 is not set |
| 907 | # CONFIG_SENSORS_ADM1031 is not set | 908 | # CONFIG_SENSORS_ADM1031 is not set |
| 908 | # CONFIG_SENSORS_ADM9240 is not set | 909 | # CONFIG_SENSORS_ADM9240 is not set |
| 910 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 909 | # CONFIG_SENSORS_ADT7462 is not set | 911 | # CONFIG_SENSORS_ADT7462 is not set |
| 910 | # CONFIG_SENSORS_ADT7470 is not set | 912 | # CONFIG_SENSORS_ADT7470 is not set |
| 911 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 912 | # CONFIG_SENSORS_ADT7475 is not set | 913 | # CONFIG_SENSORS_ADT7475 is not set |
| 914 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 913 | # CONFIG_SENSORS_ATXP1 is not set | 915 | # CONFIG_SENSORS_ATXP1 is not set |
| 914 | # CONFIG_SENSORS_DS1621 is not set | 916 | # CONFIG_SENSORS_DS1621 is not set |
| 915 | # CONFIG_SENSORS_I5K_AMB is not set | 917 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -946,6 +948,7 @@ CONFIG_SENSORS_LM75=y | |||
| 946 | # CONFIG_SENSORS_SMSC47M192 is not set | 948 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 947 | # CONFIG_SENSORS_SMSC47B397 is not set | 949 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 948 | # CONFIG_SENSORS_ADS7828 is not set | 950 | # CONFIG_SENSORS_ADS7828 is not set |
| 951 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 949 | # CONFIG_SENSORS_THMC50 is not set | 952 | # CONFIG_SENSORS_THMC50 is not set |
| 950 | # CONFIG_SENSORS_TMP401 is not set | 953 | # CONFIG_SENSORS_TMP401 is not set |
| 951 | # CONFIG_SENSORS_TMP421 is not set | 954 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -974,18 +977,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 974 | # Multifunction device drivers | 977 | # Multifunction device drivers |
| 975 | # | 978 | # |
| 976 | # CONFIG_MFD_CORE is not set | 979 | # CONFIG_MFD_CORE is not set |
| 980 | # CONFIG_MFD_88PM860X is not set | ||
| 977 | # CONFIG_MFD_SM501 is not set | 981 | # CONFIG_MFD_SM501 is not set |
| 978 | # CONFIG_HTC_PASIC3 is not set | 982 | # CONFIG_HTC_PASIC3 is not set |
| 979 | # CONFIG_TWL4030_CORE is not set | 983 | # CONFIG_TWL4030_CORE is not set |
| 980 | # CONFIG_MFD_TMIO is not set | 984 | # CONFIG_MFD_TMIO is not set |
| 981 | # CONFIG_PMIC_DA903X is not set | 985 | # CONFIG_PMIC_DA903X is not set |
| 982 | # CONFIG_PMIC_ADP5520 is not set | 986 | # CONFIG_PMIC_ADP5520 is not set |
| 987 | # CONFIG_MFD_MAX8925 is not set | ||
| 983 | # CONFIG_MFD_WM8400 is not set | 988 | # CONFIG_MFD_WM8400 is not set |
| 984 | # CONFIG_MFD_WM831X is not set | 989 | # CONFIG_MFD_WM831X is not set |
| 985 | # CONFIG_MFD_WM8350_I2C is not set | 990 | # CONFIG_MFD_WM8350_I2C is not set |
| 991 | # CONFIG_MFD_WM8994 is not set | ||
| 986 | # CONFIG_MFD_PCF50633 is not set | 992 | # CONFIG_MFD_PCF50633 is not set |
| 987 | # CONFIG_AB3100_CORE is not set | 993 | # CONFIG_AB3100_CORE is not set |
| 988 | # CONFIG_MFD_88PM8607 is not set | 994 | # CONFIG_LPC_SCH is not set |
| 989 | # CONFIG_REGULATOR is not set | 995 | # CONFIG_REGULATOR is not set |
| 990 | # CONFIG_MEDIA_SUPPORT is not set | 996 | # CONFIG_MEDIA_SUPPORT is not set |
| 991 | 997 | ||
| @@ -994,6 +1000,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 994 | # | 1000 | # |
| 995 | # CONFIG_AGP is not set | 1001 | # CONFIG_AGP is not set |
| 996 | CONFIG_VGA_ARB=y | 1002 | CONFIG_VGA_ARB=y |
| 1003 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 997 | # CONFIG_DRM is not set | 1004 | # CONFIG_DRM is not set |
| 998 | # CONFIG_VGASTATE is not set | 1005 | # CONFIG_VGASTATE is not set |
| 999 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1006 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1162,6 +1169,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1162 | # CONFIG_JFFS2_LZO is not set | 1169 | # CONFIG_JFFS2_LZO is not set |
| 1163 | CONFIG_JFFS2_RTIME=y | 1170 | CONFIG_JFFS2_RTIME=y |
| 1164 | # CONFIG_JFFS2_RUBIN is not set | 1171 | # CONFIG_JFFS2_RUBIN is not set |
| 1172 | # CONFIG_LOGFS is not set | ||
| 1165 | # CONFIG_CRAMFS is not set | 1173 | # CONFIG_CRAMFS is not set |
| 1166 | # CONFIG_SQUASHFS is not set | 1174 | # CONFIG_SQUASHFS is not set |
| 1167 | # CONFIG_VXFS_FS is not set | 1175 | # CONFIG_VXFS_FS is not set |
| @@ -1184,6 +1192,7 @@ CONFIG_SUNRPC=y | |||
| 1184 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1192 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1185 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1193 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1186 | # CONFIG_SMB_FS is not set | 1194 | # CONFIG_SMB_FS is not set |
| 1195 | # CONFIG_CEPH_FS is not set | ||
| 1187 | # CONFIG_CIFS is not set | 1196 | # CONFIG_CIFS is not set |
| 1188 | # CONFIG_NCP_FS is not set | 1197 | # CONFIG_NCP_FS is not set |
| 1189 | # CONFIG_CODA_FS is not set | 1198 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index e7b9148e58cf..b958136a12f0 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:36 2010 | 4 | # Mon Apr 19 23:17:00 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -99,14 +103,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 99 | # CONFIG_TREE_RCU_TRACE is not set | 103 | # CONFIG_TREE_RCU_TRACE is not set |
| 100 | # CONFIG_IKCONFIG is not set | 104 | # CONFIG_IKCONFIG is not set |
| 101 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 102 | CONFIG_GROUP_SCHED=y | ||
| 103 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 104 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 105 | CONFIG_USER_SCHED=y | ||
| 106 | # CONFIG_CGROUP_SCHED is not set | ||
| 107 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 108 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 109 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 110 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 111 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 112 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -114,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 114 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 115 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 116 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 117 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 118 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 119 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -318,6 +317,7 @@ CONFIG_ISA_DMA_API=y | |||
| 318 | # Bus options | 317 | # Bus options |
| 319 | # | 318 | # |
| 320 | CONFIG_ZONE_DMA=y | 319 | CONFIG_ZONE_DMA=y |
| 320 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 321 | CONFIG_PPC_INDIRECT_PCI=y | 321 | CONFIG_PPC_INDIRECT_PCI=y |
| 322 | CONFIG_FSL_SOC=y | 322 | CONFIG_FSL_SOC=y |
| 323 | CONFIG_FSL_PCI=y | 323 | CONFIG_FSL_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 328 | # CONFIG_PCIEPORTBUS is not set | 328 | # CONFIG_PCIEPORTBUS is not set |
| 329 | CONFIG_ARCH_SUPPORTS_MSI=y | 329 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 330 | # CONFIG_PCI_MSI is not set | 330 | # CONFIG_PCI_MSI is not set |
| 331 | # CONFIG_PCI_LEGACY is not set | ||
| 332 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
| 333 | # CONFIG_PCI_IOV is not set | 332 | # CONFIG_PCI_IOV is not set |
| 334 | # CONFIG_HAS_RAPIDIO is not set | 333 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -354,7 +353,6 @@ CONFIG_NET=y | |||
| 354 | # Networking options | 353 | # Networking options |
| 355 | # | 354 | # |
| 356 | CONFIG_PACKET=y | 355 | CONFIG_PACKET=y |
| 357 | # CONFIG_PACKET_MMAP is not set | ||
| 358 | CONFIG_UNIX=y | 356 | CONFIG_UNIX=y |
| 359 | CONFIG_XFRM=y | 357 | CONFIG_XFRM=y |
| 360 | # CONFIG_XFRM_USER is not set | 358 | # CONFIG_XFRM_USER is not set |
| @@ -528,6 +526,8 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 528 | # UBI - Unsorted block images | 526 | # UBI - Unsorted block images |
| 529 | # | 527 | # |
| 530 | # CONFIG_MTD_UBI is not set | 528 | # CONFIG_MTD_UBI is not set |
| 529 | CONFIG_OF_FLATTREE=y | ||
| 530 | CONFIG_OF_DYNAMIC=y | ||
| 531 | CONFIG_OF_DEVICE=y | 531 | CONFIG_OF_DEVICE=y |
| 532 | CONFIG_OF_GPIO=y | 532 | CONFIG_OF_GPIO=y |
| 533 | CONFIG_OF_I2C=y | 533 | CONFIG_OF_I2C=y |
| @@ -564,6 +564,7 @@ CONFIG_MISC_DEVICES=y | |||
| 564 | # CONFIG_ENCLOSURE_SERVICES is not set | 564 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 565 | # CONFIG_HP_ILO is not set | 565 | # CONFIG_HP_ILO is not set |
| 566 | # CONFIG_ISL29003 is not set | 566 | # CONFIG_ISL29003 is not set |
| 567 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 567 | # CONFIG_DS1682 is not set | 568 | # CONFIG_DS1682 is not set |
| 568 | # CONFIG_C2PORT is not set | 569 | # CONFIG_C2PORT is not set |
| 569 | 570 | ||
| @@ -636,6 +637,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 636 | # | 637 | # |
| 637 | # SCSI device support | 638 | # SCSI device support |
| 638 | # | 639 | # |
| 640 | CONFIG_SCSI_MOD=y | ||
| 639 | # CONFIG_RAID_ATTRS is not set | 641 | # CONFIG_RAID_ATTRS is not set |
| 640 | # CONFIG_SCSI is not set | 642 | # CONFIG_SCSI is not set |
| 641 | # CONFIG_SCSI_DMA is not set | 643 | # CONFIG_SCSI_DMA is not set |
| @@ -708,6 +710,7 @@ CONFIG_NET_PCI=y | |||
| 708 | # CONFIG_PCNET32 is not set | 710 | # CONFIG_PCNET32 is not set |
| 709 | # CONFIG_AMD8111_ETH is not set | 711 | # CONFIG_AMD8111_ETH is not set |
| 710 | # CONFIG_ADAPTEC_STARFIRE is not set | 712 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 713 | # CONFIG_KSZ884X_PCI is not set | ||
| 711 | # CONFIG_B44 is not set | 714 | # CONFIG_B44 is not set |
| 712 | # CONFIG_FORCEDETH is not set | 715 | # CONFIG_FORCEDETH is not set |
| 713 | CONFIG_E100=y | 716 | CONFIG_E100=y |
| @@ -760,6 +763,8 @@ CONFIG_NETDEV_10000=y | |||
| 760 | # CONFIG_CHELSIO_T1 is not set | 763 | # CONFIG_CHELSIO_T1 is not set |
| 761 | CONFIG_CHELSIO_T3_DEPENDS=y | 764 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 762 | # CONFIG_CHELSIO_T3 is not set | 765 | # CONFIG_CHELSIO_T3 is not set |
| 766 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 767 | # CONFIG_CHELSIO_T4 is not set | ||
| 763 | # CONFIG_ENIC is not set | 768 | # CONFIG_ENIC is not set |
| 764 | # CONFIG_IXGBE is not set | 769 | # CONFIG_IXGBE is not set |
| 765 | # CONFIG_IXGB is not set | 770 | # CONFIG_IXGB is not set |
| @@ -772,6 +777,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 772 | # CONFIG_MLX4_CORE is not set | 777 | # CONFIG_MLX4_CORE is not set |
| 773 | # CONFIG_TEHUTI is not set | 778 | # CONFIG_TEHUTI is not set |
| 774 | # CONFIG_BNX2X is not set | 779 | # CONFIG_BNX2X is not set |
| 780 | # CONFIG_QLCNIC is not set | ||
| 775 | # CONFIG_QLGE is not set | 781 | # CONFIG_QLGE is not set |
| 776 | # CONFIG_SFC is not set | 782 | # CONFIG_SFC is not set |
| 777 | # CONFIG_BE2NET is not set | 783 | # CONFIG_BE2NET is not set |
| @@ -858,6 +864,7 @@ CONFIG_SERIAL_CPM=y | |||
| 858 | CONFIG_SERIAL_CPM_CONSOLE=y | 864 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 859 | # CONFIG_SERIAL_JSM is not set | 865 | # CONFIG_SERIAL_JSM is not set |
| 860 | # CONFIG_SERIAL_OF_PLATFORM is not set | 866 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 867 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 861 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 868 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 862 | CONFIG_UNIX98_PTYS=y | 869 | CONFIG_UNIX98_PTYS=y |
| 863 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 870 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -912,6 +919,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 912 | CONFIG_I2C_MPC=y | 919 | CONFIG_I2C_MPC=y |
| 913 | # CONFIG_I2C_OCORES is not set | 920 | # CONFIG_I2C_OCORES is not set |
| 914 | # CONFIG_I2C_SIMTEC is not set | 921 | # CONFIG_I2C_SIMTEC is not set |
| 922 | # CONFIG_I2C_XILINX is not set | ||
| 915 | 923 | ||
| 916 | # | 924 | # |
| 917 | # External I2C/SMBus adapter drivers | 925 | # External I2C/SMBus adapter drivers |
| @@ -923,15 +931,9 @@ CONFIG_I2C_MPC=y | |||
| 923 | # Other I2C/SMBus bus drivers | 931 | # Other I2C/SMBus bus drivers |
| 924 | # | 932 | # |
| 925 | # CONFIG_I2C_PCA_PLATFORM is not set | 933 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 926 | |||
| 927 | # | ||
| 928 | # Miscellaneous I2C Chip support | ||
| 929 | # | ||
| 930 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 931 | # CONFIG_I2C_DEBUG_CORE is not set | 934 | # CONFIG_I2C_DEBUG_CORE is not set |
| 932 | # CONFIG_I2C_DEBUG_ALGO is not set | 935 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 933 | # CONFIG_I2C_DEBUG_BUS is not set | 936 | # CONFIG_I2C_DEBUG_BUS is not set |
| 934 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 935 | # CONFIG_SPI is not set | 937 | # CONFIG_SPI is not set |
| 936 | 938 | ||
| 937 | # | 939 | # |
| @@ -946,14 +948,18 @@ CONFIG_GPIOLIB=y | |||
| 946 | # | 948 | # |
| 947 | # Memory mapped GPIO expanders: | 949 | # Memory mapped GPIO expanders: |
| 948 | # | 950 | # |
| 951 | # CONFIG_GPIO_IT8761E is not set | ||
| 949 | # CONFIG_GPIO_XILINX is not set | 952 | # CONFIG_GPIO_XILINX is not set |
| 953 | # CONFIG_GPIO_SCH is not set | ||
| 950 | 954 | ||
| 951 | # | 955 | # |
| 952 | # I2C GPIO expanders: | 956 | # I2C GPIO expanders: |
| 953 | # | 957 | # |
| 958 | # CONFIG_GPIO_MAX7300 is not set | ||
| 954 | # CONFIG_GPIO_MAX732X is not set | 959 | # CONFIG_GPIO_MAX732X is not set |
| 955 | # CONFIG_GPIO_PCA953X is not set | 960 | # CONFIG_GPIO_PCA953X is not set |
| 956 | # CONFIG_GPIO_PCF857X is not set | 961 | # CONFIG_GPIO_PCF857X is not set |
| 962 | # CONFIG_GPIO_ADP5588 is not set | ||
| 957 | 963 | ||
| 958 | # | 964 | # |
| 959 | # PCI GPIO expanders: | 965 | # PCI GPIO expanders: |
| @@ -986,10 +992,11 @@ CONFIG_HWMON_DEBUG_CHIP=y | |||
| 986 | # CONFIG_SENSORS_ADM1029 is not set | 992 | # CONFIG_SENSORS_ADM1029 is not set |
| 987 | # CONFIG_SENSORS_ADM1031 is not set | 993 | # CONFIG_SENSORS_ADM1031 is not set |
| 988 | # CONFIG_SENSORS_ADM9240 is not set | 994 | # CONFIG_SENSORS_ADM9240 is not set |
| 995 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 989 | # CONFIG_SENSORS_ADT7462 is not set | 996 | # CONFIG_SENSORS_ADT7462 is not set |
| 990 | # CONFIG_SENSORS_ADT7470 is not set | 997 | # CONFIG_SENSORS_ADT7470 is not set |
| 991 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 992 | # CONFIG_SENSORS_ADT7475 is not set | 998 | # CONFIG_SENSORS_ADT7475 is not set |
| 999 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 993 | # CONFIG_SENSORS_ATXP1 is not set | 1000 | # CONFIG_SENSORS_ATXP1 is not set |
| 994 | # CONFIG_SENSORS_DS1621 is not set | 1001 | # CONFIG_SENSORS_DS1621 is not set |
| 995 | # CONFIG_SENSORS_I5K_AMB is not set | 1002 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1027,6 +1034,7 @@ CONFIG_SENSORS_LM75=y | |||
| 1027 | # CONFIG_SENSORS_SMSC47M192 is not set | 1034 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1028 | # CONFIG_SENSORS_SMSC47B397 is not set | 1035 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1029 | # CONFIG_SENSORS_ADS7828 is not set | 1036 | # CONFIG_SENSORS_ADS7828 is not set |
| 1037 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1030 | # CONFIG_SENSORS_THMC50 is not set | 1038 | # CONFIG_SENSORS_THMC50 is not set |
| 1031 | # CONFIG_SENSORS_TMP401 is not set | 1039 | # CONFIG_SENSORS_TMP401 is not set |
| 1032 | # CONFIG_SENSORS_TMP421 is not set | 1040 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1055,19 +1063,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1055 | # Multifunction device drivers | 1063 | # Multifunction device drivers |
| 1056 | # | 1064 | # |
| 1057 | # CONFIG_MFD_CORE is not set | 1065 | # CONFIG_MFD_CORE is not set |
| 1066 | # CONFIG_MFD_88PM860X is not set | ||
| 1058 | # CONFIG_MFD_SM501 is not set | 1067 | # CONFIG_MFD_SM501 is not set |
| 1059 | # CONFIG_HTC_PASIC3 is not set | 1068 | # CONFIG_HTC_PASIC3 is not set |
| 1069 | # CONFIG_HTC_I2CPLD is not set | ||
| 1060 | # CONFIG_TPS65010 is not set | 1070 | # CONFIG_TPS65010 is not set |
| 1061 | # CONFIG_TWL4030_CORE is not set | 1071 | # CONFIG_TWL4030_CORE is not set |
| 1062 | # CONFIG_MFD_TMIO is not set | 1072 | # CONFIG_MFD_TMIO is not set |
| 1063 | # CONFIG_PMIC_DA903X is not set | 1073 | # CONFIG_PMIC_DA903X is not set |
| 1064 | # CONFIG_PMIC_ADP5520 is not set | 1074 | # CONFIG_PMIC_ADP5520 is not set |
| 1075 | # CONFIG_MFD_MAX8925 is not set | ||
| 1065 | # CONFIG_MFD_WM8400 is not set | 1076 | # CONFIG_MFD_WM8400 is not set |
| 1066 | # CONFIG_MFD_WM831X is not set | 1077 | # CONFIG_MFD_WM831X is not set |
| 1067 | # CONFIG_MFD_WM8350_I2C is not set | 1078 | # CONFIG_MFD_WM8350_I2C is not set |
| 1079 | # CONFIG_MFD_WM8994 is not set | ||
| 1068 | # CONFIG_MFD_PCF50633 is not set | 1080 | # CONFIG_MFD_PCF50633 is not set |
| 1069 | # CONFIG_AB3100_CORE is not set | 1081 | # CONFIG_AB3100_CORE is not set |
| 1070 | # CONFIG_MFD_88PM8607 is not set | 1082 | # CONFIG_MFD_TIMBERDALE is not set |
| 1083 | # CONFIG_LPC_SCH is not set | ||
| 1071 | # CONFIG_REGULATOR is not set | 1084 | # CONFIG_REGULATOR is not set |
| 1072 | # CONFIG_MEDIA_SUPPORT is not set | 1085 | # CONFIG_MEDIA_SUPPORT is not set |
| 1073 | 1086 | ||
| @@ -1076,6 +1089,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1076 | # | 1089 | # |
| 1077 | # CONFIG_AGP is not set | 1090 | # CONFIG_AGP is not set |
| 1078 | CONFIG_VGA_ARB=y | 1091 | CONFIG_VGA_ARB=y |
| 1092 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1079 | # CONFIG_DRM is not set | 1093 | # CONFIG_DRM is not set |
| 1080 | # CONFIG_VGASTATE is not set | 1094 | # CONFIG_VGASTATE is not set |
| 1081 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1095 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1213,6 +1227,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1213 | # CONFIG_JFFS2_LZO is not set | 1227 | # CONFIG_JFFS2_LZO is not set |
| 1214 | CONFIG_JFFS2_RTIME=y | 1228 | CONFIG_JFFS2_RTIME=y |
| 1215 | # CONFIG_JFFS2_RUBIN is not set | 1229 | # CONFIG_JFFS2_RUBIN is not set |
| 1230 | # CONFIG_LOGFS is not set | ||
| 1216 | CONFIG_CRAMFS=y | 1231 | CONFIG_CRAMFS=y |
| 1217 | # CONFIG_SQUASHFS is not set | 1232 | # CONFIG_SQUASHFS is not set |
| 1218 | # CONFIG_VXFS_FS is not set | 1233 | # CONFIG_VXFS_FS is not set |
| @@ -1235,6 +1250,7 @@ CONFIG_SUNRPC=y | |||
| 1235 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1250 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1236 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1251 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1237 | # CONFIG_SMB_FS is not set | 1252 | # CONFIG_SMB_FS is not set |
| 1253 | # CONFIG_CEPH_FS is not set | ||
| 1238 | # CONFIG_CIFS is not set | 1254 | # CONFIG_CIFS is not set |
| 1239 | # CONFIG_NCP_FS is not set | 1255 | # CONFIG_NCP_FS is not set |
| 1240 | # CONFIG_CODA_FS is not set | 1256 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index a998e401bbfc..008bc9754927 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:36 2010 | 4 | # Mon Apr 19 23:17:01 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -99,14 +103,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 99 | # CONFIG_TREE_RCU_TRACE is not set | 103 | # CONFIG_TREE_RCU_TRACE is not set |
| 100 | # CONFIG_IKCONFIG is not set | 104 | # CONFIG_IKCONFIG is not set |
| 101 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 102 | CONFIG_GROUP_SCHED=y | ||
| 103 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 104 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 105 | CONFIG_USER_SCHED=y | ||
| 106 | # CONFIG_CGROUP_SCHED is not set | ||
| 107 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 108 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 109 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 110 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 111 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 112 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -114,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 114 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 115 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 116 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 117 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 118 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 119 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -318,6 +317,7 @@ CONFIG_ISA_DMA_API=y | |||
| 318 | # Bus options | 317 | # Bus options |
| 319 | # | 318 | # |
| 320 | CONFIG_ZONE_DMA=y | 319 | CONFIG_ZONE_DMA=y |
| 320 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 321 | CONFIG_PPC_INDIRECT_PCI=y | 321 | CONFIG_PPC_INDIRECT_PCI=y |
| 322 | CONFIG_FSL_SOC=y | 322 | CONFIG_FSL_SOC=y |
| 323 | CONFIG_FSL_PCI=y | 323 | CONFIG_FSL_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 328 | # CONFIG_PCIEPORTBUS is not set | 328 | # CONFIG_PCIEPORTBUS is not set |
| 329 | CONFIG_ARCH_SUPPORTS_MSI=y | 329 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 330 | # CONFIG_PCI_MSI is not set | 330 | # CONFIG_PCI_MSI is not set |
| 331 | # CONFIG_PCI_LEGACY is not set | ||
| 332 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
| 333 | # CONFIG_PCI_IOV is not set | 332 | # CONFIG_PCI_IOV is not set |
| 334 | # CONFIG_HAS_RAPIDIO is not set | 333 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -354,7 +353,6 @@ CONFIG_NET=y | |||
| 354 | # Networking options | 353 | # Networking options |
| 355 | # | 354 | # |
| 356 | CONFIG_PACKET=y | 355 | CONFIG_PACKET=y |
| 357 | # CONFIG_PACKET_MMAP is not set | ||
| 358 | CONFIG_UNIX=y | 356 | CONFIG_UNIX=y |
| 359 | CONFIG_XFRM=y | 357 | CONFIG_XFRM=y |
| 360 | # CONFIG_XFRM_USER is not set | 358 | # CONFIG_XFRM_USER is not set |
| @@ -528,6 +526,8 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 528 | # UBI - Unsorted block images | 526 | # UBI - Unsorted block images |
| 529 | # | 527 | # |
| 530 | # CONFIG_MTD_UBI is not set | 528 | # CONFIG_MTD_UBI is not set |
| 529 | CONFIG_OF_FLATTREE=y | ||
| 530 | CONFIG_OF_DYNAMIC=y | ||
| 531 | CONFIG_OF_DEVICE=y | 531 | CONFIG_OF_DEVICE=y |
| 532 | CONFIG_OF_GPIO=y | 532 | CONFIG_OF_GPIO=y |
| 533 | CONFIG_OF_I2C=y | 533 | CONFIG_OF_I2C=y |
| @@ -564,6 +564,7 @@ CONFIG_MISC_DEVICES=y | |||
| 564 | # CONFIG_ENCLOSURE_SERVICES is not set | 564 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 565 | # CONFIG_HP_ILO is not set | 565 | # CONFIG_HP_ILO is not set |
| 566 | # CONFIG_ISL29003 is not set | 566 | # CONFIG_ISL29003 is not set |
| 567 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 567 | # CONFIG_DS1682 is not set | 568 | # CONFIG_DS1682 is not set |
| 568 | # CONFIG_C2PORT is not set | 569 | # CONFIG_C2PORT is not set |
| 569 | 570 | ||
| @@ -636,6 +637,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 636 | # | 637 | # |
| 637 | # SCSI device support | 638 | # SCSI device support |
| 638 | # | 639 | # |
| 640 | CONFIG_SCSI_MOD=y | ||
| 639 | # CONFIG_RAID_ATTRS is not set | 641 | # CONFIG_RAID_ATTRS is not set |
| 640 | # CONFIG_SCSI is not set | 642 | # CONFIG_SCSI is not set |
| 641 | # CONFIG_SCSI_DMA is not set | 643 | # CONFIG_SCSI_DMA is not set |
| @@ -708,6 +710,7 @@ CONFIG_NET_PCI=y | |||
| 708 | # CONFIG_PCNET32 is not set | 710 | # CONFIG_PCNET32 is not set |
| 709 | # CONFIG_AMD8111_ETH is not set | 711 | # CONFIG_AMD8111_ETH is not set |
| 710 | # CONFIG_ADAPTEC_STARFIRE is not set | 712 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 713 | # CONFIG_KSZ884X_PCI is not set | ||
| 711 | # CONFIG_B44 is not set | 714 | # CONFIG_B44 is not set |
| 712 | # CONFIG_FORCEDETH is not set | 715 | # CONFIG_FORCEDETH is not set |
| 713 | CONFIG_E100=y | 716 | CONFIG_E100=y |
| @@ -760,6 +763,8 @@ CONFIG_NETDEV_10000=y | |||
| 760 | # CONFIG_CHELSIO_T1 is not set | 763 | # CONFIG_CHELSIO_T1 is not set |
| 761 | CONFIG_CHELSIO_T3_DEPENDS=y | 764 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 762 | # CONFIG_CHELSIO_T3 is not set | 765 | # CONFIG_CHELSIO_T3 is not set |
| 766 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 767 | # CONFIG_CHELSIO_T4 is not set | ||
| 763 | # CONFIG_ENIC is not set | 768 | # CONFIG_ENIC is not set |
| 764 | # CONFIG_IXGBE is not set | 769 | # CONFIG_IXGBE is not set |
| 765 | # CONFIG_IXGB is not set | 770 | # CONFIG_IXGB is not set |
| @@ -772,6 +777,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 772 | # CONFIG_MLX4_CORE is not set | 777 | # CONFIG_MLX4_CORE is not set |
| 773 | # CONFIG_TEHUTI is not set | 778 | # CONFIG_TEHUTI is not set |
| 774 | # CONFIG_BNX2X is not set | 779 | # CONFIG_BNX2X is not set |
| 780 | # CONFIG_QLCNIC is not set | ||
| 775 | # CONFIG_QLGE is not set | 781 | # CONFIG_QLGE is not set |
| 776 | # CONFIG_SFC is not set | 782 | # CONFIG_SFC is not set |
| 777 | # CONFIG_BE2NET is not set | 783 | # CONFIG_BE2NET is not set |
| @@ -858,6 +864,7 @@ CONFIG_SERIAL_CPM=y | |||
| 858 | CONFIG_SERIAL_CPM_CONSOLE=y | 864 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 859 | # CONFIG_SERIAL_JSM is not set | 865 | # CONFIG_SERIAL_JSM is not set |
| 860 | # CONFIG_SERIAL_OF_PLATFORM is not set | 866 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 867 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 861 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 868 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 862 | CONFIG_UNIX98_PTYS=y | 869 | CONFIG_UNIX98_PTYS=y |
| 863 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 870 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -912,6 +919,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 912 | CONFIG_I2C_MPC=y | 919 | CONFIG_I2C_MPC=y |
| 913 | # CONFIG_I2C_OCORES is not set | 920 | # CONFIG_I2C_OCORES is not set |
| 914 | # CONFIG_I2C_SIMTEC is not set | 921 | # CONFIG_I2C_SIMTEC is not set |
| 922 | # CONFIG_I2C_XILINX is not set | ||
| 915 | 923 | ||
| 916 | # | 924 | # |
| 917 | # External I2C/SMBus adapter drivers | 925 | # External I2C/SMBus adapter drivers |
| @@ -923,15 +931,9 @@ CONFIG_I2C_MPC=y | |||
| 923 | # Other I2C/SMBus bus drivers | 931 | # Other I2C/SMBus bus drivers |
| 924 | # | 932 | # |
| 925 | # CONFIG_I2C_PCA_PLATFORM is not set | 933 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 926 | |||
| 927 | # | ||
| 928 | # Miscellaneous I2C Chip support | ||
| 929 | # | ||
| 930 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 931 | # CONFIG_I2C_DEBUG_CORE is not set | 934 | # CONFIG_I2C_DEBUG_CORE is not set |
| 932 | # CONFIG_I2C_DEBUG_ALGO is not set | 935 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 933 | # CONFIG_I2C_DEBUG_BUS is not set | 936 | # CONFIG_I2C_DEBUG_BUS is not set |
| 934 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 935 | # CONFIG_SPI is not set | 937 | # CONFIG_SPI is not set |
| 936 | 938 | ||
| 937 | # | 939 | # |
| @@ -946,14 +948,18 @@ CONFIG_GPIOLIB=y | |||
| 946 | # | 948 | # |
| 947 | # Memory mapped GPIO expanders: | 949 | # Memory mapped GPIO expanders: |
| 948 | # | 950 | # |
| 951 | # CONFIG_GPIO_IT8761E is not set | ||
| 949 | # CONFIG_GPIO_XILINX is not set | 952 | # CONFIG_GPIO_XILINX is not set |
| 953 | # CONFIG_GPIO_SCH is not set | ||
| 950 | 954 | ||
| 951 | # | 955 | # |
| 952 | # I2C GPIO expanders: | 956 | # I2C GPIO expanders: |
| 953 | # | 957 | # |
| 958 | # CONFIG_GPIO_MAX7300 is not set | ||
| 954 | # CONFIG_GPIO_MAX732X is not set | 959 | # CONFIG_GPIO_MAX732X is not set |
| 955 | # CONFIG_GPIO_PCA953X is not set | 960 | # CONFIG_GPIO_PCA953X is not set |
| 956 | # CONFIG_GPIO_PCF857X is not set | 961 | # CONFIG_GPIO_PCF857X is not set |
| 962 | # CONFIG_GPIO_ADP5588 is not set | ||
| 957 | 963 | ||
| 958 | # | 964 | # |
| 959 | # PCI GPIO expanders: | 965 | # PCI GPIO expanders: |
| @@ -986,10 +992,11 @@ CONFIG_HWMON_DEBUG_CHIP=y | |||
| 986 | # CONFIG_SENSORS_ADM1029 is not set | 992 | # CONFIG_SENSORS_ADM1029 is not set |
| 987 | # CONFIG_SENSORS_ADM1031 is not set | 993 | # CONFIG_SENSORS_ADM1031 is not set |
| 988 | # CONFIG_SENSORS_ADM9240 is not set | 994 | # CONFIG_SENSORS_ADM9240 is not set |
| 995 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 989 | # CONFIG_SENSORS_ADT7462 is not set | 996 | # CONFIG_SENSORS_ADT7462 is not set |
| 990 | # CONFIG_SENSORS_ADT7470 is not set | 997 | # CONFIG_SENSORS_ADT7470 is not set |
| 991 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 992 | # CONFIG_SENSORS_ADT7475 is not set | 998 | # CONFIG_SENSORS_ADT7475 is not set |
| 999 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 993 | # CONFIG_SENSORS_ATXP1 is not set | 1000 | # CONFIG_SENSORS_ATXP1 is not set |
| 994 | # CONFIG_SENSORS_DS1621 is not set | 1001 | # CONFIG_SENSORS_DS1621 is not set |
| 995 | # CONFIG_SENSORS_I5K_AMB is not set | 1002 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1027,6 +1034,7 @@ CONFIG_SENSORS_LM75=y | |||
| 1027 | # CONFIG_SENSORS_SMSC47M192 is not set | 1034 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1028 | # CONFIG_SENSORS_SMSC47B397 is not set | 1035 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1029 | # CONFIG_SENSORS_ADS7828 is not set | 1036 | # CONFIG_SENSORS_ADS7828 is not set |
| 1037 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1030 | # CONFIG_SENSORS_THMC50 is not set | 1038 | # CONFIG_SENSORS_THMC50 is not set |
| 1031 | # CONFIG_SENSORS_TMP401 is not set | 1039 | # CONFIG_SENSORS_TMP401 is not set |
| 1032 | # CONFIG_SENSORS_TMP421 is not set | 1040 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1055,19 +1063,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1055 | # Multifunction device drivers | 1063 | # Multifunction device drivers |
| 1056 | # | 1064 | # |
| 1057 | # CONFIG_MFD_CORE is not set | 1065 | # CONFIG_MFD_CORE is not set |
| 1066 | # CONFIG_MFD_88PM860X is not set | ||
| 1058 | # CONFIG_MFD_SM501 is not set | 1067 | # CONFIG_MFD_SM501 is not set |
| 1059 | # CONFIG_HTC_PASIC3 is not set | 1068 | # CONFIG_HTC_PASIC3 is not set |
| 1069 | # CONFIG_HTC_I2CPLD is not set | ||
| 1060 | # CONFIG_TPS65010 is not set | 1070 | # CONFIG_TPS65010 is not set |
| 1061 | # CONFIG_TWL4030_CORE is not set | 1071 | # CONFIG_TWL4030_CORE is not set |
| 1062 | # CONFIG_MFD_TMIO is not set | 1072 | # CONFIG_MFD_TMIO is not set |
| 1063 | # CONFIG_PMIC_DA903X is not set | 1073 | # CONFIG_PMIC_DA903X is not set |
| 1064 | # CONFIG_PMIC_ADP5520 is not set | 1074 | # CONFIG_PMIC_ADP5520 is not set |
| 1075 | # CONFIG_MFD_MAX8925 is not set | ||
| 1065 | # CONFIG_MFD_WM8400 is not set | 1076 | # CONFIG_MFD_WM8400 is not set |
| 1066 | # CONFIG_MFD_WM831X is not set | 1077 | # CONFIG_MFD_WM831X is not set |
| 1067 | # CONFIG_MFD_WM8350_I2C is not set | 1078 | # CONFIG_MFD_WM8350_I2C is not set |
| 1079 | # CONFIG_MFD_WM8994 is not set | ||
| 1068 | # CONFIG_MFD_PCF50633 is not set | 1080 | # CONFIG_MFD_PCF50633 is not set |
| 1069 | # CONFIG_AB3100_CORE is not set | 1081 | # CONFIG_AB3100_CORE is not set |
| 1070 | # CONFIG_MFD_88PM8607 is not set | 1082 | # CONFIG_MFD_TIMBERDALE is not set |
| 1083 | # CONFIG_LPC_SCH is not set | ||
| 1071 | # CONFIG_REGULATOR is not set | 1084 | # CONFIG_REGULATOR is not set |
| 1072 | # CONFIG_MEDIA_SUPPORT is not set | 1085 | # CONFIG_MEDIA_SUPPORT is not set |
| 1073 | 1086 | ||
| @@ -1076,6 +1089,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1076 | # | 1089 | # |
| 1077 | # CONFIG_AGP is not set | 1090 | # CONFIG_AGP is not set |
| 1078 | CONFIG_VGA_ARB=y | 1091 | CONFIG_VGA_ARB=y |
| 1092 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1079 | # CONFIG_DRM is not set | 1093 | # CONFIG_DRM is not set |
| 1080 | # CONFIG_VGASTATE is not set | 1094 | # CONFIG_VGASTATE is not set |
| 1081 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1095 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1213,6 +1227,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1213 | # CONFIG_JFFS2_LZO is not set | 1227 | # CONFIG_JFFS2_LZO is not set |
| 1214 | CONFIG_JFFS2_RTIME=y | 1228 | CONFIG_JFFS2_RTIME=y |
| 1215 | # CONFIG_JFFS2_RUBIN is not set | 1229 | # CONFIG_JFFS2_RUBIN is not set |
| 1230 | # CONFIG_LOGFS is not set | ||
| 1216 | CONFIG_CRAMFS=y | 1231 | CONFIG_CRAMFS=y |
| 1217 | # CONFIG_SQUASHFS is not set | 1232 | # CONFIG_SQUASHFS is not set |
| 1218 | # CONFIG_VXFS_FS is not set | 1233 | # CONFIG_VXFS_FS is not set |
| @@ -1235,6 +1250,7 @@ CONFIG_SUNRPC=y | |||
| 1235 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1250 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1236 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1251 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1237 | # CONFIG_SMB_FS is not set | 1252 | # CONFIG_SMB_FS is not set |
| 1253 | # CONFIG_CEPH_FS is not set | ||
| 1238 | # CONFIG_CIFS is not set | 1254 | # CONFIG_CIFS is not set |
| 1239 | # CONFIG_NCP_FS is not set | 1255 | # CONFIG_NCP_FS is not set |
| 1240 | # CONFIG_CODA_FS is not set | 1256 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig index fc656af04ea1..2cf80dba0286 100644 --- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig +++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:37 2010 | 4 | # Mon Apr 19 23:17:01 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -69,6 +69,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 69 | # CONFIG_PPC_DCR_NATIVE is not set | 69 | # CONFIG_PPC_DCR_NATIVE is not set |
| 70 | # CONFIG_PPC_DCR_MMIO is not set | 70 | # CONFIG_PPC_DCR_MMIO is not set |
| 71 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 71 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 72 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 73 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 75 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 72 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 76 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 73 | CONFIG_CONSTRUCTORS=y | 77 | CONFIG_CONSTRUCTORS=y |
| 74 | 78 | ||
| @@ -104,10 +108,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 104 | CONFIG_IKCONFIG=y | 108 | CONFIG_IKCONFIG=y |
| 105 | CONFIG_IKCONFIG_PROC=y | 109 | CONFIG_IKCONFIG_PROC=y |
| 106 | CONFIG_LOG_BUF_SHIFT=14 | 110 | CONFIG_LOG_BUF_SHIFT=14 |
| 107 | # CONFIG_GROUP_SCHED is not set | ||
| 108 | # CONFIG_CGROUPS is not set | 111 | # CONFIG_CGROUPS is not set |
| 109 | CONFIG_SYSFS_DEPRECATED=y | 112 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 110 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 111 | # CONFIG_RELAY is not set | 113 | # CONFIG_RELAY is not set |
| 112 | # CONFIG_NAMESPACES is not set | 114 | # CONFIG_NAMESPACES is not set |
| 113 | CONFIG_BLK_DEV_INITRD=y | 115 | CONFIG_BLK_DEV_INITRD=y |
| @@ -115,6 +117,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 115 | CONFIG_RD_GZIP=y | 117 | CONFIG_RD_GZIP=y |
| 116 | # CONFIG_RD_BZIP2 is not set | 118 | # CONFIG_RD_BZIP2 is not set |
| 117 | # CONFIG_RD_LZMA is not set | 119 | # CONFIG_RD_LZMA is not set |
| 120 | # CONFIG_RD_LZO is not set | ||
| 118 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 121 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 119 | CONFIG_SYSCTL=y | 122 | CONFIG_SYSCTL=y |
| 120 | CONFIG_ANON_INODES=y | 123 | CONFIG_ANON_INODES=y |
| @@ -328,6 +331,7 @@ CONFIG_ISA_DMA_API=y | |||
| 328 | # Bus options | 331 | # Bus options |
| 329 | # | 332 | # |
| 330 | CONFIG_ZONE_DMA=y | 333 | CONFIG_ZONE_DMA=y |
| 334 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 331 | CONFIG_PPC_INDIRECT_PCI=y | 335 | CONFIG_PPC_INDIRECT_PCI=y |
| 332 | CONFIG_FSL_SOC=y | 336 | CONFIG_FSL_SOC=y |
| 333 | CONFIG_FSL_PCI=y | 337 | CONFIG_FSL_PCI=y |
| @@ -343,7 +347,6 @@ CONFIG_PCIEAER=y | |||
| 343 | # CONFIG_PCIEASPM is not set | 347 | # CONFIG_PCIEASPM is not set |
| 344 | CONFIG_ARCH_SUPPORTS_MSI=y | 348 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 345 | CONFIG_PCI_MSI=y | 349 | CONFIG_PCI_MSI=y |
| 346 | CONFIG_PCI_LEGACY=y | ||
| 347 | # CONFIG_PCI_DEBUG is not set | 350 | # CONFIG_PCI_DEBUG is not set |
| 348 | # CONFIG_PCI_STUB is not set | 351 | # CONFIG_PCI_STUB is not set |
| 349 | # CONFIG_PCI_IOV is not set | 352 | # CONFIG_PCI_IOV is not set |
| @@ -375,7 +378,6 @@ CONFIG_NET=y | |||
| 375 | # Networking options | 378 | # Networking options |
| 376 | # | 379 | # |
| 377 | CONFIG_PACKET=y | 380 | CONFIG_PACKET=y |
| 378 | # CONFIG_PACKET_MMAP is not set | ||
| 379 | CONFIG_UNIX=y | 381 | CONFIG_UNIX=y |
| 380 | CONFIG_XFRM=y | 382 | CONFIG_XFRM=y |
| 381 | CONFIG_XFRM_USER=y | 383 | CONFIG_XFRM_USER=y |
| @@ -600,6 +602,8 @@ CONFIG_MTD_NAND_FSL_UPM=y | |||
| 600 | # UBI - Unsorted block images | 602 | # UBI - Unsorted block images |
| 601 | # | 603 | # |
| 602 | # CONFIG_MTD_UBI is not set | 604 | # CONFIG_MTD_UBI is not set |
| 605 | CONFIG_OF_FLATTREE=y | ||
| 606 | CONFIG_OF_DYNAMIC=y | ||
| 603 | CONFIG_OF_DEVICE=y | 607 | CONFIG_OF_DEVICE=y |
| 604 | CONFIG_OF_GPIO=y | 608 | CONFIG_OF_GPIO=y |
| 605 | CONFIG_OF_I2C=y | 609 | CONFIG_OF_I2C=y |
| @@ -637,6 +641,7 @@ CONFIG_MISC_DEVICES=y | |||
| 637 | # CONFIG_ENCLOSURE_SERVICES is not set | 641 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 638 | # CONFIG_HP_ILO is not set | 642 | # CONFIG_HP_ILO is not set |
| 639 | # CONFIG_ISL29003 is not set | 643 | # CONFIG_ISL29003 is not set |
| 644 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 640 | # CONFIG_DS1682 is not set | 645 | # CONFIG_DS1682 is not set |
| 641 | # CONFIG_C2PORT is not set | 646 | # CONFIG_C2PORT is not set |
| 642 | 647 | ||
| @@ -654,6 +659,7 @@ CONFIG_HAVE_IDE=y | |||
| 654 | # | 659 | # |
| 655 | # SCSI device support | 660 | # SCSI device support |
| 656 | # | 661 | # |
| 662 | CONFIG_SCSI_MOD=y | ||
| 657 | # CONFIG_RAID_ATTRS is not set | 663 | # CONFIG_RAID_ATTRS is not set |
| 658 | CONFIG_SCSI=y | 664 | CONFIG_SCSI=y |
| 659 | CONFIG_SCSI_DMA=y | 665 | CONFIG_SCSI_DMA=y |
| @@ -777,6 +783,7 @@ CONFIG_PATA_ALI=y | |||
| 777 | # CONFIG_PATA_IT821X is not set | 783 | # CONFIG_PATA_IT821X is not set |
| 778 | # CONFIG_PATA_IT8213 is not set | 784 | # CONFIG_PATA_IT8213 is not set |
| 779 | # CONFIG_PATA_JMICRON is not set | 785 | # CONFIG_PATA_JMICRON is not set |
| 786 | # CONFIG_PATA_LEGACY is not set | ||
| 780 | # CONFIG_PATA_TRIFLEX is not set | 787 | # CONFIG_PATA_TRIFLEX is not set |
| 781 | # CONFIG_PATA_MARVELL is not set | 788 | # CONFIG_PATA_MARVELL is not set |
| 782 | # CONFIG_PATA_MPIIX is not set | 789 | # CONFIG_PATA_MPIIX is not set |
| @@ -1004,6 +1011,7 @@ CONFIG_SERIAL_CORE=y | |||
| 1004 | CONFIG_SERIAL_CORE_CONSOLE=y | 1011 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1005 | # CONFIG_SERIAL_JSM is not set | 1012 | # CONFIG_SERIAL_JSM is not set |
| 1006 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1013 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1014 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1007 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1015 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1008 | CONFIG_UNIX98_PTYS=y | 1016 | CONFIG_UNIX98_PTYS=y |
| 1009 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1017 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1053,6 +1061,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1053 | CONFIG_I2C_MPC=y | 1061 | CONFIG_I2C_MPC=y |
| 1054 | # CONFIG_I2C_OCORES is not set | 1062 | # CONFIG_I2C_OCORES is not set |
| 1055 | # CONFIG_I2C_SIMTEC is not set | 1063 | # CONFIG_I2C_SIMTEC is not set |
| 1064 | # CONFIG_I2C_XILINX is not set | ||
| 1056 | 1065 | ||
| 1057 | # | 1066 | # |
| 1058 | # External I2C/SMBus adapter drivers | 1067 | # External I2C/SMBus adapter drivers |
| @@ -1066,15 +1075,9 @@ CONFIG_I2C_MPC=y | |||
| 1066 | # | 1075 | # |
| 1067 | # CONFIG_I2C_PCA_PLATFORM is not set | 1076 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1068 | # CONFIG_I2C_STUB is not set | 1077 | # CONFIG_I2C_STUB is not set |
| 1069 | |||
| 1070 | # | ||
| 1071 | # Miscellaneous I2C Chip support | ||
| 1072 | # | ||
| 1073 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1074 | # CONFIG_I2C_DEBUG_CORE is not set | 1078 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1075 | # CONFIG_I2C_DEBUG_ALGO is not set | 1079 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1076 | # CONFIG_I2C_DEBUG_BUS is not set | 1080 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1077 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1078 | # CONFIG_SPI is not set | 1081 | # CONFIG_SPI is not set |
| 1079 | 1082 | ||
| 1080 | # | 1083 | # |
| @@ -1090,14 +1093,19 @@ CONFIG_GPIO_SYSFS=y | |||
| 1090 | # | 1093 | # |
| 1091 | # Memory mapped GPIO expanders: | 1094 | # Memory mapped GPIO expanders: |
| 1092 | # | 1095 | # |
| 1096 | # CONFIG_GPIO_IT8761E is not set | ||
| 1093 | # CONFIG_GPIO_XILINX is not set | 1097 | # CONFIG_GPIO_XILINX is not set |
| 1098 | # CONFIG_GPIO_SCH is not set | ||
| 1094 | 1099 | ||
| 1095 | # | 1100 | # |
| 1096 | # I2C GPIO expanders: | 1101 | # I2C GPIO expanders: |
| 1097 | # | 1102 | # |
| 1103 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1098 | # CONFIG_GPIO_MAX732X is not set | 1104 | # CONFIG_GPIO_MAX732X is not set |
| 1099 | CONFIG_GPIO_PCA953X=y | 1105 | CONFIG_GPIO_PCA953X=y |
| 1106 | # CONFIG_GPIO_PCA953X_IRQ is not set | ||
| 1100 | # CONFIG_GPIO_PCF857X is not set | 1107 | # CONFIG_GPIO_PCF857X is not set |
| 1108 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1101 | 1109 | ||
| 1102 | # | 1110 | # |
| 1103 | # PCI GPIO expanders: | 1111 | # PCI GPIO expanders: |
| @@ -1130,10 +1138,11 @@ CONFIG_HWMON=y | |||
| 1130 | # CONFIG_SENSORS_ADM1029 is not set | 1138 | # CONFIG_SENSORS_ADM1029 is not set |
| 1131 | # CONFIG_SENSORS_ADM1031 is not set | 1139 | # CONFIG_SENSORS_ADM1031 is not set |
| 1132 | # CONFIG_SENSORS_ADM9240 is not set | 1140 | # CONFIG_SENSORS_ADM9240 is not set |
| 1141 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1133 | # CONFIG_SENSORS_ADT7462 is not set | 1142 | # CONFIG_SENSORS_ADT7462 is not set |
| 1134 | # CONFIG_SENSORS_ADT7470 is not set | 1143 | # CONFIG_SENSORS_ADT7470 is not set |
| 1135 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1136 | # CONFIG_SENSORS_ADT7475 is not set | 1144 | # CONFIG_SENSORS_ADT7475 is not set |
| 1145 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1137 | # CONFIG_SENSORS_ATXP1 is not set | 1146 | # CONFIG_SENSORS_ATXP1 is not set |
| 1138 | CONFIG_SENSORS_DS1621=y | 1147 | CONFIG_SENSORS_DS1621=y |
| 1139 | # CONFIG_SENSORS_I5K_AMB is not set | 1148 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1171,6 +1180,7 @@ CONFIG_SENSORS_LM90=y | |||
| 1171 | # CONFIG_SENSORS_SMSC47M192 is not set | 1180 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1172 | # CONFIG_SENSORS_SMSC47B397 is not set | 1181 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1173 | # CONFIG_SENSORS_ADS7828 is not set | 1182 | # CONFIG_SENSORS_ADS7828 is not set |
| 1183 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1174 | # CONFIG_SENSORS_THMC50 is not set | 1184 | # CONFIG_SENSORS_THMC50 is not set |
| 1175 | # CONFIG_SENSORS_TMP401 is not set | 1185 | # CONFIG_SENSORS_TMP401 is not set |
| 1176 | # CONFIG_SENSORS_TMP421 is not set | 1186 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1218,19 +1228,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1218 | # Multifunction device drivers | 1228 | # Multifunction device drivers |
| 1219 | # | 1229 | # |
| 1220 | # CONFIG_MFD_CORE is not set | 1230 | # CONFIG_MFD_CORE is not set |
| 1231 | # CONFIG_MFD_88PM860X is not set | ||
| 1221 | # CONFIG_MFD_SM501 is not set | 1232 | # CONFIG_MFD_SM501 is not set |
| 1222 | # CONFIG_HTC_PASIC3 is not set | 1233 | # CONFIG_HTC_PASIC3 is not set |
| 1234 | # CONFIG_HTC_I2CPLD is not set | ||
| 1223 | # CONFIG_TPS65010 is not set | 1235 | # CONFIG_TPS65010 is not set |
| 1224 | # CONFIG_TWL4030_CORE is not set | 1236 | # CONFIG_TWL4030_CORE is not set |
| 1225 | # CONFIG_MFD_TMIO is not set | 1237 | # CONFIG_MFD_TMIO is not set |
| 1226 | # CONFIG_PMIC_DA903X is not set | 1238 | # CONFIG_PMIC_DA903X is not set |
| 1227 | # CONFIG_PMIC_ADP5520 is not set | 1239 | # CONFIG_PMIC_ADP5520 is not set |
| 1240 | # CONFIG_MFD_MAX8925 is not set | ||
| 1228 | # CONFIG_MFD_WM8400 is not set | 1241 | # CONFIG_MFD_WM8400 is not set |
| 1229 | # CONFIG_MFD_WM831X is not set | 1242 | # CONFIG_MFD_WM831X is not set |
| 1230 | # CONFIG_MFD_WM8350_I2C is not set | 1243 | # CONFIG_MFD_WM8350_I2C is not set |
| 1244 | # CONFIG_MFD_WM8994 is not set | ||
| 1231 | # CONFIG_MFD_PCF50633 is not set | 1245 | # CONFIG_MFD_PCF50633 is not set |
| 1232 | # CONFIG_AB3100_CORE is not set | 1246 | # CONFIG_AB3100_CORE is not set |
| 1233 | # CONFIG_MFD_88PM8607 is not set | 1247 | # CONFIG_MFD_TIMBERDALE is not set |
| 1248 | # CONFIG_LPC_SCH is not set | ||
| 1234 | # CONFIG_REGULATOR is not set | 1249 | # CONFIG_REGULATOR is not set |
| 1235 | # CONFIG_MEDIA_SUPPORT is not set | 1250 | # CONFIG_MEDIA_SUPPORT is not set |
| 1236 | 1251 | ||
| @@ -1239,6 +1254,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1239 | # | 1254 | # |
| 1240 | # CONFIG_AGP is not set | 1255 | # CONFIG_AGP is not set |
| 1241 | CONFIG_VGA_ARB=y | 1256 | CONFIG_VGA_ARB=y |
| 1257 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1242 | # CONFIG_DRM is not set | 1258 | # CONFIG_DRM is not set |
| 1243 | # CONFIG_VGASTATE is not set | 1259 | # CONFIG_VGASTATE is not set |
| 1244 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1260 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1271,6 +1287,7 @@ CONFIG_USB_HID=y | |||
| 1271 | # | 1287 | # |
| 1272 | # Special HID drivers | 1288 | # Special HID drivers |
| 1273 | # | 1289 | # |
| 1290 | # CONFIG_HID_3M_PCT is not set | ||
| 1274 | # CONFIG_HID_A4TECH is not set | 1291 | # CONFIG_HID_A4TECH is not set |
| 1275 | # CONFIG_HID_APPLE is not set | 1292 | # CONFIG_HID_APPLE is not set |
| 1276 | # CONFIG_HID_BELKIN is not set | 1293 | # CONFIG_HID_BELKIN is not set |
| @@ -1285,12 +1302,16 @@ CONFIG_USB_HID=y | |||
| 1285 | # CONFIG_HID_KENSINGTON is not set | 1302 | # CONFIG_HID_KENSINGTON is not set |
| 1286 | # CONFIG_HID_LOGITECH is not set | 1303 | # CONFIG_HID_LOGITECH is not set |
| 1287 | # CONFIG_HID_MICROSOFT is not set | 1304 | # CONFIG_HID_MICROSOFT is not set |
| 1305 | # CONFIG_HID_MOSART is not set | ||
| 1288 | # CONFIG_HID_MONTEREY is not set | 1306 | # CONFIG_HID_MONTEREY is not set |
| 1289 | # CONFIG_HID_NTRIG is not set | 1307 | # CONFIG_HID_NTRIG is not set |
| 1308 | # CONFIG_HID_ORTEK is not set | ||
| 1290 | # CONFIG_HID_PANTHERLORD is not set | 1309 | # CONFIG_HID_PANTHERLORD is not set |
| 1291 | # CONFIG_HID_PETALYNX is not set | 1310 | # CONFIG_HID_PETALYNX is not set |
| 1311 | # CONFIG_HID_QUANTA is not set | ||
| 1292 | # CONFIG_HID_SAMSUNG is not set | 1312 | # CONFIG_HID_SAMSUNG is not set |
| 1293 | # CONFIG_HID_SONY is not set | 1313 | # CONFIG_HID_SONY is not set |
| 1314 | # CONFIG_HID_STANTUM is not set | ||
| 1294 | # CONFIG_HID_SUNPLUS is not set | 1315 | # CONFIG_HID_SUNPLUS is not set |
| 1295 | # CONFIG_HID_GREENASIA is not set | 1316 | # CONFIG_HID_GREENASIA is not set |
| 1296 | # CONFIG_HID_SMARTJOYPLUS is not set | 1317 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1386,7 +1407,6 @@ CONFIG_USB_STORAGE=y | |||
| 1386 | # CONFIG_USB_RIO500 is not set | 1407 | # CONFIG_USB_RIO500 is not set |
| 1387 | # CONFIG_USB_LEGOTOWER is not set | 1408 | # CONFIG_USB_LEGOTOWER is not set |
| 1388 | # CONFIG_USB_LCD is not set | 1409 | # CONFIG_USB_LCD is not set |
| 1389 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1390 | # CONFIG_USB_LED is not set | 1410 | # CONFIG_USB_LED is not set |
| 1391 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1411 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1392 | # CONFIG_USB_CYTHERM is not set | 1412 | # CONFIG_USB_CYTHERM is not set |
| @@ -1398,7 +1418,6 @@ CONFIG_USB_STORAGE=y | |||
| 1398 | # CONFIG_USB_IOWARRIOR is not set | 1418 | # CONFIG_USB_IOWARRIOR is not set |
| 1399 | # CONFIG_USB_TEST is not set | 1419 | # CONFIG_USB_TEST is not set |
| 1400 | # CONFIG_USB_ISIGHTFW is not set | 1420 | # CONFIG_USB_ISIGHTFW is not set |
| 1401 | # CONFIG_USB_VST is not set | ||
| 1402 | # CONFIG_USB_GADGET is not set | 1421 | # CONFIG_USB_GADGET is not set |
| 1403 | 1422 | ||
| 1404 | # | 1423 | # |
| @@ -1423,11 +1442,11 @@ CONFIG_LEDS_GPIO_OF=y | |||
| 1423 | CONFIG_LEDS_PCA955X=y | 1442 | CONFIG_LEDS_PCA955X=y |
| 1424 | # CONFIG_LEDS_BD2802 is not set | 1443 | # CONFIG_LEDS_BD2802 is not set |
| 1425 | # CONFIG_LEDS_LT3593 is not set | 1444 | # CONFIG_LEDS_LT3593 is not set |
| 1445 | CONFIG_LEDS_TRIGGERS=y | ||
| 1426 | 1446 | ||
| 1427 | # | 1447 | # |
| 1428 | # LED Triggers | 1448 | # LED Triggers |
| 1429 | # | 1449 | # |
| 1430 | CONFIG_LEDS_TRIGGERS=y | ||
| 1431 | CONFIG_LEDS_TRIGGER_TIMER=y | 1450 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 1432 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1451 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 1433 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | 1452 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set |
| @@ -1506,6 +1525,7 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1506 | # | 1525 | # |
| 1507 | # CONFIG_RTC_DRV_GENERIC is not set | 1526 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1508 | CONFIG_DMADEVICES=y | 1527 | CONFIG_DMADEVICES=y |
| 1528 | # CONFIG_DMADEVICES_DEBUG is not set | ||
| 1509 | 1529 | ||
| 1510 | # | 1530 | # |
| 1511 | # DMA Devices | 1531 | # DMA Devices |
| @@ -1614,6 +1634,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1614 | # CONFIG_JFFS2_LZO is not set | 1634 | # CONFIG_JFFS2_LZO is not set |
| 1615 | CONFIG_JFFS2_RTIME=y | 1635 | CONFIG_JFFS2_RTIME=y |
| 1616 | # CONFIG_JFFS2_RUBIN is not set | 1636 | # CONFIG_JFFS2_RUBIN is not set |
| 1637 | # CONFIG_LOGFS is not set | ||
| 1617 | # CONFIG_CRAMFS is not set | 1638 | # CONFIG_CRAMFS is not set |
| 1618 | # CONFIG_SQUASHFS is not set | 1639 | # CONFIG_SQUASHFS is not set |
| 1619 | # CONFIG_VXFS_FS is not set | 1640 | # CONFIG_VXFS_FS is not set |
| @@ -1641,6 +1662,7 @@ CONFIG_SUNRPC=y | |||
| 1641 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1662 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1642 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1663 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1643 | # CONFIG_SMB_FS is not set | 1664 | # CONFIG_SMB_FS is not set |
| 1665 | # CONFIG_CEPH_FS is not set | ||
| 1644 | # CONFIG_CIFS is not set | 1666 | # CONFIG_CIFS is not set |
| 1645 | # CONFIG_NCP_FS is not set | 1667 | # CONFIG_NCP_FS is not set |
| 1646 | # CONFIG_CODA_FS is not set | 1668 | # CONFIG_CODA_FS is not set |
| @@ -1851,6 +1873,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1851 | CONFIG_CRYPTO_MANAGER2=y | 1873 | CONFIG_CRYPTO_MANAGER2=y |
| 1852 | # CONFIG_CRYPTO_GF128MUL is not set | 1874 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1853 | # CONFIG_CRYPTO_NULL is not set | 1875 | # CONFIG_CRYPTO_NULL is not set |
| 1876 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1854 | CONFIG_CRYPTO_WORKQUEUE=y | 1877 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1855 | # CONFIG_CRYPTO_CRYPTD is not set | 1878 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1856 | # CONFIG_CRYPTO_AUTHENC is not set | 1879 | # CONFIG_CRYPTO_AUTHENC is not set |
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig index 622d84f48aba..183c59c6d896 100644 --- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig +++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:43 2010 | 4 | # Mon Apr 19 23:17:07 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -102,11 +102,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 102 | CONFIG_IKCONFIG=y | 102 | CONFIG_IKCONFIG=y |
| 103 | CONFIG_IKCONFIG_PROC=y | 103 | CONFIG_IKCONFIG_PROC=y |
| 104 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 105 | CONFIG_GROUP_SCHED=y | ||
| 106 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 107 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 108 | CONFIG_USER_SCHED=y | ||
| 109 | # CONFIG_CGROUP_SCHED is not set | ||
| 110 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 111 | CONFIG_SYSFS_DEPRECATED=y | 106 | CONFIG_SYSFS_DEPRECATED=y |
| 112 | CONFIG_SYSFS_DEPRECATED_V2=y | 107 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -117,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 117 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 118 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 119 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 120 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 121 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 122 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -325,6 +321,7 @@ CONFIG_ISA_DMA_API=y | |||
| 325 | # Bus options | 321 | # Bus options |
| 326 | # | 322 | # |
| 327 | CONFIG_ZONE_DMA=y | 323 | CONFIG_ZONE_DMA=y |
| 324 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 328 | CONFIG_GENERIC_ISA_DMA=y | 325 | CONFIG_GENERIC_ISA_DMA=y |
| 329 | CONFIG_PPC_INDIRECT_PCI=y | 326 | CONFIG_PPC_INDIRECT_PCI=y |
| 330 | CONFIG_FSL_SOC=y | 327 | CONFIG_FSL_SOC=y |
| @@ -340,13 +337,11 @@ CONFIG_PCIEAER=y | |||
| 340 | # CONFIG_PCIEASPM is not set | 337 | # CONFIG_PCIEASPM is not set |
| 341 | CONFIG_ARCH_SUPPORTS_MSI=y | 338 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 342 | # CONFIG_PCI_MSI is not set | 339 | # CONFIG_PCI_MSI is not set |
| 343 | # CONFIG_PCI_LEGACY is not set | ||
| 344 | # CONFIG_PCI_STUB is not set | 340 | # CONFIG_PCI_STUB is not set |
| 345 | # CONFIG_PCI_IOV is not set | 341 | # CONFIG_PCI_IOV is not set |
| 346 | CONFIG_PCCARD=y | 342 | CONFIG_PCCARD=y |
| 347 | CONFIG_PCMCIA=y | 343 | CONFIG_PCMCIA=y |
| 348 | # CONFIG_PCMCIA_LOAD_CIS is not set | 344 | # CONFIG_PCMCIA_LOAD_CIS is not set |
| 349 | # CONFIG_PCMCIA_IOCTL is not set | ||
| 350 | # CONFIG_CARDBUS is not set | 345 | # CONFIG_CARDBUS is not set |
| 351 | 346 | ||
| 352 | # | 347 | # |
| @@ -382,7 +377,6 @@ CONFIG_NET=y | |||
| 382 | # Networking options | 377 | # Networking options |
| 383 | # | 378 | # |
| 384 | CONFIG_PACKET=y | 379 | CONFIG_PACKET=y |
| 385 | CONFIG_PACKET_MMAP=y | ||
| 386 | CONFIG_UNIX=y | 380 | CONFIG_UNIX=y |
| 387 | CONFIG_XFRM=y | 381 | CONFIG_XFRM=y |
| 388 | CONFIG_XFRM_USER=m | 382 | CONFIG_XFRM_USER=m |
| @@ -592,6 +586,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 592 | # UBI - Unsorted block images | 586 | # UBI - Unsorted block images |
| 593 | # | 587 | # |
| 594 | # CONFIG_MTD_UBI is not set | 588 | # CONFIG_MTD_UBI is not set |
| 589 | CONFIG_OF_FLATTREE=y | ||
| 590 | CONFIG_OF_DYNAMIC=y | ||
| 595 | CONFIG_OF_DEVICE=y | 591 | CONFIG_OF_DEVICE=y |
| 596 | CONFIG_OF_GPIO=y | 592 | CONFIG_OF_GPIO=y |
| 597 | CONFIG_OF_I2C=y | 593 | CONFIG_OF_I2C=y |
| @@ -629,6 +625,7 @@ CONFIG_MISC_DEVICES=y | |||
| 629 | # CONFIG_ENCLOSURE_SERVICES is not set | 625 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 630 | # CONFIG_HP_ILO is not set | 626 | # CONFIG_HP_ILO is not set |
| 631 | # CONFIG_ISL29003 is not set | 627 | # CONFIG_ISL29003 is not set |
| 628 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 632 | CONFIG_DS1682=y | 629 | CONFIG_DS1682=y |
| 633 | # CONFIG_C2PORT is not set | 630 | # CONFIG_C2PORT is not set |
| 634 | 631 | ||
| @@ -695,6 +692,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 695 | # | 692 | # |
| 696 | # SCSI device support | 693 | # SCSI device support |
| 697 | # | 694 | # |
| 695 | CONFIG_SCSI_MOD=y | ||
| 698 | # CONFIG_RAID_ATTRS is not set | 696 | # CONFIG_RAID_ATTRS is not set |
| 699 | CONFIG_SCSI=y | 697 | CONFIG_SCSI=y |
| 700 | CONFIG_SCSI_DMA=y | 698 | CONFIG_SCSI_DMA=y |
| @@ -819,6 +817,7 @@ CONFIG_SATA_SIL=y | |||
| 819 | # CONFIG_PATA_IT821X is not set | 817 | # CONFIG_PATA_IT821X is not set |
| 820 | # CONFIG_PATA_IT8213 is not set | 818 | # CONFIG_PATA_IT8213 is not set |
| 821 | # CONFIG_PATA_JMICRON is not set | 819 | # CONFIG_PATA_JMICRON is not set |
| 820 | # CONFIG_PATA_LEGACY is not set | ||
| 822 | # CONFIG_PATA_TRIFLEX is not set | 821 | # CONFIG_PATA_TRIFLEX is not set |
| 823 | # CONFIG_PATA_MARVELL is not set | 822 | # CONFIG_PATA_MARVELL is not set |
| 824 | # CONFIG_PATA_MPIIX is not set | 823 | # CONFIG_PATA_MPIIX is not set |
| @@ -1059,6 +1058,7 @@ CONFIG_SERIAL_CORE=y | |||
| 1059 | CONFIG_SERIAL_CORE_CONSOLE=y | 1058 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1060 | # CONFIG_SERIAL_JSM is not set | 1059 | # CONFIG_SERIAL_JSM is not set |
| 1061 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1060 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1061 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1062 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1062 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1063 | CONFIG_UNIX98_PTYS=y | 1063 | CONFIG_UNIX98_PTYS=y |
| 1064 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1064 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1116,6 +1116,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1116 | CONFIG_I2C_MPC=y | 1116 | CONFIG_I2C_MPC=y |
| 1117 | # CONFIG_I2C_OCORES is not set | 1117 | # CONFIG_I2C_OCORES is not set |
| 1118 | # CONFIG_I2C_SIMTEC is not set | 1118 | # CONFIG_I2C_SIMTEC is not set |
| 1119 | # CONFIG_I2C_XILINX is not set | ||
| 1119 | 1120 | ||
| 1120 | # | 1121 | # |
| 1121 | # External I2C/SMBus adapter drivers | 1122 | # External I2C/SMBus adapter drivers |
| @@ -1129,15 +1130,9 @@ CONFIG_I2C_MPC=y | |||
| 1129 | # | 1130 | # |
| 1130 | # CONFIG_I2C_PCA_PLATFORM is not set | 1131 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1131 | # CONFIG_I2C_STUB is not set | 1132 | # CONFIG_I2C_STUB is not set |
| 1132 | |||
| 1133 | # | ||
| 1134 | # Miscellaneous I2C Chip support | ||
| 1135 | # | ||
| 1136 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1137 | # CONFIG_I2C_DEBUG_CORE is not set | 1133 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1138 | # CONFIG_I2C_DEBUG_ALGO is not set | 1134 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1139 | # CONFIG_I2C_DEBUG_BUS is not set | 1135 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1140 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1141 | # CONFIG_SPI is not set | 1136 | # CONFIG_SPI is not set |
| 1142 | 1137 | ||
| 1143 | # | 1138 | # |
| @@ -1152,14 +1147,18 @@ CONFIG_GPIO_SYSFS=y | |||
| 1152 | # | 1147 | # |
| 1153 | # Memory mapped GPIO expanders: | 1148 | # Memory mapped GPIO expanders: |
| 1154 | # | 1149 | # |
| 1150 | # CONFIG_GPIO_IT8761E is not set | ||
| 1155 | # CONFIG_GPIO_XILINX is not set | 1151 | # CONFIG_GPIO_XILINX is not set |
| 1152 | # CONFIG_GPIO_SCH is not set | ||
| 1156 | 1153 | ||
| 1157 | # | 1154 | # |
| 1158 | # I2C GPIO expanders: | 1155 | # I2C GPIO expanders: |
| 1159 | # | 1156 | # |
| 1157 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1160 | # CONFIG_GPIO_MAX732X is not set | 1158 | # CONFIG_GPIO_MAX732X is not set |
| 1161 | # CONFIG_GPIO_PCA953X is not set | 1159 | # CONFIG_GPIO_PCA953X is not set |
| 1162 | # CONFIG_GPIO_PCF857X is not set | 1160 | # CONFIG_GPIO_PCF857X is not set |
| 1161 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1163 | 1162 | ||
| 1164 | # | 1163 | # |
| 1165 | # PCI GPIO expanders: | 1164 | # PCI GPIO expanders: |
| @@ -1192,10 +1191,11 @@ CONFIG_HWMON=y | |||
| 1192 | # CONFIG_SENSORS_ADM1029 is not set | 1191 | # CONFIG_SENSORS_ADM1029 is not set |
| 1193 | # CONFIG_SENSORS_ADM1031 is not set | 1192 | # CONFIG_SENSORS_ADM1031 is not set |
| 1194 | # CONFIG_SENSORS_ADM9240 is not set | 1193 | # CONFIG_SENSORS_ADM9240 is not set |
| 1194 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1195 | # CONFIG_SENSORS_ADT7462 is not set | 1195 | # CONFIG_SENSORS_ADT7462 is not set |
| 1196 | # CONFIG_SENSORS_ADT7470 is not set | 1196 | # CONFIG_SENSORS_ADT7470 is not set |
| 1197 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1198 | # CONFIG_SENSORS_ADT7475 is not set | 1197 | # CONFIG_SENSORS_ADT7475 is not set |
| 1198 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1199 | # CONFIG_SENSORS_ATXP1 is not set | 1199 | # CONFIG_SENSORS_ATXP1 is not set |
| 1200 | # CONFIG_SENSORS_DS1621 is not set | 1200 | # CONFIG_SENSORS_DS1621 is not set |
| 1201 | # CONFIG_SENSORS_I5K_AMB is not set | 1201 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1233,6 +1233,7 @@ CONFIG_SENSORS_LM92=y | |||
| 1233 | # CONFIG_SENSORS_SMSC47M192 is not set | 1233 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1234 | # CONFIG_SENSORS_SMSC47B397 is not set | 1234 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1235 | # CONFIG_SENSORS_ADS7828 is not set | 1235 | # CONFIG_SENSORS_ADS7828 is not set |
| 1236 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1236 | # CONFIG_SENSORS_THMC50 is not set | 1237 | # CONFIG_SENSORS_THMC50 is not set |
| 1237 | # CONFIG_SENSORS_TMP401 is not set | 1238 | # CONFIG_SENSORS_TMP401 is not set |
| 1238 | # CONFIG_SENSORS_TMP421 is not set | 1239 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1281,19 +1282,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1281 | # Multifunction device drivers | 1282 | # Multifunction device drivers |
| 1282 | # | 1283 | # |
| 1283 | # CONFIG_MFD_CORE is not set | 1284 | # CONFIG_MFD_CORE is not set |
| 1285 | # CONFIG_MFD_88PM860X is not set | ||
| 1284 | # CONFIG_MFD_SM501 is not set | 1286 | # CONFIG_MFD_SM501 is not set |
| 1285 | # CONFIG_HTC_PASIC3 is not set | 1287 | # CONFIG_HTC_PASIC3 is not set |
| 1288 | # CONFIG_HTC_I2CPLD is not set | ||
| 1286 | # CONFIG_TPS65010 is not set | 1289 | # CONFIG_TPS65010 is not set |
| 1287 | # CONFIG_TWL4030_CORE is not set | 1290 | # CONFIG_TWL4030_CORE is not set |
| 1288 | # CONFIG_MFD_TMIO is not set | 1291 | # CONFIG_MFD_TMIO is not set |
| 1289 | # CONFIG_PMIC_DA903X is not set | 1292 | # CONFIG_PMIC_DA903X is not set |
| 1290 | # CONFIG_PMIC_ADP5520 is not set | 1293 | # CONFIG_PMIC_ADP5520 is not set |
| 1294 | # CONFIG_MFD_MAX8925 is not set | ||
| 1291 | # CONFIG_MFD_WM8400 is not set | 1295 | # CONFIG_MFD_WM8400 is not set |
| 1292 | # CONFIG_MFD_WM831X is not set | 1296 | # CONFIG_MFD_WM831X is not set |
| 1293 | # CONFIG_MFD_WM8350_I2C is not set | 1297 | # CONFIG_MFD_WM8350_I2C is not set |
| 1298 | # CONFIG_MFD_WM8994 is not set | ||
| 1294 | # CONFIG_MFD_PCF50633 is not set | 1299 | # CONFIG_MFD_PCF50633 is not set |
| 1295 | # CONFIG_AB3100_CORE is not set | 1300 | # CONFIG_AB3100_CORE is not set |
| 1296 | # CONFIG_MFD_88PM8607 is not set | 1301 | # CONFIG_MFD_TIMBERDALE is not set |
| 1302 | # CONFIG_LPC_SCH is not set | ||
| 1297 | # CONFIG_REGULATOR is not set | 1303 | # CONFIG_REGULATOR is not set |
| 1298 | # CONFIG_MEDIA_SUPPORT is not set | 1304 | # CONFIG_MEDIA_SUPPORT is not set |
| 1299 | 1305 | ||
| @@ -1302,6 +1308,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1302 | # | 1308 | # |
| 1303 | # CONFIG_AGP is not set | 1309 | # CONFIG_AGP is not set |
| 1304 | CONFIG_VGA_ARB=y | 1310 | CONFIG_VGA_ARB=y |
| 1311 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1305 | # CONFIG_DRM is not set | 1312 | # CONFIG_DRM is not set |
| 1306 | # CONFIG_VGASTATE is not set | 1313 | # CONFIG_VGASTATE is not set |
| 1307 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1314 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1334,6 +1341,7 @@ CONFIG_USB_HID=y | |||
| 1334 | # | 1341 | # |
| 1335 | # Special HID drivers | 1342 | # Special HID drivers |
| 1336 | # | 1343 | # |
| 1344 | # CONFIG_HID_3M_PCT is not set | ||
| 1337 | CONFIG_HID_A4TECH=y | 1345 | CONFIG_HID_A4TECH=y |
| 1338 | CONFIG_HID_APPLE=y | 1346 | CONFIG_HID_APPLE=y |
| 1339 | CONFIG_HID_BELKIN=y | 1347 | CONFIG_HID_BELKIN=y |
| @@ -1349,14 +1357,19 @@ CONFIG_HID_GYRATION=y | |||
| 1349 | CONFIG_HID_LOGITECH=y | 1357 | CONFIG_HID_LOGITECH=y |
| 1350 | # CONFIG_LOGITECH_FF is not set | 1358 | # CONFIG_LOGITECH_FF is not set |
| 1351 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1359 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1360 | # CONFIG_LOGIG940_FF is not set | ||
| 1352 | CONFIG_HID_MICROSOFT=y | 1361 | CONFIG_HID_MICROSOFT=y |
| 1362 | # CONFIG_HID_MOSART is not set | ||
| 1353 | CONFIG_HID_MONTEREY=y | 1363 | CONFIG_HID_MONTEREY=y |
| 1354 | # CONFIG_HID_NTRIG is not set | 1364 | # CONFIG_HID_NTRIG is not set |
| 1365 | # CONFIG_HID_ORTEK is not set | ||
| 1355 | CONFIG_HID_PANTHERLORD=y | 1366 | CONFIG_HID_PANTHERLORD=y |
| 1356 | # CONFIG_PANTHERLORD_FF is not set | 1367 | # CONFIG_PANTHERLORD_FF is not set |
| 1357 | CONFIG_HID_PETALYNX=y | 1368 | CONFIG_HID_PETALYNX=y |
| 1369 | # CONFIG_HID_QUANTA is not set | ||
| 1358 | CONFIG_HID_SAMSUNG=y | 1370 | CONFIG_HID_SAMSUNG=y |
| 1359 | CONFIG_HID_SONY=y | 1371 | CONFIG_HID_SONY=y |
| 1372 | # CONFIG_HID_STANTUM is not set | ||
| 1360 | CONFIG_HID_SUNPLUS=y | 1373 | CONFIG_HID_SUNPLUS=y |
| 1361 | # CONFIG_HID_GREENASIA is not set | 1374 | # CONFIG_HID_GREENASIA is not set |
| 1362 | # CONFIG_HID_SMARTJOYPLUS is not set | 1375 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1463,7 +1476,6 @@ CONFIG_USB_STORAGE=y | |||
| 1463 | # CONFIG_USB_RIO500 is not set | 1476 | # CONFIG_USB_RIO500 is not set |
| 1464 | # CONFIG_USB_LEGOTOWER is not set | 1477 | # CONFIG_USB_LEGOTOWER is not set |
| 1465 | # CONFIG_USB_LCD is not set | 1478 | # CONFIG_USB_LCD is not set |
| 1466 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1467 | # CONFIG_USB_LED is not set | 1479 | # CONFIG_USB_LED is not set |
| 1468 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1480 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1469 | # CONFIG_USB_CYTHERM is not set | 1481 | # CONFIG_USB_CYTHERM is not set |
| @@ -1476,7 +1488,6 @@ CONFIG_USB_STORAGE=y | |||
| 1476 | # CONFIG_USB_IOWARRIOR is not set | 1488 | # CONFIG_USB_IOWARRIOR is not set |
| 1477 | # CONFIG_USB_TEST is not set | 1489 | # CONFIG_USB_TEST is not set |
| 1478 | # CONFIG_USB_ISIGHTFW is not set | 1490 | # CONFIG_USB_ISIGHTFW is not set |
| 1479 | # CONFIG_USB_VST is not set | ||
| 1480 | # CONFIG_USB_GADGET is not set | 1491 | # CONFIG_USB_GADGET is not set |
| 1481 | 1492 | ||
| 1482 | # | 1493 | # |
| @@ -1560,43 +1571,35 @@ CONFIG_RTC_DRV_RX8581=y | |||
| 1560 | CONFIG_STAGING=y | 1571 | CONFIG_STAGING=y |
| 1561 | # CONFIG_STAGING_EXCLUDE_BUILD is not set | 1572 | # CONFIG_STAGING_EXCLUDE_BUILD is not set |
| 1562 | # CONFIG_ET131X is not set | 1573 | # CONFIG_ET131X is not set |
| 1563 | # CONFIG_ME4000 is not set | ||
| 1564 | # CONFIG_MEILHAUS is not set | ||
| 1565 | # CONFIG_USB_IP_COMMON is not set | 1574 | # CONFIG_USB_IP_COMMON is not set |
| 1575 | # CONFIG_PRISM2_USB is not set | ||
| 1566 | # CONFIG_ECHO is not set | 1576 | # CONFIG_ECHO is not set |
| 1567 | # CONFIG_COMEDI is not set | 1577 | # CONFIG_COMEDI is not set |
| 1568 | # CONFIG_ASUS_OLED is not set | 1578 | # CONFIG_ASUS_OLED is not set |
| 1569 | # CONFIG_ALTERA_PCIE_CHDMA is not set | 1579 | # CONFIG_R8187SE is not set |
| 1570 | # CONFIG_INPUT_MIMIO is not set | 1580 | # CONFIG_RTL8192SU is not set |
| 1581 | # CONFIG_RTL8192U is not set | ||
| 1582 | # CONFIG_RTL8192E is not set | ||
| 1571 | # CONFIG_TRANZPORT is not set | 1583 | # CONFIG_TRANZPORT is not set |
| 1572 | 1584 | ||
| 1573 | # | 1585 | # |
| 1574 | # Android | ||
| 1575 | # | ||
| 1576 | # CONFIG_ANDROID is not set | ||
| 1577 | # CONFIG_DST is not set | ||
| 1578 | # CONFIG_POHMELFS is not set | ||
| 1579 | # CONFIG_B3DFG is not set | ||
| 1580 | # CONFIG_IDE_PHISON is not set | ||
| 1581 | # CONFIG_PLAN9AUTH is not set | ||
| 1582 | # CONFIG_HECI is not set | ||
| 1583 | # CONFIG_USB_CPC is not set | ||
| 1584 | |||
| 1585 | # | ||
| 1586 | # Qualcomm MSM Camera And Video | 1586 | # Qualcomm MSM Camera And Video |
| 1587 | # | 1587 | # |
| 1588 | 1588 | ||
| 1589 | # | 1589 | # |
| 1590 | # Camera Sensor Selection | 1590 | # Camera Sensor Selection |
| 1591 | # | 1591 | # |
| 1592 | # CONFIG_HYPERV_STORAGE is not set | 1592 | # CONFIG_INPUT_GPIO is not set |
| 1593 | # CONFIG_HYPERV_BLOCK is not set | 1593 | # CONFIG_POHMELFS is not set |
| 1594 | # CONFIG_HYPERV_NET is not set | 1594 | # CONFIG_IDE_PHISON is not set |
| 1595 | # CONFIG_VT6655 is not set | ||
| 1596 | # CONFIG_VT6656 is not set | ||
| 1595 | CONFIG_VME_BUS=y | 1597 | CONFIG_VME_BUS=y |
| 1596 | 1598 | ||
| 1597 | # | 1599 | # |
| 1598 | # VME Bridge Drivers | 1600 | # VME Bridge Drivers |
| 1599 | # | 1601 | # |
| 1602 | # CONFIG_VME_CA91CX42 is not set | ||
| 1600 | CONFIG_VME_TSI148=y | 1603 | CONFIG_VME_TSI148=y |
| 1601 | 1604 | ||
| 1602 | # | 1605 | # |
| @@ -1605,6 +1608,24 @@ CONFIG_VME_TSI148=y | |||
| 1605 | # CONFIG_VME_USER is not set | 1608 | # CONFIG_VME_USER is not set |
| 1606 | 1609 | ||
| 1607 | # | 1610 | # |
| 1611 | # VME Board Drivers | ||
| 1612 | # | ||
| 1613 | # CONFIG_VMIVME_7805 is not set | ||
| 1614 | |||
| 1615 | # | ||
| 1616 | # RAR Register Driver | ||
| 1617 | # | ||
| 1618 | # CONFIG_RAR_REGISTER is not set | ||
| 1619 | # CONFIG_IIO is not set | ||
| 1620 | # CONFIG_RAMZSWAP is not set | ||
| 1621 | # CONFIG_BATMAN_ADV is not set | ||
| 1622 | # CONFIG_STRIP is not set | ||
| 1623 | # CONFIG_PCMCIA_WAVELAN is not set | ||
| 1624 | # CONFIG_PCMCIA_NETWAVE is not set | ||
| 1625 | # CONFIG_DT3155 is not set | ||
| 1626 | # CONFIG_CRYSTALHD is not set | ||
| 1627 | |||
| 1628 | # | ||
| 1608 | # File systems | 1629 | # File systems |
| 1609 | # | 1630 | # |
| 1610 | CONFIG_EXT2_FS=y | 1631 | CONFIG_EXT2_FS=y |
| @@ -1693,6 +1714,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1693 | # CONFIG_JFFS2_LZO is not set | 1714 | # CONFIG_JFFS2_LZO is not set |
| 1694 | CONFIG_JFFS2_RTIME=y | 1715 | CONFIG_JFFS2_RTIME=y |
| 1695 | # CONFIG_JFFS2_RUBIN is not set | 1716 | # CONFIG_JFFS2_RUBIN is not set |
| 1717 | # CONFIG_LOGFS is not set | ||
| 1696 | # CONFIG_CRAMFS is not set | 1718 | # CONFIG_CRAMFS is not set |
| 1697 | # CONFIG_SQUASHFS is not set | 1719 | # CONFIG_SQUASHFS is not set |
| 1698 | # CONFIG_VXFS_FS is not set | 1720 | # CONFIG_VXFS_FS is not set |
| @@ -1719,6 +1741,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1719 | CONFIG_RPCSEC_GSS_KRB5=y | 1741 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1720 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1742 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1721 | # CONFIG_SMB_FS is not set | 1743 | # CONFIG_SMB_FS is not set |
| 1744 | # CONFIG_CEPH_FS is not set | ||
| 1722 | CONFIG_CIFS=m | 1745 | CONFIG_CIFS=m |
| 1723 | # CONFIG_CIFS_STATS is not set | 1746 | # CONFIG_CIFS_STATS is not set |
| 1724 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1747 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1864,6 +1887,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1864 | CONFIG_CRYPTO_MANAGER2=y | 1887 | CONFIG_CRYPTO_MANAGER2=y |
| 1865 | # CONFIG_CRYPTO_GF128MUL is not set | 1888 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1866 | # CONFIG_CRYPTO_NULL is not set | 1889 | # CONFIG_CRYPTO_NULL is not set |
| 1890 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1867 | CONFIG_CRYPTO_WORKQUEUE=y | 1891 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1868 | # CONFIG_CRYPTO_CRYPTD is not set | 1892 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1869 | CONFIG_CRYPTO_AUTHENC=m | 1893 | CONFIG_CRYPTO_AUTHENC=m |
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig index eb58dec11a61..1524d948a2ba 100644 --- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:41 2010 | 4 | # Mon Apr 19 23:17:05 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -102,11 +102,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 102 | CONFIG_IKCONFIG=y | 102 | CONFIG_IKCONFIG=y |
| 103 | CONFIG_IKCONFIG_PROC=y | 103 | CONFIG_IKCONFIG_PROC=y |
| 104 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 105 | CONFIG_GROUP_SCHED=y | ||
| 106 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 107 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 108 | CONFIG_USER_SCHED=y | ||
| 109 | # CONFIG_CGROUP_SCHED is not set | ||
| 110 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 111 | CONFIG_SYSFS_DEPRECATED=y | 106 | CONFIG_SYSFS_DEPRECATED=y |
| 112 | CONFIG_SYSFS_DEPRECATED_V2=y | 107 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -117,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 117 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 118 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 119 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 120 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 121 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 122 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -325,6 +321,7 @@ CONFIG_ISA_DMA_API=y | |||
| 325 | # Bus options | 321 | # Bus options |
| 326 | # | 322 | # |
| 327 | CONFIG_ZONE_DMA=y | 323 | CONFIG_ZONE_DMA=y |
| 324 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 328 | CONFIG_GENERIC_ISA_DMA=y | 325 | CONFIG_GENERIC_ISA_DMA=y |
| 329 | CONFIG_PPC_INDIRECT_PCI=y | 326 | CONFIG_PPC_INDIRECT_PCI=y |
| 330 | CONFIG_FSL_SOC=y | 327 | CONFIG_FSL_SOC=y |
| @@ -340,13 +337,11 @@ CONFIG_PCIEAER=y | |||
| 340 | # CONFIG_PCIEASPM is not set | 337 | # CONFIG_PCIEASPM is not set |
| 341 | CONFIG_ARCH_SUPPORTS_MSI=y | 338 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 342 | # CONFIG_PCI_MSI is not set | 339 | # CONFIG_PCI_MSI is not set |
| 343 | # CONFIG_PCI_LEGACY is not set | ||
| 344 | # CONFIG_PCI_STUB is not set | 340 | # CONFIG_PCI_STUB is not set |
| 345 | # CONFIG_PCI_IOV is not set | 341 | # CONFIG_PCI_IOV is not set |
| 346 | CONFIG_PCCARD=y | 342 | CONFIG_PCCARD=y |
| 347 | CONFIG_PCMCIA=y | 343 | CONFIG_PCMCIA=y |
| 348 | # CONFIG_PCMCIA_LOAD_CIS is not set | 344 | # CONFIG_PCMCIA_LOAD_CIS is not set |
| 349 | # CONFIG_PCMCIA_IOCTL is not set | ||
| 350 | # CONFIG_CARDBUS is not set | 345 | # CONFIG_CARDBUS is not set |
| 351 | 346 | ||
| 352 | # | 347 | # |
| @@ -382,7 +377,6 @@ CONFIG_NET=y | |||
| 382 | # Networking options | 377 | # Networking options |
| 383 | # | 378 | # |
| 384 | CONFIG_PACKET=y | 379 | CONFIG_PACKET=y |
| 385 | CONFIG_PACKET_MMAP=y | ||
| 386 | CONFIG_UNIX=y | 380 | CONFIG_UNIX=y |
| 387 | CONFIG_XFRM=y | 381 | CONFIG_XFRM=y |
| 388 | CONFIG_XFRM_USER=m | 382 | CONFIG_XFRM_USER=m |
| @@ -592,6 +586,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 592 | # UBI - Unsorted block images | 586 | # UBI - Unsorted block images |
| 593 | # | 587 | # |
| 594 | # CONFIG_MTD_UBI is not set | 588 | # CONFIG_MTD_UBI is not set |
| 589 | CONFIG_OF_FLATTREE=y | ||
| 590 | CONFIG_OF_DYNAMIC=y | ||
| 595 | CONFIG_OF_DEVICE=y | 591 | CONFIG_OF_DEVICE=y |
| 596 | CONFIG_OF_GPIO=y | 592 | CONFIG_OF_GPIO=y |
| 597 | CONFIG_OF_I2C=y | 593 | CONFIG_OF_I2C=y |
| @@ -629,6 +625,7 @@ CONFIG_MISC_DEVICES=y | |||
| 629 | # CONFIG_ENCLOSURE_SERVICES is not set | 625 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 630 | # CONFIG_HP_ILO is not set | 626 | # CONFIG_HP_ILO is not set |
| 631 | # CONFIG_ISL29003 is not set | 627 | # CONFIG_ISL29003 is not set |
| 628 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 632 | CONFIG_DS1682=y | 629 | CONFIG_DS1682=y |
| 633 | # CONFIG_C2PORT is not set | 630 | # CONFIG_C2PORT is not set |
| 634 | 631 | ||
| @@ -695,6 +692,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 695 | # | 692 | # |
| 696 | # SCSI device support | 693 | # SCSI device support |
| 697 | # | 694 | # |
| 695 | CONFIG_SCSI_MOD=y | ||
| 698 | # CONFIG_RAID_ATTRS is not set | 696 | # CONFIG_RAID_ATTRS is not set |
| 699 | CONFIG_SCSI=y | 697 | CONFIG_SCSI=y |
| 700 | CONFIG_SCSI_DMA=y | 698 | CONFIG_SCSI_DMA=y |
| @@ -1001,6 +999,7 @@ CONFIG_SERIAL_CORE=y | |||
| 1001 | CONFIG_SERIAL_CORE_CONSOLE=y | 999 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1002 | # CONFIG_SERIAL_JSM is not set | 1000 | # CONFIG_SERIAL_JSM is not set |
| 1003 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1001 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1002 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1004 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1003 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1005 | CONFIG_UNIX98_PTYS=y | 1004 | CONFIG_UNIX98_PTYS=y |
| 1006 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1005 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1058,6 +1057,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1058 | CONFIG_I2C_MPC=y | 1057 | CONFIG_I2C_MPC=y |
| 1059 | # CONFIG_I2C_OCORES is not set | 1058 | # CONFIG_I2C_OCORES is not set |
| 1060 | # CONFIG_I2C_SIMTEC is not set | 1059 | # CONFIG_I2C_SIMTEC is not set |
| 1060 | # CONFIG_I2C_XILINX is not set | ||
| 1061 | 1061 | ||
| 1062 | # | 1062 | # |
| 1063 | # External I2C/SMBus adapter drivers | 1063 | # External I2C/SMBus adapter drivers |
| @@ -1071,15 +1071,9 @@ CONFIG_I2C_MPC=y | |||
| 1071 | # | 1071 | # |
| 1072 | # CONFIG_I2C_PCA_PLATFORM is not set | 1072 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1073 | # CONFIG_I2C_STUB is not set | 1073 | # CONFIG_I2C_STUB is not set |
| 1074 | |||
| 1075 | # | ||
| 1076 | # Miscellaneous I2C Chip support | ||
| 1077 | # | ||
| 1078 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1079 | # CONFIG_I2C_DEBUG_CORE is not set | 1074 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1080 | # CONFIG_I2C_DEBUG_ALGO is not set | 1075 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1081 | # CONFIG_I2C_DEBUG_BUS is not set | 1076 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1082 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1083 | # CONFIG_SPI is not set | 1077 | # CONFIG_SPI is not set |
| 1084 | 1078 | ||
| 1085 | # | 1079 | # |
| @@ -1094,14 +1088,18 @@ CONFIG_GPIO_SYSFS=y | |||
| 1094 | # | 1088 | # |
| 1095 | # Memory mapped GPIO expanders: | 1089 | # Memory mapped GPIO expanders: |
| 1096 | # | 1090 | # |
| 1091 | # CONFIG_GPIO_IT8761E is not set | ||
| 1097 | # CONFIG_GPIO_XILINX is not set | 1092 | # CONFIG_GPIO_XILINX is not set |
| 1093 | # CONFIG_GPIO_SCH is not set | ||
| 1098 | 1094 | ||
| 1099 | # | 1095 | # |
| 1100 | # I2C GPIO expanders: | 1096 | # I2C GPIO expanders: |
| 1101 | # | 1097 | # |
| 1098 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1102 | # CONFIG_GPIO_MAX732X is not set | 1099 | # CONFIG_GPIO_MAX732X is not set |
| 1103 | # CONFIG_GPIO_PCA953X is not set | 1100 | # CONFIG_GPIO_PCA953X is not set |
| 1104 | # CONFIG_GPIO_PCF857X is not set | 1101 | # CONFIG_GPIO_PCF857X is not set |
| 1102 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1105 | 1103 | ||
| 1106 | # | 1104 | # |
| 1107 | # PCI GPIO expanders: | 1105 | # PCI GPIO expanders: |
| @@ -1134,10 +1132,11 @@ CONFIG_HWMON=y | |||
| 1134 | # CONFIG_SENSORS_ADM1029 is not set | 1132 | # CONFIG_SENSORS_ADM1029 is not set |
| 1135 | # CONFIG_SENSORS_ADM1031 is not set | 1133 | # CONFIG_SENSORS_ADM1031 is not set |
| 1136 | # CONFIG_SENSORS_ADM9240 is not set | 1134 | # CONFIG_SENSORS_ADM9240 is not set |
| 1135 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1137 | # CONFIG_SENSORS_ADT7462 is not set | 1136 | # CONFIG_SENSORS_ADT7462 is not set |
| 1138 | # CONFIG_SENSORS_ADT7470 is not set | 1137 | # CONFIG_SENSORS_ADT7470 is not set |
| 1139 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1140 | # CONFIG_SENSORS_ADT7475 is not set | 1138 | # CONFIG_SENSORS_ADT7475 is not set |
| 1139 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1141 | # CONFIG_SENSORS_ATXP1 is not set | 1140 | # CONFIG_SENSORS_ATXP1 is not set |
| 1142 | # CONFIG_SENSORS_DS1621 is not set | 1141 | # CONFIG_SENSORS_DS1621 is not set |
| 1143 | # CONFIG_SENSORS_I5K_AMB is not set | 1142 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1175,6 +1174,7 @@ CONFIG_SENSORS_LM92=y | |||
| 1175 | # CONFIG_SENSORS_SMSC47M192 is not set | 1174 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1176 | # CONFIG_SENSORS_SMSC47B397 is not set | 1175 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1177 | # CONFIG_SENSORS_ADS7828 is not set | 1176 | # CONFIG_SENSORS_ADS7828 is not set |
| 1177 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1178 | # CONFIG_SENSORS_THMC50 is not set | 1178 | # CONFIG_SENSORS_THMC50 is not set |
| 1179 | # CONFIG_SENSORS_TMP401 is not set | 1179 | # CONFIG_SENSORS_TMP401 is not set |
| 1180 | # CONFIG_SENSORS_TMP421 is not set | 1180 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1223,19 +1223,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1223 | # Multifunction device drivers | 1223 | # Multifunction device drivers |
| 1224 | # | 1224 | # |
| 1225 | # CONFIG_MFD_CORE is not set | 1225 | # CONFIG_MFD_CORE is not set |
| 1226 | # CONFIG_MFD_88PM860X is not set | ||
| 1226 | # CONFIG_MFD_SM501 is not set | 1227 | # CONFIG_MFD_SM501 is not set |
| 1227 | # CONFIG_HTC_PASIC3 is not set | 1228 | # CONFIG_HTC_PASIC3 is not set |
| 1229 | # CONFIG_HTC_I2CPLD is not set | ||
| 1228 | # CONFIG_TPS65010 is not set | 1230 | # CONFIG_TPS65010 is not set |
| 1229 | # CONFIG_TWL4030_CORE is not set | 1231 | # CONFIG_TWL4030_CORE is not set |
| 1230 | # CONFIG_MFD_TMIO is not set | 1232 | # CONFIG_MFD_TMIO is not set |
| 1231 | # CONFIG_PMIC_DA903X is not set | 1233 | # CONFIG_PMIC_DA903X is not set |
| 1232 | # CONFIG_PMIC_ADP5520 is not set | 1234 | # CONFIG_PMIC_ADP5520 is not set |
| 1235 | # CONFIG_MFD_MAX8925 is not set | ||
| 1233 | # CONFIG_MFD_WM8400 is not set | 1236 | # CONFIG_MFD_WM8400 is not set |
| 1234 | # CONFIG_MFD_WM831X is not set | 1237 | # CONFIG_MFD_WM831X is not set |
| 1235 | # CONFIG_MFD_WM8350_I2C is not set | 1238 | # CONFIG_MFD_WM8350_I2C is not set |
| 1239 | # CONFIG_MFD_WM8994 is not set | ||
| 1236 | # CONFIG_MFD_PCF50633 is not set | 1240 | # CONFIG_MFD_PCF50633 is not set |
| 1237 | # CONFIG_AB3100_CORE is not set | 1241 | # CONFIG_AB3100_CORE is not set |
| 1238 | # CONFIG_MFD_88PM8607 is not set | 1242 | # CONFIG_MFD_TIMBERDALE is not set |
| 1243 | # CONFIG_LPC_SCH is not set | ||
| 1239 | # CONFIG_REGULATOR is not set | 1244 | # CONFIG_REGULATOR is not set |
| 1240 | # CONFIG_MEDIA_SUPPORT is not set | 1245 | # CONFIG_MEDIA_SUPPORT is not set |
| 1241 | 1246 | ||
| @@ -1244,6 +1249,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1244 | # | 1249 | # |
| 1245 | # CONFIG_AGP is not set | 1250 | # CONFIG_AGP is not set |
| 1246 | CONFIG_VGA_ARB=y | 1251 | CONFIG_VGA_ARB=y |
| 1252 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1247 | # CONFIG_DRM is not set | 1253 | # CONFIG_DRM is not set |
| 1248 | # CONFIG_VGASTATE is not set | 1254 | # CONFIG_VGASTATE is not set |
| 1249 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1255 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1276,6 +1282,7 @@ CONFIG_USB_HID=y | |||
| 1276 | # | 1282 | # |
| 1277 | # Special HID drivers | 1283 | # Special HID drivers |
| 1278 | # | 1284 | # |
| 1285 | # CONFIG_HID_3M_PCT is not set | ||
| 1279 | CONFIG_HID_A4TECH=y | 1286 | CONFIG_HID_A4TECH=y |
| 1280 | CONFIG_HID_APPLE=y | 1287 | CONFIG_HID_APPLE=y |
| 1281 | CONFIG_HID_BELKIN=y | 1288 | CONFIG_HID_BELKIN=y |
| @@ -1291,14 +1298,19 @@ CONFIG_HID_GYRATION=y | |||
| 1291 | CONFIG_HID_LOGITECH=y | 1298 | CONFIG_HID_LOGITECH=y |
| 1292 | # CONFIG_LOGITECH_FF is not set | 1299 | # CONFIG_LOGITECH_FF is not set |
| 1293 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1300 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1301 | # CONFIG_LOGIG940_FF is not set | ||
| 1294 | CONFIG_HID_MICROSOFT=y | 1302 | CONFIG_HID_MICROSOFT=y |
| 1303 | # CONFIG_HID_MOSART is not set | ||
| 1295 | CONFIG_HID_MONTEREY=y | 1304 | CONFIG_HID_MONTEREY=y |
| 1296 | # CONFIG_HID_NTRIG is not set | 1305 | # CONFIG_HID_NTRIG is not set |
| 1306 | # CONFIG_HID_ORTEK is not set | ||
| 1297 | CONFIG_HID_PANTHERLORD=y | 1307 | CONFIG_HID_PANTHERLORD=y |
| 1298 | # CONFIG_PANTHERLORD_FF is not set | 1308 | # CONFIG_PANTHERLORD_FF is not set |
| 1299 | CONFIG_HID_PETALYNX=y | 1309 | CONFIG_HID_PETALYNX=y |
| 1310 | # CONFIG_HID_QUANTA is not set | ||
| 1300 | CONFIG_HID_SAMSUNG=y | 1311 | CONFIG_HID_SAMSUNG=y |
| 1301 | CONFIG_HID_SONY=y | 1312 | CONFIG_HID_SONY=y |
| 1313 | # CONFIG_HID_STANTUM is not set | ||
| 1302 | CONFIG_HID_SUNPLUS=y | 1314 | CONFIG_HID_SUNPLUS=y |
| 1303 | # CONFIG_HID_GREENASIA is not set | 1315 | # CONFIG_HID_GREENASIA is not set |
| 1304 | # CONFIG_HID_SMARTJOYPLUS is not set | 1316 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1405,7 +1417,6 @@ CONFIG_USB_STORAGE=y | |||
| 1405 | # CONFIG_USB_RIO500 is not set | 1417 | # CONFIG_USB_RIO500 is not set |
| 1406 | # CONFIG_USB_LEGOTOWER is not set | 1418 | # CONFIG_USB_LEGOTOWER is not set |
| 1407 | # CONFIG_USB_LCD is not set | 1419 | # CONFIG_USB_LCD is not set |
| 1408 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1409 | # CONFIG_USB_LED is not set | 1420 | # CONFIG_USB_LED is not set |
| 1410 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1421 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1411 | # CONFIG_USB_CYTHERM is not set | 1422 | # CONFIG_USB_CYTHERM is not set |
| @@ -1418,7 +1429,6 @@ CONFIG_USB_STORAGE=y | |||
| 1418 | # CONFIG_USB_IOWARRIOR is not set | 1429 | # CONFIG_USB_IOWARRIOR is not set |
| 1419 | # CONFIG_USB_TEST is not set | 1430 | # CONFIG_USB_TEST is not set |
| 1420 | # CONFIG_USB_ISIGHTFW is not set | 1431 | # CONFIG_USB_ISIGHTFW is not set |
| 1421 | # CONFIG_USB_VST is not set | ||
| 1422 | # CONFIG_USB_GADGET is not set | 1432 | # CONFIG_USB_GADGET is not set |
| 1423 | 1433 | ||
| 1424 | # | 1434 | # |
| @@ -1590,6 +1600,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1590 | # CONFIG_JFFS2_LZO is not set | 1600 | # CONFIG_JFFS2_LZO is not set |
| 1591 | CONFIG_JFFS2_RTIME=y | 1601 | CONFIG_JFFS2_RTIME=y |
| 1592 | # CONFIG_JFFS2_RUBIN is not set | 1602 | # CONFIG_JFFS2_RUBIN is not set |
| 1603 | # CONFIG_LOGFS is not set | ||
| 1593 | # CONFIG_CRAMFS is not set | 1604 | # CONFIG_CRAMFS is not set |
| 1594 | # CONFIG_SQUASHFS is not set | 1605 | # CONFIG_SQUASHFS is not set |
| 1595 | # CONFIG_VXFS_FS is not set | 1606 | # CONFIG_VXFS_FS is not set |
| @@ -1616,6 +1627,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1616 | CONFIG_RPCSEC_GSS_KRB5=y | 1627 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1617 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1628 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1618 | # CONFIG_SMB_FS is not set | 1629 | # CONFIG_SMB_FS is not set |
| 1630 | # CONFIG_CEPH_FS is not set | ||
| 1619 | CONFIG_CIFS=m | 1631 | CONFIG_CIFS=m |
| 1620 | # CONFIG_CIFS_STATS is not set | 1632 | # CONFIG_CIFS_STATS is not set |
| 1621 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1633 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1761,6 +1773,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1761 | CONFIG_CRYPTO_MANAGER2=y | 1773 | CONFIG_CRYPTO_MANAGER2=y |
| 1762 | # CONFIG_CRYPTO_GF128MUL is not set | 1774 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1763 | # CONFIG_CRYPTO_NULL is not set | 1775 | # CONFIG_CRYPTO_NULL is not set |
| 1776 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1764 | CONFIG_CRYPTO_WORKQUEUE=y | 1777 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1765 | # CONFIG_CRYPTO_CRYPTD is not set | 1778 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1766 | CONFIG_CRYPTO_AUTHENC=m | 1779 | CONFIG_CRYPTO_AUTHENC=m |
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index 62c2b81a4a8f..767c204c0603 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:42 2010 | 4 | # Mon Apr 19 23:17:06 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -102,11 +102,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 102 | CONFIG_IKCONFIG=y | 102 | CONFIG_IKCONFIG=y |
| 103 | CONFIG_IKCONFIG_PROC=y | 103 | CONFIG_IKCONFIG_PROC=y |
| 104 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 105 | CONFIG_GROUP_SCHED=y | ||
| 106 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 107 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 108 | CONFIG_USER_SCHED=y | ||
| 109 | # CONFIG_CGROUP_SCHED is not set | ||
| 110 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 111 | CONFIG_SYSFS_DEPRECATED=y | 106 | CONFIG_SYSFS_DEPRECATED=y |
| 112 | CONFIG_SYSFS_DEPRECATED_V2=y | 107 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -117,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 117 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 118 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 119 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 120 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 121 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 122 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -326,6 +322,7 @@ CONFIG_ISA_DMA_API=y | |||
| 326 | # Bus options | 322 | # Bus options |
| 327 | # | 323 | # |
| 328 | CONFIG_ZONE_DMA=y | 324 | CONFIG_ZONE_DMA=y |
| 325 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 329 | CONFIG_GENERIC_ISA_DMA=y | 326 | CONFIG_GENERIC_ISA_DMA=y |
| 330 | CONFIG_PPC_INDIRECT_PCI=y | 327 | CONFIG_PPC_INDIRECT_PCI=y |
| 331 | CONFIG_FSL_SOC=y | 328 | CONFIG_FSL_SOC=y |
| @@ -341,7 +338,6 @@ CONFIG_PCIEAER=y | |||
| 341 | # CONFIG_PCIEASPM is not set | 338 | # CONFIG_PCIEASPM is not set |
| 342 | CONFIG_ARCH_SUPPORTS_MSI=y | 339 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 343 | # CONFIG_PCI_MSI is not set | 340 | # CONFIG_PCI_MSI is not set |
| 344 | # CONFIG_PCI_LEGACY is not set | ||
| 345 | CONFIG_PCI_DEBUG=y | 341 | CONFIG_PCI_DEBUG=y |
| 346 | # CONFIG_PCI_STUB is not set | 342 | # CONFIG_PCI_STUB is not set |
| 347 | # CONFIG_PCI_IOV is not set | 343 | # CONFIG_PCI_IOV is not set |
| @@ -369,7 +365,6 @@ CONFIG_NET=y | |||
| 369 | # Networking options | 365 | # Networking options |
| 370 | # | 366 | # |
| 371 | CONFIG_PACKET=y | 367 | CONFIG_PACKET=y |
| 372 | CONFIG_PACKET_MMAP=y | ||
| 373 | CONFIG_UNIX=y | 368 | CONFIG_UNIX=y |
| 374 | CONFIG_XFRM=y | 369 | CONFIG_XFRM=y |
| 375 | CONFIG_XFRM_USER=m | 370 | CONFIG_XFRM_USER=m |
| @@ -552,6 +547,7 @@ CONFIG_ATM_BR2684=m | |||
| 552 | # CONFIG_ATM_BR2684_IPFILTER is not set | 547 | # CONFIG_ATM_BR2684_IPFILTER is not set |
| 553 | CONFIG_STP=m | 548 | CONFIG_STP=m |
| 554 | CONFIG_BRIDGE=m | 549 | CONFIG_BRIDGE=m |
| 550 | CONFIG_BRIDGE_IGMP_SNOOPING=y | ||
| 555 | # CONFIG_NET_DSA is not set | 551 | # CONFIG_NET_DSA is not set |
| 556 | CONFIG_VLAN_8021Q=m | 552 | CONFIG_VLAN_8021Q=m |
| 557 | # CONFIG_VLAN_8021Q_GVRP is not set | 553 | # CONFIG_VLAN_8021Q_GVRP is not set |
| @@ -728,6 +724,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 728 | # UBI - Unsorted block images | 724 | # UBI - Unsorted block images |
| 729 | # | 725 | # |
| 730 | # CONFIG_MTD_UBI is not set | 726 | # CONFIG_MTD_UBI is not set |
| 727 | CONFIG_OF_FLATTREE=y | ||
| 728 | CONFIG_OF_DYNAMIC=y | ||
| 731 | CONFIG_OF_DEVICE=y | 729 | CONFIG_OF_DEVICE=y |
| 732 | CONFIG_OF_GPIO=y | 730 | CONFIG_OF_GPIO=y |
| 733 | CONFIG_OF_I2C=y | 731 | CONFIG_OF_I2C=y |
| @@ -765,6 +763,7 @@ CONFIG_MISC_DEVICES=y | |||
| 765 | # CONFIG_ENCLOSURE_SERVICES is not set | 763 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 766 | # CONFIG_HP_ILO is not set | 764 | # CONFIG_HP_ILO is not set |
| 767 | # CONFIG_ISL29003 is not set | 765 | # CONFIG_ISL29003 is not set |
| 766 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 768 | CONFIG_DS1682=y | 767 | CONFIG_DS1682=y |
| 769 | # CONFIG_C2PORT is not set | 768 | # CONFIG_C2PORT is not set |
| 770 | 769 | ||
| @@ -782,6 +781,7 @@ CONFIG_HAVE_IDE=y | |||
| 782 | # | 781 | # |
| 783 | # SCSI device support | 782 | # SCSI device support |
| 784 | # | 783 | # |
| 784 | CONFIG_SCSI_MOD=y | ||
| 785 | # CONFIG_RAID_ATTRS is not set | 785 | # CONFIG_RAID_ATTRS is not set |
| 786 | CONFIG_SCSI=y | 786 | CONFIG_SCSI=y |
| 787 | CONFIG_SCSI_DMA=y | 787 | CONFIG_SCSI_DMA=y |
| @@ -905,6 +905,7 @@ CONFIG_SATA_SIL=y | |||
| 905 | # CONFIG_PATA_IT821X is not set | 905 | # CONFIG_PATA_IT821X is not set |
| 906 | # CONFIG_PATA_IT8213 is not set | 906 | # CONFIG_PATA_IT8213 is not set |
| 907 | # CONFIG_PATA_JMICRON is not set | 907 | # CONFIG_PATA_JMICRON is not set |
| 908 | # CONFIG_PATA_LEGACY is not set | ||
| 908 | # CONFIG_PATA_TRIFLEX is not set | 909 | # CONFIG_PATA_TRIFLEX is not set |
| 909 | # CONFIG_PATA_MARVELL is not set | 910 | # CONFIG_PATA_MARVELL is not set |
| 910 | # CONFIG_PATA_MPIIX is not set | 911 | # CONFIG_PATA_MPIIX is not set |
| @@ -1155,6 +1156,7 @@ CONFIG_SERIAL_CORE=y | |||
| 1155 | CONFIG_SERIAL_CORE_CONSOLE=y | 1156 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1156 | # CONFIG_SERIAL_JSM is not set | 1157 | # CONFIG_SERIAL_JSM is not set |
| 1157 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1158 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1159 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1158 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1160 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1159 | CONFIG_UNIX98_PTYS=y | 1161 | CONFIG_UNIX98_PTYS=y |
| 1160 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1162 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1204,6 +1206,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1204 | CONFIG_I2C_MPC=y | 1206 | CONFIG_I2C_MPC=y |
| 1205 | # CONFIG_I2C_OCORES is not set | 1207 | # CONFIG_I2C_OCORES is not set |
| 1206 | # CONFIG_I2C_SIMTEC is not set | 1208 | # CONFIG_I2C_SIMTEC is not set |
| 1209 | # CONFIG_I2C_XILINX is not set | ||
| 1207 | 1210 | ||
| 1208 | # | 1211 | # |
| 1209 | # External I2C/SMBus adapter drivers | 1212 | # External I2C/SMBus adapter drivers |
| @@ -1217,15 +1220,9 @@ CONFIG_I2C_MPC=y | |||
| 1217 | # | 1220 | # |
| 1218 | # CONFIG_I2C_PCA_PLATFORM is not set | 1221 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1219 | # CONFIG_I2C_STUB is not set | 1222 | # CONFIG_I2C_STUB is not set |
| 1220 | |||
| 1221 | # | ||
| 1222 | # Miscellaneous I2C Chip support | ||
| 1223 | # | ||
| 1224 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1225 | # CONFIG_I2C_DEBUG_CORE is not set | 1223 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1226 | # CONFIG_I2C_DEBUG_ALGO is not set | 1224 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1227 | # CONFIG_I2C_DEBUG_BUS is not set | 1225 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1228 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1229 | # CONFIG_SPI is not set | 1226 | # CONFIG_SPI is not set |
| 1230 | 1227 | ||
| 1231 | # | 1228 | # |
| @@ -1241,14 +1238,18 @@ CONFIG_GPIOLIB=y | |||
| 1241 | # | 1238 | # |
| 1242 | # Memory mapped GPIO expanders: | 1239 | # Memory mapped GPIO expanders: |
| 1243 | # | 1240 | # |
| 1241 | # CONFIG_GPIO_IT8761E is not set | ||
| 1244 | # CONFIG_GPIO_XILINX is not set | 1242 | # CONFIG_GPIO_XILINX is not set |
| 1243 | # CONFIG_GPIO_SCH is not set | ||
| 1245 | 1244 | ||
| 1246 | # | 1245 | # |
| 1247 | # I2C GPIO expanders: | 1246 | # I2C GPIO expanders: |
| 1248 | # | 1247 | # |
| 1248 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1249 | # CONFIG_GPIO_MAX732X is not set | 1249 | # CONFIG_GPIO_MAX732X is not set |
| 1250 | # CONFIG_GPIO_PCA953X is not set | 1250 | # CONFIG_GPIO_PCA953X is not set |
| 1251 | # CONFIG_GPIO_PCF857X is not set | 1251 | # CONFIG_GPIO_PCF857X is not set |
| 1252 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1252 | 1253 | ||
| 1253 | # | 1254 | # |
| 1254 | # PCI GPIO expanders: | 1255 | # PCI GPIO expanders: |
| @@ -1281,10 +1282,11 @@ CONFIG_HWMON=y | |||
| 1281 | # CONFIG_SENSORS_ADM1029 is not set | 1282 | # CONFIG_SENSORS_ADM1029 is not set |
| 1282 | # CONFIG_SENSORS_ADM1031 is not set | 1283 | # CONFIG_SENSORS_ADM1031 is not set |
| 1283 | # CONFIG_SENSORS_ADM9240 is not set | 1284 | # CONFIG_SENSORS_ADM9240 is not set |
| 1285 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1284 | # CONFIG_SENSORS_ADT7462 is not set | 1286 | # CONFIG_SENSORS_ADT7462 is not set |
| 1285 | # CONFIG_SENSORS_ADT7470 is not set | 1287 | # CONFIG_SENSORS_ADT7470 is not set |
| 1286 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1287 | # CONFIG_SENSORS_ADT7475 is not set | 1288 | # CONFIG_SENSORS_ADT7475 is not set |
| 1289 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1288 | # CONFIG_SENSORS_ATXP1 is not set | 1290 | # CONFIG_SENSORS_ATXP1 is not set |
| 1289 | # CONFIG_SENSORS_DS1621 is not set | 1291 | # CONFIG_SENSORS_DS1621 is not set |
| 1290 | # CONFIG_SENSORS_I5K_AMB is not set | 1292 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1322,6 +1324,7 @@ CONFIG_SENSORS_LM92=y | |||
| 1322 | # CONFIG_SENSORS_SMSC47M192 is not set | 1324 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1323 | # CONFIG_SENSORS_SMSC47B397 is not set | 1325 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1324 | # CONFIG_SENSORS_ADS7828 is not set | 1326 | # CONFIG_SENSORS_ADS7828 is not set |
| 1327 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1325 | # CONFIG_SENSORS_THMC50 is not set | 1328 | # CONFIG_SENSORS_THMC50 is not set |
| 1326 | # CONFIG_SENSORS_TMP401 is not set | 1329 | # CONFIG_SENSORS_TMP401 is not set |
| 1327 | # CONFIG_SENSORS_TMP421 is not set | 1330 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1370,19 +1373,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1370 | # Multifunction device drivers | 1373 | # Multifunction device drivers |
| 1371 | # | 1374 | # |
| 1372 | # CONFIG_MFD_CORE is not set | 1375 | # CONFIG_MFD_CORE is not set |
| 1376 | # CONFIG_MFD_88PM860X is not set | ||
| 1373 | # CONFIG_MFD_SM501 is not set | 1377 | # CONFIG_MFD_SM501 is not set |
| 1374 | # CONFIG_HTC_PASIC3 is not set | 1378 | # CONFIG_HTC_PASIC3 is not set |
| 1379 | # CONFIG_HTC_I2CPLD is not set | ||
| 1375 | # CONFIG_TPS65010 is not set | 1380 | # CONFIG_TPS65010 is not set |
| 1376 | # CONFIG_TWL4030_CORE is not set | 1381 | # CONFIG_TWL4030_CORE is not set |
| 1377 | # CONFIG_MFD_TMIO is not set | 1382 | # CONFIG_MFD_TMIO is not set |
| 1378 | # CONFIG_PMIC_DA903X is not set | 1383 | # CONFIG_PMIC_DA903X is not set |
| 1379 | # CONFIG_PMIC_ADP5520 is not set | 1384 | # CONFIG_PMIC_ADP5520 is not set |
| 1385 | # CONFIG_MFD_MAX8925 is not set | ||
| 1380 | # CONFIG_MFD_WM8400 is not set | 1386 | # CONFIG_MFD_WM8400 is not set |
| 1381 | # CONFIG_MFD_WM831X is not set | 1387 | # CONFIG_MFD_WM831X is not set |
| 1382 | # CONFIG_MFD_WM8350_I2C is not set | 1388 | # CONFIG_MFD_WM8350_I2C is not set |
| 1389 | # CONFIG_MFD_WM8994 is not set | ||
| 1383 | # CONFIG_MFD_PCF50633 is not set | 1390 | # CONFIG_MFD_PCF50633 is not set |
| 1384 | # CONFIG_AB3100_CORE is not set | 1391 | # CONFIG_AB3100_CORE is not set |
| 1385 | # CONFIG_MFD_88PM8607 is not set | 1392 | # CONFIG_MFD_TIMBERDALE is not set |
| 1393 | # CONFIG_LPC_SCH is not set | ||
| 1386 | # CONFIG_REGULATOR is not set | 1394 | # CONFIG_REGULATOR is not set |
| 1387 | # CONFIG_MEDIA_SUPPORT is not set | 1395 | # CONFIG_MEDIA_SUPPORT is not set |
| 1388 | 1396 | ||
| @@ -1391,6 +1399,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1391 | # | 1399 | # |
| 1392 | # CONFIG_AGP is not set | 1400 | # CONFIG_AGP is not set |
| 1393 | CONFIG_VGA_ARB=y | 1401 | CONFIG_VGA_ARB=y |
| 1402 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1394 | # CONFIG_DRM is not set | 1403 | # CONFIG_DRM is not set |
| 1395 | # CONFIG_VGASTATE is not set | 1404 | # CONFIG_VGASTATE is not set |
| 1396 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1405 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1423,6 +1432,7 @@ CONFIG_USB_HID=y | |||
| 1423 | # | 1432 | # |
| 1424 | # Special HID drivers | 1433 | # Special HID drivers |
| 1425 | # | 1434 | # |
| 1435 | # CONFIG_HID_3M_PCT is not set | ||
| 1426 | CONFIG_HID_A4TECH=y | 1436 | CONFIG_HID_A4TECH=y |
| 1427 | CONFIG_HID_APPLE=y | 1437 | CONFIG_HID_APPLE=y |
| 1428 | CONFIG_HID_BELKIN=y | 1438 | CONFIG_HID_BELKIN=y |
| @@ -1438,14 +1448,19 @@ CONFIG_HID_GYRATION=y | |||
| 1438 | CONFIG_HID_LOGITECH=y | 1448 | CONFIG_HID_LOGITECH=y |
| 1439 | # CONFIG_LOGITECH_FF is not set | 1449 | # CONFIG_LOGITECH_FF is not set |
| 1440 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1450 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1451 | # CONFIG_LOGIG940_FF is not set | ||
| 1441 | CONFIG_HID_MICROSOFT=y | 1452 | CONFIG_HID_MICROSOFT=y |
| 1453 | # CONFIG_HID_MOSART is not set | ||
| 1442 | CONFIG_HID_MONTEREY=y | 1454 | CONFIG_HID_MONTEREY=y |
| 1443 | # CONFIG_HID_NTRIG is not set | 1455 | # CONFIG_HID_NTRIG is not set |
| 1456 | # CONFIG_HID_ORTEK is not set | ||
| 1444 | CONFIG_HID_PANTHERLORD=y | 1457 | CONFIG_HID_PANTHERLORD=y |
| 1445 | # CONFIG_PANTHERLORD_FF is not set | 1458 | # CONFIG_PANTHERLORD_FF is not set |
| 1446 | CONFIG_HID_PETALYNX=y | 1459 | CONFIG_HID_PETALYNX=y |
| 1460 | # CONFIG_HID_QUANTA is not set | ||
| 1447 | CONFIG_HID_SAMSUNG=y | 1461 | CONFIG_HID_SAMSUNG=y |
| 1448 | CONFIG_HID_SONY=y | 1462 | CONFIG_HID_SONY=y |
| 1463 | # CONFIG_HID_STANTUM is not set | ||
| 1449 | CONFIG_HID_SUNPLUS=y | 1464 | CONFIG_HID_SUNPLUS=y |
| 1450 | # CONFIG_HID_GREENASIA is not set | 1465 | # CONFIG_HID_GREENASIA is not set |
| 1451 | # CONFIG_HID_SMARTJOYPLUS is not set | 1466 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1552,7 +1567,6 @@ CONFIG_USB_STORAGE=y | |||
| 1552 | # CONFIG_USB_RIO500 is not set | 1567 | # CONFIG_USB_RIO500 is not set |
| 1553 | # CONFIG_USB_LEGOTOWER is not set | 1568 | # CONFIG_USB_LEGOTOWER is not set |
| 1554 | # CONFIG_USB_LCD is not set | 1569 | # CONFIG_USB_LCD is not set |
| 1555 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1556 | # CONFIG_USB_LED is not set | 1570 | # CONFIG_USB_LED is not set |
| 1557 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1571 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1558 | # CONFIG_USB_CYTHERM is not set | 1572 | # CONFIG_USB_CYTHERM is not set |
| @@ -1565,7 +1579,6 @@ CONFIG_USB_STORAGE=y | |||
| 1565 | # CONFIG_USB_IOWARRIOR is not set | 1579 | # CONFIG_USB_IOWARRIOR is not set |
| 1566 | # CONFIG_USB_TEST is not set | 1580 | # CONFIG_USB_TEST is not set |
| 1567 | # CONFIG_USB_ISIGHTFW is not set | 1581 | # CONFIG_USB_ISIGHTFW is not set |
| 1568 | # CONFIG_USB_VST is not set | ||
| 1569 | # CONFIG_USB_ATM is not set | 1582 | # CONFIG_USB_ATM is not set |
| 1570 | # CONFIG_USB_GADGET is not set | 1583 | # CONFIG_USB_GADGET is not set |
| 1571 | 1584 | ||
| @@ -1650,29 +1663,29 @@ CONFIG_RTC_DRV_RX8581=y | |||
| 1650 | CONFIG_STAGING=y | 1663 | CONFIG_STAGING=y |
| 1651 | # CONFIG_STAGING_EXCLUDE_BUILD is not set | 1664 | # CONFIG_STAGING_EXCLUDE_BUILD is not set |
| 1652 | # CONFIG_ET131X is not set | 1665 | # CONFIG_ET131X is not set |
| 1653 | # CONFIG_ME4000 is not set | ||
| 1654 | # CONFIG_MEILHAUS is not set | ||
| 1655 | # CONFIG_USB_IP_COMMON is not set | 1666 | # CONFIG_USB_IP_COMMON is not set |
| 1667 | # CONFIG_PRISM2_USB is not set | ||
| 1656 | # CONFIG_ECHO is not set | 1668 | # CONFIG_ECHO is not set |
| 1657 | # CONFIG_COMEDI is not set | 1669 | # CONFIG_COMEDI is not set |
| 1658 | # CONFIG_ASUS_OLED is not set | 1670 | # CONFIG_ASUS_OLED is not set |
| 1659 | # CONFIG_ALTERA_PCIE_CHDMA is not set | 1671 | # CONFIG_R8187SE is not set |
| 1660 | # CONFIG_INPUT_MIMIO is not set | 1672 | # CONFIG_RTL8192SU is not set |
| 1673 | # CONFIG_RTL8192U is not set | ||
| 1674 | # CONFIG_RTL8192E is not set | ||
| 1661 | # CONFIG_TRANZPORT is not set | 1675 | # CONFIG_TRANZPORT is not set |
| 1662 | 1676 | ||
| 1663 | # | 1677 | # |
| 1664 | # Android | 1678 | # Qualcomm MSM Camera And Video |
| 1679 | # | ||
| 1680 | |||
| 1681 | # | ||
| 1682 | # Camera Sensor Selection | ||
| 1665 | # | 1683 | # |
| 1666 | # CONFIG_ANDROID is not set | 1684 | # CONFIG_INPUT_GPIO is not set |
| 1667 | # CONFIG_DST is not set | ||
| 1668 | # CONFIG_POHMELFS is not set | 1685 | # CONFIG_POHMELFS is not set |
| 1669 | # CONFIG_B3DFG is not set | ||
| 1670 | # CONFIG_IDE_PHISON is not set | 1686 | # CONFIG_IDE_PHISON is not set |
| 1671 | # CONFIG_PLAN9AUTH is not set | ||
| 1672 | # CONFIG_HECI is not set | ||
| 1673 | # CONFIG_VT6655 is not set | 1687 | # CONFIG_VT6655 is not set |
| 1674 | # CONFIG_USB_CPC is not set | 1688 | # CONFIG_VT6656 is not set |
| 1675 | # CONFIG_RDC_17F3101X is not set | ||
| 1676 | CONFIG_VME_BUS=y | 1689 | CONFIG_VME_BUS=y |
| 1677 | 1690 | ||
| 1678 | # | 1691 | # |
| @@ -1687,6 +1700,22 @@ CONFIG_VME_TSI148=y | |||
| 1687 | # CONFIG_VME_USER is not set | 1700 | # CONFIG_VME_USER is not set |
| 1688 | 1701 | ||
| 1689 | # | 1702 | # |
| 1703 | # VME Board Drivers | ||
| 1704 | # | ||
| 1705 | # CONFIG_VMIVME_7805 is not set | ||
| 1706 | |||
| 1707 | # | ||
| 1708 | # RAR Register Driver | ||
| 1709 | # | ||
| 1710 | # CONFIG_RAR_REGISTER is not set | ||
| 1711 | # CONFIG_IIO is not set | ||
| 1712 | # CONFIG_RAMZSWAP is not set | ||
| 1713 | # CONFIG_BATMAN_ADV is not set | ||
| 1714 | # CONFIG_STRIP is not set | ||
| 1715 | # CONFIG_DT3155 is not set | ||
| 1716 | # CONFIG_CRYSTALHD is not set | ||
| 1717 | |||
| 1718 | # | ||
| 1690 | # File systems | 1719 | # File systems |
| 1691 | # | 1720 | # |
| 1692 | CONFIG_EXT2_FS=y | 1721 | CONFIG_EXT2_FS=y |
| @@ -1772,6 +1801,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1772 | # CONFIG_JFFS2_LZO is not set | 1801 | # CONFIG_JFFS2_LZO is not set |
| 1773 | CONFIG_JFFS2_RTIME=y | 1802 | CONFIG_JFFS2_RTIME=y |
| 1774 | # CONFIG_JFFS2_RUBIN is not set | 1803 | # CONFIG_JFFS2_RUBIN is not set |
| 1804 | # CONFIG_LOGFS is not set | ||
| 1775 | # CONFIG_CRAMFS is not set | 1805 | # CONFIG_CRAMFS is not set |
| 1776 | # CONFIG_SQUASHFS is not set | 1806 | # CONFIG_SQUASHFS is not set |
| 1777 | # CONFIG_VXFS_FS is not set | 1807 | # CONFIG_VXFS_FS is not set |
| @@ -1798,6 +1828,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1798 | CONFIG_RPCSEC_GSS_KRB5=y | 1828 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1799 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1829 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1800 | # CONFIG_SMB_FS is not set | 1830 | # CONFIG_SMB_FS is not set |
| 1831 | # CONFIG_CEPH_FS is not set | ||
| 1801 | CONFIG_CIFS=m | 1832 | CONFIG_CIFS=m |
| 1802 | # CONFIG_CIFS_STATS is not set | 1833 | # CONFIG_CIFS_STATS is not set |
| 1803 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1834 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1870,7 +1901,7 @@ CONFIG_CRC32=y | |||
| 1870 | # CONFIG_CRC7 is not set | 1901 | # CONFIG_CRC7 is not set |
| 1871 | CONFIG_LIBCRC32C=m | 1902 | CONFIG_LIBCRC32C=m |
| 1872 | CONFIG_ZLIB_INFLATE=y | 1903 | CONFIG_ZLIB_INFLATE=y |
| 1873 | CONFIG_ZLIB_DEFLATE=m | 1904 | CONFIG_ZLIB_DEFLATE=y |
| 1874 | CONFIG_DECOMPRESS_GZIP=y | 1905 | CONFIG_DECOMPRESS_GZIP=y |
| 1875 | CONFIG_HAS_IOMEM=y | 1906 | CONFIG_HAS_IOMEM=y |
| 1876 | CONFIG_HAS_IOPORT=y | 1907 | CONFIG_HAS_IOPORT=y |
| @@ -2006,6 +2037,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 2006 | CONFIG_CRYPTO_MANAGER2=y | 2037 | CONFIG_CRYPTO_MANAGER2=y |
| 2007 | # CONFIG_CRYPTO_GF128MUL is not set | 2038 | # CONFIG_CRYPTO_GF128MUL is not set |
| 2008 | CONFIG_CRYPTO_NULL=m | 2039 | CONFIG_CRYPTO_NULL=m |
| 2040 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 2009 | CONFIG_CRYPTO_WORKQUEUE=y | 2041 | CONFIG_CRYPTO_WORKQUEUE=y |
| 2010 | # CONFIG_CRYPTO_CRYPTD is not set | 2042 | # CONFIG_CRYPTO_CRYPTD is not set |
| 2011 | CONFIG_CRYPTO_AUTHENC=m | 2043 | CONFIG_CRYPTO_AUTHENC=m |
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig index aab3baebab8c..55b9e4e867ac 100644 --- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:39 2010 | 4 | # Mon Apr 19 23:17:03 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -97,11 +97,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 97 | CONFIG_IKCONFIG=y | 97 | CONFIG_IKCONFIG=y |
| 98 | CONFIG_IKCONFIG_PROC=y | 98 | CONFIG_IKCONFIG_PROC=y |
| 99 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
| 100 | CONFIG_GROUP_SCHED=y | ||
| 101 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 102 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 103 | CONFIG_USER_SCHED=y | ||
| 104 | # CONFIG_CGROUP_SCHED is not set | ||
| 105 | # CONFIG_CGROUPS is not set | 100 | # CONFIG_CGROUPS is not set |
| 106 | CONFIG_SYSFS_DEPRECATED=y | 101 | CONFIG_SYSFS_DEPRECATED=y |
| 107 | CONFIG_SYSFS_DEPRECATED_V2=y | 102 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -112,6 +107,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 112 | CONFIG_RD_GZIP=y | 107 | CONFIG_RD_GZIP=y |
| 113 | # CONFIG_RD_BZIP2 is not set | 108 | # CONFIG_RD_BZIP2 is not set |
| 114 | # CONFIG_RD_LZMA is not set | 109 | # CONFIG_RD_LZMA is not set |
| 110 | # CONFIG_RD_LZO is not set | ||
| 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 111 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 116 | CONFIG_SYSCTL=y | 112 | CONFIG_SYSCTL=y |
| 117 | CONFIG_ANON_INODES=y | 113 | CONFIG_ANON_INODES=y |
| @@ -320,6 +316,7 @@ CONFIG_ISA_DMA_API=y | |||
| 320 | # Bus options | 316 | # Bus options |
| 321 | # | 317 | # |
| 322 | CONFIG_ZONE_DMA=y | 318 | CONFIG_ZONE_DMA=y |
| 319 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 323 | CONFIG_GENERIC_ISA_DMA=y | 320 | CONFIG_GENERIC_ISA_DMA=y |
| 324 | CONFIG_PPC_INDIRECT_PCI=y | 321 | CONFIG_PPC_INDIRECT_PCI=y |
| 325 | CONFIG_FSL_SOC=y | 322 | CONFIG_FSL_SOC=y |
| @@ -335,7 +332,6 @@ CONFIG_PCIEAER=y | |||
| 335 | # CONFIG_PCIEASPM is not set | 332 | # CONFIG_PCIEASPM is not set |
| 336 | CONFIG_ARCH_SUPPORTS_MSI=y | 333 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 337 | # CONFIG_PCI_MSI is not set | 334 | # CONFIG_PCI_MSI is not set |
| 338 | # CONFIG_PCI_LEGACY is not set | ||
| 339 | CONFIG_PCI_DEBUG=y | 335 | CONFIG_PCI_DEBUG=y |
| 340 | # CONFIG_PCI_STUB is not set | 336 | # CONFIG_PCI_STUB is not set |
| 341 | # CONFIG_PCI_IOV is not set | 337 | # CONFIG_PCI_IOV is not set |
| @@ -362,7 +358,6 @@ CONFIG_NET=y | |||
| 362 | # Networking options | 358 | # Networking options |
| 363 | # | 359 | # |
| 364 | CONFIG_PACKET=y | 360 | CONFIG_PACKET=y |
| 365 | # CONFIG_PACKET_MMAP is not set | ||
| 366 | CONFIG_UNIX=y | 361 | CONFIG_UNIX=y |
| 367 | CONFIG_XFRM=y | 362 | CONFIG_XFRM=y |
| 368 | CONFIG_XFRM_USER=y | 363 | CONFIG_XFRM_USER=y |
| @@ -571,6 +566,8 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 571 | # UBI - Unsorted block images | 566 | # UBI - Unsorted block images |
| 572 | # | 567 | # |
| 573 | # CONFIG_MTD_UBI is not set | 568 | # CONFIG_MTD_UBI is not set |
| 569 | CONFIG_OF_FLATTREE=y | ||
| 570 | CONFIG_OF_DYNAMIC=y | ||
| 574 | CONFIG_OF_DEVICE=y | 571 | CONFIG_OF_DEVICE=y |
| 575 | CONFIG_OF_I2C=y | 572 | CONFIG_OF_I2C=y |
| 576 | # CONFIG_PARPORT is not set | 573 | # CONFIG_PARPORT is not set |
| @@ -605,6 +602,7 @@ CONFIG_MISC_DEVICES=y | |||
| 605 | # CONFIG_ENCLOSURE_SERVICES is not set | 602 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 606 | # CONFIG_HP_ILO is not set | 603 | # CONFIG_HP_ILO is not set |
| 607 | # CONFIG_ISL29003 is not set | 604 | # CONFIG_ISL29003 is not set |
| 605 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 608 | # CONFIG_DS1682 is not set | 606 | # CONFIG_DS1682 is not set |
| 609 | # CONFIG_C2PORT is not set | 607 | # CONFIG_C2PORT is not set |
| 610 | 608 | ||
| @@ -670,6 +668,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 670 | # | 668 | # |
| 671 | # SCSI device support | 669 | # SCSI device support |
| 672 | # | 670 | # |
| 671 | CONFIG_SCSI_MOD=y | ||
| 673 | # CONFIG_RAID_ATTRS is not set | 672 | # CONFIG_RAID_ATTRS is not set |
| 674 | CONFIG_SCSI=y | 673 | CONFIG_SCSI=y |
| 675 | CONFIG_SCSI_DMA=y | 674 | CONFIG_SCSI_DMA=y |
| @@ -792,6 +791,7 @@ CONFIG_PATA_ALI=y | |||
| 792 | # CONFIG_PATA_IT821X is not set | 791 | # CONFIG_PATA_IT821X is not set |
| 793 | # CONFIG_PATA_IT8213 is not set | 792 | # CONFIG_PATA_IT8213 is not set |
| 794 | # CONFIG_PATA_JMICRON is not set | 793 | # CONFIG_PATA_JMICRON is not set |
| 794 | # CONFIG_PATA_LEGACY is not set | ||
| 795 | # CONFIG_PATA_TRIFLEX is not set | 795 | # CONFIG_PATA_TRIFLEX is not set |
| 796 | # CONFIG_PATA_MARVELL is not set | 796 | # CONFIG_PATA_MARVELL is not set |
| 797 | # CONFIG_PATA_MPIIX is not set | 797 | # CONFIG_PATA_MPIIX is not set |
| @@ -970,6 +970,7 @@ CONFIG_SERIAL_CORE=y | |||
| 970 | CONFIG_SERIAL_CORE_CONSOLE=y | 970 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 971 | # CONFIG_SERIAL_JSM is not set | 971 | # CONFIG_SERIAL_JSM is not set |
| 972 | # CONFIG_SERIAL_OF_PLATFORM is not set | 972 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 973 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 973 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 974 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 974 | CONFIG_UNIX98_PTYS=y | 975 | CONFIG_UNIX98_PTYS=y |
| 975 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 976 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1017,6 +1018,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1017 | CONFIG_I2C_MPC=y | 1018 | CONFIG_I2C_MPC=y |
| 1018 | # CONFIG_I2C_OCORES is not set | 1019 | # CONFIG_I2C_OCORES is not set |
| 1019 | # CONFIG_I2C_SIMTEC is not set | 1020 | # CONFIG_I2C_SIMTEC is not set |
| 1021 | # CONFIG_I2C_XILINX is not set | ||
| 1020 | 1022 | ||
| 1021 | # | 1023 | # |
| 1022 | # External I2C/SMBus adapter drivers | 1024 | # External I2C/SMBus adapter drivers |
| @@ -1029,15 +1031,9 @@ CONFIG_I2C_MPC=y | |||
| 1029 | # | 1031 | # |
| 1030 | # CONFIG_I2C_PCA_PLATFORM is not set | 1032 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1031 | # CONFIG_I2C_STUB is not set | 1033 | # CONFIG_I2C_STUB is not set |
| 1032 | |||
| 1033 | # | ||
| 1034 | # Miscellaneous I2C Chip support | ||
| 1035 | # | ||
| 1036 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1037 | # CONFIG_I2C_DEBUG_CORE is not set | 1034 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1038 | # CONFIG_I2C_DEBUG_ALGO is not set | 1035 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1039 | # CONFIG_I2C_DEBUG_BUS is not set | 1036 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1040 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1041 | # CONFIG_SPI is not set | 1037 | # CONFIG_SPI is not set |
| 1042 | 1038 | ||
| 1043 | # | 1039 | # |
| @@ -1062,18 +1058,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1062 | # Multifunction device drivers | 1058 | # Multifunction device drivers |
| 1063 | # | 1059 | # |
| 1064 | # CONFIG_MFD_CORE is not set | 1060 | # CONFIG_MFD_CORE is not set |
| 1061 | # CONFIG_MFD_88PM860X is not set | ||
| 1065 | # CONFIG_MFD_SM501 is not set | 1062 | # CONFIG_MFD_SM501 is not set |
| 1066 | # CONFIG_HTC_PASIC3 is not set | 1063 | # CONFIG_HTC_PASIC3 is not set |
| 1067 | # CONFIG_TWL4030_CORE is not set | 1064 | # CONFIG_TWL4030_CORE is not set |
| 1068 | # CONFIG_MFD_TMIO is not set | 1065 | # CONFIG_MFD_TMIO is not set |
| 1069 | # CONFIG_PMIC_DA903X is not set | 1066 | # CONFIG_PMIC_DA903X is not set |
| 1070 | # CONFIG_PMIC_ADP5520 is not set | 1067 | # CONFIG_PMIC_ADP5520 is not set |
| 1068 | # CONFIG_MFD_MAX8925 is not set | ||
| 1071 | # CONFIG_MFD_WM8400 is not set | 1069 | # CONFIG_MFD_WM8400 is not set |
| 1072 | # CONFIG_MFD_WM831X is not set | 1070 | # CONFIG_MFD_WM831X is not set |
| 1073 | # CONFIG_MFD_WM8350_I2C is not set | 1071 | # CONFIG_MFD_WM8350_I2C is not set |
| 1072 | # CONFIG_MFD_WM8994 is not set | ||
| 1074 | # CONFIG_MFD_PCF50633 is not set | 1073 | # CONFIG_MFD_PCF50633 is not set |
| 1075 | # CONFIG_AB3100_CORE is not set | 1074 | # CONFIG_AB3100_CORE is not set |
| 1076 | # CONFIG_MFD_88PM8607 is not set | 1075 | # CONFIG_LPC_SCH is not set |
| 1077 | # CONFIG_REGULATOR is not set | 1076 | # CONFIG_REGULATOR is not set |
| 1078 | # CONFIG_MEDIA_SUPPORT is not set | 1077 | # CONFIG_MEDIA_SUPPORT is not set |
| 1079 | 1078 | ||
| @@ -1082,6 +1081,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1082 | # | 1081 | # |
| 1083 | # CONFIG_AGP is not set | 1082 | # CONFIG_AGP is not set |
| 1084 | CONFIG_VGA_ARB=y | 1083 | CONFIG_VGA_ARB=y |
| 1084 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1085 | # CONFIG_DRM is not set | 1085 | # CONFIG_DRM is not set |
| 1086 | # CONFIG_VGASTATE is not set | 1086 | # CONFIG_VGASTATE is not set |
| 1087 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1087 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1434,6 +1434,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1434 | # CONFIG_BFS_FS is not set | 1434 | # CONFIG_BFS_FS is not set |
| 1435 | # CONFIG_EFS_FS is not set | 1435 | # CONFIG_EFS_FS is not set |
| 1436 | # CONFIG_JFFS2_FS is not set | 1436 | # CONFIG_JFFS2_FS is not set |
| 1437 | # CONFIG_LOGFS is not set | ||
| 1437 | # CONFIG_CRAMFS is not set | 1438 | # CONFIG_CRAMFS is not set |
| 1438 | # CONFIG_SQUASHFS is not set | 1439 | # CONFIG_SQUASHFS is not set |
| 1439 | # CONFIG_VXFS_FS is not set | 1440 | # CONFIG_VXFS_FS is not set |
| @@ -1461,6 +1462,7 @@ CONFIG_SUNRPC=y | |||
| 1461 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1462 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1462 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1463 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1463 | # CONFIG_SMB_FS is not set | 1464 | # CONFIG_SMB_FS is not set |
| 1465 | # CONFIG_CEPH_FS is not set | ||
| 1464 | # CONFIG_CIFS is not set | 1466 | # CONFIG_CIFS is not set |
| 1465 | # CONFIG_NCP_FS is not set | 1467 | # CONFIG_NCP_FS is not set |
| 1466 | # CONFIG_CODA_FS is not set | 1468 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig index 727a8c8d15b5..1be38eb05783 100644 --- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:40 2010 | 4 | # Mon Apr 19 23:17:04 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -97,15 +97,11 @@ CONFIG_TREE_RCU=y | |||
| 97 | # CONFIG_RCU_TRACE is not set | 97 | # CONFIG_RCU_TRACE is not set |
| 98 | CONFIG_RCU_FANOUT=32 | 98 | CONFIG_RCU_FANOUT=32 |
| 99 | # CONFIG_RCU_FANOUT_EXACT is not set | 99 | # CONFIG_RCU_FANOUT_EXACT is not set |
| 100 | # CONFIG_RCU_FAST_NO_HZ is not set | ||
| 100 | # CONFIG_TREE_RCU_TRACE is not set | 101 | # CONFIG_TREE_RCU_TRACE is not set |
| 101 | CONFIG_IKCONFIG=y | 102 | CONFIG_IKCONFIG=y |
| 102 | CONFIG_IKCONFIG_PROC=y | 103 | CONFIG_IKCONFIG_PROC=y |
| 103 | CONFIG_LOG_BUF_SHIFT=14 | 104 | CONFIG_LOG_BUF_SHIFT=14 |
| 104 | CONFIG_GROUP_SCHED=y | ||
| 105 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 106 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 107 | CONFIG_USER_SCHED=y | ||
| 108 | # CONFIG_CGROUP_SCHED is not set | ||
| 109 | # CONFIG_CGROUPS is not set | 105 | # CONFIG_CGROUPS is not set |
| 110 | CONFIG_SYSFS_DEPRECATED=y | 106 | CONFIG_SYSFS_DEPRECATED=y |
| 111 | CONFIG_SYSFS_DEPRECATED_V2=y | 107 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -116,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 116 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 117 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 118 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 119 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 120 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 121 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -326,6 +323,7 @@ CONFIG_ISA_DMA_API=y | |||
| 326 | # Bus options | 323 | # Bus options |
| 327 | # | 324 | # |
| 328 | CONFIG_ZONE_DMA=y | 325 | CONFIG_ZONE_DMA=y |
| 326 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 329 | CONFIG_GENERIC_ISA_DMA=y | 327 | CONFIG_GENERIC_ISA_DMA=y |
| 330 | CONFIG_PPC_INDIRECT_PCI=y | 328 | CONFIG_PPC_INDIRECT_PCI=y |
| 331 | CONFIG_FSL_SOC=y | 329 | CONFIG_FSL_SOC=y |
| @@ -337,7 +335,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 337 | # CONFIG_PCIEPORTBUS is not set | 335 | # CONFIG_PCIEPORTBUS is not set |
| 338 | CONFIG_ARCH_SUPPORTS_MSI=y | 336 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 339 | # CONFIG_PCI_MSI is not set | 337 | # CONFIG_PCI_MSI is not set |
| 340 | # CONFIG_PCI_LEGACY is not set | ||
| 341 | # CONFIG_PCI_DEBUG is not set | 338 | # CONFIG_PCI_DEBUG is not set |
| 342 | # CONFIG_PCI_STUB is not set | 339 | # CONFIG_PCI_STUB is not set |
| 343 | # CONFIG_PCI_IOV is not set | 340 | # CONFIG_PCI_IOV is not set |
| @@ -365,7 +362,6 @@ CONFIG_NET=y | |||
| 365 | # Networking options | 362 | # Networking options |
| 366 | # | 363 | # |
| 367 | CONFIG_PACKET=y | 364 | CONFIG_PACKET=y |
| 368 | # CONFIG_PACKET_MMAP is not set | ||
| 369 | CONFIG_UNIX=y | 365 | CONFIG_UNIX=y |
| 370 | CONFIG_XFRM=y | 366 | CONFIG_XFRM=y |
| 371 | CONFIG_XFRM_USER=y | 367 | CONFIG_XFRM_USER=y |
| @@ -498,6 +494,8 @@ CONFIG_EXTRA_FIRMWARE="" | |||
| 498 | # CONFIG_SYS_HYPERVISOR is not set | 494 | # CONFIG_SYS_HYPERVISOR is not set |
| 499 | # CONFIG_CONNECTOR is not set | 495 | # CONFIG_CONNECTOR is not set |
| 500 | # CONFIG_MTD is not set | 496 | # CONFIG_MTD is not set |
| 497 | CONFIG_OF_FLATTREE=y | ||
| 498 | CONFIG_OF_DYNAMIC=y | ||
| 501 | CONFIG_OF_DEVICE=y | 499 | CONFIG_OF_DEVICE=y |
| 502 | CONFIG_OF_I2C=y | 500 | CONFIG_OF_I2C=y |
| 503 | CONFIG_OF_MDIO=y | 501 | CONFIG_OF_MDIO=y |
| @@ -534,6 +532,7 @@ CONFIG_MISC_DEVICES=y | |||
| 534 | # CONFIG_ENCLOSURE_SERVICES is not set | 532 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 535 | # CONFIG_HP_ILO is not set | 533 | # CONFIG_HP_ILO is not set |
| 536 | # CONFIG_ISL29003 is not set | 534 | # CONFIG_ISL29003 is not set |
| 535 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 537 | # CONFIG_DS1682 is not set | 536 | # CONFIG_DS1682 is not set |
| 538 | # CONFIG_C2PORT is not set | 537 | # CONFIG_C2PORT is not set |
| 539 | 538 | ||
| @@ -551,6 +550,7 @@ CONFIG_HAVE_IDE=y | |||
| 551 | # | 550 | # |
| 552 | # SCSI device support | 551 | # SCSI device support |
| 553 | # | 552 | # |
| 553 | CONFIG_SCSI_MOD=y | ||
| 554 | # CONFIG_RAID_ATTRS is not set | 554 | # CONFIG_RAID_ATTRS is not set |
| 555 | CONFIG_SCSI=y | 555 | CONFIG_SCSI=y |
| 556 | CONFIG_SCSI_DMA=y | 556 | CONFIG_SCSI_DMA=y |
| @@ -675,6 +675,7 @@ CONFIG_PATA_ALI=y | |||
| 675 | # CONFIG_PATA_IT821X is not set | 675 | # CONFIG_PATA_IT821X is not set |
| 676 | # CONFIG_PATA_IT8213 is not set | 676 | # CONFIG_PATA_IT8213 is not set |
| 677 | # CONFIG_PATA_JMICRON is not set | 677 | # CONFIG_PATA_JMICRON is not set |
| 678 | # CONFIG_PATA_LEGACY is not set | ||
| 678 | # CONFIG_PATA_TRIFLEX is not set | 679 | # CONFIG_PATA_TRIFLEX is not set |
| 679 | # CONFIG_PATA_MARVELL is not set | 680 | # CONFIG_PATA_MARVELL is not set |
| 680 | # CONFIG_PATA_MPIIX is not set | 681 | # CONFIG_PATA_MPIIX is not set |
| @@ -799,6 +800,8 @@ CONFIG_NETDEV_10000=y | |||
| 799 | # CONFIG_CHELSIO_T1 is not set | 800 | # CONFIG_CHELSIO_T1 is not set |
| 800 | CONFIG_CHELSIO_T3_DEPENDS=y | 801 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 801 | # CONFIG_CHELSIO_T3 is not set | 802 | # CONFIG_CHELSIO_T3 is not set |
| 803 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 804 | # CONFIG_CHELSIO_T4 is not set | ||
| 802 | # CONFIG_ENIC is not set | 805 | # CONFIG_ENIC is not set |
| 803 | # CONFIG_IXGBE is not set | 806 | # CONFIG_IXGBE is not set |
| 804 | # CONFIG_IXGB is not set | 807 | # CONFIG_IXGB is not set |
| @@ -811,6 +814,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 811 | # CONFIG_MLX4_CORE is not set | 814 | # CONFIG_MLX4_CORE is not set |
| 812 | # CONFIG_TEHUTI is not set | 815 | # CONFIG_TEHUTI is not set |
| 813 | # CONFIG_BNX2X is not set | 816 | # CONFIG_BNX2X is not set |
| 817 | # CONFIG_QLCNIC is not set | ||
| 814 | # CONFIG_QLGE is not set | 818 | # CONFIG_QLGE is not set |
| 815 | # CONFIG_SFC is not set | 819 | # CONFIG_SFC is not set |
| 816 | # CONFIG_BE2NET is not set | 820 | # CONFIG_BE2NET is not set |
| @@ -920,6 +924,7 @@ CONFIG_SERIAL_CORE=y | |||
| 920 | CONFIG_SERIAL_CORE_CONSOLE=y | 924 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 921 | # CONFIG_SERIAL_JSM is not set | 925 | # CONFIG_SERIAL_JSM is not set |
| 922 | # CONFIG_SERIAL_OF_PLATFORM is not set | 926 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 927 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 923 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 928 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 924 | CONFIG_UNIX98_PTYS=y | 929 | CONFIG_UNIX98_PTYS=y |
| 925 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 930 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -968,6 +973,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 968 | CONFIG_I2C_MPC=y | 973 | CONFIG_I2C_MPC=y |
| 969 | # CONFIG_I2C_OCORES is not set | 974 | # CONFIG_I2C_OCORES is not set |
| 970 | # CONFIG_I2C_SIMTEC is not set | 975 | # CONFIG_I2C_SIMTEC is not set |
| 976 | # CONFIG_I2C_XILINX is not set | ||
| 971 | 977 | ||
| 972 | # | 978 | # |
| 973 | # External I2C/SMBus adapter drivers | 979 | # External I2C/SMBus adapter drivers |
| @@ -981,15 +987,9 @@ CONFIG_I2C_MPC=y | |||
| 981 | # | 987 | # |
| 982 | # CONFIG_I2C_PCA_PLATFORM is not set | 988 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 983 | # CONFIG_I2C_STUB is not set | 989 | # CONFIG_I2C_STUB is not set |
| 984 | |||
| 985 | # | ||
| 986 | # Miscellaneous I2C Chip support | ||
| 987 | # | ||
| 988 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 989 | # CONFIG_I2C_DEBUG_CORE is not set | 990 | # CONFIG_I2C_DEBUG_CORE is not set |
| 990 | # CONFIG_I2C_DEBUG_ALGO is not set | 991 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 991 | # CONFIG_I2C_DEBUG_BUS is not set | 992 | # CONFIG_I2C_DEBUG_BUS is not set |
| 992 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 993 | # CONFIG_SPI is not set | 993 | # CONFIG_SPI is not set |
| 994 | 994 | ||
| 995 | # | 995 | # |
| @@ -1014,18 +1014,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1014 | # Multifunction device drivers | 1014 | # Multifunction device drivers |
| 1015 | # | 1015 | # |
| 1016 | # CONFIG_MFD_CORE is not set | 1016 | # CONFIG_MFD_CORE is not set |
| 1017 | # CONFIG_MFD_88PM860X is not set | ||
| 1017 | # CONFIG_MFD_SM501 is not set | 1018 | # CONFIG_MFD_SM501 is not set |
| 1018 | # CONFIG_HTC_PASIC3 is not set | 1019 | # CONFIG_HTC_PASIC3 is not set |
| 1019 | # CONFIG_TWL4030_CORE is not set | 1020 | # CONFIG_TWL4030_CORE is not set |
| 1020 | # CONFIG_MFD_TMIO is not set | 1021 | # CONFIG_MFD_TMIO is not set |
| 1021 | # CONFIG_PMIC_DA903X is not set | 1022 | # CONFIG_PMIC_DA903X is not set |
| 1022 | # CONFIG_PMIC_ADP5520 is not set | 1023 | # CONFIG_PMIC_ADP5520 is not set |
| 1024 | # CONFIG_MFD_MAX8925 is not set | ||
| 1023 | # CONFIG_MFD_WM8400 is not set | 1025 | # CONFIG_MFD_WM8400 is not set |
| 1024 | # CONFIG_MFD_WM831X is not set | 1026 | # CONFIG_MFD_WM831X is not set |
| 1025 | # CONFIG_MFD_WM8350_I2C is not set | 1027 | # CONFIG_MFD_WM8350_I2C is not set |
| 1028 | # CONFIG_MFD_WM8994 is not set | ||
| 1026 | # CONFIG_MFD_PCF50633 is not set | 1029 | # CONFIG_MFD_PCF50633 is not set |
| 1027 | # CONFIG_AB3100_CORE is not set | 1030 | # CONFIG_AB3100_CORE is not set |
| 1028 | # CONFIG_MFD_88PM8607 is not set | 1031 | # CONFIG_LPC_SCH is not set |
| 1029 | # CONFIG_REGULATOR is not set | 1032 | # CONFIG_REGULATOR is not set |
| 1030 | # CONFIG_MEDIA_SUPPORT is not set | 1033 | # CONFIG_MEDIA_SUPPORT is not set |
| 1031 | 1034 | ||
| @@ -1034,6 +1037,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1034 | # | 1037 | # |
| 1035 | # CONFIG_AGP is not set | 1038 | # CONFIG_AGP is not set |
| 1036 | CONFIG_VGA_ARB=y | 1039 | CONFIG_VGA_ARB=y |
| 1040 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1037 | # CONFIG_DRM is not set | 1041 | # CONFIG_DRM is not set |
| 1038 | # CONFIG_VGASTATE is not set | 1042 | # CONFIG_VGASTATE is not set |
| 1039 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1043 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1151,6 +1155,7 @@ CONFIG_SND_INTEL8X0=y | |||
| 1151 | CONFIG_SND_PPC=y | 1155 | CONFIG_SND_PPC=y |
| 1152 | CONFIG_SND_USB=y | 1156 | CONFIG_SND_USB=y |
| 1153 | # CONFIG_SND_USB_AUDIO is not set | 1157 | # CONFIG_SND_USB_AUDIO is not set |
| 1158 | # CONFIG_SND_USB_UA101 is not set | ||
| 1154 | # CONFIG_SND_USB_USX2Y is not set | 1159 | # CONFIG_SND_USB_USX2Y is not set |
| 1155 | # CONFIG_SND_USB_CAIAQ is not set | 1160 | # CONFIG_SND_USB_CAIAQ is not set |
| 1156 | # CONFIG_SND_SOC is not set | 1161 | # CONFIG_SND_SOC is not set |
| @@ -1170,6 +1175,7 @@ CONFIG_USB_HID=y | |||
| 1170 | # | 1175 | # |
| 1171 | # Special HID drivers | 1176 | # Special HID drivers |
| 1172 | # | 1177 | # |
| 1178 | # CONFIG_HID_3M_PCT is not set | ||
| 1173 | CONFIG_HID_A4TECH=y | 1179 | CONFIG_HID_A4TECH=y |
| 1174 | CONFIG_HID_APPLE=y | 1180 | CONFIG_HID_APPLE=y |
| 1175 | CONFIG_HID_BELKIN=y | 1181 | CONFIG_HID_BELKIN=y |
| @@ -1185,14 +1191,19 @@ CONFIG_HID_GYRATION=y | |||
| 1185 | CONFIG_HID_LOGITECH=y | 1191 | CONFIG_HID_LOGITECH=y |
| 1186 | # CONFIG_LOGITECH_FF is not set | 1192 | # CONFIG_LOGITECH_FF is not set |
| 1187 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1193 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1194 | # CONFIG_LOGIG940_FF is not set | ||
| 1188 | CONFIG_HID_MICROSOFT=y | 1195 | CONFIG_HID_MICROSOFT=y |
| 1196 | # CONFIG_HID_MOSART is not set | ||
| 1189 | CONFIG_HID_MONTEREY=y | 1197 | CONFIG_HID_MONTEREY=y |
| 1190 | # CONFIG_HID_NTRIG is not set | 1198 | # CONFIG_HID_NTRIG is not set |
| 1199 | # CONFIG_HID_ORTEK is not set | ||
| 1191 | CONFIG_HID_PANTHERLORD=y | 1200 | CONFIG_HID_PANTHERLORD=y |
| 1192 | # CONFIG_PANTHERLORD_FF is not set | 1201 | # CONFIG_PANTHERLORD_FF is not set |
| 1193 | CONFIG_HID_PETALYNX=y | 1202 | CONFIG_HID_PETALYNX=y |
| 1203 | # CONFIG_HID_QUANTA is not set | ||
| 1194 | CONFIG_HID_SAMSUNG=y | 1204 | CONFIG_HID_SAMSUNG=y |
| 1195 | CONFIG_HID_SONY=y | 1205 | CONFIG_HID_SONY=y |
| 1206 | # CONFIG_HID_STANTUM is not set | ||
| 1196 | CONFIG_HID_SUNPLUS=y | 1207 | CONFIG_HID_SUNPLUS=y |
| 1197 | # CONFIG_HID_GREENASIA is not set | 1208 | # CONFIG_HID_GREENASIA is not set |
| 1198 | # CONFIG_HID_SMARTJOYPLUS is not set | 1209 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1300,7 +1311,6 @@ CONFIG_USB_STORAGE=y | |||
| 1300 | # CONFIG_USB_RIO500 is not set | 1311 | # CONFIG_USB_RIO500 is not set |
| 1301 | # CONFIG_USB_LEGOTOWER is not set | 1312 | # CONFIG_USB_LEGOTOWER is not set |
| 1302 | # CONFIG_USB_LCD is not set | 1313 | # CONFIG_USB_LCD is not set |
| 1303 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1304 | # CONFIG_USB_LED is not set | 1314 | # CONFIG_USB_LED is not set |
| 1305 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1315 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1306 | # CONFIG_USB_CYTHERM is not set | 1316 | # CONFIG_USB_CYTHERM is not set |
| @@ -1313,7 +1323,6 @@ CONFIG_USB_STORAGE=y | |||
| 1313 | # CONFIG_USB_IOWARRIOR is not set | 1323 | # CONFIG_USB_IOWARRIOR is not set |
| 1314 | # CONFIG_USB_TEST is not set | 1324 | # CONFIG_USB_TEST is not set |
| 1315 | # CONFIG_USB_ISIGHTFW is not set | 1325 | # CONFIG_USB_ISIGHTFW is not set |
| 1316 | # CONFIG_USB_VST is not set | ||
| 1317 | # CONFIG_USB_GADGET is not set | 1326 | # CONFIG_USB_GADGET is not set |
| 1318 | 1327 | ||
| 1319 | # | 1328 | # |
| @@ -1475,6 +1484,7 @@ CONFIG_BEFS_FS=m | |||
| 1475 | # CONFIG_BEFS_DEBUG is not set | 1484 | # CONFIG_BEFS_DEBUG is not set |
| 1476 | CONFIG_BFS_FS=m | 1485 | CONFIG_BFS_FS=m |
| 1477 | CONFIG_EFS_FS=m | 1486 | CONFIG_EFS_FS=m |
| 1487 | # CONFIG_LOGFS is not set | ||
| 1478 | CONFIG_CRAMFS=y | 1488 | CONFIG_CRAMFS=y |
| 1479 | # CONFIG_SQUASHFS is not set | 1489 | # CONFIG_SQUASHFS is not set |
| 1480 | CONFIG_VXFS_FS=m | 1490 | CONFIG_VXFS_FS=m |
| @@ -1506,6 +1516,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1506 | CONFIG_RPCSEC_GSS_KRB5=y | 1516 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1507 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1517 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1508 | # CONFIG_SMB_FS is not set | 1518 | # CONFIG_SMB_FS is not set |
| 1519 | # CONFIG_CEPH_FS is not set | ||
| 1509 | # CONFIG_CIFS is not set | 1520 | # CONFIG_CIFS is not set |
| 1510 | # CONFIG_NCP_FS is not set | 1521 | # CONFIG_NCP_FS is not set |
| 1511 | # CONFIG_CODA_FS is not set | 1522 | # CONFIG_CODA_FS is not set |
| @@ -1717,6 +1728,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1717 | CONFIG_CRYPTO_MANAGER2=y | 1728 | CONFIG_CRYPTO_MANAGER2=y |
| 1718 | # CONFIG_CRYPTO_GF128MUL is not set | 1729 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1719 | # CONFIG_CRYPTO_NULL is not set | 1730 | # CONFIG_CRYPTO_NULL is not set |
| 1731 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1720 | CONFIG_CRYPTO_WORKQUEUE=y | 1732 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1721 | # CONFIG_CRYPTO_CRYPTD is not set | 1733 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1722 | # CONFIG_CRYPTO_AUTHENC is not set | 1734 | # CONFIG_CRYPTO_AUTHENC is not set |
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig index 4fb04dd2cde3..a63009457323 100644 --- a/arch/powerpc/configs/86xx/sbc8641d_defconfig +++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:38 2010 | 4 | # Mon Apr 19 23:17:02 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -101,11 +101,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 101 | CONFIG_IKCONFIG=y | 101 | CONFIG_IKCONFIG=y |
| 102 | CONFIG_IKCONFIG_PROC=y | 102 | CONFIG_IKCONFIG_PROC=y |
| 103 | CONFIG_LOG_BUF_SHIFT=14 | 103 | CONFIG_LOG_BUF_SHIFT=14 |
| 104 | CONFIG_GROUP_SCHED=y | ||
| 105 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 106 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 107 | CONFIG_USER_SCHED=y | ||
| 108 | # CONFIG_CGROUP_SCHED is not set | ||
| 109 | # CONFIG_CGROUPS is not set | 104 | # CONFIG_CGROUPS is not set |
| 110 | CONFIG_SYSFS_DEPRECATED=y | 105 | CONFIG_SYSFS_DEPRECATED=y |
| 111 | CONFIG_SYSFS_DEPRECATED_V2=y | 106 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -116,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 116 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 117 | # CONFIG_RD_BZIP2 is not set | 112 | # CONFIG_RD_BZIP2 is not set |
| 118 | # CONFIG_RD_LZMA is not set | 113 | # CONFIG_RD_LZMA is not set |
| 114 | # CONFIG_RD_LZO is not set | ||
| 119 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 120 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 121 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -327,6 +323,7 @@ CONFIG_ISA_DMA_API=y | |||
| 327 | # Bus options | 323 | # Bus options |
| 328 | # | 324 | # |
| 329 | CONFIG_ZONE_DMA=y | 325 | CONFIG_ZONE_DMA=y |
| 326 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 330 | CONFIG_GENERIC_ISA_DMA=y | 327 | CONFIG_GENERIC_ISA_DMA=y |
| 331 | CONFIG_PPC_INDIRECT_PCI=y | 328 | CONFIG_PPC_INDIRECT_PCI=y |
| 332 | CONFIG_FSL_SOC=y | 329 | CONFIG_FSL_SOC=y |
| @@ -342,7 +339,6 @@ CONFIG_PCIEAER=y | |||
| 342 | # CONFIG_PCIEASPM is not set | 339 | # CONFIG_PCIEASPM is not set |
| 343 | CONFIG_ARCH_SUPPORTS_MSI=y | 340 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 344 | # CONFIG_PCI_MSI is not set | 341 | # CONFIG_PCI_MSI is not set |
| 345 | # CONFIG_PCI_LEGACY is not set | ||
| 346 | # CONFIG_PCI_DEBUG is not set | 342 | # CONFIG_PCI_DEBUG is not set |
| 347 | # CONFIG_PCI_STUB is not set | 343 | # CONFIG_PCI_STUB is not set |
| 348 | # CONFIG_PCI_IOV is not set | 344 | # CONFIG_PCI_IOV is not set |
| @@ -369,7 +365,6 @@ CONFIG_NET=y | |||
| 369 | # Networking options | 365 | # Networking options |
| 370 | # | 366 | # |
| 371 | CONFIG_PACKET=y | 367 | CONFIG_PACKET=y |
| 372 | CONFIG_PACKET_MMAP=y | ||
| 373 | CONFIG_UNIX=y | 368 | CONFIG_UNIX=y |
| 374 | CONFIG_XFRM=y | 369 | CONFIG_XFRM=y |
| 375 | CONFIG_XFRM_USER=m | 370 | CONFIG_XFRM_USER=m |
| @@ -552,6 +547,7 @@ CONFIG_ATM_BR2684=m | |||
| 552 | # CONFIG_ATM_BR2684_IPFILTER is not set | 547 | # CONFIG_ATM_BR2684_IPFILTER is not set |
| 553 | CONFIG_STP=m | 548 | CONFIG_STP=m |
| 554 | CONFIG_BRIDGE=m | 549 | CONFIG_BRIDGE=m |
| 550 | CONFIG_BRIDGE_IGMP_SNOOPING=y | ||
| 555 | # CONFIG_NET_DSA is not set | 551 | # CONFIG_NET_DSA is not set |
| 556 | CONFIG_VLAN_8021Q=m | 552 | CONFIG_VLAN_8021Q=m |
| 557 | # CONFIG_VLAN_8021Q_GVRP is not set | 553 | # CONFIG_VLAN_8021Q_GVRP is not set |
| @@ -733,6 +729,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 733 | # UBI - Unsorted block images | 729 | # UBI - Unsorted block images |
| 734 | # | 730 | # |
| 735 | # CONFIG_MTD_UBI is not set | 731 | # CONFIG_MTD_UBI is not set |
| 732 | CONFIG_OF_FLATTREE=y | ||
| 733 | CONFIG_OF_DYNAMIC=y | ||
| 736 | CONFIG_OF_DEVICE=y | 734 | CONFIG_OF_DEVICE=y |
| 737 | CONFIG_OF_I2C=y | 735 | CONFIG_OF_I2C=y |
| 738 | CONFIG_OF_MDIO=y | 736 | CONFIG_OF_MDIO=y |
| @@ -768,6 +766,7 @@ CONFIG_MISC_DEVICES=y | |||
| 768 | # CONFIG_ENCLOSURE_SERVICES is not set | 766 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 769 | # CONFIG_HP_ILO is not set | 767 | # CONFIG_HP_ILO is not set |
| 770 | # CONFIG_ISL29003 is not set | 768 | # CONFIG_ISL29003 is not set |
| 769 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 771 | # CONFIG_DS1682 is not set | 770 | # CONFIG_DS1682 is not set |
| 772 | # CONFIG_C2PORT is not set | 771 | # CONFIG_C2PORT is not set |
| 773 | 772 | ||
| @@ -785,6 +784,7 @@ CONFIG_HAVE_IDE=y | |||
| 785 | # | 784 | # |
| 786 | # SCSI device support | 785 | # SCSI device support |
| 787 | # | 786 | # |
| 787 | CONFIG_SCSI_MOD=y | ||
| 788 | # CONFIG_RAID_ATTRS is not set | 788 | # CONFIG_RAID_ATTRS is not set |
| 789 | # CONFIG_SCSI is not set | 789 | # CONFIG_SCSI is not set |
| 790 | # CONFIG_SCSI_DMA is not set | 790 | # CONFIG_SCSI_DMA is not set |
| @@ -1024,6 +1024,7 @@ CONFIG_SERIAL_CORE=y | |||
| 1024 | CONFIG_SERIAL_CORE_CONSOLE=y | 1024 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1025 | # CONFIG_SERIAL_JSM is not set | 1025 | # CONFIG_SERIAL_JSM is not set |
| 1026 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1026 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1027 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1027 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1028 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1028 | CONFIG_UNIX98_PTYS=y | 1029 | CONFIG_UNIX98_PTYS=y |
| 1029 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1030 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1074,6 +1075,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1074 | CONFIG_I2C_MPC=y | 1075 | CONFIG_I2C_MPC=y |
| 1075 | # CONFIG_I2C_OCORES is not set | 1076 | # CONFIG_I2C_OCORES is not set |
| 1076 | # CONFIG_I2C_SIMTEC is not set | 1077 | # CONFIG_I2C_SIMTEC is not set |
| 1078 | # CONFIG_I2C_XILINX is not set | ||
| 1077 | 1079 | ||
| 1078 | # | 1080 | # |
| 1079 | # External I2C/SMBus adapter drivers | 1081 | # External I2C/SMBus adapter drivers |
| @@ -1086,15 +1088,9 @@ CONFIG_I2C_MPC=y | |||
| 1086 | # | 1088 | # |
| 1087 | # CONFIG_I2C_PCA_PLATFORM is not set | 1089 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1088 | # CONFIG_I2C_STUB is not set | 1090 | # CONFIG_I2C_STUB is not set |
| 1089 | |||
| 1090 | # | ||
| 1091 | # Miscellaneous I2C Chip support | ||
| 1092 | # | ||
| 1093 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1094 | # CONFIG_I2C_DEBUG_CORE is not set | 1091 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1095 | # CONFIG_I2C_DEBUG_ALGO is not set | 1092 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1096 | # CONFIG_I2C_DEBUG_BUS is not set | 1093 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1097 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1098 | # CONFIG_SPI is not set | 1094 | # CONFIG_SPI is not set |
| 1099 | 1095 | ||
| 1100 | # | 1096 | # |
| @@ -1120,10 +1116,11 @@ CONFIG_HWMON=y | |||
| 1120 | # CONFIG_SENSORS_ADM1029 is not set | 1116 | # CONFIG_SENSORS_ADM1029 is not set |
| 1121 | # CONFIG_SENSORS_ADM1031 is not set | 1117 | # CONFIG_SENSORS_ADM1031 is not set |
| 1122 | # CONFIG_SENSORS_ADM9240 is not set | 1118 | # CONFIG_SENSORS_ADM9240 is not set |
| 1119 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1123 | # CONFIG_SENSORS_ADT7462 is not set | 1120 | # CONFIG_SENSORS_ADT7462 is not set |
| 1124 | # CONFIG_SENSORS_ADT7470 is not set | 1121 | # CONFIG_SENSORS_ADT7470 is not set |
| 1125 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1126 | # CONFIG_SENSORS_ADT7475 is not set | 1122 | # CONFIG_SENSORS_ADT7475 is not set |
| 1123 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1127 | # CONFIG_SENSORS_ATXP1 is not set | 1124 | # CONFIG_SENSORS_ATXP1 is not set |
| 1128 | # CONFIG_SENSORS_DS1621 is not set | 1125 | # CONFIG_SENSORS_DS1621 is not set |
| 1129 | # CONFIG_SENSORS_I5K_AMB is not set | 1126 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1160,6 +1157,7 @@ CONFIG_HWMON=y | |||
| 1160 | # CONFIG_SENSORS_SMSC47M192 is not set | 1157 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1161 | # CONFIG_SENSORS_SMSC47B397 is not set | 1158 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1162 | # CONFIG_SENSORS_ADS7828 is not set | 1159 | # CONFIG_SENSORS_ADS7828 is not set |
| 1160 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1163 | # CONFIG_SENSORS_THMC50 is not set | 1161 | # CONFIG_SENSORS_THMC50 is not set |
| 1164 | # CONFIG_SENSORS_TMP401 is not set | 1162 | # CONFIG_SENSORS_TMP401 is not set |
| 1165 | # CONFIG_SENSORS_TMP421 is not set | 1163 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1202,18 +1200,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1202 | # Multifunction device drivers | 1200 | # Multifunction device drivers |
| 1203 | # | 1201 | # |
| 1204 | # CONFIG_MFD_CORE is not set | 1202 | # CONFIG_MFD_CORE is not set |
| 1203 | # CONFIG_MFD_88PM860X is not set | ||
| 1205 | # CONFIG_MFD_SM501 is not set | 1204 | # CONFIG_MFD_SM501 is not set |
| 1206 | # CONFIG_HTC_PASIC3 is not set | 1205 | # CONFIG_HTC_PASIC3 is not set |
| 1207 | # CONFIG_TWL4030_CORE is not set | 1206 | # CONFIG_TWL4030_CORE is not set |
| 1208 | # CONFIG_MFD_TMIO is not set | 1207 | # CONFIG_MFD_TMIO is not set |
| 1209 | # CONFIG_PMIC_DA903X is not set | 1208 | # CONFIG_PMIC_DA903X is not set |
| 1210 | # CONFIG_PMIC_ADP5520 is not set | 1209 | # CONFIG_PMIC_ADP5520 is not set |
| 1210 | # CONFIG_MFD_MAX8925 is not set | ||
| 1211 | # CONFIG_MFD_WM8400 is not set | 1211 | # CONFIG_MFD_WM8400 is not set |
| 1212 | # CONFIG_MFD_WM831X is not set | 1212 | # CONFIG_MFD_WM831X is not set |
| 1213 | # CONFIG_MFD_WM8350_I2C is not set | 1213 | # CONFIG_MFD_WM8350_I2C is not set |
| 1214 | # CONFIG_MFD_WM8994 is not set | ||
| 1214 | # CONFIG_MFD_PCF50633 is not set | 1215 | # CONFIG_MFD_PCF50633 is not set |
| 1215 | # CONFIG_AB3100_CORE is not set | 1216 | # CONFIG_AB3100_CORE is not set |
| 1216 | # CONFIG_MFD_88PM8607 is not set | 1217 | # CONFIG_LPC_SCH is not set |
| 1217 | # CONFIG_REGULATOR is not set | 1218 | # CONFIG_REGULATOR is not set |
| 1218 | # CONFIG_MEDIA_SUPPORT is not set | 1219 | # CONFIG_MEDIA_SUPPORT is not set |
| 1219 | 1220 | ||
| @@ -1222,6 +1223,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1222 | # | 1223 | # |
| 1223 | # CONFIG_AGP is not set | 1224 | # CONFIG_AGP is not set |
| 1224 | CONFIG_VGA_ARB=y | 1225 | CONFIG_VGA_ARB=y |
| 1226 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1225 | # CONFIG_DRM is not set | 1227 | # CONFIG_DRM is not set |
| 1226 | # CONFIG_VGASTATE is not set | 1228 | # CONFIG_VGASTATE is not set |
| 1227 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1229 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1376,6 +1378,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1376 | # CONFIG_BFS_FS is not set | 1378 | # CONFIG_BFS_FS is not set |
| 1377 | # CONFIG_EFS_FS is not set | 1379 | # CONFIG_EFS_FS is not set |
| 1378 | # CONFIG_JFFS2_FS is not set | 1380 | # CONFIG_JFFS2_FS is not set |
| 1381 | # CONFIG_LOGFS is not set | ||
| 1379 | # CONFIG_CRAMFS is not set | 1382 | # CONFIG_CRAMFS is not set |
| 1380 | # CONFIG_SQUASHFS is not set | 1383 | # CONFIG_SQUASHFS is not set |
| 1381 | # CONFIG_VXFS_FS is not set | 1384 | # CONFIG_VXFS_FS is not set |
| @@ -1408,6 +1411,7 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 1408 | CONFIG_SMB_FS=m | 1411 | CONFIG_SMB_FS=m |
| 1409 | CONFIG_SMB_NLS_DEFAULT=y | 1412 | CONFIG_SMB_NLS_DEFAULT=y |
| 1410 | CONFIG_SMB_NLS_REMOTE="cp437" | 1413 | CONFIG_SMB_NLS_REMOTE="cp437" |
| 1414 | # CONFIG_CEPH_FS is not set | ||
| 1411 | CONFIG_CIFS=m | 1415 | CONFIG_CIFS=m |
| 1412 | # CONFIG_CIFS_STATS is not set | 1416 | # CONFIG_CIFS_STATS is not set |
| 1413 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1417 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1540,6 +1544,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1540 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1544 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1541 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1545 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1542 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 1546 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 1547 | # CONFIG_LKDTM is not set | ||
| 1543 | # CONFIG_FAULT_INJECTION is not set | 1548 | # CONFIG_FAULT_INJECTION is not set |
| 1544 | # CONFIG_LATENCYTOP is not set | 1549 | # CONFIG_LATENCYTOP is not set |
| 1545 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1550 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| @@ -1618,6 +1623,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1618 | CONFIG_CRYPTO_MANAGER2=y | 1623 | CONFIG_CRYPTO_MANAGER2=y |
| 1619 | # CONFIG_CRYPTO_GF128MUL is not set | 1624 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1620 | CONFIG_CRYPTO_NULL=m | 1625 | CONFIG_CRYPTO_NULL=m |
| 1626 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1621 | CONFIG_CRYPTO_WORKQUEUE=y | 1627 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1622 | # CONFIG_CRYPTO_CRYPTD is not set | 1628 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1623 | CONFIG_CRYPTO_AUTHENC=m | 1629 | CONFIG_CRYPTO_AUTHENC=m |
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index 5c1dc768bbd8..9f89d5c9c0be 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:23:58 2010 | 4 | # Mon Apr 19 23:16:22 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -91,11 +91,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 91 | # CONFIG_TREE_RCU_TRACE is not set | 91 | # CONFIG_TREE_RCU_TRACE is not set |
| 92 | # CONFIG_IKCONFIG is not set | 92 | # CONFIG_IKCONFIG is not set |
| 93 | CONFIG_LOG_BUF_SHIFT=14 | 93 | CONFIG_LOG_BUF_SHIFT=14 |
| 94 | CONFIG_GROUP_SCHED=y | ||
| 95 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 96 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 97 | CONFIG_USER_SCHED=y | ||
| 98 | # CONFIG_CGROUP_SCHED is not set | ||
| 99 | # CONFIG_CGROUPS is not set | 94 | # CONFIG_CGROUPS is not set |
| 100 | CONFIG_SYSFS_DEPRECATED=y | 95 | CONFIG_SYSFS_DEPRECATED=y |
| 101 | CONFIG_SYSFS_DEPRECATED_V2=y | 96 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -307,6 +302,7 @@ CONFIG_ISA_DMA_API=y | |||
| 307 | # Bus options | 302 | # Bus options |
| 308 | # | 303 | # |
| 309 | CONFIG_ZONE_DMA=y | 304 | CONFIG_ZONE_DMA=y |
| 305 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 310 | CONFIG_FSL_SOC=y | 306 | CONFIG_FSL_SOC=y |
| 311 | # CONFIG_PCI is not set | 307 | # CONFIG_PCI is not set |
| 312 | # CONFIG_PCI_DOMAINS is not set | 308 | # CONFIG_PCI_DOMAINS is not set |
| @@ -336,7 +332,6 @@ CONFIG_NET=y | |||
| 336 | # Networking options | 332 | # Networking options |
| 337 | # | 333 | # |
| 338 | CONFIG_PACKET=y | 334 | CONFIG_PACKET=y |
| 339 | # CONFIG_PACKET_MMAP is not set | ||
| 340 | CONFIG_UNIX=y | 335 | CONFIG_UNIX=y |
| 341 | # CONFIG_NET_KEY is not set | 336 | # CONFIG_NET_KEY is not set |
| 342 | CONFIG_INET=y | 337 | CONFIG_INET=y |
| @@ -505,6 +500,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 505 | # UBI - Unsorted block images | 500 | # UBI - Unsorted block images |
| 506 | # | 501 | # |
| 507 | # CONFIG_MTD_UBI is not set | 502 | # CONFIG_MTD_UBI is not set |
| 503 | CONFIG_OF_FLATTREE=y | ||
| 504 | CONFIG_OF_DYNAMIC=y | ||
| 508 | CONFIG_OF_DEVICE=y | 505 | CONFIG_OF_DEVICE=y |
| 509 | CONFIG_OF_MDIO=y | 506 | CONFIG_OF_MDIO=y |
| 510 | # CONFIG_PARPORT is not set | 507 | # CONFIG_PARPORT is not set |
| @@ -516,6 +513,7 @@ CONFIG_HAVE_IDE=y | |||
| 516 | # | 513 | # |
| 517 | # SCSI device support | 514 | # SCSI device support |
| 518 | # | 515 | # |
| 516 | CONFIG_SCSI_MOD=y | ||
| 519 | # CONFIG_RAID_ATTRS is not set | 517 | # CONFIG_RAID_ATTRS is not set |
| 520 | # CONFIG_SCSI is not set | 518 | # CONFIG_SCSI is not set |
| 521 | # CONFIG_SCSI_DMA is not set | 519 | # CONFIG_SCSI_DMA is not set |
| @@ -664,6 +662,7 @@ CONFIG_SERIAL_CORE=y | |||
| 664 | CONFIG_SERIAL_CORE_CONSOLE=y | 662 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 665 | CONFIG_SERIAL_CPM=y | 663 | CONFIG_SERIAL_CPM=y |
| 666 | CONFIG_SERIAL_CPM_CONSOLE=y | 664 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 665 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 667 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 666 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 668 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
| 669 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 668 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -802,6 +801,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 802 | # CONFIG_BFS_FS is not set | 801 | # CONFIG_BFS_FS is not set |
| 803 | # CONFIG_EFS_FS is not set | 802 | # CONFIG_EFS_FS is not set |
| 804 | # CONFIG_JFFS2_FS is not set | 803 | # CONFIG_JFFS2_FS is not set |
| 804 | # CONFIG_LOGFS is not set | ||
| 805 | CONFIG_CRAMFS=y | 805 | CONFIG_CRAMFS=y |
| 806 | # CONFIG_SQUASHFS is not set | 806 | # CONFIG_SQUASHFS is not set |
| 807 | # CONFIG_VXFS_FS is not set | 807 | # CONFIG_VXFS_FS is not set |
| @@ -826,6 +826,7 @@ CONFIG_SUNRPC=y | |||
| 826 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 826 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 827 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 827 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 828 | # CONFIG_SMB_FS is not set | 828 | # CONFIG_SMB_FS is not set |
| 829 | # CONFIG_CEPH_FS is not set | ||
| 829 | # CONFIG_CIFS is not set | 830 | # CONFIG_CIFS is not set |
| 830 | # CONFIG_NCP_FS is not set | 831 | # CONFIG_NCP_FS is not set |
| 831 | # CONFIG_CODA_FS is not set | 832 | # CONFIG_CODA_FS is not set |
| @@ -924,6 +925,7 @@ CONFIG_DEBUG_INFO=y | |||
| 924 | # CONFIG_BACKTRACE_SELF_TEST is not set | 925 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 925 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 926 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 926 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 927 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 928 | # CONFIG_LKDTM is not set | ||
| 927 | # CONFIG_FAULT_INJECTION is not set | 929 | # CONFIG_FAULT_INJECTION is not set |
| 928 | # CONFIG_LATENCYTOP is not set | 930 | # CONFIG_LATENCYTOP is not set |
| 929 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | 931 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index 72137cd881da..4ab6074db3cf 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:23:59 2010 | 4 | # Mon Apr 19 23:16:23 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -101,11 +101,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 101 | # CONFIG_TREE_RCU_TRACE is not set | 101 | # CONFIG_TREE_RCU_TRACE is not set |
| 102 | # CONFIG_IKCONFIG is not set | 102 | # CONFIG_IKCONFIG is not set |
| 103 | CONFIG_LOG_BUF_SHIFT=17 | 103 | CONFIG_LOG_BUF_SHIFT=17 |
| 104 | CONFIG_GROUP_SCHED=y | ||
| 105 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 106 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 107 | CONFIG_USER_SCHED=y | ||
| 108 | # CONFIG_CGROUP_SCHED is not set | ||
| 109 | # CONFIG_CGROUPS is not set | 104 | # CONFIG_CGROUPS is not set |
| 110 | CONFIG_SYSFS_DEPRECATED=y | 105 | CONFIG_SYSFS_DEPRECATED=y |
| 111 | CONFIG_SYSFS_DEPRECATED_V2=y | 106 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -121,6 +116,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 121 | CONFIG_RD_GZIP=y | 116 | CONFIG_RD_GZIP=y |
| 122 | CONFIG_RD_BZIP2=y | 117 | CONFIG_RD_BZIP2=y |
| 123 | CONFIG_RD_LZMA=y | 118 | CONFIG_RD_LZMA=y |
| 119 | CONFIG_RD_LZO=y | ||
| 124 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 120 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 125 | CONFIG_SYSCTL=y | 121 | CONFIG_SYSCTL=y |
| 126 | CONFIG_ANON_INODES=y | 122 | CONFIG_ANON_INODES=y |
| @@ -147,7 +143,6 @@ CONFIG_HAVE_PERF_EVENTS=y | |||
| 147 | # Kernel Performance Events And Counters | 143 | # Kernel Performance Events And Counters |
| 148 | # | 144 | # |
| 149 | CONFIG_PERF_EVENTS=y | 145 | CONFIG_PERF_EVENTS=y |
| 150 | CONFIG_EVENT_PROFILE=y | ||
| 151 | # CONFIG_PERF_COUNTERS is not set | 146 | # CONFIG_PERF_COUNTERS is not set |
| 152 | # CONFIG_DEBUG_PERF_USE_VMALLOC is not set | 147 | # CONFIG_DEBUG_PERF_USE_VMALLOC is not set |
| 153 | CONFIG_VM_EVENT_COUNTERS=y | 148 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -158,7 +153,6 @@ CONFIG_COMPAT_BRK=y | |||
| 158 | CONFIG_SLUB=y | 153 | CONFIG_SLUB=y |
| 159 | # CONFIG_SLOB is not set | 154 | # CONFIG_SLOB is not set |
| 160 | CONFIG_PROFILING=y | 155 | CONFIG_PROFILING=y |
| 161 | CONFIG_TRACEPOINTS=y | ||
| 162 | CONFIG_OPROFILE=m | 156 | CONFIG_OPROFILE=m |
| 163 | CONFIG_HAVE_OPROFILE=y | 157 | CONFIG_HAVE_OPROFILE=y |
| 164 | CONFIG_KPROBES=y | 158 | CONFIG_KPROBES=y |
| @@ -357,6 +351,7 @@ CONFIG_ISA_DMA_API=y | |||
| 357 | # Bus options | 351 | # Bus options |
| 358 | # | 352 | # |
| 359 | CONFIG_ZONE_DMA=y | 353 | CONFIG_ZONE_DMA=y |
| 354 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 360 | CONFIG_GENERIC_ISA_DMA=y | 355 | CONFIG_GENERIC_ISA_DMA=y |
| 361 | CONFIG_PPC_INDIRECT_PCI=y | 356 | CONFIG_PPC_INDIRECT_PCI=y |
| 362 | CONFIG_PCI=y | 357 | CONFIG_PCI=y |
| @@ -365,7 +360,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 365 | # CONFIG_PCIEPORTBUS is not set | 360 | # CONFIG_PCIEPORTBUS is not set |
| 366 | CONFIG_ARCH_SUPPORTS_MSI=y | 361 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 367 | CONFIG_PCI_MSI=y | 362 | CONFIG_PCI_MSI=y |
| 368 | # CONFIG_PCI_LEGACY is not set | ||
| 369 | # CONFIG_PCI_DEBUG is not set | 363 | # CONFIG_PCI_DEBUG is not set |
| 370 | # CONFIG_PCI_STUB is not set | 364 | # CONFIG_PCI_STUB is not set |
| 371 | # CONFIG_PCI_IOV is not set | 365 | # CONFIG_PCI_IOV is not set |
| @@ -396,7 +390,6 @@ CONFIG_NET=y | |||
| 396 | # Networking options | 390 | # Networking options |
| 397 | # | 391 | # |
| 398 | CONFIG_PACKET=y | 392 | CONFIG_PACKET=y |
| 399 | CONFIG_PACKET_MMAP=y | ||
| 400 | CONFIG_UNIX=y | 393 | CONFIG_UNIX=y |
| 401 | CONFIG_XFRM=y | 394 | CONFIG_XFRM=y |
| 402 | CONFIG_XFRM_USER=y | 395 | CONFIG_XFRM_USER=y |
| @@ -527,6 +520,7 @@ CONFIG_IP_VS_PROTO_UDP=y | |||
| 527 | CONFIG_IP_VS_PROTO_AH_ESP=y | 520 | CONFIG_IP_VS_PROTO_AH_ESP=y |
| 528 | CONFIG_IP_VS_PROTO_ESP=y | 521 | CONFIG_IP_VS_PROTO_ESP=y |
| 529 | CONFIG_IP_VS_PROTO_AH=y | 522 | CONFIG_IP_VS_PROTO_AH=y |
| 523 | # CONFIG_IP_VS_PROTO_SCTP is not set | ||
| 530 | 524 | ||
| 531 | # | 525 | # |
| 532 | # IPVS scheduler | 526 | # IPVS scheduler |
| @@ -630,6 +624,7 @@ CONFIG_ATM_BR2684=m | |||
| 630 | # CONFIG_ATM_BR2684_IPFILTER is not set | 624 | # CONFIG_ATM_BR2684_IPFILTER is not set |
| 631 | CONFIG_STP=m | 625 | CONFIG_STP=m |
| 632 | CONFIG_BRIDGE=m | 626 | CONFIG_BRIDGE=m |
| 627 | CONFIG_BRIDGE_IGMP_SNOOPING=y | ||
| 633 | # CONFIG_NET_DSA is not set | 628 | # CONFIG_NET_DSA is not set |
| 634 | CONFIG_VLAN_8021Q=m | 629 | CONFIG_VLAN_8021Q=m |
| 635 | # CONFIG_VLAN_8021Q_GVRP is not set | 630 | # CONFIG_VLAN_8021Q_GVRP is not set |
| @@ -690,7 +685,6 @@ CONFIG_NET_SCH_FIFO=y | |||
| 690 | # | 685 | # |
| 691 | # CONFIG_NET_PKTGEN is not set | 686 | # CONFIG_NET_PKTGEN is not set |
| 692 | # CONFIG_NET_TCPPROBE is not set | 687 | # CONFIG_NET_TCPPROBE is not set |
| 693 | # CONFIG_NET_DROP_MONITOR is not set | ||
| 694 | # CONFIG_HAMRADIO is not set | 688 | # CONFIG_HAMRADIO is not set |
| 695 | # CONFIG_CAN is not set | 689 | # CONFIG_CAN is not set |
| 696 | # CONFIG_IRDA is not set | 690 | # CONFIG_IRDA is not set |
| @@ -833,6 +827,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 833 | # UBI - Unsorted block images | 827 | # UBI - Unsorted block images |
| 834 | # | 828 | # |
| 835 | # CONFIG_MTD_UBI is not set | 829 | # CONFIG_MTD_UBI is not set |
| 830 | CONFIG_OF_FLATTREE=y | ||
| 831 | CONFIG_OF_DYNAMIC=y | ||
| 836 | CONFIG_OF_DEVICE=y | 832 | CONFIG_OF_DEVICE=y |
| 837 | CONFIG_OF_I2C=m | 833 | CONFIG_OF_I2C=m |
| 838 | CONFIG_OF_MDIO=y | 834 | CONFIG_OF_MDIO=y |
| @@ -867,6 +863,7 @@ CONFIG_HAVE_IDE=y | |||
| 867 | # | 863 | # |
| 868 | # SCSI device support | 864 | # SCSI device support |
| 869 | # | 865 | # |
| 866 | CONFIG_SCSI_MOD=m | ||
| 870 | # CONFIG_RAID_ATTRS is not set | 867 | # CONFIG_RAID_ATTRS is not set |
| 871 | CONFIG_SCSI=m | 868 | CONFIG_SCSI=m |
| 872 | CONFIG_SCSI_DMA=y | 869 | CONFIG_SCSI_DMA=y |
| @@ -1179,6 +1176,7 @@ CONFIG_SERIAL_MPSC_CONSOLE=y | |||
| 1179 | CONFIG_SERIAL_CORE=y | 1176 | CONFIG_SERIAL_CORE=y |
| 1180 | CONFIG_SERIAL_CORE_CONSOLE=y | 1177 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1181 | # CONFIG_SERIAL_JSM is not set | 1178 | # CONFIG_SERIAL_JSM is not set |
| 1179 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1182 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1180 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1183 | CONFIG_UNIX98_PTYS=y | 1181 | CONFIG_UNIX98_PTYS=y |
| 1184 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1182 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1231,6 +1229,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1231 | CONFIG_I2C_MV64XXX=m | 1229 | CONFIG_I2C_MV64XXX=m |
| 1232 | # CONFIG_I2C_OCORES is not set | 1230 | # CONFIG_I2C_OCORES is not set |
| 1233 | # CONFIG_I2C_SIMTEC is not set | 1231 | # CONFIG_I2C_SIMTEC is not set |
| 1232 | # CONFIG_I2C_XILINX is not set | ||
| 1234 | 1233 | ||
| 1235 | # | 1234 | # |
| 1236 | # External I2C/SMBus adapter drivers | 1235 | # External I2C/SMBus adapter drivers |
| @@ -1244,15 +1243,9 @@ CONFIG_I2C_MV64XXX=m | |||
| 1244 | # | 1243 | # |
| 1245 | # CONFIG_I2C_PCA_PLATFORM is not set | 1244 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1246 | # CONFIG_I2C_STUB is not set | 1245 | # CONFIG_I2C_STUB is not set |
| 1247 | |||
| 1248 | # | ||
| 1249 | # Miscellaneous I2C Chip support | ||
| 1250 | # | ||
| 1251 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1252 | # CONFIG_I2C_DEBUG_CORE is not set | 1246 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1253 | # CONFIG_I2C_DEBUG_ALGO is not set | 1247 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1254 | # CONFIG_I2C_DEBUG_BUS is not set | 1248 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1255 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1256 | # CONFIG_SPI is not set | 1249 | # CONFIG_SPI is not set |
| 1257 | 1250 | ||
| 1258 | # | 1251 | # |
| @@ -1278,10 +1271,11 @@ CONFIG_SENSORS_ADM1026=m | |||
| 1278 | # CONFIG_SENSORS_ADM1029 is not set | 1271 | # CONFIG_SENSORS_ADM1029 is not set |
| 1279 | CONFIG_SENSORS_ADM1031=m | 1272 | CONFIG_SENSORS_ADM1031=m |
| 1280 | # CONFIG_SENSORS_ADM9240 is not set | 1273 | # CONFIG_SENSORS_ADM9240 is not set |
| 1274 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1281 | # CONFIG_SENSORS_ADT7462 is not set | 1275 | # CONFIG_SENSORS_ADT7462 is not set |
| 1282 | # CONFIG_SENSORS_ADT7470 is not set | 1276 | # CONFIG_SENSORS_ADT7470 is not set |
| 1283 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1284 | # CONFIG_SENSORS_ADT7475 is not set | 1277 | # CONFIG_SENSORS_ADT7475 is not set |
| 1278 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1285 | # CONFIG_SENSORS_ATXP1 is not set | 1279 | # CONFIG_SENSORS_ATXP1 is not set |
| 1286 | CONFIG_SENSORS_DS1621=m | 1280 | CONFIG_SENSORS_DS1621=m |
| 1287 | # CONFIG_SENSORS_I5K_AMB is not set | 1281 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1318,6 +1312,7 @@ CONFIG_SENSORS_SMSC47M1=m | |||
| 1318 | # CONFIG_SENSORS_SMSC47M192 is not set | 1312 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1319 | CONFIG_SENSORS_SMSC47B397=m | 1313 | CONFIG_SENSORS_SMSC47B397=m |
| 1320 | # CONFIG_SENSORS_ADS7828 is not set | 1314 | # CONFIG_SENSORS_ADS7828 is not set |
| 1315 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1321 | # CONFIG_SENSORS_THMC50 is not set | 1316 | # CONFIG_SENSORS_THMC50 is not set |
| 1322 | # CONFIG_SENSORS_TMP401 is not set | 1317 | # CONFIG_SENSORS_TMP401 is not set |
| 1323 | # CONFIG_SENSORS_TMP421 is not set | 1318 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1369,9 +1364,9 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1369 | # CONFIG_HTC_PASIC3 is not set | 1364 | # CONFIG_HTC_PASIC3 is not set |
| 1370 | # CONFIG_MFD_TMIO is not set | 1365 | # CONFIG_MFD_TMIO is not set |
| 1371 | # CONFIG_MFD_WM8400 is not set | 1366 | # CONFIG_MFD_WM8400 is not set |
| 1372 | # CONFIG_MFD_WM8350_I2C is not set | 1367 | # CONFIG_MFD_WM8994 is not set |
| 1373 | # CONFIG_MFD_PCF50633 is not set | 1368 | # CONFIG_MFD_PCF50633 is not set |
| 1374 | # CONFIG_AB3100_CORE is not set | 1369 | # CONFIG_LPC_SCH is not set |
| 1375 | # CONFIG_REGULATOR is not set | 1370 | # CONFIG_REGULATOR is not set |
| 1376 | # CONFIG_MEDIA_SUPPORT is not set | 1371 | # CONFIG_MEDIA_SUPPORT is not set |
| 1377 | 1372 | ||
| @@ -1380,6 +1375,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1380 | # | 1375 | # |
| 1381 | # CONFIG_AGP is not set | 1376 | # CONFIG_AGP is not set |
| 1382 | CONFIG_VGA_ARB=y | 1377 | CONFIG_VGA_ARB=y |
| 1378 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1383 | # CONFIG_DRM is not set | 1379 | # CONFIG_DRM is not set |
| 1384 | # CONFIG_VGASTATE is not set | 1380 | # CONFIG_VGASTATE is not set |
| 1385 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 1381 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1413,7 +1409,6 @@ CONFIG_USB=m | |||
| 1413 | CONFIG_USB_DEVICEFS=y | 1409 | CONFIG_USB_DEVICEFS=y |
| 1414 | # CONFIG_USB_DEVICE_CLASS is not set | 1410 | # CONFIG_USB_DEVICE_CLASS is not set |
| 1415 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1411 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1416 | CONFIG_USB_SUSPEND=y | ||
| 1417 | # CONFIG_USB_OTG is not set | 1412 | # CONFIG_USB_OTG is not set |
| 1418 | CONFIG_USB_MON=m | 1413 | CONFIG_USB_MON=m |
| 1419 | # CONFIG_USB_WUSB is not set | 1414 | # CONFIG_USB_WUSB is not set |
| @@ -1535,6 +1530,7 @@ CONFIG_USB_SERIAL_MCT_U232=m | |||
| 1535 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1530 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1536 | CONFIG_USB_SERIAL_PL2303=m | 1531 | CONFIG_USB_SERIAL_PL2303=m |
| 1537 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1532 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1533 | # CONFIG_USB_SERIAL_QCAUX is not set | ||
| 1538 | # CONFIG_USB_SERIAL_QUALCOMM is not set | 1534 | # CONFIG_USB_SERIAL_QUALCOMM is not set |
| 1539 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | 1535 | # CONFIG_USB_SERIAL_SPCP8X5 is not set |
| 1540 | # CONFIG_USB_SERIAL_HP4X is not set | 1536 | # CONFIG_USB_SERIAL_HP4X is not set |
| @@ -1549,6 +1545,7 @@ CONFIG_USB_SERIAL_XIRCOM=m | |||
| 1549 | # CONFIG_USB_SERIAL_OPTION is not set | 1545 | # CONFIG_USB_SERIAL_OPTION is not set |
| 1550 | CONFIG_USB_SERIAL_OMNINET=m | 1546 | CONFIG_USB_SERIAL_OMNINET=m |
| 1551 | # CONFIG_USB_SERIAL_OPTICON is not set | 1547 | # CONFIG_USB_SERIAL_OPTICON is not set |
| 1548 | # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set | ||
| 1552 | # CONFIG_USB_SERIAL_DEBUG is not set | 1549 | # CONFIG_USB_SERIAL_DEBUG is not set |
| 1553 | 1550 | ||
| 1554 | # | 1551 | # |
| @@ -1561,7 +1558,6 @@ CONFIG_USB_EMI62=m | |||
| 1561 | CONFIG_USB_RIO500=m | 1558 | CONFIG_USB_RIO500=m |
| 1562 | CONFIG_USB_LEGOTOWER=m | 1559 | CONFIG_USB_LEGOTOWER=m |
| 1563 | CONFIG_USB_LCD=m | 1560 | CONFIG_USB_LCD=m |
| 1564 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1565 | CONFIG_USB_LED=m | 1561 | CONFIG_USB_LED=m |
| 1566 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1562 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1567 | # CONFIG_USB_CYTHERM is not set | 1563 | # CONFIG_USB_CYTHERM is not set |
| @@ -1574,7 +1570,6 @@ CONFIG_USB_LED=m | |||
| 1574 | # CONFIG_USB_IOWARRIOR is not set | 1570 | # CONFIG_USB_IOWARRIOR is not set |
| 1575 | CONFIG_USB_TEST=m | 1571 | CONFIG_USB_TEST=m |
| 1576 | # CONFIG_USB_ISIGHTFW is not set | 1572 | # CONFIG_USB_ISIGHTFW is not set |
| 1577 | # CONFIG_USB_VST is not set | ||
| 1578 | CONFIG_USB_ATM=m | 1573 | CONFIG_USB_ATM=m |
| 1579 | CONFIG_USB_SPEEDTOUCH=m | 1574 | CONFIG_USB_SPEEDTOUCH=m |
| 1580 | # CONFIG_USB_CXACRU is not set | 1575 | # CONFIG_USB_CXACRU is not set |
| @@ -1611,6 +1606,7 @@ CONFIG_INFINIBAND_SRP=m | |||
| 1611 | # CONFIG_EDAC is not set | 1606 | # CONFIG_EDAC is not set |
| 1612 | # CONFIG_RTC_CLASS is not set | 1607 | # CONFIG_RTC_CLASS is not set |
| 1613 | CONFIG_DMADEVICES=y | 1608 | CONFIG_DMADEVICES=y |
| 1609 | # CONFIG_DMADEVICES_DEBUG is not set | ||
| 1614 | 1610 | ||
| 1615 | # | 1611 | # |
| 1616 | # DMA Devices | 1612 | # DMA Devices |
| @@ -1714,6 +1710,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1714 | # CONFIG_JFFS2_LZO is not set | 1710 | # CONFIG_JFFS2_LZO is not set |
| 1715 | CONFIG_JFFS2_RTIME=y | 1711 | CONFIG_JFFS2_RTIME=y |
| 1716 | # CONFIG_JFFS2_RUBIN is not set | 1712 | # CONFIG_JFFS2_RUBIN is not set |
| 1713 | # CONFIG_LOGFS is not set | ||
| 1717 | CONFIG_CRAMFS=m | 1714 | CONFIG_CRAMFS=m |
| 1718 | # CONFIG_SQUASHFS is not set | 1715 | # CONFIG_SQUASHFS is not set |
| 1719 | CONFIG_VXFS_FS=m | 1716 | CONFIG_VXFS_FS=m |
| @@ -1742,6 +1739,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m | |||
| 1742 | CONFIG_RPCSEC_GSS_KRB5=y | 1739 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1743 | CONFIG_RPCSEC_GSS_SPKM3=m | 1740 | CONFIG_RPCSEC_GSS_SPKM3=m |
| 1744 | # CONFIG_SMB_FS is not set | 1741 | # CONFIG_SMB_FS is not set |
| 1742 | # CONFIG_CEPH_FS is not set | ||
| 1745 | CONFIG_CIFS=m | 1743 | CONFIG_CIFS=m |
| 1746 | # CONFIG_CIFS_STATS is not set | 1744 | # CONFIG_CIFS_STATS is not set |
| 1747 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1745 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1817,7 +1815,7 @@ CONFIG_NLS_KOI8_R=m | |||
| 1817 | CONFIG_NLS_KOI8_U=m | 1815 | CONFIG_NLS_KOI8_U=m |
| 1818 | CONFIG_NLS_UTF8=m | 1816 | CONFIG_NLS_UTF8=m |
| 1819 | # CONFIG_DLM is not set | 1817 | # CONFIG_DLM is not set |
| 1820 | CONFIG_BINARY_PRINTF=y | 1818 | # CONFIG_BINARY_PRINTF is not set |
| 1821 | 1819 | ||
| 1822 | # | 1820 | # |
| 1823 | # Library routines | 1821 | # Library routines |
| @@ -1833,9 +1831,11 @@ CONFIG_CRC32=y | |||
| 1833 | CONFIG_LIBCRC32C=m | 1831 | CONFIG_LIBCRC32C=m |
| 1834 | CONFIG_ZLIB_INFLATE=y | 1832 | CONFIG_ZLIB_INFLATE=y |
| 1835 | CONFIG_ZLIB_DEFLATE=y | 1833 | CONFIG_ZLIB_DEFLATE=y |
| 1834 | CONFIG_LZO_DECOMPRESS=y | ||
| 1836 | CONFIG_DECOMPRESS_GZIP=y | 1835 | CONFIG_DECOMPRESS_GZIP=y |
| 1837 | CONFIG_DECOMPRESS_BZIP2=y | 1836 | CONFIG_DECOMPRESS_BZIP2=y |
| 1838 | CONFIG_DECOMPRESS_LZMA=y | 1837 | CONFIG_DECOMPRESS_LZMA=y |
| 1838 | CONFIG_DECOMPRESS_LZO=y | ||
| 1839 | CONFIG_HAS_IOMEM=y | 1839 | CONFIG_HAS_IOMEM=y |
| 1840 | CONFIG_HAS_IOPORT=y | 1840 | CONFIG_HAS_IOPORT=y |
| 1841 | CONFIG_HAS_DMA=y | 1841 | CONFIG_HAS_DMA=y |
| @@ -1880,7 +1880,6 @@ CONFIG_DEBUG_SPINLOCK=y | |||
| 1880 | # CONFIG_LOCK_STAT is not set | 1880 | # CONFIG_LOCK_STAT is not set |
| 1881 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 1881 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
| 1882 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1882 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1883 | CONFIG_STACKTRACE=y | ||
| 1884 | # CONFIG_DEBUG_KOBJECT is not set | 1883 | # CONFIG_DEBUG_KOBJECT is not set |
| 1885 | CONFIG_DEBUG_HIGHMEM=y | 1884 | CONFIG_DEBUG_HIGHMEM=y |
| 1886 | CONFIG_DEBUG_BUGVERBOSE=y | 1885 | CONFIG_DEBUG_BUGVERBOSE=y |
| @@ -1903,16 +1902,12 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 1903 | # CONFIG_LATENCYTOP is not set | 1902 | # CONFIG_LATENCYTOP is not set |
| 1904 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1903 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1905 | # CONFIG_DEBUG_PAGEALLOC is not set | 1904 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1906 | CONFIG_NOP_TRACER=y | ||
| 1907 | CONFIG_HAVE_FUNCTION_TRACER=y | 1905 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1908 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 1906 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
| 1909 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1907 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1910 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1908 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1911 | CONFIG_RING_BUFFER=y | 1909 | CONFIG_RING_BUFFER=y |
| 1912 | CONFIG_EVENT_TRACING=y | ||
| 1913 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
| 1914 | CONFIG_RING_BUFFER_ALLOW_SWAP=y | 1910 | CONFIG_RING_BUFFER_ALLOW_SWAP=y |
| 1915 | CONFIG_TRACING=y | ||
| 1916 | CONFIG_TRACING_SUPPORT=y | 1911 | CONFIG_TRACING_SUPPORT=y |
| 1917 | CONFIG_FTRACE=y | 1912 | CONFIG_FTRACE=y |
| 1918 | # CONFIG_FUNCTION_TRACER is not set | 1913 | # CONFIG_FUNCTION_TRACER is not set |
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 79105413884e..81e904e9f392 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:23:59 2010 | 4 | # Mon Apr 19 23:16:24 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -298,6 +298,7 @@ CONFIG_ISA_DMA_API=y | |||
| 298 | # Bus options | 298 | # Bus options |
| 299 | # | 299 | # |
| 300 | CONFIG_ZONE_DMA=y | 300 | CONFIG_ZONE_DMA=y |
| 301 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 301 | CONFIG_PPC_INDIRECT_PCI=y | 302 | CONFIG_PPC_INDIRECT_PCI=y |
| 302 | CONFIG_FSL_SOC=y | 303 | CONFIG_FSL_SOC=y |
| 303 | CONFIG_PPC_PCI_CHOICE=y | 304 | CONFIG_PPC_PCI_CHOICE=y |
| @@ -308,7 +309,6 @@ CONFIG_PCI_8260=y | |||
| 308 | # CONFIG_PCIEPORTBUS is not set | 309 | # CONFIG_PCIEPORTBUS is not set |
| 309 | CONFIG_ARCH_SUPPORTS_MSI=y | 310 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 310 | # CONFIG_PCI_MSI is not set | 311 | # CONFIG_PCI_MSI is not set |
| 311 | # CONFIG_PCI_LEGACY is not set | ||
| 312 | # CONFIG_PCI_DEBUG is not set | 312 | # CONFIG_PCI_DEBUG is not set |
| 313 | # CONFIG_PCI_STUB is not set | 313 | # CONFIG_PCI_STUB is not set |
| 314 | # CONFIG_PCI_IOV is not set | 314 | # CONFIG_PCI_IOV is not set |
| @@ -335,7 +335,6 @@ CONFIG_NET=y | |||
| 335 | # Networking options | 335 | # Networking options |
| 336 | # | 336 | # |
| 337 | CONFIG_PACKET=y | 337 | CONFIG_PACKET=y |
| 338 | # CONFIG_PACKET_MMAP is not set | ||
| 339 | CONFIG_UNIX=y | 338 | CONFIG_UNIX=y |
| 340 | CONFIG_XFRM=y | 339 | CONFIG_XFRM=y |
| 341 | # CONFIG_XFRM_USER is not set | 340 | # CONFIG_XFRM_USER is not set |
| @@ -537,6 +536,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 537 | # UBI - Unsorted block images | 536 | # UBI - Unsorted block images |
| 538 | # | 537 | # |
| 539 | # CONFIG_MTD_UBI is not set | 538 | # CONFIG_MTD_UBI is not set |
| 539 | CONFIG_OF_FLATTREE=y | ||
| 540 | CONFIG_OF_DYNAMIC=y | ||
| 540 | CONFIG_OF_DEVICE=y | 541 | CONFIG_OF_DEVICE=y |
| 541 | CONFIG_OF_GPIO=y | 542 | CONFIG_OF_GPIO=y |
| 542 | CONFIG_OF_MDIO=y | 543 | CONFIG_OF_MDIO=y |
| @@ -566,6 +567,7 @@ CONFIG_HAVE_IDE=y | |||
| 566 | # | 567 | # |
| 567 | # SCSI device support | 568 | # SCSI device support |
| 568 | # | 569 | # |
| 570 | CONFIG_SCSI_MOD=y | ||
| 569 | # CONFIG_RAID_ATTRS is not set | 571 | # CONFIG_RAID_ATTRS is not set |
| 570 | # CONFIG_SCSI is not set | 572 | # CONFIG_SCSI is not set |
| 571 | # CONFIG_SCSI_DMA is not set | 573 | # CONFIG_SCSI_DMA is not set |
| @@ -671,6 +673,8 @@ CONFIG_NETDEV_10000=y | |||
| 671 | # CONFIG_CHELSIO_T1 is not set | 673 | # CONFIG_CHELSIO_T1 is not set |
| 672 | CONFIG_CHELSIO_T3_DEPENDS=y | 674 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 673 | # CONFIG_CHELSIO_T3 is not set | 675 | # CONFIG_CHELSIO_T3 is not set |
| 676 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 677 | # CONFIG_CHELSIO_T4 is not set | ||
| 674 | # CONFIG_ENIC is not set | 678 | # CONFIG_ENIC is not set |
| 675 | # CONFIG_IXGBE is not set | 679 | # CONFIG_IXGBE is not set |
| 676 | # CONFIG_IXGB is not set | 680 | # CONFIG_IXGB is not set |
| @@ -683,6 +687,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 683 | # CONFIG_MLX4_CORE is not set | 687 | # CONFIG_MLX4_CORE is not set |
| 684 | # CONFIG_TEHUTI is not set | 688 | # CONFIG_TEHUTI is not set |
| 685 | # CONFIG_BNX2X is not set | 689 | # CONFIG_BNX2X is not set |
| 690 | # CONFIG_QLCNIC is not set | ||
| 686 | # CONFIG_QLGE is not set | 691 | # CONFIG_QLGE is not set |
| 687 | # CONFIG_SFC is not set | 692 | # CONFIG_SFC is not set |
| 688 | # CONFIG_BE2NET is not set | 693 | # CONFIG_BE2NET is not set |
| @@ -737,6 +742,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 737 | CONFIG_SERIAL_CPM=y | 742 | CONFIG_SERIAL_CPM=y |
| 738 | CONFIG_SERIAL_CPM_CONSOLE=y | 743 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 739 | # CONFIG_SERIAL_JSM is not set | 744 | # CONFIG_SERIAL_JSM is not set |
| 745 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 740 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 746 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 741 | CONFIG_UNIX98_PTYS=y | 747 | CONFIG_UNIX98_PTYS=y |
| 742 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 748 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -765,7 +771,9 @@ CONFIG_GPIOLIB=y | |||
| 765 | # | 771 | # |
| 766 | # Memory mapped GPIO expanders: | 772 | # Memory mapped GPIO expanders: |
| 767 | # | 773 | # |
| 774 | # CONFIG_GPIO_IT8761E is not set | ||
| 768 | # CONFIG_GPIO_XILINX is not set | 775 | # CONFIG_GPIO_XILINX is not set |
| 776 | # CONFIG_GPIO_SCH is not set | ||
| 769 | 777 | ||
| 770 | # | 778 | # |
| 771 | # I2C GPIO expanders: | 779 | # I2C GPIO expanders: |
| @@ -804,6 +812,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 804 | # CONFIG_MFD_SM501 is not set | 812 | # CONFIG_MFD_SM501 is not set |
| 805 | # CONFIG_HTC_PASIC3 is not set | 813 | # CONFIG_HTC_PASIC3 is not set |
| 806 | # CONFIG_MFD_TMIO is not set | 814 | # CONFIG_MFD_TMIO is not set |
| 815 | # CONFIG_MFD_TIMBERDALE is not set | ||
| 816 | # CONFIG_LPC_SCH is not set | ||
| 807 | # CONFIG_REGULATOR is not set | 817 | # CONFIG_REGULATOR is not set |
| 808 | # CONFIG_MEDIA_SUPPORT is not set | 818 | # CONFIG_MEDIA_SUPPORT is not set |
| 809 | 819 | ||
| @@ -812,6 +822,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 812 | # | 822 | # |
| 813 | # CONFIG_AGP is not set | 823 | # CONFIG_AGP is not set |
| 814 | CONFIG_VGA_ARB=y | 824 | CONFIG_VGA_ARB=y |
| 825 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 815 | # CONFIG_DRM is not set | 826 | # CONFIG_DRM is not set |
| 816 | # CONFIG_VGASTATE is not set | 827 | # CONFIG_VGASTATE is not set |
| 817 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 828 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -869,6 +880,7 @@ CONFIG_AUTOFS4_FS=y | |||
| 869 | # | 880 | # |
| 870 | # Caches | 881 | # Caches |
| 871 | # | 882 | # |
| 883 | # CONFIG_FSCACHE is not set | ||
| 872 | 884 | ||
| 873 | # | 885 | # |
| 874 | # CD-ROM/DVD Filesystems | 886 | # CD-ROM/DVD Filesystems |
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index 58f7ca71a59d..c5af46ef5f40 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:00 2010 | 4 | # Mon Apr 19 23:16:24 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -90,11 +90,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 90 | # CONFIG_TREE_RCU_TRACE is not set | 90 | # CONFIG_TREE_RCU_TRACE is not set |
| 91 | # CONFIG_IKCONFIG is not set | 91 | # CONFIG_IKCONFIG is not set |
| 92 | CONFIG_LOG_BUF_SHIFT=14 | 92 | CONFIG_LOG_BUF_SHIFT=14 |
| 93 | CONFIG_GROUP_SCHED=y | ||
| 94 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 95 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 96 | CONFIG_USER_SCHED=y | ||
| 97 | # CONFIG_CGROUP_SCHED is not set | ||
| 98 | # CONFIG_CGROUPS is not set | 93 | # CONFIG_CGROUPS is not set |
| 99 | CONFIG_SYSFS_DEPRECATED=y | 94 | CONFIG_SYSFS_DEPRECATED=y |
| 100 | CONFIG_SYSFS_DEPRECATED_V2=y | 95 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -306,6 +301,7 @@ CONFIG_ISA_DMA_API=y | |||
| 306 | # Bus options | 301 | # Bus options |
| 307 | # | 302 | # |
| 308 | CONFIG_ZONE_DMA=y | 303 | CONFIG_ZONE_DMA=y |
| 304 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 309 | CONFIG_FSL_SOC=y | 305 | CONFIG_FSL_SOC=y |
| 310 | # CONFIG_PCI is not set | 306 | # CONFIG_PCI is not set |
| 311 | # CONFIG_PCI_DOMAINS is not set | 307 | # CONFIG_PCI_DOMAINS is not set |
| @@ -335,7 +331,6 @@ CONFIG_NET=y | |||
| 335 | # Networking options | 331 | # Networking options |
| 336 | # | 332 | # |
| 337 | CONFIG_PACKET=y | 333 | CONFIG_PACKET=y |
| 338 | # CONFIG_PACKET_MMAP is not set | ||
| 339 | CONFIG_UNIX=y | 334 | CONFIG_UNIX=y |
| 340 | # CONFIG_NET_KEY is not set | 335 | # CONFIG_NET_KEY is not set |
| 341 | CONFIG_INET=y | 336 | CONFIG_INET=y |
| @@ -504,6 +499,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 504 | # UBI - Unsorted block images | 499 | # UBI - Unsorted block images |
| 505 | # | 500 | # |
| 506 | # CONFIG_MTD_UBI is not set | 501 | # CONFIG_MTD_UBI is not set |
| 502 | CONFIG_OF_FLATTREE=y | ||
| 503 | CONFIG_OF_DYNAMIC=y | ||
| 507 | CONFIG_OF_DEVICE=y | 504 | CONFIG_OF_DEVICE=y |
| 508 | CONFIG_OF_MDIO=y | 505 | CONFIG_OF_MDIO=y |
| 509 | # CONFIG_PARPORT is not set | 506 | # CONFIG_PARPORT is not set |
| @@ -515,6 +512,7 @@ CONFIG_HAVE_IDE=y | |||
| 515 | # | 512 | # |
| 516 | # SCSI device support | 513 | # SCSI device support |
| 517 | # | 514 | # |
| 515 | CONFIG_SCSI_MOD=y | ||
| 518 | # CONFIG_RAID_ATTRS is not set | 516 | # CONFIG_RAID_ATTRS is not set |
| 519 | # CONFIG_SCSI is not set | 517 | # CONFIG_SCSI is not set |
| 520 | # CONFIG_SCSI_DMA is not set | 518 | # CONFIG_SCSI_DMA is not set |
| @@ -616,6 +614,7 @@ CONFIG_SERIAL_CORE=y | |||
| 616 | CONFIG_SERIAL_CORE_CONSOLE=y | 614 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 617 | CONFIG_SERIAL_CPM=y | 615 | CONFIG_SERIAL_CPM=y |
| 618 | CONFIG_SERIAL_CPM_CONSOLE=y | 616 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 617 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 619 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 618 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 620 | CONFIG_UNIX98_PTYS=y | 619 | CONFIG_UNIX98_PTYS=y |
| 621 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 620 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -753,6 +752,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 753 | # CONFIG_BFS_FS is not set | 752 | # CONFIG_BFS_FS is not set |
| 754 | # CONFIG_EFS_FS is not set | 753 | # CONFIG_EFS_FS is not set |
| 755 | # CONFIG_JFFS2_FS is not set | 754 | # CONFIG_JFFS2_FS is not set |
| 755 | # CONFIG_LOGFS is not set | ||
| 756 | CONFIG_CRAMFS=y | 756 | CONFIG_CRAMFS=y |
| 757 | # CONFIG_SQUASHFS is not set | 757 | # CONFIG_SQUASHFS is not set |
| 758 | # CONFIG_VXFS_FS is not set | 758 | # CONFIG_VXFS_FS is not set |
| @@ -777,6 +777,7 @@ CONFIG_SUNRPC=y | |||
| 777 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 777 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 778 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 778 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 779 | # CONFIG_SMB_FS is not set | 779 | # CONFIG_SMB_FS is not set |
| 780 | # CONFIG_CEPH_FS is not set | ||
| 780 | # CONFIG_CIFS is not set | 781 | # CONFIG_CIFS is not set |
| 781 | # CONFIG_NCP_FS is not set | 782 | # CONFIG_NCP_FS is not set |
| 782 | # CONFIG_CODA_FS is not set | 783 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 9a0c981277eb..588a2add393f 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:01 2010 | 4 | # Mon Apr 19 23:16:25 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 96 | CONFIG_IKCONFIG=y | 96 | CONFIG_IKCONFIG=y |
| 97 | CONFIG_IKCONFIG_PROC=y | 97 | CONFIG_IKCONFIG_PROC=y |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | CONFIG_GROUP_SCHED=y | ||
| 100 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 101 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 102 | CONFIG_USER_SCHED=y | ||
| 103 | # CONFIG_CGROUP_SCHED is not set | ||
| 104 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 105 | CONFIG_SYSFS_DEPRECATED=y | 100 | CONFIG_SYSFS_DEPRECATED=y |
| 106 | CONFIG_SYSFS_DEPRECATED_V2=y | 101 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -116,6 +111,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 116 | CONFIG_RD_GZIP=y | 111 | CONFIG_RD_GZIP=y |
| 117 | CONFIG_RD_BZIP2=y | 112 | CONFIG_RD_BZIP2=y |
| 118 | CONFIG_RD_LZMA=y | 113 | CONFIG_RD_LZMA=y |
| 114 | CONFIG_RD_LZO=y | ||
| 119 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 115 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 120 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
| 121 | CONFIG_ANON_INODES=y | 117 | CONFIG_ANON_INODES=y |
| @@ -328,6 +324,7 @@ CONFIG_ISA_DMA_API=y | |||
| 328 | # Bus options | 324 | # Bus options |
| 329 | # | 325 | # |
| 330 | CONFIG_ZONE_DMA=y | 326 | CONFIG_ZONE_DMA=y |
| 327 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 331 | CONFIG_GENERIC_ISA_DMA=y | 328 | CONFIG_GENERIC_ISA_DMA=y |
| 332 | CONFIG_PPC_INDIRECT_PCI=y | 329 | CONFIG_PPC_INDIRECT_PCI=y |
| 333 | CONFIG_FSL_SOC=y | 330 | CONFIG_FSL_SOC=y |
| @@ -337,7 +334,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 337 | # CONFIG_PCIEPORTBUS is not set | 334 | # CONFIG_PCIEPORTBUS is not set |
| 338 | CONFIG_ARCH_SUPPORTS_MSI=y | 335 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 339 | # CONFIG_PCI_MSI is not set | 336 | # CONFIG_PCI_MSI is not set |
| 340 | # CONFIG_PCI_LEGACY is not set | ||
| 341 | # CONFIG_PCI_DEBUG is not set | 337 | # CONFIG_PCI_DEBUG is not set |
| 342 | # CONFIG_PCI_STUB is not set | 338 | # CONFIG_PCI_STUB is not set |
| 343 | # CONFIG_PCI_IOV is not set | 339 | # CONFIG_PCI_IOV is not set |
| @@ -364,7 +360,6 @@ CONFIG_NET=y | |||
| 364 | # Networking options | 360 | # Networking options |
| 365 | # | 361 | # |
| 366 | CONFIG_PACKET=y | 362 | CONFIG_PACKET=y |
| 367 | CONFIG_PACKET_MMAP=y | ||
| 368 | CONFIG_UNIX=y | 363 | CONFIG_UNIX=y |
| 369 | CONFIG_XFRM=y | 364 | CONFIG_XFRM=y |
| 370 | # CONFIG_XFRM_USER is not set | 365 | # CONFIG_XFRM_USER is not set |
| @@ -433,6 +428,7 @@ CONFIG_NF_CONNTRACK_TFTP=m | |||
| 433 | CONFIG_NETFILTER_XTABLES=m | 428 | CONFIG_NETFILTER_XTABLES=m |
| 434 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set | 429 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set |
| 435 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set | 430 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set |
| 431 | # CONFIG_NETFILTER_XT_TARGET_CT is not set | ||
| 436 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 432 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 437 | CONFIG_NETFILTER_XT_TARGET_HL=m | 433 | CONFIG_NETFILTER_XT_TARGET_HL=m |
| 438 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set | 434 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set |
| @@ -665,6 +661,8 @@ CONFIG_MTD_PHYSMAP=y | |||
| 665 | # UBI - Unsorted block images | 661 | # UBI - Unsorted block images |
| 666 | # | 662 | # |
| 667 | # CONFIG_MTD_UBI is not set | 663 | # CONFIG_MTD_UBI is not set |
| 664 | CONFIG_OF_FLATTREE=y | ||
| 665 | CONFIG_OF_DYNAMIC=y | ||
| 668 | CONFIG_OF_DEVICE=y | 666 | CONFIG_OF_DEVICE=y |
| 669 | CONFIG_OF_I2C=y | 667 | CONFIG_OF_I2C=y |
| 670 | # CONFIG_PARPORT is not set | 668 | # CONFIG_PARPORT is not set |
| @@ -700,6 +698,7 @@ CONFIG_MISC_DEVICES=y | |||
| 700 | # CONFIG_ENCLOSURE_SERVICES is not set | 698 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 701 | # CONFIG_HP_ILO is not set | 699 | # CONFIG_HP_ILO is not set |
| 702 | # CONFIG_ISL29003 is not set | 700 | # CONFIG_ISL29003 is not set |
| 701 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 703 | # CONFIG_DS1682 is not set | 702 | # CONFIG_DS1682 is not set |
| 704 | # CONFIG_C2PORT is not set | 703 | # CONFIG_C2PORT is not set |
| 705 | 704 | ||
| @@ -717,6 +716,7 @@ CONFIG_HAVE_IDE=y | |||
| 717 | # | 716 | # |
| 718 | # SCSI device support | 717 | # SCSI device support |
| 719 | # | 718 | # |
| 719 | CONFIG_SCSI_MOD=y | ||
| 720 | # CONFIG_RAID_ATTRS is not set | 720 | # CONFIG_RAID_ATTRS is not set |
| 721 | CONFIG_SCSI=y | 721 | CONFIG_SCSI=y |
| 722 | CONFIG_SCSI_DMA=y | 722 | CONFIG_SCSI_DMA=y |
| @@ -840,6 +840,7 @@ CONFIG_ATA_SFF=y | |||
| 840 | CONFIG_PATA_IT821X=y | 840 | CONFIG_PATA_IT821X=y |
| 841 | # CONFIG_PATA_IT8213 is not set | 841 | # CONFIG_PATA_IT8213 is not set |
| 842 | # CONFIG_PATA_JMICRON is not set | 842 | # CONFIG_PATA_JMICRON is not set |
| 843 | # CONFIG_PATA_LEGACY is not set | ||
| 843 | # CONFIG_PATA_TRIFLEX is not set | 844 | # CONFIG_PATA_TRIFLEX is not set |
| 844 | # CONFIG_PATA_MARVELL is not set | 845 | # CONFIG_PATA_MARVELL is not set |
| 845 | # CONFIG_PATA_MPIIX is not set | 846 | # CONFIG_PATA_MPIIX is not set |
| @@ -954,6 +955,8 @@ CONFIG_NETDEV_10000=y | |||
| 954 | # CONFIG_CHELSIO_T1 is not set | 955 | # CONFIG_CHELSIO_T1 is not set |
| 955 | CONFIG_CHELSIO_T3_DEPENDS=y | 956 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 956 | # CONFIG_CHELSIO_T3 is not set | 957 | # CONFIG_CHELSIO_T3 is not set |
| 958 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 959 | # CONFIG_CHELSIO_T4 is not set | ||
| 957 | # CONFIG_ENIC is not set | 960 | # CONFIG_ENIC is not set |
| 958 | # CONFIG_IXGBE is not set | 961 | # CONFIG_IXGBE is not set |
| 959 | # CONFIG_IXGB is not set | 962 | # CONFIG_IXGB is not set |
| @@ -966,6 +969,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 966 | # CONFIG_MLX4_CORE is not set | 969 | # CONFIG_MLX4_CORE is not set |
| 967 | # CONFIG_TEHUTI is not set | 970 | # CONFIG_TEHUTI is not set |
| 968 | # CONFIG_BNX2X is not set | 971 | # CONFIG_BNX2X is not set |
| 972 | # CONFIG_QLCNIC is not set | ||
| 969 | # CONFIG_QLGE is not set | 973 | # CONFIG_QLGE is not set |
| 970 | # CONFIG_SFC is not set | 974 | # CONFIG_SFC is not set |
| 971 | # CONFIG_BE2NET is not set | 975 | # CONFIG_BE2NET is not set |
| @@ -1082,6 +1086,7 @@ CONFIG_SERIAL_CORE=y | |||
| 1082 | CONFIG_SERIAL_CORE_CONSOLE=y | 1086 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1083 | # CONFIG_SERIAL_JSM is not set | 1087 | # CONFIG_SERIAL_JSM is not set |
| 1084 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1088 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1089 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1085 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1090 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1086 | CONFIG_UNIX98_PTYS=y | 1091 | CONFIG_UNIX98_PTYS=y |
| 1087 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1092 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1131,6 +1136,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1131 | CONFIG_I2C_MPC=y | 1136 | CONFIG_I2C_MPC=y |
| 1132 | # CONFIG_I2C_OCORES is not set | 1137 | # CONFIG_I2C_OCORES is not set |
| 1133 | # CONFIG_I2C_SIMTEC is not set | 1138 | # CONFIG_I2C_SIMTEC is not set |
| 1139 | # CONFIG_I2C_XILINX is not set | ||
| 1134 | 1140 | ||
| 1135 | # | 1141 | # |
| 1136 | # External I2C/SMBus adapter drivers | 1142 | # External I2C/SMBus adapter drivers |
| @@ -1144,15 +1150,9 @@ CONFIG_I2C_MPC=y | |||
| 1144 | # | 1150 | # |
| 1145 | # CONFIG_I2C_PCA_PLATFORM is not set | 1151 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1146 | # CONFIG_I2C_STUB is not set | 1152 | # CONFIG_I2C_STUB is not set |
| 1147 | |||
| 1148 | # | ||
| 1149 | # Miscellaneous I2C Chip support | ||
| 1150 | # | ||
| 1151 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1152 | # CONFIG_I2C_DEBUG_CORE is not set | 1153 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1153 | # CONFIG_I2C_DEBUG_ALGO is not set | 1154 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1154 | # CONFIG_I2C_DEBUG_BUS is not set | 1155 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1155 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1156 | # CONFIG_SPI is not set | 1156 | # CONFIG_SPI is not set |
| 1157 | 1157 | ||
| 1158 | # | 1158 | # |
| @@ -1178,10 +1178,11 @@ CONFIG_HWMON=y | |||
| 1178 | # CONFIG_SENSORS_ADM1029 is not set | 1178 | # CONFIG_SENSORS_ADM1029 is not set |
| 1179 | # CONFIG_SENSORS_ADM1031 is not set | 1179 | # CONFIG_SENSORS_ADM1031 is not set |
| 1180 | # CONFIG_SENSORS_ADM9240 is not set | 1180 | # CONFIG_SENSORS_ADM9240 is not set |
| 1181 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1181 | # CONFIG_SENSORS_ADT7462 is not set | 1182 | # CONFIG_SENSORS_ADT7462 is not set |
| 1182 | # CONFIG_SENSORS_ADT7470 is not set | 1183 | # CONFIG_SENSORS_ADT7470 is not set |
| 1183 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1184 | # CONFIG_SENSORS_ADT7475 is not set | 1184 | # CONFIG_SENSORS_ADT7475 is not set |
| 1185 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1185 | # CONFIG_SENSORS_ATXP1 is not set | 1186 | # CONFIG_SENSORS_ATXP1 is not set |
| 1186 | # CONFIG_SENSORS_DS1621 is not set | 1187 | # CONFIG_SENSORS_DS1621 is not set |
| 1187 | # CONFIG_SENSORS_I5K_AMB is not set | 1188 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1218,6 +1219,7 @@ CONFIG_HWMON=y | |||
| 1218 | # CONFIG_SENSORS_SMSC47M192 is not set | 1219 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1219 | # CONFIG_SENSORS_SMSC47B397 is not set | 1220 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1220 | # CONFIG_SENSORS_ADS7828 is not set | 1221 | # CONFIG_SENSORS_ADS7828 is not set |
| 1222 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1221 | # CONFIG_SENSORS_THMC50 is not set | 1223 | # CONFIG_SENSORS_THMC50 is not set |
| 1222 | # CONFIG_SENSORS_TMP401 is not set | 1224 | # CONFIG_SENSORS_TMP401 is not set |
| 1223 | # CONFIG_SENSORS_TMP421 is not set | 1225 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1246,18 +1248,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1246 | # Multifunction device drivers | 1248 | # Multifunction device drivers |
| 1247 | # | 1249 | # |
| 1248 | # CONFIG_MFD_CORE is not set | 1250 | # CONFIG_MFD_CORE is not set |
| 1251 | # CONFIG_MFD_88PM860X is not set | ||
| 1249 | # CONFIG_MFD_SM501 is not set | 1252 | # CONFIG_MFD_SM501 is not set |
| 1250 | # CONFIG_HTC_PASIC3 is not set | 1253 | # CONFIG_HTC_PASIC3 is not set |
| 1251 | # CONFIG_TWL4030_CORE is not set | 1254 | # CONFIG_TWL4030_CORE is not set |
| 1252 | # CONFIG_MFD_TMIO is not set | 1255 | # CONFIG_MFD_TMIO is not set |
| 1253 | # CONFIG_PMIC_DA903X is not set | 1256 | # CONFIG_PMIC_DA903X is not set |
| 1254 | # CONFIG_PMIC_ADP5520 is not set | 1257 | # CONFIG_PMIC_ADP5520 is not set |
| 1258 | # CONFIG_MFD_MAX8925 is not set | ||
| 1255 | # CONFIG_MFD_WM8400 is not set | 1259 | # CONFIG_MFD_WM8400 is not set |
| 1256 | # CONFIG_MFD_WM831X is not set | 1260 | # CONFIG_MFD_WM831X is not set |
| 1257 | # CONFIG_MFD_WM8350_I2C is not set | 1261 | # CONFIG_MFD_WM8350_I2C is not set |
| 1262 | # CONFIG_MFD_WM8994 is not set | ||
| 1258 | # CONFIG_MFD_PCF50633 is not set | 1263 | # CONFIG_MFD_PCF50633 is not set |
| 1259 | # CONFIG_AB3100_CORE is not set | 1264 | # CONFIG_AB3100_CORE is not set |
| 1260 | # CONFIG_MFD_88PM8607 is not set | 1265 | # CONFIG_LPC_SCH is not set |
| 1261 | # CONFIG_REGULATOR is not set | 1266 | # CONFIG_REGULATOR is not set |
| 1262 | # CONFIG_MEDIA_SUPPORT is not set | 1267 | # CONFIG_MEDIA_SUPPORT is not set |
| 1263 | 1268 | ||
| @@ -1266,6 +1271,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1266 | # | 1271 | # |
| 1267 | # CONFIG_AGP is not set | 1272 | # CONFIG_AGP is not set |
| 1268 | CONFIG_VGA_ARB=y | 1273 | CONFIG_VGA_ARB=y |
| 1274 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1269 | # CONFIG_DRM is not set | 1275 | # CONFIG_DRM is not set |
| 1270 | # CONFIG_VGASTATE is not set | 1276 | # CONFIG_VGASTATE is not set |
| 1271 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1277 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1417,6 +1423,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1417 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1423 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1418 | # CONFIG_USB_SERIAL_PL2303 is not set | 1424 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1419 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1425 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1426 | # CONFIG_USB_SERIAL_QCAUX is not set | ||
| 1420 | # CONFIG_USB_SERIAL_QUALCOMM is not set | 1427 | # CONFIG_USB_SERIAL_QUALCOMM is not set |
| 1421 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | 1428 | # CONFIG_USB_SERIAL_SPCP8X5 is not set |
| 1422 | # CONFIG_USB_SERIAL_HP4X is not set | 1429 | # CONFIG_USB_SERIAL_HP4X is not set |
| @@ -1430,6 +1437,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1430 | # CONFIG_USB_SERIAL_OPTION is not set | 1437 | # CONFIG_USB_SERIAL_OPTION is not set |
| 1431 | # CONFIG_USB_SERIAL_OMNINET is not set | 1438 | # CONFIG_USB_SERIAL_OMNINET is not set |
| 1432 | # CONFIG_USB_SERIAL_OPTICON is not set | 1439 | # CONFIG_USB_SERIAL_OPTICON is not set |
| 1440 | # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set | ||
| 1433 | # CONFIG_USB_SERIAL_DEBUG is not set | 1441 | # CONFIG_USB_SERIAL_DEBUG is not set |
| 1434 | 1442 | ||
| 1435 | # | 1443 | # |
| @@ -1442,7 +1450,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1442 | # CONFIG_USB_RIO500 is not set | 1450 | # CONFIG_USB_RIO500 is not set |
| 1443 | # CONFIG_USB_LEGOTOWER is not set | 1451 | # CONFIG_USB_LEGOTOWER is not set |
| 1444 | # CONFIG_USB_LCD is not set | 1452 | # CONFIG_USB_LCD is not set |
| 1445 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1446 | # CONFIG_USB_LED is not set | 1453 | # CONFIG_USB_LED is not set |
| 1447 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1454 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1448 | # CONFIG_USB_CYTHERM is not set | 1455 | # CONFIG_USB_CYTHERM is not set |
| @@ -1455,7 +1462,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1455 | # CONFIG_USB_IOWARRIOR is not set | 1462 | # CONFIG_USB_IOWARRIOR is not set |
| 1456 | # CONFIG_USB_TEST is not set | 1463 | # CONFIG_USB_TEST is not set |
| 1457 | # CONFIG_USB_ISIGHTFW is not set | 1464 | # CONFIG_USB_ISIGHTFW is not set |
| 1458 | # CONFIG_USB_VST is not set | ||
| 1459 | # CONFIG_USB_GADGET is not set | 1465 | # CONFIG_USB_GADGET is not set |
| 1460 | 1466 | ||
| 1461 | # | 1467 | # |
| @@ -1620,6 +1626,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1620 | # CONFIG_BFS_FS is not set | 1626 | # CONFIG_BFS_FS is not set |
| 1621 | # CONFIG_EFS_FS is not set | 1627 | # CONFIG_EFS_FS is not set |
| 1622 | # CONFIG_JFFS2_FS is not set | 1628 | # CONFIG_JFFS2_FS is not set |
| 1629 | # CONFIG_LOGFS is not set | ||
| 1623 | # CONFIG_CRAMFS is not set | 1630 | # CONFIG_CRAMFS is not set |
| 1624 | # CONFIG_SQUASHFS is not set | 1631 | # CONFIG_SQUASHFS is not set |
| 1625 | # CONFIG_VXFS_FS is not set | 1632 | # CONFIG_VXFS_FS is not set |
| @@ -1651,6 +1658,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1651 | CONFIG_RPCSEC_GSS_KRB5=y | 1658 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1652 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1659 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1653 | # CONFIG_SMB_FS is not set | 1660 | # CONFIG_SMB_FS is not set |
| 1661 | # CONFIG_CEPH_FS is not set | ||
| 1654 | CONFIG_CIFS=m | 1662 | CONFIG_CIFS=m |
| 1655 | # CONFIG_CIFS_STATS is not set | 1663 | # CONFIG_CIFS_STATS is not set |
| 1656 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1664 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1723,9 +1731,11 @@ CONFIG_CRC32=y | |||
| 1723 | CONFIG_LIBCRC32C=m | 1731 | CONFIG_LIBCRC32C=m |
| 1724 | CONFIG_ZLIB_INFLATE=y | 1732 | CONFIG_ZLIB_INFLATE=y |
| 1725 | CONFIG_ZLIB_DEFLATE=m | 1733 | CONFIG_ZLIB_DEFLATE=m |
| 1734 | CONFIG_LZO_DECOMPRESS=y | ||
| 1726 | CONFIG_DECOMPRESS_GZIP=y | 1735 | CONFIG_DECOMPRESS_GZIP=y |
| 1727 | CONFIG_DECOMPRESS_BZIP2=y | 1736 | CONFIG_DECOMPRESS_BZIP2=y |
| 1728 | CONFIG_DECOMPRESS_LZMA=y | 1737 | CONFIG_DECOMPRESS_LZMA=y |
| 1738 | CONFIG_DECOMPRESS_LZO=y | ||
| 1729 | CONFIG_TEXTSEARCH=y | 1739 | CONFIG_TEXTSEARCH=y |
| 1730 | CONFIG_TEXTSEARCH_KMP=m | 1740 | CONFIG_TEXTSEARCH_KMP=m |
| 1731 | CONFIG_HAS_IOMEM=y | 1741 | CONFIG_HAS_IOMEM=y |
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig index 4c2c877f9363..0cbd56fe2e1e 100644 --- a/arch/powerpc/configs/mgcoge_defconfig +++ b/arch/powerpc/configs/mgcoge_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:02 2010 | 4 | # Mon Apr 19 23:16:26 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -105,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 105 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 106 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 107 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 108 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 109 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 109 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 110 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -311,6 +312,7 @@ CONFIG_ISA_DMA_API=y | |||
| 311 | # | 312 | # |
| 312 | # CONFIG_ISA is not set | 313 | # CONFIG_ISA is not set |
| 313 | CONFIG_ZONE_DMA=y | 314 | CONFIG_ZONE_DMA=y |
| 315 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 314 | CONFIG_PPC_INDIRECT_PCI=y | 316 | CONFIG_PPC_INDIRECT_PCI=y |
| 315 | CONFIG_FSL_SOC=y | 317 | CONFIG_FSL_SOC=y |
| 316 | CONFIG_PPC_PCI_CHOICE=y | 318 | CONFIG_PPC_PCI_CHOICE=y |
| @@ -321,7 +323,6 @@ CONFIG_PCI_8260=y | |||
| 321 | # CONFIG_PCIEPORTBUS is not set | 323 | # CONFIG_PCIEPORTBUS is not set |
| 322 | CONFIG_ARCH_SUPPORTS_MSI=y | 324 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 323 | # CONFIG_PCI_MSI is not set | 325 | # CONFIG_PCI_MSI is not set |
| 324 | # CONFIG_PCI_LEGACY is not set | ||
| 325 | # CONFIG_PCI_DEBUG is not set | 326 | # CONFIG_PCI_DEBUG is not set |
| 326 | # CONFIG_PCI_STUB is not set | 327 | # CONFIG_PCI_STUB is not set |
| 327 | # CONFIG_PCI_IOV is not set | 328 | # CONFIG_PCI_IOV is not set |
| @@ -348,7 +349,6 @@ CONFIG_NET=y | |||
| 348 | # Networking options | 349 | # Networking options |
| 349 | # | 350 | # |
| 350 | CONFIG_PACKET=y | 351 | CONFIG_PACKET=y |
| 351 | # CONFIG_PACKET_MMAP is not set | ||
| 352 | CONFIG_UNIX=y | 352 | CONFIG_UNIX=y |
| 353 | CONFIG_XFRM=y | 353 | CONFIG_XFRM=y |
| 354 | # CONFIG_XFRM_USER is not set | 354 | # CONFIG_XFRM_USER is not set |
| @@ -536,6 +536,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 536 | # UBI - Unsorted block images | 536 | # UBI - Unsorted block images |
| 537 | # | 537 | # |
| 538 | # CONFIG_MTD_UBI is not set | 538 | # CONFIG_MTD_UBI is not set |
| 539 | CONFIG_OF_FLATTREE=y | ||
| 540 | CONFIG_OF_DYNAMIC=y | ||
| 539 | CONFIG_OF_DEVICE=y | 541 | CONFIG_OF_DEVICE=y |
| 540 | CONFIG_OF_GPIO=y | 542 | CONFIG_OF_GPIO=y |
| 541 | CONFIG_OF_I2C=y | 543 | CONFIG_OF_I2C=y |
| @@ -570,6 +572,7 @@ CONFIG_HAVE_IDE=y | |||
| 570 | # | 572 | # |
| 571 | # SCSI device support | 573 | # SCSI device support |
| 572 | # | 574 | # |
| 575 | CONFIG_SCSI_MOD=y | ||
| 573 | # CONFIG_RAID_ATTRS is not set | 576 | # CONFIG_RAID_ATTRS is not set |
| 574 | # CONFIG_SCSI is not set | 577 | # CONFIG_SCSI is not set |
| 575 | # CONFIG_SCSI_DMA is not set | 578 | # CONFIG_SCSI_DMA is not set |
| @@ -704,6 +707,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 704 | CONFIG_SERIAL_CPM=y | 707 | CONFIG_SERIAL_CPM=y |
| 705 | CONFIG_SERIAL_CPM_CONSOLE=y | 708 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 706 | # CONFIG_SERIAL_JSM is not set | 709 | # CONFIG_SERIAL_JSM is not set |
| 710 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 707 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 711 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 708 | CONFIG_UNIX98_PTYS=y | 712 | CONFIG_UNIX98_PTYS=y |
| 709 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 713 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -769,14 +773,9 @@ CONFIG_I2C_CPM=y | |||
| 769 | # Other I2C/SMBus bus drivers | 773 | # Other I2C/SMBus bus drivers |
| 770 | # | 774 | # |
| 771 | # CONFIG_I2C_PCA_PLATFORM is not set | 775 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 772 | |||
| 773 | # | ||
| 774 | # Miscellaneous I2C Chip support | ||
| 775 | # | ||
| 776 | # CONFIG_I2C_DEBUG_CORE is not set | 776 | # CONFIG_I2C_DEBUG_CORE is not set |
| 777 | # CONFIG_I2C_DEBUG_ALGO is not set | 777 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 778 | # CONFIG_I2C_DEBUG_BUS is not set | 778 | # CONFIG_I2C_DEBUG_BUS is not set |
| 779 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 780 | # CONFIG_SPI is not set | 779 | # CONFIG_SPI is not set |
| 781 | 780 | ||
| 782 | # | 781 | # |
| @@ -790,14 +789,18 @@ CONFIG_GPIOLIB=y | |||
| 790 | # | 789 | # |
| 791 | # Memory mapped GPIO expanders: | 790 | # Memory mapped GPIO expanders: |
| 792 | # | 791 | # |
| 792 | # CONFIG_GPIO_IT8761E is not set | ||
| 793 | # CONFIG_GPIO_XILINX is not set | 793 | # CONFIG_GPIO_XILINX is not set |
| 794 | # CONFIG_GPIO_SCH is not set | ||
| 794 | 795 | ||
| 795 | # | 796 | # |
| 796 | # I2C GPIO expanders: | 797 | # I2C GPIO expanders: |
| 797 | # | 798 | # |
| 799 | # CONFIG_GPIO_MAX7300 is not set | ||
| 798 | # CONFIG_GPIO_MAX732X is not set | 800 | # CONFIG_GPIO_MAX732X is not set |
| 799 | # CONFIG_GPIO_PCA953X is not set | 801 | # CONFIG_GPIO_PCA953X is not set |
| 800 | # CONFIG_GPIO_PCF857X is not set | 802 | # CONFIG_GPIO_PCF857X is not set |
| 803 | # CONFIG_GPIO_ADP5588 is not set | ||
| 801 | 804 | ||
| 802 | # | 805 | # |
| 803 | # PCI GPIO expanders: | 806 | # PCI GPIO expanders: |
| @@ -829,19 +832,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 829 | # Multifunction device drivers | 832 | # Multifunction device drivers |
| 830 | # | 833 | # |
| 831 | # CONFIG_MFD_CORE is not set | 834 | # CONFIG_MFD_CORE is not set |
| 835 | # CONFIG_MFD_88PM860X is not set | ||
| 832 | # CONFIG_MFD_SM501 is not set | 836 | # CONFIG_MFD_SM501 is not set |
| 833 | # CONFIG_HTC_PASIC3 is not set | 837 | # CONFIG_HTC_PASIC3 is not set |
| 838 | # CONFIG_HTC_I2CPLD is not set | ||
| 834 | # CONFIG_TPS65010 is not set | 839 | # CONFIG_TPS65010 is not set |
| 835 | # CONFIG_TWL4030_CORE is not set | 840 | # CONFIG_TWL4030_CORE is not set |
| 836 | # CONFIG_MFD_TMIO is not set | 841 | # CONFIG_MFD_TMIO is not set |
| 837 | # CONFIG_PMIC_DA903X is not set | 842 | # CONFIG_PMIC_DA903X is not set |
| 838 | # CONFIG_PMIC_ADP5520 is not set | 843 | # CONFIG_PMIC_ADP5520 is not set |
| 844 | # CONFIG_MFD_MAX8925 is not set | ||
| 839 | # CONFIG_MFD_WM8400 is not set | 845 | # CONFIG_MFD_WM8400 is not set |
| 840 | # CONFIG_MFD_WM831X is not set | 846 | # CONFIG_MFD_WM831X is not set |
| 841 | # CONFIG_MFD_WM8350_I2C is not set | 847 | # CONFIG_MFD_WM8350_I2C is not set |
| 848 | # CONFIG_MFD_WM8994 is not set | ||
| 842 | # CONFIG_MFD_PCF50633 is not set | 849 | # CONFIG_MFD_PCF50633 is not set |
| 843 | # CONFIG_AB3100_CORE is not set | 850 | # CONFIG_AB3100_CORE is not set |
| 844 | # CONFIG_MFD_88PM8607 is not set | 851 | # CONFIG_MFD_TIMBERDALE is not set |
| 852 | # CONFIG_LPC_SCH is not set | ||
| 845 | # CONFIG_REGULATOR is not set | 853 | # CONFIG_REGULATOR is not set |
| 846 | # CONFIG_MEDIA_SUPPORT is not set | 854 | # CONFIG_MEDIA_SUPPORT is not set |
| 847 | 855 | ||
| @@ -850,6 +858,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 850 | # | 858 | # |
| 851 | # CONFIG_AGP is not set | 859 | # CONFIG_AGP is not set |
| 852 | CONFIG_VGA_ARB=y | 860 | CONFIG_VGA_ARB=y |
| 861 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 853 | # CONFIG_DRM is not set | 862 | # CONFIG_DRM is not set |
| 854 | # CONFIG_VGASTATE is not set | 863 | # CONFIG_VGASTATE is not set |
| 855 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 864 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -908,6 +917,7 @@ CONFIG_AUTOFS4_FS=y | |||
| 908 | # | 917 | # |
| 909 | # Caches | 918 | # Caches |
| 910 | # | 919 | # |
| 920 | # CONFIG_FSCACHE is not set | ||
| 911 | 921 | ||
| 912 | # | 922 | # |
| 913 | # CD-ROM/DVD Filesystems | 923 | # CD-ROM/DVD Filesystems |
| @@ -1100,6 +1110,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1100 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1110 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1101 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1111 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1102 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 1112 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 1113 | # CONFIG_LKDTM is not set | ||
| 1103 | # CONFIG_FAULT_INJECTION is not set | 1114 | # CONFIG_FAULT_INJECTION is not set |
| 1104 | # CONFIG_LATENCYTOP is not set | 1115 | # CONFIG_LATENCYTOP is not set |
| 1105 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1116 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig index 9e090f2c7e36..c1be26151021 100644 --- a/arch/powerpc/configs/mgsuvd_defconfig +++ b/arch/powerpc/configs/mgsuvd_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:03 2010 | 4 | # Mon Apr 19 23:16:27 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -89,11 +89,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 89 | # CONFIG_TREE_RCU_TRACE is not set | 89 | # CONFIG_TREE_RCU_TRACE is not set |
| 90 | # CONFIG_IKCONFIG is not set | 90 | # CONFIG_IKCONFIG is not set |
| 91 | CONFIG_LOG_BUF_SHIFT=17 | 91 | CONFIG_LOG_BUF_SHIFT=17 |
| 92 | CONFIG_GROUP_SCHED=y | ||
| 93 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 94 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 95 | CONFIG_USER_SCHED=y | ||
| 96 | # CONFIG_CGROUP_SCHED is not set | ||
| 97 | # CONFIG_CGROUPS is not set | 92 | # CONFIG_CGROUPS is not set |
| 98 | CONFIG_SYSFS_DEPRECATED=y | 93 | CONFIG_SYSFS_DEPRECATED=y |
| 99 | CONFIG_SYSFS_DEPRECATED_V2=y | 94 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -104,6 +99,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 104 | CONFIG_RD_GZIP=y | 99 | CONFIG_RD_GZIP=y |
| 105 | # CONFIG_RD_BZIP2 is not set | 100 | # CONFIG_RD_BZIP2 is not set |
| 106 | # CONFIG_RD_LZMA is not set | 101 | # CONFIG_RD_LZMA is not set |
| 102 | # CONFIG_RD_LZO is not set | ||
| 107 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 103 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 108 | CONFIG_SYSCTL=y | 104 | CONFIG_SYSCTL=y |
| 109 | CONFIG_ANON_INODES=y | 105 | CONFIG_ANON_INODES=y |
| @@ -309,6 +305,7 @@ CONFIG_ISA_DMA_API=y | |||
| 309 | # Bus options | 305 | # Bus options |
| 310 | # | 306 | # |
| 311 | CONFIG_ZONE_DMA=y | 307 | CONFIG_ZONE_DMA=y |
| 308 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 312 | CONFIG_FSL_SOC=y | 309 | CONFIG_FSL_SOC=y |
| 313 | # CONFIG_PCI is not set | 310 | # CONFIG_PCI is not set |
| 314 | # CONFIG_PCI_DOMAINS is not set | 311 | # CONFIG_PCI_DOMAINS is not set |
| @@ -337,7 +334,6 @@ CONFIG_NET=y | |||
| 337 | # Networking options | 334 | # Networking options |
| 338 | # | 335 | # |
| 339 | CONFIG_PACKET=y | 336 | CONFIG_PACKET=y |
| 340 | # CONFIG_PACKET_MMAP is not set | ||
| 341 | CONFIG_UNIX=y | 337 | CONFIG_UNIX=y |
| 342 | CONFIG_XFRM=y | 338 | CONFIG_XFRM=y |
| 343 | # CONFIG_XFRM_USER is not set | 339 | # CONFIG_XFRM_USER is not set |
| @@ -515,6 +511,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 515 | # UBI - Unsorted block images | 511 | # UBI - Unsorted block images |
| 516 | # | 512 | # |
| 517 | # CONFIG_MTD_UBI is not set | 513 | # CONFIG_MTD_UBI is not set |
| 514 | CONFIG_OF_FLATTREE=y | ||
| 515 | CONFIG_OF_DYNAMIC=y | ||
| 518 | CONFIG_OF_DEVICE=y | 516 | CONFIG_OF_DEVICE=y |
| 519 | CONFIG_OF_MDIO=y | 517 | CONFIG_OF_MDIO=y |
| 520 | # CONFIG_PARPORT is not set | 518 | # CONFIG_PARPORT is not set |
| @@ -542,6 +540,7 @@ CONFIG_HAVE_IDE=y | |||
| 542 | # | 540 | # |
| 543 | # SCSI device support | 541 | # SCSI device support |
| 544 | # | 542 | # |
| 543 | CONFIG_SCSI_MOD=y | ||
| 545 | # CONFIG_RAID_ATTRS is not set | 544 | # CONFIG_RAID_ATTRS is not set |
| 546 | # CONFIG_SCSI is not set | 545 | # CONFIG_SCSI is not set |
| 547 | # CONFIG_SCSI_DMA is not set | 546 | # CONFIG_SCSI_DMA is not set |
| @@ -643,6 +642,7 @@ CONFIG_SERIAL_CORE=y | |||
| 643 | CONFIG_SERIAL_CORE_CONSOLE=y | 642 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 644 | CONFIG_SERIAL_CPM=y | 643 | CONFIG_SERIAL_CPM=y |
| 645 | CONFIG_SERIAL_CPM_CONSOLE=y | 644 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 645 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 646 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 646 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 647 | CONFIG_UNIX98_PTYS=y | 647 | CONFIG_UNIX98_PTYS=y |
| 648 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 648 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -801,6 +801,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 801 | # CONFIG_JFFS2_LZO is not set | 801 | # CONFIG_JFFS2_LZO is not set |
| 802 | CONFIG_JFFS2_RTIME=y | 802 | CONFIG_JFFS2_RTIME=y |
| 803 | # CONFIG_JFFS2_RUBIN is not set | 803 | # CONFIG_JFFS2_RUBIN is not set |
| 804 | # CONFIG_LOGFS is not set | ||
| 804 | CONFIG_CRAMFS=y | 805 | CONFIG_CRAMFS=y |
| 805 | # CONFIG_SQUASHFS is not set | 806 | # CONFIG_SQUASHFS is not set |
| 806 | # CONFIG_VXFS_FS is not set | 807 | # CONFIG_VXFS_FS is not set |
| @@ -825,6 +826,7 @@ CONFIG_SUNRPC=y | |||
| 825 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 826 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 826 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 827 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 827 | # CONFIG_SMB_FS is not set | 828 | # CONFIG_SMB_FS is not set |
| 829 | # CONFIG_CEPH_FS is not set | ||
| 828 | # CONFIG_CIFS is not set | 830 | # CONFIG_CIFS is not set |
| 829 | # CONFIG_NCP_FS is not set | 831 | # CONFIG_NCP_FS is not set |
| 830 | # CONFIG_CODA_FS is not set | 832 | # CONFIG_CODA_FS is not set |
| @@ -892,6 +894,7 @@ CONFIG_DEBUG_FS=y | |||
| 892 | # CONFIG_DEBUG_KERNEL is not set | 894 | # CONFIG_DEBUG_KERNEL is not set |
| 893 | # CONFIG_DEBUG_MEMORY_INIT is not set | 895 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 894 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 896 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 897 | # CONFIG_LKDTM is not set | ||
| 895 | # CONFIG_LATENCYTOP is not set | 898 | # CONFIG_LATENCYTOP is not set |
| 896 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | 899 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
| 897 | CONFIG_HAVE_FUNCTION_TRACER=y | 900 | CONFIG_HAVE_FUNCTION_TRACER=y |
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 1315b775a6d2..27c63ceeb45a 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:04 2010 | 4 | # Mon Apr 19 23:16:28 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -94,11 +94,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 94 | # CONFIG_TREE_RCU_TRACE is not set | 94 | # CONFIG_TREE_RCU_TRACE is not set |
| 95 | # CONFIG_IKCONFIG is not set | 95 | # CONFIG_IKCONFIG is not set |
| 96 | CONFIG_LOG_BUF_SHIFT=14 | 96 | CONFIG_LOG_BUF_SHIFT=14 |
| 97 | CONFIG_GROUP_SCHED=y | ||
| 98 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 99 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 100 | CONFIG_USER_SCHED=y | ||
| 101 | # CONFIG_CGROUP_SCHED is not set | ||
| 102 | # CONFIG_CGROUPS is not set | 97 | # CONFIG_CGROUPS is not set |
| 103 | CONFIG_SYSFS_DEPRECATED=y | 98 | CONFIG_SYSFS_DEPRECATED=y |
| 104 | CONFIG_SYSFS_DEPRECATED_V2=y | 99 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -109,6 +104,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 109 | CONFIG_RD_GZIP=y | 104 | CONFIG_RD_GZIP=y |
| 110 | # CONFIG_RD_BZIP2 is not set | 105 | # CONFIG_RD_BZIP2 is not set |
| 111 | # CONFIG_RD_LZMA is not set | 106 | # CONFIG_RD_LZMA is not set |
| 107 | # CONFIG_RD_LZO is not set | ||
| 112 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 108 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 113 | CONFIG_SYSCTL=y | 109 | CONFIG_SYSCTL=y |
| 114 | CONFIG_ANON_INODES=y | 110 | CONFIG_ANON_INODES=y |
| @@ -311,6 +307,7 @@ CONFIG_ISA_DMA_API=y | |||
| 311 | # Bus options | 307 | # Bus options |
| 312 | # | 308 | # |
| 313 | CONFIG_ZONE_DMA=y | 309 | CONFIG_ZONE_DMA=y |
| 310 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 314 | CONFIG_GENERIC_ISA_DMA=y | 311 | CONFIG_GENERIC_ISA_DMA=y |
| 315 | # CONFIG_PPC_INDIRECT_PCI is not set | 312 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 316 | CONFIG_PCI=y | 313 | CONFIG_PCI=y |
| @@ -319,7 +316,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 319 | # CONFIG_PCIEPORTBUS is not set | 316 | # CONFIG_PCIEPORTBUS is not set |
| 320 | CONFIG_ARCH_SUPPORTS_MSI=y | 317 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 321 | # CONFIG_PCI_MSI is not set | 318 | # CONFIG_PCI_MSI is not set |
| 322 | # CONFIG_PCI_LEGACY is not set | ||
| 323 | # CONFIG_PCI_STUB is not set | 319 | # CONFIG_PCI_STUB is not set |
| 324 | # CONFIG_PCI_IOV is not set | 320 | # CONFIG_PCI_IOV is not set |
| 325 | # CONFIG_PCCARD is not set | 321 | # CONFIG_PCCARD is not set |
| @@ -345,7 +341,6 @@ CONFIG_NET=y | |||
| 345 | # Networking options | 341 | # Networking options |
| 346 | # | 342 | # |
| 347 | CONFIG_PACKET=y | 343 | CONFIG_PACKET=y |
| 348 | # CONFIG_PACKET_MMAP is not set | ||
| 349 | CONFIG_UNIX=y | 344 | CONFIG_UNIX=y |
| 350 | CONFIG_XFRM=y | 345 | CONFIG_XFRM=y |
| 351 | CONFIG_XFRM_USER=y | 346 | CONFIG_XFRM_USER=y |
| @@ -440,6 +435,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 440 | # CONFIG_SYS_HYPERVISOR is not set | 435 | # CONFIG_SYS_HYPERVISOR is not set |
| 441 | # CONFIG_CONNECTOR is not set | 436 | # CONFIG_CONNECTOR is not set |
| 442 | # CONFIG_MTD is not set | 437 | # CONFIG_MTD is not set |
| 438 | CONFIG_OF_FLATTREE=y | ||
| 439 | CONFIG_OF_DYNAMIC=y | ||
| 443 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 444 | CONFIG_OF_MDIO=y | 441 | CONFIG_OF_MDIO=y |
| 445 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| @@ -484,6 +481,7 @@ CONFIG_HAVE_IDE=y | |||
| 484 | # | 481 | # |
| 485 | # SCSI device support | 482 | # SCSI device support |
| 486 | # | 483 | # |
| 484 | CONFIG_SCSI_MOD=y | ||
| 487 | # CONFIG_RAID_ATTRS is not set | 485 | # CONFIG_RAID_ATTRS is not set |
| 488 | CONFIG_SCSI=y | 486 | CONFIG_SCSI=y |
| 489 | CONFIG_SCSI_DMA=y | 487 | CONFIG_SCSI_DMA=y |
| @@ -605,6 +603,7 @@ CONFIG_SATA_MV=y | |||
| 605 | # CONFIG_PATA_IT821X is not set | 603 | # CONFIG_PATA_IT821X is not set |
| 606 | # CONFIG_PATA_IT8213 is not set | 604 | # CONFIG_PATA_IT8213 is not set |
| 607 | # CONFIG_PATA_JMICRON is not set | 605 | # CONFIG_PATA_JMICRON is not set |
| 606 | # CONFIG_PATA_LEGACY is not set | ||
| 608 | # CONFIG_PATA_TRIFLEX is not set | 607 | # CONFIG_PATA_TRIFLEX is not set |
| 609 | # CONFIG_PATA_MARVELL is not set | 608 | # CONFIG_PATA_MARVELL is not set |
| 610 | # CONFIG_PATA_MPIIX is not set | 609 | # CONFIG_PATA_MPIIX is not set |
| @@ -696,6 +695,7 @@ CONFIG_NET_PCI=y | |||
| 696 | # CONFIG_PCNET32 is not set | 695 | # CONFIG_PCNET32 is not set |
| 697 | # CONFIG_AMD8111_ETH is not set | 696 | # CONFIG_AMD8111_ETH is not set |
| 698 | # CONFIG_ADAPTEC_STARFIRE is not set | 697 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 698 | # CONFIG_KSZ884X_PCI is not set | ||
| 699 | # CONFIG_B44 is not set | 699 | # CONFIG_B44 is not set |
| 700 | # CONFIG_FORCEDETH is not set | 700 | # CONFIG_FORCEDETH is not set |
| 701 | CONFIG_E100=y | 701 | CONFIG_E100=y |
| @@ -750,6 +750,8 @@ CONFIG_NETDEV_10000=y | |||
| 750 | # CONFIG_CHELSIO_T1 is not set | 750 | # CONFIG_CHELSIO_T1 is not set |
| 751 | CONFIG_CHELSIO_T3_DEPENDS=y | 751 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 752 | # CONFIG_CHELSIO_T3 is not set | 752 | # CONFIG_CHELSIO_T3 is not set |
| 753 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 754 | # CONFIG_CHELSIO_T4 is not set | ||
| 753 | # CONFIG_ENIC is not set | 755 | # CONFIG_ENIC is not set |
| 754 | # CONFIG_IXGBE is not set | 756 | # CONFIG_IXGBE is not set |
| 755 | # CONFIG_IXGB is not set | 757 | # CONFIG_IXGB is not set |
| @@ -762,6 +764,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 762 | # CONFIG_MLX4_CORE is not set | 764 | # CONFIG_MLX4_CORE is not set |
| 763 | # CONFIG_TEHUTI is not set | 765 | # CONFIG_TEHUTI is not set |
| 764 | # CONFIG_BNX2X is not set | 766 | # CONFIG_BNX2X is not set |
| 767 | # CONFIG_QLCNIC is not set | ||
| 765 | # CONFIG_QLGE is not set | 768 | # CONFIG_QLGE is not set |
| 766 | # CONFIG_SFC is not set | 769 | # CONFIG_SFC is not set |
| 767 | # CONFIG_BE2NET is not set | 770 | # CONFIG_BE2NET is not set |
| @@ -846,6 +849,7 @@ CONFIG_SERIAL_CORE=y | |||
| 846 | CONFIG_SERIAL_CORE_CONSOLE=y | 849 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 847 | # CONFIG_SERIAL_JSM is not set | 850 | # CONFIG_SERIAL_JSM is not set |
| 848 | # CONFIG_SERIAL_OF_PLATFORM is not set | 851 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 852 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 849 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 853 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 850 | CONFIG_UNIX98_PTYS=y | 854 | CONFIG_UNIX98_PTYS=y |
| 851 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 855 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -910,6 +914,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 910 | # CONFIG_MFD_SM501 is not set | 914 | # CONFIG_MFD_SM501 is not set |
| 911 | # CONFIG_HTC_PASIC3 is not set | 915 | # CONFIG_HTC_PASIC3 is not set |
| 912 | # CONFIG_MFD_TMIO is not set | 916 | # CONFIG_MFD_TMIO is not set |
| 917 | # CONFIG_LPC_SCH is not set | ||
| 913 | # CONFIG_REGULATOR is not set | 918 | # CONFIG_REGULATOR is not set |
| 914 | # CONFIG_MEDIA_SUPPORT is not set | 919 | # CONFIG_MEDIA_SUPPORT is not set |
| 915 | 920 | ||
| @@ -918,6 +923,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 918 | # | 923 | # |
| 919 | # CONFIG_AGP is not set | 924 | # CONFIG_AGP is not set |
| 920 | CONFIG_VGA_ARB=y | 925 | CONFIG_VGA_ARB=y |
| 926 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 921 | # CONFIG_DRM is not set | 927 | # CONFIG_DRM is not set |
| 922 | # CONFIG_VGASTATE is not set | 928 | # CONFIG_VGASTATE is not set |
| 923 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 929 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1044,6 +1050,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1044 | # CONFIG_BEFS_FS is not set | 1050 | # CONFIG_BEFS_FS is not set |
| 1045 | # CONFIG_BFS_FS is not set | 1051 | # CONFIG_BFS_FS is not set |
| 1046 | # CONFIG_EFS_FS is not set | 1052 | # CONFIG_EFS_FS is not set |
| 1053 | # CONFIG_LOGFS is not set | ||
| 1047 | # CONFIG_CRAMFS is not set | 1054 | # CONFIG_CRAMFS is not set |
| 1048 | # CONFIG_SQUASHFS is not set | 1055 | # CONFIG_SQUASHFS is not set |
| 1049 | # CONFIG_VXFS_FS is not set | 1056 | # CONFIG_VXFS_FS is not set |
| @@ -1066,6 +1073,7 @@ CONFIG_SUNRPC=y | |||
| 1066 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1073 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1067 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1074 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1068 | # CONFIG_SMB_FS is not set | 1075 | # CONFIG_SMB_FS is not set |
| 1076 | # CONFIG_CEPH_FS is not set | ||
| 1069 | # CONFIG_CIFS is not set | 1077 | # CONFIG_CIFS is not set |
| 1070 | # CONFIG_NCP_FS is not set | 1078 | # CONFIG_NCP_FS is not set |
| 1071 | # CONFIG_CODA_FS is not set | 1079 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 9073778d3575..6875fb89377e 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:05 2010 | 4 | # Mon Apr 19 23:16:29 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -96,8 +96,7 @@ CONFIG_IKCONFIG=y | |||
| 96 | CONFIG_IKCONFIG_PROC=y | 96 | CONFIG_IKCONFIG_PROC=y |
| 97 | CONFIG_LOG_BUF_SHIFT=14 | 97 | CONFIG_LOG_BUF_SHIFT=14 |
| 98 | # CONFIG_CGROUPS is not set | 98 | # CONFIG_CGROUPS is not set |
| 99 | CONFIG_SYSFS_DEPRECATED=y | 99 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 100 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 101 | # CONFIG_RELAY is not set | 100 | # CONFIG_RELAY is not set |
| 102 | # CONFIG_NAMESPACES is not set | 101 | # CONFIG_NAMESPACES is not set |
| 103 | # CONFIG_BLK_DEV_INITRD is not set | 102 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -301,6 +300,7 @@ CONFIG_ISA_DMA_API=y | |||
| 301 | # Bus options | 300 | # Bus options |
| 302 | # | 301 | # |
| 303 | CONFIG_ZONE_DMA=y | 302 | CONFIG_ZONE_DMA=y |
| 303 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 304 | CONFIG_PPC_INDIRECT_PCI=y | 304 | CONFIG_PPC_INDIRECT_PCI=y |
| 305 | CONFIG_FSL_SOC=y | 305 | CONFIG_FSL_SOC=y |
| 306 | CONFIG_PPC_PCI_CHOICE=y | 306 | CONFIG_PPC_PCI_CHOICE=y |
| @@ -311,7 +311,6 @@ CONFIG_PCI_8260=y | |||
| 311 | # CONFIG_PCIEPORTBUS is not set | 311 | # CONFIG_PCIEPORTBUS is not set |
| 312 | CONFIG_ARCH_SUPPORTS_MSI=y | 312 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 313 | # CONFIG_PCI_MSI is not set | 313 | # CONFIG_PCI_MSI is not set |
| 314 | # CONFIG_PCI_LEGACY is not set | ||
| 315 | # CONFIG_PCI_DEBUG is not set | 314 | # CONFIG_PCI_DEBUG is not set |
| 316 | # CONFIG_PCI_STUB is not set | 315 | # CONFIG_PCI_STUB is not set |
| 317 | # CONFIG_PCI_IOV is not set | 316 | # CONFIG_PCI_IOV is not set |
| @@ -338,7 +337,6 @@ CONFIG_NET=y | |||
| 338 | # Networking options | 337 | # Networking options |
| 339 | # | 338 | # |
| 340 | CONFIG_PACKET=y | 339 | CONFIG_PACKET=y |
| 341 | # CONFIG_PACKET_MMAP is not set | ||
| 342 | CONFIG_UNIX=y | 340 | CONFIG_UNIX=y |
| 343 | CONFIG_XFRM=y | 341 | CONFIG_XFRM=y |
| 344 | # CONFIG_XFRM_USER is not set | 342 | # CONFIG_XFRM_USER is not set |
| @@ -540,6 +538,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 540 | # UBI - Unsorted block images | 538 | # UBI - Unsorted block images |
| 541 | # | 539 | # |
| 542 | # CONFIG_MTD_UBI is not set | 540 | # CONFIG_MTD_UBI is not set |
| 541 | CONFIG_OF_FLATTREE=y | ||
| 542 | CONFIG_OF_DYNAMIC=y | ||
| 543 | CONFIG_OF_DEVICE=y | 543 | CONFIG_OF_DEVICE=y |
| 544 | CONFIG_OF_GPIO=y | 544 | CONFIG_OF_GPIO=y |
| 545 | CONFIG_OF_MDIO=y | 545 | CONFIG_OF_MDIO=y |
| @@ -569,6 +569,7 @@ CONFIG_HAVE_IDE=y | |||
| 569 | # | 569 | # |
| 570 | # SCSI device support | 570 | # SCSI device support |
| 571 | # | 571 | # |
| 572 | CONFIG_SCSI_MOD=y | ||
| 572 | # CONFIG_RAID_ATTRS is not set | 573 | # CONFIG_RAID_ATTRS is not set |
| 573 | # CONFIG_SCSI is not set | 574 | # CONFIG_SCSI is not set |
| 574 | # CONFIG_SCSI_DMA is not set | 575 | # CONFIG_SCSI_DMA is not set |
| @@ -674,6 +675,8 @@ CONFIG_NETDEV_10000=y | |||
| 674 | # CONFIG_CHELSIO_T1 is not set | 675 | # CONFIG_CHELSIO_T1 is not set |
| 675 | CONFIG_CHELSIO_T3_DEPENDS=y | 676 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 676 | # CONFIG_CHELSIO_T3 is not set | 677 | # CONFIG_CHELSIO_T3 is not set |
| 678 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 679 | # CONFIG_CHELSIO_T4 is not set | ||
| 677 | # CONFIG_ENIC is not set | 680 | # CONFIG_ENIC is not set |
| 678 | # CONFIG_IXGBE is not set | 681 | # CONFIG_IXGBE is not set |
| 679 | # CONFIG_IXGB is not set | 682 | # CONFIG_IXGB is not set |
| @@ -686,6 +689,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 686 | # CONFIG_MLX4_CORE is not set | 689 | # CONFIG_MLX4_CORE is not set |
| 687 | # CONFIG_TEHUTI is not set | 690 | # CONFIG_TEHUTI is not set |
| 688 | # CONFIG_BNX2X is not set | 691 | # CONFIG_BNX2X is not set |
| 692 | # CONFIG_QLCNIC is not set | ||
| 689 | # CONFIG_QLGE is not set | 693 | # CONFIG_QLGE is not set |
| 690 | # CONFIG_SFC is not set | 694 | # CONFIG_SFC is not set |
| 691 | # CONFIG_BE2NET is not set | 695 | # CONFIG_BE2NET is not set |
| @@ -797,6 +801,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 797 | CONFIG_SERIAL_CPM=y | 801 | CONFIG_SERIAL_CPM=y |
| 798 | CONFIG_SERIAL_CPM_CONSOLE=y | 802 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 799 | # CONFIG_SERIAL_JSM is not set | 803 | # CONFIG_SERIAL_JSM is not set |
| 804 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 800 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 805 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 801 | CONFIG_UNIX98_PTYS=y | 806 | CONFIG_UNIX98_PTYS=y |
| 802 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 807 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -825,7 +830,9 @@ CONFIG_GPIOLIB=y | |||
| 825 | # | 830 | # |
| 826 | # Memory mapped GPIO expanders: | 831 | # Memory mapped GPIO expanders: |
| 827 | # | 832 | # |
| 833 | # CONFIG_GPIO_IT8761E is not set | ||
| 828 | # CONFIG_GPIO_XILINX is not set | 834 | # CONFIG_GPIO_XILINX is not set |
| 835 | # CONFIG_GPIO_SCH is not set | ||
| 829 | 836 | ||
| 830 | # | 837 | # |
| 831 | # I2C GPIO expanders: | 838 | # I2C GPIO expanders: |
| @@ -864,6 +871,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 864 | # CONFIG_MFD_SM501 is not set | 871 | # CONFIG_MFD_SM501 is not set |
| 865 | # CONFIG_HTC_PASIC3 is not set | 872 | # CONFIG_HTC_PASIC3 is not set |
| 866 | # CONFIG_MFD_TMIO is not set | 873 | # CONFIG_MFD_TMIO is not set |
| 874 | # CONFIG_MFD_TIMBERDALE is not set | ||
| 875 | # CONFIG_LPC_SCH is not set | ||
| 867 | # CONFIG_REGULATOR is not set | 876 | # CONFIG_REGULATOR is not set |
| 868 | # CONFIG_MEDIA_SUPPORT is not set | 877 | # CONFIG_MEDIA_SUPPORT is not set |
| 869 | 878 | ||
| @@ -872,6 +881,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 872 | # | 881 | # |
| 873 | # CONFIG_AGP is not set | 882 | # CONFIG_AGP is not set |
| 874 | CONFIG_VGA_ARB=y | 883 | CONFIG_VGA_ARB=y |
| 884 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 875 | # CONFIG_DRM is not set | 885 | # CONFIG_DRM is not set |
| 876 | # CONFIG_VGASTATE is not set | 886 | # CONFIG_VGASTATE is not set |
| 877 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 887 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -933,6 +943,7 @@ CONFIG_AUTOFS4_FS=y | |||
| 933 | # | 943 | # |
| 934 | # Caches | 944 | # Caches |
| 935 | # | 945 | # |
| 946 | # CONFIG_FSCACHE is not set | ||
| 936 | 947 | ||
| 937 | # | 948 | # |
| 938 | # CD-ROM/DVD Filesystems | 949 | # CD-ROM/DVD Filesystems |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 05bec4835687..bbe5ae61d979 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:06 2010 | 4 | # Mon Apr 19 23:16:30 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -98,14 +98,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 98 | # CONFIG_TREE_RCU_TRACE is not set | 98 | # CONFIG_TREE_RCU_TRACE is not set |
| 99 | # CONFIG_IKCONFIG is not set | 99 | # CONFIG_IKCONFIG is not set |
| 100 | CONFIG_LOG_BUF_SHIFT=14 | 100 | CONFIG_LOG_BUF_SHIFT=14 |
| 101 | CONFIG_GROUP_SCHED=y | ||
| 102 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 103 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 104 | CONFIG_USER_SCHED=y | ||
| 105 | # CONFIG_CGROUP_SCHED is not set | ||
| 106 | # CONFIG_CGROUPS is not set | 101 | # CONFIG_CGROUPS is not set |
| 107 | CONFIG_SYSFS_DEPRECATED=y | 102 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 108 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 109 | # CONFIG_RELAY is not set | 103 | # CONFIG_RELAY is not set |
| 110 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
| 111 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |
| @@ -113,6 +107,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 113 | CONFIG_RD_GZIP=y | 107 | CONFIG_RD_GZIP=y |
| 114 | # CONFIG_RD_BZIP2 is not set | 108 | # CONFIG_RD_BZIP2 is not set |
| 115 | # CONFIG_RD_LZMA is not set | 109 | # CONFIG_RD_LZMA is not set |
| 110 | # CONFIG_RD_LZO is not set | ||
| 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 111 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 117 | CONFIG_SYSCTL=y | 112 | CONFIG_SYSCTL=y |
| 118 | CONFIG_ANON_INODES=y | 113 | CONFIG_ANON_INODES=y |
| @@ -126,7 +121,7 @@ CONFIG_BUG=y | |||
| 126 | CONFIG_ELF_CORE=y | 121 | CONFIG_ELF_CORE=y |
| 127 | CONFIG_BASE_FULL=y | 122 | CONFIG_BASE_FULL=y |
| 128 | CONFIG_FUTEX=y | 123 | CONFIG_FUTEX=y |
| 129 | # CONFIG_EPOLL is not set | 124 | CONFIG_EPOLL=y |
| 130 | CONFIG_SIGNALFD=y | 125 | CONFIG_SIGNALFD=y |
| 131 | CONFIG_TIMERFD=y | 126 | CONFIG_TIMERFD=y |
| 132 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
| @@ -331,6 +326,7 @@ CONFIG_ISA_DMA_API=y | |||
| 331 | # Bus options | 326 | # Bus options |
| 332 | # | 327 | # |
| 333 | CONFIG_ZONE_DMA=y | 328 | CONFIG_ZONE_DMA=y |
| 329 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 334 | CONFIG_GENERIC_ISA_DMA=y | 330 | CONFIG_GENERIC_ISA_DMA=y |
| 335 | CONFIG_PPC_INDIRECT_PCI=y | 331 | CONFIG_PPC_INDIRECT_PCI=y |
| 336 | CONFIG_FSL_SOC=y | 332 | CONFIG_FSL_SOC=y |
| @@ -344,7 +340,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 344 | # CONFIG_PCIEPORTBUS is not set | 340 | # CONFIG_PCIEPORTBUS is not set |
| 345 | CONFIG_ARCH_SUPPORTS_MSI=y | 341 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 346 | # CONFIG_PCI_MSI is not set | 342 | # CONFIG_PCI_MSI is not set |
| 347 | # CONFIG_PCI_LEGACY is not set | ||
| 348 | # CONFIG_PCI_STUB is not set | 343 | # CONFIG_PCI_STUB is not set |
| 349 | # CONFIG_PCI_IOV is not set | 344 | # CONFIG_PCI_IOV is not set |
| 350 | # CONFIG_PCCARD is not set | 345 | # CONFIG_PCCARD is not set |
| @@ -370,7 +365,6 @@ CONFIG_NET=y | |||
| 370 | # Networking options | 365 | # Networking options |
| 371 | # | 366 | # |
| 372 | CONFIG_PACKET=y | 367 | CONFIG_PACKET=y |
| 373 | # CONFIG_PACKET_MMAP is not set | ||
| 374 | CONFIG_UNIX=y | 368 | CONFIG_UNIX=y |
| 375 | CONFIG_XFRM=y | 369 | CONFIG_XFRM=y |
| 376 | CONFIG_XFRM_USER=m | 370 | CONFIG_XFRM_USER=m |
| @@ -560,6 +554,8 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 560 | # UBI - Unsorted block images | 554 | # UBI - Unsorted block images |
| 561 | # | 555 | # |
| 562 | # CONFIG_MTD_UBI is not set | 556 | # CONFIG_MTD_UBI is not set |
| 557 | CONFIG_OF_FLATTREE=y | ||
| 558 | CONFIG_OF_DYNAMIC=y | ||
| 563 | CONFIG_OF_DEVICE=y | 559 | CONFIG_OF_DEVICE=y |
| 564 | CONFIG_OF_GPIO=y | 560 | CONFIG_OF_GPIO=y |
| 565 | CONFIG_OF_I2C=y | 561 | CONFIG_OF_I2C=y |
| @@ -597,6 +593,7 @@ CONFIG_MISC_DEVICES=y | |||
| 597 | # CONFIG_ENCLOSURE_SERVICES is not set | 593 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 598 | # CONFIG_HP_ILO is not set | 594 | # CONFIG_HP_ILO is not set |
| 599 | # CONFIG_ISL29003 is not set | 595 | # CONFIG_ISL29003 is not set |
| 596 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 600 | # CONFIG_DS1682 is not set | 597 | # CONFIG_DS1682 is not set |
| 601 | # CONFIG_C2PORT is not set | 598 | # CONFIG_C2PORT is not set |
| 602 | 599 | ||
| @@ -614,6 +611,7 @@ CONFIG_HAVE_IDE=y | |||
| 614 | # | 611 | # |
| 615 | # SCSI device support | 612 | # SCSI device support |
| 616 | # | 613 | # |
| 614 | CONFIG_SCSI_MOD=y | ||
| 617 | # CONFIG_RAID_ATTRS is not set | 615 | # CONFIG_RAID_ATTRS is not set |
| 618 | CONFIG_SCSI=y | 616 | CONFIG_SCSI=y |
| 619 | CONFIG_SCSI_DMA=y | 617 | CONFIG_SCSI_DMA=y |
| @@ -712,7 +710,7 @@ CONFIG_ATA_SFF=y | |||
| 712 | # CONFIG_SATA_QSTOR is not set | 710 | # CONFIG_SATA_QSTOR is not set |
| 713 | # CONFIG_SATA_PROMISE is not set | 711 | # CONFIG_SATA_PROMISE is not set |
| 714 | # CONFIG_SATA_SX4 is not set | 712 | # CONFIG_SATA_SX4 is not set |
| 715 | # CONFIG_SATA_SIL is not set | 713 | CONFIG_SATA_SIL=y |
| 716 | # CONFIG_SATA_SIS is not set | 714 | # CONFIG_SATA_SIS is not set |
| 717 | # CONFIG_SATA_ULI is not set | 715 | # CONFIG_SATA_ULI is not set |
| 718 | # CONFIG_SATA_VIA is not set | 716 | # CONFIG_SATA_VIA is not set |
| @@ -737,6 +735,7 @@ CONFIG_ATA_SFF=y | |||
| 737 | # CONFIG_PATA_IT821X is not set | 735 | # CONFIG_PATA_IT821X is not set |
| 738 | # CONFIG_PATA_IT8213 is not set | 736 | # CONFIG_PATA_IT8213 is not set |
| 739 | # CONFIG_PATA_JMICRON is not set | 737 | # CONFIG_PATA_JMICRON is not set |
| 738 | # CONFIG_PATA_LEGACY is not set | ||
| 740 | # CONFIG_PATA_TRIFLEX is not set | 739 | # CONFIG_PATA_TRIFLEX is not set |
| 741 | # CONFIG_PATA_MARVELL is not set | 740 | # CONFIG_PATA_MARVELL is not set |
| 742 | # CONFIG_PATA_MPIIX is not set | 741 | # CONFIG_PATA_MPIIX is not set |
| @@ -863,6 +862,8 @@ CONFIG_NETDEV_10000=y | |||
| 863 | # CONFIG_CHELSIO_T1 is not set | 862 | # CONFIG_CHELSIO_T1 is not set |
| 864 | CONFIG_CHELSIO_T3_DEPENDS=y | 863 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 865 | # CONFIG_CHELSIO_T3 is not set | 864 | # CONFIG_CHELSIO_T3 is not set |
| 865 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 866 | # CONFIG_CHELSIO_T4 is not set | ||
| 866 | # CONFIG_ENIC is not set | 867 | # CONFIG_ENIC is not set |
| 867 | # CONFIG_IXGBE is not set | 868 | # CONFIG_IXGBE is not set |
| 868 | # CONFIG_IXGB is not set | 869 | # CONFIG_IXGB is not set |
| @@ -875,6 +876,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 875 | # CONFIG_MLX4_CORE is not set | 876 | # CONFIG_MLX4_CORE is not set |
| 876 | # CONFIG_TEHUTI is not set | 877 | # CONFIG_TEHUTI is not set |
| 877 | # CONFIG_BNX2X is not set | 878 | # CONFIG_BNX2X is not set |
| 879 | # CONFIG_QLCNIC is not set | ||
| 878 | # CONFIG_QLGE is not set | 880 | # CONFIG_QLGE is not set |
| 879 | # CONFIG_SFC is not set | 881 | # CONFIG_SFC is not set |
| 880 | # CONFIG_BE2NET is not set | 882 | # CONFIG_BE2NET is not set |
| @@ -970,6 +972,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 970 | # CONFIG_SERIAL_JSM is not set | 972 | # CONFIG_SERIAL_JSM is not set |
| 971 | # CONFIG_SERIAL_OF_PLATFORM is not set | 973 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 972 | # CONFIG_SERIAL_QE is not set | 974 | # CONFIG_SERIAL_QE is not set |
| 975 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 973 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 976 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 974 | CONFIG_UNIX98_PTYS=y | 977 | CONFIG_UNIX98_PTYS=y |
| 975 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 978 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -980,8 +983,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 980 | CONFIG_HW_RANDOM=y | 983 | CONFIG_HW_RANDOM=y |
| 981 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | 984 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set |
| 982 | # CONFIG_NVRAM is not set | 985 | # CONFIG_NVRAM is not set |
| 983 | CONFIG_GEN_RTC=y | ||
| 984 | # CONFIG_GEN_RTC_X is not set | ||
| 985 | # CONFIG_R3964 is not set | 986 | # CONFIG_R3964 is not set |
| 986 | # CONFIG_APPLICOM is not set | 987 | # CONFIG_APPLICOM is not set |
| 987 | # CONFIG_RAW_DRIVER is not set | 988 | # CONFIG_RAW_DRIVER is not set |
| @@ -1022,6 +1023,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1022 | CONFIG_I2C_MPC=y | 1023 | CONFIG_I2C_MPC=y |
| 1023 | # CONFIG_I2C_OCORES is not set | 1024 | # CONFIG_I2C_OCORES is not set |
| 1024 | # CONFIG_I2C_SIMTEC is not set | 1025 | # CONFIG_I2C_SIMTEC is not set |
| 1026 | # CONFIG_I2C_XILINX is not set | ||
| 1025 | 1027 | ||
| 1026 | # | 1028 | # |
| 1027 | # External I2C/SMBus adapter drivers | 1029 | # External I2C/SMBus adapter drivers |
| @@ -1035,15 +1037,9 @@ CONFIG_I2C_MPC=y | |||
| 1035 | # | 1037 | # |
| 1036 | # CONFIG_I2C_PCA_PLATFORM is not set | 1038 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1037 | # CONFIG_I2C_STUB is not set | 1039 | # CONFIG_I2C_STUB is not set |
| 1038 | |||
| 1039 | # | ||
| 1040 | # Miscellaneous I2C Chip support | ||
| 1041 | # | ||
| 1042 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1043 | # CONFIG_I2C_DEBUG_CORE is not set | 1040 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1044 | # CONFIG_I2C_DEBUG_ALGO is not set | 1041 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1045 | # CONFIG_I2C_DEBUG_BUS is not set | 1042 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1046 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1047 | # CONFIG_SPI is not set | 1043 | # CONFIG_SPI is not set |
| 1048 | 1044 | ||
| 1049 | # | 1045 | # |
| @@ -1058,14 +1054,18 @@ CONFIG_GPIOLIB=y | |||
| 1058 | # | 1054 | # |
| 1059 | # Memory mapped GPIO expanders: | 1055 | # Memory mapped GPIO expanders: |
| 1060 | # | 1056 | # |
| 1057 | # CONFIG_GPIO_IT8761E is not set | ||
| 1061 | # CONFIG_GPIO_XILINX is not set | 1058 | # CONFIG_GPIO_XILINX is not set |
| 1059 | # CONFIG_GPIO_SCH is not set | ||
| 1062 | 1060 | ||
| 1063 | # | 1061 | # |
| 1064 | # I2C GPIO expanders: | 1062 | # I2C GPIO expanders: |
| 1065 | # | 1063 | # |
| 1064 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1066 | # CONFIG_GPIO_MAX732X is not set | 1065 | # CONFIG_GPIO_MAX732X is not set |
| 1067 | # CONFIG_GPIO_PCA953X is not set | 1066 | # CONFIG_GPIO_PCA953X is not set |
| 1068 | # CONFIG_GPIO_PCF857X is not set | 1067 | # CONFIG_GPIO_PCF857X is not set |
| 1068 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1069 | 1069 | ||
| 1070 | # | 1070 | # |
| 1071 | # PCI GPIO expanders: | 1071 | # PCI GPIO expanders: |
| @@ -1098,10 +1098,11 @@ CONFIG_HWMON=y | |||
| 1098 | # CONFIG_SENSORS_ADM1029 is not set | 1098 | # CONFIG_SENSORS_ADM1029 is not set |
| 1099 | # CONFIG_SENSORS_ADM1031 is not set | 1099 | # CONFIG_SENSORS_ADM1031 is not set |
| 1100 | # CONFIG_SENSORS_ADM9240 is not set | 1100 | # CONFIG_SENSORS_ADM9240 is not set |
| 1101 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1101 | # CONFIG_SENSORS_ADT7462 is not set | 1102 | # CONFIG_SENSORS_ADT7462 is not set |
| 1102 | # CONFIG_SENSORS_ADT7470 is not set | 1103 | # CONFIG_SENSORS_ADT7470 is not set |
| 1103 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1104 | # CONFIG_SENSORS_ADT7475 is not set | 1104 | # CONFIG_SENSORS_ADT7475 is not set |
| 1105 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1105 | # CONFIG_SENSORS_ATXP1 is not set | 1106 | # CONFIG_SENSORS_ATXP1 is not set |
| 1106 | # CONFIG_SENSORS_DS1621 is not set | 1107 | # CONFIG_SENSORS_DS1621 is not set |
| 1107 | # CONFIG_SENSORS_I5K_AMB is not set | 1108 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1139,6 +1140,7 @@ CONFIG_HWMON=y | |||
| 1139 | # CONFIG_SENSORS_SMSC47M192 is not set | 1140 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1140 | # CONFIG_SENSORS_SMSC47B397 is not set | 1141 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1141 | # CONFIG_SENSORS_ADS7828 is not set | 1142 | # CONFIG_SENSORS_ADS7828 is not set |
| 1143 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1142 | # CONFIG_SENSORS_THMC50 is not set | 1144 | # CONFIG_SENSORS_THMC50 is not set |
| 1143 | # CONFIG_SENSORS_TMP401 is not set | 1145 | # CONFIG_SENSORS_TMP401 is not set |
| 1144 | # CONFIG_SENSORS_TMP421 is not set | 1146 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1186,19 +1188,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1186 | # Multifunction device drivers | 1188 | # Multifunction device drivers |
| 1187 | # | 1189 | # |
| 1188 | # CONFIG_MFD_CORE is not set | 1190 | # CONFIG_MFD_CORE is not set |
| 1191 | # CONFIG_MFD_88PM860X is not set | ||
| 1189 | # CONFIG_MFD_SM501 is not set | 1192 | # CONFIG_MFD_SM501 is not set |
| 1190 | # CONFIG_HTC_PASIC3 is not set | 1193 | # CONFIG_HTC_PASIC3 is not set |
| 1194 | # CONFIG_HTC_I2CPLD is not set | ||
| 1191 | # CONFIG_TPS65010 is not set | 1195 | # CONFIG_TPS65010 is not set |
| 1192 | # CONFIG_TWL4030_CORE is not set | 1196 | # CONFIG_TWL4030_CORE is not set |
| 1193 | # CONFIG_MFD_TMIO is not set | 1197 | # CONFIG_MFD_TMIO is not set |
| 1194 | # CONFIG_PMIC_DA903X is not set | 1198 | # CONFIG_PMIC_DA903X is not set |
| 1195 | # CONFIG_PMIC_ADP5520 is not set | 1199 | # CONFIG_PMIC_ADP5520 is not set |
| 1200 | # CONFIG_MFD_MAX8925 is not set | ||
| 1196 | # CONFIG_MFD_WM8400 is not set | 1201 | # CONFIG_MFD_WM8400 is not set |
| 1197 | # CONFIG_MFD_WM831X is not set | 1202 | # CONFIG_MFD_WM831X is not set |
| 1198 | # CONFIG_MFD_WM8350_I2C is not set | 1203 | # CONFIG_MFD_WM8350_I2C is not set |
| 1204 | # CONFIG_MFD_WM8994 is not set | ||
| 1199 | # CONFIG_MFD_PCF50633 is not set | 1205 | # CONFIG_MFD_PCF50633 is not set |
| 1200 | # CONFIG_AB3100_CORE is not set | 1206 | # CONFIG_AB3100_CORE is not set |
| 1201 | # CONFIG_MFD_88PM8607 is not set | 1207 | # CONFIG_MFD_TIMBERDALE is not set |
| 1208 | # CONFIG_LPC_SCH is not set | ||
| 1202 | # CONFIG_REGULATOR is not set | 1209 | # CONFIG_REGULATOR is not set |
| 1203 | # CONFIG_MEDIA_SUPPORT is not set | 1210 | # CONFIG_MEDIA_SUPPORT is not set |
| 1204 | 1211 | ||
| @@ -1207,6 +1214,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1207 | # | 1214 | # |
| 1208 | # CONFIG_AGP is not set | 1215 | # CONFIG_AGP is not set |
| 1209 | CONFIG_VGA_ARB=y | 1216 | CONFIG_VGA_ARB=y |
| 1217 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1210 | # CONFIG_DRM is not set | 1218 | # CONFIG_DRM is not set |
| 1211 | # CONFIG_VGASTATE is not set | 1219 | # CONFIG_VGASTATE is not set |
| 1212 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1220 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| @@ -1232,6 +1240,7 @@ CONFIG_USB_HID=y | |||
| 1232 | # | 1240 | # |
| 1233 | # Special HID drivers | 1241 | # Special HID drivers |
| 1234 | # | 1242 | # |
| 1243 | # CONFIG_HID_3M_PCT is not set | ||
| 1235 | CONFIG_HID_A4TECH=y | 1244 | CONFIG_HID_A4TECH=y |
| 1236 | CONFIG_HID_APPLE=y | 1245 | CONFIG_HID_APPLE=y |
| 1237 | CONFIG_HID_BELKIN=y | 1246 | CONFIG_HID_BELKIN=y |
| @@ -1247,14 +1256,19 @@ CONFIG_HID_GYRATION=y | |||
| 1247 | CONFIG_HID_LOGITECH=y | 1256 | CONFIG_HID_LOGITECH=y |
| 1248 | # CONFIG_LOGITECH_FF is not set | 1257 | # CONFIG_LOGITECH_FF is not set |
| 1249 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1258 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1259 | # CONFIG_LOGIG940_FF is not set | ||
| 1250 | CONFIG_HID_MICROSOFT=y | 1260 | CONFIG_HID_MICROSOFT=y |
| 1261 | # CONFIG_HID_MOSART is not set | ||
| 1251 | CONFIG_HID_MONTEREY=y | 1262 | CONFIG_HID_MONTEREY=y |
| 1252 | # CONFIG_HID_NTRIG is not set | 1263 | # CONFIG_HID_NTRIG is not set |
| 1264 | # CONFIG_HID_ORTEK is not set | ||
| 1253 | CONFIG_HID_PANTHERLORD=y | 1265 | CONFIG_HID_PANTHERLORD=y |
| 1254 | # CONFIG_PANTHERLORD_FF is not set | 1266 | # CONFIG_PANTHERLORD_FF is not set |
| 1255 | CONFIG_HID_PETALYNX=y | 1267 | CONFIG_HID_PETALYNX=y |
| 1268 | # CONFIG_HID_QUANTA is not set | ||
| 1256 | CONFIG_HID_SAMSUNG=y | 1269 | CONFIG_HID_SAMSUNG=y |
| 1257 | CONFIG_HID_SONY=y | 1270 | CONFIG_HID_SONY=y |
| 1271 | # CONFIG_HID_STANTUM is not set | ||
| 1258 | CONFIG_HID_SUNPLUS=y | 1272 | CONFIG_HID_SUNPLUS=y |
| 1259 | # CONFIG_HID_GREENASIA is not set | 1273 | # CONFIG_HID_GREENASIA is not set |
| 1260 | # CONFIG_HID_SMARTJOYPLUS is not set | 1274 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1344,7 +1358,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1344 | # CONFIG_USB_RIO500 is not set | 1358 | # CONFIG_USB_RIO500 is not set |
| 1345 | # CONFIG_USB_LEGOTOWER is not set | 1359 | # CONFIG_USB_LEGOTOWER is not set |
| 1346 | # CONFIG_USB_LCD is not set | 1360 | # CONFIG_USB_LCD is not set |
| 1347 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1348 | # CONFIG_USB_LED is not set | 1361 | # CONFIG_USB_LED is not set |
| 1349 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1362 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1350 | # CONFIG_USB_CYTHERM is not set | 1363 | # CONFIG_USB_CYTHERM is not set |
| @@ -1357,7 +1370,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1357 | # CONFIG_USB_IOWARRIOR is not set | 1370 | # CONFIG_USB_IOWARRIOR is not set |
| 1358 | # CONFIG_USB_TEST is not set | 1371 | # CONFIG_USB_TEST is not set |
| 1359 | # CONFIG_USB_ISIGHTFW is not set | 1372 | # CONFIG_USB_ISIGHTFW is not set |
| 1360 | # CONFIG_USB_VST is not set | ||
| 1361 | # CONFIG_USB_GADGET is not set | 1373 | # CONFIG_USB_GADGET is not set |
| 1362 | 1374 | ||
| 1363 | # | 1375 | # |
| @@ -1372,7 +1384,65 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 1372 | # CONFIG_ACCESSIBILITY is not set | 1384 | # CONFIG_ACCESSIBILITY is not set |
| 1373 | # CONFIG_INFINIBAND is not set | 1385 | # CONFIG_INFINIBAND is not set |
| 1374 | # CONFIG_EDAC is not set | 1386 | # CONFIG_EDAC is not set |
| 1375 | # CONFIG_RTC_CLASS is not set | 1387 | CONFIG_RTC_LIB=y |
| 1388 | CONFIG_RTC_CLASS=y | ||
| 1389 | CONFIG_RTC_HCTOSYS=y | ||
| 1390 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1391 | # CONFIG_RTC_DEBUG is not set | ||
| 1392 | |||
| 1393 | # | ||
| 1394 | # RTC interfaces | ||
| 1395 | # | ||
| 1396 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1397 | CONFIG_RTC_INTF_PROC=y | ||
| 1398 | CONFIG_RTC_INTF_DEV=y | ||
| 1399 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1400 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1401 | |||
| 1402 | # | ||
| 1403 | # I2C RTC drivers | ||
| 1404 | # | ||
| 1405 | CONFIG_RTC_DRV_DS1307=y | ||
| 1406 | CONFIG_RTC_DRV_DS1374=y | ||
| 1407 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1408 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1409 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1410 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1411 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1412 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1413 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1414 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1415 | # CONFIG_RTC_DRV_BQ32K is not set | ||
| 1416 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1417 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1418 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1419 | # CONFIG_RTC_DRV_RX8025 is not set | ||
| 1420 | |||
| 1421 | # | ||
| 1422 | # SPI RTC drivers | ||
| 1423 | # | ||
| 1424 | |||
| 1425 | # | ||
| 1426 | # Platform RTC drivers | ||
| 1427 | # | ||
| 1428 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1429 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1430 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1431 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1432 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1433 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1434 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1435 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1436 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1437 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
| 1438 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1439 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
| 1440 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1441 | |||
| 1442 | # | ||
| 1443 | # on-CPU RTC drivers | ||
| 1444 | # | ||
| 1445 | # CONFIG_RTC_DRV_GENERIC is not set | ||
| 1376 | # CONFIG_DMADEVICES is not set | 1446 | # CONFIG_DMADEVICES is not set |
| 1377 | # CONFIG_AUXDISPLAY is not set | 1447 | # CONFIG_AUXDISPLAY is not set |
| 1378 | # CONFIG_UIO is not set | 1448 | # CONFIG_UIO is not set |
| @@ -1453,6 +1523,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1453 | # CONFIG_BFS_FS is not set | 1523 | # CONFIG_BFS_FS is not set |
| 1454 | # CONFIG_EFS_FS is not set | 1524 | # CONFIG_EFS_FS is not set |
| 1455 | # CONFIG_JFFS2_FS is not set | 1525 | # CONFIG_JFFS2_FS is not set |
| 1526 | # CONFIG_LOGFS is not set | ||
| 1456 | # CONFIG_CRAMFS is not set | 1527 | # CONFIG_CRAMFS is not set |
| 1457 | # CONFIG_SQUASHFS is not set | 1528 | # CONFIG_SQUASHFS is not set |
| 1458 | # CONFIG_VXFS_FS is not set | 1529 | # CONFIG_VXFS_FS is not set |
| @@ -1479,6 +1550,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1479 | CONFIG_RPCSEC_GSS_KRB5=y | 1550 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1480 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1551 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1481 | # CONFIG_SMB_FS is not set | 1552 | # CONFIG_SMB_FS is not set |
| 1553 | # CONFIG_CEPH_FS is not set | ||
| 1482 | # CONFIG_CIFS is not set | 1554 | # CONFIG_CIFS is not set |
| 1483 | # CONFIG_NCP_FS is not set | 1555 | # CONFIG_NCP_FS is not set |
| 1484 | # CONFIG_CODA_FS is not set | 1556 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 8f35f8049c92..cfebef9f9123 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:06 2010 | 4 | # Mon Apr 19 23:16:31 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -68,6 +68,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 68 | # CONFIG_PPC_DCR_NATIVE is not set | 68 | # CONFIG_PPC_DCR_NATIVE is not set |
| 69 | # CONFIG_PPC_DCR_MMIO is not set | 69 | # CONFIG_PPC_DCR_MMIO is not set |
| 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 70 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 71 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 72 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 73 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 75 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 72 | CONFIG_CONSTRUCTORS=y | 76 | CONFIG_CONSTRUCTORS=y |
| 73 | 77 | ||
| @@ -103,14 +107,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 103 | CONFIG_IKCONFIG=y | 107 | CONFIG_IKCONFIG=y |
| 104 | CONFIG_IKCONFIG_PROC=y | 108 | CONFIG_IKCONFIG_PROC=y |
| 105 | CONFIG_LOG_BUF_SHIFT=14 | 109 | CONFIG_LOG_BUF_SHIFT=14 |
| 106 | CONFIG_GROUP_SCHED=y | ||
| 107 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 108 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 109 | CONFIG_USER_SCHED=y | ||
| 110 | # CONFIG_CGROUP_SCHED is not set | ||
| 111 | # CONFIG_CGROUPS is not set | 110 | # CONFIG_CGROUPS is not set |
| 112 | CONFIG_SYSFS_DEPRECATED=y | 111 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 113 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 114 | # CONFIG_RELAY is not set | 112 | # CONFIG_RELAY is not set |
| 115 | # CONFIG_NAMESPACES is not set | 113 | # CONFIG_NAMESPACES is not set |
| 116 | CONFIG_BLK_DEV_INITRD=y | 114 | CONFIG_BLK_DEV_INITRD=y |
| @@ -118,6 +116,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 118 | CONFIG_RD_GZIP=y | 116 | CONFIG_RD_GZIP=y |
| 119 | # CONFIG_RD_BZIP2 is not set | 117 | # CONFIG_RD_BZIP2 is not set |
| 120 | # CONFIG_RD_LZMA is not set | 118 | # CONFIG_RD_LZMA is not set |
| 119 | # CONFIG_RD_LZO is not set | ||
| 121 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 120 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 122 | CONFIG_SYSCTL=y | 121 | CONFIG_SYSCTL=y |
| 123 | CONFIG_ANON_INODES=y | 122 | CONFIG_ANON_INODES=y |
| @@ -334,6 +333,7 @@ CONFIG_ISA_DMA_API=y | |||
| 334 | # Bus options | 333 | # Bus options |
| 335 | # | 334 | # |
| 336 | CONFIG_ZONE_DMA=y | 335 | CONFIG_ZONE_DMA=y |
| 336 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 337 | CONFIG_GENERIC_ISA_DMA=y | 337 | CONFIG_GENERIC_ISA_DMA=y |
| 338 | CONFIG_PPC_INDIRECT_PCI=y | 338 | CONFIG_PPC_INDIRECT_PCI=y |
| 339 | CONFIG_FSL_SOC=y | 339 | CONFIG_FSL_SOC=y |
| @@ -345,7 +345,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 345 | # CONFIG_PCIEPORTBUS is not set | 345 | # CONFIG_PCIEPORTBUS is not set |
| 346 | CONFIG_ARCH_SUPPORTS_MSI=y | 346 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 347 | CONFIG_PCI_MSI=y | 347 | CONFIG_PCI_MSI=y |
| 348 | # CONFIG_PCI_LEGACY is not set | ||
| 349 | # CONFIG_PCI_DEBUG is not set | 348 | # CONFIG_PCI_DEBUG is not set |
| 350 | # CONFIG_PCI_STUB is not set | 349 | # CONFIG_PCI_STUB is not set |
| 351 | # CONFIG_PCI_IOV is not set | 350 | # CONFIG_PCI_IOV is not set |
| @@ -376,7 +375,6 @@ CONFIG_NET=y | |||
| 376 | # Networking options | 375 | # Networking options |
| 377 | # | 376 | # |
| 378 | CONFIG_PACKET=y | 377 | CONFIG_PACKET=y |
| 379 | # CONFIG_PACKET_MMAP is not set | ||
| 380 | CONFIG_UNIX=y | 378 | CONFIG_UNIX=y |
| 381 | CONFIG_XFRM=y | 379 | CONFIG_XFRM=y |
| 382 | CONFIG_XFRM_USER=y | 380 | CONFIG_XFRM_USER=y |
| @@ -509,6 +507,8 @@ CONFIG_EXTRA_FIRMWARE="" | |||
| 509 | # CONFIG_SYS_HYPERVISOR is not set | 507 | # CONFIG_SYS_HYPERVISOR is not set |
| 510 | # CONFIG_CONNECTOR is not set | 508 | # CONFIG_CONNECTOR is not set |
| 511 | # CONFIG_MTD is not set | 509 | # CONFIG_MTD is not set |
| 510 | CONFIG_OF_FLATTREE=y | ||
| 511 | CONFIG_OF_DYNAMIC=y | ||
| 512 | CONFIG_OF_DEVICE=y | 512 | CONFIG_OF_DEVICE=y |
| 513 | CONFIG_OF_GPIO=y | 513 | CONFIG_OF_GPIO=y |
| 514 | CONFIG_OF_I2C=y | 514 | CONFIG_OF_I2C=y |
| @@ -546,6 +546,7 @@ CONFIG_MISC_DEVICES=y | |||
| 546 | # CONFIG_ENCLOSURE_SERVICES is not set | 546 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 547 | # CONFIG_HP_ILO is not set | 547 | # CONFIG_HP_ILO is not set |
| 548 | # CONFIG_ISL29003 is not set | 548 | # CONFIG_ISL29003 is not set |
| 549 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 549 | # CONFIG_DS1682 is not set | 550 | # CONFIG_DS1682 is not set |
| 550 | # CONFIG_C2PORT is not set | 551 | # CONFIG_C2PORT is not set |
| 551 | 552 | ||
| @@ -563,6 +564,7 @@ CONFIG_HAVE_IDE=y | |||
| 563 | # | 564 | # |
| 564 | # SCSI device support | 565 | # SCSI device support |
| 565 | # | 566 | # |
| 567 | CONFIG_SCSI_MOD=y | ||
| 566 | # CONFIG_RAID_ATTRS is not set | 568 | # CONFIG_RAID_ATTRS is not set |
| 567 | CONFIG_SCSI=y | 569 | CONFIG_SCSI=y |
| 568 | CONFIG_SCSI_DMA=y | 570 | CONFIG_SCSI_DMA=y |
| @@ -687,6 +689,7 @@ CONFIG_PATA_ALI=y | |||
| 687 | # CONFIG_PATA_IT821X is not set | 689 | # CONFIG_PATA_IT821X is not set |
| 688 | # CONFIG_PATA_IT8213 is not set | 690 | # CONFIG_PATA_IT8213 is not set |
| 689 | # CONFIG_PATA_JMICRON is not set | 691 | # CONFIG_PATA_JMICRON is not set |
| 692 | # CONFIG_PATA_LEGACY is not set | ||
| 690 | # CONFIG_PATA_TRIFLEX is not set | 693 | # CONFIG_PATA_TRIFLEX is not set |
| 691 | # CONFIG_PATA_MARVELL is not set | 694 | # CONFIG_PATA_MARVELL is not set |
| 692 | # CONFIG_PATA_MPIIX is not set | 695 | # CONFIG_PATA_MPIIX is not set |
| @@ -817,8 +820,11 @@ CONFIG_NETDEV_10000=y | |||
| 817 | # CONFIG_CHELSIO_T1 is not set | 820 | # CONFIG_CHELSIO_T1 is not set |
| 818 | CONFIG_CHELSIO_T3_DEPENDS=y | 821 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 819 | # CONFIG_CHELSIO_T3 is not set | 822 | # CONFIG_CHELSIO_T3 is not set |
| 823 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 824 | # CONFIG_CHELSIO_T4 is not set | ||
| 820 | # CONFIG_ENIC is not set | 825 | # CONFIG_ENIC is not set |
| 821 | # CONFIG_IXGBE is not set | 826 | # CONFIG_IXGBE is not set |
| 827 | # CONFIG_IXGBEVF is not set | ||
| 822 | # CONFIG_IXGB is not set | 828 | # CONFIG_IXGB is not set |
| 823 | # CONFIG_S2IO is not set | 829 | # CONFIG_S2IO is not set |
| 824 | # CONFIG_VXGE is not set | 830 | # CONFIG_VXGE is not set |
| @@ -829,6 +835,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 829 | # CONFIG_MLX4_CORE is not set | 835 | # CONFIG_MLX4_CORE is not set |
| 830 | # CONFIG_TEHUTI is not set | 836 | # CONFIG_TEHUTI is not set |
| 831 | # CONFIG_BNX2X is not set | 837 | # CONFIG_BNX2X is not set |
| 838 | # CONFIG_QLCNIC is not set | ||
| 832 | # CONFIG_QLGE is not set | 839 | # CONFIG_QLGE is not set |
| 833 | # CONFIG_SFC is not set | 840 | # CONFIG_SFC is not set |
| 834 | # CONFIG_BE2NET is not set | 841 | # CONFIG_BE2NET is not set |
| @@ -941,6 +948,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 941 | # CONFIG_SERIAL_JSM is not set | 948 | # CONFIG_SERIAL_JSM is not set |
| 942 | # CONFIG_SERIAL_OF_PLATFORM is not set | 949 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 943 | CONFIG_SERIAL_QE=m | 950 | CONFIG_SERIAL_QE=m |
| 951 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 944 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 952 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 945 | CONFIG_UNIX98_PTYS=y | 953 | CONFIG_UNIX98_PTYS=y |
| 946 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 954 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -993,6 +1001,7 @@ CONFIG_I2C_CPM=m | |||
| 993 | CONFIG_I2C_MPC=y | 1001 | CONFIG_I2C_MPC=y |
| 994 | # CONFIG_I2C_OCORES is not set | 1002 | # CONFIG_I2C_OCORES is not set |
| 995 | # CONFIG_I2C_SIMTEC is not set | 1003 | # CONFIG_I2C_SIMTEC is not set |
| 1004 | # CONFIG_I2C_XILINX is not set | ||
| 996 | 1005 | ||
| 997 | # | 1006 | # |
| 998 | # External I2C/SMBus adapter drivers | 1007 | # External I2C/SMBus adapter drivers |
| @@ -1006,15 +1015,9 @@ CONFIG_I2C_MPC=y | |||
| 1006 | # | 1015 | # |
| 1007 | # CONFIG_I2C_PCA_PLATFORM is not set | 1016 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1008 | # CONFIG_I2C_STUB is not set | 1017 | # CONFIG_I2C_STUB is not set |
| 1009 | |||
| 1010 | # | ||
| 1011 | # Miscellaneous I2C Chip support | ||
| 1012 | # | ||
| 1013 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1014 | # CONFIG_I2C_DEBUG_CORE is not set | 1018 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1015 | # CONFIG_I2C_DEBUG_ALGO is not set | 1019 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1016 | # CONFIG_I2C_DEBUG_BUS is not set | 1020 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1017 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1018 | # CONFIG_SPI is not set | 1021 | # CONFIG_SPI is not set |
| 1019 | 1022 | ||
| 1020 | # | 1023 | # |
| @@ -1030,14 +1033,18 @@ CONFIG_GPIOLIB=y | |||
| 1030 | # | 1033 | # |
| 1031 | # Memory mapped GPIO expanders: | 1034 | # Memory mapped GPIO expanders: |
| 1032 | # | 1035 | # |
| 1036 | # CONFIG_GPIO_IT8761E is not set | ||
| 1033 | # CONFIG_GPIO_XILINX is not set | 1037 | # CONFIG_GPIO_XILINX is not set |
| 1038 | # CONFIG_GPIO_SCH is not set | ||
| 1034 | 1039 | ||
| 1035 | # | 1040 | # |
| 1036 | # I2C GPIO expanders: | 1041 | # I2C GPIO expanders: |
| 1037 | # | 1042 | # |
| 1043 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1038 | # CONFIG_GPIO_MAX732X is not set | 1044 | # CONFIG_GPIO_MAX732X is not set |
| 1039 | # CONFIG_GPIO_PCA953X is not set | 1045 | # CONFIG_GPIO_PCA953X is not set |
| 1040 | # CONFIG_GPIO_PCF857X is not set | 1046 | # CONFIG_GPIO_PCF857X is not set |
| 1047 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1041 | 1048 | ||
| 1042 | # | 1049 | # |
| 1043 | # PCI GPIO expanders: | 1050 | # PCI GPIO expanders: |
| @@ -1069,20 +1076,25 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1069 | # Multifunction device drivers | 1076 | # Multifunction device drivers |
| 1070 | # | 1077 | # |
| 1071 | # CONFIG_MFD_CORE is not set | 1078 | # CONFIG_MFD_CORE is not set |
| 1079 | # CONFIG_MFD_88PM860X is not set | ||
| 1072 | # CONFIG_MFD_SM501 is not set | 1080 | # CONFIG_MFD_SM501 is not set |
| 1073 | # CONFIG_HTC_PASIC3 is not set | 1081 | # CONFIG_HTC_PASIC3 is not set |
| 1082 | # CONFIG_HTC_I2CPLD is not set | ||
| 1074 | # CONFIG_UCB1400_CORE is not set | 1083 | # CONFIG_UCB1400_CORE is not set |
| 1075 | # CONFIG_TPS65010 is not set | 1084 | # CONFIG_TPS65010 is not set |
| 1076 | # CONFIG_TWL4030_CORE is not set | 1085 | # CONFIG_TWL4030_CORE is not set |
| 1077 | # CONFIG_MFD_TMIO is not set | 1086 | # CONFIG_MFD_TMIO is not set |
| 1078 | # CONFIG_PMIC_DA903X is not set | 1087 | # CONFIG_PMIC_DA903X is not set |
| 1079 | # CONFIG_PMIC_ADP5520 is not set | 1088 | # CONFIG_PMIC_ADP5520 is not set |
| 1089 | # CONFIG_MFD_MAX8925 is not set | ||
| 1080 | # CONFIG_MFD_WM8400 is not set | 1090 | # CONFIG_MFD_WM8400 is not set |
| 1081 | # CONFIG_MFD_WM831X is not set | 1091 | # CONFIG_MFD_WM831X is not set |
| 1082 | # CONFIG_MFD_WM8350_I2C is not set | 1092 | # CONFIG_MFD_WM8350_I2C is not set |
| 1093 | # CONFIG_MFD_WM8994 is not set | ||
| 1083 | # CONFIG_MFD_PCF50633 is not set | 1094 | # CONFIG_MFD_PCF50633 is not set |
| 1084 | # CONFIG_AB3100_CORE is not set | 1095 | # CONFIG_AB3100_CORE is not set |
| 1085 | # CONFIG_MFD_88PM8607 is not set | 1096 | # CONFIG_MFD_TIMBERDALE is not set |
| 1097 | # CONFIG_LPC_SCH is not set | ||
| 1086 | # CONFIG_REGULATOR is not set | 1098 | # CONFIG_REGULATOR is not set |
| 1087 | # CONFIG_MEDIA_SUPPORT is not set | 1099 | # CONFIG_MEDIA_SUPPORT is not set |
| 1088 | 1100 | ||
| @@ -1091,6 +1103,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1091 | # | 1103 | # |
| 1092 | # CONFIG_AGP is not set | 1104 | # CONFIG_AGP is not set |
| 1093 | CONFIG_VGA_ARB=y | 1105 | CONFIG_VGA_ARB=y |
| 1106 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1094 | # CONFIG_DRM is not set | 1107 | # CONFIG_DRM is not set |
| 1095 | # CONFIG_VGASTATE is not set | 1108 | # CONFIG_VGASTATE is not set |
| 1096 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1109 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1208,6 +1221,7 @@ CONFIG_SND_INTEL8X0=y | |||
| 1208 | CONFIG_SND_PPC=y | 1221 | CONFIG_SND_PPC=y |
| 1209 | CONFIG_SND_USB=y | 1222 | CONFIG_SND_USB=y |
| 1210 | # CONFIG_SND_USB_AUDIO is not set | 1223 | # CONFIG_SND_USB_AUDIO is not set |
| 1224 | # CONFIG_SND_USB_UA101 is not set | ||
| 1211 | # CONFIG_SND_USB_USX2Y is not set | 1225 | # CONFIG_SND_USB_USX2Y is not set |
| 1212 | # CONFIG_SND_USB_CAIAQ is not set | 1226 | # CONFIG_SND_USB_CAIAQ is not set |
| 1213 | # CONFIG_SND_SOC is not set | 1227 | # CONFIG_SND_SOC is not set |
| @@ -1227,6 +1241,7 @@ CONFIG_USB_HID=y | |||
| 1227 | # | 1241 | # |
| 1228 | # Special HID drivers | 1242 | # Special HID drivers |
| 1229 | # | 1243 | # |
| 1244 | # CONFIG_HID_3M_PCT is not set | ||
| 1230 | CONFIG_HID_A4TECH=y | 1245 | CONFIG_HID_A4TECH=y |
| 1231 | CONFIG_HID_APPLE=y | 1246 | CONFIG_HID_APPLE=y |
| 1232 | CONFIG_HID_BELKIN=y | 1247 | CONFIG_HID_BELKIN=y |
| @@ -1242,14 +1257,19 @@ CONFIG_HID_GYRATION=y | |||
| 1242 | CONFIG_HID_LOGITECH=y | 1257 | CONFIG_HID_LOGITECH=y |
| 1243 | # CONFIG_LOGITECH_FF is not set | 1258 | # CONFIG_LOGITECH_FF is not set |
| 1244 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1259 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1260 | # CONFIG_LOGIG940_FF is not set | ||
| 1245 | CONFIG_HID_MICROSOFT=y | 1261 | CONFIG_HID_MICROSOFT=y |
| 1262 | # CONFIG_HID_MOSART is not set | ||
| 1246 | CONFIG_HID_MONTEREY=y | 1263 | CONFIG_HID_MONTEREY=y |
| 1247 | # CONFIG_HID_NTRIG is not set | 1264 | # CONFIG_HID_NTRIG is not set |
| 1265 | # CONFIG_HID_ORTEK is not set | ||
| 1248 | CONFIG_HID_PANTHERLORD=y | 1266 | CONFIG_HID_PANTHERLORD=y |
| 1249 | # CONFIG_PANTHERLORD_FF is not set | 1267 | # CONFIG_PANTHERLORD_FF is not set |
| 1250 | CONFIG_HID_PETALYNX=y | 1268 | CONFIG_HID_PETALYNX=y |
| 1269 | # CONFIG_HID_QUANTA is not set | ||
| 1251 | CONFIG_HID_SAMSUNG=y | 1270 | CONFIG_HID_SAMSUNG=y |
| 1252 | CONFIG_HID_SONY=y | 1271 | CONFIG_HID_SONY=y |
| 1272 | # CONFIG_HID_STANTUM is not set | ||
| 1253 | CONFIG_HID_SUNPLUS=y | 1273 | CONFIG_HID_SUNPLUS=y |
| 1254 | # CONFIG_HID_GREENASIA is not set | 1274 | # CONFIG_HID_GREENASIA is not set |
| 1255 | # CONFIG_HID_SMARTJOYPLUS is not set | 1275 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1358,7 +1378,6 @@ CONFIG_USB_STORAGE=y | |||
| 1358 | # CONFIG_USB_RIO500 is not set | 1378 | # CONFIG_USB_RIO500 is not set |
| 1359 | # CONFIG_USB_LEGOTOWER is not set | 1379 | # CONFIG_USB_LEGOTOWER is not set |
| 1360 | # CONFIG_USB_LCD is not set | 1380 | # CONFIG_USB_LCD is not set |
| 1361 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1362 | # CONFIG_USB_LED is not set | 1381 | # CONFIG_USB_LED is not set |
| 1363 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1382 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1364 | # CONFIG_USB_CYTHERM is not set | 1383 | # CONFIG_USB_CYTHERM is not set |
| @@ -1371,7 +1390,6 @@ CONFIG_USB_STORAGE=y | |||
| 1371 | # CONFIG_USB_IOWARRIOR is not set | 1390 | # CONFIG_USB_IOWARRIOR is not set |
| 1372 | # CONFIG_USB_TEST is not set | 1391 | # CONFIG_USB_TEST is not set |
| 1373 | # CONFIG_USB_ISIGHTFW is not set | 1392 | # CONFIG_USB_ISIGHTFW is not set |
| 1374 | # CONFIG_USB_VST is not set | ||
| 1375 | # CONFIG_USB_GADGET is not set | 1393 | # CONFIG_USB_GADGET is not set |
| 1376 | 1394 | ||
| 1377 | # | 1395 | # |
| @@ -1452,6 +1470,7 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1452 | # | 1470 | # |
| 1453 | # CONFIG_RTC_DRV_GENERIC is not set | 1471 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1454 | CONFIG_DMADEVICES=y | 1472 | CONFIG_DMADEVICES=y |
| 1473 | # CONFIG_DMADEVICES_DEBUG is not set | ||
| 1455 | 1474 | ||
| 1456 | # | 1475 | # |
| 1457 | # DMA Devices | 1476 | # DMA Devices |
| @@ -1554,6 +1573,7 @@ CONFIG_BEFS_FS=m | |||
| 1554 | # CONFIG_BEFS_DEBUG is not set | 1573 | # CONFIG_BEFS_DEBUG is not set |
| 1555 | CONFIG_BFS_FS=m | 1574 | CONFIG_BFS_FS=m |
| 1556 | CONFIG_EFS_FS=m | 1575 | CONFIG_EFS_FS=m |
| 1576 | # CONFIG_LOGFS is not set | ||
| 1557 | CONFIG_CRAMFS=y | 1577 | CONFIG_CRAMFS=y |
| 1558 | # CONFIG_SQUASHFS is not set | 1578 | # CONFIG_SQUASHFS is not set |
| 1559 | CONFIG_VXFS_FS=m | 1579 | CONFIG_VXFS_FS=m |
| @@ -1585,6 +1605,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1585 | CONFIG_RPCSEC_GSS_KRB5=y | 1605 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1586 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1606 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1587 | # CONFIG_SMB_FS is not set | 1607 | # CONFIG_SMB_FS is not set |
| 1608 | # CONFIG_CEPH_FS is not set | ||
| 1588 | # CONFIG_CIFS is not set | 1609 | # CONFIG_CIFS is not set |
| 1589 | # CONFIG_NCP_FS is not set | 1610 | # CONFIG_NCP_FS is not set |
| 1590 | # CONFIG_CODA_FS is not set | 1611 | # CONFIG_CODA_FS is not set |
| @@ -1730,6 +1751,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1730 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1751 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1731 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1752 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1732 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 1753 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 1754 | # CONFIG_LKDTM is not set | ||
| 1733 | # CONFIG_FAULT_INJECTION is not set | 1755 | # CONFIG_FAULT_INJECTION is not set |
| 1734 | # CONFIG_LATENCYTOP is not set | 1756 | # CONFIG_LATENCYTOP is not set |
| 1735 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1757 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 8755ea3c7f5f..f5451d80f19b 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:07 2010 | 4 | # Mon Apr 19 23:16:31 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -69,6 +69,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
| 69 | # CONFIG_PPC_DCR_NATIVE is not set | 69 | # CONFIG_PPC_DCR_NATIVE is not set |
| 70 | # CONFIG_PPC_DCR_MMIO is not set | 70 | # CONFIG_PPC_DCR_MMIO is not set |
| 71 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 71 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| 72 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
| 73 | CONFIG_PPC_ADV_DEBUG_IACS=2 | ||
| 74 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
| 75 | CONFIG_PPC_ADV_DEBUG_DVCS=0 | ||
| 72 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 76 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 73 | CONFIG_CONSTRUCTORS=y | 77 | CONFIG_CONSTRUCTORS=y |
| 74 | 78 | ||
| @@ -100,18 +104,13 @@ CONFIG_TREE_RCU=y | |||
| 100 | # CONFIG_RCU_TRACE is not set | 104 | # CONFIG_RCU_TRACE is not set |
| 101 | CONFIG_RCU_FANOUT=32 | 105 | CONFIG_RCU_FANOUT=32 |
| 102 | # CONFIG_RCU_FANOUT_EXACT is not set | 106 | # CONFIG_RCU_FANOUT_EXACT is not set |
| 107 | # CONFIG_RCU_FAST_NO_HZ is not set | ||
| 103 | # CONFIG_TREE_RCU_TRACE is not set | 108 | # CONFIG_TREE_RCU_TRACE is not set |
| 104 | CONFIG_IKCONFIG=y | 109 | CONFIG_IKCONFIG=y |
| 105 | CONFIG_IKCONFIG_PROC=y | 110 | CONFIG_IKCONFIG_PROC=y |
| 106 | CONFIG_LOG_BUF_SHIFT=14 | 111 | CONFIG_LOG_BUF_SHIFT=14 |
| 107 | CONFIG_GROUP_SCHED=y | ||
| 108 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 109 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 110 | CONFIG_USER_SCHED=y | ||
| 111 | # CONFIG_CGROUP_SCHED is not set | ||
| 112 | # CONFIG_CGROUPS is not set | 112 | # CONFIG_CGROUPS is not set |
| 113 | CONFIG_SYSFS_DEPRECATED=y | 113 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 114 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 115 | # CONFIG_RELAY is not set | 114 | # CONFIG_RELAY is not set |
| 116 | # CONFIG_NAMESPACES is not set | 115 | # CONFIG_NAMESPACES is not set |
| 117 | CONFIG_BLK_DEV_INITRD=y | 116 | CONFIG_BLK_DEV_INITRD=y |
| @@ -119,6 +118,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 119 | CONFIG_RD_GZIP=y | 118 | CONFIG_RD_GZIP=y |
| 120 | # CONFIG_RD_BZIP2 is not set | 119 | # CONFIG_RD_BZIP2 is not set |
| 121 | # CONFIG_RD_LZMA is not set | 120 | # CONFIG_RD_LZMA is not set |
| 121 | # CONFIG_RD_LZO is not set | ||
| 122 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 122 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 123 | CONFIG_SYSCTL=y | 123 | CONFIG_SYSCTL=y |
| 124 | CONFIG_ANON_INODES=y | 124 | CONFIG_ANON_INODES=y |
| @@ -338,6 +338,7 @@ CONFIG_ISA_DMA_API=y | |||
| 338 | # Bus options | 338 | # Bus options |
| 339 | # | 339 | # |
| 340 | CONFIG_ZONE_DMA=y | 340 | CONFIG_ZONE_DMA=y |
| 341 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 341 | CONFIG_GENERIC_ISA_DMA=y | 342 | CONFIG_GENERIC_ISA_DMA=y |
| 342 | CONFIG_PPC_INDIRECT_PCI=y | 343 | CONFIG_PPC_INDIRECT_PCI=y |
| 343 | CONFIG_FSL_SOC=y | 344 | CONFIG_FSL_SOC=y |
| @@ -349,7 +350,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 349 | # CONFIG_PCIEPORTBUS is not set | 350 | # CONFIG_PCIEPORTBUS is not set |
| 350 | CONFIG_ARCH_SUPPORTS_MSI=y | 351 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 351 | CONFIG_PCI_MSI=y | 352 | CONFIG_PCI_MSI=y |
| 352 | # CONFIG_PCI_LEGACY is not set | ||
| 353 | # CONFIG_PCI_DEBUG is not set | 353 | # CONFIG_PCI_DEBUG is not set |
| 354 | # CONFIG_PCI_STUB is not set | 354 | # CONFIG_PCI_STUB is not set |
| 355 | # CONFIG_PCI_IOV is not set | 355 | # CONFIG_PCI_IOV is not set |
| @@ -380,7 +380,6 @@ CONFIG_NET=y | |||
| 380 | # Networking options | 380 | # Networking options |
| 381 | # | 381 | # |
| 382 | CONFIG_PACKET=y | 382 | CONFIG_PACKET=y |
| 383 | # CONFIG_PACKET_MMAP is not set | ||
| 384 | CONFIG_UNIX=y | 383 | CONFIG_UNIX=y |
| 385 | CONFIG_XFRM=y | 384 | CONFIG_XFRM=y |
| 386 | CONFIG_XFRM_USER=y | 385 | CONFIG_XFRM_USER=y |
| @@ -513,6 +512,8 @@ CONFIG_EXTRA_FIRMWARE="" | |||
| 513 | # CONFIG_SYS_HYPERVISOR is not set | 512 | # CONFIG_SYS_HYPERVISOR is not set |
| 514 | # CONFIG_CONNECTOR is not set | 513 | # CONFIG_CONNECTOR is not set |
| 515 | # CONFIG_MTD is not set | 514 | # CONFIG_MTD is not set |
| 515 | CONFIG_OF_FLATTREE=y | ||
| 516 | CONFIG_OF_DYNAMIC=y | ||
| 516 | CONFIG_OF_DEVICE=y | 517 | CONFIG_OF_DEVICE=y |
| 517 | CONFIG_OF_GPIO=y | 518 | CONFIG_OF_GPIO=y |
| 518 | CONFIG_OF_I2C=y | 519 | CONFIG_OF_I2C=y |
| @@ -550,6 +551,7 @@ CONFIG_MISC_DEVICES=y | |||
| 550 | # CONFIG_ENCLOSURE_SERVICES is not set | 551 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 551 | # CONFIG_HP_ILO is not set | 552 | # CONFIG_HP_ILO is not set |
| 552 | # CONFIG_ISL29003 is not set | 553 | # CONFIG_ISL29003 is not set |
| 554 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 553 | # CONFIG_DS1682 is not set | 555 | # CONFIG_DS1682 is not set |
| 554 | # CONFIG_C2PORT is not set | 556 | # CONFIG_C2PORT is not set |
| 555 | 557 | ||
| @@ -567,6 +569,7 @@ CONFIG_HAVE_IDE=y | |||
| 567 | # | 569 | # |
| 568 | # SCSI device support | 570 | # SCSI device support |
| 569 | # | 571 | # |
| 572 | CONFIG_SCSI_MOD=y | ||
| 570 | # CONFIG_RAID_ATTRS is not set | 573 | # CONFIG_RAID_ATTRS is not set |
| 571 | CONFIG_SCSI=y | 574 | CONFIG_SCSI=y |
| 572 | CONFIG_SCSI_DMA=y | 575 | CONFIG_SCSI_DMA=y |
| @@ -691,6 +694,7 @@ CONFIG_PATA_ALI=y | |||
| 691 | # CONFIG_PATA_IT821X is not set | 694 | # CONFIG_PATA_IT821X is not set |
| 692 | # CONFIG_PATA_IT8213 is not set | 695 | # CONFIG_PATA_IT8213 is not set |
| 693 | # CONFIG_PATA_JMICRON is not set | 696 | # CONFIG_PATA_JMICRON is not set |
| 697 | # CONFIG_PATA_LEGACY is not set | ||
| 694 | # CONFIG_PATA_TRIFLEX is not set | 698 | # CONFIG_PATA_TRIFLEX is not set |
| 695 | # CONFIG_PATA_MARVELL is not set | 699 | # CONFIG_PATA_MARVELL is not set |
| 696 | # CONFIG_PATA_MPIIX is not set | 700 | # CONFIG_PATA_MPIIX is not set |
| @@ -821,8 +825,11 @@ CONFIG_NETDEV_10000=y | |||
| 821 | # CONFIG_CHELSIO_T1 is not set | 825 | # CONFIG_CHELSIO_T1 is not set |
| 822 | CONFIG_CHELSIO_T3_DEPENDS=y | 826 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 823 | # CONFIG_CHELSIO_T3 is not set | 827 | # CONFIG_CHELSIO_T3 is not set |
| 828 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 829 | # CONFIG_CHELSIO_T4 is not set | ||
| 824 | # CONFIG_ENIC is not set | 830 | # CONFIG_ENIC is not set |
| 825 | # CONFIG_IXGBE is not set | 831 | # CONFIG_IXGBE is not set |
| 832 | # CONFIG_IXGBEVF is not set | ||
| 826 | # CONFIG_IXGB is not set | 833 | # CONFIG_IXGB is not set |
| 827 | # CONFIG_S2IO is not set | 834 | # CONFIG_S2IO is not set |
| 828 | # CONFIG_VXGE is not set | 835 | # CONFIG_VXGE is not set |
| @@ -833,6 +840,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 833 | # CONFIG_MLX4_CORE is not set | 840 | # CONFIG_MLX4_CORE is not set |
| 834 | # CONFIG_TEHUTI is not set | 841 | # CONFIG_TEHUTI is not set |
| 835 | # CONFIG_BNX2X is not set | 842 | # CONFIG_BNX2X is not set |
| 843 | # CONFIG_QLCNIC is not set | ||
| 836 | # CONFIG_QLGE is not set | 844 | # CONFIG_QLGE is not set |
| 837 | # CONFIG_SFC is not set | 845 | # CONFIG_SFC is not set |
| 838 | # CONFIG_BE2NET is not set | 846 | # CONFIG_BE2NET is not set |
| @@ -945,6 +953,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 945 | # CONFIG_SERIAL_JSM is not set | 953 | # CONFIG_SERIAL_JSM is not set |
| 946 | # CONFIG_SERIAL_OF_PLATFORM is not set | 954 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 947 | CONFIG_SERIAL_QE=m | 955 | CONFIG_SERIAL_QE=m |
| 956 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 948 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 957 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 949 | CONFIG_UNIX98_PTYS=y | 958 | CONFIG_UNIX98_PTYS=y |
| 950 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 959 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -997,6 +1006,7 @@ CONFIG_I2C_CPM=m | |||
| 997 | CONFIG_I2C_MPC=y | 1006 | CONFIG_I2C_MPC=y |
| 998 | # CONFIG_I2C_OCORES is not set | 1007 | # CONFIG_I2C_OCORES is not set |
| 999 | # CONFIG_I2C_SIMTEC is not set | 1008 | # CONFIG_I2C_SIMTEC is not set |
| 1009 | # CONFIG_I2C_XILINX is not set | ||
| 1000 | 1010 | ||
| 1001 | # | 1011 | # |
| 1002 | # External I2C/SMBus adapter drivers | 1012 | # External I2C/SMBus adapter drivers |
| @@ -1010,15 +1020,9 @@ CONFIG_I2C_MPC=y | |||
| 1010 | # | 1020 | # |
| 1011 | # CONFIG_I2C_PCA_PLATFORM is not set | 1021 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1012 | # CONFIG_I2C_STUB is not set | 1022 | # CONFIG_I2C_STUB is not set |
| 1013 | |||
| 1014 | # | ||
| 1015 | # Miscellaneous I2C Chip support | ||
| 1016 | # | ||
| 1017 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1018 | # CONFIG_I2C_DEBUG_CORE is not set | 1023 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1019 | # CONFIG_I2C_DEBUG_ALGO is not set | 1024 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1020 | # CONFIG_I2C_DEBUG_BUS is not set | 1025 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1021 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1022 | # CONFIG_SPI is not set | 1026 | # CONFIG_SPI is not set |
| 1023 | 1027 | ||
| 1024 | # | 1028 | # |
| @@ -1034,14 +1038,18 @@ CONFIG_GPIOLIB=y | |||
| 1034 | # | 1038 | # |
| 1035 | # Memory mapped GPIO expanders: | 1039 | # Memory mapped GPIO expanders: |
| 1036 | # | 1040 | # |
| 1041 | # CONFIG_GPIO_IT8761E is not set | ||
| 1037 | # CONFIG_GPIO_XILINX is not set | 1042 | # CONFIG_GPIO_XILINX is not set |
| 1043 | # CONFIG_GPIO_SCH is not set | ||
| 1038 | 1044 | ||
| 1039 | # | 1045 | # |
| 1040 | # I2C GPIO expanders: | 1046 | # I2C GPIO expanders: |
| 1041 | # | 1047 | # |
| 1048 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1042 | # CONFIG_GPIO_MAX732X is not set | 1049 | # CONFIG_GPIO_MAX732X is not set |
| 1043 | # CONFIG_GPIO_PCA953X is not set | 1050 | # CONFIG_GPIO_PCA953X is not set |
| 1044 | # CONFIG_GPIO_PCF857X is not set | 1051 | # CONFIG_GPIO_PCF857X is not set |
| 1052 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1045 | 1053 | ||
| 1046 | # | 1054 | # |
| 1047 | # PCI GPIO expanders: | 1055 | # PCI GPIO expanders: |
| @@ -1073,20 +1081,25 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1073 | # Multifunction device drivers | 1081 | # Multifunction device drivers |
| 1074 | # | 1082 | # |
| 1075 | # CONFIG_MFD_CORE is not set | 1083 | # CONFIG_MFD_CORE is not set |
| 1084 | # CONFIG_MFD_88PM860X is not set | ||
| 1076 | # CONFIG_MFD_SM501 is not set | 1085 | # CONFIG_MFD_SM501 is not set |
| 1077 | # CONFIG_HTC_PASIC3 is not set | 1086 | # CONFIG_HTC_PASIC3 is not set |
| 1087 | # CONFIG_HTC_I2CPLD is not set | ||
| 1078 | # CONFIG_UCB1400_CORE is not set | 1088 | # CONFIG_UCB1400_CORE is not set |
| 1079 | # CONFIG_TPS65010 is not set | 1089 | # CONFIG_TPS65010 is not set |
| 1080 | # CONFIG_TWL4030_CORE is not set | 1090 | # CONFIG_TWL4030_CORE is not set |
| 1081 | # CONFIG_MFD_TMIO is not set | 1091 | # CONFIG_MFD_TMIO is not set |
| 1082 | # CONFIG_PMIC_DA903X is not set | 1092 | # CONFIG_PMIC_DA903X is not set |
| 1083 | # CONFIG_PMIC_ADP5520 is not set | 1093 | # CONFIG_PMIC_ADP5520 is not set |
| 1094 | # CONFIG_MFD_MAX8925 is not set | ||
| 1084 | # CONFIG_MFD_WM8400 is not set | 1095 | # CONFIG_MFD_WM8400 is not set |
| 1085 | # CONFIG_MFD_WM831X is not set | 1096 | # CONFIG_MFD_WM831X is not set |
| 1086 | # CONFIG_MFD_WM8350_I2C is not set | 1097 | # CONFIG_MFD_WM8350_I2C is not set |
| 1098 | # CONFIG_MFD_WM8994 is not set | ||
| 1087 | # CONFIG_MFD_PCF50633 is not set | 1099 | # CONFIG_MFD_PCF50633 is not set |
| 1088 | # CONFIG_AB3100_CORE is not set | 1100 | # CONFIG_AB3100_CORE is not set |
| 1089 | # CONFIG_MFD_88PM8607 is not set | 1101 | # CONFIG_MFD_TIMBERDALE is not set |
| 1102 | # CONFIG_LPC_SCH is not set | ||
| 1090 | # CONFIG_REGULATOR is not set | 1103 | # CONFIG_REGULATOR is not set |
| 1091 | # CONFIG_MEDIA_SUPPORT is not set | 1104 | # CONFIG_MEDIA_SUPPORT is not set |
| 1092 | 1105 | ||
| @@ -1095,6 +1108,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1095 | # | 1108 | # |
| 1096 | # CONFIG_AGP is not set | 1109 | # CONFIG_AGP is not set |
| 1097 | CONFIG_VGA_ARB=y | 1110 | CONFIG_VGA_ARB=y |
| 1111 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1098 | # CONFIG_DRM is not set | 1112 | # CONFIG_DRM is not set |
| 1099 | # CONFIG_VGASTATE is not set | 1113 | # CONFIG_VGASTATE is not set |
| 1100 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1114 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1212,6 +1226,7 @@ CONFIG_SND_INTEL8X0=y | |||
| 1212 | CONFIG_SND_PPC=y | 1226 | CONFIG_SND_PPC=y |
| 1213 | CONFIG_SND_USB=y | 1227 | CONFIG_SND_USB=y |
| 1214 | # CONFIG_SND_USB_AUDIO is not set | 1228 | # CONFIG_SND_USB_AUDIO is not set |
| 1229 | # CONFIG_SND_USB_UA101 is not set | ||
| 1215 | # CONFIG_SND_USB_USX2Y is not set | 1230 | # CONFIG_SND_USB_USX2Y is not set |
| 1216 | # CONFIG_SND_USB_CAIAQ is not set | 1231 | # CONFIG_SND_USB_CAIAQ is not set |
| 1217 | # CONFIG_SND_SOC is not set | 1232 | # CONFIG_SND_SOC is not set |
| @@ -1231,6 +1246,7 @@ CONFIG_USB_HID=y | |||
| 1231 | # | 1246 | # |
| 1232 | # Special HID drivers | 1247 | # Special HID drivers |
| 1233 | # | 1248 | # |
| 1249 | # CONFIG_HID_3M_PCT is not set | ||
| 1234 | CONFIG_HID_A4TECH=y | 1250 | CONFIG_HID_A4TECH=y |
| 1235 | CONFIG_HID_APPLE=y | 1251 | CONFIG_HID_APPLE=y |
| 1236 | CONFIG_HID_BELKIN=y | 1252 | CONFIG_HID_BELKIN=y |
| @@ -1246,14 +1262,19 @@ CONFIG_HID_GYRATION=y | |||
| 1246 | CONFIG_HID_LOGITECH=y | 1262 | CONFIG_HID_LOGITECH=y |
| 1247 | # CONFIG_LOGITECH_FF is not set | 1263 | # CONFIG_LOGITECH_FF is not set |
| 1248 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1264 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1265 | # CONFIG_LOGIG940_FF is not set | ||
| 1249 | CONFIG_HID_MICROSOFT=y | 1266 | CONFIG_HID_MICROSOFT=y |
| 1267 | # CONFIG_HID_MOSART is not set | ||
| 1250 | CONFIG_HID_MONTEREY=y | 1268 | CONFIG_HID_MONTEREY=y |
| 1251 | # CONFIG_HID_NTRIG is not set | 1269 | # CONFIG_HID_NTRIG is not set |
| 1270 | # CONFIG_HID_ORTEK is not set | ||
| 1252 | CONFIG_HID_PANTHERLORD=y | 1271 | CONFIG_HID_PANTHERLORD=y |
| 1253 | # CONFIG_PANTHERLORD_FF is not set | 1272 | # CONFIG_PANTHERLORD_FF is not set |
| 1254 | CONFIG_HID_PETALYNX=y | 1273 | CONFIG_HID_PETALYNX=y |
| 1274 | # CONFIG_HID_QUANTA is not set | ||
| 1255 | CONFIG_HID_SAMSUNG=y | 1275 | CONFIG_HID_SAMSUNG=y |
| 1256 | CONFIG_HID_SONY=y | 1276 | CONFIG_HID_SONY=y |
| 1277 | # CONFIG_HID_STANTUM is not set | ||
| 1257 | CONFIG_HID_SUNPLUS=y | 1278 | CONFIG_HID_SUNPLUS=y |
| 1258 | # CONFIG_HID_GREENASIA is not set | 1279 | # CONFIG_HID_GREENASIA is not set |
| 1259 | # CONFIG_HID_SMARTJOYPLUS is not set | 1280 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1362,7 +1383,6 @@ CONFIG_USB_STORAGE=y | |||
| 1362 | # CONFIG_USB_RIO500 is not set | 1383 | # CONFIG_USB_RIO500 is not set |
| 1363 | # CONFIG_USB_LEGOTOWER is not set | 1384 | # CONFIG_USB_LEGOTOWER is not set |
| 1364 | # CONFIG_USB_LCD is not set | 1385 | # CONFIG_USB_LCD is not set |
| 1365 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1366 | # CONFIG_USB_LED is not set | 1386 | # CONFIG_USB_LED is not set |
| 1367 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1387 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1368 | # CONFIG_USB_CYTHERM is not set | 1388 | # CONFIG_USB_CYTHERM is not set |
| @@ -1375,7 +1395,6 @@ CONFIG_USB_STORAGE=y | |||
| 1375 | # CONFIG_USB_IOWARRIOR is not set | 1395 | # CONFIG_USB_IOWARRIOR is not set |
| 1376 | # CONFIG_USB_TEST is not set | 1396 | # CONFIG_USB_TEST is not set |
| 1377 | # CONFIG_USB_ISIGHTFW is not set | 1397 | # CONFIG_USB_ISIGHTFW is not set |
| 1378 | # CONFIG_USB_VST is not set | ||
| 1379 | # CONFIG_USB_GADGET is not set | 1398 | # CONFIG_USB_GADGET is not set |
| 1380 | 1399 | ||
| 1381 | # | 1400 | # |
| @@ -1456,6 +1475,7 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1456 | # | 1475 | # |
| 1457 | # CONFIG_RTC_DRV_GENERIC is not set | 1476 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1458 | CONFIG_DMADEVICES=y | 1477 | CONFIG_DMADEVICES=y |
| 1478 | # CONFIG_DMADEVICES_DEBUG is not set | ||
| 1459 | 1479 | ||
| 1460 | # | 1480 | # |
| 1461 | # DMA Devices | 1481 | # DMA Devices |
| @@ -1558,6 +1578,7 @@ CONFIG_BEFS_FS=m | |||
| 1558 | # CONFIG_BEFS_DEBUG is not set | 1578 | # CONFIG_BEFS_DEBUG is not set |
| 1559 | CONFIG_BFS_FS=m | 1579 | CONFIG_BFS_FS=m |
| 1560 | CONFIG_EFS_FS=m | 1580 | CONFIG_EFS_FS=m |
| 1581 | # CONFIG_LOGFS is not set | ||
| 1561 | CONFIG_CRAMFS=y | 1582 | CONFIG_CRAMFS=y |
| 1562 | # CONFIG_SQUASHFS is not set | 1583 | # CONFIG_SQUASHFS is not set |
| 1563 | CONFIG_VXFS_FS=m | 1584 | CONFIG_VXFS_FS=m |
| @@ -1589,6 +1610,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1589 | CONFIG_RPCSEC_GSS_KRB5=y | 1610 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1590 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1611 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1591 | # CONFIG_SMB_FS is not set | 1612 | # CONFIG_SMB_FS is not set |
| 1613 | # CONFIG_CEPH_FS is not set | ||
| 1592 | # CONFIG_CIFS is not set | 1614 | # CONFIG_CIFS is not set |
| 1593 | # CONFIG_NCP_FS is not set | 1615 | # CONFIG_NCP_FS is not set |
| 1594 | # CONFIG_CODA_FS is not set | 1616 | # CONFIG_CODA_FS is not set |
| @@ -1734,6 +1756,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1734 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1756 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1735 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1757 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1736 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 1758 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
| 1759 | # CONFIG_LKDTM is not set | ||
| 1737 | # CONFIG_FAULT_INJECTION is not set | 1760 | # CONFIG_FAULT_INJECTION is not set |
| 1738 | # CONFIG_LATENCYTOP is not set | 1761 | # CONFIG_LATENCYTOP is not set |
| 1739 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1762 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| @@ -1806,6 +1829,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1806 | CONFIG_CRYPTO_MANAGER2=y | 1829 | CONFIG_CRYPTO_MANAGER2=y |
| 1807 | # CONFIG_CRYPTO_GF128MUL is not set | 1830 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1808 | # CONFIG_CRYPTO_NULL is not set | 1831 | # CONFIG_CRYPTO_NULL is not set |
| 1832 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1809 | CONFIG_CRYPTO_WORKQUEUE=y | 1833 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1810 | # CONFIG_CRYPTO_CRYPTD is not set | 1834 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1811 | CONFIG_CRYPTO_AUTHENC=y | 1835 | CONFIG_CRYPTO_AUTHENC=y |
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 3f6b11b6f4f3..d8d3d1d60c84 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:08 2010 | 4 | # Mon Apr 19 23:16:32 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -89,14 +89,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 89 | # CONFIG_TREE_RCU_TRACE is not set | 89 | # CONFIG_TREE_RCU_TRACE is not set |
| 90 | # CONFIG_IKCONFIG is not set | 90 | # CONFIG_IKCONFIG is not set |
| 91 | CONFIG_LOG_BUF_SHIFT=14 | 91 | CONFIG_LOG_BUF_SHIFT=14 |
| 92 | CONFIG_GROUP_SCHED=y | ||
| 93 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 94 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 95 | CONFIG_USER_SCHED=y | ||
| 96 | # CONFIG_CGROUP_SCHED is not set | ||
| 97 | # CONFIG_CGROUPS is not set | 92 | # CONFIG_CGROUPS is not set |
| 98 | CONFIG_SYSFS_DEPRECATED=y | 93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 99 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 100 | # CONFIG_RELAY is not set | 94 | # CONFIG_RELAY is not set |
| 101 | # CONFIG_NAMESPACES is not set | 95 | # CONFIG_NAMESPACES is not set |
| 102 | # CONFIG_BLK_DEV_INITRD is not set | 96 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -305,6 +299,7 @@ CONFIG_ISA_DMA_API=y | |||
| 305 | # Bus options | 299 | # Bus options |
| 306 | # | 300 | # |
| 307 | CONFIG_ZONE_DMA=y | 301 | CONFIG_ZONE_DMA=y |
| 302 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 308 | CONFIG_FSL_SOC=y | 303 | CONFIG_FSL_SOC=y |
| 309 | # CONFIG_PCI is not set | 304 | # CONFIG_PCI is not set |
| 310 | # CONFIG_PCI_DOMAINS is not set | 305 | # CONFIG_PCI_DOMAINS is not set |
| @@ -333,7 +328,6 @@ CONFIG_NET=y | |||
| 333 | # Networking options | 328 | # Networking options |
| 334 | # | 329 | # |
| 335 | CONFIG_PACKET=y | 330 | CONFIG_PACKET=y |
| 336 | # CONFIG_PACKET_MMAP is not set | ||
| 337 | CONFIG_UNIX=y | 331 | CONFIG_UNIX=y |
| 338 | CONFIG_XFRM=y | 332 | CONFIG_XFRM=y |
| 339 | # CONFIG_XFRM_USER is not set | 333 | # CONFIG_XFRM_USER is not set |
| @@ -425,6 +419,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 425 | # CONFIG_SYS_HYPERVISOR is not set | 419 | # CONFIG_SYS_HYPERVISOR is not set |
| 426 | # CONFIG_CONNECTOR is not set | 420 | # CONFIG_CONNECTOR is not set |
| 427 | # CONFIG_MTD is not set | 421 | # CONFIG_MTD is not set |
| 422 | CONFIG_OF_FLATTREE=y | ||
| 423 | CONFIG_OF_DYNAMIC=y | ||
| 428 | CONFIG_OF_DEVICE=y | 424 | CONFIG_OF_DEVICE=y |
| 429 | CONFIG_OF_MDIO=y | 425 | CONFIG_OF_MDIO=y |
| 430 | # CONFIG_PARPORT is not set | 426 | # CONFIG_PARPORT is not set |
| @@ -456,6 +452,7 @@ CONFIG_HAVE_IDE=y | |||
| 456 | # | 452 | # |
| 457 | # SCSI device support | 453 | # SCSI device support |
| 458 | # | 454 | # |
| 455 | CONFIG_SCSI_MOD=y | ||
| 459 | # CONFIG_RAID_ATTRS is not set | 456 | # CONFIG_RAID_ATTRS is not set |
| 460 | # CONFIG_SCSI is not set | 457 | # CONFIG_SCSI is not set |
| 461 | # CONFIG_SCSI_DMA is not set | 458 | # CONFIG_SCSI_DMA is not set |
| @@ -607,6 +604,7 @@ CONFIG_SERIAL_CORE=y | |||
| 607 | CONFIG_SERIAL_CORE_CONSOLE=y | 604 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 608 | CONFIG_SERIAL_CPM=y | 605 | CONFIG_SERIAL_CPM=y |
| 609 | CONFIG_SERIAL_CPM_CONSOLE=y | 606 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 607 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 610 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 608 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 611 | CONFIG_UNIX98_PTYS=y | 609 | CONFIG_UNIX98_PTYS=y |
| 612 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 610 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -795,6 +793,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 795 | # CONFIG_BEFS_FS is not set | 793 | # CONFIG_BEFS_FS is not set |
| 796 | # CONFIG_BFS_FS is not set | 794 | # CONFIG_BFS_FS is not set |
| 797 | # CONFIG_EFS_FS is not set | 795 | # CONFIG_EFS_FS is not set |
| 796 | # CONFIG_LOGFS is not set | ||
| 798 | CONFIG_CRAMFS=y | 797 | CONFIG_CRAMFS=y |
| 799 | # CONFIG_SQUASHFS is not set | 798 | # CONFIG_SQUASHFS is not set |
| 800 | # CONFIG_VXFS_FS is not set | 799 | # CONFIG_VXFS_FS is not set |
| @@ -819,6 +818,7 @@ CONFIG_SUNRPC=y | |||
| 819 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 818 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 820 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 819 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 821 | # CONFIG_SMB_FS is not set | 820 | # CONFIG_SMB_FS is not set |
| 821 | # CONFIG_CEPH_FS is not set | ||
| 822 | # CONFIG_CIFS is not set | 822 | # CONFIG_CIFS is not set |
| 823 | # CONFIG_NCP_FS is not set | 823 | # CONFIG_NCP_FS is not set |
| 824 | # CONFIG_CODA_FS is not set | 824 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig index 41884c97a4f3..624eae9a7e20 100644 --- a/arch/powerpc/configs/mpc86xx_defconfig +++ b/arch/powerpc/configs/mpc86xx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:09 2010 | 4 | # Mon Apr 19 23:16:33 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -98,18 +98,13 @@ CONFIG_TREE_RCU=y | |||
| 98 | # CONFIG_RCU_TRACE is not set | 98 | # CONFIG_RCU_TRACE is not set |
| 99 | CONFIG_RCU_FANOUT=32 | 99 | CONFIG_RCU_FANOUT=32 |
| 100 | # CONFIG_RCU_FANOUT_EXACT is not set | 100 | # CONFIG_RCU_FANOUT_EXACT is not set |
| 101 | # CONFIG_RCU_FAST_NO_HZ is not set | ||
| 101 | # CONFIG_TREE_RCU_TRACE is not set | 102 | # CONFIG_TREE_RCU_TRACE is not set |
| 102 | CONFIG_IKCONFIG=y | 103 | CONFIG_IKCONFIG=y |
| 103 | CONFIG_IKCONFIG_PROC=y | 104 | CONFIG_IKCONFIG_PROC=y |
| 104 | CONFIG_LOG_BUF_SHIFT=14 | 105 | CONFIG_LOG_BUF_SHIFT=14 |
| 105 | CONFIG_GROUP_SCHED=y | ||
| 106 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 107 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 108 | CONFIG_USER_SCHED=y | ||
| 109 | # CONFIG_CGROUP_SCHED is not set | ||
| 110 | # CONFIG_CGROUPS is not set | 106 | # CONFIG_CGROUPS is not set |
| 111 | CONFIG_SYSFS_DEPRECATED=y | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 112 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 113 | # CONFIG_RELAY is not set | 108 | # CONFIG_RELAY is not set |
| 114 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
| 115 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
| @@ -117,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 117 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 118 | # CONFIG_RD_BZIP2 is not set | 113 | # CONFIG_RD_BZIP2 is not set |
| 119 | # CONFIG_RD_LZMA is not set | 114 | # CONFIG_RD_LZMA is not set |
| 115 | # CONFIG_RD_LZO is not set | ||
| 120 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 121 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 122 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -328,6 +324,7 @@ CONFIG_ISA_DMA_API=y | |||
| 328 | # Bus options | 324 | # Bus options |
| 329 | # | 325 | # |
| 330 | CONFIG_ZONE_DMA=y | 326 | CONFIG_ZONE_DMA=y |
| 327 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 331 | CONFIG_GENERIC_ISA_DMA=y | 328 | CONFIG_GENERIC_ISA_DMA=y |
| 332 | CONFIG_PPC_INDIRECT_PCI=y | 329 | CONFIG_PPC_INDIRECT_PCI=y |
| 333 | CONFIG_FSL_SOC=y | 330 | CONFIG_FSL_SOC=y |
| @@ -339,7 +336,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 339 | # CONFIG_PCIEPORTBUS is not set | 336 | # CONFIG_PCIEPORTBUS is not set |
| 340 | CONFIG_ARCH_SUPPORTS_MSI=y | 337 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 341 | # CONFIG_PCI_MSI is not set | 338 | # CONFIG_PCI_MSI is not set |
| 342 | # CONFIG_PCI_LEGACY is not set | ||
| 343 | # CONFIG_PCI_DEBUG is not set | 339 | # CONFIG_PCI_DEBUG is not set |
| 344 | # CONFIG_PCI_STUB is not set | 340 | # CONFIG_PCI_STUB is not set |
| 345 | # CONFIG_PCI_IOV is not set | 341 | # CONFIG_PCI_IOV is not set |
| @@ -367,7 +363,6 @@ CONFIG_NET=y | |||
| 367 | # Networking options | 363 | # Networking options |
| 368 | # | 364 | # |
| 369 | CONFIG_PACKET=y | 365 | CONFIG_PACKET=y |
| 370 | # CONFIG_PACKET_MMAP is not set | ||
| 371 | CONFIG_UNIX=y | 366 | CONFIG_UNIX=y |
| 372 | CONFIG_XFRM=y | 367 | CONFIG_XFRM=y |
| 373 | CONFIG_XFRM_USER=y | 368 | CONFIG_XFRM_USER=y |
| @@ -500,6 +495,8 @@ CONFIG_EXTRA_FIRMWARE="" | |||
| 500 | # CONFIG_SYS_HYPERVISOR is not set | 495 | # CONFIG_SYS_HYPERVISOR is not set |
| 501 | # CONFIG_CONNECTOR is not set | 496 | # CONFIG_CONNECTOR is not set |
| 502 | # CONFIG_MTD is not set | 497 | # CONFIG_MTD is not set |
| 498 | CONFIG_OF_FLATTREE=y | ||
| 499 | CONFIG_OF_DYNAMIC=y | ||
| 503 | CONFIG_OF_DEVICE=y | 500 | CONFIG_OF_DEVICE=y |
| 504 | CONFIG_OF_GPIO=y | 501 | CONFIG_OF_GPIO=y |
| 505 | CONFIG_OF_I2C=y | 502 | CONFIG_OF_I2C=y |
| @@ -537,6 +534,7 @@ CONFIG_MISC_DEVICES=y | |||
| 537 | # CONFIG_ENCLOSURE_SERVICES is not set | 534 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 538 | # CONFIG_HP_ILO is not set | 535 | # CONFIG_HP_ILO is not set |
| 539 | # CONFIG_ISL29003 is not set | 536 | # CONFIG_ISL29003 is not set |
| 537 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 540 | # CONFIG_DS1682 is not set | 538 | # CONFIG_DS1682 is not set |
| 541 | # CONFIG_C2PORT is not set | 539 | # CONFIG_C2PORT is not set |
| 542 | 540 | ||
| @@ -554,6 +552,7 @@ CONFIG_HAVE_IDE=y | |||
| 554 | # | 552 | # |
| 555 | # SCSI device support | 553 | # SCSI device support |
| 556 | # | 554 | # |
| 555 | CONFIG_SCSI_MOD=y | ||
| 557 | # CONFIG_RAID_ATTRS is not set | 556 | # CONFIG_RAID_ATTRS is not set |
| 558 | CONFIG_SCSI=y | 557 | CONFIG_SCSI=y |
| 559 | CONFIG_SCSI_DMA=y | 558 | CONFIG_SCSI_DMA=y |
| @@ -678,6 +677,7 @@ CONFIG_PATA_ALI=y | |||
| 678 | # CONFIG_PATA_IT821X is not set | 677 | # CONFIG_PATA_IT821X is not set |
| 679 | # CONFIG_PATA_IT8213 is not set | 678 | # CONFIG_PATA_IT8213 is not set |
| 680 | # CONFIG_PATA_JMICRON is not set | 679 | # CONFIG_PATA_JMICRON is not set |
| 680 | # CONFIG_PATA_LEGACY is not set | ||
| 681 | # CONFIG_PATA_TRIFLEX is not set | 681 | # CONFIG_PATA_TRIFLEX is not set |
| 682 | # CONFIG_PATA_MARVELL is not set | 682 | # CONFIG_PATA_MARVELL is not set |
| 683 | # CONFIG_PATA_MPIIX is not set | 683 | # CONFIG_PATA_MPIIX is not set |
| @@ -802,6 +802,8 @@ CONFIG_NETDEV_10000=y | |||
| 802 | # CONFIG_CHELSIO_T1 is not set | 802 | # CONFIG_CHELSIO_T1 is not set |
| 803 | CONFIG_CHELSIO_T3_DEPENDS=y | 803 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 804 | # CONFIG_CHELSIO_T3 is not set | 804 | # CONFIG_CHELSIO_T3 is not set |
| 805 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 806 | # CONFIG_CHELSIO_T4 is not set | ||
| 805 | # CONFIG_ENIC is not set | 807 | # CONFIG_ENIC is not set |
| 806 | # CONFIG_IXGBE is not set | 808 | # CONFIG_IXGBE is not set |
| 807 | # CONFIG_IXGB is not set | 809 | # CONFIG_IXGB is not set |
| @@ -814,6 +816,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 814 | # CONFIG_MLX4_CORE is not set | 816 | # CONFIG_MLX4_CORE is not set |
| 815 | # CONFIG_TEHUTI is not set | 817 | # CONFIG_TEHUTI is not set |
| 816 | # CONFIG_BNX2X is not set | 818 | # CONFIG_BNX2X is not set |
| 819 | # CONFIG_QLCNIC is not set | ||
| 817 | # CONFIG_QLGE is not set | 820 | # CONFIG_QLGE is not set |
| 818 | # CONFIG_SFC is not set | 821 | # CONFIG_SFC is not set |
| 819 | # CONFIG_BE2NET is not set | 822 | # CONFIG_BE2NET is not set |
| @@ -923,6 +926,7 @@ CONFIG_SERIAL_CORE=y | |||
| 923 | CONFIG_SERIAL_CORE_CONSOLE=y | 926 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 924 | # CONFIG_SERIAL_JSM is not set | 927 | # CONFIG_SERIAL_JSM is not set |
| 925 | # CONFIG_SERIAL_OF_PLATFORM is not set | 928 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 929 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 926 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 930 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 927 | CONFIG_UNIX98_PTYS=y | 931 | CONFIG_UNIX98_PTYS=y |
| 928 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 932 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -972,6 +976,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 972 | CONFIG_I2C_MPC=y | 976 | CONFIG_I2C_MPC=y |
| 973 | # CONFIG_I2C_OCORES is not set | 977 | # CONFIG_I2C_OCORES is not set |
| 974 | # CONFIG_I2C_SIMTEC is not set | 978 | # CONFIG_I2C_SIMTEC is not set |
| 979 | # CONFIG_I2C_XILINX is not set | ||
| 975 | 980 | ||
| 976 | # | 981 | # |
| 977 | # External I2C/SMBus adapter drivers | 982 | # External I2C/SMBus adapter drivers |
| @@ -985,15 +990,9 @@ CONFIG_I2C_MPC=y | |||
| 985 | # | 990 | # |
| 986 | # CONFIG_I2C_PCA_PLATFORM is not set | 991 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 987 | # CONFIG_I2C_STUB is not set | 992 | # CONFIG_I2C_STUB is not set |
| 988 | |||
| 989 | # | ||
| 990 | # Miscellaneous I2C Chip support | ||
| 991 | # | ||
| 992 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 993 | # CONFIG_I2C_DEBUG_CORE is not set | 993 | # CONFIG_I2C_DEBUG_CORE is not set |
| 994 | # CONFIG_I2C_DEBUG_ALGO is not set | 994 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 995 | # CONFIG_I2C_DEBUG_BUS is not set | 995 | # CONFIG_I2C_DEBUG_BUS is not set |
| 996 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 997 | # CONFIG_SPI is not set | 996 | # CONFIG_SPI is not set |
| 998 | 997 | ||
| 999 | # | 998 | # |
| @@ -1009,14 +1008,18 @@ CONFIG_GPIOLIB=y | |||
| 1009 | # | 1008 | # |
| 1010 | # Memory mapped GPIO expanders: | 1009 | # Memory mapped GPIO expanders: |
| 1011 | # | 1010 | # |
| 1011 | # CONFIG_GPIO_IT8761E is not set | ||
| 1012 | # CONFIG_GPIO_XILINX is not set | 1012 | # CONFIG_GPIO_XILINX is not set |
| 1013 | # CONFIG_GPIO_SCH is not set | ||
| 1013 | 1014 | ||
| 1014 | # | 1015 | # |
| 1015 | # I2C GPIO expanders: | 1016 | # I2C GPIO expanders: |
| 1016 | # | 1017 | # |
| 1018 | # CONFIG_GPIO_MAX7300 is not set | ||
| 1017 | # CONFIG_GPIO_MAX732X is not set | 1019 | # CONFIG_GPIO_MAX732X is not set |
| 1018 | # CONFIG_GPIO_PCA953X is not set | 1020 | # CONFIG_GPIO_PCA953X is not set |
| 1019 | # CONFIG_GPIO_PCF857X is not set | 1021 | # CONFIG_GPIO_PCF857X is not set |
| 1022 | # CONFIG_GPIO_ADP5588 is not set | ||
| 1020 | 1023 | ||
| 1021 | # | 1024 | # |
| 1022 | # PCI GPIO expanders: | 1025 | # PCI GPIO expanders: |
| @@ -1048,20 +1051,25 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1048 | # Multifunction device drivers | 1051 | # Multifunction device drivers |
| 1049 | # | 1052 | # |
| 1050 | # CONFIG_MFD_CORE is not set | 1053 | # CONFIG_MFD_CORE is not set |
| 1054 | # CONFIG_MFD_88PM860X is not set | ||
| 1051 | # CONFIG_MFD_SM501 is not set | 1055 | # CONFIG_MFD_SM501 is not set |
| 1052 | # CONFIG_HTC_PASIC3 is not set | 1056 | # CONFIG_HTC_PASIC3 is not set |
| 1057 | # CONFIG_HTC_I2CPLD is not set | ||
| 1053 | # CONFIG_UCB1400_CORE is not set | 1058 | # CONFIG_UCB1400_CORE is not set |
| 1054 | # CONFIG_TPS65010 is not set | 1059 | # CONFIG_TPS65010 is not set |
| 1055 | # CONFIG_TWL4030_CORE is not set | 1060 | # CONFIG_TWL4030_CORE is not set |
| 1056 | # CONFIG_MFD_TMIO is not set | 1061 | # CONFIG_MFD_TMIO is not set |
| 1057 | # CONFIG_PMIC_DA903X is not set | 1062 | # CONFIG_PMIC_DA903X is not set |
| 1058 | # CONFIG_PMIC_ADP5520 is not set | 1063 | # CONFIG_PMIC_ADP5520 is not set |
| 1064 | # CONFIG_MFD_MAX8925 is not set | ||
| 1059 | # CONFIG_MFD_WM8400 is not set | 1065 | # CONFIG_MFD_WM8400 is not set |
| 1060 | # CONFIG_MFD_WM831X is not set | 1066 | # CONFIG_MFD_WM831X is not set |
| 1061 | # CONFIG_MFD_WM8350_I2C is not set | 1067 | # CONFIG_MFD_WM8350_I2C is not set |
| 1068 | # CONFIG_MFD_WM8994 is not set | ||
| 1062 | # CONFIG_MFD_PCF50633 is not set | 1069 | # CONFIG_MFD_PCF50633 is not set |
| 1063 | # CONFIG_AB3100_CORE is not set | 1070 | # CONFIG_AB3100_CORE is not set |
| 1064 | # CONFIG_MFD_88PM8607 is not set | 1071 | # CONFIG_MFD_TIMBERDALE is not set |
| 1072 | # CONFIG_LPC_SCH is not set | ||
| 1065 | # CONFIG_REGULATOR is not set | 1073 | # CONFIG_REGULATOR is not set |
| 1066 | # CONFIG_MEDIA_SUPPORT is not set | 1074 | # CONFIG_MEDIA_SUPPORT is not set |
| 1067 | 1075 | ||
| @@ -1070,6 +1078,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1070 | # | 1078 | # |
| 1071 | # CONFIG_AGP is not set | 1079 | # CONFIG_AGP is not set |
| 1072 | CONFIG_VGA_ARB=y | 1080 | CONFIG_VGA_ARB=y |
| 1081 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1073 | # CONFIG_DRM is not set | 1082 | # CONFIG_DRM is not set |
| 1074 | # CONFIG_VGASTATE is not set | 1083 | # CONFIG_VGASTATE is not set |
| 1075 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1084 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1187,6 +1196,7 @@ CONFIG_SND_INTEL8X0=y | |||
| 1187 | CONFIG_SND_PPC=y | 1196 | CONFIG_SND_PPC=y |
| 1188 | CONFIG_SND_USB=y | 1197 | CONFIG_SND_USB=y |
| 1189 | # CONFIG_SND_USB_AUDIO is not set | 1198 | # CONFIG_SND_USB_AUDIO is not set |
| 1199 | # CONFIG_SND_USB_UA101 is not set | ||
| 1190 | # CONFIG_SND_USB_USX2Y is not set | 1200 | # CONFIG_SND_USB_USX2Y is not set |
| 1191 | # CONFIG_SND_USB_CAIAQ is not set | 1201 | # CONFIG_SND_USB_CAIAQ is not set |
| 1192 | # CONFIG_SND_SOC is not set | 1202 | # CONFIG_SND_SOC is not set |
| @@ -1206,6 +1216,7 @@ CONFIG_USB_HID=y | |||
| 1206 | # | 1216 | # |
| 1207 | # Special HID drivers | 1217 | # Special HID drivers |
| 1208 | # | 1218 | # |
| 1219 | # CONFIG_HID_3M_PCT is not set | ||
| 1209 | CONFIG_HID_A4TECH=y | 1220 | CONFIG_HID_A4TECH=y |
| 1210 | CONFIG_HID_APPLE=y | 1221 | CONFIG_HID_APPLE=y |
| 1211 | CONFIG_HID_BELKIN=y | 1222 | CONFIG_HID_BELKIN=y |
| @@ -1221,14 +1232,19 @@ CONFIG_HID_GYRATION=y | |||
| 1221 | CONFIG_HID_LOGITECH=y | 1232 | CONFIG_HID_LOGITECH=y |
| 1222 | # CONFIG_LOGITECH_FF is not set | 1233 | # CONFIG_LOGITECH_FF is not set |
| 1223 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1234 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1235 | # CONFIG_LOGIG940_FF is not set | ||
| 1224 | CONFIG_HID_MICROSOFT=y | 1236 | CONFIG_HID_MICROSOFT=y |
| 1237 | # CONFIG_HID_MOSART is not set | ||
| 1225 | CONFIG_HID_MONTEREY=y | 1238 | CONFIG_HID_MONTEREY=y |
| 1226 | # CONFIG_HID_NTRIG is not set | 1239 | # CONFIG_HID_NTRIG is not set |
| 1240 | # CONFIG_HID_ORTEK is not set | ||
| 1227 | CONFIG_HID_PANTHERLORD=y | 1241 | CONFIG_HID_PANTHERLORD=y |
| 1228 | # CONFIG_PANTHERLORD_FF is not set | 1242 | # CONFIG_PANTHERLORD_FF is not set |
| 1229 | CONFIG_HID_PETALYNX=y | 1243 | CONFIG_HID_PETALYNX=y |
| 1244 | # CONFIG_HID_QUANTA is not set | ||
| 1230 | CONFIG_HID_SAMSUNG=y | 1245 | CONFIG_HID_SAMSUNG=y |
| 1231 | CONFIG_HID_SONY=y | 1246 | CONFIG_HID_SONY=y |
| 1247 | # CONFIG_HID_STANTUM is not set | ||
| 1232 | CONFIG_HID_SUNPLUS=y | 1248 | CONFIG_HID_SUNPLUS=y |
| 1233 | # CONFIG_HID_GREENASIA is not set | 1249 | # CONFIG_HID_GREENASIA is not set |
| 1234 | # CONFIG_HID_SMARTJOYPLUS is not set | 1250 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1336,7 +1352,6 @@ CONFIG_USB_STORAGE=y | |||
| 1336 | # CONFIG_USB_RIO500 is not set | 1352 | # CONFIG_USB_RIO500 is not set |
| 1337 | # CONFIG_USB_LEGOTOWER is not set | 1353 | # CONFIG_USB_LEGOTOWER is not set |
| 1338 | # CONFIG_USB_LCD is not set | 1354 | # CONFIG_USB_LCD is not set |
| 1339 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1340 | # CONFIG_USB_LED is not set | 1355 | # CONFIG_USB_LED is not set |
| 1341 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1356 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1342 | # CONFIG_USB_CYTHERM is not set | 1357 | # CONFIG_USB_CYTHERM is not set |
| @@ -1349,7 +1364,6 @@ CONFIG_USB_STORAGE=y | |||
| 1349 | # CONFIG_USB_IOWARRIOR is not set | 1364 | # CONFIG_USB_IOWARRIOR is not set |
| 1350 | # CONFIG_USB_TEST is not set | 1365 | # CONFIG_USB_TEST is not set |
| 1351 | # CONFIG_USB_ISIGHTFW is not set | 1366 | # CONFIG_USB_ISIGHTFW is not set |
| 1352 | # CONFIG_USB_VST is not set | ||
| 1353 | # CONFIG_USB_GADGET is not set | 1367 | # CONFIG_USB_GADGET is not set |
| 1354 | 1368 | ||
| 1355 | # | 1369 | # |
| @@ -1512,6 +1526,7 @@ CONFIG_BEFS_FS=m | |||
| 1512 | # CONFIG_BEFS_DEBUG is not set | 1526 | # CONFIG_BEFS_DEBUG is not set |
| 1513 | CONFIG_BFS_FS=m | 1527 | CONFIG_BFS_FS=m |
| 1514 | CONFIG_EFS_FS=m | 1528 | CONFIG_EFS_FS=m |
| 1529 | # CONFIG_LOGFS is not set | ||
| 1515 | CONFIG_CRAMFS=y | 1530 | CONFIG_CRAMFS=y |
| 1516 | # CONFIG_SQUASHFS is not set | 1531 | # CONFIG_SQUASHFS is not set |
| 1517 | CONFIG_VXFS_FS=m | 1532 | CONFIG_VXFS_FS=m |
| @@ -1543,6 +1558,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1543 | CONFIG_RPCSEC_GSS_KRB5=y | 1558 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1544 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1559 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1545 | # CONFIG_SMB_FS is not set | 1560 | # CONFIG_SMB_FS is not set |
| 1561 | # CONFIG_CEPH_FS is not set | ||
| 1546 | # CONFIG_CIFS is not set | 1562 | # CONFIG_CIFS is not set |
| 1547 | # CONFIG_NCP_FS is not set | 1563 | # CONFIG_NCP_FS is not set |
| 1548 | # CONFIG_CODA_FS is not set | 1564 | # CONFIG_CODA_FS is not set |
| @@ -1754,6 +1770,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1754 | CONFIG_CRYPTO_MANAGER2=y | 1770 | CONFIG_CRYPTO_MANAGER2=y |
| 1755 | # CONFIG_CRYPTO_GF128MUL is not set | 1771 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1756 | # CONFIG_CRYPTO_NULL is not set | 1772 | # CONFIG_CRYPTO_NULL is not set |
| 1773 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1757 | CONFIG_CRYPTO_WORKQUEUE=y | 1774 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1758 | # CONFIG_CRYPTO_CRYPTD is not set | 1775 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1759 | # CONFIG_CRYPTO_AUTHENC is not set | 1776 | # CONFIG_CRYPTO_AUTHENC is not set |
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 6b9e6bd2c98d..45bd499630d0 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:10 2010 | 4 | # Mon Apr 19 23:16:34 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -90,14 +90,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 90 | # CONFIG_TREE_RCU_TRACE is not set | 90 | # CONFIG_TREE_RCU_TRACE is not set |
| 91 | # CONFIG_IKCONFIG is not set | 91 | # CONFIG_IKCONFIG is not set |
| 92 | CONFIG_LOG_BUF_SHIFT=14 | 92 | CONFIG_LOG_BUF_SHIFT=14 |
| 93 | CONFIG_GROUP_SCHED=y | ||
| 94 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 95 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 96 | CONFIG_USER_SCHED=y | ||
| 97 | # CONFIG_CGROUP_SCHED is not set | ||
| 98 | # CONFIG_CGROUPS is not set | 93 | # CONFIG_CGROUPS is not set |
| 99 | CONFIG_SYSFS_DEPRECATED=y | 94 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 100 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 101 | # CONFIG_RELAY is not set | 95 | # CONFIG_RELAY is not set |
| 102 | # CONFIG_NAMESPACES is not set | 96 | # CONFIG_NAMESPACES is not set |
| 103 | # CONFIG_BLK_DEV_INITRD is not set | 97 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -313,6 +307,7 @@ CONFIG_ISA_DMA_API=y | |||
| 313 | # Bus options | 307 | # Bus options |
| 314 | # | 308 | # |
| 315 | CONFIG_ZONE_DMA=y | 309 | CONFIG_ZONE_DMA=y |
| 310 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 316 | CONFIG_FSL_SOC=y | 311 | CONFIG_FSL_SOC=y |
| 317 | # CONFIG_PCI is not set | 312 | # CONFIG_PCI is not set |
| 318 | # CONFIG_PCI_DOMAINS is not set | 313 | # CONFIG_PCI_DOMAINS is not set |
| @@ -342,7 +337,6 @@ CONFIG_NET=y | |||
| 342 | # Networking options | 337 | # Networking options |
| 343 | # | 338 | # |
| 344 | CONFIG_PACKET=y | 339 | CONFIG_PACKET=y |
| 345 | # CONFIG_PACKET_MMAP is not set | ||
| 346 | CONFIG_UNIX=y | 340 | CONFIG_UNIX=y |
| 347 | # CONFIG_NET_KEY is not set | 341 | # CONFIG_NET_KEY is not set |
| 348 | CONFIG_INET=y | 342 | CONFIG_INET=y |
| @@ -515,6 +509,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 515 | # UBI - Unsorted block images | 509 | # UBI - Unsorted block images |
| 516 | # | 510 | # |
| 517 | # CONFIG_MTD_UBI is not set | 511 | # CONFIG_MTD_UBI is not set |
| 512 | CONFIG_OF_FLATTREE=y | ||
| 513 | CONFIG_OF_DYNAMIC=y | ||
| 518 | CONFIG_OF_DEVICE=y | 514 | CONFIG_OF_DEVICE=y |
| 519 | CONFIG_OF_MDIO=y | 515 | CONFIG_OF_MDIO=y |
| 520 | # CONFIG_PARPORT is not set | 516 | # CONFIG_PARPORT is not set |
| @@ -526,6 +522,7 @@ CONFIG_HAVE_IDE=y | |||
| 526 | # | 522 | # |
| 527 | # SCSI device support | 523 | # SCSI device support |
| 528 | # | 524 | # |
| 525 | CONFIG_SCSI_MOD=y | ||
| 529 | # CONFIG_RAID_ATTRS is not set | 526 | # CONFIG_RAID_ATTRS is not set |
| 530 | # CONFIG_SCSI is not set | 527 | # CONFIG_SCSI is not set |
| 531 | # CONFIG_SCSI_DMA is not set | 528 | # CONFIG_SCSI_DMA is not set |
| @@ -627,6 +624,7 @@ CONFIG_SERIAL_CORE=y | |||
| 627 | CONFIG_SERIAL_CORE_CONSOLE=y | 624 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 628 | CONFIG_SERIAL_CPM=y | 625 | CONFIG_SERIAL_CPM=y |
| 629 | CONFIG_SERIAL_CPM_CONSOLE=y | 626 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 627 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 630 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 628 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 631 | CONFIG_UNIX98_PTYS=y | 629 | CONFIG_UNIX98_PTYS=y |
| 632 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 630 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -764,6 +762,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 764 | # CONFIG_BFS_FS is not set | 762 | # CONFIG_BFS_FS is not set |
| 765 | # CONFIG_EFS_FS is not set | 763 | # CONFIG_EFS_FS is not set |
| 766 | # CONFIG_JFFS2_FS is not set | 764 | # CONFIG_JFFS2_FS is not set |
| 765 | # CONFIG_LOGFS is not set | ||
| 767 | CONFIG_CRAMFS=y | 766 | CONFIG_CRAMFS=y |
| 768 | # CONFIG_SQUASHFS is not set | 767 | # CONFIG_SQUASHFS is not set |
| 769 | # CONFIG_VXFS_FS is not set | 768 | # CONFIG_VXFS_FS is not set |
| @@ -788,6 +787,7 @@ CONFIG_SUNRPC=y | |||
| 788 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 787 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 789 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 788 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 790 | # CONFIG_SMB_FS is not set | 789 | # CONFIG_SMB_FS is not set |
| 790 | # CONFIG_CEPH_FS is not set | ||
| 791 | # CONFIG_CIFS is not set | 791 | # CONFIG_CIFS is not set |
| 792 | # CONFIG_NCP_FS is not set | 792 | # CONFIG_NCP_FS is not set |
| 793 | # CONFIG_CODA_FS is not set | 793 | # CONFIG_CODA_FS is not set |
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 5d06f2cb8e5e..68c175ea427a 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:11 2010 | 4 | # Mon Apr 19 23:16:35 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -105,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 105 | CONFIG_RD_GZIP=y | 105 | CONFIG_RD_GZIP=y |
| 106 | # CONFIG_RD_BZIP2 is not set | 106 | # CONFIG_RD_BZIP2 is not set |
| 107 | # CONFIG_RD_LZMA is not set | 107 | # CONFIG_RD_LZMA is not set |
| 108 | # CONFIG_RD_LZO is not set | ||
| 108 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 109 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 109 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
| 110 | CONFIG_ANON_INODES=y | 111 | CONFIG_ANON_INODES=y |
| @@ -304,6 +305,7 @@ CONFIG_ISA_DMA_API=y | |||
| 304 | # Bus options | 305 | # Bus options |
| 305 | # | 306 | # |
| 306 | CONFIG_ZONE_DMA=y | 307 | CONFIG_ZONE_DMA=y |
| 308 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 307 | CONFIG_PPC_INDIRECT_PCI=y | 309 | CONFIG_PPC_INDIRECT_PCI=y |
| 308 | CONFIG_FSL_SOC=y | 310 | CONFIG_FSL_SOC=y |
| 309 | CONFIG_PPC_PCI_CHOICE=y | 311 | CONFIG_PPC_PCI_CHOICE=y |
| @@ -315,7 +317,6 @@ CONFIG_PCI_8260=y | |||
| 315 | # CONFIG_PCIEPORTBUS is not set | 317 | # CONFIG_PCIEPORTBUS is not set |
| 316 | CONFIG_ARCH_SUPPORTS_MSI=y | 318 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 317 | # CONFIG_PCI_MSI is not set | 319 | # CONFIG_PCI_MSI is not set |
| 318 | # CONFIG_PCI_LEGACY is not set | ||
| 319 | # CONFIG_PCI_DEBUG is not set | 320 | # CONFIG_PCI_DEBUG is not set |
| 320 | # CONFIG_PCI_STUB is not set | 321 | # CONFIG_PCI_STUB is not set |
| 321 | # CONFIG_PCI_IOV is not set | 322 | # CONFIG_PCI_IOV is not set |
| @@ -342,7 +343,6 @@ CONFIG_NET=y | |||
| 342 | # Networking options | 343 | # Networking options |
| 343 | # | 344 | # |
| 344 | CONFIG_PACKET=y | 345 | CONFIG_PACKET=y |
| 345 | # CONFIG_PACKET_MMAP is not set | ||
| 346 | CONFIG_UNIX=y | 346 | CONFIG_UNIX=y |
| 347 | CONFIG_XFRM=y | 347 | CONFIG_XFRM=y |
| 348 | # CONFIG_XFRM_USER is not set | 348 | # CONFIG_XFRM_USER is not set |
| @@ -544,6 +544,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 544 | # UBI - Unsorted block images | 544 | # UBI - Unsorted block images |
| 545 | # | 545 | # |
| 546 | # CONFIG_MTD_UBI is not set | 546 | # CONFIG_MTD_UBI is not set |
| 547 | CONFIG_OF_FLATTREE=y | ||
| 548 | CONFIG_OF_DYNAMIC=y | ||
| 547 | CONFIG_OF_DEVICE=y | 549 | CONFIG_OF_DEVICE=y |
| 548 | CONFIG_OF_GPIO=y | 550 | CONFIG_OF_GPIO=y |
| 549 | CONFIG_OF_MDIO=y | 551 | CONFIG_OF_MDIO=y |
| @@ -629,6 +631,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 629 | # | 631 | # |
| 630 | # SCSI device support | 632 | # SCSI device support |
| 631 | # | 633 | # |
| 634 | CONFIG_SCSI_MOD=y | ||
| 632 | # CONFIG_RAID_ATTRS is not set | 635 | # CONFIG_RAID_ATTRS is not set |
| 633 | # CONFIG_SCSI is not set | 636 | # CONFIG_SCSI is not set |
| 634 | # CONFIG_SCSI_DMA is not set | 637 | # CONFIG_SCSI_DMA is not set |
| @@ -734,6 +737,8 @@ CONFIG_NETDEV_10000=y | |||
| 734 | # CONFIG_CHELSIO_T1 is not set | 737 | # CONFIG_CHELSIO_T1 is not set |
| 735 | CONFIG_CHELSIO_T3_DEPENDS=y | 738 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 736 | # CONFIG_CHELSIO_T3 is not set | 739 | # CONFIG_CHELSIO_T3 is not set |
| 740 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 741 | # CONFIG_CHELSIO_T4 is not set | ||
| 737 | # CONFIG_ENIC is not set | 742 | # CONFIG_ENIC is not set |
| 738 | # CONFIG_IXGBE is not set | 743 | # CONFIG_IXGBE is not set |
| 739 | # CONFIG_IXGB is not set | 744 | # CONFIG_IXGB is not set |
| @@ -746,6 +751,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 746 | # CONFIG_MLX4_CORE is not set | 751 | # CONFIG_MLX4_CORE is not set |
| 747 | # CONFIG_TEHUTI is not set | 752 | # CONFIG_TEHUTI is not set |
| 748 | # CONFIG_BNX2X is not set | 753 | # CONFIG_BNX2X is not set |
| 754 | # CONFIG_QLCNIC is not set | ||
| 749 | # CONFIG_QLGE is not set | 755 | # CONFIG_QLGE is not set |
| 750 | # CONFIG_SFC is not set | 756 | # CONFIG_SFC is not set |
| 751 | # CONFIG_BE2NET is not set | 757 | # CONFIG_BE2NET is not set |
| @@ -859,6 +865,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 859 | CONFIG_SERIAL_CPM=y | 865 | CONFIG_SERIAL_CPM=y |
| 860 | CONFIG_SERIAL_CPM_CONSOLE=y | 866 | CONFIG_SERIAL_CPM_CONSOLE=y |
| 861 | # CONFIG_SERIAL_JSM is not set | 867 | # CONFIG_SERIAL_JSM is not set |
| 868 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 862 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 869 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 863 | CONFIG_UNIX98_PTYS=y | 870 | CONFIG_UNIX98_PTYS=y |
| 864 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 871 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -887,7 +894,9 @@ CONFIG_GPIOLIB=y | |||
| 887 | # | 894 | # |
| 888 | # Memory mapped GPIO expanders: | 895 | # Memory mapped GPIO expanders: |
| 889 | # | 896 | # |
| 897 | # CONFIG_GPIO_IT8761E is not set | ||
| 890 | # CONFIG_GPIO_XILINX is not set | 898 | # CONFIG_GPIO_XILINX is not set |
| 899 | # CONFIG_GPIO_SCH is not set | ||
| 891 | 900 | ||
| 892 | # | 901 | # |
| 893 | # I2C GPIO expanders: | 902 | # I2C GPIO expanders: |
| @@ -926,6 +935,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 926 | # CONFIG_MFD_SM501 is not set | 935 | # CONFIG_MFD_SM501 is not set |
| 927 | # CONFIG_HTC_PASIC3 is not set | 936 | # CONFIG_HTC_PASIC3 is not set |
| 928 | # CONFIG_MFD_TMIO is not set | 937 | # CONFIG_MFD_TMIO is not set |
| 938 | # CONFIG_MFD_TIMBERDALE is not set | ||
| 939 | # CONFIG_LPC_SCH is not set | ||
| 929 | # CONFIG_REGULATOR is not set | 940 | # CONFIG_REGULATOR is not set |
| 930 | # CONFIG_MEDIA_SUPPORT is not set | 941 | # CONFIG_MEDIA_SUPPORT is not set |
| 931 | 942 | ||
| @@ -934,6 +945,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 934 | # | 945 | # |
| 935 | # CONFIG_AGP is not set | 946 | # CONFIG_AGP is not set |
| 936 | CONFIG_VGA_ARB=y | 947 | CONFIG_VGA_ARB=y |
| 948 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 937 | # CONFIG_DRM is not set | 949 | # CONFIG_DRM is not set |
| 938 | # CONFIG_VGASTATE is not set | 950 | # CONFIG_VGASTATE is not set |
| 939 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 951 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -996,6 +1008,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 996 | # CONFIG_USB_MIDI_GADGET is not set | 1008 | # CONFIG_USB_MIDI_GADGET is not set |
| 997 | # CONFIG_USB_G_PRINTER is not set | 1009 | # CONFIG_USB_G_PRINTER is not set |
| 998 | # CONFIG_USB_CDC_COMPOSITE is not set | 1010 | # CONFIG_USB_CDC_COMPOSITE is not set |
| 1011 | # CONFIG_USB_G_NOKIA is not set | ||
| 999 | # CONFIG_USB_G_MULTI is not set | 1012 | # CONFIG_USB_G_MULTI is not set |
| 1000 | 1013 | ||
| 1001 | # | 1014 | # |
| @@ -1051,6 +1064,7 @@ CONFIG_AUTOFS4_FS=y | |||
| 1051 | # | 1064 | # |
| 1052 | # Caches | 1065 | # Caches |
| 1053 | # | 1066 | # |
| 1067 | # CONFIG_FSCACHE is not set | ||
| 1054 | 1068 | ||
| 1055 | # | 1069 | # |
| 1056 | # CD-ROM/DVD Filesystems | 1070 | # CD-ROM/DVD Filesystems |
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index 57ab5748a34d..93f4505b5ac2 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:12 2010 | 4 | # Mon Apr 19 23:16:36 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -97,11 +97,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 97 | # CONFIG_TREE_RCU_TRACE is not set | 97 | # CONFIG_TREE_RCU_TRACE is not set |
| 98 | # CONFIG_IKCONFIG is not set | 98 | # CONFIG_IKCONFIG is not set |
| 99 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
| 100 | CONFIG_GROUP_SCHED=y | ||
| 101 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 102 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 103 | CONFIG_USER_SCHED=y | ||
| 104 | # CONFIG_CGROUP_SCHED is not set | ||
| 105 | # CONFIG_CGROUPS is not set | 100 | # CONFIG_CGROUPS is not set |
| 106 | CONFIG_SYSFS_DEPRECATED=y | 101 | CONFIG_SYSFS_DEPRECATED=y |
| 107 | CONFIG_SYSFS_DEPRECATED_V2=y | 102 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -117,6 +112,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 117 | CONFIG_RD_GZIP=y | 112 | CONFIG_RD_GZIP=y |
| 118 | CONFIG_RD_BZIP2=y | 113 | CONFIG_RD_BZIP2=y |
| 119 | CONFIG_RD_LZMA=y | 114 | CONFIG_RD_LZMA=y |
| 115 | CONFIG_RD_LZO=y | ||
| 120 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 116 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 121 | CONFIG_SYSCTL=y | 117 | CONFIG_SYSCTL=y |
| 122 | CONFIG_ANON_INODES=y | 118 | CONFIG_ANON_INODES=y |
| @@ -319,6 +315,7 @@ CONFIG_ISA_DMA_API=y | |||
| 319 | # Bus options | 315 | # Bus options |
| 320 | # | 316 | # |
| 321 | CONFIG_ZONE_DMA=y | 317 | CONFIG_ZONE_DMA=y |
| 318 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 322 | CONFIG_GENERIC_ISA_DMA=y | 319 | CONFIG_GENERIC_ISA_DMA=y |
| 323 | CONFIG_PPC_INDIRECT_PCI=y | 320 | CONFIG_PPC_INDIRECT_PCI=y |
| 324 | CONFIG_PCI=y | 321 | CONFIG_PCI=y |
| @@ -327,7 +324,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 327 | # CONFIG_PCIEPORTBUS is not set | 324 | # CONFIG_PCIEPORTBUS is not set |
| 328 | CONFIG_ARCH_SUPPORTS_MSI=y | 325 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 329 | # CONFIG_PCI_MSI is not set | 326 | # CONFIG_PCI_MSI is not set |
| 330 | # CONFIG_PCI_LEGACY is not set | ||
| 331 | # CONFIG_PCI_STUB is not set | 327 | # CONFIG_PCI_STUB is not set |
| 332 | # CONFIG_PCI_IOV is not set | 328 | # CONFIG_PCI_IOV is not set |
| 333 | # CONFIG_PCCARD is not set | 329 | # CONFIG_PCCARD is not set |
| @@ -354,7 +350,6 @@ CONFIG_NET=y | |||
| 354 | # Networking options | 350 | # Networking options |
| 355 | # | 351 | # |
| 356 | CONFIG_PACKET=y | 352 | CONFIG_PACKET=y |
| 357 | # CONFIG_PACKET_MMAP is not set | ||
| 358 | CONFIG_UNIX=y | 353 | CONFIG_UNIX=y |
| 359 | CONFIG_XFRM=y | 354 | CONFIG_XFRM=y |
| 360 | CONFIG_XFRM_USER=y | 355 | CONFIG_XFRM_USER=y |
| @@ -533,6 +528,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 533 | # UBI - Unsorted block images | 528 | # UBI - Unsorted block images |
| 534 | # | 529 | # |
| 535 | # CONFIG_MTD_UBI is not set | 530 | # CONFIG_MTD_UBI is not set |
| 531 | CONFIG_OF_FLATTREE=y | ||
| 532 | CONFIG_OF_DYNAMIC=y | ||
| 536 | CONFIG_OF_DEVICE=y | 533 | CONFIG_OF_DEVICE=y |
| 537 | CONFIG_OF_I2C=y | 534 | CONFIG_OF_I2C=y |
| 538 | CONFIG_OF_MDIO=y | 535 | CONFIG_OF_MDIO=y |
| @@ -569,6 +566,7 @@ CONFIG_MISC_DEVICES=y | |||
| 569 | # CONFIG_ENCLOSURE_SERVICES is not set | 566 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 570 | # CONFIG_HP_ILO is not set | 567 | # CONFIG_HP_ILO is not set |
| 571 | # CONFIG_ISL29003 is not set | 568 | # CONFIG_ISL29003 is not set |
| 569 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 572 | # CONFIG_DS1682 is not set | 570 | # CONFIG_DS1682 is not set |
| 573 | # CONFIG_C2PORT is not set | 571 | # CONFIG_C2PORT is not set |
| 574 | 572 | ||
| @@ -640,6 +638,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 640 | # | 638 | # |
| 641 | # SCSI device support | 639 | # SCSI device support |
| 642 | # | 640 | # |
| 641 | CONFIG_SCSI_MOD=y | ||
| 643 | # CONFIG_RAID_ATTRS is not set | 642 | # CONFIG_RAID_ATTRS is not set |
| 644 | CONFIG_SCSI=y | 643 | CONFIG_SCSI=y |
| 645 | CONFIG_SCSI_DMA=y | 644 | CONFIG_SCSI_DMA=y |
| @@ -761,6 +760,7 @@ CONFIG_SATA_MV=y | |||
| 761 | # CONFIG_PATA_IT821X is not set | 760 | # CONFIG_PATA_IT821X is not set |
| 762 | # CONFIG_PATA_IT8213 is not set | 761 | # CONFIG_PATA_IT8213 is not set |
| 763 | # CONFIG_PATA_JMICRON is not set | 762 | # CONFIG_PATA_JMICRON is not set |
| 763 | # CONFIG_PATA_LEGACY is not set | ||
| 764 | # CONFIG_PATA_TRIFLEX is not set | 764 | # CONFIG_PATA_TRIFLEX is not set |
| 765 | # CONFIG_PATA_MARVELL is not set | 765 | # CONFIG_PATA_MARVELL is not set |
| 766 | # CONFIG_PATA_MPIIX is not set | 766 | # CONFIG_PATA_MPIIX is not set |
| @@ -854,6 +854,7 @@ CONFIG_NET_PCI=y | |||
| 854 | # CONFIG_PCNET32 is not set | 854 | # CONFIG_PCNET32 is not set |
| 855 | # CONFIG_AMD8111_ETH is not set | 855 | # CONFIG_AMD8111_ETH is not set |
| 856 | # CONFIG_ADAPTEC_STARFIRE is not set | 856 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 857 | # CONFIG_KSZ884X_PCI is not set | ||
| 857 | # CONFIG_B44 is not set | 858 | # CONFIG_B44 is not set |
| 858 | # CONFIG_FORCEDETH is not set | 859 | # CONFIG_FORCEDETH is not set |
| 859 | CONFIG_E100=y | 860 | CONFIG_E100=y |
| @@ -907,6 +908,8 @@ CONFIG_NETDEV_10000=y | |||
| 907 | # CONFIG_CHELSIO_T1 is not set | 908 | # CONFIG_CHELSIO_T1 is not set |
| 908 | CONFIG_CHELSIO_T3_DEPENDS=y | 909 | CONFIG_CHELSIO_T3_DEPENDS=y |
| 909 | # CONFIG_CHELSIO_T3 is not set | 910 | # CONFIG_CHELSIO_T3 is not set |
| 911 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
| 912 | # CONFIG_CHELSIO_T4 is not set | ||
| 910 | # CONFIG_ENIC is not set | 913 | # CONFIG_ENIC is not set |
| 911 | # CONFIG_IXGBE is not set | 914 | # CONFIG_IXGBE is not set |
| 912 | # CONFIG_IXGB is not set | 915 | # CONFIG_IXGB is not set |
| @@ -919,6 +922,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 919 | # CONFIG_MLX4_CORE is not set | 922 | # CONFIG_MLX4_CORE is not set |
| 920 | # CONFIG_TEHUTI is not set | 923 | # CONFIG_TEHUTI is not set |
| 921 | # CONFIG_BNX2X is not set | 924 | # CONFIG_BNX2X is not set |
| 925 | # CONFIG_QLCNIC is not set | ||
| 922 | # CONFIG_QLGE is not set | 926 | # CONFIG_QLGE is not set |
| 923 | # CONFIG_SFC is not set | 927 | # CONFIG_SFC is not set |
| 924 | # CONFIG_BE2NET is not set | 928 | # CONFIG_BE2NET is not set |
| @@ -1016,6 +1020,7 @@ CONFIG_SERIAL_MPSC_CONSOLE=y | |||
| 1016 | CONFIG_SERIAL_CORE=y | 1020 | CONFIG_SERIAL_CORE=y |
| 1017 | CONFIG_SERIAL_CORE_CONSOLE=y | 1021 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 1018 | # CONFIG_SERIAL_JSM is not set | 1022 | # CONFIG_SERIAL_JSM is not set |
| 1023 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 1019 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 1024 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 1020 | CONFIG_UNIX98_PTYS=y | 1025 | CONFIG_UNIX98_PTYS=y |
| 1021 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 1026 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -1065,6 +1070,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 1065 | CONFIG_I2C_MV64XXX=y | 1070 | CONFIG_I2C_MV64XXX=y |
| 1066 | # CONFIG_I2C_OCORES is not set | 1071 | # CONFIG_I2C_OCORES is not set |
| 1067 | # CONFIG_I2C_SIMTEC is not set | 1072 | # CONFIG_I2C_SIMTEC is not set |
| 1073 | # CONFIG_I2C_XILINX is not set | ||
| 1068 | 1074 | ||
| 1069 | # | 1075 | # |
| 1070 | # External I2C/SMBus adapter drivers | 1076 | # External I2C/SMBus adapter drivers |
| @@ -1077,15 +1083,9 @@ CONFIG_I2C_MV64XXX=y | |||
| 1077 | # Other I2C/SMBus bus drivers | 1083 | # Other I2C/SMBus bus drivers |
| 1078 | # | 1084 | # |
| 1079 | # CONFIG_I2C_PCA_PLATFORM is not set | 1085 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 1080 | |||
| 1081 | # | ||
| 1082 | # Miscellaneous I2C Chip support | ||
| 1083 | # | ||
| 1084 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1085 | # CONFIG_I2C_DEBUG_CORE is not set | 1086 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1086 | # CONFIG_I2C_DEBUG_ALGO is not set | 1087 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1087 | # CONFIG_I2C_DEBUG_BUS is not set | 1088 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1088 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 1089 | # CONFIG_SPI is not set | 1089 | # CONFIG_SPI is not set |
| 1090 | 1090 | ||
| 1091 | # | 1091 | # |
| @@ -1111,10 +1111,11 @@ CONFIG_HWMON=y | |||
| 1111 | # CONFIG_SENSORS_ADM1029 is not set | 1111 | # CONFIG_SENSORS_ADM1029 is not set |
| 1112 | # CONFIG_SENSORS_ADM1031 is not set | 1112 | # CONFIG_SENSORS_ADM1031 is not set |
| 1113 | # CONFIG_SENSORS_ADM9240 is not set | 1113 | # CONFIG_SENSORS_ADM9240 is not set |
| 1114 | # CONFIG_SENSORS_ADT7411 is not set | ||
| 1114 | # CONFIG_SENSORS_ADT7462 is not set | 1115 | # CONFIG_SENSORS_ADT7462 is not set |
| 1115 | # CONFIG_SENSORS_ADT7470 is not set | 1116 | # CONFIG_SENSORS_ADT7470 is not set |
| 1116 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 1117 | # CONFIG_SENSORS_ADT7475 is not set | 1117 | # CONFIG_SENSORS_ADT7475 is not set |
| 1118 | # CONFIG_SENSORS_ASC7621 is not set | ||
| 1118 | # CONFIG_SENSORS_ATXP1 is not set | 1119 | # CONFIG_SENSORS_ATXP1 is not set |
| 1119 | # CONFIG_SENSORS_DS1621 is not set | 1120 | # CONFIG_SENSORS_DS1621 is not set |
| 1120 | # CONFIG_SENSORS_I5K_AMB is not set | 1121 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -1151,6 +1152,7 @@ CONFIG_HWMON=y | |||
| 1151 | # CONFIG_SENSORS_SMSC47M192 is not set | 1152 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1152 | # CONFIG_SENSORS_SMSC47B397 is not set | 1153 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1153 | # CONFIG_SENSORS_ADS7828 is not set | 1154 | # CONFIG_SENSORS_ADS7828 is not set |
| 1155 | # CONFIG_SENSORS_AMC6821 is not set | ||
| 1154 | # CONFIG_SENSORS_THMC50 is not set | 1156 | # CONFIG_SENSORS_THMC50 is not set |
| 1155 | # CONFIG_SENSORS_TMP401 is not set | 1157 | # CONFIG_SENSORS_TMP401 is not set |
| 1156 | # CONFIG_SENSORS_TMP421 is not set | 1158 | # CONFIG_SENSORS_TMP421 is not set |
| @@ -1179,18 +1181,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1179 | # Multifunction device drivers | 1181 | # Multifunction device drivers |
| 1180 | # | 1182 | # |
| 1181 | # CONFIG_MFD_CORE is not set | 1183 | # CONFIG_MFD_CORE is not set |
| 1184 | # CONFIG_MFD_88PM860X is not set | ||
| 1182 | # CONFIG_MFD_SM501 is not set | 1185 | # CONFIG_MFD_SM501 is not set |
| 1183 | # CONFIG_HTC_PASIC3 is not set | 1186 | # CONFIG_HTC_PASIC3 is not set |
| 1184 | # CONFIG_TWL4030_CORE is not set | 1187 | # CONFIG_TWL4030_CORE is not set |
| 1185 | # CONFIG_MFD_TMIO is not set | 1188 | # CONFIG_MFD_TMIO is not set |
| 1186 | # CONFIG_PMIC_DA903X is not set | 1189 | # CONFIG_PMIC_DA903X is not set |
| 1187 | # CONFIG_PMIC_ADP5520 is not set | 1190 | # CONFIG_PMIC_ADP5520 is not set |
| 1191 | # CONFIG_MFD_MAX8925 is not set | ||
| 1188 | # CONFIG_MFD_WM8400 is not set | 1192 | # CONFIG_MFD_WM8400 is not set |
| 1189 | # CONFIG_MFD_WM831X is not set | 1193 | # CONFIG_MFD_WM831X is not set |
| 1190 | # CONFIG_MFD_WM8350_I2C is not set | 1194 | # CONFIG_MFD_WM8350_I2C is not set |
| 1195 | # CONFIG_MFD_WM8994 is not set | ||
| 1191 | # CONFIG_MFD_PCF50633 is not set | 1196 | # CONFIG_MFD_PCF50633 is not set |
| 1192 | # CONFIG_AB3100_CORE is not set | 1197 | # CONFIG_AB3100_CORE is not set |
| 1193 | # CONFIG_MFD_88PM8607 is not set | 1198 | # CONFIG_LPC_SCH is not set |
| 1194 | # CONFIG_REGULATOR is not set | 1199 | # CONFIG_REGULATOR is not set |
| 1195 | # CONFIG_MEDIA_SUPPORT is not set | 1200 | # CONFIG_MEDIA_SUPPORT is not set |
| 1196 | 1201 | ||
| @@ -1199,6 +1204,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1199 | # | 1204 | # |
| 1200 | # CONFIG_AGP is not set | 1205 | # CONFIG_AGP is not set |
| 1201 | CONFIG_VGA_ARB=y | 1206 | CONFIG_VGA_ARB=y |
| 1207 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 1202 | # CONFIG_DRM is not set | 1208 | # CONFIG_DRM is not set |
| 1203 | # CONFIG_VGASTATE is not set | 1209 | # CONFIG_VGASTATE is not set |
| 1204 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 1210 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| @@ -1231,6 +1237,7 @@ CONFIG_USB_HID=y | |||
| 1231 | # | 1237 | # |
| 1232 | # Special HID drivers | 1238 | # Special HID drivers |
| 1233 | # | 1239 | # |
| 1240 | # CONFIG_HID_3M_PCT is not set | ||
| 1234 | CONFIG_HID_A4TECH=y | 1241 | CONFIG_HID_A4TECH=y |
| 1235 | CONFIG_HID_APPLE=y | 1242 | CONFIG_HID_APPLE=y |
| 1236 | CONFIG_HID_BELKIN=y | 1243 | CONFIG_HID_BELKIN=y |
| @@ -1247,14 +1254,19 @@ CONFIG_HID_KENSINGTON=y | |||
| 1247 | CONFIG_HID_LOGITECH=y | 1254 | CONFIG_HID_LOGITECH=y |
| 1248 | # CONFIG_LOGITECH_FF is not set | 1255 | # CONFIG_LOGITECH_FF is not set |
| 1249 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1256 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1257 | # CONFIG_LOGIG940_FF is not set | ||
| 1250 | CONFIG_HID_MICROSOFT=y | 1258 | CONFIG_HID_MICROSOFT=y |
| 1259 | # CONFIG_HID_MOSART is not set | ||
| 1251 | CONFIG_HID_MONTEREY=y | 1260 | CONFIG_HID_MONTEREY=y |
| 1252 | CONFIG_HID_NTRIG=y | 1261 | CONFIG_HID_NTRIG=y |
| 1262 | CONFIG_HID_ORTEK=y | ||
| 1253 | CONFIG_HID_PANTHERLORD=y | 1263 | CONFIG_HID_PANTHERLORD=y |
| 1254 | # CONFIG_PANTHERLORD_FF is not set | 1264 | # CONFIG_PANTHERLORD_FF is not set |
| 1255 | CONFIG_HID_PETALYNX=y | 1265 | CONFIG_HID_PETALYNX=y |
| 1266 | # CONFIG_HID_QUANTA is not set | ||
| 1256 | CONFIG_HID_SAMSUNG=y | 1267 | CONFIG_HID_SAMSUNG=y |
| 1257 | CONFIG_HID_SONY=y | 1268 | CONFIG_HID_SONY=y |
| 1269 | # CONFIG_HID_STANTUM is not set | ||
| 1258 | CONFIG_HID_SUNPLUS=y | 1270 | CONFIG_HID_SUNPLUS=y |
| 1259 | CONFIG_HID_GREENASIA=y | 1271 | CONFIG_HID_GREENASIA=y |
| 1260 | # CONFIG_GREENASIA_FF is not set | 1272 | # CONFIG_GREENASIA_FF is not set |
| @@ -1350,7 +1362,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1350 | # CONFIG_USB_RIO500 is not set | 1362 | # CONFIG_USB_RIO500 is not set |
| 1351 | # CONFIG_USB_LEGOTOWER is not set | 1363 | # CONFIG_USB_LEGOTOWER is not set |
| 1352 | # CONFIG_USB_LCD is not set | 1364 | # CONFIG_USB_LCD is not set |
| 1353 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1354 | # CONFIG_USB_LED is not set | 1365 | # CONFIG_USB_LED is not set |
| 1355 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1366 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1356 | # CONFIG_USB_CYTHERM is not set | 1367 | # CONFIG_USB_CYTHERM is not set |
| @@ -1363,7 +1374,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1363 | # CONFIG_USB_IOWARRIOR is not set | 1374 | # CONFIG_USB_IOWARRIOR is not set |
| 1364 | # CONFIG_USB_TEST is not set | 1375 | # CONFIG_USB_TEST is not set |
| 1365 | # CONFIG_USB_ISIGHTFW is not set | 1376 | # CONFIG_USB_ISIGHTFW is not set |
| 1366 | # CONFIG_USB_VST is not set | ||
| 1367 | # CONFIG_USB_GADGET is not set | 1377 | # CONFIG_USB_GADGET is not set |
| 1368 | 1378 | ||
| 1369 | # | 1379 | # |
| @@ -1516,6 +1526,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1516 | # CONFIG_BFS_FS is not set | 1526 | # CONFIG_BFS_FS is not set |
| 1517 | # CONFIG_EFS_FS is not set | 1527 | # CONFIG_EFS_FS is not set |
| 1518 | # CONFIG_JFFS2_FS is not set | 1528 | # CONFIG_JFFS2_FS is not set |
| 1529 | # CONFIG_LOGFS is not set | ||
| 1519 | # CONFIG_CRAMFS is not set | 1530 | # CONFIG_CRAMFS is not set |
| 1520 | # CONFIG_SQUASHFS is not set | 1531 | # CONFIG_SQUASHFS is not set |
| 1521 | # CONFIG_VXFS_FS is not set | 1532 | # CONFIG_VXFS_FS is not set |
| @@ -1538,6 +1549,7 @@ CONFIG_SUNRPC=y | |||
| 1538 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1549 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1539 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1550 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1540 | # CONFIG_SMB_FS is not set | 1551 | # CONFIG_SMB_FS is not set |
| 1552 | # CONFIG_CEPH_FS is not set | ||
| 1541 | # CONFIG_CIFS is not set | 1553 | # CONFIG_CIFS is not set |
| 1542 | # CONFIG_NCP_FS is not set | 1554 | # CONFIG_NCP_FS is not set |
| 1543 | # CONFIG_CODA_FS is not set | 1555 | # CONFIG_CODA_FS is not set |
| @@ -1620,9 +1632,11 @@ CONFIG_CRC32=y | |||
| 1620 | # CONFIG_CRC7 is not set | 1632 | # CONFIG_CRC7 is not set |
| 1621 | # CONFIG_LIBCRC32C is not set | 1633 | # CONFIG_LIBCRC32C is not set |
| 1622 | CONFIG_ZLIB_INFLATE=y | 1634 | CONFIG_ZLIB_INFLATE=y |
| 1635 | CONFIG_LZO_DECOMPRESS=y | ||
| 1623 | CONFIG_DECOMPRESS_GZIP=y | 1636 | CONFIG_DECOMPRESS_GZIP=y |
| 1624 | CONFIG_DECOMPRESS_BZIP2=y | 1637 | CONFIG_DECOMPRESS_BZIP2=y |
| 1625 | CONFIG_DECOMPRESS_LZMA=y | 1638 | CONFIG_DECOMPRESS_LZMA=y |
| 1639 | CONFIG_DECOMPRESS_LZO=y | ||
| 1626 | CONFIG_HAS_IOMEM=y | 1640 | CONFIG_HAS_IOMEM=y |
| 1627 | CONFIG_HAS_IOPORT=y | 1641 | CONFIG_HAS_IOPORT=y |
| 1628 | CONFIG_HAS_DMA=y | 1642 | CONFIG_HAS_DMA=y |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 32f7058bb173..3808bc2be86f 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.31-rc7 | 3 | # Linux kernel version: 2.6.34-rc4 |
| 4 | # Mon Aug 24 17:38:50 2009 | 4 | # Thu Apr 15 11:32:15 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -9,6 +9,7 @@ CONFIG_PPC64=y | |||
| 9 | # Processor support | 9 | # Processor support |
| 10 | # | 10 | # |
| 11 | CONFIG_PPC_BOOK3S_64=y | 11 | CONFIG_PPC_BOOK3S_64=y |
| 12 | # CONFIG_PPC_BOOK3E_64 is not set | ||
| 12 | CONFIG_PPC_BOOK3S=y | 13 | CONFIG_PPC_BOOK3S=y |
| 13 | # CONFIG_POWER4_ONLY is not set | 14 | # CONFIG_POWER4_ONLY is not set |
| 14 | CONFIG_POWER3=y | 15 | CONFIG_POWER3=y |
| @@ -35,7 +36,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 35 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
| 36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 37 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 39 | CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y | ||
| 38 | CONFIG_IRQ_PER_CPU=y | 40 | CONFIG_IRQ_PER_CPU=y |
| 41 | CONFIG_NR_IRQS=512 | ||
| 39 | CONFIG_STACKTRACE_SUPPORT=y | 42 | CONFIG_STACKTRACE_SUPPORT=y |
| 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 43 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 44 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| @@ -60,6 +63,7 @@ CONFIG_AUDIT_ARCH=y | |||
| 60 | CONFIG_GENERIC_BUG=y | 63 | CONFIG_GENERIC_BUG=y |
| 61 | CONFIG_DTC=y | 64 | CONFIG_DTC=y |
| 62 | # CONFIG_DEFAULT_UIMAGE is not set | 65 | # CONFIG_DEFAULT_UIMAGE is not set |
| 66 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 63 | # CONFIG_PPC_DCR_NATIVE is not set | 67 | # CONFIG_PPC_DCR_NATIVE is not set |
| 64 | # CONFIG_PPC_DCR_MMIO is not set | 68 | # CONFIG_PPC_DCR_MMIO is not set |
| 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 69 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
| @@ -86,14 +90,15 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
| 86 | # | 90 | # |
| 87 | # RCU Subsystem | 91 | # RCU Subsystem |
| 88 | # | 92 | # |
| 89 | CONFIG_CLASSIC_RCU=y | 93 | CONFIG_TREE_RCU=y |
| 90 | # CONFIG_TREE_RCU is not set | 94 | # CONFIG_TREE_PREEMPT_RCU is not set |
| 91 | # CONFIG_PREEMPT_RCU is not set | 95 | # CONFIG_TINY_RCU is not set |
| 96 | # CONFIG_RCU_TRACE is not set | ||
| 97 | CONFIG_RCU_FANOUT=64 | ||
| 98 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
| 92 | # CONFIG_TREE_RCU_TRACE is not set | 99 | # CONFIG_TREE_RCU_TRACE is not set |
| 93 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 94 | # CONFIG_IKCONFIG is not set | 100 | # CONFIG_IKCONFIG is not set |
| 95 | CONFIG_LOG_BUF_SHIFT=17 | 101 | CONFIG_LOG_BUF_SHIFT=17 |
| 96 | # CONFIG_GROUP_SCHED is not set | ||
| 97 | # CONFIG_CGROUPS is not set | 102 | # CONFIG_CGROUPS is not set |
| 98 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 103 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 99 | # CONFIG_RELAY is not set | 104 | # CONFIG_RELAY is not set |
| @@ -108,6 +113,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 108 | CONFIG_RD_GZIP=y | 113 | CONFIG_RD_GZIP=y |
| 109 | # CONFIG_RD_BZIP2 is not set | 114 | # CONFIG_RD_BZIP2 is not set |
| 110 | # CONFIG_RD_LZMA is not set | 115 | # CONFIG_RD_LZMA is not set |
| 116 | # CONFIG_RD_LZO is not set | ||
| 111 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 117 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 112 | CONFIG_SYSCTL=y | 118 | CONFIG_SYSCTL=y |
| 113 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
| @@ -128,21 +134,19 @@ CONFIG_TIMERFD=y | |||
| 128 | CONFIG_EVENTFD=y | 134 | CONFIG_EVENTFD=y |
| 129 | CONFIG_SHMEM=y | 135 | CONFIG_SHMEM=y |
| 130 | CONFIG_AIO=y | 136 | CONFIG_AIO=y |
| 131 | CONFIG_HAVE_PERF_COUNTERS=y | 137 | CONFIG_HAVE_PERF_EVENTS=y |
| 132 | 138 | ||
| 133 | # | 139 | # |
| 134 | # Performance Counters | 140 | # Kernel Performance Events And Counters |
| 135 | # | 141 | # |
| 142 | # CONFIG_PERF_EVENTS is not set | ||
| 136 | # CONFIG_PERF_COUNTERS is not set | 143 | # CONFIG_PERF_COUNTERS is not set |
| 137 | CONFIG_VM_EVENT_COUNTERS=y | 144 | CONFIG_VM_EVENT_COUNTERS=y |
| 138 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 139 | # CONFIG_COMPAT_BRK is not set | 145 | # CONFIG_COMPAT_BRK is not set |
| 140 | CONFIG_SLAB=y | 146 | CONFIG_SLAB=y |
| 141 | # CONFIG_SLUB is not set | 147 | # CONFIG_SLUB is not set |
| 142 | # CONFIG_SLOB is not set | 148 | # CONFIG_SLOB is not set |
| 143 | CONFIG_PROFILING=y | 149 | CONFIG_PROFILING=y |
| 144 | CONFIG_TRACEPOINTS=y | ||
| 145 | CONFIG_MARKERS=y | ||
| 146 | CONFIG_OPROFILE=m | 150 | CONFIG_OPROFILE=m |
| 147 | CONFIG_HAVE_OPROFILE=y | 151 | CONFIG_HAVE_OPROFILE=y |
| 148 | # CONFIG_KPROBES is not set | 152 | # CONFIG_KPROBES is not set |
| @@ -154,12 +158,14 @@ CONFIG_HAVE_KRETPROBES=y | |||
| 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 158 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 155 | CONFIG_HAVE_DMA_ATTRS=y | 159 | CONFIG_HAVE_DMA_ATTRS=y |
| 156 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 160 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 161 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
| 157 | 162 | ||
| 158 | # | 163 | # |
| 159 | # GCOV-based kernel profiling | 164 | # GCOV-based kernel profiling |
| 160 | # | 165 | # |
| 161 | # CONFIG_GCOV_KERNEL is not set | 166 | # CONFIG_GCOV_KERNEL is not set |
| 162 | # CONFIG_SLOW_WORK is not set | 167 | CONFIG_SLOW_WORK=y |
| 168 | # CONFIG_SLOW_WORK_DEBUG is not set | ||
| 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 169 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 164 | CONFIG_SLABINFO=y | 170 | CONFIG_SLABINFO=y |
| 165 | CONFIG_RT_MUTEXES=y | 171 | CONFIG_RT_MUTEXES=y |
| @@ -180,14 +186,41 @@ CONFIG_BLOCK_COMPAT=y | |||
| 180 | # IO Schedulers | 186 | # IO Schedulers |
| 181 | # | 187 | # |
| 182 | CONFIG_IOSCHED_NOOP=y | 188 | CONFIG_IOSCHED_NOOP=y |
| 183 | CONFIG_IOSCHED_AS=y | ||
| 184 | CONFIG_IOSCHED_DEADLINE=y | 189 | CONFIG_IOSCHED_DEADLINE=y |
| 185 | CONFIG_IOSCHED_CFQ=y | 190 | CONFIG_IOSCHED_CFQ=y |
| 186 | CONFIG_DEFAULT_AS=y | ||
| 187 | # CONFIG_DEFAULT_DEADLINE is not set | 191 | # CONFIG_DEFAULT_DEADLINE is not set |
| 188 | # CONFIG_DEFAULT_CFQ is not set | 192 | CONFIG_DEFAULT_CFQ=y |
| 189 | # CONFIG_DEFAULT_NOOP is not set | 193 | # CONFIG_DEFAULT_NOOP is not set |
| 190 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 194 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 195 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
| 196 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
| 197 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
| 198 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
| 199 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
| 200 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
| 201 | # CONFIG_INLINE_SPIN_UNLOCK is not set | ||
| 202 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
| 203 | # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set | ||
| 204 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
| 205 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
| 206 | # CONFIG_INLINE_READ_LOCK is not set | ||
| 207 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
| 208 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
| 209 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
| 210 | # CONFIG_INLINE_READ_UNLOCK is not set | ||
| 211 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
| 212 | # CONFIG_INLINE_READ_UNLOCK_IRQ is not set | ||
| 213 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
| 214 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
| 215 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
| 216 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
| 217 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
| 218 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
| 219 | # CONFIG_INLINE_WRITE_UNLOCK is not set | ||
| 220 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
| 221 | # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set | ||
| 222 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
| 223 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
| 191 | # CONFIG_FREEZER is not set | 224 | # CONFIG_FREEZER is not set |
| 192 | 225 | ||
| 193 | # | 226 | # |
| @@ -226,7 +259,6 @@ CONFIG_PPC_CELL=y | |||
| 226 | # | 259 | # |
| 227 | CONFIG_SPU_FS=m | 260 | CONFIG_SPU_FS=m |
| 228 | CONFIG_SPU_FS_64K_LS=y | 261 | CONFIG_SPU_FS_64K_LS=y |
| 229 | # CONFIG_SPU_TRACE is not set | ||
| 230 | CONFIG_SPU_BASE=y | 262 | CONFIG_SPU_BASE=y |
| 231 | # CONFIG_PQ2ADS is not set | 263 | # CONFIG_PQ2ADS is not set |
| 232 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set | 264 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set |
| @@ -267,7 +299,6 @@ CONFIG_COMPAT_BINFMT_ELF=y | |||
| 267 | # CONFIG_HAVE_AOUT is not set | 299 | # CONFIG_HAVE_AOUT is not set |
| 268 | CONFIG_BINFMT_MISC=y | 300 | CONFIG_BINFMT_MISC=y |
| 269 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 301 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 270 | # CONFIG_IOMMU_VMERGE is not set | ||
| 271 | CONFIG_IOMMU_HELPER=y | 302 | CONFIG_IOMMU_HELPER=y |
| 272 | # CONFIG_SWIOTLB is not set | 303 | # CONFIG_SWIOTLB is not set |
| 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 304 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -276,12 +307,15 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | |||
| 276 | CONFIG_KEXEC=y | 307 | CONFIG_KEXEC=y |
| 277 | # CONFIG_CRASH_DUMP is not set | 308 | # CONFIG_CRASH_DUMP is not set |
| 278 | # CONFIG_IRQ_ALL_CPUS is not set | 309 | # CONFIG_IRQ_ALL_CPUS is not set |
| 310 | CONFIG_SPARSE_IRQ=y | ||
| 279 | # CONFIG_NUMA is not set | 311 | # CONFIG_NUMA is not set |
| 312 | CONFIG_MAX_ACTIVE_REGIONS=256 | ||
| 280 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 313 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 281 | CONFIG_ARCH_FLATMEM_ENABLE=y | 314 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 282 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 315 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 283 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 316 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| 284 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 317 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 318 | CONFIG_SYS_SUPPORTS_HUGETLBFS=y | ||
| 285 | CONFIG_SELECT_MEMORY_MODEL=y | 319 | CONFIG_SELECT_MEMORY_MODEL=y |
| 286 | # CONFIG_FLATMEM_MANUAL is not set | 320 | # CONFIG_FLATMEM_MANUAL is not set |
| 287 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 321 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -295,13 +329,12 @@ CONFIG_MEMORY_HOTPLUG=y | |||
| 295 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 329 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
| 296 | # CONFIG_MEMORY_HOTREMOVE is not set | 330 | # CONFIG_MEMORY_HOTREMOVE is not set |
| 297 | CONFIG_PAGEFLAGS_EXTENDED=y | 331 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 298 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 332 | CONFIG_SPLIT_PTLOCK_CPUS=999999 |
| 299 | CONFIG_MIGRATION=y | 333 | CONFIG_MIGRATION=y |
| 300 | CONFIG_PHYS_ADDR_T_64BIT=y | 334 | CONFIG_PHYS_ADDR_T_64BIT=y |
| 301 | CONFIG_ZONE_DMA_FLAG=1 | 335 | CONFIG_ZONE_DMA_FLAG=1 |
| 302 | CONFIG_BOUNCE=y | 336 | CONFIG_BOUNCE=y |
| 303 | CONFIG_HAVE_MLOCK=y | 337 | # CONFIG_KSM is not set |
| 304 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 305 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 338 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
| 306 | CONFIG_ARCH_MEMORY_PROBE=y | 339 | CONFIG_ARCH_MEMORY_PROBE=y |
| 307 | CONFIG_PPC_HAS_HASH_64K=y | 340 | CONFIG_PPC_HAS_HASH_64K=y |
| @@ -312,11 +345,15 @@ CONFIG_PPC_4K_PAGES=y | |||
| 312 | CONFIG_FORCE_MAX_ZONEORDER=13 | 345 | CONFIG_FORCE_MAX_ZONEORDER=13 |
| 313 | CONFIG_SCHED_SMT=y | 346 | CONFIG_SCHED_SMT=y |
| 314 | CONFIG_PROC_DEVICETREE=y | 347 | CONFIG_PROC_DEVICETREE=y |
| 315 | # CONFIG_CMDLINE_BOOL is not set | 348 | CONFIG_CMDLINE_BOOL=y |
| 349 | CONFIG_CMDLINE="" | ||
| 316 | CONFIG_EXTRA_TARGETS="" | 350 | CONFIG_EXTRA_TARGETS="" |
| 317 | CONFIG_PM=y | 351 | CONFIG_PM=y |
| 318 | CONFIG_PM_DEBUG=y | 352 | CONFIG_PM_DEBUG=y |
| 353 | # CONFIG_PM_ADVANCED_DEBUG is not set | ||
| 319 | # CONFIG_PM_VERBOSE is not set | 354 | # CONFIG_PM_VERBOSE is not set |
| 355 | # CONFIG_HIBERNATION is not set | ||
| 356 | # CONFIG_PM_RUNTIME is not set | ||
| 320 | # CONFIG_SECCOMP is not set | 357 | # CONFIG_SECCOMP is not set |
| 321 | CONFIG_ISA_DMA_API=y | 358 | CONFIG_ISA_DMA_API=y |
| 322 | 359 | ||
| @@ -324,6 +361,7 @@ CONFIG_ISA_DMA_API=y | |||
| 324 | # Bus options | 361 | # Bus options |
| 325 | # | 362 | # |
| 326 | CONFIG_ZONE_DMA=y | 363 | CONFIG_ZONE_DMA=y |
| 364 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 327 | CONFIG_GENERIC_ISA_DMA=y | 365 | CONFIG_GENERIC_ISA_DMA=y |
| 328 | CONFIG_PPC_PCI_CHOICE=y | 366 | CONFIG_PPC_PCI_CHOICE=y |
| 329 | # CONFIG_PCI is not set | 367 | # CONFIG_PCI is not set |
| @@ -337,12 +375,12 @@ CONFIG_PAGE_OFFSET=0xc000000000000000 | |||
| 337 | CONFIG_KERNEL_START=0xc000000000000000 | 375 | CONFIG_KERNEL_START=0xc000000000000000 |
| 338 | CONFIG_PHYSICAL_START=0x00000000 | 376 | CONFIG_PHYSICAL_START=0x00000000 |
| 339 | CONFIG_NET=y | 377 | CONFIG_NET=y |
| 378 | CONFIG_COMPAT_NETLINK_MESSAGES=y | ||
| 340 | 379 | ||
| 341 | # | 380 | # |
| 342 | # Networking options | 381 | # Networking options |
| 343 | # | 382 | # |
| 344 | CONFIG_PACKET=y | 383 | CONFIG_PACKET=y |
| 345 | CONFIG_PACKET_MMAP=y | ||
| 346 | CONFIG_UNIX=y | 384 | CONFIG_UNIX=y |
| 347 | CONFIG_XFRM=y | 385 | CONFIG_XFRM=y |
| 348 | # CONFIG_XFRM_USER is not set | 386 | # CONFIG_XFRM_USER is not set |
| @@ -392,6 +430,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 392 | CONFIG_INET6_XFRM_MODE_BEET=y | 430 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 393 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 431 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 394 | CONFIG_IPV6_SIT=y | 432 | CONFIG_IPV6_SIT=y |
| 433 | # CONFIG_IPV6_SIT_6RD is not set | ||
| 395 | CONFIG_IPV6_NDISC_NODETYPE=y | 434 | CONFIG_IPV6_NDISC_NODETYPE=y |
| 396 | # CONFIG_IPV6_TUNNEL is not set | 435 | # CONFIG_IPV6_TUNNEL is not set |
| 397 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 436 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| @@ -400,6 +439,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
| 400 | # CONFIG_NETFILTER is not set | 439 | # CONFIG_NETFILTER is not set |
| 401 | # CONFIG_IP_DCCP is not set | 440 | # CONFIG_IP_DCCP is not set |
| 402 | # CONFIG_IP_SCTP is not set | 441 | # CONFIG_IP_SCTP is not set |
| 442 | # CONFIG_RDS is not set | ||
| 403 | # CONFIG_TIPC is not set | 443 | # CONFIG_TIPC is not set |
| 404 | # CONFIG_ATM is not set | 444 | # CONFIG_ATM is not set |
| 405 | # CONFIG_BRIDGE is not set | 445 | # CONFIG_BRIDGE is not set |
| @@ -422,7 +462,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
| 422 | # Network testing | 462 | # Network testing |
| 423 | # | 463 | # |
| 424 | # CONFIG_NET_PKTGEN is not set | 464 | # CONFIG_NET_PKTGEN is not set |
| 425 | # CONFIG_NET_DROP_MONITOR is not set | ||
| 426 | # CONFIG_HAMRADIO is not set | 465 | # CONFIG_HAMRADIO is not set |
| 427 | # CONFIG_CAN is not set | 466 | # CONFIG_CAN is not set |
| 428 | # CONFIG_IRDA is not set | 467 | # CONFIG_IRDA is not set |
| @@ -445,27 +484,30 @@ CONFIG_BT_HCIBTUSB=m | |||
| 445 | # CONFIG_BT_HCIBPA10X is not set | 484 | # CONFIG_BT_HCIBPA10X is not set |
| 446 | # CONFIG_BT_HCIBFUSB is not set | 485 | # CONFIG_BT_HCIBFUSB is not set |
| 447 | # CONFIG_BT_HCIVHCI is not set | 486 | # CONFIG_BT_HCIVHCI is not set |
| 487 | # CONFIG_BT_MRVL is not set | ||
| 488 | # CONFIG_BT_ATH3K is not set | ||
| 448 | # CONFIG_AF_RXRPC is not set | 489 | # CONFIG_AF_RXRPC is not set |
| 449 | CONFIG_WIRELESS=y | 490 | CONFIG_WIRELESS=y |
| 491 | CONFIG_WIRELESS_EXT=y | ||
| 492 | CONFIG_WEXT_CORE=y | ||
| 493 | CONFIG_WEXT_PROC=y | ||
| 450 | CONFIG_CFG80211=m | 494 | CONFIG_CFG80211=m |
| 495 | # CONFIG_NL80211_TESTMODE is not set | ||
| 496 | # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set | ||
| 451 | # CONFIG_CFG80211_REG_DEBUG is not set | 497 | # CONFIG_CFG80211_REG_DEBUG is not set |
| 498 | CONFIG_CFG80211_DEFAULT_PS=y | ||
| 452 | # CONFIG_CFG80211_DEBUGFS is not set | 499 | # CONFIG_CFG80211_DEBUGFS is not set |
| 453 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | 500 | # CONFIG_CFG80211_INTERNAL_REGDB is not set |
| 454 | CONFIG_WIRELESS_EXT=y | 501 | CONFIG_CFG80211_WEXT=y |
| 455 | # CONFIG_WIRELESS_EXT_SYSFS is not set | 502 | # CONFIG_WIRELESS_EXT_SYSFS is not set |
| 456 | # CONFIG_LIB80211 is not set | 503 | # CONFIG_LIB80211 is not set |
| 457 | CONFIG_MAC80211=m | 504 | CONFIG_MAC80211=m |
| 458 | CONFIG_MAC80211_DEFAULT_PS=y | ||
| 459 | CONFIG_MAC80211_DEFAULT_PS_VALUE=1 | ||
| 460 | |||
| 461 | # | ||
| 462 | # Rate control algorithm selection | ||
| 463 | # | ||
| 464 | CONFIG_MAC80211_RC_PID=y | 505 | CONFIG_MAC80211_RC_PID=y |
| 465 | # CONFIG_MAC80211_RC_MINSTREL is not set | 506 | # CONFIG_MAC80211_RC_MINSTREL is not set |
| 466 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 507 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
| 467 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | 508 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set |
| 468 | CONFIG_MAC80211_RC_DEFAULT="pid" | 509 | CONFIG_MAC80211_RC_DEFAULT="pid" |
| 510 | # CONFIG_MAC80211_MESH is not set | ||
| 469 | # CONFIG_MAC80211_LEDS is not set | 511 | # CONFIG_MAC80211_LEDS is not set |
| 470 | # CONFIG_MAC80211_DEBUGFS is not set | 512 | # CONFIG_MAC80211_DEBUGFS is not set |
| 471 | # CONFIG_MAC80211_DEBUG_MENU is not set | 513 | # CONFIG_MAC80211_DEBUG_MENU is not set |
| @@ -481,6 +523,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid" | |||
| 481 | # Generic Driver Options | 523 | # Generic Driver Options |
| 482 | # | 524 | # |
| 483 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 525 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 526 | # CONFIG_DEVTMPFS is not set | ||
| 484 | CONFIG_STANDALONE=y | 527 | CONFIG_STANDALONE=y |
| 485 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 528 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 486 | CONFIG_FW_LOADER=y | 529 | CONFIG_FW_LOADER=y |
| @@ -491,6 +534,8 @@ CONFIG_EXTRA_FIRMWARE="" | |||
| 491 | # CONFIG_SYS_HYPERVISOR is not set | 534 | # CONFIG_SYS_HYPERVISOR is not set |
| 492 | # CONFIG_CONNECTOR is not set | 535 | # CONFIG_CONNECTOR is not set |
| 493 | # CONFIG_MTD is not set | 536 | # CONFIG_MTD is not set |
| 537 | CONFIG_OF_FLATTREE=y | ||
| 538 | CONFIG_OF_DYNAMIC=y | ||
| 494 | CONFIG_OF_DEVICE=y | 539 | CONFIG_OF_DEVICE=y |
| 495 | # CONFIG_PARPORT is not set | 540 | # CONFIG_PARPORT is not set |
| 496 | CONFIG_BLK_DEV=y | 541 | CONFIG_BLK_DEV=y |
| @@ -498,6 +543,10 @@ CONFIG_BLK_DEV=y | |||
| 498 | # CONFIG_BLK_DEV_COW_COMMON is not set | 543 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 499 | CONFIG_BLK_DEV_LOOP=y | 544 | CONFIG_BLK_DEV_LOOP=y |
| 500 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 545 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 546 | |||
| 547 | # | ||
| 548 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | ||
| 549 | # | ||
| 501 | # CONFIG_BLK_DEV_NBD is not set | 550 | # CONFIG_BLK_DEV_NBD is not set |
| 502 | # CONFIG_BLK_DEV_UB is not set | 551 | # CONFIG_BLK_DEV_UB is not set |
| 503 | CONFIG_BLK_DEV_RAM=y | 552 | CONFIG_BLK_DEV_RAM=y |
| @@ -521,6 +570,7 @@ CONFIG_HAVE_IDE=y | |||
| 521 | # | 570 | # |
| 522 | # SCSI device support | 571 | # SCSI device support |
| 523 | # | 572 | # |
| 573 | CONFIG_SCSI_MOD=y | ||
| 524 | # CONFIG_RAID_ATTRS is not set | 574 | # CONFIG_RAID_ATTRS is not set |
| 525 | CONFIG_SCSI=y | 575 | CONFIG_SCSI=y |
| 526 | CONFIG_SCSI_DMA=y | 576 | CONFIG_SCSI_DMA=y |
| @@ -590,30 +640,27 @@ CONFIG_MII=m | |||
| 590 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 640 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
| 591 | # CONFIG_B44 is not set | 641 | # CONFIG_B44 is not set |
| 592 | # CONFIG_KS8842 is not set | 642 | # CONFIG_KS8842 is not set |
| 643 | # CONFIG_KS8851_MLL is not set | ||
| 593 | CONFIG_NETDEV_1000=y | 644 | CONFIG_NETDEV_1000=y |
| 594 | CONFIG_GELIC_NET=y | 645 | CONFIG_GELIC_NET=y |
| 595 | CONFIG_GELIC_WIRELESS=y | 646 | CONFIG_GELIC_WIRELESS=y |
| 596 | # CONFIG_NETDEV_10000 is not set | 647 | # CONFIG_NETDEV_10000 is not set |
| 597 | 648 | CONFIG_WLAN=y | |
| 598 | # | ||
| 599 | # Wireless LAN | ||
| 600 | # | ||
| 601 | # CONFIG_WLAN_PRE80211 is not set | ||
| 602 | CONFIG_WLAN_80211=y | ||
| 603 | # CONFIG_LIBERTAS is not set | ||
| 604 | # CONFIG_LIBERTAS_THINFIRM is not set | 649 | # CONFIG_LIBERTAS_THINFIRM is not set |
| 605 | # CONFIG_AT76C50X_USB is not set | 650 | # CONFIG_AT76C50X_USB is not set |
| 606 | # CONFIG_USB_ZD1201 is not set | 651 | # CONFIG_USB_ZD1201 is not set |
| 607 | # CONFIG_USB_NET_RNDIS_WLAN is not set | 652 | # CONFIG_USB_NET_RNDIS_WLAN is not set |
| 608 | # CONFIG_RTL8187 is not set | 653 | # CONFIG_RTL8187 is not set |
| 609 | # CONFIG_MAC80211_HWSIM is not set | 654 | # CONFIG_MAC80211_HWSIM is not set |
| 610 | # CONFIG_P54_COMMON is not set | 655 | # CONFIG_ATH_COMMON is not set |
| 611 | # CONFIG_AR9170_USB is not set | ||
| 612 | # CONFIG_HOSTAP is not set | ||
| 613 | # CONFIG_B43 is not set | 656 | # CONFIG_B43 is not set |
| 614 | # CONFIG_B43LEGACY is not set | 657 | # CONFIG_B43LEGACY is not set |
| 615 | # CONFIG_ZD1211RW is not set | 658 | # CONFIG_HOSTAP is not set |
| 659 | # CONFIG_LIBERTAS is not set | ||
| 660 | # CONFIG_P54_COMMON is not set | ||
| 616 | # CONFIG_RT2X00 is not set | 661 | # CONFIG_RT2X00 is not set |
| 662 | # CONFIG_WL12XX is not set | ||
| 663 | # CONFIG_ZD1211RW is not set | ||
| 617 | 664 | ||
| 618 | # | 665 | # |
| 619 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 666 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -631,6 +678,7 @@ CONFIG_USB_NET_AX8817X=m | |||
| 631 | # CONFIG_USB_NET_CDCETHER is not set | 678 | # CONFIG_USB_NET_CDCETHER is not set |
| 632 | # CONFIG_USB_NET_CDC_EEM is not set | 679 | # CONFIG_USB_NET_CDC_EEM is not set |
| 633 | # CONFIG_USB_NET_DM9601 is not set | 680 | # CONFIG_USB_NET_DM9601 is not set |
| 681 | # CONFIG_USB_NET_SMSC75XX is not set | ||
| 634 | # CONFIG_USB_NET_SMSC95XX is not set | 682 | # CONFIG_USB_NET_SMSC95XX is not set |
| 635 | # CONFIG_USB_NET_GL620A is not set | 683 | # CONFIG_USB_NET_GL620A is not set |
| 636 | # CONFIG_USB_NET_NET1080 is not set | 684 | # CONFIG_USB_NET_NET1080 is not set |
| @@ -665,6 +713,7 @@ CONFIG_SLHC=m | |||
| 665 | CONFIG_INPUT=y | 713 | CONFIG_INPUT=y |
| 666 | CONFIG_INPUT_FF_MEMLESS=m | 714 | CONFIG_INPUT_FF_MEMLESS=m |
| 667 | # CONFIG_INPUT_POLLDEV is not set | 715 | # CONFIG_INPUT_POLLDEV is not set |
| 716 | # CONFIG_INPUT_SPARSEKMAP is not set | ||
| 668 | 717 | ||
| 669 | # | 718 | # |
| 670 | # Userland interfaces | 719 | # Userland interfaces |
| @@ -712,6 +761,8 @@ CONFIG_DEVKMEM=y | |||
| 712 | # | 761 | # |
| 713 | # Non-8250 serial port support | 762 | # Non-8250 serial port support |
| 714 | # | 763 | # |
| 764 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 765 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
| 715 | CONFIG_UNIX98_PTYS=y | 766 | CONFIG_UNIX98_PTYS=y |
| 716 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 767 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 717 | # CONFIG_LEGACY_PTYS is not set | 768 | # CONFIG_LEGACY_PTYS is not set |
| @@ -735,7 +786,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
| 735 | # CONFIG_POWER_SUPPLY is not set | 786 | # CONFIG_POWER_SUPPLY is not set |
| 736 | # CONFIG_HWMON is not set | 787 | # CONFIG_HWMON is not set |
| 737 | # CONFIG_THERMAL is not set | 788 | # CONFIG_THERMAL is not set |
| 738 | # CONFIG_THERMAL_HWMON is not set | ||
| 739 | # CONFIG_WATCHDOG is not set | 789 | # CONFIG_WATCHDOG is not set |
| 740 | CONFIG_SSB_POSSIBLE=y | 790 | CONFIG_SSB_POSSIBLE=y |
| 741 | 791 | ||
| @@ -841,13 +891,13 @@ CONFIG_SND_PS3=m | |||
| 841 | CONFIG_SND_PS3_DEFAULT_START_DELAY=2000 | 891 | CONFIG_SND_PS3_DEFAULT_START_DELAY=2000 |
| 842 | CONFIG_SND_USB=y | 892 | CONFIG_SND_USB=y |
| 843 | CONFIG_SND_USB_AUDIO=m | 893 | CONFIG_SND_USB_AUDIO=m |
| 894 | # CONFIG_SND_USB_UA101 is not set | ||
| 844 | # CONFIG_SND_USB_USX2Y is not set | 895 | # CONFIG_SND_USB_USX2Y is not set |
| 845 | # CONFIG_SND_USB_CAIAQ is not set | 896 | # CONFIG_SND_USB_CAIAQ is not set |
| 846 | # CONFIG_SND_SOC is not set | 897 | # CONFIG_SND_SOC is not set |
| 847 | # CONFIG_SOUND_PRIME is not set | 898 | # CONFIG_SOUND_PRIME is not set |
| 848 | CONFIG_HID_SUPPORT=y | 899 | CONFIG_HID_SUPPORT=y |
| 849 | CONFIG_HID=y | 900 | CONFIG_HID=y |
| 850 | # CONFIG_HID_DEBUG is not set | ||
| 851 | CONFIG_HIDRAW=y | 901 | CONFIG_HIDRAW=y |
| 852 | 902 | ||
| 853 | # | 903 | # |
| @@ -866,6 +916,7 @@ CONFIG_USB_HIDDEV=y | |||
| 866 | # | 916 | # |
| 867 | # Special HID drivers | 917 | # Special HID drivers |
| 868 | # | 918 | # |
| 919 | # CONFIG_HID_3M_PCT is not set | ||
| 869 | # CONFIG_HID_A4TECH is not set | 920 | # CONFIG_HID_A4TECH is not set |
| 870 | CONFIG_HID_APPLE=m | 921 | CONFIG_HID_APPLE=m |
| 871 | CONFIG_HID_BELKIN=m | 922 | CONFIG_HID_BELKIN=m |
| @@ -876,17 +927,24 @@ CONFIG_HID_CHERRY=m | |||
| 876 | CONFIG_HID_EZKEY=m | 927 | CONFIG_HID_EZKEY=m |
| 877 | # CONFIG_HID_KYE is not set | 928 | # CONFIG_HID_KYE is not set |
| 878 | # CONFIG_HID_GYRATION is not set | 929 | # CONFIG_HID_GYRATION is not set |
| 930 | CONFIG_HID_TWINHAN=m | ||
| 879 | # CONFIG_HID_KENSINGTON is not set | 931 | # CONFIG_HID_KENSINGTON is not set |
| 880 | CONFIG_HID_LOGITECH=m | 932 | CONFIG_HID_LOGITECH=m |
| 881 | # CONFIG_LOGITECH_FF is not set | 933 | # CONFIG_LOGITECH_FF is not set |
| 882 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 934 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 935 | # CONFIG_LOGIG940_FF is not set | ||
| 936 | # CONFIG_HID_MAGICMOUSE is not set | ||
| 883 | CONFIG_HID_MICROSOFT=m | 937 | CONFIG_HID_MICROSOFT=m |
| 938 | # CONFIG_HID_MOSART is not set | ||
| 884 | # CONFIG_HID_MONTEREY is not set | 939 | # CONFIG_HID_MONTEREY is not set |
| 885 | # CONFIG_HID_NTRIG is not set | 940 | # CONFIG_HID_NTRIG is not set |
| 941 | # CONFIG_HID_ORTEK is not set | ||
| 886 | # CONFIG_HID_PANTHERLORD is not set | 942 | # CONFIG_HID_PANTHERLORD is not set |
| 887 | # CONFIG_HID_PETALYNX is not set | 943 | # CONFIG_HID_PETALYNX is not set |
| 944 | # CONFIG_HID_QUANTA is not set | ||
| 888 | # CONFIG_HID_SAMSUNG is not set | 945 | # CONFIG_HID_SAMSUNG is not set |
| 889 | CONFIG_HID_SONY=m | 946 | CONFIG_HID_SONY=m |
| 947 | # CONFIG_HID_STANTUM is not set | ||
| 890 | CONFIG_HID_SUNPLUS=m | 948 | CONFIG_HID_SUNPLUS=m |
| 891 | # CONFIG_HID_GREENASIA is not set | 949 | # CONFIG_HID_GREENASIA is not set |
| 892 | CONFIG_HID_SMARTJOYPLUS=m | 950 | CONFIG_HID_SMARTJOYPLUS=m |
| @@ -901,7 +959,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 901 | CONFIG_USB_ARCH_HAS_EHCI=y | 959 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 902 | CONFIG_USB=m | 960 | CONFIG_USB=m |
| 903 | # CONFIG_USB_DEBUG is not set | 961 | # CONFIG_USB_DEBUG is not set |
| 904 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | 962 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y |
| 905 | 963 | ||
| 906 | # | 964 | # |
| 907 | # Miscellaneous USB options | 965 | # Miscellaneous USB options |
| @@ -909,7 +967,6 @@ CONFIG_USB=m | |||
| 909 | CONFIG_USB_DEVICEFS=y | 967 | CONFIG_USB_DEVICEFS=y |
| 910 | # CONFIG_USB_DEVICE_CLASS is not set | 968 | # CONFIG_USB_DEVICE_CLASS is not set |
| 911 | # CONFIG_USB_DYNAMIC_MINORS is not set | 969 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 912 | CONFIG_USB_SUSPEND=y | ||
| 913 | # CONFIG_USB_OTG is not set | 970 | # CONFIG_USB_OTG is not set |
| 914 | # CONFIG_USB_OTG_WHITELIST is not set | 971 | # CONFIG_USB_OTG_WHITELIST is not set |
| 915 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 972 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| @@ -923,12 +980,13 @@ CONFIG_USB_MON=m | |||
| 923 | # CONFIG_USB_C67X00_HCD is not set | 980 | # CONFIG_USB_C67X00_HCD is not set |
| 924 | CONFIG_USB_EHCI_HCD=m | 981 | CONFIG_USB_EHCI_HCD=m |
| 925 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 982 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 926 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 983 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 927 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | 984 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y |
| 928 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 985 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 929 | # CONFIG_USB_OXU210HP_HCD is not set | 986 | # CONFIG_USB_OXU210HP_HCD is not set |
| 930 | # CONFIG_USB_ISP116X_HCD is not set | 987 | # CONFIG_USB_ISP116X_HCD is not set |
| 931 | # CONFIG_USB_ISP1760_HCD is not set | 988 | # CONFIG_USB_ISP1760_HCD is not set |
| 989 | # CONFIG_USB_ISP1362_HCD is not set | ||
| 932 | CONFIG_USB_OHCI_HCD=m | 990 | CONFIG_USB_OHCI_HCD=m |
| 933 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | 991 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set |
| 934 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 992 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
| @@ -995,7 +1053,6 @@ CONFIG_USB_STORAGE=m | |||
| 995 | # CONFIG_USB_RIO500 is not set | 1053 | # CONFIG_USB_RIO500 is not set |
| 996 | # CONFIG_USB_LEGOTOWER is not set | 1054 | # CONFIG_USB_LEGOTOWER is not set |
| 997 | # CONFIG_USB_LCD is not set | 1055 | # CONFIG_USB_LCD is not set |
| 998 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 999 | # CONFIG_USB_LED is not set | 1056 | # CONFIG_USB_LED is not set |
| 1000 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1057 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1001 | # CONFIG_USB_CYTHERM is not set | 1058 | # CONFIG_USB_CYTHERM is not set |
| @@ -1008,7 +1065,6 @@ CONFIG_USB_STORAGE=m | |||
| 1008 | # CONFIG_USB_IOWARRIOR is not set | 1065 | # CONFIG_USB_IOWARRIOR is not set |
| 1009 | # CONFIG_USB_TEST is not set | 1066 | # CONFIG_USB_TEST is not set |
| 1010 | # CONFIG_USB_ISIGHTFW is not set | 1067 | # CONFIG_USB_ISIGHTFW is not set |
| 1011 | # CONFIG_USB_VST is not set | ||
| 1012 | # CONFIG_USB_GADGET is not set | 1068 | # CONFIG_USB_GADGET is not set |
| 1013 | 1069 | ||
| 1014 | # | 1070 | # |
| @@ -1048,7 +1104,9 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1048 | # CONFIG_RTC_DRV_M48T86 is not set | 1104 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1049 | # CONFIG_RTC_DRV_M48T35 is not set | 1105 | # CONFIG_RTC_DRV_M48T35 is not set |
| 1050 | # CONFIG_RTC_DRV_M48T59 is not set | 1106 | # CONFIG_RTC_DRV_M48T59 is not set |
| 1107 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
| 1051 | # CONFIG_RTC_DRV_BQ4802 is not set | 1108 | # CONFIG_RTC_DRV_BQ4802 is not set |
| 1109 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
| 1052 | # CONFIG_RTC_DRV_V3020 is not set | 1110 | # CONFIG_RTC_DRV_V3020 is not set |
| 1053 | 1111 | ||
| 1054 | # | 1112 | # |
| @@ -1077,10 +1135,10 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 1077 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1135 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1078 | # CONFIG_EXT3_FS_SECURITY is not set | 1136 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1079 | CONFIG_EXT4_FS=y | 1137 | CONFIG_EXT4_FS=y |
| 1080 | # CONFIG_EXT4DEV_COMPAT is not set | ||
| 1081 | CONFIG_EXT4_FS_XATTR=y | 1138 | CONFIG_EXT4_FS_XATTR=y |
| 1082 | # CONFIG_EXT4_FS_POSIX_ACL is not set | 1139 | # CONFIG_EXT4_FS_POSIX_ACL is not set |
| 1083 | # CONFIG_EXT4_FS_SECURITY is not set | 1140 | # CONFIG_EXT4_FS_SECURITY is not set |
| 1141 | # CONFIG_EXT4_DEBUG is not set | ||
| 1084 | CONFIG_JBD=m | 1142 | CONFIG_JBD=m |
| 1085 | # CONFIG_JBD_DEBUG is not set | 1143 | # CONFIG_JBD_DEBUG is not set |
| 1086 | CONFIG_JBD2=y | 1144 | CONFIG_JBD2=y |
| @@ -1093,6 +1151,7 @@ CONFIG_FS_MBCACHE=y | |||
| 1093 | # CONFIG_GFS2_FS is not set | 1151 | # CONFIG_GFS2_FS is not set |
| 1094 | # CONFIG_OCFS2_FS is not set | 1152 | # CONFIG_OCFS2_FS is not set |
| 1095 | # CONFIG_BTRFS_FS is not set | 1153 | # CONFIG_BTRFS_FS is not set |
| 1154 | # CONFIG_NILFS2_FS is not set | ||
| 1096 | CONFIG_FILE_LOCKING=y | 1155 | CONFIG_FILE_LOCKING=y |
| 1097 | CONFIG_FSNOTIFY=y | 1156 | CONFIG_FSNOTIFY=y |
| 1098 | CONFIG_DNOTIFY=y | 1157 | CONFIG_DNOTIFY=y |
| @@ -1154,6 +1213,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1154 | # CONFIG_BEFS_FS is not set | 1213 | # CONFIG_BEFS_FS is not set |
| 1155 | # CONFIG_BFS_FS is not set | 1214 | # CONFIG_BFS_FS is not set |
| 1156 | # CONFIG_EFS_FS is not set | 1215 | # CONFIG_EFS_FS is not set |
| 1216 | # CONFIG_LOGFS is not set | ||
| 1157 | # CONFIG_CRAMFS is not set | 1217 | # CONFIG_CRAMFS is not set |
| 1158 | # CONFIG_SQUASHFS is not set | 1218 | # CONFIG_SQUASHFS is not set |
| 1159 | # CONFIG_VXFS_FS is not set | 1219 | # CONFIG_VXFS_FS is not set |
| @@ -1164,7 +1224,6 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1164 | # CONFIG_ROMFS_FS is not set | 1224 | # CONFIG_ROMFS_FS is not set |
| 1165 | # CONFIG_SYSV_FS is not set | 1225 | # CONFIG_SYSV_FS is not set |
| 1166 | # CONFIG_UFS_FS is not set | 1226 | # CONFIG_UFS_FS is not set |
| 1167 | # CONFIG_NILFS2_FS is not set | ||
| 1168 | CONFIG_NETWORK_FILESYSTEMS=y | 1227 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1169 | CONFIG_NFS_FS=y | 1228 | CONFIG_NFS_FS=y |
| 1170 | CONFIG_NFS_V3=y | 1229 | CONFIG_NFS_V3=y |
| @@ -1181,6 +1240,7 @@ CONFIG_SUNRPC_GSS=y | |||
| 1181 | CONFIG_RPCSEC_GSS_KRB5=y | 1240 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1182 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1241 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1183 | # CONFIG_SMB_FS is not set | 1242 | # CONFIG_SMB_FS is not set |
| 1243 | # CONFIG_CEPH_FS is not set | ||
| 1184 | CONFIG_CIFS=m | 1244 | CONFIG_CIFS=m |
| 1185 | # CONFIG_CIFS_STATS is not set | 1245 | # CONFIG_CIFS_STATS is not set |
| 1186 | # CONFIG_CIFS_WEAK_PW_HASH is not set | 1246 | # CONFIG_CIFS_WEAK_PW_HASH is not set |
| @@ -1237,7 +1297,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1237 | # CONFIG_NLS_KOI8_U is not set | 1297 | # CONFIG_NLS_KOI8_U is not set |
| 1238 | # CONFIG_NLS_UTF8 is not set | 1298 | # CONFIG_NLS_UTF8 is not set |
| 1239 | # CONFIG_DLM is not set | 1299 | # CONFIG_DLM is not set |
| 1240 | CONFIG_BINARY_PRINTF=y | 1300 | # CONFIG_BINARY_PRINTF is not set |
| 1241 | 1301 | ||
| 1242 | # | 1302 | # |
| 1243 | # Library routines | 1303 | # Library routines |
| @@ -1270,6 +1330,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
| 1270 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
| 1271 | CONFIG_FRAME_WARN=2048 | 1331 | CONFIG_FRAME_WARN=2048 |
| 1272 | CONFIG_MAGIC_SYSRQ=y | 1332 | CONFIG_MAGIC_SYSRQ=y |
| 1333 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 1273 | # CONFIG_UNUSED_SYMBOLS is not set | 1334 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1274 | CONFIG_DEBUG_FS=y | 1335 | CONFIG_DEBUG_FS=y |
| 1275 | # CONFIG_HEADERS_CHECK is not set | 1336 | # CONFIG_HEADERS_CHECK is not set |
| @@ -1292,6 +1353,7 @@ CONFIG_DEBUG_SPINLOCK=y | |||
| 1292 | CONFIG_DEBUG_MUTEXES=y | 1353 | CONFIG_DEBUG_MUTEXES=y |
| 1293 | CONFIG_DEBUG_LOCK_ALLOC=y | 1354 | CONFIG_DEBUG_LOCK_ALLOC=y |
| 1294 | CONFIG_PROVE_LOCKING=y | 1355 | CONFIG_PROVE_LOCKING=y |
| 1356 | # CONFIG_PROVE_RCU is not set | ||
| 1295 | CONFIG_LOCKDEP=y | 1357 | CONFIG_LOCKDEP=y |
| 1296 | # CONFIG_LOCK_STAT is not set | 1358 | # CONFIG_LOCK_STAT is not set |
| 1297 | CONFIG_DEBUG_LOCKDEP=y | 1359 | CONFIG_DEBUG_LOCKDEP=y |
| @@ -1308,26 +1370,27 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 1308 | CONFIG_DEBUG_LIST=y | 1370 | CONFIG_DEBUG_LIST=y |
| 1309 | # CONFIG_DEBUG_SG is not set | 1371 | # CONFIG_DEBUG_SG is not set |
| 1310 | # CONFIG_DEBUG_NOTIFIERS is not set | 1372 | # CONFIG_DEBUG_NOTIFIERS is not set |
| 1373 | # CONFIG_DEBUG_CREDENTIALS is not set | ||
| 1311 | # CONFIG_RCU_TORTURE_TEST is not set | 1374 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1312 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1375 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1313 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1376 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1314 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1377 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1378 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
| 1379 | # CONFIG_LKDTM is not set | ||
| 1315 | # CONFIG_FAULT_INJECTION is not set | 1380 | # CONFIG_FAULT_INJECTION is not set |
| 1316 | # CONFIG_LATENCYTOP is not set | 1381 | # CONFIG_LATENCYTOP is not set |
| 1317 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1382 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1318 | # CONFIG_DEBUG_PAGEALLOC is not set | 1383 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1319 | CONFIG_NOP_TRACER=y | ||
| 1320 | CONFIG_HAVE_FUNCTION_TRACER=y | 1384 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1321 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 1385 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
| 1322 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1386 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1323 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1387 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1324 | CONFIG_RING_BUFFER=y | 1388 | CONFIG_RING_BUFFER=y |
| 1325 | CONFIG_EVENT_TRACING=y | 1389 | CONFIG_RING_BUFFER_ALLOW_SWAP=y |
| 1326 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
| 1327 | CONFIG_TRACING=y | ||
| 1328 | CONFIG_TRACING_SUPPORT=y | 1390 | CONFIG_TRACING_SUPPORT=y |
| 1329 | # CONFIG_FTRACE is not set | 1391 | # CONFIG_FTRACE is not set |
| 1330 | # CONFIG_DYNAMIC_DEBUG is not set | 1392 | # CONFIG_DYNAMIC_DEBUG is not set |
| 1393 | # CONFIG_DMA_API_DEBUG is not set | ||
| 1331 | # CONFIG_SAMPLES is not set | 1394 | # CONFIG_SAMPLES is not set |
| 1332 | CONFIG_HAVE_ARCH_KGDB=y | 1395 | CONFIG_HAVE_ARCH_KGDB=y |
| 1333 | # CONFIG_KGDB is not set | 1396 | # CONFIG_KGDB is not set |
| @@ -1352,13 +1415,16 @@ CONFIG_IRQSTACKS=y | |||
| 1352 | # CONFIG_KEYS is not set | 1415 | # CONFIG_KEYS is not set |
| 1353 | # CONFIG_SECURITY is not set | 1416 | # CONFIG_SECURITY is not set |
| 1354 | # CONFIG_SECURITYFS is not set | 1417 | # CONFIG_SECURITYFS is not set |
| 1355 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1418 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
| 1419 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
| 1420 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
| 1421 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
| 1422 | CONFIG_DEFAULT_SECURITY="" | ||
| 1356 | CONFIG_CRYPTO=y | 1423 | CONFIG_CRYPTO=y |
| 1357 | 1424 | ||
| 1358 | # | 1425 | # |
| 1359 | # Crypto core or helper | 1426 | # Crypto core or helper |
| 1360 | # | 1427 | # |
| 1361 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1362 | CONFIG_CRYPTO_ALGAPI=y | 1428 | CONFIG_CRYPTO_ALGAPI=y |
| 1363 | CONFIG_CRYPTO_ALGAPI2=y | 1429 | CONFIG_CRYPTO_ALGAPI2=y |
| 1364 | CONFIG_CRYPTO_AEAD=m | 1430 | CONFIG_CRYPTO_AEAD=m |
| @@ -1374,6 +1440,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 1374 | CONFIG_CRYPTO_MANAGER2=y | 1440 | CONFIG_CRYPTO_MANAGER2=y |
| 1375 | CONFIG_CRYPTO_GF128MUL=m | 1441 | CONFIG_CRYPTO_GF128MUL=m |
| 1376 | # CONFIG_CRYPTO_NULL is not set | 1442 | # CONFIG_CRYPTO_NULL is not set |
| 1443 | # CONFIG_CRYPTO_PCRYPT is not set | ||
| 1377 | CONFIG_CRYPTO_WORKQUEUE=y | 1444 | CONFIG_CRYPTO_WORKQUEUE=y |
| 1378 | # CONFIG_CRYPTO_CRYPTD is not set | 1445 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1379 | # CONFIG_CRYPTO_AUTHENC is not set | 1446 | # CONFIG_CRYPTO_AUTHENC is not set |
| @@ -1402,11 +1469,13 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1402 | # | 1469 | # |
| 1403 | # CONFIG_CRYPTO_HMAC is not set | 1470 | # CONFIG_CRYPTO_HMAC is not set |
| 1404 | # CONFIG_CRYPTO_XCBC is not set | 1471 | # CONFIG_CRYPTO_XCBC is not set |
| 1472 | # CONFIG_CRYPTO_VMAC is not set | ||
| 1405 | 1473 | ||
| 1406 | # | 1474 | # |
| 1407 | # Digest | 1475 | # Digest |
| 1408 | # | 1476 | # |
| 1409 | # CONFIG_CRYPTO_CRC32C is not set | 1477 | # CONFIG_CRYPTO_CRC32C is not set |
| 1478 | CONFIG_CRYPTO_GHASH=m | ||
| 1410 | # CONFIG_CRYPTO_MD4 is not set | 1479 | # CONFIG_CRYPTO_MD4 is not set |
| 1411 | CONFIG_CRYPTO_MD5=y | 1480 | CONFIG_CRYPTO_MD5=y |
| 1412 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1481 | CONFIG_CRYPTO_MICHAEL_MIC=m |
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index f2f832161463..b1625801526e 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
| 4 | # Wed Jan 6 09:24:13 2010 | 4 | # Mon Apr 19 23:16:37 2010 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -94,11 +94,6 @@ CONFIG_RCU_FANOUT=32 | |||
| 94 | # CONFIG_TREE_RCU_TRACE is not set | 94 | # CONFIG_TREE_RCU_TRACE is not set |
| 95 | # CONFIG_IKCONFIG is not set | 95 | # CONFIG_IKCONFIG is not set |
| 96 | CONFIG_LOG_BUF_SHIFT=14 | 96 | CONFIG_LOG_BUF_SHIFT=14 |
| 97 | CONFIG_GROUP_SCHED=y | ||
| 98 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 99 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 100 | CONFIG_USER_SCHED=y | ||
| 101 | # CONFIG_CGROUP_SCHED is not set | ||
| 102 | # CONFIG_CGROUPS is not set | 97 | # CONFIG_CGROUPS is not set |
| 103 | CONFIG_SYSFS_DEPRECATED=y | 98 | CONFIG_SYSFS_DEPRECATED=y |
| 104 | CONFIG_SYSFS_DEPRECATED_V2=y | 99 | CONFIG_SYSFS_DEPRECATED_V2=y |
| @@ -314,6 +309,7 @@ CONFIG_ISA_DMA_API=y | |||
| 314 | # Bus options | 309 | # Bus options |
| 315 | # | 310 | # |
| 316 | CONFIG_ZONE_DMA=y | 311 | CONFIG_ZONE_DMA=y |
| 312 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
| 317 | CONFIG_GENERIC_ISA_DMA=y | 313 | CONFIG_GENERIC_ISA_DMA=y |
| 318 | CONFIG_PPC_INDIRECT_PCI=y | 314 | CONFIG_PPC_INDIRECT_PCI=y |
| 319 | CONFIG_FSL_SOC=y | 315 | CONFIG_FSL_SOC=y |
| @@ -323,7 +319,6 @@ CONFIG_PCI_SYSCALL=y | |||
| 323 | # CONFIG_PCIEPORTBUS is not set | 319 | # CONFIG_PCIEPORTBUS is not set |
| 324 | CONFIG_ARCH_SUPPORTS_MSI=y | 320 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 325 | # CONFIG_PCI_MSI is not set | 321 | # CONFIG_PCI_MSI is not set |
| 326 | # CONFIG_PCI_LEGACY is not set | ||
| 327 | # CONFIG_PCI_STUB is not set | 322 | # CONFIG_PCI_STUB is not set |
| 328 | # CONFIG_PCI_IOV is not set | 323 | # CONFIG_PCI_IOV is not set |
| 329 | # CONFIG_PCCARD is not set | 324 | # CONFIG_PCCARD is not set |
| @@ -349,7 +344,6 @@ CONFIG_NET=y | |||
| 349 | # Networking options | 344 | # Networking options |
| 350 | # | 345 | # |
| 351 | CONFIG_PACKET=m | 346 | CONFIG_PACKET=m |
| 352 | # CONFIG_PACKET_MMAP is not set | ||
| 353 | CONFIG_UNIX=y | 347 | CONFIG_UNIX=y |
| 354 | # CONFIG_NET_KEY is not set | 348 | # CONFIG_NET_KEY is not set |
| 355 | CONFIG_INET=y | 349 | CONFIG_INET=y |
| @@ -524,6 +518,8 @@ CONFIG_MTD_PHYSMAP=y | |||
| 524 | # UBI - Unsorted block images | 518 | # UBI - Unsorted block images |
| 525 | # | 519 | # |
| 526 | # CONFIG_MTD_UBI is not set | 520 | # CONFIG_MTD_UBI is not set |
| 521 | CONFIG_OF_FLATTREE=y | ||
| 522 | CONFIG_OF_DYNAMIC=y | ||
| 527 | CONFIG_OF_DEVICE=y | 523 | CONFIG_OF_DEVICE=y |
| 528 | CONFIG_OF_I2C=y | 524 | CONFIG_OF_I2C=y |
| 529 | # CONFIG_PARPORT is not set | 525 | # CONFIG_PARPORT is not set |
| @@ -555,6 +551,7 @@ CONFIG_MISC_DEVICES=y | |||
| 555 | # CONFIG_ENCLOSURE_SERVICES is not set | 551 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 556 | # CONFIG_HP_ILO is not set | 552 | # CONFIG_HP_ILO is not set |
| 557 | # CONFIG_ISL29003 is not set | 553 | # CONFIG_ISL29003 is not set |
| 554 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 558 | # CONFIG_DS1682 is not set | 555 | # CONFIG_DS1682 is not set |
| 559 | # CONFIG_C2PORT is not set | 556 | # CONFIG_C2PORT is not set |
| 560 | 557 | ||
| @@ -626,6 +623,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 626 | # | 623 | # |
| 627 | # SCSI device support | 624 | # SCSI device support |
| 628 | # | 625 | # |
| 626 | CONFIG_SCSI_MOD=y | ||
| 629 | # CONFIG_RAID_ATTRS is not set | 627 | # CONFIG_RAID_ATTRS is not set |
| 630 | CONFIG_SCSI=y | 628 | CONFIG_SCSI=y |
| 631 | CONFIG_SCSI_DMA=y | 629 | CONFIG_SCSI_DMA=y |
| @@ -846,6 +844,7 @@ CONFIG_SERIAL_CORE=y | |||
| 846 | CONFIG_SERIAL_CORE_CONSOLE=y | 844 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 847 | # CONFIG_SERIAL_JSM is not set | 845 | # CONFIG_SERIAL_JSM is not set |
| 848 | # CONFIG_SERIAL_OF_PLATFORM is not set | 846 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 847 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 849 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 848 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
| 850 | CONFIG_UNIX98_PTYS=y | 849 | CONFIG_UNIX98_PTYS=y |
| 851 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 850 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| @@ -895,6 +894,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 895 | CONFIG_I2C_MPC=y | 894 | CONFIG_I2C_MPC=y |
| 896 | # CONFIG_I2C_OCORES is not set | 895 | # CONFIG_I2C_OCORES is not set |
| 897 | # CONFIG_I2C_SIMTEC is not set | 896 | # CONFIG_I2C_SIMTEC is not set |
| 897 | # CONFIG_I2C_XILINX is not set | ||
| 898 | 898 | ||
| 899 | # | 899 | # |
| 900 | # External I2C/SMBus adapter drivers | 900 | # External I2C/SMBus adapter drivers |
| @@ -908,15 +908,9 @@ CONFIG_I2C_MPC=y | |||
| 908 | # | 908 | # |
| 909 | # CONFIG_I2C_PCA_PLATFORM is not set | 909 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 910 | # CONFIG_I2C_STUB is not set | 910 | # CONFIG_I2C_STUB is not set |
| 911 | |||
| 912 | # | ||
| 913 | # Miscellaneous I2C Chip support | ||
| 914 | # | ||
| 915 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 916 | # CONFIG_I2C_DEBUG_CORE is not set | 911 | # CONFIG_I2C_DEBUG_CORE is not set |
| 917 | # CONFIG_I2C_DEBUG_ALGO is not set | 912 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 918 | # CONFIG_I2C_DEBUG_BUS is not set | 913 | # CONFIG_I2C_DEBUG_BUS is not set |
| 919 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 920 | # CONFIG_SPI is not set | 914 | # CONFIG_SPI is not set |
| 921 | 915 | ||
| 922 | # | 916 | # |
| @@ -941,18 +935,21 @@ CONFIG_SSB_POSSIBLE=y | |||
| 941 | # Multifunction device drivers | 935 | # Multifunction device drivers |
| 942 | # | 936 | # |
| 943 | # CONFIG_MFD_CORE is not set | 937 | # CONFIG_MFD_CORE is not set |
| 938 | # CONFIG_MFD_88PM860X is not set | ||
| 944 | # CONFIG_MFD_SM501 is not set | 939 | # CONFIG_MFD_SM501 is not set |
| 945 | # CONFIG_HTC_PASIC3 is not set | 940 | # CONFIG_HTC_PASIC3 is not set |
| 946 | # CONFIG_TWL4030_CORE is not set | 941 | # CONFIG_TWL4030_CORE is not set |
| 947 | # CONFIG_MFD_TMIO is not set | 942 | # CONFIG_MFD_TMIO is not set |
| 948 | # CONFIG_PMIC_DA903X is not set | 943 | # CONFIG_PMIC_DA903X is not set |
| 949 | # CONFIG_PMIC_ADP5520 is not set | 944 | # CONFIG_PMIC_ADP5520 is not set |
| 945 | # CONFIG_MFD_MAX8925 is not set | ||
| 950 | # CONFIG_MFD_WM8400 is not set | 946 | # CONFIG_MFD_WM8400 is not set |
| 951 | # CONFIG_MFD_WM831X is not set | 947 | # CONFIG_MFD_WM831X is not set |
| 952 | # CONFIG_MFD_WM8350_I2C is not set | 948 | # CONFIG_MFD_WM8350_I2C is not set |
| 949 | # CONFIG_MFD_WM8994 is not set | ||
| 953 | # CONFIG_MFD_PCF50633 is not set | 950 | # CONFIG_MFD_PCF50633 is not set |
| 954 | # CONFIG_AB3100_CORE is not set | 951 | # CONFIG_AB3100_CORE is not set |
| 955 | # CONFIG_MFD_88PM8607 is not set | 952 | # CONFIG_LPC_SCH is not set |
| 956 | # CONFIG_REGULATOR is not set | 953 | # CONFIG_REGULATOR is not set |
| 957 | # CONFIG_MEDIA_SUPPORT is not set | 954 | # CONFIG_MEDIA_SUPPORT is not set |
| 958 | 955 | ||
| @@ -961,6 +958,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 961 | # | 958 | # |
| 962 | # CONFIG_AGP is not set | 959 | # CONFIG_AGP is not set |
| 963 | CONFIG_VGA_ARB=y | 960 | CONFIG_VGA_ARB=y |
| 961 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
| 964 | # CONFIG_DRM is not set | 962 | # CONFIG_DRM is not set |
| 965 | # CONFIG_VGASTATE is not set | 963 | # CONFIG_VGASTATE is not set |
| 966 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 964 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| @@ -1071,7 +1069,6 @@ CONFIG_USB_STORAGE=y | |||
| 1071 | # CONFIG_USB_RIO500 is not set | 1069 | # CONFIG_USB_RIO500 is not set |
| 1072 | # CONFIG_USB_LEGOTOWER is not set | 1070 | # CONFIG_USB_LEGOTOWER is not set |
| 1073 | # CONFIG_USB_LCD is not set | 1071 | # CONFIG_USB_LCD is not set |
| 1074 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1075 | # CONFIG_USB_LED is not set | 1072 | # CONFIG_USB_LED is not set |
| 1076 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1073 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1077 | # CONFIG_USB_CYTHERM is not set | 1074 | # CONFIG_USB_CYTHERM is not set |
| @@ -1084,7 +1081,6 @@ CONFIG_USB_STORAGE=y | |||
| 1084 | # CONFIG_USB_IOWARRIOR is not set | 1081 | # CONFIG_USB_IOWARRIOR is not set |
| 1085 | # CONFIG_USB_TEST is not set | 1082 | # CONFIG_USB_TEST is not set |
| 1086 | # CONFIG_USB_ISIGHTFW is not set | 1083 | # CONFIG_USB_ISIGHTFW is not set |
| 1087 | # CONFIG_USB_VST is not set | ||
| 1088 | # CONFIG_USB_GADGET is not set | 1084 | # CONFIG_USB_GADGET is not set |
| 1089 | 1085 | ||
| 1090 | # | 1086 | # |
| @@ -1251,6 +1247,7 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1251 | # CONFIG_JFFS2_LZO is not set | 1247 | # CONFIG_JFFS2_LZO is not set |
| 1252 | CONFIG_JFFS2_RTIME=y | 1248 | CONFIG_JFFS2_RTIME=y |
| 1253 | # CONFIG_JFFS2_RUBIN is not set | 1249 | # CONFIG_JFFS2_RUBIN is not set |
| 1250 | # CONFIG_LOGFS is not set | ||
| 1254 | # CONFIG_CRAMFS is not set | 1251 | # CONFIG_CRAMFS is not set |
| 1255 | # CONFIG_SQUASHFS is not set | 1252 | # CONFIG_SQUASHFS is not set |
| 1256 | # CONFIG_VXFS_FS is not set | 1253 | # CONFIG_VXFS_FS is not set |
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index e96d52a516ba..53b64be40eb2 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h | |||
| @@ -108,8 +108,21 @@ extern phys_addr_t kernstart_addr; | |||
| 108 | #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) | 108 | #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) |
| 109 | #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) | 109 | #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) |
| 110 | 110 | ||
| 111 | #define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - MEMORY_START)) | 111 | /* |
| 112 | * On Book-E parts we need __va to parse the device tree and we can't | ||
| 113 | * determine MEMORY_START until then. However we can determine PHYSICAL_START | ||
| 114 | * from information at hand (program counter, TLB lookup). | ||
| 115 | * | ||
| 116 | * On non-Book-E PPC64 PAGE_OFFSET and MEMORY_START are constants so use | ||
| 117 | * the other definitions for __va & __pa. | ||
| 118 | */ | ||
| 119 | #ifdef CONFIG_BOOKE | ||
| 120 | #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) - PHYSICAL_START + KERNELBASE)) | ||
| 121 | #define __pa(x) ((unsigned long)(x) + PHYSICAL_START - KERNELBASE) | ||
| 122 | #else | ||
| 123 | #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + PAGE_OFFSET - MEMORY_START)) | ||
| 112 | #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START) | 124 | #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START) |
| 125 | #endif | ||
| 113 | 126 | ||
| 114 | /* | 127 | /* |
| 115 | * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI, | 128 | * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI, |
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 5f306c4946e5..97d4bd9442d3 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -653,6 +653,7 @@ static void __init early_cmdline_parse(void) | |||
| 653 | #else | 653 | #else |
| 654 | #define OV5_CMO 0x00 | 654 | #define OV5_CMO 0x00 |
| 655 | #endif | 655 | #endif |
| 656 | #define OV5_TYPE1_AFFINITY 0x80 /* Type 1 NUMA affinity */ | ||
| 656 | 657 | ||
| 657 | /* Option Vector 6: IBM PAPR hints */ | 658 | /* Option Vector 6: IBM PAPR hints */ |
| 658 | #define OV6_LINUX 0x02 /* Linux is our OS */ | 659 | #define OV6_LINUX 0x02 /* Linux is our OS */ |
| @@ -706,7 +707,7 @@ static unsigned char ibm_architecture_vec[] = { | |||
| 706 | OV5_DONATE_DEDICATE_CPU | OV5_MSI, | 707 | OV5_DONATE_DEDICATE_CPU | OV5_MSI, |
| 707 | 0, | 708 | 0, |
| 708 | OV5_CMO, | 709 | OV5_CMO, |
| 709 | 0, | 710 | OV5_TYPE1_AFFINITY, |
| 710 | 0, | 711 | 0, |
| 711 | 0, | 712 | 0, |
| 712 | 0, | 713 | 0, |
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index c5394728bf2e..1ed6b52f3031 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c | |||
| @@ -116,7 +116,7 @@ void loadcam_entry(int idx) | |||
| 116 | mtspr(SPRN_MAS2, TLBCAM[idx].MAS2); | 116 | mtspr(SPRN_MAS2, TLBCAM[idx].MAS2); |
| 117 | mtspr(SPRN_MAS3, TLBCAM[idx].MAS3); | 117 | mtspr(SPRN_MAS3, TLBCAM[idx].MAS3); |
| 118 | 118 | ||
| 119 | if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS) | 119 | if (mmu_has_feature(MMU_FTR_BIG_PHYS)) |
| 120 | mtspr(SPRN_MAS7, TLBCAM[idx].MAS7); | 120 | mtspr(SPRN_MAS7, TLBCAM[idx].MAS7); |
| 121 | 121 | ||
| 122 | asm volatile("isync;tlbwe;isync" : : : "memory"); | 122 | asm volatile("isync;tlbwe;isync" : : : "memory"); |
| @@ -152,18 +152,13 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t phys, | |||
| 152 | 152 | ||
| 153 | TLBCAM[index].MAS3 = (phys & MAS3_RPN) | MAS3_SX | MAS3_SR; | 153 | TLBCAM[index].MAS3 = (phys & MAS3_RPN) | MAS3_SX | MAS3_SR; |
| 154 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0); | 154 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0); |
| 155 | if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS) | 155 | if (mmu_has_feature(MMU_FTR_BIG_PHYS)) |
| 156 | TLBCAM[index].MAS7 = (u64)phys >> 32; | 156 | TLBCAM[index].MAS7 = (u64)phys >> 32; |
| 157 | 157 | ||
| 158 | #ifndef CONFIG_KGDB /* want user access for breakpoints */ | ||
| 159 | if (flags & _PAGE_USER) { | 158 | if (flags & _PAGE_USER) { |
| 160 | TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR; | 159 | TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR; |
| 161 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0); | 160 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0); |
| 162 | } | 161 | } |
| 163 | #else | ||
| 164 | TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR; | ||
| 165 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0); | ||
| 166 | #endif | ||
| 167 | 162 | ||
| 168 | tlbcam_addrs[index].start = virt; | 163 | tlbcam_addrs[index].start = virt; |
| 169 | tlbcam_addrs[index].limit = virt + size - 1; | 164 | tlbcam_addrs[index].limit = virt + size - 1; |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 64c00227b997..eaa7633515b7 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -242,10 +242,11 @@ EXPORT_SYMBOL_GPL(of_node_to_nid); | |||
| 242 | */ | 242 | */ |
| 243 | static int __init find_min_common_depth(void) | 243 | static int __init find_min_common_depth(void) |
| 244 | { | 244 | { |
| 245 | int depth; | 245 | int depth, index; |
| 246 | const unsigned int *ref_points; | 246 | const unsigned int *ref_points; |
| 247 | struct device_node *rtas_root; | 247 | struct device_node *rtas_root; |
| 248 | unsigned int len; | 248 | unsigned int len; |
| 249 | struct device_node *options; | ||
| 249 | 250 | ||
| 250 | rtas_root = of_find_node_by_path("/rtas"); | 251 | rtas_root = of_find_node_by_path("/rtas"); |
| 251 | 252 | ||
| @@ -258,11 +259,23 @@ static int __init find_min_common_depth(void) | |||
| 258 | * configuration (should be all 0's) and the second is for a normal | 259 | * configuration (should be all 0's) and the second is for a normal |
| 259 | * NUMA configuration. | 260 | * NUMA configuration. |
| 260 | */ | 261 | */ |
| 262 | index = 1; | ||
| 261 | ref_points = of_get_property(rtas_root, | 263 | ref_points = of_get_property(rtas_root, |
| 262 | "ibm,associativity-reference-points", &len); | 264 | "ibm,associativity-reference-points", &len); |
| 263 | 265 | ||
| 266 | /* | ||
| 267 | * For type 1 affinity information we want the first field | ||
| 268 | */ | ||
| 269 | options = of_find_node_by_path("/options"); | ||
| 270 | if (options) { | ||
| 271 | const char *str; | ||
| 272 | str = of_get_property(options, "ibm,associativity-form", NULL); | ||
| 273 | if (str && !strcmp(str, "1")) | ||
| 274 | index = 0; | ||
| 275 | } | ||
| 276 | |||
| 264 | if ((len >= 2 * sizeof(unsigned int)) && ref_points) { | 277 | if ((len >= 2 * sizeof(unsigned int)) && ref_points) { |
| 265 | depth = ref_points[1]; | 278 | depth = ref_points[index]; |
| 266 | } else { | 279 | } else { |
| 267 | dbg("NUMA: ibm,associativity-reference-points not found.\n"); | 280 | dbg("NUMA: ibm,associativity-reference-points not found.\n"); |
| 268 | depth = -1; | 281 | depth = -1; |
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index d95121894eb7..3a2ade2e443f 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -51,7 +51,7 @@ config MPC85xx_DS | |||
| 51 | bool "Freescale MPC85xx DS" | 51 | bool "Freescale MPC85xx DS" |
| 52 | select PPC_I8259 | 52 | select PPC_I8259 |
| 53 | select DEFAULT_UIMAGE | 53 | select DEFAULT_UIMAGE |
| 54 | select FSL_ULI1575 | 54 | select FSL_ULI1575 if PCI |
| 55 | select SWIOTLB | 55 | select SWIOTLB |
| 56 | help | 56 | help |
| 57 | This option enables support for the MPC85xx DS (MPC8544 DS) board | 57 | This option enables support for the MPC85xx DS (MPC8544 DS) board |
| @@ -60,7 +60,7 @@ config MPC85xx_RDB | |||
| 60 | bool "Freescale MPC85xx RDB" | 60 | bool "Freescale MPC85xx RDB" |
| 61 | select PPC_I8259 | 61 | select PPC_I8259 |
| 62 | select DEFAULT_UIMAGE | 62 | select DEFAULT_UIMAGE |
| 63 | select FSL_ULI1575 | 63 | select FSL_ULI1575 if PCI |
| 64 | select SWIOTLB | 64 | select SWIOTLB |
| 65 | help | 65 | help |
| 66 | This option enables support for the MPC85xx RDB (P2020 RDB) board | 66 | This option enables support for the MPC85xx RDB (P2020 RDB) board |
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index fbe9f3621424..a0b5638c5dc8 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig | |||
| @@ -13,7 +13,7 @@ config MPC8641_HPCN | |||
| 13 | bool "Freescale MPC8641 HPCN" | 13 | bool "Freescale MPC8641 HPCN" |
| 14 | select PPC_I8259 | 14 | select PPC_I8259 |
| 15 | select DEFAULT_UIMAGE | 15 | select DEFAULT_UIMAGE |
| 16 | select FSL_ULI1575 | 16 | select FSL_ULI1575 if PCI |
| 17 | select HAS_RAPIDIO | 17 | select HAS_RAPIDIO |
| 18 | select SWIOTLB | 18 | select SWIOTLB |
| 19 | help | 19 | help |
| @@ -28,7 +28,7 @@ config SBC8641D | |||
| 28 | config MPC8610_HPCD | 28 | config MPC8610_HPCD |
| 29 | bool "Freescale MPC8610 HPCD" | 29 | bool "Freescale MPC8610 HPCD" |
| 30 | select DEFAULT_UIMAGE | 30 | select DEFAULT_UIMAGE |
| 31 | select FSL_ULI1575 | 31 | select FSL_ULI1575 if PCI |
| 32 | help | 32 | help |
| 33 | This option enables support for the MPC8610 HPCD board. | 33 | This option enables support for the MPC8610 HPCD board. |
| 34 | 34 | ||
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 9b21ee68ea50..01e7b5bb3c1d 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/of.h> | 12 | #include <linux/of.h> |
| 13 | #include <linux/lmb.h> | 13 | #include <linux/lmb.h> |
| 14 | #include <linux/vmalloc.h> | ||
| 14 | #include <asm/firmware.h> | 15 | #include <asm/firmware.h> |
| 15 | #include <asm/machdep.h> | 16 | #include <asm/machdep.h> |
| 16 | #include <asm/pSeries_reconfig.h> | 17 | #include <asm/pSeries_reconfig.h> |
| @@ -54,6 +55,12 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size) | |||
| 54 | */ | 55 | */ |
| 55 | start = (unsigned long)__va(base); | 56 | start = (unsigned long)__va(base); |
| 56 | ret = remove_section_mapping(start, start + lmb_size); | 57 | ret = remove_section_mapping(start, start + lmb_size); |
| 58 | |||
| 59 | /* Ensure all vmalloc mappings are flushed in case they also | ||
| 60 | * hit that section of memory | ||
| 61 | */ | ||
| 62 | vm_unmap_aliases(); | ||
| 63 | |||
| 57 | return ret; | 64 | return ret; |
| 58 | } | 65 | } |
| 59 | 66 | ||
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c index 4dae3698bf24..8d103ca6d6ab 100644 --- a/arch/powerpc/sysdev/cpm1.c +++ b/arch/powerpc/sysdev/cpm1.c | |||
| @@ -486,9 +486,6 @@ int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode) | |||
| 486 | return -EINVAL; | 486 | return -EINVAL; |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | if (reg == &mpc8xx_immr->im_cpm.cp_sicr && mode == CPM_CLK_RX) | ||
| 490 | shift += 3; | ||
| 491 | |||
| 492 | for (i = 0; i < ARRAY_SIZE(clk_map); i++) { | 489 | for (i = 0; i < ARRAY_SIZE(clk_map); i++) { |
| 493 | if (clk_map[i][0] == target && clk_map[i][1] == clock) { | 490 | if (clk_map[i][0] == target && clk_map[i][1] == clock) { |
| 494 | bits = clk_map[i][2]; | 491 | bits = clk_map[i][2]; |
| @@ -503,6 +500,17 @@ int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode) | |||
| 503 | 500 | ||
| 504 | bits <<= shift; | 501 | bits <<= shift; |
| 505 | mask <<= shift; | 502 | mask <<= shift; |
| 503 | |||
| 504 | if (reg == &mpc8xx_immr->im_cpm.cp_sicr) { | ||
| 505 | if (mode == CPM_CLK_RTX) { | ||
| 506 | bits |= bits << 3; | ||
| 507 | mask |= mask << 3; | ||
| 508 | } else if (mode == CPM_CLK_RX) { | ||
| 509 | bits <<= 3; | ||
| 510 | mask <<= 3; | ||
| 511 | } | ||
| 512 | } | ||
| 513 | |||
| 506 | out_be32(reg, (in_be32(reg) & ~mask) | bits); | 514 | out_be32(reg, (in_be32(reg) & ~mask) | bits); |
| 507 | 515 | ||
| 508 | return 0; | 516 | return 0; |
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c index eb5927212fab..8dc1e24f3c23 100644 --- a/arch/powerpc/sysdev/cpm2.c +++ b/arch/powerpc/sysdev/cpm2.c | |||
| @@ -244,9 +244,6 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode) | |||
| 244 | return -EINVAL; | 244 | return -EINVAL; |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | if (mode == CPM_CLK_RX) | ||
| 248 | shift += 3; | ||
| 249 | |||
| 250 | for (i = 0; i < ARRAY_SIZE(clk_map); i++) { | 247 | for (i = 0; i < ARRAY_SIZE(clk_map); i++) { |
| 251 | if (clk_map[i][0] == target && clk_map[i][1] == clock) { | 248 | if (clk_map[i][0] == target && clk_map[i][1] == clock) { |
| 252 | bits = clk_map[i][2]; | 249 | bits = clk_map[i][2]; |
| @@ -259,6 +256,14 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode) | |||
| 259 | bits <<= shift; | 256 | bits <<= shift; |
| 260 | mask <<= shift; | 257 | mask <<= shift; |
| 261 | 258 | ||
| 259 | if (mode == CPM_CLK_RTX) { | ||
| 260 | bits |= bits << 3; | ||
| 261 | mask |= mask << 3; | ||
| 262 | } else if (mode == CPM_CLK_RX) { | ||
| 263 | bits <<= 3; | ||
| 264 | mask <<= 3; | ||
| 265 | } | ||
| 266 | |||
| 262 | out_be32(reg, (in_be32(reg) & ~mask) | bits); | 267 | out_be32(reg, (in_be32(reg) & ~mask) | bits); |
| 263 | 268 | ||
| 264 | cpm2_unmap(im_cpmux); | 269 | cpm2_unmap(im_cpmux); |
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig index fba1f62d56e7..dba024d72a89 100644 --- a/arch/sh/configs/rts7751r2d1_defconfig +++ b/arch/sh/configs/rts7751r2d1_defconfig | |||
| @@ -877,7 +877,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 877 | # | 877 | # |
| 878 | # CONFIG_SERIAL_MAX3100 is not set | 878 | # CONFIG_SERIAL_MAX3100 is not set |
| 879 | CONFIG_SERIAL_SH_SCI=y | 879 | CONFIG_SERIAL_SH_SCI=y |
| 880 | CONFIG_SERIAL_SH_SCI_NR_UARTS=1 | 880 | CONFIG_SERIAL_SH_SCI_NR_UARTS=2 |
| 881 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | 881 | CONFIG_SERIAL_SH_SCI_CONSOLE=y |
| 882 | CONFIG_SERIAL_CORE=y | 882 | CONFIG_SERIAL_CORE=y |
| 883 | CONFIG_SERIAL_CORE_CONSOLE=y | 883 | CONFIG_SERIAL_CORE_CONSOLE=y |
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig index a8d538f06e67..6d511d06cbf6 100644 --- a/arch/sh/configs/rts7751r2dplus_defconfig +++ b/arch/sh/configs/rts7751r2dplus_defconfig | |||
| @@ -963,7 +963,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 963 | # | 963 | # |
| 964 | # CONFIG_SERIAL_MAX3100 is not set | 964 | # CONFIG_SERIAL_MAX3100 is not set |
| 965 | CONFIG_SERIAL_SH_SCI=y | 965 | CONFIG_SERIAL_SH_SCI=y |
| 966 | CONFIG_SERIAL_SH_SCI_NR_UARTS=1 | 966 | CONFIG_SERIAL_SH_SCI_NR_UARTS=2 |
| 967 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | 967 | CONFIG_SERIAL_SH_SCI_CONSOLE=y |
| 968 | CONFIG_SERIAL_CORE=y | 968 | CONFIG_SERIAL_CORE=y |
| 969 | CONFIG_SERIAL_CORE_CONSOLE=y | 969 | CONFIG_SERIAL_CORE_CONSOLE=y |
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index 17811e5d287b..f98141b3b7d7 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include "pci-sh4.h" | 18 | #include "pci-sh4.h" |
| 19 | #include <asm/addrspace.h> | 19 | #include <asm/addrspace.h> |
| 20 | #include <asm/sizes.h> | ||
| 20 | 21 | ||
| 21 | static int __init __area_sdram_check(struct pci_channel *chan, | 22 | static int __init __area_sdram_check(struct pci_channel *chan, |
| 22 | unsigned int area) | 23 | unsigned int area) |
| @@ -47,8 +48,8 @@ static int __init __area_sdram_check(struct pci_channel *chan, | |||
| 47 | static struct resource sh7751_pci_resources[] = { | 48 | static struct resource sh7751_pci_resources[] = { |
| 48 | { | 49 | { |
| 49 | .name = "SH7751_IO", | 50 | .name = "SH7751_IO", |
| 50 | .start = SH7751_PCI_IO_BASE, | 51 | .start = 0x1000, |
| 51 | .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1, | 52 | .end = SZ_4M - 1, |
| 52 | .flags = IORESOURCE_IO | 53 | .flags = IORESOURCE_IO |
| 53 | }, { | 54 | }, { |
| 54 | .name = "SH7751_mem", | 55 | .name = "SH7751_mem", |
diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h index 55f9fec082d4..de2359533994 100644 --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h | |||
| @@ -76,7 +76,7 @@ enum { | |||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | #define TS_INDEX2VAL(i) ((((i) & 3) << CHCR_TS_LOW_SHIFT) | \ | 78 | #define TS_INDEX2VAL(i) ((((i) & 3) << CHCR_TS_LOW_SHIFT) | \ |
| 79 | ((((i) >> 2) & 3) << CHCR_TS_HIGH_SHIFT)) | 79 | (((i) & 0xc) << CHCR_TS_HIGH_SHIFT)) |
| 80 | 80 | ||
| 81 | #else /* CONFIG_CPU_SH4A */ | 81 | #else /* CONFIG_CPU_SH4A */ |
| 82 | 82 | ||
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index a1dcfa3ab17d..30a3e9776123 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h | |||
| @@ -347,6 +347,7 @@ extern void __iomem *early_ioremap(resource_size_t phys_addr, | |||
| 347 | extern void __iomem *early_memremap(resource_size_t phys_addr, | 347 | extern void __iomem *early_memremap(resource_size_t phys_addr, |
| 348 | unsigned long size); | 348 | unsigned long size); |
| 349 | extern void early_iounmap(void __iomem *addr, unsigned long size); | 349 | extern void early_iounmap(void __iomem *addr, unsigned long size); |
| 350 | extern void fixup_early_ioremap(void); | ||
| 350 | 351 | ||
| 351 | #define IO_SPACE_LIMIT 0xffff | 352 | #define IO_SPACE_LIMIT 0xffff |
| 352 | 353 | ||
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c index ff469e470059..a35347501d36 100644 --- a/arch/x86/kernel/apb_timer.c +++ b/arch/x86/kernel/apb_timer.c | |||
| @@ -429,7 +429,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n, | |||
| 429 | 429 | ||
| 430 | static __init int apbt_late_init(void) | 430 | static __init int apbt_late_init(void) |
| 431 | { | 431 | { |
| 432 | if (disable_apbt_percpu) | 432 | if (disable_apbt_percpu || !apb_timer_block_enabled) |
| 433 | return 0; | 433 | return 0; |
| 434 | /* This notifier should be called after workqueue is ready */ | 434 | /* This notifier should be called after workqueue is ready */ |
| 435 | hotcpu_notifier(apbt_cpuhp_notify, -20); | 435 | hotcpu_notifier(apbt_cpuhp_notify, -20); |
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 127b8718abfb..eb2789c3f721 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
| @@ -2545,6 +2545,9 @@ void irq_force_complete_move(int irq) | |||
| 2545 | struct irq_desc *desc = irq_to_desc(irq); | 2545 | struct irq_desc *desc = irq_to_desc(irq); |
| 2546 | struct irq_cfg *cfg = desc->chip_data; | 2546 | struct irq_cfg *cfg = desc->chip_data; |
| 2547 | 2547 | ||
| 2548 | if (!cfg) | ||
| 2549 | return; | ||
| 2550 | |||
| 2548 | __irq_complete_move(&desc, cfg->vector); | 2551 | __irq_complete_move(&desc, cfg->vector); |
| 2549 | } | 2552 | } |
| 2550 | #else | 2553 | #else |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index d360b56e9825..b6215b9798e2 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
| @@ -929,7 +929,8 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, | |||
| 929 | powernow_table[i].index = index; | 929 | powernow_table[i].index = index; |
| 930 | 930 | ||
| 931 | /* Frequency may be rounded for these */ | 931 | /* Frequency may be rounded for these */ |
| 932 | if (boot_cpu_data.x86 == 0x10 || boot_cpu_data.x86 == 0x11) { | 932 | if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10) |
| 933 | || boot_cpu_data.x86 == 0x11) { | ||
| 933 | powernow_table[i].frequency = | 934 | powernow_table[i].frequency = |
| 934 | freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7); | 935 | freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7); |
| 935 | } else | 936 | } else |
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 7e1cca13af35..1366c7cfd483 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
| @@ -47,6 +47,27 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | |||
| 47 | (c->x86 == 0x6 && c->x86_model >= 0x0e)) | 47 | (c->x86 == 0x6 && c->x86_model >= 0x0e)) |
| 48 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | 48 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); |
| 49 | 49 | ||
| 50 | /* | ||
| 51 | * Atom erratum AAE44/AAF40/AAG38/AAH41: | ||
| 52 | * | ||
| 53 | * A race condition between speculative fetches and invalidating | ||
| 54 | * a large page. This is worked around in microcode, but we | ||
| 55 | * need the microcode to have already been loaded... so if it is | ||
| 56 | * not, recommend a BIOS update and disable large pages. | ||
| 57 | */ | ||
| 58 | if (c->x86 == 6 && c->x86_model == 0x1c && c->x86_mask <= 2) { | ||
| 59 | u32 ucode, junk; | ||
| 60 | |||
| 61 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | ||
| 62 | sync_core(); | ||
| 63 | rdmsr(MSR_IA32_UCODE_REV, junk, ucode); | ||
| 64 | |||
| 65 | if (ucode < 0x20e) { | ||
| 66 | printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n"); | ||
| 67 | clear_cpu_cap(c, X86_FEATURE_PSE); | ||
| 68 | } | ||
| 69 | } | ||
| 70 | |||
| 50 | #ifdef CONFIG_X86_64 | 71 | #ifdef CONFIG_X86_64 |
| 51 | set_cpu_cap(c, X86_FEATURE_SYSENTER32); | 72 | set_cpu_cap(c, X86_FEATURE_SYSENTER32); |
| 52 | #else | 73 | #else |
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 1cbed97b59cf..dfdb4dba2320 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/dmi.h> | 24 | #include <linux/dmi.h> |
| 25 | #include <linux/module.h> | ||
| 25 | #include <asm/div64.h> | 26 | #include <asm/div64.h> |
| 26 | #include <asm/vmware.h> | 27 | #include <asm/vmware.h> |
| 27 | #include <asm/x86_init.h> | 28 | #include <asm/x86_init.h> |
| @@ -101,6 +102,7 @@ int vmware_platform(void) | |||
| 101 | 102 | ||
| 102 | return 0; | 103 | return 0; |
| 103 | } | 104 | } |
| 105 | EXPORT_SYMBOL(vmware_platform); | ||
| 104 | 106 | ||
| 105 | /* | 107 | /* |
| 106 | * VMware hypervisor takes care of exporting a reliable TSC to the guest. | 108 | * VMware hypervisor takes care of exporting a reliable TSC to the guest. |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index dc9690b4c4cc..17cb3295cbf7 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -276,12 +276,12 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, | |||
| 276 | 276 | ||
| 277 | set_tsk_thread_flag(p, TIF_FORK); | 277 | set_tsk_thread_flag(p, TIF_FORK); |
| 278 | 278 | ||
| 279 | p->thread.fs = me->thread.fs; | ||
| 280 | p->thread.gs = me->thread.gs; | ||
| 281 | p->thread.io_bitmap_ptr = NULL; | 279 | p->thread.io_bitmap_ptr = NULL; |
| 282 | 280 | ||
| 283 | savesegment(gs, p->thread.gsindex); | 281 | savesegment(gs, p->thread.gsindex); |
| 282 | p->thread.gs = p->thread.gsindex ? 0 : me->thread.gs; | ||
| 284 | savesegment(fs, p->thread.fsindex); | 283 | savesegment(fs, p->thread.fsindex); |
| 284 | p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs; | ||
| 285 | savesegment(es, p->thread.es); | 285 | savesegment(es, p->thread.es); |
| 286 | savesegment(ds, p->thread.ds); | 286 | savesegment(ds, p->thread.ds); |
| 287 | 287 | ||
diff --git a/arch/x86/lib/rwsem_64.S b/arch/x86/lib/rwsem_64.S index 15acecf0d7aa..41fcf00e49df 100644 --- a/arch/x86/lib/rwsem_64.S +++ b/arch/x86/lib/rwsem_64.S | |||
| @@ -60,7 +60,7 @@ ENTRY(call_rwsem_down_write_failed) | |||
| 60 | ENDPROC(call_rwsem_down_write_failed) | 60 | ENDPROC(call_rwsem_down_write_failed) |
| 61 | 61 | ||
| 62 | ENTRY(call_rwsem_wake) | 62 | ENTRY(call_rwsem_wake) |
| 63 | decw %dx /* do nothing if still outstanding active readers */ | 63 | decl %edx /* do nothing if still outstanding active readers */ |
| 64 | jnz 1f | 64 | jnz 1f |
| 65 | save_common_regs | 65 | save_common_regs |
| 66 | movq %rax,%rdi | 66 | movq %rax,%rdi |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 5eb1ba74a3a9..12e4d2d3c110 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -448,6 +448,20 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx) | |||
| 448 | static void __iomem *prev_map[FIX_BTMAPS_SLOTS] __initdata; | 448 | static void __iomem *prev_map[FIX_BTMAPS_SLOTS] __initdata; |
| 449 | static unsigned long prev_size[FIX_BTMAPS_SLOTS] __initdata; | 449 | static unsigned long prev_size[FIX_BTMAPS_SLOTS] __initdata; |
| 450 | 450 | ||
| 451 | void __init fixup_early_ioremap(void) | ||
| 452 | { | ||
| 453 | int i; | ||
| 454 | |||
| 455 | for (i = 0; i < FIX_BTMAPS_SLOTS; i++) { | ||
| 456 | if (prev_map[i]) { | ||
| 457 | WARN_ON(1); | ||
| 458 | break; | ||
| 459 | } | ||
| 460 | } | ||
| 461 | |||
| 462 | early_ioremap_init(); | ||
| 463 | } | ||
| 464 | |||
| 451 | static int __init check_early_ioremap_leak(void) | 465 | static int __init check_early_ioremap_leak(void) |
| 452 | { | 466 | { |
| 453 | int count = 0; | 467 | int count = 0; |
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 1a8faf09afed..792854003ed3 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <asm/e820.h> | 18 | #include <asm/e820.h> |
| 19 | #include <asm/tlb.h> | 19 | #include <asm/tlb.h> |
| 20 | #include <asm/tlbflush.h> | 20 | #include <asm/tlbflush.h> |
| 21 | #include <asm/io.h> | ||
| 21 | 22 | ||
| 22 | unsigned int __VMALLOC_RESERVE = 128 << 20; | 23 | unsigned int __VMALLOC_RESERVE = 128 << 20; |
| 23 | 24 | ||
| @@ -128,6 +129,7 @@ static int __init parse_reservetop(char *arg) | |||
| 128 | 129 | ||
| 129 | address = memparse(arg, &arg); | 130 | address = memparse(arg, &arg); |
| 130 | reserve_top_address(address); | 131 | reserve_top_address(address); |
| 132 | fixup_early_ioremap(); | ||
| 131 | return 0; | 133 | return 0; |
| 132 | } | 134 | } |
| 133 | early_param("reservetop", parse_reservetop); | 135 | early_param("reservetop", parse_reservetop); |
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index c7b1ebfb7da7..31930fd30ea9 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
| @@ -66,14 +66,44 @@ resource_to_addr(struct acpi_resource *resource, | |||
| 66 | struct acpi_resource_address64 *addr) | 66 | struct acpi_resource_address64 *addr) |
| 67 | { | 67 | { |
| 68 | acpi_status status; | 68 | acpi_status status; |
| 69 | 69 | struct acpi_resource_memory24 *memory24; | |
| 70 | status = acpi_resource_to_address64(resource, addr); | 70 | struct acpi_resource_memory32 *memory32; |
| 71 | if (ACPI_SUCCESS(status) && | 71 | struct acpi_resource_fixed_memory32 *fixed_memory32; |
| 72 | (addr->resource_type == ACPI_MEMORY_RANGE || | 72 | |
| 73 | addr->resource_type == ACPI_IO_RANGE) && | 73 | memset(addr, 0, sizeof(*addr)); |
| 74 | addr->address_length > 0 && | 74 | switch (resource->type) { |
| 75 | addr->producer_consumer == ACPI_PRODUCER) { | 75 | case ACPI_RESOURCE_TYPE_MEMORY24: |
| 76 | memory24 = &resource->data.memory24; | ||
| 77 | addr->resource_type = ACPI_MEMORY_RANGE; | ||
| 78 | addr->minimum = memory24->minimum; | ||
| 79 | addr->address_length = memory24->address_length; | ||
| 80 | addr->maximum = addr->minimum + addr->address_length - 1; | ||
| 81 | return AE_OK; | ||
| 82 | case ACPI_RESOURCE_TYPE_MEMORY32: | ||
| 83 | memory32 = &resource->data.memory32; | ||
| 84 | addr->resource_type = ACPI_MEMORY_RANGE; | ||
| 85 | addr->minimum = memory32->minimum; | ||
| 86 | addr->address_length = memory32->address_length; | ||
| 87 | addr->maximum = addr->minimum + addr->address_length - 1; | ||
| 76 | return AE_OK; | 88 | return AE_OK; |
| 89 | case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: | ||
| 90 | fixed_memory32 = &resource->data.fixed_memory32; | ||
| 91 | addr->resource_type = ACPI_MEMORY_RANGE; | ||
| 92 | addr->minimum = fixed_memory32->address; | ||
| 93 | addr->address_length = fixed_memory32->address_length; | ||
| 94 | addr->maximum = addr->minimum + addr->address_length - 1; | ||
| 95 | return AE_OK; | ||
| 96 | case ACPI_RESOURCE_TYPE_ADDRESS16: | ||
| 97 | case ACPI_RESOURCE_TYPE_ADDRESS32: | ||
| 98 | case ACPI_RESOURCE_TYPE_ADDRESS64: | ||
| 99 | status = acpi_resource_to_address64(resource, addr); | ||
| 100 | if (ACPI_SUCCESS(status) && | ||
| 101 | (addr->resource_type == ACPI_MEMORY_RANGE || | ||
| 102 | addr->resource_type == ACPI_IO_RANGE) && | ||
| 103 | addr->address_length > 0) { | ||
| 104 | return AE_OK; | ||
| 105 | } | ||
| 106 | break; | ||
| 77 | } | 107 | } |
| 78 | return AE_ERROR; | 108 | return AE_ERROR; |
| 79 | } | 109 | } |
| @@ -91,30 +121,6 @@ count_resource(struct acpi_resource *acpi_res, void *data) | |||
| 91 | return AE_OK; | 121 | return AE_OK; |
| 92 | } | 122 | } |
| 93 | 123 | ||
| 94 | static void | ||
| 95 | align_resource(struct acpi_device *bridge, struct resource *res) | ||
| 96 | { | ||
| 97 | int align = (res->flags & IORESOURCE_MEM) ? 16 : 4; | ||
| 98 | |||
| 99 | /* | ||
| 100 | * Host bridge windows are not BARs, but the decoders on the PCI side | ||
| 101 | * that claim this address space have starting alignment and length | ||
| 102 | * constraints, so fix any obvious BIOS goofs. | ||
| 103 | */ | ||
| 104 | if (!IS_ALIGNED(res->start, align)) { | ||
| 105 | dev_printk(KERN_DEBUG, &bridge->dev, | ||
| 106 | "host bridge window %pR invalid; " | ||
| 107 | "aligning start to %d-byte boundary\n", res, align); | ||
| 108 | res->start &= ~(align - 1); | ||
| 109 | } | ||
| 110 | if (!IS_ALIGNED(res->end + 1, align)) { | ||
| 111 | dev_printk(KERN_DEBUG, &bridge->dev, | ||
| 112 | "host bridge window %pR invalid; " | ||
| 113 | "aligning end to %d-byte boundary\n", res, align); | ||
| 114 | res->end = ALIGN(res->end, align) - 1; | ||
| 115 | } | ||
| 116 | } | ||
| 117 | |||
| 118 | static acpi_status | 124 | static acpi_status |
| 119 | setup_resource(struct acpi_resource *acpi_res, void *data) | 125 | setup_resource(struct acpi_resource *acpi_res, void *data) |
| 120 | { | 126 | { |
| @@ -124,7 +130,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data) | |||
| 124 | acpi_status status; | 130 | acpi_status status; |
| 125 | unsigned long flags; | 131 | unsigned long flags; |
| 126 | struct resource *root, *conflict; | 132 | struct resource *root, *conflict; |
| 127 | u64 start, end, max_len; | 133 | u64 start, end; |
| 128 | 134 | ||
| 129 | status = resource_to_addr(acpi_res, &addr); | 135 | status = resource_to_addr(acpi_res, &addr); |
| 130 | if (!ACPI_SUCCESS(status)) | 136 | if (!ACPI_SUCCESS(status)) |
| @@ -141,19 +147,8 @@ setup_resource(struct acpi_resource *acpi_res, void *data) | |||
| 141 | } else | 147 | } else |
| 142 | return AE_OK; | 148 | return AE_OK; |
| 143 | 149 | ||
| 144 | max_len = addr.maximum - addr.minimum + 1; | ||
| 145 | if (addr.address_length > max_len) { | ||
| 146 | dev_printk(KERN_DEBUG, &info->bridge->dev, | ||
| 147 | "host bridge window length %#llx doesn't fit in " | ||
| 148 | "%#llx-%#llx, trimming\n", | ||
| 149 | (unsigned long long) addr.address_length, | ||
| 150 | (unsigned long long) addr.minimum, | ||
| 151 | (unsigned long long) addr.maximum); | ||
| 152 | addr.address_length = max_len; | ||
| 153 | } | ||
| 154 | |||
| 155 | start = addr.minimum + addr.translation_offset; | 150 | start = addr.minimum + addr.translation_offset; |
| 156 | end = start + addr.address_length - 1; | 151 | end = addr.maximum + addr.translation_offset; |
| 157 | 152 | ||
| 158 | res = &info->res[info->res_num]; | 153 | res = &info->res[info->res_num]; |
| 159 | res->name = info->name; | 154 | res->name = info->name; |
| @@ -161,7 +156,6 @@ setup_resource(struct acpi_resource *acpi_res, void *data) | |||
| 161 | res->start = start; | 156 | res->start = start; |
| 162 | res->end = end; | 157 | res->end = end; |
| 163 | res->child = NULL; | 158 | res->child = NULL; |
| 164 | align_resource(info->bridge, res); | ||
| 165 | 159 | ||
| 166 | if (!pci_use_crs) { | 160 | if (!pci_use_crs) { |
| 167 | dev_printk(KERN_DEBUG, &info->bridge->dev, | 161 | dev_printk(KERN_DEBUG, &info->bridge->dev, |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 46fd43f79103..97da2ba9344b 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
| @@ -72,6 +72,9 @@ pcibios_align_resource(void *data, const struct resource *res, | |||
| 72 | return start; | 72 | return start; |
| 73 | if (start & 0x300) | 73 | if (start & 0x300) |
| 74 | start = (start + 0x3ff) & ~0x3ff; | 74 | start = (start + 0x3ff) & ~0x3ff; |
| 75 | } else if (res->flags & IORESOURCE_MEM) { | ||
| 76 | if (start < BIOS_END) | ||
| 77 | start = BIOS_END; | ||
| 75 | } | 78 | } |
| 76 | return start; | 79 | return start; |
| 77 | } | 80 | } |
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 1ba7e0aca878..4f0c06c7a338 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c | |||
| @@ -109,6 +109,7 @@ void blk_rq_timed_out_timer(unsigned long data) | |||
| 109 | struct request_queue *q = (struct request_queue *) data; | 109 | struct request_queue *q = (struct request_queue *) data; |
| 110 | unsigned long flags, next = 0; | 110 | unsigned long flags, next = 0; |
| 111 | struct request *rq, *tmp; | 111 | struct request *rq, *tmp; |
| 112 | int next_set = 0; | ||
| 112 | 113 | ||
| 113 | spin_lock_irqsave(q->queue_lock, flags); | 114 | spin_lock_irqsave(q->queue_lock, flags); |
| 114 | 115 | ||
| @@ -122,16 +123,13 @@ void blk_rq_timed_out_timer(unsigned long data) | |||
| 122 | if (blk_mark_rq_complete(rq)) | 123 | if (blk_mark_rq_complete(rq)) |
| 123 | continue; | 124 | continue; |
| 124 | blk_rq_timed_out(rq); | 125 | blk_rq_timed_out(rq); |
| 125 | } else if (!next || time_after(next, rq->deadline)) | 126 | } else if (!next_set || time_after(next, rq->deadline)) { |
| 126 | next = rq->deadline; | 127 | next = rq->deadline; |
| 128 | next_set = 1; | ||
| 129 | } | ||
| 127 | } | 130 | } |
| 128 | 131 | ||
| 129 | /* | 132 | if (next_set) |
| 130 | * next can never be 0 here with the list non-empty, since we always | ||
| 131 | * bump ->deadline to 1 so we can detect if the timer was ever added | ||
| 132 | * or not. See comment in blk_add_timer() | ||
| 133 | */ | ||
| 134 | if (next) | ||
| 135 | mod_timer(&q->timeout, round_jiffies_up(next)); | 133 | mod_timer(&q->timeout, round_jiffies_up(next)); |
| 136 | 134 | ||
| 137 | spin_unlock_irqrestore(q->queue_lock, flags); | 135 | spin_unlock_irqrestore(q->queue_lock, flags); |
diff --git a/crypto/async_tx/async_raid6_recov.c b/crypto/async_tx/async_raid6_recov.c index 943f2abac9b4..ce038d861eb9 100644 --- a/crypto/async_tx/async_raid6_recov.c +++ b/crypto/async_tx/async_raid6_recov.c | |||
| @@ -324,6 +324,7 @@ struct dma_async_tx_descriptor * | |||
| 324 | async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb, | 324 | async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb, |
| 325 | struct page **blocks, struct async_submit_ctl *submit) | 325 | struct page **blocks, struct async_submit_ctl *submit) |
| 326 | { | 326 | { |
| 327 | void *scribble = submit->scribble; | ||
| 327 | int non_zero_srcs, i; | 328 | int non_zero_srcs, i; |
| 328 | 329 | ||
| 329 | BUG_ON(faila == failb); | 330 | BUG_ON(faila == failb); |
| @@ -332,11 +333,13 @@ async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb, | |||
| 332 | 333 | ||
| 333 | pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes); | 334 | pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes); |
| 334 | 335 | ||
| 335 | /* we need to preserve the contents of 'blocks' for the async | 336 | /* if a dma resource is not available or a scribble buffer is not |
| 336 | * case, so punt to synchronous if a scribble buffer is not available | 337 | * available punt to the synchronous path. In the 'dma not |
| 338 | * available' case be sure to use the scribble buffer to | ||
| 339 | * preserve the content of 'blocks' as the caller intended. | ||
| 337 | */ | 340 | */ |
| 338 | if (!submit->scribble) { | 341 | if (!async_dma_find_channel(DMA_PQ) || !scribble) { |
| 339 | void **ptrs = (void **) blocks; | 342 | void **ptrs = scribble ? scribble : (void **) blocks; |
| 340 | 343 | ||
| 341 | async_tx_quiesce(&submit->depend_tx); | 344 | async_tx_quiesce(&submit->depend_tx); |
| 342 | for (i = 0; i < disks; i++) | 345 | for (i = 0; i < disks; i++) |
| @@ -406,11 +409,13 @@ async_raid6_datap_recov(int disks, size_t bytes, int faila, | |||
| 406 | 409 | ||
| 407 | pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes); | 410 | pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes); |
| 408 | 411 | ||
| 409 | /* we need to preserve the contents of 'blocks' for the async | 412 | /* if a dma resource is not available or a scribble buffer is not |
| 410 | * case, so punt to synchronous if a scribble buffer is not available | 413 | * available punt to the synchronous path. In the 'dma not |
| 414 | * available' case be sure to use the scribble buffer to | ||
| 415 | * preserve the content of 'blocks' as the caller intended. | ||
| 411 | */ | 416 | */ |
| 412 | if (!scribble) { | 417 | if (!async_dma_find_channel(DMA_PQ) || !scribble) { |
| 413 | void **ptrs = (void **) blocks; | 418 | void **ptrs = scribble ? scribble : (void **) blocks; |
| 414 | 419 | ||
| 415 | async_tx_quiesce(&submit->depend_tx); | 420 | async_tx_quiesce(&submit->depend_tx); |
| 416 | for (i = 0; i < disks; i++) | 421 | for (i = 0; i < disks; i++) |
diff --git a/crypto/authenc.c b/crypto/authenc.c index 2bb7348d8d55..05eb32e0d949 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c | |||
| @@ -46,6 +46,12 @@ struct authenc_request_ctx { | |||
| 46 | char tail[]; | 46 | char tail[]; |
| 47 | }; | 47 | }; |
| 48 | 48 | ||
| 49 | static void authenc_request_complete(struct aead_request *req, int err) | ||
| 50 | { | ||
| 51 | if (err != -EINPROGRESS) | ||
| 52 | aead_request_complete(req, err); | ||
| 53 | } | ||
| 54 | |||
| 49 | static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key, | 55 | static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key, |
| 50 | unsigned int keylen) | 56 | unsigned int keylen) |
| 51 | { | 57 | { |
| @@ -142,7 +148,7 @@ static void authenc_geniv_ahash_update_done(struct crypto_async_request *areq, | |||
| 142 | crypto_aead_authsize(authenc), 1); | 148 | crypto_aead_authsize(authenc), 1); |
| 143 | 149 | ||
| 144 | out: | 150 | out: |
| 145 | aead_request_complete(req, err); | 151 | authenc_request_complete(req, err); |
| 146 | } | 152 | } |
| 147 | 153 | ||
| 148 | static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err) | 154 | static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err) |
| @@ -208,7 +214,7 @@ static void authenc_verify_ahash_update_done(struct crypto_async_request *areq, | |||
| 208 | err = crypto_ablkcipher_decrypt(abreq); | 214 | err = crypto_ablkcipher_decrypt(abreq); |
| 209 | 215 | ||
| 210 | out: | 216 | out: |
| 211 | aead_request_complete(req, err); | 217 | authenc_request_complete(req, err); |
| 212 | } | 218 | } |
| 213 | 219 | ||
| 214 | static void authenc_verify_ahash_done(struct crypto_async_request *areq, | 220 | static void authenc_verify_ahash_done(struct crypto_async_request *areq, |
| @@ -245,7 +251,7 @@ static void authenc_verify_ahash_done(struct crypto_async_request *areq, | |||
| 245 | err = crypto_ablkcipher_decrypt(abreq); | 251 | err = crypto_ablkcipher_decrypt(abreq); |
| 246 | 252 | ||
| 247 | out: | 253 | out: |
| 248 | aead_request_complete(req, err); | 254 | authenc_request_complete(req, err); |
| 249 | } | 255 | } |
| 250 | 256 | ||
| 251 | static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags) | 257 | static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags) |
| @@ -379,7 +385,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req, | |||
| 379 | err = crypto_authenc_genicv(areq, iv, 0); | 385 | err = crypto_authenc_genicv(areq, iv, 0); |
| 380 | } | 386 | } |
| 381 | 387 | ||
| 382 | aead_request_complete(areq, err); | 388 | authenc_request_complete(areq, err); |
| 383 | } | 389 | } |
| 384 | 390 | ||
| 385 | static int crypto_authenc_encrypt(struct aead_request *req) | 391 | static int crypto_authenc_encrypt(struct aead_request *req) |
| @@ -420,7 +426,7 @@ static void crypto_authenc_givencrypt_done(struct crypto_async_request *req, | |||
| 420 | err = crypto_authenc_genicv(areq, greq->giv, 0); | 426 | err = crypto_authenc_genicv(areq, greq->giv, 0); |
| 421 | } | 427 | } |
| 422 | 428 | ||
| 423 | aead_request_complete(areq, err); | 429 | authenc_request_complete(areq, err); |
| 424 | } | 430 | } |
| 425 | 431 | ||
| 426 | static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req) | 432 | static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req) |
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 4164dd244dd0..d94b8f0bd743 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -424,7 +424,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { | |||
| 424 | PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420), | 424 | PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420), |
| 425 | PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178), | 425 | PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178), |
| 426 | PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753), | 426 | PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753), |
| 427 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17), | 427 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x55d5bffb), |
| 428 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10), | 428 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10), |
| 429 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e), | 429 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e), |
| 430 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2 ", 0x547e66dc, 0x8671043b), | 430 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2 ", 0x547e66dc, 0x8671043b), |
| @@ -446,7 +446,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { | |||
| 446 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), | 446 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), |
| 447 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), | 447 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), |
| 448 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), | 448 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), |
| 449 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d), | 449 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x7558f133), |
| 450 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47), | 450 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47), |
| 451 | PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), | 451 | PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), |
| 452 | PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918), | 452 | PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918), |
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 67e0fc542249..93d1f9b469d4 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
| @@ -1695,6 +1695,7 @@ int drbd_send_protocol(struct drbd_conf *mdev) | |||
| 1695 | cf |= CF_DRY_RUN; | 1695 | cf |= CF_DRY_RUN; |
| 1696 | else { | 1696 | else { |
| 1697 | dev_err(DEV, "--dry-run is not supported by peer"); | 1697 | dev_err(DEV, "--dry-run is not supported by peer"); |
| 1698 | kfree(p); | ||
| 1698 | return 0; | 1699 | return 0; |
| 1699 | } | 1700 | } |
| 1700 | } | 1701 | } |
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index ed9f1de24a71..3f096e7959b4 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
| @@ -899,7 +899,8 @@ retry: | |||
| 899 | 899 | ||
| 900 | drbd_thread_start(&mdev->asender); | 900 | drbd_thread_start(&mdev->asender); |
| 901 | 901 | ||
| 902 | drbd_send_protocol(mdev); | 902 | if (!drbd_send_protocol(mdev)) |
| 903 | return -1; | ||
| 903 | drbd_send_sync_param(mdev, &mdev->sync_conf); | 904 | drbd_send_sync_param(mdev, &mdev->sync_conf); |
| 904 | drbd_send_sizes(mdev, 0); | 905 | drbd_send_sizes(mdev, 0); |
| 905 | drbd_send_uuids(mdev); | 906 | drbd_send_uuids(mdev); |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index ddf19425245d..8a549db2aa78 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/module.h> | 48 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| 50 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
| 51 | #include <linux/compat.h> | ||
| 51 | #include <linux/kthread.h> | 52 | #include <linux/kthread.h> |
| 52 | #include <linux/errno.h> | 53 | #include <linux/errno.h> |
| 53 | #include <linux/spinlock.h> | 54 | #include <linux/spinlock.h> |
| @@ -2984,7 +2985,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) | |||
| 2984 | mutex_unlock(&ctl_mutex); | 2985 | mutex_unlock(&ctl_mutex); |
| 2985 | } | 2986 | } |
| 2986 | 2987 | ||
| 2987 | static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) | 2988 | static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
| 2988 | { | 2989 | { |
| 2989 | void __user *argp = (void __user *)arg; | 2990 | void __user *argp = (void __user *)arg; |
| 2990 | struct pkt_ctrl_command ctrl_cmd; | 2991 | struct pkt_ctrl_command ctrl_cmd; |
| @@ -3021,10 +3022,20 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm | |||
| 3021 | return ret; | 3022 | return ret; |
| 3022 | } | 3023 | } |
| 3023 | 3024 | ||
| 3025 | #ifdef CONFIG_COMPAT | ||
| 3026 | static long pkt_ctl_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | ||
| 3027 | { | ||
| 3028 | return pkt_ctl_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); | ||
| 3029 | } | ||
| 3030 | #endif | ||
| 3024 | 3031 | ||
| 3025 | static const struct file_operations pkt_ctl_fops = { | 3032 | static const struct file_operations pkt_ctl_fops = { |
| 3026 | .ioctl = pkt_ctl_ioctl, | 3033 | .open = nonseekable_open, |
| 3027 | .owner = THIS_MODULE, | 3034 | .unlocked_ioctl = pkt_ctl_ioctl, |
| 3035 | #ifdef CONFIG_COMPAT | ||
| 3036 | .compat_ioctl = pkt_ctl_compat_ioctl, | ||
| 3037 | #endif | ||
| 3038 | .owner = THIS_MODULE, | ||
| 3028 | }; | 3039 | }; |
| 3029 | 3040 | ||
| 3030 | static struct miscdevice pkt_misc = { | 3041 | static struct miscdevice pkt_misc = { |
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 0fa2e4a0835d..c1ab303455cf 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
| @@ -879,8 +879,8 @@ static int isicom_open(struct tty_struct *tty, struct file *filp) | |||
| 879 | if (tport == NULL) | 879 | if (tport == NULL) |
| 880 | return -ENODEV; | 880 | return -ENODEV; |
| 881 | port = container_of(tport, struct isi_port, port); | 881 | port = container_of(tport, struct isi_port, port); |
| 882 | card = &isi_card[BOARD(tty->index)]; | ||
| 883 | 882 | ||
| 883 | tty->driver_data = port; | ||
| 884 | return tty_port_open(tport, tty, filp); | 884 | return tty_port_open(tport, tty, filp); |
| 885 | } | 885 | } |
| 886 | 886 | ||
| @@ -936,7 +936,12 @@ static void isicom_shutdown(struct tty_port *port) | |||
| 936 | static void isicom_close(struct tty_struct *tty, struct file *filp) | 936 | static void isicom_close(struct tty_struct *tty, struct file *filp) |
| 937 | { | 937 | { |
| 938 | struct isi_port *ip = tty->driver_data; | 938 | struct isi_port *ip = tty->driver_data; |
| 939 | struct tty_port *port = &ip->port; | 939 | struct tty_port *port; |
| 940 | |||
| 941 | if (ip == NULL) | ||
| 942 | return; | ||
| 943 | |||
| 944 | port = &ip->port; | ||
| 940 | if (isicom_paranoia_check(ip, tty->name, "isicom_close")) | 945 | if (isicom_paranoia_check(ip, tty->name, "isicom_close")) |
| 941 | return; | 946 | return; |
| 942 | tty_port_close(port, tty, filp); | 947 | tty_port_close(port, tty, filp); |
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 4cd6c527ee41..4e395c956a09 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c | |||
| @@ -827,6 +827,8 @@ static int stli_open(struct tty_struct *tty, struct file *filp) | |||
| 827 | return -ENODEV; | 827 | return -ENODEV; |
| 828 | if (portp->devnr < 1) | 828 | if (portp->devnr < 1) |
| 829 | return -ENODEV; | 829 | return -ENODEV; |
| 830 | |||
| 831 | tty->driver_data = portp; | ||
| 830 | return tty_port_open(&portp->port, tty, filp); | 832 | return tty_port_open(&portp->port, tty, filp); |
| 831 | } | 833 | } |
| 832 | 834 | ||
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 47023053ee85..d2692d443f7b 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -1011,6 +1011,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) | |||
| 1011 | if (!info->ioaddr) | 1011 | if (!info->ioaddr) |
| 1012 | return -ENODEV; | 1012 | return -ENODEV; |
| 1013 | 1013 | ||
| 1014 | tty->driver_data = info; | ||
| 1014 | return tty_port_open(&info->port, tty, filp); | 1015 | return tty_port_open(&info->port, tty, filp); |
| 1015 | } | 1016 | } |
| 1016 | 1017 | ||
| @@ -1074,7 +1075,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) | |||
| 1074 | struct mxser_port *info = tty->driver_data; | 1075 | struct mxser_port *info = tty->driver_data; |
| 1075 | struct tty_port *port = &info->port; | 1076 | struct tty_port *port = &info->port; |
| 1076 | 1077 | ||
| 1077 | if (tty->index == MXSER_PORTS) | 1078 | if (tty->index == MXSER_PORTS || info == NULL) |
| 1078 | return; | 1079 | return; |
| 1079 | if (tty_port_close_start(port, tty, filp) == 0) | 1080 | if (tty_port_close_start(port, tty, filp) == 0) |
| 1080 | return; | 1081 | return; |
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c index 0a8d1e56c993..b02332a5412f 100644 --- a/drivers/char/riscom8.c +++ b/drivers/char/riscom8.c | |||
| @@ -909,6 +909,7 @@ static int rc_open(struct tty_struct *tty, struct file *filp) | |||
| 909 | if (error) | 909 | if (error) |
| 910 | return error; | 910 | return error; |
| 911 | 911 | ||
| 912 | tty->driver_data = port; | ||
| 912 | return tty_port_open(&port->port, tty, filp); | 913 | return tty_port_open(&port->port, tty, filp); |
| 913 | } | 914 | } |
| 914 | 915 | ||
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 0e511d61f544..6049fd731924 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c | |||
| @@ -724,7 +724,6 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
| 724 | { | 724 | { |
| 725 | struct stlport *portp; | 725 | struct stlport *portp; |
| 726 | struct stlbrd *brdp; | 726 | struct stlbrd *brdp; |
| 727 | struct tty_port *port; | ||
| 728 | unsigned int minordev, brdnr, panelnr; | 727 | unsigned int minordev, brdnr, panelnr; |
| 729 | int portnr; | 728 | int portnr; |
| 730 | 729 | ||
| @@ -754,7 +753,8 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
| 754 | portp = brdp->panels[panelnr]->ports[portnr]; | 753 | portp = brdp->panels[panelnr]->ports[portnr]; |
| 755 | if (portp == NULL) | 754 | if (portp == NULL) |
| 756 | return -ENODEV; | 755 | return -ENODEV; |
| 757 | port = &portp->port; | 756 | |
| 757 | tty->driver_data = portp; | ||
| 758 | return tty_port_open(&portp->port, tty, filp); | 758 | return tty_port_open(&portp->port, tty, filp); |
| 759 | 759 | ||
| 760 | } | 760 | } |
| @@ -841,7 +841,8 @@ static void stl_close(struct tty_struct *tty, struct file *filp) | |||
| 841 | pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp); | 841 | pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp); |
| 842 | 842 | ||
| 843 | portp = tty->driver_data; | 843 | portp = tty->driver_data; |
| 844 | BUG_ON(portp == NULL); | 844 | if(portp == NULL) |
| 845 | return; | ||
| 845 | tty_port_close(&portp->port, tty, filp); | 846 | tty_port_close(&portp->port, tty, filp); |
| 846 | } | 847 | } |
| 847 | 848 | ||
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 2d5d575e889d..75d293eeb3ee 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -1113,6 +1113,8 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev) | |||
| 1113 | unsigned int cpu = sys_dev->id; | 1113 | unsigned int cpu = sys_dev->id; |
| 1114 | unsigned long flags; | 1114 | unsigned long flags; |
| 1115 | struct cpufreq_policy *data; | 1115 | struct cpufreq_policy *data; |
| 1116 | struct kobject *kobj; | ||
| 1117 | struct completion *cmp; | ||
| 1116 | #ifdef CONFIG_SMP | 1118 | #ifdef CONFIG_SMP |
| 1117 | struct sys_device *cpu_sys_dev; | 1119 | struct sys_device *cpu_sys_dev; |
| 1118 | unsigned int j; | 1120 | unsigned int j; |
| @@ -1141,10 +1143,11 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev) | |||
| 1141 | dprintk("removing link\n"); | 1143 | dprintk("removing link\n"); |
| 1142 | cpumask_clear_cpu(cpu, data->cpus); | 1144 | cpumask_clear_cpu(cpu, data->cpus); |
| 1143 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); | 1145 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); |
| 1144 | sysfs_remove_link(&sys_dev->kobj, "cpufreq"); | 1146 | kobj = &sys_dev->kobj; |
| 1145 | cpufreq_cpu_put(data); | 1147 | cpufreq_cpu_put(data); |
| 1146 | cpufreq_debug_enable_ratelimit(); | 1148 | cpufreq_debug_enable_ratelimit(); |
| 1147 | unlock_policy_rwsem_write(cpu); | 1149 | unlock_policy_rwsem_write(cpu); |
| 1150 | sysfs_remove_link(kobj, "cpufreq"); | ||
| 1148 | return 0; | 1151 | return 0; |
| 1149 | } | 1152 | } |
| 1150 | #endif | 1153 | #endif |
| @@ -1181,7 +1184,10 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev) | |||
| 1181 | data->governor->name, CPUFREQ_NAME_LEN); | 1184 | data->governor->name, CPUFREQ_NAME_LEN); |
| 1182 | #endif | 1185 | #endif |
| 1183 | cpu_sys_dev = get_cpu_sysdev(j); | 1186 | cpu_sys_dev = get_cpu_sysdev(j); |
| 1184 | sysfs_remove_link(&cpu_sys_dev->kobj, "cpufreq"); | 1187 | kobj = &cpu_sys_dev->kobj; |
| 1188 | unlock_policy_rwsem_write(cpu); | ||
| 1189 | sysfs_remove_link(kobj, "cpufreq"); | ||
| 1190 | lock_policy_rwsem_write(cpu); | ||
| 1185 | cpufreq_cpu_put(data); | 1191 | cpufreq_cpu_put(data); |
| 1186 | } | 1192 | } |
| 1187 | } | 1193 | } |
| @@ -1192,19 +1198,22 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev) | |||
| 1192 | if (cpufreq_driver->target) | 1198 | if (cpufreq_driver->target) |
| 1193 | __cpufreq_governor(data, CPUFREQ_GOV_STOP); | 1199 | __cpufreq_governor(data, CPUFREQ_GOV_STOP); |
| 1194 | 1200 | ||
| 1195 | kobject_put(&data->kobj); | 1201 | kobj = &data->kobj; |
| 1202 | cmp = &data->kobj_unregister; | ||
| 1203 | unlock_policy_rwsem_write(cpu); | ||
| 1204 | kobject_put(kobj); | ||
| 1196 | 1205 | ||
| 1197 | /* we need to make sure that the underlying kobj is actually | 1206 | /* we need to make sure that the underlying kobj is actually |
| 1198 | * not referenced anymore by anybody before we proceed with | 1207 | * not referenced anymore by anybody before we proceed with |
| 1199 | * unloading. | 1208 | * unloading. |
| 1200 | */ | 1209 | */ |
| 1201 | dprintk("waiting for dropping of refcount\n"); | 1210 | dprintk("waiting for dropping of refcount\n"); |
| 1202 | wait_for_completion(&data->kobj_unregister); | 1211 | wait_for_completion(cmp); |
| 1203 | dprintk("wait complete\n"); | 1212 | dprintk("wait complete\n"); |
| 1204 | 1213 | ||
| 1214 | lock_policy_rwsem_write(cpu); | ||
| 1205 | if (cpufreq_driver->exit) | 1215 | if (cpufreq_driver->exit) |
| 1206 | cpufreq_driver->exit(data); | 1216 | cpufreq_driver->exit(data); |
| 1207 | |||
| 1208 | unlock_policy_rwsem_write(cpu); | 1217 | unlock_policy_rwsem_write(cpu); |
| 1209 | 1218 | ||
| 1210 | free_cpumask_var(data->related_cpus); | 1219 | free_cpumask_var(data->related_cpus); |
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 599a40b25cb0..3a147874a465 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c | |||
| @@ -444,6 +444,7 @@ static struct attribute_group dbs_attr_group_old = { | |||
| 444 | static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) | 444 | static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) |
| 445 | { | 445 | { |
| 446 | unsigned int load = 0; | 446 | unsigned int load = 0; |
| 447 | unsigned int max_load = 0; | ||
| 447 | unsigned int freq_target; | 448 | unsigned int freq_target; |
| 448 | 449 | ||
| 449 | struct cpufreq_policy *policy; | 450 | struct cpufreq_policy *policy; |
| @@ -501,6 +502,9 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) | |||
| 501 | continue; | 502 | continue; |
| 502 | 503 | ||
| 503 | load = 100 * (wall_time - idle_time) / wall_time; | 504 | load = 100 * (wall_time - idle_time) / wall_time; |
| 505 | |||
| 506 | if (load > max_load) | ||
| 507 | max_load = load; | ||
| 504 | } | 508 | } |
| 505 | 509 | ||
| 506 | /* | 510 | /* |
| @@ -511,7 +515,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) | |||
| 511 | return; | 515 | return; |
| 512 | 516 | ||
| 513 | /* Check for frequency increase */ | 517 | /* Check for frequency increase */ |
| 514 | if (load > dbs_tuners_ins.up_threshold) { | 518 | if (max_load > dbs_tuners_ins.up_threshold) { |
| 515 | this_dbs_info->down_skip = 0; | 519 | this_dbs_info->down_skip = 0; |
| 516 | 520 | ||
| 517 | /* if we are already at full speed then break out early */ | 521 | /* if we are already at full speed then break out early */ |
| @@ -538,7 +542,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) | |||
| 538 | * can support the current CPU usage without triggering the up | 542 | * can support the current CPU usage without triggering the up |
| 539 | * policy. To be safe, we focus 10 points under the threshold. | 543 | * policy. To be safe, we focus 10 points under the threshold. |
| 540 | */ | 544 | */ |
| 541 | if (load < (dbs_tuners_ins.down_threshold - 10)) { | 545 | if (max_load < (dbs_tuners_ins.down_threshold - 10)) { |
| 542 | freq_target = (dbs_tuners_ins.freq_step * policy->max) / 100; | 546 | freq_target = (dbs_tuners_ins.freq_step * policy->max) / 100; |
| 543 | 547 | ||
| 544 | this_dbs_info->requested_freq -= freq_target; | 548 | this_dbs_info->requested_freq -= freq_target; |
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 7cc31b3f40d8..6f25a20de99f 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
| @@ -290,6 +290,7 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan) | |||
| 290 | struct sh_dmae_chan *sh_chan = to_sh_chan(chan); | 290 | struct sh_dmae_chan *sh_chan = to_sh_chan(chan); |
| 291 | struct sh_desc *desc; | 291 | struct sh_desc *desc; |
| 292 | struct sh_dmae_slave *param = chan->private; | 292 | struct sh_dmae_slave *param = chan->private; |
| 293 | int ret; | ||
| 293 | 294 | ||
| 294 | pm_runtime_get_sync(sh_chan->dev); | 295 | pm_runtime_get_sync(sh_chan->dev); |
| 295 | 296 | ||
| @@ -301,11 +302,15 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan) | |||
| 301 | struct sh_dmae_slave_config *cfg; | 302 | struct sh_dmae_slave_config *cfg; |
| 302 | 303 | ||
| 303 | cfg = sh_dmae_find_slave(sh_chan, param->slave_id); | 304 | cfg = sh_dmae_find_slave(sh_chan, param->slave_id); |
| 304 | if (!cfg) | 305 | if (!cfg) { |
| 305 | return -EINVAL; | 306 | ret = -EINVAL; |
| 307 | goto efindslave; | ||
| 308 | } | ||
| 306 | 309 | ||
| 307 | if (test_and_set_bit(param->slave_id, sh_dmae_slave_used)) | 310 | if (test_and_set_bit(param->slave_id, sh_dmae_slave_used)) { |
| 308 | return -EBUSY; | 311 | ret = -EBUSY; |
| 312 | goto etestused; | ||
| 313 | } | ||
| 309 | 314 | ||
| 310 | param->config = cfg; | 315 | param->config = cfg; |
| 311 | 316 | ||
| @@ -334,10 +339,20 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan) | |||
| 334 | } | 339 | } |
| 335 | spin_unlock_bh(&sh_chan->desc_lock); | 340 | spin_unlock_bh(&sh_chan->desc_lock); |
| 336 | 341 | ||
| 337 | if (!sh_chan->descs_allocated) | 342 | if (!sh_chan->descs_allocated) { |
| 338 | pm_runtime_put(sh_chan->dev); | 343 | ret = -ENOMEM; |
| 344 | goto edescalloc; | ||
| 345 | } | ||
| 339 | 346 | ||
| 340 | return sh_chan->descs_allocated; | 347 | return sh_chan->descs_allocated; |
| 348 | |||
| 349 | edescalloc: | ||
| 350 | if (param) | ||
| 351 | clear_bit(param->slave_id, sh_dmae_slave_used); | ||
| 352 | etestused: | ||
| 353 | efindslave: | ||
| 354 | pm_runtime_put(sh_chan->dev); | ||
| 355 | return ret; | ||
| 341 | } | 356 | } |
| 342 | 357 | ||
| 343 | /* | 358 | /* |
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c index 3ebc61067e54..75fcf1ac8bb7 100644 --- a/drivers/dma/txx9dmac.c +++ b/drivers/dma/txx9dmac.c | |||
| @@ -1359,3 +1359,5 @@ module_exit(txx9dmac_exit); | |||
| 1359 | MODULE_LICENSE("GPL"); | 1359 | MODULE_LICENSE("GPL"); |
| 1360 | MODULE_DESCRIPTION("TXx9 DMA Controller driver"); | 1360 | MODULE_DESCRIPTION("TXx9 DMA Controller driver"); |
| 1361 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | 1361 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); |
| 1362 | MODULE_ALIAS("platform:txx9dmac"); | ||
| 1363 | MODULE_ALIAS("platform:txx9dmac-chan"); | ||
diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c index f5b6d9fe4def..97e64bcdbc06 100644 --- a/drivers/edac/edac_mce_amd.c +++ b/drivers/edac/edac_mce_amd.c | |||
| @@ -294,7 +294,6 @@ wrong_ls_mce: | |||
| 294 | void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors) | 294 | void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors) |
| 295 | { | 295 | { |
| 296 | u32 ec = ERROR_CODE(regs->nbsl); | 296 | u32 ec = ERROR_CODE(regs->nbsl); |
| 297 | u32 xec = EXT_ERROR_CODE(regs->nbsl); | ||
| 298 | 297 | ||
| 299 | if (!handle_errors) | 298 | if (!handle_errors) |
| 300 | return; | 299 | return; |
| @@ -324,7 +323,7 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors) | |||
| 324 | pr_cont("\n"); | 323 | pr_cont("\n"); |
| 325 | } | 324 | } |
| 326 | 325 | ||
| 327 | pr_emerg("%s.\n", EXT_ERR_MSG(xec)); | 326 | pr_emerg("%s.\n", EXT_ERR_MSG(regs->nbsl)); |
| 328 | 327 | ||
| 329 | if (BUS_ERROR(ec) && nb_bus_decoder) | 328 | if (BUS_ERROR(ec) && nb_bus_decoder) |
| 330 | nb_bus_decoder(node_id, regs); | 329 | nb_bus_decoder(node_id, regs); |
| @@ -374,7 +373,7 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val, | |||
| 374 | ((m->status & MCI_STATUS_PCC) ? "yes" : "no")); | 373 | ((m->status & MCI_STATUS_PCC) ? "yes" : "no")); |
| 375 | 374 | ||
| 376 | /* do the two bits[14:13] together */ | 375 | /* do the two bits[14:13] together */ |
| 377 | ecc = m->status & (3ULL << 45); | 376 | ecc = (m->status >> 45) & 0x3; |
| 378 | if (ecc) | 377 | if (ecc) |
| 379 | pr_cont(", %sECC Error", ((ecc == 2) ? "C" : "U")); | 378 | pr_cont(", %sECC Error", ((ecc == 2) ? "C" : "U")); |
| 380 | 379 | ||
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 76be229c814d..eb0c3fe44b29 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
| @@ -416,7 +416,8 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, | |||
| 416 | return 0; | 416 | return 0; |
| 417 | 417 | ||
| 418 | free_sd: | 418 | free_sd: |
| 419 | sysfs_put(pdesc->value_sd); | 419 | if (pdesc) |
| 420 | sysfs_put(pdesc->value_sd); | ||
| 420 | free_id: | 421 | free_id: |
| 421 | idr_remove(&pdesc_idr, id); | 422 | idr_remove(&pdesc_idr, id); |
| 422 | desc->flags &= GPIO_FLAGS_MASK; | 423 | desc->flags &= GPIO_FLAGS_MASK; |
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 7d521e1d17e1..b827c976dc62 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c | |||
| @@ -252,6 +252,18 @@ static void pca953x_irq_bus_lock(unsigned int irq) | |||
| 252 | static void pca953x_irq_bus_sync_unlock(unsigned int irq) | 252 | static void pca953x_irq_bus_sync_unlock(unsigned int irq) |
| 253 | { | 253 | { |
| 254 | struct pca953x_chip *chip = get_irq_chip_data(irq); | 254 | struct pca953x_chip *chip = get_irq_chip_data(irq); |
| 255 | uint16_t new_irqs; | ||
| 256 | uint16_t level; | ||
| 257 | |||
| 258 | /* Look for any newly setup interrupt */ | ||
| 259 | new_irqs = chip->irq_trig_fall | chip->irq_trig_raise; | ||
| 260 | new_irqs &= ~chip->reg_direction; | ||
| 261 | |||
| 262 | while (new_irqs) { | ||
| 263 | level = __ffs(new_irqs); | ||
| 264 | pca953x_gpio_direction_input(&chip->gpio_chip, level); | ||
| 265 | new_irqs &= ~(1 << level); | ||
| 266 | } | ||
| 255 | 267 | ||
| 256 | mutex_unlock(&chip->irq_lock); | 268 | mutex_unlock(&chip->irq_lock); |
| 257 | } | 269 | } |
| @@ -278,7 +290,7 @@ static int pca953x_irq_set_type(unsigned int irq, unsigned int type) | |||
| 278 | else | 290 | else |
| 279 | chip->irq_trig_raise &= ~mask; | 291 | chip->irq_trig_raise &= ~mask; |
| 280 | 292 | ||
| 281 | return pca953x_gpio_direction_input(&chip->gpio_chip, level); | 293 | return 0; |
| 282 | } | 294 | } |
| 283 | 295 | ||
| 284 | static struct irq_chip pca953x_irq_chip = { | 296 | static struct irq_chip pca953x_irq_chip = { |
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c index 5ad8f778ced4..105701a1f05b 100644 --- a/drivers/gpio/pl061.c +++ b/drivers/gpio/pl061.c | |||
| @@ -91,6 +91,12 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset, | |||
| 91 | gpiodir = readb(chip->base + GPIODIR); | 91 | gpiodir = readb(chip->base + GPIODIR); |
| 92 | gpiodir |= 1 << offset; | 92 | gpiodir |= 1 << offset; |
| 93 | writeb(gpiodir, chip->base + GPIODIR); | 93 | writeb(gpiodir, chip->base + GPIODIR); |
| 94 | |||
| 95 | /* | ||
| 96 | * gpio value is set again, because pl061 doesn't allow to set value of | ||
| 97 | * a gpio pin before configuring it in OUT mode. | ||
| 98 | */ | ||
| 99 | writeb(!!value << offset, chip->base + (1 << (offset + 2))); | ||
| 94 | spin_unlock_irqrestore(&chip->lock, flags); | 100 | spin_unlock_irqrestore(&chip->lock, flags); |
| 95 | 101 | ||
| 96 | return 0; | 102 | return 0; |
| @@ -183,7 +189,7 @@ static int pl061_irq_type(unsigned irq, unsigned trigger) | |||
| 183 | gpioibe &= ~(1 << offset); | 189 | gpioibe &= ~(1 << offset); |
| 184 | if (trigger & IRQ_TYPE_EDGE_RISING) | 190 | if (trigger & IRQ_TYPE_EDGE_RISING) |
| 185 | gpioiev |= 1 << offset; | 191 | gpioiev |= 1 << offset; |
| 186 | else | 192 | else if (trigger & IRQ_TYPE_EDGE_FALLING) |
| 187 | gpioiev &= ~(1 << offset); | 193 | gpioiev &= ~(1 << offset); |
| 188 | } | 194 | } |
| 189 | writeb(gpioibe, chip->base + GPIOIBE); | 195 | writeb(gpioibe, chip->base + GPIOIBE); |
| @@ -204,7 +210,7 @@ static struct irq_chip pl061_irqchip = { | |||
| 204 | 210 | ||
| 205 | static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) | 211 | static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) |
| 206 | { | 212 | { |
| 207 | struct list_head *chip_list = get_irq_chip_data(irq); | 213 | struct list_head *chip_list = get_irq_data(irq); |
| 208 | struct list_head *ptr; | 214 | struct list_head *ptr; |
| 209 | struct pl061_gpio *chip; | 215 | struct pl061_gpio *chip; |
| 210 | 216 | ||
| @@ -297,9 +303,9 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id) | |||
| 297 | goto iounmap; | 303 | goto iounmap; |
| 298 | } | 304 | } |
| 299 | INIT_LIST_HEAD(chip_list); | 305 | INIT_LIST_HEAD(chip_list); |
| 300 | set_irq_chip_data(irq, chip_list); | 306 | set_irq_data(irq, chip_list); |
| 301 | } else | 307 | } else |
| 302 | chip_list = get_irq_chip_data(irq); | 308 | chip_list = get_irq_data(irq); |
| 303 | list_add(&chip->list, chip_list); | 309 | list_add(&chip->list, chip_list); |
| 304 | 310 | ||
| 305 | for (i = 0; i < PL061_GPIO_NR; i++) { | 311 | for (i = 0; i < PL061_GPIO_NR; i++) { |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 3bd872761567..a263b7070fc6 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -476,6 +476,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc) | |||
| 476 | unsigned long irqflags; | 476 | unsigned long irqflags; |
| 477 | 477 | ||
| 478 | spin_lock_irqsave(&dev->vbl_lock, irqflags); | 478 | spin_lock_irqsave(&dev->vbl_lock, irqflags); |
| 479 | dev->driver->disable_vblank(dev, crtc); | ||
| 479 | DRM_WAKEUP(&dev->vbl_queue[crtc]); | 480 | DRM_WAKEUP(&dev->vbl_queue[crtc]); |
| 480 | dev->vblank_enabled[crtc] = 0; | 481 | dev->vblank_enabled[crtc] = 0; |
| 481 | dev->last_vblank[crtc] = dev->driver->get_vblank_counter(dev, crtc); | 482 | dev->last_vblank[crtc] = dev->driver->get_vblank_counter(dev, crtc); |
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c index e4865f99989c..7732268eced2 100644 --- a/drivers/gpu/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c | |||
| @@ -77,7 +77,7 @@ static void *agp_remap(unsigned long offset, unsigned long size, | |||
| 77 | && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >= | 77 | && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >= |
| 78 | (offset + size)) | 78 | (offset + size)) |
| 79 | break; | 79 | break; |
| 80 | if (!agpmem) | 80 | if (&agpmem->head == &dev->agp->memory) |
| 81 | return NULL; | 81 | return NULL; |
| 82 | 82 | ||
| 83 | /* | 83 | /* |
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 1a1825b29f5f..25bbd30ed7af 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
| @@ -354,7 +354,10 @@ static struct bin_attribute edid_attr = { | |||
| 354 | int drm_sysfs_connector_add(struct drm_connector *connector) | 354 | int drm_sysfs_connector_add(struct drm_connector *connector) |
| 355 | { | 355 | { |
| 356 | struct drm_device *dev = connector->dev; | 356 | struct drm_device *dev = connector->dev; |
| 357 | int ret = 0, i, j; | 357 | int attr_cnt = 0; |
| 358 | int opt_cnt = 0; | ||
| 359 | int i; | ||
| 360 | int ret = 0; | ||
| 358 | 361 | ||
| 359 | /* We shouldn't get called more than once for the same connector */ | 362 | /* We shouldn't get called more than once for the same connector */ |
| 360 | BUG_ON(device_is_registered(&connector->kdev)); | 363 | BUG_ON(device_is_registered(&connector->kdev)); |
| @@ -377,8 +380,8 @@ int drm_sysfs_connector_add(struct drm_connector *connector) | |||
| 377 | 380 | ||
| 378 | /* Standard attributes */ | 381 | /* Standard attributes */ |
| 379 | 382 | ||
| 380 | for (i = 0; i < ARRAY_SIZE(connector_attrs); i++) { | 383 | for (attr_cnt = 0; attr_cnt < ARRAY_SIZE(connector_attrs); attr_cnt++) { |
| 381 | ret = device_create_file(&connector->kdev, &connector_attrs[i]); | 384 | ret = device_create_file(&connector->kdev, &connector_attrs[attr_cnt]); |
| 382 | if (ret) | 385 | if (ret) |
| 383 | goto err_out_files; | 386 | goto err_out_files; |
| 384 | } | 387 | } |
| @@ -394,8 +397,8 @@ int drm_sysfs_connector_add(struct drm_connector *connector) | |||
| 394 | case DRM_MODE_CONNECTOR_SVIDEO: | 397 | case DRM_MODE_CONNECTOR_SVIDEO: |
| 395 | case DRM_MODE_CONNECTOR_Component: | 398 | case DRM_MODE_CONNECTOR_Component: |
| 396 | case DRM_MODE_CONNECTOR_TV: | 399 | case DRM_MODE_CONNECTOR_TV: |
| 397 | for (i = 0; i < ARRAY_SIZE(connector_attrs_opt1); i++) { | 400 | for (opt_cnt = 0; opt_cnt < ARRAY_SIZE(connector_attrs_opt1); opt_cnt++) { |
| 398 | ret = device_create_file(&connector->kdev, &connector_attrs_opt1[i]); | 401 | ret = device_create_file(&connector->kdev, &connector_attrs_opt1[opt_cnt]); |
| 399 | if (ret) | 402 | if (ret) |
| 400 | goto err_out_files; | 403 | goto err_out_files; |
| 401 | } | 404 | } |
| @@ -414,10 +417,10 @@ int drm_sysfs_connector_add(struct drm_connector *connector) | |||
| 414 | return 0; | 417 | return 0; |
| 415 | 418 | ||
| 416 | err_out_files: | 419 | err_out_files: |
| 417 | if (i > 0) | 420 | for (i = 0; i < opt_cnt; i++) |
| 418 | for (j = 0; j < i; j++) | 421 | device_remove_file(&connector->kdev, &connector_attrs_opt1[i]); |
| 419 | device_remove_file(&connector->kdev, | 422 | for (i = 0; i < attr_cnt; i++) |
| 420 | &connector_attrs[i]); | 423 | device_remove_file(&connector->kdev, &connector_attrs[i]); |
| 421 | device_unregister(&connector->kdev); | 424 | device_unregister(&connector->kdev); |
| 422 | 425 | ||
| 423 | out: | 426 | out: |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 7f52cc124cfe..ef3d91dda71a 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1793,7 +1793,7 @@ i915_get_gem_seqno(struct drm_device *dev) | |||
| 1793 | { | 1793 | { |
| 1794 | drm_i915_private_t *dev_priv = dev->dev_private; | 1794 | drm_i915_private_t *dev_priv = dev->dev_private; |
| 1795 | 1795 | ||
| 1796 | if (IS_I965G(dev)) | 1796 | if (HAS_PIPE_CONTROL(dev)) |
| 1797 | return ((volatile u32 *)(dev_priv->seqno_page))[0]; | 1797 | return ((volatile u32 *)(dev_priv->seqno_page))[0]; |
| 1798 | else | 1798 | else |
| 1799 | return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX); | 1799 | return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX); |
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index 6732b5dd8ff4..27e2c715be11 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h | |||
| @@ -2912,7 +2912,7 @@ typedef struct _ATOM_ANALOG_TV_INFO_V1_2 | |||
| 2912 | UCHAR ucTV_BootUpDefaultStandard; | 2912 | UCHAR ucTV_BootUpDefaultStandard; |
| 2913 | UCHAR ucExt_TV_ASIC_ID; | 2913 | UCHAR ucExt_TV_ASIC_ID; |
| 2914 | UCHAR ucExt_TV_ASIC_SlaveAddr; | 2914 | UCHAR ucExt_TV_ASIC_SlaveAddr; |
| 2915 | ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING]; | 2915 | ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING_V1_2]; |
| 2916 | }ATOM_ANALOG_TV_INFO_V1_2; | 2916 | }ATOM_ANALOG_TV_INFO_V1_2; |
| 2917 | 2917 | ||
| 2918 | typedef struct _ATOM_DPCD_INFO | 2918 | typedef struct _ATOM_DPCD_INFO |
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index d7388fdb6d0b..cf60c0b3ef15 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
| @@ -2975,7 +2975,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) | |||
| 2975 | 2975 | ||
| 2976 | for (i = 0; i < track->num_cb; i++) { | 2976 | for (i = 0; i < track->num_cb; i++) { |
| 2977 | if (track->cb[i].robj == NULL) { | 2977 | if (track->cb[i].robj == NULL) { |
| 2978 | if (!(track->fastfill || track->color_channel_mask || | 2978 | if (!(track->zb_cb_clear || track->color_channel_mask || |
| 2979 | track->blend_read_enable)) { | 2979 | track->blend_read_enable)) { |
| 2980 | continue; | 2980 | continue; |
| 2981 | } | 2981 | } |
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index fadfe68de9cc..f47cdca1c004 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h | |||
| @@ -75,7 +75,7 @@ struct r100_cs_track { | |||
| 75 | struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE]; | 75 | struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE]; |
| 76 | bool z_enabled; | 76 | bool z_enabled; |
| 77 | bool separate_cube; | 77 | bool separate_cube; |
| 78 | bool fastfill; | 78 | bool zb_cb_clear; |
| 79 | bool blend_read_enable; | 79 | bool blend_read_enable; |
| 80 | }; | 80 | }; |
| 81 | 81 | ||
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index bd75f99bd65e..a5ff8076b423 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
| @@ -324,13 +324,12 @@ void r300_gpu_init(struct radeon_device *rdev) | |||
| 324 | uint32_t gb_tile_config, tmp; | 324 | uint32_t gb_tile_config, tmp; |
| 325 | 325 | ||
| 326 | r100_hdp_reset(rdev); | 326 | r100_hdp_reset(rdev); |
| 327 | /* FIXME: rv380 one pipes ? */ | ||
| 328 | if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) || | 327 | if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) || |
| 329 | (rdev->family == CHIP_R350)) { | 328 | (rdev->family == CHIP_R350 && rdev->pdev->device != 0x4148)) { |
| 330 | /* r300,r350 */ | 329 | /* r300,r350 */ |
| 331 | rdev->num_gb_pipes = 2; | 330 | rdev->num_gb_pipes = 2; |
| 332 | } else { | 331 | } else { |
| 333 | /* rv350,rv370,rv380,r300 AD */ | 332 | /* rv350,rv370,rv380,r300 AD, r350 AH */ |
| 334 | rdev->num_gb_pipes = 1; | 333 | rdev->num_gb_pipes = 1; |
| 335 | } | 334 | } |
| 336 | rdev->num_z_pipes = 1; | 335 | rdev->num_z_pipes = 1; |
| @@ -1045,7 +1044,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 1045 | break; | 1044 | break; |
| 1046 | case 0x4d1c: | 1045 | case 0x4d1c: |
| 1047 | /* ZB_BW_CNTL */ | 1046 | /* ZB_BW_CNTL */ |
| 1048 | track->fastfill = !!(idx_value & (1 << 2)); | 1047 | track->zb_cb_clear = !!(idx_value & (1 << 5)); |
| 1049 | break; | 1048 | break; |
| 1050 | case 0x4e04: | 1049 | case 0x4e04: |
| 1051 | /* RB3D_BLENDCNTL */ | 1050 | /* RB3D_BLENDCNTL */ |
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index ea46d558e8f3..c5c2742e4140 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c | |||
| @@ -921,7 +921,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, | |||
| 921 | 921 | ||
| 922 | ptr_addr = drm_buffer_read_object(cmdbuf->buffer, | 922 | ptr_addr = drm_buffer_read_object(cmdbuf->buffer, |
| 923 | sizeof(stack_ptr_addr), &stack_ptr_addr); | 923 | sizeof(stack_ptr_addr), &stack_ptr_addr); |
| 924 | ref_age_base = (u32 *)(unsigned long)*ptr_addr; | 924 | ref_age_base = (u32 *)(unsigned long)get_unaligned(ptr_addr); |
| 925 | 925 | ||
| 926 | for (i=0; i < header.scratch.n_bufs; i++) { | 926 | for (i=0; i < header.scratch.n_bufs; i++) { |
| 927 | buf_idx = drm_buffer_pointer_to_dword(cmdbuf->buffer, 0); | 927 | buf_idx = drm_buffer_pointer_to_dword(cmdbuf->buffer, 0); |
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index 3dc968c9f5a4..c2bda4ad62e7 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
| @@ -59,6 +59,12 @@ void r420_pipes_init(struct radeon_device *rdev) | |||
| 59 | /* get max number of pipes */ | 59 | /* get max number of pipes */ |
| 60 | gb_pipe_select = RREG32(0x402C); | 60 | gb_pipe_select = RREG32(0x402C); |
| 61 | num_pipes = ((gb_pipe_select >> 12) & 3) + 1; | 61 | num_pipes = ((gb_pipe_select >> 12) & 3) + 1; |
| 62 | |||
| 63 | /* SE chips have 1 pipe */ | ||
| 64 | if ((rdev->pdev->device == 0x5e4c) || | ||
| 65 | (rdev->pdev->device == 0x5e4f)) | ||
| 66 | num_pipes = 1; | ||
| 67 | |||
| 62 | rdev->num_gb_pipes = num_pipes; | 68 | rdev->num_gb_pipes = num_pipes; |
| 63 | tmp = 0; | 69 | tmp = 0; |
| 64 | switch (num_pipes) { | 70 | switch (num_pipes) { |
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c index c4457791dff1..28e473f1f56f 100644 --- a/drivers/gpu/drm/radeon/radeon_agp.c +++ b/drivers/gpu/drm/radeon/radeon_agp.c | |||
| @@ -134,12 +134,10 @@ int radeon_agp_init(struct radeon_device *rdev) | |||
| 134 | int ret; | 134 | int ret; |
| 135 | 135 | ||
| 136 | /* Acquire AGP. */ | 136 | /* Acquire AGP. */ |
| 137 | if (!rdev->ddev->agp->acquired) { | 137 | ret = drm_agp_acquire(rdev->ddev); |
| 138 | ret = drm_agp_acquire(rdev->ddev); | 138 | if (ret) { |
| 139 | if (ret) { | 139 | DRM_ERROR("Unable to acquire AGP: %d\n", ret); |
| 140 | DRM_ERROR("Unable to acquire AGP: %d\n", ret); | 140 | return ret; |
| 141 | return ret; | ||
| 142 | } | ||
| 143 | } | 141 | } |
| 144 | 142 | ||
| 145 | ret = drm_agp_info(rdev->ddev, &info); | 143 | ret = drm_agp_info(rdev->ddev, &info); |
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 5673665ff216..9916d825401c 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
| @@ -1264,7 +1264,7 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, | |||
| 1264 | switch (crev) { | 1264 | switch (crev) { |
| 1265 | case 1: | 1265 | case 1: |
| 1266 | tv_info = (ATOM_ANALOG_TV_INFO *)(mode_info->atom_context->bios + data_offset); | 1266 | tv_info = (ATOM_ANALOG_TV_INFO *)(mode_info->atom_context->bios + data_offset); |
| 1267 | if (index > MAX_SUPPORTED_TV_TIMING) | 1267 | if (index >= MAX_SUPPORTED_TV_TIMING) |
| 1268 | return false; | 1268 | return false; |
| 1269 | 1269 | ||
| 1270 | mode->crtc_htotal = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Total); | 1270 | mode->crtc_htotal = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Total); |
| @@ -1302,7 +1302,7 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, | |||
| 1302 | break; | 1302 | break; |
| 1303 | case 2: | 1303 | case 2: |
| 1304 | tv_info_v1_2 = (ATOM_ANALOG_TV_INFO_V1_2 *)(mode_info->atom_context->bios + data_offset); | 1304 | tv_info_v1_2 = (ATOM_ANALOG_TV_INFO_V1_2 *)(mode_info->atom_context->bios + data_offset); |
| 1305 | if (index > MAX_SUPPORTED_TV_TIMING_V1_2) | 1305 | if (index >= MAX_SUPPORTED_TV_TIMING_V1_2) |
| 1306 | return false; | 1306 | return false; |
| 1307 | 1307 | ||
| 1308 | dtd_timings = &tv_info_v1_2->aModeTimings[index]; | 1308 | dtd_timings = &tv_info_v1_2->aModeTimings[index]; |
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 1331351c5178..4559a53d5e57 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -1316,6 +1316,8 @@ radeon_add_legacy_connector(struct drm_device *dev, | |||
| 1316 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); | 1316 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
| 1317 | if (!radeon_connector->ddc_bus) | 1317 | if (!radeon_connector->ddc_bus) |
| 1318 | goto failed; | 1318 | goto failed; |
| 1319 | } | ||
| 1320 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { | ||
| 1319 | radeon_connector->dac_load_detect = true; | 1321 | radeon_connector->dac_load_detect = true; |
| 1320 | drm_connector_attach_property(&radeon_connector->base, | 1322 | drm_connector_attach_property(&radeon_connector->base, |
| 1321 | rdev->mode_info.load_detect_property, | 1323 | rdev->mode_info.load_detect_property, |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 419630dd2075..2f042a3c0e62 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
| @@ -435,14 +435,19 @@ static void radeon_init_pipes(struct drm_device *dev) | |||
| 435 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R420) { | 435 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R420) { |
| 436 | gb_pipe_sel = RADEON_READ(R400_GB_PIPE_SELECT); | 436 | gb_pipe_sel = RADEON_READ(R400_GB_PIPE_SELECT); |
| 437 | dev_priv->num_gb_pipes = ((gb_pipe_sel >> 12) & 0x3) + 1; | 437 | dev_priv->num_gb_pipes = ((gb_pipe_sel >> 12) & 0x3) + 1; |
| 438 | /* SE cards have 1 pipe */ | ||
| 439 | if ((dev->pdev->device == 0x5e4c) || | ||
| 440 | (dev->pdev->device == 0x5e4f)) | ||
| 441 | dev_priv->num_gb_pipes = 1; | ||
| 438 | } else { | 442 | } else { |
| 439 | /* R3xx */ | 443 | /* R3xx */ |
| 440 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R300 && | 444 | if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R300 && |
| 441 | dev->pdev->device != 0x4144) || | 445 | dev->pdev->device != 0x4144) || |
| 442 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350)) { | 446 | ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350 && |
| 447 | dev->pdev->device != 0x4148)) { | ||
| 443 | dev_priv->num_gb_pipes = 2; | 448 | dev_priv->num_gb_pipes = 2; |
| 444 | } else { | 449 | } else { |
| 445 | /* RV3xx/R300 AD */ | 450 | /* RV3xx/R300 AD/R350 AH */ |
| 446 | dev_priv->num_gb_pipes = 1; | 451 | dev_priv->num_gb_pipes = 1; |
| 447 | } | 452 | } |
| 448 | } | 453 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index b8d672828246..bb1c122cad21 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c | |||
| @@ -86,12 +86,12 @@ static void evergreen_crtc_load_lut(struct drm_crtc *crtc) | |||
| 86 | WREG32(EVERGREEN_DC_LUT_WHITE_OFFSET_GREEN + radeon_crtc->crtc_offset, 0xffff); | 86 | WREG32(EVERGREEN_DC_LUT_WHITE_OFFSET_GREEN + radeon_crtc->crtc_offset, 0xffff); |
| 87 | WREG32(EVERGREEN_DC_LUT_WHITE_OFFSET_RED + radeon_crtc->crtc_offset, 0xffff); | 87 | WREG32(EVERGREEN_DC_LUT_WHITE_OFFSET_RED + radeon_crtc->crtc_offset, 0xffff); |
| 88 | 88 | ||
| 89 | WREG32(EVERGREEN_DC_LUT_RW_MODE, radeon_crtc->crtc_id); | 89 | WREG32(EVERGREEN_DC_LUT_RW_MODE + radeon_crtc->crtc_offset, 0); |
| 90 | WREG32(EVERGREEN_DC_LUT_WRITE_EN_MASK, 0x00000007); | 90 | WREG32(EVERGREEN_DC_LUT_WRITE_EN_MASK + radeon_crtc->crtc_offset, 0x00000007); |
| 91 | 91 | ||
| 92 | WREG32(EVERGREEN_DC_LUT_RW_INDEX, 0); | 92 | WREG32(EVERGREEN_DC_LUT_RW_INDEX + radeon_crtc->crtc_offset, 0); |
| 93 | for (i = 0; i < 256; i++) { | 93 | for (i = 0; i < 256; i++) { |
| 94 | WREG32(EVERGREEN_DC_LUT_30_COLOR, | 94 | WREG32(EVERGREEN_DC_LUT_30_COLOR + radeon_crtc->crtc_offset, |
| 95 | (radeon_crtc->lut_r[i] << 20) | | 95 | (radeon_crtc->lut_r[i] << 20) | |
| 96 | (radeon_crtc->lut_g[i] << 10) | | 96 | (radeon_crtc->lut_g[i] << 10) | |
| 97 | (radeon_crtc->lut_b[i] << 0)); | 97 | (radeon_crtc->lut_b[i] << 0)); |
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 30293bec0801..c5ddaf58563a 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
| @@ -254,6 +254,53 @@ radeon_get_atom_connector_priv_from_encoder(struct drm_encoder *encoder) | |||
| 254 | return dig_connector; | 254 | return dig_connector; |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | void radeon_panel_mode_fixup(struct drm_encoder *encoder, | ||
| 258 | struct drm_display_mode *adjusted_mode) | ||
| 259 | { | ||
| 260 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | ||
| 261 | struct drm_device *dev = encoder->dev; | ||
| 262 | struct radeon_device *rdev = dev->dev_private; | ||
| 263 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; | ||
| 264 | unsigned hblank = native_mode->htotal - native_mode->hdisplay; | ||
| 265 | unsigned vblank = native_mode->vtotal - native_mode->vdisplay; | ||
| 266 | unsigned hover = native_mode->hsync_start - native_mode->hdisplay; | ||
| 267 | unsigned vover = native_mode->vsync_start - native_mode->vdisplay; | ||
| 268 | unsigned hsync_width = native_mode->hsync_end - native_mode->hsync_start; | ||
| 269 | unsigned vsync_width = native_mode->vsync_end - native_mode->vsync_start; | ||
| 270 | |||
| 271 | adjusted_mode->clock = native_mode->clock; | ||
| 272 | adjusted_mode->flags = native_mode->flags; | ||
| 273 | |||
| 274 | if (ASIC_IS_AVIVO(rdev)) { | ||
| 275 | adjusted_mode->hdisplay = native_mode->hdisplay; | ||
| 276 | adjusted_mode->vdisplay = native_mode->vdisplay; | ||
| 277 | } | ||
| 278 | |||
| 279 | adjusted_mode->htotal = native_mode->hdisplay + hblank; | ||
| 280 | adjusted_mode->hsync_start = native_mode->hdisplay + hover; | ||
| 281 | adjusted_mode->hsync_end = adjusted_mode->hsync_start + hsync_width; | ||
| 282 | |||
| 283 | adjusted_mode->vtotal = native_mode->vdisplay + vblank; | ||
| 284 | adjusted_mode->vsync_start = native_mode->vdisplay + vover; | ||
| 285 | adjusted_mode->vsync_end = adjusted_mode->vsync_start + vsync_width; | ||
| 286 | |||
| 287 | drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V); | ||
| 288 | |||
| 289 | if (ASIC_IS_AVIVO(rdev)) { | ||
| 290 | adjusted_mode->crtc_hdisplay = native_mode->hdisplay; | ||
| 291 | adjusted_mode->crtc_vdisplay = native_mode->vdisplay; | ||
| 292 | } | ||
| 293 | |||
| 294 | adjusted_mode->crtc_htotal = adjusted_mode->crtc_hdisplay + hblank; | ||
| 295 | adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hdisplay + hover; | ||
| 296 | adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + hsync_width; | ||
| 297 | |||
| 298 | adjusted_mode->crtc_vtotal = adjusted_mode->crtc_vdisplay + vblank; | ||
| 299 | adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + vover; | ||
| 300 | adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + vsync_width; | ||
| 301 | |||
| 302 | } | ||
| 303 | |||
| 257 | static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, | 304 | static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, |
| 258 | struct drm_display_mode *mode, | 305 | struct drm_display_mode *mode, |
| 259 | struct drm_display_mode *adjusted_mode) | 306 | struct drm_display_mode *adjusted_mode) |
| @@ -275,18 +322,8 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, | |||
| 275 | adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2; | 322 | adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2; |
| 276 | 323 | ||
| 277 | /* get the native mode for LVDS */ | 324 | /* get the native mode for LVDS */ |
| 278 | if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) { | 325 | if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) |
| 279 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; | 326 | radeon_panel_mode_fixup(encoder, adjusted_mode); |
| 280 | int mode_id = adjusted_mode->base.id; | ||
| 281 | *adjusted_mode = *native_mode; | ||
| 282 | if (!ASIC_IS_AVIVO(rdev)) { | ||
| 283 | adjusted_mode->hdisplay = mode->hdisplay; | ||
| 284 | adjusted_mode->vdisplay = mode->vdisplay; | ||
| 285 | adjusted_mode->crtc_hdisplay = mode->hdisplay; | ||
| 286 | adjusted_mode->crtc_vdisplay = mode->vdisplay; | ||
| 287 | } | ||
| 288 | adjusted_mode->base.id = mode_id; | ||
| 289 | } | ||
| 290 | 327 | ||
| 291 | /* get the native mode for TV */ | 328 | /* get the native mode for TV */ |
| 292 | if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) { | 329 | if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) { |
| @@ -1326,7 +1363,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, | |||
| 1326 | 1363 | ||
| 1327 | radeon_encoder->pixel_clock = adjusted_mode->clock; | 1364 | radeon_encoder->pixel_clock = adjusted_mode->clock; |
| 1328 | 1365 | ||
| 1329 | if (ASIC_IS_AVIVO(rdev)) { | 1366 | if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE4(rdev)) { |
| 1330 | if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)) | 1367 | if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)) |
| 1331 | atombios_yuv_setup(encoder, true); | 1368 | atombios_yuv_setup(encoder, true); |
| 1332 | else | 1369 | else |
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index d3657dcfdd26..c633319f98ed 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c | |||
| @@ -165,7 +165,7 @@ u32 radeon_get_vblank_counter_kms(struct drm_device *dev, int crtc) | |||
| 165 | { | 165 | { |
| 166 | struct radeon_device *rdev = dev->dev_private; | 166 | struct radeon_device *rdev = dev->dev_private; |
| 167 | 167 | ||
| 168 | if (crtc < 0 || crtc > 1) { | 168 | if (crtc < 0 || crtc >= rdev->num_crtc) { |
| 169 | DRM_ERROR("Invalid crtc %d\n", crtc); | 169 | DRM_ERROR("Invalid crtc %d\n", crtc); |
| 170 | return -EINVAL; | 170 | return -EINVAL; |
| 171 | } | 171 | } |
| @@ -177,7 +177,7 @@ int radeon_enable_vblank_kms(struct drm_device *dev, int crtc) | |||
| 177 | { | 177 | { |
| 178 | struct radeon_device *rdev = dev->dev_private; | 178 | struct radeon_device *rdev = dev->dev_private; |
| 179 | 179 | ||
| 180 | if (crtc < 0 || crtc > 1) { | 180 | if (crtc < 0 || crtc >= rdev->num_crtc) { |
| 181 | DRM_ERROR("Invalid crtc %d\n", crtc); | 181 | DRM_ERROR("Invalid crtc %d\n", crtc); |
| 182 | return -EINVAL; | 182 | return -EINVAL; |
| 183 | } | 183 | } |
| @@ -191,7 +191,7 @@ void radeon_disable_vblank_kms(struct drm_device *dev, int crtc) | |||
| 191 | { | 191 | { |
| 192 | struct radeon_device *rdev = dev->dev_private; | 192 | struct radeon_device *rdev = dev->dev_private; |
| 193 | 193 | ||
| 194 | if (crtc < 0 || crtc > 1) { | 194 | if (crtc < 0 || crtc >= rdev->num_crtc) { |
| 195 | DRM_ERROR("Invalid crtc %d\n", crtc); | 195 | DRM_ERROR("Invalid crtc %d\n", crtc); |
| 196 | return; | 196 | return; |
| 197 | } | 197 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 2441cca7d775..0274abe17ad9 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | |||
| @@ -228,16 +228,8 @@ static bool radeon_legacy_mode_fixup(struct drm_encoder *encoder, | |||
| 228 | drm_mode_set_crtcinfo(adjusted_mode, 0); | 228 | drm_mode_set_crtcinfo(adjusted_mode, 0); |
| 229 | 229 | ||
| 230 | /* get the native mode for LVDS */ | 230 | /* get the native mode for LVDS */ |
| 231 | if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) { | 231 | if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT)) |
| 232 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; | 232 | radeon_panel_mode_fixup(encoder, adjusted_mode); |
| 233 | int mode_id = adjusted_mode->base.id; | ||
| 234 | *adjusted_mode = *native_mode; | ||
| 235 | adjusted_mode->hdisplay = mode->hdisplay; | ||
| 236 | adjusted_mode->vdisplay = mode->vdisplay; | ||
| 237 | adjusted_mode->crtc_hdisplay = mode->hdisplay; | ||
| 238 | adjusted_mode->crtc_vdisplay = mode->vdisplay; | ||
| 239 | adjusted_mode->base.id = mode_id; | ||
| 240 | } | ||
| 241 | 233 | ||
| 242 | return true; | 234 | return true; |
| 243 | } | 235 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 0b8e32776b10..5413fcd63086 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h | |||
| @@ -558,6 +558,8 @@ extern int radeon_static_clocks_init(struct drm_device *dev); | |||
| 558 | bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, | 558 | bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, |
| 559 | struct drm_display_mode *mode, | 559 | struct drm_display_mode *mode, |
| 560 | struct drm_display_mode *adjusted_mode); | 560 | struct drm_display_mode *adjusted_mode); |
| 561 | void radeon_panel_mode_fixup(struct drm_encoder *encoder, | ||
| 562 | struct drm_display_mode *adjusted_mode); | ||
| 561 | void atom_rv515_force_tv_scaler(struct radeon_device *rdev, struct radeon_crtc *radeon_crtc); | 563 | void atom_rv515_force_tv_scaler(struct radeon_device *rdev, struct radeon_crtc *radeon_crtc); |
| 562 | 564 | ||
| 563 | /* legacy tv */ | 565 | /* legacy tv */ |
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index 6ec04ac12459..6efac8117c93 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c | |||
| @@ -75,7 +75,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_ | |||
| 75 | 75 | ||
| 76 | DRM_DEBUG("\n"); | 76 | DRM_DEBUG("\n"); |
| 77 | 77 | ||
| 78 | if (fx->lock > VIA_NR_XVMC_LOCKS) | 78 | if (fx->lock >= VIA_NR_XVMC_LOCKS) |
| 79 | return -EFAULT; | 79 | return -EFAULT; |
| 80 | 80 | ||
| 81 | lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx->lock); | 81 | lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx->lock); |
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index d6d1149d525d..c8768f38511e 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c | |||
| @@ -276,8 +276,10 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf, | |||
| 276 | 276 | ||
| 277 | mutex_lock(&vgasr_mutex); | 277 | mutex_lock(&vgasr_mutex); |
| 278 | 278 | ||
| 279 | if (!vgasr_priv.active) | 279 | if (!vgasr_priv.active) { |
| 280 | return -EINVAL; | 280 | cnt = -EINVAL; |
| 281 | goto out; | ||
| 282 | } | ||
| 281 | 283 | ||
| 282 | /* pwr off the device not in use */ | 284 | /* pwr off the device not in use */ |
| 283 | if (strncmp(usercmd, "OFF", 3) == 0) { | 285 | if (strncmp(usercmd, "OFF", 3) == 0) { |
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c index be475e844c2a..c8ab50516672 100644 --- a/drivers/hwmon/hp_accel.c +++ b/drivers/hwmon/hp_accel.c | |||
| @@ -217,6 +217,10 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = { | |||
| 217 | AXIS_DMI_MATCH("DV7", "HP Pavilion dv7", x_inverted), | 217 | AXIS_DMI_MATCH("DV7", "HP Pavilion dv7", x_inverted), |
| 218 | AXIS_DMI_MATCH("HP8710", "HP Compaq 8710", y_inverted), | 218 | AXIS_DMI_MATCH("HP8710", "HP Compaq 8710", y_inverted), |
| 219 | AXIS_DMI_MATCH("HDX18", "HP HDX 18", x_inverted), | 219 | AXIS_DMI_MATCH("HDX18", "HP HDX 18", x_inverted), |
| 220 | AXIS_DMI_MATCH("HPB432x", "HP ProBook 432", xy_rotated_left), | ||
| 221 | AXIS_DMI_MATCH("HPB442x", "HP ProBook 442", xy_rotated_left), | ||
| 222 | AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted), | ||
| 223 | AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap), | ||
| 220 | { NULL, } | 224 | { NULL, } |
| 221 | /* Laptop models without axis info (yet): | 225 | /* Laptop models without axis info (yet): |
| 222 | * "NC6910" "HP Compaq 6910" | 226 | * "NC6910" "HP Compaq 6910" |
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c index a2481f40ea1c..0e9f85d0a835 100644 --- a/drivers/i2c/busses/i2c-octeon.c +++ b/drivers/i2c/busses/i2c-octeon.c | |||
| @@ -447,7 +447,7 @@ static struct i2c_adapter octeon_i2c_ops = { | |||
| 447 | /** | 447 | /** |
| 448 | * octeon_i2c_setclock - Calculate and set clock divisors. | 448 | * octeon_i2c_setclock - Calculate and set clock divisors. |
| 449 | */ | 449 | */ |
| 450 | static int __init octeon_i2c_setclock(struct octeon_i2c *i2c) | 450 | static int __devinit octeon_i2c_setclock(struct octeon_i2c *i2c) |
| 451 | { | 451 | { |
| 452 | int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff; | 452 | int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff; |
| 453 | int thp = 0x18, mdiv = 2, ndiv = 0, delta_hz = 1000000; | 453 | int thp = 0x18, mdiv = 2, ndiv = 0, delta_hz = 1000000; |
| @@ -490,7 +490,7 @@ static int __init octeon_i2c_setclock(struct octeon_i2c *i2c) | |||
| 490 | return 0; | 490 | return 0; |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | static int __init octeon_i2c_initlowlevel(struct octeon_i2c *i2c) | 493 | static int __devinit octeon_i2c_initlowlevel(struct octeon_i2c *i2c) |
| 494 | { | 494 | { |
| 495 | u8 status; | 495 | u8 status; |
| 496 | int tries; | 496 | int tries; |
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 3202a86f420e..c2258a51fe0c 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
| @@ -40,12 +40,11 @@ | |||
| 40 | #include "i2c-core.h" | 40 | #include "i2c-core.h" |
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | /* core_lock protects i2c_adapter_idr, userspace_devices, and guarantees | 43 | /* core_lock protects i2c_adapter_idr, and guarantees |
| 44 | that device detection, deletion of detected devices, and attach_adapter | 44 | that device detection, deletion of detected devices, and attach_adapter |
| 45 | and detach_adapter calls are serialized */ | 45 | and detach_adapter calls are serialized */ |
| 46 | static DEFINE_MUTEX(core_lock); | 46 | static DEFINE_MUTEX(core_lock); |
| 47 | static DEFINE_IDR(i2c_adapter_idr); | 47 | static DEFINE_IDR(i2c_adapter_idr); |
| 48 | static LIST_HEAD(userspace_devices); | ||
| 49 | 48 | ||
| 50 | static struct device_type i2c_client_type; | 49 | static struct device_type i2c_client_type; |
| 51 | static int i2c_check_addr(struct i2c_adapter *adapter, int addr); | 50 | static int i2c_check_addr(struct i2c_adapter *adapter, int addr); |
| @@ -117,8 +116,10 @@ static int i2c_device_probe(struct device *dev) | |||
| 117 | dev_dbg(dev, "probe\n"); | 116 | dev_dbg(dev, "probe\n"); |
| 118 | 117 | ||
| 119 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); | 118 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); |
| 120 | if (status) | 119 | if (status) { |
| 121 | client->driver = NULL; | 120 | client->driver = NULL; |
| 121 | i2c_set_clientdata(client, NULL); | ||
| 122 | } | ||
| 122 | return status; | 123 | return status; |
| 123 | } | 124 | } |
| 124 | 125 | ||
| @@ -139,8 +140,10 @@ static int i2c_device_remove(struct device *dev) | |||
| 139 | dev->driver = NULL; | 140 | dev->driver = NULL; |
| 140 | status = 0; | 141 | status = 0; |
| 141 | } | 142 | } |
| 142 | if (status == 0) | 143 | if (status == 0) { |
| 143 | client->driver = NULL; | 144 | client->driver = NULL; |
| 145 | i2c_set_clientdata(client, NULL); | ||
| 146 | } | ||
| 144 | return status; | 147 | return status; |
| 145 | } | 148 | } |
| 146 | 149 | ||
| @@ -538,9 +541,9 @@ i2c_sysfs_new_device(struct device *dev, struct device_attribute *attr, | |||
| 538 | return -EEXIST; | 541 | return -EEXIST; |
| 539 | 542 | ||
| 540 | /* Keep track of the added device */ | 543 | /* Keep track of the added device */ |
| 541 | mutex_lock(&core_lock); | 544 | i2c_lock_adapter(adap); |
| 542 | list_add_tail(&client->detected, &userspace_devices); | 545 | list_add_tail(&client->detected, &adap->userspace_clients); |
| 543 | mutex_unlock(&core_lock); | 546 | i2c_unlock_adapter(adap); |
| 544 | dev_info(dev, "%s: Instantiated device %s at 0x%02hx\n", "new_device", | 547 | dev_info(dev, "%s: Instantiated device %s at 0x%02hx\n", "new_device", |
| 545 | info.type, info.addr); | 548 | info.type, info.addr); |
| 546 | 549 | ||
| @@ -579,9 +582,10 @@ i2c_sysfs_delete_device(struct device *dev, struct device_attribute *attr, | |||
| 579 | 582 | ||
| 580 | /* Make sure the device was added through sysfs */ | 583 | /* Make sure the device was added through sysfs */ |
| 581 | res = -ENOENT; | 584 | res = -ENOENT; |
| 582 | mutex_lock(&core_lock); | 585 | i2c_lock_adapter(adap); |
| 583 | list_for_each_entry_safe(client, next, &userspace_devices, detected) { | 586 | list_for_each_entry_safe(client, next, &adap->userspace_clients, |
| 584 | if (client->addr == addr && client->adapter == adap) { | 587 | detected) { |
| 588 | if (client->addr == addr) { | ||
| 585 | dev_info(dev, "%s: Deleting device %s at 0x%02hx\n", | 589 | dev_info(dev, "%s: Deleting device %s at 0x%02hx\n", |
| 586 | "delete_device", client->name, client->addr); | 590 | "delete_device", client->name, client->addr); |
| 587 | 591 | ||
| @@ -591,7 +595,7 @@ i2c_sysfs_delete_device(struct device *dev, struct device_attribute *attr, | |||
| 591 | break; | 595 | break; |
| 592 | } | 596 | } |
| 593 | } | 597 | } |
| 594 | mutex_unlock(&core_lock); | 598 | i2c_unlock_adapter(adap); |
| 595 | 599 | ||
| 596 | if (res < 0) | 600 | if (res < 0) |
| 597 | dev_err(dev, "%s: Can't find device in list\n", | 601 | dev_err(dev, "%s: Can't find device in list\n", |
| @@ -673,6 +677,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) | |||
| 673 | } | 677 | } |
| 674 | 678 | ||
| 675 | rt_mutex_init(&adap->bus_lock); | 679 | rt_mutex_init(&adap->bus_lock); |
| 680 | INIT_LIST_HEAD(&adap->userspace_clients); | ||
| 676 | 681 | ||
| 677 | /* Set default timeout to 1 second if not already set */ | 682 | /* Set default timeout to 1 second if not already set */ |
| 678 | if (adap->timeout == 0) | 683 | if (adap->timeout == 0) |
| @@ -875,14 +880,15 @@ int i2c_del_adapter(struct i2c_adapter *adap) | |||
| 875 | return res; | 880 | return res; |
| 876 | 881 | ||
| 877 | /* Remove devices instantiated from sysfs */ | 882 | /* Remove devices instantiated from sysfs */ |
| 878 | list_for_each_entry_safe(client, next, &userspace_devices, detected) { | 883 | i2c_lock_adapter(adap); |
| 879 | if (client->adapter == adap) { | 884 | list_for_each_entry_safe(client, next, &adap->userspace_clients, |
| 880 | dev_dbg(&adap->dev, "Removing %s at 0x%x\n", | 885 | detected) { |
| 881 | client->name, client->addr); | 886 | dev_dbg(&adap->dev, "Removing %s at 0x%x\n", client->name, |
| 882 | list_del(&client->detected); | 887 | client->addr); |
| 883 | i2c_unregister_device(client); | 888 | list_del(&client->detected); |
| 884 | } | 889 | i2c_unregister_device(client); |
| 885 | } | 890 | } |
| 891 | i2c_unlock_adapter(adap); | ||
| 886 | 892 | ||
| 887 | /* Detach any active clients. This can't fail, thus we do not | 893 | /* Detach any active clients. This can't fail, thus we do not |
| 888 | checking the returned value. */ | 894 | checking the returned value. */ |
| @@ -1260,12 +1266,23 @@ static int i2c_detect_address(struct i2c_client *temp_client, | |||
| 1260 | return 0; | 1266 | return 0; |
| 1261 | 1267 | ||
| 1262 | /* Make sure there is something at this address */ | 1268 | /* Make sure there is something at this address */ |
| 1263 | if (i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) < 0) | 1269 | if (addr == 0x73 && (adapter->class & I2C_CLASS_HWMON)) { |
| 1264 | return 0; | 1270 | /* Special probe for FSC hwmon chips */ |
| 1271 | union i2c_smbus_data dummy; | ||
| 1265 | 1272 | ||
| 1266 | /* Prevent 24RF08 corruption */ | 1273 | if (i2c_smbus_xfer(adapter, addr, 0, I2C_SMBUS_READ, 0, |
| 1267 | if ((addr & ~0x0f) == 0x50) | 1274 | I2C_SMBUS_BYTE_DATA, &dummy) < 0) |
| 1268 | i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL); | 1275 | return 0; |
| 1276 | } else { | ||
| 1277 | if (i2c_smbus_xfer(adapter, addr, 0, I2C_SMBUS_WRITE, 0, | ||
| 1278 | I2C_SMBUS_QUICK, NULL) < 0) | ||
| 1279 | return 0; | ||
| 1280 | |||
| 1281 | /* Prevent 24RF08 corruption */ | ||
| 1282 | if ((addr & ~0x0f) == 0x50) | ||
| 1283 | i2c_smbus_xfer(adapter, addr, 0, I2C_SMBUS_WRITE, 0, | ||
| 1284 | I2C_SMBUS_QUICK, NULL); | ||
| 1285 | } | ||
| 1269 | 1286 | ||
| 1270 | /* Finally call the custom detection function */ | 1287 | /* Finally call the custom detection function */ |
| 1271 | memset(&info, 0, sizeof(struct i2c_board_info)); | 1288 | memset(&info, 0, sizeof(struct i2c_board_info)); |
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index defce2877eef..b85450865ff0 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c | |||
| @@ -409,7 +409,7 @@ static struct pcmcia_device_id ide_ids[] = { | |||
| 409 | PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420), | 409 | PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420), |
| 410 | PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178), | 410 | PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178), |
| 411 | PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753), | 411 | PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753), |
| 412 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17), | 412 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x55d5bffb), |
| 413 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10), | 413 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10), |
| 414 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e), | 414 | PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e), |
| 415 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2 ", 0x547e66dc, 0x8671043b), | 415 | PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2 ", 0x547e66dc, 0x8671043b), |
| @@ -431,7 +431,7 @@ static struct pcmcia_device_id ide_ids[] = { | |||
| 431 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), | 431 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1), |
| 432 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), | 432 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2), |
| 433 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), | 433 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), |
| 434 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d), | 434 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x7558f133), |
| 435 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47), | 435 | PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47), |
| 436 | PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), | 436 | PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), |
| 437 | PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918), | 437 | PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918), |
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index c52bec4d0530..423e0e6031ab 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -929,6 +929,24 @@ static const struct input_device_id joydev_ids[] = { | |||
| 929 | .evbit = { BIT_MASK(EV_ABS) }, | 929 | .evbit = { BIT_MASK(EV_ABS) }, |
| 930 | .absbit = { BIT_MASK(ABS_THROTTLE) }, | 930 | .absbit = { BIT_MASK(ABS_THROTTLE) }, |
| 931 | }, | 931 | }, |
| 932 | { | ||
| 933 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | ||
| 934 | INPUT_DEVICE_ID_MATCH_KEYBIT, | ||
| 935 | .evbit = { BIT_MASK(EV_KEY) }, | ||
| 936 | .keybit = {[BIT_WORD(BTN_JOYSTICK)] = BIT_MASK(BTN_JOYSTICK) }, | ||
| 937 | }, | ||
| 938 | { | ||
| 939 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | ||
| 940 | INPUT_DEVICE_ID_MATCH_KEYBIT, | ||
| 941 | .evbit = { BIT_MASK(EV_KEY) }, | ||
| 942 | .keybit = { [BIT_WORD(BTN_GAMEPAD)] = BIT_MASK(BTN_GAMEPAD) }, | ||
| 943 | }, | ||
| 944 | { | ||
| 945 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | ||
| 946 | INPUT_DEVICE_ID_MATCH_KEYBIT, | ||
| 947 | .evbit = { BIT_MASK(EV_KEY) }, | ||
| 948 | .keybit = { [BIT_WORD(BTN_TRIGGER_HAPPY)] = BIT_MASK(BTN_TRIGGER_HAPPY) }, | ||
| 949 | }, | ||
| 932 | { } /* Terminating entry */ | 950 | { } /* Terminating entry */ |
| 933 | }; | 951 | }; |
| 934 | 952 | ||
diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c index 614b65d78fe9..e8bbc619f6df 100644 --- a/drivers/input/misc/ati_remote.c +++ b/drivers/input/misc/ati_remote.c | |||
| @@ -98,10 +98,12 @@ | |||
| 98 | * Module and Version Information, Module Parameters | 98 | * Module and Version Information, Module Parameters |
| 99 | */ | 99 | */ |
| 100 | 100 | ||
| 101 | #define ATI_REMOTE_VENDOR_ID 0x0bc7 | 101 | #define ATI_REMOTE_VENDOR_ID 0x0bc7 |
| 102 | #define ATI_REMOTE_PRODUCT_ID 0x004 | 102 | #define LOLA_REMOTE_PRODUCT_ID 0x0002 |
| 103 | #define LOLA_REMOTE_PRODUCT_ID 0x002 | 103 | #define LOLA2_REMOTE_PRODUCT_ID 0x0003 |
| 104 | #define MEDION_REMOTE_PRODUCT_ID 0x006 | 104 | #define ATI_REMOTE_PRODUCT_ID 0x0004 |
| 105 | #define NVIDIA_REMOTE_PRODUCT_ID 0x0005 | ||
| 106 | #define MEDION_REMOTE_PRODUCT_ID 0x0006 | ||
| 105 | 107 | ||
| 106 | #define DRIVER_VERSION "2.2.1" | 108 | #define DRIVER_VERSION "2.2.1" |
| 107 | #define DRIVER_AUTHOR "Torrey Hoffman <thoffman@arnor.net>" | 109 | #define DRIVER_AUTHOR "Torrey Hoffman <thoffman@arnor.net>" |
| @@ -142,8 +144,10 @@ MODULE_PARM_DESC(repeat_delay, "Delay before sending repeats, default = 500 msec | |||
| 142 | #define err(format, arg...) printk(KERN_ERR format , ## arg) | 144 | #define err(format, arg...) printk(KERN_ERR format , ## arg) |
| 143 | 145 | ||
| 144 | static struct usb_device_id ati_remote_table[] = { | 146 | static struct usb_device_id ati_remote_table[] = { |
| 145 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) }, | ||
| 146 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) }, | 147 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) }, |
| 148 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA2_REMOTE_PRODUCT_ID) }, | ||
| 149 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) }, | ||
| 150 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, NVIDIA_REMOTE_PRODUCT_ID) }, | ||
| 147 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID) }, | 151 | { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID) }, |
| 148 | {} /* Terminating entry */ | 152 | {} /* Terminating entry */ |
| 149 | }; | 153 | }; |
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 0d22cb9ce42e..99d58764ef03 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -64,7 +64,6 @@ static const struct alps_model_info alps_model_data[] = { | |||
| 64 | { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, | 64 | { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, |
| 65 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, | 65 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, |
| 66 | { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ | 66 | { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ |
| 67 | { { 0x73, 0x02, 0x64 }, 0xf8, 0xf8, 0 }, /* HP Pavilion dm3 */ | ||
| 68 | { { 0x52, 0x01, 0x14 }, 0xff, 0xff, | 67 | { { 0x52, 0x01, 0x14 }, 0xff, 0xff, |
| 69 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ | 68 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ |
| 70 | }; | 69 | }; |
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index a138b5da79f9..0520c2e19927 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c | |||
| @@ -25,6 +25,10 @@ | |||
| 25 | printk(KERN_DEBUG format, ##arg); \ | 25 | printk(KERN_DEBUG format, ##arg); \ |
| 26 | } while (0) | 26 | } while (0) |
| 27 | 27 | ||
| 28 | static bool force_elantech; | ||
| 29 | module_param_named(force_elantech, force_elantech, bool, 0644); | ||
| 30 | MODULE_PARM_DESC(force_elantech, "Force the Elantech PS/2 protocol extension to be used, 1 = enabled, 0 = disabled (default)."); | ||
| 31 | |||
| 28 | /* | 32 | /* |
| 29 | * Send a Synaptics style sliced query command | 33 | * Send a Synaptics style sliced query command |
| 30 | */ | 34 | */ |
| @@ -182,13 +186,17 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) | |||
| 182 | static int old_fingers; | 186 | static int old_fingers; |
| 183 | 187 | ||
| 184 | if (etd->fw_version_maj == 0x01) { | 188 | if (etd->fw_version_maj == 0x01) { |
| 185 | /* byte 0: D U p1 p2 1 p3 R L | 189 | /* |
| 186 | byte 1: f 0 th tw x9 x8 y9 y8 */ | 190 | * byte 0: D U p1 p2 1 p3 R L |
| 191 | * byte 1: f 0 th tw x9 x8 y9 y8 | ||
| 192 | */ | ||
| 187 | fingers = ((packet[1] & 0x80) >> 7) + | 193 | fingers = ((packet[1] & 0x80) >> 7) + |
| 188 | ((packet[1] & 0x30) >> 4); | 194 | ((packet[1] & 0x30) >> 4); |
| 189 | } else { | 195 | } else { |
| 190 | /* byte 0: n1 n0 p2 p1 1 p3 R L | 196 | /* |
| 191 | byte 1: 0 0 0 0 x9 x8 y9 y8 */ | 197 | * byte 0: n1 n0 p2 p1 1 p3 R L |
| 198 | * byte 1: 0 0 0 0 x9 x8 y9 y8 | ||
| 199 | */ | ||
| 192 | fingers = (packet[0] & 0xc0) >> 6; | 200 | fingers = (packet[0] & 0xc0) >> 6; |
| 193 | } | 201 | } |
| 194 | 202 | ||
| @@ -202,13 +210,15 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) | |||
| 202 | 210 | ||
| 203 | input_report_key(dev, BTN_TOUCH, fingers != 0); | 211 | input_report_key(dev, BTN_TOUCH, fingers != 0); |
| 204 | 212 | ||
| 205 | /* byte 2: x7 x6 x5 x4 x3 x2 x1 x0 | 213 | /* |
| 206 | byte 3: y7 y6 y5 y4 y3 y2 y1 y0 */ | 214 | * byte 2: x7 x6 x5 x4 x3 x2 x1 x0 |
| 215 | * byte 3: y7 y6 y5 y4 y3 y2 y1 y0 | ||
| 216 | */ | ||
| 207 | if (fingers) { | 217 | if (fingers) { |
| 208 | input_report_abs(dev, ABS_X, | 218 | input_report_abs(dev, ABS_X, |
| 209 | ((packet[1] & 0x0c) << 6) | packet[2]); | 219 | ((packet[1] & 0x0c) << 6) | packet[2]); |
| 210 | input_report_abs(dev, ABS_Y, ETP_YMAX_V1 - | 220 | input_report_abs(dev, ABS_Y, |
| 211 | (((packet[1] & 0x03) << 8) | packet[3])); | 221 | ETP_YMAX_V1 - (((packet[1] & 0x03) << 8) | packet[3])); |
| 212 | } | 222 | } |
| 213 | 223 | ||
| 214 | input_report_key(dev, BTN_TOOL_FINGER, fingers == 1); | 224 | input_report_key(dev, BTN_TOOL_FINGER, fingers == 1); |
| @@ -247,34 +257,47 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse) | |||
| 247 | 257 | ||
| 248 | switch (fingers) { | 258 | switch (fingers) { |
| 249 | case 1: | 259 | case 1: |
| 250 | /* byte 1: x15 x14 x13 x12 x11 x10 x9 x8 | 260 | /* |
| 251 | byte 2: x7 x6 x5 x4 x4 x2 x1 x0 */ | 261 | * byte 1: . . . . . x10 x9 x8 |
| 252 | input_report_abs(dev, ABS_X, (packet[1] << 8) | packet[2]); | 262 | * byte 2: x7 x6 x5 x4 x4 x2 x1 x0 |
| 253 | /* byte 4: y15 y14 y13 y12 y11 y10 y8 y8 | 263 | */ |
| 254 | byte 5: y7 y6 y5 y4 y3 y2 y1 y0 */ | 264 | input_report_abs(dev, ABS_X, |
| 255 | input_report_abs(dev, ABS_Y, ETP_YMAX_V2 - | 265 | ((packet[1] & 0x07) << 8) | packet[2]); |
| 256 | ((packet[4] << 8) | packet[5])); | 266 | /* |
| 267 | * byte 4: . . . . . . y9 y8 | ||
| 268 | * byte 5: y7 y6 y5 y4 y3 y2 y1 y0 | ||
| 269 | */ | ||
| 270 | input_report_abs(dev, ABS_Y, | ||
| 271 | ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5])); | ||
| 257 | break; | 272 | break; |
| 258 | 273 | ||
| 259 | case 2: | 274 | case 2: |
| 260 | /* The coordinate of each finger is reported separately with | 275 | /* |
| 261 | a lower resolution for two finger touches */ | 276 | * The coordinate of each finger is reported separately |
| 262 | /* byte 0: . . ay8 ax8 . . . . | 277 | * with a lower resolution for two finger touches: |
| 263 | byte 1: ax7 ax6 ax5 ax4 ax3 ax2 ax1 ax0 */ | 278 | * byte 0: . . ay8 ax8 . . . . |
| 279 | * byte 1: ax7 ax6 ax5 ax4 ax3 ax2 ax1 ax0 | ||
| 280 | */ | ||
| 264 | x1 = ((packet[0] & 0x10) << 4) | packet[1]; | 281 | x1 = ((packet[0] & 0x10) << 4) | packet[1]; |
| 265 | /* byte 2: ay7 ay6 ay5 ay4 ay3 ay2 ay1 ay0 */ | 282 | /* byte 2: ay7 ay6 ay5 ay4 ay3 ay2 ay1 ay0 */ |
| 266 | y1 = ETP_2FT_YMAX - (((packet[0] & 0x20) << 3) | packet[2]); | 283 | y1 = ETP_2FT_YMAX - (((packet[0] & 0x20) << 3) | packet[2]); |
| 267 | /* byte 3: . . by8 bx8 . . . . | 284 | /* |
| 268 | byte 4: bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0 */ | 285 | * byte 3: . . by8 bx8 . . . . |
| 286 | * byte 4: bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0 | ||
| 287 | */ | ||
| 269 | x2 = ((packet[3] & 0x10) << 4) | packet[4]; | 288 | x2 = ((packet[3] & 0x10) << 4) | packet[4]; |
| 270 | /* byte 5: by7 by8 by5 by4 by3 by2 by1 by0 */ | 289 | /* byte 5: by7 by8 by5 by4 by3 by2 by1 by0 */ |
| 271 | y2 = ETP_2FT_YMAX - (((packet[3] & 0x20) << 3) | packet[5]); | 290 | y2 = ETP_2FT_YMAX - (((packet[3] & 0x20) << 3) | packet[5]); |
| 272 | /* For compatibility with the X Synaptics driver scale up one | 291 | /* |
| 273 | coordinate and report as ordinary mouse movent */ | 292 | * For compatibility with the X Synaptics driver scale up |
| 293 | * one coordinate and report as ordinary mouse movent | ||
| 294 | */ | ||
| 274 | input_report_abs(dev, ABS_X, x1 << 2); | 295 | input_report_abs(dev, ABS_X, x1 << 2); |
| 275 | input_report_abs(dev, ABS_Y, y1 << 2); | 296 | input_report_abs(dev, ABS_Y, y1 << 2); |
| 276 | /* For compatibility with the proprietary X Elantech driver | 297 | /* |
| 277 | report both coordinates as hat coordinates */ | 298 | * For compatibility with the proprietary X Elantech driver |
| 299 | * report both coordinates as hat coordinates | ||
| 300 | */ | ||
| 278 | input_report_abs(dev, ABS_HAT0X, x1); | 301 | input_report_abs(dev, ABS_HAT0X, x1); |
| 279 | input_report_abs(dev, ABS_HAT0Y, y1); | 302 | input_report_abs(dev, ABS_HAT0Y, y1); |
| 280 | input_report_abs(dev, ABS_HAT1X, x2); | 303 | input_report_abs(dev, ABS_HAT1X, x2); |
| @@ -596,8 +619,12 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties) | |||
| 596 | param[0], param[1], param[2]); | 619 | param[0], param[1], param[2]); |
| 597 | 620 | ||
| 598 | if (param[0] == 0 || param[1] != 0) { | 621 | if (param[0] == 0 || param[1] != 0) { |
| 599 | pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n"); | 622 | if (!force_elantech) { |
| 600 | return -1; | 623 | pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n"); |
| 624 | return -1; | ||
| 625 | } | ||
| 626 | |||
| 627 | pr_debug("elantech.c: Probably not a real Elantech touchpad. Enabling anyway due to force_elantech.\n"); | ||
| 601 | } | 628 | } |
| 602 | 629 | ||
| 603 | if (set_properties) { | 630 | if (set_properties) { |
| @@ -666,7 +693,8 @@ int elantech_init(struct psmouse *psmouse) | |||
| 666 | * Assume every version greater than this is new EeePC style | 693 | * Assume every version greater than this is new EeePC style |
| 667 | * hardware with 6 byte packets | 694 | * hardware with 6 byte packets |
| 668 | */ | 695 | */ |
| 669 | if (etd->fw_version_maj >= 0x02 && etd->fw_version_min >= 0x30) { | 696 | if ((etd->fw_version_maj == 0x02 && etd->fw_version_min >= 0x30) || |
| 697 | etd->fw_version_maj > 0x02) { | ||
| 670 | etd->hw_version = 2; | 698 | etd->hw_version = 2; |
| 671 | /* For now show extra debug information */ | 699 | /* For now show extra debug information */ |
| 672 | etd->debug = 1; | 700 | etd->debug = 1; |
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index d8c0c8d6992c..cbc807264940 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -110,6 +110,7 @@ static struct workqueue_struct *kpsmoused_wq; | |||
| 110 | struct psmouse_protocol { | 110 | struct psmouse_protocol { |
| 111 | enum psmouse_type type; | 111 | enum psmouse_type type; |
| 112 | bool maxproto; | 112 | bool maxproto; |
| 113 | bool ignore_parity; /* Protocol should ignore parity errors from KBC */ | ||
| 113 | const char *name; | 114 | const char *name; |
| 114 | const char *alias; | 115 | const char *alias; |
| 115 | int (*detect)(struct psmouse *, bool); | 116 | int (*detect)(struct psmouse *, bool); |
| @@ -288,7 +289,9 @@ static irqreturn_t psmouse_interrupt(struct serio *serio, | |||
| 288 | if (psmouse->state == PSMOUSE_IGNORE) | 289 | if (psmouse->state == PSMOUSE_IGNORE) |
| 289 | goto out; | 290 | goto out; |
| 290 | 291 | ||
| 291 | if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) { | 292 | if (unlikely((flags & SERIO_TIMEOUT) || |
| 293 | ((flags & SERIO_PARITY) && !psmouse->ignore_parity))) { | ||
| 294 | |||
| 292 | if (psmouse->state == PSMOUSE_ACTIVATED) | 295 | if (psmouse->state == PSMOUSE_ACTIVATED) |
| 293 | printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n", | 296 | printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n", |
| 294 | flags & SERIO_TIMEOUT ? " timeout" : "", | 297 | flags & SERIO_TIMEOUT ? " timeout" : "", |
| @@ -759,6 +762,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { | |||
| 759 | .name = "PS/2", | 762 | .name = "PS/2", |
| 760 | .alias = "bare", | 763 | .alias = "bare", |
| 761 | .maxproto = true, | 764 | .maxproto = true, |
| 765 | .ignore_parity = true, | ||
| 762 | .detect = ps2bare_detect, | 766 | .detect = ps2bare_detect, |
| 763 | }, | 767 | }, |
| 764 | #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP | 768 | #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP |
| @@ -786,6 +790,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { | |||
| 786 | .name = "ImPS/2", | 790 | .name = "ImPS/2", |
| 787 | .alias = "imps", | 791 | .alias = "imps", |
| 788 | .maxproto = true, | 792 | .maxproto = true, |
| 793 | .ignore_parity = true, | ||
| 789 | .detect = intellimouse_detect, | 794 | .detect = intellimouse_detect, |
| 790 | }, | 795 | }, |
| 791 | { | 796 | { |
| @@ -793,6 +798,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { | |||
| 793 | .name = "ImExPS/2", | 798 | .name = "ImExPS/2", |
| 794 | .alias = "exps", | 799 | .alias = "exps", |
| 795 | .maxproto = true, | 800 | .maxproto = true, |
| 801 | .ignore_parity = true, | ||
| 796 | .detect = im_explorer_detect, | 802 | .detect = im_explorer_detect, |
| 797 | }, | 803 | }, |
| 798 | #ifdef CONFIG_MOUSE_PS2_SYNAPTICS | 804 | #ifdef CONFIG_MOUSE_PS2_SYNAPTICS |
| @@ -1222,6 +1228,7 @@ static void psmouse_disconnect(struct serio *serio) | |||
| 1222 | static int psmouse_switch_protocol(struct psmouse *psmouse, | 1228 | static int psmouse_switch_protocol(struct psmouse *psmouse, |
| 1223 | const struct psmouse_protocol *proto) | 1229 | const struct psmouse_protocol *proto) |
| 1224 | { | 1230 | { |
| 1231 | const struct psmouse_protocol *selected_proto; | ||
| 1225 | struct input_dev *input_dev = psmouse->dev; | 1232 | struct input_dev *input_dev = psmouse->dev; |
| 1226 | 1233 | ||
| 1227 | input_dev->dev.parent = &psmouse->ps2dev.serio->dev; | 1234 | input_dev->dev.parent = &psmouse->ps2dev.serio->dev; |
| @@ -1245,9 +1252,14 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, | |||
| 1245 | return -1; | 1252 | return -1; |
| 1246 | 1253 | ||
| 1247 | psmouse->type = proto->type; | 1254 | psmouse->type = proto->type; |
| 1248 | } else | 1255 | selected_proto = proto; |
| 1256 | } else { | ||
| 1249 | psmouse->type = psmouse_extensions(psmouse, | 1257 | psmouse->type = psmouse_extensions(psmouse, |
| 1250 | psmouse_max_proto, true); | 1258 | psmouse_max_proto, true); |
| 1259 | selected_proto = psmouse_protocol_by_type(psmouse->type); | ||
| 1260 | } | ||
| 1261 | |||
| 1262 | psmouse->ignore_parity = selected_proto->ignore_parity; | ||
| 1251 | 1263 | ||
| 1252 | /* | 1264 | /* |
| 1253 | * If mouse's packet size is 3 there is no point in polling the | 1265 | * If mouse's packet size is 3 there is no point in polling the |
| @@ -1267,7 +1279,7 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, | |||
| 1267 | psmouse->resync_time = 0; | 1279 | psmouse->resync_time = 0; |
| 1268 | 1280 | ||
| 1269 | snprintf(psmouse->devname, sizeof(psmouse->devname), "%s %s %s", | 1281 | snprintf(psmouse->devname, sizeof(psmouse->devname), "%s %s %s", |
| 1270 | psmouse_protocol_by_type(psmouse->type)->name, psmouse->vendor, psmouse->name); | 1282 | selected_proto->name, psmouse->vendor, psmouse->name); |
| 1271 | 1283 | ||
| 1272 | input_dev->name = psmouse->devname; | 1284 | input_dev->name = psmouse->devname; |
| 1273 | input_dev->phys = psmouse->phys; | 1285 | input_dev->phys = psmouse->phys; |
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index e053bdd137ff..593e910bfc7a 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h | |||
| @@ -47,6 +47,7 @@ struct psmouse { | |||
| 47 | unsigned char pktcnt; | 47 | unsigned char pktcnt; |
| 48 | unsigned char pktsize; | 48 | unsigned char pktsize; |
| 49 | unsigned char type; | 49 | unsigned char type; |
| 50 | bool ignore_parity; | ||
| 50 | bool acks_disable_command; | 51 | bool acks_disable_command; |
| 51 | unsigned int model; | 52 | unsigned int model; |
| 52 | unsigned long last; | 53 | unsigned long last; |
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 026df6010161..ebd7a99efeae 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
| @@ -137,7 +137,8 @@ static int synaptics_capability(struct psmouse *psmouse) | |||
| 137 | if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap)) | 137 | if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap)) |
| 138 | return -1; | 138 | return -1; |
| 139 | priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2]; | 139 | priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2]; |
| 140 | priv->ext_cap = 0; | 140 | priv->ext_cap = priv->ext_cap_0c = 0; |
| 141 | |||
| 141 | if (!SYN_CAP_VALID(priv->capabilities)) | 142 | if (!SYN_CAP_VALID(priv->capabilities)) |
| 142 | return -1; | 143 | return -1; |
| 143 | 144 | ||
| @@ -150,7 +151,7 @@ static int synaptics_capability(struct psmouse *psmouse) | |||
| 150 | if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) { | 151 | if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) { |
| 151 | if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) { | 152 | if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) { |
| 152 | printk(KERN_ERR "Synaptics claims to have extended capabilities," | 153 | printk(KERN_ERR "Synaptics claims to have extended capabilities," |
| 153 | " but I'm not able to read them."); | 154 | " but I'm not able to read them.\n"); |
| 154 | } else { | 155 | } else { |
| 155 | priv->ext_cap = (cap[0] << 16) | (cap[1] << 8) | cap[2]; | 156 | priv->ext_cap = (cap[0] << 16) | (cap[1] << 8) | cap[2]; |
| 156 | 157 | ||
| @@ -162,6 +163,16 @@ static int synaptics_capability(struct psmouse *psmouse) | |||
| 162 | priv->ext_cap &= 0xff0fff; | 163 | priv->ext_cap &= 0xff0fff; |
| 163 | } | 164 | } |
| 164 | } | 165 | } |
| 166 | |||
| 167 | if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 4) { | ||
| 168 | if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB_0C, cap)) { | ||
| 169 | printk(KERN_ERR "Synaptics claims to have extended capability 0x0c," | ||
| 170 | " but I'm not able to read it.\n"); | ||
| 171 | } else { | ||
| 172 | priv->ext_cap_0c = (cap[0] << 16) | (cap[1] << 8) | cap[2]; | ||
| 173 | } | ||
| 174 | } | ||
| 175 | |||
| 165 | return 0; | 176 | return 0; |
| 166 | } | 177 | } |
| 167 | 178 | ||
| @@ -348,7 +359,15 @@ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data | |||
| 348 | hw->left = (buf[0] & 0x01) ? 1 : 0; | 359 | hw->left = (buf[0] & 0x01) ? 1 : 0; |
| 349 | hw->right = (buf[0] & 0x02) ? 1 : 0; | 360 | hw->right = (buf[0] & 0x02) ? 1 : 0; |
| 350 | 361 | ||
| 351 | if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) { | 362 | if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { |
| 363 | /* | ||
| 364 | * Clickpad's button is transmitted as middle button, | ||
| 365 | * however, since it is primary button, we will report | ||
| 366 | * it as BTN_LEFT. | ||
| 367 | */ | ||
| 368 | hw->left = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; | ||
| 369 | |||
| 370 | } else if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) { | ||
| 352 | hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; | 371 | hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; |
| 353 | if (hw->w == 2) | 372 | if (hw->w == 2) |
| 354 | hw->scroll = (signed char)(buf[1]); | 373 | hw->scroll = (signed char)(buf[1]); |
| @@ -593,6 +612,12 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) | |||
| 593 | 612 | ||
| 594 | dev->absres[ABS_X] = priv->x_res; | 613 | dev->absres[ABS_X] = priv->x_res; |
| 595 | dev->absres[ABS_Y] = priv->y_res; | 614 | dev->absres[ABS_Y] = priv->y_res; |
| 615 | |||
| 616 | if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { | ||
| 617 | /* Clickpads report only left button */ | ||
| 618 | __clear_bit(BTN_RIGHT, dev->keybit); | ||
| 619 | __clear_bit(BTN_MIDDLE, dev->keybit); | ||
| 620 | } | ||
| 596 | } | 621 | } |
| 597 | 622 | ||
| 598 | static void synaptics_disconnect(struct psmouse *psmouse) | 623 | static void synaptics_disconnect(struct psmouse *psmouse) |
| @@ -697,10 +722,10 @@ int synaptics_init(struct psmouse *psmouse) | |||
| 697 | 722 | ||
| 698 | priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS; | 723 | priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS; |
| 699 | 724 | ||
| 700 | printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n", | 725 | printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n", |
| 701 | SYN_ID_MODEL(priv->identity), | 726 | SYN_ID_MODEL(priv->identity), |
| 702 | SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), | 727 | SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), |
| 703 | priv->model_id, priv->capabilities, priv->ext_cap); | 728 | priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c); |
| 704 | 729 | ||
| 705 | set_input_params(psmouse->dev, priv); | 730 | set_input_params(psmouse->dev, priv); |
| 706 | 731 | ||
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h index f0f40a331dc8..ae37c5d162a4 100644 --- a/drivers/input/mouse/synaptics.h +++ b/drivers/input/mouse/synaptics.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #define SYN_QUE_SERIAL_NUMBER_SUFFIX 0x07 | 18 | #define SYN_QUE_SERIAL_NUMBER_SUFFIX 0x07 |
| 19 | #define SYN_QUE_RESOLUTION 0x08 | 19 | #define SYN_QUE_RESOLUTION 0x08 |
| 20 | #define SYN_QUE_EXT_CAPAB 0x09 | 20 | #define SYN_QUE_EXT_CAPAB 0x09 |
| 21 | #define SYN_QUE_EXT_CAPAB_0C 0x0c | ||
| 21 | 22 | ||
| 22 | /* synatics modes */ | 23 | /* synatics modes */ |
| 23 | #define SYN_BIT_ABSOLUTE_MODE (1 << 7) | 24 | #define SYN_BIT_ABSOLUTE_MODE (1 << 7) |
| @@ -48,6 +49,8 @@ | |||
| 48 | #define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47) | 49 | #define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47) |
| 49 | #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) | 50 | #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) |
| 50 | #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) | 51 | #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) |
| 52 | #define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) | ||
| 53 | #define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100100) | ||
| 51 | 54 | ||
| 52 | /* synaptics modes query bits */ | 55 | /* synaptics modes query bits */ |
| 53 | #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7)) | 56 | #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7)) |
| @@ -96,6 +99,7 @@ struct synaptics_data { | |||
| 96 | unsigned long int model_id; /* Model-ID */ | 99 | unsigned long int model_id; /* Model-ID */ |
| 97 | unsigned long int capabilities; /* Capabilities */ | 100 | unsigned long int capabilities; /* Capabilities */ |
| 98 | unsigned long int ext_cap; /* Extended Capabilities */ | 101 | unsigned long int ext_cap; /* Extended Capabilities */ |
| 102 | unsigned long int ext_cap_0c; /* Ext Caps from 0x0c query */ | ||
| 99 | unsigned long int identity; /* Identification */ | 103 | unsigned long int identity; /* Identification */ |
| 100 | int x_res; /* X resolution in units/mm */ | 104 | int x_res; /* X resolution in units/mm */ |
| 101 | int y_res; /* Y resolution in units/mm */ | 105 | int y_res; /* Y resolution in units/mm */ |
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 204b8a1a601c..75f8b73010fa 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c | |||
| @@ -124,14 +124,25 @@ static irqreturn_t eeti_ts_isr(int irq, void *dev_id) | |||
| 124 | return IRQ_HANDLED; | 124 | return IRQ_HANDLED; |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | static int eeti_ts_open(struct input_dev *dev) | 127 | static void eeti_ts_start(struct eeti_ts_priv *priv) |
| 128 | { | 128 | { |
| 129 | struct eeti_ts_priv *priv = input_get_drvdata(dev); | ||
| 130 | |||
| 131 | enable_irq(priv->irq); | 129 | enable_irq(priv->irq); |
| 132 | 130 | ||
| 133 | /* Read the events once to arm the IRQ */ | 131 | /* Read the events once to arm the IRQ */ |
| 134 | eeti_ts_read(&priv->work); | 132 | eeti_ts_read(&priv->work); |
| 133 | } | ||
| 134 | |||
| 135 | static void eeti_ts_stop(struct eeti_ts_priv *priv) | ||
| 136 | { | ||
| 137 | disable_irq(priv->irq); | ||
| 138 | cancel_work_sync(&priv->work); | ||
| 139 | } | ||
| 140 | |||
| 141 | static int eeti_ts_open(struct input_dev *dev) | ||
| 142 | { | ||
| 143 | struct eeti_ts_priv *priv = input_get_drvdata(dev); | ||
| 144 | |||
| 145 | eeti_ts_start(priv); | ||
| 135 | 146 | ||
| 136 | return 0; | 147 | return 0; |
| 137 | } | 148 | } |
| @@ -140,8 +151,7 @@ static void eeti_ts_close(struct input_dev *dev) | |||
| 140 | { | 151 | { |
| 141 | struct eeti_ts_priv *priv = input_get_drvdata(dev); | 152 | struct eeti_ts_priv *priv = input_get_drvdata(dev); |
| 142 | 153 | ||
| 143 | disable_irq(priv->irq); | 154 | eeti_ts_stop(priv); |
| 144 | cancel_work_sync(&priv->work); | ||
| 145 | } | 155 | } |
| 146 | 156 | ||
| 147 | static int __devinit eeti_ts_probe(struct i2c_client *client, | 157 | static int __devinit eeti_ts_probe(struct i2c_client *client, |
| @@ -153,10 +163,12 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, | |||
| 153 | unsigned int irq_flags; | 163 | unsigned int irq_flags; |
| 154 | int err = -ENOMEM; | 164 | int err = -ENOMEM; |
| 155 | 165 | ||
| 156 | /* In contrast to what's described in the datasheet, there seems | 166 | /* |
| 167 | * In contrast to what's described in the datasheet, there seems | ||
| 157 | * to be no way of probing the presence of that device using I2C | 168 | * to be no way of probing the presence of that device using I2C |
| 158 | * commands. So we need to blindly believe it is there, and wait | 169 | * commands. So we need to blindly believe it is there, and wait |
| 159 | * for interrupts to occur. */ | 170 | * for interrupts to occur. |
| 171 | */ | ||
| 160 | 172 | ||
| 161 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); | 173 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
| 162 | if (!priv) { | 174 | if (!priv) { |
| @@ -212,9 +224,11 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, | |||
| 212 | goto err2; | 224 | goto err2; |
| 213 | } | 225 | } |
| 214 | 226 | ||
| 215 | /* Disable the irq for now. It will be enabled once the input device | 227 | /* |
| 216 | * is opened. */ | 228 | * Disable the device for now. It will be enabled once the |
| 217 | disable_irq(priv->irq); | 229 | * input device is opened. |
| 230 | */ | ||
| 231 | eeti_ts_stop(priv); | ||
| 218 | 232 | ||
| 219 | device_init_wakeup(&client->dev, 0); | 233 | device_init_wakeup(&client->dev, 0); |
| 220 | return 0; | 234 | return 0; |
| @@ -235,6 +249,12 @@ static int __devexit eeti_ts_remove(struct i2c_client *client) | |||
| 235 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); | 249 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); |
| 236 | 250 | ||
| 237 | free_irq(priv->irq, priv); | 251 | free_irq(priv->irq, priv); |
| 252 | /* | ||
| 253 | * eeti_ts_stop() leaves IRQ disabled. We need to re-enable it | ||
| 254 | * so that device still works if we reload the driver. | ||
| 255 | */ | ||
| 256 | enable_irq(priv->irq); | ||
| 257 | |||
| 238 | input_unregister_device(priv->input); | 258 | input_unregister_device(priv->input); |
| 239 | i2c_set_clientdata(client, NULL); | 259 | i2c_set_clientdata(client, NULL); |
| 240 | kfree(priv); | 260 | kfree(priv); |
| @@ -246,6 +266,14 @@ static int __devexit eeti_ts_remove(struct i2c_client *client) | |||
| 246 | static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg) | 266 | static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg) |
| 247 | { | 267 | { |
| 248 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); | 268 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); |
| 269 | struct input_dev *input_dev = priv->input; | ||
| 270 | |||
| 271 | mutex_lock(&input_dev->mutex); | ||
| 272 | |||
| 273 | if (input_dev->users) | ||
| 274 | eeti_ts_stop(priv); | ||
| 275 | |||
| 276 | mutex_unlock(&input_dev->mutex); | ||
| 249 | 277 | ||
| 250 | if (device_may_wakeup(&client->dev)) | 278 | if (device_may_wakeup(&client->dev)) |
| 251 | enable_irq_wake(priv->irq); | 279 | enable_irq_wake(priv->irq); |
| @@ -256,10 +284,18 @@ static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg) | |||
| 256 | static int eeti_ts_resume(struct i2c_client *client) | 284 | static int eeti_ts_resume(struct i2c_client *client) |
| 257 | { | 285 | { |
| 258 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); | 286 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); |
| 287 | struct input_dev *input_dev = priv->input; | ||
| 259 | 288 | ||
| 260 | if (device_may_wakeup(&client->dev)) | 289 | if (device_may_wakeup(&client->dev)) |
| 261 | disable_irq_wake(priv->irq); | 290 | disable_irq_wake(priv->irq); |
| 262 | 291 | ||
| 292 | mutex_lock(&input_dev->mutex); | ||
| 293 | |||
| 294 | if (input_dev->users) | ||
| 295 | eeti_ts_start(priv); | ||
| 296 | |||
| 297 | mutex_unlock(&input_dev->mutex); | ||
| 298 | |||
| 263 | return 0; | 299 | return 0; |
| 264 | } | 300 | } |
| 265 | #else | 301 | #else |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2191c8d896a0..0d0d625fece2 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -311,6 +311,22 @@ config TI_DAC7512 | |||
| 311 | This driver can also be built as a module. If so, the module | 311 | This driver can also be built as a module. If so, the module |
| 312 | will be calles ti_dac7512. | 312 | will be calles ti_dac7512. |
| 313 | 313 | ||
| 314 | config VMWARE_BALLOON | ||
| 315 | tristate "VMware Balloon Driver" | ||
| 316 | depends on X86 | ||
| 317 | help | ||
| 318 | This is VMware physical memory management driver which acts | ||
| 319 | like a "balloon" that can be inflated to reclaim physical pages | ||
| 320 | by reserving them in the guest and invalidating them in the | ||
| 321 | monitor, freeing up the underlying machine pages so they can | ||
| 322 | be allocated to other guests. The balloon can also be deflated | ||
| 323 | to allow the guest to use more physical memory. | ||
| 324 | |||
| 325 | If unsure, say N. | ||
| 326 | |||
| 327 | To compile this driver as a module, choose M here: the | ||
| 328 | module will be called vmware_balloon. | ||
| 329 | |||
| 314 | source "drivers/misc/c2port/Kconfig" | 330 | source "drivers/misc/c2port/Kconfig" |
| 315 | source "drivers/misc/eeprom/Kconfig" | 331 | source "drivers/misc/eeprom/Kconfig" |
| 316 | source "drivers/misc/cb710/Kconfig" | 332 | source "drivers/misc/cb710/Kconfig" |
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 27c484355414..7b6f7eefdf8d 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -29,3 +29,4 @@ obj-$(CONFIG_C2PORT) += c2port/ | |||
| 29 | obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/ | 29 | obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/ |
| 30 | obj-y += eeprom/ | 30 | obj-y += eeprom/ |
| 31 | obj-y += cb710/ | 31 | obj-y += cb710/ |
| 32 | obj-$(CONFIG_VMWARE_BALLOON) += vmware_balloon.o | ||
diff --git a/drivers/misc/vmware_balloon.c b/drivers/misc/vmware_balloon.c new file mode 100644 index 000000000000..e7161c4e3798 --- /dev/null +++ b/drivers/misc/vmware_balloon.c | |||
| @@ -0,0 +1,832 @@ | |||
| 1 | /* | ||
| 2 | * VMware Balloon driver. | ||
| 3 | * | ||
| 4 | * Copyright (C) 2000-2010, VMware, Inc. All Rights Reserved. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms of the GNU General Public License as published by the | ||
| 8 | * Free Software Foundation; version 2 of the License and no later version. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, but | ||
| 11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
| 13 | * NON INFRINGEMENT. See the GNU General Public License for more | ||
| 14 | * details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 19 | * | ||
| 20 | * Maintained by: Dmitry Torokhov <dtor@vmware.com> | ||
| 21 | */ | ||
| 22 | |||
| 23 | /* | ||
| 24 | * This is VMware physical memory management driver for Linux. The driver | ||
| 25 | * acts like a "balloon" that can be inflated to reclaim physical pages by | ||
| 26 | * reserving them in the guest and invalidating them in the monitor, | ||
| 27 | * freeing up the underlying machine pages so they can be allocated to | ||
| 28 | * other guests. The balloon can also be deflated to allow the guest to | ||
| 29 | * use more physical memory. Higher level policies can control the sizes | ||
| 30 | * of balloons in VMs in order to manage physical memory resources. | ||
| 31 | */ | ||
| 32 | |||
| 33 | //#define DEBUG | ||
| 34 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
| 35 | |||
| 36 | #include <linux/types.h> | ||
| 37 | #include <linux/kernel.h> | ||
| 38 | #include <linux/mm.h> | ||
| 39 | #include <linux/sched.h> | ||
| 40 | #include <linux/module.h> | ||
| 41 | #include <linux/workqueue.h> | ||
| 42 | #include <linux/debugfs.h> | ||
| 43 | #include <linux/seq_file.h> | ||
| 44 | #include <asm/vmware.h> | ||
| 45 | |||
| 46 | MODULE_AUTHOR("VMware, Inc."); | ||
| 47 | MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); | ||
| 48 | MODULE_VERSION("1.2.1.0-K"); | ||
| 49 | MODULE_ALIAS("dmi:*:svnVMware*:*"); | ||
| 50 | MODULE_ALIAS("vmware_vmmemctl"); | ||
| 51 | MODULE_LICENSE("GPL"); | ||
| 52 | |||
| 53 | /* | ||
| 54 | * Various constants controlling rate of inflaint/deflating balloon, | ||
| 55 | * measured in pages. | ||
| 56 | */ | ||
| 57 | |||
| 58 | /* | ||
| 59 | * Rate of allocating memory when there is no memory pressure | ||
| 60 | * (driver performs non-sleeping allocations). | ||
| 61 | */ | ||
| 62 | #define VMW_BALLOON_NOSLEEP_ALLOC_MAX 16384U | ||
| 63 | |||
| 64 | /* | ||
| 65 | * Rates of memory allocaton when guest experiences memory pressure | ||
| 66 | * (driver performs sleeping allocations). | ||
| 67 | */ | ||
| 68 | #define VMW_BALLOON_RATE_ALLOC_MIN 512U | ||
| 69 | #define VMW_BALLOON_RATE_ALLOC_MAX 2048U | ||
| 70 | #define VMW_BALLOON_RATE_ALLOC_INC 16U | ||
| 71 | |||
| 72 | /* | ||
| 73 | * Rates for releasing pages while deflating balloon. | ||
| 74 | */ | ||
| 75 | #define VMW_BALLOON_RATE_FREE_MIN 512U | ||
| 76 | #define VMW_BALLOON_RATE_FREE_MAX 16384U | ||
| 77 | #define VMW_BALLOON_RATE_FREE_INC 16U | ||
| 78 | |||
| 79 | /* | ||
| 80 | * When guest is under memory pressure, use a reduced page allocation | ||
| 81 | * rate for next several cycles. | ||
| 82 | */ | ||
| 83 | #define VMW_BALLOON_SLOW_CYCLES 4 | ||
| 84 | |||
| 85 | /* | ||
| 86 | * Use __GFP_HIGHMEM to allow pages from HIGHMEM zone. We don't | ||
| 87 | * allow wait (__GFP_WAIT) for NOSLEEP page allocations. Use | ||
| 88 | * __GFP_NOWARN, to suppress page allocation failure warnings. | ||
| 89 | */ | ||
| 90 | #define VMW_PAGE_ALLOC_NOSLEEP (__GFP_HIGHMEM|__GFP_NOWARN) | ||
| 91 | |||
| 92 | /* | ||
| 93 | * Use GFP_HIGHUSER when executing in a separate kernel thread | ||
| 94 | * context and allocation can sleep. This is less stressful to | ||
| 95 | * the guest memory system, since it allows the thread to block | ||
| 96 | * while memory is reclaimed, and won't take pages from emergency | ||
| 97 | * low-memory pools. | ||
| 98 | */ | ||
| 99 | #define VMW_PAGE_ALLOC_CANSLEEP (GFP_HIGHUSER) | ||
| 100 | |||
| 101 | /* Maximum number of page allocations without yielding processor */ | ||
| 102 | #define VMW_BALLOON_YIELD_THRESHOLD 1024 | ||
| 103 | |||
| 104 | |||
| 105 | /* | ||
| 106 | * Hypervisor communication port definitions. | ||
| 107 | */ | ||
| 108 | #define VMW_BALLOON_HV_PORT 0x5670 | ||
| 109 | #define VMW_BALLOON_HV_MAGIC 0x456c6d6f | ||
| 110 | #define VMW_BALLOON_PROTOCOL_VERSION 2 | ||
| 111 | #define VMW_BALLOON_GUEST_ID 1 /* Linux */ | ||
| 112 | |||
| 113 | #define VMW_BALLOON_CMD_START 0 | ||
| 114 | #define VMW_BALLOON_CMD_GET_TARGET 1 | ||
| 115 | #define VMW_BALLOON_CMD_LOCK 2 | ||
| 116 | #define VMW_BALLOON_CMD_UNLOCK 3 | ||
| 117 | #define VMW_BALLOON_CMD_GUEST_ID 4 | ||
| 118 | |||
| 119 | /* error codes */ | ||
| 120 | #define VMW_BALLOON_SUCCESS 0 | ||
| 121 | #define VMW_BALLOON_FAILURE -1 | ||
| 122 | #define VMW_BALLOON_ERROR_CMD_INVALID 1 | ||
| 123 | #define VMW_BALLOON_ERROR_PPN_INVALID 2 | ||
| 124 | #define VMW_BALLOON_ERROR_PPN_LOCKED 3 | ||
| 125 | #define VMW_BALLOON_ERROR_PPN_UNLOCKED 4 | ||
| 126 | #define VMW_BALLOON_ERROR_PPN_PINNED 5 | ||
| 127 | #define VMW_BALLOON_ERROR_PPN_NOTNEEDED 6 | ||
| 128 | #define VMW_BALLOON_ERROR_RESET 7 | ||
| 129 | #define VMW_BALLOON_ERROR_BUSY 8 | ||
| 130 | |||
| 131 | #define VMWARE_BALLOON_CMD(cmd, data, result) \ | ||
| 132 | ({ \ | ||
| 133 | unsigned long __stat, __dummy1, __dummy2; \ | ||
| 134 | __asm__ __volatile__ ("inl (%%dx)" : \ | ||
| 135 | "=a"(__stat), \ | ||
| 136 | "=c"(__dummy1), \ | ||
| 137 | "=d"(__dummy2), \ | ||
| 138 | "=b"(result) : \ | ||
| 139 | "0"(VMW_BALLOON_HV_MAGIC), \ | ||
| 140 | "1"(VMW_BALLOON_CMD_##cmd), \ | ||
| 141 | "2"(VMW_BALLOON_HV_PORT), \ | ||
| 142 | "3"(data) : \ | ||
| 143 | "memory"); \ | ||
| 144 | result &= -1UL; \ | ||
| 145 | __stat & -1UL; \ | ||
| 146 | }) | ||
| 147 | |||
| 148 | #ifdef CONFIG_DEBUG_FS | ||
| 149 | struct vmballoon_stats { | ||
| 150 | unsigned int timer; | ||
| 151 | |||
| 152 | /* allocation statustics */ | ||
| 153 | unsigned int alloc; | ||
| 154 | unsigned int alloc_fail; | ||
| 155 | unsigned int sleep_alloc; | ||
| 156 | unsigned int sleep_alloc_fail; | ||
| 157 | unsigned int refused_alloc; | ||
| 158 | unsigned int refused_free; | ||
| 159 | unsigned int free; | ||
| 160 | |||
| 161 | /* monitor operations */ | ||
| 162 | unsigned int lock; | ||
| 163 | unsigned int lock_fail; | ||
| 164 | unsigned int unlock; | ||
| 165 | unsigned int unlock_fail; | ||
| 166 | unsigned int target; | ||
| 167 | unsigned int target_fail; | ||
| 168 | unsigned int start; | ||
| 169 | unsigned int start_fail; | ||
| 170 | unsigned int guest_type; | ||
| 171 | unsigned int guest_type_fail; | ||
| 172 | }; | ||
| 173 | |||
| 174 | #define STATS_INC(stat) (stat)++ | ||
| 175 | #else | ||
| 176 | #define STATS_INC(stat) | ||
| 177 | #endif | ||
| 178 | |||
| 179 | struct vmballoon { | ||
| 180 | |||
| 181 | /* list of reserved physical pages */ | ||
| 182 | struct list_head pages; | ||
| 183 | |||
| 184 | /* transient list of non-balloonable pages */ | ||
| 185 | struct list_head refused_pages; | ||
| 186 | |||
| 187 | /* balloon size in pages */ | ||
| 188 | unsigned int size; | ||
| 189 | unsigned int target; | ||
| 190 | |||
| 191 | /* reset flag */ | ||
| 192 | bool reset_required; | ||
| 193 | |||
| 194 | /* adjustment rates (pages per second) */ | ||
| 195 | unsigned int rate_alloc; | ||
| 196 | unsigned int rate_free; | ||
| 197 | |||
| 198 | /* slowdown page allocations for next few cycles */ | ||
| 199 | unsigned int slow_allocation_cycles; | ||
| 200 | |||
| 201 | #ifdef CONFIG_DEBUG_FS | ||
| 202 | /* statistics */ | ||
| 203 | struct vmballoon_stats stats; | ||
| 204 | |||
| 205 | /* debugfs file exporting statistics */ | ||
| 206 | struct dentry *dbg_entry; | ||
| 207 | #endif | ||
| 208 | |||
| 209 | struct sysinfo sysinfo; | ||
| 210 | |||
| 211 | struct delayed_work dwork; | ||
| 212 | }; | ||
| 213 | |||
| 214 | static struct vmballoon balloon; | ||
| 215 | static struct workqueue_struct *vmballoon_wq; | ||
| 216 | |||
| 217 | /* | ||
| 218 | * Send "start" command to the host, communicating supported version | ||
| 219 | * of the protocol. | ||
| 220 | */ | ||
| 221 | static bool vmballoon_send_start(struct vmballoon *b) | ||
| 222 | { | ||
| 223 | unsigned long status, dummy; | ||
| 224 | |||
| 225 | STATS_INC(b->stats.start); | ||
| 226 | |||
| 227 | status = VMWARE_BALLOON_CMD(START, VMW_BALLOON_PROTOCOL_VERSION, dummy); | ||
| 228 | if (status == VMW_BALLOON_SUCCESS) | ||
| 229 | return true; | ||
| 230 | |||
| 231 | pr_debug("%s - failed, hv returns %ld\n", __func__, status); | ||
| 232 | STATS_INC(b->stats.start_fail); | ||
| 233 | return false; | ||
| 234 | } | ||
| 235 | |||
| 236 | static bool vmballoon_check_status(struct vmballoon *b, unsigned long status) | ||
| 237 | { | ||
| 238 | switch (status) { | ||
| 239 | case VMW_BALLOON_SUCCESS: | ||
| 240 | return true; | ||
| 241 | |||
| 242 | case VMW_BALLOON_ERROR_RESET: | ||
| 243 | b->reset_required = true; | ||
| 244 | /* fall through */ | ||
| 245 | |||
| 246 | default: | ||
| 247 | return false; | ||
| 248 | } | ||
| 249 | } | ||
| 250 | |||
| 251 | /* | ||
| 252 | * Communicate guest type to the host so that it can adjust ballooning | ||
| 253 | * algorithm to the one most appropriate for the guest. This command | ||
| 254 | * is normally issued after sending "start" command and is part of | ||
| 255 | * standard reset sequence. | ||
| 256 | */ | ||
| 257 | static bool vmballoon_send_guest_id(struct vmballoon *b) | ||
| 258 | { | ||
| 259 | unsigned long status, dummy; | ||
| 260 | |||
| 261 | status = VMWARE_BALLOON_CMD(GUEST_ID, VMW_BALLOON_GUEST_ID, dummy); | ||
| 262 | |||
| 263 | STATS_INC(b->stats.guest_type); | ||
| 264 | |||
| 265 | if (vmballoon_check_status(b, status)) | ||
| 266 | return true; | ||
| 267 | |||
| 268 | pr_debug("%s - failed, hv returns %ld\n", __func__, status); | ||
| 269 | STATS_INC(b->stats.guest_type_fail); | ||
| 270 | return false; | ||
| 271 | } | ||
| 272 | |||
| 273 | /* | ||
| 274 | * Retrieve desired balloon size from the host. | ||
| 275 | */ | ||
| 276 | static bool vmballoon_send_get_target(struct vmballoon *b, u32 *new_target) | ||
| 277 | { | ||
| 278 | unsigned long status; | ||
| 279 | unsigned long target; | ||
| 280 | unsigned long limit; | ||
| 281 | u32 limit32; | ||
| 282 | |||
| 283 | /* | ||
| 284 | * si_meminfo() is cheap. Moreover, we want to provide dynamic | ||
| 285 | * max balloon size later. So let us call si_meminfo() every | ||
| 286 | * iteration. | ||
| 287 | */ | ||
| 288 | si_meminfo(&b->sysinfo); | ||
| 289 | limit = b->sysinfo.totalram; | ||
| 290 | |||
| 291 | /* Ensure limit fits in 32-bits */ | ||
| 292 | limit32 = (u32)limit; | ||
| 293 | if (limit != limit32) | ||
| 294 | return false; | ||
| 295 | |||
| 296 | /* update stats */ | ||
| 297 | STATS_INC(b->stats.target); | ||
| 298 | |||
| 299 | status = VMWARE_BALLOON_CMD(GET_TARGET, limit, target); | ||
| 300 | if (vmballoon_check_status(b, status)) { | ||
| 301 | *new_target = target; | ||
| 302 | return true; | ||
| 303 | } | ||
| 304 | |||
| 305 | pr_debug("%s - failed, hv returns %ld\n", __func__, status); | ||
| 306 | STATS_INC(b->stats.target_fail); | ||
| 307 | return false; | ||
| 308 | } | ||
| 309 | |||
| 310 | /* | ||
| 311 | * Notify the host about allocated page so that host can use it without | ||
| 312 | * fear that guest will need it. Host may reject some pages, we need to | ||
| 313 | * check the return value and maybe submit a different page. | ||
| 314 | */ | ||
| 315 | static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn) | ||
| 316 | { | ||
| 317 | unsigned long status, dummy; | ||
| 318 | u32 pfn32; | ||
| 319 | |||
| 320 | pfn32 = (u32)pfn; | ||
| 321 | if (pfn32 != pfn) | ||
| 322 | return false; | ||
| 323 | |||
| 324 | STATS_INC(b->stats.lock); | ||
| 325 | |||
| 326 | status = VMWARE_BALLOON_CMD(LOCK, pfn, dummy); | ||
| 327 | if (vmballoon_check_status(b, status)) | ||
| 328 | return true; | ||
| 329 | |||
| 330 | pr_debug("%s - ppn %lx, hv returns %ld\n", __func__, pfn, status); | ||
| 331 | STATS_INC(b->stats.lock_fail); | ||
| 332 | return false; | ||
| 333 | } | ||
| 334 | |||
| 335 | /* | ||
| 336 | * Notify the host that guest intends to release given page back into | ||
| 337 | * the pool of available (to the guest) pages. | ||
| 338 | */ | ||
| 339 | static bool vmballoon_send_unlock_page(struct vmballoon *b, unsigned long pfn) | ||
| 340 | { | ||
| 341 | unsigned long status, dummy; | ||
| 342 | u32 pfn32; | ||
| 343 | |||
| 344 | pfn32 = (u32)pfn; | ||
| 345 | if (pfn32 != pfn) | ||
| 346 | return false; | ||
| 347 | |||
| 348 | STATS_INC(b->stats.unlock); | ||
| 349 | |||
| 350 | status = VMWARE_BALLOON_CMD(UNLOCK, pfn, dummy); | ||
| 351 | if (vmballoon_check_status(b, status)) | ||
| 352 | return true; | ||
| 353 | |||
| 354 | pr_debug("%s - ppn %lx, hv returns %ld\n", __func__, pfn, status); | ||
| 355 | STATS_INC(b->stats.unlock_fail); | ||
| 356 | return false; | ||
| 357 | } | ||
| 358 | |||
| 359 | /* | ||
| 360 | * Quickly release all pages allocated for the balloon. This function is | ||
| 361 | * called when host decides to "reset" balloon for one reason or another. | ||
| 362 | * Unlike normal "deflate" we do not (shall not) notify host of the pages | ||
| 363 | * being released. | ||
| 364 | */ | ||
| 365 | static void vmballoon_pop(struct vmballoon *b) | ||
| 366 | { | ||
| 367 | struct page *page, *next; | ||
| 368 | unsigned int count = 0; | ||
| 369 | |||
| 370 | list_for_each_entry_safe(page, next, &b->pages, lru) { | ||
| 371 | list_del(&page->lru); | ||
| 372 | __free_page(page); | ||
| 373 | STATS_INC(b->stats.free); | ||
| 374 | b->size--; | ||
| 375 | |||
| 376 | if (++count >= b->rate_free) { | ||
| 377 | count = 0; | ||
| 378 | cond_resched(); | ||
| 379 | } | ||
| 380 | } | ||
| 381 | } | ||
| 382 | |||
| 383 | /* | ||
| 384 | * Perform standard reset sequence by popping the balloon (in case it | ||
| 385 | * is not empty) and then restarting protocol. This operation normally | ||
| 386 | * happens when host responds with VMW_BALLOON_ERROR_RESET to a command. | ||
| 387 | */ | ||
| 388 | static void vmballoon_reset(struct vmballoon *b) | ||
| 389 | { | ||
| 390 | /* free all pages, skipping monitor unlock */ | ||
| 391 | vmballoon_pop(b); | ||
| 392 | |||
| 393 | if (vmballoon_send_start(b)) { | ||
| 394 | b->reset_required = false; | ||
| 395 | if (!vmballoon_send_guest_id(b)) | ||
| 396 | pr_err("failed to send guest ID to the host\n"); | ||
| 397 | } | ||
| 398 | } | ||
| 399 | |||
| 400 | /* | ||
| 401 | * Allocate (or reserve) a page for the balloon and notify the host. If host | ||
| 402 | * refuses the page put it on "refuse" list and allocate another one until host | ||
| 403 | * is satisfied. "Refused" pages are released at the end of inflation cycle | ||
| 404 | * (when we allocate b->rate_alloc pages). | ||
| 405 | */ | ||
| 406 | static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep) | ||
| 407 | { | ||
| 408 | struct page *page; | ||
| 409 | gfp_t flags; | ||
| 410 | bool locked = false; | ||
| 411 | |||
| 412 | do { | ||
| 413 | if (!can_sleep) | ||
| 414 | STATS_INC(b->stats.alloc); | ||
| 415 | else | ||
| 416 | STATS_INC(b->stats.sleep_alloc); | ||
| 417 | |||
| 418 | flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP; | ||
| 419 | page = alloc_page(flags); | ||
| 420 | if (!page) { | ||
| 421 | if (!can_sleep) | ||
| 422 | STATS_INC(b->stats.alloc_fail); | ||
| 423 | else | ||
| 424 | STATS_INC(b->stats.sleep_alloc_fail); | ||
| 425 | return -ENOMEM; | ||
| 426 | } | ||
| 427 | |||
| 428 | /* inform monitor */ | ||
| 429 | locked = vmballoon_send_lock_page(b, page_to_pfn(page)); | ||
| 430 | if (!locked) { | ||
| 431 | if (b->reset_required) { | ||
| 432 | __free_page(page); | ||
| 433 | return -EIO; | ||
| 434 | } | ||
| 435 | |||
| 436 | /* place on list of non-balloonable pages, retry allocation */ | ||
| 437 | list_add(&page->lru, &b->refused_pages); | ||
| 438 | STATS_INC(b->stats.refused_alloc); | ||
| 439 | } | ||
| 440 | } while (!locked); | ||
| 441 | |||
| 442 | /* track allocated page */ | ||
| 443 | list_add(&page->lru, &b->pages); | ||
| 444 | |||
| 445 | /* update balloon size */ | ||
| 446 | b->size++; | ||
| 447 | |||
| 448 | return 0; | ||
| 449 | } | ||
| 450 | |||
| 451 | /* | ||
| 452 | * Release the page allocated for the balloon. Note that we first notify | ||
| 453 | * the host so it can make sure the page will be available for the guest | ||
| 454 | * to use, if needed. | ||
| 455 | */ | ||
| 456 | static int vmballoon_release_page(struct vmballoon *b, struct page *page) | ||
| 457 | { | ||
| 458 | if (!vmballoon_send_unlock_page(b, page_to_pfn(page))) | ||
| 459 | return -EIO; | ||
| 460 | |||
| 461 | list_del(&page->lru); | ||
| 462 | |||
| 463 | /* deallocate page */ | ||
| 464 | __free_page(page); | ||
| 465 | STATS_INC(b->stats.free); | ||
| 466 | |||
| 467 | /* update balloon size */ | ||
| 468 | b->size--; | ||
| 469 | |||
| 470 | return 0; | ||
| 471 | } | ||
| 472 | |||
| 473 | /* | ||
| 474 | * Release pages that were allocated while attempting to inflate the | ||
| 475 | * balloon but were refused by the host for one reason or another. | ||
| 476 | */ | ||
| 477 | static void vmballoon_release_refused_pages(struct vmballoon *b) | ||
| 478 | { | ||
| 479 | struct page *page, *next; | ||
| 480 | |||
| 481 | list_for_each_entry_safe(page, next, &b->refused_pages, lru) { | ||
| 482 | list_del(&page->lru); | ||
| 483 | __free_page(page); | ||
| 484 | STATS_INC(b->stats.refused_free); | ||
| 485 | } | ||
| 486 | } | ||
| 487 | |||
| 488 | /* | ||
| 489 | * Inflate the balloon towards its target size. Note that we try to limit | ||
| 490 | * the rate of allocation to make sure we are not choking the rest of the | ||
| 491 | * system. | ||
| 492 | */ | ||
| 493 | static void vmballoon_inflate(struct vmballoon *b) | ||
| 494 | { | ||
| 495 | unsigned int goal; | ||
| 496 | unsigned int rate; | ||
| 497 | unsigned int i; | ||
| 498 | unsigned int allocations = 0; | ||
| 499 | int error = 0; | ||
| 500 | bool alloc_can_sleep = false; | ||
| 501 | |||
| 502 | pr_debug("%s - size: %d, target %d\n", __func__, b->size, b->target); | ||
| 503 | |||
| 504 | /* | ||
| 505 | * First try NOSLEEP page allocations to inflate balloon. | ||
| 506 | * | ||
| 507 | * If we do not throttle nosleep allocations, we can drain all | ||
| 508 | * free pages in the guest quickly (if the balloon target is high). | ||
| 509 | * As a side-effect, draining free pages helps to inform (force) | ||
| 510 | * the guest to start swapping if balloon target is not met yet, | ||
| 511 | * which is a desired behavior. However, balloon driver can consume | ||
| 512 | * all available CPU cycles if too many pages are allocated in a | ||
| 513 | * second. Therefore, we throttle nosleep allocations even when | ||
| 514 | * the guest is not under memory pressure. OTOH, if we have already | ||
| 515 | * predicted that the guest is under memory pressure, then we | ||
| 516 | * slowdown page allocations considerably. | ||
| 517 | */ | ||
| 518 | |||
| 519 | goal = b->target - b->size; | ||
| 520 | /* | ||
| 521 | * Start with no sleep allocation rate which may be higher | ||
| 522 | * than sleeping allocation rate. | ||
| 523 | */ | ||
| 524 | rate = b->slow_allocation_cycles ? | ||
| 525 | b->rate_alloc : VMW_BALLOON_NOSLEEP_ALLOC_MAX; | ||
| 526 | |||
| 527 | pr_debug("%s - goal: %d, no-sleep rate: %d, sleep rate: %d\n", | ||
| 528 | __func__, goal, rate, b->rate_alloc); | ||
| 529 | |||
| 530 | for (i = 0; i < goal; i++) { | ||
| 531 | |||
| 532 | error = vmballoon_reserve_page(b, alloc_can_sleep); | ||
| 533 | if (error) { | ||
| 534 | if (error != -ENOMEM) { | ||
| 535 | /* | ||
| 536 | * Not a page allocation failure, stop this | ||
| 537 | * cycle. Maybe we'll get new target from | ||
| 538 | * the host soon. | ||
| 539 | */ | ||
| 540 | break; | ||
| 541 | } | ||
| 542 | |||
| 543 | if (alloc_can_sleep) { | ||
| 544 | /* | ||
| 545 | * CANSLEEP page allocation failed, so guest | ||
| 546 | * is under severe memory pressure. Quickly | ||
| 547 | * decrease allocation rate. | ||
| 548 | */ | ||
| 549 | b->rate_alloc = max(b->rate_alloc / 2, | ||
| 550 | VMW_BALLOON_RATE_ALLOC_MIN); | ||
| 551 | break; | ||
| 552 | } | ||
| 553 | |||
| 554 | /* | ||
| 555 | * NOSLEEP page allocation failed, so the guest is | ||
| 556 | * under memory pressure. Let us slow down page | ||
| 557 | * allocations for next few cycles so that the guest | ||
| 558 | * gets out of memory pressure. Also, if we already | ||
| 559 | * allocated b->rate_alloc pages, let's pause, | ||
| 560 | * otherwise switch to sleeping allocations. | ||
| 561 | */ | ||
| 562 | b->slow_allocation_cycles = VMW_BALLOON_SLOW_CYCLES; | ||
| 563 | |||
| 564 | if (i >= b->rate_alloc) | ||
| 565 | break; | ||
| 566 | |||
| 567 | alloc_can_sleep = true; | ||
| 568 | /* Lower rate for sleeping allocations. */ | ||
| 569 | rate = b->rate_alloc; | ||
| 570 | } | ||
| 571 | |||
| 572 | if (++allocations > VMW_BALLOON_YIELD_THRESHOLD) { | ||
| 573 | cond_resched(); | ||
| 574 | allocations = 0; | ||
| 575 | } | ||
| 576 | |||
| 577 | if (i >= rate) { | ||
| 578 | /* We allocated enough pages, let's take a break. */ | ||
| 579 | break; | ||
| 580 | } | ||
| 581 | } | ||
| 582 | |||
| 583 | /* | ||
| 584 | * We reached our goal without failures so try increasing | ||
| 585 | * allocation rate. | ||
| 586 | */ | ||
| 587 | if (error == 0 && i >= b->rate_alloc) { | ||
| 588 | unsigned int mult = i / b->rate_alloc; | ||
| 589 | |||
| 590 | b->rate_alloc = | ||
| 591 | min(b->rate_alloc + mult * VMW_BALLOON_RATE_ALLOC_INC, | ||
| 592 | VMW_BALLOON_RATE_ALLOC_MAX); | ||
| 593 | } | ||
| 594 | |||
| 595 | vmballoon_release_refused_pages(b); | ||
| 596 | } | ||
| 597 | |||
| 598 | /* | ||
| 599 | * Decrease the size of the balloon allowing guest to use more memory. | ||
| 600 | */ | ||
| 601 | static void vmballoon_deflate(struct vmballoon *b) | ||
| 602 | { | ||
| 603 | struct page *page, *next; | ||
| 604 | unsigned int i = 0; | ||
| 605 | unsigned int goal; | ||
| 606 | int error; | ||
| 607 | |||
| 608 | pr_debug("%s - size: %d, target %d\n", __func__, b->size, b->target); | ||
| 609 | |||
| 610 | /* limit deallocation rate */ | ||
| 611 | goal = min(b->size - b->target, b->rate_free); | ||
| 612 | |||
| 613 | pr_debug("%s - goal: %d, rate: %d\n", __func__, goal, b->rate_free); | ||
| 614 | |||
| 615 | /* free pages to reach target */ | ||
| 616 | list_for_each_entry_safe(page, next, &b->pages, lru) { | ||
| 617 | error = vmballoon_release_page(b, page); | ||
| 618 | if (error) { | ||
| 619 | /* quickly decrease rate in case of error */ | ||
| 620 | b->rate_free = max(b->rate_free / 2, | ||
| 621 | VMW_BALLOON_RATE_FREE_MIN); | ||
| 622 | return; | ||
| 623 | } | ||
| 624 | |||
| 625 | if (++i >= goal) | ||
| 626 | break; | ||
| 627 | } | ||
| 628 | |||
| 629 | /* slowly increase rate if there were no errors */ | ||
| 630 | b->rate_free = min(b->rate_free + VMW_BALLOON_RATE_FREE_INC, | ||
| 631 | VMW_BALLOON_RATE_FREE_MAX); | ||
| 632 | } | ||
| 633 | |||
| 634 | /* | ||
| 635 | * Balloon work function: reset protocol, if needed, get the new size and | ||
| 636 | * adjust balloon as needed. Repeat in 1 sec. | ||
| 637 | */ | ||
| 638 | static void vmballoon_work(struct work_struct *work) | ||
| 639 | { | ||
| 640 | struct delayed_work *dwork = to_delayed_work(work); | ||
| 641 | struct vmballoon *b = container_of(dwork, struct vmballoon, dwork); | ||
| 642 | unsigned int target; | ||
| 643 | |||
| 644 | STATS_INC(b->stats.timer); | ||
| 645 | |||
| 646 | if (b->reset_required) | ||
| 647 | vmballoon_reset(b); | ||
| 648 | |||
| 649 | if (b->slow_allocation_cycles > 0) | ||
| 650 | b->slow_allocation_cycles--; | ||
| 651 | |||
| 652 | if (vmballoon_send_get_target(b, &target)) { | ||
| 653 | /* update target, adjust size */ | ||
| 654 | b->target = target; | ||
| 655 | |||
| 656 | if (b->size < target) | ||
| 657 | vmballoon_inflate(b); | ||
| 658 | else if (b->size > target) | ||
| 659 | vmballoon_deflate(b); | ||
| 660 | } | ||
| 661 | |||
| 662 | queue_delayed_work(vmballoon_wq, dwork, round_jiffies_relative(HZ)); | ||
| 663 | } | ||
| 664 | |||
| 665 | /* | ||
| 666 | * DEBUGFS Interface | ||
| 667 | */ | ||
| 668 | #ifdef CONFIG_DEBUG_FS | ||
| 669 | |||
| 670 | static int vmballoon_debug_show(struct seq_file *f, void *offset) | ||
| 671 | { | ||
| 672 | struct vmballoon *b = f->private; | ||
| 673 | struct vmballoon_stats *stats = &b->stats; | ||
| 674 | |||
| 675 | /* format size info */ | ||
| 676 | seq_printf(f, | ||
| 677 | "target: %8d pages\n" | ||
| 678 | "current: %8d pages\n", | ||
| 679 | b->target, b->size); | ||
| 680 | |||
| 681 | /* format rate info */ | ||
| 682 | seq_printf(f, | ||
| 683 | "rateNoSleepAlloc: %8d pages/sec\n" | ||
| 684 | "rateSleepAlloc: %8d pages/sec\n" | ||
| 685 | "rateFree: %8d pages/sec\n", | ||
| 686 | VMW_BALLOON_NOSLEEP_ALLOC_MAX, | ||
| 687 | b->rate_alloc, b->rate_free); | ||
| 688 | |||
| 689 | seq_printf(f, | ||
| 690 | "\n" | ||
| 691 | "timer: %8u\n" | ||
| 692 | "start: %8u (%4u failed)\n" | ||
| 693 | "guestType: %8u (%4u failed)\n" | ||
| 694 | "lock: %8u (%4u failed)\n" | ||
| 695 | "unlock: %8u (%4u failed)\n" | ||
| 696 | "target: %8u (%4u failed)\n" | ||
| 697 | "primNoSleepAlloc: %8u (%4u failed)\n" | ||
| 698 | "primCanSleepAlloc: %8u (%4u failed)\n" | ||
| 699 | "primFree: %8u\n" | ||
| 700 | "errAlloc: %8u\n" | ||
| 701 | "errFree: %8u\n", | ||
| 702 | stats->timer, | ||
| 703 | stats->start, stats->start_fail, | ||
| 704 | stats->guest_type, stats->guest_type_fail, | ||
| 705 | stats->lock, stats->lock_fail, | ||
| 706 | stats->unlock, stats->unlock_fail, | ||
| 707 | stats->target, stats->target_fail, | ||
| 708 | stats->alloc, stats->alloc_fail, | ||
| 709 | stats->sleep_alloc, stats->sleep_alloc_fail, | ||
| 710 | stats->free, | ||
| 711 | stats->refused_alloc, stats->refused_free); | ||
| 712 | |||
| 713 | return 0; | ||
| 714 | } | ||
| 715 | |||
| 716 | static int vmballoon_debug_open(struct inode *inode, struct file *file) | ||
| 717 | { | ||
| 718 | return single_open(file, vmballoon_debug_show, inode->i_private); | ||
| 719 | } | ||
| 720 | |||
| 721 | static const struct file_operations vmballoon_debug_fops = { | ||
| 722 | .owner = THIS_MODULE, | ||
| 723 | .open = vmballoon_debug_open, | ||
| 724 | .read = seq_read, | ||
| 725 | .llseek = seq_lseek, | ||
| 726 | .release = single_release, | ||
| 727 | }; | ||
| 728 | |||
| 729 | static int __init vmballoon_debugfs_init(struct vmballoon *b) | ||
| 730 | { | ||
| 731 | int error; | ||
| 732 | |||
| 733 | b->dbg_entry = debugfs_create_file("vmmemctl", S_IRUGO, NULL, b, | ||
| 734 | &vmballoon_debug_fops); | ||
| 735 | if (IS_ERR(b->dbg_entry)) { | ||
| 736 | error = PTR_ERR(b->dbg_entry); | ||
| 737 | pr_err("failed to create debugfs entry, error: %d\n", error); | ||
| 738 | return error; | ||
| 739 | } | ||
| 740 | |||
| 741 | return 0; | ||
| 742 | } | ||
| 743 | |||
| 744 | static void __exit vmballoon_debugfs_exit(struct vmballoon *b) | ||
| 745 | { | ||
| 746 | debugfs_remove(b->dbg_entry); | ||
| 747 | } | ||
| 748 | |||
| 749 | #else | ||
| 750 | |||
| 751 | static inline int vmballoon_debugfs_init(struct vmballoon *b) | ||
| 752 | { | ||
| 753 | return 0; | ||
| 754 | } | ||
| 755 | |||
| 756 | static inline void vmballoon_debugfs_exit(struct vmballoon *b) | ||
| 757 | { | ||
| 758 | } | ||
| 759 | |||
| 760 | #endif /* CONFIG_DEBUG_FS */ | ||
| 761 | |||
| 762 | static int __init vmballoon_init(void) | ||
| 763 | { | ||
| 764 | int error; | ||
| 765 | |||
| 766 | /* | ||
| 767 | * Check if we are running on VMware's hypervisor and bail out | ||
| 768 | * if we are not. | ||
| 769 | */ | ||
| 770 | if (!vmware_platform()) | ||
| 771 | return -ENODEV; | ||
| 772 | |||
| 773 | vmballoon_wq = create_freezeable_workqueue("vmmemctl"); | ||
| 774 | if (!vmballoon_wq) { | ||
| 775 | pr_err("failed to create workqueue\n"); | ||
| 776 | return -ENOMEM; | ||
| 777 | } | ||
| 778 | |||
| 779 | INIT_LIST_HEAD(&balloon.pages); | ||
| 780 | INIT_LIST_HEAD(&balloon.refused_pages); | ||
| 781 | |||
| 782 | /* initialize rates */ | ||
| 783 | balloon.rate_alloc = VMW_BALLOON_RATE_ALLOC_MAX; | ||
| 784 | balloon.rate_free = VMW_BALLOON_RATE_FREE_MAX; | ||
| 785 | |||
| 786 | INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work); | ||
| 787 | |||
| 788 | /* | ||
| 789 | * Start balloon. | ||
| 790 | */ | ||
| 791 | if (!vmballoon_send_start(&balloon)) { | ||
| 792 | pr_err("failed to send start command to the host\n"); | ||
| 793 | error = -EIO; | ||
| 794 | goto fail; | ||
| 795 | } | ||
| 796 | |||
| 797 | if (!vmballoon_send_guest_id(&balloon)) { | ||
| 798 | pr_err("failed to send guest ID to the host\n"); | ||
| 799 | error = -EIO; | ||
| 800 | goto fail; | ||
| 801 | } | ||
| 802 | |||
| 803 | error = vmballoon_debugfs_init(&balloon); | ||
| 804 | if (error) | ||
| 805 | goto fail; | ||
| 806 | |||
| 807 | queue_delayed_work(vmballoon_wq, &balloon.dwork, 0); | ||
| 808 | |||
| 809 | return 0; | ||
| 810 | |||
| 811 | fail: | ||
| 812 | destroy_workqueue(vmballoon_wq); | ||
| 813 | return error; | ||
| 814 | } | ||
| 815 | module_init(vmballoon_init); | ||
| 816 | |||
| 817 | static void __exit vmballoon_exit(void) | ||
| 818 | { | ||
| 819 | cancel_delayed_work_sync(&balloon.dwork); | ||
| 820 | destroy_workqueue(vmballoon_wq); | ||
| 821 | |||
| 822 | vmballoon_debugfs_exit(&balloon); | ||
| 823 | |||
| 824 | /* | ||
| 825 | * Deallocate all reserved memory, and reset connection with monitor. | ||
| 826 | * Reset connection before deallocating memory to avoid potential for | ||
| 827 | * additional spurious resets from guest touching deallocated pages. | ||
| 828 | */ | ||
| 829 | vmballoon_send_start(&balloon); | ||
| 830 | vmballoon_pop(&balloon); | ||
| 831 | } | ||
| 832 | module_exit(vmballoon_exit); | ||
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 82d1e4de475b..4521b1ecce45 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | # Core functionality. | 5 | # Core functionality. |
| 6 | obj-$(CONFIG_MTD) += mtd.o | 6 | obj-$(CONFIG_MTD) += mtd.o |
| 7 | mtd-y := mtdcore.o mtdsuper.o mtdbdi.o | 7 | mtd-y := mtdcore.o mtdsuper.o |
| 8 | mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o | 8 | mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o | 10 | obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o |
diff --git a/drivers/mtd/internal.h b/drivers/mtd/internal.h deleted file mode 100644 index c658fe7216b5..000000000000 --- a/drivers/mtd/internal.h +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | /* Internal MTD definitions | ||
| 2 | * | ||
| 3 | * Copyright © 2006 Red Hat, Inc. All Rights Reserved. | ||
| 4 | * Written by David Howells (dhowells@redhat.com) | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU General Public License | ||
| 8 | * as published by the Free Software Foundation; either version | ||
| 9 | * 2 of the License, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | /* | ||
| 13 | * mtdbdi.c | ||
| 14 | */ | ||
| 15 | extern struct backing_dev_info mtd_bdi_unmappable; | ||
| 16 | extern struct backing_dev_info mtd_bdi_ro_mappable; | ||
| 17 | extern struct backing_dev_info mtd_bdi_rw_mappable; | ||
diff --git a/drivers/mtd/mtdbdi.c b/drivers/mtd/mtdbdi.c deleted file mode 100644 index 5ca5aed0b225..000000000000 --- a/drivers/mtd/mtdbdi.c +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /* MTD backing device capabilities | ||
| 2 | * | ||
| 3 | * Copyright © 2006 Red Hat, Inc. All Rights Reserved. | ||
| 4 | * Written by David Howells (dhowells@redhat.com) | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU General Public License | ||
| 8 | * as published by the Free Software Foundation; either version | ||
| 9 | * 2 of the License, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/backing-dev.h> | ||
| 13 | #include <linux/mtd/mtd.h> | ||
| 14 | #include "internal.h" | ||
| 15 | |||
| 16 | /* | ||
| 17 | * backing device capabilities for non-mappable devices (such as NAND flash) | ||
| 18 | * - permits private mappings, copies are taken of the data | ||
| 19 | */ | ||
| 20 | struct backing_dev_info mtd_bdi_unmappable = { | ||
| 21 | .capabilities = BDI_CAP_MAP_COPY, | ||
| 22 | }; | ||
| 23 | |||
| 24 | /* | ||
| 25 | * backing device capabilities for R/O mappable devices (such as ROM) | ||
| 26 | * - permits private mappings, copies are taken of the data | ||
| 27 | * - permits non-writable shared mappings | ||
| 28 | */ | ||
| 29 | struct backing_dev_info mtd_bdi_ro_mappable = { | ||
| 30 | .capabilities = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT | | ||
| 31 | BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP), | ||
| 32 | }; | ||
| 33 | |||
| 34 | /* | ||
| 35 | * backing device capabilities for writable mappable devices (such as RAM) | ||
| 36 | * - permits private mappings, copies are taken of the data | ||
| 37 | * - permits non-writable shared mappings | ||
| 38 | */ | ||
| 39 | struct backing_dev_info mtd_bdi_rw_mappable = { | ||
| 40 | .capabilities = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT | | ||
| 41 | BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP | | ||
| 42 | BDI_CAP_WRITE_MAP), | ||
| 43 | }; | ||
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 5b38b17d2229..b177e750efc3 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
| @@ -2,6 +2,9 @@ | |||
| 2 | * Core registration and callback routines for MTD | 2 | * Core registration and callback routines for MTD |
| 3 | * drivers and users. | 3 | * drivers and users. |
| 4 | * | 4 | * |
| 5 | * bdi bits are: | ||
| 6 | * Copyright © 2006 Red Hat, Inc. All Rights Reserved. | ||
| 7 | * Written by David Howells (dhowells@redhat.com) | ||
| 5 | */ | 8 | */ |
| 6 | 9 | ||
| 7 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| @@ -16,11 +19,39 @@ | |||
| 16 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 17 | #include <linux/mtd/compatmac.h> | 20 | #include <linux/mtd/compatmac.h> |
| 18 | #include <linux/proc_fs.h> | 21 | #include <linux/proc_fs.h> |
| 22 | #include <linux/backing-dev.h> | ||
| 19 | 23 | ||
| 20 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
| 21 | #include "internal.h" | ||
| 22 | 25 | ||
| 23 | #include "mtdcore.h" | 26 | #include "mtdcore.h" |
| 27 | /* | ||
| 28 | * backing device capabilities for non-mappable devices (such as NAND flash) | ||
| 29 | * - permits private mappings, copies are taken of the data | ||
| 30 | */ | ||
| 31 | struct backing_dev_info mtd_bdi_unmappable = { | ||
| 32 | .capabilities = BDI_CAP_MAP_COPY, | ||
| 33 | }; | ||
| 34 | |||
| 35 | /* | ||
| 36 | * backing device capabilities for R/O mappable devices (such as ROM) | ||
| 37 | * - permits private mappings, copies are taken of the data | ||
| 38 | * - permits non-writable shared mappings | ||
| 39 | */ | ||
| 40 | struct backing_dev_info mtd_bdi_ro_mappable = { | ||
| 41 | .capabilities = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT | | ||
| 42 | BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP), | ||
| 43 | }; | ||
| 44 | |||
| 45 | /* | ||
| 46 | * backing device capabilities for writable mappable devices (such as RAM) | ||
| 47 | * - permits private mappings, copies are taken of the data | ||
| 48 | * - permits non-writable shared mappings | ||
| 49 | */ | ||
| 50 | struct backing_dev_info mtd_bdi_rw_mappable = { | ||
| 51 | .capabilities = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT | | ||
| 52 | BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP | | ||
| 53 | BDI_CAP_WRITE_MAP), | ||
| 54 | }; | ||
| 24 | 55 | ||
| 25 | static int mtd_cls_suspend(struct device *dev, pm_message_t state); | 56 | static int mtd_cls_suspend(struct device *dev, pm_message_t state); |
| 26 | static int mtd_cls_resume(struct device *dev); | 57 | static int mtd_cls_resume(struct device *dev); |
| @@ -628,20 +659,55 @@ done: | |||
| 628 | /*====================================================================*/ | 659 | /*====================================================================*/ |
| 629 | /* Init code */ | 660 | /* Init code */ |
| 630 | 661 | ||
| 662 | static int __init mtd_bdi_init(struct backing_dev_info *bdi, const char *name) | ||
| 663 | { | ||
| 664 | int ret; | ||
| 665 | |||
| 666 | ret = bdi_init(bdi); | ||
| 667 | if (!ret) | ||
| 668 | ret = bdi_register(bdi, NULL, name); | ||
| 669 | |||
| 670 | if (ret) | ||
| 671 | bdi_destroy(bdi); | ||
| 672 | |||
| 673 | return ret; | ||
| 674 | } | ||
| 675 | |||
| 631 | static int __init init_mtd(void) | 676 | static int __init init_mtd(void) |
| 632 | { | 677 | { |
| 633 | int ret; | 678 | int ret; |
| 679 | |||
| 634 | ret = class_register(&mtd_class); | 680 | ret = class_register(&mtd_class); |
| 681 | if (ret) | ||
| 682 | goto err_reg; | ||
| 683 | |||
| 684 | ret = mtd_bdi_init(&mtd_bdi_unmappable, "mtd-unmap"); | ||
| 685 | if (ret) | ||
| 686 | goto err_bdi1; | ||
| 687 | |||
| 688 | ret = mtd_bdi_init(&mtd_bdi_ro_mappable, "mtd-romap"); | ||
| 689 | if (ret) | ||
| 690 | goto err_bdi2; | ||
| 691 | |||
| 692 | ret = mtd_bdi_init(&mtd_bdi_rw_mappable, "mtd-rwmap"); | ||
| 693 | if (ret) | ||
| 694 | goto err_bdi3; | ||
| 635 | 695 | ||
| 636 | if (ret) { | ||
| 637 | pr_err("Error registering mtd class: %d\n", ret); | ||
| 638 | return ret; | ||
| 639 | } | ||
| 640 | #ifdef CONFIG_PROC_FS | 696 | #ifdef CONFIG_PROC_FS |
| 641 | if ((proc_mtd = create_proc_entry( "mtd", 0, NULL ))) | 697 | if ((proc_mtd = create_proc_entry( "mtd", 0, NULL ))) |
| 642 | proc_mtd->read_proc = mtd_read_proc; | 698 | proc_mtd->read_proc = mtd_read_proc; |
| 643 | #endif /* CONFIG_PROC_FS */ | 699 | #endif /* CONFIG_PROC_FS */ |
| 644 | return 0; | 700 | return 0; |
| 701 | |||
| 702 | err_bdi3: | ||
| 703 | bdi_destroy(&mtd_bdi_ro_mappable); | ||
| 704 | err_bdi2: | ||
| 705 | bdi_destroy(&mtd_bdi_unmappable); | ||
| 706 | err_bdi1: | ||
| 707 | class_unregister(&mtd_class); | ||
| 708 | err_reg: | ||
| 709 | pr_err("Error registering mtd class or bdi: %d\n", ret); | ||
| 710 | return ret; | ||
| 645 | } | 711 | } |
| 646 | 712 | ||
| 647 | static void __exit cleanup_mtd(void) | 713 | static void __exit cleanup_mtd(void) |
| @@ -651,6 +717,9 @@ static void __exit cleanup_mtd(void) | |||
| 651 | remove_proc_entry( "mtd", NULL); | 717 | remove_proc_entry( "mtd", NULL); |
| 652 | #endif /* CONFIG_PROC_FS */ | 718 | #endif /* CONFIG_PROC_FS */ |
| 653 | class_unregister(&mtd_class); | 719 | class_unregister(&mtd_class); |
| 720 | bdi_destroy(&mtd_bdi_unmappable); | ||
| 721 | bdi_destroy(&mtd_bdi_ro_mappable); | ||
| 722 | bdi_destroy(&mtd_bdi_rw_mappable); | ||
| 654 | } | 723 | } |
| 655 | 724 | ||
| 656 | module_init(init_mtd); | 725 | module_init(init_mtd); |
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index af8b42e0a55b..7c003191fca4 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/mtd/super.h> | 13 | #include <linux/mtd/super.h> |
| 14 | #include <linux/namei.h> | 14 | #include <linux/namei.h> |
| 15 | #include <linux/ctype.h> | 15 | #include <linux/ctype.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | /* | 18 | /* |
| 18 | * compare superblocks to see if they're equivalent | 19 | * compare superblocks to see if they're equivalent |
| @@ -44,6 +45,7 @@ static int get_sb_mtd_set(struct super_block *sb, void *_mtd) | |||
| 44 | 45 | ||
| 45 | sb->s_mtd = mtd; | 46 | sb->s_mtd = mtd; |
| 46 | sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index); | 47 | sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index); |
| 48 | sb->s_bdi = mtd->backing_dev_info; | ||
| 47 | return 0; | 49 | return 0; |
| 48 | } | 50 | } |
| 49 | 51 | ||
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index f59c07427af3..d60fc5719fef 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c | |||
| @@ -60,7 +60,13 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) | |||
| 60 | } | 60 | } |
| 61 | buf64 = (uint64_t *)buf; | 61 | buf64 = (uint64_t *)buf; |
| 62 | while (i < len/8) { | 62 | while (i < len/8) { |
| 63 | uint64_t x; | 63 | /* |
| 64 | * Since GCC has no proper constraint (PR 43518) | ||
| 65 | * force x variable to r2/r3 registers as ldrd instruction | ||
| 66 | * requires first register to be even. | ||
| 67 | */ | ||
| 68 | register uint64_t x asm ("r2"); | ||
| 69 | |||
| 64 | asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base)); | 70 | asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base)); |
| 65 | buf64[i++] = x; | 71 | buf64[i++] = x; |
| 66 | } | 72 | } |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index a03d291de854..f0d23de32967 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
| @@ -1944,7 +1944,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp, | |||
| 1944 | netif_dbg(tp, rx_status, dev, "%s() status %04x, size %04x, cur %04x\n", | 1944 | netif_dbg(tp, rx_status, dev, "%s() status %04x, size %04x, cur %04x\n", |
| 1945 | __func__, rx_status, rx_size, cur_rx); | 1945 | __func__, rx_status, rx_size, cur_rx); |
| 1946 | #if RTL8139_DEBUG > 2 | 1946 | #if RTL8139_DEBUG > 2 |
| 1947 | print_dump_hex(KERN_DEBUG, "Frame contents: ", | 1947 | print_hex_dump(KERN_DEBUG, "Frame contents: ", |
| 1948 | DUMP_PREFIX_OFFSET, 16, 1, | 1948 | DUMP_PREFIX_OFFSET, 16, 1, |
| 1949 | &rx_ring[ring_offset], 70, true); | 1949 | &rx_ring[ring_offset], 70, true); |
| 1950 | #endif | 1950 | #endif |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a583b50d9de8..12b280afdd51 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -273,6 +273,7 @@ obj-$(CONFIG_USB_RTL8150) += usb/ | |||
| 273 | obj-$(CONFIG_USB_HSO) += usb/ | 273 | obj-$(CONFIG_USB_HSO) += usb/ |
| 274 | obj-$(CONFIG_USB_USBNET) += usb/ | 274 | obj-$(CONFIG_USB_USBNET) += usb/ |
| 275 | obj-$(CONFIG_USB_ZD1201) += usb/ | 275 | obj-$(CONFIG_USB_ZD1201) += usb/ |
| 276 | obj-$(CONFIG_USB_IPHETH) += usb/ | ||
| 276 | 277 | ||
| 277 | obj-y += wireless/ | 278 | obj-y += wireless/ |
| 278 | obj-$(CONFIG_NET_TULIP) += tulip/ | 279 | obj-$(CONFIG_NET_TULIP) += tulip/ |
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 6995169d285a..cd17d09f385c 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
| @@ -311,11 +311,6 @@ err: | |||
| 311 | processed++; | 311 | processed++; |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | if (processed) { | ||
| 315 | wrw(ep, REG_RXDENQ, processed); | ||
| 316 | wrw(ep, REG_RXSTSENQ, processed); | ||
| 317 | } | ||
| 318 | |||
| 319 | return processed; | 314 | return processed; |
| 320 | } | 315 | } |
| 321 | 316 | ||
| @@ -350,6 +345,11 @@ poll_some_more: | |||
| 350 | goto poll_some_more; | 345 | goto poll_some_more; |
| 351 | } | 346 | } |
| 352 | 347 | ||
| 348 | if (rx) { | ||
| 349 | wrw(ep, REG_RXDENQ, rx); | ||
| 350 | wrw(ep, REG_RXSTSENQ, rx); | ||
| 351 | } | ||
| 352 | |||
| 353 | return rx; | 353 | return rx; |
| 354 | } | 354 | } |
| 355 | 355 | ||
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index a257babd1bb4..ac90a3828f69 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -58,8 +58,8 @@ | |||
| 58 | #include "bnx2_fw.h" | 58 | #include "bnx2_fw.h" |
| 59 | 59 | ||
| 60 | #define DRV_MODULE_NAME "bnx2" | 60 | #define DRV_MODULE_NAME "bnx2" |
| 61 | #define DRV_MODULE_VERSION "2.0.8" | 61 | #define DRV_MODULE_VERSION "2.0.9" |
| 62 | #define DRV_MODULE_RELDATE "Feb 15, 2010" | 62 | #define DRV_MODULE_RELDATE "April 27, 2010" |
| 63 | #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-5.0.0.j6.fw" | 63 | #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-5.0.0.j6.fw" |
| 64 | #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-5.0.0.j3.fw" | 64 | #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-5.0.0.j3.fw" |
| 65 | #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-5.0.0.j9.fw" | 65 | #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-5.0.0.j9.fw" |
| @@ -651,9 +651,10 @@ bnx2_napi_enable(struct bnx2 *bp) | |||
| 651 | } | 651 | } |
| 652 | 652 | ||
| 653 | static void | 653 | static void |
| 654 | bnx2_netif_stop(struct bnx2 *bp) | 654 | bnx2_netif_stop(struct bnx2 *bp, bool stop_cnic) |
| 655 | { | 655 | { |
| 656 | bnx2_cnic_stop(bp); | 656 | if (stop_cnic) |
| 657 | bnx2_cnic_stop(bp); | ||
| 657 | if (netif_running(bp->dev)) { | 658 | if (netif_running(bp->dev)) { |
| 658 | int i; | 659 | int i; |
| 659 | 660 | ||
| @@ -671,14 +672,15 @@ bnx2_netif_stop(struct bnx2 *bp) | |||
| 671 | } | 672 | } |
| 672 | 673 | ||
| 673 | static void | 674 | static void |
| 674 | bnx2_netif_start(struct bnx2 *bp) | 675 | bnx2_netif_start(struct bnx2 *bp, bool start_cnic) |
| 675 | { | 676 | { |
| 676 | if (atomic_dec_and_test(&bp->intr_sem)) { | 677 | if (atomic_dec_and_test(&bp->intr_sem)) { |
| 677 | if (netif_running(bp->dev)) { | 678 | if (netif_running(bp->dev)) { |
| 678 | netif_tx_wake_all_queues(bp->dev); | 679 | netif_tx_wake_all_queues(bp->dev); |
| 679 | bnx2_napi_enable(bp); | 680 | bnx2_napi_enable(bp); |
| 680 | bnx2_enable_int(bp); | 681 | bnx2_enable_int(bp); |
| 681 | bnx2_cnic_start(bp); | 682 | if (start_cnic) |
| 683 | bnx2_cnic_start(bp); | ||
| 682 | } | 684 | } |
| 683 | } | 685 | } |
| 684 | } | 686 | } |
| @@ -4759,8 +4761,12 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code) | |||
| 4759 | rc = bnx2_alloc_bad_rbuf(bp); | 4761 | rc = bnx2_alloc_bad_rbuf(bp); |
| 4760 | } | 4762 | } |
| 4761 | 4763 | ||
| 4762 | if (bp->flags & BNX2_FLAG_USING_MSIX) | 4764 | if (bp->flags & BNX2_FLAG_USING_MSIX) { |
| 4763 | bnx2_setup_msix_tbl(bp); | 4765 | bnx2_setup_msix_tbl(bp); |
| 4766 | /* Prevent MSIX table reads and write from timing out */ | ||
| 4767 | REG_WR(bp, BNX2_MISC_ECO_HW_CTL, | ||
| 4768 | BNX2_MISC_ECO_HW_CTL_LARGE_GRC_TMOUT_EN); | ||
| 4769 | } | ||
| 4764 | 4770 | ||
| 4765 | return rc; | 4771 | return rc; |
| 4766 | } | 4772 | } |
| @@ -6273,12 +6279,12 @@ bnx2_reset_task(struct work_struct *work) | |||
| 6273 | return; | 6279 | return; |
| 6274 | } | 6280 | } |
| 6275 | 6281 | ||
| 6276 | bnx2_netif_stop(bp); | 6282 | bnx2_netif_stop(bp, true); |
| 6277 | 6283 | ||
| 6278 | bnx2_init_nic(bp, 1); | 6284 | bnx2_init_nic(bp, 1); |
| 6279 | 6285 | ||
| 6280 | atomic_set(&bp->intr_sem, 1); | 6286 | atomic_set(&bp->intr_sem, 1); |
| 6281 | bnx2_netif_start(bp); | 6287 | bnx2_netif_start(bp, true); |
| 6282 | rtnl_unlock(); | 6288 | rtnl_unlock(); |
| 6283 | } | 6289 | } |
| 6284 | 6290 | ||
| @@ -6320,7 +6326,7 @@ bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp) | |||
| 6320 | struct bnx2 *bp = netdev_priv(dev); | 6326 | struct bnx2 *bp = netdev_priv(dev); |
| 6321 | 6327 | ||
| 6322 | if (netif_running(dev)) | 6328 | if (netif_running(dev)) |
| 6323 | bnx2_netif_stop(bp); | 6329 | bnx2_netif_stop(bp, false); |
| 6324 | 6330 | ||
| 6325 | bp->vlgrp = vlgrp; | 6331 | bp->vlgrp = vlgrp; |
| 6326 | 6332 | ||
| @@ -6331,7 +6337,7 @@ bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp) | |||
| 6331 | if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) | 6337 | if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) |
| 6332 | bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1); | 6338 | bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1); |
| 6333 | 6339 | ||
| 6334 | bnx2_netif_start(bp); | 6340 | bnx2_netif_start(bp, false); |
| 6335 | } | 6341 | } |
| 6336 | #endif | 6342 | #endif |
| 6337 | 6343 | ||
| @@ -7051,9 +7057,9 @@ bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal) | |||
| 7051 | bp->stats_ticks &= BNX2_HC_STATS_TICKS_HC_STAT_TICKS; | 7057 | bp->stats_ticks &= BNX2_HC_STATS_TICKS_HC_STAT_TICKS; |
| 7052 | 7058 | ||
| 7053 | if (netif_running(bp->dev)) { | 7059 | if (netif_running(bp->dev)) { |
| 7054 | bnx2_netif_stop(bp); | 7060 | bnx2_netif_stop(bp, true); |
| 7055 | bnx2_init_nic(bp, 0); | 7061 | bnx2_init_nic(bp, 0); |
| 7056 | bnx2_netif_start(bp); | 7062 | bnx2_netif_start(bp, true); |
| 7057 | } | 7063 | } |
| 7058 | 7064 | ||
| 7059 | return 0; | 7065 | return 0; |
| @@ -7083,7 +7089,7 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx) | |||
| 7083 | /* Reset will erase chipset stats; save them */ | 7089 | /* Reset will erase chipset stats; save them */ |
| 7084 | bnx2_save_stats(bp); | 7090 | bnx2_save_stats(bp); |
| 7085 | 7091 | ||
| 7086 | bnx2_netif_stop(bp); | 7092 | bnx2_netif_stop(bp, true); |
| 7087 | bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET); | 7093 | bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET); |
| 7088 | bnx2_free_skbs(bp); | 7094 | bnx2_free_skbs(bp); |
| 7089 | bnx2_free_mem(bp); | 7095 | bnx2_free_mem(bp); |
| @@ -7111,7 +7117,7 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx) | |||
| 7111 | bnx2_setup_cnic_irq_info(bp); | 7117 | bnx2_setup_cnic_irq_info(bp); |
| 7112 | mutex_unlock(&bp->cnic_lock); | 7118 | mutex_unlock(&bp->cnic_lock); |
| 7113 | #endif | 7119 | #endif |
| 7114 | bnx2_netif_start(bp); | 7120 | bnx2_netif_start(bp, true); |
| 7115 | } | 7121 | } |
| 7116 | return 0; | 7122 | return 0; |
| 7117 | } | 7123 | } |
| @@ -7364,7 +7370,7 @@ bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf) | |||
| 7364 | if (etest->flags & ETH_TEST_FL_OFFLINE) { | 7370 | if (etest->flags & ETH_TEST_FL_OFFLINE) { |
| 7365 | int i; | 7371 | int i; |
| 7366 | 7372 | ||
| 7367 | bnx2_netif_stop(bp); | 7373 | bnx2_netif_stop(bp, true); |
| 7368 | bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_DIAG); | 7374 | bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_DIAG); |
| 7369 | bnx2_free_skbs(bp); | 7375 | bnx2_free_skbs(bp); |
| 7370 | 7376 | ||
| @@ -7383,7 +7389,7 @@ bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf) | |||
| 7383 | bnx2_shutdown_chip(bp); | 7389 | bnx2_shutdown_chip(bp); |
| 7384 | else { | 7390 | else { |
| 7385 | bnx2_init_nic(bp, 1); | 7391 | bnx2_init_nic(bp, 1); |
| 7386 | bnx2_netif_start(bp); | 7392 | bnx2_netif_start(bp, true); |
| 7387 | } | 7393 | } |
| 7388 | 7394 | ||
| 7389 | /* wait for link up */ | 7395 | /* wait for link up */ |
| @@ -8377,7 +8383,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 8377 | return 0; | 8383 | return 0; |
| 8378 | 8384 | ||
| 8379 | flush_scheduled_work(); | 8385 | flush_scheduled_work(); |
| 8380 | bnx2_netif_stop(bp); | 8386 | bnx2_netif_stop(bp, true); |
| 8381 | netif_device_detach(dev); | 8387 | netif_device_detach(dev); |
| 8382 | del_timer_sync(&bp->timer); | 8388 | del_timer_sync(&bp->timer); |
| 8383 | bnx2_shutdown_chip(bp); | 8389 | bnx2_shutdown_chip(bp); |
| @@ -8399,7 +8405,7 @@ bnx2_resume(struct pci_dev *pdev) | |||
| 8399 | bnx2_set_power_state(bp, PCI_D0); | 8405 | bnx2_set_power_state(bp, PCI_D0); |
| 8400 | netif_device_attach(dev); | 8406 | netif_device_attach(dev); |
| 8401 | bnx2_init_nic(bp, 1); | 8407 | bnx2_init_nic(bp, 1); |
| 8402 | bnx2_netif_start(bp); | 8408 | bnx2_netif_start(bp, true); |
| 8403 | return 0; | 8409 | return 0; |
| 8404 | } | 8410 | } |
| 8405 | 8411 | ||
| @@ -8426,7 +8432,7 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev, | |||
| 8426 | } | 8432 | } |
| 8427 | 8433 | ||
| 8428 | if (netif_running(dev)) { | 8434 | if (netif_running(dev)) { |
| 8429 | bnx2_netif_stop(bp); | 8435 | bnx2_netif_stop(bp, true); |
| 8430 | del_timer_sync(&bp->timer); | 8436 | del_timer_sync(&bp->timer); |
| 8431 | bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_RESET); | 8437 | bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_RESET); |
| 8432 | } | 8438 | } |
| @@ -8483,7 +8489,7 @@ static void bnx2_io_resume(struct pci_dev *pdev) | |||
| 8483 | 8489 | ||
| 8484 | rtnl_lock(); | 8490 | rtnl_lock(); |
| 8485 | if (netif_running(dev)) | 8491 | if (netif_running(dev)) |
| 8486 | bnx2_netif_start(bp); | 8492 | bnx2_netif_start(bp, true); |
| 8487 | 8493 | ||
| 8488 | netif_device_attach(dev); | 8494 | netif_device_attach(dev); |
| 8489 | rtnl_unlock(); | 8495 | rtnl_unlock(); |
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 33451092b8e8..d800b598ae3d 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c | |||
| @@ -1006,7 +1006,7 @@ static int ems_usb_probe(struct usb_interface *intf, | |||
| 1006 | 1006 | ||
| 1007 | netdev = alloc_candev(sizeof(struct ems_usb), MAX_TX_URBS); | 1007 | netdev = alloc_candev(sizeof(struct ems_usb), MAX_TX_URBS); |
| 1008 | if (!netdev) { | 1008 | if (!netdev) { |
| 1009 | dev_err(netdev->dev.parent, "Couldn't alloc candev\n"); | 1009 | dev_err(&intf->dev, "ems_usb: Couldn't alloc candev\n"); |
| 1010 | return -ENOMEM; | 1010 | return -ENOMEM; |
| 1011 | } | 1011 | } |
| 1012 | 1012 | ||
| @@ -1036,20 +1036,20 @@ static int ems_usb_probe(struct usb_interface *intf, | |||
| 1036 | 1036 | ||
| 1037 | dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL); | 1037 | dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL); |
| 1038 | if (!dev->intr_urb) { | 1038 | if (!dev->intr_urb) { |
| 1039 | dev_err(netdev->dev.parent, "Couldn't alloc intr URB\n"); | 1039 | dev_err(&intf->dev, "Couldn't alloc intr URB\n"); |
| 1040 | goto cleanup_candev; | 1040 | goto cleanup_candev; |
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||
| 1043 | dev->intr_in_buffer = kzalloc(INTR_IN_BUFFER_SIZE, GFP_KERNEL); | 1043 | dev->intr_in_buffer = kzalloc(INTR_IN_BUFFER_SIZE, GFP_KERNEL); |
| 1044 | if (!dev->intr_in_buffer) { | 1044 | if (!dev->intr_in_buffer) { |
| 1045 | dev_err(netdev->dev.parent, "Couldn't alloc Intr buffer\n"); | 1045 | dev_err(&intf->dev, "Couldn't alloc Intr buffer\n"); |
| 1046 | goto cleanup_intr_urb; | 1046 | goto cleanup_intr_urb; |
| 1047 | } | 1047 | } |
| 1048 | 1048 | ||
| 1049 | dev->tx_msg_buffer = kzalloc(CPC_HEADER_SIZE + | 1049 | dev->tx_msg_buffer = kzalloc(CPC_HEADER_SIZE + |
| 1050 | sizeof(struct ems_cpc_msg), GFP_KERNEL); | 1050 | sizeof(struct ems_cpc_msg), GFP_KERNEL); |
| 1051 | if (!dev->tx_msg_buffer) { | 1051 | if (!dev->tx_msg_buffer) { |
| 1052 | dev_err(netdev->dev.parent, "Couldn't alloc Tx buffer\n"); | 1052 | dev_err(&intf->dev, "Couldn't alloc Tx buffer\n"); |
| 1053 | goto cleanup_intr_in_buffer; | 1053 | goto cleanup_intr_in_buffer; |
| 1054 | } | 1054 | } |
| 1055 | 1055 | ||
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c index 5248f9e0b2f4..35cd36729155 100644 --- a/drivers/net/cxgb3/ael1002.c +++ b/drivers/net/cxgb3/ael1002.c | |||
| @@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = { | |||
| 934 | int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter, | 934 | int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter, |
| 935 | int phy_addr, const struct mdio_ops *mdio_ops) | 935 | int phy_addr, const struct mdio_ops *mdio_ops) |
| 936 | { | 936 | { |
| 937 | cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops, | 937 | cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops, |
| 938 | SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP, | 938 | SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP, |
| 939 | "10GBASE-CX4"); | 939 | "10GBASE-CX4"); |
| 940 | return 0; | 940 | return 0; |
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index aced6c5e635c..e3f1b8566495 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
| @@ -439,7 +439,7 @@ static void free_irq_resources(struct adapter *adapter) | |||
| 439 | static int await_mgmt_replies(struct adapter *adap, unsigned long init_cnt, | 439 | static int await_mgmt_replies(struct adapter *adap, unsigned long init_cnt, |
| 440 | unsigned long n) | 440 | unsigned long n) |
| 441 | { | 441 | { |
| 442 | int attempts = 5; | 442 | int attempts = 10; |
| 443 | 443 | ||
| 444 | while (adap->sge.qs[0].rspq.offload_pkts < init_cnt + n) { | 444 | while (adap->sge.qs[0].rspq.offload_pkts < init_cnt + n) { |
| 445 | if (!--attempts) | 445 | if (!--attempts) |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index b997e578e58f..791080303db1 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -166,6 +166,7 @@ | |||
| 166 | #include <linux/ethtool.h> | 166 | #include <linux/ethtool.h> |
| 167 | #include <linux/string.h> | 167 | #include <linux/string.h> |
| 168 | #include <linux/firmware.h> | 168 | #include <linux/firmware.h> |
| 169 | #include <linux/rtnetlink.h> | ||
| 169 | #include <asm/unaligned.h> | 170 | #include <asm/unaligned.h> |
| 170 | 171 | ||
| 171 | 172 | ||
| @@ -2265,8 +2266,13 @@ static void e100_tx_timeout_task(struct work_struct *work) | |||
| 2265 | 2266 | ||
| 2266 | DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n", | 2267 | DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n", |
| 2267 | ioread8(&nic->csr->scb.status)); | 2268 | ioread8(&nic->csr->scb.status)); |
| 2268 | e100_down(netdev_priv(netdev)); | 2269 | |
| 2269 | e100_up(netdev_priv(netdev)); | 2270 | rtnl_lock(); |
| 2271 | if (netif_running(netdev)) { | ||
| 2272 | e100_down(netdev_priv(netdev)); | ||
| 2273 | e100_up(netdev_priv(netdev)); | ||
| 2274 | } | ||
| 2275 | rtnl_unlock(); | ||
| 2270 | } | 2276 | } |
| 2271 | 2277 | ||
| 2272 | static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) | 2278 | static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) |
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index 712ccc66ba25..90155552ea09 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c | |||
| @@ -336,7 +336,6 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter) | |||
| 336 | struct e1000_hw *hw = &adapter->hw; | 336 | struct e1000_hw *hw = &adapter->hw; |
| 337 | static int global_quad_port_a; /* global port a indication */ | 337 | static int global_quad_port_a; /* global port a indication */ |
| 338 | struct pci_dev *pdev = adapter->pdev; | 338 | struct pci_dev *pdev = adapter->pdev; |
| 339 | u16 eeprom_data = 0; | ||
| 340 | int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; | 339 | int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; |
| 341 | s32 rc; | 340 | s32 rc; |
| 342 | 341 | ||
| @@ -387,16 +386,15 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter) | |||
| 387 | if (pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) | 386 | if (pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) |
| 388 | adapter->flags &= ~FLAG_HAS_WOL; | 387 | adapter->flags &= ~FLAG_HAS_WOL; |
| 389 | break; | 388 | break; |
| 390 | |||
| 391 | case e1000_82573: | 389 | case e1000_82573: |
| 390 | case e1000_82574: | ||
| 391 | case e1000_82583: | ||
| 392 | /* Disable ASPM L0s due to hardware errata */ | ||
| 393 | e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L0S); | ||
| 394 | |||
| 392 | if (pdev->device == E1000_DEV_ID_82573L) { | 395 | if (pdev->device == E1000_DEV_ID_82573L) { |
| 393 | if (e1000_read_nvm(&adapter->hw, NVM_INIT_3GIO_3, 1, | 396 | adapter->flags |= FLAG_HAS_JUMBO_FRAMES; |
| 394 | &eeprom_data) < 0) | 397 | adapter->max_hw_frame_size = DEFAULT_JUMBO; |
| 395 | break; | ||
| 396 | if (!(eeprom_data & NVM_WORD1A_ASPM_MASK)) { | ||
| 397 | adapter->flags |= FLAG_HAS_JUMBO_FRAMES; | ||
| 398 | adapter->max_hw_frame_size = DEFAULT_JUMBO; | ||
| 399 | } | ||
| 400 | } | 398 | } |
| 401 | break; | 399 | break; |
| 402 | default: | 400 | default: |
| @@ -1792,6 +1790,7 @@ struct e1000_info e1000_82571_info = { | |||
| 1792 | | FLAG_RESET_OVERWRITES_LAA /* errata */ | 1790 | | FLAG_RESET_OVERWRITES_LAA /* errata */ |
| 1793 | | FLAG_TARC_SPEED_MODE_BIT /* errata */ | 1791 | | FLAG_TARC_SPEED_MODE_BIT /* errata */ |
| 1794 | | FLAG_APME_CHECK_PORT_B, | 1792 | | FLAG_APME_CHECK_PORT_B, |
| 1793 | .flags2 = FLAG2_DISABLE_ASPM_L1, /* errata 13 */ | ||
| 1795 | .pba = 38, | 1794 | .pba = 38, |
| 1796 | .max_hw_frame_size = DEFAULT_JUMBO, | 1795 | .max_hw_frame_size = DEFAULT_JUMBO, |
| 1797 | .get_variants = e1000_get_variants_82571, | 1796 | .get_variants = e1000_get_variants_82571, |
| @@ -1809,6 +1808,7 @@ struct e1000_info e1000_82572_info = { | |||
| 1809 | | FLAG_RX_CSUM_ENABLED | 1808 | | FLAG_RX_CSUM_ENABLED |
| 1810 | | FLAG_HAS_CTRLEXT_ON_LOAD | 1809 | | FLAG_HAS_CTRLEXT_ON_LOAD |
| 1811 | | FLAG_TARC_SPEED_MODE_BIT, /* errata */ | 1810 | | FLAG_TARC_SPEED_MODE_BIT, /* errata */ |
| 1811 | .flags2 = FLAG2_DISABLE_ASPM_L1, /* errata 13 */ | ||
| 1812 | .pba = 38, | 1812 | .pba = 38, |
| 1813 | .max_hw_frame_size = DEFAULT_JUMBO, | 1813 | .max_hw_frame_size = DEFAULT_JUMBO, |
| 1814 | .get_variants = e1000_get_variants_82571, | 1814 | .get_variants = e1000_get_variants_82571, |
| @@ -1820,13 +1820,11 @@ struct e1000_info e1000_82572_info = { | |||
| 1820 | struct e1000_info e1000_82573_info = { | 1820 | struct e1000_info e1000_82573_info = { |
| 1821 | .mac = e1000_82573, | 1821 | .mac = e1000_82573, |
| 1822 | .flags = FLAG_HAS_HW_VLAN_FILTER | 1822 | .flags = FLAG_HAS_HW_VLAN_FILTER |
| 1823 | | FLAG_HAS_JUMBO_FRAMES | ||
| 1824 | | FLAG_HAS_WOL | 1823 | | FLAG_HAS_WOL |
| 1825 | | FLAG_APME_IN_CTRL3 | 1824 | | FLAG_APME_IN_CTRL3 |
| 1826 | | FLAG_RX_CSUM_ENABLED | 1825 | | FLAG_RX_CSUM_ENABLED |
| 1827 | | FLAG_HAS_SMART_POWER_DOWN | 1826 | | FLAG_HAS_SMART_POWER_DOWN |
| 1828 | | FLAG_HAS_AMT | 1827 | | FLAG_HAS_AMT |
| 1829 | | FLAG_HAS_ERT | ||
| 1830 | | FLAG_HAS_SWSM_ON_LOAD, | 1828 | | FLAG_HAS_SWSM_ON_LOAD, |
| 1831 | .pba = 20, | 1829 | .pba = 20, |
| 1832 | .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, | 1830 | .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, |
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index 118bdf483593..ee32b9b27a9f 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
| 38 | #include <linux/netdevice.h> | 38 | #include <linux/netdevice.h> |
| 39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
| 40 | #include <linux/pci-aspm.h> | ||
| 40 | 41 | ||
| 41 | #include "hw.h" | 42 | #include "hw.h" |
| 42 | 43 | ||
| @@ -374,7 +375,7 @@ struct e1000_adapter { | |||
| 374 | struct e1000_info { | 375 | struct e1000_info { |
| 375 | enum e1000_mac_type mac; | 376 | enum e1000_mac_type mac; |
| 376 | unsigned int flags; | 377 | unsigned int flags; |
| 377 | unsigned int flags2; | 378 | unsigned int flags2; |
| 378 | u32 pba; | 379 | u32 pba; |
| 379 | u32 max_hw_frame_size; | 380 | u32 max_hw_frame_size; |
| 380 | s32 (*get_variants)(struct e1000_adapter *); | 381 | s32 (*get_variants)(struct e1000_adapter *); |
| @@ -421,6 +422,7 @@ struct e1000_info { | |||
| 421 | #define FLAG2_CRC_STRIPPING (1 << 0) | 422 | #define FLAG2_CRC_STRIPPING (1 << 0) |
| 422 | #define FLAG2_HAS_PHY_WAKEUP (1 << 1) | 423 | #define FLAG2_HAS_PHY_WAKEUP (1 << 1) |
| 423 | #define FLAG2_IS_DISCARDING (1 << 2) | 424 | #define FLAG2_IS_DISCARDING (1 << 2) |
| 425 | #define FLAG2_DISABLE_ASPM_L1 (1 << 3) | ||
| 424 | 426 | ||
| 425 | #define E1000_RX_DESC_PS(R, i) \ | 427 | #define E1000_RX_DESC_PS(R, i) \ |
| 426 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) | 428 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) |
| @@ -461,6 +463,7 @@ extern void e1000e_update_stats(struct e1000_adapter *adapter); | |||
| 461 | extern bool e1000e_has_link(struct e1000_adapter *adapter); | 463 | extern bool e1000e_has_link(struct e1000_adapter *adapter); |
| 462 | extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter); | 464 | extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter); |
| 463 | extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter); | 465 | extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter); |
| 466 | extern void e1000e_disable_aspm(struct pci_dev *pdev, u16 state); | ||
| 464 | 467 | ||
| 465 | extern unsigned int copybreak; | 468 | extern unsigned int copybreak; |
| 466 | 469 | ||
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 73d43c53015a..dbf81788bb40 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -4283,6 +4283,14 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) | |||
| 4283 | return -EINVAL; | 4283 | return -EINVAL; |
| 4284 | } | 4284 | } |
| 4285 | 4285 | ||
| 4286 | /* 82573 Errata 17 */ | ||
| 4287 | if (((adapter->hw.mac.type == e1000_82573) || | ||
| 4288 | (adapter->hw.mac.type == e1000_82574)) && | ||
| 4289 | (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) { | ||
| 4290 | adapter->flags2 |= FLAG2_DISABLE_ASPM_L1; | ||
| 4291 | e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1); | ||
| 4292 | } | ||
| 4293 | |||
| 4286 | while (test_and_set_bit(__E1000_RESETTING, &adapter->state)) | 4294 | while (test_and_set_bit(__E1000_RESETTING, &adapter->state)) |
| 4287 | msleep(1); | 4295 | msleep(1); |
| 4288 | /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */ | 4296 | /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */ |
| @@ -4605,29 +4613,42 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep, | |||
| 4605 | } | 4613 | } |
| 4606 | } | 4614 | } |
| 4607 | 4615 | ||
| 4608 | static void e1000e_disable_l1aspm(struct pci_dev *pdev) | 4616 | #ifdef CONFIG_PCIEASPM |
| 4617 | static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state) | ||
| 4618 | { | ||
| 4619 | pci_disable_link_state(pdev, state); | ||
| 4620 | } | ||
| 4621 | #else | ||
| 4622 | static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state) | ||
| 4609 | { | 4623 | { |
| 4610 | int pos; | 4624 | int pos; |
| 4611 | u16 val; | 4625 | u16 reg16; |
| 4612 | 4626 | ||
| 4613 | /* | 4627 | /* |
| 4614 | * 82573 workaround - disable L1 ASPM on mobile chipsets | 4628 | * Both device and parent should have the same ASPM setting. |
| 4615 | * | 4629 | * Disable ASPM in downstream component first and then upstream. |
| 4616 | * L1 ASPM on various mobile (ich7) chipsets do not behave properly | ||
| 4617 | * resulting in lost data or garbage information on the pci-e link | ||
| 4618 | * level. This could result in (false) bad EEPROM checksum errors, | ||
| 4619 | * long ping times (up to 2s) or even a system freeze/hang. | ||
| 4620 | * | ||
| 4621 | * Unfortunately this feature saves about 1W power consumption when | ||
| 4622 | * active. | ||
| 4623 | */ | 4630 | */ |
| 4624 | pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); | 4631 | pos = pci_pcie_cap(pdev); |
| 4625 | pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &val); | 4632 | pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, ®16); |
| 4626 | if (val & 0x2) { | 4633 | reg16 &= ~state; |
| 4627 | dev_warn(&pdev->dev, "Disabling L1 ASPM\n"); | 4634 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16); |
| 4628 | val &= ~0x2; | 4635 | |
| 4629 | pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, val); | 4636 | if (!pdev->bus->self) |
| 4630 | } | 4637 | return; |
| 4638 | |||
| 4639 | pos = pci_pcie_cap(pdev->bus->self); | ||
| 4640 | pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, ®16); | ||
| 4641 | reg16 &= ~state; | ||
| 4642 | pci_write_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, reg16); | ||
| 4643 | } | ||
| 4644 | #endif | ||
| 4645 | void e1000e_disable_aspm(struct pci_dev *pdev, u16 state) | ||
| 4646 | { | ||
| 4647 | dev_info(&pdev->dev, "Disabling ASPM %s %s\n", | ||
| 4648 | (state & PCIE_LINK_STATE_L0S) ? "L0s" : "", | ||
| 4649 | (state & PCIE_LINK_STATE_L1) ? "L1" : ""); | ||
| 4650 | |||
| 4651 | __e1000e_disable_aspm(pdev, state); | ||
| 4631 | } | 4652 | } |
| 4632 | 4653 | ||
| 4633 | #ifdef CONFIG_PM | 4654 | #ifdef CONFIG_PM |
| @@ -4653,7 +4674,8 @@ static int e1000_resume(struct pci_dev *pdev) | |||
| 4653 | pci_set_power_state(pdev, PCI_D0); | 4674 | pci_set_power_state(pdev, PCI_D0); |
| 4654 | pci_restore_state(pdev); | 4675 | pci_restore_state(pdev); |
| 4655 | pci_save_state(pdev); | 4676 | pci_save_state(pdev); |
| 4656 | e1000e_disable_l1aspm(pdev); | 4677 | if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1) |
| 4678 | e1000e_disable_aspm(pdev, PCIE_LINK_STATE_L1); | ||
| 4657 | 4679 | ||
| 4658 | err = pci_enable_device_mem(pdev); | 4680 | err = pci_enable_device_mem(pdev); |
| 4659 | if (err) { | 4681 | if (err) { |
| @@ -4795,7 +4817,8 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) | |||
| 4795 | int err; | 4817 | int err; |
| 4796 | pci_ers_result_t result; | 4818 | pci_ers_result_t result; |
| 4797 | 4819 | ||
| 4798 | e1000e_disable_l1aspm(pdev); | 4820 | if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1) |
| 4821 | e1000e_disable_aspm(pdev, PCIE_LINK_STATE_L1); | ||
| 4799 | err = pci_enable_device_mem(pdev); | 4822 | err = pci_enable_device_mem(pdev); |
| 4800 | if (err) { | 4823 | if (err) { |
| 4801 | dev_err(&pdev->dev, | 4824 | dev_err(&pdev->dev, |
| @@ -4889,13 +4912,6 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter) | |||
| 4889 | dev_warn(&adapter->pdev->dev, | 4912 | dev_warn(&adapter->pdev->dev, |
| 4890 | "Warning: detected DSPD enabled in EEPROM\n"); | 4913 | "Warning: detected DSPD enabled in EEPROM\n"); |
| 4891 | } | 4914 | } |
| 4892 | |||
| 4893 | ret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &buf); | ||
| 4894 | if (!ret_val && (le16_to_cpu(buf) & (3 << 2))) { | ||
| 4895 | /* ASPM enable */ | ||
| 4896 | dev_warn(&adapter->pdev->dev, | ||
| 4897 | "Warning: detected ASPM enabled in EEPROM\n"); | ||
| 4898 | } | ||
| 4899 | } | 4915 | } |
| 4900 | 4916 | ||
| 4901 | static const struct net_device_ops e1000e_netdev_ops = { | 4917 | static const struct net_device_ops e1000e_netdev_ops = { |
| @@ -4944,7 +4960,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
| 4944 | u16 eeprom_data = 0; | 4960 | u16 eeprom_data = 0; |
| 4945 | u16 eeprom_apme_mask = E1000_EEPROM_APME; | 4961 | u16 eeprom_apme_mask = E1000_EEPROM_APME; |
| 4946 | 4962 | ||
| 4947 | e1000e_disable_l1aspm(pdev); | 4963 | if (ei->flags2 & FLAG2_DISABLE_ASPM_L1) |
| 4964 | e1000e_disable_aspm(pdev, PCIE_LINK_STATE_L1); | ||
| 4948 | 4965 | ||
| 4949 | err = pci_enable_device_mem(pdev); | 4966 | err = pci_enable_device_mem(pdev); |
| 4950 | if (err) | 4967 | if (err) |
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 9f98c1c4a344..9b4e8f797a7a 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -1653,7 +1653,7 @@ fec_set_mac_address(struct net_device *dev, void *p) | |||
| 1653 | (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), | 1653 | (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), |
| 1654 | fep->hwp + FEC_ADDR_LOW); | 1654 | fep->hwp + FEC_ADDR_LOW); |
| 1655 | writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), | 1655 | writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), |
| 1656 | fep + FEC_ADDR_HIGH); | 1656 | fep->hwp + FEC_ADDR_HIGH); |
| 1657 | return 0; | 1657 | return 0; |
| 1658 | } | 1658 | } |
| 1659 | 1659 | ||
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c index d5160edf2fcf..3acac5f930c8 100644 --- a/drivers/net/fsl_pq_mdio.c +++ b/drivers/net/fsl_pq_mdio.c | |||
| @@ -205,8 +205,6 @@ static int fsl_pq_mdio_find_free(struct mii_bus *new_bus) | |||
| 205 | static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct device_node *np) | 205 | static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct device_node *np) |
| 206 | { | 206 | { |
| 207 | struct gfar __iomem *enet_regs; | 207 | struct gfar __iomem *enet_regs; |
| 208 | u32 __iomem *ioremap_tbipa; | ||
| 209 | u64 addr, size; | ||
| 210 | 208 | ||
| 211 | /* | 209 | /* |
| 212 | * This is mildly evil, but so is our hardware for doing this. | 210 | * This is mildly evil, but so is our hardware for doing this. |
| @@ -220,9 +218,7 @@ static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct devi | |||
| 220 | return &enet_regs->tbipa; | 218 | return &enet_regs->tbipa; |
| 221 | } else if (of_device_is_compatible(np, "fsl,etsec2-mdio") || | 219 | } else if (of_device_is_compatible(np, "fsl,etsec2-mdio") || |
| 222 | of_device_is_compatible(np, "fsl,etsec2-tbi")) { | 220 | of_device_is_compatible(np, "fsl,etsec2-tbi")) { |
| 223 | addr = of_translate_address(np, of_get_address(np, 1, &size, NULL)); | 221 | return of_iomap(np, 1); |
| 224 | ioremap_tbipa = ioremap(addr, size); | ||
| 225 | return ioremap_tbipa; | ||
| 226 | } else | 222 | } else |
| 227 | return NULL; | 223 | return NULL; |
| 228 | } | 224 | } |
| @@ -279,6 +275,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, | |||
| 279 | u32 __iomem *tbipa; | 275 | u32 __iomem *tbipa; |
| 280 | struct mii_bus *new_bus; | 276 | struct mii_bus *new_bus; |
| 281 | int tbiaddr = -1; | 277 | int tbiaddr = -1; |
| 278 | const u32 *addrp; | ||
| 282 | u64 addr = 0, size = 0; | 279 | u64 addr = 0, size = 0; |
| 283 | int err = 0; | 280 | int err = 0; |
| 284 | 281 | ||
| @@ -297,8 +294,19 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, | |||
| 297 | new_bus->priv = priv; | 294 | new_bus->priv = priv; |
| 298 | fsl_pq_mdio_bus_name(new_bus->id, np); | 295 | fsl_pq_mdio_bus_name(new_bus->id, np); |
| 299 | 296 | ||
| 297 | addrp = of_get_address(np, 0, &size, NULL); | ||
| 298 | if (!addrp) { | ||
| 299 | err = -EINVAL; | ||
| 300 | goto err_free_bus; | ||
| 301 | } | ||
| 302 | |||
| 300 | /* Set the PHY base address */ | 303 | /* Set the PHY base address */ |
| 301 | addr = of_translate_address(np, of_get_address(np, 0, &size, NULL)); | 304 | addr = of_translate_address(np, addrp); |
| 305 | if (addr == OF_BAD_ADDR) { | ||
| 306 | err = -EINVAL; | ||
| 307 | goto err_free_bus; | ||
| 308 | } | ||
| 309 | |||
| 302 | map = ioremap(addr, size); | 310 | map = ioremap(addr, size); |
| 303 | if (!map) { | 311 | if (!map) { |
| 304 | err = -ENOMEM; | 312 | err = -ENOMEM; |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 080d1cea5b26..4e97ca182997 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -549,12 +549,8 @@ static int gfar_parse_group(struct device_node *np, | |||
| 549 | struct gfar_private *priv, const char *model) | 549 | struct gfar_private *priv, const char *model) |
| 550 | { | 550 | { |
| 551 | u32 *queue_mask; | 551 | u32 *queue_mask; |
| 552 | u64 addr, size; | ||
| 553 | |||
| 554 | addr = of_translate_address(np, | ||
| 555 | of_get_address(np, 0, &size, NULL)); | ||
| 556 | priv->gfargrp[priv->num_grps].regs = ioremap(addr, size); | ||
| 557 | 552 | ||
| 553 | priv->gfargrp[priv->num_grps].regs = of_iomap(np, 0); | ||
| 558 | if (!priv->gfargrp[priv->num_grps].regs) | 554 | if (!priv->gfargrp[priv->num_grps].regs) |
| 559 | return -ENOMEM; | 555 | return -ENOMEM; |
| 560 | 556 | ||
| @@ -1515,9 +1511,9 @@ static void gfar_halt_nodisable(struct net_device *dev) | |||
| 1515 | tempval |= (DMACTRL_GRS | DMACTRL_GTS); | 1511 | tempval |= (DMACTRL_GRS | DMACTRL_GTS); |
| 1516 | gfar_write(®s->dmactrl, tempval); | 1512 | gfar_write(®s->dmactrl, tempval); |
| 1517 | 1513 | ||
| 1518 | while (!(gfar_read(®s->ievent) & | 1514 | spin_event_timeout(((gfar_read(®s->ievent) & |
| 1519 | (IEVENT_GRSC | IEVENT_GTSC))) | 1515 | (IEVENT_GRSC | IEVENT_GTSC)) == |
| 1520 | cpu_relax(); | 1516 | (IEVENT_GRSC | IEVENT_GTSC)), -1, 0); |
| 1521 | } | 1517 | } |
| 1522 | } | 1518 | } |
| 1523 | 1519 | ||
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index b405a00817c6..12fc0e7ba2ca 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | #define IXGBE_82599_MC_TBL_SIZE 128 | 39 | #define IXGBE_82599_MC_TBL_SIZE 128 |
| 40 | #define IXGBE_82599_VFT_TBL_SIZE 128 | 40 | #define IXGBE_82599_VFT_TBL_SIZE 128 |
| 41 | 41 | ||
| 42 | void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); | ||
| 43 | void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); | ||
| 42 | void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); | 44 | void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); |
| 43 | s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, | 45 | s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, |
| 44 | ixgbe_link_speed speed, | 46 | ixgbe_link_speed speed, |
| @@ -69,8 +71,14 @@ static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw) | |||
| 69 | if (hw->phy.multispeed_fiber) { | 71 | if (hw->phy.multispeed_fiber) { |
| 70 | /* Set up dual speed SFP+ support */ | 72 | /* Set up dual speed SFP+ support */ |
| 71 | mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber; | 73 | mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber; |
| 74 | mac->ops.disable_tx_laser = | ||
| 75 | &ixgbe_disable_tx_laser_multispeed_fiber; | ||
| 76 | mac->ops.enable_tx_laser = | ||
| 77 | &ixgbe_enable_tx_laser_multispeed_fiber; | ||
| 72 | mac->ops.flap_tx_laser = &ixgbe_flap_tx_laser_multispeed_fiber; | 78 | mac->ops.flap_tx_laser = &ixgbe_flap_tx_laser_multispeed_fiber; |
| 73 | } else { | 79 | } else { |
| 80 | mac->ops.disable_tx_laser = NULL; | ||
| 81 | mac->ops.enable_tx_laser = NULL; | ||
| 74 | mac->ops.flap_tx_laser = NULL; | 82 | mac->ops.flap_tx_laser = NULL; |
| 75 | if ((mac->ops.get_media_type(hw) == | 83 | if ((mac->ops.get_media_type(hw) == |
| 76 | ixgbe_media_type_backplane) && | 84 | ixgbe_media_type_backplane) && |
| @@ -415,6 +423,44 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, | |||
| 415 | return status; | 423 | return status; |
| 416 | } | 424 | } |
| 417 | 425 | ||
| 426 | /** | ||
| 427 | * ixgbe_disable_tx_laser_multispeed_fiber - Disable Tx laser | ||
| 428 | * @hw: pointer to hardware structure | ||
| 429 | * | ||
| 430 | * The base drivers may require better control over SFP+ module | ||
| 431 | * PHY states. This includes selectively shutting down the Tx | ||
| 432 | * laser on the PHY, effectively halting physical link. | ||
| 433 | **/ | ||
| 434 | void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) | ||
| 435 | { | ||
| 436 | u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP); | ||
| 437 | |||
| 438 | /* Disable tx laser; allow 100us to go dark per spec */ | ||
| 439 | esdp_reg |= IXGBE_ESDP_SDP3; | ||
| 440 | IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg); | ||
| 441 | IXGBE_WRITE_FLUSH(hw); | ||
| 442 | udelay(100); | ||
| 443 | } | ||
| 444 | |||
| 445 | /** | ||
| 446 | * ixgbe_enable_tx_laser_multispeed_fiber - Enable Tx laser | ||
| 447 | * @hw: pointer to hardware structure | ||
| 448 | * | ||
| 449 | * The base drivers may require better control over SFP+ module | ||
| 450 | * PHY states. This includes selectively turning on the Tx | ||
| 451 | * laser on the PHY, effectively starting physical link. | ||
| 452 | **/ | ||
| 453 | void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) | ||
| 454 | { | ||
| 455 | u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP); | ||
| 456 | |||
| 457 | /* Enable tx laser; allow 100ms to light up */ | ||
| 458 | esdp_reg &= ~IXGBE_ESDP_SDP3; | ||
| 459 | IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg); | ||
| 460 | IXGBE_WRITE_FLUSH(hw); | ||
| 461 | msleep(100); | ||
| 462 | } | ||
| 463 | |||
| 418 | /** | 464 | /** |
| 419 | * ixgbe_flap_tx_laser_multispeed_fiber - Flap Tx laser | 465 | * ixgbe_flap_tx_laser_multispeed_fiber - Flap Tx laser |
| 420 | * @hw: pointer to hardware structure | 466 | * @hw: pointer to hardware structure |
| @@ -429,23 +475,11 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, | |||
| 429 | **/ | 475 | **/ |
| 430 | void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) | 476 | void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) |
| 431 | { | 477 | { |
| 432 | u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP); | ||
| 433 | |||
| 434 | hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n"); | 478 | hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n"); |
| 435 | 479 | ||
| 436 | if (hw->mac.autotry_restart) { | 480 | if (hw->mac.autotry_restart) { |
| 437 | /* Disable tx laser; allow 100us to go dark per spec */ | 481 | ixgbe_disable_tx_laser_multispeed_fiber(hw); |
| 438 | esdp_reg |= IXGBE_ESDP_SDP3; | 482 | ixgbe_enable_tx_laser_multispeed_fiber(hw); |
| 439 | IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg); | ||
| 440 | IXGBE_WRITE_FLUSH(hw); | ||
| 441 | udelay(100); | ||
| 442 | |||
| 443 | /* Enable tx laser; allow 100ms to light up */ | ||
| 444 | esdp_reg &= ~IXGBE_ESDP_SDP3; | ||
| 445 | IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg); | ||
| 446 | IXGBE_WRITE_FLUSH(hw); | ||
| 447 | msleep(100); | ||
| 448 | |||
| 449 | hw->mac.autotry_restart = false; | 483 | hw->mac.autotry_restart = false; |
| 450 | } | 484 | } |
| 451 | } | 485 | } |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 8f677cb86290..6c00ee493a3b 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -2982,6 +2982,10 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter) | |||
| 2982 | else | 2982 | else |
| 2983 | ixgbe_configure_msi_and_legacy(adapter); | 2983 | ixgbe_configure_msi_and_legacy(adapter); |
| 2984 | 2984 | ||
| 2985 | /* enable the optics */ | ||
| 2986 | if (hw->phy.multispeed_fiber) | ||
| 2987 | hw->mac.ops.enable_tx_laser(hw); | ||
| 2988 | |||
| 2985 | clear_bit(__IXGBE_DOWN, &adapter->state); | 2989 | clear_bit(__IXGBE_DOWN, &adapter->state); |
| 2986 | ixgbe_napi_enable_all(adapter); | 2990 | ixgbe_napi_enable_all(adapter); |
| 2987 | 2991 | ||
| @@ -3243,6 +3247,10 @@ void ixgbe_down(struct ixgbe_adapter *adapter) | |||
| 3243 | /* signal that we are down to the interrupt handler */ | 3247 | /* signal that we are down to the interrupt handler */ |
| 3244 | set_bit(__IXGBE_DOWN, &adapter->state); | 3248 | set_bit(__IXGBE_DOWN, &adapter->state); |
| 3245 | 3249 | ||
| 3250 | /* power down the optics */ | ||
| 3251 | if (hw->phy.multispeed_fiber) | ||
| 3252 | hw->mac.ops.disable_tx_laser(hw); | ||
| 3253 | |||
| 3246 | /* disable receive for all VFs and wait one second */ | 3254 | /* disable receive for all VFs and wait one second */ |
| 3247 | if (adapter->num_vfs) { | 3255 | if (adapter->num_vfs) { |
| 3248 | /* ping all the active vfs to let them know we are going down */ | 3256 | /* ping all the active vfs to let them know we are going down */ |
| @@ -6253,6 +6261,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
| 6253 | goto err_eeprom; | 6261 | goto err_eeprom; |
| 6254 | } | 6262 | } |
| 6255 | 6263 | ||
| 6264 | /* power down the optics */ | ||
| 6265 | if (hw->phy.multispeed_fiber) | ||
| 6266 | hw->mac.ops.disable_tx_laser(hw); | ||
| 6267 | |||
| 6256 | init_timer(&adapter->watchdog_timer); | 6268 | init_timer(&adapter->watchdog_timer); |
| 6257 | adapter->watchdog_timer.function = &ixgbe_watchdog; | 6269 | adapter->watchdog_timer.function = &ixgbe_watchdog; |
| 6258 | adapter->watchdog_timer.data = (unsigned long)adapter; | 6270 | adapter->watchdog_timer.data = (unsigned long)adapter; |
| @@ -6400,16 +6412,6 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) | |||
| 6400 | del_timer_sync(&adapter->sfp_timer); | 6412 | del_timer_sync(&adapter->sfp_timer); |
| 6401 | cancel_work_sync(&adapter->watchdog_task); | 6413 | cancel_work_sync(&adapter->watchdog_task); |
| 6402 | cancel_work_sync(&adapter->sfp_task); | 6414 | cancel_work_sync(&adapter->sfp_task); |
| 6403 | if (adapter->hw.phy.multispeed_fiber) { | ||
| 6404 | struct ixgbe_hw *hw = &adapter->hw; | ||
| 6405 | /* | ||
| 6406 | * Restart clause 37 autoneg, disable and re-enable | ||
| 6407 | * the tx laser, to clear & alert the link partner | ||
| 6408 | * that it needs to restart autotry | ||
| 6409 | */ | ||
| 6410 | hw->mac.autotry_restart = true; | ||
| 6411 | hw->mac.ops.flap_tx_laser(hw); | ||
| 6412 | } | ||
| 6413 | cancel_work_sync(&adapter->multispeed_fiber_task); | 6415 | cancel_work_sync(&adapter->multispeed_fiber_task); |
| 6414 | cancel_work_sync(&adapter->sfp_config_module_task); | 6416 | cancel_work_sync(&adapter->sfp_config_module_task); |
| 6415 | if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE || | 6417 | if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE || |
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h index 4ec6dc1a5b75..534affcc38ca 100644 --- a/drivers/net/ixgbe/ixgbe_type.h +++ b/drivers/net/ixgbe/ixgbe_type.h | |||
| @@ -2398,6 +2398,8 @@ struct ixgbe_mac_operations { | |||
| 2398 | s32 (*enable_rx_dma)(struct ixgbe_hw *, u32); | 2398 | s32 (*enable_rx_dma)(struct ixgbe_hw *, u32); |
| 2399 | 2399 | ||
| 2400 | /* Link */ | 2400 | /* Link */ |
| 2401 | void (*disable_tx_laser)(struct ixgbe_hw *); | ||
| 2402 | void (*enable_tx_laser)(struct ixgbe_hw *); | ||
| 2401 | void (*flap_tx_laser)(struct ixgbe_hw *); | 2403 | void (*flap_tx_laser)(struct ixgbe_hw *); |
| 2402 | s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool, bool); | 2404 | s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool, bool); |
| 2403 | s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool); | 2405 | s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool); |
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c index 13cc1ca261d9..9e9f9b349766 100644 --- a/drivers/net/ks8851.c +++ b/drivers/net/ks8851.c | |||
| @@ -722,12 +722,14 @@ static void ks8851_tx_work(struct work_struct *work) | |||
| 722 | txb = skb_dequeue(&ks->txq); | 722 | txb = skb_dequeue(&ks->txq); |
| 723 | last = skb_queue_empty(&ks->txq); | 723 | last = skb_queue_empty(&ks->txq); |
| 724 | 724 | ||
| 725 | ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); | 725 | if (txb != NULL) { |
| 726 | ks8851_wrpkt(ks, txb, last); | 726 | ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); |
| 727 | ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); | 727 | ks8851_wrpkt(ks, txb, last); |
| 728 | ks8851_wrreg16(ks, KS_TXQCR, TXQCR_METFE); | 728 | ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); |
| 729 | ks8851_wrreg16(ks, KS_TXQCR, TXQCR_METFE); | ||
| 729 | 730 | ||
| 730 | ks8851_done_tx(ks, txb); | 731 | ks8851_done_tx(ks, txb); |
| 732 | } | ||
| 731 | } | 733 | } |
| 732 | 734 | ||
| 733 | mutex_unlock(&ks->lock); | 735 | mutex_unlock(&ks->lock); |
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 3d1d3a7b7ed3..757f87bb1db3 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
| @@ -781,8 +781,13 @@ static netdev_tx_t el3_start_xmit(struct sk_buff *skb, | |||
| 781 | inw(ioaddr + EL3_STATUS)); | 781 | inw(ioaddr + EL3_STATUS)); |
| 782 | 782 | ||
| 783 | spin_lock_irqsave(&lp->window_lock, flags); | 783 | spin_lock_irqsave(&lp->window_lock, flags); |
| 784 | |||
| 785 | dev->stats.tx_bytes += skb->len; | ||
| 786 | |||
| 787 | /* Put out the doubleword header... */ | ||
| 784 | outw(skb->len, ioaddr + TX_FIFO); | 788 | outw(skb->len, ioaddr + TX_FIFO); |
| 785 | outw(0, ioaddr + TX_FIFO); | 789 | outw(0, ioaddr + TX_FIFO); |
| 790 | /* ... and the packet rounded to a doubleword. */ | ||
| 786 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len+3)>>2); | 791 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len+3)>>2); |
| 787 | 792 | ||
| 788 | dev->trans_start = jiffies; | 793 | dev->trans_start = jiffies; |
| @@ -1021,8 +1026,6 @@ static void update_stats(struct net_device *dev) | |||
| 1021 | /* BadSSD */ inb(ioaddr + 12); | 1026 | /* BadSSD */ inb(ioaddr + 12); |
| 1022 | up = inb(ioaddr + 13); | 1027 | up = inb(ioaddr + 13); |
| 1023 | 1028 | ||
| 1024 | dev->stats.tx_bytes += tx + ((up & 0xf0) << 12); | ||
| 1025 | |||
| 1026 | EL3WINDOW(1); | 1029 | EL3WINDOW(1); |
| 1027 | } | 1030 | } |
| 1028 | 1031 | ||
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index fd9d6e34fda4..ccc553782a0d 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
| @@ -1804,23 +1804,30 @@ static void media_check(u_long arg) | |||
| 1804 | SMC_SELECT_BANK(1); | 1804 | SMC_SELECT_BANK(1); |
| 1805 | media |= (inw(ioaddr + CONFIG) & CFG_AUI_SELECT) ? 2 : 1; | 1805 | media |= (inw(ioaddr + CONFIG) & CFG_AUI_SELECT) ? 2 : 1; |
| 1806 | 1806 | ||
| 1807 | SMC_SELECT_BANK(saved_bank); | ||
| 1808 | spin_unlock_irqrestore(&smc->lock, flags); | ||
| 1809 | |||
| 1807 | /* Check for pending interrupt with watchdog flag set: with | 1810 | /* Check for pending interrupt with watchdog flag set: with |
| 1808 | this, we can limp along even if the interrupt is blocked */ | 1811 | this, we can limp along even if the interrupt is blocked */ |
| 1809 | if (smc->watchdog++ && ((i>>8) & i)) { | 1812 | if (smc->watchdog++ && ((i>>8) & i)) { |
| 1810 | if (!smc->fast_poll) | 1813 | if (!smc->fast_poll) |
| 1811 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); | 1814 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); |
| 1815 | local_irq_save(flags); | ||
| 1812 | smc_interrupt(dev->irq, dev); | 1816 | smc_interrupt(dev->irq, dev); |
| 1817 | local_irq_restore(flags); | ||
| 1813 | smc->fast_poll = HZ; | 1818 | smc->fast_poll = HZ; |
| 1814 | } | 1819 | } |
| 1815 | if (smc->fast_poll) { | 1820 | if (smc->fast_poll) { |
| 1816 | smc->fast_poll--; | 1821 | smc->fast_poll--; |
| 1817 | smc->media.expires = jiffies + HZ/100; | 1822 | smc->media.expires = jiffies + HZ/100; |
| 1818 | add_timer(&smc->media); | 1823 | add_timer(&smc->media); |
| 1819 | SMC_SELECT_BANK(saved_bank); | ||
| 1820 | spin_unlock_irqrestore(&smc->lock, flags); | ||
| 1821 | return; | 1824 | return; |
| 1822 | } | 1825 | } |
| 1823 | 1826 | ||
| 1827 | spin_lock_irqsave(&smc->lock, flags); | ||
| 1828 | |||
| 1829 | saved_bank = inw(ioaddr + BANK_SELECT); | ||
| 1830 | |||
| 1824 | if (smc->cfg & CFG_MII_SELECT) { | 1831 | if (smc->cfg & CFG_MII_SELECT) { |
| 1825 | if (smc->mii_if.phy_id < 0) | 1832 | if (smc->mii_if.phy_id < 0) |
| 1826 | goto reschedule; | 1833 | goto reschedule; |
| @@ -1978,15 +1985,16 @@ static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
| 1978 | unsigned int ioaddr = dev->base_addr; | 1985 | unsigned int ioaddr = dev->base_addr; |
| 1979 | u16 saved_bank = inw(ioaddr + BANK_SELECT); | 1986 | u16 saved_bank = inw(ioaddr + BANK_SELECT); |
| 1980 | int ret; | 1987 | int ret; |
| 1988 | unsigned long flags; | ||
| 1981 | 1989 | ||
| 1982 | spin_lock_irq(&smc->lock); | 1990 | spin_lock_irqsave(&smc->lock, flags); |
| 1983 | SMC_SELECT_BANK(3); | 1991 | SMC_SELECT_BANK(3); |
| 1984 | if (smc->cfg & CFG_MII_SELECT) | 1992 | if (smc->cfg & CFG_MII_SELECT) |
| 1985 | ret = mii_ethtool_gset(&smc->mii_if, ecmd); | 1993 | ret = mii_ethtool_gset(&smc->mii_if, ecmd); |
| 1986 | else | 1994 | else |
| 1987 | ret = smc_netdev_get_ecmd(dev, ecmd); | 1995 | ret = smc_netdev_get_ecmd(dev, ecmd); |
| 1988 | SMC_SELECT_BANK(saved_bank); | 1996 | SMC_SELECT_BANK(saved_bank); |
| 1989 | spin_unlock_irq(&smc->lock); | 1997 | spin_unlock_irqrestore(&smc->lock, flags); |
| 1990 | return ret; | 1998 | return ret; |
| 1991 | } | 1999 | } |
| 1992 | 2000 | ||
| @@ -1996,15 +2004,16 @@ static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
| 1996 | unsigned int ioaddr = dev->base_addr; | 2004 | unsigned int ioaddr = dev->base_addr; |
| 1997 | u16 saved_bank = inw(ioaddr + BANK_SELECT); | 2005 | u16 saved_bank = inw(ioaddr + BANK_SELECT); |
| 1998 | int ret; | 2006 | int ret; |
| 2007 | unsigned long flags; | ||
| 1999 | 2008 | ||
| 2000 | spin_lock_irq(&smc->lock); | 2009 | spin_lock_irqsave(&smc->lock, flags); |
| 2001 | SMC_SELECT_BANK(3); | 2010 | SMC_SELECT_BANK(3); |
| 2002 | if (smc->cfg & CFG_MII_SELECT) | 2011 | if (smc->cfg & CFG_MII_SELECT) |
| 2003 | ret = mii_ethtool_sset(&smc->mii_if, ecmd); | 2012 | ret = mii_ethtool_sset(&smc->mii_if, ecmd); |
| 2004 | else | 2013 | else |
| 2005 | ret = smc_netdev_set_ecmd(dev, ecmd); | 2014 | ret = smc_netdev_set_ecmd(dev, ecmd); |
| 2006 | SMC_SELECT_BANK(saved_bank); | 2015 | SMC_SELECT_BANK(saved_bank); |
| 2007 | spin_unlock_irq(&smc->lock); | 2016 | spin_unlock_irqrestore(&smc->lock, flags); |
| 2008 | return ret; | 2017 | return ret; |
| 2009 | } | 2018 | } |
| 2010 | 2019 | ||
| @@ -2014,12 +2023,13 @@ static u32 smc_get_link(struct net_device *dev) | |||
| 2014 | unsigned int ioaddr = dev->base_addr; | 2023 | unsigned int ioaddr = dev->base_addr; |
| 2015 | u16 saved_bank = inw(ioaddr + BANK_SELECT); | 2024 | u16 saved_bank = inw(ioaddr + BANK_SELECT); |
| 2016 | u32 ret; | 2025 | u32 ret; |
| 2026 | unsigned long flags; | ||
| 2017 | 2027 | ||
| 2018 | spin_lock_irq(&smc->lock); | 2028 | spin_lock_irqsave(&smc->lock, flags); |
| 2019 | SMC_SELECT_BANK(3); | 2029 | SMC_SELECT_BANK(3); |
| 2020 | ret = smc_link_ok(dev); | 2030 | ret = smc_link_ok(dev); |
| 2021 | SMC_SELECT_BANK(saved_bank); | 2031 | SMC_SELECT_BANK(saved_bank); |
| 2022 | spin_unlock_irq(&smc->lock); | 2032 | spin_unlock_irqrestore(&smc->lock, flags); |
| 2023 | return ret; | 2033 | return ret; |
| 2024 | } | 2034 | } |
| 2025 | 2035 | ||
| @@ -2056,16 +2066,17 @@ static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 2056 | int rc = 0; | 2066 | int rc = 0; |
| 2057 | u16 saved_bank; | 2067 | u16 saved_bank; |
| 2058 | unsigned int ioaddr = dev->base_addr; | 2068 | unsigned int ioaddr = dev->base_addr; |
| 2069 | unsigned long flags; | ||
| 2059 | 2070 | ||
| 2060 | if (!netif_running(dev)) | 2071 | if (!netif_running(dev)) |
| 2061 | return -EINVAL; | 2072 | return -EINVAL; |
| 2062 | 2073 | ||
| 2063 | spin_lock_irq(&smc->lock); | 2074 | spin_lock_irqsave(&smc->lock, flags); |
| 2064 | saved_bank = inw(ioaddr + BANK_SELECT); | 2075 | saved_bank = inw(ioaddr + BANK_SELECT); |
| 2065 | SMC_SELECT_BANK(3); | 2076 | SMC_SELECT_BANK(3); |
| 2066 | rc = generic_mii_ioctl(&smc->mii_if, mii, cmd, NULL); | 2077 | rc = generic_mii_ioctl(&smc->mii_if, mii, cmd, NULL); |
| 2067 | SMC_SELECT_BANK(saved_bank); | 2078 | SMC_SELECT_BANK(saved_bank); |
| 2068 | spin_unlock_irq(&smc->lock); | 2079 | spin_unlock_irqrestore(&smc->lock, flags); |
| 2069 | return rc; | 2080 | return rc; |
| 2070 | } | 2081 | } |
| 2071 | 2082 | ||
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index fc5938ba3d78..a527e37728cd 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig | |||
| @@ -88,6 +88,11 @@ config LSI_ET1011C_PHY | |||
| 88 | ---help--- | 88 | ---help--- |
| 89 | Supports the LSI ET1011C PHY. | 89 | Supports the LSI ET1011C PHY. |
| 90 | 90 | ||
| 91 | config MICREL_PHY | ||
| 92 | tristate "Driver for Micrel PHYs" | ||
| 93 | ---help--- | ||
| 94 | Supports the KSZ9021, VSC8201, KS8001 PHYs. | ||
| 95 | |||
| 91 | config FIXED_PHY | 96 | config FIXED_PHY |
| 92 | bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" | 97 | bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" |
| 93 | depends on PHYLIB=y | 98 | depends on PHYLIB=y |
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 1342585af381..13bebab65d02 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile | |||
| @@ -20,4 +20,5 @@ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o | |||
| 20 | obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o | 20 | obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o |
| 21 | obj-$(CONFIG_NATIONAL_PHY) += national.o | 21 | obj-$(CONFIG_NATIONAL_PHY) += national.o |
| 22 | obj-$(CONFIG_STE10XP) += ste10Xp.o | 22 | obj-$(CONFIG_STE10XP) += ste10Xp.o |
| 23 | obj-$(CONFIG_MICREL_PHY) += micrel.o | ||
| 23 | obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o | 24 | obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o |
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c index a872aea4ed74..f443d43edd80 100644 --- a/drivers/net/phy/mdio-octeon.c +++ b/drivers/net/phy/mdio-octeon.c | |||
| @@ -88,6 +88,7 @@ static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id, | |||
| 88 | static int __init octeon_mdiobus_probe(struct platform_device *pdev) | 88 | static int __init octeon_mdiobus_probe(struct platform_device *pdev) |
| 89 | { | 89 | { |
| 90 | struct octeon_mdiobus *bus; | 90 | struct octeon_mdiobus *bus; |
| 91 | union cvmx_smix_en smi_en; | ||
| 91 | int i; | 92 | int i; |
| 92 | int err = -ENOENT; | 93 | int err = -ENOENT; |
| 93 | 94 | ||
| @@ -103,6 +104,10 @@ static int __init octeon_mdiobus_probe(struct platform_device *pdev) | |||
| 103 | if (!bus->mii_bus) | 104 | if (!bus->mii_bus) |
| 104 | goto err; | 105 | goto err; |
| 105 | 106 | ||
| 107 | smi_en.u64 = 0; | ||
| 108 | smi_en.s.en = 1; | ||
| 109 | cvmx_write_csr(CVMX_SMIX_EN(bus->unit), smi_en.u64); | ||
| 110 | |||
| 106 | /* | 111 | /* |
| 107 | * Standard Octeon evaluation boards don't support phy | 112 | * Standard Octeon evaluation boards don't support phy |
| 108 | * interrupts, we need to poll. | 113 | * interrupts, we need to poll. |
| @@ -133,17 +138,22 @@ err_register: | |||
| 133 | 138 | ||
| 134 | err: | 139 | err: |
| 135 | devm_kfree(&pdev->dev, bus); | 140 | devm_kfree(&pdev->dev, bus); |
| 141 | smi_en.u64 = 0; | ||
| 142 | cvmx_write_csr(CVMX_SMIX_EN(bus->unit), smi_en.u64); | ||
| 136 | return err; | 143 | return err; |
| 137 | } | 144 | } |
| 138 | 145 | ||
| 139 | static int __exit octeon_mdiobus_remove(struct platform_device *pdev) | 146 | static int __exit octeon_mdiobus_remove(struct platform_device *pdev) |
| 140 | { | 147 | { |
| 141 | struct octeon_mdiobus *bus; | 148 | struct octeon_mdiobus *bus; |
| 149 | union cvmx_smix_en smi_en; | ||
| 142 | 150 | ||
| 143 | bus = dev_get_drvdata(&pdev->dev); | 151 | bus = dev_get_drvdata(&pdev->dev); |
| 144 | 152 | ||
| 145 | mdiobus_unregister(bus->mii_bus); | 153 | mdiobus_unregister(bus->mii_bus); |
| 146 | mdiobus_free(bus->mii_bus); | 154 | mdiobus_free(bus->mii_bus); |
| 155 | smi_en.u64 = 0; | ||
| 156 | cvmx_write_csr(CVMX_SMIX_EN(bus->unit), smi_en.u64); | ||
| 147 | return 0; | 157 | return 0; |
| 148 | } | 158 | } |
| 149 | 159 | ||
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c new file mode 100644 index 000000000000..0cd80e4d71d9 --- /dev/null +++ b/drivers/net/phy/micrel.c | |||
| @@ -0,0 +1,104 @@ | |||
| 1 | /* | ||
| 2 | * drivers/net/phy/micrel.c | ||
| 3 | * | ||
| 4 | * Driver for Micrel PHYs | ||
| 5 | * | ||
| 6 | * Author: David J. Choi | ||
| 7 | * | ||
| 8 | * Copyright (c) 2010 Micrel, Inc. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 13 | * option) any later version. | ||
| 14 | * | ||
| 15 | * Support : ksz9021 , vsc8201, ks8001 | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/module.h> | ||
| 20 | #include <linux/phy.h> | ||
| 21 | |||
| 22 | #define PHY_ID_KSZ9021 0x00221611 | ||
| 23 | #define PHY_ID_VSC8201 0x000FC413 | ||
| 24 | #define PHY_ID_KS8001 0x0022161A | ||
| 25 | |||
| 26 | |||
| 27 | static int kszphy_config_init(struct phy_device *phydev) | ||
| 28 | { | ||
| 29 | return 0; | ||
| 30 | } | ||
| 31 | |||
| 32 | |||
| 33 | static struct phy_driver ks8001_driver = { | ||
| 34 | .phy_id = PHY_ID_KS8001, | ||
| 35 | .phy_id_mask = 0x00fffff0, | ||
| 36 | .features = PHY_BASIC_FEATURES, | ||
| 37 | .flags = PHY_POLL, | ||
| 38 | .config_init = kszphy_config_init, | ||
| 39 | .config_aneg = genphy_config_aneg, | ||
| 40 | .read_status = genphy_read_status, | ||
| 41 | .driver = { .owner = THIS_MODULE,}, | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct phy_driver vsc8201_driver = { | ||
| 45 | .phy_id = PHY_ID_VSC8201, | ||
| 46 | .name = "Micrel VSC8201", | ||
| 47 | .phy_id_mask = 0x00fffff0, | ||
| 48 | .features = PHY_BASIC_FEATURES, | ||
| 49 | .flags = PHY_POLL, | ||
| 50 | .config_init = kszphy_config_init, | ||
| 51 | .config_aneg = genphy_config_aneg, | ||
| 52 | .read_status = genphy_read_status, | ||
| 53 | .driver = { .owner = THIS_MODULE,}, | ||
| 54 | }; | ||
| 55 | |||
| 56 | static struct phy_driver ksz9021_driver = { | ||
| 57 | .phy_id = PHY_ID_KSZ9021, | ||
| 58 | .phy_id_mask = 0x000fff10, | ||
| 59 | .name = "Micrel KSZ9021 Gigabit PHY", | ||
| 60 | .features = PHY_GBIT_FEATURES | SUPPORTED_Pause, | ||
| 61 | .flags = PHY_POLL, | ||
| 62 | .config_init = kszphy_config_init, | ||
| 63 | .config_aneg = genphy_config_aneg, | ||
| 64 | .read_status = genphy_read_status, | ||
| 65 | .driver = { .owner = THIS_MODULE, }, | ||
| 66 | }; | ||
| 67 | |||
| 68 | static int __init ksphy_init(void) | ||
| 69 | { | ||
| 70 | int ret; | ||
| 71 | |||
| 72 | ret = phy_driver_register(&ks8001_driver); | ||
| 73 | if (ret) | ||
| 74 | goto err1; | ||
| 75 | ret = phy_driver_register(&vsc8201_driver); | ||
| 76 | if (ret) | ||
| 77 | goto err2; | ||
| 78 | |||
| 79 | ret = phy_driver_register(&ksz9021_driver); | ||
| 80 | if (ret) | ||
| 81 | goto err3; | ||
| 82 | return 0; | ||
| 83 | |||
| 84 | err3: | ||
| 85 | phy_driver_unregister(&vsc8201_driver); | ||
| 86 | err2: | ||
| 87 | phy_driver_unregister(&ks8001_driver); | ||
| 88 | err1: | ||
| 89 | return ret; | ||
| 90 | } | ||
| 91 | |||
| 92 | static void __exit ksphy_exit(void) | ||
| 93 | { | ||
| 94 | phy_driver_unregister(&ks8001_driver); | ||
| 95 | phy_driver_unregister(&vsc8201_driver); | ||
| 96 | phy_driver_unregister(&ksz9021_driver); | ||
| 97 | } | ||
| 98 | |||
| 99 | module_init(ksphy_init); | ||
| 100 | module_exit(ksphy_exit); | ||
| 101 | |||
| 102 | MODULE_DESCRIPTION("Micrel PHY driver"); | ||
| 103 | MODULE_AUTHOR("David J. Choi"); | ||
| 104 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 6e281bc825e5..8518a2e58e53 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -405,6 +405,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf, | |||
| 405 | DECLARE_WAITQUEUE(wait, current); | 405 | DECLARE_WAITQUEUE(wait, current); |
| 406 | ssize_t ret; | 406 | ssize_t ret; |
| 407 | struct sk_buff *skb = NULL; | 407 | struct sk_buff *skb = NULL; |
| 408 | struct iovec iov; | ||
| 408 | 409 | ||
| 409 | ret = count; | 410 | ret = count; |
| 410 | 411 | ||
| @@ -448,7 +449,9 @@ static ssize_t ppp_read(struct file *file, char __user *buf, | |||
| 448 | if (skb->len > count) | 449 | if (skb->len > count) |
| 449 | goto outf; | 450 | goto outf; |
| 450 | ret = -EFAULT; | 451 | ret = -EFAULT; |
| 451 | if (copy_to_user(buf, skb->data, skb->len)) | 452 | iov.iov_base = buf; |
| 453 | iov.iov_len = count; | ||
| 454 | if (skb_copy_datagram_iovec(skb, 0, &iov, skb->len)) | ||
| 452 | goto outf; | 455 | goto outf; |
| 453 | ret = skb->len; | 456 | ret = skb->len; |
| 454 | 457 | ||
| @@ -1567,13 +1570,22 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb) | |||
| 1567 | struct channel *pch = chan->ppp; | 1570 | struct channel *pch = chan->ppp; |
| 1568 | int proto; | 1571 | int proto; |
| 1569 | 1572 | ||
| 1570 | if (!pch || skb->len == 0) { | 1573 | if (!pch) { |
| 1571 | kfree_skb(skb); | 1574 | kfree_skb(skb); |
| 1572 | return; | 1575 | return; |
| 1573 | } | 1576 | } |
| 1574 | 1577 | ||
| 1575 | proto = PPP_PROTO(skb); | ||
| 1576 | read_lock_bh(&pch->upl); | 1578 | read_lock_bh(&pch->upl); |
| 1579 | if (!pskb_may_pull(skb, 2)) { | ||
| 1580 | kfree_skb(skb); | ||
| 1581 | if (pch->ppp) { | ||
| 1582 | ++pch->ppp->dev->stats.rx_length_errors; | ||
| 1583 | ppp_receive_error(pch->ppp); | ||
| 1584 | } | ||
| 1585 | goto done; | ||
| 1586 | } | ||
| 1587 | |||
| 1588 | proto = PPP_PROTO(skb); | ||
| 1577 | if (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) { | 1589 | if (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) { |
| 1578 | /* put it on the channel queue */ | 1590 | /* put it on the channel queue */ |
| 1579 | skb_queue_tail(&pch->file.rq, skb); | 1591 | skb_queue_tail(&pch->file.rq, skb); |
| @@ -1585,6 +1597,8 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb) | |||
| 1585 | } else { | 1597 | } else { |
| 1586 | ppp_do_recv(pch->ppp, skb, pch); | 1598 | ppp_do_recv(pch->ppp, skb, pch); |
| 1587 | } | 1599 | } |
| 1600 | |||
| 1601 | done: | ||
| 1588 | read_unlock_bh(&pch->upl); | 1602 | read_unlock_bh(&pch->upl); |
| 1589 | } | 1603 | } |
| 1590 | 1604 | ||
| @@ -1617,7 +1631,8 @@ ppp_input_error(struct ppp_channel *chan, int code) | |||
| 1617 | static void | 1631 | static void |
| 1618 | ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) | 1632 | ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) |
| 1619 | { | 1633 | { |
| 1620 | if (pskb_may_pull(skb, 2)) { | 1634 | /* note: a 0-length skb is used as an error indication */ |
| 1635 | if (skb->len > 0) { | ||
| 1621 | #ifdef CONFIG_PPP_MULTILINK | 1636 | #ifdef CONFIG_PPP_MULTILINK |
| 1622 | /* XXX do channel-level decompression here */ | 1637 | /* XXX do channel-level decompression here */ |
| 1623 | if (PPP_PROTO(skb) == PPP_MP) | 1638 | if (PPP_PROTO(skb) == PPP_MP) |
| @@ -1625,15 +1640,10 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) | |||
| 1625 | else | 1640 | else |
| 1626 | #endif /* CONFIG_PPP_MULTILINK */ | 1641 | #endif /* CONFIG_PPP_MULTILINK */ |
| 1627 | ppp_receive_nonmp_frame(ppp, skb); | 1642 | ppp_receive_nonmp_frame(ppp, skb); |
| 1628 | return; | 1643 | } else { |
| 1644 | kfree_skb(skb); | ||
| 1645 | ppp_receive_error(ppp); | ||
| 1629 | } | 1646 | } |
| 1630 | |||
| 1631 | if (skb->len > 0) | ||
| 1632 | /* note: a 0-length skb is used as an error indication */ | ||
| 1633 | ++ppp->dev->stats.rx_length_errors; | ||
| 1634 | |||
| 1635 | kfree_skb(skb); | ||
| 1636 | ppp_receive_error(ppp); | ||
| 1637 | } | 1647 | } |
| 1638 | 1648 | ||
| 1639 | static void | 1649 | static void |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index dbb1f5a1824c..dd8106ff35aa 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -1042,14 +1042,14 @@ static void rtl8169_vlan_rx_register(struct net_device *dev, | |||
| 1042 | } | 1042 | } |
| 1043 | 1043 | ||
| 1044 | static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, | 1044 | static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, |
| 1045 | struct sk_buff *skb) | 1045 | struct sk_buff *skb, int polling) |
| 1046 | { | 1046 | { |
| 1047 | u32 opts2 = le32_to_cpu(desc->opts2); | 1047 | u32 opts2 = le32_to_cpu(desc->opts2); |
| 1048 | struct vlan_group *vlgrp = tp->vlgrp; | 1048 | struct vlan_group *vlgrp = tp->vlgrp; |
| 1049 | int ret; | 1049 | int ret; |
| 1050 | 1050 | ||
| 1051 | if (vlgrp && (opts2 & RxVlanTag)) { | 1051 | if (vlgrp && (opts2 & RxVlanTag)) { |
| 1052 | vlan_hwaccel_receive_skb(skb, vlgrp, swab16(opts2 & 0xffff)); | 1052 | __vlan_hwaccel_rx(skb, vlgrp, swab16(opts2 & 0xffff), polling); |
| 1053 | ret = 0; | 1053 | ret = 0; |
| 1054 | } else | 1054 | } else |
| 1055 | ret = -1; | 1055 | ret = -1; |
| @@ -1066,7 +1066,7 @@ static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp, | |||
| 1066 | } | 1066 | } |
| 1067 | 1067 | ||
| 1068 | static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, | 1068 | static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, |
| 1069 | struct sk_buff *skb) | 1069 | struct sk_buff *skb, int polling) |
| 1070 | { | 1070 | { |
| 1071 | return -1; | 1071 | return -1; |
| 1072 | } | 1072 | } |
| @@ -2759,6 +2759,7 @@ static void rtl8169_release_board(struct pci_dev *pdev, struct net_device *dev, | |||
| 2759 | { | 2759 | { |
| 2760 | iounmap(ioaddr); | 2760 | iounmap(ioaddr); |
| 2761 | pci_release_regions(pdev); | 2761 | pci_release_regions(pdev); |
| 2762 | pci_clear_mwi(pdev); | ||
| 2762 | pci_disable_device(pdev); | 2763 | pci_disable_device(pdev); |
| 2763 | free_netdev(dev); | 2764 | free_netdev(dev); |
| 2764 | } | 2765 | } |
| @@ -2825,8 +2826,13 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) | |||
| 2825 | spin_lock_irq(&tp->lock); | 2826 | spin_lock_irq(&tp->lock); |
| 2826 | 2827 | ||
| 2827 | RTL_W8(Cfg9346, Cfg9346_Unlock); | 2828 | RTL_W8(Cfg9346, Cfg9346_Unlock); |
| 2829 | |||
| 2828 | RTL_W32(MAC4, high); | 2830 | RTL_W32(MAC4, high); |
| 2831 | RTL_R32(MAC4); | ||
| 2832 | |||
| 2829 | RTL_W32(MAC0, low); | 2833 | RTL_W32(MAC0, low); |
| 2834 | RTL_R32(MAC0); | ||
| 2835 | |||
| 2830 | RTL_W8(Cfg9346, Cfg9346_Lock); | 2836 | RTL_W8(Cfg9346, Cfg9346_Lock); |
| 2831 | 2837 | ||
| 2832 | spin_unlock_irq(&tp->lock); | 2838 | spin_unlock_irq(&tp->lock); |
| @@ -3014,9 +3020,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3014 | goto err_out_free_dev_1; | 3020 | goto err_out_free_dev_1; |
| 3015 | } | 3021 | } |
| 3016 | 3022 | ||
| 3017 | rc = pci_set_mwi(pdev); | 3023 | if (pci_set_mwi(pdev) < 0) |
| 3018 | if (rc < 0) | 3024 | netif_info(tp, probe, dev, "Mem-Wr-Inval unavailable\n"); |
| 3019 | goto err_out_disable_2; | ||
| 3020 | 3025 | ||
| 3021 | /* make sure PCI base addr 1 is MMIO */ | 3026 | /* make sure PCI base addr 1 is MMIO */ |
| 3022 | if (!(pci_resource_flags(pdev, region) & IORESOURCE_MEM)) { | 3027 | if (!(pci_resource_flags(pdev, region) & IORESOURCE_MEM)) { |
| @@ -3024,7 +3029,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3024 | "region #%d not an MMIO resource, aborting\n", | 3029 | "region #%d not an MMIO resource, aborting\n", |
| 3025 | region); | 3030 | region); |
| 3026 | rc = -ENODEV; | 3031 | rc = -ENODEV; |
| 3027 | goto err_out_mwi_3; | 3032 | goto err_out_mwi_2; |
| 3028 | } | 3033 | } |
| 3029 | 3034 | ||
| 3030 | /* check for weird/broken PCI region reporting */ | 3035 | /* check for weird/broken PCI region reporting */ |
| @@ -3032,13 +3037,13 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3032 | netif_err(tp, probe, dev, | 3037 | netif_err(tp, probe, dev, |
| 3033 | "Invalid PCI region size(s), aborting\n"); | 3038 | "Invalid PCI region size(s), aborting\n"); |
| 3034 | rc = -ENODEV; | 3039 | rc = -ENODEV; |
| 3035 | goto err_out_mwi_3; | 3040 | goto err_out_mwi_2; |
| 3036 | } | 3041 | } |
| 3037 | 3042 | ||
| 3038 | rc = pci_request_regions(pdev, MODULENAME); | 3043 | rc = pci_request_regions(pdev, MODULENAME); |
| 3039 | if (rc < 0) { | 3044 | if (rc < 0) { |
| 3040 | netif_err(tp, probe, dev, "could not request regions\n"); | 3045 | netif_err(tp, probe, dev, "could not request regions\n"); |
| 3041 | goto err_out_mwi_3; | 3046 | goto err_out_mwi_2; |
| 3042 | } | 3047 | } |
| 3043 | 3048 | ||
| 3044 | tp->cp_cmd = PCIMulRW | RxChkSum; | 3049 | tp->cp_cmd = PCIMulRW | RxChkSum; |
| @@ -3051,7 +3056,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3051 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); | 3056 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 3052 | if (rc < 0) { | 3057 | if (rc < 0) { |
| 3053 | netif_err(tp, probe, dev, "DMA configuration failed\n"); | 3058 | netif_err(tp, probe, dev, "DMA configuration failed\n"); |
| 3054 | goto err_out_free_res_4; | 3059 | goto err_out_free_res_3; |
| 3055 | } | 3060 | } |
| 3056 | } | 3061 | } |
| 3057 | 3062 | ||
| @@ -3060,7 +3065,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3060 | if (!ioaddr) { | 3065 | if (!ioaddr) { |
| 3061 | netif_err(tp, probe, dev, "cannot remap MMIO, aborting\n"); | 3066 | netif_err(tp, probe, dev, "cannot remap MMIO, aborting\n"); |
| 3062 | rc = -EIO; | 3067 | rc = -EIO; |
| 3063 | goto err_out_free_res_4; | 3068 | goto err_out_free_res_3; |
| 3064 | } | 3069 | } |
| 3065 | 3070 | ||
| 3066 | tp->pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP); | 3071 | tp->pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP); |
| @@ -3102,7 +3107,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3102 | if (i == ARRAY_SIZE(rtl_chip_info)) { | 3107 | if (i == ARRAY_SIZE(rtl_chip_info)) { |
| 3103 | dev_err(&pdev->dev, | 3108 | dev_err(&pdev->dev, |
| 3104 | "driver bug, MAC version not found in rtl_chip_info\n"); | 3109 | "driver bug, MAC version not found in rtl_chip_info\n"); |
| 3105 | goto err_out_msi_5; | 3110 | goto err_out_msi_4; |
| 3106 | } | 3111 | } |
| 3107 | tp->chipset = i; | 3112 | tp->chipset = i; |
| 3108 | 3113 | ||
| @@ -3167,7 +3172,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3167 | 3172 | ||
| 3168 | rc = register_netdev(dev); | 3173 | rc = register_netdev(dev); |
| 3169 | if (rc < 0) | 3174 | if (rc < 0) |
| 3170 | goto err_out_msi_5; | 3175 | goto err_out_msi_4; |
| 3171 | 3176 | ||
| 3172 | pci_set_drvdata(pdev, dev); | 3177 | pci_set_drvdata(pdev, dev); |
| 3173 | 3178 | ||
| @@ -3190,14 +3195,13 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 3190 | out: | 3195 | out: |
| 3191 | return rc; | 3196 | return rc; |
| 3192 | 3197 | ||
| 3193 | err_out_msi_5: | 3198 | err_out_msi_4: |
| 3194 | rtl_disable_msi(pdev, tp); | 3199 | rtl_disable_msi(pdev, tp); |
| 3195 | iounmap(ioaddr); | 3200 | iounmap(ioaddr); |
| 3196 | err_out_free_res_4: | 3201 | err_out_free_res_3: |
| 3197 | pci_release_regions(pdev); | 3202 | pci_release_regions(pdev); |
| 3198 | err_out_mwi_3: | 3203 | err_out_mwi_2: |
| 3199 | pci_clear_mwi(pdev); | 3204 | pci_clear_mwi(pdev); |
| 3200 | err_out_disable_2: | ||
| 3201 | pci_disable_device(pdev); | 3205 | pci_disable_device(pdev); |
| 3202 | err_out_free_dev_1: | 3206 | err_out_free_dev_1: |
| 3203 | free_netdev(dev); | 3207 | free_netdev(dev); |
| @@ -4441,12 +4445,20 @@ out: | |||
| 4441 | return done; | 4445 | return done; |
| 4442 | } | 4446 | } |
| 4443 | 4447 | ||
| 4448 | /* | ||
| 4449 | * Warning : rtl8169_rx_interrupt() might be called : | ||
| 4450 | * 1) from NAPI (softirq) context | ||
| 4451 | * (polling = 1 : we should call netif_receive_skb()) | ||
| 4452 | * 2) from process context (rtl8169_reset_task()) | ||
| 4453 | * (polling = 0 : we must call netif_rx() instead) | ||
| 4454 | */ | ||
| 4444 | static int rtl8169_rx_interrupt(struct net_device *dev, | 4455 | static int rtl8169_rx_interrupt(struct net_device *dev, |
| 4445 | struct rtl8169_private *tp, | 4456 | struct rtl8169_private *tp, |
| 4446 | void __iomem *ioaddr, u32 budget) | 4457 | void __iomem *ioaddr, u32 budget) |
| 4447 | { | 4458 | { |
| 4448 | unsigned int cur_rx, rx_left; | 4459 | unsigned int cur_rx, rx_left; |
| 4449 | unsigned int delta, count; | 4460 | unsigned int delta, count; |
| 4461 | int polling = (budget != ~(u32)0) ? 1 : 0; | ||
| 4450 | 4462 | ||
| 4451 | cur_rx = tp->cur_rx; | 4463 | cur_rx = tp->cur_rx; |
| 4452 | rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx; | 4464 | rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx; |
| @@ -4508,8 +4520,12 @@ static int rtl8169_rx_interrupt(struct net_device *dev, | |||
| 4508 | skb_put(skb, pkt_size); | 4520 | skb_put(skb, pkt_size); |
| 4509 | skb->protocol = eth_type_trans(skb, dev); | 4521 | skb->protocol = eth_type_trans(skb, dev); |
| 4510 | 4522 | ||
| 4511 | if (rtl8169_rx_vlan_skb(tp, desc, skb) < 0) | 4523 | if (rtl8169_rx_vlan_skb(tp, desc, skb, polling) < 0) { |
| 4512 | netif_receive_skb(skb); | 4524 | if (likely(polling)) |
| 4525 | netif_receive_skb(skb); | ||
| 4526 | else | ||
| 4527 | netif_rx(skb); | ||
| 4528 | } | ||
| 4513 | 4529 | ||
| 4514 | dev->stats.rx_bytes += pkt_size; | 4530 | dev->stats.rx_bytes += pkt_size; |
| 4515 | dev->stats.rx_packets++; | 4531 | dev->stats.rx_packets++; |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 9944e5d662c0..04efc0c1bda9 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
| @@ -2353,17 +2353,36 @@ static int sbmac_init(struct platform_device *pldev, long long base) | |||
| 2353 | 2353 | ||
| 2354 | sc->mii_bus = mdiobus_alloc(); | 2354 | sc->mii_bus = mdiobus_alloc(); |
| 2355 | if (sc->mii_bus == NULL) { | 2355 | if (sc->mii_bus == NULL) { |
| 2356 | sbmac_uninitctx(sc); | 2356 | err = -ENOMEM; |
| 2357 | return -ENOMEM; | 2357 | goto uninit_ctx; |
| 2358 | } | 2358 | } |
| 2359 | 2359 | ||
| 2360 | sc->mii_bus->name = sbmac_mdio_string; | ||
| 2361 | snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx); | ||
| 2362 | sc->mii_bus->priv = sc; | ||
| 2363 | sc->mii_bus->read = sbmac_mii_read; | ||
| 2364 | sc->mii_bus->write = sbmac_mii_write; | ||
| 2365 | sc->mii_bus->irq = sc->phy_irq; | ||
| 2366 | for (i = 0; i < PHY_MAX_ADDR; ++i) | ||
| 2367 | sc->mii_bus->irq[i] = SBMAC_PHY_INT; | ||
| 2368 | |||
| 2369 | sc->mii_bus->parent = &pldev->dev; | ||
| 2370 | /* | ||
| 2371 | * Probe PHY address | ||
| 2372 | */ | ||
| 2373 | err = mdiobus_register(sc->mii_bus); | ||
| 2374 | if (err) { | ||
| 2375 | printk(KERN_ERR "%s: unable to register MDIO bus\n", | ||
| 2376 | dev->name); | ||
| 2377 | goto free_mdio; | ||
| 2378 | } | ||
| 2379 | dev_set_drvdata(&pldev->dev, sc->mii_bus); | ||
| 2380 | |||
| 2360 | err = register_netdev(dev); | 2381 | err = register_netdev(dev); |
| 2361 | if (err) { | 2382 | if (err) { |
| 2362 | printk(KERN_ERR "%s.%d: unable to register netdev\n", | 2383 | printk(KERN_ERR "%s.%d: unable to register netdev\n", |
| 2363 | sbmac_string, idx); | 2384 | sbmac_string, idx); |
| 2364 | mdiobus_free(sc->mii_bus); | 2385 | goto unreg_mdio; |
| 2365 | sbmac_uninitctx(sc); | ||
| 2366 | return err; | ||
| 2367 | } | 2386 | } |
| 2368 | 2387 | ||
| 2369 | pr_info("%s.%d: registered as %s\n", sbmac_string, idx, dev->name); | 2388 | pr_info("%s.%d: registered as %s\n", sbmac_string, idx, dev->name); |
| @@ -2379,19 +2398,15 @@ static int sbmac_init(struct platform_device *pldev, long long base) | |||
| 2379 | pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %pM\n", | 2398 | pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %pM\n", |
| 2380 | dev->name, base, eaddr); | 2399 | dev->name, base, eaddr); |
| 2381 | 2400 | ||
| 2382 | sc->mii_bus->name = sbmac_mdio_string; | ||
| 2383 | snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx); | ||
| 2384 | sc->mii_bus->priv = sc; | ||
| 2385 | sc->mii_bus->read = sbmac_mii_read; | ||
| 2386 | sc->mii_bus->write = sbmac_mii_write; | ||
| 2387 | sc->mii_bus->irq = sc->phy_irq; | ||
| 2388 | for (i = 0; i < PHY_MAX_ADDR; ++i) | ||
| 2389 | sc->mii_bus->irq[i] = SBMAC_PHY_INT; | ||
| 2390 | |||
| 2391 | sc->mii_bus->parent = &pldev->dev; | ||
| 2392 | dev_set_drvdata(&pldev->dev, sc->mii_bus); | ||
| 2393 | |||
| 2394 | return 0; | 2401 | return 0; |
| 2402 | unreg_mdio: | ||
| 2403 | mdiobus_unregister(sc->mii_bus); | ||
| 2404 | dev_set_drvdata(&pldev->dev, NULL); | ||
| 2405 | free_mdio: | ||
| 2406 | mdiobus_free(sc->mii_bus); | ||
| 2407 | uninit_ctx: | ||
| 2408 | sbmac_uninitctx(sc); | ||
| 2409 | return err; | ||
| 2395 | } | 2410 | } |
| 2396 | 2411 | ||
| 2397 | 2412 | ||
| @@ -2417,16 +2432,6 @@ static int sbmac_open(struct net_device *dev) | |||
| 2417 | goto out_err; | 2432 | goto out_err; |
| 2418 | } | 2433 | } |
| 2419 | 2434 | ||
| 2420 | /* | ||
| 2421 | * Probe PHY address | ||
| 2422 | */ | ||
| 2423 | err = mdiobus_register(sc->mii_bus); | ||
| 2424 | if (err) { | ||
| 2425 | printk(KERN_ERR "%s: unable to register MDIO bus\n", | ||
| 2426 | dev->name); | ||
| 2427 | goto out_unirq; | ||
| 2428 | } | ||
| 2429 | |||
| 2430 | sc->sbm_speed = sbmac_speed_none; | 2435 | sc->sbm_speed = sbmac_speed_none; |
| 2431 | sc->sbm_duplex = sbmac_duplex_none; | 2436 | sc->sbm_duplex = sbmac_duplex_none; |
| 2432 | sc->sbm_fc = sbmac_fc_none; | 2437 | sc->sbm_fc = sbmac_fc_none; |
| @@ -2457,11 +2462,7 @@ static int sbmac_open(struct net_device *dev) | |||
| 2457 | return 0; | 2462 | return 0; |
| 2458 | 2463 | ||
| 2459 | out_unregister: | 2464 | out_unregister: |
| 2460 | mdiobus_unregister(sc->mii_bus); | ||
| 2461 | |||
| 2462 | out_unirq: | ||
| 2463 | free_irq(dev->irq, dev); | 2465 | free_irq(dev->irq, dev); |
| 2464 | |||
| 2465 | out_err: | 2466 | out_err: |
| 2466 | return err; | 2467 | return err; |
| 2467 | } | 2468 | } |
| @@ -2650,9 +2651,6 @@ static int sbmac_close(struct net_device *dev) | |||
| 2650 | 2651 | ||
| 2651 | phy_disconnect(sc->phy_dev); | 2652 | phy_disconnect(sc->phy_dev); |
| 2652 | sc->phy_dev = NULL; | 2653 | sc->phy_dev = NULL; |
| 2653 | |||
| 2654 | mdiobus_unregister(sc->mii_bus); | ||
| 2655 | |||
| 2656 | free_irq(dev->irq, dev); | 2654 | free_irq(dev->irq, dev); |
| 2657 | 2655 | ||
| 2658 | sbdma_emptyring(&(sc->sbm_txdma)); | 2656 | sbdma_emptyring(&(sc->sbm_txdma)); |
| @@ -2760,6 +2758,7 @@ static int __exit sbmac_remove(struct platform_device *pldev) | |||
| 2760 | 2758 | ||
| 2761 | unregister_netdev(dev); | 2759 | unregister_netdev(dev); |
| 2762 | sbmac_uninitctx(sc); | 2760 | sbmac_uninitctx(sc); |
| 2761 | mdiobus_unregister(sc->mii_bus); | ||
| 2763 | mdiobus_free(sc->mii_bus); | 2762 | mdiobus_free(sc->mii_bus); |
| 2764 | iounmap(sc->sbm_base); | 2763 | iounmap(sc->sbm_base); |
| 2765 | free_netdev(dev); | 2764 | free_netdev(dev); |
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 6486657c47b8..649a264d6a81 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
| @@ -1861,6 +1861,7 @@ out: | |||
| 1861 | } | 1861 | } |
| 1862 | 1862 | ||
| 1863 | if (disabled) { | 1863 | if (disabled) { |
| 1864 | dev_close(efx->net_dev); | ||
| 1864 | EFX_ERR(efx, "has been disabled\n"); | 1865 | EFX_ERR(efx, "has been disabled\n"); |
| 1865 | efx->state = STATE_DISABLED; | 1866 | efx->state = STATE_DISABLED; |
| 1866 | } else { | 1867 | } else { |
| @@ -1884,8 +1885,7 @@ static void efx_reset_work(struct work_struct *data) | |||
| 1884 | } | 1885 | } |
| 1885 | 1886 | ||
| 1886 | rtnl_lock(); | 1887 | rtnl_lock(); |
| 1887 | if (efx_reset(efx, efx->reset_pending)) | 1888 | (void)efx_reset(efx, efx->reset_pending); |
| 1888 | dev_close(efx->net_dev); | ||
| 1889 | rtnl_unlock(); | 1889 | rtnl_unlock(); |
| 1890 | } | 1890 | } |
| 1891 | 1891 | ||
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index d294d66fd600..08278e7302b3 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
| @@ -1320,7 +1320,9 @@ static int falcon_probe_nvconfig(struct efx_nic *efx) | |||
| 1320 | 1320 | ||
| 1321 | EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mdio.prtad); | 1321 | EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mdio.prtad); |
| 1322 | 1322 | ||
| 1323 | falcon_probe_board(efx, board_rev); | 1323 | rc = falcon_probe_board(efx, board_rev); |
| 1324 | if (rc) | ||
| 1325 | goto fail2; | ||
| 1324 | 1326 | ||
| 1325 | kfree(nvconfig); | 1327 | kfree(nvconfig); |
| 1326 | return 0; | 1328 | return 0; |
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c index 5712fddd72f2..c7a933a3292e 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/sfc/falcon_boards.c | |||
| @@ -728,15 +728,7 @@ static const struct falcon_board_type board_types[] = { | |||
| 728 | }, | 728 | }, |
| 729 | }; | 729 | }; |
| 730 | 730 | ||
| 731 | static const struct falcon_board_type falcon_dummy_board = { | 731 | int falcon_probe_board(struct efx_nic *efx, u16 revision_info) |
| 732 | .init = efx_port_dummy_op_int, | ||
| 733 | .init_phy = efx_port_dummy_op_void, | ||
| 734 | .fini = efx_port_dummy_op_void, | ||
| 735 | .set_id_led = efx_port_dummy_op_set_id_led, | ||
| 736 | .monitor = efx_port_dummy_op_int, | ||
| 737 | }; | ||
| 738 | |||
| 739 | void falcon_probe_board(struct efx_nic *efx, u16 revision_info) | ||
| 740 | { | 732 | { |
| 741 | struct falcon_board *board = falcon_board(efx); | 733 | struct falcon_board *board = falcon_board(efx); |
| 742 | u8 type_id = FALCON_BOARD_TYPE(revision_info); | 734 | u8 type_id = FALCON_BOARD_TYPE(revision_info); |
| @@ -754,8 +746,9 @@ void falcon_probe_board(struct efx_nic *efx, u16 revision_info) | |||
| 754 | (efx->pci_dev->subsystem_vendor == EFX_VENDID_SFC) | 746 | (efx->pci_dev->subsystem_vendor == EFX_VENDID_SFC) |
| 755 | ? board->type->ref_model : board->type->gen_type, | 747 | ? board->type->ref_model : board->type->gen_type, |
| 756 | 'A' + board->major, board->minor); | 748 | 'A' + board->major, board->minor); |
| 749 | return 0; | ||
| 757 | } else { | 750 | } else { |
| 758 | EFX_ERR(efx, "unknown board type %d\n", type_id); | 751 | EFX_ERR(efx, "unknown board type %d\n", type_id); |
| 759 | board->type = &falcon_dummy_board; | 752 | return -ENODEV; |
| 760 | } | 753 | } |
| 761 | } | 754 | } |
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h index 9351c0331a47..3166bafdfbef 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h | |||
| @@ -156,7 +156,7 @@ extern struct efx_nic_type siena_a0_nic_type; | |||
| 156 | ************************************************************************** | 156 | ************************************************************************** |
| 157 | */ | 157 | */ |
| 158 | 158 | ||
| 159 | extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); | 159 | extern int falcon_probe_board(struct efx_nic *efx, u16 revision_info); |
| 160 | 160 | ||
| 161 | /* TX data path */ | 161 | /* TX data path */ |
| 162 | extern int efx_nic_probe_tx(struct efx_tx_queue *tx_queue); | 162 | extern int efx_nic_probe_tx(struct efx_tx_queue *tx_queue); |
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c index 38dcc42c4f79..e0c46f59d1f8 100644 --- a/drivers/net/sfc/siena.c +++ b/drivers/net/sfc/siena.c | |||
| @@ -456,8 +456,17 @@ static int siena_try_update_nic_stats(struct efx_nic *efx) | |||
| 456 | 456 | ||
| 457 | static void siena_update_nic_stats(struct efx_nic *efx) | 457 | static void siena_update_nic_stats(struct efx_nic *efx) |
| 458 | { | 458 | { |
| 459 | while (siena_try_update_nic_stats(efx) == -EAGAIN) | 459 | int retry; |
| 460 | cpu_relax(); | 460 | |
| 461 | /* If we're unlucky enough to read statistics wduring the DMA, wait | ||
| 462 | * up to 10ms for it to finish (typically takes <500us) */ | ||
| 463 | for (retry = 0; retry < 100; ++retry) { | ||
| 464 | if (siena_try_update_nic_stats(efx) == 0) | ||
| 465 | return; | ||
| 466 | udelay(100); | ||
| 467 | } | ||
| 468 | |||
| 469 | /* Use the old values instead */ | ||
| 461 | } | 470 | } |
| 462 | 471 | ||
| 463 | static void siena_start_nic_stats(struct efx_nic *efx) | 472 | static void siena_start_nic_stats(struct efx_nic *efx) |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 22cf1c446de3..ecc41cffb470 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -8633,6 +8633,7 @@ static int tg3_test_msi(struct tg3 *tp) | |||
| 8633 | pci_disable_msi(tp->pdev); | 8633 | pci_disable_msi(tp->pdev); |
| 8634 | 8634 | ||
| 8635 | tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI; | 8635 | tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI; |
| 8636 | tp->napi[0].irq_vec = tp->pdev->irq; | ||
| 8636 | 8637 | ||
| 8637 | err = tg3_request_irq(tp, 0); | 8638 | err = tg3_request_irq(tp, 0); |
| 8638 | if (err) | 8639 | if (err) |
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index ba56ce4382d9..d7b7018a1de1 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
| @@ -385,4 +385,25 @@ config USB_CDC_PHONET | |||
| 385 | cellular modem, as found on most Nokia handsets with the | 385 | cellular modem, as found on most Nokia handsets with the |
| 386 | "PC suite" USB profile. | 386 | "PC suite" USB profile. |
| 387 | 387 | ||
| 388 | config USB_IPHETH | ||
| 389 | tristate "Apple iPhone USB Ethernet driver" | ||
| 390 | default n | ||
| 391 | ---help--- | ||
| 392 | Module used to share Internet connection (tethering) from your | ||
| 393 | iPhone (Original, 3G and 3GS) to your system. | ||
| 394 | Note that you need userspace libraries and programs that are needed | ||
| 395 | to pair your device with your system and that understand the iPhone | ||
| 396 | protocol. | ||
| 397 | |||
| 398 | For more information: http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver | ||
| 399 | |||
| 400 | config USB_SIERRA_NET | ||
| 401 | tristate "USB-to-WWAN Driver for Sierra Wireless modems" | ||
| 402 | depends on USB_USBNET | ||
| 403 | help | ||
| 404 | Choose this option if you have a Sierra Wireless USB-to-WWAN device. | ||
| 405 | |||
| 406 | To compile this driver as a module, choose M here: the | ||
| 407 | module will be called sierra_net. | ||
| 408 | |||
| 388 | endmenu | 409 | endmenu |
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 82ea62955b56..b13a279663ba 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile | |||
| @@ -23,4 +23,6 @@ obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o | |||
| 23 | obj-$(CONFIG_USB_USBNET) += usbnet.o | 23 | obj-$(CONFIG_USB_USBNET) += usbnet.o |
| 24 | obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o | 24 | obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o |
| 25 | obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o | 25 | obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o |
| 26 | obj-$(CONFIG_USB_IPHETH) += ipheth.o | ||
| 27 | obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o | ||
| 26 | 28 | ||
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c8cdb7f30adc..3547cf13d219 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -431,6 +431,7 @@ static const struct driver_info mbm_info = { | |||
| 431 | .bind = cdc_bind, | 431 | .bind = cdc_bind, |
| 432 | .unbind = usbnet_cdc_unbind, | 432 | .unbind = usbnet_cdc_unbind, |
| 433 | .status = cdc_status, | 433 | .status = cdc_status, |
| 434 | .manage_power = cdc_manage_power, | ||
| 434 | }; | 435 | }; |
| 435 | 436 | ||
| 436 | /*-------------------------------------------------------------------------*/ | 437 | /*-------------------------------------------------------------------------*/ |
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 04b281002a76..5dfed9297b22 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
| @@ -240,7 +240,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu | |||
| 240 | goto out; | 240 | goto out; |
| 241 | 241 | ||
| 242 | dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); | 242 | dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); |
| 243 | dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1c : 0x14); | 243 | dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12); |
| 244 | 244 | ||
| 245 | for (i = 0; i < DM_TIMEOUT; i++) { | 245 | for (i = 0; i < DM_TIMEOUT; i++) { |
| 246 | u8 tmp; | 246 | u8 tmp; |
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c new file mode 100644 index 000000000000..418825d26f90 --- /dev/null +++ b/drivers/net/usb/ipheth.c | |||
| @@ -0,0 +1,569 @@ | |||
| 1 | /* | ||
| 2 | * ipheth.c - Apple iPhone USB Ethernet driver | ||
| 3 | * | ||
| 4 | * Copyright (c) 2009 Diego Giagio <diego@giagio.com> | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Redistribution and use in source and binary forms, with or without | ||
| 8 | * modification, are permitted provided that the following conditions | ||
| 9 | * are met: | ||
| 10 | * 1. Redistributions of source code must retain the above copyright | ||
| 11 | * notice, this list of conditions and the following disclaimer. | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in the | ||
| 14 | * documentation and/or other materials provided with the distribution. | ||
| 15 | * 3. Neither the name of GIAGIO.COM nor the names of its contributors | ||
| 16 | * may be used to endorse or promote products derived from this software | ||
| 17 | * without specific prior written permission. | ||
| 18 | * | ||
| 19 | * Alternatively, provided that this notice is retained in full, this | ||
| 20 | * software may be distributed under the terms of the GNU General | ||
| 21 | * Public License ("GPL") version 2, in which case the provisions of the | ||
| 22 | * GPL apply INSTEAD OF those given above. | ||
| 23 | * | ||
| 24 | * The provided data structures and external interfaces from this code | ||
| 25 | * are not restricted to be used by modules with a GPL compatible license. | ||
| 26 | * | ||
| 27 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| 28 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| 29 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| 30 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| 31 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 32 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| 33 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| 34 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| 35 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 36 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| 37 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | ||
| 38 | * DAMAGE. | ||
| 39 | * | ||
| 40 | * | ||
| 41 | * Attention: iPhone device must be paired, otherwise it won't respond to our | ||
| 42 | * driver. For more info: http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver | ||
| 43 | * | ||
| 44 | */ | ||
| 45 | |||
| 46 | #include <linux/kernel.h> | ||
| 47 | #include <linux/errno.h> | ||
| 48 | #include <linux/init.h> | ||
| 49 | #include <linux/slab.h> | ||
| 50 | #include <linux/module.h> | ||
| 51 | #include <linux/netdevice.h> | ||
| 52 | #include <linux/etherdevice.h> | ||
| 53 | #include <linux/ethtool.h> | ||
| 54 | #include <linux/usb.h> | ||
| 55 | #include <linux/workqueue.h> | ||
| 56 | |||
| 57 | #define USB_VENDOR_APPLE 0x05ac | ||
| 58 | #define USB_PRODUCT_IPHONE 0x1290 | ||
| 59 | #define USB_PRODUCT_IPHONE_3G 0x1292 | ||
| 60 | #define USB_PRODUCT_IPHONE_3GS 0x1294 | ||
| 61 | |||
| 62 | #define IPHETH_USBINTF_CLASS 255 | ||
| 63 | #define IPHETH_USBINTF_SUBCLASS 253 | ||
| 64 | #define IPHETH_USBINTF_PROTO 1 | ||
| 65 | |||
| 66 | #define IPHETH_BUF_SIZE 1516 | ||
| 67 | #define IPHETH_TX_TIMEOUT (5 * HZ) | ||
| 68 | |||
| 69 | #define IPHETH_INTFNUM 2 | ||
| 70 | #define IPHETH_ALT_INTFNUM 1 | ||
| 71 | |||
| 72 | #define IPHETH_CTRL_ENDP 0x00 | ||
| 73 | #define IPHETH_CTRL_BUF_SIZE 0x40 | ||
| 74 | #define IPHETH_CTRL_TIMEOUT (5 * HZ) | ||
| 75 | |||
| 76 | #define IPHETH_CMD_GET_MACADDR 0x00 | ||
| 77 | #define IPHETH_CMD_CARRIER_CHECK 0x45 | ||
| 78 | |||
| 79 | #define IPHETH_CARRIER_CHECK_TIMEOUT round_jiffies_relative(1 * HZ) | ||
| 80 | #define IPHETH_CARRIER_ON 0x04 | ||
| 81 | |||
| 82 | static struct usb_device_id ipheth_table[] = { | ||
| 83 | { USB_DEVICE_AND_INTERFACE_INFO( | ||
| 84 | USB_VENDOR_APPLE, USB_PRODUCT_IPHONE, | ||
| 85 | IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, | ||
| 86 | IPHETH_USBINTF_PROTO) }, | ||
| 87 | { USB_DEVICE_AND_INTERFACE_INFO( | ||
| 88 | USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G, | ||
| 89 | IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, | ||
| 90 | IPHETH_USBINTF_PROTO) }, | ||
| 91 | { USB_DEVICE_AND_INTERFACE_INFO( | ||
| 92 | USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS, | ||
| 93 | IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, | ||
| 94 | IPHETH_USBINTF_PROTO) }, | ||
| 95 | { } | ||
| 96 | }; | ||
| 97 | MODULE_DEVICE_TABLE(usb, ipheth_table); | ||
| 98 | |||
| 99 | struct ipheth_device { | ||
| 100 | struct usb_device *udev; | ||
| 101 | struct usb_interface *intf; | ||
| 102 | struct net_device *net; | ||
| 103 | struct sk_buff *tx_skb; | ||
| 104 | struct urb *tx_urb; | ||
| 105 | struct urb *rx_urb; | ||
| 106 | unsigned char *tx_buf; | ||
| 107 | unsigned char *rx_buf; | ||
| 108 | unsigned char *ctrl_buf; | ||
| 109 | u8 bulk_in; | ||
| 110 | u8 bulk_out; | ||
| 111 | struct delayed_work carrier_work; | ||
| 112 | }; | ||
| 113 | |||
| 114 | static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags); | ||
| 115 | |||
| 116 | static int ipheth_alloc_urbs(struct ipheth_device *iphone) | ||
| 117 | { | ||
| 118 | struct urb *tx_urb = NULL; | ||
| 119 | struct urb *rx_urb = NULL; | ||
| 120 | u8 *tx_buf = NULL; | ||
| 121 | u8 *rx_buf = NULL; | ||
| 122 | |||
| 123 | tx_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
| 124 | if (tx_urb == NULL) | ||
| 125 | goto error_nomem; | ||
| 126 | |||
| 127 | rx_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
| 128 | if (rx_urb == NULL) | ||
| 129 | goto free_tx_urb; | ||
| 130 | |||
| 131 | tx_buf = usb_buffer_alloc(iphone->udev, | ||
| 132 | IPHETH_BUF_SIZE, | ||
| 133 | GFP_KERNEL, | ||
| 134 | &tx_urb->transfer_dma); | ||
| 135 | if (tx_buf == NULL) | ||
| 136 | goto free_rx_urb; | ||
| 137 | |||
| 138 | rx_buf = usb_buffer_alloc(iphone->udev, | ||
| 139 | IPHETH_BUF_SIZE, | ||
| 140 | GFP_KERNEL, | ||
| 141 | &rx_urb->transfer_dma); | ||
| 142 | if (rx_buf == NULL) | ||
| 143 | goto free_tx_buf; | ||
| 144 | |||
| 145 | |||
| 146 | iphone->tx_urb = tx_urb; | ||
| 147 | iphone->rx_urb = rx_urb; | ||
| 148 | iphone->tx_buf = tx_buf; | ||
| 149 | iphone->rx_buf = rx_buf; | ||
| 150 | return 0; | ||
| 151 | |||
| 152 | free_tx_buf: | ||
| 153 | usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf, | ||
| 154 | tx_urb->transfer_dma); | ||
| 155 | free_rx_urb: | ||
| 156 | usb_free_urb(rx_urb); | ||
| 157 | free_tx_urb: | ||
| 158 | usb_free_urb(tx_urb); | ||
| 159 | error_nomem: | ||
| 160 | return -ENOMEM; | ||
| 161 | } | ||
| 162 | |||
| 163 | static void ipheth_free_urbs(struct ipheth_device *iphone) | ||
| 164 | { | ||
| 165 | usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf, | ||
| 166 | iphone->rx_urb->transfer_dma); | ||
| 167 | usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf, | ||
| 168 | iphone->tx_urb->transfer_dma); | ||
| 169 | usb_free_urb(iphone->rx_urb); | ||
| 170 | usb_free_urb(iphone->tx_urb); | ||
| 171 | } | ||
| 172 | |||
| 173 | static void ipheth_kill_urbs(struct ipheth_device *dev) | ||
| 174 | { | ||
| 175 | usb_kill_urb(dev->tx_urb); | ||
| 176 | usb_kill_urb(dev->rx_urb); | ||
| 177 | } | ||
| 178 | |||
| 179 | static void ipheth_rcvbulk_callback(struct urb *urb) | ||
| 180 | { | ||
| 181 | struct ipheth_device *dev; | ||
| 182 | struct sk_buff *skb; | ||
| 183 | int status; | ||
| 184 | char *buf; | ||
| 185 | int len; | ||
| 186 | |||
| 187 | dev = urb->context; | ||
| 188 | if (dev == NULL) | ||
| 189 | return; | ||
| 190 | |||
| 191 | status = urb->status; | ||
| 192 | switch (status) { | ||
| 193 | case -ENOENT: | ||
| 194 | case -ECONNRESET: | ||
| 195 | case -ESHUTDOWN: | ||
| 196 | return; | ||
| 197 | case 0: | ||
| 198 | break; | ||
| 199 | default: | ||
| 200 | err("%s: urb status: %d", __func__, urb->status); | ||
| 201 | return; | ||
| 202 | } | ||
| 203 | |||
| 204 | len = urb->actual_length; | ||
| 205 | buf = urb->transfer_buffer; | ||
| 206 | |||
| 207 | skb = dev_alloc_skb(NET_IP_ALIGN + len); | ||
| 208 | if (!skb) { | ||
| 209 | err("%s: dev_alloc_skb: -ENOMEM", __func__); | ||
| 210 | dev->net->stats.rx_dropped++; | ||
| 211 | return; | ||
| 212 | } | ||
| 213 | |||
| 214 | skb_reserve(skb, NET_IP_ALIGN); | ||
| 215 | memcpy(skb_put(skb, len), buf + NET_IP_ALIGN, len - NET_IP_ALIGN); | ||
| 216 | skb->dev = dev->net; | ||
| 217 | skb->protocol = eth_type_trans(skb, dev->net); | ||
| 218 | |||
| 219 | dev->net->stats.rx_packets++; | ||
| 220 | dev->net->stats.rx_bytes += len; | ||
| 221 | |||
| 222 | netif_rx(skb); | ||
| 223 | ipheth_rx_submit(dev, GFP_ATOMIC); | ||
| 224 | } | ||
| 225 | |||
| 226 | static void ipheth_sndbulk_callback(struct urb *urb) | ||
| 227 | { | ||
| 228 | struct ipheth_device *dev; | ||
| 229 | |||
| 230 | dev = urb->context; | ||
| 231 | if (dev == NULL) | ||
| 232 | return; | ||
| 233 | |||
| 234 | if (urb->status != 0 && | ||
| 235 | urb->status != -ENOENT && | ||
| 236 | urb->status != -ECONNRESET && | ||
| 237 | urb->status != -ESHUTDOWN) | ||
| 238 | err("%s: urb status: %d", __func__, urb->status); | ||
| 239 | |||
| 240 | dev_kfree_skb_irq(dev->tx_skb); | ||
| 241 | netif_wake_queue(dev->net); | ||
| 242 | } | ||
| 243 | |||
| 244 | static int ipheth_carrier_set(struct ipheth_device *dev) | ||
| 245 | { | ||
| 246 | struct usb_device *udev = dev->udev; | ||
| 247 | int retval; | ||
| 248 | |||
| 249 | retval = usb_control_msg(udev, | ||
| 250 | usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP), | ||
| 251 | IPHETH_CMD_CARRIER_CHECK, /* request */ | ||
| 252 | 0xc0, /* request type */ | ||
| 253 | 0x00, /* value */ | ||
| 254 | 0x02, /* index */ | ||
| 255 | dev->ctrl_buf, IPHETH_CTRL_BUF_SIZE, | ||
| 256 | IPHETH_CTRL_TIMEOUT); | ||
| 257 | if (retval < 0) { | ||
| 258 | err("%s: usb_control_msg: %d", __func__, retval); | ||
| 259 | return retval; | ||
| 260 | } | ||
| 261 | |||
| 262 | if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON) | ||
| 263 | netif_carrier_on(dev->net); | ||
| 264 | else | ||
| 265 | netif_carrier_off(dev->net); | ||
| 266 | |||
| 267 | return 0; | ||
| 268 | } | ||
| 269 | |||
| 270 | static void ipheth_carrier_check_work(struct work_struct *work) | ||
| 271 | { | ||
| 272 | struct ipheth_device *dev = container_of(work, struct ipheth_device, | ||
| 273 | carrier_work.work); | ||
| 274 | |||
| 275 | ipheth_carrier_set(dev); | ||
| 276 | schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT); | ||
| 277 | } | ||
| 278 | |||
| 279 | static int ipheth_get_macaddr(struct ipheth_device *dev) | ||
| 280 | { | ||
| 281 | struct usb_device *udev = dev->udev; | ||
| 282 | struct net_device *net = dev->net; | ||
| 283 | int retval; | ||
| 284 | |||
| 285 | retval = usb_control_msg(udev, | ||
| 286 | usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP), | ||
| 287 | IPHETH_CMD_GET_MACADDR, /* request */ | ||
| 288 | 0xc0, /* request type */ | ||
| 289 | 0x00, /* value */ | ||
| 290 | 0x02, /* index */ | ||
| 291 | dev->ctrl_buf, | ||
| 292 | IPHETH_CTRL_BUF_SIZE, | ||
| 293 | IPHETH_CTRL_TIMEOUT); | ||
| 294 | if (retval < 0) { | ||
| 295 | err("%s: usb_control_msg: %d", __func__, retval); | ||
| 296 | } else if (retval < ETH_ALEN) { | ||
| 297 | err("%s: usb_control_msg: short packet: %d bytes", | ||
| 298 | __func__, retval); | ||
| 299 | retval = -EINVAL; | ||
| 300 | } else { | ||
| 301 | memcpy(net->dev_addr, dev->ctrl_buf, ETH_ALEN); | ||
| 302 | retval = 0; | ||
| 303 | } | ||
| 304 | |||
| 305 | return retval; | ||
| 306 | } | ||
| 307 | |||
| 308 | static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags) | ||
| 309 | { | ||
| 310 | struct usb_device *udev = dev->udev; | ||
| 311 | int retval; | ||
| 312 | |||
| 313 | usb_fill_bulk_urb(dev->rx_urb, udev, | ||
| 314 | usb_rcvbulkpipe(udev, dev->bulk_in), | ||
| 315 | dev->rx_buf, IPHETH_BUF_SIZE, | ||
| 316 | ipheth_rcvbulk_callback, | ||
| 317 | dev); | ||
| 318 | dev->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
| 319 | |||
| 320 | retval = usb_submit_urb(dev->rx_urb, mem_flags); | ||
| 321 | if (retval) | ||
| 322 | err("%s: usb_submit_urb: %d", __func__, retval); | ||
| 323 | return retval; | ||
| 324 | } | ||
| 325 | |||
| 326 | static int ipheth_open(struct net_device *net) | ||
| 327 | { | ||
| 328 | struct ipheth_device *dev = netdev_priv(net); | ||
| 329 | struct usb_device *udev = dev->udev; | ||
| 330 | int retval = 0; | ||
| 331 | |||
| 332 | usb_set_interface(udev, IPHETH_INTFNUM, IPHETH_ALT_INTFNUM); | ||
| 333 | |||
| 334 | retval = ipheth_carrier_set(dev); | ||
| 335 | if (retval) | ||
| 336 | return retval; | ||
| 337 | |||
| 338 | retval = ipheth_rx_submit(dev, GFP_KERNEL); | ||
| 339 | if (retval) | ||
| 340 | return retval; | ||
| 341 | |||
| 342 | schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT); | ||
| 343 | netif_start_queue(net); | ||
| 344 | return retval; | ||
| 345 | } | ||
| 346 | |||
| 347 | static int ipheth_close(struct net_device *net) | ||
| 348 | { | ||
| 349 | struct ipheth_device *dev = netdev_priv(net); | ||
| 350 | |||
| 351 | cancel_delayed_work_sync(&dev->carrier_work); | ||
| 352 | netif_stop_queue(net); | ||
| 353 | return 0; | ||
| 354 | } | ||
| 355 | |||
| 356 | static int ipheth_tx(struct sk_buff *skb, struct net_device *net) | ||
| 357 | { | ||
| 358 | struct ipheth_device *dev = netdev_priv(net); | ||
| 359 | struct usb_device *udev = dev->udev; | ||
| 360 | int retval; | ||
| 361 | |||
| 362 | /* Paranoid */ | ||
| 363 | if (skb->len > IPHETH_BUF_SIZE) { | ||
| 364 | WARN(1, "%s: skb too large: %d bytes", __func__, skb->len); | ||
| 365 | dev->net->stats.tx_dropped++; | ||
| 366 | dev_kfree_skb_irq(skb); | ||
| 367 | return NETDEV_TX_OK; | ||
| 368 | } | ||
| 369 | |||
| 370 | memcpy(dev->tx_buf, skb->data, skb->len); | ||
| 371 | if (skb->len < IPHETH_BUF_SIZE) | ||
| 372 | memset(dev->tx_buf + skb->len, 0, IPHETH_BUF_SIZE - skb->len); | ||
| 373 | |||
| 374 | usb_fill_bulk_urb(dev->tx_urb, udev, | ||
| 375 | usb_sndbulkpipe(udev, dev->bulk_out), | ||
| 376 | dev->tx_buf, IPHETH_BUF_SIZE, | ||
| 377 | ipheth_sndbulk_callback, | ||
| 378 | dev); | ||
| 379 | dev->tx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
| 380 | |||
| 381 | retval = usb_submit_urb(dev->tx_urb, GFP_ATOMIC); | ||
| 382 | if (retval) { | ||
| 383 | err("%s: usb_submit_urb: %d", __func__, retval); | ||
| 384 | dev->net->stats.tx_errors++; | ||
| 385 | dev_kfree_skb_irq(skb); | ||
| 386 | } else { | ||
| 387 | dev->tx_skb = skb; | ||
| 388 | |||
| 389 | dev->net->stats.tx_packets++; | ||
| 390 | dev->net->stats.tx_bytes += skb->len; | ||
| 391 | netif_stop_queue(net); | ||
| 392 | } | ||
| 393 | |||
| 394 | return NETDEV_TX_OK; | ||
| 395 | } | ||
| 396 | |||
| 397 | static void ipheth_tx_timeout(struct net_device *net) | ||
| 398 | { | ||
| 399 | struct ipheth_device *dev = netdev_priv(net); | ||
| 400 | |||
| 401 | err("%s: TX timeout", __func__); | ||
| 402 | dev->net->stats.tx_errors++; | ||
| 403 | usb_unlink_urb(dev->tx_urb); | ||
| 404 | } | ||
| 405 | |||
| 406 | static struct net_device_stats *ipheth_stats(struct net_device *net) | ||
| 407 | { | ||
| 408 | struct ipheth_device *dev = netdev_priv(net); | ||
| 409 | return &dev->net->stats; | ||
| 410 | } | ||
| 411 | |||
| 412 | static u32 ipheth_ethtool_op_get_link(struct net_device *net) | ||
| 413 | { | ||
| 414 | struct ipheth_device *dev = netdev_priv(net); | ||
| 415 | return netif_carrier_ok(dev->net); | ||
| 416 | } | ||
| 417 | |||
| 418 | static struct ethtool_ops ops = { | ||
| 419 | .get_link = ipheth_ethtool_op_get_link | ||
| 420 | }; | ||
| 421 | |||
| 422 | static const struct net_device_ops ipheth_netdev_ops = { | ||
| 423 | .ndo_open = &ipheth_open, | ||
| 424 | .ndo_stop = &ipheth_close, | ||
| 425 | .ndo_start_xmit = &ipheth_tx, | ||
| 426 | .ndo_tx_timeout = &ipheth_tx_timeout, | ||
| 427 | .ndo_get_stats = &ipheth_stats, | ||
| 428 | }; | ||
| 429 | |||
| 430 | static struct device_type ipheth_type = { | ||
| 431 | .name = "wwan", | ||
| 432 | }; | ||
| 433 | |||
| 434 | static int ipheth_probe(struct usb_interface *intf, | ||
| 435 | const struct usb_device_id *id) | ||
| 436 | { | ||
| 437 | struct usb_device *udev = interface_to_usbdev(intf); | ||
| 438 | struct usb_host_interface *hintf; | ||
| 439 | struct usb_endpoint_descriptor *endp; | ||
| 440 | struct ipheth_device *dev; | ||
| 441 | struct net_device *netdev; | ||
| 442 | int i; | ||
| 443 | int retval; | ||
| 444 | |||
| 445 | netdev = alloc_etherdev(sizeof(struct ipheth_device)); | ||
| 446 | if (!netdev) | ||
| 447 | return -ENOMEM; | ||
| 448 | |||
| 449 | netdev->netdev_ops = &ipheth_netdev_ops; | ||
| 450 | netdev->watchdog_timeo = IPHETH_TX_TIMEOUT; | ||
| 451 | strcpy(netdev->name, "wwan%d"); | ||
| 452 | |||
| 453 | dev = netdev_priv(netdev); | ||
| 454 | dev->udev = udev; | ||
| 455 | dev->net = netdev; | ||
| 456 | dev->intf = intf; | ||
| 457 | |||
| 458 | /* Set up endpoints */ | ||
| 459 | hintf = usb_altnum_to_altsetting(intf, IPHETH_ALT_INTFNUM); | ||
| 460 | if (hintf == NULL) { | ||
| 461 | retval = -ENODEV; | ||
| 462 | err("Unable to find alternate settings interface"); | ||
| 463 | goto err_endpoints; | ||
| 464 | } | ||
| 465 | |||
| 466 | for (i = 0; i < hintf->desc.bNumEndpoints; i++) { | ||
| 467 | endp = &hintf->endpoint[i].desc; | ||
| 468 | if (usb_endpoint_is_bulk_in(endp)) | ||
| 469 | dev->bulk_in = endp->bEndpointAddress; | ||
| 470 | else if (usb_endpoint_is_bulk_out(endp)) | ||
| 471 | dev->bulk_out = endp->bEndpointAddress; | ||
| 472 | } | ||
| 473 | if (!(dev->bulk_in && dev->bulk_out)) { | ||
| 474 | retval = -ENODEV; | ||
| 475 | err("Unable to find endpoints"); | ||
| 476 | goto err_endpoints; | ||
| 477 | } | ||
| 478 | |||
| 479 | dev->ctrl_buf = kmalloc(IPHETH_CTRL_BUF_SIZE, GFP_KERNEL); | ||
| 480 | if (dev->ctrl_buf == NULL) { | ||
| 481 | retval = -ENOMEM; | ||
| 482 | goto err_alloc_ctrl_buf; | ||
| 483 | } | ||
| 484 | |||
| 485 | retval = ipheth_get_macaddr(dev); | ||
| 486 | if (retval) | ||
| 487 | goto err_get_macaddr; | ||
| 488 | |||
| 489 | INIT_DELAYED_WORK(&dev->carrier_work, ipheth_carrier_check_work); | ||
| 490 | |||
| 491 | retval = ipheth_alloc_urbs(dev); | ||
| 492 | if (retval) { | ||
| 493 | err("error allocating urbs: %d", retval); | ||
| 494 | goto err_alloc_urbs; | ||
| 495 | } | ||
| 496 | |||
| 497 | usb_set_intfdata(intf, dev); | ||
| 498 | |||
| 499 | SET_NETDEV_DEV(netdev, &intf->dev); | ||
| 500 | SET_ETHTOOL_OPS(netdev, &ops); | ||
| 501 | SET_NETDEV_DEVTYPE(netdev, &ipheth_type); | ||
| 502 | |||
| 503 | retval = register_netdev(netdev); | ||
| 504 | if (retval) { | ||
| 505 | err("error registering netdev: %d", retval); | ||
| 506 | retval = -EIO; | ||
| 507 | goto err_register_netdev; | ||
| 508 | } | ||
| 509 | |||
| 510 | dev_info(&intf->dev, "Apple iPhone USB Ethernet device attached\n"); | ||
| 511 | return 0; | ||
| 512 | |||
| 513 | err_register_netdev: | ||
| 514 | ipheth_free_urbs(dev); | ||
| 515 | err_alloc_urbs: | ||
| 516 | err_get_macaddr: | ||
| 517 | err_alloc_ctrl_buf: | ||
| 518 | kfree(dev->ctrl_buf); | ||
| 519 | err_endpoints: | ||
| 520 | free_netdev(netdev); | ||
| 521 | return retval; | ||
| 522 | } | ||
| 523 | |||
| 524 | static void ipheth_disconnect(struct usb_interface *intf) | ||
| 525 | { | ||
| 526 | struct ipheth_device *dev; | ||
| 527 | |||
| 528 | dev = usb_get_intfdata(intf); | ||
| 529 | if (dev != NULL) { | ||
| 530 | unregister_netdev(dev->net); | ||
| 531 | ipheth_kill_urbs(dev); | ||
| 532 | ipheth_free_urbs(dev); | ||
| 533 | kfree(dev->ctrl_buf); | ||
| 534 | free_netdev(dev->net); | ||
| 535 | } | ||
| 536 | usb_set_intfdata(intf, NULL); | ||
| 537 | dev_info(&intf->dev, "Apple iPhone USB Ethernet now disconnected\n"); | ||
| 538 | } | ||
| 539 | |||
| 540 | static struct usb_driver ipheth_driver = { | ||
| 541 | .name = "ipheth", | ||
| 542 | .probe = ipheth_probe, | ||
| 543 | .disconnect = ipheth_disconnect, | ||
| 544 | .id_table = ipheth_table, | ||
| 545 | }; | ||
| 546 | |||
| 547 | static int __init ipheth_init(void) | ||
| 548 | { | ||
| 549 | int retval; | ||
| 550 | |||
| 551 | retval = usb_register(&ipheth_driver); | ||
| 552 | if (retval) { | ||
| 553 | err("usb_register failed: %d", retval); | ||
| 554 | return retval; | ||
| 555 | } | ||
| 556 | return 0; | ||
| 557 | } | ||
| 558 | |||
| 559 | static void __exit ipheth_exit(void) | ||
| 560 | { | ||
| 561 | usb_deregister(&ipheth_driver); | ||
| 562 | } | ||
| 563 | |||
| 564 | module_init(ipheth_init); | ||
| 565 | module_exit(ipheth_exit); | ||
| 566 | |||
| 567 | MODULE_AUTHOR("Diego Giagio <diego@giagio.com>"); | ||
| 568 | MODULE_DESCRIPTION("Apple iPhone USB Ethernet driver"); | ||
| 569 | MODULE_LICENSE("Dual BSD/GPL"); | ||
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 52671ea043a7..c4c334d9770f 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
| @@ -145,6 +145,7 @@ static struct usb_device_id usb_klsi_table[] = { | |||
| 145 | { USB_DEVICE(0x0707, 0x0100) }, /* SMC 2202USB */ | 145 | { USB_DEVICE(0x0707, 0x0100) }, /* SMC 2202USB */ |
| 146 | { USB_DEVICE(0x07aa, 0x0001) }, /* Correga K.K. */ | 146 | { USB_DEVICE(0x07aa, 0x0001) }, /* Correga K.K. */ |
| 147 | { USB_DEVICE(0x07b8, 0x4000) }, /* D-Link DU-E10 */ | 147 | { USB_DEVICE(0x07b8, 0x4000) }, /* D-Link DU-E10 */ |
| 148 | { USB_DEVICE(0x07c9, 0xb010) }, /* Allied Telesyn AT-USB10 USB Ethernet Adapter */ | ||
| 148 | { USB_DEVICE(0x0846, 0x1001) }, /* NetGear EA-101 */ | 149 | { USB_DEVICE(0x0846, 0x1001) }, /* NetGear EA-101 */ |
| 149 | { USB_DEVICE(0x0846, 0x1002) }, /* NetGear EA-101 */ | 150 | { USB_DEVICE(0x0846, 0x1002) }, /* NetGear EA-101 */ |
| 150 | { USB_DEVICE(0x085a, 0x0008) }, /* PortGear Ethernet Adapter */ | 151 | { USB_DEVICE(0x085a, 0x0008) }, /* PortGear Ethernet Adapter */ |
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c new file mode 100644 index 000000000000..f1942d69a0d5 --- /dev/null +++ b/drivers/net/usb/sierra_net.c | |||
| @@ -0,0 +1,1004 @@ | |||
| 1 | /* | ||
| 2 | * USB-to-WWAN Driver for Sierra Wireless modems | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008, 2009, 2010 Paxton Smith, Matthew Safar, Rory Filer | ||
| 5 | * <linux@sierrawireless.com> | ||
| 6 | * | ||
| 7 | * Portions of this based on the cdc_ether driver by David Brownell (2003-2005) | ||
| 8 | * and Ole Andre Vadla Ravnas (ActiveSync) (2006). | ||
| 9 | * | ||
| 10 | * IMPORTANT DISCLAIMER: This driver is not commercially supported by | ||
| 11 | * Sierra Wireless. Use at your own risk. | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | ||
| 14 | * it under the terms of the GNU General Public License as published by | ||
| 15 | * the Free Software Foundation; either version 2 of the License, or | ||
| 16 | * (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This program is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with this program; if not, write to the Free Software | ||
| 25 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 26 | */ | ||
| 27 | |||
| 28 | #define DRIVER_VERSION "v.2.0" | ||
| 29 | #define DRIVER_AUTHOR "Paxton Smith, Matthew Safar, Rory Filer" | ||
| 30 | #define DRIVER_DESC "USB-to-WWAN Driver for Sierra Wireless modems" | ||
| 31 | static const char driver_name[] = "sierra_net"; | ||
| 32 | |||
| 33 | /* if defined debug messages enabled */ | ||
| 34 | /*#define DEBUG*/ | ||
| 35 | |||
| 36 | #include <linux/module.h> | ||
| 37 | #include <linux/etherdevice.h> | ||
| 38 | #include <linux/ethtool.h> | ||
| 39 | #include <linux/mii.h> | ||
| 40 | #include <linux/sched.h> | ||
| 41 | #include <linux/timer.h> | ||
| 42 | #include <linux/usb.h> | ||
| 43 | #include <linux/usb/cdc.h> | ||
| 44 | #include <net/ip.h> | ||
| 45 | #include <net/udp.h> | ||
| 46 | #include <asm/unaligned.h> | ||
| 47 | #include <linux/usb/usbnet.h> | ||
| 48 | |||
| 49 | #define SWI_USB_REQUEST_GET_FW_ATTR 0x06 | ||
| 50 | #define SWI_GET_FW_ATTR_MASK 0x08 | ||
| 51 | |||
| 52 | /* atomic counter partially included in MAC address to make sure 2 devices | ||
| 53 | * do not end up with the same MAC - concept breaks in case of > 255 ifaces | ||
| 54 | */ | ||
| 55 | static atomic_t iface_counter = ATOMIC_INIT(0); | ||
| 56 | |||
| 57 | /* | ||
| 58 | * SYNC Timer Delay definition used to set the expiry time | ||
| 59 | */ | ||
| 60 | #define SIERRA_NET_SYNCDELAY (2*HZ) | ||
| 61 | |||
| 62 | /* Max. MTU supported. The modem buffers are limited to 1500 */ | ||
| 63 | #define SIERRA_NET_MAX_SUPPORTED_MTU 1500 | ||
| 64 | |||
| 65 | /* The SIERRA_NET_USBCTL_BUF_LEN defines a buffer size allocated for control | ||
| 66 | * message reception ... and thus the max. received packet. | ||
| 67 | * (May be the cause for parse_hip returning -EINVAL) | ||
| 68 | */ | ||
| 69 | #define SIERRA_NET_USBCTL_BUF_LEN 1024 | ||
| 70 | |||
| 71 | /* list of interface numbers - used for constructing interface lists */ | ||
| 72 | struct sierra_net_iface_info { | ||
| 73 | const u32 infolen; /* number of interface numbers on list */ | ||
| 74 | const u8 *ifaceinfo; /* pointer to the array holding the numbers */ | ||
| 75 | }; | ||
| 76 | |||
| 77 | struct sierra_net_info_data { | ||
| 78 | u16 rx_urb_size; | ||
| 79 | struct sierra_net_iface_info whitelist; | ||
| 80 | }; | ||
| 81 | |||
| 82 | /* Private data structure */ | ||
| 83 | struct sierra_net_data { | ||
| 84 | |||
| 85 | u8 ethr_hdr_tmpl[ETH_HLEN]; /* ethernet header template for rx'd pkts */ | ||
| 86 | |||
| 87 | u16 link_up; /* air link up or down */ | ||
| 88 | u8 tx_hdr_template[4]; /* part of HIP hdr for tx'd packets */ | ||
| 89 | |||
| 90 | u8 sync_msg[4]; /* SYNC message */ | ||
| 91 | u8 shdwn_msg[4]; /* Shutdown message */ | ||
| 92 | |||
| 93 | /* Backpointer to the container */ | ||
| 94 | struct usbnet *usbnet; | ||
| 95 | |||
| 96 | u8 ifnum; /* interface number */ | ||
| 97 | |||
| 98 | /* Bit masks, must be a power of 2 */ | ||
| 99 | #define SIERRA_NET_EVENT_RESP_AVAIL 0x01 | ||
| 100 | #define SIERRA_NET_TIMER_EXPIRY 0x02 | ||
| 101 | unsigned long kevent_flags; | ||
| 102 | struct work_struct sierra_net_kevent; | ||
| 103 | struct timer_list sync_timer; /* For retrying SYNC sequence */ | ||
| 104 | }; | ||
| 105 | |||
| 106 | struct param { | ||
| 107 | int is_present; | ||
| 108 | union { | ||
| 109 | void *ptr; | ||
| 110 | u32 dword; | ||
| 111 | u16 word; | ||
| 112 | u8 byte; | ||
| 113 | }; | ||
| 114 | }; | ||
| 115 | |||
| 116 | /* HIP message type */ | ||
| 117 | #define SIERRA_NET_HIP_EXTENDEDID 0x7F | ||
| 118 | #define SIERRA_NET_HIP_HSYNC_ID 0x60 /* Modem -> host */ | ||
| 119 | #define SIERRA_NET_HIP_RESTART_ID 0x62 /* Modem -> host */ | ||
| 120 | #define SIERRA_NET_HIP_MSYNC_ID 0x20 /* Host -> modem */ | ||
| 121 | #define SIERRA_NET_HIP_SHUTD_ID 0x26 /* Host -> modem */ | ||
| 122 | |||
| 123 | #define SIERRA_NET_HIP_EXT_IP_IN_ID 0x0202 | ||
| 124 | #define SIERRA_NET_HIP_EXT_IP_OUT_ID 0x0002 | ||
| 125 | |||
| 126 | /* 3G UMTS Link Sense Indication definitions */ | ||
| 127 | #define SIERRA_NET_HIP_LSI_UMTSID 0x78 | ||
| 128 | |||
| 129 | /* Reverse Channel Grant Indication HIP message */ | ||
| 130 | #define SIERRA_NET_HIP_RCGI 0x64 | ||
| 131 | |||
| 132 | /* LSI Protocol types */ | ||
| 133 | #define SIERRA_NET_PROTOCOL_UMTS 0x01 | ||
| 134 | /* LSI Coverage */ | ||
| 135 | #define SIERRA_NET_COVERAGE_NONE 0x00 | ||
| 136 | #define SIERRA_NET_COVERAGE_NOPACKET 0x01 | ||
| 137 | |||
| 138 | /* LSI Session */ | ||
| 139 | #define SIERRA_NET_SESSION_IDLE 0x00 | ||
| 140 | /* LSI Link types */ | ||
| 141 | #define SIERRA_NET_AS_LINK_TYPE_IPv4 0x00 | ||
| 142 | |||
| 143 | struct lsi_umts { | ||
| 144 | u8 protocol; | ||
| 145 | u8 unused1; | ||
| 146 | __be16 length; | ||
| 147 | /* eventually use a union for the rest - assume umts for now */ | ||
| 148 | u8 coverage; | ||
| 149 | u8 unused2[41]; | ||
| 150 | u8 session_state; | ||
| 151 | u8 unused3[33]; | ||
| 152 | u8 link_type; | ||
| 153 | u8 pdp_addr_len; /* NW-supplied PDP address len */ | ||
| 154 | u8 pdp_addr[16]; /* NW-supplied PDP address (bigendian)) */ | ||
| 155 | u8 unused4[23]; | ||
| 156 | u8 dns1_addr_len; /* NW-supplied 1st DNS address len (bigendian) */ | ||
| 157 | u8 dns1_addr[16]; /* NW-supplied 1st DNS address */ | ||
| 158 | u8 dns2_addr_len; /* NW-supplied 2nd DNS address len */ | ||
| 159 | u8 dns2_addr[16]; /* NW-supplied 2nd DNS address (bigendian)*/ | ||
| 160 | u8 wins1_addr_len; /* NW-supplied 1st Wins address len */ | ||
| 161 | u8 wins1_addr[16]; /* NW-supplied 1st Wins address (bigendian)*/ | ||
| 162 | u8 wins2_addr_len; /* NW-supplied 2nd Wins address len */ | ||
| 163 | u8 wins2_addr[16]; /* NW-supplied 2nd Wins address (bigendian) */ | ||
| 164 | u8 unused5[4]; | ||
| 165 | u8 gw_addr_len; /* NW-supplied GW address len */ | ||
| 166 | u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */ | ||
| 167 | u8 reserved[8]; | ||
| 168 | } __attribute__ ((packed)); | ||
| 169 | |||
| 170 | #define SIERRA_NET_LSI_COMMON_LEN 4 | ||
| 171 | #define SIERRA_NET_LSI_UMTS_LEN (sizeof(struct lsi_umts)) | ||
| 172 | #define SIERRA_NET_LSI_UMTS_STATUS_LEN \ | ||
| 173 | (SIERRA_NET_LSI_UMTS_LEN - SIERRA_NET_LSI_COMMON_LEN) | ||
| 174 | |||
| 175 | /* Forward definitions */ | ||
| 176 | static void sierra_sync_timer(unsigned long syncdata); | ||
| 177 | static int sierra_net_change_mtu(struct net_device *net, int new_mtu); | ||
| 178 | |||
| 179 | /* Our own net device operations structure */ | ||
| 180 | static const struct net_device_ops sierra_net_device_ops = { | ||
| 181 | .ndo_open = usbnet_open, | ||
| 182 | .ndo_stop = usbnet_stop, | ||
| 183 | .ndo_start_xmit = usbnet_start_xmit, | ||
| 184 | .ndo_tx_timeout = usbnet_tx_timeout, | ||
| 185 | .ndo_change_mtu = sierra_net_change_mtu, | ||
| 186 | .ndo_set_mac_address = eth_mac_addr, | ||
| 187 | .ndo_validate_addr = eth_validate_addr, | ||
| 188 | }; | ||
| 189 | |||
| 190 | /* get private data associated with passed in usbnet device */ | ||
| 191 | static inline struct sierra_net_data *sierra_net_get_private(struct usbnet *dev) | ||
| 192 | { | ||
| 193 | return (struct sierra_net_data *)dev->data[0]; | ||
| 194 | } | ||
| 195 | |||
| 196 | /* set private data associated with passed in usbnet device */ | ||
| 197 | static inline void sierra_net_set_private(struct usbnet *dev, | ||
| 198 | struct sierra_net_data *priv) | ||
| 199 | { | ||
| 200 | dev->data[0] = (unsigned long)priv; | ||
| 201 | } | ||
| 202 | |||
| 203 | /* is packet IPv4 */ | ||
| 204 | static inline int is_ip(struct sk_buff *skb) | ||
| 205 | { | ||
| 206 | return (skb->protocol == cpu_to_be16(ETH_P_IP)); | ||
| 207 | } | ||
| 208 | |||
| 209 | /* | ||
| 210 | * check passed in packet and make sure that: | ||
| 211 | * - it is linear (no scatter/gather) | ||
| 212 | * - it is ethernet (mac_header properly set) | ||
| 213 | */ | ||
| 214 | static int check_ethip_packet(struct sk_buff *skb, struct usbnet *dev) | ||
| 215 | { | ||
| 216 | skb_reset_mac_header(skb); /* ethernet header */ | ||
| 217 | |||
| 218 | if (skb_is_nonlinear(skb)) { | ||
| 219 | netdev_err(dev->net, "Non linear buffer-dropping\n"); | ||
| 220 | return 0; | ||
| 221 | } | ||
| 222 | |||
| 223 | if (!pskb_may_pull(skb, ETH_HLEN)) | ||
| 224 | return 0; | ||
| 225 | skb->protocol = eth_hdr(skb)->h_proto; | ||
| 226 | |||
| 227 | return 1; | ||
| 228 | } | ||
| 229 | |||
| 230 | static const u8 *save16bit(struct param *p, const u8 *datap) | ||
| 231 | { | ||
| 232 | p->is_present = 1; | ||
| 233 | p->word = get_unaligned_be16(datap); | ||
| 234 | return datap + sizeof(p->word); | ||
| 235 | } | ||
| 236 | |||
| 237 | static const u8 *save8bit(struct param *p, const u8 *datap) | ||
| 238 | { | ||
| 239 | p->is_present = 1; | ||
| 240 | p->byte = *datap; | ||
| 241 | return datap + sizeof(p->byte); | ||
| 242 | } | ||
| 243 | |||
| 244 | /*----------------------------------------------------------------------------* | ||
| 245 | * BEGIN HIP * | ||
| 246 | *----------------------------------------------------------------------------*/ | ||
| 247 | /* HIP header */ | ||
| 248 | #define SIERRA_NET_HIP_HDR_LEN 4 | ||
| 249 | /* Extended HIP header */ | ||
| 250 | #define SIERRA_NET_HIP_EXT_HDR_LEN 6 | ||
| 251 | |||
| 252 | struct hip_hdr { | ||
| 253 | int hdrlen; | ||
| 254 | struct param payload_len; | ||
| 255 | struct param msgid; | ||
| 256 | struct param msgspecific; | ||
| 257 | struct param extmsgid; | ||
| 258 | }; | ||
| 259 | |||
| 260 | static int parse_hip(const u8 *buf, const u32 buflen, struct hip_hdr *hh) | ||
| 261 | { | ||
| 262 | const u8 *curp = buf; | ||
| 263 | int padded; | ||
| 264 | |||
| 265 | if (buflen < SIERRA_NET_HIP_HDR_LEN) | ||
| 266 | return -EPROTO; | ||
| 267 | |||
| 268 | curp = save16bit(&hh->payload_len, curp); | ||
| 269 | curp = save8bit(&hh->msgid, curp); | ||
| 270 | curp = save8bit(&hh->msgspecific, curp); | ||
| 271 | |||
| 272 | padded = hh->msgid.byte & 0x80; | ||
| 273 | hh->msgid.byte &= 0x7F; /* 7 bits */ | ||
| 274 | |||
| 275 | hh->extmsgid.is_present = (hh->msgid.byte == SIERRA_NET_HIP_EXTENDEDID); | ||
| 276 | if (hh->extmsgid.is_present) { | ||
| 277 | if (buflen < SIERRA_NET_HIP_EXT_HDR_LEN) | ||
| 278 | return -EPROTO; | ||
| 279 | |||
| 280 | hh->payload_len.word &= 0x3FFF; /* 14 bits */ | ||
| 281 | |||
| 282 | curp = save16bit(&hh->extmsgid, curp); | ||
| 283 | hh->extmsgid.word &= 0x03FF; /* 10 bits */ | ||
| 284 | |||
| 285 | hh->hdrlen = SIERRA_NET_HIP_EXT_HDR_LEN; | ||
| 286 | } else { | ||
| 287 | hh->payload_len.word &= 0x07FF; /* 11 bits */ | ||
| 288 | hh->hdrlen = SIERRA_NET_HIP_HDR_LEN; | ||
| 289 | } | ||
| 290 | |||
| 291 | if (padded) { | ||
| 292 | hh->hdrlen++; | ||
| 293 | hh->payload_len.word--; | ||
| 294 | } | ||
| 295 | |||
| 296 | /* if real packet shorter than the claimed length */ | ||
| 297 | if (buflen < (hh->hdrlen + hh->payload_len.word)) | ||
| 298 | return -EINVAL; | ||
| 299 | |||
| 300 | return 0; | ||
| 301 | } | ||
| 302 | |||
| 303 | static void build_hip(u8 *buf, const u16 payloadlen, | ||
| 304 | struct sierra_net_data *priv) | ||
| 305 | { | ||
| 306 | /* the following doesn't have the full functionality. We | ||
| 307 | * currently build only one kind of header, so it is faster this way | ||
| 308 | */ | ||
| 309 | put_unaligned_be16(payloadlen, buf); | ||
| 310 | memcpy(buf+2, priv->tx_hdr_template, sizeof(priv->tx_hdr_template)); | ||
| 311 | } | ||
| 312 | /*----------------------------------------------------------------------------* | ||
| 313 | * END HIP * | ||
| 314 | *----------------------------------------------------------------------------*/ | ||
| 315 | |||
| 316 | static int sierra_net_send_cmd(struct usbnet *dev, | ||
| 317 | u8 *cmd, int cmdlen, const char * cmd_name) | ||
| 318 | { | ||
| 319 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 320 | int status; | ||
| 321 | |||
| 322 | status = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), | ||
| 323 | USB_CDC_SEND_ENCAPSULATED_COMMAND, | ||
| 324 | USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE, 0, | ||
| 325 | priv->ifnum, cmd, cmdlen, USB_CTRL_SET_TIMEOUT); | ||
| 326 | |||
| 327 | if (status != cmdlen && status != -ENODEV) | ||
| 328 | netdev_err(dev->net, "Submit %s failed %d\n", cmd_name, status); | ||
| 329 | |||
| 330 | return status; | ||
| 331 | } | ||
| 332 | |||
| 333 | static int sierra_net_send_sync(struct usbnet *dev) | ||
| 334 | { | ||
| 335 | int status; | ||
| 336 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 337 | |||
| 338 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 339 | |||
| 340 | status = sierra_net_send_cmd(dev, priv->sync_msg, | ||
| 341 | sizeof(priv->sync_msg), "SYNC"); | ||
| 342 | |||
| 343 | return status; | ||
| 344 | } | ||
| 345 | |||
| 346 | static void sierra_net_set_ctx_index(struct sierra_net_data *priv, u8 ctx_ix) | ||
| 347 | { | ||
| 348 | dev_dbg(&(priv->usbnet->udev->dev), "%s %d", __func__, ctx_ix); | ||
| 349 | priv->tx_hdr_template[0] = 0x3F; | ||
| 350 | priv->tx_hdr_template[1] = ctx_ix; | ||
| 351 | *((u16 *)&priv->tx_hdr_template[2]) = | ||
| 352 | cpu_to_be16(SIERRA_NET_HIP_EXT_IP_OUT_ID); | ||
| 353 | } | ||
| 354 | |||
| 355 | static inline int sierra_net_is_valid_addrlen(u8 len) | ||
| 356 | { | ||
| 357 | return (len == sizeof(struct in_addr)); | ||
| 358 | } | ||
| 359 | |||
| 360 | static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen) | ||
| 361 | { | ||
| 362 | struct lsi_umts *lsi = (struct lsi_umts *)data; | ||
| 363 | |||
| 364 | if (datalen < sizeof(struct lsi_umts)) { | ||
| 365 | netdev_err(dev->net, "%s: Data length %d, exp %Zu\n", | ||
| 366 | __func__, datalen, | ||
| 367 | sizeof(struct lsi_umts)); | ||
| 368 | return -1; | ||
| 369 | } | ||
| 370 | |||
| 371 | if (lsi->length != cpu_to_be16(SIERRA_NET_LSI_UMTS_STATUS_LEN)) { | ||
| 372 | netdev_err(dev->net, "%s: LSI_UMTS_STATUS_LEN %d, exp %u\n", | ||
| 373 | __func__, be16_to_cpu(lsi->length), | ||
| 374 | (u32)SIERRA_NET_LSI_UMTS_STATUS_LEN); | ||
| 375 | return -1; | ||
| 376 | } | ||
| 377 | |||
| 378 | /* Validate the protocol - only support UMTS for now */ | ||
| 379 | if (lsi->protocol != SIERRA_NET_PROTOCOL_UMTS) { | ||
| 380 | netdev_err(dev->net, "Protocol unsupported, 0x%02x\n", | ||
| 381 | lsi->protocol); | ||
| 382 | return -1; | ||
| 383 | } | ||
| 384 | |||
| 385 | /* Validate the link type */ | ||
| 386 | if (lsi->link_type != SIERRA_NET_AS_LINK_TYPE_IPv4) { | ||
| 387 | netdev_err(dev->net, "Link type unsupported: 0x%02x\n", | ||
| 388 | lsi->link_type); | ||
| 389 | return -1; | ||
| 390 | } | ||
| 391 | |||
| 392 | /* Validate the coverage */ | ||
| 393 | if (lsi->coverage == SIERRA_NET_COVERAGE_NONE | ||
| 394 | || lsi->coverage == SIERRA_NET_COVERAGE_NOPACKET) { | ||
| 395 | netdev_err(dev->net, "No coverage, 0x%02x\n", lsi->coverage); | ||
| 396 | return 0; | ||
| 397 | } | ||
| 398 | |||
| 399 | /* Validate the session state */ | ||
| 400 | if (lsi->session_state == SIERRA_NET_SESSION_IDLE) { | ||
| 401 | netdev_err(dev->net, "Session idle, 0x%02x\n", | ||
| 402 | lsi->session_state); | ||
| 403 | return 0; | ||
| 404 | } | ||
| 405 | |||
| 406 | /* Set link_sense true */ | ||
| 407 | return 1; | ||
| 408 | } | ||
| 409 | |||
| 410 | static void sierra_net_handle_lsi(struct usbnet *dev, char *data, | ||
| 411 | struct hip_hdr *hh) | ||
| 412 | { | ||
| 413 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 414 | int link_up; | ||
| 415 | |||
| 416 | link_up = sierra_net_parse_lsi(dev, data + hh->hdrlen, | ||
| 417 | hh->payload_len.word); | ||
| 418 | if (link_up < 0) { | ||
| 419 | netdev_err(dev->net, "Invalid LSI\n"); | ||
| 420 | return; | ||
| 421 | } | ||
| 422 | if (link_up) { | ||
| 423 | sierra_net_set_ctx_index(priv, hh->msgspecific.byte); | ||
| 424 | priv->link_up = 1; | ||
| 425 | netif_carrier_on(dev->net); | ||
| 426 | } else { | ||
| 427 | priv->link_up = 0; | ||
| 428 | netif_carrier_off(dev->net); | ||
| 429 | } | ||
| 430 | } | ||
| 431 | |||
| 432 | static void sierra_net_dosync(struct usbnet *dev) | ||
| 433 | { | ||
| 434 | int status; | ||
| 435 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 436 | |||
| 437 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 438 | |||
| 439 | /* tell modem we are ready */ | ||
| 440 | status = sierra_net_send_sync(dev); | ||
| 441 | if (status < 0) | ||
| 442 | netdev_err(dev->net, | ||
| 443 | "Send SYNC failed, status %d\n", status); | ||
| 444 | status = sierra_net_send_sync(dev); | ||
| 445 | if (status < 0) | ||
| 446 | netdev_err(dev->net, | ||
| 447 | "Send SYNC failed, status %d\n", status); | ||
| 448 | |||
| 449 | /* Now, start a timer and make sure we get the Restart Indication */ | ||
| 450 | priv->sync_timer.function = sierra_sync_timer; | ||
| 451 | priv->sync_timer.data = (unsigned long) dev; | ||
| 452 | priv->sync_timer.expires = jiffies + SIERRA_NET_SYNCDELAY; | ||
| 453 | add_timer(&priv->sync_timer); | ||
| 454 | } | ||
| 455 | |||
| 456 | static void sierra_net_kevent(struct work_struct *work) | ||
| 457 | { | ||
| 458 | struct sierra_net_data *priv = | ||
| 459 | container_of(work, struct sierra_net_data, sierra_net_kevent); | ||
| 460 | struct usbnet *dev = priv->usbnet; | ||
| 461 | int len; | ||
| 462 | int err; | ||
| 463 | u8 *buf; | ||
| 464 | u8 ifnum; | ||
| 465 | |||
| 466 | if (test_bit(SIERRA_NET_EVENT_RESP_AVAIL, &priv->kevent_flags)) { | ||
| 467 | clear_bit(SIERRA_NET_EVENT_RESP_AVAIL, &priv->kevent_flags); | ||
| 468 | |||
| 469 | /* Query the modem for the LSI message */ | ||
| 470 | buf = kzalloc(SIERRA_NET_USBCTL_BUF_LEN, GFP_KERNEL); | ||
| 471 | if (!buf) { | ||
| 472 | netdev_err(dev->net, | ||
| 473 | "failed to allocate buf for LS msg\n"); | ||
| 474 | return; | ||
| 475 | } | ||
| 476 | ifnum = priv->ifnum; | ||
| 477 | len = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), | ||
| 478 | USB_CDC_GET_ENCAPSULATED_RESPONSE, | ||
| 479 | USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE, | ||
| 480 | 0, ifnum, buf, SIERRA_NET_USBCTL_BUF_LEN, | ||
| 481 | USB_CTRL_SET_TIMEOUT); | ||
| 482 | |||
| 483 | if (len < 0) { | ||
| 484 | netdev_err(dev->net, | ||
| 485 | "usb_control_msg failed, status %d\n", len); | ||
| 486 | } else { | ||
| 487 | struct hip_hdr hh; | ||
| 488 | |||
| 489 | dev_dbg(&dev->udev->dev, "%s: Received status message," | ||
| 490 | " %04x bytes", __func__, len); | ||
| 491 | |||
| 492 | err = parse_hip(buf, len, &hh); | ||
| 493 | if (err) { | ||
| 494 | netdev_err(dev->net, "%s: Bad packet," | ||
| 495 | " parse result %d\n", __func__, err); | ||
| 496 | kfree(buf); | ||
| 497 | return; | ||
| 498 | } | ||
| 499 | |||
| 500 | /* Validate packet length */ | ||
| 501 | if (len != hh.hdrlen + hh.payload_len.word) { | ||
| 502 | netdev_err(dev->net, "%s: Bad packet, received" | ||
| 503 | " %d, expected %d\n", __func__, len, | ||
| 504 | hh.hdrlen + hh.payload_len.word); | ||
| 505 | kfree(buf); | ||
| 506 | return; | ||
| 507 | } | ||
| 508 | |||
| 509 | /* Switch on received message types */ | ||
| 510 | switch (hh.msgid.byte) { | ||
| 511 | case SIERRA_NET_HIP_LSI_UMTSID: | ||
| 512 | dev_dbg(&dev->udev->dev, "LSI for ctx:%d", | ||
| 513 | hh.msgspecific.byte); | ||
| 514 | sierra_net_handle_lsi(dev, buf, &hh); | ||
| 515 | break; | ||
| 516 | case SIERRA_NET_HIP_RESTART_ID: | ||
| 517 | dev_dbg(&dev->udev->dev, "Restart reported: %d," | ||
| 518 | " stopping sync timer", | ||
| 519 | hh.msgspecific.byte); | ||
| 520 | /* Got sync resp - stop timer & clear mask */ | ||
| 521 | del_timer_sync(&priv->sync_timer); | ||
| 522 | clear_bit(SIERRA_NET_TIMER_EXPIRY, | ||
| 523 | &priv->kevent_flags); | ||
| 524 | break; | ||
| 525 | case SIERRA_NET_HIP_HSYNC_ID: | ||
| 526 | dev_dbg(&dev->udev->dev, "SYNC received"); | ||
| 527 | err = sierra_net_send_sync(dev); | ||
| 528 | if (err < 0) | ||
| 529 | netdev_err(dev->net, | ||
| 530 | "Send SYNC failed %d\n", err); | ||
| 531 | break; | ||
| 532 | case SIERRA_NET_HIP_EXTENDEDID: | ||
| 533 | netdev_err(dev->net, "Unrecognized HIP msg, " | ||
| 534 | "extmsgid 0x%04x\n", hh.extmsgid.word); | ||
| 535 | break; | ||
| 536 | case SIERRA_NET_HIP_RCGI: | ||
| 537 | /* Ignored */ | ||
| 538 | break; | ||
| 539 | default: | ||
| 540 | netdev_err(dev->net, "Unrecognized HIP msg, " | ||
| 541 | "msgid 0x%02x\n", hh.msgid.byte); | ||
| 542 | break; | ||
| 543 | } | ||
| 544 | } | ||
| 545 | kfree(buf); | ||
| 546 | } | ||
| 547 | /* The sync timer bit might be set */ | ||
| 548 | if (test_bit(SIERRA_NET_TIMER_EXPIRY, &priv->kevent_flags)) { | ||
| 549 | clear_bit(SIERRA_NET_TIMER_EXPIRY, &priv->kevent_flags); | ||
| 550 | dev_dbg(&dev->udev->dev, "Deferred sync timer expiry"); | ||
| 551 | sierra_net_dosync(priv->usbnet); | ||
| 552 | } | ||
| 553 | |||
| 554 | if (priv->kevent_flags) | ||
| 555 | dev_dbg(&dev->udev->dev, "sierra_net_kevent done, " | ||
| 556 | "kevent_flags = 0x%lx", priv->kevent_flags); | ||
| 557 | } | ||
| 558 | |||
| 559 | static void sierra_net_defer_kevent(struct usbnet *dev, int work) | ||
| 560 | { | ||
| 561 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 562 | |||
| 563 | set_bit(work, &priv->kevent_flags); | ||
| 564 | schedule_work(&priv->sierra_net_kevent); | ||
| 565 | } | ||
| 566 | |||
| 567 | /* | ||
| 568 | * Sync Retransmit Timer Handler. On expiry, kick the work queue | ||
| 569 | */ | ||
| 570 | void sierra_sync_timer(unsigned long syncdata) | ||
| 571 | { | ||
| 572 | struct usbnet *dev = (struct usbnet *)syncdata; | ||
| 573 | |||
| 574 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 575 | /* Kick the tasklet */ | ||
| 576 | sierra_net_defer_kevent(dev, SIERRA_NET_TIMER_EXPIRY); | ||
| 577 | } | ||
| 578 | |||
| 579 | static void sierra_net_status(struct usbnet *dev, struct urb *urb) | ||
| 580 | { | ||
| 581 | struct usb_cdc_notification *event; | ||
| 582 | |||
| 583 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 584 | |||
| 585 | if (urb->actual_length < sizeof *event) | ||
| 586 | return; | ||
| 587 | |||
| 588 | /* Add cases to handle other standard notifications. */ | ||
| 589 | event = urb->transfer_buffer; | ||
| 590 | switch (event->bNotificationType) { | ||
| 591 | case USB_CDC_NOTIFY_NETWORK_CONNECTION: | ||
| 592 | case USB_CDC_NOTIFY_SPEED_CHANGE: | ||
| 593 | /* USB 305 sends those */ | ||
| 594 | break; | ||
| 595 | case USB_CDC_NOTIFY_RESPONSE_AVAILABLE: | ||
| 596 | sierra_net_defer_kevent(dev, SIERRA_NET_EVENT_RESP_AVAIL); | ||
| 597 | break; | ||
| 598 | default: | ||
| 599 | netdev_err(dev->net, ": unexpected notification %02x!\n", | ||
| 600 | event->bNotificationType); | ||
| 601 | break; | ||
| 602 | } | ||
| 603 | } | ||
| 604 | |||
| 605 | static void sierra_net_get_drvinfo(struct net_device *net, | ||
| 606 | struct ethtool_drvinfo *info) | ||
| 607 | { | ||
| 608 | /* Inherit standard device info */ | ||
| 609 | usbnet_get_drvinfo(net, info); | ||
| 610 | strncpy(info->driver, driver_name, sizeof info->driver); | ||
| 611 | strncpy(info->version, DRIVER_VERSION, sizeof info->version); | ||
| 612 | } | ||
| 613 | |||
| 614 | static u32 sierra_net_get_link(struct net_device *net) | ||
| 615 | { | ||
| 616 | struct usbnet *dev = netdev_priv(net); | ||
| 617 | /* Report link is down whenever the interface is down */ | ||
| 618 | return sierra_net_get_private(dev)->link_up && netif_running(net); | ||
| 619 | } | ||
| 620 | |||
| 621 | static struct ethtool_ops sierra_net_ethtool_ops = { | ||
| 622 | .get_drvinfo = sierra_net_get_drvinfo, | ||
| 623 | .get_link = sierra_net_get_link, | ||
| 624 | .get_msglevel = usbnet_get_msglevel, | ||
| 625 | .set_msglevel = usbnet_set_msglevel, | ||
| 626 | .get_settings = usbnet_get_settings, | ||
| 627 | .set_settings = usbnet_set_settings, | ||
| 628 | .nway_reset = usbnet_nway_reset, | ||
| 629 | }; | ||
| 630 | |||
| 631 | /* MTU can not be more than 1500 bytes, enforce it. */ | ||
| 632 | static int sierra_net_change_mtu(struct net_device *net, int new_mtu) | ||
| 633 | { | ||
| 634 | if (new_mtu > SIERRA_NET_MAX_SUPPORTED_MTU) | ||
| 635 | return -EINVAL; | ||
| 636 | |||
| 637 | return usbnet_change_mtu(net, new_mtu); | ||
| 638 | } | ||
| 639 | |||
| 640 | static int is_whitelisted(const u8 ifnum, | ||
| 641 | const struct sierra_net_iface_info *whitelist) | ||
| 642 | { | ||
| 643 | if (whitelist) { | ||
| 644 | const u8 *list = whitelist->ifaceinfo; | ||
| 645 | int i; | ||
| 646 | |||
| 647 | for (i = 0; i < whitelist->infolen; i++) { | ||
| 648 | if (list[i] == ifnum) | ||
| 649 | return 1; | ||
| 650 | } | ||
| 651 | } | ||
| 652 | return 0; | ||
| 653 | } | ||
| 654 | |||
| 655 | static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap) | ||
| 656 | { | ||
| 657 | int result = 0; | ||
| 658 | u16 *attrdata; | ||
| 659 | |||
| 660 | attrdata = kmalloc(sizeof(*attrdata), GFP_KERNEL); | ||
| 661 | if (!attrdata) | ||
| 662 | return -ENOMEM; | ||
| 663 | |||
| 664 | result = usb_control_msg( | ||
| 665 | dev->udev, | ||
| 666 | usb_rcvctrlpipe(dev->udev, 0), | ||
| 667 | /* _u8 vendor specific request */ | ||
| 668 | SWI_USB_REQUEST_GET_FW_ATTR, | ||
| 669 | USB_DIR_IN | USB_TYPE_VENDOR, /* __u8 request type */ | ||
| 670 | 0x0000, /* __u16 value not used */ | ||
| 671 | 0x0000, /* __u16 index not used */ | ||
| 672 | attrdata, /* char *data */ | ||
| 673 | sizeof(*attrdata), /* __u16 size */ | ||
| 674 | USB_CTRL_SET_TIMEOUT); /* int timeout */ | ||
| 675 | |||
| 676 | if (result < 0) { | ||
| 677 | kfree(attrdata); | ||
| 678 | return -EIO; | ||
| 679 | } | ||
| 680 | |||
| 681 | *datap = *attrdata; | ||
| 682 | |||
| 683 | kfree(attrdata); | ||
| 684 | return result; | ||
| 685 | } | ||
| 686 | |||
| 687 | /* | ||
| 688 | * collects the bulk endpoints, the status endpoint. | ||
| 689 | */ | ||
| 690 | static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf) | ||
| 691 | { | ||
| 692 | u8 ifacenum; | ||
| 693 | u8 numendpoints; | ||
| 694 | u16 fwattr = 0; | ||
| 695 | int status; | ||
| 696 | struct ethhdr *eth; | ||
| 697 | struct sierra_net_data *priv; | ||
| 698 | static const u8 sync_tmplate[sizeof(priv->sync_msg)] = { | ||
| 699 | 0x00, 0x00, SIERRA_NET_HIP_MSYNC_ID, 0x00}; | ||
| 700 | static const u8 shdwn_tmplate[sizeof(priv->shdwn_msg)] = { | ||
| 701 | 0x00, 0x00, SIERRA_NET_HIP_SHUTD_ID, 0x00}; | ||
| 702 | |||
| 703 | struct sierra_net_info_data *data = | ||
| 704 | (struct sierra_net_info_data *)dev->driver_info->data; | ||
| 705 | |||
| 706 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 707 | |||
| 708 | ifacenum = intf->cur_altsetting->desc.bInterfaceNumber; | ||
| 709 | /* We only accept certain interfaces */ | ||
| 710 | if (!is_whitelisted(ifacenum, &data->whitelist)) { | ||
| 711 | dev_dbg(&dev->udev->dev, "Ignoring interface: %d", ifacenum); | ||
| 712 | return -ENODEV; | ||
| 713 | } | ||
| 714 | numendpoints = intf->cur_altsetting->desc.bNumEndpoints; | ||
| 715 | /* We have three endpoints, bulk in and out, and a status */ | ||
| 716 | if (numendpoints != 3) { | ||
| 717 | dev_err(&dev->udev->dev, "Expected 3 endpoints, found: %d", | ||
| 718 | numendpoints); | ||
| 719 | return -ENODEV; | ||
| 720 | } | ||
| 721 | /* Status endpoint set in usbnet_get_endpoints() */ | ||
| 722 | dev->status = NULL; | ||
| 723 | status = usbnet_get_endpoints(dev, intf); | ||
| 724 | if (status < 0) { | ||
| 725 | dev_err(&dev->udev->dev, "Error in usbnet_get_endpoints (%d)", | ||
| 726 | status); | ||
| 727 | return -ENODEV; | ||
| 728 | } | ||
| 729 | /* Initialize sierra private data */ | ||
| 730 | priv = kzalloc(sizeof *priv, GFP_KERNEL); | ||
| 731 | if (!priv) { | ||
| 732 | dev_err(&dev->udev->dev, "No memory"); | ||
| 733 | return -ENOMEM; | ||
| 734 | } | ||
| 735 | |||
| 736 | priv->usbnet = dev; | ||
| 737 | priv->ifnum = ifacenum; | ||
| 738 | dev->net->netdev_ops = &sierra_net_device_ops; | ||
| 739 | |||
| 740 | /* change MAC addr to include, ifacenum, and to be unique */ | ||
| 741 | dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter); | ||
| 742 | dev->net->dev_addr[ETH_ALEN-1] = ifacenum; | ||
| 743 | |||
| 744 | /* we will have to manufacture ethernet headers, prepare template */ | ||
| 745 | eth = (struct ethhdr *)priv->ethr_hdr_tmpl; | ||
| 746 | memcpy(ð->h_dest, dev->net->dev_addr, ETH_ALEN); | ||
| 747 | eth->h_proto = cpu_to_be16(ETH_P_IP); | ||
| 748 | |||
| 749 | /* prepare shutdown message template */ | ||
| 750 | memcpy(priv->shdwn_msg, shdwn_tmplate, sizeof(priv->shdwn_msg)); | ||
| 751 | /* set context index initially to 0 - prepares tx hdr template */ | ||
| 752 | sierra_net_set_ctx_index(priv, 0); | ||
| 753 | |||
| 754 | /* decrease the rx_urb_size and max_tx_size to 4k on USB 1.1 */ | ||
| 755 | dev->rx_urb_size = data->rx_urb_size; | ||
| 756 | if (dev->udev->speed != USB_SPEED_HIGH) | ||
| 757 | dev->rx_urb_size = min_t(size_t, 4096, data->rx_urb_size); | ||
| 758 | |||
| 759 | dev->net->hard_header_len += SIERRA_NET_HIP_EXT_HDR_LEN; | ||
| 760 | dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; | ||
| 761 | |||
| 762 | /* Set up the netdev */ | ||
| 763 | dev->net->flags |= IFF_NOARP; | ||
| 764 | dev->net->ethtool_ops = &sierra_net_ethtool_ops; | ||
| 765 | netif_carrier_off(dev->net); | ||
| 766 | |||
| 767 | sierra_net_set_private(dev, priv); | ||
| 768 | |||
| 769 | priv->kevent_flags = 0; | ||
| 770 | |||
| 771 | /* Use the shared workqueue */ | ||
| 772 | INIT_WORK(&priv->sierra_net_kevent, sierra_net_kevent); | ||
| 773 | |||
| 774 | /* Only need to do this once */ | ||
| 775 | init_timer(&priv->sync_timer); | ||
| 776 | |||
| 777 | /* verify fw attributes */ | ||
| 778 | status = sierra_net_get_fw_attr(dev, &fwattr); | ||
| 779 | dev_dbg(&dev->udev->dev, "Fw attr: %x\n", fwattr); | ||
| 780 | |||
| 781 | /* test whether firmware supports DHCP */ | ||
| 782 | if (!(status == sizeof(fwattr) && (fwattr & SWI_GET_FW_ATTR_MASK))) { | ||
| 783 | /* found incompatible firmware version */ | ||
| 784 | dev_err(&dev->udev->dev, "Incompatible driver and firmware" | ||
| 785 | " versions\n"); | ||
| 786 | kfree(priv); | ||
| 787 | return -ENODEV; | ||
| 788 | } | ||
| 789 | /* prepare sync message from template */ | ||
| 790 | memcpy(priv->sync_msg, sync_tmplate, sizeof(priv->sync_msg)); | ||
| 791 | |||
| 792 | /* initiate the sync sequence */ | ||
| 793 | sierra_net_dosync(dev); | ||
| 794 | |||
| 795 | return 0; | ||
| 796 | } | ||
| 797 | |||
| 798 | static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf) | ||
| 799 | { | ||
| 800 | int status; | ||
| 801 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 802 | |||
| 803 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 804 | |||
| 805 | /* Kill the timer then flush the work queue */ | ||
| 806 | del_timer_sync(&priv->sync_timer); | ||
| 807 | |||
| 808 | flush_scheduled_work(); | ||
| 809 | |||
| 810 | /* tell modem we are going away */ | ||
| 811 | status = sierra_net_send_cmd(dev, priv->shdwn_msg, | ||
| 812 | sizeof(priv->shdwn_msg), "Shutdown"); | ||
| 813 | if (status < 0) | ||
| 814 | netdev_err(dev->net, | ||
| 815 | "usb_control_msg failed, status %d\n", status); | ||
| 816 | |||
| 817 | sierra_net_set_private(dev, NULL); | ||
| 818 | |||
| 819 | kfree(priv); | ||
| 820 | } | ||
| 821 | |||
| 822 | static struct sk_buff *sierra_net_skb_clone(struct usbnet *dev, | ||
| 823 | struct sk_buff *skb, int len) | ||
| 824 | { | ||
| 825 | struct sk_buff *new_skb; | ||
| 826 | |||
| 827 | /* clone skb */ | ||
| 828 | new_skb = skb_clone(skb, GFP_ATOMIC); | ||
| 829 | |||
| 830 | /* remove len bytes from original */ | ||
| 831 | skb_pull(skb, len); | ||
| 832 | |||
| 833 | /* trim next packet to it's length */ | ||
| 834 | if (new_skb) { | ||
| 835 | skb_trim(new_skb, len); | ||
| 836 | } else { | ||
| 837 | if (netif_msg_rx_err(dev)) | ||
| 838 | netdev_err(dev->net, "failed to get skb\n"); | ||
| 839 | dev->net->stats.rx_dropped++; | ||
| 840 | } | ||
| 841 | |||
| 842 | return new_skb; | ||
| 843 | } | ||
| 844 | |||
| 845 | /* ---------------------------- Receive data path ----------------------*/ | ||
| 846 | static int sierra_net_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | ||
| 847 | { | ||
| 848 | int err; | ||
| 849 | struct hip_hdr hh; | ||
| 850 | struct sk_buff *new_skb; | ||
| 851 | |||
| 852 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 853 | |||
| 854 | /* could contain multiple packets */ | ||
| 855 | while (likely(skb->len)) { | ||
| 856 | err = parse_hip(skb->data, skb->len, &hh); | ||
| 857 | if (err) { | ||
| 858 | if (netif_msg_rx_err(dev)) | ||
| 859 | netdev_err(dev->net, "Invalid HIP header %d\n", | ||
| 860 | err); | ||
| 861 | /* dev->net->stats.rx_errors incremented by caller */ | ||
| 862 | dev->net->stats.rx_length_errors++; | ||
| 863 | return 0; | ||
| 864 | } | ||
| 865 | |||
| 866 | /* Validate Extended HIP header */ | ||
| 867 | if (!hh.extmsgid.is_present | ||
| 868 | || hh.extmsgid.word != SIERRA_NET_HIP_EXT_IP_IN_ID) { | ||
| 869 | if (netif_msg_rx_err(dev)) | ||
| 870 | netdev_err(dev->net, "HIP/ETH: Invalid pkt\n"); | ||
| 871 | |||
| 872 | dev->net->stats.rx_frame_errors++; | ||
| 873 | /* dev->net->stats.rx_errors incremented by caller */; | ||
| 874 | return 0; | ||
| 875 | } | ||
| 876 | |||
| 877 | skb_pull(skb, hh.hdrlen); | ||
| 878 | |||
| 879 | /* We are going to accept this packet, prepare it */ | ||
| 880 | memcpy(skb->data, sierra_net_get_private(dev)->ethr_hdr_tmpl, | ||
| 881 | ETH_HLEN); | ||
| 882 | |||
| 883 | /* Last packet in batch handled by usbnet */ | ||
| 884 | if (hh.payload_len.word == skb->len) | ||
| 885 | return 1; | ||
| 886 | |||
| 887 | new_skb = sierra_net_skb_clone(dev, skb, hh.payload_len.word); | ||
| 888 | if (new_skb) | ||
| 889 | usbnet_skb_return(dev, new_skb); | ||
| 890 | |||
| 891 | } /* while */ | ||
| 892 | |||
| 893 | return 0; | ||
| 894 | } | ||
| 895 | |||
| 896 | /* ---------------------------- Transmit data path ----------------------*/ | ||
| 897 | struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | ||
| 898 | gfp_t flags) | ||
| 899 | { | ||
| 900 | struct sierra_net_data *priv = sierra_net_get_private(dev); | ||
| 901 | u16 len; | ||
| 902 | bool need_tail; | ||
| 903 | |||
| 904 | dev_dbg(&dev->udev->dev, "%s", __func__); | ||
| 905 | if (priv->link_up && check_ethip_packet(skb, dev) && is_ip(skb)) { | ||
| 906 | /* enough head room as is? */ | ||
| 907 | if (SIERRA_NET_HIP_EXT_HDR_LEN <= skb_headroom(skb)) { | ||
| 908 | /* Save the Eth/IP length and set up HIP hdr */ | ||
| 909 | len = skb->len; | ||
| 910 | skb_push(skb, SIERRA_NET_HIP_EXT_HDR_LEN); | ||
| 911 | /* Handle ZLP issue */ | ||
| 912 | need_tail = ((len + SIERRA_NET_HIP_EXT_HDR_LEN) | ||
| 913 | % dev->maxpacket == 0); | ||
| 914 | if (need_tail) { | ||
| 915 | if (unlikely(skb_tailroom(skb) == 0)) { | ||
| 916 | netdev_err(dev->net, "tx_fixup:" | ||
| 917 | "no room for packet\n"); | ||
| 918 | dev_kfree_skb_any(skb); | ||
| 919 | return NULL; | ||
| 920 | } else { | ||
| 921 | skb->data[skb->len] = 0; | ||
| 922 | __skb_put(skb, 1); | ||
| 923 | len = len + 1; | ||
| 924 | } | ||
| 925 | } | ||
| 926 | build_hip(skb->data, len, priv); | ||
| 927 | return skb; | ||
| 928 | } else { | ||
| 929 | /* | ||
| 930 | * compensate in the future if necessary | ||
| 931 | */ | ||
| 932 | netdev_err(dev->net, "tx_fixup: no room for HIP\n"); | ||
| 933 | } /* headroom */ | ||
| 934 | } | ||
| 935 | |||
| 936 | if (!priv->link_up) | ||
| 937 | dev->net->stats.tx_carrier_errors++; | ||
| 938 | |||
| 939 | /* tx_dropped incremented by usbnet */ | ||
| 940 | |||
| 941 | /* filter the packet out, release it */ | ||
| 942 | dev_kfree_skb_any(skb); | ||
| 943 | return NULL; | ||
| 944 | } | ||
| 945 | |||
| 946 | static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 }; | ||
| 947 | static const struct sierra_net_info_data sierra_net_info_data_68A3 = { | ||
| 948 | .rx_urb_size = 8 * 1024, | ||
| 949 | .whitelist = { | ||
| 950 | .infolen = ARRAY_SIZE(sierra_net_ifnum_list), | ||
| 951 | .ifaceinfo = sierra_net_ifnum_list | ||
| 952 | } | ||
| 953 | }; | ||
| 954 | |||
| 955 | static const struct driver_info sierra_net_info_68A3 = { | ||
| 956 | .description = "Sierra Wireless USB-to-WWAN Modem", | ||
| 957 | .flags = FLAG_WWAN | FLAG_SEND_ZLP, | ||
| 958 | .bind = sierra_net_bind, | ||
| 959 | .unbind = sierra_net_unbind, | ||
| 960 | .status = sierra_net_status, | ||
| 961 | .rx_fixup = sierra_net_rx_fixup, | ||
| 962 | .tx_fixup = sierra_net_tx_fixup, | ||
| 963 | .data = (unsigned long)&sierra_net_info_data_68A3, | ||
| 964 | }; | ||
| 965 | |||
| 966 | static const struct usb_device_id products[] = { | ||
| 967 | {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */ | ||
| 968 | .driver_info = (unsigned long) &sierra_net_info_68A3}, | ||
| 969 | |||
| 970 | {}, /* last item */ | ||
| 971 | }; | ||
| 972 | MODULE_DEVICE_TABLE(usb, products); | ||
| 973 | |||
| 974 | /* We are based on usbnet, so let it handle the USB driver specifics */ | ||
| 975 | static struct usb_driver sierra_net_driver = { | ||
| 976 | .name = "sierra_net", | ||
| 977 | .id_table = products, | ||
| 978 | .probe = usbnet_probe, | ||
| 979 | .disconnect = usbnet_disconnect, | ||
| 980 | .suspend = usbnet_suspend, | ||
| 981 | .resume = usbnet_resume, | ||
| 982 | .no_dynamic_id = 1, | ||
| 983 | }; | ||
| 984 | |||
| 985 | static int __init sierra_net_init(void) | ||
| 986 | { | ||
| 987 | BUILD_BUG_ON(FIELD_SIZEOF(struct usbnet, data) | ||
| 988 | < sizeof(struct cdc_state)); | ||
| 989 | |||
| 990 | return usb_register(&sierra_net_driver); | ||
| 991 | } | ||
| 992 | |||
| 993 | static void __exit sierra_net_exit(void) | ||
| 994 | { | ||
| 995 | usb_deregister(&sierra_net_driver); | ||
| 996 | } | ||
| 997 | |||
| 998 | module_exit(sierra_net_exit); | ||
| 999 | module_init(sierra_net_init); | ||
| 1000 | |||
| 1001 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
| 1002 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
| 1003 | MODULE_VERSION(DRIVER_VERSION); | ||
| 1004 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index c4844adff92a..92b3e64fc14d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
| @@ -259,7 +259,7 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
| 259 | EEPROM_5000_REG_BAND_3_CHANNELS, | 259 | EEPROM_5000_REG_BAND_3_CHANNELS, |
| 260 | EEPROM_5000_REG_BAND_4_CHANNELS, | 260 | EEPROM_5000_REG_BAND_4_CHANNELS, |
| 261 | EEPROM_5000_REG_BAND_5_CHANNELS, | 261 | EEPROM_5000_REG_BAND_5_CHANNELS, |
| 262 | EEPROM_5000_REG_BAND_24_HT40_CHANNELS, | 262 | EEPROM_6000_REG_BAND_24_HT40_CHANNELS, |
| 263 | EEPROM_5000_REG_BAND_52_HT40_CHANNELS | 263 | EEPROM_5000_REG_BAND_52_HT40_CHANNELS |
| 264 | }, | 264 | }, |
| 265 | .verify_signature = iwlcore_eeprom_verify_signature, | 265 | .verify_signature = iwlcore_eeprom_verify_signature, |
| @@ -323,7 +323,7 @@ static struct iwl_lib_ops iwl6050_lib = { | |||
| 323 | EEPROM_5000_REG_BAND_3_CHANNELS, | 323 | EEPROM_5000_REG_BAND_3_CHANNELS, |
| 324 | EEPROM_5000_REG_BAND_4_CHANNELS, | 324 | EEPROM_5000_REG_BAND_4_CHANNELS, |
| 325 | EEPROM_5000_REG_BAND_5_CHANNELS, | 325 | EEPROM_5000_REG_BAND_5_CHANNELS, |
| 326 | EEPROM_5000_REG_BAND_24_HT40_CHANNELS, | 326 | EEPROM_6000_REG_BAND_24_HT40_CHANNELS, |
| 327 | EEPROM_5000_REG_BAND_52_HT40_CHANNELS | 327 | EEPROM_5000_REG_BAND_52_HT40_CHANNELS |
| 328 | }, | 328 | }, |
| 329 | .verify_signature = iwlcore_eeprom_verify_signature, | 329 | .verify_signature = iwlcore_eeprom_verify_signature, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8b8e3e1cbb44..bdff56583e11 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -3331,6 +3331,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) | |||
| 3331 | 3331 | ||
| 3332 | cancel_delayed_work_sync(&priv->init_alive_start); | 3332 | cancel_delayed_work_sync(&priv->init_alive_start); |
| 3333 | cancel_delayed_work(&priv->scan_check); | 3333 | cancel_delayed_work(&priv->scan_check); |
| 3334 | cancel_work_sync(&priv->start_internal_scan); | ||
| 3334 | cancel_delayed_work(&priv->alive_start); | 3335 | cancel_delayed_work(&priv->alive_start); |
| 3335 | cancel_work_sync(&priv->beacon_update); | 3336 | cancel_work_sync(&priv->beacon_update); |
| 3336 | del_timer_sync(&priv->statistics_periodic); | 3337 | del_timer_sync(&priv->statistics_periodic); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 3352f7086632..049b652bcb5e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -3358,7 +3358,6 @@ static void iwl_force_rf_reset(struct iwl_priv *priv) | |||
| 3358 | */ | 3358 | */ |
| 3359 | IWL_DEBUG_INFO(priv, "perform radio reset.\n"); | 3359 | IWL_DEBUG_INFO(priv, "perform radio reset.\n"); |
| 3360 | iwl_internal_short_hw_scan(priv); | 3360 | iwl_internal_short_hw_scan(priv); |
| 3361 | return; | ||
| 3362 | } | 3361 | } |
| 3363 | 3362 | ||
| 3364 | 3363 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 732590f5fe30..36940a9ec6b9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
| @@ -506,7 +506,7 @@ void iwl_init_scan_params(struct iwl_priv *priv); | |||
| 506 | int iwl_scan_cancel(struct iwl_priv *priv); | 506 | int iwl_scan_cancel(struct iwl_priv *priv); |
| 507 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); | 507 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); |
| 508 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req); | 508 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req); |
| 509 | int iwl_internal_short_hw_scan(struct iwl_priv *priv); | 509 | void iwl_internal_short_hw_scan(struct iwl_priv *priv); |
| 510 | int iwl_force_reset(struct iwl_priv *priv, int mode); | 510 | int iwl_force_reset(struct iwl_priv *priv, int mode); |
| 511 | u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, | 511 | u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, |
| 512 | const u8 *ie, int ie_len, int left); | 512 | const u8 *ie, int ie_len, int left); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 6054c5fba0c1..ef1720a852e9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
| @@ -1296,6 +1296,7 @@ struct iwl_priv { | |||
| 1296 | struct work_struct tt_work; | 1296 | struct work_struct tt_work; |
| 1297 | struct work_struct ct_enter; | 1297 | struct work_struct ct_enter; |
| 1298 | struct work_struct ct_exit; | 1298 | struct work_struct ct_exit; |
| 1299 | struct work_struct start_internal_scan; | ||
| 1299 | 1300 | ||
| 1300 | struct tasklet_struct irq_tasklet; | 1301 | struct tasklet_struct irq_tasklet; |
| 1301 | 1302 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 4e1ba824dc50..8171c701e4e1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
| @@ -203,6 +203,10 @@ struct iwl_eeprom_enhanced_txpwr { | |||
| 203 | #define EEPROM_5000_REG_BAND_52_HT40_CHANNELS ((0x92)\ | 203 | #define EEPROM_5000_REG_BAND_52_HT40_CHANNELS ((0x92)\ |
| 204 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ | 204 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ |
| 205 | 205 | ||
| 206 | /* 6000 regulatory - indirect access */ | ||
| 207 | #define EEPROM_6000_REG_BAND_24_HT40_CHANNELS ((0x80)\ | ||
| 208 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */ | ||
| 209 | |||
| 206 | /* 6000 and up regulatory tx power - indirect access */ | 210 | /* 6000 and up regulatory tx power - indirect access */ |
| 207 | /* max. elements per section */ | 211 | /* max. elements per section */ |
| 208 | #define EEPROM_MAX_TXPOWER_SECTION_ELEMENTS (8) | 212 | #define EEPROM_MAX_TXPOWER_SECTION_ELEMENTS (8) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 9ab0e412bf10..12e455a4b90e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
| @@ -470,6 +470,8 @@ EXPORT_SYMBOL(iwl_init_scan_params); | |||
| 470 | 470 | ||
| 471 | static int iwl_scan_initiate(struct iwl_priv *priv) | 471 | static int iwl_scan_initiate(struct iwl_priv *priv) |
| 472 | { | 472 | { |
| 473 | WARN_ON(!mutex_is_locked(&priv->mutex)); | ||
| 474 | |||
| 473 | IWL_DEBUG_INFO(priv, "Starting scan...\n"); | 475 | IWL_DEBUG_INFO(priv, "Starting scan...\n"); |
| 474 | set_bit(STATUS_SCANNING, &priv->status); | 476 | set_bit(STATUS_SCANNING, &priv->status); |
| 475 | priv->is_internal_short_scan = false; | 477 | priv->is_internal_short_scan = false; |
| @@ -547,24 +549,31 @@ EXPORT_SYMBOL(iwl_mac_hw_scan); | |||
| 547 | * internal short scan, this function should only been called while associated. | 549 | * internal short scan, this function should only been called while associated. |
| 548 | * It will reset and tune the radio to prevent possible RF related problem | 550 | * It will reset and tune the radio to prevent possible RF related problem |
| 549 | */ | 551 | */ |
| 550 | int iwl_internal_short_hw_scan(struct iwl_priv *priv) | 552 | void iwl_internal_short_hw_scan(struct iwl_priv *priv) |
| 551 | { | 553 | { |
| 552 | int ret = 0; | 554 | queue_work(priv->workqueue, &priv->start_internal_scan); |
| 555 | } | ||
| 556 | |||
| 557 | static void iwl_bg_start_internal_scan(struct work_struct *work) | ||
| 558 | { | ||
| 559 | struct iwl_priv *priv = | ||
| 560 | container_of(work, struct iwl_priv, start_internal_scan); | ||
| 561 | |||
| 562 | mutex_lock(&priv->mutex); | ||
| 553 | 563 | ||
| 554 | if (!iwl_is_ready_rf(priv)) { | 564 | if (!iwl_is_ready_rf(priv)) { |
| 555 | ret = -EIO; | ||
| 556 | IWL_DEBUG_SCAN(priv, "not ready or exit pending\n"); | 565 | IWL_DEBUG_SCAN(priv, "not ready or exit pending\n"); |
| 557 | goto out; | 566 | goto unlock; |
| 558 | } | 567 | } |
| 568 | |||
| 559 | if (test_bit(STATUS_SCANNING, &priv->status)) { | 569 | if (test_bit(STATUS_SCANNING, &priv->status)) { |
| 560 | IWL_DEBUG_SCAN(priv, "Scan already in progress.\n"); | 570 | IWL_DEBUG_SCAN(priv, "Scan already in progress.\n"); |
| 561 | ret = -EAGAIN; | 571 | goto unlock; |
| 562 | goto out; | ||
| 563 | } | 572 | } |
| 573 | |||
| 564 | if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) { | 574 | if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) { |
| 565 | IWL_DEBUG_SCAN(priv, "Scan request while abort pending\n"); | 575 | IWL_DEBUG_SCAN(priv, "Scan request while abort pending\n"); |
| 566 | ret = -EAGAIN; | 576 | goto unlock; |
| 567 | goto out; | ||
| 568 | } | 577 | } |
| 569 | 578 | ||
| 570 | priv->scan_bands = 0; | 579 | priv->scan_bands = 0; |
| @@ -577,9 +586,8 @@ int iwl_internal_short_hw_scan(struct iwl_priv *priv) | |||
| 577 | set_bit(STATUS_SCANNING, &priv->status); | 586 | set_bit(STATUS_SCANNING, &priv->status); |
| 578 | priv->is_internal_short_scan = true; | 587 | priv->is_internal_short_scan = true; |
| 579 | queue_work(priv->workqueue, &priv->request_scan); | 588 | queue_work(priv->workqueue, &priv->request_scan); |
| 580 | 589 | unlock: | |
| 581 | out: | 590 | mutex_unlock(&priv->mutex); |
| 582 | return ret; | ||
| 583 | } | 591 | } |
| 584 | EXPORT_SYMBOL(iwl_internal_short_hw_scan); | 592 | EXPORT_SYMBOL(iwl_internal_short_hw_scan); |
| 585 | 593 | ||
| @@ -965,6 +973,7 @@ void iwl_setup_scan_deferred_work(struct iwl_priv *priv) | |||
| 965 | INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed); | 973 | INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed); |
| 966 | INIT_WORK(&priv->request_scan, iwl_bg_request_scan); | 974 | INIT_WORK(&priv->request_scan, iwl_bg_request_scan); |
| 967 | INIT_WORK(&priv->abort_scan, iwl_bg_abort_scan); | 975 | INIT_WORK(&priv->abort_scan, iwl_bg_abort_scan); |
| 976 | INIT_WORK(&priv->start_internal_scan, iwl_bg_start_internal_scan); | ||
| 968 | INIT_DELAYED_WORK(&priv->scan_check, iwl_bg_scan_check); | 977 | INIT_DELAYED_WORK(&priv->scan_check, iwl_bg_scan_check); |
| 969 | } | 978 | } |
| 970 | EXPORT_SYMBOL(iwl_setup_scan_deferred_work); | 979 | EXPORT_SYMBOL(iwl_setup_scan_deferred_work); |
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index 269fda362836..c24067f1a0cb 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c | |||
| @@ -246,7 +246,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index, | |||
| 246 | u32 idx, i; | 246 | u32 idx, i; |
| 247 | 247 | ||
| 248 | i = (*index) % ring_limit; | 248 | i = (*index) % ring_limit; |
| 249 | (*index) = idx = le32_to_cpu(ring_control->device_idx[1]); | 249 | (*index) = idx = le32_to_cpu(ring_control->device_idx[ring_index]); |
| 250 | idx %= ring_limit; | 250 | idx %= ring_limit; |
| 251 | 251 | ||
| 252 | while (i != idx) { | 252 | while (i != idx) { |
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 18ecae4a4375..b4748337223b 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c | |||
| @@ -69,7 +69,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) | |||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | phy = get_phy_device(mdio, be32_to_cpup(addr)); | 71 | phy = get_phy_device(mdio, be32_to_cpup(addr)); |
| 72 | if (!phy) { | 72 | if (!phy || IS_ERR(phy)) { |
| 73 | dev_err(&mdio->dev, "error probing PHY at address %i\n", | 73 | dev_err(&mdio->dev, "error probing PHY at address %i\n", |
| 74 | *addr); | 74 | *addr); |
| 75 | continue; | 75 | continue; |
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index 4e3e0382c16e..083034710fa6 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/vmalloc.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/pci-bridge.h> | 25 | #include <asm/pci-bridge.h> |
| 25 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| @@ -430,6 +431,8 @@ int dlpar_remove_slot(char *drc_name) | |||
| 430 | rc = dlpar_remove_pci_slot(drc_name, dn); | 431 | rc = dlpar_remove_pci_slot(drc_name, dn); |
| 431 | break; | 432 | break; |
| 432 | } | 433 | } |
| 434 | vm_unmap_aliases(); | ||
| 435 | |||
| 433 | printk(KERN_INFO "%s: slot %s removed\n", DLPAR_MODULE_NAME, drc_name); | 436 | printk(KERN_INFO "%s: slot %s removed\n", DLPAR_MODULE_NAME, drc_name); |
| 434 | exit: | 437 | exit: |
| 435 | mutex_unlock(&rpadlpar_mutex); | 438 | mutex_unlock(&rpadlpar_mutex); |
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 719702240780..ef7411c660b9 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/pci_hotplug.h> | 29 | #include <linux/pci_hotplug.h> |
| 30 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/vmalloc.h> | ||
| 32 | #include <asm/eeh.h> /* for eeh_add_device() */ | 33 | #include <asm/eeh.h> /* for eeh_add_device() */ |
| 33 | #include <asm/rtas.h> /* rtas_call */ | 34 | #include <asm/rtas.h> /* rtas_call */ |
| 34 | #include <asm/pci-bridge.h> /* for pci_controller */ | 35 | #include <asm/pci-bridge.h> /* for pci_controller */ |
| @@ -418,6 +419,8 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) | |||
| 418 | return -EINVAL; | 419 | return -EINVAL; |
| 419 | 420 | ||
| 420 | pcibios_remove_pci_devices(slot->bus); | 421 | pcibios_remove_pci_devices(slot->bus); |
| 422 | vm_unmap_aliases(); | ||
| 423 | |||
| 421 | slot->state = NOT_CONFIGURED; | 424 | slot->state = NOT_CONFIGURED; |
| 422 | return 0; | 425 | return 0; |
| 423 | } | 426 | } |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5ea587e59e48..37499127c801 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -679,7 +679,7 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state) | |||
| 679 | */ | 679 | */ |
| 680 | int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state) | 680 | int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state) |
| 681 | { | 681 | { |
| 682 | return state > PCI_D0 ? | 682 | return state >= PCI_D0 ? |
| 683 | pci_platform_power_transition(dev, state) : -EINVAL; | 683 | pci_platform_power_transition(dev, state) : -EINVAL; |
| 684 | } | 684 | } |
| 685 | EXPORT_SYMBOL_GPL(__pci_complete_power_transition); | 685 | EXPORT_SYMBOL_GPL(__pci_complete_power_transition); |
| @@ -716,10 +716,6 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
| 716 | */ | 716 | */ |
| 717 | return 0; | 717 | return 0; |
| 718 | 718 | ||
| 719 | /* Check if we're already there */ | ||
| 720 | if (dev->current_state == state) | ||
| 721 | return 0; | ||
| 722 | |||
| 723 | __pci_start_power_transition(dev, state); | 719 | __pci_start_power_transition(dev, state); |
| 724 | 720 | ||
| 725 | /* This device is quirked not to be put into D3, so | 721 | /* This device is quirked not to be put into D3, so |
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index aa495ad9bbd4..7a711ee314b7 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c | |||
| @@ -244,11 +244,17 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) | |||
| 244 | 244 | ||
| 245 | /* Assert Secondary Bus Reset */ | 245 | /* Assert Secondary Bus Reset */ |
| 246 | pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &p2p_ctrl); | 246 | pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &p2p_ctrl); |
| 247 | p2p_ctrl |= PCI_CB_BRIDGE_CTL_CB_RESET; | 247 | p2p_ctrl |= PCI_BRIDGE_CTL_BUS_RESET; |
| 248 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, p2p_ctrl); | 248 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, p2p_ctrl); |
| 249 | 249 | ||
| 250 | /* | ||
| 251 | * we should send hot reset message for 2ms to allow it time to | ||
| 252 | * propogate to all downstream ports | ||
| 253 | */ | ||
| 254 | msleep(2); | ||
| 255 | |||
| 250 | /* De-assert Secondary Bus Reset */ | 256 | /* De-assert Secondary Bus Reset */ |
| 251 | p2p_ctrl &= ~PCI_CB_BRIDGE_CTL_CB_RESET; | 257 | p2p_ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; |
| 252 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, p2p_ctrl); | 258 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, p2p_ctrl); |
| 253 | 259 | ||
| 254 | /* | 260 | /* |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 882bd8d29fe3..c82548afcd5c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -174,19 +174,14 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | |||
| 174 | pci_read_config_dword(dev, pos, &sz); | 174 | pci_read_config_dword(dev, pos, &sz); |
| 175 | pci_write_config_dword(dev, pos, l); | 175 | pci_write_config_dword(dev, pos, l); |
| 176 | 176 | ||
| 177 | if (!sz) | ||
| 178 | goto fail; /* BAR not implemented */ | ||
| 179 | |||
| 180 | /* | 177 | /* |
| 181 | * All bits set in sz means the device isn't working properly. | 178 | * All bits set in sz means the device isn't working properly. |
| 182 | * If it's a memory BAR or a ROM, bit 0 must be clear; if it's | 179 | * If the BAR isn't implemented, all bits must be 0. If it's a |
| 183 | * an io BAR, bit 1 must be clear. | 180 | * memory BAR or a ROM, bit 0 must be clear; if it's an io BAR, bit |
| 181 | * 1 must be clear. | ||
| 184 | */ | 182 | */ |
| 185 | if (sz == 0xffffffff) { | 183 | if (!sz || sz == 0xffffffff) |
| 186 | dev_err(&dev->dev, "reg %x: invalid size %#x; broken device?\n", | ||
| 187 | pos, sz); | ||
| 188 | goto fail; | 184 | goto fail; |
| 189 | } | ||
| 190 | 185 | ||
| 191 | /* | 186 | /* |
| 192 | * I don't know how l can have all bits set. Copied from old code. | 187 | * I don't know how l can have all bits set. Copied from old code. |
| @@ -249,17 +244,13 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | |||
| 249 | pos, res); | 244 | pos, res); |
| 250 | } | 245 | } |
| 251 | } else { | 246 | } else { |
| 252 | u32 size = pci_size(l, sz, mask); | 247 | sz = pci_size(l, sz, mask); |
| 253 | 248 | ||
| 254 | if (!size) { | 249 | if (!sz) |
| 255 | dev_err(&dev->dev, "reg %x: invalid size " | ||
| 256 | "(l %#x sz %#x mask %#x); broken device?", | ||
| 257 | pos, l, sz, mask); | ||
| 258 | goto fail; | 250 | goto fail; |
| 259 | } | ||
| 260 | 251 | ||
| 261 | res->start = l; | 252 | res->start = l; |
| 262 | res->end = l + size; | 253 | res->end = l + sz; |
| 263 | 254 | ||
| 264 | dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res); | 255 | dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res); |
| 265 | } | 256 | } |
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 2d48196a48cd..0f4cc3f00028 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c | |||
| @@ -146,7 +146,6 @@ static irqreturn_t db1200_pcmcia_cdirq(int irq, void *data) | |||
| 146 | static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock) | 146 | static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock) |
| 147 | { | 147 | { |
| 148 | int ret; | 148 | int ret; |
| 149 | unsigned long flags; | ||
| 150 | 149 | ||
| 151 | if (sock->stschg_irq != -1) { | 150 | if (sock->stschg_irq != -1) { |
| 152 | ret = request_irq(sock->stschg_irq, db1000_pcmcia_stschgirq, | 151 | ret = request_irq(sock->stschg_irq, db1000_pcmcia_stschgirq, |
| @@ -162,30 +161,23 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock) | |||
| 162 | * active one disabled. | 161 | * active one disabled. |
| 163 | */ | 162 | */ |
| 164 | if (sock->board_type == BOARD_TYPE_DB1200) { | 163 | if (sock->board_type == BOARD_TYPE_DB1200) { |
| 165 | local_irq_save(flags); | ||
| 166 | |||
| 167 | ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq, | 164 | ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq, |
| 168 | IRQF_DISABLED, "pcmcia_insert", sock); | 165 | IRQF_DISABLED, "pcmcia_insert", sock); |
| 169 | if (ret) { | 166 | if (ret) |
| 170 | local_irq_restore(flags); | ||
| 171 | goto out1; | 167 | goto out1; |
| 172 | } | ||
| 173 | 168 | ||
| 174 | ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq, | 169 | ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq, |
| 175 | IRQF_DISABLED, "pcmcia_eject", sock); | 170 | IRQF_DISABLED, "pcmcia_eject", sock); |
| 176 | if (ret) { | 171 | if (ret) { |
| 177 | free_irq(sock->insert_irq, sock); | 172 | free_irq(sock->insert_irq, sock); |
| 178 | local_irq_restore(flags); | ||
| 179 | goto out1; | 173 | goto out1; |
| 180 | } | 174 | } |
| 181 | 175 | ||
| 182 | /* disable the currently active one */ | 176 | /* enable the currently silent one */ |
| 183 | if (db1200_card_inserted(sock)) | 177 | if (db1200_card_inserted(sock)) |
| 184 | disable_irq_nosync(sock->insert_irq); | 178 | enable_irq(sock->eject_irq); |
| 185 | else | 179 | else |
| 186 | disable_irq_nosync(sock->eject_irq); | 180 | enable_irq(sock->insert_irq); |
| 187 | |||
| 188 | local_irq_restore(flags); | ||
| 189 | } else { | 181 | } else { |
| 190 | /* all other (older) Db1x00 boards use a GPIO to show | 182 | /* all other (older) Db1x00 boards use a GPIO to show |
| 191 | * card detection status: use both-edge triggers. | 183 | * card detection status: use both-edge triggers. |
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 4014cf8e4a26..508f94a2a78d 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -335,7 +335,6 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le | |||
| 335 | 335 | ||
| 336 | mutex_lock(&s->ops_mutex); | 336 | mutex_lock(&s->ops_mutex); |
| 337 | list_del(&p_dev->socket_device_list); | 337 | list_del(&p_dev->socket_device_list); |
| 338 | p_dev->_removed = 1; | ||
| 339 | mutex_unlock(&s->ops_mutex); | 338 | mutex_unlock(&s->ops_mutex); |
| 340 | 339 | ||
| 341 | dev_dbg(&p_dev->dev, "unregistering device\n"); | 340 | dev_dbg(&p_dev->dev, "unregistering device\n"); |
| @@ -654,14 +653,7 @@ static int pcmcia_requery_callback(struct device *dev, void * _data) | |||
| 654 | 653 | ||
| 655 | static void pcmcia_requery(struct pcmcia_socket *s) | 654 | static void pcmcia_requery(struct pcmcia_socket *s) |
| 656 | { | 655 | { |
| 657 | int present, has_pfc; | 656 | int has_pfc; |
| 658 | |||
| 659 | mutex_lock(&s->ops_mutex); | ||
| 660 | present = s->pcmcia_state.present; | ||
| 661 | mutex_unlock(&s->ops_mutex); | ||
| 662 | |||
| 663 | if (!present) | ||
| 664 | return; | ||
| 665 | 657 | ||
| 666 | if (s->functions == 0) { | 658 | if (s->functions == 0) { |
| 667 | pcmcia_card_add(s); | 659 | pcmcia_card_add(s); |
| @@ -828,11 +820,12 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, | |||
| 828 | } | 820 | } |
| 829 | 821 | ||
| 830 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) { | 822 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) { |
| 831 | if (dev->device_no != did->device_no) | 823 | dev_dbg(&dev->dev, "this is a pseudo-multi-function device\n"); |
| 832 | return 0; | ||
| 833 | mutex_lock(&dev->socket->ops_mutex); | 824 | mutex_lock(&dev->socket->ops_mutex); |
| 834 | dev->socket->pcmcia_state.has_pfc = 1; | 825 | dev->socket->pcmcia_state.has_pfc = 1; |
| 835 | mutex_unlock(&dev->socket->ops_mutex); | 826 | mutex_unlock(&dev->socket->ops_mutex); |
| 827 | if (dev->device_no != did->device_no) | ||
| 828 | return 0; | ||
| 836 | } | 829 | } |
| 837 | 830 | ||
| 838 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID) { | 831 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID) { |
| @@ -843,7 +836,7 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, | |||
| 843 | 836 | ||
| 844 | /* if this is a pseudo-multi-function device, | 837 | /* if this is a pseudo-multi-function device, |
| 845 | * we need explicit matches */ | 838 | * we need explicit matches */ |
| 846 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) | 839 | if (dev->socket->pcmcia_state.has_pfc) |
| 847 | return 0; | 840 | return 0; |
| 848 | if (dev->device_no) | 841 | if (dev->device_no) |
| 849 | return 0; | 842 | return 0; |
| @@ -1260,9 +1253,7 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority) | |||
| 1260 | 1253 | ||
| 1261 | switch (event) { | 1254 | switch (event) { |
| 1262 | case CS_EVENT_CARD_REMOVAL: | 1255 | case CS_EVENT_CARD_REMOVAL: |
| 1263 | mutex_lock(&s->ops_mutex); | 1256 | atomic_set(&skt->present, 0); |
| 1264 | s->pcmcia_state.present = 0; | ||
| 1265 | mutex_unlock(&s->ops_mutex); | ||
| 1266 | pcmcia_card_remove(skt, NULL); | 1257 | pcmcia_card_remove(skt, NULL); |
| 1267 | handle_event(skt, event); | 1258 | handle_event(skt, event); |
| 1268 | mutex_lock(&s->ops_mutex); | 1259 | mutex_lock(&s->ops_mutex); |
| @@ -1271,9 +1262,9 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority) | |||
| 1271 | break; | 1262 | break; |
| 1272 | 1263 | ||
| 1273 | case CS_EVENT_CARD_INSERTION: | 1264 | case CS_EVENT_CARD_INSERTION: |
| 1265 | atomic_set(&skt->present, 1); | ||
| 1274 | mutex_lock(&s->ops_mutex); | 1266 | mutex_lock(&s->ops_mutex); |
| 1275 | s->pcmcia_state.has_pfc = 0; | 1267 | s->pcmcia_state.has_pfc = 0; |
| 1276 | s->pcmcia_state.present = 1; | ||
| 1277 | destroy_cis_cache(s); /* to be on the safe side... */ | 1268 | destroy_cis_cache(s); /* to be on the safe side... */ |
| 1278 | mutex_unlock(&s->ops_mutex); | 1269 | mutex_unlock(&s->ops_mutex); |
| 1279 | pcmcia_card_add(skt); | 1270 | pcmcia_card_add(skt); |
| @@ -1313,7 +1304,13 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority) | |||
| 1313 | return 0; | 1304 | return 0; |
| 1314 | } /* ds_event */ | 1305 | } /* ds_event */ |
| 1315 | 1306 | ||
| 1316 | 1307 | /* | |
| 1308 | * NOTE: This is racy. There's no guarantee the card will still be | ||
| 1309 | * physically present, even if the call to this function returns | ||
| 1310 | * non-NULL. Furthermore, the device driver most likely is unbound | ||
| 1311 | * almost immediately, so the timeframe where pcmcia_dev_present | ||
| 1312 | * returns NULL is probably really really small. | ||
| 1313 | */ | ||
| 1317 | struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev) | 1314 | struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev) |
| 1318 | { | 1315 | { |
| 1319 | struct pcmcia_device *p_dev; | 1316 | struct pcmcia_device *p_dev; |
| @@ -1323,22 +1320,9 @@ struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev) | |||
| 1323 | if (!p_dev) | 1320 | if (!p_dev) |
| 1324 | return NULL; | 1321 | return NULL; |
| 1325 | 1322 | ||
| 1326 | mutex_lock(&p_dev->socket->ops_mutex); | 1323 | if (atomic_read(&p_dev->socket->present) != 0) |
| 1327 | if (!p_dev->socket->pcmcia_state.present) | 1324 | ret = p_dev; |
| 1328 | goto out; | ||
| 1329 | |||
| 1330 | if (p_dev->socket->pcmcia_state.dead) | ||
| 1331 | goto out; | ||
| 1332 | 1325 | ||
| 1333 | if (p_dev->_removed) | ||
| 1334 | goto out; | ||
| 1335 | |||
| 1336 | if (p_dev->suspended) | ||
| 1337 | goto out; | ||
| 1338 | |||
| 1339 | ret = p_dev; | ||
| 1340 | out: | ||
| 1341 | mutex_unlock(&p_dev->socket->ops_mutex); | ||
| 1342 | pcmcia_put_dev(p_dev); | 1326 | pcmcia_put_dev(p_dev); |
| 1343 | return ret; | 1327 | return ret; |
| 1344 | } | 1328 | } |
| @@ -1388,6 +1372,8 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev, | |||
| 1388 | return ret; | 1372 | return ret; |
| 1389 | } | 1373 | } |
| 1390 | 1374 | ||
| 1375 | atomic_set(&socket->present, 0); | ||
| 1376 | |||
| 1391 | return 0; | 1377 | return 0; |
| 1392 | } | 1378 | } |
| 1393 | 1379 | ||
| @@ -1399,10 +1385,6 @@ static void pcmcia_bus_remove_socket(struct device *dev, | |||
| 1399 | if (!socket) | 1385 | if (!socket) |
| 1400 | return; | 1386 | return; |
| 1401 | 1387 | ||
| 1402 | mutex_lock(&socket->ops_mutex); | ||
| 1403 | socket->pcmcia_state.dead = 1; | ||
| 1404 | mutex_unlock(&socket->ops_mutex); | ||
| 1405 | |||
| 1406 | pccard_register_pcmcia(socket, NULL); | 1388 | pccard_register_pcmcia(socket, NULL); |
| 1407 | 1389 | ||
| 1408 | /* unregister any unbound devices */ | 1390 | /* unregister any unbound devices */ |
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 7bec4588c268..6c3320d75055 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -390,6 +390,7 @@ config EEEPC_WMI | |||
| 390 | depends on ACPI_WMI | 390 | depends on ACPI_WMI |
| 391 | depends on INPUT | 391 | depends on INPUT |
| 392 | depends on EXPERIMENTAL | 392 | depends on EXPERIMENTAL |
| 393 | select INPUT_SPARSEKMAP | ||
| 393 | ---help--- | 394 | ---help--- |
| 394 | Say Y here if you want to support WMI-based hotkeys on Eee PC laptops. | 395 | Say Y here if you want to support WMI-based hotkeys on Eee PC laptops. |
| 395 | 396 | ||
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 52262b012abb..efe8f6388906 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
| @@ -79,15 +79,15 @@ static uint wapf = 1; | |||
| 79 | module_param(wapf, uint, 0644); | 79 | module_param(wapf, uint, 0644); |
| 80 | MODULE_PARM_DESC(wapf, "WAPF value"); | 80 | MODULE_PARM_DESC(wapf, "WAPF value"); |
| 81 | 81 | ||
| 82 | static uint wlan_status = 1; | 82 | static int wlan_status = 1; |
| 83 | static uint bluetooth_status = 1; | 83 | static int bluetooth_status = 1; |
| 84 | 84 | ||
| 85 | module_param(wlan_status, uint, 0644); | 85 | module_param(wlan_status, int, 0644); |
| 86 | MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot " | 86 | MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot " |
| 87 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " | 87 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " |
| 88 | "default is 1"); | 88 | "default is 1"); |
| 89 | 89 | ||
| 90 | module_param(bluetooth_status, uint, 0644); | 90 | module_param(bluetooth_status, int, 0644); |
| 91 | MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " | 91 | MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " |
| 92 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " | 92 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " |
| 93 | "default is 1"); | 93 | "default is 1"); |
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 6ba6c30e5bb6..66f53c3c35e8 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c | |||
| @@ -217,6 +217,7 @@ static void dell_wmi_notify(u32 value, void *context) | |||
| 217 | if (dell_new_hk_type && (buffer_entry[1] != 0x10)) { | 217 | if (dell_new_hk_type && (buffer_entry[1] != 0x10)) { |
| 218 | printk(KERN_INFO "dell-wmi: Received unknown WMI event" | 218 | printk(KERN_INFO "dell-wmi: Received unknown WMI event" |
| 219 | " (0x%x)\n", buffer_entry[1]); | 219 | " (0x%x)\n", buffer_entry[1]); |
| 220 | kfree(obj); | ||
| 220 | return; | 221 | return; |
| 221 | } | 222 | } |
| 222 | 223 | ||
| @@ -234,7 +235,7 @@ static void dell_wmi_notify(u32 value, void *context) | |||
| 234 | key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) { | 235 | key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) { |
| 235 | /* Don't report brightness notifications that will also | 236 | /* Don't report brightness notifications that will also |
| 236 | * come via ACPI */ | 237 | * come via ACPI */ |
| 237 | return; | 238 | ; |
| 238 | } else { | 239 | } else { |
| 239 | input_report_key(dell_wmi_input_dev, key->keycode, 1); | 240 | input_report_key(dell_wmi_input_dev, key->keycode, 1); |
| 240 | input_sync(dell_wmi_input_dev); | 241 | input_sync(dell_wmi_input_dev); |
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 54a015785ca8..0306174ba875 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
| @@ -169,7 +169,6 @@ struct eeepc_laptop { | |||
| 169 | struct backlight_device *backlight_device; | 169 | struct backlight_device *backlight_device; |
| 170 | 170 | ||
| 171 | struct input_dev *inputdev; | 171 | struct input_dev *inputdev; |
| 172 | struct key_entry *keymap; | ||
| 173 | 172 | ||
| 174 | struct rfkill *wlan_rfkill; | 173 | struct rfkill *wlan_rfkill; |
| 175 | struct rfkill *bluetooth_rfkill; | 174 | struct rfkill *bluetooth_rfkill; |
| @@ -1204,8 +1203,8 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc) | |||
| 1204 | static void eeepc_input_exit(struct eeepc_laptop *eeepc) | 1203 | static void eeepc_input_exit(struct eeepc_laptop *eeepc) |
| 1205 | { | 1204 | { |
| 1206 | if (eeepc->inputdev) { | 1205 | if (eeepc->inputdev) { |
| 1206 | sparse_keymap_free(eeepc->inputdev); | ||
| 1207 | input_unregister_device(eeepc->inputdev); | 1207 | input_unregister_device(eeepc->inputdev); |
| 1208 | kfree(eeepc->keymap); | ||
| 1209 | } | 1208 | } |
| 1210 | } | 1209 | } |
| 1211 | 1210 | ||
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c index 9f8822658fd7..b227eb469f49 100644 --- a/drivers/platform/x86/eeepc-wmi.c +++ b/drivers/platform/x86/eeepc-wmi.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
| 27 | |||
| 26 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| @@ -30,22 +32,34 @@ | |||
| 30 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 31 | #include <linux/input.h> | 33 | #include <linux/input.h> |
| 32 | #include <linux/input/sparse-keymap.h> | 34 | #include <linux/input/sparse-keymap.h> |
| 35 | #include <linux/fb.h> | ||
| 36 | #include <linux/backlight.h> | ||
| 37 | #include <linux/platform_device.h> | ||
| 33 | #include <acpi/acpi_bus.h> | 38 | #include <acpi/acpi_bus.h> |
| 34 | #include <acpi/acpi_drivers.h> | 39 | #include <acpi/acpi_drivers.h> |
| 35 | 40 | ||
| 41 | #define EEEPC_WMI_FILE "eeepc-wmi" | ||
| 42 | |||
| 36 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); | 43 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); |
| 37 | MODULE_DESCRIPTION("Eee PC WMI Hotkey Driver"); | 44 | MODULE_DESCRIPTION("Eee PC WMI Hotkey Driver"); |
| 38 | MODULE_LICENSE("GPL"); | 45 | MODULE_LICENSE("GPL"); |
| 39 | 46 | ||
| 40 | #define EEEPC_WMI_EVENT_GUID "ABBC0F72-8EA1-11D1-00A0-C90629100000" | 47 | #define EEEPC_WMI_EVENT_GUID "ABBC0F72-8EA1-11D1-00A0-C90629100000" |
| 48 | #define EEEPC_WMI_MGMT_GUID "97845ED0-4E6D-11DE-8A39-0800200C9A66" | ||
| 41 | 49 | ||
| 42 | MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID); | 50 | MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID); |
| 51 | MODULE_ALIAS("wmi:"EEEPC_WMI_MGMT_GUID); | ||
| 43 | 52 | ||
| 44 | #define NOTIFY_BRNUP_MIN 0x11 | 53 | #define NOTIFY_BRNUP_MIN 0x11 |
| 45 | #define NOTIFY_BRNUP_MAX 0x1f | 54 | #define NOTIFY_BRNUP_MAX 0x1f |
| 46 | #define NOTIFY_BRNDOWN_MIN 0x20 | 55 | #define NOTIFY_BRNDOWN_MIN 0x20 |
| 47 | #define NOTIFY_BRNDOWN_MAX 0x2e | 56 | #define NOTIFY_BRNDOWN_MAX 0x2e |
| 48 | 57 | ||
| 58 | #define EEEPC_WMI_METHODID_DEVS 0x53564544 | ||
| 59 | #define EEEPC_WMI_METHODID_DSTS 0x53544344 | ||
| 60 | |||
| 61 | #define EEEPC_WMI_DEVID_BACKLIGHT 0x00050012 | ||
| 62 | |||
| 49 | static const struct key_entry eeepc_wmi_keymap[] = { | 63 | static const struct key_entry eeepc_wmi_keymap[] = { |
| 50 | /* Sleep already handled via generic ACPI code */ | 64 | /* Sleep already handled via generic ACPI code */ |
| 51 | { KE_KEY, 0x5d, { KEY_WLAN } }, | 65 | { KE_KEY, 0x5d, { KEY_WLAN } }, |
| @@ -58,18 +72,198 @@ static const struct key_entry eeepc_wmi_keymap[] = { | |||
| 58 | { KE_END, 0}, | 72 | { KE_END, 0}, |
| 59 | }; | 73 | }; |
| 60 | 74 | ||
| 61 | static struct input_dev *eeepc_wmi_input_dev; | 75 | struct bios_args { |
| 76 | u32 dev_id; | ||
| 77 | u32 ctrl_param; | ||
| 78 | }; | ||
| 79 | |||
| 80 | struct eeepc_wmi { | ||
| 81 | struct input_dev *inputdev; | ||
| 82 | struct backlight_device *backlight_device; | ||
| 83 | }; | ||
| 84 | |||
| 85 | static struct platform_device *platform_device; | ||
| 86 | |||
| 87 | static int eeepc_wmi_input_init(struct eeepc_wmi *eeepc) | ||
| 88 | { | ||
| 89 | int err; | ||
| 90 | |||
| 91 | eeepc->inputdev = input_allocate_device(); | ||
| 92 | if (!eeepc->inputdev) | ||
| 93 | return -ENOMEM; | ||
| 94 | |||
| 95 | eeepc->inputdev->name = "Eee PC WMI hotkeys"; | ||
| 96 | eeepc->inputdev->phys = EEEPC_WMI_FILE "/input0"; | ||
| 97 | eeepc->inputdev->id.bustype = BUS_HOST; | ||
| 98 | eeepc->inputdev->dev.parent = &platform_device->dev; | ||
| 99 | |||
| 100 | err = sparse_keymap_setup(eeepc->inputdev, eeepc_wmi_keymap, NULL); | ||
| 101 | if (err) | ||
| 102 | goto err_free_dev; | ||
| 103 | |||
| 104 | err = input_register_device(eeepc->inputdev); | ||
| 105 | if (err) | ||
| 106 | goto err_free_keymap; | ||
| 107 | |||
| 108 | return 0; | ||
| 109 | |||
| 110 | err_free_keymap: | ||
| 111 | sparse_keymap_free(eeepc->inputdev); | ||
| 112 | err_free_dev: | ||
| 113 | input_free_device(eeepc->inputdev); | ||
| 114 | return err; | ||
| 115 | } | ||
| 116 | |||
| 117 | static void eeepc_wmi_input_exit(struct eeepc_wmi *eeepc) | ||
| 118 | { | ||
| 119 | if (eeepc->inputdev) { | ||
| 120 | sparse_keymap_free(eeepc->inputdev); | ||
| 121 | input_unregister_device(eeepc->inputdev); | ||
| 122 | } | ||
| 123 | |||
| 124 | eeepc->inputdev = NULL; | ||
| 125 | } | ||
| 126 | |||
| 127 | static acpi_status eeepc_wmi_get_devstate(u32 dev_id, u32 *ctrl_param) | ||
| 128 | { | ||
| 129 | struct acpi_buffer input = { (acpi_size)sizeof(u32), &dev_id }; | ||
| 130 | struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 131 | union acpi_object *obj; | ||
| 132 | acpi_status status; | ||
| 133 | u32 tmp; | ||
| 134 | |||
| 135 | status = wmi_evaluate_method(EEEPC_WMI_MGMT_GUID, | ||
| 136 | 1, EEEPC_WMI_METHODID_DSTS, &input, &output); | ||
| 137 | |||
| 138 | if (ACPI_FAILURE(status)) | ||
| 139 | return status; | ||
| 140 | |||
| 141 | obj = (union acpi_object *)output.pointer; | ||
| 142 | if (obj && obj->type == ACPI_TYPE_INTEGER) | ||
| 143 | tmp = (u32)obj->integer.value; | ||
| 144 | else | ||
| 145 | tmp = 0; | ||
| 146 | |||
| 147 | if (ctrl_param) | ||
| 148 | *ctrl_param = tmp; | ||
| 149 | |||
| 150 | kfree(obj); | ||
| 151 | |||
| 152 | return status; | ||
| 153 | |||
| 154 | } | ||
| 155 | |||
| 156 | static acpi_status eeepc_wmi_set_devstate(u32 dev_id, u32 ctrl_param) | ||
| 157 | { | ||
| 158 | struct bios_args args = { | ||
| 159 | .dev_id = dev_id, | ||
| 160 | .ctrl_param = ctrl_param, | ||
| 161 | }; | ||
| 162 | struct acpi_buffer input = { (acpi_size)sizeof(args), &args }; | ||
| 163 | acpi_status status; | ||
| 164 | |||
| 165 | status = wmi_evaluate_method(EEEPC_WMI_MGMT_GUID, | ||
| 166 | 1, EEEPC_WMI_METHODID_DEVS, &input, NULL); | ||
| 167 | |||
| 168 | return status; | ||
| 169 | } | ||
| 170 | |||
| 171 | static int read_brightness(struct backlight_device *bd) | ||
| 172 | { | ||
| 173 | static u32 ctrl_param; | ||
| 174 | acpi_status status; | ||
| 175 | |||
| 176 | status = eeepc_wmi_get_devstate(EEEPC_WMI_DEVID_BACKLIGHT, &ctrl_param); | ||
| 177 | |||
| 178 | if (ACPI_FAILURE(status)) | ||
| 179 | return -1; | ||
| 180 | else | ||
| 181 | return ctrl_param & 0xFF; | ||
| 182 | } | ||
| 183 | |||
| 184 | static int update_bl_status(struct backlight_device *bd) | ||
| 185 | { | ||
| 186 | |||
| 187 | static u32 ctrl_param; | ||
| 188 | acpi_status status; | ||
| 189 | |||
| 190 | ctrl_param = bd->props.brightness; | ||
| 191 | |||
| 192 | status = eeepc_wmi_set_devstate(EEEPC_WMI_DEVID_BACKLIGHT, ctrl_param); | ||
| 193 | |||
| 194 | if (ACPI_FAILURE(status)) | ||
| 195 | return -1; | ||
| 196 | else | ||
| 197 | return 0; | ||
| 198 | } | ||
| 199 | |||
| 200 | static const struct backlight_ops eeepc_wmi_bl_ops = { | ||
| 201 | .get_brightness = read_brightness, | ||
| 202 | .update_status = update_bl_status, | ||
| 203 | }; | ||
| 204 | |||
| 205 | static int eeepc_wmi_backlight_notify(struct eeepc_wmi *eeepc, int code) | ||
| 206 | { | ||
| 207 | struct backlight_device *bd = eeepc->backlight_device; | ||
| 208 | int old = bd->props.brightness; | ||
| 209 | int new; | ||
| 210 | |||
| 211 | if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) | ||
| 212 | new = code - NOTIFY_BRNUP_MIN + 1; | ||
| 213 | else if (code >= NOTIFY_BRNDOWN_MIN && code <= NOTIFY_BRNDOWN_MAX) | ||
| 214 | new = code - NOTIFY_BRNDOWN_MIN; | ||
| 215 | |||
| 216 | bd->props.brightness = new; | ||
| 217 | backlight_update_status(bd); | ||
| 218 | backlight_force_update(bd, BACKLIGHT_UPDATE_HOTKEY); | ||
| 219 | |||
| 220 | return old; | ||
| 221 | } | ||
| 222 | |||
| 223 | static int eeepc_wmi_backlight_init(struct eeepc_wmi *eeepc) | ||
| 224 | { | ||
| 225 | struct backlight_device *bd; | ||
| 226 | struct backlight_properties props; | ||
| 227 | |||
| 228 | memset(&props, 0, sizeof(struct backlight_properties)); | ||
| 229 | props.max_brightness = 15; | ||
| 230 | bd = backlight_device_register(EEEPC_WMI_FILE, | ||
| 231 | &platform_device->dev, eeepc, | ||
| 232 | &eeepc_wmi_bl_ops, &props); | ||
| 233 | if (IS_ERR(bd)) { | ||
| 234 | pr_err("Could not register backlight device\n"); | ||
| 235 | return PTR_ERR(bd); | ||
| 236 | } | ||
| 237 | |||
| 238 | eeepc->backlight_device = bd; | ||
| 239 | |||
| 240 | bd->props.brightness = read_brightness(bd); | ||
| 241 | bd->props.power = FB_BLANK_UNBLANK; | ||
| 242 | backlight_update_status(bd); | ||
| 243 | |||
| 244 | return 0; | ||
| 245 | } | ||
| 246 | |||
| 247 | static void eeepc_wmi_backlight_exit(struct eeepc_wmi *eeepc) | ||
| 248 | { | ||
| 249 | if (eeepc->backlight_device) | ||
| 250 | backlight_device_unregister(eeepc->backlight_device); | ||
| 251 | |||
| 252 | eeepc->backlight_device = NULL; | ||
| 253 | } | ||
| 62 | 254 | ||
| 63 | static void eeepc_wmi_notify(u32 value, void *context) | 255 | static void eeepc_wmi_notify(u32 value, void *context) |
| 64 | { | 256 | { |
| 257 | struct eeepc_wmi *eeepc = context; | ||
| 65 | struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; | 258 | struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; |
| 66 | union acpi_object *obj; | 259 | union acpi_object *obj; |
| 67 | acpi_status status; | 260 | acpi_status status; |
| 68 | int code; | 261 | int code; |
| 262 | int orig_code; | ||
| 69 | 263 | ||
| 70 | status = wmi_get_event_data(value, &response); | 264 | status = wmi_get_event_data(value, &response); |
| 71 | if (status != AE_OK) { | 265 | if (status != AE_OK) { |
| 72 | pr_err("EEEPC WMI: bad event status 0x%x\n", status); | 266 | pr_err("bad event status 0x%x\n", status); |
| 73 | return; | 267 | return; |
| 74 | } | 268 | } |
| 75 | 269 | ||
| @@ -77,81 +271,142 @@ static void eeepc_wmi_notify(u32 value, void *context) | |||
| 77 | 271 | ||
| 78 | if (obj && obj->type == ACPI_TYPE_INTEGER) { | 272 | if (obj && obj->type == ACPI_TYPE_INTEGER) { |
| 79 | code = obj->integer.value; | 273 | code = obj->integer.value; |
| 274 | orig_code = code; | ||
| 80 | 275 | ||
| 81 | if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) | 276 | if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) |
| 82 | code = NOTIFY_BRNUP_MIN; | 277 | code = NOTIFY_BRNUP_MIN; |
| 83 | else if (code >= NOTIFY_BRNDOWN_MIN && code <= NOTIFY_BRNDOWN_MAX) | 278 | else if (code >= NOTIFY_BRNDOWN_MIN && |
| 279 | code <= NOTIFY_BRNDOWN_MAX) | ||
| 84 | code = NOTIFY_BRNDOWN_MIN; | 280 | code = NOTIFY_BRNDOWN_MIN; |
| 85 | 281 | ||
| 86 | if (!sparse_keymap_report_event(eeepc_wmi_input_dev, | 282 | if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) { |
| 283 | if (!acpi_video_backlight_support()) | ||
| 284 | eeepc_wmi_backlight_notify(eeepc, orig_code); | ||
| 285 | } | ||
| 286 | |||
| 287 | if (!sparse_keymap_report_event(eeepc->inputdev, | ||
| 87 | code, 1, true)) | 288 | code, 1, true)) |
| 88 | pr_info("EEEPC WMI: Unknown key %x pressed\n", code); | 289 | pr_info("Unknown key %x pressed\n", code); |
| 89 | } | 290 | } |
| 90 | 291 | ||
| 91 | kfree(obj); | 292 | kfree(obj); |
| 92 | } | 293 | } |
| 93 | 294 | ||
| 94 | static int eeepc_wmi_input_setup(void) | 295 | static int __devinit eeepc_wmi_platform_probe(struct platform_device *device) |
| 95 | { | 296 | { |
| 297 | struct eeepc_wmi *eeepc; | ||
| 96 | int err; | 298 | int err; |
| 299 | acpi_status status; | ||
| 97 | 300 | ||
| 98 | eeepc_wmi_input_dev = input_allocate_device(); | 301 | eeepc = platform_get_drvdata(device); |
| 99 | if (!eeepc_wmi_input_dev) | ||
| 100 | return -ENOMEM; | ||
| 101 | |||
| 102 | eeepc_wmi_input_dev->name = "Eee PC WMI hotkeys"; | ||
| 103 | eeepc_wmi_input_dev->phys = "wmi/input0"; | ||
| 104 | eeepc_wmi_input_dev->id.bustype = BUS_HOST; | ||
| 105 | 302 | ||
| 106 | err = sparse_keymap_setup(eeepc_wmi_input_dev, eeepc_wmi_keymap, NULL); | 303 | err = eeepc_wmi_input_init(eeepc); |
| 107 | if (err) | 304 | if (err) |
| 108 | goto err_free_dev; | 305 | goto error_input; |
| 109 | 306 | ||
| 110 | err = input_register_device(eeepc_wmi_input_dev); | 307 | if (!acpi_video_backlight_support()) { |
| 111 | if (err) | 308 | err = eeepc_wmi_backlight_init(eeepc); |
| 112 | goto err_free_keymap; | 309 | if (err) |
| 310 | goto error_backlight; | ||
| 311 | } else | ||
| 312 | pr_info("Backlight controlled by ACPI video driver\n"); | ||
| 313 | |||
| 314 | status = wmi_install_notify_handler(EEEPC_WMI_EVENT_GUID, | ||
| 315 | eeepc_wmi_notify, eeepc); | ||
| 316 | if (ACPI_FAILURE(status)) { | ||
| 317 | pr_err("Unable to register notify handler - %d\n", | ||
| 318 | status); | ||
| 319 | err = -ENODEV; | ||
| 320 | goto error_wmi; | ||
| 321 | } | ||
| 113 | 322 | ||
| 114 | return 0; | 323 | return 0; |
| 115 | 324 | ||
| 116 | err_free_keymap: | 325 | error_wmi: |
| 117 | sparse_keymap_free(eeepc_wmi_input_dev); | 326 | eeepc_wmi_backlight_exit(eeepc); |
| 118 | err_free_dev: | 327 | error_backlight: |
| 119 | input_free_device(eeepc_wmi_input_dev); | 328 | eeepc_wmi_input_exit(eeepc); |
| 329 | error_input: | ||
| 120 | return err; | 330 | return err; |
| 121 | } | 331 | } |
| 122 | 332 | ||
| 333 | static int __devexit eeepc_wmi_platform_remove(struct platform_device *device) | ||
| 334 | { | ||
| 335 | struct eeepc_wmi *eeepc; | ||
| 336 | |||
| 337 | eeepc = platform_get_drvdata(device); | ||
| 338 | wmi_remove_notify_handler(EEEPC_WMI_EVENT_GUID); | ||
| 339 | eeepc_wmi_backlight_exit(eeepc); | ||
| 340 | eeepc_wmi_input_exit(eeepc); | ||
| 341 | |||
| 342 | return 0; | ||
| 343 | } | ||
| 344 | |||
| 345 | static struct platform_driver platform_driver = { | ||
| 346 | .driver = { | ||
| 347 | .name = EEEPC_WMI_FILE, | ||
| 348 | .owner = THIS_MODULE, | ||
| 349 | }, | ||
| 350 | .probe = eeepc_wmi_platform_probe, | ||
| 351 | .remove = __devexit_p(eeepc_wmi_platform_remove), | ||
| 352 | }; | ||
| 353 | |||
| 123 | static int __init eeepc_wmi_init(void) | 354 | static int __init eeepc_wmi_init(void) |
| 124 | { | 355 | { |
| 356 | struct eeepc_wmi *eeepc; | ||
| 125 | int err; | 357 | int err; |
| 126 | acpi_status status; | ||
| 127 | 358 | ||
| 128 | if (!wmi_has_guid(EEEPC_WMI_EVENT_GUID)) { | 359 | if (!wmi_has_guid(EEEPC_WMI_EVENT_GUID) || |
| 129 | pr_warning("EEEPC WMI: No known WMI GUID found\n"); | 360 | !wmi_has_guid(EEEPC_WMI_MGMT_GUID)) { |
| 361 | pr_warning("No known WMI GUID found\n"); | ||
| 130 | return -ENODEV; | 362 | return -ENODEV; |
| 131 | } | 363 | } |
| 132 | 364 | ||
| 133 | err = eeepc_wmi_input_setup(); | 365 | eeepc = kzalloc(sizeof(struct eeepc_wmi), GFP_KERNEL); |
| 134 | if (err) | 366 | if (!eeepc) |
| 135 | return err; | 367 | return -ENOMEM; |
| 136 | 368 | ||
| 137 | status = wmi_install_notify_handler(EEEPC_WMI_EVENT_GUID, | 369 | platform_device = platform_device_alloc(EEEPC_WMI_FILE, -1); |
| 138 | eeepc_wmi_notify, NULL); | 370 | if (!platform_device) { |
| 139 | if (ACPI_FAILURE(status)) { | 371 | pr_warning("Unable to allocate platform device\n"); |
| 140 | sparse_keymap_free(eeepc_wmi_input_dev); | 372 | err = -ENOMEM; |
| 141 | input_unregister_device(eeepc_wmi_input_dev); | 373 | goto fail_platform; |
| 142 | pr_err("EEEPC WMI: Unable to register notify handler - %d\n", | 374 | } |
| 143 | status); | 375 | |
| 144 | return -ENODEV; | 376 | err = platform_device_add(platform_device); |
| 377 | if (err) { | ||
| 378 | pr_warning("Unable to add platform device\n"); | ||
| 379 | goto put_dev; | ||
| 380 | } | ||
| 381 | |||
| 382 | platform_set_drvdata(platform_device, eeepc); | ||
| 383 | |||
| 384 | err = platform_driver_register(&platform_driver); | ||
| 385 | if (err) { | ||
| 386 | pr_warning("Unable to register platform driver\n"); | ||
| 387 | goto del_dev; | ||
| 145 | } | 388 | } |
| 146 | 389 | ||
| 147 | return 0; | 390 | return 0; |
| 391 | |||
| 392 | del_dev: | ||
| 393 | platform_device_del(platform_device); | ||
| 394 | put_dev: | ||
| 395 | platform_device_put(platform_device); | ||
| 396 | fail_platform: | ||
| 397 | kfree(eeepc); | ||
| 398 | |||
| 399 | return err; | ||
| 148 | } | 400 | } |
| 149 | 401 | ||
| 150 | static void __exit eeepc_wmi_exit(void) | 402 | static void __exit eeepc_wmi_exit(void) |
| 151 | { | 403 | { |
| 152 | wmi_remove_notify_handler(EEEPC_WMI_EVENT_GUID); | 404 | struct eeepc_wmi *eeepc; |
| 153 | sparse_keymap_free(eeepc_wmi_input_dev); | 405 | |
| 154 | input_unregister_device(eeepc_wmi_input_dev); | 406 | eeepc = platform_get_drvdata(platform_device); |
| 407 | platform_driver_unregister(&platform_driver); | ||
| 408 | platform_device_unregister(platform_device); | ||
| 409 | kfree(eeepc); | ||
| 155 | } | 410 | } |
| 156 | 411 | ||
| 157 | module_init(eeepc_wmi_init); | 412 | module_init(eeepc_wmi_init); |
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c index b6218f11c957..552cad85ae5a 100644 --- a/drivers/regulator/max8925-regulator.c +++ b/drivers/regulator/max8925-regulator.c | |||
| @@ -109,7 +109,7 @@ static int max8925_is_enabled(struct regulator_dev *rdev) | |||
| 109 | struct max8925_regulator_info *info = rdev_get_drvdata(rdev); | 109 | struct max8925_regulator_info *info = rdev_get_drvdata(rdev); |
| 110 | int ret; | 110 | int ret; |
| 111 | 111 | ||
| 112 | ret = max8925_reg_read(info->i2c, info->vol_reg); | 112 | ret = max8925_reg_read(info->i2c, info->enable_reg); |
| 113 | if (ret < 0) | 113 | if (ret < 0) |
| 114 | return ret; | 114 | return ret; |
| 115 | 115 | ||
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c index 24485cc62ff8..4822cb50cd0f 100644 --- a/drivers/serial/8250_pnp.c +++ b/drivers/serial/8250_pnp.c | |||
| @@ -348,6 +348,8 @@ static const struct pnp_device_id pnp_dev_table[] = { | |||
| 348 | { "FUJ02E6", 0 }, | 348 | { "FUJ02E6", 0 }, |
| 349 | /* Fujitsu Wacom 2FGT Tablet PC device */ | 349 | /* Fujitsu Wacom 2FGT Tablet PC device */ |
| 350 | { "FUJ02E7", 0 }, | 350 | { "FUJ02E7", 0 }, |
| 351 | /* Fujitsu Wacom 1FGT Tablet PC device */ | ||
| 352 | { "FUJ02E9", 0 }, | ||
| 351 | /* | 353 | /* |
| 352 | * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in | 354 | * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in |
| 353 | * disguise) | 355 | * disguise) |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 3119fddaedb5..a176ab4bd65b 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
| @@ -29,39 +29,6 @@ | |||
| 29 | * kind, whether express or implied. | 29 | * kind, whether express or implied. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | /* Platform device Usage : | ||
| 33 | * | ||
| 34 | * Since PSCs can have multiple function, the correct driver for each one | ||
| 35 | * is selected by calling mpc52xx_match_psc_function(...). The function | ||
| 36 | * handled by this driver is "uart". | ||
| 37 | * | ||
| 38 | * The driver init all necessary registers to place the PSC in uart mode without | ||
| 39 | * DCD. However, the pin multiplexing aren't changed and should be set either | ||
| 40 | * by the bootloader or in the platform init code. | ||
| 41 | * | ||
| 42 | * The idx field must be equal to the PSC index (e.g. 0 for PSC1, 1 for PSC2, | ||
| 43 | * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and | ||
| 44 | * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly | ||
| 45 | * fpr the console code : without this 1:1 mapping, at early boot time, when we | ||
| 46 | * are parsing the kernel args console=ttyPSC?, we wouldn't know which PSC it | ||
| 47 | * will be mapped to. | ||
| 48 | */ | ||
| 49 | |||
| 50 | /* OF Platform device Usage : | ||
| 51 | * | ||
| 52 | * This driver is only used for PSCs configured in uart mode. The device | ||
| 53 | * tree will have a node for each PSC with "mpc52xx-psc-uart" in the compatible | ||
| 54 | * list. | ||
| 55 | * | ||
| 56 | * By default, PSC devices are enumerated in the order they are found. However | ||
| 57 | * a particular PSC number can be forces by adding 'device_no = <port#>' | ||
| 58 | * to the device node. | ||
| 59 | * | ||
| 60 | * The driver init all necessary registers to place the PSC in uart mode without | ||
| 61 | * DCD. However, the pin multiplexing aren't changed and should be set either | ||
| 62 | * by the bootloader or in the platform init code. | ||
| 63 | */ | ||
| 64 | |||
| 65 | #undef DEBUG | 32 | #undef DEBUG |
| 66 | 33 | ||
| 67 | #include <linux/device.h> | 34 | #include <linux/device.h> |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 4eaa043ca2a8..700e10833bf9 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
| @@ -752,8 +752,10 @@ static void pmz_break_ctl(struct uart_port *port, int break_state) | |||
| 752 | uap->curregs[R5] = new_reg; | 752 | uap->curregs[R5] = new_reg; |
| 753 | 753 | ||
| 754 | /* NOTE: Not subject to 'transmitter active' rule. */ | 754 | /* NOTE: Not subject to 'transmitter active' rule. */ |
| 755 | if (ZS_IS_ASLEEP(uap)) | 755 | if (ZS_IS_ASLEEP(uap)) { |
| 756 | spin_unlock_irqrestore(&port->lock, flags); | ||
| 756 | return; | 757 | return; |
| 758 | } | ||
| 757 | write_zsreg(uap, R5, uap->curregs[R5]); | 759 | write_zsreg(uap, R5, uap->curregs[R5]); |
| 758 | } | 760 | } |
| 759 | 761 | ||
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c index 2e71bbc04dac..b1962025b1aa 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/serial/serial_ks8695.c | |||
| @@ -650,6 +650,7 @@ static struct console ks8695_console = { | |||
| 650 | 650 | ||
| 651 | static int __init ks8695_console_init(void) | 651 | static int __init ks8695_console_init(void) |
| 652 | { | 652 | { |
| 653 | add_preferred_console(SERIAL_KS8695_DEVNAME, 0, NULL); | ||
| 653 | register_console(&ks8695_console); | 654 | register_console(&ks8695_console); |
| 654 | return 0; | 655 | return 0; |
| 655 | } | 656 | } |
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index d8356af118a8..e0de0d0eedea 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -204,6 +204,7 @@ static inline void mcspi_write_chconf0(const struct spi_device *spi, u32 val) | |||
| 204 | 204 | ||
| 205 | cs->chconf0 = val; | 205 | cs->chconf0 = val; |
| 206 | mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, val); | 206 | mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, val); |
| 207 | mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0); | ||
| 207 | } | 208 | } |
| 208 | 209 | ||
| 209 | static void omap2_mcspi_set_dma_req(const struct spi_device *spi, | 210 | static void omap2_mcspi_set_dma_req(const struct spi_device *spi, |
| @@ -532,7 +533,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) | |||
| 532 | goto out; | 533 | goto out; |
| 533 | } | 534 | } |
| 534 | #ifdef VERBOSE | 535 | #ifdef VERBOSE |
| 535 | dev_dbg(&spi->dev, "write-%d %04x\n", | 536 | dev_dbg(&spi->dev, "write-%d %08x\n", |
| 536 | word_len, *tx); | 537 | word_len, *tx); |
| 537 | #endif | 538 | #endif |
| 538 | __raw_writel(*tx++, tx_reg); | 539 | __raw_writel(*tx++, tx_reg); |
| @@ -550,7 +551,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) | |||
| 550 | mcspi_write_chconf0(spi, l); | 551 | mcspi_write_chconf0(spi, l); |
| 551 | *rx++ = __raw_readl(rx_reg); | 552 | *rx++ = __raw_readl(rx_reg); |
| 552 | #ifdef VERBOSE | 553 | #ifdef VERBOSE |
| 553 | dev_dbg(&spi->dev, "read-%d %04x\n", | 554 | dev_dbg(&spi->dev, "read-%d %08x\n", |
| 554 | word_len, *(rx - 1)); | 555 | word_len, *(rx - 1)); |
| 555 | #endif | 556 | #endif |
| 556 | } | 557 | } |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9ffb0fdbd6fe..b3a1f9259b62 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -41,7 +41,7 @@ static void spidev_release(struct device *dev) | |||
| 41 | spi->master->cleanup(spi); | 41 | spi->master->cleanup(spi); |
| 42 | 42 | ||
| 43 | spi_master_put(spi->master); | 43 | spi_master_put(spi->master); |
| 44 | kfree(dev); | 44 | kfree(spi); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | static ssize_t | 47 | static ssize_t |
| @@ -257,6 +257,7 @@ int spi_add_device(struct spi_device *spi) | |||
| 257 | { | 257 | { |
| 258 | static DEFINE_MUTEX(spi_add_lock); | 258 | static DEFINE_MUTEX(spi_add_lock); |
| 259 | struct device *dev = spi->master->dev.parent; | 259 | struct device *dev = spi->master->dev.parent; |
| 260 | struct device *d; | ||
| 260 | int status; | 261 | int status; |
| 261 | 262 | ||
| 262 | /* Chipselects are numbered 0..max; validate. */ | 263 | /* Chipselects are numbered 0..max; validate. */ |
| @@ -278,10 +279,11 @@ int spi_add_device(struct spi_device *spi) | |||
| 278 | */ | 279 | */ |
| 279 | mutex_lock(&spi_add_lock); | 280 | mutex_lock(&spi_add_lock); |
| 280 | 281 | ||
| 281 | if (bus_find_device_by_name(&spi_bus_type, NULL, dev_name(&spi->dev)) | 282 | d = bus_find_device_by_name(&spi_bus_type, NULL, dev_name(&spi->dev)); |
| 282 | != NULL) { | 283 | if (d != NULL) { |
| 283 | dev_err(dev, "chipselect %d already in use\n", | 284 | dev_err(dev, "chipselect %d already in use\n", |
| 284 | spi->chip_select); | 285 | spi->chip_select); |
| 286 | put_device(d); | ||
| 285 | status = -EBUSY; | 287 | status = -EBUSY; |
| 286 | goto done; | 288 | goto done; |
| 287 | } | 289 | } |
diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c index e2c44ec6fc45..7ac2c6d8e9a3 100644 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c | |||
| @@ -464,9 +464,9 @@ static void dt3155_init_isr(int minor) | |||
| 464 | /* 50/60 Hz should be set before this point but let's make sure it is */ | 464 | /* 50/60 Hz should be set before this point but let's make sure it is */ |
| 465 | /* right anyway */ | 465 | /* right anyway */ |
| 466 | 466 | ||
| 467 | ReadI2C(dt3155_lbase[ minor ], CONFIG, &i2c_csr2.reg); | 467 | ReadI2C(dt3155_lbase[ minor ], CSR2, &i2c_csr2.reg); |
| 468 | i2c_csr2.fld.HZ50 = FORMAT50HZ; | 468 | i2c_csr2.fld.HZ50 = FORMAT50HZ; |
| 469 | WriteI2C(dt3155_lbase[ minor ], CONFIG, i2c_config.reg); | 469 | WriteI2C(dt3155_lbase[ minor ], CSR2, i2c_csr2.reg); |
| 470 | 470 | ||
| 471 | /* enable busmaster chip, clear flags */ | 471 | /* enable busmaster chip, clear flags */ |
| 472 | 472 | ||
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 5d53889fb4a4..3a1112d29aeb 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c | |||
| @@ -306,9 +306,9 @@ void HvCleanup(void) | |||
| 306 | DPRINT_ENTER(VMBUS); | 306 | DPRINT_ENTER(VMBUS); |
| 307 | 307 | ||
| 308 | if (gHvContext.SignalEventBuffer) { | 308 | if (gHvContext.SignalEventBuffer) { |
| 309 | kfree(gHvContext.SignalEventBuffer); | ||
| 309 | gHvContext.SignalEventBuffer = NULL; | 310 | gHvContext.SignalEventBuffer = NULL; |
| 310 | gHvContext.SignalEventParam = NULL; | 311 | gHvContext.SignalEventParam = NULL; |
| 311 | kfree(gHvContext.SignalEventBuffer); | ||
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | if (gHvContext.HypercallPage) { | 314 | if (gHvContext.HypercallPage) { |
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index cd2930de2176..6704f64c93f0 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c | |||
| @@ -751,6 +751,7 @@ static int RndisFilterOpenDevice(struct rndis_device *Device) | |||
| 751 | 751 | ||
| 752 | ret = RndisFilterSetPacketFilter(Device, | 752 | ret = RndisFilterSetPacketFilter(Device, |
| 753 | NDIS_PACKET_TYPE_BROADCAST | | 753 | NDIS_PACKET_TYPE_BROADCAST | |
| 754 | NDIS_PACKET_TYPE_ALL_MULTICAST | | ||
| 754 | NDIS_PACKET_TYPE_DIRECTED); | 755 | NDIS_PACKET_TYPE_DIRECTED); |
| 755 | if (ret == 0) | 756 | if (ret == 0) |
| 756 | Device->State = RNDIS_DEV_DATAINITIALIZED; | 757 | Device->State = RNDIS_DEV_DATAINITIALIZED; |
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 2ccb6b93fe47..ab27d9a4446d 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c | |||
| @@ -403,8 +403,7 @@ static int netvsc_probe(struct device *device) | |||
| 403 | if (!net_drv_obj->Base.OnDeviceAdd) | 403 | if (!net_drv_obj->Base.OnDeviceAdd) |
| 404 | return -1; | 404 | return -1; |
| 405 | 405 | ||
| 406 | net = alloc_netdev(sizeof(struct net_device_context), "seth%d", | 406 | net = alloc_etherdev(sizeof(struct net_device_context)); |
| 407 | ether_setup); | ||
| 408 | if (!net) | 407 | if (!net) |
| 409 | return -1; | 408 | return -1; |
| 410 | 409 | ||
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index ea76902797bb..82e43588e8a5 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c | |||
| @@ -618,7 +618,7 @@ static int lis3l02dq_thresh_handler_th(struct iio_dev *dev_info, | |||
| 618 | static void lis3l02dq_thresh_handler_bh_no_check(struct work_struct *work_s) | 618 | static void lis3l02dq_thresh_handler_bh_no_check(struct work_struct *work_s) |
| 619 | { | 619 | { |
| 620 | struct iio_work_cont *wc | 620 | struct iio_work_cont *wc |
| 621 | = container_of(work_s, struct iio_work_cont, ws_nocheck); | 621 | = container_of(work_s, struct iio_work_cont, ws); |
| 622 | struct lis3l02dq_state *st = wc->st; | 622 | struct lis3l02dq_state *st = wc->st; |
| 623 | u8 t; | 623 | u8 t; |
| 624 | 624 | ||
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index 93712430e579..a4d97ea0df3d 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c | |||
| @@ -493,6 +493,9 @@ int lis3l02dq_probe_trigger(struct iio_dev *indio_dev) | |||
| 493 | struct lis3l02dq_state *state = indio_dev->dev_data; | 493 | struct lis3l02dq_state *state = indio_dev->dev_data; |
| 494 | 494 | ||
| 495 | state->trig = iio_allocate_trigger(); | 495 | state->trig = iio_allocate_trigger(); |
| 496 | if (!state->trig) | ||
| 497 | return -ENOMEM; | ||
| 498 | |||
| 496 | state->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL); | 499 | state->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL); |
| 497 | if (!state->trig->name) { | 500 | if (!state->trig->name) { |
| 498 | ret = -ENOMEM; | 501 | ret = -ENOMEM; |
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 790d1cc9cdc3..773f1d1d9c6e 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c | |||
| @@ -557,6 +557,7 @@ error_put_reg: | |||
| 557 | if (!IS_ERR(st->reg)) | 557 | if (!IS_ERR(st->reg)) |
| 558 | regulator_put(st->reg); | 558 | regulator_put(st->reg); |
| 559 | error_free_st: | 559 | error_free_st: |
| 560 | i2c_set_clientdata(client, NULL); | ||
| 560 | kfree(st); | 561 | kfree(st); |
| 561 | 562 | ||
| 562 | error_ret: | 563 | error_ret: |
| @@ -574,6 +575,7 @@ static int max1363_remove(struct i2c_client *client) | |||
| 574 | regulator_disable(st->reg); | 575 | regulator_disable(st->reg); |
| 575 | regulator_put(st->reg); | 576 | regulator_put(st->reg); |
| 576 | } | 577 | } |
| 578 | i2c_set_clientdata(client, NULL); | ||
| 577 | kfree(st); | 579 | kfree(st); |
| 578 | 580 | ||
| 579 | return 0; | 581 | return 0; |
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 37f58f66e491..1d77082c8531 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c | |||
| @@ -537,6 +537,7 @@ static void iio_device_unregister_sysfs(struct iio_dev *dev_info) | |||
| 537 | sysfs_remove_group(&dev_info->dev.kobj, dev_info->attrs); | 537 | sysfs_remove_group(&dev_info->dev.kobj, dev_info->attrs); |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | /* Return a negative errno on failure */ | ||
| 540 | int iio_get_new_idr_val(struct idr *this_idr) | 541 | int iio_get_new_idr_val(struct idr *this_idr) |
| 541 | { | 542 | { |
| 542 | int ret; | 543 | int ret; |
| @@ -660,7 +661,7 @@ static int iio_device_register_eventset(struct iio_dev *dev_info) | |||
| 660 | for (i = 0; i < dev_info->num_interrupt_lines; i++) { | 661 | for (i = 0; i < dev_info->num_interrupt_lines; i++) { |
| 661 | dev_info->event_interfaces[i].owner = dev_info->driver_module; | 662 | dev_info->event_interfaces[i].owner = dev_info->driver_module; |
| 662 | ret = iio_get_new_idr_val(&iio_event_idr); | 663 | ret = iio_get_new_idr_val(&iio_event_idr); |
| 663 | if (ret) | 664 | if (ret < 0) |
| 664 | goto error_free_setup_ev_ints; | 665 | goto error_free_setup_ev_ints; |
| 665 | else | 666 | else |
| 666 | dev_info->event_interfaces[i].id = ret; | 667 | dev_info->event_interfaces[i].id = ret; |
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c index 1ba4aa392f6e..8770a00e3652 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/staging/iio/light/tsl2563.c | |||
| @@ -682,6 +682,7 @@ static int __devinit tsl2563_probe(struct i2c_client *client, | |||
| 682 | fail2: | 682 | fail2: |
| 683 | iio_device_unregister(chip->indio_dev); | 683 | iio_device_unregister(chip->indio_dev); |
| 684 | fail1: | 684 | fail1: |
| 685 | i2c_set_clientdata(client, NULL); | ||
| 685 | kfree(chip); | 686 | kfree(chip); |
| 686 | return err; | 687 | return err; |
| 687 | } | 688 | } |
| @@ -692,6 +693,7 @@ static int tsl2563_remove(struct i2c_client *client) | |||
| 692 | 693 | ||
| 693 | iio_device_unregister(chip->indio_dev); | 694 | iio_device_unregister(chip->indio_dev); |
| 694 | 695 | ||
| 696 | i2c_set_clientdata(client, NULL); | ||
| 695 | kfree(chip); | 697 | kfree(chip); |
| 696 | return 0; | 698 | return 0; |
| 697 | } | 699 | } |
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c index b104c3d9c35e..cf22c091668c 100644 --- a/drivers/staging/iio/ring_sw.c +++ b/drivers/staging/iio/ring_sw.c | |||
| @@ -293,7 +293,7 @@ again: | |||
| 293 | return -EAGAIN; | 293 | return -EAGAIN; |
| 294 | memcpy(data, last_written_p_copy, ring->buf.bpd); | 294 | memcpy(data, last_written_p_copy, ring->buf.bpd); |
| 295 | 295 | ||
| 296 | if (unlikely(ring->last_written_p >= last_written_p_copy)) | 296 | if (unlikely(ring->last_written_p != last_written_p_copy)) |
| 297 | goto again; | 297 | goto again; |
| 298 | 298 | ||
| 299 | iio_unmark_sw_rb_in_use(&ring->buf); | 299 | iio_unmark_sw_rb_in_use(&ring->buf); |
diff --git a/drivers/staging/octeon/cvmx-helper-board.c b/drivers/staging/octeon/cvmx-helper-board.c index 3085e38a6f99..00a555b83354 100644 --- a/drivers/staging/octeon/cvmx-helper-board.c +++ b/drivers/staging/octeon/cvmx-helper-board.c | |||
| @@ -153,6 +153,14 @@ int cvmx_helper_board_get_mii_address(int ipd_port) | |||
| 153 | * through switch. | 153 | * through switch. |
| 154 | */ | 154 | */ |
| 155 | return -1; | 155 | return -1; |
| 156 | |||
| 157 | case CVMX_BOARD_TYPE_CUST_WSX16: | ||
| 158 | if (ipd_port >= 0 && ipd_port <= 3) | ||
| 159 | return ipd_port; | ||
| 160 | else if (ipd_port >= 16 && ipd_port <= 19) | ||
| 161 | return ipd_port - 16 + 4; | ||
| 162 | else | ||
| 163 | return -1; | ||
| 156 | } | 164 | } |
| 157 | 165 | ||
| 158 | /* Some unknown board. Somebody forgot to update this function... */ | 166 | /* Some unknown board. Somebody forgot to update this function... */ |
diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c index 1873a79bb033..740db0c1ac01 100644 --- a/drivers/staging/rt2860/usb_main_dev.c +++ b/drivers/staging/rt2860/usb_main_dev.c | |||
| @@ -63,6 +63,7 @@ struct usb_device_id rtusb_usb_id[] = { | |||
| 63 | {USB_DEVICE(0x07D1, 0x3C11)}, /* D-Link */ | 63 | {USB_DEVICE(0x07D1, 0x3C11)}, /* D-Link */ |
| 64 | {USB_DEVICE(0x14B2, 0x3C07)}, /* AL */ | 64 | {USB_DEVICE(0x14B2, 0x3C07)}, /* AL */ |
| 65 | {USB_DEVICE(0x050D, 0x8053)}, /* Belkin */ | 65 | {USB_DEVICE(0x050D, 0x8053)}, /* Belkin */ |
| 66 | {USB_DEVICE(0x050D, 0x825B)}, /* Belkin */ | ||
| 66 | {USB_DEVICE(0x14B2, 0x3C23)}, /* Airlink */ | 67 | {USB_DEVICE(0x14B2, 0x3C23)}, /* Airlink */ |
| 67 | {USB_DEVICE(0x14B2, 0x3C27)}, /* Airlink */ | 68 | {USB_DEVICE(0x14B2, 0x3C27)}, /* Airlink */ |
| 68 | {USB_DEVICE(0x07AA, 0x002F)}, /* Corega */ | 69 | {USB_DEVICE(0x07AA, 0x002F)}, /* Corega */ |
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index e16256fe595a..04d9b85f3d4c 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c | |||
| @@ -113,14 +113,17 @@ u32 rt_global_debug_component = \ | |||
| 113 | 113 | ||
| 114 | static const struct usb_device_id rtl8192_usb_id_tbl[] = { | 114 | static const struct usb_device_id rtl8192_usb_id_tbl[] = { |
| 115 | /* Realtek */ | 115 | /* Realtek */ |
| 116 | {USB_DEVICE(0x0bda, 0x8171)}, | ||
| 116 | {USB_DEVICE(0x0bda, 0x8192)}, | 117 | {USB_DEVICE(0x0bda, 0x8192)}, |
| 117 | {USB_DEVICE(0x0bda, 0x8709)}, | 118 | {USB_DEVICE(0x0bda, 0x8709)}, |
| 118 | /* Corega */ | 119 | /* Corega */ |
| 119 | {USB_DEVICE(0x07aa, 0x0043)}, | 120 | {USB_DEVICE(0x07aa, 0x0043)}, |
| 120 | /* Belkin */ | 121 | /* Belkin */ |
| 121 | {USB_DEVICE(0x050d, 0x805E)}, | 122 | {USB_DEVICE(0x050d, 0x805E)}, |
| 123 | {USB_DEVICE(0x050d, 0x815F)}, /* Belkin F5D8053 v6 */ | ||
| 122 | /* Sitecom */ | 124 | /* Sitecom */ |
| 123 | {USB_DEVICE(0x0df6, 0x0031)}, | 125 | {USB_DEVICE(0x0df6, 0x0031)}, |
| 126 | {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 */ | ||
| 124 | /* EnGenius */ | 127 | /* EnGenius */ |
| 125 | {USB_DEVICE(0x1740, 0x9201)}, | 128 | {USB_DEVICE(0x1740, 0x9201)}, |
| 126 | /* Dlink */ | 129 | /* Dlink */ |
diff --git a/drivers/staging/usbip/usbip_event.c b/drivers/staging/usbip/usbip_event.c index 6da1021e8a65..a2566f1075d5 100644 --- a/drivers/staging/usbip/usbip_event.c +++ b/drivers/staging/usbip/usbip_event.c | |||
| @@ -117,6 +117,9 @@ void usbip_stop_eh(struct usbip_device *ud) | |||
| 117 | { | 117 | { |
| 118 | struct usbip_task *eh = &ud->eh; | 118 | struct usbip_task *eh = &ud->eh; |
| 119 | 119 | ||
| 120 | if (eh->thread == current) | ||
| 121 | return; /* do not wait for myself */ | ||
| 122 | |||
| 120 | wait_for_completion(&eh->thread_done); | 123 | wait_for_completion(&eh->thread_done); |
| 121 | usbip_dbg_eh("usbip_eh has finished\n"); | 124 | usbip_dbg_eh("usbip_eh has finished\n"); |
| 122 | } | 125 | } |
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index 68f24425977f..783051f59f19 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c | |||
| @@ -2455,9 +2455,10 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 2455 | dev_info(&pdev->dev, "VME Write and flush and error check is %s\n", | 2455 | dev_info(&pdev->dev, "VME Write and flush and error check is %s\n", |
| 2456 | err_chk ? "enabled" : "disabled"); | 2456 | err_chk ? "enabled" : "disabled"); |
| 2457 | 2457 | ||
| 2458 | if (tsi148_crcsr_init(tsi148_bridge, pdev)) | 2458 | if (tsi148_crcsr_init(tsi148_bridge, pdev)) { |
| 2459 | dev_err(&pdev->dev, "CR/CSR configuration failed.\n"); | 2459 | dev_err(&pdev->dev, "CR/CSR configuration failed.\n"); |
| 2460 | goto err_crcsr; | 2460 | goto err_crcsr; |
| 2461 | } | ||
| 2461 | 2462 | ||
| 2462 | retval = vme_register_bridge(tsi148_bridge); | 2463 | retval = vme_register_bridge(tsi148_bridge); |
| 2463 | if (retval != 0) { | 2464 | if (retval != 0) { |
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index be6331e2c276..5e1a253b08a0 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1542,6 +1542,9 @@ static const struct usb_device_id acm_ids[] = { | |||
| 1542 | { USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */ | 1542 | { USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */ |
| 1543 | .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ | 1543 | .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ |
| 1544 | }, | 1544 | }, |
| 1545 | { USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */ | ||
| 1546 | .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ | ||
| 1547 | }, | ||
| 1545 | 1548 | ||
| 1546 | /* Nokia S60 phones expose two ACM channels. The first is | 1549 | /* Nokia S60 phones expose two ACM channels. The first is |
| 1547 | * a modem and is picked up by the standard AT-command | 1550 | * a modem and is picked up by the standard AT-command |
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 97a819c23ef3..7e594449600e 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig | |||
| @@ -109,7 +109,7 @@ config USB_SUSPEND | |||
| 109 | config USB_OTG | 109 | config USB_OTG |
| 110 | bool | 110 | bool |
| 111 | depends on USB && EXPERIMENTAL | 111 | depends on USB && EXPERIMENTAL |
| 112 | select USB_SUSPEND | 112 | depends on USB_SUSPEND |
| 113 | default n | 113 | default n |
| 114 | 114 | ||
| 115 | 115 | ||
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index bdf87a8414a1..2c95153c0f24 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c | |||
| @@ -120,7 +120,7 @@ int usb_choose_configuration(struct usb_device *udev) | |||
| 120 | * than a vendor-specific driver. */ | 120 | * than a vendor-specific driver. */ |
| 121 | else if (udev->descriptor.bDeviceClass != | 121 | else if (udev->descriptor.bDeviceClass != |
| 122 | USB_CLASS_VENDOR_SPEC && | 122 | USB_CLASS_VENDOR_SPEC && |
| 123 | (!desc || desc->bInterfaceClass != | 123 | (desc && desc->bInterfaceClass != |
| 124 | USB_CLASS_VENDOR_SPEC)) { | 124 | USB_CLASS_VENDOR_SPEC)) { |
| 125 | best = c; | 125 | best = c; |
| 126 | break; | 126 | break; |
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index 97b40ce133f0..4a6366a42129 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c | |||
| @@ -515,13 +515,13 @@ static int fs_create_by_name (const char *name, mode_t mode, | |||
| 515 | *dentry = NULL; | 515 | *dentry = NULL; |
| 516 | mutex_lock(&parent->d_inode->i_mutex); | 516 | mutex_lock(&parent->d_inode->i_mutex); |
| 517 | *dentry = lookup_one_len(name, parent, strlen(name)); | 517 | *dentry = lookup_one_len(name, parent, strlen(name)); |
| 518 | if (!IS_ERR(dentry)) { | 518 | if (!IS_ERR(*dentry)) { |
| 519 | if ((mode & S_IFMT) == S_IFDIR) | 519 | if ((mode & S_IFMT) == S_IFDIR) |
| 520 | error = usbfs_mkdir (parent->d_inode, *dentry, mode); | 520 | error = usbfs_mkdir (parent->d_inode, *dentry, mode); |
| 521 | else | 521 | else |
| 522 | error = usbfs_create (parent->d_inode, *dentry, mode); | 522 | error = usbfs_create (parent->d_inode, *dentry, mode); |
| 523 | } else | 523 | } else |
| 524 | error = PTR_ERR(dentry); | 524 | error = PTR_ERR(*dentry); |
| 525 | mutex_unlock(&parent->d_inode->i_mutex); | 525 | mutex_unlock(&parent->d_inode->i_mutex); |
| 526 | 526 | ||
| 527 | return error; | 527 | return error; |
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 1297e9b16a51..0561430f2ede 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
| @@ -718,7 +718,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size, | |||
| 718 | EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor); | 718 | EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor); |
| 719 | 719 | ||
| 720 | /** | 720 | /** |
| 721 | * usb_buffer_alloc - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP | 721 | * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP |
| 722 | * @dev: device the buffer will be used with | 722 | * @dev: device the buffer will be used with |
| 723 | * @size: requested buffer size | 723 | * @size: requested buffer size |
| 724 | * @mem_flags: affect whether allocation may block | 724 | * @mem_flags: affect whether allocation may block |
| @@ -737,30 +737,30 @@ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor); | |||
| 737 | * architectures where CPU caches are not DMA-coherent. On systems without | 737 | * architectures where CPU caches are not DMA-coherent. On systems without |
| 738 | * bus-snooping caches, these buffers are uncached. | 738 | * bus-snooping caches, these buffers are uncached. |
| 739 | * | 739 | * |
| 740 | * When the buffer is no longer used, free it with usb_buffer_free(). | 740 | * When the buffer is no longer used, free it with usb_free_coherent(). |
| 741 | */ | 741 | */ |
| 742 | void *usb_buffer_alloc(struct usb_device *dev, size_t size, gfp_t mem_flags, | 742 | void *usb_alloc_coherent(struct usb_device *dev, size_t size, gfp_t mem_flags, |
| 743 | dma_addr_t *dma) | 743 | dma_addr_t *dma) |
| 744 | { | 744 | { |
| 745 | if (!dev || !dev->bus) | 745 | if (!dev || !dev->bus) |
| 746 | return NULL; | 746 | return NULL; |
| 747 | return hcd_buffer_alloc(dev->bus, size, mem_flags, dma); | 747 | return hcd_buffer_alloc(dev->bus, size, mem_flags, dma); |
| 748 | } | 748 | } |
| 749 | EXPORT_SYMBOL_GPL(usb_buffer_alloc); | 749 | EXPORT_SYMBOL_GPL(usb_alloc_coherent); |
| 750 | 750 | ||
| 751 | /** | 751 | /** |
| 752 | * usb_buffer_free - free memory allocated with usb_buffer_alloc() | 752 | * usb_free_coherent - free memory allocated with usb_alloc_coherent() |
| 753 | * @dev: device the buffer was used with | 753 | * @dev: device the buffer was used with |
| 754 | * @size: requested buffer size | 754 | * @size: requested buffer size |
| 755 | * @addr: CPU address of buffer | 755 | * @addr: CPU address of buffer |
| 756 | * @dma: DMA address of buffer | 756 | * @dma: DMA address of buffer |
| 757 | * | 757 | * |
| 758 | * This reclaims an I/O buffer, letting it be reused. The memory must have | 758 | * This reclaims an I/O buffer, letting it be reused. The memory must have |
| 759 | * been allocated using usb_buffer_alloc(), and the parameters must match | 759 | * been allocated using usb_alloc_coherent(), and the parameters must match |
| 760 | * those provided in that allocation request. | 760 | * those provided in that allocation request. |
| 761 | */ | 761 | */ |
| 762 | void usb_buffer_free(struct usb_device *dev, size_t size, void *addr, | 762 | void usb_free_coherent(struct usb_device *dev, size_t size, void *addr, |
| 763 | dma_addr_t dma) | 763 | dma_addr_t dma) |
| 764 | { | 764 | { |
| 765 | if (!dev || !dev->bus) | 765 | if (!dev || !dev->bus) |
| 766 | return; | 766 | return; |
| @@ -768,7 +768,7 @@ void usb_buffer_free(struct usb_device *dev, size_t size, void *addr, | |||
| 768 | return; | 768 | return; |
| 769 | hcd_buffer_free(dev->bus, size, addr, dma); | 769 | hcd_buffer_free(dev->bus, size, addr, dma); |
| 770 | } | 770 | } |
| 771 | EXPORT_SYMBOL_GPL(usb_buffer_free); | 771 | EXPORT_SYMBOL_GPL(usb_free_coherent); |
| 772 | 772 | ||
| 773 | /** | 773 | /** |
| 774 | * usb_buffer_map - create DMA mapping(s) for an urb | 774 | * usb_buffer_map - create DMA mapping(s) for an urb |
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 124a8ccfdcda..1f73b485732d 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c | |||
| @@ -2145,6 +2145,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, | |||
| 2145 | u32 epctrl; | 2145 | u32 epctrl; |
| 2146 | u32 mps; | 2146 | u32 mps; |
| 2147 | int dir_in; | 2147 | int dir_in; |
| 2148 | int ret = 0; | ||
| 2148 | 2149 | ||
| 2149 | dev_dbg(hsotg->dev, | 2150 | dev_dbg(hsotg->dev, |
| 2150 | "%s: ep %s: a 0x%02x, attr 0x%02x, mps 0x%04x, intr %d\n", | 2151 | "%s: ep %s: a 0x%02x, attr 0x%02x, mps 0x%04x, intr %d\n", |
| @@ -2196,7 +2197,8 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, | |||
| 2196 | switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) { | 2197 | switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) { |
| 2197 | case USB_ENDPOINT_XFER_ISOC: | 2198 | case USB_ENDPOINT_XFER_ISOC: |
| 2198 | dev_err(hsotg->dev, "no current ISOC support\n"); | 2199 | dev_err(hsotg->dev, "no current ISOC support\n"); |
| 2199 | return -EINVAL; | 2200 | ret = -EINVAL; |
| 2201 | goto out; | ||
| 2200 | 2202 | ||
| 2201 | case USB_ENDPOINT_XFER_BULK: | 2203 | case USB_ENDPOINT_XFER_BULK: |
| 2202 | epctrl |= S3C_DxEPCTL_EPType_Bulk; | 2204 | epctrl |= S3C_DxEPCTL_EPType_Bulk; |
| @@ -2235,8 +2237,9 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, | |||
| 2235 | /* enable the endpoint interrupt */ | 2237 | /* enable the endpoint interrupt */ |
| 2236 | s3c_hsotg_ctrl_epint(hsotg, index, dir_in, 1); | 2238 | s3c_hsotg_ctrl_epint(hsotg, index, dir_in, 1); |
| 2237 | 2239 | ||
| 2240 | out: | ||
| 2238 | spin_unlock_irqrestore(&hs_ep->lock, flags); | 2241 | spin_unlock_irqrestore(&hs_ep->lock, flags); |
| 2239 | return 0; | 2242 | return ret; |
| 2240 | } | 2243 | } |
| 2241 | 2244 | ||
| 2242 | static int s3c_hsotg_ep_disable(struct usb_ep *ep) | 2245 | static int s3c_hsotg_ep_disable(struct usb_ep *ep) |
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 68b83ab70719..944291e10f97 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
| @@ -331,6 +331,8 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg) | |||
| 331 | */ | 331 | */ |
| 332 | if (at91_suspend_entering_slow_clock()) { | 332 | if (at91_suspend_entering_slow_clock()) { |
| 333 | ohci_usb_reset (ohci); | 333 | ohci_usb_reset (ohci); |
| 334 | /* flush the writes */ | ||
| 335 | (void) ohci_readl (ohci, &ohci->regs->control); | ||
| 334 | at91_stop_clock(); | 336 | at91_stop_clock(); |
| 335 | } | 337 | } |
| 336 | 338 | ||
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index 32bbce9718f0..65cac8cc8921 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c | |||
| @@ -697,7 +697,7 @@ static int ohci_hub_control ( | |||
| 697 | u16 wLength | 697 | u16 wLength |
| 698 | ) { | 698 | ) { |
| 699 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | 699 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); |
| 700 | int ports = hcd_to_bus (hcd)->root_hub->maxchild; | 700 | int ports = ohci->num_ports; |
| 701 | u32 temp; | 701 | u32 temp; |
| 702 | int retval = 0; | 702 | int retval = 0; |
| 703 | 703 | ||
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index 50f57f468836..e62b30b3e429 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c | |||
| @@ -660,13 +660,13 @@ static struct ehci_qh *oxu_qh_alloc(struct oxu_hcd *oxu) | |||
| 660 | if (qh->dummy == NULL) { | 660 | if (qh->dummy == NULL) { |
| 661 | oxu_dbg(oxu, "no dummy td\n"); | 661 | oxu_dbg(oxu, "no dummy td\n"); |
| 662 | oxu->qh_used[i] = 0; | 662 | oxu->qh_used[i] = 0; |
| 663 | 663 | qh = NULL; | |
| 664 | return NULL; | 664 | goto unlock; |
| 665 | } | 665 | } |
| 666 | 666 | ||
| 667 | oxu->qh_used[i] = 1; | 667 | oxu->qh_used[i] = 1; |
| 668 | } | 668 | } |
| 669 | 669 | unlock: | |
| 670 | spin_unlock(&oxu->mem_lock); | 670 | spin_unlock(&oxu->mem_lock); |
| 671 | 671 | ||
| 672 | return qh; | 672 | return qh; |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index e11cc3aa4b82..3b867a8af7b2 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
| @@ -720,10 +720,10 @@ retry: | |||
| 720 | /* port status seems weird until after reset, so | 720 | /* port status seems weird until after reset, so |
| 721 | * force the reset and make khubd clean up later. | 721 | * force the reset and make khubd clean up later. |
| 722 | */ | 722 | */ |
| 723 | if (sl811->stat_insrmv & 1) | 723 | if (irqstat & SL11H_INTMASK_RD) |
| 724 | sl811->port1 |= 1 << USB_PORT_FEAT_CONNECTION; | ||
| 725 | else | ||
| 726 | sl811->port1 &= ~(1 << USB_PORT_FEAT_CONNECTION); | 724 | sl811->port1 &= ~(1 << USB_PORT_FEAT_CONNECTION); |
| 725 | else | ||
| 726 | sl811->port1 |= 1 << USB_PORT_FEAT_CONNECTION; | ||
| 727 | 727 | ||
| 728 | sl811->port1 |= 1 << USB_PORT_FEAT_C_CONNECTION; | 728 | sl811->port1 |= 1 << USB_PORT_FEAT_C_CONNECTION; |
| 729 | 729 | ||
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index c09539bad1ee..d64f5724bfc4 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
| @@ -582,6 +582,19 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev, | |||
| 582 | return EP_INTERVAL(interval); | 582 | return EP_INTERVAL(interval); |
| 583 | } | 583 | } |
| 584 | 584 | ||
| 585 | /* The "Mult" field in the endpoint context is only set for SuperSpeed devices. | ||
| 586 | * High speed endpoint descriptors can define "the number of additional | ||
| 587 | * transaction opportunities per microframe", but that goes in the Max Burst | ||
| 588 | * endpoint context field. | ||
| 589 | */ | ||
| 590 | static inline u32 xhci_get_endpoint_mult(struct usb_device *udev, | ||
| 591 | struct usb_host_endpoint *ep) | ||
| 592 | { | ||
| 593 | if (udev->speed != USB_SPEED_SUPER || !ep->ss_ep_comp) | ||
| 594 | return 0; | ||
| 595 | return ep->ss_ep_comp->desc.bmAttributes; | ||
| 596 | } | ||
| 597 | |||
| 585 | static inline u32 xhci_get_endpoint_type(struct usb_device *udev, | 598 | static inline u32 xhci_get_endpoint_type(struct usb_device *udev, |
| 586 | struct usb_host_endpoint *ep) | 599 | struct usb_host_endpoint *ep) |
| 587 | { | 600 | { |
| @@ -612,6 +625,36 @@ static inline u32 xhci_get_endpoint_type(struct usb_device *udev, | |||
| 612 | return type; | 625 | return type; |
| 613 | } | 626 | } |
| 614 | 627 | ||
| 628 | /* Return the maximum endpoint service interval time (ESIT) payload. | ||
| 629 | * Basically, this is the maxpacket size, multiplied by the burst size | ||
| 630 | * and mult size. | ||
| 631 | */ | ||
| 632 | static inline u32 xhci_get_max_esit_payload(struct xhci_hcd *xhci, | ||
| 633 | struct usb_device *udev, | ||
| 634 | struct usb_host_endpoint *ep) | ||
| 635 | { | ||
| 636 | int max_burst; | ||
| 637 | int max_packet; | ||
| 638 | |||
| 639 | /* Only applies for interrupt or isochronous endpoints */ | ||
| 640 | if (usb_endpoint_xfer_control(&ep->desc) || | ||
| 641 | usb_endpoint_xfer_bulk(&ep->desc)) | ||
| 642 | return 0; | ||
| 643 | |||
| 644 | if (udev->speed == USB_SPEED_SUPER) { | ||
| 645 | if (ep->ss_ep_comp) | ||
| 646 | return ep->ss_ep_comp->desc.wBytesPerInterval; | ||
| 647 | xhci_warn(xhci, "WARN no SS endpoint companion descriptor.\n"); | ||
| 648 | /* Assume no bursts, no multiple opportunities to send. */ | ||
| 649 | return ep->desc.wMaxPacketSize; | ||
| 650 | } | ||
| 651 | |||
| 652 | max_packet = ep->desc.wMaxPacketSize & 0x3ff; | ||
| 653 | max_burst = (ep->desc.wMaxPacketSize & 0x1800) >> 11; | ||
| 654 | /* A 0 in max burst means 1 transfer per ESIT */ | ||
| 655 | return max_packet * (max_burst + 1); | ||
| 656 | } | ||
| 657 | |||
| 615 | int xhci_endpoint_init(struct xhci_hcd *xhci, | 658 | int xhci_endpoint_init(struct xhci_hcd *xhci, |
| 616 | struct xhci_virt_device *virt_dev, | 659 | struct xhci_virt_device *virt_dev, |
| 617 | struct usb_device *udev, | 660 | struct usb_device *udev, |
| @@ -623,6 +666,7 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, | |||
| 623 | struct xhci_ring *ep_ring; | 666 | struct xhci_ring *ep_ring; |
| 624 | unsigned int max_packet; | 667 | unsigned int max_packet; |
| 625 | unsigned int max_burst; | 668 | unsigned int max_burst; |
| 669 | u32 max_esit_payload; | ||
| 626 | 670 | ||
| 627 | ep_index = xhci_get_endpoint_index(&ep->desc); | 671 | ep_index = xhci_get_endpoint_index(&ep->desc); |
| 628 | ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index); | 672 | ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index); |
| @@ -644,6 +688,7 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, | |||
| 644 | ep_ctx->deq = ep_ring->first_seg->dma | ep_ring->cycle_state; | 688 | ep_ctx->deq = ep_ring->first_seg->dma | ep_ring->cycle_state; |
| 645 | 689 | ||
| 646 | ep_ctx->ep_info = xhci_get_endpoint_interval(udev, ep); | 690 | ep_ctx->ep_info = xhci_get_endpoint_interval(udev, ep); |
| 691 | ep_ctx->ep_info |= EP_MULT(xhci_get_endpoint_mult(udev, ep)); | ||
| 647 | 692 | ||
| 648 | /* FIXME dig Mult and streams info out of ep companion desc */ | 693 | /* FIXME dig Mult and streams info out of ep companion desc */ |
| 649 | 694 | ||
| @@ -689,6 +734,26 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, | |||
| 689 | default: | 734 | default: |
| 690 | BUG(); | 735 | BUG(); |
| 691 | } | 736 | } |
| 737 | max_esit_payload = xhci_get_max_esit_payload(xhci, udev, ep); | ||
| 738 | ep_ctx->tx_info = MAX_ESIT_PAYLOAD_FOR_EP(max_esit_payload); | ||
| 739 | |||
| 740 | /* | ||
| 741 | * XXX no idea how to calculate the average TRB buffer length for bulk | ||
| 742 | * endpoints, as the driver gives us no clue how big each scatter gather | ||
| 743 | * list entry (or buffer) is going to be. | ||
| 744 | * | ||
| 745 | * For isochronous and interrupt endpoints, we set it to the max | ||
| 746 | * available, until we have new API in the USB core to allow drivers to | ||
| 747 | * declare how much bandwidth they actually need. | ||
| 748 | * | ||
| 749 | * Normally, it would be calculated by taking the total of the buffer | ||
| 750 | * lengths in the TD and then dividing by the number of TRBs in a TD, | ||
| 751 | * including link TRBs, No-op TRBs, and Event data TRBs. Since we don't | ||
| 752 | * use Event Data TRBs, and we don't chain in a link TRB on short | ||
| 753 | * transfers, we're basically dividing by 1. | ||
| 754 | */ | ||
| 755 | ep_ctx->tx_info |= AVG_TRB_LENGTH_FOR_EP(max_esit_payload); | ||
| 756 | |||
| 692 | /* FIXME Debug endpoint context */ | 757 | /* FIXME Debug endpoint context */ |
| 693 | return 0; | 758 | return 0; |
| 694 | } | 759 | } |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index e5eb09b2f38e..ea389e9a4931 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
| @@ -609,6 +609,10 @@ struct xhci_ep_ctx { | |||
| 609 | #define MAX_PACKET_MASK (0xffff << 16) | 609 | #define MAX_PACKET_MASK (0xffff << 16) |
| 610 | #define MAX_PACKET_DECODED(p) (((p) >> 16) & 0xffff) | 610 | #define MAX_PACKET_DECODED(p) (((p) >> 16) & 0xffff) |
| 611 | 611 | ||
| 612 | /* tx_info bitmasks */ | ||
| 613 | #define AVG_TRB_LENGTH_FOR_EP(p) ((p) & 0xffff) | ||
| 614 | #define MAX_ESIT_PAYLOAD_FOR_EP(p) (((p) & 0xffff) << 16) | ||
| 615 | |||
| 612 | 616 | ||
| 613 | /** | 617 | /** |
| 614 | * struct xhci_input_control_context | 618 | * struct xhci_input_control_context |
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index b4c783c284ba..07fe490b44d8 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig | |||
| @@ -42,7 +42,7 @@ config USB_MUSB_SOC | |||
| 42 | default y if (BF52x && !BF522 && !BF523) | 42 | default y if (BF52x && !BF522 && !BF523) |
| 43 | 43 | ||
| 44 | comment "DaVinci 35x and 644x USB support" | 44 | comment "DaVinci 35x and 644x USB support" |
| 45 | depends on USB_MUSB_HDRC && ARCH_DAVINCI | 45 | depends on USB_MUSB_HDRC && ARCH_DAVINCI_DMx |
| 46 | 46 | ||
| 47 | comment "OMAP 243x high speed USB support" | 47 | comment "OMAP 243x high speed USB support" |
| 48 | depends on USB_MUSB_HDRC && ARCH_OMAP2430 | 48 | depends on USB_MUSB_HDRC && ARCH_OMAP2430 |
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 85710ccc1887..3a485dabebbb 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile | |||
| @@ -6,7 +6,7 @@ musb_hdrc-objs := musb_core.o | |||
| 6 | 6 | ||
| 7 | obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o | 7 | obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o |
| 8 | 8 | ||
| 9 | ifeq ($(CONFIG_ARCH_DAVINCI),y) | 9 | ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y) |
| 10 | musb_hdrc-objs += davinci.o | 10 | musb_hdrc-objs += davinci.o |
| 11 | endif | 11 | endif |
| 12 | 12 | ||
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c index 719a22d664ef..ec8d324237f6 100644 --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c | |||
| @@ -172,13 +172,7 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci) | |||
| 172 | 172 | ||
| 173 | spin_unlock_irqrestore(&musb->lock, flags); | 173 | spin_unlock_irqrestore(&musb->lock, flags); |
| 174 | 174 | ||
| 175 | /* REVISIT we sometimes get spurious IRQs on g_ep0 | 175 | return retval; |
| 176 | * not clear why... fall in BF54x too. | ||
| 177 | */ | ||
| 178 | if (retval != IRQ_HANDLED) | ||
| 179 | DBG(5, "spurious?\n"); | ||
| 180 | |||
| 181 | return IRQ_HANDLED; | ||
| 182 | } | 176 | } |
| 183 | 177 | ||
| 184 | static void musb_conn_timer_handler(unsigned long _musb) | 178 | static void musb_conn_timer_handler(unsigned long _musb) |
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 29bce5c0fd10..ce2e16fee0df 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
| @@ -444,6 +444,8 @@ int __init musb_platform_init(struct musb *musb) | |||
| 444 | return 0; | 444 | return 0; |
| 445 | 445 | ||
| 446 | fail: | 446 | fail: |
| 447 | clk_disable(musb->clock); | ||
| 448 | |||
| 447 | usb_nop_xceiv_unregister(); | 449 | usb_nop_xceiv_unregister(); |
| 448 | return -ENODEV; | 450 | return -ENODEV; |
| 449 | } | 451 | } |
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 0e8b8ab1d168..705cc4ad8737 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
| @@ -965,10 +965,8 @@ static void musb_shutdown(struct platform_device *pdev) | |||
| 965 | spin_lock_irqsave(&musb->lock, flags); | 965 | spin_lock_irqsave(&musb->lock, flags); |
| 966 | musb_platform_disable(musb); | 966 | musb_platform_disable(musb); |
| 967 | musb_generic_disable(musb); | 967 | musb_generic_disable(musb); |
| 968 | if (musb->clock) { | 968 | if (musb->clock) |
| 969 | clk_put(musb->clock); | 969 | clk_put(musb->clock); |
| 970 | musb->clock = NULL; | ||
| 971 | } | ||
| 972 | spin_unlock_irqrestore(&musb->lock, flags); | 970 | spin_unlock_irqrestore(&musb->lock, flags); |
| 973 | 971 | ||
| 974 | /* FIXME power down */ | 972 | /* FIXME power down */ |
| @@ -1853,15 +1851,6 @@ static void musb_free(struct musb *musb) | |||
| 1853 | put_device(musb->xceiv->dev); | 1851 | put_device(musb->xceiv->dev); |
| 1854 | #endif | 1852 | #endif |
| 1855 | 1853 | ||
| 1856 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 1857 | musb_platform_exit(musb); | ||
| 1858 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 1859 | |||
| 1860 | if (musb->clock) { | ||
| 1861 | clk_disable(musb->clock); | ||
| 1862 | clk_put(musb->clock); | ||
| 1863 | } | ||
| 1864 | |||
| 1865 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | 1854 | #ifdef CONFIG_USB_MUSB_HDRC_HCD |
| 1866 | usb_put_hcd(musb_to_hcd(musb)); | 1855 | usb_put_hcd(musb_to_hcd(musb)); |
| 1867 | #else | 1856 | #else |
| @@ -1889,8 +1878,10 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) | |||
| 1889 | */ | 1878 | */ |
| 1890 | if (!plat) { | 1879 | if (!plat) { |
| 1891 | dev_dbg(dev, "no platform_data?\n"); | 1880 | dev_dbg(dev, "no platform_data?\n"); |
| 1892 | return -ENODEV; | 1881 | status = -ENODEV; |
| 1882 | goto fail0; | ||
| 1893 | } | 1883 | } |
| 1884 | |||
| 1894 | switch (plat->mode) { | 1885 | switch (plat->mode) { |
| 1895 | case MUSB_HOST: | 1886 | case MUSB_HOST: |
| 1896 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | 1887 | #ifdef CONFIG_USB_MUSB_HDRC_HCD |
| @@ -1912,13 +1903,16 @@ bad_config: | |||
| 1912 | #endif | 1903 | #endif |
| 1913 | default: | 1904 | default: |
| 1914 | dev_err(dev, "incompatible Kconfig role setting\n"); | 1905 | dev_err(dev, "incompatible Kconfig role setting\n"); |
| 1915 | return -EINVAL; | 1906 | status = -EINVAL; |
| 1907 | goto fail0; | ||
| 1916 | } | 1908 | } |
| 1917 | 1909 | ||
| 1918 | /* allocate */ | 1910 | /* allocate */ |
| 1919 | musb = allocate_instance(dev, plat->config, ctrl); | 1911 | musb = allocate_instance(dev, plat->config, ctrl); |
| 1920 | if (!musb) | 1912 | if (!musb) { |
| 1921 | return -ENOMEM; | 1913 | status = -ENOMEM; |
| 1914 | goto fail0; | ||
| 1915 | } | ||
| 1922 | 1916 | ||
| 1923 | spin_lock_init(&musb->lock); | 1917 | spin_lock_init(&musb->lock); |
| 1924 | musb->board_mode = plat->mode; | 1918 | musb->board_mode = plat->mode; |
| @@ -1936,7 +1930,7 @@ bad_config: | |||
| 1936 | if (IS_ERR(musb->clock)) { | 1930 | if (IS_ERR(musb->clock)) { |
| 1937 | status = PTR_ERR(musb->clock); | 1931 | status = PTR_ERR(musb->clock); |
| 1938 | musb->clock = NULL; | 1932 | musb->clock = NULL; |
| 1939 | goto fail; | 1933 | goto fail1; |
| 1940 | } | 1934 | } |
| 1941 | } | 1935 | } |
| 1942 | 1936 | ||
| @@ -1955,12 +1949,12 @@ bad_config: | |||
| 1955 | */ | 1949 | */ |
| 1956 | musb->isr = generic_interrupt; | 1950 | musb->isr = generic_interrupt; |
| 1957 | status = musb_platform_init(musb); | 1951 | status = musb_platform_init(musb); |
| 1958 | |||
| 1959 | if (status < 0) | 1952 | if (status < 0) |
| 1960 | goto fail; | 1953 | goto fail2; |
| 1954 | |||
| 1961 | if (!musb->isr) { | 1955 | if (!musb->isr) { |
| 1962 | status = -ENODEV; | 1956 | status = -ENODEV; |
| 1963 | goto fail2; | 1957 | goto fail3; |
| 1964 | } | 1958 | } |
| 1965 | 1959 | ||
| 1966 | #ifndef CONFIG_MUSB_PIO_ONLY | 1960 | #ifndef CONFIG_MUSB_PIO_ONLY |
| @@ -1986,7 +1980,7 @@ bad_config: | |||
| 1986 | ? MUSB_CONTROLLER_MHDRC | 1980 | ? MUSB_CONTROLLER_MHDRC |
| 1987 | : MUSB_CONTROLLER_HDRC, musb); | 1981 | : MUSB_CONTROLLER_HDRC, musb); |
| 1988 | if (status < 0) | 1982 | if (status < 0) |
| 1989 | goto fail2; | 1983 | goto fail3; |
| 1990 | 1984 | ||
| 1991 | #ifdef CONFIG_USB_MUSB_OTG | 1985 | #ifdef CONFIG_USB_MUSB_OTG |
| 1992 | setup_timer(&musb->otg_timer, musb_otg_timer_func, (unsigned long) musb); | 1986 | setup_timer(&musb->otg_timer, musb_otg_timer_func, (unsigned long) musb); |
| @@ -1999,7 +1993,7 @@ bad_config: | |||
| 1999 | if (request_irq(nIrq, musb->isr, 0, dev_name(dev), musb)) { | 1993 | if (request_irq(nIrq, musb->isr, 0, dev_name(dev), musb)) { |
| 2000 | dev_err(dev, "request_irq %d failed!\n", nIrq); | 1994 | dev_err(dev, "request_irq %d failed!\n", nIrq); |
| 2001 | status = -ENODEV; | 1995 | status = -ENODEV; |
| 2002 | goto fail2; | 1996 | goto fail3; |
| 2003 | } | 1997 | } |
| 2004 | musb->nIrq = nIrq; | 1998 | musb->nIrq = nIrq; |
| 2005 | /* FIXME this handles wakeup irqs wrong */ | 1999 | /* FIXME this handles wakeup irqs wrong */ |
| @@ -2039,8 +2033,6 @@ bad_config: | |||
| 2039 | musb->xceiv->state = OTG_STATE_A_IDLE; | 2033 | musb->xceiv->state = OTG_STATE_A_IDLE; |
| 2040 | 2034 | ||
| 2041 | status = usb_add_hcd(musb_to_hcd(musb), -1, 0); | 2035 | status = usb_add_hcd(musb_to_hcd(musb), -1, 0); |
| 2042 | if (status) | ||
| 2043 | goto fail; | ||
| 2044 | 2036 | ||
| 2045 | DBG(1, "%s mode, status %d, devctl %02x %c\n", | 2037 | DBG(1, "%s mode, status %d, devctl %02x %c\n", |
| 2046 | "HOST", status, | 2038 | "HOST", status, |
| @@ -2055,8 +2047,6 @@ bad_config: | |||
| 2055 | musb->xceiv->state = OTG_STATE_B_IDLE; | 2047 | musb->xceiv->state = OTG_STATE_B_IDLE; |
| 2056 | 2048 | ||
| 2057 | status = musb_gadget_setup(musb); | 2049 | status = musb_gadget_setup(musb); |
| 2058 | if (status) | ||
| 2059 | goto fail; | ||
| 2060 | 2050 | ||
| 2061 | DBG(1, "%s mode, status %d, dev%02x\n", | 2051 | DBG(1, "%s mode, status %d, dev%02x\n", |
| 2062 | is_otg_enabled(musb) ? "OTG" : "PERIPHERAL", | 2052 | is_otg_enabled(musb) ? "OTG" : "PERIPHERAL", |
| @@ -2064,12 +2054,14 @@ bad_config: | |||
| 2064 | musb_readb(musb->mregs, MUSB_DEVCTL)); | 2054 | musb_readb(musb->mregs, MUSB_DEVCTL)); |
| 2065 | 2055 | ||
| 2066 | } | 2056 | } |
| 2057 | if (status < 0) | ||
| 2058 | goto fail3; | ||
| 2067 | 2059 | ||
| 2068 | #ifdef CONFIG_SYSFS | 2060 | #ifdef CONFIG_SYSFS |
| 2069 | status = sysfs_create_group(&musb->controller->kobj, &musb_attr_group); | 2061 | status = sysfs_create_group(&musb->controller->kobj, &musb_attr_group); |
| 2070 | #endif | ||
| 2071 | if (status) | 2062 | if (status) |
| 2072 | goto fail2; | 2063 | goto fail4; |
| 2064 | #endif | ||
| 2073 | 2065 | ||
| 2074 | dev_info(dev, "USB %s mode controller at %p using %s, IRQ %d\n", | 2066 | dev_info(dev, "USB %s mode controller at %p using %s, IRQ %d\n", |
| 2075 | ({char *s; | 2067 | ({char *s; |
| @@ -2085,17 +2077,29 @@ bad_config: | |||
| 2085 | 2077 | ||
| 2086 | return 0; | 2078 | return 0; |
| 2087 | 2079 | ||
| 2088 | fail2: | 2080 | fail4: |
| 2081 | if (!is_otg_enabled(musb) && is_host_enabled(musb)) | ||
| 2082 | usb_remove_hcd(musb_to_hcd(musb)); | ||
| 2083 | else | ||
| 2084 | musb_gadget_cleanup(musb); | ||
| 2085 | |||
| 2086 | fail3: | ||
| 2087 | if (musb->irq_wake) | ||
| 2088 | device_init_wakeup(dev, 0); | ||
| 2089 | musb_platform_exit(musb); | 2089 | musb_platform_exit(musb); |
| 2090 | fail: | ||
| 2091 | dev_err(musb->controller, | ||
| 2092 | "musb_init_controller failed with status %d\n", status); | ||
| 2093 | 2090 | ||
| 2091 | fail2: | ||
| 2094 | if (musb->clock) | 2092 | if (musb->clock) |
| 2095 | clk_put(musb->clock); | 2093 | clk_put(musb->clock); |
| 2096 | device_init_wakeup(dev, 0); | 2094 | |
| 2095 | fail1: | ||
| 2096 | dev_err(musb->controller, | ||
| 2097 | "musb_init_controller failed with status %d\n", status); | ||
| 2098 | |||
| 2097 | musb_free(musb); | 2099 | musb_free(musb); |
| 2098 | 2100 | ||
| 2101 | fail0: | ||
| 2102 | |||
| 2099 | return status; | 2103 | return status; |
| 2100 | 2104 | ||
| 2101 | } | 2105 | } |
| @@ -2132,7 +2136,6 @@ static int __init musb_probe(struct platform_device *pdev) | |||
| 2132 | /* clobbered by use_dma=n */ | 2136 | /* clobbered by use_dma=n */ |
| 2133 | orig_dma_mask = dev->dma_mask; | 2137 | orig_dma_mask = dev->dma_mask; |
| 2134 | #endif | 2138 | #endif |
| 2135 | |||
| 2136 | status = musb_init_controller(dev, irq, base); | 2139 | status = musb_init_controller(dev, irq, base); |
| 2137 | if (status < 0) | 2140 | if (status < 0) |
| 2138 | iounmap(base); | 2141 | iounmap(base); |
| @@ -2155,6 +2158,10 @@ static int __exit musb_remove(struct platform_device *pdev) | |||
| 2155 | if (musb->board_mode == MUSB_HOST) | 2158 | if (musb->board_mode == MUSB_HOST) |
| 2156 | usb_remove_hcd(musb_to_hcd(musb)); | 2159 | usb_remove_hcd(musb_to_hcd(musb)); |
| 2157 | #endif | 2160 | #endif |
| 2161 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 2162 | musb_platform_exit(musb); | ||
| 2163 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | ||
| 2164 | |||
| 2158 | musb_free(musb); | 2165 | musb_free(musb); |
| 2159 | iounmap(ctrl_base); | 2166 | iounmap(ctrl_base); |
| 2160 | device_init_wakeup(&pdev->dev, 0); | 2167 | device_init_wakeup(&pdev->dev, 0); |
| @@ -2176,6 +2183,7 @@ void musb_save_context(struct musb *musb) | |||
| 2176 | if (is_host_enabled(musb)) { | 2183 | if (is_host_enabled(musb)) { |
| 2177 | musb_context.frame = musb_readw(musb_base, MUSB_FRAME); | 2184 | musb_context.frame = musb_readw(musb_base, MUSB_FRAME); |
| 2178 | musb_context.testmode = musb_readb(musb_base, MUSB_TESTMODE); | 2185 | musb_context.testmode = musb_readb(musb_base, MUSB_TESTMODE); |
| 2186 | musb_context.busctl = musb_read_ulpi_buscontrol(musb->mregs); | ||
| 2179 | } | 2187 | } |
| 2180 | musb_context.power = musb_readb(musb_base, MUSB_POWER); | 2188 | musb_context.power = musb_readb(musb_base, MUSB_POWER); |
| 2181 | musb_context.intrtxe = musb_readw(musb_base, MUSB_INTRTXE); | 2189 | musb_context.intrtxe = musb_readw(musb_base, MUSB_INTRTXE); |
| @@ -2247,6 +2255,7 @@ void musb_restore_context(struct musb *musb) | |||
| 2247 | if (is_host_enabled(musb)) { | 2255 | if (is_host_enabled(musb)) { |
| 2248 | musb_writew(musb_base, MUSB_FRAME, musb_context.frame); | 2256 | musb_writew(musb_base, MUSB_FRAME, musb_context.frame); |
| 2249 | musb_writeb(musb_base, MUSB_TESTMODE, musb_context.testmode); | 2257 | musb_writeb(musb_base, MUSB_TESTMODE, musb_context.testmode); |
| 2258 | musb_write_ulpi_buscontrol(musb->mregs, musb_context.busctl); | ||
| 2250 | } | 2259 | } |
| 2251 | musb_writeb(musb_base, MUSB_POWER, musb_context.power); | 2260 | musb_writeb(musb_base, MUSB_POWER, musb_context.power); |
| 2252 | musb_writew(musb_base, MUSB_INTRTXE, musb_context.intrtxe); | 2261 | musb_writew(musb_base, MUSB_INTRTXE, musb_context.intrtxe); |
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index cd9f4a9a06c6..ac17b004909b 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h | |||
| @@ -478,7 +478,7 @@ struct musb_context_registers { | |||
| 478 | u16 frame; | 478 | u16 frame; |
| 479 | u8 index, testmode; | 479 | u8 index, testmode; |
| 480 | 480 | ||
| 481 | u8 devctl, misc; | 481 | u8 devctl, busctl, misc; |
| 482 | 482 | ||
| 483 | struct musb_csr_regs index_regs[MUSB_C_NUM_EPS]; | 483 | struct musb_csr_regs index_regs[MUSB_C_NUM_EPS]; |
| 484 | }; | 484 | }; |
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index dec896e888db..877d20b1dff9 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
| @@ -2042,6 +2042,7 @@ static int musb_urb_enqueue( | |||
| 2042 | * odd, rare, error prone, but legal. | 2042 | * odd, rare, error prone, but legal. |
| 2043 | */ | 2043 | */ |
| 2044 | kfree(qh); | 2044 | kfree(qh); |
| 2045 | qh = NULL; | ||
| 2045 | ret = 0; | 2046 | ret = 0; |
| 2046 | } else | 2047 | } else |
| 2047 | ret = musb_schedule(musb, qh, | 2048 | ret = musb_schedule(musb, qh, |
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 490cdf15ccb6..82592633502f 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
| @@ -331,8 +331,5 @@ int musb_platform_exit(struct musb *musb) | |||
| 331 | 331 | ||
| 332 | musb_platform_suspend(musb); | 332 | musb_platform_suspend(musb); |
| 333 | 333 | ||
| 334 | clk_put(musb->clock); | ||
| 335 | musb->clock = NULL; | ||
| 336 | |||
| 337 | return 0; | 334 | return 0; |
| 338 | } | 335 | } |
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index ab776a8d98ca..60d3938cafcf 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c | |||
| @@ -29,6 +29,19 @@ static void tusb_source_power(struct musb *musb, int is_on); | |||
| 29 | #define TUSB_REV_MAJOR(reg_val) ((reg_val >> 4) & 0xf) | 29 | #define TUSB_REV_MAJOR(reg_val) ((reg_val >> 4) & 0xf) |
| 30 | #define TUSB_REV_MINOR(reg_val) (reg_val & 0xf) | 30 | #define TUSB_REV_MINOR(reg_val) (reg_val & 0xf) |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_PM | ||
| 33 | /* REVISIT: These should be only needed if somebody implements off idle */ | ||
| 34 | void musb_platform_save_context(struct musb *musb, | ||
| 35 | struct musb_context_registers *musb_context) | ||
| 36 | { | ||
| 37 | } | ||
| 38 | |||
| 39 | void musb_platform_restore_context(struct musb *musb, | ||
| 40 | struct musb_context_registers *musb_context) | ||
| 41 | { | ||
| 42 | } | ||
| 43 | #endif | ||
| 44 | |||
| 32 | /* | 45 | /* |
| 33 | * Checks the revision. We need to use the DMA register as 3.0 does not | 46 | * Checks the revision. We need to use the DMA register as 3.0 does not |
| 34 | * have correct versions for TUSB_PRCM_REV or TUSB_INT_CTRL_REV. | 47 | * have correct versions for TUSB_PRCM_REV or TUSB_INT_CTRL_REV. |
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 5afa070d7dc9..c061a88f2b0f 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c | |||
| @@ -39,7 +39,7 @@ struct tusb_omap_dma_ch { | |||
| 39 | 39 | ||
| 40 | struct tusb_omap_dma *tusb_dma; | 40 | struct tusb_omap_dma *tusb_dma; |
| 41 | 41 | ||
| 42 | void __iomem *dma_addr; | 42 | dma_addr_t dma_addr; |
| 43 | 43 | ||
| 44 | u32 len; | 44 | u32 len; |
| 45 | u16 packet_sz; | 45 | u16 packet_sz; |
| @@ -126,6 +126,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
| 126 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); | 126 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); |
| 127 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; | 127 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; |
| 128 | struct musb *musb = chdat->musb; | 128 | struct musb *musb = chdat->musb; |
| 129 | struct device *dev = musb->controller; | ||
| 129 | struct musb_hw_ep *hw_ep = chdat->hw_ep; | 130 | struct musb_hw_ep *hw_ep = chdat->hw_ep; |
| 130 | void __iomem *ep_conf = hw_ep->conf; | 131 | void __iomem *ep_conf = hw_ep->conf; |
| 131 | void __iomem *mbase = musb->mregs; | 132 | void __iomem *mbase = musb->mregs; |
| @@ -173,13 +174,15 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
| 173 | DBG(3, "Using PIO for remaining %lu bytes\n", pio); | 174 | DBG(3, "Using PIO for remaining %lu bytes\n", pio); |
| 174 | buf = phys_to_virt((u32)chdat->dma_addr) + chdat->transfer_len; | 175 | buf = phys_to_virt((u32)chdat->dma_addr) + chdat->transfer_len; |
| 175 | if (chdat->tx) { | 176 | if (chdat->tx) { |
| 176 | dma_cache_maint(phys_to_virt((u32)chdat->dma_addr), | 177 | dma_unmap_single(dev, chdat->dma_addr, |
| 177 | chdat->transfer_len, DMA_TO_DEVICE); | 178 | chdat->transfer_len, |
| 179 | DMA_TO_DEVICE); | ||
| 178 | musb_write_fifo(hw_ep, pio, buf); | 180 | musb_write_fifo(hw_ep, pio, buf); |
| 179 | } else { | 181 | } else { |
| 182 | dma_unmap_single(dev, chdat->dma_addr, | ||
| 183 | chdat->transfer_len, | ||
| 184 | DMA_FROM_DEVICE); | ||
| 180 | musb_read_fifo(hw_ep, pio, buf); | 185 | musb_read_fifo(hw_ep, pio, buf); |
| 181 | dma_cache_maint(phys_to_virt((u32)chdat->dma_addr), | ||
| 182 | chdat->transfer_len, DMA_FROM_DEVICE); | ||
| 183 | } | 186 | } |
| 184 | channel->actual_len += pio; | 187 | channel->actual_len += pio; |
| 185 | } | 188 | } |
| @@ -224,6 +227,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | |||
| 224 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); | 227 | struct tusb_omap_dma_ch *chdat = to_chdat(channel); |
| 225 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; | 228 | struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; |
| 226 | struct musb *musb = chdat->musb; | 229 | struct musb *musb = chdat->musb; |
| 230 | struct device *dev = musb->controller; | ||
| 227 | struct musb_hw_ep *hw_ep = chdat->hw_ep; | 231 | struct musb_hw_ep *hw_ep = chdat->hw_ep; |
| 228 | void __iomem *mbase = musb->mregs; | 232 | void __iomem *mbase = musb->mregs; |
| 229 | void __iomem *ep_conf = hw_ep->conf; | 233 | void __iomem *ep_conf = hw_ep->conf; |
| @@ -299,14 +303,16 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, | |||
| 299 | chdat->packet_sz = packet_sz; | 303 | chdat->packet_sz = packet_sz; |
| 300 | chdat->len = len; | 304 | chdat->len = len; |
| 301 | channel->actual_len = 0; | 305 | channel->actual_len = 0; |
| 302 | chdat->dma_addr = (void __iomem *)dma_addr; | 306 | chdat->dma_addr = dma_addr; |
| 303 | channel->status = MUSB_DMA_STATUS_BUSY; | 307 | channel->status = MUSB_DMA_STATUS_BUSY; |
| 304 | 308 | ||
| 305 | /* Since we're recycling dma areas, we need to clean or invalidate */ | 309 | /* Since we're recycling dma areas, we need to clean or invalidate */ |
| 306 | if (chdat->tx) | 310 | if (chdat->tx) |
| 307 | dma_cache_maint(phys_to_virt(dma_addr), len, DMA_TO_DEVICE); | 311 | dma_map_single(dev, phys_to_virt(dma_addr), len, |
| 312 | DMA_TO_DEVICE); | ||
| 308 | else | 313 | else |
| 309 | dma_cache_maint(phys_to_virt(dma_addr), len, DMA_FROM_DEVICE); | 314 | dma_map_single(dev, phys_to_virt(dma_addr), len, |
| 315 | DMA_FROM_DEVICE); | ||
| 310 | 316 | ||
| 311 | /* Use 16-bit transfer if dma_addr is not 32-bit aligned */ | 317 | /* Use 16-bit transfer if dma_addr is not 32-bit aligned */ |
| 312 | if ((dma_addr & 0x3) == 0) { | 318 | if ((dma_addr & 0x3) == 0) { |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index ca9d866672aa..84d0edad8e4f 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -305,6 +305,11 @@ static int option_resume(struct usb_serial *serial); | |||
| 305 | #define ZTE_PRODUCT_CDMA_TECH 0xfffe | 305 | #define ZTE_PRODUCT_CDMA_TECH 0xfffe |
| 306 | #define ZTE_PRODUCT_AC8710 0xfff1 | 306 | #define ZTE_PRODUCT_AC8710 0xfff1 |
| 307 | #define ZTE_PRODUCT_AC2726 0xfff5 | 307 | #define ZTE_PRODUCT_AC2726 0xfff5 |
| 308 | #define ZTE_PRODUCT_AC8710T 0xffff | ||
| 309 | |||
| 310 | /* ZTE PRODUCTS -- alternate vendor ID */ | ||
| 311 | #define ZTE_VENDOR_ID2 0x1d6b | ||
| 312 | #define ZTE_PRODUCT_MF_330 0x0002 | ||
| 308 | 313 | ||
| 309 | #define BENQ_VENDOR_ID 0x04a5 | 314 | #define BENQ_VENDOR_ID 0x04a5 |
| 310 | #define BENQ_PRODUCT_H10 0x4068 | 315 | #define BENQ_PRODUCT_H10 0x4068 |
| @@ -373,6 +378,8 @@ static int option_resume(struct usb_serial *serial); | |||
| 373 | #define HAIER_VENDOR_ID 0x201e | 378 | #define HAIER_VENDOR_ID 0x201e |
| 374 | #define HAIER_PRODUCT_CE100 0x2009 | 379 | #define HAIER_PRODUCT_CE100 0x2009 |
| 375 | 380 | ||
| 381 | #define CINTERION_VENDOR_ID 0x0681 | ||
| 382 | |||
| 376 | /* some devices interfaces need special handling due to a number of reasons */ | 383 | /* some devices interfaces need special handling due to a number of reasons */ |
| 377 | enum option_blacklist_reason { | 384 | enum option_blacklist_reason { |
| 378 | OPTION_BLACKLIST_NONE = 0, | 385 | OPTION_BLACKLIST_NONE = 0, |
| @@ -679,6 +686,8 @@ static const struct usb_device_id option_ids[] = { | |||
| 679 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) }, | 686 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) }, |
| 680 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) }, | 687 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) }, |
| 681 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) }, | 688 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) }, |
| 689 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) }, | ||
| 690 | { USB_DEVICE(ZTE_VENDOR_ID2, ZTE_PRODUCT_MF_330) }, | ||
| 682 | { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, | 691 | { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, |
| 683 | { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) }, | 692 | { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) }, |
| 684 | { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */ | 693 | { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */ |
| @@ -716,6 +725,7 @@ static const struct usb_device_id option_ids[] = { | |||
| 716 | { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)}, | 725 | { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)}, |
| 717 | { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)}, | 726 | { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)}, |
| 718 | 727 | ||
| 728 | { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) }, | ||
| 719 | { } /* Terminating entry */ | 729 | { } /* Terminating entry */ |
| 720 | }; | 730 | }; |
| 721 | MODULE_DEVICE_TABLE(usb, option_ids); | 731 | MODULE_DEVICE_TABLE(usb, option_ids); |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index c97a0bb5b6db..c28b1607eacc 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -59,6 +59,7 @@ static const struct usb_device_id id_table[] = { | |||
| 59 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) }, | 59 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) }, |
| 60 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) }, | 60 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) }, |
| 61 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) }, | 61 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) }, |
| 62 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) }, | ||
| 62 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, | 63 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, |
| 63 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, | 64 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, |
| 64 | { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) }, | 65 | { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) }, |
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index a352d5f3a59c..23c09b38b9ec 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #define PL2303_PRODUCT_ID_ALDIGA 0x0611 | 20 | #define PL2303_PRODUCT_ID_ALDIGA 0x0611 |
| 21 | #define PL2303_PRODUCT_ID_MMX 0x0612 | 21 | #define PL2303_PRODUCT_ID_MMX 0x0612 |
| 22 | #define PL2303_PRODUCT_ID_GPRS 0x0609 | 22 | #define PL2303_PRODUCT_ID_GPRS 0x0609 |
| 23 | #define PL2303_PRODUCT_ID_HCR331 0x331a | ||
| 23 | 24 | ||
| 24 | #define ATEN_VENDOR_ID 0x0557 | 25 | #define ATEN_VENDOR_ID 0x0557 |
| 25 | #define ATEN_VENDOR_ID2 0x0547 | 26 | #define ATEN_VENDOR_ID2 0x0547 |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 880e990abb07..e1bfda33f5b9 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
| @@ -1735,7 +1735,7 @@ static int ti_download_firmware(struct ti_device *tdev) | |||
| 1735 | return -ENOENT; | 1735 | return -ENOENT; |
| 1736 | } | 1736 | } |
| 1737 | if (fw_p->size > TI_FIRMWARE_BUF_SIZE) { | 1737 | if (fw_p->size > TI_FIRMWARE_BUF_SIZE) { |
| 1738 | dev_err(&dev->dev, "%s - firmware too large %d \n", __func__, fw_p->size); | 1738 | dev_err(&dev->dev, "%s - firmware too large %zu\n", __func__, fw_p->size); |
| 1739 | return -ENOENT; | 1739 | return -ENOENT; |
| 1740 | } | 1740 | } |
| 1741 | 1741 | ||
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c index 581d2dbf675a..ecf405562f5c 100644 --- a/drivers/video/efifb.c +++ b/drivers/video/efifb.c | |||
| @@ -49,6 +49,7 @@ enum { | |||
| 49 | M_MBP_2, /* MacBook Pro 2nd gen */ | 49 | M_MBP_2, /* MacBook Pro 2nd gen */ |
| 50 | M_MBP_SR, /* MacBook Pro (Santa Rosa) */ | 50 | M_MBP_SR, /* MacBook Pro (Santa Rosa) */ |
| 51 | M_MBP_4, /* MacBook Pro, 4th gen */ | 51 | M_MBP_4, /* MacBook Pro, 4th gen */ |
| 52 | M_MBP_5_1, /* MacBook Pro, 5,1th gen */ | ||
| 52 | M_UNKNOWN /* placeholder */ | 53 | M_UNKNOWN /* placeholder */ |
| 53 | }; | 54 | }; |
| 54 | 55 | ||
| @@ -70,6 +71,7 @@ static struct efifb_dmi_info { | |||
| 70 | [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */ | 71 | [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */ |
| 71 | [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 }, | 72 | [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 }, |
| 72 | [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 }, | 73 | [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 }, |
| 74 | [M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 }, | ||
| 73 | [M_UNKNOWN] = { NULL, 0, 0, 0, 0 } | 75 | [M_UNKNOWN] = { NULL, 0, 0, 0, 0 } |
| 74 | }; | 76 | }; |
| 75 | 77 | ||
| @@ -106,6 +108,7 @@ static struct dmi_system_id __initdata dmi_system_table[] = { | |||
| 106 | EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR), | 108 | EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR), |
| 107 | EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR), | 109 | EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR), |
| 108 | EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4), | 110 | EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4), |
| 111 | EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,1", M_MBP_5_1), | ||
| 109 | {}, | 112 | {}, |
| 110 | }; | 113 | }; |
| 111 | 114 | ||
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index e14bd0749129..e8c769944812 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
| @@ -695,6 +695,7 @@ static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev, | |||
| 695 | * 1) Enable Runtime PM | 695 | * 1) Enable Runtime PM |
| 696 | * 2) Force Runtime PM Resume since hardware is accessed from probe() | 696 | * 2) Force Runtime PM Resume since hardware is accessed from probe() |
| 697 | */ | 697 | */ |
| 698 | priv->dev = &pdev->dev; | ||
| 698 | pm_runtime_enable(priv->dev); | 699 | pm_runtime_enable(priv->dev); |
| 699 | pm_runtime_resume(priv->dev); | 700 | pm_runtime_resume(priv->dev); |
| 700 | return 0; | 701 | return 0; |
| @@ -957,25 +958,24 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
| 957 | 958 | ||
| 958 | if (!pdev->dev.platform_data) { | 959 | if (!pdev->dev.platform_data) { |
| 959 | dev_err(&pdev->dev, "no platform data defined\n"); | 960 | dev_err(&pdev->dev, "no platform data defined\n"); |
| 960 | error = -EINVAL; | 961 | return -EINVAL; |
| 961 | goto err0; | ||
| 962 | } | 962 | } |
| 963 | 963 | ||
| 964 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 964 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 965 | i = platform_get_irq(pdev, 0); | 965 | i = platform_get_irq(pdev, 0); |
| 966 | if (!res || i < 0) { | 966 | if (!res || i < 0) { |
| 967 | dev_err(&pdev->dev, "cannot get platform resources\n"); | 967 | dev_err(&pdev->dev, "cannot get platform resources\n"); |
| 968 | error = -ENOENT; | 968 | return -ENOENT; |
| 969 | goto err0; | ||
| 970 | } | 969 | } |
| 971 | 970 | ||
| 972 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); | 971 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
| 973 | if (!priv) { | 972 | if (!priv) { |
| 974 | dev_err(&pdev->dev, "cannot allocate device data\n"); | 973 | dev_err(&pdev->dev, "cannot allocate device data\n"); |
| 975 | error = -ENOMEM; | 974 | return -ENOMEM; |
| 976 | goto err0; | ||
| 977 | } | 975 | } |
| 978 | 976 | ||
| 977 | platform_set_drvdata(pdev, priv); | ||
| 978 | |||
| 979 | error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED, | 979 | error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED, |
| 980 | dev_name(&pdev->dev), priv); | 980 | dev_name(&pdev->dev), priv); |
| 981 | if (error) { | 981 | if (error) { |
| @@ -984,8 +984,6 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
| 984 | } | 984 | } |
| 985 | 985 | ||
| 986 | priv->irq = i; | 986 | priv->irq = i; |
| 987 | priv->dev = &pdev->dev; | ||
| 988 | platform_set_drvdata(pdev, priv); | ||
| 989 | pdata = pdev->dev.platform_data; | 987 | pdata = pdev->dev.platform_data; |
| 990 | 988 | ||
| 991 | j = 0; | 989 | j = 0; |
| @@ -1099,9 +1097,9 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
| 1099 | info = ch->info; | 1097 | info = ch->info; |
| 1100 | 1098 | ||
| 1101 | if (info->fbdefio) { | 1099 | if (info->fbdefio) { |
| 1102 | priv->ch->sglist = vmalloc(sizeof(struct scatterlist) * | 1100 | ch->sglist = vmalloc(sizeof(struct scatterlist) * |
| 1103 | info->fix.smem_len >> PAGE_SHIFT); | 1101 | info->fix.smem_len >> PAGE_SHIFT); |
| 1104 | if (!priv->ch->sglist) { | 1102 | if (!ch->sglist) { |
| 1105 | dev_err(&pdev->dev, "cannot allocate sglist\n"); | 1103 | dev_err(&pdev->dev, "cannot allocate sglist\n"); |
| 1106 | goto err1; | 1104 | goto err1; |
| 1107 | } | 1105 | } |
| @@ -1126,9 +1124,9 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
| 1126 | } | 1124 | } |
| 1127 | 1125 | ||
| 1128 | return 0; | 1126 | return 0; |
| 1129 | err1: | 1127 | err1: |
| 1130 | sh_mobile_lcdc_remove(pdev); | 1128 | sh_mobile_lcdc_remove(pdev); |
| 1131 | err0: | 1129 | |
| 1132 | return error; | 1130 | return error; |
| 1133 | } | 1131 | } |
| 1134 | 1132 | ||
| @@ -1139,7 +1137,7 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev) | |||
| 1139 | int i; | 1137 | int i; |
| 1140 | 1138 | ||
| 1141 | for (i = 0; i < ARRAY_SIZE(priv->ch); i++) | 1139 | for (i = 0; i < ARRAY_SIZE(priv->ch); i++) |
| 1142 | if (priv->ch[i].info->dev) | 1140 | if (priv->ch[i].info && priv->ch[i].info->dev) |
| 1143 | unregister_framebuffer(priv->ch[i].info); | 1141 | unregister_framebuffer(priv->ch[i].info); |
| 1144 | 1142 | ||
| 1145 | sh_mobile_lcdc_stop(priv); | 1143 | sh_mobile_lcdc_stop(priv); |
| @@ -1162,7 +1160,8 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev) | |||
| 1162 | if (priv->dot_clk) | 1160 | if (priv->dot_clk) |
| 1163 | clk_put(priv->dot_clk); | 1161 | clk_put(priv->dot_clk); |
| 1164 | 1162 | ||
| 1165 | pm_runtime_disable(priv->dev); | 1163 | if (priv->dev) |
| 1164 | pm_runtime_disable(priv->dev); | ||
| 1166 | 1165 | ||
| 1167 | if (priv->base) | 1166 | if (priv->base) |
| 1168 | iounmap(priv->base); | 1167 | iounmap(priv->base); |
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index ef36fca2eed4..3a7e9ff8a746 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/sched.h> | ||
| 19 | 20 | ||
| 20 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
| 21 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 1ed3d554e372..17726a05a0a6 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c | |||
| @@ -115,9 +115,8 @@ static struct w1_therm_family_converter w1_therm_families[] = { | |||
| 115 | 115 | ||
| 116 | static inline int w1_DS18B20_convert_temp(u8 rom[9]) | 116 | static inline int w1_DS18B20_convert_temp(u8 rom[9]) |
| 117 | { | 117 | { |
| 118 | int t = ((s16)rom[1] << 8) | rom[0]; | 118 | s16 t = le16_to_cpup((__le16 *)rom); |
| 119 | t = t*1000/16; | 119 | return t*1000/16; |
| 120 | return t; | ||
| 121 | } | 120 | } |
| 122 | 121 | ||
| 123 | static inline int w1_DS18S20_convert_temp(u8 rom[9]) | 122 | static inline int w1_DS18S20_convert_temp(u8 rom[9]) |
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 500d38342e1e..801ead191499 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
| @@ -121,7 +121,7 @@ static ssize_t booke_wdt_write(struct file *file, const char __user *buf, | |||
| 121 | return count; | 121 | return count; |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | static const struct watchdog_info ident = { | 124 | static struct watchdog_info ident = { |
| 125 | .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, | 125 | .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, |
| 126 | .identity = "PowerPC Book-E Watchdog", | 126 | .identity = "PowerPC Book-E Watchdog", |
| 127 | }; | 127 | }; |
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 88ed54e50f74..59359c9a5e01 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c | |||
| @@ -244,7 +244,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | |||
| 244 | module_param(timeout, int, 0); | 244 | module_param(timeout, int, 0); |
| 245 | MODULE_PARM_DESC(timeout, | 245 | MODULE_PARM_DESC(timeout, |
| 246 | "Watchdog timeout in seconds. (1<=timeout<=3600, default=" | 246 | "Watchdog timeout in seconds. (1<=timeout<=3600, default=" |
| 247 | __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); | 247 | __MODULE_STRING(WDT_TIMEOUT) ")"); |
| 248 | 248 | ||
| 249 | MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>," | 249 | MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>," |
| 250 | "Alessandro Zummo <a.zummo@towertech.it>"); | 250 | "Alessandro Zummo <a.zummo@towertech.it>"); |
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index c8eadd478175..88c83aa57303 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c | |||
| @@ -67,8 +67,8 @@ static DEFINE_SPINLOCK(sbwd_lock); | |||
| 67 | void sbwdog_set(char __iomem *wdog, unsigned long t) | 67 | void sbwdog_set(char __iomem *wdog, unsigned long t) |
| 68 | { | 68 | { |
| 69 | spin_lock(&sbwd_lock); | 69 | spin_lock(&sbwd_lock); |
| 70 | __raw_writeb(0, wdog - 0x10); | 70 | __raw_writeb(0, wdog); |
| 71 | __raw_writeq(t & 0x7fffffUL, wdog); | 71 | __raw_writeq(t & 0x7fffffUL, wdog - 0x10); |
| 72 | spin_unlock(&sbwd_lock); | 72 | spin_unlock(&sbwd_lock); |
| 73 | } | 73 | } |
| 74 | 74 | ||
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c index 8d44c9b6fb5b..c7d67e9a7465 100644 --- a/drivers/watchdog/sbc_fitpc2_wdt.c +++ b/drivers/watchdog/sbc_fitpc2_wdt.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | static int nowayout = WATCHDOG_NOWAYOUT; | 30 | static int nowayout = WATCHDOG_NOWAYOUT; |
| 31 | static unsigned int margin = 60; /* (secs) Default is 1 minute */ | 31 | static unsigned int margin = 60; /* (secs) Default is 1 minute */ |
| 32 | static unsigned long wdt_status; | 32 | static unsigned long wdt_status; |
| 33 | static DEFINE_SPINLOCK(wdt_lock); | 33 | static DEFINE_MUTEX(wdt_lock); |
| 34 | 34 | ||
| 35 | #define WDT_IN_USE 0 | 35 | #define WDT_IN_USE 0 |
| 36 | #define WDT_OK_TO_CLOSE 1 | 36 | #define WDT_OK_TO_CLOSE 1 |
| @@ -45,26 +45,26 @@ static DEFINE_SPINLOCK(wdt_lock); | |||
| 45 | 45 | ||
| 46 | static void wdt_send_data(unsigned char command, unsigned char data) | 46 | static void wdt_send_data(unsigned char command, unsigned char data) |
| 47 | { | 47 | { |
| 48 | outb(command, COMMAND_PORT); | ||
| 49 | msleep(100); | ||
| 50 | outb(data, DATA_PORT); | 48 | outb(data, DATA_PORT); |
| 51 | msleep(200); | 49 | msleep(200); |
| 50 | outb(command, COMMAND_PORT); | ||
| 51 | msleep(100); | ||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | static void wdt_enable(void) | 54 | static void wdt_enable(void) |
| 55 | { | 55 | { |
| 56 | spin_lock(&wdt_lock); | 56 | mutex_lock(&wdt_lock); |
| 57 | wdt_send_data(IFACE_ON_COMMAND, 1); | 57 | wdt_send_data(IFACE_ON_COMMAND, 1); |
| 58 | wdt_send_data(REBOOT_COMMAND, margin); | 58 | wdt_send_data(REBOOT_COMMAND, margin); |
| 59 | spin_unlock(&wdt_lock); | 59 | mutex_unlock(&wdt_lock); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | static void wdt_disable(void) | 62 | static void wdt_disable(void) |
| 63 | { | 63 | { |
| 64 | spin_lock(&wdt_lock); | 64 | mutex_lock(&wdt_lock); |
| 65 | wdt_send_data(IFACE_ON_COMMAND, 0); | 65 | wdt_send_data(IFACE_ON_COMMAND, 0); |
| 66 | wdt_send_data(REBOOT_COMMAND, 0); | 66 | wdt_send_data(REBOOT_COMMAND, 0); |
| 67 | spin_unlock(&wdt_lock); | 67 | mutex_unlock(&wdt_lock); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static int fitpc2_wdt_open(struct inode *inode, struct file *file) | 70 | static int fitpc2_wdt_open(struct inode *inode, struct file *file) |
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 5c5bc8480070..f8b86e92cd66 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c | |||
| @@ -238,6 +238,13 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, | |||
| 238 | return ERR_PTR(-ENOMEM); | 238 | return ERR_PTR(-ENOMEM); |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | rc = bdi_setup_and_register(&v9ses->bdi, "9p", BDI_CAP_MAP_COPY); | ||
| 242 | if (rc) { | ||
| 243 | __putname(v9ses->aname); | ||
| 244 | __putname(v9ses->uname); | ||
| 245 | return ERR_PTR(rc); | ||
| 246 | } | ||
| 247 | |||
| 241 | spin_lock(&v9fs_sessionlist_lock); | 248 | spin_lock(&v9fs_sessionlist_lock); |
| 242 | list_add(&v9ses->slist, &v9fs_sessionlist); | 249 | list_add(&v9ses->slist, &v9fs_sessionlist); |
| 243 | spin_unlock(&v9fs_sessionlist_lock); | 250 | spin_unlock(&v9fs_sessionlist_lock); |
| @@ -301,6 +308,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, | |||
| 301 | return fid; | 308 | return fid; |
| 302 | 309 | ||
| 303 | error: | 310 | error: |
| 311 | bdi_destroy(&v9ses->bdi); | ||
| 304 | return ERR_PTR(retval); | 312 | return ERR_PTR(retval); |
| 305 | } | 313 | } |
| 306 | 314 | ||
| @@ -326,6 +334,8 @@ void v9fs_session_close(struct v9fs_session_info *v9ses) | |||
| 326 | __putname(v9ses->uname); | 334 | __putname(v9ses->uname); |
| 327 | __putname(v9ses->aname); | 335 | __putname(v9ses->aname); |
| 328 | 336 | ||
| 337 | bdi_destroy(&v9ses->bdi); | ||
| 338 | |||
| 329 | spin_lock(&v9fs_sessionlist_lock); | 339 | spin_lock(&v9fs_sessionlist_lock); |
| 330 | list_del(&v9ses->slist); | 340 | list_del(&v9ses->slist); |
| 331 | spin_unlock(&v9fs_sessionlist_lock); | 341 | spin_unlock(&v9fs_sessionlist_lock); |
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index a0a8d3dd1361..bec4d0bcb458 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * Boston, MA 02111-1301 USA | 20 | * Boston, MA 02111-1301 USA |
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #include <linux/backing-dev.h> | ||
| 23 | 24 | ||
| 24 | /** | 25 | /** |
| 25 | * enum p9_session_flags - option flags for each 9P session | 26 | * enum p9_session_flags - option flags for each 9P session |
| @@ -102,6 +103,7 @@ struct v9fs_session_info { | |||
| 102 | u32 uid; /* if ACCESS_SINGLE, the uid that has access */ | 103 | u32 uid; /* if ACCESS_SINGLE, the uid that has access */ |
| 103 | struct p9_client *clnt; /* 9p client */ | 104 | struct p9_client *clnt; /* 9p client */ |
| 104 | struct list_head slist; /* list of sessions registered with v9fs */ | 105 | struct list_head slist; /* list of sessions registered with v9fs */ |
| 106 | struct backing_dev_info bdi; | ||
| 105 | }; | 107 | }; |
| 106 | 108 | ||
| 107 | struct p9_fid *v9fs_session_init(struct v9fs_session_info *, const char *, | 109 | struct p9_fid *v9fs_session_init(struct v9fs_session_info *, const char *, |
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 491108bd6e0d..806da5d3b3a0 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c | |||
| @@ -77,6 +77,7 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses, | |||
| 77 | sb->s_blocksize = 1 << sb->s_blocksize_bits; | 77 | sb->s_blocksize = 1 << sb->s_blocksize_bits; |
| 78 | sb->s_magic = V9FS_MAGIC; | 78 | sb->s_magic = V9FS_MAGIC; |
| 79 | sb->s_op = &v9fs_super_ops; | 79 | sb->s_op = &v9fs_super_ops; |
| 80 | sb->s_bdi = &v9ses->bdi; | ||
| 80 | 81 | ||
| 81 | sb->s_flags = flags | MS_ACTIVE | MS_SYNCHRONOUS | MS_DIRSYNC | | 82 | sb->s_flags = flags | MS_ACTIVE | MS_SYNCHRONOUS | MS_DIRSYNC | |
| 82 | MS_NOATIME; | 83 | MS_NOATIME; |
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index c54dad4e6063..a10f2582844f 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/fscache.h> | 21 | #include <linux/fscache.h> |
| 22 | #include <linux/backing-dev.h> | ||
| 22 | 23 | ||
| 23 | #include "afs.h" | 24 | #include "afs.h" |
| 24 | #include "afs_vl.h" | 25 | #include "afs_vl.h" |
| @@ -313,6 +314,7 @@ struct afs_volume { | |||
| 313 | unsigned short rjservers; /* number of servers discarded due to -ENOMEDIUM */ | 314 | unsigned short rjservers; /* number of servers discarded due to -ENOMEDIUM */ |
| 314 | struct afs_server *servers[8]; /* servers on which volume resides (ordered) */ | 315 | struct afs_server *servers[8]; /* servers on which volume resides (ordered) */ |
| 315 | struct rw_semaphore server_sem; /* lock for accessing current server */ | 316 | struct rw_semaphore server_sem; /* lock for accessing current server */ |
| 317 | struct backing_dev_info bdi; | ||
| 316 | }; | 318 | }; |
| 317 | 319 | ||
| 318 | /* | 320 | /* |
diff --git a/fs/afs/super.c b/fs/afs/super.c index 14f6431598ad..e932e5a3a0c1 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
| @@ -311,6 +311,7 @@ static int afs_fill_super(struct super_block *sb, void *data) | |||
| 311 | sb->s_magic = AFS_FS_MAGIC; | 311 | sb->s_magic = AFS_FS_MAGIC; |
| 312 | sb->s_op = &afs_super_ops; | 312 | sb->s_op = &afs_super_ops; |
| 313 | sb->s_fs_info = as; | 313 | sb->s_fs_info = as; |
| 314 | sb->s_bdi = &as->volume->bdi; | ||
| 314 | 315 | ||
| 315 | /* allocate the root inode and dentry */ | 316 | /* allocate the root inode and dentry */ |
| 316 | fid.vid = as->volume->vid; | 317 | fid.vid = as->volume->vid; |
diff --git a/fs/afs/volume.c b/fs/afs/volume.c index a353e69e2391..401eeb21869f 100644 --- a/fs/afs/volume.c +++ b/fs/afs/volume.c | |||
| @@ -106,6 +106,10 @@ struct afs_volume *afs_volume_lookup(struct afs_mount_params *params) | |||
| 106 | volume->cell = params->cell; | 106 | volume->cell = params->cell; |
| 107 | volume->vid = vlocation->vldb.vid[params->type]; | 107 | volume->vid = vlocation->vldb.vid[params->type]; |
| 108 | 108 | ||
| 109 | ret = bdi_setup_and_register(&volume->bdi, "afs", BDI_CAP_MAP_COPY); | ||
| 110 | if (ret) | ||
| 111 | goto error_bdi; | ||
| 112 | |||
| 109 | init_rwsem(&volume->server_sem); | 113 | init_rwsem(&volume->server_sem); |
| 110 | 114 | ||
| 111 | /* look up all the applicable server records */ | 115 | /* look up all the applicable server records */ |
| @@ -151,6 +155,8 @@ error: | |||
| 151 | return ERR_PTR(ret); | 155 | return ERR_PTR(ret); |
| 152 | 156 | ||
| 153 | error_discard: | 157 | error_discard: |
| 158 | bdi_destroy(&volume->bdi); | ||
| 159 | error_bdi: | ||
| 154 | up_write(¶ms->cell->vl_sem); | 160 | up_write(¶ms->cell->vl_sem); |
| 155 | 161 | ||
| 156 | for (loop = volume->nservers - 1; loop >= 0; loop--) | 162 | for (loop = volume->nservers - 1; loop >= 0; loop--) |
| @@ -200,6 +206,7 @@ void afs_put_volume(struct afs_volume *volume) | |||
| 200 | for (loop = volume->nservers - 1; loop >= 0; loop--) | 206 | for (loop = volume->nservers - 1; loop >= 0; loop--) |
| 201 | afs_put_server(volume->servers[loop]); | 207 | afs_put_server(volume->servers[loop]); |
| 202 | 208 | ||
| 209 | bdi_destroy(&volume->bdi); | ||
| 203 | kfree(volume); | 210 | kfree(volume); |
| 204 | 211 | ||
| 205 | _leave(" [destroyed]"); | 212 | _leave(" [destroyed]"); |
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 7ab23e006e4c..2c5f9a0e5d72 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
| @@ -1005,15 +1005,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( | |||
| 1005 | } | 1005 | } |
| 1006 | } else if (!mm->start_data) { | 1006 | } else if (!mm->start_data) { |
| 1007 | mm->start_data = seg->addr; | 1007 | mm->start_data = seg->addr; |
| 1008 | #ifndef CONFIG_MMU | ||
| 1009 | mm->end_data = seg->addr + phdr->p_memsz; | 1008 | mm->end_data = seg->addr + phdr->p_memsz; |
| 1010 | #endif | ||
| 1011 | } | 1009 | } |
| 1012 | |||
| 1013 | #ifdef CONFIG_MMU | ||
| 1014 | if (seg->addr + phdr->p_memsz > mm->end_data) | ||
| 1015 | mm->end_data = seg->addr + phdr->p_memsz; | ||
| 1016 | #endif | ||
| 1017 | } | 1010 | } |
| 1018 | 1011 | ||
| 1019 | seg++; | 1012 | seg++; |
diff --git a/fs/block_dev.c b/fs/block_dev.c index 2a6d0193f139..6dcee88c2e5d 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -406,16 +406,23 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin) | |||
| 406 | 406 | ||
| 407 | int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync) | 407 | int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync) |
| 408 | { | 408 | { |
| 409 | struct block_device *bdev = I_BDEV(filp->f_mapping->host); | 409 | struct inode *bd_inode = filp->f_mapping->host; |
| 410 | struct block_device *bdev = I_BDEV(bd_inode); | ||
| 410 | int error; | 411 | int error; |
| 411 | 412 | ||
| 412 | error = sync_blockdev(bdev); | 413 | /* |
| 413 | if (error) | 414 | * There is no need to serialise calls to blkdev_issue_flush with |
| 414 | return error; | 415 | * i_mutex and doing so causes performance issues with concurrent |
| 415 | 416 | * O_SYNC writers to a block device. | |
| 417 | */ | ||
| 418 | mutex_unlock(&bd_inode->i_mutex); | ||
| 419 | |||
| 416 | error = blkdev_issue_flush(bdev, NULL); | 420 | error = blkdev_issue_flush(bdev, NULL); |
| 417 | if (error == -EOPNOTSUPP) | 421 | if (error == -EOPNOTSUPP) |
| 418 | error = 0; | 422 | error = 0; |
| 423 | |||
| 424 | mutex_lock(&bd_inode->i_mutex); | ||
| 425 | |||
| 419 | return error; | 426 | return error; |
| 420 | } | 427 | } |
| 421 | EXPORT_SYMBOL(blkdev_fsync); | 428 | EXPORT_SYMBOL(blkdev_fsync); |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e7b8f2c89ccb..feca04197d02 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -44,8 +44,6 @@ static struct extent_io_ops btree_extent_io_ops; | |||
| 44 | static void end_workqueue_fn(struct btrfs_work *work); | 44 | static void end_workqueue_fn(struct btrfs_work *work); |
| 45 | static void free_fs_root(struct btrfs_root *root); | 45 | static void free_fs_root(struct btrfs_root *root); |
| 46 | 46 | ||
| 47 | static atomic_t btrfs_bdi_num = ATOMIC_INIT(0); | ||
| 48 | |||
| 49 | /* | 47 | /* |
| 50 | * end_io_wq structs are used to do processing in task context when an IO is | 48 | * end_io_wq structs are used to do processing in task context when an IO is |
| 51 | * complete. This is used during reads to verify checksums, and it is used | 49 | * complete. This is used during reads to verify checksums, and it is used |
| @@ -1375,19 +1373,11 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi) | |||
| 1375 | { | 1373 | { |
| 1376 | int err; | 1374 | int err; |
| 1377 | 1375 | ||
| 1378 | bdi->name = "btrfs"; | ||
| 1379 | bdi->capabilities = BDI_CAP_MAP_COPY; | 1376 | bdi->capabilities = BDI_CAP_MAP_COPY; |
| 1380 | err = bdi_init(bdi); | 1377 | err = bdi_setup_and_register(bdi, "btrfs", BDI_CAP_MAP_COPY); |
| 1381 | if (err) | 1378 | if (err) |
| 1382 | return err; | 1379 | return err; |
| 1383 | 1380 | ||
| 1384 | err = bdi_register(bdi, NULL, "btrfs-%d", | ||
| 1385 | atomic_inc_return(&btrfs_bdi_num)); | ||
| 1386 | if (err) { | ||
| 1387 | bdi_destroy(bdi); | ||
| 1388 | return err; | ||
| 1389 | } | ||
| 1390 | |||
| 1391 | bdi->ra_pages = default_backing_dev_info.ra_pages; | 1381 | bdi->ra_pages = default_backing_dev_info.ra_pages; |
| 1392 | bdi->unplug_io_fn = btrfs_unplug_io_fn; | 1382 | bdi->unplug_io_fn = btrfs_unplug_io_fn; |
| 1393 | bdi->unplug_io_data = info; | 1383 | bdi->unplug_io_data = info; |
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 412593703d1e..4b42c2bb603f 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
| @@ -509,7 +509,7 @@ static void writepages_finish(struct ceph_osd_request *req, | |||
| 509 | u64 bytes = 0; | 509 | u64 bytes = 0; |
| 510 | struct ceph_client *client = ceph_inode_to_client(inode); | 510 | struct ceph_client *client = ceph_inode_to_client(inode); |
| 511 | long writeback_stat; | 511 | long writeback_stat; |
| 512 | unsigned issued = __ceph_caps_issued(ci, NULL); | 512 | unsigned issued = ceph_caps_issued(ci); |
| 513 | 513 | ||
| 514 | /* parse reply */ | 514 | /* parse reply */ |
| 515 | replyhead = msg->front.iov_base; | 515 | replyhead = msg->front.iov_base; |
diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c index f6394b94b866..818afe72e6c7 100644 --- a/fs/ceph/auth.c +++ b/fs/ceph/auth.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
| 5 | #include <linux/err.h> | 5 | #include <linux/err.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | 7 | ||
| 7 | #include "types.h" | 8 | #include "types.h" |
| 8 | #include "auth_none.h" | 9 | #include "auth_none.h" |
diff --git a/fs/ceph/auth_none.h b/fs/ceph/auth_none.h index 56c05533a31c..8164df1a08be 100644 --- a/fs/ceph/auth_none.h +++ b/fs/ceph/auth_none.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _FS_CEPH_AUTH_NONE_H | 1 | #ifndef _FS_CEPH_AUTH_NONE_H |
| 2 | #define _FS_CEPH_AUTH_NONE_H | 2 | #define _FS_CEPH_AUTH_NONE_H |
| 3 | 3 | ||
| 4 | #include <linux/slab.h> | ||
| 5 | |||
| 4 | #include "auth.h" | 6 | #include "auth.h" |
| 5 | 7 | ||
| 6 | /* | 8 | /* |
diff --git a/fs/ceph/auth_x.c b/fs/ceph/auth_x.c index d9001a4dc8cc..fee5a08da881 100644 --- a/fs/ceph/auth_x.c +++ b/fs/ceph/auth_x.c | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #include "auth.h" | 12 | #include "auth.h" |
| 13 | #include "decode.h" | 13 | #include "decode.h" |
| 14 | 14 | ||
| 15 | struct kmem_cache *ceph_x_ticketbuf_cachep; | ||
| 16 | |||
| 17 | #define TEMP_TICKET_BUF_LEN 256 | 15 | #define TEMP_TICKET_BUF_LEN 256 |
| 18 | 16 | ||
| 19 | static void ceph_x_validate_tickets(struct ceph_auth_client *ac, int *pneed); | 17 | static void ceph_x_validate_tickets(struct ceph_auth_client *ac, int *pneed); |
| @@ -131,13 +129,12 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac, | |||
| 131 | char *ticket_buf; | 129 | char *ticket_buf; |
| 132 | u8 struct_v; | 130 | u8 struct_v; |
| 133 | 131 | ||
| 134 | dbuf = kmem_cache_alloc(ceph_x_ticketbuf_cachep, GFP_NOFS | GFP_ATOMIC); | 132 | dbuf = kmalloc(TEMP_TICKET_BUF_LEN, GFP_NOFS); |
| 135 | if (!dbuf) | 133 | if (!dbuf) |
| 136 | return -ENOMEM; | 134 | return -ENOMEM; |
| 137 | 135 | ||
| 138 | ret = -ENOMEM; | 136 | ret = -ENOMEM; |
| 139 | ticket_buf = kmem_cache_alloc(ceph_x_ticketbuf_cachep, | 137 | ticket_buf = kmalloc(TEMP_TICKET_BUF_LEN, GFP_NOFS); |
| 140 | GFP_NOFS | GFP_ATOMIC); | ||
| 141 | if (!ticket_buf) | 138 | if (!ticket_buf) |
| 142 | goto out_dbuf; | 139 | goto out_dbuf; |
| 143 | 140 | ||
| @@ -251,9 +248,9 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac, | |||
| 251 | 248 | ||
| 252 | ret = 0; | 249 | ret = 0; |
| 253 | out: | 250 | out: |
| 254 | kmem_cache_free(ceph_x_ticketbuf_cachep, ticket_buf); | 251 | kfree(ticket_buf); |
| 255 | out_dbuf: | 252 | out_dbuf: |
| 256 | kmem_cache_free(ceph_x_ticketbuf_cachep, dbuf); | 253 | kfree(dbuf); |
| 257 | return ret; | 254 | return ret; |
| 258 | 255 | ||
| 259 | bad: | 256 | bad: |
| @@ -605,8 +602,6 @@ static void ceph_x_destroy(struct ceph_auth_client *ac) | |||
| 605 | remove_ticket_handler(ac, th); | 602 | remove_ticket_handler(ac, th); |
| 606 | } | 603 | } |
| 607 | 604 | ||
| 608 | kmem_cache_destroy(ceph_x_ticketbuf_cachep); | ||
| 609 | |||
| 610 | kfree(ac->private); | 605 | kfree(ac->private); |
| 611 | ac->private = NULL; | 606 | ac->private = NULL; |
| 612 | } | 607 | } |
| @@ -641,26 +636,20 @@ int ceph_x_init(struct ceph_auth_client *ac) | |||
| 641 | int ret; | 636 | int ret; |
| 642 | 637 | ||
| 643 | dout("ceph_x_init %p\n", ac); | 638 | dout("ceph_x_init %p\n", ac); |
| 639 | ret = -ENOMEM; | ||
| 644 | xi = kzalloc(sizeof(*xi), GFP_NOFS); | 640 | xi = kzalloc(sizeof(*xi), GFP_NOFS); |
| 645 | if (!xi) | 641 | if (!xi) |
| 646 | return -ENOMEM; | 642 | goto out; |
| 647 | 643 | ||
| 648 | ret = -ENOMEM; | ||
| 649 | ceph_x_ticketbuf_cachep = kmem_cache_create("ceph_x_ticketbuf", | ||
| 650 | TEMP_TICKET_BUF_LEN, 8, | ||
| 651 | (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD), | ||
| 652 | NULL); | ||
| 653 | if (!ceph_x_ticketbuf_cachep) | ||
| 654 | goto done_nomem; | ||
| 655 | ret = -EINVAL; | 644 | ret = -EINVAL; |
| 656 | if (!ac->secret) { | 645 | if (!ac->secret) { |
| 657 | pr_err("no secret set (for auth_x protocol)\n"); | 646 | pr_err("no secret set (for auth_x protocol)\n"); |
| 658 | goto done_nomem; | 647 | goto out_nomem; |
| 659 | } | 648 | } |
| 660 | 649 | ||
| 661 | ret = ceph_crypto_key_unarmor(&xi->secret, ac->secret); | 650 | ret = ceph_crypto_key_unarmor(&xi->secret, ac->secret); |
| 662 | if (ret) | 651 | if (ret) |
| 663 | goto done_nomem; | 652 | goto out_nomem; |
| 664 | 653 | ||
| 665 | xi->starting = true; | 654 | xi->starting = true; |
| 666 | xi->ticket_handlers = RB_ROOT; | 655 | xi->ticket_handlers = RB_ROOT; |
| @@ -670,10 +659,9 @@ int ceph_x_init(struct ceph_auth_client *ac) | |||
| 670 | ac->ops = &ceph_x_ops; | 659 | ac->ops = &ceph_x_ops; |
| 671 | return 0; | 660 | return 0; |
| 672 | 661 | ||
| 673 | done_nomem: | 662 | out_nomem: |
| 674 | kfree(xi); | 663 | kfree(xi); |
| 675 | if (ceph_x_ticketbuf_cachep) | 664 | out: |
| 676 | kmem_cache_destroy(ceph_x_ticketbuf_cachep); | ||
| 677 | return ret; | 665 | return ret; |
| 678 | } | 666 | } |
| 679 | 667 | ||
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index aa2239fa9a3b..0c1681806867 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c | |||
| @@ -1861,8 +1861,8 @@ static void kick_flushing_capsnaps(struct ceph_mds_client *mdsc, | |||
| 1861 | } else { | 1861 | } else { |
| 1862 | pr_err("%p auth cap %p not mds%d ???\n", inode, | 1862 | pr_err("%p auth cap %p not mds%d ???\n", inode, |
| 1863 | cap, session->s_mds); | 1863 | cap, session->s_mds); |
| 1864 | spin_unlock(&inode->i_lock); | ||
| 1865 | } | 1864 | } |
| 1865 | spin_unlock(&inode->i_lock); | ||
| 1866 | } | 1866 | } |
| 1867 | } | 1867 | } |
| 1868 | 1868 | ||
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index ea8ee2e526aa..650d2db5ed26 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
| @@ -880,7 +880,16 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 880 | * do_request, above). If there is no trace, we need | 880 | * do_request, above). If there is no trace, we need |
| 881 | * to do it here. | 881 | * to do it here. |
| 882 | */ | 882 | */ |
| 883 | |||
| 884 | /* d_move screws up d_subdirs order */ | ||
| 885 | ceph_i_clear(new_dir, CEPH_I_COMPLETE); | ||
| 886 | |||
| 883 | d_move(old_dentry, new_dentry); | 887 | d_move(old_dentry, new_dentry); |
| 888 | |||
| 889 | /* ensure target dentry is invalidated, despite | ||
| 890 | rehashing bug in vfs_rename_dir */ | ||
| 891 | new_dentry->d_time = jiffies; | ||
| 892 | ceph_dentry(new_dentry)->lease_shared_gen = 0; | ||
| 884 | } | 893 | } |
| 885 | ceph_mdsc_put_request(req); | 894 | ceph_mdsc_put_request(req); |
| 886 | return err; | 895 | return err; |
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 4add3d5da2c1..ed6f19721d6e 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
| @@ -665,7 +665,8 @@ more: | |||
| 665 | * throw out any page cache pages in this range. this | 665 | * throw out any page cache pages in this range. this |
| 666 | * may block. | 666 | * may block. |
| 667 | */ | 667 | */ |
| 668 | truncate_inode_pages_range(inode->i_mapping, pos, pos+len); | 668 | truncate_inode_pages_range(inode->i_mapping, pos, |
| 669 | (pos+len) | (PAGE_CACHE_SIZE-1)); | ||
| 669 | } else { | 670 | } else { |
| 670 | pages = alloc_page_vector(num_pages); | 671 | pages = alloc_page_vector(num_pages); |
| 671 | if (IS_ERR(pages)) { | 672 | if (IS_ERR(pages)) { |
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 26f883c275e8..261f3e6c0bcf 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c | |||
| @@ -997,6 +997,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, | |||
| 997 | dn, dn->d_name.len, dn->d_name.name); | 997 | dn, dn->d_name.len, dn->d_name.name); |
| 998 | dout("fill_trace doing d_move %p -> %p\n", | 998 | dout("fill_trace doing d_move %p -> %p\n", |
| 999 | req->r_old_dentry, dn); | 999 | req->r_old_dentry, dn); |
| 1000 | |||
| 1001 | /* d_move screws up d_subdirs order */ | ||
| 1002 | ceph_i_clear(dir, CEPH_I_COMPLETE); | ||
| 1003 | |||
| 1000 | d_move(req->r_old_dentry, dn); | 1004 | d_move(req->r_old_dentry, dn); |
| 1001 | dout(" src %p '%.*s' dst %p '%.*s'\n", | 1005 | dout(" src %p '%.*s' dst %p '%.*s'\n", |
| 1002 | req->r_old_dentry, | 1006 | req->r_old_dentry, |
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index cdaaa131add3..509f57d9ccb3 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c | |||
| @@ -1334,6 +1334,7 @@ static int read_partial_message(struct ceph_connection *con) | |||
| 1334 | unsigned front_len, middle_len, data_len, data_off; | 1334 | unsigned front_len, middle_len, data_len, data_off; |
| 1335 | int datacrc = con->msgr->nocrc; | 1335 | int datacrc = con->msgr->nocrc; |
| 1336 | int skip; | 1336 | int skip; |
| 1337 | u64 seq; | ||
| 1337 | 1338 | ||
| 1338 | dout("read_partial_message con %p msg %p\n", con, m); | 1339 | dout("read_partial_message con %p msg %p\n", con, m); |
| 1339 | 1340 | ||
| @@ -1368,6 +1369,25 @@ static int read_partial_message(struct ceph_connection *con) | |||
| 1368 | return -EIO; | 1369 | return -EIO; |
| 1369 | data_off = le16_to_cpu(con->in_hdr.data_off); | 1370 | data_off = le16_to_cpu(con->in_hdr.data_off); |
| 1370 | 1371 | ||
| 1372 | /* verify seq# */ | ||
| 1373 | seq = le64_to_cpu(con->in_hdr.seq); | ||
| 1374 | if ((s64)seq - (s64)con->in_seq < 1) { | ||
| 1375 | pr_info("skipping %s%lld %s seq %lld, expected %lld\n", | ||
| 1376 | ENTITY_NAME(con->peer_name), | ||
| 1377 | pr_addr(&con->peer_addr.in_addr), | ||
| 1378 | seq, con->in_seq + 1); | ||
| 1379 | con->in_base_pos = -front_len - middle_len - data_len - | ||
| 1380 | sizeof(m->footer); | ||
| 1381 | con->in_tag = CEPH_MSGR_TAG_READY; | ||
| 1382 | con->in_seq++; | ||
| 1383 | return 0; | ||
| 1384 | } else if ((s64)seq - (s64)con->in_seq > 1) { | ||
| 1385 | pr_err("read_partial_message bad seq %lld expected %lld\n", | ||
| 1386 | seq, con->in_seq + 1); | ||
| 1387 | con->error_msg = "bad message sequence # for incoming message"; | ||
| 1388 | return -EBADMSG; | ||
| 1389 | } | ||
| 1390 | |||
| 1371 | /* allocate message? */ | 1391 | /* allocate message? */ |
| 1372 | if (!con->in_msg) { | 1392 | if (!con->in_msg) { |
| 1373 | dout("got hdr type %d front %d data %d\n", con->in_hdr.type, | 1393 | dout("got hdr type %d front %d data %d\n", con->in_hdr.type, |
| @@ -1379,6 +1399,7 @@ static int read_partial_message(struct ceph_connection *con) | |||
| 1379 | con->in_base_pos = -front_len - middle_len - data_len - | 1399 | con->in_base_pos = -front_len - middle_len - data_len - |
| 1380 | sizeof(m->footer); | 1400 | sizeof(m->footer); |
| 1381 | con->in_tag = CEPH_MSGR_TAG_READY; | 1401 | con->in_tag = CEPH_MSGR_TAG_READY; |
| 1402 | con->in_seq++; | ||
| 1382 | return 0; | 1403 | return 0; |
| 1383 | } | 1404 | } |
| 1384 | if (IS_ERR(con->in_msg)) { | 1405 | if (IS_ERR(con->in_msg)) { |
| @@ -2030,6 +2051,7 @@ void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg) | |||
| 2030 | ceph_msg_put(con->in_msg); | 2051 | ceph_msg_put(con->in_msg); |
| 2031 | con->in_msg = NULL; | 2052 | con->in_msg = NULL; |
| 2032 | con->in_tag = CEPH_MSGR_TAG_READY; | 2053 | con->in_tag = CEPH_MSGR_TAG_READY; |
| 2054 | con->in_seq++; | ||
| 2033 | } else { | 2055 | } else { |
| 2034 | dout("con_revoke_pages %p msg %p pages %p no-op\n", | 2056 | dout("con_revoke_pages %p msg %p pages %p no-op\n", |
| 2035 | con, con->in_msg, msg); | 2057 | con, con->in_msg, msg); |
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 2b881262ef67..d5114db70453 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c | |||
| @@ -869,16 +869,20 @@ skip_inode: | |||
| 869 | continue; | 869 | continue; |
| 870 | ci = ceph_inode(inode); | 870 | ci = ceph_inode(inode); |
| 871 | spin_lock(&inode->i_lock); | 871 | spin_lock(&inode->i_lock); |
| 872 | if (!ci->i_snap_realm) | 872 | if (list_empty(&ci->i_snap_realm_item)) { |
| 873 | goto split_skip_inode; | 873 | struct ceph_snap_realm *oldrealm = |
| 874 | ceph_put_snap_realm(mdsc, ci->i_snap_realm); | 874 | ci->i_snap_realm; |
| 875 | spin_lock(&realm->inodes_with_caps_lock); | 875 | |
| 876 | list_add(&ci->i_snap_realm_item, | 876 | dout(" moving %p to split realm %llx %p\n", |
| 877 | &realm->inodes_with_caps); | 877 | inode, realm->ino, realm); |
| 878 | ci->i_snap_realm = realm; | 878 | spin_lock(&realm->inodes_with_caps_lock); |
| 879 | spin_unlock(&realm->inodes_with_caps_lock); | 879 | list_add(&ci->i_snap_realm_item, |
| 880 | ceph_get_snap_realm(mdsc, realm); | 880 | &realm->inodes_with_caps); |
| 881 | split_skip_inode: | 881 | ci->i_snap_realm = realm; |
| 882 | spin_unlock(&realm->inodes_with_caps_lock); | ||
| 883 | ceph_get_snap_realm(mdsc, realm); | ||
| 884 | ceph_put_snap_realm(mdsc, oldrealm); | ||
| 885 | } | ||
| 882 | spin_unlock(&inode->i_lock); | 886 | spin_unlock(&inode->i_lock); |
| 883 | iput(inode); | 887 | iput(inode); |
| 884 | } | 888 | } |
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 75d02eaa1279..f888cf487b7c 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c | |||
| @@ -996,9 +996,10 @@ static int __init init_ceph(void) | |||
| 996 | if (ret) | 996 | if (ret) |
| 997 | goto out_icache; | 997 | goto out_icache; |
| 998 | 998 | ||
| 999 | pr_info("loaded %d.%d.%d (mon/mds/osd proto %d/%d/%d)\n", | 999 | pr_info("loaded (mon/mds/osd proto %d/%d/%d, osdmap %d/%d %d/%d)\n", |
| 1000 | CEPH_VERSION_MAJOR, CEPH_VERSION_MINOR, CEPH_VERSION_PATCH, | 1000 | CEPH_MONC_PROTOCOL, CEPH_MDSC_PROTOCOL, CEPH_OSDC_PROTOCOL, |
| 1001 | CEPH_MONC_PROTOCOL, CEPH_MDSC_PROTOCOL, CEPH_OSDC_PROTOCOL); | 1001 | CEPH_OSDMAP_VERSION, CEPH_OSDMAP_VERSION_EXT, |
| 1002 | CEPH_OSDMAP_INC_VERSION, CEPH_OSDMAP_INC_VERSION_EXT); | ||
| 1002 | return 0; | 1003 | return 0; |
| 1003 | 1004 | ||
| 1004 | out_icache: | 1005 | out_icache: |
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index e30dfbb056c3..13513b80d87f 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
| 11 | #include <linux/mempool.h> | 11 | #include <linux/mempool.h> |
| 12 | #include <linux/pagemap.h> | 12 | #include <linux/pagemap.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/wait.h> | 14 | #include <linux/wait.h> |
| 14 | #include <linux/writeback.h> | 15 | #include <linux/writeback.h> |
| 15 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 4797787c6a44..246a167cb913 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | #ifndef _CIFS_FS_SB_H | 18 | #ifndef _CIFS_FS_SB_H |
| 19 | #define _CIFS_FS_SB_H | 19 | #define _CIFS_FS_SB_H |
| 20 | 20 | ||
| 21 | #include <linux/backing-dev.h> | ||
| 22 | |||
| 21 | #define CIFS_MOUNT_NO_PERM 1 /* do not do client vfs_perm check */ | 23 | #define CIFS_MOUNT_NO_PERM 1 /* do not do client vfs_perm check */ |
| 22 | #define CIFS_MOUNT_SET_UID 2 /* set current's euid in create etc. */ | 24 | #define CIFS_MOUNT_SET_UID 2 /* set current's euid in create etc. */ |
| 23 | #define CIFS_MOUNT_SERVER_INUM 4 /* inode numbers from uniqueid from server */ | 25 | #define CIFS_MOUNT_SERVER_INUM 4 /* inode numbers from uniqueid from server */ |
| @@ -50,5 +52,6 @@ struct cifs_sb_info { | |||
| 50 | #ifdef CONFIG_CIFS_DFS_UPCALL | 52 | #ifdef CONFIG_CIFS_DFS_UPCALL |
| 51 | char *mountdata; /* mount options received at mount time */ | 53 | char *mountdata; /* mount options received at mount time */ |
| 52 | #endif | 54 | #endif |
| 55 | struct backing_dev_info bdi; | ||
| 53 | }; | 56 | }; |
| 54 | #endif /* _CIFS_FS_SB_H */ | 57 | #endif /* _CIFS_FS_SB_H */ |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ded66be6597c..ad235d604a0b 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -103,6 +103,12 @@ cifs_read_super(struct super_block *sb, void *data, | |||
| 103 | if (cifs_sb == NULL) | 103 | if (cifs_sb == NULL) |
| 104 | return -ENOMEM; | 104 | return -ENOMEM; |
| 105 | 105 | ||
| 106 | rc = bdi_setup_and_register(&cifs_sb->bdi, "cifs", BDI_CAP_MAP_COPY); | ||
| 107 | if (rc) { | ||
| 108 | kfree(cifs_sb); | ||
| 109 | return rc; | ||
| 110 | } | ||
| 111 | |||
| 106 | #ifdef CONFIG_CIFS_DFS_UPCALL | 112 | #ifdef CONFIG_CIFS_DFS_UPCALL |
| 107 | /* copy mount params to sb for use in submounts */ | 113 | /* copy mount params to sb for use in submounts */ |
| 108 | /* BB: should we move this after the mount so we | 114 | /* BB: should we move this after the mount so we |
| @@ -115,6 +121,7 @@ cifs_read_super(struct super_block *sb, void *data, | |||
| 115 | int len = strlen(data); | 121 | int len = strlen(data); |
| 116 | cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL); | 122 | cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL); |
| 117 | if (cifs_sb->mountdata == NULL) { | 123 | if (cifs_sb->mountdata == NULL) { |
| 124 | bdi_destroy(&cifs_sb->bdi); | ||
| 118 | kfree(sb->s_fs_info); | 125 | kfree(sb->s_fs_info); |
| 119 | sb->s_fs_info = NULL; | 126 | sb->s_fs_info = NULL; |
| 120 | return -ENOMEM; | 127 | return -ENOMEM; |
| @@ -135,6 +142,7 @@ cifs_read_super(struct super_block *sb, void *data, | |||
| 135 | 142 | ||
| 136 | sb->s_magic = CIFS_MAGIC_NUMBER; | 143 | sb->s_magic = CIFS_MAGIC_NUMBER; |
| 137 | sb->s_op = &cifs_super_ops; | 144 | sb->s_op = &cifs_super_ops; |
| 145 | sb->s_bdi = &cifs_sb->bdi; | ||
| 138 | /* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) | 146 | /* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) |
| 139 | sb->s_blocksize = | 147 | sb->s_blocksize = |
| 140 | cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ | 148 | cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ |
| @@ -183,6 +191,7 @@ out_mount_failed: | |||
| 183 | } | 191 | } |
| 184 | #endif | 192 | #endif |
| 185 | unload_nls(cifs_sb->local_nls); | 193 | unload_nls(cifs_sb->local_nls); |
| 194 | bdi_destroy(&cifs_sb->bdi); | ||
| 186 | kfree(cifs_sb); | 195 | kfree(cifs_sb); |
| 187 | } | 196 | } |
| 188 | return rc; | 197 | return rc; |
| @@ -214,6 +223,7 @@ cifs_put_super(struct super_block *sb) | |||
| 214 | #endif | 223 | #endif |
| 215 | 224 | ||
| 216 | unload_nls(cifs_sb->local_nls); | 225 | unload_nls(cifs_sb->local_nls); |
| 226 | bdi_destroy(&cifs_sb->bdi); | ||
| 217 | kfree(cifs_sb); | 227 | kfree(cifs_sb); |
| 218 | 228 | ||
| 219 | unlock_kernel(); | 229 | unlock_kernel(); |
diff --git a/fs/coda/inode.c b/fs/coda/inode.c index a1695dcadd99..d97f9935a028 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c | |||
| @@ -167,6 +167,10 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) | |||
| 167 | return -EBUSY; | 167 | return -EBUSY; |
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | error = bdi_setup_and_register(&vc->bdi, "coda", BDI_CAP_MAP_COPY); | ||
| 171 | if (error) | ||
| 172 | goto bdi_err; | ||
| 173 | |||
| 170 | vc->vc_sb = sb; | 174 | vc->vc_sb = sb; |
| 171 | 175 | ||
| 172 | sb->s_fs_info = vc; | 176 | sb->s_fs_info = vc; |
| @@ -175,6 +179,7 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) | |||
| 175 | sb->s_blocksize_bits = 12; | 179 | sb->s_blocksize_bits = 12; |
| 176 | sb->s_magic = CODA_SUPER_MAGIC; | 180 | sb->s_magic = CODA_SUPER_MAGIC; |
| 177 | sb->s_op = &coda_super_operations; | 181 | sb->s_op = &coda_super_operations; |
| 182 | sb->s_bdi = &vc->bdi; | ||
| 178 | 183 | ||
| 179 | /* get root fid from Venus: this needs the root inode */ | 184 | /* get root fid from Venus: this needs the root inode */ |
| 180 | error = venus_rootfid(sb, &fid); | 185 | error = venus_rootfid(sb, &fid); |
| @@ -200,6 +205,8 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) | |||
| 200 | return 0; | 205 | return 0; |
| 201 | 206 | ||
| 202 | error: | 207 | error: |
| 208 | bdi_destroy(&vc->bdi); | ||
| 209 | bdi_err: | ||
| 203 | if (root) | 210 | if (root) |
| 204 | iput(root); | 211 | iput(root); |
| 205 | if (vc) | 212 | if (vc) |
| @@ -210,6 +217,7 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) | |||
| 210 | 217 | ||
| 211 | static void coda_put_super(struct super_block *sb) | 218 | static void coda_put_super(struct super_block *sb) |
| 212 | { | 219 | { |
| 220 | bdi_destroy(&coda_vcp(sb)->bdi); | ||
| 213 | coda_vcp(sb)->vc_sb = NULL; | 221 | coda_vcp(sb)->vc_sb = NULL; |
| 214 | sb->s_fs_info = NULL; | 222 | sb->s_fs_info = NULL; |
| 215 | 223 | ||
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c32a1b6a856b..641640dc7ae5 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -102,7 +102,6 @@ | |||
| 102 | #include <linux/nbd.h> | 102 | #include <linux/nbd.h> |
| 103 | #include <linux/random.h> | 103 | #include <linux/random.h> |
| 104 | #include <linux/filter.h> | 104 | #include <linux/filter.h> |
| 105 | #include <linux/pktcdvd.h> | ||
| 106 | 105 | ||
| 107 | #include <linux/hiddev.h> | 106 | #include <linux/hiddev.h> |
| 108 | 107 | ||
| @@ -1126,8 +1125,6 @@ COMPATIBLE_IOCTL(PPGETMODE) | |||
| 1126 | COMPATIBLE_IOCTL(PPGETPHASE) | 1125 | COMPATIBLE_IOCTL(PPGETPHASE) |
| 1127 | COMPATIBLE_IOCTL(PPGETFLAGS) | 1126 | COMPATIBLE_IOCTL(PPGETFLAGS) |
| 1128 | COMPATIBLE_IOCTL(PPSETFLAGS) | 1127 | COMPATIBLE_IOCTL(PPSETFLAGS) |
| 1129 | /* pktcdvd */ | ||
| 1130 | COMPATIBLE_IOCTL(PACKET_CTRL_CMD) | ||
| 1131 | /* Big A */ | 1128 | /* Big A */ |
| 1132 | /* sparc only */ | 1129 | /* sparc only */ |
| 1133 | /* Big Q for sound/OSS */ | 1130 | /* Big Q for sound/OSS */ |
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index bc7115403f38..bfc2e0f78f00 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/scatterlist.h> | 35 | #include <linux/scatterlist.h> |
| 36 | #include <linux/hash.h> | 36 | #include <linux/hash.h> |
| 37 | #include <linux/nsproxy.h> | 37 | #include <linux/nsproxy.h> |
| 38 | #include <linux/backing-dev.h> | ||
| 38 | 39 | ||
| 39 | /* Version verification for shared data structures w/ userspace */ | 40 | /* Version verification for shared data structures w/ userspace */ |
| 40 | #define ECRYPTFS_VERSION_MAJOR 0x00 | 41 | #define ECRYPTFS_VERSION_MAJOR 0x00 |
| @@ -393,6 +394,7 @@ struct ecryptfs_mount_crypt_stat { | |||
| 393 | struct ecryptfs_sb_info { | 394 | struct ecryptfs_sb_info { |
| 394 | struct super_block *wsi_sb; | 395 | struct super_block *wsi_sb; |
| 395 | struct ecryptfs_mount_crypt_stat mount_crypt_stat; | 396 | struct ecryptfs_mount_crypt_stat mount_crypt_stat; |
| 397 | struct backing_dev_info bdi; | ||
| 396 | }; | 398 | }; |
| 397 | 399 | ||
| 398 | /* file private data. */ | 400 | /* file private data. */ |
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index af1a8f01ebac..760983d0f25e 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
| @@ -497,17 +497,25 @@ struct kmem_cache *ecryptfs_sb_info_cache; | |||
| 497 | static int | 497 | static int |
| 498 | ecryptfs_fill_super(struct super_block *sb, void *raw_data, int silent) | 498 | ecryptfs_fill_super(struct super_block *sb, void *raw_data, int silent) |
| 499 | { | 499 | { |
| 500 | struct ecryptfs_sb_info *esi; | ||
| 500 | int rc = 0; | 501 | int rc = 0; |
| 501 | 502 | ||
| 502 | /* Released in ecryptfs_put_super() */ | 503 | /* Released in ecryptfs_put_super() */ |
| 503 | ecryptfs_set_superblock_private(sb, | 504 | ecryptfs_set_superblock_private(sb, |
| 504 | kmem_cache_zalloc(ecryptfs_sb_info_cache, | 505 | kmem_cache_zalloc(ecryptfs_sb_info_cache, |
| 505 | GFP_KERNEL)); | 506 | GFP_KERNEL)); |
| 506 | if (!ecryptfs_superblock_to_private(sb)) { | 507 | esi = ecryptfs_superblock_to_private(sb); |
| 508 | if (!esi) { | ||
| 507 | ecryptfs_printk(KERN_WARNING, "Out of memory\n"); | 509 | ecryptfs_printk(KERN_WARNING, "Out of memory\n"); |
| 508 | rc = -ENOMEM; | 510 | rc = -ENOMEM; |
| 509 | goto out; | 511 | goto out; |
| 510 | } | 512 | } |
| 513 | |||
| 514 | rc = bdi_setup_and_register(&esi->bdi, "ecryptfs", BDI_CAP_MAP_COPY); | ||
| 515 | if (rc) | ||
| 516 | goto out; | ||
| 517 | |||
| 518 | sb->s_bdi = &esi->bdi; | ||
| 511 | sb->s_op = &ecryptfs_sops; | 519 | sb->s_op = &ecryptfs_sops; |
| 512 | /* Released through deactivate_super(sb) from get_sb_nodev */ | 520 | /* Released through deactivate_super(sb) from get_sb_nodev */ |
| 513 | sb->s_root = d_alloc(NULL, &(const struct qstr) { | 521 | sb->s_root = d_alloc(NULL, &(const struct qstr) { |
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c index 278743c7716a..0c0ae491d231 100644 --- a/fs/ecryptfs/super.c +++ b/fs/ecryptfs/super.c | |||
| @@ -122,6 +122,7 @@ static void ecryptfs_put_super(struct super_block *sb) | |||
| 122 | lock_kernel(); | 122 | lock_kernel(); |
| 123 | 123 | ||
| 124 | ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat); | 124 | ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat); |
| 125 | bdi_destroy(&sb_info->bdi); | ||
| 125 | kmem_cache_free(ecryptfs_sb_info_cache, sb_info); | 126 | kmem_cache_free(ecryptfs_sb_info_cache, sb_info); |
| 126 | ecryptfs_set_superblock_private(sb, NULL); | 127 | ecryptfs_set_superblock_private(sb, NULL); |
| 127 | 128 | ||
diff --git a/fs/exofs/exofs.h b/fs/exofs/exofs.h index 8442e353309f..22721b2fd890 100644 --- a/fs/exofs/exofs.h +++ b/fs/exofs/exofs.h | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/fs.h> | 36 | #include <linux/fs.h> |
| 37 | #include <linux/time.h> | 37 | #include <linux/time.h> |
| 38 | #include <linux/backing-dev.h> | ||
| 38 | #include "common.h" | 39 | #include "common.h" |
| 39 | 40 | ||
| 40 | /* FIXME: Remove once pnfs hits mainline | 41 | /* FIXME: Remove once pnfs hits mainline |
| @@ -84,6 +85,7 @@ struct exofs_sb_info { | |||
| 84 | u32 s_next_generation; /* next gen # to use */ | 85 | u32 s_next_generation; /* next gen # to use */ |
| 85 | atomic_t s_curr_pending; /* number of pending commands */ | 86 | atomic_t s_curr_pending; /* number of pending commands */ |
| 86 | uint8_t s_cred[OSD_CAP_LEN]; /* credential for the fscb */ | 87 | uint8_t s_cred[OSD_CAP_LEN]; /* credential for the fscb */ |
| 88 | struct backing_dev_info bdi; /* register our bdi with VFS */ | ||
| 87 | 89 | ||
| 88 | struct pnfs_osd_data_map data_map; /* Default raid to use | 90 | struct pnfs_osd_data_map data_map; /* Default raid to use |
| 89 | * FIXME: Needed ? | 91 | * FIXME: Needed ? |
diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 18e57ea1e5b4..03149b9a5178 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c | |||
| @@ -302,6 +302,7 @@ static void exofs_put_super(struct super_block *sb) | |||
| 302 | _exofs_print_device("Unmounting", NULL, sbi->layout.s_ods[0], | 302 | _exofs_print_device("Unmounting", NULL, sbi->layout.s_ods[0], |
| 303 | sbi->layout.s_pid); | 303 | sbi->layout.s_pid); |
| 304 | 304 | ||
| 305 | bdi_destroy(&sbi->bdi); | ||
| 305 | exofs_free_sbi(sbi); | 306 | exofs_free_sbi(sbi); |
| 306 | sb->s_fs_info = NULL; | 307 | sb->s_fs_info = NULL; |
| 307 | } | 308 | } |
| @@ -546,6 +547,10 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 546 | if (!sbi) | 547 | if (!sbi) |
| 547 | return -ENOMEM; | 548 | return -ENOMEM; |
| 548 | 549 | ||
| 550 | ret = bdi_setup_and_register(&sbi->bdi, "exofs", BDI_CAP_MAP_COPY); | ||
| 551 | if (ret) | ||
| 552 | goto free_bdi; | ||
| 553 | |||
| 549 | /* use mount options to fill superblock */ | 554 | /* use mount options to fill superblock */ |
| 550 | od = osduld_path_lookup(opts->dev_name); | 555 | od = osduld_path_lookup(opts->dev_name); |
| 551 | if (IS_ERR(od)) { | 556 | if (IS_ERR(od)) { |
| @@ -612,6 +617,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 612 | } | 617 | } |
| 613 | 618 | ||
| 614 | /* set up operation vectors */ | 619 | /* set up operation vectors */ |
| 620 | sb->s_bdi = &sbi->bdi; | ||
| 615 | sb->s_fs_info = sbi; | 621 | sb->s_fs_info = sbi; |
| 616 | sb->s_op = &exofs_sops; | 622 | sb->s_op = &exofs_sops; |
| 617 | sb->s_export_op = &exofs_export_ops; | 623 | sb->s_export_op = &exofs_export_ops; |
| @@ -643,6 +649,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 643 | return 0; | 649 | return 0; |
| 644 | 650 | ||
| 645 | free_sbi: | 651 | free_sbi: |
| 652 | bdi_destroy(&sbi->bdi); | ||
| 653 | free_bdi: | ||
| 646 | EXOFS_ERR("Unable to mount exofs on %s pid=0x%llx err=%d\n", | 654 | EXOFS_ERR("Unable to mount exofs on %s pid=0x%llx err=%d\n", |
| 647 | opts->dev_name, sbi->layout.s_pid, ret); | 655 | opts->dev_name, sbi->layout.s_pid, ret); |
| 648 | exofs_free_sbi(sbi); | 656 | exofs_free_sbi(sbi); |
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 94c8ee81f5e1..236b834b4ca8 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -3879,6 +3879,7 @@ static int ext4_xattr_fiemap(struct inode *inode, | |||
| 3879 | physical += offset; | 3879 | physical += offset; |
| 3880 | length = EXT4_SB(inode->i_sb)->s_inode_size - offset; | 3880 | length = EXT4_SB(inode->i_sb)->s_inode_size - offset; |
| 3881 | flags |= FIEMAP_EXTENT_DATA_INLINE; | 3881 | flags |= FIEMAP_EXTENT_DATA_INLINE; |
| 3882 | brelse(iloc.bh); | ||
| 3882 | } else { /* external block */ | 3883 | } else { /* external block */ |
| 3883 | physical = EXT4_I(inode)->i_file_acl << blockbits; | 3884 | physical = EXT4_I(inode)->i_file_acl << blockbits; |
| 3884 | length = inode->i_sb->s_blocksize; | 3885 | length = inode->i_sb->s_blocksize; |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 5381802d6052..81d605412844 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -5375,7 +5375,7 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
| 5375 | } else { | 5375 | } else { |
| 5376 | struct ext4_iloc iloc; | 5376 | struct ext4_iloc iloc; |
| 5377 | 5377 | ||
| 5378 | err = ext4_get_inode_loc(inode, &iloc); | 5378 | err = __ext4_get_inode_loc(inode, &iloc, 0); |
| 5379 | if (err) | 5379 | if (err) |
| 5380 | return err; | 5380 | return err; |
| 5381 | if (wbc->sync_mode == WB_SYNC_ALL) | 5381 | if (wbc->sync_mode == WB_SYNC_ALL) |
| @@ -5386,6 +5386,7 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
| 5386 | (unsigned long long)iloc.bh->b_blocknr); | 5386 | (unsigned long long)iloc.bh->b_blocknr); |
| 5387 | err = -EIO; | 5387 | err = -EIO; |
| 5388 | } | 5388 | } |
| 5389 | brelse(iloc.bh); | ||
| 5389 | } | 5390 | } |
| 5390 | return err; | 5391 | return err; |
| 5391 | } | 5392 | } |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index bde9d0b170c2..b423a364dca3 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
| @@ -2535,6 +2535,17 @@ static void release_blocks_on_commit(journal_t *journal, transaction_t *txn) | |||
| 2535 | mb_debug(1, "gonna free %u blocks in group %u (0x%p):", | 2535 | mb_debug(1, "gonna free %u blocks in group %u (0x%p):", |
| 2536 | entry->count, entry->group, entry); | 2536 | entry->count, entry->group, entry); |
| 2537 | 2537 | ||
| 2538 | if (test_opt(sb, DISCARD)) { | ||
| 2539 | ext4_fsblk_t discard_block; | ||
| 2540 | |||
| 2541 | discard_block = entry->start_blk + | ||
| 2542 | ext4_group_first_block_no(sb, entry->group); | ||
| 2543 | trace_ext4_discard_blocks(sb, | ||
| 2544 | (unsigned long long)discard_block, | ||
| 2545 | entry->count); | ||
| 2546 | sb_issue_discard(sb, discard_block, entry->count); | ||
| 2547 | } | ||
| 2548 | |||
| 2538 | err = ext4_mb_load_buddy(sb, entry->group, &e4b); | 2549 | err = ext4_mb_load_buddy(sb, entry->group, &e4b); |
| 2539 | /* we expect to find existing buddy because it's pinned */ | 2550 | /* we expect to find existing buddy because it's pinned */ |
| 2540 | BUG_ON(err != 0); | 2551 | BUG_ON(err != 0); |
| @@ -2556,16 +2567,6 @@ static void release_blocks_on_commit(journal_t *journal, transaction_t *txn) | |||
| 2556 | page_cache_release(e4b.bd_bitmap_page); | 2567 | page_cache_release(e4b.bd_bitmap_page); |
| 2557 | } | 2568 | } |
| 2558 | ext4_unlock_group(sb, entry->group); | 2569 | ext4_unlock_group(sb, entry->group); |
| 2559 | if (test_opt(sb, DISCARD)) { | ||
| 2560 | ext4_fsblk_t discard_block; | ||
| 2561 | |||
| 2562 | discard_block = entry->start_blk + | ||
| 2563 | ext4_group_first_block_no(sb, entry->group); | ||
| 2564 | trace_ext4_discard_blocks(sb, | ||
| 2565 | (unsigned long long)discard_block, | ||
| 2566 | entry->count); | ||
| 2567 | sb_issue_discard(sb, discard_block, entry->count); | ||
| 2568 | } | ||
| 2569 | kmem_cache_free(ext4_free_ext_cachep, entry); | 2570 | kmem_cache_free(ext4_free_ext_cachep, entry); |
| 2570 | ext4_mb_release_desc(&e4b); | 2571 | ext4_mb_release_desc(&e4b); |
| 2571 | } | 2572 | } |
diff --git a/fs/ioctl.c b/fs/ioctl.c index 6c751106c2e5..7faefb4da939 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -228,14 +228,23 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg) | |||
| 228 | 228 | ||
| 229 | #ifdef CONFIG_BLOCK | 229 | #ifdef CONFIG_BLOCK |
| 230 | 230 | ||
| 231 | #define blk_to_logical(inode, blk) (blk << (inode)->i_blkbits) | 231 | static inline sector_t logical_to_blk(struct inode *inode, loff_t offset) |
| 232 | #define logical_to_blk(inode, offset) (offset >> (inode)->i_blkbits); | 232 | { |
| 233 | return (offset >> inode->i_blkbits); | ||
| 234 | } | ||
| 235 | |||
| 236 | static inline loff_t blk_to_logical(struct inode *inode, sector_t blk) | ||
| 237 | { | ||
| 238 | return (blk << inode->i_blkbits); | ||
| 239 | } | ||
| 233 | 240 | ||
| 234 | /** | 241 | /** |
| 235 | * __generic_block_fiemap - FIEMAP for block based inodes (no locking) | 242 | * __generic_block_fiemap - FIEMAP for block based inodes (no locking) |
| 236 | * @inode - the inode to map | 243 | * @inode: the inode to map |
| 237 | * @arg - the pointer to userspace where we copy everything to | 244 | * @fieinfo: the fiemap info struct that will be passed back to userspace |
| 238 | * @get_block - the fs's get_block function | 245 | * @start: where to start mapping in the inode |
| 246 | * @len: how much space to map | ||
| 247 | * @get_block: the fs's get_block function | ||
| 239 | * | 248 | * |
| 240 | * This does FIEMAP for block based inodes. Basically it will just loop | 249 | * This does FIEMAP for block based inodes. Basically it will just loop |
| 241 | * through get_block until we hit the number of extents we want to map, or we | 250 | * through get_block until we hit the number of extents we want to map, or we |
| @@ -250,58 +259,63 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg) | |||
| 250 | */ | 259 | */ |
| 251 | 260 | ||
| 252 | int __generic_block_fiemap(struct inode *inode, | 261 | int __generic_block_fiemap(struct inode *inode, |
| 253 | struct fiemap_extent_info *fieinfo, u64 start, | 262 | struct fiemap_extent_info *fieinfo, loff_t start, |
| 254 | u64 len, get_block_t *get_block) | 263 | loff_t len, get_block_t *get_block) |
| 255 | { | 264 | { |
| 256 | struct buffer_head tmp; | 265 | struct buffer_head map_bh; |
| 257 | unsigned long long start_blk; | 266 | sector_t start_blk, last_blk; |
| 258 | long long length = 0, map_len = 0; | 267 | loff_t isize = i_size_read(inode); |
| 259 | u64 logical = 0, phys = 0, size = 0; | 268 | u64 logical = 0, phys = 0, size = 0; |
| 260 | u32 flags = FIEMAP_EXTENT_MERGED; | 269 | u32 flags = FIEMAP_EXTENT_MERGED; |
| 261 | int ret = 0, past_eof = 0, whole_file = 0; | 270 | bool past_eof = false, whole_file = false; |
| 271 | int ret = 0; | ||
| 262 | 272 | ||
| 263 | if ((ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC))) | 273 | ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC); |
| 274 | if (ret) | ||
| 264 | return ret; | 275 | return ret; |
| 265 | 276 | ||
| 266 | start_blk = logical_to_blk(inode, start); | 277 | /* |
| 267 | 278 | * Either the i_mutex or other appropriate locking needs to be held | |
| 268 | length = (long long)min_t(u64, len, i_size_read(inode)); | 279 | * since we expect isize to not change at all through the duration of |
| 269 | if (length < len) | 280 | * this call. |
| 270 | whole_file = 1; | 281 | */ |
| 282 | if (len >= isize) { | ||
| 283 | whole_file = true; | ||
| 284 | len = isize; | ||
| 285 | } | ||
| 271 | 286 | ||
| 272 | map_len = length; | 287 | start_blk = logical_to_blk(inode, start); |
| 288 | last_blk = logical_to_blk(inode, start + len - 1); | ||
| 273 | 289 | ||
| 274 | do { | 290 | do { |
| 275 | /* | 291 | /* |
| 276 | * we set b_size to the total size we want so it will map as | 292 | * we set b_size to the total size we want so it will map as |
| 277 | * many contiguous blocks as possible at once | 293 | * many contiguous blocks as possible at once |
| 278 | */ | 294 | */ |
| 279 | memset(&tmp, 0, sizeof(struct buffer_head)); | 295 | memset(&map_bh, 0, sizeof(struct buffer_head)); |
| 280 | tmp.b_size = map_len; | 296 | map_bh.b_size = len; |
| 281 | 297 | ||
| 282 | ret = get_block(inode, start_blk, &tmp, 0); | 298 | ret = get_block(inode, start_blk, &map_bh, 0); |
| 283 | if (ret) | 299 | if (ret) |
| 284 | break; | 300 | break; |
| 285 | 301 | ||
| 286 | /* HOLE */ | 302 | /* HOLE */ |
| 287 | if (!buffer_mapped(&tmp)) { | 303 | if (!buffer_mapped(&map_bh)) { |
| 288 | length -= blk_to_logical(inode, 1); | ||
| 289 | start_blk++; | 304 | start_blk++; |
| 290 | 305 | ||
| 291 | /* | 306 | /* |
| 292 | * we want to handle the case where there is an | 307 | * We want to handle the case where there is an |
| 293 | * allocated block at the front of the file, and then | 308 | * allocated block at the front of the file, and then |
| 294 | * nothing but holes up to the end of the file properly, | 309 | * nothing but holes up to the end of the file properly, |
| 295 | * to make sure that extent at the front gets properly | 310 | * to make sure that extent at the front gets properly |
| 296 | * marked with FIEMAP_EXTENT_LAST | 311 | * marked with FIEMAP_EXTENT_LAST |
| 297 | */ | 312 | */ |
| 298 | if (!past_eof && | 313 | if (!past_eof && |
| 299 | blk_to_logical(inode, start_blk) >= | 314 | blk_to_logical(inode, start_blk) >= isize) |
| 300 | blk_to_logical(inode, 0)+i_size_read(inode)) | ||
| 301 | past_eof = 1; | 315 | past_eof = 1; |
| 302 | 316 | ||
| 303 | /* | 317 | /* |
| 304 | * first hole after going past the EOF, this is our | 318 | * First hole after going past the EOF, this is our |
| 305 | * last extent | 319 | * last extent |
| 306 | */ | 320 | */ |
| 307 | if (past_eof && size) { | 321 | if (past_eof && size) { |
| @@ -309,15 +323,18 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 309 | ret = fiemap_fill_next_extent(fieinfo, logical, | 323 | ret = fiemap_fill_next_extent(fieinfo, logical, |
| 310 | phys, size, | 324 | phys, size, |
| 311 | flags); | 325 | flags); |
| 312 | break; | 326 | } else if (size) { |
| 327 | ret = fiemap_fill_next_extent(fieinfo, logical, | ||
| 328 | phys, size, flags); | ||
| 329 | size = 0; | ||
| 313 | } | 330 | } |
| 314 | 331 | ||
| 315 | /* if we have holes up to/past EOF then we're done */ | 332 | /* if we have holes up to/past EOF then we're done */ |
| 316 | if (length <= 0 || past_eof) | 333 | if (start_blk > last_blk || past_eof || ret) |
| 317 | break; | 334 | break; |
| 318 | } else { | 335 | } else { |
| 319 | /* | 336 | /* |
| 320 | * we have gone over the length of what we wanted to | 337 | * We have gone over the length of what we wanted to |
| 321 | * map, and it wasn't the entire file, so add the extent | 338 | * map, and it wasn't the entire file, so add the extent |
| 322 | * we got last time and exit. | 339 | * we got last time and exit. |
| 323 | * | 340 | * |
| @@ -331,7 +348,7 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 331 | * are good to go, just add the extent to the fieinfo | 348 | * are good to go, just add the extent to the fieinfo |
| 332 | * and break | 349 | * and break |
| 333 | */ | 350 | */ |
| 334 | if (length <= 0 && !whole_file) { | 351 | if (start_blk > last_blk && !whole_file) { |
| 335 | ret = fiemap_fill_next_extent(fieinfo, logical, | 352 | ret = fiemap_fill_next_extent(fieinfo, logical, |
| 336 | phys, size, | 353 | phys, size, |
| 337 | flags); | 354 | flags); |
| @@ -351,11 +368,10 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 351 | } | 368 | } |
| 352 | 369 | ||
| 353 | logical = blk_to_logical(inode, start_blk); | 370 | logical = blk_to_logical(inode, start_blk); |
| 354 | phys = blk_to_logical(inode, tmp.b_blocknr); | 371 | phys = blk_to_logical(inode, map_bh.b_blocknr); |
| 355 | size = tmp.b_size; | 372 | size = map_bh.b_size; |
| 356 | flags = FIEMAP_EXTENT_MERGED; | 373 | flags = FIEMAP_EXTENT_MERGED; |
| 357 | 374 | ||
| 358 | length -= tmp.b_size; | ||
| 359 | start_blk += logical_to_blk(inode, size); | 375 | start_blk += logical_to_blk(inode, size); |
| 360 | 376 | ||
| 361 | /* | 377 | /* |
| @@ -363,15 +379,13 @@ int __generic_block_fiemap(struct inode *inode, | |||
| 363 | * soon as we find a hole that the last extent we found | 379 | * soon as we find a hole that the last extent we found |
| 364 | * is marked with FIEMAP_EXTENT_LAST | 380 | * is marked with FIEMAP_EXTENT_LAST |
| 365 | */ | 381 | */ |
| 366 | if (!past_eof && | 382 | if (!past_eof && logical + size >= isize) |
| 367 | logical+size >= | 383 | past_eof = true; |
| 368 | blk_to_logical(inode, 0)+i_size_read(inode)) | ||
| 369 | past_eof = 1; | ||
| 370 | } | 384 | } |
| 371 | cond_resched(); | 385 | cond_resched(); |
| 372 | } while (1); | 386 | } while (1); |
| 373 | 387 | ||
| 374 | /* if ret is 1 then we just hit the end of the extent array */ | 388 | /* If ret is 1 then we just hit the end of the extent array */ |
| 375 | if (ret == 1) | 389 | if (ret == 1) |
| 376 | ret = 0; | 390 | ret = 0; |
| 377 | 391 | ||
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index cf98da1be23e..fa3385154023 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
| @@ -526,10 +526,15 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
| 526 | sb->s_blocksize_bits = 10; | 526 | sb->s_blocksize_bits = 10; |
| 527 | sb->s_magic = NCP_SUPER_MAGIC; | 527 | sb->s_magic = NCP_SUPER_MAGIC; |
| 528 | sb->s_op = &ncp_sops; | 528 | sb->s_op = &ncp_sops; |
| 529 | sb->s_bdi = &server->bdi; | ||
| 529 | 530 | ||
| 530 | server = NCP_SBP(sb); | 531 | server = NCP_SBP(sb); |
| 531 | memset(server, 0, sizeof(*server)); | 532 | memset(server, 0, sizeof(*server)); |
| 532 | 533 | ||
| 534 | error = bdi_setup_and_register(&server->bdi, "ncpfs", BDI_CAP_MAP_COPY); | ||
| 535 | if (error) | ||
| 536 | goto out_bdi; | ||
| 537 | |||
| 533 | server->ncp_filp = ncp_filp; | 538 | server->ncp_filp = ncp_filp; |
| 534 | server->ncp_sock = sock; | 539 | server->ncp_sock = sock; |
| 535 | 540 | ||
| @@ -719,6 +724,8 @@ out_fput2: | |||
| 719 | if (server->info_filp) | 724 | if (server->info_filp) |
| 720 | fput(server->info_filp); | 725 | fput(server->info_filp); |
| 721 | out_fput: | 726 | out_fput: |
| 727 | bdi_destroy(&server->bdi); | ||
| 728 | out_bdi: | ||
| 722 | /* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>: | 729 | /* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>: |
| 723 | * | 730 | * |
| 724 | * The previously used put_filp(ncp_filp); was bogous, since | 731 | * The previously used put_filp(ncp_filp); was bogous, since |
| @@ -756,6 +763,7 @@ static void ncp_put_super(struct super_block *sb) | |||
| 756 | kill_pid(server->m.wdog_pid, SIGTERM, 1); | 763 | kill_pid(server->m.wdog_pid, SIGTERM, 1); |
| 757 | put_pid(server->m.wdog_pid); | 764 | put_pid(server->m.wdog_pid); |
| 758 | 765 | ||
| 766 | bdi_destroy(&server->bdi); | ||
| 759 | kfree(server->priv.data); | 767 | kfree(server->priv.data); |
| 760 | kfree(server->auth.object_name); | 768 | kfree(server->auth.object_name); |
| 761 | vfree(server->rxbuf); | 769 | vfree(server->rxbuf); |
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index a8766c4ef2e0..acc9c4943b84 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
| @@ -966,6 +966,8 @@ out_error: | |||
| 966 | static void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *source) | 966 | static void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *source) |
| 967 | { | 967 | { |
| 968 | target->flags = source->flags; | 968 | target->flags = source->flags; |
| 969 | target->rsize = source->rsize; | ||
| 970 | target->wsize = source->wsize; | ||
| 969 | target->acregmin = source->acregmin; | 971 | target->acregmin = source->acregmin; |
| 970 | target->acregmax = source->acregmax; | 972 | target->acregmax = source->acregmax; |
| 971 | target->acdirmin = source->acdirmin; | 973 | target->acdirmin = source->acdirmin; |
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index be46f26c9a56..a7bb5c694aa3 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -837,6 +837,8 @@ out_zap_parent: | |||
| 837 | /* If we have submounts, don't unhash ! */ | 837 | /* If we have submounts, don't unhash ! */ |
| 838 | if (have_submounts(dentry)) | 838 | if (have_submounts(dentry)) |
| 839 | goto out_valid; | 839 | goto out_valid; |
| 840 | if (dentry->d_flags & DCACHE_DISCONNECTED) | ||
| 841 | goto out_valid; | ||
| 840 | shrink_dcache_parent(dentry); | 842 | shrink_dcache_parent(dentry); |
| 841 | } | 843 | } |
| 842 | d_drop(dentry); | 844 | d_drop(dentry); |
| @@ -1050,7 +1052,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
| 1050 | struct inode *dir; | 1052 | struct inode *dir; |
| 1051 | int openflags, ret = 0; | 1053 | int openflags, ret = 0; |
| 1052 | 1054 | ||
| 1053 | if (!is_atomic_open(nd)) | 1055 | if (!is_atomic_open(nd) || d_mountpoint(dentry)) |
| 1054 | goto no_open; | 1056 | goto no_open; |
| 1055 | parent = dget_parent(dentry); | 1057 | parent = dget_parent(dentry); |
| 1056 | dir = parent->d_inode; | 1058 | dir = parent->d_inode; |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 638067007c65..071fcedd517c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -5218,9 +5218,12 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp) | |||
| 5218 | msg.rpc_resp = &calldata->res; | 5218 | msg.rpc_resp = &calldata->res; |
| 5219 | task_setup_data.callback_data = calldata; | 5219 | task_setup_data.callback_data = calldata; |
| 5220 | task = rpc_run_task(&task_setup_data); | 5220 | task = rpc_run_task(&task_setup_data); |
| 5221 | if (IS_ERR(task)) | 5221 | if (IS_ERR(task)) { |
| 5222 | status = PTR_ERR(task); | 5222 | status = PTR_ERR(task); |
| 5223 | goto out; | ||
| 5224 | } | ||
| 5223 | rpc_put_task(task); | 5225 | rpc_put_task(task); |
| 5226 | return 0; | ||
| 5224 | out: | 5227 | out: |
| 5225 | dprintk("<-- %s status=%d\n", __func__, status); | 5228 | dprintk("<-- %s status=%d\n", __func__, status); |
| 5226 | return status; | 5229 | return status; |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index e01637240eeb..b4148fc00f9f 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -2187,6 +2187,7 @@ static int nfs_get_sb(struct file_system_type *fs_type, | |||
| 2187 | if (data->version == 4) { | 2187 | if (data->version == 4) { |
| 2188 | error = nfs4_try_mount(flags, dev_name, data, mnt); | 2188 | error = nfs4_try_mount(flags, dev_name, data, mnt); |
| 2189 | kfree(data->client_address); | 2189 | kfree(data->client_address); |
| 2190 | kfree(data->nfs_server.export_path); | ||
| 2190 | goto out; | 2191 | goto out; |
| 2191 | } | 2192 | } |
| 2192 | #endif /* CONFIG_NFS_V4 */ | 2193 | #endif /* CONFIG_NFS_V4 */ |
| @@ -2657,7 +2658,7 @@ static void nfs_fix_devname(const struct path *path, struct vfsmount *mnt) | |||
| 2657 | devname = nfs_path(path->mnt->mnt_devname, | 2658 | devname = nfs_path(path->mnt->mnt_devname, |
| 2658 | path->mnt->mnt_root, path->dentry, | 2659 | path->mnt->mnt_root, path->dentry, |
| 2659 | page, PAGE_SIZE); | 2660 | page, PAGE_SIZE); |
| 2660 | if (devname == NULL) | 2661 | if (IS_ERR(devname)) |
| 2661 | goto out_freepage; | 2662 | goto out_freepage; |
| 2662 | tmp = kstrdup(devname, GFP_KERNEL); | 2663 | tmp = kstrdup(devname, GFP_KERNEL); |
| 2663 | if (tmp == NULL) | 2664 | if (tmp == NULL) |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index de38d63aa920..3aea3ca98ab7 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -1201,6 +1201,25 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) | |||
| 1201 | 1201 | ||
| 1202 | 1202 | ||
| 1203 | #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) | 1203 | #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) |
| 1204 | static int nfs_commit_set_lock(struct nfs_inode *nfsi, int may_wait) | ||
| 1205 | { | ||
| 1206 | if (!test_and_set_bit(NFS_INO_COMMIT, &nfsi->flags)) | ||
| 1207 | return 1; | ||
| 1208 | if (may_wait && !out_of_line_wait_on_bit_lock(&nfsi->flags, | ||
| 1209 | NFS_INO_COMMIT, nfs_wait_bit_killable, | ||
| 1210 | TASK_KILLABLE)) | ||
| 1211 | return 1; | ||
| 1212 | return 0; | ||
| 1213 | } | ||
| 1214 | |||
| 1215 | static void nfs_commit_clear_lock(struct nfs_inode *nfsi) | ||
| 1216 | { | ||
| 1217 | clear_bit(NFS_INO_COMMIT, &nfsi->flags); | ||
| 1218 | smp_mb__after_clear_bit(); | ||
| 1219 | wake_up_bit(&nfsi->flags, NFS_INO_COMMIT); | ||
| 1220 | } | ||
| 1221 | |||
| 1222 | |||
| 1204 | static void nfs_commitdata_release(void *data) | 1223 | static void nfs_commitdata_release(void *data) |
| 1205 | { | 1224 | { |
| 1206 | struct nfs_write_data *wdata = data; | 1225 | struct nfs_write_data *wdata = data; |
| @@ -1262,8 +1281,6 @@ static int nfs_commit_rpcsetup(struct list_head *head, | |||
| 1262 | task = rpc_run_task(&task_setup_data); | 1281 | task = rpc_run_task(&task_setup_data); |
| 1263 | if (IS_ERR(task)) | 1282 | if (IS_ERR(task)) |
| 1264 | return PTR_ERR(task); | 1283 | return PTR_ERR(task); |
| 1265 | if (how & FLUSH_SYNC) | ||
| 1266 | rpc_wait_for_completion_task(task); | ||
| 1267 | rpc_put_task(task); | 1284 | rpc_put_task(task); |
| 1268 | return 0; | 1285 | return 0; |
| 1269 | } | 1286 | } |
| @@ -1294,6 +1311,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how) | |||
| 1294 | BDI_RECLAIMABLE); | 1311 | BDI_RECLAIMABLE); |
| 1295 | nfs_clear_page_tag_locked(req); | 1312 | nfs_clear_page_tag_locked(req); |
| 1296 | } | 1313 | } |
| 1314 | nfs_commit_clear_lock(NFS_I(inode)); | ||
| 1297 | return -ENOMEM; | 1315 | return -ENOMEM; |
| 1298 | } | 1316 | } |
| 1299 | 1317 | ||
| @@ -1349,6 +1367,7 @@ static void nfs_commit_release(void *calldata) | |||
| 1349 | next: | 1367 | next: |
| 1350 | nfs_clear_page_tag_locked(req); | 1368 | nfs_clear_page_tag_locked(req); |
| 1351 | } | 1369 | } |
| 1370 | nfs_commit_clear_lock(NFS_I(data->inode)); | ||
| 1352 | nfs_commitdata_release(calldata); | 1371 | nfs_commitdata_release(calldata); |
| 1353 | } | 1372 | } |
| 1354 | 1373 | ||
| @@ -1363,8 +1382,11 @@ static const struct rpc_call_ops nfs_commit_ops = { | |||
| 1363 | static int nfs_commit_inode(struct inode *inode, int how) | 1382 | static int nfs_commit_inode(struct inode *inode, int how) |
| 1364 | { | 1383 | { |
| 1365 | LIST_HEAD(head); | 1384 | LIST_HEAD(head); |
| 1366 | int res; | 1385 | int may_wait = how & FLUSH_SYNC; |
| 1386 | int res = 0; | ||
| 1367 | 1387 | ||
| 1388 | if (!nfs_commit_set_lock(NFS_I(inode), may_wait)) | ||
| 1389 | goto out; | ||
| 1368 | spin_lock(&inode->i_lock); | 1390 | spin_lock(&inode->i_lock); |
| 1369 | res = nfs_scan_commit(inode, &head, 0, 0); | 1391 | res = nfs_scan_commit(inode, &head, 0, 0); |
| 1370 | spin_unlock(&inode->i_lock); | 1392 | spin_unlock(&inode->i_lock); |
| @@ -1372,7 +1394,13 @@ static int nfs_commit_inode(struct inode *inode, int how) | |||
| 1372 | int error = nfs_commit_list(inode, &head, how); | 1394 | int error = nfs_commit_list(inode, &head, how); |
| 1373 | if (error < 0) | 1395 | if (error < 0) |
| 1374 | return error; | 1396 | return error; |
| 1375 | } | 1397 | if (may_wait) |
| 1398 | wait_on_bit(&NFS_I(inode)->flags, NFS_INO_COMMIT, | ||
| 1399 | nfs_wait_bit_killable, | ||
| 1400 | TASK_KILLABLE); | ||
| 1401 | } else | ||
| 1402 | nfs_commit_clear_lock(NFS_I(inode)); | ||
| 1403 | out: | ||
| 1376 | return res; | 1404 | return res; |
| 1377 | } | 1405 | } |
| 1378 | 1406 | ||
| @@ -1444,6 +1472,7 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page) | |||
| 1444 | 1472 | ||
| 1445 | BUG_ON(!PageLocked(page)); | 1473 | BUG_ON(!PageLocked(page)); |
| 1446 | for (;;) { | 1474 | for (;;) { |
| 1475 | wait_on_page_writeback(page); | ||
| 1447 | req = nfs_page_find_request(page); | 1476 | req = nfs_page_find_request(page); |
| 1448 | if (req == NULL) | 1477 | if (req == NULL) |
| 1449 | break; | 1478 | break; |
| @@ -1478,30 +1507,18 @@ int nfs_wb_page(struct inode *inode, struct page *page) | |||
| 1478 | .range_start = range_start, | 1507 | .range_start = range_start, |
| 1479 | .range_end = range_end, | 1508 | .range_end = range_end, |
| 1480 | }; | 1509 | }; |
| 1481 | struct nfs_page *req; | ||
| 1482 | int need_commit; | ||
| 1483 | int ret; | 1510 | int ret; |
| 1484 | 1511 | ||
| 1485 | while(PagePrivate(page)) { | 1512 | while(PagePrivate(page)) { |
| 1513 | wait_on_page_writeback(page); | ||
| 1486 | if (clear_page_dirty_for_io(page)) { | 1514 | if (clear_page_dirty_for_io(page)) { |
| 1487 | ret = nfs_writepage_locked(page, &wbc); | 1515 | ret = nfs_writepage_locked(page, &wbc); |
| 1488 | if (ret < 0) | 1516 | if (ret < 0) |
| 1489 | goto out_error; | 1517 | goto out_error; |
| 1490 | } | 1518 | } |
| 1491 | req = nfs_find_and_lock_request(page); | 1519 | ret = sync_inode(inode, &wbc); |
| 1492 | if (!req) | 1520 | if (ret < 0) |
| 1493 | break; | ||
| 1494 | if (IS_ERR(req)) { | ||
| 1495 | ret = PTR_ERR(req); | ||
| 1496 | goto out_error; | 1521 | goto out_error; |
| 1497 | } | ||
| 1498 | need_commit = test_bit(PG_CLEAN, &req->wb_flags); | ||
| 1499 | nfs_clear_page_tag_locked(req); | ||
| 1500 | if (need_commit) { | ||
| 1501 | ret = nfs_commit_inode(inode, FLUSH_SYNC); | ||
| 1502 | if (ret < 0) | ||
| 1503 | goto out_error; | ||
| 1504 | } | ||
| 1505 | } | 1522 | } |
| 1506 | return 0; | 1523 | return 0; |
| 1507 | out_error: | 1524 | out_error: |
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index e1703175ee28..34ccf815ea8a 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
| @@ -161,10 +161,10 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) | |||
| 161 | argp->p = page_address(argp->pagelist[0]); | 161 | argp->p = page_address(argp->pagelist[0]); |
| 162 | argp->pagelist++; | 162 | argp->pagelist++; |
| 163 | if (argp->pagelen < PAGE_SIZE) { | 163 | if (argp->pagelen < PAGE_SIZE) { |
| 164 | argp->end = p + (argp->pagelen>>2); | 164 | argp->end = argp->p + (argp->pagelen>>2); |
| 165 | argp->pagelen = 0; | 165 | argp->pagelen = 0; |
| 166 | } else { | 166 | } else { |
| 167 | argp->end = p + (PAGE_SIZE>>2); | 167 | argp->end = argp->p + (PAGE_SIZE>>2); |
| 168 | argp->pagelen -= PAGE_SIZE; | 168 | argp->pagelen -= PAGE_SIZE; |
| 169 | } | 169 | } |
| 170 | memcpy(((char*)p)+avail, argp->p, (nbytes - avail)); | 170 | memcpy(((char*)p)+avail, argp->p, (nbytes - avail)); |
| @@ -1426,10 +1426,10 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) | |||
| 1426 | argp->p = page_address(argp->pagelist[0]); | 1426 | argp->p = page_address(argp->pagelist[0]); |
| 1427 | argp->pagelist++; | 1427 | argp->pagelist++; |
| 1428 | if (argp->pagelen < PAGE_SIZE) { | 1428 | if (argp->pagelen < PAGE_SIZE) { |
| 1429 | argp->end = p + (argp->pagelen>>2); | 1429 | argp->end = argp->p + (argp->pagelen>>2); |
| 1430 | argp->pagelen = 0; | 1430 | argp->pagelen = 0; |
| 1431 | } else { | 1431 | } else { |
| 1432 | argp->end = p + (PAGE_SIZE>>2); | 1432 | argp->end = argp->p + (PAGE_SIZE>>2); |
| 1433 | argp->pagelen -= PAGE_SIZE; | 1433 | argp->pagelen -= PAGE_SIZE; |
| 1434 | } | 1434 | } |
| 1435 | } | 1435 | } |
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 0cdbc5e7655a..48145f505a6a 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
| @@ -749,6 +749,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent, | |||
| 749 | sb->s_export_op = &nilfs_export_ops; | 749 | sb->s_export_op = &nilfs_export_ops; |
| 750 | sb->s_root = NULL; | 750 | sb->s_root = NULL; |
| 751 | sb->s_time_gran = 1; | 751 | sb->s_time_gran = 1; |
| 752 | sb->s_bdi = nilfs->ns_bdi; | ||
| 752 | 753 | ||
| 753 | err = load_nilfs(nilfs, sbi); | 754 | err = load_nilfs(nilfs, sbi); |
| 754 | if (err) | 755 | if (err) |
diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig index 3e56dbffe729..b3a159b21cfd 100644 --- a/fs/notify/inotify/Kconfig +++ b/fs/notify/inotify/Kconfig | |||
| @@ -15,6 +15,7 @@ config INOTIFY | |||
| 15 | 15 | ||
| 16 | config INOTIFY_USER | 16 | config INOTIFY_USER |
| 17 | bool "Inotify support for userspace" | 17 | bool "Inotify support for userspace" |
| 18 | select ANON_INODES | ||
| 18 | select FSNOTIFY | 19 | select FSNOTIFY |
| 19 | default y | 20 | default y |
| 20 | ---help--- | 21 | ---help--- |
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c index ecebb2276790..f9d5d3ffc75a 100644 --- a/fs/ocfs2/buffer_head_io.c +++ b/fs/ocfs2/buffer_head_io.c | |||
| @@ -406,6 +406,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, | |||
| 406 | struct buffer_head *bh) | 406 | struct buffer_head *bh) |
| 407 | { | 407 | { |
| 408 | int ret = 0; | 408 | int ret = 0; |
| 409 | struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data; | ||
| 409 | 410 | ||
| 410 | mlog_entry_void(); | 411 | mlog_entry_void(); |
| 411 | 412 | ||
| @@ -425,6 +426,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, | |||
| 425 | 426 | ||
| 426 | get_bh(bh); /* for end_buffer_write_sync() */ | 427 | get_bh(bh); /* for end_buffer_write_sync() */ |
| 427 | bh->b_end_io = end_buffer_write_sync; | 428 | bh->b_end_io = end_buffer_write_sync; |
| 429 | ocfs2_compute_meta_ecc(osb->sb, bh->b_data, &di->i_check); | ||
| 428 | submit_bh(WRITE, bh); | 430 | submit_bh(WRITE, bh); |
| 429 | 431 | ||
| 430 | wait_on_buffer(bh); | 432 | wait_on_buffer(bh); |
diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c index a795eb91f4ea..12d5eb78a11a 100644 --- a/fs/ocfs2/dlm/dlmast.c +++ b/fs/ocfs2/dlm/dlmast.c | |||
| @@ -184,9 +184,8 @@ static void dlm_update_lvb(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, | |||
| 184 | BUG_ON(!lksb); | 184 | BUG_ON(!lksb); |
| 185 | 185 | ||
| 186 | /* only updates if this node masters the lockres */ | 186 | /* only updates if this node masters the lockres */ |
| 187 | spin_lock(&res->spinlock); | ||
| 187 | if (res->owner == dlm->node_num) { | 188 | if (res->owner == dlm->node_num) { |
| 188 | |||
| 189 | spin_lock(&res->spinlock); | ||
| 190 | /* check the lksb flags for the direction */ | 189 | /* check the lksb flags for the direction */ |
| 191 | if (lksb->flags & DLM_LKSB_GET_LVB) { | 190 | if (lksb->flags & DLM_LKSB_GET_LVB) { |
| 192 | mlog(0, "getting lvb from lockres for %s node\n", | 191 | mlog(0, "getting lvb from lockres for %s node\n", |
| @@ -201,8 +200,8 @@ static void dlm_update_lvb(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, | |||
| 201 | * here. In the future we might want to clear it at the time | 200 | * here. In the future we might want to clear it at the time |
| 202 | * the put is actually done. | 201 | * the put is actually done. |
| 203 | */ | 202 | */ |
| 204 | spin_unlock(&res->spinlock); | ||
| 205 | } | 203 | } |
| 204 | spin_unlock(&res->spinlock); | ||
| 206 | 205 | ||
| 207 | /* reset any lvb flags on the lksb */ | 206 | /* reset any lvb flags on the lksb */ |
| 208 | lksb->flags &= ~(DLM_LKSB_PUT_LVB|DLM_LKSB_GET_LVB); | 207 | lksb->flags &= ~(DLM_LKSB_PUT_LVB|DLM_LKSB_GET_LVB); |
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 1b0de157a08c..b83d6107a1f5 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c | |||
| @@ -112,20 +112,20 @@ MODULE_PARM_DESC(capabilities, DLMFS_CAPABILITIES); | |||
| 112 | * O_RDONLY -> PRMODE level | 112 | * O_RDONLY -> PRMODE level |
| 113 | * O_WRONLY -> EXMODE level | 113 | * O_WRONLY -> EXMODE level |
| 114 | * | 114 | * |
| 115 | * O_NONBLOCK -> LKM_NOQUEUE | 115 | * O_NONBLOCK -> NOQUEUE |
| 116 | */ | 116 | */ |
| 117 | static int dlmfs_decode_open_flags(int open_flags, | 117 | static int dlmfs_decode_open_flags(int open_flags, |
| 118 | int *level, | 118 | int *level, |
| 119 | int *flags) | 119 | int *flags) |
| 120 | { | 120 | { |
| 121 | if (open_flags & (O_WRONLY|O_RDWR)) | 121 | if (open_flags & (O_WRONLY|O_RDWR)) |
| 122 | *level = LKM_EXMODE; | 122 | *level = DLM_LOCK_EX; |
| 123 | else | 123 | else |
| 124 | *level = LKM_PRMODE; | 124 | *level = DLM_LOCK_PR; |
| 125 | 125 | ||
| 126 | *flags = 0; | 126 | *flags = 0; |
| 127 | if (open_flags & O_NONBLOCK) | 127 | if (open_flags & O_NONBLOCK) |
| 128 | *flags |= LKM_NOQUEUE; | 128 | *flags |= DLM_LKF_NOQUEUE; |
| 129 | 129 | ||
| 130 | return 0; | 130 | return 0; |
| 131 | } | 131 | } |
| @@ -166,7 +166,7 @@ static int dlmfs_file_open(struct inode *inode, | |||
| 166 | * to be able userspace to be able to distinguish a | 166 | * to be able userspace to be able to distinguish a |
| 167 | * valid lock request from one that simply couldn't be | 167 | * valid lock request from one that simply couldn't be |
| 168 | * granted. */ | 168 | * granted. */ |
| 169 | if (flags & LKM_NOQUEUE && status == -EAGAIN) | 169 | if (flags & DLM_LKF_NOQUEUE && status == -EAGAIN) |
| 170 | status = -ETXTBSY; | 170 | status = -ETXTBSY; |
| 171 | kfree(fp); | 171 | kfree(fp); |
| 172 | goto bail; | 172 | goto bail; |
| @@ -193,7 +193,7 @@ static int dlmfs_file_release(struct inode *inode, | |||
| 193 | status = 0; | 193 | status = 0; |
| 194 | if (fp) { | 194 | if (fp) { |
| 195 | level = fp->fp_lock_level; | 195 | level = fp->fp_lock_level; |
| 196 | if (level != LKM_IVMODE) | 196 | if (level != DLM_LOCK_IV) |
| 197 | user_dlm_cluster_unlock(&ip->ip_lockres, level); | 197 | user_dlm_cluster_unlock(&ip->ip_lockres, level); |
| 198 | 198 | ||
| 199 | kfree(fp); | 199 | kfree(fp); |
| @@ -262,7 +262,7 @@ static ssize_t dlmfs_file_read(struct file *filp, | |||
| 262 | if ((count + *ppos) > i_size_read(inode)) | 262 | if ((count + *ppos) > i_size_read(inode)) |
| 263 | readlen = i_size_read(inode) - *ppos; | 263 | readlen = i_size_read(inode) - *ppos; |
| 264 | else | 264 | else |
| 265 | readlen = count - *ppos; | 265 | readlen = count; |
| 266 | 266 | ||
| 267 | lvb_buf = kmalloc(readlen, GFP_NOFS); | 267 | lvb_buf = kmalloc(readlen, GFP_NOFS); |
| 268 | if (!lvb_buf) | 268 | if (!lvb_buf) |
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 17947dc8341e..a5fbd9cea968 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -684,6 +684,7 @@ restarted_transaction: | |||
| 684 | if (why == RESTART_META) { | 684 | if (why == RESTART_META) { |
| 685 | mlog(0, "restarting function.\n"); | 685 | mlog(0, "restarting function.\n"); |
| 686 | restart_func = 1; | 686 | restart_func = 1; |
| 687 | status = 0; | ||
| 687 | } else { | 688 | } else { |
| 688 | BUG_ON(why != RESTART_TRANS); | 689 | BUG_ON(why != RESTART_TRANS); |
| 689 | 690 | ||
| @@ -1981,18 +1982,18 @@ relock: | |||
| 1981 | /* communicate with ocfs2_dio_end_io */ | 1982 | /* communicate with ocfs2_dio_end_io */ |
| 1982 | ocfs2_iocb_set_rw_locked(iocb, rw_level); | 1983 | ocfs2_iocb_set_rw_locked(iocb, rw_level); |
| 1983 | 1984 | ||
| 1984 | if (direct_io) { | 1985 | ret = generic_segment_checks(iov, &nr_segs, &ocount, |
| 1985 | ret = generic_segment_checks(iov, &nr_segs, &ocount, | 1986 | VERIFY_READ); |
| 1986 | VERIFY_READ); | 1987 | if (ret) |
| 1987 | if (ret) | 1988 | goto out_dio; |
| 1988 | goto out_dio; | ||
| 1989 | 1989 | ||
| 1990 | count = ocount; | 1990 | count = ocount; |
| 1991 | ret = generic_write_checks(file, ppos, &count, | 1991 | ret = generic_write_checks(file, ppos, &count, |
| 1992 | S_ISBLK(inode->i_mode)); | 1992 | S_ISBLK(inode->i_mode)); |
| 1993 | if (ret) | 1993 | if (ret) |
| 1994 | goto out_dio; | 1994 | goto out_dio; |
| 1995 | 1995 | ||
| 1996 | if (direct_io) { | ||
| 1996 | written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos, | 1997 | written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos, |
| 1997 | ppos, count, ocount); | 1998 | ppos, count, ocount); |
| 1998 | if (written < 0) { | 1999 | if (written < 0) { |
| @@ -2007,7 +2008,10 @@ relock: | |||
| 2007 | goto out_dio; | 2008 | goto out_dio; |
| 2008 | } | 2009 | } |
| 2009 | } else { | 2010 | } else { |
| 2010 | written = __generic_file_aio_write(iocb, iov, nr_segs, ppos); | 2011 | current->backing_dev_info = file->f_mapping->backing_dev_info; |
| 2012 | written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos, | ||
| 2013 | ppos, count, 0); | ||
| 2014 | current->backing_dev_info = NULL; | ||
| 2011 | } | 2015 | } |
| 2012 | 2016 | ||
| 2013 | out_dio: | 2017 | out_dio: |
| @@ -2021,9 +2025,9 @@ out_dio: | |||
| 2021 | if (ret < 0) | 2025 | if (ret < 0) |
| 2022 | written = ret; | 2026 | written = ret; |
| 2023 | 2027 | ||
| 2024 | if (!ret && (old_size != i_size_read(inode) || | 2028 | if (!ret && ((old_size != i_size_read(inode)) || |
| 2025 | old_clusters != OCFS2_I(inode)->ip_clusters || | 2029 | (old_clusters != OCFS2_I(inode)->ip_clusters) || |
| 2026 | has_refcount)) { | 2030 | has_refcount)) { |
| 2027 | ret = jbd2_journal_force_commit(osb->journal->j_journal); | 2031 | ret = jbd2_journal_force_commit(osb->journal->j_journal); |
| 2028 | if (ret < 0) | 2032 | if (ret < 0) |
| 2029 | written = ret; | 2033 | written = ret; |
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 07cc8bb68b6d..af189887201c 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
| @@ -558,6 +558,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, | |||
| 558 | handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); | 558 | handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); |
| 559 | if (IS_ERR(handle)) { | 559 | if (IS_ERR(handle)) { |
| 560 | status = PTR_ERR(handle); | 560 | status = PTR_ERR(handle); |
| 561 | handle = NULL; | ||
| 561 | mlog_errno(status); | 562 | mlog_errno(status); |
| 562 | goto out; | 563 | goto out; |
| 563 | } | 564 | } |
| @@ -639,11 +640,13 @@ static int ocfs2_remove_inode(struct inode *inode, | |||
| 639 | goto bail_unlock; | 640 | goto bail_unlock; |
| 640 | } | 641 | } |
| 641 | 642 | ||
| 642 | status = ocfs2_orphan_del(osb, handle, orphan_dir_inode, inode, | 643 | if (!(OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)) { |
| 643 | orphan_dir_bh); | 644 | status = ocfs2_orphan_del(osb, handle, orphan_dir_inode, inode, |
| 644 | if (status < 0) { | 645 | orphan_dir_bh); |
| 645 | mlog_errno(status); | 646 | if (status < 0) { |
| 646 | goto bail_commit; | 647 | mlog_errno(status); |
| 648 | goto bail_commit; | ||
| 649 | } | ||
| 647 | } | 650 | } |
| 648 | 651 | ||
| 649 | /* set the inodes dtime */ | 652 | /* set the inodes dtime */ |
| @@ -722,38 +725,39 @@ static void ocfs2_signal_wipe_completion(struct ocfs2_super *osb, | |||
| 722 | static int ocfs2_wipe_inode(struct inode *inode, | 725 | static int ocfs2_wipe_inode(struct inode *inode, |
| 723 | struct buffer_head *di_bh) | 726 | struct buffer_head *di_bh) |
| 724 | { | 727 | { |
| 725 | int status, orphaned_slot; | 728 | int status, orphaned_slot = -1; |
| 726 | struct inode *orphan_dir_inode = NULL; | 729 | struct inode *orphan_dir_inode = NULL; |
| 727 | struct buffer_head *orphan_dir_bh = NULL; | 730 | struct buffer_head *orphan_dir_bh = NULL; |
| 728 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | 731 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); |
| 729 | struct ocfs2_dinode *di; | 732 | struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data; |
| 730 | 733 | ||
| 731 | di = (struct ocfs2_dinode *) di_bh->b_data; | 734 | if (!(OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)) { |
| 732 | orphaned_slot = le16_to_cpu(di->i_orphaned_slot); | 735 | orphaned_slot = le16_to_cpu(di->i_orphaned_slot); |
| 733 | 736 | ||
| 734 | status = ocfs2_check_orphan_recovery_state(osb, orphaned_slot); | 737 | status = ocfs2_check_orphan_recovery_state(osb, orphaned_slot); |
| 735 | if (status) | 738 | if (status) |
| 736 | return status; | 739 | return status; |
| 737 | 740 | ||
| 738 | orphan_dir_inode = ocfs2_get_system_file_inode(osb, | 741 | orphan_dir_inode = ocfs2_get_system_file_inode(osb, |
| 739 | ORPHAN_DIR_SYSTEM_INODE, | 742 | ORPHAN_DIR_SYSTEM_INODE, |
| 740 | orphaned_slot); | 743 | orphaned_slot); |
| 741 | if (!orphan_dir_inode) { | 744 | if (!orphan_dir_inode) { |
| 742 | status = -EEXIST; | 745 | status = -EEXIST; |
| 743 | mlog_errno(status); | 746 | mlog_errno(status); |
| 744 | goto bail; | 747 | goto bail; |
| 745 | } | 748 | } |
| 746 | 749 | ||
| 747 | /* Lock the orphan dir. The lock will be held for the entire | 750 | /* Lock the orphan dir. The lock will be held for the entire |
| 748 | * delete_inode operation. We do this now to avoid races with | 751 | * delete_inode operation. We do this now to avoid races with |
| 749 | * recovery completion on other nodes. */ | 752 | * recovery completion on other nodes. */ |
| 750 | mutex_lock(&orphan_dir_inode->i_mutex); | 753 | mutex_lock(&orphan_dir_inode->i_mutex); |
| 751 | status = ocfs2_inode_lock(orphan_dir_inode, &orphan_dir_bh, 1); | 754 | status = ocfs2_inode_lock(orphan_dir_inode, &orphan_dir_bh, 1); |
| 752 | if (status < 0) { | 755 | if (status < 0) { |
| 753 | mutex_unlock(&orphan_dir_inode->i_mutex); | 756 | mutex_unlock(&orphan_dir_inode->i_mutex); |
| 754 | 757 | ||
| 755 | mlog_errno(status); | 758 | mlog_errno(status); |
| 756 | goto bail; | 759 | goto bail; |
| 760 | } | ||
| 757 | } | 761 | } |
| 758 | 762 | ||
| 759 | /* we do this while holding the orphan dir lock because we | 763 | /* we do this while holding the orphan dir lock because we |
| @@ -794,6 +798,9 @@ static int ocfs2_wipe_inode(struct inode *inode, | |||
| 794 | mlog_errno(status); | 798 | mlog_errno(status); |
| 795 | 799 | ||
| 796 | bail_unlock_dir: | 800 | bail_unlock_dir: |
| 801 | if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR) | ||
| 802 | return status; | ||
| 803 | |||
| 797 | ocfs2_inode_unlock(orphan_dir_inode, 1); | 804 | ocfs2_inode_unlock(orphan_dir_inode, 1); |
| 798 | mutex_unlock(&orphan_dir_inode->i_mutex); | 805 | mutex_unlock(&orphan_dir_inode->i_mutex); |
| 799 | brelse(orphan_dir_bh); | 806 | brelse(orphan_dir_bh); |
| @@ -889,7 +896,8 @@ static int ocfs2_query_inode_wipe(struct inode *inode, | |||
| 889 | 896 | ||
| 890 | /* Do some basic inode verification... */ | 897 | /* Do some basic inode verification... */ |
| 891 | di = (struct ocfs2_dinode *) di_bh->b_data; | 898 | di = (struct ocfs2_dinode *) di_bh->b_data; |
| 892 | if (!(di->i_flags & cpu_to_le32(OCFS2_ORPHANED_FL))) { | 899 | if (!(di->i_flags & cpu_to_le32(OCFS2_ORPHANED_FL)) && |
| 900 | !(oi->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)) { | ||
| 893 | /* | 901 | /* |
| 894 | * Inodes in the orphan dir must have ORPHANED_FL. The only | 902 | * Inodes in the orphan dir must have ORPHANED_FL. The only |
| 895 | * inodes that come back out of the orphan dir are reflink | 903 | * inodes that come back out of the orphan dir are reflink |
diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h index ba4fe07b293c..0b28e1921a39 100644 --- a/fs/ocfs2/inode.h +++ b/fs/ocfs2/inode.h | |||
| @@ -100,6 +100,8 @@ struct ocfs2_inode_info | |||
| 100 | #define OCFS2_INODE_MAYBE_ORPHANED 0x00000020 | 100 | #define OCFS2_INODE_MAYBE_ORPHANED 0x00000020 |
| 101 | /* Does someone have the file open O_DIRECT */ | 101 | /* Does someone have the file open O_DIRECT */ |
| 102 | #define OCFS2_INODE_OPEN_DIRECT 0x00000040 | 102 | #define OCFS2_INODE_OPEN_DIRECT 0x00000040 |
| 103 | /* Tell the inode wipe code it's not in orphan dir */ | ||
| 104 | #define OCFS2_INODE_SKIP_ORPHAN_DIR 0x00000080 | ||
| 103 | 105 | ||
| 104 | static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) | 106 | static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) |
| 105 | { | 107 | { |
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index b1eb50ae4097..4cbb18f26c5f 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
| @@ -408,23 +408,28 @@ static int ocfs2_mknod(struct inode *dir, | |||
| 408 | } | 408 | } |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | status = ocfs2_add_entry(handle, dentry, inode, | 411 | /* |
| 412 | OCFS2_I(inode)->ip_blkno, parent_fe_bh, | 412 | * Do this before adding the entry to the directory. We add |
| 413 | &lookup); | 413 | * also set d_op after success so that ->d_iput() will cleanup |
| 414 | if (status < 0) { | 414 | * the dentry lock even if ocfs2_add_entry() fails below. |
| 415 | */ | ||
| 416 | status = ocfs2_dentry_attach_lock(dentry, inode, | ||
| 417 | OCFS2_I(dir)->ip_blkno); | ||
| 418 | if (status) { | ||
| 415 | mlog_errno(status); | 419 | mlog_errno(status); |
| 416 | goto leave; | 420 | goto leave; |
| 417 | } | 421 | } |
| 422 | dentry->d_op = &ocfs2_dentry_ops; | ||
| 418 | 423 | ||
| 419 | status = ocfs2_dentry_attach_lock(dentry, inode, | 424 | status = ocfs2_add_entry(handle, dentry, inode, |
| 420 | OCFS2_I(dir)->ip_blkno); | 425 | OCFS2_I(inode)->ip_blkno, parent_fe_bh, |
| 421 | if (status) { | 426 | &lookup); |
| 427 | if (status < 0) { | ||
| 422 | mlog_errno(status); | 428 | mlog_errno(status); |
| 423 | goto leave; | 429 | goto leave; |
| 424 | } | 430 | } |
| 425 | 431 | ||
| 426 | insert_inode_hash(inode); | 432 | insert_inode_hash(inode); |
| 427 | dentry->d_op = &ocfs2_dentry_ops; | ||
| 428 | d_instantiate(dentry, inode); | 433 | d_instantiate(dentry, inode); |
| 429 | status = 0; | 434 | status = 0; |
| 430 | leave: | 435 | leave: |
| @@ -445,11 +450,6 @@ leave: | |||
| 445 | 450 | ||
| 446 | ocfs2_free_dir_lookup_result(&lookup); | 451 | ocfs2_free_dir_lookup_result(&lookup); |
| 447 | 452 | ||
| 448 | if ((status < 0) && inode) { | ||
| 449 | clear_nlink(inode); | ||
| 450 | iput(inode); | ||
| 451 | } | ||
| 452 | |||
| 453 | if (inode_ac) | 453 | if (inode_ac) |
| 454 | ocfs2_free_alloc_context(inode_ac); | 454 | ocfs2_free_alloc_context(inode_ac); |
| 455 | 455 | ||
| @@ -459,6 +459,17 @@ leave: | |||
| 459 | if (meta_ac) | 459 | if (meta_ac) |
| 460 | ocfs2_free_alloc_context(meta_ac); | 460 | ocfs2_free_alloc_context(meta_ac); |
| 461 | 461 | ||
| 462 | /* | ||
| 463 | * We should call iput after the i_mutex of the bitmap been | ||
| 464 | * unlocked in ocfs2_free_alloc_context, or the | ||
| 465 | * ocfs2_delete_inode will mutex_lock again. | ||
| 466 | */ | ||
| 467 | if ((status < 0) && inode) { | ||
| 468 | OCFS2_I(inode)->ip_flags |= OCFS2_INODE_SKIP_ORPHAN_DIR; | ||
| 469 | clear_nlink(inode); | ||
| 470 | iput(inode); | ||
| 471 | } | ||
| 472 | |||
| 462 | mlog_exit(status); | 473 | mlog_exit(status); |
| 463 | 474 | ||
| 464 | return status; | 475 | return status; |
| @@ -1771,22 +1782,27 @@ static int ocfs2_symlink(struct inode *dir, | |||
| 1771 | } | 1782 | } |
| 1772 | } | 1783 | } |
| 1773 | 1784 | ||
| 1774 | status = ocfs2_add_entry(handle, dentry, inode, | 1785 | /* |
| 1775 | le64_to_cpu(fe->i_blkno), parent_fe_bh, | 1786 | * Do this before adding the entry to the directory. We add |
| 1776 | &lookup); | 1787 | * also set d_op after success so that ->d_iput() will cleanup |
| 1777 | if (status < 0) { | 1788 | * the dentry lock even if ocfs2_add_entry() fails below. |
| 1789 | */ | ||
| 1790 | status = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno); | ||
| 1791 | if (status) { | ||
| 1778 | mlog_errno(status); | 1792 | mlog_errno(status); |
| 1779 | goto bail; | 1793 | goto bail; |
| 1780 | } | 1794 | } |
| 1795 | dentry->d_op = &ocfs2_dentry_ops; | ||
| 1781 | 1796 | ||
| 1782 | status = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(dir)->ip_blkno); | 1797 | status = ocfs2_add_entry(handle, dentry, inode, |
| 1783 | if (status) { | 1798 | le64_to_cpu(fe->i_blkno), parent_fe_bh, |
| 1799 | &lookup); | ||
| 1800 | if (status < 0) { | ||
| 1784 | mlog_errno(status); | 1801 | mlog_errno(status); |
| 1785 | goto bail; | 1802 | goto bail; |
| 1786 | } | 1803 | } |
| 1787 | 1804 | ||
| 1788 | insert_inode_hash(inode); | 1805 | insert_inode_hash(inode); |
| 1789 | dentry->d_op = &ocfs2_dentry_ops; | ||
| 1790 | d_instantiate(dentry, inode); | 1806 | d_instantiate(dentry, inode); |
| 1791 | bail: | 1807 | bail: |
| 1792 | if (status < 0 && did_quota) | 1808 | if (status < 0 && did_quota) |
| @@ -1811,6 +1827,7 @@ bail: | |||
| 1811 | if (xattr_ac) | 1827 | if (xattr_ac) |
| 1812 | ocfs2_free_alloc_context(xattr_ac); | 1828 | ocfs2_free_alloc_context(xattr_ac); |
| 1813 | if ((status < 0) && inode) { | 1829 | if ((status < 0) && inode) { |
| 1830 | OCFS2_I(inode)->ip_flags |= OCFS2_INODE_SKIP_ORPHAN_DIR; | ||
| 1814 | clear_nlink(inode); | 1831 | clear_nlink(inode); |
| 1815 | iput(inode); | 1832 | iput(inode); |
| 1816 | } | 1833 | } |
| @@ -1976,6 +1993,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, | |||
| 1976 | } | 1993 | } |
| 1977 | 1994 | ||
| 1978 | le32_add_cpu(&fe->i_flags, OCFS2_ORPHANED_FL); | 1995 | le32_add_cpu(&fe->i_flags, OCFS2_ORPHANED_FL); |
| 1996 | OCFS2_I(inode)->ip_flags &= ~OCFS2_INODE_SKIP_ORPHAN_DIR; | ||
| 1979 | 1997 | ||
| 1980 | /* Record which orphan dir our inode now resides | 1998 | /* Record which orphan dir our inode now resides |
| 1981 | * in. delete_inode will use this to determine which orphan | 1999 | * in. delete_inode will use this to determine which orphan |
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index bd96f6c7877e..5cbcd0f008fc 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
| @@ -4083,6 +4083,9 @@ static int ocfs2_complete_reflink(struct inode *s_inode, | |||
| 4083 | di->i_attr = s_di->i_attr; | 4083 | di->i_attr = s_di->i_attr; |
| 4084 | 4084 | ||
| 4085 | if (preserve) { | 4085 | if (preserve) { |
| 4086 | t_inode->i_uid = s_inode->i_uid; | ||
| 4087 | t_inode->i_gid = s_inode->i_gid; | ||
| 4088 | t_inode->i_mode = s_inode->i_mode; | ||
| 4086 | di->i_uid = s_di->i_uid; | 4089 | di->i_uid = s_di->i_uid; |
| 4087 | di->i_gid = s_di->i_gid; | 4090 | di->i_gid = s_di->i_gid; |
| 4088 | di->i_mode = s_di->i_mode; | 4091 | di->i_mode = s_di->i_mode; |
diff --git a/fs/proc/base.c b/fs/proc/base.c index 7621db800a74..8418fcc0a6ab 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -2909,7 +2909,7 @@ out_no_task: | |||
| 2909 | */ | 2909 | */ |
| 2910 | static const struct pid_entry tid_base_stuff[] = { | 2910 | static const struct pid_entry tid_base_stuff[] = { |
| 2911 | DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), | 2911 | DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), |
| 2912 | DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fd_operations), | 2912 | DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations), |
| 2913 | REG("environ", S_IRUSR, proc_environ_operations), | 2913 | REG("environ", S_IRUSR, proc_environ_operations), |
| 2914 | INF("auxv", S_IRUSR, proc_pid_auxv), | 2914 | INF("auxv", S_IRUSR, proc_pid_auxv), |
| 2915 | ONE("status", S_IRUGO, proc_pid_status), | 2915 | ONE("status", S_IRUGO, proc_pid_status), |
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index f8a6075abf50..07930449a958 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c | |||
| @@ -46,8 +46,6 @@ static inline bool is_privroot_deh(struct dentry *dir, | |||
| 46 | struct reiserfs_de_head *deh) | 46 | struct reiserfs_de_head *deh) |
| 47 | { | 47 | { |
| 48 | struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root; | 48 | struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root; |
| 49 | if (reiserfs_expose_privroot(dir->d_sb)) | ||
| 50 | return 0; | ||
| 51 | return (dir == dir->d_parent && privroot->d_inode && | 49 | return (dir == dir->d_parent && privroot->d_inode && |
| 52 | deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); | 50 | deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); |
| 53 | } | 51 | } |
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 4f9586bb7631..e7cc00e636dc 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
| @@ -554,7 +554,7 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th, | |||
| 554 | if (!err && new_size < i_size_read(dentry->d_inode)) { | 554 | if (!err && new_size < i_size_read(dentry->d_inode)) { |
| 555 | struct iattr newattrs = { | 555 | struct iattr newattrs = { |
| 556 | .ia_ctime = current_fs_time(inode->i_sb), | 556 | .ia_ctime = current_fs_time(inode->i_sb), |
| 557 | .ia_size = buffer_size, | 557 | .ia_size = new_size, |
| 558 | .ia_valid = ATTR_SIZE | ATTR_CTIME, | 558 | .ia_valid = ATTR_SIZE | ATTR_CTIME, |
| 559 | }; | 559 | }; |
| 560 | 560 | ||
| @@ -973,21 +973,13 @@ int reiserfs_permission(struct inode *inode, int mask) | |||
| 973 | return generic_permission(inode, mask, NULL); | 973 | return generic_permission(inode, mask, NULL); |
| 974 | } | 974 | } |
| 975 | 975 | ||
| 976 | /* This will catch lookups from the fs root to .reiserfs_priv */ | 976 | static int xattr_hide_revalidate(struct dentry *dentry, struct nameidata *nd) |
| 977 | static int | ||
| 978 | xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name) | ||
| 979 | { | 977 | { |
| 980 | struct dentry *priv_root = REISERFS_SB(dentry->d_sb)->priv_root; | 978 | return -EPERM; |
| 981 | if (container_of(q1, struct dentry, d_name) == priv_root) | ||
| 982 | return -ENOENT; | ||
| 983 | if (q1->len == name->len && | ||
| 984 | !memcmp(q1->name, name->name, name->len)) | ||
| 985 | return 0; | ||
| 986 | return 1; | ||
| 987 | } | 979 | } |
| 988 | 980 | ||
| 989 | static const struct dentry_operations xattr_lookup_poison_ops = { | 981 | static const struct dentry_operations xattr_lookup_poison_ops = { |
| 990 | .d_compare = xattr_lookup_poison, | 982 | .d_revalidate = xattr_hide_revalidate, |
| 991 | }; | 983 | }; |
| 992 | 984 | ||
| 993 | int reiserfs_lookup_privroot(struct super_block *s) | 985 | int reiserfs_lookup_privroot(struct super_block *s) |
| @@ -1001,8 +993,7 @@ int reiserfs_lookup_privroot(struct super_block *s) | |||
| 1001 | strlen(PRIVROOT_NAME)); | 993 | strlen(PRIVROOT_NAME)); |
| 1002 | if (!IS_ERR(dentry)) { | 994 | if (!IS_ERR(dentry)) { |
| 1003 | REISERFS_SB(s)->priv_root = dentry; | 995 | REISERFS_SB(s)->priv_root = dentry; |
| 1004 | if (!reiserfs_expose_privroot(s)) | 996 | dentry->d_op = &xattr_lookup_poison_ops; |
| 1005 | s->s_root->d_op = &xattr_lookup_poison_ops; | ||
| 1006 | if (dentry->d_inode) | 997 | if (dentry->d_inode) |
| 1007 | dentry->d_inode->i_flags |= S_PRIVATE; | 998 | dentry->d_inode->i_flags |= S_PRIVATE; |
| 1008 | } else | 999 | } else |
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 1c4c8f089970..dfa1d67f8fca 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
| @@ -479,6 +479,7 @@ smb_put_super(struct super_block *sb) | |||
| 479 | if (server->conn_pid) | 479 | if (server->conn_pid) |
| 480 | kill_pid(server->conn_pid, SIGTERM, 1); | 480 | kill_pid(server->conn_pid, SIGTERM, 1); |
| 481 | 481 | ||
| 482 | bdi_destroy(&server->bdi); | ||
| 482 | kfree(server->ops); | 483 | kfree(server->ops); |
| 483 | smb_unload_nls(server); | 484 | smb_unload_nls(server); |
| 484 | sb->s_fs_info = NULL; | 485 | sb->s_fs_info = NULL; |
| @@ -525,6 +526,11 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
| 525 | if (!server) | 526 | if (!server) |
| 526 | goto out_no_server; | 527 | goto out_no_server; |
| 527 | sb->s_fs_info = server; | 528 | sb->s_fs_info = server; |
| 529 | |||
| 530 | if (bdi_setup_and_register(&server->bdi, "smbfs", BDI_CAP_MAP_COPY)) | ||
| 531 | goto out_bdi; | ||
| 532 | |||
| 533 | sb->s_bdi = &server->bdi; | ||
| 528 | 534 | ||
| 529 | server->super_block = sb; | 535 | server->super_block = sb; |
| 530 | server->mnt = NULL; | 536 | server->mnt = NULL; |
| @@ -624,6 +630,8 @@ out_no_smbiod: | |||
| 624 | out_bad_option: | 630 | out_bad_option: |
| 625 | kfree(mem); | 631 | kfree(mem); |
| 626 | out_no_mem: | 632 | out_no_mem: |
| 633 | bdi_destroy(&server->bdi); | ||
| 634 | out_bdi: | ||
| 627 | if (!server->mnt) | 635 | if (!server->mnt) |
| 628 | printk(KERN_ERR "smb_fill_super: allocation failure\n"); | 636 | printk(KERN_ERR "smb_fill_super: allocation failure\n"); |
| 629 | sb->s_fs_info = NULL; | 637 | sb->s_fs_info = NULL; |
diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c index 1cb0d81b164b..653c030eb840 100644 --- a/fs/squashfs/block.c +++ b/fs/squashfs/block.c | |||
| @@ -87,9 +87,8 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, | |||
| 87 | u64 cur_index = index >> msblk->devblksize_log2; | 87 | u64 cur_index = index >> msblk->devblksize_log2; |
| 88 | int bytes, compressed, b = 0, k = 0, page = 0, avail; | 88 | int bytes, compressed, b = 0, k = 0, page = 0, avail; |
| 89 | 89 | ||
| 90 | 90 | bh = kcalloc(((srclength + msblk->devblksize - 1) | |
| 91 | bh = kcalloc((msblk->block_size >> msblk->devblksize_log2) + 1, | 91 | >> msblk->devblksize_log2) + 1, sizeof(*bh), GFP_KERNEL); |
| 92 | sizeof(*bh), GFP_KERNEL); | ||
| 93 | if (bh == NULL) | 92 | if (bh == NULL) |
| 94 | return -ENOMEM; | 93 | return -ENOMEM; |
| 95 | 94 | ||
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index 3550aec2f655..48b6f4a385a6 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c | |||
| @@ -275,7 +275,8 @@ allocate_root: | |||
| 275 | 275 | ||
| 276 | err = squashfs_read_inode(root, root_inode); | 276 | err = squashfs_read_inode(root, root_inode); |
| 277 | if (err) { | 277 | if (err) { |
| 278 | iget_failed(root); | 278 | make_bad_inode(root); |
| 279 | iput(root); | ||
| 279 | goto failed_mount; | 280 | goto failed_mount; |
| 280 | } | 281 | } |
| 281 | insert_inode_hash(root); | 282 | insert_inode_hash(root); |
| @@ -353,6 +354,7 @@ static void squashfs_put_super(struct super_block *sb) | |||
| 353 | kfree(sbi->id_table); | 354 | kfree(sbi->id_table); |
| 354 | kfree(sbi->fragment_index); | 355 | kfree(sbi->fragment_index); |
| 355 | kfree(sbi->meta_index); | 356 | kfree(sbi->meta_index); |
| 357 | kfree(sbi->inode_lookup_table); | ||
| 356 | kfree(sb->s_fs_info); | 358 | kfree(sb->s_fs_info); |
| 357 | sb->s_fs_info = NULL; | 359 | sb->s_fs_info = NULL; |
| 358 | } | 360 | } |
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 15a03d0fb9f3..7a603874e483 100644 --- a/fs/squashfs/zlib_wrapper.c +++ b/fs/squashfs/zlib_wrapper.c | |||
| @@ -128,8 +128,9 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer, | |||
| 128 | goto release_mutex; | 128 | goto release_mutex; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | length = stream->total_out; | ||
| 131 | mutex_unlock(&msblk->read_data_mutex); | 132 | mutex_unlock(&msblk->read_data_mutex); |
| 132 | return stream->total_out; | 133 | return length; |
| 133 | 134 | ||
| 134 | release_mutex: | 135 | release_mutex: |
| 135 | mutex_unlock(&msblk->read_data_mutex); | 136 | mutex_unlock(&msblk->read_data_mutex); |
diff --git a/fs/super.c b/fs/super.c index f35ac6022109..1527e6a0ee35 100644 --- a/fs/super.c +++ b/fs/super.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/kobject.h> | 37 | #include <linux/kobject.h> |
| 38 | #include <linux/mutex.h> | 38 | #include <linux/mutex.h> |
| 39 | #include <linux/file.h> | 39 | #include <linux/file.h> |
| 40 | #include <linux/backing-dev.h> | ||
| 40 | #include <asm/uaccess.h> | 41 | #include <asm/uaccess.h> |
| 41 | #include "internal.h" | 42 | #include "internal.h" |
| 42 | 43 | ||
| @@ -693,6 +694,7 @@ int set_anon_super(struct super_block *s, void *data) | |||
| 693 | return -EMFILE; | 694 | return -EMFILE; |
| 694 | } | 695 | } |
| 695 | s->s_dev = MKDEV(0, dev & MINORMASK); | 696 | s->s_dev = MKDEV(0, dev & MINORMASK); |
| 697 | s->s_bdi = &noop_backing_dev_info; | ||
| 696 | return 0; | 698 | return 0; |
| 697 | } | 699 | } |
| 698 | 700 | ||
| @@ -954,10 +956,11 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void | |||
| 954 | if (error < 0) | 956 | if (error < 0) |
| 955 | goto out_free_secdata; | 957 | goto out_free_secdata; |
| 956 | BUG_ON(!mnt->mnt_sb); | 958 | BUG_ON(!mnt->mnt_sb); |
| 959 | WARN_ON(!mnt->mnt_sb->s_bdi); | ||
| 957 | 960 | ||
| 958 | error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata); | 961 | error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata); |
| 959 | if (error) | 962 | if (error) |
| 960 | goto out_sb; | 963 | goto out_sb; |
| 961 | 964 | ||
| 962 | /* | 965 | /* |
| 963 | * filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE | 966 | * filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE |
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/pagemap.h> | 14 | #include <linux/pagemap.h> |
| 15 | #include <linux/quotaops.h> | 15 | #include <linux/quotaops.h> |
| 16 | #include <linux/buffer_head.h> | 16 | #include <linux/buffer_head.h> |
| 17 | #include <linux/backing-dev.h> | ||
| 17 | #include "internal.h" | 18 | #include "internal.h" |
| 18 | 19 | ||
| 19 | #define VALID_FLAGS (SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE| \ | 20 | #define VALID_FLAGS (SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE| \ |
| @@ -32,7 +33,7 @@ static int __sync_filesystem(struct super_block *sb, int wait) | |||
| 32 | * This should be safe, as we require bdi backing to actually | 33 | * This should be safe, as we require bdi backing to actually |
| 33 | * write out data in the first place | 34 | * write out data in the first place |
| 34 | */ | 35 | */ |
| 35 | if (!sb->s_bdi) | 36 | if (!sb->s_bdi || sb->s_bdi == &noop_backing_dev_info) |
| 36 | return 0; | 37 | return 0; |
| 37 | 38 | ||
| 38 | if (sb->s_qcop && sb->s_qcop->quota_sync) | 39 | if (sb->s_qcop && sb->s_qcop->quota_sync) |
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 52e06b487ced..29f1edca76de 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
| @@ -1209,6 +1209,7 @@ xfs_fs_put_super( | |||
| 1209 | 1209 | ||
| 1210 | xfs_unmountfs(mp); | 1210 | xfs_unmountfs(mp); |
| 1211 | xfs_freesb(mp); | 1211 | xfs_freesb(mp); |
| 1212 | xfs_inode_shrinker_unregister(mp); | ||
| 1212 | xfs_icsb_destroy_counters(mp); | 1213 | xfs_icsb_destroy_counters(mp); |
| 1213 | xfs_close_devices(mp); | 1214 | xfs_close_devices(mp); |
| 1214 | xfs_dmops_put(mp); | 1215 | xfs_dmops_put(mp); |
| @@ -1622,6 +1623,8 @@ xfs_fs_fill_super( | |||
| 1622 | if (error) | 1623 | if (error) |
| 1623 | goto fail_vnrele; | 1624 | goto fail_vnrele; |
| 1624 | 1625 | ||
| 1626 | xfs_inode_shrinker_register(mp); | ||
| 1627 | |||
| 1625 | kfree(mtpt); | 1628 | kfree(mtpt); |
| 1626 | return 0; | 1629 | return 0; |
| 1627 | 1630 | ||
| @@ -1867,6 +1870,7 @@ init_xfs_fs(void) | |||
| 1867 | goto out_cleanup_procfs; | 1870 | goto out_cleanup_procfs; |
| 1868 | 1871 | ||
| 1869 | vfs_initquota(); | 1872 | vfs_initquota(); |
| 1873 | xfs_inode_shrinker_init(); | ||
| 1870 | 1874 | ||
| 1871 | error = register_filesystem(&xfs_fs_type); | 1875 | error = register_filesystem(&xfs_fs_type); |
| 1872 | if (error) | 1876 | if (error) |
| @@ -1894,6 +1898,7 @@ exit_xfs_fs(void) | |||
| 1894 | { | 1898 | { |
| 1895 | vfs_exitquota(); | 1899 | vfs_exitquota(); |
| 1896 | unregister_filesystem(&xfs_fs_type); | 1900 | unregister_filesystem(&xfs_fs_type); |
| 1901 | xfs_inode_shrinker_destroy(); | ||
| 1897 | xfs_sysctl_unregister(); | 1902 | xfs_sysctl_unregister(); |
| 1898 | xfs_cleanup_procfs(); | 1903 | xfs_cleanup_procfs(); |
| 1899 | xfs_buf_terminate(); | 1904 | xfs_buf_terminate(); |
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c index fd9698215759..a427c638d909 100644 --- a/fs/xfs/linux-2.6/xfs_sync.c +++ b/fs/xfs/linux-2.6/xfs_sync.c | |||
| @@ -95,7 +95,8 @@ xfs_inode_ag_walk( | |||
| 95 | struct xfs_perag *pag, int flags), | 95 | struct xfs_perag *pag, int flags), |
| 96 | int flags, | 96 | int flags, |
| 97 | int tag, | 97 | int tag, |
| 98 | int exclusive) | 98 | int exclusive, |
| 99 | int *nr_to_scan) | ||
| 99 | { | 100 | { |
| 100 | uint32_t first_index; | 101 | uint32_t first_index; |
| 101 | int last_error = 0; | 102 | int last_error = 0; |
| @@ -134,7 +135,7 @@ restart: | |||
| 134 | if (error == EFSCORRUPTED) | 135 | if (error == EFSCORRUPTED) |
| 135 | break; | 136 | break; |
| 136 | 137 | ||
| 137 | } while (1); | 138 | } while ((*nr_to_scan)--); |
| 138 | 139 | ||
| 139 | if (skipped) { | 140 | if (skipped) { |
| 140 | delay(1); | 141 | delay(1); |
| @@ -150,12 +151,15 @@ xfs_inode_ag_iterator( | |||
| 150 | struct xfs_perag *pag, int flags), | 151 | struct xfs_perag *pag, int flags), |
| 151 | int flags, | 152 | int flags, |
| 152 | int tag, | 153 | int tag, |
| 153 | int exclusive) | 154 | int exclusive, |
| 155 | int *nr_to_scan) | ||
| 154 | { | 156 | { |
| 155 | int error = 0; | 157 | int error = 0; |
| 156 | int last_error = 0; | 158 | int last_error = 0; |
| 157 | xfs_agnumber_t ag; | 159 | xfs_agnumber_t ag; |
| 160 | int nr; | ||
| 158 | 161 | ||
| 162 | nr = nr_to_scan ? *nr_to_scan : INT_MAX; | ||
| 159 | for (ag = 0; ag < mp->m_sb.sb_agcount; ag++) { | 163 | for (ag = 0; ag < mp->m_sb.sb_agcount; ag++) { |
| 160 | struct xfs_perag *pag; | 164 | struct xfs_perag *pag; |
| 161 | 165 | ||
| @@ -165,14 +169,18 @@ xfs_inode_ag_iterator( | |||
| 165 | continue; | 169 | continue; |
| 166 | } | 170 | } |
| 167 | error = xfs_inode_ag_walk(mp, pag, execute, flags, tag, | 171 | error = xfs_inode_ag_walk(mp, pag, execute, flags, tag, |
| 168 | exclusive); | 172 | exclusive, &nr); |
| 169 | xfs_perag_put(pag); | 173 | xfs_perag_put(pag); |
| 170 | if (error) { | 174 | if (error) { |
| 171 | last_error = error; | 175 | last_error = error; |
| 172 | if (error == EFSCORRUPTED) | 176 | if (error == EFSCORRUPTED) |
| 173 | break; | 177 | break; |
| 174 | } | 178 | } |
| 179 | if (nr <= 0) | ||
| 180 | break; | ||
| 175 | } | 181 | } |
| 182 | if (nr_to_scan) | ||
| 183 | *nr_to_scan = nr; | ||
| 176 | return XFS_ERROR(last_error); | 184 | return XFS_ERROR(last_error); |
| 177 | } | 185 | } |
| 178 | 186 | ||
| @@ -291,7 +299,7 @@ xfs_sync_data( | |||
| 291 | ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT)) == 0); | 299 | ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT)) == 0); |
| 292 | 300 | ||
| 293 | error = xfs_inode_ag_iterator(mp, xfs_sync_inode_data, flags, | 301 | error = xfs_inode_ag_iterator(mp, xfs_sync_inode_data, flags, |
| 294 | XFS_ICI_NO_TAG, 0); | 302 | XFS_ICI_NO_TAG, 0, NULL); |
| 295 | if (error) | 303 | if (error) |
| 296 | return XFS_ERROR(error); | 304 | return XFS_ERROR(error); |
| 297 | 305 | ||
| @@ -310,7 +318,7 @@ xfs_sync_attr( | |||
| 310 | ASSERT((flags & ~SYNC_WAIT) == 0); | 318 | ASSERT((flags & ~SYNC_WAIT) == 0); |
| 311 | 319 | ||
| 312 | return xfs_inode_ag_iterator(mp, xfs_sync_inode_attr, flags, | 320 | return xfs_inode_ag_iterator(mp, xfs_sync_inode_attr, flags, |
| 313 | XFS_ICI_NO_TAG, 0); | 321 | XFS_ICI_NO_TAG, 0, NULL); |
| 314 | } | 322 | } |
| 315 | 323 | ||
| 316 | STATIC int | 324 | STATIC int |
| @@ -673,6 +681,7 @@ __xfs_inode_set_reclaim_tag( | |||
| 673 | radix_tree_tag_set(&pag->pag_ici_root, | 681 | radix_tree_tag_set(&pag->pag_ici_root, |
| 674 | XFS_INO_TO_AGINO(ip->i_mount, ip->i_ino), | 682 | XFS_INO_TO_AGINO(ip->i_mount, ip->i_ino), |
| 675 | XFS_ICI_RECLAIM_TAG); | 683 | XFS_ICI_RECLAIM_TAG); |
| 684 | pag->pag_ici_reclaimable++; | ||
| 676 | } | 685 | } |
| 677 | 686 | ||
| 678 | /* | 687 | /* |
| @@ -705,6 +714,7 @@ __xfs_inode_clear_reclaim_tag( | |||
| 705 | { | 714 | { |
| 706 | radix_tree_tag_clear(&pag->pag_ici_root, | 715 | radix_tree_tag_clear(&pag->pag_ici_root, |
| 707 | XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG); | 716 | XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG); |
| 717 | pag->pag_ici_reclaimable--; | ||
| 708 | } | 718 | } |
| 709 | 719 | ||
| 710 | /* | 720 | /* |
| @@ -854,5 +864,93 @@ xfs_reclaim_inodes( | |||
| 854 | int mode) | 864 | int mode) |
| 855 | { | 865 | { |
| 856 | return xfs_inode_ag_iterator(mp, xfs_reclaim_inode, mode, | 866 | return xfs_inode_ag_iterator(mp, xfs_reclaim_inode, mode, |
| 857 | XFS_ICI_RECLAIM_TAG, 1); | 867 | XFS_ICI_RECLAIM_TAG, 1, NULL); |
| 868 | } | ||
| 869 | |||
| 870 | /* | ||
| 871 | * Shrinker infrastructure. | ||
| 872 | * | ||
| 873 | * This is all far more complex than it needs to be. It adds a global list of | ||
| 874 | * mounts because the shrinkers can only call a global context. We need to make | ||
| 875 | * the shrinkers pass a context to avoid the need for global state. | ||
| 876 | */ | ||
| 877 | static LIST_HEAD(xfs_mount_list); | ||
| 878 | static struct rw_semaphore xfs_mount_list_lock; | ||
| 879 | |||
| 880 | static int | ||
| 881 | xfs_reclaim_inode_shrink( | ||
| 882 | int nr_to_scan, | ||
| 883 | gfp_t gfp_mask) | ||
| 884 | { | ||
| 885 | struct xfs_mount *mp; | ||
| 886 | struct xfs_perag *pag; | ||
| 887 | xfs_agnumber_t ag; | ||
| 888 | int reclaimable = 0; | ||
| 889 | |||
| 890 | if (nr_to_scan) { | ||
| 891 | if (!(gfp_mask & __GFP_FS)) | ||
| 892 | return -1; | ||
| 893 | |||
| 894 | down_read(&xfs_mount_list_lock); | ||
| 895 | list_for_each_entry(mp, &xfs_mount_list, m_mplist) { | ||
| 896 | xfs_inode_ag_iterator(mp, xfs_reclaim_inode, 0, | ||
| 897 | XFS_ICI_RECLAIM_TAG, 1, &nr_to_scan); | ||
| 898 | if (nr_to_scan <= 0) | ||
| 899 | break; | ||
| 900 | } | ||
| 901 | up_read(&xfs_mount_list_lock); | ||
| 902 | } | ||
| 903 | |||
| 904 | down_read(&xfs_mount_list_lock); | ||
| 905 | list_for_each_entry(mp, &xfs_mount_list, m_mplist) { | ||
| 906 | for (ag = 0; ag < mp->m_sb.sb_agcount; ag++) { | ||
| 907 | |||
| 908 | pag = xfs_perag_get(mp, ag); | ||
| 909 | if (!pag->pag_ici_init) { | ||
| 910 | xfs_perag_put(pag); | ||
| 911 | continue; | ||
| 912 | } | ||
| 913 | reclaimable += pag->pag_ici_reclaimable; | ||
| 914 | xfs_perag_put(pag); | ||
| 915 | } | ||
| 916 | } | ||
| 917 | up_read(&xfs_mount_list_lock); | ||
| 918 | return reclaimable; | ||
| 919 | } | ||
| 920 | |||
| 921 | static struct shrinker xfs_inode_shrinker = { | ||
| 922 | .shrink = xfs_reclaim_inode_shrink, | ||
| 923 | .seeks = DEFAULT_SEEKS, | ||
| 924 | }; | ||
| 925 | |||
| 926 | void __init | ||
| 927 | xfs_inode_shrinker_init(void) | ||
| 928 | { | ||
| 929 | init_rwsem(&xfs_mount_list_lock); | ||
| 930 | register_shrinker(&xfs_inode_shrinker); | ||
| 931 | } | ||
| 932 | |||
| 933 | void | ||
| 934 | xfs_inode_shrinker_destroy(void) | ||
| 935 | { | ||
| 936 | ASSERT(list_empty(&xfs_mount_list)); | ||
| 937 | unregister_shrinker(&xfs_inode_shrinker); | ||
| 938 | } | ||
| 939 | |||
| 940 | void | ||
| 941 | xfs_inode_shrinker_register( | ||
| 942 | struct xfs_mount *mp) | ||
| 943 | { | ||
| 944 | down_write(&xfs_mount_list_lock); | ||
| 945 | list_add_tail(&mp->m_mplist, &xfs_mount_list); | ||
| 946 | up_write(&xfs_mount_list_lock); | ||
| 947 | } | ||
| 948 | |||
| 949 | void | ||
| 950 | xfs_inode_shrinker_unregister( | ||
| 951 | struct xfs_mount *mp) | ||
| 952 | { | ||
| 953 | down_write(&xfs_mount_list_lock); | ||
| 954 | list_del(&mp->m_mplist); | ||
| 955 | up_write(&xfs_mount_list_lock); | ||
| 858 | } | 956 | } |
diff --git a/fs/xfs/linux-2.6/xfs_sync.h b/fs/xfs/linux-2.6/xfs_sync.h index d480c346cabb..cdcbaaca9880 100644 --- a/fs/xfs/linux-2.6/xfs_sync.h +++ b/fs/xfs/linux-2.6/xfs_sync.h | |||
| @@ -53,6 +53,11 @@ void __xfs_inode_clear_reclaim_tag(struct xfs_mount *mp, struct xfs_perag *pag, | |||
| 53 | int xfs_sync_inode_valid(struct xfs_inode *ip, struct xfs_perag *pag); | 53 | int xfs_sync_inode_valid(struct xfs_inode *ip, struct xfs_perag *pag); |
| 54 | int xfs_inode_ag_iterator(struct xfs_mount *mp, | 54 | int xfs_inode_ag_iterator(struct xfs_mount *mp, |
| 55 | int (*execute)(struct xfs_inode *ip, struct xfs_perag *pag, int flags), | 55 | int (*execute)(struct xfs_inode *ip, struct xfs_perag *pag, int flags), |
| 56 | int flags, int tag, int write_lock); | 56 | int flags, int tag, int write_lock, int *nr_to_scan); |
| 57 | |||
| 58 | void xfs_inode_shrinker_init(void); | ||
| 59 | void xfs_inode_shrinker_destroy(void); | ||
| 60 | void xfs_inode_shrinker_register(struct xfs_mount *mp); | ||
| 61 | void xfs_inode_shrinker_unregister(struct xfs_mount *mp); | ||
| 57 | 62 | ||
| 58 | #endif | 63 | #endif |
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index 5d0ee8d492db..50bee07d6b0e 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
| @@ -891,7 +891,8 @@ xfs_qm_dqrele_all_inodes( | |||
| 891 | uint flags) | 891 | uint flags) |
| 892 | { | 892 | { |
| 893 | ASSERT(mp->m_quotainfo); | 893 | ASSERT(mp->m_quotainfo); |
| 894 | xfs_inode_ag_iterator(mp, xfs_dqrele_inode, flags, XFS_ICI_NO_TAG, 0); | 894 | xfs_inode_ag_iterator(mp, xfs_dqrele_inode, flags, |
| 895 | XFS_ICI_NO_TAG, 0, NULL); | ||
| 895 | } | 896 | } |
| 896 | 897 | ||
| 897 | /*------------------------------------------------------------------------*/ | 898 | /*------------------------------------------------------------------------*/ |
diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h index b1a5a1ff88ea..abb8222b88c9 100644 --- a/fs/xfs/xfs_ag.h +++ b/fs/xfs/xfs_ag.h | |||
| @@ -223,6 +223,7 @@ typedef struct xfs_perag { | |||
| 223 | int pag_ici_init; /* incore inode cache initialised */ | 223 | int pag_ici_init; /* incore inode cache initialised */ |
| 224 | rwlock_t pag_ici_lock; /* incore inode lock */ | 224 | rwlock_t pag_ici_lock; /* incore inode lock */ |
| 225 | struct radix_tree_root pag_ici_root; /* incore inode cache root */ | 225 | struct radix_tree_root pag_ici_root; /* incore inode cache root */ |
| 226 | int pag_ici_reclaimable; /* reclaimable inodes */ | ||
| 226 | #endif | 227 | #endif |
| 227 | int pagb_count; /* pagb slots in use */ | 228 | int pagb_count; /* pagb slots in use */ |
| 228 | xfs_perag_busy_t pagb_list[XFS_PAGB_NUM_SLOTS]; /* unstable blocks */ | 229 | xfs_perag_busy_t pagb_list[XFS_PAGB_NUM_SLOTS]; /* unstable blocks */ |
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index cd27c9d6c71f..5bba29a07812 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c | |||
| @@ -177,16 +177,26 @@ xfs_swap_extents_check_format( | |||
| 177 | XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) > tip->i_df.if_ext_max) | 177 | XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) > tip->i_df.if_ext_max) |
| 178 | return EINVAL; | 178 | return EINVAL; |
| 179 | 179 | ||
| 180 | /* Check root block of temp in btree form to max in target */ | 180 | /* |
| 181 | * If we are in a btree format, check that the temp root block will fit | ||
| 182 | * in the target and that it has enough extents to be in btree format | ||
| 183 | * in the target. | ||
| 184 | * | ||
| 185 | * Note that we have to be careful to allow btree->extent conversions | ||
| 186 | * (a common defrag case) which will occur when the temp inode is in | ||
| 187 | * extent format... | ||
| 188 | */ | ||
| 181 | if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE && | 189 | if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE && |
| 182 | XFS_IFORK_BOFF(ip) && | 190 | ((XFS_IFORK_BOFF(ip) && |
| 183 | tip->i_df.if_broot_bytes > XFS_IFORK_BOFF(ip)) | 191 | tip->i_df.if_broot_bytes > XFS_IFORK_BOFF(ip)) || |
| 192 | XFS_IFORK_NEXTENTS(tip, XFS_DATA_FORK) <= ip->i_df.if_ext_max)) | ||
| 184 | return EINVAL; | 193 | return EINVAL; |
| 185 | 194 | ||
| 186 | /* Check root block of target in btree form to max in temp */ | 195 | /* Reciprocal target->temp btree format checks */ |
| 187 | if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE && | 196 | if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE && |
| 188 | XFS_IFORK_BOFF(tip) && | 197 | ((XFS_IFORK_BOFF(tip) && |
| 189 | ip->i_df.if_broot_bytes > XFS_IFORK_BOFF(tip)) | 198 | ip->i_df.if_broot_bytes > XFS_IFORK_BOFF(tip)) || |
| 199 | XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <= tip->i_df.if_ext_max)) | ||
| 190 | return EINVAL; | 200 | return EINVAL; |
| 191 | 201 | ||
| 192 | return 0; | 202 | return 0; |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 4fa0bc7b983e..9ff48a16a7ee 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
| @@ -259,6 +259,7 @@ typedef struct xfs_mount { | |||
| 259 | wait_queue_head_t m_wait_single_sync_task; | 259 | wait_queue_head_t m_wait_single_sync_task; |
| 260 | __int64_t m_update_flags; /* sb flags we need to update | 260 | __int64_t m_update_flags; /* sb flags we need to update |
| 261 | on the next remount,rw */ | 261 | on the next remount,rw */ |
| 262 | struct list_head m_mplist; /* inode shrinker mount list */ | ||
| 262 | } xfs_mount_t; | 263 | } xfs_mount_t; |
| 263 | 264 | ||
| 264 | /* | 265 | /* |
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index fcbc26af00e4..bd0e3c6f323f 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h | |||
| @@ -101,6 +101,7 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, | |||
| 101 | const char *fmt, ...); | 101 | const char *fmt, ...); |
| 102 | int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev); | 102 | int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev); |
| 103 | void bdi_unregister(struct backing_dev_info *bdi); | 103 | void bdi_unregister(struct backing_dev_info *bdi); |
| 104 | int bdi_setup_and_register(struct backing_dev_info *, char *, unsigned int); | ||
| 104 | void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb, | 105 | void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb, |
| 105 | long nr_pages); | 106 | long nr_pages); |
| 106 | int bdi_writeback_task(struct bdi_writeback *wb); | 107 | int bdi_writeback_task(struct bdi_writeback *wb); |
| @@ -246,6 +247,7 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio); | |||
| 246 | #endif | 247 | #endif |
| 247 | 248 | ||
| 248 | extern struct backing_dev_info default_backing_dev_info; | 249 | extern struct backing_dev_info default_backing_dev_info; |
| 250 | extern struct backing_dev_info noop_backing_dev_info; | ||
| 249 | void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page); | 251 | void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page); |
| 250 | 252 | ||
| 251 | int writeback_in_progress(struct backing_dev_info *bdi); | 253 | int writeback_in_progress(struct backing_dev_info *bdi); |
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h index 5b5d4731f956..8859e2ede9fe 100644 --- a/include/linux/coda_psdev.h +++ b/include/linux/coda_psdev.h | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | #define MAX_CODADEVS 5 /* how many do we allow */ | 7 | #define MAX_CODADEVS 5 /* how many do we allow */ |
| 8 | 8 | ||
| 9 | #ifdef __KERNEL__ | 9 | #ifdef __KERNEL__ |
| 10 | #include <linux/backing-dev.h> | ||
| 11 | |||
| 10 | struct kstatfs; | 12 | struct kstatfs; |
| 11 | 13 | ||
| 12 | /* communication pending/processing queues */ | 14 | /* communication pending/processing queues */ |
| @@ -17,6 +19,7 @@ struct venus_comm { | |||
| 17 | struct list_head vc_processing; | 19 | struct list_head vc_processing; |
| 18 | int vc_inuse; | 20 | int vc_inuse; |
| 19 | struct super_block *vc_sb; | 21 | struct super_block *vc_sb; |
| 22 | struct backing_dev_info bdi; | ||
| 20 | }; | 23 | }; |
| 21 | 24 | ||
| 22 | 25 | ||
diff --git a/include/linux/fs.h b/include/linux/fs.h index 39d57bc6cc71..44f35aea2f1f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -2315,8 +2315,9 @@ extern int vfs_fstatat(int , char __user *, struct kstat *, int); | |||
| 2315 | extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, | 2315 | extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, |
| 2316 | unsigned long arg); | 2316 | unsigned long arg); |
| 2317 | extern int __generic_block_fiemap(struct inode *inode, | 2317 | extern int __generic_block_fiemap(struct inode *inode, |
| 2318 | struct fiemap_extent_info *fieinfo, u64 start, | 2318 | struct fiemap_extent_info *fieinfo, |
| 2319 | u64 len, get_block_t *get_block); | 2319 | loff_t start, loff_t len, |
| 2320 | get_block_t *get_block); | ||
| 2320 | extern int generic_block_fiemap(struct inode *inode, | 2321 | extern int generic_block_fiemap(struct inode *inode, |
| 2321 | struct fiemap_extent_info *fieinfo, u64 start, | 2322 | struct fiemap_extent_info *fieinfo, u64 start, |
| 2322 | u64 len, get_block_t *get_block); | 2323 | u64 len, get_block_t *get_block); |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 0a5da639b327..6ed1d59bfb1e 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -355,6 +355,8 @@ struct i2c_adapter { | |||
| 355 | int nr; | 355 | int nr; |
| 356 | char name[48]; | 356 | char name[48]; |
| 357 | struct completion dev_released; | 357 | struct completion dev_released; |
| 358 | |||
| 359 | struct list_head userspace_clients; | ||
| 358 | }; | 360 | }; |
| 359 | #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) | 361 | #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) |
| 360 | 362 | ||
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h index 6330fc76b00f..5ec9ca671687 100644 --- a/include/linux/ncp_fs_sb.h +++ b/include/linux/ncp_fs_sb.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/ncp_mount.h> | 12 | #include <linux/ncp_mount.h> |
| 13 | #include <linux/net.h> | 13 | #include <linux/net.h> |
| 14 | #include <linux/mutex.h> | 14 | #include <linux/mutex.h> |
| 15 | #include <linux/backing-dev.h> | ||
| 15 | 16 | ||
| 16 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
| 17 | 18 | ||
| @@ -127,6 +128,7 @@ struct ncp_server { | |||
| 127 | size_t len; | 128 | size_t len; |
| 128 | __u8 data[128]; | 129 | __u8 data[128]; |
| 129 | } unexpected_packet; | 130 | } unexpected_packet; |
| 131 | struct backing_dev_info bdi; | ||
| 130 | }; | 132 | }; |
| 131 | 133 | ||
| 132 | extern void ncp_tcp_rcv_proc(struct work_struct *work); | 134 | extern void ncp_tcp_rcv_proc(struct work_struct *work); |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 1a0b85aa151e..07ce4609fe50 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -209,6 +209,7 @@ struct nfs_inode { | |||
| 209 | #define NFS_INO_FLUSHING (4) /* inode is flushing out data */ | 209 | #define NFS_INO_FLUSHING (4) /* inode is flushing out data */ |
| 210 | #define NFS_INO_FSCACHE (5) /* inode can be cached by FS-Cache */ | 210 | #define NFS_INO_FSCACHE (5) /* inode can be cached by FS-Cache */ |
| 211 | #define NFS_INO_FSCACHE_LOCK (6) /* FS-Cache cookie management lock */ | 211 | #define NFS_INO_FSCACHE_LOCK (6) /* FS-Cache cookie management lock */ |
| 212 | #define NFS_INO_COMMIT (7) /* inode is committing unstable writes */ | ||
| 212 | 213 | ||
| 213 | static inline struct nfs_inode *NFS_I(const struct inode *inode) | 214 | static inline struct nfs_inode *NFS_I(const struct inode *inode) |
| 214 | { | 215 | { |
diff --git a/include/linux/poison.h b/include/linux/poison.h index 2110a81c5e2a..34066ffd893d 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h | |||
| @@ -48,6 +48,15 @@ | |||
| 48 | #define POISON_FREE 0x6b /* for use-after-free poisoning */ | 48 | #define POISON_FREE 0x6b /* for use-after-free poisoning */ |
| 49 | #define POISON_END 0xa5 /* end-byte of poisoning */ | 49 | #define POISON_END 0xa5 /* end-byte of poisoning */ |
| 50 | 50 | ||
| 51 | /********** mm/hugetlb.c **********/ | ||
| 52 | /* | ||
| 53 | * Private mappings of hugetlb pages use this poisoned value for | ||
| 54 | * page->mapping. The core VM should not be doing anything with this mapping | ||
| 55 | * but futex requires the existence of some page->mapping value even though it | ||
| 56 | * is unused if PAGE_MAPPING_ANON is set. | ||
| 57 | */ | ||
| 58 | #define HUGETLB_POISON ((void *)(0x00300300 + POISON_POINTER_DELTA + PAGE_MAPPING_ANON)) | ||
| 59 | |||
| 51 | /********** arch/$ARCH/mm/init.c **********/ | 60 | /********** arch/$ARCH/mm/init.c **********/ |
| 52 | #define POISON_FREE_INITMEM 0xcc | 61 | #define POISON_FREE_INITMEM 0xcc |
| 53 | 62 | ||
diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h index 8a060a7040d8..bb947dd1fba9 100644 --- a/include/linux/smb_fs_sb.h +++ b/include/linux/smb_fs_sb.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define _SMB_FS_SB | 10 | #define _SMB_FS_SB |
| 11 | 11 | ||
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | #include <linux/backing-dev.h> | ||
| 13 | #include <linux/smb.h> | 14 | #include <linux/smb.h> |
| 14 | 15 | ||
| 15 | /* | 16 | /* |
| @@ -74,6 +75,8 @@ struct smb_sb_info { | |||
| 74 | struct smb_ops *ops; | 75 | struct smb_ops *ops; |
| 75 | 76 | ||
| 76 | struct super_block *super_block; | 77 | struct super_block *super_block; |
| 78 | |||
| 79 | struct backing_dev_info bdi; | ||
| 77 | }; | 80 | }; |
| 78 | 81 | ||
| 79 | static inline int | 82 | static inline int |
diff --git a/include/linux/usb.h b/include/linux/usb.h index ce1323c4e47c..739f1fd1cc15 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -1085,7 +1085,7 @@ typedef void (*usb_complete_t)(struct urb *); | |||
| 1085 | * Alternatively, drivers may pass the URB_NO_xxx_DMA_MAP transfer flags, | 1085 | * Alternatively, drivers may pass the URB_NO_xxx_DMA_MAP transfer flags, |
| 1086 | * which tell the host controller driver that no such mapping is needed since | 1086 | * which tell the host controller driver that no such mapping is needed since |
| 1087 | * the device driver is DMA-aware. For example, a device driver might | 1087 | * the device driver is DMA-aware. For example, a device driver might |
| 1088 | * allocate a DMA buffer with usb_buffer_alloc() or call usb_buffer_map(). | 1088 | * allocate a DMA buffer with usb_alloc_coherent() or call usb_buffer_map(). |
| 1089 | * When these transfer flags are provided, host controller drivers will | 1089 | * When these transfer flags are provided, host controller drivers will |
| 1090 | * attempt to use the dma addresses found in the transfer_dma and/or | 1090 | * attempt to use the dma addresses found in the transfer_dma and/or |
| 1091 | * setup_dma fields rather than determining a dma address themselves. | 1091 | * setup_dma fields rather than determining a dma address themselves. |
| @@ -1366,11 +1366,23 @@ static inline int usb_urb_dir_out(struct urb *urb) | |||
| 1366 | return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_OUT; | 1366 | return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_OUT; |
| 1367 | } | 1367 | } |
| 1368 | 1368 | ||
| 1369 | void *usb_buffer_alloc(struct usb_device *dev, size_t size, | 1369 | void *usb_alloc_coherent(struct usb_device *dev, size_t size, |
| 1370 | gfp_t mem_flags, dma_addr_t *dma); | 1370 | gfp_t mem_flags, dma_addr_t *dma); |
| 1371 | void usb_buffer_free(struct usb_device *dev, size_t size, | 1371 | void usb_free_coherent(struct usb_device *dev, size_t size, |
| 1372 | void *addr, dma_addr_t dma); | 1372 | void *addr, dma_addr_t dma); |
| 1373 | 1373 | ||
| 1374 | /* Compatible macros while we switch over */ | ||
| 1375 | static inline void *usb_buffer_alloc(struct usb_device *dev, size_t size, | ||
| 1376 | gfp_t mem_flags, dma_addr_t *dma) | ||
| 1377 | { | ||
| 1378 | return usb_alloc_coherent(dev, size, mem_flags, dma); | ||
| 1379 | } | ||
| 1380 | static inline void usb_buffer_free(struct usb_device *dev, size_t size, | ||
| 1381 | void *addr, dma_addr_t dma) | ||
| 1382 | { | ||
| 1383 | return usb_free_coherent(dev, size, addr, dma); | ||
| 1384 | } | ||
| 1385 | |||
| 1374 | #if 0 | 1386 | #if 0 |
| 1375 | struct urb *usb_buffer_map(struct urb *urb); | 1387 | struct urb *usb_buffer_map(struct urb *urb); |
| 1376 | void usb_buffer_dmasync(struct urb *urb); | 1388 | void usb_buffer_dmasync(struct urb *urb); |
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 8be5135ff7aa..2c55a7ea20af 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
| @@ -107,6 +107,7 @@ typedef enum { | |||
| 107 | SCTP_CMD_T1_RETRAN, /* Mark for retransmission after T1 timeout */ | 107 | SCTP_CMD_T1_RETRAN, /* Mark for retransmission after T1 timeout */ |
| 108 | SCTP_CMD_UPDATE_INITTAG, /* Update peer inittag */ | 108 | SCTP_CMD_UPDATE_INITTAG, /* Update peer inittag */ |
| 109 | SCTP_CMD_SEND_MSG, /* Send the whole use message */ | 109 | SCTP_CMD_SEND_MSG, /* Send the whole use message */ |
| 110 | SCTP_CMD_SEND_NEXT_ASCONF, /* Send the next ASCONF after ACK */ | ||
| 110 | SCTP_CMD_LAST | 111 | SCTP_CMD_LAST |
| 111 | } sctp_verb_t; | 112 | } sctp_verb_t; |
| 112 | 113 | ||
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 78740ec57d5d..fa6cde578a1d 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -128,6 +128,7 @@ extern int sctp_register_pf(struct sctp_pf *, sa_family_t); | |||
| 128 | int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb); | 128 | int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb); |
| 129 | int sctp_inet_listen(struct socket *sock, int backlog); | 129 | int sctp_inet_listen(struct socket *sock, int backlog); |
| 130 | void sctp_write_space(struct sock *sk); | 130 | void sctp_write_space(struct sock *sk); |
| 131 | void sctp_data_ready(struct sock *sk, int len); | ||
| 131 | unsigned int sctp_poll(struct file *file, struct socket *sock, | 132 | unsigned int sctp_poll(struct file *file, struct socket *sock, |
| 132 | poll_table *wait); | 133 | poll_table *wait); |
| 133 | void sctp_sock_rfree(struct sk_buff *skb); | 134 | void sctp_sock_rfree(struct sk_buff *skb); |
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index ff3017744711..597f8e27aaf6 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -778,6 +778,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, | |||
| 778 | struct iovec *data); | 778 | struct iovec *data); |
| 779 | void sctp_chunk_free(struct sctp_chunk *); | 779 | void sctp_chunk_free(struct sctp_chunk *); |
| 780 | void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); | 780 | void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); |
| 781 | void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, const void *data); | ||
| 781 | struct sctp_chunk *sctp_chunkify(struct sk_buff *, | 782 | struct sctp_chunk *sctp_chunkify(struct sk_buff *, |
| 782 | const struct sctp_association *, | 783 | const struct sctp_association *, |
| 783 | struct sock *); | 784 | struct sock *); |
diff --git a/include/net/sock.h b/include/net/sock.h index b4603cd54fcd..1ad6435f252e 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | printk(KERN_DEBUG msg); } while (0) | 74 | printk(KERN_DEBUG msg); } while (0) |
| 75 | #else | 75 | #else |
| 76 | /* Validate arguments and do nothing */ | 76 | /* Validate arguments and do nothing */ |
| 77 | static void inline int __attribute__ ((format (printf, 2, 3))) | 77 | static inline void __attribute__ ((format (printf, 2, 3))) |
| 78 | SOCK_DEBUG(struct sock *sk, const char *msg, ...) | 78 | SOCK_DEBUG(struct sock *sk, const char *msg, ...) |
| 79 | { | 79 | { |
| 80 | } | 80 | } |
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index d57847f2f6c1..aab3c13dc310 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 28 | #include <pcmcia/ss.h> | 28 | #include <pcmcia/ss.h> |
| 29 | #include <asm/atomic.h> | ||
| 29 | 30 | ||
| 30 | /* | 31 | /* |
| 31 | * PCMCIA device drivers (16-bit cards only; 32-bit cards require CardBus | 32 | * PCMCIA device drivers (16-bit cards only; 32-bit cards require CardBus |
| @@ -94,10 +95,8 @@ struct pcmcia_device { | |||
| 94 | config_req_t conf; | 95 | config_req_t conf; |
| 95 | window_handle_t win; | 96 | window_handle_t win; |
| 96 | 97 | ||
| 97 | /* Is the device suspended, or in the process of | 98 | /* Is the device suspended? */ |
| 98 | * being removed? */ | ||
| 99 | u16 suspended:1; | 99 | u16 suspended:1; |
| 100 | u16 _removed:1; | ||
| 101 | 100 | ||
| 102 | /* Flags whether io, irq, win configurations were | 101 | /* Flags whether io, irq, win configurations were |
| 103 | * requested, and whether the configuration is "locked" */ | 102 | * requested, and whether the configuration is "locked" */ |
| @@ -115,7 +114,7 @@ struct pcmcia_device { | |||
| 115 | u16 has_card_id:1; | 114 | u16 has_card_id:1; |
| 116 | u16 has_func_id:1; | 115 | u16 has_func_id:1; |
| 117 | 116 | ||
| 118 | u16 reserved:3; | 117 | u16 reserved:4; |
| 119 | 118 | ||
| 120 | u8 func_id; | 119 | u8 func_id; |
| 121 | u16 manf_id; | 120 | u16 manf_id; |
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 2e488b60bc76..344705cb42f4 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
| @@ -224,18 +224,16 @@ struct pcmcia_socket { | |||
| 224 | 224 | ||
| 225 | /* 16-bit state: */ | 225 | /* 16-bit state: */ |
| 226 | struct { | 226 | struct { |
| 227 | /* PCMCIA card is present in socket */ | ||
| 228 | u8 present:1; | ||
| 229 | /* "master" ioctl is used */ | 227 | /* "master" ioctl is used */ |
| 230 | u8 busy:1; | 228 | u8 busy:1; |
| 231 | /* pcmcia module is being unloaded */ | ||
| 232 | u8 dead:1; | ||
| 233 | /* the PCMCIA card consists of two pseudo devices */ | 229 | /* the PCMCIA card consists of two pseudo devices */ |
| 234 | u8 has_pfc:1; | 230 | u8 has_pfc:1; |
| 235 | 231 | ||
| 236 | u8 reserved:4; | 232 | u8 reserved:6; |
| 237 | } pcmcia_state; | 233 | } pcmcia_state; |
| 238 | 234 | ||
| 235 | /* non-zero if PCMCIA card is present */ | ||
| 236 | atomic_t present; | ||
| 239 | 237 | ||
| 240 | #ifdef CONFIG_PCMCIA_IOCTL | 238 | #ifdef CONFIG_PCMCIA_IOCTL |
| 241 | struct user_info_t *user; | 239 | struct user_info_t *user; |
diff --git a/init/initramfs.c b/init/initramfs.c index 37d3859b1b32..4b9c20205092 100644 --- a/init/initramfs.c +++ b/init/initramfs.c | |||
| @@ -457,7 +457,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) | |||
| 457 | compress_name); | 457 | compress_name); |
| 458 | message = msg_buf; | 458 | message = msg_buf; |
| 459 | } | 459 | } |
| 460 | } | 460 | } else |
| 461 | error("junk in compressed archive"); | ||
| 461 | if (state != Reset) | 462 | if (state != Reset) |
| 462 | error("junk in compressed archive"); | 463 | error("junk in compressed archive"); |
| 463 | this_header = saved_offset + my_inptr; | 464 | this_header = saved_offset + my_inptr; |
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 2f3fbf84215a..3d1552d3c12b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -4897,7 +4897,7 @@ err_fput_free_put_context: | |||
| 4897 | 4897 | ||
| 4898 | err_free_put_context: | 4898 | err_free_put_context: |
| 4899 | if (err < 0) | 4899 | if (err < 0) |
| 4900 | kfree(event); | 4900 | free_event(event); |
| 4901 | 4901 | ||
| 4902 | err_put_context: | 4902 | err_put_context: |
| 4903 | if (err < 0) | 4903 | if (err < 0) |
diff --git a/kernel/sys.c b/kernel/sys.c index 6d1a7e0f9d5b..7cb426a58965 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -1118,7 +1118,7 @@ DECLARE_RWSEM(uts_sem); | |||
| 1118 | 1118 | ||
| 1119 | #ifdef COMPAT_UTS_MACHINE | 1119 | #ifdef COMPAT_UTS_MACHINE |
| 1120 | #define override_architecture(name) \ | 1120 | #define override_architecture(name) \ |
| 1121 | (current->personality == PER_LINUX32 && \ | 1121 | (personality(current->personality) == PER_LINUX32 && \ |
| 1122 | copy_to_user(name->machine, COMPAT_UTS_MACHINE, \ | 1122 | copy_to_user(name->machine, COMPAT_UTS_MACHINE, \ |
| 1123 | sizeof(COMPAT_UTS_MACHINE))) | 1123 | sizeof(COMPAT_UTS_MACHINE))) |
| 1124 | #else | 1124 | #else |
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index dee48658805c..5bfb213984b2 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_work *dwork) | |||
| 774 | { | 774 | { |
| 775 | if (del_timer_sync(&dwork->timer)) { | 775 | if (del_timer_sync(&dwork->timer)) { |
| 776 | struct cpu_workqueue_struct *cwq; | 776 | struct cpu_workqueue_struct *cwq; |
| 777 | cwq = wq_per_cpu(keventd_wq, get_cpu()); | 777 | cwq = wq_per_cpu(get_wq_data(&dwork->work)->wq, get_cpu()); |
| 778 | __queue_work(cwq, &dwork->work); | 778 | __queue_work(cwq, &dwork->work); |
| 779 | put_cpu(); | 779 | put_cpu(); |
| 780 | } | 780 | } |
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c index db521f45626e..bcb3a4bd68ff 100644 --- a/lib/decompress_unlzo.c +++ b/lib/decompress_unlzo.c | |||
| @@ -97,7 +97,7 @@ STATIC inline int INIT unlzo(u8 *input, int in_len, | |||
| 97 | u32 src_len, dst_len; | 97 | u32 src_len, dst_len; |
| 98 | size_t tmp; | 98 | size_t tmp; |
| 99 | u8 *in_buf, *in_buf_save, *out_buf; | 99 | u8 *in_buf, *in_buf_save, *out_buf; |
| 100 | int obytes_processed = 0; | 100 | int ret = -1; |
| 101 | 101 | ||
| 102 | set_error_fn(error_fn); | 102 | set_error_fn(error_fn); |
| 103 | 103 | ||
| @@ -174,15 +174,22 @@ STATIC inline int INIT unlzo(u8 *input, int in_len, | |||
| 174 | 174 | ||
| 175 | /* decompress */ | 175 | /* decompress */ |
| 176 | tmp = dst_len; | 176 | tmp = dst_len; |
| 177 | r = lzo1x_decompress_safe((u8 *) in_buf, src_len, | 177 | |
| 178 | /* When the input data is not compressed at all, | ||
| 179 | * lzo1x_decompress_safe will fail, so call memcpy() | ||
| 180 | * instead */ | ||
| 181 | if (unlikely(dst_len == src_len)) | ||
| 182 | memcpy(out_buf, in_buf, src_len); | ||
| 183 | else { | ||
| 184 | r = lzo1x_decompress_safe((u8 *) in_buf, src_len, | ||
| 178 | out_buf, &tmp); | 185 | out_buf, &tmp); |
| 179 | 186 | ||
| 180 | if (r != LZO_E_OK || dst_len != tmp) { | 187 | if (r != LZO_E_OK || dst_len != tmp) { |
| 181 | error("Compressed data violation"); | 188 | error("Compressed data violation"); |
| 182 | goto exit_2; | 189 | goto exit_2; |
| 190 | } | ||
| 183 | } | 191 | } |
| 184 | 192 | ||
| 185 | obytes_processed += dst_len; | ||
| 186 | if (flush) | 193 | if (flush) |
| 187 | flush(out_buf, dst_len); | 194 | flush(out_buf, dst_len); |
| 188 | if (output) | 195 | if (output) |
| @@ -196,6 +203,7 @@ STATIC inline int INIT unlzo(u8 *input, int in_len, | |||
| 196 | in_buf += src_len; | 203 | in_buf += src_len; |
| 197 | } | 204 | } |
| 198 | 205 | ||
| 206 | ret = 0; | ||
| 199 | exit_2: | 207 | exit_2: |
| 200 | if (!input) | 208 | if (!input) |
| 201 | free(in_buf); | 209 | free(in_buf); |
| @@ -203,7 +211,7 @@ exit_1: | |||
| 203 | if (!output) | 211 | if (!output) |
| 204 | free(out_buf); | 212 | free(out_buf); |
| 205 | exit: | 213 | exit: |
| 206 | return obytes_processed; | 214 | return ret; |
| 207 | } | 215 | } |
| 208 | 216 | ||
| 209 | #define decompress unlzo | 217 | #define decompress unlzo |
diff --git a/lib/flex_array.c b/lib/flex_array.c index 66eef2e4483e..41b1804fa728 100644 --- a/lib/flex_array.c +++ b/lib/flex_array.c | |||
| @@ -99,7 +99,7 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total, | |||
| 99 | ret->element_size = element_size; | 99 | ret->element_size = element_size; |
| 100 | ret->total_nr_elements = total; | 100 | ret->total_nr_elements = total; |
| 101 | if (elements_fit_in_base(ret) && !(flags & __GFP_ZERO)) | 101 | if (elements_fit_in_base(ret) && !(flags & __GFP_ZERO)) |
| 102 | memset(ret->parts[0], FLEX_ARRAY_FREE, | 102 | memset(&ret->parts[0], FLEX_ARRAY_FREE, |
| 103 | FLEX_ARRAY_BASE_BYTES_LEFT); | 103 | FLEX_ARRAY_BASE_BYTES_LEFT); |
| 104 | return ret; | 104 | return ret; |
| 105 | } | 105 | } |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 7376b7c55ffe..46d34b0b74a8 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -118,6 +118,7 @@ long long simple_strtoll(const char *cp, char **endp, unsigned int base) | |||
| 118 | 118 | ||
| 119 | return simple_strtoull(cp, endp, base); | 119 | return simple_strtoull(cp, endp, base); |
| 120 | } | 120 | } |
| 121 | EXPORT_SYMBOL(simple_strtoll); | ||
| 121 | 122 | ||
| 122 | /** | 123 | /** |
| 123 | * strict_strtoul - convert a string to an unsigned long strictly | 124 | * strict_strtoul - convert a string to an unsigned long strictly |
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index f13e067e1467..707d0dc6da0f 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | #include <linux/writeback.h> | 11 | #include <linux/writeback.h> |
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | 13 | ||
| 14 | static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0); | ||
| 15 | |||
| 14 | void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page) | 16 | void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page) |
| 15 | { | 17 | { |
| 16 | } | 18 | } |
| @@ -25,6 +27,11 @@ struct backing_dev_info default_backing_dev_info = { | |||
| 25 | }; | 27 | }; |
| 26 | EXPORT_SYMBOL_GPL(default_backing_dev_info); | 28 | EXPORT_SYMBOL_GPL(default_backing_dev_info); |
| 27 | 29 | ||
| 30 | struct backing_dev_info noop_backing_dev_info = { | ||
| 31 | .name = "noop", | ||
| 32 | }; | ||
| 33 | EXPORT_SYMBOL_GPL(noop_backing_dev_info); | ||
| 34 | |||
| 28 | static struct class *bdi_class; | 35 | static struct class *bdi_class; |
| 29 | 36 | ||
| 30 | /* | 37 | /* |
| @@ -715,6 +722,33 @@ void bdi_destroy(struct backing_dev_info *bdi) | |||
| 715 | } | 722 | } |
| 716 | EXPORT_SYMBOL(bdi_destroy); | 723 | EXPORT_SYMBOL(bdi_destroy); |
| 717 | 724 | ||
| 725 | /* | ||
| 726 | * For use from filesystems to quickly init and register a bdi associated | ||
| 727 | * with dirty writeback | ||
| 728 | */ | ||
| 729 | int bdi_setup_and_register(struct backing_dev_info *bdi, char *name, | ||
| 730 | unsigned int cap) | ||
| 731 | { | ||
| 732 | char tmp[32]; | ||
| 733 | int err; | ||
| 734 | |||
| 735 | bdi->name = name; | ||
| 736 | bdi->capabilities = cap; | ||
| 737 | err = bdi_init(bdi); | ||
| 738 | if (err) | ||
| 739 | return err; | ||
| 740 | |||
| 741 | sprintf(tmp, "%.28s%s", name, "-%d"); | ||
| 742 | err = bdi_register(bdi, NULL, tmp, atomic_long_inc_return(&bdi_seq)); | ||
| 743 | if (err) { | ||
| 744 | bdi_destroy(bdi); | ||
| 745 | return err; | ||
| 746 | } | ||
| 747 | |||
| 748 | return 0; | ||
| 749 | } | ||
| 750 | EXPORT_SYMBOL(bdi_setup_and_register); | ||
| 751 | |||
| 718 | static wait_queue_head_t congestion_wqh[2] = { | 752 | static wait_queue_head_t congestion_wqh[2] = { |
| 719 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]), | 753 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]), |
| 720 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1]) | 754 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1]) |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6034dc9e9796..ffbdfc86aedf 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -546,6 +546,7 @@ static void free_huge_page(struct page *page) | |||
| 546 | 546 | ||
| 547 | mapping = (struct address_space *) page_private(page); | 547 | mapping = (struct address_space *) page_private(page); |
| 548 | set_page_private(page, 0); | 548 | set_page_private(page, 0); |
| 549 | page->mapping = NULL; | ||
| 549 | BUG_ON(page_count(page)); | 550 | BUG_ON(page_count(page)); |
| 550 | INIT_LIST_HEAD(&page->lru); | 551 | INIT_LIST_HEAD(&page->lru); |
| 551 | 552 | ||
| @@ -2447,8 +2448,10 @@ retry: | |||
| 2447 | spin_lock(&inode->i_lock); | 2448 | spin_lock(&inode->i_lock); |
| 2448 | inode->i_blocks += blocks_per_huge_page(h); | 2449 | inode->i_blocks += blocks_per_huge_page(h); |
| 2449 | spin_unlock(&inode->i_lock); | 2450 | spin_unlock(&inode->i_lock); |
| 2450 | } else | 2451 | } else { |
| 2451 | lock_page(page); | 2452 | lock_page(page); |
| 2453 | page->mapping = HUGETLB_POISON; | ||
| 2454 | } | ||
| 2452 | } | 2455 | } |
| 2453 | 2456 | ||
| 2454 | /* | 2457 | /* |
| @@ -365,7 +365,7 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr) | |||
| 365 | do { | 365 | do { |
| 366 | cond_resched(); | 366 | cond_resched(); |
| 367 | page = follow_page(vma, addr, FOLL_GET); | 367 | page = follow_page(vma, addr, FOLL_GET); |
| 368 | if (!page) | 368 | if (IS_ERR_OR_NULL(page)) |
| 369 | break; | 369 | break; |
| 370 | if (PageKsm(page)) | 370 | if (PageKsm(page)) |
| 371 | ret = handle_mm_fault(vma->vm_mm, vma, addr, | 371 | ret = handle_mm_fault(vma->vm_mm, vma, addr, |
| @@ -447,7 +447,7 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item) | |||
| 447 | goto out; | 447 | goto out; |
| 448 | 448 | ||
| 449 | page = follow_page(vma, addr, FOLL_GET); | 449 | page = follow_page(vma, addr, FOLL_GET); |
| 450 | if (!page) | 450 | if (IS_ERR_OR_NULL(page)) |
| 451 | goto out; | 451 | goto out; |
| 452 | if (PageAnon(page)) { | 452 | if (PageAnon(page)) { |
| 453 | flush_anon_page(vma, page, addr); | 453 | flush_anon_page(vma, page, addr); |
| @@ -1086,7 +1086,7 @@ struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item, | |||
| 1086 | cond_resched(); | 1086 | cond_resched(); |
| 1087 | tree_rmap_item = rb_entry(*new, struct rmap_item, node); | 1087 | tree_rmap_item = rb_entry(*new, struct rmap_item, node); |
| 1088 | tree_page = get_mergeable_page(tree_rmap_item); | 1088 | tree_page = get_mergeable_page(tree_rmap_item); |
| 1089 | if (!tree_page) | 1089 | if (IS_ERR_OR_NULL(tree_page)) |
| 1090 | return NULL; | 1090 | return NULL; |
| 1091 | 1091 | ||
| 1092 | /* | 1092 | /* |
| @@ -1294,7 +1294,7 @@ next_mm: | |||
| 1294 | if (ksm_test_exit(mm)) | 1294 | if (ksm_test_exit(mm)) |
| 1295 | break; | 1295 | break; |
| 1296 | *page = follow_page(vma, ksm_scan.address, FOLL_GET); | 1296 | *page = follow_page(vma, ksm_scan.address, FOLL_GET); |
| 1297 | if (*page && PageAnon(*page)) { | 1297 | if (!IS_ERR_OR_NULL(*page) && PageAnon(*page)) { |
| 1298 | flush_anon_page(vma, *page, ksm_scan.address); | 1298 | flush_anon_page(vma, *page, ksm_scan.address); |
| 1299 | flush_dcache_page(*page); | 1299 | flush_dcache_page(*page); |
| 1300 | rmap_item = get_next_rmap_item(slot, | 1300 | rmap_item = get_next_rmap_item(slot, |
| @@ -1308,7 +1308,7 @@ next_mm: | |||
| 1308 | up_read(&mm->mmap_sem); | 1308 | up_read(&mm->mmap_sem); |
| 1309 | return rmap_item; | 1309 | return rmap_item; |
| 1310 | } | 1310 | } |
| 1311 | if (*page) | 1311 | if (!IS_ERR_OR_NULL(*page)) |
| 1312 | put_page(*page); | 1312 | put_page(*page); |
| 1313 | ksm_scan.address += PAGE_SIZE; | 1313 | ksm_scan.address += PAGE_SIZE; |
| 1314 | cond_resched(); | 1314 | cond_resched(); |
| @@ -1367,7 +1367,7 @@ next_mm: | |||
| 1367 | static void ksm_do_scan(unsigned int scan_npages) | 1367 | static void ksm_do_scan(unsigned int scan_npages) |
| 1368 | { | 1368 | { |
| 1369 | struct rmap_item *rmap_item; | 1369 | struct rmap_item *rmap_item; |
| 1370 | struct page *page; | 1370 | struct page *uninitialized_var(page); |
| 1371 | 1371 | ||
| 1372 | while (scan_npages--) { | 1372 | while (scan_npages--) { |
| 1373 | cond_resched(); | 1373 | cond_resched(); |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e06490d4ae5e..0f711c213d2e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -2435,11 +2435,11 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr) | |||
| 2435 | } | 2435 | } |
| 2436 | unlock_page_cgroup(pc); | 2436 | unlock_page_cgroup(pc); |
| 2437 | 2437 | ||
| 2438 | *ptr = mem; | ||
| 2438 | if (mem) { | 2439 | if (mem) { |
| 2439 | ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem, false); | 2440 | ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false); |
| 2440 | css_put(&mem->css); | 2441 | css_put(&mem->css); |
| 2441 | } | 2442 | } |
| 2442 | *ptr = mem; | ||
| 2443 | return ret; | 2443 | return ret; |
| 2444 | } | 2444 | } |
| 2445 | 2445 | ||
| @@ -1977,7 +1977,8 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, | |||
| 1977 | return 0; | 1977 | return 0; |
| 1978 | 1978 | ||
| 1979 | /* Clean everything up if vma_adjust failed. */ | 1979 | /* Clean everything up if vma_adjust failed. */ |
| 1980 | new->vm_ops->close(new); | 1980 | if (new->vm_ops && new->vm_ops->close) |
| 1981 | new->vm_ops->close(new); | ||
| 1981 | if (new->vm_file) { | 1982 | if (new->vm_file) { |
| 1982 | if (vma->vm_flags & VM_EXECUTABLE) | 1983 | if (vma->vm_flags & VM_EXECUTABLE) |
| 1983 | removed_exe_file_vma(mm); | 1984 | removed_exe_file_vma(mm); |
| @@ -133,8 +133,8 @@ int anon_vma_prepare(struct vm_area_struct *vma) | |||
| 133 | goto out_enomem_free_avc; | 133 | goto out_enomem_free_avc; |
| 134 | allocated = anon_vma; | 134 | allocated = anon_vma; |
| 135 | } | 135 | } |
| 136 | spin_lock(&anon_vma->lock); | ||
| 137 | 136 | ||
| 137 | spin_lock(&anon_vma->lock); | ||
| 138 | /* page_table_lock to protect against threads */ | 138 | /* page_table_lock to protect against threads */ |
| 139 | spin_lock(&mm->page_table_lock); | 139 | spin_lock(&mm->page_table_lock); |
| 140 | if (likely(!vma->anon_vma)) { | 140 | if (likely(!vma->anon_vma)) { |
| @@ -144,14 +144,15 @@ int anon_vma_prepare(struct vm_area_struct *vma) | |||
| 144 | list_add(&avc->same_vma, &vma->anon_vma_chain); | 144 | list_add(&avc->same_vma, &vma->anon_vma_chain); |
| 145 | list_add(&avc->same_anon_vma, &anon_vma->head); | 145 | list_add(&avc->same_anon_vma, &anon_vma->head); |
| 146 | allocated = NULL; | 146 | allocated = NULL; |
| 147 | avc = NULL; | ||
| 147 | } | 148 | } |
| 148 | spin_unlock(&mm->page_table_lock); | 149 | spin_unlock(&mm->page_table_lock); |
| 149 | |||
| 150 | spin_unlock(&anon_vma->lock); | 150 | spin_unlock(&anon_vma->lock); |
| 151 | if (unlikely(allocated)) { | 151 | |
| 152 | if (unlikely(allocated)) | ||
| 152 | anon_vma_free(allocated); | 153 | anon_vma_free(allocated); |
| 154 | if (unlikely(avc)) | ||
| 153 | anon_vma_chain_free(avc); | 155 | anon_vma_chain_free(avc); |
| 154 | } | ||
| 155 | } | 156 | } |
| 156 | return 0; | 157 | return 0; |
| 157 | 158 | ||
| @@ -2153,7 +2153,7 @@ static int init_kmem_cache_nodes(struct kmem_cache *s, gfp_t gfpflags) | |||
| 2153 | int local_node; | 2153 | int local_node; |
| 2154 | 2154 | ||
| 2155 | if (slab_state >= UP && (s < kmalloc_caches || | 2155 | if (slab_state >= UP && (s < kmalloc_caches || |
| 2156 | s > kmalloc_caches + KMALLOC_CACHES)) | 2156 | s >= kmalloc_caches + KMALLOC_CACHES)) |
| 2157 | local_node = page_to_nid(virt_to_page(s)); | 2157 | local_node = page_to_nid(virt_to_page(s)); |
| 2158 | else | 2158 | else |
| 2159 | local_node = 0; | 2159 | local_node = 0; |
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 99d68c34e4f1..9753b690a8b3 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
| @@ -1626,7 +1626,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms | |||
| 1626 | /* Connectionless channel */ | 1626 | /* Connectionless channel */ |
| 1627 | if (sk->sk_type == SOCK_DGRAM) { | 1627 | if (sk->sk_type == SOCK_DGRAM) { |
| 1628 | skb = l2cap_create_connless_pdu(sk, msg, len); | 1628 | skb = l2cap_create_connless_pdu(sk, msg, len); |
| 1629 | err = l2cap_do_send(sk, skb); | 1629 | if (IS_ERR(skb)) |
| 1630 | err = PTR_ERR(skb); | ||
| 1631 | else | ||
| 1632 | err = l2cap_do_send(sk, skb); | ||
| 1630 | goto done; | 1633 | goto done; |
| 1631 | } | 1634 | } |
| 1632 | 1635 | ||
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index f29ada827a6a..eaa0e1bae49b 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
| @@ -727,7 +727,7 @@ static int br_multicast_igmp3_report(struct net_bridge *br, | |||
| 727 | group = grec->grec_mca; | 727 | group = grec->grec_mca; |
| 728 | type = grec->grec_type; | 728 | type = grec->grec_type; |
| 729 | 729 | ||
| 730 | len += grec->grec_nsrcs * 4; | 730 | len += ntohs(grec->grec_nsrcs) * 4; |
| 731 | if (!pskb_may_pull(skb, len)) | 731 | if (!pskb_may_pull(skb, len)) |
| 732 | return -EINVAL; | 732 | return -EINVAL; |
| 733 | 733 | ||
| @@ -957,9 +957,6 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br, | |||
| 957 | unsigned offset; | 957 | unsigned offset; |
| 958 | int err; | 958 | int err; |
| 959 | 959 | ||
| 960 | BR_INPUT_SKB_CB(skb)->igmp = 0; | ||
| 961 | BR_INPUT_SKB_CB(skb)->mrouters_only = 0; | ||
| 962 | |||
| 963 | /* We treat OOM as packet loss for now. */ | 960 | /* We treat OOM as packet loss for now. */ |
| 964 | if (!pskb_may_pull(skb, sizeof(*iph))) | 961 | if (!pskb_may_pull(skb, sizeof(*iph))) |
| 965 | return -EINVAL; | 962 | return -EINVAL; |
| @@ -1049,6 +1046,9 @@ err_out: | |||
| 1049 | int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, | 1046 | int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, |
| 1050 | struct sk_buff *skb) | 1047 | struct sk_buff *skb) |
| 1051 | { | 1048 | { |
| 1049 | BR_INPUT_SKB_CB(skb)->igmp = 0; | ||
| 1050 | BR_INPUT_SKB_CB(skb)->mrouters_only = 0; | ||
| 1051 | |||
| 1052 | if (br->multicast_disabled) | 1052 | if (br->multicast_disabled) |
| 1053 | return 0; | 1053 | return 0; |
| 1054 | 1054 | ||
diff --git a/net/core/dev.c b/net/core/dev.c index 92584bfef09b..f769098774b7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1990,7 +1990,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, | |||
| 1990 | queue_index = skb_tx_hash(dev, skb); | 1990 | queue_index = skb_tx_hash(dev, skb); |
| 1991 | 1991 | ||
| 1992 | if (sk) { | 1992 | if (sk) { |
| 1993 | struct dst_entry *dst = rcu_dereference(sk->sk_dst_cache); | 1993 | struct dst_entry *dst = rcu_dereference_bh(sk->sk_dst_cache); |
| 1994 | 1994 | ||
| 1995 | if (dst && skb_dst(skb) == dst) | 1995 | if (dst && skb_dst(skb) == dst) |
| 1996 | sk_tx_queue_set(sk, queue_index); | 1996 | sk_tx_queue_set(sk, queue_index); |
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 4568120d8533..fe776c9ddeca 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -1270,10 +1270,11 @@ replay: | |||
| 1270 | err = ops->newlink(net, dev, tb, data); | 1270 | err = ops->newlink(net, dev, tb, data); |
| 1271 | else | 1271 | else |
| 1272 | err = register_netdevice(dev); | 1272 | err = register_netdevice(dev); |
| 1273 | if (err < 0 && !IS_ERR(dev)) { | 1273 | |
| 1274 | if (err < 0 && !IS_ERR(dev)) | ||
| 1274 | free_netdev(dev); | 1275 | free_netdev(dev); |
| 1276 | if (err < 0) | ||
| 1275 | goto out; | 1277 | goto out; |
| 1276 | } | ||
| 1277 | 1278 | ||
| 1278 | err = rtnl_configure_link(dev, ifm); | 1279 | err = rtnl_configure_link(dev, ifm); |
| 1279 | if (err < 0) | 1280 | if (err < 0) |
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index c7da600750bb..93c91b633a56 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c | |||
| @@ -151,6 +151,9 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg, | |||
| 151 | dev_load(sock_net(sk), ifr.ifr_name); | 151 | dev_load(sock_net(sk), ifr.ifr_name); |
| 152 | dev = dev_get_by_name(sock_net(sk), ifr.ifr_name); | 152 | dev = dev_get_by_name(sock_net(sk), ifr.ifr_name); |
| 153 | 153 | ||
| 154 | if (!dev) | ||
| 155 | return -ENODEV; | ||
| 156 | |||
| 154 | if (dev->type == ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl) | 157 | if (dev->type == ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl) |
| 155 | ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd); | 158 | ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd); |
| 156 | 159 | ||
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 3192aa02ba5d..3f9e86b15e0d 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -200,7 +200,7 @@ lookup_protocol: | |||
| 200 | 200 | ||
| 201 | inet_sk(sk)->pinet6 = np = inet6_sk_generic(sk); | 201 | inet_sk(sk)->pinet6 = np = inet6_sk_generic(sk); |
| 202 | np->hop_limit = -1; | 202 | np->hop_limit = -1; |
| 203 | np->mcast_hops = -1; | 203 | np->mcast_hops = IPV6_DEFAULT_MCASTHOPS; |
| 204 | np->mc_loop = 1; | 204 | np->mc_loop = 1; |
| 205 | np->pmtudisc = IPV6_PMTUDISC_WANT; | 205 | np->pmtudisc = IPV6_PMTUDISC_WANT; |
| 206 | np->ipv6only = net->ipv6.sysctl.bindv6only; | 206 | np->ipv6only = net->ipv6.sysctl.bindv6only; |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 65f9c379df38..75d5ef830097 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -629,7 +629,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) | |||
| 629 | /* We must not fragment if the socket is set to force MTU discovery | 629 | /* We must not fragment if the socket is set to force MTU discovery |
| 630 | * or if the skb it not generated by a local socket. | 630 | * or if the skb it not generated by a local socket. |
| 631 | */ | 631 | */ |
| 632 | if (!skb->local_df) { | 632 | if (!skb->local_df && skb->len > mtu) { |
| 633 | skb->dev = skb_dst(skb)->dev; | 633 | skb->dev = skb_dst(skb)->dev; |
| 634 | icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); | 634 | icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); |
| 635 | IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), | 635 | IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c2438e8cb9d0..05ebd7833043 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -815,7 +815,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk, | |||
| 815 | { | 815 | { |
| 816 | int flags = 0; | 816 | int flags = 0; |
| 817 | 817 | ||
| 818 | if (rt6_need_strict(&fl->fl6_dst)) | 818 | if (fl->oif || rt6_need_strict(&fl->fl6_dst)) |
| 819 | flags |= RT6_LOOKUP_F_IFACE; | 819 | flags |= RT6_LOOKUP_F_IFACE; |
| 820 | 820 | ||
| 821 | if (!ipv6_addr_any(&fl->fl6_src)) | 821 | if (!ipv6_addr_any(&fl->fl6_src)) |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index c92ebe8f80d5..075f540ec197 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1015,7 +1015,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win, | |||
| 1015 | skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len); | 1015 | skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len); |
| 1016 | 1016 | ||
| 1017 | t1 = (struct tcphdr *) skb_push(buff, tot_len); | 1017 | t1 = (struct tcphdr *) skb_push(buff, tot_len); |
| 1018 | skb_reset_transport_header(skb); | 1018 | skb_reset_transport_header(buff); |
| 1019 | 1019 | ||
| 1020 | /* Swap the send and the receive. */ | 1020 | /* Swap the send and the receive. */ |
| 1021 | memset(t1, 0, sizeof(*t1)); | 1021 | memset(t1, 0, sizeof(*t1)); |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index ae181651c75a..00bf7c962b7e 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -124,7 +124,7 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | |||
| 124 | xdst->u.dst.dev = dev; | 124 | xdst->u.dst.dev = dev; |
| 125 | dev_hold(dev); | 125 | dev_hold(dev); |
| 126 | 126 | ||
| 127 | xdst->u.rt6.rt6i_idev = in6_dev_get(rt->u.dst.dev); | 127 | xdst->u.rt6.rt6i_idev = in6_dev_get(dev); |
| 128 | if (!xdst->u.rt6.rt6i_idev) | 128 | if (!xdst->u.rt6.rt6i_idev) |
| 129 | return -ENODEV; | 129 | return -ENODEV; |
| 130 | 130 | ||
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 96d25348aa59..87782a4bb541 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c | |||
| @@ -184,7 +184,6 @@ static void sta_addba_resp_timer_expired(unsigned long data) | |||
| 184 | HT_AGG_STATE_REQ_STOP_BA_MSK)) != | 184 | HT_AGG_STATE_REQ_STOP_BA_MSK)) != |
| 185 | HT_ADDBA_REQUESTED_MSK) { | 185 | HT_ADDBA_REQUESTED_MSK) { |
| 186 | spin_unlock_bh(&sta->lock); | 186 | spin_unlock_bh(&sta->lock); |
| 187 | *state = HT_AGG_STATE_IDLE; | ||
| 188 | #ifdef CONFIG_MAC80211_HT_DEBUG | 187 | #ifdef CONFIG_MAC80211_HT_DEBUG |
| 189 | printk(KERN_DEBUG "timer expired on tid %d but we are not " | 188 | printk(KERN_DEBUG "timer expired on tid %d but we are not " |
| 190 | "(or no longer) expecting addBA response there", | 189 | "(or no longer) expecting addBA response there", |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index c8cd169fc10e..4aefa6dc3091 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -168,6 +168,8 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, | |||
| 168 | ht_changed = conf_is_ht(&local->hw.conf) != enable_ht || | 168 | ht_changed = conf_is_ht(&local->hw.conf) != enable_ht || |
| 169 | channel_type != local->hw.conf.channel_type; | 169 | channel_type != local->hw.conf.channel_type; |
| 170 | 170 | ||
| 171 | if (local->tmp_channel) | ||
| 172 | local->tmp_channel_type = channel_type; | ||
| 171 | local->oper_channel_type = channel_type; | 173 | local->oper_channel_type = channel_type; |
| 172 | 174 | ||
| 173 | if (ht_changed) { | 175 | if (ht_changed) { |
diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c index 9ece910ea394..7b155081b4dc 100644 --- a/net/rds/rdma_transport.c +++ b/net/rds/rdma_transport.c | |||
| @@ -134,7 +134,7 @@ static int __init rds_rdma_listen_init(void) | |||
| 134 | ret = PTR_ERR(cm_id); | 134 | ret = PTR_ERR(cm_id); |
| 135 | printk(KERN_ERR "RDS/RDMA: failed to setup listener, " | 135 | printk(KERN_ERR "RDS/RDMA: failed to setup listener, " |
| 136 | "rdma_create_id() returned %d\n", ret); | 136 | "rdma_create_id() returned %d\n", ret); |
| 137 | goto out; | 137 | return ret; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | sin.sin_family = AF_INET, | 140 | sin.sin_family = AF_INET, |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index df5abbff63e2..99c93ee98ad9 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -1194,8 +1194,10 @@ void sctp_assoc_update(struct sctp_association *asoc, | |||
| 1194 | /* Remove any peer addresses not present in the new association. */ | 1194 | /* Remove any peer addresses not present in the new association. */ |
| 1195 | list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) { | 1195 | list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) { |
| 1196 | trans = list_entry(pos, struct sctp_transport, transports); | 1196 | trans = list_entry(pos, struct sctp_transport, transports); |
| 1197 | if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr)) | 1197 | if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr)) { |
| 1198 | sctp_assoc_del_peer(asoc, &trans->ipaddr); | 1198 | sctp_assoc_rm_peer(asoc, trans); |
| 1199 | continue; | ||
| 1200 | } | ||
| 1199 | 1201 | ||
| 1200 | if (asoc->state >= SCTP_STATE_ESTABLISHED) | 1202 | if (asoc->state >= SCTP_STATE_ESTABLISHED) |
| 1201 | sctp_transport_reset(trans); | 1203 | sctp_transport_reset(trans); |
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 905fda582b92..7ec09ba03a1c 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c | |||
| @@ -144,6 +144,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, | |||
| 144 | /* Use SCTP specific send buffer space queues. */ | 144 | /* Use SCTP specific send buffer space queues. */ |
| 145 | ep->sndbuf_policy = sctp_sndbuf_policy; | 145 | ep->sndbuf_policy = sctp_sndbuf_policy; |
| 146 | 146 | ||
| 147 | sk->sk_data_ready = sctp_data_ready; | ||
| 147 | sk->sk_write_space = sctp_write_space; | 148 | sk->sk_write_space = sctp_write_space; |
| 148 | sock_set_flag(sk, SOCK_USE_WRITE_QUEUE); | 149 | sock_set_flag(sk, SOCK_USE_WRITE_QUEUE); |
| 149 | 150 | ||
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 17cb400ecd6a..30c1767186b8 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
| @@ -108,7 +108,7 @@ static const struct sctp_paramhdr prsctp_param = { | |||
| 108 | cpu_to_be16(sizeof(struct sctp_paramhdr)), | 108 | cpu_to_be16(sizeof(struct sctp_paramhdr)), |
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| 111 | /* A helper to initialize to initialize an op error inside a | 111 | /* A helper to initialize an op error inside a |
| 112 | * provided chunk, as most cause codes will be embedded inside an | 112 | * provided chunk, as most cause codes will be embedded inside an |
| 113 | * abort chunk. | 113 | * abort chunk. |
| 114 | */ | 114 | */ |
| @@ -125,6 +125,29 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, | |||
| 125 | chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); | 125 | chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | /* A helper to initialize an op error inside a | ||
| 129 | * provided chunk, as most cause codes will be embedded inside an | ||
| 130 | * abort chunk. Differs from sctp_init_cause in that it won't oops | ||
| 131 | * if there isn't enough space in the op error chunk | ||
| 132 | */ | ||
| 133 | int sctp_init_cause_fixed(struct sctp_chunk *chunk, __be16 cause_code, | ||
| 134 | size_t paylen) | ||
| 135 | { | ||
| 136 | sctp_errhdr_t err; | ||
| 137 | __u16 len; | ||
| 138 | |||
| 139 | /* Cause code constants are now defined in network order. */ | ||
| 140 | err.cause = cause_code; | ||
| 141 | len = sizeof(sctp_errhdr_t) + paylen; | ||
| 142 | err.length = htons(len); | ||
| 143 | |||
| 144 | if (skb_tailroom(chunk->skb) > len) | ||
| 145 | return -ENOSPC; | ||
| 146 | chunk->subh.err_hdr = sctp_addto_chunk_fixed(chunk, | ||
| 147 | sizeof(sctp_errhdr_t), | ||
| 148 | &err); | ||
| 149 | return 0; | ||
| 150 | } | ||
| 128 | /* 3.3.2 Initiation (INIT) (1) | 151 | /* 3.3.2 Initiation (INIT) (1) |
| 129 | * | 152 | * |
| 130 | * This chunk is used to initiate a SCTP association between two | 153 | * This chunk is used to initiate a SCTP association between two |
| @@ -208,7 +231,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, | |||
| 208 | sp = sctp_sk(asoc->base.sk); | 231 | sp = sctp_sk(asoc->base.sk); |
| 209 | num_types = sp->pf->supported_addrs(sp, types); | 232 | num_types = sp->pf->supported_addrs(sp, types); |
| 210 | 233 | ||
| 211 | chunksize = sizeof(init) + addrs_len + SCTP_SAT_LEN(num_types); | 234 | chunksize = sizeof(init) + addrs_len; |
| 235 | chunksize += WORD_ROUND(SCTP_SAT_LEN(num_types)); | ||
| 212 | chunksize += sizeof(ecap_param); | 236 | chunksize += sizeof(ecap_param); |
| 213 | 237 | ||
| 214 | if (sctp_prsctp_enable) | 238 | if (sctp_prsctp_enable) |
| @@ -238,14 +262,14 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, | |||
| 238 | /* Add HMACS parameter length if any were defined */ | 262 | /* Add HMACS parameter length if any were defined */ |
| 239 | auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs; | 263 | auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs; |
| 240 | if (auth_hmacs->length) | 264 | if (auth_hmacs->length) |
| 241 | chunksize += ntohs(auth_hmacs->length); | 265 | chunksize += WORD_ROUND(ntohs(auth_hmacs->length)); |
| 242 | else | 266 | else |
| 243 | auth_hmacs = NULL; | 267 | auth_hmacs = NULL; |
| 244 | 268 | ||
| 245 | /* Add CHUNKS parameter length */ | 269 | /* Add CHUNKS parameter length */ |
| 246 | auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks; | 270 | auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks; |
| 247 | if (auth_chunks->length) | 271 | if (auth_chunks->length) |
| 248 | chunksize += ntohs(auth_chunks->length); | 272 | chunksize += WORD_ROUND(ntohs(auth_chunks->length)); |
| 249 | else | 273 | else |
| 250 | auth_chunks = NULL; | 274 | auth_chunks = NULL; |
| 251 | 275 | ||
| @@ -255,7 +279,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, | |||
| 255 | 279 | ||
| 256 | /* If we have any extensions to report, account for that */ | 280 | /* If we have any extensions to report, account for that */ |
| 257 | if (num_ext) | 281 | if (num_ext) |
| 258 | chunksize += sizeof(sctp_supported_ext_param_t) + num_ext; | 282 | chunksize += WORD_ROUND(sizeof(sctp_supported_ext_param_t) + |
| 283 | num_ext); | ||
| 259 | 284 | ||
| 260 | /* RFC 2960 3.3.2 Initiation (INIT) (1) | 285 | /* RFC 2960 3.3.2 Initiation (INIT) (1) |
| 261 | * | 286 | * |
| @@ -397,13 +422,13 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc, | |||
| 397 | 422 | ||
| 398 | auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs; | 423 | auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs; |
| 399 | if (auth_hmacs->length) | 424 | if (auth_hmacs->length) |
| 400 | chunksize += ntohs(auth_hmacs->length); | 425 | chunksize += WORD_ROUND(ntohs(auth_hmacs->length)); |
| 401 | else | 426 | else |
| 402 | auth_hmacs = NULL; | 427 | auth_hmacs = NULL; |
| 403 | 428 | ||
| 404 | auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks; | 429 | auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks; |
| 405 | if (auth_chunks->length) | 430 | if (auth_chunks->length) |
| 406 | chunksize += ntohs(auth_chunks->length); | 431 | chunksize += WORD_ROUND(ntohs(auth_chunks->length)); |
| 407 | else | 432 | else |
| 408 | auth_chunks = NULL; | 433 | auth_chunks = NULL; |
| 409 | 434 | ||
| @@ -412,7 +437,8 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc, | |||
| 412 | } | 437 | } |
| 413 | 438 | ||
| 414 | if (num_ext) | 439 | if (num_ext) |
| 415 | chunksize += sizeof(sctp_supported_ext_param_t) + num_ext; | 440 | chunksize += WORD_ROUND(sizeof(sctp_supported_ext_param_t) + |
| 441 | num_ext); | ||
| 416 | 442 | ||
| 417 | /* Now allocate and fill out the chunk. */ | 443 | /* Now allocate and fill out the chunk. */ |
| 418 | retval = sctp_make_chunk(asoc, SCTP_CID_INIT_ACK, 0, chunksize); | 444 | retval = sctp_make_chunk(asoc, SCTP_CID_INIT_ACK, 0, chunksize); |
| @@ -1129,6 +1155,24 @@ nodata: | |||
| 1129 | return retval; | 1155 | return retval; |
| 1130 | } | 1156 | } |
| 1131 | 1157 | ||
| 1158 | /* Create an Operation Error chunk of a fixed size, | ||
| 1159 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) | ||
| 1160 | * This is a helper function to allocate an error chunk for | ||
| 1161 | * for those invalid parameter codes in which we may not want | ||
| 1162 | * to report all the errors, if the incomming chunk is large | ||
| 1163 | */ | ||
| 1164 | static inline struct sctp_chunk *sctp_make_op_error_fixed( | ||
| 1165 | const struct sctp_association *asoc, | ||
| 1166 | const struct sctp_chunk *chunk) | ||
| 1167 | { | ||
| 1168 | size_t size = asoc ? asoc->pathmtu : 0; | ||
| 1169 | |||
| 1170 | if (!size) | ||
| 1171 | size = SCTP_DEFAULT_MAXSEGMENT; | ||
| 1172 | |||
| 1173 | return sctp_make_op_error_space(asoc, chunk, size); | ||
| 1174 | } | ||
| 1175 | |||
| 1132 | /* Create an Operation Error chunk. */ | 1176 | /* Create an Operation Error chunk. */ |
| 1133 | struct sctp_chunk *sctp_make_op_error(const struct sctp_association *asoc, | 1177 | struct sctp_chunk *sctp_make_op_error(const struct sctp_association *asoc, |
| 1134 | const struct sctp_chunk *chunk, | 1178 | const struct sctp_chunk *chunk, |
| @@ -1371,6 +1415,18 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data) | |||
| 1371 | return target; | 1415 | return target; |
| 1372 | } | 1416 | } |
| 1373 | 1417 | ||
| 1418 | /* Append bytes to the end of a chunk. Returns NULL if there isn't sufficient | ||
| 1419 | * space in the chunk | ||
| 1420 | */ | ||
| 1421 | void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk, | ||
| 1422 | int len, const void *data) | ||
| 1423 | { | ||
| 1424 | if (skb_tailroom(chunk->skb) > len) | ||
| 1425 | return sctp_addto_chunk(chunk, len, data); | ||
| 1426 | else | ||
| 1427 | return NULL; | ||
| 1428 | } | ||
| 1429 | |||
| 1374 | /* Append bytes from user space to the end of a chunk. Will panic if | 1430 | /* Append bytes from user space to the end of a chunk. Will panic if |
| 1375 | * chunk is not big enough. | 1431 | * chunk is not big enough. |
| 1376 | * Returns a kernel err value. | 1432 | * Returns a kernel err value. |
| @@ -1974,13 +2030,12 @@ static sctp_ierror_t sctp_process_unk_param(const struct sctp_association *asoc, | |||
| 1974 | * returning multiple unknown parameters. | 2030 | * returning multiple unknown parameters. |
| 1975 | */ | 2031 | */ |
| 1976 | if (NULL == *errp) | 2032 | if (NULL == *errp) |
| 1977 | *errp = sctp_make_op_error_space(asoc, chunk, | 2033 | *errp = sctp_make_op_error_fixed(asoc, chunk); |
| 1978 | ntohs(chunk->chunk_hdr->length)); | ||
| 1979 | 2034 | ||
| 1980 | if (*errp) { | 2035 | if (*errp) { |
| 1981 | sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, | 2036 | sctp_init_cause_fixed(*errp, SCTP_ERROR_UNKNOWN_PARAM, |
| 1982 | WORD_ROUND(ntohs(param.p->length))); | 2037 | WORD_ROUND(ntohs(param.p->length))); |
| 1983 | sctp_addto_chunk(*errp, | 2038 | sctp_addto_chunk_fixed(*errp, |
| 1984 | WORD_ROUND(ntohs(param.p->length)), | 2039 | WORD_ROUND(ntohs(param.p->length)), |
| 1985 | param.v); | 2040 | param.v); |
| 1986 | } else { | 2041 | } else { |
| @@ -3315,21 +3370,6 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, | |||
| 3315 | sctp_chunk_free(asconf); | 3370 | sctp_chunk_free(asconf); |
| 3316 | asoc->addip_last_asconf = NULL; | 3371 | asoc->addip_last_asconf = NULL; |
| 3317 | 3372 | ||
| 3318 | /* Send the next asconf chunk from the addip chunk queue. */ | ||
| 3319 | if (!list_empty(&asoc->addip_chunk_list)) { | ||
| 3320 | struct list_head *entry = asoc->addip_chunk_list.next; | ||
| 3321 | asconf = list_entry(entry, struct sctp_chunk, list); | ||
| 3322 | |||
| 3323 | list_del_init(entry); | ||
| 3324 | |||
| 3325 | /* Hold the chunk until an ASCONF_ACK is received. */ | ||
| 3326 | sctp_chunk_hold(asconf); | ||
| 3327 | if (sctp_primitive_ASCONF(asoc, asconf)) | ||
| 3328 | sctp_chunk_free(asconf); | ||
| 3329 | else | ||
| 3330 | asoc->addip_last_asconf = asconf; | ||
| 3331 | } | ||
| 3332 | |||
| 3333 | return retval; | 3373 | return retval; |
| 3334 | } | 3374 | } |
| 3335 | 3375 | ||
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index 4c5bed9af4e3..d5ae450b6f02 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
| @@ -962,6 +962,29 @@ static int sctp_cmd_send_msg(struct sctp_association *asoc, | |||
| 962 | } | 962 | } |
| 963 | 963 | ||
| 964 | 964 | ||
| 965 | /* Sent the next ASCONF packet currently stored in the association. | ||
| 966 | * This happens after the ASCONF_ACK was succeffully processed. | ||
| 967 | */ | ||
| 968 | static void sctp_cmd_send_asconf(struct sctp_association *asoc) | ||
| 969 | { | ||
| 970 | /* Send the next asconf chunk from the addip chunk | ||
| 971 | * queue. | ||
| 972 | */ | ||
| 973 | if (!list_empty(&asoc->addip_chunk_list)) { | ||
| 974 | struct list_head *entry = asoc->addip_chunk_list.next; | ||
| 975 | struct sctp_chunk *asconf = list_entry(entry, | ||
| 976 | struct sctp_chunk, list); | ||
| 977 | list_del_init(entry); | ||
| 978 | |||
| 979 | /* Hold the chunk until an ASCONF_ACK is received. */ | ||
| 980 | sctp_chunk_hold(asconf); | ||
| 981 | if (sctp_primitive_ASCONF(asoc, asconf)) | ||
| 982 | sctp_chunk_free(asconf); | ||
| 983 | else | ||
| 984 | asoc->addip_last_asconf = asconf; | ||
| 985 | } | ||
| 986 | } | ||
| 987 | |||
| 965 | 988 | ||
| 966 | /* These three macros allow us to pull the debugging code out of the | 989 | /* These three macros allow us to pull the debugging code out of the |
| 967 | * main flow of sctp_do_sm() to keep attention focused on the real | 990 | * main flow of sctp_do_sm() to keep attention focused on the real |
| @@ -1617,6 +1640,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
| 1617 | } | 1640 | } |
| 1618 | error = sctp_cmd_send_msg(asoc, cmd->obj.msg); | 1641 | error = sctp_cmd_send_msg(asoc, cmd->obj.msg); |
| 1619 | break; | 1642 | break; |
| 1643 | case SCTP_CMD_SEND_NEXT_ASCONF: | ||
| 1644 | sctp_cmd_send_asconf(asoc); | ||
| 1645 | break; | ||
| 1620 | default: | 1646 | default: |
| 1621 | printk(KERN_WARNING "Impossible command: %u, %p\n", | 1647 | printk(KERN_WARNING "Impossible command: %u, %p\n", |
| 1622 | cmd->verb, cmd->obj.ptr); | 1648 | cmd->verb, cmd->obj.ptr); |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index abf601a1b847..24b2cd555637 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -3676,8 +3676,14 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep, | |||
| 3676 | SCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO)); | 3676 | SCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO)); |
| 3677 | 3677 | ||
| 3678 | if (!sctp_process_asconf_ack((struct sctp_association *)asoc, | 3678 | if (!sctp_process_asconf_ack((struct sctp_association *)asoc, |
| 3679 | asconf_ack)) | 3679 | asconf_ack)) { |
| 3680 | /* Successfully processed ASCONF_ACK. We can | ||
| 3681 | * release the next asconf if we have one. | ||
| 3682 | */ | ||
| 3683 | sctp_add_cmd_sf(commands, SCTP_CMD_SEND_NEXT_ASCONF, | ||
| 3684 | SCTP_NULL()); | ||
| 3680 | return SCTP_DISPOSITION_CONSUME; | 3685 | return SCTP_DISPOSITION_CONSUME; |
| 3686 | } | ||
| 3681 | 3687 | ||
| 3682 | abort = sctp_make_abort(asoc, asconf_ack, | 3688 | abort = sctp_make_abort(asoc, asconf_ack, |
| 3683 | sizeof(sctp_errhdr_t)); | 3689 | sizeof(sctp_errhdr_t)); |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 007e8baba089..44a1ab03a3f0 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -3719,12 +3719,12 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk) | |||
| 3719 | sp->hmac = NULL; | 3719 | sp->hmac = NULL; |
| 3720 | 3720 | ||
| 3721 | SCTP_DBG_OBJCNT_INC(sock); | 3721 | SCTP_DBG_OBJCNT_INC(sock); |
| 3722 | percpu_counter_inc(&sctp_sockets_allocated); | ||
| 3723 | 3722 | ||
| 3724 | /* Set socket backlog limit. */ | 3723 | /* Set socket backlog limit. */ |
| 3725 | sk->sk_backlog.limit = sysctl_sctp_rmem[1]; | 3724 | sk->sk_backlog.limit = sysctl_sctp_rmem[1]; |
| 3726 | 3725 | ||
| 3727 | local_bh_disable(); | 3726 | local_bh_disable(); |
| 3727 | percpu_counter_inc(&sctp_sockets_allocated); | ||
| 3728 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); | 3728 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); |
| 3729 | local_bh_enable(); | 3729 | local_bh_enable(); |
| 3730 | 3730 | ||
| @@ -3741,8 +3741,8 @@ SCTP_STATIC void sctp_destroy_sock(struct sock *sk) | |||
| 3741 | /* Release our hold on the endpoint. */ | 3741 | /* Release our hold on the endpoint. */ |
| 3742 | ep = sctp_sk(sk)->ep; | 3742 | ep = sctp_sk(sk)->ep; |
| 3743 | sctp_endpoint_free(ep); | 3743 | sctp_endpoint_free(ep); |
| 3744 | percpu_counter_dec(&sctp_sockets_allocated); | ||
| 3745 | local_bh_disable(); | 3744 | local_bh_disable(); |
| 3745 | percpu_counter_dec(&sctp_sockets_allocated); | ||
| 3746 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); | 3746 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); |
| 3747 | local_bh_enable(); | 3747 | local_bh_enable(); |
| 3748 | } | 3748 | } |
| @@ -6189,6 +6189,16 @@ do_nonblock: | |||
| 6189 | goto out; | 6189 | goto out; |
| 6190 | } | 6190 | } |
| 6191 | 6191 | ||
| 6192 | void sctp_data_ready(struct sock *sk, int len) | ||
| 6193 | { | ||
| 6194 | read_lock_bh(&sk->sk_callback_lock); | ||
| 6195 | if (sk_has_sleeper(sk)) | ||
| 6196 | wake_up_interruptible_sync_poll(sk->sk_sleep, POLLIN | | ||
| 6197 | POLLRDNORM | POLLRDBAND); | ||
| 6198 | sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN); | ||
| 6199 | read_unlock_bh(&sk->sk_callback_lock); | ||
| 6200 | } | ||
| 6201 | |||
| 6192 | /* If socket sndbuf has changed, wake up all per association waiters. */ | 6202 | /* If socket sndbuf has changed, wake up all per association waiters. */ |
| 6193 | void sctp_write_space(struct sock *sk) | 6203 | void sctp_write_space(struct sock *sk) |
| 6194 | { | 6204 | { |
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index f394fc190a49..95afe79dd9d7 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
| @@ -237,7 +237,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) | |||
| 237 | list_for_each_entry_safe(cred, next, &cred_unused, cr_lru) { | 237 | list_for_each_entry_safe(cred, next, &cred_unused, cr_lru) { |
| 238 | 238 | ||
| 239 | /* Enforce a 60 second garbage collection moratorium */ | 239 | /* Enforce a 60 second garbage collection moratorium */ |
| 240 | if (time_in_range_open(cred->cr_expire, expired, jiffies) && | 240 | if (time_in_range(cred->cr_expire, expired, jiffies) && |
| 241 | test_bit(RPCAUTH_CRED_HASHED, &cred->cr_flags) != 0) | 241 | test_bit(RPCAUTH_CRED_HASHED, &cred->cr_flags) != 0) |
| 242 | continue; | 242 | continue; |
| 243 | 243 | ||
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index cbddd0cb83f1..36e84e13c6aa 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
| @@ -402,6 +402,7 @@ static void __x25_destroy_socket(struct sock *sk) | |||
| 402 | /* | 402 | /* |
| 403 | * Queue the unaccepted socket for death | 403 | * Queue the unaccepted socket for death |
| 404 | */ | 404 | */ |
| 405 | skb->sk->sk_state = TCP_LISTEN; | ||
| 405 | sock_set_flag(skb->sk, SOCK_DEAD); | 406 | sock_set_flag(skb->sk, SOCK_DEAD); |
| 406 | x25_start_heartbeat(skb->sk); | 407 | x25_start_heartbeat(skb->sk); |
| 407 | x25_sk(skb->sk)->state = X25_STATE_0; | 408 | x25_sk(skb->sk)->state = X25_STATE_0; |
diff --git a/security/keys/gc.c b/security/keys/gc.c index 19902319d097..a46e825cbf02 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c | |||
| @@ -77,10 +77,10 @@ static bool key_gc_keyring(struct key *keyring, time_t limit) | |||
| 77 | goto dont_gc; | 77 | goto dont_gc; |
| 78 | 78 | ||
| 79 | /* scan the keyring looking for dead keys */ | 79 | /* scan the keyring looking for dead keys */ |
| 80 | klist = rcu_dereference_check(keyring->payload.subscriptions, | 80 | rcu_read_lock(); |
| 81 | lockdep_is_held(&key_serial_lock)); | 81 | klist = rcu_dereference(keyring->payload.subscriptions); |
| 82 | if (!klist) | 82 | if (!klist) |
| 83 | goto dont_gc; | 83 | goto unlock_dont_gc; |
| 84 | 84 | ||
| 85 | for (loop = klist->nkeys - 1; loop >= 0; loop--) { | 85 | for (loop = klist->nkeys - 1; loop >= 0; loop--) { |
| 86 | key = klist->keys[loop]; | 86 | key = klist->keys[loop]; |
| @@ -89,11 +89,14 @@ static bool key_gc_keyring(struct key *keyring, time_t limit) | |||
| 89 | goto do_gc; | 89 | goto do_gc; |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | unlock_dont_gc: | ||
| 93 | rcu_read_unlock(); | ||
| 92 | dont_gc: | 94 | dont_gc: |
| 93 | kleave(" = false"); | 95 | kleave(" = false"); |
| 94 | return false; | 96 | return false; |
| 95 | 97 | ||
| 96 | do_gc: | 98 | do_gc: |
| 99 | rcu_read_unlock(); | ||
| 97 | key_gc_cursor = keyring->serial; | 100 | key_gc_cursor = keyring->serial; |
| 98 | key_get(keyring); | 101 | key_get(keyring); |
| 99 | spin_unlock(&key_serial_lock); | 102 | spin_unlock(&key_serial_lock); |
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index e814d2109f8e..1e4b0037935c 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
| @@ -20,6 +20,11 @@ | |||
| 20 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
| 21 | #include "internal.h" | 21 | #include "internal.h" |
| 22 | 22 | ||
| 23 | #define rcu_dereference_locked_keyring(keyring) \ | ||
| 24 | (rcu_dereference_protected( \ | ||
| 25 | (keyring)->payload.subscriptions, \ | ||
| 26 | rwsem_is_locked((struct rw_semaphore *)&(keyring)->sem))) | ||
| 27 | |||
| 23 | /* | 28 | /* |
| 24 | * when plumbing the depths of the key tree, this sets a hard limit set on how | 29 | * when plumbing the depths of the key tree, this sets a hard limit set on how |
| 25 | * deep we're willing to go | 30 | * deep we're willing to go |
| @@ -201,8 +206,7 @@ static long keyring_read(const struct key *keyring, | |||
| 201 | int loop, ret; | 206 | int loop, ret; |
| 202 | 207 | ||
| 203 | ret = 0; | 208 | ret = 0; |
| 204 | klist = rcu_dereference(keyring->payload.subscriptions); | 209 | klist = rcu_dereference_locked_keyring(keyring); |
| 205 | |||
| 206 | if (klist) { | 210 | if (klist) { |
| 207 | /* calculate how much data we could return */ | 211 | /* calculate how much data we could return */ |
| 208 | qty = klist->nkeys * sizeof(key_serial_t); | 212 | qty = klist->nkeys * sizeof(key_serial_t); |
| @@ -526,9 +530,8 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check) | |||
| 526 | struct key *keyring; | 530 | struct key *keyring; |
| 527 | int bucket; | 531 | int bucket; |
| 528 | 532 | ||
| 529 | keyring = ERR_PTR(-EINVAL); | ||
| 530 | if (!name) | 533 | if (!name) |
| 531 | goto error; | 534 | return ERR_PTR(-EINVAL); |
| 532 | 535 | ||
| 533 | bucket = keyring_hash(name); | 536 | bucket = keyring_hash(name); |
| 534 | 537 | ||
| @@ -555,17 +558,18 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check) | |||
| 555 | KEY_SEARCH) < 0) | 558 | KEY_SEARCH) < 0) |
| 556 | continue; | 559 | continue; |
| 557 | 560 | ||
| 558 | /* we've got a match */ | 561 | /* we've got a match but we might end up racing with |
| 559 | atomic_inc(&keyring->usage); | 562 | * key_cleanup() if the keyring is currently 'dead' |
| 560 | read_unlock(&keyring_name_lock); | 563 | * (ie. it has a zero usage count) */ |
| 561 | goto error; | 564 | if (!atomic_inc_not_zero(&keyring->usage)) |
| 565 | continue; | ||
| 566 | goto out; | ||
| 562 | } | 567 | } |
| 563 | } | 568 | } |
| 564 | 569 | ||
| 565 | read_unlock(&keyring_name_lock); | ||
| 566 | keyring = ERR_PTR(-ENOKEY); | 570 | keyring = ERR_PTR(-ENOKEY); |
| 567 | 571 | out: | |
| 568 | error: | 572 | read_unlock(&keyring_name_lock); |
| 569 | return keyring; | 573 | return keyring; |
| 570 | 574 | ||
| 571 | } /* end find_keyring_by_name() */ | 575 | } /* end find_keyring_by_name() */ |
| @@ -720,8 +724,7 @@ int __key_link(struct key *keyring, struct key *key) | |||
| 720 | } | 724 | } |
| 721 | 725 | ||
| 722 | /* see if there's a matching key we can displace */ | 726 | /* see if there's a matching key we can displace */ |
| 723 | klist = keyring->payload.subscriptions; | 727 | klist = rcu_dereference_locked_keyring(keyring); |
| 724 | |||
| 725 | if (klist && klist->nkeys > 0) { | 728 | if (klist && klist->nkeys > 0) { |
| 726 | struct key_type *type = key->type; | 729 | struct key_type *type = key->type; |
| 727 | 730 | ||
| @@ -765,8 +768,6 @@ int __key_link(struct key *keyring, struct key *key) | |||
| 765 | if (ret < 0) | 768 | if (ret < 0) |
| 766 | goto error2; | 769 | goto error2; |
| 767 | 770 | ||
| 768 | klist = keyring->payload.subscriptions; | ||
| 769 | |||
| 770 | if (klist && klist->nkeys < klist->maxkeys) { | 771 | if (klist && klist->nkeys < klist->maxkeys) { |
| 771 | /* there's sufficient slack space to add directly */ | 772 | /* there's sufficient slack space to add directly */ |
| 772 | atomic_inc(&key->usage); | 773 | atomic_inc(&key->usage); |
| @@ -868,7 +869,7 @@ int key_unlink(struct key *keyring, struct key *key) | |||
| 868 | 869 | ||
| 869 | down_write(&keyring->sem); | 870 | down_write(&keyring->sem); |
| 870 | 871 | ||
| 871 | klist = keyring->payload.subscriptions; | 872 | klist = rcu_dereference_locked_keyring(keyring); |
| 872 | if (klist) { | 873 | if (klist) { |
| 873 | /* search the keyring for the key */ | 874 | /* search the keyring for the key */ |
| 874 | for (loop = 0; loop < klist->nkeys; loop++) | 875 | for (loop = 0; loop < klist->nkeys; loop++) |
| @@ -959,7 +960,7 @@ int keyring_clear(struct key *keyring) | |||
| 959 | /* detach the pointer block with the locks held */ | 960 | /* detach the pointer block with the locks held */ |
| 960 | down_write(&keyring->sem); | 961 | down_write(&keyring->sem); |
| 961 | 962 | ||
| 962 | klist = keyring->payload.subscriptions; | 963 | klist = rcu_dereference_locked_keyring(keyring); |
| 963 | if (klist) { | 964 | if (klist) { |
| 964 | /* adjust the quota */ | 965 | /* adjust the quota */ |
| 965 | key_payload_reserve(keyring, | 966 | key_payload_reserve(keyring, |
| @@ -991,7 +992,9 @@ EXPORT_SYMBOL(keyring_clear); | |||
| 991 | */ | 992 | */ |
| 992 | static void keyring_revoke(struct key *keyring) | 993 | static void keyring_revoke(struct key *keyring) |
| 993 | { | 994 | { |
| 994 | struct keyring_list *klist = keyring->payload.subscriptions; | 995 | struct keyring_list *klist; |
| 996 | |||
| 997 | klist = rcu_dereference_locked_keyring(keyring); | ||
| 995 | 998 | ||
| 996 | /* adjust the quota */ | 999 | /* adjust the quota */ |
| 997 | key_payload_reserve(keyring, 0); | 1000 | key_payload_reserve(keyring, 0); |
| @@ -1025,7 +1028,7 @@ void keyring_gc(struct key *keyring, time_t limit) | |||
| 1025 | 1028 | ||
| 1026 | down_write(&keyring->sem); | 1029 | down_write(&keyring->sem); |
| 1027 | 1030 | ||
| 1028 | klist = keyring->payload.subscriptions; | 1031 | klist = rcu_dereference_locked_keyring(keyring); |
| 1029 | if (!klist) | 1032 | if (!klist) |
| 1030 | goto no_klist; | 1033 | goto no_klist; |
| 1031 | 1034 | ||
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index ea97c3120d66..d8c1a6a0fb08 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c | |||
| @@ -94,7 +94,7 @@ static int call_sbin_request_key(struct key_construction *cons, | |||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | /* attach the auth key to the session keyring */ | 96 | /* attach the auth key to the session keyring */ |
| 97 | ret = __key_link(keyring, authkey); | 97 | ret = key_link(keyring, authkey); |
| 98 | if (ret < 0) | 98 | if (ret < 0) |
| 99 | goto error_link; | 99 | goto error_link; |
| 100 | 100 | ||
| @@ -339,8 +339,10 @@ static int construct_alloc_key(struct key_type *type, | |||
| 339 | 339 | ||
| 340 | key_already_present: | 340 | key_already_present: |
| 341 | mutex_unlock(&key_construction_mutex); | 341 | mutex_unlock(&key_construction_mutex); |
| 342 | if (dest_keyring) | 342 | if (dest_keyring) { |
| 343 | __key_link(dest_keyring, key_ref_to_ptr(key_ref)); | ||
| 343 | up_write(&dest_keyring->sem); | 344 | up_write(&dest_keyring->sem); |
| 345 | } | ||
| 344 | mutex_unlock(&user->cons_lock); | 346 | mutex_unlock(&user->cons_lock); |
| 345 | key_put(key); | 347 | key_put(key); |
| 346 | *_key = key = key_ref_to_ptr(key_ref); | 348 | *_key = key = key_ref_to_ptr(key_ref); |
| @@ -431,6 +433,11 @@ struct key *request_key_and_link(struct key_type *type, | |||
| 431 | 433 | ||
| 432 | if (!IS_ERR(key_ref)) { | 434 | if (!IS_ERR(key_ref)) { |
| 433 | key = key_ref_to_ptr(key_ref); | 435 | key = key_ref_to_ptr(key_ref); |
| 436 | if (dest_keyring) { | ||
| 437 | construct_get_dest_keyring(&dest_keyring); | ||
| 438 | key_link(dest_keyring, key); | ||
| 439 | key_put(dest_keyring); | ||
| 440 | } | ||
| 434 | } else if (PTR_ERR(key_ref) != -EAGAIN) { | 441 | } else if (PTR_ERR(key_ref) != -EAGAIN) { |
| 435 | key = ERR_CAST(key_ref); | 442 | key = ERR_CAST(key_ref); |
| 436 | } else { | 443 | } else { |
diff --git a/sound/core/timer.c b/sound/core/timer.c index 73943651caed..5040c7b862fe 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
| @@ -1160,6 +1160,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, | |||
| 1160 | { | 1160 | { |
| 1161 | struct snd_timer_user *tu = timeri->callback_data; | 1161 | struct snd_timer_user *tu = timeri->callback_data; |
| 1162 | struct snd_timer_tread r1; | 1162 | struct snd_timer_tread r1; |
| 1163 | unsigned long flags; | ||
| 1163 | 1164 | ||
| 1164 | if (event >= SNDRV_TIMER_EVENT_START && | 1165 | if (event >= SNDRV_TIMER_EVENT_START && |
| 1165 | event <= SNDRV_TIMER_EVENT_PAUSE) | 1166 | event <= SNDRV_TIMER_EVENT_PAUSE) |
| @@ -1169,9 +1170,9 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, | |||
| 1169 | r1.event = event; | 1170 | r1.event = event; |
| 1170 | r1.tstamp = *tstamp; | 1171 | r1.tstamp = *tstamp; |
| 1171 | r1.val = resolution; | 1172 | r1.val = resolution; |
| 1172 | spin_lock(&tu->qlock); | 1173 | spin_lock_irqsave(&tu->qlock, flags); |
| 1173 | snd_timer_user_append_to_tqueue(tu, &r1); | 1174 | snd_timer_user_append_to_tqueue(tu, &r1); |
| 1174 | spin_unlock(&tu->qlock); | 1175 | spin_unlock_irqrestore(&tu->qlock, flags); |
| 1175 | kill_fasync(&tu->fasync, SIGIO, POLL_IN); | 1176 | kill_fasync(&tu->fasync, SIGIO, POLL_IN); |
| 1176 | wake_up(&tu->qchange_sleep); | 1177 | wake_up(&tu->qchange_sleep); |
| 1177 | } | 1178 | } |
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index cafc3a7316a8..ff18286fef9d 100644 --- a/sound/isa/sb/es968.c +++ b/sound/isa/sb/es968.c | |||
| @@ -93,7 +93,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard, | |||
| 93 | return err; | 93 | return err; |
| 94 | } | 94 | } |
| 95 | port[dev] = pnp_port_start(pdev, 0); | 95 | port[dev] = pnp_port_start(pdev, 0); |
| 96 | dma8[dev] = pnp_dma(pdev, 1); | 96 | dma8[dev] = pnp_dma(pdev, 0); |
| 97 | irq[dev] = pnp_irq(pdev, 0); | 97 | irq[dev] = pnp_irq(pdev, 0); |
| 98 | 98 | ||
| 99 | return 0; | 99 | return 0; |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index f669442b7c82..cec68152dcb1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -2273,6 +2273,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { | |||
| 2273 | SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB), | 2273 | SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB), |
| 2274 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB), | 2274 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB), |
| 2275 | SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB), | 2275 | SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB), |
| 2276 | SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB), | ||
| 2276 | SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB), | 2277 | SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB), |
| 2277 | {} | 2278 | {} |
| 2278 | }; | 2279 | }; |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index af34606c30c3..e9fdfc4b1c57 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -519,14 +519,6 @@ static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) | |||
| 519 | ad198x_power_eapd(codec); | 519 | ad198x_power_eapd(codec); |
| 520 | return 0; | 520 | return 0; |
| 521 | } | 521 | } |
| 522 | |||
| 523 | static int ad198x_resume(struct hda_codec *codec) | ||
| 524 | { | ||
| 525 | ad198x_init(codec); | ||
| 526 | snd_hda_codec_resume_amp(codec); | ||
| 527 | snd_hda_codec_resume_cache(codec); | ||
| 528 | return 0; | ||
| 529 | } | ||
| 530 | #endif | 522 | #endif |
| 531 | 523 | ||
| 532 | static struct hda_codec_ops ad198x_patch_ops = { | 524 | static struct hda_codec_ops ad198x_patch_ops = { |
| @@ -539,7 +531,6 @@ static struct hda_codec_ops ad198x_patch_ops = { | |||
| 539 | #endif | 531 | #endif |
| 540 | #ifdef SND_HDA_NEEDS_RESUME | 532 | #ifdef SND_HDA_NEEDS_RESUME |
| 541 | .suspend = ad198x_suspend, | 533 | .suspend = ad198x_suspend, |
| 542 | .resume = ad198x_resume, | ||
| 543 | #endif | 534 | #endif |
| 544 | .reboot_notify = ad198x_shutup, | 535 | .reboot_notify = ad198x_shutup, |
| 545 | }; | 536 | }; |
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 7de782a5b8f4..350ee8ac4153 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
| @@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec) | |||
| 766 | for (n = 0; n < AUTO_PIN_LAST; n++) { | 766 | for (n = 0; n < AUTO_PIN_LAST; n++) { |
| 767 | if (!spec->adc_nid[n]) | 767 | if (!spec->adc_nid[n]) |
| 768 | continue; | 768 | continue; |
| 769 | err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[i]); | 769 | err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]); |
| 770 | if (err < 0) | 770 | if (err < 0) |
| 771 | return err; | 771 | return err; |
| 772 | } | 772 | } |
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 61682e1d09da..56e52071c769 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -1195,9 +1195,10 @@ static int patch_cxt5045(struct hda_codec *codec) | |||
| 1195 | 1195 | ||
| 1196 | switch (codec->subsystem_id >> 16) { | 1196 | switch (codec->subsystem_id >> 16) { |
| 1197 | case 0x103c: | 1197 | case 0x103c: |
| 1198 | case 0x1631: | ||
| 1198 | case 0x1734: | 1199 | case 0x1734: |
| 1199 | /* HP & Fujitsu-Siemens laptops have really bad sound over 0dB | 1200 | /* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad |
| 1200 | * on NID 0x17. Fix max PCM level to 0 dB | 1201 | * sound over 0dB on NID 0x17. Fix max PCM level to 0 dB |
| 1201 | * (originally it has 0x2b steps with 0dB offset 0x14) | 1202 | * (originally it has 0x2b steps with 0dB offset 0x14) |
| 1202 | */ | 1203 | */ |
| 1203 | snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, | 1204 | snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, |
| @@ -2842,6 +2843,9 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { | |||
| 2842 | CXT5066_DELL_LAPTOP), | 2843 | CXT5066_DELL_LAPTOP), |
| 2843 | SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), | 2844 | SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), |
| 2844 | SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), | 2845 | SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), |
| 2846 | SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), | ||
| 2847 | SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5), | ||
| 2848 | SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5), | ||
| 2845 | SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD), | 2849 | SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD), |
| 2846 | {} | 2850 | {} |
| 2847 | }; | 2851 | }; |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index aad1627f56f1..7404dba16f83 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -4143,7 +4143,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = { | |||
| 4143 | SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG), | 4143 | SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG), |
| 4144 | SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734), | 4144 | SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734), |
| 4145 | SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU), | 4145 | SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU), |
| 4146 | SND_PCI_QUIRK(0x1734, 0x10ac, "FSC", ALC880_UNIWILL), | 4146 | SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_F1734), |
| 4147 | SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU), | 4147 | SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU), |
| 4148 | SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW), | 4148 | SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW), |
| 4149 | SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG), | 4149 | SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG), |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index c4be3fab94e5..7fb7d017a347 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -1607,6 +1607,10 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { | |||
| 1607 | "Dell Studio 1555", STAC_DELL_M6_DMIC), | 1607 | "Dell Studio 1555", STAC_DELL_M6_DMIC), |
| 1608 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd, | 1608 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd, |
| 1609 | "Dell Studio 1557", STAC_DELL_M6_DMIC), | 1609 | "Dell Studio 1557", STAC_DELL_M6_DMIC), |
| 1610 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe, | ||
| 1611 | "Dell Studio XPS 1645", STAC_DELL_M6_BOTH), | ||
| 1612 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413, | ||
| 1613 | "Dell Studio 1558", STAC_DELL_M6_BOTH), | ||
| 1610 | {} /* terminator */ | 1614 | {} /* terminator */ |
| 1611 | }; | 1615 | }; |
| 1612 | 1616 | ||
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index b64e78139d63..b56e33676780 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
| @@ -849,6 +849,7 @@ struct snd_m3 { | |||
| 849 | struct snd_kcontrol *master_switch; | 849 | struct snd_kcontrol *master_switch; |
| 850 | struct snd_kcontrol *master_volume; | 850 | struct snd_kcontrol *master_volume; |
| 851 | struct tasklet_struct hwvol_tq; | 851 | struct tasklet_struct hwvol_tq; |
| 852 | unsigned int in_suspend; | ||
| 852 | 853 | ||
| 853 | #ifdef CONFIG_PM | 854 | #ifdef CONFIG_PM |
| 854 | u16 *suspend_mem; | 855 | u16 *suspend_mem; |
| @@ -884,6 +885,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = { | |||
| 884 | MODULE_DEVICE_TABLE(pci, snd_m3_ids); | 885 | MODULE_DEVICE_TABLE(pci, snd_m3_ids); |
| 885 | 886 | ||
| 886 | static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = { | 887 | static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = { |
| 888 | SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c), | ||
| 887 | SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d), | 889 | SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d), |
| 888 | SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d), | 890 | SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d), |
| 889 | SND_PCI_QUIRK(0x1033, 0x80f1, "NEC LM800J/7", 0x03), | 891 | SND_PCI_QUIRK(0x1033, 0x80f1, "NEC LM800J/7", 0x03), |
| @@ -1613,6 +1615,11 @@ static void snd_m3_update_hw_volume(unsigned long private_data) | |||
| 1613 | outb(0x88, chip->iobase + SHADOW_MIX_REG_MASTER); | 1615 | outb(0x88, chip->iobase + SHADOW_MIX_REG_MASTER); |
| 1614 | outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER); | 1616 | outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER); |
| 1615 | 1617 | ||
| 1618 | /* Ignore spurious HV interrupts during suspend / resume, this avoids | ||
| 1619 | mistaking them for a mute button press. */ | ||
| 1620 | if (chip->in_suspend) | ||
| 1621 | return; | ||
| 1622 | |||
| 1616 | if (!chip->master_switch || !chip->master_volume) | 1623 | if (!chip->master_switch || !chip->master_volume) |
| 1617 | return; | 1624 | return; |
| 1618 | 1625 | ||
| @@ -2424,6 +2431,7 @@ static int m3_suspend(struct pci_dev *pci, pm_message_t state) | |||
| 2424 | if (chip->suspend_mem == NULL) | 2431 | if (chip->suspend_mem == NULL) |
| 2425 | return 0; | 2432 | return 0; |
| 2426 | 2433 | ||
| 2434 | chip->in_suspend = 1; | ||
| 2427 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); | 2435 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); |
| 2428 | snd_pcm_suspend_all(chip->pcm); | 2436 | snd_pcm_suspend_all(chip->pcm); |
| 2429 | snd_ac97_suspend(chip->ac97); | 2437 | snd_ac97_suspend(chip->ac97); |
| @@ -2497,6 +2505,7 @@ static int m3_resume(struct pci_dev *pci) | |||
| 2497 | snd_m3_hv_init(chip); | 2505 | snd_m3_hv_init(chip); |
| 2498 | 2506 | ||
| 2499 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | 2507 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); |
| 2508 | chip->in_suspend = 0; | ||
| 2500 | return 0; | 2509 | return 0; |
| 2501 | } | 2510 | } |
| 2502 | #endif /* CONFIG_PM */ | 2511 | #endif /* CONFIG_PM */ |
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 612e18b4bf4e..0ec20b68e8cb 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c | |||
| @@ -254,3 +254,4 @@ module_exit(txx9aclc_ac97_exit); | |||
| 254 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | 254 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); |
| 255 | MODULE_DESCRIPTION("TXx9 ACLC AC97 driver"); | 255 | MODULE_DESCRIPTION("TXx9 ACLC AC97 driver"); |
| 256 | MODULE_LICENSE("GPL"); | 256 | MODULE_LICENSE("GPL"); |
| 257 | MODULE_ALIAS("platform:txx9aclc-ac97"); | ||
diff --git a/sound/soc/txx9/txx9aclc-generic.c b/sound/soc/txx9/txx9aclc-generic.c index 3175de9a92cb..95b17f731aec 100644 --- a/sound/soc/txx9/txx9aclc-generic.c +++ b/sound/soc/txx9/txx9aclc-generic.c | |||
| @@ -96,3 +96,4 @@ module_exit(txx9aclc_generic_exit); | |||
| 96 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | 96 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); |
| 97 | MODULE_DESCRIPTION("Generic TXx9 ACLC ALSA SoC audio driver"); | 97 | MODULE_DESCRIPTION("Generic TXx9 ACLC ALSA SoC audio driver"); |
| 98 | MODULE_LICENSE("GPL"); | 98 | MODULE_LICENSE("GPL"); |
| 99 | MODULE_ALIAS("platform:txx9aclc-generic"); | ||