diff options
329 files changed, 6330 insertions, 8348 deletions
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi index e8ffc70ffe1..4f9ba3c2fca 100644 --- a/Documentation/ABI/testing/sysfs-firmware-acpi +++ b/Documentation/ABI/testing/sysfs-firmware-acpi | |||
| @@ -69,9 +69,13 @@ Description: | |||
| 69 | gpe1F: 0 invalid | 69 | gpe1F: 0 invalid |
| 70 | gpe_all: 1192 | 70 | gpe_all: 1192 |
| 71 | sci: 1194 | 71 | sci: 1194 |
| 72 | sci_not: 0 | ||
| 72 | 73 | ||
| 73 | sci - The total number of times the ACPI SCI | 74 | sci - The number of times the ACPI SCI |
| 74 | has claimed an interrupt. | 75 | has been called and claimed an interrupt. |
| 76 | |||
| 77 | sci_not - The number of times the ACPI SCI | ||
| 78 | has been called and NOT claimed an interrupt. | ||
| 75 | 79 | ||
| 76 | gpe_all - count of SCI caused by GPEs. | 80 | gpe_all - count of SCI caused by GPEs. |
| 77 | 81 | ||
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 3d7650768bb..e7e9a69069e 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ThinkPad ACPI Extras Driver | 1 | ThinkPad ACPI Extras Driver |
| 2 | 2 | ||
| 3 | Version 0.22 | 3 | Version 0.23 |
| 4 | November 23rd, 2008 | 4 | April 10th, 2009 |
| 5 | 5 | ||
| 6 | Borislav Deianov <borislav@users.sf.net> | 6 | Borislav Deianov <borislav@users.sf.net> |
| 7 | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 7 | Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 0ab0230cbcb..d16b7a1c379 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
| @@ -43,12 +43,11 @@ Table of Contents | |||
| 43 | 2) Representing devices without a current OF specification | 43 | 2) Representing devices without a current OF specification |
| 44 | a) PHY nodes | 44 | a) PHY nodes |
| 45 | b) Interrupt controllers | 45 | b) Interrupt controllers |
| 46 | c) CFI or JEDEC memory-mapped NOR flash | 46 | c) 4xx/Axon EMAC ethernet nodes |
| 47 | d) 4xx/Axon EMAC ethernet nodes | 47 | d) Xilinx IP cores |
| 48 | e) Xilinx IP cores | 48 | e) USB EHCI controllers |
| 49 | f) USB EHCI controllers | 49 | f) MDIO on GPIOs |
| 50 | g) MDIO on GPIOs | 50 | g) SPI busses |
| 51 | h) SPI busses | ||
| 52 | 51 | ||
| 53 | VII - Marvell Discovery mv64[345]6x System Controller chips | 52 | VII - Marvell Discovery mv64[345]6x System Controller chips |
| 54 | 1) The /system-controller node | 53 | 1) The /system-controller node |
| @@ -999,7 +998,7 @@ compatibility. | |||
| 999 | translation of SOC addresses for memory mapped SOC registers. | 998 | translation of SOC addresses for memory mapped SOC registers. |
| 1000 | - bus-frequency: Contains the bus frequency for the SOC node. | 999 | - bus-frequency: Contains the bus frequency for the SOC node. |
| 1001 | Typically, the value of this field is filled in by the boot | 1000 | Typically, the value of this field is filled in by the boot |
| 1002 | loader. | 1001 | loader. |
| 1003 | 1002 | ||
| 1004 | 1003 | ||
| 1005 | Recommended properties: | 1004 | Recommended properties: |
| @@ -1287,71 +1286,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
| 1287 | device_type = "open-pic"; | 1286 | device_type = "open-pic"; |
| 1288 | }; | 1287 | }; |
| 1289 | 1288 | ||
| 1290 | c) CFI or JEDEC memory-mapped NOR flash | 1289 | c) 4xx/Axon EMAC ethernet nodes |
| 1291 | |||
| 1292 | Flash chips (Memory Technology Devices) are often used for solid state | ||
| 1293 | file systems on embedded devices. | ||
| 1294 | |||
| 1295 | - compatible : should contain the specific model of flash chip(s) | ||
| 1296 | used, if known, followed by either "cfi-flash" or "jedec-flash" | ||
| 1297 | - reg : Address range of the flash chip | ||
| 1298 | - bank-width : Width (in bytes) of the flash bank. Equal to the | ||
| 1299 | device width times the number of interleaved chips. | ||
| 1300 | - device-width : (optional) Width of a single flash chip. If | ||
| 1301 | omitted, assumed to be equal to 'bank-width'. | ||
| 1302 | - #address-cells, #size-cells : Must be present if the flash has | ||
| 1303 | sub-nodes representing partitions (see below). In this case | ||
| 1304 | both #address-cells and #size-cells must be equal to 1. | ||
| 1305 | |||
| 1306 | For JEDEC compatible devices, the following additional properties | ||
| 1307 | are defined: | ||
| 1308 | |||
| 1309 | - vendor-id : Contains the flash chip's vendor id (1 byte). | ||
| 1310 | - device-id : Contains the flash chip's device id (1 byte). | ||
| 1311 | |||
| 1312 | In addition to the information on the flash bank itself, the | ||
| 1313 | device tree may optionally contain additional information | ||
| 1314 | describing partitions of the flash address space. This can be | ||
| 1315 | used on platforms which have strong conventions about which | ||
| 1316 | portions of the flash are used for what purposes, but which don't | ||
| 1317 | use an on-flash partition table such as RedBoot. | ||
| 1318 | |||
| 1319 | Each partition is represented as a sub-node of the flash device. | ||
| 1320 | Each node's name represents the name of the corresponding | ||
| 1321 | partition of the flash device. | ||
| 1322 | |||
| 1323 | Flash partitions | ||
| 1324 | - reg : The partition's offset and size within the flash bank. | ||
| 1325 | - label : (optional) The label / name for this flash partition. | ||
| 1326 | If omitted, the label is taken from the node name (excluding | ||
| 1327 | the unit address). | ||
| 1328 | - read-only : (optional) This parameter, if present, is a hint to | ||
| 1329 | Linux that this flash partition should only be mounted | ||
| 1330 | read-only. This is usually used for flash partitions | ||
| 1331 | containing early-boot firmware images or data which should not | ||
| 1332 | be clobbered. | ||
| 1333 | |||
| 1334 | Example: | ||
| 1335 | |||
| 1336 | flash@ff000000 { | ||
| 1337 | compatible = "amd,am29lv128ml", "cfi-flash"; | ||
| 1338 | reg = <ff000000 01000000>; | ||
| 1339 | bank-width = <4>; | ||
| 1340 | device-width = <1>; | ||
| 1341 | #address-cells = <1>; | ||
| 1342 | #size-cells = <1>; | ||
| 1343 | fs@0 { | ||
| 1344 | label = "fs"; | ||
| 1345 | reg = <0 f80000>; | ||
| 1346 | }; | ||
| 1347 | firmware@f80000 { | ||
| 1348 | label ="firmware"; | ||
| 1349 | reg = <f80000 80000>; | ||
| 1350 | read-only; | ||
| 1351 | }; | ||
| 1352 | }; | ||
| 1353 | |||
| 1354 | d) 4xx/Axon EMAC ethernet nodes | ||
| 1355 | 1290 | ||
| 1356 | The EMAC ethernet controller in IBM and AMCC 4xx chips, and also | 1291 | The EMAC ethernet controller in IBM and AMCC 4xx chips, and also |
| 1357 | the Axon bridge. To operate this needs to interact with a ths | 1292 | the Axon bridge. To operate this needs to interact with a ths |
| @@ -1499,7 +1434,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
| 1499 | available. | 1434 | available. |
| 1500 | For Axon: 0x0000012a | 1435 | For Axon: 0x0000012a |
| 1501 | 1436 | ||
| 1502 | e) Xilinx IP cores | 1437 | d) Xilinx IP cores |
| 1503 | 1438 | ||
| 1504 | The Xilinx EDK toolchain ships with a set of IP cores (devices) for use | 1439 | The Xilinx EDK toolchain ships with a set of IP cores (devices) for use |
| 1505 | in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range | 1440 | in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range |
| @@ -1761,7 +1696,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
| 1761 | listed above, nodes for these devices should include a phy-handle | 1696 | listed above, nodes for these devices should include a phy-handle |
| 1762 | property, and may include other common network device properties | 1697 | property, and may include other common network device properties |
| 1763 | like local-mac-address. | 1698 | like local-mac-address. |
| 1764 | 1699 | ||
| 1765 | iv) Xilinx Uartlite | 1700 | iv) Xilinx Uartlite |
| 1766 | 1701 | ||
| 1767 | Xilinx uartlite devices are simple fixed speed serial ports. | 1702 | Xilinx uartlite devices are simple fixed speed serial ports. |
| @@ -1793,7 +1728,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
| 1793 | - reg-offset : A value of 3 is required | 1728 | - reg-offset : A value of 3 is required |
| 1794 | - reg-shift : A value of 2 is required | 1729 | - reg-shift : A value of 2 is required |
| 1795 | 1730 | ||
| 1796 | f) USB EHCI controllers | 1731 | e) USB EHCI controllers |
| 1797 | 1732 | ||
| 1798 | Required properties: | 1733 | Required properties: |
| 1799 | - compatible : should be "usb-ehci". | 1734 | - compatible : should be "usb-ehci". |
| @@ -1819,7 +1754,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
| 1819 | big-endian; | 1754 | big-endian; |
| 1820 | }; | 1755 | }; |
| 1821 | 1756 | ||
| 1822 | g) MDIO on GPIOs | 1757 | f) MDIO on GPIOs |
| 1823 | 1758 | ||
| 1824 | Currently defined compatibles: | 1759 | Currently defined compatibles: |
| 1825 | - virtual,gpio-mdio | 1760 | - virtual,gpio-mdio |
| @@ -1839,7 +1774,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
| 1839 | &qe_pio_c 6>; | 1774 | &qe_pio_c 6>; |
| 1840 | }; | 1775 | }; |
| 1841 | 1776 | ||
| 1842 | h) SPI (Serial Peripheral Interface) busses | 1777 | g) SPI (Serial Peripheral Interface) busses |
| 1843 | 1778 | ||
| 1844 | SPI busses can be described with a node for the SPI master device | 1779 | SPI busses can be described with a node for the SPI master device |
| 1845 | and a set of child nodes for each SPI slave on the bus. For this | 1780 | and a set of child nodes for each SPI slave on the bus. For this |
diff --git a/Documentation/powerpc/dts-bindings/mtd-physmap.txt b/Documentation/powerpc/dts-bindings/mtd-physmap.txt new file mode 100644 index 00000000000..667c9bde869 --- /dev/null +++ b/Documentation/powerpc/dts-bindings/mtd-physmap.txt | |||
| @@ -0,0 +1,80 @@ | |||
| 1 | CFI or JEDEC memory-mapped NOR flash | ||
| 2 | |||
| 3 | Flash chips (Memory Technology Devices) are often used for solid state | ||
| 4 | file systems on embedded devices. | ||
| 5 | |||
| 6 | - compatible : should contain the specific model of flash chip(s) | ||
| 7 | used, if known, followed by either "cfi-flash" or "jedec-flash" | ||
| 8 | - reg : Address range(s) of the flash chip(s) | ||
| 9 | It's possible to (optionally) define multiple "reg" tuples so that | ||
| 10 | non-identical NOR chips can be described in one flash node. | ||
| 11 | - bank-width : Width (in bytes) of the flash bank. Equal to the | ||
| 12 | device width times the number of interleaved chips. | ||
| 13 | - device-width : (optional) Width of a single flash chip. If | ||
| 14 | omitted, assumed to be equal to 'bank-width'. | ||
| 15 | - #address-cells, #size-cells : Must be present if the flash has | ||
| 16 | sub-nodes representing partitions (see below). In this case | ||
| 17 | both #address-cells and #size-cells must be equal to 1. | ||
| 18 | |||
| 19 | For JEDEC compatible devices, the following additional properties | ||
| 20 | are defined: | ||
| 21 | |||
| 22 | - vendor-id : Contains the flash chip's vendor id (1 byte). | ||
| 23 | - device-id : Contains the flash chip's device id (1 byte). | ||
| 24 | |||
| 25 | In addition to the information on the flash bank itself, the | ||
| 26 | device tree may optionally contain additional information | ||
| 27 | describing partitions of the flash address space. This can be | ||
| 28 | used on platforms which have strong conventions about which | ||
| 29 | portions of the flash are used for what purposes, but which don't | ||
| 30 | use an on-flash partition table such as RedBoot. | ||
| 31 | |||
| 32 | Each partition is represented as a sub-node of the flash device. | ||
| 33 | Each node's name represents the name of the corresponding | ||
| 34 | partition of the flash device. | ||
| 35 | |||
| 36 | Flash partitions | ||
| 37 | - reg : The partition's offset and size within the flash bank. | ||
| 38 | - label : (optional) The label / name for this flash partition. | ||
| 39 | If omitted, the label is taken from the node name (excluding | ||
| 40 | the unit address). | ||
| 41 | - read-only : (optional) This parameter, if present, is a hint to | ||
| 42 | Linux that this flash partition should only be mounted | ||
| 43 | read-only. This is usually used for flash partitions | ||
| 44 | containing early-boot firmware images or data which should not | ||
| 45 | be clobbered. | ||
| 46 | |||
| 47 | Example: | ||
| 48 | |||
| 49 | flash@ff000000 { | ||
| 50 | compatible = "amd,am29lv128ml", "cfi-flash"; | ||
| 51 | reg = <ff000000 01000000>; | ||
| 52 | bank-width = <4>; | ||
| 53 | device-width = <1>; | ||
| 54 | #address-cells = <1>; | ||
| 55 | #size-cells = <1>; | ||
| 56 | fs@0 { | ||
| 57 | label = "fs"; | ||
| 58 | reg = <0 f80000>; | ||
| 59 | }; | ||
| 60 | firmware@f80000 { | ||
| 61 | label ="firmware"; | ||
| 62 | reg = <f80000 80000>; | ||
| 63 | read-only; | ||
| 64 | }; | ||
| 65 | }; | ||
| 66 | |||
| 67 | Here an example with multiple "reg" tuples: | ||
| 68 | |||
| 69 | flash@f0000000,0 { | ||
| 70 | #address-cells = <1>; | ||
| 71 | #size-cells = <1>; | ||
| 72 | compatible = "intel,PC48F4400P0VB", "cfi-flash"; | ||
| 73 | reg = <0 0x00000000 0x02000000 | ||
| 74 | 0 0x02000000 0x02000000>; | ||
| 75 | bank-width = <2>; | ||
| 76 | partition@0 { | ||
| 77 | label = "test-part1"; | ||
| 78 | reg = <0 0x04000000>; | ||
| 79 | }; | ||
| 80 | }; | ||
diff --git a/MAINTAINERS b/MAINTAINERS index cb9571042f2..ef03abed595 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1337,12 +1337,9 @@ L: cbe-oss-dev@ozlabs.org | |||
| 1337 | W: http://www.ibm.com/developerworks/power/cell/ | 1337 | W: http://www.ibm.com/developerworks/power/cell/ |
| 1338 | S: Supported | 1338 | S: Supported |
| 1339 | F: arch/powerpc/include/asm/cell*.h | 1339 | F: arch/powerpc/include/asm/cell*.h |
| 1340 | F: arch/powerpc/include/asm/lv1call.h | ||
| 1341 | F: arch/powerpc/include/asm/ps3*.h | ||
| 1342 | F: arch/powerpc/include/asm/spu*.h | 1340 | F: arch/powerpc/include/asm/spu*.h |
| 1343 | F: arch/powerpc/oprofile/*cell* | 1341 | F: arch/powerpc/oprofile/*cell* |
| 1344 | F: arch/powerpc/platforms/cell/ | 1342 | F: arch/powerpc/platforms/cell/ |
| 1345 | F: arch/powerpc/platforms/ps3/ | ||
| 1346 | 1343 | ||
| 1347 | CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: | 1344 | CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: |
| 1348 | P: David Vrabel | 1345 | P: David Vrabel |
| @@ -2761,7 +2758,7 @@ IDE SUBSYSTEM | |||
| 2761 | P: Bartlomiej Zolnierkiewicz | 2758 | P: Bartlomiej Zolnierkiewicz |
| 2762 | M: bzolnier@gmail.com | 2759 | M: bzolnier@gmail.com |
| 2763 | L: linux-ide@vger.kernel.org | 2760 | L: linux-ide@vger.kernel.org |
| 2764 | T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/ | 2761 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git |
| 2765 | S: Maintained | 2762 | S: Maintained |
| 2766 | F: Documentation/ide/ | 2763 | F: Documentation/ide/ |
| 2767 | F: drivers/ide/ | 2764 | F: drivers/ide/ |
| @@ -3994,8 +3991,8 @@ NETWORKING [GENERAL] | |||
| 3994 | P: David S. Miller | 3991 | P: David S. Miller |
| 3995 | M: davem@davemloft.net | 3992 | M: davem@davemloft.net |
| 3996 | L: netdev@vger.kernel.org | 3993 | L: netdev@vger.kernel.org |
| 3997 | W: http://linux-net.osdl.org/ | 3994 | W: http://www.linuxfoundation.org/en/Net |
| 3998 | T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git | 3995 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git |
| 3999 | S: Maintained | 3996 | S: Maintained |
| 4000 | F: net/ | 3997 | F: net/ |
| 4001 | F: include/net/ | 3998 | F: include/net/ |
| @@ -4036,6 +4033,13 @@ F: net/wireless/ | |||
| 4036 | F: include/net/ieee80211* | 4033 | F: include/net/ieee80211* |
| 4037 | F: include/net/wireless.h | 4034 | F: include/net/wireless.h |
| 4038 | 4035 | ||
| 4036 | NETWORKING DRIVERS | ||
| 4037 | L: netdev@vger.kernel.org | ||
| 4038 | W: http://www.linuxfoundation.org/en/Net | ||
| 4039 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git | ||
| 4040 | S: Odd Fixes | ||
| 4041 | F: drivers/net/ | ||
| 4042 | |||
| 4039 | NETXEN (1/10) GbE SUPPORT | 4043 | NETXEN (1/10) GbE SUPPORT |
| 4040 | P: Dhananjay Phadke | 4044 | P: Dhananjay Phadke |
| 4041 | M: dhananjay@netxen.com | 4045 | M: dhananjay@netxen.com |
| @@ -4507,7 +4511,9 @@ F: arch/powerpc/include/asm/ps3*.h | |||
| 4507 | F: arch/powerpc/platforms/ps3/ | 4511 | F: arch/powerpc/platforms/ps3/ |
| 4508 | F: drivers/*/ps3* | 4512 | F: drivers/*/ps3* |
| 4509 | F: drivers/ps3/ | 4513 | F: drivers/ps3/ |
| 4514 | F: drivers/rtc/rtc-ps3.c | ||
| 4510 | F: drivers/usb/host/*ps3.c | 4515 | F: drivers/usb/host/*ps3.c |
| 4516 | F: sound/ppc/snd_ps3* | ||
| 4511 | 4517 | ||
| 4512 | PS3VRAM DRIVER | 4518 | PS3VRAM DRIVER |
| 4513 | P: Jim Paris | 4519 | P: Jim Paris |
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index 010618487cf..94cc58ef61a 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
| @@ -387,6 +387,8 @@ | |||
| 387 | #define __NR_dup3 (__NR_SYSCALL_BASE+358) | 387 | #define __NR_dup3 (__NR_SYSCALL_BASE+358) |
| 388 | #define __NR_pipe2 (__NR_SYSCALL_BASE+359) | 388 | #define __NR_pipe2 (__NR_SYSCALL_BASE+359) |
| 389 | #define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) | 389 | #define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) |
| 390 | #define __NR_preadv (__NR_SYSCALL_BASE+361) | ||
| 391 | #define __NR_pwritev (__NR_SYSCALL_BASE+362) | ||
| 390 | 392 | ||
| 391 | /* | 393 | /* |
| 392 | * The following SWIs are ARM private. | 394 | * The following SWIs are ARM private. |
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 9ca8d13f05f..1680e9e9c83 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
| @@ -370,6 +370,8 @@ | |||
| 370 | CALL(sys_dup3) | 370 | CALL(sys_dup3) |
| 371 | CALL(sys_pipe2) | 371 | CALL(sys_pipe2) |
| 372 | /* 360 */ CALL(sys_inotify_init1) | 372 | /* 360 */ CALL(sys_inotify_init1) |
| 373 | CALL(sys_preadv) | ||
| 374 | CALL(sys_pwritev) | ||
| 373 | #ifndef syscalls_counted | 375 | #ifndef syscalls_counted |
| 374 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls | 376 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
| 375 | #define syscalls_counted | 377 | #define syscalls_counted |
diff --git a/arch/arm/mach-imx/include/mach/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h index 502d5aa2c09..6c2942f8292 100644 --- a/arch/arm/mach-imx/include/mach/gpio.h +++ b/arch/arm/mach-imx/include/mach/gpio.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _IMX_GPIO_H | 1 | #ifndef _IMX_GPIO_H |
| 2 | 2 | ||
| 3 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 4 | #include <mach/hardware.h> | ||
| 4 | #include <mach/imx-regs.h> | 5 | #include <mach/imx-regs.h> |
| 5 | 6 | ||
| 6 | #define IMX_GPIO_ALLOC_MODE_NORMAL 0 | 7 | #define IMX_GPIO_ALLOC_MODE_NORMAL 0 |
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 16dc9ea0839..eeb00240d78 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
| 24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
| 25 | #include <mach/kirkwood.h> | 25 | #include <mach/kirkwood.h> |
| 26 | #include <mach/bridge-regs.h> | ||
| 26 | #include <plat/cache-feroceon-l2.h> | 27 | #include <plat/cache-feroceon-l2.h> |
| 27 | #include <plat/ehci-orion.h> | 28 | #include <plat/ehci-orion.h> |
| 28 | #include <plat/mvsdio.h> | 29 | #include <plat/mvsdio.h> |
diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h new file mode 100644 index 00000000000..4f7029f521c --- /dev/null +++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/include/mach/bridge-regs.h | ||
| 3 | * | ||
| 4 | * Mbus-L to Mbus Bridge Registers | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ASM_ARCH_BRIDGE_REGS_H | ||
| 12 | #define __ASM_ARCH_BRIDGE_REGS_H | ||
| 13 | |||
| 14 | #include <mach/kirkwood.h> | ||
| 15 | |||
| 16 | #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) | ||
| 17 | #define CPU_RESET 0x00000002 | ||
| 18 | |||
| 19 | #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) | ||
| 20 | #define SOFT_RESET_OUT_EN 0x00000004 | ||
| 21 | |||
| 22 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | ||
| 23 | #define SOFT_RESET 0x00000001 | ||
| 24 | |||
| 25 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 26 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 27 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 28 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 29 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | ||
| 30 | |||
| 31 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | ||
| 32 | #define IRQ_CAUSE_LOW_OFF 0x0000 | ||
| 33 | #define IRQ_MASK_LOW_OFF 0x0004 | ||
| 34 | #define IRQ_CAUSE_HIGH_OFF 0x0010 | ||
| 35 | #define IRQ_MASK_HIGH_OFF 0x0014 | ||
| 36 | |||
| 37 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | ||
| 38 | |||
| 39 | #define L2_CONFIG_REG (BRIDGE_VIRT_BASE | 0x0128) | ||
| 40 | #define L2_WRITETHROUGH 0x00000010 | ||
| 41 | |||
| 42 | #endif | ||
diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index c0cc5b5c82a..a4a55c199d7 100644 --- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <mach/kirkwood.h> | 9 | #include <mach/bridge-regs.h> |
| 10 | 10 | ||
| 11 | .macro addruart,rx | 11 | .macro addruart,rx |
| 12 | mrc p15, 0, \rx, c1, c0 | 12 | mrc p15, 0, \rx, c1, c0 |
diff --git a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S index 83e0cba77b3..8939d36f893 100644 --- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <mach/kirkwood.h> | 11 | #include <mach/bridge-regs.h> |
| 12 | 12 | ||
| 13 | .macro disable_fiq | 13 | .macro disable_fiq |
| 14 | .endm | 14 | .endm |
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index 38c98685359..b3e13958821 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h | |||
| @@ -44,44 +44,6 @@ | |||
| 44 | #define KIRKWOOD_PCIE_MEM_SIZE SZ_128M | 44 | #define KIRKWOOD_PCIE_MEM_SIZE SZ_128M |
| 45 | 45 | ||
| 46 | /* | 46 | /* |
| 47 | * MBUS bridge registers. | ||
| 48 | */ | ||
| 49 | #define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000) | ||
| 50 | #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) | ||
| 51 | #define CPU_RESET 0x00000002 | ||
| 52 | #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) | ||
| 53 | #define SOFT_RESET_OUT_EN 0x00000004 | ||
| 54 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | ||
| 55 | #define SOFT_RESET 0x00000001 | ||
| 56 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 57 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 58 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 59 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 60 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | ||
| 61 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | ||
| 62 | #define IRQ_CAUSE_LOW_OFF 0x0000 | ||
| 63 | #define IRQ_MASK_LOW_OFF 0x0004 | ||
| 64 | #define IRQ_CAUSE_HIGH_OFF 0x0010 | ||
| 65 | #define IRQ_MASK_HIGH_OFF 0x0014 | ||
| 66 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | ||
| 67 | #define L2_CONFIG_REG (BRIDGE_VIRT_BASE | 0x0128) | ||
| 68 | #define L2_WRITETHROUGH 0x00000010 | ||
| 69 | |||
| 70 | /* | ||
| 71 | * Supported devices and revisions. | ||
| 72 | */ | ||
| 73 | #define MV88F6281_DEV_ID 0x6281 | ||
| 74 | #define MV88F6281_REV_Z0 0 | ||
| 75 | #define MV88F6281_REV_A0 2 | ||
| 76 | |||
| 77 | #define MV88F6192_DEV_ID 0x6192 | ||
| 78 | #define MV88F6192_REV_Z0 0 | ||
| 79 | #define MV88F6192_REV_A0 2 | ||
| 80 | |||
| 81 | #define MV88F6180_DEV_ID 0x6180 | ||
| 82 | #define MV88F6180_REV_A0 2 | ||
| 83 | |||
| 84 | /* | ||
| 85 | * Register Map | 47 | * Register Map |
| 86 | */ | 48 | */ |
| 87 | #define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x00000) | 49 | #define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x00000) |
| @@ -99,6 +61,8 @@ | |||
| 99 | #define UART1_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x2100) | 61 | #define UART1_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x2100) |
| 100 | #define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) | 62 | #define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) |
| 101 | 63 | ||
| 64 | #define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000) | ||
| 65 | |||
| 102 | #define PCIE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x40000) | 66 | #define PCIE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x40000) |
| 103 | 67 | ||
| 104 | #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) | 68 | #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) |
| @@ -119,5 +83,18 @@ | |||
| 119 | 83 | ||
| 120 | #define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000) | 84 | #define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000) |
| 121 | 85 | ||
| 86 | /* | ||
| 87 | * Supported devices and revisions. | ||
| 88 | */ | ||
| 89 | #define MV88F6281_DEV_ID 0x6281 | ||
| 90 | #define MV88F6281_REV_Z0 0 | ||
| 91 | #define MV88F6281_REV_A0 2 | ||
| 92 | |||
| 93 | #define MV88F6192_DEV_ID 0x6192 | ||
| 94 | #define MV88F6192_REV_Z0 0 | ||
| 95 | #define MV88F6192_REV_A0 2 | ||
| 96 | |||
| 97 | #define MV88F6180_DEV_ID 0x6180 | ||
| 98 | #define MV88F6180_REV_A0 2 | ||
| 122 | 99 | ||
| 123 | #endif | 100 | #endif |
diff --git a/arch/arm/mach-kirkwood/include/mach/system.h b/arch/arm/mach-kirkwood/include/mach/system.h index 23a1914c1da..7568e95d279 100644 --- a/arch/arm/mach-kirkwood/include/mach/system.h +++ b/arch/arm/mach-kirkwood/include/mach/system.h | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | #ifndef __ASM_ARCH_SYSTEM_H | 9 | #ifndef __ASM_ARCH_SYSTEM_H |
| 10 | #define __ASM_ARCH_SYSTEM_H | 10 | #define __ASM_ARCH_SYSTEM_H |
| 11 | 11 | ||
| 12 | #include <mach/hardware.h> | 12 | #include <mach/bridge-regs.h> |
| 13 | #include <mach/kirkwood.h> | ||
| 14 | 13 | ||
| 15 | static inline void arch_idle(void) | 14 | static inline void arch_idle(void) |
| 16 | { | 15 | { |
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c index 06083b23bb4..28020abf49e 100644 --- a/arch/arm/mach-kirkwood/irq.c +++ b/arch/arm/mach-kirkwood/irq.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <mach/bridge-regs.h> | ||
| 15 | #include <plat/irq.h> | 16 | #include <plat/irq.h> |
| 16 | #include <asm/gpio.h> | 17 | #include <asm/gpio.h> |
| 17 | #include "common.h" | 18 | #include "common.h" |
diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c index 0332d8f5c18..b9537c97beb 100644 --- a/arch/arm/mach-loki/addr-map.c +++ b/arch/arm/mach-loki/addr-map.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | /* | 38 | /* |
| 39 | * CPU Address Decode Windows registers | 39 | * CPU Address Decode Windows registers |
| 40 | */ | 40 | */ |
| 41 | #define BRIDGE_REG(x) (BRIDGE_VIRT_BASE | (x)) | ||
| 41 | #define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4)) | 42 | #define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4)) |
| 42 | #define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4)) | 43 | #define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4)) |
| 43 | #define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4)) | 44 | #define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4)) |
diff --git a/arch/arm/mach-loki/include/mach/bridge-regs.h b/arch/arm/mach-loki/include/mach/bridge-regs.h new file mode 100644 index 00000000000..a3fabf70044 --- /dev/null +++ b/arch/arm/mach-loki/include/mach/bridge-regs.h | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-loki/include/mach/bridge-regs.h | ||
| 3 | * | ||
| 4 | * This file is licensed under the terms of the GNU General Public | ||
| 5 | * License version 2. This program is licensed "as is" without any | ||
| 6 | * warranty of any kind, whether express or implied. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __ASM_ARCH_BRIDGE_REGS_H | ||
| 10 | #define __ASM_ARCH_BRIDGE_REGS_H | ||
| 11 | |||
| 12 | #include <mach/loki.h> | ||
| 13 | |||
| 14 | #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) | ||
| 15 | #define SOFT_RESET_OUT_EN 0x00000004 | ||
| 16 | |||
| 17 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | ||
| 18 | #define SOFT_RESET 0x00000001 | ||
| 19 | |||
| 20 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 21 | |||
| 22 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 23 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 24 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 25 | #define BRIDGE_INT_TIMER1_CLR 0x0004 | ||
| 26 | |||
| 27 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | ||
| 28 | #define IRQ_CAUSE_OFF 0x0000 | ||
| 29 | #define IRQ_MASK_OFF 0x0004 | ||
| 30 | |||
| 31 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | ||
| 32 | |||
| 33 | #endif | ||
diff --git a/arch/arm/mach-loki/include/mach/entry-macro.S b/arch/arm/mach-loki/include/mach/entry-macro.S index 332af38ec13..bc917ed3a62 100644 --- a/arch/arm/mach-loki/include/mach/entry-macro.S +++ b/arch/arm/mach-loki/include/mach/entry-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <mach/loki.h> | 11 | #include <mach/bridge-regs.h> |
| 12 | 12 | ||
| 13 | .macro disable_fiq | 13 | .macro disable_fiq |
| 14 | .endm | 14 | .endm |
diff --git a/arch/arm/mach-loki/include/mach/loki.h b/arch/arm/mach-loki/include/mach/loki.h index c00af6ba557..bfca7c265f4 100644 --- a/arch/arm/mach-loki/include/mach/loki.h +++ b/arch/arm/mach-loki/include/mach/loki.h | |||
| @@ -58,20 +58,6 @@ | |||
| 58 | #define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) | 58 | #define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) |
| 59 | 59 | ||
| 60 | #define BRIDGE_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x20000) | 60 | #define BRIDGE_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x20000) |
| 61 | #define BRIDGE_REG(x) (BRIDGE_VIRT_BASE | (x)) | ||
| 62 | #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) | ||
| 63 | #define SOFT_RESET_OUT_EN 0x00000004 | ||
| 64 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | ||
| 65 | #define SOFT_RESET 0x00000001 | ||
| 66 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 67 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 68 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 69 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 70 | #define BRIDGE_INT_TIMER1_CLR 0x0004 | ||
| 71 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | ||
| 72 | #define IRQ_CAUSE_OFF 0x0000 | ||
| 73 | #define IRQ_MASK_OFF 0x0004 | ||
| 74 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | ||
| 75 | 61 | ||
| 76 | #define PCIE0_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x30000) | 62 | #define PCIE0_VIRT_BASE (LOKI_REGS_VIRT_BASE | 0x30000) |
| 77 | 63 | ||
diff --git a/arch/arm/mach-loki/include/mach/system.h b/arch/arm/mach-loki/include/mach/system.h index c1de36fe9b3..71895199a53 100644 --- a/arch/arm/mach-loki/include/mach/system.h +++ b/arch/arm/mach-loki/include/mach/system.h | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | #ifndef __ASM_ARCH_SYSTEM_H | 9 | #ifndef __ASM_ARCH_SYSTEM_H |
| 10 | #define __ASM_ARCH_SYSTEM_H | 10 | #define __ASM_ARCH_SYSTEM_H |
| 11 | 11 | ||
| 12 | #include <mach/hardware.h> | 12 | #include <mach/bridge-regs.h> |
| 13 | #include <mach/loki.h> | ||
| 14 | 13 | ||
| 15 | static inline void arch_idle(void) | 14 | static inline void arch_idle(void) |
| 16 | { | 15 | { |
diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c index e1f97338d5b..76b211bfcca 100644 --- a/arch/arm/mach-loki/irq.c +++ b/arch/arm/mach-loki/irq.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <mach/bridge-regs.h> | ||
| 15 | #include <plat/irq.h> | 16 | #include <plat/irq.h> |
| 16 | #include "common.h" | 17 | #include "common.h" |
| 17 | 18 | ||
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index a575daaa62d..9ba595083da 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
| 21 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
| 22 | #include <mach/mv78xx0.h> | 22 | #include <mach/mv78xx0.h> |
| 23 | #include <mach/bridge-regs.h> | ||
| 23 | #include <plat/cache-feroceon-l2.h> | 24 | #include <plat/cache-feroceon-l2.h> |
| 24 | #include <plat/ehci-orion.h> | 25 | #include <plat/ehci-orion.h> |
| 25 | #include <plat/orion_nand.h> | 26 | #include <plat/orion_nand.h> |
diff --git a/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h new file mode 100644 index 00000000000..2d14c4fe294 --- /dev/null +++ b/arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | ||
| 3 | * | ||
| 4 | * This file is licensed under the terms of the GNU General Public | ||
| 5 | * License version 2. This program is licensed "as is" without any | ||
| 6 | * warranty of any kind, whether express or implied. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __ASM_ARCH_BRIDGE_REGS_H | ||
| 10 | #define __ASM_ARCH_BRIDGE_REGS_H | ||
| 11 | |||
| 12 | #include <mach/mv78xx0.h> | ||
| 13 | |||
| 14 | #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) | ||
| 15 | #define L2_WRITETHROUGH 0x00020000 | ||
| 16 | |||
| 17 | #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) | ||
| 18 | #define SOFT_RESET_OUT_EN 0x00000004 | ||
| 19 | |||
| 20 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | ||
| 21 | #define SOFT_RESET 0x00000001 | ||
| 22 | |||
| 23 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 24 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 25 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 26 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 27 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | ||
| 28 | |||
| 29 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | ||
| 30 | #define IRQ_CAUSE_ERR_OFF 0x0000 | ||
| 31 | #define IRQ_CAUSE_LOW_OFF 0x0004 | ||
| 32 | #define IRQ_CAUSE_HIGH_OFF 0x0008 | ||
| 33 | #define IRQ_MASK_ERR_OFF 0x000c | ||
| 34 | #define IRQ_MASK_LOW_OFF 0x0010 | ||
| 35 | #define IRQ_MASK_HIGH_OFF 0x0014 | ||
| 36 | |||
| 37 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | ||
| 38 | |||
| 39 | #endif | ||
diff --git a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S index fbfb2693ce6..66ae2d29e77 100644 --- a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <mach/mv78xx0.h> | 11 | #include <mach/bridge-regs.h> |
| 12 | 12 | ||
| 13 | .macro disable_fiq | 13 | .macro disable_fiq |
| 14 | .endm | 14 | .endm |
diff --git a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h index 582cffc733a..d715b92b090 100644 --- a/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h +++ b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | |||
| @@ -59,37 +59,6 @@ | |||
| 59 | * Core-specific peripheral registers. | 59 | * Core-specific peripheral registers. |
| 60 | */ | 60 | */ |
| 61 | #define BRIDGE_VIRT_BASE (MV78XX0_CORE_REGS_VIRT_BASE) | 61 | #define BRIDGE_VIRT_BASE (MV78XX0_CORE_REGS_VIRT_BASE) |
| 62 | #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) | ||
| 63 | #define L2_WRITETHROUGH 0x00020000 | ||
| 64 | #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) | ||
| 65 | #define SOFT_RESET_OUT_EN 0x00000004 | ||
| 66 | #define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE | 0x010c) | ||
| 67 | #define SOFT_RESET 0x00000001 | ||
| 68 | #define BRIDGE_CAUSE (BRIDGE_VIRT_BASE | 0x0110) | ||
| 69 | #define BRIDGE_MASK (BRIDGE_VIRT_BASE | 0x0114) | ||
| 70 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 71 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 72 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | ||
| 73 | #define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0200) | ||
| 74 | #define IRQ_CAUSE_ERR_OFF 0x0000 | ||
| 75 | #define IRQ_CAUSE_LOW_OFF 0x0004 | ||
| 76 | #define IRQ_CAUSE_HIGH_OFF 0x0008 | ||
| 77 | #define IRQ_MASK_ERR_OFF 0x000c | ||
| 78 | #define IRQ_MASK_LOW_OFF 0x0010 | ||
| 79 | #define IRQ_MASK_HIGH_OFF 0x0014 | ||
| 80 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | ||
| 81 | |||
| 82 | /* | ||
| 83 | * Supported devices and revisions. | ||
| 84 | */ | ||
| 85 | #define MV78X00_Z0_DEV_ID 0x6381 | ||
| 86 | #define MV78X00_REV_Z0 1 | ||
| 87 | |||
| 88 | #define MV78100_DEV_ID 0x7810 | ||
| 89 | #define MV78100_REV_A0 1 | ||
| 90 | |||
| 91 | #define MV78200_DEV_ID 0x7820 | ||
| 92 | #define MV78200_REV_A0 1 | ||
| 93 | 62 | ||
| 94 | /* | 63 | /* |
| 95 | * Register Map | 64 | * Register Map |
| @@ -135,5 +104,16 @@ | |||
| 135 | 104 | ||
| 136 | #define SATA_PHYS_BASE (MV78XX0_REGS_PHYS_BASE | 0xa0000) | 105 | #define SATA_PHYS_BASE (MV78XX0_REGS_PHYS_BASE | 0xa0000) |
| 137 | 106 | ||
| 107 | /* | ||
| 108 | * Supported devices and revisions. | ||
| 109 | */ | ||
| 110 | #define MV78X00_Z0_DEV_ID 0x6381 | ||
| 111 | #define MV78X00_REV_Z0 1 | ||
| 112 | |||
| 113 | #define MV78100_DEV_ID 0x7810 | ||
| 114 | #define MV78100_REV_A0 1 | ||
| 115 | |||
| 116 | #define MV78200_DEV_ID 0x7820 | ||
| 117 | #define MV78200_REV_A0 1 | ||
| 138 | 118 | ||
| 139 | #endif | 119 | #endif |
diff --git a/arch/arm/mach-mv78xx0/include/mach/system.h b/arch/arm/mach-mv78xx0/include/mach/system.h index 1d6350b22d0..66e7ce4e90b 100644 --- a/arch/arm/mach-mv78xx0/include/mach/system.h +++ b/arch/arm/mach-mv78xx0/include/mach/system.h | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | #ifndef __ASM_ARCH_SYSTEM_H | 9 | #ifndef __ASM_ARCH_SYSTEM_H |
| 10 | #define __ASM_ARCH_SYSTEM_H | 10 | #define __ASM_ARCH_SYSTEM_H |
| 11 | 11 | ||
| 12 | #include <mach/hardware.h> | 12 | #include <mach/bridge-regs.h> |
| 13 | #include <mach/mv78xx0.h> | ||
| 14 | 13 | ||
| 15 | static inline void arch_idle(void) | 14 | static inline void arch_idle(void) |
| 16 | { | 15 | { |
diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c index 30b7e4bcdbc..f289b0ea7dc 100644 --- a/arch/arm/mach-mv78xx0/irq.c +++ b/arch/arm/mach-mv78xx0/irq.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 15 | #include <asm/gpio.h> | 15 | #include <asm/gpio.h> |
| 16 | #include <mach/mv78xx0.h> | 16 | #include <mach/bridge-regs.h> |
| 17 | #include <plat/irq.h> | 17 | #include <plat/irq.h> |
| 18 | #include "common.h" | 18 | #include "common.h" |
| 19 | 19 | ||
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index 719957e05d9..c14d1213727 100644 --- a/arch/arm/mach-orion5x/addr-map.c +++ b/arch/arm/mach-orion5x/addr-map.c | |||
| @@ -57,12 +57,14 @@ | |||
| 57 | /* | 57 | /* |
| 58 | * Helpers to get DDR bank info | 58 | * Helpers to get DDR bank info |
| 59 | */ | 59 | */ |
| 60 | #define ORION5X_DDR_REG(x) (ORION5X_DDR_VIRT_BASE | (x)) | ||
| 60 | #define DDR_BASE_CS(n) ORION5X_DDR_REG(0x1500 + ((n) << 3)) | 61 | #define DDR_BASE_CS(n) ORION5X_DDR_REG(0x1500 + ((n) << 3)) |
| 61 | #define DDR_SIZE_CS(n) ORION5X_DDR_REG(0x1504 + ((n) << 3)) | 62 | #define DDR_SIZE_CS(n) ORION5X_DDR_REG(0x1504 + ((n) << 3)) |
| 62 | 63 | ||
| 63 | /* | 64 | /* |
| 64 | * CPU Address Decode Windows registers | 65 | * CPU Address Decode Windows registers |
| 65 | */ | 66 | */ |
| 67 | #define ORION5X_BRIDGE_REG(x) (ORION5X_BRIDGE_VIRT_BASE | (x)) | ||
| 66 | #define CPU_WIN_CTRL(n) ORION5X_BRIDGE_REG(0x000 | ((n) << 4)) | 68 | #define CPU_WIN_CTRL(n) ORION5X_BRIDGE_REG(0x000 | ((n) << 4)) |
| 67 | #define CPU_WIN_BASE(n) ORION5X_BRIDGE_REG(0x004 | ((n) << 4)) | 69 | #define CPU_WIN_BASE(n) ORION5X_BRIDGE_REG(0x004 | ((n) << 4)) |
| 68 | #define CPU_WIN_REMAP_LO(n) ORION5X_BRIDGE_REG(0x008 | ((n) << 4)) | 70 | #define CPU_WIN_REMAP_LO(n) ORION5X_BRIDGE_REG(0x008 | ((n) << 4)) |
diff --git a/arch/arm/mach-orion5x/include/mach/bridge-regs.h b/arch/arm/mach-orion5x/include/mach/bridge-regs.h new file mode 100644 index 00000000000..be896e59d3e --- /dev/null +++ b/arch/arm/mach-orion5x/include/mach/bridge-regs.h | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/include/mach/bridge-regs.h | ||
| 3 | * | ||
| 4 | * Orion CPU Bridge Registers | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ASM_ARCH_BRIDGE_REGS_H | ||
| 12 | #define __ASM_ARCH_BRIDGE_REGS_H | ||
| 13 | |||
| 14 | #include <mach/orion5x.h> | ||
| 15 | |||
| 16 | #define CPU_CONF (ORION5X_BRIDGE_VIRT_BASE | 0x100) | ||
| 17 | |||
| 18 | #define CPU_CTRL (ORION5X_BRIDGE_VIRT_BASE | 0x104) | ||
| 19 | |||
| 20 | #define CPU_RESET_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x108) | ||
| 21 | #define WDT_RESET 0x0002 | ||
| 22 | |||
| 23 | #define CPU_SOFT_RESET (ORION5X_BRIDGE_VIRT_BASE | 0x10c) | ||
| 24 | |||
| 25 | #define POWER_MNG_CTRL_REG (ORION5X_BRIDGE_VIRT_BASE | 0x11C) | ||
| 26 | |||
| 27 | #define BRIDGE_CAUSE (ORION5X_BRIDGE_VIRT_BASE | 0x110) | ||
| 28 | #define WDT_INT_REQ 0x0008 | ||
| 29 | |||
| 30 | #define BRIDGE_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x114) | ||
| 31 | #define BRIDGE_INT_TIMER0 0x0002 | ||
| 32 | #define BRIDGE_INT_TIMER1 0x0004 | ||
| 33 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | ||
| 34 | |||
| 35 | #define MAIN_IRQ_CAUSE (ORION5X_BRIDGE_VIRT_BASE | 0x200) | ||
| 36 | |||
| 37 | #define MAIN_IRQ_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x204) | ||
| 38 | |||
| 39 | #define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300) | ||
| 40 | |||
| 41 | #endif | ||
diff --git a/arch/arm/mach-orion5x/include/mach/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S index 4351937035c..d658992e540 100644 --- a/arch/arm/mach-orion5x/include/mach/entry-macro.S +++ b/arch/arm/mach-orion5x/include/mach/entry-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <mach/orion5x.h> | 11 | #include <mach/bridge-regs.h> |
| 12 | 12 | ||
| 13 | .macro disable_fiq | 13 | .macro disable_fiq |
| 14 | .endm | 14 | .endm |
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index 67bda31406d..377a773ae53 100644 --- a/arch/arm/mach-orion5x/include/mach/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h | |||
| @@ -61,30 +61,10 @@ | |||
| 61 | #define ORION5X_PCI_MEM_SIZE SZ_128M | 61 | #define ORION5X_PCI_MEM_SIZE SZ_128M |
| 62 | 62 | ||
| 63 | /******************************************************************************* | 63 | /******************************************************************************* |
| 64 | * Supported Devices & Revisions | ||
| 65 | ******************************************************************************/ | ||
| 66 | /* Orion-1 (88F5181) and Orion-VoIP (88F5181L) */ | ||
| 67 | #define MV88F5181_DEV_ID 0x5181 | ||
| 68 | #define MV88F5181_REV_B1 3 | ||
| 69 | #define MV88F5181L_REV_A0 8 | ||
| 70 | #define MV88F5181L_REV_A1 9 | ||
| 71 | /* Orion-NAS (88F5182) */ | ||
| 72 | #define MV88F5182_DEV_ID 0x5182 | ||
| 73 | #define MV88F5182_REV_A2 2 | ||
| 74 | /* Orion-2 (88F5281) */ | ||
| 75 | #define MV88F5281_DEV_ID 0x5281 | ||
| 76 | #define MV88F5281_REV_D0 4 | ||
| 77 | #define MV88F5281_REV_D1 5 | ||
| 78 | #define MV88F5281_REV_D2 6 | ||
| 79 | /* Orion-1-90 (88F6183) */ | ||
| 80 | #define MV88F6183_DEV_ID 0x6183 | ||
| 81 | #define MV88F6183_REV_B0 3 | ||
| 82 | |||
| 83 | /******************************************************************************* | ||
| 84 | * Orion Registers Map | 64 | * Orion Registers Map |
| 85 | ******************************************************************************/ | 65 | ******************************************************************************/ |
| 66 | |||
| 86 | #define ORION5X_DDR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x00000) | 67 | #define ORION5X_DDR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x00000) |
| 87 | #define ORION5X_DDR_REG(x) (ORION5X_DDR_VIRT_BASE | (x)) | ||
| 88 | 68 | ||
| 89 | #define ORION5X_DEV_BUS_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x10000) | 69 | #define ORION5X_DEV_BUS_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x10000) |
| 90 | #define ORION5X_DEV_BUS_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x10000) | 70 | #define ORION5X_DEV_BUS_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x10000) |
| @@ -97,34 +77,25 @@ | |||
| 97 | #define UART1_VIRT_BASE (ORION5X_DEV_BUS_VIRT_BASE | 0x2100) | 77 | #define UART1_VIRT_BASE (ORION5X_DEV_BUS_VIRT_BASE | 0x2100) |
| 98 | 78 | ||
| 99 | #define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x20000) | 79 | #define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x20000) |
| 100 | #define ORION5X_BRIDGE_REG(x) (ORION5X_BRIDGE_VIRT_BASE | (x)) | ||
| 101 | #define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300) | ||
| 102 | 80 | ||
| 103 | #define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x30000) | 81 | #define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x30000) |
| 104 | #define ORION5X_PCI_REG(x) (ORION5X_PCI_VIRT_BASE | (x)) | ||
| 105 | 82 | ||
| 106 | #define ORION5X_PCIE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x40000) | 83 | #define ORION5X_PCIE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x40000) |
| 107 | #define ORION5X_PCIE_REG(x) (ORION5X_PCIE_VIRT_BASE | (x)) | ||
| 108 | 84 | ||
| 109 | #define ORION5X_USB0_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x50000) | 85 | #define ORION5X_USB0_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x50000) |
| 110 | #define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000) | 86 | #define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000) |
| 111 | #define ORION5X_USB0_REG(x) (ORION5X_USB0_VIRT_BASE | (x)) | ||
| 112 | 87 | ||
| 113 | #define ORION5X_XOR_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x60900) | 88 | #define ORION5X_XOR_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x60900) |
| 114 | #define ORION5X_XOR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x60900) | 89 | #define ORION5X_XOR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x60900) |
| 115 | #define ORION5X_XOR_REG(x) (ORION5X_XOR_VIRT_BASE | (x)) | ||
| 116 | 90 | ||
| 117 | #define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000) | 91 | #define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000) |
| 118 | #define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000) | 92 | #define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000) |
| 119 | #define ORION5X_ETH_REG(x) (ORION5X_ETH_VIRT_BASE | (x)) | ||
| 120 | 93 | ||
| 121 | #define ORION5X_SATA_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x80000) | 94 | #define ORION5X_SATA_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x80000) |
| 122 | #define ORION5X_SATA_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x80000) | 95 | #define ORION5X_SATA_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x80000) |
| 123 | #define ORION5X_SATA_REG(x) (ORION5X_SATA_VIRT_BASE | (x)) | ||
| 124 | 96 | ||
| 125 | #define ORION5X_USB1_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0xa0000) | 97 | #define ORION5X_USB1_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0xa0000) |
| 126 | #define ORION5X_USB1_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0xa0000) | 98 | #define ORION5X_USB1_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0xa0000) |
| 127 | #define ORION5X_USB1_REG(x) (ORION5X_USB1_VIRT_BASE | (x)) | ||
| 128 | 99 | ||
| 129 | /******************************************************************************* | 100 | /******************************************************************************* |
| 130 | * Device Bus Registers | 101 | * Device Bus Registers |
| @@ -142,23 +113,24 @@ | |||
| 142 | #define DEV_BUS_INT_CAUSE ORION5X_DEV_BUS_REG(0x4d0) | 113 | #define DEV_BUS_INT_CAUSE ORION5X_DEV_BUS_REG(0x4d0) |
| 143 | #define DEV_BUS_INT_MASK ORION5X_DEV_BUS_REG(0x4d4) | 114 | #define DEV_BUS_INT_MASK ORION5X_DEV_BUS_REG(0x4d4) |
| 144 | 115 | ||
| 145 | /*************************************************************************** | 116 | /******************************************************************************* |
| 146 | * Orion CPU Bridge Registers | 117 | * Supported Devices & Revisions |
| 147 | **************************************************************************/ | 118 | ******************************************************************************/ |
| 148 | #define CPU_CONF ORION5X_BRIDGE_REG(0x100) | 119 | /* Orion-1 (88F5181) and Orion-VoIP (88F5181L) */ |
| 149 | #define CPU_CTRL ORION5X_BRIDGE_REG(0x104) | 120 | #define MV88F5181_DEV_ID 0x5181 |
| 150 | #define CPU_RESET_MASK ORION5X_BRIDGE_REG(0x108) | 121 | #define MV88F5181_REV_B1 3 |
| 151 | #define WDT_RESET 0x0002 | 122 | #define MV88F5181L_REV_A0 8 |
| 152 | #define CPU_SOFT_RESET ORION5X_BRIDGE_REG(0x10c) | 123 | #define MV88F5181L_REV_A1 9 |
| 153 | #define POWER_MNG_CTRL_REG ORION5X_BRIDGE_REG(0x11C) | 124 | /* Orion-NAS (88F5182) */ |
| 154 | #define BRIDGE_CAUSE ORION5X_BRIDGE_REG(0x110) | 125 | #define MV88F5182_DEV_ID 0x5182 |
| 155 | #define WDT_INT_REQ 0x0008 | 126 | #define MV88F5182_REV_A2 2 |
| 156 | #define BRIDGE_MASK ORION5X_BRIDGE_REG(0x114) | 127 | /* Orion-2 (88F5281) */ |
| 157 | #define BRIDGE_INT_TIMER0 0x0002 | 128 | #define MV88F5281_DEV_ID 0x5281 |
| 158 | #define BRIDGE_INT_TIMER1 0x0004 | 129 | #define MV88F5281_REV_D0 4 |
| 159 | #define BRIDGE_INT_TIMER1_CLR (~0x0004) | 130 | #define MV88F5281_REV_D1 5 |
| 160 | #define MAIN_IRQ_CAUSE ORION5X_BRIDGE_REG(0x200) | 131 | #define MV88F5281_REV_D2 6 |
| 161 | #define MAIN_IRQ_MASK ORION5X_BRIDGE_REG(0x204) | 132 | /* Orion-1-90 (88F6183) */ |
| 162 | 133 | #define MV88F6183_DEV_ID 0x6183 | |
| 134 | #define MV88F6183_REV_B0 3 | ||
| 163 | 135 | ||
| 164 | #endif | 136 | #endif |
diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h index 9b8db1dcfa8..e912490fff2 100644 --- a/arch/arm/mach-orion5x/include/mach/system.h +++ b/arch/arm/mach-orion5x/include/mach/system.h | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | #ifndef __ASM_ARCH_SYSTEM_H | 11 | #ifndef __ASM_ARCH_SYSTEM_H |
| 12 | #define __ASM_ARCH_SYSTEM_H | 12 | #define __ASM_ARCH_SYSTEM_H |
| 13 | 13 | ||
| 14 | #include <mach/hardware.h> | 14 | #include <mach/bridge-regs.h> |
| 15 | #include <mach/orion5x.h> | ||
| 16 | 15 | ||
| 17 | static inline void arch_idle(void) | 16 | static inline void arch_idle(void) |
| 18 | { | 17 | { |
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c index e03f7b45cb0..d7512b925a8 100644 --- a/arch/arm/mach-orion5x/irq.c +++ b/arch/arm/mach-orion5x/irq.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <asm/gpio.h> | 17 | #include <asm/gpio.h> |
| 18 | #include <mach/orion5x.h> | 18 | #include <mach/bridge-regs.h> |
| 19 | #include <plat/irq.h> | 19 | #include <plat/irq.h> |
| 20 | #include "common.h" | 20 | #include "common.h" |
| 21 | 21 | ||
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c index 68acca98e63..41e6d5033d5 100644 --- a/arch/arm/mach-orion5x/mss2-setup.c +++ b/arch/arm/mach-orion5x/mss2-setup.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| 27 | #include <asm/mach/pci.h> | 27 | #include <asm/mach/pci.h> |
| 28 | #include <mach/orion5x.h> | 28 | #include <mach/orion5x.h> |
| 29 | #include <mach/bridge-regs.h> | ||
| 29 | #include "common.h" | 30 | #include "common.h" |
| 30 | #include "mpp.h" | 31 | #include "mpp.h" |
| 31 | 32 | ||
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index d0a785a3b88..36dc5413cc9 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
| @@ -196,6 +196,7 @@ static int __init pcie_setup(struct pci_sys_data *sys) | |||
| 196 | /***************************************************************************** | 196 | /***************************************************************************** |
| 197 | * PCI controller | 197 | * PCI controller |
| 198 | ****************************************************************************/ | 198 | ****************************************************************************/ |
| 199 | #define ORION5X_PCI_REG(x) (ORION5X_PCI_VIRT_BASE | (x)) | ||
| 199 | #define PCI_MODE ORION5X_PCI_REG(0xd00) | 200 | #define PCI_MODE ORION5X_PCI_REG(0xd00) |
| 200 | #define PCI_CMD ORION5X_PCI_REG(0xc00) | 201 | #define PCI_CMD ORION5X_PCI_REG(0xc00) |
| 201 | #define PCI_P2P_CONF ORION5X_PCI_REG(0x1d14) | 202 | #define PCI_P2P_CONF ORION5X_PCI_REG(0x1d14) |
diff --git a/arch/arm/mach-pxa/include/mach/audio.h b/arch/arm/mach-pxa/include/mach/audio.h index f82f96dd105..16eb02552d5 100644 --- a/arch/arm/mach-pxa/include/mach/audio.h +++ b/arch/arm/mach-pxa/include/mach/audio.h | |||
| @@ -4,12 +4,22 @@ | |||
| 4 | #include <sound/core.h> | 4 | #include <sound/core.h> |
| 5 | #include <sound/pcm.h> | 5 | #include <sound/pcm.h> |
| 6 | 6 | ||
| 7 | /* | ||
| 8 | * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95) | ||
| 9 | * a -1 value means no gpio will be used for reset | ||
| 10 | |||
| 11 | * reset_gpio should only be specified for pxa27x CPUs where a silicon | ||
| 12 | * bug prevents correct operation of the reset line. If not specified, | ||
| 13 | * the default behaviour on these CPUs is to consider gpio 113 as the | ||
| 14 | * AC97 reset line, which is the default on most boards. | ||
| 15 | */ | ||
| 7 | typedef struct { | 16 | typedef struct { |
| 8 | int (*startup)(struct snd_pcm_substream *, void *); | 17 | int (*startup)(struct snd_pcm_substream *, void *); |
| 9 | void (*shutdown)(struct snd_pcm_substream *, void *); | 18 | void (*shutdown)(struct snd_pcm_substream *, void *); |
| 10 | void (*suspend)(void *); | 19 | void (*suspend)(void *); |
| 11 | void (*resume)(void *); | 20 | void (*resume)(void *); |
| 12 | void *priv; | 21 | void *priv; |
| 22 | int reset_gpio; | ||
| 13 | } pxa2xx_audio_ops_t; | 23 | } pxa2xx_audio_ops_t; |
| 14 | 24 | ||
| 15 | extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops); | 25 | extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops); |
diff --git a/arch/arm/mach-pxa/include/mach/palmasoc.h b/arch/arm/mach-pxa/include/mach/palmasoc.h index 6c4b1f7de20..58afb30d529 100644 --- a/arch/arm/mach-pxa/include/mach/palmasoc.h +++ b/arch/arm/mach-pxa/include/mach/palmasoc.h | |||
| @@ -1,13 +1,8 @@ | |||
| 1 | #ifndef _INCLUDE_PALMASOC_H_ | 1 | #ifndef _INCLUDE_PALMASOC_H_ |
| 2 | #define _INCLUDE_PALMASOC_H_ | 2 | #define _INCLUDE_PALMASOC_H_ |
| 3 | |||
| 3 | struct palm27x_asoc_info { | 4 | struct palm27x_asoc_info { |
| 4 | int jack_gpio; | 5 | int jack_gpio; |
| 5 | }; | 6 | }; |
| 6 | 7 | ||
| 7 | #ifdef CONFIG_SND_PXA2XX_SOC_PALM27X | ||
| 8 | void __init palm27x_asoc_set_pdata(struct palm27x_asoc_info *data); | ||
| 9 | #else | ||
| 10 | static inline void palm27x_asoc_set_pdata(struct palm27x_asoc_info *data) {} | ||
| 11 | #endif | ||
| 12 | |||
| 13 | #endif | 8 | #endif |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 9203b069b35..ff8052ce0a0 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
| @@ -742,6 +742,10 @@ struct i2c_pxa_platform_data i2c_pdata = { | |||
| 742 | .fast_mode = 1, | 742 | .fast_mode = 1, |
| 743 | }; | 743 | }; |
| 744 | 744 | ||
| 745 | static pxa2xx_audio_ops_t mioa701_ac97_info = { | ||
| 746 | .reset_gpio = 95, | ||
| 747 | }; | ||
| 748 | |||
| 745 | /* | 749 | /* |
| 746 | * Mio global | 750 | * Mio global |
| 747 | */ | 751 | */ |
| @@ -815,7 +819,7 @@ static void __init mioa701_machine_init(void) | |||
| 815 | pxa_set_keypad_info(&mioa701_keypad_info); | 819 | pxa_set_keypad_info(&mioa701_keypad_info); |
| 816 | wm97xx_bat_set_pdata(&mioa701_battery_data); | 820 | wm97xx_bat_set_pdata(&mioa701_battery_data); |
| 817 | pxa_set_udc_info(&mioa701_udc_info); | 821 | pxa_set_udc_info(&mioa701_udc_info); |
| 818 | pxa_set_ac97_info(NULL); | 822 | pxa_set_ac97_info(&mioa701_ac97_info); |
| 819 | pm_power_off = mioa701_poweroff; | 823 | pm_power_off = mioa701_poweroff; |
| 820 | arm_pm_restart = mioa701_restart; | 824 | arm_pm_restart = mioa701_restart; |
| 821 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 825 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index ecf5910e39d..1cec1806f00 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c | |||
| @@ -477,10 +477,22 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = { | |||
| 477 | /****************************************************************************** | 477 | /****************************************************************************** |
| 478 | * aSoC audio | 478 | * aSoC audio |
| 479 | ******************************************************************************/ | 479 | ******************************************************************************/ |
| 480 | static struct palm27x_asoc_info palm27x_asoc_pdata = { | 480 | static struct palm27x_asoc_info palmld_asoc_pdata = { |
| 481 | .jack_gpio = GPIO_NR_PALMLD_EARPHONE_DETECT, | 481 | .jack_gpio = GPIO_NR_PALMLD_EARPHONE_DETECT, |
| 482 | }; | 482 | }; |
| 483 | 483 | ||
| 484 | static pxa2xx_audio_ops_t palmld_ac97_pdata = { | ||
| 485 | .reset_gpio = 95, | ||
| 486 | }; | ||
| 487 | |||
| 488 | static struct platform_device palmld_asoc = { | ||
| 489 | .name = "palm27x-asoc", | ||
| 490 | .id = -1, | ||
| 491 | .dev = { | ||
| 492 | .platform_data = &palmld_asoc_pdata, | ||
| 493 | }, | ||
| 494 | }; | ||
| 495 | |||
| 484 | /****************************************************************************** | 496 | /****************************************************************************** |
| 485 | * Framebuffer | 497 | * Framebuffer |
| 486 | ******************************************************************************/ | 498 | ******************************************************************************/ |
| @@ -544,6 +556,7 @@ static struct platform_device *devices[] __initdata = { | |||
| 544 | &palmld_backlight, | 556 | &palmld_backlight, |
| 545 | &palmld_leds, | 557 | &palmld_leds, |
| 546 | &power_supply, | 558 | &power_supply, |
| 559 | &palmld_asoc, | ||
| 547 | }; | 560 | }; |
| 548 | 561 | ||
| 549 | static struct map_desc palmld_io_desc[] __initdata = { | 562 | static struct map_desc palmld_io_desc[] __initdata = { |
| @@ -573,11 +586,10 @@ static void __init palmld_init(void) | |||
| 573 | 586 | ||
| 574 | set_pxa_fb_info(&palmld_lcd_screen); | 587 | set_pxa_fb_info(&palmld_lcd_screen); |
| 575 | pxa_set_mci_info(&palmld_mci_platform_data); | 588 | pxa_set_mci_info(&palmld_mci_platform_data); |
| 576 | pxa_set_ac97_info(NULL); | 589 | pxa_set_ac97_info(&palmld_ac97_pdata); |
| 577 | pxa_set_ficp_info(&palmld_ficp_platform_data); | 590 | pxa_set_ficp_info(&palmld_ficp_platform_data); |
| 578 | pxa_set_keypad_info(&palmld_keypad_platform_data); | 591 | pxa_set_keypad_info(&palmld_keypad_platform_data); |
| 579 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); | 592 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); |
| 580 | palm27x_asoc_set_pdata(&palm27x_asoc_pdata); | ||
| 581 | 593 | ||
| 582 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 594 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 583 | } | 595 | } |
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index d7f81068c61..30662363907 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
| @@ -420,10 +420,22 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = { | |||
| 420 | /****************************************************************************** | 420 | /****************************************************************************** |
| 421 | * aSoC audio | 421 | * aSoC audio |
| 422 | ******************************************************************************/ | 422 | ******************************************************************************/ |
| 423 | static struct palm27x_asoc_info palm27x_asoc_pdata = { | 423 | static struct palm27x_asoc_info palmt5_asoc_pdata = { |
| 424 | .jack_gpio = GPIO_NR_PALMT5_EARPHONE_DETECT, | 424 | .jack_gpio = GPIO_NR_PALMT5_EARPHONE_DETECT, |
| 425 | }; | 425 | }; |
| 426 | 426 | ||
| 427 | static pxa2xx_audio_ops_t palmt5_ac97_pdata = { | ||
| 428 | .reset_gpio = 95, | ||
| 429 | }; | ||
| 430 | |||
| 431 | static struct platform_device palmt5_asoc = { | ||
| 432 | .name = "palm27x-asoc", | ||
| 433 | .id = -1, | ||
| 434 | .dev = { | ||
| 435 | .platform_data = &palmt5_asoc_pdata, | ||
| 436 | }, | ||
| 437 | }; | ||
| 438 | |||
| 427 | /****************************************************************************** | 439 | /****************************************************************************** |
| 428 | * Framebuffer | 440 | * Framebuffer |
| 429 | ******************************************************************************/ | 441 | ******************************************************************************/ |
| @@ -486,6 +498,7 @@ static struct platform_device *devices[] __initdata = { | |||
| 486 | #endif | 498 | #endif |
| 487 | &palmt5_backlight, | 499 | &palmt5_backlight, |
| 488 | &power_supply, | 500 | &power_supply, |
| 501 | &palmt5_asoc, | ||
| 489 | }; | 502 | }; |
| 490 | 503 | ||
| 491 | /* setup udc GPIOs initial state */ | 504 | /* setup udc GPIOs initial state */ |
| @@ -504,12 +517,11 @@ static void __init palmt5_init(void) | |||
| 504 | set_pxa_fb_info(&palmt5_lcd_screen); | 517 | set_pxa_fb_info(&palmt5_lcd_screen); |
| 505 | pxa_set_mci_info(&palmt5_mci_platform_data); | 518 | pxa_set_mci_info(&palmt5_mci_platform_data); |
| 506 | palmt5_udc_init(); | 519 | palmt5_udc_init(); |
| 520 | pxa_set_ac97_info(&palmt5_ac97_pdata); | ||
| 507 | pxa_set_udc_info(&palmt5_udc_info); | 521 | pxa_set_udc_info(&palmt5_udc_info); |
| 508 | pxa_set_ac97_info(NULL); | ||
| 509 | pxa_set_ficp_info(&palmt5_ficp_platform_data); | 522 | pxa_set_ficp_info(&palmt5_ficp_platform_data); |
| 510 | pxa_set_keypad_info(&palmt5_keypad_platform_data); | 523 | pxa_set_keypad_info(&palmt5_keypad_platform_data); |
| 511 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); | 524 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); |
| 512 | palm27x_asoc_set_pdata(&palm27x_asoc_pdata); | ||
| 513 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 525 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 514 | } | 526 | } |
| 515 | 527 | ||
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 14393d0ad8b..e2d44b1a8a9 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <mach/irda.h> | 40 | #include <mach/irda.h> |
| 41 | #include <mach/pxa27x_keypad.h> | 41 | #include <mach/pxa27x_keypad.h> |
| 42 | #include <mach/udc.h> | 42 | #include <mach/udc.h> |
| 43 | #include <mach/palmasoc.h> | ||
| 43 | 44 | ||
| 44 | #include "generic.h" | 45 | #include "generic.h" |
| 45 | #include "devices.h" | 46 | #include "devices.h" |
| @@ -434,6 +435,25 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = { | |||
| 434 | }; | 435 | }; |
| 435 | 436 | ||
| 436 | /****************************************************************************** | 437 | /****************************************************************************** |
| 438 | * aSoC audio | ||
| 439 | ******************************************************************************/ | ||
| 440 | static struct palm27x_asoc_info palmtx_asoc_pdata = { | ||
| 441 | .jack_gpio = GPIO_NR_PALMTX_EARPHONE_DETECT, | ||
| 442 | }; | ||
| 443 | |||
| 444 | static pxa2xx_audio_ops_t palmtx_ac97_pdata = { | ||
| 445 | .reset_gpio = 95, | ||
| 446 | }; | ||
| 447 | |||
| 448 | static struct platform_device palmtx_asoc = { | ||
| 449 | .name = "palm27x-asoc", | ||
| 450 | .id = -1, | ||
| 451 | .dev = { | ||
| 452 | .platform_data = &palmtx_asoc_pdata, | ||
| 453 | }, | ||
| 454 | }; | ||
| 455 | |||
| 456 | /****************************************************************************** | ||
| 437 | * Framebuffer | 457 | * Framebuffer |
| 438 | ******************************************************************************/ | 458 | ******************************************************************************/ |
| 439 | static struct pxafb_mode_info palmtx_lcd_modes[] = { | 459 | static struct pxafb_mode_info palmtx_lcd_modes[] = { |
| @@ -495,6 +515,7 @@ static struct platform_device *devices[] __initdata = { | |||
| 495 | #endif | 515 | #endif |
| 496 | &palmtx_backlight, | 516 | &palmtx_backlight, |
| 497 | &power_supply, | 517 | &power_supply, |
| 518 | &palmtx_asoc, | ||
| 498 | }; | 519 | }; |
| 499 | 520 | ||
| 500 | static struct map_desc palmtx_io_desc[] __initdata = { | 521 | static struct map_desc palmtx_io_desc[] __initdata = { |
| @@ -529,8 +550,8 @@ static void __init palmtx_init(void) | |||
| 529 | set_pxa_fb_info(&palmtx_lcd_screen); | 550 | set_pxa_fb_info(&palmtx_lcd_screen); |
| 530 | pxa_set_mci_info(&palmtx_mci_platform_data); | 551 | pxa_set_mci_info(&palmtx_mci_platform_data); |
| 531 | palmtx_udc_init(); | 552 | palmtx_udc_init(); |
| 553 | pxa_set_ac97_info(&palmtx_ac97_pdata); | ||
| 532 | pxa_set_udc_info(&palmtx_udc_info); | 554 | pxa_set_udc_info(&palmtx_udc_info); |
| 533 | pxa_set_ac97_info(NULL); | ||
| 534 | pxa_set_ficp_info(&palmtx_ficp_platform_data); | 555 | pxa_set_ficp_info(&palmtx_ficp_platform_data); |
| 535 | pxa_set_keypad_info(&palmtx_keypad_platform_data); | 556 | pxa_set_keypad_info(&palmtx_keypad_platform_data); |
| 536 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); | 557 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); |
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 6112740b4ae..6c12b5a3132 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
| @@ -377,7 +377,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = { | |||
| 377 | #include <linux/i2c/pca953x.h> | 377 | #include <linux/i2c/pca953x.h> |
| 378 | 378 | ||
| 379 | static struct pca953x_platform_data pca9536_data = { | 379 | static struct pca953x_platform_data pca9536_data = { |
| 380 | .gpio_base = NR_BUILTIN_GPIO + 1, | 380 | .gpio_base = NR_BUILTIN_GPIO, |
| 381 | }; | 381 | }; |
| 382 | 382 | ||
| 383 | static int gpio_bus_switch; | 383 | static int gpio_bus_switch; |
| @@ -405,9 +405,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link) | |||
| 405 | int ret; | 405 | int ret; |
| 406 | 406 | ||
| 407 | if (!gpio_bus_switch) { | 407 | if (!gpio_bus_switch) { |
| 408 | ret = gpio_request(NR_BUILTIN_GPIO + 1, "camera"); | 408 | ret = gpio_request(NR_BUILTIN_GPIO, "camera"); |
| 409 | if (!ret) { | 409 | if (!ret) { |
| 410 | gpio_bus_switch = NR_BUILTIN_GPIO + 1; | 410 | gpio_bus_switch = NR_BUILTIN_GPIO; |
| 411 | gpio_direction_output(gpio_bus_switch, 0); | 411 | gpio_direction_output(gpio_bus_switch, 0); |
| 412 | } else | 412 | } else |
| 413 | gpio_bus_switch = -EINVAL; | 413 | gpio_bus_switch = -EINVAL; |
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 2faf9dba4ef..de8a001fc3a 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
| 18 | #include <asm/mach/time.h> | 18 | #include <asm/mach/time.h> |
| 19 | #include <mach/hardware.h> | 19 | #include <mach/bridge-regs.h> |
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | * Number of timer ticks per jiffy. | 22 | * Number of timer ticks per jiffy. |
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 28af6a731bb..d20a5db4c4d 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
| @@ -610,20 +610,22 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
| 610 | int r; | 610 | int r; |
| 611 | 611 | ||
| 612 | again: | 612 | again: |
| 613 | preempt_disable(); | ||
| 614 | local_irq_disable(); | ||
| 615 | |||
| 616 | if (signal_pending(current)) { | 613 | if (signal_pending(current)) { |
| 617 | local_irq_enable(); | ||
| 618 | preempt_enable(); | ||
| 619 | r = -EINTR; | 614 | r = -EINTR; |
| 620 | kvm_run->exit_reason = KVM_EXIT_INTR; | 615 | kvm_run->exit_reason = KVM_EXIT_INTR; |
| 621 | goto out; | 616 | goto out; |
| 622 | } | 617 | } |
| 623 | 618 | ||
| 619 | /* | ||
| 620 | * down_read() may sleep and return with interrupts enabled | ||
| 621 | */ | ||
| 622 | down_read(&vcpu->kvm->slots_lock); | ||
| 623 | |||
| 624 | preempt_disable(); | ||
| 625 | local_irq_disable(); | ||
| 626 | |||
| 624 | vcpu->guest_mode = 1; | 627 | vcpu->guest_mode = 1; |
| 625 | kvm_guest_enter(); | 628 | kvm_guest_enter(); |
| 626 | down_read(&vcpu->kvm->slots_lock); | ||
| 627 | r = vti_vcpu_run(vcpu, kvm_run); | 629 | r = vti_vcpu_run(vcpu, kvm_run); |
| 628 | if (r < 0) { | 630 | if (r < 0) { |
| 629 | local_irq_enable(); | 631 | local_irq_enable(); |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 23597beb66c..0f69fa5ddf2 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:42 2008 | 4 | # Wed Apr 22 20:47:52 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 140 | CONFIG_NEED_MULTIPLE_NODES=y | 151 | CONFIG_NEED_MULTIPLE_NODES=y |
| 141 | CONFIG_PAGEFLAGS_EXTENDED=y | 152 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 153 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 143 | # CONFIG_RESOURCES_64BIT is not set | ||
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 154 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 145 | CONFIG_ZONE_DMA_FLAG=1 | 155 | CONFIG_ZONE_DMA_FLAG=1 |
| 146 | CONFIG_BOUNCE=y | 156 | CONFIG_BOUNCE=y |
| 147 | CONFIG_VIRT_TO_BUS=y | 157 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | 158 | CONFIG_UNEVICTABLE_LRU=y |
| 159 | CONFIG_HAVE_MLOCK=y | ||
| 160 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 149 | 161 | ||
| 150 | # | 162 | # |
| 151 | # General setup | 163 | # General setup |
| @@ -157,7 +169,7 @@ CONFIG_BINFMT_AOUT=m | |||
| 157 | CONFIG_BINFMT_MISC=m | 169 | CONFIG_BINFMT_MISC=m |
| 158 | CONFIG_ZORRO=y | 170 | CONFIG_ZORRO=y |
| 159 | CONFIG_AMIGA_PCMCIA=y | 171 | CONFIG_AMIGA_PCMCIA=y |
| 160 | # CONFIG_HEARTBEAT is not set | 172 | CONFIG_HEARTBEAT=y |
| 161 | CONFIG_PROC_HARDWARE=y | 173 | CONFIG_PROC_HARDWARE=y |
| 162 | CONFIG_ISA=y | 174 | CONFIG_ISA=y |
| 163 | CONFIG_GENERIC_ISA_DMA=y | 175 | CONFIG_GENERIC_ISA_DMA=y |
| @@ -184,7 +196,10 @@ CONFIG_INET=y | |||
| 184 | # CONFIG_IP_MULTICAST is not set | 196 | # CONFIG_IP_MULTICAST is not set |
| 185 | # CONFIG_IP_ADVANCED_ROUTER is not set | 197 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 186 | CONFIG_IP_FIB_HASH=y | 198 | CONFIG_IP_FIB_HASH=y |
| 187 | # CONFIG_IP_PNP is not set | 199 | CONFIG_IP_PNP=y |
| 200 | # CONFIG_IP_PNP_DHCP is not set | ||
| 201 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 202 | # CONFIG_IP_PNP_RARP is not set | ||
| 188 | CONFIG_NET_IPIP=m | 203 | CONFIG_NET_IPIP=m |
| 189 | CONFIG_NET_IPGRE=m | 204 | CONFIG_NET_IPGRE=m |
| 190 | # CONFIG_ARPD is not set | 205 | # CONFIG_ARPD is not set |
| @@ -258,6 +273,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 273 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 274 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 275 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 276 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 277 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 278 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 279 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -266,6 +282,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 282 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 283 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 284 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 285 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 269 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 286 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 270 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 287 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 271 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 288 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -276,6 +293,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 293 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 294 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 295 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 297 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 298 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 299 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -354,25 +372,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 372 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 355 | CONFIG_IP6_NF_MATCH_MH=m | 373 | CONFIG_IP6_NF_MATCH_MH=m |
| 356 | CONFIG_IP6_NF_MATCH_RT=m | 374 | CONFIG_IP6_NF_MATCH_RT=m |
| 375 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 357 | CONFIG_IP6_NF_TARGET_LOG=m | 376 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | 377 | CONFIG_IP6_NF_FILTER=m |
| 359 | CONFIG_IP6_NF_TARGET_REJECT=m | 378 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 360 | CONFIG_IP6_NF_MANGLE=m | 379 | CONFIG_IP6_NF_MANGLE=m |
| 361 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 362 | CONFIG_IP6_NF_RAW=m | 380 | CONFIG_IP6_NF_RAW=m |
| 363 | CONFIG_IP_DCCP=m | 381 | CONFIG_IP_DCCP=m |
| 364 | CONFIG_INET_DCCP_DIAG=m | 382 | CONFIG_INET_DCCP_DIAG=m |
| 365 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 366 | 383 | ||
| 367 | # | 384 | # |
| 368 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 385 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 369 | # | 386 | # |
| 370 | CONFIG_IP_DCCP_CCID2=m | ||
| 371 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 387 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 372 | CONFIG_IP_DCCP_CCID3=m | 388 | # CONFIG_IP_DCCP_CCID3 is not set |
| 373 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 374 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 375 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 376 | CONFIG_IP_SCTP=m | 389 | CONFIG_IP_SCTP=m |
| 377 | # CONFIG_SCTP_DBG_MSG is not set | 390 | # CONFIG_SCTP_DBG_MSG is not set |
| 378 | # CONFIG_SCTP_DBG_OBJCNT is not set | 391 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -394,8 +407,10 @@ CONFIG_ATALK=m | |||
| 394 | # CONFIG_LAPB is not set | 407 | # CONFIG_LAPB is not set |
| 395 | # CONFIG_ECONET is not set | 408 | # CONFIG_ECONET is not set |
| 396 | # CONFIG_WAN_ROUTER is not set | 409 | # CONFIG_WAN_ROUTER is not set |
| 410 | # CONFIG_PHONET is not set | ||
| 397 | # CONFIG_NET_SCHED is not set | 411 | # CONFIG_NET_SCHED is not set |
| 398 | CONFIG_NET_CLS_ROUTE=y | 412 | CONFIG_NET_CLS_ROUTE=y |
| 413 | # CONFIG_DCB is not set | ||
| 399 | 414 | ||
| 400 | # | 415 | # |
| 401 | # Network testing | 416 | # Network testing |
| @@ -406,8 +421,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 406 | # CONFIG_IRDA is not set | 421 | # CONFIG_IRDA is not set |
| 407 | # CONFIG_BT is not set | 422 | # CONFIG_BT is not set |
| 408 | # CONFIG_AF_RXRPC is not set | 423 | # CONFIG_AF_RXRPC is not set |
| 409 | # CONFIG_PHONET is not set | ||
| 410 | # CONFIG_WIRELESS is not set | 424 | # CONFIG_WIRELESS is not set |
| 425 | # CONFIG_WIMAX is not set | ||
| 411 | # CONFIG_RFKILL is not set | 426 | # CONFIG_RFKILL is not set |
| 412 | # CONFIG_NET_9P is not set | 427 | # CONFIG_NET_9P is not set |
| 413 | 428 | ||
| @@ -453,15 +468,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 453 | CONFIG_ATA_OVER_ETH=m | 468 | CONFIG_ATA_OVER_ETH=m |
| 454 | # CONFIG_BLK_DEV_HD is not set | 469 | # CONFIG_BLK_DEV_HD is not set |
| 455 | CONFIG_MISC_DEVICES=y | 470 | CONFIG_MISC_DEVICES=y |
| 456 | # CONFIG_EEPROM_93CX6 is not set | ||
| 457 | # CONFIG_ENCLOSURE_SERVICES is not set | 471 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 458 | # CONFIG_C2PORT is not set | 472 | # CONFIG_C2PORT is not set |
| 473 | |||
| 474 | # | ||
| 475 | # EEPROM support | ||
| 476 | # | ||
| 477 | # CONFIG_EEPROM_93CX6 is not set | ||
| 459 | CONFIG_HAVE_IDE=y | 478 | CONFIG_HAVE_IDE=y |
| 460 | CONFIG_IDE=y | 479 | CONFIG_IDE=y |
| 461 | 480 | ||
| 462 | # | 481 | # |
| 463 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 482 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 464 | # | 483 | # |
| 484 | CONFIG_IDE_ATAPI=y | ||
| 465 | # CONFIG_BLK_DEV_IDE_SATA is not set | 485 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 466 | CONFIG_IDE_GD=y | 486 | CONFIG_IDE_GD=y |
| 467 | CONFIG_IDE_GD_ATA=y | 487 | CONFIG_IDE_GD_ATA=y |
| @@ -469,7 +489,6 @@ CONFIG_IDE_GD_ATA=y | |||
| 469 | CONFIG_BLK_DEV_IDECD=y | 489 | CONFIG_BLK_DEV_IDECD=y |
| 470 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 490 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 471 | # CONFIG_BLK_DEV_IDETAPE is not set | 491 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 472 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 473 | # CONFIG_IDE_TASK_IOCTL is not set | 492 | # CONFIG_IDE_TASK_IOCTL is not set |
| 474 | CONFIG_IDE_PROC_FS=y | 493 | CONFIG_IDE_PROC_FS=y |
| 475 | 494 | ||
| @@ -478,7 +497,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 478 | # | 497 | # |
| 479 | # CONFIG_BLK_DEV_PLATFORM is not set | 498 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 480 | CONFIG_BLK_DEV_GAYLE=y | 499 | CONFIG_BLK_DEV_GAYLE=y |
| 481 | CONFIG_BLK_DEV_IDEDOUBLER=y | ||
| 482 | CONFIG_BLK_DEV_BUDDHA=y | 500 | CONFIG_BLK_DEV_BUDDHA=y |
| 483 | # CONFIG_BLK_DEV_IDEDMA is not set | 501 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 484 | 502 | ||
| @@ -530,6 +548,8 @@ CONFIG_ISCSI_TCP=m | |||
| 530 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 548 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 531 | # CONFIG_SCSI_ADVANSYS is not set | 549 | # CONFIG_SCSI_ADVANSYS is not set |
| 532 | # CONFIG_SCSI_IN2000 is not set | 550 | # CONFIG_SCSI_IN2000 is not set |
| 551 | # CONFIG_LIBFC is not set | ||
| 552 | # CONFIG_LIBFCOE is not set | ||
| 533 | # CONFIG_SCSI_DTC3280 is not set | 553 | # CONFIG_SCSI_DTC3280 is not set |
| 534 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 554 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 535 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | 555 | # CONFIG_SCSI_GENERIC_NCR5380 is not set |
| @@ -547,6 +567,7 @@ CONFIG_GVP11_SCSI=y | |||
| 547 | CONFIG_SCSI_A4000T=y | 567 | CONFIG_SCSI_A4000T=y |
| 548 | CONFIG_SCSI_ZORRO7XX=y | 568 | CONFIG_SCSI_ZORRO7XX=y |
| 549 | # CONFIG_SCSI_DH is not set | 569 | # CONFIG_SCSI_DH is not set |
| 570 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 550 | CONFIG_MD=y | 571 | CONFIG_MD=y |
| 551 | CONFIG_BLK_DEV_MD=m | 572 | CONFIG_BLK_DEV_MD=m |
| 552 | CONFIG_MD_LINEAR=m | 573 | CONFIG_MD_LINEAR=m |
| @@ -554,7 +575,7 @@ CONFIG_MD_RAID0=m | |||
| 554 | CONFIG_MD_RAID1=m | 575 | CONFIG_MD_RAID1=m |
| 555 | # CONFIG_MD_RAID10 is not set | 576 | # CONFIG_MD_RAID10 is not set |
| 556 | CONFIG_MD_RAID456=m | 577 | CONFIG_MD_RAID456=m |
| 557 | CONFIG_MD_RAID5_RESHAPE=y | 578 | CONFIG_MD_RAID6_PQ=m |
| 558 | # CONFIG_MD_MULTIPATH is not set | 579 | # CONFIG_MD_MULTIPATH is not set |
| 559 | # CONFIG_MD_FAULTY is not set | 580 | # CONFIG_MD_FAULTY is not set |
| 560 | CONFIG_BLK_DEV_DM=m | 581 | CONFIG_BLK_DEV_DM=m |
| @@ -567,6 +588,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 567 | # CONFIG_DM_DELAY is not set | 588 | # CONFIG_DM_DELAY is not set |
| 568 | CONFIG_DM_UEVENT=y | 589 | CONFIG_DM_UEVENT=y |
| 569 | CONFIG_NETDEVICES=y | 590 | CONFIG_NETDEVICES=y |
| 591 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 570 | CONFIG_DUMMY=m | 592 | CONFIG_DUMMY=m |
| 571 | # CONFIG_BONDING is not set | 593 | # CONFIG_BONDING is not set |
| 572 | CONFIG_MACVLAN=m | 594 | CONFIG_MACVLAN=m |
| @@ -577,14 +599,16 @@ CONFIG_VETH=m | |||
| 577 | # CONFIG_PHYLIB is not set | 599 | # CONFIG_PHYLIB is not set |
| 578 | CONFIG_NET_ETHERNET=y | 600 | CONFIG_NET_ETHERNET=y |
| 579 | # CONFIG_MII is not set | 601 | # CONFIG_MII is not set |
| 580 | CONFIG_ARIADNE=m | 602 | CONFIG_ARIADNE=y |
| 581 | CONFIG_A2065=m | 603 | CONFIG_A2065=y |
| 582 | CONFIG_HYDRA=m | 604 | CONFIG_HYDRA=y |
| 583 | CONFIG_ZORRO8390=m | 605 | CONFIG_ZORRO8390=y |
| 584 | CONFIG_APNE=m | 606 | CONFIG_APNE=y |
| 585 | # CONFIG_NET_VENDOR_3COM is not set | 607 | # CONFIG_NET_VENDOR_3COM is not set |
| 586 | # CONFIG_NET_VENDOR_SMC is not set | 608 | # CONFIG_NET_VENDOR_SMC is not set |
| 609 | # CONFIG_ETHOC is not set | ||
| 587 | # CONFIG_NET_VENDOR_RACAL is not set | 610 | # CONFIG_NET_VENDOR_RACAL is not set |
| 611 | # CONFIG_DNET is not set | ||
| 588 | # CONFIG_AT1700 is not set | 612 | # CONFIG_AT1700 is not set |
| 589 | # CONFIG_DEPCA is not set | 613 | # CONFIG_DEPCA is not set |
| 590 | # CONFIG_HP100 is not set | 614 | # CONFIG_HP100 is not set |
| @@ -609,7 +633,10 @@ CONFIG_APNE=m | |||
| 609 | # | 633 | # |
| 610 | # CONFIG_WLAN_PRE80211 is not set | 634 | # CONFIG_WLAN_PRE80211 is not set |
| 611 | # CONFIG_WLAN_80211 is not set | 635 | # CONFIG_WLAN_80211 is not set |
| 612 | # CONFIG_IWLWIFI_LEDS is not set | 636 | |
| 637 | # | ||
| 638 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 639 | # | ||
| 613 | # CONFIG_WAN is not set | 640 | # CONFIG_WAN is not set |
| 614 | # CONFIG_PLIP is not set | 641 | # CONFIG_PLIP is not set |
| 615 | CONFIG_PPP=m | 642 | CONFIG_PPP=m |
| @@ -719,7 +746,7 @@ CONFIG_HW_CONSOLE=y | |||
| 719 | CONFIG_VT_HW_CONSOLE_BINDING=y | 746 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 720 | # CONFIG_DEVKMEM is not set | 747 | # CONFIG_DEVKMEM is not set |
| 721 | # CONFIG_SERIAL_NONSTANDARD is not set | 748 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 722 | CONFIG_A2232=m | 749 | CONFIG_A2232=y |
| 723 | 750 | ||
| 724 | # | 751 | # |
| 725 | # Serial drivers | 752 | # Serial drivers |
| @@ -730,6 +757,7 @@ CONFIG_A2232=m | |||
| 730 | # Non-8250 serial port support | 757 | # Non-8250 serial port support |
| 731 | # | 758 | # |
| 732 | CONFIG_UNIX98_PTYS=y | 759 | CONFIG_UNIX98_PTYS=y |
| 760 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 733 | CONFIG_LEGACY_PTYS=y | 761 | CONFIG_LEGACY_PTYS=y |
| 734 | CONFIG_LEGACY_PTY_COUNT=256 | 762 | CONFIG_LEGACY_PTY_COUNT=256 |
| 735 | CONFIG_PRINTER=m | 763 | CONFIG_PRINTER=m |
| @@ -821,6 +849,7 @@ CONFIG_FB_FM2=y | |||
| 821 | # CONFIG_FB_VIRTUAL is not set | 849 | # CONFIG_FB_VIRTUAL is not set |
| 822 | # CONFIG_FB_METRONOME is not set | 850 | # CONFIG_FB_METRONOME is not set |
| 823 | # CONFIG_FB_MB862XX is not set | 851 | # CONFIG_FB_MB862XX is not set |
| 852 | # CONFIG_FB_BROADSHEET is not set | ||
| 824 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 853 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 825 | 854 | ||
| 826 | # | 855 | # |
| @@ -856,7 +885,6 @@ CONFIG_HIDRAW=y | |||
| 856 | # | 885 | # |
| 857 | # Special HID drivers | 886 | # Special HID drivers |
| 858 | # | 887 | # |
| 859 | CONFIG_HID_COMPAT=y | ||
| 860 | # CONFIG_USB_SUPPORT is not set | 888 | # CONFIG_USB_SUPPORT is not set |
| 861 | # CONFIG_MMC is not set | 889 | # CONFIG_MMC is not set |
| 862 | # CONFIG_MEMSTICK is not set | 890 | # CONFIG_MEMSTICK is not set |
| @@ -867,14 +895,13 @@ CONFIG_HID_COMPAT=y | |||
| 867 | # CONFIG_AUXDISPLAY is not set | 895 | # CONFIG_AUXDISPLAY is not set |
| 868 | # CONFIG_UIO is not set | 896 | # CONFIG_UIO is not set |
| 869 | # CONFIG_STAGING is not set | 897 | # CONFIG_STAGING is not set |
| 870 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 871 | 898 | ||
| 872 | # | 899 | # |
| 873 | # Character devices | 900 | # Character devices |
| 874 | # | 901 | # |
| 875 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 902 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
| 876 | CONFIG_MULTIFACE_III_TTY=m | 903 | CONFIG_MULTIFACE_III_TTY=m |
| 877 | # CONFIG_SERIAL_CONSOLE is not set | 904 | CONFIG_SERIAL_CONSOLE=y |
| 878 | 905 | ||
| 879 | # | 906 | # |
| 880 | # File systems | 907 | # File systems |
| @@ -883,6 +910,7 @@ CONFIG_EXT2_FS=y | |||
| 883 | # CONFIG_EXT2_FS_XATTR is not set | 910 | # CONFIG_EXT2_FS_XATTR is not set |
| 884 | # CONFIG_EXT2_FS_XIP is not set | 911 | # CONFIG_EXT2_FS_XIP is not set |
| 885 | CONFIG_EXT3_FS=y | 912 | CONFIG_EXT3_FS=y |
| 913 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 886 | # CONFIG_EXT3_FS_XATTR is not set | 914 | # CONFIG_EXT3_FS_XATTR is not set |
| 887 | # CONFIG_EXT4_FS is not set | 915 | # CONFIG_EXT4_FS is not set |
| 888 | CONFIG_JBD=y | 916 | CONFIG_JBD=y |
| @@ -909,13 +937,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 909 | # CONFIG_OCFS2_FS_STATS is not set | 937 | # CONFIG_OCFS2_FS_STATS is not set |
| 910 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 938 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 911 | # CONFIG_OCFS2_DEBUG_FS is not set | 939 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 912 | # CONFIG_OCFS2_COMPAT_JBD is not set | 940 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 941 | # CONFIG_BTRFS_FS is not set | ||
| 913 | CONFIG_DNOTIFY=y | 942 | CONFIG_DNOTIFY=y |
| 914 | CONFIG_INOTIFY=y | 943 | CONFIG_INOTIFY=y |
| 915 | CONFIG_INOTIFY_USER=y | 944 | CONFIG_INOTIFY_USER=y |
| 916 | CONFIG_QUOTA=y | 945 | CONFIG_QUOTA=y |
| 917 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 946 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 918 | # CONFIG_PRINT_QUOTA_WARNING is not set | 947 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 948 | CONFIG_QUOTA_TREE=m | ||
| 919 | # CONFIG_QFMT_V1 is not set | 949 | # CONFIG_QFMT_V1 is not set |
| 920 | # CONFIG_QFMT_V2 is not set | 950 | # CONFIG_QFMT_V2 is not set |
| 921 | CONFIG_QUOTACTL=y | 951 | CONFIG_QUOTACTL=y |
| @@ -924,6 +954,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 924 | CONFIG_FUSE_FS=m | 954 | CONFIG_FUSE_FS=m |
| 925 | 955 | ||
| 926 | # | 956 | # |
| 957 | # Caches | ||
| 958 | # | ||
| 959 | # CONFIG_FSCACHE is not set | ||
| 960 | |||
| 961 | # | ||
| 927 | # CD-ROM/DVD Filesystems | 962 | # CD-ROM/DVD Filesystems |
| 928 | # | 963 | # |
| 929 | CONFIG_ISO9660_FS=y | 964 | CONFIG_ISO9660_FS=y |
| @@ -935,8 +970,8 @@ CONFIG_UDF_NLS=y | |||
| 935 | # | 970 | # |
| 936 | # DOS/FAT/NT Filesystems | 971 | # DOS/FAT/NT Filesystems |
| 937 | # | 972 | # |
| 938 | CONFIG_FAT_FS=m | 973 | CONFIG_FAT_FS=y |
| 939 | CONFIG_MSDOS_FS=m | 974 | CONFIG_MSDOS_FS=y |
| 940 | CONFIG_VFAT_FS=m | 975 | CONFIG_VFAT_FS=m |
| 941 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | 976 | CONFIG_FAT_DEFAULT_CODEPAGE=437 |
| 942 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 977 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" |
| @@ -954,10 +989,7 @@ CONFIG_TMPFS=y | |||
| 954 | # CONFIG_TMPFS_POSIX_ACL is not set | 989 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 955 | # CONFIG_HUGETLB_PAGE is not set | 990 | # CONFIG_HUGETLB_PAGE is not set |
| 956 | CONFIG_CONFIGFS_FS=m | 991 | CONFIG_CONFIGFS_FS=m |
| 957 | 992 | CONFIG_MISC_FILESYSTEMS=y | |
| 958 | # | ||
| 959 | # Miscellaneous filesystems | ||
| 960 | # | ||
| 961 | # CONFIG_ADFS_FS is not set | 993 | # CONFIG_ADFS_FS is not set |
| 962 | CONFIG_AFFS_FS=m | 994 | CONFIG_AFFS_FS=m |
| 963 | CONFIG_HFS_FS=m | 995 | CONFIG_HFS_FS=m |
| @@ -966,6 +998,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 966 | # CONFIG_BFS_FS is not set | 998 | # CONFIG_BFS_FS is not set |
| 967 | # CONFIG_EFS_FS is not set | 999 | # CONFIG_EFS_FS is not set |
| 968 | CONFIG_CRAMFS=m | 1000 | CONFIG_CRAMFS=m |
| 1001 | CONFIG_SQUASHFS=m | ||
| 1002 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 1003 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 969 | # CONFIG_VXFS_FS is not set | 1004 | # CONFIG_VXFS_FS is not set |
| 970 | CONFIG_MINIX_FS=y | 1005 | CONFIG_MINIX_FS=y |
| 971 | # CONFIG_OMFS_FS is not set | 1006 | # CONFIG_OMFS_FS is not set |
| @@ -976,23 +1011,24 @@ CONFIG_SYSV_FS=m | |||
| 976 | CONFIG_UFS_FS=m | 1011 | CONFIG_UFS_FS=m |
| 977 | # CONFIG_UFS_FS_WRITE is not set | 1012 | # CONFIG_UFS_FS_WRITE is not set |
| 978 | # CONFIG_UFS_DEBUG is not set | 1013 | # CONFIG_UFS_DEBUG is not set |
| 1014 | # CONFIG_NILFS2_FS is not set | ||
| 979 | CONFIG_NETWORK_FILESYSTEMS=y | 1015 | CONFIG_NETWORK_FILESYSTEMS=y |
| 980 | CONFIG_NFS_FS=m | 1016 | CONFIG_NFS_FS=y |
| 981 | CONFIG_NFS_V3=y | 1017 | CONFIG_NFS_V3=y |
| 982 | # CONFIG_NFS_V3_ACL is not set | 1018 | # CONFIG_NFS_V3_ACL is not set |
| 983 | CONFIG_NFS_V4=y | 1019 | CONFIG_NFS_V4=y |
| 1020 | # CONFIG_ROOT_NFS is not set | ||
| 984 | CONFIG_NFSD=m | 1021 | CONFIG_NFSD=m |
| 985 | CONFIG_NFSD_V3=y | 1022 | CONFIG_NFSD_V3=y |
| 986 | # CONFIG_NFSD_V3_ACL is not set | 1023 | # CONFIG_NFSD_V3_ACL is not set |
| 987 | # CONFIG_NFSD_V4 is not set | 1024 | # CONFIG_NFSD_V4 is not set |
| 988 | CONFIG_LOCKD=m | 1025 | CONFIG_LOCKD=y |
| 989 | CONFIG_LOCKD_V4=y | 1026 | CONFIG_LOCKD_V4=y |
| 990 | CONFIG_EXPORTFS=m | 1027 | CONFIG_EXPORTFS=m |
| 991 | CONFIG_NFS_COMMON=y | 1028 | CONFIG_NFS_COMMON=y |
| 992 | CONFIG_SUNRPC=m | 1029 | CONFIG_SUNRPC=y |
| 993 | CONFIG_SUNRPC_GSS=m | 1030 | CONFIG_SUNRPC_GSS=y |
| 994 | # CONFIG_SUNRPC_REGISTER_V4 is not set | 1031 | CONFIG_RPCSEC_GSS_KRB5=y |
| 995 | CONFIG_RPCSEC_GSS_KRB5=m | ||
| 996 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1032 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 997 | CONFIG_SMB_FS=m | 1033 | CONFIG_SMB_FS=m |
| 998 | CONFIG_SMB_NLS_DEFAULT=y | 1034 | CONFIG_SMB_NLS_DEFAULT=y |
| @@ -1067,11 +1103,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1067 | CONFIG_DEBUG_MEMORY_INIT=y | 1103 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1068 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1104 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1069 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1105 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1070 | |||
| 1071 | # | ||
| 1072 | # Tracers | ||
| 1073 | # | ||
| 1074 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1075 | # CONFIG_SAMPLES is not set | 1106 | # CONFIG_SAMPLES is not set |
| 1076 | 1107 | ||
| 1077 | # | 1108 | # |
| @@ -1092,13 +1123,21 @@ CONFIG_CRYPTO=y | |||
| 1092 | # | 1123 | # |
| 1093 | # CONFIG_CRYPTO_FIPS is not set | 1124 | # CONFIG_CRYPTO_FIPS is not set |
| 1094 | CONFIG_CRYPTO_ALGAPI=y | 1125 | CONFIG_CRYPTO_ALGAPI=y |
| 1095 | CONFIG_CRYPTO_AEAD=y | 1126 | CONFIG_CRYPTO_ALGAPI2=y |
| 1127 | CONFIG_CRYPTO_AEAD=m | ||
| 1128 | CONFIG_CRYPTO_AEAD2=y | ||
| 1096 | CONFIG_CRYPTO_BLKCIPHER=y | 1129 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1130 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1097 | CONFIG_CRYPTO_HASH=y | 1131 | CONFIG_CRYPTO_HASH=y |
| 1098 | CONFIG_CRYPTO_RNG=y | 1132 | CONFIG_CRYPTO_HASH2=y |
| 1133 | CONFIG_CRYPTO_RNG=m | ||
| 1134 | CONFIG_CRYPTO_RNG2=y | ||
| 1135 | CONFIG_CRYPTO_PCOMP=y | ||
| 1099 | CONFIG_CRYPTO_MANAGER=y | 1136 | CONFIG_CRYPTO_MANAGER=y |
| 1137 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1100 | CONFIG_CRYPTO_GF128MUL=m | 1138 | CONFIG_CRYPTO_GF128MUL=m |
| 1101 | CONFIG_CRYPTO_NULL=m | 1139 | CONFIG_CRYPTO_NULL=m |
| 1140 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1102 | CONFIG_CRYPTO_CRYPTD=m | 1141 | CONFIG_CRYPTO_CRYPTD=m |
| 1103 | CONFIG_CRYPTO_AUTHENC=m | 1142 | CONFIG_CRYPTO_AUTHENC=m |
| 1104 | CONFIG_CRYPTO_TEST=m | 1143 | CONFIG_CRYPTO_TEST=m |
| @@ -1113,7 +1152,7 @@ CONFIG_CRYPTO_SEQIV=m | |||
| 1113 | # | 1152 | # |
| 1114 | # Block modes | 1153 | # Block modes |
| 1115 | # | 1154 | # |
| 1116 | CONFIG_CRYPTO_CBC=m | 1155 | CONFIG_CRYPTO_CBC=y |
| 1117 | CONFIG_CRYPTO_CTR=m | 1156 | CONFIG_CRYPTO_CTR=m |
| 1118 | CONFIG_CRYPTO_CTS=m | 1157 | CONFIG_CRYPTO_CTS=m |
| 1119 | CONFIG_CRYPTO_ECB=m | 1158 | CONFIG_CRYPTO_ECB=m |
| @@ -1132,7 +1171,7 @@ CONFIG_CRYPTO_XCBC=m | |||
| 1132 | # | 1171 | # |
| 1133 | CONFIG_CRYPTO_CRC32C=m | 1172 | CONFIG_CRYPTO_CRC32C=m |
| 1134 | CONFIG_CRYPTO_MD4=m | 1173 | CONFIG_CRYPTO_MD4=m |
| 1135 | CONFIG_CRYPTO_MD5=m | 1174 | CONFIG_CRYPTO_MD5=y |
| 1136 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1175 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1137 | CONFIG_CRYPTO_RMD128=m | 1176 | CONFIG_CRYPTO_RMD128=m |
| 1138 | CONFIG_CRYPTO_RMD160=m | 1177 | CONFIG_CRYPTO_RMD160=m |
| @@ -1154,7 +1193,7 @@ CONFIG_CRYPTO_BLOWFISH=m | |||
| 1154 | CONFIG_CRYPTO_CAMELLIA=m | 1193 | CONFIG_CRYPTO_CAMELLIA=m |
| 1155 | CONFIG_CRYPTO_CAST5=m | 1194 | CONFIG_CRYPTO_CAST5=m |
| 1156 | CONFIG_CRYPTO_CAST6=m | 1195 | CONFIG_CRYPTO_CAST6=m |
| 1157 | CONFIG_CRYPTO_DES=m | 1196 | CONFIG_CRYPTO_DES=y |
| 1158 | CONFIG_CRYPTO_FCRYPT=m | 1197 | CONFIG_CRYPTO_FCRYPT=m |
| 1159 | CONFIG_CRYPTO_KHAZAD=m | 1198 | CONFIG_CRYPTO_KHAZAD=m |
| 1160 | CONFIG_CRYPTO_SALSA20=m | 1199 | CONFIG_CRYPTO_SALSA20=m |
| @@ -1168,6 +1207,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1168 | # Compression | 1207 | # Compression |
| 1169 | # | 1208 | # |
| 1170 | CONFIG_CRYPTO_DEFLATE=m | 1209 | CONFIG_CRYPTO_DEFLATE=m |
| 1210 | CONFIG_CRYPTO_ZLIB=m | ||
| 1171 | CONFIG_CRYPTO_LZO=m | 1211 | CONFIG_CRYPTO_LZO=m |
| 1172 | 1212 | ||
| 1173 | # | 1213 | # |
| @@ -1175,11 +1215,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1175 | # | 1215 | # |
| 1176 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1216 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1177 | # CONFIG_CRYPTO_HW is not set | 1217 | # CONFIG_CRYPTO_HW is not set |
| 1218 | # CONFIG_BINARY_PRINTF is not set | ||
| 1178 | 1219 | ||
| 1179 | # | 1220 | # |
| 1180 | # Library routines | 1221 | # Library routines |
| 1181 | # | 1222 | # |
| 1182 | CONFIG_BITREVERSE=y | 1223 | CONFIG_BITREVERSE=y |
| 1224 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1183 | CONFIG_CRC_CCITT=m | 1225 | CONFIG_CRC_CCITT=m |
| 1184 | CONFIG_CRC16=m | 1226 | CONFIG_CRC16=m |
| 1185 | CONFIG_CRC_T10DIF=y | 1227 | CONFIG_CRC_T10DIF=y |
| @@ -1191,10 +1233,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1191 | CONFIG_ZLIB_DEFLATE=m | 1233 | CONFIG_ZLIB_DEFLATE=m |
| 1192 | CONFIG_LZO_COMPRESS=m | 1234 | CONFIG_LZO_COMPRESS=m |
| 1193 | CONFIG_LZO_DECOMPRESS=m | 1235 | CONFIG_LZO_DECOMPRESS=m |
| 1236 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1237 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1238 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1194 | CONFIG_TEXTSEARCH=y | 1239 | CONFIG_TEXTSEARCH=y |
| 1195 | CONFIG_TEXTSEARCH_KMP=m | 1240 | CONFIG_TEXTSEARCH_KMP=m |
| 1196 | CONFIG_TEXTSEARCH_BM=m | 1241 | CONFIG_TEXTSEARCH_BM=m |
| 1197 | CONFIG_TEXTSEARCH_FSM=m | 1242 | CONFIG_TEXTSEARCH_FSM=m |
| 1198 | CONFIG_PLIST=y | ||
| 1199 | CONFIG_HAS_IOMEM=y | 1243 | CONFIG_HAS_IOMEM=y |
| 1200 | CONFIG_HAS_DMA=y | 1244 | CONFIG_HAS_DMA=y |
| 1245 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 935108d115a..5fff58196b3 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:43 2008 | 4 | # Wed Apr 22 20:47:54 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 140 | CONFIG_NEED_MULTIPLE_NODES=y | 151 | CONFIG_NEED_MULTIPLE_NODES=y |
| 141 | CONFIG_PAGEFLAGS_EXTENDED=y | 152 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 153 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 143 | # CONFIG_RESOURCES_64BIT is not set | ||
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 154 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 145 | CONFIG_ZONE_DMA_FLAG=1 | 155 | CONFIG_ZONE_DMA_FLAG=1 |
| 146 | CONFIG_BOUNCE=y | 156 | CONFIG_BOUNCE=y |
| 147 | CONFIG_VIRT_TO_BUS=y | 157 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | 158 | CONFIG_UNEVICTABLE_LRU=y |
| 159 | CONFIG_HAVE_MLOCK=y | ||
| 160 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 149 | 161 | ||
| 150 | # | 162 | # |
| 151 | # General setup | 163 | # General setup |
| @@ -256,6 +268,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 268 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 269 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 270 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 271 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 259 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 272 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 273 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 261 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 274 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -264,6 +277,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 277 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 278 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 279 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 267 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 281 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 268 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 282 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 269 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 283 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -274,6 +288,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 274 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 288 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 289 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 276 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 290 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 277 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 292 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 293 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 294 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -352,25 +367,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 352 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 367 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 353 | CONFIG_IP6_NF_MATCH_MH=m | 368 | CONFIG_IP6_NF_MATCH_MH=m |
| 354 | CONFIG_IP6_NF_MATCH_RT=m | 369 | CONFIG_IP6_NF_MATCH_RT=m |
| 370 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 355 | CONFIG_IP6_NF_TARGET_LOG=m | 371 | CONFIG_IP6_NF_TARGET_LOG=m |
| 356 | CONFIG_IP6_NF_FILTER=m | 372 | CONFIG_IP6_NF_FILTER=m |
| 357 | CONFIG_IP6_NF_TARGET_REJECT=m | 373 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 358 | CONFIG_IP6_NF_MANGLE=m | 374 | CONFIG_IP6_NF_MANGLE=m |
| 359 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 360 | CONFIG_IP6_NF_RAW=m | 375 | CONFIG_IP6_NF_RAW=m |
| 361 | CONFIG_IP_DCCP=m | 376 | CONFIG_IP_DCCP=m |
| 362 | CONFIG_INET_DCCP_DIAG=m | 377 | CONFIG_INET_DCCP_DIAG=m |
| 363 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 364 | 378 | ||
| 365 | # | 379 | # |
| 366 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 380 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 367 | # | 381 | # |
| 368 | CONFIG_IP_DCCP_CCID2=m | ||
| 369 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 382 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 370 | CONFIG_IP_DCCP_CCID3=m | 383 | # CONFIG_IP_DCCP_CCID3 is not set |
| 371 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 372 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 373 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 374 | CONFIG_IP_SCTP=m | 384 | CONFIG_IP_SCTP=m |
| 375 | # CONFIG_SCTP_DBG_MSG is not set | 385 | # CONFIG_SCTP_DBG_MSG is not set |
| 376 | # CONFIG_SCTP_DBG_OBJCNT is not set | 386 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -392,8 +402,10 @@ CONFIG_ATALK=m | |||
| 392 | # CONFIG_LAPB is not set | 402 | # CONFIG_LAPB is not set |
| 393 | # CONFIG_ECONET is not set | 403 | # CONFIG_ECONET is not set |
| 394 | # CONFIG_WAN_ROUTER is not set | 404 | # CONFIG_WAN_ROUTER is not set |
| 405 | # CONFIG_PHONET is not set | ||
| 395 | # CONFIG_NET_SCHED is not set | 406 | # CONFIG_NET_SCHED is not set |
| 396 | CONFIG_NET_CLS_ROUTE=y | 407 | CONFIG_NET_CLS_ROUTE=y |
| 408 | # CONFIG_DCB is not set | ||
| 397 | 409 | ||
| 398 | # | 410 | # |
| 399 | # Network testing | 411 | # Network testing |
| @@ -404,8 +416,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 404 | # CONFIG_IRDA is not set | 416 | # CONFIG_IRDA is not set |
| 405 | # CONFIG_BT is not set | 417 | # CONFIG_BT is not set |
| 406 | # CONFIG_AF_RXRPC is not set | 418 | # CONFIG_AF_RXRPC is not set |
| 407 | # CONFIG_PHONET is not set | ||
| 408 | # CONFIG_WIRELESS is not set | 419 | # CONFIG_WIRELESS is not set |
| 420 | # CONFIG_WIMAX is not set | ||
| 409 | # CONFIG_RFKILL is not set | 421 | # CONFIG_RFKILL is not set |
| 410 | # CONFIG_NET_9P is not set | 422 | # CONFIG_NET_9P is not set |
| 411 | 423 | ||
| @@ -441,9 +453,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 441 | CONFIG_ATA_OVER_ETH=m | 453 | CONFIG_ATA_OVER_ETH=m |
| 442 | # CONFIG_BLK_DEV_HD is not set | 454 | # CONFIG_BLK_DEV_HD is not set |
| 443 | CONFIG_MISC_DEVICES=y | 455 | CONFIG_MISC_DEVICES=y |
| 444 | # CONFIG_EEPROM_93CX6 is not set | ||
| 445 | # CONFIG_ENCLOSURE_SERVICES is not set | 456 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 446 | # CONFIG_C2PORT is not set | 457 | # CONFIG_C2PORT is not set |
| 458 | |||
| 459 | # | ||
| 460 | # EEPROM support | ||
| 461 | # | ||
| 462 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | CONFIG_HAVE_IDE=y | 463 | CONFIG_HAVE_IDE=y |
| 448 | # CONFIG_IDE is not set | 464 | # CONFIG_IDE is not set |
| 449 | 465 | ||
| @@ -491,8 +507,11 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 491 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 507 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 492 | CONFIG_SCSI_LOWLEVEL=y | 508 | CONFIG_SCSI_LOWLEVEL=y |
| 493 | CONFIG_ISCSI_TCP=m | 509 | CONFIG_ISCSI_TCP=m |
| 510 | # CONFIG_LIBFC is not set | ||
| 511 | # CONFIG_LIBFCOE is not set | ||
| 494 | # CONFIG_SCSI_DEBUG is not set | 512 | # CONFIG_SCSI_DEBUG is not set |
| 495 | # CONFIG_SCSI_DH is not set | 513 | # CONFIG_SCSI_DH is not set |
| 514 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 496 | CONFIG_MD=y | 515 | CONFIG_MD=y |
| 497 | CONFIG_BLK_DEV_MD=m | 516 | CONFIG_BLK_DEV_MD=m |
| 498 | CONFIG_MD_LINEAR=m | 517 | CONFIG_MD_LINEAR=m |
| @@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m | |||
| 500 | CONFIG_MD_RAID1=m | 519 | CONFIG_MD_RAID1=m |
| 501 | # CONFIG_MD_RAID10 is not set | 520 | # CONFIG_MD_RAID10 is not set |
| 502 | CONFIG_MD_RAID456=m | 521 | CONFIG_MD_RAID456=m |
| 503 | CONFIG_MD_RAID5_RESHAPE=y | 522 | CONFIG_MD_RAID6_PQ=m |
| 504 | # CONFIG_MD_MULTIPATH is not set | 523 | # CONFIG_MD_MULTIPATH is not set |
| 505 | # CONFIG_MD_FAULTY is not set | 524 | # CONFIG_MD_FAULTY is not set |
| 506 | CONFIG_BLK_DEV_DM=m | 525 | CONFIG_BLK_DEV_DM=m |
| @@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 513 | # CONFIG_DM_DELAY is not set | 532 | # CONFIG_DM_DELAY is not set |
| 514 | CONFIG_DM_UEVENT=y | 533 | CONFIG_DM_UEVENT=y |
| 515 | CONFIG_NETDEVICES=y | 534 | CONFIG_NETDEVICES=y |
| 535 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 516 | CONFIG_DUMMY=m | 536 | CONFIG_DUMMY=m |
| 517 | # CONFIG_BONDING is not set | 537 | # CONFIG_BONDING is not set |
| 518 | CONFIG_MACVLAN=m | 538 | CONFIG_MACVLAN=m |
| @@ -522,6 +542,8 @@ CONFIG_VETH=m | |||
| 522 | # CONFIG_PHYLIB is not set | 542 | # CONFIG_PHYLIB is not set |
| 523 | CONFIG_NET_ETHERNET=y | 543 | CONFIG_NET_ETHERNET=y |
| 524 | # CONFIG_MII is not set | 544 | # CONFIG_MII is not set |
| 545 | # CONFIG_ETHOC is not set | ||
| 546 | # CONFIG_DNET is not set | ||
| 525 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 547 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 526 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 548 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 527 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 549 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -538,7 +560,10 @@ CONFIG_NET_ETHERNET=y | |||
| 538 | # | 560 | # |
| 539 | # CONFIG_WLAN_PRE80211 is not set | 561 | # CONFIG_WLAN_PRE80211 is not set |
| 540 | # CONFIG_WLAN_80211 is not set | 562 | # CONFIG_WLAN_80211 is not set |
| 541 | # CONFIG_IWLWIFI_LEDS is not set | 563 | |
| 564 | # | ||
| 565 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 566 | # | ||
| 542 | # CONFIG_WAN is not set | 567 | # CONFIG_WAN is not set |
| 543 | CONFIG_PPP=m | 568 | CONFIG_PPP=m |
| 544 | # CONFIG_PPP_MULTILINK is not set | 569 | # CONFIG_PPP_MULTILINK is not set |
| @@ -596,7 +621,6 @@ CONFIG_MOUSE_PS2=m | |||
| 596 | CONFIG_MOUSE_PS2_ALPS=y | 621 | CONFIG_MOUSE_PS2_ALPS=y |
| 597 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 622 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 598 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 623 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 599 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 600 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 624 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 601 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 625 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 602 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 626 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -636,6 +660,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 636 | # Non-8250 serial port support | 660 | # Non-8250 serial port support |
| 637 | # | 661 | # |
| 638 | CONFIG_UNIX98_PTYS=y | 662 | CONFIG_UNIX98_PTYS=y |
| 663 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 639 | CONFIG_LEGACY_PTYS=y | 664 | CONFIG_LEGACY_PTYS=y |
| 640 | CONFIG_LEGACY_PTY_COUNT=256 | 665 | CONFIG_LEGACY_PTY_COUNT=256 |
| 641 | # CONFIG_IPMI_HANDLER is not set | 666 | # CONFIG_IPMI_HANDLER is not set |
| @@ -718,6 +743,7 @@ CONFIG_FB_APOLLO=y | |||
| 718 | # CONFIG_FB_VIRTUAL is not set | 743 | # CONFIG_FB_VIRTUAL is not set |
| 719 | # CONFIG_FB_METRONOME is not set | 744 | # CONFIG_FB_METRONOME is not set |
| 720 | # CONFIG_FB_MB862XX is not set | 745 | # CONFIG_FB_MB862XX is not set |
| 746 | # CONFIG_FB_BROADSHEET is not set | ||
| 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 747 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 722 | 748 | ||
| 723 | # | 749 | # |
| @@ -749,7 +775,6 @@ CONFIG_HIDRAW=y | |||
| 749 | # | 775 | # |
| 750 | # Special HID drivers | 776 | # Special HID drivers |
| 751 | # | 777 | # |
| 752 | CONFIG_HID_COMPAT=y | ||
| 753 | # CONFIG_USB_SUPPORT is not set | 778 | # CONFIG_USB_SUPPORT is not set |
| 754 | # CONFIG_MMC is not set | 779 | # CONFIG_MMC is not set |
| 755 | # CONFIG_MEMSTICK is not set | 780 | # CONFIG_MEMSTICK is not set |
| @@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y | |||
| 757 | # CONFIG_ACCESSIBILITY is not set | 782 | # CONFIG_ACCESSIBILITY is not set |
| 758 | # CONFIG_RTC_CLASS is not set | 783 | # CONFIG_RTC_CLASS is not set |
| 759 | # CONFIG_DMADEVICES is not set | 784 | # CONFIG_DMADEVICES is not set |
| 785 | # CONFIG_AUXDISPLAY is not set | ||
| 760 | # CONFIG_UIO is not set | 786 | # CONFIG_UIO is not set |
| 761 | # CONFIG_STAGING is not set | 787 | # CONFIG_STAGING is not set |
| 762 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 763 | 788 | ||
| 764 | # | 789 | # |
| 765 | # Character devices | 790 | # Character devices |
| @@ -774,6 +799,7 @@ CONFIG_EXT2_FS=y | |||
| 774 | # CONFIG_EXT2_FS_XATTR is not set | 799 | # CONFIG_EXT2_FS_XATTR is not set |
| 775 | # CONFIG_EXT2_FS_XIP is not set | 800 | # CONFIG_EXT2_FS_XIP is not set |
| 776 | CONFIG_EXT3_FS=y | 801 | CONFIG_EXT3_FS=y |
| 802 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 777 | # CONFIG_EXT3_FS_XATTR is not set | 803 | # CONFIG_EXT3_FS_XATTR is not set |
| 778 | # CONFIG_EXT4_FS is not set | 804 | # CONFIG_EXT4_FS is not set |
| 779 | CONFIG_JBD=y | 805 | CONFIG_JBD=y |
| @@ -800,13 +826,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 800 | # CONFIG_OCFS2_FS_STATS is not set | 826 | # CONFIG_OCFS2_FS_STATS is not set |
| 801 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 827 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 802 | # CONFIG_OCFS2_DEBUG_FS is not set | 828 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 803 | # CONFIG_OCFS2_COMPAT_JBD is not set | 829 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 830 | # CONFIG_BTRFS_FS is not set | ||
| 804 | CONFIG_DNOTIFY=y | 831 | CONFIG_DNOTIFY=y |
| 805 | CONFIG_INOTIFY=y | 832 | CONFIG_INOTIFY=y |
| 806 | CONFIG_INOTIFY_USER=y | 833 | CONFIG_INOTIFY_USER=y |
| 807 | CONFIG_QUOTA=y | 834 | CONFIG_QUOTA=y |
| 808 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 835 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 809 | # CONFIG_PRINT_QUOTA_WARNING is not set | 836 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 837 | CONFIG_QUOTA_TREE=m | ||
| 810 | # CONFIG_QFMT_V1 is not set | 838 | # CONFIG_QFMT_V1 is not set |
| 811 | # CONFIG_QFMT_V2 is not set | 839 | # CONFIG_QFMT_V2 is not set |
| 812 | CONFIG_QUOTACTL=y | 840 | CONFIG_QUOTACTL=y |
| @@ -815,6 +843,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 815 | CONFIG_FUSE_FS=m | 843 | CONFIG_FUSE_FS=m |
| 816 | 844 | ||
| 817 | # | 845 | # |
| 846 | # Caches | ||
| 847 | # | ||
| 848 | # CONFIG_FSCACHE is not set | ||
| 849 | |||
| 850 | # | ||
| 818 | # CD-ROM/DVD Filesystems | 851 | # CD-ROM/DVD Filesystems |
| 819 | # | 852 | # |
| 820 | CONFIG_ISO9660_FS=y | 853 | CONFIG_ISO9660_FS=y |
| @@ -845,10 +878,7 @@ CONFIG_TMPFS=y | |||
| 845 | # CONFIG_TMPFS_POSIX_ACL is not set | 878 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 846 | # CONFIG_HUGETLB_PAGE is not set | 879 | # CONFIG_HUGETLB_PAGE is not set |
| 847 | CONFIG_CONFIGFS_FS=m | 880 | CONFIG_CONFIGFS_FS=m |
| 848 | 881 | CONFIG_MISC_FILESYSTEMS=y | |
| 849 | # | ||
| 850 | # Miscellaneous filesystems | ||
| 851 | # | ||
| 852 | # CONFIG_ADFS_FS is not set | 882 | # CONFIG_ADFS_FS is not set |
| 853 | CONFIG_AFFS_FS=m | 883 | CONFIG_AFFS_FS=m |
| 854 | CONFIG_HFS_FS=m | 884 | CONFIG_HFS_FS=m |
| @@ -857,6 +887,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 857 | # CONFIG_BFS_FS is not set | 887 | # CONFIG_BFS_FS is not set |
| 858 | # CONFIG_EFS_FS is not set | 888 | # CONFIG_EFS_FS is not set |
| 859 | CONFIG_CRAMFS=m | 889 | CONFIG_CRAMFS=m |
| 890 | CONFIG_SQUASHFS=m | ||
| 891 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 892 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 860 | # CONFIG_VXFS_FS is not set | 893 | # CONFIG_VXFS_FS is not set |
| 861 | CONFIG_MINIX_FS=y | 894 | CONFIG_MINIX_FS=y |
| 862 | # CONFIG_OMFS_FS is not set | 895 | # CONFIG_OMFS_FS is not set |
| @@ -867,6 +900,7 @@ CONFIG_SYSV_FS=m | |||
| 867 | CONFIG_UFS_FS=m | 900 | CONFIG_UFS_FS=m |
| 868 | # CONFIG_UFS_FS_WRITE is not set | 901 | # CONFIG_UFS_FS_WRITE is not set |
| 869 | # CONFIG_UFS_DEBUG is not set | 902 | # CONFIG_UFS_DEBUG is not set |
| 903 | # CONFIG_NILFS2_FS is not set | ||
| 870 | CONFIG_NETWORK_FILESYSTEMS=y | 904 | CONFIG_NETWORK_FILESYSTEMS=y |
| 871 | CONFIG_NFS_FS=y | 905 | CONFIG_NFS_FS=y |
| 872 | CONFIG_NFS_V3=y | 906 | CONFIG_NFS_V3=y |
| @@ -883,7 +917,6 @@ CONFIG_EXPORTFS=m | |||
| 883 | CONFIG_NFS_COMMON=y | 917 | CONFIG_NFS_COMMON=y |
| 884 | CONFIG_SUNRPC=y | 918 | CONFIG_SUNRPC=y |
| 885 | CONFIG_SUNRPC_GSS=y | 919 | CONFIG_SUNRPC_GSS=y |
| 886 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 887 | CONFIG_RPCSEC_GSS_KRB5=y | 920 | CONFIG_RPCSEC_GSS_KRB5=y |
| 888 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 921 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 889 | CONFIG_SMB_FS=m | 922 | CONFIG_SMB_FS=m |
| @@ -958,11 +991,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 958 | CONFIG_DEBUG_MEMORY_INIT=y | 991 | CONFIG_DEBUG_MEMORY_INIT=y |
| 959 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 992 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 960 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 993 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 961 | |||
| 962 | # | ||
| 963 | # Tracers | ||
| 964 | # | ||
| 965 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 966 | # CONFIG_SAMPLES is not set | 994 | # CONFIG_SAMPLES is not set |
| 967 | 995 | ||
| 968 | # | 996 | # |
| @@ -983,13 +1011,21 @@ CONFIG_CRYPTO=y | |||
| 983 | # | 1011 | # |
| 984 | # CONFIG_CRYPTO_FIPS is not set | 1012 | # CONFIG_CRYPTO_FIPS is not set |
| 985 | CONFIG_CRYPTO_ALGAPI=y | 1013 | CONFIG_CRYPTO_ALGAPI=y |
| 986 | CONFIG_CRYPTO_AEAD=y | 1014 | CONFIG_CRYPTO_ALGAPI2=y |
| 1015 | CONFIG_CRYPTO_AEAD=m | ||
| 1016 | CONFIG_CRYPTO_AEAD2=y | ||
| 987 | CONFIG_CRYPTO_BLKCIPHER=y | 1017 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1018 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 988 | CONFIG_CRYPTO_HASH=y | 1019 | CONFIG_CRYPTO_HASH=y |
| 989 | CONFIG_CRYPTO_RNG=y | 1020 | CONFIG_CRYPTO_HASH2=y |
| 1021 | CONFIG_CRYPTO_RNG=m | ||
| 1022 | CONFIG_CRYPTO_RNG2=y | ||
| 1023 | CONFIG_CRYPTO_PCOMP=y | ||
| 990 | CONFIG_CRYPTO_MANAGER=y | 1024 | CONFIG_CRYPTO_MANAGER=y |
| 1025 | CONFIG_CRYPTO_MANAGER2=y | ||
| 991 | CONFIG_CRYPTO_GF128MUL=m | 1026 | CONFIG_CRYPTO_GF128MUL=m |
| 992 | CONFIG_CRYPTO_NULL=m | 1027 | CONFIG_CRYPTO_NULL=m |
| 1028 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 993 | CONFIG_CRYPTO_CRYPTD=m | 1029 | CONFIG_CRYPTO_CRYPTD=m |
| 994 | CONFIG_CRYPTO_AUTHENC=m | 1030 | CONFIG_CRYPTO_AUTHENC=m |
| 995 | CONFIG_CRYPTO_TEST=m | 1031 | CONFIG_CRYPTO_TEST=m |
| @@ -1059,6 +1095,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1059 | # Compression | 1095 | # Compression |
| 1060 | # | 1096 | # |
| 1061 | CONFIG_CRYPTO_DEFLATE=m | 1097 | CONFIG_CRYPTO_DEFLATE=m |
| 1098 | CONFIG_CRYPTO_ZLIB=m | ||
| 1062 | CONFIG_CRYPTO_LZO=m | 1099 | CONFIG_CRYPTO_LZO=m |
| 1063 | 1100 | ||
| 1064 | # | 1101 | # |
| @@ -1066,11 +1103,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1066 | # | 1103 | # |
| 1067 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1104 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1068 | # CONFIG_CRYPTO_HW is not set | 1105 | # CONFIG_CRYPTO_HW is not set |
| 1106 | # CONFIG_BINARY_PRINTF is not set | ||
| 1069 | 1107 | ||
| 1070 | # | 1108 | # |
| 1071 | # Library routines | 1109 | # Library routines |
| 1072 | # | 1110 | # |
| 1073 | CONFIG_BITREVERSE=y | 1111 | CONFIG_BITREVERSE=y |
| 1112 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1074 | CONFIG_CRC_CCITT=m | 1113 | CONFIG_CRC_CCITT=m |
| 1075 | CONFIG_CRC16=m | 1114 | CONFIG_CRC16=m |
| 1076 | CONFIG_CRC_T10DIF=y | 1115 | CONFIG_CRC_T10DIF=y |
| @@ -1082,10 +1121,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1082 | CONFIG_ZLIB_DEFLATE=m | 1121 | CONFIG_ZLIB_DEFLATE=m |
| 1083 | CONFIG_LZO_COMPRESS=m | 1122 | CONFIG_LZO_COMPRESS=m |
| 1084 | CONFIG_LZO_DECOMPRESS=m | 1123 | CONFIG_LZO_DECOMPRESS=m |
| 1124 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1125 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1126 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1085 | CONFIG_TEXTSEARCH=y | 1127 | CONFIG_TEXTSEARCH=y |
| 1086 | CONFIG_TEXTSEARCH_KMP=m | 1128 | CONFIG_TEXTSEARCH_KMP=m |
| 1087 | CONFIG_TEXTSEARCH_BM=m | 1129 | CONFIG_TEXTSEARCH_BM=m |
| 1088 | CONFIG_TEXTSEARCH_FSM=m | 1130 | CONFIG_TEXTSEARCH_FSM=m |
| 1089 | CONFIG_PLIST=y | ||
| 1090 | CONFIG_HAS_IOMEM=y | 1131 | CONFIG_HAS_IOMEM=y |
| 1091 | CONFIG_HAS_DMA=y | 1132 | CONFIG_HAS_DMA=y |
| 1133 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index a594a1d47b6..d92a90e03ec 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:44 2008 | 4 | # Wed Apr 22 20:47:56 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 140 | CONFIG_NEED_MULTIPLE_NODES=y | 151 | CONFIG_NEED_MULTIPLE_NODES=y |
| 141 | CONFIG_PAGEFLAGS_EXTENDED=y | 152 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 153 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 143 | # CONFIG_RESOURCES_64BIT is not set | ||
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 154 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 145 | CONFIG_ZONE_DMA_FLAG=1 | 155 | CONFIG_ZONE_DMA_FLAG=1 |
| 146 | CONFIG_BOUNCE=y | 156 | CONFIG_BOUNCE=y |
| 147 | CONFIG_VIRT_TO_BUS=y | 157 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | 158 | CONFIG_UNEVICTABLE_LRU=y |
| 159 | CONFIG_HAVE_MLOCK=y | ||
| 160 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 149 | 161 | ||
| 150 | # | 162 | # |
| 151 | # General setup | 163 | # General setup |
| @@ -180,7 +192,10 @@ CONFIG_INET=y | |||
| 180 | # CONFIG_IP_MULTICAST is not set | 192 | # CONFIG_IP_MULTICAST is not set |
| 181 | # CONFIG_IP_ADVANCED_ROUTER is not set | 193 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 182 | CONFIG_IP_FIB_HASH=y | 194 | CONFIG_IP_FIB_HASH=y |
| 183 | # CONFIG_IP_PNP is not set | 195 | CONFIG_IP_PNP=y |
| 196 | # CONFIG_IP_PNP_DHCP is not set | ||
| 197 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 198 | # CONFIG_IP_PNP_RARP is not set | ||
| 184 | CONFIG_NET_IPIP=m | 199 | CONFIG_NET_IPIP=m |
| 185 | CONFIG_NET_IPGRE=m | 200 | CONFIG_NET_IPGRE=m |
| 186 | # CONFIG_ARPD is not set | 201 | # CONFIG_ARPD is not set |
| @@ -254,6 +269,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 254 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 269 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 255 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 270 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 256 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 271 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 272 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 257 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 273 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 258 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 274 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 275 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -262,6 +278,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 262 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 278 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 279 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 280 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 265 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 282 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 266 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 283 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 267 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 284 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -272,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 272 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 289 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 273 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 290 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 291 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 275 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 293 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 276 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 294 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 295 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -350,25 +368,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 350 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 368 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 351 | CONFIG_IP6_NF_MATCH_MH=m | 369 | CONFIG_IP6_NF_MATCH_MH=m |
| 352 | CONFIG_IP6_NF_MATCH_RT=m | 370 | CONFIG_IP6_NF_MATCH_RT=m |
| 371 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 353 | CONFIG_IP6_NF_TARGET_LOG=m | 372 | CONFIG_IP6_NF_TARGET_LOG=m |
| 354 | CONFIG_IP6_NF_FILTER=m | 373 | CONFIG_IP6_NF_FILTER=m |
| 355 | CONFIG_IP6_NF_TARGET_REJECT=m | 374 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 356 | CONFIG_IP6_NF_MANGLE=m | 375 | CONFIG_IP6_NF_MANGLE=m |
| 357 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 358 | CONFIG_IP6_NF_RAW=m | 376 | CONFIG_IP6_NF_RAW=m |
| 359 | CONFIG_IP_DCCP=m | 377 | CONFIG_IP_DCCP=m |
| 360 | CONFIG_INET_DCCP_DIAG=m | 378 | CONFIG_INET_DCCP_DIAG=m |
| 361 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 362 | 379 | ||
| 363 | # | 380 | # |
| 364 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 381 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 365 | # | 382 | # |
| 366 | CONFIG_IP_DCCP_CCID2=m | ||
| 367 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 383 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 368 | CONFIG_IP_DCCP_CCID3=m | 384 | # CONFIG_IP_DCCP_CCID3 is not set |
| 369 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 370 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 371 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 372 | CONFIG_IP_SCTP=m | 385 | CONFIG_IP_SCTP=m |
| 373 | # CONFIG_SCTP_DBG_MSG is not set | 386 | # CONFIG_SCTP_DBG_MSG is not set |
| 374 | # CONFIG_SCTP_DBG_OBJCNT is not set | 387 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -390,8 +403,10 @@ CONFIG_ATALK=m | |||
| 390 | # CONFIG_LAPB is not set | 403 | # CONFIG_LAPB is not set |
| 391 | # CONFIG_ECONET is not set | 404 | # CONFIG_ECONET is not set |
| 392 | # CONFIG_WAN_ROUTER is not set | 405 | # CONFIG_WAN_ROUTER is not set |
| 406 | # CONFIG_PHONET is not set | ||
| 393 | # CONFIG_NET_SCHED is not set | 407 | # CONFIG_NET_SCHED is not set |
| 394 | CONFIG_NET_CLS_ROUTE=y | 408 | CONFIG_NET_CLS_ROUTE=y |
| 409 | # CONFIG_DCB is not set | ||
| 395 | 410 | ||
| 396 | # | 411 | # |
| 397 | # Network testing | 412 | # Network testing |
| @@ -402,8 +417,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 402 | # CONFIG_IRDA is not set | 417 | # CONFIG_IRDA is not set |
| 403 | # CONFIG_BT is not set | 418 | # CONFIG_BT is not set |
| 404 | # CONFIG_AF_RXRPC is not set | 419 | # CONFIG_AF_RXRPC is not set |
| 405 | # CONFIG_PHONET is not set | ||
| 406 | # CONFIG_WIRELESS is not set | 420 | # CONFIG_WIRELESS is not set |
| 421 | # CONFIG_WIMAX is not set | ||
| 407 | # CONFIG_RFKILL is not set | 422 | # CONFIG_RFKILL is not set |
| 408 | # CONFIG_NET_9P is not set | 423 | # CONFIG_NET_9P is not set |
| 409 | 424 | ||
| @@ -445,15 +460,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 445 | CONFIG_ATA_OVER_ETH=m | 460 | CONFIG_ATA_OVER_ETH=m |
| 446 | # CONFIG_BLK_DEV_HD is not set | 461 | # CONFIG_BLK_DEV_HD is not set |
| 447 | CONFIG_MISC_DEVICES=y | 462 | CONFIG_MISC_DEVICES=y |
| 448 | # CONFIG_EEPROM_93CX6 is not set | ||
| 449 | # CONFIG_ENCLOSURE_SERVICES is not set | 463 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 450 | # CONFIG_C2PORT is not set | 464 | # CONFIG_C2PORT is not set |
| 465 | |||
| 466 | # | ||
| 467 | # EEPROM support | ||
| 468 | # | ||
| 469 | # CONFIG_EEPROM_93CX6 is not set | ||
| 451 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
| 452 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
| 453 | 472 | ||
| 454 | # | 473 | # |
| 455 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 474 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 456 | # | 475 | # |
| 476 | CONFIG_IDE_ATAPI=y | ||
| 457 | # CONFIG_BLK_DEV_IDE_SATA is not set | 477 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 458 | CONFIG_IDE_GD=y | 478 | CONFIG_IDE_GD=y |
| 459 | CONFIG_IDE_GD_ATA=y | 479 | CONFIG_IDE_GD_ATA=y |
| @@ -461,7 +481,6 @@ CONFIG_IDE_GD_ATA=y | |||
| 461 | CONFIG_BLK_DEV_IDECD=y | 481 | CONFIG_BLK_DEV_IDECD=y |
| 462 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 482 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 463 | # CONFIG_BLK_DEV_IDETAPE is not set | 483 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 464 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 465 | # CONFIG_IDE_TASK_IOCTL is not set | 484 | # CONFIG_IDE_TASK_IOCTL is not set |
| 466 | CONFIG_IDE_PROC_FS=y | 485 | CONFIG_IDE_PROC_FS=y |
| 467 | 486 | ||
| @@ -516,11 +535,14 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 516 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 535 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 517 | CONFIG_SCSI_LOWLEVEL=y | 536 | CONFIG_SCSI_LOWLEVEL=y |
| 518 | CONFIG_ISCSI_TCP=m | 537 | CONFIG_ISCSI_TCP=m |
| 538 | # CONFIG_LIBFC is not set | ||
| 539 | # CONFIG_LIBFCOE is not set | ||
| 519 | # CONFIG_SCSI_DEBUG is not set | 540 | # CONFIG_SCSI_DEBUG is not set |
| 520 | CONFIG_ATARI_SCSI=y | 541 | CONFIG_ATARI_SCSI=y |
| 521 | # CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set | 542 | # CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set |
| 522 | # CONFIG_ATARI_SCSI_RESET_BOOT is not set | 543 | # CONFIG_ATARI_SCSI_RESET_BOOT is not set |
| 523 | # CONFIG_SCSI_DH is not set | 544 | # CONFIG_SCSI_DH is not set |
| 545 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 524 | CONFIG_MD=y | 546 | CONFIG_MD=y |
| 525 | CONFIG_BLK_DEV_MD=m | 547 | CONFIG_BLK_DEV_MD=m |
| 526 | CONFIG_MD_LINEAR=m | 548 | CONFIG_MD_LINEAR=m |
| @@ -528,7 +550,7 @@ CONFIG_MD_RAID0=m | |||
| 528 | CONFIG_MD_RAID1=m | 550 | CONFIG_MD_RAID1=m |
| 529 | # CONFIG_MD_RAID10 is not set | 551 | # CONFIG_MD_RAID10 is not set |
| 530 | CONFIG_MD_RAID456=m | 552 | CONFIG_MD_RAID456=m |
| 531 | CONFIG_MD_RAID5_RESHAPE=y | 553 | CONFIG_MD_RAID6_PQ=m |
| 532 | # CONFIG_MD_MULTIPATH is not set | 554 | # CONFIG_MD_MULTIPATH is not set |
| 533 | # CONFIG_MD_FAULTY is not set | 555 | # CONFIG_MD_FAULTY is not set |
| 534 | CONFIG_BLK_DEV_DM=m | 556 | CONFIG_BLK_DEV_DM=m |
| @@ -541,6 +563,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 541 | # CONFIG_DM_DELAY is not set | 563 | # CONFIG_DM_DELAY is not set |
| 542 | CONFIG_DM_UEVENT=y | 564 | CONFIG_DM_UEVENT=y |
| 543 | CONFIG_NETDEVICES=y | 565 | CONFIG_NETDEVICES=y |
| 566 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 544 | CONFIG_DUMMY=m | 567 | CONFIG_DUMMY=m |
| 545 | # CONFIG_BONDING is not set | 568 | # CONFIG_BONDING is not set |
| 546 | CONFIG_MACVLAN=m | 569 | CONFIG_MACVLAN=m |
| @@ -550,7 +573,9 @@ CONFIG_VETH=m | |||
| 550 | # CONFIG_PHYLIB is not set | 573 | # CONFIG_PHYLIB is not set |
| 551 | CONFIG_NET_ETHERNET=y | 574 | CONFIG_NET_ETHERNET=y |
| 552 | CONFIG_MII=y | 575 | CONFIG_MII=y |
| 553 | CONFIG_ATARILANCE=m | 576 | CONFIG_ATARILANCE=y |
| 577 | # CONFIG_ETHOC is not set | ||
| 578 | # CONFIG_DNET is not set | ||
| 554 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 579 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 555 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 580 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 556 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 581 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -568,7 +593,10 @@ CONFIG_ATARILANCE=m | |||
| 568 | # | 593 | # |
| 569 | # CONFIG_WLAN_PRE80211 is not set | 594 | # CONFIG_WLAN_PRE80211 is not set |
| 570 | # CONFIG_WLAN_80211 is not set | 595 | # CONFIG_WLAN_80211 is not set |
| 571 | # CONFIG_IWLWIFI_LEDS is not set | 596 | |
| 597 | # | ||
| 598 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 599 | # | ||
| 572 | # CONFIG_WAN is not set | 600 | # CONFIG_WAN is not set |
| 573 | # CONFIG_PLIP is not set | 601 | # CONFIG_PLIP is not set |
| 574 | CONFIG_PPP=m | 602 | CONFIG_PPP=m |
| @@ -625,11 +653,10 @@ CONFIG_INPUT_KEYBOARD=y | |||
| 625 | CONFIG_ATARI_KBD_CORE=y | 653 | CONFIG_ATARI_KBD_CORE=y |
| 626 | CONFIG_KEYBOARD_ATARI=y | 654 | CONFIG_KEYBOARD_ATARI=y |
| 627 | CONFIG_INPUT_MOUSE=y | 655 | CONFIG_INPUT_MOUSE=y |
| 628 | CONFIG_MOUSE_PS2=y | 656 | CONFIG_MOUSE_PS2=m |
| 629 | CONFIG_MOUSE_PS2_ALPS=y | 657 | CONFIG_MOUSE_PS2_ALPS=y |
| 630 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 658 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 631 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 659 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 632 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 633 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 660 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 634 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 661 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 635 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 662 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -649,7 +676,7 @@ CONFIG_INPUT_M68K_BEEP=m | |||
| 649 | CONFIG_SERIO=y | 676 | CONFIG_SERIO=y |
| 650 | # CONFIG_SERIO_SERPORT is not set | 677 | # CONFIG_SERIO_SERPORT is not set |
| 651 | # CONFIG_SERIO_PARKBD is not set | 678 | # CONFIG_SERIO_PARKBD is not set |
| 652 | CONFIG_SERIO_LIBPS2=y | 679 | CONFIG_SERIO_LIBPS2=m |
| 653 | # CONFIG_SERIO_RAW is not set | 680 | # CONFIG_SERIO_RAW is not set |
| 654 | # CONFIG_GAMEPORT is not set | 681 | # CONFIG_GAMEPORT is not set |
| 655 | 682 | ||
| @@ -673,6 +700,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 673 | # Non-8250 serial port support | 700 | # Non-8250 serial port support |
| 674 | # | 701 | # |
| 675 | CONFIG_UNIX98_PTYS=y | 702 | CONFIG_UNIX98_PTYS=y |
| 703 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 676 | CONFIG_LEGACY_PTYS=y | 704 | CONFIG_LEGACY_PTYS=y |
| 677 | CONFIG_LEGACY_PTY_COUNT=256 | 705 | CONFIG_LEGACY_PTY_COUNT=256 |
| 678 | CONFIG_PRINTER=m | 706 | CONFIG_PRINTER=m |
| @@ -760,6 +788,7 @@ CONFIG_FB_ATARI=y | |||
| 760 | # CONFIG_FB_VIRTUAL is not set | 788 | # CONFIG_FB_VIRTUAL is not set |
| 761 | # CONFIG_FB_METRONOME is not set | 789 | # CONFIG_FB_METRONOME is not set |
| 762 | # CONFIG_FB_MB862XX is not set | 790 | # CONFIG_FB_MB862XX is not set |
| 791 | # CONFIG_FB_BROADSHEET is not set | ||
| 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 792 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 764 | 793 | ||
| 765 | # | 794 | # |
| @@ -794,7 +823,6 @@ CONFIG_HIDRAW=y | |||
| 794 | # | 823 | # |
| 795 | # Special HID drivers | 824 | # Special HID drivers |
| 796 | # | 825 | # |
| 797 | CONFIG_HID_COMPAT=y | ||
| 798 | # CONFIG_USB_SUPPORT is not set | 826 | # CONFIG_USB_SUPPORT is not set |
| 799 | # CONFIG_MMC is not set | 827 | # CONFIG_MMC is not set |
| 800 | # CONFIG_MEMSTICK is not set | 828 | # CONFIG_MEMSTICK is not set |
| @@ -805,14 +833,14 @@ CONFIG_HID_COMPAT=y | |||
| 805 | # CONFIG_AUXDISPLAY is not set | 833 | # CONFIG_AUXDISPLAY is not set |
| 806 | # CONFIG_UIO is not set | 834 | # CONFIG_UIO is not set |
| 807 | # CONFIG_STAGING is not set | 835 | # CONFIG_STAGING is not set |
| 808 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 809 | 836 | ||
| 810 | # | 837 | # |
| 811 | # Character devices | 838 | # Character devices |
| 812 | # | 839 | # |
| 813 | CONFIG_ATARI_MFPSER=m | 840 | CONFIG_ATARI_MFPSER=y |
| 814 | CONFIG_ATARI_MIDI=m | 841 | CONFIG_ATARI_MIDI=y |
| 815 | CONFIG_ATARI_DSP56K=m | 842 | CONFIG_ATARI_DSP56K=m |
| 843 | CONFIG_SERIAL_CONSOLE=y | ||
| 816 | 844 | ||
| 817 | # | 845 | # |
| 818 | # File systems | 846 | # File systems |
| @@ -821,6 +849,7 @@ CONFIG_EXT2_FS=y | |||
| 821 | # CONFIG_EXT2_FS_XATTR is not set | 849 | # CONFIG_EXT2_FS_XATTR is not set |
| 822 | # CONFIG_EXT2_FS_XIP is not set | 850 | # CONFIG_EXT2_FS_XIP is not set |
| 823 | CONFIG_EXT3_FS=y | 851 | CONFIG_EXT3_FS=y |
| 852 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 824 | # CONFIG_EXT3_FS_XATTR is not set | 853 | # CONFIG_EXT3_FS_XATTR is not set |
| 825 | # CONFIG_EXT4_FS is not set | 854 | # CONFIG_EXT4_FS is not set |
| 826 | CONFIG_JBD=y | 855 | CONFIG_JBD=y |
| @@ -847,13 +876,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 847 | # CONFIG_OCFS2_FS_STATS is not set | 876 | # CONFIG_OCFS2_FS_STATS is not set |
| 848 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 877 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 849 | # CONFIG_OCFS2_DEBUG_FS is not set | 878 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 850 | # CONFIG_OCFS2_COMPAT_JBD is not set | 879 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 880 | # CONFIG_BTRFS_FS is not set | ||
| 851 | CONFIG_DNOTIFY=y | 881 | CONFIG_DNOTIFY=y |
| 852 | CONFIG_INOTIFY=y | 882 | CONFIG_INOTIFY=y |
| 853 | CONFIG_INOTIFY_USER=y | 883 | CONFIG_INOTIFY_USER=y |
| 854 | CONFIG_QUOTA=y | 884 | CONFIG_QUOTA=y |
| 855 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 885 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 856 | # CONFIG_PRINT_QUOTA_WARNING is not set | 886 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 887 | CONFIG_QUOTA_TREE=m | ||
| 857 | # CONFIG_QFMT_V1 is not set | 888 | # CONFIG_QFMT_V1 is not set |
| 858 | # CONFIG_QFMT_V2 is not set | 889 | # CONFIG_QFMT_V2 is not set |
| 859 | CONFIG_QUOTACTL=y | 890 | CONFIG_QUOTACTL=y |
| @@ -862,6 +893,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 862 | CONFIG_FUSE_FS=m | 893 | CONFIG_FUSE_FS=m |
| 863 | 894 | ||
| 864 | # | 895 | # |
| 896 | # Caches | ||
| 897 | # | ||
| 898 | # CONFIG_FSCACHE is not set | ||
| 899 | |||
| 900 | # | ||
| 865 | # CD-ROM/DVD Filesystems | 901 | # CD-ROM/DVD Filesystems |
| 866 | # | 902 | # |
| 867 | CONFIG_ISO9660_FS=y | 903 | CONFIG_ISO9660_FS=y |
| @@ -892,10 +928,7 @@ CONFIG_TMPFS=y | |||
| 892 | # CONFIG_TMPFS_POSIX_ACL is not set | 928 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 893 | # CONFIG_HUGETLB_PAGE is not set | 929 | # CONFIG_HUGETLB_PAGE is not set |
| 894 | CONFIG_CONFIGFS_FS=m | 930 | CONFIG_CONFIGFS_FS=m |
| 895 | 931 | CONFIG_MISC_FILESYSTEMS=y | |
| 896 | # | ||
| 897 | # Miscellaneous filesystems | ||
| 898 | # | ||
| 899 | # CONFIG_ADFS_FS is not set | 932 | # CONFIG_ADFS_FS is not set |
| 900 | CONFIG_AFFS_FS=m | 933 | CONFIG_AFFS_FS=m |
| 901 | CONFIG_HFS_FS=m | 934 | CONFIG_HFS_FS=m |
| @@ -904,6 +937,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 904 | # CONFIG_BFS_FS is not set | 937 | # CONFIG_BFS_FS is not set |
| 905 | # CONFIG_EFS_FS is not set | 938 | # CONFIG_EFS_FS is not set |
| 906 | CONFIG_CRAMFS=m | 939 | CONFIG_CRAMFS=m |
| 940 | CONFIG_SQUASHFS=m | ||
| 941 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 942 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 907 | # CONFIG_VXFS_FS is not set | 943 | # CONFIG_VXFS_FS is not set |
| 908 | CONFIG_MINIX_FS=y | 944 | CONFIG_MINIX_FS=y |
| 909 | # CONFIG_OMFS_FS is not set | 945 | # CONFIG_OMFS_FS is not set |
| @@ -914,22 +950,24 @@ CONFIG_SYSV_FS=m | |||
| 914 | CONFIG_UFS_FS=m | 950 | CONFIG_UFS_FS=m |
| 915 | # CONFIG_UFS_FS_WRITE is not set | 951 | # CONFIG_UFS_FS_WRITE is not set |
| 916 | # CONFIG_UFS_DEBUG is not set | 952 | # CONFIG_UFS_DEBUG is not set |
| 953 | # CONFIG_NILFS2_FS is not set | ||
| 917 | CONFIG_NETWORK_FILESYSTEMS=y | 954 | CONFIG_NETWORK_FILESYSTEMS=y |
| 918 | CONFIG_NFS_FS=m | 955 | CONFIG_NFS_FS=y |
| 919 | CONFIG_NFS_V3=y | 956 | CONFIG_NFS_V3=y |
| 920 | # CONFIG_NFS_V3_ACL is not set | 957 | # CONFIG_NFS_V3_ACL is not set |
| 921 | # CONFIG_NFS_V4 is not set | 958 | CONFIG_NFS_V4=y |
| 959 | # CONFIG_ROOT_NFS is not set | ||
| 922 | CONFIG_NFSD=m | 960 | CONFIG_NFSD=m |
| 923 | CONFIG_NFSD_V3=y | 961 | CONFIG_NFSD_V3=y |
| 924 | # CONFIG_NFSD_V3_ACL is not set | 962 | # CONFIG_NFSD_V3_ACL is not set |
| 925 | # CONFIG_NFSD_V4 is not set | 963 | # CONFIG_NFSD_V4 is not set |
| 926 | CONFIG_LOCKD=m | 964 | CONFIG_LOCKD=y |
| 927 | CONFIG_LOCKD_V4=y | 965 | CONFIG_LOCKD_V4=y |
| 928 | CONFIG_EXPORTFS=m | 966 | CONFIG_EXPORTFS=m |
| 929 | CONFIG_NFS_COMMON=y | 967 | CONFIG_NFS_COMMON=y |
| 930 | CONFIG_SUNRPC=m | 968 | CONFIG_SUNRPC=y |
| 931 | # CONFIG_SUNRPC_REGISTER_V4 is not set | 969 | CONFIG_SUNRPC_GSS=y |
| 932 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 970 | CONFIG_RPCSEC_GSS_KRB5=y |
| 933 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 971 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 934 | CONFIG_SMB_FS=m | 972 | CONFIG_SMB_FS=m |
| 935 | CONFIG_SMB_NLS_DEFAULT=y | 973 | CONFIG_SMB_NLS_DEFAULT=y |
| @@ -1004,11 +1042,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1004 | CONFIG_DEBUG_MEMORY_INIT=y | 1042 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1005 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1043 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1006 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1044 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1007 | |||
| 1008 | # | ||
| 1009 | # Tracers | ||
| 1010 | # | ||
| 1011 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1012 | # CONFIG_SAMPLES is not set | 1045 | # CONFIG_SAMPLES is not set |
| 1013 | 1046 | ||
| 1014 | # | 1047 | # |
| @@ -1029,13 +1062,21 @@ CONFIG_CRYPTO=y | |||
| 1029 | # | 1062 | # |
| 1030 | # CONFIG_CRYPTO_FIPS is not set | 1063 | # CONFIG_CRYPTO_FIPS is not set |
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1064 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_AEAD=y | 1065 | CONFIG_CRYPTO_ALGAPI2=y |
| 1066 | CONFIG_CRYPTO_AEAD=m | ||
| 1067 | CONFIG_CRYPTO_AEAD2=y | ||
| 1033 | CONFIG_CRYPTO_BLKCIPHER=y | 1068 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1069 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1034 | CONFIG_CRYPTO_HASH=y | 1070 | CONFIG_CRYPTO_HASH=y |
| 1035 | CONFIG_CRYPTO_RNG=y | 1071 | CONFIG_CRYPTO_HASH2=y |
| 1072 | CONFIG_CRYPTO_RNG=m | ||
| 1073 | CONFIG_CRYPTO_RNG2=y | ||
| 1074 | CONFIG_CRYPTO_PCOMP=y | ||
| 1036 | CONFIG_CRYPTO_MANAGER=y | 1075 | CONFIG_CRYPTO_MANAGER=y |
| 1076 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1037 | CONFIG_CRYPTO_GF128MUL=m | 1077 | CONFIG_CRYPTO_GF128MUL=m |
| 1038 | CONFIG_CRYPTO_NULL=m | 1078 | CONFIG_CRYPTO_NULL=m |
| 1079 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1039 | CONFIG_CRYPTO_CRYPTD=m | 1080 | CONFIG_CRYPTO_CRYPTD=m |
| 1040 | CONFIG_CRYPTO_AUTHENC=m | 1081 | CONFIG_CRYPTO_AUTHENC=m |
| 1041 | CONFIG_CRYPTO_TEST=m | 1082 | CONFIG_CRYPTO_TEST=m |
| @@ -1050,7 +1091,7 @@ CONFIG_CRYPTO_SEQIV=m | |||
| 1050 | # | 1091 | # |
| 1051 | # Block modes | 1092 | # Block modes |
| 1052 | # | 1093 | # |
| 1053 | CONFIG_CRYPTO_CBC=m | 1094 | CONFIG_CRYPTO_CBC=y |
| 1054 | CONFIG_CRYPTO_CTR=m | 1095 | CONFIG_CRYPTO_CTR=m |
| 1055 | CONFIG_CRYPTO_CTS=m | 1096 | CONFIG_CRYPTO_CTS=m |
| 1056 | CONFIG_CRYPTO_ECB=m | 1097 | CONFIG_CRYPTO_ECB=m |
| @@ -1069,7 +1110,7 @@ CONFIG_CRYPTO_XCBC=m | |||
| 1069 | # | 1110 | # |
| 1070 | CONFIG_CRYPTO_CRC32C=m | 1111 | CONFIG_CRYPTO_CRC32C=m |
| 1071 | CONFIG_CRYPTO_MD4=m | 1112 | CONFIG_CRYPTO_MD4=m |
| 1072 | CONFIG_CRYPTO_MD5=m | 1113 | CONFIG_CRYPTO_MD5=y |
| 1073 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1114 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1074 | CONFIG_CRYPTO_RMD128=m | 1115 | CONFIG_CRYPTO_RMD128=m |
| 1075 | CONFIG_CRYPTO_RMD160=m | 1116 | CONFIG_CRYPTO_RMD160=m |
| @@ -1091,7 +1132,7 @@ CONFIG_CRYPTO_BLOWFISH=m | |||
| 1091 | CONFIG_CRYPTO_CAMELLIA=m | 1132 | CONFIG_CRYPTO_CAMELLIA=m |
| 1092 | CONFIG_CRYPTO_CAST5=m | 1133 | CONFIG_CRYPTO_CAST5=m |
| 1093 | CONFIG_CRYPTO_CAST6=m | 1134 | CONFIG_CRYPTO_CAST6=m |
| 1094 | CONFIG_CRYPTO_DES=m | 1135 | CONFIG_CRYPTO_DES=y |
| 1095 | CONFIG_CRYPTO_FCRYPT=m | 1136 | CONFIG_CRYPTO_FCRYPT=m |
| 1096 | CONFIG_CRYPTO_KHAZAD=m | 1137 | CONFIG_CRYPTO_KHAZAD=m |
| 1097 | CONFIG_CRYPTO_SALSA20=m | 1138 | CONFIG_CRYPTO_SALSA20=m |
| @@ -1105,6 +1146,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1105 | # Compression | 1146 | # Compression |
| 1106 | # | 1147 | # |
| 1107 | CONFIG_CRYPTO_DEFLATE=m | 1148 | CONFIG_CRYPTO_DEFLATE=m |
| 1149 | CONFIG_CRYPTO_ZLIB=m | ||
| 1108 | CONFIG_CRYPTO_LZO=m | 1150 | CONFIG_CRYPTO_LZO=m |
| 1109 | 1151 | ||
| 1110 | # | 1152 | # |
| @@ -1112,11 +1154,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1112 | # | 1154 | # |
| 1113 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1155 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1114 | # CONFIG_CRYPTO_HW is not set | 1156 | # CONFIG_CRYPTO_HW is not set |
| 1157 | # CONFIG_BINARY_PRINTF is not set | ||
| 1115 | 1158 | ||
| 1116 | # | 1159 | # |
| 1117 | # Library routines | 1160 | # Library routines |
| 1118 | # | 1161 | # |
| 1119 | CONFIG_BITREVERSE=y | 1162 | CONFIG_BITREVERSE=y |
| 1163 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1120 | CONFIG_CRC_CCITT=m | 1164 | CONFIG_CRC_CCITT=m |
| 1121 | CONFIG_CRC16=y | 1165 | CONFIG_CRC16=y |
| 1122 | CONFIG_CRC_T10DIF=y | 1166 | CONFIG_CRC_T10DIF=y |
| @@ -1128,10 +1172,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1128 | CONFIG_ZLIB_DEFLATE=m | 1172 | CONFIG_ZLIB_DEFLATE=m |
| 1129 | CONFIG_LZO_COMPRESS=m | 1173 | CONFIG_LZO_COMPRESS=m |
| 1130 | CONFIG_LZO_DECOMPRESS=m | 1174 | CONFIG_LZO_DECOMPRESS=m |
| 1175 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1176 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1177 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1131 | CONFIG_TEXTSEARCH=y | 1178 | CONFIG_TEXTSEARCH=y |
| 1132 | CONFIG_TEXTSEARCH_KMP=m | 1179 | CONFIG_TEXTSEARCH_KMP=m |
| 1133 | CONFIG_TEXTSEARCH_BM=m | 1180 | CONFIG_TEXTSEARCH_BM=m |
| 1134 | CONFIG_TEXTSEARCH_FSM=m | 1181 | CONFIG_TEXTSEARCH_FSM=m |
| 1135 | CONFIG_PLIST=y | ||
| 1136 | CONFIG_HAS_IOMEM=y | 1182 | CONFIG_HAS_IOMEM=y |
| 1137 | CONFIG_HAS_DMA=y | 1183 | CONFIG_HAS_DMA=y |
| 1184 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index d3d9814a91d..6e6b1aa6668 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:45 2008 | 4 | # Wed Apr 22 20:47:59 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 143 | CONFIG_NEED_MULTIPLE_NODES=y | 154 | CONFIG_NEED_MULTIPLE_NODES=y |
| 144 | CONFIG_PAGEFLAGS_EXTENDED=y | 155 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 146 | # CONFIG_RESOURCES_64BIT is not set | ||
| 147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 157 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 148 | CONFIG_ZONE_DMA_FLAG=1 | 158 | CONFIG_ZONE_DMA_FLAG=1 |
| 149 | CONFIG_BOUNCE=y | 159 | CONFIG_BOUNCE=y |
| 150 | CONFIG_VIRT_TO_BUS=y | 160 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | 161 | CONFIG_UNEVICTABLE_LRU=y |
| 162 | CONFIG_HAVE_MLOCK=y | ||
| 163 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 152 | 164 | ||
| 153 | # | 165 | # |
| 154 | # General setup | 166 | # General setup |
| @@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 270 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 272 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 274 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 275 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 276 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 279 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 280 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 281 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 269 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 283 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 270 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 284 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 271 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 285 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 290 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 292 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 294 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 295 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 296 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 369 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 355 | CONFIG_IP6_NF_MATCH_MH=m | 370 | CONFIG_IP6_NF_MATCH_MH=m |
| 356 | CONFIG_IP6_NF_MATCH_RT=m | 371 | CONFIG_IP6_NF_MATCH_RT=m |
| 372 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 357 | CONFIG_IP6_NF_TARGET_LOG=m | 373 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | 374 | CONFIG_IP6_NF_FILTER=m |
| 359 | CONFIG_IP6_NF_TARGET_REJECT=m | 375 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 360 | CONFIG_IP6_NF_MANGLE=m | 376 | CONFIG_IP6_NF_MANGLE=m |
| 361 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 362 | CONFIG_IP6_NF_RAW=m | 377 | CONFIG_IP6_NF_RAW=m |
| 363 | CONFIG_IP_DCCP=m | 378 | CONFIG_IP_DCCP=m |
| 364 | CONFIG_INET_DCCP_DIAG=m | 379 | CONFIG_INET_DCCP_DIAG=m |
| 365 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 366 | 380 | ||
| 367 | # | 381 | # |
| 368 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 382 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 369 | # | 383 | # |
| 370 | CONFIG_IP_DCCP_CCID2=m | ||
| 371 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 384 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 372 | CONFIG_IP_DCCP_CCID3=m | 385 | # CONFIG_IP_DCCP_CCID3 is not set |
| 373 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 374 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 375 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 376 | CONFIG_IP_SCTP=m | 386 | CONFIG_IP_SCTP=m |
| 377 | # CONFIG_SCTP_DBG_MSG is not set | 387 | # CONFIG_SCTP_DBG_MSG is not set |
| 378 | # CONFIG_SCTP_DBG_OBJCNT is not set | 388 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -394,8 +404,10 @@ CONFIG_ATALK=m | |||
| 394 | # CONFIG_LAPB is not set | 404 | # CONFIG_LAPB is not set |
| 395 | # CONFIG_ECONET is not set | 405 | # CONFIG_ECONET is not set |
| 396 | # CONFIG_WAN_ROUTER is not set | 406 | # CONFIG_WAN_ROUTER is not set |
| 407 | # CONFIG_PHONET is not set | ||
| 397 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
| 398 | CONFIG_NET_CLS_ROUTE=y | 409 | CONFIG_NET_CLS_ROUTE=y |
| 410 | # CONFIG_DCB is not set | ||
| 399 | 411 | ||
| 400 | # | 412 | # |
| 401 | # Network testing | 413 | # Network testing |
| @@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 406 | # CONFIG_IRDA is not set | 418 | # CONFIG_IRDA is not set |
| 407 | # CONFIG_BT is not set | 419 | # CONFIG_BT is not set |
| 408 | # CONFIG_AF_RXRPC is not set | 420 | # CONFIG_AF_RXRPC is not set |
| 409 | # CONFIG_PHONET is not set | ||
| 410 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_WIRELESS is not set |
| 422 | # CONFIG_WIMAX is not set | ||
| 411 | # CONFIG_RFKILL is not set | 423 | # CONFIG_RFKILL is not set |
| 412 | # CONFIG_NET_9P is not set | 424 | # CONFIG_NET_9P is not set |
| 413 | 425 | ||
| @@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 443 | CONFIG_ATA_OVER_ETH=m | 455 | CONFIG_ATA_OVER_ETH=m |
| 444 | # CONFIG_BLK_DEV_HD is not set | 456 | # CONFIG_BLK_DEV_HD is not set |
| 445 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
| 446 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | # CONFIG_ENCLOSURE_SERVICES is not set | 458 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | 459 | # CONFIG_C2PORT is not set |
| 460 | |||
| 461 | # | ||
| 462 | # EEPROM support | ||
| 463 | # | ||
| 464 | # CONFIG_EEPROM_93CX6 is not set | ||
| 449 | CONFIG_HAVE_IDE=y | 465 | CONFIG_HAVE_IDE=y |
| 450 | # CONFIG_IDE is not set | 466 | # CONFIG_IDE is not set |
| 451 | 467 | ||
| @@ -493,10 +509,13 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 493 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 509 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 494 | CONFIG_SCSI_LOWLEVEL=y | 510 | CONFIG_SCSI_LOWLEVEL=y |
| 495 | CONFIG_ISCSI_TCP=m | 511 | CONFIG_ISCSI_TCP=m |
| 512 | # CONFIG_LIBFC is not set | ||
| 513 | # CONFIG_LIBFCOE is not set | ||
| 496 | CONFIG_53C700_BE_BUS=y | 514 | CONFIG_53C700_BE_BUS=y |
| 497 | # CONFIG_SCSI_DEBUG is not set | 515 | # CONFIG_SCSI_DEBUG is not set |
| 498 | CONFIG_BVME6000_SCSI=y | 516 | CONFIG_BVME6000_SCSI=y |
| 499 | # CONFIG_SCSI_DH is not set | 517 | # CONFIG_SCSI_DH is not set |
| 518 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 500 | CONFIG_MD=y | 519 | CONFIG_MD=y |
| 501 | CONFIG_BLK_DEV_MD=m | 520 | CONFIG_BLK_DEV_MD=m |
| 502 | CONFIG_MD_LINEAR=m | 521 | CONFIG_MD_LINEAR=m |
| @@ -504,7 +523,7 @@ CONFIG_MD_RAID0=m | |||
| 504 | CONFIG_MD_RAID1=m | 523 | CONFIG_MD_RAID1=m |
| 505 | # CONFIG_MD_RAID10 is not set | 524 | # CONFIG_MD_RAID10 is not set |
| 506 | CONFIG_MD_RAID456=m | 525 | CONFIG_MD_RAID456=m |
| 507 | CONFIG_MD_RAID5_RESHAPE=y | 526 | CONFIG_MD_RAID6_PQ=m |
| 508 | # CONFIG_MD_MULTIPATH is not set | 527 | # CONFIG_MD_MULTIPATH is not set |
| 509 | # CONFIG_MD_FAULTY is not set | 528 | # CONFIG_MD_FAULTY is not set |
| 510 | CONFIG_BLK_DEV_DM=m | 529 | CONFIG_BLK_DEV_DM=m |
| @@ -517,6 +536,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 517 | # CONFIG_DM_DELAY is not set | 536 | # CONFIG_DM_DELAY is not set |
| 518 | CONFIG_DM_UEVENT=y | 537 | CONFIG_DM_UEVENT=y |
| 519 | CONFIG_NETDEVICES=y | 538 | CONFIG_NETDEVICES=y |
| 539 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 520 | CONFIG_DUMMY=m | 540 | CONFIG_DUMMY=m |
| 521 | # CONFIG_BONDING is not set | 541 | # CONFIG_BONDING is not set |
| 522 | CONFIG_MACVLAN=m | 542 | CONFIG_MACVLAN=m |
| @@ -527,6 +547,8 @@ CONFIG_VETH=m | |||
| 527 | CONFIG_NET_ETHERNET=y | 547 | CONFIG_NET_ETHERNET=y |
| 528 | # CONFIG_MII is not set | 548 | # CONFIG_MII is not set |
| 529 | CONFIG_BVME6000_NET=y | 549 | CONFIG_BVME6000_NET=y |
| 550 | # CONFIG_ETHOC is not set | ||
| 551 | # CONFIG_DNET is not set | ||
| 530 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 552 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 553 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 554 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -543,7 +565,10 @@ CONFIG_BVME6000_NET=y | |||
| 543 | # | 565 | # |
| 544 | # CONFIG_WLAN_PRE80211 is not set | 566 | # CONFIG_WLAN_PRE80211 is not set |
| 545 | # CONFIG_WLAN_80211 is not set | 567 | # CONFIG_WLAN_80211 is not set |
| 546 | # CONFIG_IWLWIFI_LEDS is not set | 568 | |
| 569 | # | ||
| 570 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 571 | # | ||
| 547 | # CONFIG_WAN is not set | 572 | # CONFIG_WAN is not set |
| 548 | CONFIG_PPP=m | 573 | CONFIG_PPP=m |
| 549 | # CONFIG_PPP_MULTILINK is not set | 574 | # CONFIG_PPP_MULTILINK is not set |
| @@ -601,7 +626,6 @@ CONFIG_MOUSE_PS2=m | |||
| 601 | CONFIG_MOUSE_PS2_ALPS=y | 626 | CONFIG_MOUSE_PS2_ALPS=y |
| 602 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 627 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 603 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 628 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 604 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 605 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 629 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 606 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 630 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 607 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 631 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -641,6 +665,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 641 | # Non-8250 serial port support | 665 | # Non-8250 serial port support |
| 642 | # | 666 | # |
| 643 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
| 668 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 644 | CONFIG_LEGACY_PTYS=y | 669 | CONFIG_LEGACY_PTYS=y |
| 645 | CONFIG_LEGACY_PTY_COUNT=256 | 670 | CONFIG_LEGACY_PTY_COUNT=256 |
| 646 | # CONFIG_IPMI_HANDLER is not set | 671 | # CONFIG_IPMI_HANDLER is not set |
| @@ -717,7 +742,6 @@ CONFIG_HIDRAW=y | |||
| 717 | # | 742 | # |
| 718 | # Special HID drivers | 743 | # Special HID drivers |
| 719 | # | 744 | # |
| 720 | CONFIG_HID_COMPAT=y | ||
| 721 | # CONFIG_USB_SUPPORT is not set | 745 | # CONFIG_USB_SUPPORT is not set |
| 722 | # CONFIG_MMC is not set | 746 | # CONFIG_MMC is not set |
| 723 | # CONFIG_MEMSTICK is not set | 747 | # CONFIG_MEMSTICK is not set |
| @@ -725,9 +749,9 @@ CONFIG_HID_COMPAT=y | |||
| 725 | # CONFIG_ACCESSIBILITY is not set | 749 | # CONFIG_ACCESSIBILITY is not set |
| 726 | # CONFIG_RTC_CLASS is not set | 750 | # CONFIG_RTC_CLASS is not set |
| 727 | # CONFIG_DMADEVICES is not set | 751 | # CONFIG_DMADEVICES is not set |
| 752 | # CONFIG_AUXDISPLAY is not set | ||
| 728 | # CONFIG_UIO is not set | 753 | # CONFIG_UIO is not set |
| 729 | # CONFIG_STAGING is not set | 754 | # CONFIG_STAGING is not set |
| 730 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 731 | 755 | ||
| 732 | # | 756 | # |
| 733 | # Character devices | 757 | # Character devices |
| @@ -742,6 +766,7 @@ CONFIG_EXT2_FS=y | |||
| 742 | # CONFIG_EXT2_FS_XATTR is not set | 766 | # CONFIG_EXT2_FS_XATTR is not set |
| 743 | # CONFIG_EXT2_FS_XIP is not set | 767 | # CONFIG_EXT2_FS_XIP is not set |
| 744 | CONFIG_EXT3_FS=y | 768 | CONFIG_EXT3_FS=y |
| 769 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 745 | # CONFIG_EXT3_FS_XATTR is not set | 770 | # CONFIG_EXT3_FS_XATTR is not set |
| 746 | # CONFIG_EXT4_FS is not set | 771 | # CONFIG_EXT4_FS is not set |
| 747 | CONFIG_JBD=y | 772 | CONFIG_JBD=y |
| @@ -768,13 +793,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 768 | # CONFIG_OCFS2_FS_STATS is not set | 793 | # CONFIG_OCFS2_FS_STATS is not set |
| 769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 794 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 770 | # CONFIG_OCFS2_DEBUG_FS is not set | 795 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 771 | # CONFIG_OCFS2_COMPAT_JBD is not set | 796 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 797 | # CONFIG_BTRFS_FS is not set | ||
| 772 | CONFIG_DNOTIFY=y | 798 | CONFIG_DNOTIFY=y |
| 773 | CONFIG_INOTIFY=y | 799 | CONFIG_INOTIFY=y |
| 774 | CONFIG_INOTIFY_USER=y | 800 | CONFIG_INOTIFY_USER=y |
| 775 | CONFIG_QUOTA=y | 801 | CONFIG_QUOTA=y |
| 776 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 802 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 777 | # CONFIG_PRINT_QUOTA_WARNING is not set | 803 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 804 | CONFIG_QUOTA_TREE=m | ||
| 778 | # CONFIG_QFMT_V1 is not set | 805 | # CONFIG_QFMT_V1 is not set |
| 779 | # CONFIG_QFMT_V2 is not set | 806 | # CONFIG_QFMT_V2 is not set |
| 780 | CONFIG_QUOTACTL=y | 807 | CONFIG_QUOTACTL=y |
| @@ -783,6 +810,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 783 | CONFIG_FUSE_FS=m | 810 | CONFIG_FUSE_FS=m |
| 784 | 811 | ||
| 785 | # | 812 | # |
| 813 | # Caches | ||
| 814 | # | ||
| 815 | # CONFIG_FSCACHE is not set | ||
| 816 | |||
| 817 | # | ||
| 786 | # CD-ROM/DVD Filesystems | 818 | # CD-ROM/DVD Filesystems |
| 787 | # | 819 | # |
| 788 | CONFIG_ISO9660_FS=y | 820 | CONFIG_ISO9660_FS=y |
| @@ -813,10 +845,7 @@ CONFIG_TMPFS=y | |||
| 813 | # CONFIG_TMPFS_POSIX_ACL is not set | 845 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 814 | # CONFIG_HUGETLB_PAGE is not set | 846 | # CONFIG_HUGETLB_PAGE is not set |
| 815 | CONFIG_CONFIGFS_FS=m | 847 | CONFIG_CONFIGFS_FS=m |
| 816 | 848 | CONFIG_MISC_FILESYSTEMS=y | |
| 817 | # | ||
| 818 | # Miscellaneous filesystems | ||
| 819 | # | ||
| 820 | # CONFIG_ADFS_FS is not set | 849 | # CONFIG_ADFS_FS is not set |
| 821 | CONFIG_AFFS_FS=m | 850 | CONFIG_AFFS_FS=m |
| 822 | CONFIG_HFS_FS=m | 851 | CONFIG_HFS_FS=m |
| @@ -825,6 +854,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 825 | # CONFIG_BFS_FS is not set | 854 | # CONFIG_BFS_FS is not set |
| 826 | # CONFIG_EFS_FS is not set | 855 | # CONFIG_EFS_FS is not set |
| 827 | CONFIG_CRAMFS=m | 856 | CONFIG_CRAMFS=m |
| 857 | CONFIG_SQUASHFS=m | ||
| 858 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 859 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 828 | # CONFIG_VXFS_FS is not set | 860 | # CONFIG_VXFS_FS is not set |
| 829 | CONFIG_MINIX_FS=y | 861 | CONFIG_MINIX_FS=y |
| 830 | # CONFIG_OMFS_FS is not set | 862 | # CONFIG_OMFS_FS is not set |
| @@ -835,6 +867,7 @@ CONFIG_SYSV_FS=m | |||
| 835 | CONFIG_UFS_FS=m | 867 | CONFIG_UFS_FS=m |
| 836 | # CONFIG_UFS_FS_WRITE is not set | 868 | # CONFIG_UFS_FS_WRITE is not set |
| 837 | # CONFIG_UFS_DEBUG is not set | 869 | # CONFIG_UFS_DEBUG is not set |
| 870 | # CONFIG_NILFS2_FS is not set | ||
| 838 | CONFIG_NETWORK_FILESYSTEMS=y | 871 | CONFIG_NETWORK_FILESYSTEMS=y |
| 839 | CONFIG_NFS_FS=y | 872 | CONFIG_NFS_FS=y |
| 840 | CONFIG_NFS_V3=y | 873 | CONFIG_NFS_V3=y |
| @@ -851,7 +884,6 @@ CONFIG_EXPORTFS=m | |||
| 851 | CONFIG_NFS_COMMON=y | 884 | CONFIG_NFS_COMMON=y |
| 852 | CONFIG_SUNRPC=y | 885 | CONFIG_SUNRPC=y |
| 853 | CONFIG_SUNRPC_GSS=y | 886 | CONFIG_SUNRPC_GSS=y |
| 854 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 855 | CONFIG_RPCSEC_GSS_KRB5=y | 887 | CONFIG_RPCSEC_GSS_KRB5=y |
| 856 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 888 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 857 | CONFIG_SMB_FS=m | 889 | CONFIG_SMB_FS=m |
| @@ -927,11 +959,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 927 | CONFIG_DEBUG_MEMORY_INIT=y | 959 | CONFIG_DEBUG_MEMORY_INIT=y |
| 928 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 960 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 929 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 961 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 930 | |||
| 931 | # | ||
| 932 | # Tracers | ||
| 933 | # | ||
| 934 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 935 | # CONFIG_SAMPLES is not set | 962 | # CONFIG_SAMPLES is not set |
| 936 | 963 | ||
| 937 | # | 964 | # |
| @@ -952,13 +979,21 @@ CONFIG_CRYPTO=y | |||
| 952 | # | 979 | # |
| 953 | # CONFIG_CRYPTO_FIPS is not set | 980 | # CONFIG_CRYPTO_FIPS is not set |
| 954 | CONFIG_CRYPTO_ALGAPI=y | 981 | CONFIG_CRYPTO_ALGAPI=y |
| 955 | CONFIG_CRYPTO_AEAD=y | 982 | CONFIG_CRYPTO_ALGAPI2=y |
| 983 | CONFIG_CRYPTO_AEAD=m | ||
| 984 | CONFIG_CRYPTO_AEAD2=y | ||
| 956 | CONFIG_CRYPTO_BLKCIPHER=y | 985 | CONFIG_CRYPTO_BLKCIPHER=y |
| 986 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 957 | CONFIG_CRYPTO_HASH=y | 987 | CONFIG_CRYPTO_HASH=y |
| 958 | CONFIG_CRYPTO_RNG=y | 988 | CONFIG_CRYPTO_HASH2=y |
| 989 | CONFIG_CRYPTO_RNG=m | ||
| 990 | CONFIG_CRYPTO_RNG2=y | ||
| 991 | CONFIG_CRYPTO_PCOMP=y | ||
| 959 | CONFIG_CRYPTO_MANAGER=y | 992 | CONFIG_CRYPTO_MANAGER=y |
| 993 | CONFIG_CRYPTO_MANAGER2=y | ||
| 960 | CONFIG_CRYPTO_GF128MUL=m | 994 | CONFIG_CRYPTO_GF128MUL=m |
| 961 | CONFIG_CRYPTO_NULL=m | 995 | CONFIG_CRYPTO_NULL=m |
| 996 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 962 | CONFIG_CRYPTO_CRYPTD=m | 997 | CONFIG_CRYPTO_CRYPTD=m |
| 963 | CONFIG_CRYPTO_AUTHENC=m | 998 | CONFIG_CRYPTO_AUTHENC=m |
| 964 | CONFIG_CRYPTO_TEST=m | 999 | CONFIG_CRYPTO_TEST=m |
| @@ -1028,6 +1063,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1028 | # Compression | 1063 | # Compression |
| 1029 | # | 1064 | # |
| 1030 | CONFIG_CRYPTO_DEFLATE=m | 1065 | CONFIG_CRYPTO_DEFLATE=m |
| 1066 | CONFIG_CRYPTO_ZLIB=m | ||
| 1031 | CONFIG_CRYPTO_LZO=m | 1067 | CONFIG_CRYPTO_LZO=m |
| 1032 | 1068 | ||
| 1033 | # | 1069 | # |
| @@ -1035,11 +1071,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1035 | # | 1071 | # |
| 1036 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1072 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1037 | # CONFIG_CRYPTO_HW is not set | 1073 | # CONFIG_CRYPTO_HW is not set |
| 1074 | # CONFIG_BINARY_PRINTF is not set | ||
| 1038 | 1075 | ||
| 1039 | # | 1076 | # |
| 1040 | # Library routines | 1077 | # Library routines |
| 1041 | # | 1078 | # |
| 1042 | CONFIG_BITREVERSE=m | 1079 | CONFIG_BITREVERSE=m |
| 1080 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1043 | CONFIG_CRC_CCITT=m | 1081 | CONFIG_CRC_CCITT=m |
| 1044 | CONFIG_CRC16=m | 1082 | CONFIG_CRC16=m |
| 1045 | CONFIG_CRC_T10DIF=y | 1083 | CONFIG_CRC_T10DIF=y |
| @@ -1051,10 +1089,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1051 | CONFIG_ZLIB_DEFLATE=m | 1089 | CONFIG_ZLIB_DEFLATE=m |
| 1052 | CONFIG_LZO_COMPRESS=m | 1090 | CONFIG_LZO_COMPRESS=m |
| 1053 | CONFIG_LZO_DECOMPRESS=m | 1091 | CONFIG_LZO_DECOMPRESS=m |
| 1092 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1093 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1094 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1054 | CONFIG_TEXTSEARCH=y | 1095 | CONFIG_TEXTSEARCH=y |
| 1055 | CONFIG_TEXTSEARCH_KMP=m | 1096 | CONFIG_TEXTSEARCH_KMP=m |
| 1056 | CONFIG_TEXTSEARCH_BM=m | 1097 | CONFIG_TEXTSEARCH_BM=m |
| 1057 | CONFIG_TEXTSEARCH_FSM=m | 1098 | CONFIG_TEXTSEARCH_FSM=m |
| 1058 | CONFIG_PLIST=y | ||
| 1059 | CONFIG_HAS_IOMEM=y | 1099 | CONFIG_HAS_IOMEM=y |
| 1060 | CONFIG_HAS_DMA=y | 1100 | CONFIG_HAS_DMA=y |
| 1101 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 5556ef088d0..bc0565f63a1 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:46 2008 | 4 | # Wed Apr 22 20:48:01 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -141,12 +152,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 141 | CONFIG_NEED_MULTIPLE_NODES=y | 152 | CONFIG_NEED_MULTIPLE_NODES=y |
| 142 | CONFIG_PAGEFLAGS_EXTENDED=y | 153 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 143 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 144 | # CONFIG_RESOURCES_64BIT is not set | ||
| 145 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 155 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 146 | CONFIG_ZONE_DMA_FLAG=1 | 156 | CONFIG_ZONE_DMA_FLAG=1 |
| 147 | CONFIG_BOUNCE=y | 157 | CONFIG_BOUNCE=y |
| 148 | CONFIG_VIRT_TO_BUS=y | 158 | CONFIG_VIRT_TO_BUS=y |
| 149 | CONFIG_UNEVICTABLE_LRU=y | 159 | CONFIG_UNEVICTABLE_LRU=y |
| 160 | CONFIG_HAVE_MLOCK=y | ||
| 161 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 150 | 162 | ||
| 151 | # | 163 | # |
| 152 | # General setup | 164 | # General setup |
| @@ -257,6 +269,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 257 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 269 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 258 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 270 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 271 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 272 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 260 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 273 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 274 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 275 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -265,6 +278,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 265 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 278 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 279 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 280 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 268 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 282 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 269 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 283 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 270 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 284 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -275,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 275 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 289 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 276 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 290 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 291 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 278 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 293 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 294 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 295 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -353,25 +368,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 353 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 368 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 354 | CONFIG_IP6_NF_MATCH_MH=m | 369 | CONFIG_IP6_NF_MATCH_MH=m |
| 355 | CONFIG_IP6_NF_MATCH_RT=m | 370 | CONFIG_IP6_NF_MATCH_RT=m |
| 371 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 356 | CONFIG_IP6_NF_TARGET_LOG=m | 372 | CONFIG_IP6_NF_TARGET_LOG=m |
| 357 | CONFIG_IP6_NF_FILTER=m | 373 | CONFIG_IP6_NF_FILTER=m |
| 358 | CONFIG_IP6_NF_TARGET_REJECT=m | 374 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 359 | CONFIG_IP6_NF_MANGLE=m | 375 | CONFIG_IP6_NF_MANGLE=m |
| 360 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 361 | CONFIG_IP6_NF_RAW=m | 376 | CONFIG_IP6_NF_RAW=m |
| 362 | CONFIG_IP_DCCP=m | 377 | CONFIG_IP_DCCP=m |
| 363 | CONFIG_INET_DCCP_DIAG=m | 378 | CONFIG_INET_DCCP_DIAG=m |
| 364 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 365 | 379 | ||
| 366 | # | 380 | # |
| 367 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 381 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 368 | # | 382 | # |
| 369 | CONFIG_IP_DCCP_CCID2=m | ||
| 370 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 383 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 371 | CONFIG_IP_DCCP_CCID3=m | 384 | # CONFIG_IP_DCCP_CCID3 is not set |
| 372 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 373 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 374 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 375 | CONFIG_IP_SCTP=m | 385 | CONFIG_IP_SCTP=m |
| 376 | # CONFIG_SCTP_DBG_MSG is not set | 386 | # CONFIG_SCTP_DBG_MSG is not set |
| 377 | # CONFIG_SCTP_DBG_OBJCNT is not set | 387 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -393,8 +403,10 @@ CONFIG_ATALK=m | |||
| 393 | # CONFIG_LAPB is not set | 403 | # CONFIG_LAPB is not set |
| 394 | # CONFIG_ECONET is not set | 404 | # CONFIG_ECONET is not set |
| 395 | # CONFIG_WAN_ROUTER is not set | 405 | # CONFIG_WAN_ROUTER is not set |
| 406 | # CONFIG_PHONET is not set | ||
| 396 | # CONFIG_NET_SCHED is not set | 407 | # CONFIG_NET_SCHED is not set |
| 397 | CONFIG_NET_CLS_ROUTE=y | 408 | CONFIG_NET_CLS_ROUTE=y |
| 409 | # CONFIG_DCB is not set | ||
| 398 | 410 | ||
| 399 | # | 411 | # |
| 400 | # Network testing | 412 | # Network testing |
| @@ -405,8 +417,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 405 | # CONFIG_IRDA is not set | 417 | # CONFIG_IRDA is not set |
| 406 | # CONFIG_BT is not set | 418 | # CONFIG_BT is not set |
| 407 | # CONFIG_AF_RXRPC is not set | 419 | # CONFIG_AF_RXRPC is not set |
| 408 | # CONFIG_PHONET is not set | ||
| 409 | # CONFIG_WIRELESS is not set | 420 | # CONFIG_WIRELESS is not set |
| 421 | # CONFIG_WIMAX is not set | ||
| 410 | # CONFIG_RFKILL is not set | 422 | # CONFIG_RFKILL is not set |
| 411 | # CONFIG_NET_9P is not set | 423 | # CONFIG_NET_9P is not set |
| 412 | 424 | ||
| @@ -442,9 +454,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 442 | CONFIG_ATA_OVER_ETH=m | 454 | CONFIG_ATA_OVER_ETH=m |
| 443 | # CONFIG_BLK_DEV_HD is not set | 455 | # CONFIG_BLK_DEV_HD is not set |
| 444 | CONFIG_MISC_DEVICES=y | 456 | CONFIG_MISC_DEVICES=y |
| 445 | # CONFIG_EEPROM_93CX6 is not set | ||
| 446 | # CONFIG_ENCLOSURE_SERVICES is not set | 457 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 447 | # CONFIG_C2PORT is not set | 458 | # CONFIG_C2PORT is not set |
| 459 | |||
| 460 | # | ||
| 461 | # EEPROM support | ||
| 462 | # | ||
| 463 | # CONFIG_EEPROM_93CX6 is not set | ||
| 448 | CONFIG_HAVE_IDE=y | 464 | CONFIG_HAVE_IDE=y |
| 449 | # CONFIG_IDE is not set | 465 | # CONFIG_IDE is not set |
| 450 | 466 | ||
| @@ -492,8 +508,11 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 492 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 508 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 493 | CONFIG_SCSI_LOWLEVEL=y | 509 | CONFIG_SCSI_LOWLEVEL=y |
| 494 | CONFIG_ISCSI_TCP=m | 510 | CONFIG_ISCSI_TCP=m |
| 511 | # CONFIG_LIBFC is not set | ||
| 512 | # CONFIG_LIBFCOE is not set | ||
| 495 | # CONFIG_SCSI_DEBUG is not set | 513 | # CONFIG_SCSI_DEBUG is not set |
| 496 | # CONFIG_SCSI_DH is not set | 514 | # CONFIG_SCSI_DH is not set |
| 515 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 497 | CONFIG_MD=y | 516 | CONFIG_MD=y |
| 498 | CONFIG_BLK_DEV_MD=m | 517 | CONFIG_BLK_DEV_MD=m |
| 499 | CONFIG_MD_LINEAR=m | 518 | CONFIG_MD_LINEAR=m |
| @@ -501,7 +520,7 @@ CONFIG_MD_RAID0=m | |||
| 501 | CONFIG_MD_RAID1=m | 520 | CONFIG_MD_RAID1=m |
| 502 | # CONFIG_MD_RAID10 is not set | 521 | # CONFIG_MD_RAID10 is not set |
| 503 | CONFIG_MD_RAID456=m | 522 | CONFIG_MD_RAID456=m |
| 504 | CONFIG_MD_RAID5_RESHAPE=y | 523 | CONFIG_MD_RAID6_PQ=m |
| 505 | # CONFIG_MD_MULTIPATH is not set | 524 | # CONFIG_MD_MULTIPATH is not set |
| 506 | # CONFIG_MD_FAULTY is not set | 525 | # CONFIG_MD_FAULTY is not set |
| 507 | CONFIG_BLK_DEV_DM=m | 526 | CONFIG_BLK_DEV_DM=m |
| @@ -514,6 +533,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 514 | # CONFIG_DM_DELAY is not set | 533 | # CONFIG_DM_DELAY is not set |
| 515 | CONFIG_DM_UEVENT=y | 534 | CONFIG_DM_UEVENT=y |
| 516 | CONFIG_NETDEVICES=y | 535 | CONFIG_NETDEVICES=y |
| 536 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 517 | CONFIG_DUMMY=m | 537 | CONFIG_DUMMY=m |
| 518 | # CONFIG_BONDING is not set | 538 | # CONFIG_BONDING is not set |
| 519 | CONFIG_MACVLAN=m | 539 | CONFIG_MACVLAN=m |
| @@ -524,6 +544,8 @@ CONFIG_VETH=m | |||
| 524 | CONFIG_NET_ETHERNET=y | 544 | CONFIG_NET_ETHERNET=y |
| 525 | # CONFIG_MII is not set | 545 | # CONFIG_MII is not set |
| 526 | CONFIG_HPLANCE=y | 546 | CONFIG_HPLANCE=y |
| 547 | # CONFIG_ETHOC is not set | ||
| 548 | # CONFIG_DNET is not set | ||
| 527 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 549 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 528 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 550 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 529 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 551 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -540,7 +562,10 @@ CONFIG_HPLANCE=y | |||
| 540 | # | 562 | # |
| 541 | # CONFIG_WLAN_PRE80211 is not set | 563 | # CONFIG_WLAN_PRE80211 is not set |
| 542 | # CONFIG_WLAN_80211 is not set | 564 | # CONFIG_WLAN_80211 is not set |
| 543 | # CONFIG_IWLWIFI_LEDS is not set | 565 | |
| 566 | # | ||
| 567 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 568 | # | ||
| 544 | # CONFIG_WAN is not set | 569 | # CONFIG_WAN is not set |
| 545 | CONFIG_PPP=m | 570 | CONFIG_PPP=m |
| 546 | # CONFIG_PPP_MULTILINK is not set | 571 | # CONFIG_PPP_MULTILINK is not set |
| @@ -600,7 +625,6 @@ CONFIG_MOUSE_PS2=m | |||
| 600 | CONFIG_MOUSE_PS2_ALPS=y | 625 | CONFIG_MOUSE_PS2_ALPS=y |
| 601 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 626 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 627 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 628 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 629 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -646,6 +670,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 646 | # Non-8250 serial port support | 670 | # Non-8250 serial port support |
| 647 | # | 671 | # |
| 648 | CONFIG_UNIX98_PTYS=y | 672 | CONFIG_UNIX98_PTYS=y |
| 673 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 649 | CONFIG_LEGACY_PTYS=y | 674 | CONFIG_LEGACY_PTYS=y |
| 650 | CONFIG_LEGACY_PTY_COUNT=256 | 675 | CONFIG_LEGACY_PTY_COUNT=256 |
| 651 | # CONFIG_IPMI_HANDLER is not set | 676 | # CONFIG_IPMI_HANDLER is not set |
| @@ -728,6 +753,7 @@ CONFIG_FB_HP300=y | |||
| 728 | # CONFIG_FB_VIRTUAL is not set | 753 | # CONFIG_FB_VIRTUAL is not set |
| 729 | # CONFIG_FB_METRONOME is not set | 754 | # CONFIG_FB_METRONOME is not set |
| 730 | # CONFIG_FB_MB862XX is not set | 755 | # CONFIG_FB_MB862XX is not set |
| 756 | # CONFIG_FB_BROADSHEET is not set | ||
| 731 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 757 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 732 | 758 | ||
| 733 | # | 759 | # |
| @@ -759,7 +785,6 @@ CONFIG_HIDRAW=y | |||
| 759 | # | 785 | # |
| 760 | # Special HID drivers | 786 | # Special HID drivers |
| 761 | # | 787 | # |
| 762 | CONFIG_HID_COMPAT=y | ||
| 763 | # CONFIG_USB_SUPPORT is not set | 788 | # CONFIG_USB_SUPPORT is not set |
| 764 | # CONFIG_MMC is not set | 789 | # CONFIG_MMC is not set |
| 765 | # CONFIG_MEMSTICK is not set | 790 | # CONFIG_MEMSTICK is not set |
| @@ -767,9 +792,9 @@ CONFIG_HID_COMPAT=y | |||
| 767 | # CONFIG_ACCESSIBILITY is not set | 792 | # CONFIG_ACCESSIBILITY is not set |
| 768 | # CONFIG_RTC_CLASS is not set | 793 | # CONFIG_RTC_CLASS is not set |
| 769 | # CONFIG_DMADEVICES is not set | 794 | # CONFIG_DMADEVICES is not set |
| 795 | # CONFIG_AUXDISPLAY is not set | ||
| 770 | # CONFIG_UIO is not set | 796 | # CONFIG_UIO is not set |
| 771 | # CONFIG_STAGING is not set | 797 | # CONFIG_STAGING is not set |
| 772 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 773 | 798 | ||
| 774 | # | 799 | # |
| 775 | # Character devices | 800 | # Character devices |
| @@ -782,6 +807,7 @@ CONFIG_EXT2_FS=y | |||
| 782 | # CONFIG_EXT2_FS_XATTR is not set | 807 | # CONFIG_EXT2_FS_XATTR is not set |
| 783 | # CONFIG_EXT2_FS_XIP is not set | 808 | # CONFIG_EXT2_FS_XIP is not set |
| 784 | CONFIG_EXT3_FS=y | 809 | CONFIG_EXT3_FS=y |
| 810 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 785 | # CONFIG_EXT3_FS_XATTR is not set | 811 | # CONFIG_EXT3_FS_XATTR is not set |
| 786 | # CONFIG_EXT4_FS is not set | 812 | # CONFIG_EXT4_FS is not set |
| 787 | CONFIG_JBD=y | 813 | CONFIG_JBD=y |
| @@ -808,13 +834,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 808 | # CONFIG_OCFS2_FS_STATS is not set | 834 | # CONFIG_OCFS2_FS_STATS is not set |
| 809 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 835 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 810 | # CONFIG_OCFS2_DEBUG_FS is not set | 836 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 811 | # CONFIG_OCFS2_COMPAT_JBD is not set | 837 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 838 | # CONFIG_BTRFS_FS is not set | ||
| 812 | CONFIG_DNOTIFY=y | 839 | CONFIG_DNOTIFY=y |
| 813 | CONFIG_INOTIFY=y | 840 | CONFIG_INOTIFY=y |
| 814 | CONFIG_INOTIFY_USER=y | 841 | CONFIG_INOTIFY_USER=y |
| 815 | CONFIG_QUOTA=y | 842 | CONFIG_QUOTA=y |
| 816 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 843 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 817 | # CONFIG_PRINT_QUOTA_WARNING is not set | 844 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 845 | CONFIG_QUOTA_TREE=m | ||
| 818 | # CONFIG_QFMT_V1 is not set | 846 | # CONFIG_QFMT_V1 is not set |
| 819 | # CONFIG_QFMT_V2 is not set | 847 | # CONFIG_QFMT_V2 is not set |
| 820 | CONFIG_QUOTACTL=y | 848 | CONFIG_QUOTACTL=y |
| @@ -823,6 +851,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 823 | CONFIG_FUSE_FS=m | 851 | CONFIG_FUSE_FS=m |
| 824 | 852 | ||
| 825 | # | 853 | # |
| 854 | # Caches | ||
| 855 | # | ||
| 856 | # CONFIG_FSCACHE is not set | ||
| 857 | |||
| 858 | # | ||
| 826 | # CD-ROM/DVD Filesystems | 859 | # CD-ROM/DVD Filesystems |
| 827 | # | 860 | # |
| 828 | CONFIG_ISO9660_FS=y | 861 | CONFIG_ISO9660_FS=y |
| @@ -853,10 +886,7 @@ CONFIG_TMPFS=y | |||
| 853 | # CONFIG_TMPFS_POSIX_ACL is not set | 886 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 854 | # CONFIG_HUGETLB_PAGE is not set | 887 | # CONFIG_HUGETLB_PAGE is not set |
| 855 | CONFIG_CONFIGFS_FS=m | 888 | CONFIG_CONFIGFS_FS=m |
| 856 | 889 | CONFIG_MISC_FILESYSTEMS=y | |
| 857 | # | ||
| 858 | # Miscellaneous filesystems | ||
| 859 | # | ||
| 860 | # CONFIG_ADFS_FS is not set | 890 | # CONFIG_ADFS_FS is not set |
| 861 | CONFIG_AFFS_FS=m | 891 | CONFIG_AFFS_FS=m |
| 862 | CONFIG_HFS_FS=m | 892 | CONFIG_HFS_FS=m |
| @@ -865,6 +895,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 865 | # CONFIG_BFS_FS is not set | 895 | # CONFIG_BFS_FS is not set |
| 866 | # CONFIG_EFS_FS is not set | 896 | # CONFIG_EFS_FS is not set |
| 867 | CONFIG_CRAMFS=m | 897 | CONFIG_CRAMFS=m |
| 898 | CONFIG_SQUASHFS=m | ||
| 899 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 900 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 868 | # CONFIG_VXFS_FS is not set | 901 | # CONFIG_VXFS_FS is not set |
| 869 | CONFIG_MINIX_FS=y | 902 | CONFIG_MINIX_FS=y |
| 870 | # CONFIG_OMFS_FS is not set | 903 | # CONFIG_OMFS_FS is not set |
| @@ -875,6 +908,7 @@ CONFIG_SYSV_FS=m | |||
| 875 | CONFIG_UFS_FS=m | 908 | CONFIG_UFS_FS=m |
| 876 | # CONFIG_UFS_FS_WRITE is not set | 909 | # CONFIG_UFS_FS_WRITE is not set |
| 877 | # CONFIG_UFS_DEBUG is not set | 910 | # CONFIG_UFS_DEBUG is not set |
| 911 | # CONFIG_NILFS2_FS is not set | ||
| 878 | CONFIG_NETWORK_FILESYSTEMS=y | 912 | CONFIG_NETWORK_FILESYSTEMS=y |
| 879 | CONFIG_NFS_FS=y | 913 | CONFIG_NFS_FS=y |
| 880 | CONFIG_NFS_V3=y | 914 | CONFIG_NFS_V3=y |
| @@ -891,7 +925,6 @@ CONFIG_EXPORTFS=m | |||
| 891 | CONFIG_NFS_COMMON=y | 925 | CONFIG_NFS_COMMON=y |
| 892 | CONFIG_SUNRPC=y | 926 | CONFIG_SUNRPC=y |
| 893 | CONFIG_SUNRPC_GSS=y | 927 | CONFIG_SUNRPC_GSS=y |
| 894 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 895 | CONFIG_RPCSEC_GSS_KRB5=y | 928 | CONFIG_RPCSEC_GSS_KRB5=y |
| 896 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 929 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 897 | CONFIG_SMB_FS=m | 930 | CONFIG_SMB_FS=m |
| @@ -966,11 +999,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 966 | CONFIG_DEBUG_MEMORY_INIT=y | 999 | CONFIG_DEBUG_MEMORY_INIT=y |
| 967 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1000 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 968 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1001 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 969 | |||
| 970 | # | ||
| 971 | # Tracers | ||
| 972 | # | ||
| 973 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 974 | # CONFIG_SAMPLES is not set | 1002 | # CONFIG_SAMPLES is not set |
| 975 | 1003 | ||
| 976 | # | 1004 | # |
| @@ -991,13 +1019,21 @@ CONFIG_CRYPTO=y | |||
| 991 | # | 1019 | # |
| 992 | # CONFIG_CRYPTO_FIPS is not set | 1020 | # CONFIG_CRYPTO_FIPS is not set |
| 993 | CONFIG_CRYPTO_ALGAPI=y | 1021 | CONFIG_CRYPTO_ALGAPI=y |
| 994 | CONFIG_CRYPTO_AEAD=y | 1022 | CONFIG_CRYPTO_ALGAPI2=y |
| 1023 | CONFIG_CRYPTO_AEAD=m | ||
| 1024 | CONFIG_CRYPTO_AEAD2=y | ||
| 995 | CONFIG_CRYPTO_BLKCIPHER=y | 1025 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1026 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 996 | CONFIG_CRYPTO_HASH=y | 1027 | CONFIG_CRYPTO_HASH=y |
| 997 | CONFIG_CRYPTO_RNG=y | 1028 | CONFIG_CRYPTO_HASH2=y |
| 1029 | CONFIG_CRYPTO_RNG=m | ||
| 1030 | CONFIG_CRYPTO_RNG2=y | ||
| 1031 | CONFIG_CRYPTO_PCOMP=y | ||
| 998 | CONFIG_CRYPTO_MANAGER=y | 1032 | CONFIG_CRYPTO_MANAGER=y |
| 1033 | CONFIG_CRYPTO_MANAGER2=y | ||
| 999 | CONFIG_CRYPTO_GF128MUL=m | 1034 | CONFIG_CRYPTO_GF128MUL=m |
| 1000 | CONFIG_CRYPTO_NULL=m | 1035 | CONFIG_CRYPTO_NULL=m |
| 1036 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1001 | CONFIG_CRYPTO_CRYPTD=m | 1037 | CONFIG_CRYPTO_CRYPTD=m |
| 1002 | CONFIG_CRYPTO_AUTHENC=m | 1038 | CONFIG_CRYPTO_AUTHENC=m |
| 1003 | CONFIG_CRYPTO_TEST=m | 1039 | CONFIG_CRYPTO_TEST=m |
| @@ -1067,6 +1103,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1067 | # Compression | 1103 | # Compression |
| 1068 | # | 1104 | # |
| 1069 | CONFIG_CRYPTO_DEFLATE=m | 1105 | CONFIG_CRYPTO_DEFLATE=m |
| 1106 | CONFIG_CRYPTO_ZLIB=m | ||
| 1070 | CONFIG_CRYPTO_LZO=m | 1107 | CONFIG_CRYPTO_LZO=m |
| 1071 | 1108 | ||
| 1072 | # | 1109 | # |
| @@ -1074,11 +1111,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1074 | # | 1111 | # |
| 1075 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1112 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1076 | # CONFIG_CRYPTO_HW is not set | 1113 | # CONFIG_CRYPTO_HW is not set |
| 1114 | # CONFIG_BINARY_PRINTF is not set | ||
| 1077 | 1115 | ||
| 1078 | # | 1116 | # |
| 1079 | # Library routines | 1117 | # Library routines |
| 1080 | # | 1118 | # |
| 1081 | CONFIG_BITREVERSE=y | 1119 | CONFIG_BITREVERSE=y |
| 1120 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1082 | CONFIG_CRC_CCITT=m | 1121 | CONFIG_CRC_CCITT=m |
| 1083 | CONFIG_CRC16=m | 1122 | CONFIG_CRC16=m |
| 1084 | CONFIG_CRC_T10DIF=y | 1123 | CONFIG_CRC_T10DIF=y |
| @@ -1090,10 +1129,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1090 | CONFIG_ZLIB_DEFLATE=m | 1129 | CONFIG_ZLIB_DEFLATE=m |
| 1091 | CONFIG_LZO_COMPRESS=m | 1130 | CONFIG_LZO_COMPRESS=m |
| 1092 | CONFIG_LZO_DECOMPRESS=m | 1131 | CONFIG_LZO_DECOMPRESS=m |
| 1132 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1133 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1134 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1093 | CONFIG_TEXTSEARCH=y | 1135 | CONFIG_TEXTSEARCH=y |
| 1094 | CONFIG_TEXTSEARCH_KMP=m | 1136 | CONFIG_TEXTSEARCH_KMP=m |
| 1095 | CONFIG_TEXTSEARCH_BM=m | 1137 | CONFIG_TEXTSEARCH_BM=m |
| 1096 | CONFIG_TEXTSEARCH_FSM=m | 1138 | CONFIG_TEXTSEARCH_FSM=m |
| 1097 | CONFIG_PLIST=y | ||
| 1098 | CONFIG_HAS_IOMEM=y | 1139 | CONFIG_HAS_IOMEM=y |
| 1099 | CONFIG_HAS_DMA=y | 1140 | CONFIG_HAS_DMA=y |
| 1141 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index c6de25724a2..9991b64fea5 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:47 2008 | 4 | # Wed Apr 22 20:48:03 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -142,12 +153,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 142 | CONFIG_NEED_MULTIPLE_NODES=y | 153 | CONFIG_NEED_MULTIPLE_NODES=y |
| 143 | CONFIG_PAGEFLAGS_EXTENDED=y | 154 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 145 | # CONFIG_RESOURCES_64BIT is not set | ||
| 146 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 156 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 147 | CONFIG_ZONE_DMA_FLAG=1 | 157 | CONFIG_ZONE_DMA_FLAG=1 |
| 148 | CONFIG_BOUNCE=y | 158 | CONFIG_BOUNCE=y |
| 149 | CONFIG_VIRT_TO_BUS=y | 159 | CONFIG_VIRT_TO_BUS=y |
| 150 | CONFIG_UNEVICTABLE_LRU=y | 160 | CONFIG_UNEVICTABLE_LRU=y |
| 161 | CONFIG_HAVE_MLOCK=y | ||
| 162 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 151 | 163 | ||
| 152 | # | 164 | # |
| 153 | # General setup | 165 | # General setup |
| @@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 267 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 268 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 269 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 272 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 273 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 276 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 277 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 278 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 266 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 280 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 267 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 281 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 268 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 282 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 287 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 288 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 289 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 291 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 292 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 293 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 366 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 352 | CONFIG_IP6_NF_MATCH_MH=m | 367 | CONFIG_IP6_NF_MATCH_MH=m |
| 353 | CONFIG_IP6_NF_MATCH_RT=m | 368 | CONFIG_IP6_NF_MATCH_RT=m |
| 369 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 354 | CONFIG_IP6_NF_TARGET_LOG=m | 370 | CONFIG_IP6_NF_TARGET_LOG=m |
| 355 | CONFIG_IP6_NF_FILTER=m | 371 | CONFIG_IP6_NF_FILTER=m |
| 356 | CONFIG_IP6_NF_TARGET_REJECT=m | 372 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 357 | CONFIG_IP6_NF_MANGLE=m | 373 | CONFIG_IP6_NF_MANGLE=m |
| 358 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 359 | CONFIG_IP6_NF_RAW=m | 374 | CONFIG_IP6_NF_RAW=m |
| 360 | CONFIG_IP_DCCP=m | 375 | CONFIG_IP_DCCP=m |
| 361 | CONFIG_INET_DCCP_DIAG=m | 376 | CONFIG_INET_DCCP_DIAG=m |
| 362 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 363 | 377 | ||
| 364 | # | 378 | # |
| 365 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 379 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 366 | # | 380 | # |
| 367 | CONFIG_IP_DCCP_CCID2=m | ||
| 368 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 381 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 369 | CONFIG_IP_DCCP_CCID3=m | 382 | # CONFIG_IP_DCCP_CCID3 is not set |
| 370 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 371 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 372 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 373 | CONFIG_IP_SCTP=m | 383 | CONFIG_IP_SCTP=m |
| 374 | # CONFIG_SCTP_DBG_MSG is not set | 384 | # CONFIG_SCTP_DBG_MSG is not set |
| 375 | # CONFIG_SCTP_DBG_OBJCNT is not set | 385 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -394,8 +404,10 @@ CONFIG_IPDDP_DECAP=y | |||
| 394 | # CONFIG_LAPB is not set | 404 | # CONFIG_LAPB is not set |
| 395 | # CONFIG_ECONET is not set | 405 | # CONFIG_ECONET is not set |
| 396 | # CONFIG_WAN_ROUTER is not set | 406 | # CONFIG_WAN_ROUTER is not set |
| 407 | # CONFIG_PHONET is not set | ||
| 397 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
| 398 | CONFIG_NET_CLS_ROUTE=y | 409 | CONFIG_NET_CLS_ROUTE=y |
| 410 | # CONFIG_DCB is not set | ||
| 399 | 411 | ||
| 400 | # | 412 | # |
| 401 | # Network testing | 413 | # Network testing |
| @@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 406 | # CONFIG_IRDA is not set | 418 | # CONFIG_IRDA is not set |
| 407 | # CONFIG_BT is not set | 419 | # CONFIG_BT is not set |
| 408 | # CONFIG_AF_RXRPC is not set | 420 | # CONFIG_AF_RXRPC is not set |
| 409 | # CONFIG_PHONET is not set | ||
| 410 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_WIRELESS is not set |
| 422 | # CONFIG_WIMAX is not set | ||
| 411 | # CONFIG_RFKILL is not set | 423 | # CONFIG_RFKILL is not set |
| 412 | # CONFIG_NET_9P is not set | 424 | # CONFIG_NET_9P is not set |
| 413 | 425 | ||
| @@ -429,6 +441,7 @@ CONFIG_CONNECTOR=m | |||
| 429 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
| 430 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 431 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 444 | CONFIG_BLK_DEV_SWIM=y | ||
| 432 | # CONFIG_BLK_DEV_COW_COMMON is not set | 445 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 433 | CONFIG_BLK_DEV_LOOP=y | 446 | CONFIG_BLK_DEV_LOOP=y |
| 434 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 447 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| @@ -443,15 +456,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 443 | CONFIG_ATA_OVER_ETH=m | 456 | CONFIG_ATA_OVER_ETH=m |
| 444 | # CONFIG_BLK_DEV_HD is not set | 457 | # CONFIG_BLK_DEV_HD is not set |
| 445 | CONFIG_MISC_DEVICES=y | 458 | CONFIG_MISC_DEVICES=y |
| 446 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | # CONFIG_ENCLOSURE_SERVICES is not set | 459 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | 460 | # CONFIG_C2PORT is not set |
| 461 | |||
| 462 | # | ||
| 463 | # EEPROM support | ||
| 464 | # | ||
| 465 | # CONFIG_EEPROM_93CX6 is not set | ||
| 449 | CONFIG_HAVE_IDE=y | 466 | CONFIG_HAVE_IDE=y |
| 450 | CONFIG_IDE=y | 467 | CONFIG_IDE=y |
| 451 | 468 | ||
| 452 | # | 469 | # |
| 453 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 470 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 454 | # | 471 | # |
| 472 | CONFIG_IDE_ATAPI=y | ||
| 455 | # CONFIG_BLK_DEV_IDE_SATA is not set | 473 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 456 | CONFIG_IDE_GD=y | 474 | CONFIG_IDE_GD=y |
| 457 | CONFIG_IDE_GD_ATA=y | 475 | CONFIG_IDE_GD_ATA=y |
| @@ -459,7 +477,6 @@ CONFIG_IDE_GD_ATA=y | |||
| 459 | CONFIG_BLK_DEV_IDECD=y | 477 | CONFIG_BLK_DEV_IDECD=y |
| 460 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 478 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 461 | # CONFIG_BLK_DEV_IDETAPE is not set | 479 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 462 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 463 | # CONFIG_IDE_TASK_IOCTL is not set | 480 | # CONFIG_IDE_TASK_IOCTL is not set |
| 464 | CONFIG_IDE_PROC_FS=y | 481 | CONFIG_IDE_PROC_FS=y |
| 465 | 482 | ||
| @@ -514,10 +531,13 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 514 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 531 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 515 | CONFIG_SCSI_LOWLEVEL=y | 532 | CONFIG_SCSI_LOWLEVEL=y |
| 516 | CONFIG_ISCSI_TCP=m | 533 | CONFIG_ISCSI_TCP=m |
| 534 | # CONFIG_LIBFC is not set | ||
| 535 | # CONFIG_LIBFCOE is not set | ||
| 517 | # CONFIG_SCSI_DEBUG is not set | 536 | # CONFIG_SCSI_DEBUG is not set |
| 518 | CONFIG_MAC_SCSI=y | 537 | CONFIG_MAC_SCSI=y |
| 519 | CONFIG_SCSI_MAC_ESP=y | 538 | CONFIG_SCSI_MAC_ESP=y |
| 520 | # CONFIG_SCSI_DH is not set | 539 | # CONFIG_SCSI_DH is not set |
| 540 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 521 | CONFIG_MD=y | 541 | CONFIG_MD=y |
| 522 | CONFIG_BLK_DEV_MD=m | 542 | CONFIG_BLK_DEV_MD=m |
| 523 | CONFIG_MD_LINEAR=m | 543 | CONFIG_MD_LINEAR=m |
| @@ -525,7 +545,7 @@ CONFIG_MD_RAID0=m | |||
| 525 | CONFIG_MD_RAID1=m | 545 | CONFIG_MD_RAID1=m |
| 526 | # CONFIG_MD_RAID10 is not set | 546 | # CONFIG_MD_RAID10 is not set |
| 527 | CONFIG_MD_RAID456=m | 547 | CONFIG_MD_RAID456=m |
| 528 | CONFIG_MD_RAID5_RESHAPE=y | 548 | CONFIG_MD_RAID6_PQ=m |
| 529 | # CONFIG_MD_MULTIPATH is not set | 549 | # CONFIG_MD_MULTIPATH is not set |
| 530 | # CONFIG_MD_FAULTY is not set | 550 | # CONFIG_MD_FAULTY is not set |
| 531 | CONFIG_BLK_DEV_DM=m | 551 | CONFIG_BLK_DEV_DM=m |
| @@ -547,6 +567,7 @@ CONFIG_ADB_CUDA=y | |||
| 547 | CONFIG_INPUT_ADBHID=y | 567 | CONFIG_INPUT_ADBHID=y |
| 548 | CONFIG_MAC_EMUMOUSEBTN=y | 568 | CONFIG_MAC_EMUMOUSEBTN=y |
| 549 | CONFIG_NETDEVICES=y | 569 | CONFIG_NETDEVICES=y |
| 570 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 550 | CONFIG_DUMMY=m | 571 | CONFIG_DUMMY=m |
| 551 | # CONFIG_BONDING is not set | 572 | # CONFIG_BONDING is not set |
| 552 | CONFIG_MACVLAN=m | 573 | CONFIG_MACVLAN=m |
| @@ -561,6 +582,8 @@ CONFIG_MAC89x0=m | |||
| 561 | CONFIG_MACSONIC=m | 582 | CONFIG_MACSONIC=m |
| 562 | CONFIG_MACMACE=y | 583 | CONFIG_MACMACE=y |
| 563 | # CONFIG_NET_VENDOR_SMC is not set | 584 | # CONFIG_NET_VENDOR_SMC is not set |
| 585 | # CONFIG_ETHOC is not set | ||
| 586 | # CONFIG_DNET is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 587 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 565 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 588 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 566 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 589 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -577,7 +600,10 @@ CONFIG_MACMACE=y | |||
| 577 | # | 600 | # |
| 578 | # CONFIG_WLAN_PRE80211 is not set | 601 | # CONFIG_WLAN_PRE80211 is not set |
| 579 | # CONFIG_WLAN_80211 is not set | 602 | # CONFIG_WLAN_80211 is not set |
| 580 | # CONFIG_IWLWIFI_LEDS is not set | 603 | |
| 604 | # | ||
| 605 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 606 | # | ||
| 581 | # CONFIG_WAN is not set | 607 | # CONFIG_WAN is not set |
| 582 | CONFIG_PPP=m | 608 | CONFIG_PPP=m |
| 583 | # CONFIG_PPP_MULTILINK is not set | 609 | # CONFIG_PPP_MULTILINK is not set |
| @@ -635,7 +661,6 @@ CONFIG_MOUSE_PS2=m | |||
| 635 | CONFIG_MOUSE_PS2_ALPS=y | 661 | CONFIG_MOUSE_PS2_ALPS=y |
| 636 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 662 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 637 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 663 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 638 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 639 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 664 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 640 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 665 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 641 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 666 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -677,6 +702,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 677 | # Non-8250 serial port support | 702 | # Non-8250 serial port support |
| 678 | # | 703 | # |
| 679 | CONFIG_UNIX98_PTYS=y | 704 | CONFIG_UNIX98_PTYS=y |
| 705 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 680 | CONFIG_LEGACY_PTYS=y | 706 | CONFIG_LEGACY_PTYS=y |
| 681 | CONFIG_LEGACY_PTY_COUNT=256 | 707 | CONFIG_LEGACY_PTY_COUNT=256 |
| 682 | # CONFIG_IPMI_HANDLER is not set | 708 | # CONFIG_IPMI_HANDLER is not set |
| @@ -760,6 +786,7 @@ CONFIG_FB_MAC=y | |||
| 760 | # CONFIG_FB_VIRTUAL is not set | 786 | # CONFIG_FB_VIRTUAL is not set |
| 761 | # CONFIG_FB_METRONOME is not set | 787 | # CONFIG_FB_METRONOME is not set |
| 762 | # CONFIG_FB_MB862XX is not set | 788 | # CONFIG_FB_MB862XX is not set |
| 789 | # CONFIG_FB_BROADSHEET is not set | ||
| 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 790 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 764 | 791 | ||
| 765 | # | 792 | # |
| @@ -793,7 +820,6 @@ CONFIG_HIDRAW=y | |||
| 793 | # | 820 | # |
| 794 | # Special HID drivers | 821 | # Special HID drivers |
| 795 | # | 822 | # |
| 796 | CONFIG_HID_COMPAT=y | ||
| 797 | # CONFIG_USB_SUPPORT is not set | 823 | # CONFIG_USB_SUPPORT is not set |
| 798 | # CONFIG_MMC is not set | 824 | # CONFIG_MMC is not set |
| 799 | # CONFIG_MEMSTICK is not set | 825 | # CONFIG_MEMSTICK is not set |
| @@ -801,9 +827,9 @@ CONFIG_HID_COMPAT=y | |||
| 801 | # CONFIG_ACCESSIBILITY is not set | 827 | # CONFIG_ACCESSIBILITY is not set |
| 802 | # CONFIG_RTC_CLASS is not set | 828 | # CONFIG_RTC_CLASS is not set |
| 803 | # CONFIG_DMADEVICES is not set | 829 | # CONFIG_DMADEVICES is not set |
| 830 | # CONFIG_AUXDISPLAY is not set | ||
| 804 | # CONFIG_UIO is not set | 831 | # CONFIG_UIO is not set |
| 805 | # CONFIG_STAGING is not set | 832 | # CONFIG_STAGING is not set |
| 806 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 807 | 833 | ||
| 808 | # | 834 | # |
| 809 | # Character devices | 835 | # Character devices |
| @@ -819,6 +845,7 @@ CONFIG_EXT2_FS=y | |||
| 819 | # CONFIG_EXT2_FS_XATTR is not set | 845 | # CONFIG_EXT2_FS_XATTR is not set |
| 820 | # CONFIG_EXT2_FS_XIP is not set | 846 | # CONFIG_EXT2_FS_XIP is not set |
| 821 | CONFIG_EXT3_FS=y | 847 | CONFIG_EXT3_FS=y |
| 848 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 822 | # CONFIG_EXT3_FS_XATTR is not set | 849 | # CONFIG_EXT3_FS_XATTR is not set |
| 823 | # CONFIG_EXT4_FS is not set | 850 | # CONFIG_EXT4_FS is not set |
| 824 | CONFIG_JBD=y | 851 | CONFIG_JBD=y |
| @@ -845,13 +872,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 845 | # CONFIG_OCFS2_FS_STATS is not set | 872 | # CONFIG_OCFS2_FS_STATS is not set |
| 846 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 873 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 847 | # CONFIG_OCFS2_DEBUG_FS is not set | 874 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 848 | # CONFIG_OCFS2_COMPAT_JBD is not set | 875 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 876 | # CONFIG_BTRFS_FS is not set | ||
| 849 | CONFIG_DNOTIFY=y | 877 | CONFIG_DNOTIFY=y |
| 850 | CONFIG_INOTIFY=y | 878 | CONFIG_INOTIFY=y |
| 851 | CONFIG_INOTIFY_USER=y | 879 | CONFIG_INOTIFY_USER=y |
| 852 | CONFIG_QUOTA=y | 880 | CONFIG_QUOTA=y |
| 853 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 881 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 854 | # CONFIG_PRINT_QUOTA_WARNING is not set | 882 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 883 | CONFIG_QUOTA_TREE=m | ||
| 855 | # CONFIG_QFMT_V1 is not set | 884 | # CONFIG_QFMT_V1 is not set |
| 856 | # CONFIG_QFMT_V2 is not set | 885 | # CONFIG_QFMT_V2 is not set |
| 857 | CONFIG_QUOTACTL=y | 886 | CONFIG_QUOTACTL=y |
| @@ -860,6 +889,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 860 | CONFIG_FUSE_FS=m | 889 | CONFIG_FUSE_FS=m |
| 861 | 890 | ||
| 862 | # | 891 | # |
| 892 | # Caches | ||
| 893 | # | ||
| 894 | # CONFIG_FSCACHE is not set | ||
| 895 | |||
| 896 | # | ||
| 863 | # CD-ROM/DVD Filesystems | 897 | # CD-ROM/DVD Filesystems |
| 864 | # | 898 | # |
| 865 | CONFIG_ISO9660_FS=y | 899 | CONFIG_ISO9660_FS=y |
| @@ -890,10 +924,7 @@ CONFIG_TMPFS=y | |||
| 890 | # CONFIG_TMPFS_POSIX_ACL is not set | 924 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 891 | # CONFIG_HUGETLB_PAGE is not set | 925 | # CONFIG_HUGETLB_PAGE is not set |
| 892 | CONFIG_CONFIGFS_FS=m | 926 | CONFIG_CONFIGFS_FS=m |
| 893 | 927 | CONFIG_MISC_FILESYSTEMS=y | |
| 894 | # | ||
| 895 | # Miscellaneous filesystems | ||
| 896 | # | ||
| 897 | # CONFIG_ADFS_FS is not set | 928 | # CONFIG_ADFS_FS is not set |
| 898 | CONFIG_AFFS_FS=m | 929 | CONFIG_AFFS_FS=m |
| 899 | CONFIG_HFS_FS=y | 930 | CONFIG_HFS_FS=y |
| @@ -902,6 +933,9 @@ CONFIG_HFSPLUS_FS=y | |||
| 902 | # CONFIG_BFS_FS is not set | 933 | # CONFIG_BFS_FS is not set |
| 903 | # CONFIG_EFS_FS is not set | 934 | # CONFIG_EFS_FS is not set |
| 904 | CONFIG_CRAMFS=m | 935 | CONFIG_CRAMFS=m |
| 936 | CONFIG_SQUASHFS=m | ||
| 937 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 938 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 905 | # CONFIG_VXFS_FS is not set | 939 | # CONFIG_VXFS_FS is not set |
| 906 | CONFIG_MINIX_FS=y | 940 | CONFIG_MINIX_FS=y |
| 907 | # CONFIG_OMFS_FS is not set | 941 | # CONFIG_OMFS_FS is not set |
| @@ -912,6 +946,7 @@ CONFIG_SYSV_FS=m | |||
| 912 | CONFIG_UFS_FS=m | 946 | CONFIG_UFS_FS=m |
| 913 | # CONFIG_UFS_FS_WRITE is not set | 947 | # CONFIG_UFS_FS_WRITE is not set |
| 914 | # CONFIG_UFS_DEBUG is not set | 948 | # CONFIG_UFS_DEBUG is not set |
| 949 | # CONFIG_NILFS2_FS is not set | ||
| 915 | CONFIG_NETWORK_FILESYSTEMS=y | 950 | CONFIG_NETWORK_FILESYSTEMS=y |
| 916 | CONFIG_NFS_FS=m | 951 | CONFIG_NFS_FS=m |
| 917 | CONFIG_NFS_V3=y | 952 | CONFIG_NFS_V3=y |
| @@ -927,7 +962,6 @@ CONFIG_EXPORTFS=m | |||
| 927 | CONFIG_NFS_COMMON=y | 962 | CONFIG_NFS_COMMON=y |
| 928 | CONFIG_SUNRPC=m | 963 | CONFIG_SUNRPC=m |
| 929 | CONFIG_SUNRPC_GSS=m | 964 | CONFIG_SUNRPC_GSS=m |
| 930 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 931 | CONFIG_RPCSEC_GSS_KRB5=m | 965 | CONFIG_RPCSEC_GSS_KRB5=m |
| 932 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 966 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 933 | CONFIG_SMB_FS=m | 967 | CONFIG_SMB_FS=m |
| @@ -1003,11 +1037,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1003 | CONFIG_DEBUG_MEMORY_INIT=y | 1037 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1004 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1038 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1005 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1039 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1006 | |||
| 1007 | # | ||
| 1008 | # Tracers | ||
| 1009 | # | ||
| 1010 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1011 | # CONFIG_SAMPLES is not set | 1040 | # CONFIG_SAMPLES is not set |
| 1012 | 1041 | ||
| 1013 | # | 1042 | # |
| @@ -1028,13 +1057,21 @@ CONFIG_CRYPTO=y | |||
| 1028 | # | 1057 | # |
| 1029 | # CONFIG_CRYPTO_FIPS is not set | 1058 | # CONFIG_CRYPTO_FIPS is not set |
| 1030 | CONFIG_CRYPTO_ALGAPI=y | 1059 | CONFIG_CRYPTO_ALGAPI=y |
| 1031 | CONFIG_CRYPTO_AEAD=y | 1060 | CONFIG_CRYPTO_ALGAPI2=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1061 | CONFIG_CRYPTO_AEAD=m |
| 1062 | CONFIG_CRYPTO_AEAD2=y | ||
| 1063 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1064 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1033 | CONFIG_CRYPTO_HASH=y | 1065 | CONFIG_CRYPTO_HASH=y |
| 1034 | CONFIG_CRYPTO_RNG=y | 1066 | CONFIG_CRYPTO_HASH2=y |
| 1067 | CONFIG_CRYPTO_RNG=m | ||
| 1068 | CONFIG_CRYPTO_RNG2=y | ||
| 1069 | CONFIG_CRYPTO_PCOMP=y | ||
| 1035 | CONFIG_CRYPTO_MANAGER=y | 1070 | CONFIG_CRYPTO_MANAGER=y |
| 1071 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1036 | CONFIG_CRYPTO_GF128MUL=m | 1072 | CONFIG_CRYPTO_GF128MUL=m |
| 1037 | CONFIG_CRYPTO_NULL=m | 1073 | CONFIG_CRYPTO_NULL=m |
| 1074 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1038 | CONFIG_CRYPTO_CRYPTD=m | 1075 | CONFIG_CRYPTO_CRYPTD=m |
| 1039 | CONFIG_CRYPTO_AUTHENC=m | 1076 | CONFIG_CRYPTO_AUTHENC=m |
| 1040 | CONFIG_CRYPTO_TEST=m | 1077 | CONFIG_CRYPTO_TEST=m |
| @@ -1104,6 +1141,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1104 | # Compression | 1141 | # Compression |
| 1105 | # | 1142 | # |
| 1106 | CONFIG_CRYPTO_DEFLATE=m | 1143 | CONFIG_CRYPTO_DEFLATE=m |
| 1144 | CONFIG_CRYPTO_ZLIB=m | ||
| 1107 | CONFIG_CRYPTO_LZO=m | 1145 | CONFIG_CRYPTO_LZO=m |
| 1108 | 1146 | ||
| 1109 | # | 1147 | # |
| @@ -1111,11 +1149,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1111 | # | 1149 | # |
| 1112 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1150 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1113 | # CONFIG_CRYPTO_HW is not set | 1151 | # CONFIG_CRYPTO_HW is not set |
| 1152 | # CONFIG_BINARY_PRINTF is not set | ||
| 1114 | 1153 | ||
| 1115 | # | 1154 | # |
| 1116 | # Library routines | 1155 | # Library routines |
| 1117 | # | 1156 | # |
| 1118 | CONFIG_BITREVERSE=y | 1157 | CONFIG_BITREVERSE=y |
| 1158 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1119 | CONFIG_CRC_CCITT=m | 1159 | CONFIG_CRC_CCITT=m |
| 1120 | CONFIG_CRC16=m | 1160 | CONFIG_CRC16=m |
| 1121 | CONFIG_CRC_T10DIF=y | 1161 | CONFIG_CRC_T10DIF=y |
| @@ -1127,10 +1167,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1127 | CONFIG_ZLIB_DEFLATE=m | 1167 | CONFIG_ZLIB_DEFLATE=m |
| 1128 | CONFIG_LZO_COMPRESS=m | 1168 | CONFIG_LZO_COMPRESS=m |
| 1129 | CONFIG_LZO_DECOMPRESS=m | 1169 | CONFIG_LZO_DECOMPRESS=m |
| 1170 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1171 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1172 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1130 | CONFIG_TEXTSEARCH=y | 1173 | CONFIG_TEXTSEARCH=y |
| 1131 | CONFIG_TEXTSEARCH_KMP=m | 1174 | CONFIG_TEXTSEARCH_KMP=m |
| 1132 | CONFIG_TEXTSEARCH_BM=m | 1175 | CONFIG_TEXTSEARCH_BM=m |
| 1133 | CONFIG_TEXTSEARCH_FSM=m | 1176 | CONFIG_TEXTSEARCH_FSM=m |
| 1134 | CONFIG_PLIST=y | ||
| 1135 | CONFIG_HAS_IOMEM=y | 1177 | CONFIG_HAS_IOMEM=y |
| 1136 | CONFIG_HAS_DMA=y | 1178 | CONFIG_HAS_DMA=y |
| 1179 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 70693588031..69c43e2d8b4 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:48 2008 | 4 | # Wed Apr 22 20:48:06 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -146,12 +157,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 146 | CONFIG_NEED_MULTIPLE_NODES=y | 157 | CONFIG_NEED_MULTIPLE_NODES=y |
| 147 | CONFIG_PAGEFLAGS_EXTENDED=y | 158 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 148 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 159 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 149 | # CONFIG_RESOURCES_64BIT is not set | ||
| 150 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 160 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 151 | CONFIG_ZONE_DMA_FLAG=1 | 161 | CONFIG_ZONE_DMA_FLAG=1 |
| 152 | CONFIG_BOUNCE=y | 162 | CONFIG_BOUNCE=y |
| 153 | CONFIG_VIRT_TO_BUS=y | 163 | CONFIG_VIRT_TO_BUS=y |
| 154 | CONFIG_UNEVICTABLE_LRU=y | 164 | CONFIG_UNEVICTABLE_LRU=y |
| 165 | CONFIG_HAVE_MLOCK=y | ||
| 166 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 155 | 167 | ||
| 156 | # | 168 | # |
| 157 | # General setup | 169 | # General setup |
| @@ -268,6 +280,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 268 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 280 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 281 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 282 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 283 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 271 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 284 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 272 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 285 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 286 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -276,6 +289,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 276 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 289 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 277 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 290 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 278 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 291 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 279 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 293 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 294 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 295 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -286,6 +300,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 286 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 300 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 287 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 301 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 302 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 303 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 289 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 304 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 291 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -364,25 +379,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 364 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 379 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 365 | CONFIG_IP6_NF_MATCH_MH=m | 380 | CONFIG_IP6_NF_MATCH_MH=m |
| 366 | CONFIG_IP6_NF_MATCH_RT=m | 381 | CONFIG_IP6_NF_MATCH_RT=m |
| 382 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 367 | CONFIG_IP6_NF_TARGET_LOG=m | 383 | CONFIG_IP6_NF_TARGET_LOG=m |
| 368 | CONFIG_IP6_NF_FILTER=m | 384 | CONFIG_IP6_NF_FILTER=m |
| 369 | CONFIG_IP6_NF_TARGET_REJECT=m | 385 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 370 | CONFIG_IP6_NF_MANGLE=m | 386 | CONFIG_IP6_NF_MANGLE=m |
| 371 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 372 | CONFIG_IP6_NF_RAW=m | 387 | CONFIG_IP6_NF_RAW=m |
| 373 | CONFIG_IP_DCCP=m | 388 | CONFIG_IP_DCCP=m |
| 374 | CONFIG_INET_DCCP_DIAG=m | 389 | CONFIG_INET_DCCP_DIAG=m |
| 375 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 376 | 390 | ||
| 377 | # | 391 | # |
| 378 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 392 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 379 | # | 393 | # |
| 380 | CONFIG_IP_DCCP_CCID2=m | ||
| 381 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 394 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 382 | CONFIG_IP_DCCP_CCID3=m | 395 | # CONFIG_IP_DCCP_CCID3 is not set |
| 383 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 384 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 385 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 386 | CONFIG_IP_SCTP=m | 396 | CONFIG_IP_SCTP=m |
| 387 | # CONFIG_SCTP_DBG_MSG is not set | 397 | # CONFIG_SCTP_DBG_MSG is not set |
| 388 | # CONFIG_SCTP_DBG_OBJCNT is not set | 398 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -408,8 +418,10 @@ CONFIG_IPDDP_DECAP=y | |||
| 408 | # CONFIG_LAPB is not set | 418 | # CONFIG_LAPB is not set |
| 409 | # CONFIG_ECONET is not set | 419 | # CONFIG_ECONET is not set |
| 410 | # CONFIG_WAN_ROUTER is not set | 420 | # CONFIG_WAN_ROUTER is not set |
| 421 | # CONFIG_PHONET is not set | ||
| 411 | # CONFIG_NET_SCHED is not set | 422 | # CONFIG_NET_SCHED is not set |
| 412 | CONFIG_NET_CLS_ROUTE=y | 423 | CONFIG_NET_CLS_ROUTE=y |
| 424 | # CONFIG_DCB is not set | ||
| 413 | 425 | ||
| 414 | # | 426 | # |
| 415 | # Network testing | 427 | # Network testing |
| @@ -420,8 +432,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 420 | # CONFIG_IRDA is not set | 432 | # CONFIG_IRDA is not set |
| 421 | # CONFIG_BT is not set | 433 | # CONFIG_BT is not set |
| 422 | # CONFIG_AF_RXRPC is not set | 434 | # CONFIG_AF_RXRPC is not set |
| 423 | # CONFIG_PHONET is not set | ||
| 424 | # CONFIG_WIRELESS is not set | 435 | # CONFIG_WIRELESS is not set |
| 436 | # CONFIG_WIMAX is not set | ||
| 425 | # CONFIG_RFKILL is not set | 437 | # CONFIG_RFKILL is not set |
| 426 | # CONFIG_NET_9P is not set | 438 | # CONFIG_NET_9P is not set |
| 427 | 439 | ||
| @@ -454,6 +466,7 @@ CONFIG_PARPORT_NOT_PC=y | |||
| 454 | CONFIG_BLK_DEV=y | 466 | CONFIG_BLK_DEV=y |
| 455 | CONFIG_AMIGA_FLOPPY=y | 467 | CONFIG_AMIGA_FLOPPY=y |
| 456 | CONFIG_ATARI_FLOPPY=y | 468 | CONFIG_ATARI_FLOPPY=y |
| 469 | CONFIG_BLK_DEV_SWIM=y | ||
| 457 | CONFIG_AMIGA_Z2RAM=y | 470 | CONFIG_AMIGA_Z2RAM=y |
| 458 | # CONFIG_BLK_DEV_COW_COMMON is not set | 471 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 459 | CONFIG_BLK_DEV_LOOP=y | 472 | CONFIG_BLK_DEV_LOOP=y |
| @@ -469,15 +482,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 469 | CONFIG_ATA_OVER_ETH=m | 482 | CONFIG_ATA_OVER_ETH=m |
| 470 | # CONFIG_BLK_DEV_HD is not set | 483 | # CONFIG_BLK_DEV_HD is not set |
| 471 | CONFIG_MISC_DEVICES=y | 484 | CONFIG_MISC_DEVICES=y |
| 472 | # CONFIG_EEPROM_93CX6 is not set | ||
| 473 | # CONFIG_ENCLOSURE_SERVICES is not set | 485 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 474 | # CONFIG_C2PORT is not set | 486 | # CONFIG_C2PORT is not set |
| 487 | |||
| 488 | # | ||
| 489 | # EEPROM support | ||
| 490 | # | ||
| 491 | # CONFIG_EEPROM_93CX6 is not set | ||
| 475 | CONFIG_HAVE_IDE=y | 492 | CONFIG_HAVE_IDE=y |
| 476 | CONFIG_IDE=y | 493 | CONFIG_IDE=y |
| 477 | 494 | ||
| 478 | # | 495 | # |
| 479 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 496 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 480 | # | 497 | # |
| 498 | CONFIG_IDE_ATAPI=y | ||
| 481 | # CONFIG_BLK_DEV_IDE_SATA is not set | 499 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 482 | CONFIG_IDE_GD=y | 500 | CONFIG_IDE_GD=y |
| 483 | CONFIG_IDE_GD_ATA=y | 501 | CONFIG_IDE_GD_ATA=y |
| @@ -485,7 +503,6 @@ CONFIG_IDE_GD_ATA=y | |||
| 485 | CONFIG_BLK_DEV_IDECD=y | 503 | CONFIG_BLK_DEV_IDECD=y |
| 486 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 504 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 487 | # CONFIG_BLK_DEV_IDETAPE is not set | 505 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 488 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 489 | # CONFIG_IDE_TASK_IOCTL is not set | 506 | # CONFIG_IDE_TASK_IOCTL is not set |
| 490 | CONFIG_IDE_PROC_FS=y | 507 | CONFIG_IDE_PROC_FS=y |
| 491 | 508 | ||
| @@ -494,7 +511,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 494 | # | 511 | # |
| 495 | # CONFIG_BLK_DEV_PLATFORM is not set | 512 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 496 | CONFIG_BLK_DEV_GAYLE=y | 513 | CONFIG_BLK_DEV_GAYLE=y |
| 497 | CONFIG_BLK_DEV_IDEDOUBLER=y | ||
| 498 | CONFIG_BLK_DEV_BUDDHA=y | 514 | CONFIG_BLK_DEV_BUDDHA=y |
| 499 | CONFIG_BLK_DEV_FALCON_IDE=y | 515 | CONFIG_BLK_DEV_FALCON_IDE=y |
| 500 | CONFIG_BLK_DEV_MAC_IDE=y | 516 | CONFIG_BLK_DEV_MAC_IDE=y |
| @@ -549,6 +565,8 @@ CONFIG_ISCSI_TCP=m | |||
| 549 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 565 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 550 | # CONFIG_SCSI_ADVANSYS is not set | 566 | # CONFIG_SCSI_ADVANSYS is not set |
| 551 | # CONFIG_SCSI_IN2000 is not set | 567 | # CONFIG_SCSI_IN2000 is not set |
| 568 | # CONFIG_LIBFC is not set | ||
| 569 | # CONFIG_LIBFCOE is not set | ||
| 552 | # CONFIG_SCSI_DTC3280 is not set | 570 | # CONFIG_SCSI_DTC3280 is not set |
| 553 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 571 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 554 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | 572 | # CONFIG_SCSI_GENERIC_NCR5380 is not set |
| @@ -575,6 +593,7 @@ CONFIG_MVME16x_SCSI=y | |||
| 575 | CONFIG_BVME6000_SCSI=y | 593 | CONFIG_BVME6000_SCSI=y |
| 576 | CONFIG_SUN3X_ESP=y | 594 | CONFIG_SUN3X_ESP=y |
| 577 | # CONFIG_SCSI_DH is not set | 595 | # CONFIG_SCSI_DH is not set |
| 596 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 578 | CONFIG_MD=y | 597 | CONFIG_MD=y |
| 579 | CONFIG_BLK_DEV_MD=m | 598 | CONFIG_BLK_DEV_MD=m |
| 580 | CONFIG_MD_LINEAR=m | 599 | CONFIG_MD_LINEAR=m |
| @@ -582,7 +601,7 @@ CONFIG_MD_RAID0=m | |||
| 582 | CONFIG_MD_RAID1=m | 601 | CONFIG_MD_RAID1=m |
| 583 | # CONFIG_MD_RAID10 is not set | 602 | # CONFIG_MD_RAID10 is not set |
| 584 | CONFIG_MD_RAID456=m | 603 | CONFIG_MD_RAID456=m |
| 585 | CONFIG_MD_RAID5_RESHAPE=y | 604 | CONFIG_MD_RAID6_PQ=m |
| 586 | # CONFIG_MD_MULTIPATH is not set | 605 | # CONFIG_MD_MULTIPATH is not set |
| 587 | # CONFIG_MD_FAULTY is not set | 606 | # CONFIG_MD_FAULTY is not set |
| 588 | CONFIG_BLK_DEV_DM=m | 607 | CONFIG_BLK_DEV_DM=m |
| @@ -604,6 +623,7 @@ CONFIG_ADB_CUDA=y | |||
| 604 | CONFIG_INPUT_ADBHID=y | 623 | CONFIG_INPUT_ADBHID=y |
| 605 | CONFIG_MAC_EMUMOUSEBTN=y | 624 | CONFIG_MAC_EMUMOUSEBTN=y |
| 606 | CONFIG_NETDEVICES=y | 625 | CONFIG_NETDEVICES=y |
| 626 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 607 | CONFIG_DUMMY=m | 627 | CONFIG_DUMMY=m |
| 608 | # CONFIG_BONDING is not set | 628 | # CONFIG_BONDING is not set |
| 609 | CONFIG_MACVLAN=m | 629 | CONFIG_MACVLAN=m |
| @@ -614,24 +634,26 @@ CONFIG_VETH=m | |||
| 614 | # CONFIG_PHYLIB is not set | 634 | # CONFIG_PHYLIB is not set |
| 615 | CONFIG_NET_ETHERNET=y | 635 | CONFIG_NET_ETHERNET=y |
| 616 | CONFIG_MII=y | 636 | CONFIG_MII=y |
| 617 | CONFIG_ARIADNE=m | 637 | CONFIG_ARIADNE=y |
| 618 | CONFIG_A2065=m | 638 | CONFIG_A2065=y |
| 619 | CONFIG_HYDRA=m | 639 | CONFIG_HYDRA=y |
| 620 | CONFIG_ZORRO8390=m | 640 | CONFIG_ZORRO8390=y |
| 621 | CONFIG_APNE=m | 641 | CONFIG_APNE=y |
| 622 | CONFIG_MAC8390=y | 642 | CONFIG_MAC8390=y |
| 623 | CONFIG_MAC89x0=m | 643 | CONFIG_MAC89x0=y |
| 624 | CONFIG_MACSONIC=m | 644 | CONFIG_MACSONIC=y |
| 625 | CONFIG_MACMACE=y | 645 | CONFIG_MACMACE=y |
| 626 | CONFIG_MVME147_NET=y | 646 | CONFIG_MVME147_NET=y |
| 627 | CONFIG_MVME16x_NET=y | 647 | CONFIG_MVME16x_NET=y |
| 628 | CONFIG_BVME6000_NET=y | 648 | CONFIG_BVME6000_NET=y |
| 629 | CONFIG_ATARILANCE=m | 649 | CONFIG_ATARILANCE=y |
| 630 | CONFIG_SUN3LANCE=y | 650 | CONFIG_SUN3LANCE=y |
| 631 | CONFIG_HPLANCE=y | 651 | CONFIG_HPLANCE=y |
| 632 | # CONFIG_NET_VENDOR_3COM is not set | 652 | # CONFIG_NET_VENDOR_3COM is not set |
| 633 | # CONFIG_NET_VENDOR_SMC is not set | 653 | # CONFIG_NET_VENDOR_SMC is not set |
| 654 | # CONFIG_ETHOC is not set | ||
| 634 | # CONFIG_NET_VENDOR_RACAL is not set | 655 | # CONFIG_NET_VENDOR_RACAL is not set |
| 656 | # CONFIG_DNET is not set | ||
| 635 | # CONFIG_AT1700 is not set | 657 | # CONFIG_AT1700 is not set |
| 636 | # CONFIG_DEPCA is not set | 658 | # CONFIG_DEPCA is not set |
| 637 | # CONFIG_HP100 is not set | 659 | # CONFIG_HP100 is not set |
| @@ -657,7 +679,10 @@ CONFIG_NE2000=m | |||
| 657 | # | 679 | # |
| 658 | # CONFIG_WLAN_PRE80211 is not set | 680 | # CONFIG_WLAN_PRE80211 is not set |
| 659 | # CONFIG_WLAN_80211 is not set | 681 | # CONFIG_WLAN_80211 is not set |
| 660 | # CONFIG_IWLWIFI_LEDS is not set | 682 | |
| 683 | # | ||
| 684 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 685 | # | ||
| 661 | # CONFIG_WAN is not set | 686 | # CONFIG_WAN is not set |
| 662 | # CONFIG_PLIP is not set | 687 | # CONFIG_PLIP is not set |
| 663 | CONFIG_PPP=m | 688 | CONFIG_PPP=m |
| @@ -717,11 +742,10 @@ CONFIG_KEYBOARD_ATARI=y | |||
| 717 | CONFIG_KEYBOARD_HIL_OLD=y | 742 | CONFIG_KEYBOARD_HIL_OLD=y |
| 718 | CONFIG_KEYBOARD_HIL=y | 743 | CONFIG_KEYBOARD_HIL=y |
| 719 | CONFIG_INPUT_MOUSE=y | 744 | CONFIG_INPUT_MOUSE=y |
| 720 | CONFIG_MOUSE_PS2=y | 745 | CONFIG_MOUSE_PS2=m |
| 721 | CONFIG_MOUSE_PS2_ALPS=y | 746 | CONFIG_MOUSE_PS2_ALPS=y |
| 722 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 747 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 723 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 748 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 724 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 725 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 749 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 726 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 750 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 727 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 751 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -732,7 +756,7 @@ CONFIG_MOUSE_SERIAL=m | |||
| 732 | CONFIG_MOUSE_AMIGA=m | 756 | CONFIG_MOUSE_AMIGA=m |
| 733 | CONFIG_MOUSE_ATARI=m | 757 | CONFIG_MOUSE_ATARI=m |
| 734 | # CONFIG_MOUSE_VSXXXAA is not set | 758 | # CONFIG_MOUSE_VSXXXAA is not set |
| 735 | CONFIG_MOUSE_HIL=m | 759 | CONFIG_MOUSE_HIL=y |
| 736 | CONFIG_INPUT_JOYSTICK=y | 760 | CONFIG_INPUT_JOYSTICK=y |
| 737 | # CONFIG_JOYSTICK_ANALOG is not set | 761 | # CONFIG_JOYSTICK_ANALOG is not set |
| 738 | # CONFIG_JOYSTICK_A3D is not set | 762 | # CONFIG_JOYSTICK_A3D is not set |
| @@ -763,18 +787,18 @@ CONFIG_JOYSTICK_AMIGA=m | |||
| 763 | CONFIG_INPUT_MISC=y | 787 | CONFIG_INPUT_MISC=y |
| 764 | CONFIG_INPUT_M68K_BEEP=m | 788 | CONFIG_INPUT_M68K_BEEP=m |
| 765 | # CONFIG_INPUT_UINPUT is not set | 789 | # CONFIG_INPUT_UINPUT is not set |
| 766 | CONFIG_HP_SDC_RTC=m | 790 | CONFIG_HP_SDC_RTC=y |
| 767 | 791 | ||
| 768 | # | 792 | # |
| 769 | # Hardware I/O ports | 793 | # Hardware I/O ports |
| 770 | # | 794 | # |
| 771 | CONFIG_SERIO=y | 795 | CONFIG_SERIO=y |
| 772 | # CONFIG_SERIO_SERPORT is not set | 796 | # CONFIG_SERIO_SERPORT is not set |
| 773 | CONFIG_SERIO_Q40KBD=m | 797 | CONFIG_SERIO_Q40KBD=y |
| 774 | # CONFIG_SERIO_PARKBD is not set | 798 | # CONFIG_SERIO_PARKBD is not set |
| 775 | CONFIG_HP_SDC=y | 799 | CONFIG_HP_SDC=y |
| 776 | CONFIG_HIL_MLC=y | 800 | CONFIG_HIL_MLC=y |
| 777 | CONFIG_SERIO_LIBPS2=y | 801 | CONFIG_SERIO_LIBPS2=m |
| 778 | # CONFIG_SERIO_RAW is not set | 802 | # CONFIG_SERIO_RAW is not set |
| 779 | # CONFIG_GAMEPORT is not set | 803 | # CONFIG_GAMEPORT is not set |
| 780 | 804 | ||
| @@ -788,7 +812,7 @@ CONFIG_HW_CONSOLE=y | |||
| 788 | CONFIG_VT_HW_CONSOLE_BINDING=y | 812 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 789 | # CONFIG_DEVKMEM is not set | 813 | # CONFIG_DEVKMEM is not set |
| 790 | # CONFIG_SERIAL_NONSTANDARD is not set | 814 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 791 | CONFIG_A2232=m | 815 | CONFIG_A2232=y |
| 792 | 816 | ||
| 793 | # | 817 | # |
| 794 | # Serial drivers | 818 | # Serial drivers |
| @@ -799,6 +823,7 @@ CONFIG_A2232=m | |||
| 799 | # Non-8250 serial port support | 823 | # Non-8250 serial port support |
| 800 | # | 824 | # |
| 801 | CONFIG_UNIX98_PTYS=y | 825 | CONFIG_UNIX98_PTYS=y |
| 826 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 802 | CONFIG_LEGACY_PTYS=y | 827 | CONFIG_LEGACY_PTYS=y |
| 803 | CONFIG_LEGACY_PTY_COUNT=256 | 828 | CONFIG_LEGACY_PTY_COUNT=256 |
| 804 | CONFIG_PRINTER=m | 829 | CONFIG_PRINTER=m |
| @@ -807,7 +832,7 @@ CONFIG_PRINTER=m | |||
| 807 | # CONFIG_IPMI_HANDLER is not set | 832 | # CONFIG_IPMI_HANDLER is not set |
| 808 | # CONFIG_HW_RANDOM is not set | 833 | # CONFIG_HW_RANDOM is not set |
| 809 | CONFIG_NVRAM=y | 834 | CONFIG_NVRAM=y |
| 810 | CONFIG_GEN_RTC=m | 835 | CONFIG_GEN_RTC=y |
| 811 | CONFIG_GEN_RTC_X=y | 836 | CONFIG_GEN_RTC_X=y |
| 812 | # CONFIG_DTLK is not set | 837 | # CONFIG_DTLK is not set |
| 813 | # CONFIG_R3964 is not set | 838 | # CONFIG_R3964 is not set |
| @@ -898,6 +923,7 @@ CONFIG_FB_HP300=y | |||
| 898 | # CONFIG_FB_VIRTUAL is not set | 923 | # CONFIG_FB_VIRTUAL is not set |
| 899 | # CONFIG_FB_METRONOME is not set | 924 | # CONFIG_FB_METRONOME is not set |
| 900 | # CONFIG_FB_MB862XX is not set | 925 | # CONFIG_FB_MB862XX is not set |
| 926 | # CONFIG_FB_BROADSHEET is not set | ||
| 901 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 927 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 902 | 928 | ||
| 903 | # | 929 | # |
| @@ -937,7 +963,6 @@ CONFIG_HIDRAW=y | |||
| 937 | # | 963 | # |
| 938 | # Special HID drivers | 964 | # Special HID drivers |
| 939 | # | 965 | # |
| 940 | CONFIG_HID_COMPAT=y | ||
| 941 | # CONFIG_USB_SUPPORT is not set | 966 | # CONFIG_USB_SUPPORT is not set |
| 942 | # CONFIG_MMC is not set | 967 | # CONFIG_MMC is not set |
| 943 | # CONFIG_MEMSTICK is not set | 968 | # CONFIG_MEMSTICK is not set |
| @@ -948,13 +973,12 @@ CONFIG_HID_COMPAT=y | |||
| 948 | # CONFIG_AUXDISPLAY is not set | 973 | # CONFIG_AUXDISPLAY is not set |
| 949 | # CONFIG_UIO is not set | 974 | # CONFIG_UIO is not set |
| 950 | # CONFIG_STAGING is not set | 975 | # CONFIG_STAGING is not set |
| 951 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 952 | 976 | ||
| 953 | # | 977 | # |
| 954 | # Character devices | 978 | # Character devices |
| 955 | # | 979 | # |
| 956 | CONFIG_ATARI_MFPSER=m | 980 | CONFIG_ATARI_MFPSER=y |
| 957 | CONFIG_ATARI_MIDI=m | 981 | CONFIG_ATARI_MIDI=y |
| 958 | CONFIG_ATARI_DSP56K=m | 982 | CONFIG_ATARI_DSP56K=m |
| 959 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 983 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
| 960 | CONFIG_MULTIFACE_III_TTY=m | 984 | CONFIG_MULTIFACE_III_TTY=m |
| @@ -974,6 +998,7 @@ CONFIG_EXT2_FS=y | |||
| 974 | # CONFIG_EXT2_FS_XATTR is not set | 998 | # CONFIG_EXT2_FS_XATTR is not set |
| 975 | # CONFIG_EXT2_FS_XIP is not set | 999 | # CONFIG_EXT2_FS_XIP is not set |
| 976 | CONFIG_EXT3_FS=y | 1000 | CONFIG_EXT3_FS=y |
| 1001 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 977 | # CONFIG_EXT3_FS_XATTR is not set | 1002 | # CONFIG_EXT3_FS_XATTR is not set |
| 978 | # CONFIG_EXT4_FS is not set | 1003 | # CONFIG_EXT4_FS is not set |
| 979 | CONFIG_JBD=y | 1004 | CONFIG_JBD=y |
| @@ -1000,13 +1025,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 1000 | # CONFIG_OCFS2_FS_STATS is not set | 1025 | # CONFIG_OCFS2_FS_STATS is not set |
| 1001 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 1026 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 1002 | # CONFIG_OCFS2_DEBUG_FS is not set | 1027 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1003 | # CONFIG_OCFS2_COMPAT_JBD is not set | 1028 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 1029 | # CONFIG_BTRFS_FS is not set | ||
| 1004 | CONFIG_DNOTIFY=y | 1030 | CONFIG_DNOTIFY=y |
| 1005 | CONFIG_INOTIFY=y | 1031 | CONFIG_INOTIFY=y |
| 1006 | CONFIG_INOTIFY_USER=y | 1032 | CONFIG_INOTIFY_USER=y |
| 1007 | CONFIG_QUOTA=y | 1033 | CONFIG_QUOTA=y |
| 1008 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 1034 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 1009 | # CONFIG_PRINT_QUOTA_WARNING is not set | 1035 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 1036 | CONFIG_QUOTA_TREE=m | ||
| 1010 | # CONFIG_QFMT_V1 is not set | 1037 | # CONFIG_QFMT_V1 is not set |
| 1011 | # CONFIG_QFMT_V2 is not set | 1038 | # CONFIG_QFMT_V2 is not set |
| 1012 | CONFIG_QUOTACTL=y | 1039 | CONFIG_QUOTACTL=y |
| @@ -1015,6 +1042,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 1015 | CONFIG_FUSE_FS=m | 1042 | CONFIG_FUSE_FS=m |
| 1016 | 1043 | ||
| 1017 | # | 1044 | # |
| 1045 | # Caches | ||
| 1046 | # | ||
| 1047 | # CONFIG_FSCACHE is not set | ||
| 1048 | |||
| 1049 | # | ||
| 1018 | # CD-ROM/DVD Filesystems | 1050 | # CD-ROM/DVD Filesystems |
| 1019 | # | 1051 | # |
| 1020 | CONFIG_ISO9660_FS=y | 1052 | CONFIG_ISO9660_FS=y |
| @@ -1045,10 +1077,7 @@ CONFIG_TMPFS=y | |||
| 1045 | # CONFIG_TMPFS_POSIX_ACL is not set | 1077 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1046 | # CONFIG_HUGETLB_PAGE is not set | 1078 | # CONFIG_HUGETLB_PAGE is not set |
| 1047 | CONFIG_CONFIGFS_FS=m | 1079 | CONFIG_CONFIGFS_FS=m |
| 1048 | 1080 | CONFIG_MISC_FILESYSTEMS=y | |
| 1049 | # | ||
| 1050 | # Miscellaneous filesystems | ||
| 1051 | # | ||
| 1052 | # CONFIG_ADFS_FS is not set | 1081 | # CONFIG_ADFS_FS is not set |
| 1053 | CONFIG_AFFS_FS=m | 1082 | CONFIG_AFFS_FS=m |
| 1054 | CONFIG_HFS_FS=y | 1083 | CONFIG_HFS_FS=y |
| @@ -1057,6 +1086,9 @@ CONFIG_HFSPLUS_FS=y | |||
| 1057 | # CONFIG_BFS_FS is not set | 1086 | # CONFIG_BFS_FS is not set |
| 1058 | # CONFIG_EFS_FS is not set | 1087 | # CONFIG_EFS_FS is not set |
| 1059 | CONFIG_CRAMFS=m | 1088 | CONFIG_CRAMFS=m |
| 1089 | CONFIG_SQUASHFS=m | ||
| 1090 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 1091 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 1060 | # CONFIG_VXFS_FS is not set | 1092 | # CONFIG_VXFS_FS is not set |
| 1061 | CONFIG_MINIX_FS=y | 1093 | CONFIG_MINIX_FS=y |
| 1062 | # CONFIG_OMFS_FS is not set | 1094 | # CONFIG_OMFS_FS is not set |
| @@ -1067,6 +1099,7 @@ CONFIG_SYSV_FS=m | |||
| 1067 | CONFIG_UFS_FS=m | 1099 | CONFIG_UFS_FS=m |
| 1068 | # CONFIG_UFS_FS_WRITE is not set | 1100 | # CONFIG_UFS_FS_WRITE is not set |
| 1069 | # CONFIG_UFS_DEBUG is not set | 1101 | # CONFIG_UFS_DEBUG is not set |
| 1102 | # CONFIG_NILFS2_FS is not set | ||
| 1070 | CONFIG_NETWORK_FILESYSTEMS=y | 1103 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1071 | CONFIG_NFS_FS=y | 1104 | CONFIG_NFS_FS=y |
| 1072 | CONFIG_NFS_V3=y | 1105 | CONFIG_NFS_V3=y |
| @@ -1083,7 +1116,6 @@ CONFIG_EXPORTFS=m | |||
| 1083 | CONFIG_NFS_COMMON=y | 1116 | CONFIG_NFS_COMMON=y |
| 1084 | CONFIG_SUNRPC=y | 1117 | CONFIG_SUNRPC=y |
| 1085 | CONFIG_SUNRPC_GSS=y | 1118 | CONFIG_SUNRPC_GSS=y |
| 1086 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1087 | CONFIG_RPCSEC_GSS_KRB5=y | 1119 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1088 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1120 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1089 | CONFIG_SMB_FS=m | 1121 | CONFIG_SMB_FS=m |
| @@ -1163,11 +1195,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1163 | CONFIG_DEBUG_MEMORY_INIT=y | 1195 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1164 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1196 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1165 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1197 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1166 | |||
| 1167 | # | ||
| 1168 | # Tracers | ||
| 1169 | # | ||
| 1170 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1171 | # CONFIG_SAMPLES is not set | 1198 | # CONFIG_SAMPLES is not set |
| 1172 | 1199 | ||
| 1173 | # | 1200 | # |
| @@ -1188,13 +1215,21 @@ CONFIG_CRYPTO=y | |||
| 1188 | # | 1215 | # |
| 1189 | # CONFIG_CRYPTO_FIPS is not set | 1216 | # CONFIG_CRYPTO_FIPS is not set |
| 1190 | CONFIG_CRYPTO_ALGAPI=y | 1217 | CONFIG_CRYPTO_ALGAPI=y |
| 1191 | CONFIG_CRYPTO_AEAD=y | 1218 | CONFIG_CRYPTO_ALGAPI2=y |
| 1219 | CONFIG_CRYPTO_AEAD=m | ||
| 1220 | CONFIG_CRYPTO_AEAD2=y | ||
| 1192 | CONFIG_CRYPTO_BLKCIPHER=y | 1221 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1222 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1193 | CONFIG_CRYPTO_HASH=y | 1223 | CONFIG_CRYPTO_HASH=y |
| 1194 | CONFIG_CRYPTO_RNG=y | 1224 | CONFIG_CRYPTO_HASH2=y |
| 1225 | CONFIG_CRYPTO_RNG=m | ||
| 1226 | CONFIG_CRYPTO_RNG2=y | ||
| 1227 | CONFIG_CRYPTO_PCOMP=y | ||
| 1195 | CONFIG_CRYPTO_MANAGER=y | 1228 | CONFIG_CRYPTO_MANAGER=y |
| 1229 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1196 | CONFIG_CRYPTO_GF128MUL=m | 1230 | CONFIG_CRYPTO_GF128MUL=m |
| 1197 | CONFIG_CRYPTO_NULL=m | 1231 | CONFIG_CRYPTO_NULL=m |
| 1232 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1198 | CONFIG_CRYPTO_CRYPTD=m | 1233 | CONFIG_CRYPTO_CRYPTD=m |
| 1199 | CONFIG_CRYPTO_AUTHENC=m | 1234 | CONFIG_CRYPTO_AUTHENC=m |
| 1200 | CONFIG_CRYPTO_TEST=m | 1235 | CONFIG_CRYPTO_TEST=m |
| @@ -1264,6 +1299,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1264 | # Compression | 1299 | # Compression |
| 1265 | # | 1300 | # |
| 1266 | CONFIG_CRYPTO_DEFLATE=m | 1301 | CONFIG_CRYPTO_DEFLATE=m |
| 1302 | CONFIG_CRYPTO_ZLIB=m | ||
| 1267 | CONFIG_CRYPTO_LZO=m | 1303 | CONFIG_CRYPTO_LZO=m |
| 1268 | 1304 | ||
| 1269 | # | 1305 | # |
| @@ -1271,11 +1307,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1271 | # | 1307 | # |
| 1272 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1308 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1273 | # CONFIG_CRYPTO_HW is not set | 1309 | # CONFIG_CRYPTO_HW is not set |
| 1310 | # CONFIG_BINARY_PRINTF is not set | ||
| 1274 | 1311 | ||
| 1275 | # | 1312 | # |
| 1276 | # Library routines | 1313 | # Library routines |
| 1277 | # | 1314 | # |
| 1278 | CONFIG_BITREVERSE=y | 1315 | CONFIG_BITREVERSE=y |
| 1316 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1279 | CONFIG_CRC_CCITT=m | 1317 | CONFIG_CRC_CCITT=m |
| 1280 | CONFIG_CRC16=y | 1318 | CONFIG_CRC16=y |
| 1281 | CONFIG_CRC_T10DIF=y | 1319 | CONFIG_CRC_T10DIF=y |
| @@ -1287,10 +1325,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1287 | CONFIG_ZLIB_DEFLATE=m | 1325 | CONFIG_ZLIB_DEFLATE=m |
| 1288 | CONFIG_LZO_COMPRESS=m | 1326 | CONFIG_LZO_COMPRESS=m |
| 1289 | CONFIG_LZO_DECOMPRESS=m | 1327 | CONFIG_LZO_DECOMPRESS=m |
| 1328 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1329 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1330 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1290 | CONFIG_TEXTSEARCH=y | 1331 | CONFIG_TEXTSEARCH=y |
| 1291 | CONFIG_TEXTSEARCH_KMP=m | 1332 | CONFIG_TEXTSEARCH_KMP=m |
| 1292 | CONFIG_TEXTSEARCH_BM=m | 1333 | CONFIG_TEXTSEARCH_BM=m |
| 1293 | CONFIG_TEXTSEARCH_FSM=m | 1334 | CONFIG_TEXTSEARCH_FSM=m |
| 1294 | CONFIG_PLIST=y | ||
| 1295 | CONFIG_HAS_IOMEM=y | 1335 | CONFIG_HAS_IOMEM=y |
| 1296 | CONFIG_HAS_DMA=y | 1336 | CONFIG_HAS_DMA=y |
| 1337 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 52d42715bd0..7dceb5d7122 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:50 2008 | 4 | # Wed Apr 22 20:48:08 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 143 | CONFIG_NEED_MULTIPLE_NODES=y | 154 | CONFIG_NEED_MULTIPLE_NODES=y |
| 144 | CONFIG_PAGEFLAGS_EXTENDED=y | 155 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 146 | # CONFIG_RESOURCES_64BIT is not set | ||
| 147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 157 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 148 | CONFIG_ZONE_DMA_FLAG=1 | 158 | CONFIG_ZONE_DMA_FLAG=1 |
| 149 | CONFIG_BOUNCE=y | 159 | CONFIG_BOUNCE=y |
| 150 | CONFIG_VIRT_TO_BUS=y | 160 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | 161 | CONFIG_UNEVICTABLE_LRU=y |
| 162 | CONFIG_HAVE_MLOCK=y | ||
| 163 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 152 | 164 | ||
| 153 | # | 165 | # |
| 154 | # General setup | 166 | # General setup |
| @@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 270 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 272 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 274 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 275 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 276 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 279 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 280 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 281 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 269 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 283 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 270 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 284 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 271 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 285 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 290 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 292 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 294 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 295 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 296 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 369 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 355 | CONFIG_IP6_NF_MATCH_MH=m | 370 | CONFIG_IP6_NF_MATCH_MH=m |
| 356 | CONFIG_IP6_NF_MATCH_RT=m | 371 | CONFIG_IP6_NF_MATCH_RT=m |
| 372 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 357 | CONFIG_IP6_NF_TARGET_LOG=m | 373 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | 374 | CONFIG_IP6_NF_FILTER=m |
| 359 | CONFIG_IP6_NF_TARGET_REJECT=m | 375 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 360 | CONFIG_IP6_NF_MANGLE=m | 376 | CONFIG_IP6_NF_MANGLE=m |
| 361 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 362 | CONFIG_IP6_NF_RAW=m | 377 | CONFIG_IP6_NF_RAW=m |
| 363 | CONFIG_IP_DCCP=m | 378 | CONFIG_IP_DCCP=m |
| 364 | CONFIG_INET_DCCP_DIAG=m | 379 | CONFIG_INET_DCCP_DIAG=m |
| 365 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 366 | 380 | ||
| 367 | # | 381 | # |
| 368 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 382 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 369 | # | 383 | # |
| 370 | CONFIG_IP_DCCP_CCID2=m | ||
| 371 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 384 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 372 | CONFIG_IP_DCCP_CCID3=m | 385 | # CONFIG_IP_DCCP_CCID3 is not set |
| 373 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 374 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 375 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 376 | CONFIG_IP_SCTP=m | 386 | CONFIG_IP_SCTP=m |
| 377 | # CONFIG_SCTP_DBG_MSG is not set | 387 | # CONFIG_SCTP_DBG_MSG is not set |
| 378 | # CONFIG_SCTP_DBG_OBJCNT is not set | 388 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -394,8 +404,10 @@ CONFIG_ATALK=m | |||
| 394 | # CONFIG_LAPB is not set | 404 | # CONFIG_LAPB is not set |
| 395 | # CONFIG_ECONET is not set | 405 | # CONFIG_ECONET is not set |
| 396 | # CONFIG_WAN_ROUTER is not set | 406 | # CONFIG_WAN_ROUTER is not set |
| 407 | # CONFIG_PHONET is not set | ||
| 397 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
| 398 | CONFIG_NET_CLS_ROUTE=y | 409 | CONFIG_NET_CLS_ROUTE=y |
| 410 | # CONFIG_DCB is not set | ||
| 399 | 411 | ||
| 400 | # | 412 | # |
| 401 | # Network testing | 413 | # Network testing |
| @@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 406 | # CONFIG_IRDA is not set | 418 | # CONFIG_IRDA is not set |
| 407 | # CONFIG_BT is not set | 419 | # CONFIG_BT is not set |
| 408 | # CONFIG_AF_RXRPC is not set | 420 | # CONFIG_AF_RXRPC is not set |
| 409 | # CONFIG_PHONET is not set | ||
| 410 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_WIRELESS is not set |
| 422 | # CONFIG_WIMAX is not set | ||
| 411 | # CONFIG_RFKILL is not set | 423 | # CONFIG_RFKILL is not set |
| 412 | # CONFIG_NET_9P is not set | 424 | # CONFIG_NET_9P is not set |
| 413 | 425 | ||
| @@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 443 | CONFIG_ATA_OVER_ETH=m | 455 | CONFIG_ATA_OVER_ETH=m |
| 444 | # CONFIG_BLK_DEV_HD is not set | 456 | # CONFIG_BLK_DEV_HD is not set |
| 445 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
| 446 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | # CONFIG_ENCLOSURE_SERVICES is not set | 458 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | 459 | # CONFIG_C2PORT is not set |
| 460 | |||
| 461 | # | ||
| 462 | # EEPROM support | ||
| 463 | # | ||
| 464 | # CONFIG_EEPROM_93CX6 is not set | ||
| 449 | CONFIG_HAVE_IDE=y | 465 | CONFIG_HAVE_IDE=y |
| 450 | # CONFIG_IDE is not set | 466 | # CONFIG_IDE is not set |
| 451 | 467 | ||
| @@ -493,9 +509,12 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 493 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 509 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 494 | CONFIG_SCSI_LOWLEVEL=y | 510 | CONFIG_SCSI_LOWLEVEL=y |
| 495 | CONFIG_ISCSI_TCP=m | 511 | CONFIG_ISCSI_TCP=m |
| 512 | # CONFIG_LIBFC is not set | ||
| 513 | # CONFIG_LIBFCOE is not set | ||
| 496 | # CONFIG_SCSI_DEBUG is not set | 514 | # CONFIG_SCSI_DEBUG is not set |
| 497 | CONFIG_MVME147_SCSI=y | 515 | CONFIG_MVME147_SCSI=y |
| 498 | # CONFIG_SCSI_DH is not set | 516 | # CONFIG_SCSI_DH is not set |
| 517 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 499 | CONFIG_MD=y | 518 | CONFIG_MD=y |
| 500 | CONFIG_BLK_DEV_MD=m | 519 | CONFIG_BLK_DEV_MD=m |
| 501 | CONFIG_MD_LINEAR=m | 520 | CONFIG_MD_LINEAR=m |
| @@ -503,7 +522,7 @@ CONFIG_MD_RAID0=m | |||
| 503 | CONFIG_MD_RAID1=m | 522 | CONFIG_MD_RAID1=m |
| 504 | # CONFIG_MD_RAID10 is not set | 523 | # CONFIG_MD_RAID10 is not set |
| 505 | CONFIG_MD_RAID456=m | 524 | CONFIG_MD_RAID456=m |
| 506 | CONFIG_MD_RAID5_RESHAPE=y | 525 | CONFIG_MD_RAID6_PQ=m |
| 507 | # CONFIG_MD_MULTIPATH is not set | 526 | # CONFIG_MD_MULTIPATH is not set |
| 508 | # CONFIG_MD_FAULTY is not set | 527 | # CONFIG_MD_FAULTY is not set |
| 509 | CONFIG_BLK_DEV_DM=m | 528 | CONFIG_BLK_DEV_DM=m |
| @@ -516,6 +535,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 516 | # CONFIG_DM_DELAY is not set | 535 | # CONFIG_DM_DELAY is not set |
| 517 | CONFIG_DM_UEVENT=y | 536 | CONFIG_DM_UEVENT=y |
| 518 | CONFIG_NETDEVICES=y | 537 | CONFIG_NETDEVICES=y |
| 538 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 519 | CONFIG_DUMMY=m | 539 | CONFIG_DUMMY=m |
| 520 | # CONFIG_BONDING is not set | 540 | # CONFIG_BONDING is not set |
| 521 | CONFIG_MACVLAN=m | 541 | CONFIG_MACVLAN=m |
| @@ -526,6 +546,8 @@ CONFIG_VETH=m | |||
| 526 | CONFIG_NET_ETHERNET=y | 546 | CONFIG_NET_ETHERNET=y |
| 527 | # CONFIG_MII is not set | 547 | # CONFIG_MII is not set |
| 528 | CONFIG_MVME147_NET=y | 548 | CONFIG_MVME147_NET=y |
| 549 | # CONFIG_ETHOC is not set | ||
| 550 | # CONFIG_DNET is not set | ||
| 529 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 551 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 530 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 552 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 531 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 553 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -542,7 +564,10 @@ CONFIG_MVME147_NET=y | |||
| 542 | # | 564 | # |
| 543 | # CONFIG_WLAN_PRE80211 is not set | 565 | # CONFIG_WLAN_PRE80211 is not set |
| 544 | # CONFIG_WLAN_80211 is not set | 566 | # CONFIG_WLAN_80211 is not set |
| 545 | # CONFIG_IWLWIFI_LEDS is not set | 567 | |
| 568 | # | ||
| 569 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 570 | # | ||
| 546 | # CONFIG_WAN is not set | 571 | # CONFIG_WAN is not set |
| 547 | CONFIG_PPP=m | 572 | CONFIG_PPP=m |
| 548 | # CONFIG_PPP_MULTILINK is not set | 573 | # CONFIG_PPP_MULTILINK is not set |
| @@ -600,7 +625,6 @@ CONFIG_MOUSE_PS2=m | |||
| 600 | CONFIG_MOUSE_PS2_ALPS=y | 625 | CONFIG_MOUSE_PS2_ALPS=y |
| 601 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 626 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 602 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 627 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 603 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 604 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 628 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 605 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 629 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 606 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -640,6 +664,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 640 | # Non-8250 serial port support | 664 | # Non-8250 serial port support |
| 641 | # | 665 | # |
| 642 | CONFIG_UNIX98_PTYS=y | 666 | CONFIG_UNIX98_PTYS=y |
| 667 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 643 | CONFIG_LEGACY_PTYS=y | 668 | CONFIG_LEGACY_PTYS=y |
| 644 | CONFIG_LEGACY_PTY_COUNT=256 | 669 | CONFIG_LEGACY_PTY_COUNT=256 |
| 645 | # CONFIG_IPMI_HANDLER is not set | 670 | # CONFIG_IPMI_HANDLER is not set |
| @@ -716,7 +741,6 @@ CONFIG_HIDRAW=y | |||
| 716 | # | 741 | # |
| 717 | # Special HID drivers | 742 | # Special HID drivers |
| 718 | # | 743 | # |
| 719 | CONFIG_HID_COMPAT=y | ||
| 720 | # CONFIG_USB_SUPPORT is not set | 744 | # CONFIG_USB_SUPPORT is not set |
| 721 | # CONFIG_MMC is not set | 745 | # CONFIG_MMC is not set |
| 722 | # CONFIG_MEMSTICK is not set | 746 | # CONFIG_MEMSTICK is not set |
| @@ -724,9 +748,9 @@ CONFIG_HID_COMPAT=y | |||
| 724 | # CONFIG_ACCESSIBILITY is not set | 748 | # CONFIG_ACCESSIBILITY is not set |
| 725 | # CONFIG_RTC_CLASS is not set | 749 | # CONFIG_RTC_CLASS is not set |
| 726 | # CONFIG_DMADEVICES is not set | 750 | # CONFIG_DMADEVICES is not set |
| 751 | # CONFIG_AUXDISPLAY is not set | ||
| 727 | # CONFIG_UIO is not set | 752 | # CONFIG_UIO is not set |
| 728 | # CONFIG_STAGING is not set | 753 | # CONFIG_STAGING is not set |
| 729 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 730 | 754 | ||
| 731 | # | 755 | # |
| 732 | # Character devices | 756 | # Character devices |
| @@ -741,6 +765,7 @@ CONFIG_EXT2_FS=y | |||
| 741 | # CONFIG_EXT2_FS_XATTR is not set | 765 | # CONFIG_EXT2_FS_XATTR is not set |
| 742 | # CONFIG_EXT2_FS_XIP is not set | 766 | # CONFIG_EXT2_FS_XIP is not set |
| 743 | CONFIG_EXT3_FS=y | 767 | CONFIG_EXT3_FS=y |
| 768 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 744 | # CONFIG_EXT3_FS_XATTR is not set | 769 | # CONFIG_EXT3_FS_XATTR is not set |
| 745 | # CONFIG_EXT4_FS is not set | 770 | # CONFIG_EXT4_FS is not set |
| 746 | CONFIG_JBD=y | 771 | CONFIG_JBD=y |
| @@ -767,13 +792,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 767 | # CONFIG_OCFS2_FS_STATS is not set | 792 | # CONFIG_OCFS2_FS_STATS is not set |
| 768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 793 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 769 | # CONFIG_OCFS2_DEBUG_FS is not set | 794 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 770 | # CONFIG_OCFS2_COMPAT_JBD is not set | 795 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 796 | # CONFIG_BTRFS_FS is not set | ||
| 771 | CONFIG_DNOTIFY=y | 797 | CONFIG_DNOTIFY=y |
| 772 | CONFIG_INOTIFY=y | 798 | CONFIG_INOTIFY=y |
| 773 | CONFIG_INOTIFY_USER=y | 799 | CONFIG_INOTIFY_USER=y |
| 774 | CONFIG_QUOTA=y | 800 | CONFIG_QUOTA=y |
| 775 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 801 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 776 | # CONFIG_PRINT_QUOTA_WARNING is not set | 802 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 803 | CONFIG_QUOTA_TREE=m | ||
| 777 | # CONFIG_QFMT_V1 is not set | 804 | # CONFIG_QFMT_V1 is not set |
| 778 | # CONFIG_QFMT_V2 is not set | 805 | # CONFIG_QFMT_V2 is not set |
| 779 | CONFIG_QUOTACTL=y | 806 | CONFIG_QUOTACTL=y |
| @@ -782,6 +809,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 782 | CONFIG_FUSE_FS=m | 809 | CONFIG_FUSE_FS=m |
| 783 | 810 | ||
| 784 | # | 811 | # |
| 812 | # Caches | ||
| 813 | # | ||
| 814 | # CONFIG_FSCACHE is not set | ||
| 815 | |||
| 816 | # | ||
| 785 | # CD-ROM/DVD Filesystems | 817 | # CD-ROM/DVD Filesystems |
| 786 | # | 818 | # |
| 787 | CONFIG_ISO9660_FS=y | 819 | CONFIG_ISO9660_FS=y |
| @@ -812,10 +844,7 @@ CONFIG_TMPFS=y | |||
| 812 | # CONFIG_TMPFS_POSIX_ACL is not set | 844 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 813 | # CONFIG_HUGETLB_PAGE is not set | 845 | # CONFIG_HUGETLB_PAGE is not set |
| 814 | CONFIG_CONFIGFS_FS=m | 846 | CONFIG_CONFIGFS_FS=m |
| 815 | 847 | CONFIG_MISC_FILESYSTEMS=y | |
| 816 | # | ||
| 817 | # Miscellaneous filesystems | ||
| 818 | # | ||
| 819 | # CONFIG_ADFS_FS is not set | 848 | # CONFIG_ADFS_FS is not set |
| 820 | CONFIG_AFFS_FS=m | 849 | CONFIG_AFFS_FS=m |
| 821 | CONFIG_HFS_FS=m | 850 | CONFIG_HFS_FS=m |
| @@ -824,6 +853,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 824 | # CONFIG_BFS_FS is not set | 853 | # CONFIG_BFS_FS is not set |
| 825 | # CONFIG_EFS_FS is not set | 854 | # CONFIG_EFS_FS is not set |
| 826 | CONFIG_CRAMFS=m | 855 | CONFIG_CRAMFS=m |
| 856 | CONFIG_SQUASHFS=m | ||
| 857 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 858 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 827 | # CONFIG_VXFS_FS is not set | 859 | # CONFIG_VXFS_FS is not set |
| 828 | CONFIG_MINIX_FS=y | 860 | CONFIG_MINIX_FS=y |
| 829 | # CONFIG_OMFS_FS is not set | 861 | # CONFIG_OMFS_FS is not set |
| @@ -834,6 +866,7 @@ CONFIG_SYSV_FS=m | |||
| 834 | CONFIG_UFS_FS=m | 866 | CONFIG_UFS_FS=m |
| 835 | # CONFIG_UFS_FS_WRITE is not set | 867 | # CONFIG_UFS_FS_WRITE is not set |
| 836 | # CONFIG_UFS_DEBUG is not set | 868 | # CONFIG_UFS_DEBUG is not set |
| 869 | # CONFIG_NILFS2_FS is not set | ||
| 837 | CONFIG_NETWORK_FILESYSTEMS=y | 870 | CONFIG_NETWORK_FILESYSTEMS=y |
| 838 | CONFIG_NFS_FS=y | 871 | CONFIG_NFS_FS=y |
| 839 | CONFIG_NFS_V3=y | 872 | CONFIG_NFS_V3=y |
| @@ -850,7 +883,6 @@ CONFIG_EXPORTFS=m | |||
| 850 | CONFIG_NFS_COMMON=y | 883 | CONFIG_NFS_COMMON=y |
| 851 | CONFIG_SUNRPC=y | 884 | CONFIG_SUNRPC=y |
| 852 | CONFIG_SUNRPC_GSS=y | 885 | CONFIG_SUNRPC_GSS=y |
| 853 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 854 | CONFIG_RPCSEC_GSS_KRB5=y | 886 | CONFIG_RPCSEC_GSS_KRB5=y |
| 855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 887 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 856 | CONFIG_SMB_FS=m | 888 | CONFIG_SMB_FS=m |
| @@ -926,11 +958,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 926 | CONFIG_DEBUG_MEMORY_INIT=y | 958 | CONFIG_DEBUG_MEMORY_INIT=y |
| 927 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 959 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 928 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 960 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 929 | |||
| 930 | # | ||
| 931 | # Tracers | ||
| 932 | # | ||
| 933 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 934 | # CONFIG_SAMPLES is not set | 961 | # CONFIG_SAMPLES is not set |
| 935 | 962 | ||
| 936 | # | 963 | # |
| @@ -951,13 +978,21 @@ CONFIG_CRYPTO=y | |||
| 951 | # | 978 | # |
| 952 | # CONFIG_CRYPTO_FIPS is not set | 979 | # CONFIG_CRYPTO_FIPS is not set |
| 953 | CONFIG_CRYPTO_ALGAPI=y | 980 | CONFIG_CRYPTO_ALGAPI=y |
| 954 | CONFIG_CRYPTO_AEAD=y | 981 | CONFIG_CRYPTO_ALGAPI2=y |
| 982 | CONFIG_CRYPTO_AEAD=m | ||
| 983 | CONFIG_CRYPTO_AEAD2=y | ||
| 955 | CONFIG_CRYPTO_BLKCIPHER=y | 984 | CONFIG_CRYPTO_BLKCIPHER=y |
| 985 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 956 | CONFIG_CRYPTO_HASH=y | 986 | CONFIG_CRYPTO_HASH=y |
| 957 | CONFIG_CRYPTO_RNG=y | 987 | CONFIG_CRYPTO_HASH2=y |
| 988 | CONFIG_CRYPTO_RNG=m | ||
| 989 | CONFIG_CRYPTO_RNG2=y | ||
| 990 | CONFIG_CRYPTO_PCOMP=y | ||
| 958 | CONFIG_CRYPTO_MANAGER=y | 991 | CONFIG_CRYPTO_MANAGER=y |
| 992 | CONFIG_CRYPTO_MANAGER2=y | ||
| 959 | CONFIG_CRYPTO_GF128MUL=m | 993 | CONFIG_CRYPTO_GF128MUL=m |
| 960 | CONFIG_CRYPTO_NULL=m | 994 | CONFIG_CRYPTO_NULL=m |
| 995 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 961 | CONFIG_CRYPTO_CRYPTD=m | 996 | CONFIG_CRYPTO_CRYPTD=m |
| 962 | CONFIG_CRYPTO_AUTHENC=m | 997 | CONFIG_CRYPTO_AUTHENC=m |
| 963 | CONFIG_CRYPTO_TEST=m | 998 | CONFIG_CRYPTO_TEST=m |
| @@ -1027,6 +1062,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1027 | # Compression | 1062 | # Compression |
| 1028 | # | 1063 | # |
| 1029 | CONFIG_CRYPTO_DEFLATE=m | 1064 | CONFIG_CRYPTO_DEFLATE=m |
| 1065 | CONFIG_CRYPTO_ZLIB=m | ||
| 1030 | CONFIG_CRYPTO_LZO=m | 1066 | CONFIG_CRYPTO_LZO=m |
| 1031 | 1067 | ||
| 1032 | # | 1068 | # |
| @@ -1034,11 +1070,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1034 | # | 1070 | # |
| 1035 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1071 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1036 | # CONFIG_CRYPTO_HW is not set | 1072 | # CONFIG_CRYPTO_HW is not set |
| 1073 | # CONFIG_BINARY_PRINTF is not set | ||
| 1037 | 1074 | ||
| 1038 | # | 1075 | # |
| 1039 | # Library routines | 1076 | # Library routines |
| 1040 | # | 1077 | # |
| 1041 | CONFIG_BITREVERSE=y | 1078 | CONFIG_BITREVERSE=y |
| 1079 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1042 | CONFIG_CRC_CCITT=m | 1080 | CONFIG_CRC_CCITT=m |
| 1043 | CONFIG_CRC16=m | 1081 | CONFIG_CRC16=m |
| 1044 | CONFIG_CRC_T10DIF=y | 1082 | CONFIG_CRC_T10DIF=y |
| @@ -1050,10 +1088,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1050 | CONFIG_ZLIB_DEFLATE=m | 1088 | CONFIG_ZLIB_DEFLATE=m |
| 1051 | CONFIG_LZO_COMPRESS=m | 1089 | CONFIG_LZO_COMPRESS=m |
| 1052 | CONFIG_LZO_DECOMPRESS=m | 1090 | CONFIG_LZO_DECOMPRESS=m |
| 1091 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1092 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1093 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1053 | CONFIG_TEXTSEARCH=y | 1094 | CONFIG_TEXTSEARCH=y |
| 1054 | CONFIG_TEXTSEARCH_KMP=m | 1095 | CONFIG_TEXTSEARCH_KMP=m |
| 1055 | CONFIG_TEXTSEARCH_BM=m | 1096 | CONFIG_TEXTSEARCH_BM=m |
| 1056 | CONFIG_TEXTSEARCH_FSM=m | 1097 | CONFIG_TEXTSEARCH_FSM=m |
| 1057 | CONFIG_PLIST=y | ||
| 1058 | CONFIG_HAS_IOMEM=y | 1098 | CONFIG_HAS_IOMEM=y |
| 1059 | CONFIG_HAS_DMA=y | 1099 | CONFIG_HAS_DMA=y |
| 1100 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 3403ed2eda7..890594fcacb 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:51 2008 | 4 | # Wed Apr 22 20:48:10 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -143,12 +154,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 143 | CONFIG_NEED_MULTIPLE_NODES=y | 154 | CONFIG_NEED_MULTIPLE_NODES=y |
| 144 | CONFIG_PAGEFLAGS_EXTENDED=y | 155 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 145 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 146 | # CONFIG_RESOURCES_64BIT is not set | ||
| 147 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 157 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 148 | CONFIG_ZONE_DMA_FLAG=1 | 158 | CONFIG_ZONE_DMA_FLAG=1 |
| 149 | CONFIG_BOUNCE=y | 159 | CONFIG_BOUNCE=y |
| 150 | CONFIG_VIRT_TO_BUS=y | 160 | CONFIG_VIRT_TO_BUS=y |
| 151 | CONFIG_UNEVICTABLE_LRU=y | 161 | CONFIG_UNEVICTABLE_LRU=y |
| 162 | CONFIG_HAVE_MLOCK=y | ||
| 163 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 152 | 164 | ||
| 153 | # | 165 | # |
| 154 | # General setup | 166 | # General setup |
| @@ -258,6 +270,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 258 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 270 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 272 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 273 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 261 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 274 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 275 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 276 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -266,6 +279,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 266 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 279 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 280 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 281 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 282 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 269 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 283 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 270 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 284 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 271 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 285 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -276,6 +290,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 276 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 290 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 292 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 293 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 279 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 294 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 295 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 296 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -354,25 +369,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 354 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 369 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 355 | CONFIG_IP6_NF_MATCH_MH=m | 370 | CONFIG_IP6_NF_MATCH_MH=m |
| 356 | CONFIG_IP6_NF_MATCH_RT=m | 371 | CONFIG_IP6_NF_MATCH_RT=m |
| 372 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 357 | CONFIG_IP6_NF_TARGET_LOG=m | 373 | CONFIG_IP6_NF_TARGET_LOG=m |
| 358 | CONFIG_IP6_NF_FILTER=m | 374 | CONFIG_IP6_NF_FILTER=m |
| 359 | CONFIG_IP6_NF_TARGET_REJECT=m | 375 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 360 | CONFIG_IP6_NF_MANGLE=m | 376 | CONFIG_IP6_NF_MANGLE=m |
| 361 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 362 | CONFIG_IP6_NF_RAW=m | 377 | CONFIG_IP6_NF_RAW=m |
| 363 | CONFIG_IP_DCCP=m | 378 | CONFIG_IP_DCCP=m |
| 364 | CONFIG_INET_DCCP_DIAG=m | 379 | CONFIG_INET_DCCP_DIAG=m |
| 365 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 366 | 380 | ||
| 367 | # | 381 | # |
| 368 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 382 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 369 | # | 383 | # |
| 370 | CONFIG_IP_DCCP_CCID2=m | ||
| 371 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 384 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 372 | CONFIG_IP_DCCP_CCID3=m | 385 | # CONFIG_IP_DCCP_CCID3 is not set |
| 373 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 374 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 375 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 376 | CONFIG_IP_SCTP=m | 386 | CONFIG_IP_SCTP=m |
| 377 | # CONFIG_SCTP_DBG_MSG is not set | 387 | # CONFIG_SCTP_DBG_MSG is not set |
| 378 | # CONFIG_SCTP_DBG_OBJCNT is not set | 388 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -394,8 +404,10 @@ CONFIG_ATALK=m | |||
| 394 | # CONFIG_LAPB is not set | 404 | # CONFIG_LAPB is not set |
| 395 | # CONFIG_ECONET is not set | 405 | # CONFIG_ECONET is not set |
| 396 | # CONFIG_WAN_ROUTER is not set | 406 | # CONFIG_WAN_ROUTER is not set |
| 407 | # CONFIG_PHONET is not set | ||
| 397 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
| 398 | CONFIG_NET_CLS_ROUTE=y | 409 | CONFIG_NET_CLS_ROUTE=y |
| 410 | # CONFIG_DCB is not set | ||
| 399 | 411 | ||
| 400 | # | 412 | # |
| 401 | # Network testing | 413 | # Network testing |
| @@ -406,8 +418,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 406 | # CONFIG_IRDA is not set | 418 | # CONFIG_IRDA is not set |
| 407 | # CONFIG_BT is not set | 419 | # CONFIG_BT is not set |
| 408 | # CONFIG_AF_RXRPC is not set | 420 | # CONFIG_AF_RXRPC is not set |
| 409 | # CONFIG_PHONET is not set | ||
| 410 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_WIRELESS is not set |
| 422 | # CONFIG_WIMAX is not set | ||
| 411 | # CONFIG_RFKILL is not set | 423 | # CONFIG_RFKILL is not set |
| 412 | # CONFIG_NET_9P is not set | 424 | # CONFIG_NET_9P is not set |
| 413 | 425 | ||
| @@ -443,9 +455,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 443 | CONFIG_ATA_OVER_ETH=m | 455 | CONFIG_ATA_OVER_ETH=m |
| 444 | # CONFIG_BLK_DEV_HD is not set | 456 | # CONFIG_BLK_DEV_HD is not set |
| 445 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
| 446 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | # CONFIG_ENCLOSURE_SERVICES is not set | 458 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 448 | # CONFIG_C2PORT is not set | 459 | # CONFIG_C2PORT is not set |
| 460 | |||
| 461 | # | ||
| 462 | # EEPROM support | ||
| 463 | # | ||
| 464 | # CONFIG_EEPROM_93CX6 is not set | ||
| 449 | CONFIG_HAVE_IDE=y | 465 | CONFIG_HAVE_IDE=y |
| 450 | # CONFIG_IDE is not set | 466 | # CONFIG_IDE is not set |
| 451 | 467 | ||
| @@ -493,10 +509,13 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 493 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 509 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 494 | CONFIG_SCSI_LOWLEVEL=y | 510 | CONFIG_SCSI_LOWLEVEL=y |
| 495 | CONFIG_ISCSI_TCP=m | 511 | CONFIG_ISCSI_TCP=m |
| 512 | # CONFIG_LIBFC is not set | ||
| 513 | # CONFIG_LIBFCOE is not set | ||
| 496 | CONFIG_53C700_BE_BUS=y | 514 | CONFIG_53C700_BE_BUS=y |
| 497 | # CONFIG_SCSI_DEBUG is not set | 515 | # CONFIG_SCSI_DEBUG is not set |
| 498 | CONFIG_MVME16x_SCSI=y | 516 | CONFIG_MVME16x_SCSI=y |
| 499 | # CONFIG_SCSI_DH is not set | 517 | # CONFIG_SCSI_DH is not set |
| 518 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 500 | CONFIG_MD=y | 519 | CONFIG_MD=y |
| 501 | CONFIG_BLK_DEV_MD=m | 520 | CONFIG_BLK_DEV_MD=m |
| 502 | CONFIG_MD_LINEAR=m | 521 | CONFIG_MD_LINEAR=m |
| @@ -504,7 +523,7 @@ CONFIG_MD_RAID0=m | |||
| 504 | CONFIG_MD_RAID1=m | 523 | CONFIG_MD_RAID1=m |
| 505 | # CONFIG_MD_RAID10 is not set | 524 | # CONFIG_MD_RAID10 is not set |
| 506 | CONFIG_MD_RAID456=m | 525 | CONFIG_MD_RAID456=m |
| 507 | CONFIG_MD_RAID5_RESHAPE=y | 526 | CONFIG_MD_RAID6_PQ=m |
| 508 | # CONFIG_MD_MULTIPATH is not set | 527 | # CONFIG_MD_MULTIPATH is not set |
| 509 | # CONFIG_MD_FAULTY is not set | 528 | # CONFIG_MD_FAULTY is not set |
| 510 | CONFIG_BLK_DEV_DM=m | 529 | CONFIG_BLK_DEV_DM=m |
| @@ -517,6 +536,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 517 | # CONFIG_DM_DELAY is not set | 536 | # CONFIG_DM_DELAY is not set |
| 518 | CONFIG_DM_UEVENT=y | 537 | CONFIG_DM_UEVENT=y |
| 519 | CONFIG_NETDEVICES=y | 538 | CONFIG_NETDEVICES=y |
| 539 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 520 | CONFIG_DUMMY=m | 540 | CONFIG_DUMMY=m |
| 521 | # CONFIG_BONDING is not set | 541 | # CONFIG_BONDING is not set |
| 522 | CONFIG_MACVLAN=m | 542 | CONFIG_MACVLAN=m |
| @@ -527,6 +547,8 @@ CONFIG_VETH=m | |||
| 527 | CONFIG_NET_ETHERNET=y | 547 | CONFIG_NET_ETHERNET=y |
| 528 | # CONFIG_MII is not set | 548 | # CONFIG_MII is not set |
| 529 | CONFIG_MVME16x_NET=y | 549 | CONFIG_MVME16x_NET=y |
| 550 | # CONFIG_ETHOC is not set | ||
| 551 | # CONFIG_DNET is not set | ||
| 530 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 552 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 553 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 554 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -543,7 +565,10 @@ CONFIG_MVME16x_NET=y | |||
| 543 | # | 565 | # |
| 544 | # CONFIG_WLAN_PRE80211 is not set | 566 | # CONFIG_WLAN_PRE80211 is not set |
| 545 | # CONFIG_WLAN_80211 is not set | 567 | # CONFIG_WLAN_80211 is not set |
| 546 | # CONFIG_IWLWIFI_LEDS is not set | 568 | |
| 569 | # | ||
| 570 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 571 | # | ||
| 547 | # CONFIG_WAN is not set | 572 | # CONFIG_WAN is not set |
| 548 | CONFIG_PPP=m | 573 | CONFIG_PPP=m |
| 549 | # CONFIG_PPP_MULTILINK is not set | 574 | # CONFIG_PPP_MULTILINK is not set |
| @@ -601,7 +626,6 @@ CONFIG_MOUSE_PS2=m | |||
| 601 | CONFIG_MOUSE_PS2_ALPS=y | 626 | CONFIG_MOUSE_PS2_ALPS=y |
| 602 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 627 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 603 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 628 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 604 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 605 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 629 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 606 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 630 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 607 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 631 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -641,6 +665,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 641 | # Non-8250 serial port support | 665 | # Non-8250 serial port support |
| 642 | # | 666 | # |
| 643 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
| 668 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 644 | CONFIG_LEGACY_PTYS=y | 669 | CONFIG_LEGACY_PTYS=y |
| 645 | CONFIG_LEGACY_PTY_COUNT=256 | 670 | CONFIG_LEGACY_PTY_COUNT=256 |
| 646 | # CONFIG_IPMI_HANDLER is not set | 671 | # CONFIG_IPMI_HANDLER is not set |
| @@ -717,7 +742,6 @@ CONFIG_HIDRAW=y | |||
| 717 | # | 742 | # |
| 718 | # Special HID drivers | 743 | # Special HID drivers |
| 719 | # | 744 | # |
| 720 | CONFIG_HID_COMPAT=y | ||
| 721 | # CONFIG_USB_SUPPORT is not set | 745 | # CONFIG_USB_SUPPORT is not set |
| 722 | # CONFIG_MMC is not set | 746 | # CONFIG_MMC is not set |
| 723 | # CONFIG_MEMSTICK is not set | 747 | # CONFIG_MEMSTICK is not set |
| @@ -725,9 +749,9 @@ CONFIG_HID_COMPAT=y | |||
| 725 | # CONFIG_ACCESSIBILITY is not set | 749 | # CONFIG_ACCESSIBILITY is not set |
| 726 | # CONFIG_RTC_CLASS is not set | 750 | # CONFIG_RTC_CLASS is not set |
| 727 | # CONFIG_DMADEVICES is not set | 751 | # CONFIG_DMADEVICES is not set |
| 752 | # CONFIG_AUXDISPLAY is not set | ||
| 728 | # CONFIG_UIO is not set | 753 | # CONFIG_UIO is not set |
| 729 | # CONFIG_STAGING is not set | 754 | # CONFIG_STAGING is not set |
| 730 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 731 | 755 | ||
| 732 | # | 756 | # |
| 733 | # Character devices | 757 | # Character devices |
| @@ -743,6 +767,7 @@ CONFIG_EXT2_FS=y | |||
| 743 | # CONFIG_EXT2_FS_XATTR is not set | 767 | # CONFIG_EXT2_FS_XATTR is not set |
| 744 | # CONFIG_EXT2_FS_XIP is not set | 768 | # CONFIG_EXT2_FS_XIP is not set |
| 745 | CONFIG_EXT3_FS=y | 769 | CONFIG_EXT3_FS=y |
| 770 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 746 | # CONFIG_EXT3_FS_XATTR is not set | 771 | # CONFIG_EXT3_FS_XATTR is not set |
| 747 | # CONFIG_EXT4_FS is not set | 772 | # CONFIG_EXT4_FS is not set |
| 748 | CONFIG_JBD=y | 773 | CONFIG_JBD=y |
| @@ -769,13 +794,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 769 | # CONFIG_OCFS2_FS_STATS is not set | 794 | # CONFIG_OCFS2_FS_STATS is not set |
| 770 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 795 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 771 | # CONFIG_OCFS2_DEBUG_FS is not set | 796 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 772 | # CONFIG_OCFS2_COMPAT_JBD is not set | 797 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 798 | # CONFIG_BTRFS_FS is not set | ||
| 773 | CONFIG_DNOTIFY=y | 799 | CONFIG_DNOTIFY=y |
| 774 | CONFIG_INOTIFY=y | 800 | CONFIG_INOTIFY=y |
| 775 | CONFIG_INOTIFY_USER=y | 801 | CONFIG_INOTIFY_USER=y |
| 776 | CONFIG_QUOTA=y | 802 | CONFIG_QUOTA=y |
| 777 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 803 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 778 | # CONFIG_PRINT_QUOTA_WARNING is not set | 804 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 805 | CONFIG_QUOTA_TREE=m | ||
| 779 | # CONFIG_QFMT_V1 is not set | 806 | # CONFIG_QFMT_V1 is not set |
| 780 | # CONFIG_QFMT_V2 is not set | 807 | # CONFIG_QFMT_V2 is not set |
| 781 | CONFIG_QUOTACTL=y | 808 | CONFIG_QUOTACTL=y |
| @@ -784,6 +811,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 784 | CONFIG_FUSE_FS=m | 811 | CONFIG_FUSE_FS=m |
| 785 | 812 | ||
| 786 | # | 813 | # |
| 814 | # Caches | ||
| 815 | # | ||
| 816 | # CONFIG_FSCACHE is not set | ||
| 817 | |||
| 818 | # | ||
| 787 | # CD-ROM/DVD Filesystems | 819 | # CD-ROM/DVD Filesystems |
| 788 | # | 820 | # |
| 789 | CONFIG_ISO9660_FS=y | 821 | CONFIG_ISO9660_FS=y |
| @@ -814,10 +846,7 @@ CONFIG_TMPFS=y | |||
| 814 | # CONFIG_TMPFS_POSIX_ACL is not set | 846 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 815 | # CONFIG_HUGETLB_PAGE is not set | 847 | # CONFIG_HUGETLB_PAGE is not set |
| 816 | CONFIG_CONFIGFS_FS=m | 848 | CONFIG_CONFIGFS_FS=m |
| 817 | 849 | CONFIG_MISC_FILESYSTEMS=y | |
| 818 | # | ||
| 819 | # Miscellaneous filesystems | ||
| 820 | # | ||
| 821 | # CONFIG_ADFS_FS is not set | 850 | # CONFIG_ADFS_FS is not set |
| 822 | CONFIG_AFFS_FS=m | 851 | CONFIG_AFFS_FS=m |
| 823 | CONFIG_HFS_FS=m | 852 | CONFIG_HFS_FS=m |
| @@ -826,6 +855,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 826 | # CONFIG_BFS_FS is not set | 855 | # CONFIG_BFS_FS is not set |
| 827 | # CONFIG_EFS_FS is not set | 856 | # CONFIG_EFS_FS is not set |
| 828 | CONFIG_CRAMFS=m | 857 | CONFIG_CRAMFS=m |
| 858 | CONFIG_SQUASHFS=m | ||
| 859 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 860 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 829 | # CONFIG_VXFS_FS is not set | 861 | # CONFIG_VXFS_FS is not set |
| 830 | CONFIG_MINIX_FS=y | 862 | CONFIG_MINIX_FS=y |
| 831 | # CONFIG_OMFS_FS is not set | 863 | # CONFIG_OMFS_FS is not set |
| @@ -836,6 +868,7 @@ CONFIG_SYSV_FS=m | |||
| 836 | CONFIG_UFS_FS=m | 868 | CONFIG_UFS_FS=m |
| 837 | # CONFIG_UFS_FS_WRITE is not set | 869 | # CONFIG_UFS_FS_WRITE is not set |
| 838 | # CONFIG_UFS_DEBUG is not set | 870 | # CONFIG_UFS_DEBUG is not set |
| 871 | # CONFIG_NILFS2_FS is not set | ||
| 839 | CONFIG_NETWORK_FILESYSTEMS=y | 872 | CONFIG_NETWORK_FILESYSTEMS=y |
| 840 | CONFIG_NFS_FS=y | 873 | CONFIG_NFS_FS=y |
| 841 | CONFIG_NFS_V3=y | 874 | CONFIG_NFS_V3=y |
| @@ -852,7 +885,6 @@ CONFIG_EXPORTFS=m | |||
| 852 | CONFIG_NFS_COMMON=y | 885 | CONFIG_NFS_COMMON=y |
| 853 | CONFIG_SUNRPC=y | 886 | CONFIG_SUNRPC=y |
| 854 | CONFIG_SUNRPC_GSS=y | 887 | CONFIG_SUNRPC_GSS=y |
| 855 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 856 | CONFIG_RPCSEC_GSS_KRB5=y | 888 | CONFIG_RPCSEC_GSS_KRB5=y |
| 857 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 889 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 858 | CONFIG_SMB_FS=m | 890 | CONFIG_SMB_FS=m |
| @@ -928,11 +960,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 928 | CONFIG_DEBUG_MEMORY_INIT=y | 960 | CONFIG_DEBUG_MEMORY_INIT=y |
| 929 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 961 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 930 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 962 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 931 | |||
| 932 | # | ||
| 933 | # Tracers | ||
| 934 | # | ||
| 935 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 936 | # CONFIG_SAMPLES is not set | 963 | # CONFIG_SAMPLES is not set |
| 937 | 964 | ||
| 938 | # | 965 | # |
| @@ -953,13 +980,21 @@ CONFIG_CRYPTO=y | |||
| 953 | # | 980 | # |
| 954 | # CONFIG_CRYPTO_FIPS is not set | 981 | # CONFIG_CRYPTO_FIPS is not set |
| 955 | CONFIG_CRYPTO_ALGAPI=y | 982 | CONFIG_CRYPTO_ALGAPI=y |
| 956 | CONFIG_CRYPTO_AEAD=y | 983 | CONFIG_CRYPTO_ALGAPI2=y |
| 984 | CONFIG_CRYPTO_AEAD=m | ||
| 985 | CONFIG_CRYPTO_AEAD2=y | ||
| 957 | CONFIG_CRYPTO_BLKCIPHER=y | 986 | CONFIG_CRYPTO_BLKCIPHER=y |
| 987 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 958 | CONFIG_CRYPTO_HASH=y | 988 | CONFIG_CRYPTO_HASH=y |
| 959 | CONFIG_CRYPTO_RNG=y | 989 | CONFIG_CRYPTO_HASH2=y |
| 990 | CONFIG_CRYPTO_RNG=m | ||
| 991 | CONFIG_CRYPTO_RNG2=y | ||
| 992 | CONFIG_CRYPTO_PCOMP=y | ||
| 960 | CONFIG_CRYPTO_MANAGER=y | 993 | CONFIG_CRYPTO_MANAGER=y |
| 994 | CONFIG_CRYPTO_MANAGER2=y | ||
| 961 | CONFIG_CRYPTO_GF128MUL=m | 995 | CONFIG_CRYPTO_GF128MUL=m |
| 962 | CONFIG_CRYPTO_NULL=m | 996 | CONFIG_CRYPTO_NULL=m |
| 997 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 963 | CONFIG_CRYPTO_CRYPTD=m | 998 | CONFIG_CRYPTO_CRYPTD=m |
| 964 | CONFIG_CRYPTO_AUTHENC=m | 999 | CONFIG_CRYPTO_AUTHENC=m |
| 965 | CONFIG_CRYPTO_TEST=m | 1000 | CONFIG_CRYPTO_TEST=m |
| @@ -1029,6 +1064,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1029 | # Compression | 1064 | # Compression |
| 1030 | # | 1065 | # |
| 1031 | CONFIG_CRYPTO_DEFLATE=m | 1066 | CONFIG_CRYPTO_DEFLATE=m |
| 1067 | CONFIG_CRYPTO_ZLIB=m | ||
| 1032 | CONFIG_CRYPTO_LZO=m | 1068 | CONFIG_CRYPTO_LZO=m |
| 1033 | 1069 | ||
| 1034 | # | 1070 | # |
| @@ -1036,11 +1072,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1036 | # | 1072 | # |
| 1037 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1073 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1038 | # CONFIG_CRYPTO_HW is not set | 1074 | # CONFIG_CRYPTO_HW is not set |
| 1075 | # CONFIG_BINARY_PRINTF is not set | ||
| 1039 | 1076 | ||
| 1040 | # | 1077 | # |
| 1041 | # Library routines | 1078 | # Library routines |
| 1042 | # | 1079 | # |
| 1043 | CONFIG_BITREVERSE=y | 1080 | CONFIG_BITREVERSE=y |
| 1081 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1044 | CONFIG_CRC_CCITT=m | 1082 | CONFIG_CRC_CCITT=m |
| 1045 | CONFIG_CRC16=m | 1083 | CONFIG_CRC16=m |
| 1046 | CONFIG_CRC_T10DIF=y | 1084 | CONFIG_CRC_T10DIF=y |
| @@ -1052,10 +1090,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1052 | CONFIG_ZLIB_DEFLATE=m | 1090 | CONFIG_ZLIB_DEFLATE=m |
| 1053 | CONFIG_LZO_COMPRESS=m | 1091 | CONFIG_LZO_COMPRESS=m |
| 1054 | CONFIG_LZO_DECOMPRESS=m | 1092 | CONFIG_LZO_DECOMPRESS=m |
| 1093 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1094 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1095 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1055 | CONFIG_TEXTSEARCH=y | 1096 | CONFIG_TEXTSEARCH=y |
| 1056 | CONFIG_TEXTSEARCH_KMP=m | 1097 | CONFIG_TEXTSEARCH_KMP=m |
| 1057 | CONFIG_TEXTSEARCH_BM=m | 1098 | CONFIG_TEXTSEARCH_BM=m |
| 1058 | CONFIG_TEXTSEARCH_FSM=m | 1099 | CONFIG_TEXTSEARCH_FSM=m |
| 1059 | CONFIG_PLIST=y | ||
| 1060 | CONFIG_HAS_IOMEM=y | 1100 | CONFIG_HAS_IOMEM=y |
| 1061 | CONFIG_HAS_DMA=y | 1101 | CONFIG_HAS_DMA=y |
| 1102 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 3459c594194..7cf58c27ff8 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:52 2008 | 4 | # Wed Apr 22 20:48:13 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 140 | CONFIG_NEED_MULTIPLE_NODES=y | 151 | CONFIG_NEED_MULTIPLE_NODES=y |
| 141 | CONFIG_PAGEFLAGS_EXTENDED=y | 152 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 153 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 143 | # CONFIG_RESOURCES_64BIT is not set | ||
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 154 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 145 | CONFIG_ZONE_DMA_FLAG=1 | 155 | CONFIG_ZONE_DMA_FLAG=1 |
| 146 | CONFIG_BOUNCE=y | 156 | CONFIG_BOUNCE=y |
| 147 | CONFIG_VIRT_TO_BUS=y | 157 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | 158 | CONFIG_UNEVICTABLE_LRU=y |
| 159 | CONFIG_HAVE_MLOCK=y | ||
| 160 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 149 | 161 | ||
| 150 | # | 162 | # |
| 151 | # General setup | 163 | # General setup |
| @@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 267 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 268 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 269 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 272 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 273 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 276 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 277 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 278 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 266 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 280 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 267 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 281 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 268 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 282 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 287 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 288 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 289 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 291 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 292 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 293 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 366 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 352 | CONFIG_IP6_NF_MATCH_MH=m | 367 | CONFIG_IP6_NF_MATCH_MH=m |
| 353 | CONFIG_IP6_NF_MATCH_RT=m | 368 | CONFIG_IP6_NF_MATCH_RT=m |
| 369 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 354 | CONFIG_IP6_NF_TARGET_LOG=m | 370 | CONFIG_IP6_NF_TARGET_LOG=m |
| 355 | CONFIG_IP6_NF_FILTER=m | 371 | CONFIG_IP6_NF_FILTER=m |
| 356 | CONFIG_IP6_NF_TARGET_REJECT=m | 372 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 357 | CONFIG_IP6_NF_MANGLE=m | 373 | CONFIG_IP6_NF_MANGLE=m |
| 358 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 359 | CONFIG_IP6_NF_RAW=m | 374 | CONFIG_IP6_NF_RAW=m |
| 360 | CONFIG_IP_DCCP=m | 375 | CONFIG_IP_DCCP=m |
| 361 | CONFIG_INET_DCCP_DIAG=m | 376 | CONFIG_INET_DCCP_DIAG=m |
| 362 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 363 | 377 | ||
| 364 | # | 378 | # |
| 365 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 379 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 366 | # | 380 | # |
| 367 | CONFIG_IP_DCCP_CCID2=m | ||
| 368 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 381 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 369 | CONFIG_IP_DCCP_CCID3=m | 382 | # CONFIG_IP_DCCP_CCID3 is not set |
| 370 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 371 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 372 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 373 | CONFIG_IP_SCTP=m | 383 | CONFIG_IP_SCTP=m |
| 374 | # CONFIG_SCTP_DBG_MSG is not set | 384 | # CONFIG_SCTP_DBG_MSG is not set |
| 375 | # CONFIG_SCTP_DBG_OBJCNT is not set | 385 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -391,8 +401,10 @@ CONFIG_ATALK=m | |||
| 391 | # CONFIG_LAPB is not set | 401 | # CONFIG_LAPB is not set |
| 392 | # CONFIG_ECONET is not set | 402 | # CONFIG_ECONET is not set |
| 393 | # CONFIG_WAN_ROUTER is not set | 403 | # CONFIG_WAN_ROUTER is not set |
| 404 | # CONFIG_PHONET is not set | ||
| 394 | # CONFIG_NET_SCHED is not set | 405 | # CONFIG_NET_SCHED is not set |
| 395 | CONFIG_NET_CLS_ROUTE=y | 406 | CONFIG_NET_CLS_ROUTE=y |
| 407 | # CONFIG_DCB is not set | ||
| 396 | 408 | ||
| 397 | # | 409 | # |
| 398 | # Network testing | 410 | # Network testing |
| @@ -403,8 +415,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 403 | # CONFIG_IRDA is not set | 415 | # CONFIG_IRDA is not set |
| 404 | # CONFIG_BT is not set | 416 | # CONFIG_BT is not set |
| 405 | # CONFIG_AF_RXRPC is not set | 417 | # CONFIG_AF_RXRPC is not set |
| 406 | # CONFIG_PHONET is not set | ||
| 407 | # CONFIG_WIRELESS is not set | 418 | # CONFIG_WIRELESS is not set |
| 419 | # CONFIG_WIMAX is not set | ||
| 408 | # CONFIG_RFKILL is not set | 420 | # CONFIG_RFKILL is not set |
| 409 | # CONFIG_NET_9P is not set | 421 | # CONFIG_NET_9P is not set |
| 410 | 422 | ||
| @@ -441,15 +453,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 441 | CONFIG_ATA_OVER_ETH=m | 453 | CONFIG_ATA_OVER_ETH=m |
| 442 | # CONFIG_BLK_DEV_HD is not set | 454 | # CONFIG_BLK_DEV_HD is not set |
| 443 | CONFIG_MISC_DEVICES=y | 455 | CONFIG_MISC_DEVICES=y |
| 444 | # CONFIG_EEPROM_93CX6 is not set | ||
| 445 | # CONFIG_ENCLOSURE_SERVICES is not set | 456 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 446 | # CONFIG_C2PORT is not set | 457 | # CONFIG_C2PORT is not set |
| 458 | |||
| 459 | # | ||
| 460 | # EEPROM support | ||
| 461 | # | ||
| 462 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | CONFIG_HAVE_IDE=y | 463 | CONFIG_HAVE_IDE=y |
| 448 | CONFIG_IDE=y | 464 | CONFIG_IDE=y |
| 449 | 465 | ||
| 450 | # | 466 | # |
| 451 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 467 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 452 | # | 468 | # |
| 469 | CONFIG_IDE_ATAPI=y | ||
| 453 | # CONFIG_BLK_DEV_IDE_SATA is not set | 470 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 454 | CONFIG_IDE_GD=y | 471 | CONFIG_IDE_GD=y |
| 455 | CONFIG_IDE_GD_ATA=y | 472 | CONFIG_IDE_GD_ATA=y |
| @@ -457,7 +474,6 @@ CONFIG_IDE_GD_ATA=y | |||
| 457 | CONFIG_BLK_DEV_IDECD=y | 474 | CONFIG_BLK_DEV_IDECD=y |
| 458 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | 475 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
| 459 | # CONFIG_BLK_DEV_IDETAPE is not set | 476 | # CONFIG_BLK_DEV_IDETAPE is not set |
| 460 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 461 | # CONFIG_IDE_TASK_IOCTL is not set | 477 | # CONFIG_IDE_TASK_IOCTL is not set |
| 462 | CONFIG_IDE_PROC_FS=y | 478 | CONFIG_IDE_PROC_FS=y |
| 463 | 479 | ||
| @@ -516,6 +532,8 @@ CONFIG_ISCSI_TCP=m | |||
| 516 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 532 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 517 | # CONFIG_SCSI_ADVANSYS is not set | 533 | # CONFIG_SCSI_ADVANSYS is not set |
| 518 | # CONFIG_SCSI_IN2000 is not set | 534 | # CONFIG_SCSI_IN2000 is not set |
| 535 | # CONFIG_LIBFC is not set | ||
| 536 | # CONFIG_LIBFCOE is not set | ||
| 519 | # CONFIG_SCSI_DTC3280 is not set | 537 | # CONFIG_SCSI_DTC3280 is not set |
| 520 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 538 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 521 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | 539 | # CONFIG_SCSI_GENERIC_NCR5380 is not set |
| @@ -527,6 +545,7 @@ CONFIG_ISCSI_TCP=m | |||
| 527 | # CONFIG_SCSI_T128 is not set | 545 | # CONFIG_SCSI_T128 is not set |
| 528 | # CONFIG_SCSI_DEBUG is not set | 546 | # CONFIG_SCSI_DEBUG is not set |
| 529 | # CONFIG_SCSI_DH is not set | 547 | # CONFIG_SCSI_DH is not set |
| 548 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 530 | CONFIG_MD=y | 549 | CONFIG_MD=y |
| 531 | CONFIG_BLK_DEV_MD=m | 550 | CONFIG_BLK_DEV_MD=m |
| 532 | CONFIG_MD_LINEAR=m | 551 | CONFIG_MD_LINEAR=m |
| @@ -534,7 +553,7 @@ CONFIG_MD_RAID0=m | |||
| 534 | CONFIG_MD_RAID1=m | 553 | CONFIG_MD_RAID1=m |
| 535 | # CONFIG_MD_RAID10 is not set | 554 | # CONFIG_MD_RAID10 is not set |
| 536 | CONFIG_MD_RAID456=m | 555 | CONFIG_MD_RAID456=m |
| 537 | CONFIG_MD_RAID5_RESHAPE=y | 556 | CONFIG_MD_RAID6_PQ=m |
| 538 | # CONFIG_MD_MULTIPATH is not set | 557 | # CONFIG_MD_MULTIPATH is not set |
| 539 | # CONFIG_MD_FAULTY is not set | 558 | # CONFIG_MD_FAULTY is not set |
| 540 | CONFIG_BLK_DEV_DM=m | 559 | CONFIG_BLK_DEV_DM=m |
| @@ -547,6 +566,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 547 | # CONFIG_DM_DELAY is not set | 566 | # CONFIG_DM_DELAY is not set |
| 548 | CONFIG_DM_UEVENT=y | 567 | CONFIG_DM_UEVENT=y |
| 549 | CONFIG_NETDEVICES=y | 568 | CONFIG_NETDEVICES=y |
| 569 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 550 | CONFIG_DUMMY=m | 570 | CONFIG_DUMMY=m |
| 551 | # CONFIG_BONDING is not set | 571 | # CONFIG_BONDING is not set |
| 552 | CONFIG_MACVLAN=m | 572 | CONFIG_MACVLAN=m |
| @@ -559,7 +579,9 @@ CONFIG_NET_ETHERNET=y | |||
| 559 | # CONFIG_MII is not set | 579 | # CONFIG_MII is not set |
| 560 | # CONFIG_NET_VENDOR_3COM is not set | 580 | # CONFIG_NET_VENDOR_3COM is not set |
| 561 | # CONFIG_NET_VENDOR_SMC is not set | 581 | # CONFIG_NET_VENDOR_SMC is not set |
| 582 | # CONFIG_ETHOC is not set | ||
| 562 | # CONFIG_NET_VENDOR_RACAL is not set | 583 | # CONFIG_NET_VENDOR_RACAL is not set |
| 584 | # CONFIG_DNET is not set | ||
| 563 | # CONFIG_AT1700 is not set | 585 | # CONFIG_AT1700 is not set |
| 564 | # CONFIG_DEPCA is not set | 586 | # CONFIG_DEPCA is not set |
| 565 | # CONFIG_HP100 is not set | 587 | # CONFIG_HP100 is not set |
| @@ -584,7 +606,10 @@ CONFIG_NE2000=m | |||
| 584 | # | 606 | # |
| 585 | # CONFIG_WLAN_PRE80211 is not set | 607 | # CONFIG_WLAN_PRE80211 is not set |
| 586 | # CONFIG_WLAN_80211 is not set | 608 | # CONFIG_WLAN_80211 is not set |
| 587 | # CONFIG_IWLWIFI_LEDS is not set | 609 | |
| 610 | # | ||
| 611 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 612 | # | ||
| 588 | # CONFIG_WAN is not set | 613 | # CONFIG_WAN is not set |
| 589 | CONFIG_PPP=m | 614 | CONFIG_PPP=m |
| 590 | # CONFIG_PPP_MULTILINK is not set | 615 | # CONFIG_PPP_MULTILINK is not set |
| @@ -642,7 +667,6 @@ CONFIG_MOUSE_PS2=m | |||
| 642 | CONFIG_MOUSE_PS2_ALPS=y | 667 | CONFIG_MOUSE_PS2_ALPS=y |
| 643 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 668 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 644 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 669 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 645 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 646 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 670 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 647 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 671 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 648 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 672 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -688,6 +712,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 688 | # Non-8250 serial port support | 712 | # Non-8250 serial port support |
| 689 | # | 713 | # |
| 690 | CONFIG_UNIX98_PTYS=y | 714 | CONFIG_UNIX98_PTYS=y |
| 715 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 691 | CONFIG_LEGACY_PTYS=y | 716 | CONFIG_LEGACY_PTYS=y |
| 692 | CONFIG_LEGACY_PTY_COUNT=256 | 717 | CONFIG_LEGACY_PTY_COUNT=256 |
| 693 | # CONFIG_IPMI_HANDLER is not set | 718 | # CONFIG_IPMI_HANDLER is not set |
| @@ -771,6 +796,7 @@ CONFIG_FB_Q40=y | |||
| 771 | # CONFIG_FB_VIRTUAL is not set | 796 | # CONFIG_FB_VIRTUAL is not set |
| 772 | # CONFIG_FB_METRONOME is not set | 797 | # CONFIG_FB_METRONOME is not set |
| 773 | # CONFIG_FB_MB862XX is not set | 798 | # CONFIG_FB_MB862XX is not set |
| 799 | # CONFIG_FB_BROADSHEET is not set | ||
| 774 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 800 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 775 | 801 | ||
| 776 | # | 802 | # |
| @@ -805,7 +831,6 @@ CONFIG_HIDRAW=y | |||
| 805 | # | 831 | # |
| 806 | # Special HID drivers | 832 | # Special HID drivers |
| 807 | # | 833 | # |
| 808 | CONFIG_HID_COMPAT=y | ||
| 809 | # CONFIG_USB_SUPPORT is not set | 834 | # CONFIG_USB_SUPPORT is not set |
| 810 | # CONFIG_MMC is not set | 835 | # CONFIG_MMC is not set |
| 811 | # CONFIG_MEMSTICK is not set | 836 | # CONFIG_MEMSTICK is not set |
| @@ -813,9 +838,9 @@ CONFIG_HID_COMPAT=y | |||
| 813 | # CONFIG_ACCESSIBILITY is not set | 838 | # CONFIG_ACCESSIBILITY is not set |
| 814 | # CONFIG_RTC_CLASS is not set | 839 | # CONFIG_RTC_CLASS is not set |
| 815 | # CONFIG_DMADEVICES is not set | 840 | # CONFIG_DMADEVICES is not set |
| 841 | # CONFIG_AUXDISPLAY is not set | ||
| 816 | # CONFIG_UIO is not set | 842 | # CONFIG_UIO is not set |
| 817 | # CONFIG_STAGING is not set | 843 | # CONFIG_STAGING is not set |
| 818 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 819 | 844 | ||
| 820 | # | 845 | # |
| 821 | # Character devices | 846 | # Character devices |
| @@ -828,6 +853,7 @@ CONFIG_EXT2_FS=y | |||
| 828 | # CONFIG_EXT2_FS_XATTR is not set | 853 | # CONFIG_EXT2_FS_XATTR is not set |
| 829 | # CONFIG_EXT2_FS_XIP is not set | 854 | # CONFIG_EXT2_FS_XIP is not set |
| 830 | CONFIG_EXT3_FS=y | 855 | CONFIG_EXT3_FS=y |
| 856 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 831 | # CONFIG_EXT3_FS_XATTR is not set | 857 | # CONFIG_EXT3_FS_XATTR is not set |
| 832 | # CONFIG_EXT4_FS is not set | 858 | # CONFIG_EXT4_FS is not set |
| 833 | CONFIG_JBD=y | 859 | CONFIG_JBD=y |
| @@ -854,13 +880,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 854 | # CONFIG_OCFS2_FS_STATS is not set | 880 | # CONFIG_OCFS2_FS_STATS is not set |
| 855 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 881 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 856 | # CONFIG_OCFS2_DEBUG_FS is not set | 882 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 857 | # CONFIG_OCFS2_COMPAT_JBD is not set | 883 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 884 | # CONFIG_BTRFS_FS is not set | ||
| 858 | CONFIG_DNOTIFY=y | 885 | CONFIG_DNOTIFY=y |
| 859 | CONFIG_INOTIFY=y | 886 | CONFIG_INOTIFY=y |
| 860 | CONFIG_INOTIFY_USER=y | 887 | CONFIG_INOTIFY_USER=y |
| 861 | CONFIG_QUOTA=y | 888 | CONFIG_QUOTA=y |
| 862 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 889 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 863 | # CONFIG_PRINT_QUOTA_WARNING is not set | 890 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 891 | CONFIG_QUOTA_TREE=m | ||
| 864 | # CONFIG_QFMT_V1 is not set | 892 | # CONFIG_QFMT_V1 is not set |
| 865 | # CONFIG_QFMT_V2 is not set | 893 | # CONFIG_QFMT_V2 is not set |
| 866 | CONFIG_QUOTACTL=y | 894 | CONFIG_QUOTACTL=y |
| @@ -869,6 +897,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 869 | CONFIG_FUSE_FS=m | 897 | CONFIG_FUSE_FS=m |
| 870 | 898 | ||
| 871 | # | 899 | # |
| 900 | # Caches | ||
| 901 | # | ||
| 902 | # CONFIG_FSCACHE is not set | ||
| 903 | |||
| 904 | # | ||
| 872 | # CD-ROM/DVD Filesystems | 905 | # CD-ROM/DVD Filesystems |
| 873 | # | 906 | # |
| 874 | CONFIG_ISO9660_FS=y | 907 | CONFIG_ISO9660_FS=y |
| @@ -899,10 +932,7 @@ CONFIG_TMPFS=y | |||
| 899 | # CONFIG_TMPFS_POSIX_ACL is not set | 932 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 900 | # CONFIG_HUGETLB_PAGE is not set | 933 | # CONFIG_HUGETLB_PAGE is not set |
| 901 | CONFIG_CONFIGFS_FS=m | 934 | CONFIG_CONFIGFS_FS=m |
| 902 | 935 | CONFIG_MISC_FILESYSTEMS=y | |
| 903 | # | ||
| 904 | # Miscellaneous filesystems | ||
| 905 | # | ||
| 906 | # CONFIG_ADFS_FS is not set | 936 | # CONFIG_ADFS_FS is not set |
| 907 | CONFIG_AFFS_FS=m | 937 | CONFIG_AFFS_FS=m |
| 908 | CONFIG_HFS_FS=m | 938 | CONFIG_HFS_FS=m |
| @@ -911,6 +941,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 911 | # CONFIG_BFS_FS is not set | 941 | # CONFIG_BFS_FS is not set |
| 912 | # CONFIG_EFS_FS is not set | 942 | # CONFIG_EFS_FS is not set |
| 913 | CONFIG_CRAMFS=m | 943 | CONFIG_CRAMFS=m |
| 944 | CONFIG_SQUASHFS=m | ||
| 945 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 946 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 914 | # CONFIG_VXFS_FS is not set | 947 | # CONFIG_VXFS_FS is not set |
| 915 | CONFIG_MINIX_FS=y | 948 | CONFIG_MINIX_FS=y |
| 916 | # CONFIG_OMFS_FS is not set | 949 | # CONFIG_OMFS_FS is not set |
| @@ -921,6 +954,7 @@ CONFIG_SYSV_FS=m | |||
| 921 | CONFIG_UFS_FS=m | 954 | CONFIG_UFS_FS=m |
| 922 | # CONFIG_UFS_FS_WRITE is not set | 955 | # CONFIG_UFS_FS_WRITE is not set |
| 923 | # CONFIG_UFS_DEBUG is not set | 956 | # CONFIG_UFS_DEBUG is not set |
| 957 | # CONFIG_NILFS2_FS is not set | ||
| 924 | CONFIG_NETWORK_FILESYSTEMS=y | 958 | CONFIG_NETWORK_FILESYSTEMS=y |
| 925 | CONFIG_NFS_FS=y | 959 | CONFIG_NFS_FS=y |
| 926 | CONFIG_NFS_V3=y | 960 | CONFIG_NFS_V3=y |
| @@ -936,7 +970,6 @@ CONFIG_EXPORTFS=m | |||
| 936 | CONFIG_NFS_COMMON=y | 970 | CONFIG_NFS_COMMON=y |
| 937 | CONFIG_SUNRPC=y | 971 | CONFIG_SUNRPC=y |
| 938 | CONFIG_SUNRPC_GSS=y | 972 | CONFIG_SUNRPC_GSS=y |
| 939 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 940 | CONFIG_RPCSEC_GSS_KRB5=y | 973 | CONFIG_RPCSEC_GSS_KRB5=y |
| 941 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 974 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 942 | CONFIG_SMB_FS=m | 975 | CONFIG_SMB_FS=m |
| @@ -1011,11 +1044,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1011 | CONFIG_DEBUG_MEMORY_INIT=y | 1044 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1012 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1045 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1013 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1046 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1014 | |||
| 1015 | # | ||
| 1016 | # Tracers | ||
| 1017 | # | ||
| 1018 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1019 | # CONFIG_SAMPLES is not set | 1047 | # CONFIG_SAMPLES is not set |
| 1020 | 1048 | ||
| 1021 | # | 1049 | # |
| @@ -1036,13 +1064,21 @@ CONFIG_CRYPTO=y | |||
| 1036 | # | 1064 | # |
| 1037 | # CONFIG_CRYPTO_FIPS is not set | 1065 | # CONFIG_CRYPTO_FIPS is not set |
| 1038 | CONFIG_CRYPTO_ALGAPI=y | 1066 | CONFIG_CRYPTO_ALGAPI=y |
| 1039 | CONFIG_CRYPTO_AEAD=y | 1067 | CONFIG_CRYPTO_ALGAPI2=y |
| 1068 | CONFIG_CRYPTO_AEAD=m | ||
| 1069 | CONFIG_CRYPTO_AEAD2=y | ||
| 1040 | CONFIG_CRYPTO_BLKCIPHER=y | 1070 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1071 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1041 | CONFIG_CRYPTO_HASH=y | 1072 | CONFIG_CRYPTO_HASH=y |
| 1042 | CONFIG_CRYPTO_RNG=y | 1073 | CONFIG_CRYPTO_HASH2=y |
| 1074 | CONFIG_CRYPTO_RNG=m | ||
| 1075 | CONFIG_CRYPTO_RNG2=y | ||
| 1076 | CONFIG_CRYPTO_PCOMP=y | ||
| 1043 | CONFIG_CRYPTO_MANAGER=y | 1077 | CONFIG_CRYPTO_MANAGER=y |
| 1078 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1044 | CONFIG_CRYPTO_GF128MUL=m | 1079 | CONFIG_CRYPTO_GF128MUL=m |
| 1045 | CONFIG_CRYPTO_NULL=m | 1080 | CONFIG_CRYPTO_NULL=m |
| 1081 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1046 | CONFIG_CRYPTO_CRYPTD=m | 1082 | CONFIG_CRYPTO_CRYPTD=m |
| 1047 | CONFIG_CRYPTO_AUTHENC=m | 1083 | CONFIG_CRYPTO_AUTHENC=m |
| 1048 | CONFIG_CRYPTO_TEST=m | 1084 | CONFIG_CRYPTO_TEST=m |
| @@ -1112,6 +1148,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1112 | # Compression | 1148 | # Compression |
| 1113 | # | 1149 | # |
| 1114 | CONFIG_CRYPTO_DEFLATE=m | 1150 | CONFIG_CRYPTO_DEFLATE=m |
| 1151 | CONFIG_CRYPTO_ZLIB=m | ||
| 1115 | CONFIG_CRYPTO_LZO=m | 1152 | CONFIG_CRYPTO_LZO=m |
| 1116 | 1153 | ||
| 1117 | # | 1154 | # |
| @@ -1119,11 +1156,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1119 | # | 1156 | # |
| 1120 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1157 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1121 | # CONFIG_CRYPTO_HW is not set | 1158 | # CONFIG_CRYPTO_HW is not set |
| 1159 | # CONFIG_BINARY_PRINTF is not set | ||
| 1122 | 1160 | ||
| 1123 | # | 1161 | # |
| 1124 | # Library routines | 1162 | # Library routines |
| 1125 | # | 1163 | # |
| 1126 | CONFIG_BITREVERSE=y | 1164 | CONFIG_BITREVERSE=y |
| 1165 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1127 | CONFIG_CRC_CCITT=m | 1166 | CONFIG_CRC_CCITT=m |
| 1128 | CONFIG_CRC16=m | 1167 | CONFIG_CRC16=m |
| 1129 | CONFIG_CRC_T10DIF=y | 1168 | CONFIG_CRC_T10DIF=y |
| @@ -1135,10 +1174,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1135 | CONFIG_ZLIB_DEFLATE=m | 1174 | CONFIG_ZLIB_DEFLATE=m |
| 1136 | CONFIG_LZO_COMPRESS=m | 1175 | CONFIG_LZO_COMPRESS=m |
| 1137 | CONFIG_LZO_DECOMPRESS=m | 1176 | CONFIG_LZO_DECOMPRESS=m |
| 1177 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1178 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1179 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1138 | CONFIG_TEXTSEARCH=y | 1180 | CONFIG_TEXTSEARCH=y |
| 1139 | CONFIG_TEXTSEARCH_KMP=m | 1181 | CONFIG_TEXTSEARCH_KMP=m |
| 1140 | CONFIG_TEXTSEARCH_BM=m | 1182 | CONFIG_TEXTSEARCH_BM=m |
| 1141 | CONFIG_TEXTSEARCH_FSM=m | 1183 | CONFIG_TEXTSEARCH_FSM=m |
| 1142 | CONFIG_PLIST=y | ||
| 1143 | CONFIG_HAS_IOMEM=y | 1184 | CONFIG_HAS_IOMEM=y |
| 1144 | CONFIG_HAS_DMA=y | 1185 | CONFIG_HAS_DMA=y |
| 1186 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index f404917429f..f27c1a47bac 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:53 2008 | 4 | # Wed Apr 22 20:48:16 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -138,12 +149,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 138 | CONFIG_NEED_MULTIPLE_NODES=y | 149 | CONFIG_NEED_MULTIPLE_NODES=y |
| 139 | CONFIG_PAGEFLAGS_EXTENDED=y | 150 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 140 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 151 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 141 | # CONFIG_RESOURCES_64BIT is not set | ||
| 142 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 152 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 143 | CONFIG_ZONE_DMA_FLAG=1 | 153 | CONFIG_ZONE_DMA_FLAG=1 |
| 144 | CONFIG_BOUNCE=y | 154 | CONFIG_BOUNCE=y |
| 145 | CONFIG_VIRT_TO_BUS=y | 155 | CONFIG_VIRT_TO_BUS=y |
| 146 | CONFIG_UNEVICTABLE_LRU=y | 156 | CONFIG_UNEVICTABLE_LRU=y |
| 157 | CONFIG_HAVE_MLOCK=y | ||
| 158 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 147 | 159 | ||
| 148 | # | 160 | # |
| 149 | # General setup | 161 | # General setup |
| @@ -253,6 +265,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 253 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 265 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 254 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 266 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 255 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 267 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 256 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 269 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 257 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 270 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 258 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 271 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -261,6 +274,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 261 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 274 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 262 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 275 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 263 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 276 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 264 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 278 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 265 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 279 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 266 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 280 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -271,6 +285,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 271 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 285 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 272 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 286 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 273 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 287 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 274 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 289 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 290 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 276 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 291 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -349,25 +364,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 349 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 364 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 350 | CONFIG_IP6_NF_MATCH_MH=m | 365 | CONFIG_IP6_NF_MATCH_MH=m |
| 351 | CONFIG_IP6_NF_MATCH_RT=m | 366 | CONFIG_IP6_NF_MATCH_RT=m |
| 367 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 352 | CONFIG_IP6_NF_TARGET_LOG=m | 368 | CONFIG_IP6_NF_TARGET_LOG=m |
| 353 | CONFIG_IP6_NF_FILTER=m | 369 | CONFIG_IP6_NF_FILTER=m |
| 354 | CONFIG_IP6_NF_TARGET_REJECT=m | 370 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 355 | CONFIG_IP6_NF_MANGLE=m | 371 | CONFIG_IP6_NF_MANGLE=m |
| 356 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 357 | CONFIG_IP6_NF_RAW=m | 372 | CONFIG_IP6_NF_RAW=m |
| 358 | CONFIG_IP_DCCP=m | 373 | CONFIG_IP_DCCP=m |
| 359 | CONFIG_INET_DCCP_DIAG=m | 374 | CONFIG_INET_DCCP_DIAG=m |
| 360 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 361 | 375 | ||
| 362 | # | 376 | # |
| 363 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 377 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 364 | # | 378 | # |
| 365 | CONFIG_IP_DCCP_CCID2=m | ||
| 366 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 379 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 367 | CONFIG_IP_DCCP_CCID3=m | 380 | # CONFIG_IP_DCCP_CCID3 is not set |
| 368 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 369 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 370 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 371 | CONFIG_IP_SCTP=m | 381 | CONFIG_IP_SCTP=m |
| 372 | # CONFIG_SCTP_DBG_MSG is not set | 382 | # CONFIG_SCTP_DBG_MSG is not set |
| 373 | # CONFIG_SCTP_DBG_OBJCNT is not set | 383 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -389,8 +399,10 @@ CONFIG_ATALK=m | |||
| 389 | # CONFIG_LAPB is not set | 399 | # CONFIG_LAPB is not set |
| 390 | # CONFIG_ECONET is not set | 400 | # CONFIG_ECONET is not set |
| 391 | # CONFIG_WAN_ROUTER is not set | 401 | # CONFIG_WAN_ROUTER is not set |
| 402 | # CONFIG_PHONET is not set | ||
| 392 | # CONFIG_NET_SCHED is not set | 403 | # CONFIG_NET_SCHED is not set |
| 393 | CONFIG_NET_CLS_ROUTE=y | 404 | CONFIG_NET_CLS_ROUTE=y |
| 405 | # CONFIG_DCB is not set | ||
| 394 | 406 | ||
| 395 | # | 407 | # |
| 396 | # Network testing | 408 | # Network testing |
| @@ -401,8 +413,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 401 | # CONFIG_IRDA is not set | 413 | # CONFIG_IRDA is not set |
| 402 | # CONFIG_BT is not set | 414 | # CONFIG_BT is not set |
| 403 | # CONFIG_AF_RXRPC is not set | 415 | # CONFIG_AF_RXRPC is not set |
| 404 | # CONFIG_PHONET is not set | ||
| 405 | # CONFIG_WIRELESS is not set | 416 | # CONFIG_WIRELESS is not set |
| 417 | # CONFIG_WIMAX is not set | ||
| 406 | # CONFIG_RFKILL is not set | 418 | # CONFIG_RFKILL is not set |
| 407 | # CONFIG_NET_9P is not set | 419 | # CONFIG_NET_9P is not set |
| 408 | 420 | ||
| @@ -438,9 +450,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 438 | CONFIG_ATA_OVER_ETH=m | 450 | CONFIG_ATA_OVER_ETH=m |
| 439 | # CONFIG_BLK_DEV_HD is not set | 451 | # CONFIG_BLK_DEV_HD is not set |
| 440 | CONFIG_MISC_DEVICES=y | 452 | CONFIG_MISC_DEVICES=y |
| 441 | # CONFIG_EEPROM_93CX6 is not set | ||
| 442 | # CONFIG_ENCLOSURE_SERVICES is not set | 453 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 443 | # CONFIG_C2PORT is not set | 454 | # CONFIG_C2PORT is not set |
| 455 | |||
| 456 | # | ||
| 457 | # EEPROM support | ||
| 458 | # | ||
| 459 | # CONFIG_EEPROM_93CX6 is not set | ||
| 444 | CONFIG_HAVE_IDE=y | 460 | CONFIG_HAVE_IDE=y |
| 445 | # CONFIG_IDE is not set | 461 | # CONFIG_IDE is not set |
| 446 | 462 | ||
| @@ -488,9 +504,12 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 488 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 504 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 489 | CONFIG_SCSI_LOWLEVEL=y | 505 | CONFIG_SCSI_LOWLEVEL=y |
| 490 | CONFIG_ISCSI_TCP=m | 506 | CONFIG_ISCSI_TCP=m |
| 507 | # CONFIG_LIBFC is not set | ||
| 508 | # CONFIG_LIBFCOE is not set | ||
| 491 | # CONFIG_SCSI_DEBUG is not set | 509 | # CONFIG_SCSI_DEBUG is not set |
| 492 | CONFIG_SUN3_SCSI=y | 510 | CONFIG_SUN3_SCSI=y |
| 493 | # CONFIG_SCSI_DH is not set | 511 | # CONFIG_SCSI_DH is not set |
| 512 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 494 | CONFIG_MD=y | 513 | CONFIG_MD=y |
| 495 | CONFIG_BLK_DEV_MD=m | 514 | CONFIG_BLK_DEV_MD=m |
| 496 | CONFIG_MD_LINEAR=m | 515 | CONFIG_MD_LINEAR=m |
| @@ -498,7 +517,7 @@ CONFIG_MD_RAID0=m | |||
| 498 | CONFIG_MD_RAID1=m | 517 | CONFIG_MD_RAID1=m |
| 499 | # CONFIG_MD_RAID10 is not set | 518 | # CONFIG_MD_RAID10 is not set |
| 500 | CONFIG_MD_RAID456=m | 519 | CONFIG_MD_RAID456=m |
| 501 | CONFIG_MD_RAID5_RESHAPE=y | 520 | CONFIG_MD_RAID6_PQ=m |
| 502 | # CONFIG_MD_MULTIPATH is not set | 521 | # CONFIG_MD_MULTIPATH is not set |
| 503 | # CONFIG_MD_FAULTY is not set | 522 | # CONFIG_MD_FAULTY is not set |
| 504 | CONFIG_BLK_DEV_DM=m | 523 | CONFIG_BLK_DEV_DM=m |
| @@ -511,6 +530,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 511 | # CONFIG_DM_DELAY is not set | 530 | # CONFIG_DM_DELAY is not set |
| 512 | CONFIG_DM_UEVENT=y | 531 | CONFIG_DM_UEVENT=y |
| 513 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
| 533 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 514 | CONFIG_DUMMY=m | 534 | CONFIG_DUMMY=m |
| 515 | # CONFIG_BONDING is not set | 535 | # CONFIG_BONDING is not set |
| 516 | CONFIG_MACVLAN=m | 536 | CONFIG_MACVLAN=m |
| @@ -522,6 +542,8 @@ CONFIG_NET_ETHERNET=y | |||
| 522 | # CONFIG_MII is not set | 542 | # CONFIG_MII is not set |
| 523 | CONFIG_SUN3LANCE=y | 543 | CONFIG_SUN3LANCE=y |
| 524 | CONFIG_SUN3_82586=y | 544 | CONFIG_SUN3_82586=y |
| 545 | # CONFIG_ETHOC is not set | ||
| 546 | # CONFIG_DNET is not set | ||
| 525 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 547 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 526 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 548 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 527 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 549 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -537,7 +559,10 @@ CONFIG_SUN3_82586=y | |||
| 537 | # | 559 | # |
| 538 | # CONFIG_WLAN_PRE80211 is not set | 560 | # CONFIG_WLAN_PRE80211 is not set |
| 539 | # CONFIG_WLAN_80211 is not set | 561 | # CONFIG_WLAN_80211 is not set |
| 540 | # CONFIG_IWLWIFI_LEDS is not set | 562 | |
| 563 | # | ||
| 564 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 565 | # | ||
| 541 | # CONFIG_WAN is not set | 566 | # CONFIG_WAN is not set |
| 542 | CONFIG_PPP=m | 567 | CONFIG_PPP=m |
| 543 | # CONFIG_PPP_MULTILINK is not set | 568 | # CONFIG_PPP_MULTILINK is not set |
| @@ -595,7 +620,6 @@ CONFIG_MOUSE_PS2=m | |||
| 595 | CONFIG_MOUSE_PS2_ALPS=y | 620 | CONFIG_MOUSE_PS2_ALPS=y |
| 596 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 621 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 597 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 622 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 598 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 599 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 623 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 600 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 624 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 601 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 625 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -635,6 +659,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 635 | # Non-8250 serial port support | 659 | # Non-8250 serial port support |
| 636 | # | 660 | # |
| 637 | CONFIG_UNIX98_PTYS=y | 661 | CONFIG_UNIX98_PTYS=y |
| 662 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 638 | CONFIG_LEGACY_PTYS=y | 663 | CONFIG_LEGACY_PTYS=y |
| 639 | CONFIG_LEGACY_PTY_COUNT=256 | 664 | CONFIG_LEGACY_PTY_COUNT=256 |
| 640 | # CONFIG_IPMI_HANDLER is not set | 665 | # CONFIG_IPMI_HANDLER is not set |
| @@ -710,6 +735,7 @@ CONFIG_FB=y | |||
| 710 | # CONFIG_FB_VIRTUAL is not set | 735 | # CONFIG_FB_VIRTUAL is not set |
| 711 | # CONFIG_FB_METRONOME is not set | 736 | # CONFIG_FB_METRONOME is not set |
| 712 | # CONFIG_FB_MB862XX is not set | 737 | # CONFIG_FB_MB862XX is not set |
| 738 | # CONFIG_FB_BROADSHEET is not set | ||
| 713 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 739 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 714 | 740 | ||
| 715 | # | 741 | # |
| @@ -741,16 +767,15 @@ CONFIG_HIDRAW=y | |||
| 741 | # | 767 | # |
| 742 | # Special HID drivers | 768 | # Special HID drivers |
| 743 | # | 769 | # |
| 744 | CONFIG_HID_COMPAT=y | ||
| 745 | # CONFIG_USB_SUPPORT is not set | 770 | # CONFIG_USB_SUPPORT is not set |
| 746 | # CONFIG_MMC is not set | 771 | # CONFIG_MMC is not set |
| 747 | # CONFIG_MEMSTICK is not set | 772 | # CONFIG_MEMSTICK is not set |
| 748 | # CONFIG_NEW_LEDS is not set | 773 | # CONFIG_NEW_LEDS is not set |
| 749 | # CONFIG_ACCESSIBILITY is not set | 774 | # CONFIG_ACCESSIBILITY is not set |
| 750 | # CONFIG_RTC_CLASS is not set | 775 | # CONFIG_RTC_CLASS is not set |
| 776 | # CONFIG_AUXDISPLAY is not set | ||
| 751 | # CONFIG_UIO is not set | 777 | # CONFIG_UIO is not set |
| 752 | # CONFIG_STAGING is not set | 778 | # CONFIG_STAGING is not set |
| 753 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 754 | 779 | ||
| 755 | # | 780 | # |
| 756 | # Character devices | 781 | # Character devices |
| @@ -763,6 +788,7 @@ CONFIG_EXT2_FS=y | |||
| 763 | # CONFIG_EXT2_FS_XATTR is not set | 788 | # CONFIG_EXT2_FS_XATTR is not set |
| 764 | # CONFIG_EXT2_FS_XIP is not set | 789 | # CONFIG_EXT2_FS_XIP is not set |
| 765 | CONFIG_EXT3_FS=y | 790 | CONFIG_EXT3_FS=y |
| 791 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 766 | # CONFIG_EXT3_FS_XATTR is not set | 792 | # CONFIG_EXT3_FS_XATTR is not set |
| 767 | # CONFIG_EXT4_FS is not set | 793 | # CONFIG_EXT4_FS is not set |
| 768 | CONFIG_JBD=y | 794 | CONFIG_JBD=y |
| @@ -789,13 +815,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 789 | # CONFIG_OCFS2_FS_STATS is not set | 815 | # CONFIG_OCFS2_FS_STATS is not set |
| 790 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 816 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 791 | # CONFIG_OCFS2_DEBUG_FS is not set | 817 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 792 | # CONFIG_OCFS2_COMPAT_JBD is not set | 818 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 819 | # CONFIG_BTRFS_FS is not set | ||
| 793 | CONFIG_DNOTIFY=y | 820 | CONFIG_DNOTIFY=y |
| 794 | CONFIG_INOTIFY=y | 821 | CONFIG_INOTIFY=y |
| 795 | CONFIG_INOTIFY_USER=y | 822 | CONFIG_INOTIFY_USER=y |
| 796 | CONFIG_QUOTA=y | 823 | CONFIG_QUOTA=y |
| 797 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 824 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 798 | # CONFIG_PRINT_QUOTA_WARNING is not set | 825 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 826 | CONFIG_QUOTA_TREE=m | ||
| 799 | # CONFIG_QFMT_V1 is not set | 827 | # CONFIG_QFMT_V1 is not set |
| 800 | # CONFIG_QFMT_V2 is not set | 828 | # CONFIG_QFMT_V2 is not set |
| 801 | CONFIG_QUOTACTL=y | 829 | CONFIG_QUOTACTL=y |
| @@ -804,6 +832,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 804 | CONFIG_FUSE_FS=m | 832 | CONFIG_FUSE_FS=m |
| 805 | 833 | ||
| 806 | # | 834 | # |
| 835 | # Caches | ||
| 836 | # | ||
| 837 | # CONFIG_FSCACHE is not set | ||
| 838 | |||
| 839 | # | ||
| 807 | # CD-ROM/DVD Filesystems | 840 | # CD-ROM/DVD Filesystems |
| 808 | # | 841 | # |
| 809 | CONFIG_ISO9660_FS=y | 842 | CONFIG_ISO9660_FS=y |
| @@ -834,10 +867,7 @@ CONFIG_TMPFS=y | |||
| 834 | # CONFIG_TMPFS_POSIX_ACL is not set | 867 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 835 | # CONFIG_HUGETLB_PAGE is not set | 868 | # CONFIG_HUGETLB_PAGE is not set |
| 836 | CONFIG_CONFIGFS_FS=m | 869 | CONFIG_CONFIGFS_FS=m |
| 837 | 870 | CONFIG_MISC_FILESYSTEMS=y | |
| 838 | # | ||
| 839 | # Miscellaneous filesystems | ||
| 840 | # | ||
| 841 | # CONFIG_ADFS_FS is not set | 871 | # CONFIG_ADFS_FS is not set |
| 842 | CONFIG_AFFS_FS=m | 872 | CONFIG_AFFS_FS=m |
| 843 | CONFIG_HFS_FS=m | 873 | CONFIG_HFS_FS=m |
| @@ -846,6 +876,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 846 | # CONFIG_BFS_FS is not set | 876 | # CONFIG_BFS_FS is not set |
| 847 | # CONFIG_EFS_FS is not set | 877 | # CONFIG_EFS_FS is not set |
| 848 | CONFIG_CRAMFS=m | 878 | CONFIG_CRAMFS=m |
| 879 | CONFIG_SQUASHFS=m | ||
| 880 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 881 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 849 | # CONFIG_VXFS_FS is not set | 882 | # CONFIG_VXFS_FS is not set |
| 850 | CONFIG_MINIX_FS=y | 883 | CONFIG_MINIX_FS=y |
| 851 | # CONFIG_OMFS_FS is not set | 884 | # CONFIG_OMFS_FS is not set |
| @@ -856,6 +889,7 @@ CONFIG_SYSV_FS=m | |||
| 856 | CONFIG_UFS_FS=m | 889 | CONFIG_UFS_FS=m |
| 857 | # CONFIG_UFS_FS_WRITE is not set | 890 | # CONFIG_UFS_FS_WRITE is not set |
| 858 | # CONFIG_UFS_DEBUG is not set | 891 | # CONFIG_UFS_DEBUG is not set |
| 892 | # CONFIG_NILFS2_FS is not set | ||
| 859 | CONFIG_NETWORK_FILESYSTEMS=y | 893 | CONFIG_NETWORK_FILESYSTEMS=y |
| 860 | CONFIG_NFS_FS=y | 894 | CONFIG_NFS_FS=y |
| 861 | CONFIG_NFS_V3=y | 895 | CONFIG_NFS_V3=y |
| @@ -872,7 +906,6 @@ CONFIG_EXPORTFS=m | |||
| 872 | CONFIG_NFS_COMMON=y | 906 | CONFIG_NFS_COMMON=y |
| 873 | CONFIG_SUNRPC=y | 907 | CONFIG_SUNRPC=y |
| 874 | CONFIG_SUNRPC_GSS=y | 908 | CONFIG_SUNRPC_GSS=y |
| 875 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 876 | CONFIG_RPCSEC_GSS_KRB5=y | 909 | CONFIG_RPCSEC_GSS_KRB5=y |
| 877 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 910 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 878 | CONFIG_SMB_FS=m | 911 | CONFIG_SMB_FS=m |
| @@ -948,11 +981,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 948 | CONFIG_DEBUG_MEMORY_INIT=y | 981 | CONFIG_DEBUG_MEMORY_INIT=y |
| 949 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 982 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 950 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 983 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 951 | |||
| 952 | # | ||
| 953 | # Tracers | ||
| 954 | # | ||
| 955 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 956 | # CONFIG_SAMPLES is not set | 984 | # CONFIG_SAMPLES is not set |
| 957 | 985 | ||
| 958 | # | 986 | # |
| @@ -973,13 +1001,21 @@ CONFIG_CRYPTO=y | |||
| 973 | # | 1001 | # |
| 974 | # CONFIG_CRYPTO_FIPS is not set | 1002 | # CONFIG_CRYPTO_FIPS is not set |
| 975 | CONFIG_CRYPTO_ALGAPI=y | 1003 | CONFIG_CRYPTO_ALGAPI=y |
| 976 | CONFIG_CRYPTO_AEAD=y | 1004 | CONFIG_CRYPTO_ALGAPI2=y |
| 1005 | CONFIG_CRYPTO_AEAD=m | ||
| 1006 | CONFIG_CRYPTO_AEAD2=y | ||
| 977 | CONFIG_CRYPTO_BLKCIPHER=y | 1007 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1008 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 978 | CONFIG_CRYPTO_HASH=y | 1009 | CONFIG_CRYPTO_HASH=y |
| 979 | CONFIG_CRYPTO_RNG=y | 1010 | CONFIG_CRYPTO_HASH2=y |
| 1011 | CONFIG_CRYPTO_RNG=m | ||
| 1012 | CONFIG_CRYPTO_RNG2=y | ||
| 1013 | CONFIG_CRYPTO_PCOMP=y | ||
| 980 | CONFIG_CRYPTO_MANAGER=y | 1014 | CONFIG_CRYPTO_MANAGER=y |
| 1015 | CONFIG_CRYPTO_MANAGER2=y | ||
| 981 | CONFIG_CRYPTO_GF128MUL=m | 1016 | CONFIG_CRYPTO_GF128MUL=m |
| 982 | CONFIG_CRYPTO_NULL=m | 1017 | CONFIG_CRYPTO_NULL=m |
| 1018 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 983 | CONFIG_CRYPTO_CRYPTD=m | 1019 | CONFIG_CRYPTO_CRYPTD=m |
| 984 | CONFIG_CRYPTO_AUTHENC=m | 1020 | CONFIG_CRYPTO_AUTHENC=m |
| 985 | CONFIG_CRYPTO_TEST=m | 1021 | CONFIG_CRYPTO_TEST=m |
| @@ -1049,6 +1085,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1049 | # Compression | 1085 | # Compression |
| 1050 | # | 1086 | # |
| 1051 | CONFIG_CRYPTO_DEFLATE=m | 1087 | CONFIG_CRYPTO_DEFLATE=m |
| 1088 | CONFIG_CRYPTO_ZLIB=m | ||
| 1052 | CONFIG_CRYPTO_LZO=m | 1089 | CONFIG_CRYPTO_LZO=m |
| 1053 | 1090 | ||
| 1054 | # | 1091 | # |
| @@ -1056,11 +1093,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1056 | # | 1093 | # |
| 1057 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1094 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1058 | # CONFIG_CRYPTO_HW is not set | 1095 | # CONFIG_CRYPTO_HW is not set |
| 1096 | # CONFIG_BINARY_PRINTF is not set | ||
| 1059 | 1097 | ||
| 1060 | # | 1098 | # |
| 1061 | # Library routines | 1099 | # Library routines |
| 1062 | # | 1100 | # |
| 1063 | CONFIG_BITREVERSE=y | 1101 | CONFIG_BITREVERSE=y |
| 1102 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1064 | CONFIG_CRC_CCITT=m | 1103 | CONFIG_CRC_CCITT=m |
| 1065 | CONFIG_CRC16=m | 1104 | CONFIG_CRC16=m |
| 1066 | CONFIG_CRC_T10DIF=y | 1105 | CONFIG_CRC_T10DIF=y |
| @@ -1072,9 +1111,12 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1072 | CONFIG_ZLIB_DEFLATE=m | 1111 | CONFIG_ZLIB_DEFLATE=m |
| 1073 | CONFIG_LZO_COMPRESS=m | 1112 | CONFIG_LZO_COMPRESS=m |
| 1074 | CONFIG_LZO_DECOMPRESS=m | 1113 | CONFIG_LZO_DECOMPRESS=m |
| 1114 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1115 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1116 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1075 | CONFIG_TEXTSEARCH=y | 1117 | CONFIG_TEXTSEARCH=y |
| 1076 | CONFIG_TEXTSEARCH_KMP=m | 1118 | CONFIG_TEXTSEARCH_KMP=m |
| 1077 | CONFIG_TEXTSEARCH_BM=m | 1119 | CONFIG_TEXTSEARCH_BM=m |
| 1078 | CONFIG_TEXTSEARCH_FSM=m | 1120 | CONFIG_TEXTSEARCH_FSM=m |
| 1079 | CONFIG_PLIST=y | ||
| 1080 | CONFIG_HAS_IOMEM=y | 1121 | CONFIG_HAS_IOMEM=y |
| 1122 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 4d8a1e84e39..c40edb919fd 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_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.28-rc7 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Tue Dec 2 20:27:54 2008 | 4 | # Wed Apr 22 20:48:20 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -29,14 +29,24 @@ CONFIG_SWAP=y | |||
| 29 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 30 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 31 | CONFIG_POSIX_MQUEUE=y | 31 | CONFIG_POSIX_MQUEUE=y |
| 32 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 32 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | CONFIG_RELAY=y | 51 | CONFIG_RELAY=y |
| 42 | CONFIG_NAMESPACES=y | 52 | CONFIG_NAMESPACES=y |
| @@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y | |||
| 44 | # CONFIG_IPC_NS is not set | 54 | # CONFIG_IPC_NS is not set |
| 45 | # CONFIG_USER_NS is not set | 55 | # CONFIG_USER_NS is not set |
| 46 | # CONFIG_PID_NS is not set | 56 | # CONFIG_PID_NS is not set |
| 57 | # CONFIG_NET_NS is not set | ||
| 47 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
| 48 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 60 | CONFIG_RD_GZIP=y | ||
| 61 | CONFIG_RD_BZIP2=y | ||
| 62 | CONFIG_RD_LZMA=y | ||
| 49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 63 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 50 | CONFIG_SYSCTL=y | 64 | CONFIG_SYSCTL=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 51 | # CONFIG_EMBEDDED is not set | 66 | # CONFIG_EMBEDDED is not set |
| 52 | CONFIG_UID16=y | 67 | CONFIG_UID16=y |
| 53 | CONFIG_SYSCTL_SYSCALL=y | 68 | CONFIG_SYSCTL_SYSCALL=y |
| 54 | CONFIG_KALLSYMS=y | 69 | CONFIG_KALLSYMS=y |
| 55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 71 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 56 | CONFIG_HOTPLUG=y | 72 | CONFIG_HOTPLUG=y |
| 57 | CONFIG_PRINTK=y | 73 | CONFIG_PRINTK=y |
| 58 | CONFIG_BUG=y | 74 | CONFIG_BUG=y |
| 59 | CONFIG_ELF_CORE=y | 75 | CONFIG_ELF_CORE=y |
| 60 | CONFIG_COMPAT_BRK=y | ||
| 61 | CONFIG_BASE_FULL=y | 76 | CONFIG_BASE_FULL=y |
| 62 | CONFIG_FUTEX=y | 77 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | ||
| 64 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 66 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| @@ -68,15 +82,16 @@ CONFIG_EVENTFD=y | |||
| 68 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
| 69 | CONFIG_AIO=y | 83 | CONFIG_AIO=y |
| 70 | CONFIG_VM_EVENT_COUNTERS=y | 84 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_SLAB=y | 86 | CONFIG_SLAB=y |
| 72 | # CONFIG_SLUB is not set | 87 | # CONFIG_SLUB is not set |
| 73 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
| 74 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
| 75 | # CONFIG_MARKERS is not set | 90 | # CONFIG_MARKERS is not set |
| 91 | # CONFIG_SLOW_WORK is not set | ||
| 76 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 92 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 77 | CONFIG_SLABINFO=y | 93 | CONFIG_SLABINFO=y |
| 78 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 79 | # CONFIG_TINY_SHMEM is not set | ||
| 80 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 81 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 82 | # CONFIG_MODULE_FORCE_LOAD is not set | 97 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 100 | # CONFIG_MODVERSIONS is not set |
| 86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 87 | CONFIG_KMOD=y | ||
| 88 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 89 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 90 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 91 | # CONFIG_LSF is not set | ||
| 92 | CONFIG_BLK_DEV_BSG=y | 104 | CONFIG_BLK_DEV_BSG=y |
| 93 | # CONFIG_BLK_DEV_INTEGRITY is not set | 105 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 94 | 106 | ||
| @@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y | |||
| 104 | # CONFIG_DEFAULT_CFQ is not set | 116 | # CONFIG_DEFAULT_CFQ is not set |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 118 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | ||
| 108 | # CONFIG_FREEZER is not set | 119 | # CONFIG_FREEZER is not set |
| 109 | 120 | ||
| 110 | # | 121 | # |
| @@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 140 | CONFIG_NEED_MULTIPLE_NODES=y | 151 | CONFIG_NEED_MULTIPLE_NODES=y |
| 141 | CONFIG_PAGEFLAGS_EXTENDED=y | 152 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 142 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 153 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 143 | # CONFIG_RESOURCES_64BIT is not set | ||
| 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 154 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 145 | CONFIG_ZONE_DMA_FLAG=1 | 155 | CONFIG_ZONE_DMA_FLAG=1 |
| 146 | CONFIG_BOUNCE=y | 156 | CONFIG_BOUNCE=y |
| 147 | CONFIG_VIRT_TO_BUS=y | 157 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | 158 | CONFIG_UNEVICTABLE_LRU=y |
| 159 | CONFIG_HAVE_MLOCK=y | ||
| 160 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 149 | 161 | ||
| 150 | # | 162 | # |
| 151 | # General setup | 163 | # General setup |
| @@ -255,6 +267,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 267 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 268 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 269 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| 258 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 271 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 272 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 273 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| @@ -263,6 +276,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m | |||
| 263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 276 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 264 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 277 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 278 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 279 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
| 266 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 280 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 267 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 281 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 268 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 282 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| @@ -273,6 +287,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m | |||
| 273 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 287 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 288 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 289 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 290 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
| 276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | 291 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m |
| 277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 292 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 293 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -351,25 +366,20 @@ CONFIG_IP6_NF_MATCH_HL=m | |||
| 351 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 366 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 352 | CONFIG_IP6_NF_MATCH_MH=m | 367 | CONFIG_IP6_NF_MATCH_MH=m |
| 353 | CONFIG_IP6_NF_MATCH_RT=m | 368 | CONFIG_IP6_NF_MATCH_RT=m |
| 369 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 354 | CONFIG_IP6_NF_TARGET_LOG=m | 370 | CONFIG_IP6_NF_TARGET_LOG=m |
| 355 | CONFIG_IP6_NF_FILTER=m | 371 | CONFIG_IP6_NF_FILTER=m |
| 356 | CONFIG_IP6_NF_TARGET_REJECT=m | 372 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 357 | CONFIG_IP6_NF_MANGLE=m | 373 | CONFIG_IP6_NF_MANGLE=m |
| 358 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 359 | CONFIG_IP6_NF_RAW=m | 374 | CONFIG_IP6_NF_RAW=m |
| 360 | CONFIG_IP_DCCP=m | 375 | CONFIG_IP_DCCP=m |
| 361 | CONFIG_INET_DCCP_DIAG=m | 376 | CONFIG_INET_DCCP_DIAG=m |
| 362 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 363 | 377 | ||
| 364 | # | 378 | # |
| 365 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 379 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 366 | # | 380 | # |
| 367 | CONFIG_IP_DCCP_CCID2=m | ||
| 368 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | 381 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set |
| 369 | CONFIG_IP_DCCP_CCID3=m | 382 | # CONFIG_IP_DCCP_CCID3 is not set |
| 370 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 371 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 372 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 373 | CONFIG_IP_SCTP=m | 383 | CONFIG_IP_SCTP=m |
| 374 | # CONFIG_SCTP_DBG_MSG is not set | 384 | # CONFIG_SCTP_DBG_MSG is not set |
| 375 | # CONFIG_SCTP_DBG_OBJCNT is not set | 385 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| @@ -391,8 +401,10 @@ CONFIG_ATALK=m | |||
| 391 | # CONFIG_LAPB is not set | 401 | # CONFIG_LAPB is not set |
| 392 | # CONFIG_ECONET is not set | 402 | # CONFIG_ECONET is not set |
| 393 | # CONFIG_WAN_ROUTER is not set | 403 | # CONFIG_WAN_ROUTER is not set |
| 404 | # CONFIG_PHONET is not set | ||
| 394 | # CONFIG_NET_SCHED is not set | 405 | # CONFIG_NET_SCHED is not set |
| 395 | CONFIG_NET_CLS_ROUTE=y | 406 | CONFIG_NET_CLS_ROUTE=y |
| 407 | # CONFIG_DCB is not set | ||
| 396 | 408 | ||
| 397 | # | 409 | # |
| 398 | # Network testing | 410 | # Network testing |
| @@ -403,8 +415,8 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 403 | # CONFIG_IRDA is not set | 415 | # CONFIG_IRDA is not set |
| 404 | # CONFIG_BT is not set | 416 | # CONFIG_BT is not set |
| 405 | # CONFIG_AF_RXRPC is not set | 417 | # CONFIG_AF_RXRPC is not set |
| 406 | # CONFIG_PHONET is not set | ||
| 407 | # CONFIG_WIRELESS is not set | 418 | # CONFIG_WIRELESS is not set |
| 419 | # CONFIG_WIMAX is not set | ||
| 408 | # CONFIG_RFKILL is not set | 420 | # CONFIG_RFKILL is not set |
| 409 | # CONFIG_NET_9P is not set | 421 | # CONFIG_NET_9P is not set |
| 410 | 422 | ||
| @@ -440,9 +452,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 440 | CONFIG_ATA_OVER_ETH=m | 452 | CONFIG_ATA_OVER_ETH=m |
| 441 | # CONFIG_BLK_DEV_HD is not set | 453 | # CONFIG_BLK_DEV_HD is not set |
| 442 | CONFIG_MISC_DEVICES=y | 454 | CONFIG_MISC_DEVICES=y |
| 443 | # CONFIG_EEPROM_93CX6 is not set | ||
| 444 | # CONFIG_ENCLOSURE_SERVICES is not set | 455 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 445 | # CONFIG_C2PORT is not set | 456 | # CONFIG_C2PORT is not set |
| 457 | |||
| 458 | # | ||
| 459 | # EEPROM support | ||
| 460 | # | ||
| 461 | # CONFIG_EEPROM_93CX6 is not set | ||
| 446 | CONFIG_HAVE_IDE=y | 462 | CONFIG_HAVE_IDE=y |
| 447 | # CONFIG_IDE is not set | 463 | # CONFIG_IDE is not set |
| 448 | 464 | ||
| @@ -490,9 +506,12 @@ CONFIG_SCSI_SRP_ATTRS=m | |||
| 490 | CONFIG_SCSI_SRP_TGT_ATTRS=y | 506 | CONFIG_SCSI_SRP_TGT_ATTRS=y |
| 491 | CONFIG_SCSI_LOWLEVEL=y | 507 | CONFIG_SCSI_LOWLEVEL=y |
| 492 | CONFIG_ISCSI_TCP=m | 508 | CONFIG_ISCSI_TCP=m |
| 509 | # CONFIG_LIBFC is not set | ||
| 510 | # CONFIG_LIBFCOE is not set | ||
| 493 | # CONFIG_SCSI_DEBUG is not set | 511 | # CONFIG_SCSI_DEBUG is not set |
| 494 | CONFIG_SUN3X_ESP=y | 512 | CONFIG_SUN3X_ESP=y |
| 495 | # CONFIG_SCSI_DH is not set | 513 | # CONFIG_SCSI_DH is not set |
| 514 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 496 | CONFIG_MD=y | 515 | CONFIG_MD=y |
| 497 | CONFIG_BLK_DEV_MD=m | 516 | CONFIG_BLK_DEV_MD=m |
| 498 | CONFIG_MD_LINEAR=m | 517 | CONFIG_MD_LINEAR=m |
| @@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m | |||
| 500 | CONFIG_MD_RAID1=m | 519 | CONFIG_MD_RAID1=m |
| 501 | # CONFIG_MD_RAID10 is not set | 520 | # CONFIG_MD_RAID10 is not set |
| 502 | CONFIG_MD_RAID456=m | 521 | CONFIG_MD_RAID456=m |
| 503 | CONFIG_MD_RAID5_RESHAPE=y | 522 | CONFIG_MD_RAID6_PQ=m |
| 504 | # CONFIG_MD_MULTIPATH is not set | 523 | # CONFIG_MD_MULTIPATH is not set |
| 505 | # CONFIG_MD_FAULTY is not set | 524 | # CONFIG_MD_FAULTY is not set |
| 506 | CONFIG_BLK_DEV_DM=m | 525 | CONFIG_BLK_DEV_DM=m |
| @@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 513 | # CONFIG_DM_DELAY is not set | 532 | # CONFIG_DM_DELAY is not set |
| 514 | CONFIG_DM_UEVENT=y | 533 | CONFIG_DM_UEVENT=y |
| 515 | CONFIG_NETDEVICES=y | 534 | CONFIG_NETDEVICES=y |
| 535 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 516 | CONFIG_DUMMY=m | 536 | CONFIG_DUMMY=m |
| 517 | # CONFIG_BONDING is not set | 537 | # CONFIG_BONDING is not set |
| 518 | CONFIG_MACVLAN=m | 538 | CONFIG_MACVLAN=m |
| @@ -523,6 +543,8 @@ CONFIG_VETH=m | |||
| 523 | CONFIG_NET_ETHERNET=y | 543 | CONFIG_NET_ETHERNET=y |
| 524 | # CONFIG_MII is not set | 544 | # CONFIG_MII is not set |
| 525 | CONFIG_SUN3LANCE=y | 545 | CONFIG_SUN3LANCE=y |
| 546 | # CONFIG_ETHOC is not set | ||
| 547 | # CONFIG_DNET is not set | ||
| 526 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 548 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 527 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 549 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 528 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 550 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -539,7 +561,10 @@ CONFIG_SUN3LANCE=y | |||
| 539 | # | 561 | # |
| 540 | # CONFIG_WLAN_PRE80211 is not set | 562 | # CONFIG_WLAN_PRE80211 is not set |
| 541 | # CONFIG_WLAN_80211 is not set | 563 | # CONFIG_WLAN_80211 is not set |
| 542 | # CONFIG_IWLWIFI_LEDS is not set | 564 | |
| 565 | # | ||
| 566 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 567 | # | ||
| 543 | # CONFIG_WAN is not set | 568 | # CONFIG_WAN is not set |
| 544 | CONFIG_PPP=m | 569 | CONFIG_PPP=m |
| 545 | # CONFIG_PPP_MULTILINK is not set | 570 | # CONFIG_PPP_MULTILINK is not set |
| @@ -597,7 +622,6 @@ CONFIG_MOUSE_PS2=m | |||
| 597 | CONFIG_MOUSE_PS2_ALPS=y | 622 | CONFIG_MOUSE_PS2_ALPS=y |
| 598 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 623 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 599 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 624 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 600 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 601 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 625 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 602 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 626 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 603 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 627 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -637,6 +661,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 637 | # Non-8250 serial port support | 661 | # Non-8250 serial port support |
| 638 | # | 662 | # |
| 639 | CONFIG_UNIX98_PTYS=y | 663 | CONFIG_UNIX98_PTYS=y |
| 664 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 640 | CONFIG_LEGACY_PTYS=y | 665 | CONFIG_LEGACY_PTYS=y |
| 641 | CONFIG_LEGACY_PTY_COUNT=256 | 666 | CONFIG_LEGACY_PTY_COUNT=256 |
| 642 | # CONFIG_IPMI_HANDLER is not set | 667 | # CONFIG_IPMI_HANDLER is not set |
| @@ -718,6 +743,7 @@ CONFIG_FB=y | |||
| 718 | # CONFIG_FB_VIRTUAL is not set | 743 | # CONFIG_FB_VIRTUAL is not set |
| 719 | # CONFIG_FB_METRONOME is not set | 744 | # CONFIG_FB_METRONOME is not set |
| 720 | # CONFIG_FB_MB862XX is not set | 745 | # CONFIG_FB_MB862XX is not set |
| 746 | # CONFIG_FB_BROADSHEET is not set | ||
| 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 747 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 722 | 748 | ||
| 723 | # | 749 | # |
| @@ -749,7 +775,6 @@ CONFIG_HIDRAW=y | |||
| 749 | # | 775 | # |
| 750 | # Special HID drivers | 776 | # Special HID drivers |
| 751 | # | 777 | # |
| 752 | CONFIG_HID_COMPAT=y | ||
| 753 | # CONFIG_USB_SUPPORT is not set | 778 | # CONFIG_USB_SUPPORT is not set |
| 754 | # CONFIG_MMC is not set | 779 | # CONFIG_MMC is not set |
| 755 | # CONFIG_MEMSTICK is not set | 780 | # CONFIG_MEMSTICK is not set |
| @@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y | |||
| 757 | # CONFIG_ACCESSIBILITY is not set | 782 | # CONFIG_ACCESSIBILITY is not set |
| 758 | # CONFIG_RTC_CLASS is not set | 783 | # CONFIG_RTC_CLASS is not set |
| 759 | # CONFIG_DMADEVICES is not set | 784 | # CONFIG_DMADEVICES is not set |
| 785 | # CONFIG_AUXDISPLAY is not set | ||
| 760 | # CONFIG_UIO is not set | 786 | # CONFIG_UIO is not set |
| 761 | # CONFIG_STAGING is not set | 787 | # CONFIG_STAGING is not set |
| 762 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 763 | 788 | ||
| 764 | # | 789 | # |
| 765 | # Character devices | 790 | # Character devices |
| @@ -772,6 +797,7 @@ CONFIG_EXT2_FS=y | |||
| 772 | # CONFIG_EXT2_FS_XATTR is not set | 797 | # CONFIG_EXT2_FS_XATTR is not set |
| 773 | # CONFIG_EXT2_FS_XIP is not set | 798 | # CONFIG_EXT2_FS_XIP is not set |
| 774 | CONFIG_EXT3_FS=y | 799 | CONFIG_EXT3_FS=y |
| 800 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 775 | # CONFIG_EXT3_FS_XATTR is not set | 801 | # CONFIG_EXT3_FS_XATTR is not set |
| 776 | # CONFIG_EXT4_FS is not set | 802 | # CONFIG_EXT4_FS is not set |
| 777 | CONFIG_JBD=y | 803 | CONFIG_JBD=y |
| @@ -798,13 +824,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | |||
| 798 | # CONFIG_OCFS2_FS_STATS is not set | 824 | # CONFIG_OCFS2_FS_STATS is not set |
| 799 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 825 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 800 | # CONFIG_OCFS2_DEBUG_FS is not set | 826 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 801 | # CONFIG_OCFS2_COMPAT_JBD is not set | 827 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
| 828 | # CONFIG_BTRFS_FS is not set | ||
| 802 | CONFIG_DNOTIFY=y | 829 | CONFIG_DNOTIFY=y |
| 803 | CONFIG_INOTIFY=y | 830 | CONFIG_INOTIFY=y |
| 804 | CONFIG_INOTIFY_USER=y | 831 | CONFIG_INOTIFY_USER=y |
| 805 | CONFIG_QUOTA=y | 832 | CONFIG_QUOTA=y |
| 806 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 833 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 807 | # CONFIG_PRINT_QUOTA_WARNING is not set | 834 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 835 | CONFIG_QUOTA_TREE=m | ||
| 808 | # CONFIG_QFMT_V1 is not set | 836 | # CONFIG_QFMT_V1 is not set |
| 809 | # CONFIG_QFMT_V2 is not set | 837 | # CONFIG_QFMT_V2 is not set |
| 810 | CONFIG_QUOTACTL=y | 838 | CONFIG_QUOTACTL=y |
| @@ -813,6 +841,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 813 | CONFIG_FUSE_FS=m | 841 | CONFIG_FUSE_FS=m |
| 814 | 842 | ||
| 815 | # | 843 | # |
| 844 | # Caches | ||
| 845 | # | ||
| 846 | # CONFIG_FSCACHE is not set | ||
| 847 | |||
| 848 | # | ||
| 816 | # CD-ROM/DVD Filesystems | 849 | # CD-ROM/DVD Filesystems |
| 817 | # | 850 | # |
| 818 | CONFIG_ISO9660_FS=y | 851 | CONFIG_ISO9660_FS=y |
| @@ -843,10 +876,7 @@ CONFIG_TMPFS=y | |||
| 843 | # CONFIG_TMPFS_POSIX_ACL is not set | 876 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 844 | # CONFIG_HUGETLB_PAGE is not set | 877 | # CONFIG_HUGETLB_PAGE is not set |
| 845 | CONFIG_CONFIGFS_FS=m | 878 | CONFIG_CONFIGFS_FS=m |
| 846 | 879 | CONFIG_MISC_FILESYSTEMS=y | |
| 847 | # | ||
| 848 | # Miscellaneous filesystems | ||
| 849 | # | ||
| 850 | # CONFIG_ADFS_FS is not set | 880 | # CONFIG_ADFS_FS is not set |
| 851 | CONFIG_AFFS_FS=m | 881 | CONFIG_AFFS_FS=m |
| 852 | CONFIG_HFS_FS=m | 882 | CONFIG_HFS_FS=m |
| @@ -855,6 +885,9 @@ CONFIG_HFSPLUS_FS=m | |||
| 855 | # CONFIG_BFS_FS is not set | 885 | # CONFIG_BFS_FS is not set |
| 856 | # CONFIG_EFS_FS is not set | 886 | # CONFIG_EFS_FS is not set |
| 857 | CONFIG_CRAMFS=m | 887 | CONFIG_CRAMFS=m |
| 888 | CONFIG_SQUASHFS=m | ||
| 889 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
| 890 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
| 858 | # CONFIG_VXFS_FS is not set | 891 | # CONFIG_VXFS_FS is not set |
| 859 | CONFIG_MINIX_FS=y | 892 | CONFIG_MINIX_FS=y |
| 860 | # CONFIG_OMFS_FS is not set | 893 | # CONFIG_OMFS_FS is not set |
| @@ -865,6 +898,7 @@ CONFIG_SYSV_FS=m | |||
| 865 | CONFIG_UFS_FS=m | 898 | CONFIG_UFS_FS=m |
| 866 | # CONFIG_UFS_FS_WRITE is not set | 899 | # CONFIG_UFS_FS_WRITE is not set |
| 867 | # CONFIG_UFS_DEBUG is not set | 900 | # CONFIG_UFS_DEBUG is not set |
| 901 | # CONFIG_NILFS2_FS is not set | ||
| 868 | CONFIG_NETWORK_FILESYSTEMS=y | 902 | CONFIG_NETWORK_FILESYSTEMS=y |
| 869 | CONFIG_NFS_FS=y | 903 | CONFIG_NFS_FS=y |
| 870 | CONFIG_NFS_V3=y | 904 | CONFIG_NFS_V3=y |
| @@ -881,7 +915,6 @@ CONFIG_EXPORTFS=m | |||
| 881 | CONFIG_NFS_COMMON=y | 915 | CONFIG_NFS_COMMON=y |
| 882 | CONFIG_SUNRPC=y | 916 | CONFIG_SUNRPC=y |
| 883 | CONFIG_SUNRPC_GSS=y | 917 | CONFIG_SUNRPC_GSS=y |
| 884 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 885 | CONFIG_RPCSEC_GSS_KRB5=y | 918 | CONFIG_RPCSEC_GSS_KRB5=y |
| 886 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 919 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 887 | CONFIG_SMB_FS=m | 920 | CONFIG_SMB_FS=m |
| @@ -957,11 +990,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 957 | CONFIG_DEBUG_MEMORY_INIT=y | 990 | CONFIG_DEBUG_MEMORY_INIT=y |
| 958 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 991 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 959 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 992 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 960 | |||
| 961 | # | ||
| 962 | # Tracers | ||
| 963 | # | ||
| 964 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 965 | # CONFIG_SAMPLES is not set | 993 | # CONFIG_SAMPLES is not set |
| 966 | 994 | ||
| 967 | # | 995 | # |
| @@ -982,13 +1010,21 @@ CONFIG_CRYPTO=y | |||
| 982 | # | 1010 | # |
| 983 | # CONFIG_CRYPTO_FIPS is not set | 1011 | # CONFIG_CRYPTO_FIPS is not set |
| 984 | CONFIG_CRYPTO_ALGAPI=y | 1012 | CONFIG_CRYPTO_ALGAPI=y |
| 985 | CONFIG_CRYPTO_AEAD=y | 1013 | CONFIG_CRYPTO_ALGAPI2=y |
| 1014 | CONFIG_CRYPTO_AEAD=m | ||
| 1015 | CONFIG_CRYPTO_AEAD2=y | ||
| 986 | CONFIG_CRYPTO_BLKCIPHER=y | 1016 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1017 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 987 | CONFIG_CRYPTO_HASH=y | 1018 | CONFIG_CRYPTO_HASH=y |
| 988 | CONFIG_CRYPTO_RNG=y | 1019 | CONFIG_CRYPTO_HASH2=y |
| 1020 | CONFIG_CRYPTO_RNG=m | ||
| 1021 | CONFIG_CRYPTO_RNG2=y | ||
| 1022 | CONFIG_CRYPTO_PCOMP=y | ||
| 989 | CONFIG_CRYPTO_MANAGER=y | 1023 | CONFIG_CRYPTO_MANAGER=y |
| 1024 | CONFIG_CRYPTO_MANAGER2=y | ||
| 990 | CONFIG_CRYPTO_GF128MUL=m | 1025 | CONFIG_CRYPTO_GF128MUL=m |
| 991 | CONFIG_CRYPTO_NULL=m | 1026 | CONFIG_CRYPTO_NULL=m |
| 1027 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 992 | CONFIG_CRYPTO_CRYPTD=m | 1028 | CONFIG_CRYPTO_CRYPTD=m |
| 993 | CONFIG_CRYPTO_AUTHENC=m | 1029 | CONFIG_CRYPTO_AUTHENC=m |
| 994 | CONFIG_CRYPTO_TEST=m | 1030 | CONFIG_CRYPTO_TEST=m |
| @@ -1058,6 +1094,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1058 | # Compression | 1094 | # Compression |
| 1059 | # | 1095 | # |
| 1060 | CONFIG_CRYPTO_DEFLATE=m | 1096 | CONFIG_CRYPTO_DEFLATE=m |
| 1097 | CONFIG_CRYPTO_ZLIB=m | ||
| 1061 | CONFIG_CRYPTO_LZO=m | 1098 | CONFIG_CRYPTO_LZO=m |
| 1062 | 1099 | ||
| 1063 | # | 1100 | # |
| @@ -1065,11 +1102,13 @@ CONFIG_CRYPTO_LZO=m | |||
| 1065 | # | 1102 | # |
| 1066 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1103 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1067 | # CONFIG_CRYPTO_HW is not set | 1104 | # CONFIG_CRYPTO_HW is not set |
| 1105 | # CONFIG_BINARY_PRINTF is not set | ||
| 1068 | 1106 | ||
| 1069 | # | 1107 | # |
| 1070 | # Library routines | 1108 | # Library routines |
| 1071 | # | 1109 | # |
| 1072 | CONFIG_BITREVERSE=y | 1110 | CONFIG_BITREVERSE=y |
| 1111 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1073 | CONFIG_CRC_CCITT=m | 1112 | CONFIG_CRC_CCITT=m |
| 1074 | CONFIG_CRC16=m | 1113 | CONFIG_CRC16=m |
| 1075 | CONFIG_CRC_T10DIF=y | 1114 | CONFIG_CRC_T10DIF=y |
| @@ -1081,10 +1120,13 @@ CONFIG_ZLIB_INFLATE=y | |||
| 1081 | CONFIG_ZLIB_DEFLATE=m | 1120 | CONFIG_ZLIB_DEFLATE=m |
| 1082 | CONFIG_LZO_COMPRESS=m | 1121 | CONFIG_LZO_COMPRESS=m |
| 1083 | CONFIG_LZO_DECOMPRESS=m | 1122 | CONFIG_LZO_DECOMPRESS=m |
| 1123 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1124 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1125 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1084 | CONFIG_TEXTSEARCH=y | 1126 | CONFIG_TEXTSEARCH=y |
| 1085 | CONFIG_TEXTSEARCH_KMP=m | 1127 | CONFIG_TEXTSEARCH_KMP=m |
| 1086 | CONFIG_TEXTSEARCH_BM=m | 1128 | CONFIG_TEXTSEARCH_BM=m |
| 1087 | CONFIG_TEXTSEARCH_FSM=m | 1129 | CONFIG_TEXTSEARCH_FSM=m |
| 1088 | CONFIG_PLIST=y | ||
| 1089 | CONFIG_HAS_IOMEM=y | 1130 | CONFIG_HAS_IOMEM=y |
| 1090 | CONFIG_HAS_DMA=y | 1131 | CONFIG_HAS_DMA=y |
| 1132 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 3c19027331f..aa29a8640f7 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h | |||
| @@ -332,10 +332,12 @@ | |||
| 332 | #define __NR_dup3 326 | 332 | #define __NR_dup3 326 |
| 333 | #define __NR_pipe2 327 | 333 | #define __NR_pipe2 327 |
| 334 | #define __NR_inotify_init1 328 | 334 | #define __NR_inotify_init1 328 |
| 335 | #define __NR_preadv 329 | ||
| 336 | #define __NR_pwritev 330 | ||
| 335 | 337 | ||
| 336 | #ifdef __KERNEL__ | 338 | #ifdef __KERNEL__ |
| 337 | 339 | ||
| 338 | #define NR_syscalls 329 | 340 | #define NR_syscalls 331 |
| 339 | 341 | ||
| 340 | #define __ARCH_WANT_IPC_PARSE_VERSION | 342 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 341 | #define __ARCH_WANT_OLD_READDIR | 343 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 5c332f2b9b8..8744f60c07a 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -753,4 +753,6 @@ sys_call_table: | |||
| 753 | .long sys_dup3 | 753 | .long sys_dup3 |
| 754 | .long sys_pipe2 | 754 | .long sys_pipe2 |
| 755 | .long sys_inotify_init1 | 755 | .long sys_inotify_init1 |
| 756 | .long sys_preadv | ||
| 757 | .long sys_pwritev /* 330 */ | ||
| 756 | 758 | ||
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 4beb59dfc6e..534376299a9 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
| @@ -16,6 +16,7 @@ config MMU | |||
| 16 | 16 | ||
| 17 | config NO_DMA | 17 | config NO_DMA |
| 18 | bool | 18 | bool |
| 19 | depends on !COLDFIRE | ||
| 19 | default y | 20 | default y |
| 20 | 21 | ||
| 21 | config FPU | 22 | config FPU |
diff --git a/arch/m68knommu/configs/m5208evb_defconfig b/arch/m68knommu/configs/m5208evb_defconfig index 6fae33a05e2..854a4f333b2 100644 --- a/arch/m68knommu/configs/m5208evb_defconfig +++ b/arch/m68knommu/configs/m5208evb_defconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # | 4 | # |
| 5 | CONFIG_M68K=y | 5 | CONFIG_M68K=y |
| 6 | # CONFIG_MMU is not set | 6 | # CONFIG_MMU is not set |
| @@ -15,9 +15,10 @@ CONFIG_GENERIC_HWEIGHT=y | |||
| 15 | CONFIG_GENERIC_HARDIRQS=y | 15 | CONFIG_GENERIC_HARDIRQS=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_TIME=y | 17 | CONFIG_GENERIC_TIME=y |
| 18 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 18 | CONFIG_TIME_LOW_RES=y | 19 | CONFIG_TIME_LOW_RES=y |
| 20 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 19 | CONFIG_NO_IOPORT=y | 21 | CONFIG_NO_IOPORT=y |
| 20 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 22 | 23 | ||
| 23 | # | 24 | # |
| @@ -33,53 +34,55 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 33 | # CONFIG_BSD_PROCESS_ACCT is not set | 34 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_RELAY is not set | 50 | # CONFIG_RELAY is not set |
| 41 | # CONFIG_NAMESPACES is not set | 51 | # CONFIG_NAMESPACES is not set |
| 42 | # CONFIG_BLK_DEV_INITRD is not set | 52 | # CONFIG_BLK_DEV_INITRD is not set |
| 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 53 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 44 | CONFIG_SYSCTL=y | 54 | CONFIG_SYSCTL=y |
| 45 | CONFIG_EMBEDDED=y | 55 | CONFIG_EMBEDDED=y |
| 46 | # CONFIG_UID16 is not set | 56 | CONFIG_UID16=y |
| 47 | # CONFIG_SYSCTL_SYSCALL is not set | 57 | CONFIG_SYSCTL_SYSCALL=y |
| 48 | # CONFIG_KALLSYMS is not set | 58 | # CONFIG_KALLSYMS is not set |
| 59 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 49 | # CONFIG_HOTPLUG is not set | 60 | # CONFIG_HOTPLUG is not set |
| 50 | CONFIG_PRINTK=y | 61 | CONFIG_PRINTK=y |
| 51 | CONFIG_BUG=y | 62 | CONFIG_BUG=y |
| 52 | CONFIG_ELF_CORE=y | 63 | CONFIG_ELF_CORE=y |
| 53 | # CONFIG_COMPAT_BRK is not set | ||
| 54 | CONFIG_BASE_FULL=y | 64 | CONFIG_BASE_FULL=y |
| 55 | # CONFIG_FUTEX is not set | 65 | # CONFIG_FUTEX is not set |
| 56 | # CONFIG_EPOLL is not set | 66 | # CONFIG_EPOLL is not set |
| 57 | # CONFIG_SIGNALFD is not set | 67 | # CONFIG_SIGNALFD is not set |
| 58 | # CONFIG_TIMERFD is not set | 68 | # CONFIG_TIMERFD is not set |
| 59 | # CONFIG_EVENTFD is not set | 69 | # CONFIG_EVENTFD is not set |
| 70 | # CONFIG_AIO is not set | ||
| 60 | # CONFIG_VM_EVENT_COUNTERS is not set | 71 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 61 | CONFIG_SLAB=y | 72 | # CONFIG_COMPAT_BRK is not set |
| 62 | # CONFIG_SLUB is not set | 73 | # CONFIG_SLAB is not set |
| 74 | CONFIG_SLUB=y | ||
| 63 | # CONFIG_SLOB is not set | 75 | # CONFIG_SLOB is not set |
| 64 | # CONFIG_PROFILING is not set | 76 | # CONFIG_PROFILING is not set |
| 65 | # CONFIG_MARKERS is not set | 77 | # CONFIG_MARKERS is not set |
| 66 | # CONFIG_HAVE_OPROFILE is not set | 78 | # CONFIG_SLOW_WORK is not set |
| 67 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 68 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 69 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 70 | CONFIG_SLABINFO=y | ||
| 71 | CONFIG_TINY_SHMEM=y | ||
| 72 | CONFIG_BASE_SMALL=0 | 80 | CONFIG_BASE_SMALL=0 |
| 73 | CONFIG_MODULES=y | 81 | # CONFIG_MODULES is not set |
| 74 | CONFIG_MODULE_UNLOAD=y | ||
| 75 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 76 | # CONFIG_MODVERSIONS is not set | ||
| 77 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 78 | # CONFIG_KMOD is not set | ||
| 79 | CONFIG_BLOCK=y | 82 | CONFIG_BLOCK=y |
| 80 | # CONFIG_LBD is not set | 83 | # CONFIG_LBD is not set |
| 81 | # CONFIG_LSF is not set | ||
| 82 | # CONFIG_BLK_DEV_BSG is not set | 84 | # CONFIG_BLK_DEV_BSG is not set |
| 85 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 83 | 86 | ||
| 84 | # | 87 | # |
| 85 | # IO Schedulers | 88 | # IO Schedulers |
| @@ -93,7 +96,7 @@ CONFIG_IOSCHED_NOOP=y | |||
| 93 | # CONFIG_DEFAULT_CFQ is not set | 96 | # CONFIG_DEFAULT_CFQ is not set |
| 94 | CONFIG_DEFAULT_NOOP=y | 97 | CONFIG_DEFAULT_NOOP=y |
| 95 | CONFIG_DEFAULT_IOSCHED="noop" | 98 | CONFIG_DEFAULT_IOSCHED="noop" |
| 96 | CONFIG_CLASSIC_RCU=y | 99 | # CONFIG_FREEZER is not set |
| 97 | 100 | ||
| 98 | # | 101 | # |
| 99 | # Processor type and features | 102 | # Processor type and features |
| @@ -145,44 +148,39 @@ CONFIG_RAM16BIT=y | |||
| 145 | # CONFIG_ROM is not set | 148 | # CONFIG_ROM is not set |
| 146 | CONFIG_RAMKERNEL=y | 149 | CONFIG_RAMKERNEL=y |
| 147 | # CONFIG_ROMKERNEL is not set | 150 | # CONFIG_ROMKERNEL is not set |
| 151 | CONFIG_PREEMPT_NONE=y | ||
| 152 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 153 | # CONFIG_PREEMPT is not set | ||
| 154 | # CONFIG_NO_HZ is not set | ||
| 155 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 156 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 148 | CONFIG_SELECT_MEMORY_MODEL=y | 157 | CONFIG_SELECT_MEMORY_MODEL=y |
| 149 | CONFIG_FLATMEM_MANUAL=y | 158 | CONFIG_FLATMEM_MANUAL=y |
| 150 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 159 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 151 | # CONFIG_SPARSEMEM_MANUAL is not set | 160 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 152 | CONFIG_FLATMEM=y | 161 | CONFIG_FLATMEM=y |
| 153 | CONFIG_FLAT_NODE_MEM_MAP=y | 162 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 154 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 156 | CONFIG_PAGEFLAGS_EXTENDED=y | 163 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 164 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 158 | # CONFIG_RESOURCES_64BIT is not set | 165 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 159 | CONFIG_ZONE_DMA_FLAG=1 | 166 | CONFIG_ZONE_DMA_FLAG=1 |
| 160 | CONFIG_VIRT_TO_BUS=y | 167 | CONFIG_VIRT_TO_BUS=y |
| 168 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 161 | CONFIG_ISA_DMA_API=y | 169 | CONFIG_ISA_DMA_API=y |
| 162 | 170 | ||
| 163 | # | 171 | # |
| 164 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 165 | # | ||
| 166 | # CONFIG_PCI is not set | ||
| 167 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 168 | |||
| 169 | # | ||
| 170 | # Executable file formats | 172 | # Executable file formats |
| 171 | # | 173 | # |
| 172 | CONFIG_BINFMT_FLAT=y | 174 | CONFIG_BINFMT_FLAT=y |
| 173 | # CONFIG_BINFMT_ZFLAT is not set | 175 | # CONFIG_BINFMT_ZFLAT is not set |
| 174 | # CONFIG_BINFMT_SHARED_FLAT is not set | 176 | # CONFIG_BINFMT_SHARED_FLAT is not set |
| 175 | # CONFIG_BINFMT_AOUT is not set | 177 | # CONFIG_HAVE_AOUT is not set |
| 176 | # CONFIG_BINFMT_MISC is not set | 178 | # CONFIG_BINFMT_MISC is not set |
| 177 | 179 | ||
| 178 | # | 180 | # |
| 179 | # Power management options | 181 | # Power management options |
| 180 | # | 182 | # |
| 181 | # CONFIG_PM is not set | 183 | # CONFIG_PM is not set |
| 182 | |||
| 183 | # | ||
| 184 | # Networking | ||
| 185 | # | ||
| 186 | CONFIG_NET=y | 184 | CONFIG_NET=y |
| 187 | 185 | ||
| 188 | # | 186 | # |
| @@ -223,6 +221,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 223 | # CONFIG_TIPC is not set | 221 | # CONFIG_TIPC is not set |
| 224 | # CONFIG_ATM is not set | 222 | # CONFIG_ATM is not set |
| 225 | # CONFIG_BRIDGE is not set | 223 | # CONFIG_BRIDGE is not set |
| 224 | # CONFIG_NET_DSA is not set | ||
| 226 | # CONFIG_VLAN_8021Q is not set | 225 | # CONFIG_VLAN_8021Q is not set |
| 227 | # CONFIG_DECNET is not set | 226 | # CONFIG_DECNET is not set |
| 228 | # CONFIG_LLC2 is not set | 227 | # CONFIG_LLC2 is not set |
| @@ -232,7 +231,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 232 | # CONFIG_LAPB is not set | 231 | # CONFIG_LAPB is not set |
| 233 | # CONFIG_ECONET is not set | 232 | # CONFIG_ECONET is not set |
| 234 | # CONFIG_WAN_ROUTER is not set | 233 | # CONFIG_WAN_ROUTER is not set |
| 234 | # CONFIG_PHONET is not set | ||
| 235 | # CONFIG_NET_SCHED is not set | 235 | # CONFIG_NET_SCHED is not set |
| 236 | # CONFIG_DCB is not set | ||
| 236 | 237 | ||
| 237 | # | 238 | # |
| 238 | # Network testing | 239 | # Network testing |
| @@ -243,14 +244,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 243 | # CONFIG_IRDA is not set | 244 | # CONFIG_IRDA is not set |
| 244 | # CONFIG_BT is not set | 245 | # CONFIG_BT is not set |
| 245 | # CONFIG_AF_RXRPC is not set | 246 | # CONFIG_AF_RXRPC is not set |
| 246 | 247 | # CONFIG_WIRELESS is not set | |
| 247 | # | 248 | # CONFIG_WIMAX is not set |
| 248 | # Wireless | ||
| 249 | # | ||
| 250 | # CONFIG_CFG80211 is not set | ||
| 251 | # CONFIG_WIRELESS_EXT is not set | ||
| 252 | # CONFIG_MAC80211 is not set | ||
| 253 | # CONFIG_IEEE80211 is not set | ||
| 254 | # CONFIG_RFKILL is not set | 249 | # CONFIG_RFKILL is not set |
| 255 | # CONFIG_NET_9P is not set | 250 | # CONFIG_NET_9P is not set |
| 256 | 251 | ||
| @@ -289,10 +284,8 @@ CONFIG_MTD_BLOCK=y | |||
| 289 | # | 284 | # |
| 290 | # RAM/ROM/Flash chip drivers | 285 | # RAM/ROM/Flash chip drivers |
| 291 | # | 286 | # |
| 292 | CONFIG_MTD_CFI=y | 287 | # CONFIG_MTD_CFI is not set |
| 293 | # CONFIG_MTD_JEDECPROBE is not set | 288 | # CONFIG_MTD_JEDECPROBE is not set |
| 294 | CONFIG_MTD_GEN_PROBE=y | ||
| 295 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 296 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | 289 | CONFIG_MTD_MAP_BANK_WIDTH_1=y |
| 297 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | 290 | CONFIG_MTD_MAP_BANK_WIDTH_2=y |
| 298 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | 291 | CONFIG_MTD_MAP_BANK_WIDTH_4=y |
| @@ -303,10 +296,6 @@ CONFIG_MTD_CFI_I1=y | |||
| 303 | CONFIG_MTD_CFI_I2=y | 296 | CONFIG_MTD_CFI_I2=y |
| 304 | # CONFIG_MTD_CFI_I4 is not set | 297 | # CONFIG_MTD_CFI_I4 is not set |
| 305 | # CONFIG_MTD_CFI_I8 is not set | 298 | # CONFIG_MTD_CFI_I8 is not set |
| 306 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 307 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 308 | # CONFIG_MTD_CFI_STAA is not set | ||
| 309 | CONFIG_MTD_CFI_UTIL=y | ||
| 310 | CONFIG_MTD_RAM=y | 299 | CONFIG_MTD_RAM=y |
| 311 | # CONFIG_MTD_ROM is not set | 300 | # CONFIG_MTD_ROM is not set |
| 312 | # CONFIG_MTD_ABSENT is not set | 301 | # CONFIG_MTD_ABSENT is not set |
| @@ -315,7 +304,6 @@ CONFIG_MTD_RAM=y | |||
| 315 | # Mapping drivers for chip access | 304 | # Mapping drivers for chip access |
| 316 | # | 305 | # |
| 317 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 306 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 318 | # CONFIG_MTD_PHYSMAP is not set | ||
| 319 | CONFIG_MTD_UCLINUX=y | 307 | CONFIG_MTD_UCLINUX=y |
| 320 | # CONFIG_MTD_PLATRAM is not set | 308 | # CONFIG_MTD_PLATRAM is not set |
| 321 | 309 | ||
| @@ -337,6 +325,11 @@ CONFIG_MTD_UCLINUX=y | |||
| 337 | # CONFIG_MTD_ONENAND is not set | 325 | # CONFIG_MTD_ONENAND is not set |
| 338 | 326 | ||
| 339 | # | 327 | # |
| 328 | # LPDDR flash memory drivers | ||
| 329 | # | ||
| 330 | # CONFIG_MTD_LPDDR is not set | ||
| 331 | |||
| 332 | # | ||
| 340 | # UBI - Unsorted block images | 333 | # UBI - Unsorted block images |
| 341 | # | 334 | # |
| 342 | # CONFIG_MTD_UBI is not set | 335 | # CONFIG_MTD_UBI is not set |
| @@ -351,6 +344,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 351 | # CONFIG_BLK_DEV_XIP is not set | 344 | # CONFIG_BLK_DEV_XIP is not set |
| 352 | # CONFIG_CDROM_PKTCDVD is not set | 345 | # CONFIG_CDROM_PKTCDVD is not set |
| 353 | # CONFIG_ATA_OVER_ETH is not set | 346 | # CONFIG_ATA_OVER_ETH is not set |
| 347 | # CONFIG_BLK_DEV_HD is not set | ||
| 354 | # CONFIG_MISC_DEVICES is not set | 348 | # CONFIG_MISC_DEVICES is not set |
| 355 | CONFIG_HAVE_IDE=y | 349 | CONFIG_HAVE_IDE=y |
| 356 | # CONFIG_IDE is not set | 350 | # CONFIG_IDE is not set |
| @@ -364,7 +358,7 @@ CONFIG_HAVE_IDE=y | |||
| 364 | # CONFIG_SCSI_NETLINK is not set | 358 | # CONFIG_SCSI_NETLINK is not set |
| 365 | # CONFIG_MD is not set | 359 | # CONFIG_MD is not set |
| 366 | CONFIG_NETDEVICES=y | 360 | CONFIG_NETDEVICES=y |
| 367 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 361 | CONFIG_COMPAT_NET_DEV_OPS=y |
| 368 | # CONFIG_DUMMY is not set | 362 | # CONFIG_DUMMY is not set |
| 369 | # CONFIG_BONDING is not set | 363 | # CONFIG_BONDING is not set |
| 370 | # CONFIG_MACVLAN is not set | 364 | # CONFIG_MACVLAN is not set |
| @@ -374,10 +368,15 @@ CONFIG_NETDEVICES=y | |||
| 374 | # CONFIG_PHYLIB is not set | 368 | # CONFIG_PHYLIB is not set |
| 375 | CONFIG_NET_ETHERNET=y | 369 | CONFIG_NET_ETHERNET=y |
| 376 | # CONFIG_MII is not set | 370 | # CONFIG_MII is not set |
| 371 | # CONFIG_ETHOC is not set | ||
| 372 | # CONFIG_DNET is not set | ||
| 377 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 373 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 378 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 374 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 379 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 375 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 380 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 376 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 377 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 378 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 379 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 381 | # CONFIG_B44 is not set | 380 | # CONFIG_B44 is not set |
| 382 | CONFIG_FEC=y | 381 | CONFIG_FEC=y |
| 383 | # CONFIG_FEC2 is not set | 382 | # CONFIG_FEC2 is not set |
| @@ -389,8 +388,10 @@ CONFIG_FEC=y | |||
| 389 | # | 388 | # |
| 390 | # CONFIG_WLAN_PRE80211 is not set | 389 | # CONFIG_WLAN_PRE80211 is not set |
| 391 | # CONFIG_WLAN_80211 is not set | 390 | # CONFIG_WLAN_80211 is not set |
| 392 | # CONFIG_IWLWIFI is not set | 391 | |
| 393 | # CONFIG_IWLWIFI_LEDS is not set | 392 | # |
| 393 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 394 | # | ||
| 394 | # CONFIG_WAN is not set | 395 | # CONFIG_WAN is not set |
| 395 | # CONFIG_PPP is not set | 396 | # CONFIG_PPP is not set |
| 396 | # CONFIG_SLIP is not set | 397 | # CONFIG_SLIP is not set |
| @@ -415,7 +416,7 @@ CONFIG_FEC=y | |||
| 415 | # Character devices | 416 | # Character devices |
| 416 | # | 417 | # |
| 417 | # CONFIG_VT is not set | 418 | # CONFIG_VT is not set |
| 418 | # CONFIG_DEVKMEM is not set | 419 | CONFIG_DEVKMEM=y |
| 419 | # CONFIG_SERIAL_NONSTANDARD is not set | 420 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 420 | 421 | ||
| 421 | # | 422 | # |
| @@ -428,7 +429,6 @@ CONFIG_FEC=y | |||
| 428 | # | 429 | # |
| 429 | CONFIG_SERIAL_CORE=y | 430 | CONFIG_SERIAL_CORE=y |
| 430 | CONFIG_SERIAL_CORE_CONSOLE=y | 431 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 431 | # CONFIG_SERIAL_COLDFIRE is not set | ||
| 432 | CONFIG_SERIAL_MCF=y | 432 | CONFIG_SERIAL_MCF=y |
| 433 | CONFIG_SERIAL_MCF_BAUDRATE=115200 | 433 | CONFIG_SERIAL_MCF_BAUDRATE=115200 |
| 434 | CONFIG_SERIAL_MCF_CONSOLE=y | 434 | CONFIG_SERIAL_MCF_CONSOLE=y |
| @@ -447,19 +447,23 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 447 | # CONFIG_POWER_SUPPLY is not set | 447 | # CONFIG_POWER_SUPPLY is not set |
| 448 | # CONFIG_HWMON is not set | 448 | # CONFIG_HWMON is not set |
| 449 | # CONFIG_THERMAL is not set | 449 | # CONFIG_THERMAL is not set |
| 450 | # CONFIG_THERMAL_HWMON is not set | ||
| 450 | # CONFIG_WATCHDOG is not set | 451 | # CONFIG_WATCHDOG is not set |
| 452 | CONFIG_SSB_POSSIBLE=y | ||
| 451 | 453 | ||
| 452 | # | 454 | # |
| 453 | # Sonics Silicon Backplane | 455 | # Sonics Silicon Backplane |
| 454 | # | 456 | # |
| 455 | CONFIG_SSB_POSSIBLE=y | ||
| 456 | # CONFIG_SSB is not set | 457 | # CONFIG_SSB is not set |
| 457 | 458 | ||
| 458 | # | 459 | # |
| 459 | # Multifunction device drivers | 460 | # Multifunction device drivers |
| 460 | # | 461 | # |
| 462 | # CONFIG_MFD_CORE is not set | ||
| 461 | # CONFIG_MFD_SM501 is not set | 463 | # CONFIG_MFD_SM501 is not set |
| 462 | # CONFIG_HTC_PASIC3 is not set | 464 | # CONFIG_HTC_PASIC3 is not set |
| 465 | # CONFIG_MFD_TMIO is not set | ||
| 466 | # CONFIG_REGULATOR is not set | ||
| 463 | 467 | ||
| 464 | # | 468 | # |
| 465 | # Multimedia devices | 469 | # Multimedia devices |
| @@ -470,11 +474,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 470 | # | 474 | # |
| 471 | # CONFIG_VIDEO_DEV is not set | 475 | # CONFIG_VIDEO_DEV is not set |
| 472 | # CONFIG_DVB_CORE is not set | 476 | # CONFIG_DVB_CORE is not set |
| 477 | # CONFIG_VIDEO_MEDIA is not set | ||
| 473 | 478 | ||
| 474 | # | 479 | # |
| 475 | # Multimedia drivers | 480 | # Multimedia drivers |
| 476 | # | 481 | # |
| 477 | # CONFIG_DAB is not set | 482 | CONFIG_DAB=y |
| 478 | 483 | ||
| 479 | # | 484 | # |
| 480 | # Graphics support | 485 | # Graphics support |
| @@ -488,10 +493,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 488 | # Display device support | 493 | # Display device support |
| 489 | # | 494 | # |
| 490 | # CONFIG_DISPLAY_SUPPORT is not set | 495 | # CONFIG_DISPLAY_SUPPORT is not set |
| 491 | |||
| 492 | # | ||
| 493 | # Sound | ||
| 494 | # | ||
| 495 | # CONFIG_SOUND is not set | 496 | # CONFIG_SOUND is not set |
| 496 | # CONFIG_USB_SUPPORT is not set | 497 | # CONFIG_USB_SUPPORT is not set |
| 497 | # CONFIG_MMC is not set | 498 | # CONFIG_MMC is not set |
| @@ -499,7 +500,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 499 | # CONFIG_NEW_LEDS is not set | 500 | # CONFIG_NEW_LEDS is not set |
| 500 | # CONFIG_ACCESSIBILITY is not set | 501 | # CONFIG_ACCESSIBILITY is not set |
| 501 | # CONFIG_RTC_CLASS is not set | 502 | # CONFIG_RTC_CLASS is not set |
| 503 | # CONFIG_DMADEVICES is not set | ||
| 504 | # CONFIG_AUXDISPLAY is not set | ||
| 502 | # CONFIG_UIO is not set | 505 | # CONFIG_UIO is not set |
| 506 | # CONFIG_STAGING is not set | ||
| 503 | 507 | ||
| 504 | # | 508 | # |
| 505 | # File systems | 509 | # File systems |
| @@ -507,11 +511,13 @@ CONFIG_SSB_POSSIBLE=y | |||
| 507 | CONFIG_EXT2_FS=y | 511 | CONFIG_EXT2_FS=y |
| 508 | # CONFIG_EXT2_FS_XATTR is not set | 512 | # CONFIG_EXT2_FS_XATTR is not set |
| 509 | # CONFIG_EXT3_FS is not set | 513 | # CONFIG_EXT3_FS is not set |
| 510 | # CONFIG_EXT4DEV_FS is not set | 514 | # CONFIG_EXT4_FS is not set |
| 511 | # CONFIG_REISERFS_FS is not set | 515 | # CONFIG_REISERFS_FS is not set |
| 512 | # CONFIG_JFS_FS is not set | 516 | # CONFIG_JFS_FS is not set |
| 513 | # CONFIG_FS_POSIX_ACL is not set | 517 | # CONFIG_FS_POSIX_ACL is not set |
| 518 | # CONFIG_FILE_LOCKING is not set | ||
| 514 | # CONFIG_XFS_FS is not set | 519 | # CONFIG_XFS_FS is not set |
| 520 | # CONFIG_BTRFS_FS is not set | ||
| 515 | # CONFIG_DNOTIFY is not set | 521 | # CONFIG_DNOTIFY is not set |
| 516 | # CONFIG_INOTIFY is not set | 522 | # CONFIG_INOTIFY is not set |
| 517 | # CONFIG_QUOTA is not set | 523 | # CONFIG_QUOTA is not set |
| @@ -520,6 +526,11 @@ CONFIG_EXT2_FS=y | |||
| 520 | # CONFIG_FUSE_FS is not set | 526 | # CONFIG_FUSE_FS is not set |
| 521 | 527 | ||
| 522 | # | 528 | # |
| 529 | # Caches | ||
| 530 | # | ||
| 531 | # CONFIG_FSCACHE is not set | ||
| 532 | |||
| 533 | # | ||
| 523 | # CD-ROM/DVD Filesystems | 534 | # CD-ROM/DVD Filesystems |
| 524 | # | 535 | # |
| 525 | # CONFIG_ISO9660_FS is not set | 536 | # CONFIG_ISO9660_FS is not set |
| @@ -540,10 +551,7 @@ CONFIG_PROC_SYSCTL=y | |||
| 540 | # CONFIG_SYSFS is not set | 551 | # CONFIG_SYSFS is not set |
| 541 | # CONFIG_TMPFS is not set | 552 | # CONFIG_TMPFS is not set |
| 542 | # CONFIG_HUGETLB_PAGE is not set | 553 | # CONFIG_HUGETLB_PAGE is not set |
| 543 | 554 | CONFIG_MISC_FILESYSTEMS=y | |
| 544 | # | ||
| 545 | # Miscellaneous filesystems | ||
| 546 | # | ||
| 547 | # CONFIG_ADFS_FS is not set | 555 | # CONFIG_ADFS_FS is not set |
| 548 | # CONFIG_AFFS_FS is not set | 556 | # CONFIG_AFFS_FS is not set |
| 549 | # CONFIG_HFS_FS is not set | 557 | # CONFIG_HFS_FS is not set |
| @@ -553,13 +561,20 @@ CONFIG_PROC_SYSCTL=y | |||
| 553 | # CONFIG_EFS_FS is not set | 561 | # CONFIG_EFS_FS is not set |
| 554 | # CONFIG_JFFS2_FS is not set | 562 | # CONFIG_JFFS2_FS is not set |
| 555 | # CONFIG_CRAMFS is not set | 563 | # CONFIG_CRAMFS is not set |
| 564 | # CONFIG_SQUASHFS is not set | ||
| 556 | # CONFIG_VXFS_FS is not set | 565 | # CONFIG_VXFS_FS is not set |
| 557 | # CONFIG_MINIX_FS is not set | 566 | # CONFIG_MINIX_FS is not set |
| 567 | # CONFIG_OMFS_FS is not set | ||
| 558 | # CONFIG_HPFS_FS is not set | 568 | # CONFIG_HPFS_FS is not set |
| 559 | # CONFIG_QNX4FS_FS is not set | 569 | # CONFIG_QNX4FS_FS is not set |
| 560 | CONFIG_ROMFS_FS=y | 570 | CONFIG_ROMFS_FS=y |
| 571 | # CONFIG_ROMFS_BACKED_BY_BLOCK is not set | ||
| 572 | CONFIG_ROMFS_BACKED_BY_MTD=y | ||
| 573 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 574 | CONFIG_ROMFS_ON_MTD=y | ||
| 561 | # CONFIG_SYSV_FS is not set | 575 | # CONFIG_SYSV_FS is not set |
| 562 | # CONFIG_UFS_FS is not set | 576 | # CONFIG_UFS_FS is not set |
| 577 | # CONFIG_NILFS2_FS is not set | ||
| 563 | # CONFIG_NETWORK_FILESYSTEMS is not set | 578 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 564 | 579 | ||
| 565 | # | 580 | # |
| @@ -581,10 +596,14 @@ CONFIG_FRAME_WARN=1024 | |||
| 581 | # CONFIG_HEADERS_CHECK is not set | 596 | # CONFIG_HEADERS_CHECK is not set |
| 582 | # CONFIG_DEBUG_KERNEL is not set | 597 | # CONFIG_DEBUG_KERNEL is not set |
| 583 | # CONFIG_DEBUG_BUGVERBOSE is not set | 598 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 599 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 600 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 601 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 584 | # CONFIG_SAMPLES is not set | 602 | # CONFIG_SAMPLES is not set |
| 585 | CONFIG_FULLDEBUG=y | 603 | CONFIG_FULLDEBUG=y |
| 586 | # CONFIG_HIGHPROFILE is not set | 604 | # CONFIG_HIGHPROFILE is not set |
| 587 | # CONFIG_BOOTPARAM is not set | 605 | CONFIG_BOOTPARAM=y |
| 606 | CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0" | ||
| 588 | # CONFIG_NO_KERNEL_MSG is not set | 607 | # CONFIG_NO_KERNEL_MSG is not set |
| 589 | # CONFIG_BDM_DISABLE is not set | 608 | # CONFIG_BDM_DISABLE is not set |
| 590 | 609 | ||
| @@ -592,19 +611,23 @@ CONFIG_FULLDEBUG=y | |||
| 592 | # Security options | 611 | # Security options |
| 593 | # | 612 | # |
| 594 | # CONFIG_KEYS is not set | 613 | # CONFIG_KEYS is not set |
| 614 | # CONFIG_SECURITYFS is not set | ||
| 595 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 615 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 596 | # CONFIG_CRYPTO is not set | 616 | # CONFIG_CRYPTO is not set |
| 617 | # CONFIG_BINARY_PRINTF is not set | ||
| 597 | 618 | ||
| 598 | # | 619 | # |
| 599 | # Library routines | 620 | # Library routines |
| 600 | # | 621 | # |
| 601 | CONFIG_BITREVERSE=y | 622 | CONFIG_BITREVERSE=y |
| 602 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 623 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 603 | # CONFIG_CRC_CCITT is not set | 624 | # CONFIG_CRC_CCITT is not set |
| 604 | # CONFIG_CRC16 is not set | 625 | # CONFIG_CRC16 is not set |
| 626 | # CONFIG_CRC_T10DIF is not set | ||
| 605 | # CONFIG_CRC_ITU_T is not set | 627 | # CONFIG_CRC_ITU_T is not set |
| 606 | CONFIG_CRC32=y | 628 | CONFIG_CRC32=y |
| 607 | # CONFIG_CRC7 is not set | 629 | # CONFIG_CRC7 is not set |
| 608 | # CONFIG_LIBCRC32C is not set | 630 | # CONFIG_LIBCRC32C is not set |
| 609 | CONFIG_HAS_IOMEM=y | 631 | CONFIG_HAS_IOMEM=y |
| 610 | CONFIG_HAS_DMA=y | 632 | CONFIG_HAS_DMA=y |
| 633 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68knommu/configs/m5249evb_defconfig b/arch/m68knommu/configs/m5249evb_defconfig index cc6458333d6..2efba32e33a 100644 --- a/arch/m68knommu/configs/m5249evb_defconfig +++ b/arch/m68knommu/configs/m5249evb_defconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Wed Apr 22 17:32:41 2009 | ||
| 4 | # | 5 | # |
| 5 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 6 | # CONFIG_MMU is not set | 7 | # CONFIG_MMU is not set |
| @@ -15,9 +16,10 @@ CONFIG_GENERIC_HWEIGHT=y | |||
| 15 | CONFIG_GENERIC_HARDIRQS=y | 16 | CONFIG_GENERIC_HARDIRQS=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 17 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_TIME=y | 18 | CONFIG_GENERIC_TIME=y |
| 19 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 18 | CONFIG_TIME_LOW_RES=y | 20 | CONFIG_TIME_LOW_RES=y |
| 21 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
| 19 | CONFIG_NO_IOPORT=y | 22 | CONFIG_NO_IOPORT=y |
| 20 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 22 | 24 | ||
| 23 | # | 25 | # |
| @@ -29,11 +31,23 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
| 29 | CONFIG_LOCALVERSION="" | 31 | CONFIG_LOCALVERSION="" |
| 30 | CONFIG_LOCALVERSION_AUTO=y | 32 | CONFIG_LOCALVERSION_AUTO=y |
| 31 | # CONFIG_SYSVIPC is not set | 33 | # CONFIG_SYSVIPC is not set |
| 34 | # CONFIG_POSIX_MQUEUE is not set | ||
| 32 | # CONFIG_BSD_PROCESS_ACCT is not set | 35 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 36 | # CONFIG_TASKSTATS is not set | ||
| 37 | # CONFIG_AUDIT is not set | ||
| 38 | |||
| 39 | # | ||
| 40 | # RCU Subsystem | ||
| 41 | # | ||
| 42 | CONFIG_CLASSIC_RCU=y | ||
| 43 | # CONFIG_TREE_RCU is not set | ||
| 44 | # CONFIG_PREEMPT_RCU is not set | ||
| 45 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 46 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 33 | # CONFIG_IKCONFIG is not set | 47 | # CONFIG_IKCONFIG is not set |
| 34 | CONFIG_LOG_BUF_SHIFT=14 | 48 | CONFIG_LOG_BUF_SHIFT=14 |
| 35 | # CONFIG_CGROUPS is not set | ||
| 36 | # CONFIG_GROUP_SCHED is not set | 49 | # CONFIG_GROUP_SCHED is not set |
| 50 | # CONFIG_CGROUPS is not set | ||
| 37 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 51 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 38 | # CONFIG_RELAY is not set | 52 | # CONFIG_RELAY is not set |
| 39 | # CONFIG_NAMESPACES is not set | 53 | # CONFIG_NAMESPACES is not set |
| @@ -41,44 +55,37 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 55 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 42 | CONFIG_SYSCTL=y | 56 | CONFIG_SYSCTL=y |
| 43 | CONFIG_EMBEDDED=y | 57 | CONFIG_EMBEDDED=y |
| 44 | # CONFIG_UID16 is not set | 58 | CONFIG_UID16=y |
| 45 | # CONFIG_SYSCTL_SYSCALL is not set | 59 | CONFIG_SYSCTL_SYSCALL=y |
| 46 | # CONFIG_KALLSYMS is not set | 60 | # CONFIG_KALLSYMS is not set |
| 61 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 47 | # CONFIG_HOTPLUG is not set | 62 | # CONFIG_HOTPLUG is not set |
| 48 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
| 49 | CONFIG_BUG=y | 64 | CONFIG_BUG=y |
| 50 | CONFIG_ELF_CORE=y | 65 | CONFIG_ELF_CORE=y |
| 51 | # CONFIG_COMPAT_BRK is not set | ||
| 52 | CONFIG_BASE_FULL=y | 66 | CONFIG_BASE_FULL=y |
| 53 | # CONFIG_FUTEX is not set | 67 | # CONFIG_FUTEX is not set |
| 54 | # CONFIG_EPOLL is not set | 68 | # CONFIG_EPOLL is not set |
| 55 | # CONFIG_SIGNALFD is not set | 69 | # CONFIG_SIGNALFD is not set |
| 56 | # CONFIG_TIMERFD is not set | 70 | # CONFIG_TIMERFD is not set |
| 57 | # CONFIG_EVENTFD is not set | 71 | # CONFIG_EVENTFD is not set |
| 72 | # CONFIG_AIO is not set | ||
| 58 | # CONFIG_VM_EVENT_COUNTERS is not set | 73 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 59 | CONFIG_SLAB=y | 74 | # CONFIG_SLUB_DEBUG is not set |
| 60 | # CONFIG_SLUB is not set | 75 | CONFIG_COMPAT_BRK=y |
| 76 | # CONFIG_SLAB is not set | ||
| 77 | CONFIG_SLUB=y | ||
| 61 | # CONFIG_SLOB is not set | 78 | # CONFIG_SLOB is not set |
| 62 | # CONFIG_PROFILING is not set | 79 | # CONFIG_PROFILING is not set |
| 63 | # CONFIG_MARKERS is not set | 80 | # CONFIG_MARKERS is not set |
| 64 | # CONFIG_HAVE_OPROFILE is not set | 81 | # CONFIG_SLOW_WORK is not set |
| 65 | # CONFIG_HAVE_KPROBES is not set | 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 66 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 67 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 68 | CONFIG_SLABINFO=y | ||
| 69 | CONFIG_TINY_SHMEM=y | ||
| 70 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
| 71 | CONFIG_MODULES=y | 84 | # CONFIG_MODULES is not set |
| 72 | CONFIG_MODULE_UNLOAD=y | ||
| 73 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 74 | # CONFIG_MODVERSIONS is not set | ||
| 75 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 76 | # CONFIG_KMOD is not set | ||
| 77 | CONFIG_BLOCK=y | 85 | CONFIG_BLOCK=y |
| 78 | # CONFIG_LBD is not set | 86 | # CONFIG_LBD is not set |
| 79 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 80 | # CONFIG_LSF is not set | ||
| 81 | # CONFIG_BLK_DEV_BSG is not set | 87 | # CONFIG_BLK_DEV_BSG is not set |
| 88 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 82 | 89 | ||
| 83 | # | 90 | # |
| 84 | # IO Schedulers | 91 | # IO Schedulers |
| @@ -92,7 +99,7 @@ CONFIG_IOSCHED_NOOP=y | |||
| 92 | # CONFIG_DEFAULT_CFQ is not set | 99 | # CONFIG_DEFAULT_CFQ is not set |
| 93 | CONFIG_DEFAULT_NOOP=y | 100 | CONFIG_DEFAULT_NOOP=y |
| 94 | CONFIG_DEFAULT_IOSCHED="noop" | 101 | CONFIG_DEFAULT_IOSCHED="noop" |
| 95 | CONFIG_CLASSIC_RCU=y | 102 | # CONFIG_FREEZER is not set |
| 96 | 103 | ||
| 97 | # | 104 | # |
| 98 | # Processor type and features | 105 | # Processor type and features |
| @@ -144,45 +151,103 @@ CONFIG_RAMAUTOBIT=y | |||
| 144 | # CONFIG_ROM is not set | 151 | # CONFIG_ROM is not set |
| 145 | CONFIG_RAMKERNEL=y | 152 | CONFIG_RAMKERNEL=y |
| 146 | # CONFIG_ROMKERNEL is not set | 153 | # CONFIG_ROMKERNEL is not set |
| 154 | CONFIG_PREEMPT_NONE=y | ||
| 155 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 156 | # CONFIG_PREEMPT is not set | ||
| 147 | CONFIG_SELECT_MEMORY_MODEL=y | 157 | CONFIG_SELECT_MEMORY_MODEL=y |
| 148 | CONFIG_FLATMEM_MANUAL=y | 158 | CONFIG_FLATMEM_MANUAL=y |
| 149 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 159 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 150 | # CONFIG_SPARSEMEM_MANUAL is not set | 160 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 151 | CONFIG_FLATMEM=y | 161 | CONFIG_FLATMEM=y |
| 152 | CONFIG_FLAT_NODE_MEM_MAP=y | 162 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 153 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 155 | CONFIG_PAGEFLAGS_EXTENDED=y | 163 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 164 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 157 | # CONFIG_RESOURCES_64BIT is not set | 165 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 158 | CONFIG_ZONE_DMA_FLAG=1 | 166 | CONFIG_ZONE_DMA_FLAG=1 |
| 159 | CONFIG_VIRT_TO_BUS=y | 167 | CONFIG_VIRT_TO_BUS=y |
| 168 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 160 | CONFIG_ISA_DMA_API=y | 169 | CONFIG_ISA_DMA_API=y |
| 161 | 170 | ||
| 162 | # | 171 | # |
| 163 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 164 | # | ||
| 165 | # CONFIG_PCI is not set | ||
| 166 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 167 | |||
| 168 | # | ||
| 169 | # Executable file formats | 172 | # Executable file formats |
| 170 | # | 173 | # |
| 171 | CONFIG_BINFMT_FLAT=y | 174 | CONFIG_BINFMT_FLAT=y |
| 172 | # CONFIG_BINFMT_ZFLAT is not set | 175 | # CONFIG_BINFMT_ZFLAT is not set |
| 173 | # CONFIG_BINFMT_SHARED_FLAT is not set | 176 | # CONFIG_BINFMT_SHARED_FLAT is not set |
| 174 | # CONFIG_BINFMT_AOUT is not set | 177 | # CONFIG_HAVE_AOUT is not set |
| 175 | # CONFIG_BINFMT_MISC is not set | 178 | # CONFIG_BINFMT_MISC is not set |
| 176 | 179 | ||
| 177 | # | 180 | # |
| 178 | # Power management options | 181 | # Power management options |
| 179 | # | 182 | # |
| 180 | # CONFIG_PM is not set | 183 | # CONFIG_PM is not set |
| 181 | 184 | CONFIG_NET=y | |
| 182 | # | 185 | |
| 183 | # Networking | 186 | # |
| 184 | # | 187 | # Networking options |
| 185 | # CONFIG_NET is not set | 188 | # |
| 189 | CONFIG_PACKET=y | ||
| 190 | # CONFIG_PACKET_MMAP is not set | ||
| 191 | CONFIG_UNIX=y | ||
| 192 | # CONFIG_NET_KEY is not set | ||
| 193 | CONFIG_INET=y | ||
| 194 | # CONFIG_IP_MULTICAST is not set | ||
| 195 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 196 | CONFIG_IP_FIB_HASH=y | ||
| 197 | # CONFIG_IP_PNP is not set | ||
| 198 | # CONFIG_NET_IPIP is not set | ||
| 199 | # CONFIG_NET_IPGRE is not set | ||
| 200 | # CONFIG_ARPD is not set | ||
| 201 | # CONFIG_SYN_COOKIES is not set | ||
| 202 | # CONFIG_INET_AH is not set | ||
| 203 | # CONFIG_INET_ESP is not set | ||
| 204 | # CONFIG_INET_IPCOMP is not set | ||
| 205 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 206 | # CONFIG_INET_TUNNEL is not set | ||
| 207 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 208 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 209 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 210 | # CONFIG_INET_LRO is not set | ||
| 211 | # CONFIG_INET_DIAG is not set | ||
| 212 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 213 | CONFIG_TCP_CONG_CUBIC=y | ||
| 214 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 215 | # CONFIG_TCP_MD5SIG is not set | ||
| 216 | # CONFIG_IPV6 is not set | ||
| 217 | # CONFIG_NETWORK_SECMARK is not set | ||
| 218 | # CONFIG_NETFILTER is not set | ||
| 219 | # CONFIG_IP_DCCP is not set | ||
| 220 | # CONFIG_IP_SCTP is not set | ||
| 221 | # CONFIG_TIPC is not set | ||
| 222 | # CONFIG_ATM is not set | ||
| 223 | # CONFIG_BRIDGE is not set | ||
| 224 | # CONFIG_NET_DSA is not set | ||
| 225 | # CONFIG_VLAN_8021Q is not set | ||
| 226 | # CONFIG_DECNET is not set | ||
| 227 | # CONFIG_LLC2 is not set | ||
| 228 | # CONFIG_IPX is not set | ||
| 229 | # CONFIG_ATALK is not set | ||
| 230 | # CONFIG_X25 is not set | ||
| 231 | # CONFIG_LAPB is not set | ||
| 232 | # CONFIG_ECONET is not set | ||
| 233 | # CONFIG_WAN_ROUTER is not set | ||
| 234 | # CONFIG_PHONET is not set | ||
| 235 | # CONFIG_NET_SCHED is not set | ||
| 236 | # CONFIG_DCB is not set | ||
| 237 | |||
| 238 | # | ||
| 239 | # Network testing | ||
| 240 | # | ||
| 241 | # CONFIG_NET_PKTGEN is not set | ||
| 242 | # CONFIG_HAMRADIO is not set | ||
| 243 | # CONFIG_CAN is not set | ||
| 244 | # CONFIG_IRDA is not set | ||
| 245 | # CONFIG_BT is not set | ||
| 246 | # CONFIG_AF_RXRPC is not set | ||
| 247 | # CONFIG_WIRELESS is not set | ||
| 248 | # CONFIG_WIMAX is not set | ||
| 249 | # CONFIG_RFKILL is not set | ||
| 250 | # CONFIG_NET_9P is not set | ||
| 186 | 251 | ||
| 187 | # | 252 | # |
| 188 | # Device Drivers | 253 | # Device Drivers |
| @@ -194,6 +259,7 @@ CONFIG_BINFMT_FLAT=y | |||
| 194 | CONFIG_STANDALONE=y | 259 | CONFIG_STANDALONE=y |
| 195 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 260 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 196 | # CONFIG_SYS_HYPERVISOR is not set | 261 | # CONFIG_SYS_HYPERVISOR is not set |
| 262 | # CONFIG_CONNECTOR is not set | ||
| 197 | CONFIG_MTD=y | 263 | CONFIG_MTD=y |
| 198 | # CONFIG_MTD_DEBUG is not set | 264 | # CONFIG_MTD_DEBUG is not set |
| 199 | # CONFIG_MTD_CONCAT is not set | 265 | # CONFIG_MTD_CONCAT is not set |
| @@ -259,6 +325,11 @@ CONFIG_MTD_UCLINUX=y | |||
| 259 | # CONFIG_MTD_ONENAND is not set | 325 | # CONFIG_MTD_ONENAND is not set |
| 260 | 326 | ||
| 261 | # | 327 | # |
| 328 | # LPDDR flash memory drivers | ||
| 329 | # | ||
| 330 | # CONFIG_MTD_LPDDR is not set | ||
| 331 | |||
| 332 | # | ||
| 262 | # UBI - Unsorted block images | 333 | # UBI - Unsorted block images |
| 263 | # | 334 | # |
| 264 | # CONFIG_MTD_UBI is not set | 335 | # CONFIG_MTD_UBI is not set |
| @@ -266,14 +337,15 @@ CONFIG_MTD_UCLINUX=y | |||
| 266 | CONFIG_BLK_DEV=y | 337 | CONFIG_BLK_DEV=y |
| 267 | # CONFIG_BLK_DEV_COW_COMMON is not set | 338 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 268 | # CONFIG_BLK_DEV_LOOP is not set | 339 | # CONFIG_BLK_DEV_LOOP is not set |
| 340 | # CONFIG_BLK_DEV_NBD is not set | ||
| 269 | CONFIG_BLK_DEV_RAM=y | 341 | CONFIG_BLK_DEV_RAM=y |
| 270 | CONFIG_BLK_DEV_RAM_COUNT=16 | 342 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 271 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 343 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 272 | # CONFIG_BLK_DEV_XIP is not set | 344 | # CONFIG_BLK_DEV_XIP is not set |
| 273 | # CONFIG_CDROM_PKTCDVD is not set | 345 | # CONFIG_CDROM_PKTCDVD is not set |
| 274 | CONFIG_MISC_DEVICES=y | 346 | # CONFIG_ATA_OVER_ETH is not set |
| 275 | # CONFIG_EEPROM_93CX6 is not set | 347 | # CONFIG_BLK_DEV_HD is not set |
| 276 | # CONFIG_ENCLOSURE_SERVICES is not set | 348 | # CONFIG_MISC_DEVICES is not set |
| 277 | CONFIG_HAVE_IDE=y | 349 | CONFIG_HAVE_IDE=y |
| 278 | # CONFIG_IDE is not set | 350 | # CONFIG_IDE is not set |
| 279 | 351 | ||
| @@ -285,6 +357,56 @@ CONFIG_HAVE_IDE=y | |||
| 285 | # CONFIG_SCSI_DMA is not set | 357 | # CONFIG_SCSI_DMA is not set |
| 286 | # CONFIG_SCSI_NETLINK is not set | 358 | # CONFIG_SCSI_NETLINK is not set |
| 287 | # CONFIG_MD is not set | 359 | # CONFIG_MD is not set |
| 360 | CONFIG_NETDEVICES=y | ||
| 361 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 362 | # CONFIG_DUMMY is not set | ||
| 363 | # CONFIG_BONDING is not set | ||
| 364 | # CONFIG_MACVLAN is not set | ||
| 365 | # CONFIG_EQUALIZER is not set | ||
| 366 | # CONFIG_TUN is not set | ||
| 367 | # CONFIG_VETH is not set | ||
| 368 | # CONFIG_PHYLIB is not set | ||
| 369 | CONFIG_NET_ETHERNET=y | ||
| 370 | # CONFIG_MII is not set | ||
| 371 | # CONFIG_ETHOC is not set | ||
| 372 | # CONFIG_DNET is not set | ||
| 373 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 374 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 375 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 376 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 377 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 378 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 379 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 380 | # CONFIG_B44 is not set | ||
| 381 | # CONFIG_NETDEV_1000 is not set | ||
| 382 | # CONFIG_NETDEV_10000 is not set | ||
| 383 | |||
| 384 | # | ||
| 385 | # Wireless LAN | ||
| 386 | # | ||
| 387 | # CONFIG_WLAN_PRE80211 is not set | ||
| 388 | # CONFIG_WLAN_80211 is not set | ||
| 389 | |||
| 390 | # | ||
| 391 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 392 | # | ||
| 393 | # CONFIG_WAN is not set | ||
| 394 | CONFIG_PPP=y | ||
| 395 | # CONFIG_PPP_MULTILINK is not set | ||
| 396 | # CONFIG_PPP_FILTER is not set | ||
| 397 | # CONFIG_PPP_ASYNC is not set | ||
| 398 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 399 | # CONFIG_PPP_DEFLATE is not set | ||
| 400 | # CONFIG_PPP_BSDCOMP is not set | ||
| 401 | # CONFIG_PPP_MPPE is not set | ||
| 402 | # CONFIG_PPPOE is not set | ||
| 403 | # CONFIG_PPPOL2TP is not set | ||
| 404 | # CONFIG_SLIP is not set | ||
| 405 | CONFIG_SLHC=y | ||
| 406 | # CONFIG_NETCONSOLE is not set | ||
| 407 | # CONFIG_NETPOLL is not set | ||
| 408 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 409 | # CONFIG_ISDN is not set | ||
| 288 | # CONFIG_PHONE is not set | 410 | # CONFIG_PHONE is not set |
| 289 | 411 | ||
| 290 | # | 412 | # |
| @@ -302,7 +424,7 @@ CONFIG_HAVE_IDE=y | |||
| 302 | # Character devices | 424 | # Character devices |
| 303 | # | 425 | # |
| 304 | # CONFIG_VT is not set | 426 | # CONFIG_VT is not set |
| 305 | # CONFIG_DEVKMEM is not set | 427 | CONFIG_DEVKMEM=y |
| 306 | # CONFIG_SERIAL_NONSTANDARD is not set | 428 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 307 | 429 | ||
| 308 | # | 430 | # |
| @@ -315,7 +437,6 @@ CONFIG_HAVE_IDE=y | |||
| 315 | # | 437 | # |
| 316 | CONFIG_SERIAL_CORE=y | 438 | CONFIG_SERIAL_CORE=y |
| 317 | CONFIG_SERIAL_CORE_CONSOLE=y | 439 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 318 | # CONFIG_SERIAL_COLDFIRE is not set | ||
| 319 | CONFIG_SERIAL_MCF=y | 440 | CONFIG_SERIAL_MCF=y |
| 320 | CONFIG_SERIAL_MCF_BAUDRATE=19200 | 441 | CONFIG_SERIAL_MCF_BAUDRATE=19200 |
| 321 | CONFIG_SERIAL_MCF_CONSOLE=y | 442 | CONFIG_SERIAL_MCF_CONSOLE=y |
| @@ -323,7 +444,8 @@ CONFIG_SERIAL_MCF_CONSOLE=y | |||
| 323 | CONFIG_LEGACY_PTYS=y | 444 | CONFIG_LEGACY_PTYS=y |
| 324 | CONFIG_LEGACY_PTY_COUNT=256 | 445 | CONFIG_LEGACY_PTY_COUNT=256 |
| 325 | # CONFIG_IPMI_HANDLER is not set | 446 | # CONFIG_IPMI_HANDLER is not set |
| 326 | # CONFIG_HW_RANDOM is not set | 447 | CONFIG_HW_RANDOM=y |
| 448 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 327 | # CONFIG_GEN_RTC is not set | 449 | # CONFIG_GEN_RTC is not set |
| 328 | # CONFIG_R3964 is not set | 450 | # CONFIG_R3964 is not set |
| 329 | # CONFIG_RAW_DRIVER is not set | 451 | # CONFIG_RAW_DRIVER is not set |
| @@ -334,19 +456,23 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 334 | # CONFIG_POWER_SUPPLY is not set | 456 | # CONFIG_POWER_SUPPLY is not set |
| 335 | # CONFIG_HWMON is not set | 457 | # CONFIG_HWMON is not set |
| 336 | # CONFIG_THERMAL is not set | 458 | # CONFIG_THERMAL is not set |
| 459 | # CONFIG_THERMAL_HWMON is not set | ||
| 337 | # CONFIG_WATCHDOG is not set | 460 | # CONFIG_WATCHDOG is not set |
| 461 | CONFIG_SSB_POSSIBLE=y | ||
| 338 | 462 | ||
| 339 | # | 463 | # |
| 340 | # Sonics Silicon Backplane | 464 | # Sonics Silicon Backplane |
| 341 | # | 465 | # |
| 342 | CONFIG_SSB_POSSIBLE=y | ||
| 343 | # CONFIG_SSB is not set | 466 | # CONFIG_SSB is not set |
| 344 | 467 | ||
| 345 | # | 468 | # |
| 346 | # Multifunction device drivers | 469 | # Multifunction device drivers |
| 347 | # | 470 | # |
| 471 | # CONFIG_MFD_CORE is not set | ||
| 348 | # CONFIG_MFD_SM501 is not set | 472 | # CONFIG_MFD_SM501 is not set |
| 349 | # CONFIG_HTC_PASIC3 is not set | 473 | # CONFIG_HTC_PASIC3 is not set |
| 474 | # CONFIG_MFD_TMIO is not set | ||
| 475 | # CONFIG_REGULATOR is not set | ||
| 350 | 476 | ||
| 351 | # | 477 | # |
| 352 | # Multimedia devices | 478 | # Multimedia devices |
| @@ -356,11 +482,13 @@ CONFIG_SSB_POSSIBLE=y | |||
| 356 | # Multimedia core support | 482 | # Multimedia core support |
| 357 | # | 483 | # |
| 358 | # CONFIG_VIDEO_DEV is not set | 484 | # CONFIG_VIDEO_DEV is not set |
| 485 | # CONFIG_DVB_CORE is not set | ||
| 486 | # CONFIG_VIDEO_MEDIA is not set | ||
| 359 | 487 | ||
| 360 | # | 488 | # |
| 361 | # Multimedia drivers | 489 | # Multimedia drivers |
| 362 | # | 490 | # |
| 363 | # CONFIG_DAB is not set | 491 | CONFIG_DAB=y |
| 364 | 492 | ||
| 365 | # | 493 | # |
| 366 | # Graphics support | 494 | # Graphics support |
| @@ -374,10 +502,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 374 | # Display device support | 502 | # Display device support |
| 375 | # | 503 | # |
| 376 | # CONFIG_DISPLAY_SUPPORT is not set | 504 | # CONFIG_DISPLAY_SUPPORT is not set |
| 377 | |||
| 378 | # | ||
| 379 | # Sound | ||
| 380 | # | ||
| 381 | # CONFIG_SOUND is not set | 505 | # CONFIG_SOUND is not set |
| 382 | # CONFIG_USB_SUPPORT is not set | 506 | # CONFIG_USB_SUPPORT is not set |
| 383 | # CONFIG_MMC is not set | 507 | # CONFIG_MMC is not set |
| @@ -385,7 +509,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 385 | # CONFIG_NEW_LEDS is not set | 509 | # CONFIG_NEW_LEDS is not set |
| 386 | # CONFIG_ACCESSIBILITY is not set | 510 | # CONFIG_ACCESSIBILITY is not set |
| 387 | # CONFIG_RTC_CLASS is not set | 511 | # CONFIG_RTC_CLASS is not set |
| 512 | # CONFIG_DMADEVICES is not set | ||
| 513 | # CONFIG_AUXDISPLAY is not set | ||
| 388 | # CONFIG_UIO is not set | 514 | # CONFIG_UIO is not set |
| 515 | # CONFIG_STAGING is not set | ||
| 389 | 516 | ||
| 390 | # | 517 | # |
| 391 | # File systems | 518 | # File systems |
| @@ -393,19 +520,28 @@ CONFIG_SSB_POSSIBLE=y | |||
| 393 | CONFIG_EXT2_FS=y | 520 | CONFIG_EXT2_FS=y |
| 394 | # CONFIG_EXT2_FS_XATTR is not set | 521 | # CONFIG_EXT2_FS_XATTR is not set |
| 395 | # CONFIG_EXT3_FS is not set | 522 | # CONFIG_EXT3_FS is not set |
| 396 | # CONFIG_EXT4DEV_FS is not set | 523 | # CONFIG_EXT4_FS is not set |
| 397 | # CONFIG_REISERFS_FS is not set | 524 | # CONFIG_REISERFS_FS is not set |
| 398 | # CONFIG_JFS_FS is not set | 525 | # CONFIG_JFS_FS is not set |
| 399 | # CONFIG_FS_POSIX_ACL is not set | 526 | # CONFIG_FS_POSIX_ACL is not set |
| 527 | # CONFIG_FILE_LOCKING is not set | ||
| 400 | # CONFIG_XFS_FS is not set | 528 | # CONFIG_XFS_FS is not set |
| 401 | # CONFIG_DNOTIFY is not set | 529 | # CONFIG_OCFS2_FS is not set |
| 402 | # CONFIG_INOTIFY is not set | 530 | # CONFIG_BTRFS_FS is not set |
| 531 | CONFIG_DNOTIFY=y | ||
| 532 | CONFIG_INOTIFY=y | ||
| 533 | CONFIG_INOTIFY_USER=y | ||
| 403 | # CONFIG_QUOTA is not set | 534 | # CONFIG_QUOTA is not set |
| 404 | # CONFIG_AUTOFS_FS is not set | 535 | # CONFIG_AUTOFS_FS is not set |
| 405 | # CONFIG_AUTOFS4_FS is not set | 536 | # CONFIG_AUTOFS4_FS is not set |
| 406 | # CONFIG_FUSE_FS is not set | 537 | # CONFIG_FUSE_FS is not set |
| 407 | 538 | ||
| 408 | # | 539 | # |
| 540 | # Caches | ||
| 541 | # | ||
| 542 | # CONFIG_FSCACHE is not set | ||
| 543 | |||
| 544 | # | ||
| 409 | # CD-ROM/DVD Filesystems | 545 | # CD-ROM/DVD Filesystems |
| 410 | # | 546 | # |
| 411 | # CONFIG_ISO9660_FS is not set | 547 | # CONFIG_ISO9660_FS is not set |
| @@ -427,10 +563,7 @@ CONFIG_SYSFS=y | |||
| 427 | # CONFIG_TMPFS is not set | 563 | # CONFIG_TMPFS is not set |
| 428 | # CONFIG_HUGETLB_PAGE is not set | 564 | # CONFIG_HUGETLB_PAGE is not set |
| 429 | # CONFIG_CONFIGFS_FS is not set | 565 | # CONFIG_CONFIGFS_FS is not set |
| 430 | 566 | CONFIG_MISC_FILESYSTEMS=y | |
| 431 | # | ||
| 432 | # Miscellaneous filesystems | ||
| 433 | # | ||
| 434 | # CONFIG_ADFS_FS is not set | 567 | # CONFIG_ADFS_FS is not set |
| 435 | # CONFIG_AFFS_FS is not set | 568 | # CONFIG_AFFS_FS is not set |
| 436 | # CONFIG_HFS_FS is not set | 569 | # CONFIG_HFS_FS is not set |
| @@ -440,13 +573,21 @@ CONFIG_SYSFS=y | |||
| 440 | # CONFIG_EFS_FS is not set | 573 | # CONFIG_EFS_FS is not set |
| 441 | # CONFIG_JFFS2_FS is not set | 574 | # CONFIG_JFFS2_FS is not set |
| 442 | # CONFIG_CRAMFS is not set | 575 | # CONFIG_CRAMFS is not set |
| 576 | # CONFIG_SQUASHFS is not set | ||
| 443 | # CONFIG_VXFS_FS is not set | 577 | # CONFIG_VXFS_FS is not set |
| 444 | # CONFIG_MINIX_FS is not set | 578 | # CONFIG_MINIX_FS is not set |
| 579 | # CONFIG_OMFS_FS is not set | ||
| 445 | # CONFIG_HPFS_FS is not set | 580 | # CONFIG_HPFS_FS is not set |
| 446 | # CONFIG_QNX4FS_FS is not set | 581 | # CONFIG_QNX4FS_FS is not set |
| 447 | CONFIG_ROMFS_FS=y | 582 | CONFIG_ROMFS_FS=y |
| 583 | # CONFIG_ROMFS_BACKED_BY_BLOCK is not set | ||
| 584 | CONFIG_ROMFS_BACKED_BY_MTD=y | ||
| 585 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 586 | CONFIG_ROMFS_ON_MTD=y | ||
| 448 | # CONFIG_SYSV_FS is not set | 587 | # CONFIG_SYSV_FS is not set |
| 449 | # CONFIG_UFS_FS is not set | 588 | # CONFIG_UFS_FS is not set |
| 589 | # CONFIG_NILFS2_FS is not set | ||
| 590 | # CONFIG_NETWORK_FILESYSTEMS is not set | ||
| 450 | 591 | ||
| 451 | # | 592 | # |
| 452 | # Partition Types | 593 | # Partition Types |
| @@ -454,6 +595,7 @@ CONFIG_ROMFS_FS=y | |||
| 454 | # CONFIG_PARTITION_ADVANCED is not set | 595 | # CONFIG_PARTITION_ADVANCED is not set |
| 455 | CONFIG_MSDOS_PARTITION=y | 596 | CONFIG_MSDOS_PARTITION=y |
| 456 | # CONFIG_NLS is not set | 597 | # CONFIG_NLS is not set |
| 598 | # CONFIG_DLM is not set | ||
| 457 | 599 | ||
| 458 | # | 600 | # |
| 459 | # Kernel hacking | 601 | # Kernel hacking |
| @@ -468,10 +610,14 @@ CONFIG_FRAME_WARN=1024 | |||
| 468 | # CONFIG_HEADERS_CHECK is not set | 610 | # CONFIG_HEADERS_CHECK is not set |
| 469 | # CONFIG_DEBUG_KERNEL is not set | 611 | # CONFIG_DEBUG_KERNEL is not set |
| 470 | # CONFIG_DEBUG_BUGVERBOSE is not set | 612 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 613 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 614 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 615 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 471 | # CONFIG_SAMPLES is not set | 616 | # CONFIG_SAMPLES is not set |
| 472 | # CONFIG_FULLDEBUG is not set | 617 | # CONFIG_FULLDEBUG is not set |
| 473 | # CONFIG_HIGHPROFILE is not set | 618 | # CONFIG_HIGHPROFILE is not set |
| 474 | # CONFIG_BOOTPARAM is not set | 619 | CONFIG_BOOTPARAM=y |
| 620 | CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0" | ||
| 475 | # CONFIG_NO_KERNEL_MSG is not set | 621 | # CONFIG_NO_KERNEL_MSG is not set |
| 476 | # CONFIG_BDM_DISABLE is not set | 622 | # CONFIG_BDM_DISABLE is not set |
| 477 | 623 | ||
| @@ -480,18 +626,22 @@ CONFIG_FRAME_WARN=1024 | |||
| 480 | # | 626 | # |
| 481 | # CONFIG_KEYS is not set | 627 | # CONFIG_KEYS is not set |
| 482 | # CONFIG_SECURITY is not set | 628 | # CONFIG_SECURITY is not set |
| 629 | # CONFIG_SECURITYFS is not set | ||
| 483 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 630 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 484 | # CONFIG_CRYPTO is not set | 631 | # CONFIG_CRYPTO is not set |
| 632 | # CONFIG_BINARY_PRINTF is not set | ||
| 485 | 633 | ||
| 486 | # | 634 | # |
| 487 | # Library routines | 635 | # Library routines |
| 488 | # | 636 | # |
| 489 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 637 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 490 | # CONFIG_CRC_CCITT is not set | 638 | # CONFIG_CRC_CCITT is not set |
| 491 | # CONFIG_CRC16 is not set | 639 | # CONFIG_CRC16 is not set |
| 640 | # CONFIG_CRC_T10DIF is not set | ||
| 492 | # CONFIG_CRC_ITU_T is not set | 641 | # CONFIG_CRC_ITU_T is not set |
| 493 | # CONFIG_CRC32 is not set | 642 | # CONFIG_CRC32 is not set |
| 494 | # CONFIG_CRC7 is not set | 643 | # CONFIG_CRC7 is not set |
| 495 | # CONFIG_LIBCRC32C is not set | 644 | # CONFIG_LIBCRC32C is not set |
| 496 | CONFIG_HAS_IOMEM=y | 645 | CONFIG_HAS_IOMEM=y |
| 497 | CONFIG_HAS_DMA=y | 646 | CONFIG_HAS_DMA=y |
| 647 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68knommu/configs/m5272c3_defconfig b/arch/m68knommu/configs/m5272c3_defconfig new file mode 100644 index 00000000000..f37852a3421 --- /dev/null +++ b/arch/m68knommu/configs/m5272c3_defconfig | |||
| @@ -0,0 +1,645 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.30-rc2 | ||
| 4 | # Wed Apr 22 17:17:30 2009 | ||
| 5 | # | ||
| 6 | CONFIG_M68K=y | ||
| 7 | # CONFIG_MMU is not set | ||
| 8 | # CONFIG_FPU is not set | ||
| 9 | CONFIG_ZONE_DMA=y | ||
| 10 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 11 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
| 12 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 13 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 14 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 15 | CONFIG_GENERIC_HWEIGHT=y | ||
| 16 | CONFIG_GENERIC_HARDIRQS=y | ||
| 17 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 18 | CONFIG_GENERIC_TIME=y | ||
| 19 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 20 | CONFIG_TIME_LOW_RES=y | ||
| 21 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
| 22 | CONFIG_NO_IOPORT=y | ||
| 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 24 | |||
| 25 | # | ||
| 26 | # General setup | ||
| 27 | # | ||
| 28 | CONFIG_EXPERIMENTAL=y | ||
| 29 | CONFIG_BROKEN_ON_SMP=y | ||
| 30 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 31 | CONFIG_LOCALVERSION="" | ||
| 32 | CONFIG_LOCALVERSION_AUTO=y | ||
| 33 | # CONFIG_SYSVIPC is not set | ||
| 34 | # CONFIG_POSIX_MQUEUE is not set | ||
| 35 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 36 | # CONFIG_TASKSTATS is not set | ||
| 37 | # CONFIG_AUDIT is not set | ||
| 38 | |||
| 39 | # | ||
| 40 | # RCU Subsystem | ||
| 41 | # | ||
| 42 | CONFIG_CLASSIC_RCU=y | ||
| 43 | # CONFIG_TREE_RCU is not set | ||
| 44 | # CONFIG_PREEMPT_RCU is not set | ||
| 45 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 46 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 47 | # CONFIG_IKCONFIG is not set | ||
| 48 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 49 | # CONFIG_GROUP_SCHED is not set | ||
| 50 | # CONFIG_CGROUPS is not set | ||
| 51 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 52 | # CONFIG_RELAY is not set | ||
| 53 | # CONFIG_NAMESPACES is not set | ||
| 54 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 55 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 56 | CONFIG_SYSCTL=y | ||
| 57 | CONFIG_EMBEDDED=y | ||
| 58 | CONFIG_UID16=y | ||
| 59 | CONFIG_SYSCTL_SYSCALL=y | ||
| 60 | # CONFIG_KALLSYMS is not set | ||
| 61 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 62 | # CONFIG_HOTPLUG is not set | ||
| 63 | CONFIG_PRINTK=y | ||
| 64 | CONFIG_BUG=y | ||
| 65 | CONFIG_ELF_CORE=y | ||
| 66 | CONFIG_BASE_FULL=y | ||
| 67 | # CONFIG_FUTEX is not set | ||
| 68 | # CONFIG_EPOLL is not set | ||
| 69 | # CONFIG_SIGNALFD is not set | ||
| 70 | # CONFIG_TIMERFD is not set | ||
| 71 | # CONFIG_EVENTFD is not set | ||
| 72 | # CONFIG_AIO is not set | ||
| 73 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
| 74 | # CONFIG_SLUB_DEBUG is not set | ||
| 75 | CONFIG_COMPAT_BRK=y | ||
| 76 | # CONFIG_SLAB is not set | ||
| 77 | CONFIG_SLUB=y | ||
| 78 | # CONFIG_SLOB is not set | ||
| 79 | # CONFIG_PROFILING is not set | ||
| 80 | # CONFIG_MARKERS is not set | ||
| 81 | # CONFIG_SLOW_WORK is not set | ||
| 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 83 | CONFIG_BASE_SMALL=0 | ||
| 84 | # CONFIG_MODULES is not set | ||
| 85 | CONFIG_BLOCK=y | ||
| 86 | # CONFIG_LBD is not set | ||
| 87 | # CONFIG_BLK_DEV_BSG is not set | ||
| 88 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 89 | |||
| 90 | # | ||
| 91 | # IO Schedulers | ||
| 92 | # | ||
| 93 | CONFIG_IOSCHED_NOOP=y | ||
| 94 | # CONFIG_IOSCHED_AS is not set | ||
| 95 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 96 | # CONFIG_IOSCHED_CFQ is not set | ||
| 97 | # CONFIG_DEFAULT_AS is not set | ||
| 98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 99 | # CONFIG_DEFAULT_CFQ is not set | ||
| 100 | CONFIG_DEFAULT_NOOP=y | ||
| 101 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 102 | # CONFIG_FREEZER is not set | ||
| 103 | |||
| 104 | # | ||
| 105 | # Processor type and features | ||
| 106 | # | ||
| 107 | # CONFIG_M68328 is not set | ||
| 108 | # CONFIG_M68EZ328 is not set | ||
| 109 | # CONFIG_M68VZ328 is not set | ||
| 110 | # CONFIG_M68360 is not set | ||
| 111 | # CONFIG_M5206 is not set | ||
| 112 | # CONFIG_M5206e is not set | ||
| 113 | # CONFIG_M520x is not set | ||
| 114 | # CONFIG_M523x is not set | ||
| 115 | # CONFIG_M5249 is not set | ||
| 116 | # CONFIG_M5271 is not set | ||
| 117 | CONFIG_M5272=y | ||
| 118 | # CONFIG_M5275 is not set | ||
| 119 | # CONFIG_M528x is not set | ||
| 120 | # CONFIG_M5307 is not set | ||
| 121 | # CONFIG_M532x is not set | ||
| 122 | # CONFIG_M5407 is not set | ||
| 123 | CONFIG_COLDFIRE=y | ||
| 124 | CONFIG_CLOCK_SET=y | ||
| 125 | CONFIG_CLOCK_FREQ=66666666 | ||
| 126 | CONFIG_CLOCK_DIV=1 | ||
| 127 | |||
| 128 | # | ||
| 129 | # Platform | ||
| 130 | # | ||
| 131 | # CONFIG_UC5272 is not set | ||
| 132 | CONFIG_M5272C3=y | ||
| 133 | # CONFIG_COBRA5272 is not set | ||
| 134 | # CONFIG_CANCam is not set | ||
| 135 | # CONFIG_SCALES is not set | ||
| 136 | # CONFIG_NETtel is not set | ||
| 137 | # CONFIG_CPU16B is not set | ||
| 138 | # CONFIG_MOD5272 is not set | ||
| 139 | CONFIG_FREESCALE=y | ||
| 140 | CONFIG_4KSTACKS=y | ||
| 141 | CONFIG_HZ=100 | ||
| 142 | |||
| 143 | # | ||
| 144 | # RAM configuration | ||
| 145 | # | ||
| 146 | CONFIG_RAMBASE=0x00000000 | ||
| 147 | CONFIG_RAMSIZE=0x00800000 | ||
| 148 | CONFIG_VECTORBASE=0x00000000 | ||
| 149 | CONFIG_KERNELBASE=0x00020000 | ||
| 150 | CONFIG_RAMAUTOBIT=y | ||
| 151 | # CONFIG_RAM8BIT is not set | ||
| 152 | # CONFIG_RAM16BIT is not set | ||
| 153 | # CONFIG_RAM32BIT is not set | ||
| 154 | |||
| 155 | # | ||
| 156 | # ROM configuration | ||
| 157 | # | ||
| 158 | # CONFIG_ROM is not set | ||
| 159 | CONFIG_RAMKERNEL=y | ||
| 160 | # CONFIG_ROMKERNEL is not set | ||
| 161 | CONFIG_PREEMPT_NONE=y | ||
| 162 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 163 | # CONFIG_PREEMPT is not set | ||
| 164 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 165 | CONFIG_FLATMEM_MANUAL=y | ||
| 166 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 167 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 168 | CONFIG_FLATMEM=y | ||
| 169 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 170 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 171 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 172 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 173 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 174 | CONFIG_VIRT_TO_BUS=y | ||
| 175 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Executable file formats | ||
| 179 | # | ||
| 180 | CONFIG_BINFMT_FLAT=y | ||
| 181 | # CONFIG_BINFMT_ZFLAT is not set | ||
| 182 | # CONFIG_BINFMT_SHARED_FLAT is not set | ||
| 183 | # CONFIG_HAVE_AOUT is not set | ||
| 184 | # CONFIG_BINFMT_MISC is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # Power management options | ||
| 188 | # | ||
| 189 | # CONFIG_PM is not set | ||
| 190 | CONFIG_NET=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Networking options | ||
| 194 | # | ||
| 195 | CONFIG_PACKET=y | ||
| 196 | # CONFIG_PACKET_MMAP is not set | ||
| 197 | CONFIG_UNIX=y | ||
| 198 | # CONFIG_NET_KEY is not set | ||
| 199 | CONFIG_INET=y | ||
| 200 | # CONFIG_IP_MULTICAST is not set | ||
| 201 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 202 | CONFIG_IP_FIB_HASH=y | ||
| 203 | # CONFIG_IP_PNP is not set | ||
| 204 | # CONFIG_NET_IPIP is not set | ||
| 205 | # CONFIG_NET_IPGRE is not set | ||
| 206 | # CONFIG_ARPD is not set | ||
| 207 | # CONFIG_SYN_COOKIES is not set | ||
| 208 | # CONFIG_INET_AH is not set | ||
| 209 | # CONFIG_INET_ESP is not set | ||
| 210 | # CONFIG_INET_IPCOMP is not set | ||
| 211 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 212 | # CONFIG_INET_TUNNEL is not set | ||
| 213 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 214 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 215 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 216 | # CONFIG_INET_LRO is not set | ||
| 217 | # CONFIG_INET_DIAG is not set | ||
| 218 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 219 | CONFIG_TCP_CONG_CUBIC=y | ||
| 220 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 221 | # CONFIG_TCP_MD5SIG is not set | ||
| 222 | # CONFIG_IPV6 is not set | ||
| 223 | # CONFIG_NETWORK_SECMARK is not set | ||
| 224 | # CONFIG_NETFILTER is not set | ||
| 225 | # CONFIG_IP_DCCP is not set | ||
| 226 | # CONFIG_IP_SCTP is not set | ||
| 227 | # CONFIG_TIPC is not set | ||
| 228 | # CONFIG_ATM is not set | ||
| 229 | # CONFIG_BRIDGE is not set | ||
| 230 | # CONFIG_NET_DSA is not set | ||
| 231 | # CONFIG_VLAN_8021Q is not set | ||
| 232 | # CONFIG_DECNET is not set | ||
| 233 | # CONFIG_LLC2 is not set | ||
| 234 | # CONFIG_IPX is not set | ||
| 235 | # CONFIG_ATALK is not set | ||
| 236 | # CONFIG_X25 is not set | ||
| 237 | # CONFIG_LAPB is not set | ||
| 238 | # CONFIG_ECONET is not set | ||
| 239 | # CONFIG_WAN_ROUTER is not set | ||
| 240 | # CONFIG_PHONET is not set | ||
| 241 | # CONFIG_NET_SCHED is not set | ||
| 242 | # CONFIG_DCB is not set | ||
| 243 | |||
| 244 | # | ||
| 245 | # Network testing | ||
| 246 | # | ||
| 247 | # CONFIG_NET_PKTGEN is not set | ||
| 248 | # CONFIG_HAMRADIO is not set | ||
| 249 | # CONFIG_CAN is not set | ||
| 250 | # CONFIG_IRDA is not set | ||
| 251 | # CONFIG_BT is not set | ||
| 252 | # CONFIG_AF_RXRPC is not set | ||
| 253 | # CONFIG_WIRELESS is not set | ||
| 254 | # CONFIG_WIMAX is not set | ||
| 255 | # CONFIG_RFKILL is not set | ||
| 256 | # CONFIG_NET_9P is not set | ||
| 257 | |||
| 258 | # | ||
| 259 | # Device Drivers | ||
| 260 | # | ||
| 261 | |||
| 262 | # | ||
| 263 | # Generic Driver Options | ||
| 264 | # | ||
| 265 | CONFIG_STANDALONE=y | ||
| 266 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 267 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 268 | # CONFIG_CONNECTOR is not set | ||
| 269 | CONFIG_MTD=y | ||
| 270 | # CONFIG_MTD_DEBUG is not set | ||
| 271 | # CONFIG_MTD_CONCAT is not set | ||
| 272 | CONFIG_MTD_PARTITIONS=y | ||
| 273 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 274 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 275 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 276 | |||
| 277 | # | ||
| 278 | # User Modules And Translation Layers | ||
| 279 | # | ||
| 280 | CONFIG_MTD_CHAR=y | ||
| 281 | CONFIG_MTD_BLKDEVS=y | ||
| 282 | CONFIG_MTD_BLOCK=y | ||
| 283 | # CONFIG_FTL is not set | ||
| 284 | # CONFIG_NFTL is not set | ||
| 285 | # CONFIG_INFTL is not set | ||
| 286 | # CONFIG_RFD_FTL is not set | ||
| 287 | # CONFIG_SSFDC is not set | ||
| 288 | # CONFIG_MTD_OOPS is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # RAM/ROM/Flash chip drivers | ||
| 292 | # | ||
| 293 | # CONFIG_MTD_CFI is not set | ||
| 294 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 295 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 296 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 297 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 298 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 299 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 300 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 301 | CONFIG_MTD_CFI_I1=y | ||
| 302 | CONFIG_MTD_CFI_I2=y | ||
| 303 | # CONFIG_MTD_CFI_I4 is not set | ||
| 304 | # CONFIG_MTD_CFI_I8 is not set | ||
| 305 | CONFIG_MTD_RAM=y | ||
| 306 | # CONFIG_MTD_ROM is not set | ||
| 307 | # CONFIG_MTD_ABSENT is not set | ||
| 308 | |||
| 309 | # | ||
| 310 | # Mapping drivers for chip access | ||
| 311 | # | ||
| 312 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 313 | CONFIG_MTD_UCLINUX=y | ||
| 314 | # CONFIG_MTD_PLATRAM is not set | ||
| 315 | |||
| 316 | # | ||
| 317 | # Self-contained MTD device drivers | ||
| 318 | # | ||
| 319 | # CONFIG_MTD_SLRAM is not set | ||
| 320 | # CONFIG_MTD_PHRAM is not set | ||
| 321 | # CONFIG_MTD_MTDRAM is not set | ||
| 322 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 323 | |||
| 324 | # | ||
| 325 | # Disk-On-Chip Device Drivers | ||
| 326 | # | ||
| 327 | # CONFIG_MTD_DOC2000 is not set | ||
| 328 | # CONFIG_MTD_DOC2001 is not set | ||
| 329 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 330 | # CONFIG_MTD_NAND is not set | ||
| 331 | # CONFIG_MTD_ONENAND is not set | ||
| 332 | |||
| 333 | # | ||
| 334 | # LPDDR flash memory drivers | ||
| 335 | # | ||
| 336 | # CONFIG_MTD_LPDDR is not set | ||
| 337 | |||
| 338 | # | ||
| 339 | # UBI - Unsorted block images | ||
| 340 | # | ||
| 341 | # CONFIG_MTD_UBI is not set | ||
| 342 | # CONFIG_PARPORT is not set | ||
| 343 | CONFIG_BLK_DEV=y | ||
| 344 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 345 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 346 | # CONFIG_BLK_DEV_NBD is not set | ||
| 347 | CONFIG_BLK_DEV_RAM=y | ||
| 348 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 349 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 350 | # CONFIG_BLK_DEV_XIP is not set | ||
| 351 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 352 | # CONFIG_ATA_OVER_ETH is not set | ||
| 353 | # CONFIG_BLK_DEV_HD is not set | ||
| 354 | # CONFIG_MISC_DEVICES is not set | ||
| 355 | CONFIG_HAVE_IDE=y | ||
| 356 | # CONFIG_IDE is not set | ||
| 357 | |||
| 358 | # | ||
| 359 | # SCSI device support | ||
| 360 | # | ||
| 361 | # CONFIG_RAID_ATTRS is not set | ||
| 362 | # CONFIG_SCSI is not set | ||
| 363 | # CONFIG_SCSI_DMA is not set | ||
| 364 | # CONFIG_SCSI_NETLINK is not set | ||
| 365 | # CONFIG_MD is not set | ||
| 366 | CONFIG_NETDEVICES=y | ||
| 367 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 368 | # CONFIG_DUMMY is not set | ||
| 369 | # CONFIG_BONDING is not set | ||
| 370 | # CONFIG_MACVLAN is not set | ||
| 371 | # CONFIG_EQUALIZER is not set | ||
| 372 | # CONFIG_TUN is not set | ||
| 373 | # CONFIG_VETH is not set | ||
| 374 | # CONFIG_PHYLIB is not set | ||
| 375 | CONFIG_NET_ETHERNET=y | ||
| 376 | # CONFIG_MII is not set | ||
| 377 | # CONFIG_ETHOC is not set | ||
| 378 | # CONFIG_DNET is not set | ||
| 379 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 380 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 381 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 382 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 383 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 384 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 385 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 386 | # CONFIG_B44 is not set | ||
| 387 | CONFIG_FEC=y | ||
| 388 | # CONFIG_FEC2 is not set | ||
| 389 | # CONFIG_NETDEV_1000 is not set | ||
| 390 | # CONFIG_NETDEV_10000 is not set | ||
| 391 | |||
| 392 | # | ||
| 393 | # Wireless LAN | ||
| 394 | # | ||
| 395 | # CONFIG_WLAN_PRE80211 is not set | ||
| 396 | # CONFIG_WLAN_80211 is not set | ||
| 397 | |||
| 398 | # | ||
| 399 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 400 | # | ||
| 401 | # CONFIG_WAN is not set | ||
| 402 | # CONFIG_PPP is not set | ||
| 403 | # CONFIG_SLIP is not set | ||
| 404 | # CONFIG_NETCONSOLE is not set | ||
| 405 | # CONFIG_NETPOLL is not set | ||
| 406 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 407 | # CONFIG_ISDN is not set | ||
| 408 | # CONFIG_PHONE is not set | ||
| 409 | |||
| 410 | # | ||
| 411 | # Input device support | ||
| 412 | # | ||
| 413 | # CONFIG_INPUT is not set | ||
| 414 | |||
| 415 | # | ||
| 416 | # Hardware I/O ports | ||
| 417 | # | ||
| 418 | # CONFIG_SERIO is not set | ||
| 419 | # CONFIG_GAMEPORT is not set | ||
| 420 | |||
| 421 | # | ||
| 422 | # Character devices | ||
| 423 | # | ||
| 424 | # CONFIG_VT is not set | ||
| 425 | CONFIG_DEVKMEM=y | ||
| 426 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 427 | |||
| 428 | # | ||
| 429 | # Serial drivers | ||
| 430 | # | ||
| 431 | # CONFIG_SERIAL_8250 is not set | ||
| 432 | |||
| 433 | # | ||
| 434 | # Non-8250 serial port support | ||
| 435 | # | ||
| 436 | CONFIG_SERIAL_CORE=y | ||
| 437 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 438 | CONFIG_SERIAL_MCF=y | ||
| 439 | CONFIG_SERIAL_MCF_BAUDRATE=19200 | ||
| 440 | CONFIG_SERIAL_MCF_CONSOLE=y | ||
| 441 | # CONFIG_UNIX98_PTYS is not set | ||
| 442 | CONFIG_LEGACY_PTYS=y | ||
| 443 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 444 | # CONFIG_IPMI_HANDLER is not set | ||
| 445 | CONFIG_HW_RANDOM=y | ||
| 446 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 447 | # CONFIG_GEN_RTC is not set | ||
| 448 | # CONFIG_R3964 is not set | ||
| 449 | # CONFIG_RAW_DRIVER is not set | ||
| 450 | # CONFIG_TCG_TPM is not set | ||
| 451 | # CONFIG_I2C is not set | ||
| 452 | # CONFIG_SPI is not set | ||
| 453 | # CONFIG_W1 is not set | ||
| 454 | # CONFIG_POWER_SUPPLY is not set | ||
| 455 | # CONFIG_HWMON is not set | ||
| 456 | # CONFIG_THERMAL is not set | ||
| 457 | # CONFIG_THERMAL_HWMON is not set | ||
| 458 | # CONFIG_WATCHDOG is not set | ||
| 459 | CONFIG_SSB_POSSIBLE=y | ||
| 460 | |||
| 461 | # | ||
| 462 | # Sonics Silicon Backplane | ||
| 463 | # | ||
| 464 | # CONFIG_SSB is not set | ||
| 465 | |||
| 466 | # | ||
| 467 | # Multifunction device drivers | ||
| 468 | # | ||
| 469 | # CONFIG_MFD_CORE is not set | ||
| 470 | # CONFIG_MFD_SM501 is not set | ||
| 471 | # CONFIG_HTC_PASIC3 is not set | ||
| 472 | # CONFIG_MFD_TMIO is not set | ||
| 473 | # CONFIG_REGULATOR is not set | ||
| 474 | |||
| 475 | # | ||
| 476 | # Multimedia devices | ||
| 477 | # | ||
| 478 | |||
| 479 | # | ||
| 480 | # Multimedia core support | ||
| 481 | # | ||
| 482 | # CONFIG_VIDEO_DEV is not set | ||
| 483 | # CONFIG_DVB_CORE is not set | ||
| 484 | # CONFIG_VIDEO_MEDIA is not set | ||
| 485 | |||
| 486 | # | ||
| 487 | # Multimedia drivers | ||
| 488 | # | ||
| 489 | CONFIG_DAB=y | ||
| 490 | |||
| 491 | # | ||
| 492 | # Graphics support | ||
| 493 | # | ||
| 494 | # CONFIG_VGASTATE is not set | ||
| 495 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 496 | # CONFIG_FB is not set | ||
| 497 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 498 | |||
| 499 | # | ||
| 500 | # Display device support | ||
| 501 | # | ||
| 502 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 503 | # CONFIG_SOUND is not set | ||
| 504 | # CONFIG_USB_SUPPORT is not set | ||
| 505 | # CONFIG_MMC is not set | ||
| 506 | # CONFIG_MEMSTICK is not set | ||
| 507 | # CONFIG_NEW_LEDS is not set | ||
| 508 | # CONFIG_ACCESSIBILITY is not set | ||
| 509 | # CONFIG_RTC_CLASS is not set | ||
| 510 | # CONFIG_DMADEVICES is not set | ||
| 511 | # CONFIG_AUXDISPLAY is not set | ||
| 512 | # CONFIG_UIO is not set | ||
| 513 | # CONFIG_STAGING is not set | ||
| 514 | |||
| 515 | # | ||
| 516 | # File systems | ||
| 517 | # | ||
| 518 | CONFIG_EXT2_FS=y | ||
| 519 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 520 | # CONFIG_EXT3_FS is not set | ||
| 521 | # CONFIG_EXT4_FS is not set | ||
| 522 | # CONFIG_REISERFS_FS is not set | ||
| 523 | # CONFIG_JFS_FS is not set | ||
| 524 | # CONFIG_FS_POSIX_ACL is not set | ||
| 525 | # CONFIG_FILE_LOCKING is not set | ||
| 526 | # CONFIG_XFS_FS is not set | ||
| 527 | # CONFIG_OCFS2_FS is not set | ||
| 528 | # CONFIG_BTRFS_FS is not set | ||
| 529 | # CONFIG_DNOTIFY is not set | ||
| 530 | # CONFIG_INOTIFY is not set | ||
| 531 | # CONFIG_QUOTA is not set | ||
| 532 | # CONFIG_AUTOFS_FS is not set | ||
| 533 | # CONFIG_AUTOFS4_FS is not set | ||
| 534 | # CONFIG_FUSE_FS is not set | ||
| 535 | |||
| 536 | # | ||
| 537 | # Caches | ||
| 538 | # | ||
| 539 | # CONFIG_FSCACHE is not set | ||
| 540 | |||
| 541 | # | ||
| 542 | # CD-ROM/DVD Filesystems | ||
| 543 | # | ||
| 544 | # CONFIG_ISO9660_FS is not set | ||
| 545 | # CONFIG_UDF_FS is not set | ||
| 546 | |||
| 547 | # | ||
| 548 | # DOS/FAT/NT Filesystems | ||
| 549 | # | ||
| 550 | # CONFIG_MSDOS_FS is not set | ||
| 551 | # CONFIG_VFAT_FS is not set | ||
| 552 | # CONFIG_NTFS_FS is not set | ||
| 553 | |||
| 554 | # | ||
| 555 | # Pseudo filesystems | ||
| 556 | # | ||
| 557 | CONFIG_PROC_FS=y | ||
| 558 | CONFIG_PROC_SYSCTL=y | ||
| 559 | CONFIG_SYSFS=y | ||
| 560 | # CONFIG_TMPFS is not set | ||
| 561 | # CONFIG_HUGETLB_PAGE is not set | ||
| 562 | # CONFIG_CONFIGFS_FS is not set | ||
| 563 | CONFIG_MISC_FILESYSTEMS=y | ||
| 564 | # CONFIG_ADFS_FS is not set | ||
| 565 | # CONFIG_AFFS_FS is not set | ||
| 566 | # CONFIG_HFS_FS is not set | ||
| 567 | # CONFIG_HFSPLUS_FS is not set | ||
| 568 | # CONFIG_BEFS_FS is not set | ||
| 569 | # CONFIG_BFS_FS is not set | ||
| 570 | # CONFIG_EFS_FS is not set | ||
| 571 | # CONFIG_JFFS2_FS is not set | ||
| 572 | # CONFIG_CRAMFS is not set | ||
| 573 | # CONFIG_SQUASHFS is not set | ||
| 574 | # CONFIG_VXFS_FS is not set | ||
| 575 | # CONFIG_MINIX_FS is not set | ||
| 576 | # CONFIG_OMFS_FS is not set | ||
| 577 | # CONFIG_HPFS_FS is not set | ||
| 578 | # CONFIG_QNX4FS_FS is not set | ||
| 579 | CONFIG_ROMFS_FS=y | ||
| 580 | # CONFIG_ROMFS_BACKED_BY_BLOCK is not set | ||
| 581 | CONFIG_ROMFS_BACKED_BY_MTD=y | ||
| 582 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 583 | CONFIG_ROMFS_ON_MTD=y | ||
| 584 | # CONFIG_SYSV_FS is not set | ||
| 585 | # CONFIG_UFS_FS is not set | ||
| 586 | # CONFIG_NILFS2_FS is not set | ||
| 587 | # CONFIG_NETWORK_FILESYSTEMS is not set | ||
| 588 | |||
| 589 | # | ||
| 590 | # Partition Types | ||
| 591 | # | ||
| 592 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 593 | CONFIG_MSDOS_PARTITION=y | ||
| 594 | # CONFIG_NLS is not set | ||
| 595 | # CONFIG_DLM is not set | ||
| 596 | |||
| 597 | # | ||
| 598 | # Kernel hacking | ||
| 599 | # | ||
| 600 | # CONFIG_PRINTK_TIME is not set | ||
| 601 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 602 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 603 | CONFIG_FRAME_WARN=1024 | ||
| 604 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 605 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 606 | # CONFIG_DEBUG_FS is not set | ||
| 607 | # CONFIG_HEADERS_CHECK is not set | ||
| 608 | # CONFIG_DEBUG_KERNEL is not set | ||
| 609 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 610 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 611 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 612 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 613 | # CONFIG_SAMPLES is not set | ||
| 614 | # CONFIG_FULLDEBUG is not set | ||
| 615 | # CONFIG_HIGHPROFILE is not set | ||
| 616 | CONFIG_BOOTPARAM=y | ||
| 617 | CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0" | ||
| 618 | # CONFIG_NO_KERNEL_MSG is not set | ||
| 619 | # CONFIG_BDM_DISABLE is not set | ||
| 620 | |||
| 621 | # | ||
| 622 | # Security options | ||
| 623 | # | ||
| 624 | # CONFIG_KEYS is not set | ||
| 625 | # CONFIG_SECURITY is not set | ||
| 626 | # CONFIG_SECURITYFS is not set | ||
| 627 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 628 | # CONFIG_CRYPTO is not set | ||
| 629 | # CONFIG_BINARY_PRINTF is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # Library routines | ||
| 633 | # | ||
| 634 | CONFIG_BITREVERSE=y | ||
| 635 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 636 | # CONFIG_CRC_CCITT is not set | ||
| 637 | # CONFIG_CRC16 is not set | ||
| 638 | # CONFIG_CRC_T10DIF is not set | ||
| 639 | # CONFIG_CRC_ITU_T is not set | ||
| 640 | CONFIG_CRC32=y | ||
| 641 | # CONFIG_CRC7 is not set | ||
| 642 | # CONFIG_LIBCRC32C is not set | ||
| 643 | CONFIG_HAS_IOMEM=y | ||
| 644 | CONFIG_HAS_DMA=y | ||
| 645 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68knommu/configs/m5275evb_defconfig b/arch/m68knommu/configs/m5275evb_defconfig index 0d1256f5add..dc5c621d419 100644 --- a/arch/m68knommu/configs/m5275evb_defconfig +++ b/arch/m68knommu/configs/m5275evb_defconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Wed Apr 22 23:29:01 2009 | ||
| 4 | # | 5 | # |
| 5 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 6 | # CONFIG_MMU is not set | 7 | # CONFIG_MMU is not set |
| @@ -15,9 +16,10 @@ CONFIG_GENERIC_HWEIGHT=y | |||
| 15 | CONFIG_GENERIC_HARDIRQS=y | 16 | CONFIG_GENERIC_HARDIRQS=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 17 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_TIME=y | 18 | CONFIG_GENERIC_TIME=y |
| 19 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 18 | CONFIG_TIME_LOW_RES=y | 20 | CONFIG_TIME_LOW_RES=y |
| 21 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 19 | CONFIG_NO_IOPORT=y | 22 | CONFIG_NO_IOPORT=y |
| 20 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 22 | 24 | ||
| 23 | # | 25 | # |
| @@ -33,10 +35,19 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 33 | # CONFIG_BSD_PROCESS_ACCT is not set | 35 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 34 | # CONFIG_TASKSTATS is not set | 36 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
| 38 | |||
| 39 | # | ||
| 40 | # RCU Subsystem | ||
| 41 | # | ||
| 42 | CONFIG_CLASSIC_RCU=y | ||
| 43 | # CONFIG_TREE_RCU is not set | ||
| 44 | # CONFIG_PREEMPT_RCU is not set | ||
| 45 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 46 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 47 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 48 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 49 | # CONFIG_GROUP_SCHED is not set |
| 50 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 51 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | # CONFIG_RELAY is not set | 52 | # CONFIG_RELAY is not set |
| 42 | # CONFIG_NAMESPACES is not set | 53 | # CONFIG_NAMESPACES is not set |
| @@ -44,44 +55,37 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 44 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 55 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 45 | CONFIG_SYSCTL=y | 56 | CONFIG_SYSCTL=y |
| 46 | CONFIG_EMBEDDED=y | 57 | CONFIG_EMBEDDED=y |
| 47 | # CONFIG_UID16 is not set | 58 | CONFIG_UID16=y |
| 48 | # CONFIG_SYSCTL_SYSCALL is not set | 59 | CONFIG_SYSCTL_SYSCALL=y |
| 49 | # CONFIG_KALLSYMS is not set | 60 | # CONFIG_KALLSYMS is not set |
| 61 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 50 | # CONFIG_HOTPLUG is not set | 62 | # CONFIG_HOTPLUG is not set |
| 51 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
| 52 | CONFIG_BUG=y | 64 | CONFIG_BUG=y |
| 53 | CONFIG_ELF_CORE=y | 65 | CONFIG_ELF_CORE=y |
| 54 | # CONFIG_COMPAT_BRK is not set | ||
| 55 | CONFIG_BASE_FULL=y | 66 | CONFIG_BASE_FULL=y |
| 56 | # CONFIG_FUTEX is not set | 67 | # CONFIG_FUTEX is not set |
| 57 | # CONFIG_EPOLL is not set | 68 | # CONFIG_EPOLL is not set |
| 58 | # CONFIG_SIGNALFD is not set | 69 | # CONFIG_SIGNALFD is not set |
| 59 | # CONFIG_TIMERFD is not set | 70 | # CONFIG_TIMERFD is not set |
| 60 | # CONFIG_EVENTFD is not set | 71 | # CONFIG_EVENTFD is not set |
| 72 | # CONFIG_AIO is not set | ||
| 61 | # CONFIG_VM_EVENT_COUNTERS is not set | 73 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 62 | CONFIG_SLAB=y | 74 | # CONFIG_SLUB_DEBUG is not set |
| 63 | # CONFIG_SLUB is not set | 75 | CONFIG_COMPAT_BRK=y |
| 76 | # CONFIG_SLAB is not set | ||
| 77 | CONFIG_SLUB=y | ||
| 64 | # CONFIG_SLOB is not set | 78 | # CONFIG_SLOB is not set |
| 65 | # CONFIG_PROFILING is not set | 79 | # CONFIG_PROFILING is not set |
| 66 | # CONFIG_MARKERS is not set | 80 | # CONFIG_MARKERS is not set |
| 67 | # CONFIG_HAVE_OPROFILE is not set | 81 | # CONFIG_SLOW_WORK is not set |
| 68 | # CONFIG_HAVE_KPROBES is not set | 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 69 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 70 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 71 | CONFIG_SLABINFO=y | ||
| 72 | CONFIG_TINY_SHMEM=y | ||
| 73 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
| 74 | CONFIG_MODULES=y | 84 | # CONFIG_MODULES is not set |
| 75 | CONFIG_MODULE_UNLOAD=y | ||
| 76 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 77 | # CONFIG_MODVERSIONS is not set | ||
| 78 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 79 | # CONFIG_KMOD is not set | ||
| 80 | CONFIG_BLOCK=y | 85 | CONFIG_BLOCK=y |
| 81 | # CONFIG_LBD is not set | 86 | # CONFIG_LBD is not set |
| 82 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 83 | # CONFIG_LSF is not set | ||
| 84 | # CONFIG_BLK_DEV_BSG is not set | 87 | # CONFIG_BLK_DEV_BSG is not set |
| 88 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 85 | 89 | ||
| 86 | # | 90 | # |
| 87 | # IO Schedulers | 91 | # IO Schedulers |
| @@ -95,7 +99,7 @@ CONFIG_IOSCHED_NOOP=y | |||
| 95 | # CONFIG_DEFAULT_CFQ is not set | 99 | # CONFIG_DEFAULT_CFQ is not set |
| 96 | CONFIG_DEFAULT_NOOP=y | 100 | CONFIG_DEFAULT_NOOP=y |
| 97 | CONFIG_DEFAULT_IOSCHED="noop" | 101 | CONFIG_DEFAULT_IOSCHED="noop" |
| 98 | CONFIG_CLASSIC_RCU=y | 102 | # CONFIG_FREEZER is not set |
| 99 | 103 | ||
| 100 | # | 104 | # |
| 101 | # Processor type and features | 105 | # Processor type and features |
| @@ -148,44 +152,39 @@ CONFIG_RAMAUTOBIT=y | |||
| 148 | # CONFIG_ROM is not set | 152 | # CONFIG_ROM is not set |
| 149 | CONFIG_RAMKERNEL=y | 153 | CONFIG_RAMKERNEL=y |
| 150 | # CONFIG_ROMKERNEL is not set | 154 | # CONFIG_ROMKERNEL is not set |
| 155 | CONFIG_PREEMPT_NONE=y | ||
| 156 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 157 | # CONFIG_PREEMPT is not set | ||
| 158 | # CONFIG_NO_HZ is not set | ||
| 159 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 160 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 151 | CONFIG_SELECT_MEMORY_MODEL=y | 161 | CONFIG_SELECT_MEMORY_MODEL=y |
| 152 | CONFIG_FLATMEM_MANUAL=y | 162 | CONFIG_FLATMEM_MANUAL=y |
| 153 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 163 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 154 | # CONFIG_SPARSEMEM_MANUAL is not set | 164 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 155 | CONFIG_FLATMEM=y | 165 | CONFIG_FLATMEM=y |
| 156 | CONFIG_FLAT_NODE_MEM_MAP=y | 166 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 157 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 158 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 159 | CONFIG_PAGEFLAGS_EXTENDED=y | 167 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 160 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 168 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 161 | # CONFIG_RESOURCES_64BIT is not set | 169 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 162 | CONFIG_ZONE_DMA_FLAG=1 | 170 | CONFIG_ZONE_DMA_FLAG=1 |
| 163 | CONFIG_VIRT_TO_BUS=y | 171 | CONFIG_VIRT_TO_BUS=y |
| 172 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 164 | CONFIG_ISA_DMA_API=y | 173 | CONFIG_ISA_DMA_API=y |
| 165 | 174 | ||
| 166 | # | 175 | # |
| 167 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 168 | # | ||
| 169 | # CONFIG_PCI is not set | ||
| 170 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 171 | |||
| 172 | # | ||
| 173 | # Executable file formats | 176 | # Executable file formats |
| 174 | # | 177 | # |
| 175 | CONFIG_BINFMT_FLAT=y | 178 | CONFIG_BINFMT_FLAT=y |
| 176 | # CONFIG_BINFMT_ZFLAT is not set | 179 | # CONFIG_BINFMT_ZFLAT is not set |
| 177 | # CONFIG_BINFMT_SHARED_FLAT is not set | 180 | # CONFIG_BINFMT_SHARED_FLAT is not set |
| 178 | # CONFIG_BINFMT_AOUT is not set | 181 | # CONFIG_HAVE_AOUT is not set |
| 179 | # CONFIG_BINFMT_MISC is not set | 182 | # CONFIG_BINFMT_MISC is not set |
| 180 | 183 | ||
| 181 | # | 184 | # |
| 182 | # Power management options | 185 | # Power management options |
| 183 | # | 186 | # |
| 184 | # CONFIG_PM is not set | 187 | # CONFIG_PM is not set |
| 185 | |||
| 186 | # | ||
| 187 | # Networking | ||
| 188 | # | ||
| 189 | CONFIG_NET=y | 188 | CONFIG_NET=y |
| 190 | 189 | ||
| 191 | # | 190 | # |
| @@ -226,6 +225,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 226 | # CONFIG_TIPC is not set | 225 | # CONFIG_TIPC is not set |
| 227 | # CONFIG_ATM is not set | 226 | # CONFIG_ATM is not set |
| 228 | # CONFIG_BRIDGE is not set | 227 | # CONFIG_BRIDGE is not set |
| 228 | # CONFIG_NET_DSA is not set | ||
| 229 | # CONFIG_VLAN_8021Q is not set | 229 | # CONFIG_VLAN_8021Q is not set |
| 230 | # CONFIG_DECNET is not set | 230 | # CONFIG_DECNET is not set |
| 231 | # CONFIG_LLC2 is not set | 231 | # CONFIG_LLC2 is not set |
| @@ -235,7 +235,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 235 | # CONFIG_LAPB is not set | 235 | # CONFIG_LAPB is not set |
| 236 | # CONFIG_ECONET is not set | 236 | # CONFIG_ECONET is not set |
| 237 | # CONFIG_WAN_ROUTER is not set | 237 | # CONFIG_WAN_ROUTER is not set |
| 238 | # CONFIG_PHONET is not set | ||
| 238 | # CONFIG_NET_SCHED is not set | 239 | # CONFIG_NET_SCHED is not set |
| 240 | # CONFIG_DCB is not set | ||
| 239 | 241 | ||
| 240 | # | 242 | # |
| 241 | # Network testing | 243 | # Network testing |
| @@ -246,14 +248,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 246 | # CONFIG_IRDA is not set | 248 | # CONFIG_IRDA is not set |
| 247 | # CONFIG_BT is not set | 249 | # CONFIG_BT is not set |
| 248 | # CONFIG_AF_RXRPC is not set | 250 | # CONFIG_AF_RXRPC is not set |
| 249 | 251 | # CONFIG_WIRELESS is not set | |
| 250 | # | 252 | # CONFIG_WIMAX is not set |
| 251 | # Wireless | ||
| 252 | # | ||
| 253 | # CONFIG_CFG80211 is not set | ||
| 254 | # CONFIG_WIRELESS_EXT is not set | ||
| 255 | # CONFIG_MAC80211 is not set | ||
| 256 | # CONFIG_IEEE80211 is not set | ||
| 257 | # CONFIG_RFKILL is not set | 253 | # CONFIG_RFKILL is not set |
| 258 | # CONFIG_NET_9P is not set | 254 | # CONFIG_NET_9P is not set |
| 259 | 255 | ||
| @@ -333,6 +329,11 @@ CONFIG_MTD_UCLINUX=y | |||
| 333 | # CONFIG_MTD_ONENAND is not set | 329 | # CONFIG_MTD_ONENAND is not set |
| 334 | 330 | ||
| 335 | # | 331 | # |
| 332 | # LPDDR flash memory drivers | ||
| 333 | # | ||
| 334 | # CONFIG_MTD_LPDDR is not set | ||
| 335 | |||
| 336 | # | ||
| 336 | # UBI - Unsorted block images | 337 | # UBI - Unsorted block images |
| 337 | # | 338 | # |
| 338 | # CONFIG_MTD_UBI is not set | 339 | # CONFIG_MTD_UBI is not set |
| @@ -347,6 +348,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 347 | # CONFIG_BLK_DEV_XIP is not set | 348 | # CONFIG_BLK_DEV_XIP is not set |
| 348 | # CONFIG_CDROM_PKTCDVD is not set | 349 | # CONFIG_CDROM_PKTCDVD is not set |
| 349 | # CONFIG_ATA_OVER_ETH is not set | 350 | # CONFIG_ATA_OVER_ETH is not set |
| 351 | # CONFIG_BLK_DEV_HD is not set | ||
| 350 | # CONFIG_MISC_DEVICES is not set | 352 | # CONFIG_MISC_DEVICES is not set |
| 351 | CONFIG_HAVE_IDE=y | 353 | CONFIG_HAVE_IDE=y |
| 352 | # CONFIG_IDE is not set | 354 | # CONFIG_IDE is not set |
| @@ -360,7 +362,7 @@ CONFIG_HAVE_IDE=y | |||
| 360 | # CONFIG_SCSI_NETLINK is not set | 362 | # CONFIG_SCSI_NETLINK is not set |
| 361 | # CONFIG_MD is not set | 363 | # CONFIG_MD is not set |
| 362 | CONFIG_NETDEVICES=y | 364 | CONFIG_NETDEVICES=y |
| 363 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 365 | CONFIG_COMPAT_NET_DEV_OPS=y |
| 364 | # CONFIG_DUMMY is not set | 366 | # CONFIG_DUMMY is not set |
| 365 | # CONFIG_BONDING is not set | 367 | # CONFIG_BONDING is not set |
| 366 | # CONFIG_MACVLAN is not set | 368 | # CONFIG_MACVLAN is not set |
| @@ -370,10 +372,15 @@ CONFIG_NETDEVICES=y | |||
| 370 | # CONFIG_PHYLIB is not set | 372 | # CONFIG_PHYLIB is not set |
| 371 | CONFIG_NET_ETHERNET=y | 373 | CONFIG_NET_ETHERNET=y |
| 372 | # CONFIG_MII is not set | 374 | # CONFIG_MII is not set |
| 375 | # CONFIG_ETHOC is not set | ||
| 376 | # CONFIG_DNET is not set | ||
| 373 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 377 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 374 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 378 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 375 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 379 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 376 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 380 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 381 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 382 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 383 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 377 | # CONFIG_B44 is not set | 384 | # CONFIG_B44 is not set |
| 378 | CONFIG_FEC=y | 385 | CONFIG_FEC=y |
| 379 | CONFIG_FEC2=y | 386 | CONFIG_FEC2=y |
| @@ -385,8 +392,10 @@ CONFIG_FEC2=y | |||
| 385 | # | 392 | # |
| 386 | # CONFIG_WLAN_PRE80211 is not set | 393 | # CONFIG_WLAN_PRE80211 is not set |
| 387 | # CONFIG_WLAN_80211 is not set | 394 | # CONFIG_WLAN_80211 is not set |
| 388 | # CONFIG_IWLWIFI is not set | 395 | |
| 389 | # CONFIG_IWLWIFI_LEDS is not set | 396 | # |
| 397 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 398 | # | ||
| 390 | # CONFIG_WAN is not set | 399 | # CONFIG_WAN is not set |
| 391 | CONFIG_PPP=y | 400 | CONFIG_PPP=y |
| 392 | # CONFIG_PPP_MULTILINK is not set | 401 | # CONFIG_PPP_MULTILINK is not set |
| @@ -421,7 +430,7 @@ CONFIG_SLHC=y | |||
| 421 | # Character devices | 430 | # Character devices |
| 422 | # | 431 | # |
| 423 | # CONFIG_VT is not set | 432 | # CONFIG_VT is not set |
| 424 | # CONFIG_DEVKMEM is not set | 433 | CONFIG_DEVKMEM=y |
| 425 | # CONFIG_SERIAL_NONSTANDARD is not set | 434 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 426 | 435 | ||
| 427 | # | 436 | # |
| @@ -434,7 +443,6 @@ CONFIG_SLHC=y | |||
| 434 | # | 443 | # |
| 435 | CONFIG_SERIAL_CORE=y | 444 | CONFIG_SERIAL_CORE=y |
| 436 | CONFIG_SERIAL_CORE_CONSOLE=y | 445 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 437 | # CONFIG_SERIAL_COLDFIRE is not set | ||
| 438 | CONFIG_SERIAL_MCF=y | 446 | CONFIG_SERIAL_MCF=y |
| 439 | CONFIG_SERIAL_MCF_BAUDRATE=19200 | 447 | CONFIG_SERIAL_MCF_BAUDRATE=19200 |
| 440 | CONFIG_SERIAL_MCF_CONSOLE=y | 448 | CONFIG_SERIAL_MCF_CONSOLE=y |
| @@ -442,7 +450,8 @@ CONFIG_SERIAL_MCF_CONSOLE=y | |||
| 442 | CONFIG_LEGACY_PTYS=y | 450 | CONFIG_LEGACY_PTYS=y |
| 443 | CONFIG_LEGACY_PTY_COUNT=256 | 451 | CONFIG_LEGACY_PTY_COUNT=256 |
| 444 | # CONFIG_IPMI_HANDLER is not set | 452 | # CONFIG_IPMI_HANDLER is not set |
| 445 | # CONFIG_HW_RANDOM is not set | 453 | CONFIG_HW_RANDOM=y |
| 454 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 446 | # CONFIG_GEN_RTC is not set | 455 | # CONFIG_GEN_RTC is not set |
| 447 | # CONFIG_R3964 is not set | 456 | # CONFIG_R3964 is not set |
| 448 | # CONFIG_RAW_DRIVER is not set | 457 | # CONFIG_RAW_DRIVER is not set |
| @@ -453,19 +462,23 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 453 | # CONFIG_POWER_SUPPLY is not set | 462 | # CONFIG_POWER_SUPPLY is not set |
| 454 | # CONFIG_HWMON is not set | 463 | # CONFIG_HWMON is not set |
| 455 | # CONFIG_THERMAL is not set | 464 | # CONFIG_THERMAL is not set |
| 465 | # CONFIG_THERMAL_HWMON is not set | ||
| 456 | # CONFIG_WATCHDOG is not set | 466 | # CONFIG_WATCHDOG is not set |
| 467 | CONFIG_SSB_POSSIBLE=y | ||
| 457 | 468 | ||
| 458 | # | 469 | # |
| 459 | # Sonics Silicon Backplane | 470 | # Sonics Silicon Backplane |
| 460 | # | 471 | # |
| 461 | CONFIG_SSB_POSSIBLE=y | ||
| 462 | # CONFIG_SSB is not set | 472 | # CONFIG_SSB is not set |
| 463 | 473 | ||
| 464 | # | 474 | # |
| 465 | # Multifunction device drivers | 475 | # Multifunction device drivers |
| 466 | # | 476 | # |
| 477 | # CONFIG_MFD_CORE is not set | ||
| 467 | # CONFIG_MFD_SM501 is not set | 478 | # CONFIG_MFD_SM501 is not set |
| 468 | # CONFIG_HTC_PASIC3 is not set | 479 | # CONFIG_HTC_PASIC3 is not set |
| 480 | # CONFIG_MFD_TMIO is not set | ||
| 481 | # CONFIG_REGULATOR is not set | ||
| 469 | 482 | ||
| 470 | # | 483 | # |
| 471 | # Multimedia devices | 484 | # Multimedia devices |
| @@ -476,6 +489,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 476 | # | 489 | # |
| 477 | # CONFIG_VIDEO_DEV is not set | 490 | # CONFIG_VIDEO_DEV is not set |
| 478 | # CONFIG_DVB_CORE is not set | 491 | # CONFIG_DVB_CORE is not set |
| 492 | # CONFIG_VIDEO_MEDIA is not set | ||
| 479 | 493 | ||
| 480 | # | 494 | # |
| 481 | # Multimedia drivers | 495 | # Multimedia drivers |
| @@ -494,10 +508,6 @@ CONFIG_DAB=y | |||
| 494 | # Display device support | 508 | # Display device support |
| 495 | # | 509 | # |
| 496 | # CONFIG_DISPLAY_SUPPORT is not set | 510 | # CONFIG_DISPLAY_SUPPORT is not set |
| 497 | |||
| 498 | # | ||
| 499 | # Sound | ||
| 500 | # | ||
| 501 | # CONFIG_SOUND is not set | 511 | # CONFIG_SOUND is not set |
| 502 | # CONFIG_USB_SUPPORT is not set | 512 | # CONFIG_USB_SUPPORT is not set |
| 503 | # CONFIG_MMC is not set | 513 | # CONFIG_MMC is not set |
| @@ -505,7 +515,10 @@ CONFIG_DAB=y | |||
| 505 | # CONFIG_NEW_LEDS is not set | 515 | # CONFIG_NEW_LEDS is not set |
| 506 | # CONFIG_ACCESSIBILITY is not set | 516 | # CONFIG_ACCESSIBILITY is not set |
| 507 | # CONFIG_RTC_CLASS is not set | 517 | # CONFIG_RTC_CLASS is not set |
| 518 | # CONFIG_DMADEVICES is not set | ||
| 519 | # CONFIG_AUXDISPLAY is not set | ||
| 508 | # CONFIG_UIO is not set | 520 | # CONFIG_UIO is not set |
| 521 | # CONFIG_STAGING is not set | ||
| 509 | 522 | ||
| 510 | # | 523 | # |
| 511 | # File systems | 524 | # File systems |
| @@ -513,12 +526,14 @@ CONFIG_DAB=y | |||
| 513 | CONFIG_EXT2_FS=y | 526 | CONFIG_EXT2_FS=y |
| 514 | # CONFIG_EXT2_FS_XATTR is not set | 527 | # CONFIG_EXT2_FS_XATTR is not set |
| 515 | # CONFIG_EXT3_FS is not set | 528 | # CONFIG_EXT3_FS is not set |
| 516 | # CONFIG_EXT4DEV_FS is not set | 529 | # CONFIG_EXT4_FS is not set |
| 517 | # CONFIG_REISERFS_FS is not set | 530 | # CONFIG_REISERFS_FS is not set |
| 518 | # CONFIG_JFS_FS is not set | 531 | # CONFIG_JFS_FS is not set |
| 519 | # CONFIG_FS_POSIX_ACL is not set | 532 | # CONFIG_FS_POSIX_ACL is not set |
| 533 | # CONFIG_FILE_LOCKING is not set | ||
| 520 | # CONFIG_XFS_FS is not set | 534 | # CONFIG_XFS_FS is not set |
| 521 | # CONFIG_OCFS2_FS is not set | 535 | # CONFIG_OCFS2_FS is not set |
| 536 | # CONFIG_BTRFS_FS is not set | ||
| 522 | # CONFIG_DNOTIFY is not set | 537 | # CONFIG_DNOTIFY is not set |
| 523 | # CONFIG_INOTIFY is not set | 538 | # CONFIG_INOTIFY is not set |
| 524 | # CONFIG_QUOTA is not set | 539 | # CONFIG_QUOTA is not set |
| @@ -527,6 +542,11 @@ CONFIG_EXT2_FS=y | |||
| 527 | # CONFIG_FUSE_FS is not set | 542 | # CONFIG_FUSE_FS is not set |
| 528 | 543 | ||
| 529 | # | 544 | # |
| 545 | # Caches | ||
| 546 | # | ||
| 547 | # CONFIG_FSCACHE is not set | ||
| 548 | |||
| 549 | # | ||
| 530 | # CD-ROM/DVD Filesystems | 550 | # CD-ROM/DVD Filesystems |
| 531 | # | 551 | # |
| 532 | # CONFIG_ISO9660_FS is not set | 552 | # CONFIG_ISO9660_FS is not set |
| @@ -548,10 +568,7 @@ CONFIG_SYSFS=y | |||
| 548 | # CONFIG_TMPFS is not set | 568 | # CONFIG_TMPFS is not set |
| 549 | # CONFIG_HUGETLB_PAGE is not set | 569 | # CONFIG_HUGETLB_PAGE is not set |
| 550 | # CONFIG_CONFIGFS_FS is not set | 570 | # CONFIG_CONFIGFS_FS is not set |
| 551 | 571 | CONFIG_MISC_FILESYSTEMS=y | |
| 552 | # | ||
| 553 | # Miscellaneous filesystems | ||
| 554 | # | ||
| 555 | # CONFIG_ADFS_FS is not set | 572 | # CONFIG_ADFS_FS is not set |
| 556 | # CONFIG_AFFS_FS is not set | 573 | # CONFIG_AFFS_FS is not set |
| 557 | # CONFIG_HFS_FS is not set | 574 | # CONFIG_HFS_FS is not set |
| @@ -561,21 +578,21 @@ CONFIG_SYSFS=y | |||
| 561 | # CONFIG_EFS_FS is not set | 578 | # CONFIG_EFS_FS is not set |
| 562 | # CONFIG_JFFS2_FS is not set | 579 | # CONFIG_JFFS2_FS is not set |
| 563 | # CONFIG_CRAMFS is not set | 580 | # CONFIG_CRAMFS is not set |
| 581 | # CONFIG_SQUASHFS is not set | ||
| 564 | # CONFIG_VXFS_FS is not set | 582 | # CONFIG_VXFS_FS is not set |
| 565 | # CONFIG_MINIX_FS is not set | 583 | # CONFIG_MINIX_FS is not set |
| 584 | # CONFIG_OMFS_FS is not set | ||
| 566 | # CONFIG_HPFS_FS is not set | 585 | # CONFIG_HPFS_FS is not set |
| 567 | # CONFIG_QNX4FS_FS is not set | 586 | # CONFIG_QNX4FS_FS is not set |
| 568 | CONFIG_ROMFS_FS=y | 587 | CONFIG_ROMFS_FS=y |
| 588 | # CONFIG_ROMFS_BACKED_BY_BLOCK is not set | ||
| 589 | CONFIG_ROMFS_BACKED_BY_MTD=y | ||
| 590 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 591 | CONFIG_ROMFS_ON_MTD=y | ||
| 569 | # CONFIG_SYSV_FS is not set | 592 | # CONFIG_SYSV_FS is not set |
| 570 | # CONFIG_UFS_FS is not set | 593 | # CONFIG_UFS_FS is not set |
| 571 | CONFIG_NETWORK_FILESYSTEMS=y | 594 | # CONFIG_NILFS2_FS is not set |
| 572 | # CONFIG_NFS_FS is not set | 595 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 573 | # CONFIG_NFSD is not set | ||
| 574 | # CONFIG_SMB_FS is not set | ||
| 575 | # CONFIG_CIFS is not set | ||
| 576 | # CONFIG_NCP_FS is not set | ||
| 577 | # CONFIG_CODA_FS is not set | ||
| 578 | # CONFIG_AFS_FS is not set | ||
| 579 | 596 | ||
| 580 | # | 597 | # |
| 581 | # Partition Types | 598 | # Partition Types |
| @@ -598,10 +615,14 @@ CONFIG_FRAME_WARN=1024 | |||
| 598 | # CONFIG_HEADERS_CHECK is not set | 615 | # CONFIG_HEADERS_CHECK is not set |
| 599 | # CONFIG_DEBUG_KERNEL is not set | 616 | # CONFIG_DEBUG_KERNEL is not set |
| 600 | # CONFIG_DEBUG_BUGVERBOSE is not set | 617 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 618 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 619 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 620 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 601 | # CONFIG_SAMPLES is not set | 621 | # CONFIG_SAMPLES is not set |
| 602 | # CONFIG_FULLDEBUG is not set | 622 | # CONFIG_FULLDEBUG is not set |
| 603 | # CONFIG_HIGHPROFILE is not set | 623 | # CONFIG_HIGHPROFILE is not set |
| 604 | # CONFIG_BOOTPARAM is not set | 624 | CONFIG_BOOTPARAM=y |
| 625 | CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0" | ||
| 605 | # CONFIG_NO_KERNEL_MSG is not set | 626 | # CONFIG_NO_KERNEL_MSG is not set |
| 606 | # CONFIG_BDM_DISABLE is not set | 627 | # CONFIG_BDM_DISABLE is not set |
| 607 | 628 | ||
| @@ -610,18 +631,22 @@ CONFIG_FRAME_WARN=1024 | |||
| 610 | # | 631 | # |
| 611 | # CONFIG_KEYS is not set | 632 | # CONFIG_KEYS is not set |
| 612 | # CONFIG_SECURITY is not set | 633 | # CONFIG_SECURITY is not set |
| 634 | # CONFIG_SECURITYFS is not set | ||
| 613 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 635 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 614 | # CONFIG_CRYPTO is not set | 636 | # CONFIG_CRYPTO is not set |
| 637 | # CONFIG_BINARY_PRINTF is not set | ||
| 615 | 638 | ||
| 616 | # | 639 | # |
| 617 | # Library routines | 640 | # Library routines |
| 618 | # | 641 | # |
| 619 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 642 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 620 | # CONFIG_CRC_CCITT is not set | 643 | # CONFIG_CRC_CCITT is not set |
| 621 | # CONFIG_CRC16 is not set | 644 | # CONFIG_CRC16 is not set |
| 645 | # CONFIG_CRC_T10DIF is not set | ||
| 622 | # CONFIG_CRC_ITU_T is not set | 646 | # CONFIG_CRC_ITU_T is not set |
| 623 | # CONFIG_CRC32 is not set | 647 | # CONFIG_CRC32 is not set |
| 624 | # CONFIG_CRC7 is not set | 648 | # CONFIG_CRC7 is not set |
| 625 | # CONFIG_LIBCRC32C is not set | 649 | # CONFIG_LIBCRC32C is not set |
| 626 | CONFIG_HAS_IOMEM=y | 650 | CONFIG_HAS_IOMEM=y |
| 627 | CONFIG_HAS_DMA=y | 651 | CONFIG_HAS_DMA=y |
| 652 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68knommu/configs/m5307c3_defconfig b/arch/m68knommu/configs/m5307c3_defconfig index fe2acdfa4d7..3a3f6733ae4 100644 --- a/arch/m68knommu/configs/m5307c3_defconfig +++ b/arch/m68knommu/configs/m5307c3_defconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # | 4 | # |
| 5 | CONFIG_M68K=y | 5 | CONFIG_M68K=y |
| 6 | # CONFIG_MMU is not set | 6 | # CONFIG_MMU is not set |
| @@ -15,9 +15,10 @@ CONFIG_GENERIC_HWEIGHT=y | |||
| 15 | CONFIG_GENERIC_HARDIRQS=y | 15 | CONFIG_GENERIC_HARDIRQS=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_TIME=y | 17 | CONFIG_GENERIC_TIME=y |
| 18 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 18 | CONFIG_TIME_LOW_RES=y | 19 | CONFIG_TIME_LOW_RES=y |
| 20 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
| 19 | CONFIG_NO_IOPORT=y | 21 | CONFIG_NO_IOPORT=y |
| 20 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 22 | 23 | ||
| 23 | # | 24 | # |
| @@ -33,10 +34,21 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 33 | # CONFIG_BSD_PROCESS_ACCT is not set | 34 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 49 | # CONFIG_USER_SCHED is not set | ||
| 50 | # CONFIG_CGROUP_SCHED is not set | ||
| 51 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 52 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 41 | # CONFIG_RELAY is not set | 53 | # CONFIG_RELAY is not set |
| 42 | # CONFIG_NAMESPACES is not set | 54 | # CONFIG_NAMESPACES is not set |
| @@ -44,44 +56,37 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 44 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 56 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 45 | CONFIG_SYSCTL=y | 57 | CONFIG_SYSCTL=y |
| 46 | CONFIG_EMBEDDED=y | 58 | CONFIG_EMBEDDED=y |
| 47 | # CONFIG_UID16 is not set | 59 | CONFIG_UID16=y |
| 48 | # CONFIG_SYSCTL_SYSCALL is not set | 60 | CONFIG_SYSCTL_SYSCALL=y |
| 49 | # CONFIG_KALLSYMS is not set | 61 | # CONFIG_KALLSYMS is not set |
| 62 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 50 | # CONFIG_HOTPLUG is not set | 63 | # CONFIG_HOTPLUG is not set |
| 51 | CONFIG_PRINTK=y | 64 | CONFIG_PRINTK=y |
| 52 | CONFIG_BUG=y | 65 | CONFIG_BUG=y |
| 53 | CONFIG_ELF_CORE=y | 66 | CONFIG_ELF_CORE=y |
| 54 | # CONFIG_COMPAT_BRK is not set | ||
| 55 | CONFIG_BASE_FULL=y | 67 | CONFIG_BASE_FULL=y |
| 56 | # CONFIG_FUTEX is not set | 68 | # CONFIG_FUTEX is not set |
| 57 | # CONFIG_EPOLL is not set | 69 | # CONFIG_EPOLL is not set |
| 58 | # CONFIG_SIGNALFD is not set | 70 | # CONFIG_SIGNALFD is not set |
| 59 | # CONFIG_TIMERFD is not set | 71 | # CONFIG_TIMERFD is not set |
| 60 | # CONFIG_EVENTFD is not set | 72 | # CONFIG_EVENTFD is not set |
| 73 | # CONFIG_AIO is not set | ||
| 61 | # CONFIG_VM_EVENT_COUNTERS is not set | 74 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 62 | CONFIG_SLAB=y | 75 | # CONFIG_SLUB_DEBUG is not set |
| 63 | # CONFIG_SLUB is not set | 76 | CONFIG_COMPAT_BRK=y |
| 77 | # CONFIG_SLAB is not set | ||
| 78 | CONFIG_SLUB=y | ||
| 64 | # CONFIG_SLOB is not set | 79 | # CONFIG_SLOB is not set |
| 65 | # CONFIG_PROFILING is not set | 80 | # CONFIG_PROFILING is not set |
| 66 | # CONFIG_MARKERS is not set | 81 | # CONFIG_MARKERS is not set |
| 67 | # CONFIG_HAVE_OPROFILE is not set | 82 | # CONFIG_SLOW_WORK is not set |
| 68 | # CONFIG_HAVE_KPROBES is not set | 83 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 69 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 70 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 71 | CONFIG_SLABINFO=y | ||
| 72 | CONFIG_TINY_SHMEM=y | ||
| 73 | CONFIG_BASE_SMALL=0 | 84 | CONFIG_BASE_SMALL=0 |
| 74 | CONFIG_MODULES=y | 85 | # CONFIG_MODULES is not set |
| 75 | CONFIG_MODULE_UNLOAD=y | ||
| 76 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 77 | # CONFIG_MODVERSIONS is not set | ||
| 78 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 79 | # CONFIG_KMOD is not set | ||
| 80 | CONFIG_BLOCK=y | 86 | CONFIG_BLOCK=y |
| 81 | # CONFIG_LBD is not set | 87 | # CONFIG_LBD is not set |
| 82 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 83 | # CONFIG_LSF is not set | ||
| 84 | # CONFIG_BLK_DEV_BSG is not set | 88 | # CONFIG_BLK_DEV_BSG is not set |
| 89 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 85 | 90 | ||
| 86 | # | 91 | # |
| 87 | # IO Schedulers | 92 | # IO Schedulers |
| @@ -95,7 +100,7 @@ CONFIG_IOSCHED_NOOP=y | |||
| 95 | # CONFIG_DEFAULT_CFQ is not set | 100 | # CONFIG_DEFAULT_CFQ is not set |
| 96 | CONFIG_DEFAULT_NOOP=y | 101 | CONFIG_DEFAULT_NOOP=y |
| 97 | CONFIG_DEFAULT_IOSCHED="noop" | 102 | CONFIG_DEFAULT_IOSCHED="noop" |
| 98 | CONFIG_CLASSIC_RCU=y | 103 | # CONFIG_FREEZER is not set |
| 99 | 104 | ||
| 100 | # | 105 | # |
| 101 | # Processor type and features | 106 | # Processor type and features |
| @@ -127,12 +132,11 @@ CONFIG_CLOCK_DIV=2 | |||
| 127 | # | 132 | # |
| 128 | # CONFIG_ARN5307 is not set | 133 | # CONFIG_ARN5307 is not set |
| 129 | CONFIG_M5307C3=y | 134 | CONFIG_M5307C3=y |
| 130 | # CONFIG_eLIA is not set | ||
| 131 | # CONFIG_SECUREEDGEMP3 is not set | 135 | # CONFIG_SECUREEDGEMP3 is not set |
| 132 | # CONFIG_CLEOPATRA is not set | 136 | # CONFIG_CLEOPATRA is not set |
| 133 | # CONFIG_NETtel is not set | 137 | # CONFIG_NETtel is not set |
| 134 | CONFIG_FREESCALE=y | 138 | CONFIG_FREESCALE=y |
| 135 | # CONFIG_4KSTACKS is not set | 139 | CONFIG_4KSTACKS=y |
| 136 | CONFIG_HZ=100 | 140 | CONFIG_HZ=100 |
| 137 | 141 | ||
| 138 | # | 142 | # |
| @@ -153,45 +157,36 @@ CONFIG_RAMAUTOBIT=y | |||
| 153 | # CONFIG_ROM is not set | 157 | # CONFIG_ROM is not set |
| 154 | CONFIG_RAMKERNEL=y | 158 | CONFIG_RAMKERNEL=y |
| 155 | # CONFIG_ROMKERNEL is not set | 159 | # CONFIG_ROMKERNEL is not set |
| 160 | CONFIG_PREEMPT_NONE=y | ||
| 161 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 162 | # CONFIG_PREEMPT is not set | ||
| 156 | CONFIG_SELECT_MEMORY_MODEL=y | 163 | CONFIG_SELECT_MEMORY_MODEL=y |
| 157 | CONFIG_FLATMEM_MANUAL=y | 164 | CONFIG_FLATMEM_MANUAL=y |
| 158 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 165 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 159 | # CONFIG_SPARSEMEM_MANUAL is not set | 166 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 160 | CONFIG_FLATMEM=y | 167 | CONFIG_FLATMEM=y |
| 161 | CONFIG_FLAT_NODE_MEM_MAP=y | 168 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 162 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 163 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 164 | CONFIG_PAGEFLAGS_EXTENDED=y | 169 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 165 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 170 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 166 | # CONFIG_RESOURCES_64BIT is not set | 171 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 167 | CONFIG_ZONE_DMA_FLAG=1 | 172 | CONFIG_ZONE_DMA_FLAG=1 |
| 168 | CONFIG_VIRT_TO_BUS=y | 173 | CONFIG_VIRT_TO_BUS=y |
| 174 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 169 | CONFIG_ISA_DMA_API=y | 175 | CONFIG_ISA_DMA_API=y |
| 170 | 176 | ||
| 171 | # | 177 | # |
| 172 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 173 | # | ||
| 174 | # CONFIG_PCI is not set | ||
| 175 | # CONFIG_COMEMPCI is not set | ||
| 176 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 177 | |||
| 178 | # | ||
| 179 | # Executable file formats | 178 | # Executable file formats |
| 180 | # | 179 | # |
| 181 | CONFIG_BINFMT_FLAT=y | 180 | CONFIG_BINFMT_FLAT=y |
| 182 | # CONFIG_BINFMT_ZFLAT is not set | 181 | # CONFIG_BINFMT_ZFLAT is not set |
| 183 | # CONFIG_BINFMT_SHARED_FLAT is not set | 182 | # CONFIG_BINFMT_SHARED_FLAT is not set |
| 184 | # CONFIG_BINFMT_AOUT is not set | 183 | # CONFIG_HAVE_AOUT is not set |
| 185 | # CONFIG_BINFMT_MISC is not set | 184 | # CONFIG_BINFMT_MISC is not set |
| 186 | 185 | ||
| 187 | # | 186 | # |
| 188 | # Power management options | 187 | # Power management options |
| 189 | # | 188 | # |
| 190 | # CONFIG_PM is not set | 189 | # CONFIG_PM is not set |
| 191 | |||
| 192 | # | ||
| 193 | # Networking | ||
| 194 | # | ||
| 195 | CONFIG_NET=y | 190 | CONFIG_NET=y |
| 196 | 191 | ||
| 197 | # | 192 | # |
| @@ -232,6 +227,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 232 | # CONFIG_TIPC is not set | 227 | # CONFIG_TIPC is not set |
| 233 | # CONFIG_ATM is not set | 228 | # CONFIG_ATM is not set |
| 234 | # CONFIG_BRIDGE is not set | 229 | # CONFIG_BRIDGE is not set |
| 230 | # CONFIG_NET_DSA is not set | ||
| 235 | # CONFIG_VLAN_8021Q is not set | 231 | # CONFIG_VLAN_8021Q is not set |
| 236 | # CONFIG_DECNET is not set | 232 | # CONFIG_DECNET is not set |
| 237 | # CONFIG_LLC2 is not set | 233 | # CONFIG_LLC2 is not set |
| @@ -241,7 +237,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 241 | # CONFIG_LAPB is not set | 237 | # CONFIG_LAPB is not set |
| 242 | # CONFIG_ECONET is not set | 238 | # CONFIG_ECONET is not set |
| 243 | # CONFIG_WAN_ROUTER is not set | 239 | # CONFIG_WAN_ROUTER is not set |
| 240 | # CONFIG_PHONET is not set | ||
| 244 | # CONFIG_NET_SCHED is not set | 241 | # CONFIG_NET_SCHED is not set |
| 242 | # CONFIG_DCB is not set | ||
| 245 | 243 | ||
| 246 | # | 244 | # |
| 247 | # Network testing | 245 | # Network testing |
| @@ -252,14 +250,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 252 | # CONFIG_IRDA is not set | 250 | # CONFIG_IRDA is not set |
| 253 | # CONFIG_BT is not set | 251 | # CONFIG_BT is not set |
| 254 | # CONFIG_AF_RXRPC is not set | 252 | # CONFIG_AF_RXRPC is not set |
| 255 | 253 | # CONFIG_WIRELESS is not set | |
| 256 | # | 254 | # CONFIG_WIMAX is not set |
| 257 | # Wireless | ||
| 258 | # | ||
| 259 | # CONFIG_CFG80211 is not set | ||
| 260 | # CONFIG_WIRELESS_EXT is not set | ||
| 261 | # CONFIG_MAC80211 is not set | ||
| 262 | # CONFIG_IEEE80211 is not set | ||
| 263 | # CONFIG_RFKILL is not set | 255 | # CONFIG_RFKILL is not set |
| 264 | # CONFIG_NET_9P is not set | 256 | # CONFIG_NET_9P is not set |
| 265 | 257 | ||
| @@ -274,7 +266,79 @@ CONFIG_STANDALONE=y | |||
| 274 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 266 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 275 | # CONFIG_SYS_HYPERVISOR is not set | 267 | # CONFIG_SYS_HYPERVISOR is not set |
| 276 | # CONFIG_CONNECTOR is not set | 268 | # CONFIG_CONNECTOR is not set |
| 277 | # CONFIG_MTD is not set | 269 | CONFIG_MTD=y |
| 270 | # CONFIG_MTD_DEBUG is not set | ||
| 271 | # CONFIG_MTD_CONCAT is not set | ||
| 272 | CONFIG_MTD_PARTITIONS=y | ||
| 273 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 274 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 275 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 276 | |||
| 277 | # | ||
| 278 | # User Modules And Translation Layers | ||
| 279 | # | ||
| 280 | CONFIG_MTD_CHAR=y | ||
| 281 | CONFIG_MTD_BLKDEVS=y | ||
| 282 | CONFIG_MTD_BLOCK=y | ||
| 283 | # CONFIG_FTL is not set | ||
| 284 | # CONFIG_NFTL is not set | ||
| 285 | # CONFIG_INFTL is not set | ||
| 286 | # CONFIG_RFD_FTL is not set | ||
| 287 | # CONFIG_SSFDC is not set | ||
| 288 | # CONFIG_MTD_OOPS is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # RAM/ROM/Flash chip drivers | ||
| 292 | # | ||
| 293 | # CONFIG_MTD_CFI is not set | ||
| 294 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 295 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 296 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 297 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 298 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 299 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 300 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 301 | CONFIG_MTD_CFI_I1=y | ||
| 302 | CONFIG_MTD_CFI_I2=y | ||
| 303 | # CONFIG_MTD_CFI_I4 is not set | ||
| 304 | # CONFIG_MTD_CFI_I8 is not set | ||
| 305 | CONFIG_MTD_RAM=y | ||
| 306 | # CONFIG_MTD_ROM is not set | ||
| 307 | # CONFIG_MTD_ABSENT is not set | ||
| 308 | |||
| 309 | # | ||
| 310 | # Mapping drivers for chip access | ||
| 311 | # | ||
| 312 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 313 | CONFIG_MTD_UCLINUX=y | ||
| 314 | # CONFIG_MTD_PLATRAM is not set | ||
| 315 | |||
| 316 | # | ||
| 317 | # Self-contained MTD device drivers | ||
| 318 | # | ||
| 319 | # CONFIG_MTD_SLRAM is not set | ||
| 320 | # CONFIG_MTD_PHRAM is not set | ||
| 321 | # CONFIG_MTD_MTDRAM is not set | ||
| 322 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 323 | |||
| 324 | # | ||
| 325 | # Disk-On-Chip Device Drivers | ||
| 326 | # | ||
| 327 | # CONFIG_MTD_DOC2000 is not set | ||
| 328 | # CONFIG_MTD_DOC2001 is not set | ||
| 329 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 330 | # CONFIG_MTD_NAND is not set | ||
| 331 | # CONFIG_MTD_ONENAND is not set | ||
| 332 | |||
| 333 | # | ||
| 334 | # LPDDR flash memory drivers | ||
| 335 | # | ||
| 336 | # CONFIG_MTD_LPDDR is not set | ||
| 337 | |||
| 338 | # | ||
| 339 | # UBI - Unsorted block images | ||
| 340 | # | ||
| 341 | # CONFIG_MTD_UBI is not set | ||
| 278 | # CONFIG_PARPORT is not set | 342 | # CONFIG_PARPORT is not set |
| 279 | CONFIG_BLK_DEV=y | 343 | CONFIG_BLK_DEV=y |
| 280 | # CONFIG_BLK_DEV_COW_COMMON is not set | 344 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| @@ -286,6 +350,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 286 | # CONFIG_BLK_DEV_XIP is not set | 350 | # CONFIG_BLK_DEV_XIP is not set |
| 287 | # CONFIG_CDROM_PKTCDVD is not set | 351 | # CONFIG_CDROM_PKTCDVD is not set |
| 288 | # CONFIG_ATA_OVER_ETH is not set | 352 | # CONFIG_ATA_OVER_ETH is not set |
| 353 | # CONFIG_BLK_DEV_HD is not set | ||
| 289 | # CONFIG_MISC_DEVICES is not set | 354 | # CONFIG_MISC_DEVICES is not set |
| 290 | CONFIG_HAVE_IDE=y | 355 | CONFIG_HAVE_IDE=y |
| 291 | # CONFIG_IDE is not set | 356 | # CONFIG_IDE is not set |
| @@ -299,7 +364,7 @@ CONFIG_HAVE_IDE=y | |||
| 299 | # CONFIG_SCSI_NETLINK is not set | 364 | # CONFIG_SCSI_NETLINK is not set |
| 300 | # CONFIG_MD is not set | 365 | # CONFIG_MD is not set |
| 301 | CONFIG_NETDEVICES=y | 366 | CONFIG_NETDEVICES=y |
| 302 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 367 | CONFIG_COMPAT_NET_DEV_OPS=y |
| 303 | # CONFIG_DUMMY is not set | 368 | # CONFIG_DUMMY is not set |
| 304 | # CONFIG_BONDING is not set | 369 | # CONFIG_BONDING is not set |
| 305 | # CONFIG_MACVLAN is not set | 370 | # CONFIG_MACVLAN is not set |
| @@ -309,10 +374,15 @@ CONFIG_NETDEVICES=y | |||
| 309 | # CONFIG_PHYLIB is not set | 374 | # CONFIG_PHYLIB is not set |
| 310 | CONFIG_NET_ETHERNET=y | 375 | CONFIG_NET_ETHERNET=y |
| 311 | # CONFIG_MII is not set | 376 | # CONFIG_MII is not set |
| 377 | # CONFIG_ETHOC is not set | ||
| 378 | # CONFIG_DNET is not set | ||
| 312 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 379 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 313 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 380 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 314 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 381 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 315 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 382 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 383 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 384 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 385 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 316 | # CONFIG_B44 is not set | 386 | # CONFIG_B44 is not set |
| 317 | # CONFIG_NETDEV_1000 is not set | 387 | # CONFIG_NETDEV_1000 is not set |
| 318 | # CONFIG_NETDEV_10000 is not set | 388 | # CONFIG_NETDEV_10000 is not set |
| @@ -322,8 +392,10 @@ CONFIG_NET_ETHERNET=y | |||
| 322 | # | 392 | # |
| 323 | # CONFIG_WLAN_PRE80211 is not set | 393 | # CONFIG_WLAN_PRE80211 is not set |
| 324 | # CONFIG_WLAN_80211 is not set | 394 | # CONFIG_WLAN_80211 is not set |
| 325 | # CONFIG_IWLWIFI is not set | 395 | |
| 326 | # CONFIG_IWLWIFI_LEDS is not set | 396 | # |
| 397 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 398 | # | ||
| 327 | # CONFIG_WAN is not set | 399 | # CONFIG_WAN is not set |
| 328 | CONFIG_PPP=y | 400 | CONFIG_PPP=y |
| 329 | # CONFIG_PPP_MULTILINK is not set | 401 | # CONFIG_PPP_MULTILINK is not set |
| @@ -381,7 +453,7 @@ CONFIG_INPUT=y | |||
| 381 | # Character devices | 453 | # Character devices |
| 382 | # | 454 | # |
| 383 | # CONFIG_VT is not set | 455 | # CONFIG_VT is not set |
| 384 | # CONFIG_DEVKMEM is not set | 456 | CONFIG_DEVKMEM=y |
| 385 | # CONFIG_SERIAL_NONSTANDARD is not set | 457 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 386 | 458 | ||
| 387 | # | 459 | # |
| @@ -394,13 +466,12 @@ CONFIG_INPUT=y | |||
| 394 | # | 466 | # |
| 395 | CONFIG_SERIAL_CORE=y | 467 | CONFIG_SERIAL_CORE=y |
| 396 | CONFIG_SERIAL_CORE_CONSOLE=y | 468 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 397 | # CONFIG_SERIAL_COLDFIRE is not set | ||
| 398 | CONFIG_SERIAL_MCF=y | 469 | CONFIG_SERIAL_MCF=y |
| 399 | CONFIG_SERIAL_MCF_BAUDRATE=19200 | 470 | CONFIG_SERIAL_MCF_BAUDRATE=19200 |
| 400 | CONFIG_SERIAL_MCF_CONSOLE=y | 471 | CONFIG_SERIAL_MCF_CONSOLE=y |
| 401 | CONFIG_UNIX98_PTYS=y | 472 | CONFIG_UNIX98_PTYS=y |
| 402 | CONFIG_LEGACY_PTYS=y | 473 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 403 | CONFIG_LEGACY_PTY_COUNT=256 | 474 | # CONFIG_LEGACY_PTYS is not set |
| 404 | # CONFIG_IPMI_HANDLER is not set | 475 | # CONFIG_IPMI_HANDLER is not set |
| 405 | # CONFIG_HW_RANDOM is not set | 476 | # CONFIG_HW_RANDOM is not set |
| 406 | # CONFIG_GEN_RTC is not set | 477 | # CONFIG_GEN_RTC is not set |
| @@ -413,19 +484,23 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 413 | # CONFIG_POWER_SUPPLY is not set | 484 | # CONFIG_POWER_SUPPLY is not set |
| 414 | # CONFIG_HWMON is not set | 485 | # CONFIG_HWMON is not set |
| 415 | # CONFIG_THERMAL is not set | 486 | # CONFIG_THERMAL is not set |
| 487 | # CONFIG_THERMAL_HWMON is not set | ||
| 416 | # CONFIG_WATCHDOG is not set | 488 | # CONFIG_WATCHDOG is not set |
| 489 | CONFIG_SSB_POSSIBLE=y | ||
| 417 | 490 | ||
| 418 | # | 491 | # |
| 419 | # Sonics Silicon Backplane | 492 | # Sonics Silicon Backplane |
| 420 | # | 493 | # |
| 421 | CONFIG_SSB_POSSIBLE=y | ||
| 422 | # CONFIG_SSB is not set | 494 | # CONFIG_SSB is not set |
| 423 | 495 | ||
| 424 | # | 496 | # |
| 425 | # Multifunction device drivers | 497 | # Multifunction device drivers |
| 426 | # | 498 | # |
| 499 | # CONFIG_MFD_CORE is not set | ||
| 427 | # CONFIG_MFD_SM501 is not set | 500 | # CONFIG_MFD_SM501 is not set |
| 428 | # CONFIG_HTC_PASIC3 is not set | 501 | # CONFIG_HTC_PASIC3 is not set |
| 502 | # CONFIG_MFD_TMIO is not set | ||
| 503 | # CONFIG_REGULATOR is not set | ||
| 429 | 504 | ||
| 430 | # | 505 | # |
| 431 | # Multimedia devices | 506 | # Multimedia devices |
| @@ -436,6 +511,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 436 | # | 511 | # |
| 437 | # CONFIG_VIDEO_DEV is not set | 512 | # CONFIG_VIDEO_DEV is not set |
| 438 | # CONFIG_DVB_CORE is not set | 513 | # CONFIG_DVB_CORE is not set |
| 514 | # CONFIG_VIDEO_MEDIA is not set | ||
| 439 | 515 | ||
| 440 | # | 516 | # |
| 441 | # Multimedia drivers | 517 | # Multimedia drivers |
| @@ -454,10 +530,6 @@ CONFIG_DAB=y | |||
| 454 | # Display device support | 530 | # Display device support |
| 455 | # | 531 | # |
| 456 | # CONFIG_DISPLAY_SUPPORT is not set | 532 | # CONFIG_DISPLAY_SUPPORT is not set |
| 457 | |||
| 458 | # | ||
| 459 | # Sound | ||
| 460 | # | ||
| 461 | # CONFIG_SOUND is not set | 533 | # CONFIG_SOUND is not set |
| 462 | # CONFIG_HID_SUPPORT is not set | 534 | # CONFIG_HID_SUPPORT is not set |
| 463 | # CONFIG_USB_SUPPORT is not set | 535 | # CONFIG_USB_SUPPORT is not set |
| @@ -466,7 +538,10 @@ CONFIG_DAB=y | |||
| 466 | # CONFIG_NEW_LEDS is not set | 538 | # CONFIG_NEW_LEDS is not set |
| 467 | # CONFIG_ACCESSIBILITY is not set | 539 | # CONFIG_ACCESSIBILITY is not set |
| 468 | # CONFIG_RTC_CLASS is not set | 540 | # CONFIG_RTC_CLASS is not set |
| 541 | # CONFIG_DMADEVICES is not set | ||
| 542 | # CONFIG_AUXDISPLAY is not set | ||
| 469 | # CONFIG_UIO is not set | 543 | # CONFIG_UIO is not set |
| 544 | # CONFIG_STAGING is not set | ||
| 470 | 545 | ||
| 471 | # | 546 | # |
| 472 | # File systems | 547 | # File systems |
| @@ -474,12 +549,14 @@ CONFIG_DAB=y | |||
| 474 | CONFIG_EXT2_FS=y | 549 | CONFIG_EXT2_FS=y |
| 475 | # CONFIG_EXT2_FS_XATTR is not set | 550 | # CONFIG_EXT2_FS_XATTR is not set |
| 476 | # CONFIG_EXT3_FS is not set | 551 | # CONFIG_EXT3_FS is not set |
| 477 | # CONFIG_EXT4DEV_FS is not set | 552 | # CONFIG_EXT4_FS is not set |
| 478 | # CONFIG_REISERFS_FS is not set | 553 | # CONFIG_REISERFS_FS is not set |
| 479 | # CONFIG_JFS_FS is not set | 554 | # CONFIG_JFS_FS is not set |
| 480 | # CONFIG_FS_POSIX_ACL is not set | 555 | # CONFIG_FS_POSIX_ACL is not set |
| 556 | CONFIG_FILE_LOCKING=y | ||
| 481 | # CONFIG_XFS_FS is not set | 557 | # CONFIG_XFS_FS is not set |
| 482 | # CONFIG_OCFS2_FS is not set | 558 | # CONFIG_OCFS2_FS is not set |
| 559 | # CONFIG_BTRFS_FS is not set | ||
| 483 | # CONFIG_DNOTIFY is not set | 560 | # CONFIG_DNOTIFY is not set |
| 484 | # CONFIG_INOTIFY is not set | 561 | # CONFIG_INOTIFY is not set |
| 485 | # CONFIG_QUOTA is not set | 562 | # CONFIG_QUOTA is not set |
| @@ -488,6 +565,11 @@ CONFIG_EXT2_FS=y | |||
| 488 | # CONFIG_FUSE_FS is not set | 565 | # CONFIG_FUSE_FS is not set |
| 489 | 566 | ||
| 490 | # | 567 | # |
| 568 | # Caches | ||
| 569 | # | ||
| 570 | # CONFIG_FSCACHE is not set | ||
| 571 | |||
| 572 | # | ||
| 491 | # CD-ROM/DVD Filesystems | 573 | # CD-ROM/DVD Filesystems |
| 492 | # | 574 | # |
| 493 | # CONFIG_ISO9660_FS is not set | 575 | # CONFIG_ISO9660_FS is not set |
| @@ -509,10 +591,7 @@ CONFIG_SYSFS=y | |||
| 509 | # CONFIG_TMPFS is not set | 591 | # CONFIG_TMPFS is not set |
| 510 | # CONFIG_HUGETLB_PAGE is not set | 592 | # CONFIG_HUGETLB_PAGE is not set |
| 511 | # CONFIG_CONFIGFS_FS is not set | 593 | # CONFIG_CONFIGFS_FS is not set |
| 512 | 594 | CONFIG_MISC_FILESYSTEMS=y | |
| 513 | # | ||
| 514 | # Miscellaneous filesystems | ||
| 515 | # | ||
| 516 | # CONFIG_ADFS_FS is not set | 595 | # CONFIG_ADFS_FS is not set |
| 517 | # CONFIG_AFFS_FS is not set | 596 | # CONFIG_AFFS_FS is not set |
| 518 | # CONFIG_HFS_FS is not set | 597 | # CONFIG_HFS_FS is not set |
| @@ -520,14 +599,22 @@ CONFIG_SYSFS=y | |||
| 520 | # CONFIG_BEFS_FS is not set | 599 | # CONFIG_BEFS_FS is not set |
| 521 | # CONFIG_BFS_FS is not set | 600 | # CONFIG_BFS_FS is not set |
| 522 | # CONFIG_EFS_FS is not set | 601 | # CONFIG_EFS_FS is not set |
| 602 | # CONFIG_JFFS2_FS is not set | ||
| 523 | # CONFIG_CRAMFS is not set | 603 | # CONFIG_CRAMFS is not set |
| 604 | # CONFIG_SQUASHFS is not set | ||
| 524 | # CONFIG_VXFS_FS is not set | 605 | # CONFIG_VXFS_FS is not set |
| 525 | # CONFIG_MINIX_FS is not set | 606 | # CONFIG_MINIX_FS is not set |
| 607 | # CONFIG_OMFS_FS is not set | ||
| 526 | # CONFIG_HPFS_FS is not set | 608 | # CONFIG_HPFS_FS is not set |
| 527 | # CONFIG_QNX4FS_FS is not set | 609 | # CONFIG_QNX4FS_FS is not set |
| 528 | CONFIG_ROMFS_FS=y | 610 | CONFIG_ROMFS_FS=y |
| 611 | # CONFIG_ROMFS_BACKED_BY_BLOCK is not set | ||
| 612 | CONFIG_ROMFS_BACKED_BY_MTD=y | ||
| 613 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 614 | CONFIG_ROMFS_ON_MTD=y | ||
| 529 | # CONFIG_SYSV_FS is not set | 615 | # CONFIG_SYSV_FS is not set |
| 530 | # CONFIG_UFS_FS is not set | 616 | # CONFIG_UFS_FS is not set |
| 617 | # CONFIG_NILFS2_FS is not set | ||
| 531 | # CONFIG_NETWORK_FILESYSTEMS is not set | 618 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 532 | 619 | ||
| 533 | # | 620 | # |
| @@ -551,10 +638,14 @@ CONFIG_FRAME_WARN=1024 | |||
| 551 | # CONFIG_HEADERS_CHECK is not set | 638 | # CONFIG_HEADERS_CHECK is not set |
| 552 | # CONFIG_DEBUG_KERNEL is not set | 639 | # CONFIG_DEBUG_KERNEL is not set |
| 553 | # CONFIG_DEBUG_BUGVERBOSE is not set | 640 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 641 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 642 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 643 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 554 | # CONFIG_SAMPLES is not set | 644 | # CONFIG_SAMPLES is not set |
| 555 | CONFIG_FULLDEBUG=y | 645 | CONFIG_FULLDEBUG=y |
| 556 | # CONFIG_HIGHPROFILE is not set | 646 | # CONFIG_HIGHPROFILE is not set |
| 557 | # CONFIG_BOOTPARAM is not set | 647 | CONFIG_BOOTPARAM=y |
| 648 | CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0" | ||
| 558 | # CONFIG_NO_KERNEL_MSG is not set | 649 | # CONFIG_NO_KERNEL_MSG is not set |
| 559 | # CONFIG_BDM_DISABLE is not set | 650 | # CONFIG_BDM_DISABLE is not set |
| 560 | 651 | ||
| @@ -563,18 +654,22 @@ CONFIG_FULLDEBUG=y | |||
| 563 | # | 654 | # |
| 564 | # CONFIG_KEYS is not set | 655 | # CONFIG_KEYS is not set |
| 565 | # CONFIG_SECURITY is not set | 656 | # CONFIG_SECURITY is not set |
| 657 | # CONFIG_SECURITYFS is not set | ||
| 566 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 658 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 567 | # CONFIG_CRYPTO is not set | 659 | # CONFIG_CRYPTO is not set |
| 660 | # CONFIG_BINARY_PRINTF is not set | ||
| 568 | 661 | ||
| 569 | # | 662 | # |
| 570 | # Library routines | 663 | # Library routines |
| 571 | # | 664 | # |
| 572 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 665 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 573 | # CONFIG_CRC_CCITT is not set | 666 | # CONFIG_CRC_CCITT is not set |
| 574 | # CONFIG_CRC16 is not set | 667 | # CONFIG_CRC16 is not set |
| 668 | # CONFIG_CRC_T10DIF is not set | ||
| 575 | # CONFIG_CRC_ITU_T is not set | 669 | # CONFIG_CRC_ITU_T is not set |
| 576 | # CONFIG_CRC32 is not set | 670 | # CONFIG_CRC32 is not set |
| 577 | # CONFIG_CRC7 is not set | 671 | # CONFIG_CRC7 is not set |
| 578 | # CONFIG_LIBCRC32C is not set | 672 | # CONFIG_LIBCRC32C is not set |
| 579 | CONFIG_HAS_IOMEM=y | 673 | CONFIG_HAS_IOMEM=y |
| 580 | CONFIG_HAS_DMA=y | 674 | CONFIG_HAS_DMA=y |
| 675 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68knommu/configs/m5407c3_defconfig b/arch/m68knommu/configs/m5407c3_defconfig index 1118936d20e..97b6cde2fc1 100644 --- a/arch/m68knommu/configs/m5407c3_defconfig +++ b/arch/m68knommu/configs/m5407c3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc1 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Wed May 7 10:25:16 2008 | 4 | # Thu Apr 23 09:21:40 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | # CONFIG_MMU is not set | 7 | # CONFIG_MMU is not set |
| @@ -16,9 +16,10 @@ CONFIG_GENERIC_HWEIGHT=y | |||
| 16 | CONFIG_GENERIC_HARDIRQS=y | 16 | CONFIG_GENERIC_HARDIRQS=y |
| 17 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 17 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 18 | CONFIG_GENERIC_TIME=y | 18 | CONFIG_GENERIC_TIME=y |
| 19 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 19 | CONFIG_TIME_LOW_RES=y | 20 | CONFIG_TIME_LOW_RES=y |
| 21 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
| 20 | CONFIG_NO_IOPORT=y | 22 | CONFIG_NO_IOPORT=y |
| 21 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 23 | 24 | ||
| 24 | # | 25 | # |
| @@ -34,10 +35,19 @@ CONFIG_LOCALVERSION_AUTO=y | |||
| 34 | # CONFIG_BSD_PROCESS_ACCT is not set | 35 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 35 | # CONFIG_TASKSTATS is not set | 36 | # CONFIG_TASKSTATS is not set |
| 36 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
| 38 | |||
| 39 | # | ||
| 40 | # RCU Subsystem | ||
| 41 | # | ||
| 42 | CONFIG_CLASSIC_RCU=y | ||
| 43 | # CONFIG_TREE_RCU is not set | ||
| 44 | # CONFIG_PREEMPT_RCU is not set | ||
| 45 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 46 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 37 | # CONFIG_IKCONFIG is not set | 47 | # CONFIG_IKCONFIG is not set |
| 38 | CONFIG_LOG_BUF_SHIFT=14 | 48 | CONFIG_LOG_BUF_SHIFT=14 |
| 39 | # CONFIG_CGROUPS is not set | ||
| 40 | # CONFIG_GROUP_SCHED is not set | 49 | # CONFIG_GROUP_SCHED is not set |
| 50 | # CONFIG_CGROUPS is not set | ||
| 41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 51 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 42 | # CONFIG_RELAY is not set | 52 | # CONFIG_RELAY is not set |
| 43 | # CONFIG_NAMESPACES is not set | 53 | # CONFIG_NAMESPACES is not set |
| @@ -45,44 +55,43 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 55 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 46 | CONFIG_SYSCTL=y | 56 | CONFIG_SYSCTL=y |
| 47 | CONFIG_EMBEDDED=y | 57 | CONFIG_EMBEDDED=y |
| 48 | # CONFIG_UID16 is not set | 58 | CONFIG_UID16=y |
| 49 | # CONFIG_SYSCTL_SYSCALL is not set | 59 | CONFIG_SYSCTL_SYSCALL=y |
| 50 | # CONFIG_KALLSYMS is not set | 60 | # CONFIG_KALLSYMS is not set |
| 61 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 51 | # CONFIG_HOTPLUG is not set | 62 | # CONFIG_HOTPLUG is not set |
| 52 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
| 53 | CONFIG_BUG=y | 64 | CONFIG_BUG=y |
| 54 | CONFIG_ELF_CORE=y | 65 | CONFIG_ELF_CORE=y |
| 55 | # CONFIG_COMPAT_BRK is not set | ||
| 56 | CONFIG_BASE_FULL=y | 66 | CONFIG_BASE_FULL=y |
| 57 | # CONFIG_FUTEX is not set | 67 | # CONFIG_FUTEX is not set |
| 58 | # CONFIG_EPOLL is not set | 68 | # CONFIG_EPOLL is not set |
| 59 | # CONFIG_SIGNALFD is not set | 69 | # CONFIG_SIGNALFD is not set |
| 60 | # CONFIG_TIMERFD is not set | 70 | # CONFIG_TIMERFD is not set |
| 61 | # CONFIG_EVENTFD is not set | 71 | # CONFIG_EVENTFD is not set |
| 72 | # CONFIG_AIO is not set | ||
| 62 | # CONFIG_VM_EVENT_COUNTERS is not set | 73 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 63 | CONFIG_SLAB=y | 74 | CONFIG_SLUB_DEBUG=y |
| 64 | # CONFIG_SLUB is not set | 75 | CONFIG_COMPAT_BRK=y |
| 76 | # CONFIG_SLAB is not set | ||
| 77 | CONFIG_SLUB=y | ||
| 65 | # CONFIG_SLOB is not set | 78 | # CONFIG_SLOB is not set |
| 66 | # CONFIG_PROFILING is not set | 79 | # CONFIG_PROFILING is not set |
| 67 | # CONFIG_MARKERS is not set | 80 | # CONFIG_MARKERS is not set |
| 68 | # CONFIG_HAVE_OPROFILE is not set | 81 | # CONFIG_SLOW_WORK is not set |
| 69 | # CONFIG_HAVE_KPROBES is not set | 82 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 70 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 71 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 72 | CONFIG_SLABINFO=y | 83 | CONFIG_SLABINFO=y |
| 73 | CONFIG_TINY_SHMEM=y | ||
| 74 | CONFIG_BASE_SMALL=0 | 84 | CONFIG_BASE_SMALL=0 |
| 75 | CONFIG_MODULES=y | 85 | CONFIG_MODULES=y |
| 86 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 76 | CONFIG_MODULE_UNLOAD=y | 87 | CONFIG_MODULE_UNLOAD=y |
| 77 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 88 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 78 | # CONFIG_MODVERSIONS is not set | 89 | # CONFIG_MODVERSIONS is not set |
| 79 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 90 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 80 | # CONFIG_KMOD is not set | ||
| 81 | CONFIG_BLOCK=y | 91 | CONFIG_BLOCK=y |
| 82 | # CONFIG_LBD is not set | 92 | # CONFIG_LBD is not set |
| 83 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 84 | # CONFIG_LSF is not set | ||
| 85 | # CONFIG_BLK_DEV_BSG is not set | 93 | # CONFIG_BLK_DEV_BSG is not set |
| 94 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 86 | 95 | ||
| 87 | # | 96 | # |
| 88 | # IO Schedulers | 97 | # IO Schedulers |
| @@ -96,7 +105,7 @@ CONFIG_IOSCHED_NOOP=y | |||
| 96 | # CONFIG_DEFAULT_CFQ is not set | 105 | # CONFIG_DEFAULT_CFQ is not set |
| 97 | CONFIG_DEFAULT_NOOP=y | 106 | CONFIG_DEFAULT_NOOP=y |
| 98 | CONFIG_DEFAULT_IOSCHED="noop" | 107 | CONFIG_DEFAULT_IOSCHED="noop" |
| 99 | CONFIG_CLASSIC_RCU=y | 108 | # CONFIG_FREEZER is not set |
| 100 | 109 | ||
| 101 | # | 110 | # |
| 102 | # Processor type and features | 111 | # Processor type and features |
| @@ -149,45 +158,36 @@ CONFIG_RAMAUTOBIT=y | |||
| 149 | # CONFIG_ROM is not set | 158 | # CONFIG_ROM is not set |
| 150 | CONFIG_RAMKERNEL=y | 159 | CONFIG_RAMKERNEL=y |
| 151 | # CONFIG_ROMKERNEL is not set | 160 | # CONFIG_ROMKERNEL is not set |
| 161 | CONFIG_PREEMPT_NONE=y | ||
| 162 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 163 | # CONFIG_PREEMPT is not set | ||
| 152 | CONFIG_SELECT_MEMORY_MODEL=y | 164 | CONFIG_SELECT_MEMORY_MODEL=y |
| 153 | CONFIG_FLATMEM_MANUAL=y | 165 | CONFIG_FLATMEM_MANUAL=y |
| 154 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 166 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 155 | # CONFIG_SPARSEMEM_MANUAL is not set | 167 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 156 | CONFIG_FLATMEM=y | 168 | CONFIG_FLATMEM=y |
| 157 | CONFIG_FLAT_NODE_MEM_MAP=y | 169 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 158 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 159 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 160 | CONFIG_PAGEFLAGS_EXTENDED=y | 170 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 161 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 171 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 162 | # CONFIG_RESOURCES_64BIT is not set | 172 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 163 | CONFIG_ZONE_DMA_FLAG=1 | 173 | CONFIG_ZONE_DMA_FLAG=1 |
| 164 | CONFIG_VIRT_TO_BUS=y | 174 | CONFIG_VIRT_TO_BUS=y |
| 175 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 165 | CONFIG_ISA_DMA_API=y | 176 | CONFIG_ISA_DMA_API=y |
| 166 | 177 | ||
| 167 | # | 178 | # |
| 168 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
| 169 | # | ||
| 170 | # CONFIG_PCI is not set | ||
| 171 | # CONFIG_COMEMPCI is not set | ||
| 172 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 173 | |||
| 174 | # | ||
| 175 | # Executable file formats | 179 | # Executable file formats |
| 176 | # | 180 | # |
| 177 | CONFIG_BINFMT_FLAT=y | 181 | CONFIG_BINFMT_FLAT=y |
| 178 | # CONFIG_BINFMT_ZFLAT is not set | 182 | # CONFIG_BINFMT_ZFLAT is not set |
| 179 | # CONFIG_BINFMT_SHARED_FLAT is not set | 183 | # CONFIG_BINFMT_SHARED_FLAT is not set |
| 180 | # CONFIG_BINFMT_AOUT is not set | 184 | # CONFIG_HAVE_AOUT is not set |
| 181 | # CONFIG_BINFMT_MISC is not set | 185 | # CONFIG_BINFMT_MISC is not set |
| 182 | 186 | ||
| 183 | # | 187 | # |
| 184 | # Power management options | 188 | # Power management options |
| 185 | # | 189 | # |
| 186 | # CONFIG_PM is not set | 190 | # CONFIG_PM is not set |
| 187 | |||
| 188 | # | ||
| 189 | # Networking | ||
| 190 | # | ||
| 191 | CONFIG_NET=y | 191 | CONFIG_NET=y |
| 192 | 192 | ||
| 193 | # | 193 | # |
| @@ -228,6 +228,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 228 | # CONFIG_TIPC is not set | 228 | # CONFIG_TIPC is not set |
| 229 | # CONFIG_ATM is not set | 229 | # CONFIG_ATM is not set |
| 230 | # CONFIG_BRIDGE is not set | 230 | # CONFIG_BRIDGE is not set |
| 231 | # CONFIG_NET_DSA is not set | ||
| 231 | # CONFIG_VLAN_8021Q is not set | 232 | # CONFIG_VLAN_8021Q is not set |
| 232 | # CONFIG_DECNET is not set | 233 | # CONFIG_DECNET is not set |
| 233 | # CONFIG_LLC2 is not set | 234 | # CONFIG_LLC2 is not set |
| @@ -237,7 +238,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 237 | # CONFIG_LAPB is not set | 238 | # CONFIG_LAPB is not set |
| 238 | # CONFIG_ECONET is not set | 239 | # CONFIG_ECONET is not set |
| 239 | # CONFIG_WAN_ROUTER is not set | 240 | # CONFIG_WAN_ROUTER is not set |
| 241 | # CONFIG_PHONET is not set | ||
| 240 | # CONFIG_NET_SCHED is not set | 242 | # CONFIG_NET_SCHED is not set |
| 243 | # CONFIG_DCB is not set | ||
| 241 | 244 | ||
| 242 | # | 245 | # |
| 243 | # Network testing | 246 | # Network testing |
| @@ -248,14 +251,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 248 | # CONFIG_IRDA is not set | 251 | # CONFIG_IRDA is not set |
| 249 | # CONFIG_BT is not set | 252 | # CONFIG_BT is not set |
| 250 | # CONFIG_AF_RXRPC is not set | 253 | # CONFIG_AF_RXRPC is not set |
| 251 | 254 | # CONFIG_WIRELESS is not set | |
| 252 | # | 255 | # CONFIG_WIMAX is not set |
| 253 | # Wireless | ||
| 254 | # | ||
| 255 | # CONFIG_CFG80211 is not set | ||
| 256 | # CONFIG_WIRELESS_EXT is not set | ||
| 257 | # CONFIG_MAC80211 is not set | ||
| 258 | # CONFIG_IEEE80211 is not set | ||
| 259 | # CONFIG_RFKILL is not set | 256 | # CONFIG_RFKILL is not set |
| 260 | # CONFIG_NET_9P is not set | 257 | # CONFIG_NET_9P is not set |
| 261 | 258 | ||
| @@ -274,6 +271,7 @@ CONFIG_MTD=y | |||
| 274 | # CONFIG_MTD_DEBUG is not set | 271 | # CONFIG_MTD_DEBUG is not set |
| 275 | # CONFIG_MTD_CONCAT is not set | 272 | # CONFIG_MTD_CONCAT is not set |
| 276 | CONFIG_MTD_PARTITIONS=y | 273 | CONFIG_MTD_PARTITIONS=y |
| 274 | # CONFIG_MTD_TESTS is not set | ||
| 277 | # CONFIG_MTD_REDBOOT_PARTS is not set | 275 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 278 | # CONFIG_MTD_CMDLINE_PARTS is not set | 276 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 279 | # CONFIG_MTD_AR7_PARTS is not set | 277 | # CONFIG_MTD_AR7_PARTS is not set |
| @@ -335,6 +333,11 @@ CONFIG_MTD_UCLINUX=y | |||
| 335 | # CONFIG_MTD_ONENAND is not set | 333 | # CONFIG_MTD_ONENAND is not set |
| 336 | 334 | ||
| 337 | # | 335 | # |
| 336 | # LPDDR flash memory drivers | ||
| 337 | # | ||
| 338 | # CONFIG_MTD_LPDDR is not set | ||
| 339 | |||
| 340 | # | ||
| 338 | # UBI - Unsorted block images | 341 | # UBI - Unsorted block images |
| 339 | # | 342 | # |
| 340 | # CONFIG_MTD_UBI is not set | 343 | # CONFIG_MTD_UBI is not set |
| @@ -349,6 +352,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 349 | # CONFIG_BLK_DEV_XIP is not set | 352 | # CONFIG_BLK_DEV_XIP is not set |
| 350 | # CONFIG_CDROM_PKTCDVD is not set | 353 | # CONFIG_CDROM_PKTCDVD is not set |
| 351 | # CONFIG_ATA_OVER_ETH is not set | 354 | # CONFIG_ATA_OVER_ETH is not set |
| 355 | # CONFIG_BLK_DEV_HD is not set | ||
| 352 | # CONFIG_MISC_DEVICES is not set | 356 | # CONFIG_MISC_DEVICES is not set |
| 353 | CONFIG_HAVE_IDE=y | 357 | CONFIG_HAVE_IDE=y |
| 354 | # CONFIG_IDE is not set | 358 | # CONFIG_IDE is not set |
| @@ -362,7 +366,7 @@ CONFIG_HAVE_IDE=y | |||
| 362 | # CONFIG_SCSI_NETLINK is not set | 366 | # CONFIG_SCSI_NETLINK is not set |
| 363 | # CONFIG_MD is not set | 367 | # CONFIG_MD is not set |
| 364 | CONFIG_NETDEVICES=y | 368 | CONFIG_NETDEVICES=y |
| 365 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 369 | CONFIG_COMPAT_NET_DEV_OPS=y |
| 366 | # CONFIG_DUMMY is not set | 370 | # CONFIG_DUMMY is not set |
| 367 | # CONFIG_BONDING is not set | 371 | # CONFIG_BONDING is not set |
| 368 | # CONFIG_MACVLAN is not set | 372 | # CONFIG_MACVLAN is not set |
| @@ -372,10 +376,15 @@ CONFIG_NETDEVICES=y | |||
| 372 | # CONFIG_PHYLIB is not set | 376 | # CONFIG_PHYLIB is not set |
| 373 | CONFIG_NET_ETHERNET=y | 377 | CONFIG_NET_ETHERNET=y |
| 374 | # CONFIG_MII is not set | 378 | # CONFIG_MII is not set |
| 379 | # CONFIG_ETHOC is not set | ||
| 380 | # CONFIG_DNET is not set | ||
| 375 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 381 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 376 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 382 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 377 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 383 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 378 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 384 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 385 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 386 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 387 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 379 | # CONFIG_B44 is not set | 388 | # CONFIG_B44 is not set |
| 380 | # CONFIG_NETDEV_1000 is not set | 389 | # CONFIG_NETDEV_1000 is not set |
| 381 | # CONFIG_NETDEV_10000 is not set | 390 | # CONFIG_NETDEV_10000 is not set |
| @@ -385,8 +394,10 @@ CONFIG_NET_ETHERNET=y | |||
| 385 | # | 394 | # |
| 386 | # CONFIG_WLAN_PRE80211 is not set | 395 | # CONFIG_WLAN_PRE80211 is not set |
| 387 | # CONFIG_WLAN_80211 is not set | 396 | # CONFIG_WLAN_80211 is not set |
| 388 | # CONFIG_IWLWIFI is not set | 397 | |
| 389 | # CONFIG_IWLWIFI_LEDS is not set | 398 | # |
| 399 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 400 | # | ||
| 390 | # CONFIG_WAN is not set | 401 | # CONFIG_WAN is not set |
| 391 | CONFIG_PPP=y | 402 | CONFIG_PPP=y |
| 392 | # CONFIG_PPP_MULTILINK is not set | 403 | # CONFIG_PPP_MULTILINK is not set |
| @@ -409,39 +420,22 @@ CONFIG_SLHC=y | |||
| 409 | # | 420 | # |
| 410 | # Input device support | 421 | # Input device support |
| 411 | # | 422 | # |
| 412 | CONFIG_INPUT=y | 423 | # CONFIG_INPUT is not set |
| 413 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 414 | # CONFIG_INPUT_POLLDEV is not set | ||
| 415 | |||
| 416 | # | ||
| 417 | # Userland interfaces | ||
| 418 | # | ||
| 419 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 420 | # CONFIG_INPUT_JOYDEV is not set | ||
| 421 | # CONFIG_INPUT_EVDEV is not set | ||
| 422 | # CONFIG_INPUT_EVBUG is not set | ||
| 423 | |||
| 424 | # | ||
| 425 | # Input Device Drivers | ||
| 426 | # | ||
| 427 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 428 | # CONFIG_INPUT_MOUSE is not set | ||
| 429 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 430 | # CONFIG_INPUT_TABLET is not set | ||
| 431 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 432 | # CONFIG_INPUT_MISC is not set | ||
| 433 | 424 | ||
| 434 | # | 425 | # |
| 435 | # Hardware I/O ports | 426 | # Hardware I/O ports |
| 436 | # | 427 | # |
| 437 | # CONFIG_SERIO is not set | 428 | CONFIG_SERIO=y |
| 429 | CONFIG_SERIO_SERPORT=y | ||
| 430 | # CONFIG_SERIO_LIBPS2 is not set | ||
| 431 | # CONFIG_SERIO_RAW is not set | ||
| 438 | # CONFIG_GAMEPORT is not set | 432 | # CONFIG_GAMEPORT is not set |
| 439 | 433 | ||
| 440 | # | 434 | # |
| 441 | # Character devices | 435 | # Character devices |
| 442 | # | 436 | # |
| 443 | # CONFIG_VT is not set | 437 | # CONFIG_VT is not set |
| 444 | # CONFIG_DEVKMEM is not set | 438 | CONFIG_DEVKMEM=y |
| 445 | # CONFIG_SERIAL_NONSTANDARD is not set | 439 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 446 | 440 | ||
| 447 | # | 441 | # |
| @@ -454,7 +448,6 @@ CONFIG_INPUT=y | |||
| 454 | # | 448 | # |
| 455 | CONFIG_SERIAL_CORE=y | 449 | CONFIG_SERIAL_CORE=y |
| 456 | CONFIG_SERIAL_CORE_CONSOLE=y | 450 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 457 | # CONFIG_SERIAL_COLDFIRE is not set | ||
| 458 | CONFIG_SERIAL_MCF=y | 451 | CONFIG_SERIAL_MCF=y |
| 459 | CONFIG_SERIAL_MCF_BAUDRATE=19200 | 452 | CONFIG_SERIAL_MCF_BAUDRATE=19200 |
| 460 | CONFIG_SERIAL_MCF_CONSOLE=y | 453 | CONFIG_SERIAL_MCF_CONSOLE=y |
| @@ -473,19 +466,23 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 473 | # CONFIG_POWER_SUPPLY is not set | 466 | # CONFIG_POWER_SUPPLY is not set |
| 474 | # CONFIG_HWMON is not set | 467 | # CONFIG_HWMON is not set |
| 475 | # CONFIG_THERMAL is not set | 468 | # CONFIG_THERMAL is not set |
| 469 | # CONFIG_THERMAL_HWMON is not set | ||
| 476 | # CONFIG_WATCHDOG is not set | 470 | # CONFIG_WATCHDOG is not set |
| 471 | CONFIG_SSB_POSSIBLE=y | ||
| 477 | 472 | ||
| 478 | # | 473 | # |
| 479 | # Sonics Silicon Backplane | 474 | # Sonics Silicon Backplane |
| 480 | # | 475 | # |
| 481 | CONFIG_SSB_POSSIBLE=y | ||
| 482 | # CONFIG_SSB is not set | 476 | # CONFIG_SSB is not set |
| 483 | 477 | ||
| 484 | # | 478 | # |
| 485 | # Multifunction device drivers | 479 | # Multifunction device drivers |
| 486 | # | 480 | # |
| 481 | # CONFIG_MFD_CORE is not set | ||
| 487 | # CONFIG_MFD_SM501 is not set | 482 | # CONFIG_MFD_SM501 is not set |
| 488 | # CONFIG_HTC_PASIC3 is not set | 483 | # CONFIG_HTC_PASIC3 is not set |
| 484 | # CONFIG_MFD_TMIO is not set | ||
| 485 | # CONFIG_REGULATOR is not set | ||
| 489 | 486 | ||
| 490 | # | 487 | # |
| 491 | # Multimedia devices | 488 | # Multimedia devices |
| @@ -496,6 +493,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 496 | # | 493 | # |
| 497 | # CONFIG_VIDEO_DEV is not set | 494 | # CONFIG_VIDEO_DEV is not set |
| 498 | # CONFIG_DVB_CORE is not set | 495 | # CONFIG_DVB_CORE is not set |
| 496 | # CONFIG_VIDEO_MEDIA is not set | ||
| 499 | 497 | ||
| 500 | # | 498 | # |
| 501 | # Multimedia drivers | 499 | # Multimedia drivers |
| @@ -514,19 +512,17 @@ CONFIG_DAB=y | |||
| 514 | # Display device support | 512 | # Display device support |
| 515 | # | 513 | # |
| 516 | # CONFIG_DISPLAY_SUPPORT is not set | 514 | # CONFIG_DISPLAY_SUPPORT is not set |
| 517 | |||
| 518 | # | ||
| 519 | # Sound | ||
| 520 | # | ||
| 521 | # CONFIG_SOUND is not set | 515 | # CONFIG_SOUND is not set |
| 522 | # CONFIG_HID_SUPPORT is not set | ||
| 523 | # CONFIG_USB_SUPPORT is not set | 516 | # CONFIG_USB_SUPPORT is not set |
| 524 | # CONFIG_MMC is not set | 517 | # CONFIG_MMC is not set |
| 525 | # CONFIG_MEMSTICK is not set | 518 | # CONFIG_MEMSTICK is not set |
| 526 | # CONFIG_NEW_LEDS is not set | 519 | # CONFIG_NEW_LEDS is not set |
| 527 | # CONFIG_ACCESSIBILITY is not set | 520 | # CONFIG_ACCESSIBILITY is not set |
| 528 | # CONFIG_RTC_CLASS is not set | 521 | # CONFIG_RTC_CLASS is not set |
| 522 | # CONFIG_DMADEVICES is not set | ||
| 523 | # CONFIG_AUXDISPLAY is not set | ||
| 529 | # CONFIG_UIO is not set | 524 | # CONFIG_UIO is not set |
| 525 | # CONFIG_STAGING is not set | ||
| 530 | 526 | ||
| 531 | # | 527 | # |
| 532 | # File systems | 528 | # File systems |
| @@ -534,12 +530,14 @@ CONFIG_DAB=y | |||
| 534 | CONFIG_EXT2_FS=y | 530 | CONFIG_EXT2_FS=y |
| 535 | # CONFIG_EXT2_FS_XATTR is not set | 531 | # CONFIG_EXT2_FS_XATTR is not set |
| 536 | # CONFIG_EXT3_FS is not set | 532 | # CONFIG_EXT3_FS is not set |
| 537 | # CONFIG_EXT4DEV_FS is not set | 533 | # CONFIG_EXT4_FS is not set |
| 538 | # CONFIG_REISERFS_FS is not set | 534 | # CONFIG_REISERFS_FS is not set |
| 539 | # CONFIG_JFS_FS is not set | 535 | # CONFIG_JFS_FS is not set |
| 540 | # CONFIG_FS_POSIX_ACL is not set | 536 | # CONFIG_FS_POSIX_ACL is not set |
| 537 | # CONFIG_FILE_LOCKING is not set | ||
| 541 | # CONFIG_XFS_FS is not set | 538 | # CONFIG_XFS_FS is not set |
| 542 | # CONFIG_OCFS2_FS is not set | 539 | # CONFIG_OCFS2_FS is not set |
| 540 | # CONFIG_BTRFS_FS is not set | ||
| 543 | # CONFIG_DNOTIFY is not set | 541 | # CONFIG_DNOTIFY is not set |
| 544 | # CONFIG_INOTIFY is not set | 542 | # CONFIG_INOTIFY is not set |
| 545 | # CONFIG_QUOTA is not set | 543 | # CONFIG_QUOTA is not set |
| @@ -548,6 +546,11 @@ CONFIG_EXT2_FS=y | |||
| 548 | # CONFIG_FUSE_FS is not set | 546 | # CONFIG_FUSE_FS is not set |
| 549 | 547 | ||
| 550 | # | 548 | # |
| 549 | # Caches | ||
| 550 | # | ||
| 551 | # CONFIG_FSCACHE is not set | ||
| 552 | |||
| 553 | # | ||
| 551 | # CD-ROM/DVD Filesystems | 554 | # CD-ROM/DVD Filesystems |
| 552 | # | 555 | # |
| 553 | # CONFIG_ISO9660_FS is not set | 556 | # CONFIG_ISO9660_FS is not set |
| @@ -569,10 +572,7 @@ CONFIG_SYSFS=y | |||
| 569 | # CONFIG_TMPFS is not set | 572 | # CONFIG_TMPFS is not set |
| 570 | # CONFIG_HUGETLB_PAGE is not set | 573 | # CONFIG_HUGETLB_PAGE is not set |
| 571 | # CONFIG_CONFIGFS_FS is not set | 574 | # CONFIG_CONFIGFS_FS is not set |
| 572 | 575 | CONFIG_MISC_FILESYSTEMS=y | |
| 573 | # | ||
| 574 | # Miscellaneous filesystems | ||
| 575 | # | ||
| 576 | # CONFIG_ADFS_FS is not set | 576 | # CONFIG_ADFS_FS is not set |
| 577 | # CONFIG_AFFS_FS is not set | 577 | # CONFIG_AFFS_FS is not set |
| 578 | # CONFIG_HFS_FS is not set | 578 | # CONFIG_HFS_FS is not set |
| @@ -582,13 +582,20 @@ CONFIG_SYSFS=y | |||
| 582 | # CONFIG_EFS_FS is not set | 582 | # CONFIG_EFS_FS is not set |
| 583 | # CONFIG_JFFS2_FS is not set | 583 | # CONFIG_JFFS2_FS is not set |
| 584 | # CONFIG_CRAMFS is not set | 584 | # CONFIG_CRAMFS is not set |
| 585 | # CONFIG_SQUASHFS is not set | ||
| 585 | # CONFIG_VXFS_FS is not set | 586 | # CONFIG_VXFS_FS is not set |
| 586 | # CONFIG_MINIX_FS is not set | 587 | # CONFIG_MINIX_FS is not set |
| 588 | # CONFIG_OMFS_FS is not set | ||
| 587 | # CONFIG_HPFS_FS is not set | 589 | # CONFIG_HPFS_FS is not set |
| 588 | # CONFIG_QNX4FS_FS is not set | 590 | # CONFIG_QNX4FS_FS is not set |
| 589 | CONFIG_ROMFS_FS=y | 591 | CONFIG_ROMFS_FS=y |
| 592 | # CONFIG_ROMFS_BACKED_BY_BLOCK is not set | ||
| 593 | CONFIG_ROMFS_BACKED_BY_MTD=y | ||
| 594 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 595 | CONFIG_ROMFS_ON_MTD=y | ||
| 590 | # CONFIG_SYSV_FS is not set | 596 | # CONFIG_SYSV_FS is not set |
| 591 | # CONFIG_UFS_FS is not set | 597 | # CONFIG_UFS_FS is not set |
| 598 | # CONFIG_NILFS2_FS is not set | ||
| 592 | # CONFIG_NETWORK_FILESYSTEMS is not set | 599 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 593 | 600 | ||
| 594 | # | 601 | # |
| @@ -611,11 +618,17 @@ CONFIG_FRAME_WARN=1024 | |||
| 611 | # CONFIG_DEBUG_FS is not set | 618 | # CONFIG_DEBUG_FS is not set |
| 612 | # CONFIG_HEADERS_CHECK is not set | 619 | # CONFIG_HEADERS_CHECK is not set |
| 613 | # CONFIG_DEBUG_KERNEL is not set | 620 | # CONFIG_DEBUG_KERNEL is not set |
| 621 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 622 | # CONFIG_SLUB_STATS is not set | ||
| 614 | # CONFIG_DEBUG_BUGVERBOSE is not set | 623 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 624 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 625 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 626 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 615 | # CONFIG_SAMPLES is not set | 627 | # CONFIG_SAMPLES is not set |
| 616 | # CONFIG_FULLDEBUG is not set | 628 | # CONFIG_FULLDEBUG is not set |
| 617 | # CONFIG_HIGHPROFILE is not set | 629 | # CONFIG_HIGHPROFILE is not set |
| 618 | # CONFIG_BOOTPARAM is not set | 630 | CONFIG_BOOTPARAM=y |
| 631 | CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0" | ||
| 619 | # CONFIG_NO_KERNEL_MSG is not set | 632 | # CONFIG_NO_KERNEL_MSG is not set |
| 620 | # CONFIG_BDM_DISABLE is not set | 633 | # CONFIG_BDM_DISABLE is not set |
| 621 | 634 | ||
| @@ -624,18 +637,22 @@ CONFIG_FRAME_WARN=1024 | |||
| 624 | # | 637 | # |
| 625 | # CONFIG_KEYS is not set | 638 | # CONFIG_KEYS is not set |
| 626 | # CONFIG_SECURITY is not set | 639 | # CONFIG_SECURITY is not set |
| 640 | # CONFIG_SECURITYFS is not set | ||
| 627 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 641 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 628 | # CONFIG_CRYPTO is not set | 642 | # CONFIG_CRYPTO is not set |
| 643 | # CONFIG_BINARY_PRINTF is not set | ||
| 629 | 644 | ||
| 630 | # | 645 | # |
| 631 | # Library routines | 646 | # Library routines |
| 632 | # | 647 | # |
| 633 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 648 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 634 | # CONFIG_CRC_CCITT is not set | 649 | # CONFIG_CRC_CCITT is not set |
| 635 | # CONFIG_CRC16 is not set | 650 | # CONFIG_CRC16 is not set |
| 651 | # CONFIG_CRC_T10DIF is not set | ||
| 636 | # CONFIG_CRC_ITU_T is not set | 652 | # CONFIG_CRC_ITU_T is not set |
| 637 | # CONFIG_CRC32 is not set | 653 | # CONFIG_CRC32 is not set |
| 638 | # CONFIG_CRC7 is not set | 654 | # CONFIG_CRC7 is not set |
| 639 | # CONFIG_LIBCRC32C is not set | 655 | # CONFIG_LIBCRC32C is not set |
| 640 | CONFIG_HAS_IOMEM=y | 656 | CONFIG_HAS_IOMEM=y |
| 641 | CONFIG_HAS_DMA=y | 657 | CONFIG_HAS_DMA=y |
| 658 | CONFIG_NLATTR=y | ||
diff --git a/arch/m68knommu/kernel/asm-offsets.c b/arch/m68knommu/kernel/asm-offsets.c index c785d07c02c..f500dd6935d 100644 --- a/arch/m68knommu/kernel/asm-offsets.c +++ b/arch/m68knommu/kernel/asm-offsets.c | |||
| @@ -30,9 +30,6 @@ int main(void) | |||
| 30 | DEFINE(TASK_MM, offsetof(struct task_struct, mm)); | 30 | DEFINE(TASK_MM, offsetof(struct task_struct, mm)); |
| 31 | DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm)); | 31 | DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm)); |
| 32 | 32 | ||
| 33 | /* offsets into the kernel_stat struct */ | ||
| 34 | DEFINE(STAT_IRQ, offsetof(struct kernel_stat, irqs)); | ||
| 35 | |||
| 36 | /* offsets into the irq_cpustat_t struct */ | 33 | /* offsets into the irq_cpustat_t struct */ |
| 37 | DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending)); | 34 | DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending)); |
| 38 | 35 | ||
| @@ -69,9 +66,6 @@ int main(void) | |||
| 69 | DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4); | 66 | DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4); |
| 70 | #endif | 67 | #endif |
| 71 | 68 | ||
| 72 | /* offsets into the kernel_stat struct */ | ||
| 73 | DEFINE(STAT_IRQ, offsetof(struct kernel_stat, irqs)); | ||
| 74 | |||
| 75 | /* signal defines */ | 69 | /* signal defines */ |
| 76 | DEFINE(SIGSEGV, SIGSEGV); | 70 | DEFINE(SIGSEGV, SIGSEGV); |
| 77 | DEFINE(SEGV_MAPERR, SEGV_MAPERR); | 71 | DEFINE(SEGV_MAPERR, SEGV_MAPERR); |
diff --git a/arch/m68knommu/kernel/dma.c b/arch/m68knommu/kernel/dma.c index 93612580663..aaf38bbbb6c 100644 --- a/arch/m68knommu/kernel/dma.c +++ b/arch/m68knommu/kernel/dma.c | |||
| @@ -7,10 +7,9 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 10 | #include <linux/string.h> | ||
| 11 | #include <linux/device.h> | 10 | #include <linux/device.h> |
| 12 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
| 13 | #include <asm/io.h> | 12 | #include <asm/cacheflush.h> |
| 14 | 13 | ||
| 15 | void *dma_alloc_coherent(struct device *dev, size_t size, | 14 | void *dma_alloc_coherent(struct device *dev, size_t size, |
| 16 | dma_addr_t *dma_handle, gfp_t gfp) | 15 | dma_addr_t *dma_handle, gfp_t gfp) |
| @@ -36,7 +35,39 @@ void dma_free_coherent(struct device *dev, size_t size, | |||
| 36 | free_pages((unsigned long)vaddr, get_order(size)); | 35 | free_pages((unsigned long)vaddr, get_order(size)); |
| 37 | } | 36 | } |
| 38 | 37 | ||
| 39 | void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, enum dma_data_direction dir) | 38 | void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, |
| 39 | size_t size, enum dma_data_direction dir) | ||
| 40 | { | 40 | { |
| 41 | switch (dir) { | ||
| 42 | case DMA_TO_DEVICE: | ||
| 43 | flush_dcache_range(handle, size); | ||
| 44 | break; | ||
| 45 | case DMA_FROM_DEVICE: | ||
| 46 | /* Should be clear already */ | ||
| 47 | break; | ||
| 48 | default: | ||
| 49 | if (printk_ratelimit()) | ||
| 50 | printk("dma_sync_single_for_device: unsupported dir %u\n", dir); | ||
| 51 | break; | ||
| 52 | } | ||
| 53 | } | ||
| 54 | |||
| 55 | EXPORT_SYMBOL(dma_sync_single_for_device); | ||
| 56 | dma_addr_t dma_map_single(struct device *dev, void *addr, size_t size, | ||
| 57 | enum dma_data_direction dir) | ||
| 58 | { | ||
| 59 | dma_addr_t handle = virt_to_phys(addr); | ||
| 60 | flush_dcache_range(handle, size); | ||
| 61 | return handle; | ||
| 41 | } | 62 | } |
| 63 | EXPORT_SYMBOL(dma_map_single); | ||
| 42 | 64 | ||
| 65 | dma_addr_t dma_map_page(struct device *dev, struct page *page, | ||
| 66 | unsigned long offset, size_t size, | ||
| 67 | enum dma_data_direction dir) | ||
| 68 | { | ||
| 69 | dma_addr_t handle = page_to_phys(page) + offset; | ||
| 70 | dma_sync_single_for_device(dev, handle, size, dir); | ||
| 71 | return handle; | ||
| 72 | } | ||
| 73 | EXPORT_SYMBOL(dma_map_page); | ||
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index 1017e76f371..c0b8782832f 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
| @@ -347,6 +347,8 @@ ENTRY(sys_call_table) | |||
| 347 | .long sys_dup3 | 347 | .long sys_dup3 |
| 348 | .long sys_pipe2 | 348 | .long sys_pipe2 |
| 349 | .long sys_inotify_init1 | 349 | .long sys_inotify_init1 |
| 350 | .long sys_preadv | ||
| 351 | .long sys_pwritev /* 330 */ | ||
| 350 | 352 | ||
| 351 | .rept NR_syscalls-(.-sys_call_table)/4 | 353 | .rept NR_syscalls-(.-sys_call_table)/4 |
| 352 | .long sys_ni_syscall | 354 | .long sys_ni_syscall |
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 69ba9b10767..b7fe505e358 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S | |||
| @@ -147,6 +147,8 @@ SECTIONS { | |||
| 147 | . = ALIGN(4); | 147 | . = ALIGN(4); |
| 148 | _sdata = . ; | 148 | _sdata = . ; |
| 149 | DATA_DATA | 149 | DATA_DATA |
| 150 | . = ALIGN(32); | ||
| 151 | *(.data.cacheline_aligned) | ||
| 150 | . = ALIGN(8192) ; | 152 | . = ALIGN(8192) ; |
| 151 | *(.data.init_task) | 153 | *(.data.init_task) |
| 152 | _edata = . ; | 154 | _edata = . ; |
diff --git a/arch/m68knommu/platform/527x/config.c b/arch/m68knommu/platform/527x/config.c index 49343fb157b..428b15922ef 100644 --- a/arch/m68knommu/platform/527x/config.c +++ b/arch/m68knommu/platform/527x/config.c | |||
| @@ -189,10 +189,15 @@ static void __init m527x_fec_init(void) | |||
| 189 | m527x_fec_irq_init(0); | 189 | m527x_fec_irq_init(0); |
| 190 | 190 | ||
| 191 | /* Set multi-function pins to ethernet mode for fec0 */ | 191 | /* Set multi-function pins to ethernet mode for fec0 */ |
| 192 | #if defined(CONFIG_M5271) | ||
| 193 | v = readb(MCF_IPSBAR + 0x100047); | ||
| 194 | writeb(v | 0xf0, MCF_IPSBAR + 0x100047); | ||
| 195 | #else | ||
| 192 | par = readw(MCF_IPSBAR + 0x100082); | 196 | par = readw(MCF_IPSBAR + 0x100082); |
| 193 | writew(par | 0xf00, MCF_IPSBAR + 0x100082); | 197 | writew(par | 0xf00, MCF_IPSBAR + 0x100082); |
| 194 | v = readb(MCF_IPSBAR + 0x100078); | 198 | v = readb(MCF_IPSBAR + 0x100078); |
| 195 | writeb(v | 0xc0, MCF_IPSBAR + 0x100078); | 199 | writeb(v | 0xc0, MCF_IPSBAR + 0x100078); |
| 200 | #endif | ||
| 196 | 201 | ||
| 197 | #ifdef CONFIG_FEC2 | 202 | #ifdef CONFIG_FEC2 |
| 198 | m527x_fec_irq_init(1); | 203 | m527x_fec_irq_init(1); |
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 0dcbb983297..aaadfa701da 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile | |||
| @@ -26,21 +26,19 @@ ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY))) | |||
| 26 | endif | 26 | endif |
| 27 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div | 27 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div |
| 28 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift | 28 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift |
| 29 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP) += -mxl-pattern-compare | 29 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare |
| 30 | 30 | ||
| 31 | CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) | 31 | CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) |
| 32 | 32 | ||
| 33 | # The various CONFIG_XILINX cpu features options are integers 0/1/2... | 33 | # The various CONFIG_XILINX cpu features options are integers 0/1/2... |
| 34 | # rather than bools y/n | 34 | # rather than bools y/n |
| 35 | CFLAGS += $(CPUFLAGS-1) | ||
| 36 | CFLAGS += $(CPUFLAGS-2) | ||
| 37 | 35 | ||
| 38 | # r31 holds current when in kernel mode | 36 | # r31 holds current when in kernel mode |
| 39 | CFLAGS += -ffixed-r31 | 37 | CFLAGS_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) |
| 40 | 38 | ||
| 41 | LDFLAGS_BLOB := --format binary --oformat elf32-microblaze | 39 | LDFLAGS_BLOB := --format binary --oformat elf32-microblaze |
| 42 | 40 | ||
| 43 | LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) | 41 | LIBGCC := $(shell $(CC) $(CFLAGS_KERNEL) -print-libgcc-file-name) |
| 44 | 42 | ||
| 45 | head-y := arch/microblaze/kernel/head.o | 43 | head-y := arch/microblaze/kernel/head.o |
| 46 | libs-y += arch/microblaze/lib/ $(LIBGCC) | 44 | libs-y += arch/microblaze/lib/ $(LIBGCC) |
diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h index c4c64b43c07..c209c47509d 100644 --- a/arch/microblaze/include/asm/cache.h +++ b/arch/microblaze/include/asm/cache.h | |||
| @@ -37,9 +37,4 @@ void _invalidate_dcache(unsigned int addr); | |||
| 37 | #define __disable_dcache() _disable_dcache() | 37 | #define __disable_dcache() _disable_dcache() |
| 38 | #define __invalidate_dcache(addr) _invalidate_dcache(addr) | 38 | #define __invalidate_dcache(addr) _invalidate_dcache(addr) |
| 39 | 39 | ||
| 40 | /* FIXME - I don't think this is right */ | ||
| 41 | #ifdef CONFIG_XILINX_UNCACHED_SHADOW | ||
| 42 | #define UNCACHED_SHADOW_MASK (CONFIG_XILINX_ERAM_SIZE) | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #endif /* _ASM_MICROBLAZE_CACHE_H */ | 40 | #endif /* _ASM_MICROBLAZE_CACHE_H */ |
diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h index 7f57e42ee46..e4c3aef884d 100644 --- a/arch/microblaze/include/asm/entry.h +++ b/arch/microblaze/include/asm/entry.h | |||
| @@ -29,7 +29,9 @@ DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */ | |||
| 29 | DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */ | 29 | DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */ |
| 30 | DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ | 30 | DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ |
| 31 | DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */ | 31 | DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */ |
| 32 | DECLARE_PER_CPU(unsigned int, SYSCALL_SAVE); /* Saved syscall number */ | ||
| 33 | # endif /* __ASSEMBLY__ */ | 32 | # endif /* __ASSEMBLY__ */ |
| 34 | 33 | ||
| 34 | /* noMMU hasn't any space for args */ | ||
| 35 | # define STATE_SAVE_ARG_SPACE (0) | ||
| 36 | |||
| 35 | #endif /* _ASM_MICROBLAZE_ENTRY_H */ | 37 | #endif /* _ASM_MICROBLAZE_ENTRY_H */ |
diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h index 4cdd2159f47..24ca540e77c 100644 --- a/arch/microblaze/include/asm/exceptions.h +++ b/arch/microblaze/include/asm/exceptions.h | |||
| @@ -61,6 +61,9 @@ | |||
| 61 | asmlinkage void full_exception(struct pt_regs *regs, unsigned int type, | 61 | asmlinkage void full_exception(struct pt_regs *regs, unsigned int type, |
| 62 | int fsr, int addr); | 62 | int fsr, int addr); |
| 63 | 63 | ||
| 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); | ||
| 66 | |||
| 64 | #if defined(CONFIG_XMON) | 67 | #if defined(CONFIG_XMON) |
| 65 | extern void xmon(struct pt_regs *regs); | 68 | extern void xmon(struct pt_regs *regs); |
| 66 | extern int xmon_bpt(struct pt_regs *regs); | 69 | extern int xmon_bpt(struct pt_regs *regs); |
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h index d8e15434ba2..9329029d261 100644 --- a/arch/microblaze/include/asm/processor.h +++ b/arch/microblaze/include/asm/processor.h | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #include <asm/setup.h> | 15 | #include <asm/setup.h> |
| 16 | #include <asm/registers.h> | 16 | #include <asm/registers.h> |
| 17 | #include <asm/segment.h> | 17 | #include <asm/segment.h> |
| 18 | #include <asm/entry.h> | ||
| 19 | #include <asm/current.h> | ||
| 18 | 20 | ||
| 19 | # ifndef __ASSEMBLY__ | 21 | # ifndef __ASSEMBLY__ |
| 20 | /* from kernel/cpu/mb.c */ | 22 | /* from kernel/cpu/mb.c */ |
| @@ -26,6 +28,12 @@ extern const struct seq_operations cpuinfo_op; | |||
| 26 | 28 | ||
| 27 | # endif /* __ASSEMBLY__ */ | 29 | # endif /* __ASSEMBLY__ */ |
| 28 | 30 | ||
| 31 | #define task_pt_regs(tsk) \ | ||
| 32 | (((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1) | ||
| 33 | |||
| 34 | /* Do necessary setup to start up a newly executed thread. */ | ||
| 35 | void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp); | ||
| 36 | |||
| 29 | /* | 37 | /* |
| 30 | * User space process size: memory size | 38 | * User space process size: memory size |
| 31 | * | 39 | * |
| @@ -55,16 +63,6 @@ struct task_struct; | |||
| 55 | struct thread_struct { }; | 63 | struct thread_struct { }; |
| 56 | # define INIT_THREAD { } | 64 | # define INIT_THREAD { } |
| 57 | 65 | ||
| 58 | /* Do necessary setup to start up a newly executed thread. */ | ||
| 59 | static inline void start_thread(struct pt_regs *regs, | ||
| 60 | unsigned long pc, | ||
| 61 | unsigned long usp) | ||
| 62 | { | ||
| 63 | regs->pc = pc; | ||
| 64 | regs->r1 = usp; | ||
| 65 | regs->kernel_mode = 0; | ||
| 66 | } | ||
| 67 | |||
| 68 | /* Free all resources held by a thread. */ | 66 | /* Free all resources held by a thread. */ |
| 69 | static inline void release_thread(struct task_struct *dead_task) | 67 | static inline void release_thread(struct task_struct *dead_task) |
| 70 | { | 68 | { |
| @@ -84,9 +82,6 @@ extern unsigned long get_wchan(struct task_struct *p); | |||
| 84 | */ | 82 | */ |
| 85 | extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); | 83 | extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); |
| 86 | 84 | ||
| 87 | # define task_pt_regs(tsk) \ | ||
| 88 | (((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1) | ||
| 89 | |||
| 90 | # define KSTK_EIP(tsk) (0) | 85 | # define KSTK_EIP(tsk) (0) |
| 91 | # define KSTK_ESP(tsk) (0) | 86 | # define KSTK_ESP(tsk) (0) |
| 92 | 87 | ||
diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h index f1f03486428..55015bce5e4 100644 --- a/arch/microblaze/include/asm/ptrace.h +++ b/arch/microblaze/include/asm/ptrace.h | |||
| @@ -52,10 +52,10 @@ struct pt_regs { | |||
| 52 | microblaze_reg_t ear; | 52 | microblaze_reg_t ear; |
| 53 | microblaze_reg_t esr; | 53 | microblaze_reg_t esr; |
| 54 | microblaze_reg_t fsr; | 54 | microblaze_reg_t fsr; |
| 55 | int kernel_mode; | 55 | int pt_mode; |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | #define kernel_mode(regs) ((regs)->kernel_mode) | 58 | #define kernel_mode(regs) ((regs)->pt_mode) |
| 59 | #define user_mode(regs) (!kernel_mode(regs)) | 59 | #define user_mode(regs) (!kernel_mode(regs)) |
| 60 | 60 | ||
| 61 | #define instruction_pointer(regs) ((regs)->pc) | 61 | #define instruction_pointer(regs) ((regs)->pc) |
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index d9d3903fde3..b5e2f5fa5c5 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h | |||
| @@ -378,8 +378,10 @@ | |||
| 378 | #define __NR_sendmsg 360 /* new */ | 378 | #define __NR_sendmsg 360 /* new */ |
| 379 | #define __NR_recvmsg 361 /* new */ | 379 | #define __NR_recvmsg 361 /* new */ |
| 380 | #define __NR_accept04 362 /* new */ | 380 | #define __NR_accept04 362 /* new */ |
| 381 | #define __NR_preadv 363 /* new */ | ||
| 382 | #define __NR_pwritev 364 /* new */ | ||
| 381 | 383 | ||
| 382 | #define __NR_syscalls 363 | 384 | #define __NR_syscalls 365 |
| 383 | 385 | ||
| 384 | #ifdef __KERNEL__ | 386 | #ifdef __KERNEL__ |
| 385 | #ifndef __ASSEMBLY__ | 387 | #ifndef __ASSEMBLY__ |
diff --git a/arch/microblaze/kernel/asm-offsets.c b/arch/microblaze/kernel/asm-offsets.c index 38e1a2e8ad0..aabd9e9423a 100644 --- a/arch/microblaze/kernel/asm-offsets.c +++ b/arch/microblaze/kernel/asm-offsets.c | |||
| @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) | |||
| 57 | DEFINE(PT_R29, offsetof(struct pt_regs, r29)); | 57 | DEFINE(PT_R29, offsetof(struct pt_regs, r29)); |
| 58 | DEFINE(PT_R30, offsetof(struct pt_regs, r30)); | 58 | DEFINE(PT_R30, offsetof(struct pt_regs, r30)); |
| 59 | DEFINE(PT_R31, offsetof(struct pt_regs, r31)); | 59 | DEFINE(PT_R31, offsetof(struct pt_regs, r31)); |
| 60 | DEFINE(PT_MODE, offsetof(struct pt_regs, kernel_mode)); | 60 | DEFINE(PT_MODE, offsetof(struct pt_regs, pt_mode)); |
| 61 | BLANK(); | 61 | BLANK(); |
| 62 | 62 | ||
| 63 | /* Magic offsets for PTRACE PEEK/POKE etc */ | 63 | /* Magic offsets for PTRACE PEEK/POKE etc */ |
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index be9fecca4f9..af866a45012 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c | |||
| @@ -100,7 +100,6 @@ void _enable_dcache(void) | |||
| 100 | 100 | ||
| 101 | void _disable_dcache(void) | 101 | void _disable_dcache(void) |
| 102 | { | 102 | { |
| 103 | if (cpuinfo.use_dcache) { | ||
| 104 | #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR | 103 | #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR |
| 105 | __asm__ __volatile__ (" \ | 104 | __asm__ __volatile__ (" \ |
| 106 | msrclr r0, %0; \ | 105 | msrclr r0, %0; \ |
| @@ -119,12 +118,10 @@ void _disable_dcache(void) | |||
| 119 | : "i" (MSR_DCE) \ | 118 | : "i" (MSR_DCE) \ |
| 120 | : "memory", "r12"); | 119 | : "memory", "r12"); |
| 121 | #endif | 120 | #endif |
| 122 | } | ||
| 123 | } | 121 | } |
| 124 | 122 | ||
| 125 | void _invalidate_dcache(unsigned int addr) | 123 | void _invalidate_dcache(unsigned int addr) |
| 126 | { | 124 | { |
| 127 | if (cpuinfo.use_dcache) | ||
| 128 | __asm__ __volatile__ (" \ | 125 | __asm__ __volatile__ (" \ |
| 129 | wdc %0, r0" \ | 126 | wdc %0, r0" \ |
| 130 | : \ | 127 | : \ |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c index cf7424a6bb8..153f57c57b6 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | |||
| @@ -30,6 +30,13 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) | |||
| 30 | int temp; /* for saving temp value */ | 30 | int temp; /* for saving temp value */ |
| 31 | get_pvr(&pvr); | 31 | get_pvr(&pvr); |
| 32 | 32 | ||
| 33 | CI(ver_code, VERSION); | ||
| 34 | if (!ci->ver_code) { | ||
| 35 | printk(KERN_ERR "ERROR: MB has broken PVR regs " | ||
| 36 | "-> use DTS setting\n"); | ||
| 37 | return; | ||
| 38 | } | ||
| 39 | |||
| 33 | temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |\ | 40 | temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |\ |
| 34 | PVR_USE_PCMP_INSTR(pvr) | PVR_USE_DIV(pvr); | 41 | PVR_USE_PCMP_INSTR(pvr) | PVR_USE_DIV(pvr); |
| 35 | if (ci->use_instr != temp) | 42 | if (ci->use_instr != temp) |
| @@ -60,8 +67,6 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) | |||
| 60 | 67 | ||
| 61 | CI(mmu, USE_MMU); | 68 | CI(mmu, USE_MMU); |
| 62 | 69 | ||
| 63 | CI(ver_code, VERSION); | ||
| 64 | |||
| 65 | CI(use_icache, USE_ICACHE); | 70 | CI(use_icache, USE_ICACHE); |
| 66 | CI(icache_tagbits, ICACHE_ADDR_TAG_BITS); | 71 | CI(icache_tagbits, ICACHE_ADDR_TAG_BITS); |
| 67 | CI(icache_write, ICACHE_ALLOW_WR); | 72 | CI(icache_write, ICACHE_ALLOW_WR); |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index 4a740dfcf6d..a10bea119b9 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c | |||
| @@ -71,7 +71,7 @@ void __init setup_cpuinfo(void) | |||
| 71 | __func__); | 71 | __func__); |
| 72 | set_cpuinfo_static(&cpuinfo, cpu); | 72 | set_cpuinfo_static(&cpuinfo, cpu); |
| 73 | break; | 73 | break; |
| 74 | /* FIXME I found weird behavior with MB 7.00.a/b | 74 | /* FIXME I found weird behavior with MB 7.00.a/b 7.10.a |
| 75 | * please do not use FULL PVR with MMU */ | 75 | * please do not use FULL PVR with MMU */ |
| 76 | case 1: | 76 | case 1: |
| 77 | printk(KERN_INFO "%s: Using full CPU PVR support\n", | 77 | printk(KERN_INFO "%s: Using full CPU PVR support\n", |
diff --git a/arch/microblaze/kernel/cpu/mb.c b/arch/microblaze/kernel/cpu/mb.c index 3b6212bdc8d..4dcfccdbc36 100644 --- a/arch/microblaze/kernel/cpu/mb.c +++ b/arch/microblaze/kernel/cpu/mb.c | |||
| @@ -115,8 +115,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 115 | cpuinfo.hw_debug ? "yes" : "no"); | 115 | cpuinfo.hw_debug ? "yes" : "no"); |
| 116 | 116 | ||
| 117 | count += seq_printf(m, | 117 | count += seq_printf(m, |
| 118 | "PVR-USR1:\t%x\n" | 118 | "PVR-USR1:\t%02x\n" |
| 119 | "PVR-USR2:\t%x\n", | 119 | "PVR-USR2:\t%08x\n", |
| 120 | cpuinfo.pvr_user1, | 120 | cpuinfo.pvr_user1, |
| 121 | cpuinfo.pvr_user2); | 121 | cpuinfo.pvr_user2); |
| 122 | 122 | ||
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c index 62cc78993f4..4b0f0fdb9ca 100644 --- a/arch/microblaze/kernel/early_printk.c +++ b/arch/microblaze/kernel/early_printk.c | |||
| @@ -36,7 +36,7 @@ static void early_printk_putc(char c) | |||
| 36 | 36 | ||
| 37 | unsigned retries = 10000; | 37 | unsigned retries = 10000; |
| 38 | /* read status bit - 0x8 offset */ | 38 | /* read status bit - 0x8 offset */ |
| 39 | while (retries-- && (in_be32(base_addr + 8) & (1 << 3))) | 39 | while (--retries && (in_be32(base_addr + 8) & (1 << 3))) |
| 40 | ; | 40 | ; |
| 41 | 41 | ||
| 42 | /* Only attempt the iowrite if we didn't timeout */ | 42 | /* Only attempt the iowrite if we didn't timeout */ |
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c index 436f26ccbfa..07d4fa339ed 100644 --- a/arch/microblaze/kernel/process.c +++ b/arch/microblaze/kernel/process.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | void show_regs(struct pt_regs *regs) | 19 | void show_regs(struct pt_regs *regs) |
| 20 | { | 20 | { |
| 21 | printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->kernel_mode); | 21 | printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode); |
| 22 | printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n", | 22 | printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n", |
| 23 | regs->r1, regs->r2, regs->r3, regs->r4); | 23 | regs->r1, regs->r2, regs->r3, regs->r4); |
| 24 | printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n", | 24 | printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n", |
| @@ -37,8 +37,6 @@ void show_regs(struct pt_regs *regs) | |||
| 37 | regs->r29, regs->r30, regs->r31, regs->pc); | 37 | regs->r29, regs->r30, regs->r31, regs->pc); |
| 38 | printk(KERN_INFO " msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n", | 38 | printk(KERN_INFO " msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n", |
| 39 | regs->msr, regs->ear, regs->esr, regs->fsr); | 39 | regs->msr, regs->ear, regs->esr, regs->fsr); |
| 40 | while (1) | ||
| 41 | ; | ||
| 42 | } | 40 | } |
| 43 | 41 | ||
| 44 | void (*pm_idle)(void); | 42 | void (*pm_idle)(void); |
| @@ -163,7 +161,6 @@ static void kernel_thread_helper(int (*fn)(void *), void *arg) | |||
| 163 | int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | 161 | int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) |
| 164 | { | 162 | { |
| 165 | struct pt_regs regs; | 163 | struct pt_regs regs; |
| 166 | int ret; | ||
| 167 | 164 | ||
| 168 | memset(®s, 0, sizeof(regs)); | 165 | memset(®s, 0, sizeof(regs)); |
| 169 | /* store them in non-volatile registers */ | 166 | /* store them in non-volatile registers */ |
| @@ -171,12 +168,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | |||
| 171 | regs.r6 = (unsigned long)arg; | 168 | regs.r6 = (unsigned long)arg; |
| 172 | local_save_flags(regs.msr); | 169 | local_save_flags(regs.msr); |
| 173 | regs.pc = (unsigned long)kernel_thread_helper; | 170 | regs.pc = (unsigned long)kernel_thread_helper; |
| 174 | regs.kernel_mode = 1; | 171 | regs.pt_mode = 1; |
| 175 | 172 | ||
| 176 | ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, | 173 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, |
| 177 | ®s, 0, NULL, NULL); | 174 | ®s, 0, NULL, NULL); |
| 178 | |||
| 179 | return ret; | ||
| 180 | } | 175 | } |
| 181 | 176 | ||
| 182 | unsigned long get_wchan(struct task_struct *p) | 177 | unsigned long get_wchan(struct task_struct *p) |
| @@ -184,3 +179,12 @@ unsigned long get_wchan(struct task_struct *p) | |||
| 184 | /* TBD (used by procfs) */ | 179 | /* TBD (used by procfs) */ |
| 185 | return 0; | 180 | return 0; |
| 186 | } | 181 | } |
| 182 | |||
| 183 | /* Set up a thread for executing a new program */ | ||
| 184 | void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp) | ||
| 185 | { | ||
| 186 | set_fs(USER_DS); | ||
| 187 | regs->pc = pc; | ||
| 188 | regs->r1 = usp; | ||
| 189 | regs->pt_mode = 0; | ||
| 190 | } | ||
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index 3889cf45fa7..40d36931e36 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c | |||
| @@ -178,7 +178,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc, int *rval_p) | |||
| 178 | 178 | ||
| 179 | asmlinkage int sys_sigreturn(struct pt_regs *regs) | 179 | asmlinkage int sys_sigreturn(struct pt_regs *regs) |
| 180 | { | 180 | { |
| 181 | struct sigframe *frame = (struct sigframe *)regs->r1; | 181 | struct sigframe *frame = |
| 182 | (struct sigframe *)(regs->r1 + STATE_SAVE_ARG_SPACE); | ||
| 183 | |||
| 182 | sigset_t set; | 184 | sigset_t set; |
| 183 | int rval; | 185 | int rval; |
| 184 | 186 | ||
| @@ -209,7 +211,9 @@ badframe: | |||
| 209 | 211 | ||
| 210 | asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) | 212 | asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) |
| 211 | { | 213 | { |
| 212 | struct rt_sigframe *frame = (struct rt_sigframe *)regs->r1; | 214 | struct rt_sigframe *frame = |
| 215 | (struct rt_sigframe *)(regs->r1 + STATE_SAVE_ARG_SPACE); | ||
| 216 | |||
| 213 | sigset_t set; | 217 | sigset_t set; |
| 214 | stack_t st; | 218 | stack_t st; |
| 215 | int rval; | 219 | int rval; |
| @@ -336,7 +340,8 @@ static void setup_frame(int sig, struct k_sigaction *ka, | |||
| 336 | goto give_sigsegv; | 340 | goto give_sigsegv; |
| 337 | 341 | ||
| 338 | /* Set up registers for signal handler */ | 342 | /* Set up registers for signal handler */ |
| 339 | regs->r1 = (unsigned long) frame; | 343 | regs->r1 = (unsigned long) frame - STATE_SAVE_ARG_SPACE; |
| 344 | |||
| 340 | /* Signal handler args: */ | 345 | /* Signal handler args: */ |
| 341 | regs->r5 = signal; /* Arg 0: signum */ | 346 | regs->r5 = signal; /* Arg 0: signum */ |
| 342 | regs->r6 = (unsigned long) &frame->sc; /* arg 1: sigcontext */ | 347 | regs->r6 = (unsigned long) &frame->sc; /* arg 1: sigcontext */ |
| @@ -414,7 +419,8 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
| 414 | goto give_sigsegv; | 419 | goto give_sigsegv; |
| 415 | 420 | ||
| 416 | /* Set up registers for signal handler */ | 421 | /* Set up registers for signal handler */ |
| 417 | regs->r1 = (unsigned long) frame; | 422 | regs->r1 = (unsigned long) frame - STATE_SAVE_ARG_SPACE; |
| 423 | |||
| 418 | /* Signal handler args: */ | 424 | /* Signal handler args: */ |
| 419 | regs->r5 = signal; /* arg 0: signum */ | 425 | regs->r5 = signal; /* arg 0: signum */ |
| 420 | regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */ | 426 | regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */ |
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 529b0dbf4fe..3bb42ec924c 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
| @@ -363,3 +363,5 @@ ENTRY(sys_call_table) | |||
| 363 | .long sys_sendmsg /* 360 */ | 363 | .long sys_sendmsg /* 360 */ |
| 364 | .long sys_recvmsg | 364 | .long sys_recvmsg |
| 365 | .long sys_ni_syscall | 365 | .long sys_ni_syscall |
| 366 | .long sys_ni_syscall | ||
| 367 | .long sys_ni_syscall | ||
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index 05a497eefd7..bdfa2f9f0c8 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c | |||
| @@ -176,7 +176,7 @@ static __init void microblaze_clockevent_init(void) | |||
| 176 | clockevents_register_device(&clockevent_microblaze_timer); | 176 | clockevents_register_device(&clockevent_microblaze_timer); |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | static cycle_t microblaze_read(void) | 179 | static cycle_t microblaze_read(struct clocksource *cs) |
| 180 | { | 180 | { |
| 181 | /* reading actual value of timer 1 */ | 181 | /* reading actual value of timer 1 */ |
| 182 | return (cycle_t) (in_be32(TIMER_BASE + TCR1)); | 182 | return (cycle_t) (in_be32(TIMER_BASE + TCR1)); |
diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c index fbdc533c61e..293ef486013 100644 --- a/arch/microblaze/kernel/traps.c +++ b/arch/microblaze/kernel/traps.c | |||
| @@ -34,7 +34,7 @@ static int kstack_depth_to_print = 24; | |||
| 34 | 34 | ||
| 35 | static int __init kstack_setup(char *s) | 35 | static int __init kstack_setup(char *s) |
| 36 | { | 36 | { |
| 37 | kstack_depth_to_print = strict_strtoul(s, 0, 0); | 37 | kstack_depth_to_print = strict_strtoul(s, 0, NULL); |
| 38 | 38 | ||
| 39 | return 1; | 39 | return 1; |
| 40 | } | 40 | } |
diff --git a/arch/mn10300/configs/asb2303_defconfig b/arch/mn10300/configs/asb2303_defconfig index 3aa8906b3de..3acce23708b 100644 --- a/arch/mn10300/configs/asb2303_defconfig +++ b/arch/mn10300/configs/asb2303_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.25-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Tue Feb 19 18:52:24 2008 | 4 | # Sat Apr 18 11:13:22 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_MN10300=y | 6 | CONFIG_MN10300=y |
| 7 | CONFIG_AM33=y | 7 | CONFIG_AM33=y |
| @@ -18,7 +18,6 @@ CONFIG_GENERIC_TIME=y | |||
| 18 | CONFIG_GENERIC_BUG=y | 18 | CONFIG_GENERIC_BUG=y |
| 19 | CONFIG_QUICKLIST=y | 19 | CONFIG_QUICKLIST=y |
| 20 | CONFIG_ARCH_HAS_ILOG2_U32=y | 20 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 21 | # CONFIG_ARCH_SUPPORTS_AOUT is not set | ||
| 22 | CONFIG_GENERIC_HARDIRQS=y | 21 | CONFIG_GENERIC_HARDIRQS=y |
| 23 | # CONFIG_HOTPLUG_CPU is not set | 22 | # CONFIG_HOTPLUG_CPU is not set |
| 24 | CONFIG_HZ=1000 | 23 | CONFIG_HZ=1000 |
| @@ -40,52 +39,58 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
| 40 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 39 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 41 | # CONFIG_TASKSTATS is not set | 40 | # CONFIG_TASKSTATS is not set |
| 42 | # CONFIG_AUDIT is not set | 41 | # CONFIG_AUDIT is not set |
| 42 | |||
| 43 | # | ||
| 44 | # RCU Subsystem | ||
| 45 | # | ||
| 46 | CONFIG_CLASSIC_RCU=y | ||
| 47 | # CONFIG_TREE_RCU is not set | ||
| 48 | # CONFIG_PREEMPT_RCU is not set | ||
| 49 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 50 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 43 | # CONFIG_IKCONFIG is not set | 51 | # CONFIG_IKCONFIG is not set |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 52 | CONFIG_LOG_BUF_SHIFT=14 |
| 45 | # CONFIG_CGROUPS is not set | ||
| 46 | # CONFIG_GROUP_SCHED is not set | 53 | # CONFIG_GROUP_SCHED is not set |
| 47 | # CONFIG_USER_SCHED is not set | 54 | # CONFIG_CGROUPS is not set |
| 48 | # CONFIG_CGROUP_SCHED is not set | 55 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 49 | # CONFIG_SYSFS_DEPRECATED is not set | ||
| 50 | # CONFIG_RELAY is not set | 56 | # CONFIG_RELAY is not set |
| 51 | # CONFIG_NAMESPACES is not set | 57 | # CONFIG_NAMESPACES is not set |
| 52 | # CONFIG_BLK_DEV_INITRD is not set | 58 | # CONFIG_BLK_DEV_INITRD is not set |
| 53 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 59 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 54 | CONFIG_SYSCTL=y | 60 | CONFIG_SYSCTL=y |
| 61 | CONFIG_ANON_INODES=y | ||
| 55 | CONFIG_EMBEDDED=y | 62 | CONFIG_EMBEDDED=y |
| 56 | CONFIG_SYSCTL_SYSCALL=y | 63 | CONFIG_SYSCTL_SYSCALL=y |
| 57 | # CONFIG_KALLSYMS is not set | 64 | # CONFIG_KALLSYMS is not set |
| 65 | CONFIG_STRIP_ASM_SYMS=y | ||
| 58 | # CONFIG_HOTPLUG is not set | 66 | # CONFIG_HOTPLUG is not set |
| 59 | CONFIG_PRINTK=y | 67 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 68 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 69 | CONFIG_ELF_CORE=y |
| 62 | CONFIG_COMPAT_BRK=y | ||
| 63 | CONFIG_BASE_FULL=y | 70 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 71 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | ||
| 66 | CONFIG_EPOLL=y | 72 | CONFIG_EPOLL=y |
| 67 | CONFIG_SIGNALFD=y | 73 | CONFIG_SIGNALFD=y |
| 68 | CONFIG_TIMERFD=y | 74 | CONFIG_TIMERFD=y |
| 69 | CONFIG_EVENTFD=y | 75 | CONFIG_EVENTFD=y |
| 70 | CONFIG_SHMEM=y | 76 | CONFIG_SHMEM=y |
| 77 | CONFIG_AIO=y | ||
| 71 | # CONFIG_VM_EVENT_COUNTERS is not set | 78 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 79 | CONFIG_COMPAT_BRK=y | ||
| 72 | CONFIG_SLAB=y | 80 | CONFIG_SLAB=y |
| 73 | # CONFIG_SLUB is not set | 81 | # CONFIG_SLUB is not set |
| 74 | # CONFIG_SLOB is not set | 82 | # CONFIG_SLOB is not set |
| 75 | CONFIG_PROFILING=y | 83 | CONFIG_PROFILING=y |
| 76 | # CONFIG_MARKERS is not set | 84 | # CONFIG_MARKERS is not set |
| 77 | CONFIG_OPROFILE=y | 85 | CONFIG_HAVE_OPROFILE=y |
| 78 | # CONFIG_HAVE_OPROFILE is not set | 86 | # CONFIG_SLOW_WORK is not set |
| 79 | # CONFIG_HAVE_KPROBES is not set | 87 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 80 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
| 81 | CONFIG_SLABINFO=y | 88 | CONFIG_SLABINFO=y |
| 82 | CONFIG_RT_MUTEXES=y | 89 | CONFIG_RT_MUTEXES=y |
| 83 | # CONFIG_TINY_SHMEM is not set | ||
| 84 | CONFIG_BASE_SMALL=0 | 90 | CONFIG_BASE_SMALL=0 |
| 85 | # CONFIG_MODULES is not set | 91 | # CONFIG_MODULES is not set |
| 86 | # CONFIG_BLOCK is not set | 92 | # CONFIG_BLOCK is not set |
| 87 | CONFIG_CLASSIC_RCU=y | 93 | # CONFIG_FREEZER is not set |
| 88 | # CONFIG_PREEMPT_RCU is not set | ||
| 89 | 94 | ||
| 90 | # | 95 | # |
| 91 | # Matsushita MN10300 system setup | 96 | # Matsushita MN10300 system setup |
| @@ -107,7 +112,6 @@ CONFIG_INTERRUPT_VECTOR_BASE=0x90000000 | |||
| 107 | CONFIG_KERNEL_TEXT_ADDRESS=0x90001000 | 112 | CONFIG_KERNEL_TEXT_ADDRESS=0x90001000 |
| 108 | CONFIG_KERNEL_ZIMAGE_BASE_ADDRESS=0x90700000 | 113 | CONFIG_KERNEL_ZIMAGE_BASE_ADDRESS=0x90700000 |
| 109 | CONFIG_PREEMPT=y | 114 | CONFIG_PREEMPT=y |
| 110 | CONFIG_PREEMPT_BKL=y | ||
| 111 | CONFIG_MN10300_CURRENT_IN_E2=y | 115 | CONFIG_MN10300_CURRENT_IN_E2=y |
| 112 | CONFIG_MN10300_USING_JTAG=y | 116 | CONFIG_MN10300_USING_JTAG=y |
| 113 | CONFIG_MN10300_RTC=y | 117 | CONFIG_MN10300_RTC=y |
| @@ -135,13 +139,15 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 135 | # CONFIG_SPARSEMEM_MANUAL is not set | 139 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 136 | CONFIG_FLATMEM=y | 140 | CONFIG_FLATMEM=y |
| 137 | CONFIG_FLAT_NODE_MEM_MAP=y | 141 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 138 | # CONFIG_SPARSEMEM_STATIC is not set | 142 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 139 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 140 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 143 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 141 | # CONFIG_RESOURCES_64BIT is not set | 144 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 142 | CONFIG_ZONE_DMA_FLAG=0 | 145 | CONFIG_ZONE_DMA_FLAG=0 |
| 143 | CONFIG_NR_QUICK=1 | 146 | CONFIG_NR_QUICK=1 |
| 144 | CONFIG_VIRT_TO_BUS=y | 147 | CONFIG_VIRT_TO_BUS=y |
| 148 | CONFIG_UNEVICTABLE_LRU=y | ||
| 149 | CONFIG_HAVE_MLOCK=y | ||
| 150 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 145 | 151 | ||
| 146 | # | 152 | # |
| 147 | # Power management options | 153 | # Power management options |
| @@ -152,11 +158,9 @@ CONFIG_VIRT_TO_BUS=y | |||
| 152 | # Executable formats | 158 | # Executable formats |
| 153 | # | 159 | # |
| 154 | CONFIG_BINFMT_ELF=y | 160 | CONFIG_BINFMT_ELF=y |
| 161 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 162 | # CONFIG_HAVE_AOUT is not set | ||
| 155 | # CONFIG_BINFMT_MISC is not set | 163 | # CONFIG_BINFMT_MISC is not set |
| 156 | |||
| 157 | # | ||
| 158 | # Networking | ||
| 159 | # | ||
| 160 | CONFIG_NET=y | 164 | CONFIG_NET=y |
| 161 | 165 | ||
| 162 | # | 166 | # |
| @@ -194,8 +198,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 194 | CONFIG_DEFAULT_TCP_CONG="cubic" | 198 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 195 | # CONFIG_TCP_MD5SIG is not set | 199 | # CONFIG_TCP_MD5SIG is not set |
| 196 | # CONFIG_IPV6 is not set | 200 | # CONFIG_IPV6 is not set |
| 197 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 198 | # CONFIG_INET6_TUNNEL is not set | ||
| 199 | # CONFIG_NETWORK_SECMARK is not set | 201 | # CONFIG_NETWORK_SECMARK is not set |
| 200 | # CONFIG_NETFILTER is not set | 202 | # CONFIG_NETFILTER is not set |
| 201 | # CONFIG_IP_DCCP is not set | 203 | # CONFIG_IP_DCCP is not set |
| @@ -203,6 +205,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 203 | # CONFIG_TIPC is not set | 205 | # CONFIG_TIPC is not set |
| 204 | # CONFIG_ATM is not set | 206 | # CONFIG_ATM is not set |
| 205 | # CONFIG_BRIDGE is not set | 207 | # CONFIG_BRIDGE is not set |
| 208 | # CONFIG_NET_DSA is not set | ||
| 206 | # CONFIG_VLAN_8021Q is not set | 209 | # CONFIG_VLAN_8021Q is not set |
| 207 | # CONFIG_DECNET is not set | 210 | # CONFIG_DECNET is not set |
| 208 | # CONFIG_LLC2 is not set | 211 | # CONFIG_LLC2 is not set |
| @@ -212,7 +215,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 212 | # CONFIG_LAPB is not set | 215 | # CONFIG_LAPB is not set |
| 213 | # CONFIG_ECONET is not set | 216 | # CONFIG_ECONET is not set |
| 214 | # CONFIG_WAN_ROUTER is not set | 217 | # CONFIG_WAN_ROUTER is not set |
| 218 | # CONFIG_PHONET is not set | ||
| 215 | # CONFIG_NET_SCHED is not set | 219 | # CONFIG_NET_SCHED is not set |
| 220 | # CONFIG_DCB is not set | ||
| 216 | 221 | ||
| 217 | # | 222 | # |
| 218 | # Network testing | 223 | # Network testing |
| @@ -223,14 +228,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 223 | # CONFIG_IRDA is not set | 228 | # CONFIG_IRDA is not set |
| 224 | # CONFIG_BT is not set | 229 | # CONFIG_BT is not set |
| 225 | # CONFIG_AF_RXRPC is not set | 230 | # CONFIG_AF_RXRPC is not set |
| 226 | 231 | # CONFIG_WIRELESS is not set | |
| 227 | # | 232 | # CONFIG_WIMAX is not set |
| 228 | # Wireless | ||
| 229 | # | ||
| 230 | # CONFIG_CFG80211 is not set | ||
| 231 | # CONFIG_WIRELESS_EXT is not set | ||
| 232 | # CONFIG_MAC80211 is not set | ||
| 233 | # CONFIG_IEEE80211 is not set | ||
| 234 | # CONFIG_RFKILL is not set | 233 | # CONFIG_RFKILL is not set |
| 235 | # CONFIG_NET_9P is not set | 234 | # CONFIG_NET_9P is not set |
| 236 | 235 | ||
| @@ -255,6 +254,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | |||
| 255 | CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y | 254 | CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y |
| 256 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | 255 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set |
| 257 | # CONFIG_MTD_CMDLINE_PARTS is not set | 256 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 257 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 258 | 258 | ||
| 259 | # | 259 | # |
| 260 | # User Modules And Translation Layers | 260 | # User Modules And Translation Layers |
| @@ -297,9 +297,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 297 | # | 297 | # |
| 298 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 298 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 299 | CONFIG_MTD_PHYSMAP=y | 299 | CONFIG_MTD_PHYSMAP=y |
| 300 | CONFIG_MTD_PHYSMAP_START=0x8000000 | 300 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
| 301 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 302 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | ||
| 303 | # CONFIG_MTD_PLATRAM is not set | 301 | # CONFIG_MTD_PLATRAM is not set |
| 304 | 302 | ||
| 305 | # | 303 | # |
| @@ -319,14 +317,23 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 319 | # CONFIG_MTD_ONENAND is not set | 317 | # CONFIG_MTD_ONENAND is not set |
| 320 | 318 | ||
| 321 | # | 319 | # |
| 320 | # LPDDR flash memory drivers | ||
| 321 | # | ||
| 322 | # CONFIG_MTD_LPDDR is not set | ||
| 323 | |||
| 324 | # | ||
| 322 | # UBI - Unsorted block images | 325 | # UBI - Unsorted block images |
| 323 | # | 326 | # |
| 324 | # CONFIG_MTD_UBI is not set | 327 | # CONFIG_MTD_UBI is not set |
| 325 | # CONFIG_PARPORT is not set | 328 | # CONFIG_PARPORT is not set |
| 326 | CONFIG_MISC_DEVICES=y | 329 | CONFIG_MISC_DEVICES=y |
| 327 | # CONFIG_EEPROM_93CX6 is not set | ||
| 328 | # CONFIG_ENCLOSURE_SERVICES is not set | 330 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 329 | # CONFIG_HAVE_IDE is not set | 331 | # CONFIG_C2PORT is not set |
| 332 | |||
| 333 | # | ||
| 334 | # EEPROM support | ||
| 335 | # | ||
| 336 | # CONFIG_EEPROM_93CX6 is not set | ||
| 330 | 337 | ||
| 331 | # | 338 | # |
| 332 | # SCSI device support | 339 | # SCSI device support |
| @@ -334,7 +341,7 @@ CONFIG_MISC_DEVICES=y | |||
| 334 | # CONFIG_SCSI_DMA is not set | 341 | # CONFIG_SCSI_DMA is not set |
| 335 | # CONFIG_SCSI_NETLINK is not set | 342 | # CONFIG_SCSI_NETLINK is not set |
| 336 | CONFIG_NETDEVICES=y | 343 | CONFIG_NETDEVICES=y |
| 337 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 344 | CONFIG_COMPAT_NET_DEV_OPS=y |
| 338 | # CONFIG_DUMMY is not set | 345 | # CONFIG_DUMMY is not set |
| 339 | # CONFIG_BONDING is not set | 346 | # CONFIG_BONDING is not set |
| 340 | # CONFIG_MACVLAN is not set | 347 | # CONFIG_MACVLAN is not set |
| @@ -345,10 +352,15 @@ CONFIG_NETDEVICES=y | |||
| 345 | CONFIG_NET_ETHERNET=y | 352 | CONFIG_NET_ETHERNET=y |
| 346 | CONFIG_MII=y | 353 | CONFIG_MII=y |
| 347 | CONFIG_SMC91X=y | 354 | CONFIG_SMC91X=y |
| 355 | # CONFIG_ETHOC is not set | ||
| 356 | # CONFIG_DNET is not set | ||
| 348 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 357 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 349 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 358 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 350 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 359 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 351 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 360 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 361 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 362 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 363 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 352 | # CONFIG_B44 is not set | 364 | # CONFIG_B44 is not set |
| 353 | # CONFIG_NETDEV_1000 is not set | 365 | # CONFIG_NETDEV_1000 is not set |
| 354 | # CONFIG_NETDEV_10000 is not set | 366 | # CONFIG_NETDEV_10000 is not set |
| @@ -358,6 +370,10 @@ CONFIG_SMC91X=y | |||
| 358 | # | 370 | # |
| 359 | # CONFIG_WLAN_PRE80211 is not set | 371 | # CONFIG_WLAN_PRE80211 is not set |
| 360 | # CONFIG_WLAN_80211 is not set | 372 | # CONFIG_WLAN_80211 is not set |
| 373 | |||
| 374 | # | ||
| 375 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 376 | # | ||
| 361 | # CONFIG_WAN is not set | 377 | # CONFIG_WAN is not set |
| 362 | # CONFIG_PPP is not set | 378 | # CONFIG_PPP is not set |
| 363 | # CONFIG_SLIP is not set | 379 | # CONFIG_SLIP is not set |
| @@ -382,6 +398,7 @@ CONFIG_SMC91X=y | |||
| 382 | # Character devices | 398 | # Character devices |
| 383 | # | 399 | # |
| 384 | # CONFIG_VT is not set | 400 | # CONFIG_VT is not set |
| 401 | CONFIG_DEVKMEM=y | ||
| 385 | # CONFIG_SERIAL_NONSTANDARD is not set | 402 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 386 | 403 | ||
| 387 | # | 404 | # |
| @@ -403,6 +420,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 403 | CONFIG_SERIAL_CORE=y | 420 | CONFIG_SERIAL_CORE=y |
| 404 | CONFIG_SERIAL_CORE_CONSOLE=y | 421 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 405 | CONFIG_UNIX98_PTYS=y | 422 | CONFIG_UNIX98_PTYS=y |
| 423 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 406 | CONFIG_LEGACY_PTYS=y | 424 | CONFIG_LEGACY_PTYS=y |
| 407 | CONFIG_LEGACY_PTY_COUNT=256 | 425 | CONFIG_LEGACY_PTY_COUNT=256 |
| 408 | # CONFIG_IPMI_HANDLER is not set | 426 | # CONFIG_IPMI_HANDLER is not set |
| @@ -411,34 +429,43 @@ CONFIG_RTC=y | |||
| 411 | # CONFIG_R3964 is not set | 429 | # CONFIG_R3964 is not set |
| 412 | # CONFIG_TCG_TPM is not set | 430 | # CONFIG_TCG_TPM is not set |
| 413 | # CONFIG_I2C is not set | 431 | # CONFIG_I2C is not set |
| 414 | |||
| 415 | # | ||
| 416 | # SPI support | ||
| 417 | # | ||
| 418 | # CONFIG_SPI is not set | 432 | # CONFIG_SPI is not set |
| 419 | # CONFIG_SPI_MASTER is not set | ||
| 420 | # CONFIG_W1 is not set | 433 | # CONFIG_W1 is not set |
| 421 | # CONFIG_POWER_SUPPLY is not set | 434 | # CONFIG_POWER_SUPPLY is not set |
| 422 | # CONFIG_HWMON is not set | 435 | # CONFIG_HWMON is not set |
| 423 | # CONFIG_THERMAL is not set | 436 | # CONFIG_THERMAL is not set |
| 437 | # CONFIG_THERMAL_HWMON is not set | ||
| 424 | # CONFIG_WATCHDOG is not set | 438 | # CONFIG_WATCHDOG is not set |
| 439 | CONFIG_SSB_POSSIBLE=y | ||
| 425 | 440 | ||
| 426 | # | 441 | # |
| 427 | # Sonics Silicon Backplane | 442 | # Sonics Silicon Backplane |
| 428 | # | 443 | # |
| 429 | CONFIG_SSB_POSSIBLE=y | ||
| 430 | # CONFIG_SSB is not set | 444 | # CONFIG_SSB is not set |
| 431 | 445 | ||
| 432 | # | 446 | # |
| 433 | # Multifunction device drivers | 447 | # Multifunction device drivers |
| 434 | # | 448 | # |
| 449 | # CONFIG_MFD_CORE is not set | ||
| 435 | # CONFIG_MFD_SM501 is not set | 450 | # CONFIG_MFD_SM501 is not set |
| 451 | # CONFIG_HTC_PASIC3 is not set | ||
| 452 | # CONFIG_MFD_TMIO is not set | ||
| 453 | # CONFIG_REGULATOR is not set | ||
| 436 | 454 | ||
| 437 | # | 455 | # |
| 438 | # Multimedia devices | 456 | # Multimedia devices |
| 439 | # | 457 | # |
| 458 | |||
| 459 | # | ||
| 460 | # Multimedia core support | ||
| 461 | # | ||
| 440 | # CONFIG_VIDEO_DEV is not set | 462 | # CONFIG_VIDEO_DEV is not set |
| 441 | # CONFIG_DVB_CORE is not set | 463 | # CONFIG_DVB_CORE is not set |
| 464 | # CONFIG_VIDEO_MEDIA is not set | ||
| 465 | |||
| 466 | # | ||
| 467 | # Multimedia drivers | ||
| 468 | # | ||
| 442 | # CONFIG_DAB is not set | 469 | # CONFIG_DAB is not set |
| 443 | 470 | ||
| 444 | # | 471 | # |
| @@ -453,21 +480,17 @@ CONFIG_SSB_POSSIBLE=y | |||
| 453 | # Display device support | 480 | # Display device support |
| 454 | # | 481 | # |
| 455 | # CONFIG_DISPLAY_SUPPORT is not set | 482 | # CONFIG_DISPLAY_SUPPORT is not set |
| 456 | |||
| 457 | # | ||
| 458 | # Sound | ||
| 459 | # | ||
| 460 | # CONFIG_SOUND is not set | 483 | # CONFIG_SOUND is not set |
| 461 | # CONFIG_USB_SUPPORT is not set | 484 | # CONFIG_USB_SUPPORT is not set |
| 462 | # CONFIG_MMC is not set | 485 | # CONFIG_MMC is not set |
| 463 | # CONFIG_MEMSTICK is not set | 486 | # CONFIG_MEMSTICK is not set |
| 464 | # CONFIG_NEW_LEDS is not set | 487 | # CONFIG_NEW_LEDS is not set |
| 488 | # CONFIG_ACCESSIBILITY is not set | ||
| 465 | # CONFIG_RTC_CLASS is not set | 489 | # CONFIG_RTC_CLASS is not set |
| 466 | 490 | # CONFIG_DMADEVICES is not set | |
| 467 | # | 491 | # CONFIG_AUXDISPLAY is not set |
| 468 | # Userspace I/O | ||
| 469 | # | ||
| 470 | # CONFIG_UIO is not set | 492 | # CONFIG_UIO is not set |
| 493 | # CONFIG_STAGING is not set | ||
| 471 | 494 | ||
| 472 | # | 495 | # |
| 473 | # File systems | 496 | # File systems |
| @@ -481,20 +504,23 @@ CONFIG_INOTIFY_USER=y | |||
| 481 | # CONFIG_FUSE_FS is not set | 504 | # CONFIG_FUSE_FS is not set |
| 482 | 505 | ||
| 483 | # | 506 | # |
| 507 | # Caches | ||
| 508 | # | ||
| 509 | # CONFIG_FSCACHE is not set | ||
| 510 | |||
| 511 | # | ||
| 484 | # Pseudo filesystems | 512 | # Pseudo filesystems |
| 485 | # | 513 | # |
| 486 | CONFIG_PROC_FS=y | 514 | CONFIG_PROC_FS=y |
| 487 | CONFIG_PROC_KCORE=y | 515 | CONFIG_PROC_KCORE=y |
| 488 | CONFIG_PROC_SYSCTL=y | 516 | CONFIG_PROC_SYSCTL=y |
| 517 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
| 489 | CONFIG_SYSFS=y | 518 | CONFIG_SYSFS=y |
| 490 | CONFIG_TMPFS=y | 519 | CONFIG_TMPFS=y |
| 491 | # CONFIG_TMPFS_POSIX_ACL is not set | 520 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 492 | # CONFIG_HUGETLB_PAGE is not set | 521 | # CONFIG_HUGETLB_PAGE is not set |
| 493 | # CONFIG_CONFIGFS_FS is not set | 522 | # CONFIG_CONFIGFS_FS is not set |
| 494 | 523 | CONFIG_MISC_FILESYSTEMS=y | |
| 495 | # | ||
| 496 | # Miscellaneous filesystems | ||
| 497 | # | ||
| 498 | CONFIG_JFFS2_FS=y | 524 | CONFIG_JFFS2_FS=y |
| 499 | CONFIG_JFFS2_FS_DEBUG=0 | 525 | CONFIG_JFFS2_FS_DEBUG=0 |
| 500 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 526 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| @@ -506,19 +532,17 @@ CONFIG_JFFS2_ZLIB=y | |||
| 506 | # CONFIG_JFFS2_LZO is not set | 532 | # CONFIG_JFFS2_LZO is not set |
| 507 | CONFIG_JFFS2_RTIME=y | 533 | CONFIG_JFFS2_RTIME=y |
| 508 | # CONFIG_JFFS2_RUBIN is not set | 534 | # CONFIG_JFFS2_RUBIN is not set |
| 535 | # CONFIG_ROMFS_FS is not set | ||
| 509 | CONFIG_NETWORK_FILESYSTEMS=y | 536 | CONFIG_NETWORK_FILESYSTEMS=y |
| 510 | CONFIG_NFS_FS=y | 537 | CONFIG_NFS_FS=y |
| 511 | CONFIG_NFS_V3=y | 538 | CONFIG_NFS_V3=y |
| 512 | # CONFIG_NFS_V3_ACL is not set | 539 | # CONFIG_NFS_V3_ACL is not set |
| 513 | # CONFIG_NFS_V4 is not set | 540 | # CONFIG_NFS_V4 is not set |
| 514 | # CONFIG_NFS_DIRECTIO is not set | ||
| 515 | # CONFIG_NFSD is not set | ||
| 516 | CONFIG_ROOT_NFS=y | 541 | CONFIG_ROOT_NFS=y |
| 517 | CONFIG_LOCKD=y | 542 | CONFIG_LOCKD=y |
| 518 | CONFIG_LOCKD_V4=y | 543 | CONFIG_LOCKD_V4=y |
| 519 | CONFIG_NFS_COMMON=y | 544 | CONFIG_NFS_COMMON=y |
| 520 | CONFIG_SUNRPC=y | 545 | CONFIG_SUNRPC=y |
| 521 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 522 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 546 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 523 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 547 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 524 | # CONFIG_SMB_FS is not set | 548 | # CONFIG_SMB_FS is not set |
| @@ -535,12 +559,16 @@ CONFIG_SUNRPC=y | |||
| 535 | # CONFIG_PRINTK_TIME is not set | 559 | # CONFIG_PRINTK_TIME is not set |
| 536 | CONFIG_ENABLE_WARN_DEPRECATED=y | 560 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 537 | CONFIG_ENABLE_MUST_CHECK=y | 561 | CONFIG_ENABLE_MUST_CHECK=y |
| 562 | CONFIG_FRAME_WARN=1024 | ||
| 538 | CONFIG_MAGIC_SYSRQ=y | 563 | CONFIG_MAGIC_SYSRQ=y |
| 539 | # CONFIG_UNUSED_SYMBOLS is not set | 564 | # CONFIG_UNUSED_SYMBOLS is not set |
| 540 | # CONFIG_DEBUG_FS is not set | 565 | # CONFIG_DEBUG_FS is not set |
| 541 | # CONFIG_HEADERS_CHECK is not set | 566 | # CONFIG_HEADERS_CHECK is not set |
| 542 | # CONFIG_DEBUG_KERNEL is not set | 567 | # CONFIG_DEBUG_KERNEL is not set |
| 543 | # CONFIG_DEBUG_BUGVERBOSE is not set | 568 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 569 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 570 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 571 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 544 | # CONFIG_SAMPLES is not set | 572 | # CONFIG_SAMPLES is not set |
| 545 | 573 | ||
| 546 | # | 574 | # |
| @@ -548,26 +576,26 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 548 | # | 576 | # |
| 549 | # CONFIG_KEYS is not set | 577 | # CONFIG_KEYS is not set |
| 550 | # CONFIG_SECURITY is not set | 578 | # CONFIG_SECURITY is not set |
| 579 | # CONFIG_SECURITYFS is not set | ||
| 551 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 580 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 552 | # CONFIG_CRYPTO is not set | 581 | # CONFIG_CRYPTO is not set |
| 582 | # CONFIG_BINARY_PRINTF is not set | ||
| 553 | 583 | ||
| 554 | # | 584 | # |
| 555 | # Library routines | 585 | # Library routines |
| 556 | # | 586 | # |
| 557 | CONFIG_BITREVERSE=y | 587 | CONFIG_BITREVERSE=y |
| 588 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 558 | # CONFIG_CRC_CCITT is not set | 589 | # CONFIG_CRC_CCITT is not set |
| 559 | # CONFIG_CRC16 is not set | 590 | # CONFIG_CRC16 is not set |
| 591 | # CONFIG_CRC_T10DIF is not set | ||
| 560 | # CONFIG_CRC_ITU_T is not set | 592 | # CONFIG_CRC_ITU_T is not set |
| 561 | CONFIG_CRC32=y | 593 | CONFIG_CRC32=y |
| 562 | # CONFIG_CRC7 is not set | 594 | # CONFIG_CRC7 is not set |
| 563 | # CONFIG_LIBCRC32C is not set | 595 | # CONFIG_LIBCRC32C is not set |
| 564 | CONFIG_ZLIB_INFLATE=y | 596 | CONFIG_ZLIB_INFLATE=y |
| 565 | CONFIG_ZLIB_DEFLATE=y | 597 | CONFIG_ZLIB_DEFLATE=y |
| 566 | CONFIG_PLIST=y | ||
| 567 | CONFIG_HAS_IOMEM=y | 598 | CONFIG_HAS_IOMEM=y |
| 568 | CONFIG_HAS_IOPORT=y | 599 | CONFIG_HAS_IOPORT=y |
| 569 | CONFIG_HAS_DMA=y | 600 | CONFIG_HAS_DMA=y |
| 570 | 601 | CONFIG_NLATTR=y | |
| 571 | # | ||
| 572 | # Profiling support | ||
| 573 | # | ||
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index c63e3566479..d13cb11ce62 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
| @@ -293,4 +293,43 @@ | |||
| 293 | 0x02000000 0 0xa0000000 0xa0000000 0 0x10000000 | 293 | 0x02000000 0 0xa0000000 0xa0000000 0 0x10000000 |
| 294 | 0x01000000 0 0x00000000 0xb0000000 0 0x01000000>; | 294 | 0x01000000 0 0x00000000 0xb0000000 0 0x01000000>; |
| 295 | }; | 295 | }; |
| 296 | |||
| 297 | localbus { | ||
| 298 | compatible = "fsl,mpc5200b-lpb","fsl,mpc5200-lpb","simple-bus"; | ||
| 299 | |||
| 300 | #address-cells = <2>; | ||
| 301 | #size-cells = <1>; | ||
| 302 | |||
| 303 | ranges = <0 0 0xfe000000 0x02000000>; | ||
| 304 | |||
| 305 | flash@0,0 { | ||
| 306 | compatible = "cfi-flash"; | ||
| 307 | reg = <0 0 0x02000000>; | ||
| 308 | bank-width = <1>; | ||
| 309 | #size-cells = <1>; | ||
| 310 | #address-cells = <1>; | ||
| 311 | |||
| 312 | partition@0 { | ||
| 313 | label = "kernel"; | ||
| 314 | reg = <0x00000000 0x00200000>; | ||
| 315 | }; | ||
| 316 | partition@200000 { | ||
| 317 | label = "rootfs"; | ||
| 318 | reg = <0x00200000 0x01d00000>; | ||
| 319 | }; | ||
| 320 | partition@1f00000 { | ||
| 321 | label = "u-boot"; | ||
| 322 | reg = <0x01f00000 0x00060000>; | ||
| 323 | }; | ||
| 324 | partition@1f60000 { | ||
| 325 | label = "u-boot-env"; | ||
| 326 | reg = <0x01f60000 0x00020000>; | ||
| 327 | }; | ||
| 328 | partition@1f80000 { | ||
| 329 | label = "dtb"; | ||
| 330 | reg = <0x01f80000 0x00080000>; | ||
| 331 | }; | ||
| 332 | }; | ||
| 333 | }; | ||
| 334 | |||
| 296 | }; | 335 | }; |
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig index 1239c6132b4..3838b77b811 100644 --- a/arch/powerpc/configs/52xx/cm5200_defconfig +++ b/arch/powerpc/configs/52xx/cm5200_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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 21:41:58 2009 | 4 | # Sat Apr 18 00:47:44 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_6xx=y | |||
| 14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_BOOK3S=y | ||
| 17 | CONFIG_PPC_FPU=y | 18 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | 19 | # CONFIG_ALTIVEC is not set |
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| @@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y | |||
| 54 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 55 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
| 56 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
| 58 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 58 | 60 | ||
| 59 | # | 61 | # |
| @@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 94 | # CONFIG_NAMESPACES is not set | 96 | # CONFIG_NAMESPACES is not set |
| 95 | CONFIG_BLK_DEV_INITRD=y | 97 | CONFIG_BLK_DEV_INITRD=y |
| 96 | CONFIG_INITRAMFS_SOURCE="" | 98 | CONFIG_INITRAMFS_SOURCE="" |
| 99 | CONFIG_RD_GZIP=y | ||
| 100 | # CONFIG_RD_BZIP2 is not set | ||
| 101 | # CONFIG_RD_LZMA is not set | ||
| 97 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 102 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 98 | CONFIG_SYSCTL=y | 103 | CONFIG_SYSCTL=y |
| 104 | CONFIG_ANON_INODES=y | ||
| 99 | CONFIG_EMBEDDED=y | 105 | CONFIG_EMBEDDED=y |
| 100 | # CONFIG_SYSCTL_SYSCALL is not set | 106 | # CONFIG_SYSCTL_SYSCALL is not set |
| 101 | # CONFIG_KALLSYMS is not set | 107 | # CONFIG_KALLSYMS is not set |
| 108 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 102 | CONFIG_HOTPLUG=y | 109 | CONFIG_HOTPLUG=y |
| 103 | CONFIG_PRINTK=y | 110 | CONFIG_PRINTK=y |
| 104 | CONFIG_BUG=y | 111 | CONFIG_BUG=y |
| 105 | CONFIG_ELF_CORE=y | 112 | CONFIG_ELF_CORE=y |
| 106 | CONFIG_COMPAT_BRK=y | ||
| 107 | CONFIG_BASE_FULL=y | 113 | CONFIG_BASE_FULL=y |
| 108 | CONFIG_FUTEX=y | 114 | CONFIG_FUTEX=y |
| 109 | CONFIG_ANON_INODES=y | ||
| 110 | # CONFIG_EPOLL is not set | 115 | # CONFIG_EPOLL is not set |
| 111 | CONFIG_SIGNALFD=y | 116 | CONFIG_SIGNALFD=y |
| 112 | CONFIG_TIMERFD=y | 117 | CONFIG_TIMERFD=y |
| @@ -115,10 +120,12 @@ CONFIG_SHMEM=y | |||
| 115 | CONFIG_AIO=y | 120 | CONFIG_AIO=y |
| 116 | CONFIG_VM_EVENT_COUNTERS=y | 121 | CONFIG_VM_EVENT_COUNTERS=y |
| 117 | CONFIG_SLUB_DEBUG=y | 122 | CONFIG_SLUB_DEBUG=y |
| 123 | CONFIG_COMPAT_BRK=y | ||
| 118 | # CONFIG_SLAB is not set | 124 | # CONFIG_SLAB is not set |
| 119 | CONFIG_SLUB=y | 125 | CONFIG_SLUB=y |
| 120 | # CONFIG_SLOB is not set | 126 | # CONFIG_SLOB is not set |
| 121 | # CONFIG_PROFILING is not set | 127 | # CONFIG_PROFILING is not set |
| 128 | # CONFIG_MARKERS is not set | ||
| 122 | CONFIG_HAVE_OPROFILE=y | 129 | CONFIG_HAVE_OPROFILE=y |
| 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 130 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 124 | CONFIG_HAVE_IOREMAP_PROT=y | 131 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 126 | CONFIG_HAVE_KRETPROBES=y | 133 | CONFIG_HAVE_KRETPROBES=y |
| 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 134 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 128 | CONFIG_HAVE_CLK=y | 135 | CONFIG_HAVE_CLK=y |
| 136 | # CONFIG_SLOW_WORK is not set | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 137 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 138 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 139 | CONFIG_RT_MUTEXES=y |
| @@ -133,7 +141,6 @@ CONFIG_BASE_SMALL=0 | |||
| 133 | # CONFIG_MODULES is not set | 141 | # CONFIG_MODULES is not set |
| 134 | CONFIG_BLOCK=y | 142 | CONFIG_BLOCK=y |
| 135 | # CONFIG_LBD is not set | 143 | # CONFIG_LBD is not set |
| 136 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 137 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 145 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 139 | 146 | ||
| @@ -154,8 +161,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 154 | # | 161 | # |
| 155 | # Platform support | 162 | # Platform support |
| 156 | # | 163 | # |
| 157 | CONFIG_PPC_MULTIPLATFORM=y | ||
| 158 | CONFIG_CLASSIC32=y | ||
| 159 | # CONFIG_PPC_CHRP is not set | 164 | # CONFIG_PPC_CHRP is not set |
| 160 | # CONFIG_MPC5121_ADS is not set | 165 | # CONFIG_MPC5121_ADS is not set |
| 161 | # CONFIG_MPC5121_GENERIC is not set | 166 | # CONFIG_MPC5121_GENERIC is not set |
| @@ -163,6 +168,7 @@ CONFIG_PPC_MPC52xx=y | |||
| 163 | CONFIG_PPC_MPC5200_SIMPLE=y | 168 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 164 | # CONFIG_PPC_EFIKA is not set | 169 | # CONFIG_PPC_EFIKA is not set |
| 165 | # CONFIG_PPC_LITE5200 is not set | 170 | # CONFIG_PPC_LITE5200 is not set |
| 171 | # CONFIG_PPC_MEDIA5200 is not set | ||
| 166 | # CONFIG_PPC_MPC5200_BUGFIX is not set | 172 | # CONFIG_PPC_MPC5200_BUGFIX is not set |
| 167 | # CONFIG_PPC_MPC5200_GPIO is not set | 173 | # CONFIG_PPC_MPC5200_GPIO is not set |
| 168 | # CONFIG_PPC_PMAC is not set | 174 | # CONFIG_PPC_PMAC is not set |
| @@ -173,6 +179,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 173 | # CONFIG_PPC_83xx is not set | 179 | # CONFIG_PPC_83xx is not set |
| 174 | # CONFIG_PPC_86xx is not set | 180 | # CONFIG_PPC_86xx is not set |
| 175 | # CONFIG_EMBEDDED6xx is not set | 181 | # CONFIG_EMBEDDED6xx is not set |
| 182 | # CONFIG_AMIGAONE is not set | ||
| 183 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
| 176 | # CONFIG_IPIC is not set | 184 | # CONFIG_IPIC is not set |
| 177 | # CONFIG_MPIC is not set | 185 | # CONFIG_MPIC is not set |
| 178 | # CONFIG_MPIC_WEIRD is not set | 186 | # CONFIG_MPIC_WEIRD is not set |
| @@ -232,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 232 | CONFIG_BOUNCE=y | 240 | CONFIG_BOUNCE=y |
| 233 | CONFIG_VIRT_TO_BUS=y | 241 | CONFIG_VIRT_TO_BUS=y |
| 234 | CONFIG_UNEVICTABLE_LRU=y | 242 | CONFIG_UNEVICTABLE_LRU=y |
| 243 | CONFIG_HAVE_MLOCK=y | ||
| 244 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 235 | CONFIG_PPC_4K_PAGES=y | 245 | CONFIG_PPC_4K_PAGES=y |
| 236 | # CONFIG_PPC_16K_PAGES is not set | 246 | # CONFIG_PPC_16K_PAGES is not set |
| 237 | # CONFIG_PPC_64K_PAGES is not set | 247 | # CONFIG_PPC_64K_PAGES is not set |
| 248 | # CONFIG_PPC_256K_PAGES is not set | ||
| 238 | CONFIG_FORCE_MAX_ZONEORDER=11 | 249 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 239 | CONFIG_PROC_DEVICETREE=y | 250 | CONFIG_PROC_DEVICETREE=y |
| 240 | # CONFIG_CMDLINE_BOOL is not set | 251 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -275,7 +286,6 @@ CONFIG_NET=y | |||
| 275 | # | 286 | # |
| 276 | # Networking options | 287 | # Networking options |
| 277 | # | 288 | # |
| 278 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 279 | CONFIG_PACKET=y | 289 | CONFIG_PACKET=y |
| 280 | # CONFIG_PACKET_MMAP is not set | 290 | # CONFIG_PACKET_MMAP is not set |
| 281 | CONFIG_UNIX=y | 291 | CONFIG_UNIX=y |
| @@ -331,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 331 | # CONFIG_LAPB is not set | 341 | # CONFIG_LAPB is not set |
| 332 | # CONFIG_ECONET is not set | 342 | # CONFIG_ECONET is not set |
| 333 | # CONFIG_WAN_ROUTER is not set | 343 | # CONFIG_WAN_ROUTER is not set |
| 344 | # CONFIG_PHONET is not set | ||
| 334 | # CONFIG_NET_SCHED is not set | 345 | # CONFIG_NET_SCHED is not set |
| 335 | # CONFIG_DCB is not set | 346 | # CONFIG_DCB is not set |
| 336 | 347 | ||
| @@ -343,7 +354,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 343 | # CONFIG_IRDA is not set | 354 | # CONFIG_IRDA is not set |
| 344 | # CONFIG_BT is not set | 355 | # CONFIG_BT is not set |
| 345 | # CONFIG_AF_RXRPC is not set | 356 | # CONFIG_AF_RXRPC is not set |
| 346 | # CONFIG_PHONET is not set | ||
| 347 | # CONFIG_WIRELESS is not set | 357 | # CONFIG_WIRELESS is not set |
| 348 | # CONFIG_WIMAX is not set | 358 | # CONFIG_WIMAX is not set |
| 349 | # CONFIG_RFKILL is not set | 359 | # CONFIG_RFKILL is not set |
| @@ -440,7 +450,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 440 | # LPDDR flash memory drivers | 450 | # LPDDR flash memory drivers |
| 441 | # | 451 | # |
| 442 | # CONFIG_MTD_LPDDR is not set | 452 | # CONFIG_MTD_LPDDR is not set |
| 443 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 444 | 453 | ||
| 445 | # | 454 | # |
| 446 | # UBI - Unsorted block images | 455 | # UBI - Unsorted block images |
| @@ -505,10 +514,12 @@ CONFIG_CHR_DEV_SG=y | |||
| 505 | # CONFIG_SCSI_SRP_ATTRS is not set | 514 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 506 | # CONFIG_SCSI_LOWLEVEL is not set | 515 | # CONFIG_SCSI_LOWLEVEL is not set |
| 507 | # CONFIG_SCSI_DH is not set | 516 | # CONFIG_SCSI_DH is not set |
| 517 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 508 | # CONFIG_ATA is not set | 518 | # CONFIG_ATA is not set |
| 509 | # CONFIG_MD is not set | 519 | # CONFIG_MD is not set |
| 510 | # CONFIG_MACINTOSH_DRIVERS is not set | 520 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 511 | CONFIG_NETDEVICES=y | 521 | CONFIG_NETDEVICES=y |
| 522 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 512 | # CONFIG_DUMMY is not set | 523 | # CONFIG_DUMMY is not set |
| 513 | # CONFIG_BONDING is not set | 524 | # CONFIG_BONDING is not set |
| 514 | # CONFIG_MACVLAN is not set | 525 | # CONFIG_MACVLAN is not set |
| @@ -537,6 +548,8 @@ CONFIG_LXT_PHY=y | |||
| 537 | # CONFIG_MDIO_BITBANG is not set | 548 | # CONFIG_MDIO_BITBANG is not set |
| 538 | CONFIG_NET_ETHERNET=y | 549 | CONFIG_NET_ETHERNET=y |
| 539 | # CONFIG_MII is not set | 550 | # CONFIG_MII is not set |
| 551 | # CONFIG_ETHOC is not set | ||
| 552 | # CONFIG_DNET is not set | ||
| 540 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 553 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 541 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 554 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 542 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 555 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -555,7 +568,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 555 | # | 568 | # |
| 556 | # CONFIG_WLAN_PRE80211 is not set | 569 | # CONFIG_WLAN_PRE80211 is not set |
| 557 | # CONFIG_WLAN_80211 is not set | 570 | # CONFIG_WLAN_80211 is not set |
| 558 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 559 | 571 | ||
| 560 | # | 572 | # |
| 561 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 573 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -657,7 +669,6 @@ CONFIG_I2C_MPC=y | |||
| 657 | # CONFIG_SENSORS_PCF8574 is not set | 669 | # CONFIG_SENSORS_PCF8574 is not set |
| 658 | # CONFIG_PCF8575 is not set | 670 | # CONFIG_PCF8575 is not set |
| 659 | # CONFIG_SENSORS_PCA9539 is not set | 671 | # CONFIG_SENSORS_PCA9539 is not set |
| 660 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 661 | # CONFIG_SENSORS_MAX6875 is not set | 672 | # CONFIG_SENSORS_MAX6875 is not set |
| 662 | # CONFIG_SENSORS_TSL2550 is not set | 673 | # CONFIG_SENSORS_TSL2550 is not set |
| 663 | # CONFIG_I2C_DEBUG_CORE is not set | 674 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -786,11 +797,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 786 | # CONFIG_USB_TMC is not set | 797 | # CONFIG_USB_TMC is not set |
| 787 | 798 | ||
| 788 | # | 799 | # |
| 789 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 800 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 790 | # | 801 | # |
| 791 | 802 | ||
| 792 | # | 803 | # |
| 793 | # see USB_STORAGE Help for more information | 804 | # also be needed; see USB_STORAGE Help for more info |
| 794 | # | 805 | # |
| 795 | CONFIG_USB_STORAGE=y | 806 | CONFIG_USB_STORAGE=y |
| 796 | # CONFIG_USB_STORAGE_DEBUG is not set | 807 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -831,7 +842,6 @@ CONFIG_USB_STORAGE=y | |||
| 831 | # CONFIG_USB_LED is not set | 842 | # CONFIG_USB_LED is not set |
| 832 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 843 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 833 | # CONFIG_USB_CYTHERM is not set | 844 | # CONFIG_USB_CYTHERM is not set |
| 834 | # CONFIG_USB_PHIDGET is not set | ||
| 835 | # CONFIG_USB_IDMOUSE is not set | 845 | # CONFIG_USB_IDMOUSE is not set |
| 836 | # CONFIG_USB_FTDI_ELAN is not set | 846 | # CONFIG_USB_FTDI_ELAN is not set |
| 837 | # CONFIG_USB_APPLEDISPLAY is not set | 847 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -846,6 +856,7 @@ CONFIG_USB_STORAGE=y | |||
| 846 | # | 856 | # |
| 847 | # OTG and related infrastructure | 857 | # OTG and related infrastructure |
| 848 | # | 858 | # |
| 859 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 849 | # CONFIG_MMC is not set | 860 | # CONFIG_MMC is not set |
| 850 | # CONFIG_MEMSTICK is not set | 861 | # CONFIG_MEMSTICK is not set |
| 851 | # CONFIG_NEW_LEDS is not set | 862 | # CONFIG_NEW_LEDS is not set |
| @@ -853,6 +864,7 @@ CONFIG_USB_STORAGE=y | |||
| 853 | # CONFIG_EDAC is not set | 864 | # CONFIG_EDAC is not set |
| 854 | # CONFIG_RTC_CLASS is not set | 865 | # CONFIG_RTC_CLASS is not set |
| 855 | # CONFIG_DMADEVICES is not set | 866 | # CONFIG_DMADEVICES is not set |
| 867 | # CONFIG_AUXDISPLAY is not set | ||
| 856 | # CONFIG_UIO is not set | 868 | # CONFIG_UIO is not set |
| 857 | # CONFIG_STAGING is not set | 869 | # CONFIG_STAGING is not set |
| 858 | 870 | ||
| @@ -863,6 +875,7 @@ CONFIG_EXT2_FS=y | |||
| 863 | # CONFIG_EXT2_FS_XATTR is not set | 875 | # CONFIG_EXT2_FS_XATTR is not set |
| 864 | # CONFIG_EXT2_FS_XIP is not set | 876 | # CONFIG_EXT2_FS_XIP is not set |
| 865 | CONFIG_EXT3_FS=y | 877 | CONFIG_EXT3_FS=y |
| 878 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 866 | CONFIG_EXT3_FS_XATTR=y | 879 | CONFIG_EXT3_FS_XATTR=y |
| 867 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 880 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 868 | # CONFIG_EXT3_FS_SECURITY is not set | 881 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -885,6 +898,11 @@ CONFIG_INOTIFY_USER=y | |||
| 885 | # CONFIG_FUSE_FS is not set | 898 | # CONFIG_FUSE_FS is not set |
| 886 | 899 | ||
| 887 | # | 900 | # |
| 901 | # Caches | ||
| 902 | # | ||
| 903 | # CONFIG_FSCACHE is not set | ||
| 904 | |||
| 905 | # | ||
| 888 | # CD-ROM/DVD Filesystems | 906 | # CD-ROM/DVD Filesystems |
| 889 | # | 907 | # |
| 890 | # CONFIG_ISO9660_FS is not set | 908 | # CONFIG_ISO9660_FS is not set |
| @@ -941,6 +959,7 @@ CONFIG_CRAMFS=y | |||
| 941 | # CONFIG_ROMFS_FS is not set | 959 | # CONFIG_ROMFS_FS is not set |
| 942 | # CONFIG_SYSV_FS is not set | 960 | # CONFIG_SYSV_FS is not set |
| 943 | # CONFIG_UFS_FS is not set | 961 | # CONFIG_UFS_FS is not set |
| 962 | # CONFIG_NILFS2_FS is not set | ||
| 944 | CONFIG_NETWORK_FILESYSTEMS=y | 963 | CONFIG_NETWORK_FILESYSTEMS=y |
| 945 | CONFIG_NFS_FS=y | 964 | CONFIG_NFS_FS=y |
| 946 | CONFIG_NFS_V3=y | 965 | CONFIG_NFS_V3=y |
| @@ -953,7 +972,6 @@ CONFIG_LOCKD_V4=y | |||
| 953 | CONFIG_NFS_COMMON=y | 972 | CONFIG_NFS_COMMON=y |
| 954 | CONFIG_SUNRPC=y | 973 | CONFIG_SUNRPC=y |
| 955 | CONFIG_SUNRPC_GSS=y | 974 | CONFIG_SUNRPC_GSS=y |
| 956 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 957 | CONFIG_RPCSEC_GSS_KRB5=y | 975 | CONFIG_RPCSEC_GSS_KRB5=y |
| 958 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 976 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 959 | # CONFIG_SMB_FS is not set | 977 | # CONFIG_SMB_FS is not set |
| @@ -1024,6 +1042,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1024 | # CONFIG_NLS_KOI8_U is not set | 1042 | # CONFIG_NLS_KOI8_U is not set |
| 1025 | # CONFIG_NLS_UTF8 is not set | 1043 | # CONFIG_NLS_UTF8 is not set |
| 1026 | # CONFIG_DLM is not set | 1044 | # CONFIG_DLM is not set |
| 1045 | # CONFIG_BINARY_PRINTF is not set | ||
| 1027 | 1046 | ||
| 1028 | # | 1047 | # |
| 1029 | # Library routines | 1048 | # Library routines |
| @@ -1039,11 +1058,12 @@ CONFIG_CRC32=y | |||
| 1039 | # CONFIG_LIBCRC32C is not set | 1058 | # CONFIG_LIBCRC32C is not set |
| 1040 | CONFIG_ZLIB_INFLATE=y | 1059 | CONFIG_ZLIB_INFLATE=y |
| 1041 | CONFIG_ZLIB_DEFLATE=y | 1060 | CONFIG_ZLIB_DEFLATE=y |
| 1042 | CONFIG_PLIST=y | 1061 | CONFIG_DECOMPRESS_GZIP=y |
| 1043 | CONFIG_HAS_IOMEM=y | 1062 | CONFIG_HAS_IOMEM=y |
| 1044 | CONFIG_HAS_IOPORT=y | 1063 | CONFIG_HAS_IOPORT=y |
| 1045 | CONFIG_HAS_DMA=y | 1064 | CONFIG_HAS_DMA=y |
| 1046 | CONFIG_HAVE_LMB=y | 1065 | CONFIG_HAVE_LMB=y |
| 1066 | CONFIG_NLATTR=y | ||
| 1047 | 1067 | ||
| 1048 | # | 1068 | # |
| 1049 | # Kernel hacking | 1069 | # Kernel hacking |
| @@ -1061,6 +1081,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1061 | CONFIG_DETECT_SOFTLOCKUP=y | 1081 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1062 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1082 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1063 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1083 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1084 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1085 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1086 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1064 | CONFIG_SCHED_DEBUG=y | 1087 | CONFIG_SCHED_DEBUG=y |
| 1065 | # CONFIG_SCHEDSTATS is not set | 1088 | # CONFIG_SCHEDSTATS is not set |
| 1066 | # CONFIG_TIMER_STATS is not set | 1089 | # CONFIG_TIMER_STATS is not set |
| @@ -1089,9 +1112,12 @@ CONFIG_SCHED_DEBUG=y | |||
| 1089 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1112 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1090 | # CONFIG_FAULT_INJECTION is not set | 1113 | # CONFIG_FAULT_INJECTION is not set |
| 1091 | # CONFIG_LATENCYTOP is not set | 1114 | # CONFIG_LATENCYTOP is not set |
| 1115 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1092 | CONFIG_HAVE_FUNCTION_TRACER=y | 1116 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1117 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1093 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1118 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1094 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1119 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1120 | CONFIG_TRACING_SUPPORT=y | ||
| 1095 | 1121 | ||
| 1096 | # | 1122 | # |
| 1097 | # Tracers | 1123 | # Tracers |
| @@ -1099,17 +1125,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1099 | # CONFIG_FUNCTION_TRACER is not set | 1125 | # CONFIG_FUNCTION_TRACER is not set |
| 1100 | # CONFIG_SCHED_TRACER is not set | 1126 | # CONFIG_SCHED_TRACER is not set |
| 1101 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1127 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1128 | # CONFIG_EVENT_TRACER is not set | ||
| 1102 | # CONFIG_BOOT_TRACER is not set | 1129 | # CONFIG_BOOT_TRACER is not set |
| 1103 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1130 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1104 | # CONFIG_STACK_TRACER is not set | 1131 | # CONFIG_STACK_TRACER is not set |
| 1105 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1132 | # CONFIG_KMEMTRACE is not set |
| 1133 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1134 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1106 | # CONFIG_SAMPLES is not set | 1135 | # CONFIG_SAMPLES is not set |
| 1107 | CONFIG_HAVE_ARCH_KGDB=y | 1136 | CONFIG_HAVE_ARCH_KGDB=y |
| 1108 | # CONFIG_KGDB is not set | 1137 | # CONFIG_KGDB is not set |
| 1109 | CONFIG_PRINT_STACK_DEPTH=64 | 1138 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1110 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1139 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1111 | # CONFIG_DEBUG_STACK_USAGE is not set | 1140 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1112 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1113 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1141 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1114 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1142 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1115 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1143 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| @@ -1140,10 +1168,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1140 | CONFIG_CRYPTO_HASH=y | 1168 | CONFIG_CRYPTO_HASH=y |
| 1141 | CONFIG_CRYPTO_HASH2=y | 1169 | CONFIG_CRYPTO_HASH2=y |
| 1142 | CONFIG_CRYPTO_RNG2=y | 1170 | CONFIG_CRYPTO_RNG2=y |
| 1171 | CONFIG_CRYPTO_PCOMP=y | ||
| 1143 | CONFIG_CRYPTO_MANAGER=y | 1172 | CONFIG_CRYPTO_MANAGER=y |
| 1144 | CONFIG_CRYPTO_MANAGER2=y | 1173 | CONFIG_CRYPTO_MANAGER2=y |
| 1145 | # CONFIG_CRYPTO_GF128MUL is not set | 1174 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1146 | # CONFIG_CRYPTO_NULL is not set | 1175 | # CONFIG_CRYPTO_NULL is not set |
| 1176 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1147 | # CONFIG_CRYPTO_CRYPTD is not set | 1177 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1148 | # CONFIG_CRYPTO_AUTHENC is not set | 1178 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1149 | 1179 | ||
| @@ -1211,6 +1241,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1211 | # Compression | 1241 | # Compression |
| 1212 | # | 1242 | # |
| 1213 | # CONFIG_CRYPTO_DEFLATE is not set | 1243 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1244 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1214 | # CONFIG_CRYPTO_LZO is not set | 1245 | # CONFIG_CRYPTO_LZO is not set |
| 1215 | 1246 | ||
| 1216 | # | 1247 | # |
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index b7b88056290..29b0f34488f 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 21:41:14 2009 | 4 | # Sat Apr 18 00:48:04 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_6xx=y | |||
| 14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_BOOK3S=y | ||
| 17 | CONFIG_PPC_FPU=y | 18 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | 19 | # CONFIG_ALTIVEC is not set |
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| @@ -55,6 +56,7 @@ CONFIG_DEFAULT_UIMAGE=y | |||
| 55 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 56 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 56 | # CONFIG_PPC_DCR_NATIVE is not set | 57 | # CONFIG_PPC_DCR_NATIVE is not set |
| 57 | # CONFIG_PPC_DCR_MMIO is not set | 58 | # CONFIG_PPC_DCR_MMIO is not set |
| 59 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 58 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 59 | 61 | ||
| 60 | # | 62 | # |
| @@ -95,19 +97,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 95 | # CONFIG_NAMESPACES is not set | 97 | # CONFIG_NAMESPACES is not set |
| 96 | CONFIG_BLK_DEV_INITRD=y | 98 | CONFIG_BLK_DEV_INITRD=y |
| 97 | CONFIG_INITRAMFS_SOURCE="" | 99 | CONFIG_INITRAMFS_SOURCE="" |
| 100 | CONFIG_RD_GZIP=y | ||
| 101 | # CONFIG_RD_BZIP2 is not set | ||
| 102 | # CONFIG_RD_LZMA is not set | ||
| 98 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 103 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 99 | CONFIG_SYSCTL=y | 104 | CONFIG_SYSCTL=y |
| 105 | CONFIG_ANON_INODES=y | ||
| 100 | CONFIG_EMBEDDED=y | 106 | CONFIG_EMBEDDED=y |
| 101 | # CONFIG_SYSCTL_SYSCALL is not set | 107 | # CONFIG_SYSCTL_SYSCALL is not set |
| 102 | # CONFIG_KALLSYMS is not set | 108 | # CONFIG_KALLSYMS is not set |
| 109 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 103 | CONFIG_HOTPLUG=y | 110 | CONFIG_HOTPLUG=y |
| 104 | CONFIG_PRINTK=y | 111 | CONFIG_PRINTK=y |
| 105 | CONFIG_BUG=y | 112 | CONFIG_BUG=y |
| 106 | CONFIG_ELF_CORE=y | 113 | CONFIG_ELF_CORE=y |
| 107 | CONFIG_COMPAT_BRK=y | ||
| 108 | CONFIG_BASE_FULL=y | 114 | CONFIG_BASE_FULL=y |
| 109 | CONFIG_FUTEX=y | 115 | CONFIG_FUTEX=y |
| 110 | CONFIG_ANON_INODES=y | ||
| 111 | # CONFIG_EPOLL is not set | 116 | # CONFIG_EPOLL is not set |
| 112 | CONFIG_SIGNALFD=y | 117 | CONFIG_SIGNALFD=y |
| 113 | CONFIG_TIMERFD=y | 118 | CONFIG_TIMERFD=y |
| @@ -117,10 +122,12 @@ CONFIG_AIO=y | |||
| 117 | CONFIG_VM_EVENT_COUNTERS=y | 122 | CONFIG_VM_EVENT_COUNTERS=y |
| 118 | CONFIG_PCI_QUIRKS=y | 123 | CONFIG_PCI_QUIRKS=y |
| 119 | CONFIG_SLUB_DEBUG=y | 124 | CONFIG_SLUB_DEBUG=y |
| 125 | CONFIG_COMPAT_BRK=y | ||
| 120 | # CONFIG_SLAB is not set | 126 | # CONFIG_SLAB is not set |
| 121 | CONFIG_SLUB=y | 127 | CONFIG_SLUB=y |
| 122 | # CONFIG_SLOB is not set | 128 | # CONFIG_SLOB is not set |
| 123 | # CONFIG_PROFILING is not set | 129 | # CONFIG_PROFILING is not set |
| 130 | # CONFIG_MARKERS is not set | ||
| 124 | CONFIG_HAVE_OPROFILE=y | 131 | CONFIG_HAVE_OPROFILE=y |
| 125 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 132 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 126 | CONFIG_HAVE_IOREMAP_PROT=y | 133 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -128,6 +135,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 128 | CONFIG_HAVE_KRETPROBES=y | 135 | CONFIG_HAVE_KRETPROBES=y |
| 129 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 136 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 130 | CONFIG_HAVE_CLK=y | 137 | CONFIG_HAVE_CLK=y |
| 138 | # CONFIG_SLOW_WORK is not set | ||
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 132 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
| 133 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| @@ -140,7 +148,6 @@ CONFIG_MODULE_UNLOAD=y | |||
| 140 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 148 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 141 | CONFIG_BLOCK=y | 149 | CONFIG_BLOCK=y |
| 142 | # CONFIG_LBD is not set | 150 | # CONFIG_LBD is not set |
| 143 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 144 | # CONFIG_BLK_DEV_BSG is not set | 151 | # CONFIG_BLK_DEV_BSG is not set |
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | 152 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 146 | 153 | ||
| @@ -161,8 +168,6 @@ CONFIG_FREEZER=y | |||
| 161 | # | 168 | # |
| 162 | # Platform support | 169 | # Platform support |
| 163 | # | 170 | # |
| 164 | CONFIG_PPC_MULTIPLATFORM=y | ||
| 165 | CONFIG_CLASSIC32=y | ||
| 166 | # CONFIG_PPC_CHRP is not set | 171 | # CONFIG_PPC_CHRP is not set |
| 167 | # CONFIG_MPC5121_ADS is not set | 172 | # CONFIG_MPC5121_ADS is not set |
| 168 | # CONFIG_MPC5121_GENERIC is not set | 173 | # CONFIG_MPC5121_GENERIC is not set |
| @@ -170,6 +175,7 @@ CONFIG_PPC_MPC52xx=y | |||
| 170 | CONFIG_PPC_MPC5200_SIMPLE=y | 175 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 171 | # CONFIG_PPC_EFIKA is not set | 176 | # CONFIG_PPC_EFIKA is not set |
| 172 | CONFIG_PPC_LITE5200=y | 177 | CONFIG_PPC_LITE5200=y |
| 178 | # CONFIG_PPC_MEDIA5200 is not set | ||
| 173 | # CONFIG_PPC_MPC5200_BUGFIX is not set | 179 | # CONFIG_PPC_MPC5200_BUGFIX is not set |
| 174 | # CONFIG_PPC_MPC5200_GPIO is not set | 180 | # CONFIG_PPC_MPC5200_GPIO is not set |
| 175 | # CONFIG_PPC_PMAC is not set | 181 | # CONFIG_PPC_PMAC is not set |
| @@ -180,6 +186,8 @@ CONFIG_PPC_LITE5200=y | |||
| 180 | # CONFIG_PPC_83xx is not set | 186 | # CONFIG_PPC_83xx is not set |
| 181 | # CONFIG_PPC_86xx is not set | 187 | # CONFIG_PPC_86xx is not set |
| 182 | # CONFIG_EMBEDDED6xx is not set | 188 | # CONFIG_EMBEDDED6xx is not set |
| 189 | # CONFIG_AMIGAONE is not set | ||
| 190 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
| 183 | # CONFIG_IPIC is not set | 191 | # CONFIG_IPIC is not set |
| 184 | # CONFIG_MPIC is not set | 192 | # CONFIG_MPIC is not set |
| 185 | # CONFIG_MPIC_WEIRD is not set | 193 | # CONFIG_MPIC_WEIRD is not set |
| @@ -241,9 +249,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 241 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| 242 | CONFIG_VIRT_TO_BUS=y | 250 | CONFIG_VIRT_TO_BUS=y |
| 243 | CONFIG_UNEVICTABLE_LRU=y | 251 | CONFIG_UNEVICTABLE_LRU=y |
| 252 | CONFIG_HAVE_MLOCK=y | ||
| 253 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 244 | CONFIG_PPC_4K_PAGES=y | 254 | CONFIG_PPC_4K_PAGES=y |
| 245 | # CONFIG_PPC_16K_PAGES is not set | 255 | # CONFIG_PPC_16K_PAGES is not set |
| 246 | # CONFIG_PPC_64K_PAGES is not set | 256 | # CONFIG_PPC_64K_PAGES is not set |
| 257 | # CONFIG_PPC_256K_PAGES is not set | ||
| 247 | CONFIG_FORCE_MAX_ZONEORDER=11 | 258 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 248 | CONFIG_PROC_DEVICETREE=y | 259 | CONFIG_PROC_DEVICETREE=y |
| 249 | # CONFIG_CMDLINE_BOOL is not set | 260 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -272,6 +283,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 272 | CONFIG_PCI_LEGACY=y | 283 | CONFIG_PCI_LEGACY=y |
| 273 | # CONFIG_PCI_DEBUG is not set | 284 | # CONFIG_PCI_DEBUG is not set |
| 274 | # CONFIG_PCI_STUB is not set | 285 | # CONFIG_PCI_STUB is not set |
| 286 | # CONFIG_PCI_IOV is not set | ||
| 275 | # CONFIG_PCCARD is not set | 287 | # CONFIG_PCCARD is not set |
| 276 | # CONFIG_HOTPLUG_PCI is not set | 288 | # CONFIG_HOTPLUG_PCI is not set |
| 277 | # CONFIG_HAS_RAPIDIO is not set | 289 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -294,7 +306,6 @@ CONFIG_NET=y | |||
| 294 | # | 306 | # |
| 295 | # Networking options | 307 | # Networking options |
| 296 | # | 308 | # |
| 297 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 298 | CONFIG_PACKET=y | 309 | CONFIG_PACKET=y |
| 299 | # CONFIG_PACKET_MMAP is not set | 310 | # CONFIG_PACKET_MMAP is not set |
| 300 | CONFIG_UNIX=y | 311 | CONFIG_UNIX=y |
| @@ -350,6 +361,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 350 | # CONFIG_LAPB is not set | 361 | # CONFIG_LAPB is not set |
| 351 | # CONFIG_ECONET is not set | 362 | # CONFIG_ECONET is not set |
| 352 | # CONFIG_WAN_ROUTER is not set | 363 | # CONFIG_WAN_ROUTER is not set |
| 364 | # CONFIG_PHONET is not set | ||
| 353 | # CONFIG_NET_SCHED is not set | 365 | # CONFIG_NET_SCHED is not set |
| 354 | # CONFIG_DCB is not set | 366 | # CONFIG_DCB is not set |
| 355 | 367 | ||
| @@ -362,7 +374,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 362 | # CONFIG_IRDA is not set | 374 | # CONFIG_IRDA is not set |
| 363 | # CONFIG_BT is not set | 375 | # CONFIG_BT is not set |
| 364 | # CONFIG_AF_RXRPC is not set | 376 | # CONFIG_AF_RXRPC is not set |
| 365 | # CONFIG_PHONET is not set | ||
| 366 | # CONFIG_WIRELESS is not set | 377 | # CONFIG_WIRELESS is not set |
| 367 | # CONFIG_WIMAX is not set | 378 | # CONFIG_WIMAX is not set |
| 368 | # CONFIG_RFKILL is not set | 379 | # CONFIG_RFKILL is not set |
| @@ -412,6 +423,7 @@ CONFIG_MISC_DEVICES=y | |||
| 412 | # CONFIG_ICS932S401 is not set | 423 | # CONFIG_ICS932S401 is not set |
| 413 | # CONFIG_ENCLOSURE_SERVICES is not set | 424 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 414 | # CONFIG_HP_ILO is not set | 425 | # CONFIG_HP_ILO is not set |
| 426 | # CONFIG_ISL29003 is not set | ||
| 415 | # CONFIG_C2PORT is not set | 427 | # CONFIG_C2PORT is not set |
| 416 | 428 | ||
| 417 | # | 429 | # |
| @@ -477,9 +489,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 477 | # CONFIG_MEGARAID_NEWGEN is not set | 489 | # CONFIG_MEGARAID_NEWGEN is not set |
| 478 | # CONFIG_MEGARAID_LEGACY is not set | 490 | # CONFIG_MEGARAID_LEGACY is not set |
| 479 | # CONFIG_MEGARAID_SAS is not set | 491 | # CONFIG_MEGARAID_SAS is not set |
| 492 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 480 | # CONFIG_SCSI_HPTIOP is not set | 493 | # CONFIG_SCSI_HPTIOP is not set |
| 481 | # CONFIG_SCSI_BUSLOGIC is not set | 494 | # CONFIG_SCSI_BUSLOGIC is not set |
| 482 | # CONFIG_LIBFC is not set | 495 | # CONFIG_LIBFC is not set |
| 496 | # CONFIG_LIBFCOE is not set | ||
| 483 | # CONFIG_FCOE is not set | 497 | # CONFIG_FCOE is not set |
| 484 | # CONFIG_SCSI_DMX3191D is not set | 498 | # CONFIG_SCSI_DMX3191D is not set |
| 485 | # CONFIG_SCSI_EATA is not set | 499 | # CONFIG_SCSI_EATA is not set |
| @@ -502,6 +516,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 502 | # CONFIG_SCSI_DEBUG is not set | 516 | # CONFIG_SCSI_DEBUG is not set |
| 503 | # CONFIG_SCSI_SRP is not set | 517 | # CONFIG_SCSI_SRP is not set |
| 504 | # CONFIG_SCSI_DH is not set | 518 | # CONFIG_SCSI_DH is not set |
| 519 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 505 | CONFIG_ATA=y | 520 | CONFIG_ATA=y |
| 506 | # CONFIG_ATA_NONSTANDARD is not set | 521 | # CONFIG_ATA_NONSTANDARD is not set |
| 507 | CONFIG_SATA_PMP=y | 522 | CONFIG_SATA_PMP=y |
| @@ -578,6 +593,7 @@ CONFIG_PATA_MPC52xx=y | |||
| 578 | # CONFIG_I2O is not set | 593 | # CONFIG_I2O is not set |
| 579 | # CONFIG_MACINTOSH_DRIVERS is not set | 594 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 580 | CONFIG_NETDEVICES=y | 595 | CONFIG_NETDEVICES=y |
| 596 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 581 | # CONFIG_DUMMY is not set | 597 | # CONFIG_DUMMY is not set |
| 582 | # CONFIG_BONDING is not set | 598 | # CONFIG_BONDING is not set |
| 583 | # CONFIG_MACVLAN is not set | 599 | # CONFIG_MACVLAN is not set |
| @@ -611,6 +627,8 @@ CONFIG_NET_ETHERNET=y | |||
| 611 | # CONFIG_SUNGEM is not set | 627 | # CONFIG_SUNGEM is not set |
| 612 | # CONFIG_CASSINI is not set | 628 | # CONFIG_CASSINI is not set |
| 613 | # CONFIG_NET_VENDOR_3COM is not set | 629 | # CONFIG_NET_VENDOR_3COM is not set |
| 630 | # CONFIG_ETHOC is not set | ||
| 631 | # CONFIG_DNET is not set | ||
| 614 | # CONFIG_NET_TULIP is not set | 632 | # CONFIG_NET_TULIP is not set |
| 615 | # CONFIG_HP100 is not set | 633 | # CONFIG_HP100 is not set |
| 616 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 634 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -632,6 +650,7 @@ CONFIG_NETDEV_1000=y | |||
| 632 | # CONFIG_E1000E is not set | 650 | # CONFIG_E1000E is not set |
| 633 | # CONFIG_IP1000 is not set | 651 | # CONFIG_IP1000 is not set |
| 634 | # CONFIG_IGB is not set | 652 | # CONFIG_IGB is not set |
| 653 | # CONFIG_IGBVF is not set | ||
| 635 | # CONFIG_NS83820 is not set | 654 | # CONFIG_NS83820 is not set |
| 636 | # CONFIG_HAMACHI is not set | 655 | # CONFIG_HAMACHI is not set |
| 637 | # CONFIG_YELLOWFIN is not set | 656 | # CONFIG_YELLOWFIN is not set |
| @@ -642,10 +661,10 @@ CONFIG_NETDEV_1000=y | |||
| 642 | # CONFIG_VIA_VELOCITY is not set | 661 | # CONFIG_VIA_VELOCITY is not set |
| 643 | # CONFIG_TIGON3 is not set | 662 | # CONFIG_TIGON3 is not set |
| 644 | # CONFIG_BNX2 is not set | 663 | # CONFIG_BNX2 is not set |
| 645 | # CONFIG_MV643XX_ETH is not set | ||
| 646 | # CONFIG_QLA3XXX is not set | 664 | # CONFIG_QLA3XXX is not set |
| 647 | # CONFIG_ATL1 is not set | 665 | # CONFIG_ATL1 is not set |
| 648 | # CONFIG_ATL1E is not set | 666 | # CONFIG_ATL1E is not set |
| 667 | # CONFIG_ATL1C is not set | ||
| 649 | # CONFIG_JME is not set | 668 | # CONFIG_JME is not set |
| 650 | CONFIG_NETDEV_10000=y | 669 | CONFIG_NETDEV_10000=y |
| 651 | # CONFIG_CHELSIO_T1 is not set | 670 | # CONFIG_CHELSIO_T1 is not set |
| @@ -655,6 +674,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 655 | # CONFIG_IXGBE is not set | 674 | # CONFIG_IXGBE is not set |
| 656 | # CONFIG_IXGB is not set | 675 | # CONFIG_IXGB is not set |
| 657 | # CONFIG_S2IO is not set | 676 | # CONFIG_S2IO is not set |
| 677 | # CONFIG_VXGE is not set | ||
| 658 | # CONFIG_MYRI10GE is not set | 678 | # CONFIG_MYRI10GE is not set |
| 659 | # CONFIG_NETXEN_NIC is not set | 679 | # CONFIG_NETXEN_NIC is not set |
| 660 | # CONFIG_NIU is not set | 680 | # CONFIG_NIU is not set |
| @@ -664,6 +684,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 664 | # CONFIG_BNX2X is not set | 684 | # CONFIG_BNX2X is not set |
| 665 | # CONFIG_QLGE is not set | 685 | # CONFIG_QLGE is not set |
| 666 | # CONFIG_SFC is not set | 686 | # CONFIG_SFC is not set |
| 687 | # CONFIG_BE2NET is not set | ||
| 667 | # CONFIG_TR is not set | 688 | # CONFIG_TR is not set |
| 668 | 689 | ||
| 669 | # | 690 | # |
| @@ -671,7 +692,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 671 | # | 692 | # |
| 672 | # CONFIG_WLAN_PRE80211 is not set | 693 | # CONFIG_WLAN_PRE80211 is not set |
| 673 | # CONFIG_WLAN_80211 is not set | 694 | # CONFIG_WLAN_80211 is not set |
| 674 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 675 | 695 | ||
| 676 | # | 696 | # |
| 677 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 697 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -795,7 +815,6 @@ CONFIG_I2C_MPC=y | |||
| 795 | # CONFIG_SENSORS_PCF8574 is not set | 815 | # CONFIG_SENSORS_PCF8574 is not set |
| 796 | # CONFIG_PCF8575 is not set | 816 | # CONFIG_PCF8575 is not set |
| 797 | # CONFIG_SENSORS_PCA9539 is not set | 817 | # CONFIG_SENSORS_PCA9539 is not set |
| 798 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 799 | # CONFIG_SENSORS_MAX6875 is not set | 818 | # CONFIG_SENSORS_MAX6875 is not set |
| 800 | # CONFIG_SENSORS_TSL2550 is not set | 819 | # CONFIG_SENSORS_TSL2550 is not set |
| 801 | # CONFIG_I2C_DEBUG_CORE is not set | 820 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -876,7 +895,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 876 | # | 895 | # |
| 877 | 896 | ||
| 878 | # | 897 | # |
| 879 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 898 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 880 | # | 899 | # |
| 881 | # CONFIG_USB_GADGET is not set | 900 | # CONFIG_USB_GADGET is not set |
| 882 | 901 | ||
| @@ -892,6 +911,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 892 | # CONFIG_EDAC is not set | 911 | # CONFIG_EDAC is not set |
| 893 | # CONFIG_RTC_CLASS is not set | 912 | # CONFIG_RTC_CLASS is not set |
| 894 | # CONFIG_DMADEVICES is not set | 913 | # CONFIG_DMADEVICES is not set |
| 914 | # CONFIG_AUXDISPLAY is not set | ||
| 895 | # CONFIG_UIO is not set | 915 | # CONFIG_UIO is not set |
| 896 | # CONFIG_STAGING is not set | 916 | # CONFIG_STAGING is not set |
| 897 | 917 | ||
| @@ -902,6 +922,7 @@ CONFIG_EXT2_FS=y | |||
| 902 | # CONFIG_EXT2_FS_XATTR is not set | 922 | # CONFIG_EXT2_FS_XATTR is not set |
| 903 | # CONFIG_EXT2_FS_XIP is not set | 923 | # CONFIG_EXT2_FS_XIP is not set |
| 904 | CONFIG_EXT3_FS=y | 924 | CONFIG_EXT3_FS=y |
| 925 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 905 | CONFIG_EXT3_FS_XATTR=y | 926 | CONFIG_EXT3_FS_XATTR=y |
| 906 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 927 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 907 | # CONFIG_EXT3_FS_SECURITY is not set | 928 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -924,6 +945,11 @@ CONFIG_INOTIFY_USER=y | |||
| 924 | # CONFIG_FUSE_FS is not set | 945 | # CONFIG_FUSE_FS is not set |
| 925 | 946 | ||
| 926 | # | 947 | # |
| 948 | # Caches | ||
| 949 | # | ||
| 950 | # CONFIG_FSCACHE is not set | ||
| 951 | |||
| 952 | # | ||
| 927 | # CD-ROM/DVD Filesystems | 953 | # CD-ROM/DVD Filesystems |
| 928 | # | 954 | # |
| 929 | # CONFIG_ISO9660_FS is not set | 955 | # CONFIG_ISO9660_FS is not set |
| @@ -966,6 +992,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 966 | # CONFIG_ROMFS_FS is not set | 992 | # CONFIG_ROMFS_FS is not set |
| 967 | # CONFIG_SYSV_FS is not set | 993 | # CONFIG_SYSV_FS is not set |
| 968 | # CONFIG_UFS_FS is not set | 994 | # CONFIG_UFS_FS is not set |
| 995 | # CONFIG_NILFS2_FS is not set | ||
| 969 | CONFIG_NETWORK_FILESYSTEMS=y | 996 | CONFIG_NETWORK_FILESYSTEMS=y |
| 970 | CONFIG_NFS_FS=y | 997 | CONFIG_NFS_FS=y |
| 971 | CONFIG_NFS_V3=y | 998 | CONFIG_NFS_V3=y |
| @@ -978,7 +1005,6 @@ CONFIG_LOCKD_V4=y | |||
| 978 | CONFIG_NFS_COMMON=y | 1005 | CONFIG_NFS_COMMON=y |
| 979 | CONFIG_SUNRPC=y | 1006 | CONFIG_SUNRPC=y |
| 980 | CONFIG_SUNRPC_GSS=y | 1007 | CONFIG_SUNRPC_GSS=y |
| 981 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 982 | CONFIG_RPCSEC_GSS_KRB5=y | 1008 | CONFIG_RPCSEC_GSS_KRB5=y |
| 983 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1009 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 984 | # CONFIG_SMB_FS is not set | 1010 | # CONFIG_SMB_FS is not set |
| @@ -994,6 +1020,7 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 994 | CONFIG_MSDOS_PARTITION=y | 1020 | CONFIG_MSDOS_PARTITION=y |
| 995 | # CONFIG_NLS is not set | 1021 | # CONFIG_NLS is not set |
| 996 | # CONFIG_DLM is not set | 1022 | # CONFIG_DLM is not set |
| 1023 | # CONFIG_BINARY_PRINTF is not set | ||
| 997 | 1024 | ||
| 998 | # | 1025 | # |
| 999 | # Library routines | 1026 | # Library routines |
| @@ -1007,11 +1034,13 @@ CONFIG_GENERIC_FIND_LAST_BIT=y | |||
| 1007 | CONFIG_CRC32=y | 1034 | CONFIG_CRC32=y |
| 1008 | # CONFIG_CRC7 is not set | 1035 | # CONFIG_CRC7 is not set |
| 1009 | # CONFIG_LIBCRC32C is not set | 1036 | # CONFIG_LIBCRC32C is not set |
| 1010 | CONFIG_PLIST=y | 1037 | CONFIG_ZLIB_INFLATE=y |
| 1038 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1011 | CONFIG_HAS_IOMEM=y | 1039 | CONFIG_HAS_IOMEM=y |
| 1012 | CONFIG_HAS_IOPORT=y | 1040 | CONFIG_HAS_IOPORT=y |
| 1013 | CONFIG_HAS_DMA=y | 1041 | CONFIG_HAS_DMA=y |
| 1014 | CONFIG_HAVE_LMB=y | 1042 | CONFIG_HAVE_LMB=y |
| 1043 | CONFIG_NLATTR=y | ||
| 1015 | 1044 | ||
| 1016 | # | 1045 | # |
| 1017 | # Kernel hacking | 1046 | # Kernel hacking |
| @@ -1029,6 +1058,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1029 | CONFIG_DETECT_SOFTLOCKUP=y | 1058 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1030 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1059 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1031 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1060 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1061 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1062 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1063 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1032 | CONFIG_SCHED_DEBUG=y | 1064 | CONFIG_SCHED_DEBUG=y |
| 1033 | # CONFIG_SCHEDSTATS is not set | 1065 | # CONFIG_SCHEDSTATS is not set |
| 1034 | # CONFIG_TIMER_STATS is not set | 1066 | # CONFIG_TIMER_STATS is not set |
| @@ -1057,9 +1089,12 @@ CONFIG_DEBUG_INFO=y | |||
| 1057 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1089 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1058 | # CONFIG_FAULT_INJECTION is not set | 1090 | # CONFIG_FAULT_INJECTION is not set |
| 1059 | # CONFIG_LATENCYTOP is not set | 1091 | # CONFIG_LATENCYTOP is not set |
| 1092 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1060 | CONFIG_HAVE_FUNCTION_TRACER=y | 1093 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1094 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1061 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1095 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1062 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1096 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1097 | CONFIG_TRACING_SUPPORT=y | ||
| 1063 | 1098 | ||
| 1064 | # | 1099 | # |
| 1065 | # Tracers | 1100 | # Tracers |
| @@ -1067,17 +1102,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1067 | # CONFIG_FUNCTION_TRACER is not set | 1102 | # CONFIG_FUNCTION_TRACER is not set |
| 1068 | # CONFIG_SCHED_TRACER is not set | 1103 | # CONFIG_SCHED_TRACER is not set |
| 1069 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1104 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1105 | # CONFIG_EVENT_TRACER is not set | ||
| 1070 | # CONFIG_BOOT_TRACER is not set | 1106 | # CONFIG_BOOT_TRACER is not set |
| 1071 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1107 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1072 | # CONFIG_STACK_TRACER is not set | 1108 | # CONFIG_STACK_TRACER is not set |
| 1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1109 | # CONFIG_KMEMTRACE is not set |
| 1110 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1111 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1074 | # CONFIG_SAMPLES is not set | 1112 | # CONFIG_SAMPLES is not set |
| 1075 | CONFIG_HAVE_ARCH_KGDB=y | 1113 | CONFIG_HAVE_ARCH_KGDB=y |
| 1076 | # CONFIG_KGDB is not set | 1114 | # CONFIG_KGDB is not set |
| 1077 | CONFIG_PRINT_STACK_DEPTH=64 | 1115 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1078 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1116 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1079 | # CONFIG_DEBUG_STACK_USAGE is not set | 1117 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1080 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1081 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1118 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1082 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1119 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1083 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1120 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| @@ -1108,10 +1145,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1108 | CONFIG_CRYPTO_HASH=y | 1145 | CONFIG_CRYPTO_HASH=y |
| 1109 | CONFIG_CRYPTO_HASH2=y | 1146 | CONFIG_CRYPTO_HASH2=y |
| 1110 | CONFIG_CRYPTO_RNG2=y | 1147 | CONFIG_CRYPTO_RNG2=y |
| 1148 | CONFIG_CRYPTO_PCOMP=y | ||
| 1111 | CONFIG_CRYPTO_MANAGER=y | 1149 | CONFIG_CRYPTO_MANAGER=y |
| 1112 | CONFIG_CRYPTO_MANAGER2=y | 1150 | CONFIG_CRYPTO_MANAGER2=y |
| 1113 | # CONFIG_CRYPTO_GF128MUL is not set | 1151 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1114 | # CONFIG_CRYPTO_NULL is not set | 1152 | # CONFIG_CRYPTO_NULL is not set |
| 1153 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1115 | # CONFIG_CRYPTO_CRYPTD is not set | 1154 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1116 | # CONFIG_CRYPTO_AUTHENC is not set | 1155 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1117 | # CONFIG_CRYPTO_TEST is not set | 1156 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1180,6 +1219,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1180 | # Compression | 1219 | # Compression |
| 1181 | # | 1220 | # |
| 1182 | # CONFIG_CRYPTO_DEFLATE is not set | 1221 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1222 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1183 | # CONFIG_CRYPTO_LZO is not set | 1223 | # CONFIG_CRYPTO_LZO is not set |
| 1184 | 1224 | ||
| 1185 | # | 1225 | # |
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index fb10f22fd0d..07b6b266ea9 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 21:42:29 2009 | 4 | # Sat Apr 18 00:48:22 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_6xx=y | |||
| 14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_BOOK3S=y | ||
| 17 | CONFIG_PPC_FPU=y | 18 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | 19 | # CONFIG_ALTIVEC is not set |
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| @@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y | |||
| 54 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 55 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
| 56 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
| 58 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 58 | 60 | ||
| 59 | # | 61 | # |
| @@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 94 | # CONFIG_NAMESPACES is not set | 96 | # CONFIG_NAMESPACES is not set |
| 95 | CONFIG_BLK_DEV_INITRD=y | 97 | CONFIG_BLK_DEV_INITRD=y |
| 96 | CONFIG_INITRAMFS_SOURCE="" | 98 | CONFIG_INITRAMFS_SOURCE="" |
| 99 | CONFIG_RD_GZIP=y | ||
| 100 | # CONFIG_RD_BZIP2 is not set | ||
| 101 | # CONFIG_RD_LZMA is not set | ||
| 97 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 102 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 98 | CONFIG_SYSCTL=y | 103 | CONFIG_SYSCTL=y |
| 104 | CONFIG_ANON_INODES=y | ||
| 99 | CONFIG_EMBEDDED=y | 105 | CONFIG_EMBEDDED=y |
| 100 | # CONFIG_SYSCTL_SYSCALL is not set | 106 | # CONFIG_SYSCTL_SYSCALL is not set |
| 101 | # CONFIG_KALLSYMS is not set | 107 | # CONFIG_KALLSYMS is not set |
| 108 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 102 | CONFIG_HOTPLUG=y | 109 | CONFIG_HOTPLUG=y |
| 103 | CONFIG_PRINTK=y | 110 | CONFIG_PRINTK=y |
| 104 | CONFIG_BUG=y | 111 | CONFIG_BUG=y |
| 105 | CONFIG_ELF_CORE=y | 112 | CONFIG_ELF_CORE=y |
| 106 | CONFIG_COMPAT_BRK=y | ||
| 107 | CONFIG_BASE_FULL=y | 113 | CONFIG_BASE_FULL=y |
| 108 | CONFIG_FUTEX=y | 114 | CONFIG_FUTEX=y |
| 109 | CONFIG_ANON_INODES=y | ||
| 110 | # CONFIG_EPOLL is not set | 115 | # CONFIG_EPOLL is not set |
| 111 | CONFIG_SIGNALFD=y | 116 | CONFIG_SIGNALFD=y |
| 112 | CONFIG_TIMERFD=y | 117 | CONFIG_TIMERFD=y |
| @@ -115,10 +120,12 @@ CONFIG_SHMEM=y | |||
| 115 | CONFIG_AIO=y | 120 | CONFIG_AIO=y |
| 116 | CONFIG_VM_EVENT_COUNTERS=y | 121 | CONFIG_VM_EVENT_COUNTERS=y |
| 117 | CONFIG_SLUB_DEBUG=y | 122 | CONFIG_SLUB_DEBUG=y |
| 123 | CONFIG_COMPAT_BRK=y | ||
| 118 | # CONFIG_SLAB is not set | 124 | # CONFIG_SLAB is not set |
| 119 | CONFIG_SLUB=y | 125 | CONFIG_SLUB=y |
| 120 | # CONFIG_SLOB is not set | 126 | # CONFIG_SLOB is not set |
| 121 | # CONFIG_PROFILING is not set | 127 | # CONFIG_PROFILING is not set |
| 128 | # CONFIG_MARKERS is not set | ||
| 122 | CONFIG_HAVE_OPROFILE=y | 129 | CONFIG_HAVE_OPROFILE=y |
| 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 130 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 124 | CONFIG_HAVE_IOREMAP_PROT=y | 131 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 126 | CONFIG_HAVE_KRETPROBES=y | 133 | CONFIG_HAVE_KRETPROBES=y |
| 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 134 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 128 | CONFIG_HAVE_CLK=y | 135 | CONFIG_HAVE_CLK=y |
| 136 | # CONFIG_SLOW_WORK is not set | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 137 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 138 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 139 | CONFIG_RT_MUTEXES=y |
| @@ -133,7 +141,6 @@ CONFIG_BASE_SMALL=0 | |||
| 133 | # CONFIG_MODULES is not set | 141 | # CONFIG_MODULES is not set |
| 134 | CONFIG_BLOCK=y | 142 | CONFIG_BLOCK=y |
| 135 | # CONFIG_LBD is not set | 143 | # CONFIG_LBD is not set |
| 136 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 137 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 145 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 139 | 146 | ||
| @@ -154,8 +161,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 154 | # | 161 | # |
| 155 | # Platform support | 162 | # Platform support |
| 156 | # | 163 | # |
| 157 | CONFIG_PPC_MULTIPLATFORM=y | ||
| 158 | CONFIG_CLASSIC32=y | ||
| 159 | # CONFIG_PPC_CHRP is not set | 164 | # CONFIG_PPC_CHRP is not set |
| 160 | # CONFIG_MPC5121_ADS is not set | 165 | # CONFIG_MPC5121_ADS is not set |
| 161 | # CONFIG_MPC5121_GENERIC is not set | 166 | # CONFIG_MPC5121_GENERIC is not set |
| @@ -163,6 +168,7 @@ CONFIG_PPC_MPC52xx=y | |||
| 163 | CONFIG_PPC_MPC5200_SIMPLE=y | 168 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 164 | # CONFIG_PPC_EFIKA is not set | 169 | # CONFIG_PPC_EFIKA is not set |
| 165 | # CONFIG_PPC_LITE5200 is not set | 170 | # CONFIG_PPC_LITE5200 is not set |
| 171 | # CONFIG_PPC_MEDIA5200 is not set | ||
| 166 | # CONFIG_PPC_MPC5200_BUGFIX is not set | 172 | # CONFIG_PPC_MPC5200_BUGFIX is not set |
| 167 | # CONFIG_PPC_MPC5200_GPIO is not set | 173 | # CONFIG_PPC_MPC5200_GPIO is not set |
| 168 | # CONFIG_PPC_PMAC is not set | 174 | # CONFIG_PPC_PMAC is not set |
| @@ -173,6 +179,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 173 | # CONFIG_PPC_83xx is not set | 179 | # CONFIG_PPC_83xx is not set |
| 174 | # CONFIG_PPC_86xx is not set | 180 | # CONFIG_PPC_86xx is not set |
| 175 | # CONFIG_EMBEDDED6xx is not set | 181 | # CONFIG_EMBEDDED6xx is not set |
| 182 | # CONFIG_AMIGAONE is not set | ||
| 183 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
| 176 | # CONFIG_IPIC is not set | 184 | # CONFIG_IPIC is not set |
| 177 | # CONFIG_MPIC is not set | 185 | # CONFIG_MPIC is not set |
| 178 | # CONFIG_MPIC_WEIRD is not set | 186 | # CONFIG_MPIC_WEIRD is not set |
| @@ -233,9 +241,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 233 | CONFIG_BOUNCE=y | 241 | CONFIG_BOUNCE=y |
| 234 | CONFIG_VIRT_TO_BUS=y | 242 | CONFIG_VIRT_TO_BUS=y |
| 235 | CONFIG_UNEVICTABLE_LRU=y | 243 | CONFIG_UNEVICTABLE_LRU=y |
| 244 | CONFIG_HAVE_MLOCK=y | ||
| 245 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 236 | CONFIG_PPC_4K_PAGES=y | 246 | CONFIG_PPC_4K_PAGES=y |
| 237 | # CONFIG_PPC_16K_PAGES is not set | 247 | # CONFIG_PPC_16K_PAGES is not set |
| 238 | # CONFIG_PPC_64K_PAGES is not set | 248 | # CONFIG_PPC_64K_PAGES is not set |
| 249 | # CONFIG_PPC_256K_PAGES is not set | ||
| 239 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 240 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 241 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -276,7 +287,6 @@ CONFIG_NET=y | |||
| 276 | # | 287 | # |
| 277 | # Networking options | 288 | # Networking options |
| 278 | # | 289 | # |
| 279 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 280 | CONFIG_PACKET=y | 290 | CONFIG_PACKET=y |
| 281 | # CONFIG_PACKET_MMAP is not set | 291 | # CONFIG_PACKET_MMAP is not set |
| 282 | CONFIG_UNIX=y | 292 | CONFIG_UNIX=y |
| @@ -332,6 +342,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 332 | # CONFIG_LAPB is not set | 342 | # CONFIG_LAPB is not set |
| 333 | # CONFIG_ECONET is not set | 343 | # CONFIG_ECONET is not set |
| 334 | # CONFIG_WAN_ROUTER is not set | 344 | # CONFIG_WAN_ROUTER is not set |
| 345 | # CONFIG_PHONET is not set | ||
| 335 | # CONFIG_NET_SCHED is not set | 346 | # CONFIG_NET_SCHED is not set |
| 336 | # CONFIG_DCB is not set | 347 | # CONFIG_DCB is not set |
| 337 | 348 | ||
| @@ -344,7 +355,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 344 | # CONFIG_IRDA is not set | 355 | # CONFIG_IRDA is not set |
| 345 | # CONFIG_BT is not set | 356 | # CONFIG_BT is not set |
| 346 | # CONFIG_AF_RXRPC is not set | 357 | # CONFIG_AF_RXRPC is not set |
| 347 | # CONFIG_PHONET is not set | ||
| 348 | # CONFIG_WIRELESS is not set | 358 | # CONFIG_WIRELESS is not set |
| 349 | # CONFIG_WIMAX is not set | 359 | # CONFIG_WIMAX is not set |
| 350 | # CONFIG_RFKILL is not set | 360 | # CONFIG_RFKILL is not set |
| @@ -441,7 +451,6 @@ CONFIG_MTD_ROM=y | |||
| 441 | # LPDDR flash memory drivers | 451 | # LPDDR flash memory drivers |
| 442 | # | 452 | # |
| 443 | # CONFIG_MTD_LPDDR is not set | 453 | # CONFIG_MTD_LPDDR is not set |
| 444 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 445 | 454 | ||
| 446 | # | 455 | # |
| 447 | # UBI - Unsorted block images | 456 | # UBI - Unsorted block images |
| @@ -466,6 +475,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 466 | CONFIG_MISC_DEVICES=y | 475 | CONFIG_MISC_DEVICES=y |
| 467 | # CONFIG_ICS932S401 is not set | 476 | # CONFIG_ICS932S401 is not set |
| 468 | # CONFIG_ENCLOSURE_SERVICES is not set | 477 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 478 | # CONFIG_ISL29003 is not set | ||
| 469 | # CONFIG_C2PORT is not set | 479 | # CONFIG_C2PORT is not set |
| 470 | 480 | ||
| 471 | # | 481 | # |
| @@ -516,8 +526,10 @@ CONFIG_CHR_DEV_SG=y | |||
| 516 | CONFIG_SCSI_LOWLEVEL=y | 526 | CONFIG_SCSI_LOWLEVEL=y |
| 517 | # CONFIG_ISCSI_TCP is not set | 527 | # CONFIG_ISCSI_TCP is not set |
| 518 | # CONFIG_LIBFC is not set | 528 | # CONFIG_LIBFC is not set |
| 529 | # CONFIG_LIBFCOE is not set | ||
| 519 | # CONFIG_SCSI_DEBUG is not set | 530 | # CONFIG_SCSI_DEBUG is not set |
| 520 | # CONFIG_SCSI_DH is not set | 531 | # CONFIG_SCSI_DH is not set |
| 532 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 521 | CONFIG_ATA=y | 533 | CONFIG_ATA=y |
| 522 | # CONFIG_ATA_NONSTANDARD is not set | 534 | # CONFIG_ATA_NONSTANDARD is not set |
| 523 | CONFIG_SATA_PMP=y | 535 | CONFIG_SATA_PMP=y |
| @@ -528,6 +540,7 @@ CONFIG_PATA_MPC52xx=y | |||
| 528 | # CONFIG_MD is not set | 540 | # CONFIG_MD is not set |
| 529 | # CONFIG_MACINTOSH_DRIVERS is not set | 541 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 530 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
| 543 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 531 | # CONFIG_DUMMY is not set | 544 | # CONFIG_DUMMY is not set |
| 532 | # CONFIG_BONDING is not set | 545 | # CONFIG_BONDING is not set |
| 533 | # CONFIG_MACVLAN is not set | 546 | # CONFIG_MACVLAN is not set |
| @@ -556,6 +569,8 @@ CONFIG_ICPLUS_PHY=y | |||
| 556 | CONFIG_MDIO_BITBANG=y | 569 | CONFIG_MDIO_BITBANG=y |
| 557 | CONFIG_NET_ETHERNET=y | 570 | CONFIG_NET_ETHERNET=y |
| 558 | CONFIG_MII=y | 571 | CONFIG_MII=y |
| 572 | # CONFIG_ETHOC is not set | ||
| 573 | # CONFIG_DNET is not set | ||
| 559 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 574 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 560 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 575 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 561 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 576 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -574,7 +589,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 574 | # | 589 | # |
| 575 | # CONFIG_WLAN_PRE80211 is not set | 590 | # CONFIG_WLAN_PRE80211 is not set |
| 576 | # CONFIG_WLAN_80211 is not set | 591 | # CONFIG_WLAN_80211 is not set |
| 577 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 578 | 592 | ||
| 579 | # | 593 | # |
| 580 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 594 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -665,7 +679,6 @@ CONFIG_I2C_MPC=y | |||
| 665 | # CONFIG_SENSORS_PCF8574 is not set | 679 | # CONFIG_SENSORS_PCF8574 is not set |
| 666 | # CONFIG_PCF8575 is not set | 680 | # CONFIG_PCF8575 is not set |
| 667 | # CONFIG_SENSORS_PCA9539 is not set | 681 | # CONFIG_SENSORS_PCA9539 is not set |
| 668 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 669 | # CONFIG_SENSORS_MAX6875 is not set | 682 | # CONFIG_SENSORS_MAX6875 is not set |
| 670 | # CONFIG_SENSORS_TSL2550 is not set | 683 | # CONFIG_SENSORS_TSL2550 is not set |
| 671 | # CONFIG_I2C_DEBUG_CORE is not set | 684 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -696,6 +709,7 @@ CONFIG_HWMON=y | |||
| 696 | # CONFIG_SENSORS_F71805F is not set | 709 | # CONFIG_SENSORS_F71805F is not set |
| 697 | # CONFIG_SENSORS_F71882FG is not set | 710 | # CONFIG_SENSORS_F71882FG is not set |
| 698 | # CONFIG_SENSORS_F75375S is not set | 711 | # CONFIG_SENSORS_F75375S is not set |
| 712 | # CONFIG_SENSORS_G760A is not set | ||
| 699 | # CONFIG_SENSORS_GL518SM is not set | 713 | # CONFIG_SENSORS_GL518SM is not set |
| 700 | # CONFIG_SENSORS_GL520SM is not set | 714 | # CONFIG_SENSORS_GL520SM is not set |
| 701 | # CONFIG_SENSORS_IT87 is not set | 715 | # CONFIG_SENSORS_IT87 is not set |
| @@ -710,11 +724,14 @@ CONFIG_HWMON=y | |||
| 710 | # CONFIG_SENSORS_LM90 is not set | 724 | # CONFIG_SENSORS_LM90 is not set |
| 711 | # CONFIG_SENSORS_LM92 is not set | 725 | # CONFIG_SENSORS_LM92 is not set |
| 712 | # CONFIG_SENSORS_LM93 is not set | 726 | # CONFIG_SENSORS_LM93 is not set |
| 727 | # CONFIG_SENSORS_LTC4215 is not set | ||
| 713 | # CONFIG_SENSORS_LTC4245 is not set | 728 | # CONFIG_SENSORS_LTC4245 is not set |
| 729 | # CONFIG_SENSORS_LM95241 is not set | ||
| 714 | # CONFIG_SENSORS_MAX1619 is not set | 730 | # CONFIG_SENSORS_MAX1619 is not set |
| 715 | # CONFIG_SENSORS_MAX6650 is not set | 731 | # CONFIG_SENSORS_MAX6650 is not set |
| 716 | # CONFIG_SENSORS_PC87360 is not set | 732 | # CONFIG_SENSORS_PC87360 is not set |
| 717 | # CONFIG_SENSORS_PC87427 is not set | 733 | # CONFIG_SENSORS_PC87427 is not set |
| 734 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 718 | # CONFIG_SENSORS_DME1737 is not set | 735 | # CONFIG_SENSORS_DME1737 is not set |
| 719 | # CONFIG_SENSORS_SMSC47M1 is not set | 736 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 720 | # CONFIG_SENSORS_SMSC47M192 is not set | 737 | # CONFIG_SENSORS_SMSC47M192 is not set |
| @@ -800,7 +817,9 @@ CONFIG_LEDS_CLASS=y | |||
| 800 | # | 817 | # |
| 801 | # LED drivers | 818 | # LED drivers |
| 802 | # | 819 | # |
| 820 | # CONFIG_LEDS_LP5521 is not set | ||
| 803 | # CONFIG_LEDS_PCA955X is not set | 821 | # CONFIG_LEDS_PCA955X is not set |
| 822 | # CONFIG_LEDS_BD2802 is not set | ||
| 804 | 823 | ||
| 805 | # | 824 | # |
| 806 | # LED Triggers | 825 | # LED Triggers |
| @@ -810,6 +829,10 @@ CONFIG_LEDS_TRIGGER_TIMER=y | |||
| 810 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 829 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
| 811 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | 830 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set |
| 812 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 831 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
| 832 | |||
| 833 | # | ||
| 834 | # iptables trigger is under Netfilter config (LED target) | ||
| 835 | # | ||
| 813 | # CONFIG_ACCESSIBILITY is not set | 836 | # CONFIG_ACCESSIBILITY is not set |
| 814 | # CONFIG_EDAC is not set | 837 | # CONFIG_EDAC is not set |
| 815 | CONFIG_RTC_LIB=y | 838 | CONFIG_RTC_LIB=y |
| @@ -866,8 +889,9 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 866 | # | 889 | # |
| 867 | # on-CPU RTC drivers | 890 | # on-CPU RTC drivers |
| 868 | # | 891 | # |
| 869 | # CONFIG_RTC_DRV_PPC is not set | 892 | # CONFIG_RTC_DRV_GENERIC is not set |
| 870 | # CONFIG_DMADEVICES is not set | 893 | # CONFIG_DMADEVICES is not set |
| 894 | # CONFIG_AUXDISPLAY is not set | ||
| 871 | # CONFIG_UIO is not set | 895 | # CONFIG_UIO is not set |
| 872 | # CONFIG_STAGING is not set | 896 | # CONFIG_STAGING is not set |
| 873 | 897 | ||
| @@ -878,6 +902,7 @@ CONFIG_EXT2_FS=y | |||
| 878 | # CONFIG_EXT2_FS_XATTR is not set | 902 | # CONFIG_EXT2_FS_XATTR is not set |
| 879 | # CONFIG_EXT2_FS_XIP is not set | 903 | # CONFIG_EXT2_FS_XIP is not set |
| 880 | CONFIG_EXT3_FS=y | 904 | CONFIG_EXT3_FS=y |
| 905 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 881 | CONFIG_EXT3_FS_XATTR=y | 906 | CONFIG_EXT3_FS_XATTR=y |
| 882 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 907 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 883 | # CONFIG_EXT3_FS_SECURITY is not set | 908 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -900,6 +925,11 @@ CONFIG_INOTIFY_USER=y | |||
| 900 | # CONFIG_FUSE_FS is not set | 925 | # CONFIG_FUSE_FS is not set |
| 901 | 926 | ||
| 902 | # | 927 | # |
| 928 | # Caches | ||
| 929 | # | ||
| 930 | # CONFIG_FSCACHE is not set | ||
| 931 | |||
| 932 | # | ||
| 903 | # CD-ROM/DVD Filesystems | 933 | # CD-ROM/DVD Filesystems |
| 904 | # | 934 | # |
| 905 | # CONFIG_ISO9660_FS is not set | 935 | # CONFIG_ISO9660_FS is not set |
| @@ -956,6 +986,7 @@ CONFIG_CRAMFS=y | |||
| 956 | # CONFIG_ROMFS_FS is not set | 986 | # CONFIG_ROMFS_FS is not set |
| 957 | # CONFIG_SYSV_FS is not set | 987 | # CONFIG_SYSV_FS is not set |
| 958 | # CONFIG_UFS_FS is not set | 988 | # CONFIG_UFS_FS is not set |
| 989 | # CONFIG_NILFS2_FS is not set | ||
| 959 | CONFIG_NETWORK_FILESYSTEMS=y | 990 | CONFIG_NETWORK_FILESYSTEMS=y |
| 960 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 961 | CONFIG_NFS_V3=y | 992 | CONFIG_NFS_V3=y |
| @@ -968,7 +999,6 @@ CONFIG_LOCKD_V4=y | |||
| 968 | CONFIG_NFS_COMMON=y | 999 | CONFIG_NFS_COMMON=y |
| 969 | CONFIG_SUNRPC=y | 1000 | CONFIG_SUNRPC=y |
| 970 | CONFIG_SUNRPC_GSS=y | 1001 | CONFIG_SUNRPC_GSS=y |
| 971 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 972 | CONFIG_RPCSEC_GSS_KRB5=y | 1002 | CONFIG_RPCSEC_GSS_KRB5=y |
| 973 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1003 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 974 | # CONFIG_SMB_FS is not set | 1004 | # CONFIG_SMB_FS is not set |
| @@ -1039,6 +1069,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1039 | # CONFIG_NLS_KOI8_U is not set | 1069 | # CONFIG_NLS_KOI8_U is not set |
| 1040 | # CONFIG_NLS_UTF8 is not set | 1070 | # CONFIG_NLS_UTF8 is not set |
| 1041 | # CONFIG_DLM is not set | 1071 | # CONFIG_DLM is not set |
| 1072 | # CONFIG_BINARY_PRINTF is not set | ||
| 1042 | 1073 | ||
| 1043 | # | 1074 | # |
| 1044 | # Library routines | 1075 | # Library routines |
| @@ -1054,11 +1085,12 @@ CONFIG_CRC32=y | |||
| 1054 | # CONFIG_LIBCRC32C is not set | 1085 | # CONFIG_LIBCRC32C is not set |
| 1055 | CONFIG_ZLIB_INFLATE=y | 1086 | CONFIG_ZLIB_INFLATE=y |
| 1056 | CONFIG_ZLIB_DEFLATE=y | 1087 | CONFIG_ZLIB_DEFLATE=y |
| 1057 | CONFIG_PLIST=y | 1088 | CONFIG_DECOMPRESS_GZIP=y |
| 1058 | CONFIG_HAS_IOMEM=y | 1089 | CONFIG_HAS_IOMEM=y |
| 1059 | CONFIG_HAS_IOPORT=y | 1090 | CONFIG_HAS_IOPORT=y |
| 1060 | CONFIG_HAS_DMA=y | 1091 | CONFIG_HAS_DMA=y |
| 1061 | CONFIG_HAVE_LMB=y | 1092 | CONFIG_HAVE_LMB=y |
| 1093 | CONFIG_NLATTR=y | ||
| 1062 | 1094 | ||
| 1063 | # | 1095 | # |
| 1064 | # Kernel hacking | 1096 | # Kernel hacking |
| @@ -1076,6 +1108,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1076 | CONFIG_DETECT_SOFTLOCKUP=y | 1108 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1077 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1109 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1078 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1110 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1111 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1112 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1113 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1079 | CONFIG_SCHED_DEBUG=y | 1114 | CONFIG_SCHED_DEBUG=y |
| 1080 | # CONFIG_SCHEDSTATS is not set | 1115 | # CONFIG_SCHEDSTATS is not set |
| 1081 | # CONFIG_TIMER_STATS is not set | 1116 | # CONFIG_TIMER_STATS is not set |
| @@ -1104,9 +1139,12 @@ CONFIG_DEBUG_INFO=y | |||
| 1104 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1139 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1105 | # CONFIG_FAULT_INJECTION is not set | 1140 | # CONFIG_FAULT_INJECTION is not set |
| 1106 | # CONFIG_LATENCYTOP is not set | 1141 | # CONFIG_LATENCYTOP is not set |
| 1142 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1107 | CONFIG_HAVE_FUNCTION_TRACER=y | 1143 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1144 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1108 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1145 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1109 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1146 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1147 | CONFIG_TRACING_SUPPORT=y | ||
| 1110 | 1148 | ||
| 1111 | # | 1149 | # |
| 1112 | # Tracers | 1150 | # Tracers |
| @@ -1114,17 +1152,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1114 | # CONFIG_FUNCTION_TRACER is not set | 1152 | # CONFIG_FUNCTION_TRACER is not set |
| 1115 | # CONFIG_SCHED_TRACER is not set | 1153 | # CONFIG_SCHED_TRACER is not set |
| 1116 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1154 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1155 | # CONFIG_EVENT_TRACER is not set | ||
| 1117 | # CONFIG_BOOT_TRACER is not set | 1156 | # CONFIG_BOOT_TRACER is not set |
| 1118 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1157 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1119 | # CONFIG_STACK_TRACER is not set | 1158 | # CONFIG_STACK_TRACER is not set |
| 1120 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1159 | # CONFIG_KMEMTRACE is not set |
| 1160 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1161 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1121 | # CONFIG_SAMPLES is not set | 1162 | # CONFIG_SAMPLES is not set |
| 1122 | CONFIG_HAVE_ARCH_KGDB=y | 1163 | CONFIG_HAVE_ARCH_KGDB=y |
| 1123 | # CONFIG_KGDB is not set | 1164 | # CONFIG_KGDB is not set |
| 1124 | CONFIG_PRINT_STACK_DEPTH=64 | 1165 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1125 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1166 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1126 | # CONFIG_DEBUG_STACK_USAGE is not set | 1167 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1127 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1128 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1168 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1129 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1169 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1130 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1170 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| @@ -1155,10 +1195,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1155 | CONFIG_CRYPTO_HASH=y | 1195 | CONFIG_CRYPTO_HASH=y |
| 1156 | CONFIG_CRYPTO_HASH2=y | 1196 | CONFIG_CRYPTO_HASH2=y |
| 1157 | CONFIG_CRYPTO_RNG2=y | 1197 | CONFIG_CRYPTO_RNG2=y |
| 1198 | CONFIG_CRYPTO_PCOMP=y | ||
| 1158 | CONFIG_CRYPTO_MANAGER=y | 1199 | CONFIG_CRYPTO_MANAGER=y |
| 1159 | CONFIG_CRYPTO_MANAGER2=y | 1200 | CONFIG_CRYPTO_MANAGER2=y |
| 1160 | # CONFIG_CRYPTO_GF128MUL is not set | 1201 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1161 | # CONFIG_CRYPTO_NULL is not set | 1202 | # CONFIG_CRYPTO_NULL is not set |
| 1203 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1162 | # CONFIG_CRYPTO_CRYPTD is not set | 1204 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1163 | # CONFIG_CRYPTO_AUTHENC is not set | 1205 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1164 | 1206 | ||
| @@ -1226,6 +1268,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1226 | # Compression | 1268 | # Compression |
| 1227 | # | 1269 | # |
| 1228 | # CONFIG_CRYPTO_DEFLATE is not set | 1270 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1271 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1229 | # CONFIG_CRYPTO_LZO is not set | 1272 | # CONFIG_CRYPTO_LZO is not set |
| 1230 | 1273 | ||
| 1231 | # | 1274 | # |
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index 00944c09a0a..afb1a3d1ef0 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 21:41:33 2009 | 4 | # Sat Apr 18 00:48:42 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_6xx=y | |||
| 14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_BOOK3S=y | ||
| 17 | CONFIG_PPC_FPU=y | 18 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | 19 | # CONFIG_ALTIVEC is not set |
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| @@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y | |||
| 54 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 55 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
| 56 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
| 58 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 58 | 60 | ||
| 59 | # | 61 | # |
| @@ -69,6 +71,7 @@ CONFIG_LOCALVERSION="trunk" | |||
| 69 | CONFIG_SYSVIPC=y | 71 | CONFIG_SYSVIPC=y |
| 70 | CONFIG_SYSVIPC_SYSCTL=y | 72 | CONFIG_SYSVIPC_SYSCTL=y |
| 71 | CONFIG_POSIX_MQUEUE=y | 73 | CONFIG_POSIX_MQUEUE=y |
| 74 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 72 | # CONFIG_BSD_PROCESS_ACCT is not set | 75 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 73 | # CONFIG_TASKSTATS is not set | 76 | # CONFIG_TASKSTATS is not set |
| 74 | # CONFIG_AUDIT is not set | 77 | # CONFIG_AUDIT is not set |
| @@ -97,18 +100,18 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 97 | # CONFIG_BLK_DEV_INITRD is not set | 100 | # CONFIG_BLK_DEV_INITRD is not set |
| 98 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 101 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 99 | CONFIG_SYSCTL=y | 102 | CONFIG_SYSCTL=y |
| 103 | CONFIG_ANON_INODES=y | ||
| 100 | CONFIG_EMBEDDED=y | 104 | CONFIG_EMBEDDED=y |
| 101 | # CONFIG_SYSCTL_SYSCALL is not set | 105 | # CONFIG_SYSCTL_SYSCALL is not set |
| 102 | CONFIG_KALLSYMS=y | 106 | CONFIG_KALLSYMS=y |
| 103 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 107 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 108 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 104 | CONFIG_HOTPLUG=y | 109 | CONFIG_HOTPLUG=y |
| 105 | CONFIG_PRINTK=y | 110 | CONFIG_PRINTK=y |
| 106 | CONFIG_BUG=y | 111 | CONFIG_BUG=y |
| 107 | CONFIG_ELF_CORE=y | 112 | CONFIG_ELF_CORE=y |
| 108 | CONFIG_COMPAT_BRK=y | ||
| 109 | CONFIG_BASE_FULL=y | 113 | CONFIG_BASE_FULL=y |
| 110 | CONFIG_FUTEX=y | 114 | CONFIG_FUTEX=y |
| 111 | CONFIG_ANON_INODES=y | ||
| 112 | CONFIG_EPOLL=y | 115 | CONFIG_EPOLL=y |
| 113 | CONFIG_SIGNALFD=y | 116 | CONFIG_SIGNALFD=y |
| 114 | CONFIG_TIMERFD=y | 117 | CONFIG_TIMERFD=y |
| @@ -117,10 +120,12 @@ CONFIG_SHMEM=y | |||
| 117 | CONFIG_AIO=y | 120 | CONFIG_AIO=y |
| 118 | # CONFIG_VM_EVENT_COUNTERS is not set | 121 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 119 | CONFIG_PCI_QUIRKS=y | 122 | CONFIG_PCI_QUIRKS=y |
| 123 | CONFIG_COMPAT_BRK=y | ||
| 120 | CONFIG_SLAB=y | 124 | CONFIG_SLAB=y |
| 121 | # CONFIG_SLUB is not set | 125 | # CONFIG_SLUB is not set |
| 122 | # CONFIG_SLOB is not set | 126 | # CONFIG_SLOB is not set |
| 123 | # CONFIG_PROFILING is not set | 127 | # CONFIG_PROFILING is not set |
| 128 | # CONFIG_MARKERS is not set | ||
| 124 | CONFIG_HAVE_OPROFILE=y | 129 | CONFIG_HAVE_OPROFILE=y |
| 125 | # CONFIG_KPROBES is not set | 130 | # CONFIG_KPROBES is not set |
| 126 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 131 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| @@ -129,6 +134,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 129 | CONFIG_HAVE_KRETPROBES=y | 134 | CONFIG_HAVE_KRETPROBES=y |
| 130 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 135 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 131 | CONFIG_HAVE_CLK=y | 136 | CONFIG_HAVE_CLK=y |
| 137 | # CONFIG_SLOW_WORK is not set | ||
| 132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 138 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 133 | CONFIG_SLABINFO=y | 139 | CONFIG_SLABINFO=y |
| 134 | CONFIG_RT_MUTEXES=y | 140 | CONFIG_RT_MUTEXES=y |
| @@ -141,7 +147,6 @@ CONFIG_MODULE_UNLOAD=y | |||
| 141 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 147 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 142 | CONFIG_BLOCK=y | 148 | CONFIG_BLOCK=y |
| 143 | # CONFIG_LBD is not set | 149 | # CONFIG_LBD is not set |
| 144 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 145 | # CONFIG_BLK_DEV_BSG is not set | 150 | # CONFIG_BLK_DEV_BSG is not set |
| 146 | # CONFIG_BLK_DEV_INTEGRITY is not set | 151 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 147 | 152 | ||
| @@ -162,8 +167,6 @@ CONFIG_DEFAULT_IOSCHED="noop" | |||
| 162 | # | 167 | # |
| 163 | # Platform support | 168 | # Platform support |
| 164 | # | 169 | # |
| 165 | CONFIG_PPC_MULTIPLATFORM=y | ||
| 166 | CONFIG_CLASSIC32=y | ||
| 167 | # CONFIG_PPC_CHRP is not set | 170 | # CONFIG_PPC_CHRP is not set |
| 168 | # CONFIG_MPC5121_ADS is not set | 171 | # CONFIG_MPC5121_ADS is not set |
| 169 | # CONFIG_MPC5121_GENERIC is not set | 172 | # CONFIG_MPC5121_GENERIC is not set |
| @@ -171,6 +174,7 @@ CONFIG_PPC_MPC52xx=y | |||
| 171 | CONFIG_PPC_MPC5200_SIMPLE=y | 174 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 172 | # CONFIG_PPC_EFIKA is not set | 175 | # CONFIG_PPC_EFIKA is not set |
| 173 | # CONFIG_PPC_LITE5200 is not set | 176 | # CONFIG_PPC_LITE5200 is not set |
| 177 | # CONFIG_PPC_MEDIA5200 is not set | ||
| 174 | # CONFIG_PPC_MPC5200_BUGFIX is not set | 178 | # CONFIG_PPC_MPC5200_BUGFIX is not set |
| 175 | # CONFIG_PPC_MPC5200_GPIO is not set | 179 | # CONFIG_PPC_MPC5200_GPIO is not set |
| 176 | # CONFIG_PPC_PMAC is not set | 180 | # CONFIG_PPC_PMAC is not set |
| @@ -181,6 +185,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 181 | # CONFIG_PPC_83xx is not set | 185 | # CONFIG_PPC_83xx is not set |
| 182 | # CONFIG_PPC_86xx is not set | 186 | # CONFIG_PPC_86xx is not set |
| 183 | # CONFIG_EMBEDDED6xx is not set | 187 | # CONFIG_EMBEDDED6xx is not set |
| 188 | # CONFIG_AMIGAONE is not set | ||
| 189 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
| 184 | # CONFIG_IPIC is not set | 190 | # CONFIG_IPIC is not set |
| 185 | # CONFIG_MPIC is not set | 191 | # CONFIG_MPIC is not set |
| 186 | # CONFIG_MPIC_WEIRD is not set | 192 | # CONFIG_MPIC_WEIRD is not set |
| @@ -242,9 +248,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 242 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
| 243 | CONFIG_VIRT_TO_BUS=y | 249 | CONFIG_VIRT_TO_BUS=y |
| 244 | CONFIG_UNEVICTABLE_LRU=y | 250 | CONFIG_UNEVICTABLE_LRU=y |
| 251 | CONFIG_HAVE_MLOCK=y | ||
| 252 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 245 | CONFIG_PPC_4K_PAGES=y | 253 | CONFIG_PPC_4K_PAGES=y |
| 246 | # CONFIG_PPC_16K_PAGES is not set | 254 | # CONFIG_PPC_16K_PAGES is not set |
| 247 | # CONFIG_PPC_64K_PAGES is not set | 255 | # CONFIG_PPC_64K_PAGES is not set |
| 256 | # CONFIG_PPC_256K_PAGES is not set | ||
| 248 | CONFIG_FORCE_MAX_ZONEORDER=11 | 257 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 249 | CONFIG_PROC_DEVICETREE=y | 258 | CONFIG_PROC_DEVICETREE=y |
| 250 | # CONFIG_CMDLINE_BOOL is not set | 259 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -268,6 +277,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 268 | # CONFIG_PCI_MSI is not set | 277 | # CONFIG_PCI_MSI is not set |
| 269 | CONFIG_PCI_LEGACY=y | 278 | CONFIG_PCI_LEGACY=y |
| 270 | # CONFIG_PCI_STUB is not set | 279 | # CONFIG_PCI_STUB is not set |
| 280 | # CONFIG_PCI_IOV is not set | ||
| 271 | # CONFIG_PCCARD is not set | 281 | # CONFIG_PCCARD is not set |
| 272 | # CONFIG_HOTPLUG_PCI is not set | 282 | # CONFIG_HOTPLUG_PCI is not set |
| 273 | # CONFIG_HAS_RAPIDIO is not set | 283 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -290,7 +300,6 @@ CONFIG_NET=y | |||
| 290 | # | 300 | # |
| 291 | # Networking options | 301 | # Networking options |
| 292 | # | 302 | # |
| 293 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 294 | CONFIG_PACKET=y | 303 | CONFIG_PACKET=y |
| 295 | # CONFIG_PACKET_MMAP is not set | 304 | # CONFIG_PACKET_MMAP is not set |
| 296 | CONFIG_UNIX=y | 305 | CONFIG_UNIX=y |
| @@ -340,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 340 | # CONFIG_LAPB is not set | 349 | # CONFIG_LAPB is not set |
| 341 | # CONFIG_ECONET is not set | 350 | # CONFIG_ECONET is not set |
| 342 | # CONFIG_WAN_ROUTER is not set | 351 | # CONFIG_WAN_ROUTER is not set |
| 352 | # CONFIG_PHONET is not set | ||
| 343 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
| 344 | # CONFIG_DCB is not set | 354 | # CONFIG_DCB is not set |
| 345 | 355 | ||
| @@ -352,7 +362,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 352 | # CONFIG_IRDA is not set | 362 | # CONFIG_IRDA is not set |
| 353 | # CONFIG_BT is not set | 363 | # CONFIG_BT is not set |
| 354 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
| 355 | # CONFIG_PHONET is not set | ||
| 356 | # CONFIG_WIRELESS is not set | 365 | # CONFIG_WIRELESS is not set |
| 357 | # CONFIG_WIMAX is not set | 366 | # CONFIG_WIMAX is not set |
| 358 | # CONFIG_RFKILL is not set | 367 | # CONFIG_RFKILL is not set |
| @@ -451,7 +460,6 @@ CONFIG_MTD_PHYSMAP=y | |||
| 451 | # LPDDR flash memory drivers | 460 | # LPDDR flash memory drivers |
| 452 | # | 461 | # |
| 453 | # CONFIG_MTD_LPDDR is not set | 462 | # CONFIG_MTD_LPDDR is not set |
| 454 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 455 | 463 | ||
| 456 | # | 464 | # |
| 457 | # UBI - Unsorted block images | 465 | # UBI - Unsorted block images |
| @@ -504,6 +512,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 504 | # CONFIG_SCSI_SRP_ATTRS is not set | 512 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 505 | # CONFIG_SCSI_LOWLEVEL is not set | 513 | # CONFIG_SCSI_LOWLEVEL is not set |
| 506 | # CONFIG_SCSI_DH is not set | 514 | # CONFIG_SCSI_DH is not set |
| 515 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 507 | CONFIG_ATA=m | 516 | CONFIG_ATA=m |
| 508 | # CONFIG_ATA_NONSTANDARD is not set | 517 | # CONFIG_ATA_NONSTANDARD is not set |
| 509 | CONFIG_SATA_PMP=y | 518 | CONFIG_SATA_PMP=y |
| @@ -580,6 +589,7 @@ CONFIG_PATA_MPC52xx=m | |||
| 580 | # CONFIG_I2O is not set | 589 | # CONFIG_I2O is not set |
| 581 | # CONFIG_MACINTOSH_DRIVERS is not set | 590 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 582 | CONFIG_NETDEVICES=y | 591 | CONFIG_NETDEVICES=y |
| 592 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 583 | # CONFIG_DUMMY is not set | 593 | # CONFIG_DUMMY is not set |
| 584 | # CONFIG_BONDING is not set | 594 | # CONFIG_BONDING is not set |
| 585 | # CONFIG_MACVLAN is not set | 595 | # CONFIG_MACVLAN is not set |
| @@ -613,6 +623,8 @@ CONFIG_MII=y | |||
| 613 | # CONFIG_SUNGEM is not set | 623 | # CONFIG_SUNGEM is not set |
| 614 | # CONFIG_CASSINI is not set | 624 | # CONFIG_CASSINI is not set |
| 615 | # CONFIG_NET_VENDOR_3COM is not set | 625 | # CONFIG_NET_VENDOR_3COM is not set |
| 626 | # CONFIG_ETHOC is not set | ||
| 627 | # CONFIG_DNET is not set | ||
| 616 | # CONFIG_NET_TULIP is not set | 628 | # CONFIG_NET_TULIP is not set |
| 617 | # CONFIG_HP100 is not set | 629 | # CONFIG_HP100 is not set |
| 618 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 630 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -636,7 +648,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 636 | # | 648 | # |
| 637 | # CONFIG_WLAN_PRE80211 is not set | 649 | # CONFIG_WLAN_PRE80211 is not set |
| 638 | # CONFIG_WLAN_80211 is not set | 650 | # CONFIG_WLAN_80211 is not set |
| 639 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 640 | 651 | ||
| 641 | # | 652 | # |
| 642 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 653 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -702,6 +713,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 702 | # CONFIG_HVC_UDBG is not set | 713 | # CONFIG_HVC_UDBG is not set |
| 703 | # CONFIG_IPMI_HANDLER is not set | 714 | # CONFIG_IPMI_HANDLER is not set |
| 704 | CONFIG_HW_RANDOM=y | 715 | CONFIG_HW_RANDOM=y |
| 716 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 705 | # CONFIG_NVRAM is not set | 717 | # CONFIG_NVRAM is not set |
| 706 | # CONFIG_R3964 is not set | 718 | # CONFIG_R3964 is not set |
| 707 | # CONFIG_APPLICOM is not set | 719 | # CONFIG_APPLICOM is not set |
| @@ -767,7 +779,6 @@ CONFIG_I2C_MPC=y | |||
| 767 | # CONFIG_SENSORS_PCF8574 is not set | 779 | # CONFIG_SENSORS_PCF8574 is not set |
| 768 | # CONFIG_PCF8575 is not set | 780 | # CONFIG_PCF8575 is not set |
| 769 | # CONFIG_SENSORS_PCA9539 is not set | 781 | # CONFIG_SENSORS_PCA9539 is not set |
| 770 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 771 | # CONFIG_SENSORS_MAX6875 is not set | 782 | # CONFIG_SENSORS_MAX6875 is not set |
| 772 | # CONFIG_SENSORS_TSL2550 is not set | 783 | # CONFIG_SENSORS_TSL2550 is not set |
| 773 | # CONFIG_I2C_DEBUG_CORE is not set | 784 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -889,11 +900,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 889 | # CONFIG_USB_TMC is not set | 900 | # CONFIG_USB_TMC is not set |
| 890 | 901 | ||
| 891 | # | 902 | # |
| 892 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 903 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 893 | # | 904 | # |
| 894 | 905 | ||
| 895 | # | 906 | # |
| 896 | # see USB_STORAGE Help for more information | 907 | # also be needed; see USB_STORAGE Help for more info |
| 897 | # | 908 | # |
| 898 | CONFIG_USB_STORAGE=m | 909 | CONFIG_USB_STORAGE=m |
| 899 | # CONFIG_USB_STORAGE_DEBUG is not set | 910 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -934,7 +945,6 @@ CONFIG_USB_STORAGE=m | |||
| 934 | # CONFIG_USB_LED is not set | 945 | # CONFIG_USB_LED is not set |
| 935 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 946 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 936 | # CONFIG_USB_CYTHERM is not set | 947 | # CONFIG_USB_CYTHERM is not set |
| 937 | # CONFIG_USB_PHIDGET is not set | ||
| 938 | # CONFIG_USB_IDMOUSE is not set | 948 | # CONFIG_USB_IDMOUSE is not set |
| 939 | # CONFIG_USB_FTDI_ELAN is not set | 949 | # CONFIG_USB_FTDI_ELAN is not set |
| 940 | # CONFIG_USB_APPLEDISPLAY is not set | 950 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -949,6 +959,7 @@ CONFIG_USB_STORAGE=m | |||
| 949 | # | 959 | # |
| 950 | # OTG and related infrastructure | 960 | # OTG and related infrastructure |
| 951 | # | 961 | # |
| 962 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 952 | # CONFIG_UWB is not set | 963 | # CONFIG_UWB is not set |
| 953 | # CONFIG_MMC is not set | 964 | # CONFIG_MMC is not set |
| 954 | # CONFIG_MEMSTICK is not set | 965 | # CONFIG_MEMSTICK is not set |
| @@ -1007,8 +1018,9 @@ CONFIG_RTC_DRV_PCF8563=m | |||
| 1007 | # | 1018 | # |
| 1008 | # on-CPU RTC drivers | 1019 | # on-CPU RTC drivers |
| 1009 | # | 1020 | # |
| 1010 | # CONFIG_RTC_DRV_PPC is not set | 1021 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1011 | # CONFIG_DMADEVICES is not set | 1022 | # CONFIG_DMADEVICES is not set |
| 1023 | # CONFIG_AUXDISPLAY is not set | ||
| 1012 | # CONFIG_UIO is not set | 1024 | # CONFIG_UIO is not set |
| 1013 | # CONFIG_STAGING is not set | 1025 | # CONFIG_STAGING is not set |
| 1014 | 1026 | ||
| @@ -1019,6 +1031,7 @@ CONFIG_EXT2_FS=m | |||
| 1019 | # CONFIG_EXT2_FS_XATTR is not set | 1031 | # CONFIG_EXT2_FS_XATTR is not set |
| 1020 | # CONFIG_EXT2_FS_XIP is not set | 1032 | # CONFIG_EXT2_FS_XIP is not set |
| 1021 | CONFIG_EXT3_FS=m | 1033 | CONFIG_EXT3_FS=m |
| 1034 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1022 | CONFIG_EXT3_FS_XATTR=y | 1035 | CONFIG_EXT3_FS_XATTR=y |
| 1023 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1036 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1024 | # CONFIG_EXT3_FS_SECURITY is not set | 1037 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -1040,6 +1053,11 @@ CONFIG_FILE_LOCKING=y | |||
| 1040 | # CONFIG_FUSE_FS is not set | 1053 | # CONFIG_FUSE_FS is not set |
| 1041 | 1054 | ||
| 1042 | # | 1055 | # |
| 1056 | # Caches | ||
| 1057 | # | ||
| 1058 | # CONFIG_FSCACHE is not set | ||
| 1059 | |||
| 1060 | # | ||
| 1043 | # CD-ROM/DVD Filesystems | 1061 | # CD-ROM/DVD Filesystems |
| 1044 | # | 1062 | # |
| 1045 | # CONFIG_ISO9660_FS is not set | 1063 | # CONFIG_ISO9660_FS is not set |
| @@ -1096,6 +1114,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1096 | # CONFIG_ROMFS_FS is not set | 1114 | # CONFIG_ROMFS_FS is not set |
| 1097 | # CONFIG_SYSV_FS is not set | 1115 | # CONFIG_SYSV_FS is not set |
| 1098 | # CONFIG_UFS_FS is not set | 1116 | # CONFIG_UFS_FS is not set |
| 1117 | # CONFIG_NILFS2_FS is not set | ||
| 1099 | CONFIG_NETWORK_FILESYSTEMS=y | 1118 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1100 | CONFIG_NFS_FS=y | 1119 | CONFIG_NFS_FS=y |
| 1101 | CONFIG_NFS_V3=y | 1120 | CONFIG_NFS_V3=y |
| @@ -1107,7 +1126,6 @@ CONFIG_LOCKD=y | |||
| 1107 | CONFIG_LOCKD_V4=y | 1126 | CONFIG_LOCKD_V4=y |
| 1108 | CONFIG_NFS_COMMON=y | 1127 | CONFIG_NFS_COMMON=y |
| 1109 | CONFIG_SUNRPC=y | 1128 | CONFIG_SUNRPC=y |
| 1110 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1111 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1129 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1112 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1130 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1113 | # CONFIG_SMB_FS is not set | 1131 | # CONFIG_SMB_FS is not set |
| @@ -1162,6 +1180,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1162 | # CONFIG_NLS_KOI8_U is not set | 1180 | # CONFIG_NLS_KOI8_U is not set |
| 1163 | # CONFIG_NLS_UTF8 is not set | 1181 | # CONFIG_NLS_UTF8 is not set |
| 1164 | # CONFIG_DLM is not set | 1182 | # CONFIG_DLM is not set |
| 1183 | # CONFIG_BINARY_PRINTF is not set | ||
| 1165 | 1184 | ||
| 1166 | # | 1185 | # |
| 1167 | # Library routines | 1186 | # Library routines |
| @@ -1177,11 +1196,11 @@ CONFIG_CRC32=y | |||
| 1177 | # CONFIG_LIBCRC32C is not set | 1196 | # CONFIG_LIBCRC32C is not set |
| 1178 | CONFIG_ZLIB_INFLATE=y | 1197 | CONFIG_ZLIB_INFLATE=y |
| 1179 | CONFIG_ZLIB_DEFLATE=y | 1198 | CONFIG_ZLIB_DEFLATE=y |
| 1180 | CONFIG_PLIST=y | ||
| 1181 | CONFIG_HAS_IOMEM=y | 1199 | CONFIG_HAS_IOMEM=y |
| 1182 | CONFIG_HAS_IOPORT=y | 1200 | CONFIG_HAS_IOPORT=y |
| 1183 | CONFIG_HAS_DMA=y | 1201 | CONFIG_HAS_DMA=y |
| 1184 | CONFIG_HAVE_LMB=y | 1202 | CONFIG_HAVE_LMB=y |
| 1203 | CONFIG_NLATTR=y | ||
| 1185 | 1204 | ||
| 1186 | # | 1205 | # |
| 1187 | # Kernel hacking | 1206 | # Kernel hacking |
| @@ -1200,13 +1219,25 @@ CONFIG_FRAME_WARN=1024 | |||
| 1200 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1219 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1201 | # CONFIG_LATENCYTOP is not set | 1220 | # CONFIG_LATENCYTOP is not set |
| 1202 | CONFIG_HAVE_FUNCTION_TRACER=y | 1221 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1222 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1203 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1223 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1204 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1224 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1225 | CONFIG_TRACING_SUPPORT=y | ||
| 1205 | 1226 | ||
| 1206 | # | 1227 | # |
| 1207 | # Tracers | 1228 | # Tracers |
| 1208 | # | 1229 | # |
| 1209 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1230 | # CONFIG_FUNCTION_TRACER is not set |
| 1231 | # CONFIG_PREEMPT_TRACER is not set | ||
| 1232 | # CONFIG_SCHED_TRACER is not set | ||
| 1233 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1234 | # CONFIG_EVENT_TRACER is not set | ||
| 1235 | # CONFIG_BOOT_TRACER is not set | ||
| 1236 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1237 | # CONFIG_STACK_TRACER is not set | ||
| 1238 | # CONFIG_KMEMTRACE is not set | ||
| 1239 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1240 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1210 | # CONFIG_SAMPLES is not set | 1241 | # CONFIG_SAMPLES is not set |
| 1211 | CONFIG_HAVE_ARCH_KGDB=y | 1242 | CONFIG_HAVE_ARCH_KGDB=y |
| 1212 | CONFIG_PRINT_STACK_DEPTH=64 | 1243 | CONFIG_PRINT_STACK_DEPTH=64 |
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig index 65237ad6f07..8585c7c1286 100644 --- a/arch/powerpc/configs/52xx/tqm5200_defconfig +++ b/arch/powerpc/configs/52xx/tqm5200_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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 21:42:58 2009 | 4 | # Sat Apr 18 00:48:57 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_6xx=y | |||
| 14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_BOOK3S=y | ||
| 17 | CONFIG_PPC_FPU=y | 18 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | 19 | # CONFIG_ALTIVEC is not set |
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| @@ -54,6 +55,7 @@ CONFIG_GENERIC_BUG=y | |||
| 54 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
| 55 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
| 56 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
| 58 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 58 | 60 | ||
| 59 | # | 61 | # |
| @@ -94,19 +96,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 94 | # CONFIG_NAMESPACES is not set | 96 | # CONFIG_NAMESPACES is not set |
| 95 | CONFIG_BLK_DEV_INITRD=y | 97 | CONFIG_BLK_DEV_INITRD=y |
| 96 | CONFIG_INITRAMFS_SOURCE="" | 98 | CONFIG_INITRAMFS_SOURCE="" |
| 99 | CONFIG_RD_GZIP=y | ||
| 100 | # CONFIG_RD_BZIP2 is not set | ||
| 101 | # CONFIG_RD_LZMA is not set | ||
| 97 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 102 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 98 | CONFIG_SYSCTL=y | 103 | CONFIG_SYSCTL=y |
| 104 | CONFIG_ANON_INODES=y | ||
| 99 | CONFIG_EMBEDDED=y | 105 | CONFIG_EMBEDDED=y |
| 100 | # CONFIG_SYSCTL_SYSCALL is not set | 106 | # CONFIG_SYSCTL_SYSCALL is not set |
| 101 | # CONFIG_KALLSYMS is not set | 107 | # CONFIG_KALLSYMS is not set |
| 108 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 102 | CONFIG_HOTPLUG=y | 109 | CONFIG_HOTPLUG=y |
| 103 | CONFIG_PRINTK=y | 110 | CONFIG_PRINTK=y |
| 104 | CONFIG_BUG=y | 111 | CONFIG_BUG=y |
| 105 | CONFIG_ELF_CORE=y | 112 | CONFIG_ELF_CORE=y |
| 106 | CONFIG_COMPAT_BRK=y | ||
| 107 | CONFIG_BASE_FULL=y | 113 | CONFIG_BASE_FULL=y |
| 108 | CONFIG_FUTEX=y | 114 | CONFIG_FUTEX=y |
| 109 | CONFIG_ANON_INODES=y | ||
| 110 | # CONFIG_EPOLL is not set | 115 | # CONFIG_EPOLL is not set |
| 111 | CONFIG_SIGNALFD=y | 116 | CONFIG_SIGNALFD=y |
| 112 | CONFIG_TIMERFD=y | 117 | CONFIG_TIMERFD=y |
| @@ -115,10 +120,12 @@ CONFIG_SHMEM=y | |||
| 115 | CONFIG_AIO=y | 120 | CONFIG_AIO=y |
| 116 | CONFIG_VM_EVENT_COUNTERS=y | 121 | CONFIG_VM_EVENT_COUNTERS=y |
| 117 | CONFIG_SLUB_DEBUG=y | 122 | CONFIG_SLUB_DEBUG=y |
| 123 | CONFIG_COMPAT_BRK=y | ||
| 118 | # CONFIG_SLAB is not set | 124 | # CONFIG_SLAB is not set |
| 119 | CONFIG_SLUB=y | 125 | CONFIG_SLUB=y |
| 120 | # CONFIG_SLOB is not set | 126 | # CONFIG_SLOB is not set |
| 121 | # CONFIG_PROFILING is not set | 127 | # CONFIG_PROFILING is not set |
| 128 | # CONFIG_MARKERS is not set | ||
| 122 | CONFIG_HAVE_OPROFILE=y | 129 | CONFIG_HAVE_OPROFILE=y |
| 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 130 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 124 | CONFIG_HAVE_IOREMAP_PROT=y | 131 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -126,6 +133,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 126 | CONFIG_HAVE_KRETPROBES=y | 133 | CONFIG_HAVE_KRETPROBES=y |
| 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 134 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 128 | CONFIG_HAVE_CLK=y | 135 | CONFIG_HAVE_CLK=y |
| 136 | # CONFIG_SLOW_WORK is not set | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 137 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 138 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 139 | CONFIG_RT_MUTEXES=y |
| @@ -138,7 +146,6 @@ CONFIG_MODVERSIONS=y | |||
| 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 146 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 139 | CONFIG_BLOCK=y | 147 | CONFIG_BLOCK=y |
| 140 | # CONFIG_LBD is not set | 148 | # CONFIG_LBD is not set |
| 141 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 142 | # CONFIG_BLK_DEV_BSG is not set | 149 | # CONFIG_BLK_DEV_BSG is not set |
| 143 | # CONFIG_BLK_DEV_INTEGRITY is not set | 150 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 144 | 151 | ||
| @@ -159,8 +166,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 159 | # | 166 | # |
| 160 | # Platform support | 167 | # Platform support |
| 161 | # | 168 | # |
| 162 | CONFIG_PPC_MULTIPLATFORM=y | ||
| 163 | CONFIG_CLASSIC32=y | ||
| 164 | # CONFIG_PPC_CHRP is not set | 169 | # CONFIG_PPC_CHRP is not set |
| 165 | # CONFIG_MPC5121_ADS is not set | 170 | # CONFIG_MPC5121_ADS is not set |
| 166 | # CONFIG_MPC5121_GENERIC is not set | 171 | # CONFIG_MPC5121_GENERIC is not set |
| @@ -168,6 +173,7 @@ CONFIG_PPC_MPC52xx=y | |||
| 168 | CONFIG_PPC_MPC5200_SIMPLE=y | 173 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 169 | # CONFIG_PPC_EFIKA is not set | 174 | # CONFIG_PPC_EFIKA is not set |
| 170 | # CONFIG_PPC_LITE5200 is not set | 175 | # CONFIG_PPC_LITE5200 is not set |
| 176 | # CONFIG_PPC_MEDIA5200 is not set | ||
| 171 | CONFIG_PPC_MPC5200_BUGFIX=y | 177 | CONFIG_PPC_MPC5200_BUGFIX=y |
| 172 | # CONFIG_PPC_MPC5200_GPIO is not set | 178 | # CONFIG_PPC_MPC5200_GPIO is not set |
| 173 | # CONFIG_PPC_PMAC is not set | 179 | # CONFIG_PPC_PMAC is not set |
| @@ -178,6 +184,8 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
| 178 | # CONFIG_PPC_83xx is not set | 184 | # CONFIG_PPC_83xx is not set |
| 179 | # CONFIG_PPC_86xx is not set | 185 | # CONFIG_PPC_86xx is not set |
| 180 | # CONFIG_EMBEDDED6xx is not set | 186 | # CONFIG_EMBEDDED6xx is not set |
| 187 | # CONFIG_AMIGAONE is not set | ||
| 188 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
| 181 | # CONFIG_IPIC is not set | 189 | # CONFIG_IPIC is not set |
| 182 | # CONFIG_MPIC is not set | 190 | # CONFIG_MPIC is not set |
| 183 | # CONFIG_MPIC_WEIRD is not set | 191 | # CONFIG_MPIC_WEIRD is not set |
| @@ -238,9 +246,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 238 | CONFIG_BOUNCE=y | 246 | CONFIG_BOUNCE=y |
| 239 | CONFIG_VIRT_TO_BUS=y | 247 | CONFIG_VIRT_TO_BUS=y |
| 240 | CONFIG_UNEVICTABLE_LRU=y | 248 | CONFIG_UNEVICTABLE_LRU=y |
| 249 | CONFIG_HAVE_MLOCK=y | ||
| 250 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 241 | CONFIG_PPC_4K_PAGES=y | 251 | CONFIG_PPC_4K_PAGES=y |
| 242 | # CONFIG_PPC_16K_PAGES is not set | 252 | # CONFIG_PPC_16K_PAGES is not set |
| 243 | # CONFIG_PPC_64K_PAGES is not set | 253 | # CONFIG_PPC_64K_PAGES is not set |
| 254 | # CONFIG_PPC_256K_PAGES is not set | ||
| 244 | CONFIG_FORCE_MAX_ZONEORDER=11 | 255 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 245 | CONFIG_PROC_DEVICETREE=y | 256 | CONFIG_PROC_DEVICETREE=y |
| 246 | # CONFIG_CMDLINE_BOOL is not set | 257 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -281,7 +292,6 @@ CONFIG_NET=y | |||
| 281 | # | 292 | # |
| 282 | # Networking options | 293 | # Networking options |
| 283 | # | 294 | # |
| 284 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 285 | CONFIG_PACKET=y | 295 | CONFIG_PACKET=y |
| 286 | # CONFIG_PACKET_MMAP is not set | 296 | # CONFIG_PACKET_MMAP is not set |
| 287 | CONFIG_UNIX=y | 297 | CONFIG_UNIX=y |
| @@ -337,6 +347,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 337 | # CONFIG_LAPB is not set | 347 | # CONFIG_LAPB is not set |
| 338 | # CONFIG_ECONET is not set | 348 | # CONFIG_ECONET is not set |
| 339 | # CONFIG_WAN_ROUTER is not set | 349 | # CONFIG_WAN_ROUTER is not set |
| 350 | # CONFIG_PHONET is not set | ||
| 340 | # CONFIG_NET_SCHED is not set | 351 | # CONFIG_NET_SCHED is not set |
| 341 | # CONFIG_DCB is not set | 352 | # CONFIG_DCB is not set |
| 342 | 353 | ||
| @@ -349,7 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 349 | # CONFIG_IRDA is not set | 360 | # CONFIG_IRDA is not set |
| 350 | # CONFIG_BT is not set | 361 | # CONFIG_BT is not set |
| 351 | # CONFIG_AF_RXRPC is not set | 362 | # CONFIG_AF_RXRPC is not set |
| 352 | # CONFIG_PHONET is not set | ||
| 353 | # CONFIG_WIRELESS is not set | 363 | # CONFIG_WIRELESS is not set |
| 354 | # CONFIG_WIMAX is not set | 364 | # CONFIG_WIMAX is not set |
| 355 | # CONFIG_RFKILL is not set | 365 | # CONFIG_RFKILL is not set |
| @@ -447,7 +457,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 447 | # LPDDR flash memory drivers | 457 | # LPDDR flash memory drivers |
| 448 | # | 458 | # |
| 449 | # CONFIG_MTD_LPDDR is not set | 459 | # CONFIG_MTD_LPDDR is not set |
| 450 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 451 | 460 | ||
| 452 | # | 461 | # |
| 453 | # UBI - Unsorted block images | 462 | # UBI - Unsorted block images |
| @@ -514,8 +523,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 514 | CONFIG_SCSI_LOWLEVEL=y | 523 | CONFIG_SCSI_LOWLEVEL=y |
| 515 | # CONFIG_ISCSI_TCP is not set | 524 | # CONFIG_ISCSI_TCP is not set |
| 516 | # CONFIG_LIBFC is not set | 525 | # CONFIG_LIBFC is not set |
| 526 | # CONFIG_LIBFCOE is not set | ||
| 517 | # CONFIG_SCSI_DEBUG is not set | 527 | # CONFIG_SCSI_DEBUG is not set |
| 518 | # CONFIG_SCSI_DH is not set | 528 | # CONFIG_SCSI_DH is not set |
| 529 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 519 | CONFIG_ATA=y | 530 | CONFIG_ATA=y |
| 520 | # CONFIG_ATA_NONSTANDARD is not set | 531 | # CONFIG_ATA_NONSTANDARD is not set |
| 521 | CONFIG_SATA_PMP=y | 532 | CONFIG_SATA_PMP=y |
| @@ -527,6 +538,7 @@ CONFIG_PATA_PLATFORM=y | |||
| 527 | # CONFIG_MD is not set | 538 | # CONFIG_MD is not set |
| 528 | # CONFIG_MACINTOSH_DRIVERS is not set | 539 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 529 | CONFIG_NETDEVICES=y | 540 | CONFIG_NETDEVICES=y |
| 541 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 530 | # CONFIG_DUMMY is not set | 542 | # CONFIG_DUMMY is not set |
| 531 | # CONFIG_BONDING is not set | 543 | # CONFIG_BONDING is not set |
| 532 | # CONFIG_MACVLAN is not set | 544 | # CONFIG_MACVLAN is not set |
| @@ -555,6 +567,8 @@ CONFIG_LXT_PHY=y | |||
| 555 | # CONFIG_MDIO_BITBANG is not set | 567 | # CONFIG_MDIO_BITBANG is not set |
| 556 | CONFIG_NET_ETHERNET=y | 568 | CONFIG_NET_ETHERNET=y |
| 557 | # CONFIG_MII is not set | 569 | # CONFIG_MII is not set |
| 570 | # CONFIG_ETHOC is not set | ||
| 571 | # CONFIG_DNET is not set | ||
| 558 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 572 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 559 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 573 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 560 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 574 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -573,7 +587,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 573 | # | 587 | # |
| 574 | # CONFIG_WLAN_PRE80211 is not set | 588 | # CONFIG_WLAN_PRE80211 is not set |
| 575 | # CONFIG_WLAN_80211 is not set | 589 | # CONFIG_WLAN_80211 is not set |
| 576 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 577 | 590 | ||
| 578 | # | 591 | # |
| 579 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 592 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -675,7 +688,6 @@ CONFIG_I2C_MPC=y | |||
| 675 | # CONFIG_SENSORS_PCF8574 is not set | 688 | # CONFIG_SENSORS_PCF8574 is not set |
| 676 | # CONFIG_PCF8575 is not set | 689 | # CONFIG_PCF8575 is not set |
| 677 | # CONFIG_SENSORS_PCA9539 is not set | 690 | # CONFIG_SENSORS_PCA9539 is not set |
| 678 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 679 | # CONFIG_SENSORS_MAX6875 is not set | 691 | # CONFIG_SENSORS_MAX6875 is not set |
| 680 | # CONFIG_SENSORS_TSL2550 is not set | 692 | # CONFIG_SENSORS_TSL2550 is not set |
| 681 | # CONFIG_I2C_DEBUG_CORE is not set | 693 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -706,6 +718,7 @@ CONFIG_HWMON=y | |||
| 706 | # CONFIG_SENSORS_F71805F is not set | 718 | # CONFIG_SENSORS_F71805F is not set |
| 707 | # CONFIG_SENSORS_F71882FG is not set | 719 | # CONFIG_SENSORS_F71882FG is not set |
| 708 | # CONFIG_SENSORS_F75375S is not set | 720 | # CONFIG_SENSORS_F75375S is not set |
| 721 | # CONFIG_SENSORS_G760A is not set | ||
| 709 | # CONFIG_SENSORS_GL518SM is not set | 722 | # CONFIG_SENSORS_GL518SM is not set |
| 710 | # CONFIG_SENSORS_GL520SM is not set | 723 | # CONFIG_SENSORS_GL520SM is not set |
| 711 | # CONFIG_SENSORS_IT87 is not set | 724 | # CONFIG_SENSORS_IT87 is not set |
| @@ -720,11 +733,14 @@ CONFIG_HWMON=y | |||
| 720 | # CONFIG_SENSORS_LM90 is not set | 733 | # CONFIG_SENSORS_LM90 is not set |
| 721 | # CONFIG_SENSORS_LM92 is not set | 734 | # CONFIG_SENSORS_LM92 is not set |
| 722 | # CONFIG_SENSORS_LM93 is not set | 735 | # CONFIG_SENSORS_LM93 is not set |
| 736 | # CONFIG_SENSORS_LTC4215 is not set | ||
| 723 | # CONFIG_SENSORS_LTC4245 is not set | 737 | # CONFIG_SENSORS_LTC4245 is not set |
| 738 | # CONFIG_SENSORS_LM95241 is not set | ||
| 724 | # CONFIG_SENSORS_MAX1619 is not set | 739 | # CONFIG_SENSORS_MAX1619 is not set |
| 725 | # CONFIG_SENSORS_MAX6650 is not set | 740 | # CONFIG_SENSORS_MAX6650 is not set |
| 726 | # CONFIG_SENSORS_PC87360 is not set | 741 | # CONFIG_SENSORS_PC87360 is not set |
| 727 | # CONFIG_SENSORS_PC87427 is not set | 742 | # CONFIG_SENSORS_PC87427 is not set |
| 743 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 728 | # CONFIG_SENSORS_DME1737 is not set | 744 | # CONFIG_SENSORS_DME1737 is not set |
| 729 | # CONFIG_SENSORS_SMSC47M1 is not set | 745 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 730 | # CONFIG_SENSORS_SMSC47M192 is not set | 746 | # CONFIG_SENSORS_SMSC47M192 is not set |
| @@ -857,11 +873,11 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 857 | # CONFIG_USB_TMC is not set | 873 | # CONFIG_USB_TMC is not set |
| 858 | 874 | ||
| 859 | # | 875 | # |
| 860 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 876 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 861 | # | 877 | # |
| 862 | 878 | ||
| 863 | # | 879 | # |
| 864 | # see USB_STORAGE Help for more information | 880 | # also be needed; see USB_STORAGE Help for more info |
| 865 | # | 881 | # |
| 866 | CONFIG_USB_STORAGE=y | 882 | CONFIG_USB_STORAGE=y |
| 867 | # CONFIG_USB_STORAGE_DEBUG is not set | 883 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -902,7 +918,6 @@ CONFIG_USB_STORAGE=y | |||
| 902 | # CONFIG_USB_LED is not set | 918 | # CONFIG_USB_LED is not set |
| 903 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 919 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 904 | # CONFIG_USB_CYTHERM is not set | 920 | # CONFIG_USB_CYTHERM is not set |
| 905 | # CONFIG_USB_PHIDGET is not set | ||
| 906 | # CONFIG_USB_IDMOUSE is not set | 921 | # CONFIG_USB_IDMOUSE is not set |
| 907 | # CONFIG_USB_FTDI_ELAN is not set | 922 | # CONFIG_USB_FTDI_ELAN is not set |
| 908 | # CONFIG_USB_APPLEDISPLAY is not set | 923 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -917,6 +932,7 @@ CONFIG_USB_STORAGE=y | |||
| 917 | # | 932 | # |
| 918 | # OTG and related infrastructure | 933 | # OTG and related infrastructure |
| 919 | # | 934 | # |
| 935 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 920 | # CONFIG_MMC is not set | 936 | # CONFIG_MMC is not set |
| 921 | # CONFIG_MEMSTICK is not set | 937 | # CONFIG_MEMSTICK is not set |
| 922 | # CONFIG_NEW_LEDS is not set | 938 | # CONFIG_NEW_LEDS is not set |
| @@ -976,8 +992,9 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 976 | # | 992 | # |
| 977 | # on-CPU RTC drivers | 993 | # on-CPU RTC drivers |
| 978 | # | 994 | # |
| 979 | # CONFIG_RTC_DRV_PPC is not set | 995 | # CONFIG_RTC_DRV_GENERIC is not set |
| 980 | # CONFIG_DMADEVICES is not set | 996 | # CONFIG_DMADEVICES is not set |
| 997 | # CONFIG_AUXDISPLAY is not set | ||
| 981 | # CONFIG_UIO is not set | 998 | # CONFIG_UIO is not set |
| 982 | # CONFIG_STAGING is not set | 999 | # CONFIG_STAGING is not set |
| 983 | 1000 | ||
| @@ -988,6 +1005,7 @@ CONFIG_EXT2_FS=y | |||
| 988 | # CONFIG_EXT2_FS_XATTR is not set | 1005 | # CONFIG_EXT2_FS_XATTR is not set |
| 989 | # CONFIG_EXT2_FS_XIP is not set | 1006 | # CONFIG_EXT2_FS_XIP is not set |
| 990 | CONFIG_EXT3_FS=y | 1007 | CONFIG_EXT3_FS=y |
| 1008 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 991 | CONFIG_EXT3_FS_XATTR=y | 1009 | CONFIG_EXT3_FS_XATTR=y |
| 992 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1010 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 993 | # CONFIG_EXT3_FS_SECURITY is not set | 1011 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -1010,6 +1028,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1010 | # CONFIG_FUSE_FS is not set | 1028 | # CONFIG_FUSE_FS is not set |
| 1011 | 1029 | ||
| 1012 | # | 1030 | # |
| 1031 | # Caches | ||
| 1032 | # | ||
| 1033 | # CONFIG_FSCACHE is not set | ||
| 1034 | |||
| 1035 | # | ||
| 1013 | # CD-ROM/DVD Filesystems | 1036 | # CD-ROM/DVD Filesystems |
| 1014 | # | 1037 | # |
| 1015 | # CONFIG_ISO9660_FS is not set | 1038 | # CONFIG_ISO9660_FS is not set |
| @@ -1066,6 +1089,7 @@ CONFIG_CRAMFS=y | |||
| 1066 | # CONFIG_ROMFS_FS is not set | 1089 | # CONFIG_ROMFS_FS is not set |
| 1067 | # CONFIG_SYSV_FS is not set | 1090 | # CONFIG_SYSV_FS is not set |
| 1068 | # CONFIG_UFS_FS is not set | 1091 | # CONFIG_UFS_FS is not set |
| 1092 | # CONFIG_NILFS2_FS is not set | ||
| 1069 | CONFIG_NETWORK_FILESYSTEMS=y | 1093 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1070 | CONFIG_NFS_FS=y | 1094 | CONFIG_NFS_FS=y |
| 1071 | CONFIG_NFS_V3=y | 1095 | CONFIG_NFS_V3=y |
| @@ -1078,7 +1102,6 @@ CONFIG_LOCKD_V4=y | |||
| 1078 | CONFIG_NFS_COMMON=y | 1102 | CONFIG_NFS_COMMON=y |
| 1079 | CONFIG_SUNRPC=y | 1103 | CONFIG_SUNRPC=y |
| 1080 | CONFIG_SUNRPC_GSS=y | 1104 | CONFIG_SUNRPC_GSS=y |
| 1081 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1082 | CONFIG_RPCSEC_GSS_KRB5=y | 1105 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1083 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1106 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1084 | # CONFIG_SMB_FS is not set | 1107 | # CONFIG_SMB_FS is not set |
| @@ -1149,6 +1172,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1149 | # CONFIG_NLS_KOI8_U is not set | 1172 | # CONFIG_NLS_KOI8_U is not set |
| 1150 | # CONFIG_NLS_UTF8 is not set | 1173 | # CONFIG_NLS_UTF8 is not set |
| 1151 | # CONFIG_DLM is not set | 1174 | # CONFIG_DLM is not set |
| 1175 | # CONFIG_BINARY_PRINTF is not set | ||
| 1152 | 1176 | ||
| 1153 | # | 1177 | # |
| 1154 | # Library routines | 1178 | # Library routines |
| @@ -1164,11 +1188,12 @@ CONFIG_CRC32=y | |||
| 1164 | # CONFIG_LIBCRC32C is not set | 1188 | # CONFIG_LIBCRC32C is not set |
| 1165 | CONFIG_ZLIB_INFLATE=y | 1189 | CONFIG_ZLIB_INFLATE=y |
| 1166 | CONFIG_ZLIB_DEFLATE=y | 1190 | CONFIG_ZLIB_DEFLATE=y |
| 1167 | CONFIG_PLIST=y | 1191 | CONFIG_DECOMPRESS_GZIP=y |
| 1168 | CONFIG_HAS_IOMEM=y | 1192 | CONFIG_HAS_IOMEM=y |
| 1169 | CONFIG_HAS_IOPORT=y | 1193 | CONFIG_HAS_IOPORT=y |
| 1170 | CONFIG_HAS_DMA=y | 1194 | CONFIG_HAS_DMA=y |
| 1171 | CONFIG_HAVE_LMB=y | 1195 | CONFIG_HAVE_LMB=y |
| 1196 | CONFIG_NLATTR=y | ||
| 1172 | 1197 | ||
| 1173 | # | 1198 | # |
| 1174 | # Kernel hacking | 1199 | # Kernel hacking |
| @@ -1186,6 +1211,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1186 | CONFIG_DETECT_SOFTLOCKUP=y | 1211 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1187 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1212 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1188 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1213 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1214 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1215 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1216 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1189 | CONFIG_SCHED_DEBUG=y | 1217 | CONFIG_SCHED_DEBUG=y |
| 1190 | # CONFIG_SCHEDSTATS is not set | 1218 | # CONFIG_SCHEDSTATS is not set |
| 1191 | # CONFIG_TIMER_STATS is not set | 1219 | # CONFIG_TIMER_STATS is not set |
| @@ -1214,9 +1242,12 @@ CONFIG_DEBUG_INFO=y | |||
| 1214 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1242 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1215 | # CONFIG_FAULT_INJECTION is not set | 1243 | # CONFIG_FAULT_INJECTION is not set |
| 1216 | # CONFIG_LATENCYTOP is not set | 1244 | # CONFIG_LATENCYTOP is not set |
| 1245 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1217 | CONFIG_HAVE_FUNCTION_TRACER=y | 1246 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1247 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1218 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1248 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1219 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1249 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1250 | CONFIG_TRACING_SUPPORT=y | ||
| 1220 | 1251 | ||
| 1221 | # | 1252 | # |
| 1222 | # Tracers | 1253 | # Tracers |
| @@ -1224,17 +1255,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1224 | # CONFIG_FUNCTION_TRACER is not set | 1255 | # CONFIG_FUNCTION_TRACER is not set |
| 1225 | # CONFIG_SCHED_TRACER is not set | 1256 | # CONFIG_SCHED_TRACER is not set |
| 1226 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1257 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1258 | # CONFIG_EVENT_TRACER is not set | ||
| 1227 | # CONFIG_BOOT_TRACER is not set | 1259 | # CONFIG_BOOT_TRACER is not set |
| 1228 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1260 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1229 | # CONFIG_STACK_TRACER is not set | 1261 | # CONFIG_STACK_TRACER is not set |
| 1230 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1262 | # CONFIG_KMEMTRACE is not set |
| 1263 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1264 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1231 | # CONFIG_SAMPLES is not set | 1265 | # CONFIG_SAMPLES is not set |
| 1232 | CONFIG_HAVE_ARCH_KGDB=y | 1266 | CONFIG_HAVE_ARCH_KGDB=y |
| 1233 | # CONFIG_KGDB is not set | 1267 | # CONFIG_KGDB is not set |
| 1234 | CONFIG_PRINT_STACK_DEPTH=64 | 1268 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1235 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1269 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1236 | # CONFIG_DEBUG_STACK_USAGE is not set | 1270 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1237 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1238 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1271 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1239 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1272 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1240 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1273 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| @@ -1265,10 +1298,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1265 | CONFIG_CRYPTO_HASH=y | 1298 | CONFIG_CRYPTO_HASH=y |
| 1266 | CONFIG_CRYPTO_HASH2=y | 1299 | CONFIG_CRYPTO_HASH2=y |
| 1267 | CONFIG_CRYPTO_RNG2=y | 1300 | CONFIG_CRYPTO_RNG2=y |
| 1301 | CONFIG_CRYPTO_PCOMP=y | ||
| 1268 | CONFIG_CRYPTO_MANAGER=y | 1302 | CONFIG_CRYPTO_MANAGER=y |
| 1269 | CONFIG_CRYPTO_MANAGER2=y | 1303 | CONFIG_CRYPTO_MANAGER2=y |
| 1270 | # CONFIG_CRYPTO_GF128MUL is not set | 1304 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1271 | # CONFIG_CRYPTO_NULL is not set | 1305 | # CONFIG_CRYPTO_NULL is not set |
| 1306 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1272 | # CONFIG_CRYPTO_CRYPTD is not set | 1307 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1273 | # CONFIG_CRYPTO_AUTHENC is not set | 1308 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1274 | # CONFIG_CRYPTO_TEST is not set | 1309 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1337,6 +1372,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1337 | # Compression | 1372 | # Compression |
| 1338 | # | 1373 | # |
| 1339 | # CONFIG_CRYPTO_DEFLATE is not set | 1374 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1375 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1340 | # CONFIG_CRYPTO_LZO is not set | 1376 | # CONFIG_CRYPTO_LZO is not set |
| 1341 | 1377 | ||
| 1342 | # | 1378 | # |
diff --git a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig deleted file mode 100644 index e31b6a4732e..00000000000 --- a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig +++ /dev/null | |||
| @@ -1,1802 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.29-rc2 | ||
| 4 | # Mon Jan 26 15:36:04 2009 | ||
| 5 | # | ||
| 6 | # CONFIG_PPC64 is not set | ||
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | CONFIG_PPC_85xx=y | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_E500=y | ||
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 19 | CONFIG_BOOKE=y | ||
| 20 | CONFIG_FSL_BOOKE=y | ||
| 21 | CONFIG_FSL_EMB_PERFMON=y | ||
| 22 | # CONFIG_PHYS_64BIT is not set | ||
| 23 | CONFIG_SPE=y | ||
| 24 | CONFIG_PPC_MMU_NOHASH=y | ||
| 25 | # CONFIG_PPC_MM_SLICES is not set | ||
| 26 | # CONFIG_SMP is not set | ||
| 27 | CONFIG_PPC32=y | ||
| 28 | CONFIG_WORD_SIZE=32 | ||
| 29 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | ||
| 30 | CONFIG_MMU=y | ||
| 31 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 32 | CONFIG_GENERIC_TIME=y | ||
| 33 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 34 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 35 | CONFIG_GENERIC_HARDIRQS=y | ||
| 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
| 37 | CONFIG_IRQ_PER_CPU=y | ||
| 38 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 40 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 41 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 42 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 43 | CONFIG_GENERIC_HWEIGHT=y | ||
| 44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 47 | CONFIG_PPC=y | ||
| 48 | CONFIG_EARLY_PRINTK=y | ||
| 49 | CONFIG_GENERIC_NVRAM=y | ||
| 50 | CONFIG_SCHED_OMIT_FRAME_POINTER=y | ||
| 51 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 52 | CONFIG_PPC_OF=y | ||
| 53 | CONFIG_OF=y | ||
| 54 | CONFIG_PPC_UDBG_16550=y | ||
| 55 | # CONFIG_GENERIC_TBSYNC is not set | ||
| 56 | CONFIG_AUDIT_ARCH=y | ||
| 57 | CONFIG_GENERIC_BUG=y | ||
| 58 | CONFIG_DEFAULT_UIMAGE=y | ||
| 59 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 60 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 62 | |||
| 63 | # | ||
| 64 | # General setup | ||
| 65 | # | ||
| 66 | CONFIG_EXPERIMENTAL=y | ||
| 67 | CONFIG_BROKEN_ON_SMP=y | ||
| 68 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 69 | CONFIG_LOCALVERSION="" | ||
| 70 | CONFIG_LOCALVERSION_AUTO=y | ||
| 71 | CONFIG_SWAP=y | ||
| 72 | CONFIG_SYSVIPC=y | ||
| 73 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 74 | CONFIG_POSIX_MQUEUE=y | ||
| 75 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 76 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 77 | # CONFIG_TASKSTATS is not set | ||
| 78 | CONFIG_AUDIT=y | ||
| 79 | # CONFIG_AUDITSYSCALL is not set | ||
| 80 | CONFIG_IKCONFIG=y | ||
| 81 | CONFIG_IKCONFIG_PROC=y | ||
| 82 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 83 | CONFIG_GROUP_SCHED=y | ||
| 84 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 85 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 86 | CONFIG_USER_SCHED=y | ||
| 87 | # CONFIG_CGROUP_SCHED is not set | ||
| 88 | # CONFIG_CGROUPS is not set | ||
| 89 | CONFIG_SYSFS_DEPRECATED=y | ||
| 90 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 91 | # CONFIG_RELAY is not set | ||
| 92 | # CONFIG_NAMESPACES is not set | ||
| 93 | CONFIG_BLK_DEV_INITRD=y | ||
| 94 | CONFIG_INITRAMFS_SOURCE="" | ||
| 95 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 96 | CONFIG_SYSCTL=y | ||
| 97 | CONFIG_EMBEDDED=y | ||
| 98 | CONFIG_SYSCTL_SYSCALL=y | ||
| 99 | CONFIG_KALLSYMS=y | ||
| 100 | CONFIG_KALLSYMS_ALL=y | ||
| 101 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
| 102 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 103 | CONFIG_HOTPLUG=y | ||
| 104 | CONFIG_PRINTK=y | ||
| 105 | CONFIG_BUG=y | ||
| 106 | CONFIG_ELF_CORE=y | ||
| 107 | CONFIG_COMPAT_BRK=y | ||
| 108 | CONFIG_BASE_FULL=y | ||
| 109 | CONFIG_FUTEX=y | ||
| 110 | CONFIG_ANON_INODES=y | ||
| 111 | CONFIG_EPOLL=y | ||
| 112 | CONFIG_SIGNALFD=y | ||
| 113 | CONFIG_TIMERFD=y | ||
| 114 | CONFIG_EVENTFD=y | ||
| 115 | CONFIG_SHMEM=y | ||
| 116 | CONFIG_AIO=y | ||
| 117 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 118 | CONFIG_PCI_QUIRKS=y | ||
| 119 | CONFIG_SLUB_DEBUG=y | ||
| 120 | # CONFIG_SLAB is not set | ||
| 121 | CONFIG_SLUB=y | ||
| 122 | # CONFIG_SLOB is not set | ||
| 123 | # CONFIG_PROFILING is not set | ||
| 124 | CONFIG_HAVE_OPROFILE=y | ||
| 125 | # CONFIG_KPROBES is not set | ||
| 126 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 127 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 128 | CONFIG_HAVE_KPROBES=y | ||
| 129 | CONFIG_HAVE_KRETPROBES=y | ||
| 130 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 132 | CONFIG_SLABINFO=y | ||
| 133 | CONFIG_RT_MUTEXES=y | ||
| 134 | CONFIG_BASE_SMALL=0 | ||
| 135 | CONFIG_MODULES=y | ||
| 136 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 137 | CONFIG_MODULE_UNLOAD=y | ||
| 138 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 139 | CONFIG_MODVERSIONS=y | ||
| 140 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 141 | CONFIG_BLOCK=y | ||
| 142 | CONFIG_LBD=y | ||
| 143 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 144 | # CONFIG_BLK_DEV_BSG is not set | ||
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # IO Schedulers | ||
| 149 | # | ||
| 150 | CONFIG_IOSCHED_NOOP=y | ||
| 151 | CONFIG_IOSCHED_AS=y | ||
| 152 | CONFIG_IOSCHED_DEADLINE=y | ||
| 153 | CONFIG_IOSCHED_CFQ=y | ||
| 154 | # CONFIG_DEFAULT_AS is not set | ||
| 155 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 156 | CONFIG_DEFAULT_CFQ=y | ||
| 157 | # CONFIG_DEFAULT_NOOP is not set | ||
| 158 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 159 | CONFIG_CLASSIC_RCU=y | ||
| 160 | # CONFIG_TREE_RCU is not set | ||
| 161 | # CONFIG_PREEMPT_RCU is not set | ||
| 162 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 163 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 164 | # CONFIG_FREEZER is not set | ||
| 165 | |||
| 166 | # | ||
| 167 | # Platform support | ||
| 168 | # | ||
| 169 | # CONFIG_PPC_CELL is not set | ||
| 170 | # CONFIG_PPC_CELL_NATIVE is not set | ||
| 171 | # CONFIG_PQ2ADS is not set | ||
| 172 | CONFIG_MPC85xx=y | ||
| 173 | # CONFIG_MPC8540_ADS is not set | ||
| 174 | # CONFIG_MPC8560_ADS is not set | ||
| 175 | # CONFIG_MPC85xx_CDS is not set | ||
| 176 | # CONFIG_MPC85xx_MDS is not set | ||
| 177 | CONFIG_MPC8536_DS=y | ||
| 178 | # CONFIG_MPC85xx_DS is not set | ||
| 179 | # CONFIG_KSI8560 is not set | ||
| 180 | # CONFIG_STX_GP3 is not set | ||
| 181 | # CONFIG_TQM8540 is not set | ||
| 182 | # CONFIG_TQM8541 is not set | ||
| 183 | # CONFIG_TQM8548 is not set | ||
| 184 | # CONFIG_TQM8555 is not set | ||
| 185 | # CONFIG_TQM8560 is not set | ||
| 186 | # CONFIG_SBC8548 is not set | ||
| 187 | # CONFIG_SBC8560 is not set | ||
| 188 | # CONFIG_IPIC is not set | ||
| 189 | CONFIG_MPIC=y | ||
| 190 | # CONFIG_MPIC_WEIRD is not set | ||
| 191 | # CONFIG_PPC_I8259 is not set | ||
| 192 | # CONFIG_PPC_RTAS is not set | ||
| 193 | # CONFIG_MMIO_NVRAM is not set | ||
| 194 | # CONFIG_PPC_MPC106 is not set | ||
| 195 | # CONFIG_PPC_970_NAP is not set | ||
| 196 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 197 | # CONFIG_GENERIC_IOMAP is not set | ||
| 198 | # CONFIG_CPU_FREQ is not set | ||
| 199 | # CONFIG_QUICC_ENGINE is not set | ||
| 200 | # CONFIG_CPM2 is not set | ||
| 201 | # CONFIG_FSL_ULI1575 is not set | ||
| 202 | # CONFIG_MPC8xxx_GPIO is not set | ||
| 203 | # CONFIG_SIMPLE_GPIO is not set | ||
| 204 | |||
| 205 | # | ||
| 206 | # Kernel options | ||
| 207 | # | ||
| 208 | CONFIG_HIGHMEM=y | ||
| 209 | CONFIG_TICK_ONESHOT=y | ||
| 210 | CONFIG_NO_HZ=y | ||
| 211 | CONFIG_HIGH_RES_TIMERS=y | ||
| 212 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 213 | # CONFIG_HZ_100 is not set | ||
| 214 | CONFIG_HZ_250=y | ||
| 215 | # CONFIG_HZ_300 is not set | ||
| 216 | # CONFIG_HZ_1000 is not set | ||
| 217 | CONFIG_HZ=250 | ||
| 218 | CONFIG_SCHED_HRTICK=y | ||
| 219 | CONFIG_PREEMPT_NONE=y | ||
| 220 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 221 | # CONFIG_PREEMPT is not set | ||
| 222 | CONFIG_BINFMT_ELF=y | ||
| 223 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 224 | # CONFIG_HAVE_AOUT is not set | ||
| 225 | CONFIG_BINFMT_MISC=m | ||
| 226 | CONFIG_MATH_EMULATION=y | ||
| 227 | # CONFIG_IOMMU_HELPER is not set | ||
| 228 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 229 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 231 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 232 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 233 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 234 | CONFIG_FLATMEM_MANUAL=y | ||
| 235 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 236 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 237 | CONFIG_FLATMEM=y | ||
| 238 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 239 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 240 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 241 | CONFIG_MIGRATION=y | ||
| 242 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 243 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 244 | CONFIG_BOUNCE=y | ||
| 245 | CONFIG_VIRT_TO_BUS=y | ||
| 246 | CONFIG_UNEVICTABLE_LRU=y | ||
| 247 | CONFIG_PPC_4K_PAGES=y | ||
| 248 | # CONFIG_PPC_16K_PAGES is not set | ||
| 249 | # CONFIG_PPC_64K_PAGES is not set | ||
| 250 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 251 | CONFIG_PROC_DEVICETREE=y | ||
| 252 | # CONFIG_CMDLINE_BOOL is not set | ||
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 254 | # CONFIG_PM is not set | ||
| 255 | CONFIG_SECCOMP=y | ||
| 256 | CONFIG_ISA_DMA_API=y | ||
| 257 | |||
| 258 | # | ||
| 259 | # Bus options | ||
| 260 | # | ||
| 261 | CONFIG_ZONE_DMA=y | ||
| 262 | CONFIG_PPC_INDIRECT_PCI=y | ||
| 263 | CONFIG_FSL_SOC=y | ||
| 264 | CONFIG_FSL_PCI=y | ||
| 265 | CONFIG_PPC_PCI_CHOICE=y | ||
| 266 | CONFIG_PCI=y | ||
| 267 | CONFIG_PCI_DOMAINS=y | ||
| 268 | CONFIG_PCI_SYSCALL=y | ||
| 269 | # CONFIG_PCIEPORTBUS is not set | ||
| 270 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 271 | # CONFIG_PCI_MSI is not set | ||
| 272 | # CONFIG_PCI_LEGACY is not set | ||
| 273 | # CONFIG_PCI_DEBUG is not set | ||
| 274 | # CONFIG_PCI_STUB is not set | ||
| 275 | # CONFIG_PCCARD is not set | ||
| 276 | # CONFIG_HOTPLUG_PCI is not set | ||
| 277 | # CONFIG_HAS_RAPIDIO is not set | ||
| 278 | |||
| 279 | # | ||
| 280 | # Advanced setup | ||
| 281 | # | ||
| 282 | # CONFIG_ADVANCED_OPTIONS is not set | ||
| 283 | |||
| 284 | # | ||
| 285 | # Default settings for advanced configuration options are used | ||
| 286 | # | ||
| 287 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
| 288 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 289 | CONFIG_KERNEL_START=0xc0000000 | ||
| 290 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 291 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 292 | CONFIG_TASK_SIZE=0xc0000000 | ||
| 293 | CONFIG_NET=y | ||
| 294 | |||
| 295 | # | ||
| 296 | # Networking options | ||
| 297 | # | ||
| 298 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 299 | CONFIG_PACKET=y | ||
| 300 | # CONFIG_PACKET_MMAP is not set | ||
| 301 | CONFIG_UNIX=y | ||
| 302 | CONFIG_XFRM=y | ||
| 303 | CONFIG_XFRM_USER=y | ||
| 304 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 305 | # CONFIG_XFRM_MIGRATE is not set | ||
| 306 | # CONFIG_XFRM_STATISTICS is not set | ||
| 307 | CONFIG_NET_KEY=m | ||
| 308 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 309 | CONFIG_INET=y | ||
| 310 | CONFIG_IP_MULTICAST=y | ||
| 311 | CONFIG_IP_ADVANCED_ROUTER=y | ||
| 312 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 313 | # CONFIG_IP_FIB_TRIE is not set | ||
| 314 | CONFIG_IP_FIB_HASH=y | ||
| 315 | CONFIG_IP_MULTIPLE_TABLES=y | ||
| 316 | CONFIG_IP_ROUTE_MULTIPATH=y | ||
| 317 | CONFIG_IP_ROUTE_VERBOSE=y | ||
| 318 | CONFIG_IP_PNP=y | ||
| 319 | CONFIG_IP_PNP_DHCP=y | ||
| 320 | CONFIG_IP_PNP_BOOTP=y | ||
| 321 | CONFIG_IP_PNP_RARP=y | ||
| 322 | CONFIG_NET_IPIP=y | ||
| 323 | CONFIG_NET_IPGRE=y | ||
| 324 | CONFIG_NET_IPGRE_BROADCAST=y | ||
| 325 | CONFIG_IP_MROUTE=y | ||
| 326 | CONFIG_IP_PIMSM_V1=y | ||
| 327 | CONFIG_IP_PIMSM_V2=y | ||
| 328 | CONFIG_ARPD=y | ||
| 329 | # CONFIG_SYN_COOKIES is not set | ||
| 330 | # CONFIG_INET_AH is not set | ||
| 331 | # CONFIG_INET_ESP is not set | ||
| 332 | # CONFIG_INET_IPCOMP is not set | ||
| 333 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 334 | CONFIG_INET_TUNNEL=y | ||
| 335 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 336 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 337 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 338 | # CONFIG_INET_LRO is not set | ||
| 339 | CONFIG_INET_DIAG=y | ||
| 340 | CONFIG_INET_TCP_DIAG=y | ||
| 341 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 342 | CONFIG_TCP_CONG_CUBIC=y | ||
| 343 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 344 | # CONFIG_TCP_MD5SIG is not set | ||
| 345 | CONFIG_IPV6=y | ||
| 346 | # CONFIG_IPV6_PRIVACY is not set | ||
| 347 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 348 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 349 | # CONFIG_INET6_AH is not set | ||
| 350 | # CONFIG_INET6_ESP is not set | ||
| 351 | # CONFIG_INET6_IPCOMP is not set | ||
| 352 | # CONFIG_IPV6_MIP6 is not set | ||
| 353 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 354 | # CONFIG_INET6_TUNNEL is not set | ||
| 355 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | ||
| 356 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | ||
| 357 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
| 358 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 359 | CONFIG_IPV6_SIT=y | ||
| 360 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 361 | # CONFIG_IPV6_TUNNEL is not set | ||
| 362 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 363 | # CONFIG_IPV6_MROUTE is not set | ||
| 364 | # CONFIG_NETWORK_SECMARK is not set | ||
| 365 | # CONFIG_NETFILTER is not set | ||
| 366 | # CONFIG_IP_DCCP is not set | ||
| 367 | CONFIG_IP_SCTP=m | ||
| 368 | # CONFIG_SCTP_DBG_MSG is not set | ||
| 369 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
| 370 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 371 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 372 | CONFIG_SCTP_HMAC_MD5=y | ||
| 373 | # CONFIG_TIPC is not set | ||
| 374 | # CONFIG_ATM is not set | ||
| 375 | # CONFIG_BRIDGE is not set | ||
| 376 | # CONFIG_NET_DSA is not set | ||
| 377 | # CONFIG_VLAN_8021Q is not set | ||
| 378 | # CONFIG_DECNET is not set | ||
| 379 | # CONFIG_LLC2 is not set | ||
| 380 | # CONFIG_IPX is not set | ||
| 381 | # CONFIG_ATALK is not set | ||
| 382 | # CONFIG_X25 is not set | ||
| 383 | # CONFIG_LAPB is not set | ||
| 384 | # CONFIG_ECONET is not set | ||
| 385 | # CONFIG_WAN_ROUTER is not set | ||
| 386 | # CONFIG_NET_SCHED is not set | ||
| 387 | # CONFIG_DCB is not set | ||
| 388 | |||
| 389 | # | ||
| 390 | # Network testing | ||
| 391 | # | ||
| 392 | # CONFIG_NET_PKTGEN is not set | ||
| 393 | # CONFIG_HAMRADIO is not set | ||
| 394 | # CONFIG_CAN is not set | ||
| 395 | # CONFIG_IRDA is not set | ||
| 396 | # CONFIG_BT is not set | ||
| 397 | # CONFIG_AF_RXRPC is not set | ||
| 398 | # CONFIG_PHONET is not set | ||
| 399 | CONFIG_FIB_RULES=y | ||
| 400 | CONFIG_WIRELESS=y | ||
| 401 | # CONFIG_CFG80211 is not set | ||
| 402 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 403 | # CONFIG_WIRELESS_EXT is not set | ||
| 404 | # CONFIG_LIB80211 is not set | ||
| 405 | # CONFIG_MAC80211 is not set | ||
| 406 | # CONFIG_WIMAX is not set | ||
| 407 | # CONFIG_RFKILL is not set | ||
| 408 | # CONFIG_NET_9P is not set | ||
| 409 | |||
| 410 | # | ||
| 411 | # Device Drivers | ||
| 412 | # | ||
| 413 | |||
| 414 | # | ||
| 415 | # Generic Driver Options | ||
| 416 | # | ||
| 417 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 418 | CONFIG_STANDALONE=y | ||
| 419 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 420 | CONFIG_FW_LOADER=y | ||
| 421 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 422 | CONFIG_EXTRA_FIRMWARE="" | ||
| 423 | # CONFIG_DEBUG_DRIVER is not set | ||
| 424 | # CONFIG_DEBUG_DEVRES is not set | ||
| 425 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 426 | # CONFIG_CONNECTOR is not set | ||
| 427 | # CONFIG_MTD is not set | ||
| 428 | CONFIG_OF_DEVICE=y | ||
| 429 | CONFIG_OF_I2C=y | ||
| 430 | # CONFIG_PARPORT is not set | ||
| 431 | CONFIG_BLK_DEV=y | ||
| 432 | # CONFIG_BLK_DEV_FD is not set | ||
| 433 | # CONFIG_BLK_CPQ_DA is not set | ||
| 434 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 435 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 436 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 437 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 438 | CONFIG_BLK_DEV_LOOP=y | ||
| 439 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 440 | CONFIG_BLK_DEV_NBD=y | ||
| 441 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 442 | # CONFIG_BLK_DEV_UB is not set | ||
| 443 | CONFIG_BLK_DEV_RAM=y | ||
| 444 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 445 | CONFIG_BLK_DEV_RAM_SIZE=524288 | ||
| 446 | # CONFIG_BLK_DEV_XIP is not set | ||
| 447 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 448 | # CONFIG_ATA_OVER_ETH is not set | ||
| 449 | # CONFIG_BLK_DEV_HD is not set | ||
| 450 | CONFIG_MISC_DEVICES=y | ||
| 451 | # CONFIG_PHANTOM is not set | ||
| 452 | # CONFIG_EEPROM_93CX6 is not set | ||
| 453 | # CONFIG_SGI_IOC4 is not set | ||
| 454 | # CONFIG_TIFM_CORE is not set | ||
| 455 | # CONFIG_ICS932S401 is not set | ||
| 456 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 457 | # CONFIG_HP_ILO is not set | ||
| 458 | # CONFIG_C2PORT is not set | ||
| 459 | CONFIG_HAVE_IDE=y | ||
| 460 | # CONFIG_IDE is not set | ||
| 461 | |||
| 462 | # | ||
| 463 | # SCSI device support | ||
| 464 | # | ||
| 465 | # CONFIG_RAID_ATTRS is not set | ||
| 466 | CONFIG_SCSI=y | ||
| 467 | CONFIG_SCSI_DMA=y | ||
| 468 | # CONFIG_SCSI_TGT is not set | ||
| 469 | # CONFIG_SCSI_NETLINK is not set | ||
| 470 | CONFIG_SCSI_PROC_FS=y | ||
| 471 | |||
| 472 | # | ||
| 473 | # SCSI support type (disk, tape, CD-ROM) | ||
| 474 | # | ||
| 475 | CONFIG_BLK_DEV_SD=y | ||
| 476 | CONFIG_CHR_DEV_ST=y | ||
| 477 | # CONFIG_CHR_DEV_OSST is not set | ||
| 478 | CONFIG_BLK_DEV_SR=y | ||
| 479 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 480 | CONFIG_CHR_DEV_SG=y | ||
| 481 | # CONFIG_CHR_DEV_SCH is not set | ||
| 482 | |||
| 483 | # | ||
| 484 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 485 | # | ||
| 486 | CONFIG_SCSI_MULTI_LUN=y | ||
| 487 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 488 | CONFIG_SCSI_LOGGING=y | ||
| 489 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 490 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 491 | |||
| 492 | # | ||
| 493 | # SCSI Transports | ||
| 494 | # | ||
| 495 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 496 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 497 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 498 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 499 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 500 | CONFIG_SCSI_LOWLEVEL=y | ||
| 501 | # CONFIG_ISCSI_TCP is not set | ||
| 502 | # CONFIG_SCSI_CXGB3_ISCSI is not set | ||
| 503 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 504 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 505 | # CONFIG_SCSI_ACARD is not set | ||
| 506 | # CONFIG_SCSI_AACRAID is not set | ||
| 507 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 508 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 509 | # CONFIG_SCSI_AIC79XX is not set | ||
| 510 | # CONFIG_SCSI_AIC94XX is not set | ||
| 511 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 512 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 513 | # CONFIG_SCSI_ARCMSR is not set | ||
| 514 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 515 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 516 | # CONFIG_MEGARAID_SAS is not set | ||
| 517 | # CONFIG_SCSI_HPTIOP is not set | ||
| 518 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 519 | # CONFIG_LIBFC is not set | ||
| 520 | # CONFIG_FCOE is not set | ||
| 521 | # CONFIG_SCSI_DMX3191D is not set | ||
| 522 | # CONFIG_SCSI_EATA is not set | ||
| 523 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 524 | # CONFIG_SCSI_GDTH is not set | ||
| 525 | # CONFIG_SCSI_IPS is not set | ||
| 526 | # CONFIG_SCSI_INITIO is not set | ||
| 527 | # CONFIG_SCSI_INIA100 is not set | ||
| 528 | # CONFIG_SCSI_MVSAS is not set | ||
| 529 | # CONFIG_SCSI_STEX is not set | ||
| 530 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 531 | # CONFIG_SCSI_IPR is not set | ||
| 532 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 533 | # CONFIG_SCSI_QLA_FC is not set | ||
| 534 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 535 | # CONFIG_SCSI_LPFC is not set | ||
| 536 | # CONFIG_SCSI_DC395x is not set | ||
| 537 | # CONFIG_SCSI_DC390T is not set | ||
| 538 | # CONFIG_SCSI_NSP32 is not set | ||
| 539 | # CONFIG_SCSI_DEBUG is not set | ||
| 540 | # CONFIG_SCSI_SRP is not set | ||
| 541 | # CONFIG_SCSI_DH is not set | ||
| 542 | CONFIG_ATA=y | ||
| 543 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 544 | CONFIG_SATA_PMP=y | ||
| 545 | # CONFIG_SATA_AHCI is not set | ||
| 546 | CONFIG_SATA_SIL24=y | ||
| 547 | CONFIG_SATA_FSL=y | ||
| 548 | CONFIG_ATA_SFF=y | ||
| 549 | # CONFIG_SATA_SVW is not set | ||
| 550 | # CONFIG_ATA_PIIX is not set | ||
| 551 | # CONFIG_SATA_MV is not set | ||
| 552 | # CONFIG_SATA_NV is not set | ||
| 553 | # CONFIG_PDC_ADMA is not set | ||
| 554 | # CONFIG_SATA_QSTOR is not set | ||
| 555 | # CONFIG_SATA_PROMISE is not set | ||
| 556 | # CONFIG_SATA_SX4 is not set | ||
| 557 | CONFIG_SATA_SIL=y | ||
| 558 | # CONFIG_SATA_SIS is not set | ||
| 559 | # CONFIG_SATA_ULI is not set | ||
| 560 | # CONFIG_SATA_VIA is not set | ||
| 561 | # CONFIG_SATA_VITESSE is not set | ||
| 562 | # CONFIG_SATA_INIC162X is not set | ||
| 563 | # CONFIG_PATA_ALI is not set | ||
| 564 | # CONFIG_PATA_AMD is not set | ||
| 565 | # CONFIG_PATA_ARTOP is not set | ||
| 566 | # CONFIG_PATA_ATIIXP is not set | ||
| 567 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 568 | # CONFIG_PATA_CMD64X is not set | ||
| 569 | # CONFIG_PATA_CS5520 is not set | ||
| 570 | # CONFIG_PATA_CS5530 is not set | ||
| 571 | # CONFIG_PATA_CYPRESS is not set | ||
| 572 | # CONFIG_PATA_EFAR is not set | ||
| 573 | # CONFIG_ATA_GENERIC is not set | ||
| 574 | # CONFIG_PATA_HPT366 is not set | ||
| 575 | # CONFIG_PATA_HPT37X is not set | ||
| 576 | # CONFIG_PATA_HPT3X2N is not set | ||
| 577 | # CONFIG_PATA_HPT3X3 is not set | ||
| 578 | # CONFIG_PATA_IT821X is not set | ||
| 579 | # CONFIG_PATA_IT8213 is not set | ||
| 580 | # CONFIG_PATA_JMICRON is not set | ||
| 581 | # CONFIG_PATA_TRIFLEX is not set | ||
| 582 | # CONFIG_PATA_MARVELL is not set | ||
| 583 | # CONFIG_PATA_MPIIX is not set | ||
| 584 | # CONFIG_PATA_OLDPIIX is not set | ||
| 585 | # CONFIG_PATA_NETCELL is not set | ||
| 586 | # CONFIG_PATA_NINJA32 is not set | ||
| 587 | # CONFIG_PATA_NS87410 is not set | ||
| 588 | # CONFIG_PATA_NS87415 is not set | ||
| 589 | # CONFIG_PATA_OPTI is not set | ||
| 590 | # CONFIG_PATA_OPTIDMA is not set | ||
| 591 | # CONFIG_PATA_PDC_OLD is not set | ||
| 592 | # CONFIG_PATA_RADISYS is not set | ||
| 593 | # CONFIG_PATA_RZ1000 is not set | ||
| 594 | # CONFIG_PATA_SC1200 is not set | ||
| 595 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 596 | # CONFIG_PATA_PDC2027X is not set | ||
| 597 | # CONFIG_PATA_SIL680 is not set | ||
| 598 | # CONFIG_PATA_SIS is not set | ||
| 599 | # CONFIG_PATA_VIA is not set | ||
| 600 | # CONFIG_PATA_WINBOND is not set | ||
| 601 | # CONFIG_PATA_PLATFORM is not set | ||
| 602 | # CONFIG_PATA_SCH is not set | ||
| 603 | # CONFIG_MD is not set | ||
| 604 | # CONFIG_FUSION is not set | ||
| 605 | |||
| 606 | # | ||
| 607 | # IEEE 1394 (FireWire) support | ||
| 608 | # | ||
| 609 | |||
| 610 | # | ||
| 611 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 612 | # | ||
| 613 | # CONFIG_FIREWIRE is not set | ||
| 614 | # CONFIG_IEEE1394 is not set | ||
| 615 | # CONFIG_I2O is not set | ||
| 616 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
| 617 | CONFIG_NETDEVICES=y | ||
| 618 | CONFIG_DUMMY=y | ||
| 619 | # CONFIG_BONDING is not set | ||
| 620 | # CONFIG_MACVLAN is not set | ||
| 621 | # CONFIG_EQUALIZER is not set | ||
| 622 | # CONFIG_TUN is not set | ||
| 623 | # CONFIG_VETH is not set | ||
| 624 | # CONFIG_ARCNET is not set | ||
| 625 | CONFIG_PHYLIB=y | ||
| 626 | |||
| 627 | # | ||
| 628 | # MII PHY device drivers | ||
| 629 | # | ||
| 630 | # CONFIG_MARVELL_PHY is not set | ||
| 631 | # CONFIG_DAVICOM_PHY is not set | ||
| 632 | # CONFIG_QSEMI_PHY is not set | ||
| 633 | # CONFIG_LXT_PHY is not set | ||
| 634 | # CONFIG_CICADA_PHY is not set | ||
| 635 | CONFIG_VITESSE_PHY=y | ||
| 636 | # CONFIG_SMSC_PHY is not set | ||
| 637 | # CONFIG_BROADCOM_PHY is not set | ||
| 638 | # CONFIG_ICPLUS_PHY is not set | ||
| 639 | # CONFIG_REALTEK_PHY is not set | ||
| 640 | # CONFIG_NATIONAL_PHY is not set | ||
| 641 | # CONFIG_STE10XP is not set | ||
| 642 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 643 | # CONFIG_FIXED_PHY is not set | ||
| 644 | # CONFIG_MDIO_BITBANG is not set | ||
| 645 | CONFIG_NET_ETHERNET=y | ||
| 646 | CONFIG_MII=y | ||
| 647 | # CONFIG_HAPPYMEAL is not set | ||
| 648 | # CONFIG_SUNGEM is not set | ||
| 649 | # CONFIG_CASSINI is not set | ||
| 650 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 651 | # CONFIG_NET_TULIP is not set | ||
| 652 | # CONFIG_HP100 is not set | ||
| 653 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 654 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 655 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 656 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 657 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 658 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 659 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 660 | # CONFIG_NET_PCI is not set | ||
| 661 | # CONFIG_B44 is not set | ||
| 662 | # CONFIG_ATL2 is not set | ||
| 663 | CONFIG_NETDEV_1000=y | ||
| 664 | # CONFIG_ACENIC is not set | ||
| 665 | # CONFIG_DL2K is not set | ||
| 666 | # CONFIG_E1000 is not set | ||
| 667 | # CONFIG_E1000E is not set | ||
| 668 | # CONFIG_IP1000 is not set | ||
| 669 | # CONFIG_IGB is not set | ||
| 670 | # CONFIG_NS83820 is not set | ||
| 671 | # CONFIG_HAMACHI is not set | ||
| 672 | # CONFIG_YELLOWFIN is not set | ||
| 673 | # CONFIG_R8169 is not set | ||
| 674 | # CONFIG_SIS190 is not set | ||
| 675 | CONFIG_SKGE=y | ||
| 676 | # CONFIG_SKGE_DEBUG is not set | ||
| 677 | CONFIG_SKY2=y | ||
| 678 | # CONFIG_SKY2_DEBUG is not set | ||
| 679 | # CONFIG_VIA_VELOCITY is not set | ||
| 680 | # CONFIG_TIGON3 is not set | ||
| 681 | # CONFIG_BNX2 is not set | ||
| 682 | CONFIG_GIANFAR=y | ||
| 683 | # CONFIG_QLA3XXX is not set | ||
| 684 | # CONFIG_ATL1 is not set | ||
| 685 | # CONFIG_ATL1E is not set | ||
| 686 | # CONFIG_JME is not set | ||
| 687 | CONFIG_NETDEV_10000=y | ||
| 688 | # CONFIG_CHELSIO_T1 is not set | ||
| 689 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
| 690 | # CONFIG_CHELSIO_T3 is not set | ||
| 691 | # CONFIG_ENIC is not set | ||
| 692 | # CONFIG_IXGBE is not set | ||
| 693 | # CONFIG_IXGB is not set | ||
| 694 | # CONFIG_S2IO is not set | ||
| 695 | # CONFIG_MYRI10GE is not set | ||
| 696 | # CONFIG_NETXEN_NIC is not set | ||
| 697 | # CONFIG_NIU is not set | ||
| 698 | # CONFIG_MLX4_EN is not set | ||
| 699 | # CONFIG_MLX4_CORE is not set | ||
| 700 | # CONFIG_TEHUTI is not set | ||
| 701 | # CONFIG_BNX2X is not set | ||
| 702 | # CONFIG_QLGE is not set | ||
| 703 | # CONFIG_SFC is not set | ||
| 704 | # CONFIG_TR is not set | ||
| 705 | |||
| 706 | # | ||
| 707 | # Wireless LAN | ||
| 708 | # | ||
| 709 | # CONFIG_WLAN_PRE80211 is not set | ||
| 710 | # CONFIG_WLAN_80211 is not set | ||
| 711 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 712 | |||
| 713 | # | ||
| 714 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 715 | # | ||
| 716 | |||
| 717 | # | ||
| 718 | # USB Network Adapters | ||
| 719 | # | ||
| 720 | # CONFIG_USB_CATC is not set | ||
| 721 | # CONFIG_USB_KAWETH is not set | ||
| 722 | # CONFIG_USB_PEGASUS is not set | ||
| 723 | # CONFIG_USB_RTL8150 is not set | ||
| 724 | # CONFIG_USB_USBNET is not set | ||
| 725 | # CONFIG_WAN is not set | ||
| 726 | # CONFIG_FDDI is not set | ||
| 727 | # CONFIG_HIPPI is not set | ||
| 728 | # CONFIG_PPP is not set | ||
| 729 | # CONFIG_SLIP is not set | ||
| 730 | # CONFIG_NET_FC is not set | ||
| 731 | # CONFIG_NETCONSOLE is not set | ||
| 732 | # CONFIG_NETPOLL is not set | ||
| 733 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 734 | # CONFIG_ISDN is not set | ||
| 735 | # CONFIG_PHONE is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # Input device support | ||
| 739 | # | ||
| 740 | CONFIG_INPUT=y | ||
| 741 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 742 | # CONFIG_INPUT_POLLDEV is not set | ||
| 743 | |||
| 744 | # | ||
| 745 | # Userland interfaces | ||
| 746 | # | ||
| 747 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 748 | # CONFIG_INPUT_JOYDEV is not set | ||
| 749 | # CONFIG_INPUT_EVDEV is not set | ||
| 750 | # CONFIG_INPUT_EVBUG is not set | ||
| 751 | |||
| 752 | # | ||
| 753 | # Input Device Drivers | ||
| 754 | # | ||
| 755 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 756 | # CONFIG_INPUT_MOUSE is not set | ||
| 757 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 758 | # CONFIG_INPUT_TABLET is not set | ||
| 759 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 760 | # CONFIG_INPUT_MISC is not set | ||
| 761 | |||
| 762 | # | ||
| 763 | # Hardware I/O ports | ||
| 764 | # | ||
| 765 | CONFIG_SERIO=y | ||
| 766 | CONFIG_SERIO_I8042=y | ||
| 767 | CONFIG_SERIO_SERPORT=y | ||
| 768 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 769 | CONFIG_SERIO_LIBPS2=y | ||
| 770 | # CONFIG_SERIO_RAW is not set | ||
| 771 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 772 | # CONFIG_GAMEPORT is not set | ||
| 773 | |||
| 774 | # | ||
| 775 | # Character devices | ||
| 776 | # | ||
| 777 | CONFIG_VT=y | ||
| 778 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 779 | CONFIG_VT_CONSOLE=y | ||
| 780 | CONFIG_HW_CONSOLE=y | ||
| 781 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 782 | CONFIG_DEVKMEM=y | ||
| 783 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 784 | # CONFIG_NOZOMI is not set | ||
| 785 | |||
| 786 | # | ||
| 787 | # Serial drivers | ||
| 788 | # | ||
| 789 | CONFIG_SERIAL_8250=y | ||
| 790 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 791 | CONFIG_SERIAL_8250_PCI=y | ||
| 792 | CONFIG_SERIAL_8250_NR_UARTS=2 | ||
| 793 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | ||
| 794 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 795 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 796 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 797 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 798 | CONFIG_SERIAL_8250_RSA=y | ||
| 799 | |||
| 800 | # | ||
| 801 | # Non-8250 serial port support | ||
| 802 | # | ||
| 803 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 804 | CONFIG_SERIAL_CORE=y | ||
| 805 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 806 | # CONFIG_SERIAL_JSM is not set | ||
| 807 | # CONFIG_SERIAL_OF_PLATFORM is not set | ||
| 808 | CONFIG_UNIX98_PTYS=y | ||
| 809 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 810 | CONFIG_LEGACY_PTYS=y | ||
| 811 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 812 | # CONFIG_HVC_UDBG is not set | ||
| 813 | # CONFIG_IPMI_HANDLER is not set | ||
| 814 | CONFIG_HW_RANDOM=y | ||
| 815 | # CONFIG_NVRAM is not set | ||
| 816 | # CONFIG_R3964 is not set | ||
| 817 | # CONFIG_APPLICOM is not set | ||
| 818 | # CONFIG_RAW_DRIVER is not set | ||
| 819 | # CONFIG_TCG_TPM is not set | ||
| 820 | CONFIG_DEVPORT=y | ||
| 821 | CONFIG_I2C=y | ||
| 822 | CONFIG_I2C_BOARDINFO=y | ||
| 823 | # CONFIG_I2C_CHARDEV is not set | ||
| 824 | CONFIG_I2C_HELPER_AUTO=y | ||
| 825 | |||
| 826 | # | ||
| 827 | # I2C Hardware Bus support | ||
| 828 | # | ||
| 829 | |||
| 830 | # | ||
| 831 | # PC SMBus host controller drivers | ||
| 832 | # | ||
| 833 | # CONFIG_I2C_ALI1535 is not set | ||
| 834 | # CONFIG_I2C_ALI1563 is not set | ||
| 835 | # CONFIG_I2C_ALI15X3 is not set | ||
| 836 | # CONFIG_I2C_AMD756 is not set | ||
| 837 | # CONFIG_I2C_AMD8111 is not set | ||
| 838 | # CONFIG_I2C_I801 is not set | ||
| 839 | # CONFIG_I2C_ISCH is not set | ||
| 840 | # CONFIG_I2C_PIIX4 is not set | ||
| 841 | # CONFIG_I2C_NFORCE2 is not set | ||
| 842 | # CONFIG_I2C_SIS5595 is not set | ||
| 843 | # CONFIG_I2C_SIS630 is not set | ||
| 844 | # CONFIG_I2C_SIS96X is not set | ||
| 845 | # CONFIG_I2C_VIA is not set | ||
| 846 | # CONFIG_I2C_VIAPRO is not set | ||
| 847 | |||
| 848 | # | ||
| 849 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 850 | # | ||
| 851 | CONFIG_I2C_MPC=y | ||
| 852 | # CONFIG_I2C_OCORES is not set | ||
| 853 | # CONFIG_I2C_SIMTEC is not set | ||
| 854 | |||
| 855 | # | ||
| 856 | # External I2C/SMBus adapter drivers | ||
| 857 | # | ||
| 858 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 859 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 860 | # CONFIG_I2C_TINY_USB is not set | ||
| 861 | |||
| 862 | # | ||
| 863 | # Graphics adapter I2C/DDC channel drivers | ||
| 864 | # | ||
| 865 | # CONFIG_I2C_VOODOO3 is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # Other I2C/SMBus bus drivers | ||
| 869 | # | ||
| 870 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 871 | # CONFIG_I2C_STUB is not set | ||
| 872 | |||
| 873 | # | ||
| 874 | # Miscellaneous I2C Chip support | ||
| 875 | # | ||
| 876 | # CONFIG_DS1682 is not set | ||
| 877 | # CONFIG_EEPROM_AT24 is not set | ||
| 878 | CONFIG_EEPROM_LEGACY=y | ||
| 879 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 880 | # CONFIG_PCF8575 is not set | ||
| 881 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 882 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 883 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 884 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 885 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 886 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 887 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 888 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 889 | # CONFIG_SPI is not set | ||
| 890 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 891 | # CONFIG_GPIOLIB is not set | ||
| 892 | # CONFIG_W1 is not set | ||
| 893 | # CONFIG_POWER_SUPPLY is not set | ||
| 894 | # CONFIG_HWMON is not set | ||
| 895 | CONFIG_THERMAL=y | ||
| 896 | # CONFIG_WATCHDOG is not set | ||
| 897 | CONFIG_SSB_POSSIBLE=y | ||
| 898 | |||
| 899 | # | ||
| 900 | # Sonics Silicon Backplane | ||
| 901 | # | ||
| 902 | # CONFIG_SSB is not set | ||
| 903 | |||
| 904 | # | ||
| 905 | # Multifunction device drivers | ||
| 906 | # | ||
| 907 | # CONFIG_MFD_CORE is not set | ||
| 908 | # CONFIG_MFD_SM501 is not set | ||
| 909 | # CONFIG_HTC_PASIC3 is not set | ||
| 910 | # CONFIG_TWL4030_CORE is not set | ||
| 911 | # CONFIG_MFD_TMIO is not set | ||
| 912 | # CONFIG_PMIC_DA903X is not set | ||
| 913 | # CONFIG_MFD_WM8400 is not set | ||
| 914 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 915 | # CONFIG_MFD_PCF50633 is not set | ||
| 916 | # CONFIG_REGULATOR is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # Multimedia devices | ||
| 920 | # | ||
| 921 | |||
| 922 | # | ||
| 923 | # Multimedia core support | ||
| 924 | # | ||
| 925 | # CONFIG_VIDEO_DEV is not set | ||
| 926 | CONFIG_DVB_CORE=m | ||
| 927 | CONFIG_VIDEO_MEDIA=m | ||
| 928 | |||
| 929 | # | ||
| 930 | # Multimedia drivers | ||
| 931 | # | ||
| 932 | # CONFIG_MEDIA_ATTACH is not set | ||
| 933 | CONFIG_MEDIA_TUNER=m | ||
| 934 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 935 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 936 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 937 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 938 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 939 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 940 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 941 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 942 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 943 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
| 944 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
| 945 | |||
| 946 | # | ||
| 947 | # Supported SAA7146 based PCI Adapters | ||
| 948 | # | ||
| 949 | # CONFIG_TTPCI_EEPROM is not set | ||
| 950 | # CONFIG_DVB_BUDGET_CORE is not set | ||
| 951 | |||
| 952 | # | ||
| 953 | # Supported USB Adapters | ||
| 954 | # | ||
| 955 | # CONFIG_DVB_USB is not set | ||
| 956 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
| 957 | # CONFIG_DVB_TTUSB_DEC is not set | ||
| 958 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 959 | |||
| 960 | # | ||
| 961 | # Supported FlexCopII (B2C2) Adapters | ||
| 962 | # | ||
| 963 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
| 964 | |||
| 965 | # | ||
| 966 | # Supported BT878 Adapters | ||
| 967 | # | ||
| 968 | |||
| 969 | # | ||
| 970 | # Supported Pluto2 Adapters | ||
| 971 | # | ||
| 972 | # CONFIG_DVB_PLUTO2 is not set | ||
| 973 | |||
| 974 | # | ||
| 975 | # Supported SDMC DM1105 Adapters | ||
| 976 | # | ||
| 977 | # CONFIG_DVB_DM1105 is not set | ||
| 978 | |||
| 979 | # | ||
| 980 | # Supported DVB Frontends | ||
| 981 | # | ||
| 982 | |||
| 983 | # | ||
| 984 | # Customise DVB Frontends | ||
| 985 | # | ||
| 986 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
| 987 | |||
| 988 | # | ||
| 989 | # Multistandard (satellite) frontends | ||
| 990 | # | ||
| 991 | # CONFIG_DVB_STB0899 is not set | ||
| 992 | # CONFIG_DVB_STB6100 is not set | ||
| 993 | |||
| 994 | # | ||
| 995 | # DVB-S (satellite) frontends | ||
| 996 | # | ||
| 997 | # CONFIG_DVB_CX24110 is not set | ||
| 998 | # CONFIG_DVB_CX24123 is not set | ||
| 999 | # CONFIG_DVB_MT312 is not set | ||
| 1000 | # CONFIG_DVB_S5H1420 is not set | ||
| 1001 | # CONFIG_DVB_STV0288 is not set | ||
| 1002 | # CONFIG_DVB_STB6000 is not set | ||
| 1003 | # CONFIG_DVB_STV0299 is not set | ||
| 1004 | # CONFIG_DVB_TDA8083 is not set | ||
| 1005 | # CONFIG_DVB_TDA10086 is not set | ||
| 1006 | # CONFIG_DVB_TDA8261 is not set | ||
| 1007 | # CONFIG_DVB_VES1X93 is not set | ||
| 1008 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 1009 | # CONFIG_DVB_TUNER_CX24113 is not set | ||
| 1010 | # CONFIG_DVB_TDA826X is not set | ||
| 1011 | # CONFIG_DVB_TUA6100 is not set | ||
| 1012 | # CONFIG_DVB_CX24116 is not set | ||
| 1013 | # CONFIG_DVB_SI21XX is not set | ||
| 1014 | |||
| 1015 | # | ||
| 1016 | # DVB-T (terrestrial) frontends | ||
| 1017 | # | ||
| 1018 | # CONFIG_DVB_SP8870 is not set | ||
| 1019 | # CONFIG_DVB_SP887X is not set | ||
| 1020 | # CONFIG_DVB_CX22700 is not set | ||
| 1021 | # CONFIG_DVB_CX22702 is not set | ||
| 1022 | # CONFIG_DVB_DRX397XD is not set | ||
| 1023 | # CONFIG_DVB_L64781 is not set | ||
| 1024 | # CONFIG_DVB_TDA1004X is not set | ||
| 1025 | # CONFIG_DVB_NXT6000 is not set | ||
| 1026 | # CONFIG_DVB_MT352 is not set | ||
| 1027 | # CONFIG_DVB_ZL10353 is not set | ||
| 1028 | # CONFIG_DVB_DIB3000MB is not set | ||
| 1029 | # CONFIG_DVB_DIB3000MC is not set | ||
| 1030 | # CONFIG_DVB_DIB7000M is not set | ||
| 1031 | # CONFIG_DVB_DIB7000P is not set | ||
| 1032 | # CONFIG_DVB_TDA10048 is not set | ||
| 1033 | |||
| 1034 | # | ||
| 1035 | # DVB-C (cable) frontends | ||
| 1036 | # | ||
| 1037 | # CONFIG_DVB_VES1820 is not set | ||
| 1038 | # CONFIG_DVB_TDA10021 is not set | ||
| 1039 | # CONFIG_DVB_TDA10023 is not set | ||
| 1040 | # CONFIG_DVB_STV0297 is not set | ||
| 1041 | |||
| 1042 | # | ||
| 1043 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
| 1044 | # | ||
| 1045 | # CONFIG_DVB_NXT200X is not set | ||
| 1046 | # CONFIG_DVB_OR51211 is not set | ||
| 1047 | # CONFIG_DVB_OR51132 is not set | ||
| 1048 | # CONFIG_DVB_BCM3510 is not set | ||
| 1049 | # CONFIG_DVB_LGDT330X is not set | ||
| 1050 | # CONFIG_DVB_LGDT3304 is not set | ||
| 1051 | # CONFIG_DVB_S5H1409 is not set | ||
| 1052 | # CONFIG_DVB_AU8522 is not set | ||
| 1053 | # CONFIG_DVB_S5H1411 is not set | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # ISDB-T (terrestrial) frontends | ||
| 1057 | # | ||
| 1058 | # CONFIG_DVB_S921 is not set | ||
| 1059 | |||
| 1060 | # | ||
| 1061 | # Digital terrestrial only tuners/PLL | ||
| 1062 | # | ||
| 1063 | # CONFIG_DVB_PLL is not set | ||
| 1064 | # CONFIG_DVB_TUNER_DIB0070 is not set | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # SEC control devices for DVB-S | ||
| 1068 | # | ||
| 1069 | # CONFIG_DVB_LNBP21 is not set | ||
| 1070 | # CONFIG_DVB_ISL6405 is not set | ||
| 1071 | # CONFIG_DVB_ISL6421 is not set | ||
| 1072 | # CONFIG_DVB_LGS8GL5 is not set | ||
| 1073 | |||
| 1074 | # | ||
| 1075 | # Tools to develop new frontends | ||
| 1076 | # | ||
| 1077 | # CONFIG_DVB_DUMMY_FE is not set | ||
| 1078 | # CONFIG_DVB_AF9013 is not set | ||
| 1079 | CONFIG_DAB=y | ||
| 1080 | # CONFIG_USB_DABUSB is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Graphics support | ||
| 1084 | # | ||
| 1085 | # CONFIG_AGP is not set | ||
| 1086 | # CONFIG_DRM is not set | ||
| 1087 | # CONFIG_VGASTATE is not set | ||
| 1088 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 1089 | # CONFIG_FB is not set | ||
| 1090 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # Display device support | ||
| 1094 | # | ||
| 1095 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1096 | |||
| 1097 | # | ||
| 1098 | # Console display driver support | ||
| 1099 | # | ||
| 1100 | CONFIG_VGA_CONSOLE=y | ||
| 1101 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 1102 | CONFIG_DUMMY_CONSOLE=y | ||
| 1103 | CONFIG_SOUND=y | ||
| 1104 | # CONFIG_SOUND_OSS_CORE is not set | ||
| 1105 | CONFIG_SND=y | ||
| 1106 | CONFIG_SND_TIMER=y | ||
| 1107 | CONFIG_SND_PCM=y | ||
| 1108 | # CONFIG_SND_SEQUENCER is not set | ||
| 1109 | # CONFIG_SND_MIXER_OSS is not set | ||
| 1110 | # CONFIG_SND_PCM_OSS is not set | ||
| 1111 | # CONFIG_SND_HRTIMER is not set | ||
| 1112 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 1113 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1114 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1115 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1116 | # CONFIG_SND_DEBUG is not set | ||
| 1117 | CONFIG_SND_VMASTER=y | ||
| 1118 | CONFIG_SND_AC97_CODEC=y | ||
| 1119 | CONFIG_SND_DRIVERS=y | ||
| 1120 | # CONFIG_SND_DUMMY is not set | ||
| 1121 | # CONFIG_SND_MTPAV is not set | ||
| 1122 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 1123 | # CONFIG_SND_MPU401 is not set | ||
| 1124 | # CONFIG_SND_AC97_POWER_SAVE is not set | ||
| 1125 | CONFIG_SND_PCI=y | ||
| 1126 | # CONFIG_SND_AD1889 is not set | ||
| 1127 | # CONFIG_SND_ALS300 is not set | ||
| 1128 | # CONFIG_SND_ALS4000 is not set | ||
| 1129 | # CONFIG_SND_ALI5451 is not set | ||
| 1130 | # CONFIG_SND_ATIIXP is not set | ||
| 1131 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 1132 | # CONFIG_SND_AU8810 is not set | ||
| 1133 | # CONFIG_SND_AU8820 is not set | ||
| 1134 | # CONFIG_SND_AU8830 is not set | ||
| 1135 | # CONFIG_SND_AW2 is not set | ||
| 1136 | # CONFIG_SND_AZT3328 is not set | ||
| 1137 | # CONFIG_SND_BT87X is not set | ||
| 1138 | # CONFIG_SND_CA0106 is not set | ||
| 1139 | # CONFIG_SND_CMIPCI is not set | ||
| 1140 | # CONFIG_SND_OXYGEN is not set | ||
| 1141 | # CONFIG_SND_CS4281 is not set | ||
| 1142 | # CONFIG_SND_CS46XX is not set | ||
| 1143 | # CONFIG_SND_CS5530 is not set | ||
| 1144 | # CONFIG_SND_DARLA20 is not set | ||
| 1145 | # CONFIG_SND_GINA20 is not set | ||
| 1146 | # CONFIG_SND_LAYLA20 is not set | ||
| 1147 | # CONFIG_SND_DARLA24 is not set | ||
| 1148 | # CONFIG_SND_GINA24 is not set | ||
| 1149 | # CONFIG_SND_LAYLA24 is not set | ||
| 1150 | # CONFIG_SND_MONA is not set | ||
| 1151 | # CONFIG_SND_MIA is not set | ||
| 1152 | # CONFIG_SND_ECHO3G is not set | ||
| 1153 | # CONFIG_SND_INDIGO is not set | ||
| 1154 | # CONFIG_SND_INDIGOIO is not set | ||
| 1155 | # CONFIG_SND_INDIGODJ is not set | ||
| 1156 | # CONFIG_SND_EMU10K1 is not set | ||
| 1157 | # CONFIG_SND_EMU10K1X is not set | ||
| 1158 | # CONFIG_SND_ENS1370 is not set | ||
| 1159 | # CONFIG_SND_ENS1371 is not set | ||
| 1160 | # CONFIG_SND_ES1938 is not set | ||
| 1161 | # CONFIG_SND_ES1968 is not set | ||
| 1162 | # CONFIG_SND_FM801 is not set | ||
| 1163 | # CONFIG_SND_HDA_INTEL is not set | ||
| 1164 | # CONFIG_SND_HDSP is not set | ||
| 1165 | # CONFIG_SND_HDSPM is not set | ||
| 1166 | # CONFIG_SND_HIFIER is not set | ||
| 1167 | # CONFIG_SND_ICE1712 is not set | ||
| 1168 | # CONFIG_SND_ICE1724 is not set | ||
| 1169 | CONFIG_SND_INTEL8X0=y | ||
| 1170 | # CONFIG_SND_INTEL8X0M is not set | ||
| 1171 | # CONFIG_SND_KORG1212 is not set | ||
| 1172 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1173 | # CONFIG_SND_MIXART is not set | ||
| 1174 | # CONFIG_SND_NM256 is not set | ||
| 1175 | # CONFIG_SND_PCXHR is not set | ||
| 1176 | # CONFIG_SND_RIPTIDE is not set | ||
| 1177 | # CONFIG_SND_RME32 is not set | ||
| 1178 | # CONFIG_SND_RME96 is not set | ||
| 1179 | # CONFIG_SND_RME9652 is not set | ||
| 1180 | # CONFIG_SND_SONICVIBES is not set | ||
| 1181 | # CONFIG_SND_TRIDENT is not set | ||
| 1182 | # CONFIG_SND_VIA82XX is not set | ||
| 1183 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 1184 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1185 | # CONFIG_SND_VX222 is not set | ||
| 1186 | # CONFIG_SND_YMFPCI is not set | ||
| 1187 | CONFIG_SND_PPC=y | ||
| 1188 | CONFIG_SND_USB=y | ||
| 1189 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1190 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1191 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1192 | # CONFIG_SND_SOC is not set | ||
| 1193 | # CONFIG_SOUND_PRIME is not set | ||
| 1194 | CONFIG_AC97_BUS=y | ||
| 1195 | CONFIG_HID_SUPPORT=y | ||
| 1196 | CONFIG_HID=y | ||
| 1197 | # CONFIG_HID_DEBUG is not set | ||
| 1198 | # CONFIG_HIDRAW is not set | ||
| 1199 | |||
| 1200 | # | ||
| 1201 | # USB Input Devices | ||
| 1202 | # | ||
| 1203 | CONFIG_USB_HID=y | ||
| 1204 | # CONFIG_HID_PID is not set | ||
| 1205 | # CONFIG_USB_HIDDEV is not set | ||
| 1206 | |||
| 1207 | # | ||
| 1208 | # Special HID drivers | ||
| 1209 | # | ||
| 1210 | CONFIG_HID_COMPAT=y | ||
| 1211 | CONFIG_HID_A4TECH=y | ||
| 1212 | CONFIG_HID_APPLE=y | ||
| 1213 | CONFIG_HID_BELKIN=y | ||
| 1214 | CONFIG_HID_CHERRY=y | ||
| 1215 | CONFIG_HID_CHICONY=y | ||
| 1216 | CONFIG_HID_CYPRESS=y | ||
| 1217 | CONFIG_HID_EZKEY=y | ||
| 1218 | CONFIG_HID_GYRATION=y | ||
| 1219 | CONFIG_HID_LOGITECH=y | ||
| 1220 | # CONFIG_LOGITECH_FF is not set | ||
| 1221 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1222 | CONFIG_HID_MICROSOFT=y | ||
| 1223 | CONFIG_HID_MONTEREY=y | ||
| 1224 | # CONFIG_HID_NTRIG is not set | ||
| 1225 | CONFIG_HID_PANTHERLORD=y | ||
| 1226 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1227 | CONFIG_HID_PETALYNX=y | ||
| 1228 | CONFIG_HID_SAMSUNG=y | ||
| 1229 | CONFIG_HID_SONY=y | ||
| 1230 | CONFIG_HID_SUNPLUS=y | ||
| 1231 | # CONFIG_GREENASIA_FF is not set | ||
| 1232 | # CONFIG_HID_TOPSEED is not set | ||
| 1233 | CONFIG_THRUSTMASTER_FF=m | ||
| 1234 | CONFIG_ZEROPLUS_FF=m | ||
| 1235 | CONFIG_USB_SUPPORT=y | ||
| 1236 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 1237 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 1238 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 1239 | CONFIG_USB=y | ||
| 1240 | # CONFIG_USB_DEBUG is not set | ||
| 1241 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 1242 | |||
| 1243 | # | ||
| 1244 | # Miscellaneous USB options | ||
| 1245 | # | ||
| 1246 | CONFIG_USB_DEVICEFS=y | ||
| 1247 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1248 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1249 | # CONFIG_USB_OTG is not set | ||
| 1250 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1251 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1252 | CONFIG_USB_MON=y | ||
| 1253 | # CONFIG_USB_WUSB is not set | ||
| 1254 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 1255 | |||
| 1256 | # | ||
| 1257 | # USB Host Controller Drivers | ||
| 1258 | # | ||
| 1259 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1260 | CONFIG_USB_EHCI_HCD=y | ||
| 1261 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | ||
| 1262 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
| 1263 | CONFIG_USB_EHCI_FSL=y | ||
| 1264 | CONFIG_USB_EHCI_HCD_PPC_OF=y | ||
| 1265 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 1266 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1267 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1268 | CONFIG_USB_OHCI_HCD=y | ||
| 1269 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
| 1270 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | ||
| 1271 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | ||
| 1272 | CONFIG_USB_OHCI_HCD_PCI=y | ||
| 1273 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | ||
| 1274 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | ||
| 1275 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 1276 | # CONFIG_USB_UHCI_HCD is not set | ||
| 1277 | # CONFIG_USB_SL811_HCD is not set | ||
| 1278 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1279 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1280 | # CONFIG_USB_HWA_HCD is not set | ||
| 1281 | |||
| 1282 | # | ||
| 1283 | # USB Device Class drivers | ||
| 1284 | # | ||
| 1285 | # CONFIG_USB_ACM is not set | ||
| 1286 | # CONFIG_USB_PRINTER is not set | ||
| 1287 | # CONFIG_USB_WDM is not set | ||
| 1288 | # CONFIG_USB_TMC is not set | ||
| 1289 | |||
| 1290 | # | ||
| 1291 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | ||
| 1292 | # | ||
| 1293 | |||
| 1294 | # | ||
| 1295 | # see USB_STORAGE Help for more information | ||
| 1296 | # | ||
| 1297 | CONFIG_USB_STORAGE=y | ||
| 1298 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 1299 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1300 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1301 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1302 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1303 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1304 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1305 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1306 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1307 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1308 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1309 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1310 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1311 | |||
| 1312 | # | ||
| 1313 | # USB Imaging devices | ||
| 1314 | # | ||
| 1315 | # CONFIG_USB_MDC800 is not set | ||
| 1316 | # CONFIG_USB_MICROTEK is not set | ||
| 1317 | |||
| 1318 | # | ||
| 1319 | # USB port drivers | ||
| 1320 | # | ||
| 1321 | # CONFIG_USB_SERIAL is not set | ||
| 1322 | |||
| 1323 | # | ||
| 1324 | # USB Miscellaneous drivers | ||
| 1325 | # | ||
| 1326 | # CONFIG_USB_EMI62 is not set | ||
| 1327 | # CONFIG_USB_EMI26 is not set | ||
| 1328 | # CONFIG_USB_ADUTUX is not set | ||
| 1329 | # CONFIG_USB_SEVSEG is not set | ||
| 1330 | # CONFIG_USB_RIO500 is not set | ||
| 1331 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1332 | # CONFIG_USB_LCD is not set | ||
| 1333 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1334 | # CONFIG_USB_LED is not set | ||
| 1335 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1336 | # CONFIG_USB_CYTHERM is not set | ||
| 1337 | # CONFIG_USB_PHIDGET is not set | ||
| 1338 | # CONFIG_USB_IDMOUSE is not set | ||
| 1339 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1340 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1341 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1342 | # CONFIG_USB_LD is not set | ||
| 1343 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1344 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1345 | # CONFIG_USB_TEST is not set | ||
| 1346 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1347 | # CONFIG_USB_VST is not set | ||
| 1348 | # CONFIG_USB_GADGET is not set | ||
| 1349 | |||
| 1350 | # | ||
| 1351 | # OTG and related infrastructure | ||
| 1352 | # | ||
| 1353 | # CONFIG_UWB is not set | ||
| 1354 | # CONFIG_MMC is not set | ||
| 1355 | # CONFIG_MEMSTICK is not set | ||
| 1356 | # CONFIG_NEW_LEDS is not set | ||
| 1357 | # CONFIG_ACCESSIBILITY is not set | ||
| 1358 | # CONFIG_INFINIBAND is not set | ||
| 1359 | # CONFIG_EDAC is not set | ||
| 1360 | CONFIG_RTC_LIB=y | ||
| 1361 | CONFIG_RTC_CLASS=y | ||
| 1362 | CONFIG_RTC_HCTOSYS=y | ||
| 1363 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1364 | # CONFIG_RTC_DEBUG is not set | ||
| 1365 | |||
| 1366 | # | ||
| 1367 | # RTC interfaces | ||
| 1368 | # | ||
| 1369 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1370 | CONFIG_RTC_INTF_PROC=y | ||
| 1371 | CONFIG_RTC_INTF_DEV=y | ||
| 1372 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1373 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1374 | |||
| 1375 | # | ||
| 1376 | # I2C RTC drivers | ||
| 1377 | # | ||
| 1378 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1379 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1380 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1381 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1382 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1383 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1384 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1385 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1386 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1387 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1388 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1389 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1390 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1391 | |||
| 1392 | # | ||
| 1393 | # SPI RTC drivers | ||
| 1394 | # | ||
| 1395 | |||
| 1396 | # | ||
| 1397 | # Platform RTC drivers | ||
| 1398 | # | ||
| 1399 | CONFIG_RTC_DRV_CMOS=y | ||
| 1400 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1401 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1402 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1403 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1404 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1405 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1406 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1407 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1408 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1409 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1410 | |||
| 1411 | # | ||
| 1412 | # on-CPU RTC drivers | ||
| 1413 | # | ||
| 1414 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1415 | CONFIG_DMADEVICES=y | ||
| 1416 | |||
| 1417 | # | ||
| 1418 | # DMA Devices | ||
| 1419 | # | ||
| 1420 | CONFIG_FSL_DMA=y | ||
| 1421 | CONFIG_DMA_ENGINE=y | ||
| 1422 | |||
| 1423 | # | ||
| 1424 | # DMA Clients | ||
| 1425 | # | ||
| 1426 | # CONFIG_NET_DMA is not set | ||
| 1427 | # CONFIG_DMATEST is not set | ||
| 1428 | # CONFIG_UIO is not set | ||
| 1429 | # CONFIG_STAGING is not set | ||
| 1430 | |||
| 1431 | # | ||
| 1432 | # File systems | ||
| 1433 | # | ||
| 1434 | CONFIG_EXT2_FS=y | ||
| 1435 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1436 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1437 | CONFIG_EXT3_FS=y | ||
| 1438 | CONFIG_EXT3_FS_XATTR=y | ||
| 1439 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 1440 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 1441 | # CONFIG_EXT4_FS is not set | ||
| 1442 | CONFIG_JBD=y | ||
| 1443 | # CONFIG_JBD_DEBUG is not set | ||
| 1444 | CONFIG_FS_MBCACHE=y | ||
| 1445 | # CONFIG_REISERFS_FS is not set | ||
| 1446 | # CONFIG_JFS_FS is not set | ||
| 1447 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1448 | CONFIG_FILE_LOCKING=y | ||
| 1449 | # CONFIG_XFS_FS is not set | ||
| 1450 | # CONFIG_GFS2_FS is not set | ||
| 1451 | # CONFIG_OCFS2_FS is not set | ||
| 1452 | # CONFIG_BTRFS_FS is not set | ||
| 1453 | CONFIG_DNOTIFY=y | ||
| 1454 | CONFIG_INOTIFY=y | ||
| 1455 | CONFIG_INOTIFY_USER=y | ||
| 1456 | # CONFIG_QUOTA is not set | ||
| 1457 | # CONFIG_AUTOFS_FS is not set | ||
| 1458 | # CONFIG_AUTOFS4_FS is not set | ||
| 1459 | # CONFIG_FUSE_FS is not set | ||
| 1460 | |||
| 1461 | # | ||
| 1462 | # CD-ROM/DVD Filesystems | ||
| 1463 | # | ||
| 1464 | CONFIG_ISO9660_FS=m | ||
| 1465 | CONFIG_JOLIET=y | ||
| 1466 | CONFIG_ZISOFS=y | ||
| 1467 | CONFIG_UDF_FS=m | ||
| 1468 | CONFIG_UDF_NLS=y | ||
| 1469 | |||
| 1470 | # | ||
| 1471 | # DOS/FAT/NT Filesystems | ||
| 1472 | # | ||
| 1473 | CONFIG_FAT_FS=y | ||
| 1474 | CONFIG_MSDOS_FS=m | ||
| 1475 | CONFIG_VFAT_FS=y | ||
| 1476 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1477 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1478 | CONFIG_NTFS_FS=y | ||
| 1479 | # CONFIG_NTFS_DEBUG is not set | ||
| 1480 | # CONFIG_NTFS_RW is not set | ||
| 1481 | |||
| 1482 | # | ||
| 1483 | # Pseudo filesystems | ||
| 1484 | # | ||
| 1485 | CONFIG_PROC_FS=y | ||
| 1486 | CONFIG_PROC_KCORE=y | ||
| 1487 | CONFIG_PROC_SYSCTL=y | ||
| 1488 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1489 | CONFIG_SYSFS=y | ||
| 1490 | CONFIG_TMPFS=y | ||
| 1491 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1492 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1493 | # CONFIG_CONFIGFS_FS is not set | ||
| 1494 | CONFIG_MISC_FILESYSTEMS=y | ||
| 1495 | CONFIG_ADFS_FS=m | ||
| 1496 | # CONFIG_ADFS_FS_RW is not set | ||
| 1497 | CONFIG_AFFS_FS=m | ||
| 1498 | CONFIG_HFS_FS=m | ||
| 1499 | CONFIG_HFSPLUS_FS=m | ||
| 1500 | CONFIG_BEFS_FS=m | ||
| 1501 | # CONFIG_BEFS_DEBUG is not set | ||
| 1502 | CONFIG_BFS_FS=m | ||
| 1503 | CONFIG_EFS_FS=m | ||
| 1504 | CONFIG_CRAMFS=y | ||
| 1505 | # CONFIG_SQUASHFS is not set | ||
| 1506 | CONFIG_VXFS_FS=m | ||
| 1507 | # CONFIG_MINIX_FS is not set | ||
| 1508 | # CONFIG_OMFS_FS is not set | ||
| 1509 | CONFIG_HPFS_FS=m | ||
| 1510 | CONFIG_QNX4FS_FS=m | ||
| 1511 | # CONFIG_ROMFS_FS is not set | ||
| 1512 | CONFIG_SYSV_FS=m | ||
| 1513 | CONFIG_UFS_FS=m | ||
| 1514 | # CONFIG_UFS_FS_WRITE is not set | ||
| 1515 | # CONFIG_UFS_DEBUG is not set | ||
| 1516 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1517 | CONFIG_NFS_FS=y | ||
| 1518 | CONFIG_NFS_V3=y | ||
| 1519 | # CONFIG_NFS_V3_ACL is not set | ||
| 1520 | CONFIG_NFS_V4=y | ||
| 1521 | CONFIG_ROOT_NFS=y | ||
| 1522 | CONFIG_NFSD=y | ||
| 1523 | # CONFIG_NFSD_V3 is not set | ||
| 1524 | # CONFIG_NFSD_V4 is not set | ||
| 1525 | CONFIG_LOCKD=y | ||
| 1526 | CONFIG_LOCKD_V4=y | ||
| 1527 | CONFIG_EXPORTFS=y | ||
| 1528 | CONFIG_NFS_COMMON=y | ||
| 1529 | CONFIG_SUNRPC=y | ||
| 1530 | CONFIG_SUNRPC_GSS=y | ||
| 1531 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1532 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1533 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1534 | # CONFIG_SMB_FS is not set | ||
| 1535 | # CONFIG_CIFS is not set | ||
| 1536 | # CONFIG_NCP_FS is not set | ||
| 1537 | # CONFIG_CODA_FS is not set | ||
| 1538 | # CONFIG_AFS_FS is not set | ||
| 1539 | |||
| 1540 | # | ||
| 1541 | # Partition Types | ||
| 1542 | # | ||
| 1543 | CONFIG_PARTITION_ADVANCED=y | ||
| 1544 | # CONFIG_ACORN_PARTITION is not set | ||
| 1545 | # CONFIG_OSF_PARTITION is not set | ||
| 1546 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1547 | # CONFIG_ATARI_PARTITION is not set | ||
| 1548 | CONFIG_MAC_PARTITION=y | ||
| 1549 | CONFIG_MSDOS_PARTITION=y | ||
| 1550 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1551 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1552 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1553 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1554 | # CONFIG_LDM_PARTITION is not set | ||
| 1555 | # CONFIG_SGI_PARTITION is not set | ||
| 1556 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1557 | # CONFIG_SUN_PARTITION is not set | ||
| 1558 | # CONFIG_KARMA_PARTITION is not set | ||
| 1559 | # CONFIG_EFI_PARTITION is not set | ||
| 1560 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1561 | CONFIG_NLS=y | ||
| 1562 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1563 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1564 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1565 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1566 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1567 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1568 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1569 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1570 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1571 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1572 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1573 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1574 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1575 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1576 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1577 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1578 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1579 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1580 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1581 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1582 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1583 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1584 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1585 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1586 | # CONFIG_NLS_ASCII is not set | ||
| 1587 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1588 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1589 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1590 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1591 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1592 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1593 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1594 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1595 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1596 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1597 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1598 | # CONFIG_NLS_KOI8_R is not set | ||
| 1599 | # CONFIG_NLS_KOI8_U is not set | ||
| 1600 | CONFIG_NLS_UTF8=m | ||
| 1601 | # CONFIG_DLM is not set | ||
| 1602 | |||
| 1603 | # | ||
| 1604 | # Library routines | ||
| 1605 | # | ||
| 1606 | CONFIG_BITREVERSE=y | ||
| 1607 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1608 | # CONFIG_CRC_CCITT is not set | ||
| 1609 | # CONFIG_CRC16 is not set | ||
| 1610 | CONFIG_CRC_T10DIF=y | ||
| 1611 | CONFIG_CRC_ITU_T=m | ||
| 1612 | CONFIG_CRC32=y | ||
| 1613 | # CONFIG_CRC7 is not set | ||
| 1614 | CONFIG_LIBCRC32C=m | ||
| 1615 | CONFIG_ZLIB_INFLATE=y | ||
| 1616 | CONFIG_PLIST=y | ||
| 1617 | CONFIG_HAS_IOMEM=y | ||
| 1618 | CONFIG_HAS_IOPORT=y | ||
| 1619 | CONFIG_HAS_DMA=y | ||
| 1620 | CONFIG_HAVE_LMB=y | ||
| 1621 | |||
| 1622 | # | ||
| 1623 | # Kernel hacking | ||
| 1624 | # | ||
| 1625 | # CONFIG_PRINTK_TIME is not set | ||
| 1626 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1627 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1628 | CONFIG_FRAME_WARN=1024 | ||
| 1629 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1630 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1631 | CONFIG_DEBUG_FS=y | ||
| 1632 | # CONFIG_HEADERS_CHECK is not set | ||
| 1633 | CONFIG_DEBUG_KERNEL=y | ||
| 1634 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1635 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1636 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1637 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1638 | CONFIG_SCHED_DEBUG=y | ||
| 1639 | # CONFIG_SCHEDSTATS is not set | ||
| 1640 | # CONFIG_TIMER_STATS is not set | ||
| 1641 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1642 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1643 | # CONFIG_SLUB_STATS is not set | ||
| 1644 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1645 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1646 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1647 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1648 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1649 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1650 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1651 | # CONFIG_DEBUG_HIGHMEM is not set | ||
| 1652 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1653 | CONFIG_DEBUG_INFO=y | ||
| 1654 | # CONFIG_DEBUG_VM is not set | ||
| 1655 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1656 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1657 | # CONFIG_DEBUG_LIST is not set | ||
| 1658 | # CONFIG_DEBUG_SG is not set | ||
| 1659 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1660 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1661 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1662 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1663 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1664 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1665 | # CONFIG_FAULT_INJECTION is not set | ||
| 1666 | # CONFIG_LATENCYTOP is not set | ||
| 1667 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1668 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1669 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1670 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1671 | |||
| 1672 | # | ||
| 1673 | # Tracers | ||
| 1674 | # | ||
| 1675 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1676 | # CONFIG_SCHED_TRACER is not set | ||
| 1677 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1678 | # CONFIG_BOOT_TRACER is not set | ||
| 1679 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1680 | # CONFIG_STACK_TRACER is not set | ||
| 1681 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1682 | # CONFIG_SAMPLES is not set | ||
| 1683 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1684 | # CONFIG_KGDB is not set | ||
| 1685 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1686 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
| 1687 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1688 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1689 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
| 1690 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1691 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1692 | # CONFIG_XMON is not set | ||
| 1693 | # CONFIG_IRQSTACKS is not set | ||
| 1694 | # CONFIG_VIRQ_DEBUG is not set | ||
| 1695 | # CONFIG_BDI_SWITCH is not set | ||
| 1696 | # CONFIG_PPC_EARLY_DEBUG is not set | ||
| 1697 | |||
| 1698 | # | ||
| 1699 | # Security options | ||
| 1700 | # | ||
| 1701 | # CONFIG_KEYS is not set | ||
| 1702 | # CONFIG_SECURITY is not set | ||
| 1703 | # CONFIG_SECURITYFS is not set | ||
| 1704 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1705 | CONFIG_CRYPTO=y | ||
| 1706 | |||
| 1707 | # | ||
| 1708 | # Crypto core or helper | ||
| 1709 | # | ||
| 1710 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1711 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1712 | CONFIG_CRYPTO_ALGAPI2=y | ||
| 1713 | CONFIG_CRYPTO_AEAD=y | ||
| 1714 | CONFIG_CRYPTO_AEAD2=y | ||
| 1715 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1716 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1717 | CONFIG_CRYPTO_HASH=y | ||
| 1718 | CONFIG_CRYPTO_HASH2=y | ||
| 1719 | CONFIG_CRYPTO_RNG2=y | ||
| 1720 | CONFIG_CRYPTO_MANAGER=y | ||
| 1721 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1722 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1723 | # CONFIG_CRYPTO_NULL is not set | ||
| 1724 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1725 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1726 | # CONFIG_CRYPTO_TEST is not set | ||
| 1727 | |||
| 1728 | # | ||
| 1729 | # Authenticated Encryption with Associated Data | ||
| 1730 | # | ||
| 1731 | # CONFIG_CRYPTO_CCM is not set | ||
| 1732 | # CONFIG_CRYPTO_GCM is not set | ||
| 1733 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1734 | |||
| 1735 | # | ||
| 1736 | # Block modes | ||
| 1737 | # | ||
| 1738 | CONFIG_CRYPTO_CBC=y | ||
| 1739 | # CONFIG_CRYPTO_CTR is not set | ||
| 1740 | # CONFIG_CRYPTO_CTS is not set | ||
| 1741 | # CONFIG_CRYPTO_ECB is not set | ||
| 1742 | # CONFIG_CRYPTO_LRW is not set | ||
| 1743 | CONFIG_CRYPTO_PCBC=m | ||
| 1744 | # CONFIG_CRYPTO_XTS is not set | ||
| 1745 | |||
| 1746 | # | ||
| 1747 | # Hash modes | ||
| 1748 | # | ||
| 1749 | CONFIG_CRYPTO_HMAC=y | ||
| 1750 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1751 | |||
| 1752 | # | ||
| 1753 | # Digest | ||
| 1754 | # | ||
| 1755 | CONFIG_CRYPTO_CRC32C=m | ||
| 1756 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1757 | CONFIG_CRYPTO_MD5=y | ||
| 1758 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1759 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1760 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1761 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1762 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1763 | CONFIG_CRYPTO_SHA1=m | ||
| 1764 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1765 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1766 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1767 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1768 | |||
| 1769 | # | ||
| 1770 | # Ciphers | ||
| 1771 | # | ||
| 1772 | # CONFIG_CRYPTO_AES is not set | ||
| 1773 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1774 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1775 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1776 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1777 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1778 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1779 | CONFIG_CRYPTO_DES=y | ||
| 1780 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1781 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1782 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1783 | # CONFIG_CRYPTO_SEED is not set | ||
| 1784 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1785 | # CONFIG_CRYPTO_TEA is not set | ||
| 1786 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1787 | |||
| 1788 | # | ||
| 1789 | # Compression | ||
| 1790 | # | ||
| 1791 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1792 | # CONFIG_CRYPTO_LZO is not set | ||
| 1793 | |||
| 1794 | # | ||
| 1795 | # Random Number Generation | ||
| 1796 | # | ||
| 1797 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1798 | CONFIG_CRYPTO_HW=y | ||
| 1799 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1800 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
| 1801 | # CONFIG_PPC_CLOCK is not set | ||
| 1802 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig deleted file mode 100644 index f6fa0b761cb..00000000000 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ /dev/null | |||
| @@ -1,1802 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.29-rc2 | ||
| 4 | # Mon Jan 26 15:36:07 2009 | ||
| 5 | # | ||
| 6 | # CONFIG_PPC64 is not set | ||
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | CONFIG_PPC_85xx=y | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_E500=y | ||
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 19 | CONFIG_BOOKE=y | ||
| 20 | CONFIG_FSL_BOOKE=y | ||
| 21 | CONFIG_FSL_EMB_PERFMON=y | ||
| 22 | # CONFIG_PHYS_64BIT is not set | ||
| 23 | CONFIG_SPE=y | ||
| 24 | CONFIG_PPC_MMU_NOHASH=y | ||
| 25 | # CONFIG_PPC_MM_SLICES is not set | ||
| 26 | # CONFIG_SMP is not set | ||
| 27 | CONFIG_PPC32=y | ||
| 28 | CONFIG_WORD_SIZE=32 | ||
| 29 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | ||
| 30 | CONFIG_MMU=y | ||
| 31 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 32 | CONFIG_GENERIC_TIME=y | ||
| 33 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 34 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 35 | CONFIG_GENERIC_HARDIRQS=y | ||
| 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
| 37 | CONFIG_IRQ_PER_CPU=y | ||
| 38 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 40 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 41 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 42 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 43 | CONFIG_GENERIC_HWEIGHT=y | ||
| 44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 47 | CONFIG_PPC=y | ||
| 48 | CONFIG_EARLY_PRINTK=y | ||
| 49 | CONFIG_GENERIC_NVRAM=y | ||
| 50 | CONFIG_SCHED_OMIT_FRAME_POINTER=y | ||
| 51 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 52 | CONFIG_PPC_OF=y | ||
| 53 | CONFIG_OF=y | ||
| 54 | CONFIG_PPC_UDBG_16550=y | ||
| 55 | # CONFIG_GENERIC_TBSYNC is not set | ||
| 56 | CONFIG_AUDIT_ARCH=y | ||
| 57 | CONFIG_GENERIC_BUG=y | ||
| 58 | CONFIG_DEFAULT_UIMAGE=y | ||
| 59 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 60 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 62 | |||
| 63 | # | ||
| 64 | # General setup | ||
| 65 | # | ||
| 66 | CONFIG_EXPERIMENTAL=y | ||
| 67 | CONFIG_BROKEN_ON_SMP=y | ||
| 68 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 69 | CONFIG_LOCALVERSION="" | ||
| 70 | CONFIG_LOCALVERSION_AUTO=y | ||
| 71 | CONFIG_SWAP=y | ||
| 72 | CONFIG_SYSVIPC=y | ||
| 73 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 74 | CONFIG_POSIX_MQUEUE=y | ||
| 75 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 76 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 77 | # CONFIG_TASKSTATS is not set | ||
| 78 | CONFIG_AUDIT=y | ||
| 79 | # CONFIG_AUDITSYSCALL is not set | ||
| 80 | CONFIG_IKCONFIG=y | ||
| 81 | CONFIG_IKCONFIG_PROC=y | ||
| 82 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 83 | CONFIG_GROUP_SCHED=y | ||
| 84 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 85 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 86 | CONFIG_USER_SCHED=y | ||
| 87 | # CONFIG_CGROUP_SCHED is not set | ||
| 88 | # CONFIG_CGROUPS is not set | ||
| 89 | CONFIG_SYSFS_DEPRECATED=y | ||
| 90 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 91 | # CONFIG_RELAY is not set | ||
| 92 | # CONFIG_NAMESPACES is not set | ||
| 93 | CONFIG_BLK_DEV_INITRD=y | ||
| 94 | CONFIG_INITRAMFS_SOURCE="" | ||
| 95 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 96 | CONFIG_SYSCTL=y | ||
| 97 | CONFIG_EMBEDDED=y | ||
| 98 | CONFIG_SYSCTL_SYSCALL=y | ||
| 99 | CONFIG_KALLSYMS=y | ||
| 100 | CONFIG_KALLSYMS_ALL=y | ||
| 101 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
| 102 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 103 | CONFIG_HOTPLUG=y | ||
| 104 | CONFIG_PRINTK=y | ||
| 105 | CONFIG_BUG=y | ||
| 106 | CONFIG_ELF_CORE=y | ||
| 107 | CONFIG_COMPAT_BRK=y | ||
| 108 | CONFIG_BASE_FULL=y | ||
| 109 | CONFIG_FUTEX=y | ||
| 110 | CONFIG_ANON_INODES=y | ||
| 111 | CONFIG_EPOLL=y | ||
| 112 | CONFIG_SIGNALFD=y | ||
| 113 | CONFIG_TIMERFD=y | ||
| 114 | CONFIG_EVENTFD=y | ||
| 115 | CONFIG_SHMEM=y | ||
| 116 | CONFIG_AIO=y | ||
| 117 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 118 | CONFIG_PCI_QUIRKS=y | ||
| 119 | CONFIG_SLUB_DEBUG=y | ||
| 120 | # CONFIG_SLAB is not set | ||
| 121 | CONFIG_SLUB=y | ||
| 122 | # CONFIG_SLOB is not set | ||
| 123 | # CONFIG_PROFILING is not set | ||
| 124 | CONFIG_HAVE_OPROFILE=y | ||
| 125 | # CONFIG_KPROBES is not set | ||
| 126 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 127 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 128 | CONFIG_HAVE_KPROBES=y | ||
| 129 | CONFIG_HAVE_KRETPROBES=y | ||
| 130 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 132 | CONFIG_SLABINFO=y | ||
| 133 | CONFIG_RT_MUTEXES=y | ||
| 134 | CONFIG_BASE_SMALL=0 | ||
| 135 | CONFIG_MODULES=y | ||
| 136 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 137 | CONFIG_MODULE_UNLOAD=y | ||
| 138 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 139 | CONFIG_MODVERSIONS=y | ||
| 140 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 141 | CONFIG_BLOCK=y | ||
| 142 | CONFIG_LBD=y | ||
| 143 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 144 | # CONFIG_BLK_DEV_BSG is not set | ||
| 145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 146 | |||
| 147 | # | ||
| 148 | # IO Schedulers | ||
| 149 | # | ||
| 150 | CONFIG_IOSCHED_NOOP=y | ||
| 151 | CONFIG_IOSCHED_AS=y | ||
| 152 | CONFIG_IOSCHED_DEADLINE=y | ||
| 153 | CONFIG_IOSCHED_CFQ=y | ||
| 154 | # CONFIG_DEFAULT_AS is not set | ||
| 155 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 156 | CONFIG_DEFAULT_CFQ=y | ||
| 157 | # CONFIG_DEFAULT_NOOP is not set | ||
| 158 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 159 | CONFIG_CLASSIC_RCU=y | ||
| 160 | # CONFIG_TREE_RCU is not set | ||
| 161 | # CONFIG_PREEMPT_RCU is not set | ||
| 162 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 163 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 164 | # CONFIG_FREEZER is not set | ||
| 165 | |||
| 166 | # | ||
| 167 | # Platform support | ||
| 168 | # | ||
| 169 | # CONFIG_PPC_CELL is not set | ||
| 170 | # CONFIG_PPC_CELL_NATIVE is not set | ||
| 171 | # CONFIG_PQ2ADS is not set | ||
| 172 | CONFIG_MPC85xx=y | ||
| 173 | # CONFIG_MPC8540_ADS is not set | ||
| 174 | # CONFIG_MPC8560_ADS is not set | ||
| 175 | # CONFIG_MPC85xx_CDS is not set | ||
| 176 | # CONFIG_MPC85xx_MDS is not set | ||
| 177 | # CONFIG_MPC8536_DS is not set | ||
| 178 | CONFIG_MPC85xx_DS=y | ||
| 179 | # CONFIG_KSI8560 is not set | ||
| 180 | # CONFIG_STX_GP3 is not set | ||
| 181 | # CONFIG_TQM8540 is not set | ||
| 182 | # CONFIG_TQM8541 is not set | ||
| 183 | # CONFIG_TQM8548 is not set | ||
| 184 | # CONFIG_TQM8555 is not set | ||
| 185 | # CONFIG_TQM8560 is not set | ||
| 186 | # CONFIG_SBC8548 is not set | ||
| 187 | # CONFIG_SBC8560 is not set | ||
| 188 | # CONFIG_IPIC is not set | ||
| 189 | CONFIG_MPIC=y | ||
| 190 | # CONFIG_MPIC_WEIRD is not set | ||
| 191 | CONFIG_PPC_I8259=y | ||
| 192 | # CONFIG_PPC_RTAS is not set | ||
| 193 | # CONFIG_MMIO_NVRAM is not set | ||
| 194 | # CONFIG_PPC_MPC106 is not set | ||
| 195 | # CONFIG_PPC_970_NAP is not set | ||
| 196 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 197 | # CONFIG_GENERIC_IOMAP is not set | ||
| 198 | # CONFIG_CPU_FREQ is not set | ||
| 199 | # CONFIG_QUICC_ENGINE is not set | ||
| 200 | # CONFIG_CPM2 is not set | ||
| 201 | CONFIG_FSL_ULI1575=y | ||
| 202 | # CONFIG_MPC8xxx_GPIO is not set | ||
| 203 | # CONFIG_SIMPLE_GPIO is not set | ||
| 204 | |||
| 205 | # | ||
| 206 | # Kernel options | ||
| 207 | # | ||
| 208 | CONFIG_HIGHMEM=y | ||
| 209 | CONFIG_TICK_ONESHOT=y | ||
| 210 | CONFIG_NO_HZ=y | ||
| 211 | CONFIG_HIGH_RES_TIMERS=y | ||
| 212 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 213 | # CONFIG_HZ_100 is not set | ||
| 214 | CONFIG_HZ_250=y | ||
| 215 | # CONFIG_HZ_300 is not set | ||
| 216 | # CONFIG_HZ_1000 is not set | ||
| 217 | CONFIG_HZ=250 | ||
| 218 | CONFIG_SCHED_HRTICK=y | ||
| 219 | CONFIG_PREEMPT_NONE=y | ||
| 220 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 221 | # CONFIG_PREEMPT is not set | ||
| 222 | CONFIG_BINFMT_ELF=y | ||
| 223 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 224 | # CONFIG_HAVE_AOUT is not set | ||
| 225 | CONFIG_BINFMT_MISC=m | ||
| 226 | CONFIG_MATH_EMULATION=y | ||
| 227 | # CONFIG_IOMMU_HELPER is not set | ||
| 228 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 229 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 231 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 232 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 233 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 234 | CONFIG_FLATMEM_MANUAL=y | ||
| 235 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 236 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 237 | CONFIG_FLATMEM=y | ||
| 238 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 239 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 240 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 241 | CONFIG_MIGRATION=y | ||
| 242 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 243 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 244 | CONFIG_BOUNCE=y | ||
| 245 | CONFIG_VIRT_TO_BUS=y | ||
| 246 | CONFIG_UNEVICTABLE_LRU=y | ||
| 247 | CONFIG_PPC_4K_PAGES=y | ||
| 248 | # CONFIG_PPC_16K_PAGES is not set | ||
| 249 | # CONFIG_PPC_64K_PAGES is not set | ||
| 250 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 251 | CONFIG_PROC_DEVICETREE=y | ||
| 252 | # CONFIG_CMDLINE_BOOL is not set | ||
| 253 | CONFIG_EXTRA_TARGETS="" | ||
| 254 | # CONFIG_PM is not set | ||
| 255 | CONFIG_SECCOMP=y | ||
| 256 | CONFIG_ISA_DMA_API=y | ||
| 257 | |||
| 258 | # | ||
| 259 | # Bus options | ||
| 260 | # | ||
| 261 | CONFIG_ZONE_DMA=y | ||
| 262 | CONFIG_GENERIC_ISA_DMA=y | ||
| 263 | CONFIG_PPC_INDIRECT_PCI=y | ||
| 264 | CONFIG_FSL_SOC=y | ||
| 265 | CONFIG_FSL_PCI=y | ||
| 266 | CONFIG_PPC_PCI_CHOICE=y | ||
| 267 | CONFIG_PCI=y | ||
| 268 | CONFIG_PCI_DOMAINS=y | ||
| 269 | CONFIG_PCI_SYSCALL=y | ||
| 270 | # CONFIG_PCIEPORTBUS is not set | ||
| 271 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 272 | # CONFIG_PCI_MSI is not set | ||
| 273 | # CONFIG_PCI_LEGACY is not set | ||
| 274 | # CONFIG_PCI_DEBUG is not set | ||
| 275 | # CONFIG_PCI_STUB is not set | ||
| 276 | # CONFIG_PCCARD is not set | ||
| 277 | # CONFIG_HOTPLUG_PCI is not set | ||
| 278 | # CONFIG_HAS_RAPIDIO is not set | ||
| 279 | |||
| 280 | # | ||
| 281 | # Advanced setup | ||
| 282 | # | ||
| 283 | # CONFIG_ADVANCED_OPTIONS is not set | ||
| 284 | |||
| 285 | # | ||
| 286 | # Default settings for advanced configuration options are used | ||
| 287 | # | ||
| 288 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
| 289 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 290 | CONFIG_KERNEL_START=0xc0000000 | ||
| 291 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 292 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 293 | CONFIG_TASK_SIZE=0xc0000000 | ||
| 294 | CONFIG_NET=y | ||
| 295 | |||
| 296 | # | ||
| 297 | # Networking options | ||
| 298 | # | ||
| 299 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 300 | CONFIG_PACKET=y | ||
| 301 | # CONFIG_PACKET_MMAP is not set | ||
| 302 | CONFIG_UNIX=y | ||
| 303 | CONFIG_XFRM=y | ||
| 304 | CONFIG_XFRM_USER=y | ||
| 305 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 306 | # CONFIG_XFRM_MIGRATE is not set | ||
| 307 | # CONFIG_XFRM_STATISTICS is not set | ||
| 308 | CONFIG_NET_KEY=m | ||
| 309 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 310 | CONFIG_INET=y | ||
| 311 | CONFIG_IP_MULTICAST=y | ||
| 312 | CONFIG_IP_ADVANCED_ROUTER=y | ||
| 313 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 314 | # CONFIG_IP_FIB_TRIE is not set | ||
| 315 | CONFIG_IP_FIB_HASH=y | ||
| 316 | CONFIG_IP_MULTIPLE_TABLES=y | ||
| 317 | CONFIG_IP_ROUTE_MULTIPATH=y | ||
| 318 | CONFIG_IP_ROUTE_VERBOSE=y | ||
| 319 | CONFIG_IP_PNP=y | ||
| 320 | CONFIG_IP_PNP_DHCP=y | ||
| 321 | CONFIG_IP_PNP_BOOTP=y | ||
| 322 | CONFIG_IP_PNP_RARP=y | ||
| 323 | CONFIG_NET_IPIP=y | ||
| 324 | CONFIG_NET_IPGRE=y | ||
| 325 | CONFIG_NET_IPGRE_BROADCAST=y | ||
| 326 | CONFIG_IP_MROUTE=y | ||
| 327 | CONFIG_IP_PIMSM_V1=y | ||
| 328 | CONFIG_IP_PIMSM_V2=y | ||
| 329 | CONFIG_ARPD=y | ||
| 330 | # CONFIG_SYN_COOKIES is not set | ||
| 331 | # CONFIG_INET_AH is not set | ||
| 332 | # CONFIG_INET_ESP is not set | ||
| 333 | # CONFIG_INET_IPCOMP is not set | ||
| 334 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 335 | CONFIG_INET_TUNNEL=y | ||
| 336 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 337 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 338 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 339 | # CONFIG_INET_LRO is not set | ||
| 340 | CONFIG_INET_DIAG=y | ||
| 341 | CONFIG_INET_TCP_DIAG=y | ||
| 342 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 343 | CONFIG_TCP_CONG_CUBIC=y | ||
| 344 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 345 | # CONFIG_TCP_MD5SIG is not set | ||
| 346 | CONFIG_IPV6=y | ||
| 347 | # CONFIG_IPV6_PRIVACY is not set | ||
| 348 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 349 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 350 | # CONFIG_INET6_AH is not set | ||
| 351 | # CONFIG_INET6_ESP is not set | ||
| 352 | # CONFIG_INET6_IPCOMP is not set | ||
| 353 | # CONFIG_IPV6_MIP6 is not set | ||
| 354 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 355 | # CONFIG_INET6_TUNNEL is not set | ||
| 356 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | ||
| 357 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | ||
| 358 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
| 359 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 360 | CONFIG_IPV6_SIT=y | ||
| 361 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 362 | # CONFIG_IPV6_TUNNEL is not set | ||
| 363 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 364 | # CONFIG_IPV6_MROUTE is not set | ||
| 365 | # CONFIG_NETWORK_SECMARK is not set | ||
| 366 | # CONFIG_NETFILTER is not set | ||
| 367 | # CONFIG_IP_DCCP is not set | ||
| 368 | CONFIG_IP_SCTP=m | ||
| 369 | # CONFIG_SCTP_DBG_MSG is not set | ||
| 370 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
| 371 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 372 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 373 | CONFIG_SCTP_HMAC_MD5=y | ||
| 374 | # CONFIG_TIPC is not set | ||
| 375 | # CONFIG_ATM is not set | ||
| 376 | # CONFIG_BRIDGE is not set | ||
| 377 | # CONFIG_NET_DSA is not set | ||
| 378 | # CONFIG_VLAN_8021Q is not set | ||
| 379 | # CONFIG_DECNET is not set | ||
| 380 | # CONFIG_LLC2 is not set | ||
| 381 | # CONFIG_IPX is not set | ||
| 382 | # CONFIG_ATALK is not set | ||
| 383 | # CONFIG_X25 is not set | ||
| 384 | # CONFIG_LAPB is not set | ||
| 385 | # CONFIG_ECONET is not set | ||
| 386 | # CONFIG_WAN_ROUTER is not set | ||
| 387 | # CONFIG_NET_SCHED is not set | ||
| 388 | # CONFIG_DCB is not set | ||
| 389 | |||
| 390 | # | ||
| 391 | # Network testing | ||
| 392 | # | ||
| 393 | # CONFIG_NET_PKTGEN is not set | ||
| 394 | # CONFIG_HAMRADIO is not set | ||
| 395 | # CONFIG_CAN is not set | ||
| 396 | # CONFIG_IRDA is not set | ||
| 397 | # CONFIG_BT is not set | ||
| 398 | # CONFIG_AF_RXRPC is not set | ||
| 399 | # CONFIG_PHONET is not set | ||
| 400 | CONFIG_FIB_RULES=y | ||
| 401 | CONFIG_WIRELESS=y | ||
| 402 | # CONFIG_CFG80211 is not set | ||
| 403 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 404 | # CONFIG_WIRELESS_EXT is not set | ||
| 405 | # CONFIG_LIB80211 is not set | ||
| 406 | # CONFIG_MAC80211 is not set | ||
| 407 | # CONFIG_WIMAX is not set | ||
| 408 | # CONFIG_RFKILL is not set | ||
| 409 | # CONFIG_NET_9P is not set | ||
| 410 | |||
| 411 | # | ||
| 412 | # Device Drivers | ||
| 413 | # | ||
| 414 | |||
| 415 | # | ||
| 416 | # Generic Driver Options | ||
| 417 | # | ||
| 418 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 419 | CONFIG_STANDALONE=y | ||
| 420 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 421 | CONFIG_FW_LOADER=y | ||
| 422 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 423 | CONFIG_EXTRA_FIRMWARE="" | ||
| 424 | # CONFIG_DEBUG_DRIVER is not set | ||
| 425 | # CONFIG_DEBUG_DEVRES is not set | ||
| 426 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 427 | # CONFIG_CONNECTOR is not set | ||
| 428 | # CONFIG_MTD is not set | ||
| 429 | CONFIG_OF_DEVICE=y | ||
| 430 | CONFIG_OF_I2C=y | ||
| 431 | # CONFIG_PARPORT is not set | ||
| 432 | CONFIG_BLK_DEV=y | ||
| 433 | # CONFIG_BLK_DEV_FD is not set | ||
| 434 | # CONFIG_BLK_CPQ_DA is not set | ||
| 435 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 436 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 437 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 438 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 439 | CONFIG_BLK_DEV_LOOP=y | ||
| 440 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 441 | CONFIG_BLK_DEV_NBD=y | ||
| 442 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 443 | # CONFIG_BLK_DEV_UB is not set | ||
| 444 | CONFIG_BLK_DEV_RAM=y | ||
| 445 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 446 | CONFIG_BLK_DEV_RAM_SIZE=131072 | ||
| 447 | # CONFIG_BLK_DEV_XIP is not set | ||
| 448 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 449 | # CONFIG_ATA_OVER_ETH is not set | ||
| 450 | # CONFIG_BLK_DEV_HD is not set | ||
| 451 | CONFIG_MISC_DEVICES=y | ||
| 452 | # CONFIG_PHANTOM is not set | ||
| 453 | # CONFIG_EEPROM_93CX6 is not set | ||
| 454 | # CONFIG_SGI_IOC4 is not set | ||
| 455 | # CONFIG_TIFM_CORE is not set | ||
| 456 | # CONFIG_ICS932S401 is not set | ||
| 457 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 458 | # CONFIG_HP_ILO is not set | ||
| 459 | # CONFIG_C2PORT is not set | ||
| 460 | CONFIG_HAVE_IDE=y | ||
| 461 | # CONFIG_IDE is not set | ||
| 462 | |||
| 463 | # | ||
| 464 | # SCSI device support | ||
| 465 | # | ||
| 466 | # CONFIG_RAID_ATTRS is not set | ||
| 467 | CONFIG_SCSI=y | ||
| 468 | CONFIG_SCSI_DMA=y | ||
| 469 | # CONFIG_SCSI_TGT is not set | ||
| 470 | # CONFIG_SCSI_NETLINK is not set | ||
| 471 | CONFIG_SCSI_PROC_FS=y | ||
| 472 | |||
| 473 | # | ||
| 474 | # SCSI support type (disk, tape, CD-ROM) | ||
| 475 | # | ||
| 476 | CONFIG_BLK_DEV_SD=y | ||
| 477 | CONFIG_CHR_DEV_ST=y | ||
| 478 | # CONFIG_CHR_DEV_OSST is not set | ||
| 479 | CONFIG_BLK_DEV_SR=y | ||
| 480 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 481 | CONFIG_CHR_DEV_SG=y | ||
| 482 | # CONFIG_CHR_DEV_SCH is not set | ||
| 483 | |||
| 484 | # | ||
| 485 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 486 | # | ||
| 487 | CONFIG_SCSI_MULTI_LUN=y | ||
| 488 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 489 | CONFIG_SCSI_LOGGING=y | ||
| 490 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 491 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 492 | |||
| 493 | # | ||
| 494 | # SCSI Transports | ||
| 495 | # | ||
| 496 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 497 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 498 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 499 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 500 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 501 | CONFIG_SCSI_LOWLEVEL=y | ||
| 502 | # CONFIG_ISCSI_TCP is not set | ||
| 503 | # CONFIG_SCSI_CXGB3_ISCSI is not set | ||
| 504 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 505 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 506 | # CONFIG_SCSI_ACARD is not set | ||
| 507 | # CONFIG_SCSI_AACRAID is not set | ||
| 508 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 509 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 510 | # CONFIG_SCSI_AIC79XX is not set | ||
| 511 | # CONFIG_SCSI_AIC94XX is not set | ||
| 512 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 513 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 514 | # CONFIG_SCSI_ARCMSR is not set | ||
| 515 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 516 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 517 | # CONFIG_MEGARAID_SAS is not set | ||
| 518 | # CONFIG_SCSI_HPTIOP is not set | ||
| 519 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 520 | # CONFIG_LIBFC is not set | ||
| 521 | # CONFIG_FCOE is not set | ||
| 522 | # CONFIG_SCSI_DMX3191D is not set | ||
| 523 | # CONFIG_SCSI_EATA is not set | ||
| 524 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 525 | # CONFIG_SCSI_GDTH is not set | ||
| 526 | # CONFIG_SCSI_IPS is not set | ||
| 527 | # CONFIG_SCSI_INITIO is not set | ||
| 528 | # CONFIG_SCSI_INIA100 is not set | ||
| 529 | # CONFIG_SCSI_MVSAS is not set | ||
| 530 | # CONFIG_SCSI_STEX is not set | ||
| 531 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 532 | # CONFIG_SCSI_IPR is not set | ||
| 533 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 534 | # CONFIG_SCSI_QLA_FC is not set | ||
| 535 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 536 | # CONFIG_SCSI_LPFC is not set | ||
| 537 | # CONFIG_SCSI_DC395x is not set | ||
| 538 | # CONFIG_SCSI_DC390T is not set | ||
| 539 | # CONFIG_SCSI_NSP32 is not set | ||
| 540 | # CONFIG_SCSI_DEBUG is not set | ||
| 541 | # CONFIG_SCSI_SRP is not set | ||
| 542 | # CONFIG_SCSI_DH is not set | ||
| 543 | CONFIG_ATA=y | ||
| 544 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 545 | CONFIG_SATA_PMP=y | ||
| 546 | CONFIG_SATA_AHCI=y | ||
| 547 | # CONFIG_SATA_SIL24 is not set | ||
| 548 | # CONFIG_SATA_FSL is not set | ||
| 549 | CONFIG_ATA_SFF=y | ||
| 550 | # CONFIG_SATA_SVW is not set | ||
| 551 | # CONFIG_ATA_PIIX is not set | ||
| 552 | # CONFIG_SATA_MV is not set | ||
| 553 | # CONFIG_SATA_NV is not set | ||
| 554 | # CONFIG_PDC_ADMA is not set | ||
| 555 | # CONFIG_SATA_QSTOR is not set | ||
| 556 | # CONFIG_SATA_PROMISE is not set | ||
| 557 | # CONFIG_SATA_SX4 is not set | ||
| 558 | # CONFIG_SATA_SIL is not set | ||
| 559 | # CONFIG_SATA_SIS is not set | ||
| 560 | # CONFIG_SATA_ULI is not set | ||
| 561 | # CONFIG_SATA_VIA is not set | ||
| 562 | # CONFIG_SATA_VITESSE is not set | ||
| 563 | # CONFIG_SATA_INIC162X is not set | ||
| 564 | CONFIG_PATA_ALI=y | ||
| 565 | # CONFIG_PATA_AMD is not set | ||
| 566 | # CONFIG_PATA_ARTOP is not set | ||
| 567 | # CONFIG_PATA_ATIIXP is not set | ||
| 568 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 569 | # CONFIG_PATA_CMD64X is not set | ||
| 570 | # CONFIG_PATA_CS5520 is not set | ||
| 571 | # CONFIG_PATA_CS5530 is not set | ||
| 572 | # CONFIG_PATA_CYPRESS is not set | ||
| 573 | # CONFIG_PATA_EFAR is not set | ||
| 574 | # CONFIG_ATA_GENERIC is not set | ||
| 575 | # CONFIG_PATA_HPT366 is not set | ||
| 576 | # CONFIG_PATA_HPT37X is not set | ||
| 577 | # CONFIG_PATA_HPT3X2N is not set | ||
| 578 | # CONFIG_PATA_HPT3X3 is not set | ||
| 579 | # CONFIG_PATA_IT821X is not set | ||
| 580 | # CONFIG_PATA_IT8213 is not set | ||
| 581 | # CONFIG_PATA_JMICRON is not set | ||
| 582 | # CONFIG_PATA_TRIFLEX is not set | ||
| 583 | # CONFIG_PATA_MARVELL is not set | ||
| 584 | # CONFIG_PATA_MPIIX is not set | ||
| 585 | # CONFIG_PATA_OLDPIIX is not set | ||
| 586 | # CONFIG_PATA_NETCELL is not set | ||
| 587 | # CONFIG_PATA_NINJA32 is not set | ||
| 588 | # CONFIG_PATA_NS87410 is not set | ||
| 589 | # CONFIG_PATA_NS87415 is not set | ||
| 590 | # CONFIG_PATA_OPTI is not set | ||
| 591 | # CONFIG_PATA_OPTIDMA is not set | ||
| 592 | # CONFIG_PATA_PDC_OLD is not set | ||
| 593 | # CONFIG_PATA_RADISYS is not set | ||
| 594 | # CONFIG_PATA_RZ1000 is not set | ||
| 595 | # CONFIG_PATA_SC1200 is not set | ||
| 596 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 597 | # CONFIG_PATA_PDC2027X is not set | ||
| 598 | # CONFIG_PATA_SIL680 is not set | ||
| 599 | # CONFIG_PATA_SIS is not set | ||
| 600 | # CONFIG_PATA_VIA is not set | ||
| 601 | # CONFIG_PATA_WINBOND is not set | ||
| 602 | # CONFIG_PATA_PLATFORM is not set | ||
| 603 | # CONFIG_PATA_SCH is not set | ||
| 604 | # CONFIG_MD is not set | ||
| 605 | # CONFIG_FUSION is not set | ||
| 606 | |||
| 607 | # | ||
| 608 | # IEEE 1394 (FireWire) support | ||
| 609 | # | ||
| 610 | |||
| 611 | # | ||
| 612 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 613 | # | ||
| 614 | # CONFIG_FIREWIRE is not set | ||
| 615 | # CONFIG_IEEE1394 is not set | ||
| 616 | # CONFIG_I2O is not set | ||
| 617 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
| 618 | CONFIG_NETDEVICES=y | ||
| 619 | CONFIG_DUMMY=y | ||
| 620 | # CONFIG_BONDING is not set | ||
| 621 | # CONFIG_MACVLAN is not set | ||
| 622 | # CONFIG_EQUALIZER is not set | ||
| 623 | # CONFIG_TUN is not set | ||
| 624 | # CONFIG_VETH is not set | ||
| 625 | # CONFIG_ARCNET is not set | ||
| 626 | CONFIG_PHYLIB=y | ||
| 627 | |||
| 628 | # | ||
| 629 | # MII PHY device drivers | ||
| 630 | # | ||
| 631 | # CONFIG_MARVELL_PHY is not set | ||
| 632 | # CONFIG_DAVICOM_PHY is not set | ||
| 633 | # CONFIG_QSEMI_PHY is not set | ||
| 634 | # CONFIG_LXT_PHY is not set | ||
| 635 | # CONFIG_CICADA_PHY is not set | ||
| 636 | CONFIG_VITESSE_PHY=y | ||
| 637 | # CONFIG_SMSC_PHY is not set | ||
| 638 | # CONFIG_BROADCOM_PHY is not set | ||
| 639 | # CONFIG_ICPLUS_PHY is not set | ||
| 640 | # CONFIG_REALTEK_PHY is not set | ||
| 641 | # CONFIG_NATIONAL_PHY is not set | ||
| 642 | # CONFIG_STE10XP is not set | ||
| 643 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 644 | # CONFIG_FIXED_PHY is not set | ||
| 645 | # CONFIG_MDIO_BITBANG is not set | ||
| 646 | CONFIG_NET_ETHERNET=y | ||
| 647 | CONFIG_MII=y | ||
| 648 | # CONFIG_HAPPYMEAL is not set | ||
| 649 | # CONFIG_SUNGEM is not set | ||
| 650 | # CONFIG_CASSINI is not set | ||
| 651 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 652 | # CONFIG_NET_TULIP is not set | ||
| 653 | # CONFIG_HP100 is not set | ||
| 654 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 655 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 656 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 657 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 658 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 659 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 660 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 661 | # CONFIG_NET_PCI is not set | ||
| 662 | # CONFIG_B44 is not set | ||
| 663 | # CONFIG_ATL2 is not set | ||
| 664 | CONFIG_NETDEV_1000=y | ||
| 665 | # CONFIG_ACENIC is not set | ||
| 666 | # CONFIG_DL2K is not set | ||
| 667 | # CONFIG_E1000 is not set | ||
| 668 | # CONFIG_E1000E is not set | ||
| 669 | # CONFIG_IP1000 is not set | ||
| 670 | # CONFIG_IGB is not set | ||
| 671 | # CONFIG_NS83820 is not set | ||
| 672 | # CONFIG_HAMACHI is not set | ||
| 673 | # CONFIG_YELLOWFIN is not set | ||
| 674 | # CONFIG_R8169 is not set | ||
| 675 | # CONFIG_SIS190 is not set | ||
| 676 | # CONFIG_SKGE is not set | ||
| 677 | # CONFIG_SKY2 is not set | ||
| 678 | # CONFIG_VIA_VELOCITY is not set | ||
| 679 | # CONFIG_TIGON3 is not set | ||
| 680 | # CONFIG_BNX2 is not set | ||
| 681 | CONFIG_GIANFAR=y | ||
| 682 | # CONFIG_QLA3XXX is not set | ||
| 683 | # CONFIG_ATL1 is not set | ||
| 684 | # CONFIG_ATL1E is not set | ||
| 685 | # CONFIG_JME is not set | ||
| 686 | CONFIG_NETDEV_10000=y | ||
| 687 | # CONFIG_CHELSIO_T1 is not set | ||
| 688 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
| 689 | # CONFIG_CHELSIO_T3 is not set | ||
| 690 | # CONFIG_ENIC is not set | ||
| 691 | # CONFIG_IXGBE is not set | ||
| 692 | # CONFIG_IXGB is not set | ||
| 693 | # CONFIG_S2IO is not set | ||
| 694 | # CONFIG_MYRI10GE is not set | ||
| 695 | # CONFIG_NETXEN_NIC is not set | ||
| 696 | # CONFIG_NIU is not set | ||
| 697 | # CONFIG_MLX4_EN is not set | ||
| 698 | # CONFIG_MLX4_CORE is not set | ||
| 699 | # CONFIG_TEHUTI is not set | ||
| 700 | # CONFIG_BNX2X is not set | ||
| 701 | # CONFIG_QLGE is not set | ||
| 702 | # CONFIG_SFC is not set | ||
| 703 | # CONFIG_TR is not set | ||
| 704 | |||
| 705 | # | ||
| 706 | # Wireless LAN | ||
| 707 | # | ||
| 708 | # CONFIG_WLAN_PRE80211 is not set | ||
| 709 | # CONFIG_WLAN_80211 is not set | ||
| 710 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 711 | |||
| 712 | # | ||
| 713 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 714 | # | ||
| 715 | |||
| 716 | # | ||
| 717 | # USB Network Adapters | ||
| 718 | # | ||
| 719 | # CONFIG_USB_CATC is not set | ||
| 720 | # CONFIG_USB_KAWETH is not set | ||
| 721 | # CONFIG_USB_PEGASUS is not set | ||
| 722 | # CONFIG_USB_RTL8150 is not set | ||
| 723 | # CONFIG_USB_USBNET is not set | ||
| 724 | # CONFIG_WAN is not set | ||
| 725 | # CONFIG_FDDI is not set | ||
| 726 | # CONFIG_HIPPI is not set | ||
| 727 | # CONFIG_PPP is not set | ||
| 728 | # CONFIG_SLIP is not set | ||
| 729 | # CONFIG_NET_FC is not set | ||
| 730 | # CONFIG_NETCONSOLE is not set | ||
| 731 | # CONFIG_NETPOLL is not set | ||
| 732 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 733 | # CONFIG_ISDN is not set | ||
| 734 | # CONFIG_PHONE is not set | ||
| 735 | |||
| 736 | # | ||
| 737 | # Input device support | ||
| 738 | # | ||
| 739 | CONFIG_INPUT=y | ||
| 740 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 741 | # CONFIG_INPUT_POLLDEV is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # Userland interfaces | ||
| 745 | # | ||
| 746 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 747 | # CONFIG_INPUT_JOYDEV is not set | ||
| 748 | # CONFIG_INPUT_EVDEV is not set | ||
| 749 | # CONFIG_INPUT_EVBUG is not set | ||
| 750 | |||
| 751 | # | ||
| 752 | # Input Device Drivers | ||
| 753 | # | ||
| 754 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 755 | # CONFIG_INPUT_MOUSE is not set | ||
| 756 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 757 | # CONFIG_INPUT_TABLET is not set | ||
| 758 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 759 | # CONFIG_INPUT_MISC is not set | ||
| 760 | |||
| 761 | # | ||
| 762 | # Hardware I/O ports | ||
| 763 | # | ||
| 764 | CONFIG_SERIO=y | ||
| 765 | CONFIG_SERIO_I8042=y | ||
| 766 | CONFIG_SERIO_SERPORT=y | ||
| 767 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 768 | CONFIG_SERIO_LIBPS2=y | ||
| 769 | # CONFIG_SERIO_RAW is not set | ||
| 770 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
| 771 | # CONFIG_GAMEPORT is not set | ||
| 772 | |||
| 773 | # | ||
| 774 | # Character devices | ||
| 775 | # | ||
| 776 | CONFIG_VT=y | ||
| 777 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 778 | CONFIG_VT_CONSOLE=y | ||
| 779 | CONFIG_HW_CONSOLE=y | ||
| 780 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 781 | CONFIG_DEVKMEM=y | ||
| 782 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 783 | # CONFIG_NOZOMI is not set | ||
| 784 | |||
| 785 | # | ||
| 786 | # Serial drivers | ||
| 787 | # | ||
| 788 | CONFIG_SERIAL_8250=y | ||
| 789 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 790 | CONFIG_SERIAL_8250_PCI=y | ||
| 791 | CONFIG_SERIAL_8250_NR_UARTS=2 | ||
| 792 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | ||
| 793 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 794 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 795 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 796 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 797 | CONFIG_SERIAL_8250_RSA=y | ||
| 798 | |||
| 799 | # | ||
| 800 | # Non-8250 serial port support | ||
| 801 | # | ||
| 802 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 803 | CONFIG_SERIAL_CORE=y | ||
| 804 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 805 | # CONFIG_SERIAL_JSM is not set | ||
| 806 | # CONFIG_SERIAL_OF_PLATFORM is not set | ||
| 807 | CONFIG_UNIX98_PTYS=y | ||
| 808 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 809 | CONFIG_LEGACY_PTYS=y | ||
| 810 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 811 | # CONFIG_HVC_UDBG is not set | ||
| 812 | # CONFIG_IPMI_HANDLER is not set | ||
| 813 | CONFIG_HW_RANDOM=y | ||
| 814 | CONFIG_NVRAM=y | ||
| 815 | # CONFIG_R3964 is not set | ||
| 816 | # CONFIG_APPLICOM is not set | ||
| 817 | # CONFIG_RAW_DRIVER is not set | ||
| 818 | # CONFIG_TCG_TPM is not set | ||
| 819 | CONFIG_DEVPORT=y | ||
| 820 | CONFIG_I2C=y | ||
| 821 | CONFIG_I2C_BOARDINFO=y | ||
| 822 | # CONFIG_I2C_CHARDEV is not set | ||
| 823 | CONFIG_I2C_HELPER_AUTO=y | ||
| 824 | |||
| 825 | # | ||
| 826 | # I2C Hardware Bus support | ||
| 827 | # | ||
| 828 | |||
| 829 | # | ||
| 830 | # PC SMBus host controller drivers | ||
| 831 | # | ||
| 832 | # CONFIG_I2C_ALI1535 is not set | ||
| 833 | # CONFIG_I2C_ALI1563 is not set | ||
| 834 | # CONFIG_I2C_ALI15X3 is not set | ||
| 835 | # CONFIG_I2C_AMD756 is not set | ||
| 836 | # CONFIG_I2C_AMD8111 is not set | ||
| 837 | # CONFIG_I2C_I801 is not set | ||
| 838 | # CONFIG_I2C_ISCH is not set | ||
| 839 | # CONFIG_I2C_PIIX4 is not set | ||
| 840 | # CONFIG_I2C_NFORCE2 is not set | ||
| 841 | # CONFIG_I2C_SIS5595 is not set | ||
| 842 | # CONFIG_I2C_SIS630 is not set | ||
| 843 | # CONFIG_I2C_SIS96X is not set | ||
| 844 | # CONFIG_I2C_VIA is not set | ||
| 845 | # CONFIG_I2C_VIAPRO is not set | ||
| 846 | |||
| 847 | # | ||
| 848 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 849 | # | ||
| 850 | CONFIG_I2C_MPC=y | ||
| 851 | # CONFIG_I2C_OCORES is not set | ||
| 852 | # CONFIG_I2C_SIMTEC is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # External I2C/SMBus adapter drivers | ||
| 856 | # | ||
| 857 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 858 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 859 | # CONFIG_I2C_TINY_USB is not set | ||
| 860 | |||
| 861 | # | ||
| 862 | # Graphics adapter I2C/DDC channel drivers | ||
| 863 | # | ||
| 864 | # CONFIG_I2C_VOODOO3 is not set | ||
| 865 | |||
| 866 | # | ||
| 867 | # Other I2C/SMBus bus drivers | ||
| 868 | # | ||
| 869 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 870 | # CONFIG_I2C_STUB is not set | ||
| 871 | |||
| 872 | # | ||
| 873 | # Miscellaneous I2C Chip support | ||
| 874 | # | ||
| 875 | # CONFIG_DS1682 is not set | ||
| 876 | # CONFIG_EEPROM_AT24 is not set | ||
| 877 | CONFIG_EEPROM_LEGACY=y | ||
| 878 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 879 | # CONFIG_PCF8575 is not set | ||
| 880 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 881 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 882 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 883 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 884 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 885 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 886 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 887 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 888 | # CONFIG_SPI is not set | ||
| 889 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 890 | # CONFIG_GPIOLIB is not set | ||
| 891 | # CONFIG_W1 is not set | ||
| 892 | # CONFIG_POWER_SUPPLY is not set | ||
| 893 | # CONFIG_HWMON is not set | ||
| 894 | # CONFIG_THERMAL is not set | ||
| 895 | # CONFIG_THERMAL_HWMON is not set | ||
| 896 | # CONFIG_WATCHDOG is not set | ||
| 897 | CONFIG_SSB_POSSIBLE=y | ||
| 898 | |||
| 899 | # | ||
| 900 | # Sonics Silicon Backplane | ||
| 901 | # | ||
| 902 | # CONFIG_SSB is not set | ||
| 903 | |||
| 904 | # | ||
| 905 | # Multifunction device drivers | ||
| 906 | # | ||
| 907 | # CONFIG_MFD_CORE is not set | ||
| 908 | # CONFIG_MFD_SM501 is not set | ||
| 909 | # CONFIG_HTC_PASIC3 is not set | ||
| 910 | # CONFIG_TWL4030_CORE is not set | ||
| 911 | # CONFIG_MFD_TMIO is not set | ||
| 912 | # CONFIG_PMIC_DA903X is not set | ||
| 913 | # CONFIG_MFD_WM8400 is not set | ||
| 914 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 915 | # CONFIG_MFD_PCF50633 is not set | ||
| 916 | # CONFIG_REGULATOR is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # Multimedia devices | ||
| 920 | # | ||
| 921 | |||
| 922 | # | ||
| 923 | # Multimedia core support | ||
| 924 | # | ||
| 925 | # CONFIG_VIDEO_DEV is not set | ||
| 926 | CONFIG_DVB_CORE=m | ||
| 927 | CONFIG_VIDEO_MEDIA=m | ||
| 928 | |||
| 929 | # | ||
| 930 | # Multimedia drivers | ||
| 931 | # | ||
| 932 | # CONFIG_MEDIA_ATTACH is not set | ||
| 933 | CONFIG_MEDIA_TUNER=m | ||
| 934 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 935 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 936 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 937 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 938 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 939 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 940 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 941 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 942 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 943 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
| 944 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
| 945 | |||
| 946 | # | ||
| 947 | # Supported SAA7146 based PCI Adapters | ||
| 948 | # | ||
| 949 | # CONFIG_TTPCI_EEPROM is not set | ||
| 950 | # CONFIG_DVB_BUDGET_CORE is not set | ||
| 951 | |||
| 952 | # | ||
| 953 | # Supported USB Adapters | ||
| 954 | # | ||
| 955 | # CONFIG_DVB_USB is not set | ||
| 956 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
| 957 | # CONFIG_DVB_TTUSB_DEC is not set | ||
| 958 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
| 959 | |||
| 960 | # | ||
| 961 | # Supported FlexCopII (B2C2) Adapters | ||
| 962 | # | ||
| 963 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
| 964 | |||
| 965 | # | ||
| 966 | # Supported BT878 Adapters | ||
| 967 | # | ||
| 968 | |||
| 969 | # | ||
| 970 | # Supported Pluto2 Adapters | ||
| 971 | # | ||
| 972 | # CONFIG_DVB_PLUTO2 is not set | ||
| 973 | |||
| 974 | # | ||
| 975 | # Supported SDMC DM1105 Adapters | ||
| 976 | # | ||
| 977 | # CONFIG_DVB_DM1105 is not set | ||
| 978 | |||
| 979 | # | ||
| 980 | # Supported DVB Frontends | ||
| 981 | # | ||
| 982 | |||
| 983 | # | ||
| 984 | # Customise DVB Frontends | ||
| 985 | # | ||
| 986 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
| 987 | |||
| 988 | # | ||
| 989 | # Multistandard (satellite) frontends | ||
| 990 | # | ||
| 991 | # CONFIG_DVB_STB0899 is not set | ||
| 992 | # CONFIG_DVB_STB6100 is not set | ||
| 993 | |||
| 994 | # | ||
| 995 | # DVB-S (satellite) frontends | ||
| 996 | # | ||
| 997 | # CONFIG_DVB_CX24110 is not set | ||
| 998 | # CONFIG_DVB_CX24123 is not set | ||
| 999 | # CONFIG_DVB_MT312 is not set | ||
| 1000 | # CONFIG_DVB_S5H1420 is not set | ||
| 1001 | # CONFIG_DVB_STV0288 is not set | ||
| 1002 | # CONFIG_DVB_STB6000 is not set | ||
| 1003 | # CONFIG_DVB_STV0299 is not set | ||
| 1004 | # CONFIG_DVB_TDA8083 is not set | ||
| 1005 | # CONFIG_DVB_TDA10086 is not set | ||
| 1006 | # CONFIG_DVB_TDA8261 is not set | ||
| 1007 | # CONFIG_DVB_VES1X93 is not set | ||
| 1008 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 1009 | # CONFIG_DVB_TUNER_CX24113 is not set | ||
| 1010 | # CONFIG_DVB_TDA826X is not set | ||
| 1011 | # CONFIG_DVB_TUA6100 is not set | ||
| 1012 | # CONFIG_DVB_CX24116 is not set | ||
| 1013 | # CONFIG_DVB_SI21XX is not set | ||
| 1014 | |||
| 1015 | # | ||
| 1016 | # DVB-T (terrestrial) frontends | ||
| 1017 | # | ||
| 1018 | # CONFIG_DVB_SP8870 is not set | ||
| 1019 | # CONFIG_DVB_SP887X is not set | ||
| 1020 | # CONFIG_DVB_CX22700 is not set | ||
| 1021 | # CONFIG_DVB_CX22702 is not set | ||
| 1022 | # CONFIG_DVB_DRX397XD is not set | ||
| 1023 | # CONFIG_DVB_L64781 is not set | ||
| 1024 | # CONFIG_DVB_TDA1004X is not set | ||
| 1025 | # CONFIG_DVB_NXT6000 is not set | ||
| 1026 | # CONFIG_DVB_MT352 is not set | ||
| 1027 | # CONFIG_DVB_ZL10353 is not set | ||
| 1028 | # CONFIG_DVB_DIB3000MB is not set | ||
| 1029 | # CONFIG_DVB_DIB3000MC is not set | ||
| 1030 | # CONFIG_DVB_DIB7000M is not set | ||
| 1031 | # CONFIG_DVB_DIB7000P is not set | ||
| 1032 | # CONFIG_DVB_TDA10048 is not set | ||
| 1033 | |||
| 1034 | # | ||
| 1035 | # DVB-C (cable) frontends | ||
| 1036 | # | ||
| 1037 | # CONFIG_DVB_VES1820 is not set | ||
| 1038 | # CONFIG_DVB_TDA10021 is not set | ||
| 1039 | # CONFIG_DVB_TDA10023 is not set | ||
| 1040 | # CONFIG_DVB_STV0297 is not set | ||
| 1041 | |||
| 1042 | # | ||
| 1043 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
| 1044 | # | ||
| 1045 | # CONFIG_DVB_NXT200X is not set | ||
| 1046 | # CONFIG_DVB_OR51211 is not set | ||
| 1047 | # CONFIG_DVB_OR51132 is not set | ||
| 1048 | # CONFIG_DVB_BCM3510 is not set | ||
| 1049 | # CONFIG_DVB_LGDT330X is not set | ||
| 1050 | # CONFIG_DVB_LGDT3304 is not set | ||
| 1051 | # CONFIG_DVB_S5H1409 is not set | ||
| 1052 | # CONFIG_DVB_AU8522 is not set | ||
| 1053 | # CONFIG_DVB_S5H1411 is not set | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # ISDB-T (terrestrial) frontends | ||
| 1057 | # | ||
| 1058 | # CONFIG_DVB_S921 is not set | ||
| 1059 | |||
| 1060 | # | ||
| 1061 | # Digital terrestrial only tuners/PLL | ||
| 1062 | # | ||
| 1063 | # CONFIG_DVB_PLL is not set | ||
| 1064 | # CONFIG_DVB_TUNER_DIB0070 is not set | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # SEC control devices for DVB-S | ||
| 1068 | # | ||
| 1069 | # CONFIG_DVB_LNBP21 is not set | ||
| 1070 | # CONFIG_DVB_ISL6405 is not set | ||
| 1071 | # CONFIG_DVB_ISL6421 is not set | ||
| 1072 | # CONFIG_DVB_LGS8GL5 is not set | ||
| 1073 | |||
| 1074 | # | ||
| 1075 | # Tools to develop new frontends | ||
| 1076 | # | ||
| 1077 | # CONFIG_DVB_DUMMY_FE is not set | ||
| 1078 | # CONFIG_DVB_AF9013 is not set | ||
| 1079 | CONFIG_DAB=y | ||
| 1080 | # CONFIG_USB_DABUSB is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Graphics support | ||
| 1084 | # | ||
| 1085 | # CONFIG_AGP is not set | ||
| 1086 | # CONFIG_DRM is not set | ||
| 1087 | # CONFIG_VGASTATE is not set | ||
| 1088 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 1089 | # CONFIG_FB is not set | ||
| 1090 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # Display device support | ||
| 1094 | # | ||
| 1095 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1096 | |||
| 1097 | # | ||
| 1098 | # Console display driver support | ||
| 1099 | # | ||
| 1100 | CONFIG_VGA_CONSOLE=y | ||
| 1101 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 1102 | CONFIG_DUMMY_CONSOLE=y | ||
| 1103 | CONFIG_SOUND=y | ||
| 1104 | CONFIG_SOUND_OSS_CORE=y | ||
| 1105 | CONFIG_SND=y | ||
| 1106 | CONFIG_SND_TIMER=y | ||
| 1107 | CONFIG_SND_PCM=y | ||
| 1108 | # CONFIG_SND_SEQUENCER is not set | ||
| 1109 | CONFIG_SND_OSSEMUL=y | ||
| 1110 | CONFIG_SND_MIXER_OSS=y | ||
| 1111 | CONFIG_SND_PCM_OSS=y | ||
| 1112 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 1113 | # CONFIG_SND_HRTIMER is not set | ||
| 1114 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 1115 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
| 1116 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1117 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1118 | # CONFIG_SND_DEBUG is not set | ||
| 1119 | CONFIG_SND_VMASTER=y | ||
| 1120 | CONFIG_SND_AC97_CODEC=y | ||
| 1121 | CONFIG_SND_DRIVERS=y | ||
| 1122 | # CONFIG_SND_DUMMY is not set | ||
| 1123 | # CONFIG_SND_MTPAV is not set | ||
| 1124 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 1125 | # CONFIG_SND_MPU401 is not set | ||
| 1126 | # CONFIG_SND_AC97_POWER_SAVE is not set | ||
| 1127 | CONFIG_SND_PCI=y | ||
| 1128 | # CONFIG_SND_AD1889 is not set | ||
| 1129 | # CONFIG_SND_ALS300 is not set | ||
| 1130 | # CONFIG_SND_ALS4000 is not set | ||
| 1131 | # CONFIG_SND_ALI5451 is not set | ||
| 1132 | # CONFIG_SND_ATIIXP is not set | ||
| 1133 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 1134 | # CONFIG_SND_AU8810 is not set | ||
| 1135 | # CONFIG_SND_AU8820 is not set | ||
| 1136 | # CONFIG_SND_AU8830 is not set | ||
| 1137 | # CONFIG_SND_AW2 is not set | ||
| 1138 | # CONFIG_SND_AZT3328 is not set | ||
| 1139 | # CONFIG_SND_BT87X is not set | ||
| 1140 | # CONFIG_SND_CA0106 is not set | ||
| 1141 | # CONFIG_SND_CMIPCI is not set | ||
| 1142 | # CONFIG_SND_OXYGEN is not set | ||
| 1143 | # CONFIG_SND_CS4281 is not set | ||
| 1144 | # CONFIG_SND_CS46XX is not set | ||
| 1145 | # CONFIG_SND_CS5530 is not set | ||
| 1146 | # CONFIG_SND_DARLA20 is not set | ||
| 1147 | # CONFIG_SND_GINA20 is not set | ||
| 1148 | # CONFIG_SND_LAYLA20 is not set | ||
| 1149 | # CONFIG_SND_DARLA24 is not set | ||
| 1150 | # CONFIG_SND_GINA24 is not set | ||
| 1151 | # CONFIG_SND_LAYLA24 is not set | ||
| 1152 | # CONFIG_SND_MONA is not set | ||
| 1153 | # CONFIG_SND_MIA is not set | ||
| 1154 | # CONFIG_SND_ECHO3G is not set | ||
| 1155 | # CONFIG_SND_INDIGO is not set | ||
| 1156 | # CONFIG_SND_INDIGOIO is not set | ||
| 1157 | # CONFIG_SND_INDIGODJ is not set | ||
| 1158 | # CONFIG_SND_EMU10K1 is not set | ||
| 1159 | # CONFIG_SND_EMU10K1X is not set | ||
| 1160 | # CONFIG_SND_ENS1370 is not set | ||
| 1161 | # CONFIG_SND_ENS1371 is not set | ||
| 1162 | # CONFIG_SND_ES1938 is not set | ||
| 1163 | # CONFIG_SND_ES1968 is not set | ||
| 1164 | # CONFIG_SND_FM801 is not set | ||
| 1165 | # CONFIG_SND_HDA_INTEL is not set | ||
| 1166 | # CONFIG_SND_HDSP is not set | ||
| 1167 | # CONFIG_SND_HDSPM is not set | ||
| 1168 | # CONFIG_SND_HIFIER is not set | ||
| 1169 | # CONFIG_SND_ICE1712 is not set | ||
| 1170 | # CONFIG_SND_ICE1724 is not set | ||
| 1171 | CONFIG_SND_INTEL8X0=y | ||
| 1172 | # CONFIG_SND_INTEL8X0M is not set | ||
| 1173 | # CONFIG_SND_KORG1212 is not set | ||
| 1174 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1175 | # CONFIG_SND_MIXART is not set | ||
| 1176 | # CONFIG_SND_NM256 is not set | ||
| 1177 | # CONFIG_SND_PCXHR is not set | ||
| 1178 | # CONFIG_SND_RIPTIDE is not set | ||
| 1179 | # CONFIG_SND_RME32 is not set | ||
| 1180 | # CONFIG_SND_RME96 is not set | ||
| 1181 | # CONFIG_SND_RME9652 is not set | ||
| 1182 | # CONFIG_SND_SONICVIBES is not set | ||
| 1183 | # CONFIG_SND_TRIDENT is not set | ||
| 1184 | # CONFIG_SND_VIA82XX is not set | ||
| 1185 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 1186 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1187 | # CONFIG_SND_VX222 is not set | ||
| 1188 | # CONFIG_SND_YMFPCI is not set | ||
| 1189 | CONFIG_SND_PPC=y | ||
| 1190 | CONFIG_SND_USB=y | ||
| 1191 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1192 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1193 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1194 | # CONFIG_SND_SOC is not set | ||
| 1195 | # CONFIG_SOUND_PRIME is not set | ||
| 1196 | CONFIG_AC97_BUS=y | ||
| 1197 | CONFIG_HID_SUPPORT=y | ||
| 1198 | CONFIG_HID=y | ||
| 1199 | # CONFIG_HID_DEBUG is not set | ||
| 1200 | # CONFIG_HIDRAW is not set | ||
| 1201 | |||
| 1202 | # | ||
| 1203 | # USB Input Devices | ||
| 1204 | # | ||
| 1205 | CONFIG_USB_HID=y | ||
| 1206 | # CONFIG_HID_PID is not set | ||
| 1207 | # CONFIG_USB_HIDDEV is not set | ||
| 1208 | |||
| 1209 | # | ||
| 1210 | # Special HID drivers | ||
| 1211 | # | ||
| 1212 | CONFIG_HID_COMPAT=y | ||
| 1213 | CONFIG_HID_A4TECH=y | ||
| 1214 | CONFIG_HID_APPLE=y | ||
| 1215 | CONFIG_HID_BELKIN=y | ||
| 1216 | CONFIG_HID_CHERRY=y | ||
| 1217 | CONFIG_HID_CHICONY=y | ||
| 1218 | CONFIG_HID_CYPRESS=y | ||
| 1219 | CONFIG_HID_EZKEY=y | ||
| 1220 | CONFIG_HID_GYRATION=y | ||
| 1221 | CONFIG_HID_LOGITECH=y | ||
| 1222 | # CONFIG_LOGITECH_FF is not set | ||
| 1223 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1224 | CONFIG_HID_MICROSOFT=y | ||
| 1225 | CONFIG_HID_MONTEREY=y | ||
| 1226 | # CONFIG_HID_NTRIG is not set | ||
| 1227 | CONFIG_HID_PANTHERLORD=y | ||
| 1228 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1229 | CONFIG_HID_PETALYNX=y | ||
| 1230 | CONFIG_HID_SAMSUNG=y | ||
| 1231 | CONFIG_HID_SONY=y | ||
| 1232 | CONFIG_HID_SUNPLUS=y | ||
| 1233 | # CONFIG_GREENASIA_FF is not set | ||
| 1234 | # CONFIG_HID_TOPSEED is not set | ||
| 1235 | CONFIG_THRUSTMASTER_FF=m | ||
| 1236 | CONFIG_ZEROPLUS_FF=m | ||
| 1237 | CONFIG_USB_SUPPORT=y | ||
| 1238 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 1239 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 1240 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 1241 | CONFIG_USB=y | ||
| 1242 | # CONFIG_USB_DEBUG is not set | ||
| 1243 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 1244 | |||
| 1245 | # | ||
| 1246 | # Miscellaneous USB options | ||
| 1247 | # | ||
| 1248 | CONFIG_USB_DEVICEFS=y | ||
| 1249 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1250 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1251 | # CONFIG_USB_OTG is not set | ||
| 1252 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1253 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1254 | CONFIG_USB_MON=y | ||
| 1255 | # CONFIG_USB_WUSB is not set | ||
| 1256 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # USB Host Controller Drivers | ||
| 1260 | # | ||
| 1261 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1262 | CONFIG_USB_EHCI_HCD=y | ||
| 1263 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
| 1264 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
| 1265 | # CONFIG_USB_EHCI_FSL is not set | ||
| 1266 | CONFIG_USB_EHCI_HCD_PPC_OF=y | ||
| 1267 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 1268 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1269 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1270 | CONFIG_USB_OHCI_HCD=y | ||
| 1271 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
| 1272 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | ||
| 1273 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | ||
| 1274 | CONFIG_USB_OHCI_HCD_PCI=y | ||
| 1275 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | ||
| 1276 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | ||
| 1277 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 1278 | # CONFIG_USB_UHCI_HCD is not set | ||
| 1279 | # CONFIG_USB_SL811_HCD is not set | ||
| 1280 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1281 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1282 | # CONFIG_USB_HWA_HCD is not set | ||
| 1283 | |||
| 1284 | # | ||
| 1285 | # USB Device Class drivers | ||
| 1286 | # | ||
| 1287 | # CONFIG_USB_ACM is not set | ||
| 1288 | # CONFIG_USB_PRINTER is not set | ||
| 1289 | # CONFIG_USB_WDM is not set | ||
| 1290 | # CONFIG_USB_TMC is not set | ||
| 1291 | |||
| 1292 | # | ||
| 1293 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | ||
| 1294 | # | ||
| 1295 | |||
| 1296 | # | ||
| 1297 | # see USB_STORAGE Help for more information | ||
| 1298 | # | ||
| 1299 | CONFIG_USB_STORAGE=y | ||
| 1300 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 1301 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1302 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1303 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1304 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1305 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1306 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1307 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1308 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1309 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1310 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1311 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1312 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1313 | |||
| 1314 | # | ||
| 1315 | # USB Imaging devices | ||
| 1316 | # | ||
| 1317 | # CONFIG_USB_MDC800 is not set | ||
| 1318 | # CONFIG_USB_MICROTEK is not set | ||
| 1319 | |||
| 1320 | # | ||
| 1321 | # USB port drivers | ||
| 1322 | # | ||
| 1323 | # CONFIG_USB_SERIAL is not set | ||
| 1324 | |||
| 1325 | # | ||
| 1326 | # USB Miscellaneous drivers | ||
| 1327 | # | ||
| 1328 | # CONFIG_USB_EMI62 is not set | ||
| 1329 | # CONFIG_USB_EMI26 is not set | ||
| 1330 | # CONFIG_USB_ADUTUX is not set | ||
| 1331 | # CONFIG_USB_SEVSEG is not set | ||
| 1332 | # CONFIG_USB_RIO500 is not set | ||
| 1333 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1334 | # CONFIG_USB_LCD is not set | ||
| 1335 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1336 | # CONFIG_USB_LED is not set | ||
| 1337 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1338 | # CONFIG_USB_CYTHERM is not set | ||
| 1339 | # CONFIG_USB_PHIDGET is not set | ||
| 1340 | # CONFIG_USB_IDMOUSE is not set | ||
| 1341 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1342 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1343 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1344 | # CONFIG_USB_LD is not set | ||
| 1345 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1346 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1347 | # CONFIG_USB_TEST is not set | ||
| 1348 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1349 | # CONFIG_USB_VST is not set | ||
| 1350 | # CONFIG_USB_GADGET is not set | ||
| 1351 | |||
| 1352 | # | ||
| 1353 | # OTG and related infrastructure | ||
| 1354 | # | ||
| 1355 | # CONFIG_UWB is not set | ||
| 1356 | # CONFIG_MMC is not set | ||
| 1357 | # CONFIG_MEMSTICK is not set | ||
| 1358 | # CONFIG_NEW_LEDS is not set | ||
| 1359 | # CONFIG_ACCESSIBILITY is not set | ||
| 1360 | # CONFIG_INFINIBAND is not set | ||
| 1361 | # CONFIG_EDAC is not set | ||
| 1362 | CONFIG_RTC_LIB=y | ||
| 1363 | CONFIG_RTC_CLASS=y | ||
| 1364 | CONFIG_RTC_HCTOSYS=y | ||
| 1365 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1366 | # CONFIG_RTC_DEBUG is not set | ||
| 1367 | |||
| 1368 | # | ||
| 1369 | # RTC interfaces | ||
| 1370 | # | ||
| 1371 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1372 | CONFIG_RTC_INTF_PROC=y | ||
| 1373 | CONFIG_RTC_INTF_DEV=y | ||
| 1374 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1375 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1376 | |||
| 1377 | # | ||
| 1378 | # I2C RTC drivers | ||
| 1379 | # | ||
| 1380 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1381 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1382 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1383 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1384 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1385 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1386 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1387 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1388 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1389 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1390 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1391 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1392 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1393 | |||
| 1394 | # | ||
| 1395 | # SPI RTC drivers | ||
| 1396 | # | ||
| 1397 | |||
| 1398 | # | ||
| 1399 | # Platform RTC drivers | ||
| 1400 | # | ||
| 1401 | CONFIG_RTC_DRV_CMOS=y | ||
| 1402 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1403 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1404 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1405 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1406 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1407 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1408 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1409 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1410 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1411 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1412 | |||
| 1413 | # | ||
| 1414 | # on-CPU RTC drivers | ||
| 1415 | # | ||
| 1416 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1417 | CONFIG_DMADEVICES=y | ||
| 1418 | |||
| 1419 | # | ||
| 1420 | # DMA Devices | ||
| 1421 | # | ||
| 1422 | CONFIG_FSL_DMA=y | ||
| 1423 | CONFIG_DMA_ENGINE=y | ||
| 1424 | |||
| 1425 | # | ||
| 1426 | # DMA Clients | ||
| 1427 | # | ||
| 1428 | # CONFIG_NET_DMA is not set | ||
| 1429 | # CONFIG_DMATEST is not set | ||
| 1430 | # CONFIG_UIO is not set | ||
| 1431 | # CONFIG_STAGING is not set | ||
| 1432 | |||
| 1433 | # | ||
| 1434 | # File systems | ||
| 1435 | # | ||
| 1436 | CONFIG_EXT2_FS=y | ||
| 1437 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1438 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1439 | CONFIG_EXT3_FS=y | ||
| 1440 | CONFIG_EXT3_FS_XATTR=y | ||
| 1441 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 1442 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 1443 | # CONFIG_EXT4_FS is not set | ||
| 1444 | CONFIG_JBD=y | ||
| 1445 | CONFIG_FS_MBCACHE=y | ||
| 1446 | # CONFIG_REISERFS_FS is not set | ||
| 1447 | # CONFIG_JFS_FS is not set | ||
| 1448 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1449 | CONFIG_FILE_LOCKING=y | ||
| 1450 | # CONFIG_XFS_FS is not set | ||
| 1451 | # CONFIG_GFS2_FS is not set | ||
| 1452 | # CONFIG_OCFS2_FS is not set | ||
| 1453 | # CONFIG_BTRFS_FS is not set | ||
| 1454 | CONFIG_DNOTIFY=y | ||
| 1455 | CONFIG_INOTIFY=y | ||
| 1456 | CONFIG_INOTIFY_USER=y | ||
| 1457 | # CONFIG_QUOTA is not set | ||
| 1458 | # CONFIG_AUTOFS_FS is not set | ||
| 1459 | # CONFIG_AUTOFS4_FS is not set | ||
| 1460 | # CONFIG_FUSE_FS is not set | ||
| 1461 | |||
| 1462 | # | ||
| 1463 | # CD-ROM/DVD Filesystems | ||
| 1464 | # | ||
| 1465 | CONFIG_ISO9660_FS=m | ||
| 1466 | CONFIG_JOLIET=y | ||
| 1467 | CONFIG_ZISOFS=y | ||
| 1468 | CONFIG_UDF_FS=m | ||
| 1469 | CONFIG_UDF_NLS=y | ||
| 1470 | |||
| 1471 | # | ||
| 1472 | # DOS/FAT/NT Filesystems | ||
| 1473 | # | ||
| 1474 | CONFIG_FAT_FS=y | ||
| 1475 | CONFIG_MSDOS_FS=m | ||
| 1476 | CONFIG_VFAT_FS=y | ||
| 1477 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1478 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1479 | CONFIG_NTFS_FS=y | ||
| 1480 | # CONFIG_NTFS_DEBUG is not set | ||
| 1481 | # CONFIG_NTFS_RW is not set | ||
| 1482 | |||
| 1483 | # | ||
| 1484 | # Pseudo filesystems | ||
| 1485 | # | ||
| 1486 | CONFIG_PROC_FS=y | ||
| 1487 | CONFIG_PROC_KCORE=y | ||
| 1488 | CONFIG_PROC_SYSCTL=y | ||
| 1489 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1490 | CONFIG_SYSFS=y | ||
| 1491 | CONFIG_TMPFS=y | ||
| 1492 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1493 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1494 | # CONFIG_CONFIGFS_FS is not set | ||
| 1495 | CONFIG_MISC_FILESYSTEMS=y | ||
| 1496 | CONFIG_ADFS_FS=m | ||
| 1497 | # CONFIG_ADFS_FS_RW is not set | ||
| 1498 | CONFIG_AFFS_FS=m | ||
| 1499 | CONFIG_HFS_FS=m | ||
| 1500 | CONFIG_HFSPLUS_FS=m | ||
| 1501 | CONFIG_BEFS_FS=m | ||
| 1502 | # CONFIG_BEFS_DEBUG is not set | ||
| 1503 | CONFIG_BFS_FS=m | ||
| 1504 | CONFIG_EFS_FS=m | ||
| 1505 | CONFIG_CRAMFS=y | ||
| 1506 | # CONFIG_SQUASHFS is not set | ||
| 1507 | CONFIG_VXFS_FS=m | ||
| 1508 | # CONFIG_MINIX_FS is not set | ||
| 1509 | # CONFIG_OMFS_FS is not set | ||
| 1510 | CONFIG_HPFS_FS=m | ||
| 1511 | CONFIG_QNX4FS_FS=m | ||
| 1512 | # CONFIG_ROMFS_FS is not set | ||
| 1513 | CONFIG_SYSV_FS=m | ||
| 1514 | CONFIG_UFS_FS=m | ||
| 1515 | # CONFIG_UFS_FS_WRITE is not set | ||
| 1516 | # CONFIG_UFS_DEBUG is not set | ||
| 1517 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1518 | CONFIG_NFS_FS=y | ||
| 1519 | CONFIG_NFS_V3=y | ||
| 1520 | # CONFIG_NFS_V3_ACL is not set | ||
| 1521 | CONFIG_NFS_V4=y | ||
| 1522 | CONFIG_ROOT_NFS=y | ||
| 1523 | CONFIG_NFSD=y | ||
| 1524 | # CONFIG_NFSD_V3 is not set | ||
| 1525 | # CONFIG_NFSD_V4 is not set | ||
| 1526 | CONFIG_LOCKD=y | ||
| 1527 | CONFIG_LOCKD_V4=y | ||
| 1528 | CONFIG_EXPORTFS=y | ||
| 1529 | CONFIG_NFS_COMMON=y | ||
| 1530 | CONFIG_SUNRPC=y | ||
| 1531 | CONFIG_SUNRPC_GSS=y | ||
| 1532 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1533 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1534 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1535 | # CONFIG_SMB_FS is not set | ||
| 1536 | # CONFIG_CIFS is not set | ||
| 1537 | # CONFIG_NCP_FS is not set | ||
| 1538 | # CONFIG_CODA_FS is not set | ||
| 1539 | # CONFIG_AFS_FS is not set | ||
| 1540 | |||
| 1541 | # | ||
| 1542 | # Partition Types | ||
| 1543 | # | ||
| 1544 | CONFIG_PARTITION_ADVANCED=y | ||
| 1545 | # CONFIG_ACORN_PARTITION is not set | ||
| 1546 | # CONFIG_OSF_PARTITION is not set | ||
| 1547 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1548 | # CONFIG_ATARI_PARTITION is not set | ||
| 1549 | CONFIG_MAC_PARTITION=y | ||
| 1550 | CONFIG_MSDOS_PARTITION=y | ||
| 1551 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1552 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1553 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1554 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1555 | # CONFIG_LDM_PARTITION is not set | ||
| 1556 | # CONFIG_SGI_PARTITION is not set | ||
| 1557 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1558 | # CONFIG_SUN_PARTITION is not set | ||
| 1559 | # CONFIG_KARMA_PARTITION is not set | ||
| 1560 | # CONFIG_EFI_PARTITION is not set | ||
| 1561 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1562 | CONFIG_NLS=y | ||
| 1563 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1564 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1565 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1566 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1567 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1568 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1569 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1570 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1571 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1572 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1573 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1574 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1575 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1576 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1577 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1578 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1579 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1580 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1581 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1582 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1583 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1584 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1585 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1586 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1587 | # CONFIG_NLS_ASCII is not set | ||
| 1588 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1589 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1590 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1591 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1592 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1593 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1594 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1595 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1596 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1597 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1598 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1599 | # CONFIG_NLS_KOI8_R is not set | ||
| 1600 | # CONFIG_NLS_KOI8_U is not set | ||
| 1601 | CONFIG_NLS_UTF8=m | ||
| 1602 | # CONFIG_DLM is not set | ||
| 1603 | |||
| 1604 | # | ||
| 1605 | # Library routines | ||
| 1606 | # | ||
| 1607 | CONFIG_BITREVERSE=y | ||
| 1608 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1609 | # CONFIG_CRC_CCITT is not set | ||
| 1610 | # CONFIG_CRC16 is not set | ||
| 1611 | CONFIG_CRC_T10DIF=y | ||
| 1612 | CONFIG_CRC_ITU_T=m | ||
| 1613 | CONFIG_CRC32=y | ||
| 1614 | # CONFIG_CRC7 is not set | ||
| 1615 | CONFIG_LIBCRC32C=m | ||
| 1616 | CONFIG_ZLIB_INFLATE=y | ||
| 1617 | CONFIG_PLIST=y | ||
| 1618 | CONFIG_HAS_IOMEM=y | ||
| 1619 | CONFIG_HAS_IOPORT=y | ||
| 1620 | CONFIG_HAS_DMA=y | ||
| 1621 | CONFIG_HAVE_LMB=y | ||
| 1622 | |||
| 1623 | # | ||
| 1624 | # Kernel hacking | ||
| 1625 | # | ||
| 1626 | # CONFIG_PRINTK_TIME is not set | ||
| 1627 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1628 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1629 | CONFIG_FRAME_WARN=1024 | ||
| 1630 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1631 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1632 | # CONFIG_DEBUG_FS is not set | ||
| 1633 | # CONFIG_HEADERS_CHECK is not set | ||
| 1634 | CONFIG_DEBUG_KERNEL=y | ||
| 1635 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1636 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1637 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1638 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1639 | CONFIG_SCHED_DEBUG=y | ||
| 1640 | # CONFIG_SCHEDSTATS is not set | ||
| 1641 | # CONFIG_TIMER_STATS is not set | ||
| 1642 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1643 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1644 | # CONFIG_SLUB_STATS is not set | ||
| 1645 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1646 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1647 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1648 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1649 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1650 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1651 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1652 | # CONFIG_DEBUG_HIGHMEM is not set | ||
| 1653 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1654 | CONFIG_DEBUG_INFO=y | ||
| 1655 | # CONFIG_DEBUG_VM is not set | ||
| 1656 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1657 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1658 | # CONFIG_DEBUG_LIST is not set | ||
| 1659 | # CONFIG_DEBUG_SG is not set | ||
| 1660 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1661 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1662 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1663 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1664 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1665 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1666 | # CONFIG_FAULT_INJECTION is not set | ||
| 1667 | # CONFIG_LATENCYTOP is not set | ||
| 1668 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1669 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1670 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1671 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1672 | |||
| 1673 | # | ||
| 1674 | # Tracers | ||
| 1675 | # | ||
| 1676 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1677 | # CONFIG_SCHED_TRACER is not set | ||
| 1678 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1679 | # CONFIG_BOOT_TRACER is not set | ||
| 1680 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1681 | # CONFIG_STACK_TRACER is not set | ||
| 1682 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1683 | # CONFIG_SAMPLES is not set | ||
| 1684 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1685 | # CONFIG_KGDB is not set | ||
| 1686 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1687 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
| 1688 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1689 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1690 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
| 1691 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1692 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1693 | # CONFIG_XMON is not set | ||
| 1694 | # CONFIG_IRQSTACKS is not set | ||
| 1695 | # CONFIG_BDI_SWITCH is not set | ||
| 1696 | # CONFIG_PPC_EARLY_DEBUG is not set | ||
| 1697 | |||
| 1698 | # | ||
| 1699 | # Security options | ||
| 1700 | # | ||
| 1701 | # CONFIG_KEYS is not set | ||
| 1702 | # CONFIG_SECURITY is not set | ||
| 1703 | # CONFIG_SECURITYFS is not set | ||
| 1704 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1705 | CONFIG_CRYPTO=y | ||
| 1706 | |||
| 1707 | # | ||
| 1708 | # Crypto core or helper | ||
| 1709 | # | ||
| 1710 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1711 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1712 | CONFIG_CRYPTO_ALGAPI2=y | ||
| 1713 | CONFIG_CRYPTO_AEAD=y | ||
| 1714 | CONFIG_CRYPTO_AEAD2=y | ||
| 1715 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1716 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1717 | CONFIG_CRYPTO_HASH=y | ||
| 1718 | CONFIG_CRYPTO_HASH2=y | ||
| 1719 | CONFIG_CRYPTO_RNG2=y | ||
| 1720 | CONFIG_CRYPTO_MANAGER=y | ||
| 1721 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1722 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1723 | # CONFIG_CRYPTO_NULL is not set | ||
| 1724 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1725 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1726 | # CONFIG_CRYPTO_TEST is not set | ||
| 1727 | |||
| 1728 | # | ||
| 1729 | # Authenticated Encryption with Associated Data | ||
| 1730 | # | ||
| 1731 | # CONFIG_CRYPTO_CCM is not set | ||
| 1732 | # CONFIG_CRYPTO_GCM is not set | ||
| 1733 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1734 | |||
| 1735 | # | ||
| 1736 | # Block modes | ||
| 1737 | # | ||
| 1738 | CONFIG_CRYPTO_CBC=y | ||
| 1739 | # CONFIG_CRYPTO_CTR is not set | ||
| 1740 | # CONFIG_CRYPTO_CTS is not set | ||
| 1741 | # CONFIG_CRYPTO_ECB is not set | ||
| 1742 | # CONFIG_CRYPTO_LRW is not set | ||
| 1743 | CONFIG_CRYPTO_PCBC=m | ||
| 1744 | # CONFIG_CRYPTO_XTS is not set | ||
| 1745 | |||
| 1746 | # | ||
| 1747 | # Hash modes | ||
| 1748 | # | ||
| 1749 | CONFIG_CRYPTO_HMAC=y | ||
| 1750 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1751 | |||
| 1752 | # | ||
| 1753 | # Digest | ||
| 1754 | # | ||
| 1755 | CONFIG_CRYPTO_CRC32C=m | ||
| 1756 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1757 | CONFIG_CRYPTO_MD5=y | ||
| 1758 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1759 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1760 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1761 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1762 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1763 | CONFIG_CRYPTO_SHA1=m | ||
| 1764 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1765 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1766 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1767 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1768 | |||
| 1769 | # | ||
| 1770 | # Ciphers | ||
| 1771 | # | ||
| 1772 | # CONFIG_CRYPTO_AES is not set | ||
| 1773 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1774 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1775 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1776 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1777 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1778 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1779 | CONFIG_CRYPTO_DES=y | ||
| 1780 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1781 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1782 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1783 | # CONFIG_CRYPTO_SEED is not set | ||
| 1784 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1785 | # CONFIG_CRYPTO_TEA is not set | ||
| 1786 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1787 | |||
| 1788 | # | ||
| 1789 | # Compression | ||
| 1790 | # | ||
| 1791 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1792 | # CONFIG_CRYPTO_LZO is not set | ||
| 1793 | |||
| 1794 | # | ||
| 1795 | # Random Number Generation | ||
| 1796 | # | ||
| 1797 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1798 | CONFIG_CRYPTO_HW=y | ||
| 1799 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1800 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
| 1801 | # CONFIG_PPC_CLOCK is not set | ||
| 1802 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig deleted file mode 100644 index 186c1010a13..00000000000 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ /dev/null | |||
| @@ -1,1309 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.29-rc2 | ||
| 4 | # Mon Jan 26 15:36:10 2009 | ||
| 5 | # | ||
| 6 | # CONFIG_PPC64 is not set | ||
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | CONFIG_PPC_85xx=y | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_E500=y | ||
| 18 | # CONFIG_PPC_E500MC is not set | ||
| 19 | CONFIG_BOOKE=y | ||
| 20 | CONFIG_FSL_BOOKE=y | ||
| 21 | CONFIG_FSL_EMB_PERFMON=y | ||
| 22 | # CONFIG_PHYS_64BIT is not set | ||
| 23 | CONFIG_SPE=y | ||
| 24 | CONFIG_PPC_MMU_NOHASH=y | ||
| 25 | # CONFIG_PPC_MM_SLICES is not set | ||
| 26 | # CONFIG_SMP is not set | ||
| 27 | CONFIG_PPC32=y | ||
| 28 | CONFIG_WORD_SIZE=32 | ||
| 29 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | ||
| 30 | CONFIG_MMU=y | ||
| 31 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 32 | CONFIG_GENERIC_TIME=y | ||
| 33 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 34 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 35 | CONFIG_GENERIC_HARDIRQS=y | ||
| 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
| 37 | CONFIG_IRQ_PER_CPU=y | ||
| 38 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 40 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 41 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 42 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 43 | CONFIG_GENERIC_HWEIGHT=y | ||
| 44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 47 | CONFIG_PPC=y | ||
| 48 | CONFIG_EARLY_PRINTK=y | ||
| 49 | CONFIG_GENERIC_NVRAM=y | ||
| 50 | CONFIG_SCHED_OMIT_FRAME_POINTER=y | ||
| 51 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 52 | CONFIG_PPC_OF=y | ||
| 53 | CONFIG_OF=y | ||
| 54 | CONFIG_PPC_UDBG_16550=y | ||
| 55 | # CONFIG_GENERIC_TBSYNC is not set | ||
| 56 | CONFIG_AUDIT_ARCH=y | ||
| 57 | CONFIG_GENERIC_BUG=y | ||
| 58 | CONFIG_DEFAULT_UIMAGE=y | ||
| 59 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 60 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 62 | |||
| 63 | # | ||
| 64 | # General setup | ||
| 65 | # | ||
| 66 | CONFIG_EXPERIMENTAL=y | ||
| 67 | CONFIG_BROKEN_ON_SMP=y | ||
| 68 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 69 | CONFIG_LOCALVERSION="" | ||
| 70 | CONFIG_LOCALVERSION_AUTO=y | ||
| 71 | CONFIG_SWAP=y | ||
| 72 | CONFIG_SYSVIPC=y | ||
| 73 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 74 | # CONFIG_POSIX_MQUEUE is not set | ||
| 75 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 76 | # CONFIG_TASKSTATS is not set | ||
| 77 | # CONFIG_AUDIT is not set | ||
| 78 | # CONFIG_IKCONFIG is not set | ||
| 79 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 80 | CONFIG_GROUP_SCHED=y | ||
| 81 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 82 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 83 | CONFIG_USER_SCHED=y | ||
| 84 | # CONFIG_CGROUP_SCHED is not set | ||
| 85 | # CONFIG_CGROUPS is not set | ||
| 86 | CONFIG_SYSFS_DEPRECATED=y | ||
| 87 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 88 | # CONFIG_RELAY is not set | ||
| 89 | # CONFIG_NAMESPACES is not set | ||
| 90 | CONFIG_BLK_DEV_INITRD=y | ||
| 91 | CONFIG_INITRAMFS_SOURCE="" | ||
| 92 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 93 | CONFIG_SYSCTL=y | ||
| 94 | CONFIG_EMBEDDED=y | ||
| 95 | CONFIG_SYSCTL_SYSCALL=y | ||
| 96 | # CONFIG_KALLSYMS is not set | ||
| 97 | CONFIG_HOTPLUG=y | ||
| 98 | CONFIG_PRINTK=y | ||
| 99 | CONFIG_BUG=y | ||
| 100 | CONFIG_ELF_CORE=y | ||
| 101 | CONFIG_COMPAT_BRK=y | ||
| 102 | CONFIG_BASE_FULL=y | ||
| 103 | CONFIG_FUTEX=y | ||
| 104 | CONFIG_ANON_INODES=y | ||
| 105 | # CONFIG_EPOLL is not set | ||
| 106 | CONFIG_SIGNALFD=y | ||
| 107 | CONFIG_TIMERFD=y | ||
| 108 | CONFIG_EVENTFD=y | ||
| 109 | CONFIG_SHMEM=y | ||
| 110 | CONFIG_AIO=y | ||
| 111 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 112 | CONFIG_PCI_QUIRKS=y | ||
| 113 | CONFIG_SLUB_DEBUG=y | ||
| 114 | # CONFIG_SLAB is not set | ||
| 115 | CONFIG_SLUB=y | ||
| 116 | # CONFIG_SLOB is not set | ||
| 117 | # CONFIG_PROFILING is not set | ||
| 118 | CONFIG_HAVE_OPROFILE=y | ||
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | ||
| 122 | CONFIG_HAVE_KRETPROBES=y | ||
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | ||
| 126 | CONFIG_RT_MUTEXES=y | ||
| 127 | CONFIG_BASE_SMALL=0 | ||
| 128 | CONFIG_MODULES=y | ||
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 130 | CONFIG_MODULE_UNLOAD=y | ||
| 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 132 | # CONFIG_MODVERSIONS is not set | ||
| 133 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 134 | CONFIG_BLOCK=y | ||
| 135 | # CONFIG_LBD is not set | ||
| 136 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 137 | # CONFIG_BLK_DEV_BSG is not set | ||
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 139 | |||
| 140 | # | ||
| 141 | # IO Schedulers | ||
| 142 | # | ||
| 143 | CONFIG_IOSCHED_NOOP=y | ||
| 144 | CONFIG_IOSCHED_AS=y | ||
| 145 | CONFIG_IOSCHED_DEADLINE=y | ||
| 146 | CONFIG_IOSCHED_CFQ=y | ||
| 147 | CONFIG_DEFAULT_AS=y | ||
| 148 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 149 | # CONFIG_DEFAULT_CFQ is not set | ||
| 150 | # CONFIG_DEFAULT_NOOP is not set | ||
| 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 152 | CONFIG_CLASSIC_RCU=y | ||
| 153 | # CONFIG_TREE_RCU is not set | ||
| 154 | # CONFIG_PREEMPT_RCU is not set | ||
| 155 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 156 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 157 | # CONFIG_FREEZER is not set | ||
| 158 | |||
| 159 | # | ||
| 160 | # Platform support | ||
| 161 | # | ||
| 162 | # CONFIG_PPC_CELL is not set | ||
| 163 | # CONFIG_PPC_CELL_NATIVE is not set | ||
| 164 | # CONFIG_PQ2ADS is not set | ||
| 165 | CONFIG_MPC85xx=y | ||
| 166 | # CONFIG_MPC8540_ADS is not set | ||
| 167 | # CONFIG_MPC8560_ADS is not set | ||
| 168 | # CONFIG_MPC85xx_CDS is not set | ||
| 169 | CONFIG_MPC85xx_MDS=y | ||
| 170 | # CONFIG_MPC8536_DS is not set | ||
| 171 | # CONFIG_MPC85xx_DS is not set | ||
| 172 | # CONFIG_KSI8560 is not set | ||
| 173 | # CONFIG_STX_GP3 is not set | ||
| 174 | # CONFIG_TQM8540 is not set | ||
| 175 | # CONFIG_TQM8541 is not set | ||
| 176 | # CONFIG_TQM8548 is not set | ||
| 177 | # CONFIG_TQM8555 is not set | ||
| 178 | # CONFIG_TQM8560 is not set | ||
| 179 | # CONFIG_SBC8548 is not set | ||
| 180 | # CONFIG_SBC8560 is not set | ||
| 181 | # CONFIG_IPIC is not set | ||
| 182 | CONFIG_MPIC=y | ||
| 183 | # CONFIG_MPIC_WEIRD is not set | ||
| 184 | # CONFIG_PPC_I8259 is not set | ||
| 185 | # CONFIG_PPC_RTAS is not set | ||
| 186 | # CONFIG_MMIO_NVRAM is not set | ||
| 187 | # CONFIG_PPC_MPC106 is not set | ||
| 188 | # CONFIG_PPC_970_NAP is not set | ||
| 189 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 190 | # CONFIG_GENERIC_IOMAP is not set | ||
| 191 | # CONFIG_CPU_FREQ is not set | ||
| 192 | CONFIG_QUICC_ENGINE=y | ||
| 193 | # CONFIG_QE_GPIO is not set | ||
| 194 | # CONFIG_CPM2 is not set | ||
| 195 | # CONFIG_FSL_ULI1575 is not set | ||
| 196 | # CONFIG_MPC8xxx_GPIO is not set | ||
| 197 | # CONFIG_SIMPLE_GPIO is not set | ||
| 198 | |||
| 199 | # | ||
| 200 | # Kernel options | ||
| 201 | # | ||
| 202 | # CONFIG_HIGHMEM is not set | ||
| 203 | CONFIG_TICK_ONESHOT=y | ||
| 204 | CONFIG_NO_HZ=y | ||
| 205 | CONFIG_HIGH_RES_TIMERS=y | ||
| 206 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 207 | # CONFIG_HZ_100 is not set | ||
| 208 | CONFIG_HZ_250=y | ||
| 209 | # CONFIG_HZ_300 is not set | ||
| 210 | # CONFIG_HZ_1000 is not set | ||
| 211 | CONFIG_HZ=250 | ||
| 212 | CONFIG_SCHED_HRTICK=y | ||
| 213 | CONFIG_PREEMPT_NONE=y | ||
| 214 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 215 | # CONFIG_PREEMPT is not set | ||
| 216 | CONFIG_BINFMT_ELF=y | ||
| 217 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 218 | # CONFIG_HAVE_AOUT is not set | ||
| 219 | # CONFIG_BINFMT_MISC is not set | ||
| 220 | CONFIG_MATH_EMULATION=y | ||
| 221 | # CONFIG_IOMMU_HELPER is not set | ||
| 222 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 223 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 224 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 225 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 227 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 228 | CONFIG_FLATMEM_MANUAL=y | ||
| 229 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 230 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 231 | CONFIG_FLATMEM=y | ||
| 232 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 233 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 234 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 235 | CONFIG_MIGRATION=y | ||
| 236 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 237 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 238 | CONFIG_BOUNCE=y | ||
| 239 | CONFIG_VIRT_TO_BUS=y | ||
| 240 | CONFIG_UNEVICTABLE_LRU=y | ||
| 241 | CONFIG_PPC_4K_PAGES=y | ||
| 242 | # CONFIG_PPC_16K_PAGES is not set | ||
| 243 | # CONFIG_PPC_64K_PAGES is not set | ||
| 244 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 245 | CONFIG_PROC_DEVICETREE=y | ||
| 246 | # CONFIG_CMDLINE_BOOL is not set | ||
| 247 | CONFIG_EXTRA_TARGETS="" | ||
| 248 | # CONFIG_PM is not set | ||
| 249 | CONFIG_SECCOMP=y | ||
| 250 | CONFIG_ISA_DMA_API=y | ||
| 251 | |||
| 252 | # | ||
| 253 | # Bus options | ||
| 254 | # | ||
| 255 | CONFIG_ZONE_DMA=y | ||
| 256 | CONFIG_PPC_INDIRECT_PCI=y | ||
| 257 | CONFIG_FSL_SOC=y | ||
| 258 | CONFIG_FSL_PCI=y | ||
| 259 | CONFIG_PPC_PCI_CHOICE=y | ||
| 260 | CONFIG_PCI=y | ||
| 261 | CONFIG_PCI_DOMAINS=y | ||
| 262 | CONFIG_PCI_SYSCALL=y | ||
| 263 | # CONFIG_PCIEPORTBUS is not set | ||
| 264 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 265 | # CONFIG_PCI_MSI is not set | ||
| 266 | # CONFIG_PCI_LEGACY is not set | ||
| 267 | # CONFIG_PCI_DEBUG is not set | ||
| 268 | # CONFIG_PCI_STUB is not set | ||
| 269 | # CONFIG_PCCARD is not set | ||
| 270 | # CONFIG_HOTPLUG_PCI is not set | ||
| 271 | # CONFIG_HAS_RAPIDIO is not set | ||
| 272 | |||
| 273 | # | ||
| 274 | # Advanced setup | ||
| 275 | # | ||
| 276 | # CONFIG_ADVANCED_OPTIONS is not set | ||
| 277 | |||
| 278 | # | ||
| 279 | # Default settings for advanced configuration options are used | ||
| 280 | # | ||
| 281 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
| 282 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 283 | CONFIG_KERNEL_START=0xc0000000 | ||
| 284 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 285 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 286 | CONFIG_TASK_SIZE=0xc0000000 | ||
| 287 | CONFIG_NET=y | ||
| 288 | |||
| 289 | # | ||
| 290 | # Networking options | ||
| 291 | # | ||
| 292 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 293 | CONFIG_PACKET=y | ||
| 294 | # CONFIG_PACKET_MMAP is not set | ||
| 295 | CONFIG_UNIX=y | ||
| 296 | CONFIG_XFRM=y | ||
| 297 | # CONFIG_XFRM_USER is not set | ||
| 298 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 299 | # CONFIG_XFRM_MIGRATE is not set | ||
| 300 | # CONFIG_XFRM_STATISTICS is not set | ||
| 301 | # CONFIG_NET_KEY is not set | ||
| 302 | CONFIG_INET=y | ||
| 303 | CONFIG_IP_MULTICAST=y | ||
| 304 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 305 | CONFIG_IP_FIB_HASH=y | ||
| 306 | CONFIG_IP_PNP=y | ||
| 307 | CONFIG_IP_PNP_DHCP=y | ||
| 308 | CONFIG_IP_PNP_BOOTP=y | ||
| 309 | # CONFIG_IP_PNP_RARP is not set | ||
| 310 | # CONFIG_NET_IPIP is not set | ||
| 311 | # CONFIG_NET_IPGRE is not set | ||
| 312 | # CONFIG_IP_MROUTE is not set | ||
| 313 | # CONFIG_ARPD is not set | ||
| 314 | CONFIG_SYN_COOKIES=y | ||
| 315 | # CONFIG_INET_AH is not set | ||
| 316 | # CONFIG_INET_ESP is not set | ||
| 317 | # CONFIG_INET_IPCOMP is not set | ||
| 318 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 319 | # CONFIG_INET_TUNNEL is not set | ||
| 320 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 321 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 322 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 323 | # CONFIG_INET_LRO is not set | ||
| 324 | CONFIG_INET_DIAG=y | ||
| 325 | CONFIG_INET_TCP_DIAG=y | ||
| 326 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 327 | CONFIG_TCP_CONG_CUBIC=y | ||
| 328 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 329 | # CONFIG_TCP_MD5SIG is not set | ||
| 330 | # CONFIG_IPV6 is not set | ||
| 331 | # CONFIG_NETWORK_SECMARK is not set | ||
| 332 | # CONFIG_NETFILTER is not set | ||
| 333 | # CONFIG_IP_DCCP is not set | ||
| 334 | # CONFIG_IP_SCTP is not set | ||
| 335 | # CONFIG_TIPC is not set | ||
| 336 | # CONFIG_ATM is not set | ||
| 337 | # CONFIG_BRIDGE is not set | ||
| 338 | # CONFIG_NET_DSA is not set | ||
| 339 | # CONFIG_VLAN_8021Q is not set | ||
| 340 | # CONFIG_DECNET is not set | ||
| 341 | # CONFIG_LLC2 is not set | ||
| 342 | # CONFIG_IPX is not set | ||
| 343 | # CONFIG_ATALK is not set | ||
| 344 | # CONFIG_X25 is not set | ||
| 345 | # CONFIG_LAPB is not set | ||
| 346 | # CONFIG_ECONET is not set | ||
| 347 | # CONFIG_WAN_ROUTER is not set | ||
| 348 | # CONFIG_NET_SCHED is not set | ||
| 349 | # CONFIG_DCB is not set | ||
| 350 | |||
| 351 | # | ||
| 352 | # Network testing | ||
| 353 | # | ||
| 354 | # CONFIG_NET_PKTGEN is not set | ||
| 355 | # CONFIG_HAMRADIO is not set | ||
| 356 | # CONFIG_CAN is not set | ||
| 357 | # CONFIG_IRDA is not set | ||
| 358 | # CONFIG_BT is not set | ||
| 359 | # CONFIG_AF_RXRPC is not set | ||
| 360 | # CONFIG_PHONET is not set | ||
| 361 | CONFIG_WIRELESS=y | ||
| 362 | # CONFIG_CFG80211 is not set | ||
| 363 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 364 | # CONFIG_WIRELESS_EXT is not set | ||
| 365 | # CONFIG_LIB80211 is not set | ||
| 366 | # CONFIG_MAC80211 is not set | ||
| 367 | # CONFIG_WIMAX is not set | ||
| 368 | # CONFIG_RFKILL is not set | ||
| 369 | # CONFIG_NET_9P is not set | ||
| 370 | |||
| 371 | # | ||
| 372 | # Device Drivers | ||
| 373 | # | ||
| 374 | |||
| 375 | # | ||
| 376 | # Generic Driver Options | ||
| 377 | # | ||
| 378 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 379 | CONFIG_STANDALONE=y | ||
| 380 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 381 | # CONFIG_FW_LOADER is not set | ||
| 382 | # CONFIG_DEBUG_DRIVER is not set | ||
| 383 | # CONFIG_DEBUG_DEVRES is not set | ||
| 384 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 385 | # CONFIG_CONNECTOR is not set | ||
| 386 | # CONFIG_MTD is not set | ||
| 387 | CONFIG_OF_DEVICE=y | ||
| 388 | CONFIG_OF_I2C=y | ||
| 389 | # CONFIG_PARPORT is not set | ||
| 390 | CONFIG_BLK_DEV=y | ||
| 391 | # CONFIG_BLK_DEV_FD is not set | ||
| 392 | # CONFIG_BLK_CPQ_DA is not set | ||
| 393 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 394 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 395 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 396 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 397 | CONFIG_BLK_DEV_LOOP=y | ||
| 398 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 399 | # CONFIG_BLK_DEV_NBD is not set | ||
| 400 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 401 | CONFIG_BLK_DEV_RAM=y | ||
| 402 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 403 | CONFIG_BLK_DEV_RAM_SIZE=32768 | ||
| 404 | # CONFIG_BLK_DEV_XIP is not set | ||
| 405 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 406 | # CONFIG_ATA_OVER_ETH is not set | ||
| 407 | # CONFIG_BLK_DEV_HD is not set | ||
| 408 | CONFIG_MISC_DEVICES=y | ||
| 409 | # CONFIG_PHANTOM is not set | ||
| 410 | # CONFIG_EEPROM_93CX6 is not set | ||
| 411 | # CONFIG_SGI_IOC4 is not set | ||
| 412 | # CONFIG_TIFM_CORE is not set | ||
| 413 | # CONFIG_ICS932S401 is not set | ||
| 414 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 415 | # CONFIG_HP_ILO is not set | ||
| 416 | # CONFIG_C2PORT is not set | ||
| 417 | CONFIG_HAVE_IDE=y | ||
| 418 | # CONFIG_IDE is not set | ||
| 419 | |||
| 420 | # | ||
| 421 | # SCSI device support | ||
| 422 | # | ||
| 423 | # CONFIG_RAID_ATTRS is not set | ||
| 424 | CONFIG_SCSI=y | ||
| 425 | CONFIG_SCSI_DMA=y | ||
| 426 | # CONFIG_SCSI_TGT is not set | ||
| 427 | # CONFIG_SCSI_NETLINK is not set | ||
| 428 | CONFIG_SCSI_PROC_FS=y | ||
| 429 | |||
| 430 | # | ||
| 431 | # SCSI support type (disk, tape, CD-ROM) | ||
| 432 | # | ||
| 433 | # CONFIG_BLK_DEV_SD is not set | ||
| 434 | # CONFIG_CHR_DEV_ST is not set | ||
| 435 | # CONFIG_CHR_DEV_OSST is not set | ||
| 436 | # CONFIG_BLK_DEV_SR is not set | ||
| 437 | # CONFIG_CHR_DEV_SG is not set | ||
| 438 | # CONFIG_CHR_DEV_SCH is not set | ||
| 439 | |||
| 440 | # | ||
| 441 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 442 | # | ||
| 443 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 444 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 445 | # CONFIG_SCSI_LOGGING is not set | ||
| 446 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 447 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 448 | |||
| 449 | # | ||
| 450 | # SCSI Transports | ||
| 451 | # | ||
| 452 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 453 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 454 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 455 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 456 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 457 | CONFIG_SCSI_LOWLEVEL=y | ||
| 458 | # CONFIG_ISCSI_TCP is not set | ||
| 459 | # CONFIG_SCSI_CXGB3_ISCSI is not set | ||
| 460 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 461 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 462 | # CONFIG_SCSI_ACARD is not set | ||
| 463 | # CONFIG_SCSI_AACRAID is not set | ||
| 464 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 465 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 466 | # CONFIG_SCSI_AIC79XX is not set | ||
| 467 | # CONFIG_SCSI_AIC94XX is not set | ||
| 468 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 469 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 470 | # CONFIG_SCSI_ARCMSR is not set | ||
| 471 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 472 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 473 | # CONFIG_MEGARAID_SAS is not set | ||
| 474 | # CONFIG_SCSI_HPTIOP is not set | ||
| 475 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 476 | # CONFIG_LIBFC is not set | ||
| 477 | # CONFIG_FCOE is not set | ||
| 478 | # CONFIG_SCSI_DMX3191D is not set | ||
| 479 | # CONFIG_SCSI_EATA is not set | ||
| 480 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 481 | # CONFIG_SCSI_GDTH is not set | ||
| 482 | # CONFIG_SCSI_IPS is not set | ||
| 483 | # CONFIG_SCSI_INITIO is not set | ||
| 484 | # CONFIG_SCSI_INIA100 is not set | ||
| 485 | # CONFIG_SCSI_MVSAS is not set | ||
| 486 | # CONFIG_SCSI_STEX is not set | ||
| 487 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 488 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 489 | # CONFIG_SCSI_QLA_FC is not set | ||
| 490 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 491 | # CONFIG_SCSI_LPFC is not set | ||
| 492 | # CONFIG_SCSI_DC395x is not set | ||
| 493 | # CONFIG_SCSI_DC390T is not set | ||
| 494 | # CONFIG_SCSI_NSP32 is not set | ||
| 495 | # CONFIG_SCSI_DEBUG is not set | ||
| 496 | # CONFIG_SCSI_SRP is not set | ||
| 497 | # CONFIG_SCSI_DH is not set | ||
| 498 | # CONFIG_ATA is not set | ||
| 499 | # CONFIG_MD is not set | ||
| 500 | # CONFIG_FUSION is not set | ||
| 501 | |||
| 502 | # | ||
| 503 | # IEEE 1394 (FireWire) support | ||
| 504 | # | ||
| 505 | |||
| 506 | # | ||
| 507 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 508 | # | ||
| 509 | # CONFIG_FIREWIRE is not set | ||
| 510 | # CONFIG_IEEE1394 is not set | ||
| 511 | # CONFIG_I2O is not set | ||
| 512 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
| 513 | CONFIG_NETDEVICES=y | ||
| 514 | # CONFIG_DUMMY is not set | ||
| 515 | # CONFIG_BONDING is not set | ||
| 516 | # CONFIG_MACVLAN is not set | ||
| 517 | # CONFIG_EQUALIZER is not set | ||
| 518 | # CONFIG_TUN is not set | ||
| 519 | # CONFIG_VETH is not set | ||
| 520 | # CONFIG_ARCNET is not set | ||
| 521 | CONFIG_PHYLIB=y | ||
| 522 | |||
| 523 | # | ||
| 524 | # MII PHY device drivers | ||
| 525 | # | ||
| 526 | CONFIG_MARVELL_PHY=y | ||
| 527 | # CONFIG_DAVICOM_PHY is not set | ||
| 528 | # CONFIG_QSEMI_PHY is not set | ||
| 529 | # CONFIG_LXT_PHY is not set | ||
| 530 | # CONFIG_CICADA_PHY is not set | ||
| 531 | # CONFIG_VITESSE_PHY is not set | ||
| 532 | # CONFIG_SMSC_PHY is not set | ||
| 533 | # CONFIG_BROADCOM_PHY is not set | ||
| 534 | # CONFIG_ICPLUS_PHY is not set | ||
| 535 | # CONFIG_REALTEK_PHY is not set | ||
| 536 | # CONFIG_NATIONAL_PHY is not set | ||
| 537 | # CONFIG_STE10XP is not set | ||
| 538 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 539 | # CONFIG_FIXED_PHY is not set | ||
| 540 | # CONFIG_MDIO_BITBANG is not set | ||
| 541 | CONFIG_NET_ETHERNET=y | ||
| 542 | CONFIG_MII=y | ||
| 543 | # CONFIG_HAPPYMEAL is not set | ||
| 544 | # CONFIG_SUNGEM is not set | ||
| 545 | # CONFIG_CASSINI is not set | ||
| 546 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 547 | # CONFIG_NET_TULIP is not set | ||
| 548 | # CONFIG_HP100 is not set | ||
| 549 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 550 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 551 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 552 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 553 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 554 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 555 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 556 | # CONFIG_NET_PCI is not set | ||
| 557 | # CONFIG_B44 is not set | ||
| 558 | # CONFIG_ATL2 is not set | ||
| 559 | CONFIG_NETDEV_1000=y | ||
| 560 | # CONFIG_ACENIC is not set | ||
| 561 | # CONFIG_DL2K is not set | ||
| 562 | # CONFIG_E1000 is not set | ||
| 563 | # CONFIG_E1000E is not set | ||
| 564 | # CONFIG_IP1000 is not set | ||
| 565 | # CONFIG_IGB is not set | ||
| 566 | # CONFIG_NS83820 is not set | ||
| 567 | # CONFIG_HAMACHI is not set | ||
| 568 | # CONFIG_YELLOWFIN is not set | ||
| 569 | # CONFIG_R8169 is not set | ||
| 570 | # CONFIG_SIS190 is not set | ||
| 571 | # CONFIG_SKGE is not set | ||
| 572 | # CONFIG_SKY2 is not set | ||
| 573 | # CONFIG_VIA_VELOCITY is not set | ||
| 574 | # CONFIG_TIGON3 is not set | ||
| 575 | # CONFIG_BNX2 is not set | ||
| 576 | CONFIG_GIANFAR=y | ||
| 577 | # CONFIG_UCC_GETH is not set | ||
| 578 | # CONFIG_QLA3XXX is not set | ||
| 579 | # CONFIG_ATL1 is not set | ||
| 580 | # CONFIG_ATL1E is not set | ||
| 581 | # CONFIG_JME is not set | ||
| 582 | CONFIG_NETDEV_10000=y | ||
| 583 | # CONFIG_CHELSIO_T1 is not set | ||
| 584 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
| 585 | # CONFIG_CHELSIO_T3 is not set | ||
| 586 | # CONFIG_ENIC is not set | ||
| 587 | # CONFIG_IXGBE is not set | ||
| 588 | # CONFIG_IXGB is not set | ||
| 589 | # CONFIG_S2IO is not set | ||
| 590 | # CONFIG_MYRI10GE is not set | ||
| 591 | # CONFIG_NETXEN_NIC is not set | ||
| 592 | # CONFIG_NIU is not set | ||
| 593 | # CONFIG_MLX4_EN is not set | ||
| 594 | # CONFIG_MLX4_CORE is not set | ||
| 595 | # CONFIG_TEHUTI is not set | ||
| 596 | # CONFIG_BNX2X is not set | ||
| 597 | # CONFIG_QLGE is not set | ||
| 598 | # CONFIG_SFC is not set | ||
| 599 | # CONFIG_TR is not set | ||
| 600 | |||
| 601 | # | ||
| 602 | # Wireless LAN | ||
| 603 | # | ||
| 604 | # CONFIG_WLAN_PRE80211 is not set | ||
| 605 | # CONFIG_WLAN_80211 is not set | ||
| 606 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 607 | |||
| 608 | # | ||
| 609 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 610 | # | ||
| 611 | # CONFIG_WAN is not set | ||
| 612 | # CONFIG_FDDI is not set | ||
| 613 | # CONFIG_HIPPI is not set | ||
| 614 | # CONFIG_PPP is not set | ||
| 615 | # CONFIG_SLIP is not set | ||
| 616 | # CONFIG_NET_FC is not set | ||
| 617 | # CONFIG_NETCONSOLE is not set | ||
| 618 | # CONFIG_NETPOLL is not set | ||
| 619 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 620 | # CONFIG_ISDN is not set | ||
| 621 | # CONFIG_PHONE is not set | ||
| 622 | |||
| 623 | # | ||
| 624 | # Input device support | ||
| 625 | # | ||
| 626 | CONFIG_INPUT=y | ||
| 627 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 628 | # CONFIG_INPUT_POLLDEV is not set | ||
| 629 | |||
| 630 | # | ||
| 631 | # Userland interfaces | ||
| 632 | # | ||
| 633 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 634 | # CONFIG_INPUT_JOYDEV is not set | ||
| 635 | # CONFIG_INPUT_EVDEV is not set | ||
| 636 | # CONFIG_INPUT_EVBUG is not set | ||
| 637 | |||
| 638 | # | ||
| 639 | # Input Device Drivers | ||
| 640 | # | ||
| 641 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 642 | # CONFIG_INPUT_MOUSE is not set | ||
| 643 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 644 | # CONFIG_INPUT_TABLET is not set | ||
| 645 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 646 | # CONFIG_INPUT_MISC is not set | ||
| 647 | |||
| 648 | # | ||
| 649 | # Hardware I/O ports | ||
| 650 | # | ||
| 651 | # CONFIG_SERIO is not set | ||
| 652 | # CONFIG_GAMEPORT is not set | ||
| 653 | |||
| 654 | # | ||
| 655 | # Character devices | ||
| 656 | # | ||
| 657 | # CONFIG_VT is not set | ||
| 658 | CONFIG_DEVKMEM=y | ||
| 659 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 660 | # CONFIG_NOZOMI is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # Serial drivers | ||
| 664 | # | ||
| 665 | CONFIG_SERIAL_8250=y | ||
| 666 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 667 | CONFIG_SERIAL_8250_PCI=y | ||
| 668 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 669 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 670 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 671 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 672 | |||
| 673 | # | ||
| 674 | # Non-8250 serial port support | ||
| 675 | # | ||
| 676 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 677 | CONFIG_SERIAL_CORE=y | ||
| 678 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 679 | # CONFIG_SERIAL_JSM is not set | ||
| 680 | # CONFIG_SERIAL_OF_PLATFORM is not set | ||
| 681 | # CONFIG_SERIAL_QE is not set | ||
| 682 | CONFIG_UNIX98_PTYS=y | ||
| 683 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 684 | CONFIG_LEGACY_PTYS=y | ||
| 685 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 686 | # CONFIG_HVC_UDBG is not set | ||
| 687 | # CONFIG_IPMI_HANDLER is not set | ||
| 688 | CONFIG_HW_RANDOM=y | ||
| 689 | # CONFIG_NVRAM is not set | ||
| 690 | # CONFIG_R3964 is not set | ||
| 691 | # CONFIG_APPLICOM is not set | ||
| 692 | # CONFIG_RAW_DRIVER is not set | ||
| 693 | # CONFIG_TCG_TPM is not set | ||
| 694 | CONFIG_DEVPORT=y | ||
| 695 | CONFIG_I2C=y | ||
| 696 | CONFIG_I2C_BOARDINFO=y | ||
| 697 | CONFIG_I2C_CHARDEV=y | ||
| 698 | CONFIG_I2C_HELPER_AUTO=y | ||
| 699 | |||
| 700 | # | ||
| 701 | # I2C Hardware Bus support | ||
| 702 | # | ||
| 703 | |||
| 704 | # | ||
| 705 | # PC SMBus host controller drivers | ||
| 706 | # | ||
| 707 | # CONFIG_I2C_ALI1535 is not set | ||
| 708 | # CONFIG_I2C_ALI1563 is not set | ||
| 709 | # CONFIG_I2C_ALI15X3 is not set | ||
| 710 | # CONFIG_I2C_AMD756 is not set | ||
| 711 | # CONFIG_I2C_AMD8111 is not set | ||
| 712 | # CONFIG_I2C_I801 is not set | ||
| 713 | # CONFIG_I2C_ISCH is not set | ||
| 714 | # CONFIG_I2C_PIIX4 is not set | ||
| 715 | # CONFIG_I2C_NFORCE2 is not set | ||
| 716 | # CONFIG_I2C_SIS5595 is not set | ||
| 717 | # CONFIG_I2C_SIS630 is not set | ||
| 718 | # CONFIG_I2C_SIS96X is not set | ||
| 719 | # CONFIG_I2C_VIA is not set | ||
| 720 | # CONFIG_I2C_VIAPRO is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 724 | # | ||
| 725 | CONFIG_I2C_MPC=y | ||
| 726 | # CONFIG_I2C_OCORES is not set | ||
| 727 | # CONFIG_I2C_SIMTEC is not set | ||
| 728 | |||
| 729 | # | ||
| 730 | # External I2C/SMBus adapter drivers | ||
| 731 | # | ||
| 732 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 733 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 734 | |||
| 735 | # | ||
| 736 | # Graphics adapter I2C/DDC channel drivers | ||
| 737 | # | ||
| 738 | # CONFIG_I2C_VOODOO3 is not set | ||
| 739 | |||
| 740 | # | ||
| 741 | # Other I2C/SMBus bus drivers | ||
| 742 | # | ||
| 743 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 744 | # CONFIG_I2C_STUB is not set | ||
| 745 | |||
| 746 | # | ||
| 747 | # Miscellaneous I2C Chip support | ||
| 748 | # | ||
| 749 | # CONFIG_DS1682 is not set | ||
| 750 | # CONFIG_EEPROM_AT24 is not set | ||
| 751 | # CONFIG_EEPROM_LEGACY is not set | ||
| 752 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 753 | # CONFIG_PCF8575 is not set | ||
| 754 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 755 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 756 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 757 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 758 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 759 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 760 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 761 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 762 | # CONFIG_SPI is not set | ||
| 763 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 764 | # CONFIG_GPIOLIB is not set | ||
| 765 | # CONFIG_W1 is not set | ||
| 766 | # CONFIG_POWER_SUPPLY is not set | ||
| 767 | CONFIG_HWMON=y | ||
| 768 | # CONFIG_HWMON_VID is not set | ||
| 769 | # CONFIG_SENSORS_AD7414 is not set | ||
| 770 | # CONFIG_SENSORS_AD7418 is not set | ||
| 771 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 772 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 773 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 774 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 775 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 776 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 777 | # CONFIG_SENSORS_ADT7462 is not set | ||
| 778 | # CONFIG_SENSORS_ADT7470 is not set | ||
| 779 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 780 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 781 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 782 | # CONFIG_SENSORS_DS1621 is not set | ||
| 783 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 784 | # CONFIG_SENSORS_F71805F is not set | ||
| 785 | # CONFIG_SENSORS_F71882FG is not set | ||
| 786 | # CONFIG_SENSORS_F75375S is not set | ||
| 787 | # CONFIG_SENSORS_GL518SM is not set | ||
| 788 | # CONFIG_SENSORS_GL520SM is not set | ||
| 789 | # CONFIG_SENSORS_IT87 is not set | ||
| 790 | # CONFIG_SENSORS_LM63 is not set | ||
| 791 | # CONFIG_SENSORS_LM75 is not set | ||
| 792 | # CONFIG_SENSORS_LM77 is not set | ||
| 793 | # CONFIG_SENSORS_LM78 is not set | ||
| 794 | # CONFIG_SENSORS_LM80 is not set | ||
| 795 | # CONFIG_SENSORS_LM83 is not set | ||
| 796 | # CONFIG_SENSORS_LM85 is not set | ||
| 797 | # CONFIG_SENSORS_LM87 is not set | ||
| 798 | # CONFIG_SENSORS_LM90 is not set | ||
| 799 | # CONFIG_SENSORS_LM92 is not set | ||
| 800 | # CONFIG_SENSORS_LM93 is not set | ||
| 801 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 802 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 803 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 804 | # CONFIG_SENSORS_PC87360 is not set | ||
| 805 | # CONFIG_SENSORS_PC87427 is not set | ||
| 806 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 807 | # CONFIG_SENSORS_DME1737 is not set | ||
| 808 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 809 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
| 810 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 811 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 812 | # CONFIG_SENSORS_THMC50 is not set | ||
| 813 | # CONFIG_SENSORS_VIA686A is not set | ||
| 814 | # CONFIG_SENSORS_VT1211 is not set | ||
| 815 | # CONFIG_SENSORS_VT8231 is not set | ||
| 816 | # CONFIG_SENSORS_W83781D is not set | ||
| 817 | # CONFIG_SENSORS_W83791D is not set | ||
| 818 | # CONFIG_SENSORS_W83792D is not set | ||
| 819 | # CONFIG_SENSORS_W83793 is not set | ||
| 820 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 821 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 822 | # CONFIG_SENSORS_W83627HF is not set | ||
| 823 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 824 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 825 | # CONFIG_THERMAL is not set | ||
| 826 | # CONFIG_THERMAL_HWMON is not set | ||
| 827 | CONFIG_WATCHDOG=y | ||
| 828 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 829 | |||
| 830 | # | ||
| 831 | # Watchdog Device Drivers | ||
| 832 | # | ||
| 833 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 834 | # CONFIG_ALIM7101_WDT is not set | ||
| 835 | # CONFIG_BOOKE_WDT is not set | ||
| 836 | |||
| 837 | # | ||
| 838 | # PCI-based Watchdog Cards | ||
| 839 | # | ||
| 840 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 841 | # CONFIG_WDTPCI is not set | ||
| 842 | CONFIG_SSB_POSSIBLE=y | ||
| 843 | |||
| 844 | # | ||
| 845 | # Sonics Silicon Backplane | ||
| 846 | # | ||
| 847 | # CONFIG_SSB is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # Multifunction device drivers | ||
| 851 | # | ||
| 852 | # CONFIG_MFD_CORE is not set | ||
| 853 | # CONFIG_MFD_SM501 is not set | ||
| 854 | # CONFIG_HTC_PASIC3 is not set | ||
| 855 | # CONFIG_TWL4030_CORE is not set | ||
| 856 | # CONFIG_MFD_TMIO is not set | ||
| 857 | # CONFIG_PMIC_DA903X is not set | ||
| 858 | # CONFIG_MFD_WM8400 is not set | ||
| 859 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 860 | # CONFIG_MFD_PCF50633 is not set | ||
| 861 | # CONFIG_REGULATOR is not set | ||
| 862 | |||
| 863 | # | ||
| 864 | # Multimedia devices | ||
| 865 | # | ||
| 866 | |||
| 867 | # | ||
| 868 | # Multimedia core support | ||
| 869 | # | ||
| 870 | # CONFIG_VIDEO_DEV is not set | ||
| 871 | # CONFIG_DVB_CORE is not set | ||
| 872 | # CONFIG_VIDEO_MEDIA is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # Multimedia drivers | ||
| 876 | # | ||
| 877 | CONFIG_DAB=y | ||
| 878 | |||
| 879 | # | ||
| 880 | # Graphics support | ||
| 881 | # | ||
| 882 | # CONFIG_AGP is not set | ||
| 883 | # CONFIG_DRM is not set | ||
| 884 | # CONFIG_VGASTATE is not set | ||
| 885 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 886 | # CONFIG_FB is not set | ||
| 887 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 888 | |||
| 889 | # | ||
| 890 | # Display device support | ||
| 891 | # | ||
| 892 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 893 | # CONFIG_SOUND is not set | ||
| 894 | CONFIG_HID_SUPPORT=y | ||
| 895 | CONFIG_HID=y | ||
| 896 | # CONFIG_HID_DEBUG is not set | ||
| 897 | # CONFIG_HIDRAW is not set | ||
| 898 | # CONFIG_HID_PID is not set | ||
| 899 | |||
| 900 | # | ||
| 901 | # Special HID drivers | ||
| 902 | # | ||
| 903 | CONFIG_HID_COMPAT=y | ||
| 904 | CONFIG_USB_SUPPORT=y | ||
| 905 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 906 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 907 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 908 | # CONFIG_USB is not set | ||
| 909 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 910 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 911 | |||
| 912 | # | ||
| 913 | # Enable Host or Gadget support to see Inventra options | ||
| 914 | # | ||
| 915 | |||
| 916 | # | ||
| 917 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | ||
| 918 | # | ||
| 919 | # CONFIG_USB_GADGET is not set | ||
| 920 | |||
| 921 | # | ||
| 922 | # OTG and related infrastructure | ||
| 923 | # | ||
| 924 | # CONFIG_UWB is not set | ||
| 925 | # CONFIG_MMC is not set | ||
| 926 | # CONFIG_MEMSTICK is not set | ||
| 927 | # CONFIG_NEW_LEDS is not set | ||
| 928 | # CONFIG_ACCESSIBILITY is not set | ||
| 929 | # CONFIG_INFINIBAND is not set | ||
| 930 | # CONFIG_EDAC is not set | ||
| 931 | CONFIG_RTC_LIB=y | ||
| 932 | CONFIG_RTC_CLASS=y | ||
| 933 | CONFIG_RTC_HCTOSYS=y | ||
| 934 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 935 | # CONFIG_RTC_DEBUG is not set | ||
| 936 | |||
| 937 | # | ||
| 938 | # RTC interfaces | ||
| 939 | # | ||
| 940 | CONFIG_RTC_INTF_SYSFS=y | ||
| 941 | CONFIG_RTC_INTF_PROC=y | ||
| 942 | CONFIG_RTC_INTF_DEV=y | ||
| 943 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 944 | # CONFIG_RTC_DRV_TEST is not set | ||
| 945 | |||
| 946 | # | ||
| 947 | # I2C RTC drivers | ||
| 948 | # | ||
| 949 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 950 | CONFIG_RTC_DRV_DS1374=y | ||
| 951 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 952 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 953 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 954 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 955 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 956 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 957 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 958 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 959 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 960 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 961 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 962 | |||
| 963 | # | ||
| 964 | # SPI RTC drivers | ||
| 965 | # | ||
| 966 | |||
| 967 | # | ||
| 968 | # Platform RTC drivers | ||
| 969 | # | ||
| 970 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 971 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 972 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 973 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 974 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 975 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 976 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 977 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 978 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 979 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 980 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 981 | |||
| 982 | # | ||
| 983 | # on-CPU RTC drivers | ||
| 984 | # | ||
| 985 | # CONFIG_RTC_DRV_PPC is not set | ||
| 986 | # CONFIG_DMADEVICES is not set | ||
| 987 | # CONFIG_UIO is not set | ||
| 988 | # CONFIG_STAGING is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # File systems | ||
| 992 | # | ||
| 993 | CONFIG_EXT2_FS=y | ||
| 994 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 995 | # CONFIG_EXT2_FS_XIP is not set | ||
| 996 | CONFIG_EXT3_FS=y | ||
| 997 | CONFIG_EXT3_FS_XATTR=y | ||
| 998 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
| 999 | # CONFIG_EXT3_FS_SECURITY is not set | ||
| 1000 | # CONFIG_EXT4_FS is not set | ||
| 1001 | CONFIG_JBD=y | ||
| 1002 | CONFIG_FS_MBCACHE=y | ||
| 1003 | # CONFIG_REISERFS_FS is not set | ||
| 1004 | # CONFIG_JFS_FS is not set | ||
| 1005 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1006 | CONFIG_FILE_LOCKING=y | ||
| 1007 | # CONFIG_XFS_FS is not set | ||
| 1008 | # CONFIG_OCFS2_FS is not set | ||
| 1009 | # CONFIG_BTRFS_FS is not set | ||
| 1010 | CONFIG_DNOTIFY=y | ||
| 1011 | CONFIG_INOTIFY=y | ||
| 1012 | CONFIG_INOTIFY_USER=y | ||
| 1013 | # CONFIG_QUOTA is not set | ||
| 1014 | # CONFIG_AUTOFS_FS is not set | ||
| 1015 | # CONFIG_AUTOFS4_FS is not set | ||
| 1016 | # CONFIG_FUSE_FS is not set | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # CD-ROM/DVD Filesystems | ||
| 1020 | # | ||
| 1021 | # CONFIG_ISO9660_FS is not set | ||
| 1022 | # CONFIG_UDF_FS is not set | ||
| 1023 | |||
| 1024 | # | ||
| 1025 | # DOS/FAT/NT Filesystems | ||
| 1026 | # | ||
| 1027 | # CONFIG_MSDOS_FS is not set | ||
| 1028 | # CONFIG_VFAT_FS is not set | ||
| 1029 | # CONFIG_NTFS_FS is not set | ||
| 1030 | |||
| 1031 | # | ||
| 1032 | # Pseudo filesystems | ||
| 1033 | # | ||
| 1034 | CONFIG_PROC_FS=y | ||
| 1035 | CONFIG_PROC_KCORE=y | ||
| 1036 | CONFIG_PROC_SYSCTL=y | ||
| 1037 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1038 | CONFIG_SYSFS=y | ||
| 1039 | CONFIG_TMPFS=y | ||
| 1040 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1041 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1042 | # CONFIG_CONFIGFS_FS is not set | ||
| 1043 | CONFIG_MISC_FILESYSTEMS=y | ||
| 1044 | # CONFIG_ADFS_FS is not set | ||
| 1045 | # CONFIG_AFFS_FS is not set | ||
| 1046 | # CONFIG_HFS_FS is not set | ||
| 1047 | # CONFIG_HFSPLUS_FS is not set | ||
| 1048 | # CONFIG_BEFS_FS is not set | ||
| 1049 | # CONFIG_BFS_FS is not set | ||
| 1050 | # CONFIG_EFS_FS is not set | ||
| 1051 | # CONFIG_CRAMFS is not set | ||
| 1052 | # CONFIG_SQUASHFS is not set | ||
| 1053 | # CONFIG_VXFS_FS is not set | ||
| 1054 | # CONFIG_MINIX_FS is not set | ||
| 1055 | # CONFIG_OMFS_FS is not set | ||
| 1056 | # CONFIG_HPFS_FS is not set | ||
| 1057 | # CONFIG_QNX4FS_FS is not set | ||
| 1058 | # CONFIG_ROMFS_FS is not set | ||
| 1059 | # CONFIG_SYSV_FS is not set | ||
| 1060 | # CONFIG_UFS_FS is not set | ||
| 1061 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1062 | CONFIG_NFS_FS=y | ||
| 1063 | CONFIG_NFS_V3=y | ||
| 1064 | # CONFIG_NFS_V3_ACL is not set | ||
| 1065 | CONFIG_NFS_V4=y | ||
| 1066 | CONFIG_ROOT_NFS=y | ||
| 1067 | # CONFIG_NFSD is not set | ||
| 1068 | CONFIG_LOCKD=y | ||
| 1069 | CONFIG_LOCKD_V4=y | ||
| 1070 | CONFIG_NFS_COMMON=y | ||
| 1071 | CONFIG_SUNRPC=y | ||
| 1072 | CONFIG_SUNRPC_GSS=y | ||
| 1073 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1074 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1075 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1076 | # CONFIG_SMB_FS is not set | ||
| 1077 | # CONFIG_CIFS is not set | ||
| 1078 | # CONFIG_NCP_FS is not set | ||
| 1079 | # CONFIG_CODA_FS is not set | ||
| 1080 | # CONFIG_AFS_FS is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Partition Types | ||
| 1084 | # | ||
| 1085 | CONFIG_PARTITION_ADVANCED=y | ||
| 1086 | # CONFIG_ACORN_PARTITION is not set | ||
| 1087 | # CONFIG_OSF_PARTITION is not set | ||
| 1088 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1089 | # CONFIG_ATARI_PARTITION is not set | ||
| 1090 | # CONFIG_MAC_PARTITION is not set | ||
| 1091 | # CONFIG_MSDOS_PARTITION is not set | ||
| 1092 | # CONFIG_LDM_PARTITION is not set | ||
| 1093 | # CONFIG_SGI_PARTITION is not set | ||
| 1094 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1095 | # CONFIG_SUN_PARTITION is not set | ||
| 1096 | # CONFIG_KARMA_PARTITION is not set | ||
| 1097 | # CONFIG_EFI_PARTITION is not set | ||
| 1098 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1099 | # CONFIG_NLS is not set | ||
| 1100 | # CONFIG_DLM is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Library routines | ||
| 1104 | # | ||
| 1105 | CONFIG_BITREVERSE=y | ||
| 1106 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1107 | # CONFIG_CRC_CCITT is not set | ||
| 1108 | # CONFIG_CRC16 is not set | ||
| 1109 | # CONFIG_CRC_T10DIF is not set | ||
| 1110 | # CONFIG_CRC_ITU_T is not set | ||
| 1111 | CONFIG_CRC32=y | ||
| 1112 | # CONFIG_CRC7 is not set | ||
| 1113 | # CONFIG_LIBCRC32C is not set | ||
| 1114 | CONFIG_PLIST=y | ||
| 1115 | CONFIG_HAS_IOMEM=y | ||
| 1116 | CONFIG_HAS_IOPORT=y | ||
| 1117 | CONFIG_HAS_DMA=y | ||
| 1118 | CONFIG_HAVE_LMB=y | ||
| 1119 | |||
| 1120 | # | ||
| 1121 | # Kernel hacking | ||
| 1122 | # | ||
| 1123 | # CONFIG_PRINTK_TIME is not set | ||
| 1124 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1125 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1126 | CONFIG_FRAME_WARN=1024 | ||
| 1127 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1128 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1129 | # CONFIG_DEBUG_FS is not set | ||
| 1130 | # CONFIG_HEADERS_CHECK is not set | ||
| 1131 | CONFIG_DEBUG_KERNEL=y | ||
| 1132 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1133 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1134 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1135 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1136 | CONFIG_SCHED_DEBUG=y | ||
| 1137 | # CONFIG_SCHEDSTATS is not set | ||
| 1138 | # CONFIG_TIMER_STATS is not set | ||
| 1139 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1140 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1141 | # CONFIG_SLUB_STATS is not set | ||
| 1142 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1143 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1144 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1145 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1146 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1147 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1148 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1149 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1150 | # CONFIG_DEBUG_INFO is not set | ||
| 1151 | # CONFIG_DEBUG_VM is not set | ||
| 1152 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1153 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1154 | # CONFIG_DEBUG_LIST is not set | ||
| 1155 | # CONFIG_DEBUG_SG is not set | ||
| 1156 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1157 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1158 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1159 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1160 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1161 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1162 | # CONFIG_FAULT_INJECTION is not set | ||
| 1163 | # CONFIG_LATENCYTOP is not set | ||
| 1164 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1165 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1166 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1167 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
| 1168 | |||
| 1169 | # | ||
| 1170 | # Tracers | ||
| 1171 | # | ||
| 1172 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1173 | # CONFIG_SCHED_TRACER is not set | ||
| 1174 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1175 | # CONFIG_BOOT_TRACER is not set | ||
| 1176 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1177 | # CONFIG_STACK_TRACER is not set | ||
| 1178 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1179 | # CONFIG_SAMPLES is not set | ||
| 1180 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1181 | # CONFIG_KGDB is not set | ||
| 1182 | CONFIG_PRINT_STACK_DEPTH=64 | ||
| 1183 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
| 1184 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1185 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1186 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
| 1187 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1188 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1189 | # CONFIG_XMON is not set | ||
| 1190 | # CONFIG_IRQSTACKS is not set | ||
| 1191 | # CONFIG_BDI_SWITCH is not set | ||
| 1192 | CONFIG_PPC_EARLY_DEBUG=y | ||
| 1193 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | ||
| 1194 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | ||
| 1195 | # CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set | ||
| 1196 | # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set | ||
| 1197 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | ||
| 1198 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | ||
| 1199 | # CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set | ||
| 1200 | # CONFIG_PPC_EARLY_DEBUG_BEAT is not set | ||
| 1201 | # CONFIG_PPC_EARLY_DEBUG_44x is not set | ||
| 1202 | # CONFIG_PPC_EARLY_DEBUG_40x is not set | ||
| 1203 | # CONFIG_PPC_EARLY_DEBUG_CPM is not set | ||
| 1204 | |||
| 1205 | # | ||
| 1206 | # Security options | ||
| 1207 | # | ||
| 1208 | # CONFIG_KEYS is not set | ||
| 1209 | # CONFIG_SECURITY is not set | ||
| 1210 | # CONFIG_SECURITYFS is not set | ||
| 1211 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1212 | CONFIG_CRYPTO=y | ||
| 1213 | |||
| 1214 | # | ||
| 1215 | # Crypto core or helper | ||
| 1216 | # | ||
| 1217 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1218 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1219 | CONFIG_CRYPTO_ALGAPI2=y | ||
| 1220 | CONFIG_CRYPTO_AEAD2=y | ||
| 1221 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1222 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1223 | CONFIG_CRYPTO_HASH=y | ||
| 1224 | CONFIG_CRYPTO_HASH2=y | ||
| 1225 | CONFIG_CRYPTO_RNG2=y | ||
| 1226 | CONFIG_CRYPTO_MANAGER=y | ||
| 1227 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1228 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1229 | # CONFIG_CRYPTO_NULL is not set | ||
| 1230 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1231 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1232 | # CONFIG_CRYPTO_TEST is not set | ||
| 1233 | |||
| 1234 | # | ||
| 1235 | # Authenticated Encryption with Associated Data | ||
| 1236 | # | ||
| 1237 | # CONFIG_CRYPTO_CCM is not set | ||
| 1238 | # CONFIG_CRYPTO_GCM is not set | ||
| 1239 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1240 | |||
| 1241 | # | ||
| 1242 | # Block modes | ||
| 1243 | # | ||
| 1244 | CONFIG_CRYPTO_CBC=y | ||
| 1245 | # CONFIG_CRYPTO_CTR is not set | ||
| 1246 | # CONFIG_CRYPTO_CTS is not set | ||
| 1247 | CONFIG_CRYPTO_ECB=m | ||
| 1248 | # CONFIG_CRYPTO_LRW is not set | ||
| 1249 | CONFIG_CRYPTO_PCBC=m | ||
| 1250 | # CONFIG_CRYPTO_XTS is not set | ||
| 1251 | |||
| 1252 | # | ||
| 1253 | # Hash modes | ||
| 1254 | # | ||
| 1255 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1256 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # Digest | ||
| 1260 | # | ||
| 1261 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1262 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1263 | CONFIG_CRYPTO_MD5=y | ||
| 1264 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1265 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1266 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1267 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1268 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1269 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1270 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1271 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1272 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1273 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1274 | |||
| 1275 | # | ||
| 1276 | # Ciphers | ||
| 1277 | # | ||
| 1278 | # CONFIG_CRYPTO_AES is not set | ||
| 1279 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1280 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1281 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1282 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1283 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1284 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1285 | CONFIG_CRYPTO_DES=y | ||
| 1286 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1287 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1288 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1289 | # CONFIG_CRYPTO_SEED is not set | ||
| 1290 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1291 | # CONFIG_CRYPTO_TEA is not set | ||
| 1292 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1293 | |||
| 1294 | # | ||
| 1295 | # Compression | ||
| 1296 | # | ||
| 1297 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1298 | # CONFIG_CRYPTO_LZO is not set | ||
| 1299 | |||
| 1300 | # | ||
| 1301 | # Random Number Generation | ||
| 1302 | # | ||
| 1303 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1304 | CONFIG_CRYPTO_HW=y | ||
| 1305 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1306 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
| 1307 | # CONFIG_PPC_CLOCK is not set | ||
| 1308 | CONFIG_PPC_LIB_RHEAP=y | ||
| 1309 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index af0cd55605d..aaa4416660e 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_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.29-rc3 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Fri Feb 6 09:48:53 2009 | 4 | # Mon Apr 20 11:06:25 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -14,6 +14,7 @@ CONFIG_6xx=y | |||
| 14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
| 15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
| 16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
| 17 | CONFIG_PPC_BOOK3S=y | ||
| 17 | CONFIG_PPC_FPU=y | 18 | CONFIG_PPC_FPU=y |
| 18 | # CONFIG_ALTIVEC is not set | 19 | # CONFIG_ALTIVEC is not set |
| 19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
| @@ -39,6 +40,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 39 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 41 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 42 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 43 | CONFIG_GENERIC_GPIO=y | ||
| 42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 43 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
| 44 | CONFIG_EARLY_PRINTK=y | 46 | CONFIG_EARLY_PRINTK=y |
| @@ -55,6 +57,7 @@ CONFIG_DEFAULT_UIMAGE=y | |||
| 55 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 56 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
| 57 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
| 60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 58 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 59 | 62 | ||
| 60 | # | 63 | # |
| @@ -91,19 +94,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 91 | # CONFIG_NAMESPACES is not set | 94 | # CONFIG_NAMESPACES is not set |
| 92 | CONFIG_BLK_DEV_INITRD=y | 95 | CONFIG_BLK_DEV_INITRD=y |
| 93 | CONFIG_INITRAMFS_SOURCE="" | 96 | CONFIG_INITRAMFS_SOURCE="" |
| 97 | CONFIG_RD_GZIP=y | ||
| 98 | # CONFIG_RD_BZIP2 is not set | ||
| 99 | # CONFIG_RD_LZMA is not set | ||
| 94 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 100 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 95 | CONFIG_SYSCTL=y | 101 | CONFIG_SYSCTL=y |
| 102 | CONFIG_ANON_INODES=y | ||
| 96 | CONFIG_EMBEDDED=y | 103 | CONFIG_EMBEDDED=y |
| 97 | # CONFIG_SYSCTL_SYSCALL is not set | 104 | # CONFIG_SYSCTL_SYSCALL is not set |
| 98 | # CONFIG_KALLSYMS is not set | 105 | # CONFIG_KALLSYMS is not set |
| 106 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 99 | CONFIG_HOTPLUG=y | 107 | CONFIG_HOTPLUG=y |
| 100 | CONFIG_PRINTK=y | 108 | CONFIG_PRINTK=y |
| 101 | CONFIG_BUG=y | 109 | CONFIG_BUG=y |
| 102 | CONFIG_ELF_CORE=y | 110 | CONFIG_ELF_CORE=y |
| 103 | CONFIG_COMPAT_BRK=y | ||
| 104 | CONFIG_BASE_FULL=y | 111 | CONFIG_BASE_FULL=y |
| 105 | CONFIG_FUTEX=y | 112 | CONFIG_FUTEX=y |
| 106 | CONFIG_ANON_INODES=y | ||
| 107 | # CONFIG_EPOLL is not set | 113 | # CONFIG_EPOLL is not set |
| 108 | CONFIG_SIGNALFD=y | 114 | CONFIG_SIGNALFD=y |
| 109 | CONFIG_TIMERFD=y | 115 | CONFIG_TIMERFD=y |
| @@ -113,10 +119,12 @@ CONFIG_AIO=y | |||
| 113 | CONFIG_VM_EVENT_COUNTERS=y | 119 | CONFIG_VM_EVENT_COUNTERS=y |
| 114 | CONFIG_PCI_QUIRKS=y | 120 | CONFIG_PCI_QUIRKS=y |
| 115 | CONFIG_SLUB_DEBUG=y | 121 | CONFIG_SLUB_DEBUG=y |
| 122 | CONFIG_COMPAT_BRK=y | ||
| 116 | # CONFIG_SLAB is not set | 123 | # CONFIG_SLAB is not set |
| 117 | CONFIG_SLUB=y | 124 | CONFIG_SLUB=y |
| 118 | # CONFIG_SLOB is not set | 125 | # CONFIG_SLOB is not set |
| 119 | # CONFIG_PROFILING is not set | 126 | # CONFIG_PROFILING is not set |
| 127 | # CONFIG_MARKERS is not set | ||
| 120 | CONFIG_HAVE_OPROFILE=y | 128 | CONFIG_HAVE_OPROFILE=y |
| 121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 129 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 122 | CONFIG_HAVE_IOREMAP_PROT=y | 130 | CONFIG_HAVE_IOREMAP_PROT=y |
| @@ -124,6 +132,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 124 | CONFIG_HAVE_KRETPROBES=y | 132 | CONFIG_HAVE_KRETPROBES=y |
| 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 133 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 126 | CONFIG_HAVE_CLK=y | 134 | CONFIG_HAVE_CLK=y |
| 135 | # CONFIG_SLOW_WORK is not set | ||
| 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 136 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 128 | CONFIG_SLABINFO=y | 137 | CONFIG_SLABINFO=y |
| 129 | CONFIG_RT_MUTEXES=y | 138 | CONFIG_RT_MUTEXES=y |
| @@ -136,7 +145,6 @@ CONFIG_MODULE_UNLOAD=y | |||
| 136 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 145 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 137 | CONFIG_BLOCK=y | 146 | CONFIG_BLOCK=y |
| 138 | # CONFIG_LBD is not set | 147 | # CONFIG_LBD is not set |
| 139 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 140 | # CONFIG_BLK_DEV_BSG is not set | 148 | # CONFIG_BLK_DEV_BSG is not set |
| 141 | # CONFIG_BLK_DEV_INTEGRITY is not set | 149 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 142 | 150 | ||
| @@ -157,8 +165,6 @@ CONFIG_FREEZER=y | |||
| 157 | # | 165 | # |
| 158 | # Platform support | 166 | # Platform support |
| 159 | # | 167 | # |
| 160 | CONFIG_PPC_MULTIPLATFORM=y | ||
| 161 | CONFIG_CLASSIC32=y | ||
| 162 | # CONFIG_PPC_CHRP is not set | 168 | # CONFIG_PPC_CHRP is not set |
| 163 | # CONFIG_MPC5121_ADS is not set | 169 | # CONFIG_MPC5121_ADS is not set |
| 164 | # CONFIG_MPC5121_GENERIC is not set | 170 | # CONFIG_MPC5121_GENERIC is not set |
| @@ -166,8 +172,9 @@ CONFIG_PPC_MPC52xx=y | |||
| 166 | CONFIG_PPC_MPC5200_SIMPLE=y | 172 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 167 | CONFIG_PPC_EFIKA=y | 173 | CONFIG_PPC_EFIKA=y |
| 168 | CONFIG_PPC_LITE5200=y | 174 | CONFIG_PPC_LITE5200=y |
| 175 | CONFIG_PPC_MEDIA5200=y | ||
| 169 | CONFIG_PPC_MPC5200_BUGFIX=y | 176 | CONFIG_PPC_MPC5200_BUGFIX=y |
| 170 | # CONFIG_PPC_MPC5200_GPIO is not set | 177 | CONFIG_PPC_MPC5200_GPIO=y |
| 171 | # CONFIG_PPC_PMAC is not set | 178 | # CONFIG_PPC_PMAC is not set |
| 172 | # CONFIG_PPC_CELL is not set | 179 | # CONFIG_PPC_CELL is not set |
| 173 | # CONFIG_PPC_CELL_NATIVE is not set | 180 | # CONFIG_PPC_CELL_NATIVE is not set |
| @@ -176,7 +183,9 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
| 176 | # CONFIG_PPC_83xx is not set | 183 | # CONFIG_PPC_83xx is not set |
| 177 | # CONFIG_PPC_86xx is not set | 184 | # CONFIG_PPC_86xx is not set |
| 178 | # CONFIG_EMBEDDED6xx is not set | 185 | # CONFIG_EMBEDDED6xx is not set |
| 186 | # CONFIG_AMIGAONE is not set | ||
| 179 | CONFIG_PPC_NATIVE=y | 187 | CONFIG_PPC_NATIVE=y |
| 188 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
| 180 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 189 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
| 181 | # CONFIG_IPIC is not set | 190 | # CONFIG_IPIC is not set |
| 182 | # CONFIG_MPIC is not set | 191 | # CONFIG_MPIC is not set |
| @@ -241,9 +250,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 241 | CONFIG_BOUNCE=y | 250 | CONFIG_BOUNCE=y |
| 242 | CONFIG_VIRT_TO_BUS=y | 251 | CONFIG_VIRT_TO_BUS=y |
| 243 | CONFIG_UNEVICTABLE_LRU=y | 252 | CONFIG_UNEVICTABLE_LRU=y |
| 253 | CONFIG_HAVE_MLOCK=y | ||
| 254 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 244 | CONFIG_PPC_4K_PAGES=y | 255 | CONFIG_PPC_4K_PAGES=y |
| 245 | # CONFIG_PPC_16K_PAGES is not set | 256 | # CONFIG_PPC_16K_PAGES is not set |
| 246 | # CONFIG_PPC_64K_PAGES is not set | 257 | # CONFIG_PPC_64K_PAGES is not set |
| 258 | # CONFIG_PPC_256K_PAGES is not set | ||
| 247 | CONFIG_FORCE_MAX_ZONEORDER=11 | 259 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 248 | CONFIG_PROC_DEVICETREE=y | 260 | CONFIG_PROC_DEVICETREE=y |
| 249 | # CONFIG_CMDLINE_BOOL is not set | 261 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -272,6 +284,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 272 | CONFIG_PCI_LEGACY=y | 284 | CONFIG_PCI_LEGACY=y |
| 273 | # CONFIG_PCI_DEBUG is not set | 285 | # CONFIG_PCI_DEBUG is not set |
| 274 | # CONFIG_PCI_STUB is not set | 286 | # CONFIG_PCI_STUB is not set |
| 287 | # CONFIG_PCI_IOV is not set | ||
| 275 | # CONFIG_PCCARD is not set | 288 | # CONFIG_PCCARD is not set |
| 276 | # CONFIG_HOTPLUG_PCI is not set | 289 | # CONFIG_HOTPLUG_PCI is not set |
| 277 | # CONFIG_HAS_RAPIDIO is not set | 290 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -294,7 +307,6 @@ CONFIG_NET=y | |||
| 294 | # | 307 | # |
| 295 | # Networking options | 308 | # Networking options |
| 296 | # | 309 | # |
| 297 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 298 | CONFIG_PACKET=y | 310 | CONFIG_PACKET=y |
| 299 | # CONFIG_PACKET_MMAP is not set | 311 | # CONFIG_PACKET_MMAP is not set |
| 300 | CONFIG_UNIX=y | 312 | CONFIG_UNIX=y |
| @@ -350,6 +362,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 350 | # CONFIG_LAPB is not set | 362 | # CONFIG_LAPB is not set |
| 351 | # CONFIG_ECONET is not set | 363 | # CONFIG_ECONET is not set |
| 352 | # CONFIG_WAN_ROUTER is not set | 364 | # CONFIG_WAN_ROUTER is not set |
| 365 | # CONFIG_PHONET is not set | ||
| 353 | # CONFIG_NET_SCHED is not set | 366 | # CONFIG_NET_SCHED is not set |
| 354 | # CONFIG_DCB is not set | 367 | # CONFIG_DCB is not set |
| 355 | 368 | ||
| @@ -362,7 +375,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 362 | # CONFIG_IRDA is not set | 375 | # CONFIG_IRDA is not set |
| 363 | # CONFIG_BT is not set | 376 | # CONFIG_BT is not set |
| 364 | # CONFIG_AF_RXRPC is not set | 377 | # CONFIG_AF_RXRPC is not set |
| 365 | # CONFIG_PHONET is not set | ||
| 366 | # CONFIG_WIRELESS is not set | 378 | # CONFIG_WIRELESS is not set |
| 367 | # CONFIG_WIMAX is not set | 379 | # CONFIG_WIMAX is not set |
| 368 | # CONFIG_RFKILL is not set | 380 | # CONFIG_RFKILL is not set |
| @@ -388,12 +400,9 @@ CONFIG_MTD=y | |||
| 388 | CONFIG_MTD_CONCAT=y | 400 | CONFIG_MTD_CONCAT=y |
| 389 | CONFIG_MTD_PARTITIONS=y | 401 | CONFIG_MTD_PARTITIONS=y |
| 390 | # CONFIG_MTD_TESTS is not set | 402 | # CONFIG_MTD_TESTS is not set |
| 391 | CONFIG_MTD_REDBOOT_PARTS=y | 403 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 392 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
| 393 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
| 394 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
| 395 | CONFIG_MTD_CMDLINE_PARTS=y | 404 | CONFIG_MTD_CMDLINE_PARTS=y |
| 396 | # CONFIG_MTD_OF_PARTS is not set | 405 | CONFIG_MTD_OF_PARTS=y |
| 397 | # CONFIG_MTD_AR7_PARTS is not set | 406 | # CONFIG_MTD_AR7_PARTS is not set |
| 398 | 407 | ||
| 399 | # | 408 | # |
| @@ -447,6 +456,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 447 | # Self-contained MTD device drivers | 456 | # Self-contained MTD device drivers |
| 448 | # | 457 | # |
| 449 | # CONFIG_MTD_PMC551 is not set | 458 | # CONFIG_MTD_PMC551 is not set |
| 459 | # CONFIG_MTD_DATAFLASH is not set | ||
| 460 | # CONFIG_MTD_M25P80 is not set | ||
| 450 | # CONFIG_MTD_SLRAM is not set | 461 | # CONFIG_MTD_SLRAM is not set |
| 451 | # CONFIG_MTD_PHRAM is not set | 462 | # CONFIG_MTD_PHRAM is not set |
| 452 | # CONFIG_MTD_MTDRAM is not set | 463 | # CONFIG_MTD_MTDRAM is not set |
| @@ -465,14 +476,23 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 465 | # LPDDR flash memory drivers | 476 | # LPDDR flash memory drivers |
| 466 | # | 477 | # |
| 467 | # CONFIG_MTD_LPDDR is not set | 478 | # CONFIG_MTD_LPDDR is not set |
| 468 | # CONFIG_MTD_QINFO_PROBE is not set | ||
| 469 | 479 | ||
| 470 | # | 480 | # |
| 471 | # UBI - Unsorted block images | 481 | # UBI - Unsorted block images |
| 472 | # | 482 | # |
| 473 | # CONFIG_MTD_UBI is not set | 483 | CONFIG_MTD_UBI=m |
| 484 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | ||
| 485 | CONFIG_MTD_UBI_BEB_RESERVE=1 | ||
| 486 | # CONFIG_MTD_UBI_GLUEBI is not set | ||
| 487 | |||
| 488 | # | ||
| 489 | # UBI debugging options | ||
| 490 | # | ||
| 491 | # CONFIG_MTD_UBI_DEBUG is not set | ||
| 474 | CONFIG_OF_DEVICE=y | 492 | CONFIG_OF_DEVICE=y |
| 493 | CONFIG_OF_GPIO=y | ||
| 475 | CONFIG_OF_I2C=y | 494 | CONFIG_OF_I2C=y |
| 495 | CONFIG_OF_SPI=y | ||
| 476 | # CONFIG_PARPORT is not set | 496 | # CONFIG_PARPORT is not set |
| 477 | CONFIG_BLK_DEV=y | 497 | CONFIG_BLK_DEV=y |
| 478 | # CONFIG_BLK_DEV_FD is not set | 498 | # CONFIG_BLK_DEV_FD is not set |
| @@ -500,12 +520,14 @@ CONFIG_MISC_DEVICES=y | |||
| 500 | # CONFIG_ICS932S401 is not set | 520 | # CONFIG_ICS932S401 is not set |
| 501 | # CONFIG_ENCLOSURE_SERVICES is not set | 521 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 502 | # CONFIG_HP_ILO is not set | 522 | # CONFIG_HP_ILO is not set |
| 523 | # CONFIG_ISL29003 is not set | ||
| 503 | # CONFIG_C2PORT is not set | 524 | # CONFIG_C2PORT is not set |
| 504 | 525 | ||
| 505 | # | 526 | # |
| 506 | # EEPROM support | 527 | # EEPROM support |
| 507 | # | 528 | # |
| 508 | CONFIG_EEPROM_AT24=y | 529 | CONFIG_EEPROM_AT24=y |
| 530 | # CONFIG_EEPROM_AT25 is not set | ||
| 509 | # CONFIG_EEPROM_LEGACY is not set | 531 | # CONFIG_EEPROM_LEGACY is not set |
| 510 | # CONFIG_EEPROM_93CX6 is not set | 532 | # CONFIG_EEPROM_93CX6 is not set |
| 511 | CONFIG_HAVE_IDE=y | 533 | CONFIG_HAVE_IDE=y |
| @@ -564,9 +586,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 564 | # CONFIG_MEGARAID_NEWGEN is not set | 586 | # CONFIG_MEGARAID_NEWGEN is not set |
| 565 | # CONFIG_MEGARAID_LEGACY is not set | 587 | # CONFIG_MEGARAID_LEGACY is not set |
| 566 | # CONFIG_MEGARAID_SAS is not set | 588 | # CONFIG_MEGARAID_SAS is not set |
| 589 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 567 | # CONFIG_SCSI_HPTIOP is not set | 590 | # CONFIG_SCSI_HPTIOP is not set |
| 568 | # CONFIG_SCSI_BUSLOGIC is not set | 591 | # CONFIG_SCSI_BUSLOGIC is not set |
| 569 | # CONFIG_LIBFC is not set | 592 | # CONFIG_LIBFC is not set |
| 593 | # CONFIG_LIBFCOE is not set | ||
| 570 | # CONFIG_FCOE is not set | 594 | # CONFIG_FCOE is not set |
| 571 | # CONFIG_SCSI_DMX3191D is not set | 595 | # CONFIG_SCSI_DMX3191D is not set |
| 572 | # CONFIG_SCSI_EATA is not set | 596 | # CONFIG_SCSI_EATA is not set |
| @@ -589,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 589 | # CONFIG_SCSI_DEBUG is not set | 613 | # CONFIG_SCSI_DEBUG is not set |
| 590 | # CONFIG_SCSI_SRP is not set | 614 | # CONFIG_SCSI_SRP is not set |
| 591 | # CONFIG_SCSI_DH is not set | 615 | # CONFIG_SCSI_DH is not set |
| 616 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 592 | CONFIG_ATA=y | 617 | CONFIG_ATA=y |
| 593 | # CONFIG_ATA_NONSTANDARD is not set | 618 | # CONFIG_ATA_NONSTANDARD is not set |
| 594 | CONFIG_SATA_PMP=y | 619 | CONFIG_SATA_PMP=y |
| @@ -666,6 +691,7 @@ CONFIG_PATA_PLATFORM=y | |||
| 666 | # CONFIG_I2O is not set | 691 | # CONFIG_I2O is not set |
| 667 | # CONFIG_MACINTOSH_DRIVERS is not set | 692 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 668 | CONFIG_NETDEVICES=y | 693 | CONFIG_NETDEVICES=y |
| 694 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 669 | # CONFIG_DUMMY is not set | 695 | # CONFIG_DUMMY is not set |
| 670 | # CONFIG_BONDING is not set | 696 | # CONFIG_BONDING is not set |
| 671 | # CONFIG_MACVLAN is not set | 697 | # CONFIG_MACVLAN is not set |
| @@ -699,6 +725,9 @@ CONFIG_NET_ETHERNET=y | |||
| 699 | # CONFIG_SUNGEM is not set | 725 | # CONFIG_SUNGEM is not set |
| 700 | # CONFIG_CASSINI is not set | 726 | # CONFIG_CASSINI is not set |
| 701 | # CONFIG_NET_VENDOR_3COM is not set | 727 | # CONFIG_NET_VENDOR_3COM is not set |
| 728 | # CONFIG_ENC28J60 is not set | ||
| 729 | # CONFIG_ETHOC is not set | ||
| 730 | # CONFIG_DNET is not set | ||
| 702 | # CONFIG_NET_TULIP is not set | 731 | # CONFIG_NET_TULIP is not set |
| 703 | # CONFIG_HP100 is not set | 732 | # CONFIG_HP100 is not set |
| 704 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 733 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -722,7 +751,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 722 | # | 751 | # |
| 723 | # CONFIG_WLAN_PRE80211 is not set | 752 | # CONFIG_WLAN_PRE80211 is not set |
| 724 | # CONFIG_WLAN_80211 is not set | 753 | # CONFIG_WLAN_80211 is not set |
| 725 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 726 | 754 | ||
| 727 | # | 755 | # |
| 728 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 756 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -802,6 +830,7 @@ CONFIG_DEVKMEM=y | |||
| 802 | # | 830 | # |
| 803 | # Non-8250 serial port support | 831 | # Non-8250 serial port support |
| 804 | # | 832 | # |
| 833 | # CONFIG_SERIAL_MAX3100 is not set | ||
| 805 | # CONFIG_SERIAL_UARTLITE is not set | 834 | # CONFIG_SERIAL_UARTLITE is not set |
| 806 | CONFIG_SERIAL_CORE=y | 835 | CONFIG_SERIAL_CORE=y |
| 807 | CONFIG_SERIAL_CORE_CONSOLE=y | 836 | CONFIG_SERIAL_CORE_CONSOLE=y |
| @@ -854,6 +883,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 854 | # | 883 | # |
| 855 | # I2C system bus drivers (mostly embedded / system-on-chip) | 884 | # I2C system bus drivers (mostly embedded / system-on-chip) |
| 856 | # | 885 | # |
| 886 | # CONFIG_I2C_GPIO is not set | ||
| 857 | CONFIG_I2C_MPC=y | 887 | CONFIG_I2C_MPC=y |
| 858 | # CONFIG_I2C_OCORES is not set | 888 | # CONFIG_I2C_OCORES is not set |
| 859 | # CONFIG_I2C_SIMTEC is not set | 889 | # CONFIG_I2C_SIMTEC is not set |
| @@ -883,22 +913,63 @@ CONFIG_I2C_MPC=y | |||
| 883 | # CONFIG_SENSORS_PCF8574 is not set | 913 | # CONFIG_SENSORS_PCF8574 is not set |
| 884 | # CONFIG_PCF8575 is not set | 914 | # CONFIG_PCF8575 is not set |
| 885 | # CONFIG_SENSORS_PCA9539 is not set | 915 | # CONFIG_SENSORS_PCA9539 is not set |
| 886 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 887 | # CONFIG_SENSORS_MAX6875 is not set | 916 | # CONFIG_SENSORS_MAX6875 is not set |
| 888 | # CONFIG_SENSORS_TSL2550 is not set | 917 | # CONFIG_SENSORS_TSL2550 is not set |
| 889 | # CONFIG_I2C_DEBUG_CORE is not set | 918 | # CONFIG_I2C_DEBUG_CORE is not set |
| 890 | # CONFIG_I2C_DEBUG_ALGO is not set | 919 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 891 | # CONFIG_I2C_DEBUG_BUS is not set | 920 | # CONFIG_I2C_DEBUG_BUS is not set |
| 892 | # CONFIG_I2C_DEBUG_CHIP is not set | 921 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 893 | # CONFIG_SPI is not set | 922 | CONFIG_SPI=y |
| 923 | # CONFIG_SPI_DEBUG is not set | ||
| 924 | CONFIG_SPI_MASTER=y | ||
| 925 | |||
| 926 | # | ||
| 927 | # SPI Master Controller Drivers | ||
| 928 | # | ||
| 929 | # CONFIG_SPI_BITBANG is not set | ||
| 930 | # CONFIG_SPI_GPIO is not set | ||
| 931 | CONFIG_SPI_MPC52xx_PSC=m | ||
| 932 | |||
| 933 | # | ||
| 934 | # SPI Protocol Masters | ||
| 935 | # | ||
| 936 | CONFIG_SPI_SPIDEV=m | ||
| 937 | # CONFIG_SPI_TLE62X0 is not set | ||
| 894 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 938 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 895 | # CONFIG_GPIOLIB is not set | 939 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
| 940 | CONFIG_GPIOLIB=y | ||
| 941 | # CONFIG_DEBUG_GPIO is not set | ||
| 942 | # CONFIG_GPIO_SYSFS is not set | ||
| 943 | |||
| 944 | # | ||
| 945 | # Memory mapped GPIO expanders: | ||
| 946 | # | ||
| 947 | # CONFIG_GPIO_XILINX is not set | ||
| 948 | |||
| 949 | # | ||
| 950 | # I2C GPIO expanders: | ||
| 951 | # | ||
| 952 | # CONFIG_GPIO_MAX732X is not set | ||
| 953 | # CONFIG_GPIO_PCA953X is not set | ||
| 954 | # CONFIG_GPIO_PCF857X is not set | ||
| 955 | |||
| 956 | # | ||
| 957 | # PCI GPIO expanders: | ||
| 958 | # | ||
| 959 | # CONFIG_GPIO_BT8XX is not set | ||
| 960 | |||
| 961 | # | ||
| 962 | # SPI GPIO expanders: | ||
| 963 | # | ||
| 964 | # CONFIG_GPIO_MAX7301 is not set | ||
| 965 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 896 | # CONFIG_W1 is not set | 966 | # CONFIG_W1 is not set |
| 897 | # CONFIG_POWER_SUPPLY is not set | 967 | # CONFIG_POWER_SUPPLY is not set |
| 898 | CONFIG_HWMON=y | 968 | CONFIG_HWMON=y |
| 899 | # CONFIG_HWMON_VID is not set | 969 | # CONFIG_HWMON_VID is not set |
| 900 | # CONFIG_SENSORS_AD7414 is not set | 970 | # CONFIG_SENSORS_AD7414 is not set |
| 901 | # CONFIG_SENSORS_AD7418 is not set | 971 | # CONFIG_SENSORS_AD7418 is not set |
| 972 | # CONFIG_SENSORS_ADCXX is not set | ||
| 902 | # CONFIG_SENSORS_ADM1021 is not set | 973 | # CONFIG_SENSORS_ADM1021 is not set |
| 903 | # CONFIG_SENSORS_ADM1025 is not set | 974 | # CONFIG_SENSORS_ADM1025 is not set |
| 904 | # CONFIG_SENSORS_ADM1026 is not set | 975 | # CONFIG_SENSORS_ADM1026 is not set |
| @@ -915,10 +986,12 @@ CONFIG_HWMON=y | |||
| 915 | # CONFIG_SENSORS_F71805F is not set | 986 | # CONFIG_SENSORS_F71805F is not set |
| 916 | # CONFIG_SENSORS_F71882FG is not set | 987 | # CONFIG_SENSORS_F71882FG is not set |
| 917 | # CONFIG_SENSORS_F75375S is not set | 988 | # CONFIG_SENSORS_F75375S is not set |
| 989 | # CONFIG_SENSORS_G760A is not set | ||
| 918 | # CONFIG_SENSORS_GL518SM is not set | 990 | # CONFIG_SENSORS_GL518SM is not set |
| 919 | # CONFIG_SENSORS_GL520SM is not set | 991 | # CONFIG_SENSORS_GL520SM is not set |
| 920 | # CONFIG_SENSORS_IT87 is not set | 992 | # CONFIG_SENSORS_IT87 is not set |
| 921 | # CONFIG_SENSORS_LM63 is not set | 993 | # CONFIG_SENSORS_LM63 is not set |
| 994 | # CONFIG_SENSORS_LM70 is not set | ||
| 922 | # CONFIG_SENSORS_LM75 is not set | 995 | # CONFIG_SENSORS_LM75 is not set |
| 923 | # CONFIG_SENSORS_LM77 is not set | 996 | # CONFIG_SENSORS_LM77 is not set |
| 924 | # CONFIG_SENSORS_LM78 is not set | 997 | # CONFIG_SENSORS_LM78 is not set |
| @@ -929,11 +1002,16 @@ CONFIG_HWMON=y | |||
| 929 | # CONFIG_SENSORS_LM90 is not set | 1002 | # CONFIG_SENSORS_LM90 is not set |
| 930 | # CONFIG_SENSORS_LM92 is not set | 1003 | # CONFIG_SENSORS_LM92 is not set |
| 931 | # CONFIG_SENSORS_LM93 is not set | 1004 | # CONFIG_SENSORS_LM93 is not set |
| 1005 | # CONFIG_SENSORS_LTC4215 is not set | ||
| 932 | # CONFIG_SENSORS_LTC4245 is not set | 1006 | # CONFIG_SENSORS_LTC4245 is not set |
| 1007 | # CONFIG_SENSORS_LM95241 is not set | ||
| 1008 | # CONFIG_SENSORS_MAX1111 is not set | ||
| 933 | # CONFIG_SENSORS_MAX1619 is not set | 1009 | # CONFIG_SENSORS_MAX1619 is not set |
| 934 | # CONFIG_SENSORS_MAX6650 is not set | 1010 | # CONFIG_SENSORS_MAX6650 is not set |
| 935 | # CONFIG_SENSORS_PC87360 is not set | 1011 | # CONFIG_SENSORS_PC87360 is not set |
| 936 | # CONFIG_SENSORS_PC87427 is not set | 1012 | # CONFIG_SENSORS_PC87427 is not set |
| 1013 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 1014 | # CONFIG_SENSORS_SHT15 is not set | ||
| 937 | # CONFIG_SENSORS_SIS5595 is not set | 1015 | # CONFIG_SENSORS_SIS5595 is not set |
| 938 | # CONFIG_SENSORS_DME1737 is not set | 1016 | # CONFIG_SENSORS_DME1737 is not set |
| 939 | # CONFIG_SENSORS_SMSC47M1 is not set | 1017 | # CONFIG_SENSORS_SMSC47M1 is not set |
| @@ -952,6 +1030,7 @@ CONFIG_HWMON=y | |||
| 952 | # CONFIG_SENSORS_W83L786NG is not set | 1030 | # CONFIG_SENSORS_W83L786NG is not set |
| 953 | # CONFIG_SENSORS_W83627HF is not set | 1031 | # CONFIG_SENSORS_W83627HF is not set |
| 954 | # CONFIG_SENSORS_W83627EHF is not set | 1032 | # CONFIG_SENSORS_W83627EHF is not set |
| 1033 | # CONFIG_SENSORS_LIS3_SPI is not set | ||
| 955 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1034 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 956 | # CONFIG_THERMAL is not set | 1035 | # CONFIG_THERMAL is not set |
| 957 | # CONFIG_THERMAL_HWMON is not set | 1036 | # CONFIG_THERMAL_HWMON is not set |
| @@ -989,6 +1068,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 989 | # CONFIG_MFD_CORE is not set | 1068 | # CONFIG_MFD_CORE is not set |
| 990 | # CONFIG_MFD_SM501 is not set | 1069 | # CONFIG_MFD_SM501 is not set |
| 991 | # CONFIG_HTC_PASIC3 is not set | 1070 | # CONFIG_HTC_PASIC3 is not set |
| 1071 | # CONFIG_TPS65010 is not set | ||
| 992 | # CONFIG_TWL4030_CORE is not set | 1072 | # CONFIG_TWL4030_CORE is not set |
| 993 | # CONFIG_MFD_TMIO is not set | 1073 | # CONFIG_MFD_TMIO is not set |
| 994 | # CONFIG_PMIC_DA903X is not set | 1074 | # CONFIG_PMIC_DA903X is not set |
| @@ -1084,9 +1164,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1084 | # CONFIG_FB_VIRTUAL is not set | 1164 | # CONFIG_FB_VIRTUAL is not set |
| 1085 | # CONFIG_FB_METRONOME is not set | 1165 | # CONFIG_FB_METRONOME is not set |
| 1086 | # CONFIG_FB_MB862XX is not set | 1166 | # CONFIG_FB_MB862XX is not set |
| 1167 | # CONFIG_FB_BROADSHEET is not set | ||
| 1087 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1168 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1088 | CONFIG_LCD_CLASS_DEVICE=m | 1169 | CONFIG_LCD_CLASS_DEVICE=m |
| 1170 | # CONFIG_LCD_LTV350QV is not set | ||
| 1089 | # CONFIG_LCD_ILI9320 is not set | 1171 | # CONFIG_LCD_ILI9320 is not set |
| 1172 | # CONFIG_LCD_TDO24M is not set | ||
| 1173 | # CONFIG_LCD_VGG2432A4 is not set | ||
| 1090 | # CONFIG_LCD_PLATFORM is not set | 1174 | # CONFIG_LCD_PLATFORM is not set |
| 1091 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1175 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 1092 | CONFIG_BACKLIGHT_GENERIC=y | 1176 | CONFIG_BACKLIGHT_GENERIC=y |
| @@ -1127,15 +1211,17 @@ CONFIG_USB_HID=y | |||
| 1127 | # | 1211 | # |
| 1128 | # Special HID drivers | 1212 | # Special HID drivers |
| 1129 | # | 1213 | # |
| 1130 | CONFIG_HID_COMPAT=y | ||
| 1131 | CONFIG_HID_A4TECH=y | 1214 | CONFIG_HID_A4TECH=y |
| 1132 | # CONFIG_HID_APPLE is not set | 1215 | # CONFIG_HID_APPLE is not set |
| 1133 | CONFIG_HID_BELKIN=y | 1216 | CONFIG_HID_BELKIN=y |
| 1134 | CONFIG_HID_CHERRY=y | 1217 | CONFIG_HID_CHERRY=y |
| 1135 | # CONFIG_HID_CHICONY is not set | 1218 | # CONFIG_HID_CHICONY is not set |
| 1136 | CONFIG_HID_CYPRESS=y | 1219 | CONFIG_HID_CYPRESS=y |
| 1220 | # CONFIG_DRAGONRISE_FF is not set | ||
| 1137 | CONFIG_HID_EZKEY=y | 1221 | CONFIG_HID_EZKEY=y |
| 1222 | # CONFIG_HID_KYE is not set | ||
| 1138 | # CONFIG_HID_GYRATION is not set | 1223 | # CONFIG_HID_GYRATION is not set |
| 1224 | # CONFIG_HID_KENSINGTON is not set | ||
| 1139 | # CONFIG_HID_LOGITECH is not set | 1225 | # CONFIG_HID_LOGITECH is not set |
| 1140 | # CONFIG_HID_MICROSOFT is not set | 1226 | # CONFIG_HID_MICROSOFT is not set |
| 1141 | # CONFIG_HID_MONTEREY is not set | 1227 | # CONFIG_HID_MONTEREY is not set |
| @@ -1204,11 +1290,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1204 | # CONFIG_USB_TMC is not set | 1290 | # CONFIG_USB_TMC is not set |
| 1205 | 1291 | ||
| 1206 | # | 1292 | # |
| 1207 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1293 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1208 | # | 1294 | # |
| 1209 | 1295 | ||
| 1210 | # | 1296 | # |
| 1211 | # see USB_STORAGE Help for more information | 1297 | # also be needed; see USB_STORAGE Help for more info |
| 1212 | # | 1298 | # |
| 1213 | CONFIG_USB_STORAGE=y | 1299 | CONFIG_USB_STORAGE=y |
| 1214 | # CONFIG_USB_STORAGE_DEBUG is not set | 1300 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1250,7 +1336,6 @@ CONFIG_USB_STORAGE=y | |||
| 1250 | # CONFIG_USB_LED is not set | 1336 | # CONFIG_USB_LED is not set |
| 1251 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1337 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1252 | # CONFIG_USB_CYTHERM is not set | 1338 | # CONFIG_USB_CYTHERM is not set |
| 1253 | # CONFIG_USB_PHIDGET is not set | ||
| 1254 | # CONFIG_USB_IDMOUSE is not set | 1339 | # CONFIG_USB_IDMOUSE is not set |
| 1255 | # CONFIG_USB_FTDI_ELAN is not set | 1340 | # CONFIG_USB_FTDI_ELAN is not set |
| 1256 | # CONFIG_USB_APPLEDISPLAY is not set | 1341 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1265,6 +1350,8 @@ CONFIG_USB_STORAGE=y | |||
| 1265 | # | 1350 | # |
| 1266 | # OTG and related infrastructure | 1351 | # OTG and related infrastructure |
| 1267 | # | 1352 | # |
| 1353 | # CONFIG_USB_GPIO_VBUS is not set | ||
| 1354 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1268 | # CONFIG_UWB is not set | 1355 | # CONFIG_UWB is not set |
| 1269 | # CONFIG_MMC is not set | 1356 | # CONFIG_MMC is not set |
| 1270 | # CONFIG_MEMSTICK is not set | 1357 | # CONFIG_MEMSTICK is not set |
| @@ -1317,6 +1404,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1317 | # | 1404 | # |
| 1318 | # SPI RTC drivers | 1405 | # SPI RTC drivers |
| 1319 | # | 1406 | # |
| 1407 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 1408 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 1409 | # CONFIG_RTC_DRV_DS1390 is not set | ||
| 1410 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 1411 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 1412 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 1413 | # CONFIG_RTC_DRV_DS3234 is not set | ||
| 1320 | 1414 | ||
| 1321 | # | 1415 | # |
| 1322 | # Platform RTC drivers | 1416 | # Platform RTC drivers |
| @@ -1336,8 +1430,9 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1336 | # | 1430 | # |
| 1337 | # on-CPU RTC drivers | 1431 | # on-CPU RTC drivers |
| 1338 | # | 1432 | # |
| 1339 | # CONFIG_RTC_DRV_PPC is not set | 1433 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1340 | # CONFIG_DMADEVICES is not set | 1434 | # CONFIG_DMADEVICES is not set |
| 1435 | # CONFIG_AUXDISPLAY is not set | ||
| 1341 | # CONFIG_UIO is not set | 1436 | # CONFIG_UIO is not set |
| 1342 | # CONFIG_STAGING is not set | 1437 | # CONFIG_STAGING is not set |
| 1343 | 1438 | ||
| @@ -1348,6 +1443,7 @@ CONFIG_EXT2_FS=y | |||
| 1348 | # CONFIG_EXT2_FS_XATTR is not set | 1443 | # CONFIG_EXT2_FS_XATTR is not set |
| 1349 | # CONFIG_EXT2_FS_XIP is not set | 1444 | # CONFIG_EXT2_FS_XIP is not set |
| 1350 | CONFIG_EXT3_FS=y | 1445 | CONFIG_EXT3_FS=y |
| 1446 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1351 | CONFIG_EXT3_FS_XATTR=y | 1447 | CONFIG_EXT3_FS_XATTR=y |
| 1352 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1448 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1353 | # CONFIG_EXT3_FS_SECURITY is not set | 1449 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -1370,6 +1466,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1370 | # CONFIG_FUSE_FS is not set | 1466 | # CONFIG_FUSE_FS is not set |
| 1371 | 1467 | ||
| 1372 | # | 1468 | # |
| 1469 | # Caches | ||
| 1470 | # | ||
| 1471 | # CONFIG_FSCACHE is not set | ||
| 1472 | |||
| 1473 | # | ||
| 1373 | # CD-ROM/DVD Filesystems | 1474 | # CD-ROM/DVD Filesystems |
| 1374 | # | 1475 | # |
| 1375 | # CONFIG_ISO9660_FS is not set | 1476 | # CONFIG_ISO9660_FS is not set |
| @@ -1416,6 +1517,12 @@ CONFIG_JFFS2_ZLIB=y | |||
| 1416 | # CONFIG_JFFS2_LZO is not set | 1517 | # CONFIG_JFFS2_LZO is not set |
| 1417 | CONFIG_JFFS2_RTIME=y | 1518 | CONFIG_JFFS2_RTIME=y |
| 1418 | # CONFIG_JFFS2_RUBIN is not set | 1519 | # CONFIG_JFFS2_RUBIN is not set |
| 1520 | CONFIG_UBIFS_FS=m | ||
| 1521 | # CONFIG_UBIFS_FS_XATTR is not set | ||
| 1522 | # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set | ||
| 1523 | CONFIG_UBIFS_FS_LZO=y | ||
| 1524 | CONFIG_UBIFS_FS_ZLIB=y | ||
| 1525 | # CONFIG_UBIFS_FS_DEBUG is not set | ||
| 1419 | CONFIG_CRAMFS=y | 1526 | CONFIG_CRAMFS=y |
| 1420 | # CONFIG_SQUASHFS is not set | 1527 | # CONFIG_SQUASHFS is not set |
| 1421 | # CONFIG_VXFS_FS is not set | 1528 | # CONFIG_VXFS_FS is not set |
| @@ -1426,6 +1533,7 @@ CONFIG_CRAMFS=y | |||
| 1426 | # CONFIG_ROMFS_FS is not set | 1533 | # CONFIG_ROMFS_FS is not set |
| 1427 | # CONFIG_SYSV_FS is not set | 1534 | # CONFIG_SYSV_FS is not set |
| 1428 | # CONFIG_UFS_FS is not set | 1535 | # CONFIG_UFS_FS is not set |
| 1536 | # CONFIG_NILFS2_FS is not set | ||
| 1429 | CONFIG_NETWORK_FILESYSTEMS=y | 1537 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1430 | CONFIG_NFS_FS=y | 1538 | CONFIG_NFS_FS=y |
| 1431 | CONFIG_NFS_V3=y | 1539 | CONFIG_NFS_V3=y |
| @@ -1438,7 +1546,6 @@ CONFIG_LOCKD_V4=y | |||
| 1438 | CONFIG_NFS_COMMON=y | 1546 | CONFIG_NFS_COMMON=y |
| 1439 | CONFIG_SUNRPC=y | 1547 | CONFIG_SUNRPC=y |
| 1440 | CONFIG_SUNRPC_GSS=y | 1548 | CONFIG_SUNRPC_GSS=y |
| 1441 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1442 | CONFIG_RPCSEC_GSS_KRB5=y | 1549 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1443 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1550 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1444 | # CONFIG_SMB_FS is not set | 1551 | # CONFIG_SMB_FS is not set |
| @@ -1493,6 +1600,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1493 | # CONFIG_NLS_KOI8_U is not set | 1600 | # CONFIG_NLS_KOI8_U is not set |
| 1494 | # CONFIG_NLS_UTF8 is not set | 1601 | # CONFIG_NLS_UTF8 is not set |
| 1495 | # CONFIG_DLM is not set | 1602 | # CONFIG_DLM is not set |
| 1603 | # CONFIG_BINARY_PRINTF is not set | ||
| 1496 | 1604 | ||
| 1497 | # | 1605 | # |
| 1498 | # Library routines | 1606 | # Library routines |
| @@ -1500,7 +1608,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1500 | CONFIG_BITREVERSE=y | 1608 | CONFIG_BITREVERSE=y |
| 1501 | CONFIG_GENERIC_FIND_LAST_BIT=y | 1609 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 1502 | # CONFIG_CRC_CCITT is not set | 1610 | # CONFIG_CRC_CCITT is not set |
| 1503 | # CONFIG_CRC16 is not set | 1611 | CONFIG_CRC16=m |
| 1504 | # CONFIG_CRC_T10DIF is not set | 1612 | # CONFIG_CRC_T10DIF is not set |
| 1505 | # CONFIG_CRC_ITU_T is not set | 1613 | # CONFIG_CRC_ITU_T is not set |
| 1506 | CONFIG_CRC32=y | 1614 | CONFIG_CRC32=y |
| @@ -1508,11 +1616,14 @@ CONFIG_CRC32=y | |||
| 1508 | # CONFIG_LIBCRC32C is not set | 1616 | # CONFIG_LIBCRC32C is not set |
| 1509 | CONFIG_ZLIB_INFLATE=y | 1617 | CONFIG_ZLIB_INFLATE=y |
| 1510 | CONFIG_ZLIB_DEFLATE=y | 1618 | CONFIG_ZLIB_DEFLATE=y |
| 1511 | CONFIG_PLIST=y | 1619 | CONFIG_LZO_COMPRESS=m |
| 1620 | CONFIG_LZO_DECOMPRESS=m | ||
| 1621 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1512 | CONFIG_HAS_IOMEM=y | 1622 | CONFIG_HAS_IOMEM=y |
| 1513 | CONFIG_HAS_IOPORT=y | 1623 | CONFIG_HAS_IOPORT=y |
| 1514 | CONFIG_HAS_DMA=y | 1624 | CONFIG_HAS_DMA=y |
| 1515 | CONFIG_HAVE_LMB=y | 1625 | CONFIG_HAVE_LMB=y |
| 1626 | CONFIG_NLATTR=y | ||
| 1516 | 1627 | ||
| 1517 | # | 1628 | # |
| 1518 | # Kernel hacking | 1629 | # Kernel hacking |
| @@ -1530,6 +1641,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1530 | CONFIG_DETECT_SOFTLOCKUP=y | 1641 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1531 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1642 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1532 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1643 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1644 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1645 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1646 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1533 | CONFIG_SCHED_DEBUG=y | 1647 | CONFIG_SCHED_DEBUG=y |
| 1534 | # CONFIG_SCHEDSTATS is not set | 1648 | # CONFIG_SCHEDSTATS is not set |
| 1535 | # CONFIG_TIMER_STATS is not set | 1649 | # CONFIG_TIMER_STATS is not set |
| @@ -1558,9 +1672,12 @@ CONFIG_DEBUG_INFO=y | |||
| 1558 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1672 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 1559 | # CONFIG_FAULT_INJECTION is not set | 1673 | # CONFIG_FAULT_INJECTION is not set |
| 1560 | # CONFIG_LATENCYTOP is not set | 1674 | # CONFIG_LATENCYTOP is not set |
| 1675 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1561 | CONFIG_HAVE_FUNCTION_TRACER=y | 1676 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1677 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1562 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1678 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1563 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1679 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1680 | CONFIG_TRACING_SUPPORT=y | ||
| 1564 | 1681 | ||
| 1565 | # | 1682 | # |
| 1566 | # Tracers | 1683 | # Tracers |
| @@ -1568,17 +1685,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1568 | # CONFIG_FUNCTION_TRACER is not set | 1685 | # CONFIG_FUNCTION_TRACER is not set |
| 1569 | # CONFIG_SCHED_TRACER is not set | 1686 | # CONFIG_SCHED_TRACER is not set |
| 1570 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1687 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1688 | # CONFIG_EVENT_TRACER is not set | ||
| 1571 | # CONFIG_BOOT_TRACER is not set | 1689 | # CONFIG_BOOT_TRACER is not set |
| 1572 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1690 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1573 | # CONFIG_STACK_TRACER is not set | 1691 | # CONFIG_STACK_TRACER is not set |
| 1574 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1692 | # CONFIG_KMEMTRACE is not set |
| 1693 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1694 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1575 | # CONFIG_SAMPLES is not set | 1695 | # CONFIG_SAMPLES is not set |
| 1576 | CONFIG_HAVE_ARCH_KGDB=y | 1696 | CONFIG_HAVE_ARCH_KGDB=y |
| 1577 | # CONFIG_KGDB is not set | 1697 | # CONFIG_KGDB is not set |
| 1578 | CONFIG_PRINT_STACK_DEPTH=64 | 1698 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1579 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1699 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1580 | # CONFIG_DEBUG_STACK_USAGE is not set | 1700 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1581 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1582 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1701 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1583 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1702 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1584 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1703 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| @@ -1609,10 +1728,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1609 | CONFIG_CRYPTO_HASH=y | 1728 | CONFIG_CRYPTO_HASH=y |
| 1610 | CONFIG_CRYPTO_HASH2=y | 1729 | CONFIG_CRYPTO_HASH2=y |
| 1611 | CONFIG_CRYPTO_RNG2=y | 1730 | CONFIG_CRYPTO_RNG2=y |
| 1731 | CONFIG_CRYPTO_PCOMP=y | ||
| 1612 | CONFIG_CRYPTO_MANAGER=y | 1732 | CONFIG_CRYPTO_MANAGER=y |
| 1613 | CONFIG_CRYPTO_MANAGER2=y | 1733 | CONFIG_CRYPTO_MANAGER2=y |
| 1614 | # CONFIG_CRYPTO_GF128MUL is not set | 1734 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1615 | # CONFIG_CRYPTO_NULL is not set | 1735 | # CONFIG_CRYPTO_NULL is not set |
| 1736 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1616 | # CONFIG_CRYPTO_CRYPTD is not set | 1737 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1617 | # CONFIG_CRYPTO_AUTHENC is not set | 1738 | # CONFIG_CRYPTO_AUTHENC is not set |
| 1618 | # CONFIG_CRYPTO_TEST is not set | 1739 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1680,8 +1801,9 @@ CONFIG_CRYPTO_DES=y | |||
| 1680 | # | 1801 | # |
| 1681 | # Compression | 1802 | # Compression |
| 1682 | # | 1803 | # |
| 1683 | # CONFIG_CRYPTO_DEFLATE is not set | 1804 | CONFIG_CRYPTO_DEFLATE=m |
| 1684 | # CONFIG_CRYPTO_LZO is not set | 1805 | # CONFIG_CRYPTO_ZLIB is not set |
| 1806 | CONFIG_CRYPTO_LZO=m | ||
| 1685 | 1807 | ||
| 1686 | # | 1808 | # |
| 1687 | # Random Number Generation | 1809 | # Random Number Generation |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index fb08819d7cc..c162724fed4 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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 15:35:37 2009 | 4 | # Tue Apr 21 15:40:23 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,6 +22,7 @@ CONFIG_FSL_EMB_PERFMON=y | |||
| 22 | # CONFIG_PHYS_64BIT is not set | 22 | # CONFIG_PHYS_64BIT is not set |
| 23 | CONFIG_SPE=y | 23 | CONFIG_SPE=y |
| 24 | CONFIG_PPC_MMU_NOHASH=y | 24 | CONFIG_PPC_MMU_NOHASH=y |
| 25 | CONFIG_PPC_BOOK3E_MMU=y | ||
| 25 | # CONFIG_PPC_MM_SLICES is not set | 26 | # CONFIG_PPC_MM_SLICES is not set |
| 26 | # CONFIG_SMP is not set | 27 | # CONFIG_SMP is not set |
| 27 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
| @@ -59,6 +60,7 @@ CONFIG_GENERIC_BUG=y | |||
| 59 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
| 60 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
| 61 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
| 63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 63 | 65 | ||
| 64 | # | 66 | # |
| @@ -73,11 +75,21 @@ CONFIG_SWAP=y | |||
| 73 | CONFIG_SYSVIPC=y | 75 | CONFIG_SYSVIPC=y |
| 74 | CONFIG_SYSVIPC_SYSCTL=y | 76 | CONFIG_SYSVIPC_SYSCTL=y |
| 75 | CONFIG_POSIX_MQUEUE=y | 77 | CONFIG_POSIX_MQUEUE=y |
| 78 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 76 | CONFIG_BSD_PROCESS_ACCT=y | 79 | CONFIG_BSD_PROCESS_ACCT=y |
| 77 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 80 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 78 | # CONFIG_TASKSTATS is not set | 81 | # CONFIG_TASKSTATS is not set |
| 79 | CONFIG_AUDIT=y | 82 | CONFIG_AUDIT=y |
| 80 | # CONFIG_AUDITSYSCALL is not set | 83 | # CONFIG_AUDITSYSCALL is not set |
| 84 | |||
| 85 | # | ||
| 86 | # RCU Subsystem | ||
| 87 | # | ||
| 88 | CONFIG_CLASSIC_RCU=y | ||
| 89 | # CONFIG_TREE_RCU is not set | ||
| 90 | # CONFIG_PREEMPT_RCU is not set | ||
| 91 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 92 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 81 | CONFIG_IKCONFIG=y | 93 | CONFIG_IKCONFIG=y |
| 82 | CONFIG_IKCONFIG_PROC=y | 94 | CONFIG_IKCONFIG_PROC=y |
| 83 | CONFIG_LOG_BUF_SHIFT=14 | 95 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -93,22 +105,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 93 | # CONFIG_NAMESPACES is not set | 105 | # CONFIG_NAMESPACES is not set |
| 94 | CONFIG_BLK_DEV_INITRD=y | 106 | CONFIG_BLK_DEV_INITRD=y |
| 95 | CONFIG_INITRAMFS_SOURCE="" | 107 | CONFIG_INITRAMFS_SOURCE="" |
| 108 | CONFIG_RD_GZIP=y | ||
| 109 | # CONFIG_RD_BZIP2 is not set | ||
| 110 | # CONFIG_RD_LZMA is not set | ||
| 96 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 111 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 97 | CONFIG_SYSCTL=y | 112 | CONFIG_SYSCTL=y |
| 113 | CONFIG_ANON_INODES=y | ||
| 98 | CONFIG_EMBEDDED=y | 114 | CONFIG_EMBEDDED=y |
| 99 | CONFIG_SYSCTL_SYSCALL=y | 115 | CONFIG_SYSCTL_SYSCALL=y |
| 100 | CONFIG_KALLSYMS=y | 116 | CONFIG_KALLSYMS=y |
| 101 | CONFIG_KALLSYMS_ALL=y | 117 | CONFIG_KALLSYMS_ALL=y |
| 102 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
| 103 | CONFIG_KALLSYMS_EXTRA_PASS=y | 118 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 119 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 104 | CONFIG_HOTPLUG=y | 120 | CONFIG_HOTPLUG=y |
| 105 | CONFIG_PRINTK=y | 121 | CONFIG_PRINTK=y |
| 106 | CONFIG_BUG=y | 122 | CONFIG_BUG=y |
| 107 | CONFIG_ELF_CORE=y | 123 | CONFIG_ELF_CORE=y |
| 108 | CONFIG_COMPAT_BRK=y | ||
| 109 | CONFIG_BASE_FULL=y | 124 | CONFIG_BASE_FULL=y |
| 110 | CONFIG_FUTEX=y | 125 | CONFIG_FUTEX=y |
| 111 | CONFIG_ANON_INODES=y | ||
| 112 | CONFIG_EPOLL=y | 126 | CONFIG_EPOLL=y |
| 113 | CONFIG_SIGNALFD=y | 127 | CONFIG_SIGNALFD=y |
| 114 | CONFIG_TIMERFD=y | 128 | CONFIG_TIMERFD=y |
| @@ -118,10 +132,12 @@ CONFIG_AIO=y | |||
| 118 | CONFIG_VM_EVENT_COUNTERS=y | 132 | CONFIG_VM_EVENT_COUNTERS=y |
| 119 | CONFIG_PCI_QUIRKS=y | 133 | CONFIG_PCI_QUIRKS=y |
| 120 | CONFIG_SLUB_DEBUG=y | 134 | CONFIG_SLUB_DEBUG=y |
| 135 | CONFIG_COMPAT_BRK=y | ||
| 121 | # CONFIG_SLAB is not set | 136 | # CONFIG_SLAB is not set |
| 122 | CONFIG_SLUB=y | 137 | CONFIG_SLUB=y |
| 123 | # CONFIG_SLOB is not set | 138 | # CONFIG_SLOB is not set |
| 124 | # CONFIG_PROFILING is not set | 139 | # CONFIG_PROFILING is not set |
| 140 | # CONFIG_MARKERS is not set | ||
| 125 | CONFIG_HAVE_OPROFILE=y | 141 | CONFIG_HAVE_OPROFILE=y |
| 126 | # CONFIG_KPROBES is not set | 142 | # CONFIG_KPROBES is not set |
| 127 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 143 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| @@ -130,6 +146,7 @@ CONFIG_HAVE_KPROBES=y | |||
| 130 | CONFIG_HAVE_KRETPROBES=y | 146 | CONFIG_HAVE_KRETPROBES=y |
| 131 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 147 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 132 | CONFIG_HAVE_CLK=y | 148 | CONFIG_HAVE_CLK=y |
| 149 | # CONFIG_SLOW_WORK is not set | ||
| 133 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 150 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 134 | CONFIG_SLABINFO=y | 151 | CONFIG_SLABINFO=y |
| 135 | CONFIG_RT_MUTEXES=y | 152 | CONFIG_RT_MUTEXES=y |
| @@ -142,7 +159,6 @@ CONFIG_MODVERSIONS=y | |||
| 142 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 159 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 143 | CONFIG_BLOCK=y | 160 | CONFIG_BLOCK=y |
| 144 | CONFIG_LBD=y | 161 | CONFIG_LBD=y |
| 145 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 146 | # CONFIG_BLK_DEV_BSG is not set | 162 | # CONFIG_BLK_DEV_BSG is not set |
| 147 | # CONFIG_BLK_DEV_INTEGRITY is not set | 163 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 148 | 164 | ||
| @@ -158,11 +174,6 @@ CONFIG_IOSCHED_CFQ=y | |||
| 158 | CONFIG_DEFAULT_CFQ=y | 174 | CONFIG_DEFAULT_CFQ=y |
| 159 | # CONFIG_DEFAULT_NOOP is not set | 175 | # CONFIG_DEFAULT_NOOP is not set |
| 160 | CONFIG_DEFAULT_IOSCHED="cfq" | 176 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 161 | CONFIG_CLASSIC_RCU=y | ||
| 162 | # CONFIG_TREE_RCU is not set | ||
| 163 | # CONFIG_PREEMPT_RCU is not set | ||
| 164 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 165 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 166 | # CONFIG_FREEZER is not set | 177 | # CONFIG_FREEZER is not set |
| 167 | 178 | ||
| 168 | # | 179 | # |
| @@ -178,8 +189,9 @@ CONFIG_MPC85xx_CDS=y | |||
| 178 | CONFIG_MPC85xx_MDS=y | 189 | CONFIG_MPC85xx_MDS=y |
| 179 | CONFIG_MPC8536_DS=y | 190 | CONFIG_MPC8536_DS=y |
| 180 | CONFIG_MPC85xx_DS=y | 191 | CONFIG_MPC85xx_DS=y |
| 192 | CONFIG_SOCRATES=y | ||
| 181 | CONFIG_KSI8560=y | 193 | CONFIG_KSI8560=y |
| 182 | # CONFIG_STX_GP3 is not set | 194 | CONFIG_STX_GP3=y |
| 183 | CONFIG_TQM8540=y | 195 | CONFIG_TQM8540=y |
| 184 | CONFIG_TQM8541=y | 196 | CONFIG_TQM8541=y |
| 185 | CONFIG_TQM8548=y | 197 | CONFIG_TQM8548=y |
| @@ -200,11 +212,11 @@ CONFIG_PPC_I8259=y | |||
| 200 | # CONFIG_GENERIC_IOMAP is not set | 212 | # CONFIG_GENERIC_IOMAP is not set |
| 201 | # CONFIG_CPU_FREQ is not set | 213 | # CONFIG_CPU_FREQ is not set |
| 202 | CONFIG_QUICC_ENGINE=y | 214 | CONFIG_QUICC_ENGINE=y |
| 203 | # CONFIG_QE_GPIO is not set | 215 | CONFIG_QE_GPIO=y |
| 204 | CONFIG_CPM2=y | 216 | CONFIG_CPM2=y |
| 205 | CONFIG_FSL_ULI1575=y | 217 | CONFIG_FSL_ULI1575=y |
| 206 | CONFIG_CPM=y | 218 | CONFIG_CPM=y |
| 207 | # CONFIG_MPC8xxx_GPIO is not set | 219 | CONFIG_MPC8xxx_GPIO=y |
| 208 | # CONFIG_SIMPLE_GPIO is not set | 220 | # CONFIG_SIMPLE_GPIO is not set |
| 209 | 221 | ||
| 210 | # | 222 | # |
| @@ -249,9 +261,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 249 | CONFIG_BOUNCE=y | 261 | CONFIG_BOUNCE=y |
| 250 | CONFIG_VIRT_TO_BUS=y | 262 | CONFIG_VIRT_TO_BUS=y |
| 251 | CONFIG_UNEVICTABLE_LRU=y | 263 | CONFIG_UNEVICTABLE_LRU=y |
| 264 | CONFIG_HAVE_MLOCK=y | ||
| 265 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 252 | CONFIG_PPC_4K_PAGES=y | 266 | CONFIG_PPC_4K_PAGES=y |
| 253 | # CONFIG_PPC_16K_PAGES is not set | 267 | # CONFIG_PPC_16K_PAGES is not set |
| 254 | # CONFIG_PPC_64K_PAGES is not set | 268 | # CONFIG_PPC_64K_PAGES is not set |
| 269 | # CONFIG_PPC_256K_PAGES is not set | ||
| 255 | CONFIG_FORCE_MAX_ZONEORDER=11 | 270 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 256 | CONFIG_PROC_DEVICETREE=y | 271 | CONFIG_PROC_DEVICETREE=y |
| 257 | # CONFIG_CMDLINE_BOOL is not set | 272 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -278,6 +293,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 278 | # CONFIG_PCI_LEGACY is not set | 293 | # CONFIG_PCI_LEGACY is not set |
| 279 | # CONFIG_PCI_DEBUG is not set | 294 | # CONFIG_PCI_DEBUG is not set |
| 280 | # CONFIG_PCI_STUB is not set | 295 | # CONFIG_PCI_STUB is not set |
| 296 | # CONFIG_PCI_IOV is not set | ||
| 281 | # CONFIG_PCCARD is not set | 297 | # CONFIG_PCCARD is not set |
| 282 | # CONFIG_HOTPLUG_PCI is not set | 298 | # CONFIG_HOTPLUG_PCI is not set |
| 283 | # CONFIG_HAS_RAPIDIO is not set | 299 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -291,17 +307,17 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 291 | # Default settings for advanced configuration options are used | 307 | # Default settings for advanced configuration options are used |
| 292 | # | 308 | # |
| 293 | CONFIG_LOWMEM_SIZE=0x30000000 | 309 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 310 | CONFIG_LOWMEM_CAM_NUM=3 | ||
| 294 | CONFIG_PAGE_OFFSET=0xc0000000 | 311 | CONFIG_PAGE_OFFSET=0xc0000000 |
| 295 | CONFIG_KERNEL_START=0xc0000000 | 312 | CONFIG_KERNEL_START=0xc0000000 |
| 296 | CONFIG_PHYSICAL_START=0x00000000 | 313 | CONFIG_PHYSICAL_START=0x00000000 |
| 297 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 314 | CONFIG_PHYSICAL_ALIGN=0x04000000 |
| 298 | CONFIG_TASK_SIZE=0xc0000000 | 315 | CONFIG_TASK_SIZE=0xc0000000 |
| 299 | CONFIG_NET=y | 316 | CONFIG_NET=y |
| 300 | 317 | ||
| 301 | # | 318 | # |
| 302 | # Networking options | 319 | # Networking options |
| 303 | # | 320 | # |
| 304 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 305 | CONFIG_PACKET=y | 321 | CONFIG_PACKET=y |
| 306 | # CONFIG_PACKET_MMAP is not set | 322 | # CONFIG_PACKET_MMAP is not set |
| 307 | CONFIG_UNIX=y | 323 | CONFIG_UNIX=y |
| @@ -389,6 +405,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 389 | # CONFIG_LAPB is not set | 405 | # CONFIG_LAPB is not set |
| 390 | # CONFIG_ECONET is not set | 406 | # CONFIG_ECONET is not set |
| 391 | # CONFIG_WAN_ROUTER is not set | 407 | # CONFIG_WAN_ROUTER is not set |
| 408 | # CONFIG_PHONET is not set | ||
| 392 | # CONFIG_NET_SCHED is not set | 409 | # CONFIG_NET_SCHED is not set |
| 393 | # CONFIG_DCB is not set | 410 | # CONFIG_DCB is not set |
| 394 | 411 | ||
| @@ -401,7 +418,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 401 | # CONFIG_IRDA is not set | 418 | # CONFIG_IRDA is not set |
| 402 | # CONFIG_BT is not set | 419 | # CONFIG_BT is not set |
| 403 | # CONFIG_AF_RXRPC is not set | 420 | # CONFIG_AF_RXRPC is not set |
| 404 | # CONFIG_PHONET is not set | ||
| 405 | CONFIG_FIB_RULES=y | 421 | CONFIG_FIB_RULES=y |
| 406 | CONFIG_WIRELESS=y | 422 | CONFIG_WIRELESS=y |
| 407 | # CONFIG_CFG80211 is not set | 423 | # CONFIG_CFG80211 is not set |
| @@ -456,13 +472,20 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 456 | # CONFIG_BLK_DEV_HD is not set | 472 | # CONFIG_BLK_DEV_HD is not set |
| 457 | CONFIG_MISC_DEVICES=y | 473 | CONFIG_MISC_DEVICES=y |
| 458 | # CONFIG_PHANTOM is not set | 474 | # CONFIG_PHANTOM is not set |
| 459 | # CONFIG_EEPROM_93CX6 is not set | ||
| 460 | # CONFIG_SGI_IOC4 is not set | 475 | # CONFIG_SGI_IOC4 is not set |
| 461 | # CONFIG_TIFM_CORE is not set | 476 | # CONFIG_TIFM_CORE is not set |
| 462 | # CONFIG_ICS932S401 is not set | 477 | # CONFIG_ICS932S401 is not set |
| 463 | # CONFIG_ENCLOSURE_SERVICES is not set | 478 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 464 | # CONFIG_HP_ILO is not set | 479 | # CONFIG_HP_ILO is not set |
| 480 | # CONFIG_ISL29003 is not set | ||
| 465 | # CONFIG_C2PORT is not set | 481 | # CONFIG_C2PORT is not set |
| 482 | |||
| 483 | # | ||
| 484 | # EEPROM support | ||
| 485 | # | ||
| 486 | # CONFIG_EEPROM_AT24 is not set | ||
| 487 | CONFIG_EEPROM_LEGACY=y | ||
| 488 | # CONFIG_EEPROM_93CX6 is not set | ||
| 466 | CONFIG_HAVE_IDE=y | 489 | CONFIG_HAVE_IDE=y |
| 467 | # CONFIG_IDE is not set | 490 | # CONFIG_IDE is not set |
| 468 | 491 | ||
| @@ -521,9 +544,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 521 | # CONFIG_MEGARAID_NEWGEN is not set | 544 | # CONFIG_MEGARAID_NEWGEN is not set |
| 522 | # CONFIG_MEGARAID_LEGACY is not set | 545 | # CONFIG_MEGARAID_LEGACY is not set |
| 523 | # CONFIG_MEGARAID_SAS is not set | 546 | # CONFIG_MEGARAID_SAS is not set |
| 547 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 524 | # CONFIG_SCSI_HPTIOP is not set | 548 | # CONFIG_SCSI_HPTIOP is not set |
| 525 | # CONFIG_SCSI_BUSLOGIC is not set | 549 | # CONFIG_SCSI_BUSLOGIC is not set |
| 526 | # CONFIG_LIBFC is not set | 550 | # CONFIG_LIBFC is not set |
| 551 | # CONFIG_LIBFCOE is not set | ||
| 527 | # CONFIG_FCOE is not set | 552 | # CONFIG_FCOE is not set |
| 528 | # CONFIG_SCSI_DMX3191D is not set | 553 | # CONFIG_SCSI_DMX3191D is not set |
| 529 | # CONFIG_SCSI_EATA is not set | 554 | # CONFIG_SCSI_EATA is not set |
| @@ -546,6 +571,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 546 | # CONFIG_SCSI_DEBUG is not set | 571 | # CONFIG_SCSI_DEBUG is not set |
| 547 | # CONFIG_SCSI_SRP is not set | 572 | # CONFIG_SCSI_SRP is not set |
| 548 | # CONFIG_SCSI_DH is not set | 573 | # CONFIG_SCSI_DH is not set |
| 574 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 549 | CONFIG_ATA=y | 575 | CONFIG_ATA=y |
| 550 | # CONFIG_ATA_NONSTANDARD is not set | 576 | # CONFIG_ATA_NONSTANDARD is not set |
| 551 | CONFIG_SATA_PMP=y | 577 | CONFIG_SATA_PMP=y |
| @@ -622,6 +648,7 @@ CONFIG_PATA_ALI=y | |||
| 622 | # CONFIG_I2O is not set | 648 | # CONFIG_I2O is not set |
| 623 | # CONFIG_MACINTOSH_DRIVERS is not set | 649 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 624 | CONFIG_NETDEVICES=y | 650 | CONFIG_NETDEVICES=y |
| 651 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 625 | CONFIG_DUMMY=y | 652 | CONFIG_DUMMY=y |
| 626 | # CONFIG_BONDING is not set | 653 | # CONFIG_BONDING is not set |
| 627 | # CONFIG_MACVLAN is not set | 654 | # CONFIG_MACVLAN is not set |
| @@ -634,11 +661,11 @@ CONFIG_PHYLIB=y | |||
| 634 | # | 661 | # |
| 635 | # MII PHY device drivers | 662 | # MII PHY device drivers |
| 636 | # | 663 | # |
| 637 | # CONFIG_MARVELL_PHY is not set | 664 | CONFIG_MARVELL_PHY=y |
| 638 | # CONFIG_DAVICOM_PHY is not set | 665 | CONFIG_DAVICOM_PHY=y |
| 639 | # CONFIG_QSEMI_PHY is not set | 666 | # CONFIG_QSEMI_PHY is not set |
| 640 | # CONFIG_LXT_PHY is not set | 667 | # CONFIG_LXT_PHY is not set |
| 641 | # CONFIG_CICADA_PHY is not set | 668 | CONFIG_CICADA_PHY=y |
| 642 | CONFIG_VITESSE_PHY=y | 669 | CONFIG_VITESSE_PHY=y |
| 643 | # CONFIG_SMSC_PHY is not set | 670 | # CONFIG_SMSC_PHY is not set |
| 644 | # CONFIG_BROADCOM_PHY is not set | 671 | # CONFIG_BROADCOM_PHY is not set |
| @@ -647,7 +674,7 @@ CONFIG_VITESSE_PHY=y | |||
| 647 | # CONFIG_NATIONAL_PHY is not set | 674 | # CONFIG_NATIONAL_PHY is not set |
| 648 | # CONFIG_STE10XP is not set | 675 | # CONFIG_STE10XP is not set |
| 649 | # CONFIG_LSI_ET1011C_PHY is not set | 676 | # CONFIG_LSI_ET1011C_PHY is not set |
| 650 | # CONFIG_FIXED_PHY is not set | 677 | CONFIG_FIXED_PHY=y |
| 651 | # CONFIG_MDIO_BITBANG is not set | 678 | # CONFIG_MDIO_BITBANG is not set |
| 652 | CONFIG_NET_ETHERNET=y | 679 | CONFIG_NET_ETHERNET=y |
| 653 | CONFIG_MII=y | 680 | CONFIG_MII=y |
| @@ -655,6 +682,8 @@ CONFIG_MII=y | |||
| 655 | # CONFIG_SUNGEM is not set | 682 | # CONFIG_SUNGEM is not set |
| 656 | # CONFIG_CASSINI is not set | 683 | # CONFIG_CASSINI is not set |
| 657 | # CONFIG_NET_VENDOR_3COM is not set | 684 | # CONFIG_NET_VENDOR_3COM is not set |
| 685 | # CONFIG_ETHOC is not set | ||
| 686 | # CONFIG_DNET is not set | ||
| 658 | # CONFIG_NET_TULIP is not set | 687 | # CONFIG_NET_TULIP is not set |
| 659 | # CONFIG_HP100 is not set | 688 | # CONFIG_HP100 is not set |
| 660 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 689 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -667,7 +696,10 @@ CONFIG_MII=y | |||
| 667 | # CONFIG_NET_PCI is not set | 696 | # CONFIG_NET_PCI is not set |
| 668 | # CONFIG_B44 is not set | 697 | # CONFIG_B44 is not set |
| 669 | # CONFIG_ATL2 is not set | 698 | # CONFIG_ATL2 is not set |
| 670 | # CONFIG_FS_ENET is not set | 699 | CONFIG_FS_ENET=y |
| 700 | CONFIG_FS_ENET_HAS_SCC=y | ||
| 701 | CONFIG_FS_ENET_HAS_FCC=y | ||
| 702 | # CONFIG_FS_ENET_MDIO_FCC is not set | ||
| 671 | CONFIG_NETDEV_1000=y | 703 | CONFIG_NETDEV_1000=y |
| 672 | # CONFIG_ACENIC is not set | 704 | # CONFIG_ACENIC is not set |
| 673 | # CONFIG_DL2K is not set | 705 | # CONFIG_DL2K is not set |
| @@ -675,6 +707,7 @@ CONFIG_NETDEV_1000=y | |||
| 675 | # CONFIG_E1000E is not set | 707 | # CONFIG_E1000E is not set |
| 676 | # CONFIG_IP1000 is not set | 708 | # CONFIG_IP1000 is not set |
| 677 | # CONFIG_IGB is not set | 709 | # CONFIG_IGB is not set |
| 710 | # CONFIG_IGBVF is not set | ||
| 678 | # CONFIG_NS83820 is not set | 711 | # CONFIG_NS83820 is not set |
| 679 | # CONFIG_HAMACHI is not set | 712 | # CONFIG_HAMACHI is not set |
| 680 | # CONFIG_YELLOWFIN is not set | 713 | # CONFIG_YELLOWFIN is not set |
| @@ -685,11 +718,15 @@ CONFIG_NETDEV_1000=y | |||
| 685 | # CONFIG_VIA_VELOCITY is not set | 718 | # CONFIG_VIA_VELOCITY is not set |
| 686 | # CONFIG_TIGON3 is not set | 719 | # CONFIG_TIGON3 is not set |
| 687 | # CONFIG_BNX2 is not set | 720 | # CONFIG_BNX2 is not set |
| 721 | CONFIG_FSL_PQ_MDIO=y | ||
| 688 | CONFIG_GIANFAR=y | 722 | CONFIG_GIANFAR=y |
| 689 | # CONFIG_UCC_GETH is not set | 723 | CONFIG_UCC_GETH=y |
| 724 | # CONFIG_UGETH_MAGIC_PACKET is not set | ||
| 725 | # CONFIG_UGETH_TX_ON_DEMAND is not set | ||
| 690 | # CONFIG_QLA3XXX is not set | 726 | # CONFIG_QLA3XXX is not set |
| 691 | # CONFIG_ATL1 is not set | 727 | # CONFIG_ATL1 is not set |
| 692 | # CONFIG_ATL1E is not set | 728 | # CONFIG_ATL1E is not set |
| 729 | # CONFIG_ATL1C is not set | ||
| 693 | # CONFIG_JME is not set | 730 | # CONFIG_JME is not set |
| 694 | CONFIG_NETDEV_10000=y | 731 | CONFIG_NETDEV_10000=y |
| 695 | # CONFIG_CHELSIO_T1 is not set | 732 | # CONFIG_CHELSIO_T1 is not set |
| @@ -699,6 +736,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 699 | # CONFIG_IXGBE is not set | 736 | # CONFIG_IXGBE is not set |
| 700 | # CONFIG_IXGB is not set | 737 | # CONFIG_IXGB is not set |
| 701 | # CONFIG_S2IO is not set | 738 | # CONFIG_S2IO is not set |
| 739 | # CONFIG_VXGE is not set | ||
| 702 | # CONFIG_MYRI10GE is not set | 740 | # CONFIG_MYRI10GE is not set |
| 703 | # CONFIG_NETXEN_NIC is not set | 741 | # CONFIG_NETXEN_NIC is not set |
| 704 | # CONFIG_NIU is not set | 742 | # CONFIG_NIU is not set |
| @@ -708,6 +746,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 708 | # CONFIG_BNX2X is not set | 746 | # CONFIG_BNX2X is not set |
| 709 | # CONFIG_QLGE is not set | 747 | # CONFIG_QLGE is not set |
| 710 | # CONFIG_SFC is not set | 748 | # CONFIG_SFC is not set |
| 749 | # CONFIG_BE2NET is not set | ||
| 711 | # CONFIG_TR is not set | 750 | # CONFIG_TR is not set |
| 712 | 751 | ||
| 713 | # | 752 | # |
| @@ -715,7 +754,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 715 | # | 754 | # |
| 716 | # CONFIG_WLAN_PRE80211 is not set | 755 | # CONFIG_WLAN_PRE80211 is not set |
| 717 | # CONFIG_WLAN_80211 is not set | 756 | # CONFIG_WLAN_80211 is not set |
| 718 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 719 | 757 | ||
| 720 | # | 758 | # |
| 721 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 759 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -813,14 +851,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 813 | # CONFIG_SERIAL_CPM is not set | 851 | # CONFIG_SERIAL_CPM is not set |
| 814 | # CONFIG_SERIAL_JSM is not set | 852 | # CONFIG_SERIAL_JSM is not set |
| 815 | # CONFIG_SERIAL_OF_PLATFORM is not set | 853 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 816 | # CONFIG_SERIAL_QE is not set | 854 | CONFIG_SERIAL_QE=m |
| 817 | CONFIG_UNIX98_PTYS=y | 855 | CONFIG_UNIX98_PTYS=y |
| 818 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 856 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 819 | CONFIG_LEGACY_PTYS=y | 857 | CONFIG_LEGACY_PTYS=y |
| 820 | CONFIG_LEGACY_PTY_COUNT=256 | 858 | CONFIG_LEGACY_PTY_COUNT=256 |
| 821 | # CONFIG_HVC_UDBG is not set | 859 | # CONFIG_HVC_UDBG is not set |
| 822 | # CONFIG_IPMI_HANDLER is not set | 860 | # CONFIG_IPMI_HANDLER is not set |
| 823 | # CONFIG_HW_RANDOM is not set | 861 | CONFIG_HW_RANDOM=y |
| 862 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 824 | CONFIG_NVRAM=y | 863 | CONFIG_NVRAM=y |
| 825 | # CONFIG_R3964 is not set | 864 | # CONFIG_R3964 is not set |
| 826 | # CONFIG_APPLICOM is not set | 865 | # CONFIG_APPLICOM is not set |
| @@ -857,7 +896,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 857 | # | 896 | # |
| 858 | # I2C system bus drivers (mostly embedded / system-on-chip) | 897 | # I2C system bus drivers (mostly embedded / system-on-chip) |
| 859 | # | 898 | # |
| 860 | # CONFIG_I2C_CPM is not set | 899 | CONFIG_I2C_CPM=m |
| 861 | # CONFIG_I2C_GPIO is not set | 900 | # CONFIG_I2C_GPIO is not set |
| 862 | CONFIG_I2C_MPC=y | 901 | CONFIG_I2C_MPC=y |
| 863 | # CONFIG_I2C_OCORES is not set | 902 | # CONFIG_I2C_OCORES is not set |
| @@ -885,12 +924,9 @@ CONFIG_I2C_MPC=y | |||
| 885 | # Miscellaneous I2C Chip support | 924 | # Miscellaneous I2C Chip support |
| 886 | # | 925 | # |
| 887 | # CONFIG_DS1682 is not set | 926 | # CONFIG_DS1682 is not set |
| 888 | # CONFIG_EEPROM_AT24 is not set | ||
| 889 | CONFIG_EEPROM_LEGACY=y | ||
| 890 | # CONFIG_SENSORS_PCF8574 is not set | 927 | # CONFIG_SENSORS_PCF8574 is not set |
| 891 | # CONFIG_PCF8575 is not set | 928 | # CONFIG_PCF8575 is not set |
| 892 | # CONFIG_SENSORS_PCA9539 is not set | 929 | # CONFIG_SENSORS_PCA9539 is not set |
| 893 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 894 | # CONFIG_SENSORS_MAX6875 is not set | 930 | # CONFIG_SENSORS_MAX6875 is not set |
| 895 | # CONFIG_SENSORS_TSL2550 is not set | 931 | # CONFIG_SENSORS_TSL2550 is not set |
| 896 | # CONFIG_I2C_DEBUG_CORE is not set | 932 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -969,7 +1005,7 @@ CONFIG_VIDEO_MEDIA=m | |||
| 969 | # | 1005 | # |
| 970 | # CONFIG_MEDIA_ATTACH is not set | 1006 | # CONFIG_MEDIA_ATTACH is not set |
| 971 | CONFIG_MEDIA_TUNER=m | 1007 | CONFIG_MEDIA_TUNER=m |
| 972 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | 1008 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set |
| 973 | CONFIG_MEDIA_TUNER_SIMPLE=m | 1009 | CONFIG_MEDIA_TUNER_SIMPLE=m |
| 974 | CONFIG_MEDIA_TUNER_TDA8290=m | 1010 | CONFIG_MEDIA_TUNER_TDA8290=m |
| 975 | CONFIG_MEDIA_TUNER_TDA9887=m | 1011 | CONFIG_MEDIA_TUNER_TDA9887=m |
| @@ -978,6 +1014,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m | |||
| 978 | CONFIG_MEDIA_TUNER_MT20XX=m | 1014 | CONFIG_MEDIA_TUNER_MT20XX=m |
| 979 | CONFIG_MEDIA_TUNER_XC2028=m | 1015 | CONFIG_MEDIA_TUNER_XC2028=m |
| 980 | CONFIG_MEDIA_TUNER_XC5000=m | 1016 | CONFIG_MEDIA_TUNER_XC5000=m |
| 1017 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
| 981 | # CONFIG_DVB_DYNAMIC_MINORS is not set | 1018 | # CONFIG_DVB_DYNAMIC_MINORS is not set |
| 982 | CONFIG_DVB_CAPTURE_DRIVERS=y | 1019 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 983 | 1020 | ||
| @@ -1017,103 +1054,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 1017 | # | 1054 | # |
| 1018 | # Supported DVB Frontends | 1055 | # Supported DVB Frontends |
| 1019 | # | 1056 | # |
| 1020 | |||
| 1021 | # | ||
| 1022 | # Customise DVB Frontends | ||
| 1023 | # | ||
| 1024 | # CONFIG_DVB_FE_CUSTOMISE is not set | 1057 | # CONFIG_DVB_FE_CUSTOMISE is not set |
| 1025 | |||
| 1026 | # | ||
| 1027 | # Multistandard (satellite) frontends | ||
| 1028 | # | ||
| 1029 | # CONFIG_DVB_STB0899 is not set | ||
| 1030 | # CONFIG_DVB_STB6100 is not set | ||
| 1031 | |||
| 1032 | # | ||
| 1033 | # DVB-S (satellite) frontends | ||
| 1034 | # | ||
| 1035 | # CONFIG_DVB_CX24110 is not set | ||
| 1036 | # CONFIG_DVB_CX24123 is not set | ||
| 1037 | # CONFIG_DVB_MT312 is not set | ||
| 1038 | # CONFIG_DVB_S5H1420 is not set | ||
| 1039 | # CONFIG_DVB_STV0288 is not set | ||
| 1040 | # CONFIG_DVB_STB6000 is not set | ||
| 1041 | # CONFIG_DVB_STV0299 is not set | ||
| 1042 | # CONFIG_DVB_TDA8083 is not set | ||
| 1043 | # CONFIG_DVB_TDA10086 is not set | ||
| 1044 | # CONFIG_DVB_TDA8261 is not set | ||
| 1045 | # CONFIG_DVB_VES1X93 is not set | ||
| 1046 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 1047 | # CONFIG_DVB_TUNER_CX24113 is not set | ||
| 1048 | # CONFIG_DVB_TDA826X is not set | ||
| 1049 | # CONFIG_DVB_TUA6100 is not set | ||
| 1050 | # CONFIG_DVB_CX24116 is not set | ||
| 1051 | # CONFIG_DVB_SI21XX is not set | ||
| 1052 | |||
| 1053 | # | ||
| 1054 | # DVB-T (terrestrial) frontends | ||
| 1055 | # | ||
| 1056 | # CONFIG_DVB_SP8870 is not set | ||
| 1057 | # CONFIG_DVB_SP887X is not set | ||
| 1058 | # CONFIG_DVB_CX22700 is not set | ||
| 1059 | # CONFIG_DVB_CX22702 is not set | ||
| 1060 | # CONFIG_DVB_DRX397XD is not set | ||
| 1061 | # CONFIG_DVB_L64781 is not set | ||
| 1062 | # CONFIG_DVB_TDA1004X is not set | ||
| 1063 | # CONFIG_DVB_NXT6000 is not set | ||
| 1064 | # CONFIG_DVB_MT352 is not set | ||
| 1065 | # CONFIG_DVB_ZL10353 is not set | ||
| 1066 | # CONFIG_DVB_DIB3000MB is not set | ||
| 1067 | # CONFIG_DVB_DIB3000MC is not set | ||
| 1068 | # CONFIG_DVB_DIB7000M is not set | ||
| 1069 | # CONFIG_DVB_DIB7000P is not set | ||
| 1070 | # CONFIG_DVB_TDA10048 is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # DVB-C (cable) frontends | ||
| 1074 | # | ||
| 1075 | # CONFIG_DVB_VES1820 is not set | ||
| 1076 | # CONFIG_DVB_TDA10021 is not set | ||
| 1077 | # CONFIG_DVB_TDA10023 is not set | ||
| 1078 | # CONFIG_DVB_STV0297 is not set | ||
| 1079 | |||
| 1080 | # | ||
| 1081 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
| 1082 | # | ||
| 1083 | # CONFIG_DVB_NXT200X is not set | ||
| 1084 | # CONFIG_DVB_OR51211 is not set | ||
| 1085 | # CONFIG_DVB_OR51132 is not set | ||
| 1086 | # CONFIG_DVB_BCM3510 is not set | ||
| 1087 | # CONFIG_DVB_LGDT330X is not set | ||
| 1088 | # CONFIG_DVB_LGDT3304 is not set | ||
| 1089 | # CONFIG_DVB_S5H1409 is not set | ||
| 1090 | # CONFIG_DVB_AU8522 is not set | ||
| 1091 | # CONFIG_DVB_S5H1411 is not set | ||
| 1092 | |||
| 1093 | # | ||
| 1094 | # ISDB-T (terrestrial) frontends | ||
| 1095 | # | ||
| 1096 | # CONFIG_DVB_S921 is not set | ||
| 1097 | |||
| 1098 | # | ||
| 1099 | # Digital terrestrial only tuners/PLL | ||
| 1100 | # | ||
| 1101 | # CONFIG_DVB_PLL is not set | ||
| 1102 | # CONFIG_DVB_TUNER_DIB0070 is not set | ||
| 1103 | |||
| 1104 | # | ||
| 1105 | # SEC control devices for DVB-S | ||
| 1106 | # | ||
| 1107 | # CONFIG_DVB_LNBP21 is not set | ||
| 1108 | # CONFIG_DVB_ISL6405 is not set | ||
| 1109 | # CONFIG_DVB_ISL6421 is not set | ||
| 1110 | # CONFIG_DVB_LGS8GL5 is not set | ||
| 1111 | |||
| 1112 | # | ||
| 1113 | # Tools to develop new frontends | ||
| 1114 | # | ||
| 1115 | # CONFIG_DVB_DUMMY_FE is not set | ||
| 1116 | # CONFIG_DVB_AF9013 is not set | ||
| 1117 | CONFIG_DAB=y | 1058 | CONFIG_DAB=y |
| 1118 | # CONFIG_USB_DABUSB is not set | 1059 | # CONFIG_USB_DABUSB is not set |
| 1119 | 1060 | ||
| @@ -1193,6 +1134,8 @@ CONFIG_SND_PCI=y | |||
| 1193 | # CONFIG_SND_INDIGO is not set | 1134 | # CONFIG_SND_INDIGO is not set |
| 1194 | # CONFIG_SND_INDIGOIO is not set | 1135 | # CONFIG_SND_INDIGOIO is not set |
| 1195 | # CONFIG_SND_INDIGODJ is not set | 1136 | # CONFIG_SND_INDIGODJ is not set |
| 1137 | # CONFIG_SND_INDIGOIOX is not set | ||
| 1138 | # CONFIG_SND_INDIGODJX is not set | ||
| 1196 | # CONFIG_SND_EMU10K1 is not set | 1139 | # CONFIG_SND_EMU10K1 is not set |
| 1197 | # CONFIG_SND_EMU10K1X is not set | 1140 | # CONFIG_SND_EMU10K1X is not set |
| 1198 | # CONFIG_SND_ENS1370 is not set | 1141 | # CONFIG_SND_ENS1370 is not set |
| @@ -1247,15 +1190,17 @@ CONFIG_USB_HID=y | |||
| 1247 | # | 1190 | # |
| 1248 | # Special HID drivers | 1191 | # Special HID drivers |
| 1249 | # | 1192 | # |
| 1250 | CONFIG_HID_COMPAT=y | ||
| 1251 | CONFIG_HID_A4TECH=y | 1193 | CONFIG_HID_A4TECH=y |
| 1252 | CONFIG_HID_APPLE=y | 1194 | CONFIG_HID_APPLE=y |
| 1253 | CONFIG_HID_BELKIN=y | 1195 | CONFIG_HID_BELKIN=y |
| 1254 | CONFIG_HID_CHERRY=y | 1196 | CONFIG_HID_CHERRY=y |
| 1255 | CONFIG_HID_CHICONY=y | 1197 | CONFIG_HID_CHICONY=y |
| 1256 | CONFIG_HID_CYPRESS=y | 1198 | CONFIG_HID_CYPRESS=y |
| 1199 | # CONFIG_DRAGONRISE_FF is not set | ||
| 1257 | CONFIG_HID_EZKEY=y | 1200 | CONFIG_HID_EZKEY=y |
| 1201 | # CONFIG_HID_KYE is not set | ||
| 1258 | CONFIG_HID_GYRATION=y | 1202 | CONFIG_HID_GYRATION=y |
| 1203 | # CONFIG_HID_KENSINGTON is not set | ||
| 1259 | CONFIG_HID_LOGITECH=y | 1204 | CONFIG_HID_LOGITECH=y |
| 1260 | # CONFIG_LOGITECH_FF is not set | 1205 | # CONFIG_LOGITECH_FF is not set |
| 1261 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1206 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| @@ -1314,6 +1259,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | |||
| 1314 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1259 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
| 1315 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1260 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1316 | # CONFIG_USB_UHCI_HCD is not set | 1261 | # CONFIG_USB_UHCI_HCD is not set |
| 1262 | # CONFIG_USB_FHCI_HCD is not set | ||
| 1317 | # CONFIG_USB_SL811_HCD is not set | 1263 | # CONFIG_USB_SL811_HCD is not set |
| 1318 | # CONFIG_USB_R8A66597_HCD is not set | 1264 | # CONFIG_USB_R8A66597_HCD is not set |
| 1319 | # CONFIG_USB_WHCI_HCD is not set | 1265 | # CONFIG_USB_WHCI_HCD is not set |
| @@ -1329,11 +1275,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1329 | # CONFIG_USB_TMC is not set | 1275 | # CONFIG_USB_TMC is not set |
| 1330 | 1276 | ||
| 1331 | # | 1277 | # |
| 1332 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1278 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1333 | # | 1279 | # |
| 1334 | 1280 | ||
| 1335 | # | 1281 | # |
| 1336 | # see USB_STORAGE Help for more information | 1282 | # also be needed; see USB_STORAGE Help for more info |
| 1337 | # | 1283 | # |
| 1338 | CONFIG_USB_STORAGE=y | 1284 | CONFIG_USB_STORAGE=y |
| 1339 | # CONFIG_USB_STORAGE_DEBUG is not set | 1285 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1375,7 +1321,6 @@ CONFIG_USB_STORAGE=y | |||
| 1375 | # CONFIG_USB_LED is not set | 1321 | # CONFIG_USB_LED is not set |
| 1376 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1322 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1377 | # CONFIG_USB_CYTHERM is not set | 1323 | # CONFIG_USB_CYTHERM is not set |
| 1378 | # CONFIG_USB_PHIDGET is not set | ||
| 1379 | # CONFIG_USB_IDMOUSE is not set | 1324 | # CONFIG_USB_IDMOUSE is not set |
| 1380 | # CONFIG_USB_FTDI_ELAN is not set | 1325 | # CONFIG_USB_FTDI_ELAN is not set |
| 1381 | # CONFIG_USB_APPLEDISPLAY is not set | 1326 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1392,6 +1337,7 @@ CONFIG_USB_STORAGE=y | |||
| 1392 | # OTG and related infrastructure | 1337 | # OTG and related infrastructure |
| 1393 | # | 1338 | # |
| 1394 | # CONFIG_USB_GPIO_VBUS is not set | 1339 | # CONFIG_USB_GPIO_VBUS is not set |
| 1340 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1395 | # CONFIG_UWB is not set | 1341 | # CONFIG_UWB is not set |
| 1396 | # CONFIG_MMC is not set | 1342 | # CONFIG_MMC is not set |
| 1397 | # CONFIG_MEMSTICK is not set | 1343 | # CONFIG_MEMSTICK is not set |
| @@ -1406,6 +1352,8 @@ CONFIG_EDAC=y | |||
| 1406 | # CONFIG_EDAC_DEBUG is not set | 1352 | # CONFIG_EDAC_DEBUG is not set |
| 1407 | CONFIG_EDAC_MM_EDAC=y | 1353 | CONFIG_EDAC_MM_EDAC=y |
| 1408 | CONFIG_EDAC_MPC85XX=y | 1354 | CONFIG_EDAC_MPC85XX=y |
| 1355 | # CONFIG_EDAC_AMD8131 is not set | ||
| 1356 | # CONFIG_EDAC_AMD8111 is not set | ||
| 1409 | CONFIG_RTC_LIB=y | 1357 | CONFIG_RTC_LIB=y |
| 1410 | CONFIG_RTC_CLASS=y | 1358 | CONFIG_RTC_CLASS=y |
| 1411 | CONFIG_RTC_HCTOSYS=y | 1359 | CONFIG_RTC_HCTOSYS=y |
| @@ -1460,7 +1408,7 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1460 | # | 1408 | # |
| 1461 | # on-CPU RTC drivers | 1409 | # on-CPU RTC drivers |
| 1462 | # | 1410 | # |
| 1463 | # CONFIG_RTC_DRV_PPC is not set | 1411 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1464 | CONFIG_DMADEVICES=y | 1412 | CONFIG_DMADEVICES=y |
| 1465 | 1413 | ||
| 1466 | # | 1414 | # |
| @@ -1473,7 +1421,9 @@ CONFIG_DMA_ENGINE=y | |||
| 1473 | # DMA Clients | 1421 | # DMA Clients |
| 1474 | # | 1422 | # |
| 1475 | # CONFIG_NET_DMA is not set | 1423 | # CONFIG_NET_DMA is not set |
| 1424 | # CONFIG_ASYNC_TX_DMA is not set | ||
| 1476 | # CONFIG_DMATEST is not set | 1425 | # CONFIG_DMATEST is not set |
| 1426 | # CONFIG_AUXDISPLAY is not set | ||
| 1477 | # CONFIG_UIO is not set | 1427 | # CONFIG_UIO is not set |
| 1478 | # CONFIG_STAGING is not set | 1428 | # CONFIG_STAGING is not set |
| 1479 | 1429 | ||
| @@ -1484,6 +1434,7 @@ CONFIG_EXT2_FS=y | |||
| 1484 | # CONFIG_EXT2_FS_XATTR is not set | 1434 | # CONFIG_EXT2_FS_XATTR is not set |
| 1485 | # CONFIG_EXT2_FS_XIP is not set | 1435 | # CONFIG_EXT2_FS_XIP is not set |
| 1486 | CONFIG_EXT3_FS=y | 1436 | CONFIG_EXT3_FS=y |
| 1437 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1487 | CONFIG_EXT3_FS_XATTR=y | 1438 | CONFIG_EXT3_FS_XATTR=y |
| 1488 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1439 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1489 | # CONFIG_EXT3_FS_SECURITY is not set | 1440 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -1508,6 +1459,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1508 | # CONFIG_FUSE_FS is not set | 1459 | # CONFIG_FUSE_FS is not set |
| 1509 | 1460 | ||
| 1510 | # | 1461 | # |
| 1462 | # Caches | ||
| 1463 | # | ||
| 1464 | # CONFIG_FSCACHE is not set | ||
| 1465 | |||
| 1466 | # | ||
| 1511 | # CD-ROM/DVD Filesystems | 1467 | # CD-ROM/DVD Filesystems |
| 1512 | # | 1468 | # |
| 1513 | CONFIG_ISO9660_FS=m | 1469 | CONFIG_ISO9660_FS=m |
| @@ -1562,6 +1518,7 @@ CONFIG_SYSV_FS=m | |||
| 1562 | CONFIG_UFS_FS=m | 1518 | CONFIG_UFS_FS=m |
| 1563 | # CONFIG_UFS_FS_WRITE is not set | 1519 | # CONFIG_UFS_FS_WRITE is not set |
| 1564 | # CONFIG_UFS_DEBUG is not set | 1520 | # CONFIG_UFS_DEBUG is not set |
| 1521 | # CONFIG_NILFS2_FS is not set | ||
| 1565 | CONFIG_NETWORK_FILESYSTEMS=y | 1522 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1566 | CONFIG_NFS_FS=y | 1523 | CONFIG_NFS_FS=y |
| 1567 | CONFIG_NFS_V3=y | 1524 | CONFIG_NFS_V3=y |
| @@ -1577,7 +1534,6 @@ CONFIG_EXPORTFS=y | |||
| 1577 | CONFIG_NFS_COMMON=y | 1534 | CONFIG_NFS_COMMON=y |
| 1578 | CONFIG_SUNRPC=y | 1535 | CONFIG_SUNRPC=y |
| 1579 | CONFIG_SUNRPC_GSS=y | 1536 | CONFIG_SUNRPC_GSS=y |
| 1580 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1581 | CONFIG_RPCSEC_GSS_KRB5=y | 1537 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1582 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1538 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1583 | # CONFIG_SMB_FS is not set | 1539 | # CONFIG_SMB_FS is not set |
| @@ -1648,6 +1604,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1648 | # CONFIG_NLS_KOI8_U is not set | 1604 | # CONFIG_NLS_KOI8_U is not set |
| 1649 | CONFIG_NLS_UTF8=m | 1605 | CONFIG_NLS_UTF8=m |
| 1650 | # CONFIG_DLM is not set | 1606 | # CONFIG_DLM is not set |
| 1607 | CONFIG_UCC_SLOW=y | ||
| 1608 | CONFIG_UCC_FAST=y | ||
| 1609 | CONFIG_UCC=y | ||
| 1610 | # CONFIG_BINARY_PRINTF is not set | ||
| 1651 | 1611 | ||
| 1652 | # | 1612 | # |
| 1653 | # Library routines | 1613 | # Library routines |
| @@ -1662,11 +1622,12 @@ CONFIG_CRC32=y | |||
| 1662 | # CONFIG_CRC7 is not set | 1622 | # CONFIG_CRC7 is not set |
| 1663 | CONFIG_LIBCRC32C=m | 1623 | CONFIG_LIBCRC32C=m |
| 1664 | CONFIG_ZLIB_INFLATE=y | 1624 | CONFIG_ZLIB_INFLATE=y |
| 1665 | CONFIG_PLIST=y | 1625 | CONFIG_DECOMPRESS_GZIP=y |
| 1666 | CONFIG_HAS_IOMEM=y | 1626 | CONFIG_HAS_IOMEM=y |
| 1667 | CONFIG_HAS_IOPORT=y | 1627 | CONFIG_HAS_IOPORT=y |
| 1668 | CONFIG_HAS_DMA=y | 1628 | CONFIG_HAS_DMA=y |
| 1669 | CONFIG_HAVE_LMB=y | 1629 | CONFIG_HAVE_LMB=y |
| 1630 | CONFIG_NLATTR=y | ||
| 1670 | 1631 | ||
| 1671 | # | 1632 | # |
| 1672 | # Kernel hacking | 1633 | # Kernel hacking |
| @@ -1684,6 +1645,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1684 | CONFIG_DETECT_SOFTLOCKUP=y | 1645 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1685 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1646 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1686 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1647 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1648 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1649 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1650 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1687 | CONFIG_SCHED_DEBUG=y | 1651 | CONFIG_SCHED_DEBUG=y |
| 1688 | # CONFIG_SCHEDSTATS is not set | 1652 | # CONFIG_SCHEDSTATS is not set |
| 1689 | # CONFIG_TIMER_STATS is not set | 1653 | # CONFIG_TIMER_STATS is not set |
| @@ -1714,9 +1678,12 @@ CONFIG_DEBUG_INFO=y | |||
| 1714 | # CONFIG_FAULT_INJECTION is not set | 1678 | # CONFIG_FAULT_INJECTION is not set |
| 1715 | # CONFIG_LATENCYTOP is not set | 1679 | # CONFIG_LATENCYTOP is not set |
| 1716 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1680 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1681 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1717 | CONFIG_HAVE_FUNCTION_TRACER=y | 1682 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1683 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1718 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1684 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1719 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1685 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1686 | CONFIG_TRACING_SUPPORT=y | ||
| 1720 | 1687 | ||
| 1721 | # | 1688 | # |
| 1722 | # Tracers | 1689 | # Tracers |
| @@ -1724,17 +1691,20 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1724 | # CONFIG_FUNCTION_TRACER is not set | 1691 | # CONFIG_FUNCTION_TRACER is not set |
| 1725 | # CONFIG_SCHED_TRACER is not set | 1692 | # CONFIG_SCHED_TRACER is not set |
| 1726 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1693 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1694 | # CONFIG_EVENT_TRACER is not set | ||
| 1727 | # CONFIG_BOOT_TRACER is not set | 1695 | # CONFIG_BOOT_TRACER is not set |
| 1728 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1696 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1729 | # CONFIG_STACK_TRACER is not set | 1697 | # CONFIG_STACK_TRACER is not set |
| 1730 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1698 | # CONFIG_KMEMTRACE is not set |
| 1699 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1700 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1701 | # CONFIG_DYNAMIC_DEBUG is not set | ||
| 1731 | # CONFIG_SAMPLES is not set | 1702 | # CONFIG_SAMPLES is not set |
| 1732 | CONFIG_HAVE_ARCH_KGDB=y | 1703 | CONFIG_HAVE_ARCH_KGDB=y |
| 1733 | # CONFIG_KGDB is not set | 1704 | # CONFIG_KGDB is not set |
| 1734 | CONFIG_PRINT_STACK_DEPTH=64 | 1705 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1735 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1706 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1736 | # CONFIG_DEBUG_STACK_USAGE is not set | 1707 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1737 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1738 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1708 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1739 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1709 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1740 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1710 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| @@ -1759,18 +1729,21 @@ CONFIG_CRYPTO=y | |||
| 1759 | # CONFIG_CRYPTO_FIPS is not set | 1729 | # CONFIG_CRYPTO_FIPS is not set |
| 1760 | CONFIG_CRYPTO_ALGAPI=y | 1730 | CONFIG_CRYPTO_ALGAPI=y |
| 1761 | CONFIG_CRYPTO_ALGAPI2=y | 1731 | CONFIG_CRYPTO_ALGAPI2=y |
| 1732 | CONFIG_CRYPTO_AEAD=y | ||
| 1762 | CONFIG_CRYPTO_AEAD2=y | 1733 | CONFIG_CRYPTO_AEAD2=y |
| 1763 | CONFIG_CRYPTO_BLKCIPHER=y | 1734 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1764 | CONFIG_CRYPTO_BLKCIPHER2=y | 1735 | CONFIG_CRYPTO_BLKCIPHER2=y |
| 1765 | CONFIG_CRYPTO_HASH=y | 1736 | CONFIG_CRYPTO_HASH=y |
| 1766 | CONFIG_CRYPTO_HASH2=y | 1737 | CONFIG_CRYPTO_HASH2=y |
| 1767 | CONFIG_CRYPTO_RNG2=y | 1738 | CONFIG_CRYPTO_RNG2=y |
| 1739 | CONFIG_CRYPTO_PCOMP=y | ||
| 1768 | CONFIG_CRYPTO_MANAGER=y | 1740 | CONFIG_CRYPTO_MANAGER=y |
| 1769 | CONFIG_CRYPTO_MANAGER2=y | 1741 | CONFIG_CRYPTO_MANAGER2=y |
| 1770 | # CONFIG_CRYPTO_GF128MUL is not set | 1742 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1771 | # CONFIG_CRYPTO_NULL is not set | 1743 | # CONFIG_CRYPTO_NULL is not set |
| 1744 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1772 | # CONFIG_CRYPTO_CRYPTD is not set | 1745 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1773 | # CONFIG_CRYPTO_AUTHENC is not set | 1746 | CONFIG_CRYPTO_AUTHENC=y |
| 1774 | # CONFIG_CRYPTO_TEST is not set | 1747 | # CONFIG_CRYPTO_TEST is not set |
| 1775 | 1748 | ||
| 1776 | # | 1749 | # |
| @@ -1837,6 +1810,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1837 | # Compression | 1810 | # Compression |
| 1838 | # | 1811 | # |
| 1839 | # CONFIG_CRYPTO_DEFLATE is not set | 1812 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1813 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1840 | # CONFIG_CRYPTO_LZO is not set | 1814 | # CONFIG_CRYPTO_LZO is not set |
| 1841 | 1815 | ||
| 1842 | # | 1816 | # |
| @@ -1845,7 +1819,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1845 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1819 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1846 | CONFIG_CRYPTO_HW=y | 1820 | CONFIG_CRYPTO_HW=y |
| 1847 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1821 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1848 | # CONFIG_CRYPTO_DEV_TALITOS is not set | 1822 | CONFIG_CRYPTO_DEV_TALITOS=y |
| 1849 | CONFIG_PPC_CLOCK=y | 1823 | CONFIG_PPC_CLOCK=y |
| 1850 | CONFIG_PPC_LIB_RHEAP=y | 1824 | CONFIG_PPC_LIB_RHEAP=y |
| 1851 | # CONFIG_VIRTUALIZATION is not set | 1825 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 813223ae174..1aa1c508d60 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_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.29-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Mon Jan 26 15:36:12 2009 | 4 | # Tue Apr 21 15:41:18 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,9 +22,10 @@ CONFIG_FSL_EMB_PERFMON=y | |||
| 22 | # CONFIG_PHYS_64BIT is not set | 22 | # CONFIG_PHYS_64BIT is not set |
| 23 | CONFIG_SPE=y | 23 | CONFIG_SPE=y |
| 24 | CONFIG_PPC_MMU_NOHASH=y | 24 | CONFIG_PPC_MMU_NOHASH=y |
| 25 | CONFIG_PPC_BOOK3E_MMU=y | ||
| 25 | # CONFIG_PPC_MM_SLICES is not set | 26 | # CONFIG_PPC_MM_SLICES is not set |
| 26 | CONFIG_SMP=y | 27 | CONFIG_SMP=y |
| 27 | CONFIG_NR_CPUS=2 | 28 | CONFIG_NR_CPUS=8 |
| 28 | CONFIG_PPC32=y | 29 | CONFIG_PPC32=y |
| 29 | CONFIG_WORD_SIZE=32 | 30 | CONFIG_WORD_SIZE=32 |
| 30 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | 31 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| @@ -44,6 +45,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 44 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
| 45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 46 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 48 | CONFIG_GENERIC_GPIO=y | ||
| 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 48 | CONFIG_PPC=y | 50 | CONFIG_PPC=y |
| 49 | CONFIG_EARLY_PRINTK=y | 51 | CONFIG_EARLY_PRINTK=y |
| @@ -59,6 +61,7 @@ CONFIG_GENERIC_BUG=y | |||
| 59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
| 60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
| 61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
| 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 63 | 66 | ||
| 64 | # | 67 | # |
| @@ -73,11 +76,21 @@ CONFIG_SWAP=y | |||
| 73 | CONFIG_SYSVIPC=y | 76 | CONFIG_SYSVIPC=y |
| 74 | CONFIG_SYSVIPC_SYSCTL=y | 77 | CONFIG_SYSVIPC_SYSCTL=y |
| 75 | CONFIG_POSIX_MQUEUE=y | 78 | CONFIG_POSIX_MQUEUE=y |
| 79 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 76 | CONFIG_BSD_PROCESS_ACCT=y | 80 | CONFIG_BSD_PROCESS_ACCT=y |
| 77 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 81 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 78 | # CONFIG_TASKSTATS is not set | 82 | # CONFIG_TASKSTATS is not set |
| 79 | CONFIG_AUDIT=y | 83 | CONFIG_AUDIT=y |
| 80 | # CONFIG_AUDITSYSCALL is not set | 84 | # CONFIG_AUDITSYSCALL is not set |
| 85 | |||
| 86 | # | ||
| 87 | # RCU Subsystem | ||
| 88 | # | ||
| 89 | CONFIG_CLASSIC_RCU=y | ||
| 90 | # CONFIG_TREE_RCU is not set | ||
| 91 | # CONFIG_PREEMPT_RCU is not set | ||
| 92 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 93 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 81 | CONFIG_IKCONFIG=y | 94 | CONFIG_IKCONFIG=y |
| 82 | CONFIG_IKCONFIG_PROC=y | 95 | CONFIG_IKCONFIG_PROC=y |
| 83 | CONFIG_LOG_BUF_SHIFT=14 | 96 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -93,22 +106,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
| 93 | # CONFIG_NAMESPACES is not set | 106 | # CONFIG_NAMESPACES is not set |
| 94 | CONFIG_BLK_DEV_INITRD=y | 107 | CONFIG_BLK_DEV_INITRD=y |
| 95 | CONFIG_INITRAMFS_SOURCE="" | 108 | CONFIG_INITRAMFS_SOURCE="" |
| 109 | CONFIG_RD_GZIP=y | ||
| 110 | # CONFIG_RD_BZIP2 is not set | ||
| 111 | # CONFIG_RD_LZMA is not set | ||
| 96 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 112 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 97 | CONFIG_SYSCTL=y | 113 | CONFIG_SYSCTL=y |
| 114 | CONFIG_ANON_INODES=y | ||
| 98 | CONFIG_EMBEDDED=y | 115 | CONFIG_EMBEDDED=y |
| 99 | CONFIG_SYSCTL_SYSCALL=y | 116 | CONFIG_SYSCTL_SYSCALL=y |
| 100 | CONFIG_KALLSYMS=y | 117 | CONFIG_KALLSYMS=y |
| 101 | CONFIG_KALLSYMS_ALL=y | 118 | CONFIG_KALLSYMS_ALL=y |
| 102 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
| 103 | CONFIG_KALLSYMS_EXTRA_PASS=y | 119 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 120 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 104 | CONFIG_HOTPLUG=y | 121 | CONFIG_HOTPLUG=y |
| 105 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
| 106 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
| 107 | CONFIG_ELF_CORE=y | 124 | CONFIG_ELF_CORE=y |
| 108 | CONFIG_COMPAT_BRK=y | ||
| 109 | CONFIG_BASE_FULL=y | 125 | CONFIG_BASE_FULL=y |
| 110 | CONFIG_FUTEX=y | 126 | CONFIG_FUTEX=y |
| 111 | CONFIG_ANON_INODES=y | ||
| 112 | CONFIG_EPOLL=y | 127 | CONFIG_EPOLL=y |
| 113 | CONFIG_SIGNALFD=y | 128 | CONFIG_SIGNALFD=y |
| 114 | CONFIG_TIMERFD=y | 129 | CONFIG_TIMERFD=y |
| @@ -118,10 +133,12 @@ CONFIG_AIO=y | |||
| 118 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
| 119 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
| 120 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
| 136 | CONFIG_COMPAT_BRK=y | ||
| 121 | # CONFIG_SLAB is not set | 137 | # CONFIG_SLAB is not set |
| 122 | CONFIG_SLUB=y | 138 | CONFIG_SLUB=y |
| 123 | # CONFIG_SLOB is not set | 139 | # CONFIG_SLOB is not set |
| 124 | # CONFIG_PROFILING is not set | 140 | # CONFIG_PROFILING is not set |
| 141 | # CONFIG_MARKERS is not set | ||
| 125 | CONFIG_HAVE_OPROFILE=y | 142 | CONFIG_HAVE_OPROFILE=y |
| 126 | # CONFIG_KPROBES is not set | 143 | # CONFIG_KPROBES is not set |
| 127 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 144 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| @@ -130,6 +147,8 @@ CONFIG_HAVE_KPROBES=y | |||
| 130 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
| 131 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 132 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 149 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 150 | CONFIG_HAVE_CLK=y | ||
| 151 | # CONFIG_SLOW_WORK is not set | ||
| 133 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 152 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 134 | CONFIG_SLABINFO=y | 153 | CONFIG_SLABINFO=y |
| 135 | CONFIG_RT_MUTEXES=y | 154 | CONFIG_RT_MUTEXES=y |
| @@ -143,7 +162,6 @@ CONFIG_MODVERSIONS=y | |||
| 143 | CONFIG_STOP_MACHINE=y | 162 | CONFIG_STOP_MACHINE=y |
| 144 | CONFIG_BLOCK=y | 163 | CONFIG_BLOCK=y |
| 145 | CONFIG_LBD=y | 164 | CONFIG_LBD=y |
| 146 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 147 | # CONFIG_BLK_DEV_BSG is not set | 165 | # CONFIG_BLK_DEV_BSG is not set |
| 148 | # CONFIG_BLK_DEV_INTEGRITY is not set | 166 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 149 | 167 | ||
| @@ -159,11 +177,6 @@ CONFIG_IOSCHED_CFQ=y | |||
| 159 | CONFIG_DEFAULT_CFQ=y | 177 | CONFIG_DEFAULT_CFQ=y |
| 160 | # CONFIG_DEFAULT_NOOP is not set | 178 | # CONFIG_DEFAULT_NOOP is not set |
| 161 | CONFIG_DEFAULT_IOSCHED="cfq" | 179 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 162 | CONFIG_CLASSIC_RCU=y | ||
| 163 | # CONFIG_TREE_RCU is not set | ||
| 164 | # CONFIG_PREEMPT_RCU is not set | ||
| 165 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 166 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 167 | # CONFIG_FREEZER is not set | 180 | # CONFIG_FREEZER is not set |
| 168 | 181 | ||
| 169 | # | 182 | # |
| @@ -173,21 +186,23 @@ CONFIG_CLASSIC_RCU=y | |||
| 173 | # CONFIG_PPC_CELL_NATIVE is not set | 186 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PQ2ADS is not set | 187 | # CONFIG_PQ2ADS is not set |
| 175 | CONFIG_MPC85xx=y | 188 | CONFIG_MPC85xx=y |
| 176 | # CONFIG_MPC8540_ADS is not set | 189 | CONFIG_MPC8540_ADS=y |
| 177 | # CONFIG_MPC8560_ADS is not set | 190 | CONFIG_MPC8560_ADS=y |
| 178 | # CONFIG_MPC85xx_CDS is not set | 191 | CONFIG_MPC85xx_CDS=y |
| 179 | # CONFIG_MPC85xx_MDS is not set | 192 | CONFIG_MPC85xx_MDS=y |
| 180 | # CONFIG_MPC8536_DS is not set | 193 | CONFIG_MPC8536_DS=y |
| 181 | CONFIG_MPC85xx_DS=y | 194 | CONFIG_MPC85xx_DS=y |
| 182 | # CONFIG_KSI8560 is not set | 195 | CONFIG_SOCRATES=y |
| 183 | # CONFIG_STX_GP3 is not set | 196 | CONFIG_KSI8560=y |
| 184 | # CONFIG_TQM8540 is not set | 197 | CONFIG_STX_GP3=y |
| 185 | # CONFIG_TQM8541 is not set | 198 | CONFIG_TQM8540=y |
| 186 | # CONFIG_TQM8548 is not set | 199 | CONFIG_TQM8541=y |
| 187 | # CONFIG_TQM8555 is not set | 200 | CONFIG_TQM8548=y |
| 188 | # CONFIG_TQM8560 is not set | 201 | CONFIG_TQM8555=y |
| 189 | # CONFIG_SBC8548 is not set | 202 | CONFIG_TQM8560=y |
| 203 | CONFIG_SBC8548=y | ||
| 190 | # CONFIG_SBC8560 is not set | 204 | # CONFIG_SBC8560 is not set |
| 205 | CONFIG_TQM85xx=y | ||
| 191 | # CONFIG_IPIC is not set | 206 | # CONFIG_IPIC is not set |
| 192 | CONFIG_MPIC=y | 207 | CONFIG_MPIC=y |
| 193 | # CONFIG_MPIC_WEIRD is not set | 208 | # CONFIG_MPIC_WEIRD is not set |
| @@ -199,10 +214,12 @@ CONFIG_PPC_I8259=y | |||
| 199 | # CONFIG_PPC_INDIRECT_IO is not set | 214 | # CONFIG_PPC_INDIRECT_IO is not set |
| 200 | # CONFIG_GENERIC_IOMAP is not set | 215 | # CONFIG_GENERIC_IOMAP is not set |
| 201 | # CONFIG_CPU_FREQ is not set | 216 | # CONFIG_CPU_FREQ is not set |
| 202 | # CONFIG_QUICC_ENGINE is not set | 217 | CONFIG_QUICC_ENGINE=y |
| 203 | # CONFIG_CPM2 is not set | 218 | CONFIG_QE_GPIO=y |
| 219 | CONFIG_CPM2=y | ||
| 204 | CONFIG_FSL_ULI1575=y | 220 | CONFIG_FSL_ULI1575=y |
| 205 | # CONFIG_MPC8xxx_GPIO is not set | 221 | CONFIG_CPM=y |
| 222 | CONFIG_MPC8xxx_GPIO=y | ||
| 206 | # CONFIG_SIMPLE_GPIO is not set | 223 | # CONFIG_SIMPLE_GPIO is not set |
| 207 | 224 | ||
| 208 | # | 225 | # |
| @@ -248,9 +265,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 248 | CONFIG_BOUNCE=y | 265 | CONFIG_BOUNCE=y |
| 249 | CONFIG_VIRT_TO_BUS=y | 266 | CONFIG_VIRT_TO_BUS=y |
| 250 | CONFIG_UNEVICTABLE_LRU=y | 267 | CONFIG_UNEVICTABLE_LRU=y |
| 268 | CONFIG_HAVE_MLOCK=y | ||
| 269 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 251 | CONFIG_PPC_4K_PAGES=y | 270 | CONFIG_PPC_4K_PAGES=y |
| 252 | # CONFIG_PPC_16K_PAGES is not set | 271 | # CONFIG_PPC_16K_PAGES is not set |
| 253 | # CONFIG_PPC_64K_PAGES is not set | 272 | # CONFIG_PPC_64K_PAGES is not set |
| 273 | # CONFIG_PPC_256K_PAGES is not set | ||
| 254 | CONFIG_FORCE_MAX_ZONEORDER=11 | 274 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 255 | CONFIG_PROC_DEVICETREE=y | 275 | CONFIG_PROC_DEVICETREE=y |
| 256 | # CONFIG_CMDLINE_BOOL is not set | 276 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -277,6 +297,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 277 | # CONFIG_PCI_LEGACY is not set | 297 | # CONFIG_PCI_LEGACY is not set |
| 278 | # CONFIG_PCI_DEBUG is not set | 298 | # CONFIG_PCI_DEBUG is not set |
| 279 | # CONFIG_PCI_STUB is not set | 299 | # CONFIG_PCI_STUB is not set |
| 300 | # CONFIG_PCI_IOV is not set | ||
| 280 | # CONFIG_PCCARD is not set | 301 | # CONFIG_PCCARD is not set |
| 281 | # CONFIG_HOTPLUG_PCI is not set | 302 | # CONFIG_HOTPLUG_PCI is not set |
| 282 | # CONFIG_HAS_RAPIDIO is not set | 303 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -290,17 +311,17 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 290 | # Default settings for advanced configuration options are used | 311 | # Default settings for advanced configuration options are used |
| 291 | # | 312 | # |
| 292 | CONFIG_LOWMEM_SIZE=0x30000000 | 313 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 314 | CONFIG_LOWMEM_CAM_NUM=3 | ||
| 293 | CONFIG_PAGE_OFFSET=0xc0000000 | 315 | CONFIG_PAGE_OFFSET=0xc0000000 |
| 294 | CONFIG_KERNEL_START=0xc0000000 | 316 | CONFIG_KERNEL_START=0xc0000000 |
| 295 | CONFIG_PHYSICAL_START=0x00000000 | 317 | CONFIG_PHYSICAL_START=0x00000000 |
| 296 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 318 | CONFIG_PHYSICAL_ALIGN=0x04000000 |
| 297 | CONFIG_TASK_SIZE=0xc0000000 | 319 | CONFIG_TASK_SIZE=0xc0000000 |
| 298 | CONFIG_NET=y | 320 | CONFIG_NET=y |
| 299 | 321 | ||
| 300 | # | 322 | # |
| 301 | # Networking options | 323 | # Networking options |
| 302 | # | 324 | # |
| 303 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 304 | CONFIG_PACKET=y | 325 | CONFIG_PACKET=y |
| 305 | # CONFIG_PACKET_MMAP is not set | 326 | # CONFIG_PACKET_MMAP is not set |
| 306 | CONFIG_UNIX=y | 327 | CONFIG_UNIX=y |
| @@ -388,6 +409,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 388 | # CONFIG_LAPB is not set | 409 | # CONFIG_LAPB is not set |
| 389 | # CONFIG_ECONET is not set | 410 | # CONFIG_ECONET is not set |
| 390 | # CONFIG_WAN_ROUTER is not set | 411 | # CONFIG_WAN_ROUTER is not set |
| 412 | # CONFIG_PHONET is not set | ||
| 391 | # CONFIG_NET_SCHED is not set | 413 | # CONFIG_NET_SCHED is not set |
| 392 | # CONFIG_DCB is not set | 414 | # CONFIG_DCB is not set |
| 393 | 415 | ||
| @@ -400,7 +422,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 400 | # CONFIG_IRDA is not set | 422 | # CONFIG_IRDA is not set |
| 401 | # CONFIG_BT is not set | 423 | # CONFIG_BT is not set |
| 402 | # CONFIG_AF_RXRPC is not set | 424 | # CONFIG_AF_RXRPC is not set |
| 403 | # CONFIG_PHONET is not set | ||
| 404 | CONFIG_FIB_RULES=y | 425 | CONFIG_FIB_RULES=y |
| 405 | CONFIG_WIRELESS=y | 426 | CONFIG_WIRELESS=y |
| 406 | # CONFIG_CFG80211 is not set | 427 | # CONFIG_CFG80211 is not set |
| @@ -431,6 +452,7 @@ CONFIG_EXTRA_FIRMWARE="" | |||
| 431 | # CONFIG_CONNECTOR is not set | 452 | # CONFIG_CONNECTOR is not set |
| 432 | # CONFIG_MTD is not set | 453 | # CONFIG_MTD is not set |
| 433 | CONFIG_OF_DEVICE=y | 454 | CONFIG_OF_DEVICE=y |
| 455 | CONFIG_OF_GPIO=y | ||
| 434 | CONFIG_OF_I2C=y | 456 | CONFIG_OF_I2C=y |
| 435 | # CONFIG_PARPORT is not set | 457 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 458 | CONFIG_BLK_DEV=y |
| @@ -454,13 +476,20 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 454 | # CONFIG_BLK_DEV_HD is not set | 476 | # CONFIG_BLK_DEV_HD is not set |
| 455 | CONFIG_MISC_DEVICES=y | 477 | CONFIG_MISC_DEVICES=y |
| 456 | # CONFIG_PHANTOM is not set | 478 | # CONFIG_PHANTOM is not set |
| 457 | # CONFIG_EEPROM_93CX6 is not set | ||
| 458 | # CONFIG_SGI_IOC4 is not set | 479 | # CONFIG_SGI_IOC4 is not set |
| 459 | # CONFIG_TIFM_CORE is not set | 480 | # CONFIG_TIFM_CORE is not set |
| 460 | # CONFIG_ICS932S401 is not set | 481 | # CONFIG_ICS932S401 is not set |
| 461 | # CONFIG_ENCLOSURE_SERVICES is not set | 482 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 462 | # CONFIG_HP_ILO is not set | 483 | # CONFIG_HP_ILO is not set |
| 484 | # CONFIG_ISL29003 is not set | ||
| 463 | # CONFIG_C2PORT is not set | 485 | # CONFIG_C2PORT is not set |
| 486 | |||
| 487 | # | ||
| 488 | # EEPROM support | ||
| 489 | # | ||
| 490 | # CONFIG_EEPROM_AT24 is not set | ||
| 491 | CONFIG_EEPROM_LEGACY=y | ||
| 492 | # CONFIG_EEPROM_93CX6 is not set | ||
| 464 | CONFIG_HAVE_IDE=y | 493 | CONFIG_HAVE_IDE=y |
| 465 | # CONFIG_IDE is not set | 494 | # CONFIG_IDE is not set |
| 466 | 495 | ||
| @@ -519,9 +548,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 519 | # CONFIG_MEGARAID_NEWGEN is not set | 548 | # CONFIG_MEGARAID_NEWGEN is not set |
| 520 | # CONFIG_MEGARAID_LEGACY is not set | 549 | # CONFIG_MEGARAID_LEGACY is not set |
| 521 | # CONFIG_MEGARAID_SAS is not set | 550 | # CONFIG_MEGARAID_SAS is not set |
| 551 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 522 | # CONFIG_SCSI_HPTIOP is not set | 552 | # CONFIG_SCSI_HPTIOP is not set |
| 523 | # CONFIG_SCSI_BUSLOGIC is not set | 553 | # CONFIG_SCSI_BUSLOGIC is not set |
| 524 | # CONFIG_LIBFC is not set | 554 | # CONFIG_LIBFC is not set |
| 555 | # CONFIG_LIBFCOE is not set | ||
| 525 | # CONFIG_FCOE is not set | 556 | # CONFIG_FCOE is not set |
| 526 | # CONFIG_SCSI_DMX3191D is not set | 557 | # CONFIG_SCSI_DMX3191D is not set |
| 527 | # CONFIG_SCSI_EATA is not set | 558 | # CONFIG_SCSI_EATA is not set |
| @@ -544,12 +575,13 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 544 | # CONFIG_SCSI_DEBUG is not set | 575 | # CONFIG_SCSI_DEBUG is not set |
| 545 | # CONFIG_SCSI_SRP is not set | 576 | # CONFIG_SCSI_SRP is not set |
| 546 | # CONFIG_SCSI_DH is not set | 577 | # CONFIG_SCSI_DH is not set |
| 578 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 547 | CONFIG_ATA=y | 579 | CONFIG_ATA=y |
| 548 | # CONFIG_ATA_NONSTANDARD is not set | 580 | # CONFIG_ATA_NONSTANDARD is not set |
| 549 | CONFIG_SATA_PMP=y | 581 | CONFIG_SATA_PMP=y |
| 550 | CONFIG_SATA_AHCI=y | 582 | CONFIG_SATA_AHCI=y |
| 551 | # CONFIG_SATA_SIL24 is not set | 583 | # CONFIG_SATA_SIL24 is not set |
| 552 | # CONFIG_SATA_FSL is not set | 584 | CONFIG_SATA_FSL=y |
| 553 | CONFIG_ATA_SFF=y | 585 | CONFIG_ATA_SFF=y |
| 554 | # CONFIG_SATA_SVW is not set | 586 | # CONFIG_SATA_SVW is not set |
| 555 | # CONFIG_ATA_PIIX is not set | 587 | # CONFIG_ATA_PIIX is not set |
| @@ -620,6 +652,7 @@ CONFIG_PATA_ALI=y | |||
| 620 | # CONFIG_I2O is not set | 652 | # CONFIG_I2O is not set |
| 621 | # CONFIG_MACINTOSH_DRIVERS is not set | 653 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 622 | CONFIG_NETDEVICES=y | 654 | CONFIG_NETDEVICES=y |
| 655 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 623 | CONFIG_DUMMY=y | 656 | CONFIG_DUMMY=y |
| 624 | # CONFIG_BONDING is not set | 657 | # CONFIG_BONDING is not set |
| 625 | # CONFIG_MACVLAN is not set | 658 | # CONFIG_MACVLAN is not set |
| @@ -632,11 +665,11 @@ CONFIG_PHYLIB=y | |||
| 632 | # | 665 | # |
| 633 | # MII PHY device drivers | 666 | # MII PHY device drivers |
| 634 | # | 667 | # |
| 635 | # CONFIG_MARVELL_PHY is not set | 668 | CONFIG_MARVELL_PHY=y |
| 636 | # CONFIG_DAVICOM_PHY is not set | 669 | CONFIG_DAVICOM_PHY=y |
| 637 | # CONFIG_QSEMI_PHY is not set | 670 | # CONFIG_QSEMI_PHY is not set |
| 638 | # CONFIG_LXT_PHY is not set | 671 | # CONFIG_LXT_PHY is not set |
| 639 | # CONFIG_CICADA_PHY is not set | 672 | CONFIG_CICADA_PHY=y |
| 640 | CONFIG_VITESSE_PHY=y | 673 | CONFIG_VITESSE_PHY=y |
| 641 | # CONFIG_SMSC_PHY is not set | 674 | # CONFIG_SMSC_PHY is not set |
| 642 | # CONFIG_BROADCOM_PHY is not set | 675 | # CONFIG_BROADCOM_PHY is not set |
| @@ -645,7 +678,7 @@ CONFIG_VITESSE_PHY=y | |||
| 645 | # CONFIG_NATIONAL_PHY is not set | 678 | # CONFIG_NATIONAL_PHY is not set |
| 646 | # CONFIG_STE10XP is not set | 679 | # CONFIG_STE10XP is not set |
| 647 | # CONFIG_LSI_ET1011C_PHY is not set | 680 | # CONFIG_LSI_ET1011C_PHY is not set |
| 648 | # CONFIG_FIXED_PHY is not set | 681 | CONFIG_FIXED_PHY=y |
| 649 | # CONFIG_MDIO_BITBANG is not set | 682 | # CONFIG_MDIO_BITBANG is not set |
| 650 | CONFIG_NET_ETHERNET=y | 683 | CONFIG_NET_ETHERNET=y |
| 651 | CONFIG_MII=y | 684 | CONFIG_MII=y |
| @@ -653,6 +686,8 @@ CONFIG_MII=y | |||
| 653 | # CONFIG_SUNGEM is not set | 686 | # CONFIG_SUNGEM is not set |
| 654 | # CONFIG_CASSINI is not set | 687 | # CONFIG_CASSINI is not set |
| 655 | # CONFIG_NET_VENDOR_3COM is not set | 688 | # CONFIG_NET_VENDOR_3COM is not set |
| 689 | # CONFIG_ETHOC is not set | ||
| 690 | # CONFIG_DNET is not set | ||
| 656 | # CONFIG_NET_TULIP is not set | 691 | # CONFIG_NET_TULIP is not set |
| 657 | # CONFIG_HP100 is not set | 692 | # CONFIG_HP100 is not set |
| 658 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 693 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -665,6 +700,10 @@ CONFIG_MII=y | |||
| 665 | # CONFIG_NET_PCI is not set | 700 | # CONFIG_NET_PCI is not set |
| 666 | # CONFIG_B44 is not set | 701 | # CONFIG_B44 is not set |
| 667 | # CONFIG_ATL2 is not set | 702 | # CONFIG_ATL2 is not set |
| 703 | CONFIG_FS_ENET=y | ||
| 704 | CONFIG_FS_ENET_HAS_SCC=y | ||
| 705 | CONFIG_FS_ENET_HAS_FCC=y | ||
| 706 | # CONFIG_FS_ENET_MDIO_FCC is not set | ||
| 668 | CONFIG_NETDEV_1000=y | 707 | CONFIG_NETDEV_1000=y |
| 669 | # CONFIG_ACENIC is not set | 708 | # CONFIG_ACENIC is not set |
| 670 | # CONFIG_DL2K is not set | 709 | # CONFIG_DL2K is not set |
| @@ -672,6 +711,7 @@ CONFIG_NETDEV_1000=y | |||
| 672 | # CONFIG_E1000E is not set | 711 | # CONFIG_E1000E is not set |
| 673 | # CONFIG_IP1000 is not set | 712 | # CONFIG_IP1000 is not set |
| 674 | # CONFIG_IGB is not set | 713 | # CONFIG_IGB is not set |
| 714 | # CONFIG_IGBVF is not set | ||
| 675 | # CONFIG_NS83820 is not set | 715 | # CONFIG_NS83820 is not set |
| 676 | # CONFIG_HAMACHI is not set | 716 | # CONFIG_HAMACHI is not set |
| 677 | # CONFIG_YELLOWFIN is not set | 717 | # CONFIG_YELLOWFIN is not set |
| @@ -682,10 +722,15 @@ CONFIG_NETDEV_1000=y | |||
| 682 | # CONFIG_VIA_VELOCITY is not set | 722 | # CONFIG_VIA_VELOCITY is not set |
| 683 | # CONFIG_TIGON3 is not set | 723 | # CONFIG_TIGON3 is not set |
| 684 | # CONFIG_BNX2 is not set | 724 | # CONFIG_BNX2 is not set |
| 725 | CONFIG_FSL_PQ_MDIO=y | ||
| 685 | CONFIG_GIANFAR=y | 726 | CONFIG_GIANFAR=y |
| 727 | CONFIG_UCC_GETH=y | ||
| 728 | # CONFIG_UGETH_MAGIC_PACKET is not set | ||
| 729 | # CONFIG_UGETH_TX_ON_DEMAND is not set | ||
| 686 | # CONFIG_QLA3XXX is not set | 730 | # CONFIG_QLA3XXX is not set |
| 687 | # CONFIG_ATL1 is not set | 731 | # CONFIG_ATL1 is not set |
| 688 | # CONFIG_ATL1E is not set | 732 | # CONFIG_ATL1E is not set |
| 733 | # CONFIG_ATL1C is not set | ||
| 689 | # CONFIG_JME is not set | 734 | # CONFIG_JME is not set |
| 690 | CONFIG_NETDEV_10000=y | 735 | CONFIG_NETDEV_10000=y |
| 691 | # CONFIG_CHELSIO_T1 is not set | 736 | # CONFIG_CHELSIO_T1 is not set |
| @@ -695,6 +740,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 695 | # CONFIG_IXGBE is not set | 740 | # CONFIG_IXGBE is not set |
| 696 | # CONFIG_IXGB is not set | 741 | # CONFIG_IXGB is not set |
| 697 | # CONFIG_S2IO is not set | 742 | # CONFIG_S2IO is not set |
| 743 | # CONFIG_VXGE is not set | ||
| 698 | # CONFIG_MYRI10GE is not set | 744 | # CONFIG_MYRI10GE is not set |
| 699 | # CONFIG_NETXEN_NIC is not set | 745 | # CONFIG_NETXEN_NIC is not set |
| 700 | # CONFIG_NIU is not set | 746 | # CONFIG_NIU is not set |
| @@ -704,6 +750,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 704 | # CONFIG_BNX2X is not set | 750 | # CONFIG_BNX2X is not set |
| 705 | # CONFIG_QLGE is not set | 751 | # CONFIG_QLGE is not set |
| 706 | # CONFIG_SFC is not set | 752 | # CONFIG_SFC is not set |
| 753 | # CONFIG_BE2NET is not set | ||
| 707 | # CONFIG_TR is not set | 754 | # CONFIG_TR is not set |
| 708 | 755 | ||
| 709 | # | 756 | # |
| @@ -711,7 +758,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 711 | # | 758 | # |
| 712 | # CONFIG_WLAN_PRE80211 is not set | 759 | # CONFIG_WLAN_PRE80211 is not set |
| 713 | # CONFIG_WLAN_80211 is not set | 760 | # CONFIG_WLAN_80211 is not set |
| 714 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 715 | 761 | ||
| 716 | # | 762 | # |
| 717 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 763 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -806,8 +852,10 @@ CONFIG_SERIAL_8250_RSA=y | |||
| 806 | # CONFIG_SERIAL_UARTLITE is not set | 852 | # CONFIG_SERIAL_UARTLITE is not set |
| 807 | CONFIG_SERIAL_CORE=y | 853 | CONFIG_SERIAL_CORE=y |
| 808 | CONFIG_SERIAL_CORE_CONSOLE=y | 854 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 855 | # CONFIG_SERIAL_CPM is not set | ||
| 809 | # CONFIG_SERIAL_JSM is not set | 856 | # CONFIG_SERIAL_JSM is not set |
| 810 | # CONFIG_SERIAL_OF_PLATFORM is not set | 857 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 858 | CONFIG_SERIAL_QE=m | ||
| 811 | CONFIG_UNIX98_PTYS=y | 859 | CONFIG_UNIX98_PTYS=y |
| 812 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 860 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 813 | CONFIG_LEGACY_PTYS=y | 861 | CONFIG_LEGACY_PTYS=y |
| @@ -815,6 +863,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 815 | # CONFIG_HVC_UDBG is not set | 863 | # CONFIG_HVC_UDBG is not set |
| 816 | # CONFIG_IPMI_HANDLER is not set | 864 | # CONFIG_IPMI_HANDLER is not set |
| 817 | CONFIG_HW_RANDOM=y | 865 | CONFIG_HW_RANDOM=y |
| 866 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 818 | CONFIG_NVRAM=y | 867 | CONFIG_NVRAM=y |
| 819 | # CONFIG_R3964 is not set | 868 | # CONFIG_R3964 is not set |
| 820 | # CONFIG_APPLICOM is not set | 869 | # CONFIG_APPLICOM is not set |
| @@ -851,6 +900,8 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 851 | # | 900 | # |
| 852 | # I2C system bus drivers (mostly embedded / system-on-chip) | 901 | # I2C system bus drivers (mostly embedded / system-on-chip) |
| 853 | # | 902 | # |
| 903 | CONFIG_I2C_CPM=m | ||
| 904 | # CONFIG_I2C_GPIO is not set | ||
| 854 | CONFIG_I2C_MPC=y | 905 | CONFIG_I2C_MPC=y |
| 855 | # CONFIG_I2C_OCORES is not set | 906 | # CONFIG_I2C_OCORES is not set |
| 856 | # CONFIG_I2C_SIMTEC is not set | 907 | # CONFIG_I2C_SIMTEC is not set |
| @@ -877,12 +928,9 @@ CONFIG_I2C_MPC=y | |||
| 877 | # Miscellaneous I2C Chip support | 928 | # Miscellaneous I2C Chip support |
| 878 | # | 929 | # |
| 879 | # CONFIG_DS1682 is not set | 930 | # CONFIG_DS1682 is not set |
| 880 | # CONFIG_EEPROM_AT24 is not set | ||
| 881 | CONFIG_EEPROM_LEGACY=y | ||
| 882 | # CONFIG_SENSORS_PCF8574 is not set | 931 | # CONFIG_SENSORS_PCF8574 is not set |
| 883 | # CONFIG_PCF8575 is not set | 932 | # CONFIG_PCF8575 is not set |
| 884 | # CONFIG_SENSORS_PCA9539 is not set | 933 | # CONFIG_SENSORS_PCA9539 is not set |
| 885 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 886 | # CONFIG_SENSORS_MAX6875 is not set | 934 | # CONFIG_SENSORS_MAX6875 is not set |
| 887 | # CONFIG_SENSORS_TSL2550 is not set | 935 | # CONFIG_SENSORS_TSL2550 is not set |
| 888 | # CONFIG_I2C_DEBUG_CORE is not set | 936 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -891,7 +939,31 @@ CONFIG_EEPROM_LEGACY=y | |||
| 891 | # CONFIG_I2C_DEBUG_CHIP is not set | 939 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 892 | # CONFIG_SPI is not set | 940 | # CONFIG_SPI is not set |
| 893 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 941 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 894 | # CONFIG_GPIOLIB is not set | 942 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
| 943 | CONFIG_GPIOLIB=y | ||
| 944 | # CONFIG_DEBUG_GPIO is not set | ||
| 945 | # CONFIG_GPIO_SYSFS is not set | ||
| 946 | |||
| 947 | # | ||
| 948 | # Memory mapped GPIO expanders: | ||
| 949 | # | ||
| 950 | # CONFIG_GPIO_XILINX is not set | ||
| 951 | |||
| 952 | # | ||
| 953 | # I2C GPIO expanders: | ||
| 954 | # | ||
| 955 | # CONFIG_GPIO_MAX732X is not set | ||
| 956 | # CONFIG_GPIO_PCA953X is not set | ||
| 957 | # CONFIG_GPIO_PCF857X is not set | ||
| 958 | |||
| 959 | # | ||
| 960 | # PCI GPIO expanders: | ||
| 961 | # | ||
| 962 | # CONFIG_GPIO_BT8XX is not set | ||
| 963 | |||
| 964 | # | ||
| 965 | # SPI GPIO expanders: | ||
| 966 | # | ||
| 895 | # CONFIG_W1 is not set | 967 | # CONFIG_W1 is not set |
| 896 | # CONFIG_POWER_SUPPLY is not set | 968 | # CONFIG_POWER_SUPPLY is not set |
| 897 | # CONFIG_HWMON is not set | 969 | # CONFIG_HWMON is not set |
| @@ -911,6 +983,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 911 | # CONFIG_MFD_CORE is not set | 983 | # CONFIG_MFD_CORE is not set |
| 912 | # CONFIG_MFD_SM501 is not set | 984 | # CONFIG_MFD_SM501 is not set |
| 913 | # CONFIG_HTC_PASIC3 is not set | 985 | # CONFIG_HTC_PASIC3 is not set |
| 986 | # CONFIG_UCB1400_CORE is not set | ||
| 987 | # CONFIG_TPS65010 is not set | ||
| 914 | # CONFIG_TWL4030_CORE is not set | 988 | # CONFIG_TWL4030_CORE is not set |
| 915 | # CONFIG_MFD_TMIO is not set | 989 | # CONFIG_MFD_TMIO is not set |
| 916 | # CONFIG_PMIC_DA903X is not set | 990 | # CONFIG_PMIC_DA903X is not set |
| @@ -935,7 +1009,7 @@ CONFIG_VIDEO_MEDIA=m | |||
| 935 | # | 1009 | # |
| 936 | # CONFIG_MEDIA_ATTACH is not set | 1010 | # CONFIG_MEDIA_ATTACH is not set |
| 937 | CONFIG_MEDIA_TUNER=m | 1011 | CONFIG_MEDIA_TUNER=m |
| 938 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | 1012 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set |
| 939 | CONFIG_MEDIA_TUNER_SIMPLE=m | 1013 | CONFIG_MEDIA_TUNER_SIMPLE=m |
| 940 | CONFIG_MEDIA_TUNER_TDA8290=m | 1014 | CONFIG_MEDIA_TUNER_TDA8290=m |
| 941 | CONFIG_MEDIA_TUNER_TDA9887=m | 1015 | CONFIG_MEDIA_TUNER_TDA9887=m |
| @@ -944,6 +1018,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m | |||
| 944 | CONFIG_MEDIA_TUNER_MT20XX=m | 1018 | CONFIG_MEDIA_TUNER_MT20XX=m |
| 945 | CONFIG_MEDIA_TUNER_XC2028=m | 1019 | CONFIG_MEDIA_TUNER_XC2028=m |
| 946 | CONFIG_MEDIA_TUNER_XC5000=m | 1020 | CONFIG_MEDIA_TUNER_XC5000=m |
| 1021 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
| 947 | # CONFIG_DVB_DYNAMIC_MINORS is not set | 1022 | # CONFIG_DVB_DYNAMIC_MINORS is not set |
| 948 | CONFIG_DVB_CAPTURE_DRIVERS=y | 1023 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 949 | 1024 | ||
| @@ -983,103 +1058,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 983 | # | 1058 | # |
| 984 | # Supported DVB Frontends | 1059 | # Supported DVB Frontends |
| 985 | # | 1060 | # |
| 986 | |||
| 987 | # | ||
| 988 | # Customise DVB Frontends | ||
| 989 | # | ||
| 990 | # CONFIG_DVB_FE_CUSTOMISE is not set | 1061 | # CONFIG_DVB_FE_CUSTOMISE is not set |
| 991 | |||
| 992 | # | ||
| 993 | # Multistandard (satellite) frontends | ||
| 994 | # | ||
| 995 | # CONFIG_DVB_STB0899 is not set | ||
| 996 | # CONFIG_DVB_STB6100 is not set | ||
| 997 | |||
| 998 | # | ||
| 999 | # DVB-S (satellite) frontends | ||
| 1000 | # | ||
| 1001 | # CONFIG_DVB_CX24110 is not set | ||
| 1002 | # CONFIG_DVB_CX24123 is not set | ||
| 1003 | # CONFIG_DVB_MT312 is not set | ||
| 1004 | # CONFIG_DVB_S5H1420 is not set | ||
| 1005 | # CONFIG_DVB_STV0288 is not set | ||
| 1006 | # CONFIG_DVB_STB6000 is not set | ||
| 1007 | # CONFIG_DVB_STV0299 is not set | ||
| 1008 | # CONFIG_DVB_TDA8083 is not set | ||
| 1009 | # CONFIG_DVB_TDA10086 is not set | ||
| 1010 | # CONFIG_DVB_TDA8261 is not set | ||
| 1011 | # CONFIG_DVB_VES1X93 is not set | ||
| 1012 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 1013 | # CONFIG_DVB_TUNER_CX24113 is not set | ||
| 1014 | # CONFIG_DVB_TDA826X is not set | ||
| 1015 | # CONFIG_DVB_TUA6100 is not set | ||
| 1016 | # CONFIG_DVB_CX24116 is not set | ||
| 1017 | # CONFIG_DVB_SI21XX is not set | ||
| 1018 | |||
| 1019 | # | ||
| 1020 | # DVB-T (terrestrial) frontends | ||
| 1021 | # | ||
| 1022 | # CONFIG_DVB_SP8870 is not set | ||
| 1023 | # CONFIG_DVB_SP887X is not set | ||
| 1024 | # CONFIG_DVB_CX22700 is not set | ||
| 1025 | # CONFIG_DVB_CX22702 is not set | ||
| 1026 | # CONFIG_DVB_DRX397XD is not set | ||
| 1027 | # CONFIG_DVB_L64781 is not set | ||
| 1028 | # CONFIG_DVB_TDA1004X is not set | ||
| 1029 | # CONFIG_DVB_NXT6000 is not set | ||
| 1030 | # CONFIG_DVB_MT352 is not set | ||
| 1031 | # CONFIG_DVB_ZL10353 is not set | ||
| 1032 | # CONFIG_DVB_DIB3000MB is not set | ||
| 1033 | # CONFIG_DVB_DIB3000MC is not set | ||
| 1034 | # CONFIG_DVB_DIB7000M is not set | ||
| 1035 | # CONFIG_DVB_DIB7000P is not set | ||
| 1036 | # CONFIG_DVB_TDA10048 is not set | ||
| 1037 | |||
| 1038 | # | ||
| 1039 | # DVB-C (cable) frontends | ||
| 1040 | # | ||
| 1041 | # CONFIG_DVB_VES1820 is not set | ||
| 1042 | # CONFIG_DVB_TDA10021 is not set | ||
| 1043 | # CONFIG_DVB_TDA10023 is not set | ||
| 1044 | # CONFIG_DVB_STV0297 is not set | ||
| 1045 | |||
| 1046 | # | ||
| 1047 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
| 1048 | # | ||
| 1049 | # CONFIG_DVB_NXT200X is not set | ||
| 1050 | # CONFIG_DVB_OR51211 is not set | ||
| 1051 | # CONFIG_DVB_OR51132 is not set | ||
| 1052 | # CONFIG_DVB_BCM3510 is not set | ||
| 1053 | # CONFIG_DVB_LGDT330X is not set | ||
| 1054 | # CONFIG_DVB_LGDT3304 is not set | ||
| 1055 | # CONFIG_DVB_S5H1409 is not set | ||
| 1056 | # CONFIG_DVB_AU8522 is not set | ||
| 1057 | # CONFIG_DVB_S5H1411 is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # ISDB-T (terrestrial) frontends | ||
| 1061 | # | ||
| 1062 | # CONFIG_DVB_S921 is not set | ||
| 1063 | |||
| 1064 | # | ||
| 1065 | # Digital terrestrial only tuners/PLL | ||
| 1066 | # | ||
| 1067 | # CONFIG_DVB_PLL is not set | ||
| 1068 | # CONFIG_DVB_TUNER_DIB0070 is not set | ||
| 1069 | |||
| 1070 | # | ||
| 1071 | # SEC control devices for DVB-S | ||
| 1072 | # | ||
| 1073 | # CONFIG_DVB_LNBP21 is not set | ||
| 1074 | # CONFIG_DVB_ISL6405 is not set | ||
| 1075 | # CONFIG_DVB_ISL6421 is not set | ||
| 1076 | # CONFIG_DVB_LGS8GL5 is not set | ||
| 1077 | |||
| 1078 | # | ||
| 1079 | # Tools to develop new frontends | ||
| 1080 | # | ||
| 1081 | # CONFIG_DVB_DUMMY_FE is not set | ||
| 1082 | # CONFIG_DVB_AF9013 is not set | ||
| 1083 | CONFIG_DAB=y | 1062 | CONFIG_DAB=y |
| 1084 | # CONFIG_USB_DABUSB is not set | 1063 | # CONFIG_USB_DABUSB is not set |
| 1085 | 1064 | ||
| @@ -1159,6 +1138,8 @@ CONFIG_SND_PCI=y | |||
| 1159 | # CONFIG_SND_INDIGO is not set | 1138 | # CONFIG_SND_INDIGO is not set |
| 1160 | # CONFIG_SND_INDIGOIO is not set | 1139 | # CONFIG_SND_INDIGOIO is not set |
| 1161 | # CONFIG_SND_INDIGODJ is not set | 1140 | # CONFIG_SND_INDIGODJ is not set |
| 1141 | # CONFIG_SND_INDIGOIOX is not set | ||
| 1142 | # CONFIG_SND_INDIGODJX is not set | ||
| 1162 | # CONFIG_SND_EMU10K1 is not set | 1143 | # CONFIG_SND_EMU10K1 is not set |
| 1163 | # CONFIG_SND_EMU10K1X is not set | 1144 | # CONFIG_SND_EMU10K1X is not set |
| 1164 | # CONFIG_SND_ENS1370 is not set | 1145 | # CONFIG_SND_ENS1370 is not set |
| @@ -1213,15 +1194,17 @@ CONFIG_USB_HID=y | |||
| 1213 | # | 1194 | # |
| 1214 | # Special HID drivers | 1195 | # Special HID drivers |
| 1215 | # | 1196 | # |
| 1216 | CONFIG_HID_COMPAT=y | ||
| 1217 | CONFIG_HID_A4TECH=y | 1197 | CONFIG_HID_A4TECH=y |
| 1218 | CONFIG_HID_APPLE=y | 1198 | CONFIG_HID_APPLE=y |
| 1219 | CONFIG_HID_BELKIN=y | 1199 | CONFIG_HID_BELKIN=y |
| 1220 | CONFIG_HID_CHERRY=y | 1200 | CONFIG_HID_CHERRY=y |
| 1221 | CONFIG_HID_CHICONY=y | 1201 | CONFIG_HID_CHICONY=y |
| 1222 | CONFIG_HID_CYPRESS=y | 1202 | CONFIG_HID_CYPRESS=y |
| 1203 | # CONFIG_DRAGONRISE_FF is not set | ||
| 1223 | CONFIG_HID_EZKEY=y | 1204 | CONFIG_HID_EZKEY=y |
| 1205 | # CONFIG_HID_KYE is not set | ||
| 1224 | CONFIG_HID_GYRATION=y | 1206 | CONFIG_HID_GYRATION=y |
| 1207 | # CONFIG_HID_KENSINGTON is not set | ||
| 1225 | CONFIG_HID_LOGITECH=y | 1208 | CONFIG_HID_LOGITECH=y |
| 1226 | # CONFIG_LOGITECH_FF is not set | 1209 | # CONFIG_LOGITECH_FF is not set |
| 1227 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1210 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| @@ -1264,9 +1247,9 @@ CONFIG_USB_MON=y | |||
| 1264 | # | 1247 | # |
| 1265 | # CONFIG_USB_C67X00_HCD is not set | 1248 | # CONFIG_USB_C67X00_HCD is not set |
| 1266 | CONFIG_USB_EHCI_HCD=y | 1249 | CONFIG_USB_EHCI_HCD=y |
| 1267 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1250 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1268 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1251 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1269 | # CONFIG_USB_EHCI_FSL is not set | 1252 | CONFIG_USB_EHCI_FSL=y |
| 1270 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1253 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1271 | # CONFIG_USB_OXU210HP_HCD is not set | 1254 | # CONFIG_USB_OXU210HP_HCD is not set |
| 1272 | # CONFIG_USB_ISP116X_HCD is not set | 1255 | # CONFIG_USB_ISP116X_HCD is not set |
| @@ -1280,10 +1263,12 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | |||
| 1280 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1263 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
| 1281 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1264 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1282 | # CONFIG_USB_UHCI_HCD is not set | 1265 | # CONFIG_USB_UHCI_HCD is not set |
| 1266 | # CONFIG_USB_FHCI_HCD is not set | ||
| 1283 | # CONFIG_USB_SL811_HCD is not set | 1267 | # CONFIG_USB_SL811_HCD is not set |
| 1284 | # CONFIG_USB_R8A66597_HCD is not set | 1268 | # CONFIG_USB_R8A66597_HCD is not set |
| 1285 | # CONFIG_USB_WHCI_HCD is not set | 1269 | # CONFIG_USB_WHCI_HCD is not set |
| 1286 | # CONFIG_USB_HWA_HCD is not set | 1270 | # CONFIG_USB_HWA_HCD is not set |
| 1271 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 1287 | 1272 | ||
| 1288 | # | 1273 | # |
| 1289 | # USB Device Class drivers | 1274 | # USB Device Class drivers |
| @@ -1294,11 +1279,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1294 | # CONFIG_USB_TMC is not set | 1279 | # CONFIG_USB_TMC is not set |
| 1295 | 1280 | ||
| 1296 | # | 1281 | # |
| 1297 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1282 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1298 | # | 1283 | # |
| 1299 | 1284 | ||
| 1300 | # | 1285 | # |
| 1301 | # see USB_STORAGE Help for more information | 1286 | # also be needed; see USB_STORAGE Help for more info |
| 1302 | # | 1287 | # |
| 1303 | CONFIG_USB_STORAGE=y | 1288 | CONFIG_USB_STORAGE=y |
| 1304 | # CONFIG_USB_STORAGE_DEBUG is not set | 1289 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1340,7 +1325,6 @@ CONFIG_USB_STORAGE=y | |||
| 1340 | # CONFIG_USB_LED is not set | 1325 | # CONFIG_USB_LED is not set |
| 1341 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1326 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1342 | # CONFIG_USB_CYTHERM is not set | 1327 | # CONFIG_USB_CYTHERM is not set |
| 1343 | # CONFIG_USB_PHIDGET is not set | ||
| 1344 | # CONFIG_USB_IDMOUSE is not set | 1328 | # CONFIG_USB_IDMOUSE is not set |
| 1345 | # CONFIG_USB_FTDI_ELAN is not set | 1329 | # CONFIG_USB_FTDI_ELAN is not set |
| 1346 | # CONFIG_USB_APPLEDISPLAY is not set | 1330 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1356,13 +1340,24 @@ CONFIG_USB_STORAGE=y | |||
| 1356 | # | 1340 | # |
| 1357 | # OTG and related infrastructure | 1341 | # OTG and related infrastructure |
| 1358 | # | 1342 | # |
| 1343 | # CONFIG_USB_GPIO_VBUS is not set | ||
| 1344 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1359 | # CONFIG_UWB is not set | 1345 | # CONFIG_UWB is not set |
| 1360 | # CONFIG_MMC is not set | 1346 | # CONFIG_MMC is not set |
| 1361 | # CONFIG_MEMSTICK is not set | 1347 | # CONFIG_MEMSTICK is not set |
| 1362 | # CONFIG_NEW_LEDS is not set | 1348 | # CONFIG_NEW_LEDS is not set |
| 1363 | # CONFIG_ACCESSIBILITY is not set | 1349 | # CONFIG_ACCESSIBILITY is not set |
| 1364 | # CONFIG_INFINIBAND is not set | 1350 | # CONFIG_INFINIBAND is not set |
| 1365 | # CONFIG_EDAC is not set | 1351 | CONFIG_EDAC=y |
| 1352 | |||
| 1353 | # | ||
| 1354 | # Reporting subsystems | ||
| 1355 | # | ||
| 1356 | # CONFIG_EDAC_DEBUG is not set | ||
| 1357 | CONFIG_EDAC_MM_EDAC=y | ||
| 1358 | CONFIG_EDAC_MPC85XX=y | ||
| 1359 | # CONFIG_EDAC_AMD8131 is not set | ||
| 1360 | # CONFIG_EDAC_AMD8111 is not set | ||
| 1366 | CONFIG_RTC_LIB=y | 1361 | CONFIG_RTC_LIB=y |
| 1367 | CONFIG_RTC_CLASS=y | 1362 | CONFIG_RTC_CLASS=y |
| 1368 | CONFIG_RTC_HCTOSYS=y | 1363 | CONFIG_RTC_HCTOSYS=y |
| @@ -1417,8 +1412,22 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1417 | # | 1412 | # |
| 1418 | # on-CPU RTC drivers | 1413 | # on-CPU RTC drivers |
| 1419 | # | 1414 | # |
| 1420 | # CONFIG_RTC_DRV_PPC is not set | 1415 | # CONFIG_RTC_DRV_GENERIC is not set |
| 1421 | # CONFIG_DMADEVICES is not set | 1416 | CONFIG_DMADEVICES=y |
| 1417 | |||
| 1418 | # | ||
| 1419 | # DMA Devices | ||
| 1420 | # | ||
| 1421 | CONFIG_FSL_DMA=y | ||
| 1422 | CONFIG_DMA_ENGINE=y | ||
| 1423 | |||
| 1424 | # | ||
| 1425 | # DMA Clients | ||
| 1426 | # | ||
| 1427 | # CONFIG_NET_DMA is not set | ||
| 1428 | # CONFIG_ASYNC_TX_DMA is not set | ||
| 1429 | # CONFIG_DMATEST is not set | ||
| 1430 | # CONFIG_AUXDISPLAY is not set | ||
| 1422 | # CONFIG_UIO is not set | 1431 | # CONFIG_UIO is not set |
| 1423 | # CONFIG_STAGING is not set | 1432 | # CONFIG_STAGING is not set |
| 1424 | 1433 | ||
| @@ -1429,11 +1438,13 @@ CONFIG_EXT2_FS=y | |||
| 1429 | # CONFIG_EXT2_FS_XATTR is not set | 1438 | # CONFIG_EXT2_FS_XATTR is not set |
| 1430 | # CONFIG_EXT2_FS_XIP is not set | 1439 | # CONFIG_EXT2_FS_XIP is not set |
| 1431 | CONFIG_EXT3_FS=y | 1440 | CONFIG_EXT3_FS=y |
| 1441 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1432 | CONFIG_EXT3_FS_XATTR=y | 1442 | CONFIG_EXT3_FS_XATTR=y |
| 1433 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1443 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1434 | # CONFIG_EXT3_FS_SECURITY is not set | 1444 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1435 | # CONFIG_EXT4_FS is not set | 1445 | # CONFIG_EXT4_FS is not set |
| 1436 | CONFIG_JBD=y | 1446 | CONFIG_JBD=y |
| 1447 | # CONFIG_JBD_DEBUG is not set | ||
| 1437 | CONFIG_FS_MBCACHE=y | 1448 | CONFIG_FS_MBCACHE=y |
| 1438 | # CONFIG_REISERFS_FS is not set | 1449 | # CONFIG_REISERFS_FS is not set |
| 1439 | # CONFIG_JFS_FS is not set | 1450 | # CONFIG_JFS_FS is not set |
| @@ -1452,6 +1463,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1452 | # CONFIG_FUSE_FS is not set | 1463 | # CONFIG_FUSE_FS is not set |
| 1453 | 1464 | ||
| 1454 | # | 1465 | # |
| 1466 | # Caches | ||
| 1467 | # | ||
| 1468 | # CONFIG_FSCACHE is not set | ||
| 1469 | |||
| 1470 | # | ||
| 1455 | # CD-ROM/DVD Filesystems | 1471 | # CD-ROM/DVD Filesystems |
| 1456 | # | 1472 | # |
| 1457 | CONFIG_ISO9660_FS=m | 1473 | CONFIG_ISO9660_FS=m |
| @@ -1506,6 +1522,7 @@ CONFIG_SYSV_FS=m | |||
| 1506 | CONFIG_UFS_FS=m | 1522 | CONFIG_UFS_FS=m |
| 1507 | # CONFIG_UFS_FS_WRITE is not set | 1523 | # CONFIG_UFS_FS_WRITE is not set |
| 1508 | # CONFIG_UFS_DEBUG is not set | 1524 | # CONFIG_UFS_DEBUG is not set |
| 1525 | # CONFIG_NILFS2_FS is not set | ||
| 1509 | CONFIG_NETWORK_FILESYSTEMS=y | 1526 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1510 | CONFIG_NFS_FS=y | 1527 | CONFIG_NFS_FS=y |
| 1511 | CONFIG_NFS_V3=y | 1528 | CONFIG_NFS_V3=y |
| @@ -1521,7 +1538,6 @@ CONFIG_EXPORTFS=y | |||
| 1521 | CONFIG_NFS_COMMON=y | 1538 | CONFIG_NFS_COMMON=y |
| 1522 | CONFIG_SUNRPC=y | 1539 | CONFIG_SUNRPC=y |
| 1523 | CONFIG_SUNRPC_GSS=y | 1540 | CONFIG_SUNRPC_GSS=y |
| 1524 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 1525 | CONFIG_RPCSEC_GSS_KRB5=y | 1541 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1526 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1542 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1527 | # CONFIG_SMB_FS is not set | 1543 | # CONFIG_SMB_FS is not set |
| @@ -1592,6 +1608,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1592 | # CONFIG_NLS_KOI8_U is not set | 1608 | # CONFIG_NLS_KOI8_U is not set |
| 1593 | CONFIG_NLS_UTF8=m | 1609 | CONFIG_NLS_UTF8=m |
| 1594 | # CONFIG_DLM is not set | 1610 | # CONFIG_DLM is not set |
| 1611 | CONFIG_UCC_SLOW=y | ||
| 1612 | CONFIG_UCC_FAST=y | ||
| 1613 | CONFIG_UCC=y | ||
| 1614 | # CONFIG_BINARY_PRINTF is not set | ||
| 1595 | 1615 | ||
| 1596 | # | 1616 | # |
| 1597 | # Library routines | 1617 | # Library routines |
| @@ -1606,11 +1626,12 @@ CONFIG_CRC32=y | |||
| 1606 | # CONFIG_CRC7 is not set | 1626 | # CONFIG_CRC7 is not set |
| 1607 | CONFIG_LIBCRC32C=m | 1627 | CONFIG_LIBCRC32C=m |
| 1608 | CONFIG_ZLIB_INFLATE=y | 1628 | CONFIG_ZLIB_INFLATE=y |
| 1609 | CONFIG_PLIST=y | 1629 | CONFIG_DECOMPRESS_GZIP=y |
| 1610 | CONFIG_HAS_IOMEM=y | 1630 | CONFIG_HAS_IOMEM=y |
| 1611 | CONFIG_HAS_IOPORT=y | 1631 | CONFIG_HAS_IOPORT=y |
| 1612 | CONFIG_HAS_DMA=y | 1632 | CONFIG_HAS_DMA=y |
| 1613 | CONFIG_HAVE_LMB=y | 1633 | CONFIG_HAVE_LMB=y |
| 1634 | CONFIG_NLATTR=y | ||
| 1614 | 1635 | ||
| 1615 | # | 1636 | # |
| 1616 | # Kernel hacking | 1637 | # Kernel hacking |
| @@ -1621,13 +1642,16 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1621 | CONFIG_FRAME_WARN=1024 | 1642 | CONFIG_FRAME_WARN=1024 |
| 1622 | # CONFIG_MAGIC_SYSRQ is not set | 1643 | # CONFIG_MAGIC_SYSRQ is not set |
| 1623 | # CONFIG_UNUSED_SYMBOLS is not set | 1644 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1624 | # CONFIG_DEBUG_FS is not set | 1645 | CONFIG_DEBUG_FS=y |
| 1625 | # CONFIG_HEADERS_CHECK is not set | 1646 | # CONFIG_HEADERS_CHECK is not set |
| 1626 | CONFIG_DEBUG_KERNEL=y | 1647 | CONFIG_DEBUG_KERNEL=y |
| 1627 | # CONFIG_DEBUG_SHIRQ is not set | 1648 | # CONFIG_DEBUG_SHIRQ is not set |
| 1628 | CONFIG_DETECT_SOFTLOCKUP=y | 1649 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1629 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1650 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1630 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1651 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1652 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1653 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1654 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1631 | CONFIG_SCHED_DEBUG=y | 1655 | CONFIG_SCHED_DEBUG=y |
| 1632 | # CONFIG_SCHEDSTATS is not set | 1656 | # CONFIG_SCHEDSTATS is not set |
| 1633 | # CONFIG_TIMER_STATS is not set | 1657 | # CONFIG_TIMER_STATS is not set |
| @@ -1658,9 +1682,12 @@ CONFIG_DEBUG_INFO=y | |||
| 1658 | # CONFIG_FAULT_INJECTION is not set | 1682 | # CONFIG_FAULT_INJECTION is not set |
| 1659 | # CONFIG_LATENCYTOP is not set | 1683 | # CONFIG_LATENCYTOP is not set |
| 1660 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1684 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1685 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1661 | CONFIG_HAVE_FUNCTION_TRACER=y | 1686 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1687 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
| 1662 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1688 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
| 1663 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1689 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
| 1690 | CONFIG_TRACING_SUPPORT=y | ||
| 1664 | 1691 | ||
| 1665 | # | 1692 | # |
| 1666 | # Tracers | 1693 | # Tracers |
| @@ -1668,22 +1695,26 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | |||
| 1668 | # CONFIG_FUNCTION_TRACER is not set | 1695 | # CONFIG_FUNCTION_TRACER is not set |
| 1669 | # CONFIG_SCHED_TRACER is not set | 1696 | # CONFIG_SCHED_TRACER is not set |
| 1670 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1697 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1698 | # CONFIG_EVENT_TRACER is not set | ||
| 1671 | # CONFIG_BOOT_TRACER is not set | 1699 | # CONFIG_BOOT_TRACER is not set |
| 1672 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1700 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1673 | # CONFIG_STACK_TRACER is not set | 1701 | # CONFIG_STACK_TRACER is not set |
| 1674 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1702 | # CONFIG_KMEMTRACE is not set |
| 1703 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1704 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1705 | # CONFIG_DYNAMIC_DEBUG is not set | ||
| 1675 | # CONFIG_SAMPLES is not set | 1706 | # CONFIG_SAMPLES is not set |
| 1676 | CONFIG_HAVE_ARCH_KGDB=y | 1707 | CONFIG_HAVE_ARCH_KGDB=y |
| 1677 | # CONFIG_KGDB is not set | 1708 | # CONFIG_KGDB is not set |
| 1678 | CONFIG_PRINT_STACK_DEPTH=64 | 1709 | CONFIG_PRINT_STACK_DEPTH=64 |
| 1679 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1710 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1680 | # CONFIG_DEBUG_STACK_USAGE is not set | 1711 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1681 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1682 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1712 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1683 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1713 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
| 1684 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1714 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
| 1685 | # CONFIG_XMON is not set | 1715 | # CONFIG_XMON is not set |
| 1686 | # CONFIG_IRQSTACKS is not set | 1716 | # CONFIG_IRQSTACKS is not set |
| 1717 | CONFIG_VIRQ_DEBUG=y | ||
| 1687 | # CONFIG_BDI_SWITCH is not set | 1718 | # CONFIG_BDI_SWITCH is not set |
| 1688 | # CONFIG_PPC_EARLY_DEBUG is not set | 1719 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1689 | 1720 | ||
| @@ -1709,10 +1740,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1709 | CONFIG_CRYPTO_HASH=y | 1740 | CONFIG_CRYPTO_HASH=y |
| 1710 | CONFIG_CRYPTO_HASH2=y | 1741 | CONFIG_CRYPTO_HASH2=y |
| 1711 | CONFIG_CRYPTO_RNG2=y | 1742 | CONFIG_CRYPTO_RNG2=y |
| 1743 | CONFIG_CRYPTO_PCOMP=y | ||
| 1712 | CONFIG_CRYPTO_MANAGER=y | 1744 | CONFIG_CRYPTO_MANAGER=y |
| 1713 | CONFIG_CRYPTO_MANAGER2=y | 1745 | CONFIG_CRYPTO_MANAGER2=y |
| 1714 | # CONFIG_CRYPTO_GF128MUL is not set | 1746 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1715 | # CONFIG_CRYPTO_NULL is not set | 1747 | # CONFIG_CRYPTO_NULL is not set |
| 1748 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1716 | # CONFIG_CRYPTO_CRYPTD is not set | 1749 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1717 | CONFIG_CRYPTO_AUTHENC=y | 1750 | CONFIG_CRYPTO_AUTHENC=y |
| 1718 | # CONFIG_CRYPTO_TEST is not set | 1751 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1781,6 +1814,7 @@ CONFIG_CRYPTO_DES=y | |||
| 1781 | # Compression | 1814 | # Compression |
| 1782 | # | 1815 | # |
| 1783 | # CONFIG_CRYPTO_DEFLATE is not set | 1816 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1817 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1784 | # CONFIG_CRYPTO_LZO is not set | 1818 | # CONFIG_CRYPTO_LZO is not set |
| 1785 | 1819 | ||
| 1786 | # | 1820 | # |
| @@ -1790,5 +1824,6 @@ CONFIG_CRYPTO_DES=y | |||
| 1790 | CONFIG_CRYPTO_HW=y | 1824 | CONFIG_CRYPTO_HW=y |
| 1791 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1825 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1792 | CONFIG_CRYPTO_DEV_TALITOS=y | 1826 | CONFIG_CRYPTO_DEV_TALITOS=y |
| 1793 | # CONFIG_PPC_CLOCK is not set | 1827 | CONFIG_PPC_CLOCK=y |
| 1828 | CONFIG_PPC_LIB_RHEAP=y | ||
| 1794 | # CONFIG_VIRTUALIZATION is not set | 1829 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 1a856b15226..087c22f1d36 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h | |||
| @@ -258,7 +258,8 @@ do { \ | |||
| 258 | # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \ | 258 | # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \ |
| 259 | (exec_stk != EXSTACK_DISABLE_X) : 0) | 259 | (exec_stk != EXSTACK_DISABLE_X) : 0) |
| 260 | #else | 260 | #else |
| 261 | # define SET_PERSONALITY(ex) set_personality(PER_LINUX) | 261 | # define SET_PERSONALITY(ex) \ |
| 262 | set_personality(PER_LINUX | (current->personality & (~PER_MASK))) | ||
| 262 | #endif /* __powerpc64__ */ | 263 | #endif /* __powerpc64__ */ |
| 263 | 264 | ||
| 264 | extern int dcache_bsize; | 265 | extern int dcache_bsize; |
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index 8f0856f312d..8362620c9e6 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c | |||
| @@ -971,7 +971,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq | |||
| 971 | struct device_node *p; | 971 | struct device_node *p; |
| 972 | const u32 *intspec, *tmp, *addr; | 972 | const u32 *intspec, *tmp, *addr; |
| 973 | u32 intsize, intlen; | 973 | u32 intsize, intlen; |
| 974 | int res; | 974 | int res = -EINVAL; |
| 975 | 975 | ||
| 976 | DBG("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index); | 976 | DBG("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index); |
| 977 | 977 | ||
| @@ -995,21 +995,20 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq | |||
| 995 | 995 | ||
| 996 | /* Get size of interrupt specifier */ | 996 | /* Get size of interrupt specifier */ |
| 997 | tmp = of_get_property(p, "#interrupt-cells", NULL); | 997 | tmp = of_get_property(p, "#interrupt-cells", NULL); |
| 998 | if (tmp == NULL) { | 998 | if (tmp == NULL) |
| 999 | of_node_put(p); | 999 | goto out; |
| 1000 | return -EINVAL; | ||
| 1001 | } | ||
| 1002 | intsize = *tmp; | 1000 | intsize = *tmp; |
| 1003 | 1001 | ||
| 1004 | DBG(" intsize=%d intlen=%d\n", intsize, intlen); | 1002 | DBG(" intsize=%d intlen=%d\n", intsize, intlen); |
| 1005 | 1003 | ||
| 1006 | /* Check index */ | 1004 | /* Check index */ |
| 1007 | if ((index + 1) * intsize > intlen) | 1005 | if ((index + 1) * intsize > intlen) |
| 1008 | return -EINVAL; | 1006 | goto out; |
| 1009 | 1007 | ||
| 1010 | /* Get new specifier and map it */ | 1008 | /* Get new specifier and map it */ |
| 1011 | res = of_irq_map_raw(p, intspec + index * intsize, intsize, | 1009 | res = of_irq_map_raw(p, intspec + index * intsize, intsize, |
| 1012 | addr, out_irq); | 1010 | addr, out_irq); |
| 1011 | out: | ||
| 1013 | of_node_put(p); | 1012 | of_node_put(p); |
| 1014 | return res; | 1013 | return res; |
| 1015 | } | 1014 | } |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index db556d25c3a..1ade7eb6ae0 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
| @@ -753,7 +753,7 @@ void __init early_init_mmu(void) | |||
| 753 | } | 753 | } |
| 754 | 754 | ||
| 755 | #ifdef CONFIG_SMP | 755 | #ifdef CONFIG_SMP |
| 756 | void __init early_init_mmu_secondary(void) | 756 | void __cpuinit early_init_mmu_secondary(void) |
| 757 | { | 757 | { |
| 758 | /* Initialize hash table for that CPU */ | 758 | /* Initialize hash table for that CPU */ |
| 759 | if (!firmware_has_feature(FW_FEATURE_LPAR)) | 759 | if (!firmware_has_feature(FW_FEATURE_LPAR)) |
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c index 1db6b9e037f..65a35f38e06 100644 --- a/arch/powerpc/platforms/fsl_uli1575.c +++ b/arch/powerpc/platforms/fsl_uli1575.c | |||
| @@ -275,11 +275,6 @@ static void __devinit hpcd_quirk_uli5288(struct pci_dev *dev) | |||
| 275 | if (!machine_is(mpc86xx_hpcd)) | 275 | if (!machine_is(mpc86xx_hpcd)) |
| 276 | return; | 276 | return; |
| 277 | 277 | ||
| 278 | /* Interrupt Disable, Needed when SATA disabled */ | ||
| 279 | pci_read_config_word(dev, PCI_COMMAND, &temp); | ||
| 280 | temp |= 1<<10; | ||
| 281 | pci_write_config_word(dev, PCI_COMMAND, temp); | ||
| 282 | |||
| 283 | pci_read_config_byte(dev, 0x83, &c); | 278 | pci_read_config_byte(dev, 0x83, &c); |
| 284 | c |= 0x80; | 279 | c |= 0x80; |
| 285 | pci_write_config_byte(dev, 0x83, c); | 280 | pci_write_config_byte(dev, 0x83, c); |
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index c64fb5bfb37..153051eb6d9 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c | |||
| @@ -44,10 +44,6 @@ | |||
| 44 | 44 | ||
| 45 | #include "pasemi.h" | 45 | #include "pasemi.h" |
| 46 | 46 | ||
| 47 | #if !defined(CONFIG_SMP) | ||
| 48 | static void smp_send_stop(void) {} | ||
| 49 | #endif | ||
| 50 | |||
| 51 | /* SDC reset register, must be pre-mapped at reset time */ | 47 | /* SDC reset register, must be pre-mapped at reset time */ |
| 52 | static void __iomem *reset_reg; | 48 | static void __iomem *reset_reg; |
| 53 | 49 | ||
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c index 86e392b1b04..cf1cd0f8c18 100644 --- a/arch/powerpc/platforms/ps3/os-area.c +++ b/arch/powerpc/platforms/ps3/os-area.c | |||
| @@ -578,7 +578,7 @@ static void os_area_db_init(struct os_area_db *db) | |||
| 578 | * | 578 | * |
| 579 | */ | 579 | */ |
| 580 | 580 | ||
| 581 | static void update_flash_db(void) | 581 | static void __maybe_unused update_flash_db(void) |
| 582 | { | 582 | { |
| 583 | int result; | 583 | int result; |
| 584 | int file; | 584 | int file; |
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index a0fa4ebb39c..abdb124e1e2 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/device.h> | ||
| 21 | #include <linux/rio.h> | 22 | #include <linux/rio.h> |
| 22 | #include <linux/rio_drv.h> | 23 | #include <linux/rio_drv.h> |
| 23 | #include <linux/of_platform.h> | 24 | #include <linux/of_platform.h> |
| @@ -159,6 +160,7 @@ struct rio_msg_rx_ring { | |||
| 159 | }; | 160 | }; |
| 160 | 161 | ||
| 161 | struct rio_priv { | 162 | struct rio_priv { |
| 163 | struct device *dev; | ||
| 162 | void __iomem *regs_win; | 164 | void __iomem *regs_win; |
| 163 | struct rio_atmu_regs __iomem *atmu_regs; | 165 | struct rio_atmu_regs __iomem *atmu_regs; |
| 164 | struct rio_atmu_regs __iomem *maint_atmu_regs; | 166 | struct rio_atmu_regs __iomem *maint_atmu_regs; |
| @@ -484,13 +486,13 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr | |||
| 484 | 486 | ||
| 485 | for (i = 0; i < priv->msg_tx_ring.size; i++) { | 487 | for (i = 0; i < priv->msg_tx_ring.size; i++) { |
| 486 | priv->msg_tx_ring.virt_buffer[i] = | 488 | priv->msg_tx_ring.virt_buffer[i] = |
| 487 | dma_alloc_coherent(NULL, RIO_MSG_BUFFER_SIZE, | 489 | dma_alloc_coherent(priv->dev, RIO_MSG_BUFFER_SIZE, |
| 488 | &priv->msg_tx_ring.phys_buffer[i], GFP_KERNEL); | 490 | &priv->msg_tx_ring.phys_buffer[i], GFP_KERNEL); |
| 489 | if (!priv->msg_tx_ring.virt_buffer[i]) { | 491 | if (!priv->msg_tx_ring.virt_buffer[i]) { |
| 490 | rc = -ENOMEM; | 492 | rc = -ENOMEM; |
| 491 | for (j = 0; j < priv->msg_tx_ring.size; j++) | 493 | for (j = 0; j < priv->msg_tx_ring.size; j++) |
| 492 | if (priv->msg_tx_ring.virt_buffer[j]) | 494 | if (priv->msg_tx_ring.virt_buffer[j]) |
| 493 | dma_free_coherent(NULL, | 495 | dma_free_coherent(priv->dev, |
| 494 | RIO_MSG_BUFFER_SIZE, | 496 | RIO_MSG_BUFFER_SIZE, |
| 495 | priv->msg_tx_ring. | 497 | priv->msg_tx_ring. |
| 496 | virt_buffer[j], | 498 | virt_buffer[j], |
| @@ -501,7 +503,7 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr | |||
| 501 | } | 503 | } |
| 502 | 504 | ||
| 503 | /* Initialize outbound message descriptor ring */ | 505 | /* Initialize outbound message descriptor ring */ |
| 504 | priv->msg_tx_ring.virt = dma_alloc_coherent(NULL, | 506 | priv->msg_tx_ring.virt = dma_alloc_coherent(priv->dev, |
| 505 | priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, | 507 | priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, |
| 506 | &priv->msg_tx_ring.phys, GFP_KERNEL); | 508 | &priv->msg_tx_ring.phys, GFP_KERNEL); |
| 507 | if (!priv->msg_tx_ring.virt) { | 509 | if (!priv->msg_tx_ring.virt) { |
| @@ -549,12 +551,13 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr | |||
| 549 | return rc; | 551 | return rc; |
| 550 | 552 | ||
| 551 | out_irq: | 553 | out_irq: |
| 552 | dma_free_coherent(NULL, priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, | 554 | dma_free_coherent(priv->dev, |
| 555 | priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, | ||
| 553 | priv->msg_tx_ring.virt, priv->msg_tx_ring.phys); | 556 | priv->msg_tx_ring.virt, priv->msg_tx_ring.phys); |
| 554 | 557 | ||
| 555 | out_dma: | 558 | out_dma: |
| 556 | for (i = 0; i < priv->msg_tx_ring.size; i++) | 559 | for (i = 0; i < priv->msg_tx_ring.size; i++) |
| 557 | dma_free_coherent(NULL, RIO_MSG_BUFFER_SIZE, | 560 | dma_free_coherent(priv->dev, RIO_MSG_BUFFER_SIZE, |
| 558 | priv->msg_tx_ring.virt_buffer[i], | 561 | priv->msg_tx_ring.virt_buffer[i], |
| 559 | priv->msg_tx_ring.phys_buffer[i]); | 562 | priv->msg_tx_ring.phys_buffer[i]); |
| 560 | 563 | ||
| @@ -576,7 +579,8 @@ void rio_close_outb_mbox(struct rio_mport *mport, int mbox) | |||
| 576 | out_be32(&priv->msg_regs->omr, 0); | 579 | out_be32(&priv->msg_regs->omr, 0); |
| 577 | 580 | ||
| 578 | /* Free ring */ | 581 | /* Free ring */ |
| 579 | dma_free_coherent(NULL, priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, | 582 | dma_free_coherent(priv->dev, |
| 583 | priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE, | ||
| 580 | priv->msg_tx_ring.virt, priv->msg_tx_ring.phys); | 584 | priv->msg_tx_ring.virt, priv->msg_tx_ring.phys); |
| 581 | 585 | ||
| 582 | /* Free interrupt */ | 586 | /* Free interrupt */ |
| @@ -654,7 +658,7 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri | |||
| 654 | priv->msg_rx_ring.virt_buffer[i] = NULL; | 658 | priv->msg_rx_ring.virt_buffer[i] = NULL; |
| 655 | 659 | ||
| 656 | /* Initialize inbound message ring */ | 660 | /* Initialize inbound message ring */ |
| 657 | priv->msg_rx_ring.virt = dma_alloc_coherent(NULL, | 661 | priv->msg_rx_ring.virt = dma_alloc_coherent(priv->dev, |
| 658 | priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE, | 662 | priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE, |
| 659 | &priv->msg_rx_ring.phys, GFP_KERNEL); | 663 | &priv->msg_rx_ring.phys, GFP_KERNEL); |
| 660 | if (!priv->msg_rx_ring.virt) { | 664 | if (!priv->msg_rx_ring.virt) { |
| @@ -673,7 +677,7 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri | |||
| 673 | rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0, | 677 | rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0, |
| 674 | "msg_rx", (void *)mport); | 678 | "msg_rx", (void *)mport); |
| 675 | if (rc < 0) { | 679 | if (rc < 0) { |
| 676 | dma_free_coherent(NULL, RIO_MSG_BUFFER_SIZE, | 680 | dma_free_coherent(priv->dev, RIO_MSG_BUFFER_SIZE, |
| 677 | priv->msg_tx_ring.virt_buffer[i], | 681 | priv->msg_tx_ring.virt_buffer[i], |
| 678 | priv->msg_tx_ring.phys_buffer[i]); | 682 | priv->msg_tx_ring.phys_buffer[i]); |
| 679 | goto out; | 683 | goto out; |
| @@ -713,7 +717,7 @@ void rio_close_inb_mbox(struct rio_mport *mport, int mbox) | |||
| 713 | out_be32(&priv->msg_regs->imr, 0); | 717 | out_be32(&priv->msg_regs->imr, 0); |
| 714 | 718 | ||
| 715 | /* Free ring */ | 719 | /* Free ring */ |
| 716 | dma_free_coherent(NULL, priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE, | 720 | dma_free_coherent(priv->dev, priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE, |
| 717 | priv->msg_rx_ring.virt, priv->msg_rx_ring.phys); | 721 | priv->msg_rx_ring.virt, priv->msg_rx_ring.phys); |
| 718 | 722 | ||
| 719 | /* Free interrupt */ | 723 | /* Free interrupt */ |
| @@ -890,7 +894,7 @@ static int fsl_rio_doorbell_init(struct rio_mport *mport) | |||
| 890 | } | 894 | } |
| 891 | 895 | ||
| 892 | /* Initialize inbound doorbells */ | 896 | /* Initialize inbound doorbells */ |
| 893 | priv->dbell_ring.virt = dma_alloc_coherent(NULL, 512 * | 897 | priv->dbell_ring.virt = dma_alloc_coherent(priv->dev, 512 * |
| 894 | DOORBELL_MESSAGE_SIZE, &priv->dbell_ring.phys, GFP_KERNEL); | 898 | DOORBELL_MESSAGE_SIZE, &priv->dbell_ring.phys, GFP_KERNEL); |
| 895 | if (!priv->dbell_ring.virt) { | 899 | if (!priv->dbell_ring.virt) { |
| 896 | printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n"); | 900 | printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n"); |
| @@ -911,7 +915,7 @@ static int fsl_rio_doorbell_init(struct rio_mport *mport) | |||
| 911 | "dbell_rx", (void *)mport); | 915 | "dbell_rx", (void *)mport); |
| 912 | if (rc < 0) { | 916 | if (rc < 0) { |
| 913 | iounmap(priv->dbell_win); | 917 | iounmap(priv->dbell_win); |
| 914 | dma_free_coherent(NULL, 512 * DOORBELL_MESSAGE_SIZE, | 918 | dma_free_coherent(priv->dev, 512 * DOORBELL_MESSAGE_SIZE, |
| 915 | priv->dbell_ring.virt, priv->dbell_ring.phys); | 919 | priv->dbell_ring.virt, priv->dbell_ring.phys); |
| 916 | printk(KERN_ERR | 920 | printk(KERN_ERR |
| 917 | "MPC85xx RIO: unable to request inbound doorbell irq"); | 921 | "MPC85xx RIO: unable to request inbound doorbell irq"); |
| @@ -1087,6 +1091,8 @@ int fsl_rio_setup(struct of_device *dev) | |||
| 1087 | rio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0); | 1091 | rio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0); |
| 1088 | strcpy(port->name, "RIO0 mport"); | 1092 | strcpy(port->name, "RIO0 mport"); |
| 1089 | 1093 | ||
| 1094 | priv->dev = &dev->dev; | ||
| 1095 | |||
| 1090 | port->ops = ops; | 1096 | port->ops = ops; |
| 1091 | port->host_deviceid = fsl_rio_get_hdid(port->id); | 1097 | port->host_deviceid = fsl_rio_get_hdid(port->id); |
| 1092 | 1098 | ||
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index aeb3cff95f6..1dfc7100c7e 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
| @@ -98,7 +98,7 @@ static DECLARE_WORK(appldata_work, appldata_work_fn); | |||
| 98 | /* | 98 | /* |
| 99 | * Ops list | 99 | * Ops list |
| 100 | */ | 100 | */ |
| 101 | static DEFINE_SPINLOCK(appldata_ops_lock); | 101 | static DEFINE_MUTEX(appldata_ops_mutex); |
| 102 | static LIST_HEAD(appldata_ops_list); | 102 | static LIST_HEAD(appldata_ops_list); |
| 103 | 103 | ||
| 104 | 104 | ||
| @@ -129,14 +129,14 @@ static void appldata_work_fn(struct work_struct *work) | |||
| 129 | 129 | ||
| 130 | i = 0; | 130 | i = 0; |
| 131 | get_online_cpus(); | 131 | get_online_cpus(); |
| 132 | spin_lock(&appldata_ops_lock); | 132 | mutex_lock(&appldata_ops_mutex); |
| 133 | list_for_each(lh, &appldata_ops_list) { | 133 | list_for_each(lh, &appldata_ops_list) { |
| 134 | ops = list_entry(lh, struct appldata_ops, list); | 134 | ops = list_entry(lh, struct appldata_ops, list); |
| 135 | if (ops->active == 1) { | 135 | if (ops->active == 1) { |
| 136 | ops->callback(ops->data); | 136 | ops->callback(ops->data); |
| 137 | } | 137 | } |
| 138 | } | 138 | } |
| 139 | spin_unlock(&appldata_ops_lock); | 139 | mutex_unlock(&appldata_ops_mutex); |
| 140 | put_online_cpus(); | 140 | put_online_cpus(); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| @@ -338,7 +338,7 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp, | |||
| 338 | struct list_head *lh; | 338 | struct list_head *lh; |
| 339 | 339 | ||
| 340 | found = 0; | 340 | found = 0; |
| 341 | spin_lock(&appldata_ops_lock); | 341 | mutex_lock(&appldata_ops_mutex); |
| 342 | list_for_each(lh, &appldata_ops_list) { | 342 | list_for_each(lh, &appldata_ops_list) { |
| 343 | tmp_ops = list_entry(lh, struct appldata_ops, list); | 343 | tmp_ops = list_entry(lh, struct appldata_ops, list); |
| 344 | if (&tmp_ops->ctl_table[2] == ctl) { | 344 | if (&tmp_ops->ctl_table[2] == ctl) { |
| @@ -346,15 +346,15 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp, | |||
| 346 | } | 346 | } |
| 347 | } | 347 | } |
| 348 | if (!found) { | 348 | if (!found) { |
| 349 | spin_unlock(&appldata_ops_lock); | 349 | mutex_unlock(&appldata_ops_mutex); |
| 350 | return -ENODEV; | 350 | return -ENODEV; |
| 351 | } | 351 | } |
| 352 | ops = ctl->data; | 352 | ops = ctl->data; |
| 353 | if (!try_module_get(ops->owner)) { // protect this function | 353 | if (!try_module_get(ops->owner)) { // protect this function |
| 354 | spin_unlock(&appldata_ops_lock); | 354 | mutex_unlock(&appldata_ops_mutex); |
| 355 | return -ENODEV; | 355 | return -ENODEV; |
| 356 | } | 356 | } |
| 357 | spin_unlock(&appldata_ops_lock); | 357 | mutex_unlock(&appldata_ops_mutex); |
| 358 | 358 | ||
| 359 | if (!*lenp || *ppos) { | 359 | if (!*lenp || *ppos) { |
| 360 | *lenp = 0; | 360 | *lenp = 0; |
| @@ -378,11 +378,11 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp, | |||
| 378 | return -EFAULT; | 378 | return -EFAULT; |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | spin_lock(&appldata_ops_lock); | 381 | mutex_lock(&appldata_ops_mutex); |
| 382 | if ((buf[0] == '1') && (ops->active == 0)) { | 382 | if ((buf[0] == '1') && (ops->active == 0)) { |
| 383 | // protect work queue callback | 383 | // protect work queue callback |
| 384 | if (!try_module_get(ops->owner)) { | 384 | if (!try_module_get(ops->owner)) { |
| 385 | spin_unlock(&appldata_ops_lock); | 385 | mutex_unlock(&appldata_ops_mutex); |
| 386 | module_put(ops->owner); | 386 | module_put(ops->owner); |
| 387 | return -ENODEV; | 387 | return -ENODEV; |
| 388 | } | 388 | } |
| @@ -407,7 +407,7 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp, | |||
| 407 | "failed with rc=%d\n", ops->name, rc); | 407 | "failed with rc=%d\n", ops->name, rc); |
| 408 | module_put(ops->owner); | 408 | module_put(ops->owner); |
| 409 | } | 409 | } |
| 410 | spin_unlock(&appldata_ops_lock); | 410 | mutex_unlock(&appldata_ops_mutex); |
| 411 | out: | 411 | out: |
| 412 | *lenp = len; | 412 | *lenp = len; |
| 413 | *ppos += len; | 413 | *ppos += len; |
| @@ -433,9 +433,9 @@ int appldata_register_ops(struct appldata_ops *ops) | |||
| 433 | if (!ops->ctl_table) | 433 | if (!ops->ctl_table) |
| 434 | return -ENOMEM; | 434 | return -ENOMEM; |
| 435 | 435 | ||
| 436 | spin_lock(&appldata_ops_lock); | 436 | mutex_lock(&appldata_ops_mutex); |
| 437 | list_add(&ops->list, &appldata_ops_list); | 437 | list_add(&ops->list, &appldata_ops_list); |
| 438 | spin_unlock(&appldata_ops_lock); | 438 | mutex_unlock(&appldata_ops_mutex); |
| 439 | 439 | ||
| 440 | ops->ctl_table[0].procname = appldata_proc_name; | 440 | ops->ctl_table[0].procname = appldata_proc_name; |
| 441 | ops->ctl_table[0].maxlen = 0; | 441 | ops->ctl_table[0].maxlen = 0; |
| @@ -452,9 +452,9 @@ int appldata_register_ops(struct appldata_ops *ops) | |||
| 452 | goto out; | 452 | goto out; |
| 453 | return 0; | 453 | return 0; |
| 454 | out: | 454 | out: |
| 455 | spin_lock(&appldata_ops_lock); | 455 | mutex_lock(&appldata_ops_mutex); |
| 456 | list_del(&ops->list); | 456 | list_del(&ops->list); |
| 457 | spin_unlock(&appldata_ops_lock); | 457 | mutex_unlock(&appldata_ops_mutex); |
| 458 | kfree(ops->ctl_table); | 458 | kfree(ops->ctl_table); |
| 459 | return -ENOMEM; | 459 | return -ENOMEM; |
| 460 | } | 460 | } |
| @@ -466,9 +466,9 @@ out: | |||
| 466 | */ | 466 | */ |
| 467 | void appldata_unregister_ops(struct appldata_ops *ops) | 467 | void appldata_unregister_ops(struct appldata_ops *ops) |
| 468 | { | 468 | { |
| 469 | spin_lock(&appldata_ops_lock); | 469 | mutex_lock(&appldata_ops_mutex); |
| 470 | list_del(&ops->list); | 470 | list_del(&ops->list); |
| 471 | spin_unlock(&appldata_ops_lock); | 471 | mutex_unlock(&appldata_ops_mutex); |
| 472 | unregister_sysctl_table(ops->sysctl_header); | 472 | unregister_sysctl_table(ops->sysctl_header); |
| 473 | kfree(ops->ctl_table); | 473 | kfree(ops->ctl_table); |
| 474 | } | 474 | } |
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c index 3ed56b7d1b2..4188cbe63a5 100644 --- a/arch/s390/appldata/appldata_mem.c +++ b/arch/s390/appldata/appldata_mem.c | |||
| @@ -78,7 +78,7 @@ static void appldata_get_mem_data(void *data) | |||
| 78 | { | 78 | { |
| 79 | /* | 79 | /* |
| 80 | * don't put large structures on the stack, we are | 80 | * don't put large structures on the stack, we are |
| 81 | * serialized through the appldata_ops_lock and can use static | 81 | * serialized through the appldata_ops_mutex and can use static |
| 82 | */ | 82 | */ |
| 83 | static struct sysinfo val; | 83 | static struct sysinfo val; |
| 84 | unsigned long ev[NR_VM_EVENT_ITEMS]; | 84 | unsigned long ev[NR_VM_EVENT_ITEMS]; |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 31e809c7779..d401d56c255 100644 --- a/arch/s390/defconfig +++ b/arch/s390/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.29-rc4 | 3 | # Linux kernel version: 2.6.30-rc3 |
| 4 | # Wed Feb 11 10:07:16 2009 | 4 | # Thu Apr 23 09:29:52 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_SCHED_MC=y | 6 | CONFIG_SCHED_MC=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -22,6 +22,7 @@ CONFIG_NO_DMA=y | |||
| 22 | CONFIG_GENERIC_LOCKBREAK=y | 22 | CONFIG_GENERIC_LOCKBREAK=y |
| 23 | CONFIG_PGSTE=y | 23 | CONFIG_PGSTE=y |
| 24 | CONFIG_VIRT_CPU_ACCOUNTING=y | 24 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| 25 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 25 | CONFIG_S390=y | 26 | CONFIG_S390=y |
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 27 | 28 | ||
| @@ -37,6 +38,7 @@ CONFIG_SWAP=y | |||
| 37 | CONFIG_SYSVIPC=y | 38 | CONFIG_SYSVIPC=y |
| 38 | CONFIG_SYSVIPC_SYSCTL=y | 39 | CONFIG_SYSVIPC_SYSCTL=y |
| 39 | CONFIG_POSIX_MQUEUE=y | 40 | CONFIG_POSIX_MQUEUE=y |
| 41 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 40 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 41 | # CONFIG_TASKSTATS is not set | 43 | # CONFIG_TASKSTATS is not set |
| 42 | CONFIG_AUDIT=y | 44 | CONFIG_AUDIT=y |
| @@ -77,21 +79,24 @@ CONFIG_IPC_NS=y | |||
| 77 | # CONFIG_NET_NS is not set | 79 | # CONFIG_NET_NS is not set |
| 78 | CONFIG_BLK_DEV_INITRD=y | 80 | CONFIG_BLK_DEV_INITRD=y |
| 79 | CONFIG_INITRAMFS_SOURCE="" | 81 | CONFIG_INITRAMFS_SOURCE="" |
| 82 | CONFIG_RD_GZIP=y | ||
| 83 | CONFIG_RD_BZIP2=y | ||
| 84 | CONFIG_RD_LZMA=y | ||
| 80 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 85 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 81 | CONFIG_SYSCTL=y | 86 | CONFIG_SYSCTL=y |
| 87 | CONFIG_ANON_INODES=y | ||
| 82 | # CONFIG_EMBEDDED is not set | 88 | # CONFIG_EMBEDDED is not set |
| 83 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
| 85 | # CONFIG_KALLSYMS_ALL is not set | 91 | # CONFIG_KALLSYMS_ALL is not set |
| 86 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 93 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 87 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| 88 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| 89 | CONFIG_BUG=y | 96 | CONFIG_BUG=y |
| 90 | CONFIG_ELF_CORE=y | 97 | CONFIG_ELF_CORE=y |
| 91 | # CONFIG_COMPAT_BRK is not set | ||
| 92 | CONFIG_BASE_FULL=y | 98 | CONFIG_BASE_FULL=y |
| 93 | CONFIG_FUTEX=y | 99 | CONFIG_FUTEX=y |
| 94 | CONFIG_ANON_INODES=y | ||
| 95 | CONFIG_EPOLL=y | 100 | CONFIG_EPOLL=y |
| 96 | CONFIG_SIGNALFD=y | 101 | CONFIG_SIGNALFD=y |
| 97 | CONFIG_TIMERFD=y | 102 | CONFIG_TIMERFD=y |
| @@ -99,10 +104,12 @@ CONFIG_EVENTFD=y | |||
| 99 | CONFIG_SHMEM=y | 104 | CONFIG_SHMEM=y |
| 100 | CONFIG_AIO=y | 105 | CONFIG_AIO=y |
| 101 | CONFIG_VM_EVENT_COUNTERS=y | 106 | CONFIG_VM_EVENT_COUNTERS=y |
| 107 | # CONFIG_COMPAT_BRK is not set | ||
| 102 | CONFIG_SLAB=y | 108 | CONFIG_SLAB=y |
| 103 | # CONFIG_SLUB is not set | 109 | # CONFIG_SLUB is not set |
| 104 | # CONFIG_SLOB is not set | 110 | # CONFIG_SLOB is not set |
| 105 | # CONFIG_PROFILING is not set | 111 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | ||
| 106 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 107 | CONFIG_KPROBES=y | 114 | CONFIG_KPROBES=y |
| 108 | CONFIG_HAVE_SYSCALL_WRAPPERS=y | 115 | CONFIG_HAVE_SYSCALL_WRAPPERS=y |
| @@ -111,6 +118,8 @@ CONFIG_HAVE_KPROBES=y | |||
| 111 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 112 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 113 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 120 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 121 | CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES=y | ||
| 122 | # CONFIG_SLOW_WORK is not set | ||
| 114 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 115 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| @@ -124,7 +133,6 @@ CONFIG_MODVERSIONS=y | |||
| 124 | CONFIG_INIT_ALL_POSSIBLE=y | 133 | CONFIG_INIT_ALL_POSSIBLE=y |
| 125 | CONFIG_STOP_MACHINE=y | 134 | CONFIG_STOP_MACHINE=y |
| 126 | CONFIG_BLOCK=y | 135 | CONFIG_BLOCK=y |
| 127 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 128 | CONFIG_BLK_DEV_BSG=y | 136 | CONFIG_BLK_DEV_BSG=y |
| 129 | # CONFIG_BLK_DEV_INTEGRITY is not set | 137 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 130 | CONFIG_BLOCK_COMPAT=y | 138 | CONFIG_BLOCK_COMPAT=y |
| @@ -211,11 +219,12 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 211 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 212 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 213 | CONFIG_UNEVICTABLE_LRU=y | 221 | CONFIG_UNEVICTABLE_LRU=y |
| 222 | CONFIG_HAVE_MLOCK=y | ||
| 223 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 214 | 224 | ||
| 215 | # | 225 | # |
| 216 | # I/O subsystem configuration | 226 | # I/O subsystem configuration |
| 217 | # | 227 | # |
| 218 | CONFIG_MACHCHK_WARNING=y | ||
| 219 | CONFIG_QDIO=y | 228 | CONFIG_QDIO=y |
| 220 | CONFIG_CHSC_SCH=m | 229 | CONFIG_CHSC_SCH=m |
| 221 | 230 | ||
| @@ -247,12 +256,12 @@ CONFIG_S390_HYPFS_FS=y | |||
| 247 | CONFIG_KEXEC=y | 256 | CONFIG_KEXEC=y |
| 248 | # CONFIG_ZFCPDUMP is not set | 257 | # CONFIG_ZFCPDUMP is not set |
| 249 | CONFIG_S390_GUEST=y | 258 | CONFIG_S390_GUEST=y |
| 259 | CONFIG_SECCOMP=y | ||
| 250 | CONFIG_NET=y | 260 | CONFIG_NET=y |
| 251 | 261 | ||
| 252 | # | 262 | # |
| 253 | # Networking options | 263 | # Networking options |
| 254 | # | 264 | # |
| 255 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 256 | CONFIG_PACKET=y | 265 | CONFIG_PACKET=y |
| 257 | # CONFIG_PACKET_MMAP is not set | 266 | # CONFIG_PACKET_MMAP is not set |
| 258 | CONFIG_UNIX=y | 267 | CONFIG_UNIX=y |
| @@ -374,6 +383,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
| 374 | # CONFIG_LAPB is not set | 383 | # CONFIG_LAPB is not set |
| 375 | # CONFIG_ECONET is not set | 384 | # CONFIG_ECONET is not set |
| 376 | # CONFIG_WAN_ROUTER is not set | 385 | # CONFIG_WAN_ROUTER is not set |
| 386 | # CONFIG_PHONET is not set | ||
| 377 | CONFIG_NET_SCHED=y | 387 | CONFIG_NET_SCHED=y |
| 378 | 388 | ||
| 379 | # | 389 | # |
| @@ -438,7 +448,6 @@ CONFIG_CAN_BCM=m | |||
| 438 | CONFIG_CAN_VCAN=m | 448 | CONFIG_CAN_VCAN=m |
| 439 | # CONFIG_CAN_DEBUG_DEVICES is not set | 449 | # CONFIG_CAN_DEBUG_DEVICES is not set |
| 440 | # CONFIG_AF_RXRPC is not set | 450 | # CONFIG_AF_RXRPC is not set |
| 441 | # CONFIG_PHONET is not set | ||
| 442 | # CONFIG_WIMAX is not set | 451 | # CONFIG_WIMAX is not set |
| 443 | # CONFIG_RFKILL is not set | 452 | # CONFIG_RFKILL is not set |
| 444 | # CONFIG_NET_9P is not set | 453 | # CONFIG_NET_9P is not set |
| @@ -537,6 +546,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 537 | CONFIG_SCSI_LOWLEVEL=y | 546 | CONFIG_SCSI_LOWLEVEL=y |
| 538 | # CONFIG_ISCSI_TCP is not set | 547 | # CONFIG_ISCSI_TCP is not set |
| 539 | # CONFIG_LIBFC is not set | 548 | # CONFIG_LIBFC is not set |
| 549 | # CONFIG_LIBFCOE is not set | ||
| 540 | # CONFIG_SCSI_DEBUG is not set | 550 | # CONFIG_SCSI_DEBUG is not set |
| 541 | CONFIG_ZFCP=y | 551 | CONFIG_ZFCP=y |
| 542 | CONFIG_SCSI_DH=m | 552 | CONFIG_SCSI_DH=m |
| @@ -544,6 +554,10 @@ CONFIG_SCSI_DH_RDAC=m | |||
| 544 | CONFIG_SCSI_DH_HP_SW=m | 554 | CONFIG_SCSI_DH_HP_SW=m |
| 545 | CONFIG_SCSI_DH_EMC=m | 555 | CONFIG_SCSI_DH_EMC=m |
| 546 | CONFIG_SCSI_DH_ALUA=m | 556 | CONFIG_SCSI_DH_ALUA=m |
| 557 | CONFIG_SCSI_OSD_INITIATOR=m | ||
| 558 | CONFIG_SCSI_OSD_ULD=m | ||
| 559 | CONFIG_SCSI_OSD_DPRINT_SENSE=1 | ||
| 560 | # CONFIG_SCSI_OSD_DEBUG is not set | ||
| 547 | CONFIG_MD=y | 561 | CONFIG_MD=y |
| 548 | CONFIG_BLK_DEV_MD=y | 562 | CONFIG_BLK_DEV_MD=y |
| 549 | CONFIG_MD_AUTODETECT=y | 563 | CONFIG_MD_AUTODETECT=y |
| @@ -564,6 +578,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 564 | # CONFIG_DM_DELAY is not set | 578 | # CONFIG_DM_DELAY is not set |
| 565 | # CONFIG_DM_UEVENT is not set | 579 | # CONFIG_DM_UEVENT is not set |
| 566 | CONFIG_NETDEVICES=y | 580 | CONFIG_NETDEVICES=y |
| 581 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 567 | # CONFIG_IFB is not set | 582 | # CONFIG_IFB is not set |
| 568 | CONFIG_DUMMY=m | 583 | CONFIG_DUMMY=m |
| 569 | CONFIG_BONDING=m | 584 | CONFIG_BONDING=m |
| @@ -667,6 +682,7 @@ CONFIG_S390_VMUR=m | |||
| 667 | # CONFIG_MEMSTICK is not set | 682 | # CONFIG_MEMSTICK is not set |
| 668 | # CONFIG_NEW_LEDS is not set | 683 | # CONFIG_NEW_LEDS is not set |
| 669 | CONFIG_ACCESSIBILITY=y | 684 | CONFIG_ACCESSIBILITY=y |
| 685 | # CONFIG_AUXDISPLAY is not set | ||
| 670 | # CONFIG_STAGING is not set | 686 | # CONFIG_STAGING is not set |
| 671 | 687 | ||
| 672 | # | 688 | # |
| @@ -676,6 +692,7 @@ CONFIG_EXT2_FS=y | |||
| 676 | # CONFIG_EXT2_FS_XATTR is not set | 692 | # CONFIG_EXT2_FS_XATTR is not set |
| 677 | # CONFIG_EXT2_FS_XIP is not set | 693 | # CONFIG_EXT2_FS_XIP is not set |
| 678 | CONFIG_EXT3_FS=y | 694 | CONFIG_EXT3_FS=y |
| 695 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 679 | CONFIG_EXT3_FS_XATTR=y | 696 | CONFIG_EXT3_FS_XATTR=y |
| 680 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 697 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 681 | # CONFIG_EXT3_FS_SECURITY is not set | 698 | # CONFIG_EXT3_FS_SECURITY is not set |
| @@ -701,6 +718,11 @@ CONFIG_INOTIFY_USER=y | |||
| 701 | CONFIG_GENERIC_ACL=y | 718 | CONFIG_GENERIC_ACL=y |
| 702 | 719 | ||
| 703 | # | 720 | # |
| 721 | # Caches | ||
| 722 | # | ||
| 723 | # CONFIG_FSCACHE is not set | ||
| 724 | |||
| 725 | # | ||
| 704 | # CD-ROM/DVD Filesystems | 726 | # CD-ROM/DVD Filesystems |
| 705 | # | 727 | # |
| 706 | # CONFIG_ISO9660_FS is not set | 728 | # CONFIG_ISO9660_FS is not set |
| @@ -744,6 +766,8 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 744 | # CONFIG_ROMFS_FS is not set | 766 | # CONFIG_ROMFS_FS is not set |
| 745 | # CONFIG_SYSV_FS is not set | 767 | # CONFIG_SYSV_FS is not set |
| 746 | # CONFIG_UFS_FS is not set | 768 | # CONFIG_UFS_FS is not set |
| 769 | # CONFIG_EXOFS_FS is not set | ||
| 770 | # CONFIG_NILFS2_FS is not set | ||
| 747 | CONFIG_NETWORK_FILESYSTEMS=y | 771 | CONFIG_NETWORK_FILESYSTEMS=y |
| 748 | CONFIG_NFS_FS=y | 772 | CONFIG_NFS_FS=y |
| 749 | CONFIG_NFS_V3=y | 773 | CONFIG_NFS_V3=y |
| @@ -758,7 +782,6 @@ CONFIG_LOCKD_V4=y | |||
| 758 | CONFIG_EXPORTFS=y | 782 | CONFIG_EXPORTFS=y |
| 759 | CONFIG_NFS_COMMON=y | 783 | CONFIG_NFS_COMMON=y |
| 760 | CONFIG_SUNRPC=y | 784 | CONFIG_SUNRPC=y |
| 761 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 762 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 785 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 763 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 786 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 764 | # CONFIG_SMB_FS is not set | 787 | # CONFIG_SMB_FS is not set |
| @@ -806,6 +829,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 806 | CONFIG_DEBUG_FS=y | 829 | CONFIG_DEBUG_FS=y |
| 807 | # CONFIG_HEADERS_CHECK is not set | 830 | # CONFIG_HEADERS_CHECK is not set |
| 808 | CONFIG_DEBUG_KERNEL=y | 831 | CONFIG_DEBUG_KERNEL=y |
| 832 | # CONFIG_DETECT_HUNG_TASK is not set | ||
| 809 | # CONFIG_SCHED_DEBUG is not set | 833 | # CONFIG_SCHED_DEBUG is not set |
| 810 | # CONFIG_SCHEDSTATS is not set | 834 | # CONFIG_SCHEDSTATS is not set |
| 811 | # CONFIG_TIMER_STATS is not set | 835 | # CONFIG_TIMER_STATS is not set |
| @@ -830,7 +854,6 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 830 | # CONFIG_DEBUG_LIST is not set | 854 | # CONFIG_DEBUG_LIST is not set |
| 831 | # CONFIG_DEBUG_SG is not set | 855 | # CONFIG_DEBUG_SG is not set |
| 832 | # CONFIG_DEBUG_NOTIFIERS is not set | 856 | # CONFIG_DEBUG_NOTIFIERS is not set |
| 833 | # CONFIG_FRAME_POINTER is not set | ||
| 834 | # CONFIG_RCU_TORTURE_TEST is not set | 857 | # CONFIG_RCU_TORTURE_TEST is not set |
| 835 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 858 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 836 | # CONFIG_KPROBES_SANITY_TEST is not set | 859 | # CONFIG_KPROBES_SANITY_TEST is not set |
| @@ -840,7 +863,9 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 840 | # CONFIG_FAULT_INJECTION is not set | 863 | # CONFIG_FAULT_INJECTION is not set |
| 841 | # CONFIG_LATENCYTOP is not set | 864 | # CONFIG_LATENCYTOP is not set |
| 842 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 865 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 866 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 843 | CONFIG_HAVE_FUNCTION_TRACER=y | 867 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 868 | CONFIG_TRACING_SUPPORT=y | ||
| 844 | 869 | ||
| 845 | # | 870 | # |
| 846 | # Tracers | 871 | # Tracers |
| @@ -850,14 +875,17 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 850 | # CONFIG_PREEMPT_TRACER is not set | 875 | # CONFIG_PREEMPT_TRACER is not set |
| 851 | # CONFIG_SCHED_TRACER is not set | 876 | # CONFIG_SCHED_TRACER is not set |
| 852 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 877 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 878 | # CONFIG_EVENT_TRACER is not set | ||
| 853 | # CONFIG_BOOT_TRACER is not set | 879 | # CONFIG_BOOT_TRACER is not set |
| 854 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 880 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 855 | # CONFIG_STACK_TRACER is not set | 881 | # CONFIG_STACK_TRACER is not set |
| 856 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 882 | # CONFIG_KMEMTRACE is not set |
| 883 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 884 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 885 | # CONFIG_DYNAMIC_DEBUG is not set | ||
| 857 | CONFIG_SAMPLES=y | 886 | CONFIG_SAMPLES=y |
| 858 | # CONFIG_SAMPLE_KOBJECT is not set | 887 | # CONFIG_SAMPLE_KOBJECT is not set |
| 859 | # CONFIG_SAMPLE_KPROBES is not set | 888 | # CONFIG_SAMPLE_KPROBES is not set |
| 860 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 861 | 889 | ||
| 862 | # | 890 | # |
| 863 | # Security options | 891 | # Security options |
| @@ -882,10 +910,12 @@ CONFIG_CRYPTO_HASH=m | |||
| 882 | CONFIG_CRYPTO_HASH2=y | 910 | CONFIG_CRYPTO_HASH2=y |
| 883 | CONFIG_CRYPTO_RNG=m | 911 | CONFIG_CRYPTO_RNG=m |
| 884 | CONFIG_CRYPTO_RNG2=y | 912 | CONFIG_CRYPTO_RNG2=y |
| 913 | CONFIG_CRYPTO_PCOMP=y | ||
| 885 | CONFIG_CRYPTO_MANAGER=y | 914 | CONFIG_CRYPTO_MANAGER=y |
| 886 | CONFIG_CRYPTO_MANAGER2=y | 915 | CONFIG_CRYPTO_MANAGER2=y |
| 887 | CONFIG_CRYPTO_GF128MUL=m | 916 | CONFIG_CRYPTO_GF128MUL=m |
| 888 | # CONFIG_CRYPTO_NULL is not set | 917 | # CONFIG_CRYPTO_NULL is not set |
| 918 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 889 | # CONFIG_CRYPTO_CRYPTD is not set | 919 | # CONFIG_CRYPTO_CRYPTD is not set |
| 890 | CONFIG_CRYPTO_AUTHENC=m | 920 | CONFIG_CRYPTO_AUTHENC=m |
| 891 | # CONFIG_CRYPTO_TEST is not set | 921 | # CONFIG_CRYPTO_TEST is not set |
| @@ -954,6 +984,7 @@ CONFIG_CRYPTO_SEED=m | |||
| 954 | # Compression | 984 | # Compression |
| 955 | # | 985 | # |
| 956 | # CONFIG_CRYPTO_DEFLATE is not set | 986 | # CONFIG_CRYPTO_DEFLATE is not set |
| 987 | CONFIG_CRYPTO_ZLIB=m | ||
| 957 | CONFIG_CRYPTO_LZO=m | 988 | CONFIG_CRYPTO_LZO=m |
| 958 | 989 | ||
| 959 | # | 990 | # |
| @@ -969,6 +1000,7 @@ CONFIG_CRYPTO_SHA512_S390=m | |||
| 969 | # CONFIG_CRYPTO_DES_S390 is not set | 1000 | # CONFIG_CRYPTO_DES_S390 is not set |
| 970 | # CONFIG_CRYPTO_AES_S390 is not set | 1001 | # CONFIG_CRYPTO_AES_S390 is not set |
| 971 | CONFIG_S390_PRNG=m | 1002 | CONFIG_S390_PRNG=m |
| 1003 | # CONFIG_BINARY_PRINTF is not set | ||
| 972 | 1004 | ||
| 973 | # | 1005 | # |
| 974 | # Library routines | 1006 | # Library routines |
| @@ -982,9 +1014,14 @@ CONFIG_CRC_T10DIF=y | |||
| 982 | CONFIG_CRC32=m | 1014 | CONFIG_CRC32=m |
| 983 | CONFIG_CRC7=m | 1015 | CONFIG_CRC7=m |
| 984 | CONFIG_LIBCRC32C=m | 1016 | CONFIG_LIBCRC32C=m |
| 1017 | CONFIG_ZLIB_INFLATE=y | ||
| 1018 | CONFIG_ZLIB_DEFLATE=m | ||
| 985 | CONFIG_LZO_COMPRESS=m | 1019 | CONFIG_LZO_COMPRESS=m |
| 986 | CONFIG_LZO_DECOMPRESS=m | 1020 | CONFIG_LZO_DECOMPRESS=m |
| 987 | CONFIG_PLIST=y | 1021 | CONFIG_DECOMPRESS_GZIP=y |
| 1022 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1023 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1024 | CONFIG_NLATTR=y | ||
| 988 | CONFIG_HAVE_KVM=y | 1025 | CONFIG_HAVE_KVM=y |
| 989 | CONFIG_VIRTUALIZATION=y | 1026 | CONFIG_VIRTUALIZATION=y |
| 990 | CONFIG_KVM=m | 1027 | CONFIG_KVM=m |
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h index 95b0f7db3c6..941384fbd39 100644 --- a/arch/s390/include/asm/cputime.h +++ b/arch/s390/include/asm/cputime.h | |||
| @@ -174,4 +174,8 @@ cputime64_to_clock_t(cputime64_t cputime) | |||
| 174 | return __div(cputime, 4096000000ULL / USER_HZ); | 174 | return __div(cputime, 4096000000ULL / USER_HZ); |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | cputime64_t s390_get_idle_time(int cpu); | ||
| 178 | |||
| 179 | #define arch_idle_time(cpu) s390_get_idle_time(cpu) | ||
| 180 | |||
| 177 | #endif /* _S390_CPUTIME_H */ | 181 | #endif /* _S390_CPUTIME_H */ |
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 6f3711a0eaa..b8bf4b14006 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <asm/ebcdic.h> | 23 | #include <asm/ebcdic.h> |
| 24 | #include <asm/reset.h> | 24 | #include <asm/reset.h> |
| 25 | #include <asm/sclp.h> | 25 | #include <asm/sclp.h> |
| 26 | #include <asm/sigp.h> | ||
| 26 | #include <asm/checksum.h> | 27 | #include <asm/checksum.h> |
| 27 | 28 | ||
| 28 | #define IPL_PARM_BLOCK_VERSION 0 | 29 | #define IPL_PARM_BLOCK_VERSION 0 |
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index 38ea92ff04f..c87f59bd824 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
| @@ -240,6 +240,22 @@ void vtime_stop_cpu(void) | |||
| 240 | } | 240 | } |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | cputime64_t s390_get_idle_time(int cpu) | ||
| 244 | { | ||
| 245 | struct s390_idle_data *idle; | ||
| 246 | unsigned long long now, idle_time, idle_enter; | ||
| 247 | |||
| 248 | idle = &per_cpu(s390_idle, cpu); | ||
| 249 | spin_lock(&idle->lock); | ||
| 250 | now = get_clock(); | ||
| 251 | idle_time = 0; | ||
| 252 | idle_enter = idle->idle_enter; | ||
| 253 | if (idle_enter != 0ULL && idle_enter < now) | ||
| 254 | idle_time = now - idle_enter; | ||
| 255 | spin_unlock(&idle->lock); | ||
| 256 | return idle_time; | ||
| 257 | } | ||
| 258 | |||
| 243 | /* | 259 | /* |
| 244 | * Sorted add to a list. List is linear searched until first bigger | 260 | * Sorted add to a list. List is linear searched until first bigger |
| 245 | * element is found. | 261 | * element is found. |
diff --git a/arch/sparc/configs/sparc32_defconfig b/arch/sparc/configs/sparc32_defconfig index 09ab46e4c59..8bcd27af724 100644 --- a/arch/sparc/configs/sparc32_defconfig +++ b/arch/sparc/configs/sparc32_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.28 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Thu Jan 8 16:45:44 2009 | 4 | # Fri Apr 17 04:04:46 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
| 7 | CONFIG_SPARC=y | 7 | CONFIG_SPARC=y |
| @@ -30,17 +30,27 @@ CONFIG_SWAP=y | |||
| 30 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
| 31 | CONFIG_SYSVIPC_SYSCTL=y | 31 | CONFIG_SYSVIPC_SYSCTL=y |
| 32 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
| 33 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 33 | # CONFIG_BSD_PROCESS_ACCT is not set | 34 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 34 | # CONFIG_TASKSTATS is not set | 35 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 37 | |||
| 38 | # | ||
| 39 | # RCU Subsystem | ||
| 40 | # | ||
| 41 | CONFIG_CLASSIC_RCU=y | ||
| 42 | # CONFIG_TREE_RCU is not set | ||
| 43 | # CONFIG_PREEMPT_RCU is not set | ||
| 44 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 45 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 36 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
| 37 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
| 38 | # CONFIG_CGROUPS is not set | ||
| 39 | CONFIG_GROUP_SCHED=y | 48 | CONFIG_GROUP_SCHED=y |
| 40 | CONFIG_FAIR_GROUP_SCHED=y | 49 | CONFIG_FAIR_GROUP_SCHED=y |
| 41 | CONFIG_RT_GROUP_SCHED=y | 50 | CONFIG_RT_GROUP_SCHED=y |
| 42 | CONFIG_USER_SCHED=y | 51 | CONFIG_USER_SCHED=y |
| 43 | # CONFIG_CGROUP_SCHED is not set | 52 | # CONFIG_CGROUP_SCHED is not set |
| 53 | # CONFIG_CGROUPS is not set | ||
| 44 | CONFIG_SYSFS_DEPRECATED=y | 54 | CONFIG_SYSFS_DEPRECATED=y |
| 45 | CONFIG_SYSFS_DEPRECATED_V2=y | 55 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 46 | # CONFIG_RELAY is not set | 56 | # CONFIG_RELAY is not set |
| @@ -49,24 +59,28 @@ CONFIG_NAMESPACES=y | |||
| 49 | # CONFIG_IPC_NS is not set | 59 | # CONFIG_IPC_NS is not set |
| 50 | # CONFIG_USER_NS is not set | 60 | # CONFIG_USER_NS is not set |
| 51 | # CONFIG_PID_NS is not set | 61 | # CONFIG_PID_NS is not set |
| 62 | # CONFIG_NET_NS is not set | ||
| 52 | CONFIG_BLK_DEV_INITRD=y | 63 | CONFIG_BLK_DEV_INITRD=y |
| 53 | CONFIG_INITRAMFS_SOURCE="" | 64 | CONFIG_INITRAMFS_SOURCE="" |
| 65 | CONFIG_RD_GZIP=y | ||
| 66 | CONFIG_RD_BZIP2=y | ||
| 67 | CONFIG_RD_LZMA=y | ||
| 54 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 68 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 55 | CONFIG_SYSCTL=y | 69 | CONFIG_SYSCTL=y |
| 70 | CONFIG_ANON_INODES=y | ||
| 56 | # CONFIG_EMBEDDED is not set | 71 | # CONFIG_EMBEDDED is not set |
| 57 | CONFIG_UID16=y | 72 | CONFIG_UID16=y |
| 58 | CONFIG_SYSCTL_SYSCALL=y | 73 | CONFIG_SYSCTL_SYSCALL=y |
| 59 | CONFIG_KALLSYMS=y | 74 | CONFIG_KALLSYMS=y |
| 60 | # CONFIG_KALLSYMS_ALL is not set | 75 | # CONFIG_KALLSYMS_ALL is not set |
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 76 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 77 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 62 | CONFIG_HOTPLUG=y | 78 | CONFIG_HOTPLUG=y |
| 63 | CONFIG_PRINTK=y | 79 | CONFIG_PRINTK=y |
| 64 | CONFIG_BUG=y | 80 | CONFIG_BUG=y |
| 65 | CONFIG_ELF_CORE=y | 81 | CONFIG_ELF_CORE=y |
| 66 | CONFIG_COMPAT_BRK=y | ||
| 67 | CONFIG_BASE_FULL=y | 82 | CONFIG_BASE_FULL=y |
| 68 | CONFIG_FUTEX=y | 83 | CONFIG_FUTEX=y |
| 69 | CONFIG_ANON_INODES=y | ||
| 70 | CONFIG_EPOLL=y | 84 | CONFIG_EPOLL=y |
| 71 | CONFIG_SIGNALFD=y | 85 | CONFIG_SIGNALFD=y |
| 72 | CONFIG_TIMERFD=y | 86 | CONFIG_TIMERFD=y |
| @@ -75,12 +89,15 @@ CONFIG_SHMEM=y | |||
| 75 | CONFIG_AIO=y | 89 | CONFIG_AIO=y |
| 76 | CONFIG_VM_EVENT_COUNTERS=y | 90 | CONFIG_VM_EVENT_COUNTERS=y |
| 77 | CONFIG_PCI_QUIRKS=y | 91 | CONFIG_PCI_QUIRKS=y |
| 92 | CONFIG_COMPAT_BRK=y | ||
| 78 | CONFIG_SLAB=y | 93 | CONFIG_SLAB=y |
| 79 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLUB is not set |
| 80 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
| 81 | # CONFIG_PROFILING is not set | 96 | # CONFIG_PROFILING is not set |
| 97 | # CONFIG_MARKERS is not set | ||
| 82 | CONFIG_HAVE_OPROFILE=y | 98 | CONFIG_HAVE_OPROFILE=y |
| 83 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 99 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 100 | # CONFIG_SLOW_WORK is not set | ||
| 84 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 101 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 85 | CONFIG_SLABINFO=y | 102 | CONFIG_SLABINFO=y |
| 86 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
| @@ -93,7 +110,6 @@ CONFIG_MODULE_UNLOAD=y | |||
| 93 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 110 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 94 | CONFIG_BLOCK=y | 111 | CONFIG_BLOCK=y |
| 95 | # CONFIG_LBD is not set | 112 | # CONFIG_LBD is not set |
| 96 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 97 | # CONFIG_BLK_DEV_BSG is not set | 113 | # CONFIG_BLK_DEV_BSG is not set |
| 98 | # CONFIG_BLK_DEV_INTEGRITY is not set | 114 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 99 | 115 | ||
| @@ -109,11 +125,6 @@ CONFIG_IOSCHED_CFQ=y | |||
| 109 | CONFIG_DEFAULT_CFQ=y | 125 | CONFIG_DEFAULT_CFQ=y |
| 110 | # CONFIG_DEFAULT_NOOP is not set | 126 | # CONFIG_DEFAULT_NOOP is not set |
| 111 | CONFIG_DEFAULT_IOSCHED="cfq" | 127 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 112 | CONFIG_CLASSIC_RCU=y | ||
| 113 | # CONFIG_TREE_RCU is not set | ||
| 114 | # CONFIG_PREEMPT_RCU is not set | ||
| 115 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 116 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 117 | # CONFIG_FREEZER is not set | 128 | # CONFIG_FREEZER is not set |
| 118 | 129 | ||
| 119 | # | 130 | # |
| @@ -144,6 +155,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 144 | CONFIG_ZONE_DMA_FLAG=1 | 155 | CONFIG_ZONE_DMA_FLAG=1 |
| 145 | CONFIG_BOUNCE=y | 156 | CONFIG_BOUNCE=y |
| 146 | CONFIG_UNEVICTABLE_LRU=y | 157 | CONFIG_UNEVICTABLE_LRU=y |
| 158 | CONFIG_HAVE_MLOCK=y | ||
| 159 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 147 | CONFIG_SUN_PM=y | 160 | CONFIG_SUN_PM=y |
| 148 | # CONFIG_SPARC_LED is not set | 161 | # CONFIG_SPARC_LED is not set |
| 149 | CONFIG_SERIAL_CONSOLE=y | 162 | CONFIG_SERIAL_CONSOLE=y |
| @@ -159,6 +172,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 159 | CONFIG_PCI_LEGACY=y | 172 | CONFIG_PCI_LEGACY=y |
| 160 | # CONFIG_PCI_DEBUG is not set | 173 | # CONFIG_PCI_DEBUG is not set |
| 161 | # CONFIG_PCI_STUB is not set | 174 | # CONFIG_PCI_STUB is not set |
| 175 | # CONFIG_PCI_IOV is not set | ||
| 162 | # CONFIG_PCCARD is not set | 176 | # CONFIG_PCCARD is not set |
| 163 | CONFIG_SUN_OPENPROMFS=m | 177 | CONFIG_SUN_OPENPROMFS=m |
| 164 | CONFIG_SPARC32_PCI=y | 178 | CONFIG_SPARC32_PCI=y |
| @@ -175,8 +189,6 @@ CONFIG_NET=y | |||
| 175 | # | 189 | # |
| 176 | # Networking options | 190 | # Networking options |
| 177 | # | 191 | # |
| 178 | # CONFIG_NET_NS is not set | ||
| 179 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 180 | CONFIG_PACKET=y | 192 | CONFIG_PACKET=y |
| 181 | # CONFIG_PACKET_MMAP is not set | 193 | # CONFIG_PACKET_MMAP is not set |
| 182 | CONFIG_UNIX=y | 194 | CONFIG_UNIX=y |
| @@ -251,6 +263,7 @@ CONFIG_IPV6_TUNNEL=m | |||
| 251 | # CONFIG_LAPB is not set | 263 | # CONFIG_LAPB is not set |
| 252 | # CONFIG_ECONET is not set | 264 | # CONFIG_ECONET is not set |
| 253 | # CONFIG_WAN_ROUTER is not set | 265 | # CONFIG_WAN_ROUTER is not set |
| 266 | # CONFIG_PHONET is not set | ||
| 254 | # CONFIG_NET_SCHED is not set | 267 | # CONFIG_NET_SCHED is not set |
| 255 | # CONFIG_DCB is not set | 268 | # CONFIG_DCB is not set |
| 256 | 269 | ||
| @@ -263,7 +276,6 @@ CONFIG_NET_PKTGEN=m | |||
| 263 | # CONFIG_IRDA is not set | 276 | # CONFIG_IRDA is not set |
| 264 | # CONFIG_BT is not set | 277 | # CONFIG_BT is not set |
| 265 | # CONFIG_AF_RXRPC is not set | 278 | # CONFIG_AF_RXRPC is not set |
| 266 | # CONFIG_PHONET is not set | ||
| 267 | CONFIG_WIRELESS=y | 279 | CONFIG_WIRELESS=y |
| 268 | # CONFIG_CFG80211 is not set | 280 | # CONFIG_CFG80211 is not set |
| 269 | CONFIG_WIRELESS_OLD_REGULATORY=y | 281 | CONFIG_WIRELESS_OLD_REGULATORY=y |
| @@ -313,12 +325,16 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 313 | # CONFIG_BLK_DEV_HD is not set | 325 | # CONFIG_BLK_DEV_HD is not set |
| 314 | CONFIG_MISC_DEVICES=y | 326 | CONFIG_MISC_DEVICES=y |
| 315 | # CONFIG_PHANTOM is not set | 327 | # CONFIG_PHANTOM is not set |
| 316 | # CONFIG_EEPROM_93CX6 is not set | ||
| 317 | # CONFIG_SGI_IOC4 is not set | 328 | # CONFIG_SGI_IOC4 is not set |
| 318 | # CONFIG_TIFM_CORE is not set | 329 | # CONFIG_TIFM_CORE is not set |
| 319 | # CONFIG_ENCLOSURE_SERVICES is not set | 330 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 320 | # CONFIG_HP_ILO is not set | 331 | # CONFIG_HP_ILO is not set |
| 321 | # CONFIG_C2PORT is not set | 332 | # CONFIG_C2PORT is not set |
| 333 | |||
| 334 | # | ||
| 335 | # EEPROM support | ||
| 336 | # | ||
| 337 | # CONFIG_EEPROM_93CX6 is not set | ||
| 322 | CONFIG_HAVE_IDE=y | 338 | CONFIG_HAVE_IDE=y |
| 323 | # CONFIG_IDE is not set | 339 | # CONFIG_IDE is not set |
| 324 | 340 | ||
| @@ -375,8 +391,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 375 | # CONFIG_MEGARAID_NEWGEN is not set | 391 | # CONFIG_MEGARAID_NEWGEN is not set |
| 376 | # CONFIG_MEGARAID_LEGACY is not set | 392 | # CONFIG_MEGARAID_LEGACY is not set |
| 377 | # CONFIG_MEGARAID_SAS is not set | 393 | # CONFIG_MEGARAID_SAS is not set |
| 394 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 378 | # CONFIG_SCSI_HPTIOP is not set | 395 | # CONFIG_SCSI_HPTIOP is not set |
| 379 | # CONFIG_LIBFC is not set | 396 | # CONFIG_LIBFC is not set |
| 397 | # CONFIG_LIBFCOE is not set | ||
| 380 | # CONFIG_FCOE is not set | 398 | # CONFIG_FCOE is not set |
| 381 | # CONFIG_SCSI_DMX3191D is not set | 399 | # CONFIG_SCSI_DMX3191D is not set |
| 382 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 400 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -398,6 +416,7 @@ CONFIG_SCSI_QLOGICPTI=m | |||
| 398 | CONFIG_SCSI_SUNESP=y | 416 | CONFIG_SCSI_SUNESP=y |
| 399 | # CONFIG_SCSI_SRP is not set | 417 | # CONFIG_SCSI_SRP is not set |
| 400 | # CONFIG_SCSI_DH is not set | 418 | # CONFIG_SCSI_DH is not set |
| 419 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 401 | # CONFIG_ATA is not set | 420 | # CONFIG_ATA is not set |
| 402 | # CONFIG_MD is not set | 421 | # CONFIG_MD is not set |
| 403 | # CONFIG_FUSION is not set | 422 | # CONFIG_FUSION is not set |
| @@ -413,6 +432,7 @@ CONFIG_SCSI_SUNESP=y | |||
| 413 | # CONFIG_IEEE1394 is not set | 432 | # CONFIG_IEEE1394 is not set |
| 414 | # CONFIG_I2O is not set | 433 | # CONFIG_I2O is not set |
| 415 | CONFIG_NETDEVICES=y | 434 | CONFIG_NETDEVICES=y |
| 435 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 416 | CONFIG_DUMMY=m | 436 | CONFIG_DUMMY=m |
| 417 | # CONFIG_BONDING is not set | 437 | # CONFIG_BONDING is not set |
| 418 | # CONFIG_MACVLAN is not set | 438 | # CONFIG_MACVLAN is not set |
| @@ -430,6 +450,8 @@ CONFIG_SUNQE=m | |||
| 430 | # CONFIG_SUNGEM is not set | 450 | # CONFIG_SUNGEM is not set |
| 431 | # CONFIG_CASSINI is not set | 451 | # CONFIG_CASSINI is not set |
| 432 | # CONFIG_NET_VENDOR_3COM is not set | 452 | # CONFIG_NET_VENDOR_3COM is not set |
| 453 | # CONFIG_ETHOC is not set | ||
| 454 | # CONFIG_DNET is not set | ||
| 433 | # CONFIG_NET_TULIP is not set | 455 | # CONFIG_NET_TULIP is not set |
| 434 | # CONFIG_HP100 is not set | 456 | # CONFIG_HP100 is not set |
| 435 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 457 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -448,6 +470,7 @@ CONFIG_NETDEV_1000=y | |||
| 448 | # CONFIG_E1000 is not set | 470 | # CONFIG_E1000 is not set |
| 449 | # CONFIG_IP1000 is not set | 471 | # CONFIG_IP1000 is not set |
| 450 | # CONFIG_IGB is not set | 472 | # CONFIG_IGB is not set |
| 473 | # CONFIG_IGBVF is not set | ||
| 451 | # CONFIG_MYRI_SBUS is not set | 474 | # CONFIG_MYRI_SBUS is not set |
| 452 | # CONFIG_NS83820 is not set | 475 | # CONFIG_NS83820 is not set |
| 453 | # CONFIG_HAMACHI is not set | 476 | # CONFIG_HAMACHI is not set |
| @@ -462,6 +485,7 @@ CONFIG_NETDEV_1000=y | |||
| 462 | # CONFIG_QLA3XXX is not set | 485 | # CONFIG_QLA3XXX is not set |
| 463 | # CONFIG_ATL1 is not set | 486 | # CONFIG_ATL1 is not set |
| 464 | # CONFIG_ATL1E is not set | 487 | # CONFIG_ATL1E is not set |
| 488 | # CONFIG_ATL1C is not set | ||
| 465 | # CONFIG_JME is not set | 489 | # CONFIG_JME is not set |
| 466 | CONFIG_NETDEV_10000=y | 490 | CONFIG_NETDEV_10000=y |
| 467 | # CONFIG_CHELSIO_T1 is not set | 491 | # CONFIG_CHELSIO_T1 is not set |
| @@ -471,6 +495,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 471 | # CONFIG_IXGBE is not set | 495 | # CONFIG_IXGBE is not set |
| 472 | # CONFIG_IXGB is not set | 496 | # CONFIG_IXGB is not set |
| 473 | # CONFIG_S2IO is not set | 497 | # CONFIG_S2IO is not set |
| 498 | # CONFIG_VXGE is not set | ||
| 474 | # CONFIG_MYRI10GE is not set | 499 | # CONFIG_MYRI10GE is not set |
| 475 | # CONFIG_NETXEN_NIC is not set | 500 | # CONFIG_NETXEN_NIC is not set |
| 476 | # CONFIG_NIU is not set | 501 | # CONFIG_NIU is not set |
| @@ -480,6 +505,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 480 | # CONFIG_BNX2X is not set | 505 | # CONFIG_BNX2X is not set |
| 481 | # CONFIG_QLGE is not set | 506 | # CONFIG_QLGE is not set |
| 482 | # CONFIG_SFC is not set | 507 | # CONFIG_SFC is not set |
| 508 | # CONFIG_BE2NET is not set | ||
| 483 | # CONFIG_TR is not set | 509 | # CONFIG_TR is not set |
| 484 | 510 | ||
| 485 | # | 511 | # |
| @@ -487,7 +513,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 487 | # | 513 | # |
| 488 | # CONFIG_WLAN_PRE80211 is not set | 514 | # CONFIG_WLAN_PRE80211 is not set |
| 489 | # CONFIG_WLAN_80211 is not set | 515 | # CONFIG_WLAN_80211 is not set |
| 490 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 491 | 516 | ||
| 492 | # | 517 | # |
| 493 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 518 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
| @@ -537,7 +562,6 @@ CONFIG_MOUSE_PS2=m | |||
| 537 | CONFIG_MOUSE_PS2_ALPS=y | 562 | CONFIG_MOUSE_PS2_ALPS=y |
| 538 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 563 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 539 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 564 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 540 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 541 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 565 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 542 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 566 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 543 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 567 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -597,6 +621,7 @@ CONFIG_LEGACY_PTYS=y | |||
| 597 | CONFIG_LEGACY_PTY_COUNT=256 | 621 | CONFIG_LEGACY_PTY_COUNT=256 |
| 598 | # CONFIG_IPMI_HANDLER is not set | 622 | # CONFIG_IPMI_HANDLER is not set |
| 599 | CONFIG_HW_RANDOM=m | 623 | CONFIG_HW_RANDOM=m |
| 624 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 600 | # CONFIG_R3964 is not set | 625 | # CONFIG_R3964 is not set |
| 601 | # CONFIG_APPLICOM is not set | 626 | # CONFIG_APPLICOM is not set |
| 602 | # CONFIG_RAW_DRIVER is not set | 627 | # CONFIG_RAW_DRIVER is not set |
| @@ -688,7 +713,6 @@ CONFIG_HID=y | |||
| 688 | # | 713 | # |
| 689 | # Special HID drivers | 714 | # Special HID drivers |
| 690 | # | 715 | # |
| 691 | CONFIG_HID_COMPAT=y | ||
| 692 | CONFIG_USB_SUPPORT=y | 716 | CONFIG_USB_SUPPORT=y |
| 693 | CONFIG_USB_ARCH_HAS_HCD=y | 717 | CONFIG_USB_ARCH_HAS_HCD=y |
| 694 | CONFIG_USB_ARCH_HAS_OHCI=y | 718 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -700,7 +724,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 700 | # | 724 | # |
| 701 | 725 | ||
| 702 | # | 726 | # |
| 703 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 727 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 704 | # | 728 | # |
| 705 | # CONFIG_USB_GADGET is not set | 729 | # CONFIG_USB_GADGET is not set |
| 706 | 730 | ||
| @@ -750,6 +774,7 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 750 | # on-CPU RTC drivers | 774 | # on-CPU RTC drivers |
| 751 | # | 775 | # |
| 752 | # CONFIG_DMADEVICES is not set | 776 | # CONFIG_DMADEVICES is not set |
| 777 | # CONFIG_AUXDISPLAY is not set | ||
| 753 | # CONFIG_UIO is not set | 778 | # CONFIG_UIO is not set |
| 754 | # CONFIG_STAGING is not set | 779 | # CONFIG_STAGING is not set |
| 755 | 780 | ||
| @@ -777,6 +802,7 @@ CONFIG_FS_POSIX_ACL=y | |||
| 777 | CONFIG_FILE_LOCKING=y | 802 | CONFIG_FILE_LOCKING=y |
| 778 | # CONFIG_XFS_FS is not set | 803 | # CONFIG_XFS_FS is not set |
| 779 | # CONFIG_OCFS2_FS is not set | 804 | # CONFIG_OCFS2_FS is not set |
| 805 | # CONFIG_BTRFS_FS is not set | ||
| 780 | CONFIG_DNOTIFY=y | 806 | CONFIG_DNOTIFY=y |
| 781 | CONFIG_INOTIFY=y | 807 | CONFIG_INOTIFY=y |
| 782 | CONFIG_INOTIFY_USER=y | 808 | CONFIG_INOTIFY_USER=y |
| @@ -786,6 +812,11 @@ CONFIG_AUTOFS4_FS=m | |||
| 786 | # CONFIG_FUSE_FS is not set | 812 | # CONFIG_FUSE_FS is not set |
| 787 | 813 | ||
| 788 | # | 814 | # |
| 815 | # Caches | ||
| 816 | # | ||
| 817 | # CONFIG_FSCACHE is not set | ||
| 818 | |||
| 819 | # | ||
| 789 | # CD-ROM/DVD Filesystems | 820 | # CD-ROM/DVD Filesystems |
| 790 | # | 821 | # |
| 791 | CONFIG_ISO9660_FS=m | 822 | CONFIG_ISO9660_FS=m |
| @@ -820,14 +851,20 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 820 | # CONFIG_BFS_FS is not set | 851 | # CONFIG_BFS_FS is not set |
| 821 | # CONFIG_EFS_FS is not set | 852 | # CONFIG_EFS_FS is not set |
| 822 | # CONFIG_CRAMFS is not set | 853 | # CONFIG_CRAMFS is not set |
| 854 | # CONFIG_SQUASHFS is not set | ||
| 823 | # CONFIG_VXFS_FS is not set | 855 | # CONFIG_VXFS_FS is not set |
| 824 | # CONFIG_MINIX_FS is not set | 856 | # CONFIG_MINIX_FS is not set |
| 825 | # CONFIG_OMFS_FS is not set | 857 | # CONFIG_OMFS_FS is not set |
| 826 | # CONFIG_HPFS_FS is not set | 858 | # CONFIG_HPFS_FS is not set |
| 827 | # CONFIG_QNX4FS_FS is not set | 859 | # CONFIG_QNX4FS_FS is not set |
| 828 | CONFIG_ROMFS_FS=m | 860 | CONFIG_ROMFS_FS=m |
| 861 | CONFIG_ROMFS_BACKED_BY_BLOCK=y | ||
| 862 | # CONFIG_ROMFS_BACKED_BY_MTD is not set | ||
| 863 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
| 864 | CONFIG_ROMFS_ON_BLOCK=y | ||
| 829 | # CONFIG_SYSV_FS is not set | 865 | # CONFIG_SYSV_FS is not set |
| 830 | # CONFIG_UFS_FS is not set | 866 | # CONFIG_UFS_FS is not set |
| 867 | # CONFIG_NILFS2_FS is not set | ||
| 831 | CONFIG_NETWORK_FILESYSTEMS=y | 868 | CONFIG_NETWORK_FILESYSTEMS=y |
| 832 | CONFIG_NFS_FS=y | 869 | CONFIG_NFS_FS=y |
| 833 | # CONFIG_NFS_V3 is not set | 870 | # CONFIG_NFS_V3 is not set |
| @@ -838,7 +875,6 @@ CONFIG_LOCKD=y | |||
| 838 | CONFIG_NFS_COMMON=y | 875 | CONFIG_NFS_COMMON=y |
| 839 | CONFIG_SUNRPC=y | 876 | CONFIG_SUNRPC=y |
| 840 | CONFIG_SUNRPC_GSS=m | 877 | CONFIG_SUNRPC_GSS=m |
| 841 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 842 | CONFIG_RPCSEC_GSS_KRB5=m | 878 | CONFIG_RPCSEC_GSS_KRB5=m |
| 843 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 879 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 844 | # CONFIG_SMB_FS is not set | 880 | # CONFIG_SMB_FS is not set |
| @@ -911,6 +947,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 911 | CONFIG_DETECT_SOFTLOCKUP=y | 947 | CONFIG_DETECT_SOFTLOCKUP=y |
| 912 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 948 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 913 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 949 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 950 | CONFIG_DETECT_HUNG_TASK=y | ||
| 951 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 952 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 914 | # CONFIG_SCHED_DEBUG is not set | 953 | # CONFIG_SCHED_DEBUG is not set |
| 915 | # CONFIG_SCHEDSTATS is not set | 954 | # CONFIG_SCHEDSTATS is not set |
| 916 | # CONFIG_TIMER_STATS is not set | 955 | # CONFIG_TIMER_STATS is not set |
| @@ -939,15 +978,7 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 939 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 978 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
| 940 | # CONFIG_FAULT_INJECTION is not set | 979 | # CONFIG_FAULT_INJECTION is not set |
| 941 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | 980 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
| 942 | 981 | # CONFIG_PAGE_POISONING is not set | |
| 943 | # | ||
| 944 | # Tracers | ||
| 945 | # | ||
| 946 | # CONFIG_SCHED_TRACER is not set | ||
| 947 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 948 | # CONFIG_BOOT_TRACER is not set | ||
| 949 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 950 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 951 | # CONFIG_SAMPLES is not set | 982 | # CONFIG_SAMPLES is not set |
| 952 | CONFIG_HAVE_ARCH_KGDB=y | 983 | CONFIG_HAVE_ARCH_KGDB=y |
| 953 | CONFIG_KGDB=y | 984 | CONFIG_KGDB=y |
| @@ -979,10 +1010,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 979 | CONFIG_CRYPTO_HASH=y | 1010 | CONFIG_CRYPTO_HASH=y |
| 980 | CONFIG_CRYPTO_HASH2=y | 1011 | CONFIG_CRYPTO_HASH2=y |
| 981 | CONFIG_CRYPTO_RNG2=y | 1012 | CONFIG_CRYPTO_RNG2=y |
| 1013 | CONFIG_CRYPTO_PCOMP=y | ||
| 982 | CONFIG_CRYPTO_MANAGER=y | 1014 | CONFIG_CRYPTO_MANAGER=y |
| 983 | CONFIG_CRYPTO_MANAGER2=y | 1015 | CONFIG_CRYPTO_MANAGER2=y |
| 984 | # CONFIG_CRYPTO_GF128MUL is not set | 1016 | # CONFIG_CRYPTO_GF128MUL is not set |
| 985 | CONFIG_CRYPTO_NULL=m | 1017 | CONFIG_CRYPTO_NULL=m |
| 1018 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 986 | # CONFIG_CRYPTO_CRYPTD is not set | 1019 | # CONFIG_CRYPTO_CRYPTD is not set |
| 987 | CONFIG_CRYPTO_AUTHENC=y | 1020 | CONFIG_CRYPTO_AUTHENC=y |
| 988 | # CONFIG_CRYPTO_TEST is not set | 1021 | # CONFIG_CRYPTO_TEST is not set |
| @@ -1052,6 +1085,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1052 | # Compression | 1085 | # Compression |
| 1053 | # | 1086 | # |
| 1054 | CONFIG_CRYPTO_DEFLATE=y | 1087 | CONFIG_CRYPTO_DEFLATE=y |
| 1088 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1055 | # CONFIG_CRYPTO_LZO is not set | 1089 | # CONFIG_CRYPTO_LZO is not set |
| 1056 | 1090 | ||
| 1057 | # | 1091 | # |
| @@ -1059,6 +1093,7 @@ CONFIG_CRYPTO_DEFLATE=y | |||
| 1059 | # | 1093 | # |
| 1060 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1094 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1061 | # CONFIG_CRYPTO_HW is not set | 1095 | # CONFIG_CRYPTO_HW is not set |
| 1096 | # CONFIG_BINARY_PRINTF is not set | ||
| 1062 | 1097 | ||
| 1063 | # | 1098 | # |
| 1064 | # Library routines | 1099 | # Library routines |
| @@ -1074,7 +1109,10 @@ CONFIG_CRC32=y | |||
| 1074 | CONFIG_LIBCRC32C=m | 1109 | CONFIG_LIBCRC32C=m |
| 1075 | CONFIG_ZLIB_INFLATE=y | 1110 | CONFIG_ZLIB_INFLATE=y |
| 1076 | CONFIG_ZLIB_DEFLATE=y | 1111 | CONFIG_ZLIB_DEFLATE=y |
| 1077 | CONFIG_PLIST=y | 1112 | CONFIG_DECOMPRESS_GZIP=y |
| 1113 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1114 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1078 | CONFIG_HAS_IOMEM=y | 1115 | CONFIG_HAS_IOMEM=y |
| 1079 | CONFIG_HAS_IOPORT=y | 1116 | CONFIG_HAS_IOPORT=y |
| 1080 | CONFIG_HAS_DMA=y | 1117 | CONFIG_HAS_DMA=y |
| 1118 | CONFIG_NLATTR=y | ||
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index ade49941def..b5d63bd8716 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_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.28 | 3 | # Linux kernel version: 2.6.30-rc2 |
| 4 | # Fri Jan 2 18:14:26 2009 | 4 | # Fri Apr 17 02:03:07 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_64BIT=y | ||
| 6 | CONFIG_SPARC=y | 7 | CONFIG_SPARC=y |
| 8 | # CONFIG_SPARC32 is not set | ||
| 7 | CONFIG_SPARC64=y | 9 | CONFIG_SPARC64=y |
| 8 | CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc64_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc64_defconfig" |
| 9 | CONFIG_BITS=64 | 11 | CONFIG_BITS=64 |
| 10 | CONFIG_64BIT=y | ||
| 11 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 12 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 13 | CONFIG_GENERIC_CLOCKEVENTS=y | 14 | CONFIG_GENERIC_CLOCKEVENTS=y |
| @@ -22,6 +23,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | |||
| 22 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| 23 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 24 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
| 24 | CONFIG_OF=y | 25 | CONFIG_OF=y |
| 26 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
| 25 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 26 | 28 | ||
| 27 | # | 29 | # |
| @@ -36,17 +38,27 @@ CONFIG_SWAP=y | |||
| 36 | CONFIG_SYSVIPC=y | 38 | CONFIG_SYSVIPC=y |
| 37 | CONFIG_SYSVIPC_SYSCTL=y | 39 | CONFIG_SYSVIPC_SYSCTL=y |
| 38 | CONFIG_POSIX_MQUEUE=y | 40 | CONFIG_POSIX_MQUEUE=y |
| 41 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
| 39 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 40 | # CONFIG_TASKSTATS is not set | 43 | # CONFIG_TASKSTATS is not set |
| 41 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
| 45 | |||
| 46 | # | ||
| 47 | # RCU Subsystem | ||
| 48 | # | ||
| 49 | CONFIG_CLASSIC_RCU=y | ||
| 50 | # CONFIG_TREE_RCU is not set | ||
| 51 | # CONFIG_PREEMPT_RCU is not set | ||
| 52 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 53 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 42 | # CONFIG_IKCONFIG is not set | 54 | # CONFIG_IKCONFIG is not set |
| 43 | CONFIG_LOG_BUF_SHIFT=18 | 55 | CONFIG_LOG_BUF_SHIFT=18 |
| 44 | # CONFIG_CGROUPS is not set | ||
| 45 | CONFIG_GROUP_SCHED=y | 56 | CONFIG_GROUP_SCHED=y |
| 46 | CONFIG_FAIR_GROUP_SCHED=y | 57 | CONFIG_FAIR_GROUP_SCHED=y |
| 47 | CONFIG_RT_GROUP_SCHED=y | 58 | CONFIG_RT_GROUP_SCHED=y |
| 48 | CONFIG_USER_SCHED=y | 59 | CONFIG_USER_SCHED=y |
| 49 | # CONFIG_CGROUP_SCHED is not set | 60 | # CONFIG_CGROUP_SCHED is not set |
| 61 | # CONFIG_CGROUPS is not set | ||
| 50 | CONFIG_SYSFS_DEPRECATED=y | 62 | CONFIG_SYSFS_DEPRECATED=y |
| 51 | CONFIG_SYSFS_DEPRECATED_V2=y | 63 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 52 | CONFIG_RELAY=y | 64 | CONFIG_RELAY=y |
| @@ -55,24 +67,28 @@ CONFIG_NAMESPACES=y | |||
| 55 | # CONFIG_IPC_NS is not set | 67 | # CONFIG_IPC_NS is not set |
| 56 | # CONFIG_USER_NS is not set | 68 | # CONFIG_USER_NS is not set |
| 57 | # CONFIG_PID_NS is not set | 69 | # CONFIG_PID_NS is not set |
| 70 | # CONFIG_NET_NS is not set | ||
| 58 | CONFIG_BLK_DEV_INITRD=y | 71 | CONFIG_BLK_DEV_INITRD=y |
| 59 | CONFIG_INITRAMFS_SOURCE="" | 72 | CONFIG_INITRAMFS_SOURCE="" |
| 73 | CONFIG_RD_GZIP=y | ||
| 74 | CONFIG_RD_BZIP2=y | ||
| 75 | CONFIG_RD_LZMA=y | ||
| 60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 76 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 61 | CONFIG_SYSCTL=y | 77 | CONFIG_SYSCTL=y |
| 78 | CONFIG_ANON_INODES=y | ||
| 62 | # CONFIG_EMBEDDED is not set | 79 | # CONFIG_EMBEDDED is not set |
| 63 | CONFIG_UID16=y | 80 | CONFIG_UID16=y |
| 64 | CONFIG_SYSCTL_SYSCALL=y | 81 | CONFIG_SYSCTL_SYSCALL=y |
| 65 | CONFIG_KALLSYMS=y | 82 | CONFIG_KALLSYMS=y |
| 66 | # CONFIG_KALLSYMS_ALL is not set | 83 | # CONFIG_KALLSYMS_ALL is not set |
| 67 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 84 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 85 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 68 | CONFIG_HOTPLUG=y | 86 | CONFIG_HOTPLUG=y |
| 69 | CONFIG_PRINTK=y | 87 | CONFIG_PRINTK=y |
| 70 | CONFIG_BUG=y | 88 | CONFIG_BUG=y |
| 71 | CONFIG_ELF_CORE=y | 89 | CONFIG_ELF_CORE=y |
| 72 | # CONFIG_COMPAT_BRK is not set | ||
| 73 | CONFIG_BASE_FULL=y | 90 | CONFIG_BASE_FULL=y |
| 74 | CONFIG_FUTEX=y | 91 | CONFIG_FUTEX=y |
| 75 | CONFIG_ANON_INODES=y | ||
| 76 | CONFIG_EPOLL=y | 92 | CONFIG_EPOLL=y |
| 77 | CONFIG_SIGNALFD=y | 93 | CONFIG_SIGNALFD=y |
| 78 | CONFIG_TIMERFD=y | 94 | CONFIG_TIMERFD=y |
| @@ -82,6 +98,7 @@ CONFIG_AIO=y | |||
| 82 | CONFIG_VM_EVENT_COUNTERS=y | 98 | CONFIG_VM_EVENT_COUNTERS=y |
| 83 | CONFIG_PCI_QUIRKS=y | 99 | CONFIG_PCI_QUIRKS=y |
| 84 | CONFIG_SLUB_DEBUG=y | 100 | CONFIG_SLUB_DEBUG=y |
| 101 | # CONFIG_COMPAT_BRK is not set | ||
| 85 | # CONFIG_SLAB is not set | 102 | # CONFIG_SLAB is not set |
| 86 | CONFIG_SLUB=y | 103 | CONFIG_SLUB=y |
| 87 | # CONFIG_SLOB is not set | 104 | # CONFIG_SLOB is not set |
| @@ -91,15 +108,16 @@ CONFIG_TRACEPOINTS=y | |||
| 91 | CONFIG_OPROFILE=m | 108 | CONFIG_OPROFILE=m |
| 92 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
| 93 | CONFIG_KPROBES=y | 110 | CONFIG_KPROBES=y |
| 111 | CONFIG_HAVE_SYSCALL_WRAPPERS=y | ||
| 94 | CONFIG_KRETPROBES=y | 112 | CONFIG_KRETPROBES=y |
| 95 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 96 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 97 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 115 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 98 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 116 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
| 117 | # CONFIG_SLOW_WORK is not set | ||
| 99 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 118 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 100 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 101 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 102 | # CONFIG_TINY_SHMEM is not set | ||
| 103 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 104 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 105 | # CONFIG_MODULE_FORCE_LOAD is not set | 123 | # CONFIG_MODULE_FORCE_LOAD is not set |
| @@ -107,10 +125,8 @@ CONFIG_MODULE_UNLOAD=y | |||
| 107 | CONFIG_MODULE_FORCE_UNLOAD=y | 125 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 108 | CONFIG_MODVERSIONS=y | 126 | CONFIG_MODVERSIONS=y |
| 109 | CONFIG_MODULE_SRCVERSION_ALL=y | 127 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 110 | CONFIG_KMOD=y | ||
| 111 | CONFIG_STOP_MACHINE=y | 128 | CONFIG_STOP_MACHINE=y |
| 112 | CONFIG_BLOCK=y | 129 | CONFIG_BLOCK=y |
| 113 | CONFIG_BLK_DEV_IO_TRACE=y | ||
| 114 | CONFIG_BLK_DEV_BSG=y | 130 | CONFIG_BLK_DEV_BSG=y |
| 115 | # CONFIG_BLK_DEV_INTEGRITY is not set | 131 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 116 | CONFIG_BLOCK_COMPAT=y | 132 | CONFIG_BLOCK_COMPAT=y |
| @@ -127,11 +143,6 @@ CONFIG_DEFAULT_AS=y | |||
| 127 | # CONFIG_DEFAULT_CFQ is not set | 143 | # CONFIG_DEFAULT_CFQ is not set |
| 128 | # CONFIG_DEFAULT_NOOP is not set | 144 | # CONFIG_DEFAULT_NOOP is not set |
| 129 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 130 | CONFIG_CLASSIC_RCU=y | ||
| 131 | # CONFIG_TREE_RCU is not set | ||
| 132 | # CONFIG_PREEMPT_RCU is not set | ||
| 133 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 134 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 135 | # CONFIG_FREEZER is not set | 146 | # CONFIG_FREEZER is not set |
| 136 | 147 | ||
| 137 | # | 148 | # |
| @@ -185,11 +196,12 @@ CONFIG_SPARSEMEM_VMEMMAP=y | |||
| 185 | CONFIG_PAGEFLAGS_EXTENDED=y | 196 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 186 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 197 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 187 | CONFIG_MIGRATION=y | 198 | CONFIG_MIGRATION=y |
| 188 | CONFIG_RESOURCES_64BIT=y | ||
| 189 | CONFIG_PHYS_ADDR_T_64BIT=y | 199 | CONFIG_PHYS_ADDR_T_64BIT=y |
| 190 | CONFIG_ZONE_DMA_FLAG=0 | 200 | CONFIG_ZONE_DMA_FLAG=0 |
| 191 | CONFIG_NR_QUICK=1 | 201 | CONFIG_NR_QUICK=1 |
| 192 | CONFIG_UNEVICTABLE_LRU=y | 202 | CONFIG_UNEVICTABLE_LRU=y |
| 203 | CONFIG_HAVE_MLOCK=y | ||
| 204 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 193 | CONFIG_SCHED_SMT=y | 205 | CONFIG_SCHED_SMT=y |
| 194 | CONFIG_SCHED_MC=y | 206 | CONFIG_SCHED_MC=y |
| 195 | # CONFIG_PREEMPT_NONE is not set | 207 | # CONFIG_PREEMPT_NONE is not set |
| @@ -210,6 +222,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 210 | CONFIG_PCI_MSI=y | 222 | CONFIG_PCI_MSI=y |
| 211 | # CONFIG_PCI_LEGACY is not set | 223 | # CONFIG_PCI_LEGACY is not set |
| 212 | # CONFIG_PCI_DEBUG is not set | 224 | # CONFIG_PCI_DEBUG is not set |
| 225 | # CONFIG_PCI_STUB is not set | ||
| 226 | # CONFIG_PCI_IOV is not set | ||
| 213 | # CONFIG_PCCARD is not set | 227 | # CONFIG_PCCARD is not set |
| 214 | CONFIG_SUN_OPENPROMFS=m | 228 | CONFIG_SUN_OPENPROMFS=m |
| 215 | CONFIG_SPARC64_PCI=y | 229 | CONFIG_SPARC64_PCI=y |
| @@ -229,8 +243,6 @@ CONFIG_NET=y | |||
| 229 | # | 243 | # |
| 230 | # Networking options | 244 | # Networking options |
| 231 | # | 245 | # |
| 232 | # CONFIG_NET_NS is not set | ||
| 233 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 234 | CONFIG_PACKET=y | 246 | CONFIG_PACKET=y |
| 235 | CONFIG_PACKET_MMAP=y | 247 | CONFIG_PACKET_MMAP=y |
| 236 | CONFIG_UNIX=y | 248 | CONFIG_UNIX=y |
| @@ -292,25 +304,7 @@ CONFIG_IPV6_TUNNEL=m | |||
| 292 | # CONFIG_IPV6_MROUTE is not set | 304 | # CONFIG_IPV6_MROUTE is not set |
| 293 | # CONFIG_NETWORK_SECMARK is not set | 305 | # CONFIG_NETWORK_SECMARK is not set |
| 294 | # CONFIG_NETFILTER is not set | 306 | # CONFIG_NETFILTER is not set |
| 295 | CONFIG_IP_DCCP=m | 307 | # CONFIG_IP_DCCP is not set |
| 296 | CONFIG_INET_DCCP_DIAG=m | ||
| 297 | CONFIG_IP_DCCP_ACKVEC=y | ||
| 298 | |||
| 299 | # | ||
| 300 | # DCCP CCIDs Configuration (EXPERIMENTAL) | ||
| 301 | # | ||
| 302 | CONFIG_IP_DCCP_CCID2=m | ||
| 303 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
| 304 | CONFIG_IP_DCCP_CCID3=m | ||
| 305 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 306 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 307 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
| 308 | |||
| 309 | # | ||
| 310 | # DCCP Kernel Hacking | ||
| 311 | # | ||
| 312 | # CONFIG_IP_DCCP_DEBUG is not set | ||
| 313 | # CONFIG_NET_DCCPPROBE is not set | ||
| 314 | # CONFIG_IP_SCTP is not set | 308 | # CONFIG_IP_SCTP is not set |
| 315 | # CONFIG_TIPC is not set | 309 | # CONFIG_TIPC is not set |
| 316 | # CONFIG_ATM is not set | 310 | # CONFIG_ATM is not set |
| @@ -326,6 +320,7 @@ CONFIG_VLAN_8021Q=m | |||
| 326 | # CONFIG_LAPB is not set | 320 | # CONFIG_LAPB is not set |
| 327 | # CONFIG_ECONET is not set | 321 | # CONFIG_ECONET is not set |
| 328 | # CONFIG_WAN_ROUTER is not set | 322 | # CONFIG_WAN_ROUTER is not set |
| 323 | # CONFIG_PHONET is not set | ||
| 329 | # CONFIG_NET_SCHED is not set | 324 | # CONFIG_NET_SCHED is not set |
| 330 | # CONFIG_DCB is not set | 325 | # CONFIG_DCB is not set |
| 331 | 326 | ||
| @@ -334,18 +329,19 @@ CONFIG_VLAN_8021Q=m | |||
| 334 | # | 329 | # |
| 335 | CONFIG_NET_PKTGEN=m | 330 | CONFIG_NET_PKTGEN=m |
| 336 | CONFIG_NET_TCPPROBE=m | 331 | CONFIG_NET_TCPPROBE=m |
| 332 | # CONFIG_NET_DROP_MONITOR is not set | ||
| 337 | # CONFIG_HAMRADIO is not set | 333 | # CONFIG_HAMRADIO is not set |
| 338 | # CONFIG_CAN is not set | 334 | # CONFIG_CAN is not set |
| 339 | # CONFIG_IRDA is not set | 335 | # CONFIG_IRDA is not set |
| 340 | # CONFIG_BT is not set | 336 | # CONFIG_BT is not set |
| 341 | # CONFIG_AF_RXRPC is not set | 337 | # CONFIG_AF_RXRPC is not set |
| 342 | # CONFIG_PHONET is not set | ||
| 343 | CONFIG_WIRELESS=y | 338 | CONFIG_WIRELESS=y |
| 344 | # CONFIG_CFG80211 is not set | 339 | # CONFIG_CFG80211 is not set |
| 345 | CONFIG_WIRELESS_OLD_REGULATORY=y | 340 | CONFIG_WIRELESS_OLD_REGULATORY=y |
| 346 | # CONFIG_WIRELESS_EXT is not set | 341 | # CONFIG_WIRELESS_EXT is not set |
| 347 | # CONFIG_LIB80211 is not set | 342 | # CONFIG_LIB80211 is not set |
| 348 | # CONFIG_MAC80211 is not set | 343 | # CONFIG_MAC80211 is not set |
| 344 | # CONFIG_WIMAX is not set | ||
| 349 | # CONFIG_RFKILL is not set | 345 | # CONFIG_RFKILL is not set |
| 350 | # CONFIG_NET_9P is not set | 346 | # CONFIG_NET_9P is not set |
| 351 | 347 | ||
| @@ -389,19 +385,27 @@ CONFIG_SUNVDC=m | |||
| 389 | # CONFIG_BLK_DEV_HD is not set | 385 | # CONFIG_BLK_DEV_HD is not set |
| 390 | CONFIG_MISC_DEVICES=y | 386 | CONFIG_MISC_DEVICES=y |
| 391 | # CONFIG_PHANTOM is not set | 387 | # CONFIG_PHANTOM is not set |
| 392 | # CONFIG_EEPROM_93CX6 is not set | ||
| 393 | # CONFIG_SGI_IOC4 is not set | 388 | # CONFIG_SGI_IOC4 is not set |
| 394 | # CONFIG_TIFM_CORE is not set | 389 | # CONFIG_TIFM_CORE is not set |
| 395 | # CONFIG_ICS932S401 is not set | 390 | # CONFIG_ICS932S401 is not set |
| 396 | # CONFIG_ENCLOSURE_SERVICES is not set | 391 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 397 | # CONFIG_HP_ILO is not set | 392 | # CONFIG_HP_ILO is not set |
| 393 | # CONFIG_ISL29003 is not set | ||
| 398 | # CONFIG_C2PORT is not set | 394 | # CONFIG_C2PORT is not set |
| 395 | |||
| 396 | # | ||
| 397 | # EEPROM support | ||
| 398 | # | ||
| 399 | # CONFIG_EEPROM_AT24 is not set | ||
| 400 | # CONFIG_EEPROM_LEGACY is not set | ||
| 401 | # CONFIG_EEPROM_93CX6 is not set | ||
| 399 | CONFIG_HAVE_IDE=y | 402 | CONFIG_HAVE_IDE=y |
| 400 | CONFIG_IDE=y | 403 | CONFIG_IDE=y |
| 401 | 404 | ||
| 402 | # | 405 | # |
| 403 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 406 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 404 | # | 407 | # |
| 408 | CONFIG_IDE_XFER_MODE=y | ||
| 405 | CONFIG_IDE_TIMINGS=y | 409 | CONFIG_IDE_TIMINGS=y |
| 406 | CONFIG_IDE_ATAPI=y | 410 | CONFIG_IDE_ATAPI=y |
| 407 | # CONFIG_BLK_DEV_IDE_SATA is not set | 411 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| @@ -439,6 +443,7 @@ CONFIG_BLK_DEV_ALI15X3=y | |||
| 439 | # CONFIG_BLK_DEV_JMICRON is not set | 443 | # CONFIG_BLK_DEV_JMICRON is not set |
| 440 | # CONFIG_BLK_DEV_SC1200 is not set | 444 | # CONFIG_BLK_DEV_SC1200 is not set |
| 441 | # CONFIG_BLK_DEV_PIIX is not set | 445 | # CONFIG_BLK_DEV_PIIX is not set |
| 446 | # CONFIG_BLK_DEV_IT8172 is not set | ||
| 442 | # CONFIG_BLK_DEV_IT8213 is not set | 447 | # CONFIG_BLK_DEV_IT8213 is not set |
| 443 | # CONFIG_BLK_DEV_IT821X is not set | 448 | # CONFIG_BLK_DEV_IT821X is not set |
| 444 | # CONFIG_BLK_DEV_NS87415 is not set | 449 | # CONFIG_BLK_DEV_NS87415 is not set |
| @@ -506,8 +511,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 506 | # CONFIG_MEGARAID_NEWGEN is not set | 511 | # CONFIG_MEGARAID_NEWGEN is not set |
| 507 | # CONFIG_MEGARAID_LEGACY is not set | 512 | # CONFIG_MEGARAID_LEGACY is not set |
| 508 | # CONFIG_MEGARAID_SAS is not set | 513 | # CONFIG_MEGARAID_SAS is not set |
| 514 | # CONFIG_SCSI_MPT2SAS is not set | ||
| 509 | # CONFIG_SCSI_HPTIOP is not set | 515 | # CONFIG_SCSI_HPTIOP is not set |
| 510 | # CONFIG_LIBFC is not set | 516 | # CONFIG_LIBFC is not set |
| 517 | # CONFIG_LIBFCOE is not set | ||
| 511 | # CONFIG_FCOE is not set | 518 | # CONFIG_FCOE is not set |
| 512 | # CONFIG_SCSI_DMX3191D is not set | 519 | # CONFIG_SCSI_DMX3191D is not set |
| 513 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 520 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -528,6 +535,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 528 | # CONFIG_SCSI_SUNESP is not set | 535 | # CONFIG_SCSI_SUNESP is not set |
| 529 | # CONFIG_SCSI_SRP is not set | 536 | # CONFIG_SCSI_SRP is not set |
| 530 | # CONFIG_SCSI_DH is not set | 537 | # CONFIG_SCSI_DH is not set |
| 538 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 531 | # CONFIG_ATA is not set | 539 | # CONFIG_ATA is not set |
| 532 | CONFIG_MD=y | 540 | CONFIG_MD=y |
| 533 | CONFIG_BLK_DEV_MD=m | 541 | CONFIG_BLK_DEV_MD=m |
| @@ -536,7 +544,7 @@ CONFIG_MD_RAID0=m | |||
| 536 | CONFIG_MD_RAID1=m | 544 | CONFIG_MD_RAID1=m |
| 537 | CONFIG_MD_RAID10=m | 545 | CONFIG_MD_RAID10=m |
| 538 | CONFIG_MD_RAID456=m | 546 | CONFIG_MD_RAID456=m |
| 539 | # CONFIG_MD_RAID5_RESHAPE is not set | 547 | CONFIG_MD_RAID6_PQ=m |
| 540 | CONFIG_MD_MULTIPATH=m | 548 | CONFIG_MD_MULTIPATH=m |
| 541 | # CONFIG_MD_FAULTY is not set | 549 | # CONFIG_MD_FAULTY is not set |
| 542 | CONFIG_BLK_DEV_DM=m | 550 | CONFIG_BLK_DEV_DM=m |
| @@ -561,6 +569,7 @@ CONFIG_DM_ZERO=m | |||
| 561 | # CONFIG_IEEE1394 is not set | 569 | # CONFIG_IEEE1394 is not set |
| 562 | # CONFIG_I2O is not set | 570 | # CONFIG_I2O is not set |
| 563 | CONFIG_NETDEVICES=y | 571 | CONFIG_NETDEVICES=y |
| 572 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 564 | # CONFIG_DUMMY is not set | 573 | # CONFIG_DUMMY is not set |
| 565 | # CONFIG_BONDING is not set | 574 | # CONFIG_BONDING is not set |
| 566 | # CONFIG_MACVLAN is not set | 575 | # CONFIG_MACVLAN is not set |
| @@ -589,14 +598,16 @@ CONFIG_PHYLIB=m | |||
| 589 | # CONFIG_MDIO_BITBANG is not set | 598 | # CONFIG_MDIO_BITBANG is not set |
| 590 | CONFIG_NET_ETHERNET=y | 599 | CONFIG_NET_ETHERNET=y |
| 591 | CONFIG_MII=m | 600 | CONFIG_MII=m |
| 592 | # CONFIG_SUNLANCE is not set | 601 | CONFIG_SUNLANCE=m |
| 593 | # CONFIG_HAPPYMEAL is not set | 602 | CONFIG_HAPPYMEAL=m |
| 594 | # CONFIG_SUNBMAC is not set | 603 | # CONFIG_SUNBMAC is not set |
| 595 | # CONFIG_SUNQE is not set | 604 | # CONFIG_SUNQE is not set |
| 596 | # CONFIG_SUNGEM is not set | 605 | CONFIG_SUNGEM=m |
| 597 | CONFIG_CASSINI=m | 606 | # CONFIG_CASSINI is not set |
| 598 | CONFIG_SUNVNET=m | 607 | CONFIG_SUNVNET=m |
| 599 | # CONFIG_NET_VENDOR_3COM is not set | 608 | # CONFIG_NET_VENDOR_3COM is not set |
| 609 | # CONFIG_ETHOC is not set | ||
| 610 | # CONFIG_DNET is not set | ||
| 600 | # CONFIG_NET_TULIP is not set | 611 | # CONFIG_NET_TULIP is not set |
| 601 | # CONFIG_HP100 is not set | 612 | # CONFIG_HP100 is not set |
| 602 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 613 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| @@ -631,9 +642,10 @@ CONFIG_NETDEV_1000=y | |||
| 631 | # CONFIG_ACENIC is not set | 642 | # CONFIG_ACENIC is not set |
| 632 | # CONFIG_DL2K is not set | 643 | # CONFIG_DL2K is not set |
| 633 | CONFIG_E1000=m | 644 | CONFIG_E1000=m |
| 634 | # CONFIG_E1000E is not set | 645 | CONFIG_E1000E=m |
| 635 | # CONFIG_IP1000 is not set | 646 | # CONFIG_IP1000 is not set |
| 636 | # CONFIG_IGB is not set | 647 | # CONFIG_IGB is not set |
| 648 | # CONFIG_IGBVF is not set | ||
| 637 | # CONFIG_MYRI_SBUS is not set | 649 | # CONFIG_MYRI_SBUS is not set |
| 638 | # CONFIG_NS83820 is not set | 650 | # CONFIG_NS83820 is not set |
| 639 | # CONFIG_HAMACHI is not set | 651 | # CONFIG_HAMACHI is not set |
| @@ -648,6 +660,7 @@ CONFIG_BNX2=m | |||
| 648 | # CONFIG_QLA3XXX is not set | 660 | # CONFIG_QLA3XXX is not set |
| 649 | # CONFIG_ATL1 is not set | 661 | # CONFIG_ATL1 is not set |
| 650 | # CONFIG_ATL1E is not set | 662 | # CONFIG_ATL1E is not set |
| 663 | # CONFIG_ATL1C is not set | ||
| 651 | # CONFIG_JME is not set | 664 | # CONFIG_JME is not set |
| 652 | CONFIG_NETDEV_10000=y | 665 | CONFIG_NETDEV_10000=y |
| 653 | # CONFIG_CHELSIO_T1 is not set | 666 | # CONFIG_CHELSIO_T1 is not set |
| @@ -657,6 +670,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
| 657 | # CONFIG_IXGBE is not set | 670 | # CONFIG_IXGBE is not set |
| 658 | # CONFIG_IXGB is not set | 671 | # CONFIG_IXGB is not set |
| 659 | # CONFIG_S2IO is not set | 672 | # CONFIG_S2IO is not set |
| 673 | # CONFIG_VXGE is not set | ||
| 660 | # CONFIG_MYRI10GE is not set | 674 | # CONFIG_MYRI10GE is not set |
| 661 | # CONFIG_NETXEN_NIC is not set | 675 | # CONFIG_NETXEN_NIC is not set |
| 662 | CONFIG_NIU=m | 676 | CONFIG_NIU=m |
| @@ -666,6 +680,7 @@ CONFIG_NIU=m | |||
| 666 | # CONFIG_BNX2X is not set | 680 | # CONFIG_BNX2X is not set |
| 667 | # CONFIG_QLGE is not set | 681 | # CONFIG_QLGE is not set |
| 668 | # CONFIG_SFC is not set | 682 | # CONFIG_SFC is not set |
| 683 | # CONFIG_BE2NET is not set | ||
| 669 | # CONFIG_TR is not set | 684 | # CONFIG_TR is not set |
| 670 | 685 | ||
| 671 | # | 686 | # |
| @@ -673,7 +688,10 @@ CONFIG_NIU=m | |||
| 673 | # | 688 | # |
| 674 | # CONFIG_WLAN_PRE80211 is not set | 689 | # CONFIG_WLAN_PRE80211 is not set |
| 675 | # CONFIG_WLAN_80211 is not set | 690 | # CONFIG_WLAN_80211 is not set |
| 676 | # CONFIG_IWLWIFI_LEDS is not set | 691 | |
| 692 | # | ||
| 693 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 694 | # | ||
| 677 | 695 | ||
| 678 | # | 696 | # |
| 679 | # USB Network Adapters | 697 | # USB Network Adapters |
| @@ -738,7 +756,6 @@ CONFIG_MOUSE_PS2=y | |||
| 738 | CONFIG_MOUSE_PS2_ALPS=y | 756 | CONFIG_MOUSE_PS2_ALPS=y |
| 739 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 757 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
| 740 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 758 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 741 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 742 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 759 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 743 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 760 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
| 744 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 761 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| @@ -805,6 +822,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 805 | # CONFIG_LEGACY_PTYS is not set | 822 | # CONFIG_LEGACY_PTYS is not set |
| 806 | # CONFIG_IPMI_HANDLER is not set | 823 | # CONFIG_IPMI_HANDLER is not set |
| 807 | CONFIG_HW_RANDOM=m | 824 | CONFIG_HW_RANDOM=m |
| 825 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 808 | CONFIG_HW_RANDOM_N2RNG=m | 826 | CONFIG_HW_RANDOM_N2RNG=m |
| 809 | # CONFIG_R3964 is not set | 827 | # CONFIG_R3964 is not set |
| 810 | # CONFIG_APPLICOM is not set | 828 | # CONFIG_APPLICOM is not set |
| @@ -867,12 +885,9 @@ CONFIG_I2C_ALGOBIT=y | |||
| 867 | # Miscellaneous I2C Chip support | 885 | # Miscellaneous I2C Chip support |
| 868 | # | 886 | # |
| 869 | # CONFIG_DS1682 is not set | 887 | # CONFIG_DS1682 is not set |
| 870 | # CONFIG_EEPROM_AT24 is not set | ||
| 871 | # CONFIG_EEPROM_LEGACY is not set | ||
| 872 | # CONFIG_SENSORS_PCF8574 is not set | 888 | # CONFIG_SENSORS_PCF8574 is not set |
| 873 | # CONFIG_PCF8575 is not set | 889 | # CONFIG_PCF8575 is not set |
| 874 | # CONFIG_SENSORS_PCA9539 is not set | 890 | # CONFIG_SENSORS_PCA9539 is not set |
| 875 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 876 | # CONFIG_SENSORS_MAX6875 is not set | 891 | # CONFIG_SENSORS_MAX6875 is not set |
| 877 | # CONFIG_SENSORS_TSL2550 is not set | 892 | # CONFIG_SENSORS_TSL2550 is not set |
| 878 | # CONFIG_I2C_DEBUG_CORE is not set | 893 | # CONFIG_I2C_DEBUG_CORE is not set |
| @@ -897,12 +912,14 @@ CONFIG_HWMON=y | |||
| 897 | # CONFIG_SENSORS_ADT7462 is not set | 912 | # CONFIG_SENSORS_ADT7462 is not set |
| 898 | # CONFIG_SENSORS_ADT7470 is not set | 913 | # CONFIG_SENSORS_ADT7470 is not set |
| 899 | # CONFIG_SENSORS_ADT7473 is not set | 914 | # CONFIG_SENSORS_ADT7473 is not set |
| 915 | # CONFIG_SENSORS_ADT7475 is not set | ||
| 900 | # CONFIG_SENSORS_ATXP1 is not set | 916 | # CONFIG_SENSORS_ATXP1 is not set |
| 901 | # CONFIG_SENSORS_DS1621 is not set | 917 | # CONFIG_SENSORS_DS1621 is not set |
| 902 | # CONFIG_SENSORS_I5K_AMB is not set | 918 | # CONFIG_SENSORS_I5K_AMB is not set |
| 903 | # CONFIG_SENSORS_F71805F is not set | 919 | # CONFIG_SENSORS_F71805F is not set |
| 904 | # CONFIG_SENSORS_F71882FG is not set | 920 | # CONFIG_SENSORS_F71882FG is not set |
| 905 | # CONFIG_SENSORS_F75375S is not set | 921 | # CONFIG_SENSORS_F75375S is not set |
| 922 | # CONFIG_SENSORS_G760A is not set | ||
| 906 | # CONFIG_SENSORS_GL518SM is not set | 923 | # CONFIG_SENSORS_GL518SM is not set |
| 907 | # CONFIG_SENSORS_GL520SM is not set | 924 | # CONFIG_SENSORS_GL520SM is not set |
| 908 | # CONFIG_SENSORS_IT87 is not set | 925 | # CONFIG_SENSORS_IT87 is not set |
| @@ -917,10 +934,14 @@ CONFIG_HWMON=y | |||
| 917 | # CONFIG_SENSORS_LM90 is not set | 934 | # CONFIG_SENSORS_LM90 is not set |
| 918 | # CONFIG_SENSORS_LM92 is not set | 935 | # CONFIG_SENSORS_LM92 is not set |
| 919 | # CONFIG_SENSORS_LM93 is not set | 936 | # CONFIG_SENSORS_LM93 is not set |
| 937 | # CONFIG_SENSORS_LTC4215 is not set | ||
| 938 | # CONFIG_SENSORS_LTC4245 is not set | ||
| 939 | # CONFIG_SENSORS_LM95241 is not set | ||
| 920 | # CONFIG_SENSORS_MAX1619 is not set | 940 | # CONFIG_SENSORS_MAX1619 is not set |
| 921 | # CONFIG_SENSORS_MAX6650 is not set | 941 | # CONFIG_SENSORS_MAX6650 is not set |
| 922 | # CONFIG_SENSORS_PC87360 is not set | 942 | # CONFIG_SENSORS_PC87360 is not set |
| 923 | # CONFIG_SENSORS_PC87427 is not set | 943 | # CONFIG_SENSORS_PC87427 is not set |
| 944 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 924 | # CONFIG_SENSORS_SIS5595 is not set | 945 | # CONFIG_SENSORS_SIS5595 is not set |
| 925 | # CONFIG_SENSORS_DME1737 is not set | 946 | # CONFIG_SENSORS_DME1737 is not set |
| 926 | # CONFIG_SENSORS_SMSC47M1 is not set | 947 | # CONFIG_SENSORS_SMSC47M1 is not set |
| @@ -957,10 +978,12 @@ CONFIG_SSB_POSSIBLE=y | |||
| 957 | # CONFIG_MFD_CORE is not set | 978 | # CONFIG_MFD_CORE is not set |
| 958 | # CONFIG_MFD_SM501 is not set | 979 | # CONFIG_MFD_SM501 is not set |
| 959 | # CONFIG_HTC_PASIC3 is not set | 980 | # CONFIG_HTC_PASIC3 is not set |
| 981 | # CONFIG_TWL4030_CORE is not set | ||
| 960 | # CONFIG_MFD_TMIO is not set | 982 | # CONFIG_MFD_TMIO is not set |
| 961 | # CONFIG_PMIC_DA903X is not set | 983 | # CONFIG_PMIC_DA903X is not set |
| 962 | # CONFIG_MFD_WM8400 is not set | 984 | # CONFIG_MFD_WM8400 is not set |
| 963 | # CONFIG_MFD_WM8350_I2C is not set | 985 | # CONFIG_MFD_WM8350_I2C is not set |
| 986 | # CONFIG_MFD_PCF50633 is not set | ||
| 964 | # CONFIG_REGULATOR is not set | 987 | # CONFIG_REGULATOR is not set |
| 965 | 988 | ||
| 966 | # | 989 | # |
| @@ -1053,6 +1076,7 @@ CONFIG_FB_ATY_GX=y | |||
| 1053 | # CONFIG_FB_VIRTUAL is not set | 1076 | # CONFIG_FB_VIRTUAL is not set |
| 1054 | # CONFIG_FB_METRONOME is not set | 1077 | # CONFIG_FB_METRONOME is not set |
| 1055 | # CONFIG_FB_MB862XX is not set | 1078 | # CONFIG_FB_MB862XX is not set |
| 1079 | # CONFIG_FB_BROADSHEET is not set | ||
| 1056 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1080 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 1057 | 1081 | ||
| 1058 | # | 1082 | # |
| @@ -1141,6 +1165,8 @@ CONFIG_SND_ALI5451=m | |||
| 1141 | # CONFIG_SND_INDIGO is not set | 1165 | # CONFIG_SND_INDIGO is not set |
| 1142 | # CONFIG_SND_INDIGOIO is not set | 1166 | # CONFIG_SND_INDIGOIO is not set |
| 1143 | # CONFIG_SND_INDIGODJ is not set | 1167 | # CONFIG_SND_INDIGODJ is not set |
| 1168 | # CONFIG_SND_INDIGOIOX is not set | ||
| 1169 | # CONFIG_SND_INDIGODJX is not set | ||
| 1144 | # CONFIG_SND_EMU10K1 is not set | 1170 | # CONFIG_SND_EMU10K1 is not set |
| 1145 | # CONFIG_SND_EMU10K1X is not set | 1171 | # CONFIG_SND_EMU10K1X is not set |
| 1146 | # CONFIG_SND_ENS1370 is not set | 1172 | # CONFIG_SND_ENS1370 is not set |
| @@ -1197,28 +1223,31 @@ CONFIG_USB_HIDDEV=y | |||
| 1197 | # | 1223 | # |
| 1198 | # Special HID drivers | 1224 | # Special HID drivers |
| 1199 | # | 1225 | # |
| 1200 | CONFIG_HID_COMPAT=y | ||
| 1201 | CONFIG_HID_A4TECH=y | 1226 | CONFIG_HID_A4TECH=y |
| 1202 | CONFIG_HID_APPLE=y | 1227 | CONFIG_HID_APPLE=y |
| 1203 | CONFIG_HID_BELKIN=y | 1228 | CONFIG_HID_BELKIN=y |
| 1204 | CONFIG_HID_BRIGHT=y | ||
| 1205 | CONFIG_HID_CHERRY=y | 1229 | CONFIG_HID_CHERRY=y |
| 1206 | CONFIG_HID_CHICONY=y | 1230 | CONFIG_HID_CHICONY=y |
| 1207 | CONFIG_HID_CYPRESS=y | 1231 | CONFIG_HID_CYPRESS=y |
| 1208 | CONFIG_HID_DELL=y | 1232 | # CONFIG_DRAGONRISE_FF is not set |
| 1209 | CONFIG_HID_EZKEY=y | 1233 | CONFIG_HID_EZKEY=y |
| 1234 | CONFIG_HID_KYE=y | ||
| 1210 | CONFIG_HID_GYRATION=y | 1235 | CONFIG_HID_GYRATION=y |
| 1236 | CONFIG_HID_KENSINGTON=y | ||
| 1211 | CONFIG_HID_LOGITECH=y | 1237 | CONFIG_HID_LOGITECH=y |
| 1212 | # CONFIG_LOGITECH_FF is not set | 1238 | # CONFIG_LOGITECH_FF is not set |
| 1213 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1239 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
| 1214 | CONFIG_HID_MICROSOFT=y | 1240 | CONFIG_HID_MICROSOFT=y |
| 1215 | CONFIG_HID_MONTEREY=y | 1241 | CONFIG_HID_MONTEREY=y |
| 1242 | CONFIG_HID_NTRIG=y | ||
| 1216 | CONFIG_HID_PANTHERLORD=y | 1243 | CONFIG_HID_PANTHERLORD=y |
| 1217 | # CONFIG_PANTHERLORD_FF is not set | 1244 | # CONFIG_PANTHERLORD_FF is not set |
| 1218 | CONFIG_HID_PETALYNX=y | 1245 | CONFIG_HID_PETALYNX=y |
| 1219 | CONFIG_HID_SAMSUNG=y | 1246 | CONFIG_HID_SAMSUNG=y |
| 1220 | CONFIG_HID_SONY=y | 1247 | CONFIG_HID_SONY=y |
| 1221 | CONFIG_HID_SUNPLUS=y | 1248 | CONFIG_HID_SUNPLUS=y |
| 1249 | # CONFIG_GREENASIA_FF is not set | ||
| 1250 | CONFIG_HID_TOPSEED=y | ||
| 1222 | # CONFIG_THRUSTMASTER_FF is not set | 1251 | # CONFIG_THRUSTMASTER_FF is not set |
| 1223 | # CONFIG_ZEROPLUS_FF is not set | 1252 | # CONFIG_ZEROPLUS_FF is not set |
| 1224 | CONFIG_USB_SUPPORT=y | 1253 | CONFIG_USB_SUPPORT=y |
| @@ -1247,6 +1276,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1247 | CONFIG_USB_EHCI_HCD=m | 1276 | CONFIG_USB_EHCI_HCD=m |
| 1248 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1277 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1249 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1278 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1279 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 1250 | # CONFIG_USB_ISP116X_HCD is not set | 1280 | # CONFIG_USB_ISP116X_HCD is not set |
| 1251 | # CONFIG_USB_ISP1760_HCD is not set | 1281 | # CONFIG_USB_ISP1760_HCD is not set |
| 1252 | CONFIG_USB_OHCI_HCD=y | 1282 | CONFIG_USB_OHCI_HCD=y |
| @@ -1268,18 +1298,17 @@ CONFIG_USB_UHCI_HCD=m | |||
| 1268 | # CONFIG_USB_TMC is not set | 1298 | # CONFIG_USB_TMC is not set |
| 1269 | 1299 | ||
| 1270 | # | 1300 | # |
| 1271 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1301 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
| 1272 | # | 1302 | # |
| 1273 | 1303 | ||
| 1274 | # | 1304 | # |
| 1275 | # see USB_STORAGE Help for more information | 1305 | # also be needed; see USB_STORAGE Help for more info |
| 1276 | # | 1306 | # |
| 1277 | CONFIG_USB_STORAGE=m | 1307 | CONFIG_USB_STORAGE=m |
| 1278 | # CONFIG_USB_STORAGE_DEBUG is not set | 1308 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1279 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1309 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 1280 | # CONFIG_USB_STORAGE_FREECOM is not set | 1310 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 1281 | # CONFIG_USB_STORAGE_ISD200 is not set | 1311 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 1282 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1283 | # CONFIG_USB_STORAGE_USBAT is not set | 1312 | # CONFIG_USB_STORAGE_USBAT is not set |
| 1284 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1313 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 1285 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1314 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| @@ -1315,7 +1344,6 @@ CONFIG_USB_STORAGE=m | |||
| 1315 | # CONFIG_USB_LED is not set | 1344 | # CONFIG_USB_LED is not set |
| 1316 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1345 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1317 | # CONFIG_USB_CYTHERM is not set | 1346 | # CONFIG_USB_CYTHERM is not set |
| 1318 | # CONFIG_USB_PHIDGET is not set | ||
| 1319 | # CONFIG_USB_IDMOUSE is not set | 1347 | # CONFIG_USB_IDMOUSE is not set |
| 1320 | # CONFIG_USB_FTDI_ELAN is not set | 1348 | # CONFIG_USB_FTDI_ELAN is not set |
| 1321 | # CONFIG_USB_APPLEDISPLAY is not set | 1349 | # CONFIG_USB_APPLEDISPLAY is not set |
| @@ -1327,6 +1355,11 @@ CONFIG_USB_STORAGE=m | |||
| 1327 | # CONFIG_USB_ISIGHTFW is not set | 1355 | # CONFIG_USB_ISIGHTFW is not set |
| 1328 | # CONFIG_USB_VST is not set | 1356 | # CONFIG_USB_VST is not set |
| 1329 | # CONFIG_USB_GADGET is not set | 1357 | # CONFIG_USB_GADGET is not set |
| 1358 | |||
| 1359 | # | ||
| 1360 | # OTG and related infrastructure | ||
| 1361 | # | ||
| 1362 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1330 | # CONFIG_UWB is not set | 1363 | # CONFIG_UWB is not set |
| 1331 | # CONFIG_MMC is not set | 1364 | # CONFIG_MMC is not set |
| 1332 | # CONFIG_MEMSTICK is not set | 1365 | # CONFIG_MEMSTICK is not set |
| @@ -1390,6 +1423,7 @@ CONFIG_RTC_DRV_BQ4802=y | |||
| 1390 | CONFIG_RTC_DRV_SUN4V=y | 1423 | CONFIG_RTC_DRV_SUN4V=y |
| 1391 | CONFIG_RTC_DRV_STARFIRE=y | 1424 | CONFIG_RTC_DRV_STARFIRE=y |
| 1392 | # CONFIG_DMADEVICES is not set | 1425 | # CONFIG_DMADEVICES is not set |
| 1426 | # CONFIG_AUXDISPLAY is not set | ||
| 1393 | # CONFIG_UIO is not set | 1427 | # CONFIG_UIO is not set |
| 1394 | # CONFIG_STAGING is not set | 1428 | # CONFIG_STAGING is not set |
| 1395 | 1429 | ||
| @@ -1412,6 +1446,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y | |||
| 1412 | CONFIG_EXT2_FS_SECURITY=y | 1446 | CONFIG_EXT2_FS_SECURITY=y |
| 1413 | # CONFIG_EXT2_FS_XIP is not set | 1447 | # CONFIG_EXT2_FS_XIP is not set |
| 1414 | CONFIG_EXT3_FS=y | 1448 | CONFIG_EXT3_FS=y |
| 1449 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1415 | CONFIG_EXT3_FS_XATTR=y | 1450 | CONFIG_EXT3_FS_XATTR=y |
| 1416 | CONFIG_EXT3_FS_POSIX_ACL=y | 1451 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1417 | CONFIG_EXT3_FS_SECURITY=y | 1452 | CONFIG_EXT3_FS_SECURITY=y |
| @@ -1426,6 +1461,7 @@ CONFIG_FILE_LOCKING=y | |||
| 1426 | # CONFIG_XFS_FS is not set | 1461 | # CONFIG_XFS_FS is not set |
| 1427 | # CONFIG_GFS2_FS is not set | 1462 | # CONFIG_GFS2_FS is not set |
| 1428 | # CONFIG_OCFS2_FS is not set | 1463 | # CONFIG_OCFS2_FS is not set |
| 1464 | # CONFIG_BTRFS_FS is not set | ||
| 1429 | CONFIG_DNOTIFY=y | 1465 | CONFIG_DNOTIFY=y |
| 1430 | CONFIG_INOTIFY=y | 1466 | CONFIG_INOTIFY=y |
| 1431 | CONFIG_INOTIFY_USER=y | 1467 | CONFIG_INOTIFY_USER=y |
| @@ -1435,6 +1471,11 @@ CONFIG_INOTIFY_USER=y | |||
| 1435 | # CONFIG_FUSE_FS is not set | 1471 | # CONFIG_FUSE_FS is not set |
| 1436 | 1472 | ||
| 1437 | # | 1473 | # |
| 1474 | # Caches | ||
| 1475 | # | ||
| 1476 | # CONFIG_FSCACHE is not set | ||
| 1477 | |||
| 1478 | # | ||
| 1438 | # CD-ROM/DVD Filesystems | 1479 | # CD-ROM/DVD Filesystems |
| 1439 | # | 1480 | # |
| 1440 | # CONFIG_ISO9660_FS is not set | 1481 | # CONFIG_ISO9660_FS is not set |
| @@ -1460,10 +1501,7 @@ CONFIG_TMPFS=y | |||
| 1460 | CONFIG_HUGETLBFS=y | 1501 | CONFIG_HUGETLBFS=y |
| 1461 | CONFIG_HUGETLB_PAGE=y | 1502 | CONFIG_HUGETLB_PAGE=y |
| 1462 | # CONFIG_CONFIGFS_FS is not set | 1503 | # CONFIG_CONFIGFS_FS is not set |
| 1463 | 1504 | CONFIG_MISC_FILESYSTEMS=y | |
| 1464 | # | ||
| 1465 | # Miscellaneous filesystems | ||
| 1466 | # | ||
| 1467 | # CONFIG_ADFS_FS is not set | 1505 | # CONFIG_ADFS_FS is not set |
| 1468 | # CONFIG_AFFS_FS is not set | 1506 | # CONFIG_AFFS_FS is not set |
| 1469 | # CONFIG_ECRYPT_FS is not set | 1507 | # CONFIG_ECRYPT_FS is not set |
| @@ -1473,6 +1511,7 @@ CONFIG_HUGETLB_PAGE=y | |||
| 1473 | # CONFIG_BFS_FS is not set | 1511 | # CONFIG_BFS_FS is not set |
| 1474 | # CONFIG_EFS_FS is not set | 1512 | # CONFIG_EFS_FS is not set |
| 1475 | # CONFIG_CRAMFS is not set | 1513 | # CONFIG_CRAMFS is not set |
| 1514 | # CONFIG_SQUASHFS is not set | ||
| 1476 | # CONFIG_VXFS_FS is not set | 1515 | # CONFIG_VXFS_FS is not set |
| 1477 | # CONFIG_MINIX_FS is not set | 1516 | # CONFIG_MINIX_FS is not set |
| 1478 | # CONFIG_OMFS_FS is not set | 1517 | # CONFIG_OMFS_FS is not set |
| @@ -1481,6 +1520,7 @@ CONFIG_HUGETLB_PAGE=y | |||
| 1481 | # CONFIG_ROMFS_FS is not set | 1520 | # CONFIG_ROMFS_FS is not set |
| 1482 | # CONFIG_SYSV_FS is not set | 1521 | # CONFIG_SYSV_FS is not set |
| 1483 | # CONFIG_UFS_FS is not set | 1522 | # CONFIG_UFS_FS is not set |
| 1523 | # CONFIG_NILFS2_FS is not set | ||
| 1484 | CONFIG_NETWORK_FILESYSTEMS=y | 1524 | CONFIG_NETWORK_FILESYSTEMS=y |
| 1485 | # CONFIG_NFS_FS is not set | 1525 | # CONFIG_NFS_FS is not set |
| 1486 | # CONFIG_NFSD is not set | 1526 | # CONFIG_NFSD is not set |
| @@ -1555,6 +1595,9 @@ CONFIG_DEBUG_KERNEL=y | |||
| 1555 | CONFIG_DETECT_SOFTLOCKUP=y | 1595 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1556 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1596 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
| 1557 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1597 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
| 1598 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1599 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1600 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1558 | # CONFIG_SCHED_DEBUG is not set | 1601 | # CONFIG_SCHED_DEBUG is not set |
| 1559 | CONFIG_SCHEDSTATS=y | 1602 | CONFIG_SCHEDSTATS=y |
| 1560 | # CONFIG_TIMER_STATS is not set | 1603 | # CONFIG_TIMER_STATS is not set |
| @@ -1590,10 +1633,12 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 1590 | # CONFIG_FAULT_INJECTION is not set | 1633 | # CONFIG_FAULT_INJECTION is not set |
| 1591 | # CONFIG_LATENCYTOP is not set | 1634 | # CONFIG_LATENCYTOP is not set |
| 1592 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1635 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1636 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1593 | CONFIG_NOP_TRACER=y | 1637 | CONFIG_NOP_TRACER=y |
| 1594 | CONFIG_HAVE_FUNCTION_TRACER=y | 1638 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1595 | CONFIG_RING_BUFFER=y | 1639 | CONFIG_RING_BUFFER=y |
| 1596 | CONFIG_TRACING=y | 1640 | CONFIG_TRACING=y |
| 1641 | CONFIG_TRACING_SUPPORT=y | ||
| 1597 | 1642 | ||
| 1598 | # | 1643 | # |
| 1599 | # Tracers | 1644 | # Tracers |
| @@ -1602,18 +1647,21 @@ CONFIG_TRACING=y | |||
| 1602 | # CONFIG_IRQSOFF_TRACER is not set | 1647 | # CONFIG_IRQSOFF_TRACER is not set |
| 1603 | # CONFIG_SCHED_TRACER is not set | 1648 | # CONFIG_SCHED_TRACER is not set |
| 1604 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1649 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1650 | # CONFIG_EVENT_TRACER is not set | ||
| 1605 | # CONFIG_BOOT_TRACER is not set | 1651 | # CONFIG_BOOT_TRACER is not set |
| 1606 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1652 | # CONFIG_TRACE_BRANCH_PROFILING is not set |
| 1607 | # CONFIG_STACK_TRACER is not set | 1653 | # CONFIG_STACK_TRACER is not set |
| 1654 | # CONFIG_KMEMTRACE is not set | ||
| 1655 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1656 | CONFIG_BLK_DEV_IO_TRACE=y | ||
| 1608 | # CONFIG_FTRACE_STARTUP_TEST is not set | 1657 | # CONFIG_FTRACE_STARTUP_TEST is not set |
| 1609 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1658 | # CONFIG_DYNAMIC_DEBUG is not set |
| 1610 | # CONFIG_SAMPLES is not set | 1659 | # CONFIG_SAMPLES is not set |
| 1611 | CONFIG_HAVE_ARCH_KGDB=y | 1660 | CONFIG_HAVE_ARCH_KGDB=y |
| 1612 | # CONFIG_KGDB is not set | 1661 | # CONFIG_KGDB is not set |
| 1613 | # CONFIG_DEBUG_STACK_USAGE is not set | 1662 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1614 | # CONFIG_DEBUG_DCFLUSH is not set | 1663 | # CONFIG_DEBUG_DCFLUSH is not set |
| 1615 | # CONFIG_STACK_DEBUG is not set | 1664 | # CONFIG_STACK_DEBUG is not set |
| 1616 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1617 | 1665 | ||
| 1618 | # | 1666 | # |
| 1619 | # Security options | 1667 | # Security options |
| @@ -1642,10 +1690,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
| 1642 | CONFIG_CRYPTO_HASH=y | 1690 | CONFIG_CRYPTO_HASH=y |
| 1643 | CONFIG_CRYPTO_HASH2=y | 1691 | CONFIG_CRYPTO_HASH2=y |
| 1644 | CONFIG_CRYPTO_RNG2=y | 1692 | CONFIG_CRYPTO_RNG2=y |
| 1693 | CONFIG_CRYPTO_PCOMP=y | ||
| 1645 | CONFIG_CRYPTO_MANAGER=y | 1694 | CONFIG_CRYPTO_MANAGER=y |
| 1646 | CONFIG_CRYPTO_MANAGER2=y | 1695 | CONFIG_CRYPTO_MANAGER2=y |
| 1647 | CONFIG_CRYPTO_GF128MUL=m | 1696 | CONFIG_CRYPTO_GF128MUL=m |
| 1648 | CONFIG_CRYPTO_NULL=m | 1697 | CONFIG_CRYPTO_NULL=m |
| 1698 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1649 | # CONFIG_CRYPTO_CRYPTD is not set | 1699 | # CONFIG_CRYPTO_CRYPTD is not set |
| 1650 | CONFIG_CRYPTO_AUTHENC=y | 1700 | CONFIG_CRYPTO_AUTHENC=y |
| 1651 | CONFIG_CRYPTO_TEST=m | 1701 | CONFIG_CRYPTO_TEST=m |
| @@ -1715,6 +1765,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m | |||
| 1715 | # Compression | 1765 | # Compression |
| 1716 | # | 1766 | # |
| 1717 | CONFIG_CRYPTO_DEFLATE=y | 1767 | CONFIG_CRYPTO_DEFLATE=y |
| 1768 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1718 | # CONFIG_CRYPTO_LZO is not set | 1769 | # CONFIG_CRYPTO_LZO is not set |
| 1719 | 1770 | ||
| 1720 | # | 1771 | # |
| @@ -1723,11 +1774,13 @@ CONFIG_CRYPTO_DEFLATE=y | |||
| 1723 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1774 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1724 | CONFIG_CRYPTO_HW=y | 1775 | CONFIG_CRYPTO_HW=y |
| 1725 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1776 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1777 | CONFIG_BINARY_PRINTF=y | ||
| 1726 | 1778 | ||
| 1727 | # | 1779 | # |
| 1728 | # Library routines | 1780 | # Library routines |
| 1729 | # | 1781 | # |
| 1730 | CONFIG_BITREVERSE=y | 1782 | CONFIG_BITREVERSE=y |
| 1783 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1731 | CONFIG_CRC_CCITT=m | 1784 | CONFIG_CRC_CCITT=m |
| 1732 | CONFIG_CRC16=m | 1785 | CONFIG_CRC16=m |
| 1733 | # CONFIG_CRC_T10DIF is not set | 1786 | # CONFIG_CRC_T10DIF is not set |
| @@ -1737,8 +1790,11 @@ CONFIG_CRC32=y | |||
| 1737 | CONFIG_LIBCRC32C=m | 1790 | CONFIG_LIBCRC32C=m |
| 1738 | CONFIG_ZLIB_INFLATE=y | 1791 | CONFIG_ZLIB_INFLATE=y |
| 1739 | CONFIG_ZLIB_DEFLATE=y | 1792 | CONFIG_ZLIB_DEFLATE=y |
| 1740 | CONFIG_PLIST=y | 1793 | CONFIG_DECOMPRESS_GZIP=y |
| 1794 | CONFIG_DECOMPRESS_BZIP2=y | ||
| 1795 | CONFIG_DECOMPRESS_LZMA=y | ||
| 1741 | CONFIG_HAS_IOMEM=y | 1796 | CONFIG_HAS_IOMEM=y |
| 1742 | CONFIG_HAS_IOPORT=y | 1797 | CONFIG_HAS_IOPORT=y |
| 1743 | CONFIG_HAS_DMA=y | 1798 | CONFIG_HAS_DMA=y |
| 1744 | CONFIG_HAVE_LMB=y | 1799 | CONFIG_HAVE_LMB=y |
| 1800 | CONFIG_NLATTR=y | ||
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index 0a83bd73765..c8f14c1dc52 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c | |||
| @@ -246,8 +246,25 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) | |||
| 246 | 246 | ||
| 247 | static int of_bus_sbus_match(struct device_node *np) | 247 | static int of_bus_sbus_match(struct device_node *np) |
| 248 | { | 248 | { |
| 249 | return !strcmp(np->name, "sbus") || | 249 | struct device_node *dp = np; |
| 250 | !strcmp(np->name, "sbi"); | 250 | |
| 251 | while (dp) { | ||
| 252 | if (!strcmp(dp->name, "sbus") || | ||
| 253 | !strcmp(dp->name, "sbi")) | ||
| 254 | return 1; | ||
| 255 | |||
| 256 | /* Have a look at use_1to1_mapping(). We're trying | ||
| 257 | * to match SBUS if that's the top-level bus and we | ||
| 258 | * don't have some intervening real bus that provides | ||
| 259 | * ranges based translations. | ||
| 260 | */ | ||
| 261 | if (of_find_property(dp, "ranges", NULL) != NULL) | ||
| 262 | break; | ||
| 263 | |||
| 264 | dp = dp->parent; | ||
| 265 | } | ||
| 266 | |||
| 267 | return 0; | ||
| 251 | } | 268 | } |
| 252 | 269 | ||
| 253 | static void of_bus_sbus_count_cells(struct device_node *child, | 270 | static void of_bus_sbus_count_cells(struct device_node *child, |
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c index 27381f1baff..5ac287ac03d 100644 --- a/arch/sparc/kernel/of_device_64.c +++ b/arch/sparc/kernel/of_device_64.c | |||
| @@ -300,8 +300,25 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) | |||
| 300 | 300 | ||
| 301 | static int of_bus_sbus_match(struct device_node *np) | 301 | static int of_bus_sbus_match(struct device_node *np) |
| 302 | { | 302 | { |
| 303 | return !strcmp(np->name, "sbus") || | 303 | struct device_node *dp = np; |
| 304 | !strcmp(np->name, "sbi"); | 304 | |
| 305 | while (dp) { | ||
| 306 | if (!strcmp(dp->name, "sbus") || | ||
| 307 | !strcmp(dp->name, "sbi")) | ||
| 308 | return 1; | ||
| 309 | |||
| 310 | /* Have a look at use_1to1_mapping(). We're trying | ||
| 311 | * to match SBUS if that's the top-level bus and we | ||
| 312 | * don't have some intervening real bus that provides | ||
| 313 | * ranges based translations. | ||
| 314 | */ | ||
| 315 | if (of_find_property(dp, "ranges", NULL) != NULL) | ||
| 316 | break; | ||
| 317 | |||
| 318 | dp = dp->parent; | ||
| 319 | } | ||
| 320 | |||
| 321 | return 0; | ||
| 305 | } | 322 | } |
| 306 | 323 | ||
| 307 | static void of_bus_sbus_count_cells(struct device_node *child, | 324 | static void of_bus_sbus_count_cells(struct device_node *child, |
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index ecdb682ab51..208ecf6643d 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
| @@ -65,14 +65,18 @@ enum { | |||
| 65 | struct acpi_cpufreq_data { | 65 | struct acpi_cpufreq_data { |
| 66 | struct acpi_processor_performance *acpi_data; | 66 | struct acpi_processor_performance *acpi_data; |
| 67 | struct cpufreq_frequency_table *freq_table; | 67 | struct cpufreq_frequency_table *freq_table; |
| 68 | unsigned int max_freq; | ||
| 69 | unsigned int resume; | 68 | unsigned int resume; |
| 70 | unsigned int cpu_feature; | 69 | unsigned int cpu_feature; |
| 71 | u64 saved_aperf, saved_mperf; | ||
| 72 | }; | 70 | }; |
| 73 | 71 | ||
| 74 | static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data); | 72 | static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data); |
| 75 | 73 | ||
| 74 | struct acpi_msr_data { | ||
| 75 | u64 saved_aperf, saved_mperf; | ||
| 76 | }; | ||
| 77 | |||
| 78 | static DEFINE_PER_CPU(struct acpi_msr_data, msr_data); | ||
| 79 | |||
| 76 | DEFINE_TRACE(power_mark); | 80 | DEFINE_TRACE(power_mark); |
| 77 | 81 | ||
| 78 | /* acpi_perf_data is a pointer to percpu data. */ | 82 | /* acpi_perf_data is a pointer to percpu data. */ |
| @@ -287,11 +291,11 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy, | |||
| 287 | return 0; | 291 | return 0; |
| 288 | 292 | ||
| 289 | cur.aperf.whole = readin.aperf.whole - | 293 | cur.aperf.whole = readin.aperf.whole - |
| 290 | per_cpu(drv_data, cpu)->saved_aperf; | 294 | per_cpu(msr_data, cpu).saved_aperf; |
| 291 | cur.mperf.whole = readin.mperf.whole - | 295 | cur.mperf.whole = readin.mperf.whole - |
| 292 | per_cpu(drv_data, cpu)->saved_mperf; | 296 | per_cpu(msr_data, cpu).saved_mperf; |
| 293 | per_cpu(drv_data, cpu)->saved_aperf = readin.aperf.whole; | 297 | per_cpu(msr_data, cpu).saved_aperf = readin.aperf.whole; |
| 294 | per_cpu(drv_data, cpu)->saved_mperf = readin.mperf.whole; | 298 | per_cpu(msr_data, cpu).saved_mperf = readin.mperf.whole; |
| 295 | 299 | ||
| 296 | #ifdef __i386__ | 300 | #ifdef __i386__ |
| 297 | /* | 301 | /* |
| @@ -335,7 +339,7 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy, | |||
| 335 | 339 | ||
| 336 | #endif | 340 | #endif |
| 337 | 341 | ||
| 338 | retval = per_cpu(drv_data, policy->cpu)->max_freq * perf_percent / 100; | 342 | retval = (policy->cpuinfo.max_freq * perf_percent) / 100; |
| 339 | 343 | ||
| 340 | return retval; | 344 | return retval; |
| 341 | } | 345 | } |
| @@ -688,16 +692,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 688 | /* Check for high latency (>20uS) from buggy BIOSes, like on T42 */ | 692 | /* Check for high latency (>20uS) from buggy BIOSes, like on T42 */ |
| 689 | if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE && | 693 | if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE && |
| 690 | policy->cpuinfo.transition_latency > 20 * 1000) { | 694 | policy->cpuinfo.transition_latency > 20 * 1000) { |
| 691 | static int print_once; | ||
| 692 | policy->cpuinfo.transition_latency = 20 * 1000; | 695 | policy->cpuinfo.transition_latency = 20 * 1000; |
| 693 | if (!print_once) { | 696 | printk_once(KERN_INFO "Capping off P-state tranision" |
| 694 | print_once = 1; | 697 | " latency at 20 uS\n"); |
| 695 | printk(KERN_INFO "Capping off P-state tranision latency" | ||
| 696 | " at 20 uS\n"); | ||
| 697 | } | ||
| 698 | } | 698 | } |
| 699 | 699 | ||
| 700 | data->max_freq = perf->states[0].core_frequency * 1000; | ||
| 701 | /* table init */ | 700 | /* table init */ |
| 702 | for (i = 0; i < perf->state_count; i++) { | 701 | for (i = 0; i < perf->state_count; i++) { |
| 703 | if (i > 0 && perf->states[i].core_frequency >= | 702 | if (i > 0 && perf->states[i].core_frequency >= |
| @@ -716,6 +715,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 716 | if (result) | 715 | if (result) |
| 717 | goto err_freqfree; | 716 | goto err_freqfree; |
| 718 | 717 | ||
| 718 | if (perf->states[0].core_frequency * 1000 != policy->cpuinfo.max_freq) | ||
| 719 | printk(KERN_WARNING FW_WARN "P-state 0 is not max freq\n"); | ||
| 720 | |||
| 719 | switch (perf->control_register.space_id) { | 721 | switch (perf->control_register.space_id) { |
| 720 | case ACPI_ADR_SPACE_SYSTEM_IO: | 722 | case ACPI_ADR_SPACE_SYSTEM_IO: |
| 721 | /* Current speed is unknown and not detectable by IO port */ | 723 | /* Current speed is unknown and not detectable by IO port */ |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 2a36f7f7c4c..b6caf1329b1 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -1248,7 +1248,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu, | |||
| 1248 | pgprintk("%s: adding gfn %lx role %x\n", __func__, gfn, role.word); | 1248 | pgprintk("%s: adding gfn %lx role %x\n", __func__, gfn, role.word); |
| 1249 | sp->gfn = gfn; | 1249 | sp->gfn = gfn; |
| 1250 | sp->role = role; | 1250 | sp->role = role; |
| 1251 | sp->global = role.cr4_pge; | 1251 | sp->global = 0; |
| 1252 | hlist_add_head(&sp->hash_link, bucket); | 1252 | hlist_add_head(&sp->hash_link, bucket); |
| 1253 | if (!direct) { | 1253 | if (!direct) { |
| 1254 | if (rmap_write_protect(vcpu->kvm, gfn)) | 1254 | if (rmap_write_protect(vcpu->kvm, gfn)) |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8ca100a9eca..7c1ce5ac613 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -2775,6 +2775,9 @@ out: | |||
| 2775 | 2775 | ||
| 2776 | void kvm_arch_exit(void) | 2776 | void kvm_arch_exit(void) |
| 2777 | { | 2777 | { |
| 2778 | if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) | ||
| 2779 | cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block, | ||
| 2780 | CPUFREQ_TRANSITION_NOTIFIER); | ||
| 2778 | kvm_x86_ops = NULL; | 2781 | kvm_x86_ops = NULL; |
| 2779 | kvm_mmu_module_exit(); | 2782 | kvm_mmu_module_exit(); |
| 2780 | } | 2783 | } |
| @@ -4159,6 +4162,11 @@ EXPORT_SYMBOL_GPL(kvm_put_guest_fpu); | |||
| 4159 | 4162 | ||
| 4160 | void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) | 4163 | void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) |
| 4161 | { | 4164 | { |
| 4165 | if (vcpu->arch.time_page) { | ||
| 4166 | kvm_release_page_dirty(vcpu->arch.time_page); | ||
| 4167 | vcpu->arch.time_page = NULL; | ||
| 4168 | } | ||
| 4169 | |||
| 4162 | kvm_x86_ops->vcpu_free(vcpu); | 4170 | kvm_x86_ops->vcpu_free(vcpu); |
| 4163 | } | 4171 | } |
| 4164 | 4172 | ||
diff --git a/block/blk-core.c b/block/blk-core.c index 07ab75403e1..2998fe3a237 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -643,7 +643,7 @@ static inline void blk_free_request(struct request_queue *q, struct request *rq) | |||
| 643 | } | 643 | } |
| 644 | 644 | ||
| 645 | static struct request * | 645 | static struct request * |
| 646 | blk_alloc_request(struct request_queue *q, int rw, int priv, gfp_t gfp_mask) | 646 | blk_alloc_request(struct request_queue *q, int flags, int priv, gfp_t gfp_mask) |
| 647 | { | 647 | { |
| 648 | struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask); | 648 | struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask); |
| 649 | 649 | ||
| @@ -652,7 +652,7 @@ blk_alloc_request(struct request_queue *q, int rw, int priv, gfp_t gfp_mask) | |||
| 652 | 652 | ||
| 653 | blk_rq_init(q, rq); | 653 | blk_rq_init(q, rq); |
| 654 | 654 | ||
| 655 | rq->cmd_flags = rw | REQ_ALLOCED; | 655 | rq->cmd_flags = flags | REQ_ALLOCED; |
| 656 | 656 | ||
| 657 | if (priv) { | 657 | if (priv) { |
| 658 | if (unlikely(elv_set_request(q, rq, gfp_mask))) { | 658 | if (unlikely(elv_set_request(q, rq, gfp_mask))) { |
| @@ -792,6 +792,8 @@ static struct request *get_request(struct request_queue *q, int rw_flags, | |||
| 792 | if (priv) | 792 | if (priv) |
| 793 | rl->elvpriv++; | 793 | rl->elvpriv++; |
| 794 | 794 | ||
| 795 | if (blk_queue_io_stat(q)) | ||
| 796 | rw_flags |= REQ_IO_STAT; | ||
| 795 | spin_unlock_irq(q->queue_lock); | 797 | spin_unlock_irq(q->queue_lock); |
| 796 | 798 | ||
| 797 | rq = blk_alloc_request(q, rw_flags, priv, gfp_mask); | 799 | rq = blk_alloc_request(q, rw_flags, priv, gfp_mask); |
diff --git a/block/blk-merge.c b/block/blk-merge.c index 63760ca3da0..23d2a6fe34a 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c | |||
| @@ -402,7 +402,10 @@ static int attempt_merge(struct request_queue *q, struct request *req, | |||
| 402 | 402 | ||
| 403 | elv_merge_requests(q, req, next); | 403 | elv_merge_requests(q, req, next); |
| 404 | 404 | ||
| 405 | blk_account_io_merge(req); | 405 | /* |
| 406 | * 'next' is going away, so update stats accordingly | ||
| 407 | */ | ||
| 408 | blk_account_io_merge(next); | ||
| 406 | 409 | ||
| 407 | req->ioprio = ioprio_best(req->ioprio, next->ioprio); | 410 | req->ioprio = ioprio_best(req->ioprio, next->ioprio); |
| 408 | if (blk_rq_cpu_valid(next)) | 411 | if (blk_rq_cpu_valid(next)) |
diff --git a/block/blk-settings.c b/block/blk-settings.c index 69c42adde52..57af728d94b 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
| @@ -156,26 +156,28 @@ EXPORT_SYMBOL(blk_queue_make_request); | |||
| 156 | 156 | ||
| 157 | /** | 157 | /** |
| 158 | * blk_queue_bounce_limit - set bounce buffer limit for queue | 158 | * blk_queue_bounce_limit - set bounce buffer limit for queue |
| 159 | * @q: the request queue for the device | 159 | * @q: the request queue for the device |
| 160 | * @dma_addr: bus address limit | 160 | * @dma_mask: the maximum address the device can handle |
| 161 | * | 161 | * |
| 162 | * Description: | 162 | * Description: |
| 163 | * Different hardware can have different requirements as to what pages | 163 | * Different hardware can have different requirements as to what pages |
| 164 | * it can do I/O directly to. A low level driver can call | 164 | * it can do I/O directly to. A low level driver can call |
| 165 | * blk_queue_bounce_limit to have lower memory pages allocated as bounce | 165 | * blk_queue_bounce_limit to have lower memory pages allocated as bounce |
| 166 | * buffers for doing I/O to pages residing above @dma_addr. | 166 | * buffers for doing I/O to pages residing above @dma_mask. |
| 167 | **/ | 167 | **/ |
| 168 | void blk_queue_bounce_limit(struct request_queue *q, u64 dma_addr) | 168 | void blk_queue_bounce_limit(struct request_queue *q, u64 dma_mask) |
| 169 | { | 169 | { |
| 170 | unsigned long b_pfn = dma_addr >> PAGE_SHIFT; | 170 | unsigned long b_pfn = dma_mask >> PAGE_SHIFT; |
| 171 | int dma = 0; | 171 | int dma = 0; |
| 172 | 172 | ||
| 173 | q->bounce_gfp = GFP_NOIO; | 173 | q->bounce_gfp = GFP_NOIO; |
| 174 | #if BITS_PER_LONG == 64 | 174 | #if BITS_PER_LONG == 64 |
| 175 | /* Assume anything <= 4GB can be handled by IOMMU. | 175 | /* |
| 176 | Actually some IOMMUs can handle everything, but I don't | 176 | * Assume anything <= 4GB can be handled by IOMMU. Actually |
| 177 | know of a way to test this here. */ | 177 | * some IOMMUs can handle everything, but I don't know of a |
| 178 | if (b_pfn < (min_t(u64, 0x100000000UL, BLK_BOUNCE_HIGH) >> PAGE_SHIFT)) | 178 | * way to test this here. |
| 179 | */ | ||
| 180 | if (b_pfn < (min_t(u64, 0xffffffffUL, BLK_BOUNCE_HIGH) >> PAGE_SHIFT)) | ||
| 179 | dma = 1; | 181 | dma = 1; |
| 180 | q->bounce_pfn = max_low_pfn; | 182 | q->bounce_pfn = max_low_pfn; |
| 181 | #else | 183 | #else |
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index cac4e9febe6..3ff9bba3379 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c | |||
| @@ -209,14 +209,10 @@ static ssize_t queue_iostats_store(struct request_queue *q, const char *page, | |||
| 209 | ssize_t ret = queue_var_store(&stats, page, count); | 209 | ssize_t ret = queue_var_store(&stats, page, count); |
| 210 | 210 | ||
| 211 | spin_lock_irq(q->queue_lock); | 211 | spin_lock_irq(q->queue_lock); |
| 212 | elv_quiesce_start(q); | ||
| 213 | |||
| 214 | if (stats) | 212 | if (stats) |
| 215 | queue_flag_set(QUEUE_FLAG_IO_STAT, q); | 213 | queue_flag_set(QUEUE_FLAG_IO_STAT, q); |
| 216 | else | 214 | else |
| 217 | queue_flag_clear(QUEUE_FLAG_IO_STAT, q); | 215 | queue_flag_clear(QUEUE_FLAG_IO_STAT, q); |
| 218 | |||
| 219 | elv_quiesce_end(q); | ||
| 220 | spin_unlock_irq(q->queue_lock); | 216 | spin_unlock_irq(q->queue_lock); |
| 221 | 217 | ||
| 222 | return ret; | 218 | return ret; |
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index bbbdc4b8ccf..1ec0d503cac 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c | |||
| @@ -211,6 +211,12 @@ void blk_abort_queue(struct request_queue *q) | |||
| 211 | struct request *rq, *tmp; | 211 | struct request *rq, *tmp; |
| 212 | LIST_HEAD(list); | 212 | LIST_HEAD(list); |
| 213 | 213 | ||
| 214 | /* | ||
| 215 | * Not a request based block device, nothing to abort | ||
| 216 | */ | ||
| 217 | if (!q->request_fn) | ||
| 218 | return; | ||
| 219 | |||
| 214 | spin_lock_irqsave(q->queue_lock, flags); | 220 | spin_lock_irqsave(q->queue_lock, flags); |
| 215 | 221 | ||
| 216 | elv_abort_queue(q); | 222 | elv_abort_queue(q); |
| @@ -224,6 +230,13 @@ void blk_abort_queue(struct request_queue *q) | |||
| 224 | list_for_each_entry_safe(rq, tmp, &list, timeout_list) | 230 | list_for_each_entry_safe(rq, tmp, &list, timeout_list) |
| 225 | blk_abort_request(rq); | 231 | blk_abort_request(rq); |
| 226 | 232 | ||
| 233 | /* | ||
| 234 | * Occasionally, blk_abort_request() will return without | ||
| 235 | * deleting the element from the list. Make sure we add those back | ||
| 236 | * instead of leaving them on the local stack list. | ||
| 237 | */ | ||
| 238 | list_splice(&list, &q->timeout_list); | ||
| 239 | |||
| 227 | spin_unlock_irqrestore(q->queue_lock, flags); | 240 | spin_unlock_irqrestore(q->queue_lock, flags); |
| 228 | 241 | ||
| 229 | } | 242 | } |
diff --git a/block/blk.h b/block/blk.h index 5dfc41267a0..79c85f7c9ff 100644 --- a/block/blk.h +++ b/block/blk.h | |||
| @@ -114,12 +114,7 @@ static inline int blk_cpu_to_group(int cpu) | |||
| 114 | 114 | ||
| 115 | static inline int blk_do_io_stat(struct request *rq) | 115 | static inline int blk_do_io_stat(struct request *rq) |
| 116 | { | 116 | { |
| 117 | struct gendisk *disk = rq->rq_disk; | 117 | return rq->rq_disk && blk_rq_io_stat(rq); |
| 118 | |||
| 119 | if (!disk || !disk->queue) | ||
| 120 | return 0; | ||
| 121 | |||
| 122 | return blk_queue_io_stat(disk->queue) && (rq->cmd_flags & REQ_ELVPRIV); | ||
| 123 | } | 118 | } |
| 124 | 119 | ||
| 125 | #endif | 120 | #endif |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 0d3b70de3d8..a55a9bd75bd 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -154,6 +154,8 @@ struct cfq_queue { | |||
| 154 | unsigned long rb_key; | 154 | unsigned long rb_key; |
| 155 | /* prio tree member */ | 155 | /* prio tree member */ |
| 156 | struct rb_node p_node; | 156 | struct rb_node p_node; |
| 157 | /* prio tree root we belong to, if any */ | ||
| 158 | struct rb_root *p_root; | ||
| 157 | /* sorted list of pending requests */ | 159 | /* sorted list of pending requests */ |
| 158 | struct rb_root sort_list; | 160 | struct rb_root sort_list; |
| 159 | /* if fifo isn't expired, next request to serve */ | 161 | /* if fifo isn't expired, next request to serve */ |
| @@ -558,10 +560,10 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq, | |||
| 558 | } | 560 | } |
| 559 | 561 | ||
| 560 | static struct cfq_queue * | 562 | static struct cfq_queue * |
| 561 | cfq_prio_tree_lookup(struct cfq_data *cfqd, int ioprio, sector_t sector, | 563 | cfq_prio_tree_lookup(struct cfq_data *cfqd, struct rb_root *root, |
| 562 | struct rb_node **ret_parent, struct rb_node ***rb_link) | 564 | sector_t sector, struct rb_node **ret_parent, |
| 565 | struct rb_node ***rb_link) | ||
| 563 | { | 566 | { |
| 564 | struct rb_root *root = &cfqd->prio_trees[ioprio]; | ||
| 565 | struct rb_node **p, *parent; | 567 | struct rb_node **p, *parent; |
| 566 | struct cfq_queue *cfqq = NULL; | 568 | struct cfq_queue *cfqq = NULL; |
| 567 | 569 | ||
| @@ -584,34 +586,38 @@ cfq_prio_tree_lookup(struct cfq_data *cfqd, int ioprio, sector_t sector, | |||
| 584 | else | 586 | else |
| 585 | break; | 587 | break; |
| 586 | p = n; | 588 | p = n; |
| 589 | cfqq = NULL; | ||
| 587 | } | 590 | } |
| 588 | 591 | ||
| 589 | *ret_parent = parent; | 592 | *ret_parent = parent; |
| 590 | if (rb_link) | 593 | if (rb_link) |
| 591 | *rb_link = p; | 594 | *rb_link = p; |
| 592 | return NULL; | 595 | return cfqq; |
| 593 | } | 596 | } |
| 594 | 597 | ||
| 595 | static void cfq_prio_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq) | 598 | static void cfq_prio_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq) |
| 596 | { | 599 | { |
| 597 | struct rb_root *root = &cfqd->prio_trees[cfqq->ioprio]; | ||
| 598 | struct rb_node **p, *parent; | 600 | struct rb_node **p, *parent; |
| 599 | struct cfq_queue *__cfqq; | 601 | struct cfq_queue *__cfqq; |
| 600 | 602 | ||
| 601 | if (!RB_EMPTY_NODE(&cfqq->p_node)) | 603 | if (cfqq->p_root) { |
| 602 | rb_erase_init(&cfqq->p_node, root); | 604 | rb_erase(&cfqq->p_node, cfqq->p_root); |
| 605 | cfqq->p_root = NULL; | ||
| 606 | } | ||
| 603 | 607 | ||
| 604 | if (cfq_class_idle(cfqq)) | 608 | if (cfq_class_idle(cfqq)) |
| 605 | return; | 609 | return; |
| 606 | if (!cfqq->next_rq) | 610 | if (!cfqq->next_rq) |
| 607 | return; | 611 | return; |
| 608 | 612 | ||
| 609 | __cfqq = cfq_prio_tree_lookup(cfqd, cfqq->ioprio, cfqq->next_rq->sector, | 613 | cfqq->p_root = &cfqd->prio_trees[cfqq->org_ioprio]; |
| 614 | __cfqq = cfq_prio_tree_lookup(cfqd, cfqq->p_root, cfqq->next_rq->sector, | ||
| 610 | &parent, &p); | 615 | &parent, &p); |
| 611 | BUG_ON(__cfqq); | 616 | if (!__cfqq) { |
| 612 | 617 | rb_link_node(&cfqq->p_node, parent, p); | |
| 613 | rb_link_node(&cfqq->p_node, parent, p); | 618 | rb_insert_color(&cfqq->p_node, cfqq->p_root); |
| 614 | rb_insert_color(&cfqq->p_node, root); | 619 | } else |
| 620 | cfqq->p_root = NULL; | ||
| 615 | } | 621 | } |
| 616 | 622 | ||
| 617 | /* | 623 | /* |
| @@ -656,8 +662,10 @@ static void cfq_del_cfqq_rr(struct cfq_data *cfqd, struct cfq_queue *cfqq) | |||
| 656 | 662 | ||
| 657 | if (!RB_EMPTY_NODE(&cfqq->rb_node)) | 663 | if (!RB_EMPTY_NODE(&cfqq->rb_node)) |
| 658 | cfq_rb_erase(&cfqq->rb_node, &cfqd->service_tree); | 664 | cfq_rb_erase(&cfqq->rb_node, &cfqd->service_tree); |
| 659 | if (!RB_EMPTY_NODE(&cfqq->p_node)) | 665 | if (cfqq->p_root) { |
| 660 | rb_erase_init(&cfqq->p_node, &cfqd->prio_trees[cfqq->ioprio]); | 666 | rb_erase(&cfqq->p_node, cfqq->p_root); |
| 667 | cfqq->p_root = NULL; | ||
| 668 | } | ||
| 661 | 669 | ||
| 662 | BUG_ON(!cfqd->busy_queues); | 670 | BUG_ON(!cfqd->busy_queues); |
| 663 | cfqd->busy_queues--; | 671 | cfqd->busy_queues--; |
| @@ -947,20 +955,24 @@ static inline sector_t cfq_dist_from_last(struct cfq_data *cfqd, | |||
| 947 | return cfqd->last_position - rq->sector; | 955 | return cfqd->last_position - rq->sector; |
| 948 | } | 956 | } |
| 949 | 957 | ||
| 958 | #define CIC_SEEK_THR 8 * 1024 | ||
| 959 | #define CIC_SEEKY(cic) ((cic)->seek_mean > CIC_SEEK_THR) | ||
| 960 | |||
| 950 | static inline int cfq_rq_close(struct cfq_data *cfqd, struct request *rq) | 961 | static inline int cfq_rq_close(struct cfq_data *cfqd, struct request *rq) |
| 951 | { | 962 | { |
| 952 | struct cfq_io_context *cic = cfqd->active_cic; | 963 | struct cfq_io_context *cic = cfqd->active_cic; |
| 964 | sector_t sdist = cic->seek_mean; | ||
| 953 | 965 | ||
| 954 | if (!sample_valid(cic->seek_samples)) | 966 | if (!sample_valid(cic->seek_samples)) |
| 955 | return 0; | 967 | sdist = CIC_SEEK_THR; |
| 956 | 968 | ||
| 957 | return cfq_dist_from_last(cfqd, rq) <= cic->seek_mean; | 969 | return cfq_dist_from_last(cfqd, rq) <= sdist; |
| 958 | } | 970 | } |
| 959 | 971 | ||
| 960 | static struct cfq_queue *cfqq_close(struct cfq_data *cfqd, | 972 | static struct cfq_queue *cfqq_close(struct cfq_data *cfqd, |
| 961 | struct cfq_queue *cur_cfqq) | 973 | struct cfq_queue *cur_cfqq) |
| 962 | { | 974 | { |
| 963 | struct rb_root *root = &cfqd->prio_trees[cur_cfqq->ioprio]; | 975 | struct rb_root *root = &cfqd->prio_trees[cur_cfqq->org_ioprio]; |
| 964 | struct rb_node *parent, *node; | 976 | struct rb_node *parent, *node; |
| 965 | struct cfq_queue *__cfqq; | 977 | struct cfq_queue *__cfqq; |
| 966 | sector_t sector = cfqd->last_position; | 978 | sector_t sector = cfqd->last_position; |
| @@ -972,8 +984,7 @@ static struct cfq_queue *cfqq_close(struct cfq_data *cfqd, | |||
| 972 | * First, if we find a request starting at the end of the last | 984 | * First, if we find a request starting at the end of the last |
| 973 | * request, choose it. | 985 | * request, choose it. |
| 974 | */ | 986 | */ |
| 975 | __cfqq = cfq_prio_tree_lookup(cfqd, cur_cfqq->ioprio, | 987 | __cfqq = cfq_prio_tree_lookup(cfqd, root, sector, &parent, NULL); |
| 976 | sector, &parent, NULL); | ||
| 977 | if (__cfqq) | 988 | if (__cfqq) |
| 978 | return __cfqq; | 989 | return __cfqq; |
| 979 | 990 | ||
| @@ -1039,9 +1050,6 @@ static struct cfq_queue *cfq_close_cooperator(struct cfq_data *cfqd, | |||
| 1039 | return cfqq; | 1050 | return cfqq; |
| 1040 | } | 1051 | } |
| 1041 | 1052 | ||
| 1042 | |||
| 1043 | #define CIC_SEEKY(cic) ((cic)->seek_mean > (8 * 1024)) | ||
| 1044 | |||
| 1045 | static void cfq_arm_slice_timer(struct cfq_data *cfqd) | 1053 | static void cfq_arm_slice_timer(struct cfq_data *cfqd) |
| 1046 | { | 1054 | { |
| 1047 | struct cfq_queue *cfqq = cfqd->active_queue; | 1055 | struct cfq_queue *cfqq = cfqd->active_queue; |
| @@ -1908,7 +1916,9 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic, | |||
| 1908 | sector_t sdist; | 1916 | sector_t sdist; |
| 1909 | u64 total; | 1917 | u64 total; |
| 1910 | 1918 | ||
| 1911 | if (cic->last_request_pos < rq->sector) | 1919 | if (!cic->last_request_pos) |
| 1920 | sdist = 0; | ||
| 1921 | else if (cic->last_request_pos < rq->sector) | ||
| 1912 | sdist = rq->sector - cic->last_request_pos; | 1922 | sdist = rq->sector - cic->last_request_pos; |
| 1913 | else | 1923 | else |
| 1914 | sdist = cic->last_request_pos - rq->sector; | 1924 | sdist = cic->last_request_pos - rq->sector; |
| @@ -2443,12 +2453,22 @@ static void cfq_exit_queue(struct elevator_queue *e) | |||
| 2443 | static void *cfq_init_queue(struct request_queue *q) | 2453 | static void *cfq_init_queue(struct request_queue *q) |
| 2444 | { | 2454 | { |
| 2445 | struct cfq_data *cfqd; | 2455 | struct cfq_data *cfqd; |
| 2456 | int i; | ||
| 2446 | 2457 | ||
| 2447 | cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node); | 2458 | cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node); |
| 2448 | if (!cfqd) | 2459 | if (!cfqd) |
| 2449 | return NULL; | 2460 | return NULL; |
| 2450 | 2461 | ||
| 2451 | cfqd->service_tree = CFQ_RB_ROOT; | 2462 | cfqd->service_tree = CFQ_RB_ROOT; |
| 2463 | |||
| 2464 | /* | ||
| 2465 | * Not strictly needed (since RB_ROOT just clears the node and we | ||
| 2466 | * zeroed cfqd on alloc), but better be safe in case someone decides | ||
| 2467 | * to add magic to the rb code | ||
| 2468 | */ | ||
| 2469 | for (i = 0; i < CFQ_PRIO_LISTS; i++) | ||
| 2470 | cfqd->prio_trees[i] = RB_ROOT; | ||
| 2471 | |||
| 2452 | INIT_LIST_HEAD(&cfqd->cic_list); | 2472 | INIT_LIST_HEAD(&cfqd->cic_list); |
| 2453 | 2473 | ||
| 2454 | cfqd->queue = q; | 2474 | cfqd->queue = q; |
diff --git a/block/genhd.c b/block/genhd.c index a9ec910974c..1a4916e0173 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
| @@ -98,7 +98,7 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk, | |||
| 98 | 98 | ||
| 99 | if (flags & DISK_PITER_REVERSE) | 99 | if (flags & DISK_PITER_REVERSE) |
| 100 | piter->idx = ptbl->len - 1; | 100 | piter->idx = ptbl->len - 1; |
| 101 | else if (flags & DISK_PITER_INCL_PART0) | 101 | else if (flags & (DISK_PITER_INCL_PART0 | DISK_PITER_INCL_EMPTY_PART0)) |
| 102 | piter->idx = 0; | 102 | piter->idx = 0; |
| 103 | else | 103 | else |
| 104 | piter->idx = 1; | 104 | piter->idx = 1; |
| @@ -134,7 +134,8 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) | |||
| 134 | /* determine iteration parameters */ | 134 | /* determine iteration parameters */ |
| 135 | if (piter->flags & DISK_PITER_REVERSE) { | 135 | if (piter->flags & DISK_PITER_REVERSE) { |
| 136 | inc = -1; | 136 | inc = -1; |
| 137 | if (piter->flags & DISK_PITER_INCL_PART0) | 137 | if (piter->flags & (DISK_PITER_INCL_PART0 | |
| 138 | DISK_PITER_INCL_EMPTY_PART0)) | ||
| 138 | end = -1; | 139 | end = -1; |
| 139 | else | 140 | else |
| 140 | end = 0; | 141 | end = 0; |
| @@ -150,7 +151,10 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) | |||
| 150 | part = rcu_dereference(ptbl->part[piter->idx]); | 151 | part = rcu_dereference(ptbl->part[piter->idx]); |
| 151 | if (!part) | 152 | if (!part) |
| 152 | continue; | 153 | continue; |
| 153 | if (!(piter->flags & DISK_PITER_INCL_EMPTY) && !part->nr_sects) | 154 | if (!part->nr_sects && |
| 155 | !(piter->flags & DISK_PITER_INCL_EMPTY) && | ||
| 156 | !(piter->flags & DISK_PITER_INCL_EMPTY_PART0 && | ||
| 157 | piter->idx == 0)) | ||
| 154 | continue; | 158 | continue; |
| 155 | 159 | ||
| 156 | get_device(part_to_dev(part)); | 160 | get_device(part_to_dev(part)); |
| @@ -1011,7 +1015,7 @@ static int diskstats_show(struct seq_file *seqf, void *v) | |||
| 1011 | "\n\n"); | 1015 | "\n\n"); |
| 1012 | */ | 1016 | */ |
| 1013 | 1017 | ||
| 1014 | disk_part_iter_init(&piter, gp, DISK_PITER_INCL_PART0); | 1018 | disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0); |
| 1015 | while ((hd = disk_part_iter_next(&piter))) { | 1019 | while ((hd = disk_part_iter_next(&piter))) { |
| 1016 | cpu = part_stat_lock(); | 1020 | cpu = part_stat_lock(); |
| 1017 | part_round_stats(cpu, hd); | 1021 | part_round_stats(cpu, hd); |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 84b7f8709f4..82a0ca2f672 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -290,6 +290,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, | |||
| 290 | 290 | ||
| 291 | if (hdr->iovec_count) { | 291 | if (hdr->iovec_count) { |
| 292 | const int size = sizeof(struct sg_iovec) * hdr->iovec_count; | 292 | const int size = sizeof(struct sg_iovec) * hdr->iovec_count; |
| 293 | size_t iov_data_len; | ||
| 293 | struct sg_iovec *iov; | 294 | struct sg_iovec *iov; |
| 294 | 295 | ||
| 295 | iov = kmalloc(size, GFP_KERNEL); | 296 | iov = kmalloc(size, GFP_KERNEL); |
| @@ -304,8 +305,18 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, | |||
| 304 | goto out; | 305 | goto out; |
| 305 | } | 306 | } |
| 306 | 307 | ||
| 308 | /* SG_IO howto says that the shorter of the two wins */ | ||
| 309 | iov_data_len = iov_length((struct iovec *)iov, | ||
| 310 | hdr->iovec_count); | ||
| 311 | if (hdr->dxfer_len < iov_data_len) { | ||
| 312 | hdr->iovec_count = iov_shorten((struct iovec *)iov, | ||
| 313 | hdr->iovec_count, | ||
| 314 | hdr->dxfer_len); | ||
| 315 | iov_data_len = hdr->dxfer_len; | ||
| 316 | } | ||
| 317 | |||
| 307 | ret = blk_rq_map_user_iov(q, rq, NULL, iov, hdr->iovec_count, | 318 | ret = blk_rq_map_user_iov(q, rq, NULL, iov, hdr->iovec_count, |
| 308 | hdr->dxfer_len, GFP_KERNEL); | 319 | iov_data_len, GFP_KERNEL); |
| 309 | kfree(iov); | 320 | kfree(iov); |
| 310 | } else if (hdr->dxfer_len) | 321 | } else if (hdr->dxfer_len) |
| 311 | ret = blk_rq_map_user(q, rq, NULL, hdr->dxferp, hdr->dxfer_len, | 322 | ret = blk_rq_map_user(q, rq, NULL, hdr->dxferp, hdr->dxfer_len, |
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index baa5fc05e12..db307a356f0 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c | |||
| @@ -211,6 +211,12 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) | |||
| 211 | 211 | ||
| 212 | ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) | 212 | ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) |
| 213 | 213 | ||
| 214 | static unsigned int gts, bfs; | ||
| 215 | module_param(gts, uint, 0644); | ||
| 216 | module_param(bfs, uint, 0644); | ||
| 217 | MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend."); | ||
| 218 | MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".); | ||
| 219 | |||
| 214 | /******************************************************************************* | 220 | /******************************************************************************* |
| 215 | * | 221 | * |
| 216 | * FUNCTION: acpi_enter_sleep_state | 222 | * FUNCTION: acpi_enter_sleep_state |
| @@ -278,16 +284,18 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
| 278 | return_ACPI_STATUS(status); | 284 | return_ACPI_STATUS(status); |
| 279 | } | 285 | } |
| 280 | 286 | ||
| 281 | /* Execute the _GTS method */ | 287 | if (gts) { |
| 288 | /* Execute the _GTS method */ | ||
| 282 | 289 | ||
| 283 | arg_list.count = 1; | 290 | arg_list.count = 1; |
| 284 | arg_list.pointer = &arg; | 291 | arg_list.pointer = &arg; |
| 285 | arg.type = ACPI_TYPE_INTEGER; | 292 | arg.type = ACPI_TYPE_INTEGER; |
| 286 | arg.integer.value = sleep_state; | 293 | arg.integer.value = sleep_state; |
| 287 | 294 | ||
| 288 | status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL); | 295 | status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL); |
| 289 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { | 296 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { |
| 290 | return_ACPI_STATUS(status); | 297 | return_ACPI_STATUS(status); |
| 298 | } | ||
| 291 | } | 299 | } |
| 292 | 300 | ||
| 293 | /* Get current value of PM1A control */ | 301 | /* Get current value of PM1A control */ |
| @@ -513,18 +521,19 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state) | |||
| 513 | } | 521 | } |
| 514 | } | 522 | } |
| 515 | 523 | ||
| 516 | /* Execute the _BFS method */ | 524 | if (bfs) { |
| 525 | /* Execute the _BFS method */ | ||
| 517 | 526 | ||
| 518 | arg_list.count = 1; | 527 | arg_list.count = 1; |
| 519 | arg_list.pointer = &arg; | 528 | arg_list.pointer = &arg; |
| 520 | arg.type = ACPI_TYPE_INTEGER; | 529 | arg.type = ACPI_TYPE_INTEGER; |
| 521 | arg.integer.value = sleep_state; | 530 | arg.integer.value = sleep_state; |
| 522 | 531 | ||
| 523 | status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL); | 532 | status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL); |
| 524 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { | 533 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { |
| 525 | ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS")); | 534 | ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS")); |
| 535 | } | ||
| 526 | } | 536 | } |
| 527 | |||
| 528 | return_ACPI_STATUS(status); | 537 | return_ACPI_STATUS(status); |
| 529 | } | 538 | } |
| 530 | 539 | ||
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c index 7737afb157c..ec33f270c5b 100644 --- a/drivers/acpi/acpica/hwvalid.c +++ b/drivers/acpi/acpica/hwvalid.c | |||
| @@ -90,6 +90,7 @@ static const struct acpi_port_info acpi_protected_ports[] = { | |||
| 90 | {"PIT2", 0x0048, 0x004B, ACPI_OSI_WIN_XP}, | 90 | {"PIT2", 0x0048, 0x004B, ACPI_OSI_WIN_XP}, |
| 91 | {"RTC", 0x0070, 0x0071, ACPI_OSI_WIN_XP}, | 91 | {"RTC", 0x0070, 0x0071, ACPI_OSI_WIN_XP}, |
| 92 | {"CMOS", 0x0074, 0x0076, ACPI_OSI_WIN_XP}, | 92 | {"CMOS", 0x0074, 0x0076, ACPI_OSI_WIN_XP}, |
| 93 | {"DMA1", 0x0081, 0x0083, ACPI_OSI_WIN_XP}, | ||
| 93 | {"DMA1L", 0x0087, 0x0087, ACPI_OSI_WIN_XP}, | 94 | {"DMA1L", 0x0087, 0x0087, ACPI_OSI_WIN_XP}, |
| 94 | {"DMA2", 0x0089, 0x008B, ACPI_OSI_WIN_XP}, | 95 | {"DMA2", 0x0089, 0x008B, ACPI_OSI_WIN_XP}, |
| 95 | {"DMA2L", 0x008F, 0x008F, ACPI_OSI_WIN_XP}, | 96 | {"DMA2L", 0x008F, 0x008F, ACPI_OSI_WIN_XP}, |
| @@ -151,7 +152,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
| 151 | ACPI_ERROR((AE_INFO, | 152 | ACPI_ERROR((AE_INFO, |
| 152 | "Illegal I/O port address/length above 64K: 0x%p/%X", | 153 | "Illegal I/O port address/length above 64K: 0x%p/%X", |
| 153 | ACPI_CAST_PTR(void, address), byte_width)); | 154 | ACPI_CAST_PTR(void, address), byte_width)); |
| 154 | return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS); | 155 | return_ACPI_STATUS(AE_LIMIT); |
| 155 | } | 156 | } |
| 156 | 157 | ||
| 157 | /* Exit if requested address is not within the protected port table */ | 158 | /* Exit if requested address is not within the protected port table */ |
| @@ -178,11 +179,12 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
| 178 | /* Port illegality may depend on the _OSI calls made by the BIOS */ | 179 | /* Port illegality may depend on the _OSI calls made by the BIOS */ |
| 179 | 180 | ||
| 180 | if (acpi_gbl_osi_data >= port_info->osi_dependency) { | 181 | if (acpi_gbl_osi_data >= port_info->osi_dependency) { |
| 181 | ACPI_ERROR((AE_INFO, | 182 | ACPI_DEBUG_PRINT((ACPI_DB_IO, |
| 182 | "Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)", | 183 | "Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)", |
| 183 | ACPI_CAST_PTR(void, address), | 184 | ACPI_CAST_PTR(void, address), |
| 184 | byte_width, port_info->name, | 185 | byte_width, port_info->name, |
| 185 | port_info->start, port_info->end)); | 186 | port_info->start, |
| 187 | port_info->end)); | ||
| 186 | 188 | ||
| 187 | return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS); | 189 | return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS); |
| 188 | } | 190 | } |
| @@ -206,7 +208,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
| 206 | * Value Where value is placed | 208 | * Value Where value is placed |
| 207 | * Width Number of bits | 209 | * Width Number of bits |
| 208 | * | 210 | * |
| 209 | * RETURN: Value read from port | 211 | * RETURN: Status and value read from port |
| 210 | * | 212 | * |
| 211 | * DESCRIPTION: Read data from an I/O port or register. This is a front-end | 213 | * DESCRIPTION: Read data from an I/O port or register. This is a front-end |
| 212 | * to acpi_os_read_port that performs validation on both the port | 214 | * to acpi_os_read_port that performs validation on both the port |
| @@ -217,14 +219,43 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) | |||
| 217 | acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width) | 219 | acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width) |
| 218 | { | 220 | { |
| 219 | acpi_status status; | 221 | acpi_status status; |
| 222 | u32 one_byte; | ||
| 223 | u32 i; | ||
| 224 | |||
| 225 | /* Validate the entire request and perform the I/O */ | ||
| 220 | 226 | ||
| 221 | status = acpi_hw_validate_io_request(address, width); | 227 | status = acpi_hw_validate_io_request(address, width); |
| 222 | if (ACPI_FAILURE(status)) { | 228 | if (ACPI_SUCCESS(status)) { |
| 229 | status = acpi_os_read_port(address, value, width); | ||
| 223 | return status; | 230 | return status; |
| 224 | } | 231 | } |
| 225 | 232 | ||
| 226 | status = acpi_os_read_port(address, value, width); | 233 | if (status != AE_AML_ILLEGAL_ADDRESS) { |
| 227 | return status; | 234 | return status; |
| 235 | } | ||
| 236 | |||
| 237 | /* | ||
| 238 | * There has been a protection violation within the request. Fall | ||
| 239 | * back to byte granularity port I/O and ignore the failing bytes. | ||
| 240 | * This provides Windows compatibility. | ||
| 241 | */ | ||
| 242 | for (i = 0, *value = 0; i < width; i += 8) { | ||
| 243 | |||
| 244 | /* Validate and read one byte */ | ||
| 245 | |||
| 246 | if (acpi_hw_validate_io_request(address, 8) == AE_OK) { | ||
| 247 | status = acpi_os_read_port(address, &one_byte, 8); | ||
| 248 | if (ACPI_FAILURE(status)) { | ||
| 249 | return status; | ||
| 250 | } | ||
| 251 | |||
| 252 | *value |= (one_byte << i); | ||
| 253 | } | ||
| 254 | |||
| 255 | address++; | ||
| 256 | } | ||
| 257 | |||
| 258 | return AE_OK; | ||
| 228 | } | 259 | } |
| 229 | 260 | ||
| 230 | /****************************************************************************** | 261 | /****************************************************************************** |
| @@ -235,7 +266,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width) | |||
| 235 | * Value Value to write | 266 | * Value Value to write |
| 236 | * Width Number of bits | 267 | * Width Number of bits |
| 237 | * | 268 | * |
| 238 | * RETURN: None | 269 | * RETURN: Status |
| 239 | * | 270 | * |
| 240 | * DESCRIPTION: Write data to an I/O port or register. This is a front-end | 271 | * DESCRIPTION: Write data to an I/O port or register. This is a front-end |
| 241 | * to acpi_os_write_port that performs validation on both the port | 272 | * to acpi_os_write_port that performs validation on both the port |
| @@ -246,12 +277,39 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width) | |||
| 246 | acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width) | 277 | acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width) |
| 247 | { | 278 | { |
| 248 | acpi_status status; | 279 | acpi_status status; |
| 280 | u32 i; | ||
| 281 | |||
| 282 | /* Validate the entire request and perform the I/O */ | ||
| 249 | 283 | ||
| 250 | status = acpi_hw_validate_io_request(address, width); | 284 | status = acpi_hw_validate_io_request(address, width); |
| 251 | if (ACPI_FAILURE(status)) { | 285 | if (ACPI_SUCCESS(status)) { |
| 286 | status = acpi_os_write_port(address, value, width); | ||
| 252 | return status; | 287 | return status; |
| 253 | } | 288 | } |
| 254 | 289 | ||
| 255 | status = acpi_os_write_port(address, value, width); | 290 | if (status != AE_AML_ILLEGAL_ADDRESS) { |
| 256 | return status; | 291 | return status; |
| 292 | } | ||
| 293 | |||
| 294 | /* | ||
| 295 | * There has been a protection violation within the request. Fall | ||
| 296 | * back to byte granularity port I/O and ignore the failing bytes. | ||
| 297 | * This provides Windows compatibility. | ||
| 298 | */ | ||
| 299 | for (i = 0; i < width; i += 8) { | ||
| 300 | |||
| 301 | /* Validate and write one byte */ | ||
| 302 | |||
| 303 | if (acpi_hw_validate_io_request(address, 8) == AE_OK) { | ||
| 304 | status = | ||
| 305 | acpi_os_write_port(address, (value >> i) & 0xFF, 8); | ||
| 306 | if (ACPI_FAILURE(status)) { | ||
| 307 | return status; | ||
| 308 | } | ||
| 309 | } | ||
| 310 | |||
| 311 | address++; | ||
| 312 | } | ||
| 313 | |||
| 314 | return AE_OK; | ||
| 257 | } | 315 | } |
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c index 663f692fffc..a3c23d686d5 100644 --- a/drivers/acpi/acpica/rscreate.c +++ b/drivers/acpi/acpica/rscreate.c | |||
| @@ -191,8 +191,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, | |||
| 191 | user_prt = ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer); | 191 | user_prt = ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer); |
| 192 | 192 | ||
| 193 | for (index = 0; index < number_of_elements; index++) { | 193 | for (index = 0; index < number_of_elements; index++) { |
| 194 | int source_name_index = 2; | ||
| 195 | int source_index_index = 3; | ||
| 196 | 194 | ||
| 197 | /* | 195 | /* |
| 198 | * Point user_prt past this current structure | 196 | * Point user_prt past this current structure |
| @@ -261,27 +259,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, | |||
| 261 | return_ACPI_STATUS(AE_BAD_DATA); | 259 | return_ACPI_STATUS(AE_BAD_DATA); |
| 262 | } | 260 | } |
| 263 | 261 | ||
| 264 | /* | ||
| 265 | * If BIOS erroneously reversed the _PRT source_name and source_index, | ||
| 266 | * then reverse them back. | ||
| 267 | */ | ||
| 268 | if ((sub_object_list[3])->common.type != | ||
| 269 | ACPI_TYPE_INTEGER) { | ||
| 270 | if (acpi_gbl_enable_interpreter_slack) { | ||
| 271 | source_name_index = 3; | ||
| 272 | source_index_index = 2; | ||
| 273 | printk(KERN_WARNING | ||
| 274 | "ACPI: Handling Garbled _PRT entry\n"); | ||
| 275 | } else { | ||
| 276 | ACPI_ERROR((AE_INFO, | ||
| 277 | "(PRT[%X].source_index) Need Integer, found %s", | ||
| 278 | index, | ||
| 279 | acpi_ut_get_object_type_name | ||
| 280 | (sub_object_list[3]))); | ||
| 281 | return_ACPI_STATUS(AE_BAD_DATA); | ||
| 282 | } | ||
| 283 | } | ||
| 284 | |||
| 285 | user_prt->pin = (u32) obj_desc->integer.value; | 262 | user_prt->pin = (u32) obj_desc->integer.value; |
| 286 | 263 | ||
| 287 | /* | 264 | /* |
| @@ -304,7 +281,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, | |||
| 304 | * 3) Third subobject: Dereference the PRT.source_name | 281 | * 3) Third subobject: Dereference the PRT.source_name |
| 305 | * The name may be unresolved (slack mode), so allow a null object | 282 | * The name may be unresolved (slack mode), so allow a null object |
| 306 | */ | 283 | */ |
| 307 | obj_desc = sub_object_list[source_name_index]; | 284 | obj_desc = sub_object_list[2]; |
| 308 | if (obj_desc) { | 285 | if (obj_desc) { |
| 309 | switch (obj_desc->common.type) { | 286 | switch (obj_desc->common.type) { |
| 310 | case ACPI_TYPE_LOCAL_REFERENCE: | 287 | case ACPI_TYPE_LOCAL_REFERENCE: |
| @@ -378,7 +355,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, | |||
| 378 | 355 | ||
| 379 | /* 4) Fourth subobject: Dereference the PRT.source_index */ | 356 | /* 4) Fourth subobject: Dereference the PRT.source_index */ |
| 380 | 357 | ||
| 381 | obj_desc = sub_object_list[source_index_index]; | 358 | obj_desc = sub_object_list[3]; |
| 382 | if (obj_desc->common.type != ACPI_TYPE_INTEGER) { | 359 | if (obj_desc->common.type != ACPI_TYPE_INTEGER) { |
| 383 | ACPI_ERROR((AE_INFO, | 360 | ACPI_ERROR((AE_INFO, |
| 384 | "(PRT[%X].SourceIndex) Need Integer, found %s", | 361 | "(PRT[%X].SourceIndex) Need Integer, found %s", |
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index d73c94b8441..9195deba9d9 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * acpi_button.c - ACPI Button Driver ($Revision: 30 $) | 2 | * button.c - ACPI Button Driver |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com> | 4 | * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com> |
| 5 | * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> | 5 | * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> |
| @@ -41,17 +41,13 @@ | |||
| 41 | 41 | ||
| 42 | #define ACPI_BUTTON_SUBCLASS_POWER "power" | 42 | #define ACPI_BUTTON_SUBCLASS_POWER "power" |
| 43 | #define ACPI_BUTTON_HID_POWER "PNP0C0C" | 43 | #define ACPI_BUTTON_HID_POWER "PNP0C0C" |
| 44 | #define ACPI_BUTTON_DEVICE_NAME_POWER "Power Button (CM)" | 44 | #define ACPI_BUTTON_DEVICE_NAME_POWER "Power Button" |
| 45 | #define ACPI_BUTTON_DEVICE_NAME_POWERF "Power Button (FF)" | ||
| 46 | #define ACPI_BUTTON_TYPE_POWER 0x01 | 45 | #define ACPI_BUTTON_TYPE_POWER 0x01 |
| 47 | #define ACPI_BUTTON_TYPE_POWERF 0x02 | ||
| 48 | 46 | ||
| 49 | #define ACPI_BUTTON_SUBCLASS_SLEEP "sleep" | 47 | #define ACPI_BUTTON_SUBCLASS_SLEEP "sleep" |
| 50 | #define ACPI_BUTTON_HID_SLEEP "PNP0C0E" | 48 | #define ACPI_BUTTON_HID_SLEEP "PNP0C0E" |
| 51 | #define ACPI_BUTTON_DEVICE_NAME_SLEEP "Sleep Button (CM)" | 49 | #define ACPI_BUTTON_DEVICE_NAME_SLEEP "Sleep Button" |
| 52 | #define ACPI_BUTTON_DEVICE_NAME_SLEEPF "Sleep Button (FF)" | ||
| 53 | #define ACPI_BUTTON_TYPE_SLEEP 0x03 | 50 | #define ACPI_BUTTON_TYPE_SLEEP 0x03 |
| 54 | #define ACPI_BUTTON_TYPE_SLEEPF 0x04 | ||
| 55 | 51 | ||
| 56 | #define ACPI_BUTTON_SUBCLASS_LID "lid" | 52 | #define ACPI_BUTTON_SUBCLASS_LID "lid" |
| 57 | #define ACPI_BUTTON_HID_LID "PNP0C0D" | 53 | #define ACPI_BUTTON_HID_LID "PNP0C0D" |
| @@ -95,7 +91,6 @@ static struct acpi_driver acpi_button_driver = { | |||
| 95 | }; | 91 | }; |
| 96 | 92 | ||
| 97 | struct acpi_button { | 93 | struct acpi_button { |
| 98 | struct acpi_device *device; /* Fixed button kludge */ | ||
| 99 | unsigned int type; | 94 | unsigned int type; |
| 100 | struct input_dev *input; | 95 | struct input_dev *input; |
| 101 | char phys[32]; /* for input device */ | 96 | char phys[32]; /* for input device */ |
| @@ -126,14 +121,10 @@ static struct proc_dir_entry *acpi_button_dir; | |||
| 126 | 121 | ||
| 127 | static int acpi_button_info_seq_show(struct seq_file *seq, void *offset) | 122 | static int acpi_button_info_seq_show(struct seq_file *seq, void *offset) |
| 128 | { | 123 | { |
| 129 | struct acpi_button *button = seq->private; | 124 | struct acpi_device *device = seq->private; |
| 130 | |||
| 131 | if (!button || !button->device) | ||
| 132 | return 0; | ||
| 133 | 125 | ||
| 134 | seq_printf(seq, "type: %s\n", | 126 | seq_printf(seq, "type: %s\n", |
| 135 | acpi_device_name(button->device)); | 127 | acpi_device_name(device)); |
| 136 | |||
| 137 | return 0; | 128 | return 0; |
| 138 | } | 129 | } |
| 139 | 130 | ||
| @@ -144,14 +135,11 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file) | |||
| 144 | 135 | ||
| 145 | static int acpi_button_state_seq_show(struct seq_file *seq, void *offset) | 136 | static int acpi_button_state_seq_show(struct seq_file *seq, void *offset) |
| 146 | { | 137 | { |
| 147 | struct acpi_button *button = seq->private; | 138 | struct acpi_device *device = seq->private; |
| 148 | acpi_status status; | 139 | acpi_status status; |
| 149 | unsigned long long state; | 140 | unsigned long long state; |
| 150 | 141 | ||
| 151 | if (!button || !button->device) | 142 | status = acpi_evaluate_integer(device->handle, "_LID", NULL, &state); |
| 152 | return 0; | ||
| 153 | |||
| 154 | status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, &state); | ||
| 155 | seq_printf(seq, "state: %s\n", | 143 | seq_printf(seq, "state: %s\n", |
| 156 | ACPI_FAILURE(status) ? "unsupported" : | 144 | ACPI_FAILURE(status) ? "unsupported" : |
| 157 | (state ? "open" : "closed")); | 145 | (state ? "open" : "closed")); |
| @@ -169,24 +157,17 @@ static struct proc_dir_entry *acpi_lid_dir; | |||
| 169 | 157 | ||
| 170 | static int acpi_button_add_fs(struct acpi_device *device) | 158 | static int acpi_button_add_fs(struct acpi_device *device) |
| 171 | { | 159 | { |
| 160 | struct acpi_button *button = acpi_driver_data(device); | ||
| 172 | struct proc_dir_entry *entry = NULL; | 161 | struct proc_dir_entry *entry = NULL; |
| 173 | struct acpi_button *button; | ||
| 174 | |||
| 175 | if (!device || !acpi_driver_data(device)) | ||
| 176 | return -EINVAL; | ||
| 177 | |||
| 178 | button = acpi_driver_data(device); | ||
| 179 | 162 | ||
| 180 | switch (button->type) { | 163 | switch (button->type) { |
| 181 | case ACPI_BUTTON_TYPE_POWER: | 164 | case ACPI_BUTTON_TYPE_POWER: |
| 182 | case ACPI_BUTTON_TYPE_POWERF: | ||
| 183 | if (!acpi_power_dir) | 165 | if (!acpi_power_dir) |
| 184 | acpi_power_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_POWER, | 166 | acpi_power_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_POWER, |
| 185 | acpi_button_dir); | 167 | acpi_button_dir); |
| 186 | entry = acpi_power_dir; | 168 | entry = acpi_power_dir; |
| 187 | break; | 169 | break; |
| 188 | case ACPI_BUTTON_TYPE_SLEEP: | 170 | case ACPI_BUTTON_TYPE_SLEEP: |
| 189 | case ACPI_BUTTON_TYPE_SLEEPF: | ||
| 190 | if (!acpi_sleep_dir) | 171 | if (!acpi_sleep_dir) |
| 191 | acpi_sleep_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_SLEEP, | 172 | acpi_sleep_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_SLEEP, |
| 192 | acpi_button_dir); | 173 | acpi_button_dir); |
| @@ -210,8 +191,7 @@ static int acpi_button_add_fs(struct acpi_device *device) | |||
| 210 | /* 'info' [R] */ | 191 | /* 'info' [R] */ |
| 211 | entry = proc_create_data(ACPI_BUTTON_FILE_INFO, | 192 | entry = proc_create_data(ACPI_BUTTON_FILE_INFO, |
| 212 | S_IRUGO, acpi_device_dir(device), | 193 | S_IRUGO, acpi_device_dir(device), |
| 213 | &acpi_button_info_fops, | 194 | &acpi_button_info_fops, device); |
| 214 | acpi_driver_data(device)); | ||
| 215 | if (!entry) | 195 | if (!entry) |
| 216 | return -ENODEV; | 196 | return -ENODEV; |
| 217 | 197 | ||
| @@ -219,8 +199,7 @@ static int acpi_button_add_fs(struct acpi_device *device) | |||
| 219 | if (button->type == ACPI_BUTTON_TYPE_LID) { | 199 | if (button->type == ACPI_BUTTON_TYPE_LID) { |
| 220 | entry = proc_create_data(ACPI_BUTTON_FILE_STATE, | 200 | entry = proc_create_data(ACPI_BUTTON_FILE_STATE, |
| 221 | S_IRUGO, acpi_device_dir(device), | 201 | S_IRUGO, acpi_device_dir(device), |
| 222 | &acpi_button_state_fops, | 202 | &acpi_button_state_fops, device); |
| 223 | acpi_driver_data(device)); | ||
| 224 | if (!entry) | 203 | if (!entry) |
| 225 | return -ENODEV; | 204 | return -ENODEV; |
| 226 | } | 205 | } |
| @@ -250,15 +229,16 @@ static int acpi_button_remove_fs(struct acpi_device *device) | |||
| 250 | /* -------------------------------------------------------------------------- | 229 | /* -------------------------------------------------------------------------- |
| 251 | Driver Interface | 230 | Driver Interface |
| 252 | -------------------------------------------------------------------------- */ | 231 | -------------------------------------------------------------------------- */ |
| 253 | static int acpi_lid_send_state(struct acpi_button *button) | 232 | static int acpi_lid_send_state(struct acpi_device *device) |
| 254 | { | 233 | { |
| 234 | struct acpi_button *button = acpi_driver_data(device); | ||
| 255 | unsigned long long state; | 235 | unsigned long long state; |
| 256 | acpi_status status; | 236 | acpi_status status; |
| 257 | 237 | ||
| 258 | status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, | 238 | status = acpi_evaluate_integer(device->handle, "_LID", NULL, &state); |
| 259 | &state); | ||
| 260 | if (ACPI_FAILURE(status)) | 239 | if (ACPI_FAILURE(status)) |
| 261 | return -ENODEV; | 240 | return -ENODEV; |
| 241 | |||
| 262 | /* input layer checks if event is redundant */ | 242 | /* input layer checks if event is redundant */ |
| 263 | input_report_switch(button->input, SW_LID, !state); | 243 | input_report_switch(button->input, SW_LID, !state); |
| 264 | input_sync(button->input); | 244 | input_sync(button->input); |
| @@ -270,9 +250,6 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) | |||
| 270 | struct acpi_button *button = acpi_driver_data(device); | 250 | struct acpi_button *button = acpi_driver_data(device); |
| 271 | struct input_dev *input; | 251 | struct input_dev *input; |
| 272 | 252 | ||
| 273 | if (!button || !button->device) | ||
| 274 | return; | ||
| 275 | |||
| 276 | switch (event) { | 253 | switch (event) { |
| 277 | case ACPI_FIXED_HARDWARE_EVENT: | 254 | case ACPI_FIXED_HARDWARE_EVENT: |
| 278 | event = ACPI_BUTTON_NOTIFY_STATUS; | 255 | event = ACPI_BUTTON_NOTIFY_STATUS; |
| @@ -280,7 +257,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) | |||
| 280 | case ACPI_BUTTON_NOTIFY_STATUS: | 257 | case ACPI_BUTTON_NOTIFY_STATUS: |
| 281 | input = button->input; | 258 | input = button->input; |
| 282 | if (button->type == ACPI_BUTTON_TYPE_LID) { | 259 | if (button->type == ACPI_BUTTON_TYPE_LID) { |
| 283 | acpi_lid_send_state(button); | 260 | acpi_lid_send_state(device); |
| 284 | } else { | 261 | } else { |
| 285 | int keycode = test_bit(KEY_SLEEP, input->keybit) ? | 262 | int keycode = test_bit(KEY_SLEEP, input->keybit) ? |
| 286 | KEY_SLEEP : KEY_POWER; | 263 | KEY_SLEEP : KEY_POWER; |
| @@ -291,43 +268,35 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) | |||
| 291 | input_sync(input); | 268 | input_sync(input); |
| 292 | } | 269 | } |
| 293 | 270 | ||
| 294 | acpi_bus_generate_proc_event(button->device, event, | 271 | acpi_bus_generate_proc_event(device, event, ++button->pushed); |
| 295 | ++button->pushed); | ||
| 296 | break; | 272 | break; |
| 297 | default: | 273 | default: |
| 298 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 274 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 299 | "Unsupported event [0x%x]\n", event)); | 275 | "Unsupported event [0x%x]\n", event)); |
| 300 | break; | 276 | break; |
| 301 | } | 277 | } |
| 302 | |||
| 303 | return; | ||
| 304 | } | 278 | } |
| 305 | 279 | ||
| 306 | static int acpi_button_resume(struct acpi_device *device) | 280 | static int acpi_button_resume(struct acpi_device *device) |
| 307 | { | 281 | { |
| 308 | struct acpi_button *button; | 282 | struct acpi_button *button = acpi_driver_data(device); |
| 309 | if (!device) | 283 | |
| 310 | return -EINVAL; | 284 | if (button->type == ACPI_BUTTON_TYPE_LID) |
| 311 | button = acpi_driver_data(device); | 285 | return acpi_lid_send_state(device); |
| 312 | if (button && button->type == ACPI_BUTTON_TYPE_LID) | ||
| 313 | return acpi_lid_send_state(button); | ||
| 314 | return 0; | 286 | return 0; |
| 315 | } | 287 | } |
| 316 | 288 | ||
| 317 | static int acpi_button_add(struct acpi_device *device) | 289 | static int acpi_button_add(struct acpi_device *device) |
| 318 | { | 290 | { |
| 319 | int error; | ||
| 320 | struct acpi_button *button; | 291 | struct acpi_button *button; |
| 321 | struct input_dev *input; | 292 | struct input_dev *input; |
| 322 | 293 | char *hid, *name, *class; | |
| 323 | if (!device) | 294 | int error; |
| 324 | return -EINVAL; | ||
| 325 | 295 | ||
| 326 | button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL); | 296 | button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL); |
| 327 | if (!button) | 297 | if (!button) |
| 328 | return -ENOMEM; | 298 | return -ENOMEM; |
| 329 | 299 | ||
| 330 | button->device = device; | ||
| 331 | device->driver_data = button; | 300 | device->driver_data = button; |
| 332 | 301 | ||
| 333 | button->input = input = input_allocate_device(); | 302 | button->input = input = input_allocate_device(); |
| @@ -336,40 +305,29 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 336 | goto err_free_button; | 305 | goto err_free_button; |
| 337 | } | 306 | } |
| 338 | 307 | ||
| 339 | /* | 308 | hid = acpi_device_hid(device); |
| 340 | * Determine the button type (via hid), as fixed-feature buttons | 309 | name = acpi_device_name(device); |
| 341 | * need to be handled a bit differently than generic-space. | 310 | class = acpi_device_class(device); |
| 342 | */ | 311 | |
| 343 | if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_POWER)) { | 312 | if (!strcmp(hid, ACPI_BUTTON_HID_POWER) || |
| 313 | !strcmp(hid, ACPI_BUTTON_HID_POWERF)) { | ||
| 344 | button->type = ACPI_BUTTON_TYPE_POWER; | 314 | button->type = ACPI_BUTTON_TYPE_POWER; |
| 345 | strcpy(acpi_device_name(device), ACPI_BUTTON_DEVICE_NAME_POWER); | 315 | strcpy(name, ACPI_BUTTON_DEVICE_NAME_POWER); |
| 346 | sprintf(acpi_device_class(device), "%s/%s", | 316 | sprintf(class, "%s/%s", |
| 347 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); | ||
| 348 | } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_POWERF)) { | ||
| 349 | button->type = ACPI_BUTTON_TYPE_POWERF; | ||
| 350 | strcpy(acpi_device_name(device), | ||
| 351 | ACPI_BUTTON_DEVICE_NAME_POWERF); | ||
| 352 | sprintf(acpi_device_class(device), "%s/%s", | ||
| 353 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); | 317 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); |
| 354 | } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_SLEEP)) { | 318 | } else if (!strcmp(hid, ACPI_BUTTON_HID_SLEEP) || |
| 319 | !strcmp(hid, ACPI_BUTTON_HID_SLEEPF)) { | ||
| 355 | button->type = ACPI_BUTTON_TYPE_SLEEP; | 320 | button->type = ACPI_BUTTON_TYPE_SLEEP; |
| 356 | strcpy(acpi_device_name(device), ACPI_BUTTON_DEVICE_NAME_SLEEP); | 321 | strcpy(name, ACPI_BUTTON_DEVICE_NAME_SLEEP); |
| 357 | sprintf(acpi_device_class(device), "%s/%s", | 322 | sprintf(class, "%s/%s", |
| 358 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); | ||
| 359 | } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_SLEEPF)) { | ||
| 360 | button->type = ACPI_BUTTON_TYPE_SLEEPF; | ||
| 361 | strcpy(acpi_device_name(device), | ||
| 362 | ACPI_BUTTON_DEVICE_NAME_SLEEPF); | ||
| 363 | sprintf(acpi_device_class(device), "%s/%s", | ||
| 364 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); | 323 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); |
| 365 | } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_LID)) { | 324 | } else if (!strcmp(hid, ACPI_BUTTON_HID_LID)) { |
| 366 | button->type = ACPI_BUTTON_TYPE_LID; | 325 | button->type = ACPI_BUTTON_TYPE_LID; |
| 367 | strcpy(acpi_device_name(device), ACPI_BUTTON_DEVICE_NAME_LID); | 326 | strcpy(name, ACPI_BUTTON_DEVICE_NAME_LID); |
| 368 | sprintf(acpi_device_class(device), "%s/%s", | 327 | sprintf(class, "%s/%s", |
| 369 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); | 328 | ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); |
| 370 | } else { | 329 | } else { |
| 371 | printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", | 330 | printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid); |
| 372 | acpi_device_hid(device)); | ||
| 373 | error = -ENODEV; | 331 | error = -ENODEV; |
| 374 | goto err_free_input; | 332 | goto err_free_input; |
| 375 | } | 333 | } |
| @@ -378,10 +336,9 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 378 | if (error) | 336 | if (error) |
| 379 | goto err_free_input; | 337 | goto err_free_input; |
| 380 | 338 | ||
| 381 | snprintf(button->phys, sizeof(button->phys), | 339 | snprintf(button->phys, sizeof(button->phys), "%s/button/input0", hid); |
| 382 | "%s/button/input0", acpi_device_hid(device)); | ||
| 383 | 340 | ||
| 384 | input->name = acpi_device_name(device); | 341 | input->name = name; |
| 385 | input->phys = button->phys; | 342 | input->phys = button->phys; |
| 386 | input->id.bustype = BUS_HOST; | 343 | input->id.bustype = BUS_HOST; |
| 387 | input->id.product = button->type; | 344 | input->id.product = button->type; |
| @@ -389,13 +346,11 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 389 | 346 | ||
| 390 | switch (button->type) { | 347 | switch (button->type) { |
| 391 | case ACPI_BUTTON_TYPE_POWER: | 348 | case ACPI_BUTTON_TYPE_POWER: |
| 392 | case ACPI_BUTTON_TYPE_POWERF: | ||
| 393 | input->evbit[0] = BIT_MASK(EV_KEY); | 349 | input->evbit[0] = BIT_MASK(EV_KEY); |
| 394 | set_bit(KEY_POWER, input->keybit); | 350 | set_bit(KEY_POWER, input->keybit); |
| 395 | break; | 351 | break; |
| 396 | 352 | ||
| 397 | case ACPI_BUTTON_TYPE_SLEEP: | 353 | case ACPI_BUTTON_TYPE_SLEEP: |
| 398 | case ACPI_BUTTON_TYPE_SLEEPF: | ||
| 399 | input->evbit[0] = BIT_MASK(EV_KEY); | 354 | input->evbit[0] = BIT_MASK(EV_KEY); |
| 400 | set_bit(KEY_SLEEP, input->keybit); | 355 | set_bit(KEY_SLEEP, input->keybit); |
| 401 | break; | 356 | break; |
| @@ -410,7 +365,7 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 410 | if (error) | 365 | if (error) |
| 411 | goto err_remove_fs; | 366 | goto err_remove_fs; |
| 412 | if (button->type == ACPI_BUTTON_TYPE_LID) | 367 | if (button->type == ACPI_BUTTON_TYPE_LID) |
| 413 | acpi_lid_send_state(button); | 368 | acpi_lid_send_state(device); |
| 414 | 369 | ||
| 415 | if (device->wakeup.flags.valid) { | 370 | if (device->wakeup.flags.valid) { |
| 416 | /* Button's GPE is run-wake GPE */ | 371 | /* Button's GPE is run-wake GPE */ |
| @@ -422,9 +377,7 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 422 | device->wakeup.state.enabled = 1; | 377 | device->wakeup.state.enabled = 1; |
| 423 | } | 378 | } |
| 424 | 379 | ||
| 425 | printk(KERN_INFO PREFIX "%s [%s]\n", | 380 | printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device)); |
| 426 | acpi_device_name(device), acpi_device_bid(device)); | ||
| 427 | |||
| 428 | return 0; | 381 | return 0; |
| 429 | 382 | ||
| 430 | err_remove_fs: | 383 | err_remove_fs: |
| @@ -438,17 +391,11 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 438 | 391 | ||
| 439 | static int acpi_button_remove(struct acpi_device *device, int type) | 392 | static int acpi_button_remove(struct acpi_device *device, int type) |
| 440 | { | 393 | { |
| 441 | struct acpi_button *button; | 394 | struct acpi_button *button = acpi_driver_data(device); |
| 442 | |||
| 443 | if (!device || !acpi_driver_data(device)) | ||
| 444 | return -EINVAL; | ||
| 445 | |||
| 446 | button = acpi_driver_data(device); | ||
| 447 | 395 | ||
| 448 | acpi_button_remove_fs(device); | 396 | acpi_button_remove_fs(device); |
| 449 | input_unregister_device(button->input); | 397 | input_unregister_device(button->input); |
| 450 | kfree(button); | 398 | kfree(button); |
| 451 | |||
| 452 | return 0; | 399 | return 0; |
| 453 | } | 400 | } |
| 454 | 401 | ||
| @@ -459,6 +406,7 @@ static int __init acpi_button_init(void) | |||
| 459 | acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir); | 406 | acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir); |
| 460 | if (!acpi_button_dir) | 407 | if (!acpi_button_dir) |
| 461 | return -ENODEV; | 408 | return -ENODEV; |
| 409 | |||
| 462 | result = acpi_bus_register_driver(&acpi_button_driver); | 410 | result = acpi_bus_register_driver(&acpi_button_driver); |
| 463 | if (result < 0) { | 411 | if (result < 0) { |
| 464 | remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir); | 412 | remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir); |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 04e90443eff..391f331674c 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -1065,6 +1065,7 @@ static int acpi_ec_resume(struct acpi_device *device) | |||
| 1065 | struct acpi_ec *ec = acpi_driver_data(device); | 1065 | struct acpi_ec *ec = acpi_driver_data(device); |
| 1066 | /* Enable use of GPE back */ | 1066 | /* Enable use of GPE back */ |
| 1067 | clear_bit(EC_FLAGS_NO_GPE, &ec->flags); | 1067 | clear_bit(EC_FLAGS_NO_GPE, &ec->flags); |
| 1068 | set_bit(EC_FLAGS_GPE_MODE, &ec->flags); | ||
| 1068 | acpi_enable_gpe(NULL, ec->gpe); | 1069 | acpi_enable_gpe(NULL, ec->gpe); |
| 1069 | return 0; | 1070 | return 0; |
| 1070 | } | 1071 | } |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index d59f08ecaf1..d916bea729f 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -353,8 +353,10 @@ static irqreturn_t acpi_irq(int irq, void *dev_id) | |||
| 353 | if (handled) { | 353 | if (handled) { |
| 354 | acpi_irq_handled++; | 354 | acpi_irq_handled++; |
| 355 | return IRQ_HANDLED; | 355 | return IRQ_HANDLED; |
| 356 | } else | 356 | } else { |
| 357 | acpi_irq_not_handled++; | ||
| 357 | return IRQ_NONE; | 358 | return IRQ_NONE; |
| 359 | } | ||
| 358 | } | 360 | } |
| 359 | 361 | ||
| 360 | acpi_status | 362 | acpi_status |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 6fe121434ff..f7ca8c55956 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -581,6 +581,11 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) | |||
| 581 | for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) { | 581 | for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) { |
| 582 | struct acpi_processor_cx *cx = &pr->power.states[i]; | 582 | struct acpi_processor_cx *cx = &pr->power.states[i]; |
| 583 | 583 | ||
| 584 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) | ||
| 585 | /* TSC could halt in idle, so notify users */ | ||
| 586 | if (tsc_halts_in_c(cx->type)) | ||
| 587 | mark_tsc_unstable("TSC halts in idle");; | ||
| 588 | #endif | ||
| 584 | switch (cx->type) { | 589 | switch (cx->type) { |
| 585 | case ACPI_STATE_C1: | 590 | case ACPI_STATE_C1: |
| 586 | cx->valid = 1; | 591 | cx->valid = 1; |
| @@ -657,11 +662,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset) | |||
| 657 | 662 | ||
| 658 | seq_printf(seq, "active state: C%zd\n" | 663 | seq_printf(seq, "active state: C%zd\n" |
| 659 | "max_cstate: C%d\n" | 664 | "max_cstate: C%d\n" |
| 660 | "bus master activity: %08x\n" | ||
| 661 | "maximum allowed latency: %d usec\n", | 665 | "maximum allowed latency: %d usec\n", |
| 662 | pr->power.state ? pr->power.state - pr->power.states : 0, | 666 | pr->power.state ? pr->power.state - pr->power.states : 0, |
| 663 | max_cstate, (unsigned)pr->power.bm_activity, | 667 | max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); |
| 664 | pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); | ||
| 665 | 668 | ||
| 666 | seq_puts(seq, "states:\n"); | 669 | seq_puts(seq, "states:\n"); |
| 667 | 670 | ||
| @@ -871,11 +874,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, | |||
| 871 | kt2 = ktime_get_real(); | 874 | kt2 = ktime_get_real(); |
| 872 | idle_time = ktime_to_us(ktime_sub(kt2, kt1)); | 875 | idle_time = ktime_to_us(ktime_sub(kt2, kt1)); |
| 873 | 876 | ||
| 874 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) | ||
| 875 | /* TSC could halt in idle, so notify users */ | ||
| 876 | if (tsc_halts_in_c(cx->type)) | ||
| 877 | mark_tsc_unstable("TSC halts in idle");; | ||
| 878 | #endif | ||
| 879 | sleep_ticks = us_to_pm_timer_ticks(idle_time); | 877 | sleep_ticks = us_to_pm_timer_ticks(idle_time); |
| 880 | 878 | ||
| 881 | /* Tell the scheduler how much we idled: */ | 879 | /* Tell the scheduler how much we idled: */ |
| @@ -955,6 +953,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
| 955 | */ | 953 | */ |
| 956 | acpi_state_timer_broadcast(pr, cx, 1); | 954 | acpi_state_timer_broadcast(pr, cx, 1); |
| 957 | 955 | ||
| 956 | kt1 = ktime_get_real(); | ||
| 958 | /* | 957 | /* |
| 959 | * disable bus master | 958 | * disable bus master |
| 960 | * bm_check implies we need ARB_DIS | 959 | * bm_check implies we need ARB_DIS |
| @@ -976,10 +975,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
| 976 | ACPI_FLUSH_CPU_CACHE(); | 975 | ACPI_FLUSH_CPU_CACHE(); |
| 977 | } | 976 | } |
| 978 | 977 | ||
| 979 | kt1 = ktime_get_real(); | ||
| 980 | acpi_idle_do_entry(cx); | 978 | acpi_idle_do_entry(cx); |
| 981 | kt2 = ktime_get_real(); | ||
| 982 | idle_time = ktime_to_us(ktime_sub(kt2, kt1)); | ||
| 983 | 979 | ||
| 984 | /* Re-enable bus master arbitration */ | 980 | /* Re-enable bus master arbitration */ |
| 985 | if (pr->flags.bm_check && pr->flags.bm_control) { | 981 | if (pr->flags.bm_check && pr->flags.bm_control) { |
| @@ -988,12 +984,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
| 988 | c3_cpu_count--; | 984 | c3_cpu_count--; |
| 989 | spin_unlock(&c3_lock); | 985 | spin_unlock(&c3_lock); |
| 990 | } | 986 | } |
| 987 | kt2 = ktime_get_real(); | ||
| 988 | idle_time = ktime_to_us(ktime_sub(kt2, kt1)); | ||
| 991 | 989 | ||
| 992 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) | ||
| 993 | /* TSC could halt in idle, so notify users */ | ||
| 994 | if (tsc_halts_in_c(ACPI_STATE_C3)) | ||
| 995 | mark_tsc_unstable("TSC halts in idle"); | ||
| 996 | #endif | ||
| 997 | sleep_ticks = us_to_pm_timer_ticks(idle_time); | 990 | sleep_ticks = us_to_pm_timer_ticks(idle_time); |
| 998 | /* Tell the scheduler how much we idled: */ | 991 | /* Tell the scheduler how much we idled: */ |
| 999 | sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS); | 992 | sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS); |
| @@ -1037,6 +1030,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) | |||
| 1037 | dev->states[i].desc[0] = '\0'; | 1030 | dev->states[i].desc[0] = '\0'; |
| 1038 | } | 1031 | } |
| 1039 | 1032 | ||
| 1033 | if (max_cstate == 0) | ||
| 1034 | max_cstate = 1; | ||
| 1035 | |||
| 1040 | for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) { | 1036 | for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) { |
| 1041 | cx = &pr->power.states[i]; | 1037 | cx = &pr->power.states[i]; |
| 1042 | state = &dev->states[count]; | 1038 | state = &dev->states[count]; |
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index d060e6fd7fd..01574a06653 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -713,6 +713,32 @@ static void acpi_power_off(void) | |||
| 713 | acpi_enter_sleep_state(ACPI_STATE_S5); | 713 | acpi_enter_sleep_state(ACPI_STATE_S5); |
| 714 | } | 714 | } |
| 715 | 715 | ||
| 716 | /* | ||
| 717 | * ACPI 2.0 created the optional _GTS and _BFS, | ||
| 718 | * but industry adoption has been neither rapid nor broad. | ||
| 719 | * | ||
| 720 | * Linux gets into trouble when it executes poorly validated | ||
| 721 | * paths through the BIOS, so disable _GTS and _BFS by default, | ||
| 722 | * but do speak up and offer the option to enable them. | ||
| 723 | */ | ||
| 724 | void __init acpi_gts_bfs_check(void) | ||
| 725 | { | ||
| 726 | acpi_handle dummy; | ||
| 727 | |||
| 728 | if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__GTS, &dummy))) | ||
| 729 | { | ||
| 730 | printk(KERN_NOTICE PREFIX "BIOS offers _GTS\n"); | ||
| 731 | printk(KERN_NOTICE PREFIX "If \"acpi.gts=1\" improves suspend, " | ||
| 732 | "please notify linux-acpi@vger.kernel.org\n"); | ||
| 733 | } | ||
| 734 | if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__BFS, &dummy))) | ||
| 735 | { | ||
| 736 | printk(KERN_NOTICE PREFIX "BIOS offers _BFS\n"); | ||
| 737 | printk(KERN_NOTICE PREFIX "If \"acpi.bfs=1\" improves resume, " | ||
| 738 | "please notify linux-acpi@vger.kernel.org\n"); | ||
| 739 | } | ||
| 740 | } | ||
| 741 | |||
| 716 | int __init acpi_sleep_init(void) | 742 | int __init acpi_sleep_init(void) |
| 717 | { | 743 | { |
| 718 | acpi_status status; | 744 | acpi_status status; |
| @@ -771,5 +797,6 @@ int __init acpi_sleep_init(void) | |||
| 771 | * object can also be evaluated when the system enters S5. | 797 | * object can also be evaluated when the system enters S5. |
| 772 | */ | 798 | */ |
| 773 | register_reboot_notifier(&tts_notifier); | 799 | register_reboot_notifier(&tts_notifier); |
| 800 | acpi_gts_bfs_check(); | ||
| 774 | return 0; | 801 | return 0; |
| 775 | } | 802 | } |
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index da51f05ef8d..0944daec064 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
| @@ -38,6 +38,7 @@ ACPI_MODULE_NAME("system"); | |||
| 38 | #define ACPI_SYSTEM_DEVICE_NAME "System" | 38 | #define ACPI_SYSTEM_DEVICE_NAME "System" |
| 39 | 39 | ||
| 40 | u32 acpi_irq_handled; | 40 | u32 acpi_irq_handled; |
| 41 | u32 acpi_irq_not_handled; | ||
| 41 | 42 | ||
| 42 | /* | 43 | /* |
| 43 | * Make ACPICA version work as module param | 44 | * Make ACPICA version work as module param |
| @@ -214,8 +215,9 @@ err: | |||
| 214 | 215 | ||
| 215 | #define COUNT_GPE 0 | 216 | #define COUNT_GPE 0 |
| 216 | #define COUNT_SCI 1 /* acpi_irq_handled */ | 217 | #define COUNT_SCI 1 /* acpi_irq_handled */ |
| 217 | #define COUNT_ERROR 2 /* other */ | 218 | #define COUNT_SCI_NOT 2 /* acpi_irq_not_handled */ |
| 218 | #define NUM_COUNTERS_EXTRA 3 | 219 | #define COUNT_ERROR 3 /* other */ |
| 220 | #define NUM_COUNTERS_EXTRA 4 | ||
| 219 | 221 | ||
| 220 | struct event_counter { | 222 | struct event_counter { |
| 221 | u32 count; | 223 | u32 count; |
| @@ -317,6 +319,8 @@ static ssize_t counter_show(struct kobject *kobj, | |||
| 317 | 319 | ||
| 318 | all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI].count = | 320 | all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI].count = |
| 319 | acpi_irq_handled; | 321 | acpi_irq_handled; |
| 322 | all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI_NOT].count = | ||
| 323 | acpi_irq_not_handled; | ||
| 320 | all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_GPE].count = | 324 | all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_GPE].count = |
| 321 | acpi_gpe_count; | 325 | acpi_gpe_count; |
| 322 | 326 | ||
| @@ -363,6 +367,7 @@ static ssize_t counter_set(struct kobject *kobj, | |||
| 363 | all_counters[i].count = 0; | 367 | all_counters[i].count = 0; |
| 364 | acpi_gpe_count = 0; | 368 | acpi_gpe_count = 0; |
| 365 | acpi_irq_handled = 0; | 369 | acpi_irq_handled = 0; |
| 370 | acpi_irq_not_handled = 0; | ||
| 366 | goto end; | 371 | goto end; |
| 367 | } | 372 | } |
| 368 | 373 | ||
| @@ -456,6 +461,8 @@ void acpi_irq_stats_init(void) | |||
| 456 | sprintf(buffer, "gpe_all"); | 461 | sprintf(buffer, "gpe_all"); |
| 457 | else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI) | 462 | else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI) |
| 458 | sprintf(buffer, "sci"); | 463 | sprintf(buffer, "sci"); |
| 464 | else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI_NOT) | ||
| 465 | sprintf(buffer, "sci_not"); | ||
| 459 | else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR) | 466 | else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR) |
| 460 | sprintf(buffer, "error"); | 467 | sprintf(buffer, "error"); |
| 461 | else | 468 | else |
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 9cd15e8c893..564ea142428 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
| @@ -909,7 +909,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) | |||
| 909 | thermal_zone_device_register("acpitz", trips, tz, | 909 | thermal_zone_device_register("acpitz", trips, tz, |
| 910 | &acpi_thermal_zone_ops, | 910 | &acpi_thermal_zone_ops, |
| 911 | 0, 0, 0, | 911 | 0, 0, 0, |
| 912 | tz->polling_frequency); | 912 | tz->polling_frequency*100); |
| 913 | if (IS_ERR(tz->thermal_zone)) | 913 | if (IS_ERR(tz->thermal_zone)) |
| 914 | return -ENODEV; | 914 | return -ENODEV; |
| 915 | 915 | ||
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index cd4fb7543a9..1705d947ea0 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -770,10 +770,12 @@ acpi_video_init_brightness(struct acpi_video_device *device) | |||
| 770 | * In this case, the first two elements in _BCL packages | 770 | * In this case, the first two elements in _BCL packages |
| 771 | * are also supported brightness levels that OS should take care of. | 771 | * are also supported brightness levels that OS should take care of. |
| 772 | */ | 772 | */ |
| 773 | for (i = 2; i < count; i++) | 773 | for (i = 2; i < count; i++) { |
| 774 | if (br->levels[i] == br->levels[0] || | 774 | if (br->levels[i] == br->levels[0]) |
| 775 | br->levels[i] == br->levels[1]) | ||
| 776 | level_ac_battery++; | 775 | level_ac_battery++; |
| 776 | if (br->levels[i] == br->levels[1]) | ||
| 777 | level_ac_battery++; | ||
| 778 | } | ||
| 777 | 779 | ||
| 778 | if (level_ac_battery < 2) { | 780 | if (level_ac_battery < 2) { |
| 779 | level_ac_battery = 2 - level_ac_battery; | 781 | level_ac_battery = 2 - level_ac_battery; |
| @@ -807,12 +809,19 @@ acpi_video_init_brightness(struct acpi_video_device *device) | |||
| 807 | br->flags._BCM_use_index = br->flags._BCL_use_index; | 809 | br->flags._BCM_use_index = br->flags._BCL_use_index; |
| 808 | 810 | ||
| 809 | /* _BQC uses INDEX while _BCL uses VALUE in some laptops */ | 811 | /* _BQC uses INDEX while _BCL uses VALUE in some laptops */ |
| 810 | br->curr = max_level; | 812 | br->curr = level_old = max_level; |
| 813 | |||
| 814 | if (!device->cap._BQC) | ||
| 815 | goto set_level; | ||
| 816 | |||
| 811 | result = acpi_video_device_lcd_get_level_current(device, &level_old); | 817 | result = acpi_video_device_lcd_get_level_current(device, &level_old); |
| 812 | if (result) | 818 | if (result) |
| 813 | goto out_free_levels; | 819 | goto out_free_levels; |
| 814 | 820 | ||
| 815 | result = acpi_video_device_lcd_set_level(device, br->curr); | 821 | /* |
| 822 | * Set the level to maximum and check if _BQC uses indexed value | ||
| 823 | */ | ||
| 824 | result = acpi_video_device_lcd_set_level(device, max_level); | ||
| 816 | if (result) | 825 | if (result) |
| 817 | goto out_free_levels; | 826 | goto out_free_levels; |
| 818 | 827 | ||
| @@ -820,25 +829,19 @@ acpi_video_init_brightness(struct acpi_video_device *device) | |||
| 820 | if (result) | 829 | if (result) |
| 821 | goto out_free_levels; | 830 | goto out_free_levels; |
| 822 | 831 | ||
| 823 | if ((level != level_old) && !br->flags._BCM_use_index) { | 832 | br->flags._BQC_use_index = (level == max_level ? 0 : 1); |
| 824 | /* Note: | 833 | |
| 825 | * This piece of code does not work correctly if the current | 834 | if (!br->flags._BQC_use_index) |
| 826 | * brightness levels is 0. | 835 | goto set_level; |
| 827 | * But I guess boxes that boot with such a dark screen are rare | 836 | |
| 828 | * and no more code is needed to cover this specifial case. | 837 | if (br->flags._BCL_reversed) |
| 829 | */ | 838 | level_old = (br->count - 1) - level_old; |
| 830 | 839 | level_old = br->levels[level_old]; | |
| 831 | if (level_ac_battery != 2) { | 840 | |
| 832 | /* | 841 | set_level: |
| 833 | * For now, we don't support the _BCL like this: | 842 | result = acpi_video_device_lcd_set_level(device, level_old); |
| 834 | * 16, 15, 0, 1, 2, 3, ..., 14, 15, 16 | 843 | if (result) |
| 835 | * because we may mess up the index returned by _BQC. | 844 | goto out_free_levels; |
| 836 | * Plus: we have not got a box like this. | ||
| 837 | */ | ||
| 838 | ACPI_ERROR((AE_INFO, "_BCL not supported\n")); | ||
| 839 | } | ||
| 840 | br->flags._BQC_use_index = 1; | ||
| 841 | } | ||
| 842 | 845 | ||
| 843 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 846 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 844 | "found %d brightness levels\n", count - 2)); | 847 | "found %d brightness levels\n", count - 2)); |
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 9744d59a69f..858c34dd032 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
| @@ -906,6 +906,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, | |||
| 906 | goto failed_alloc; | 906 | goto failed_alloc; |
| 907 | 907 | ||
| 908 | blk_queue_make_request(card->queue, mm_make_request); | 908 | blk_queue_make_request(card->queue, mm_make_request); |
| 909 | card->queue->queue_lock = &card->lock; | ||
| 909 | card->queue->queuedata = card; | 910 | card->queue->queuedata = card; |
| 910 | card->queue->unplug_fn = mm_unplug_device; | 911 | card->queue->unplug_fn = mm_unplug_device; |
| 911 | 912 | ||
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 69427722d20..8dc1fd3115c 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c | |||
| @@ -370,11 +370,8 @@ int intel_opregion_init(struct drm_device *dev, int resume) | |||
| 370 | if (mboxes & MBOX_ACPI) { | 370 | if (mboxes & MBOX_ACPI) { |
| 371 | DRM_DEBUG("Public ACPI methods supported\n"); | 371 | DRM_DEBUG("Public ACPI methods supported\n"); |
| 372 | opregion->acpi = base + OPREGION_ACPI_OFFSET; | 372 | opregion->acpi = base + OPREGION_ACPI_OFFSET; |
| 373 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 373 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
| 374 | intel_didl_outputs(dev); | 374 | intel_didl_outputs(dev); |
| 375 | if (!resume) | ||
| 376 | acpi_video_register(); | ||
| 377 | } | ||
| 378 | } else { | 375 | } else { |
| 379 | DRM_DEBUG("Public ACPI methods not supported\n"); | 376 | DRM_DEBUG("Public ACPI methods not supported\n"); |
| 380 | err = -ENOTSUPP; | 377 | err = -ENOTSUPP; |
| @@ -391,6 +388,10 @@ int intel_opregion_init(struct drm_device *dev, int resume) | |||
| 391 | opregion->asle = base + OPREGION_ASLE_OFFSET; | 388 | opregion->asle = base + OPREGION_ASLE_OFFSET; |
| 392 | } | 389 | } |
| 393 | 390 | ||
| 391 | if (!resume) | ||
| 392 | acpi_video_register(); | ||
| 393 | |||
| 394 | |||
| 394 | /* Notify BIOS we are ready to handle ACPI video ext notifs. | 395 | /* Notify BIOS we are ready to handle ACPI video ext notifs. |
| 395 | * Right now, all the events are handled by the ACPI video module. | 396 | * Right now, all the events are handled by the ACPI video module. |
| 396 | * We don't actually need to do anything with them. */ | 397 | * We don't actually need to do anything with them. */ |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 3aec19d1fdf..3d4e0996976 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -609,7 +609,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
| 609 | struct request *rq = hwif->rq; | 609 | struct request *rq = hwif->rq; |
| 610 | ide_expiry_t *expiry = NULL; | 610 | ide_expiry_t *expiry = NULL; |
| 611 | int dma_error = 0, dma, thislen, uptodate = 0; | 611 | int dma_error = 0, dma, thislen, uptodate = 0; |
| 612 | int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc, nsectors; | 612 | int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc = 0, nsectors; |
| 613 | int sense = blk_sense_request(rq); | 613 | int sense = blk_sense_request(rq); |
| 614 | unsigned int timeout; | 614 | unsigned int timeout; |
| 615 | u16 len; | 615 | u16 len; |
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 1aebdf1a4f5..4b6b71e2cdf 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/mutex.h> | 7 | #include <linux/mutex.h> |
| 8 | #include <linux/ide.h> | 8 | #include <linux/ide.h> |
| 9 | #include <linux/hdreg.h> | 9 | #include <linux/hdreg.h> |
| 10 | #include <linux/dmi.h> | ||
| 10 | 11 | ||
| 11 | #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT) | 12 | #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT) |
| 12 | #define IDE_DISK_MINORS (1 << PARTN_BITS) | 13 | #define IDE_DISK_MINORS (1 << PARTN_BITS) |
| @@ -99,6 +100,19 @@ static void ide_gd_resume(ide_drive_t *drive) | |||
| 99 | (void)drive->disk_ops->get_capacity(drive); | 100 | (void)drive->disk_ops->get_capacity(drive); |
| 100 | } | 101 | } |
| 101 | 102 | ||
| 103 | static const struct dmi_system_id ide_coldreboot_table[] = { | ||
| 104 | { | ||
| 105 | /* Acer TravelMate 66x cuts power during reboot */ | ||
| 106 | .ident = "Acer TravelMate 660", | ||
| 107 | .matches = { | ||
| 108 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
| 109 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 660"), | ||
| 110 | }, | ||
| 111 | }, | ||
| 112 | |||
| 113 | { } /* terminate list */ | ||
| 114 | }; | ||
| 115 | |||
| 102 | static void ide_gd_shutdown(ide_drive_t *drive) | 116 | static void ide_gd_shutdown(ide_drive_t *drive) |
| 103 | { | 117 | { |
| 104 | #ifdef CONFIG_ALPHA | 118 | #ifdef CONFIG_ALPHA |
| @@ -115,7 +129,8 @@ static void ide_gd_shutdown(ide_drive_t *drive) | |||
| 115 | the disk to expire its write cache. */ | 129 | the disk to expire its write cache. */ |
| 116 | if (system_state != SYSTEM_POWER_OFF) { | 130 | if (system_state != SYSTEM_POWER_OFF) { |
| 117 | #else | 131 | #else |
| 118 | if (system_state == SYSTEM_RESTART) { | 132 | if (system_state == SYSTEM_RESTART && |
| 133 | !dmi_check_system(ide_coldreboot_table)) { | ||
| 119 | #endif | 134 | #endif |
| 120 | drive->disk_ops->flush(drive); | 135 | drive->disk_ops->flush(drive); |
| 121 | return; | 136 | return; |
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c index c7acca0b873..09d813d313f 100644 --- a/drivers/ide/palm_bk3710.c +++ b/drivers/ide/palm_bk3710.c | |||
| @@ -39,27 +39,12 @@ | |||
| 39 | /* Primary Control Offset */ | 39 | /* Primary Control Offset */ |
| 40 | #define IDE_PALM_ATA_PRI_CTL_OFFSET 0x3F6 | 40 | #define IDE_PALM_ATA_PRI_CTL_OFFSET 0x3F6 |
| 41 | 41 | ||
| 42 | /* | ||
| 43 | * PalmChip 3710 IDE Controller UDMA timing structure Definition | ||
| 44 | */ | ||
| 45 | struct palm_bk3710_udmatiming { | ||
| 46 | unsigned int rptime; /* Ready to pause time */ | ||
| 47 | unsigned int cycletime; /* Cycle Time */ | ||
| 48 | }; | ||
| 49 | |||
| 50 | #define BK3710_BMICP 0x00 | 42 | #define BK3710_BMICP 0x00 |
| 51 | #define BK3710_BMISP 0x02 | 43 | #define BK3710_BMISP 0x02 |
| 52 | #define BK3710_BMIDTP 0x04 | 44 | #define BK3710_BMIDTP 0x04 |
| 53 | #define BK3710_BMICS 0x08 | ||
| 54 | #define BK3710_BMISS 0x0A | ||
| 55 | #define BK3710_BMIDTS 0x0C | ||
| 56 | #define BK3710_IDETIMP 0x40 | 45 | #define BK3710_IDETIMP 0x40 |
| 57 | #define BK3710_IDETIMS 0x42 | ||
| 58 | #define BK3710_SIDETIM 0x44 | ||
| 59 | #define BK3710_SLEWCTL 0x45 | ||
| 60 | #define BK3710_IDESTATUS 0x47 | 46 | #define BK3710_IDESTATUS 0x47 |
| 61 | #define BK3710_UDMACTL 0x48 | 47 | #define BK3710_UDMACTL 0x48 |
| 62 | #define BK3710_UDMATIM 0x4A | ||
| 63 | #define BK3710_MISCCTL 0x50 | 48 | #define BK3710_MISCCTL 0x50 |
| 64 | #define BK3710_REGSTB 0x54 | 49 | #define BK3710_REGSTB 0x54 |
| 65 | #define BK3710_REGRCVR 0x58 | 50 | #define BK3710_REGRCVR 0x58 |
| @@ -71,17 +56,22 @@ struct palm_bk3710_udmatiming { | |||
| 71 | #define BK3710_UDMATRP 0x70 | 56 | #define BK3710_UDMATRP 0x70 |
| 72 | #define BK3710_UDMAENV 0x74 | 57 | #define BK3710_UDMAENV 0x74 |
| 73 | #define BK3710_IORDYTMP 0x78 | 58 | #define BK3710_IORDYTMP 0x78 |
| 74 | #define BK3710_IORDYTMS 0x7C | ||
| 75 | 59 | ||
| 76 | static unsigned ideclk_period; /* in nanoseconds */ | 60 | static unsigned ideclk_period; /* in nanoseconds */ |
| 77 | 61 | ||
| 62 | struct palm_bk3710_udmatiming { | ||
| 63 | unsigned int rptime; /* tRP -- Ready to pause time (nsec) */ | ||
| 64 | unsigned int cycletime; /* tCYCTYP2/2 -- avg Cycle Time (nsec) */ | ||
| 65 | /* tENV is always a minimum of 20 nsec */ | ||
| 66 | }; | ||
| 67 | |||
| 78 | static const struct palm_bk3710_udmatiming palm_bk3710_udmatimings[6] = { | 68 | static const struct palm_bk3710_udmatiming palm_bk3710_udmatimings[6] = { |
| 79 | {160, 240}, /* UDMA Mode 0 */ | 69 | { 160, 240 / 2 }, /* UDMA Mode 0 */ |
| 80 | {125, 160}, /* UDMA Mode 1 */ | 70 | { 125, 160 / 2 }, /* UDMA Mode 1 */ |
| 81 | {100, 120}, /* UDMA Mode 2 */ | 71 | { 100, 120 / 2 }, /* UDMA Mode 2 */ |
| 82 | {100, 90}, /* UDMA Mode 3 */ | 72 | { 100, 90 / 2 }, /* UDMA Mode 3 */ |
| 83 | {100, 60}, /* UDMA Mode 4 */ | 73 | { 100, 60 / 2 }, /* UDMA Mode 4 */ |
| 84 | {85, 40}, /* UDMA Mode 5 */ | 74 | { 85, 40 / 2 }, /* UDMA Mode 5 */ |
| 85 | }; | 75 | }; |
| 86 | 76 | ||
| 87 | static void palm_bk3710_setudmamode(void __iomem *base, unsigned int dev, | 77 | static void palm_bk3710_setudmamode(void __iomem *base, unsigned int dev, |
| @@ -98,11 +88,6 @@ static void palm_bk3710_setudmamode(void __iomem *base, unsigned int dev, | |||
| 98 | trp = DIV_ROUND_UP(palm_bk3710_udmatimings[mode].rptime, | 88 | trp = DIV_ROUND_UP(palm_bk3710_udmatimings[mode].rptime, |
| 99 | ideclk_period) - 1; | 89 | ideclk_period) - 1; |
| 100 | 90 | ||
| 101 | /* udmatim Register */ | ||
| 102 | val16 = readw(base + BK3710_UDMATIM) & (dev ? 0xFF0F : 0xFFF0); | ||
| 103 | val16 |= (mode << (dev ? 4 : 0)); | ||
| 104 | writew(val16, base + BK3710_UDMATIM); | ||
| 105 | |||
| 106 | /* udmastb Ultra DMA Access Strobe Width */ | 91 | /* udmastb Ultra DMA Access Strobe Width */ |
| 107 | val32 = readl(base + BK3710_UDMASTB) & (0xFF << (dev ? 0 : 8)); | 92 | val32 = readl(base + BK3710_UDMASTB) & (0xFF << (dev ? 0 : 8)); |
| 108 | val32 |= (t0 << (dev ? 8 : 0)); | 93 | val32 |= (t0 << (dev ? 8 : 0)); |
| @@ -163,10 +148,11 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate, | |||
| 163 | u32 val32; | 148 | u32 val32; |
| 164 | struct ide_timing *t; | 149 | struct ide_timing *t; |
| 165 | 150 | ||
| 151 | t = ide_timing_find_mode(XFER_PIO_0 + mode); | ||
| 152 | |||
| 166 | /* PIO Data Setup */ | 153 | /* PIO Data Setup */ |
| 167 | t0 = DIV_ROUND_UP(cycletime, ideclk_period); | 154 | t0 = DIV_ROUND_UP(cycletime, ideclk_period); |
| 168 | t2 = DIV_ROUND_UP(ide_timing_find_mode(XFER_PIO_0 + mode)->active, | 155 | t2 = DIV_ROUND_UP(t->active, ideclk_period); |
| 169 | ideclk_period); | ||
| 170 | 156 | ||
| 171 | t2i = t0 - t2 - 1; | 157 | t2i = t0 - t2 - 1; |
| 172 | t2 -= 1; | 158 | t2 -= 1; |
| @@ -187,7 +173,6 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate, | |||
| 187 | } | 173 | } |
| 188 | 174 | ||
| 189 | /* TASKFILE Setup */ | 175 | /* TASKFILE Setup */ |
| 190 | t = ide_timing_find_mode(XFER_PIO_0 + mode); | ||
| 191 | t0 = DIV_ROUND_UP(t->cyc8b, ideclk_period); | 176 | t0 = DIV_ROUND_UP(t->cyc8b, ideclk_period); |
| 192 | t2 = DIV_ROUND_UP(t->act8b, ideclk_period); | 177 | t2 = DIV_ROUND_UP(t->act8b, ideclk_period); |
| 193 | 178 | ||
| @@ -236,42 +221,23 @@ static void palm_bk3710_set_pio_mode(ide_drive_t *drive, u8 pio) | |||
| 236 | static void __devinit palm_bk3710_chipinit(void __iomem *base) | 221 | static void __devinit palm_bk3710_chipinit(void __iomem *base) |
| 237 | { | 222 | { |
| 238 | /* | 223 | /* |
| 239 | * enable the reset_en of ATA controller so that when ata signals | 224 | * REVISIT: the ATA reset signal needs to be managed through a |
| 240 | * are brought out, by writing into device config. at that | 225 | * GPIO, which means it should come from platform_data. Until |
| 241 | * time por_n signal should not be 'Z' and have a stable value. | 226 | * we get and use such information, we have to trust that things |
| 227 | * have been reset before we get here. | ||
| 242 | */ | 228 | */ |
| 243 | writel(0x0300, base + BK3710_MISCCTL); | ||
| 244 | |||
| 245 | /* wait for some time and deassert the reset of ATA Device. */ | ||
| 246 | mdelay(100); | ||
| 247 | |||
| 248 | /* Deassert the Reset */ | ||
| 249 | writel(0x0200, base + BK3710_MISCCTL); | ||
| 250 | 229 | ||
| 251 | /* | 230 | /* |
| 252 | * Program the IDETIMP Register Value based on the following assumptions | 231 | * Program the IDETIMP Register Value based on the following assumptions |
| 253 | * | 232 | * |
| 254 | * (ATA_IDETIMP_IDEEN , ENABLE ) | | 233 | * (ATA_IDETIMP_IDEEN , ENABLE ) | |
| 255 | * (ATA_IDETIMP_SLVTIMEN , DISABLE) | | ||
| 256 | * (ATA_IDETIMP_RDYSMPL , 70NS) | | ||
| 257 | * (ATA_IDETIMP_RDYRCVRY , 50NS) | | ||
| 258 | * (ATA_IDETIMP_DMAFTIM1 , PIOCOMP) | | ||
| 259 | * (ATA_IDETIMP_PREPOST1 , DISABLE) | | 234 | * (ATA_IDETIMP_PREPOST1 , DISABLE) | |
| 260 | * (ATA_IDETIMP_RDYSEN1 , DISABLE) | | ||
| 261 | * (ATA_IDETIMP_PIOFTIM1 , DISABLE) | | ||
| 262 | * (ATA_IDETIMP_DMAFTIM0 , PIOCOMP) | | ||
| 263 | * (ATA_IDETIMP_PREPOST0 , DISABLE) | | 235 | * (ATA_IDETIMP_PREPOST0 , DISABLE) | |
| 264 | * (ATA_IDETIMP_RDYSEN0 , DISABLE) | | 236 | * |
| 265 | * (ATA_IDETIMP_PIOFTIM0 , DISABLE) | 237 | * DM6446 silicon rev 2.1 and earlier have no observed net benefit |
| 266 | */ | 238 | * from enabling prefetch/postwrite. |
| 267 | writew(0xB388, base + BK3710_IDETIMP); | ||
| 268 | |||
| 269 | /* | ||
| 270 | * Configure SIDETIM Register | ||
| 271 | * (ATA_SIDETIM_RDYSMPS1 ,120NS ) | | ||
| 272 | * (ATA_SIDETIM_RDYRCYS1 ,120NS ) | ||
| 273 | */ | 239 | */ |
| 274 | writeb(0, base + BK3710_SIDETIM); | 240 | writew(BIT(15), base + BK3710_IDETIMP); |
| 275 | 241 | ||
| 276 | /* | 242 | /* |
| 277 | * UDMACTL Ultra-ATA DMA Control | 243 | * UDMACTL Ultra-ATA DMA Control |
| @@ -283,11 +249,11 @@ static void __devinit palm_bk3710_chipinit(void __iomem *base) | |||
| 283 | 249 | ||
| 284 | /* | 250 | /* |
| 285 | * MISCCTL Miscellaneous Conrol Register | 251 | * MISCCTL Miscellaneous Conrol Register |
| 286 | * (ATA_MISCCTL_RSTMODEP , 1) | | 252 | * (ATA_MISCCTL_HWNHLD1P , 1 cycle) |
| 287 | * (ATA_MISCCTL_RESETP , 0) | | 253 | * (ATA_MISCCTL_HWNHLD0P , 1 cycle) |
| 288 | * (ATA_MISCCTL_TIMORIDE , 1) | 254 | * (ATA_MISCCTL_TIMORIDE , 1) |
| 289 | */ | 255 | */ |
| 290 | writel(0x201, base + BK3710_MISCCTL); | 256 | writel(0x001, base + BK3710_MISCCTL); |
| 291 | 257 | ||
| 292 | /* | 258 | /* |
| 293 | * IORDYTMP IORDY Timer for Primary Register | 259 | * IORDYTMP IORDY Timer for Primary Register |
| @@ -357,10 +323,9 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) | |||
| 357 | 323 | ||
| 358 | clk_enable(clk); | 324 | clk_enable(clk); |
| 359 | rate = clk_get_rate(clk); | 325 | rate = clk_get_rate(clk); |
| 360 | ideclk_period = 1000000000UL / rate; | ||
| 361 | 326 | ||
| 362 | /* Register the IDE interface with Linux ATA Interface */ | 327 | /* NOTE: round *down* to meet minimum timings; we count in clocks */ |
| 363 | memset(&hw, 0, sizeof(hw)); | 328 | ideclk_period = 1000000000UL / rate; |
| 364 | 329 | ||
| 365 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 330 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 366 | if (mem == NULL) { | 331 | if (mem == NULL) { |
| @@ -390,6 +355,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) | |||
| 390 | /* Configure the Palm Chip controller */ | 355 | /* Configure the Palm Chip controller */ |
| 391 | palm_bk3710_chipinit(base); | 356 | palm_bk3710_chipinit(base); |
| 392 | 357 | ||
| 358 | memset(&hw, 0, sizeof(hw)); | ||
| 393 | for (i = 0; i < IDE_NR_PORTS - 2; i++) | 359 | for (i = 0; i < IDE_NR_PORTS - 2; i++) |
| 394 | hw.io_ports_array[i] = (unsigned long) | 360 | hw.io_ports_array[i] = (unsigned long) |
| 395 | (base + IDE_PALM_ATA_PRI_REG_OFFSET + i); | 361 | (base + IDE_PALM_ATA_PRI_REG_OFFSET + i); |
| @@ -402,6 +368,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) | |||
| 402 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : | 368 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : |
| 403 | ATA_UDMA5; | 369 | ATA_UDMA5; |
| 404 | 370 | ||
| 371 | /* Register the IDE interface with Linux */ | ||
| 405 | rc = ide_host_add(&palm_bk3710_port_info, hws, NULL); | 372 | rc = ide_host_add(&palm_bk3710_port_info, hws, NULL); |
| 406 | if (rc) | 373 | if (rc) |
| 407 | goto out; | 374 | goto out; |
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 173cf55c64d..3d906833948 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -123,7 +123,7 @@ config PMAC_APM_EMU | |||
| 123 | 123 | ||
| 124 | config PMAC_MEDIABAY | 124 | config PMAC_MEDIABAY |
| 125 | bool "Support PowerBook hotswap media bay" | 125 | bool "Support PowerBook hotswap media bay" |
| 126 | depends on PPC_PMAC && PPC32 | 126 | depends on PPC_PMAC && PPC32 && BLOCK |
| 127 | help | 127 | help |
| 128 | This option adds support for older PowerBook's hotswap media bay | 128 | This option adds support for older PowerBook's hotswap media bay |
| 129 | that can contains batteries, floppy drives, or IDE devices. PCI | 129 | that can contains batteries, floppy drives, or IDE devices. PCI |
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index d7e46d345d9..029ad8ce8a7 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
| 19 | #include <linux/stddef.h> | 19 | #include <linux/stddef.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/ide.h> | ||
| 22 | #include <linux/kthread.h> | 21 | #include <linux/kthread.h> |
| 23 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 24 | #include <asm/prom.h> | 23 | #include <asm/prom.h> |
| @@ -447,6 +446,7 @@ int check_media_bay_by_base(unsigned long base, int what) | |||
| 447 | 446 | ||
| 448 | return -ENODEV; | 447 | return -ENODEV; |
| 449 | } | 448 | } |
| 449 | EXPORT_SYMBOL_GPL(check_media_bay_by_base); | ||
| 450 | 450 | ||
| 451 | int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, | 451 | int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, |
| 452 | int irq, ide_hwif_t *hwif) | 452 | int irq, ide_hwif_t *hwif) |
| @@ -486,6 +486,7 @@ int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, | |||
| 486 | 486 | ||
| 487 | return -ENODEV; | 487 | return -ENODEV; |
| 488 | } | 488 | } |
| 489 | EXPORT_SYMBOL_GPL(media_bay_set_ide_infos); | ||
| 489 | #endif /* CONFIG_BLK_DEV_IDE_PMAC */ | 490 | #endif /* CONFIG_BLK_DEV_IDE_PMAC */ |
| 490 | 491 | ||
| 491 | static void media_bay_step(int i) | 492 | static void media_bay_step(int i) |
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index 92c297796a9..bd945d04dc9 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
| @@ -1200,7 +1200,7 @@ static int si470x_fops_release(struct file *file) | |||
| 1200 | video_unregister_device(radio->videodev); | 1200 | video_unregister_device(radio->videodev); |
| 1201 | kfree(radio->buffer); | 1201 | kfree(radio->buffer); |
| 1202 | kfree(radio); | 1202 | kfree(radio); |
| 1203 | goto unlock; | 1203 | goto done; |
| 1204 | } | 1204 | } |
| 1205 | 1205 | ||
| 1206 | /* stop rds reception */ | 1206 | /* stop rds reception */ |
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c index f9fbe02e0f6..50b415e07ed 100644 --- a/drivers/media/video/pwc/pwc-ctrl.c +++ b/drivers/media/video/pwc/pwc-ctrl.c | |||
| @@ -159,35 +159,67 @@ static void pwc_set_image_buffer_size(struct pwc_device *pdev); | |||
| 159 | 159 | ||
| 160 | /****************************************************************************/ | 160 | /****************************************************************************/ |
| 161 | 161 | ||
| 162 | static int _send_control_msg(struct pwc_device *pdev, | ||
| 163 | u8 request, u16 value, int index, void *buf, int buflen, int timeout) | ||
| 164 | { | ||
| 165 | int rc; | ||
| 166 | void *kbuf = NULL; | ||
| 167 | |||
| 168 | if (buflen) { | ||
| 169 | kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */ | ||
| 170 | if (kbuf == NULL) | ||
| 171 | return -ENOMEM; | ||
| 172 | memcpy(kbuf, buf, buflen); | ||
| 173 | } | ||
| 162 | 174 | ||
| 163 | #define SendControlMsg(request, value, buflen) \ | 175 | rc = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0), |
| 164 | usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0), \ | 176 | request, |
| 165 | request, \ | 177 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 166 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, \ | 178 | value, |
| 167 | value, \ | 179 | index, |
| 168 | pdev->vcinterface, \ | 180 | kbuf, buflen, timeout); |
| 169 | &buf, buflen, 500) | ||
| 170 | 181 | ||
| 171 | #define RecvControlMsg(request, value, buflen) \ | 182 | kfree(kbuf); |
| 172 | usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0), \ | 183 | return rc; |
| 173 | request, \ | 184 | } |
| 174 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, \ | ||
| 175 | value, \ | ||
| 176 | pdev->vcinterface, \ | ||
| 177 | &buf, buflen, 500) | ||
| 178 | 185 | ||
| 186 | static int recv_control_msg(struct pwc_device *pdev, | ||
| 187 | u8 request, u16 value, void *buf, int buflen) | ||
| 188 | { | ||
| 189 | int rc; | ||
| 190 | void *kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */ | ||
| 191 | |||
| 192 | if (kbuf == NULL) | ||
| 193 | return -ENOMEM; | ||
| 194 | |||
| 195 | rc = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0), | ||
| 196 | request, | ||
| 197 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | ||
| 198 | value, | ||
| 199 | pdev->vcinterface, | ||
| 200 | kbuf, buflen, 500); | ||
| 201 | memcpy(buf, kbuf, buflen); | ||
| 202 | kfree(kbuf); | ||
| 203 | return rc; | ||
| 204 | } | ||
| 179 | 205 | ||
| 180 | static int send_video_command(struct usb_device *udev, int index, void *buf, int buflen) | 206 | static inline int send_video_command(struct pwc_device *pdev, |
| 207 | int index, void *buf, int buflen) | ||
| 181 | { | 208 | { |
| 182 | return usb_control_msg(udev, | 209 | return _send_control_msg(pdev, |
| 183 | usb_sndctrlpipe(udev, 0), | ||
| 184 | SET_EP_STREAM_CTL, | 210 | SET_EP_STREAM_CTL, |
| 185 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | ||
| 186 | VIDEO_OUTPUT_CONTROL_FORMATTER, | 211 | VIDEO_OUTPUT_CONTROL_FORMATTER, |
| 187 | index, | 212 | index, |
| 188 | buf, buflen, 1000); | 213 | buf, buflen, 1000); |
| 189 | } | 214 | } |
| 190 | 215 | ||
| 216 | static inline int send_control_msg(struct pwc_device *pdev, | ||
| 217 | u8 request, u16 value, void *buf, int buflen) | ||
| 218 | { | ||
| 219 | return _send_control_msg(pdev, | ||
| 220 | request, value, pdev->vcinterface, buf, buflen, 500); | ||
| 221 | } | ||
| 222 | |||
| 191 | 223 | ||
| 192 | 224 | ||
| 193 | static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames) | 225 | static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames) |
| @@ -224,7 +256,7 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames) | |||
| 224 | return -EINVAL; | 256 | return -EINVAL; |
| 225 | 257 | ||
| 226 | memcpy(buf, pEntry->mode, 3); | 258 | memcpy(buf, pEntry->mode, 3); |
| 227 | ret = send_video_command(pdev->udev, pdev->vendpoint, buf, 3); | 259 | ret = send_video_command(pdev, pdev->vendpoint, buf, 3); |
| 228 | if (ret < 0) { | 260 | if (ret < 0) { |
| 229 | PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret); | 261 | PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret); |
| 230 | return ret; | 262 | return ret; |
| @@ -285,7 +317,7 @@ static int set_video_mode_Timon(struct pwc_device *pdev, int size, int frames, i | |||
| 285 | memcpy(buf, pChoose->mode, 13); | 317 | memcpy(buf, pChoose->mode, 13); |
| 286 | if (snapshot) | 318 | if (snapshot) |
| 287 | buf[0] |= 0x80; | 319 | buf[0] |= 0x80; |
| 288 | ret = send_video_command(pdev->udev, pdev->vendpoint, buf, 13); | 320 | ret = send_video_command(pdev, pdev->vendpoint, buf, 13); |
| 289 | if (ret < 0) | 321 | if (ret < 0) |
| 290 | return ret; | 322 | return ret; |
| 291 | 323 | ||
| @@ -358,7 +390,7 @@ static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int frames, i | |||
| 358 | buf[0] |= 0x80; | 390 | buf[0] |= 0x80; |
| 359 | 391 | ||
| 360 | /* Firmware bug: video endpoint is 5, but commands are sent to endpoint 4 */ | 392 | /* Firmware bug: video endpoint is 5, but commands are sent to endpoint 4 */ |
| 361 | ret = send_video_command(pdev->udev, 4 /* pdev->vendpoint */, buf, 12); | 393 | ret = send_video_command(pdev, 4 /* pdev->vendpoint */, buf, 12); |
| 362 | if (ret < 0) | 394 | if (ret < 0) |
| 363 | return ret; | 395 | return ret; |
| 364 | 396 | ||
| @@ -530,7 +562,8 @@ int pwc_get_brightness(struct pwc_device *pdev) | |||
| 530 | char buf; | 562 | char buf; |
| 531 | int ret; | 563 | int ret; |
| 532 | 564 | ||
| 533 | ret = RecvControlMsg(GET_LUM_CTL, BRIGHTNESS_FORMATTER, 1); | 565 | ret = recv_control_msg(pdev, |
| 566 | GET_LUM_CTL, BRIGHTNESS_FORMATTER, &buf, sizeof(buf)); | ||
| 534 | if (ret < 0) | 567 | if (ret < 0) |
| 535 | return ret; | 568 | return ret; |
| 536 | return buf; | 569 | return buf; |
| @@ -545,7 +578,8 @@ int pwc_set_brightness(struct pwc_device *pdev, int value) | |||
| 545 | if (value > 0xffff) | 578 | if (value > 0xffff) |
| 546 | value = 0xffff; | 579 | value = 0xffff; |
| 547 | buf = (value >> 9) & 0x7f; | 580 | buf = (value >> 9) & 0x7f; |
| 548 | return SendControlMsg(SET_LUM_CTL, BRIGHTNESS_FORMATTER, 1); | 581 | return send_control_msg(pdev, |
| 582 | SET_LUM_CTL, BRIGHTNESS_FORMATTER, &buf, sizeof(buf)); | ||
| 549 | } | 583 | } |
| 550 | 584 | ||
| 551 | /* CONTRAST */ | 585 | /* CONTRAST */ |
| @@ -555,7 +589,8 @@ int pwc_get_contrast(struct pwc_device *pdev) | |||
| 555 | char buf; | 589 | char buf; |
| 556 | int ret; | 590 | int ret; |
| 557 | 591 | ||
| 558 | ret = RecvControlMsg(GET_LUM_CTL, CONTRAST_FORMATTER, 1); | 592 | ret = recv_control_msg(pdev, |
| 593 | GET_LUM_CTL, CONTRAST_FORMATTER, &buf, sizeof(buf)); | ||
| 559 | if (ret < 0) | 594 | if (ret < 0) |
| 560 | return ret; | 595 | return ret; |
| 561 | return buf; | 596 | return buf; |
| @@ -570,7 +605,8 @@ int pwc_set_contrast(struct pwc_device *pdev, int value) | |||
| 570 | if (value > 0xffff) | 605 | if (value > 0xffff) |
| 571 | value = 0xffff; | 606 | value = 0xffff; |
| 572 | buf = (value >> 10) & 0x3f; | 607 | buf = (value >> 10) & 0x3f; |
| 573 | return SendControlMsg(SET_LUM_CTL, CONTRAST_FORMATTER, 1); | 608 | return send_control_msg(pdev, |
| 609 | SET_LUM_CTL, CONTRAST_FORMATTER, &buf, sizeof(buf)); | ||
| 574 | } | 610 | } |
| 575 | 611 | ||
| 576 | /* GAMMA */ | 612 | /* GAMMA */ |
| @@ -580,7 +616,8 @@ int pwc_get_gamma(struct pwc_device *pdev) | |||
| 580 | char buf; | 616 | char buf; |
| 581 | int ret; | 617 | int ret; |
| 582 | 618 | ||
| 583 | ret = RecvControlMsg(GET_LUM_CTL, GAMMA_FORMATTER, 1); | 619 | ret = recv_control_msg(pdev, |
| 620 | GET_LUM_CTL, GAMMA_FORMATTER, &buf, sizeof(buf)); | ||
| 584 | if (ret < 0) | 621 | if (ret < 0) |
| 585 | return ret; | 622 | return ret; |
| 586 | return buf; | 623 | return buf; |
| @@ -595,7 +632,8 @@ int pwc_set_gamma(struct pwc_device *pdev, int value) | |||
| 595 | if (value > 0xffff) | 632 | if (value > 0xffff) |
| 596 | value = 0xffff; | 633 | value = 0xffff; |
| 597 | buf = (value >> 11) & 0x1f; | 634 | buf = (value >> 11) & 0x1f; |
| 598 | return SendControlMsg(SET_LUM_CTL, GAMMA_FORMATTER, 1); | 635 | return send_control_msg(pdev, |
| 636 | SET_LUM_CTL, GAMMA_FORMATTER, &buf, sizeof(buf)); | ||
| 599 | } | 637 | } |
| 600 | 638 | ||
| 601 | 639 | ||
| @@ -613,7 +651,8 @@ int pwc_get_saturation(struct pwc_device *pdev, int *value) | |||
| 613 | saturation_register = SATURATION_MODE_FORMATTER2; | 651 | saturation_register = SATURATION_MODE_FORMATTER2; |
| 614 | else | 652 | else |
| 615 | saturation_register = SATURATION_MODE_FORMATTER1; | 653 | saturation_register = SATURATION_MODE_FORMATTER1; |
| 616 | ret = RecvControlMsg(GET_CHROM_CTL, saturation_register, 1); | 654 | ret = recv_control_msg(pdev, |
| 655 | GET_CHROM_CTL, saturation_register, &buf, sizeof(buf)); | ||
| 617 | if (ret < 0) | 656 | if (ret < 0) |
| 618 | return ret; | 657 | return ret; |
| 619 | *value = (signed)buf; | 658 | *value = (signed)buf; |
| @@ -636,7 +675,8 @@ int pwc_set_saturation(struct pwc_device *pdev, int value) | |||
| 636 | saturation_register = SATURATION_MODE_FORMATTER2; | 675 | saturation_register = SATURATION_MODE_FORMATTER2; |
| 637 | else | 676 | else |
| 638 | saturation_register = SATURATION_MODE_FORMATTER1; | 677 | saturation_register = SATURATION_MODE_FORMATTER1; |
| 639 | return SendControlMsg(SET_CHROM_CTL, saturation_register, 1); | 678 | return send_control_msg(pdev, |
| 679 | SET_CHROM_CTL, saturation_register, &buf, sizeof(buf)); | ||
| 640 | } | 680 | } |
| 641 | 681 | ||
| 642 | /* AGC */ | 682 | /* AGC */ |
| @@ -651,7 +691,8 @@ int pwc_set_agc(struct pwc_device *pdev, int mode, int value) | |||
| 651 | else | 691 | else |
| 652 | buf = 0xff; /* fixed */ | 692 | buf = 0xff; /* fixed */ |
| 653 | 693 | ||
| 654 | ret = SendControlMsg(SET_LUM_CTL, AGC_MODE_FORMATTER, 1); | 694 | ret = send_control_msg(pdev, |
| 695 | SET_LUM_CTL, AGC_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 655 | 696 | ||
| 656 | if (!mode && ret >= 0) { | 697 | if (!mode && ret >= 0) { |
| 657 | if (value < 0) | 698 | if (value < 0) |
| @@ -659,7 +700,8 @@ int pwc_set_agc(struct pwc_device *pdev, int mode, int value) | |||
| 659 | if (value > 0xffff) | 700 | if (value > 0xffff) |
| 660 | value = 0xffff; | 701 | value = 0xffff; |
| 661 | buf = (value >> 10) & 0x3F; | 702 | buf = (value >> 10) & 0x3F; |
| 662 | ret = SendControlMsg(SET_LUM_CTL, PRESET_AGC_FORMATTER, 1); | 703 | ret = send_control_msg(pdev, |
| 704 | SET_LUM_CTL, PRESET_AGC_FORMATTER, &buf, sizeof(buf)); | ||
| 663 | } | 705 | } |
| 664 | if (ret < 0) | 706 | if (ret < 0) |
| 665 | return ret; | 707 | return ret; |
| @@ -671,12 +713,14 @@ int pwc_get_agc(struct pwc_device *pdev, int *value) | |||
| 671 | unsigned char buf; | 713 | unsigned char buf; |
| 672 | int ret; | 714 | int ret; |
| 673 | 715 | ||
| 674 | ret = RecvControlMsg(GET_LUM_CTL, AGC_MODE_FORMATTER, 1); | 716 | ret = recv_control_msg(pdev, |
| 717 | GET_LUM_CTL, AGC_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 675 | if (ret < 0) | 718 | if (ret < 0) |
| 676 | return ret; | 719 | return ret; |
| 677 | 720 | ||
| 678 | if (buf != 0) { /* fixed */ | 721 | if (buf != 0) { /* fixed */ |
| 679 | ret = RecvControlMsg(GET_LUM_CTL, PRESET_AGC_FORMATTER, 1); | 722 | ret = recv_control_msg(pdev, |
| 723 | GET_LUM_CTL, PRESET_AGC_FORMATTER, &buf, sizeof(buf)); | ||
| 680 | if (ret < 0) | 724 | if (ret < 0) |
| 681 | return ret; | 725 | return ret; |
| 682 | if (buf > 0x3F) | 726 | if (buf > 0x3F) |
| @@ -684,7 +728,8 @@ int pwc_get_agc(struct pwc_device *pdev, int *value) | |||
| 684 | *value = (buf << 10); | 728 | *value = (buf << 10); |
| 685 | } | 729 | } |
| 686 | else { /* auto */ | 730 | else { /* auto */ |
| 687 | ret = RecvControlMsg(GET_STATUS_CTL, READ_AGC_FORMATTER, 1); | 731 | ret = recv_control_msg(pdev, |
| 732 | GET_STATUS_CTL, READ_AGC_FORMATTER, &buf, sizeof(buf)); | ||
| 688 | if (ret < 0) | 733 | if (ret < 0) |
| 689 | return ret; | 734 | return ret; |
| 690 | /* Gah... this value ranges from 0x00 ... 0x9F */ | 735 | /* Gah... this value ranges from 0x00 ... 0x9F */ |
| @@ -707,7 +752,8 @@ int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value) | |||
| 707 | else | 752 | else |
| 708 | buf[0] = 0xff; /* fixed */ | 753 | buf[0] = 0xff; /* fixed */ |
| 709 | 754 | ||
| 710 | ret = SendControlMsg(SET_LUM_CTL, SHUTTER_MODE_FORMATTER, 1); | 755 | ret = send_control_msg(pdev, |
| 756 | SET_LUM_CTL, SHUTTER_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 711 | 757 | ||
| 712 | if (!mode && ret >= 0) { | 758 | if (!mode && ret >= 0) { |
| 713 | if (value < 0) | 759 | if (value < 0) |
| @@ -726,7 +772,9 @@ int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value) | |||
| 726 | buf[0] = value >> 8; | 772 | buf[0] = value >> 8; |
| 727 | } | 773 | } |
| 728 | 774 | ||
| 729 | ret = SendControlMsg(SET_LUM_CTL, PRESET_SHUTTER_FORMATTER, 2); | 775 | ret = send_control_msg(pdev, |
| 776 | SET_LUM_CTL, PRESET_SHUTTER_FORMATTER, | ||
| 777 | &buf, sizeof(buf)); | ||
| 730 | } | 778 | } |
| 731 | return ret; | 779 | return ret; |
| 732 | } | 780 | } |
| @@ -737,7 +785,8 @@ int pwc_get_shutter_speed(struct pwc_device *pdev, int *value) | |||
| 737 | unsigned char buf[2]; | 785 | unsigned char buf[2]; |
| 738 | int ret; | 786 | int ret; |
| 739 | 787 | ||
| 740 | ret = RecvControlMsg(GET_STATUS_CTL, READ_SHUTTER_FORMATTER, 2); | 788 | ret = recv_control_msg(pdev, |
| 789 | GET_STATUS_CTL, READ_SHUTTER_FORMATTER, &buf, sizeof(buf)); | ||
| 741 | if (ret < 0) | 790 | if (ret < 0) |
| 742 | return ret; | 791 | return ret; |
| 743 | *value = buf[0] + (buf[1] << 8); | 792 | *value = buf[0] + (buf[1] << 8); |
| @@ -764,7 +813,9 @@ int pwc_camera_power(struct pwc_device *pdev, int power) | |||
| 764 | buf = 0x00; /* active */ | 813 | buf = 0x00; /* active */ |
| 765 | else | 814 | else |
| 766 | buf = 0xFF; /* power save */ | 815 | buf = 0xFF; /* power save */ |
| 767 | return SendControlMsg(SET_STATUS_CTL, SET_POWER_SAVE_MODE_FORMATTER, 1); | 816 | return send_control_msg(pdev, |
| 817 | SET_STATUS_CTL, SET_POWER_SAVE_MODE_FORMATTER, | ||
| 818 | &buf, sizeof(buf)); | ||
| 768 | } | 819 | } |
| 769 | 820 | ||
| 770 | 821 | ||
| @@ -773,20 +824,20 @@ int pwc_camera_power(struct pwc_device *pdev, int power) | |||
| 773 | 824 | ||
| 774 | int pwc_restore_user(struct pwc_device *pdev) | 825 | int pwc_restore_user(struct pwc_device *pdev) |
| 775 | { | 826 | { |
| 776 | char buf; /* dummy */ | 827 | return send_control_msg(pdev, |
| 777 | return SendControlMsg(SET_STATUS_CTL, RESTORE_USER_DEFAULTS_FORMATTER, 0); | 828 | SET_STATUS_CTL, RESTORE_USER_DEFAULTS_FORMATTER, NULL, 0); |
| 778 | } | 829 | } |
| 779 | 830 | ||
| 780 | int pwc_save_user(struct pwc_device *pdev) | 831 | int pwc_save_user(struct pwc_device *pdev) |
| 781 | { | 832 | { |
| 782 | char buf; /* dummy */ | 833 | return send_control_msg(pdev, |
| 783 | return SendControlMsg(SET_STATUS_CTL, SAVE_USER_DEFAULTS_FORMATTER, 0); | 834 | SET_STATUS_CTL, SAVE_USER_DEFAULTS_FORMATTER, NULL, 0); |
| 784 | } | 835 | } |
| 785 | 836 | ||
| 786 | int pwc_restore_factory(struct pwc_device *pdev) | 837 | int pwc_restore_factory(struct pwc_device *pdev) |
| 787 | { | 838 | { |
| 788 | char buf; /* dummy */ | 839 | return send_control_msg(pdev, |
| 789 | return SendControlMsg(SET_STATUS_CTL, RESTORE_FACTORY_DEFAULTS_FORMATTER, 0); | 840 | SET_STATUS_CTL, RESTORE_FACTORY_DEFAULTS_FORMATTER, NULL, 0); |
| 790 | } | 841 | } |
| 791 | 842 | ||
| 792 | /* ************************************************* */ | 843 | /* ************************************************* */ |
| @@ -814,7 +865,8 @@ int pwc_set_awb(struct pwc_device *pdev, int mode) | |||
| 814 | 865 | ||
| 815 | buf = mode & 0x07; /* just the lowest three bits */ | 866 | buf = mode & 0x07; /* just the lowest three bits */ |
| 816 | 867 | ||
| 817 | ret = SendControlMsg(SET_CHROM_CTL, WB_MODE_FORMATTER, 1); | 868 | ret = send_control_msg(pdev, |
| 869 | SET_CHROM_CTL, WB_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 818 | 870 | ||
| 819 | if (ret < 0) | 871 | if (ret < 0) |
| 820 | return ret; | 872 | return ret; |
| @@ -826,7 +878,8 @@ int pwc_get_awb(struct pwc_device *pdev) | |||
| 826 | unsigned char buf; | 878 | unsigned char buf; |
| 827 | int ret; | 879 | int ret; |
| 828 | 880 | ||
| 829 | ret = RecvControlMsg(GET_CHROM_CTL, WB_MODE_FORMATTER, 1); | 881 | ret = recv_control_msg(pdev, |
| 882 | GET_CHROM_CTL, WB_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 830 | 883 | ||
| 831 | if (ret < 0) | 884 | if (ret < 0) |
| 832 | return ret; | 885 | return ret; |
| @@ -843,7 +896,9 @@ int pwc_set_red_gain(struct pwc_device *pdev, int value) | |||
| 843 | value = 0xffff; | 896 | value = 0xffff; |
| 844 | /* only the msb is considered */ | 897 | /* only the msb is considered */ |
| 845 | buf = value >> 8; | 898 | buf = value >> 8; |
| 846 | return SendControlMsg(SET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, 1); | 899 | return send_control_msg(pdev, |
| 900 | SET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, | ||
| 901 | &buf, sizeof(buf)); | ||
| 847 | } | 902 | } |
| 848 | 903 | ||
| 849 | int pwc_get_red_gain(struct pwc_device *pdev, int *value) | 904 | int pwc_get_red_gain(struct pwc_device *pdev, int *value) |
| @@ -851,7 +906,9 @@ int pwc_get_red_gain(struct pwc_device *pdev, int *value) | |||
| 851 | unsigned char buf; | 906 | unsigned char buf; |
| 852 | int ret; | 907 | int ret; |
| 853 | 908 | ||
| 854 | ret = RecvControlMsg(GET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, 1); | 909 | ret = recv_control_msg(pdev, |
| 910 | GET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, | ||
| 911 | &buf, sizeof(buf)); | ||
| 855 | if (ret < 0) | 912 | if (ret < 0) |
| 856 | return ret; | 913 | return ret; |
| 857 | *value = buf << 8; | 914 | *value = buf << 8; |
| @@ -869,7 +926,9 @@ int pwc_set_blue_gain(struct pwc_device *pdev, int value) | |||
| 869 | value = 0xffff; | 926 | value = 0xffff; |
| 870 | /* only the msb is considered */ | 927 | /* only the msb is considered */ |
| 871 | buf = value >> 8; | 928 | buf = value >> 8; |
| 872 | return SendControlMsg(SET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, 1); | 929 | return send_control_msg(pdev, |
| 930 | SET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, | ||
| 931 | &buf, sizeof(buf)); | ||
| 873 | } | 932 | } |
| 874 | 933 | ||
| 875 | int pwc_get_blue_gain(struct pwc_device *pdev, int *value) | 934 | int pwc_get_blue_gain(struct pwc_device *pdev, int *value) |
| @@ -877,7 +936,9 @@ int pwc_get_blue_gain(struct pwc_device *pdev, int *value) | |||
| 877 | unsigned char buf; | 936 | unsigned char buf; |
| 878 | int ret; | 937 | int ret; |
| 879 | 938 | ||
| 880 | ret = RecvControlMsg(GET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, 1); | 939 | ret = recv_control_msg(pdev, |
| 940 | GET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, | ||
| 941 | &buf, sizeof(buf)); | ||
| 881 | if (ret < 0) | 942 | if (ret < 0) |
| 882 | return ret; | 943 | return ret; |
| 883 | *value = buf << 8; | 944 | *value = buf << 8; |
| @@ -894,7 +955,8 @@ static int pwc_read_red_gain(struct pwc_device *pdev, int *value) | |||
| 894 | unsigned char buf; | 955 | unsigned char buf; |
| 895 | int ret; | 956 | int ret; |
| 896 | 957 | ||
| 897 | ret = RecvControlMsg(GET_STATUS_CTL, READ_RED_GAIN_FORMATTER, 1); | 958 | ret = recv_control_msg(pdev, |
| 959 | GET_STATUS_CTL, READ_RED_GAIN_FORMATTER, &buf, sizeof(buf)); | ||
| 898 | if (ret < 0) | 960 | if (ret < 0) |
| 899 | return ret; | 961 | return ret; |
| 900 | *value = buf << 8; | 962 | *value = buf << 8; |
| @@ -906,7 +968,8 @@ static int pwc_read_blue_gain(struct pwc_device *pdev, int *value) | |||
| 906 | unsigned char buf; | 968 | unsigned char buf; |
| 907 | int ret; | 969 | int ret; |
| 908 | 970 | ||
| 909 | ret = RecvControlMsg(GET_STATUS_CTL, READ_BLUE_GAIN_FORMATTER, 1); | 971 | ret = recv_control_msg(pdev, |
| 972 | GET_STATUS_CTL, READ_BLUE_GAIN_FORMATTER, &buf, sizeof(buf)); | ||
| 910 | if (ret < 0) | 973 | if (ret < 0) |
| 911 | return ret; | 974 | return ret; |
| 912 | *value = buf << 8; | 975 | *value = buf << 8; |
| @@ -920,7 +983,8 @@ static int pwc_set_wb_speed(struct pwc_device *pdev, int speed) | |||
| 920 | 983 | ||
| 921 | /* useful range is 0x01..0x20 */ | 984 | /* useful range is 0x01..0x20 */ |
| 922 | buf = speed / 0x7f0; | 985 | buf = speed / 0x7f0; |
| 923 | return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1); | 986 | return send_control_msg(pdev, |
| 987 | SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, &buf, sizeof(buf)); | ||
| 924 | } | 988 | } |
| 925 | 989 | ||
| 926 | static int pwc_get_wb_speed(struct pwc_device *pdev, int *value) | 990 | static int pwc_get_wb_speed(struct pwc_device *pdev, int *value) |
| @@ -928,7 +992,8 @@ static int pwc_get_wb_speed(struct pwc_device *pdev, int *value) | |||
| 928 | unsigned char buf; | 992 | unsigned char buf; |
| 929 | int ret; | 993 | int ret; |
| 930 | 994 | ||
| 931 | ret = RecvControlMsg(GET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1); | 995 | ret = recv_control_msg(pdev, |
| 996 | GET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, &buf, sizeof(buf)); | ||
| 932 | if (ret < 0) | 997 | if (ret < 0) |
| 933 | return ret; | 998 | return ret; |
| 934 | *value = buf * 0x7f0; | 999 | *value = buf * 0x7f0; |
| @@ -942,7 +1007,8 @@ static int pwc_set_wb_delay(struct pwc_device *pdev, int delay) | |||
| 942 | 1007 | ||
| 943 | /* useful range is 0x01..0x3F */ | 1008 | /* useful range is 0x01..0x3F */ |
| 944 | buf = (delay >> 10); | 1009 | buf = (delay >> 10); |
| 945 | return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1); | 1010 | return send_control_msg(pdev, |
| 1011 | SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, &buf, sizeof(buf)); | ||
| 946 | } | 1012 | } |
| 947 | 1013 | ||
| 948 | static int pwc_get_wb_delay(struct pwc_device *pdev, int *value) | 1014 | static int pwc_get_wb_delay(struct pwc_device *pdev, int *value) |
| @@ -950,7 +1016,8 @@ static int pwc_get_wb_delay(struct pwc_device *pdev, int *value) | |||
| 950 | unsigned char buf; | 1016 | unsigned char buf; |
| 951 | int ret; | 1017 | int ret; |
| 952 | 1018 | ||
| 953 | ret = RecvControlMsg(GET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1); | 1019 | ret = recv_control_msg(pdev, |
| 1020 | GET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, &buf, sizeof(buf)); | ||
| 954 | if (ret < 0) | 1021 | if (ret < 0) |
| 955 | return ret; | 1022 | return ret; |
| 956 | *value = buf << 10; | 1023 | *value = buf << 10; |
| @@ -978,7 +1045,8 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value) | |||
| 978 | buf[0] = on_value; | 1045 | buf[0] = on_value; |
| 979 | buf[1] = off_value; | 1046 | buf[1] = off_value; |
| 980 | 1047 | ||
| 981 | return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2); | 1048 | return send_control_msg(pdev, |
| 1049 | SET_STATUS_CTL, LED_FORMATTER, &buf, sizeof(buf)); | ||
| 982 | } | 1050 | } |
| 983 | 1051 | ||
| 984 | static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value) | 1052 | static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value) |
| @@ -992,7 +1060,8 @@ static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value) | |||
| 992 | return 0; | 1060 | return 0; |
| 993 | } | 1061 | } |
| 994 | 1062 | ||
| 995 | ret = RecvControlMsg(GET_STATUS_CTL, LED_FORMATTER, 2); | 1063 | ret = recv_control_msg(pdev, |
| 1064 | GET_STATUS_CTL, LED_FORMATTER, &buf, sizeof(buf)); | ||
| 996 | if (ret < 0) | 1065 | if (ret < 0) |
| 997 | return ret; | 1066 | return ret; |
| 998 | *on_value = buf[0] * 100; | 1067 | *on_value = buf[0] * 100; |
| @@ -1009,7 +1078,8 @@ int pwc_set_contour(struct pwc_device *pdev, int contour) | |||
| 1009 | buf = 0xff; /* auto contour on */ | 1078 | buf = 0xff; /* auto contour on */ |
| 1010 | else | 1079 | else |
| 1011 | buf = 0x0; /* auto contour off */ | 1080 | buf = 0x0; /* auto contour off */ |
| 1012 | ret = SendControlMsg(SET_LUM_CTL, AUTO_CONTOUR_FORMATTER, 1); | 1081 | ret = send_control_msg(pdev, |
| 1082 | SET_LUM_CTL, AUTO_CONTOUR_FORMATTER, &buf, sizeof(buf)); | ||
| 1013 | if (ret < 0) | 1083 | if (ret < 0) |
| 1014 | return ret; | 1084 | return ret; |
| 1015 | 1085 | ||
| @@ -1019,7 +1089,8 @@ int pwc_set_contour(struct pwc_device *pdev, int contour) | |||
| 1019 | contour = 0xffff; | 1089 | contour = 0xffff; |
| 1020 | 1090 | ||
| 1021 | buf = (contour >> 10); /* contour preset is [0..3f] */ | 1091 | buf = (contour >> 10); /* contour preset is [0..3f] */ |
| 1022 | ret = SendControlMsg(SET_LUM_CTL, PRESET_CONTOUR_FORMATTER, 1); | 1092 | ret = send_control_msg(pdev, |
| 1093 | SET_LUM_CTL, PRESET_CONTOUR_FORMATTER, &buf, sizeof(buf)); | ||
| 1023 | if (ret < 0) | 1094 | if (ret < 0) |
| 1024 | return ret; | 1095 | return ret; |
| 1025 | return 0; | 1096 | return 0; |
| @@ -1030,13 +1101,16 @@ int pwc_get_contour(struct pwc_device *pdev, int *contour) | |||
| 1030 | unsigned char buf; | 1101 | unsigned char buf; |
| 1031 | int ret; | 1102 | int ret; |
| 1032 | 1103 | ||
| 1033 | ret = RecvControlMsg(GET_LUM_CTL, AUTO_CONTOUR_FORMATTER, 1); | 1104 | ret = recv_control_msg(pdev, |
| 1105 | GET_LUM_CTL, AUTO_CONTOUR_FORMATTER, &buf, sizeof(buf)); | ||
| 1034 | if (ret < 0) | 1106 | if (ret < 0) |
| 1035 | return ret; | 1107 | return ret; |
| 1036 | 1108 | ||
| 1037 | if (buf == 0) { | 1109 | if (buf == 0) { |
| 1038 | /* auto mode off, query current preset value */ | 1110 | /* auto mode off, query current preset value */ |
| 1039 | ret = RecvControlMsg(GET_LUM_CTL, PRESET_CONTOUR_FORMATTER, 1); | 1111 | ret = recv_control_msg(pdev, |
| 1112 | GET_LUM_CTL, PRESET_CONTOUR_FORMATTER, | ||
| 1113 | &buf, sizeof(buf)); | ||
| 1040 | if (ret < 0) | 1114 | if (ret < 0) |
| 1041 | return ret; | 1115 | return ret; |
| 1042 | *contour = buf << 10; | 1116 | *contour = buf << 10; |
| @@ -1055,7 +1129,9 @@ int pwc_set_backlight(struct pwc_device *pdev, int backlight) | |||
| 1055 | buf = 0xff; | 1129 | buf = 0xff; |
| 1056 | else | 1130 | else |
| 1057 | buf = 0x0; | 1131 | buf = 0x0; |
| 1058 | return SendControlMsg(SET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1); | 1132 | return send_control_msg(pdev, |
| 1133 | SET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, | ||
| 1134 | &buf, sizeof(buf)); | ||
| 1059 | } | 1135 | } |
| 1060 | 1136 | ||
| 1061 | int pwc_get_backlight(struct pwc_device *pdev, int *backlight) | 1137 | int pwc_get_backlight(struct pwc_device *pdev, int *backlight) |
| @@ -1063,7 +1139,9 @@ int pwc_get_backlight(struct pwc_device *pdev, int *backlight) | |||
| 1063 | int ret; | 1139 | int ret; |
| 1064 | unsigned char buf; | 1140 | unsigned char buf; |
| 1065 | 1141 | ||
| 1066 | ret = RecvControlMsg(GET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1); | 1142 | ret = recv_control_msg(pdev, |
| 1143 | GET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, | ||
| 1144 | &buf, sizeof(buf)); | ||
| 1067 | if (ret < 0) | 1145 | if (ret < 0) |
| 1068 | return ret; | 1146 | return ret; |
| 1069 | *backlight = !!buf; | 1147 | *backlight = !!buf; |
| @@ -1078,7 +1156,8 @@ int pwc_set_colour_mode(struct pwc_device *pdev, int colour) | |||
| 1078 | buf = 0xff; | 1156 | buf = 0xff; |
| 1079 | else | 1157 | else |
| 1080 | buf = 0x0; | 1158 | buf = 0x0; |
| 1081 | return SendControlMsg(SET_CHROM_CTL, COLOUR_MODE_FORMATTER, 1); | 1159 | return send_control_msg(pdev, |
| 1160 | SET_CHROM_CTL, COLOUR_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 1082 | } | 1161 | } |
| 1083 | 1162 | ||
| 1084 | int pwc_get_colour_mode(struct pwc_device *pdev, int *colour) | 1163 | int pwc_get_colour_mode(struct pwc_device *pdev, int *colour) |
| @@ -1086,7 +1165,8 @@ int pwc_get_colour_mode(struct pwc_device *pdev, int *colour) | |||
| 1086 | int ret; | 1165 | int ret; |
| 1087 | unsigned char buf; | 1166 | unsigned char buf; |
| 1088 | 1167 | ||
| 1089 | ret = RecvControlMsg(GET_CHROM_CTL, COLOUR_MODE_FORMATTER, 1); | 1168 | ret = recv_control_msg(pdev, |
| 1169 | GET_CHROM_CTL, COLOUR_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 1090 | if (ret < 0) | 1170 | if (ret < 0) |
| 1091 | return ret; | 1171 | return ret; |
| 1092 | *colour = !!buf; | 1172 | *colour = !!buf; |
| @@ -1102,7 +1182,8 @@ int pwc_set_flicker(struct pwc_device *pdev, int flicker) | |||
| 1102 | buf = 0xff; | 1182 | buf = 0xff; |
| 1103 | else | 1183 | else |
| 1104 | buf = 0x0; | 1184 | buf = 0x0; |
| 1105 | return SendControlMsg(SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1); | 1185 | return send_control_msg(pdev, |
| 1186 | SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 1106 | } | 1187 | } |
| 1107 | 1188 | ||
| 1108 | int pwc_get_flicker(struct pwc_device *pdev, int *flicker) | 1189 | int pwc_get_flicker(struct pwc_device *pdev, int *flicker) |
| @@ -1110,7 +1191,8 @@ int pwc_get_flicker(struct pwc_device *pdev, int *flicker) | |||
| 1110 | int ret; | 1191 | int ret; |
| 1111 | unsigned char buf; | 1192 | unsigned char buf; |
| 1112 | 1193 | ||
| 1113 | ret = RecvControlMsg(GET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1); | 1194 | ret = recv_control_msg(pdev, |
| 1195 | GET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, &buf, sizeof(buf)); | ||
| 1114 | if (ret < 0) | 1196 | if (ret < 0) |
| 1115 | return ret; | 1197 | return ret; |
| 1116 | *flicker = !!buf; | 1198 | *flicker = !!buf; |
| @@ -1126,7 +1208,9 @@ int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise) | |||
| 1126 | if (noise > 3) | 1208 | if (noise > 3) |
| 1127 | noise = 3; | 1209 | noise = 3; |
| 1128 | buf = noise; | 1210 | buf = noise; |
| 1129 | return SendControlMsg(SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1); | 1211 | return send_control_msg(pdev, |
| 1212 | SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, | ||
| 1213 | &buf, sizeof(buf)); | ||
| 1130 | } | 1214 | } |
| 1131 | 1215 | ||
| 1132 | int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise) | 1216 | int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise) |
| @@ -1134,7 +1218,9 @@ int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise) | |||
| 1134 | int ret; | 1218 | int ret; |
| 1135 | unsigned char buf; | 1219 | unsigned char buf; |
| 1136 | 1220 | ||
| 1137 | ret = RecvControlMsg(GET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1); | 1221 | ret = recv_control_msg(pdev, |
| 1222 | GET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, | ||
| 1223 | &buf, sizeof(buf)); | ||
| 1138 | if (ret < 0) | 1224 | if (ret < 0) |
| 1139 | return ret; | 1225 | return ret; |
| 1140 | *noise = buf; | 1226 | *noise = buf; |
| @@ -1146,7 +1232,8 @@ static int _pwc_mpt_reset(struct pwc_device *pdev, int flags) | |||
| 1146 | unsigned char buf; | 1232 | unsigned char buf; |
| 1147 | 1233 | ||
| 1148 | buf = flags & 0x03; // only lower two bits are currently used | 1234 | buf = flags & 0x03; // only lower two bits are currently used |
| 1149 | return SendControlMsg(SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, 1); | 1235 | return send_control_msg(pdev, |
| 1236 | SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, &buf, sizeof(buf)); | ||
| 1150 | } | 1237 | } |
| 1151 | 1238 | ||
| 1152 | int pwc_mpt_reset(struct pwc_device *pdev, int flags) | 1239 | int pwc_mpt_reset(struct pwc_device *pdev, int flags) |
| @@ -1175,7 +1262,8 @@ static int _pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt) | |||
| 1175 | buf[1] = (pan >> 8) & 0xFF; | 1262 | buf[1] = (pan >> 8) & 0xFF; |
| 1176 | buf[2] = tilt & 0xFF; | 1263 | buf[2] = tilt & 0xFF; |
| 1177 | buf[3] = (tilt >> 8) & 0xFF; | 1264 | buf[3] = (tilt >> 8) & 0xFF; |
| 1178 | return SendControlMsg(SET_MPT_CTL, PT_RELATIVE_CONTROL_FORMATTER, 4); | 1265 | return send_control_msg(pdev, |
| 1266 | SET_MPT_CTL, PT_RELATIVE_CONTROL_FORMATTER, &buf, sizeof(buf)); | ||
| 1179 | } | 1267 | } |
| 1180 | 1268 | ||
| 1181 | int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt) | 1269 | int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt) |
| @@ -1211,7 +1299,8 @@ static int pwc_mpt_get_status(struct pwc_device *pdev, struct pwc_mpt_status *st | |||
| 1211 | int ret; | 1299 | int ret; |
| 1212 | unsigned char buf[5]; | 1300 | unsigned char buf[5]; |
| 1213 | 1301 | ||
| 1214 | ret = RecvControlMsg(GET_MPT_CTL, PT_STATUS_FORMATTER, 5); | 1302 | ret = recv_control_msg(pdev, |
| 1303 | GET_MPT_CTL, PT_STATUS_FORMATTER, &buf, sizeof(buf)); | ||
| 1215 | if (ret < 0) | 1304 | if (ret < 0) |
| 1216 | return ret; | 1305 | return ret; |
| 1217 | status->status = buf[0] & 0x7; // 3 bits are used for reporting | 1306 | status->status = buf[0] & 0x7; // 3 bits are used for reporting |
| @@ -1233,7 +1322,8 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor) | |||
| 1233 | else | 1322 | else |
| 1234 | request = SENSOR_TYPE_FORMATTER2; | 1323 | request = SENSOR_TYPE_FORMATTER2; |
| 1235 | 1324 | ||
| 1236 | ret = RecvControlMsg(GET_STATUS_CTL, request, 1); | 1325 | ret = recv_control_msg(pdev, |
| 1326 | GET_STATUS_CTL, request, &buf, sizeof(buf)); | ||
| 1237 | if (ret < 0) | 1327 | if (ret < 0) |
| 1238 | return ret; | 1328 | return ret; |
| 1239 | if (pdev->type < 675) | 1329 | if (pdev->type < 675) |
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 7c5b257ce8e..29acd06b1c3 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
| @@ -332,7 +332,7 @@ static void cafe_select_chip(struct mtd_info *mtd, int chipnr) | |||
| 332 | cafe->ctl1 &= ~CTRL1_CHIPSELECT; | 332 | cafe->ctl1 &= ~CTRL1_CHIPSELECT; |
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | static int cafe_nand_interrupt(int irq, void *id) | 335 | static irqreturn_t cafe_nand_interrupt(int irq, void *id) |
| 336 | { | 336 | { |
| 337 | struct mtd_info *mtd = id; | 337 | struct mtd_info *mtd = id; |
| 338 | struct cafe_priv *cafe = mtd->priv; | 338 | struct cafe_priv *cafe = mtd->priv; |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 29df398b772..1fc45431a62 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
| @@ -1383,6 +1383,11 @@ static void rtl8139_hw_start (struct net_device *dev) | |||
| 1383 | RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0))); | 1383 | RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0))); |
| 1384 | RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4))); | 1384 | RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4))); |
| 1385 | 1385 | ||
| 1386 | tp->cur_rx = 0; | ||
| 1387 | |||
| 1388 | /* init Rx ring buffer DMA address */ | ||
| 1389 | RTL_W32_F (RxBuf, tp->rx_ring_dma); | ||
| 1390 | |||
| 1386 | /* Must enable Tx/Rx before setting transfer thresholds! */ | 1391 | /* Must enable Tx/Rx before setting transfer thresholds! */ |
| 1387 | RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb); | 1392 | RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb); |
| 1388 | 1393 | ||
| @@ -1390,8 +1395,6 @@ static void rtl8139_hw_start (struct net_device *dev) | |||
| 1390 | RTL_W32 (RxConfig, tp->rx_config); | 1395 | RTL_W32 (RxConfig, tp->rx_config); |
| 1391 | RTL_W32 (TxConfig, rtl8139_tx_config); | 1396 | RTL_W32 (TxConfig, rtl8139_tx_config); |
| 1392 | 1397 | ||
| 1393 | tp->cur_rx = 0; | ||
| 1394 | |||
| 1395 | rtl_check_media (dev, 1); | 1398 | rtl_check_media (dev, 1); |
| 1396 | 1399 | ||
| 1397 | if (tp->chipset >= CH_8139B) { | 1400 | if (tp->chipset >= CH_8139B) { |
| @@ -1406,9 +1409,6 @@ static void rtl8139_hw_start (struct net_device *dev) | |||
| 1406 | /* Lock Config[01234] and BMCR register writes */ | 1409 | /* Lock Config[01234] and BMCR register writes */ |
| 1407 | RTL_W8 (Cfg9346, Cfg9346_Lock); | 1410 | RTL_W8 (Cfg9346, Cfg9346_Lock); |
| 1408 | 1411 | ||
| 1409 | /* init Rx ring buffer DMA address */ | ||
| 1410 | RTL_W32_F (RxBuf, tp->rx_ring_dma); | ||
| 1411 | |||
| 1412 | /* init Tx buffer DMA addresses */ | 1412 | /* init Tx buffer DMA addresses */ |
| 1413 | for (i = 0; i < NUM_TX_DESC; i++) | 1413 | for (i = 0; i < NUM_TX_DESC; i++) |
| 1414 | RTL_W32_F (TxAddr0 + (i * 4), tp->tx_bufs_dma + (tp->tx_buf[i] - tp->tx_bufs)); | 1414 | RTL_W32_F (TxAddr0 + (i * 4), tp->tx_bufs_dma + (tp->tx_buf[i] - tp->tx_bufs)); |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9e921544ba2..214a92d1ef7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -28,9 +28,9 @@ if NETDEVICES | |||
| 28 | 28 | ||
| 29 | config COMPAT_NET_DEV_OPS | 29 | config COMPAT_NET_DEV_OPS |
| 30 | default y | 30 | default y |
| 31 | bool "Enable older network device API compatiablity" | 31 | bool "Enable older network device API compatibility" |
| 32 | ---help--- | 32 | ---help--- |
| 33 | This option enables kernel compatiability with older network devices | 33 | This option enables kernel compatibility with older network devices |
| 34 | that do not use net_device_ops interface. | 34 | that do not use net_device_ops interface. |
| 35 | 35 | ||
| 36 | If unsure, say Y. | 36 | If unsure, say Y. |
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index ab0e5febef8..7ea48414c6c 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
| @@ -1117,8 +1117,8 @@ static void cxgb_down(struct adapter *adapter) | |||
| 1117 | spin_unlock_irq(&adapter->work_lock); | 1117 | spin_unlock_irq(&adapter->work_lock); |
| 1118 | 1118 | ||
| 1119 | free_irq_resources(adapter); | 1119 | free_irq_resources(adapter); |
| 1120 | flush_workqueue(cxgb3_wq); /* wait for external IRQ handler */ | ||
| 1121 | quiesce_rx(adapter); | 1120 | quiesce_rx(adapter); |
| 1121 | flush_workqueue(cxgb3_wq); /* wait for external IRQ handler */ | ||
| 1122 | } | 1122 | } |
| 1123 | 1123 | ||
| 1124 | static void schedule_chk_task(struct adapter *adap) | 1124 | static void schedule_chk_task(struct adapter *adap) |
| @@ -1187,6 +1187,9 @@ static int offload_close(struct t3cdev *tdev) | |||
| 1187 | 1187 | ||
| 1188 | sysfs_remove_group(&tdev->lldev->dev.kobj, &offload_attr_group); | 1188 | sysfs_remove_group(&tdev->lldev->dev.kobj, &offload_attr_group); |
| 1189 | 1189 | ||
| 1190 | /* Flush work scheduled while releasing TIDs */ | ||
| 1191 | flush_scheduled_work(); | ||
| 1192 | |||
| 1190 | tdev->lldev = NULL; | 1193 | tdev->lldev = NULL; |
| 1191 | cxgb3_set_dummy_ops(tdev); | 1194 | cxgb3_set_dummy_ops(tdev); |
| 1192 | t3_tp_set_offload_mode(adapter, 0); | 1195 | t3_tp_set_offload_mode(adapter, 0); |
| @@ -1232,6 +1235,10 @@ static int cxgb_close(struct net_device *dev) | |||
| 1232 | struct port_info *pi = netdev_priv(dev); | 1235 | struct port_info *pi = netdev_priv(dev); |
| 1233 | struct adapter *adapter = pi->adapter; | 1236 | struct adapter *adapter = pi->adapter; |
| 1234 | 1237 | ||
| 1238 | |||
| 1239 | if (!adapter->open_device_map) | ||
| 1240 | return 0; | ||
| 1241 | |||
| 1235 | /* Stop link fault interrupts */ | 1242 | /* Stop link fault interrupts */ |
| 1236 | t3_xgm_intr_disable(adapter, pi->port_id); | 1243 | t3_xgm_intr_disable(adapter, pi->port_id); |
| 1237 | t3_read_reg(adapter, A_XGM_INT_STATUS + pi->mac.offset); | 1244 | t3_read_reg(adapter, A_XGM_INT_STATUS + pi->mac.offset); |
| @@ -1247,8 +1254,7 @@ static int cxgb_close(struct net_device *dev) | |||
| 1247 | spin_unlock_irq(&adapter->work_lock); | 1254 | spin_unlock_irq(&adapter->work_lock); |
| 1248 | 1255 | ||
| 1249 | if (!(adapter->open_device_map & PORT_MASK)) | 1256 | if (!(adapter->open_device_map & PORT_MASK)) |
| 1250 | cancel_rearming_delayed_workqueue(cxgb3_wq, | 1257 | cancel_delayed_work_sync(&adapter->adap_check_task); |
| 1251 | &adapter->adap_check_task); | ||
| 1252 | 1258 | ||
| 1253 | if (!adapter->open_device_map) | 1259 | if (!adapter->open_device_map) |
| 1254 | cxgb_down(adapter); | 1260 | cxgb_down(adapter); |
| @@ -2493,6 +2499,7 @@ static void check_link_status(struct adapter *adapter) | |||
| 2493 | 2499 | ||
| 2494 | spin_lock_irq(&adapter->work_lock); | 2500 | spin_lock_irq(&adapter->work_lock); |
| 2495 | if (p->link_fault) { | 2501 | if (p->link_fault) { |
| 2502 | t3_link_fault(adapter, i); | ||
| 2496 | spin_unlock_irq(&adapter->work_lock); | 2503 | spin_unlock_irq(&adapter->work_lock); |
| 2497 | continue; | 2504 | continue; |
| 2498 | } | 2505 | } |
| @@ -2554,9 +2561,7 @@ static void t3_adap_check_task(struct work_struct *work) | |||
| 2554 | 2561 | ||
| 2555 | adapter->check_task_cnt++; | 2562 | adapter->check_task_cnt++; |
| 2556 | 2563 | ||
| 2557 | /* Check link status for PHYs without interrupts */ | 2564 | check_link_status(adapter); |
| 2558 | if (p->linkpoll_period) | ||
| 2559 | check_link_status(adapter); | ||
| 2560 | 2565 | ||
| 2561 | /* Accumulate MAC stats if needed */ | 2566 | /* Accumulate MAC stats if needed */ |
| 2562 | if (!p->linkpoll_period || | 2567 | if (!p->linkpoll_period || |
| @@ -2680,21 +2685,6 @@ void t3_os_ext_intr_handler(struct adapter *adapter) | |||
| 2680 | spin_unlock(&adapter->work_lock); | 2685 | spin_unlock(&adapter->work_lock); |
| 2681 | } | 2686 | } |
| 2682 | 2687 | ||
| 2683 | static void link_fault_task(struct work_struct *work) | ||
| 2684 | { | ||
| 2685 | struct adapter *adapter = container_of(work, struct adapter, | ||
| 2686 | link_fault_handler_task); | ||
| 2687 | int i; | ||
| 2688 | |||
| 2689 | for_each_port(adapter, i) { | ||
| 2690 | struct net_device *netdev = adapter->port[i]; | ||
| 2691 | struct port_info *pi = netdev_priv(netdev); | ||
| 2692 | |||
| 2693 | if (pi->link_fault) | ||
| 2694 | t3_link_fault(adapter, i); | ||
| 2695 | } | ||
| 2696 | } | ||
| 2697 | |||
| 2698 | void t3_os_link_fault_handler(struct adapter *adapter, int port_id) | 2688 | void t3_os_link_fault_handler(struct adapter *adapter, int port_id) |
| 2699 | { | 2689 | { |
| 2700 | struct net_device *netdev = adapter->port[port_id]; | 2690 | struct net_device *netdev = adapter->port[port_id]; |
| @@ -2702,7 +2692,6 @@ void t3_os_link_fault_handler(struct adapter *adapter, int port_id) | |||
| 2702 | 2692 | ||
| 2703 | spin_lock(&adapter->work_lock); | 2693 | spin_lock(&adapter->work_lock); |
| 2704 | pi->link_fault = 1; | 2694 | pi->link_fault = 1; |
| 2705 | queue_work(cxgb3_wq, &adapter->link_fault_handler_task); | ||
| 2706 | spin_unlock(&adapter->work_lock); | 2695 | spin_unlock(&adapter->work_lock); |
| 2707 | } | 2696 | } |
| 2708 | 2697 | ||
| @@ -2838,6 +2827,9 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev, | |||
| 2838 | struct adapter *adapter = pci_get_drvdata(pdev); | 2827 | struct adapter *adapter = pci_get_drvdata(pdev); |
| 2839 | int ret; | 2828 | int ret; |
| 2840 | 2829 | ||
| 2830 | if (state == pci_channel_io_perm_failure) | ||
| 2831 | return PCI_ERS_RESULT_DISCONNECT; | ||
| 2832 | |||
| 2841 | ret = t3_adapter_error(adapter, 0); | 2833 | ret = t3_adapter_error(adapter, 0); |
| 2842 | 2834 | ||
| 2843 | /* Request a slot reset. */ | 2835 | /* Request a slot reset. */ |
| @@ -2932,8 +2924,13 @@ static int __devinit cxgb_enable_msix(struct adapter *adap) | |||
| 2932 | while ((err = pci_enable_msix(adap->pdev, entries, vectors)) > 0) | 2924 | while ((err = pci_enable_msix(adap->pdev, entries, vectors)) > 0) |
| 2933 | vectors = err; | 2925 | vectors = err; |
| 2934 | 2926 | ||
| 2935 | if (!err && vectors < (adap->params.nports + 1)) | 2927 | if (err < 0) |
| 2928 | pci_disable_msix(adap->pdev); | ||
| 2929 | |||
| 2930 | if (!err && vectors < (adap->params.nports + 1)) { | ||
| 2931 | pci_disable_msix(adap->pdev); | ||
| 2936 | err = -1; | 2932 | err = -1; |
| 2933 | } | ||
| 2937 | 2934 | ||
| 2938 | if (!err) { | 2935 | if (!err) { |
| 2939 | for (i = 0; i < vectors; ++i) | 2936 | for (i = 0; i < vectors; ++i) |
| @@ -3082,7 +3079,6 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
| 3082 | 3079 | ||
| 3083 | INIT_LIST_HEAD(&adapter->adapter_list); | 3080 | INIT_LIST_HEAD(&adapter->adapter_list); |
| 3084 | INIT_WORK(&adapter->ext_intr_handler_task, ext_intr_task); | 3081 | INIT_WORK(&adapter->ext_intr_handler_task, ext_intr_task); |
| 3085 | INIT_WORK(&adapter->link_fault_handler_task, link_fault_task); | ||
| 3086 | INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task); | 3082 | INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task); |
| 3087 | INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task); | 3083 | INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task); |
| 3088 | 3084 | ||
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 31ed31a3428..e1bd690ff83 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
| @@ -1202,7 +1202,6 @@ void t3_link_changed(struct adapter *adapter, int port_id) | |||
| 1202 | struct cphy *phy = &pi->phy; | 1202 | struct cphy *phy = &pi->phy; |
| 1203 | struct cmac *mac = &pi->mac; | 1203 | struct cmac *mac = &pi->mac; |
| 1204 | struct link_config *lc = &pi->link_config; | 1204 | struct link_config *lc = &pi->link_config; |
| 1205 | int force_link_down = 0; | ||
| 1206 | 1205 | ||
| 1207 | phy->ops->get_link_status(phy, &link_ok, &speed, &duplex, &fc); | 1206 | phy->ops->get_link_status(phy, &link_ok, &speed, &duplex, &fc); |
| 1208 | 1207 | ||
| @@ -1218,14 +1217,9 @@ void t3_link_changed(struct adapter *adapter, int port_id) | |||
| 1218 | status = t3_read_reg(adapter, A_XGM_INT_STATUS + mac->offset); | 1217 | status = t3_read_reg(adapter, A_XGM_INT_STATUS + mac->offset); |
| 1219 | if (status & F_LINKFAULTCHANGE) { | 1218 | if (status & F_LINKFAULTCHANGE) { |
| 1220 | mac->stats.link_faults++; | 1219 | mac->stats.link_faults++; |
| 1221 | force_link_down = 1; | 1220 | pi->link_fault = 1; |
| 1222 | } | 1221 | } |
| 1223 | t3_open_rx_traffic(mac, rx_cfg, rx_hash_high, rx_hash_low); | 1222 | t3_open_rx_traffic(mac, rx_cfg, rx_hash_high, rx_hash_low); |
| 1224 | |||
| 1225 | if (force_link_down) { | ||
| 1226 | t3_os_link_fault_handler(adapter, port_id); | ||
| 1227 | return; | ||
| 1228 | } | ||
| 1229 | } | 1223 | } |
| 1230 | 1224 | ||
| 1231 | if (lc->requested_fc & PAUSE_AUTONEG) | 1225 | if (lc->requested_fc & PAUSE_AUTONEG) |
| @@ -1292,9 +1286,6 @@ void t3_link_fault(struct adapter *adapter, int port_id) | |||
| 1292 | /* Account link faults only when the phy reports a link up */ | 1286 | /* Account link faults only when the phy reports a link up */ |
| 1293 | if (link_ok) | 1287 | if (link_ok) |
| 1294 | mac->stats.link_faults++; | 1288 | mac->stats.link_faults++; |
| 1295 | |||
| 1296 | msleep(1000); | ||
| 1297 | t3_os_link_fault_handler(adapter, port_id); | ||
| 1298 | } else { | 1289 | } else { |
| 1299 | if (link_ok) | 1290 | if (link_ok) |
| 1300 | t3_write_reg(adapter, A_XGM_XAUI_ACT_CTRL + mac->offset, | 1291 | t3_write_reg(adapter, A_XGM_XAUI_ACT_CTRL + mac->offset, |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index ef12931d302..6a46ceed943 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -3834,7 +3834,6 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, | |||
| 3834 | struct e1000_buffer *buffer_info; | 3834 | struct e1000_buffer *buffer_info; |
| 3835 | unsigned int i, eop; | 3835 | unsigned int i, eop; |
| 3836 | unsigned int count = 0; | 3836 | unsigned int count = 0; |
| 3837 | bool cleaned = false; | ||
| 3838 | unsigned int total_tx_bytes=0, total_tx_packets=0; | 3837 | unsigned int total_tx_bytes=0, total_tx_packets=0; |
| 3839 | 3838 | ||
| 3840 | i = tx_ring->next_to_clean; | 3839 | i = tx_ring->next_to_clean; |
| @@ -3843,7 +3842,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, | |||
| 3843 | 3842 | ||
| 3844 | while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && | 3843 | while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && |
| 3845 | (count < tx_ring->count)) { | 3844 | (count < tx_ring->count)) { |
| 3846 | for (cleaned = false; !cleaned; count++) { | 3845 | bool cleaned = false; |
| 3846 | for ( ; !cleaned; count++) { | ||
| 3847 | tx_desc = E1000_TX_DESC(*tx_ring, i); | 3847 | tx_desc = E1000_TX_DESC(*tx_ring, i); |
| 3848 | buffer_info = &tx_ring->buffer_info[i]; | 3848 | buffer_info = &tx_ring->buffer_info[i]; |
| 3849 | cleaned = (i == eop); | 3849 | cleaned = (i == eop); |
| @@ -3871,7 +3871,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, | |||
| 3871 | tx_ring->next_to_clean = i; | 3871 | tx_ring->next_to_clean = i; |
| 3872 | 3872 | ||
| 3873 | #define TX_WAKE_THRESHOLD 32 | 3873 | #define TX_WAKE_THRESHOLD 32 |
| 3874 | if (unlikely(cleaned && netif_carrier_ok(netdev) && | 3874 | if (unlikely(count && netif_carrier_ok(netdev) && |
| 3875 | E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) { | 3875 | E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) { |
| 3876 | /* Make sure that anybody stopping the queue after this | 3876 | /* Make sure that anybody stopping the queue after this |
| 3877 | * sees the new next_to_clean. | 3877 | * sees the new next_to_clean. |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 1693ed116b1..ca82f19a7ed 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -621,7 +621,6 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) | |||
| 621 | struct e1000_buffer *buffer_info; | 621 | struct e1000_buffer *buffer_info; |
| 622 | unsigned int i, eop; | 622 | unsigned int i, eop; |
| 623 | unsigned int count = 0; | 623 | unsigned int count = 0; |
| 624 | bool cleaned = false; | ||
| 625 | unsigned int total_tx_bytes = 0, total_tx_packets = 0; | 624 | unsigned int total_tx_bytes = 0, total_tx_packets = 0; |
| 626 | 625 | ||
| 627 | i = tx_ring->next_to_clean; | 626 | i = tx_ring->next_to_clean; |
| @@ -630,7 +629,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) | |||
| 630 | 629 | ||
| 631 | while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && | 630 | while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && |
| 632 | (count < tx_ring->count)) { | 631 | (count < tx_ring->count)) { |
| 633 | for (cleaned = 0; !cleaned; count++) { | 632 | bool cleaned = false; |
| 633 | for (; !cleaned; count++) { | ||
| 634 | tx_desc = E1000_TX_DESC(*tx_ring, i); | 634 | tx_desc = E1000_TX_DESC(*tx_ring, i); |
| 635 | buffer_info = &tx_ring->buffer_info[i]; | 635 | buffer_info = &tx_ring->buffer_info[i]; |
| 636 | cleaned = (i == eop); | 636 | cleaned = (i == eop); |
| @@ -661,8 +661,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) | |||
| 661 | tx_ring->next_to_clean = i; | 661 | tx_ring->next_to_clean = i; |
| 662 | 662 | ||
| 663 | #define TX_WAKE_THRESHOLD 32 | 663 | #define TX_WAKE_THRESHOLD 32 |
| 664 | if (cleaned && netif_carrier_ok(netdev) && | 664 | if (count && netif_carrier_ok(netdev) && |
| 665 | e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) { | 665 | e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) { |
| 666 | /* Make sure that anybody stopping the queue after this | 666 | /* Make sure that anybody stopping the queue after this |
| 667 | * sees the new next_to_clean. | 667 | * sees the new next_to_clean. |
| 668 | */ | 668 | */ |
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c index 470b676c1da..f4417fc3b0f 100644 --- a/drivers/net/ixgbe/ixgbe_dcb_82599.c +++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c | |||
| @@ -290,7 +290,7 @@ s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw, | |||
| 290 | s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, | 290 | s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, |
| 291 | struct ixgbe_dcb_config *dcb_config) | 291 | struct ixgbe_dcb_config *dcb_config) |
| 292 | { | 292 | { |
| 293 | u32 i, reg; | 293 | u32 i, reg, rx_pba_size; |
| 294 | 294 | ||
| 295 | /* If PFC is disabled globally then fall back to LFC. */ | 295 | /* If PFC is disabled globally then fall back to LFC. */ |
| 296 | if (!dcb_config->pfc_mode_enable) { | 296 | if (!dcb_config->pfc_mode_enable) { |
| @@ -301,17 +301,23 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, | |||
| 301 | 301 | ||
| 302 | /* Configure PFC Tx thresholds per TC */ | 302 | /* Configure PFC Tx thresholds per TC */ |
| 303 | for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { | 303 | for (i = 0; i < MAX_TRAFFIC_CLASS; i++) { |
| 304 | /* Config and remember Tx */ | 304 | if (dcb_config->rx_pba_cfg == pba_equal) |
| 305 | rx_pba_size = IXGBE_RXPBSIZE_64KB; | ||
| 306 | else | ||
| 307 | rx_pba_size = (i < 4) ? IXGBE_RXPBSIZE_80KB | ||
| 308 | : IXGBE_RXPBSIZE_48KB; | ||
| 309 | |||
| 310 | reg = ((rx_pba_size >> 5) & 0xFFE0); | ||
| 305 | if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full || | 311 | if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full || |
| 306 | dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx) { | 312 | dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx) |
| 307 | reg = hw->fc.high_water | IXGBE_FCRTH_FCEN; | 313 | reg |= IXGBE_FCRTL_XONE; |
| 308 | IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg); | 314 | IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg); |
| 309 | reg = hw->fc.low_water | IXGBE_FCRTL_XONE; | 315 | |
| 310 | IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg); | 316 | reg = ((rx_pba_size >> 2) & 0xFFE0); |
| 311 | } else { | 317 | if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full || |
| 312 | IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), 0); | 318 | dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx) |
| 313 | IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0); | 319 | reg |= IXGBE_FCRTH_FCEN; |
| 314 | } | 320 | IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg); |
| 315 | } | 321 | } |
| 316 | 322 | ||
| 317 | /* Configure pause time (2 TCs per register) */ | 323 | /* Configure pause time (2 TCs per register) */ |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index febde45cf9f..01884256f4c 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -2841,11 +2841,55 @@ static inline bool ixgbe_cache_ring_dcb(struct ixgbe_adapter *adapter) | |||
| 2841 | } | 2841 | } |
| 2842 | ret = true; | 2842 | ret = true; |
| 2843 | } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) { | 2843 | } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) { |
| 2844 | for (i = 0; i < dcb_i; i++) { | 2844 | if (dcb_i == 8) { |
| 2845 | adapter->rx_ring[i].reg_idx = i << 4; | 2845 | /* |
| 2846 | adapter->tx_ring[i].reg_idx = i << 4; | 2846 | * Tx TC0 starts at: descriptor queue 0 |
| 2847 | * Tx TC1 starts at: descriptor queue 32 | ||
| 2848 | * Tx TC2 starts at: descriptor queue 64 | ||
| 2849 | * Tx TC3 starts at: descriptor queue 80 | ||
| 2850 | * Tx TC4 starts at: descriptor queue 96 | ||
| 2851 | * Tx TC5 starts at: descriptor queue 104 | ||
| 2852 | * Tx TC6 starts at: descriptor queue 112 | ||
| 2853 | * Tx TC7 starts at: descriptor queue 120 | ||
| 2854 | * | ||
| 2855 | * Rx TC0-TC7 are offset by 16 queues each | ||
| 2856 | */ | ||
| 2857 | for (i = 0; i < 3; i++) { | ||
| 2858 | adapter->tx_ring[i].reg_idx = i << 5; | ||
| 2859 | adapter->rx_ring[i].reg_idx = i << 4; | ||
| 2860 | } | ||
| 2861 | for ( ; i < 5; i++) { | ||
| 2862 | adapter->tx_ring[i].reg_idx = | ||
| 2863 | ((i + 2) << 4); | ||
| 2864 | adapter->rx_ring[i].reg_idx = i << 4; | ||
| 2865 | } | ||
| 2866 | for ( ; i < dcb_i; i++) { | ||
| 2867 | adapter->tx_ring[i].reg_idx = | ||
| 2868 | ((i + 8) << 3); | ||
| 2869 | adapter->rx_ring[i].reg_idx = i << 4; | ||
| 2870 | } | ||
| 2871 | |||
| 2872 | ret = true; | ||
| 2873 | } else if (dcb_i == 4) { | ||
| 2874 | /* | ||
| 2875 | * Tx TC0 starts at: descriptor queue 0 | ||
| 2876 | * Tx TC1 starts at: descriptor queue 64 | ||
| 2877 | * Tx TC2 starts at: descriptor queue 96 | ||
| 2878 | * Tx TC3 starts at: descriptor queue 112 | ||
| 2879 | * | ||
| 2880 | * Rx TC0-TC3 are offset by 32 queues each | ||
| 2881 | */ | ||
| 2882 | adapter->tx_ring[0].reg_idx = 0; | ||
| 2883 | adapter->tx_ring[1].reg_idx = 64; | ||
| 2884 | adapter->tx_ring[2].reg_idx = 96; | ||
| 2885 | adapter->tx_ring[3].reg_idx = 112; | ||
| 2886 | for (i = 0 ; i < dcb_i; i++) | ||
| 2887 | adapter->rx_ring[i].reg_idx = i << 5; | ||
| 2888 | |||
| 2889 | ret = true; | ||
| 2890 | } else { | ||
| 2891 | ret = false; | ||
| 2847 | } | 2892 | } |
| 2848 | ret = true; | ||
| 2849 | } else { | 2893 | } else { |
| 2850 | ret = false; | 2894 | ret = false; |
| 2851 | } | 2895 | } |
| @@ -3946,7 +3990,7 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work) | |||
| 3946 | } | 3990 | } |
| 3947 | hw->mac.ops.setup_sfp(hw); | 3991 | hw->mac.ops.setup_sfp(hw); |
| 3948 | 3992 | ||
| 3949 | if (!adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK) | 3993 | if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK)) |
| 3950 | /* This will also work for DA Twinax connections */ | 3994 | /* This will also work for DA Twinax connections */ |
| 3951 | schedule_work(&adapter->multispeed_fiber_task); | 3995 | schedule_work(&adapter->multispeed_fiber_task); |
| 3952 | adapter->flags &= ~IXGBE_FLAG_IN_SFP_MOD_TASK; | 3996 | adapter->flags &= ~IXGBE_FLAG_IN_SFP_MOD_TASK; |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 46073de290c..e82aee41d77 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
| @@ -316,10 +316,11 @@ static void macb_tx(struct macb *bp) | |||
| 316 | dev_dbg(&bp->pdev->dev, "macb_tx status = %02lx\n", | 316 | dev_dbg(&bp->pdev->dev, "macb_tx status = %02lx\n", |
| 317 | (unsigned long)status); | 317 | (unsigned long)status); |
| 318 | 318 | ||
| 319 | if (status & MACB_BIT(UND)) { | 319 | if (status & (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) { |
| 320 | int i; | 320 | int i; |
| 321 | printk(KERN_ERR "%s: TX underrun, resetting buffers\n", | 321 | printk(KERN_ERR "%s: TX %s, resetting buffers\n", |
| 322 | bp->dev->name); | 322 | bp->dev->name, status & MACB_BIT(UND) ? |
| 323 | "underrun" : "retry limit exceeded"); | ||
| 323 | 324 | ||
| 324 | /* Transfer ongoing, disable transmitter, to avoid confusion */ | 325 | /* Transfer ongoing, disable transmitter, to avoid confusion */ |
| 325 | if (status & MACB_BIT(TGO)) | 326 | if (status & MACB_BIT(TGO)) |
| @@ -520,27 +521,10 @@ static int macb_poll(struct napi_struct *napi, int budget) | |||
| 520 | macb_writel(bp, RSR, status); | 521 | macb_writel(bp, RSR, status); |
| 521 | 522 | ||
| 522 | work_done = 0; | 523 | work_done = 0; |
| 523 | if (!status) { | ||
| 524 | /* | ||
| 525 | * This may happen if an interrupt was pending before | ||
| 526 | * this function was called last time, and no packets | ||
| 527 | * have been received since. | ||
| 528 | */ | ||
| 529 | napi_complete(napi); | ||
| 530 | goto out; | ||
| 531 | } | ||
| 532 | 524 | ||
| 533 | dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n", | 525 | dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n", |
| 534 | (unsigned long)status, budget); | 526 | (unsigned long)status, budget); |
| 535 | 527 | ||
| 536 | if (!(status & MACB_BIT(REC))) { | ||
| 537 | dev_warn(&bp->pdev->dev, | ||
| 538 | "No RX buffers complete, status = %02lx\n", | ||
| 539 | (unsigned long)status); | ||
| 540 | napi_complete(napi); | ||
| 541 | goto out; | ||
| 542 | } | ||
| 543 | |||
| 544 | work_done = macb_rx(bp, budget); | 528 | work_done = macb_rx(bp, budget); |
| 545 | if (work_done < budget) | 529 | if (work_done < budget) |
| 546 | napi_complete(napi); | 530 | napi_complete(napi); |
| @@ -549,7 +533,6 @@ static int macb_poll(struct napi_struct *napi, int budget) | |||
| 549 | * We've done what we can to clean the buffers. Make sure we | 533 | * We've done what we can to clean the buffers. Make sure we |
| 550 | * get notified when new packets arrive. | 534 | * get notified when new packets arrive. |
| 551 | */ | 535 | */ |
| 552 | out: | ||
| 553 | macb_writel(bp, IER, MACB_RX_INT_FLAGS); | 536 | macb_writel(bp, IER, MACB_RX_INT_FLAGS); |
| 554 | 537 | ||
| 555 | /* TODO: Handle errors */ | 538 | /* TODO: Handle errors */ |
| @@ -590,7 +573,8 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) | |||
| 590 | } | 573 | } |
| 591 | } | 574 | } |
| 592 | 575 | ||
| 593 | if (status & (MACB_BIT(TCOMP) | MACB_BIT(ISR_TUND))) | 576 | if (status & (MACB_BIT(TCOMP) | MACB_BIT(ISR_TUND) | |
| 577 | MACB_BIT(ISR_RLE))) | ||
| 594 | macb_tx(bp); | 578 | macb_tx(bp); |
| 595 | 579 | ||
| 596 | /* | 580 | /* |
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 70d3ef4a2c5..214a8cf2b70 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
| @@ -376,7 +376,8 @@ static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev) | |||
| 376 | const struct macvlan_dev *vlan = netdev_priv(dev); | 376 | const struct macvlan_dev *vlan = netdev_priv(dev); |
| 377 | struct net_device *lowerdev = vlan->lowerdev; | 377 | struct net_device *lowerdev = vlan->lowerdev; |
| 378 | 378 | ||
| 379 | if (lowerdev->ethtool_ops->get_rx_csum == NULL) | 379 | if (lowerdev->ethtool_ops == NULL || |
| 380 | lowerdev->ethtool_ops->get_rx_csum == NULL) | ||
| 380 | return 0; | 381 | return 0; |
| 381 | return lowerdev->ethtool_ops->get_rx_csum(lowerdev); | 382 | return lowerdev->ethtool_ops->get_rx_csum(lowerdev); |
| 382 | } | 383 | } |
| @@ -387,7 +388,8 @@ static int macvlan_ethtool_get_settings(struct net_device *dev, | |||
| 387 | const struct macvlan_dev *vlan = netdev_priv(dev); | 388 | const struct macvlan_dev *vlan = netdev_priv(dev); |
| 388 | struct net_device *lowerdev = vlan->lowerdev; | 389 | struct net_device *lowerdev = vlan->lowerdev; |
| 389 | 390 | ||
| 390 | if (!lowerdev->ethtool_ops->get_settings) | 391 | if (!lowerdev->ethtool_ops || |
| 392 | !lowerdev->ethtool_ops->get_settings) | ||
| 391 | return -EOPNOTSUPP; | 393 | return -EOPNOTSUPP; |
| 392 | 394 | ||
| 393 | return lowerdev->ethtool_ops->get_settings(lowerdev, cmd); | 395 | return lowerdev->ethtool_ops->get_settings(lowerdev, cmd); |
| @@ -398,7 +400,8 @@ static u32 macvlan_ethtool_get_flags(struct net_device *dev) | |||
| 398 | const struct macvlan_dev *vlan = netdev_priv(dev); | 400 | const struct macvlan_dev *vlan = netdev_priv(dev); |
| 399 | struct net_device *lowerdev = vlan->lowerdev; | 401 | struct net_device *lowerdev = vlan->lowerdev; |
| 400 | 402 | ||
| 401 | if (!lowerdev->ethtool_ops->get_flags) | 403 | if (!lowerdev->ethtool_ops || |
| 404 | !lowerdev->ethtool_ops->get_flags) | ||
| 402 | return 0; | 405 | return 0; |
| 403 | return lowerdev->ethtool_ops->get_flags(lowerdev); | 406 | return lowerdev->ethtool_ops->get_flags(lowerdev); |
| 404 | } | 407 | } |
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c index eda72dd2120..510633fd57f 100644 --- a/drivers/net/mlx4/en_main.c +++ b/drivers/net/mlx4/en_main.c | |||
| @@ -181,7 +181,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev) | |||
| 181 | mdev->workqueue = create_singlethread_workqueue("mlx4_en"); | 181 | mdev->workqueue = create_singlethread_workqueue("mlx4_en"); |
| 182 | if (!mdev->workqueue) { | 182 | if (!mdev->workqueue) { |
| 183 | err = -ENOMEM; | 183 | err = -ENOMEM; |
| 184 | goto err_close_nic; | 184 | goto err_mr; |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | /* At this stage all non-port specific tasks are complete: | 187 | /* At this stage all non-port specific tasks are complete: |
| @@ -214,9 +214,8 @@ err_free_netdev: | |||
| 214 | flush_workqueue(mdev->workqueue); | 214 | flush_workqueue(mdev->workqueue); |
| 215 | 215 | ||
| 216 | /* Stop event queue before we drop down to release shared SW state */ | 216 | /* Stop event queue before we drop down to release shared SW state */ |
| 217 | |||
| 218 | err_close_nic: | ||
| 219 | destroy_workqueue(mdev->workqueue); | 217 | destroy_workqueue(mdev->workqueue); |
| 218 | |||
| 220 | err_mr: | 219 | err_mr: |
| 221 | mlx4_mr_free(dev, &mdev->mr); | 220 | mlx4_mr_free(dev, &mdev->mr); |
| 222 | err_uar: | 221 | err_uar: |
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c index 303c23de6ca..438678ab2a1 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/mlx4/en_netdev.c | |||
| @@ -348,11 +348,9 @@ static void mlx4_en_tx_timeout(struct net_device *dev) | |||
| 348 | if (netif_msg_timer(priv)) | 348 | if (netif_msg_timer(priv)) |
| 349 | mlx4_warn(mdev, "Tx timeout called on port:%d\n", priv->port); | 349 | mlx4_warn(mdev, "Tx timeout called on port:%d\n", priv->port); |
| 350 | 350 | ||
| 351 | if (netif_carrier_ok(dev)) { | 351 | priv->port_stats.tx_timeout++; |
| 352 | priv->port_stats.tx_timeout++; | 352 | mlx4_dbg(DRV, priv, "Scheduling watchdog\n"); |
| 353 | mlx4_dbg(DRV, priv, "Scheduling watchdog\n"); | 353 | queue_work(mdev->workqueue, &priv->watchdog_task); |
| 354 | queue_work(mdev->workqueue, &priv->watchdog_task); | ||
| 355 | } | ||
| 356 | } | 354 | } |
| 357 | 355 | ||
| 358 | 356 | ||
| @@ -761,9 +759,14 @@ static void mlx4_en_restart(struct work_struct *work) | |||
| 761 | struct net_device *dev = priv->dev; | 759 | struct net_device *dev = priv->dev; |
| 762 | 760 | ||
| 763 | mlx4_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port); | 761 | mlx4_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port); |
| 764 | mlx4_en_stop_port(dev); | 762 | |
| 765 | if (mlx4_en_start_port(dev)) | 763 | mutex_lock(&mdev->state_lock); |
| 766 | mlx4_err(mdev, "Failed restarting port %d\n", priv->port); | 764 | if (priv->port_up) { |
| 765 | mlx4_en_stop_port(dev); | ||
| 766 | if (mlx4_en_start_port(dev)) | ||
| 767 | mlx4_err(mdev, "Failed restarting port %d\n", priv->port); | ||
| 768 | } | ||
| 769 | mutex_unlock(&mdev->state_lock); | ||
| 767 | } | 770 | } |
| 768 | 771 | ||
| 769 | 772 | ||
| @@ -1054,7 +1057,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, | |||
| 1054 | * Set driver features | 1057 | * Set driver features |
| 1055 | */ | 1058 | */ |
| 1056 | dev->features |= NETIF_F_SG; | 1059 | dev->features |= NETIF_F_SG; |
| 1057 | dev->features |= NETIF_F_HW_CSUM; | 1060 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; |
| 1058 | dev->features |= NETIF_F_HIGHDMA; | 1061 | dev->features |= NETIF_F_HIGHDMA; |
| 1059 | dev->features |= NETIF_F_HW_VLAN_TX | | 1062 | dev->features |= NETIF_F_HW_VLAN_TX | |
| 1060 | NETIF_F_HW_VLAN_RX | | 1063 | NETIF_F_HW_VLAN_RX | |
diff --git a/drivers/net/mlx4/en_port.c b/drivers/net/mlx4/en_port.c index c5a4c038975..a29abe845d2 100644 --- a/drivers/net/mlx4/en_port.c +++ b/drivers/net/mlx4/en_port.c | |||
| @@ -151,6 +151,7 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) | |||
| 151 | struct mlx4_cmd_mailbox *mailbox; | 151 | struct mlx4_cmd_mailbox *mailbox; |
| 152 | u64 in_mod = reset << 8 | port; | 152 | u64 in_mod = reset << 8 | port; |
| 153 | int err; | 153 | int err; |
| 154 | int i; | ||
| 154 | 155 | ||
| 155 | mailbox = mlx4_alloc_cmd_mailbox(mdev->dev); | 156 | mailbox = mlx4_alloc_cmd_mailbox(mdev->dev); |
| 156 | if (IS_ERR(mailbox)) | 157 | if (IS_ERR(mailbox)) |
| @@ -165,38 +166,18 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) | |||
| 165 | 166 | ||
| 166 | spin_lock_bh(&priv->stats_lock); | 167 | spin_lock_bh(&priv->stats_lock); |
| 167 | 168 | ||
| 168 | stats->rx_packets = be32_to_cpu(mlx4_en_stats->RTOTFRMS) - | 169 | stats->rx_packets = 0; |
| 169 | be32_to_cpu(mlx4_en_stats->RDROP); | 170 | stats->rx_bytes = 0; |
| 170 | stats->tx_packets = be64_to_cpu(mlx4_en_stats->TTOT_prio_0) + | 171 | for (i = 0; i < priv->rx_ring_num; i++) { |
| 171 | be64_to_cpu(mlx4_en_stats->TTOT_prio_1) + | 172 | stats->rx_packets += priv->rx_ring[i].packets; |
| 172 | be64_to_cpu(mlx4_en_stats->TTOT_prio_2) + | 173 | stats->rx_bytes += priv->rx_ring[i].bytes; |
| 173 | be64_to_cpu(mlx4_en_stats->TTOT_prio_3) + | 174 | } |
| 174 | be64_to_cpu(mlx4_en_stats->TTOT_prio_4) + | 175 | stats->tx_packets = 0; |
| 175 | be64_to_cpu(mlx4_en_stats->TTOT_prio_5) + | 176 | stats->tx_bytes = 0; |
| 176 | be64_to_cpu(mlx4_en_stats->TTOT_prio_6) + | 177 | for (i = 0; i <= priv->tx_ring_num; i++) { |
| 177 | be64_to_cpu(mlx4_en_stats->TTOT_prio_7) + | 178 | stats->tx_packets += priv->tx_ring[i].packets; |
| 178 | be64_to_cpu(mlx4_en_stats->TTOT_novlan) + | 179 | stats->tx_bytes += priv->tx_ring[i].bytes; |
| 179 | be64_to_cpu(mlx4_en_stats->TTOT_loopbk); | 180 | } |
| 180 | stats->rx_bytes = be64_to_cpu(mlx4_en_stats->ROCT_prio_0) + | ||
| 181 | be64_to_cpu(mlx4_en_stats->ROCT_prio_1) + | ||
| 182 | be64_to_cpu(mlx4_en_stats->ROCT_prio_2) + | ||
| 183 | be64_to_cpu(mlx4_en_stats->ROCT_prio_3) + | ||
| 184 | be64_to_cpu(mlx4_en_stats->ROCT_prio_4) + | ||
| 185 | be64_to_cpu(mlx4_en_stats->ROCT_prio_5) + | ||
| 186 | be64_to_cpu(mlx4_en_stats->ROCT_prio_6) + | ||
| 187 | be64_to_cpu(mlx4_en_stats->ROCT_prio_7) + | ||
| 188 | be64_to_cpu(mlx4_en_stats->ROCT_novlan); | ||
| 189 | |||
| 190 | stats->tx_bytes = be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_0) + | ||
| 191 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_1) + | ||
| 192 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_2) + | ||
| 193 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_3) + | ||
| 194 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_4) + | ||
| 195 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_5) + | ||
| 196 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_6) + | ||
| 197 | be64_to_cpu(mlx4_en_stats->TTTLOCT_prio_7) + | ||
| 198 | be64_to_cpu(mlx4_en_stats->TTTLOCT_novlan) + | ||
| 199 | be64_to_cpu(mlx4_en_stats->TTTLOCT_loopbk); | ||
| 200 | 181 | ||
| 201 | stats->rx_errors = be64_to_cpu(mlx4_en_stats->PCS) + | 182 | stats->rx_errors = be64_to_cpu(mlx4_en_stats->PCS) + |
| 202 | be32_to_cpu(mlx4_en_stats->RdropLength) + | 183 | be32_to_cpu(mlx4_en_stats->RdropLength) + |
diff --git a/drivers/net/mlx4/en_resources.c b/drivers/net/mlx4/en_resources.c index a0545209e50..65ca706c04b 100644 --- a/drivers/net/mlx4/en_resources.c +++ b/drivers/net/mlx4/en_resources.c | |||
| @@ -94,3 +94,9 @@ void mlx4_en_unmap_buffer(struct mlx4_buf *buf) | |||
| 94 | 94 | ||
| 95 | vunmap(buf->direct.buf); | 95 | vunmap(buf->direct.buf); |
| 96 | } | 96 | } |
| 97 | |||
| 98 | void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event) | ||
| 99 | { | ||
| 100 | return; | ||
| 101 | } | ||
| 102 | |||
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index 7e40741fb7d..0cbb78ca7b2 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
| @@ -436,8 +436,9 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) | |||
| 436 | /* Initialize page allocators */ | 436 | /* Initialize page allocators */ |
| 437 | err = mlx4_en_init_allocator(priv, ring); | 437 | err = mlx4_en_init_allocator(priv, ring); |
| 438 | if (err) { | 438 | if (err) { |
| 439 | mlx4_err(mdev, "Failed initializing ring allocator\n"); | 439 | mlx4_err(mdev, "Failed initializing ring allocator\n"); |
| 440 | goto err_allocator; | 440 | ring_ind--; |
| 441 | goto err_allocator; | ||
| 441 | } | 442 | } |
| 442 | 443 | ||
| 443 | /* Fill Rx buffers */ | 444 | /* Fill Rx buffers */ |
| @@ -467,6 +468,7 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) | |||
| 467 | ring->wqres.db.dma, &ring->srq); | 468 | ring->wqres.db.dma, &ring->srq); |
| 468 | if (err){ | 469 | if (err){ |
| 469 | mlx4_err(mdev, "Failed to allocate srq\n"); | 470 | mlx4_err(mdev, "Failed to allocate srq\n"); |
| 471 | ring_ind--; | ||
| 470 | goto err_srq; | 472 | goto err_srq; |
| 471 | } | 473 | } |
| 472 | ring->srq.event = mlx4_en_srq_event; | 474 | ring->srq.event = mlx4_en_srq_event; |
| @@ -926,12 +928,6 @@ void mlx4_en_set_default_rss_map(struct mlx4_en_priv *priv, | |||
| 926 | } | 928 | } |
| 927 | } | 929 | } |
| 928 | 930 | ||
| 929 | static void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event) | ||
| 930 | { | ||
| 931 | return; | ||
| 932 | } | ||
| 933 | |||
| 934 | |||
| 935 | static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, | 931 | static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, |
| 936 | int qpn, int srqn, int cqn, | 932 | int qpn, int srqn, int cqn, |
| 937 | enum mlx4_qp_state *state, | 933 | enum mlx4_qp_state *state, |
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 4afd5993e31..ac6fc499b28 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c | |||
| @@ -112,6 +112,7 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, | |||
| 112 | mlx4_err(mdev, "Failed allocating qp %d\n", ring->qpn); | 112 | mlx4_err(mdev, "Failed allocating qp %d\n", ring->qpn); |
| 113 | goto err_reserve; | 113 | goto err_reserve; |
| 114 | } | 114 | } |
| 115 | ring->qp.event = mlx4_en_sqp_event; | ||
| 115 | 116 | ||
| 116 | return 0; | 117 | return 0; |
| 117 | 118 | ||
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h index e9af32d41ca..ef840abbcd3 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/mlx4/mlx4_en.h | |||
| @@ -538,6 +538,7 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget); | |||
| 538 | void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride, | 538 | void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride, |
| 539 | int is_tx, int rss, int qpn, int cqn, int srqn, | 539 | int is_tx, int rss, int qpn, int cqn, int srqn, |
| 540 | struct mlx4_qp_context *context); | 540 | struct mlx4_qp_context *context); |
| 541 | void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event); | ||
| 541 | int mlx4_en_map_buffer(struct mlx4_buf *buf); | 542 | int mlx4_en_map_buffer(struct mlx4_buf *buf); |
| 542 | void mlx4_en_unmap_buffer(struct mlx4_buf *buf); | 543 | void mlx4_en_unmap_buffer(struct mlx4_buf *buf); |
| 543 | 544 | ||
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 2fbf9f9ddd3..652a3688836 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -1758,7 +1758,7 @@ static struct pcmcia_device_id pcnet_ids[] = { | |||
| 1758 | PCMCIA_MFC_DEVICE_CIS_PROD_ID12(0, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"), | 1758 | PCMCIA_MFC_DEVICE_CIS_PROD_ID12(0, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"), |
| 1759 | PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"), | 1759 | PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"), |
| 1760 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "DP83903.cis"), | 1760 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "DP83903.cis"), |
| 1761 | PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "LA-PCM.cis"), | 1761 | PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"), |
| 1762 | PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"), | 1762 | PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"), |
| 1763 | PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"), | 1763 | PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"), |
| 1764 | PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"), | 1764 | PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"), |
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index a5ac2bd58b5..4f3ada622f9 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
| @@ -2101,6 +2101,9 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl, | |||
| 2101 | if (ret) { | 2101 | if (ret) { |
| 2102 | pr_debug("%s: WEP/WPA setup failed %d\n", __func__, | 2102 | pr_debug("%s: WEP/WPA setup failed %d\n", __func__, |
| 2103 | ret); | 2103 | ret); |
| 2104 | ret = -EPERM; | ||
| 2105 | gelic_wl_send_iwap_event(wl, NULL); | ||
| 2106 | goto out; | ||
| 2104 | } | 2107 | } |
| 2105 | 2108 | ||
| 2106 | /* start association */ | 2109 | /* start association */ |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 7a837c46596..201be425643 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -2190,7 +2190,14 @@ static int tg3_nvram_read_using_eeprom(struct tg3 *tp, | |||
| 2190 | if (!(tmp & EEPROM_ADDR_COMPLETE)) | 2190 | if (!(tmp & EEPROM_ADDR_COMPLETE)) |
| 2191 | return -EBUSY; | 2191 | return -EBUSY; |
| 2192 | 2192 | ||
| 2193 | *val = tr32(GRC_EEPROM_DATA); | 2193 | tmp = tr32(GRC_EEPROM_DATA); |
| 2194 | |||
| 2195 | /* | ||
| 2196 | * The data will always be opposite the native endian | ||
| 2197 | * format. Perform a blind byteswap to compensate. | ||
| 2198 | */ | ||
| 2199 | *val = swab32(tmp); | ||
| 2200 | |||
| 2194 | return 0; | 2201 | return 0; |
| 2195 | } | 2202 | } |
| 2196 | 2203 | ||
| @@ -10663,7 +10670,13 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp, | |||
| 10663 | 10670 | ||
| 10664 | memcpy(&data, buf + i, 4); | 10671 | memcpy(&data, buf + i, 4); |
| 10665 | 10672 | ||
| 10666 | tw32(GRC_EEPROM_DATA, be32_to_cpu(data)); | 10673 | /* |
| 10674 | * The SEEPROM interface expects the data to always be opposite | ||
| 10675 | * the native endian format. We accomplish this by reversing | ||
| 10676 | * all the operations that would have been performed on the | ||
| 10677 | * data from a call to tg3_nvram_read_be32(). | ||
| 10678 | */ | ||
| 10679 | tw32(GRC_EEPROM_DATA, swab32(be32_to_cpu(data))); | ||
| 10667 | 10680 | ||
| 10668 | val = tr32(GRC_EEPROM_ADDR); | 10681 | val = tr32(GRC_EEPROM_ADDR); |
| 10669 | tw32(GRC_EEPROM_ADDR, val | EEPROM_ADDR_COMPLETE); | 10682 | tw32(GRC_EEPROM_ADDR, val | EEPROM_ADDR_COMPLETE); |
| @@ -12443,13 +12456,8 @@ static int __devinit tg3_get_device_address(struct tg3 *tp) | |||
| 12443 | /* Next, try NVRAM. */ | 12456 | /* Next, try NVRAM. */ |
| 12444 | if (!tg3_nvram_read_be32(tp, mac_offset + 0, &hi) && | 12457 | if (!tg3_nvram_read_be32(tp, mac_offset + 0, &hi) && |
| 12445 | !tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) { | 12458 | !tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) { |
| 12446 | dev->dev_addr[0] = ((hi >> 16) & 0xff); | 12459 | memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2); |
| 12447 | dev->dev_addr[1] = ((hi >> 24) & 0xff); | 12460 | memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo)); |
| 12448 | dev->dev_addr[2] = ((lo >> 0) & 0xff); | ||
| 12449 | dev->dev_addr[3] = ((lo >> 8) & 0xff); | ||
| 12450 | dev->dev_addr[4] = ((lo >> 16) & 0xff); | ||
| 12451 | dev->dev_addr[5] = ((lo >> 24) & 0xff); | ||
| 12452 | |||
| 12453 | } | 12461 | } |
| 12454 | /* Finally just fetch it out of the MAC control regs. */ | 12462 | /* Finally just fetch it out of the MAC control regs. */ |
| 12455 | else { | 12463 | else { |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 16716aef184..735bf41c654 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -93,7 +93,6 @@ struct tun_file { | |||
| 93 | atomic_t count; | 93 | atomic_t count; |
| 94 | struct tun_struct *tun; | 94 | struct tun_struct *tun; |
| 95 | struct net *net; | 95 | struct net *net; |
| 96 | wait_queue_head_t read_wait; | ||
| 97 | }; | 96 | }; |
| 98 | 97 | ||
| 99 | struct tun_sock; | 98 | struct tun_sock; |
| @@ -156,6 +155,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file) | |||
| 156 | tfile->tun = tun; | 155 | tfile->tun = tun; |
| 157 | tun->tfile = tfile; | 156 | tun->tfile = tfile; |
| 158 | dev_hold(tun->dev); | 157 | dev_hold(tun->dev); |
| 158 | sock_hold(tun->sk); | ||
| 159 | atomic_inc(&tfile->count); | 159 | atomic_inc(&tfile->count); |
| 160 | 160 | ||
| 161 | out: | 161 | out: |
| @@ -165,11 +165,8 @@ out: | |||
| 165 | 165 | ||
| 166 | static void __tun_detach(struct tun_struct *tun) | 166 | static void __tun_detach(struct tun_struct *tun) |
| 167 | { | 167 | { |
| 168 | struct tun_file *tfile = tun->tfile; | ||
| 169 | |||
| 170 | /* Detach from net device */ | 168 | /* Detach from net device */ |
| 171 | netif_tx_lock_bh(tun->dev); | 169 | netif_tx_lock_bh(tun->dev); |
| 172 | tfile->tun = NULL; | ||
| 173 | tun->tfile = NULL; | 170 | tun->tfile = NULL; |
| 174 | netif_tx_unlock_bh(tun->dev); | 171 | netif_tx_unlock_bh(tun->dev); |
| 175 | 172 | ||
| @@ -333,12 +330,19 @@ static void tun_net_uninit(struct net_device *dev) | |||
| 333 | /* Inform the methods they need to stop using the dev. | 330 | /* Inform the methods they need to stop using the dev. |
| 334 | */ | 331 | */ |
| 335 | if (tfile) { | 332 | if (tfile) { |
| 336 | wake_up_all(&tfile->read_wait); | 333 | wake_up_all(&tun->socket.wait); |
| 337 | if (atomic_dec_and_test(&tfile->count)) | 334 | if (atomic_dec_and_test(&tfile->count)) |
| 338 | __tun_detach(tun); | 335 | __tun_detach(tun); |
| 339 | } | 336 | } |
| 340 | } | 337 | } |
| 341 | 338 | ||
| 339 | static void tun_free_netdev(struct net_device *dev) | ||
| 340 | { | ||
| 341 | struct tun_struct *tun = netdev_priv(dev); | ||
| 342 | |||
| 343 | sock_put(tun->sk); | ||
| 344 | } | ||
| 345 | |||
| 342 | /* Net device open. */ | 346 | /* Net device open. */ |
| 343 | static int tun_net_open(struct net_device *dev) | 347 | static int tun_net_open(struct net_device *dev) |
| 344 | { | 348 | { |
| @@ -393,7 +397,7 @@ static int tun_net_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 393 | /* Notify and wake up reader process */ | 397 | /* Notify and wake up reader process */ |
| 394 | if (tun->flags & TUN_FASYNC) | 398 | if (tun->flags & TUN_FASYNC) |
| 395 | kill_fasync(&tun->fasync, SIGIO, POLL_IN); | 399 | kill_fasync(&tun->fasync, SIGIO, POLL_IN); |
| 396 | wake_up_interruptible(&tun->tfile->read_wait); | 400 | wake_up_interruptible(&tun->socket.wait); |
| 397 | return 0; | 401 | return 0; |
| 398 | 402 | ||
| 399 | drop: | 403 | drop: |
| @@ -490,7 +494,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait) | |||
| 490 | 494 | ||
| 491 | DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name); | 495 | DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name); |
| 492 | 496 | ||
| 493 | poll_wait(file, &tfile->read_wait, wait); | 497 | poll_wait(file, &tun->socket.wait, wait); |
| 494 | 498 | ||
| 495 | if (!skb_queue_empty(&tun->readq)) | 499 | if (!skb_queue_empty(&tun->readq)) |
| 496 | mask |= POLLIN | POLLRDNORM; | 500 | mask |= POLLIN | POLLRDNORM; |
| @@ -763,7 +767,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, | |||
| 763 | goto out; | 767 | goto out; |
| 764 | } | 768 | } |
| 765 | 769 | ||
| 766 | add_wait_queue(&tfile->read_wait, &wait); | 770 | add_wait_queue(&tun->socket.wait, &wait); |
| 767 | while (len) { | 771 | while (len) { |
| 768 | current->state = TASK_INTERRUPTIBLE; | 772 | current->state = TASK_INTERRUPTIBLE; |
| 769 | 773 | ||
| @@ -794,7 +798,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, | |||
| 794 | } | 798 | } |
| 795 | 799 | ||
| 796 | current->state = TASK_RUNNING; | 800 | current->state = TASK_RUNNING; |
| 797 | remove_wait_queue(&tfile->read_wait, &wait); | 801 | remove_wait_queue(&tun->socket.wait, &wait); |
| 798 | 802 | ||
| 799 | out: | 803 | out: |
| 800 | tun_put(tun); | 804 | tun_put(tun); |
| @@ -811,7 +815,7 @@ static void tun_setup(struct net_device *dev) | |||
| 811 | tun->group = -1; | 815 | tun->group = -1; |
| 812 | 816 | ||
| 813 | dev->ethtool_ops = &tun_ethtool_ops; | 817 | dev->ethtool_ops = &tun_ethtool_ops; |
| 814 | dev->destructor = free_netdev; | 818 | dev->destructor = tun_free_netdev; |
| 815 | } | 819 | } |
| 816 | 820 | ||
| 817 | /* Trivial set of netlink ops to allow deleting tun or tap | 821 | /* Trivial set of netlink ops to allow deleting tun or tap |
| @@ -848,7 +852,7 @@ static void tun_sock_write_space(struct sock *sk) | |||
| 848 | 852 | ||
| 849 | static void tun_sock_destruct(struct sock *sk) | 853 | static void tun_sock_destruct(struct sock *sk) |
| 850 | { | 854 | { |
| 851 | dev_put(container_of(sk, struct tun_sock, sk)->tun->dev); | 855 | free_netdev(container_of(sk, struct tun_sock, sk)->tun->dev); |
| 852 | } | 856 | } |
| 853 | 857 | ||
| 854 | static struct proto tun_proto = { | 858 | static struct proto tun_proto = { |
| @@ -862,7 +866,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 862 | struct sock *sk; | 866 | struct sock *sk; |
| 863 | struct tun_struct *tun; | 867 | struct tun_struct *tun; |
| 864 | struct net_device *dev; | 868 | struct net_device *dev; |
| 865 | struct tun_file *tfile = file->private_data; | ||
| 866 | int err; | 869 | int err; |
| 867 | 870 | ||
| 868 | dev = __dev_get_by_name(net, ifr->ifr_name); | 871 | dev = __dev_get_by_name(net, ifr->ifr_name); |
| @@ -920,13 +923,10 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 920 | if (!sk) | 923 | if (!sk) |
| 921 | goto err_free_dev; | 924 | goto err_free_dev; |
| 922 | 925 | ||
| 923 | /* This ref count is for tun->sk. */ | 926 | init_waitqueue_head(&tun->socket.wait); |
| 924 | dev_hold(dev); | ||
| 925 | sock_init_data(&tun->socket, sk); | 927 | sock_init_data(&tun->socket, sk); |
| 926 | sk->sk_write_space = tun_sock_write_space; | 928 | sk->sk_write_space = tun_sock_write_space; |
| 927 | sk->sk_destruct = tun_sock_destruct; | ||
| 928 | sk->sk_sndbuf = INT_MAX; | 929 | sk->sk_sndbuf = INT_MAX; |
| 929 | sk->sk_sleep = &tfile->read_wait; | ||
| 930 | 930 | ||
| 931 | tun->sk = sk; | 931 | tun->sk = sk; |
| 932 | container_of(sk, struct tun_sock, sk)->tun = tun; | 932 | container_of(sk, struct tun_sock, sk)->tun = tun; |
| @@ -942,11 +942,13 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 942 | err = -EINVAL; | 942 | err = -EINVAL; |
| 943 | err = register_netdevice(tun->dev); | 943 | err = register_netdevice(tun->dev); |
| 944 | if (err < 0) | 944 | if (err < 0) |
| 945 | goto err_free_dev; | 945 | goto err_free_sk; |
| 946 | |||
| 947 | sk->sk_destruct = tun_sock_destruct; | ||
| 946 | 948 | ||
| 947 | err = tun_attach(tun, file); | 949 | err = tun_attach(tun, file); |
| 948 | if (err < 0) | 950 | if (err < 0) |
| 949 | goto err_free_dev; | 951 | goto failed; |
| 950 | } | 952 | } |
| 951 | 953 | ||
| 952 | DBG(KERN_INFO "%s: tun_set_iff\n", tun->dev->name); | 954 | DBG(KERN_INFO "%s: tun_set_iff\n", tun->dev->name); |
| @@ -1266,7 +1268,6 @@ static int tun_chr_open(struct inode *inode, struct file * file) | |||
| 1266 | atomic_set(&tfile->count, 0); | 1268 | atomic_set(&tfile->count, 0); |
| 1267 | tfile->tun = NULL; | 1269 | tfile->tun = NULL; |
| 1268 | tfile->net = get_net(current->nsproxy->net_ns); | 1270 | tfile->net = get_net(current->nsproxy->net_ns); |
| 1269 | init_waitqueue_head(&tfile->read_wait); | ||
| 1270 | file->private_data = tfile; | 1271 | file->private_data = tfile; |
| 1271 | return 0; | 1272 | return 0; |
| 1272 | } | 1273 | } |
| @@ -1284,14 +1285,16 @@ static int tun_chr_close(struct inode *inode, struct file *file) | |||
| 1284 | __tun_detach(tun); | 1285 | __tun_detach(tun); |
| 1285 | 1286 | ||
| 1286 | /* If desireable, unregister the netdevice. */ | 1287 | /* If desireable, unregister the netdevice. */ |
| 1287 | if (!(tun->flags & TUN_PERSIST)) { | 1288 | if (!(tun->flags & TUN_PERSIST)) |
| 1288 | sock_put(tun->sk); | ||
| 1289 | unregister_netdevice(tun->dev); | 1289 | unregister_netdevice(tun->dev); |
| 1290 | } | ||
| 1291 | 1290 | ||
| 1292 | rtnl_unlock(); | 1291 | rtnl_unlock(); |
| 1293 | } | 1292 | } |
| 1294 | 1293 | ||
| 1294 | tun = tfile->tun; | ||
| 1295 | if (tun) | ||
| 1296 | sock_put(tun->sk); | ||
| 1297 | |||
| 1295 | put_net(tfile->net); | 1298 | put_net(tfile->net); |
| 1296 | kfree(tfile); | 1299 | kfree(tfile); |
| 1297 | 1300 | ||
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index d3f39e86eb9..44f8392da11 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -1394,7 +1394,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth) | |||
| 1394 | (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) || | 1394 | (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) || |
| 1395 | (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) || | 1395 | (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) || |
| 1396 | (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) { | 1396 | (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) { |
| 1397 | upsmr |= UCC_GETH_UPSMR_RPM; | 1397 | if (ugeth->phy_interface != PHY_INTERFACE_MODE_RMII) |
| 1398 | upsmr |= UCC_GETH_UPSMR_RPM; | ||
| 1398 | switch (ugeth->max_speed) { | 1399 | switch (ugeth->max_speed) { |
| 1399 | case SPEED_10: | 1400 | case SPEED_10: |
| 1400 | upsmr |= UCC_GETH_UPSMR_R10M; | 1401 | upsmr |= UCC_GETH_UPSMR_R10M; |
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index a8228d87c8c..2138535f233 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
| @@ -899,6 +899,7 @@ static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
| 899 | /* cleanup should already have been scheduled */ | 899 | /* cleanup should already have been scheduled */ |
| 900 | break; | 900 | break; |
| 901 | case -ENODEV: /* disconnect() upcoming */ | 901 | case -ENODEV: /* disconnect() upcoming */ |
| 902 | case -EPERM: | ||
| 902 | netif_device_detach(pegasus->net); | 903 | netif_device_detach(pegasus->net); |
| 903 | break; | 904 | break; |
| 904 | default: | 905 | default: |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index f21a6171c69..c36d3a3d655 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -6713,11 +6713,11 @@ static int airo_set_auth(struct net_device *dev, | |||
| 6713 | local->config.authType = AUTH_ENCRYPT; | 6713 | local->config.authType = AUTH_ENCRYPT; |
| 6714 | } else | 6714 | } else |
| 6715 | return -EINVAL; | 6715 | return -EINVAL; |
| 6716 | break; | ||
| 6717 | 6716 | ||
| 6718 | /* Commit the changes to flags if needed */ | 6717 | /* Commit the changes to flags if needed */ |
| 6719 | if (local->config.authType != currentAuthType) | 6718 | if (local->config.authType != currentAuthType) |
| 6720 | set_bit (FLAG_COMMIT, &local->flags); | 6719 | set_bit (FLAG_COMMIT, &local->flags); |
| 6720 | break; | ||
| 6721 | } | 6721 | } |
| 6722 | 6722 | ||
| 6723 | case IW_AUTH_WPA_ENABLED: | 6723 | case IW_AUTH_WPA_ENABLED: |
diff --git a/drivers/net/wireless/ar9170/hw.h b/drivers/net/wireless/ar9170/hw.h index 13091bd9d81..53e250a4278 100644 --- a/drivers/net/wireless/ar9170/hw.h +++ b/drivers/net/wireless/ar9170/hw.h | |||
| @@ -310,7 +310,7 @@ struct ar9170_tx_control { | |||
| 310 | 310 | ||
| 311 | struct ar9170_rx_head { | 311 | struct ar9170_rx_head { |
| 312 | u8 plcp[12]; | 312 | u8 plcp[12]; |
| 313 | }; | 313 | } __packed; |
| 314 | 314 | ||
| 315 | struct ar9170_rx_tail { | 315 | struct ar9170_rx_tail { |
| 316 | union { | 316 | union { |
| @@ -318,16 +318,16 @@ struct ar9170_rx_tail { | |||
| 318 | u8 rssi_ant0, rssi_ant1, rssi_ant2, | 318 | u8 rssi_ant0, rssi_ant1, rssi_ant2, |
| 319 | rssi_ant0x, rssi_ant1x, rssi_ant2x, | 319 | rssi_ant0x, rssi_ant1x, rssi_ant2x, |
| 320 | rssi_combined; | 320 | rssi_combined; |
| 321 | }; | 321 | } __packed; |
| 322 | u8 rssi[7]; | 322 | u8 rssi[7]; |
| 323 | }; | 323 | } __packed; |
| 324 | 324 | ||
| 325 | u8 evm_stream0[6], evm_stream1[6]; | 325 | u8 evm_stream0[6], evm_stream1[6]; |
| 326 | u8 phy_err; | 326 | u8 phy_err; |
| 327 | u8 SAidx, DAidx; | 327 | u8 SAidx, DAidx; |
| 328 | u8 error; | 328 | u8 error; |
| 329 | u8 status; | 329 | u8 status; |
| 330 | }; | 330 | } __packed; |
| 331 | 331 | ||
| 332 | #define AR9170_ENC_ALG_NONE 0x0 | 332 | #define AR9170_ENC_ALG_NONE 0x0 |
| 333 | #define AR9170_ENC_ALG_WEP64 0x1 | 333 | #define AR9170_ENC_ALG_WEP64 0x1 |
diff --git a/drivers/net/wireless/ar9170/usb.c b/drivers/net/wireless/ar9170/usb.c index ad296840893..fddda477095 100644 --- a/drivers/net/wireless/ar9170/usb.c +++ b/drivers/net/wireless/ar9170/usb.c | |||
| @@ -59,6 +59,8 @@ static struct usb_device_id ar9170_usb_ids[] = { | |||
| 59 | { USB_DEVICE(0x0cf3, 0x9170) }, | 59 | { USB_DEVICE(0x0cf3, 0x9170) }, |
| 60 | /* Atheros TG121N */ | 60 | /* Atheros TG121N */ |
| 61 | { USB_DEVICE(0x0cf3, 0x1001) }, | 61 | { USB_DEVICE(0x0cf3, 0x1001) }, |
| 62 | /* Cace Airpcap NX */ | ||
| 63 | { USB_DEVICE(0xcace, 0x0300) }, | ||
| 62 | /* D-Link DWA 160A */ | 64 | /* D-Link DWA 160A */ |
| 63 | { USB_DEVICE(0x07d1, 0x3c10) }, | 65 | { USB_DEVICE(0x07d1, 0x3c10) }, |
| 64 | /* Netgear WNDA3100 */ | 66 | /* Netgear WNDA3100 */ |
| @@ -67,6 +69,8 @@ static struct usb_device_id ar9170_usb_ids[] = { | |||
| 67 | { USB_DEVICE(0x0846, 0x9001) }, | 69 | { USB_DEVICE(0x0846, 0x9001) }, |
| 68 | /* Zydas ZD1221 */ | 70 | /* Zydas ZD1221 */ |
| 69 | { USB_DEVICE(0x0ace, 0x1221) }, | 71 | { USB_DEVICE(0x0ace, 0x1221) }, |
| 72 | /* ZyXEL NWD271N */ | ||
| 73 | { USB_DEVICE(0x0586, 0x3417) }, | ||
| 70 | /* Z-Com UB81 BG */ | 74 | /* Z-Com UB81 BG */ |
| 71 | { USB_DEVICE(0x0cde, 0x0023) }, | 75 | { USB_DEVICE(0x0cde, 0x0023) }, |
| 72 | /* Z-Com UB82 ABG */ | 76 | /* Z-Com UB82 ABG */ |
| @@ -619,6 +623,39 @@ static int ar9170_usb_open(struct ar9170 *ar) | |||
| 619 | return 0; | 623 | return 0; |
| 620 | } | 624 | } |
| 621 | 625 | ||
| 626 | static int ar9170_usb_init_device(struct ar9170_usb *aru) | ||
| 627 | { | ||
| 628 | int err; | ||
| 629 | |||
| 630 | err = ar9170_usb_alloc_rx_irq_urb(aru); | ||
| 631 | if (err) | ||
| 632 | goto err_out; | ||
| 633 | |||
| 634 | err = ar9170_usb_alloc_rx_bulk_urbs(aru); | ||
| 635 | if (err) | ||
| 636 | goto err_unrx; | ||
| 637 | |||
| 638 | err = ar9170_usb_upload_firmware(aru); | ||
| 639 | if (err) { | ||
| 640 | err = ar9170_echo_test(&aru->common, 0x60d43110); | ||
| 641 | if (err) { | ||
| 642 | /* force user invention, by disabling the device */ | ||
| 643 | err = usb_driver_set_configuration(aru->udev, -1); | ||
| 644 | dev_err(&aru->udev->dev, "device is in a bad state. " | ||
| 645 | "please reconnect it!\n"); | ||
| 646 | goto err_unrx; | ||
| 647 | } | ||
| 648 | } | ||
| 649 | |||
| 650 | return 0; | ||
| 651 | |||
| 652 | err_unrx: | ||
| 653 | ar9170_usb_cancel_urbs(aru); | ||
| 654 | |||
| 655 | err_out: | ||
| 656 | return err; | ||
| 657 | } | ||
| 658 | |||
| 622 | static int ar9170_usb_probe(struct usb_interface *intf, | 659 | static int ar9170_usb_probe(struct usb_interface *intf, |
| 623 | const struct usb_device_id *id) | 660 | const struct usb_device_id *id) |
| 624 | { | 661 | { |
| @@ -654,32 +691,16 @@ static int ar9170_usb_probe(struct usb_interface *intf, | |||
| 654 | 691 | ||
| 655 | err = ar9170_usb_reset(aru); | 692 | err = ar9170_usb_reset(aru); |
| 656 | if (err) | 693 | if (err) |
| 657 | goto err_unlock; | 694 | goto err_freehw; |
| 658 | 695 | ||
| 659 | err = ar9170_usb_request_firmware(aru); | 696 | err = ar9170_usb_request_firmware(aru); |
| 660 | if (err) | 697 | if (err) |
| 661 | goto err_unlock; | 698 | goto err_freehw; |
| 662 | 699 | ||
| 663 | err = ar9170_usb_alloc_rx_irq_urb(aru); | 700 | err = ar9170_usb_init_device(aru); |
| 664 | if (err) | 701 | if (err) |
| 665 | goto err_freefw; | 702 | goto err_freefw; |
| 666 | 703 | ||
| 667 | err = ar9170_usb_alloc_rx_bulk_urbs(aru); | ||
| 668 | if (err) | ||
| 669 | goto err_unrx; | ||
| 670 | |||
| 671 | err = ar9170_usb_upload_firmware(aru); | ||
| 672 | if (err) { | ||
| 673 | err = ar9170_echo_test(&aru->common, 0x60d43110); | ||
| 674 | if (err) { | ||
| 675 | /* force user invention, by disabling the device */ | ||
| 676 | err = usb_driver_set_configuration(aru->udev, -1); | ||
| 677 | dev_err(&aru->udev->dev, "device is in a bad state. " | ||
| 678 | "please reconnect it!\n"); | ||
| 679 | goto err_unrx; | ||
| 680 | } | ||
| 681 | } | ||
| 682 | |||
| 683 | err = ar9170_usb_open(ar); | 704 | err = ar9170_usb_open(ar); |
| 684 | if (err) | 705 | if (err) |
| 685 | goto err_unrx; | 706 | goto err_unrx; |
| @@ -699,7 +720,7 @@ err_freefw: | |||
| 699 | release_firmware(aru->init_values); | 720 | release_firmware(aru->init_values); |
| 700 | release_firmware(aru->firmware); | 721 | release_firmware(aru->firmware); |
| 701 | 722 | ||
| 702 | err_unlock: | 723 | err_freehw: |
| 703 | usb_set_intfdata(intf, NULL); | 724 | usb_set_intfdata(intf, NULL); |
| 704 | usb_put_dev(udev); | 725 | usb_put_dev(udev); |
| 705 | ieee80211_free_hw(ar->hw); | 726 | ieee80211_free_hw(ar->hw); |
| @@ -726,12 +747,65 @@ static void ar9170_usb_disconnect(struct usb_interface *intf) | |||
| 726 | ieee80211_free_hw(aru->common.hw); | 747 | ieee80211_free_hw(aru->common.hw); |
| 727 | } | 748 | } |
| 728 | 749 | ||
| 750 | #ifdef CONFIG_PM | ||
| 751 | static int ar9170_suspend(struct usb_interface *intf, | ||
| 752 | pm_message_t message) | ||
| 753 | { | ||
| 754 | struct ar9170_usb *aru = usb_get_intfdata(intf); | ||
| 755 | |||
| 756 | if (!aru) | ||
| 757 | return -ENODEV; | ||
| 758 | |||
| 759 | aru->common.state = AR9170_IDLE; | ||
| 760 | ar9170_usb_cancel_urbs(aru); | ||
| 761 | |||
| 762 | return 0; | ||
| 763 | } | ||
| 764 | |||
| 765 | static int ar9170_resume(struct usb_interface *intf) | ||
| 766 | { | ||
| 767 | struct ar9170_usb *aru = usb_get_intfdata(intf); | ||
| 768 | int err; | ||
| 769 | |||
| 770 | if (!aru) | ||
| 771 | return -ENODEV; | ||
| 772 | |||
| 773 | usb_unpoison_anchored_urbs(&aru->rx_submitted); | ||
| 774 | usb_unpoison_anchored_urbs(&aru->tx_submitted); | ||
| 775 | |||
| 776 | /* | ||
| 777 | * FIXME: firmware upload will fail on resume. | ||
| 778 | * but this is better than a hang! | ||
| 779 | */ | ||
| 780 | |||
| 781 | err = ar9170_usb_init_device(aru); | ||
| 782 | if (err) | ||
| 783 | goto err_unrx; | ||
| 784 | |||
| 785 | err = ar9170_usb_open(&aru->common); | ||
| 786 | if (err) | ||
| 787 | goto err_unrx; | ||
| 788 | |||
| 789 | return 0; | ||
| 790 | |||
| 791 | err_unrx: | ||
| 792 | aru->common.state = AR9170_IDLE; | ||
| 793 | ar9170_usb_cancel_urbs(aru); | ||
| 794 | |||
| 795 | return err; | ||
| 796 | } | ||
| 797 | #endif /* CONFIG_PM */ | ||
| 798 | |||
| 729 | static struct usb_driver ar9170_driver = { | 799 | static struct usb_driver ar9170_driver = { |
| 730 | .name = "ar9170usb", | 800 | .name = "ar9170usb", |
| 731 | .probe = ar9170_usb_probe, | 801 | .probe = ar9170_usb_probe, |
| 732 | .disconnect = ar9170_usb_disconnect, | 802 | .disconnect = ar9170_usb_disconnect, |
| 733 | .id_table = ar9170_usb_ids, | 803 | .id_table = ar9170_usb_ids, |
| 734 | .soft_unbind = 1, | 804 | .soft_unbind = 1, |
| 805 | #ifdef CONFIG_PM | ||
| 806 | .suspend = ar9170_suspend, | ||
| 807 | .resume = ar9170_resume, | ||
| 808 | #endif /* CONFIG_PM */ | ||
| 735 | }; | 809 | }; |
| 736 | 810 | ||
| 737 | static int __init ar9170_init(void) | 811 | static int __init ar9170_init(void) |
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 0c02f1c2bd9..744f4f4dd3d 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c | |||
| @@ -250,6 +250,8 @@ static struct usb_device_id dev_table[] = { | |||
| 250 | { USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) }, | 250 | { USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) }, |
| 251 | /* Siemens Gigaset USB WLAN Adapter 11 */ | 251 | /* Siemens Gigaset USB WLAN Adapter 11 */ |
| 252 | { USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) }, | 252 | { USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) }, |
| 253 | /* OQO Model 01+ Internal Wi-Fi */ | ||
| 254 | { USB_DEVICE(0x1557, 0x0002), USB_DEVICE_DATA(BOARD_505A) }, | ||
| 253 | /* | 255 | /* |
| 254 | * at76c505amx-rfmd | 256 | * at76c505amx-rfmd |
| 255 | */ | 257 | */ |
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 71cb18d6757..dd1f3015674 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
| @@ -493,6 +493,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
| 493 | int hdrlen, padsize, retval; | 493 | int hdrlen, padsize, retval; |
| 494 | bool decrypt_error = false; | 494 | bool decrypt_error = false; |
| 495 | u8 keyix; | 495 | u8 keyix; |
| 496 | __le16 fc; | ||
| 496 | 497 | ||
| 497 | spin_lock_bh(&sc->rx.rxbuflock); | 498 | spin_lock_bh(&sc->rx.rxbuflock); |
| 498 | 499 | ||
| @@ -606,6 +607,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
| 606 | /* see if any padding is done by the hw and remove it */ | 607 | /* see if any padding is done by the hw and remove it */ |
| 607 | hdr = (struct ieee80211_hdr *)skb->data; | 608 | hdr = (struct ieee80211_hdr *)skb->data; |
| 608 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); | 609 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); |
| 610 | fc = hdr->frame_control; | ||
| 609 | 611 | ||
| 610 | /* The MAC header is padded to have 32-bit boundary if the | 612 | /* The MAC header is padded to have 32-bit boundary if the |
| 611 | * packet payload is non-zero. The general calculation for | 613 | * packet payload is non-zero. The general calculation for |
| @@ -690,7 +692,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
| 690 | sc->rx.rxotherant = 0; | 692 | sc->rx.rxotherant = 0; |
| 691 | } | 693 | } |
| 692 | 694 | ||
| 693 | if (ieee80211_is_beacon(hdr->frame_control) && | 695 | if (ieee80211_is_beacon(fc) && |
| 694 | (sc->sc_flags & SC_OP_WAIT_FOR_BEACON)) { | 696 | (sc->sc_flags & SC_OP_WAIT_FOR_BEACON)) { |
| 695 | sc->sc_flags &= ~SC_OP_WAIT_FOR_BEACON; | 697 | sc->sc_flags &= ~SC_OP_WAIT_FOR_BEACON; |
| 696 | ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP); | 698 | ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP); |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 857d84148b1..27eef8fb710 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
| @@ -1502,7 +1502,6 @@ static const struct net_device_ops atmel_netdev_ops = { | |||
| 1502 | .ndo_set_mac_address = atmel_set_mac_address, | 1502 | .ndo_set_mac_address = atmel_set_mac_address, |
| 1503 | .ndo_start_xmit = start_tx, | 1503 | .ndo_start_xmit = start_tx, |
| 1504 | .ndo_do_ioctl = atmel_ioctl, | 1504 | .ndo_do_ioctl = atmel_ioctl, |
| 1505 | .ndo_change_mtu = eth_change_mtu, | ||
| 1506 | .ndo_validate_addr = eth_validate_addr, | 1505 | .ndo_validate_addr = eth_validate_addr, |
| 1507 | }; | 1506 | }; |
| 1508 | 1507 | ||
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index e228c1de6e1..eae680b5305 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
| @@ -555,11 +555,32 @@ address_error: | |||
| 555 | return 1; | 555 | return 1; |
| 556 | } | 556 | } |
| 557 | 557 | ||
| 558 | static bool b43_rx_buffer_is_poisoned(struct b43_dmaring *ring, struct sk_buff *skb) | ||
| 559 | { | ||
| 560 | unsigned char *f = skb->data + ring->frameoffset; | ||
| 561 | |||
| 562 | return ((f[0] & f[1] & f[2] & f[3] & f[4] & f[5] & f[6] & f[7]) == 0xFF); | ||
| 563 | } | ||
| 564 | |||
| 565 | static void b43_poison_rx_buffer(struct b43_dmaring *ring, struct sk_buff *skb) | ||
| 566 | { | ||
| 567 | struct b43_rxhdr_fw4 *rxhdr; | ||
| 568 | unsigned char *frame; | ||
| 569 | |||
| 570 | /* This poisons the RX buffer to detect DMA failures. */ | ||
| 571 | |||
| 572 | rxhdr = (struct b43_rxhdr_fw4 *)(skb->data); | ||
| 573 | rxhdr->frame_len = 0; | ||
| 574 | |||
| 575 | B43_WARN_ON(ring->rx_buffersize < ring->frameoffset + sizeof(struct b43_plcp_hdr6) + 2); | ||
| 576 | frame = skb->data + ring->frameoffset; | ||
| 577 | memset(frame, 0xFF, sizeof(struct b43_plcp_hdr6) + 2 /* padding */); | ||
| 578 | } | ||
| 579 | |||
| 558 | static int setup_rx_descbuffer(struct b43_dmaring *ring, | 580 | static int setup_rx_descbuffer(struct b43_dmaring *ring, |
| 559 | struct b43_dmadesc_generic *desc, | 581 | struct b43_dmadesc_generic *desc, |
| 560 | struct b43_dmadesc_meta *meta, gfp_t gfp_flags) | 582 | struct b43_dmadesc_meta *meta, gfp_t gfp_flags) |
| 561 | { | 583 | { |
| 562 | struct b43_rxhdr_fw4 *rxhdr; | ||
| 563 | dma_addr_t dmaaddr; | 584 | dma_addr_t dmaaddr; |
| 564 | struct sk_buff *skb; | 585 | struct sk_buff *skb; |
| 565 | 586 | ||
| @@ -568,6 +589,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, | |||
| 568 | skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags); | 589 | skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags); |
| 569 | if (unlikely(!skb)) | 590 | if (unlikely(!skb)) |
| 570 | return -ENOMEM; | 591 | return -ENOMEM; |
| 592 | b43_poison_rx_buffer(ring, skb); | ||
| 571 | dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0); | 593 | dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0); |
| 572 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { | 594 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { |
| 573 | /* ugh. try to realloc in zone_dma */ | 595 | /* ugh. try to realloc in zone_dma */ |
| @@ -578,6 +600,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, | |||
| 578 | skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags); | 600 | skb = __dev_alloc_skb(ring->rx_buffersize, gfp_flags); |
| 579 | if (unlikely(!skb)) | 601 | if (unlikely(!skb)) |
| 580 | return -ENOMEM; | 602 | return -ENOMEM; |
| 603 | b43_poison_rx_buffer(ring, skb); | ||
| 581 | dmaaddr = map_descbuffer(ring, skb->data, | 604 | dmaaddr = map_descbuffer(ring, skb->data, |
| 582 | ring->rx_buffersize, 0); | 605 | ring->rx_buffersize, 0); |
| 583 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { | 606 | if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) { |
| @@ -592,9 +615,6 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring, | |||
| 592 | ring->ops->fill_descriptor(ring, desc, dmaaddr, | 615 | ring->ops->fill_descriptor(ring, desc, dmaaddr, |
| 593 | ring->rx_buffersize, 0, 0, 0); | 616 | ring->rx_buffersize, 0, 0, 0); |
| 594 | 617 | ||
| 595 | rxhdr = (struct b43_rxhdr_fw4 *)(skb->data); | ||
| 596 | rxhdr->frame_len = 0; | ||
| 597 | |||
| 598 | return 0; | 618 | return 0; |
| 599 | } | 619 | } |
| 600 | 620 | ||
| @@ -1483,12 +1503,17 @@ static void dma_rx(struct b43_dmaring *ring, int *slot) | |||
| 1483 | len = le16_to_cpu(rxhdr->frame_len); | 1503 | len = le16_to_cpu(rxhdr->frame_len); |
| 1484 | } while (len == 0 && i++ < 5); | 1504 | } while (len == 0 && i++ < 5); |
| 1485 | if (unlikely(len == 0)) { | 1505 | if (unlikely(len == 0)) { |
| 1486 | /* recycle the descriptor buffer. */ | 1506 | dmaaddr = meta->dmaaddr; |
| 1487 | sync_descbuffer_for_device(ring, meta->dmaaddr, | 1507 | goto drop_recycle_buffer; |
| 1488 | ring->rx_buffersize); | ||
| 1489 | goto drop; | ||
| 1490 | } | 1508 | } |
| 1491 | } | 1509 | } |
| 1510 | if (unlikely(b43_rx_buffer_is_poisoned(ring, skb))) { | ||
| 1511 | /* Something went wrong with the DMA. | ||
| 1512 | * The device did not touch the buffer and did not overwrite the poison. */ | ||
| 1513 | b43dbg(ring->dev->wl, "DMA RX: Dropping poisoned buffer.\n"); | ||
| 1514 | dmaaddr = meta->dmaaddr; | ||
| 1515 | goto drop_recycle_buffer; | ||
| 1516 | } | ||
| 1492 | if (unlikely(len > ring->rx_buffersize)) { | 1517 | if (unlikely(len > ring->rx_buffersize)) { |
| 1493 | /* The data did not fit into one descriptor buffer | 1518 | /* The data did not fit into one descriptor buffer |
| 1494 | * and is split over multiple buffers. | 1519 | * and is split over multiple buffers. |
| @@ -1501,6 +1526,7 @@ static void dma_rx(struct b43_dmaring *ring, int *slot) | |||
| 1501 | while (1) { | 1526 | while (1) { |
| 1502 | desc = ops->idx2desc(ring, *slot, &meta); | 1527 | desc = ops->idx2desc(ring, *slot, &meta); |
| 1503 | /* recycle the descriptor buffer. */ | 1528 | /* recycle the descriptor buffer. */ |
| 1529 | b43_poison_rx_buffer(ring, meta->skb); | ||
| 1504 | sync_descbuffer_for_device(ring, meta->dmaaddr, | 1530 | sync_descbuffer_for_device(ring, meta->dmaaddr, |
| 1505 | ring->rx_buffersize); | 1531 | ring->rx_buffersize); |
| 1506 | *slot = next_slot(ring, *slot); | 1532 | *slot = next_slot(ring, *slot); |
| @@ -1519,8 +1545,7 @@ static void dma_rx(struct b43_dmaring *ring, int *slot) | |||
| 1519 | err = setup_rx_descbuffer(ring, desc, meta, GFP_ATOMIC); | 1545 | err = setup_rx_descbuffer(ring, desc, meta, GFP_ATOMIC); |
| 1520 | if (unlikely(err)) { | 1546 | if (unlikely(err)) { |
| 1521 | b43dbg(ring->dev->wl, "DMA RX: setup_rx_descbuffer() failed\n"); | 1547 | b43dbg(ring->dev->wl, "DMA RX: setup_rx_descbuffer() failed\n"); |
| 1522 | sync_descbuffer_for_device(ring, dmaaddr, ring->rx_buffersize); | 1548 | goto drop_recycle_buffer; |
| 1523 | goto drop; | ||
| 1524 | } | 1549 | } |
| 1525 | 1550 | ||
| 1526 | unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0); | 1551 | unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0); |
| @@ -1530,6 +1555,11 @@ static void dma_rx(struct b43_dmaring *ring, int *slot) | |||
| 1530 | b43_rx(ring->dev, skb, rxhdr); | 1555 | b43_rx(ring->dev, skb, rxhdr); |
| 1531 | drop: | 1556 | drop: |
| 1532 | return; | 1557 | return; |
| 1558 | |||
| 1559 | drop_recycle_buffer: | ||
| 1560 | /* Poison and recycle the RX buffer. */ | ||
| 1561 | b43_poison_rx_buffer(ring, skb); | ||
| 1562 | sync_descbuffer_for_device(ring, dmaaddr, ring->rx_buffersize); | ||
| 1533 | } | 1563 | } |
| 1534 | 1564 | ||
| 1535 | void b43_dma_rx(struct b43_dmaring *ring) | 1565 | void b43_dma_rx(struct b43_dmaring *ring) |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 4896e083111..79b685e300c 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -3974,6 +3974,11 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev, | |||
| 3974 | phy->next_txpwr_check_time = jiffies; | 3974 | phy->next_txpwr_check_time = jiffies; |
| 3975 | /* PHY TX errors counter. */ | 3975 | /* PHY TX errors counter. */ |
| 3976 | atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT); | 3976 | atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT); |
| 3977 | |||
| 3978 | #if B43_DEBUG | ||
| 3979 | phy->phy_locked = 0; | ||
| 3980 | phy->radio_locked = 0; | ||
| 3981 | #endif | ||
| 3977 | } | 3982 | } |
| 3978 | 3983 | ||
| 3979 | static void setup_struct_wldev_for_init(struct b43_wldev *dev) | 3984 | static void setup_struct_wldev_for_init(struct b43_wldev *dev) |
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c index 026b61c03fb..e176b6e0d9c 100644 --- a/drivers/net/wireless/b43/phy_common.c +++ b/drivers/net/wireless/b43/phy_common.c | |||
| @@ -131,12 +131,16 @@ void b43_radio_lock(struct b43_wldev *dev) | |||
| 131 | { | 131 | { |
| 132 | u32 macctl; | 132 | u32 macctl; |
| 133 | 133 | ||
| 134 | #if B43_DEBUG | ||
| 135 | B43_WARN_ON(dev->phy.radio_locked); | ||
| 136 | dev->phy.radio_locked = 1; | ||
| 137 | #endif | ||
| 138 | |||
| 134 | macctl = b43_read32(dev, B43_MMIO_MACCTL); | 139 | macctl = b43_read32(dev, B43_MMIO_MACCTL); |
| 135 | B43_WARN_ON(macctl & B43_MACCTL_RADIOLOCK); | ||
| 136 | macctl |= B43_MACCTL_RADIOLOCK; | 140 | macctl |= B43_MACCTL_RADIOLOCK; |
| 137 | b43_write32(dev, B43_MMIO_MACCTL, macctl); | 141 | b43_write32(dev, B43_MMIO_MACCTL, macctl); |
| 138 | /* Commit the write and wait for the device | 142 | /* Commit the write and wait for the firmware |
| 139 | * to exit any radio register access. */ | 143 | * to finish any radio register access. */ |
| 140 | b43_read32(dev, B43_MMIO_MACCTL); | 144 | b43_read32(dev, B43_MMIO_MACCTL); |
| 141 | udelay(10); | 145 | udelay(10); |
| 142 | } | 146 | } |
| @@ -145,11 +149,15 @@ void b43_radio_unlock(struct b43_wldev *dev) | |||
| 145 | { | 149 | { |
| 146 | u32 macctl; | 150 | u32 macctl; |
| 147 | 151 | ||
| 152 | #if B43_DEBUG | ||
| 153 | B43_WARN_ON(!dev->phy.radio_locked); | ||
| 154 | dev->phy.radio_locked = 0; | ||
| 155 | #endif | ||
| 156 | |||
| 148 | /* Commit any write */ | 157 | /* Commit any write */ |
| 149 | b43_read16(dev, B43_MMIO_PHY_VER); | 158 | b43_read16(dev, B43_MMIO_PHY_VER); |
| 150 | /* unlock */ | 159 | /* unlock */ |
| 151 | macctl = b43_read32(dev, B43_MMIO_MACCTL); | 160 | macctl = b43_read32(dev, B43_MMIO_MACCTL); |
| 152 | B43_WARN_ON(!(macctl & B43_MACCTL_RADIOLOCK)); | ||
| 153 | macctl &= ~B43_MACCTL_RADIOLOCK; | 161 | macctl &= ~B43_MACCTL_RADIOLOCK; |
| 154 | b43_write32(dev, B43_MMIO_MACCTL, macctl); | 162 | b43_write32(dev, B43_MMIO_MACCTL, macctl); |
| 155 | } | 163 | } |
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h index c9f5430d1d7..b2d99101947 100644 --- a/drivers/net/wireless/b43/phy_common.h +++ b/drivers/net/wireless/b43/phy_common.h | |||
| @@ -245,8 +245,10 @@ struct b43_phy { | |||
| 245 | atomic_t txerr_cnt; | 245 | atomic_t txerr_cnt; |
| 246 | 246 | ||
| 247 | #ifdef CONFIG_B43_DEBUG | 247 | #ifdef CONFIG_B43_DEBUG |
| 248 | /* PHY registers locked by b43_phy_lock()? */ | 248 | /* PHY registers locked (w.r.t. firmware) */ |
| 249 | bool phy_locked; | 249 | bool phy_locked; |
| 250 | /* Radio registers locked (w.r.t. firmware) */ | ||
| 251 | bool radio_locked; | ||
| 250 | #endif /* B43_DEBUG */ | 252 | #endif /* B43_DEBUG */ |
| 251 | }; | 253 | }; |
| 252 | 254 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 2399328e8de..527525cc091 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
| @@ -1192,7 +1192,7 @@ int iwl3945_hw_nic_init(struct iwl_priv *priv) | |||
| 1192 | return -ENOMEM; | 1192 | return -ENOMEM; |
| 1193 | } | 1193 | } |
| 1194 | } else | 1194 | } else |
| 1195 | iwl_rx_queue_reset(priv, rxq); | 1195 | iwl3945_rx_queue_reset(priv, rxq); |
| 1196 | 1196 | ||
| 1197 | iwl3945_rx_replenish(priv); | 1197 | iwl3945_rx_replenish(priv); |
| 1198 | 1198 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index ab7aaf6872c..55188844657 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h | |||
| @@ -215,6 +215,7 @@ extern int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm); | |||
| 215 | extern int iwl3945_tx_queue_init(struct iwl_priv *priv, | 215 | extern int iwl3945_tx_queue_init(struct iwl_priv *priv, |
| 216 | struct iwl_tx_queue *txq, int count, u32 id); | 216 | struct iwl_tx_queue *txq, int count, u32 id); |
| 217 | extern void iwl3945_rx_replenish(void *data); | 217 | extern void iwl3945_rx_replenish(void *data); |
| 218 | extern void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq); | ||
| 218 | extern void iwl3945_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq); | 219 | extern void iwl3945_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq); |
| 219 | extern int iwl3945_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, | 220 | extern int iwl3945_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, |
| 220 | const void *data); | 221 | const void *data); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3889158b359..1ef4192207a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -976,11 +976,9 @@ void iwl_rx_handle(struct iwl_priv *priv) | |||
| 976 | 976 | ||
| 977 | rxq->queue[i] = NULL; | 977 | rxq->queue[i] = NULL; |
| 978 | 978 | ||
| 979 | dma_sync_single_range_for_cpu( | 979 | pci_unmap_single(priv->pci_dev, rxb->real_dma_addr, |
| 980 | &priv->pci_dev->dev, rxb->real_dma_addr, | 980 | priv->hw_params.rx_buf_size + 256, |
| 981 | rxb->aligned_dma_addr - rxb->real_dma_addr, | 981 | PCI_DMA_FROMDEVICE); |
| 982 | priv->hw_params.rx_buf_size, | ||
| 983 | PCI_DMA_FROMDEVICE); | ||
| 984 | pkt = (struct iwl_rx_packet *)rxb->skb->data; | 982 | pkt = (struct iwl_rx_packet *)rxb->skb->data; |
| 985 | 983 | ||
| 986 | /* Reclaim a command buffer only if this packet is a response | 984 | /* Reclaim a command buffer only if this packet is a response |
| @@ -1031,9 +1029,6 @@ void iwl_rx_handle(struct iwl_priv *priv) | |||
| 1031 | rxb->skb = NULL; | 1029 | rxb->skb = NULL; |
| 1032 | } | 1030 | } |
| 1033 | 1031 | ||
| 1034 | pci_unmap_single(priv->pci_dev, rxb->real_dma_addr, | ||
| 1035 | priv->hw_params.rx_buf_size + 256, | ||
| 1036 | PCI_DMA_FROMDEVICE); | ||
| 1037 | spin_lock_irqsave(&rxq->lock, flags); | 1032 | spin_lock_irqsave(&rxq->lock, flags); |
| 1038 | list_add_tail(&rxb->list, &priv->rxq.rx_used); | 1033 | list_add_tail(&rxb->list, &priv->rxq.rx_used); |
| 1039 | spin_unlock_irqrestore(&rxq->lock, flags); | 1034 | spin_unlock_irqrestore(&rxq->lock, flags); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h index 2f1242447b3..6e983149b83 100644 --- a/drivers/net/wireless/iwlwifi/iwl-csr.h +++ b/drivers/net/wireless/iwlwifi/iwl-csr.h | |||
| @@ -223,7 +223,7 @@ | |||
| 223 | #define CSR_EEPROM_REG_MSK_DATA (0xFFFF0000) | 223 | #define CSR_EEPROM_REG_MSK_DATA (0xFFFF0000) |
| 224 | 224 | ||
| 225 | /* EEPROM GP */ | 225 | /* EEPROM GP */ |
| 226 | #define CSR_EEPROM_GP_VALID_MSK (0x00000006) | 226 | #define CSR_EEPROM_GP_VALID_MSK (0x00000007) |
| 227 | #define CSR_EEPROM_GP_BAD_SIGNATURE (0x00000000) | 227 | #define CSR_EEPROM_GP_BAD_SIGNATURE (0x00000000) |
| 228 | #define CSR_EEPROM_GP_IF_OWNER_MSK (0x00000180) | 228 | #define CSR_EEPROM_GP_IF_OWNER_MSK (0x00000180) |
| 229 | 229 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index ec9a13846ed..cf7f0db58fc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
| @@ -360,12 +360,16 @@ struct iwl_host_cmd { | |||
| 360 | 360 | ||
| 361 | /** | 361 | /** |
| 362 | * struct iwl_rx_queue - Rx queue | 362 | * struct iwl_rx_queue - Rx queue |
| 363 | * @bd: driver's pointer to buffer of receive buffer descriptors (rbd) | ||
| 364 | * @dma_addr: bus address of buffer of receive buffer descriptors (rbd) | ||
| 363 | * @read: Shared index to newest available Rx buffer | 365 | * @read: Shared index to newest available Rx buffer |
| 364 | * @write: Shared index to oldest written Rx packet | 366 | * @write: Shared index to oldest written Rx packet |
| 365 | * @free_count: Number of pre-allocated buffers in rx_free | 367 | * @free_count: Number of pre-allocated buffers in rx_free |
| 366 | * @rx_free: list of free SKBs for use | 368 | * @rx_free: list of free SKBs for use |
| 367 | * @rx_used: List of Rx buffers with no SKB | 369 | * @rx_used: List of Rx buffers with no SKB |
| 368 | * @need_update: flag to indicate we need to update read/write index | 370 | * @need_update: flag to indicate we need to update read/write index |
| 371 | * @rb_stts: driver's pointer to receive buffer status | ||
| 372 | * @rb_stts_dma: bus address of receive buffer status | ||
| 369 | * | 373 | * |
| 370 | * NOTE: rx_free and rx_used are used as a FIFO for iwl_rx_mem_buffers | 374 | * NOTE: rx_free and rx_used are used as a FIFO for iwl_rx_mem_buffers |
| 371 | */ | 375 | */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 1f117a49c56..71d5b8a1a73 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
| @@ -799,6 +799,22 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 799 | /* Copy MAC header from skb into command buffer */ | 799 | /* Copy MAC header from skb into command buffer */ |
| 800 | memcpy(tx_cmd->hdr, hdr, hdr_len); | 800 | memcpy(tx_cmd->hdr, hdr, hdr_len); |
| 801 | 801 | ||
| 802 | |||
| 803 | /* Total # bytes to be transmitted */ | ||
| 804 | len = (u16)skb->len; | ||
| 805 | tx_cmd->len = cpu_to_le16(len); | ||
| 806 | |||
| 807 | if (info->control.hw_key) | ||
| 808 | iwl_tx_cmd_build_hwcrypto(priv, info, tx_cmd, skb, sta_id); | ||
| 809 | |||
| 810 | /* TODO need this for burst mode later on */ | ||
| 811 | iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id); | ||
| 812 | |||
| 813 | /* set is_hcca to 0; it probably will never be implemented */ | ||
| 814 | iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0); | ||
| 815 | |||
| 816 | iwl_update_tx_stats(priv, le16_to_cpu(fc), len); | ||
| 817 | |||
| 802 | /* | 818 | /* |
| 803 | * Use the first empty entry in this queue's command buffer array | 819 | * Use the first empty entry in this queue's command buffer array |
| 804 | * to contain the Tx command and MAC header concatenated together | 820 | * to contain the Tx command and MAC header concatenated together |
| @@ -819,21 +835,30 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 819 | else | 835 | else |
| 820 | len_org = 0; | 836 | len_org = 0; |
| 821 | 837 | ||
| 838 | /* Tell NIC about any 2-byte padding after MAC header */ | ||
| 839 | if (len_org) | ||
| 840 | tx_cmd->tx_flags |= TX_CMD_FLG_MH_PAD_MSK; | ||
| 841 | |||
| 822 | /* Physical address of this Tx command's header (not MAC header!), | 842 | /* Physical address of this Tx command's header (not MAC header!), |
| 823 | * within command buffer array. */ | 843 | * within command buffer array. */ |
| 824 | txcmd_phys = pci_map_single(priv->pci_dev, | 844 | txcmd_phys = pci_map_single(priv->pci_dev, |
| 825 | out_cmd, sizeof(struct iwl_cmd), | 845 | &out_cmd->hdr, len, |
| 826 | PCI_DMA_BIDIRECTIONAL); | 846 | PCI_DMA_BIDIRECTIONAL); |
| 827 | pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys); | 847 | pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys); |
| 828 | pci_unmap_len_set(&out_cmd->meta, len, sizeof(struct iwl_cmd)); | 848 | pci_unmap_len_set(&out_cmd->meta, len, len); |
| 829 | /* Add buffer containing Tx command and MAC(!) header to TFD's | 849 | /* Add buffer containing Tx command and MAC(!) header to TFD's |
| 830 | * first entry */ | 850 | * first entry */ |
| 831 | txcmd_phys += offsetof(struct iwl_cmd, hdr); | ||
| 832 | priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, | 851 | priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, |
| 833 | txcmd_phys, len, 1, 0); | 852 | txcmd_phys, len, 1, 0); |
| 834 | 853 | ||
| 835 | if (info->control.hw_key) | 854 | if (!ieee80211_has_morefrags(hdr->frame_control)) { |
| 836 | iwl_tx_cmd_build_hwcrypto(priv, info, tx_cmd, skb, sta_id); | 855 | txq->need_update = 1; |
| 856 | if (qc) | ||
| 857 | priv->stations[sta_id].tid[tid].seq_number = seq_number; | ||
| 858 | } else { | ||
| 859 | wait_write_ptr = 1; | ||
| 860 | txq->need_update = 0; | ||
| 861 | } | ||
| 837 | 862 | ||
| 838 | /* Set up TFD's 2nd entry to point directly to remainder of skb, | 863 | /* Set up TFD's 2nd entry to point directly to remainder of skb, |
| 839 | * if any (802.11 null frames have no payload). */ | 864 | * if any (802.11 null frames have no payload). */ |
| @@ -846,41 +871,29 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 846 | 0, 0); | 871 | 0, 0); |
| 847 | } | 872 | } |
| 848 | 873 | ||
| 849 | /* Tell NIC about any 2-byte padding after MAC header */ | ||
| 850 | if (len_org) | ||
| 851 | tx_cmd->tx_flags |= TX_CMD_FLG_MH_PAD_MSK; | ||
| 852 | |||
| 853 | /* Total # bytes to be transmitted */ | ||
| 854 | len = (u16)skb->len; | ||
| 855 | tx_cmd->len = cpu_to_le16(len); | ||
| 856 | /* TODO need this for burst mode later on */ | ||
| 857 | iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id); | ||
| 858 | |||
| 859 | /* set is_hcca to 0; it probably will never be implemented */ | ||
| 860 | iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0); | ||
| 861 | |||
| 862 | iwl_update_tx_stats(priv, le16_to_cpu(fc), len); | ||
| 863 | |||
| 864 | scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) + | 874 | scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) + |
| 865 | offsetof(struct iwl_tx_cmd, scratch); | 875 | offsetof(struct iwl_tx_cmd, scratch); |
| 876 | |||
| 877 | len = sizeof(struct iwl_tx_cmd) + | ||
| 878 | sizeof(struct iwl_cmd_header) + hdr_len; | ||
| 879 | /* take back ownership of DMA buffer to enable update */ | ||
| 880 | pci_dma_sync_single_for_cpu(priv->pci_dev, txcmd_phys, | ||
| 881 | len, PCI_DMA_BIDIRECTIONAL); | ||
| 866 | tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys); | 882 | tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys); |
| 867 | tx_cmd->dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys); | 883 | tx_cmd->dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys); |
| 868 | 884 | ||
| 869 | if (!ieee80211_has_morefrags(hdr->frame_control)) { | 885 | IWL_DEBUG_TX(priv, "sequence nr = 0X%x \n", |
| 870 | txq->need_update = 1; | 886 | le16_to_cpu(out_cmd->hdr.sequence)); |
| 871 | if (qc) | 887 | IWL_DEBUG_TX(priv, "tx_flags = 0X%x \n", le32_to_cpu(tx_cmd->tx_flags)); |
| 872 | priv->stations[sta_id].tid[tid].seq_number = seq_number; | ||
| 873 | } else { | ||
| 874 | wait_write_ptr = 1; | ||
| 875 | txq->need_update = 0; | ||
| 876 | } | ||
| 877 | |||
| 878 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd)); | 888 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd)); |
| 879 | |||
| 880 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len); | 889 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len); |
| 881 | 890 | ||
| 882 | /* Set up entry for this TFD in Tx byte-count array */ | 891 | /* Set up entry for this TFD in Tx byte-count array */ |
| 883 | priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, len); | 892 | priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, |
| 893 | le16_to_cpu(tx_cmd->len)); | ||
| 894 | |||
| 895 | pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys, | ||
| 896 | len, PCI_DMA_BIDIRECTIONAL); | ||
| 884 | 897 | ||
| 885 | /* Tell device the write index *just past* this latest filled TFD */ | 898 | /* Tell device the write index *just past* this latest filled TFD */ |
| 886 | q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); | 899 | q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); |
| @@ -968,18 +981,9 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) | |||
| 968 | INDEX_TO_SEQ(q->write_ptr)); | 981 | INDEX_TO_SEQ(q->write_ptr)); |
| 969 | if (out_cmd->meta.flags & CMD_SIZE_HUGE) | 982 | if (out_cmd->meta.flags & CMD_SIZE_HUGE) |
| 970 | out_cmd->hdr.sequence |= SEQ_HUGE_FRAME; | 983 | out_cmd->hdr.sequence |= SEQ_HUGE_FRAME; |
| 971 | len = (idx == TFD_CMD_SLOTS) ? | 984 | len = sizeof(struct iwl_cmd) - sizeof(struct iwl_cmd_meta); |
| 972 | IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd); | 985 | len += (idx == TFD_CMD_SLOTS) ? IWL_MAX_SCAN_SIZE : 0; |
| 973 | |||
| 974 | phys_addr = pci_map_single(priv->pci_dev, out_cmd, | ||
| 975 | len, PCI_DMA_BIDIRECTIONAL); | ||
| 976 | pci_unmap_addr_set(&out_cmd->meta, mapping, phys_addr); | ||
| 977 | pci_unmap_len_set(&out_cmd->meta, len, len); | ||
| 978 | phys_addr += offsetof(struct iwl_cmd, hdr); | ||
| 979 | 986 | ||
| 980 | priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, | ||
| 981 | phys_addr, fix_size, 1, | ||
| 982 | U32_PAD(cmd->len)); | ||
| 983 | 987 | ||
| 984 | #ifdef CONFIG_IWLWIFI_DEBUG | 988 | #ifdef CONFIG_IWLWIFI_DEBUG |
| 985 | switch (out_cmd->hdr.cmd) { | 989 | switch (out_cmd->hdr.cmd) { |
| @@ -1007,6 +1011,15 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) | |||
| 1007 | /* Set up entry in queue's byte count circular buffer */ | 1011 | /* Set up entry in queue's byte count circular buffer */ |
| 1008 | priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0); | 1012 | priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0); |
| 1009 | 1013 | ||
| 1014 | phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr, | ||
| 1015 | fix_size, PCI_DMA_BIDIRECTIONAL); | ||
| 1016 | pci_unmap_addr_set(&out_cmd->meta, mapping, phys_addr); | ||
| 1017 | pci_unmap_len_set(&out_cmd->meta, len, fix_size); | ||
| 1018 | |||
| 1019 | priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, | ||
| 1020 | phys_addr, fix_size, 1, | ||
| 1021 | U32_PAD(cmd->len)); | ||
| 1022 | |||
| 1010 | /* Increment and update queue's write index */ | 1023 | /* Increment and update queue's write index */ |
| 1011 | q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); | 1024 | q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); |
| 1012 | ret = iwl_txq_update_write_ptr(priv, txq); | 1025 | ret = iwl_txq_update_write_ptr(priv, txq); |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index ce729281ff6..617c4235d97 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -972,7 +972,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 972 | dma_addr_t phys_addr; | 972 | dma_addr_t phys_addr; |
| 973 | dma_addr_t txcmd_phys; | 973 | dma_addr_t txcmd_phys; |
| 974 | int txq_id = skb_get_queue_mapping(skb); | 974 | int txq_id = skb_get_queue_mapping(skb); |
| 975 | u16 len, idx, len_org, hdr_len; | 975 | u16 len, idx, len_org, hdr_len; /* TODO: len_org is not used */ |
| 976 | u8 id; | 976 | u8 id; |
| 977 | u8 unicast; | 977 | u8 unicast; |
| 978 | u8 sta_id; | 978 | u8 sta_id; |
| @@ -1074,6 +1074,40 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 1074 | /* Copy MAC header from skb into command buffer */ | 1074 | /* Copy MAC header from skb into command buffer */ |
| 1075 | memcpy(tx->hdr, hdr, hdr_len); | 1075 | memcpy(tx->hdr, hdr, hdr_len); |
| 1076 | 1076 | ||
| 1077 | |||
| 1078 | if (info->control.hw_key) | ||
| 1079 | iwl3945_build_tx_cmd_hwcrypto(priv, info, out_cmd, skb, sta_id); | ||
| 1080 | |||
| 1081 | /* TODO need this for burst mode later on */ | ||
| 1082 | iwl3945_build_tx_cmd_basic(priv, out_cmd, info, hdr, sta_id); | ||
| 1083 | |||
| 1084 | /* set is_hcca to 0; it probably will never be implemented */ | ||
| 1085 | iwl3945_hw_build_tx_cmd_rate(priv, out_cmd, info, hdr, sta_id, 0); | ||
| 1086 | |||
| 1087 | /* Total # bytes to be transmitted */ | ||
| 1088 | len = (u16)skb->len; | ||
| 1089 | tx->len = cpu_to_le16(len); | ||
| 1090 | |||
| 1091 | |||
| 1092 | tx->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; | ||
| 1093 | tx->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; | ||
| 1094 | |||
| 1095 | if (!ieee80211_has_morefrags(hdr->frame_control)) { | ||
| 1096 | txq->need_update = 1; | ||
| 1097 | if (qc) | ||
| 1098 | priv->stations_39[sta_id].tid[tid].seq_number = seq_number; | ||
| 1099 | } else { | ||
| 1100 | wait_write_ptr = 1; | ||
| 1101 | txq->need_update = 0; | ||
| 1102 | } | ||
| 1103 | |||
| 1104 | IWL_DEBUG_TX(priv, "sequence nr = 0X%x \n", | ||
| 1105 | le16_to_cpu(out_cmd->hdr.sequence)); | ||
| 1106 | IWL_DEBUG_TX(priv, "tx_flags = 0X%x \n", le32_to_cpu(tx->tx_flags)); | ||
| 1107 | iwl_print_hex_dump(priv, IWL_DL_TX, tx, sizeof(*tx)); | ||
| 1108 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx->hdr, | ||
| 1109 | ieee80211_hdrlen(fc)); | ||
| 1110 | |||
| 1077 | /* | 1111 | /* |
| 1078 | * Use the first empty entry in this queue's command buffer array | 1112 | * Use the first empty entry in this queue's command buffer array |
| 1079 | * to contain the Tx command and MAC header concatenated together | 1113 | * to contain the Tx command and MAC header concatenated together |
| @@ -1096,22 +1130,18 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 1096 | 1130 | ||
| 1097 | /* Physical address of this Tx command's header (not MAC header!), | 1131 | /* Physical address of this Tx command's header (not MAC header!), |
| 1098 | * within command buffer array. */ | 1132 | * within command buffer array. */ |
| 1099 | txcmd_phys = pci_map_single(priv->pci_dev, | 1133 | txcmd_phys = pci_map_single(priv->pci_dev, &out_cmd->hdr, |
| 1100 | out_cmd, sizeof(struct iwl_cmd), | 1134 | len, PCI_DMA_TODEVICE); |
| 1101 | PCI_DMA_TODEVICE); | 1135 | /* we do not map meta data ... so we can safely access address to |
| 1136 | * provide to unmap command*/ | ||
| 1102 | pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys); | 1137 | pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys); |
| 1103 | pci_unmap_len_set(&out_cmd->meta, len, sizeof(struct iwl_cmd)); | 1138 | pci_unmap_len_set(&out_cmd->meta, len, len); |
| 1104 | /* Add buffer containing Tx command and MAC(!) header to TFD's | ||
| 1105 | * first entry */ | ||
| 1106 | txcmd_phys += offsetof(struct iwl_cmd, hdr); | ||
| 1107 | 1139 | ||
| 1108 | /* Add buffer containing Tx command and MAC(!) header to TFD's | 1140 | /* Add buffer containing Tx command and MAC(!) header to TFD's |
| 1109 | * first entry */ | 1141 | * first entry */ |
| 1110 | priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, | 1142 | priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, |
| 1111 | txcmd_phys, len, 1, 0); | 1143 | txcmd_phys, len, 1, 0); |
| 1112 | 1144 | ||
| 1113 | if (info->control.hw_key) | ||
| 1114 | iwl3945_build_tx_cmd_hwcrypto(priv, info, out_cmd, skb, sta_id); | ||
| 1115 | 1145 | ||
| 1116 | /* Set up TFD's 2nd entry to point directly to remainder of skb, | 1146 | /* Set up TFD's 2nd entry to point directly to remainder of skb, |
| 1117 | * if any (802.11 null frames have no payload). */ | 1147 | * if any (802.11 null frames have no payload). */ |
| @@ -1124,32 +1154,6 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
| 1124 | 0, U32_PAD(len)); | 1154 | 0, U32_PAD(len)); |
| 1125 | } | 1155 | } |
| 1126 | 1156 | ||
| 1127 | /* Total # bytes to be transmitted */ | ||
| 1128 | len = (u16)skb->len; | ||
| 1129 | tx->len = cpu_to_le16(len); | ||
| 1130 | |||
| 1131 | /* TODO need this for burst mode later on */ | ||
| 1132 | iwl3945_build_tx_cmd_basic(priv, out_cmd, info, hdr, sta_id); | ||
| 1133 | |||
| 1134 | /* set is_hcca to 0; it probably will never be implemented */ | ||
| 1135 | iwl3945_hw_build_tx_cmd_rate(priv, out_cmd, info, hdr, sta_id, 0); | ||
| 1136 | |||
| 1137 | tx->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; | ||
| 1138 | tx->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; | ||
| 1139 | |||
| 1140 | if (!ieee80211_has_morefrags(hdr->frame_control)) { | ||
| 1141 | txq->need_update = 1; | ||
| 1142 | if (qc) | ||
| 1143 | priv->stations_39[sta_id].tid[tid].seq_number = seq_number; | ||
| 1144 | } else { | ||
| 1145 | wait_write_ptr = 1; | ||
| 1146 | txq->need_update = 0; | ||
| 1147 | } | ||
| 1148 | |||
| 1149 | iwl_print_hex_dump(priv, IWL_DL_TX, tx, sizeof(*tx)); | ||
| 1150 | |||
| 1151 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx->hdr, | ||
| 1152 | ieee80211_hdrlen(fc)); | ||
| 1153 | 1157 | ||
| 1154 | /* Tell device the write index *just past* this latest filled TFD */ | 1158 | /* Tell device the write index *just past* this latest filled TFD */ |
| 1155 | q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); | 1159 | q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); |
| @@ -1661,6 +1665,37 @@ static void iwl3945_rx_allocate(struct iwl_priv *priv) | |||
| 1661 | spin_unlock_irqrestore(&rxq->lock, flags); | 1665 | spin_unlock_irqrestore(&rxq->lock, flags); |
| 1662 | } | 1666 | } |
| 1663 | 1667 | ||
| 1668 | void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq) | ||
| 1669 | { | ||
| 1670 | unsigned long flags; | ||
| 1671 | int i; | ||
| 1672 | spin_lock_irqsave(&rxq->lock, flags); | ||
| 1673 | INIT_LIST_HEAD(&rxq->rx_free); | ||
| 1674 | INIT_LIST_HEAD(&rxq->rx_used); | ||
| 1675 | /* Fill the rx_used queue with _all_ of the Rx buffers */ | ||
| 1676 | for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) { | ||
| 1677 | /* In the reset function, these buffers may have been allocated | ||
| 1678 | * to an SKB, so we need to unmap and free potential storage */ | ||
| 1679 | if (rxq->pool[i].skb != NULL) { | ||
| 1680 | pci_unmap_single(priv->pci_dev, | ||
| 1681 | rxq->pool[i].real_dma_addr, | ||
| 1682 | priv->hw_params.rx_buf_size, | ||
| 1683 | PCI_DMA_FROMDEVICE); | ||
| 1684 | priv->alloc_rxb_skb--; | ||
| 1685 | dev_kfree_skb(rxq->pool[i].skb); | ||
| 1686 | rxq->pool[i].skb = NULL; | ||
| 1687 | } | ||
| 1688 | list_add_tail(&rxq->pool[i].list, &rxq->rx_used); | ||
| 1689 | } | ||
| 1690 | |||
| 1691 | /* Set us so that we have processed and used all buffers, but have | ||
| 1692 | * not restocked the Rx queue with fresh buffers */ | ||
| 1693 | rxq->read = rxq->write = 0; | ||
| 1694 | rxq->free_count = 0; | ||
| 1695 | spin_unlock_irqrestore(&rxq->lock, flags); | ||
| 1696 | } | ||
| 1697 | EXPORT_SYMBOL(iwl3945_rx_queue_reset); | ||
| 1698 | |||
| 1664 | /* | 1699 | /* |
| 1665 | * this should be called while priv->lock is locked | 1700 | * this should be called while priv->lock is locked |
| 1666 | */ | 1701 | */ |
| @@ -1685,6 +1720,34 @@ void iwl3945_rx_replenish(void *data) | |||
| 1685 | spin_unlock_irqrestore(&priv->lock, flags); | 1720 | spin_unlock_irqrestore(&priv->lock, flags); |
| 1686 | } | 1721 | } |
| 1687 | 1722 | ||
| 1723 | /* Assumes that the skb field of the buffers in 'pool' is kept accurate. | ||
| 1724 | * If an SKB has been detached, the POOL needs to have its SKB set to NULL | ||
| 1725 | * This free routine walks the list of POOL entries and if SKB is set to | ||
| 1726 | * non NULL it is unmapped and freed | ||
| 1727 | */ | ||
| 1728 | static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq) | ||
| 1729 | { | ||
| 1730 | int i; | ||
| 1731 | for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) { | ||
| 1732 | if (rxq->pool[i].skb != NULL) { | ||
| 1733 | pci_unmap_single(priv->pci_dev, | ||
| 1734 | rxq->pool[i].real_dma_addr, | ||
| 1735 | priv->hw_params.rx_buf_size, | ||
| 1736 | PCI_DMA_FROMDEVICE); | ||
| 1737 | dev_kfree_skb(rxq->pool[i].skb); | ||
| 1738 | } | ||
| 1739 | } | ||
| 1740 | |||
| 1741 | pci_free_consistent(priv->pci_dev, 4 * RX_QUEUE_SIZE, rxq->bd, | ||
| 1742 | rxq->dma_addr); | ||
| 1743 | pci_free_consistent(priv->pci_dev, sizeof(struct iwl_rb_status), | ||
| 1744 | rxq->rb_stts, rxq->rb_stts_dma); | ||
| 1745 | rxq->bd = NULL; | ||
| 1746 | rxq->rb_stts = NULL; | ||
| 1747 | } | ||
| 1748 | EXPORT_SYMBOL(iwl3945_rx_queue_free); | ||
| 1749 | |||
| 1750 | |||
| 1688 | /* Convert linear signal-to-noise ratio into dB */ | 1751 | /* Convert linear signal-to-noise ratio into dB */ |
| 1689 | static u8 ratio2dB[100] = { | 1752 | static u8 ratio2dB[100] = { |
| 1690 | /* 0 1 2 3 4 5 6 7 8 9 */ | 1753 | /* 0 1 2 3 4 5 6 7 8 9 */ |
| @@ -1802,9 +1865,9 @@ static void iwl3945_rx_handle(struct iwl_priv *priv) | |||
| 1802 | 1865 | ||
| 1803 | rxq->queue[i] = NULL; | 1866 | rxq->queue[i] = NULL; |
| 1804 | 1867 | ||
| 1805 | pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->real_dma_addr, | 1868 | pci_unmap_single(priv->pci_dev, rxb->real_dma_addr, |
| 1806 | priv->hw_params.rx_buf_size, | 1869 | priv->hw_params.rx_buf_size, |
| 1807 | PCI_DMA_FROMDEVICE); | 1870 | PCI_DMA_FROMDEVICE); |
| 1808 | pkt = (struct iwl_rx_packet *)rxb->skb->data; | 1871 | pkt = (struct iwl_rx_packet *)rxb->skb->data; |
| 1809 | 1872 | ||
| 1810 | /* Reclaim a command buffer only if this packet is a response | 1873 | /* Reclaim a command buffer only if this packet is a response |
| @@ -1852,9 +1915,6 @@ static void iwl3945_rx_handle(struct iwl_priv *priv) | |||
| 1852 | rxb->skb = NULL; | 1915 | rxb->skb = NULL; |
| 1853 | } | 1916 | } |
| 1854 | 1917 | ||
| 1855 | pci_unmap_single(priv->pci_dev, rxb->real_dma_addr, | ||
| 1856 | priv->hw_params.rx_buf_size, | ||
| 1857 | PCI_DMA_FROMDEVICE); | ||
| 1858 | spin_lock_irqsave(&rxq->lock, flags); | 1918 | spin_lock_irqsave(&rxq->lock, flags); |
| 1859 | list_add_tail(&rxb->list, &priv->rxq.rx_used); | 1919 | list_add_tail(&rxb->list, &priv->rxq.rx_used); |
| 1860 | spin_unlock_irqrestore(&rxq->lock, flags); | 1920 | spin_unlock_irqrestore(&rxq->lock, flags); |
| @@ -4075,7 +4135,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
| 4075 | if (!static_key) { | 4135 | if (!static_key) { |
| 4076 | sta_id = iwl3945_hw_find_station(priv, addr); | 4136 | sta_id = iwl3945_hw_find_station(priv, addr); |
| 4077 | if (sta_id == IWL_INVALID_STATION) { | 4137 | if (sta_id == IWL_INVALID_STATION) { |
| 4078 | IWL_DEBUG_MAC80211(priv, "leave - %pMnot in station map.\n", | 4138 | IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n", |
| 4079 | addr); | 4139 | addr); |
| 4080 | return -EINVAL; | 4140 | return -EINVAL; |
| 4081 | } | 4141 | } |
| @@ -4913,6 +4973,8 @@ static int iwl3945_setup_mac(struct iwl_priv *priv) | |||
| 4913 | 4973 | ||
| 4914 | hw->wiphy->custom_regulatory = true; | 4974 | hw->wiphy->custom_regulatory = true; |
| 4915 | 4975 | ||
| 4976 | hw->wiphy->max_scan_ssids = 1; /* WILL FIX */ | ||
| 4977 | |||
| 4916 | /* Default value; 4 EDCA QOS priorities */ | 4978 | /* Default value; 4 EDCA QOS priorities */ |
| 4917 | hw->queues = 4; | 4979 | hw->queues = 4; |
| 4918 | 4980 | ||
| @@ -5194,12 +5256,12 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) | |||
| 5194 | sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group); | 5256 | sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group); |
| 5195 | 5257 | ||
| 5196 | iwl_rfkill_unregister(priv); | 5258 | iwl_rfkill_unregister(priv); |
| 5197 | cancel_delayed_work(&priv->rfkill_poll); | 5259 | cancel_delayed_work_sync(&priv->rfkill_poll); |
| 5198 | 5260 | ||
| 5199 | iwl3945_dealloc_ucode_pci(priv); | 5261 | iwl3945_dealloc_ucode_pci(priv); |
| 5200 | 5262 | ||
| 5201 | if (priv->rxq.bd) | 5263 | if (priv->rxq.bd) |
| 5202 | iwl_rx_queue_free(priv, &priv->rxq); | 5264 | iwl3945_rx_queue_free(priv, &priv->rxq); |
| 5203 | iwl3945_hw_txq_ctx_free(priv); | 5265 | iwl3945_hw_txq_ctx_free(priv); |
| 5204 | 5266 | ||
| 5205 | iwl3945_unset_hw_params(priv); | 5267 | iwl3945_unset_hw_params(priv); |
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c index 63d7e19ce9b..8e669775cb5 100644 --- a/drivers/net/wireless/libertas/rx.c +++ b/drivers/net/wireless/libertas/rx.c | |||
| @@ -170,6 +170,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb) | |||
| 170 | lbs_deb_rx("rx err: frame received with bad length\n"); | 170 | lbs_deb_rx("rx err: frame received with bad length\n"); |
| 171 | dev->stats.rx_length_errors++; | 171 | dev->stats.rx_length_errors++; |
| 172 | ret = 0; | 172 | ret = 0; |
| 173 | dev_kfree_skb(skb); | ||
| 173 | goto done; | 174 | goto done; |
| 174 | } | 175 | } |
| 175 | 176 | ||
| @@ -181,6 +182,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb) | |||
| 181 | lbs_pr_alert("rxpd not ok\n"); | 182 | lbs_pr_alert("rxpd not ok\n"); |
| 182 | dev->stats.rx_errors++; | 183 | dev->stats.rx_errors++; |
| 183 | ret = 0; | 184 | ret = 0; |
| 185 | dev_kfree_skb(skb); | ||
| 184 | goto done; | 186 | goto done; |
| 185 | } | 187 | } |
| 186 | 188 | ||
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 57a0268d1ba..a9a970469c2 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
| @@ -893,8 +893,7 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index) | |||
| 893 | rx_desc->next_rx_desc_phys_addr = | 893 | rx_desc->next_rx_desc_phys_addr = |
| 894 | cpu_to_le32(rxq->rx_desc_dma | 894 | cpu_to_le32(rxq->rx_desc_dma |
| 895 | + nexti * sizeof(*rx_desc)); | 895 | + nexti * sizeof(*rx_desc)); |
| 896 | rx_desc->rx_ctrl = | 896 | rx_desc->rx_ctrl = MWL8K_RX_CTRL_OWNED_BY_HOST; |
| 897 | cpu_to_le32(MWL8K_RX_CTRL_OWNED_BY_HOST); | ||
| 898 | } | 897 | } |
| 899 | 898 | ||
| 900 | return 0; | 899 | return 0; |
| @@ -3720,12 +3719,12 @@ err_free_reg: | |||
| 3720 | return rc; | 3719 | return rc; |
| 3721 | } | 3720 | } |
| 3722 | 3721 | ||
| 3723 | static void __devexit mwl8k_remove(struct pci_dev *pdev) | 3722 | static void __devexit mwl8k_shutdown(struct pci_dev *pdev) |
| 3724 | { | 3723 | { |
| 3725 | printk(KERN_ERR "===>%s(%u)\n", __func__, __LINE__); | 3724 | printk(KERN_ERR "===>%s(%u)\n", __func__, __LINE__); |
| 3726 | } | 3725 | } |
| 3727 | 3726 | ||
| 3728 | static void __devexit mwl8k_shutdown(struct pci_dev *pdev) | 3727 | static void __devexit mwl8k_remove(struct pci_dev *pdev) |
| 3729 | { | 3728 | { |
| 3730 | struct ieee80211_hw *hw = pci_get_drvdata(pdev); | 3729 | struct ieee80211_hw *hw = pci_get_drvdata(pdev); |
| 3731 | struct mwl8k_priv *priv; | 3730 | struct mwl8k_priv *priv; |
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c index 081428d9409..632fac86a30 100644 --- a/drivers/net/wireless/orinoco/hw.c +++ b/drivers/net/wireless/orinoco/hw.c | |||
| @@ -372,15 +372,13 @@ int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx, | |||
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | /* Wait upto 100ms for tx queue to empty */ | 374 | /* Wait upto 100ms for tx queue to empty */ |
| 375 | k = 100; | 375 | for (k = 100; k > 0; k--) { |
| 376 | do { | ||
| 377 | k--; | ||
| 378 | udelay(1000); | 376 | udelay(1000); |
| 379 | ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY, | 377 | ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY, |
| 380 | &xmitting); | 378 | &xmitting); |
| 381 | if (ret) | 379 | if (ret || !xmitting) |
| 382 | break; | 380 | break; |
| 383 | } while ((k > 0) && xmitting); | 381 | } |
| 384 | 382 | ||
| 385 | if (k == 0) | 383 | if (k == 0) |
| 386 | ret = -ETIMEDOUT; | 384 | ret = -ETIMEDOUT; |
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h index 2dda5fe418b..ecf8b6ed5a4 100644 --- a/drivers/net/wireless/p54/p54.h +++ b/drivers/net/wireless/p54/p54.h | |||
| @@ -14,9 +14,9 @@ | |||
| 14 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_MAC80211_LEDS | 17 | #ifdef CONFIG_P54_LEDS |
| 18 | #include <linux/leds.h> | 18 | #include <linux/leds.h> |
| 19 | #endif /* CONFIG_MAC80211_LEDS */ | 19 | #endif /* CONFIG_P54_LEDS */ |
| 20 | 20 | ||
| 21 | enum p54_control_frame_types { | 21 | enum p54_control_frame_types { |
| 22 | P54_CONTROL_TYPE_SETUP = 0, | 22 | P54_CONTROL_TYPE_SETUP = 0, |
| @@ -116,7 +116,7 @@ enum fw_state { | |||
| 116 | FW_STATE_RESETTING, | 116 | FW_STATE_RESETTING, |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | #ifdef CONFIG_MAC80211_LEDS | 119 | #ifdef CONFIG_P54_LEDS |
| 120 | 120 | ||
| 121 | #define P54_LED_MAX_NAME_LEN 31 | 121 | #define P54_LED_MAX_NAME_LEN 31 |
| 122 | 122 | ||
| @@ -129,7 +129,7 @@ struct p54_led_dev { | |||
| 129 | unsigned int registered; | 129 | unsigned int registered; |
| 130 | }; | 130 | }; |
| 131 | 131 | ||
| 132 | #endif /* CONFIG_MAC80211_LEDS */ | 132 | #endif /* CONFIG_P54_LEDS */ |
| 133 | 133 | ||
| 134 | struct p54_common { | 134 | struct p54_common { |
| 135 | struct ieee80211_hw *hw; | 135 | struct ieee80211_hw *hw; |
| @@ -177,10 +177,10 @@ struct p54_common { | |||
| 177 | u8 privacy_caps; | 177 | u8 privacy_caps; |
| 178 | u8 rx_keycache_size; | 178 | u8 rx_keycache_size; |
| 179 | /* LED management */ | 179 | /* LED management */ |
| 180 | #ifdef CONFIG_MAC80211_LEDS | 180 | #ifdef CONFIG_P54_LEDS |
| 181 | struct p54_led_dev assoc_led; | 181 | struct p54_led_dev assoc_led; |
| 182 | struct p54_led_dev tx_led; | 182 | struct p54_led_dev tx_led; |
| 183 | #endif /* CONFIG_MAC80211_LEDS */ | 183 | #endif /* CONFIG_P54_LEDS */ |
| 184 | u16 softled_state; /* bit field of glowing LEDs */ | 184 | u16 softled_state; /* bit field of glowing LEDs */ |
| 185 | }; | 185 | }; |
| 186 | 186 | ||
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 0c1b0577d4e..c8f0232ee5e 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c | |||
| @@ -2543,8 +2543,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len) | |||
| 2543 | priv->basic_rate_mask = 0x15f; | 2543 | priv->basic_rate_mask = 0x15f; |
| 2544 | skb_queue_head_init(&priv->tx_queue); | 2544 | skb_queue_head_init(&priv->tx_queue); |
| 2545 | dev->flags = IEEE80211_HW_RX_INCLUDES_FCS | | 2545 | dev->flags = IEEE80211_HW_RX_INCLUDES_FCS | |
| 2546 | IEEE80211_HW_SUPPORTS_PS | | ||
| 2547 | IEEE80211_HW_PS_NULLFUNC_STACK | | ||
| 2548 | IEEE80211_HW_SIGNAL_DBM | | 2546 | IEEE80211_HW_SIGNAL_DBM | |
| 2549 | IEEE80211_HW_NOISE_DBM; | 2547 | IEEE80211_HW_NOISE_DBM; |
| 2550 | 2548 | ||
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index 2b222aaa6f0..d1fe577de3d 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c | |||
| @@ -457,9 +457,10 @@ static int p54spi_wq_tx(struct p54s_priv *priv) | |||
| 457 | struct ieee80211_tx_info *info; | 457 | struct ieee80211_tx_info *info; |
| 458 | struct p54_tx_info *minfo; | 458 | struct p54_tx_info *minfo; |
| 459 | struct p54s_tx_info *dinfo; | 459 | struct p54s_tx_info *dinfo; |
| 460 | unsigned long flags; | ||
| 460 | int ret = 0; | 461 | int ret = 0; |
| 461 | 462 | ||
| 462 | spin_lock_bh(&priv->tx_lock); | 463 | spin_lock_irqsave(&priv->tx_lock, flags); |
| 463 | 464 | ||
| 464 | while (!list_empty(&priv->tx_pending)) { | 465 | while (!list_empty(&priv->tx_pending)) { |
| 465 | entry = list_entry(priv->tx_pending.next, | 466 | entry = list_entry(priv->tx_pending.next, |
| @@ -467,7 +468,7 @@ static int p54spi_wq_tx(struct p54s_priv *priv) | |||
| 467 | 468 | ||
| 468 | list_del_init(&entry->tx_list); | 469 | list_del_init(&entry->tx_list); |
| 469 | 470 | ||
| 470 | spin_unlock_bh(&priv->tx_lock); | 471 | spin_unlock_irqrestore(&priv->tx_lock, flags); |
| 471 | 472 | ||
| 472 | dinfo = container_of((void *) entry, struct p54s_tx_info, | 473 | dinfo = container_of((void *) entry, struct p54s_tx_info, |
| 473 | tx_list); | 474 | tx_list); |
| @@ -479,16 +480,14 @@ static int p54spi_wq_tx(struct p54s_priv *priv) | |||
| 479 | 480 | ||
| 480 | ret = p54spi_tx_frame(priv, skb); | 481 | ret = p54spi_tx_frame(priv, skb); |
| 481 | 482 | ||
| 482 | spin_lock_bh(&priv->tx_lock); | ||
| 483 | |||
| 484 | if (ret < 0) { | 483 | if (ret < 0) { |
| 485 | p54_free_skb(priv->hw, skb); | 484 | p54_free_skb(priv->hw, skb); |
| 486 | goto out; | 485 | return ret; |
| 487 | } | 486 | } |
| 488 | } | ||
| 489 | 487 | ||
| 490 | out: | 488 | spin_lock_irqsave(&priv->tx_lock, flags); |
| 491 | spin_unlock_bh(&priv->tx_lock); | 489 | } |
| 490 | spin_unlock_irqrestore(&priv->tx_lock, flags); | ||
| 492 | return ret; | 491 | return ret; |
| 493 | } | 492 | } |
| 494 | 493 | ||
| @@ -498,12 +497,13 @@ static void p54spi_op_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
| 498 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 497 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
| 499 | struct p54_tx_info *mi = (struct p54_tx_info *) info->rate_driver_data; | 498 | struct p54_tx_info *mi = (struct p54_tx_info *) info->rate_driver_data; |
| 500 | struct p54s_tx_info *di = (struct p54s_tx_info *) mi->data; | 499 | struct p54s_tx_info *di = (struct p54s_tx_info *) mi->data; |
| 500 | unsigned long flags; | ||
| 501 | 501 | ||
| 502 | BUILD_BUG_ON(sizeof(*di) > sizeof((mi->data))); | 502 | BUILD_BUG_ON(sizeof(*di) > sizeof((mi->data))); |
| 503 | 503 | ||
| 504 | spin_lock_bh(&priv->tx_lock); | 504 | spin_lock_irqsave(&priv->tx_lock, flags); |
| 505 | list_add_tail(&di->tx_list, &priv->tx_pending); | 505 | list_add_tail(&di->tx_list, &priv->tx_pending); |
| 506 | spin_unlock_bh(&priv->tx_lock); | 506 | spin_unlock_irqrestore(&priv->tx_lock, flags); |
| 507 | 507 | ||
| 508 | queue_work(priv->hw->workqueue, &priv->work); | 508 | queue_work(priv->hw->workqueue, &priv->work); |
| 509 | } | 509 | } |
| @@ -604,6 +604,7 @@ out: | |||
| 604 | static void p54spi_op_stop(struct ieee80211_hw *dev) | 604 | static void p54spi_op_stop(struct ieee80211_hw *dev) |
| 605 | { | 605 | { |
| 606 | struct p54s_priv *priv = dev->priv; | 606 | struct p54s_priv *priv = dev->priv; |
| 607 | unsigned long flags; | ||
| 607 | 608 | ||
| 608 | if (mutex_lock_interruptible(&priv->mutex)) { | 609 | if (mutex_lock_interruptible(&priv->mutex)) { |
| 609 | /* FIXME: how to handle this error? */ | 610 | /* FIXME: how to handle this error? */ |
| @@ -615,9 +616,9 @@ static void p54spi_op_stop(struct ieee80211_hw *dev) | |||
| 615 | cancel_work_sync(&priv->work); | 616 | cancel_work_sync(&priv->work); |
| 616 | 617 | ||
| 617 | p54spi_power_off(priv); | 618 | p54spi_power_off(priv); |
| 618 | spin_lock_bh(&priv->tx_lock); | 619 | spin_lock_irqsave(&priv->tx_lock, flags); |
| 619 | INIT_LIST_HEAD(&priv->tx_pending); | 620 | INIT_LIST_HEAD(&priv->tx_pending); |
| 620 | spin_unlock_bh(&priv->tx_lock); | 621 | spin_unlock_irqrestore(&priv->tx_lock, flags); |
| 621 | 622 | ||
| 622 | priv->fw_state = FW_STATE_OFF; | 623 | priv->fw_state = FW_STATE_OFF; |
| 623 | mutex_unlock(&priv->mutex); | 624 | mutex_unlock(&priv->mutex); |
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index da6640afc83..6cc6cbc9234 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
| @@ -71,6 +71,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { | |||
| 71 | {USB_DEVICE(0x1260, 0xee22)}, /* SMC 2862W-G version 2 */ | 71 | {USB_DEVICE(0x1260, 0xee22)}, /* SMC 2862W-G version 2 */ |
| 72 | {USB_DEVICE(0x13b1, 0x000a)}, /* Linksys WUSB54G ver 2 */ | 72 | {USB_DEVICE(0x13b1, 0x000a)}, /* Linksys WUSB54G ver 2 */ |
| 73 | {USB_DEVICE(0x13B1, 0x000C)}, /* Linksys WUSB54AG */ | 73 | {USB_DEVICE(0x13B1, 0x000C)}, /* Linksys WUSB54AG */ |
| 74 | {USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */ | ||
| 74 | {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ | 75 | {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ |
| 75 | {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ | 76 | {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ |
| 76 | {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ | 77 | {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 05f94e21b42..5752aaae906 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
| @@ -646,10 +646,8 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) | |||
| 646 | * Register HW. | 646 | * Register HW. |
| 647 | */ | 647 | */ |
| 648 | status = ieee80211_register_hw(rt2x00dev->hw); | 648 | status = ieee80211_register_hw(rt2x00dev->hw); |
| 649 | if (status) { | 649 | if (status) |
| 650 | rt2x00lib_remove_hw(rt2x00dev); | ||
| 651 | return status; | 650 | return status; |
| 652 | } | ||
| 653 | 651 | ||
| 654 | set_bit(DEVICE_STATE_REGISTERED_HW, &rt2x00dev->flags); | 652 | set_bit(DEVICE_STATE_REGISTERED_HW, &rt2x00dev->flags); |
| 655 | 653 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 43fa0f84900..9730b4f8fd2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
| @@ -369,8 +369,6 @@ int rt2x00pci_suspend(struct pci_dev *pci_dev, pm_message_t state) | |||
| 369 | if (retval) | 369 | if (retval) |
| 370 | return retval; | 370 | return retval; |
| 371 | 371 | ||
| 372 | rt2x00pci_free_reg(rt2x00dev); | ||
| 373 | |||
| 374 | pci_save_state(pci_dev); | 372 | pci_save_state(pci_dev); |
| 375 | pci_disable_device(pci_dev); | 373 | pci_disable_device(pci_dev); |
| 376 | return pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state)); | 374 | return pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state)); |
| @@ -381,7 +379,6 @@ int rt2x00pci_resume(struct pci_dev *pci_dev) | |||
| 381 | { | 379 | { |
| 382 | struct ieee80211_hw *hw = pci_get_drvdata(pci_dev); | 380 | struct ieee80211_hw *hw = pci_get_drvdata(pci_dev); |
| 383 | struct rt2x00_dev *rt2x00dev = hw->priv; | 381 | struct rt2x00_dev *rt2x00dev = hw->priv; |
| 384 | int retval; | ||
| 385 | 382 | ||
| 386 | if (pci_set_power_state(pci_dev, PCI_D0) || | 383 | if (pci_set_power_state(pci_dev, PCI_D0) || |
| 387 | pci_enable_device(pci_dev) || | 384 | pci_enable_device(pci_dev) || |
| @@ -390,20 +387,7 @@ int rt2x00pci_resume(struct pci_dev *pci_dev) | |||
| 390 | return -EIO; | 387 | return -EIO; |
| 391 | } | 388 | } |
| 392 | 389 | ||
| 393 | retval = rt2x00pci_alloc_reg(rt2x00dev); | 390 | return rt2x00lib_resume(rt2x00dev); |
| 394 | if (retval) | ||
| 395 | return retval; | ||
| 396 | |||
| 397 | retval = rt2x00lib_resume(rt2x00dev); | ||
| 398 | if (retval) | ||
| 399 | goto exit_free_reg; | ||
| 400 | |||
| 401 | return 0; | ||
| 402 | |||
| 403 | exit_free_reg: | ||
| 404 | rt2x00pci_free_reg(rt2x00dev); | ||
| 405 | |||
| 406 | return retval; | ||
| 407 | } | 391 | } |
| 408 | EXPORT_SYMBOL_GPL(rt2x00pci_resume); | 392 | EXPORT_SYMBOL_GPL(rt2x00pci_resume); |
| 409 | #endif /* CONFIG_PM */ | 393 | #endif /* CONFIG_PM */ |
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 7d50ca82375..501544882c2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
| @@ -702,8 +702,6 @@ int rt2x00usb_suspend(struct usb_interface *usb_intf, pm_message_t state) | |||
| 702 | if (retval) | 702 | if (retval) |
| 703 | return retval; | 703 | return retval; |
| 704 | 704 | ||
| 705 | rt2x00usb_free_reg(rt2x00dev); | ||
| 706 | |||
| 707 | /* | 705 | /* |
| 708 | * Decrease usbdev refcount. | 706 | * Decrease usbdev refcount. |
| 709 | */ | 707 | */ |
| @@ -717,24 +715,10 @@ int rt2x00usb_resume(struct usb_interface *usb_intf) | |||
| 717 | { | 715 | { |
| 718 | struct ieee80211_hw *hw = usb_get_intfdata(usb_intf); | 716 | struct ieee80211_hw *hw = usb_get_intfdata(usb_intf); |
| 719 | struct rt2x00_dev *rt2x00dev = hw->priv; | 717 | struct rt2x00_dev *rt2x00dev = hw->priv; |
| 720 | int retval; | ||
| 721 | 718 | ||
| 722 | usb_get_dev(interface_to_usbdev(usb_intf)); | 719 | usb_get_dev(interface_to_usbdev(usb_intf)); |
| 723 | 720 | ||
| 724 | retval = rt2x00usb_alloc_reg(rt2x00dev); | 721 | return rt2x00lib_resume(rt2x00dev); |
| 725 | if (retval) | ||
| 726 | return retval; | ||
| 727 | |||
| 728 | retval = rt2x00lib_resume(rt2x00dev); | ||
| 729 | if (retval) | ||
| 730 | goto exit_free_reg; | ||
| 731 | |||
| 732 | return 0; | ||
| 733 | |||
| 734 | exit_free_reg: | ||
| 735 | rt2x00usb_free_reg(rt2x00dev); | ||
| 736 | |||
| 737 | return retval; | ||
| 738 | } | 722 | } |
| 739 | EXPORT_SYMBOL_GPL(rt2x00usb_resume); | 723 | EXPORT_SYMBOL_GPL(rt2x00usb_resume); |
| 740 | #endif /* CONFIG_PM */ | 724 | #endif /* CONFIG_PM */ |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 420fff42c0d..853b2b279b6 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2369,6 +2369,8 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2369 | /* Buffalo */ | 2369 | /* Buffalo */ |
| 2370 | { USB_DEVICE(0x0411, 0x00d8), USB_DEVICE_DATA(&rt73usb_ops) }, | 2370 | { USB_DEVICE(0x0411, 0x00d8), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2371 | { USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) }, | 2371 | { USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2372 | { USB_DEVICE(0x0411, 0x0116), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2373 | { USB_DEVICE(0x0411, 0x0119), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2372 | /* CNet */ | 2374 | /* CNet */ |
| 2373 | { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) }, | 2375 | { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2374 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, | 2376 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, |
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index 1cd02f5a23a..bc43f78f6f0 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c | |||
| @@ -255,6 +255,9 @@ static int __init sharpsl_pcmcia_init(void) | |||
| 255 | { | 255 | { |
| 256 | int ret; | 256 | int ret; |
| 257 | 257 | ||
| 258 | if (!platform_scoop_config) | ||
| 259 | return -ENODEV; | ||
| 260 | |||
| 258 | sharpsl_pcmcia_ops.nr = platform_scoop_config->num_devs; | 261 | sharpsl_pcmcia_ops.nr = platform_scoop_config->num_devs; |
| 259 | sharpsl_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); | 262 | sharpsl_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); |
| 260 | 263 | ||
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index d3c92d777bd..552958545f9 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
| @@ -317,7 +317,8 @@ static void sony_laptop_report_input_event(u8 event) | |||
| 317 | struct input_dev *key_dev = sony_laptop_input.key_dev; | 317 | struct input_dev *key_dev = sony_laptop_input.key_dev; |
| 318 | struct sony_laptop_keypress kp = { NULL }; | 318 | struct sony_laptop_keypress kp = { NULL }; |
| 319 | 319 | ||
| 320 | if (event == SONYPI_EVENT_FNKEY_RELEASED) { | 320 | if (event == SONYPI_EVENT_FNKEY_RELEASED || |
| 321 | event == SONYPI_EVENT_ANYBUTTON_RELEASED) { | ||
| 321 | /* Nothing, not all VAIOs generate this event */ | 322 | /* Nothing, not all VAIOs generate this event */ |
| 322 | return; | 323 | return; |
| 323 | } | 324 | } |
| @@ -905,7 +906,6 @@ static struct sony_nc_event sony_127_events[] = { | |||
| 905 | { 0x05, SONYPI_EVENT_ANYBUTTON_RELEASED }, | 906 | { 0x05, SONYPI_EVENT_ANYBUTTON_RELEASED }, |
| 906 | { 0x86, SONYPI_EVENT_PKEY_P5 }, | 907 | { 0x86, SONYPI_EVENT_PKEY_P5 }, |
| 907 | { 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED }, | 908 | { 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED }, |
| 908 | { 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED }, | ||
| 909 | { 0x87, SONYPI_EVENT_SETTINGKEY_PRESSED }, | 909 | { 0x87, SONYPI_EVENT_SETTINGKEY_PRESSED }, |
| 910 | { 0x07, SONYPI_EVENT_ANYBUTTON_RELEASED }, | 910 | { 0x07, SONYPI_EVENT_ANYBUTTON_RELEASED }, |
| 911 | { 0, 0 }, | 911 | { 0, 0 }, |
| @@ -1004,6 +1004,7 @@ static int sony_nc_function_setup(struct acpi_device *device) | |||
| 1004 | sony_call_snc_handle(0x0100, 0, &result); | 1004 | sony_call_snc_handle(0x0100, 0, &result); |
| 1005 | sony_call_snc_handle(0x0101, 0, &result); | 1005 | sony_call_snc_handle(0x0101, 0, &result); |
| 1006 | sony_call_snc_handle(0x0102, 0x100, &result); | 1006 | sony_call_snc_handle(0x0102, 0x100, &result); |
| 1007 | sony_call_snc_handle(0x0127, 0, &result); | ||
| 1007 | 1008 | ||
| 1008 | return 0; | 1009 | return 0; |
| 1009 | } | 1010 | } |
| @@ -1040,7 +1041,7 @@ static int sony_nc_resume(struct acpi_device *device) | |||
| 1040 | 1041 | ||
| 1041 | /* set the last requested brightness level */ | 1042 | /* set the last requested brightness level */ |
| 1042 | if (sony_backlight_device && | 1043 | if (sony_backlight_device && |
| 1043 | !sony_backlight_update_status(sony_backlight_device)) | 1044 | sony_backlight_update_status(sony_backlight_device) < 0) |
| 1044 | printk(KERN_WARNING DRV_PFX "unable to restore brightness level\n"); | 1045 | printk(KERN_WARNING DRV_PFX "unable to restore brightness level\n"); |
| 1045 | 1046 | ||
| 1046 | return 0; | 1047 | return 0; |
| @@ -1102,8 +1103,11 @@ static int sony_nc_setup_wifi_rfkill(struct acpi_device *device) | |||
| 1102 | err = rfkill_register(sony_wifi_rfkill); | 1103 | err = rfkill_register(sony_wifi_rfkill); |
| 1103 | if (err) | 1104 | if (err) |
| 1104 | rfkill_free(sony_wifi_rfkill); | 1105 | rfkill_free(sony_wifi_rfkill); |
| 1105 | else | 1106 | else { |
| 1106 | sony_rfkill_devices[SONY_WIFI] = sony_wifi_rfkill; | 1107 | sony_rfkill_devices[SONY_WIFI] = sony_wifi_rfkill; |
| 1108 | sony_nc_rfkill_set(sony_wifi_rfkill->data, | ||
| 1109 | RFKILL_STATE_UNBLOCKED); | ||
| 1110 | } | ||
| 1107 | return err; | 1111 | return err; |
| 1108 | } | 1112 | } |
| 1109 | 1113 | ||
| @@ -1124,8 +1128,11 @@ static int sony_nc_setup_bluetooth_rfkill(struct acpi_device *device) | |||
| 1124 | err = rfkill_register(sony_bluetooth_rfkill); | 1128 | err = rfkill_register(sony_bluetooth_rfkill); |
| 1125 | if (err) | 1129 | if (err) |
| 1126 | rfkill_free(sony_bluetooth_rfkill); | 1130 | rfkill_free(sony_bluetooth_rfkill); |
| 1127 | else | 1131 | else { |
| 1128 | sony_rfkill_devices[SONY_BLUETOOTH] = sony_bluetooth_rfkill; | 1132 | sony_rfkill_devices[SONY_BLUETOOTH] = sony_bluetooth_rfkill; |
| 1133 | sony_nc_rfkill_set(sony_bluetooth_rfkill->data, | ||
| 1134 | RFKILL_STATE_UNBLOCKED); | ||
| 1135 | } | ||
| 1129 | return err; | 1136 | return err; |
| 1130 | } | 1137 | } |
| 1131 | 1138 | ||
| @@ -1145,8 +1152,11 @@ static int sony_nc_setup_wwan_rfkill(struct acpi_device *device) | |||
| 1145 | err = rfkill_register(sony_wwan_rfkill); | 1152 | err = rfkill_register(sony_wwan_rfkill); |
| 1146 | if (err) | 1153 | if (err) |
| 1147 | rfkill_free(sony_wwan_rfkill); | 1154 | rfkill_free(sony_wwan_rfkill); |
| 1148 | else | 1155 | else { |
| 1149 | sony_rfkill_devices[SONY_WWAN] = sony_wwan_rfkill; | 1156 | sony_rfkill_devices[SONY_WWAN] = sony_wwan_rfkill; |
| 1157 | sony_nc_rfkill_set(sony_wwan_rfkill->data, | ||
| 1158 | RFKILL_STATE_UNBLOCKED); | ||
| 1159 | } | ||
| 1150 | return err; | 1160 | return err; |
| 1151 | } | 1161 | } |
| 1152 | 1162 | ||
| @@ -1166,8 +1176,11 @@ static int sony_nc_setup_wimax_rfkill(struct acpi_device *device) | |||
| 1166 | err = rfkill_register(sony_wimax_rfkill); | 1176 | err = rfkill_register(sony_wimax_rfkill); |
| 1167 | if (err) | 1177 | if (err) |
| 1168 | rfkill_free(sony_wimax_rfkill); | 1178 | rfkill_free(sony_wimax_rfkill); |
| 1169 | else | 1179 | else { |
| 1170 | sony_rfkill_devices[SONY_WIMAX] = sony_wimax_rfkill; | 1180 | sony_rfkill_devices[SONY_WIMAX] = sony_wimax_rfkill; |
| 1181 | sony_nc_rfkill_set(sony_wimax_rfkill->data, | ||
| 1182 | RFKILL_STATE_UNBLOCKED); | ||
| 1183 | } | ||
| 1171 | return err; | 1184 | return err; |
| 1172 | } | 1185 | } |
| 1173 | 1186 | ||
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index a40b075743d..912be65b626 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * 02110-1301, USA. | 21 | * 02110-1301, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #define TPACPI_VERSION "0.22" | 24 | #define TPACPI_VERSION "0.23" |
| 25 | #define TPACPI_SYSFS_VERSION 0x020300 | 25 | #define TPACPI_SYSFS_VERSION 0x020300 |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| @@ -303,11 +303,17 @@ static u32 dbg_level; | |||
| 303 | 303 | ||
| 304 | static struct workqueue_struct *tpacpi_wq; | 304 | static struct workqueue_struct *tpacpi_wq; |
| 305 | 305 | ||
| 306 | enum led_status_t { | ||
| 307 | TPACPI_LED_OFF = 0, | ||
| 308 | TPACPI_LED_ON, | ||
| 309 | TPACPI_LED_BLINK, | ||
| 310 | }; | ||
| 311 | |||
| 306 | /* Special LED class that can defer work */ | 312 | /* Special LED class that can defer work */ |
| 307 | struct tpacpi_led_classdev { | 313 | struct tpacpi_led_classdev { |
| 308 | struct led_classdev led_classdev; | 314 | struct led_classdev led_classdev; |
| 309 | struct work_struct work; | 315 | struct work_struct work; |
| 310 | enum led_brightness new_brightness; | 316 | enum led_status_t new_state; |
| 311 | unsigned int led; | 317 | unsigned int led; |
| 312 | }; | 318 | }; |
| 313 | 319 | ||
| @@ -2946,12 +2952,18 @@ static int hotkey_read(char *p) | |||
| 2946 | return len; | 2952 | return len; |
| 2947 | } | 2953 | } |
| 2948 | 2954 | ||
| 2949 | static void hotkey_enabledisable_warn(void) | 2955 | static void hotkey_enabledisable_warn(bool enable) |
| 2950 | { | 2956 | { |
| 2951 | tpacpi_log_usertask("procfs hotkey enable/disable"); | 2957 | tpacpi_log_usertask("procfs hotkey enable/disable"); |
| 2952 | WARN(1, TPACPI_WARN | 2958 | if (!WARN((tpacpi_lifecycle == TPACPI_LIFE_RUNNING || !enable), |
| 2953 | "hotkey enable/disable functionality has been " | 2959 | TPACPI_WARN |
| 2954 | "removed from the driver. Hotkeys are always enabled.\n"); | 2960 | "hotkey enable/disable functionality has been " |
| 2961 | "removed from the driver. Hotkeys are always " | ||
| 2962 | "enabled\n")) | ||
| 2963 | printk(TPACPI_ERR | ||
| 2964 | "Please remove the hotkey=enable module " | ||
| 2965 | "parameter, it is deprecated. Hotkeys are always " | ||
| 2966 | "enabled\n"); | ||
| 2955 | } | 2967 | } |
| 2956 | 2968 | ||
| 2957 | static int hotkey_write(char *buf) | 2969 | static int hotkey_write(char *buf) |
| @@ -2971,9 +2983,9 @@ static int hotkey_write(char *buf) | |||
| 2971 | res = 0; | 2983 | res = 0; |
| 2972 | while ((cmd = next_cmd(&buf))) { | 2984 | while ((cmd = next_cmd(&buf))) { |
| 2973 | if (strlencmp(cmd, "enable") == 0) { | 2985 | if (strlencmp(cmd, "enable") == 0) { |
| 2974 | hotkey_enabledisable_warn(); | 2986 | hotkey_enabledisable_warn(1); |
| 2975 | } else if (strlencmp(cmd, "disable") == 0) { | 2987 | } else if (strlencmp(cmd, "disable") == 0) { |
| 2976 | hotkey_enabledisable_warn(); | 2988 | hotkey_enabledisable_warn(0); |
| 2977 | res = -EPERM; | 2989 | res = -EPERM; |
| 2978 | } else if (strlencmp(cmd, "reset") == 0) { | 2990 | } else if (strlencmp(cmd, "reset") == 0) { |
| 2979 | mask = hotkey_orig_mask; | 2991 | mask = hotkey_orig_mask; |
| @@ -4207,7 +4219,7 @@ static void light_set_status_worker(struct work_struct *work) | |||
| 4207 | container_of(work, struct tpacpi_led_classdev, work); | 4219 | container_of(work, struct tpacpi_led_classdev, work); |
| 4208 | 4220 | ||
| 4209 | if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING)) | 4221 | if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING)) |
| 4210 | light_set_status((data->new_brightness != LED_OFF)); | 4222 | light_set_status((data->new_state != TPACPI_LED_OFF)); |
| 4211 | } | 4223 | } |
| 4212 | 4224 | ||
| 4213 | static void light_sysfs_set(struct led_classdev *led_cdev, | 4225 | static void light_sysfs_set(struct led_classdev *led_cdev, |
| @@ -4217,7 +4229,8 @@ static void light_sysfs_set(struct led_classdev *led_cdev, | |||
| 4217 | container_of(led_cdev, | 4229 | container_of(led_cdev, |
| 4218 | struct tpacpi_led_classdev, | 4230 | struct tpacpi_led_classdev, |
| 4219 | led_classdev); | 4231 | led_classdev); |
| 4220 | data->new_brightness = brightness; | 4232 | data->new_state = (brightness != LED_OFF) ? |
| 4233 | TPACPI_LED_ON : TPACPI_LED_OFF; | ||
| 4221 | queue_work(tpacpi_wq, &data->work); | 4234 | queue_work(tpacpi_wq, &data->work); |
| 4222 | } | 4235 | } |
| 4223 | 4236 | ||
| @@ -4724,12 +4737,6 @@ enum { /* For TPACPI_LED_OLD */ | |||
| 4724 | TPACPI_LED_EC_HLMS = 0x0e, /* EC reg to select led to command */ | 4737 | TPACPI_LED_EC_HLMS = 0x0e, /* EC reg to select led to command */ |
| 4725 | }; | 4738 | }; |
| 4726 | 4739 | ||
| 4727 | enum led_status_t { | ||
| 4728 | TPACPI_LED_OFF = 0, | ||
| 4729 | TPACPI_LED_ON, | ||
| 4730 | TPACPI_LED_BLINK, | ||
| 4731 | }; | ||
| 4732 | |||
| 4733 | static enum led_access_mode led_supported; | 4740 | static enum led_access_mode led_supported; |
| 4734 | 4741 | ||
| 4735 | TPACPI_HANDLE(led, ec, "SLED", /* 570 */ | 4742 | TPACPI_HANDLE(led, ec, "SLED", /* 570 */ |
| @@ -4841,23 +4848,13 @@ static int led_set_status(const unsigned int led, | |||
| 4841 | return rc; | 4848 | return rc; |
| 4842 | } | 4849 | } |
| 4843 | 4850 | ||
| 4844 | static void led_sysfs_set_status(unsigned int led, | ||
| 4845 | enum led_brightness brightness) | ||
| 4846 | { | ||
| 4847 | led_set_status(led, | ||
| 4848 | (brightness == LED_OFF) ? | ||
| 4849 | TPACPI_LED_OFF : | ||
| 4850 | (tpacpi_led_state_cache[led] == TPACPI_LED_BLINK) ? | ||
| 4851 | TPACPI_LED_BLINK : TPACPI_LED_ON); | ||
| 4852 | } | ||
| 4853 | |||
| 4854 | static void led_set_status_worker(struct work_struct *work) | 4851 | static void led_set_status_worker(struct work_struct *work) |
| 4855 | { | 4852 | { |
| 4856 | struct tpacpi_led_classdev *data = | 4853 | struct tpacpi_led_classdev *data = |
| 4857 | container_of(work, struct tpacpi_led_classdev, work); | 4854 | container_of(work, struct tpacpi_led_classdev, work); |
| 4858 | 4855 | ||
| 4859 | if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING)) | 4856 | if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING)) |
| 4860 | led_sysfs_set_status(data->led, data->new_brightness); | 4857 | led_set_status(data->led, data->new_state); |
| 4861 | } | 4858 | } |
| 4862 | 4859 | ||
| 4863 | static void led_sysfs_set(struct led_classdev *led_cdev, | 4860 | static void led_sysfs_set(struct led_classdev *led_cdev, |
| @@ -4866,7 +4863,13 @@ static void led_sysfs_set(struct led_classdev *led_cdev, | |||
| 4866 | struct tpacpi_led_classdev *data = container_of(led_cdev, | 4863 | struct tpacpi_led_classdev *data = container_of(led_cdev, |
| 4867 | struct tpacpi_led_classdev, led_classdev); | 4864 | struct tpacpi_led_classdev, led_classdev); |
| 4868 | 4865 | ||
| 4869 | data->new_brightness = brightness; | 4866 | if (brightness == LED_OFF) |
| 4867 | data->new_state = TPACPI_LED_OFF; | ||
| 4868 | else if (tpacpi_led_state_cache[data->led] != TPACPI_LED_BLINK) | ||
| 4869 | data->new_state = TPACPI_LED_ON; | ||
| 4870 | else | ||
| 4871 | data->new_state = TPACPI_LED_BLINK; | ||
| 4872 | |||
| 4870 | queue_work(tpacpi_wq, &data->work); | 4873 | queue_work(tpacpi_wq, &data->work); |
| 4871 | } | 4874 | } |
| 4872 | 4875 | ||
| @@ -4884,7 +4887,7 @@ static int led_sysfs_blink_set(struct led_classdev *led_cdev, | |||
| 4884 | } else if ((*delay_on != 500) || (*delay_off != 500)) | 4887 | } else if ((*delay_on != 500) || (*delay_off != 500)) |
| 4885 | return -EINVAL; | 4888 | return -EINVAL; |
| 4886 | 4889 | ||
| 4887 | data->new_brightness = TPACPI_LED_BLINK; | 4890 | data->new_state = TPACPI_LED_BLINK; |
| 4888 | queue_work(tpacpi_wq, &data->work); | 4891 | queue_work(tpacpi_wq, &data->work); |
| 4889 | 4892 | ||
| 4890 | return 0; | 4893 | return 0; |
| @@ -7858,6 +7861,15 @@ static int __init thinkpad_acpi_module_init(void) | |||
| 7858 | MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); | 7861 | MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); |
| 7859 | 7862 | ||
| 7860 | /* | 7863 | /* |
| 7864 | * This will autoload the driver in almost every ThinkPad | ||
| 7865 | * in widespread use. | ||
| 7866 | * | ||
| 7867 | * Only _VERY_ old models, like the 240, 240x and 570 lack | ||
| 7868 | * the HKEY event interface. | ||
| 7869 | */ | ||
| 7870 | MODULE_DEVICE_TABLE(acpi, ibm_htk_device_ids); | ||
| 7871 | |||
| 7872 | /* | ||
| 7861 | * DMI matching for module autoloading | 7873 | * DMI matching for module autoloading |
| 7862 | * | 7874 | * |
| 7863 | * See http://thinkwiki.org/wiki/List_of_DMI_IDs | 7875 | * See http://thinkwiki.org/wiki/List_of_DMI_IDs |
| @@ -7869,18 +7881,13 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); | |||
| 7869 | #define IBM_BIOS_MODULE_ALIAS(__type) \ | 7881 | #define IBM_BIOS_MODULE_ALIAS(__type) \ |
| 7870 | MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") | 7882 | MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") |
| 7871 | 7883 | ||
| 7872 | /* Non-ancient thinkpads */ | ||
| 7873 | MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); | ||
| 7874 | MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); | ||
| 7875 | |||
| 7876 | /* Ancient thinkpad BIOSes have to be identified by | 7884 | /* Ancient thinkpad BIOSes have to be identified by |
| 7877 | * BIOS type or model number, and there are far less | 7885 | * BIOS type or model number, and there are far less |
| 7878 | * BIOS types than model numbers... */ | 7886 | * BIOS types than model numbers... */ |
| 7879 | IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]"); | 7887 | IBM_BIOS_MODULE_ALIAS("I[MU]"); /* 570, 570e */ |
| 7880 | IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]"); | ||
| 7881 | IBM_BIOS_MODULE_ALIAS("K[UX-Z]"); | ||
| 7882 | 7888 | ||
| 7883 | MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh"); | 7889 | MODULE_AUTHOR("Borislav Deianov <borislav@users.sf.net>"); |
| 7890 | MODULE_AUTHOR("Henrique de Moraes Holschuh <hmh@hmh.eng.br>"); | ||
| 7884 | MODULE_DESCRIPTION(TPACPI_DESC); | 7891 | MODULE_DESCRIPTION(TPACPI_DESC); |
| 7885 | MODULE_VERSION(TPACPI_VERSION); | 7892 | MODULE_VERSION(TPACPI_VERSION); |
| 7886 | MODULE_LICENSE("GPL"); | 7893 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h index c07809c8016..5469e099597 100644 --- a/drivers/s390/char/tape.h +++ b/drivers/s390/char/tape.h | |||
| @@ -285,7 +285,7 @@ extern int tape_mtop(struct tape_device *, int, int); | |||
| 285 | extern void tape_state_set(struct tape_device *, enum tape_state); | 285 | extern void tape_state_set(struct tape_device *, enum tape_state); |
| 286 | 286 | ||
| 287 | extern int tape_generic_online(struct tape_device *, struct tape_discipline *); | 287 | extern int tape_generic_online(struct tape_device *, struct tape_discipline *); |
| 288 | extern int tape_generic_offline(struct tape_device *device); | 288 | extern int tape_generic_offline(struct ccw_device *); |
| 289 | 289 | ||
| 290 | /* Externals from tape_devmap.c */ | 290 | /* Externals from tape_devmap.c */ |
| 291 | extern int tape_generic_probe(struct ccw_device *); | 291 | extern int tape_generic_probe(struct ccw_device *); |
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c index 807ded5eb04..5f8e8ef43dd 100644 --- a/drivers/s390/char/tape_34xx.c +++ b/drivers/s390/char/tape_34xx.c | |||
| @@ -1294,12 +1294,6 @@ tape_34xx_online(struct ccw_device *cdev) | |||
| 1294 | ); | 1294 | ); |
| 1295 | } | 1295 | } |
| 1296 | 1296 | ||
| 1297 | static int | ||
| 1298 | tape_34xx_offline(struct ccw_device *cdev) | ||
| 1299 | { | ||
| 1300 | return tape_generic_offline(cdev->dev.driver_data); | ||
| 1301 | } | ||
| 1302 | |||
| 1303 | static struct ccw_driver tape_34xx_driver = { | 1297 | static struct ccw_driver tape_34xx_driver = { |
| 1304 | .name = "tape_34xx", | 1298 | .name = "tape_34xx", |
| 1305 | .owner = THIS_MODULE, | 1299 | .owner = THIS_MODULE, |
| @@ -1307,7 +1301,7 @@ static struct ccw_driver tape_34xx_driver = { | |||
| 1307 | .probe = tape_generic_probe, | 1301 | .probe = tape_generic_probe, |
| 1308 | .remove = tape_generic_remove, | 1302 | .remove = tape_generic_remove, |
| 1309 | .set_online = tape_34xx_online, | 1303 | .set_online = tape_34xx_online, |
| 1310 | .set_offline = tape_34xx_offline, | 1304 | .set_offline = tape_generic_offline, |
| 1311 | }; | 1305 | }; |
| 1312 | 1306 | ||
| 1313 | static int | 1307 | static int |
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c index fc1d9129414..823b05bd0dd 100644 --- a/drivers/s390/char/tape_3590.c +++ b/drivers/s390/char/tape_3590.c | |||
| @@ -1707,19 +1707,13 @@ tape_3590_online(struct ccw_device *cdev) | |||
| 1707 | &tape_discipline_3590); | 1707 | &tape_discipline_3590); |
| 1708 | } | 1708 | } |
| 1709 | 1709 | ||
| 1710 | static int | ||
| 1711 | tape_3590_offline(struct ccw_device *cdev) | ||
| 1712 | { | ||
| 1713 | return tape_generic_offline(cdev->dev.driver_data); | ||
| 1714 | } | ||
| 1715 | |||
| 1716 | static struct ccw_driver tape_3590_driver = { | 1710 | static struct ccw_driver tape_3590_driver = { |
| 1717 | .name = "tape_3590", | 1711 | .name = "tape_3590", |
| 1718 | .owner = THIS_MODULE, | 1712 | .owner = THIS_MODULE, |
| 1719 | .ids = tape_3590_ids, | 1713 | .ids = tape_3590_ids, |
| 1720 | .probe = tape_generic_probe, | 1714 | .probe = tape_generic_probe, |
| 1721 | .remove = tape_generic_remove, | 1715 | .remove = tape_generic_remove, |
| 1722 | .set_offline = tape_3590_offline, | 1716 | .set_offline = tape_generic_offline, |
| 1723 | .set_online = tape_3590_online, | 1717 | .set_online = tape_3590_online, |
| 1724 | }; | 1718 | }; |
| 1725 | 1719 | ||
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c index 08c09d3503c..8a109f3b69c 100644 --- a/drivers/s390/char/tape_core.c +++ b/drivers/s390/char/tape_core.c | |||
| @@ -387,8 +387,11 @@ tape_cleanup_device(struct tape_device *device) | |||
| 387 | * Manual offline is only allowed while the drive is not in use. | 387 | * Manual offline is only allowed while the drive is not in use. |
| 388 | */ | 388 | */ |
| 389 | int | 389 | int |
| 390 | tape_generic_offline(struct tape_device *device) | 390 | tape_generic_offline(struct ccw_device *cdev) |
| 391 | { | 391 | { |
| 392 | struct tape_device *device; | ||
| 393 | |||
| 394 | device = cdev->dev.driver_data; | ||
| 392 | if (!device) { | 395 | if (!device) { |
| 393 | return -ENODEV; | 396 | return -ENODEV; |
| 394 | } | 397 | } |
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c index 61af3d91ac8..e3519fa5a3b 100644 --- a/drivers/scsi/a4000t.c +++ b/drivers/scsi/a4000t.c | |||
| @@ -129,7 +129,7 @@ static int __init a4000t_scsi_init(void) | |||
| 129 | a4000t_scsi_device = platform_device_register_simple("a4000t-scsi", | 129 | a4000t_scsi_device = platform_device_register_simple("a4000t-scsi", |
| 130 | -1, NULL, 0); | 130 | -1, NULL, 0); |
| 131 | if (IS_ERR(a4000t_scsi_device)) { | 131 | if (IS_ERR(a4000t_scsi_device)) { |
| 132 | platform_driver_register(&a4000t_scsi_driver); | 132 | platform_driver_unregister(&a4000t_scsi_driver); |
| 133 | return PTR_ERR(a4000t_scsi_device); | 133 | return PTR_ERR(a4000t_scsi_device); |
| 134 | } | 134 | } |
| 135 | 135 | ||
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 7ddff3f5508..938bc1b6c3f 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
| @@ -771,8 +771,6 @@ static int pci_netmos_init(struct pci_dev *dev) | |||
| 771 | } | 771 | } |
| 772 | 772 | ||
| 773 | /* | 773 | /* |
| 774 | * ITE support by Niels de Vos <niels.devos@wincor-nixdorf.com> | ||
| 775 | * | ||
| 776 | * These chips are available with optionally one parallel port and up to | 774 | * These chips are available with optionally one parallel port and up to |
| 777 | * two serial ports. Unfortunately they all have the same product id. | 775 | * two serial ports. Unfortunately they all have the same product id. |
| 778 | * | 776 | * |
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 34e6108e1d4..0fe434505ac 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * This driver supports USB CDC WCM Device Management. | 4 | * This driver supports USB CDC WCM Device Management. |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2007-2008 Oliver Neukum | 6 | * Copyright (c) 2007-2009 Oliver Neukum |
| 7 | * | 7 | * |
| 8 | * Some code taken from cdc-acm.c | 8 | * Some code taken from cdc-acm.c |
| 9 | * | 9 | * |
| @@ -610,7 +610,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
| 610 | if (!buffer) | 610 | if (!buffer) |
| 611 | goto out; | 611 | goto out; |
| 612 | 612 | ||
| 613 | while (buflen > 0) { | 613 | while (buflen > 2) { |
| 614 | if (buffer [1] != USB_DT_CS_INTERFACE) { | 614 | if (buffer [1] != USB_DT_CS_INTERFACE) { |
| 615 | dev_err(&intf->dev, "skipping garbage\n"); | 615 | dev_err(&intf->dev, "skipping garbage\n"); |
| 616 | goto next_desc; | 616 | goto next_desc; |
| @@ -646,16 +646,18 @@ next_desc: | |||
| 646 | spin_lock_init(&desc->iuspin); | 646 | spin_lock_init(&desc->iuspin); |
| 647 | init_waitqueue_head(&desc->wait); | 647 | init_waitqueue_head(&desc->wait); |
| 648 | desc->wMaxCommand = maxcom; | 648 | desc->wMaxCommand = maxcom; |
| 649 | /* this will be expanded and needed in hardware endianness */ | ||
| 649 | desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber); | 650 | desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber); |
| 650 | desc->intf = intf; | 651 | desc->intf = intf; |
| 651 | INIT_WORK(&desc->rxwork, wdm_rxwork); | 652 | INIT_WORK(&desc->rxwork, wdm_rxwork); |
| 652 | 653 | ||
| 653 | iface = &intf->altsetting[0]; | 654 | rv = -EINVAL; |
| 655 | iface = intf->cur_altsetting; | ||
| 656 | if (iface->desc.bNumEndpoints != 1) | ||
| 657 | goto err; | ||
| 654 | ep = &iface->endpoint[0].desc; | 658 | ep = &iface->endpoint[0].desc; |
| 655 | if (!ep || !usb_endpoint_is_int_in(ep)) { | 659 | if (!ep || !usb_endpoint_is_int_in(ep)) |
| 656 | rv = -EINVAL; | ||
| 657 | goto err; | 660 | goto err; |
| 658 | } | ||
| 659 | 661 | ||
| 660 | desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize); | 662 | desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize); |
| 661 | desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0; | 663 | desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0; |
| @@ -711,12 +713,19 @@ next_desc: | |||
| 711 | 713 | ||
| 712 | usb_set_intfdata(intf, desc); | 714 | usb_set_intfdata(intf, desc); |
| 713 | rv = usb_register_dev(intf, &wdm_class); | 715 | rv = usb_register_dev(intf, &wdm_class); |
| 714 | dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n", | ||
| 715 | intf->minor - WDM_MINOR_BASE); | ||
| 716 | if (rv < 0) | 716 | if (rv < 0) |
| 717 | goto err; | 717 | goto err3; |
| 718 | else | ||
| 719 | dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n", | ||
| 720 | intf->minor - WDM_MINOR_BASE); | ||
| 718 | out: | 721 | out: |
| 719 | return rv; | 722 | return rv; |
| 723 | err3: | ||
| 724 | usb_set_intfdata(intf, NULL); | ||
| 725 | usb_buffer_free(interface_to_usbdev(desc->intf), | ||
| 726 | desc->bMaxPacketSize0, | ||
| 727 | desc->inbuf, | ||
| 728 | desc->response->transfer_dma); | ||
| 720 | err2: | 729 | err2: |
| 721 | usb_buffer_free(interface_to_usbdev(desc->intf), | 730 | usb_buffer_free(interface_to_usbdev(desc->intf), |
| 722 | desc->wMaxPacketSize, | 731 | desc->wMaxPacketSize, |
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c index cadb2dc1d28..3ba2fff7149 100644 --- a/drivers/usb/core/buffer.c +++ b/drivers/usb/core/buffer.c | |||
| @@ -119,7 +119,7 @@ void *hcd_buffer_alloc( | |||
| 119 | if (size <= pool_max [i]) | 119 | if (size <= pool_max [i]) |
| 120 | return dma_pool_alloc(hcd->pool [i], mem_flags, dma); | 120 | return dma_pool_alloc(hcd->pool [i], mem_flags, dma); |
| 121 | } | 121 | } |
| 122 | return dma_alloc_coherent(hcd->self.controller, size, dma, 0); | 122 | return dma_alloc_coherent(hcd->self.controller, size, dma, mem_flags); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | void hcd_buffer_free( | 125 | void hcd_buffer_free( |
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index 22c65960c42..38e531ecae4 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | * - Gadget API (majority of optional features) | 51 | * - Gadget API (majority of optional features) |
| 52 | * - Suspend & Remote Wakeup | 52 | * - Suspend & Remote Wakeup |
| 53 | */ | 53 | */ |
| 54 | #include <linux/delay.h> | ||
| 54 | #include <linux/device.h> | 55 | #include <linux/device.h> |
| 55 | #include <linux/dmapool.h> | 56 | #include <linux/dmapool.h> |
| 56 | #include <linux/dma-mapping.h> | 57 | #include <linux/dma-mapping.h> |
| @@ -142,7 +143,7 @@ static struct { | |||
| 142 | #define CAP_DEVICEADDR (0x014UL) | 143 | #define CAP_DEVICEADDR (0x014UL) |
| 143 | #define CAP_ENDPTLISTADDR (0x018UL) | 144 | #define CAP_ENDPTLISTADDR (0x018UL) |
| 144 | #define CAP_PORTSC (0x044UL) | 145 | #define CAP_PORTSC (0x044UL) |
| 145 | #define CAP_DEVLC (0x0B4UL) | 146 | #define CAP_DEVLC (0x084UL) |
| 146 | #define CAP_USBMODE (hw_bank.lpm ? 0x0C8UL : 0x068UL) | 147 | #define CAP_USBMODE (hw_bank.lpm ? 0x0C8UL : 0x068UL) |
| 147 | #define CAP_ENDPTSETUPSTAT (hw_bank.lpm ? 0x0D8UL : 0x06CUL) | 148 | #define CAP_ENDPTSETUPSTAT (hw_bank.lpm ? 0x0D8UL : 0x06CUL) |
| 148 | #define CAP_ENDPTPRIME (hw_bank.lpm ? 0x0DCUL : 0x070UL) | 149 | #define CAP_ENDPTPRIME (hw_bank.lpm ? 0x0DCUL : 0x070UL) |
| @@ -1986,6 +1987,8 @@ static int ep_enable(struct usb_ep *ep, | |||
| 1986 | do { | 1987 | do { |
| 1987 | dbg_event(_usb_addr(mEp), "ENABLE", 0); | 1988 | dbg_event(_usb_addr(mEp), "ENABLE", 0); |
| 1988 | 1989 | ||
| 1990 | mEp->qh[mEp->dir].ptr->cap = 0; | ||
| 1991 | |||
| 1989 | if (mEp->type == USB_ENDPOINT_XFER_CONTROL) | 1992 | if (mEp->type == USB_ENDPOINT_XFER_CONTROL) |
| 1990 | mEp->qh[mEp->dir].ptr->cap |= QH_IOS; | 1993 | mEp->qh[mEp->dir].ptr->cap |= QH_IOS; |
| 1991 | else if (mEp->type == USB_ENDPOINT_XFER_ISOC) | 1994 | else if (mEp->type == USB_ENDPOINT_XFER_ISOC) |
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 5c030b080d4..381a53b3e11 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
| @@ -738,7 +738,6 @@ static struct fsg_dev *the_fsg; | |||
| 738 | static struct usb_gadget_driver fsg_driver; | 738 | static struct usb_gadget_driver fsg_driver; |
| 739 | 739 | ||
| 740 | static void close_backing_file(struct lun *curlun); | 740 | static void close_backing_file(struct lun *curlun); |
| 741 | static void close_all_backing_files(struct fsg_dev *fsg); | ||
| 742 | 741 | ||
| 743 | 742 | ||
| 744 | /*-------------------------------------------------------------------------*/ | 743 | /*-------------------------------------------------------------------------*/ |
| @@ -3593,12 +3592,10 @@ static int fsg_main_thread(void *fsg_) | |||
| 3593 | fsg->thread_task = NULL; | 3592 | fsg->thread_task = NULL; |
| 3594 | spin_unlock_irq(&fsg->lock); | 3593 | spin_unlock_irq(&fsg->lock); |
| 3595 | 3594 | ||
| 3596 | /* In case we are exiting because of a signal, unregister the | 3595 | /* If we are exiting because of a signal, unregister the |
| 3597 | * gadget driver and close the backing file. */ | 3596 | * gadget driver. */ |
| 3598 | if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags)) { | 3597 | if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags)) |
| 3599 | usb_gadget_unregister_driver(&fsg_driver); | 3598 | usb_gadget_unregister_driver(&fsg_driver); |
| 3600 | close_all_backing_files(fsg); | ||
| 3601 | } | ||
| 3602 | 3599 | ||
| 3603 | /* Let the unbind and cleanup routines know the thread has exited */ | 3600 | /* Let the unbind and cleanup routines know the thread has exited */ |
| 3604 | complete_and_exit(&fsg->thread_notifier, 0); | 3601 | complete_and_exit(&fsg->thread_notifier, 0); |
| @@ -3703,14 +3700,6 @@ static void close_backing_file(struct lun *curlun) | |||
| 3703 | } | 3700 | } |
| 3704 | } | 3701 | } |
| 3705 | 3702 | ||
| 3706 | static void close_all_backing_files(struct fsg_dev *fsg) | ||
| 3707 | { | ||
| 3708 | int i; | ||
| 3709 | |||
| 3710 | for (i = 0; i < fsg->nluns; ++i) | ||
| 3711 | close_backing_file(&fsg->luns[i]); | ||
| 3712 | } | ||
| 3713 | |||
| 3714 | 3703 | ||
| 3715 | static ssize_t show_ro(struct device *dev, struct device_attribute *attr, char *buf) | 3704 | static ssize_t show_ro(struct device *dev, struct device_attribute *attr, char *buf) |
| 3716 | { | 3705 | { |
| @@ -3845,6 +3834,7 @@ static void /* __init_or_exit */ fsg_unbind(struct usb_gadget *gadget) | |||
| 3845 | if (curlun->registered) { | 3834 | if (curlun->registered) { |
| 3846 | device_remove_file(&curlun->dev, &dev_attr_ro); | 3835 | device_remove_file(&curlun->dev, &dev_attr_ro); |
| 3847 | device_remove_file(&curlun->dev, &dev_attr_file); | 3836 | device_remove_file(&curlun->dev, &dev_attr_file); |
| 3837 | close_backing_file(curlun); | ||
| 3848 | device_unregister(&curlun->dev); | 3838 | device_unregister(&curlun->dev); |
| 3849 | curlun->registered = 0; | 3839 | curlun->registered = 0; |
| 3850 | } | 3840 | } |
| @@ -4190,7 +4180,6 @@ autoconf_fail: | |||
| 4190 | out: | 4180 | out: |
| 4191 | fsg->state = FSG_STATE_TERMINATED; // The thread is dead | 4181 | fsg->state = FSG_STATE_TERMINATED; // The thread is dead |
| 4192 | fsg_unbind(gadget); | 4182 | fsg_unbind(gadget); |
| 4193 | close_all_backing_files(fsg); | ||
| 4194 | complete(&fsg->thread_notifier); | 4183 | complete(&fsg->thread_notifier); |
| 4195 | return rc; | 4184 | return rc; |
| 4196 | } | 4185 | } |
| @@ -4284,7 +4273,6 @@ static void __exit fsg_cleanup(void) | |||
| 4284 | /* Wait for the thread to finish up */ | 4273 | /* Wait for the thread to finish up */ |
| 4285 | wait_for_completion(&fsg->thread_notifier); | 4274 | wait_for_completion(&fsg->thread_notifier); |
| 4286 | 4275 | ||
| 4287 | close_all_backing_files(fsg); | ||
| 4288 | kref_put(&fsg->ref, fsg_release); | 4276 | kref_put(&fsg->ref, fsg_release); |
| 4289 | } | 4277 | } |
| 4290 | module_exit(fsg_cleanup); | 4278 | module_exit(fsg_cleanup); |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 57d9641c6bf..a2db0e174f2 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -3104,7 +3104,6 @@ static int omap_udc_resume(struct platform_device *dev) | |||
| 3104 | /*-------------------------------------------------------------------------*/ | 3104 | /*-------------------------------------------------------------------------*/ |
| 3105 | 3105 | ||
| 3106 | static struct platform_driver udc_driver = { | 3106 | static struct platform_driver udc_driver = { |
| 3107 | .probe = omap_udc_probe, | ||
| 3108 | .remove = __exit_p(omap_udc_remove), | 3107 | .remove = __exit_p(omap_udc_remove), |
| 3109 | .suspend = omap_udc_suspend, | 3108 | .suspend = omap_udc_suspend, |
| 3110 | .resume = omap_udc_resume, | 3109 | .resume = omap_udc_resume, |
| @@ -3122,7 +3121,7 @@ static int __init udc_init(void) | |||
| 3122 | #endif | 3121 | #endif |
| 3123 | "%s\n", driver_desc, | 3122 | "%s\n", driver_desc, |
| 3124 | use_dma ? " (dma)" : ""); | 3123 | use_dma ? " (dma)" : ""); |
| 3125 | return platform_driver_register(&udc_driver); | 3124 | return platform_driver_probe(&udc_driver, omap_udc_probe); |
| 3126 | } | 3125 | } |
| 3127 | module_init(udc_init); | 3126 | module_init(udc_init); |
| 3128 | 3127 | ||
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index ada5d2ba297..556d0ec0c1f 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c | |||
| @@ -323,7 +323,7 @@ static int tt_available ( | |||
| 323 | * already scheduled transactions | 323 | * already scheduled transactions |
| 324 | */ | 324 | */ |
| 325 | if (125 < usecs) { | 325 | if (125 < usecs) { |
| 326 | int ufs = (usecs / 125) - 1; | 326 | int ufs = (usecs / 125); |
| 327 | int i; | 327 | int i; |
| 328 | for (i = uframe; i < (uframe + ufs) && i < 8; i++) | 328 | for (i = uframe; i < (uframe + ufs) && i < 8; i++) |
| 329 | if (0 < tt_usecs[i]) { | 329 | if (0 < tt_usecs[i]) { |
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 0112353ec97..4000cf6d1e8 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
| @@ -2191,7 +2191,7 @@ static int musb_resume_early(struct platform_device *pdev) | |||
| 2191 | 2191 | ||
| 2192 | #else | 2192 | #else |
| 2193 | #define musb_suspend NULL | 2193 | #define musb_suspend NULL |
| 2194 | #define musb_resume NULL | 2194 | #define musb_resume_early NULL |
| 2195 | #endif | 2195 | #endif |
| 2196 | 2196 | ||
| 2197 | static struct platform_driver musb_driver = { | 2197 | static struct platform_driver musb_driver = { |
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 901dffdf23b..60924ce0849 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Some code has been taken from tusb6010.c | 3 | * Some code has been taken from tusb6010.c |
| 4 | * Copyrights for that are attributable to: | 4 | * Copyrights for that are attributable to: |
| 5 | * Copyright (C) 2006 Nokia Corporation | 5 | * Copyright (C) 2006 Nokia Corporation |
| 6 | * Jarkko Nikula <jarkko.nikula@nokia.com> | ||
| 7 | * Tony Lindgren <tony@atomide.com> | 6 | * Tony Lindgren <tony@atomide.com> |
| 8 | * | 7 | * |
| 9 | * This file is part of the Inventra Controller Driver for Linux. | 8 | * This file is part of the Inventra Controller Driver for Linux. |
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index 9e20fd070d7..4ac1477d356 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * TUSB6010 USB 2.0 OTG Dual Role controller | 2 | * TUSB6010 USB 2.0 OTG Dual Role controller |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2006 Nokia Corporation | 4 | * Copyright (C) 2006 Nokia Corporation |
| 5 | * Jarkko Nikula <jarkko.nikula@nokia.com> | ||
| 6 | * Tony Lindgren <tony@atomide.com> | 5 | * Tony Lindgren <tony@atomide.com> |
| 7 | * | 6 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/usb/musb/tusb6010.h b/drivers/usb/musb/tusb6010.h index ab8c96286ce..35c933a5d99 100644 --- a/drivers/usb/musb/tusb6010.h +++ b/drivers/usb/musb/tusb6010.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Definitions for TUSB6010 USB 2.0 OTG Dual Role controller | 2 | * Definitions for TUSB6010 USB 2.0 OTG Dual Role controller |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2006 Nokia Corporation | 4 | * Copyright (C) 2006 Nokia Corporation |
| 5 | * Jarkko Nikula <jarkko.nikula@nokia.com> | ||
| 6 | * Tony Lindgren <tony@atomide.com> | 5 | * Tony Lindgren <tony@atomide.com> |
| 7 | * | 6 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c index ff318fae7d4..0a43a7db750 100644 --- a/drivers/usb/otg/otg.c +++ b/drivers/usb/otg/otg.c | |||
| @@ -43,7 +43,8 @@ EXPORT_SYMBOL(otg_get_transceiver); | |||
| 43 | */ | 43 | */ |
| 44 | void otg_put_transceiver(struct otg_transceiver *x) | 44 | void otg_put_transceiver(struct otg_transceiver *x) |
| 45 | { | 45 | { |
| 46 | put_device(x->dev); | 46 | if (x) |
| 47 | put_device(x->dev); | ||
| 47 | } | 48 | } |
| 48 | EXPORT_SYMBOL(otg_put_transceiver); | 49 | EXPORT_SYMBOL(otg_put_transceiver); |
| 49 | 50 | ||
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index 858bdd038fb..dd501bb63ed 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c | |||
| @@ -175,13 +175,6 @@ static int cyberjack_open(struct tty_struct *tty, | |||
| 175 | dbg("%s - usb_clear_halt", __func__); | 175 | dbg("%s - usb_clear_halt", __func__); |
| 176 | usb_clear_halt(port->serial->dev, port->write_urb->pipe); | 176 | usb_clear_halt(port->serial->dev, port->write_urb->pipe); |
| 177 | 177 | ||
| 178 | /* force low_latency on so that our tty_push actually forces | ||
| 179 | * the data through, otherwise it is scheduled, and with high | ||
| 180 | * data rates (like with OHCI) data can get lost. | ||
| 181 | */ | ||
| 182 | if (tty) | ||
| 183 | tty->low_latency = 1; | ||
| 184 | |||
| 185 | priv = usb_get_serial_port_data(port); | 178 | priv = usb_get_serial_port_data(port); |
| 186 | spin_lock_irqsave(&priv->lock, flags); | 179 | spin_lock_irqsave(&priv->lock, flags); |
| 187 | priv->rdtodo = 0; | 180 | priv->rdtodo = 0; |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index eae4740d448..e568710b263 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
| @@ -656,10 +656,6 @@ static int cypress_open(struct tty_struct *tty, | |||
| 656 | priv->rx_flags = 0; | 656 | priv->rx_flags = 0; |
| 657 | spin_unlock_irqrestore(&priv->lock, flags); | 657 | spin_unlock_irqrestore(&priv->lock, flags); |
| 658 | 658 | ||
| 659 | /* setting to zero could cause data loss */ | ||
| 660 | if (tty) | ||
| 661 | tty->low_latency = 1; | ||
| 662 | |||
| 663 | /* raise both lines and set termios */ | 659 | /* raise both lines and set termios */ |
| 664 | spin_lock_irqsave(&priv->lock, flags); | 660 | spin_lock_irqsave(&priv->lock, flags); |
| 665 | priv->line_control = CONTROL_DTR | CONTROL_RTS; | 661 | priv->line_control = CONTROL_DTR | CONTROL_RTS; |
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index 8a69cce40b6..c709ec474a8 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
| @@ -478,12 +478,6 @@ static void empeg_set_termios(struct tty_struct *tty, | |||
| 478 | termios->c_cflag | 478 | termios->c_cflag |
| 479 | |= CS8; /* character size 8 bits */ | 479 | |= CS8; /* character size 8 bits */ |
| 480 | 480 | ||
| 481 | /* | ||
| 482 | * Force low_latency on; otherwise the pushes are scheduled; | ||
| 483 | * this is bad as it opens up the possibility of dropping bytes | ||
| 484 | * on the floor. We don't want to drop bytes on the floor. :) | ||
| 485 | */ | ||
| 486 | tty->low_latency = 1; | ||
| 487 | tty_encode_baud_rate(tty, 115200, 115200); | 481 | tty_encode_baud_rate(tty, 115200, 115200); |
| 488 | } | 482 | } |
| 489 | 483 | ||
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index a26a0e2cdb4..586d30ff450 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
| @@ -973,14 +973,6 @@ static int garmin_open(struct tty_struct *tty, | |||
| 973 | 973 | ||
| 974 | dbg("%s - port %d", __func__, port->number); | 974 | dbg("%s - port %d", __func__, port->number); |
| 975 | 975 | ||
| 976 | /* | ||
| 977 | * Force low_latency on so that our tty_push actually forces the data | ||
| 978 | * through, otherwise it is scheduled, and with high data rates (like | ||
| 979 | * with OHCI) data can get lost. | ||
| 980 | */ | ||
| 981 | if (tty) | ||
| 982 | tty->low_latency = 1; | ||
| 983 | |||
| 984 | spin_lock_irqsave(&garmin_data_p->lock, flags); | 976 | spin_lock_irqsave(&garmin_data_p->lock, flags); |
| 985 | garmin_data_p->mode = initial_mode; | 977 | garmin_data_p->mode = initial_mode; |
| 986 | garmin_data_p->count = 0; | 978 | garmin_data_p->count = 0; |
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 9d57cace373..4cec9906ccf 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -122,12 +122,6 @@ int usb_serial_generic_open(struct tty_struct *tty, | |||
| 122 | 122 | ||
| 123 | dbg("%s - port %d", __func__, port->number); | 123 | dbg("%s - port %d", __func__, port->number); |
| 124 | 124 | ||
| 125 | /* force low_latency on so that our tty_push actually forces the data | ||
| 126 | through, otherwise it is scheduled, and with high data rates (like | ||
| 127 | with OHCI) data can get lost. */ | ||
| 128 | if (tty) | ||
| 129 | tty->low_latency = 1; | ||
| 130 | |||
| 131 | /* clear the throttle flags */ | 125 | /* clear the throttle flags */ |
| 132 | spin_lock_irqsave(&port->lock, flags); | 126 | spin_lock_irqsave(&port->lock, flags); |
| 133 | port->throttled = 0; | 127 | port->throttled = 0; |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index e85c8c0d1ad..fb4a73d090f 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
| @@ -193,8 +193,6 @@ static const struct divisor_table_entry divisor_table[] = { | |||
| 193 | /* local variables */ | 193 | /* local variables */ |
| 194 | static int debug; | 194 | static int debug; |
| 195 | 195 | ||
| 196 | static int low_latency = 1; /* tty low latency flag, on by default */ | ||
| 197 | |||
| 198 | static atomic_t CmdUrbs; /* Number of outstanding Command Write Urbs */ | 196 | static atomic_t CmdUrbs; /* Number of outstanding Command Write Urbs */ |
| 199 | 197 | ||
| 200 | 198 | ||
| @@ -867,9 +865,6 @@ static int edge_open(struct tty_struct *tty, | |||
| 867 | if (edge_port == NULL) | 865 | if (edge_port == NULL) |
| 868 | return -ENODEV; | 866 | return -ENODEV; |
| 869 | 867 | ||
| 870 | if (tty) | ||
| 871 | tty->low_latency = low_latency; | ||
| 872 | |||
| 873 | /* see if we've set up our endpoint info yet (can't set it up | 868 | /* see if we've set up our endpoint info yet (can't set it up |
| 874 | in edge_startup as the structures were not set up at that time.) */ | 869 | in edge_startup as the structures were not set up at that time.) */ |
| 875 | serial = port->serial; | 870 | serial = port->serial; |
| @@ -3299,6 +3294,3 @@ MODULE_FIRMWARE("edgeport/down2.fw"); | |||
| 3299 | 3294 | ||
| 3300 | module_param(debug, bool, S_IRUGO | S_IWUSR); | 3295 | module_param(debug, bool, S_IRUGO | S_IWUSR); |
| 3301 | MODULE_PARM_DESC(debug, "Debug enabled or not"); | 3296 | MODULE_PARM_DESC(debug, "Debug enabled or not"); |
| 3302 | |||
| 3303 | module_param(low_latency, bool, S_IRUGO | S_IWUSR); | ||
| 3304 | MODULE_PARM_DESC(low_latency, "Low latency enabled or not"); | ||
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index c3cdd00ddc4..513b25e044c 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -76,7 +76,6 @@ struct edgeport_uart_buf_desc { | |||
| 76 | #define EDGE_READ_URB_STOPPING 1 | 76 | #define EDGE_READ_URB_STOPPING 1 |
| 77 | #define EDGE_READ_URB_STOPPED 2 | 77 | #define EDGE_READ_URB_STOPPED 2 |
| 78 | 78 | ||
| 79 | #define EDGE_LOW_LATENCY 1 | ||
| 80 | #define EDGE_CLOSING_WAIT 4000 /* in .01 sec */ | 79 | #define EDGE_CLOSING_WAIT 4000 /* in .01 sec */ |
| 81 | 80 | ||
| 82 | #define EDGE_OUT_BUF_SIZE 1024 | 81 | #define EDGE_OUT_BUF_SIZE 1024 |
| @@ -232,7 +231,6 @@ static unsigned short OperationalBuildNumber; | |||
| 232 | 231 | ||
| 233 | static int debug; | 232 | static int debug; |
| 234 | 233 | ||
| 235 | static int low_latency = EDGE_LOW_LATENCY; | ||
| 236 | static int closing_wait = EDGE_CLOSING_WAIT; | 234 | static int closing_wait = EDGE_CLOSING_WAIT; |
| 237 | static int ignore_cpu_rev; | 235 | static int ignore_cpu_rev; |
| 238 | static int default_uart_mode; /* RS232 */ | 236 | static int default_uart_mode; /* RS232 */ |
| @@ -1850,9 +1848,6 @@ static int edge_open(struct tty_struct *tty, | |||
| 1850 | if (edge_port == NULL) | 1848 | if (edge_port == NULL) |
| 1851 | return -ENODEV; | 1849 | return -ENODEV; |
| 1852 | 1850 | ||
| 1853 | if (tty) | ||
| 1854 | tty->low_latency = low_latency; | ||
| 1855 | |||
| 1856 | port_number = port->number - port->serial->minor; | 1851 | port_number = port->number - port->serial->minor; |
| 1857 | switch (port_number) { | 1852 | switch (port_number) { |
| 1858 | case 0: | 1853 | case 0: |
| @@ -3008,9 +3003,6 @@ MODULE_FIRMWARE("edgeport/down3.bin"); | |||
| 3008 | module_param(debug, bool, S_IRUGO | S_IWUSR); | 3003 | module_param(debug, bool, S_IRUGO | S_IWUSR); |
| 3009 | MODULE_PARM_DESC(debug, "Debug enabled or not"); | 3004 | MODULE_PARM_DESC(debug, "Debug enabled or not"); |
| 3010 | 3005 | ||
| 3011 | module_param(low_latency, bool, S_IRUGO | S_IWUSR); | ||
| 3012 | MODULE_PARM_DESC(low_latency, "Low latency enabled or not"); | ||
| 3013 | |||
| 3014 | module_param(closing_wait, int, S_IRUGO | S_IWUSR); | 3006 | module_param(closing_wait, int, S_IRUGO | S_IWUSR); |
| 3015 | MODULE_PARM_DESC(closing_wait, "Maximum wait for data to drain, in .01 secs"); | 3007 | MODULE_PARM_DESC(closing_wait, "Maximum wait for data to drain, in .01 secs"); |
| 3016 | 3008 | ||
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index ef92095b073..cd62825a9ac 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
| @@ -631,13 +631,7 @@ static int ipaq_open(struct tty_struct *tty, | |||
| 631 | priv->free_len += PACKET_SIZE; | 631 | priv->free_len += PACKET_SIZE; |
| 632 | } | 632 | } |
| 633 | 633 | ||
| 634 | /* | ||
| 635 | * Force low latency on. This will immediately push data to the line | ||
| 636 | * discipline instead of queueing. | ||
| 637 | */ | ||
| 638 | |||
| 639 | if (tty) { | 634 | if (tty) { |
| 640 | tty->low_latency = 1; | ||
| 641 | /* FIXME: These two are bogus */ | 635 | /* FIXME: These two are bogus */ |
| 642 | tty->raw = 1; | 636 | tty->raw = 1; |
| 643 | tty->real_raw = 1; | 637 | tty->real_raw = 1; |
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index f530032ed93..da2a2b46644 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
| @@ -207,9 +207,6 @@ static int ipw_open(struct tty_struct *tty, | |||
| 207 | if (!buf_flow_init) | 207 | if (!buf_flow_init) |
| 208 | return -ENOMEM; | 208 | return -ENOMEM; |
| 209 | 209 | ||
| 210 | if (tty) | ||
| 211 | tty->low_latency = 1; | ||
| 212 | |||
| 213 | /* --1: Tell the modem to initialize (we think) From sniffs this is | 210 | /* --1: Tell the modem to initialize (we think) From sniffs this is |
| 214 | * always the first thing that gets sent to the modem during | 211 | * always the first thing that gets sent to the modem during |
| 215 | * opening of the device */ | 212 | * opening of the device */ |
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index 2314c6ae4fc..4473d442b2a 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c | |||
| @@ -1051,7 +1051,6 @@ static int iuu_open(struct tty_struct *tty, | |||
| 1051 | tty->termios->c_oflag = 0; | 1051 | tty->termios->c_oflag = 0; |
| 1052 | tty->termios->c_iflag = 0; | 1052 | tty->termios->c_iflag = 0; |
| 1053 | priv->termios_initialized = 1; | 1053 | priv->termios_initialized = 1; |
| 1054 | tty->low_latency = 1; | ||
| 1055 | priv->poll = 0; | 1054 | priv->poll = 0; |
| 1056 | } | 1055 | } |
| 1057 | spin_unlock_irqrestore(&priv->lock, flags); | 1056 | spin_unlock_irqrestore(&priv->lock, flags); |
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 6286baad939..c148544953b 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
| @@ -231,13 +231,7 @@ static int kobil_open(struct tty_struct *tty, | |||
| 231 | /* someone sets the dev to 0 if the close method has been called */ | 231 | /* someone sets the dev to 0 if the close method has been called */ |
| 232 | port->interrupt_in_urb->dev = port->serial->dev; | 232 | port->interrupt_in_urb->dev = port->serial->dev; |
| 233 | 233 | ||
| 234 | |||
| 235 | /* force low_latency on so that our tty_push actually forces | ||
| 236 | * the data through, otherwise it is scheduled, and with high | ||
| 237 | * data rates (like with OHCI) data can get lost. | ||
| 238 | */ | ||
| 239 | if (tty) { | 234 | if (tty) { |
| 240 | tty->low_latency = 1; | ||
| 241 | 235 | ||
| 242 | /* Default to echo off and other sane device settings */ | 236 | /* Default to echo off and other sane device settings */ |
| 243 | tty->termios->c_lflag = 0; | 237 | tty->termios->c_lflag = 0; |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index e772cc0a97f..24e3b5d4b4d 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
| @@ -446,13 +446,6 @@ static int mos7720_open(struct tty_struct *tty, | |||
| 446 | data = 0x0c; | 446 | data = 0x0c; |
| 447 | send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data); | 447 | send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data); |
| 448 | 448 | ||
| 449 | /* force low_latency on so that our tty_push actually forces * | ||
| 450 | * the data through,otherwise it is scheduled, and with * | ||
| 451 | * high data rates (like with OHCI) data can get lost. */ | ||
| 452 | |||
| 453 | if (tty) | ||
| 454 | tty->low_latency = 1; | ||
| 455 | |||
| 456 | /* see if we've set up our endpoint info yet * | 449 | /* see if we've set up our endpoint info yet * |
| 457 | * (can't set it up in mos7720_startup as the * | 450 | * (can't set it up in mos7720_startup as the * |
| 458 | * structures were not set up at that time.) */ | 451 | * structures were not set up at that time.) */ |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 2c20e88a91b..84fb1dcd30d 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | /* | 38 | /* |
| 39 | * Version Information | 39 | * Version Information |
| 40 | */ | 40 | */ |
| 41 | #define DRIVER_VERSION "1.3.1" | 41 | #define DRIVER_VERSION "1.3.2" |
| 42 | #define DRIVER_DESC "Moschip 7840/7820 USB Serial Driver" | 42 | #define DRIVER_DESC "Moschip 7840/7820 USB Serial Driver" |
| 43 | 43 | ||
| 44 | /* | 44 | /* |
| @@ -123,6 +123,11 @@ | |||
| 123 | #define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 | 123 | #define BANDB_DEVICE_ID_USOPTL4_4 0xAC44 |
| 124 | #define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 | 124 | #define BANDB_DEVICE_ID_USOPTL4_2 0xAC42 |
| 125 | 125 | ||
| 126 | /* This driver also supports the ATEN UC2324 device since it is mos7840 based | ||
| 127 | * - if I knew the device id it would also support the ATEN UC2322 */ | ||
| 128 | #define USB_VENDOR_ID_ATENINTL 0x0557 | ||
| 129 | #define ATENINTL_DEVICE_ID_UC2324 0x2011 | ||
| 130 | |||
| 126 | /* Interrupt Routine Defines */ | 131 | /* Interrupt Routine Defines */ |
| 127 | 132 | ||
| 128 | #define SERIAL_IIR_RLS 0x06 | 133 | #define SERIAL_IIR_RLS 0x06 |
| @@ -170,6 +175,7 @@ static struct usb_device_id moschip_port_id_table[] = { | |||
| 170 | {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, | 175 | {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, |
| 171 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, | 176 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, |
| 172 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, | 177 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, |
| 178 | {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, | ||
| 173 | {} /* terminating entry */ | 179 | {} /* terminating entry */ |
| 174 | }; | 180 | }; |
| 175 | 181 | ||
| @@ -178,6 +184,7 @@ static __devinitdata struct usb_device_id moschip_id_table_combined[] = { | |||
| 178 | {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, | 184 | {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)}, |
| 179 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, | 185 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)}, |
| 180 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, | 186 | {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)}, |
| 187 | {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)}, | ||
| 181 | {} /* terminating entry */ | 188 | {} /* terminating entry */ |
| 182 | }; | 189 | }; |
| 183 | 190 | ||
| @@ -1000,12 +1007,6 @@ static int mos7840_open(struct tty_struct *tty, | |||
| 1000 | status = mos7840_set_reg_sync(port, mos7840_port->ControlRegOffset, | 1007 | status = mos7840_set_reg_sync(port, mos7840_port->ControlRegOffset, |
| 1001 | Data); | 1008 | Data); |
| 1002 | 1009 | ||
| 1003 | /* force low_latency on so that our tty_push actually forces * | ||
| 1004 | * the data through,otherwise it is scheduled, and with * | ||
| 1005 | * high data rates (like with OHCI) data can get lost. */ | ||
| 1006 | if (tty) | ||
| 1007 | tty->low_latency = 1; | ||
| 1008 | |||
| 1009 | /* Check to see if we've set up our endpoint info yet * | 1010 | /* Check to see if we've set up our endpoint info yet * |
| 1010 | * (can't set it up in mos7840_startup as the structures * | 1011 | * (can't set it up in mos7840_startup as the structures * |
| 1011 | * were not set up at that time.) */ | 1012 | * were not set up at that time.) */ |
| @@ -2477,9 +2478,14 @@ static int mos7840_startup(struct usb_serial *serial) | |||
| 2477 | mos7840_set_port_private(serial->port[i], mos7840_port); | 2478 | mos7840_set_port_private(serial->port[i], mos7840_port); |
| 2478 | spin_lock_init(&mos7840_port->pool_lock); | 2479 | spin_lock_init(&mos7840_port->pool_lock); |
| 2479 | 2480 | ||
| 2480 | mos7840_port->port_num = ((serial->port[i]->number - | 2481 | /* minor is not initialised until later by |
| 2481 | (serial->port[i]->serial->minor)) + | 2482 | * usb-serial.c:get_free_serial() and cannot therefore be used |
| 2482 | 1); | 2483 | * to index device instances */ |
| 2484 | mos7840_port->port_num = i + 1; | ||
| 2485 | dbg ("serial->port[i]->number = %d", serial->port[i]->number); | ||
| 2486 | dbg ("serial->port[i]->serial->minor = %d", serial->port[i]->serial->minor); | ||
| 2487 | dbg ("mos7840_port->port_num = %d", mos7840_port->port_num); | ||
| 2488 | dbg ("serial->minor = %d", serial->minor); | ||
| 2483 | 2489 | ||
| 2484 | if (mos7840_port->port_num == 1) { | 2490 | if (mos7840_port->port_num == 1) { |
| 2485 | mos7840_port->SpRegOffset = 0x0; | 2491 | mos7840_port->SpRegOffset = 0x0; |
| @@ -2690,13 +2696,16 @@ static void mos7840_shutdown(struct usb_serial *serial) | |||
| 2690 | 2696 | ||
| 2691 | for (i = 0; i < serial->num_ports; ++i) { | 2697 | for (i = 0; i < serial->num_ports; ++i) { |
| 2692 | mos7840_port = mos7840_get_port_private(serial->port[i]); | 2698 | mos7840_port = mos7840_get_port_private(serial->port[i]); |
| 2693 | spin_lock_irqsave(&mos7840_port->pool_lock, flags); | 2699 | dbg ("mos7840_port %d = %p", i, mos7840_port); |
| 2694 | mos7840_port->zombie = 1; | 2700 | if (mos7840_port) { |
| 2695 | spin_unlock_irqrestore(&mos7840_port->pool_lock, flags); | 2701 | spin_lock_irqsave(&mos7840_port->pool_lock, flags); |
| 2696 | usb_kill_urb(mos7840_port->control_urb); | 2702 | mos7840_port->zombie = 1; |
| 2697 | kfree(mos7840_port->ctrl_buf); | 2703 | spin_unlock_irqrestore(&mos7840_port->pool_lock, flags); |
| 2698 | kfree(mos7840_port->dr); | 2704 | usb_kill_urb(mos7840_port->control_urb); |
| 2699 | kfree(mos7840_port); | 2705 | kfree(mos7840_port->ctrl_buf); |
| 2706 | kfree(mos7840_port->dr); | ||
| 2707 | kfree(mos7840_port); | ||
| 2708 | } | ||
| 2700 | mos7840_set_port_private(serial->port[i], NULL); | 2709 | mos7840_set_port_private(serial->port[i], NULL); |
| 2701 | } | 2710 | } |
| 2702 | 2711 | ||
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 839583dc8b6..b500ad10b75 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
| @@ -159,14 +159,6 @@ static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port, | |||
| 159 | priv->port = port; | 159 | priv->port = port; |
| 160 | spin_unlock_irqrestore(&priv->lock, flags); | 160 | spin_unlock_irqrestore(&priv->lock, flags); |
| 161 | 161 | ||
| 162 | /* | ||
| 163 | * Force low_latency on so that our tty_push actually forces the data | ||
| 164 | * through, otherwise it is scheduled, and with high data rates (like | ||
| 165 | * with OHCI) data can get lost. | ||
| 166 | */ | ||
| 167 | if (tty) | ||
| 168 | tty->low_latency = 1; | ||
| 169 | |||
| 170 | /* Start reading from the device */ | 162 | /* Start reading from the device */ |
| 171 | usb_fill_bulk_urb(priv->bulk_read_urb, priv->udev, | 163 | usb_fill_bulk_urb(priv->bulk_read_urb, priv->udev, |
| 172 | usb_rcvbulkpipe(priv->udev, | 164 | usb_rcvbulkpipe(priv->udev, |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 47bd070f24b..7817b82889c 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -936,9 +936,6 @@ static int option_open(struct tty_struct *tty, | |||
| 936 | usb_pipeout(urb->pipe), 0); */ | 936 | usb_pipeout(urb->pipe), 0); */ |
| 937 | } | 937 | } |
| 938 | 938 | ||
| 939 | if (tty) | ||
| 940 | tty->low_latency = 1; | ||
| 941 | |||
| 942 | option_send_setup(tty, port); | 939 | option_send_setup(tty, port); |
| 943 | 940 | ||
| 944 | return 0; | 941 | return 0; |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index d9bf9a5c20e..913225c6161 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org> | 14 | Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org> |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #define DRIVER_VERSION "v.1.3.2" | 17 | #define DRIVER_VERSION "v.1.3.3" |
| 18 | #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>" | 18 | #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>" |
| 19 | #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems" | 19 | #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems" |
| 20 | 20 | ||
| @@ -259,9 +259,21 @@ static int sierra_send_setup(struct tty_struct *tty, | |||
| 259 | val |= 0x02; | 259 | val |= 0x02; |
| 260 | 260 | ||
| 261 | /* If composite device then properly report interface */ | 261 | /* If composite device then properly report interface */ |
| 262 | if (serial->num_ports == 1) | 262 | if (serial->num_ports == 1) { |
| 263 | interface = sierra_calc_interface(serial); | 263 | interface = sierra_calc_interface(serial); |
| 264 | 264 | ||
| 265 | /* Control message is sent only to interfaces with | ||
| 266 | * interrupt_in endpoints | ||
| 267 | */ | ||
| 268 | if (port->interrupt_in_urb) { | ||
| 269 | /* send control message */ | ||
| 270 | return usb_control_msg(serial->dev, | ||
| 271 | usb_rcvctrlpipe(serial->dev, 0), | ||
| 272 | 0x22, 0x21, val, interface, | ||
| 273 | NULL, 0, USB_CTRL_SET_TIMEOUT); | ||
| 274 | } | ||
| 275 | } | ||
| 276 | |||
| 265 | /* Otherwise the need to do non-composite mapping */ | 277 | /* Otherwise the need to do non-composite mapping */ |
| 266 | else { | 278 | else { |
| 267 | if (port->bulk_out_endpointAddress == 2) | 279 | if (port->bulk_out_endpointAddress == 2) |
| @@ -270,12 +282,13 @@ static int sierra_send_setup(struct tty_struct *tty, | |||
| 270 | interface = 1; | 282 | interface = 1; |
| 271 | else if (port->bulk_out_endpointAddress == 5) | 283 | else if (port->bulk_out_endpointAddress == 5) |
| 272 | interface = 2; | 284 | interface = 2; |
| 273 | } | ||
| 274 | 285 | ||
| 275 | return usb_control_msg(serial->dev, | 286 | return usb_control_msg(serial->dev, |
| 276 | usb_rcvctrlpipe(serial->dev, 0), | 287 | usb_rcvctrlpipe(serial->dev, 0), |
| 277 | 0x22, 0x21, val, interface, | 288 | 0x22, 0x21, val, interface, |
| 278 | NULL, 0, USB_CTRL_SET_TIMEOUT); | 289 | NULL, 0, USB_CTRL_SET_TIMEOUT); |
| 290 | |||
| 291 | } | ||
| 279 | } | 292 | } |
| 280 | 293 | ||
| 281 | return 0; | 294 | return 0; |
| @@ -585,9 +598,6 @@ static int sierra_open(struct tty_struct *tty, | |||
| 585 | } | 598 | } |
| 586 | } | 599 | } |
| 587 | 600 | ||
| 588 | if (tty) | ||
| 589 | tty->low_latency = 1; | ||
| 590 | |||
| 591 | sierra_send_setup(tty, port); | 601 | sierra_send_setup(tty, port); |
| 592 | 602 | ||
| 593 | /* start up the interrupt endpoint if we have one */ | 603 | /* start up the interrupt endpoint if we have one */ |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 9c4c700c7cc..0a64bac306e 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
| @@ -50,11 +50,10 @@ | |||
| 50 | 50 | ||
| 51 | #define TI_TRANSFER_TIMEOUT 2 | 51 | #define TI_TRANSFER_TIMEOUT 2 |
| 52 | 52 | ||
| 53 | #define TI_DEFAULT_LOW_LATENCY 0 | ||
| 54 | #define TI_DEFAULT_CLOSING_WAIT 4000 /* in .01 secs */ | 53 | #define TI_DEFAULT_CLOSING_WAIT 4000 /* in .01 secs */ |
| 55 | 54 | ||
| 56 | /* supported setserial flags */ | 55 | /* supported setserial flags */ |
| 57 | #define TI_SET_SERIAL_FLAGS (ASYNC_LOW_LATENCY) | 56 | #define TI_SET_SERIAL_FLAGS 0 |
| 58 | 57 | ||
| 59 | /* read urb states */ | 58 | /* read urb states */ |
| 60 | #define TI_READ_URB_RUNNING 0 | 59 | #define TI_READ_URB_RUNNING 0 |
| @@ -161,7 +160,6 @@ static int ti_buf_get(struct circ_buf *cb, char *buf, int count); | |||
| 161 | 160 | ||
| 162 | /* module parameters */ | 161 | /* module parameters */ |
| 163 | static int debug; | 162 | static int debug; |
| 164 | static int low_latency = TI_DEFAULT_LOW_LATENCY; | ||
| 165 | static int closing_wait = TI_DEFAULT_CLOSING_WAIT; | 163 | static int closing_wait = TI_DEFAULT_CLOSING_WAIT; |
| 166 | static ushort vendor_3410[TI_EXTRA_VID_PID_COUNT]; | 164 | static ushort vendor_3410[TI_EXTRA_VID_PID_COUNT]; |
| 167 | static unsigned int vendor_3410_count; | 165 | static unsigned int vendor_3410_count; |
| @@ -296,10 +294,6 @@ MODULE_FIRMWARE("mts_edge.fw"); | |||
| 296 | module_param(debug, bool, S_IRUGO | S_IWUSR); | 294 | module_param(debug, bool, S_IRUGO | S_IWUSR); |
| 297 | MODULE_PARM_DESC(debug, "Enable debugging, 0=no, 1=yes"); | 295 | MODULE_PARM_DESC(debug, "Enable debugging, 0=no, 1=yes"); |
| 298 | 296 | ||
| 299 | module_param(low_latency, bool, S_IRUGO | S_IWUSR); | ||
| 300 | MODULE_PARM_DESC(low_latency, | ||
| 301 | "TTY low_latency flag, 0=off, 1=on, default is off"); | ||
| 302 | |||
| 303 | module_param(closing_wait, int, S_IRUGO | S_IWUSR); | 297 | module_param(closing_wait, int, S_IRUGO | S_IWUSR); |
| 304 | MODULE_PARM_DESC(closing_wait, | 298 | MODULE_PARM_DESC(closing_wait, |
| 305 | "Maximum wait for data to drain in close, in .01 secs, default is 4000"); | 299 | "Maximum wait for data to drain in close, in .01 secs, default is 4000"); |
| @@ -448,7 +442,6 @@ static int ti_startup(struct usb_serial *serial) | |||
| 448 | spin_lock_init(&tport->tp_lock); | 442 | spin_lock_init(&tport->tp_lock); |
| 449 | tport->tp_uart_base_addr = (i == 0 ? | 443 | tport->tp_uart_base_addr = (i == 0 ? |
| 450 | TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR); | 444 | TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR); |
| 451 | tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0; | ||
| 452 | tport->tp_closing_wait = closing_wait; | 445 | tport->tp_closing_wait = closing_wait; |
| 453 | init_waitqueue_head(&tport->tp_msr_wait); | 446 | init_waitqueue_head(&tport->tp_msr_wait); |
| 454 | init_waitqueue_head(&tport->tp_write_wait); | 447 | init_waitqueue_head(&tport->tp_write_wait); |
| @@ -528,10 +521,6 @@ static int ti_open(struct tty_struct *tty, | |||
| 528 | if (mutex_lock_interruptible(&tdev->td_open_close_lock)) | 521 | if (mutex_lock_interruptible(&tdev->td_open_close_lock)) |
| 529 | return -ERESTARTSYS; | 522 | return -ERESTARTSYS; |
| 530 | 523 | ||
| 531 | if (tty) | ||
| 532 | tty->low_latency = | ||
| 533 | (tport->tp_flags & ASYNC_LOW_LATENCY) ? 1 : 0; | ||
| 534 | |||
| 535 | port_number = port->number - port->serial->minor; | 524 | port_number = port->number - port->serial->minor; |
| 536 | 525 | ||
| 537 | memset(&(tport->tp_icount), 0x00, sizeof(tport->tp_icount)); | 526 | memset(&(tport->tp_icount), 0x00, sizeof(tport->tp_icount)); |
| @@ -1454,7 +1443,6 @@ static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport, | |||
| 1454 | return -EFAULT; | 1443 | return -EFAULT; |
| 1455 | 1444 | ||
| 1456 | tport->tp_flags = new_serial.flags & TI_SET_SERIAL_FLAGS; | 1445 | tport->tp_flags = new_serial.flags & TI_SET_SERIAL_FLAGS; |
| 1457 | tty->low_latency = (tport->tp_flags & ASYNC_LOW_LATENCY) ? 1 : 0; | ||
| 1458 | tport->tp_closing_wait = new_serial.closing_wait; | 1446 | tport->tp_closing_wait = new_serial.closing_wait; |
| 1459 | 1447 | ||
| 1460 | return 0; | 1448 | return 0; |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 2a70563bbee..0a566eea49c 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
| @@ -137,22 +137,10 @@ static void destroy_serial(struct kref *kref) | |||
| 137 | 137 | ||
| 138 | dbg("%s - %s", __func__, serial->type->description); | 138 | dbg("%s - %s", __func__, serial->type->description); |
| 139 | 139 | ||
| 140 | serial->type->shutdown(serial); | ||
| 141 | |||
| 142 | /* return the minor range that this device had */ | 140 | /* return the minor range that this device had */ |
| 143 | if (serial->minor != SERIAL_TTY_NO_MINOR) | 141 | if (serial->minor != SERIAL_TTY_NO_MINOR) |
| 144 | return_serial(serial); | 142 | return_serial(serial); |
| 145 | 143 | ||
| 146 | for (i = 0; i < serial->num_ports; ++i) | ||
| 147 | serial->port[i]->port.count = 0; | ||
| 148 | |||
| 149 | /* the ports are cleaned up and released in port_release() */ | ||
| 150 | for (i = 0; i < serial->num_ports; ++i) | ||
| 151 | if (serial->port[i]->dev.parent != NULL) { | ||
| 152 | device_unregister(&serial->port[i]->dev); | ||
| 153 | serial->port[i] = NULL; | ||
| 154 | } | ||
| 155 | |||
| 156 | /* If this is a "fake" port, we have to clean it up here, as it will | 144 | /* If this is a "fake" port, we have to clean it up here, as it will |
| 157 | * not get cleaned up in port_release() as it was never registered with | 145 | * not get cleaned up in port_release() as it was never registered with |
| 158 | * the driver core */ | 146 | * the driver core */ |
| @@ -187,7 +175,7 @@ static int serial_open (struct tty_struct *tty, struct file *filp) | |||
| 187 | struct usb_serial *serial; | 175 | struct usb_serial *serial; |
| 188 | struct usb_serial_port *port; | 176 | struct usb_serial_port *port; |
| 189 | unsigned int portNumber; | 177 | unsigned int portNumber; |
| 190 | int retval; | 178 | int retval = 0; |
| 191 | 179 | ||
| 192 | dbg("%s", __func__); | 180 | dbg("%s", __func__); |
| 193 | 181 | ||
| @@ -198,21 +186,24 @@ static int serial_open (struct tty_struct *tty, struct file *filp) | |||
| 198 | return -ENODEV; | 186 | return -ENODEV; |
| 199 | } | 187 | } |
| 200 | 188 | ||
| 189 | mutex_lock(&serial->disc_mutex); | ||
| 201 | portNumber = tty->index - serial->minor; | 190 | portNumber = tty->index - serial->minor; |
| 202 | port = serial->port[portNumber]; | 191 | port = serial->port[portNumber]; |
| 203 | if (!port) { | 192 | if (!port || serial->disconnected) |
| 204 | retval = -ENODEV; | ||
| 205 | goto bailout_kref_put; | ||
| 206 | } | ||
| 207 | |||
| 208 | if (port->serial->disconnected) { | ||
| 209 | retval = -ENODEV; | 193 | retval = -ENODEV; |
| 210 | goto bailout_kref_put; | 194 | else |
| 211 | } | 195 | get_device(&port->dev); |
| 196 | /* | ||
| 197 | * Note: Our locking order requirement does not allow port->mutex | ||
| 198 | * to be acquired while serial->disc_mutex is held. | ||
| 199 | */ | ||
| 200 | mutex_unlock(&serial->disc_mutex); | ||
| 201 | if (retval) | ||
| 202 | goto bailout_serial_put; | ||
| 212 | 203 | ||
| 213 | if (mutex_lock_interruptible(&port->mutex)) { | 204 | if (mutex_lock_interruptible(&port->mutex)) { |
| 214 | retval = -ERESTARTSYS; | 205 | retval = -ERESTARTSYS; |
| 215 | goto bailout_kref_put; | 206 | goto bailout_port_put; |
| 216 | } | 207 | } |
| 217 | 208 | ||
| 218 | ++port->port.count; | 209 | ++port->port.count; |
| @@ -232,14 +223,20 @@ static int serial_open (struct tty_struct *tty, struct file *filp) | |||
| 232 | goto bailout_mutex_unlock; | 223 | goto bailout_mutex_unlock; |
| 233 | } | 224 | } |
| 234 | 225 | ||
| 235 | retval = usb_autopm_get_interface(serial->interface); | 226 | mutex_lock(&serial->disc_mutex); |
| 227 | if (serial->disconnected) | ||
| 228 | retval = -ENODEV; | ||
| 229 | else | ||
| 230 | retval = usb_autopm_get_interface(serial->interface); | ||
| 236 | if (retval) | 231 | if (retval) |
| 237 | goto bailout_module_put; | 232 | goto bailout_module_put; |
| 233 | |||
| 238 | /* only call the device specific open if this | 234 | /* only call the device specific open if this |
| 239 | * is the first time the port is opened */ | 235 | * is the first time the port is opened */ |
| 240 | retval = serial->type->open(tty, port, filp); | 236 | retval = serial->type->open(tty, port, filp); |
| 241 | if (retval) | 237 | if (retval) |
| 242 | goto bailout_interface_put; | 238 | goto bailout_interface_put; |
| 239 | mutex_unlock(&serial->disc_mutex); | ||
| 243 | } | 240 | } |
| 244 | 241 | ||
| 245 | mutex_unlock(&port->mutex); | 242 | mutex_unlock(&port->mutex); |
| @@ -248,13 +245,16 @@ static int serial_open (struct tty_struct *tty, struct file *filp) | |||
| 248 | bailout_interface_put: | 245 | bailout_interface_put: |
| 249 | usb_autopm_put_interface(serial->interface); | 246 | usb_autopm_put_interface(serial->interface); |
| 250 | bailout_module_put: | 247 | bailout_module_put: |
| 248 | mutex_unlock(&serial->disc_mutex); | ||
| 251 | module_put(serial->type->driver.owner); | 249 | module_put(serial->type->driver.owner); |
| 252 | bailout_mutex_unlock: | 250 | bailout_mutex_unlock: |
| 253 | port->port.count = 0; | 251 | port->port.count = 0; |
| 254 | tty->driver_data = NULL; | 252 | tty->driver_data = NULL; |
| 255 | tty_port_tty_set(&port->port, NULL); | 253 | tty_port_tty_set(&port->port, NULL); |
| 256 | mutex_unlock(&port->mutex); | 254 | mutex_unlock(&port->mutex); |
| 257 | bailout_kref_put: | 255 | bailout_port_put: |
| 256 | put_device(&port->dev); | ||
| 257 | bailout_serial_put: | ||
| 258 | usb_serial_put(serial); | 258 | usb_serial_put(serial); |
| 259 | return retval; | 259 | return retval; |
| 260 | } | 260 | } |
| @@ -262,6 +262,9 @@ bailout_kref_put: | |||
| 262 | static void serial_close(struct tty_struct *tty, struct file *filp) | 262 | static void serial_close(struct tty_struct *tty, struct file *filp) |
| 263 | { | 263 | { |
| 264 | struct usb_serial_port *port = tty->driver_data; | 264 | struct usb_serial_port *port = tty->driver_data; |
| 265 | struct usb_serial *serial; | ||
| 266 | struct module *owner; | ||
| 267 | int count; | ||
| 265 | 268 | ||
| 266 | if (!port) | 269 | if (!port) |
| 267 | return; | 270 | return; |
| @@ -269,6 +272,8 @@ static void serial_close(struct tty_struct *tty, struct file *filp) | |||
| 269 | dbg("%s - port %d", __func__, port->number); | 272 | dbg("%s - port %d", __func__, port->number); |
| 270 | 273 | ||
| 271 | mutex_lock(&port->mutex); | 274 | mutex_lock(&port->mutex); |
| 275 | serial = port->serial; | ||
| 276 | owner = serial->type->driver.owner; | ||
| 272 | 277 | ||
| 273 | if (port->port.count == 0) { | 278 | if (port->port.count == 0) { |
| 274 | mutex_unlock(&port->mutex); | 279 | mutex_unlock(&port->mutex); |
| @@ -281,7 +286,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp) | |||
| 281 | * this before we drop the port count. The call is protected | 286 | * this before we drop the port count. The call is protected |
| 282 | * by the port mutex | 287 | * by the port mutex |
| 283 | */ | 288 | */ |
| 284 | port->serial->type->close(tty, port, filp); | 289 | serial->type->close(tty, port, filp); |
| 285 | 290 | ||
| 286 | if (port->port.count == (port->console ? 2 : 1)) { | 291 | if (port->port.count == (port->console ? 2 : 1)) { |
| 287 | struct tty_struct *tty = tty_port_tty_get(&port->port); | 292 | struct tty_struct *tty = tty_port_tty_get(&port->port); |
| @@ -295,17 +300,23 @@ static void serial_close(struct tty_struct *tty, struct file *filp) | |||
| 295 | } | 300 | } |
| 296 | } | 301 | } |
| 297 | 302 | ||
| 298 | if (port->port.count == 1) { | ||
| 299 | mutex_lock(&port->serial->disc_mutex); | ||
| 300 | if (!port->serial->disconnected) | ||
| 301 | usb_autopm_put_interface(port->serial->interface); | ||
| 302 | mutex_unlock(&port->serial->disc_mutex); | ||
| 303 | module_put(port->serial->type->driver.owner); | ||
| 304 | } | ||
| 305 | --port->port.count; | 303 | --port->port.count; |
| 306 | 304 | count = port->port.count; | |
| 307 | mutex_unlock(&port->mutex); | 305 | mutex_unlock(&port->mutex); |
| 308 | usb_serial_put(port->serial); | 306 | put_device(&port->dev); |
| 307 | |||
| 308 | /* Mustn't dereference port any more */ | ||
| 309 | if (count == 0) { | ||
| 310 | mutex_lock(&serial->disc_mutex); | ||
| 311 | if (!serial->disconnected) | ||
| 312 | usb_autopm_put_interface(serial->interface); | ||
| 313 | mutex_unlock(&serial->disc_mutex); | ||
| 314 | } | ||
| 315 | usb_serial_put(serial); | ||
| 316 | |||
| 317 | /* Mustn't dereference serial any more */ | ||
| 318 | if (count == 0) | ||
| 319 | module_put(owner); | ||
| 309 | } | 320 | } |
| 310 | 321 | ||
| 311 | static int serial_write(struct tty_struct *tty, const unsigned char *buf, | 322 | static int serial_write(struct tty_struct *tty, const unsigned char *buf, |
| @@ -549,7 +560,13 @@ static void kill_traffic(struct usb_serial_port *port) | |||
| 549 | 560 | ||
| 550 | static void port_free(struct usb_serial_port *port) | 561 | static void port_free(struct usb_serial_port *port) |
| 551 | { | 562 | { |
| 563 | /* | ||
| 564 | * Stop all the traffic before cancelling the work, so that | ||
| 565 | * nobody will restart it by calling usb_serial_port_softint. | ||
| 566 | */ | ||
| 552 | kill_traffic(port); | 567 | kill_traffic(port); |
| 568 | cancel_work_sync(&port->work); | ||
| 569 | |||
| 553 | usb_free_urb(port->read_urb); | 570 | usb_free_urb(port->read_urb); |
| 554 | usb_free_urb(port->write_urb); | 571 | usb_free_urb(port->write_urb); |
| 555 | usb_free_urb(port->interrupt_in_urb); | 572 | usb_free_urb(port->interrupt_in_urb); |
| @@ -558,7 +575,6 @@ static void port_free(struct usb_serial_port *port) | |||
| 558 | kfree(port->bulk_out_buffer); | 575 | kfree(port->bulk_out_buffer); |
| 559 | kfree(port->interrupt_in_buffer); | 576 | kfree(port->interrupt_in_buffer); |
| 560 | kfree(port->interrupt_out_buffer); | 577 | kfree(port->interrupt_out_buffer); |
| 561 | flush_scheduled_work(); /* port->work */ | ||
| 562 | kfree(port); | 578 | kfree(port); |
| 563 | } | 579 | } |
| 564 | 580 | ||
| @@ -1043,6 +1059,12 @@ void usb_serial_disconnect(struct usb_interface *interface) | |||
| 1043 | usb_set_intfdata(interface, NULL); | 1059 | usb_set_intfdata(interface, NULL); |
| 1044 | /* must set a flag, to signal subdrivers */ | 1060 | /* must set a flag, to signal subdrivers */ |
| 1045 | serial->disconnected = 1; | 1061 | serial->disconnected = 1; |
| 1062 | mutex_unlock(&serial->disc_mutex); | ||
| 1063 | |||
| 1064 | /* Unfortunately, many of the sub-drivers expect the port structures | ||
| 1065 | * to exist when their shutdown method is called, so we have to go | ||
| 1066 | * through this awkward two-step unregistration procedure. | ||
| 1067 | */ | ||
| 1046 | for (i = 0; i < serial->num_ports; ++i) { | 1068 | for (i = 0; i < serial->num_ports; ++i) { |
| 1047 | port = serial->port[i]; | 1069 | port = serial->port[i]; |
| 1048 | if (port) { | 1070 | if (port) { |
| @@ -1052,11 +1074,21 @@ void usb_serial_disconnect(struct usb_interface *interface) | |||
| 1052 | tty_kref_put(tty); | 1074 | tty_kref_put(tty); |
| 1053 | } | 1075 | } |
| 1054 | kill_traffic(port); | 1076 | kill_traffic(port); |
| 1077 | cancel_work_sync(&port->work); | ||
| 1078 | device_del(&port->dev); | ||
| 1079 | } | ||
| 1080 | } | ||
| 1081 | serial->type->shutdown(serial); | ||
| 1082 | for (i = 0; i < serial->num_ports; ++i) { | ||
| 1083 | port = serial->port[i]; | ||
| 1084 | if (port) { | ||
| 1085 | put_device(&port->dev); | ||
| 1086 | serial->port[i] = NULL; | ||
| 1055 | } | 1087 | } |
| 1056 | } | 1088 | } |
| 1089 | |||
| 1057 | /* let the last holder of this object | 1090 | /* let the last holder of this object |
| 1058 | * cause it to be cleaned up */ | 1091 | * cause it to be cleaned up */ |
| 1059 | mutex_unlock(&serial->disc_mutex); | ||
| 1060 | usb_serial_put(serial); | 1092 | usb_serial_put(serial); |
| 1061 | dev_info(dev, "device disconnected\n"); | 1093 | dev_info(dev, "device disconnected\n"); |
| 1062 | } | 1094 | } |
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 4facce3d936..5ac414bda71 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
| @@ -296,14 +296,6 @@ static int visor_open(struct tty_struct *tty, struct usb_serial_port *port, | |||
| 296 | priv->throttled = 0; | 296 | priv->throttled = 0; |
| 297 | spin_unlock_irqrestore(&priv->lock, flags); | 297 | spin_unlock_irqrestore(&priv->lock, flags); |
| 298 | 298 | ||
| 299 | /* | ||
| 300 | * Force low_latency on so that our tty_push actually forces the data | ||
| 301 | * through, otherwise it is scheduled, and with high data rates (like | ||
| 302 | * with OHCI) data can get lost. | ||
| 303 | */ | ||
| 304 | if (tty) | ||
| 305 | tty->low_latency = 1; | ||
| 306 | |||
| 307 | /* Start reading from the device */ | 299 | /* Start reading from the device */ |
| 308 | usb_fill_bulk_urb(port->read_urb, serial->dev, | 300 | usb_fill_bulk_urb(port->read_urb, serial->dev, |
| 309 | usb_rcvbulkpipe(serial->dev, | 301 | usb_rcvbulkpipe(serial->dev, |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 96db479d116..fa65a3b0860 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -1851,6 +1851,12 @@ UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, | |||
| 1851 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1851 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1852 | US_FL_CAPACITY_HEURISTICS), | 1852 | US_FL_CAPACITY_HEURISTICS), |
| 1853 | 1853 | ||
| 1854 | /* Reported by Alessio Treglia <quadrispro@ubuntu.com> */ | ||
| 1855 | UNUSUAL_DEV( 0xed10, 0x7636, 0x0001, 0x0001, | ||
| 1856 | "TGE", | ||
| 1857 | "Digital MP3 Audio Player", | ||
| 1858 | US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), | ||
| 1859 | |||
| 1854 | /* Control/Bulk transport for all SubClass values */ | 1860 | /* Control/Bulk transport for all SubClass values */ |
| 1855 | USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR), | 1861 | USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR), |
| 1856 | USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR), | 1862 | USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR), |
diff --git a/drivers/watchdog/orion5x_wdt.c b/drivers/watchdog/orion5x_wdt.c index 7529616739d..2cde568e4fb 100644 --- a/drivers/watchdog/orion5x_wdt.c +++ b/drivers/watchdog/orion5x_wdt.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 25 | #include <mach/bridge-regs.h> | ||
| 25 | #include <plat/orion5x_wdt.h> | 26 | #include <plat/orion5x_wdt.h> |
| 26 | 27 | ||
| 27 | /* | 28 | /* |
diff --git a/firmware/Makefile b/firmware/Makefile index 142c17ab9e5..25200d106ee 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -46,6 +46,7 @@ fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin | |||
| 46 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ | 46 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ |
| 47 | e100/d102e_ucode.bin | 47 | e100/d102e_ucode.bin |
| 48 | fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin | 48 | fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin |
| 49 | fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis | ||
| 49 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin | 50 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin |
| 50 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ | 51 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ |
| 51 | advansys/3550.bin advansys/38C0800.bin | 52 | advansys/3550.bin advansys/38C0800.bin |
diff --git a/firmware/WHENCE b/firmware/WHENCE index 10f61c9e5a8..4c52984a831 100644 --- a/firmware/WHENCE +++ b/firmware/WHENCE | |||
| @@ -576,6 +576,16 @@ Found in hex form in kernel source. | |||
| 576 | 576 | ||
| 577 | -------------------------------------------------------------------------- | 577 | -------------------------------------------------------------------------- |
| 578 | 578 | ||
| 579 | Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter | ||
| 580 | |||
| 581 | File: cis/LA-PCM.cis | ||
| 582 | |||
| 583 | Licence: GPL | ||
| 584 | |||
| 585 | Originally developed by the pcmcia-cs project | ||
| 586 | |||
| 587 | -------------------------------------------------------------------------- | ||
| 588 | |||
| 579 | Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA | 589 | Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA |
| 580 | 590 | ||
| 581 | File: ositech/Xilinx7OD.bin | 591 | File: ositech/Xilinx7OD.bin |
diff --git a/firmware/cis/LA-PCM.cis.ihex b/firmware/cis/LA-PCM.cis.ihex new file mode 100644 index 00000000000..a0ff0c7b393 --- /dev/null +++ b/firmware/cis/LA-PCM.cis.ihex | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | :100000000105D4F953E9FF17035338FF20040FC04B | ||
| 2 | :1000100002002102060315390401416C6C69656414 | ||
| 3 | :100020002054656C657369732C4B2E4B00457468C6 | ||
| 4 | :1000300065726E6574204C414E20436172640043CA | ||
| 5 | :10004000656E747265434F4D004C412D50434D0019 | ||
| 6 | :10005000FF1A0602100000020B1B08810108E06075 | ||
| 7 | :1000600000021F1B08820108E06020021F1B08839A | ||
| 8 | :100070000108E06040021F1B08840108E060600284 | ||
| 9 | :100080001F1B08850108E06080021F1B088601080D | ||
| 10 | :10009000E060A0021F1B08870108E060C0021F1B70 | ||
| 11 | :1000A00008880108E060E0021F1B08890108E06081 | ||
| 12 | :1000B00000031F1B088A0108E06020031F1B088B38 | ||
| 13 | :1000C0000108E06040031F1B088C0108E06060032A | ||
| 14 | :1000D0001F1B088D0108E06080031F1B088E0108AC | ||
| 15 | :1000E000E060A0031F1B088F0108E060C0031F1B16 | ||
| 16 | :0D00F00008900108E060E0031F1400FF000D | ||
| 17 | :00000001FF | ||
| 18 | # | ||
| 19 | # Replacement CIS for Allied Telesis LA-PCM | ||
| 20 | # | ||
| @@ -175,14 +175,6 @@ struct bio_vec *bvec_alloc_bs(gfp_t gfp_mask, int nr, unsigned long *idx, | |||
| 175 | struct bio_vec *bvl; | 175 | struct bio_vec *bvl; |
| 176 | 176 | ||
| 177 | /* | 177 | /* |
| 178 | * If 'bs' is given, lookup the pool and do the mempool alloc. | ||
| 179 | * If not, this is a bio_kmalloc() allocation and just do a | ||
| 180 | * kzalloc() for the exact number of vecs right away. | ||
| 181 | */ | ||
| 182 | if (!bs) | ||
| 183 | bvl = kmalloc(nr * sizeof(struct bio_vec), gfp_mask); | ||
| 184 | |||
| 185 | /* | ||
| 186 | * see comment near bvec_array define! | 178 | * see comment near bvec_array define! |
| 187 | */ | 179 | */ |
| 188 | switch (nr) { | 180 | switch (nr) { |
| @@ -260,21 +252,6 @@ void bio_free(struct bio *bio, struct bio_set *bs) | |||
| 260 | mempool_free(p, bs->bio_pool); | 252 | mempool_free(p, bs->bio_pool); |
| 261 | } | 253 | } |
| 262 | 254 | ||
| 263 | /* | ||
| 264 | * default destructor for a bio allocated with bio_alloc_bioset() | ||
| 265 | */ | ||
| 266 | static void bio_fs_destructor(struct bio *bio) | ||
| 267 | { | ||
| 268 | bio_free(bio, fs_bio_set); | ||
| 269 | } | ||
| 270 | |||
| 271 | static void bio_kmalloc_destructor(struct bio *bio) | ||
| 272 | { | ||
| 273 | if (bio_has_allocated_vec(bio)) | ||
| 274 | kfree(bio->bi_io_vec); | ||
| 275 | kfree(bio); | ||
| 276 | } | ||
| 277 | |||
| 278 | void bio_init(struct bio *bio) | 255 | void bio_init(struct bio *bio) |
| 279 | { | 256 | { |
| 280 | memset(bio, 0, sizeof(*bio)); | 257 | memset(bio, 0, sizeof(*bio)); |
| @@ -301,21 +278,15 @@ void bio_init(struct bio *bio) | |||
| 301 | **/ | 278 | **/ |
| 302 | struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) | 279 | struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) |
| 303 | { | 280 | { |
| 281 | unsigned long idx = BIO_POOL_NONE; | ||
| 304 | struct bio_vec *bvl = NULL; | 282 | struct bio_vec *bvl = NULL; |
| 305 | struct bio *bio = NULL; | 283 | struct bio *bio; |
| 306 | unsigned long idx = 0; | 284 | void *p; |
| 307 | void *p = NULL; | 285 | |
| 308 | 286 | p = mempool_alloc(bs->bio_pool, gfp_mask); | |
| 309 | if (bs) { | 287 | if (unlikely(!p)) |
| 310 | p = mempool_alloc(bs->bio_pool, gfp_mask); | 288 | return NULL; |
| 311 | if (!p) | 289 | bio = p + bs->front_pad; |
| 312 | goto err; | ||
| 313 | bio = p + bs->front_pad; | ||
| 314 | } else { | ||
| 315 | bio = kmalloc(sizeof(*bio), gfp_mask); | ||
| 316 | if (!bio) | ||
| 317 | goto err; | ||
| 318 | } | ||
| 319 | 290 | ||
| 320 | bio_init(bio); | 291 | bio_init(bio); |
| 321 | 292 | ||
| @@ -332,22 +303,50 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) | |||
| 332 | 303 | ||
| 333 | nr_iovecs = bvec_nr_vecs(idx); | 304 | nr_iovecs = bvec_nr_vecs(idx); |
| 334 | } | 305 | } |
| 306 | out_set: | ||
| 335 | bio->bi_flags |= idx << BIO_POOL_OFFSET; | 307 | bio->bi_flags |= idx << BIO_POOL_OFFSET; |
| 336 | bio->bi_max_vecs = nr_iovecs; | 308 | bio->bi_max_vecs = nr_iovecs; |
| 337 | out_set: | ||
| 338 | bio->bi_io_vec = bvl; | 309 | bio->bi_io_vec = bvl; |
| 339 | |||
| 340 | return bio; | 310 | return bio; |
| 341 | 311 | ||
| 342 | err_free: | 312 | err_free: |
| 343 | if (bs) | 313 | mempool_free(p, bs->bio_pool); |
| 344 | mempool_free(p, bs->bio_pool); | ||
| 345 | else | ||
| 346 | kfree(bio); | ||
| 347 | err: | ||
| 348 | return NULL; | 314 | return NULL; |
| 349 | } | 315 | } |
| 350 | 316 | ||
| 317 | static void bio_fs_destructor(struct bio *bio) | ||
| 318 | { | ||
| 319 | bio_free(bio, fs_bio_set); | ||
| 320 | } | ||
| 321 | |||
| 322 | /** | ||
| 323 | * bio_alloc - allocate a new bio, memory pool backed | ||
| 324 | * @gfp_mask: allocation mask to use | ||
| 325 | * @nr_iovecs: number of iovecs | ||
| 326 | * | ||
| 327 | * Allocate a new bio with @nr_iovecs bvecs. If @gfp_mask | ||
| 328 | * contains __GFP_WAIT, the allocation is guaranteed to succeed. | ||
| 329 | * | ||
| 330 | * RETURNS: | ||
| 331 | * Pointer to new bio on success, NULL on failure. | ||
| 332 | */ | ||
| 333 | struct bio *bio_alloc(gfp_t gfp_mask, int nr_iovecs) | ||
| 334 | { | ||
| 335 | struct bio *bio = bio_alloc_bioset(gfp_mask, nr_iovecs, fs_bio_set); | ||
| 336 | |||
| 337 | if (bio) | ||
| 338 | bio->bi_destructor = bio_fs_destructor; | ||
| 339 | |||
| 340 | return bio; | ||
| 341 | } | ||
| 342 | |||
| 343 | static void bio_kmalloc_destructor(struct bio *bio) | ||
| 344 | { | ||
| 345 | if (bio_integrity(bio)) | ||
| 346 | bio_integrity_free(bio); | ||
| 347 | kfree(bio); | ||
| 348 | } | ||
| 349 | |||
| 351 | /** | 350 | /** |
| 352 | * bio_alloc - allocate a bio for I/O | 351 | * bio_alloc - allocate a bio for I/O |
| 353 | * @gfp_mask: the GFP_ mask given to the slab allocator | 352 | * @gfp_mask: the GFP_ mask given to the slab allocator |
| @@ -366,29 +365,20 @@ err: | |||
| 366 | * do so can cause livelocks under memory pressure. | 365 | * do so can cause livelocks under memory pressure. |
| 367 | * | 366 | * |
| 368 | **/ | 367 | **/ |
| 369 | struct bio *bio_alloc(gfp_t gfp_mask, int nr_iovecs) | ||
| 370 | { | ||
| 371 | struct bio *bio = bio_alloc_bioset(gfp_mask, nr_iovecs, fs_bio_set); | ||
| 372 | |||
| 373 | if (bio) | ||
| 374 | bio->bi_destructor = bio_fs_destructor; | ||
| 375 | |||
| 376 | return bio; | ||
| 377 | } | ||
| 378 | |||
| 379 | /* | ||
| 380 | * Like bio_alloc(), but doesn't use a mempool backing. This means that | ||
| 381 | * it CAN fail, but while bio_alloc() can only be used for allocations | ||
| 382 | * that have a short (finite) life span, bio_kmalloc() should be used | ||
| 383 | * for more permanent bio allocations (like allocating some bio's for | ||
| 384 | * initalization or setup purposes). | ||
| 385 | */ | ||
| 386 | struct bio *bio_kmalloc(gfp_t gfp_mask, int nr_iovecs) | 368 | struct bio *bio_kmalloc(gfp_t gfp_mask, int nr_iovecs) |
| 387 | { | 369 | { |
| 388 | struct bio *bio = bio_alloc_bioset(gfp_mask, nr_iovecs, NULL); | 370 | struct bio *bio; |
| 389 | 371 | ||
| 390 | if (bio) | 372 | bio = kmalloc(sizeof(struct bio) + nr_iovecs * sizeof(struct bio_vec), |
| 391 | bio->bi_destructor = bio_kmalloc_destructor; | 373 | gfp_mask); |
| 374 | if (unlikely(!bio)) | ||
| 375 | return NULL; | ||
| 376 | |||
| 377 | bio_init(bio); | ||
| 378 | bio->bi_flags |= BIO_POOL_NONE << BIO_POOL_OFFSET; | ||
| 379 | bio->bi_max_vecs = nr_iovecs; | ||
| 380 | bio->bi_io_vec = bio->bi_inline_vecs; | ||
| 381 | bio->bi_destructor = bio_kmalloc_destructor; | ||
| 392 | 382 | ||
| 393 | return bio; | 383 | return bio; |
| 394 | } | 384 | } |
| @@ -832,7 +822,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, | |||
| 832 | return ERR_PTR(-ENOMEM); | 822 | return ERR_PTR(-ENOMEM); |
| 833 | 823 | ||
| 834 | ret = -ENOMEM; | 824 | ret = -ENOMEM; |
| 835 | bio = bio_alloc(gfp_mask, nr_pages); | 825 | bio = bio_kmalloc(gfp_mask, nr_pages); |
| 836 | if (!bio) | 826 | if (!bio) |
| 837 | goto out_bmd; | 827 | goto out_bmd; |
| 838 | 828 | ||
| @@ -956,7 +946,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q, | |||
| 956 | if (!nr_pages) | 946 | if (!nr_pages) |
| 957 | return ERR_PTR(-EINVAL); | 947 | return ERR_PTR(-EINVAL); |
| 958 | 948 | ||
| 959 | bio = bio_alloc(gfp_mask, nr_pages); | 949 | bio = bio_kmalloc(gfp_mask, nr_pages); |
| 960 | if (!bio) | 950 | if (!bio) |
| 961 | return ERR_PTR(-ENOMEM); | 951 | return ERR_PTR(-ENOMEM); |
| 962 | 952 | ||
| @@ -1140,7 +1130,7 @@ static struct bio *__bio_map_kern(struct request_queue *q, void *data, | |||
| 1140 | int offset, i; | 1130 | int offset, i; |
| 1141 | struct bio *bio; | 1131 | struct bio *bio; |
| 1142 | 1132 | ||
| 1143 | bio = bio_alloc(gfp_mask, nr_pages); | 1133 | bio = bio_kmalloc(gfp_mask, nr_pages); |
| 1144 | if (!bio) | 1134 | if (!bio) |
| 1145 | return ERR_PTR(-ENOMEM); | 1135 | return ERR_PTR(-ENOMEM); |
| 1146 | 1136 | ||
diff --git a/fs/compat.c b/fs/compat.c index 379a399bf5c..681ed81e6be 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1476,6 +1476,7 @@ int compat_do_execve(char * filename, | |||
| 1476 | struct linux_binprm *bprm; | 1476 | struct linux_binprm *bprm; |
| 1477 | struct file *file; | 1477 | struct file *file; |
| 1478 | struct files_struct *displaced; | 1478 | struct files_struct *displaced; |
| 1479 | bool clear_in_exec; | ||
| 1479 | int retval; | 1480 | int retval; |
| 1480 | 1481 | ||
| 1481 | retval = unshare_files(&displaced); | 1482 | retval = unshare_files(&displaced); |
| @@ -1498,8 +1499,9 @@ int compat_do_execve(char * filename, | |||
| 1498 | goto out_unlock; | 1499 | goto out_unlock; |
| 1499 | 1500 | ||
| 1500 | retval = check_unsafe_exec(bprm); | 1501 | retval = check_unsafe_exec(bprm); |
| 1501 | if (retval) | 1502 | if (retval < 0) |
| 1502 | goto out_unlock; | 1503 | goto out_unlock; |
| 1504 | clear_in_exec = retval; | ||
| 1503 | 1505 | ||
| 1504 | file = open_exec(filename); | 1506 | file = open_exec(filename); |
| 1505 | retval = PTR_ERR(file); | 1507 | retval = PTR_ERR(file); |
| @@ -1546,9 +1548,7 @@ int compat_do_execve(char * filename, | |||
| 1546 | goto out; | 1548 | goto out; |
| 1547 | 1549 | ||
| 1548 | /* execve succeeded */ | 1550 | /* execve succeeded */ |
| 1549 | write_lock(¤t->fs->lock); | ||
| 1550 | current->fs->in_exec = 0; | 1551 | current->fs->in_exec = 0; |
| 1551 | write_unlock(¤t->fs->lock); | ||
| 1552 | current->in_execve = 0; | 1552 | current->in_execve = 0; |
| 1553 | mutex_unlock(¤t->cred_exec_mutex); | 1553 | mutex_unlock(¤t->cred_exec_mutex); |
| 1554 | acct_update_integrals(current); | 1554 | acct_update_integrals(current); |
| @@ -1568,9 +1568,8 @@ out_file: | |||
| 1568 | } | 1568 | } |
| 1569 | 1569 | ||
| 1570 | out_unmark: | 1570 | out_unmark: |
| 1571 | write_lock(¤t->fs->lock); | 1571 | if (clear_in_exec) |
| 1572 | current->fs->in_exec = 0; | 1572 | current->fs->in_exec = 0; |
| 1573 | write_unlock(¤t->fs->lock); | ||
| 1574 | 1573 | ||
| 1575 | out_unlock: | 1574 | out_unlock: |
| 1576 | current->in_execve = 0; | 1575 | current->in_execve = 0; |
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 8b65f289ee0..b91851f1cda 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
| @@ -483,15 +483,7 @@ int ecryptfs_encrypt_page(struct page *page) | |||
| 483 | ecryptfs_inode = page->mapping->host; | 483 | ecryptfs_inode = page->mapping->host; |
| 484 | crypt_stat = | 484 | crypt_stat = |
| 485 | &(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat); | 485 | &(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat); |
| 486 | if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { | 486 | BUG_ON(!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)); |
| 487 | rc = ecryptfs_write_lower_page_segment(ecryptfs_inode, page, | ||
| 488 | 0, PAGE_CACHE_SIZE); | ||
| 489 | if (rc) | ||
| 490 | printk(KERN_ERR "%s: Error attempting to copy " | ||
| 491 | "page at index [%ld]\n", __func__, | ||
| 492 | page->index); | ||
| 493 | goto out; | ||
| 494 | } | ||
| 495 | enc_extent_page = alloc_page(GFP_USER); | 487 | enc_extent_page = alloc_page(GFP_USER); |
| 496 | if (!enc_extent_page) { | 488 | if (!enc_extent_page) { |
| 497 | rc = -ENOMEM; | 489 | rc = -ENOMEM; |
| @@ -620,16 +612,7 @@ int ecryptfs_decrypt_page(struct page *page) | |||
| 620 | ecryptfs_inode = page->mapping->host; | 612 | ecryptfs_inode = page->mapping->host; |
| 621 | crypt_stat = | 613 | crypt_stat = |
| 622 | &(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat); | 614 | &(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat); |
| 623 | if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { | 615 | BUG_ON(!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)); |
| 624 | rc = ecryptfs_read_lower_page_segment(page, page->index, 0, | ||
| 625 | PAGE_CACHE_SIZE, | ||
| 626 | ecryptfs_inode); | ||
| 627 | if (rc) | ||
| 628 | printk(KERN_ERR "%s: Error attempting to copy " | ||
| 629 | "page at index [%ld]\n", __func__, | ||
| 630 | page->index); | ||
| 631 | goto out; | ||
| 632 | } | ||
| 633 | enc_extent_page = alloc_page(GFP_USER); | 616 | enc_extent_page = alloc_page(GFP_USER); |
| 634 | if (!enc_extent_page) { | 617 | if (!enc_extent_page) { |
| 635 | rc = -ENOMEM; | 618 | rc = -ENOMEM; |
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index 064c5820e4e..00b30a2d546 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
| @@ -269,6 +269,7 @@ struct ecryptfs_crypt_stat { | |||
| 269 | #define ECRYPTFS_ENCRYPT_FILENAMES 0x00000800 | 269 | #define ECRYPTFS_ENCRYPT_FILENAMES 0x00000800 |
| 270 | #define ECRYPTFS_ENCFN_USE_MOUNT_FNEK 0x00001000 | 270 | #define ECRYPTFS_ENCFN_USE_MOUNT_FNEK 0x00001000 |
| 271 | #define ECRYPTFS_ENCFN_USE_FEK 0x00002000 | 271 | #define ECRYPTFS_ENCFN_USE_FEK 0x00002000 |
| 272 | #define ECRYPTFS_UNLINK_SIGS 0x00004000 | ||
| 272 | u32 flags; | 273 | u32 flags; |
| 273 | unsigned int file_version; | 274 | unsigned int file_version; |
| 274 | size_t iv_bytes; | 275 | size_t iv_bytes; |
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 55b3145b807..93bc0f8174a 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
| @@ -379,9 +379,11 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, | |||
| 379 | goto out_d_drop; | 379 | goto out_d_drop; |
| 380 | } | 380 | } |
| 381 | lower_dir_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry->d_parent); | 381 | lower_dir_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry->d_parent); |
| 382 | mutex_lock(&lower_dir_dentry->d_inode->i_mutex); | ||
| 382 | lower_dentry = lookup_one_len(ecryptfs_dentry->d_name.name, | 383 | lower_dentry = lookup_one_len(ecryptfs_dentry->d_name.name, |
| 383 | lower_dir_dentry, | 384 | lower_dir_dentry, |
| 384 | ecryptfs_dentry->d_name.len); | 385 | ecryptfs_dentry->d_name.len); |
| 386 | mutex_unlock(&lower_dir_dentry->d_inode->i_mutex); | ||
| 385 | if (IS_ERR(lower_dentry)) { | 387 | if (IS_ERR(lower_dentry)) { |
| 386 | rc = PTR_ERR(lower_dentry); | 388 | rc = PTR_ERR(lower_dentry); |
| 387 | printk(KERN_ERR "%s: lookup_one_len() returned [%d] on " | 389 | printk(KERN_ERR "%s: lookup_one_len() returned [%d] on " |
| @@ -406,9 +408,11 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, | |||
| 406 | "filename; rc = [%d]\n", __func__, rc); | 408 | "filename; rc = [%d]\n", __func__, rc); |
| 407 | goto out_d_drop; | 409 | goto out_d_drop; |
| 408 | } | 410 | } |
| 411 | mutex_lock(&lower_dir_dentry->d_inode->i_mutex); | ||
| 409 | lower_dentry = lookup_one_len(encrypted_and_encoded_name, | 412 | lower_dentry = lookup_one_len(encrypted_and_encoded_name, |
| 410 | lower_dir_dentry, | 413 | lower_dir_dentry, |
| 411 | encrypted_and_encoded_name_size - 1); | 414 | encrypted_and_encoded_name_size - 1); |
| 415 | mutex_unlock(&lower_dir_dentry->d_inode->i_mutex); | ||
| 412 | if (IS_ERR(lower_dentry)) { | 416 | if (IS_ERR(lower_dentry)) { |
| 413 | rc = PTR_ERR(lower_dentry); | 417 | rc = PTR_ERR(lower_dentry); |
| 414 | printk(KERN_ERR "%s: lookup_one_len() returned [%d] on " | 418 | printk(KERN_ERR "%s: lookup_one_len() returned [%d] on " |
| @@ -636,8 +640,9 @@ static int | |||
| 636 | ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) | 640 | ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) |
| 637 | { | 641 | { |
| 638 | char *lower_buf; | 642 | char *lower_buf; |
| 643 | size_t lower_bufsiz; | ||
| 639 | struct dentry *lower_dentry; | 644 | struct dentry *lower_dentry; |
| 640 | struct ecryptfs_crypt_stat *crypt_stat; | 645 | struct ecryptfs_mount_crypt_stat *mount_crypt_stat; |
| 641 | char *plaintext_name; | 646 | char *plaintext_name; |
| 642 | size_t plaintext_name_size; | 647 | size_t plaintext_name_size; |
| 643 | mm_segment_t old_fs; | 648 | mm_segment_t old_fs; |
| @@ -648,12 +653,21 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) | |||
| 648 | rc = -EINVAL; | 653 | rc = -EINVAL; |
| 649 | goto out; | 654 | goto out; |
| 650 | } | 655 | } |
| 651 | crypt_stat = &ecryptfs_inode_to_private(dentry->d_inode)->crypt_stat; | 656 | mount_crypt_stat = &ecryptfs_superblock_to_private( |
| 657 | dentry->d_sb)->mount_crypt_stat; | ||
| 658 | /* | ||
| 659 | * If the lower filename is encrypted, it will result in a significantly | ||
| 660 | * longer name. If needed, truncate the name after decode and decrypt. | ||
| 661 | */ | ||
| 662 | if (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES) | ||
| 663 | lower_bufsiz = PATH_MAX; | ||
| 664 | else | ||
| 665 | lower_bufsiz = bufsiz; | ||
| 652 | /* Released in this function */ | 666 | /* Released in this function */ |
| 653 | lower_buf = kmalloc(bufsiz, GFP_KERNEL); | 667 | lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL); |
| 654 | if (lower_buf == NULL) { | 668 | if (lower_buf == NULL) { |
| 655 | printk(KERN_ERR "%s: Out of memory whilst attempting to " | 669 | printk(KERN_ERR "%s: Out of memory whilst attempting to " |
| 656 | "kmalloc [%d] bytes\n", __func__, bufsiz); | 670 | "kmalloc [%d] bytes\n", __func__, lower_bufsiz); |
| 657 | rc = -ENOMEM; | 671 | rc = -ENOMEM; |
| 658 | goto out; | 672 | goto out; |
| 659 | } | 673 | } |
| @@ -661,7 +675,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) | |||
| 661 | set_fs(get_ds()); | 675 | set_fs(get_ds()); |
| 662 | rc = lower_dentry->d_inode->i_op->readlink(lower_dentry, | 676 | rc = lower_dentry->d_inode->i_op->readlink(lower_dentry, |
| 663 | (char __user *)lower_buf, | 677 | (char __user *)lower_buf, |
| 664 | bufsiz); | 678 | lower_bufsiz); |
| 665 | set_fs(old_fs); | 679 | set_fs(old_fs); |
| 666 | if (rc >= 0) { | 680 | if (rc >= 0) { |
| 667 | rc = ecryptfs_decode_and_decrypt_filename(&plaintext_name, | 681 | rc = ecryptfs_decode_and_decrypt_filename(&plaintext_name, |
| @@ -674,7 +688,9 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) | |||
| 674 | rc); | 688 | rc); |
| 675 | goto out_free_lower_buf; | 689 | goto out_free_lower_buf; |
| 676 | } | 690 | } |
| 677 | rc = copy_to_user(buf, plaintext_name, plaintext_name_size); | 691 | /* Check for bufsiz <= 0 done in sys_readlinkat() */ |
| 692 | rc = copy_to_user(buf, plaintext_name, | ||
| 693 | min((unsigned) bufsiz, plaintext_name_size)); | ||
| 678 | if (rc) | 694 | if (rc) |
| 679 | rc = -EFAULT; | 695 | rc = -EFAULT; |
| 680 | else | 696 | else |
| @@ -814,6 +830,13 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length) | |||
| 814 | size_t num_zeros = (PAGE_CACHE_SIZE | 830 | size_t num_zeros = (PAGE_CACHE_SIZE |
| 815 | - (new_length & ~PAGE_CACHE_MASK)); | 831 | - (new_length & ~PAGE_CACHE_MASK)); |
| 816 | 832 | ||
| 833 | if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { | ||
| 834 | rc = vmtruncate(inode, new_length); | ||
| 835 | if (rc) | ||
| 836 | goto out_free; | ||
| 837 | rc = vmtruncate(lower_dentry->d_inode, new_length); | ||
| 838 | goto out_free; | ||
| 839 | } | ||
| 817 | if (num_zeros) { | 840 | if (num_zeros) { |
| 818 | char *zeros_virt; | 841 | char *zeros_virt; |
| 819 | 842 | ||
| @@ -915,8 +938,6 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) | |||
| 915 | } | 938 | } |
| 916 | rc = 0; | 939 | rc = 0; |
| 917 | crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); | 940 | crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); |
| 918 | mutex_unlock(&crypt_stat->cs_mutex); | ||
| 919 | goto out; | ||
| 920 | } | 941 | } |
| 921 | } | 942 | } |
| 922 | mutex_unlock(&crypt_stat->cs_mutex); | 943 | mutex_unlock(&crypt_stat->cs_mutex); |
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index aed56c25539..ccabd5faa04 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
| @@ -190,14 +190,14 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry, | |||
| 190 | init_special_inode(inode, lower_inode->i_mode, | 190 | init_special_inode(inode, lower_inode->i_mode, |
| 191 | lower_inode->i_rdev); | 191 | lower_inode->i_rdev); |
| 192 | dentry->d_op = &ecryptfs_dops; | 192 | dentry->d_op = &ecryptfs_dops; |
| 193 | if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD) | ||
| 194 | d_add(dentry, inode); | ||
| 195 | else | ||
| 196 | d_instantiate(dentry, inode); | ||
| 197 | fsstack_copy_attr_all(inode, lower_inode, NULL); | 193 | fsstack_copy_attr_all(inode, lower_inode, NULL); |
| 198 | /* This size will be overwritten for real files w/ headers and | 194 | /* This size will be overwritten for real files w/ headers and |
| 199 | * other metadata */ | 195 | * other metadata */ |
| 200 | fsstack_copy_inode_size(inode, lower_inode); | 196 | fsstack_copy_inode_size(inode, lower_inode); |
| 197 | if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD) | ||
| 198 | d_add(dentry, inode); | ||
| 199 | else | ||
| 200 | d_instantiate(dentry, inode); | ||
| 201 | out: | 201 | out: |
| 202 | return rc; | 202 | return rc; |
| 203 | } | 203 | } |
| @@ -208,7 +208,7 @@ enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig, | |||
| 208 | ecryptfs_opt_passthrough, ecryptfs_opt_xattr_metadata, | 208 | ecryptfs_opt_passthrough, ecryptfs_opt_xattr_metadata, |
| 209 | ecryptfs_opt_encrypted_view, ecryptfs_opt_fnek_sig, | 209 | ecryptfs_opt_encrypted_view, ecryptfs_opt_fnek_sig, |
| 210 | ecryptfs_opt_fn_cipher, ecryptfs_opt_fn_cipher_key_bytes, | 210 | ecryptfs_opt_fn_cipher, ecryptfs_opt_fn_cipher_key_bytes, |
| 211 | ecryptfs_opt_err }; | 211 | ecryptfs_opt_unlink_sigs, ecryptfs_opt_err }; |
| 212 | 212 | ||
| 213 | static const match_table_t tokens = { | 213 | static const match_table_t tokens = { |
| 214 | {ecryptfs_opt_sig, "sig=%s"}, | 214 | {ecryptfs_opt_sig, "sig=%s"}, |
| @@ -222,6 +222,7 @@ static const match_table_t tokens = { | |||
| 222 | {ecryptfs_opt_fnek_sig, "ecryptfs_fnek_sig=%s"}, | 222 | {ecryptfs_opt_fnek_sig, "ecryptfs_fnek_sig=%s"}, |
| 223 | {ecryptfs_opt_fn_cipher, "ecryptfs_fn_cipher=%s"}, | 223 | {ecryptfs_opt_fn_cipher, "ecryptfs_fn_cipher=%s"}, |
| 224 | {ecryptfs_opt_fn_cipher_key_bytes, "ecryptfs_fn_key_bytes=%u"}, | 224 | {ecryptfs_opt_fn_cipher_key_bytes, "ecryptfs_fn_key_bytes=%u"}, |
| 225 | {ecryptfs_opt_unlink_sigs, "ecryptfs_unlink_sigs"}, | ||
| 225 | {ecryptfs_opt_err, NULL} | 226 | {ecryptfs_opt_err, NULL} |
| 226 | }; | 227 | }; |
| 227 | 228 | ||
| @@ -402,6 +403,9 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options) | |||
| 402 | fn_cipher_key_bytes; | 403 | fn_cipher_key_bytes; |
| 403 | fn_cipher_key_bytes_set = 1; | 404 | fn_cipher_key_bytes_set = 1; |
| 404 | break; | 405 | break; |
| 406 | case ecryptfs_opt_unlink_sigs: | ||
| 407 | mount_crypt_stat->flags |= ECRYPTFS_UNLINK_SIGS; | ||
| 408 | break; | ||
| 405 | case ecryptfs_opt_err: | 409 | case ecryptfs_opt_err: |
| 406 | default: | 410 | default: |
| 407 | printk(KERN_WARNING | 411 | printk(KERN_WARNING |
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c index 295e7fa5675..f1c17e87c5f 100644 --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c | |||
| @@ -133,45 +133,6 @@ out: | |||
| 133 | return rc; | 133 | return rc; |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | static int | ||
| 137 | ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type, | ||
| 138 | struct ecryptfs_msg_ctx **msg_ctx); | ||
| 139 | |||
| 140 | /** | ||
| 141 | * ecryptfs_send_raw_message | ||
| 142 | * @msg_type: Message type | ||
| 143 | * @daemon: Daemon struct for recipient of message | ||
| 144 | * | ||
| 145 | * A raw message is one that does not include an ecryptfs_message | ||
| 146 | * struct. It simply has a type. | ||
| 147 | * | ||
| 148 | * Must be called with ecryptfs_daemon_hash_mux held. | ||
| 149 | * | ||
| 150 | * Returns zero on success; non-zero otherwise | ||
| 151 | */ | ||
| 152 | static int ecryptfs_send_raw_message(u8 msg_type, | ||
| 153 | struct ecryptfs_daemon *daemon) | ||
| 154 | { | ||
| 155 | struct ecryptfs_msg_ctx *msg_ctx; | ||
| 156 | int rc; | ||
| 157 | |||
| 158 | rc = ecryptfs_send_message_locked(NULL, 0, msg_type, &msg_ctx); | ||
| 159 | if (rc) { | ||
| 160 | printk(KERN_ERR "%s: Error whilst attempting to send " | ||
| 161 | "message to ecryptfsd; rc = [%d]\n", __func__, rc); | ||
| 162 | goto out; | ||
| 163 | } | ||
| 164 | /* Raw messages are logically context-free (e.g., no | ||
| 165 | * reply is expected), so we set the state of the | ||
| 166 | * ecryptfs_msg_ctx object to indicate that it should | ||
| 167 | * be freed as soon as the message is sent. */ | ||
| 168 | mutex_lock(&msg_ctx->mux); | ||
| 169 | msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_NO_REPLY; | ||
| 170 | mutex_unlock(&msg_ctx->mux); | ||
| 171 | out: | ||
| 172 | return rc; | ||
| 173 | } | ||
| 174 | |||
| 175 | /** | 136 | /** |
| 176 | * ecryptfs_spawn_daemon - Create and initialize a new daemon struct | 137 | * ecryptfs_spawn_daemon - Create and initialize a new daemon struct |
| 177 | * @daemon: Pointer to set to newly allocated daemon struct | 138 | * @daemon: Pointer to set to newly allocated daemon struct |
| @@ -212,49 +173,6 @@ out: | |||
| 212 | } | 173 | } |
| 213 | 174 | ||
| 214 | /** | 175 | /** |
| 215 | * ecryptfs_process_helo | ||
| 216 | * @euid: The user ID owner of the message | ||
| 217 | * @user_ns: The namespace in which @euid applies | ||
| 218 | * @pid: The process ID for the userspace program that sent the | ||
| 219 | * message | ||
| 220 | * | ||
| 221 | * Adds the euid and pid values to the daemon euid hash. If an euid | ||
| 222 | * already has a daemon pid registered, the daemon will be | ||
| 223 | * unregistered before the new daemon is put into the hash list. | ||
| 224 | * Returns zero after adding a new daemon to the hash list; | ||
| 225 | * non-zero otherwise. | ||
| 226 | */ | ||
| 227 | int ecryptfs_process_helo(uid_t euid, struct user_namespace *user_ns, | ||
| 228 | struct pid *pid) | ||
| 229 | { | ||
| 230 | struct ecryptfs_daemon *new_daemon; | ||
| 231 | struct ecryptfs_daemon *old_daemon; | ||
| 232 | int rc; | ||
| 233 | |||
| 234 | mutex_lock(&ecryptfs_daemon_hash_mux); | ||
| 235 | rc = ecryptfs_find_daemon_by_euid(&old_daemon, euid, user_ns); | ||
| 236 | if (rc != 0) { | ||
| 237 | printk(KERN_WARNING "Received request from user [%d] " | ||
| 238 | "to register daemon [0x%p]; unregistering daemon " | ||
| 239 | "[0x%p]\n", euid, pid, old_daemon->pid); | ||
| 240 | rc = ecryptfs_send_raw_message(ECRYPTFS_MSG_QUIT, old_daemon); | ||
| 241 | if (rc) | ||
| 242 | printk(KERN_WARNING "Failed to send QUIT " | ||
| 243 | "message to daemon [0x%p]; rc = [%d]\n", | ||
| 244 | old_daemon->pid, rc); | ||
| 245 | hlist_del(&old_daemon->euid_chain); | ||
| 246 | kfree(old_daemon); | ||
| 247 | } | ||
| 248 | rc = ecryptfs_spawn_daemon(&new_daemon, euid, user_ns, pid); | ||
| 249 | if (rc) | ||
| 250 | printk(KERN_ERR "%s: The gods are displeased with this attempt " | ||
| 251 | "to create a new daemon object for euid [%d]; pid " | ||
| 252 | "[0x%p]; rc = [%d]\n", __func__, euid, pid, rc); | ||
| 253 | mutex_unlock(&ecryptfs_daemon_hash_mux); | ||
| 254 | return rc; | ||
| 255 | } | ||
| 256 | |||
| 257 | /** | ||
| 258 | * ecryptfs_exorcise_daemon - Destroy the daemon struct | 176 | * ecryptfs_exorcise_daemon - Destroy the daemon struct |
| 259 | * | 177 | * |
| 260 | * Must be called ceremoniously while in possession of | 178 | * Must be called ceremoniously while in possession of |
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index dda3c58eefc..4ec8f61ccf5 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c | |||
| @@ -193,26 +193,20 @@ int ecryptfs_send_miscdev(char *data, size_t data_size, | |||
| 193 | int rc = 0; | 193 | int rc = 0; |
| 194 | 194 | ||
| 195 | mutex_lock(&msg_ctx->mux); | 195 | mutex_lock(&msg_ctx->mux); |
| 196 | if (data) { | 196 | msg_ctx->msg = kmalloc((sizeof(*msg_ctx->msg) + data_size), |
| 197 | msg_ctx->msg = kmalloc((sizeof(*msg_ctx->msg) + data_size), | 197 | GFP_KERNEL); |
| 198 | GFP_KERNEL); | 198 | if (!msg_ctx->msg) { |
| 199 | if (!msg_ctx->msg) { | 199 | rc = -ENOMEM; |
| 200 | rc = -ENOMEM; | 200 | printk(KERN_ERR "%s: Out of memory whilst attempting " |
| 201 | printk(KERN_ERR "%s: Out of memory whilst attempting " | 201 | "to kmalloc(%zd, GFP_KERNEL)\n", __func__, |
| 202 | "to kmalloc(%zd, GFP_KERNEL)\n", __func__, | 202 | (sizeof(*msg_ctx->msg) + data_size)); |
| 203 | (sizeof(*msg_ctx->msg) + data_size)); | 203 | goto out_unlock; |
| 204 | goto out_unlock; | 204 | } |
| 205 | } | ||
| 206 | } else | ||
| 207 | msg_ctx->msg = NULL; | ||
| 208 | msg_ctx->msg->index = msg_ctx->index; | 205 | msg_ctx->msg->index = msg_ctx->index; |
| 209 | msg_ctx->msg->data_len = data_size; | 206 | msg_ctx->msg->data_len = data_size; |
| 210 | msg_ctx->type = msg_type; | 207 | msg_ctx->type = msg_type; |
| 211 | if (data) { | 208 | memcpy(msg_ctx->msg->data, data, data_size); |
| 212 | memcpy(msg_ctx->msg->data, data, data_size); | 209 | msg_ctx->msg_size = (sizeof(*msg_ctx->msg) + data_size); |
| 213 | msg_ctx->msg_size = (sizeof(*msg_ctx->msg) + data_size); | ||
| 214 | } else | ||
| 215 | msg_ctx->msg_size = 0; | ||
| 216 | mutex_lock(&daemon->mux); | 210 | mutex_lock(&daemon->mux); |
| 217 | list_add_tail(&msg_ctx->daemon_out_list, &daemon->msg_ctx_out_queue); | 211 | list_add_tail(&msg_ctx->daemon_out_list, &daemon->msg_ctx_out_queue); |
| 218 | daemon->num_queued_msg_ctx++; | 212 | daemon->num_queued_msg_ctx++; |
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index 46cec2b6979..5c6bab9786e 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c | |||
| @@ -449,6 +449,7 @@ int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode) | |||
| 449 | struct ecryptfs_crypt_stat *crypt_stat; | 449 | struct ecryptfs_crypt_stat *crypt_stat; |
| 450 | 450 | ||
| 451 | crypt_stat = &ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat; | 451 | crypt_stat = &ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat; |
| 452 | BUG_ON(!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)); | ||
| 452 | if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) | 453 | if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) |
| 453 | return ecryptfs_write_inode_size_to_xattr(ecryptfs_inode); | 454 | return ecryptfs_write_inode_size_to_xattr(ecryptfs_inode); |
| 454 | else | 455 | else |
| @@ -490,6 +491,16 @@ static int ecryptfs_write_end(struct file *file, | |||
| 490 | ecryptfs_printk(KERN_DEBUG, "Not a new file\n"); | 491 | ecryptfs_printk(KERN_DEBUG, "Not a new file\n"); |
| 491 | ecryptfs_printk(KERN_DEBUG, "Calling fill_zeros_to_end_of_page" | 492 | ecryptfs_printk(KERN_DEBUG, "Calling fill_zeros_to_end_of_page" |
| 492 | "(page w/ index = [0x%.16x], to = [%d])\n", index, to); | 493 | "(page w/ index = [0x%.16x], to = [%d])\n", index, to); |
| 494 | if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { | ||
| 495 | rc = ecryptfs_write_lower_page_segment(ecryptfs_inode, page, 0, | ||
| 496 | to); | ||
| 497 | if (!rc) { | ||
| 498 | rc = copied; | ||
| 499 | fsstack_copy_inode_size(ecryptfs_inode, | ||
| 500 | ecryptfs_inode_to_lower(ecryptfs_inode)); | ||
| 501 | } | ||
| 502 | goto out; | ||
| 503 | } | ||
| 493 | /* Fills in zeros if 'to' goes beyond inode size */ | 504 | /* Fills in zeros if 'to' goes beyond inode size */ |
| 494 | rc = fill_zeros_to_end_of_page(page, to); | 505 | rc = fill_zeros_to_end_of_page(page, to); |
| 495 | if (rc) { | 506 | if (rc) { |
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c index 75c2ea9fee3..a137c6ea2fe 100644 --- a/fs/ecryptfs/read_write.c +++ b/fs/ecryptfs/read_write.c | |||
| @@ -117,13 +117,15 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset, | |||
| 117 | size_t size) | 117 | size_t size) |
| 118 | { | 118 | { |
| 119 | struct page *ecryptfs_page; | 119 | struct page *ecryptfs_page; |
| 120 | struct ecryptfs_crypt_stat *crypt_stat; | ||
| 121 | struct inode *ecryptfs_inode = ecryptfs_file->f_dentry->d_inode; | ||
| 120 | char *ecryptfs_page_virt; | 122 | char *ecryptfs_page_virt; |
| 121 | loff_t ecryptfs_file_size = | 123 | loff_t ecryptfs_file_size = i_size_read(ecryptfs_inode); |
| 122 | i_size_read(ecryptfs_file->f_dentry->d_inode); | ||
| 123 | loff_t data_offset = 0; | 124 | loff_t data_offset = 0; |
| 124 | loff_t pos; | 125 | loff_t pos; |
| 125 | int rc = 0; | 126 | int rc = 0; |
| 126 | 127 | ||
| 128 | crypt_stat = &ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat; | ||
| 127 | /* | 129 | /* |
| 128 | * if we are writing beyond current size, then start pos | 130 | * if we are writing beyond current size, then start pos |
| 129 | * at the current size - we'll fill in zeros from there. | 131 | * at the current size - we'll fill in zeros from there. |
| @@ -184,7 +186,13 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset, | |||
| 184 | flush_dcache_page(ecryptfs_page); | 186 | flush_dcache_page(ecryptfs_page); |
| 185 | SetPageUptodate(ecryptfs_page); | 187 | SetPageUptodate(ecryptfs_page); |
| 186 | unlock_page(ecryptfs_page); | 188 | unlock_page(ecryptfs_page); |
| 187 | rc = ecryptfs_encrypt_page(ecryptfs_page); | 189 | if (crypt_stat->flags & ECRYPTFS_ENCRYPTED) |
| 190 | rc = ecryptfs_encrypt_page(ecryptfs_page); | ||
| 191 | else | ||
| 192 | rc = ecryptfs_write_lower_page_segment(ecryptfs_inode, | ||
| 193 | ecryptfs_page, | ||
| 194 | start_offset_in_page, | ||
| 195 | data_offset); | ||
| 188 | page_cache_release(ecryptfs_page); | 196 | page_cache_release(ecryptfs_page); |
| 189 | if (rc) { | 197 | if (rc) { |
| 190 | printk(KERN_ERR "%s: Error encrypting " | 198 | printk(KERN_ERR "%s: Error encrypting " |
| @@ -194,14 +202,16 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset, | |||
| 194 | pos += num_bytes; | 202 | pos += num_bytes; |
| 195 | } | 203 | } |
| 196 | if ((offset + size) > ecryptfs_file_size) { | 204 | if ((offset + size) > ecryptfs_file_size) { |
| 197 | i_size_write(ecryptfs_file->f_dentry->d_inode, (offset + size)); | 205 | i_size_write(ecryptfs_inode, (offset + size)); |
| 198 | rc = ecryptfs_write_inode_size_to_metadata( | 206 | if (crypt_stat->flags & ECRYPTFS_ENCRYPTED) { |
| 199 | ecryptfs_file->f_dentry->d_inode); | 207 | rc = ecryptfs_write_inode_size_to_metadata( |
| 200 | if (rc) { | 208 | ecryptfs_inode); |
| 201 | printk(KERN_ERR "Problem with " | 209 | if (rc) { |
| 202 | "ecryptfs_write_inode_size_to_metadata; " | 210 | printk(KERN_ERR "Problem with " |
| 203 | "rc = [%d]\n", rc); | 211 | "ecryptfs_write_inode_size_to_metadata; " |
| 204 | goto out; | 212 | "rc = [%d]\n", rc); |
| 213 | goto out; | ||
| 214 | } | ||
| 205 | } | 215 | } |
| 206 | } | 216 | } |
| 207 | out: | 217 | out: |
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c index c27ac2b358a..fa4c7e7d15d 100644 --- a/fs/ecryptfs/super.c +++ b/fs/ecryptfs/super.c | |||
| @@ -170,7 +170,10 @@ static int ecryptfs_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
| 170 | list_for_each_entry(walker, | 170 | list_for_each_entry(walker, |
| 171 | &mount_crypt_stat->global_auth_tok_list, | 171 | &mount_crypt_stat->global_auth_tok_list, |
| 172 | mount_crypt_stat_list) { | 172 | mount_crypt_stat_list) { |
| 173 | seq_printf(m, ",ecryptfs_sig=%s", walker->sig); | 173 | if (walker->flags & ECRYPTFS_AUTH_TOK_FNEK) |
| 174 | seq_printf(m, ",ecryptfs_fnek_sig=%s", walker->sig); | ||
| 175 | else | ||
| 176 | seq_printf(m, ",ecryptfs_sig=%s", walker->sig); | ||
| 174 | } | 177 | } |
| 175 | mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex); | 178 | mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex); |
| 176 | 179 | ||
| @@ -186,6 +189,8 @@ static int ecryptfs_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
| 186 | seq_printf(m, ",ecryptfs_xattr_metadata"); | 189 | seq_printf(m, ",ecryptfs_xattr_metadata"); |
| 187 | if (mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED) | 190 | if (mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED) |
| 188 | seq_printf(m, ",ecryptfs_encrypted_view"); | 191 | seq_printf(m, ",ecryptfs_encrypted_view"); |
| 192 | if (mount_crypt_stat->flags & ECRYPTFS_UNLINK_SIGS) | ||
| 193 | seq_printf(m, ",ecryptfs_unlink_sigs"); | ||
| 189 | 194 | ||
| 190 | return 0; | 195 | return 0; |
| 191 | } | 196 | } |
| @@ -1060,7 +1060,6 @@ EXPORT_SYMBOL(install_exec_creds); | |||
| 1060 | int check_unsafe_exec(struct linux_binprm *bprm) | 1060 | int check_unsafe_exec(struct linux_binprm *bprm) |
| 1061 | { | 1061 | { |
| 1062 | struct task_struct *p = current, *t; | 1062 | struct task_struct *p = current, *t; |
| 1063 | unsigned long flags; | ||
| 1064 | unsigned n_fs; | 1063 | unsigned n_fs; |
| 1065 | int res = 0; | 1064 | int res = 0; |
| 1066 | 1065 | ||
| @@ -1068,21 +1067,22 @@ int check_unsafe_exec(struct linux_binprm *bprm) | |||
| 1068 | 1067 | ||
| 1069 | n_fs = 1; | 1068 | n_fs = 1; |
| 1070 | write_lock(&p->fs->lock); | 1069 | write_lock(&p->fs->lock); |
| 1071 | lock_task_sighand(p, &flags); | 1070 | rcu_read_lock(); |
| 1072 | for (t = next_thread(p); t != p; t = next_thread(t)) { | 1071 | for (t = next_thread(p); t != p; t = next_thread(t)) { |
| 1073 | if (t->fs == p->fs) | 1072 | if (t->fs == p->fs) |
| 1074 | n_fs++; | 1073 | n_fs++; |
| 1075 | } | 1074 | } |
| 1075 | rcu_read_unlock(); | ||
| 1076 | 1076 | ||
| 1077 | if (p->fs->users > n_fs) { | 1077 | if (p->fs->users > n_fs) { |
| 1078 | bprm->unsafe |= LSM_UNSAFE_SHARE; | 1078 | bprm->unsafe |= LSM_UNSAFE_SHARE; |
| 1079 | } else { | 1079 | } else { |
| 1080 | if (p->fs->in_exec) | 1080 | res = -EAGAIN; |
| 1081 | res = -EAGAIN; | 1081 | if (!p->fs->in_exec) { |
| 1082 | p->fs->in_exec = 1; | 1082 | p->fs->in_exec = 1; |
| 1083 | res = 1; | ||
| 1084 | } | ||
| 1083 | } | 1085 | } |
| 1084 | |||
| 1085 | unlock_task_sighand(p, &flags); | ||
| 1086 | write_unlock(&p->fs->lock); | 1086 | write_unlock(&p->fs->lock); |
| 1087 | 1087 | ||
| 1088 | return res; | 1088 | return res; |
| @@ -1284,6 +1284,7 @@ int do_execve(char * filename, | |||
| 1284 | struct linux_binprm *bprm; | 1284 | struct linux_binprm *bprm; |
| 1285 | struct file *file; | 1285 | struct file *file; |
| 1286 | struct files_struct *displaced; | 1286 | struct files_struct *displaced; |
| 1287 | bool clear_in_exec; | ||
| 1287 | int retval; | 1288 | int retval; |
| 1288 | 1289 | ||
| 1289 | retval = unshare_files(&displaced); | 1290 | retval = unshare_files(&displaced); |
| @@ -1306,8 +1307,9 @@ int do_execve(char * filename, | |||
| 1306 | goto out_unlock; | 1307 | goto out_unlock; |
| 1307 | 1308 | ||
| 1308 | retval = check_unsafe_exec(bprm); | 1309 | retval = check_unsafe_exec(bprm); |
| 1309 | if (retval) | 1310 | if (retval < 0) |
| 1310 | goto out_unlock; | 1311 | goto out_unlock; |
| 1312 | clear_in_exec = retval; | ||
| 1311 | 1313 | ||
| 1312 | file = open_exec(filename); | 1314 | file = open_exec(filename); |
| 1313 | retval = PTR_ERR(file); | 1315 | retval = PTR_ERR(file); |
| @@ -1355,9 +1357,7 @@ int do_execve(char * filename, | |||
| 1355 | goto out; | 1357 | goto out; |
| 1356 | 1358 | ||
| 1357 | /* execve succeeded */ | 1359 | /* execve succeeded */ |
| 1358 | write_lock(¤t->fs->lock); | ||
| 1359 | current->fs->in_exec = 0; | 1360 | current->fs->in_exec = 0; |
| 1360 | write_unlock(¤t->fs->lock); | ||
| 1361 | current->in_execve = 0; | 1361 | current->in_execve = 0; |
| 1362 | mutex_unlock(¤t->cred_exec_mutex); | 1362 | mutex_unlock(¤t->cred_exec_mutex); |
| 1363 | acct_update_integrals(current); | 1363 | acct_update_integrals(current); |
| @@ -1377,9 +1377,8 @@ out_file: | |||
| 1377 | } | 1377 | } |
| 1378 | 1378 | ||
| 1379 | out_unmark: | 1379 | out_unmark: |
| 1380 | write_lock(¤t->fs->lock); | 1380 | if (clear_in_exec) |
| 1381 | current->fs->in_exec = 0; | 1381 | current->fs->in_exec = 0; |
| 1382 | write_unlock(¤t->fs->lock); | ||
| 1383 | 1382 | ||
| 1384 | out_unlock: | 1383 | out_unlock: |
| 1385 | current->in_execve = 0; | 1384 | current->in_execve = 0; |
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 2a1cb097976..e4033215834 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -326,11 +326,14 @@ ext4_ext_max_entries(struct inode *inode, int depth) | |||
| 326 | 326 | ||
| 327 | static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext) | 327 | static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext) |
| 328 | { | 328 | { |
| 329 | ext4_fsblk_t block = ext_pblock(ext); | 329 | ext4_fsblk_t block = ext_pblock(ext), valid_block; |
| 330 | int len = ext4_ext_get_actual_len(ext); | 330 | int len = ext4_ext_get_actual_len(ext); |
| 331 | struct ext4_super_block *es = EXT4_SB(inode->i_sb)->s_es; | 331 | struct ext4_super_block *es = EXT4_SB(inode->i_sb)->s_es; |
| 332 | if (unlikely(block < le32_to_cpu(es->s_first_data_block) || | 332 | |
| 333 | ((block + len) > ext4_blocks_count(es)))) | 333 | valid_block = le32_to_cpu(es->s_first_data_block) + |
| 334 | EXT4_SB(inode->i_sb)->s_gdb_count; | ||
| 335 | if (unlikely(block <= valid_block || | ||
| 336 | ((block + len) > ext4_blocks_count(es)))) | ||
| 334 | return 0; | 337 | return 0; |
| 335 | else | 338 | else |
| 336 | return 1; | 339 | return 1; |
| @@ -339,10 +342,13 @@ static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext) | |||
| 339 | static int ext4_valid_extent_idx(struct inode *inode, | 342 | static int ext4_valid_extent_idx(struct inode *inode, |
| 340 | struct ext4_extent_idx *ext_idx) | 343 | struct ext4_extent_idx *ext_idx) |
| 341 | { | 344 | { |
| 342 | ext4_fsblk_t block = idx_pblock(ext_idx); | 345 | ext4_fsblk_t block = idx_pblock(ext_idx), valid_block; |
| 343 | struct ext4_super_block *es = EXT4_SB(inode->i_sb)->s_es; | 346 | struct ext4_super_block *es = EXT4_SB(inode->i_sb)->s_es; |
| 344 | if (unlikely(block < le32_to_cpu(es->s_first_data_block) || | 347 | |
| 345 | (block >= ext4_blocks_count(es)))) | 348 | valid_block = le32_to_cpu(es->s_first_data_block) + |
| 349 | EXT4_SB(inode->i_sb)->s_gdb_count; | ||
| 350 | if (unlikely(block <= valid_block || | ||
| 351 | (block >= ext4_blocks_count(es)))) | ||
| 346 | return 0; | 352 | return 0; |
| 347 | else | 353 | else |
| 348 | return 1; | 354 | return 1; |
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 47b84e8df56..f18e0a08a6b 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
| @@ -585,6 +585,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent, | |||
| 585 | fallback: | 585 | fallback: |
| 586 | ngroups = sbi->s_groups_count; | 586 | ngroups = sbi->s_groups_count; |
| 587 | avefreei = freei / ngroups; | 587 | avefreei = freei / ngroups; |
| 588 | fallback_retry: | ||
| 588 | parent_group = EXT4_I(parent)->i_block_group; | 589 | parent_group = EXT4_I(parent)->i_block_group; |
| 589 | for (i = 0; i < ngroups; i++) { | 590 | for (i = 0; i < ngroups; i++) { |
| 590 | grp = (parent_group + i) % ngroups; | 591 | grp = (parent_group + i) % ngroups; |
| @@ -602,7 +603,7 @@ fallback: | |||
| 602 | * filesystems the above test can fail to find any blockgroups | 603 | * filesystems the above test can fail to find any blockgroups |
| 603 | */ | 604 | */ |
| 604 | avefreei = 0; | 605 | avefreei = 0; |
| 605 | goto fallback; | 606 | goto fallback_retry; |
| 606 | } | 607 | } |
| 607 | 608 | ||
| 608 | return -1; | 609 | return -1; |
| @@ -831,11 +832,12 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode) | |||
| 831 | ret2 = find_group_flex(sb, dir, &group); | 832 | ret2 = find_group_flex(sb, dir, &group); |
| 832 | if (ret2 == -1) { | 833 | if (ret2 == -1) { |
| 833 | ret2 = find_group_other(sb, dir, &group, mode); | 834 | ret2 = find_group_other(sb, dir, &group, mode); |
| 834 | if (ret2 == 0 && once) | 835 | if (ret2 == 0 && once) { |
| 835 | once = 0; | 836 | once = 0; |
| 836 | printk(KERN_NOTICE "ext4: find_group_flex " | 837 | printk(KERN_NOTICE "ext4: find_group_flex " |
| 837 | "failed, fallback succeeded dir %lu\n", | 838 | "failed, fallback succeeded dir %lu\n", |
| 838 | dir->i_ino); | 839 | dir->i_ino); |
| 840 | } | ||
| 839 | } | 841 | } |
| 840 | goto got_group; | 842 | goto got_group; |
| 841 | } | 843 | } |
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index f03d024038e..565038243fa 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
| @@ -212,8 +212,7 @@ static u32 gfs2_bitfit(const u8 *buf, const unsigned int len, | |||
| 212 | if (tmp == 0) | 212 | if (tmp == 0) |
| 213 | return BFITNOENT; | 213 | return BFITNOENT; |
| 214 | ptr--; | 214 | ptr--; |
| 215 | bit = fls64(tmp); | 215 | bit = __ffs64(tmp); |
| 216 | bit--; /* fls64 always adds one to the bit count */ | ||
| 217 | bit /= 2; /* two bits per entry in the bitmap */ | 216 | bit /= 2; /* two bits per entry in the bitmap */ |
| 218 | return (((const unsigned char *)ptr - buf) * GFS2_NBBY) + bit; | 217 | return (((const unsigned char *)ptr - buf) * GFS2_NBBY) + bit; |
| 219 | } | 218 | } |
| @@ -1445,10 +1444,12 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart, | |||
| 1445 | u64 gfs2_alloc_block(struct gfs2_inode *ip, unsigned int *n) | 1444 | u64 gfs2_alloc_block(struct gfs2_inode *ip, unsigned int *n) |
| 1446 | { | 1445 | { |
| 1447 | struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); | 1446 | struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); |
| 1447 | struct buffer_head *dibh; | ||
| 1448 | struct gfs2_alloc *al = ip->i_alloc; | 1448 | struct gfs2_alloc *al = ip->i_alloc; |
| 1449 | struct gfs2_rgrpd *rgd = al->al_rgd; | 1449 | struct gfs2_rgrpd *rgd = al->al_rgd; |
| 1450 | u32 goal, blk; | 1450 | u32 goal, blk; |
| 1451 | u64 block; | 1451 | u64 block; |
| 1452 | int error; | ||
| 1452 | 1453 | ||
| 1453 | if (rgrp_contains_block(rgd, ip->i_goal)) | 1454 | if (rgrp_contains_block(rgd, ip->i_goal)) |
| 1454 | goal = ip->i_goal - rgd->rd_data0; | 1455 | goal = ip->i_goal - rgd->rd_data0; |
| @@ -1461,7 +1462,13 @@ u64 gfs2_alloc_block(struct gfs2_inode *ip, unsigned int *n) | |||
| 1461 | rgd->rd_last_alloc = blk; | 1462 | rgd->rd_last_alloc = blk; |
| 1462 | block = rgd->rd_data0 + blk; | 1463 | block = rgd->rd_data0 + blk; |
| 1463 | ip->i_goal = block; | 1464 | ip->i_goal = block; |
| 1464 | 1465 | error = gfs2_meta_inode_buffer(ip, &dibh); | |
| 1466 | if (error == 0) { | ||
| 1467 | struct gfs2_dinode *di = (struct gfs2_dinode *)dibh->b_data; | ||
| 1468 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | ||
| 1469 | di->di_goal_meta = di->di_goal_data = cpu_to_be64(ip->i_goal); | ||
| 1470 | brelse(dibh); | ||
| 1471 | } | ||
| 1465 | gfs2_assert_withdraw(sdp, rgd->rd_free >= *n); | 1472 | gfs2_assert_withdraw(sdp, rgd->rd_free >= *n); |
| 1466 | rgd->rd_free -= *n; | 1473 | rgd->rd_free -= *n; |
| 1467 | 1474 | ||
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index a8e8513a78a..06560c520f4 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -502,7 +502,7 @@ void journal_commit_transaction(journal_t *journal) | |||
| 502 | err = 0; | 502 | err = 0; |
| 503 | } | 503 | } |
| 504 | 504 | ||
| 505 | journal_write_revoke_records(journal, commit_transaction); | 505 | journal_write_revoke_records(journal, commit_transaction, write_op); |
| 506 | 506 | ||
| 507 | /* | 507 | /* |
| 508 | * If we found any dirty or locked buffers, then we should have | 508 | * If we found any dirty or locked buffers, then we should have |
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index 3e9afc2a91d..da6cd9bdaab 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #include <linux/slab.h> | 86 | #include <linux/slab.h> |
| 87 | #include <linux/list.h> | 87 | #include <linux/list.h> |
| 88 | #include <linux/init.h> | 88 | #include <linux/init.h> |
| 89 | #include <linux/bio.h> | ||
| 89 | #endif | 90 | #endif |
| 90 | #include <linux/log2.h> | 91 | #include <linux/log2.h> |
| 91 | 92 | ||
| @@ -118,8 +119,8 @@ struct jbd_revoke_table_s | |||
| 118 | #ifdef __KERNEL__ | 119 | #ifdef __KERNEL__ |
| 119 | static void write_one_revoke_record(journal_t *, transaction_t *, | 120 | static void write_one_revoke_record(journal_t *, transaction_t *, |
| 120 | struct journal_head **, int *, | 121 | struct journal_head **, int *, |
| 121 | struct jbd_revoke_record_s *); | 122 | struct jbd_revoke_record_s *, int); |
| 122 | static void flush_descriptor(journal_t *, struct journal_head *, int); | 123 | static void flush_descriptor(journal_t *, struct journal_head *, int, int); |
| 123 | #endif | 124 | #endif |
| 124 | 125 | ||
| 125 | /* Utility functions to maintain the revoke table */ | 126 | /* Utility functions to maintain the revoke table */ |
| @@ -500,7 +501,7 @@ void journal_switch_revoke_table(journal_t *journal) | |||
| 500 | * revoke hash, deleting the entries as we go. | 501 | * revoke hash, deleting the entries as we go. |
| 501 | */ | 502 | */ |
| 502 | void journal_write_revoke_records(journal_t *journal, | 503 | void journal_write_revoke_records(journal_t *journal, |
| 503 | transaction_t *transaction) | 504 | transaction_t *transaction, int write_op) |
| 504 | { | 505 | { |
| 505 | struct journal_head *descriptor; | 506 | struct journal_head *descriptor; |
| 506 | struct jbd_revoke_record_s *record; | 507 | struct jbd_revoke_record_s *record; |
| @@ -524,14 +525,14 @@ void journal_write_revoke_records(journal_t *journal, | |||
| 524 | hash_list->next; | 525 | hash_list->next; |
| 525 | write_one_revoke_record(journal, transaction, | 526 | write_one_revoke_record(journal, transaction, |
| 526 | &descriptor, &offset, | 527 | &descriptor, &offset, |
| 527 | record); | 528 | record, write_op); |
| 528 | count++; | 529 | count++; |
| 529 | list_del(&record->hash); | 530 | list_del(&record->hash); |
| 530 | kmem_cache_free(revoke_record_cache, record); | 531 | kmem_cache_free(revoke_record_cache, record); |
| 531 | } | 532 | } |
| 532 | } | 533 | } |
| 533 | if (descriptor) | 534 | if (descriptor) |
| 534 | flush_descriptor(journal, descriptor, offset); | 535 | flush_descriptor(journal, descriptor, offset, write_op); |
| 535 | jbd_debug(1, "Wrote %d revoke records\n", count); | 536 | jbd_debug(1, "Wrote %d revoke records\n", count); |
| 536 | } | 537 | } |
| 537 | 538 | ||
| @@ -544,7 +545,8 @@ static void write_one_revoke_record(journal_t *journal, | |||
| 544 | transaction_t *transaction, | 545 | transaction_t *transaction, |
| 545 | struct journal_head **descriptorp, | 546 | struct journal_head **descriptorp, |
| 546 | int *offsetp, | 547 | int *offsetp, |
| 547 | struct jbd_revoke_record_s *record) | 548 | struct jbd_revoke_record_s *record, |
| 549 | int write_op) | ||
| 548 | { | 550 | { |
| 549 | struct journal_head *descriptor; | 551 | struct journal_head *descriptor; |
| 550 | int offset; | 552 | int offset; |
| @@ -563,7 +565,7 @@ static void write_one_revoke_record(journal_t *journal, | |||
| 563 | /* Make sure we have a descriptor with space left for the record */ | 565 | /* Make sure we have a descriptor with space left for the record */ |
| 564 | if (descriptor) { | 566 | if (descriptor) { |
| 565 | if (offset == journal->j_blocksize) { | 567 | if (offset == journal->j_blocksize) { |
| 566 | flush_descriptor(journal, descriptor, offset); | 568 | flush_descriptor(journal, descriptor, offset, write_op); |
| 567 | descriptor = NULL; | 569 | descriptor = NULL; |
| 568 | } | 570 | } |
| 569 | } | 571 | } |
| @@ -600,7 +602,7 @@ static void write_one_revoke_record(journal_t *journal, | |||
| 600 | 602 | ||
| 601 | static void flush_descriptor(journal_t *journal, | 603 | static void flush_descriptor(journal_t *journal, |
| 602 | struct journal_head *descriptor, | 604 | struct journal_head *descriptor, |
| 603 | int offset) | 605 | int offset, int write_op) |
| 604 | { | 606 | { |
| 605 | journal_revoke_header_t *header; | 607 | journal_revoke_header_t *header; |
| 606 | struct buffer_head *bh = jh2bh(descriptor); | 608 | struct buffer_head *bh = jh2bh(descriptor); |
| @@ -615,7 +617,7 @@ static void flush_descriptor(journal_t *journal, | |||
| 615 | set_buffer_jwrite(bh); | 617 | set_buffer_jwrite(bh); |
| 616 | BUFFER_TRACE(bh, "write"); | 618 | BUFFER_TRACE(bh, "write"); |
| 617 | set_buffer_dirty(bh); | 619 | set_buffer_dirty(bh); |
| 618 | ll_rw_block(SWRITE, 1, &bh); | 620 | ll_rw_block((write_op == WRITE) ? SWRITE : SWRITE_SYNC_PLUG, 1, &bh); |
| 619 | } | 621 | } |
| 620 | #endif | 622 | #endif |
| 621 | 623 | ||
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 073c8c3df7c..0b7d3b8226f 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
| @@ -506,7 +506,8 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
| 506 | if (err) | 506 | if (err) |
| 507 | jbd2_journal_abort(journal, err); | 507 | jbd2_journal_abort(journal, err); |
| 508 | 508 | ||
| 509 | jbd2_journal_write_revoke_records(journal, commit_transaction); | 509 | jbd2_journal_write_revoke_records(journal, commit_transaction, |
| 510 | write_op); | ||
| 510 | 511 | ||
| 511 | jbd_debug(3, "JBD: commit phase 2\n"); | 512 | jbd_debug(3, "JBD: commit phase 2\n"); |
| 512 | 513 | ||
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index bbe6d592d8b..a360b06af2e 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #include <linux/slab.h> | 86 | #include <linux/slab.h> |
| 87 | #include <linux/list.h> | 87 | #include <linux/list.h> |
| 88 | #include <linux/init.h> | 88 | #include <linux/init.h> |
| 89 | #include <linux/bio.h> | ||
| 89 | #endif | 90 | #endif |
| 90 | #include <linux/log2.h> | 91 | #include <linux/log2.h> |
| 91 | 92 | ||
| @@ -118,8 +119,8 @@ struct jbd2_revoke_table_s | |||
| 118 | #ifdef __KERNEL__ | 119 | #ifdef __KERNEL__ |
| 119 | static void write_one_revoke_record(journal_t *, transaction_t *, | 120 | static void write_one_revoke_record(journal_t *, transaction_t *, |
| 120 | struct journal_head **, int *, | 121 | struct journal_head **, int *, |
| 121 | struct jbd2_revoke_record_s *); | 122 | struct jbd2_revoke_record_s *, int); |
| 122 | static void flush_descriptor(journal_t *, struct journal_head *, int); | 123 | static void flush_descriptor(journal_t *, struct journal_head *, int, int); |
| 123 | #endif | 124 | #endif |
| 124 | 125 | ||
| 125 | /* Utility functions to maintain the revoke table */ | 126 | /* Utility functions to maintain the revoke table */ |
| @@ -499,7 +500,8 @@ void jbd2_journal_switch_revoke_table(journal_t *journal) | |||
| 499 | * revoke hash, deleting the entries as we go. | 500 | * revoke hash, deleting the entries as we go. |
| 500 | */ | 501 | */ |
| 501 | void jbd2_journal_write_revoke_records(journal_t *journal, | 502 | void jbd2_journal_write_revoke_records(journal_t *journal, |
| 502 | transaction_t *transaction) | 503 | transaction_t *transaction, |
| 504 | int write_op) | ||
| 503 | { | 505 | { |
| 504 | struct journal_head *descriptor; | 506 | struct journal_head *descriptor; |
| 505 | struct jbd2_revoke_record_s *record; | 507 | struct jbd2_revoke_record_s *record; |
| @@ -523,14 +525,14 @@ void jbd2_journal_write_revoke_records(journal_t *journal, | |||
| 523 | hash_list->next; | 525 | hash_list->next; |
| 524 | write_one_revoke_record(journal, transaction, | 526 | write_one_revoke_record(journal, transaction, |
| 525 | &descriptor, &offset, | 527 | &descriptor, &offset, |
| 526 | record); | 528 | record, write_op); |
| 527 | count++; | 529 | count++; |
| 528 | list_del(&record->hash); | 530 | list_del(&record->hash); |
| 529 | kmem_cache_free(jbd2_revoke_record_cache, record); | 531 | kmem_cache_free(jbd2_revoke_record_cache, record); |
| 530 | } | 532 | } |
| 531 | } | 533 | } |
| 532 | if (descriptor) | 534 | if (descriptor) |
| 533 | flush_descriptor(journal, descriptor, offset); | 535 | flush_descriptor(journal, descriptor, offset, write_op); |
| 534 | jbd_debug(1, "Wrote %d revoke records\n", count); | 536 | jbd_debug(1, "Wrote %d revoke records\n", count); |
| 535 | } | 537 | } |
| 536 | 538 | ||
| @@ -543,7 +545,8 @@ static void write_one_revoke_record(journal_t *journal, | |||
| 543 | transaction_t *transaction, | 545 | transaction_t *transaction, |
| 544 | struct journal_head **descriptorp, | 546 | struct journal_head **descriptorp, |
| 545 | int *offsetp, | 547 | int *offsetp, |
| 546 | struct jbd2_revoke_record_s *record) | 548 | struct jbd2_revoke_record_s *record, |
| 549 | int write_op) | ||
| 547 | { | 550 | { |
| 548 | struct journal_head *descriptor; | 551 | struct journal_head *descriptor; |
| 549 | int offset; | 552 | int offset; |
| @@ -562,7 +565,7 @@ static void write_one_revoke_record(journal_t *journal, | |||
| 562 | /* Make sure we have a descriptor with space left for the record */ | 565 | /* Make sure we have a descriptor with space left for the record */ |
| 563 | if (descriptor) { | 566 | if (descriptor) { |
| 564 | if (offset == journal->j_blocksize) { | 567 | if (offset == journal->j_blocksize) { |
| 565 | flush_descriptor(journal, descriptor, offset); | 568 | flush_descriptor(journal, descriptor, offset, write_op); |
| 566 | descriptor = NULL; | 569 | descriptor = NULL; |
| 567 | } | 570 | } |
| 568 | } | 571 | } |
| @@ -607,7 +610,7 @@ static void write_one_revoke_record(journal_t *journal, | |||
| 607 | 610 | ||
| 608 | static void flush_descriptor(journal_t *journal, | 611 | static void flush_descriptor(journal_t *journal, |
| 609 | struct journal_head *descriptor, | 612 | struct journal_head *descriptor, |
| 610 | int offset) | 613 | int offset, int write_op) |
| 611 | { | 614 | { |
| 612 | jbd2_journal_revoke_header_t *header; | 615 | jbd2_journal_revoke_header_t *header; |
| 613 | struct buffer_head *bh = jh2bh(descriptor); | 616 | struct buffer_head *bh = jh2bh(descriptor); |
| @@ -622,7 +625,7 @@ static void flush_descriptor(journal_t *journal, | |||
| 622 | set_buffer_jwrite(bh); | 625 | set_buffer_jwrite(bh); |
| 623 | BUFFER_TRACE(bh, "write"); | 626 | BUFFER_TRACE(bh, "write"); |
| 624 | set_buffer_dirty(bh); | 627 | set_buffer_dirty(bh); |
| 625 | ll_rw_block(SWRITE, 1, &bh); | 628 | ll_rw_block((write_op == WRITE) ? SWRITE : SWRITE_SYNC_PLUG, 1, &bh); |
| 626 | } | 629 | } |
| 627 | #endif | 630 | #endif |
| 628 | 631 | ||
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index f75efa22df5..81e4eb60972 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c | |||
| @@ -18,6 +18,9 @@ | |||
| 18 | #ifndef arch_irq_stat | 18 | #ifndef arch_irq_stat |
| 19 | #define arch_irq_stat() 0 | 19 | #define arch_irq_stat() 0 |
| 20 | #endif | 20 | #endif |
| 21 | #ifndef arch_idle_time | ||
| 22 | #define arch_idle_time(cpu) 0 | ||
| 23 | #endif | ||
| 21 | 24 | ||
| 22 | static int show_stat(struct seq_file *p, void *v) | 25 | static int show_stat(struct seq_file *p, void *v) |
| 23 | { | 26 | { |
| @@ -40,6 +43,7 @@ static int show_stat(struct seq_file *p, void *v) | |||
| 40 | nice = cputime64_add(nice, kstat_cpu(i).cpustat.nice); | 43 | nice = cputime64_add(nice, kstat_cpu(i).cpustat.nice); |
| 41 | system = cputime64_add(system, kstat_cpu(i).cpustat.system); | 44 | system = cputime64_add(system, kstat_cpu(i).cpustat.system); |
| 42 | idle = cputime64_add(idle, kstat_cpu(i).cpustat.idle); | 45 | idle = cputime64_add(idle, kstat_cpu(i).cpustat.idle); |
| 46 | idle = cputime64_add(idle, arch_idle_time(i)); | ||
| 43 | iowait = cputime64_add(iowait, kstat_cpu(i).cpustat.iowait); | 47 | iowait = cputime64_add(iowait, kstat_cpu(i).cpustat.iowait); |
| 44 | irq = cputime64_add(irq, kstat_cpu(i).cpustat.irq); | 48 | irq = cputime64_add(irq, kstat_cpu(i).cpustat.irq); |
| 45 | softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq); | 49 | softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq); |
| @@ -69,6 +73,7 @@ static int show_stat(struct seq_file *p, void *v) | |||
| 69 | nice = kstat_cpu(i).cpustat.nice; | 73 | nice = kstat_cpu(i).cpustat.nice; |
| 70 | system = kstat_cpu(i).cpustat.system; | 74 | system = kstat_cpu(i).cpustat.system; |
| 71 | idle = kstat_cpu(i).cpustat.idle; | 75 | idle = kstat_cpu(i).cpustat.idle; |
| 76 | idle = cputime64_add(idle, arch_idle_time(i)); | ||
| 72 | iowait = kstat_cpu(i).cpustat.iowait; | 77 | iowait = kstat_cpu(i).cpustat.iowait; |
| 73 | irq = kstat_cpu(i).cpustat.irq; | 78 | irq = kstat_cpu(i).cpustat.irq; |
| 74 | softirq = kstat_cpu(i).cpustat.softirq; | 79 | softirq = kstat_cpu(i).cpustat.softirq; |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index b09c4fde972..4927c063347 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -84,7 +84,6 @@ struct acpi_processor_power { | |||
| 84 | struct acpi_processor_cx *state; | 84 | struct acpi_processor_cx *state; |
| 85 | unsigned long bm_check_timestamp; | 85 | unsigned long bm_check_timestamp; |
| 86 | u32 default_state; | 86 | u32 default_state; |
| 87 | u32 bm_activity; | ||
| 88 | int count; | 87 | int count; |
| 89 | struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; | 88 | struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; |
| 90 | int timer_broadcast_on_state; | 89 | int timer_broadcast_on_state; |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6586cbd0d4a..88be890ee3c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -111,6 +111,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); | |||
| 111 | int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); | 111 | int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); |
| 112 | void acpi_irq_stats_init(void); | 112 | void acpi_irq_stats_init(void); |
| 113 | extern u32 acpi_irq_handled; | 113 | extern u32 acpi_irq_handled; |
| 114 | extern u32 acpi_irq_not_handled; | ||
| 114 | 115 | ||
| 115 | extern struct acpi_mcfg_allocation *pci_mmcfg_config; | 116 | extern struct acpi_mcfg_allocation *pci_mmcfg_config; |
| 116 | extern int pci_mmcfg_config_num; | 117 | extern int pci_mmcfg_config_num; |
diff --git a/include/linux/bio.h b/include/linux/bio.h index b89cf2d8289..7b214fd672a 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
| @@ -132,6 +132,7 @@ struct bio { | |||
| 132 | * top 4 bits of bio flags indicate the pool this bio came from | 132 | * top 4 bits of bio flags indicate the pool this bio came from |
| 133 | */ | 133 | */ |
| 134 | #define BIO_POOL_BITS (4) | 134 | #define BIO_POOL_BITS (4) |
| 135 | #define BIO_POOL_NONE ((1UL << BIO_POOL_BITS) - 1) | ||
| 135 | #define BIO_POOL_OFFSET (BITS_PER_LONG - BIO_POOL_BITS) | 136 | #define BIO_POOL_OFFSET (BITS_PER_LONG - BIO_POOL_BITS) |
| 136 | #define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET) | 137 | #define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET) |
| 137 | #define BIO_POOL_IDX(bio) ((bio)->bi_flags >> BIO_POOL_OFFSET) | 138 | #define BIO_POOL_IDX(bio) ((bio)->bi_flags >> BIO_POOL_OFFSET) |
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 61829139795..c05a29cb9bb 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h | |||
| @@ -112,6 +112,25 @@ static inline unsigned fls_long(unsigned long l) | |||
| 112 | return fls64(l); | 112 | return fls64(l); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | /** | ||
| 116 | * __ffs64 - find first set bit in a 64 bit word | ||
| 117 | * @word: The 64 bit word | ||
| 118 | * | ||
| 119 | * On 64 bit arches this is a synomyn for __ffs | ||
| 120 | * The result is not defined if no bits are set, so check that @word | ||
| 121 | * is non-zero before calling this. | ||
| 122 | */ | ||
| 123 | static inline unsigned long __ffs64(u64 word) | ||
| 124 | { | ||
| 125 | #if BITS_PER_LONG == 32 | ||
| 126 | if (((u32)word) == 0UL) | ||
| 127 | return __ffs((u32)(word >> 32)) + 32; | ||
| 128 | #elif BITS_PER_LONG != 64 | ||
| 129 | #error BITS_PER_LONG not 32 or 64 | ||
| 130 | #endif | ||
| 131 | return __ffs((unsigned long)word); | ||
| 132 | } | ||
| 133 | |||
| 115 | #ifdef __KERNEL__ | 134 | #ifdef __KERNEL__ |
| 116 | #ifdef CONFIG_GENERIC_FIND_FIRST_BIT | 135 | #ifdef CONFIG_GENERIC_FIND_FIRST_BIT |
| 117 | 136 | ||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ba54c834a59..2755d5c6da2 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -118,6 +118,7 @@ enum rq_flag_bits { | |||
| 118 | __REQ_COPY_USER, /* contains copies of user pages */ | 118 | __REQ_COPY_USER, /* contains copies of user pages */ |
| 119 | __REQ_INTEGRITY, /* integrity metadata has been remapped */ | 119 | __REQ_INTEGRITY, /* integrity metadata has been remapped */ |
| 120 | __REQ_NOIDLE, /* Don't anticipate more IO after this one */ | 120 | __REQ_NOIDLE, /* Don't anticipate more IO after this one */ |
| 121 | __REQ_IO_STAT, /* account I/O stat */ | ||
| 121 | __REQ_NR_BITS, /* stops here */ | 122 | __REQ_NR_BITS, /* stops here */ |
| 122 | }; | 123 | }; |
| 123 | 124 | ||
| @@ -145,6 +146,7 @@ enum rq_flag_bits { | |||
| 145 | #define REQ_COPY_USER (1 << __REQ_COPY_USER) | 146 | #define REQ_COPY_USER (1 << __REQ_COPY_USER) |
| 146 | #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) | 147 | #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) |
| 147 | #define REQ_NOIDLE (1 << __REQ_NOIDLE) | 148 | #define REQ_NOIDLE (1 << __REQ_NOIDLE) |
| 149 | #define REQ_IO_STAT (1 << __REQ_IO_STAT) | ||
| 148 | 150 | ||
| 149 | #define BLK_MAX_CDB 16 | 151 | #define BLK_MAX_CDB 16 |
| 150 | 152 | ||
| @@ -598,6 +600,7 @@ enum { | |||
| 598 | blk_failfast_transport(rq) || \ | 600 | blk_failfast_transport(rq) || \ |
| 599 | blk_failfast_driver(rq)) | 601 | blk_failfast_driver(rq)) |
| 600 | #define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED) | 602 | #define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED) |
| 603 | #define blk_rq_io_stat(rq) ((rq)->cmd_flags & REQ_IO_STAT) | ||
| 601 | 604 | ||
| 602 | #define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) | 605 | #define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) |
| 603 | 606 | ||
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 43fc95d822d..244677cc082 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
| @@ -79,6 +79,10 @@ struct fsl_spi_platform_data { | |||
| 79 | u16 max_chipselect; | 79 | u16 max_chipselect; |
| 80 | void (*cs_control)(struct spi_device *spi, bool on); | 80 | void (*cs_control)(struct spi_device *spi, bool on); |
| 81 | u32 sysclk; | 81 | u32 sysclk; |
| 82 | |||
| 83 | /* Legacy hooks, used by mpc52xx_psc_spi driver. */ | ||
| 84 | void (*activate_cs)(u8 cs, u8 polarity); | ||
| 85 | void (*deactivate_cs)(u8 cs, u8 polarity); | ||
| 82 | }; | 86 | }; |
| 83 | 87 | ||
| 84 | struct mpc8xx_pcmcia_ops { | 88 | struct mpc8xx_pcmcia_ops { |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 634c53028fb..a1a28caed23 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -214,6 +214,7 @@ static inline void disk_put_part(struct hd_struct *part) | |||
| 214 | #define DISK_PITER_REVERSE (1 << 0) /* iterate in the reverse direction */ | 214 | #define DISK_PITER_REVERSE (1 << 0) /* iterate in the reverse direction */ |
| 215 | #define DISK_PITER_INCL_EMPTY (1 << 1) /* include 0-sized parts */ | 215 | #define DISK_PITER_INCL_EMPTY (1 << 1) /* include 0-sized parts */ |
| 216 | #define DISK_PITER_INCL_PART0 (1 << 2) /* include partition 0 */ | 216 | #define DISK_PITER_INCL_PART0 (1 << 2) /* include partition 0 */ |
| 217 | #define DISK_PITER_INCL_EMPTY_PART0 (1 << 3) /* include empty partition 0 */ | ||
| 217 | 218 | ||
| 218 | struct disk_part_iter { | 219 | struct disk_part_iter { |
| 219 | struct gendisk *disk; | 220 | struct gendisk *disk; |
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 53ae4399da2..c2049a04fa0 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
| @@ -978,7 +978,8 @@ extern void journal_destroy_revoke(journal_t *); | |||
| 978 | extern int journal_revoke (handle_t *, | 978 | extern int journal_revoke (handle_t *, |
| 979 | unsigned long, struct buffer_head *); | 979 | unsigned long, struct buffer_head *); |
| 980 | extern int journal_cancel_revoke(handle_t *, struct journal_head *); | 980 | extern int journal_cancel_revoke(handle_t *, struct journal_head *); |
| 981 | extern void journal_write_revoke_records(journal_t *, transaction_t *); | 981 | extern void journal_write_revoke_records(journal_t *, |
| 982 | transaction_t *, int); | ||
| 982 | 983 | ||
| 983 | /* Recovery revoke support */ | 984 | /* Recovery revoke support */ |
| 984 | extern int journal_set_revoke(journal_t *, unsigned long, tid_t); | 985 | extern int journal_set_revoke(journal_t *, unsigned long, tid_t); |
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 8815a3456b3..cc02393bfce 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
| @@ -1193,7 +1193,8 @@ extern int jbd2_journal_init_revoke_caches(void); | |||
| 1193 | extern void jbd2_journal_destroy_revoke(journal_t *); | 1193 | extern void jbd2_journal_destroy_revoke(journal_t *); |
| 1194 | extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *); | 1194 | extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *); |
| 1195 | extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *); | 1195 | extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *); |
| 1196 | extern void jbd2_journal_write_revoke_records(journal_t *, transaction_t *); | 1196 | extern void jbd2_journal_write_revoke_records(journal_t *, |
| 1197 | transaction_t *, int); | ||
| 1197 | 1198 | ||
| 1198 | /* Recovery revoke support */ | 1199 | /* Recovery revoke support */ |
| 1199 | extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); | 1200 | extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 311a073afe8..8cc137911b3 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
| @@ -409,6 +409,8 @@ struct kvm_trace_rec { | |||
| 409 | #ifdef __KVM_HAVE_DEVICE_ASSIGNMENT | 409 | #ifdef __KVM_HAVE_DEVICE_ASSIGNMENT |
| 410 | #define KVM_CAP_DEVICE_DEASSIGNMENT 27 | 410 | #define KVM_CAP_DEVICE_DEASSIGNMENT 27 |
| 411 | #endif | 411 | #endif |
| 412 | /* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */ | ||
| 413 | #define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30 | ||
| 412 | 414 | ||
| 413 | #ifdef KVM_CAP_IRQ_ROUTING | 415 | #ifdef KVM_CAP_IRQ_ROUTING |
| 414 | 416 | ||
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h index 04b4d7330e6..d745f5b6c7b 100644 --- a/include/linux/pktcdvd.h +++ b/include/linux/pktcdvd.h | |||
| @@ -113,6 +113,7 @@ struct pkt_ctrl_command { | |||
| 113 | #include <linux/cdrom.h> | 113 | #include <linux/cdrom.h> |
| 114 | #include <linux/kobject.h> | 114 | #include <linux/kobject.h> |
| 115 | #include <linux/sysfs.h> | 115 | #include <linux/sysfs.h> |
| 116 | #include <linux/mempool.h> | ||
| 116 | 117 | ||
| 117 | /* default bio write queue congestion marks */ | 118 | /* default bio write queue congestion marks */ |
| 118 | #define PKT_WRITE_CONGESTION_ON 10000 | 119 | #define PKT_WRITE_CONGESTION_ON 10000 |
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index d6aad0ea603..d4375566926 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h | |||
| @@ -7,6 +7,9 @@ | |||
| 7 | * key configuration differences between boards. | 7 | * key configuration differences between boards. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #ifndef __LINUX_USB_MUSB_H | ||
| 11 | #define __LINUX_USB_MUSB_H | ||
| 12 | |||
| 10 | /* The USB role is defined by the connector used on the board, so long as | 13 | /* The USB role is defined by the connector used on the board, so long as |
| 11 | * standards are being followed. (Developer boards sometimes won't.) | 14 | * standards are being followed. (Developer boards sometimes won't.) |
| 12 | */ | 15 | */ |
| @@ -101,3 +104,5 @@ extern int __init tusb6010_setup_interface( | |||
| 101 | extern int tusb6010_platform_retime(unsigned is_refclk); | 104 | extern int tusb6010_platform_retime(unsigned is_refclk); |
| 102 | 105 | ||
| 103 | #endif /* OMAP2 */ | 106 | #endif /* OMAP2 */ |
| 107 | |||
| 108 | #endif /* __LINUX_USB_MUSB_H */ | ||
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h index 9dc1039ff78..8df0b7f7fc6 100644 --- a/include/net/netfilter/nf_nat.h +++ b/include/net/netfilter/nf_nat.h | |||
| @@ -18,6 +18,7 @@ enum nf_nat_manip_type | |||
| 18 | #define IP_NAT_RANGE_MAP_IPS 1 | 18 | #define IP_NAT_RANGE_MAP_IPS 1 |
| 19 | #define IP_NAT_RANGE_PROTO_SPECIFIED 2 | 19 | #define IP_NAT_RANGE_PROTO_SPECIFIED 2 |
| 20 | #define IP_NAT_RANGE_PROTO_RANDOM 4 | 20 | #define IP_NAT_RANGE_PROTO_RANDOM 4 |
| 21 | #define IP_NAT_RANGE_PERSISTENT 8 | ||
| 21 | 22 | ||
| 22 | /* NAT sequence number modifications */ | 23 | /* NAT sequence number modifications */ |
| 23 | struct nf_nat_seq { | 24 | struct nf_nat_seq { |
diff --git a/include/sound/pxa2xx-lib.h b/include/sound/pxa2xx-lib.h index 2c894b600e5..2fd3d251d9a 100644 --- a/include/sound/pxa2xx-lib.h +++ b/include/sound/pxa2xx-lib.h | |||
| @@ -42,19 +42,4 @@ extern int pxa2xx_ac97_hw_resume(void); | |||
| 42 | extern int pxa2xx_ac97_hw_probe(struct platform_device *dev); | 42 | extern int pxa2xx_ac97_hw_probe(struct platform_device *dev); |
| 43 | extern void pxa2xx_ac97_hw_remove(struct platform_device *dev); | 43 | extern void pxa2xx_ac97_hw_remove(struct platform_device *dev); |
| 44 | 44 | ||
| 45 | /* AC97 platform_data */ | ||
| 46 | /** | ||
| 47 | * struct pxa2xx_ac97_platform_data - pxa ac97 platform data | ||
| 48 | * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95) | ||
| 49 | * a -1 value means no gpio will be used for reset | ||
| 50 | * | ||
| 51 | * Platform data should only be specified for pxa27x CPUs where a silicon bug | ||
| 52 | * prevents correct operation of the reset line. If not specified, the default | ||
| 53 | * behaviour is to consider gpio 113 as the AC97 reset line, which is the | ||
| 54 | * default on most boards. | ||
| 55 | */ | ||
| 56 | struct pxa2xx_ac97_platform_data { | ||
| 57 | int reset_gpio; | ||
| 58 | }; | ||
| 59 | |||
| 60 | #endif | 45 | #endif |
diff --git a/kernel/slow-work.c b/kernel/slow-work.c index cf2bc01186e..b28d19135f4 100644 --- a/kernel/slow-work.c +++ b/kernel/slow-work.c | |||
| @@ -609,14 +609,14 @@ void slow_work_unregister_user(void) | |||
| 609 | if (slow_work_user_count == 0) { | 609 | if (slow_work_user_count == 0) { |
| 610 | printk(KERN_NOTICE "Slow work thread pool: Shutting down\n"); | 610 | printk(KERN_NOTICE "Slow work thread pool: Shutting down\n"); |
| 611 | slow_work_threads_should_exit = true; | 611 | slow_work_threads_should_exit = true; |
| 612 | del_timer_sync(&slow_work_cull_timer); | ||
| 613 | del_timer_sync(&slow_work_oom_timer); | ||
| 612 | wake_up_all(&slow_work_thread_wq); | 614 | wake_up_all(&slow_work_thread_wq); |
| 613 | wait_for_completion(&slow_work_last_thread_exited); | 615 | wait_for_completion(&slow_work_last_thread_exited); |
| 614 | printk(KERN_NOTICE "Slow work thread pool:" | 616 | printk(KERN_NOTICE "Slow work thread pool:" |
| 615 | " Shut down complete\n"); | 617 | " Shut down complete\n"); |
| 616 | } | 618 | } |
| 617 | 619 | ||
| 618 | del_timer_sync(&slow_work_cull_timer); | ||
| 619 | |||
| 620 | mutex_unlock(&slow_work_user_lock); | 620 | mutex_unlock(&slow_work_user_lock); |
| 621 | } | 621 | } |
| 622 | EXPORT_SYMBOL(slow_work_unregister_user); | 622 | EXPORT_SYMBOL(slow_work_unregister_user); |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index c6e854f215f..812c28207ba 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -440,7 +440,7 @@ config LOCKDEP | |||
| 440 | bool | 440 | bool |
| 441 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | 441 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |
| 442 | select STACKTRACE | 442 | select STACKTRACE |
| 443 | select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND | 443 | select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND && !S390 |
| 444 | select KALLSYMS | 444 | select KALLSYMS |
| 445 | select KALLSYMS_ALL | 445 | select KALLSYMS_ALL |
| 446 | 446 | ||
| @@ -620,7 +620,7 @@ config ARCH_WANT_FRAME_POINTERS | |||
| 620 | config FRAME_POINTER | 620 | config FRAME_POINTER |
| 621 | bool "Compile the kernel with frame pointers" | 621 | bool "Compile the kernel with frame pointers" |
| 622 | depends on DEBUG_KERNEL && \ | 622 | depends on DEBUG_KERNEL && \ |
| 623 | (CRIS || M68K || M68KNOMMU || FRV || UML || S390 || \ | 623 | (CRIS || M68K || M68KNOMMU || FRV || UML || \ |
| 624 | AVR32 || SUPERH || BLACKFIN || MN10300) || \ | 624 | AVR32 || SUPERH || BLACKFIN || MN10300) || \ |
| 625 | ARCH_WANT_FRAME_POINTERS | 625 | ARCH_WANT_FRAME_POINTERS |
| 626 | default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS | 626 | default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS |
| @@ -809,13 +809,13 @@ config FAULT_INJECTION_STACKTRACE_FILTER | |||
| 809 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT | 809 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT |
| 810 | depends on !X86_64 | 810 | depends on !X86_64 |
| 811 | select STACKTRACE | 811 | select STACKTRACE |
| 812 | select FRAME_POINTER if !PPC | 812 | select FRAME_POINTER if !PPC && !S390 |
| 813 | help | 813 | help |
| 814 | Provide stacktrace filter for fault-injection capabilities | 814 | Provide stacktrace filter for fault-injection capabilities |
| 815 | 815 | ||
| 816 | config LATENCYTOP | 816 | config LATENCYTOP |
| 817 | bool "Latency measuring infrastructure" | 817 | bool "Latency measuring infrastructure" |
| 818 | select FRAME_POINTER if !MIPS && !PPC | 818 | select FRAME_POINTER if !MIPS && !PPC && !S390 |
| 819 | select KALLSYMS | 819 | select KALLSYMS |
| 820 | select KALLSYMS_ALL | 820 | select KALLSYMS_ALL |
| 821 | select STACKTRACE | 821 | select STACKTRACE |
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index b7b449dafbe..a295e404e90 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c | |||
| @@ -347,9 +347,12 @@ bool sg_miter_next(struct sg_mapping_iter *miter) | |||
| 347 | sg_miter_stop(miter); | 347 | sg_miter_stop(miter); |
| 348 | 348 | ||
| 349 | /* get to the next sg if necessary. __offset is adjusted by stop */ | 349 | /* get to the next sg if necessary. __offset is adjusted by stop */ |
| 350 | if (miter->__offset == miter->__sg->length && --miter->__nents) { | 350 | while (miter->__offset == miter->__sg->length) { |
| 351 | miter->__sg = sg_next(miter->__sg); | 351 | if (--miter->__nents) { |
| 352 | miter->__offset = 0; | 352 | miter->__sg = sg_next(miter->__sg); |
| 353 | miter->__offset = 0; | ||
| 354 | } else | ||
| 355 | return false; | ||
| 353 | } | 356 | } |
| 354 | 357 | ||
| 355 | /* map the next page */ | 358 | /* map the next page */ |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 1b34135cf99..6b092136401 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -668,7 +668,8 @@ static int vlan_ethtool_get_settings(struct net_device *dev, | |||
| 668 | const struct vlan_dev_info *vlan = vlan_dev_info(dev); | 668 | const struct vlan_dev_info *vlan = vlan_dev_info(dev); |
| 669 | struct net_device *real_dev = vlan->real_dev; | 669 | struct net_device *real_dev = vlan->real_dev; |
| 670 | 670 | ||
| 671 | if (!real_dev->ethtool_ops->get_settings) | 671 | if (!real_dev->ethtool_ops || |
| 672 | !real_dev->ethtool_ops->get_settings) | ||
| 672 | return -EOPNOTSUPP; | 673 | return -EOPNOTSUPP; |
| 673 | 674 | ||
| 674 | return real_dev->ethtool_ops->get_settings(real_dev, cmd); | 675 | return real_dev->ethtool_ops->get_settings(real_dev, cmd); |
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index 57aeba729ba..832bcf092a0 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c | |||
| @@ -148,9 +148,13 @@ static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos) | |||
| 148 | { | 148 | { |
| 149 | struct ax25_uid_assoc *pt; | 149 | struct ax25_uid_assoc *pt; |
| 150 | struct hlist_node *node; | 150 | struct hlist_node *node; |
| 151 | int i = 0; | 151 | int i = 1; |
| 152 | 152 | ||
| 153 | read_lock(&ax25_uid_lock); | 153 | read_lock(&ax25_uid_lock); |
| 154 | |||
| 155 | if (*pos == 0) | ||
| 156 | return SEQ_START_TOKEN; | ||
| 157 | |||
| 154 | ax25_uid_for_each(pt, node, &ax25_uid_list) { | 158 | ax25_uid_for_each(pt, node, &ax25_uid_list) { |
| 155 | if (i == *pos) | 159 | if (i == *pos) |
| 156 | return pt; | 160 | return pt; |
| @@ -162,8 +166,10 @@ static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos) | |||
| 162 | static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 166 | static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos) |
| 163 | { | 167 | { |
| 164 | ++*pos; | 168 | ++*pos; |
| 165 | 169 | if (v == SEQ_START_TOKEN) | |
| 166 | return hlist_entry(((ax25_uid_assoc *)v)->uid_node.next, | 170 | return ax25_uid_list.first; |
| 171 | else | ||
| 172 | return hlist_entry(((ax25_uid_assoc *)v)->uid_node.next, | ||
| 167 | ax25_uid_assoc, uid_node); | 173 | ax25_uid_assoc, uid_node); |
| 168 | } | 174 | } |
| 169 | 175 | ||
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 55534244c3a..15f40ea8d54 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
| @@ -866,8 +866,16 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
| 866 | hci_dev_lock(hdev); | 866 | hci_dev_lock(hdev); |
| 867 | 867 | ||
| 868 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); | 868 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); |
| 869 | if (!conn) | 869 | if (!conn) { |
| 870 | goto unlock; | 870 | if (ev->link_type != SCO_LINK) |
| 871 | goto unlock; | ||
| 872 | |||
| 873 | conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, &ev->bdaddr); | ||
| 874 | if (!conn) | ||
| 875 | goto unlock; | ||
| 876 | |||
| 877 | conn->type = SCO_LINK; | ||
| 878 | } | ||
| 871 | 879 | ||
| 872 | if (!ev->status) { | 880 | if (!ev->status) { |
| 873 | conn->handle = __le16_to_cpu(ev->handle); | 881 | conn->handle = __le16_to_cpu(ev->handle); |
| @@ -1646,20 +1654,28 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu | |||
| 1646 | conn->type = SCO_LINK; | 1654 | conn->type = SCO_LINK; |
| 1647 | } | 1655 | } |
| 1648 | 1656 | ||
| 1649 | if (conn->out && ev->status == 0x1c && conn->attempt < 2) { | 1657 | switch (ev->status) { |
| 1650 | conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) | | 1658 | case 0x00: |
| 1651 | (hdev->esco_type & EDR_ESCO_MASK); | ||
| 1652 | hci_setup_sync(conn, conn->link->handle); | ||
| 1653 | goto unlock; | ||
| 1654 | } | ||
| 1655 | |||
| 1656 | if (!ev->status) { | ||
| 1657 | conn->handle = __le16_to_cpu(ev->handle); | 1659 | conn->handle = __le16_to_cpu(ev->handle); |
| 1658 | conn->state = BT_CONNECTED; | 1660 | conn->state = BT_CONNECTED; |
| 1659 | 1661 | ||
| 1660 | hci_conn_add_sysfs(conn); | 1662 | hci_conn_add_sysfs(conn); |
| 1661 | } else | 1663 | break; |
| 1664 | |||
| 1665 | case 0x1c: /* SCO interval rejected */ | ||
| 1666 | case 0x1f: /* Unspecified error */ | ||
| 1667 | if (conn->out && conn->attempt < 2) { | ||
| 1668 | conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) | | ||
| 1669 | (hdev->esco_type & EDR_ESCO_MASK); | ||
| 1670 | hci_setup_sync(conn, conn->link->handle); | ||
| 1671 | goto unlock; | ||
| 1672 | } | ||
| 1673 | /* fall through */ | ||
| 1674 | |||
| 1675 | default: | ||
| 1662 | conn->state = BT_CLOSED; | 1676 | conn->state = BT_CLOSED; |
| 1677 | break; | ||
| 1678 | } | ||
| 1663 | 1679 | ||
| 1664 | hci_proto_connect_cfm(conn, ev->status); | 1680 | hci_proto_connect_cfm(conn, ev->status); |
| 1665 | if (ev->status) | 1681 | if (ev->status) |
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 1d0fb0f23c6..374536e050a 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
| @@ -1194,6 +1194,8 @@ void rfcomm_dlc_accept(struct rfcomm_dlc *d) | |||
| 1194 | 1194 | ||
| 1195 | rfcomm_send_ua(d->session, d->dlci); | 1195 | rfcomm_send_ua(d->session, d->dlci); |
| 1196 | 1196 | ||
| 1197 | rfcomm_dlc_clear_timer(d); | ||
| 1198 | |||
| 1197 | rfcomm_dlc_lock(d); | 1199 | rfcomm_dlc_lock(d); |
| 1198 | d->state = BT_CONNECTED; | 1200 | d->state = BT_CONNECTED; |
| 1199 | d->state_change(d, 0); | 1201 | d->state_change(d, 0); |
diff --git a/net/can/af_can.c b/net/can/af_can.c index 547bafc79e2..10f0528c3bf 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
| @@ -674,8 +674,8 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 674 | 674 | ||
| 675 | rcu_read_unlock(); | 675 | rcu_read_unlock(); |
| 676 | 676 | ||
| 677 | /* free the skbuff allocated by the netdevice driver */ | 677 | /* consume the skbuff allocated by the netdevice driver */ |
| 678 | kfree_skb(skb); | 678 | consume_skb(skb); |
| 679 | 679 | ||
| 680 | if (matches > 0) { | 680 | if (matches > 0) { |
| 681 | can_stats.matches++; | 681 | can_stats.matches++; |
diff --git a/net/core/dev.c b/net/core/dev.c index 343883f65ea..308a7d0c277 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1336,7 +1336,12 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev) | |||
| 1336 | { | 1336 | { |
| 1337 | struct packet_type *ptype; | 1337 | struct packet_type *ptype; |
| 1338 | 1338 | ||
| 1339 | #ifdef CONFIG_NET_CLS_ACT | ||
| 1340 | if (!(skb->tstamp.tv64 && (G_TC_FROM(skb->tc_verd) & AT_INGRESS))) | ||
| 1341 | net_timestamp(skb); | ||
| 1342 | #else | ||
| 1339 | net_timestamp(skb); | 1343 | net_timestamp(skb); |
| 1344 | #endif | ||
| 1340 | 1345 | ||
| 1341 | rcu_read_lock(); | 1346 | rcu_read_lock(); |
| 1342 | list_for_each_entry_rcu(ptype, &ptype_all, list) { | 1347 | list_for_each_entry_rcu(ptype, &ptype_all, list) { |
| @@ -2540,9 +2545,9 @@ struct sk_buff *napi_fraginfo_skb(struct napi_struct *napi, | |||
| 2540 | } | 2545 | } |
| 2541 | 2546 | ||
| 2542 | BUG_ON(info->nr_frags > MAX_SKB_FRAGS); | 2547 | BUG_ON(info->nr_frags > MAX_SKB_FRAGS); |
| 2543 | frag = &info->frags[info->nr_frags - 1]; | 2548 | frag = info->frags; |
| 2544 | 2549 | ||
| 2545 | for (i = skb_shinfo(skb)->nr_frags; i < info->nr_frags; i++) { | 2550 | for (i = 0; i < info->nr_frags; i++) { |
| 2546 | skb_fill_page_desc(skb, i, frag->page, frag->page_offset, | 2551 | skb_fill_page_desc(skb, i, frag->page, frag->page_offset, |
| 2547 | frag->size); | 2552 | frag->size); |
| 2548 | frag++; | 2553 | frag++; |
| @@ -4400,7 +4405,7 @@ int register_netdevice(struct net_device *dev) | |||
| 4400 | dev->iflink = -1; | 4405 | dev->iflink = -1; |
| 4401 | 4406 | ||
| 4402 | #ifdef CONFIG_COMPAT_NET_DEV_OPS | 4407 | #ifdef CONFIG_COMPAT_NET_DEV_OPS |
| 4403 | /* Netdevice_ops API compatiability support. | 4408 | /* Netdevice_ops API compatibility support. |
| 4404 | * This is temporary until all network devices are converted. | 4409 | * This is temporary until all network devices are converted. |
| 4405 | */ | 4410 | */ |
| 4406 | if (dev->netdev_ops) { | 4411 | if (dev->netdev_ops) { |
| @@ -4411,7 +4416,7 @@ int register_netdevice(struct net_device *dev) | |||
| 4411 | dev->name, netdev_drivername(dev, drivername, 64)); | 4416 | dev->name, netdev_drivername(dev, drivername, 64)); |
| 4412 | 4417 | ||
| 4413 | /* This works only because net_device_ops and the | 4418 | /* This works only because net_device_ops and the |
| 4414 | compatiablity structure are the same. */ | 4419 | compatibility structure are the same. */ |
| 4415 | dev->netdev_ops = (void *) &(dev->init); | 4420 | dev->netdev_ops = (void *) &(dev->init); |
| 4416 | } | 4421 | } |
| 4417 | #endif | 4422 | #endif |
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index fe65187810f..3229e0a81ba 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c | |||
| @@ -211,7 +211,8 @@ find_best_ips_proto(struct nf_conntrack_tuple *tuple, | |||
| 211 | minip = ntohl(range->min_ip); | 211 | minip = ntohl(range->min_ip); |
| 212 | maxip = ntohl(range->max_ip); | 212 | maxip = ntohl(range->max_ip); |
| 213 | j = jhash_2words((__force u32)tuple->src.u3.ip, | 213 | j = jhash_2words((__force u32)tuple->src.u3.ip, |
| 214 | (__force u32)tuple->dst.u3.ip, 0); | 214 | range->flags & IP_NAT_RANGE_PERSISTENT ? |
| 215 | (__force u32)tuple->dst.u3.ip : 0, 0); | ||
| 215 | j = ((u64)j * (maxip - minip + 1)) >> 32; | 216 | j = ((u64)j * (maxip - minip + 1)) >> 32; |
| 216 | *var_ipp = htonl(minip + j); | 217 | *var_ipp = htonl(minip + j); |
| 217 | } | 218 | } |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index fafbec8b073..1d7f49c6f0c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -2511,6 +2511,7 @@ struct sk_buff **tcp_gro_receive(struct sk_buff **head, struct sk_buff *skb) | |||
| 2511 | struct sk_buff *p; | 2511 | struct sk_buff *p; |
| 2512 | struct tcphdr *th; | 2512 | struct tcphdr *th; |
| 2513 | struct tcphdr *th2; | 2513 | struct tcphdr *th2; |
| 2514 | unsigned int len; | ||
| 2514 | unsigned int thlen; | 2515 | unsigned int thlen; |
| 2515 | unsigned int flags; | 2516 | unsigned int flags; |
| 2516 | unsigned int mss = 1; | 2517 | unsigned int mss = 1; |
| @@ -2531,6 +2532,7 @@ struct sk_buff **tcp_gro_receive(struct sk_buff **head, struct sk_buff *skb) | |||
| 2531 | 2532 | ||
| 2532 | skb_gro_pull(skb, thlen); | 2533 | skb_gro_pull(skb, thlen); |
| 2533 | 2534 | ||
| 2535 | len = skb_gro_len(skb); | ||
| 2534 | flags = tcp_flag_word(th); | 2536 | flags = tcp_flag_word(th); |
| 2535 | 2537 | ||
| 2536 | for (; (p = *head); head = &p->next) { | 2538 | for (; (p = *head); head = &p->next) { |
| @@ -2561,7 +2563,7 @@ found: | |||
| 2561 | 2563 | ||
| 2562 | mss = skb_shinfo(p)->gso_size; | 2564 | mss = skb_shinfo(p)->gso_size; |
| 2563 | 2565 | ||
| 2564 | flush |= (skb_gro_len(skb) > mss) | !skb_gro_len(skb); | 2566 | flush |= (len > mss) | !len; |
| 2565 | flush |= (ntohl(th2->seq) + skb_gro_len(p)) ^ ntohl(th->seq); | 2567 | flush |= (ntohl(th2->seq) + skb_gro_len(p)) ^ ntohl(th->seq); |
| 2566 | 2568 | ||
| 2567 | if (flush || skb_gro_receive(head, skb)) { | 2569 | if (flush || skb_gro_receive(head, skb)) { |
| @@ -2574,7 +2576,7 @@ found: | |||
| 2574 | tcp_flag_word(th2) |= flags & (TCP_FLAG_FIN | TCP_FLAG_PSH); | 2576 | tcp_flag_word(th2) |= flags & (TCP_FLAG_FIN | TCP_FLAG_PSH); |
| 2575 | 2577 | ||
| 2576 | out_check_final: | 2578 | out_check_final: |
| 2577 | flush = skb_gro_len(skb) < mss; | 2579 | flush = len < mss; |
| 2578 | flush |= flags & (TCP_FLAG_URG | TCP_FLAG_PSH | TCP_FLAG_RST | | 2580 | flush |= flags & (TCP_FLAG_URG | TCP_FLAG_PSH | TCP_FLAG_RST | |
| 2579 | TCP_FLAG_SYN | TCP_FLAG_FIN); | 2581 | TCP_FLAG_SYN | TCP_FLAG_FIN); |
| 2580 | 2582 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 53300fa2359..59aec609cec 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -778,7 +778,7 @@ static void tcp_adjust_pcount(struct sock *sk, struct sk_buff *skb, int decr) | |||
| 778 | 778 | ||
| 779 | if (tp->lost_skb_hint && | 779 | if (tp->lost_skb_hint && |
| 780 | before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) && | 780 | before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) && |
| 781 | (tcp_is_fack(tp) || TCP_SKB_CB(skb)->sacked)) | 781 | (tcp_is_fack(tp) || (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED))) |
| 782 | tp->lost_cnt_hint -= decr; | 782 | tp->lost_cnt_hint -= decr; |
| 783 | 783 | ||
| 784 | tcp_verify_left_out(tp); | 784 | tcp_verify_left_out(tp); |
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 49e786535dc..b51c9187c34 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
| @@ -172,6 +172,7 @@ static void iucv_sock_close(struct sock *sk) | |||
| 172 | err = iucv_sock_wait_state(sk, IUCV_CLOSED, 0, timeo); | 172 | err = iucv_sock_wait_state(sk, IUCV_CLOSED, 0, timeo); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | case IUCV_CLOSING: /* fall through */ | ||
| 175 | sk->sk_state = IUCV_CLOSED; | 176 | sk->sk_state = IUCV_CLOSED; |
| 176 | sk->sk_state_change(sk); | 177 | sk->sk_state_change(sk); |
| 177 | 178 | ||
| @@ -224,6 +225,8 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio) | |||
| 224 | spin_lock_init(&iucv_sk(sk)->message_q.lock); | 225 | spin_lock_init(&iucv_sk(sk)->message_q.lock); |
| 225 | skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q); | 226 | skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q); |
| 226 | iucv_sk(sk)->send_tag = 0; | 227 | iucv_sk(sk)->send_tag = 0; |
| 228 | iucv_sk(sk)->path = NULL; | ||
| 229 | memset(&iucv_sk(sk)->src_user_id , 0, 32); | ||
| 227 | 230 | ||
| 228 | sk->sk_destruct = iucv_sock_destruct; | 231 | sk->sk_destruct = iucv_sock_destruct; |
| 229 | sk->sk_sndtimeo = IUCV_CONN_TIMEOUT; | 232 | sk->sk_sndtimeo = IUCV_CONN_TIMEOUT; |
| @@ -811,6 +814,8 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 811 | 814 | ||
| 812 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); | 815 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); |
| 813 | 816 | ||
| 817 | /* receive/dequeue next skb: | ||
| 818 | * the function understands MSG_PEEK and, thus, does not dequeue skb */ | ||
| 814 | skb = skb_recv_datagram(sk, flags, noblock, &err); | 819 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
| 815 | if (!skb) { | 820 | if (!skb) { |
| 816 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 821 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
| @@ -858,9 +863,7 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 858 | iucv_process_message_q(sk); | 863 | iucv_process_message_q(sk); |
| 859 | spin_unlock_bh(&iucv->message_q.lock); | 864 | spin_unlock_bh(&iucv->message_q.lock); |
| 860 | } | 865 | } |
| 861 | 866 | } | |
| 862 | } else | ||
| 863 | skb_queue_head(&sk->sk_receive_queue, skb); | ||
| 864 | 867 | ||
| 865 | done: | 868 | done: |
| 866 | return err ? : copied; | 869 | return err ? : copied; |
| @@ -934,6 +937,9 @@ static int iucv_sock_shutdown(struct socket *sock, int how) | |||
| 934 | 937 | ||
| 935 | lock_sock(sk); | 938 | lock_sock(sk); |
| 936 | switch (sk->sk_state) { | 939 | switch (sk->sk_state) { |
| 940 | case IUCV_DISCONN: | ||
| 941 | case IUCV_CLOSING: | ||
| 942 | case IUCV_SEVERED: | ||
| 937 | case IUCV_CLOSED: | 943 | case IUCV_CLOSED: |
| 938 | err = -ENOTCONN; | 944 | err = -ENOTCONN; |
| 939 | goto fail; | 945 | goto fail; |
| @@ -1113,8 +1119,12 @@ static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg) | |||
| 1113 | struct sock_msg_q *save_msg; | 1119 | struct sock_msg_q *save_msg; |
| 1114 | int len; | 1120 | int len; |
| 1115 | 1121 | ||
| 1116 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 1122 | if (sk->sk_shutdown & RCV_SHUTDOWN) { |
| 1123 | iucv_message_reject(path, msg); | ||
| 1117 | return; | 1124 | return; |
| 1125 | } | ||
| 1126 | |||
| 1127 | spin_lock(&iucv->message_q.lock); | ||
| 1118 | 1128 | ||
| 1119 | if (!list_empty(&iucv->message_q.list) || | 1129 | if (!list_empty(&iucv->message_q.list) || |
| 1120 | !skb_queue_empty(&iucv->backlog_skb_q)) | 1130 | !skb_queue_empty(&iucv->backlog_skb_q)) |
| @@ -1129,9 +1139,8 @@ static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg) | |||
| 1129 | if (!skb) | 1139 | if (!skb) |
| 1130 | goto save_message; | 1140 | goto save_message; |
| 1131 | 1141 | ||
| 1132 | spin_lock(&iucv->message_q.lock); | ||
| 1133 | iucv_process_message(sk, skb, path, msg); | 1142 | iucv_process_message(sk, skb, path, msg); |
| 1134 | spin_unlock(&iucv->message_q.lock); | 1143 | goto out_unlock; |
| 1135 | 1144 | ||
| 1136 | return; | 1145 | return; |
| 1137 | 1146 | ||
| @@ -1142,8 +1151,9 @@ save_message: | |||
| 1142 | save_msg->path = path; | 1151 | save_msg->path = path; |
| 1143 | save_msg->msg = *msg; | 1152 | save_msg->msg = *msg; |
| 1144 | 1153 | ||
| 1145 | spin_lock(&iucv->message_q.lock); | ||
| 1146 | list_add_tail(&save_msg->list, &iucv->message_q.list); | 1154 | list_add_tail(&save_msg->list, &iucv->message_q.list); |
| 1155 | |||
| 1156 | out_unlock: | ||
| 1147 | spin_unlock(&iucv->message_q.lock); | 1157 | spin_unlock(&iucv->message_q.lock); |
| 1148 | } | 1158 | } |
| 1149 | 1159 | ||
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index f3d9ae350fb..ecc3faf9f11 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
| @@ -202,10 +202,3 @@ config MAC80211_DEBUG_COUNTERS | |||
| 202 | and show them in debugfs. | 202 | and show them in debugfs. |
| 203 | 203 | ||
| 204 | If unsure, say N. | 204 | If unsure, say N. |
| 205 | |||
| 206 | config MAC80211_VERBOSE_SPECT_MGMT_DEBUG | ||
| 207 | bool "Verbose Spectrum Management (IEEE 802.11h)debugging" | ||
| 208 | depends on MAC80211_DEBUG_MENU | ||
| 209 | ---help--- | ||
| 210 | Say Y here to print out verbose Spectrum Management (IEEE 802.11h) | ||
| 211 | debug messages. | ||
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index a6f1d8a869b..fbcbed6cad0 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
| @@ -258,7 +258,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) | |||
| 258 | (chan->max_power - local->power_constr_level) : | 258 | (chan->max_power - local->power_constr_level) : |
| 259 | chan->max_power; | 259 | chan->max_power; |
| 260 | 260 | ||
| 261 | if (local->user_power_level) | 261 | if (local->user_power_level >= 0) |
| 262 | power = min(power, local->user_power_level); | 262 | power = min(power, local->user_power_level); |
| 263 | 263 | ||
| 264 | if (local->hw.conf.power_level != power) { | 264 | if (local->hw.conf.power_level != power) { |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 7ecda9d59d8..132938b073d 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -441,6 +441,9 @@ static bool ieee80211_check_tim(struct ieee802_11_elems *elems, u16 aid) | |||
| 441 | u8 index, indexn1, indexn2; | 441 | u8 index, indexn1, indexn2; |
| 442 | struct ieee80211_tim_ie *tim = (struct ieee80211_tim_ie *) elems->tim; | 442 | struct ieee80211_tim_ie *tim = (struct ieee80211_tim_ie *) elems->tim; |
| 443 | 443 | ||
| 444 | if (unlikely(!tim || elems->tim_len < 4)) | ||
| 445 | return false; | ||
| 446 | |||
| 444 | aid &= 0x3fff; | 447 | aid &= 0x3fff; |
| 445 | index = aid / 8; | 448 | index = aid / 8; |
| 446 | mask = 1 << (aid & 7); | 449 | mask = 1 << (aid & 7); |
| @@ -945,9 +948,13 @@ void ieee80211_beacon_loss_work(struct work_struct *work) | |||
| 945 | u.mgd.beacon_loss_work); | 948 | u.mgd.beacon_loss_work); |
| 946 | struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; | 949 | struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; |
| 947 | 950 | ||
| 948 | printk(KERN_DEBUG "%s: driver reports beacon loss from AP %pM " | 951 | #ifdef CONFIG_MAC80211_VERBOSE_DEBUG |
| 949 | "- sending probe request\n", sdata->dev->name, | 952 | if (net_ratelimit()) { |
| 950 | sdata->u.mgd.bssid); | 953 | printk(KERN_DEBUG "%s: driver reports beacon loss from AP %pM " |
| 954 | "- sending probe request\n", sdata->dev->name, | ||
| 955 | sdata->u.mgd.bssid); | ||
| 956 | } | ||
| 957 | #endif | ||
| 951 | 958 | ||
| 952 | ifmgd->flags |= IEEE80211_STA_PROBEREQ_POLL; | 959 | ifmgd->flags |= IEEE80211_STA_PROBEREQ_POLL; |
| 953 | ieee80211_send_probe_req(sdata, ifmgd->bssid, ifmgd->ssid, | 960 | ieee80211_send_probe_req(sdata, ifmgd->bssid, ifmgd->ssid, |
| @@ -1007,9 +1014,13 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata) | |||
| 1007 | (local->hw.conf.flags & IEEE80211_CONF_PS)) && | 1014 | (local->hw.conf.flags & IEEE80211_CONF_PS)) && |
| 1008 | time_after(jiffies, | 1015 | time_after(jiffies, |
| 1009 | ifmgd->last_beacon + IEEE80211_MONITORING_INTERVAL)) { | 1016 | ifmgd->last_beacon + IEEE80211_MONITORING_INTERVAL)) { |
| 1010 | printk(KERN_DEBUG "%s: beacon loss from AP %pM " | 1017 | #ifdef CONFIG_MAC80211_VERBOSE_DEBUG |
| 1011 | "- sending probe request\n", | 1018 | if (net_ratelimit()) { |
| 1012 | sdata->dev->name, ifmgd->bssid); | 1019 | printk(KERN_DEBUG "%s: beacon loss from AP %pM " |
| 1020 | "- sending probe request\n", | ||
| 1021 | sdata->dev->name, ifmgd->bssid); | ||
| 1022 | } | ||
| 1023 | #endif | ||
| 1013 | ifmgd->flags |= IEEE80211_STA_PROBEREQ_POLL; | 1024 | ifmgd->flags |= IEEE80211_STA_PROBEREQ_POLL; |
| 1014 | ieee80211_send_probe_req(sdata, ifmgd->bssid, ifmgd->ssid, | 1025 | ieee80211_send_probe_req(sdata, ifmgd->bssid, ifmgd->ssid, |
| 1015 | ifmgd->ssid_len, NULL, 0); | 1026 | ifmgd->ssid_len, NULL, 0); |
| @@ -1355,7 +1366,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
| 1355 | 1366 | ||
| 1356 | for (i = 0; i < elems.ext_supp_rates_len; i++) { | 1367 | for (i = 0; i < elems.ext_supp_rates_len; i++) { |
| 1357 | int rate = (elems.ext_supp_rates[i] & 0x7f) * 5; | 1368 | int rate = (elems.ext_supp_rates[i] & 0x7f) * 5; |
| 1358 | bool is_basic = !!(elems.supp_rates[i] & 0x80); | 1369 | bool is_basic = !!(elems.ext_supp_rates[i] & 0x80); |
| 1359 | 1370 | ||
| 1360 | if (rate > 110) | 1371 | if (rate > 110) |
| 1361 | have_higher_than_11mbit = true; | 1372 | have_higher_than_11mbit = true; |
| @@ -1902,9 +1913,17 @@ static void ieee80211_sta_work(struct work_struct *work) | |||
| 1902 | 1913 | ||
| 1903 | static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) | 1914 | static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) |
| 1904 | { | 1915 | { |
| 1905 | if (sdata->vif.type == NL80211_IFTYPE_STATION) | 1916 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
| 1917 | /* | ||
| 1918 | * Need to update last_beacon to avoid beacon loss | ||
| 1919 | * test to trigger. | ||
| 1920 | */ | ||
| 1921 | sdata->u.mgd.last_beacon = jiffies; | ||
| 1922 | |||
| 1923 | |||
| 1906 | queue_work(sdata->local->hw.workqueue, | 1924 | queue_work(sdata->local->hw.workqueue, |
| 1907 | &sdata->u.mgd.work); | 1925 | &sdata->u.mgd.work); |
| 1926 | } | ||
| 1908 | } | 1927 | } |
| 1909 | 1928 | ||
| 1910 | /* interface setup */ | 1929 | /* interface setup */ |
| @@ -2105,12 +2124,13 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) | |||
| 2105 | struct ieee80211_local *local = | 2124 | struct ieee80211_local *local = |
| 2106 | container_of(work, struct ieee80211_local, | 2125 | container_of(work, struct ieee80211_local, |
| 2107 | dynamic_ps_enable_work); | 2126 | dynamic_ps_enable_work); |
| 2127 | /* XXX: using scan_sdata is completely broken! */ | ||
| 2108 | struct ieee80211_sub_if_data *sdata = local->scan_sdata; | 2128 | struct ieee80211_sub_if_data *sdata = local->scan_sdata; |
| 2109 | 2129 | ||
| 2110 | if (local->hw.conf.flags & IEEE80211_CONF_PS) | 2130 | if (local->hw.conf.flags & IEEE80211_CONF_PS) |
| 2111 | return; | 2131 | return; |
| 2112 | 2132 | ||
| 2113 | if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) | 2133 | if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK && sdata) |
| 2114 | ieee80211_send_nullfunc(local, sdata, 1); | 2134 | ieee80211_send_nullfunc(local, sdata, 1); |
| 2115 | 2135 | ||
| 2116 | local->hw.conf.flags |= IEEE80211_CONF_PS; | 2136 | local->hw.conf.flags |= IEEE80211_CONF_PS; |
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 02730232649..81985d27cbd 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
| @@ -156,8 +156,19 @@ int __ieee80211_resume(struct ieee80211_hw *hw) | |||
| 156 | case NL80211_IFTYPE_ADHOC: | 156 | case NL80211_IFTYPE_ADHOC: |
| 157 | case NL80211_IFTYPE_AP: | 157 | case NL80211_IFTYPE_AP: |
| 158 | case NL80211_IFTYPE_MESH_POINT: | 158 | case NL80211_IFTYPE_MESH_POINT: |
| 159 | WARN_ON(ieee80211_if_config(sdata, changed)); | 159 | /* |
| 160 | ieee80211_bss_info_change_notify(sdata, ~0); | 160 | * Driver's config_interface can fail if rfkill is |
| 161 | * enabled. Accommodate this return code. | ||
| 162 | * FIXME: When mac80211 has knowledge of rfkill | ||
| 163 | * state the code below can change back to: | ||
| 164 | * WARN(ieee80211_if_config(sdata, changed)); | ||
| 165 | * ieee80211_bss_info_change_notify(sdata, ~0); | ||
| 166 | */ | ||
| 167 | if (ieee80211_if_config(sdata, changed)) | ||
| 168 | printk(KERN_DEBUG "%s: failed to configure interface during resume\n", | ||
| 169 | sdata->dev->name); | ||
| 170 | else | ||
| 171 | ieee80211_bss_info_change_notify(sdata, ~0); | ||
| 161 | break; | 172 | break; |
| 162 | case NL80211_IFTYPE_WDS: | 173 | case NL80211_IFTYPE_WDS: |
| 163 | break; | 174 | break; |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 64ebe664eff..9776f73c51a 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | 29 | static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, |
| 30 | struct tid_ampdu_rx *tid_agg_rx, | 30 | struct tid_ampdu_rx *tid_agg_rx, |
| 31 | struct sk_buff *skb, | 31 | struct sk_buff *skb, |
| 32 | struct ieee80211_rx_status *status, | ||
| 32 | u16 mpdu_seq_num, | 33 | u16 mpdu_seq_num, |
| 33 | int bar_req); | 34 | int bar_req); |
| 34 | /* | 35 | /* |
| @@ -1396,7 +1397,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) | |||
| 1396 | * mac80211. That also explains the __skb_push() | 1397 | * mac80211. That also explains the __skb_push() |
| 1397 | * below. | 1398 | * below. |
| 1398 | */ | 1399 | */ |
| 1399 | align = (unsigned long)skb->data & 4; | 1400 | align = (unsigned long)skb->data & 3; |
| 1400 | if (align) { | 1401 | if (align) { |
| 1401 | if (WARN_ON(skb_headroom(skb) < 3)) { | 1402 | if (WARN_ON(skb_headroom(skb) < 3)) { |
| 1402 | dev_kfree_skb(skb); | 1403 | dev_kfree_skb(skb); |
| @@ -1688,7 +1689,7 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx) | |||
| 1688 | /* manage reordering buffer according to requested */ | 1689 | /* manage reordering buffer according to requested */ |
| 1689 | /* sequence number */ | 1690 | /* sequence number */ |
| 1690 | rcu_read_lock(); | 1691 | rcu_read_lock(); |
| 1691 | ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, NULL, | 1692 | ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, NULL, NULL, |
| 1692 | start_seq_num, 1); | 1693 | start_seq_num, 1); |
| 1693 | rcu_read_unlock(); | 1694 | rcu_read_unlock(); |
| 1694 | return RX_DROP_UNUSABLE; | 1695 | return RX_DROP_UNUSABLE; |
| @@ -2293,6 +2294,7 @@ static inline u16 seq_sub(u16 sq1, u16 sq2) | |||
| 2293 | static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | 2294 | static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, |
| 2294 | struct tid_ampdu_rx *tid_agg_rx, | 2295 | struct tid_ampdu_rx *tid_agg_rx, |
| 2295 | struct sk_buff *skb, | 2296 | struct sk_buff *skb, |
| 2297 | struct ieee80211_rx_status *rxstatus, | ||
| 2296 | u16 mpdu_seq_num, | 2298 | u16 mpdu_seq_num, |
| 2297 | int bar_req) | 2299 | int bar_req) |
| 2298 | { | 2300 | { |
| @@ -2374,6 +2376,8 @@ static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | |||
| 2374 | 2376 | ||
| 2375 | /* put the frame in the reordering buffer */ | 2377 | /* put the frame in the reordering buffer */ |
| 2376 | tid_agg_rx->reorder_buf[index] = skb; | 2378 | tid_agg_rx->reorder_buf[index] = skb; |
| 2379 | memcpy(tid_agg_rx->reorder_buf[index]->cb, rxstatus, | ||
| 2380 | sizeof(*rxstatus)); | ||
| 2377 | tid_agg_rx->stored_mpdu_num++; | 2381 | tid_agg_rx->stored_mpdu_num++; |
| 2378 | /* release the buffer until next missing frame */ | 2382 | /* release the buffer until next missing frame */ |
| 2379 | index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) | 2383 | index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) |
| @@ -2399,7 +2403,8 @@ static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | |||
| 2399 | } | 2403 | } |
| 2400 | 2404 | ||
| 2401 | static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, | 2405 | static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, |
| 2402 | struct sk_buff *skb) | 2406 | struct sk_buff *skb, |
| 2407 | struct ieee80211_rx_status *status) | ||
| 2403 | { | 2408 | { |
| 2404 | struct ieee80211_hw *hw = &local->hw; | 2409 | struct ieee80211_hw *hw = &local->hw; |
| 2405 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 2410 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |
| @@ -2448,7 +2453,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, | |||
| 2448 | 2453 | ||
| 2449 | /* according to mpdu sequence number deal with reordering buffer */ | 2454 | /* according to mpdu sequence number deal with reordering buffer */ |
| 2450 | mpdu_seq_num = (sc & IEEE80211_SCTL_SEQ) >> 4; | 2455 | mpdu_seq_num = (sc & IEEE80211_SCTL_SEQ) >> 4; |
| 2451 | ret = ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, skb, | 2456 | ret = ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, skb, status, |
| 2452 | mpdu_seq_num, 0); | 2457 | mpdu_seq_num, 0); |
| 2453 | end_reorder: | 2458 | end_reorder: |
| 2454 | return ret; | 2459 | return ret; |
| @@ -2512,7 +2517,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
| 2512 | return; | 2517 | return; |
| 2513 | } | 2518 | } |
| 2514 | 2519 | ||
| 2515 | if (!ieee80211_rx_reorder_ampdu(local, skb)) | 2520 | if (!ieee80211_rx_reorder_ampdu(local, skb, status)) |
| 2516 | __ieee80211_rx_handle_packet(hw, skb, status, rate); | 2521 | __ieee80211_rx_handle_packet(hw, skb, status, rate); |
| 2517 | 2522 | ||
| 2518 | rcu_read_unlock(); | 2523 | rcu_read_unlock(); |
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index deb4ecec122..959aa8379cc 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
| @@ -417,6 +417,7 @@ static int ieee80211_ioctl_siwtxpower(struct net_device *dev, | |||
| 417 | { | 417 | { |
| 418 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 418 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
| 419 | struct ieee80211_channel* chan = local->hw.conf.channel; | 419 | struct ieee80211_channel* chan = local->hw.conf.channel; |
| 420 | bool reconf = false; | ||
| 420 | u32 reconf_flags = 0; | 421 | u32 reconf_flags = 0; |
| 421 | int new_power_level; | 422 | int new_power_level; |
| 422 | 423 | ||
| @@ -427,14 +428,38 @@ static int ieee80211_ioctl_siwtxpower(struct net_device *dev, | |||
| 427 | if (!chan) | 428 | if (!chan) |
| 428 | return -EINVAL; | 429 | return -EINVAL; |
| 429 | 430 | ||
| 430 | if (data->txpower.fixed) | 431 | /* only change when not disabling */ |
| 431 | new_power_level = min(data->txpower.value, chan->max_power); | 432 | if (!data->txpower.disabled) { |
| 432 | else /* Automatic power level setting */ | 433 | if (data->txpower.fixed) { |
| 433 | new_power_level = chan->max_power; | 434 | if (data->txpower.value < 0) |
| 435 | return -EINVAL; | ||
| 436 | new_power_level = data->txpower.value; | ||
| 437 | /* | ||
| 438 | * Debatable, but we cannot do a fixed power | ||
| 439 | * level above the regulatory constraint. | ||
| 440 | * Use "iwconfig wlan0 txpower 15dBm" instead. | ||
| 441 | */ | ||
| 442 | if (new_power_level > chan->max_power) | ||
| 443 | return -EINVAL; | ||
| 444 | } else { | ||
| 445 | /* | ||
| 446 | * Automatic power level setting, max being the value | ||
| 447 | * passed in from userland. | ||
| 448 | */ | ||
| 449 | if (data->txpower.value < 0) | ||
| 450 | new_power_level = -1; | ||
| 451 | else | ||
| 452 | new_power_level = data->txpower.value; | ||
| 453 | } | ||
| 454 | |||
| 455 | reconf = true; | ||
| 434 | 456 | ||
| 435 | local->user_power_level = new_power_level; | 457 | /* |
| 436 | if (local->hw.conf.power_level != new_power_level) | 458 | * ieee80211_hw_config() will limit to the channel's |
| 437 | reconf_flags |= IEEE80211_CONF_CHANGE_POWER; | 459 | * max power and possibly power constraint from AP. |
| 460 | */ | ||
| 461 | local->user_power_level = new_power_level; | ||
| 462 | } | ||
| 438 | 463 | ||
| 439 | if (local->hw.conf.radio_enabled != !(data->txpower.disabled)) { | 464 | if (local->hw.conf.radio_enabled != !(data->txpower.disabled)) { |
| 440 | local->hw.conf.radio_enabled = !(data->txpower.disabled); | 465 | local->hw.conf.radio_enabled = !(data->txpower.disabled); |
| @@ -442,7 +467,7 @@ static int ieee80211_ioctl_siwtxpower(struct net_device *dev, | |||
| 442 | ieee80211_led_radio(local, local->hw.conf.radio_enabled); | 467 | ieee80211_led_radio(local, local->hw.conf.radio_enabled); |
| 443 | } | 468 | } |
| 444 | 469 | ||
| 445 | if (reconf_flags) | 470 | if (reconf || reconf_flags) |
| 446 | ieee80211_hw_config(local, reconf_flags); | 471 | ieee80211_hw_config(local, reconf_flags); |
| 447 | 472 | ||
| 448 | return 0; | 473 | return 0; |
| @@ -530,7 +555,7 @@ static int ieee80211_ioctl_giwfrag(struct net_device *dev, | |||
| 530 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 555 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
| 531 | 556 | ||
| 532 | frag->value = local->fragmentation_threshold; | 557 | frag->value = local->fragmentation_threshold; |
| 533 | frag->disabled = (frag->value >= IEEE80211_MAX_RTS_THRESHOLD); | 558 | frag->disabled = (frag->value >= IEEE80211_MAX_FRAG_THRESHOLD); |
| 534 | frag->fixed = 1; | 559 | frag->fixed = 1; |
| 535 | 560 | ||
| 536 | return 0; | 561 | return 0; |
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 30b8e9009f9..0fa5a422959 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c | |||
| @@ -176,7 +176,7 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me, | |||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | /* Get rid of expecteds, set helpers to NULL. */ | 178 | /* Get rid of expecteds, set helpers to NULL. */ |
| 179 | hlist_for_each_entry(h, nn, &net->ct.unconfirmed, hnnode) | 179 | hlist_nulls_for_each_entry(h, nn, &net->ct.unconfirmed, hnnode) |
| 180 | unhelp(h, me); | 180 | unhelp(h, me); |
| 181 | for (i = 0; i < nf_conntrack_htable_size; i++) { | 181 | for (i = 0; i < nf_conntrack_htable_size; i++) { |
| 182 | hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode) | 182 | hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode) |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index c6439c77953..f13fc57e1ec 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -512,7 +512,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
| 512 | 512 | ||
| 513 | skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC); | 513 | skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC); |
| 514 | if (!skb) | 514 | if (!skb) |
| 515 | return NOTIFY_DONE; | 515 | goto errout; |
| 516 | 516 | ||
| 517 | b = skb->tail; | 517 | b = skb->tail; |
| 518 | 518 | ||
| @@ -591,8 +591,9 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
| 591 | nla_put_failure: | 591 | nla_put_failure: |
| 592 | rcu_read_unlock(); | 592 | rcu_read_unlock(); |
| 593 | nlmsg_failure: | 593 | nlmsg_failure: |
| 594 | nfnetlink_set_err(0, group, -ENOBUFS); | ||
| 595 | kfree_skb(skb); | 594 | kfree_skb(skb); |
| 595 | errout: | ||
| 596 | nfnetlink_set_err(0, group, -ENOBUFS); | ||
| 596 | return NOTIFY_DONE; | 597 | return NOTIFY_DONE; |
| 597 | } | 598 | } |
| 598 | #endif /* CONFIG_NF_CONNTRACK_EVENTS */ | 599 | #endif /* CONFIG_NF_CONNTRACK_EVENTS */ |
| @@ -987,7 +988,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[]) | |||
| 987 | { | 988 | { |
| 988 | struct nf_conntrack_helper *helper; | 989 | struct nf_conntrack_helper *helper; |
| 989 | struct nf_conn_help *help = nfct_help(ct); | 990 | struct nf_conn_help *help = nfct_help(ct); |
| 990 | char *helpname; | 991 | char *helpname = NULL; |
| 991 | int err; | 992 | int err; |
| 992 | 993 | ||
| 993 | /* don't change helper of sibling connections */ | 994 | /* don't change helper of sibling connections */ |
| @@ -1230,7 +1231,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[], | |||
| 1230 | 1231 | ||
| 1231 | rcu_read_lock(); | 1232 | rcu_read_lock(); |
| 1232 | if (cda[CTA_HELP]) { | 1233 | if (cda[CTA_HELP]) { |
| 1233 | char *helpname; | 1234 | char *helpname = NULL; |
| 1234 | 1235 | ||
| 1235 | err = ctnetlink_parse_help(cda[CTA_HELP], &helpname); | 1236 | err = ctnetlink_parse_help(cda[CTA_HELP], &helpname); |
| 1236 | if (err < 0) | 1237 | if (err < 0) |
| @@ -1564,7 +1565,7 @@ static int ctnetlink_expect_event(struct notifier_block *this, | |||
| 1564 | 1565 | ||
| 1565 | skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); | 1566 | skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); |
| 1566 | if (!skb) | 1567 | if (!skb) |
| 1567 | return NOTIFY_DONE; | 1568 | goto errout; |
| 1568 | 1569 | ||
| 1569 | b = skb->tail; | 1570 | b = skb->tail; |
| 1570 | 1571 | ||
| @@ -1589,8 +1590,9 @@ static int ctnetlink_expect_event(struct notifier_block *this, | |||
| 1589 | nla_put_failure: | 1590 | nla_put_failure: |
| 1590 | rcu_read_unlock(); | 1591 | rcu_read_unlock(); |
| 1591 | nlmsg_failure: | 1592 | nlmsg_failure: |
| 1592 | nfnetlink_set_err(0, 0, -ENOBUFS); | ||
| 1593 | kfree_skb(skb); | 1593 | kfree_skb(skb); |
| 1594 | errout: | ||
| 1595 | nfnetlink_set_err(0, 0, -ENOBUFS); | ||
| 1594 | return NOTIFY_DONE; | 1596 | return NOTIFY_DONE; |
| 1595 | } | 1597 | } |
| 1596 | #endif | 1598 | #endif |
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 8bb998fe098..beb37311e1a 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c | |||
| @@ -36,10 +36,14 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger) | |||
| 36 | int nf_log_register(u_int8_t pf, struct nf_logger *logger) | 36 | int nf_log_register(u_int8_t pf, struct nf_logger *logger) |
| 37 | { | 37 | { |
| 38 | const struct nf_logger *llog; | 38 | const struct nf_logger *llog; |
| 39 | int i; | ||
| 39 | 40 | ||
| 40 | if (pf >= ARRAY_SIZE(nf_loggers)) | 41 | if (pf >= ARRAY_SIZE(nf_loggers)) |
| 41 | return -EINVAL; | 42 | return -EINVAL; |
| 42 | 43 | ||
| 44 | for (i = 0; i < ARRAY_SIZE(logger->list); i++) | ||
| 45 | INIT_LIST_HEAD(&logger->list[i]); | ||
| 46 | |||
| 43 | mutex_lock(&nf_log_mutex); | 47 | mutex_lock(&nf_log_mutex); |
| 44 | 48 | ||
| 45 | if (pf == NFPROTO_UNSPEC) { | 49 | if (pf == NFPROTO_UNSPEC) { |
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 2785d66a7e3..b8ab37ad7ed 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c | |||
| @@ -203,7 +203,7 @@ static int __init nfnetlink_init(void) | |||
| 203 | nfnetlink_rcv, NULL, THIS_MODULE); | 203 | nfnetlink_rcv, NULL, THIS_MODULE); |
| 204 | if (!nfnl) { | 204 | if (!nfnl) { |
| 205 | printk(KERN_ERR "cannot initialize nfnetlink!\n"); | 205 | printk(KERN_ERR "cannot initialize nfnetlink!\n"); |
| 206 | return -1; | 206 | return -ENOMEM; |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | return 0; | 209 | return 0; |
diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c index 834c6eb7f48..c0519139679 100644 --- a/net/netlabel/netlabel_addrlist.c +++ b/net/netlabel/netlabel_addrlist.c | |||
| @@ -256,13 +256,11 @@ struct netlbl_af4list *netlbl_af4list_remove(__be32 addr, __be32 mask, | |||
| 256 | { | 256 | { |
| 257 | struct netlbl_af4list *entry; | 257 | struct netlbl_af4list *entry; |
| 258 | 258 | ||
| 259 | entry = netlbl_af4list_search(addr, head); | 259 | entry = netlbl_af4list_search_exact(addr, mask, head); |
| 260 | if (entry != NULL && entry->addr == addr && entry->mask == mask) { | 260 | if (entry == NULL) |
| 261 | netlbl_af4list_remove_entry(entry); | 261 | return NULL; |
| 262 | return entry; | 262 | netlbl_af4list_remove_entry(entry); |
| 263 | } | 263 | return entry; |
| 264 | |||
| 265 | return NULL; | ||
| 266 | } | 264 | } |
| 267 | 265 | ||
| 268 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 266 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| @@ -299,15 +297,11 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr, | |||
| 299 | { | 297 | { |
| 300 | struct netlbl_af6list *entry; | 298 | struct netlbl_af6list *entry; |
| 301 | 299 | ||
| 302 | entry = netlbl_af6list_search(addr, head); | 300 | entry = netlbl_af6list_search_exact(addr, mask, head); |
| 303 | if (entry != NULL && | 301 | if (entry == NULL) |
| 304 | ipv6_addr_equal(&entry->addr, addr) && | 302 | return NULL; |
| 305 | ipv6_addr_equal(&entry->mask, mask)) { | 303 | netlbl_af6list_remove_entry(entry); |
| 306 | netlbl_af6list_remove_entry(entry); | 304 | return entry; |
| 307 | return entry; | ||
| 308 | } | ||
| 309 | |||
| 310 | return NULL; | ||
| 311 | } | 305 | } |
| 312 | #endif /* IPv6 */ | 306 | #endif /* IPv6 */ |
| 313 | 307 | ||
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 4e705f87969..3be0e016ab7 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
| @@ -1084,8 +1084,10 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1084 | 1084 | ||
| 1085 | /* Build a packet - the conventional user limit is 236 bytes. We can | 1085 | /* Build a packet - the conventional user limit is 236 bytes. We can |
| 1086 | do ludicrously large NetROM frames but must not overflow */ | 1086 | do ludicrously large NetROM frames but must not overflow */ |
| 1087 | if (len > 65536) | 1087 | if (len > 65536) { |
| 1088 | return -EMSGSIZE; | 1088 | err = -EMSGSIZE; |
| 1089 | goto out; | ||
| 1090 | } | ||
| 1089 | 1091 | ||
| 1090 | SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n"); | 1092 | SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n"); |
| 1091 | size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN; | 1093 | size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN; |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index d876b873484..2b88295cb7b 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -280,6 +280,14 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch) | |||
| 280 | if (unlikely(!skb)) | 280 | if (unlikely(!skb)) |
| 281 | return NULL; | 281 | return NULL; |
| 282 | 282 | ||
| 283 | #ifdef CONFIG_NET_CLS_ACT | ||
| 284 | /* | ||
| 285 | * If it's at ingress let's pretend the delay is | ||
| 286 | * from the network (tstamp will be updated). | ||
| 287 | */ | ||
| 288 | if (G_TC_FROM(skb->tc_verd) & AT_INGRESS) | ||
| 289 | skb->tstamp.tv64 = 0; | ||
| 290 | #endif | ||
| 283 | pr_debug("netem_dequeue: return skb=%p\n", skb); | 291 | pr_debug("netem_dequeue: return skb=%p\n", skb); |
| 284 | sch->q.qlen--; | 292 | sch->q.qlen--; |
| 285 | return skb; | 293 | return skb; |
diff --git a/net/wireless/core.h b/net/wireless/core.h index d43daa236ef..0a592e4295f 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
| @@ -90,7 +90,7 @@ struct cfg80211_internal_bss { | |||
| 90 | struct rb_node rbn; | 90 | struct rb_node rbn; |
| 91 | unsigned long ts; | 91 | unsigned long ts; |
| 92 | struct kref ref; | 92 | struct kref ref; |
| 93 | bool hold; | 93 | bool hold, ies_allocated; |
| 94 | 94 | ||
| 95 | /* must be last because of priv member */ | 95 | /* must be last because of priv member */ |
| 96 | struct cfg80211_bss pub; | 96 | struct cfg80211_bss pub; |
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 353e1a4ece8..2456e4ee445 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -3334,7 +3334,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, | |||
| 3334 | struct sk_buff *msg; | 3334 | struct sk_buff *msg; |
| 3335 | void *hdr; | 3335 | void *hdr; |
| 3336 | 3336 | ||
| 3337 | msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL); | 3337 | msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC); |
| 3338 | if (!msg) | 3338 | if (!msg) |
| 3339 | return; | 3339 | return; |
| 3340 | 3340 | ||
| @@ -3353,7 +3353,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, | |||
| 3353 | return; | 3353 | return; |
| 3354 | } | 3354 | } |
| 3355 | 3355 | ||
| 3356 | genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, GFP_KERNEL); | 3356 | genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, GFP_ATOMIC); |
| 3357 | return; | 3357 | return; |
| 3358 | 3358 | ||
| 3359 | nla_put_failure: | 3359 | nla_put_failure: |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 6327e1617ac..6c1993d9990 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -2095,11 +2095,12 @@ int set_regdom(const struct ieee80211_regdomain *rd) | |||
| 2095 | /* Caller must hold cfg80211_mutex */ | 2095 | /* Caller must hold cfg80211_mutex */ |
| 2096 | void reg_device_remove(struct wiphy *wiphy) | 2096 | void reg_device_remove(struct wiphy *wiphy) |
| 2097 | { | 2097 | { |
| 2098 | struct wiphy *request_wiphy; | 2098 | struct wiphy *request_wiphy = NULL; |
| 2099 | 2099 | ||
| 2100 | assert_cfg80211_lock(); | 2100 | assert_cfg80211_lock(); |
| 2101 | 2101 | ||
| 2102 | request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx); | 2102 | if (last_request) |
| 2103 | request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx); | ||
| 2103 | 2104 | ||
| 2104 | kfree(wiphy->regd); | 2105 | kfree(wiphy->regd); |
| 2105 | if (!last_request || !request_wiphy) | 2106 | if (!last_request || !request_wiphy) |
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 2a00e362f5f..2ae65b39b52 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -58,6 +58,10 @@ static void bss_release(struct kref *ref) | |||
| 58 | bss = container_of(ref, struct cfg80211_internal_bss, ref); | 58 | bss = container_of(ref, struct cfg80211_internal_bss, ref); |
| 59 | if (bss->pub.free_priv) | 59 | if (bss->pub.free_priv) |
| 60 | bss->pub.free_priv(&bss->pub); | 60 | bss->pub.free_priv(&bss->pub); |
| 61 | |||
| 62 | if (bss->ies_allocated) | ||
| 63 | kfree(bss->pub.information_elements); | ||
| 64 | |||
| 61 | kfree(bss); | 65 | kfree(bss); |
| 62 | } | 66 | } |
| 63 | 67 | ||
| @@ -360,19 +364,41 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev, | |||
| 360 | 364 | ||
| 361 | found = rb_find_bss(dev, res); | 365 | found = rb_find_bss(dev, res); |
| 362 | 366 | ||
| 363 | if (found && overwrite) { | 367 | if (found) { |
| 364 | list_replace(&found->list, &res->list); | ||
| 365 | rb_replace_node(&found->rbn, &res->rbn, | ||
| 366 | &dev->bss_tree); | ||
| 367 | kref_put(&found->ref, bss_release); | ||
| 368 | found = res; | ||
| 369 | } else if (found) { | ||
| 370 | kref_get(&found->ref); | 368 | kref_get(&found->ref); |
| 371 | found->pub.beacon_interval = res->pub.beacon_interval; | 369 | found->pub.beacon_interval = res->pub.beacon_interval; |
| 372 | found->pub.tsf = res->pub.tsf; | 370 | found->pub.tsf = res->pub.tsf; |
| 373 | found->pub.signal = res->pub.signal; | 371 | found->pub.signal = res->pub.signal; |
| 374 | found->pub.capability = res->pub.capability; | 372 | found->pub.capability = res->pub.capability; |
| 375 | found->ts = res->ts; | 373 | found->ts = res->ts; |
| 374 | |||
| 375 | /* overwrite IEs */ | ||
| 376 | if (overwrite) { | ||
| 377 | size_t used = dev->wiphy.bss_priv_size + sizeof(*res); | ||
| 378 | size_t ielen = res->pub.len_information_elements; | ||
| 379 | |||
| 380 | if (ksize(found) >= used + ielen) { | ||
| 381 | memcpy(found->pub.information_elements, | ||
| 382 | res->pub.information_elements, ielen); | ||
| 383 | found->pub.len_information_elements = ielen; | ||
| 384 | } else { | ||
| 385 | u8 *ies = found->pub.information_elements; | ||
| 386 | |||
| 387 | if (found->ies_allocated) { | ||
| 388 | if (ksize(ies) < ielen) | ||
| 389 | ies = krealloc(ies, ielen, | ||
| 390 | GFP_ATOMIC); | ||
| 391 | } else | ||
| 392 | ies = kmalloc(ielen, GFP_ATOMIC); | ||
| 393 | |||
| 394 | if (ies) { | ||
| 395 | memcpy(ies, res->pub.information_elements, ielen); | ||
| 396 | found->ies_allocated = true; | ||
| 397 | found->pub.information_elements = ies; | ||
| 398 | } | ||
| 399 | } | ||
| 400 | } | ||
| 401 | |||
| 376 | kref_put(&res->ref, bss_release); | 402 | kref_put(&res->ref, bss_release); |
| 377 | } else { | 403 | } else { |
| 378 | /* this "consumes" the reference */ | 404 | /* this "consumes" the reference */ |
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index 15500b9d2da..84bb07d39a7 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c | |||
| @@ -47,7 +47,7 @@ MODULE_DESCRIPTION("pcm3052 (onyx) codec driver for snd-aoa"); | |||
| 47 | struct onyx { | 47 | struct onyx { |
| 48 | /* cache registers 65 to 80, they are write-only! */ | 48 | /* cache registers 65 to 80, they are write-only! */ |
| 49 | u8 cache[16]; | 49 | u8 cache[16]; |
| 50 | struct i2c_client i2c; | 50 | struct i2c_client *i2c; |
| 51 | struct aoa_codec codec; | 51 | struct aoa_codec codec; |
| 52 | u32 initialised:1, | 52 | u32 initialised:1, |
| 53 | spdif_locked:1, | 53 | spdif_locked:1, |
| @@ -72,7 +72,7 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value) | |||
| 72 | *value = onyx->cache[reg-FIRSTREGISTER]; | 72 | *value = onyx->cache[reg-FIRSTREGISTER]; |
| 73 | return 0; | 73 | return 0; |
| 74 | } | 74 | } |
| 75 | v = i2c_smbus_read_byte_data(&onyx->i2c, reg); | 75 | v = i2c_smbus_read_byte_data(onyx->i2c, reg); |
| 76 | if (v < 0) | 76 | if (v < 0) |
| 77 | return -1; | 77 | return -1; |
| 78 | *value = (u8)v; | 78 | *value = (u8)v; |
| @@ -84,7 +84,7 @@ static int onyx_write_register(struct onyx *onyx, u8 reg, u8 value) | |||
| 84 | { | 84 | { |
| 85 | int result; | 85 | int result; |
| 86 | 86 | ||
| 87 | result = i2c_smbus_write_byte_data(&onyx->i2c, reg, value); | 87 | result = i2c_smbus_write_byte_data(onyx->i2c, reg, value); |
| 88 | if (!result) | 88 | if (!result) |
| 89 | onyx->cache[reg-FIRSTREGISTER] = value; | 89 | onyx->cache[reg-FIRSTREGISTER] = value; |
| 90 | return result; | 90 | return result; |
| @@ -996,12 +996,45 @@ static void onyx_exit_codec(struct aoa_codec *codec) | |||
| 996 | onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx); | 996 | onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx); |
| 997 | } | 997 | } |
| 998 | 998 | ||
| 999 | static struct i2c_driver onyx_driver; | ||
| 1000 | |||
| 1001 | static int onyx_create(struct i2c_adapter *adapter, | 999 | static int onyx_create(struct i2c_adapter *adapter, |
| 1002 | struct device_node *node, | 1000 | struct device_node *node, |
| 1003 | int addr) | 1001 | int addr) |
| 1004 | { | 1002 | { |
| 1003 | struct i2c_board_info info; | ||
| 1004 | struct i2c_client *client; | ||
| 1005 | |||
| 1006 | memset(&info, 0, sizeof(struct i2c_board_info)); | ||
| 1007 | strlcpy(info.type, "aoa_codec_onyx", I2C_NAME_SIZE); | ||
| 1008 | info.addr = addr; | ||
| 1009 | info.platform_data = node; | ||
| 1010 | client = i2c_new_device(adapter, &info); | ||
| 1011 | if (!client) | ||
| 1012 | return -ENODEV; | ||
| 1013 | |||
| 1014 | /* | ||
| 1015 | * We know the driver is already loaded, so the device should be | ||
| 1016 | * already bound. If not it means binding failed, which suggests | ||
| 1017 | * the device doesn't really exist and should be deleted. | ||
| 1018 | * Ideally this would be replaced by better checks _before_ | ||
| 1019 | * instantiating the device. | ||
| 1020 | */ | ||
| 1021 | if (!client->driver) { | ||
| 1022 | i2c_unregister_device(client); | ||
| 1023 | return -ENODEV; | ||
| 1024 | } | ||
| 1025 | |||
| 1026 | /* | ||
| 1027 | * Let i2c-core delete that device on driver removal. | ||
| 1028 | * This is safe because i2c-core holds the core_lock mutex for us. | ||
| 1029 | */ | ||
| 1030 | list_add_tail(&client->detected, &client->driver->clients); | ||
| 1031 | return 0; | ||
| 1032 | } | ||
| 1033 | |||
| 1034 | static int onyx_i2c_probe(struct i2c_client *client, | ||
| 1035 | const struct i2c_device_id *id) | ||
| 1036 | { | ||
| 1037 | struct device_node *node = client->dev.platform_data; | ||
| 1005 | struct onyx *onyx; | 1038 | struct onyx *onyx; |
| 1006 | u8 dummy; | 1039 | u8 dummy; |
| 1007 | 1040 | ||
| @@ -1011,20 +1044,12 @@ static int onyx_create(struct i2c_adapter *adapter, | |||
| 1011 | return -ENOMEM; | 1044 | return -ENOMEM; |
| 1012 | 1045 | ||
| 1013 | mutex_init(&onyx->mutex); | 1046 | mutex_init(&onyx->mutex); |
| 1014 | onyx->i2c.driver = &onyx_driver; | 1047 | onyx->i2c = client; |
| 1015 | onyx->i2c.adapter = adapter; | 1048 | i2c_set_clientdata(client, onyx); |
| 1016 | onyx->i2c.addr = addr & 0x7f; | ||
| 1017 | strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE); | ||
| 1018 | |||
| 1019 | if (i2c_attach_client(&onyx->i2c)) { | ||
| 1020 | printk(KERN_ERR PFX "failed to attach to i2c\n"); | ||
| 1021 | goto fail; | ||
| 1022 | } | ||
| 1023 | 1049 | ||
| 1024 | /* we try to read from register ONYX_REG_CONTROL | 1050 | /* we try to read from register ONYX_REG_CONTROL |
| 1025 | * to check if the codec is present */ | 1051 | * to check if the codec is present */ |
| 1026 | if (onyx_read_register(onyx, ONYX_REG_CONTROL, &dummy) != 0) { | 1052 | if (onyx_read_register(onyx, ONYX_REG_CONTROL, &dummy) != 0) { |
| 1027 | i2c_detach_client(&onyx->i2c); | ||
| 1028 | printk(KERN_ERR PFX "failed to read control register\n"); | 1053 | printk(KERN_ERR PFX "failed to read control register\n"); |
| 1029 | goto fail; | 1054 | goto fail; |
| 1030 | } | 1055 | } |
| @@ -1036,14 +1061,14 @@ static int onyx_create(struct i2c_adapter *adapter, | |||
| 1036 | onyx->codec.node = of_node_get(node); | 1061 | onyx->codec.node = of_node_get(node); |
| 1037 | 1062 | ||
| 1038 | if (aoa_codec_register(&onyx->codec)) { | 1063 | if (aoa_codec_register(&onyx->codec)) { |
| 1039 | i2c_detach_client(&onyx->i2c); | ||
| 1040 | goto fail; | 1064 | goto fail; |
| 1041 | } | 1065 | } |
| 1042 | printk(KERN_DEBUG PFX "created and attached onyx instance\n"); | 1066 | printk(KERN_DEBUG PFX "created and attached onyx instance\n"); |
| 1043 | return 0; | 1067 | return 0; |
| 1044 | fail: | 1068 | fail: |
| 1069 | i2c_set_clientdata(client, NULL); | ||
| 1045 | kfree(onyx); | 1070 | kfree(onyx); |
| 1046 | return -EINVAL; | 1071 | return -ENODEV; |
| 1047 | } | 1072 | } |
| 1048 | 1073 | ||
| 1049 | static int onyx_i2c_attach(struct i2c_adapter *adapter) | 1074 | static int onyx_i2c_attach(struct i2c_adapter *adapter) |
| @@ -1080,28 +1105,33 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter) | |||
| 1080 | return onyx_create(adapter, NULL, 0x47); | 1105 | return onyx_create(adapter, NULL, 0x47); |
| 1081 | } | 1106 | } |
| 1082 | 1107 | ||
| 1083 | static int onyx_i2c_detach(struct i2c_client *client) | 1108 | static int onyx_i2c_remove(struct i2c_client *client) |
| 1084 | { | 1109 | { |
| 1085 | struct onyx *onyx = container_of(client, struct onyx, i2c); | 1110 | struct onyx *onyx = i2c_get_clientdata(client); |
| 1086 | int err; | ||
| 1087 | 1111 | ||
| 1088 | if ((err = i2c_detach_client(client))) | ||
| 1089 | return err; | ||
| 1090 | aoa_codec_unregister(&onyx->codec); | 1112 | aoa_codec_unregister(&onyx->codec); |
| 1091 | of_node_put(onyx->codec.node); | 1113 | of_node_put(onyx->codec.node); |
| 1092 | if (onyx->codec_info) | 1114 | if (onyx->codec_info) |
| 1093 | kfree(onyx->codec_info); | 1115 | kfree(onyx->codec_info); |
| 1116 | i2c_set_clientdata(client, onyx); | ||
| 1094 | kfree(onyx); | 1117 | kfree(onyx); |
| 1095 | return 0; | 1118 | return 0; |
| 1096 | } | 1119 | } |
| 1097 | 1120 | ||
| 1121 | static const struct i2c_device_id onyx_i2c_id[] = { | ||
| 1122 | { "aoa_codec_onyx", 0 }, | ||
| 1123 | { } | ||
| 1124 | }; | ||
| 1125 | |||
| 1098 | static struct i2c_driver onyx_driver = { | 1126 | static struct i2c_driver onyx_driver = { |
| 1099 | .driver = { | 1127 | .driver = { |
| 1100 | .name = "aoa_codec_onyx", | 1128 | .name = "aoa_codec_onyx", |
| 1101 | .owner = THIS_MODULE, | 1129 | .owner = THIS_MODULE, |
| 1102 | }, | 1130 | }, |
| 1103 | .attach_adapter = onyx_i2c_attach, | 1131 | .attach_adapter = onyx_i2c_attach, |
| 1104 | .detach_client = onyx_i2c_detach, | 1132 | .probe = onyx_i2c_probe, |
| 1133 | .remove = onyx_i2c_remove, | ||
| 1134 | .id_table = onyx_i2c_id, | ||
| 1105 | }; | 1135 | }; |
| 1106 | 1136 | ||
| 1107 | static int __init onyx_init(void) | 1137 | static int __init onyx_init(void) |
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c index 008e0f85097..f0ebc971c68 100644 --- a/sound/aoa/codecs/tas.c +++ b/sound/aoa/codecs/tas.c | |||
| @@ -82,7 +82,7 @@ MODULE_DESCRIPTION("tas codec driver for snd-aoa"); | |||
| 82 | 82 | ||
| 83 | struct tas { | 83 | struct tas { |
| 84 | struct aoa_codec codec; | 84 | struct aoa_codec codec; |
| 85 | struct i2c_client i2c; | 85 | struct i2c_client *i2c; |
| 86 | u32 mute_l:1, mute_r:1 , | 86 | u32 mute_l:1, mute_r:1 , |
| 87 | controls_created:1 , | 87 | controls_created:1 , |
| 88 | drc_enabled:1, | 88 | drc_enabled:1, |
| @@ -108,9 +108,9 @@ static struct tas *codec_to_tas(struct aoa_codec *codec) | |||
| 108 | static inline int tas_write_reg(struct tas *tas, u8 reg, u8 len, u8 *data) | 108 | static inline int tas_write_reg(struct tas *tas, u8 reg, u8 len, u8 *data) |
| 109 | { | 109 | { |
| 110 | if (len == 1) | 110 | if (len == 1) |
| 111 | return i2c_smbus_write_byte_data(&tas->i2c, reg, *data); | 111 | return i2c_smbus_write_byte_data(tas->i2c, reg, *data); |
| 112 | else | 112 | else |
| 113 | return i2c_smbus_write_i2c_block_data(&tas->i2c, reg, len, data); | 113 | return i2c_smbus_write_i2c_block_data(tas->i2c, reg, len, data); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | static void tas3004_set_drc(struct tas *tas) | 116 | static void tas3004_set_drc(struct tas *tas) |
| @@ -882,12 +882,34 @@ static void tas_exit_codec(struct aoa_codec *codec) | |||
| 882 | } | 882 | } |
| 883 | 883 | ||
| 884 | 884 | ||
| 885 | static struct i2c_driver tas_driver; | ||
| 886 | |||
| 887 | static int tas_create(struct i2c_adapter *adapter, | 885 | static int tas_create(struct i2c_adapter *adapter, |
| 888 | struct device_node *node, | 886 | struct device_node *node, |
| 889 | int addr) | 887 | int addr) |
| 890 | { | 888 | { |
| 889 | struct i2c_board_info info; | ||
| 890 | struct i2c_client *client; | ||
| 891 | |||
| 892 | memset(&info, 0, sizeof(struct i2c_board_info)); | ||
| 893 | strlcpy(info.type, "aoa_codec_tas", I2C_NAME_SIZE); | ||
| 894 | info.addr = addr; | ||
| 895 | info.platform_data = node; | ||
| 896 | |||
| 897 | client = i2c_new_device(adapter, &info); | ||
| 898 | if (!client) | ||
| 899 | return -ENODEV; | ||
| 900 | |||
| 901 | /* | ||
| 902 | * Let i2c-core delete that device on driver removal. | ||
| 903 | * This is safe because i2c-core holds the core_lock mutex for us. | ||
| 904 | */ | ||
| 905 | list_add_tail(&client->detected, &client->driver->clients); | ||
| 906 | return 0; | ||
| 907 | } | ||
| 908 | |||
| 909 | static int tas_i2c_probe(struct i2c_client *client, | ||
| 910 | const struct i2c_device_id *id) | ||
| 911 | { | ||
| 912 | struct device_node *node = client->dev.platform_data; | ||
| 891 | struct tas *tas; | 913 | struct tas *tas; |
| 892 | 914 | ||
| 893 | tas = kzalloc(sizeof(struct tas), GFP_KERNEL); | 915 | tas = kzalloc(sizeof(struct tas), GFP_KERNEL); |
| @@ -896,17 +918,11 @@ static int tas_create(struct i2c_adapter *adapter, | |||
| 896 | return -ENOMEM; | 918 | return -ENOMEM; |
| 897 | 919 | ||
| 898 | mutex_init(&tas->mtx); | 920 | mutex_init(&tas->mtx); |
| 899 | tas->i2c.driver = &tas_driver; | 921 | tas->i2c = client; |
| 900 | tas->i2c.adapter = adapter; | 922 | i2c_set_clientdata(client, tas); |
| 901 | tas->i2c.addr = addr; | 923 | |
| 902 | /* seems that half is a saner default */ | 924 | /* seems that half is a saner default */ |
| 903 | tas->drc_range = TAS3004_DRC_MAX / 2; | 925 | tas->drc_range = TAS3004_DRC_MAX / 2; |
| 904 | strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE); | ||
| 905 | |||
| 906 | if (i2c_attach_client(&tas->i2c)) { | ||
| 907 | printk(KERN_ERR PFX "failed to attach to i2c\n"); | ||
| 908 | goto fail; | ||
| 909 | } | ||
| 910 | 926 | ||
| 911 | strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN); | 927 | strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN); |
| 912 | tas->codec.owner = THIS_MODULE; | 928 | tas->codec.owner = THIS_MODULE; |
| @@ -915,14 +931,12 @@ static int tas_create(struct i2c_adapter *adapter, | |||
| 915 | tas->codec.node = of_node_get(node); | 931 | tas->codec.node = of_node_get(node); |
| 916 | 932 | ||
| 917 | if (aoa_codec_register(&tas->codec)) { | 933 | if (aoa_codec_register(&tas->codec)) { |
| 918 | goto detach; | 934 | goto fail; |
| 919 | } | 935 | } |
| 920 | printk(KERN_DEBUG | 936 | printk(KERN_DEBUG |
| 921 | "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n", | 937 | "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n", |
| 922 | addr, node->full_name); | 938 | (unsigned int)client->addr, node->full_name); |
| 923 | return 0; | 939 | return 0; |
| 924 | detach: | ||
| 925 | i2c_detach_client(&tas->i2c); | ||
| 926 | fail: | 940 | fail: |
| 927 | mutex_destroy(&tas->mtx); | 941 | mutex_destroy(&tas->mtx); |
| 928 | kfree(tas); | 942 | kfree(tas); |
| @@ -970,14 +984,11 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
| 970 | return -ENODEV; | 984 | return -ENODEV; |
| 971 | } | 985 | } |
| 972 | 986 | ||
| 973 | static int tas_i2c_detach(struct i2c_client *client) | 987 | static int tas_i2c_remove(struct i2c_client *client) |
| 974 | { | 988 | { |
| 975 | struct tas *tas = container_of(client, struct tas, i2c); | 989 | struct tas *tas = i2c_get_clientdata(client); |
| 976 | int err; | ||
| 977 | u8 tmp = TAS_ACR_ANALOG_PDOWN; | 990 | u8 tmp = TAS_ACR_ANALOG_PDOWN; |
| 978 | 991 | ||
| 979 | if ((err = i2c_detach_client(client))) | ||
| 980 | return err; | ||
| 981 | aoa_codec_unregister(&tas->codec); | 992 | aoa_codec_unregister(&tas->codec); |
| 982 | of_node_put(tas->codec.node); | 993 | of_node_put(tas->codec.node); |
| 983 | 994 | ||
| @@ -989,13 +1000,20 @@ static int tas_i2c_detach(struct i2c_client *client) | |||
| 989 | return 0; | 1000 | return 0; |
| 990 | } | 1001 | } |
| 991 | 1002 | ||
| 1003 | static const struct i2c_device_id tas_i2c_id[] = { | ||
| 1004 | { "aoa_codec_tas", 0 }, | ||
| 1005 | { } | ||
| 1006 | }; | ||
| 1007 | |||
| 992 | static struct i2c_driver tas_driver = { | 1008 | static struct i2c_driver tas_driver = { |
| 993 | .driver = { | 1009 | .driver = { |
| 994 | .name = "aoa_codec_tas", | 1010 | .name = "aoa_codec_tas", |
| 995 | .owner = THIS_MODULE, | 1011 | .owner = THIS_MODULE, |
| 996 | }, | 1012 | }, |
| 997 | .attach_adapter = tas_i2c_attach, | 1013 | .attach_adapter = tas_i2c_attach, |
| 998 | .detach_client = tas_i2c_detach, | 1014 | .probe = tas_i2c_probe, |
| 1015 | .remove = tas_i2c_remove, | ||
| 1016 | .id_table = tas_i2c_id, | ||
| 999 | }; | 1017 | }; |
| 1000 | 1018 | ||
| 1001 | static int __init tas_init(void) | 1019 | static int __init tas_init(void) |
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 0afd1a8226f..a2c12d105c9 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
| @@ -364,7 +364,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); | |||
| 364 | int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) | 364 | int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) |
| 365 | { | 365 | { |
| 366 | int ret; | 366 | int ret; |
| 367 | struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data; | 367 | pxa2xx_audio_ops_t *pdata = dev->dev.platform_data; |
| 368 | 368 | ||
| 369 | if (pdata) { | 369 | if (pdata) { |
| 370 | switch (pdata->reset_gpio) { | 370 | switch (pdata->reset_gpio) { |
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 97ee127ac33..78288dbfc17 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
| @@ -2122,7 +2122,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, | |||
| 2122 | } | 2122 | } |
| 2123 | /* nothing should be in powerdown mode */ | 2123 | /* nothing should be in powerdown mode */ |
| 2124 | snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0); | 2124 | snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0); |
| 2125 | end_time = jiffies + msecs_to_jiffies(100); | 2125 | end_time = jiffies + msecs_to_jiffies(120); |
| 2126 | do { | 2126 | do { |
| 2127 | if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f) | 2127 | if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f) |
| 2128 | goto __ready_ok; | 2128 | goto __ready_ok; |
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 9ce8548c03e..71515ddb459 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
| @@ -1393,6 +1393,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { | |||
| 1393 | .name = "HP nx6125", | 1393 | .name = "HP nx6125", |
| 1394 | .type = AC97_TUNE_MUTE_LED | 1394 | .type = AC97_TUNE_MUTE_LED |
| 1395 | }, | 1395 | }, |
| 1396 | { | ||
| 1397 | .subvendor = 0x103c, | ||
| 1398 | .subdevice = 0x3091, | ||
| 1399 | .name = "unknown HP", | ||
| 1400 | .type = AC97_TUNE_MUTE_LED | ||
| 1401 | }, | ||
| 1396 | { } /* terminator */ | 1402 | { } /* terminator */ |
| 1397 | }; | 1403 | }; |
| 1398 | 1404 | ||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6ed787eedd0..b8a0d3e7927 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -188,6 +188,8 @@ enum { | |||
| 188 | ALC663_ASUS_MODE4, | 188 | ALC663_ASUS_MODE4, |
| 189 | ALC663_ASUS_MODE5, | 189 | ALC663_ASUS_MODE5, |
| 190 | ALC663_ASUS_MODE6, | 190 | ALC663_ASUS_MODE6, |
| 191 | ALC272_DELL, | ||
| 192 | ALC272_DELL_ZM1, | ||
| 191 | ALC662_AUTO, | 193 | ALC662_AUTO, |
| 192 | ALC662_MODEL_LAST, | 194 | ALC662_MODEL_LAST, |
| 193 | }; | 195 | }; |
| @@ -12976,10 +12978,17 @@ static struct snd_pci_quirk alc269_cfg_tbl[] = { | |||
| 12976 | SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1), | 12978 | SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1), |
| 12977 | SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A", | 12979 | SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A", |
| 12978 | ALC269_ASUS_EEEPC_P703), | 12980 | ALC269_ASUS_EEEPC_P703), |
| 12981 | SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_ASUS_EEEPC_P703), | ||
| 12982 | SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_ASUS_EEEPC_P703), | ||
| 12983 | SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_ASUS_EEEPC_P703), | ||
| 12984 | SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_ASUS_EEEPC_P703), | ||
| 12985 | SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_ASUS_EEEPC_P703), | ||
| 12986 | SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_ASUS_EEEPC_P703), | ||
| 12979 | SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901", | 12987 | SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901", |
| 12980 | ALC269_ASUS_EEEPC_P901), | 12988 | ALC269_ASUS_EEEPC_P901), |
| 12981 | SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101", | 12989 | SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101", |
| 12982 | ALC269_ASUS_EEEPC_P901), | 12990 | ALC269_ASUS_EEEPC_P901), |
| 12991 | SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_ASUS_EEEPC_P901), | ||
| 12983 | SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU), | 12992 | SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU), |
| 12984 | SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK), | 12993 | SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK), |
| 12985 | {} | 12994 | {} |
| @@ -15210,12 +15219,23 @@ static hda_nid_t alc662_dac_nids[4] = { | |||
| 15210 | 0x02, 0x03, 0x04 | 15219 | 0x02, 0x03, 0x04 |
| 15211 | }; | 15220 | }; |
| 15212 | 15221 | ||
| 15222 | static hda_nid_t alc272_dac_nids[2] = { | ||
| 15223 | 0x02, 0x03 | ||
| 15224 | }; | ||
| 15225 | |||
| 15213 | static hda_nid_t alc662_adc_nids[1] = { | 15226 | static hda_nid_t alc662_adc_nids[1] = { |
| 15214 | /* ADC1-2 */ | 15227 | /* ADC1-2 */ |
| 15215 | 0x09, | 15228 | 0x09, |
| 15216 | }; | 15229 | }; |
| 15217 | 15230 | ||
| 15231 | static hda_nid_t alc272_adc_nids[1] = { | ||
| 15232 | /* ADC1-2 */ | ||
| 15233 | 0x08, | ||
| 15234 | }; | ||
| 15235 | |||
| 15218 | static hda_nid_t alc662_capsrc_nids[1] = { 0x22 }; | 15236 | static hda_nid_t alc662_capsrc_nids[1] = { 0x22 }; |
| 15237 | static hda_nid_t alc272_capsrc_nids[1] = { 0x23 }; | ||
| 15238 | |||
| 15219 | 15239 | ||
| 15220 | /* input MUX */ | 15240 | /* input MUX */ |
| 15221 | /* FIXME: should be a matrix-type input source selection */ | 15241 | /* FIXME: should be a matrix-type input source selection */ |
| @@ -15641,14 +15661,7 @@ static struct hda_verb alc662_init_verbs[] = { | |||
| 15641 | /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */ | 15661 | /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */ |
| 15642 | /* Input mixer */ | 15662 | /* Input mixer */ |
| 15643 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 15663 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
| 15644 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
| 15645 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)}, | ||
| 15646 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, | ||
| 15647 | |||
| 15648 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 15664 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
| 15649 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
| 15650 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)}, | ||
| 15651 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, | ||
| 15652 | 15665 | ||
| 15653 | /* always trun on EAPD */ | 15666 | /* always trun on EAPD */ |
| 15654 | {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2}, | 15667 | {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2}, |
| @@ -15843,12 +15856,48 @@ static struct hda_verb alc662_ecs_init_verbs[] = { | |||
| 15843 | {} | 15856 | {} |
| 15844 | }; | 15857 | }; |
| 15845 | 15858 | ||
| 15859 | static struct hda_verb alc272_dell_zm1_init_verbs[] = { | ||
| 15860 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15861 | {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15862 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15863 | {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15864 | {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
| 15865 | {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 15866 | {0x21, AC_VERB_SET_CONNECT_SEL, 0x01}, /* Headphone */ | ||
| 15867 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
| 15868 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)}, | ||
| 15869 | {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT}, | ||
| 15870 | {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, | ||
| 15871 | {} | ||
| 15872 | }; | ||
| 15873 | |||
| 15874 | static struct hda_verb alc272_dell_init_verbs[] = { | ||
| 15875 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15876 | {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15877 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15878 | {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
| 15879 | {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
| 15880 | {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
| 15881 | {0x21, AC_VERB_SET_CONNECT_SEL, 0x01}, /* Headphone */ | ||
| 15882 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
| 15883 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)}, | ||
| 15884 | {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT}, | ||
| 15885 | {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, | ||
| 15886 | {} | ||
| 15887 | }; | ||
| 15888 | |||
| 15846 | static struct snd_kcontrol_new alc662_auto_capture_mixer[] = { | 15889 | static struct snd_kcontrol_new alc662_auto_capture_mixer[] = { |
| 15847 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), | 15890 | HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), |
| 15848 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), | 15891 | HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), |
| 15849 | { } /* end */ | 15892 | { } /* end */ |
| 15850 | }; | 15893 | }; |
| 15851 | 15894 | ||
| 15895 | static struct snd_kcontrol_new alc272_auto_capture_mixer[] = { | ||
| 15896 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
| 15897 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
| 15898 | { } /* end */ | ||
| 15899 | }; | ||
| 15900 | |||
| 15852 | static void alc662_lenovo_101e_ispeaker_automute(struct hda_codec *codec) | 15901 | static void alc662_lenovo_101e_ispeaker_automute(struct hda_codec *codec) |
| 15853 | { | 15902 | { |
| 15854 | unsigned int present; | 15903 | unsigned int present; |
| @@ -16360,6 +16409,8 @@ static const char *alc662_models[ALC662_MODEL_LAST] = { | |||
| 16360 | 16409 | ||
| 16361 | static struct snd_pci_quirk alc662_cfg_tbl[] = { | 16410 | static struct snd_pci_quirk alc662_cfg_tbl[] = { |
| 16362 | SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS), | 16411 | SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS), |
| 16412 | SND_PCI_QUIRK(0x1028, 0x02d6, "DELL", ALC272_DELL), | ||
| 16413 | SND_PCI_QUIRK(0x1028, 0x02f4, "DELL ZM1", ALC272_DELL_ZM1), | ||
| 16363 | SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC663_ASUS_MODE1), | 16414 | SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC663_ASUS_MODE1), |
| 16364 | SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3), | 16415 | SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3), |
| 16365 | SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC663_ASUS_MODE3), | 16416 | SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC663_ASUS_MODE3), |
| @@ -16372,26 +16423,36 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { | |||
| 16372 | SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC663_ASUS_MODE6), | 16423 | SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC663_ASUS_MODE6), |
| 16373 | SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC663_ASUS_MODE6), | 16424 | SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC663_ASUS_MODE6), |
| 16374 | SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_ASUS_MODE2), | 16425 | SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_ASUS_MODE2), |
| 16426 | SND_PCI_QUIRK(0x1043, 0x17b3, "ASUS F70SL", ALC663_ASUS_MODE3), | ||
| 16427 | SND_PCI_QUIRK(0x1043, 0x17c3, "ASUS UX20", ALC663_ASUS_M51VA), | ||
| 16428 | SND_PCI_QUIRK(0x1043, 0x17f3, "ASUS X58LE", ALC662_ASUS_MODE2), | ||
| 16375 | SND_PCI_QUIRK(0x1043, 0x1813, "ASUS NB", ALC662_ASUS_MODE2), | 16429 | SND_PCI_QUIRK(0x1043, 0x1813, "ASUS NB", ALC662_ASUS_MODE2), |
| 16376 | SND_PCI_QUIRK(0x1043, 0x1823, "ASUS NB", ALC663_ASUS_MODE5), | 16430 | SND_PCI_QUIRK(0x1043, 0x1823, "ASUS NB", ALC663_ASUS_MODE5), |
| 16377 | SND_PCI_QUIRK(0x1043, 0x1833, "ASUS NB", ALC663_ASUS_MODE6), | 16431 | SND_PCI_QUIRK(0x1043, 0x1833, "ASUS NB", ALC663_ASUS_MODE6), |
| 16378 | SND_PCI_QUIRK(0x1043, 0x1843, "ASUS NB", ALC662_ASUS_MODE2), | 16432 | SND_PCI_QUIRK(0x1043, 0x1843, "ASUS NB", ALC662_ASUS_MODE2), |
| 16433 | SND_PCI_QUIRK(0x1043, 0x1853, "ASUS F50Z", ALC663_ASUS_MODE1), | ||
| 16379 | SND_PCI_QUIRK(0x1043, 0x1864, "ASUS NB", ALC662_ASUS_MODE2), | 16434 | SND_PCI_QUIRK(0x1043, 0x1864, "ASUS NB", ALC662_ASUS_MODE2), |
| 16380 | SND_PCI_QUIRK(0x1043, 0x1876, "ASUS NB", ALC662_ASUS_MODE2), | 16435 | SND_PCI_QUIRK(0x1043, 0x1876, "ASUS NB", ALC662_ASUS_MODE2), |
| 16381 | SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA), | 16436 | SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA), |
| 16382 | /*SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M50Vr", ALC663_ASUS_MODE1),*/ | 16437 | /*SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M50Vr", ALC663_ASUS_MODE1),*/ |
| 16383 | SND_PCI_QUIRK(0x1043, 0x1893, "ASUS M50Vm", ALC663_ASUS_MODE3), | 16438 | SND_PCI_QUIRK(0x1043, 0x1893, "ASUS M50Vm", ALC663_ASUS_MODE3), |
| 16384 | SND_PCI_QUIRK(0x1043, 0x1894, "ASUS X55", ALC663_ASUS_MODE3), | 16439 | SND_PCI_QUIRK(0x1043, 0x1894, "ASUS X55", ALC663_ASUS_MODE3), |
| 16440 | SND_PCI_QUIRK(0x1043, 0x18b3, "ASUS N80Vc", ALC663_ASUS_MODE1), | ||
| 16441 | SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS N81Te", ALC663_ASUS_MODE1), | ||
| 16442 | SND_PCI_QUIRK(0x1043, 0x18f3, "ASUS N505Tp", ALC663_ASUS_MODE1), | ||
| 16385 | SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC663_ASUS_MODE1), | 16443 | SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC663_ASUS_MODE1), |
| 16386 | SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_ASUS_MODE2), | 16444 | SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_ASUS_MODE2), |
| 16387 | SND_PCI_QUIRK(0x1043, 0x1933, "ASUS F80Q", ALC662_ASUS_MODE2), | 16445 | SND_PCI_QUIRK(0x1043, 0x1933, "ASUS F80Q", ALC662_ASUS_MODE2), |
| 16446 | SND_PCI_QUIRK(0x1043, 0x1943, "ASUS Vx3V", ALC663_ASUS_MODE1), | ||
| 16388 | SND_PCI_QUIRK(0x1043, 0x1953, "ASUS NB", ALC663_ASUS_MODE1), | 16447 | SND_PCI_QUIRK(0x1043, 0x1953, "ASUS NB", ALC663_ASUS_MODE1), |
| 16389 | SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71C", ALC663_ASUS_MODE3), | 16448 | SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71C", ALC663_ASUS_MODE3), |
| 16449 | SND_PCI_QUIRK(0x1043, 0x1983, "ASUS N5051A", ALC663_ASUS_MODE1), | ||
| 16390 | SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC663_ASUS_MODE1), | 16450 | SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC663_ASUS_MODE1), |
| 16391 | SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V), | 16451 | SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V), |
| 16392 | /*SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS NB", ALC663_ASUS_MODE1),*/ | 16452 | /*SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS NB", ALC663_ASUS_MODE1),*/ |
| 16393 | SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS F7Z", ALC663_ASUS_MODE1), | 16453 | SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS F7Z", ALC663_ASUS_MODE1), |
| 16394 | SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_ASUS_MODE2), | 16454 | SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_ASUS_MODE2), |
| 16455 | SND_PCI_QUIRK(0x1043, 0x19d3, "ASUS NB", ALC663_ASUS_M51VA), | ||
| 16395 | SND_PCI_QUIRK(0x1043, 0x19e3, "ASUS NB", ALC663_ASUS_MODE1), | 16456 | SND_PCI_QUIRK(0x1043, 0x19e3, "ASUS NB", ALC663_ASUS_MODE1), |
| 16396 | SND_PCI_QUIRK(0x1043, 0x19f3, "ASUS NB", ALC663_ASUS_MODE4), | 16457 | SND_PCI_QUIRK(0x1043, 0x19f3, "ASUS NB", ALC663_ASUS_MODE4), |
| 16397 | SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG), | 16458 | SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG), |
| @@ -16403,6 +16464,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { | |||
| 16403 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", | 16464 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", |
| 16404 | ALC662_3ST_6ch_DIG), | 16465 | ALC662_3ST_6ch_DIG), |
| 16405 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG), | 16466 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG), |
| 16467 | SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA), | ||
| 16406 | SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E), | 16468 | SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E), |
| 16407 | SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0", | 16469 | SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0", |
| 16408 | ALC662_3ST_6ch_DIG), | 16470 | ALC662_3ST_6ch_DIG), |
| @@ -16640,6 +16702,36 @@ static struct alc_config_preset alc662_presets[] = { | |||
| 16640 | .unsol_event = alc663_mode6_unsol_event, | 16702 | .unsol_event = alc663_mode6_unsol_event, |
| 16641 | .init_hook = alc663_mode6_inithook, | 16703 | .init_hook = alc663_mode6_inithook, |
| 16642 | }, | 16704 | }, |
| 16705 | [ALC272_DELL] = { | ||
| 16706 | .mixers = { alc663_m51va_mixer }, | ||
| 16707 | .cap_mixer = alc272_auto_capture_mixer, | ||
| 16708 | .init_verbs = { alc662_init_verbs, alc272_dell_init_verbs }, | ||
| 16709 | .num_dacs = ARRAY_SIZE(alc272_dac_nids), | ||
| 16710 | .dac_nids = alc662_dac_nids, | ||
| 16711 | .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes), | ||
| 16712 | .adc_nids = alc272_adc_nids, | ||
| 16713 | .num_adc_nids = ARRAY_SIZE(alc272_adc_nids), | ||
| 16714 | .capsrc_nids = alc272_capsrc_nids, | ||
| 16715 | .channel_mode = alc662_3ST_2ch_modes, | ||
| 16716 | .input_mux = &alc663_m51va_capture_source, | ||
| 16717 | .unsol_event = alc663_m51va_unsol_event, | ||
| 16718 | .init_hook = alc663_m51va_inithook, | ||
| 16719 | }, | ||
| 16720 | [ALC272_DELL_ZM1] = { | ||
| 16721 | .mixers = { alc663_m51va_mixer }, | ||
| 16722 | .cap_mixer = alc662_auto_capture_mixer, | ||
| 16723 | .init_verbs = { alc662_init_verbs, alc272_dell_zm1_init_verbs }, | ||
| 16724 | .num_dacs = ARRAY_SIZE(alc272_dac_nids), | ||
| 16725 | .dac_nids = alc662_dac_nids, | ||
| 16726 | .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes), | ||
| 16727 | .adc_nids = alc662_adc_nids, | ||
| 16728 | .num_adc_nids = ARRAY_SIZE(alc662_adc_nids), | ||
| 16729 | .capsrc_nids = alc662_capsrc_nids, | ||
| 16730 | .channel_mode = alc662_3ST_2ch_modes, | ||
| 16731 | .input_mux = &alc663_m51va_capture_source, | ||
| 16732 | .unsol_event = alc663_m51va_unsol_event, | ||
| 16733 | .init_hook = alc663_m51va_inithook, | ||
| 16734 | }, | ||
| 16643 | }; | 16735 | }; |
| 16644 | 16736 | ||
| 16645 | 16737 | ||
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 8042d539889..173bebf9f51 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
| @@ -2751,11 +2751,12 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) | |||
| 2751 | if (pos == 0) { | 2751 | if (pos == 0) { |
| 2752 | snd_printk(KERN_ERR "intel8x0: measure - unreliable DMA position..\n"); | 2752 | snd_printk(KERN_ERR "intel8x0: measure - unreliable DMA position..\n"); |
| 2753 | __retry: | 2753 | __retry: |
| 2754 | if (attempt < 2) { | 2754 | if (attempt < 3) { |
| 2755 | msleep(300); | ||
| 2755 | attempt++; | 2756 | attempt++; |
| 2756 | goto __again; | 2757 | goto __again; |
| 2757 | } | 2758 | } |
| 2758 | return; | 2759 | goto __end; |
| 2759 | } | 2760 | } |
| 2760 | 2761 | ||
| 2761 | pos /= 4; | 2762 | pos /= 4; |
| @@ -2782,6 +2783,7 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) | |||
| 2782 | else if (pos < 47500 || pos > 48500) | 2783 | else if (pos < 47500 || pos > 48500) |
| 2783 | /* not 48000Hz, tuning the clock.. */ | 2784 | /* not 48000Hz, tuning the clock.. */ |
| 2784 | chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos; | 2785 | chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos; |
| 2786 | __end: | ||
| 2785 | printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock); | 2787 | printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock); |
| 2786 | snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0); | 2788 | snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0); |
| 2787 | } | 2789 | } |
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index 6ff99ed7751..a5afb2682e7 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c | |||
| @@ -33,26 +33,25 @@ | |||
| 33 | static struct pmac_keywest *keywest_ctx; | 33 | static struct pmac_keywest *keywest_ctx; |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | static int keywest_attach_adapter(struct i2c_adapter *adapter); | ||
| 37 | static int keywest_detach_client(struct i2c_client *client); | ||
| 38 | |||
| 39 | struct i2c_driver keywest_driver = { | ||
| 40 | .driver = { | ||
| 41 | .name = "PMac Keywest Audio", | ||
| 42 | }, | ||
| 43 | .attach_adapter = &keywest_attach_adapter, | ||
| 44 | .detach_client = &keywest_detach_client, | ||
| 45 | }; | ||
| 46 | |||
| 47 | |||
| 48 | #ifndef i2c_device_name | 36 | #ifndef i2c_device_name |
| 49 | #define i2c_device_name(x) ((x)->name) | 37 | #define i2c_device_name(x) ((x)->name) |
| 50 | #endif | 38 | #endif |
| 51 | 39 | ||
| 40 | static int keywest_probe(struct i2c_client *client, | ||
| 41 | const struct i2c_device_id *id) | ||
| 42 | { | ||
| 43 | i2c_set_clientdata(client, keywest_ctx); | ||
| 44 | return 0; | ||
| 45 | } | ||
| 46 | |||
| 47 | /* | ||
| 48 | * This is kind of a hack, best would be to turn powermac to fixed i2c | ||
| 49 | * bus numbers and declare the sound device as part of platform | ||
| 50 | * initialization | ||
| 51 | */ | ||
| 52 | static int keywest_attach_adapter(struct i2c_adapter *adapter) | 52 | static int keywest_attach_adapter(struct i2c_adapter *adapter) |
| 53 | { | 53 | { |
| 54 | int err; | 54 | struct i2c_board_info info; |
| 55 | struct i2c_client *new_client; | ||
| 56 | 55 | ||
| 57 | if (! keywest_ctx) | 56 | if (! keywest_ctx) |
| 58 | return -EINVAL; | 57 | return -EINVAL; |
| @@ -60,46 +59,47 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter) | |||
| 60 | if (strncmp(i2c_device_name(adapter), "mac-io", 6)) | 59 | if (strncmp(i2c_device_name(adapter), "mac-io", 6)) |
| 61 | return 0; /* ignored */ | 60 | return 0; /* ignored */ |
| 62 | 61 | ||
| 63 | new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 62 | memset(&info, 0, sizeof(struct i2c_board_info)); |
| 64 | if (! new_client) | 63 | strlcpy(info.type, "keywest", I2C_NAME_SIZE); |
| 65 | return -ENOMEM; | 64 | info.addr = keywest_ctx->addr; |
| 66 | 65 | keywest_ctx->client = i2c_new_device(adapter, &info); | |
| 67 | new_client->addr = keywest_ctx->addr; | ||
| 68 | i2c_set_clientdata(new_client, keywest_ctx); | ||
| 69 | new_client->adapter = adapter; | ||
| 70 | new_client->driver = &keywest_driver; | ||
| 71 | new_client->flags = 0; | ||
| 72 | |||
| 73 | strcpy(i2c_device_name(new_client), keywest_ctx->name); | ||
| 74 | keywest_ctx->client = new_client; | ||
| 75 | 66 | ||
| 76 | /* Tell the i2c layer a new client has arrived */ | 67 | /* |
| 77 | if (i2c_attach_client(new_client)) { | 68 | * Let i2c-core delete that device on driver removal. |
| 78 | snd_printk(KERN_ERR "tumbler: cannot attach i2c client\n"); | 69 | * This is safe because i2c-core holds the core_lock mutex for us. |
| 79 | err = -ENODEV; | 70 | */ |
| 80 | goto __err; | 71 | list_add_tail(&keywest_ctx->client->detected, |
| 81 | } | 72 | &keywest_ctx->client->driver->clients); |
| 82 | |||
| 83 | return 0; | 73 | return 0; |
| 84 | |||
| 85 | __err: | ||
| 86 | kfree(new_client); | ||
| 87 | keywest_ctx->client = NULL; | ||
| 88 | return err; | ||
| 89 | } | 74 | } |
| 90 | 75 | ||
| 91 | static int keywest_detach_client(struct i2c_client *client) | 76 | static int keywest_remove(struct i2c_client *client) |
| 92 | { | 77 | { |
| 78 | i2c_set_clientdata(client, NULL); | ||
| 93 | if (! keywest_ctx) | 79 | if (! keywest_ctx) |
| 94 | return 0; | 80 | return 0; |
| 95 | if (client == keywest_ctx->client) | 81 | if (client == keywest_ctx->client) |
| 96 | keywest_ctx->client = NULL; | 82 | keywest_ctx->client = NULL; |
| 97 | 83 | ||
| 98 | i2c_detach_client(client); | ||
| 99 | kfree(client); | ||
| 100 | return 0; | 84 | return 0; |
| 101 | } | 85 | } |
| 102 | 86 | ||
| 87 | |||
| 88 | static const struct i2c_device_id keywest_i2c_id[] = { | ||
| 89 | { "keywest", 0 }, | ||
| 90 | { } | ||
| 91 | }; | ||
| 92 | |||
| 93 | struct i2c_driver keywest_driver = { | ||
| 94 | .driver = { | ||
| 95 | .name = "PMac Keywest Audio", | ||
| 96 | }, | ||
| 97 | .attach_adapter = keywest_attach_adapter, | ||
| 98 | .probe = keywest_probe, | ||
| 99 | .remove = keywest_remove, | ||
| 100 | .id_table = keywest_i2c_id, | ||
| 101 | }; | ||
| 102 | |||
| 103 | /* exported */ | 103 | /* exported */ |
| 104 | void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) | 104 | void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) |
| 105 | { | 105 | { |
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 6e23a81dba7..c2d1a7a18fa 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c | |||
| @@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) | |||
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | #ifdef CONFIG_PM | 320 | #ifdef CONFIG_PM |
| 321 | static int wm9705_soc_suspend(struct platform_device *pdev) | 321 | static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg) |
| 322 | { | 322 | { |
| 323 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 323 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
| 324 | struct snd_soc_codec *codec = socdev->card->codec; | 324 | struct snd_soc_codec *codec = socdev->card->codec; |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index a6d1178ce12..91ef17992de 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
| 5 | * | 5 | * |
| 6 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or | 8 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License | 9 | * modify it under the terms of the GNU General Public License |
| @@ -417,6 +417,6 @@ static void __exit n810_soc_exit(void) | |||
| 417 | module_init(n810_soc_init); | 417 | module_init(n810_soc_init); |
| 418 | module_exit(n810_soc_exit); | 418 | module_exit(n810_soc_exit); |
| 419 | 419 | ||
| 420 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); | 420 | MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); |
| 421 | MODULE_DESCRIPTION("ALSA SoC Nokia N810"); | 421 | MODULE_DESCRIPTION("ALSA SoC Nokia N810"); |
| 422 | MODULE_LICENSE("GPL"); | 422 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 90f4df7fd90..91261428384 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
| 5 | * | 5 | * |
| 6 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 7 | * Peter Ujfalusi <peter.ujfalusi@nokia.com> | ||
| 7 | * | 8 | * |
| 8 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |
| @@ -532,6 +533,6 @@ static void __exit snd_omap_mcbsp_exit(void) | |||
| 532 | } | 533 | } |
| 533 | module_exit(snd_omap_mcbsp_exit); | 534 | module_exit(snd_omap_mcbsp_exit); |
| 534 | 535 | ||
| 535 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); | 536 | MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); |
| 536 | MODULE_DESCRIPTION("OMAP I2S SoC Interface"); | 537 | MODULE_DESCRIPTION("OMAP I2S SoC Interface"); |
| 537 | MODULE_LICENSE("GPL"); | 538 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index df7ad13ba73..c8147aace81 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
| 5 | * | 5 | * |
| 6 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 7 | * Peter Ujfalusi <peter.ujfalusi@nokia.com> | ||
| 7 | * | 8 | * |
| 8 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 1bdbb042718..07cf7f46b58 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
| 5 | * | 5 | * |
| 6 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 7 | * Peter Ujfalusi <peter.ujfalusi@nokia.com> | ||
| 7 | * | 8 | * |
| 8 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |
| @@ -367,6 +368,6 @@ static void __exit omap_soc_platform_exit(void) | |||
| 367 | } | 368 | } |
| 368 | module_exit(omap_soc_platform_exit); | 369 | module_exit(omap_soc_platform_exit); |
| 369 | 370 | ||
| 370 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); | 371 | MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); |
| 371 | MODULE_DESCRIPTION("OMAP PCM DMA module"); | 372 | MODULE_DESCRIPTION("OMAP PCM DMA module"); |
| 372 | MODULE_LICENSE("GPL"); | 373 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h index e4369bdfd77..8d9d26916b0 100644 --- a/sound/soc/omap/omap-pcm.h +++ b/sound/soc/omap/omap-pcm.h | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
| 5 | * | 5 | * |
| 6 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 7 | * Peter Ujfalusi <peter.ujfalusi@nokia.com> | ||
| 7 | * | 8 | * |
| 8 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 48a73f64500..44fcc4e01e0 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
| @@ -200,7 +200,7 @@ static struct snd_soc_device palm27x_snd_devdata = { | |||
| 200 | 200 | ||
| 201 | static struct platform_device *palm27x_snd_device; | 201 | static struct platform_device *palm27x_snd_device; |
| 202 | 202 | ||
| 203 | static int __init palm27x_asoc_init(void) | 203 | static int palm27x_asoc_probe(struct platform_device *pdev) |
| 204 | { | 204 | { |
| 205 | int ret; | 205 | int ret; |
| 206 | 206 | ||
| @@ -208,6 +208,10 @@ static int __init palm27x_asoc_init(void) | |||
| 208 | machine_is_palmld())) | 208 | machine_is_palmld())) |
| 209 | return -ENODEV; | 209 | return -ENODEV; |
| 210 | 210 | ||
| 211 | if (pdev->dev.platform_data) | ||
| 212 | palm27x_ep_gpio = ((struct palm27x_asoc_info *) | ||
| 213 | (pdev->dev.platform_data))->jack_gpio; | ||
| 214 | |||
| 211 | ret = gpio_request(palm27x_ep_gpio, "Headphone Jack"); | 215 | ret = gpio_request(palm27x_ep_gpio, "Headphone Jack"); |
| 212 | if (ret) | 216 | if (ret) |
| 213 | return ret; | 217 | return ret; |
| @@ -245,16 +249,31 @@ err_alloc: | |||
| 245 | return ret; | 249 | return ret; |
| 246 | } | 250 | } |
| 247 | 251 | ||
| 248 | static void __exit palm27x_asoc_exit(void) | 252 | static int __devexit palm27x_asoc_remove(struct platform_device *pdev) |
| 249 | { | 253 | { |
| 250 | free_irq(gpio_to_irq(palm27x_ep_gpio), NULL); | 254 | free_irq(gpio_to_irq(palm27x_ep_gpio), NULL); |
| 251 | gpio_free(palm27x_ep_gpio); | 255 | gpio_free(palm27x_ep_gpio); |
| 252 | platform_device_unregister(palm27x_snd_device); | 256 | platform_device_unregister(palm27x_snd_device); |
| 257 | return 0; | ||
| 253 | } | 258 | } |
| 254 | 259 | ||
| 255 | void __init palm27x_asoc_set_pdata(struct palm27x_asoc_info *data) | 260 | static struct platform_driver palm27x_wm9712_driver = { |
| 261 | .probe = palm27x_asoc_probe, | ||
| 262 | .remove = __devexit_p(palm27x_asoc_remove), | ||
| 263 | .driver = { | ||
| 264 | .name = "palm27x-asoc", | ||
| 265 | .owner = THIS_MODULE, | ||
| 266 | }, | ||
| 267 | }; | ||
| 268 | |||
| 269 | static int __init palm27x_asoc_init(void) | ||
| 270 | { | ||
| 271 | return platform_driver_register(&palm27x_wm9712_driver); | ||
| 272 | } | ||
| 273 | |||
| 274 | static void __exit palm27x_asoc_exit(void) | ||
| 256 | { | 275 | { |
| 257 | palm27x_ep_gpio = data->jack_gpio; | 276 | platform_driver_unregister(&palm27x_wm9712_driver); |
| 258 | } | 277 | } |
| 259 | 278 | ||
| 260 | module_init(palm27x_asoc_init); | 279 | module_init(palm27x_asoc_init); |
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index de2254475d5..286be31545d 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
| @@ -280,12 +280,33 @@ static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai) | |||
| 280 | * ssp_set_clkdiv - set SSP clock divider | 280 | * ssp_set_clkdiv - set SSP clock divider |
| 281 | * @div: serial clock rate divider | 281 | * @div: serial clock rate divider |
| 282 | */ | 282 | */ |
| 283 | static void ssp_set_scr(struct ssp_dev *dev, u32 div) | 283 | static void ssp_set_scr(struct ssp_device *ssp, u32 div) |
| 284 | { | 284 | { |
| 285 | struct ssp_device *ssp = dev->ssp; | 285 | u32 sscr0 = ssp_read_reg(ssp, SSCR0); |
| 286 | u32 sscr0 = ssp_read_reg(dev->ssp, SSCR0) & ~SSCR0_SCR; | 286 | |
| 287 | if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) { | ||
| 288 | sscr0 &= ~0x0000ff00; | ||
| 289 | sscr0 |= ((div - 2)/2) << 8; /* 2..512 */ | ||
| 290 | } else { | ||
| 291 | sscr0 &= ~0x000fff00; | ||
| 292 | sscr0 |= (div - 1) << 8; /* 1..4096 */ | ||
| 293 | } | ||
| 294 | ssp_write_reg(ssp, SSCR0, sscr0); | ||
| 295 | } | ||
| 296 | |||
| 297 | /** | ||
| 298 | * ssp_get_clkdiv - get SSP clock divider | ||
| 299 | */ | ||
| 300 | static u32 ssp_get_scr(struct ssp_device *ssp) | ||
| 301 | { | ||
| 302 | u32 sscr0 = ssp_read_reg(ssp, SSCR0); | ||
| 303 | u32 div; | ||
| 287 | 304 | ||
| 288 | ssp_write_reg(ssp, SSCR0, (sscr0 | SSCR0_SerClkDiv(div))); | 305 | if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) |
| 306 | div = ((sscr0 >> 8) & 0xff) * 2 + 2; | ||
| 307 | else | ||
| 308 | div = ((sscr0 >> 8) & 0xfff) + 1; | ||
| 309 | return div; | ||
| 289 | } | 310 | } |
| 290 | 311 | ||
| 291 | /* | 312 | /* |
| @@ -326,7 +347,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, | |||
| 326 | break; | 347 | break; |
| 327 | case PXA_SSP_CLK_AUDIO: | 348 | case PXA_SSP_CLK_AUDIO: |
| 328 | priv->sysclk = 0; | 349 | priv->sysclk = 0; |
| 329 | ssp_set_scr(&priv->dev, 1); | 350 | ssp_set_scr(ssp, 1); |
| 330 | sscr0 |= SSCR0_ACS; | 351 | sscr0 |= SSCR0_ACS; |
| 331 | break; | 352 | break; |
| 332 | default: | 353 | default: |
| @@ -387,7 +408,7 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai, | |||
| 387 | ssp_write_reg(ssp, SSACD, val); | 408 | ssp_write_reg(ssp, SSACD, val); |
| 388 | break; | 409 | break; |
| 389 | case PXA_SSP_DIV_SCR: | 410 | case PXA_SSP_DIV_SCR: |
| 390 | ssp_set_scr(&priv->dev, div); | 411 | ssp_set_scr(ssp, div); |
| 391 | break; | 412 | break; |
| 392 | default: | 413 | default: |
| 393 | return -ENODEV; | 414 | return -ENODEV; |
| @@ -674,8 +695,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, | |||
| 674 | case SND_SOC_DAIFMT_I2S: | 695 | case SND_SOC_DAIFMT_I2S: |
| 675 | sspsp = ssp_read_reg(ssp, SSPSP); | 696 | sspsp = ssp_read_reg(ssp, SSPSP); |
| 676 | 697 | ||
| 677 | if (((sscr0 & SSCR0_SCR) == SSCR0_SerClkDiv(4)) && | 698 | if ((ssp_get_scr(ssp) == 4) && (width == 16)) { |
| 678 | (width == 16)) { | ||
| 679 | /* This is a special case where the bitclk is 64fs | 699 | /* This is a special case where the bitclk is 64fs |
| 680 | * and we're not dealing with 2*32 bits of audio | 700 | * and we're not dealing with 2*32 bits of audio |
| 681 | * samples. | 701 | * samples. |
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index 012ff1f6f8a..a5aae9d67f3 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c | |||
| @@ -474,6 +474,14 @@ static bool us122l_create_card(struct snd_card *card) | |||
| 474 | return true; | 474 | return true; |
| 475 | } | 475 | } |
| 476 | 476 | ||
| 477 | static void snd_us122l_free(struct snd_card *card) | ||
| 478 | { | ||
| 479 | struct us122l *us122l = US122L(card); | ||
| 480 | int index = us122l->chip.index; | ||
| 481 | if (index >= 0 && index < SNDRV_CARDS) | ||
| 482 | snd_us122l_card_used[index] = 0; | ||
| 483 | } | ||
| 484 | |||
| 477 | static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp) | 485 | static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp) |
| 478 | { | 486 | { |
| 479 | int dev; | 487 | int dev; |
| @@ -490,7 +498,7 @@ static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp) | |||
| 490 | if (err < 0) | 498 | if (err < 0) |
| 491 | return err; | 499 | return err; |
| 492 | snd_us122l_card_used[US122L(card)->chip.index = dev] = 1; | 500 | snd_us122l_card_used[US122L(card)->chip.index = dev] = 1; |
| 493 | 501 | card->private_free = snd_us122l_free; | |
| 494 | US122L(card)->chip.dev = device; | 502 | US122L(card)->chip.dev = device; |
| 495 | US122L(card)->chip.card = card; | 503 | US122L(card)->chip.card = card; |
| 496 | mutex_init(&US122L(card)->mutex); | 504 | mutex_init(&US122L(card)->mutex); |
| @@ -584,7 +592,7 @@ static void snd_us122l_disconnect(struct usb_interface *intf) | |||
| 584 | } | 592 | } |
| 585 | 593 | ||
| 586 | usb_put_intf(intf); | 594 | usb_put_intf(intf); |
| 587 | usb_put_dev(US122L(card)->chip.dev); | 595 | usb_put_dev(us122l->chip.dev); |
| 588 | 596 | ||
| 589 | while (atomic_read(&us122l->mmap_count)) | 597 | while (atomic_read(&us122l->mmap_count)) |
| 590 | msleep(500); | 598 | msleep(500); |
diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c index 24393dafcb6..12ae0340adc 100644 --- a/sound/usb/usx2y/usb_stream.c +++ b/sound/usb/usx2y/usb_stream.c | |||
| @@ -33,32 +33,26 @@ static unsigned usb_stream_next_packet_size(struct usb_stream_kernel *sk) | |||
| 33 | static void playback_prep_freqn(struct usb_stream_kernel *sk, struct urb *urb) | 33 | static void playback_prep_freqn(struct usb_stream_kernel *sk, struct urb *urb) |
| 34 | { | 34 | { |
| 35 | struct usb_stream *s = sk->s; | 35 | struct usb_stream *s = sk->s; |
| 36 | unsigned l = 0; | 36 | int pack, lb = 0; |
| 37 | int pack; | 37 | |
| 38 | 38 | for (pack = 0; pack < sk->n_o_ps; pack++) { | |
| 39 | urb->iso_frame_desc[0].offset = 0; | 39 | int l = usb_stream_next_packet_size(sk); |
| 40 | urb->iso_frame_desc[0].length = usb_stream_next_packet_size(sk); | 40 | if (s->idle_outsize + lb + l > s->period_size) |
| 41 | sk->out_phase = sk->out_phase_peeked; | ||
| 42 | urb->transfer_buffer_length = urb->iso_frame_desc[0].length; | ||
| 43 | |||
| 44 | for (pack = 1; pack < sk->n_o_ps; pack++) { | ||
| 45 | l = usb_stream_next_packet_size(sk); | ||
| 46 | if (s->idle_outsize + urb->transfer_buffer_length + l > | ||
| 47 | s->period_size) | ||
| 48 | goto check; | 41 | goto check; |
| 49 | 42 | ||
| 50 | sk->out_phase = sk->out_phase_peeked; | 43 | sk->out_phase = sk->out_phase_peeked; |
| 51 | urb->iso_frame_desc[pack].offset = urb->transfer_buffer_length; | 44 | urb->iso_frame_desc[pack].offset = lb; |
| 52 | urb->iso_frame_desc[pack].length = l; | 45 | urb->iso_frame_desc[pack].length = l; |
| 53 | urb->transfer_buffer_length += l; | 46 | lb += l; |
| 54 | } | 47 | } |
| 55 | snd_printdd(KERN_DEBUG "%i\n", urb->transfer_buffer_length); | 48 | snd_printdd(KERN_DEBUG "%i\n", lb); |
| 56 | 49 | ||
| 57 | check: | 50 | check: |
| 58 | urb->number_of_packets = pack; | 51 | urb->number_of_packets = pack; |
| 59 | s->idle_outsize += urb->transfer_buffer_length - s->period_size; | 52 | urb->transfer_buffer_length = lb; |
| 53 | s->idle_outsize += lb - s->period_size; | ||
| 60 | snd_printdd(KERN_DEBUG "idle=%i ul=%i ps=%i\n", s->idle_outsize, | 54 | snd_printdd(KERN_DEBUG "idle=%i ul=%i ps=%i\n", s->idle_outsize, |
| 61 | urb->transfer_buffer_length, s->period_size); | 55 | lb, s->period_size); |
| 62 | } | 56 | } |
| 63 | 57 | ||
| 64 | static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, | 58 | static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, |
| @@ -282,21 +276,20 @@ static int usb_stream_prepare_playback(struct usb_stream_kernel *sk, | |||
| 282 | struct usb_stream *s = sk->s; | 276 | struct usb_stream *s = sk->s; |
| 283 | struct urb *io; | 277 | struct urb *io; |
| 284 | struct usb_iso_packet_descriptor *id, *od; | 278 | struct usb_iso_packet_descriptor *id, *od; |
| 285 | int p, l = 0; | 279 | int p = 0, lb = 0, l = 0; |
| 286 | 280 | ||
| 287 | io = sk->idle_outurb; | 281 | io = sk->idle_outurb; |
| 288 | od = io->iso_frame_desc; | 282 | od = io->iso_frame_desc; |
| 289 | io->transfer_buffer_length = 0; | ||
| 290 | 283 | ||
| 291 | for (p = 0; s->sync_packet < 0; ++p, ++s->sync_packet) { | 284 | for (; s->sync_packet < 0; ++p, ++s->sync_packet) { |
| 292 | struct urb *ii = sk->completed_inurb; | 285 | struct urb *ii = sk->completed_inurb; |
| 293 | id = ii->iso_frame_desc + | 286 | id = ii->iso_frame_desc + |
| 294 | ii->number_of_packets + s->sync_packet; | 287 | ii->number_of_packets + s->sync_packet; |
| 295 | l = id->actual_length; | 288 | l = id->actual_length; |
| 296 | 289 | ||
| 297 | od[p].length = l; | 290 | od[p].length = l; |
| 298 | od[p].offset = io->transfer_buffer_length; | 291 | od[p].offset = lb; |
| 299 | io->transfer_buffer_length += l; | 292 | lb += l; |
| 300 | } | 293 | } |
| 301 | 294 | ||
| 302 | for (; | 295 | for (; |
| @@ -304,38 +297,38 @@ static int usb_stream_prepare_playback(struct usb_stream_kernel *sk, | |||
| 304 | ++p, ++s->sync_packet) { | 297 | ++p, ++s->sync_packet) { |
| 305 | l = inurb->iso_frame_desc[s->sync_packet].actual_length; | 298 | l = inurb->iso_frame_desc[s->sync_packet].actual_length; |
| 306 | 299 | ||
| 307 | if (s->idle_outsize + io->transfer_buffer_length + l > | 300 | if (s->idle_outsize + lb + l > s->period_size) |
| 308 | s->period_size) | ||
| 309 | goto check_ok; | 301 | goto check_ok; |
| 310 | 302 | ||
| 311 | od[p].length = l; | 303 | od[p].length = l; |
| 312 | od[p].offset = io->transfer_buffer_length; | 304 | od[p].offset = lb; |
| 313 | io->transfer_buffer_length += l; | 305 | lb += l; |
| 314 | } | 306 | } |
| 315 | 307 | ||
| 316 | check_ok: | 308 | check_ok: |
| 317 | s->sync_packet -= inurb->number_of_packets; | 309 | s->sync_packet -= inurb->number_of_packets; |
| 318 | if (s->sync_packet < -2 || s->sync_packet > 0) { | 310 | if (unlikely(s->sync_packet < -2 || s->sync_packet > 0)) { |
| 319 | snd_printk(KERN_WARNING "invalid sync_packet = %i;" | 311 | snd_printk(KERN_WARNING "invalid sync_packet = %i;" |
| 320 | " p=%i nop=%i %i %x %x %x > %x\n", | 312 | " p=%i nop=%i %i %x %x %x > %x\n", |
| 321 | s->sync_packet, p, inurb->number_of_packets, | 313 | s->sync_packet, p, inurb->number_of_packets, |
| 322 | s->idle_outsize + io->transfer_buffer_length + l, | 314 | s->idle_outsize + lb + l, |
| 323 | s->idle_outsize, io->transfer_buffer_length, l, | 315 | s->idle_outsize, lb, l, |
| 324 | s->period_size); | 316 | s->period_size); |
| 325 | return -1; | 317 | return -1; |
| 326 | } | 318 | } |
| 327 | if (io->transfer_buffer_length % s->cfg.frame_size) { | 319 | if (unlikely(lb % s->cfg.frame_size)) { |
| 328 | snd_printk(KERN_WARNING"invalid outsize = %i\n", | 320 | snd_printk(KERN_WARNING"invalid outsize = %i\n", |
| 329 | io->transfer_buffer_length); | 321 | lb); |
| 330 | return -1; | 322 | return -1; |
| 331 | } | 323 | } |
| 332 | s->idle_outsize += io->transfer_buffer_length - s->period_size; | 324 | s->idle_outsize += lb - s->period_size; |
| 333 | io->number_of_packets = p; | 325 | io->number_of_packets = p; |
| 334 | if (s->idle_outsize > 0) { | 326 | io->transfer_buffer_length = lb; |
| 335 | snd_printk(KERN_WARNING "idle=%i\n", s->idle_outsize); | 327 | if (s->idle_outsize <= 0) |
| 336 | return -1; | 328 | return 0; |
| 337 | } | 329 | |
| 338 | return 0; | 330 | snd_printk(KERN_WARNING "idle=%i\n", s->idle_outsize); |
| 331 | return -1; | ||
| 339 | } | 332 | } |
| 340 | 333 | ||
| 341 | static void prepare_inurb(int number_of_packets, struct urb *iu) | 334 | static void prepare_inurb(int number_of_packets, struct urb *iu) |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 605697e9c4d..1ecbe2391c8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -920,6 +920,7 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
| 920 | int r; | 920 | int r; |
| 921 | gfn_t base_gfn; | 921 | gfn_t base_gfn; |
| 922 | unsigned long npages; | 922 | unsigned long npages; |
| 923 | int largepages; | ||
| 923 | unsigned long i; | 924 | unsigned long i; |
| 924 | struct kvm_memory_slot *memslot; | 925 | struct kvm_memory_slot *memslot; |
| 925 | struct kvm_memory_slot old, new; | 926 | struct kvm_memory_slot old, new; |
| @@ -960,7 +961,7 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
| 960 | for (i = 0; i < KVM_MEMORY_SLOTS; ++i) { | 961 | for (i = 0; i < KVM_MEMORY_SLOTS; ++i) { |
| 961 | struct kvm_memory_slot *s = &kvm->memslots[i]; | 962 | struct kvm_memory_slot *s = &kvm->memslots[i]; |
| 962 | 963 | ||
| 963 | if (s == memslot) | 964 | if (s == memslot || !s->npages) |
| 964 | continue; | 965 | continue; |
| 965 | if (!((base_gfn + npages <= s->base_gfn) || | 966 | if (!((base_gfn + npages <= s->base_gfn) || |
| 966 | (base_gfn >= s->base_gfn + s->npages))) | 967 | (base_gfn >= s->base_gfn + s->npages))) |
| @@ -995,11 +996,8 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
| 995 | new.userspace_addr = 0; | 996 | new.userspace_addr = 0; |
| 996 | } | 997 | } |
| 997 | if (npages && !new.lpage_info) { | 998 | if (npages && !new.lpage_info) { |
| 998 | int largepages = npages / KVM_PAGES_PER_HPAGE; | 999 | largepages = 1 + (base_gfn + npages - 1) / KVM_PAGES_PER_HPAGE; |
| 999 | if (npages % KVM_PAGES_PER_HPAGE) | 1000 | largepages -= base_gfn / KVM_PAGES_PER_HPAGE; |
| 1000 | largepages++; | ||
| 1001 | if (base_gfn % KVM_PAGES_PER_HPAGE) | ||
| 1002 | largepages++; | ||
| 1003 | 1001 | ||
| 1004 | new.lpage_info = vmalloc(largepages * sizeof(*new.lpage_info)); | 1002 | new.lpage_info = vmalloc(largepages * sizeof(*new.lpage_info)); |
| 1005 | 1003 | ||
| @@ -1985,6 +1983,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg) | |||
| 1985 | switch (arg) { | 1983 | switch (arg) { |
| 1986 | case KVM_CAP_USER_MEMORY: | 1984 | case KVM_CAP_USER_MEMORY: |
| 1987 | case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: | 1985 | case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: |
| 1986 | case KVM_CAP_JOIN_MEMORY_REGIONS_WORKS: | ||
| 1988 | return 1; | 1987 | return 1; |
| 1989 | #ifdef CONFIG_HAVE_KVM_IRQCHIP | 1988 | #ifdef CONFIG_HAVE_KVM_IRQCHIP |
| 1990 | case KVM_CAP_IRQ_ROUTING: | 1989 | case KVM_CAP_IRQ_ROUTING: |