diff options
179 files changed, 1879 insertions, 1200 deletions
| @@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com> | |||
| 96 | Thomas Graf <tgraf@suug.ch> | 96 | Thomas Graf <tgraf@suug.ch> |
| 97 | Tony Luck <tony.luck@intel.com> | 97 | Tony Luck <tony.luck@intel.com> |
| 98 | Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com> | 98 | Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com> |
| 99 | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | ||
| 100 | Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> | ||
| 99 | Valdis Kletnieks <Valdis.Kletnieks@vt.edu> | 101 | Valdis Kletnieks <Valdis.Kletnieks@vt.edu> |
diff --git a/Documentation/ABI/testing/sysfs-gpio b/Documentation/ABI/testing/sysfs-gpio new file mode 100644 index 000000000000..8aab8092ad35 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-gpio | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | What: /sys/class/gpio/ | ||
| 2 | Date: July 2008 | ||
| 3 | KernelVersion: 2.6.27 | ||
| 4 | Contact: David Brownell <dbrownell@users.sourceforge.net> | ||
| 5 | Description: | ||
| 6 | |||
| 7 | As a Kconfig option, individual GPIO signals may be accessed from | ||
| 8 | userspace. GPIOs are only made available to userspace by an explicit | ||
| 9 | "export" operation. If a given GPIO is not claimed for use by | ||
| 10 | kernel code, it may be exported by userspace (and unexported later). | ||
| 11 | Kernel code may export it for complete or partial access. | ||
| 12 | |||
| 13 | GPIOs are identified as they are inside the kernel, using integers in | ||
| 14 | the range 0..INT_MAX. See Documentation/gpio.txt for more information. | ||
| 15 | |||
| 16 | /sys/class/gpio | ||
| 17 | /export ... asks the kernel to export a GPIO to userspace | ||
| 18 | /unexport ... to return a GPIO to the kernel | ||
| 19 | /gpioN ... for each exported GPIO #N | ||
| 20 | /value ... always readable, writes fail for input GPIOs | ||
| 21 | /direction ... r/w as: in, out (default low); write: high, low | ||
| 22 | /gpiochipN ... for each gpiochip; #N is its first GPIO | ||
| 23 | /base ... (r/o) same as N | ||
| 24 | /label ... (r/o) descriptive, not necessarily unique | ||
| 25 | /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1) | ||
| 26 | |||
diff --git a/Documentation/cpusets.txt b/Documentation/cpusets.txt index 1f5a924d1e56..47e568a9370a 100644 --- a/Documentation/cpusets.txt +++ b/Documentation/cpusets.txt | |||
| @@ -635,14 +635,16 @@ prior 'mems' setting, will not be moved. | |||
| 635 | 635 | ||
| 636 | There is an exception to the above. If hotplug functionality is used | 636 | There is an exception to the above. If hotplug functionality is used |
| 637 | to remove all the CPUs that are currently assigned to a cpuset, | 637 | to remove all the CPUs that are currently assigned to a cpuset, |
| 638 | then the kernel will automatically update the cpus_allowed of all | 638 | then all the tasks in that cpuset will be moved to the nearest ancestor |
| 639 | tasks attached to CPUs in that cpuset to allow all CPUs. When memory | 639 | with non-empty cpus. But the moving of some (or all) tasks might fail if |
| 640 | hotplug functionality for removing Memory Nodes is available, a | 640 | cpuset is bound with another cgroup subsystem which has some restrictions |
| 641 | similar exception is expected to apply there as well. In general, | 641 | on task attaching. In this failing case, those tasks will stay |
| 642 | the kernel prefers to violate cpuset placement, over starving a task | 642 | in the original cpuset, and the kernel will automatically update |
| 643 | that has had all its allowed CPUs or Memory Nodes taken offline. User | 643 | their cpus_allowed to allow all online CPUs. When memory hotplug |
| 644 | code should reconfigure cpusets to only refer to online CPUs and Memory | 644 | functionality for removing Memory Nodes is available, a similar exception |
| 645 | Nodes when using hotplug to add or remove such resources. | 645 | is expected to apply there as well. In general, the kernel prefers to |
| 646 | violate cpuset placement, over starving a task that has had all | ||
| 647 | its allowed CPUs or Memory Nodes taken offline. | ||
| 646 | 648 | ||
| 647 | There is a second exception to the above. GFP_ATOMIC requests are | 649 | There is a second exception to the above. GFP_ATOMIC requests are |
| 648 | kernel internal allocations that must be satisfied, immediately. | 650 | kernel internal allocations that must be satisfied, immediately. |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index eb1a47b97427..83c88cae1eda 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -322,3 +322,11 @@ Why: Accounting can now be enabled/disabled without kernel recompilation. | |||
| 322 | controlled by a kernel/module/sysfs/sysctl parameter. | 322 | controlled by a kernel/module/sysfs/sysctl parameter. |
| 323 | Who: Krzysztof Piotr Oledzki <ole@ans.pl> | 323 | Who: Krzysztof Piotr Oledzki <ole@ans.pl> |
| 324 | 324 | ||
| 325 | --------------------------- | ||
| 326 | |||
| 327 | What: ide-scsi (BLK_DEV_IDESCSI) | ||
| 328 | When: 2.6.29 | ||
| 329 | Why: The 2.6 kernel supports direct writing to ide CD drives, which | ||
| 330 | eliminates the need for ide-scsi. The new method is more | ||
| 331 | efficient in every way. | ||
| 332 | Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | ||
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 394eb2cc1c39..f566ad9bcb7b 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -2413,6 +2413,8 @@ The following 4 memory types are supported: | |||
| 2413 | - (bit 1) anonymous shared memory | 2413 | - (bit 1) anonymous shared memory |
| 2414 | - (bit 2) file-backed private memory | 2414 | - (bit 2) file-backed private memory |
| 2415 | - (bit 3) file-backed shared memory | 2415 | - (bit 3) file-backed shared memory |
| 2416 | - (bit 4) ELF header pages in file-backed private memory areas (it is | ||
| 2417 | effective only if the bit 2 is cleared) | ||
| 2416 | 2418 | ||
| 2417 | Note that MMIO pages such as frame buffer are never dumped and vDSO pages | 2419 | Note that MMIO pages such as frame buffer are never dumped and vDSO pages |
| 2418 | are always dumped regardless of the bitmask status. | 2420 | are always dumped regardless of the bitmask status. |
diff --git a/MAINTAINERS b/MAINTAINERS index 186be3ba5069..cad81a24e832 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -271,20 +271,20 @@ W: http://www.lesswatts.org/projects/acpi/ | |||
| 271 | S: Supported | 271 | S: Supported |
| 272 | 272 | ||
| 273 | ACPI WMI DRIVER | 273 | ACPI WMI DRIVER |
| 274 | P: Carlos Corbacho | 274 | P: Carlos Corbacho |
| 275 | M: carlos@strangeworlds.co.uk | 275 | M: carlos@strangeworlds.co.uk |
| 276 | L: linux-acpi@vger.kernel.org | 276 | L: linux-acpi@vger.kernel.org |
| 277 | W: http://www.lesswatts.org/projects/acpi/ | 277 | W: http://www.lesswatts.org/projects/acpi/ |
| 278 | S: Maintained | 278 | S: Maintained |
| 279 | 279 | ||
| 280 | AD1889 ALSA SOUND DRIVER | 280 | AD1889 ALSA SOUND DRIVER |
| 281 | P: Kyle McMartin | 281 | P: Kyle McMartin |
| 282 | M: kyle@mcmartin.ca | 282 | M: kyle@mcmartin.ca |
| 283 | P: Thibaut Varene | 283 | P: Thibaut Varene |
| 284 | M: T-Bone@parisc-linux.org | 284 | M: T-Bone@parisc-linux.org |
| 285 | W: http://wiki.parisc-linux.org/AD1889 | 285 | W: http://wiki.parisc-linux.org/AD1889 |
| 286 | L: linux-parisc@vger.kernel.org | 286 | L: linux-parisc@vger.kernel.org |
| 287 | S: Maintained | 287 | S: Maintained |
| 288 | 288 | ||
| 289 | ADM1025 HARDWARE MONITOR DRIVER | 289 | ADM1025 HARDWARE MONITOR DRIVER |
| 290 | P: Jean Delvare | 290 | P: Jean Delvare |
| @@ -473,11 +473,11 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | |||
| 473 | S: Maintained | 473 | S: Maintained |
| 474 | 474 | ||
| 475 | ARM/ATMEL AT91RM9200 ARM ARCHITECTURE | 475 | ARM/ATMEL AT91RM9200 ARM ARCHITECTURE |
| 476 | P: Andrew Victor | 476 | P: Andrew Victor |
| 477 | M: linux@maxim.org.za | 477 | M: linux@maxim.org.za |
| 478 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | 478 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) |
| 479 | W: http://maxim.org.za/at91_26.html | 479 | W: http://maxim.org.za/at91_26.html |
| 480 | S: Maintained | 480 | S: Maintained |
| 481 | 481 | ||
| 482 | ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE | 482 | ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE |
| 483 | P: Lennert Buytenhek | 483 | P: Lennert Buytenhek |
| @@ -532,10 +532,10 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | |||
| 532 | S: Maintained | 532 | S: Maintained |
| 533 | 533 | ||
| 534 | ARM/HP JORNADA 7XX MACHINE SUPPORT | 534 | ARM/HP JORNADA 7XX MACHINE SUPPORT |
| 535 | P: Kristoffer Ericson | 535 | P: Kristoffer Ericson |
| 536 | M: kristoffer.ericson@gmail.com | 536 | M: kristoffer.ericson@gmail.com |
| 537 | W: www.jlime.com | 537 | W: www.jlime.com |
| 538 | S: Maintained | 538 | S: Maintained |
| 539 | 539 | ||
| 540 | ARM/INTEL IOP32X ARM ARCHITECTURE | 540 | ARM/INTEL IOP32X ARM ARCHITECTURE |
| 541 | P: Lennert Buytenhek | 541 | P: Lennert Buytenhek |
| @@ -1017,7 +1017,7 @@ T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git | |||
| 1017 | S: Maintained | 1017 | S: Maintained |
| 1018 | 1018 | ||
| 1019 | CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER | 1019 | CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER |
| 1020 | P: Jonathan Corbet | 1020 | P: Jonathan Corbet |
| 1021 | M: corbet@lwn.net | 1021 | M: corbet@lwn.net |
| 1022 | L: video4linux-list@redhat.com | 1022 | L: video4linux-list@redhat.com |
| 1023 | S: Maintained | 1023 | S: Maintained |
| @@ -1359,7 +1359,7 @@ P: Digi International, Inc | |||
| 1359 | M: Eng.Linux@digi.com | 1359 | M: Eng.Linux@digi.com |
| 1360 | L: Eng.Linux@digi.com | 1360 | L: Eng.Linux@digi.com |
| 1361 | W: http://www.digi.com | 1361 | W: http://www.digi.com |
| 1362 | S: Orphaned | 1362 | S: Orphan |
| 1363 | 1363 | ||
| 1364 | DIRECTORY NOTIFICATION | 1364 | DIRECTORY NOTIFICATION |
| 1365 | P: Stephen Rothwell | 1365 | P: Stephen Rothwell |
| @@ -1423,12 +1423,12 @@ L: linux-acpi@vger.kernel.org | |||
| 1423 | S: Supported | 1423 | S: Supported |
| 1424 | 1424 | ||
| 1425 | DOCUMENTATION (/Documentation directory) | 1425 | DOCUMENTATION (/Documentation directory) |
| 1426 | P: Michael Kerrisk | 1426 | P: Michael Kerrisk |
| 1427 | M: mtk.manpages@gmail.com | 1427 | M: mtk.manpages@gmail.com |
| 1428 | P: Randy Dunlap | 1428 | P: Randy Dunlap |
| 1429 | M: rdunlap@xenotime.net | 1429 | M: rdunlap@xenotime.net |
| 1430 | L: linux-doc@vger.kernel.org | 1430 | L: linux-doc@vger.kernel.org |
| 1431 | S: Maintained | 1431 | S: Maintained |
| 1432 | 1432 | ||
| 1433 | DOUBLETALK DRIVER | 1433 | DOUBLETALK DRIVER |
| 1434 | P: James R. Van Zandt | 1434 | P: James R. Van Zandt |
| @@ -1459,7 +1459,7 @@ S: Maintained | |||
| 1459 | DVB SUBSYSTEM AND DRIVERS | 1459 | DVB SUBSYSTEM AND DRIVERS |
| 1460 | P: LinuxTV.org Project | 1460 | P: LinuxTV.org Project |
| 1461 | M: v4l-dvb-maintainer@linuxtv.org | 1461 | M: v4l-dvb-maintainer@linuxtv.org |
| 1462 | L: linux-dvb@linuxtv.org (subscription required) | 1462 | L: linux-dvb@linuxtv.org (subscription required) |
| 1463 | W: http://linuxtv.org/ | 1463 | W: http://linuxtv.org/ |
| 1464 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git | 1464 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
| 1465 | S: Maintained | 1465 | S: Maintained |
| @@ -1797,7 +1797,7 @@ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit) | |||
| 1797 | P: Rik Faith | 1797 | P: Rik Faith |
| 1798 | M: faith@cs.unc.edu | 1798 | M: faith@cs.unc.edu |
| 1799 | L: linux-scsi@vger.kernel.org | 1799 | L: linux-scsi@vger.kernel.org |
| 1800 | S: Odd fixes (e.g., new signatures) | 1800 | S: Odd Fixes (e.g., new signatures) |
| 1801 | 1801 | ||
| 1802 | GDT SCSI DISK ARRAY CONTROLLER DRIVER | 1802 | GDT SCSI DISK ARRAY CONTROLLER DRIVER |
| 1803 | P: Achim Leubner | 1803 | P: Achim Leubner |
| @@ -1838,10 +1838,10 @@ S: Maintained | |||
| 1838 | HARDWARE MONITORING | 1838 | HARDWARE MONITORING |
| 1839 | L: lm-sensors@lm-sensors.org | 1839 | L: lm-sensors@lm-sensors.org |
| 1840 | W: http://www.lm-sensors.org/ | 1840 | W: http://www.lm-sensors.org/ |
| 1841 | S: Orphaned | 1841 | S: Orphan |
| 1842 | 1842 | ||
| 1843 | HARDWARE RANDOM NUMBER GENERATOR CORE | 1843 | HARDWARE RANDOM NUMBER GENERATOR CORE |
| 1844 | S: Orphaned | 1844 | S: Orphan |
| 1845 | 1845 | ||
| 1846 | HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER | 1846 | HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER |
| 1847 | P: Robert Love | 1847 | P: Robert Love |
| @@ -2108,7 +2108,7 @@ M: rolandd@cisco.com | |||
| 2108 | P: Sean Hefty | 2108 | P: Sean Hefty |
| 2109 | M: sean.hefty@intel.com | 2109 | M: sean.hefty@intel.com |
| 2110 | P: Hal Rosenstock | 2110 | P: Hal Rosenstock |
| 2111 | M: hal.rosenstock@gmail.com | 2111 | M: hal.rosenstock@gmail.com |
| 2112 | L: general@lists.openfabrics.org | 2112 | L: general@lists.openfabrics.org |
| 2113 | W: http://www.openib.org/ | 2113 | W: http://www.openib.org/ |
| 2114 | T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git | 2114 | T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git |
| @@ -2696,17 +2696,17 @@ S: Maintained | |||
| 2696 | 2696 | ||
| 2697 | MARVELL YUKON / SYSKONNECT DRIVER | 2697 | MARVELL YUKON / SYSKONNECT DRIVER |
| 2698 | P: Mirko Lindner | 2698 | P: Mirko Lindner |
| 2699 | M: mlindner@syskonnect.de | 2699 | M: mlindner@syskonnect.de |
| 2700 | P: Ralph Roesler | 2700 | P: Ralph Roesler |
| 2701 | M: rroesler@syskonnect.de | 2701 | M: rroesler@syskonnect.de |
| 2702 | W: http://www.syskonnect.com | 2702 | W: http://www.syskonnect.com |
| 2703 | S: Supported | 2703 | S: Supported |
| 2704 | 2704 | ||
| 2705 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 | 2705 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 |
| 2706 | P: Michael Kerrisk | 2706 | P: Michael Kerrisk |
| 2707 | M: mtk.manpages@gmail.com | 2707 | M: mtk.manpages@gmail.com |
| 2708 | W: http://www.kernel.org/doc/man-pages | 2708 | W: http://www.kernel.org/doc/man-pages |
| 2709 | S: Supported | 2709 | S: Supported |
| 2710 | 2710 | ||
| 2711 | MARVELL LIBERTAS WIRELESS DRIVER | 2711 | MARVELL LIBERTAS WIRELESS DRIVER |
| 2712 | P: Dan Williams | 2712 | P: Dan Williams |
| @@ -2735,7 +2735,7 @@ S: Maintained | |||
| 2735 | MEGARAID SCSI DRIVERS | 2735 | MEGARAID SCSI DRIVERS |
| 2736 | P: Neela Syam Kolli | 2736 | P: Neela Syam Kolli |
| 2737 | M: megaraidlinux@lsi.com | 2737 | M: megaraidlinux@lsi.com |
| 2738 | S: linux-scsi@vger.kernel.org | 2738 | L: linux-scsi@vger.kernel.org |
| 2739 | W: http://megaraid.lsilogic.com | 2739 | W: http://megaraid.lsilogic.com |
| 2740 | S: Maintained | 2740 | S: Maintained |
| 2741 | 2741 | ||
| @@ -2853,7 +2853,7 @@ MULTIMEDIA CARD (MMC) ETC. OVER SPI | |||
| 2853 | P: David Brownell | 2853 | P: David Brownell |
| 2854 | M: dbrownell@users.sourceforge.net | 2854 | M: dbrownell@users.sourceforge.net |
| 2855 | L: linux-kernel@vger.kernel.org | 2855 | L: linux-kernel@vger.kernel.org |
| 2856 | S: Odd fixes | 2856 | S: Odd Fixes |
| 2857 | 2857 | ||
| 2858 | MULTISOUND SOUND DRIVER | 2858 | MULTISOUND SOUND DRIVER |
| 2859 | P: Andrew Veliath | 2859 | P: Andrew Veliath |
| @@ -2867,10 +2867,10 @@ L: linux-kernel@vger.kernel.org | |||
| 2867 | S: Maintained | 2867 | S: Maintained |
| 2868 | 2868 | ||
| 2869 | MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER | 2869 | MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER |
| 2870 | P: Felipe Balbi | 2870 | P: Felipe Balbi |
| 2871 | M: felipe.balbi@nokia.com | 2871 | M: felipe.balbi@nokia.com |
| 2872 | L: linux-usb@vger.kernel.org | 2872 | L: linux-usb@vger.kernel.org |
| 2873 | S: Maintained | 2873 | S: Maintained |
| 2874 | 2874 | ||
| 2875 | MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) | 2875 | MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) |
| 2876 | P: Andrew Gallatin | 2876 | P: Andrew Gallatin |
| @@ -2882,7 +2882,7 @@ W: http://www.myri.com/scs/download-Myri10GE.html | |||
| 2882 | S: Supported | 2882 | S: Supported |
| 2883 | 2883 | ||
| 2884 | NATSEMI ETHERNET DRIVER (DP8381x) | 2884 | NATSEMI ETHERNET DRIVER (DP8381x) |
| 2885 | P: Tim Hockin | 2885 | P: Tim Hockin |
| 2886 | M: thockin@hockin.org | 2886 | M: thockin@hockin.org |
| 2887 | S: Maintained | 2887 | S: Maintained |
| 2888 | 2888 | ||
| @@ -3101,7 +3101,7 @@ M: laforge@gnumonks.org | |||
| 3101 | S: Maintained | 3101 | S: Maintained |
| 3102 | 3102 | ||
| 3103 | OMNIVISION OV7670 SENSOR DRIVER | 3103 | OMNIVISION OV7670 SENSOR DRIVER |
| 3104 | P: Jonathan Corbet | 3104 | P: Jonathan Corbet |
| 3105 | M: corbet@lwn.net | 3105 | M: corbet@lwn.net |
| 3106 | L: video4linux-list@redhat.com | 3106 | L: video4linux-list@redhat.com |
| 3107 | S: Maintained | 3107 | S: Maintained |
| @@ -3211,7 +3211,7 @@ T: git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git | |||
| 3211 | S: Supported | 3211 | S: Supported |
| 3212 | 3212 | ||
| 3213 | PCI HOTPLUG CORE | 3213 | PCI HOTPLUG CORE |
| 3214 | P: Kristen Carlson Accardi | 3214 | P: Kristen Carlson Accardi |
| 3215 | M: kristen.c.accardi@intel.com | 3215 | M: kristen.c.accardi@intel.com |
| 3216 | S: Supported | 3216 | S: Supported |
| 3217 | 3217 | ||
| @@ -3650,7 +3650,7 @@ M: jmorris@namei.org | |||
| 3650 | P: Eric Paris | 3650 | P: Eric Paris |
| 3651 | M: eparis@parisplace.org | 3651 | M: eparis@parisplace.org |
| 3652 | L: linux-kernel@vger.kernel.org (kernel issues) | 3652 | L: linux-kernel@vger.kernel.org (kernel issues) |
| 3653 | L: selinux@tycho.nsa.gov (subscribers-only, general discussion) | 3653 | L: selinux@tycho.nsa.gov (subscribers-only, general discussion) |
| 3654 | W: http://www.nsa.gov/selinux | 3654 | W: http://www.nsa.gov/selinux |
| 3655 | S: Supported | 3655 | S: Supported |
| 3656 | 3656 | ||
| @@ -3768,10 +3768,10 @@ M: bn@niasdigital.com | |||
| 3768 | S: Maintained | 3768 | S: Maintained |
| 3769 | 3769 | ||
| 3770 | SOC-CAMERA V4L2 SUBSYSTEM | 3770 | SOC-CAMERA V4L2 SUBSYSTEM |
| 3771 | P: Guennadi Liakhovetski | 3771 | P: Guennadi Liakhovetski |
| 3772 | M: g.liakhovetski@gmx.de | 3772 | M: g.liakhovetski@gmx.de |
| 3773 | L: video4linux-list@redhat.com | 3773 | L: video4linux-list@redhat.com |
| 3774 | S: Maintained | 3774 | S: Maintained |
| 3775 | 3775 | ||
| 3776 | SOFTWARE RAID (Multiple Disks) SUPPORT | 3776 | SOFTWARE RAID (Multiple Disks) SUPPORT |
| 3777 | P: Ingo Molnar | 3777 | P: Ingo Molnar |
| @@ -3925,7 +3925,7 @@ S: Maintained | |||
| 3925 | 3925 | ||
| 3926 | STARMODE RADIO IP (STRIP) PROTOCOL DRIVER | 3926 | STARMODE RADIO IP (STRIP) PROTOCOL DRIVER |
| 3927 | W: http://mosquitonet.Stanford.EDU/strip.html | 3927 | W: http://mosquitonet.Stanford.EDU/strip.html |
| 3928 | S: Unsupported ? | 3928 | S: Orphan |
| 3929 | 3929 | ||
| 3930 | STRADIS MPEG-2 DECODER DRIVER | 3930 | STRADIS MPEG-2 DECODER DRIVER |
| 3931 | P: Nathan Laredo | 3931 | P: Nathan Laredo |
| @@ -4006,9 +4006,9 @@ T: git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git | |||
| 4006 | S: Maintained | 4006 | S: Maintained |
| 4007 | 4007 | ||
| 4008 | TI FLASH MEDIA INTERFACE DRIVER | 4008 | TI FLASH MEDIA INTERFACE DRIVER |
| 4009 | P: Alex Dubov | 4009 | P: Alex Dubov |
| 4010 | M: oakad@yahoo.com | 4010 | M: oakad@yahoo.com |
| 4011 | S: Maintained | 4011 | S: Maintained |
| 4012 | 4012 | ||
| 4013 | TI OMAP MMC INTERFACE DRIVER | 4013 | TI OMAP MMC INTERFACE DRIVER |
| 4014 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim | 4014 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim |
| @@ -4154,13 +4154,13 @@ USB BLOCK DRIVER (UB ub) | |||
| 4154 | P: Pete Zaitcev | 4154 | P: Pete Zaitcev |
| 4155 | M: zaitcev@redhat.com | 4155 | M: zaitcev@redhat.com |
| 4156 | L: linux-kernel@vger.kernel.org | 4156 | L: linux-kernel@vger.kernel.org |
| 4157 | L: linux-usb@vger.kernel.org | 4157 | L: linux-usb@vger.kernel.org |
| 4158 | S: Supported | 4158 | S: Supported |
| 4159 | 4159 | ||
| 4160 | USB CDC ETHERNET DRIVER | 4160 | USB CDC ETHERNET DRIVER |
| 4161 | P: Greg Kroah-Hartman | 4161 | P: Greg Kroah-Hartman |
| 4162 | M: greg@kroah.com | 4162 | M: greg@kroah.com |
| 4163 | L: linux-usb@vger.kernel.org | 4163 | L: linux-usb@vger.kernel.org |
| 4164 | S: Maintained | 4164 | S: Maintained |
| 4165 | W: http://www.kroah.com/linux-usb/ | 4165 | W: http://www.kroah.com/linux-usb/ |
| 4166 | 4166 | ||
| @@ -4187,13 +4187,13 @@ S: Maintained | |||
| 4187 | USB EHCI DRIVER | 4187 | USB EHCI DRIVER |
| 4188 | P: David Brownell | 4188 | P: David Brownell |
| 4189 | M: dbrownell@users.sourceforge.net | 4189 | M: dbrownell@users.sourceforge.net |
| 4190 | L: linux-usb@vger.kernel.org | 4190 | L: linux-usb@vger.kernel.org |
| 4191 | S: Odd Fixes | 4191 | S: Odd Fixes |
| 4192 | 4192 | ||
| 4193 | USB ET61X[12]51 DRIVER | 4193 | USB ET61X[12]51 DRIVER |
| 4194 | P: Luca Risolia | 4194 | P: Luca Risolia |
| 4195 | M: luca.risolia@studio.unibo.it | 4195 | M: luca.risolia@studio.unibo.it |
| 4196 | L: linux-usb@vger.kernel.org | 4196 | L: linux-usb@vger.kernel.org |
| 4197 | L: video4linux-list@redhat.com | 4197 | L: video4linux-list@redhat.com |
| 4198 | W: http://www.linux-projects.org | 4198 | W: http://www.linux-projects.org |
| 4199 | S: Maintained | 4199 | S: Maintained |
| @@ -4201,33 +4201,33 @@ S: Maintained | |||
| 4201 | USB GADGET/PERIPHERAL SUBSYSTEM | 4201 | USB GADGET/PERIPHERAL SUBSYSTEM |
| 4202 | P: David Brownell | 4202 | P: David Brownell |
| 4203 | M: dbrownell@users.sourceforge.net | 4203 | M: dbrownell@users.sourceforge.net |
| 4204 | L: linux-usb@vger.kernel.org | 4204 | L: linux-usb@vger.kernel.org |
| 4205 | W: http://www.linux-usb.org/gadget | 4205 | W: http://www.linux-usb.org/gadget |
| 4206 | S: Maintained | 4206 | S: Maintained |
| 4207 | 4207 | ||
| 4208 | USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) | 4208 | USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) |
| 4209 | P: Jiri Kosina | 4209 | P: Jiri Kosina |
| 4210 | M: jkosina@suse.cz | 4210 | M: jkosina@suse.cz |
| 4211 | L: linux-usb@vger.kernel.org | 4211 | L: linux-usb@vger.kernel.org |
| 4212 | T: git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git | 4212 | T: git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git |
| 4213 | S: Maintained | 4213 | S: Maintained |
| 4214 | 4214 | ||
| 4215 | USB ISP116X DRIVER | 4215 | USB ISP116X DRIVER |
| 4216 | P: Olav Kongas | 4216 | P: Olav Kongas |
| 4217 | M: ok@artecdesign.ee | 4217 | M: ok@artecdesign.ee |
| 4218 | L: linux-usb@vger.kernel.org | 4218 | L: linux-usb@vger.kernel.org |
| 4219 | S: Maintained | 4219 | S: Maintained |
| 4220 | 4220 | ||
| 4221 | USB KAWASAKI LSI DRIVER | 4221 | USB KAWASAKI LSI DRIVER |
| 4222 | P: Oliver Neukum | 4222 | P: Oliver Neukum |
| 4223 | M: oliver@neukum.name | 4223 | M: oliver@neukum.name |
| 4224 | L: linux-usb@vger.kernel.org | 4224 | L: linux-usb@vger.kernel.org |
| 4225 | S: Maintained | 4225 | S: Maintained |
| 4226 | 4226 | ||
| 4227 | USB MASS STORAGE DRIVER | 4227 | USB MASS STORAGE DRIVER |
| 4228 | P: Matthew Dharm | 4228 | P: Matthew Dharm |
| 4229 | M: mdharm-usb@one-eyed-alien.net | 4229 | M: mdharm-usb@one-eyed-alien.net |
| 4230 | L: linux-usb@vger.kernel.org | 4230 | L: linux-usb@vger.kernel.org |
| 4231 | L: usb-storage@lists.one-eyed-alien.net | 4231 | L: usb-storage@lists.one-eyed-alien.net |
| 4232 | S: Maintained | 4232 | S: Maintained |
| 4233 | W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ | 4233 | W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ |
| @@ -4235,26 +4235,26 @@ W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ | |||
| 4235 | USB OHCI DRIVER | 4235 | USB OHCI DRIVER |
| 4236 | P: David Brownell | 4236 | P: David Brownell |
| 4237 | M: dbrownell@users.sourceforge.net | 4237 | M: dbrownell@users.sourceforge.net |
| 4238 | L: linux-usb@vger.kernel.org | 4238 | L: linux-usb@vger.kernel.org |
| 4239 | S: Odd Fixes | 4239 | S: Odd Fixes |
| 4240 | 4240 | ||
| 4241 | USB OPTION-CARD DRIVER | 4241 | USB OPTION-CARD DRIVER |
| 4242 | P: Matthias Urlichs | 4242 | P: Matthias Urlichs |
| 4243 | M: smurf@smurf.noris.de | 4243 | M: smurf@smurf.noris.de |
| 4244 | L: linux-usb@vger.kernel.org | 4244 | L: linux-usb@vger.kernel.org |
| 4245 | S: Maintained | 4245 | S: Maintained |
| 4246 | 4246 | ||
| 4247 | USB OV511 DRIVER | 4247 | USB OV511 DRIVER |
| 4248 | P: Mark McClelland | 4248 | P: Mark McClelland |
| 4249 | M: mmcclell@bigfoot.com | 4249 | M: mmcclell@bigfoot.com |
| 4250 | L: linux-usb@vger.kernel.org | 4250 | L: linux-usb@vger.kernel.org |
| 4251 | W: http://alpha.dyndns.org/ov511/ | 4251 | W: http://alpha.dyndns.org/ov511/ |
| 4252 | S: Maintained | 4252 | S: Maintained |
| 4253 | 4253 | ||
| 4254 | USB PEGASUS DRIVER | 4254 | USB PEGASUS DRIVER |
| 4255 | P: Petko Manolov | 4255 | P: Petko Manolov |
| 4256 | M: petkan@users.sourceforge.net | 4256 | M: petkan@users.sourceforge.net |
| 4257 | L: linux-usb@vger.kernel.org | 4257 | L: linux-usb@vger.kernel.org |
| 4258 | L: netdev@vger.kernel.org | 4258 | L: netdev@vger.kernel.org |
| 4259 | W: http://pegasus2.sourceforge.net/ | 4259 | W: http://pegasus2.sourceforge.net/ |
| 4260 | S: Maintained | 4260 | S: Maintained |
| @@ -4262,13 +4262,13 @@ S: Maintained | |||
| 4262 | USB PRINTER DRIVER (usblp) | 4262 | USB PRINTER DRIVER (usblp) |
| 4263 | P: Pete Zaitcev | 4263 | P: Pete Zaitcev |
| 4264 | M: zaitcev@redhat.com | 4264 | M: zaitcev@redhat.com |
| 4265 | L: linux-usb@vger.kernel.org | 4265 | L: linux-usb@vger.kernel.org |
| 4266 | S: Supported | 4266 | S: Supported |
| 4267 | 4267 | ||
| 4268 | USB RTL8150 DRIVER | 4268 | USB RTL8150 DRIVER |
| 4269 | P: Petko Manolov | 4269 | P: Petko Manolov |
| 4270 | M: petkan@users.sourceforge.net | 4270 | M: petkan@users.sourceforge.net |
| 4271 | L: linux-usb@vger.kernel.org | 4271 | L: linux-usb@vger.kernel.org |
| 4272 | L: netdev@vger.kernel.org | 4272 | L: netdev@vger.kernel.org |
| 4273 | W: http://pegasus2.sourceforge.net/ | 4273 | W: http://pegasus2.sourceforge.net/ |
| 4274 | S: Maintained | 4274 | S: Maintained |
| @@ -4276,20 +4276,20 @@ S: Maintained | |||
| 4276 | USB SE401 DRIVER | 4276 | USB SE401 DRIVER |
| 4277 | P: Jeroen Vreeken | 4277 | P: Jeroen Vreeken |
| 4278 | M: pe1rxq@amsat.org | 4278 | M: pe1rxq@amsat.org |
| 4279 | L: linux-usb@vger.kernel.org | 4279 | L: linux-usb@vger.kernel.org |
| 4280 | W: http://www.chello.nl/~j.vreeken/se401/ | 4280 | W: http://www.chello.nl/~j.vreeken/se401/ |
| 4281 | S: Maintained | 4281 | S: Maintained |
| 4282 | 4282 | ||
| 4283 | USB SERIAL BELKIN F5U103 DRIVER | 4283 | USB SERIAL BELKIN F5U103 DRIVER |
| 4284 | P: William Greathouse | 4284 | P: William Greathouse |
| 4285 | M: wgreathouse@smva.com | 4285 | M: wgreathouse@smva.com |
| 4286 | L: linux-usb@vger.kernel.org | 4286 | L: linux-usb@vger.kernel.org |
| 4287 | S: Maintained | 4287 | S: Maintained |
| 4288 | 4288 | ||
| 4289 | USB SERIAL CYPRESS M8 DRIVER | 4289 | USB SERIAL CYPRESS M8 DRIVER |
| 4290 | P: Lonnie Mendez | 4290 | P: Lonnie Mendez |
| 4291 | M: dignome@gmail.com | 4291 | M: dignome@gmail.com |
| 4292 | L: linux-usb@vger.kernel.org | 4292 | L: linux-usb@vger.kernel.org |
| 4293 | S: Maintained | 4293 | S: Maintained |
| 4294 | W: http://geocities.com/i0xox0i | 4294 | W: http://geocities.com/i0xox0i |
| 4295 | W: http://firstlight.net/cvs | 4295 | W: http://firstlight.net/cvs |
| @@ -4304,39 +4304,39 @@ USB SERIAL DIGI ACCELEPORT DRIVER | |||
| 4304 | P: Peter Berger and Al Borchers | 4304 | P: Peter Berger and Al Borchers |
| 4305 | M: pberger@brimson.com | 4305 | M: pberger@brimson.com |
| 4306 | M: alborchers@steinerpoint.com | 4306 | M: alborchers@steinerpoint.com |
| 4307 | L: linux-usb@vger.kernel.org | 4307 | L: linux-usb@vger.kernel.org |
| 4308 | S: Maintained | 4308 | S: Maintained |
| 4309 | 4309 | ||
| 4310 | USB SERIAL DRIVER | 4310 | USB SERIAL DRIVER |
| 4311 | P: Greg Kroah-Hartman | 4311 | P: Greg Kroah-Hartman |
| 4312 | M: gregkh@suse.de | 4312 | M: gregkh@suse.de |
| 4313 | L: linux-usb@vger.kernel.org | 4313 | L: linux-usb@vger.kernel.org |
| 4314 | S: Supported | 4314 | S: Supported |
| 4315 | 4315 | ||
| 4316 | USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER | 4316 | USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER |
| 4317 | P: Gary Brubaker | 4317 | P: Gary Brubaker |
| 4318 | M: xavyer@ix.netcom.com | 4318 | M: xavyer@ix.netcom.com |
| 4319 | L: linux-usb@vger.kernel.org | 4319 | L: linux-usb@vger.kernel.org |
| 4320 | S: Maintained | 4320 | S: Maintained |
| 4321 | 4321 | ||
| 4322 | USB SERIAL KEYSPAN DRIVER | 4322 | USB SERIAL KEYSPAN DRIVER |
| 4323 | P: Greg Kroah-Hartman | 4323 | P: Greg Kroah-Hartman |
| 4324 | M: greg@kroah.com | 4324 | M: greg@kroah.com |
| 4325 | L: linux-usb@vger.kernel.org | 4325 | L: linux-usb@vger.kernel.org |
| 4326 | W: http://www.kroah.com/linux/ | 4326 | W: http://www.kroah.com/linux/ |
| 4327 | S: Maintained | 4327 | S: Maintained |
| 4328 | 4328 | ||
| 4329 | USB SERIAL WHITEHEAT DRIVER | 4329 | USB SERIAL WHITEHEAT DRIVER |
| 4330 | P: Support Department | 4330 | P: Support Department |
| 4331 | M: support@connecttech.com | 4331 | M: support@connecttech.com |
| 4332 | L: linux-usb@vger.kernel.org | 4332 | L: linux-usb@vger.kernel.org |
| 4333 | W: http://www.connecttech.com | 4333 | W: http://www.connecttech.com |
| 4334 | S: Supported | 4334 | S: Supported |
| 4335 | 4335 | ||
| 4336 | USB SN9C1xx DRIVER | 4336 | USB SN9C1xx DRIVER |
| 4337 | P: Luca Risolia | 4337 | P: Luca Risolia |
| 4338 | M: luca.risolia@studio.unibo.it | 4338 | M: luca.risolia@studio.unibo.it |
| 4339 | L: linux-usb@vger.kernel.org | 4339 | L: linux-usb@vger.kernel.org |
| 4340 | L: video4linux-list@redhat.com | 4340 | L: video4linux-list@redhat.com |
| 4341 | W: http://www.linux-projects.org | 4341 | W: http://www.linux-projects.org |
| 4342 | S: Maintained | 4342 | S: Maintained |
| @@ -4344,7 +4344,7 @@ S: Maintained | |||
| 4344 | USB SUBSYSTEM | 4344 | USB SUBSYSTEM |
| 4345 | P: Greg Kroah-Hartman | 4345 | P: Greg Kroah-Hartman |
| 4346 | M: gregkh@suse.de | 4346 | M: gregkh@suse.de |
| 4347 | L: linux-usb@vger.kernel.org | 4347 | L: linux-usb@vger.kernel.org |
| 4348 | W: http://www.linux-usb.org | 4348 | W: http://www.linux-usb.org |
| 4349 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 4349 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ |
| 4350 | S: Supported | 4350 | S: Supported |
| @@ -4352,7 +4352,7 @@ S: Supported | |||
| 4352 | USB UHCI DRIVER | 4352 | USB UHCI DRIVER |
| 4353 | P: Alan Stern | 4353 | P: Alan Stern |
| 4354 | M: stern@rowland.harvard.edu | 4354 | M: stern@rowland.harvard.edu |
| 4355 | L: linux-usb@vger.kernel.org | 4355 | L: linux-usb@vger.kernel.org |
| 4356 | S: Maintained | 4356 | S: Maintained |
| 4357 | 4357 | ||
| 4358 | USB "USBNET" DRIVER FRAMEWORK | 4358 | USB "USBNET" DRIVER FRAMEWORK |
| @@ -4365,7 +4365,7 @@ S: Maintained | |||
| 4365 | USB VIDEO CLASS | 4365 | USB VIDEO CLASS |
| 4366 | P: Laurent Pinchart | 4366 | P: Laurent Pinchart |
| 4367 | M: laurent.pinchart@skynet.be | 4367 | M: laurent.pinchart@skynet.be |
| 4368 | L: linx-uvc-devel@berlios.de | 4368 | L: linux-uvc-devel@lists.berlios.de |
| 4369 | L: video4linux-list@redhat.com | 4369 | L: video4linux-list@redhat.com |
| 4370 | W: http://linux-uvc.berlios.de | 4370 | W: http://linux-uvc.berlios.de |
| 4371 | S: Maintained | 4371 | S: Maintained |
| @@ -4373,7 +4373,7 @@ S: Maintained | |||
| 4373 | USB W996[87]CF DRIVER | 4373 | USB W996[87]CF DRIVER |
| 4374 | P: Luca Risolia | 4374 | P: Luca Risolia |
| 4375 | M: luca.risolia@studio.unibo.it | 4375 | M: luca.risolia@studio.unibo.it |
| 4376 | L: linux-usb@vger.kernel.org | 4376 | L: linux-usb@vger.kernel.org |
| 4377 | L: video4linux-list@redhat.com | 4377 | L: video4linux-list@redhat.com |
| 4378 | W: http://www.linux-projects.org | 4378 | W: http://www.linux-projects.org |
| 4379 | S: Maintained | 4379 | S: Maintained |
| @@ -4387,7 +4387,7 @@ S: Maintained | |||
| 4387 | USB ZC0301 DRIVER | 4387 | USB ZC0301 DRIVER |
| 4388 | P: Luca Risolia | 4388 | P: Luca Risolia |
| 4389 | M: luca.risolia@studio.unibo.it | 4389 | M: luca.risolia@studio.unibo.it |
| 4390 | L: linux-usb@vger.kernel.org | 4390 | L: linux-usb@vger.kernel.org |
| 4391 | L: video4linux-list@redhat.com | 4391 | L: video4linux-list@redhat.com |
| 4392 | W: http://www.linux-projects.org | 4392 | W: http://www.linux-projects.org |
| 4393 | S: Maintained | 4393 | S: Maintained |
| @@ -4395,14 +4395,14 @@ S: Maintained | |||
| 4395 | USB ZD1201 DRIVER | 4395 | USB ZD1201 DRIVER |
| 4396 | P: Jeroen Vreeken | 4396 | P: Jeroen Vreeken |
| 4397 | M: pe1rxq@amsat.org | 4397 | M: pe1rxq@amsat.org |
| 4398 | L: linux-usb@vger.kernel.org | 4398 | L: linux-usb@vger.kernel.org |
| 4399 | W: http://linux-lc100020.sourceforge.net | 4399 | W: http://linux-lc100020.sourceforge.net |
| 4400 | S: Maintained | 4400 | S: Maintained |
| 4401 | 4401 | ||
| 4402 | USB ZR364XX DRIVER | 4402 | USB ZR364XX DRIVER |
| 4403 | P: Antoine Jacquet | 4403 | P: Antoine Jacquet |
| 4404 | M: royale@zerezo.com | 4404 | M: royale@zerezo.com |
| 4405 | L: linux-usb@vger.kernel.org | 4405 | L: linux-usb@vger.kernel.org |
| 4406 | L: video4linux-list@redhat.com | 4406 | L: video4linux-list@redhat.com |
| 4407 | W: http://royale.zerezo.com/zr364xx/ | 4407 | W: http://royale.zerezo.com/zr364xx/ |
| 4408 | S: Maintained | 4408 | S: Maintained |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 27 | 3 | SUBLEVEL = 27 |
| 4 | EXTRAVERSION = -rc6 | 4 | EXTRAVERSION = -rc7 |
| 5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 721c03d53f4b..918d0cbbf064 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h | |||
| @@ -30,7 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
| 30 | * The networking and block device layers use this boolean for bounce | 30 | * The networking and block device layers use this boolean for bounce |
| 31 | * buffer decisions. | 31 | * buffer decisions. |
| 32 | */ | 32 | */ |
| 33 | #define PCI_DMA_BUS_IS_PHYS (0) | 33 | #define PCI_DMA_BUS_IS_PHYS (1) |
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * Whether pci_unmap_{single,page} is a nop depends upon the | 36 | * Whether pci_unmap_{single,page} is a nop depends upon the |
diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index 720c48b9ee04..aa2fc375a325 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c | |||
| @@ -70,9 +70,6 @@ void davinci_psc_config(unsigned int domain, unsigned int id, char enable) | |||
| 70 | { | 70 | { |
| 71 | u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask; | 71 | u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask; |
| 72 | 72 | ||
| 73 | if (id < 0) | ||
| 74 | return; | ||
| 75 | |||
| 76 | mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id); | 73 | mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id); |
| 77 | if (enable) | 74 | if (enable) |
| 78 | mdctl |= 0x00000003; /* Enable Module */ | 75 | mdctl |= 0x00000003; /* Enable Module */ |
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c index 0a152ed15a85..df8582a6231b 100644 --- a/arch/arm/mach-mx3/pcm037.c +++ b/arch/arm/mach-mx3/pcm037.c | |||
| @@ -54,7 +54,7 @@ static struct platform_device pcm037_flash = { | |||
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | static struct imxuart_platform_data uart_pdata = { | 56 | static struct imxuart_platform_data uart_pdata = { |
| 57 | .flags = 0, | 57 | .flags = IMXUART_HAVE_RTSCTS, |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | static struct platform_device *devices[] __initdata = { | 60 | static struct platform_device *devices[] __initdata = { |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 5dab30eafddc..9f3ef9eb32e3 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <asm/mach/sharpsl_param.h> | 50 | #include <asm/mach/sharpsl_param.h> |
| 51 | 51 | ||
| 52 | #include "generic.h" | 52 | #include "generic.h" |
| 53 | #include "clock.h" | ||
| 53 | #include "devices.h" | 54 | #include "devices.h" |
| 54 | 55 | ||
| 55 | static unsigned long tosa_pin_config[] = { | 56 | static unsigned long tosa_pin_config[] = { |
| @@ -521,6 +522,14 @@ static struct gpio_keys_button tosa_gpio_keys[] = { | |||
| 521 | .wakeup = 1, | 522 | .wakeup = 1, |
| 522 | .active_low = 1, | 523 | .active_low = 1, |
| 523 | }, | 524 | }, |
| 525 | { | ||
| 526 | .type = EV_SW, | ||
| 527 | .code = SW_HEADPHONE_INSERT, | ||
| 528 | .gpio = TOSA_GPIO_EAR_IN, | ||
| 529 | .desc = "HeadPhone insert", | ||
| 530 | .active_low = 1, | ||
| 531 | .debounce_interval = 300, | ||
| 532 | }, | ||
| 524 | }; | 533 | }; |
| 525 | 534 | ||
| 526 | static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = { | 535 | static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = { |
| @@ -792,6 +801,8 @@ static void __init tosa_init(void) | |||
| 792 | pxa_set_i2c_info(NULL); | 801 | pxa_set_i2c_info(NULL); |
| 793 | platform_scoop_config = &tosa_pcmcia_config; | 802 | platform_scoop_config = &tosa_pcmcia_config; |
| 794 | 803 | ||
| 804 | clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL); | ||
| 805 | |||
| 795 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 806 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 796 | } | 807 | } |
| 797 | 808 | ||
diff --git a/arch/arm/mach-sa1100/include/mach/jornada720.h b/arch/arm/mach-sa1100/include/mach/jornada720.h index bc120850d313..cc6b4bfcecf6 100644 --- a/arch/arm/mach-sa1100/include/mach/jornada720.h +++ b/arch/arm/mach-sa1100/include/mach/jornada720.h | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-sa1100/include/mach/jornada720.h | 2 | * arch/arm/mach-sa1100/include/mach/jornada720.h |
| 3 | * | 3 | * |
| 4 | * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 | 4 | * SSP/MCU communication definitions for HP Jornada 710/720/728 |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> | 6 | * Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> |
| 7 | * Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu> | 7 | * Copyright 2000 John Ankcorn <jca@lcs.mit.edu> |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| @@ -25,3 +25,8 @@ | |||
| 25 | #define PWMOFF 0xDF | 25 | #define PWMOFF 0xDF |
| 26 | #define TXDUMMY 0x11 | 26 | #define TXDUMMY 0x11 |
| 27 | #define ERRORCODE 0x00 | 27 | #define ERRORCODE 0x00 |
| 28 | |||
| 29 | extern void jornada_ssp_start(void); | ||
| 30 | extern void jornada_ssp_end(void); | ||
| 31 | extern int jornada_ssp_inout(u8 byte); | ||
| 32 | extern int jornada_ssp_byte(u8 byte); | ||
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 06ea7abd9170..28cf36967977 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
| @@ -21,8 +21,8 @@ | |||
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | 22 | ||
| 23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 24 | #include <asm/hardware/ssp.h> | ||
| 25 | #include <mach/jornada720.h> | 24 | #include <mach/jornada720.h> |
| 25 | #include <asm/hardware/ssp.h> | ||
| 26 | 26 | ||
| 27 | static DEFINE_SPINLOCK(jornada_ssp_lock); | 27 | static DEFINE_SPINLOCK(jornada_ssp_lock); |
| 28 | static unsigned long jornada_ssp_flags; | 28 | static unsigned long jornada_ssp_flags; |
| @@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout); | |||
| 109 | * jornada_ssp_start - enable mcu | 109 | * jornada_ssp_start - enable mcu |
| 110 | * | 110 | * |
| 111 | */ | 111 | */ |
| 112 | int jornada_ssp_start() | 112 | void jornada_ssp_start(void) |
| 113 | { | 113 | { |
| 114 | spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); | 114 | spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); |
| 115 | GPCR = GPIO_GPIO25; | 115 | GPCR = GPIO_GPIO25; |
| 116 | udelay(50); | 116 | udelay(50); |
| 117 | return 0; | 117 | return; |
| 118 | }; | 118 | }; |
| 119 | EXPORT_SYMBOL(jornada_ssp_start); | 119 | EXPORT_SYMBOL(jornada_ssp_start); |
| 120 | 120 | ||
| @@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start); | |||
| 122 | * jornada_ssp_end - disable mcu and turn off lock | 122 | * jornada_ssp_end - disable mcu and turn off lock |
| 123 | * | 123 | * |
| 124 | */ | 124 | */ |
| 125 | int jornada_ssp_end() | 125 | void jornada_ssp_end(void) |
| 126 | { | 126 | { |
| 127 | GPSR = GPIO_GPIO25; | 127 | GPSR = GPIO_GPIO25; |
| 128 | spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); | 128 | spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); |
| 129 | return 0; | 129 | return; |
| 130 | }; | 130 | }; |
| 131 | EXPORT_SYMBOL(jornada_ssp_end); | 131 | EXPORT_SYMBOL(jornada_ssp_end); |
| 132 | 132 | ||
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 187e3d8bfdfe..01da719a7453 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <mach/tc.h> | 22 | #include <mach/tc.h> |
| 23 | #include <mach/board.h> | 23 | #include <mach/board.h> |
| 24 | #include <mach/mmc.h> | ||
| 24 | #include <mach/mux.h> | 25 | #include <mach/mux.h> |
| 25 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
| 26 | #include <mach/menelaus.h> | 27 | #include <mach/menelaus.h> |
| @@ -194,25 +195,38 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, | |||
| 194 | 195 | ||
| 195 | /*-------------------------------------------------------------------------*/ | 196 | /*-------------------------------------------------------------------------*/ |
| 196 | 197 | ||
| 197 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) | 198 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ |
| 199 | defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) | ||
| 198 | 200 | ||
| 199 | #ifdef CONFIG_ARCH_OMAP24XX | 201 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) |
| 200 | #define OMAP_MMC1_BASE 0x4809c000 | 202 | #define OMAP_MMC1_BASE 0x4809c000 |
| 201 | #define OMAP_MMC1_INT INT_24XX_MMC_IRQ | 203 | #define OMAP_MMC1_END (OMAP_MMC1_BASE + 0x1fc) |
| 204 | #define OMAP_MMC1_INT INT_24XX_MMC_IRQ | ||
| 205 | |||
| 206 | #define OMAP_MMC2_BASE 0x480b4000 | ||
| 207 | #define OMAP_MMC2_END (OMAP_MMC2_BASE + 0x1fc) | ||
| 208 | #define OMAP_MMC2_INT INT_24XX_MMC2_IRQ | ||
| 209 | |||
| 202 | #else | 210 | #else |
| 211 | |||
| 203 | #define OMAP_MMC1_BASE 0xfffb7800 | 212 | #define OMAP_MMC1_BASE 0xfffb7800 |
| 213 | #define OMAP_MMC1_END (OMAP_MMC1_BASE + 0x7f) | ||
| 204 | #define OMAP_MMC1_INT INT_MMC | 214 | #define OMAP_MMC1_INT INT_MMC |
| 205 | #endif | 215 | |
| 206 | #define OMAP_MMC2_BASE 0xfffb7c00 /* omap16xx only */ | 216 | #define OMAP_MMC2_BASE 0xfffb7c00 /* omap16xx only */ |
| 217 | #define OMAP_MMC2_END (OMAP_MMC2_BASE + 0x7f) | ||
| 218 | #define OMAP_MMC2_INT INT_1610_MMC2 | ||
| 219 | |||
| 220 | #endif | ||
| 207 | 221 | ||
| 208 | static struct omap_mmc_conf mmc1_conf; | 222 | static struct omap_mmc_platform_data mmc1_data; |
| 209 | 223 | ||
| 210 | static u64 mmc1_dmamask = 0xffffffff; | 224 | static u64 mmc1_dmamask = 0xffffffff; |
| 211 | 225 | ||
| 212 | static struct resource mmc1_resources[] = { | 226 | static struct resource mmc1_resources[] = { |
| 213 | { | 227 | { |
| 214 | .start = OMAP_MMC1_BASE, | 228 | .start = OMAP_MMC1_BASE, |
| 215 | .end = OMAP_MMC1_BASE + 0x7f, | 229 | .end = OMAP_MMC1_END, |
| 216 | .flags = IORESOURCE_MEM, | 230 | .flags = IORESOURCE_MEM, |
| 217 | }, | 231 | }, |
| 218 | { | 232 | { |
| @@ -226,26 +240,27 @@ static struct platform_device mmc_omap_device1 = { | |||
| 226 | .id = 1, | 240 | .id = 1, |
| 227 | .dev = { | 241 | .dev = { |
| 228 | .dma_mask = &mmc1_dmamask, | 242 | .dma_mask = &mmc1_dmamask, |
| 229 | .platform_data = &mmc1_conf, | 243 | .platform_data = &mmc1_data, |
| 230 | }, | 244 | }, |
| 231 | .num_resources = ARRAY_SIZE(mmc1_resources), | 245 | .num_resources = ARRAY_SIZE(mmc1_resources), |
| 232 | .resource = mmc1_resources, | 246 | .resource = mmc1_resources, |
| 233 | }; | 247 | }; |
| 234 | 248 | ||
| 235 | #ifdef CONFIG_ARCH_OMAP16XX | 249 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \ |
| 250 | defined(CONFIG_ARCH_OMAP34XX) | ||
| 236 | 251 | ||
| 237 | static struct omap_mmc_conf mmc2_conf; | 252 | static struct omap_mmc_platform_data mmc2_data; |
| 238 | 253 | ||
| 239 | static u64 mmc2_dmamask = 0xffffffff; | 254 | static u64 mmc2_dmamask = 0xffffffff; |
| 240 | 255 | ||
| 241 | static struct resource mmc2_resources[] = { | 256 | static struct resource mmc2_resources[] = { |
| 242 | { | 257 | { |
| 243 | .start = OMAP_MMC2_BASE, | 258 | .start = OMAP_MMC2_BASE, |
| 244 | .end = OMAP_MMC2_BASE + 0x7f, | 259 | .end = OMAP_MMC2_END, |
| 245 | .flags = IORESOURCE_MEM, | 260 | .flags = IORESOURCE_MEM, |
| 246 | }, | 261 | }, |
| 247 | { | 262 | { |
| 248 | .start = INT_1610_MMC2, | 263 | .start = OMAP_MMC2_INT, |
| 249 | .flags = IORESOURCE_IRQ, | 264 | .flags = IORESOURCE_IRQ, |
| 250 | }, | 265 | }, |
| 251 | }; | 266 | }; |
| @@ -255,26 +270,19 @@ static struct platform_device mmc_omap_device2 = { | |||
| 255 | .id = 2, | 270 | .id = 2, |
| 256 | .dev = { | 271 | .dev = { |
| 257 | .dma_mask = &mmc2_dmamask, | 272 | .dma_mask = &mmc2_dmamask, |
| 258 | .platform_data = &mmc2_conf, | 273 | .platform_data = &mmc2_data, |
| 259 | }, | 274 | }, |
| 260 | .num_resources = ARRAY_SIZE(mmc2_resources), | 275 | .num_resources = ARRAY_SIZE(mmc2_resources), |
| 261 | .resource = mmc2_resources, | 276 | .resource = mmc2_resources, |
| 262 | }; | 277 | }; |
| 263 | #endif | 278 | #endif |
| 264 | 279 | ||
| 265 | static void __init omap_init_mmc(void) | 280 | static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf) |
| 266 | { | 281 | { |
| 267 | const struct omap_mmc_config *mmc_conf; | 282 | if (cpu_is_omap2430() || cpu_is_omap34xx()) |
| 268 | const struct omap_mmc_conf *mmc; | ||
| 269 | |||
| 270 | /* NOTE: assumes MMC was never (wrongly) enabled */ | ||
| 271 | mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config); | ||
| 272 | if (!mmc_conf) | ||
| 273 | return; | 283 | return; |
| 274 | 284 | ||
| 275 | /* block 1 is always available and has just one pinout option */ | 285 | if (mmc_conf->mmc[0].enabled) { |
| 276 | mmc = &mmc_conf->mmc[0]; | ||
| 277 | if (mmc->enabled) { | ||
| 278 | if (cpu_is_omap24xx()) { | 286 | if (cpu_is_omap24xx()) { |
| 279 | omap_cfg_reg(H18_24XX_MMC_CMD); | 287 | omap_cfg_reg(H18_24XX_MMC_CMD); |
| 280 | omap_cfg_reg(H15_24XX_MMC_CLKI); | 288 | omap_cfg_reg(H15_24XX_MMC_CLKI); |
| @@ -292,7 +300,7 @@ static void __init omap_init_mmc(void) | |||
| 292 | omap_cfg_reg(P20_1710_MMC_DATDIR0); | 300 | omap_cfg_reg(P20_1710_MMC_DATDIR0); |
| 293 | } | 301 | } |
| 294 | } | 302 | } |
| 295 | if (mmc->wire4) { | 303 | if (mmc_conf->mmc[0].wire4) { |
| 296 | if (cpu_is_omap24xx()) { | 304 | if (cpu_is_omap24xx()) { |
| 297 | omap_cfg_reg(H14_24XX_MMC_DAT1); | 305 | omap_cfg_reg(H14_24XX_MMC_DAT1); |
| 298 | omap_cfg_reg(E19_24XX_MMC_DAT2); | 306 | omap_cfg_reg(E19_24XX_MMC_DAT2); |
| @@ -303,25 +311,22 @@ static void __init omap_init_mmc(void) | |||
| 303 | } else { | 311 | } else { |
| 304 | omap_cfg_reg(MMC_DAT1); | 312 | omap_cfg_reg(MMC_DAT1); |
| 305 | /* NOTE: DAT2 can be on W10 (here) or M15 */ | 313 | /* NOTE: DAT2 can be on W10 (here) or M15 */ |
| 306 | if (!mmc->nomux) | 314 | if (!mmc_conf->mmc[0].nomux) |
| 307 | omap_cfg_reg(MMC_DAT2); | 315 | omap_cfg_reg(MMC_DAT2); |
| 308 | omap_cfg_reg(MMC_DAT3); | 316 | omap_cfg_reg(MMC_DAT3); |
| 309 | } | 317 | } |
| 310 | } | 318 | } |
| 311 | mmc1_conf = *mmc; | ||
| 312 | (void) platform_device_register(&mmc_omap_device1); | ||
| 313 | } | 319 | } |
| 314 | 320 | ||
| 315 | #ifdef CONFIG_ARCH_OMAP16XX | 321 | #ifdef CONFIG_ARCH_OMAP16XX |
| 316 | /* block 2 is on newer chips, and has many pinout options */ | 322 | /* block 2 is on newer chips, and has many pinout options */ |
| 317 | mmc = &mmc_conf->mmc[1]; | 323 | if (mmc_conf->mmc[1].enabled) { |
| 318 | if (mmc->enabled) { | 324 | if (!mmc_conf->mmc[1].nomux) { |
| 319 | if (!mmc->nomux) { | ||
| 320 | omap_cfg_reg(Y8_1610_MMC2_CMD); | 325 | omap_cfg_reg(Y8_1610_MMC2_CMD); |
| 321 | omap_cfg_reg(Y10_1610_MMC2_CLK); | 326 | omap_cfg_reg(Y10_1610_MMC2_CLK); |
| 322 | omap_cfg_reg(R18_1610_MMC2_CLKIN); | 327 | omap_cfg_reg(R18_1610_MMC2_CLKIN); |
| 323 | omap_cfg_reg(W8_1610_MMC2_DAT0); | 328 | omap_cfg_reg(W8_1610_MMC2_DAT0); |
| 324 | if (mmc->wire4) { | 329 | if (mmc_conf->mmc[1].wire4) { |
| 325 | omap_cfg_reg(V8_1610_MMC2_DAT1); | 330 | omap_cfg_reg(V8_1610_MMC2_DAT1); |
| 326 | omap_cfg_reg(W15_1610_MMC2_DAT2); | 331 | omap_cfg_reg(W15_1610_MMC2_DAT2); |
| 327 | omap_cfg_reg(R10_1610_MMC2_DAT3); | 332 | omap_cfg_reg(R10_1610_MMC2_DAT3); |
| @@ -337,14 +342,55 @@ static void __init omap_init_mmc(void) | |||
| 337 | if (cpu_is_omap1710()) | 342 | if (cpu_is_omap1710()) |
| 338 | omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24), | 343 | omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24), |
| 339 | MOD_CONF_CTRL_1); | 344 | MOD_CONF_CTRL_1); |
| 340 | mmc2_conf = *mmc; | 345 | } |
| 346 | #endif | ||
| 347 | } | ||
| 348 | |||
| 349 | static void __init omap_init_mmc(void) | ||
| 350 | { | ||
| 351 | const struct omap_mmc_config *mmc_conf; | ||
| 352 | |||
| 353 | /* NOTE: assumes MMC was never (wrongly) enabled */ | ||
| 354 | mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config); | ||
| 355 | if (!mmc_conf) | ||
| 356 | return; | ||
| 357 | |||
| 358 | omap_init_mmc_conf(mmc_conf); | ||
| 359 | |||
| 360 | if (mmc_conf->mmc[0].enabled) { | ||
| 361 | mmc1_data.conf = mmc_conf->mmc[0]; | ||
| 362 | (void) platform_device_register(&mmc_omap_device1); | ||
| 363 | } | ||
| 364 | |||
| 365 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \ | ||
| 366 | defined(CONFIG_ARCH_OMAP34XX) | ||
| 367 | if (mmc_conf->mmc[1].enabled) { | ||
| 368 | mmc2_data.conf = mmc_conf->mmc[1]; | ||
| 341 | (void) platform_device_register(&mmc_omap_device2); | 369 | (void) platform_device_register(&mmc_omap_device2); |
| 342 | } | 370 | } |
| 343 | #endif | 371 | #endif |
| 344 | return; | ||
| 345 | } | 372 | } |
| 373 | |||
| 374 | void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) | ||
| 375 | { | ||
| 376 | switch (host) { | ||
| 377 | case 1: | ||
| 378 | mmc1_data = *info; | ||
| 379 | break; | ||
| 380 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \ | ||
| 381 | defined(CONFIG_ARCH_OMAP34XX) | ||
| 382 | case 2: | ||
| 383 | mmc2_data = *info; | ||
| 384 | break; | ||
| 385 | #endif | ||
| 386 | default: | ||
| 387 | BUG(); | ||
| 388 | } | ||
| 389 | } | ||
| 390 | |||
| 346 | #else | 391 | #else |
| 347 | static inline void omap_init_mmc(void) {} | 392 | static inline void omap_init_mmc(void) {} |
| 393 | void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) {} | ||
| 348 | #endif | 394 | #endif |
| 349 | 395 | ||
| 350 | /*-------------------------------------------------------------------------*/ | 396 | /*-------------------------------------------------------------------------*/ |
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index ee4c292683e1..dfc3443e23aa 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c | |||
| @@ -325,7 +325,7 @@ static int __init atstk1002_init(void) | |||
| 325 | #ifdef CONFIG_BOARD_ATSTK100X_SPI1 | 325 | #ifdef CONFIG_BOARD_ATSTK100X_SPI1 |
| 326 | at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); | 326 | at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); |
| 327 | #endif | 327 | #endif |
| 328 | #ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM | 328 | #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM |
| 329 | at32_add_device_mci(0, MCI_PDATA); | 329 | at32_add_device_mci(0, MCI_PDATA); |
| 330 | #endif | 330 | #endif |
| 331 | #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM | 331 | #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM |
diff --git a/arch/avr32/boot/images/.gitignore b/arch/avr32/boot/images/.gitignore new file mode 100644 index 000000000000..64ea9d0141d2 --- /dev/null +++ b/arch/avr32/boot/images/.gitignore | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | uImage | ||
| 2 | uImage.srec | ||
| 3 | vmlinux.cso | ||
| 4 | sfdwarf.log | ||
diff --git a/arch/avr32/kernel/.gitignore b/arch/avr32/kernel/.gitignore new file mode 100644 index 000000000000..c5f676c3c224 --- /dev/null +++ b/arch/avr32/kernel/.gitignore | |||
| @@ -0,0 +1 @@ | |||
| vmlinux.lds | |||
diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c index 84a7d44edc67..11e310c567a9 100644 --- a/arch/avr32/kernel/avr32_ksyms.c +++ b/arch/avr32/kernel/avr32_ksyms.c | |||
| @@ -58,6 +58,7 @@ EXPORT_SYMBOL(find_first_zero_bit); | |||
| 58 | EXPORT_SYMBOL(find_next_zero_bit); | 58 | EXPORT_SYMBOL(find_next_zero_bit); |
| 59 | EXPORT_SYMBOL(find_first_bit); | 59 | EXPORT_SYMBOL(find_first_bit); |
| 60 | EXPORT_SYMBOL(find_next_bit); | 60 | EXPORT_SYMBOL(find_next_bit); |
| 61 | EXPORT_SYMBOL(generic_find_next_le_bit); | ||
| 61 | EXPORT_SYMBOL(generic_find_next_zero_le_bit); | 62 | EXPORT_SYMBOL(generic_find_next_zero_le_bit); |
| 62 | 63 | ||
| 63 | /* I/O primitives (lib/io-*.S) */ | 64 | /* I/O primitives (lib/io-*.S) */ |
diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S index 890286a1e62b..673178e235f3 100644 --- a/arch/avr32/kernel/syscall-stubs.S +++ b/arch/avr32/kernel/syscall-stubs.S | |||
| @@ -109,3 +109,12 @@ __sys_epoll_pwait: | |||
| 109 | rcall sys_epoll_pwait | 109 | rcall sys_epoll_pwait |
| 110 | sub sp, -4 | 110 | sub sp, -4 |
| 111 | popm pc | 111 | popm pc |
| 112 | |||
| 113 | .global __sys_sync_file_range | ||
| 114 | .type __sys_sync_file_range,@function | ||
| 115 | __sys_sync_file_range: | ||
| 116 | pushm lr | ||
| 117 | st.w --sp, ARG6 | ||
| 118 | rcall sys_sync_file_range | ||
| 119 | sub sp, -4 | ||
| 120 | popm pc | ||
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index 478bda4c4a09..7ee0057613b3 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/arch/avr32/kernel/syscall_table.S | |||
| @@ -275,7 +275,7 @@ sys_call_table: | |||
| 275 | .long sys_set_robust_list | 275 | .long sys_set_robust_list |
| 276 | .long sys_get_robust_list /* 260 */ | 276 | .long sys_get_robust_list /* 260 */ |
| 277 | .long __sys_splice | 277 | .long __sys_splice |
| 278 | .long sys_sync_file_range | 278 | .long __sys_sync_file_range |
| 279 | .long sys_tee | 279 | .long sys_tee |
| 280 | .long sys_vmsplice | 280 | .long sys_vmsplice |
| 281 | .long __sys_epoll_pwait /* 265 */ | 281 | .long __sys_epoll_pwait /* 265 */ |
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c index b835c4c01368..0d987373bc01 100644 --- a/arch/avr32/kernel/traps.c +++ b/arch/avr32/kernel/traps.c | |||
| @@ -116,15 +116,15 @@ asmlinkage void do_nmi(unsigned long ecr, struct pt_regs *regs) | |||
| 116 | switch (ret) { | 116 | switch (ret) { |
| 117 | case NOTIFY_OK: | 117 | case NOTIFY_OK: |
| 118 | case NOTIFY_STOP: | 118 | case NOTIFY_STOP: |
| 119 | return; | 119 | break; |
| 120 | case NOTIFY_BAD: | 120 | case NOTIFY_BAD: |
| 121 | die("Fatal Non-Maskable Interrupt", regs, SIGINT); | 121 | die("Fatal Non-Maskable Interrupt", regs, SIGINT); |
| 122 | default: | 122 | default: |
| 123 | printk(KERN_ALERT "Got NMI, but nobody cared. Disabling...\n"); | ||
| 124 | nmi_disable(); | ||
| 123 | break; | 125 | break; |
| 124 | } | 126 | } |
| 125 | 127 | nmi_exit(); | |
| 126 | printk(KERN_ALERT "Got NMI, but nobody cared. Disabling...\n"); | ||
| 127 | nmi_disable(); | ||
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | asmlinkage void do_critical_exception(unsigned long ecr, struct pt_regs *regs) | 130 | asmlinkage void do_critical_exception(unsigned long ecr, struct pt_regs *regs) |
diff --git a/arch/avr32/lib/findbit.S b/arch/avr32/lib/findbit.S index c6b91dee857c..997b33b2288a 100644 --- a/arch/avr32/lib/findbit.S +++ b/arch/avr32/lib/findbit.S | |||
| @@ -123,6 +123,36 @@ ENTRY(find_next_bit) | |||
| 123 | brgt 1b | 123 | brgt 1b |
| 124 | retal r11 | 124 | retal r11 |
| 125 | 125 | ||
| 126 | ENTRY(generic_find_next_le_bit) | ||
| 127 | lsr r8, r10, 5 | ||
| 128 | sub r9, r11, r10 | ||
| 129 | retle r11 | ||
| 130 | |||
| 131 | lsl r8, 2 | ||
| 132 | add r12, r8 | ||
| 133 | andl r10, 31, COH | ||
| 134 | breq 1f | ||
| 135 | |||
| 136 | /* offset is not word-aligned. Handle the first (32 - r10) bits */ | ||
| 137 | ldswp.w r8, r12[0] | ||
| 138 | sub r12, -4 | ||
| 139 | lsr r8, r8, r10 | ||
| 140 | brne .L_found | ||
| 141 | |||
| 142 | /* r9 = r9 - (32 - r10) = r9 + r10 - 32 */ | ||
| 143 | add r9, r10 | ||
| 144 | sub r9, 32 | ||
| 145 | retle r11 | ||
| 146 | |||
| 147 | /* Main loop. offset must be word-aligned */ | ||
| 148 | 1: ldswp.w r8, r12[0] | ||
| 149 | cp.w r8, 0 | ||
| 150 | brne .L_found | ||
| 151 | sub r12, -4 | ||
| 152 | sub r9, 32 | ||
| 153 | brgt 1b | ||
| 154 | retal r11 | ||
| 155 | |||
| 126 | ENTRY(generic_find_next_zero_le_bit) | 156 | ENTRY(generic_find_next_zero_le_bit) |
| 127 | lsr r8, r10, 5 | 157 | lsr r8, r10, 5 |
| 128 | sub r9, r11, r10 | 158 | sub r9, r11, r10 |
diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h index 5e0c1a6bce8d..2acb6b6543c9 100644 --- a/arch/ia64/include/asm/elf.h +++ b/arch/ia64/include/asm/elf.h | |||
| @@ -266,4 +266,19 @@ do { \ | |||
| 266 | } \ | 266 | } \ |
| 267 | } while (0) | 267 | } while (0) |
| 268 | 268 | ||
| 269 | /* | ||
| 270 | * format for entries in the Global Offset Table | ||
| 271 | */ | ||
| 272 | struct got_entry { | ||
| 273 | uint64_t val; | ||
| 274 | }; | ||
| 275 | |||
| 276 | /* | ||
| 277 | * Layout of the Function Descriptor | ||
| 278 | */ | ||
| 279 | struct fdesc { | ||
| 280 | uint64_t ip; | ||
| 281 | uint64_t gp; | ||
| 282 | }; | ||
| 283 | |||
| 269 | #endif /* _ASM_IA64_ELF_H */ | 284 | #endif /* _ASM_IA64_ELF_H */ |
diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h index a7acad2bc2f0..f66799891036 100644 --- a/arch/ia64/include/asm/sections.h +++ b/arch/ia64/include/asm/sections.h | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/elf.h> | ||
| 10 | #include <linux/uaccess.h> | ||
| 9 | #include <asm-generic/sections.h> | 11 | #include <asm-generic/sections.h> |
| 10 | 12 | ||
| 11 | extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[]; | 13 | extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[]; |
| @@ -22,7 +24,16 @@ extern char __start_unwind[], __end_unwind[]; | |||
| 22 | extern char __start_ivt_text[], __end_ivt_text[]; | 24 | extern char __start_ivt_text[], __end_ivt_text[]; |
| 23 | 25 | ||
| 24 | #undef dereference_function_descriptor | 26 | #undef dereference_function_descriptor |
| 25 | void *dereference_function_descriptor(void *); | 27 | static inline void *dereference_function_descriptor(void *ptr) |
| 28 | { | ||
| 29 | struct fdesc *desc = ptr; | ||
| 30 | void *p; | ||
| 31 | |||
| 32 | if (!probe_kernel_address(&desc->ip, p)) | ||
| 33 | ptr = p; | ||
| 34 | return ptr; | ||
| 35 | } | ||
| 36 | |||
| 26 | 37 | ||
| 27 | #endif /* _ASM_IA64_SECTIONS_H */ | 38 | #endif /* _ASM_IA64_SECTIONS_H */ |
| 28 | 39 | ||
diff --git a/arch/ia64/include/asm/sn/bte.h b/arch/ia64/include/asm/sn/bte.h index a0d214f43115..5efecf06c9a4 100644 --- a/arch/ia64/include/asm/sn/bte.h +++ b/arch/ia64/include/asm/sn/bte.h | |||
| @@ -223,10 +223,11 @@ extern void bte_error_handler(unsigned long); | |||
| 223 | * until the transfer is complete. In order to get the asynch | 223 | * until the transfer is complete. In order to get the asynch |
| 224 | * version of bte_copy, you must perform this check yourself. | 224 | * version of bte_copy, you must perform this check yourself. |
| 225 | */ | 225 | */ |
| 226 | #define BTE_UNALIGNED_COPY(src, dest, len, mode) \ | 226 | #define BTE_UNALIGNED_COPY(src, dest, len, mode) \ |
| 227 | (((len & L1_CACHE_MASK) || (src & L1_CACHE_MASK) || \ | 227 | (((len & (L1_CACHE_BYTES - 1)) || \ |
| 228 | (dest & L1_CACHE_MASK)) ? \ | 228 | (src & (L1_CACHE_BYTES - 1)) || \ |
| 229 | bte_unaligned_copy(src, dest, len, mode) : \ | 229 | (dest & (L1_CACHE_BYTES - 1))) ? \ |
| 230 | bte_unaligned_copy(src, dest, len, mode) : \ | ||
| 230 | bte_copy(src, dest, len, mode, NULL)) | 231 | bte_copy(src, dest, len, mode, NULL)) |
| 231 | 232 | ||
| 232 | 233 | ||
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 545626f66a4c..aaa7d901521f 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c | |||
| @@ -31,11 +31,9 @@ | |||
| 31 | #include <linux/elf.h> | 31 | #include <linux/elf.h> |
| 32 | #include <linux/moduleloader.h> | 32 | #include <linux/moduleloader.h> |
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/uaccess.h> | ||
| 35 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
| 36 | 35 | ||
| 37 | #include <asm/patch.h> | 36 | #include <asm/patch.h> |
| 38 | #include <asm/sections.h> | ||
| 39 | #include <asm/unaligned.h> | 37 | #include <asm/unaligned.h> |
| 40 | 38 | ||
| 41 | #define ARCH_MODULE_DEBUG 0 | 39 | #define ARCH_MODULE_DEBUG 0 |
| @@ -137,15 +135,6 @@ static const char *reloc_name[256] = { | |||
| 137 | 135 | ||
| 138 | #undef N | 136 | #undef N |
| 139 | 137 | ||
| 140 | struct got_entry { | ||
| 141 | uint64_t val; | ||
| 142 | }; | ||
| 143 | |||
| 144 | struct fdesc { | ||
| 145 | uint64_t ip; | ||
| 146 | uint64_t gp; | ||
| 147 | }; | ||
| 148 | |||
| 149 | /* Opaque struct for insns, to protect against derefs. */ | 138 | /* Opaque struct for insns, to protect against derefs. */ |
| 150 | struct insn; | 139 | struct insn; |
| 151 | 140 | ||
| @@ -943,13 +932,3 @@ module_arch_cleanup (struct module *mod) | |||
| 943 | if (mod->arch.core_unw_table) | 932 | if (mod->arch.core_unw_table) |
| 944 | unw_remove_unwind_table(mod->arch.core_unw_table); | 933 | unw_remove_unwind_table(mod->arch.core_unw_table); |
| 945 | } | 934 | } |
| 946 | |||
| 947 | void *dereference_function_descriptor(void *ptr) | ||
| 948 | { | ||
| 949 | struct fdesc *desc = ptr; | ||
| 950 | void *p; | ||
| 951 | |||
| 952 | if (!probe_kernel_address(&desc->ip, p)) | ||
| 953 | ptr = p; | ||
| 954 | return ptr; | ||
| 955 | } | ||
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index bcea81e432fd..d8f05e504fbf 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -741,16 +741,14 @@ int __cpu_disable(void) | |||
| 741 | return -EBUSY; | 741 | return -EBUSY; |
| 742 | } | 742 | } |
| 743 | 743 | ||
| 744 | cpu_clear(cpu, cpu_online_map); | ||
| 745 | |||
| 746 | if (migrate_platform_irqs(cpu)) { | 744 | if (migrate_platform_irqs(cpu)) { |
| 747 | cpu_set(cpu, cpu_online_map); | 745 | cpu_set(cpu, cpu_online_map); |
| 748 | return (-EBUSY); | 746 | return (-EBUSY); |
| 749 | } | 747 | } |
| 750 | 748 | ||
| 751 | remove_siblinginfo(cpu); | 749 | remove_siblinginfo(cpu); |
| 752 | cpu_clear(cpu, cpu_online_map); | ||
| 753 | fixup_irqs(); | 750 | fixup_irqs(); |
| 751 | cpu_clear(cpu, cpu_online_map); | ||
| 754 | local_flush_tlb_all(); | 752 | local_flush_tlb_all(); |
| 755 | cpu_clear(cpu, cpu_callin_map); | 753 | cpu_clear(cpu, cpu_callin_map); |
| 756 | return 0; | 754 | return 0; |
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 7a37d06376be..cd0d1a7284b7 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <asm/cacheflush.h> | 38 | #include <asm/cacheflush.h> |
| 39 | #include <asm/div64.h> | 39 | #include <asm/div64.h> |
| 40 | #include <asm/tlb.h> | 40 | #include <asm/tlb.h> |
| 41 | #include <asm/elf.h> | ||
| 41 | 42 | ||
| 42 | #include "misc.h" | 43 | #include "misc.h" |
| 43 | #include "vti.h" | 44 | #include "vti.h" |
| @@ -61,12 +62,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { | |||
| 61 | { NULL } | 62 | { NULL } |
| 62 | }; | 63 | }; |
| 63 | 64 | ||
| 64 | |||
| 65 | struct fdesc{ | ||
| 66 | unsigned long ip; | ||
| 67 | unsigned long gp; | ||
| 68 | }; | ||
| 69 | |||
| 70 | static void kvm_flush_icache(unsigned long start, unsigned long len) | 65 | static void kvm_flush_icache(unsigned long start, unsigned long len) |
| 71 | { | 66 | { |
| 72 | int l; | 67 | int l; |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 529462c01570..79165122501c 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
| @@ -420,8 +420,10 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size) | |||
| 420 | entry = find_next_zero_bit(map, mapsize, last_entry); | 420 | entry = find_next_zero_bit(map, mapsize, last_entry); |
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | if (entry > mapsize) | 423 | if (entry > mapsize) { |
| 424 | kfree(ca_dmamap); | ||
| 424 | goto map_return; | 425 | goto map_return; |
| 426 | } | ||
| 425 | 427 | ||
| 426 | for (i = 0; i < entries; i++) | 428 | for (i = 0; i < entries; i++) |
| 427 | set_bit(entry + i, map); | 429 | set_bit(entry + i, map); |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 8e2a0f5faf53..8bd61a640fc9 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:00 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -166,10 +172,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 166 | CONFIG_ZONE_DMA=y | 172 | CONFIG_ZONE_DMA=y |
| 167 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 173 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 168 | CONFIG_ZORRO_NAMES=y | 174 | CONFIG_ZORRO_NAMES=y |
| 169 | |||
| 170 | # | ||
| 171 | # Networking | ||
| 172 | # | ||
| 173 | CONFIG_NET=y | 175 | CONFIG_NET=y |
| 174 | 176 | ||
| 175 | # | 177 | # |
| @@ -183,6 +185,7 @@ CONFIG_XFRM=y | |||
| 183 | # CONFIG_XFRM_SUB_POLICY is not set | 185 | # CONFIG_XFRM_SUB_POLICY is not set |
| 184 | CONFIG_XFRM_MIGRATE=y | 186 | CONFIG_XFRM_MIGRATE=y |
| 185 | # CONFIG_XFRM_STATISTICS is not set | 187 | # CONFIG_XFRM_STATISTICS is not set |
| 188 | CONFIG_XFRM_IPCOMP=m | ||
| 186 | CONFIG_NET_KEY=y | 189 | CONFIG_NET_KEY=y |
| 187 | CONFIG_NET_KEY_MIGRATE=y | 190 | CONFIG_NET_KEY_MIGRATE=y |
| 188 | CONFIG_INET=y | 191 | CONFIG_INET=y |
| @@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 413 | # | 416 | # |
| 414 | # CONFIG_CFG80211 is not set | 417 | # CONFIG_CFG80211 is not set |
| 415 | CONFIG_WIRELESS_EXT=y | 418 | CONFIG_WIRELESS_EXT=y |
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 416 | # CONFIG_MAC80211 is not set | 420 | # CONFIG_MAC80211 is not set |
| 417 | CONFIG_IEEE80211=m | 421 | CONFIG_IEEE80211=m |
| 418 | # CONFIG_IEEE80211_DEBUG is not set | 422 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 433 | CONFIG_STANDALONE=y | 437 | CONFIG_STANDALONE=y |
| 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 438 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 435 | CONFIG_FW_LOADER=m | 439 | CONFIG_FW_LOADER=y |
| 440 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 441 | CONFIG_EXTRA_FIRMWARE="" | ||
| 436 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
| 437 | CONFIG_CONNECTOR=m | 443 | CONFIG_CONNECTOR=m |
| 438 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
| @@ -460,6 +466,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 460 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 466 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 461 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 467 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 462 | CONFIG_ATA_OVER_ETH=m | 468 | CONFIG_ATA_OVER_ETH=m |
| 469 | # CONFIG_BLK_DEV_HD is not set | ||
| 463 | CONFIG_MISC_DEVICES=y | 470 | CONFIG_MISC_DEVICES=y |
| 464 | # CONFIG_EEPROM_93CX6 is not set | 471 | # CONFIG_EEPROM_93CX6 is not set |
| 465 | # CONFIG_ENCLOSURE_SERVICES is not set | 472 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -470,6 +477,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 470 | # | 477 | # |
| 471 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 478 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 472 | # | 479 | # |
| 480 | CONFIG_IDE_ATAPI=y | ||
| 473 | # CONFIG_BLK_DEV_IDE_SATA is not set | 481 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 474 | CONFIG_BLK_DEV_IDEDISK=y | 482 | CONFIG_BLK_DEV_IDEDISK=y |
| 475 | # CONFIG_IDEDISK_MULTI_MODE is not set | 483 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -489,8 +497,6 @@ CONFIG_BLK_DEV_GAYLE=y | |||
| 489 | CONFIG_BLK_DEV_IDEDOUBLER=y | 497 | CONFIG_BLK_DEV_IDEDOUBLER=y |
| 490 | CONFIG_BLK_DEV_BUDDHA=y | 498 | CONFIG_BLK_DEV_BUDDHA=y |
| 491 | # CONFIG_BLK_DEV_IDEDMA is not set | 499 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 492 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 493 | # CONFIG_BLK_DEV_HD is not set | ||
| 494 | 500 | ||
| 495 | # | 501 | # |
| 496 | # SCSI device support | 502 | # SCSI device support |
| @@ -556,6 +562,7 @@ CONFIG_A2091_SCSI=y | |||
| 556 | CONFIG_GVP11_SCSI=y | 562 | CONFIG_GVP11_SCSI=y |
| 557 | CONFIG_SCSI_A4000T=y | 563 | CONFIG_SCSI_A4000T=y |
| 558 | CONFIG_SCSI_ZORRO7XX=y | 564 | CONFIG_SCSI_ZORRO7XX=y |
| 565 | # CONFIG_SCSI_DH is not set | ||
| 559 | CONFIG_MD=y | 566 | CONFIG_MD=y |
| 560 | CONFIG_BLK_DEV_MD=m | 567 | CONFIG_BLK_DEV_MD=m |
| 561 | CONFIG_MD_LINEAR=m | 568 | CONFIG_MD_LINEAR=m |
| @@ -564,7 +571,7 @@ CONFIG_MD_RAID1=m | |||
| 564 | # CONFIG_MD_RAID10 is not set | 571 | # CONFIG_MD_RAID10 is not set |
| 565 | CONFIG_MD_RAID456=m | 572 | CONFIG_MD_RAID456=m |
| 566 | CONFIG_MD_RAID5_RESHAPE=y | 573 | CONFIG_MD_RAID5_RESHAPE=y |
| 567 | CONFIG_MD_MULTIPATH=m | 574 | # CONFIG_MD_MULTIPATH is not set |
| 568 | # CONFIG_MD_FAULTY is not set | 575 | # CONFIG_MD_FAULTY is not set |
| 569 | CONFIG_BLK_DEV_DM=m | 576 | CONFIG_BLK_DEV_DM=m |
| 570 | # CONFIG_DM_DEBUG is not set | 577 | # CONFIG_DM_DEBUG is not set |
| @@ -573,13 +580,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 573 | CONFIG_DM_MIRROR=m | 580 | CONFIG_DM_MIRROR=m |
| 574 | CONFIG_DM_ZERO=m | 581 | CONFIG_DM_ZERO=m |
| 575 | CONFIG_DM_MULTIPATH=m | 582 | CONFIG_DM_MULTIPATH=m |
| 576 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 577 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 578 | CONFIG_DM_MULTIPATH_HP=m | ||
| 579 | # CONFIG_DM_DELAY is not set | 583 | # CONFIG_DM_DELAY is not set |
| 580 | CONFIG_DM_UEVENT=y | 584 | CONFIG_DM_UEVENT=y |
| 581 | CONFIG_NETDEVICES=y | 585 | CONFIG_NETDEVICES=y |
| 582 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 583 | CONFIG_DUMMY=m | 586 | CONFIG_DUMMY=m |
| 584 | # CONFIG_BONDING is not set | 587 | # CONFIG_BONDING is not set |
| 585 | CONFIG_MACVLAN=m | 588 | CONFIG_MACVLAN=m |
| @@ -722,6 +725,7 @@ CONFIG_INPUT_M68K_BEEP=m | |||
| 722 | # Character devices | 725 | # Character devices |
| 723 | # | 726 | # |
| 724 | CONFIG_VT=y | 727 | CONFIG_VT=y |
| 728 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 725 | CONFIG_VT_CONSOLE=y | 729 | CONFIG_VT_CONSOLE=y |
| 726 | CONFIG_HW_CONSOLE=y | 730 | CONFIG_HW_CONSOLE=y |
| 727 | CONFIG_VT_HW_CONSOLE_BINDING=y | 731 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -757,6 +761,7 @@ CONFIG_GEN_RTC_X=y | |||
| 757 | # CONFIG_POWER_SUPPLY is not set | 761 | # CONFIG_POWER_SUPPLY is not set |
| 758 | # CONFIG_HWMON is not set | 762 | # CONFIG_HWMON is not set |
| 759 | # CONFIG_THERMAL is not set | 763 | # CONFIG_THERMAL is not set |
| 764 | # CONFIG_THERMAL_HWMON is not set | ||
| 760 | # CONFIG_WATCHDOG is not set | 765 | # CONFIG_WATCHDOG is not set |
| 761 | 766 | ||
| 762 | # | 767 | # |
| @@ -768,8 +773,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 768 | # | 773 | # |
| 769 | # Multifunction device drivers | 774 | # Multifunction device drivers |
| 770 | # | 775 | # |
| 776 | # CONFIG_MFD_CORE is not set | ||
| 771 | # CONFIG_MFD_SM501 is not set | 777 | # CONFIG_MFD_SM501 is not set |
| 772 | # CONFIG_HTC_PASIC3 is not set | 778 | # CONFIG_HTC_PASIC3 is not set |
| 779 | # CONFIG_MFD_TMIO is not set | ||
| 773 | 780 | ||
| 774 | # | 781 | # |
| 775 | # Multimedia devices | 782 | # Multimedia devices |
| @@ -844,10 +851,6 @@ CONFIG_LOGO=y | |||
| 844 | CONFIG_LOGO_LINUX_MONO=y | 851 | CONFIG_LOGO_LINUX_MONO=y |
| 845 | CONFIG_LOGO_LINUX_VGA16=y | 852 | CONFIG_LOGO_LINUX_VGA16=y |
| 846 | CONFIG_LOGO_LINUX_CLUT224=y | 853 | CONFIG_LOGO_LINUX_CLUT224=y |
| 847 | |||
| 848 | # | ||
| 849 | # Sound | ||
| 850 | # | ||
| 851 | CONFIG_SOUND=m | 854 | CONFIG_SOUND=m |
| 852 | CONFIG_DMASOUND_PAULA=m | 855 | CONFIG_DMASOUND_PAULA=m |
| 853 | CONFIG_DMASOUND=m | 856 | CONFIG_DMASOUND=m |
| @@ -861,6 +864,7 @@ CONFIG_HIDRAW=y | |||
| 861 | # CONFIG_NEW_LEDS is not set | 864 | # CONFIG_NEW_LEDS is not set |
| 862 | # CONFIG_ACCESSIBILITY is not set | 865 | # CONFIG_ACCESSIBILITY is not set |
| 863 | # CONFIG_RTC_CLASS is not set | 866 | # CONFIG_RTC_CLASS is not set |
| 867 | # CONFIG_DMADEVICES is not set | ||
| 864 | # CONFIG_AUXDISPLAY is not set | 868 | # CONFIG_AUXDISPLAY is not set |
| 865 | # CONFIG_UIO is not set | 869 | # CONFIG_UIO is not set |
| 866 | 870 | ||
| @@ -899,6 +903,7 @@ CONFIG_XFS_FS=m | |||
| 899 | CONFIG_OCFS2_FS=m | 903 | CONFIG_OCFS2_FS=m |
| 900 | CONFIG_OCFS2_FS_O2CB=m | 904 | CONFIG_OCFS2_FS_O2CB=m |
| 901 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 905 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 906 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 902 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 907 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 903 | # CONFIG_OCFS2_DEBUG_FS is not set | 908 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 904 | CONFIG_DNOTIFY=y | 909 | CONFIG_DNOTIFY=y |
| @@ -958,6 +963,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 958 | CONFIG_CRAMFS=m | 963 | CONFIG_CRAMFS=m |
| 959 | # CONFIG_VXFS_FS is not set | 964 | # CONFIG_VXFS_FS is not set |
| 960 | CONFIG_MINIX_FS=y | 965 | CONFIG_MINIX_FS=y |
| 966 | # CONFIG_OMFS_FS is not set | ||
| 961 | CONFIG_HPFS_FS=m | 967 | CONFIG_HPFS_FS=m |
| 962 | # CONFIG_QNX4FS_FS is not set | 968 | # CONFIG_QNX4FS_FS is not set |
| 963 | # CONFIG_ROMFS_FS is not set | 969 | # CONFIG_ROMFS_FS is not set |
| @@ -980,7 +986,6 @@ CONFIG_EXPORTFS=m | |||
| 980 | CONFIG_NFS_COMMON=y | 986 | CONFIG_NFS_COMMON=y |
| 981 | CONFIG_SUNRPC=m | 987 | CONFIG_SUNRPC=m |
| 982 | CONFIG_SUNRPC_GSS=m | 988 | CONFIG_SUNRPC_GSS=m |
| 983 | CONFIG_SUNRPC_BIND34=y | ||
| 984 | CONFIG_RPCSEC_GSS_KRB5=m | 989 | CONFIG_RPCSEC_GSS_KRB5=m |
| 985 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 990 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 986 | CONFIG_SMB_FS=m | 991 | CONFIG_SMB_FS=m |
| @@ -989,7 +994,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 989 | # CONFIG_CIFS is not set | 994 | # CONFIG_CIFS is not set |
| 990 | # CONFIG_NCP_FS is not set | 995 | # CONFIG_NCP_FS is not set |
| 991 | CONFIG_CODA_FS=m | 996 | CONFIG_CODA_FS=m |
| 992 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 993 | # CONFIG_AFS_FS is not set | 997 | # CONFIG_AFS_FS is not set |
| 994 | 998 | ||
| 995 | # | 999 | # |
| @@ -1054,6 +1058,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1054 | # CONFIG_HEADERS_CHECK is not set | 1058 | # CONFIG_HEADERS_CHECK is not set |
| 1055 | # CONFIG_DEBUG_KERNEL is not set | 1059 | # CONFIG_DEBUG_KERNEL is not set |
| 1056 | CONFIG_DEBUG_BUGVERBOSE=y | 1060 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1061 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1062 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1057 | # CONFIG_SAMPLES is not set | 1063 | # CONFIG_SAMPLES is not set |
| 1058 | 1064 | ||
| 1059 | # | 1065 | # |
| @@ -1113,6 +1119,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1113 | CONFIG_CRYPTO_MD4=m | 1119 | CONFIG_CRYPTO_MD4=m |
| 1114 | CONFIG_CRYPTO_MD5=m | 1120 | CONFIG_CRYPTO_MD5=m |
| 1115 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1121 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1122 | CONFIG_CRYPTO_RMD128=m | ||
| 1123 | CONFIG_CRYPTO_RMD160=m | ||
| 1124 | CONFIG_CRYPTO_RMD256=m | ||
| 1125 | CONFIG_CRYPTO_RMD320=m | ||
| 1116 | CONFIG_CRYPTO_SHA1=m | 1126 | CONFIG_CRYPTO_SHA1=m |
| 1117 | CONFIG_CRYPTO_SHA256=m | 1127 | CONFIG_CRYPTO_SHA256=m |
| 1118 | CONFIG_CRYPTO_SHA512=m | 1128 | CONFIG_CRYPTO_SHA512=m |
| @@ -1154,6 +1164,7 @@ CONFIG_BITREVERSE=y | |||
| 1154 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1164 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1155 | CONFIG_CRC_CCITT=m | 1165 | CONFIG_CRC_CCITT=m |
| 1156 | CONFIG_CRC16=m | 1166 | CONFIG_CRC16=m |
| 1167 | CONFIG_CRC_T10DIF=y | ||
| 1157 | CONFIG_CRC_ITU_T=m | 1168 | CONFIG_CRC_ITU_T=m |
| 1158 | CONFIG_CRC32=y | 1169 | CONFIG_CRC32=y |
| 1159 | # CONFIG_CRC7 is not set | 1170 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index e2d511e2a1d1..c41b854c0284 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:01 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -161,10 +167,6 @@ CONFIG_HEARTBEAT=y | |||
| 161 | CONFIG_PROC_HARDWARE=y | 167 | CONFIG_PROC_HARDWARE=y |
| 162 | CONFIG_ZONE_DMA=y | 168 | CONFIG_ZONE_DMA=y |
| 163 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 169 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 164 | |||
| 165 | # | ||
| 166 | # Networking | ||
| 167 | # | ||
| 168 | CONFIG_NET=y | 170 | CONFIG_NET=y |
| 169 | 171 | ||
| 170 | # | 172 | # |
| @@ -178,6 +180,7 @@ CONFIG_XFRM=y | |||
| 178 | # CONFIG_XFRM_SUB_POLICY is not set | 180 | # CONFIG_XFRM_SUB_POLICY is not set |
| 179 | CONFIG_XFRM_MIGRATE=y | 181 | CONFIG_XFRM_MIGRATE=y |
| 180 | # CONFIG_XFRM_STATISTICS is not set | 182 | # CONFIG_XFRM_STATISTICS is not set |
| 183 | CONFIG_XFRM_IPCOMP=m | ||
| 181 | CONFIG_NET_KEY=y | 184 | CONFIG_NET_KEY=y |
| 182 | CONFIG_NET_KEY_MIGRATE=y | 185 | CONFIG_NET_KEY_MIGRATE=y |
| 183 | CONFIG_INET=y | 186 | CONFIG_INET=y |
| @@ -411,6 +414,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 411 | # | 414 | # |
| 412 | # CONFIG_CFG80211 is not set | 415 | # CONFIG_CFG80211 is not set |
| 413 | CONFIG_WIRELESS_EXT=y | 416 | CONFIG_WIRELESS_EXT=y |
| 417 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 414 | # CONFIG_MAC80211 is not set | 418 | # CONFIG_MAC80211 is not set |
| 415 | CONFIG_IEEE80211=m | 419 | CONFIG_IEEE80211=m |
| 416 | # CONFIG_IEEE80211_DEBUG is not set | 420 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -430,7 +434,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 430 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 434 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 431 | CONFIG_STANDALONE=y | 435 | CONFIG_STANDALONE=y |
| 432 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 436 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 433 | CONFIG_FW_LOADER=m | 437 | CONFIG_FW_LOADER=y |
| 438 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 439 | CONFIG_EXTRA_FIRMWARE="" | ||
| 434 | # CONFIG_SYS_HYPERVISOR is not set | 440 | # CONFIG_SYS_HYPERVISOR is not set |
| 435 | CONFIG_CONNECTOR=m | 441 | CONFIG_CONNECTOR=m |
| 436 | # CONFIG_MTD is not set | 442 | # CONFIG_MTD is not set |
| @@ -448,6 +454,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 448 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 454 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 449 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 455 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 450 | CONFIG_ATA_OVER_ETH=m | 456 | CONFIG_ATA_OVER_ETH=m |
| 457 | # CONFIG_BLK_DEV_HD is not set | ||
| 451 | CONFIG_MISC_DEVICES=y | 458 | CONFIG_MISC_DEVICES=y |
| 452 | # CONFIG_EEPROM_93CX6 is not set | 459 | # CONFIG_EEPROM_93CX6 is not set |
| 453 | # CONFIG_ENCLOSURE_SERVICES is not set | 460 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -499,6 +506,7 @@ CONFIG_SCSI_SRP_TGT_ATTRS=y | |||
| 499 | CONFIG_SCSI_LOWLEVEL=y | 506 | CONFIG_SCSI_LOWLEVEL=y |
| 500 | CONFIG_ISCSI_TCP=m | 507 | CONFIG_ISCSI_TCP=m |
| 501 | # CONFIG_SCSI_DEBUG is not set | 508 | # CONFIG_SCSI_DEBUG is not set |
| 509 | # CONFIG_SCSI_DH is not set | ||
| 502 | CONFIG_MD=y | 510 | CONFIG_MD=y |
| 503 | CONFIG_BLK_DEV_MD=m | 511 | CONFIG_BLK_DEV_MD=m |
| 504 | CONFIG_MD_LINEAR=m | 512 | CONFIG_MD_LINEAR=m |
| @@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m | |||
| 507 | # CONFIG_MD_RAID10 is not set | 515 | # CONFIG_MD_RAID10 is not set |
| 508 | CONFIG_MD_RAID456=m | 516 | CONFIG_MD_RAID456=m |
| 509 | CONFIG_MD_RAID5_RESHAPE=y | 517 | CONFIG_MD_RAID5_RESHAPE=y |
| 510 | CONFIG_MD_MULTIPATH=m | 518 | # CONFIG_MD_MULTIPATH is not set |
| 511 | # CONFIG_MD_FAULTY is not set | 519 | # CONFIG_MD_FAULTY is not set |
| 512 | CONFIG_BLK_DEV_DM=m | 520 | CONFIG_BLK_DEV_DM=m |
| 513 | # CONFIG_DM_DEBUG is not set | 521 | # CONFIG_DM_DEBUG is not set |
| @@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 516 | CONFIG_DM_MIRROR=m | 524 | CONFIG_DM_MIRROR=m |
| 517 | CONFIG_DM_ZERO=m | 525 | CONFIG_DM_ZERO=m |
| 518 | CONFIG_DM_MULTIPATH=m | 526 | CONFIG_DM_MULTIPATH=m |
| 519 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 520 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 521 | CONFIG_DM_MULTIPATH_HP=m | ||
| 522 | # CONFIG_DM_DELAY is not set | 527 | # CONFIG_DM_DELAY is not set |
| 523 | CONFIG_DM_UEVENT=y | 528 | CONFIG_DM_UEVENT=y |
| 524 | CONFIG_NETDEVICES=y | 529 | CONFIG_NETDEVICES=y |
| 525 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 526 | CONFIG_DUMMY=m | 530 | CONFIG_DUMMY=m |
| 527 | # CONFIG_BONDING is not set | 531 | # CONFIG_BONDING is not set |
| 528 | CONFIG_MACVLAN=m | 532 | CONFIG_MACVLAN=m |
| @@ -532,7 +536,6 @@ CONFIG_VETH=m | |||
| 532 | # CONFIG_PHYLIB is not set | 536 | # CONFIG_PHYLIB is not set |
| 533 | CONFIG_NET_ETHERNET=y | 537 | CONFIG_NET_ETHERNET=y |
| 534 | # CONFIG_MII is not set | 538 | # CONFIG_MII is not set |
| 535 | CONFIG_APOLLO_ELPLUS=y | ||
| 536 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 539 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 537 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 540 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 538 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 541 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -627,6 +630,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 627 | # Character devices | 630 | # Character devices |
| 628 | # | 631 | # |
| 629 | CONFIG_VT=y | 632 | CONFIG_VT=y |
| 633 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 630 | CONFIG_VT_CONSOLE=y | 634 | CONFIG_VT_CONSOLE=y |
| 631 | CONFIG_HW_CONSOLE=y | 635 | CONFIG_HW_CONSOLE=y |
| 632 | CONFIG_VT_HW_CONSOLE_BINDING=y | 636 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -657,6 +661,7 @@ CONFIG_GEN_RTC_X=y | |||
| 657 | # CONFIG_POWER_SUPPLY is not set | 661 | # CONFIG_POWER_SUPPLY is not set |
| 658 | # CONFIG_HWMON is not set | 662 | # CONFIG_HWMON is not set |
| 659 | # CONFIG_THERMAL is not set | 663 | # CONFIG_THERMAL is not set |
| 664 | # CONFIG_THERMAL_HWMON is not set | ||
| 660 | # CONFIG_WATCHDOG is not set | 665 | # CONFIG_WATCHDOG is not set |
| 661 | 666 | ||
| 662 | # | 667 | # |
| @@ -668,8 +673,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 668 | # | 673 | # |
| 669 | # Multifunction device drivers | 674 | # Multifunction device drivers |
| 670 | # | 675 | # |
| 676 | # CONFIG_MFD_CORE is not set | ||
| 671 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
| 672 | # CONFIG_HTC_PASIC3 is not set | 678 | # CONFIG_HTC_PASIC3 is not set |
| 679 | # CONFIG_MFD_TMIO is not set | ||
| 673 | 680 | ||
| 674 | # | 681 | # |
| 675 | # Multimedia devices | 682 | # Multimedia devices |
| @@ -738,10 +745,6 @@ CONFIG_LOGO=y | |||
| 738 | CONFIG_LOGO_LINUX_MONO=y | 745 | CONFIG_LOGO_LINUX_MONO=y |
| 739 | # CONFIG_LOGO_LINUX_VGA16 is not set | 746 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 740 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 747 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
| 741 | |||
| 742 | # | ||
| 743 | # Sound | ||
| 744 | # | ||
| 745 | # CONFIG_SOUND is not set | 748 | # CONFIG_SOUND is not set |
| 746 | CONFIG_HID_SUPPORT=y | 749 | CONFIG_HID_SUPPORT=y |
| 747 | CONFIG_HID=m | 750 | CONFIG_HID=m |
| @@ -753,6 +756,7 @@ CONFIG_HIDRAW=y | |||
| 753 | # CONFIG_NEW_LEDS is not set | 756 | # CONFIG_NEW_LEDS is not set |
| 754 | # CONFIG_ACCESSIBILITY is not set | 757 | # CONFIG_ACCESSIBILITY is not set |
| 755 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
| 759 | # CONFIG_DMADEVICES is not set | ||
| 756 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
| 757 | 761 | ||
| 758 | # | 762 | # |
| @@ -789,6 +793,7 @@ CONFIG_XFS_FS=m | |||
| 789 | CONFIG_OCFS2_FS=m | 793 | CONFIG_OCFS2_FS=m |
| 790 | CONFIG_OCFS2_FS_O2CB=m | 794 | CONFIG_OCFS2_FS_O2CB=m |
| 791 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 795 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 796 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 792 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 797 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 793 | # CONFIG_OCFS2_DEBUG_FS is not set | 798 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 794 | CONFIG_DNOTIFY=y | 799 | CONFIG_DNOTIFY=y |
| @@ -848,6 +853,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 848 | CONFIG_CRAMFS=m | 853 | CONFIG_CRAMFS=m |
| 849 | # CONFIG_VXFS_FS is not set | 854 | # CONFIG_VXFS_FS is not set |
| 850 | CONFIG_MINIX_FS=y | 855 | CONFIG_MINIX_FS=y |
| 856 | # CONFIG_OMFS_FS is not set | ||
| 851 | CONFIG_HPFS_FS=m | 857 | CONFIG_HPFS_FS=m |
| 852 | # CONFIG_QNX4FS_FS is not set | 858 | # CONFIG_QNX4FS_FS is not set |
| 853 | # CONFIG_ROMFS_FS is not set | 859 | # CONFIG_ROMFS_FS is not set |
| @@ -860,18 +866,17 @@ CONFIG_NFS_FS=y | |||
| 860 | CONFIG_NFS_V3=y | 866 | CONFIG_NFS_V3=y |
| 861 | # CONFIG_NFS_V3_ACL is not set | 867 | # CONFIG_NFS_V3_ACL is not set |
| 862 | CONFIG_NFS_V4=y | 868 | CONFIG_NFS_V4=y |
| 869 | CONFIG_ROOT_NFS=y | ||
| 863 | CONFIG_NFSD=m | 870 | CONFIG_NFSD=m |
| 864 | CONFIG_NFSD_V3=y | 871 | CONFIG_NFSD_V3=y |
| 865 | # CONFIG_NFSD_V3_ACL is not set | 872 | # CONFIG_NFSD_V3_ACL is not set |
| 866 | # CONFIG_NFSD_V4 is not set | 873 | # CONFIG_NFSD_V4 is not set |
| 867 | CONFIG_ROOT_NFS=y | ||
| 868 | CONFIG_LOCKD=y | 874 | CONFIG_LOCKD=y |
| 869 | CONFIG_LOCKD_V4=y | 875 | CONFIG_LOCKD_V4=y |
| 870 | CONFIG_EXPORTFS=m | 876 | CONFIG_EXPORTFS=m |
| 871 | CONFIG_NFS_COMMON=y | 877 | CONFIG_NFS_COMMON=y |
| 872 | CONFIG_SUNRPC=y | 878 | CONFIG_SUNRPC=y |
| 873 | CONFIG_SUNRPC_GSS=y | 879 | CONFIG_SUNRPC_GSS=y |
| 874 | CONFIG_SUNRPC_BIND34=y | ||
| 875 | CONFIG_RPCSEC_GSS_KRB5=y | 880 | CONFIG_RPCSEC_GSS_KRB5=y |
| 876 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 881 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 877 | CONFIG_SMB_FS=m | 882 | CONFIG_SMB_FS=m |
| @@ -880,7 +885,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 880 | # CONFIG_CIFS is not set | 885 | # CONFIG_CIFS is not set |
| 881 | # CONFIG_NCP_FS is not set | 886 | # CONFIG_NCP_FS is not set |
| 882 | CONFIG_CODA_FS=m | 887 | CONFIG_CODA_FS=m |
| 883 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 884 | # CONFIG_AFS_FS is not set | 888 | # CONFIG_AFS_FS is not set |
| 885 | 889 | ||
| 886 | # | 890 | # |
| @@ -944,6 +948,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 944 | # CONFIG_HEADERS_CHECK is not set | 948 | # CONFIG_HEADERS_CHECK is not set |
| 945 | # CONFIG_DEBUG_KERNEL is not set | 949 | # CONFIG_DEBUG_KERNEL is not set |
| 946 | CONFIG_DEBUG_BUGVERBOSE=y | 950 | CONFIG_DEBUG_BUGVERBOSE=y |
| 951 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 952 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 947 | # CONFIG_SAMPLES is not set | 953 | # CONFIG_SAMPLES is not set |
| 948 | 954 | ||
| 949 | # | 955 | # |
| @@ -1003,6 +1009,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1003 | CONFIG_CRYPTO_MD4=m | 1009 | CONFIG_CRYPTO_MD4=m |
| 1004 | CONFIG_CRYPTO_MD5=y | 1010 | CONFIG_CRYPTO_MD5=y |
| 1005 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1011 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1012 | CONFIG_CRYPTO_RMD128=m | ||
| 1013 | CONFIG_CRYPTO_RMD160=m | ||
| 1014 | CONFIG_CRYPTO_RMD256=m | ||
| 1015 | CONFIG_CRYPTO_RMD320=m | ||
| 1006 | CONFIG_CRYPTO_SHA1=m | 1016 | CONFIG_CRYPTO_SHA1=m |
| 1007 | CONFIG_CRYPTO_SHA256=m | 1017 | CONFIG_CRYPTO_SHA256=m |
| 1008 | CONFIG_CRYPTO_SHA512=m | 1018 | CONFIG_CRYPTO_SHA512=m |
| @@ -1044,6 +1054,7 @@ CONFIG_BITREVERSE=y | |||
| 1044 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1054 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1045 | CONFIG_CRC_CCITT=m | 1055 | CONFIG_CRC_CCITT=m |
| 1046 | CONFIG_CRC16=m | 1056 | CONFIG_CRC16=m |
| 1057 | CONFIG_CRC_T10DIF=y | ||
| 1047 | CONFIG_CRC_ITU_T=m | 1058 | CONFIG_CRC_ITU_T=m |
| 1048 | CONFIG_CRC32=y | 1059 | CONFIG_CRC32=y |
| 1049 | # CONFIG_CRC7 is not set | 1060 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 6e20d656adaf..654c5acb9e86 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:02 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -162,10 +168,6 @@ CONFIG_HEARTBEAT=y | |||
| 162 | CONFIG_PROC_HARDWARE=y | 168 | CONFIG_PROC_HARDWARE=y |
| 163 | CONFIG_ZONE_DMA=y | 169 | CONFIG_ZONE_DMA=y |
| 164 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 170 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 165 | |||
| 166 | # | ||
| 167 | # Networking | ||
| 168 | # | ||
| 169 | CONFIG_NET=y | 171 | CONFIG_NET=y |
| 170 | 172 | ||
| 171 | # | 173 | # |
| @@ -179,6 +181,7 @@ CONFIG_XFRM=y | |||
| 179 | # CONFIG_XFRM_SUB_POLICY is not set | 181 | # CONFIG_XFRM_SUB_POLICY is not set |
| 180 | CONFIG_XFRM_MIGRATE=y | 182 | CONFIG_XFRM_MIGRATE=y |
| 181 | # CONFIG_XFRM_STATISTICS is not set | 183 | # CONFIG_XFRM_STATISTICS is not set |
| 184 | CONFIG_XFRM_IPCOMP=m | ||
| 182 | CONFIG_NET_KEY=y | 185 | CONFIG_NET_KEY=y |
| 183 | CONFIG_NET_KEY_MIGRATE=y | 186 | CONFIG_NET_KEY_MIGRATE=y |
| 184 | CONFIG_INET=y | 187 | CONFIG_INET=y |
| @@ -409,6 +412,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 409 | # | 412 | # |
| 410 | # CONFIG_CFG80211 is not set | 413 | # CONFIG_CFG80211 is not set |
| 411 | CONFIG_WIRELESS_EXT=y | 414 | CONFIG_WIRELESS_EXT=y |
| 415 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 412 | # CONFIG_MAC80211 is not set | 416 | # CONFIG_MAC80211 is not set |
| 413 | CONFIG_IEEE80211=m | 417 | CONFIG_IEEE80211=m |
| 414 | # CONFIG_IEEE80211_DEBUG is not set | 418 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -428,7 +432,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 428 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 429 | CONFIG_STANDALONE=y | 433 | CONFIG_STANDALONE=y |
| 430 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 431 | CONFIG_FW_LOADER=m | 435 | CONFIG_FW_LOADER=y |
| 436 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 437 | CONFIG_EXTRA_FIRMWARE="" | ||
| 432 | # CONFIG_SYS_HYPERVISOR is not set | 438 | # CONFIG_SYS_HYPERVISOR is not set |
| 433 | CONFIG_CONNECTOR=m | 439 | CONFIG_CONNECTOR=m |
| 434 | # CONFIG_MTD is not set | 440 | # CONFIG_MTD is not set |
| @@ -452,6 +458,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 452 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 458 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 453 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 459 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 454 | CONFIG_ATA_OVER_ETH=m | 460 | CONFIG_ATA_OVER_ETH=m |
| 461 | # CONFIG_BLK_DEV_HD is not set | ||
| 455 | CONFIG_MISC_DEVICES=y | 462 | CONFIG_MISC_DEVICES=y |
| 456 | # CONFIG_EEPROM_93CX6 is not set | 463 | # CONFIG_EEPROM_93CX6 is not set |
| 457 | # CONFIG_ENCLOSURE_SERVICES is not set | 464 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -462,6 +469,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 462 | # | 469 | # |
| 463 | # 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 |
| 464 | # | 471 | # |
| 472 | CONFIG_IDE_ATAPI=y | ||
| 465 | # CONFIG_BLK_DEV_IDE_SATA is not set | 473 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 466 | CONFIG_BLK_DEV_IDEDISK=y | 474 | CONFIG_BLK_DEV_IDEDISK=y |
| 467 | # CONFIG_IDEDISK_MULTI_MODE is not set | 475 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -479,8 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 479 | # CONFIG_BLK_DEV_PLATFORM is not set | 487 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 480 | CONFIG_BLK_DEV_FALCON_IDE=y | 488 | CONFIG_BLK_DEV_FALCON_IDE=y |
| 481 | # CONFIG_BLK_DEV_IDEDMA is not set | 489 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 482 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 483 | # CONFIG_BLK_DEV_HD is not set | ||
| 484 | 490 | ||
| 485 | # | 491 | # |
| 486 | # SCSI device support | 492 | # SCSI device support |
| @@ -530,6 +536,7 @@ CONFIG_ISCSI_TCP=m | |||
| 530 | CONFIG_ATARI_SCSI=y | 536 | CONFIG_ATARI_SCSI=y |
| 531 | # CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set | 537 | # CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set |
| 532 | # CONFIG_ATARI_SCSI_RESET_BOOT is not set | 538 | # CONFIG_ATARI_SCSI_RESET_BOOT is not set |
| 539 | # CONFIG_SCSI_DH is not set | ||
| 533 | CONFIG_MD=y | 540 | CONFIG_MD=y |
| 534 | CONFIG_BLK_DEV_MD=m | 541 | CONFIG_BLK_DEV_MD=m |
| 535 | CONFIG_MD_LINEAR=m | 542 | CONFIG_MD_LINEAR=m |
| @@ -538,7 +545,7 @@ CONFIG_MD_RAID1=m | |||
| 538 | # CONFIG_MD_RAID10 is not set | 545 | # CONFIG_MD_RAID10 is not set |
| 539 | CONFIG_MD_RAID456=m | 546 | CONFIG_MD_RAID456=m |
| 540 | CONFIG_MD_RAID5_RESHAPE=y | 547 | CONFIG_MD_RAID5_RESHAPE=y |
| 541 | CONFIG_MD_MULTIPATH=m | 548 | # CONFIG_MD_MULTIPATH is not set |
| 542 | # CONFIG_MD_FAULTY is not set | 549 | # CONFIG_MD_FAULTY is not set |
| 543 | CONFIG_BLK_DEV_DM=m | 550 | CONFIG_BLK_DEV_DM=m |
| 544 | # CONFIG_DM_DEBUG is not set | 551 | # CONFIG_DM_DEBUG is not set |
| @@ -547,13 +554,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 547 | CONFIG_DM_MIRROR=m | 554 | CONFIG_DM_MIRROR=m |
| 548 | CONFIG_DM_ZERO=m | 555 | CONFIG_DM_ZERO=m |
| 549 | CONFIG_DM_MULTIPATH=m | 556 | CONFIG_DM_MULTIPATH=m |
| 550 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 551 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 552 | CONFIG_DM_MULTIPATH_HP=m | ||
| 553 | # CONFIG_DM_DELAY is not set | 557 | # CONFIG_DM_DELAY is not set |
| 554 | CONFIG_DM_UEVENT=y | 558 | CONFIG_DM_UEVENT=y |
| 555 | CONFIG_NETDEVICES=y | 559 | CONFIG_NETDEVICES=y |
| 556 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 557 | CONFIG_DUMMY=m | 560 | CONFIG_DUMMY=m |
| 558 | # CONFIG_BONDING is not set | 561 | # CONFIG_BONDING is not set |
| 559 | CONFIG_MACVLAN=m | 562 | CONFIG_MACVLAN=m |
| @@ -666,6 +669,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 666 | # Character devices | 669 | # Character devices |
| 667 | # | 670 | # |
| 668 | CONFIG_VT=y | 671 | CONFIG_VT=y |
| 672 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 669 | CONFIG_VT_CONSOLE=y | 673 | CONFIG_VT_CONSOLE=y |
| 670 | CONFIG_HW_CONSOLE=y | 674 | CONFIG_HW_CONSOLE=y |
| 671 | CONFIG_VT_HW_CONSOLE_BINDING=y | 675 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -700,6 +704,7 @@ CONFIG_GEN_RTC_X=y | |||
| 700 | # CONFIG_POWER_SUPPLY is not set | 704 | # CONFIG_POWER_SUPPLY is not set |
| 701 | # CONFIG_HWMON is not set | 705 | # CONFIG_HWMON is not set |
| 702 | # CONFIG_THERMAL is not set | 706 | # CONFIG_THERMAL is not set |
| 707 | # CONFIG_THERMAL_HWMON is not set | ||
| 703 | # CONFIG_WATCHDOG is not set | 708 | # CONFIG_WATCHDOG is not set |
| 704 | 709 | ||
| 705 | # | 710 | # |
| @@ -711,8 +716,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 711 | # | 716 | # |
| 712 | # Multifunction device drivers | 717 | # Multifunction device drivers |
| 713 | # | 718 | # |
| 719 | # CONFIG_MFD_CORE is not set | ||
| 714 | # CONFIG_MFD_SM501 is not set | 720 | # CONFIG_MFD_SM501 is not set |
| 715 | # CONFIG_HTC_PASIC3 is not set | 721 | # CONFIG_HTC_PASIC3 is not set |
| 722 | # CONFIG_MFD_TMIO is not set | ||
| 716 | 723 | ||
| 717 | # | 724 | # |
| 718 | # Multimedia devices | 725 | # Multimedia devices |
| @@ -782,10 +789,6 @@ CONFIG_LOGO=y | |||
| 782 | CONFIG_LOGO_LINUX_MONO=y | 789 | CONFIG_LOGO_LINUX_MONO=y |
| 783 | CONFIG_LOGO_LINUX_VGA16=y | 790 | CONFIG_LOGO_LINUX_VGA16=y |
| 784 | CONFIG_LOGO_LINUX_CLUT224=y | 791 | CONFIG_LOGO_LINUX_CLUT224=y |
| 785 | |||
| 786 | # | ||
| 787 | # Sound | ||
| 788 | # | ||
| 789 | CONFIG_SOUND=m | 792 | CONFIG_SOUND=m |
| 790 | CONFIG_DMASOUND_ATARI=m | 793 | CONFIG_DMASOUND_ATARI=m |
| 791 | CONFIG_DMASOUND=m | 794 | CONFIG_DMASOUND=m |
| @@ -799,6 +802,7 @@ CONFIG_HIDRAW=y | |||
| 799 | # CONFIG_NEW_LEDS is not set | 802 | # CONFIG_NEW_LEDS is not set |
| 800 | # CONFIG_ACCESSIBILITY is not set | 803 | # CONFIG_ACCESSIBILITY is not set |
| 801 | # CONFIG_RTC_CLASS is not set | 804 | # CONFIG_RTC_CLASS is not set |
| 805 | # CONFIG_DMADEVICES is not set | ||
| 802 | # CONFIG_AUXDISPLAY is not set | 806 | # CONFIG_AUXDISPLAY is not set |
| 803 | # CONFIG_UIO is not set | 807 | # CONFIG_UIO is not set |
| 804 | 808 | ||
| @@ -806,11 +810,8 @@ CONFIG_HIDRAW=y | |||
| 806 | # Character devices | 810 | # Character devices |
| 807 | # | 811 | # |
| 808 | CONFIG_ATARI_MFPSER=m | 812 | CONFIG_ATARI_MFPSER=m |
| 809 | CONFIG_ATARI_SCC=y | ||
| 810 | CONFIG_ATARI_SCC_DMA=y | ||
| 811 | CONFIG_ATARI_MIDI=m | 813 | CONFIG_ATARI_MIDI=m |
| 812 | CONFIG_ATARI_DSP56K=m | 814 | CONFIG_ATARI_DSP56K=m |
| 813 | # CONFIG_SERIAL_CONSOLE is not set | ||
| 814 | 815 | ||
| 815 | # | 816 | # |
| 816 | # File systems | 817 | # File systems |
| @@ -820,8 +821,10 @@ CONFIG_EXT2_FS=y | |||
| 820 | # CONFIG_EXT2_FS_XIP is not set | 821 | # CONFIG_EXT2_FS_XIP is not set |
| 821 | CONFIG_EXT3_FS=y | 822 | CONFIG_EXT3_FS=y |
| 822 | # CONFIG_EXT3_FS_XATTR is not set | 823 | # CONFIG_EXT3_FS_XATTR is not set |
| 823 | # CONFIG_EXT4DEV_FS is not set | 824 | CONFIG_EXT4DEV_FS=y |
| 825 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
| 824 | CONFIG_JBD=y | 826 | CONFIG_JBD=y |
| 827 | CONFIG_JBD2=y | ||
| 825 | CONFIG_REISERFS_FS=m | 828 | CONFIG_REISERFS_FS=m |
| 826 | # CONFIG_REISERFS_CHECK is not set | 829 | # CONFIG_REISERFS_CHECK is not set |
| 827 | # CONFIG_REISERFS_PROC_INFO is not set | 830 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -840,6 +843,7 @@ CONFIG_XFS_FS=m | |||
| 840 | CONFIG_OCFS2_FS=m | 843 | CONFIG_OCFS2_FS=m |
| 841 | CONFIG_OCFS2_FS_O2CB=m | 844 | CONFIG_OCFS2_FS_O2CB=m |
| 842 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 845 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 846 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 843 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 847 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 844 | # CONFIG_OCFS2_DEBUG_FS is not set | 848 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 845 | CONFIG_DNOTIFY=y | 849 | CONFIG_DNOTIFY=y |
| @@ -899,6 +903,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 899 | CONFIG_CRAMFS=m | 903 | CONFIG_CRAMFS=m |
| 900 | # CONFIG_VXFS_FS is not set | 904 | # CONFIG_VXFS_FS is not set |
| 901 | CONFIG_MINIX_FS=y | 905 | CONFIG_MINIX_FS=y |
| 906 | # CONFIG_OMFS_FS is not set | ||
| 902 | CONFIG_HPFS_FS=m | 907 | CONFIG_HPFS_FS=m |
| 903 | # CONFIG_QNX4FS_FS is not set | 908 | # CONFIG_QNX4FS_FS is not set |
| 904 | # CONFIG_ROMFS_FS is not set | 909 | # CONFIG_ROMFS_FS is not set |
| @@ -920,7 +925,6 @@ CONFIG_LOCKD_V4=y | |||
| 920 | CONFIG_EXPORTFS=m | 925 | CONFIG_EXPORTFS=m |
| 921 | CONFIG_NFS_COMMON=y | 926 | CONFIG_NFS_COMMON=y |
| 922 | CONFIG_SUNRPC=m | 927 | CONFIG_SUNRPC=m |
| 923 | CONFIG_SUNRPC_BIND34=y | ||
| 924 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 928 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 925 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 929 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 926 | CONFIG_SMB_FS=m | 930 | CONFIG_SMB_FS=m |
| @@ -929,7 +933,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 929 | # CONFIG_CIFS is not set | 933 | # CONFIG_CIFS is not set |
| 930 | # CONFIG_NCP_FS is not set | 934 | # CONFIG_NCP_FS is not set |
| 931 | CONFIG_CODA_FS=m | 935 | CONFIG_CODA_FS=m |
| 932 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 933 | # CONFIG_AFS_FS is not set | 936 | # CONFIG_AFS_FS is not set |
| 934 | 937 | ||
| 935 | # | 938 | # |
| @@ -994,6 +997,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 994 | # CONFIG_HEADERS_CHECK is not set | 997 | # CONFIG_HEADERS_CHECK is not set |
| 995 | # CONFIG_DEBUG_KERNEL is not set | 998 | # CONFIG_DEBUG_KERNEL is not set |
| 996 | CONFIG_DEBUG_BUGVERBOSE=y | 999 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1000 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1001 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 997 | # CONFIG_SAMPLES is not set | 1002 | # CONFIG_SAMPLES is not set |
| 998 | 1003 | ||
| 999 | # | 1004 | # |
| @@ -1053,6 +1058,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1053 | CONFIG_CRYPTO_MD4=m | 1058 | CONFIG_CRYPTO_MD4=m |
| 1054 | CONFIG_CRYPTO_MD5=m | 1059 | CONFIG_CRYPTO_MD5=m |
| 1055 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1060 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1061 | CONFIG_CRYPTO_RMD128=m | ||
| 1062 | CONFIG_CRYPTO_RMD160=m | ||
| 1063 | CONFIG_CRYPTO_RMD256=m | ||
| 1064 | CONFIG_CRYPTO_RMD320=m | ||
| 1056 | CONFIG_CRYPTO_SHA1=m | 1065 | CONFIG_CRYPTO_SHA1=m |
| 1057 | CONFIG_CRYPTO_SHA256=m | 1066 | CONFIG_CRYPTO_SHA256=m |
| 1058 | CONFIG_CRYPTO_SHA512=m | 1067 | CONFIG_CRYPTO_SHA512=m |
| @@ -1094,6 +1103,7 @@ CONFIG_BITREVERSE=y | |||
| 1094 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1103 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1095 | CONFIG_CRC_CCITT=m | 1104 | CONFIG_CRC_CCITT=m |
| 1096 | CONFIG_CRC16=y | 1105 | CONFIG_CRC16=y |
| 1106 | CONFIG_CRC_T10DIF=y | ||
| 1097 | CONFIG_CRC_ITU_T=m | 1107 | CONFIG_CRC_ITU_T=m |
| 1098 | CONFIG_CRC32=y | 1108 | CONFIG_CRC32=y |
| 1099 | # CONFIG_CRC7 is not set | 1109 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index a0a9b30bb502..2e44af0fe54a 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:03 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m | |||
| 163 | CONFIG_PROC_HARDWARE=y | 169 | CONFIG_PROC_HARDWARE=y |
| 164 | CONFIG_ZONE_DMA=y | 170 | CONFIG_ZONE_DMA=y |
| 165 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 171 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 166 | |||
| 167 | # | ||
| 168 | # Networking | ||
| 169 | # | ||
| 170 | CONFIG_NET=y | 172 | CONFIG_NET=y |
| 171 | 173 | ||
| 172 | # | 174 | # |
| @@ -180,6 +182,7 @@ CONFIG_XFRM=y | |||
| 180 | # CONFIG_XFRM_SUB_POLICY is not set | 182 | # CONFIG_XFRM_SUB_POLICY is not set |
| 181 | CONFIG_XFRM_MIGRATE=y | 183 | CONFIG_XFRM_MIGRATE=y |
| 182 | # CONFIG_XFRM_STATISTICS is not set | 184 | # CONFIG_XFRM_STATISTICS is not set |
| 185 | CONFIG_XFRM_IPCOMP=m | ||
| 183 | CONFIG_NET_KEY=y | 186 | CONFIG_NET_KEY=y |
| 184 | CONFIG_NET_KEY_MIGRATE=y | 187 | CONFIG_NET_KEY_MIGRATE=y |
| 185 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| @@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 413 | # | 416 | # |
| 414 | # CONFIG_CFG80211 is not set | 417 | # CONFIG_CFG80211 is not set |
| 415 | CONFIG_WIRELESS_EXT=y | 418 | CONFIG_WIRELESS_EXT=y |
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 416 | # CONFIG_MAC80211 is not set | 420 | # CONFIG_MAC80211 is not set |
| 417 | CONFIG_IEEE80211=m | 421 | CONFIG_IEEE80211=m |
| 418 | # CONFIG_IEEE80211_DEBUG is not set | 422 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 433 | CONFIG_STANDALONE=y | 437 | CONFIG_STANDALONE=y |
| 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 438 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 435 | CONFIG_FW_LOADER=m | 439 | CONFIG_FW_LOADER=y |
| 440 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 441 | CONFIG_EXTRA_FIRMWARE="" | ||
| 436 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
| 437 | CONFIG_CONNECTOR=m | 443 | CONFIG_CONNECTOR=m |
| 438 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
| @@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 450 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 456 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 451 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 457 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 452 | CONFIG_ATA_OVER_ETH=m | 458 | CONFIG_ATA_OVER_ETH=m |
| 459 | # CONFIG_BLK_DEV_HD is not set | ||
| 453 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
| 454 | # CONFIG_EEPROM_93CX6 is not set | 461 | # CONFIG_EEPROM_93CX6 is not set |
| 455 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -503,6 +510,7 @@ CONFIG_ISCSI_TCP=m | |||
| 503 | CONFIG_53C700_BE_BUS=y | 510 | CONFIG_53C700_BE_BUS=y |
| 504 | # CONFIG_SCSI_DEBUG is not set | 511 | # CONFIG_SCSI_DEBUG is not set |
| 505 | CONFIG_BVME6000_SCSI=y | 512 | CONFIG_BVME6000_SCSI=y |
| 513 | # CONFIG_SCSI_DH is not set | ||
| 506 | CONFIG_MD=y | 514 | CONFIG_MD=y |
| 507 | CONFIG_BLK_DEV_MD=m | 515 | CONFIG_BLK_DEV_MD=m |
| 508 | CONFIG_MD_LINEAR=m | 516 | CONFIG_MD_LINEAR=m |
| @@ -511,7 +519,7 @@ CONFIG_MD_RAID1=m | |||
| 511 | # CONFIG_MD_RAID10 is not set | 519 | # CONFIG_MD_RAID10 is not set |
| 512 | CONFIG_MD_RAID456=m | 520 | CONFIG_MD_RAID456=m |
| 513 | CONFIG_MD_RAID5_RESHAPE=y | 521 | CONFIG_MD_RAID5_RESHAPE=y |
| 514 | CONFIG_MD_MULTIPATH=m | 522 | # CONFIG_MD_MULTIPATH is not set |
| 515 | # CONFIG_MD_FAULTY is not set | 523 | # CONFIG_MD_FAULTY is not set |
| 516 | CONFIG_BLK_DEV_DM=m | 524 | CONFIG_BLK_DEV_DM=m |
| 517 | # CONFIG_DM_DEBUG is not set | 525 | # CONFIG_DM_DEBUG is not set |
| @@ -520,13 +528,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 520 | CONFIG_DM_MIRROR=m | 528 | CONFIG_DM_MIRROR=m |
| 521 | CONFIG_DM_ZERO=m | 529 | CONFIG_DM_ZERO=m |
| 522 | CONFIG_DM_MULTIPATH=m | 530 | CONFIG_DM_MULTIPATH=m |
| 523 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 524 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 525 | CONFIG_DM_MULTIPATH_HP=m | ||
| 526 | # CONFIG_DM_DELAY is not set | 531 | # CONFIG_DM_DELAY is not set |
| 527 | CONFIG_DM_UEVENT=y | 532 | CONFIG_DM_UEVENT=y |
| 528 | CONFIG_NETDEVICES=y | 533 | CONFIG_NETDEVICES=y |
| 529 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 530 | CONFIG_DUMMY=m | 534 | CONFIG_DUMMY=m |
| 531 | # CONFIG_BONDING is not set | 535 | # CONFIG_BONDING is not set |
| 532 | CONFIG_MACVLAN=m | 536 | CONFIG_MACVLAN=m |
| @@ -631,6 +635,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 631 | # Character devices | 635 | # Character devices |
| 632 | # | 636 | # |
| 633 | CONFIG_VT=y | 637 | CONFIG_VT=y |
| 638 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 634 | CONFIG_VT_CONSOLE=y | 639 | CONFIG_VT_CONSOLE=y |
| 635 | CONFIG_HW_CONSOLE=y | 640 | CONFIG_HW_CONSOLE=y |
| 636 | CONFIG_VT_HW_CONSOLE_BINDING=y | 641 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -661,6 +666,7 @@ CONFIG_GEN_RTC_X=y | |||
| 661 | # CONFIG_POWER_SUPPLY is not set | 666 | # CONFIG_POWER_SUPPLY is not set |
| 662 | # CONFIG_HWMON is not set | 667 | # CONFIG_HWMON is not set |
| 663 | # CONFIG_THERMAL is not set | 668 | # CONFIG_THERMAL is not set |
| 669 | # CONFIG_THERMAL_HWMON is not set | ||
| 664 | # CONFIG_WATCHDOG is not set | 670 | # CONFIG_WATCHDOG is not set |
| 665 | 671 | ||
| 666 | # | 672 | # |
| @@ -672,8 +678,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 672 | # | 678 | # |
| 673 | # Multifunction device drivers | 679 | # Multifunction device drivers |
| 674 | # | 680 | # |
| 681 | # CONFIG_MFD_CORE is not set | ||
| 675 | # CONFIG_MFD_SM501 is not set | 682 | # CONFIG_MFD_SM501 is not set |
| 676 | # CONFIG_HTC_PASIC3 is not set | 683 | # CONFIG_HTC_PASIC3 is not set |
| 684 | # CONFIG_MFD_TMIO is not set | ||
| 677 | 685 | ||
| 678 | # | 686 | # |
| 679 | # Multimedia devices | 687 | # Multimedia devices |
| @@ -708,10 +716,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 708 | # Console display driver support | 716 | # Console display driver support |
| 709 | # | 717 | # |
| 710 | CONFIG_DUMMY_CONSOLE=y | 718 | CONFIG_DUMMY_CONSOLE=y |
| 711 | |||
| 712 | # | ||
| 713 | # Sound | ||
| 714 | # | ||
| 715 | # CONFIG_SOUND is not set | 719 | # CONFIG_SOUND is not set |
| 716 | CONFIG_HID_SUPPORT=y | 720 | CONFIG_HID_SUPPORT=y |
| 717 | CONFIG_HID=m | 721 | CONFIG_HID=m |
| @@ -723,6 +727,7 @@ CONFIG_HIDRAW=y | |||
| 723 | # CONFIG_NEW_LEDS is not set | 727 | # CONFIG_NEW_LEDS is not set |
| 724 | # CONFIG_ACCESSIBILITY is not set | 728 | # CONFIG_ACCESSIBILITY is not set |
| 725 | # CONFIG_RTC_CLASS is not set | 729 | # CONFIG_RTC_CLASS is not set |
| 730 | # CONFIG_DMADEVICES is not set | ||
| 726 | # CONFIG_UIO is not set | 731 | # CONFIG_UIO is not set |
| 727 | 732 | ||
| 728 | # | 733 | # |
| @@ -759,6 +764,7 @@ CONFIG_XFS_FS=m | |||
| 759 | CONFIG_OCFS2_FS=m | 764 | CONFIG_OCFS2_FS=m |
| 760 | CONFIG_OCFS2_FS_O2CB=m | 765 | CONFIG_OCFS2_FS_O2CB=m |
| 761 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 766 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 767 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 762 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 768 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 763 | # CONFIG_OCFS2_DEBUG_FS is not set | 769 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 764 | CONFIG_DNOTIFY=y | 770 | CONFIG_DNOTIFY=y |
| @@ -818,6 +824,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 818 | CONFIG_CRAMFS=m | 824 | CONFIG_CRAMFS=m |
| 819 | # CONFIG_VXFS_FS is not set | 825 | # CONFIG_VXFS_FS is not set |
| 820 | CONFIG_MINIX_FS=y | 826 | CONFIG_MINIX_FS=y |
| 827 | # CONFIG_OMFS_FS is not set | ||
| 821 | CONFIG_HPFS_FS=m | 828 | CONFIG_HPFS_FS=m |
| 822 | # CONFIG_QNX4FS_FS is not set | 829 | # CONFIG_QNX4FS_FS is not set |
| 823 | # CONFIG_ROMFS_FS is not set | 830 | # CONFIG_ROMFS_FS is not set |
| @@ -830,18 +837,17 @@ CONFIG_NFS_FS=y | |||
| 830 | CONFIG_NFS_V3=y | 837 | CONFIG_NFS_V3=y |
| 831 | # CONFIG_NFS_V3_ACL is not set | 838 | # CONFIG_NFS_V3_ACL is not set |
| 832 | CONFIG_NFS_V4=y | 839 | CONFIG_NFS_V4=y |
| 840 | CONFIG_ROOT_NFS=y | ||
| 833 | CONFIG_NFSD=m | 841 | CONFIG_NFSD=m |
| 834 | CONFIG_NFSD_V3=y | 842 | CONFIG_NFSD_V3=y |
| 835 | # CONFIG_NFSD_V3_ACL is not set | 843 | # CONFIG_NFSD_V3_ACL is not set |
| 836 | # CONFIG_NFSD_V4 is not set | 844 | # CONFIG_NFSD_V4 is not set |
| 837 | CONFIG_ROOT_NFS=y | ||
| 838 | CONFIG_LOCKD=y | 845 | CONFIG_LOCKD=y |
| 839 | CONFIG_LOCKD_V4=y | 846 | CONFIG_LOCKD_V4=y |
| 840 | CONFIG_EXPORTFS=m | 847 | CONFIG_EXPORTFS=m |
| 841 | CONFIG_NFS_COMMON=y | 848 | CONFIG_NFS_COMMON=y |
| 842 | CONFIG_SUNRPC=y | 849 | CONFIG_SUNRPC=y |
| 843 | CONFIG_SUNRPC_GSS=y | 850 | CONFIG_SUNRPC_GSS=y |
| 844 | CONFIG_SUNRPC_BIND34=y | ||
| 845 | CONFIG_RPCSEC_GSS_KRB5=y | 851 | CONFIG_RPCSEC_GSS_KRB5=y |
| 846 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 852 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 847 | CONFIG_SMB_FS=m | 853 | CONFIG_SMB_FS=m |
| @@ -850,7 +856,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 850 | # CONFIG_CIFS is not set | 856 | # CONFIG_CIFS is not set |
| 851 | # CONFIG_NCP_FS is not set | 857 | # CONFIG_NCP_FS is not set |
| 852 | CONFIG_CODA_FS=m | 858 | CONFIG_CODA_FS=m |
| 853 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 854 | # CONFIG_AFS_FS is not set | 859 | # CONFIG_AFS_FS is not set |
| 855 | 860 | ||
| 856 | # | 861 | # |
| @@ -915,6 +920,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 915 | # CONFIG_HEADERS_CHECK is not set | 920 | # CONFIG_HEADERS_CHECK is not set |
| 916 | # CONFIG_DEBUG_KERNEL is not set | 921 | # CONFIG_DEBUG_KERNEL is not set |
| 917 | CONFIG_DEBUG_BUGVERBOSE=y | 922 | CONFIG_DEBUG_BUGVERBOSE=y |
| 923 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 924 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 918 | # CONFIG_SAMPLES is not set | 925 | # CONFIG_SAMPLES is not set |
| 919 | 926 | ||
| 920 | # | 927 | # |
| @@ -974,6 +981,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 974 | CONFIG_CRYPTO_MD4=m | 981 | CONFIG_CRYPTO_MD4=m |
| 975 | CONFIG_CRYPTO_MD5=y | 982 | CONFIG_CRYPTO_MD5=y |
| 976 | CONFIG_CRYPTO_MICHAEL_MIC=m | 983 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 984 | CONFIG_CRYPTO_RMD128=m | ||
| 985 | CONFIG_CRYPTO_RMD160=m | ||
| 986 | CONFIG_CRYPTO_RMD256=m | ||
| 987 | CONFIG_CRYPTO_RMD320=m | ||
| 977 | CONFIG_CRYPTO_SHA1=m | 988 | CONFIG_CRYPTO_SHA1=m |
| 978 | CONFIG_CRYPTO_SHA256=m | 989 | CONFIG_CRYPTO_SHA256=m |
| 979 | CONFIG_CRYPTO_SHA512=m | 990 | CONFIG_CRYPTO_SHA512=m |
| @@ -1015,6 +1026,7 @@ CONFIG_BITREVERSE=m | |||
| 1015 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1026 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1016 | CONFIG_CRC_CCITT=m | 1027 | CONFIG_CRC_CCITT=m |
| 1017 | CONFIG_CRC16=m | 1028 | CONFIG_CRC16=m |
| 1029 | CONFIG_CRC_T10DIF=y | ||
| 1018 | CONFIG_CRC_ITU_T=m | 1030 | CONFIG_CRC_ITU_T=m |
| 1019 | CONFIG_CRC32=m | 1031 | CONFIG_CRC32=m |
| 1020 | # CONFIG_CRC7 is not set | 1032 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 6778041de262..3570fc89b089 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:04 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -162,10 +168,6 @@ CONFIG_HEARTBEAT=y | |||
| 162 | CONFIG_PROC_HARDWARE=y | 168 | CONFIG_PROC_HARDWARE=y |
| 163 | CONFIG_ZONE_DMA=y | 169 | CONFIG_ZONE_DMA=y |
| 164 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 170 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 165 | |||
| 166 | # | ||
| 167 | # Networking | ||
| 168 | # | ||
| 169 | CONFIG_NET=y | 171 | CONFIG_NET=y |
| 170 | 172 | ||
| 171 | # | 173 | # |
| @@ -179,6 +181,7 @@ CONFIG_XFRM=y | |||
| 179 | # CONFIG_XFRM_SUB_POLICY is not set | 181 | # CONFIG_XFRM_SUB_POLICY is not set |
| 180 | CONFIG_XFRM_MIGRATE=y | 182 | CONFIG_XFRM_MIGRATE=y |
| 181 | # CONFIG_XFRM_STATISTICS is not set | 183 | # CONFIG_XFRM_STATISTICS is not set |
| 184 | CONFIG_XFRM_IPCOMP=m | ||
| 182 | CONFIG_NET_KEY=y | 185 | CONFIG_NET_KEY=y |
| 183 | CONFIG_NET_KEY_MIGRATE=y | 186 | CONFIG_NET_KEY_MIGRATE=y |
| 184 | CONFIG_INET=y | 187 | CONFIG_INET=y |
| @@ -412,6 +415,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 412 | # | 415 | # |
| 413 | # CONFIG_CFG80211 is not set | 416 | # CONFIG_CFG80211 is not set |
| 414 | CONFIG_WIRELESS_EXT=y | 417 | CONFIG_WIRELESS_EXT=y |
| 418 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 415 | # CONFIG_MAC80211 is not set | 419 | # CONFIG_MAC80211 is not set |
| 416 | CONFIG_IEEE80211=m | 420 | CONFIG_IEEE80211=m |
| 417 | # CONFIG_IEEE80211_DEBUG is not set | 421 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -431,7 +435,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 431 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 435 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 432 | CONFIG_STANDALONE=y | 436 | CONFIG_STANDALONE=y |
| 433 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 437 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 434 | CONFIG_FW_LOADER=m | 438 | CONFIG_FW_LOADER=y |
| 439 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 440 | CONFIG_EXTRA_FIRMWARE="" | ||
| 435 | # CONFIG_SYS_HYPERVISOR is not set | 441 | # CONFIG_SYS_HYPERVISOR is not set |
| 436 | CONFIG_CONNECTOR=m | 442 | CONFIG_CONNECTOR=m |
| 437 | # CONFIG_MTD is not set | 443 | # CONFIG_MTD is not set |
| @@ -449,6 +455,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 449 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 455 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 450 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 456 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 451 | CONFIG_ATA_OVER_ETH=m | 457 | CONFIG_ATA_OVER_ETH=m |
| 458 | # CONFIG_BLK_DEV_HD is not set | ||
| 452 | CONFIG_MISC_DEVICES=y | 459 | CONFIG_MISC_DEVICES=y |
| 453 | # CONFIG_EEPROM_93CX6 is not set | 460 | # CONFIG_EEPROM_93CX6 is not set |
| 454 | # CONFIG_ENCLOSURE_SERVICES is not set | 461 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -500,6 +507,7 @@ CONFIG_SCSI_SRP_TGT_ATTRS=y | |||
| 500 | CONFIG_SCSI_LOWLEVEL=y | 507 | CONFIG_SCSI_LOWLEVEL=y |
| 501 | CONFIG_ISCSI_TCP=m | 508 | CONFIG_ISCSI_TCP=m |
| 502 | # CONFIG_SCSI_DEBUG is not set | 509 | # CONFIG_SCSI_DEBUG is not set |
| 510 | # CONFIG_SCSI_DH is not set | ||
| 503 | CONFIG_MD=y | 511 | CONFIG_MD=y |
| 504 | CONFIG_BLK_DEV_MD=m | 512 | CONFIG_BLK_DEV_MD=m |
| 505 | CONFIG_MD_LINEAR=m | 513 | CONFIG_MD_LINEAR=m |
| @@ -508,7 +516,7 @@ CONFIG_MD_RAID1=m | |||
| 508 | # CONFIG_MD_RAID10 is not set | 516 | # CONFIG_MD_RAID10 is not set |
| 509 | CONFIG_MD_RAID456=m | 517 | CONFIG_MD_RAID456=m |
| 510 | CONFIG_MD_RAID5_RESHAPE=y | 518 | CONFIG_MD_RAID5_RESHAPE=y |
| 511 | CONFIG_MD_MULTIPATH=m | 519 | # CONFIG_MD_MULTIPATH is not set |
| 512 | # CONFIG_MD_FAULTY is not set | 520 | # CONFIG_MD_FAULTY is not set |
| 513 | CONFIG_BLK_DEV_DM=m | 521 | CONFIG_BLK_DEV_DM=m |
| 514 | # CONFIG_DM_DEBUG is not set | 522 | # CONFIG_DM_DEBUG is not set |
| @@ -517,13 +525,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 517 | CONFIG_DM_MIRROR=m | 525 | CONFIG_DM_MIRROR=m |
| 518 | CONFIG_DM_ZERO=m | 526 | CONFIG_DM_ZERO=m |
| 519 | CONFIG_DM_MULTIPATH=m | 527 | CONFIG_DM_MULTIPATH=m |
| 520 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 521 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 522 | CONFIG_DM_MULTIPATH_HP=m | ||
| 523 | # CONFIG_DM_DELAY is not set | 528 | # CONFIG_DM_DELAY is not set |
| 524 | CONFIG_DM_UEVENT=y | 529 | CONFIG_DM_UEVENT=y |
| 525 | CONFIG_NETDEVICES=y | 530 | CONFIG_NETDEVICES=y |
| 526 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 527 | CONFIG_DUMMY=m | 531 | CONFIG_DUMMY=m |
| 528 | # CONFIG_BONDING is not set | 532 | # CONFIG_BONDING is not set |
| 529 | CONFIG_MACVLAN=m | 533 | CONFIG_MACVLAN=m |
| @@ -636,6 +640,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 636 | # Character devices | 640 | # Character devices |
| 637 | # | 641 | # |
| 638 | CONFIG_VT=y | 642 | CONFIG_VT=y |
| 643 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 639 | CONFIG_VT_CONSOLE=y | 644 | CONFIG_VT_CONSOLE=y |
| 640 | CONFIG_HW_CONSOLE=y | 645 | CONFIG_HW_CONSOLE=y |
| 641 | CONFIG_VT_HW_CONSOLE_BINDING=y | 646 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -666,6 +671,7 @@ CONFIG_GEN_RTC_X=y | |||
| 666 | # CONFIG_POWER_SUPPLY is not set | 671 | # CONFIG_POWER_SUPPLY is not set |
| 667 | # CONFIG_HWMON is not set | 672 | # CONFIG_HWMON is not set |
| 668 | # CONFIG_THERMAL is not set | 673 | # CONFIG_THERMAL is not set |
| 674 | # CONFIG_THERMAL_HWMON is not set | ||
| 669 | # CONFIG_WATCHDOG is not set | 675 | # CONFIG_WATCHDOG is not set |
| 670 | 676 | ||
| 671 | # | 677 | # |
| @@ -677,8 +683,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 677 | # | 683 | # |
| 678 | # Multifunction device drivers | 684 | # Multifunction device drivers |
| 679 | # | 685 | # |
| 686 | # CONFIG_MFD_CORE is not set | ||
| 680 | # CONFIG_MFD_SM501 is not set | 687 | # CONFIG_MFD_SM501 is not set |
| 681 | # CONFIG_HTC_PASIC3 is not set | 688 | # CONFIG_HTC_PASIC3 is not set |
| 689 | # CONFIG_MFD_TMIO is not set | ||
| 682 | 690 | ||
| 683 | # | 691 | # |
| 684 | # Multimedia devices | 692 | # Multimedia devices |
| @@ -747,10 +755,6 @@ CONFIG_LOGO=y | |||
| 747 | # CONFIG_LOGO_LINUX_MONO is not set | 755 | # CONFIG_LOGO_LINUX_MONO is not set |
| 748 | # CONFIG_LOGO_LINUX_VGA16 is not set | 756 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 749 | CONFIG_LOGO_LINUX_CLUT224=y | 757 | CONFIG_LOGO_LINUX_CLUT224=y |
| 750 | |||
| 751 | # | ||
| 752 | # Sound | ||
| 753 | # | ||
| 754 | # CONFIG_SOUND is not set | 758 | # CONFIG_SOUND is not set |
| 755 | CONFIG_HID_SUPPORT=y | 759 | CONFIG_HID_SUPPORT=y |
| 756 | CONFIG_HID=m | 760 | CONFIG_HID=m |
| @@ -762,6 +766,7 @@ CONFIG_HIDRAW=y | |||
| 762 | # CONFIG_NEW_LEDS is not set | 766 | # CONFIG_NEW_LEDS is not set |
| 763 | # CONFIG_ACCESSIBILITY is not set | 767 | # CONFIG_ACCESSIBILITY is not set |
| 764 | # CONFIG_RTC_CLASS is not set | 768 | # CONFIG_RTC_CLASS is not set |
| 769 | # CONFIG_DMADEVICES is not set | ||
| 765 | # CONFIG_UIO is not set | 770 | # CONFIG_UIO is not set |
| 766 | 771 | ||
| 767 | # | 772 | # |
| @@ -796,6 +801,7 @@ CONFIG_XFS_FS=m | |||
| 796 | CONFIG_OCFS2_FS=m | 801 | CONFIG_OCFS2_FS=m |
| 797 | CONFIG_OCFS2_FS_O2CB=m | 802 | CONFIG_OCFS2_FS_O2CB=m |
| 798 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 803 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 804 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 799 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 805 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 800 | # CONFIG_OCFS2_DEBUG_FS is not set | 806 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 801 | CONFIG_DNOTIFY=y | 807 | CONFIG_DNOTIFY=y |
| @@ -855,6 +861,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 855 | CONFIG_CRAMFS=m | 861 | CONFIG_CRAMFS=m |
| 856 | # CONFIG_VXFS_FS is not set | 862 | # CONFIG_VXFS_FS is not set |
| 857 | CONFIG_MINIX_FS=y | 863 | CONFIG_MINIX_FS=y |
| 864 | # CONFIG_OMFS_FS is not set | ||
| 858 | CONFIG_HPFS_FS=m | 865 | CONFIG_HPFS_FS=m |
| 859 | # CONFIG_QNX4FS_FS is not set | 866 | # CONFIG_QNX4FS_FS is not set |
| 860 | # CONFIG_ROMFS_FS is not set | 867 | # CONFIG_ROMFS_FS is not set |
| @@ -867,18 +874,17 @@ CONFIG_NFS_FS=y | |||
| 867 | CONFIG_NFS_V3=y | 874 | CONFIG_NFS_V3=y |
| 868 | # CONFIG_NFS_V3_ACL is not set | 875 | # CONFIG_NFS_V3_ACL is not set |
| 869 | CONFIG_NFS_V4=y | 876 | CONFIG_NFS_V4=y |
| 877 | CONFIG_ROOT_NFS=y | ||
| 870 | CONFIG_NFSD=m | 878 | CONFIG_NFSD=m |
| 871 | CONFIG_NFSD_V3=y | 879 | CONFIG_NFSD_V3=y |
| 872 | # CONFIG_NFSD_V3_ACL is not set | 880 | # CONFIG_NFSD_V3_ACL is not set |
| 873 | # CONFIG_NFSD_V4 is not set | 881 | # CONFIG_NFSD_V4 is not set |
| 874 | CONFIG_ROOT_NFS=y | ||
| 875 | CONFIG_LOCKD=y | 882 | CONFIG_LOCKD=y |
| 876 | CONFIG_LOCKD_V4=y | 883 | CONFIG_LOCKD_V4=y |
| 877 | CONFIG_EXPORTFS=m | 884 | CONFIG_EXPORTFS=m |
| 878 | CONFIG_NFS_COMMON=y | 885 | CONFIG_NFS_COMMON=y |
| 879 | CONFIG_SUNRPC=y | 886 | CONFIG_SUNRPC=y |
| 880 | CONFIG_SUNRPC_GSS=y | 887 | CONFIG_SUNRPC_GSS=y |
| 881 | CONFIG_SUNRPC_BIND34=y | ||
| 882 | CONFIG_RPCSEC_GSS_KRB5=y | 888 | CONFIG_RPCSEC_GSS_KRB5=y |
| 883 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 889 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 884 | CONFIG_SMB_FS=m | 890 | CONFIG_SMB_FS=m |
| @@ -887,7 +893,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 887 | # CONFIG_CIFS is not set | 893 | # CONFIG_CIFS is not set |
| 888 | # CONFIG_NCP_FS is not set | 894 | # CONFIG_NCP_FS is not set |
| 889 | CONFIG_CODA_FS=m | 895 | CONFIG_CODA_FS=m |
| 890 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 891 | # CONFIG_AFS_FS is not set | 896 | # CONFIG_AFS_FS is not set |
| 892 | 897 | ||
| 893 | # | 898 | # |
| @@ -951,6 +956,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 951 | # CONFIG_HEADERS_CHECK is not set | 956 | # CONFIG_HEADERS_CHECK is not set |
| 952 | # CONFIG_DEBUG_KERNEL is not set | 957 | # CONFIG_DEBUG_KERNEL is not set |
| 953 | CONFIG_DEBUG_BUGVERBOSE=y | 958 | CONFIG_DEBUG_BUGVERBOSE=y |
| 959 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 960 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 954 | # CONFIG_SAMPLES is not set | 961 | # CONFIG_SAMPLES is not set |
| 955 | 962 | ||
| 956 | # | 963 | # |
| @@ -1010,6 +1017,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1010 | CONFIG_CRYPTO_MD4=m | 1017 | CONFIG_CRYPTO_MD4=m |
| 1011 | CONFIG_CRYPTO_MD5=y | 1018 | CONFIG_CRYPTO_MD5=y |
| 1012 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1019 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1020 | CONFIG_CRYPTO_RMD128=m | ||
| 1021 | CONFIG_CRYPTO_RMD160=m | ||
| 1022 | CONFIG_CRYPTO_RMD256=m | ||
| 1023 | CONFIG_CRYPTO_RMD320=m | ||
| 1013 | CONFIG_CRYPTO_SHA1=m | 1024 | CONFIG_CRYPTO_SHA1=m |
| 1014 | CONFIG_CRYPTO_SHA256=m | 1025 | CONFIG_CRYPTO_SHA256=m |
| 1015 | CONFIG_CRYPTO_SHA512=m | 1026 | CONFIG_CRYPTO_SHA512=m |
| @@ -1051,6 +1062,7 @@ CONFIG_BITREVERSE=y | |||
| 1051 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1062 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1052 | CONFIG_CRC_CCITT=m | 1063 | CONFIG_CRC_CCITT=m |
| 1053 | CONFIG_CRC16=m | 1064 | CONFIG_CRC16=m |
| 1065 | CONFIG_CRC_T10DIF=y | ||
| 1054 | CONFIG_CRC_ITU_T=m | 1066 | CONFIG_CRC_ITU_T=m |
| 1055 | CONFIG_CRC32=y | 1067 | CONFIG_CRC32=y |
| 1056 | # CONFIG_CRC7 is not set | 1068 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 7cd375740348..db6e8822594a 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:06 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m | |||
| 163 | CONFIG_PROC_HARDWARE=y | 169 | CONFIG_PROC_HARDWARE=y |
| 164 | CONFIG_ZONE_DMA=y | 170 | CONFIG_ZONE_DMA=y |
| 165 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 171 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 166 | |||
| 167 | # | ||
| 168 | # Networking | ||
| 169 | # | ||
| 170 | CONFIG_NET=y | 172 | CONFIG_NET=y |
| 171 | 173 | ||
| 172 | # | 174 | # |
| @@ -180,6 +182,7 @@ CONFIG_XFRM=y | |||
| 180 | # CONFIG_XFRM_SUB_POLICY is not set | 182 | # CONFIG_XFRM_SUB_POLICY is not set |
| 181 | CONFIG_XFRM_MIGRATE=y | 183 | CONFIG_XFRM_MIGRATE=y |
| 182 | # CONFIG_XFRM_STATISTICS is not set | 184 | # CONFIG_XFRM_STATISTICS is not set |
| 185 | CONFIG_XFRM_IPCOMP=m | ||
| 183 | CONFIG_NET_KEY=y | 186 | CONFIG_NET_KEY=y |
| 184 | CONFIG_NET_KEY_MIGRATE=y | 187 | CONFIG_NET_KEY_MIGRATE=y |
| 185 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| @@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 413 | # | 416 | # |
| 414 | # CONFIG_CFG80211 is not set | 417 | # CONFIG_CFG80211 is not set |
| 415 | CONFIG_WIRELESS_EXT=y | 418 | CONFIG_WIRELESS_EXT=y |
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 416 | # CONFIG_MAC80211 is not set | 420 | # CONFIG_MAC80211 is not set |
| 417 | CONFIG_IEEE80211=m | 421 | CONFIG_IEEE80211=m |
| 418 | # CONFIG_IEEE80211_DEBUG is not set | 422 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 433 | CONFIG_STANDALONE=y | 437 | CONFIG_STANDALONE=y |
| 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 438 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 435 | CONFIG_FW_LOADER=m | 439 | CONFIG_FW_LOADER=y |
| 440 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 441 | CONFIG_EXTRA_FIRMWARE="" | ||
| 436 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
| 437 | CONFIG_CONNECTOR=m | 443 | CONFIG_CONNECTOR=m |
| 438 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
| @@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 450 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 456 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 451 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 457 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 452 | CONFIG_ATA_OVER_ETH=m | 458 | CONFIG_ATA_OVER_ETH=m |
| 459 | # CONFIG_BLK_DEV_HD is not set | ||
| 453 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
| 454 | # CONFIG_EEPROM_93CX6 is not set | 461 | # CONFIG_EEPROM_93CX6 is not set |
| 455 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -460,6 +467,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 460 | # | 467 | # |
| 461 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 468 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 462 | # | 469 | # |
| 470 | CONFIG_IDE_ATAPI=y | ||
| 463 | # CONFIG_BLK_DEV_IDE_SATA is not set | 471 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 464 | CONFIG_BLK_DEV_IDEDISK=y | 472 | CONFIG_BLK_DEV_IDEDISK=y |
| 465 | # CONFIG_IDEDISK_MULTI_MODE is not set | 473 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -477,8 +485,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 477 | # CONFIG_BLK_DEV_PLATFORM is not set | 485 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 478 | CONFIG_BLK_DEV_MAC_IDE=y | 486 | CONFIG_BLK_DEV_MAC_IDE=y |
| 479 | # CONFIG_BLK_DEV_IDEDMA is not set | 487 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 480 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 481 | # CONFIG_BLK_DEV_HD is not set | ||
| 482 | 488 | ||
| 483 | # | 489 | # |
| 484 | # SCSI device support | 490 | # SCSI device support |
| @@ -527,6 +533,7 @@ CONFIG_ISCSI_TCP=m | |||
| 527 | # CONFIG_SCSI_DEBUG is not set | 533 | # CONFIG_SCSI_DEBUG is not set |
| 528 | CONFIG_MAC_SCSI=y | 534 | CONFIG_MAC_SCSI=y |
| 529 | CONFIG_SCSI_MAC_ESP=y | 535 | CONFIG_SCSI_MAC_ESP=y |
| 536 | # CONFIG_SCSI_DH is not set | ||
| 530 | CONFIG_MD=y | 537 | CONFIG_MD=y |
| 531 | CONFIG_BLK_DEV_MD=m | 538 | CONFIG_BLK_DEV_MD=m |
| 532 | CONFIG_MD_LINEAR=m | 539 | CONFIG_MD_LINEAR=m |
| @@ -535,7 +542,7 @@ CONFIG_MD_RAID1=m | |||
| 535 | # CONFIG_MD_RAID10 is not set | 542 | # CONFIG_MD_RAID10 is not set |
| 536 | CONFIG_MD_RAID456=m | 543 | CONFIG_MD_RAID456=m |
| 537 | CONFIG_MD_RAID5_RESHAPE=y | 544 | CONFIG_MD_RAID5_RESHAPE=y |
| 538 | CONFIG_MD_MULTIPATH=m | 545 | # CONFIG_MD_MULTIPATH is not set |
| 539 | # CONFIG_MD_FAULTY is not set | 546 | # CONFIG_MD_FAULTY is not set |
| 540 | CONFIG_BLK_DEV_DM=m | 547 | CONFIG_BLK_DEV_DM=m |
| 541 | # CONFIG_DM_DEBUG is not set | 548 | # CONFIG_DM_DEBUG is not set |
| @@ -544,9 +551,6 @@ CONFIG_DM_SNAPSHOT=m | |||
| 544 | CONFIG_DM_MIRROR=m | 551 | CONFIG_DM_MIRROR=m |
| 545 | CONFIG_DM_ZERO=m | 552 | CONFIG_DM_ZERO=m |
| 546 | CONFIG_DM_MULTIPATH=m | 553 | CONFIG_DM_MULTIPATH=m |
| 547 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 548 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 549 | CONFIG_DM_MULTIPATH_HP=m | ||
| 550 | # CONFIG_DM_DELAY is not set | 554 | # CONFIG_DM_DELAY is not set |
| 551 | CONFIG_DM_UEVENT=y | 555 | CONFIG_DM_UEVENT=y |
| 552 | CONFIG_MACINTOSH_DRIVERS=y | 556 | CONFIG_MACINTOSH_DRIVERS=y |
| @@ -559,7 +563,6 @@ CONFIG_ADB_CUDA=y | |||
| 559 | CONFIG_INPUT_ADBHID=y | 563 | CONFIG_INPUT_ADBHID=y |
| 560 | CONFIG_MAC_EMUMOUSEBTN=y | 564 | CONFIG_MAC_EMUMOUSEBTN=y |
| 561 | CONFIG_NETDEVICES=y | 565 | CONFIG_NETDEVICES=y |
| 562 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 563 | CONFIG_DUMMY=m | 566 | CONFIG_DUMMY=m |
| 564 | # CONFIG_BONDING is not set | 567 | # CONFIG_BONDING is not set |
| 565 | CONFIG_MACVLAN=m | 568 | CONFIG_MACVLAN=m |
| @@ -670,6 +673,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 670 | # Character devices | 673 | # Character devices |
| 671 | # | 674 | # |
| 672 | CONFIG_VT=y | 675 | CONFIG_VT=y |
| 676 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 673 | CONFIG_VT_CONSOLE=y | 677 | CONFIG_VT_CONSOLE=y |
| 674 | CONFIG_HW_CONSOLE=y | 678 | CONFIG_HW_CONSOLE=y |
| 675 | CONFIG_VT_HW_CONSOLE_BINDING=y | 679 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -700,6 +704,7 @@ CONFIG_GEN_RTC_X=y | |||
| 700 | # CONFIG_POWER_SUPPLY is not set | 704 | # CONFIG_POWER_SUPPLY is not set |
| 701 | # CONFIG_HWMON is not set | 705 | # CONFIG_HWMON is not set |
| 702 | # CONFIG_THERMAL is not set | 706 | # CONFIG_THERMAL is not set |
| 707 | # CONFIG_THERMAL_HWMON is not set | ||
| 703 | # CONFIG_WATCHDOG is not set | 708 | # CONFIG_WATCHDOG is not set |
| 704 | 709 | ||
| 705 | # | 710 | # |
| @@ -711,8 +716,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 711 | # | 716 | # |
| 712 | # Multifunction device drivers | 717 | # Multifunction device drivers |
| 713 | # | 718 | # |
| 719 | # CONFIG_MFD_CORE is not set | ||
| 714 | # CONFIG_MFD_SM501 is not set | 720 | # CONFIG_MFD_SM501 is not set |
| 715 | # CONFIG_HTC_PASIC3 is not set | 721 | # CONFIG_HTC_PASIC3 is not set |
| 722 | # CONFIG_MFD_TMIO is not set | ||
| 716 | 723 | ||
| 717 | # | 724 | # |
| 718 | # Multimedia devices | 725 | # Multimedia devices |
| @@ -784,10 +791,6 @@ CONFIG_LOGO_LINUX_MONO=y | |||
| 784 | CONFIG_LOGO_LINUX_VGA16=y | 791 | CONFIG_LOGO_LINUX_VGA16=y |
| 785 | CONFIG_LOGO_LINUX_CLUT224=y | 792 | CONFIG_LOGO_LINUX_CLUT224=y |
| 786 | CONFIG_LOGO_MAC_CLUT224=y | 793 | CONFIG_LOGO_MAC_CLUT224=y |
| 787 | |||
| 788 | # | ||
| 789 | # Sound | ||
| 790 | # | ||
| 791 | # CONFIG_SOUND is not set | 794 | # CONFIG_SOUND is not set |
| 792 | CONFIG_HID_SUPPORT=y | 795 | CONFIG_HID_SUPPORT=y |
| 793 | CONFIG_HID=m | 796 | CONFIG_HID=m |
| @@ -799,6 +802,7 @@ CONFIG_HIDRAW=y | |||
| 799 | # CONFIG_NEW_LEDS is not set | 802 | # CONFIG_NEW_LEDS is not set |
| 800 | # CONFIG_ACCESSIBILITY is not set | 803 | # CONFIG_ACCESSIBILITY is not set |
| 801 | # CONFIG_RTC_CLASS is not set | 804 | # CONFIG_RTC_CLASS is not set |
| 805 | # CONFIG_DMADEVICES is not set | ||
| 802 | # CONFIG_UIO is not set | 806 | # CONFIG_UIO is not set |
| 803 | 807 | ||
| 804 | # | 808 | # |
| @@ -836,6 +840,7 @@ CONFIG_XFS_FS=m | |||
| 836 | CONFIG_OCFS2_FS=m | 840 | CONFIG_OCFS2_FS=m |
| 837 | CONFIG_OCFS2_FS_O2CB=m | 841 | CONFIG_OCFS2_FS_O2CB=m |
| 838 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 842 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 843 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 839 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 844 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 840 | # CONFIG_OCFS2_DEBUG_FS is not set | 845 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 841 | CONFIG_DNOTIFY=y | 846 | CONFIG_DNOTIFY=y |
| @@ -895,6 +900,7 @@ CONFIG_HFSPLUS_FS=y | |||
| 895 | CONFIG_CRAMFS=m | 900 | CONFIG_CRAMFS=m |
| 896 | # CONFIG_VXFS_FS is not set | 901 | # CONFIG_VXFS_FS is not set |
| 897 | CONFIG_MINIX_FS=y | 902 | CONFIG_MINIX_FS=y |
| 903 | # CONFIG_OMFS_FS is not set | ||
| 898 | CONFIG_HPFS_FS=m | 904 | CONFIG_HPFS_FS=m |
| 899 | # CONFIG_QNX4FS_FS is not set | 905 | # CONFIG_QNX4FS_FS is not set |
| 900 | # CONFIG_ROMFS_FS is not set | 906 | # CONFIG_ROMFS_FS is not set |
| @@ -917,7 +923,6 @@ CONFIG_EXPORTFS=m | |||
| 917 | CONFIG_NFS_COMMON=y | 923 | CONFIG_NFS_COMMON=y |
| 918 | CONFIG_SUNRPC=m | 924 | CONFIG_SUNRPC=m |
| 919 | CONFIG_SUNRPC_GSS=m | 925 | CONFIG_SUNRPC_GSS=m |
| 920 | CONFIG_SUNRPC_BIND34=y | ||
| 921 | CONFIG_RPCSEC_GSS_KRB5=m | 926 | CONFIG_RPCSEC_GSS_KRB5=m |
| 922 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 927 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 923 | CONFIG_SMB_FS=m | 928 | CONFIG_SMB_FS=m |
| @@ -926,7 +931,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 926 | # CONFIG_CIFS is not set | 931 | # CONFIG_CIFS is not set |
| 927 | # CONFIG_NCP_FS is not set | 932 | # CONFIG_NCP_FS is not set |
| 928 | CONFIG_CODA_FS=m | 933 | CONFIG_CODA_FS=m |
| 929 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 930 | # CONFIG_AFS_FS is not set | 934 | # CONFIG_AFS_FS is not set |
| 931 | 935 | ||
| 932 | # | 936 | # |
| @@ -991,6 +995,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 991 | # CONFIG_HEADERS_CHECK is not set | 995 | # CONFIG_HEADERS_CHECK is not set |
| 992 | # CONFIG_DEBUG_KERNEL is not set | 996 | # CONFIG_DEBUG_KERNEL is not set |
| 993 | CONFIG_DEBUG_BUGVERBOSE=y | 997 | CONFIG_DEBUG_BUGVERBOSE=y |
| 998 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 999 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 994 | # CONFIG_SAMPLES is not set | 1000 | # CONFIG_SAMPLES is not set |
| 995 | 1001 | ||
| 996 | # | 1002 | # |
| @@ -1050,6 +1056,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1050 | CONFIG_CRYPTO_MD4=m | 1056 | CONFIG_CRYPTO_MD4=m |
| 1051 | CONFIG_CRYPTO_MD5=m | 1057 | CONFIG_CRYPTO_MD5=m |
| 1052 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1058 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1059 | CONFIG_CRYPTO_RMD128=m | ||
| 1060 | CONFIG_CRYPTO_RMD160=m | ||
| 1061 | CONFIG_CRYPTO_RMD256=m | ||
| 1062 | CONFIG_CRYPTO_RMD320=m | ||
| 1053 | CONFIG_CRYPTO_SHA1=m | 1063 | CONFIG_CRYPTO_SHA1=m |
| 1054 | CONFIG_CRYPTO_SHA256=m | 1064 | CONFIG_CRYPTO_SHA256=m |
| 1055 | CONFIG_CRYPTO_SHA512=m | 1065 | CONFIG_CRYPTO_SHA512=m |
| @@ -1091,6 +1101,7 @@ CONFIG_BITREVERSE=y | |||
| 1091 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1101 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1092 | CONFIG_CRC_CCITT=m | 1102 | CONFIG_CRC_CCITT=m |
| 1093 | CONFIG_CRC16=m | 1103 | CONFIG_CRC16=m |
| 1104 | CONFIG_CRC_T10DIF=y | ||
| 1094 | CONFIG_CRC_ITU_T=m | 1105 | CONFIG_CRC_ITU_T=m |
| 1095 | CONFIG_CRC32=y | 1106 | CONFIG_CRC32=y |
| 1096 | # CONFIG_CRC7 is not set | 1107 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 0747fa3984df..1a806102b999 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:07 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -173,10 +179,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 173 | CONFIG_ZONE_DMA=y | 179 | CONFIG_ZONE_DMA=y |
| 174 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 180 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 175 | CONFIG_ZORRO_NAMES=y | 181 | CONFIG_ZORRO_NAMES=y |
| 176 | |||
| 177 | # | ||
| 178 | # Networking | ||
| 179 | # | ||
| 180 | CONFIG_NET=y | 182 | CONFIG_NET=y |
| 181 | 183 | ||
| 182 | # | 184 | # |
| @@ -190,6 +192,7 @@ CONFIG_XFRM=y | |||
| 190 | # CONFIG_XFRM_SUB_POLICY is not set | 192 | # CONFIG_XFRM_SUB_POLICY is not set |
| 191 | CONFIG_XFRM_MIGRATE=y | 193 | CONFIG_XFRM_MIGRATE=y |
| 192 | # CONFIG_XFRM_STATISTICS is not set | 194 | # CONFIG_XFRM_STATISTICS is not set |
| 195 | CONFIG_XFRM_IPCOMP=m | ||
| 193 | CONFIG_NET_KEY=y | 196 | CONFIG_NET_KEY=y |
| 194 | CONFIG_NET_KEY_MIGRATE=y | 197 | CONFIG_NET_KEY_MIGRATE=y |
| 195 | CONFIG_INET=y | 198 | CONFIG_INET=y |
| @@ -427,6 +430,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 427 | # | 430 | # |
| 428 | # CONFIG_CFG80211 is not set | 431 | # CONFIG_CFG80211 is not set |
| 429 | CONFIG_WIRELESS_EXT=y | 432 | CONFIG_WIRELESS_EXT=y |
| 433 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 430 | # CONFIG_MAC80211 is not set | 434 | # CONFIG_MAC80211 is not set |
| 431 | CONFIG_IEEE80211=m | 435 | CONFIG_IEEE80211=m |
| 432 | # CONFIG_IEEE80211_DEBUG is not set | 436 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -446,7 +450,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 446 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 450 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 447 | CONFIG_STANDALONE=y | 451 | CONFIG_STANDALONE=y |
| 448 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 452 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 449 | CONFIG_FW_LOADER=m | 453 | CONFIG_FW_LOADER=y |
| 454 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 455 | CONFIG_EXTRA_FIRMWARE="" | ||
| 450 | # CONFIG_SYS_HYPERVISOR is not set | 456 | # CONFIG_SYS_HYPERVISOR is not set |
| 451 | CONFIG_CONNECTOR=m | 457 | CONFIG_CONNECTOR=m |
| 452 | # CONFIG_MTD is not set | 458 | # CONFIG_MTD is not set |
| @@ -476,6 +482,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 476 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 482 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 477 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 483 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 478 | CONFIG_ATA_OVER_ETH=m | 484 | CONFIG_ATA_OVER_ETH=m |
| 485 | # CONFIG_BLK_DEV_HD is not set | ||
| 479 | CONFIG_MISC_DEVICES=y | 486 | CONFIG_MISC_DEVICES=y |
| 480 | # CONFIG_EEPROM_93CX6 is not set | 487 | # CONFIG_EEPROM_93CX6 is not set |
| 481 | # CONFIG_ENCLOSURE_SERVICES is not set | 488 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -486,6 +493,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 486 | # | 493 | # |
| 487 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 494 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 488 | # | 495 | # |
| 496 | CONFIG_IDE_ATAPI=y | ||
| 489 | # CONFIG_BLK_DEV_IDE_SATA is not set | 497 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 490 | CONFIG_BLK_DEV_IDEDISK=y | 498 | CONFIG_BLK_DEV_IDEDISK=y |
| 491 | # CONFIG_IDEDISK_MULTI_MODE is not set | 499 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -508,8 +516,6 @@ CONFIG_BLK_DEV_FALCON_IDE=y | |||
| 508 | CONFIG_BLK_DEV_MAC_IDE=y | 516 | CONFIG_BLK_DEV_MAC_IDE=y |
| 509 | CONFIG_BLK_DEV_Q40IDE=y | 517 | CONFIG_BLK_DEV_Q40IDE=y |
| 510 | # CONFIG_BLK_DEV_IDEDMA is not set | 518 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 511 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 512 | # CONFIG_BLK_DEV_HD is not set | ||
| 513 | 519 | ||
| 514 | # | 520 | # |
| 515 | # SCSI device support | 521 | # SCSI device support |
| @@ -584,6 +590,7 @@ CONFIG_MVME147_SCSI=y | |||
| 584 | CONFIG_MVME16x_SCSI=y | 590 | CONFIG_MVME16x_SCSI=y |
| 585 | CONFIG_BVME6000_SCSI=y | 591 | CONFIG_BVME6000_SCSI=y |
| 586 | CONFIG_SUN3X_ESP=y | 592 | CONFIG_SUN3X_ESP=y |
| 593 | # CONFIG_SCSI_DH is not set | ||
| 587 | CONFIG_MD=y | 594 | CONFIG_MD=y |
| 588 | CONFIG_BLK_DEV_MD=m | 595 | CONFIG_BLK_DEV_MD=m |
| 589 | CONFIG_MD_LINEAR=m | 596 | CONFIG_MD_LINEAR=m |
| @@ -592,7 +599,7 @@ CONFIG_MD_RAID1=m | |||
| 592 | # CONFIG_MD_RAID10 is not set | 599 | # CONFIG_MD_RAID10 is not set |
| 593 | CONFIG_MD_RAID456=m | 600 | CONFIG_MD_RAID456=m |
| 594 | CONFIG_MD_RAID5_RESHAPE=y | 601 | CONFIG_MD_RAID5_RESHAPE=y |
| 595 | CONFIG_MD_MULTIPATH=m | 602 | # CONFIG_MD_MULTIPATH is not set |
| 596 | # CONFIG_MD_FAULTY is not set | 603 | # CONFIG_MD_FAULTY is not set |
| 597 | CONFIG_BLK_DEV_DM=m | 604 | CONFIG_BLK_DEV_DM=m |
| 598 | # CONFIG_DM_DEBUG is not set | 605 | # CONFIG_DM_DEBUG is not set |
| @@ -601,9 +608,6 @@ CONFIG_DM_SNAPSHOT=m | |||
| 601 | CONFIG_DM_MIRROR=m | 608 | CONFIG_DM_MIRROR=m |
| 602 | CONFIG_DM_ZERO=m | 609 | CONFIG_DM_ZERO=m |
| 603 | CONFIG_DM_MULTIPATH=m | 610 | CONFIG_DM_MULTIPATH=m |
| 604 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 605 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 606 | CONFIG_DM_MULTIPATH_HP=m | ||
| 607 | # CONFIG_DM_DELAY is not set | 611 | # CONFIG_DM_DELAY is not set |
| 608 | CONFIG_DM_UEVENT=y | 612 | CONFIG_DM_UEVENT=y |
| 609 | CONFIG_MACINTOSH_DRIVERS=y | 613 | CONFIG_MACINTOSH_DRIVERS=y |
| @@ -616,7 +620,6 @@ CONFIG_ADB_CUDA=y | |||
| 616 | CONFIG_INPUT_ADBHID=y | 620 | CONFIG_INPUT_ADBHID=y |
| 617 | CONFIG_MAC_EMUMOUSEBTN=y | 621 | CONFIG_MAC_EMUMOUSEBTN=y |
| 618 | CONFIG_NETDEVICES=y | 622 | CONFIG_NETDEVICES=y |
| 619 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 620 | CONFIG_DUMMY=m | 623 | CONFIG_DUMMY=m |
| 621 | # CONFIG_BONDING is not set | 624 | # CONFIG_BONDING is not set |
| 622 | CONFIG_MACVLAN=m | 625 | CONFIG_MACVLAN=m |
| @@ -632,7 +635,6 @@ CONFIG_A2065=m | |||
| 632 | CONFIG_HYDRA=m | 635 | CONFIG_HYDRA=m |
| 633 | CONFIG_ZORRO8390=m | 636 | CONFIG_ZORRO8390=m |
| 634 | CONFIG_APNE=m | 637 | CONFIG_APNE=m |
| 635 | CONFIG_APOLLO_ELPLUS=y | ||
| 636 | CONFIG_MAC8390=y | 638 | CONFIG_MAC8390=y |
| 637 | CONFIG_MAC89x0=m | 639 | CONFIG_MAC89x0=m |
| 638 | CONFIG_MACSONIC=m | 640 | CONFIG_MACSONIC=m |
| @@ -791,6 +793,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 791 | # Character devices | 793 | # Character devices |
| 792 | # | 794 | # |
| 793 | CONFIG_VT=y | 795 | CONFIG_VT=y |
| 796 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 794 | CONFIG_VT_CONSOLE=y | 797 | CONFIG_VT_CONSOLE=y |
| 795 | CONFIG_HW_CONSOLE=y | 798 | CONFIG_HW_CONSOLE=y |
| 796 | CONFIG_VT_HW_CONSOLE_BINDING=y | 799 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -827,6 +830,7 @@ CONFIG_GEN_RTC_X=y | |||
| 827 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
| 828 | # CONFIG_HWMON is not set | 831 | # CONFIG_HWMON is not set |
| 829 | # CONFIG_THERMAL is not set | 832 | # CONFIG_THERMAL is not set |
| 833 | # CONFIG_THERMAL_HWMON is not set | ||
| 830 | # CONFIG_WATCHDOG is not set | 834 | # CONFIG_WATCHDOG is not set |
| 831 | 835 | ||
| 832 | # | 836 | # |
| @@ -838,8 +842,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 838 | # | 842 | # |
| 839 | # Multifunction device drivers | 843 | # Multifunction device drivers |
| 840 | # | 844 | # |
| 845 | # CONFIG_MFD_CORE is not set | ||
| 841 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 842 | # CONFIG_HTC_PASIC3 is not set | 847 | # CONFIG_HTC_PASIC3 is not set |
| 848 | # CONFIG_MFD_TMIO is not set | ||
| 843 | 849 | ||
| 844 | # | 850 | # |
| 845 | # Multimedia devices | 851 | # Multimedia devices |
| @@ -923,10 +929,6 @@ CONFIG_LOGO_LINUX_MONO=y | |||
| 923 | CONFIG_LOGO_LINUX_VGA16=y | 929 | CONFIG_LOGO_LINUX_VGA16=y |
| 924 | CONFIG_LOGO_LINUX_CLUT224=y | 930 | CONFIG_LOGO_LINUX_CLUT224=y |
| 925 | CONFIG_LOGO_MAC_CLUT224=y | 931 | CONFIG_LOGO_MAC_CLUT224=y |
| 926 | |||
| 927 | # | ||
| 928 | # Sound | ||
| 929 | # | ||
| 930 | CONFIG_SOUND=m | 932 | CONFIG_SOUND=m |
| 931 | CONFIG_DMASOUND_ATARI=m | 933 | CONFIG_DMASOUND_ATARI=m |
| 932 | CONFIG_DMASOUND_PAULA=m | 934 | CONFIG_DMASOUND_PAULA=m |
| @@ -942,6 +944,7 @@ CONFIG_HIDRAW=y | |||
| 942 | # CONFIG_NEW_LEDS is not set | 944 | # CONFIG_NEW_LEDS is not set |
| 943 | # CONFIG_ACCESSIBILITY is not set | 945 | # CONFIG_ACCESSIBILITY is not set |
| 944 | # CONFIG_RTC_CLASS is not set | 946 | # CONFIG_RTC_CLASS is not set |
| 947 | # CONFIG_DMADEVICES is not set | ||
| 945 | # CONFIG_AUXDISPLAY is not set | 948 | # CONFIG_AUXDISPLAY is not set |
| 946 | # CONFIG_UIO is not set | 949 | # CONFIG_UIO is not set |
| 947 | 950 | ||
| @@ -949,8 +952,6 @@ CONFIG_HIDRAW=y | |||
| 949 | # Character devices | 952 | # Character devices |
| 950 | # | 953 | # |
| 951 | CONFIG_ATARI_MFPSER=m | 954 | CONFIG_ATARI_MFPSER=m |
| 952 | CONFIG_ATARI_SCC=y | ||
| 953 | CONFIG_ATARI_SCC_DMA=y | ||
| 954 | CONFIG_ATARI_MIDI=m | 955 | CONFIG_ATARI_MIDI=m |
| 955 | CONFIG_ATARI_DSP56K=m | 956 | CONFIG_ATARI_DSP56K=m |
| 956 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 957 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
| @@ -972,8 +973,10 @@ CONFIG_EXT2_FS=y | |||
| 972 | # CONFIG_EXT2_FS_XIP is not set | 973 | # CONFIG_EXT2_FS_XIP is not set |
| 973 | CONFIG_EXT3_FS=y | 974 | CONFIG_EXT3_FS=y |
| 974 | # CONFIG_EXT3_FS_XATTR is not set | 975 | # CONFIG_EXT3_FS_XATTR is not set |
| 975 | # CONFIG_EXT4DEV_FS is not set | 976 | CONFIG_EXT4DEV_FS=y |
| 977 | # CONFIG_EXT4DEV_FS_XATTR is not set | ||
| 976 | CONFIG_JBD=y | 978 | CONFIG_JBD=y |
| 979 | CONFIG_JBD2=y | ||
| 977 | CONFIG_REISERFS_FS=m | 980 | CONFIG_REISERFS_FS=m |
| 978 | # CONFIG_REISERFS_CHECK is not set | 981 | # CONFIG_REISERFS_CHECK is not set |
| 979 | # CONFIG_REISERFS_PROC_INFO is not set | 982 | # CONFIG_REISERFS_PROC_INFO is not set |
| @@ -992,6 +995,7 @@ CONFIG_XFS_FS=m | |||
| 992 | CONFIG_OCFS2_FS=m | 995 | CONFIG_OCFS2_FS=m |
| 993 | CONFIG_OCFS2_FS_O2CB=m | 996 | CONFIG_OCFS2_FS_O2CB=m |
| 994 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 997 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 998 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 995 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 999 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 996 | # CONFIG_OCFS2_DEBUG_FS is not set | 1000 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 997 | CONFIG_DNOTIFY=y | 1001 | CONFIG_DNOTIFY=y |
| @@ -1051,6 +1055,7 @@ CONFIG_HFSPLUS_FS=y | |||
| 1051 | CONFIG_CRAMFS=m | 1055 | CONFIG_CRAMFS=m |
| 1052 | # CONFIG_VXFS_FS is not set | 1056 | # CONFIG_VXFS_FS is not set |
| 1053 | CONFIG_MINIX_FS=y | 1057 | CONFIG_MINIX_FS=y |
| 1058 | # CONFIG_OMFS_FS is not set | ||
| 1054 | CONFIG_HPFS_FS=m | 1059 | CONFIG_HPFS_FS=m |
| 1055 | # CONFIG_QNX4FS_FS is not set | 1060 | # CONFIG_QNX4FS_FS is not set |
| 1056 | # CONFIG_ROMFS_FS is not set | 1061 | # CONFIG_ROMFS_FS is not set |
| @@ -1063,18 +1068,17 @@ CONFIG_NFS_FS=y | |||
| 1063 | CONFIG_NFS_V3=y | 1068 | CONFIG_NFS_V3=y |
| 1064 | # CONFIG_NFS_V3_ACL is not set | 1069 | # CONFIG_NFS_V3_ACL is not set |
| 1065 | CONFIG_NFS_V4=y | 1070 | CONFIG_NFS_V4=y |
| 1071 | CONFIG_ROOT_NFS=y | ||
| 1066 | CONFIG_NFSD=m | 1072 | CONFIG_NFSD=m |
| 1067 | CONFIG_NFSD_V3=y | 1073 | CONFIG_NFSD_V3=y |
| 1068 | # CONFIG_NFSD_V3_ACL is not set | 1074 | # CONFIG_NFSD_V3_ACL is not set |
| 1069 | # CONFIG_NFSD_V4 is not set | 1075 | # CONFIG_NFSD_V4 is not set |
| 1070 | CONFIG_ROOT_NFS=y | ||
| 1071 | CONFIG_LOCKD=y | 1076 | CONFIG_LOCKD=y |
| 1072 | CONFIG_LOCKD_V4=y | 1077 | CONFIG_LOCKD_V4=y |
| 1073 | CONFIG_EXPORTFS=m | 1078 | CONFIG_EXPORTFS=m |
| 1074 | CONFIG_NFS_COMMON=y | 1079 | CONFIG_NFS_COMMON=y |
| 1075 | CONFIG_SUNRPC=y | 1080 | CONFIG_SUNRPC=y |
| 1076 | CONFIG_SUNRPC_GSS=y | 1081 | CONFIG_SUNRPC_GSS=y |
| 1077 | CONFIG_SUNRPC_BIND34=y | ||
| 1078 | CONFIG_RPCSEC_GSS_KRB5=y | 1082 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1079 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1083 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1080 | CONFIG_SMB_FS=m | 1084 | CONFIG_SMB_FS=m |
| @@ -1083,7 +1087,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 1083 | # CONFIG_CIFS is not set | 1087 | # CONFIG_CIFS is not set |
| 1084 | # CONFIG_NCP_FS is not set | 1088 | # CONFIG_NCP_FS is not set |
| 1085 | CONFIG_CODA_FS=m | 1089 | CONFIG_CODA_FS=m |
| 1086 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 1087 | # CONFIG_AFS_FS is not set | 1090 | # CONFIG_AFS_FS is not set |
| 1088 | 1091 | ||
| 1089 | # | 1092 | # |
| @@ -1152,6 +1155,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1152 | # CONFIG_HEADERS_CHECK is not set | 1155 | # CONFIG_HEADERS_CHECK is not set |
| 1153 | # CONFIG_DEBUG_KERNEL is not set | 1156 | # CONFIG_DEBUG_KERNEL is not set |
| 1154 | CONFIG_DEBUG_BUGVERBOSE=y | 1157 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1158 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1159 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1155 | # CONFIG_SAMPLES is not set | 1160 | # CONFIG_SAMPLES is not set |
| 1156 | 1161 | ||
| 1157 | # | 1162 | # |
| @@ -1211,6 +1216,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1211 | CONFIG_CRYPTO_MD4=m | 1216 | CONFIG_CRYPTO_MD4=m |
| 1212 | CONFIG_CRYPTO_MD5=y | 1217 | CONFIG_CRYPTO_MD5=y |
| 1213 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1218 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1219 | CONFIG_CRYPTO_RMD128=m | ||
| 1220 | CONFIG_CRYPTO_RMD160=m | ||
| 1221 | CONFIG_CRYPTO_RMD256=m | ||
| 1222 | CONFIG_CRYPTO_RMD320=m | ||
| 1214 | CONFIG_CRYPTO_SHA1=m | 1223 | CONFIG_CRYPTO_SHA1=m |
| 1215 | CONFIG_CRYPTO_SHA256=m | 1224 | CONFIG_CRYPTO_SHA256=m |
| 1216 | CONFIG_CRYPTO_SHA512=m | 1225 | CONFIG_CRYPTO_SHA512=m |
| @@ -1252,6 +1261,7 @@ CONFIG_BITREVERSE=y | |||
| 1252 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1261 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1253 | CONFIG_CRC_CCITT=m | 1262 | CONFIG_CRC_CCITT=m |
| 1254 | CONFIG_CRC16=y | 1263 | CONFIG_CRC16=y |
| 1264 | CONFIG_CRC_T10DIF=y | ||
| 1255 | CONFIG_CRC_ITU_T=m | 1265 | CONFIG_CRC_ITU_T=m |
| 1256 | CONFIG_CRC32=y | 1266 | CONFIG_CRC32=y |
| 1257 | # CONFIG_CRC7 is not set | 1267 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index e7a8246840b5..cacb5aef6a37 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:08 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m | |||
| 163 | CONFIG_PROC_HARDWARE=y | 169 | CONFIG_PROC_HARDWARE=y |
| 164 | CONFIG_ZONE_DMA=y | 170 | CONFIG_ZONE_DMA=y |
| 165 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 171 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 166 | |||
| 167 | # | ||
| 168 | # Networking | ||
| 169 | # | ||
| 170 | CONFIG_NET=y | 172 | CONFIG_NET=y |
| 171 | 173 | ||
| 172 | # | 174 | # |
| @@ -180,6 +182,7 @@ CONFIG_XFRM=y | |||
| 180 | # CONFIG_XFRM_SUB_POLICY is not set | 182 | # CONFIG_XFRM_SUB_POLICY is not set |
| 181 | CONFIG_XFRM_MIGRATE=y | 183 | CONFIG_XFRM_MIGRATE=y |
| 182 | # CONFIG_XFRM_STATISTICS is not set | 184 | # CONFIG_XFRM_STATISTICS is not set |
| 185 | CONFIG_XFRM_IPCOMP=m | ||
| 183 | CONFIG_NET_KEY=y | 186 | CONFIG_NET_KEY=y |
| 184 | CONFIG_NET_KEY_MIGRATE=y | 187 | CONFIG_NET_KEY_MIGRATE=y |
| 185 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| @@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 413 | # | 416 | # |
| 414 | # CONFIG_CFG80211 is not set | 417 | # CONFIG_CFG80211 is not set |
| 415 | CONFIG_WIRELESS_EXT=y | 418 | CONFIG_WIRELESS_EXT=y |
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 416 | # CONFIG_MAC80211 is not set | 420 | # CONFIG_MAC80211 is not set |
| 417 | CONFIG_IEEE80211=m | 421 | CONFIG_IEEE80211=m |
| 418 | # CONFIG_IEEE80211_DEBUG is not set | 422 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 433 | CONFIG_STANDALONE=y | 437 | CONFIG_STANDALONE=y |
| 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 438 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 435 | CONFIG_FW_LOADER=m | 439 | CONFIG_FW_LOADER=y |
| 440 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 441 | CONFIG_EXTRA_FIRMWARE="" | ||
| 436 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
| 437 | CONFIG_CONNECTOR=m | 443 | CONFIG_CONNECTOR=m |
| 438 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
| @@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 450 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 456 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 451 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 457 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 452 | CONFIG_ATA_OVER_ETH=m | 458 | CONFIG_ATA_OVER_ETH=m |
| 459 | # CONFIG_BLK_DEV_HD is not set | ||
| 453 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
| 454 | # CONFIG_EEPROM_93CX6 is not set | 461 | # CONFIG_EEPROM_93CX6 is not set |
| 455 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -502,6 +509,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 502 | CONFIG_ISCSI_TCP=m | 509 | CONFIG_ISCSI_TCP=m |
| 503 | # CONFIG_SCSI_DEBUG is not set | 510 | # CONFIG_SCSI_DEBUG is not set |
| 504 | CONFIG_MVME147_SCSI=y | 511 | CONFIG_MVME147_SCSI=y |
| 512 | # CONFIG_SCSI_DH is not set | ||
| 505 | CONFIG_MD=y | 513 | CONFIG_MD=y |
| 506 | CONFIG_BLK_DEV_MD=m | 514 | CONFIG_BLK_DEV_MD=m |
| 507 | CONFIG_MD_LINEAR=m | 515 | CONFIG_MD_LINEAR=m |
| @@ -510,7 +518,7 @@ CONFIG_MD_RAID1=m | |||
| 510 | # CONFIG_MD_RAID10 is not set | 518 | # CONFIG_MD_RAID10 is not set |
| 511 | CONFIG_MD_RAID456=m | 519 | CONFIG_MD_RAID456=m |
| 512 | CONFIG_MD_RAID5_RESHAPE=y | 520 | CONFIG_MD_RAID5_RESHAPE=y |
| 513 | CONFIG_MD_MULTIPATH=m | 521 | # CONFIG_MD_MULTIPATH is not set |
| 514 | # CONFIG_MD_FAULTY is not set | 522 | # CONFIG_MD_FAULTY is not set |
| 515 | CONFIG_BLK_DEV_DM=m | 523 | CONFIG_BLK_DEV_DM=m |
| 516 | # CONFIG_DM_DEBUG is not set | 524 | # CONFIG_DM_DEBUG is not set |
| @@ -519,13 +527,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 519 | CONFIG_DM_MIRROR=m | 527 | CONFIG_DM_MIRROR=m |
| 520 | CONFIG_DM_ZERO=m | 528 | CONFIG_DM_ZERO=m |
| 521 | CONFIG_DM_MULTIPATH=m | 529 | CONFIG_DM_MULTIPATH=m |
| 522 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 523 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 524 | CONFIG_DM_MULTIPATH_HP=m | ||
| 525 | # CONFIG_DM_DELAY is not set | 530 | # CONFIG_DM_DELAY is not set |
| 526 | CONFIG_DM_UEVENT=y | 531 | CONFIG_DM_UEVENT=y |
| 527 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
| 528 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 529 | CONFIG_DUMMY=m | 533 | CONFIG_DUMMY=m |
| 530 | # CONFIG_BONDING is not set | 534 | # CONFIG_BONDING is not set |
| 531 | CONFIG_MACVLAN=m | 535 | CONFIG_MACVLAN=m |
| @@ -630,6 +634,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 630 | # Character devices | 634 | # Character devices |
| 631 | # | 635 | # |
| 632 | CONFIG_VT=y | 636 | CONFIG_VT=y |
| 637 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 633 | CONFIG_VT_CONSOLE=y | 638 | CONFIG_VT_CONSOLE=y |
| 634 | CONFIG_HW_CONSOLE=y | 639 | CONFIG_HW_CONSOLE=y |
| 635 | CONFIG_VT_HW_CONSOLE_BINDING=y | 640 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -660,6 +665,7 @@ CONFIG_GEN_RTC_X=y | |||
| 660 | # CONFIG_POWER_SUPPLY is not set | 665 | # CONFIG_POWER_SUPPLY is not set |
| 661 | # CONFIG_HWMON is not set | 666 | # CONFIG_HWMON is not set |
| 662 | # CONFIG_THERMAL is not set | 667 | # CONFIG_THERMAL is not set |
| 668 | # CONFIG_THERMAL_HWMON is not set | ||
| 663 | # CONFIG_WATCHDOG is not set | 669 | # CONFIG_WATCHDOG is not set |
| 664 | 670 | ||
| 665 | # | 671 | # |
| @@ -671,8 +677,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 671 | # | 677 | # |
| 672 | # Multifunction device drivers | 678 | # Multifunction device drivers |
| 673 | # | 679 | # |
| 680 | # CONFIG_MFD_CORE is not set | ||
| 674 | # CONFIG_MFD_SM501 is not set | 681 | # CONFIG_MFD_SM501 is not set |
| 675 | # CONFIG_HTC_PASIC3 is not set | 682 | # CONFIG_HTC_PASIC3 is not set |
| 683 | # CONFIG_MFD_TMIO is not set | ||
| 676 | 684 | ||
| 677 | # | 685 | # |
| 678 | # Multimedia devices | 686 | # Multimedia devices |
| @@ -707,10 +715,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 707 | # Console display driver support | 715 | # Console display driver support |
| 708 | # | 716 | # |
| 709 | CONFIG_DUMMY_CONSOLE=y | 717 | CONFIG_DUMMY_CONSOLE=y |
| 710 | |||
| 711 | # | ||
| 712 | # Sound | ||
| 713 | # | ||
| 714 | # CONFIG_SOUND is not set | 718 | # CONFIG_SOUND is not set |
| 715 | CONFIG_HID_SUPPORT=y | 719 | CONFIG_HID_SUPPORT=y |
| 716 | CONFIG_HID=m | 720 | CONFIG_HID=m |
| @@ -722,6 +726,7 @@ CONFIG_HIDRAW=y | |||
| 722 | # CONFIG_NEW_LEDS is not set | 726 | # CONFIG_NEW_LEDS is not set |
| 723 | # CONFIG_ACCESSIBILITY is not set | 727 | # CONFIG_ACCESSIBILITY is not set |
| 724 | # CONFIG_RTC_CLASS is not set | 728 | # CONFIG_RTC_CLASS is not set |
| 729 | # CONFIG_DMADEVICES is not set | ||
| 725 | # CONFIG_UIO is not set | 730 | # CONFIG_UIO is not set |
| 726 | 731 | ||
| 727 | # | 732 | # |
| @@ -758,6 +763,7 @@ CONFIG_XFS_FS=m | |||
| 758 | CONFIG_OCFS2_FS=m | 763 | CONFIG_OCFS2_FS=m |
| 759 | CONFIG_OCFS2_FS_O2CB=m | 764 | CONFIG_OCFS2_FS_O2CB=m |
| 760 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 765 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 766 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 761 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 767 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 762 | # CONFIG_OCFS2_DEBUG_FS is not set | 768 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 763 | CONFIG_DNOTIFY=y | 769 | CONFIG_DNOTIFY=y |
| @@ -817,6 +823,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 817 | CONFIG_CRAMFS=m | 823 | CONFIG_CRAMFS=m |
| 818 | # CONFIG_VXFS_FS is not set | 824 | # CONFIG_VXFS_FS is not set |
| 819 | CONFIG_MINIX_FS=y | 825 | CONFIG_MINIX_FS=y |
| 826 | # CONFIG_OMFS_FS is not set | ||
| 820 | CONFIG_HPFS_FS=m | 827 | CONFIG_HPFS_FS=m |
| 821 | # CONFIG_QNX4FS_FS is not set | 828 | # CONFIG_QNX4FS_FS is not set |
| 822 | # CONFIG_ROMFS_FS is not set | 829 | # CONFIG_ROMFS_FS is not set |
| @@ -829,18 +836,17 @@ CONFIG_NFS_FS=y | |||
| 829 | CONFIG_NFS_V3=y | 836 | CONFIG_NFS_V3=y |
| 830 | # CONFIG_NFS_V3_ACL is not set | 837 | # CONFIG_NFS_V3_ACL is not set |
| 831 | CONFIG_NFS_V4=y | 838 | CONFIG_NFS_V4=y |
| 839 | CONFIG_ROOT_NFS=y | ||
| 832 | CONFIG_NFSD=m | 840 | CONFIG_NFSD=m |
| 833 | CONFIG_NFSD_V3=y | 841 | CONFIG_NFSD_V3=y |
| 834 | # CONFIG_NFSD_V3_ACL is not set | 842 | # CONFIG_NFSD_V3_ACL is not set |
| 835 | # CONFIG_NFSD_V4 is not set | 843 | # CONFIG_NFSD_V4 is not set |
| 836 | CONFIG_ROOT_NFS=y | ||
| 837 | CONFIG_LOCKD=y | 844 | CONFIG_LOCKD=y |
| 838 | CONFIG_LOCKD_V4=y | 845 | CONFIG_LOCKD_V4=y |
| 839 | CONFIG_EXPORTFS=m | 846 | CONFIG_EXPORTFS=m |
| 840 | CONFIG_NFS_COMMON=y | 847 | CONFIG_NFS_COMMON=y |
| 841 | CONFIG_SUNRPC=y | 848 | CONFIG_SUNRPC=y |
| 842 | CONFIG_SUNRPC_GSS=y | 849 | CONFIG_SUNRPC_GSS=y |
| 843 | CONFIG_SUNRPC_BIND34=y | ||
| 844 | CONFIG_RPCSEC_GSS_KRB5=y | 850 | CONFIG_RPCSEC_GSS_KRB5=y |
| 845 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 846 | CONFIG_SMB_FS=m | 852 | CONFIG_SMB_FS=m |
| @@ -849,7 +855,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 849 | # CONFIG_CIFS is not set | 855 | # CONFIG_CIFS is not set |
| 850 | # CONFIG_NCP_FS is not set | 856 | # CONFIG_NCP_FS is not set |
| 851 | CONFIG_CODA_FS=m | 857 | CONFIG_CODA_FS=m |
| 852 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 853 | # CONFIG_AFS_FS is not set | 858 | # CONFIG_AFS_FS is not set |
| 854 | 859 | ||
| 855 | # | 860 | # |
| @@ -914,6 +919,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 914 | # CONFIG_HEADERS_CHECK is not set | 919 | # CONFIG_HEADERS_CHECK is not set |
| 915 | # CONFIG_DEBUG_KERNEL is not set | 920 | # CONFIG_DEBUG_KERNEL is not set |
| 916 | CONFIG_DEBUG_BUGVERBOSE=y | 921 | CONFIG_DEBUG_BUGVERBOSE=y |
| 922 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 923 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 917 | # CONFIG_SAMPLES is not set | 924 | # CONFIG_SAMPLES is not set |
| 918 | 925 | ||
| 919 | # | 926 | # |
| @@ -973,6 +980,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 973 | CONFIG_CRYPTO_MD4=m | 980 | CONFIG_CRYPTO_MD4=m |
| 974 | CONFIG_CRYPTO_MD5=y | 981 | CONFIG_CRYPTO_MD5=y |
| 975 | CONFIG_CRYPTO_MICHAEL_MIC=m | 982 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 983 | CONFIG_CRYPTO_RMD128=m | ||
| 984 | CONFIG_CRYPTO_RMD160=m | ||
| 985 | CONFIG_CRYPTO_RMD256=m | ||
| 986 | CONFIG_CRYPTO_RMD320=m | ||
| 976 | CONFIG_CRYPTO_SHA1=m | 987 | CONFIG_CRYPTO_SHA1=m |
| 977 | CONFIG_CRYPTO_SHA256=m | 988 | CONFIG_CRYPTO_SHA256=m |
| 978 | CONFIG_CRYPTO_SHA512=m | 989 | CONFIG_CRYPTO_SHA512=m |
| @@ -1014,6 +1025,7 @@ CONFIG_BITREVERSE=y | |||
| 1014 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1025 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1015 | CONFIG_CRC_CCITT=m | 1026 | CONFIG_CRC_CCITT=m |
| 1016 | CONFIG_CRC16=m | 1027 | CONFIG_CRC16=m |
| 1028 | CONFIG_CRC_T10DIF=y | ||
| 1017 | CONFIG_CRC_ITU_T=m | 1029 | CONFIG_CRC_ITU_T=m |
| 1018 | CONFIG_CRC32=y | 1030 | CONFIG_CRC32=y |
| 1019 | # CONFIG_CRC7 is not set | 1031 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index ab536eb172bb..a183e25e348d 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:09 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m | |||
| 163 | CONFIG_PROC_HARDWARE=y | 169 | CONFIG_PROC_HARDWARE=y |
| 164 | CONFIG_ZONE_DMA=y | 170 | CONFIG_ZONE_DMA=y |
| 165 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 171 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 166 | |||
| 167 | # | ||
| 168 | # Networking | ||
| 169 | # | ||
| 170 | CONFIG_NET=y | 172 | CONFIG_NET=y |
| 171 | 173 | ||
| 172 | # | 174 | # |
| @@ -180,6 +182,7 @@ CONFIG_XFRM=y | |||
| 180 | # CONFIG_XFRM_SUB_POLICY is not set | 182 | # CONFIG_XFRM_SUB_POLICY is not set |
| 181 | CONFIG_XFRM_MIGRATE=y | 183 | CONFIG_XFRM_MIGRATE=y |
| 182 | # CONFIG_XFRM_STATISTICS is not set | 184 | # CONFIG_XFRM_STATISTICS is not set |
| 185 | CONFIG_XFRM_IPCOMP=m | ||
| 183 | CONFIG_NET_KEY=y | 186 | CONFIG_NET_KEY=y |
| 184 | CONFIG_NET_KEY_MIGRATE=y | 187 | CONFIG_NET_KEY_MIGRATE=y |
| 185 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| @@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 413 | # | 416 | # |
| 414 | # CONFIG_CFG80211 is not set | 417 | # CONFIG_CFG80211 is not set |
| 415 | CONFIG_WIRELESS_EXT=y | 418 | CONFIG_WIRELESS_EXT=y |
| 419 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 416 | # CONFIG_MAC80211 is not set | 420 | # CONFIG_MAC80211 is not set |
| 417 | CONFIG_IEEE80211=m | 421 | CONFIG_IEEE80211=m |
| 418 | # CONFIG_IEEE80211_DEBUG is not set | 422 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 432 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 433 | CONFIG_STANDALONE=y | 437 | CONFIG_STANDALONE=y |
| 434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 438 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 435 | CONFIG_FW_LOADER=m | 439 | CONFIG_FW_LOADER=y |
| 440 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 441 | CONFIG_EXTRA_FIRMWARE="" | ||
| 436 | # CONFIG_SYS_HYPERVISOR is not set | 442 | # CONFIG_SYS_HYPERVISOR is not set |
| 437 | CONFIG_CONNECTOR=m | 443 | CONFIG_CONNECTOR=m |
| 438 | # CONFIG_MTD is not set | 444 | # CONFIG_MTD is not set |
| @@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 450 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 456 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 451 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 457 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 452 | CONFIG_ATA_OVER_ETH=m | 458 | CONFIG_ATA_OVER_ETH=m |
| 459 | # CONFIG_BLK_DEV_HD is not set | ||
| 453 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
| 454 | # CONFIG_EEPROM_93CX6 is not set | 461 | # CONFIG_EEPROM_93CX6 is not set |
| 455 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -503,6 +510,7 @@ CONFIG_ISCSI_TCP=m | |||
| 503 | CONFIG_53C700_BE_BUS=y | 510 | CONFIG_53C700_BE_BUS=y |
| 504 | # CONFIG_SCSI_DEBUG is not set | 511 | # CONFIG_SCSI_DEBUG is not set |
| 505 | CONFIG_MVME16x_SCSI=y | 512 | CONFIG_MVME16x_SCSI=y |
| 513 | # CONFIG_SCSI_DH is not set | ||
| 506 | CONFIG_MD=y | 514 | CONFIG_MD=y |
| 507 | CONFIG_BLK_DEV_MD=m | 515 | CONFIG_BLK_DEV_MD=m |
| 508 | CONFIG_MD_LINEAR=m | 516 | CONFIG_MD_LINEAR=m |
| @@ -511,7 +519,7 @@ CONFIG_MD_RAID1=m | |||
| 511 | # CONFIG_MD_RAID10 is not set | 519 | # CONFIG_MD_RAID10 is not set |
| 512 | CONFIG_MD_RAID456=m | 520 | CONFIG_MD_RAID456=m |
| 513 | CONFIG_MD_RAID5_RESHAPE=y | 521 | CONFIG_MD_RAID5_RESHAPE=y |
| 514 | CONFIG_MD_MULTIPATH=m | 522 | # CONFIG_MD_MULTIPATH is not set |
| 515 | # CONFIG_MD_FAULTY is not set | 523 | # CONFIG_MD_FAULTY is not set |
| 516 | CONFIG_BLK_DEV_DM=m | 524 | CONFIG_BLK_DEV_DM=m |
| 517 | # CONFIG_DM_DEBUG is not set | 525 | # CONFIG_DM_DEBUG is not set |
| @@ -520,13 +528,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 520 | CONFIG_DM_MIRROR=m | 528 | CONFIG_DM_MIRROR=m |
| 521 | CONFIG_DM_ZERO=m | 529 | CONFIG_DM_ZERO=m |
| 522 | CONFIG_DM_MULTIPATH=m | 530 | CONFIG_DM_MULTIPATH=m |
| 523 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 524 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 525 | CONFIG_DM_MULTIPATH_HP=m | ||
| 526 | # CONFIG_DM_DELAY is not set | 531 | # CONFIG_DM_DELAY is not set |
| 527 | CONFIG_DM_UEVENT=y | 532 | CONFIG_DM_UEVENT=y |
| 528 | CONFIG_NETDEVICES=y | 533 | CONFIG_NETDEVICES=y |
| 529 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 530 | CONFIG_DUMMY=m | 534 | CONFIG_DUMMY=m |
| 531 | # CONFIG_BONDING is not set | 535 | # CONFIG_BONDING is not set |
| 532 | CONFIG_MACVLAN=m | 536 | CONFIG_MACVLAN=m |
| @@ -631,6 +635,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 631 | # Character devices | 635 | # Character devices |
| 632 | # | 636 | # |
| 633 | CONFIG_VT=y | 637 | CONFIG_VT=y |
| 638 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 634 | CONFIG_VT_CONSOLE=y | 639 | CONFIG_VT_CONSOLE=y |
| 635 | CONFIG_HW_CONSOLE=y | 640 | CONFIG_HW_CONSOLE=y |
| 636 | CONFIG_VT_HW_CONSOLE_BINDING=y | 641 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -661,6 +666,7 @@ CONFIG_GEN_RTC_X=y | |||
| 661 | # CONFIG_POWER_SUPPLY is not set | 666 | # CONFIG_POWER_SUPPLY is not set |
| 662 | # CONFIG_HWMON is not set | 667 | # CONFIG_HWMON is not set |
| 663 | # CONFIG_THERMAL is not set | 668 | # CONFIG_THERMAL is not set |
| 669 | # CONFIG_THERMAL_HWMON is not set | ||
| 664 | # CONFIG_WATCHDOG is not set | 670 | # CONFIG_WATCHDOG is not set |
| 665 | 671 | ||
| 666 | # | 672 | # |
| @@ -672,8 +678,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 672 | # | 678 | # |
| 673 | # Multifunction device drivers | 679 | # Multifunction device drivers |
| 674 | # | 680 | # |
| 681 | # CONFIG_MFD_CORE is not set | ||
| 675 | # CONFIG_MFD_SM501 is not set | 682 | # CONFIG_MFD_SM501 is not set |
| 676 | # CONFIG_HTC_PASIC3 is not set | 683 | # CONFIG_HTC_PASIC3 is not set |
| 684 | # CONFIG_MFD_TMIO is not set | ||
| 677 | 685 | ||
| 678 | # | 686 | # |
| 679 | # Multimedia devices | 687 | # Multimedia devices |
| @@ -708,10 +716,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 708 | # Console display driver support | 716 | # Console display driver support |
| 709 | # | 717 | # |
| 710 | CONFIG_DUMMY_CONSOLE=y | 718 | CONFIG_DUMMY_CONSOLE=y |
| 711 | |||
| 712 | # | ||
| 713 | # Sound | ||
| 714 | # | ||
| 715 | # CONFIG_SOUND is not set | 719 | # CONFIG_SOUND is not set |
| 716 | CONFIG_HID_SUPPORT=y | 720 | CONFIG_HID_SUPPORT=y |
| 717 | CONFIG_HID=m | 721 | CONFIG_HID=m |
| @@ -723,6 +727,7 @@ CONFIG_HIDRAW=y | |||
| 723 | # CONFIG_NEW_LEDS is not set | 727 | # CONFIG_NEW_LEDS is not set |
| 724 | # CONFIG_ACCESSIBILITY is not set | 728 | # CONFIG_ACCESSIBILITY is not set |
| 725 | # CONFIG_RTC_CLASS is not set | 729 | # CONFIG_RTC_CLASS is not set |
| 730 | # CONFIG_DMADEVICES is not set | ||
| 726 | # CONFIG_UIO is not set | 731 | # CONFIG_UIO is not set |
| 727 | 732 | ||
| 728 | # | 733 | # |
| @@ -760,6 +765,7 @@ CONFIG_XFS_FS=m | |||
| 760 | CONFIG_OCFS2_FS=m | 765 | CONFIG_OCFS2_FS=m |
| 761 | CONFIG_OCFS2_FS_O2CB=m | 766 | CONFIG_OCFS2_FS_O2CB=m |
| 762 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 767 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 768 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 763 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 764 | # CONFIG_OCFS2_DEBUG_FS is not set | 770 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 765 | CONFIG_DNOTIFY=y | 771 | CONFIG_DNOTIFY=y |
| @@ -819,6 +825,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 819 | CONFIG_CRAMFS=m | 825 | CONFIG_CRAMFS=m |
| 820 | # CONFIG_VXFS_FS is not set | 826 | # CONFIG_VXFS_FS is not set |
| 821 | CONFIG_MINIX_FS=y | 827 | CONFIG_MINIX_FS=y |
| 828 | # CONFIG_OMFS_FS is not set | ||
| 822 | CONFIG_HPFS_FS=m | 829 | CONFIG_HPFS_FS=m |
| 823 | # CONFIG_QNX4FS_FS is not set | 830 | # CONFIG_QNX4FS_FS is not set |
| 824 | # CONFIG_ROMFS_FS is not set | 831 | # CONFIG_ROMFS_FS is not set |
| @@ -831,18 +838,17 @@ CONFIG_NFS_FS=y | |||
| 831 | CONFIG_NFS_V3=y | 838 | CONFIG_NFS_V3=y |
| 832 | # CONFIG_NFS_V3_ACL is not set | 839 | # CONFIG_NFS_V3_ACL is not set |
| 833 | CONFIG_NFS_V4=y | 840 | CONFIG_NFS_V4=y |
| 841 | CONFIG_ROOT_NFS=y | ||
| 834 | CONFIG_NFSD=m | 842 | CONFIG_NFSD=m |
| 835 | CONFIG_NFSD_V3=y | 843 | CONFIG_NFSD_V3=y |
| 836 | # CONFIG_NFSD_V3_ACL is not set | 844 | # CONFIG_NFSD_V3_ACL is not set |
| 837 | # CONFIG_NFSD_V4 is not set | 845 | # CONFIG_NFSD_V4 is not set |
| 838 | CONFIG_ROOT_NFS=y | ||
| 839 | CONFIG_LOCKD=y | 846 | CONFIG_LOCKD=y |
| 840 | CONFIG_LOCKD_V4=y | 847 | CONFIG_LOCKD_V4=y |
| 841 | CONFIG_EXPORTFS=m | 848 | CONFIG_EXPORTFS=m |
| 842 | CONFIG_NFS_COMMON=y | 849 | CONFIG_NFS_COMMON=y |
| 843 | CONFIG_SUNRPC=y | 850 | CONFIG_SUNRPC=y |
| 844 | CONFIG_SUNRPC_GSS=y | 851 | CONFIG_SUNRPC_GSS=y |
| 845 | CONFIG_SUNRPC_BIND34=y | ||
| 846 | CONFIG_RPCSEC_GSS_KRB5=y | 852 | CONFIG_RPCSEC_GSS_KRB5=y |
| 847 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 853 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 848 | CONFIG_SMB_FS=m | 854 | CONFIG_SMB_FS=m |
| @@ -851,7 +857,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 851 | # CONFIG_CIFS is not set | 857 | # CONFIG_CIFS is not set |
| 852 | # CONFIG_NCP_FS is not set | 858 | # CONFIG_NCP_FS is not set |
| 853 | CONFIG_CODA_FS=m | 859 | CONFIG_CODA_FS=m |
| 854 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 855 | # CONFIG_AFS_FS is not set | 860 | # CONFIG_AFS_FS is not set |
| 856 | 861 | ||
| 857 | # | 862 | # |
| @@ -916,6 +921,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 916 | # CONFIG_HEADERS_CHECK is not set | 921 | # CONFIG_HEADERS_CHECK is not set |
| 917 | # CONFIG_DEBUG_KERNEL is not set | 922 | # CONFIG_DEBUG_KERNEL is not set |
| 918 | CONFIG_DEBUG_BUGVERBOSE=y | 923 | CONFIG_DEBUG_BUGVERBOSE=y |
| 924 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 925 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 919 | # CONFIG_SAMPLES is not set | 926 | # CONFIG_SAMPLES is not set |
| 920 | 927 | ||
| 921 | # | 928 | # |
| @@ -975,6 +982,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 975 | CONFIG_CRYPTO_MD4=m | 982 | CONFIG_CRYPTO_MD4=m |
| 976 | CONFIG_CRYPTO_MD5=y | 983 | CONFIG_CRYPTO_MD5=y |
| 977 | CONFIG_CRYPTO_MICHAEL_MIC=m | 984 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 985 | CONFIG_CRYPTO_RMD128=m | ||
| 986 | CONFIG_CRYPTO_RMD160=m | ||
| 987 | CONFIG_CRYPTO_RMD256=m | ||
| 988 | CONFIG_CRYPTO_RMD320=m | ||
| 978 | CONFIG_CRYPTO_SHA1=m | 989 | CONFIG_CRYPTO_SHA1=m |
| 979 | CONFIG_CRYPTO_SHA256=m | 990 | CONFIG_CRYPTO_SHA256=m |
| 980 | CONFIG_CRYPTO_SHA512=m | 991 | CONFIG_CRYPTO_SHA512=m |
| @@ -1016,6 +1027,7 @@ CONFIG_BITREVERSE=y | |||
| 1016 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1027 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1017 | CONFIG_CRC_CCITT=m | 1028 | CONFIG_CRC_CCITT=m |
| 1018 | CONFIG_CRC16=m | 1029 | CONFIG_CRC16=m |
| 1030 | CONFIG_CRC_T10DIF=y | ||
| 1019 | CONFIG_CRC_ITU_T=m | 1031 | CONFIG_CRC_ITU_T=m |
| 1020 | CONFIG_CRC32=y | 1032 | CONFIG_CRC32=y |
| 1021 | # CONFIG_CRC7 is not set | 1033 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index e05be687b500..72eaff0776b8 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:10 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -163,10 +169,6 @@ CONFIG_ISA=y | |||
| 163 | CONFIG_GENERIC_ISA_DMA=y | 169 | CONFIG_GENERIC_ISA_DMA=y |
| 164 | CONFIG_ZONE_DMA=y | 170 | CONFIG_ZONE_DMA=y |
| 165 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 171 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 166 | |||
| 167 | # | ||
| 168 | # Networking | ||
| 169 | # | ||
| 170 | CONFIG_NET=y | 172 | CONFIG_NET=y |
| 171 | 173 | ||
| 172 | # | 174 | # |
| @@ -180,6 +182,7 @@ CONFIG_XFRM=y | |||
| 180 | # CONFIG_XFRM_SUB_POLICY is not set | 182 | # CONFIG_XFRM_SUB_POLICY is not set |
| 181 | CONFIG_XFRM_MIGRATE=y | 183 | CONFIG_XFRM_MIGRATE=y |
| 182 | # CONFIG_XFRM_STATISTICS is not set | 184 | # CONFIG_XFRM_STATISTICS is not set |
| 185 | CONFIG_XFRM_IPCOMP=m | ||
| 183 | CONFIG_NET_KEY=y | 186 | CONFIG_NET_KEY=y |
| 184 | CONFIG_NET_KEY_MIGRATE=y | 187 | CONFIG_NET_KEY_MIGRATE=y |
| 185 | CONFIG_INET=y | 188 | CONFIG_INET=y |
| @@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # | 413 | # |
| 411 | # CONFIG_CFG80211 is not set | 414 | # CONFIG_CFG80211 is not set |
| 412 | CONFIG_WIRELESS_EXT=y | 415 | CONFIG_WIRELESS_EXT=y |
| 416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 413 | # CONFIG_MAC80211 is not set | 417 | # CONFIG_MAC80211 is not set |
| 414 | CONFIG_IEEE80211=m | 418 | CONFIG_IEEE80211=m |
| 415 | # CONFIG_IEEE80211_DEBUG is not set | 419 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 429 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 433 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 430 | CONFIG_STANDALONE=y | 434 | CONFIG_STANDALONE=y |
| 431 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 435 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 432 | CONFIG_FW_LOADER=m | 436 | CONFIG_FW_LOADER=y |
| 437 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 438 | CONFIG_EXTRA_FIRMWARE="" | ||
| 433 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
| 434 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
| 435 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
| @@ -448,6 +454,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 448 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 454 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 449 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 455 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 450 | CONFIG_ATA_OVER_ETH=m | 456 | CONFIG_ATA_OVER_ETH=m |
| 457 | # CONFIG_BLK_DEV_HD is not set | ||
| 451 | CONFIG_MISC_DEVICES=y | 458 | CONFIG_MISC_DEVICES=y |
| 452 | # CONFIG_EEPROM_93CX6 is not set | 459 | # CONFIG_EEPROM_93CX6 is not set |
| 453 | # CONFIG_ENCLOSURE_SERVICES is not set | 460 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -458,6 +465,7 @@ CONFIG_BLK_DEV_IDE=y | |||
| 458 | # | 465 | # |
| 459 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 460 | # | 467 | # |
| 468 | CONFIG_IDE_ATAPI=y | ||
| 461 | # CONFIG_BLK_DEV_IDE_SATA is not set | 469 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 462 | CONFIG_BLK_DEV_IDEDISK=y | 470 | CONFIG_BLK_DEV_IDEDISK=y |
| 463 | # CONFIG_IDEDISK_MULTI_MODE is not set | 471 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| @@ -475,8 +483,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 475 | # CONFIG_BLK_DEV_PLATFORM is not set | 483 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 476 | CONFIG_BLK_DEV_Q40IDE=y | 484 | CONFIG_BLK_DEV_Q40IDE=y |
| 477 | # CONFIG_BLK_DEV_IDEDMA is not set | 485 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 478 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
| 479 | # CONFIG_BLK_DEV_HD is not set | ||
| 480 | 486 | ||
| 481 | # | 487 | # |
| 482 | # SCSI device support | 488 | # SCSI device support |
| @@ -536,6 +542,7 @@ CONFIG_ISCSI_TCP=m | |||
| 536 | # CONFIG_SCSI_SYM53C416 is not set | 542 | # CONFIG_SCSI_SYM53C416 is not set |
| 537 | # CONFIG_SCSI_T128 is not set | 543 | # CONFIG_SCSI_T128 is not set |
| 538 | # CONFIG_SCSI_DEBUG is not set | 544 | # CONFIG_SCSI_DEBUG is not set |
| 545 | # CONFIG_SCSI_DH is not set | ||
| 539 | CONFIG_MD=y | 546 | CONFIG_MD=y |
| 540 | CONFIG_BLK_DEV_MD=m | 547 | CONFIG_BLK_DEV_MD=m |
| 541 | CONFIG_MD_LINEAR=m | 548 | CONFIG_MD_LINEAR=m |
| @@ -544,7 +551,7 @@ CONFIG_MD_RAID1=m | |||
| 544 | # CONFIG_MD_RAID10 is not set | 551 | # CONFIG_MD_RAID10 is not set |
| 545 | CONFIG_MD_RAID456=m | 552 | CONFIG_MD_RAID456=m |
| 546 | CONFIG_MD_RAID5_RESHAPE=y | 553 | CONFIG_MD_RAID5_RESHAPE=y |
| 547 | CONFIG_MD_MULTIPATH=m | 554 | # CONFIG_MD_MULTIPATH is not set |
| 548 | # CONFIG_MD_FAULTY is not set | 555 | # CONFIG_MD_FAULTY is not set |
| 549 | CONFIG_BLK_DEV_DM=m | 556 | CONFIG_BLK_DEV_DM=m |
| 550 | # CONFIG_DM_DEBUG is not set | 557 | # CONFIG_DM_DEBUG is not set |
| @@ -553,13 +560,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 553 | CONFIG_DM_MIRROR=m | 560 | CONFIG_DM_MIRROR=m |
| 554 | CONFIG_DM_ZERO=m | 561 | CONFIG_DM_ZERO=m |
| 555 | CONFIG_DM_MULTIPATH=m | 562 | CONFIG_DM_MULTIPATH=m |
| 556 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 557 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 558 | CONFIG_DM_MULTIPATH_HP=m | ||
| 559 | # CONFIG_DM_DELAY is not set | 563 | # CONFIG_DM_DELAY is not set |
| 560 | CONFIG_DM_UEVENT=y | 564 | CONFIG_DM_UEVENT=y |
| 561 | CONFIG_NETDEVICES=y | 565 | CONFIG_NETDEVICES=y |
| 562 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 563 | CONFIG_DUMMY=m | 566 | CONFIG_DUMMY=m |
| 564 | # CONFIG_BONDING is not set | 567 | # CONFIG_BONDING is not set |
| 565 | CONFIG_MACVLAN=m | 568 | CONFIG_MACVLAN=m |
| @@ -680,6 +683,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 680 | # Character devices | 683 | # Character devices |
| 681 | # | 684 | # |
| 682 | CONFIG_VT=y | 685 | CONFIG_VT=y |
| 686 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 683 | CONFIG_VT_CONSOLE=y | 687 | CONFIG_VT_CONSOLE=y |
| 684 | CONFIG_HW_CONSOLE=y | 688 | CONFIG_HW_CONSOLE=y |
| 685 | CONFIG_VT_HW_CONSOLE_BINDING=y | 689 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -711,6 +715,7 @@ CONFIG_GEN_RTC_X=y | |||
| 711 | # CONFIG_POWER_SUPPLY is not set | 715 | # CONFIG_POWER_SUPPLY is not set |
| 712 | # CONFIG_HWMON is not set | 716 | # CONFIG_HWMON is not set |
| 713 | # CONFIG_THERMAL is not set | 717 | # CONFIG_THERMAL is not set |
| 718 | # CONFIG_THERMAL_HWMON is not set | ||
| 714 | # CONFIG_WATCHDOG is not set | 719 | # CONFIG_WATCHDOG is not set |
| 715 | 720 | ||
| 716 | # | 721 | # |
| @@ -722,8 +727,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 722 | # | 727 | # |
| 723 | # Multifunction device drivers | 728 | # Multifunction device drivers |
| 724 | # | 729 | # |
| 730 | # CONFIG_MFD_CORE is not set | ||
| 725 | # CONFIG_MFD_SM501 is not set | 731 | # CONFIG_MFD_SM501 is not set |
| 726 | # CONFIG_HTC_PASIC3 is not set | 732 | # CONFIG_HTC_PASIC3 is not set |
| 733 | # CONFIG_MFD_TMIO is not set | ||
| 727 | 734 | ||
| 728 | # | 735 | # |
| 729 | # Multimedia devices | 736 | # Multimedia devices |
| @@ -792,10 +799,6 @@ CONFIG_LOGO=y | |||
| 792 | CONFIG_LOGO_LINUX_MONO=y | 799 | CONFIG_LOGO_LINUX_MONO=y |
| 793 | CONFIG_LOGO_LINUX_VGA16=y | 800 | CONFIG_LOGO_LINUX_VGA16=y |
| 794 | CONFIG_LOGO_LINUX_CLUT224=y | 801 | CONFIG_LOGO_LINUX_CLUT224=y |
| 795 | |||
| 796 | # | ||
| 797 | # Sound | ||
| 798 | # | ||
| 799 | CONFIG_SOUND=m | 802 | CONFIG_SOUND=m |
| 800 | CONFIG_DMASOUND_Q40=m | 803 | CONFIG_DMASOUND_Q40=m |
| 801 | CONFIG_DMASOUND=m | 804 | CONFIG_DMASOUND=m |
| @@ -809,6 +812,7 @@ CONFIG_HIDRAW=y | |||
| 809 | # CONFIG_NEW_LEDS is not set | 812 | # CONFIG_NEW_LEDS is not set |
| 810 | # CONFIG_ACCESSIBILITY is not set | 813 | # CONFIG_ACCESSIBILITY is not set |
| 811 | # CONFIG_RTC_CLASS is not set | 814 | # CONFIG_RTC_CLASS is not set |
| 815 | # CONFIG_DMADEVICES is not set | ||
| 812 | # CONFIG_UIO is not set | 816 | # CONFIG_UIO is not set |
| 813 | 817 | ||
| 814 | # | 818 | # |
| @@ -843,6 +847,7 @@ CONFIG_XFS_FS=m | |||
| 843 | CONFIG_OCFS2_FS=m | 847 | CONFIG_OCFS2_FS=m |
| 844 | CONFIG_OCFS2_FS_O2CB=m | 848 | CONFIG_OCFS2_FS_O2CB=m |
| 845 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 849 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 850 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 846 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 851 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 847 | # CONFIG_OCFS2_DEBUG_FS is not set | 852 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 848 | CONFIG_DNOTIFY=y | 853 | CONFIG_DNOTIFY=y |
| @@ -902,6 +907,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 902 | CONFIG_CRAMFS=m | 907 | CONFIG_CRAMFS=m |
| 903 | # CONFIG_VXFS_FS is not set | 908 | # CONFIG_VXFS_FS is not set |
| 904 | CONFIG_MINIX_FS=y | 909 | CONFIG_MINIX_FS=y |
| 910 | # CONFIG_OMFS_FS is not set | ||
| 905 | CONFIG_HPFS_FS=m | 911 | CONFIG_HPFS_FS=m |
| 906 | # CONFIG_QNX4FS_FS is not set | 912 | # CONFIG_QNX4FS_FS is not set |
| 907 | # CONFIG_ROMFS_FS is not set | 913 | # CONFIG_ROMFS_FS is not set |
| @@ -924,7 +930,6 @@ CONFIG_EXPORTFS=m | |||
| 924 | CONFIG_NFS_COMMON=y | 930 | CONFIG_NFS_COMMON=y |
| 925 | CONFIG_SUNRPC=y | 931 | CONFIG_SUNRPC=y |
| 926 | CONFIG_SUNRPC_GSS=y | 932 | CONFIG_SUNRPC_GSS=y |
| 927 | CONFIG_SUNRPC_BIND34=y | ||
| 928 | CONFIG_RPCSEC_GSS_KRB5=y | 933 | CONFIG_RPCSEC_GSS_KRB5=y |
| 929 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 934 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 930 | CONFIG_SMB_FS=m | 935 | CONFIG_SMB_FS=m |
| @@ -933,7 +938,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 933 | # CONFIG_CIFS is not set | 938 | # CONFIG_CIFS is not set |
| 934 | # CONFIG_NCP_FS is not set | 939 | # CONFIG_NCP_FS is not set |
| 935 | CONFIG_CODA_FS=m | 940 | CONFIG_CODA_FS=m |
| 936 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 937 | # CONFIG_AFS_FS is not set | 941 | # CONFIG_AFS_FS is not set |
| 938 | 942 | ||
| 939 | # | 943 | # |
| @@ -997,6 +1001,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 997 | # CONFIG_HEADERS_CHECK is not set | 1001 | # CONFIG_HEADERS_CHECK is not set |
| 998 | # CONFIG_DEBUG_KERNEL is not set | 1002 | # CONFIG_DEBUG_KERNEL is not set |
| 999 | CONFIG_DEBUG_BUGVERBOSE=y | 1003 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1004 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1005 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1000 | # CONFIG_SAMPLES is not set | 1006 | # CONFIG_SAMPLES is not set |
| 1001 | 1007 | ||
| 1002 | # | 1008 | # |
| @@ -1056,6 +1062,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1056 | CONFIG_CRYPTO_MD4=m | 1062 | CONFIG_CRYPTO_MD4=m |
| 1057 | CONFIG_CRYPTO_MD5=y | 1063 | CONFIG_CRYPTO_MD5=y |
| 1058 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1064 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1065 | CONFIG_CRYPTO_RMD128=m | ||
| 1066 | CONFIG_CRYPTO_RMD160=m | ||
| 1067 | CONFIG_CRYPTO_RMD256=m | ||
| 1068 | CONFIG_CRYPTO_RMD320=m | ||
| 1059 | CONFIG_CRYPTO_SHA1=m | 1069 | CONFIG_CRYPTO_SHA1=m |
| 1060 | CONFIG_CRYPTO_SHA256=m | 1070 | CONFIG_CRYPTO_SHA256=m |
| 1061 | CONFIG_CRYPTO_SHA512=m | 1071 | CONFIG_CRYPTO_SHA512=m |
| @@ -1097,6 +1107,7 @@ CONFIG_BITREVERSE=y | |||
| 1097 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1107 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1098 | CONFIG_CRC_CCITT=m | 1108 | CONFIG_CRC_CCITT=m |
| 1099 | CONFIG_CRC16=m | 1109 | CONFIG_CRC16=m |
| 1110 | CONFIG_CRC_T10DIF=y | ||
| 1100 | CONFIG_CRC_ITU_T=m | 1111 | CONFIG_CRC_ITU_T=m |
| 1101 | CONFIG_CRC32=y | 1112 | CONFIG_CRC32=y |
| 1102 | # CONFIG_CRC7 is not set | 1113 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 296340d2b315..cb62b96d766e 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:11 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -149,10 +155,6 @@ CONFIG_BINFMT_MISC=m | |||
| 149 | CONFIG_PROC_HARDWARE=y | 155 | CONFIG_PROC_HARDWARE=y |
| 150 | CONFIG_ZONE_DMA=y | 156 | CONFIG_ZONE_DMA=y |
| 151 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 157 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 152 | |||
| 153 | # | ||
| 154 | # Networking | ||
| 155 | # | ||
| 156 | CONFIG_NET=y | 158 | CONFIG_NET=y |
| 157 | 159 | ||
| 158 | # | 160 | # |
| @@ -166,6 +168,7 @@ CONFIG_XFRM=y | |||
| 166 | # CONFIG_XFRM_SUB_POLICY is not set | 168 | # CONFIG_XFRM_SUB_POLICY is not set |
| 167 | CONFIG_XFRM_MIGRATE=y | 169 | CONFIG_XFRM_MIGRATE=y |
| 168 | # CONFIG_XFRM_STATISTICS is not set | 170 | # CONFIG_XFRM_STATISTICS is not set |
| 171 | CONFIG_XFRM_IPCOMP=m | ||
| 169 | CONFIG_NET_KEY=y | 172 | CONFIG_NET_KEY=y |
| 170 | CONFIG_NET_KEY_MIGRATE=y | 173 | CONFIG_NET_KEY_MIGRATE=y |
| 171 | CONFIG_INET=y | 174 | CONFIG_INET=y |
| @@ -399,6 +402,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 399 | # | 402 | # |
| 400 | # CONFIG_CFG80211 is not set | 403 | # CONFIG_CFG80211 is not set |
| 401 | CONFIG_WIRELESS_EXT=y | 404 | CONFIG_WIRELESS_EXT=y |
| 405 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 402 | # CONFIG_MAC80211 is not set | 406 | # CONFIG_MAC80211 is not set |
| 403 | CONFIG_IEEE80211=m | 407 | CONFIG_IEEE80211=m |
| 404 | # CONFIG_IEEE80211_DEBUG is not set | 408 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -418,7 +422,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 418 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 422 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 419 | CONFIG_STANDALONE=y | 423 | CONFIG_STANDALONE=y |
| 420 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 424 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 421 | CONFIG_FW_LOADER=m | 425 | CONFIG_FW_LOADER=y |
| 426 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 427 | CONFIG_EXTRA_FIRMWARE="" | ||
| 422 | # CONFIG_SYS_HYPERVISOR is not set | 428 | # CONFIG_SYS_HYPERVISOR is not set |
| 423 | CONFIG_CONNECTOR=m | 429 | CONFIG_CONNECTOR=m |
| 424 | # CONFIG_MTD is not set | 430 | # CONFIG_MTD is not set |
| @@ -436,6 +442,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 436 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 442 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 437 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 443 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 438 | CONFIG_ATA_OVER_ETH=m | 444 | CONFIG_ATA_OVER_ETH=m |
| 445 | # CONFIG_BLK_DEV_HD is not set | ||
| 439 | CONFIG_MISC_DEVICES=y | 446 | CONFIG_MISC_DEVICES=y |
| 440 | # CONFIG_EEPROM_93CX6 is not set | 447 | # CONFIG_EEPROM_93CX6 is not set |
| 441 | # CONFIG_ENCLOSURE_SERVICES is not set | 448 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -488,6 +495,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 488 | CONFIG_ISCSI_TCP=m | 495 | CONFIG_ISCSI_TCP=m |
| 489 | # CONFIG_SCSI_DEBUG is not set | 496 | # CONFIG_SCSI_DEBUG is not set |
| 490 | CONFIG_SUN3_SCSI=y | 497 | CONFIG_SUN3_SCSI=y |
| 498 | # CONFIG_SCSI_DH is not set | ||
| 491 | CONFIG_MD=y | 499 | CONFIG_MD=y |
| 492 | CONFIG_BLK_DEV_MD=m | 500 | CONFIG_BLK_DEV_MD=m |
| 493 | CONFIG_MD_LINEAR=m | 501 | CONFIG_MD_LINEAR=m |
| @@ -496,7 +504,7 @@ CONFIG_MD_RAID1=m | |||
| 496 | # CONFIG_MD_RAID10 is not set | 504 | # CONFIG_MD_RAID10 is not set |
| 497 | CONFIG_MD_RAID456=m | 505 | CONFIG_MD_RAID456=m |
| 498 | CONFIG_MD_RAID5_RESHAPE=y | 506 | CONFIG_MD_RAID5_RESHAPE=y |
| 499 | CONFIG_MD_MULTIPATH=m | 507 | # CONFIG_MD_MULTIPATH is not set |
| 500 | # CONFIG_MD_FAULTY is not set | 508 | # CONFIG_MD_FAULTY is not set |
| 501 | CONFIG_BLK_DEV_DM=m | 509 | CONFIG_BLK_DEV_DM=m |
| 502 | # CONFIG_DM_DEBUG is not set | 510 | # CONFIG_DM_DEBUG is not set |
| @@ -505,13 +513,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 505 | CONFIG_DM_MIRROR=m | 513 | CONFIG_DM_MIRROR=m |
| 506 | CONFIG_DM_ZERO=m | 514 | CONFIG_DM_ZERO=m |
| 507 | CONFIG_DM_MULTIPATH=m | 515 | CONFIG_DM_MULTIPATH=m |
| 508 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 509 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 510 | CONFIG_DM_MULTIPATH_HP=m | ||
| 511 | # CONFIG_DM_DELAY is not set | 516 | # CONFIG_DM_DELAY is not set |
| 512 | CONFIG_DM_UEVENT=y | 517 | CONFIG_DM_UEVENT=y |
| 513 | CONFIG_NETDEVICES=y | 518 | CONFIG_NETDEVICES=y |
| 514 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 515 | CONFIG_DUMMY=m | 519 | CONFIG_DUMMY=m |
| 516 | # CONFIG_BONDING is not set | 520 | # CONFIG_BONDING is not set |
| 517 | CONFIG_MACVLAN=m | 521 | CONFIG_MACVLAN=m |
| @@ -527,7 +531,6 @@ CONFIG_SUN3_82586=y | |||
| 527 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 528 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 529 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 530 | # CONFIG_B44 is not set | ||
| 531 | # CONFIG_NETDEV_1000 is not set | 534 | # CONFIG_NETDEV_1000 is not set |
| 532 | # CONFIG_NETDEV_10000 is not set | 535 | # CONFIG_NETDEV_10000 is not set |
| 533 | 536 | ||
| @@ -617,6 +620,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 617 | # Character devices | 620 | # Character devices |
| 618 | # | 621 | # |
| 619 | CONFIG_VT=y | 622 | CONFIG_VT=y |
| 623 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 620 | CONFIG_VT_CONSOLE=y | 624 | CONFIG_VT_CONSOLE=y |
| 621 | CONFIG_HW_CONSOLE=y | 625 | CONFIG_HW_CONSOLE=y |
| 622 | CONFIG_VT_HW_CONSOLE_BINDING=y | 626 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -647,19 +651,20 @@ CONFIG_GEN_RTC_X=y | |||
| 647 | # CONFIG_POWER_SUPPLY is not set | 651 | # CONFIG_POWER_SUPPLY is not set |
| 648 | # CONFIG_HWMON is not set | 652 | # CONFIG_HWMON is not set |
| 649 | # CONFIG_THERMAL is not set | 653 | # CONFIG_THERMAL is not set |
| 654 | # CONFIG_THERMAL_HWMON is not set | ||
| 650 | # CONFIG_WATCHDOG is not set | 655 | # CONFIG_WATCHDOG is not set |
| 651 | 656 | ||
| 652 | # | 657 | # |
| 653 | # Sonics Silicon Backplane | 658 | # Sonics Silicon Backplane |
| 654 | # | 659 | # |
| 655 | CONFIG_SSB_POSSIBLE=y | ||
| 656 | # CONFIG_SSB is not set | ||
| 657 | 660 | ||
| 658 | # | 661 | # |
| 659 | # Multifunction device drivers | 662 | # Multifunction device drivers |
| 660 | # | 663 | # |
| 664 | # CONFIG_MFD_CORE is not set | ||
| 661 | # CONFIG_MFD_SM501 is not set | 665 | # CONFIG_MFD_SM501 is not set |
| 662 | # CONFIG_HTC_PASIC3 is not set | 666 | # CONFIG_HTC_PASIC3 is not set |
| 667 | # CONFIG_MFD_TMIO is not set | ||
| 663 | 668 | ||
| 664 | # | 669 | # |
| 665 | # Multimedia devices | 670 | # Multimedia devices |
| @@ -727,10 +732,6 @@ CONFIG_LOGO=y | |||
| 727 | CONFIG_LOGO_LINUX_MONO=y | 732 | CONFIG_LOGO_LINUX_MONO=y |
| 728 | CONFIG_LOGO_LINUX_VGA16=y | 733 | CONFIG_LOGO_LINUX_VGA16=y |
| 729 | CONFIG_LOGO_LINUX_CLUT224=y | 734 | CONFIG_LOGO_LINUX_CLUT224=y |
| 730 | |||
| 731 | # | ||
| 732 | # Sound | ||
| 733 | # | ||
| 734 | # CONFIG_SOUND is not set | 735 | # CONFIG_SOUND is not set |
| 735 | CONFIG_HID_SUPPORT=y | 736 | CONFIG_HID_SUPPORT=y |
| 736 | CONFIG_HID=m | 737 | CONFIG_HID=m |
| @@ -776,6 +777,7 @@ CONFIG_XFS_FS=m | |||
| 776 | CONFIG_OCFS2_FS=m | 777 | CONFIG_OCFS2_FS=m |
| 777 | CONFIG_OCFS2_FS_O2CB=m | 778 | CONFIG_OCFS2_FS_O2CB=m |
| 778 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 779 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 780 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 779 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 781 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 780 | # CONFIG_OCFS2_DEBUG_FS is not set | 782 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 781 | CONFIG_DNOTIFY=y | 783 | CONFIG_DNOTIFY=y |
| @@ -835,6 +837,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 835 | CONFIG_CRAMFS=m | 837 | CONFIG_CRAMFS=m |
| 836 | # CONFIG_VXFS_FS is not set | 838 | # CONFIG_VXFS_FS is not set |
| 837 | CONFIG_MINIX_FS=y | 839 | CONFIG_MINIX_FS=y |
| 840 | # CONFIG_OMFS_FS is not set | ||
| 838 | CONFIG_HPFS_FS=m | 841 | CONFIG_HPFS_FS=m |
| 839 | # CONFIG_QNX4FS_FS is not set | 842 | # CONFIG_QNX4FS_FS is not set |
| 840 | # CONFIG_ROMFS_FS is not set | 843 | # CONFIG_ROMFS_FS is not set |
| @@ -847,18 +850,17 @@ CONFIG_NFS_FS=y | |||
| 847 | CONFIG_NFS_V3=y | 850 | CONFIG_NFS_V3=y |
| 848 | # CONFIG_NFS_V3_ACL is not set | 851 | # CONFIG_NFS_V3_ACL is not set |
| 849 | CONFIG_NFS_V4=y | 852 | CONFIG_NFS_V4=y |
| 853 | CONFIG_ROOT_NFS=y | ||
| 850 | CONFIG_NFSD=m | 854 | CONFIG_NFSD=m |
| 851 | CONFIG_NFSD_V3=y | 855 | CONFIG_NFSD_V3=y |
| 852 | # CONFIG_NFSD_V3_ACL is not set | 856 | # CONFIG_NFSD_V3_ACL is not set |
| 853 | # CONFIG_NFSD_V4 is not set | 857 | # CONFIG_NFSD_V4 is not set |
| 854 | CONFIG_ROOT_NFS=y | ||
| 855 | CONFIG_LOCKD=y | 858 | CONFIG_LOCKD=y |
| 856 | CONFIG_LOCKD_V4=y | 859 | CONFIG_LOCKD_V4=y |
| 857 | CONFIG_EXPORTFS=m | 860 | CONFIG_EXPORTFS=m |
| 858 | CONFIG_NFS_COMMON=y | 861 | CONFIG_NFS_COMMON=y |
| 859 | CONFIG_SUNRPC=y | 862 | CONFIG_SUNRPC=y |
| 860 | CONFIG_SUNRPC_GSS=y | 863 | CONFIG_SUNRPC_GSS=y |
| 861 | CONFIG_SUNRPC_BIND34=y | ||
| 862 | CONFIG_RPCSEC_GSS_KRB5=y | 864 | CONFIG_RPCSEC_GSS_KRB5=y |
| 863 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 865 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 864 | CONFIG_SMB_FS=m | 866 | CONFIG_SMB_FS=m |
| @@ -867,7 +869,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 867 | # CONFIG_CIFS is not set | 869 | # CONFIG_CIFS is not set |
| 868 | # CONFIG_NCP_FS is not set | 870 | # CONFIG_NCP_FS is not set |
| 869 | CONFIG_CODA_FS=m | 871 | CONFIG_CODA_FS=m |
| 870 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 871 | # CONFIG_AFS_FS is not set | 872 | # CONFIG_AFS_FS is not set |
| 872 | 873 | ||
| 873 | # | 874 | # |
| @@ -932,6 +933,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 932 | # CONFIG_HEADERS_CHECK is not set | 933 | # CONFIG_HEADERS_CHECK is not set |
| 933 | # CONFIG_DEBUG_KERNEL is not set | 934 | # CONFIG_DEBUG_KERNEL is not set |
| 934 | CONFIG_DEBUG_BUGVERBOSE=y | 935 | CONFIG_DEBUG_BUGVERBOSE=y |
| 936 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 937 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 935 | # CONFIG_SAMPLES is not set | 938 | # CONFIG_SAMPLES is not set |
| 936 | 939 | ||
| 937 | # | 940 | # |
| @@ -991,6 +994,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 991 | CONFIG_CRYPTO_MD4=m | 994 | CONFIG_CRYPTO_MD4=m |
| 992 | CONFIG_CRYPTO_MD5=y | 995 | CONFIG_CRYPTO_MD5=y |
| 993 | CONFIG_CRYPTO_MICHAEL_MIC=m | 996 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 997 | CONFIG_CRYPTO_RMD128=m | ||
| 998 | CONFIG_CRYPTO_RMD160=m | ||
| 999 | CONFIG_CRYPTO_RMD256=m | ||
| 1000 | CONFIG_CRYPTO_RMD320=m | ||
| 994 | CONFIG_CRYPTO_SHA1=m | 1001 | CONFIG_CRYPTO_SHA1=m |
| 995 | CONFIG_CRYPTO_SHA256=m | 1002 | CONFIG_CRYPTO_SHA256=m |
| 996 | CONFIG_CRYPTO_SHA512=m | 1003 | CONFIG_CRYPTO_SHA512=m |
| @@ -1032,6 +1039,7 @@ CONFIG_BITREVERSE=y | |||
| 1032 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1039 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1033 | CONFIG_CRC_CCITT=m | 1040 | CONFIG_CRC_CCITT=m |
| 1034 | CONFIG_CRC16=m | 1041 | CONFIG_CRC16=m |
| 1042 | CONFIG_CRC_T10DIF=y | ||
| 1035 | CONFIG_CRC_ITU_T=m | 1043 | CONFIG_CRC_ITU_T=m |
| 1036 | CONFIG_CRC32=y | 1044 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | 1045 | # CONFIG_CRC7 is not set |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 8d3a416c92bf..04b4363a7050 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.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Wed May 28 22:47:35 2008 | 4 | # Wed Sep 10 09:02:12 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -52,7 +52,6 @@ CONFIG_SYSCTL=y | |||
| 52 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
| 53 | CONFIG_UID16=y | 53 | CONFIG_UID16=y |
| 54 | CONFIG_SYSCTL_SYSCALL=y | 54 | CONFIG_SYSCTL_SYSCALL=y |
| 55 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 58 | CONFIG_HOTPLUG=y | 57 | CONFIG_HOTPLUG=y |
| @@ -75,10 +74,16 @@ CONFIG_SLAB=y | |||
| 75 | # CONFIG_PROFILING is not set | 74 | # CONFIG_PROFILING is not set |
| 76 | # CONFIG_MARKERS is not set | 75 | # CONFIG_MARKERS is not set |
| 77 | # CONFIG_HAVE_OPROFILE is not set | 76 | # CONFIG_HAVE_OPROFILE is not set |
| 77 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 78 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 78 | # CONFIG_HAVE_KPROBES is not set | 79 | # CONFIG_HAVE_KPROBES is not set |
| 79 | # CONFIG_HAVE_KRETPROBES is not set | 80 | # CONFIG_HAVE_KRETPROBES is not set |
| 81 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 80 | # CONFIG_HAVE_DMA_ATTRS is not set | 82 | # CONFIG_HAVE_DMA_ATTRS is not set |
| 83 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 84 | # CONFIG_HAVE_CLK is not set | ||
| 81 | CONFIG_PROC_PAGE_MONITOR=y | 85 | CONFIG_PROC_PAGE_MONITOR=y |
| 86 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 82 | CONFIG_SLABINFO=y | 87 | CONFIG_SLABINFO=y |
| 83 | CONFIG_RT_MUTEXES=y | 88 | CONFIG_RT_MUTEXES=y |
| 84 | # CONFIG_TINY_SHMEM is not set | 89 | # CONFIG_TINY_SHMEM is not set |
| @@ -95,6 +100,7 @@ CONFIG_BLOCK=y | |||
| 95 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 96 | # CONFIG_LSF is not set | 101 | # CONFIG_LSF is not set |
| 97 | CONFIG_BLK_DEV_BSG=y | 102 | CONFIG_BLK_DEV_BSG=y |
| 103 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 98 | 104 | ||
| 99 | # | 105 | # |
| 100 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -160,10 +166,6 @@ CONFIG_BINFMT_MISC=m | |||
| 160 | CONFIG_PROC_HARDWARE=y | 166 | CONFIG_PROC_HARDWARE=y |
| 161 | CONFIG_ZONE_DMA=y | 167 | CONFIG_ZONE_DMA=y |
| 162 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 168 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 163 | |||
| 164 | # | ||
| 165 | # Networking | ||
| 166 | # | ||
| 167 | CONFIG_NET=y | 169 | CONFIG_NET=y |
| 168 | 170 | ||
| 169 | # | 171 | # |
| @@ -177,6 +179,7 @@ CONFIG_XFRM=y | |||
| 177 | # CONFIG_XFRM_SUB_POLICY is not set | 179 | # CONFIG_XFRM_SUB_POLICY is not set |
| 178 | CONFIG_XFRM_MIGRATE=y | 180 | CONFIG_XFRM_MIGRATE=y |
| 179 | # CONFIG_XFRM_STATISTICS is not set | 181 | # CONFIG_XFRM_STATISTICS is not set |
| 182 | CONFIG_XFRM_IPCOMP=m | ||
| 180 | CONFIG_NET_KEY=y | 183 | CONFIG_NET_KEY=y |
| 181 | CONFIG_NET_KEY_MIGRATE=y | 184 | CONFIG_NET_KEY_MIGRATE=y |
| 182 | CONFIG_INET=y | 185 | CONFIG_INET=y |
| @@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 410 | # | 413 | # |
| 411 | # CONFIG_CFG80211 is not set | 414 | # CONFIG_CFG80211 is not set |
| 412 | CONFIG_WIRELESS_EXT=y | 415 | CONFIG_WIRELESS_EXT=y |
| 416 | # CONFIG_WIRELESS_EXT_SYSFS is not set | ||
| 413 | # CONFIG_MAC80211 is not set | 417 | # CONFIG_MAC80211 is not set |
| 414 | CONFIG_IEEE80211=m | 418 | CONFIG_IEEE80211=m |
| 415 | # CONFIG_IEEE80211_DEBUG is not set | 419 | # CONFIG_IEEE80211_DEBUG is not set |
| @@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 429 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 433 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 430 | CONFIG_STANDALONE=y | 434 | CONFIG_STANDALONE=y |
| 431 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 435 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 432 | CONFIG_FW_LOADER=m | 436 | CONFIG_FW_LOADER=y |
| 437 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
| 438 | CONFIG_EXTRA_FIRMWARE="" | ||
| 433 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
| 434 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
| 435 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
| @@ -447,6 +453,7 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 447 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 453 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 448 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 454 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 449 | CONFIG_ATA_OVER_ETH=m | 455 | CONFIG_ATA_OVER_ETH=m |
| 456 | # CONFIG_BLK_DEV_HD is not set | ||
| 450 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
| 451 | # CONFIG_EEPROM_93CX6 is not set | 458 | # CONFIG_EEPROM_93CX6 is not set |
| 452 | # CONFIG_ENCLOSURE_SERVICES is not set | 459 | # CONFIG_ENCLOSURE_SERVICES is not set |
| @@ -499,6 +506,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 499 | CONFIG_ISCSI_TCP=m | 506 | CONFIG_ISCSI_TCP=m |
| 500 | # CONFIG_SCSI_DEBUG is not set | 507 | # CONFIG_SCSI_DEBUG is not set |
| 501 | CONFIG_SUN3X_ESP=y | 508 | CONFIG_SUN3X_ESP=y |
| 509 | # CONFIG_SCSI_DH is not set | ||
| 502 | CONFIG_MD=y | 510 | CONFIG_MD=y |
| 503 | CONFIG_BLK_DEV_MD=m | 511 | CONFIG_BLK_DEV_MD=m |
| 504 | CONFIG_MD_LINEAR=m | 512 | CONFIG_MD_LINEAR=m |
| @@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m | |||
| 507 | # CONFIG_MD_RAID10 is not set | 515 | # CONFIG_MD_RAID10 is not set |
| 508 | CONFIG_MD_RAID456=m | 516 | CONFIG_MD_RAID456=m |
| 509 | CONFIG_MD_RAID5_RESHAPE=y | 517 | CONFIG_MD_RAID5_RESHAPE=y |
| 510 | CONFIG_MD_MULTIPATH=m | 518 | # CONFIG_MD_MULTIPATH is not set |
| 511 | # CONFIG_MD_FAULTY is not set | 519 | # CONFIG_MD_FAULTY is not set |
| 512 | CONFIG_BLK_DEV_DM=m | 520 | CONFIG_BLK_DEV_DM=m |
| 513 | # CONFIG_DM_DEBUG is not set | 521 | # CONFIG_DM_DEBUG is not set |
| @@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m | |||
| 516 | CONFIG_DM_MIRROR=m | 524 | CONFIG_DM_MIRROR=m |
| 517 | CONFIG_DM_ZERO=m | 525 | CONFIG_DM_ZERO=m |
| 518 | CONFIG_DM_MULTIPATH=m | 526 | CONFIG_DM_MULTIPATH=m |
| 519 | CONFIG_DM_MULTIPATH_EMC=m | ||
| 520 | CONFIG_DM_MULTIPATH_RDAC=m | ||
| 521 | CONFIG_DM_MULTIPATH_HP=m | ||
| 522 | # CONFIG_DM_DELAY is not set | 527 | # CONFIG_DM_DELAY is not set |
| 523 | CONFIG_DM_UEVENT=y | 528 | CONFIG_DM_UEVENT=y |
| 524 | CONFIG_NETDEVICES=y | 529 | CONFIG_NETDEVICES=y |
| 525 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 526 | CONFIG_DUMMY=m | 530 | CONFIG_DUMMY=m |
| 527 | # CONFIG_BONDING is not set | 531 | # CONFIG_BONDING is not set |
| 528 | CONFIG_MACVLAN=m | 532 | CONFIG_MACVLAN=m |
| @@ -627,6 +631,7 @@ CONFIG_SERIO_LIBPS2=m | |||
| 627 | # Character devices | 631 | # Character devices |
| 628 | # | 632 | # |
| 629 | CONFIG_VT=y | 633 | CONFIG_VT=y |
| 634 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 630 | CONFIG_VT_CONSOLE=y | 635 | CONFIG_VT_CONSOLE=y |
| 631 | CONFIG_HW_CONSOLE=y | 636 | CONFIG_HW_CONSOLE=y |
| 632 | CONFIG_VT_HW_CONSOLE_BINDING=y | 637 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| @@ -657,6 +662,7 @@ CONFIG_GEN_RTC_X=y | |||
| 657 | # CONFIG_POWER_SUPPLY is not set | 662 | # CONFIG_POWER_SUPPLY is not set |
| 658 | # CONFIG_HWMON is not set | 663 | # CONFIG_HWMON is not set |
| 659 | # CONFIG_THERMAL is not set | 664 | # CONFIG_THERMAL is not set |
| 665 | # CONFIG_THERMAL_HWMON is not set | ||
| 660 | # CONFIG_WATCHDOG is not set | 666 | # CONFIG_WATCHDOG is not set |
| 661 | 667 | ||
| 662 | # | 668 | # |
| @@ -668,8 +674,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 668 | # | 674 | # |
| 669 | # Multifunction device drivers | 675 | # Multifunction device drivers |
| 670 | # | 676 | # |
| 677 | # CONFIG_MFD_CORE is not set | ||
| 671 | # CONFIG_MFD_SM501 is not set | 678 | # CONFIG_MFD_SM501 is not set |
| 672 | # CONFIG_HTC_PASIC3 is not set | 679 | # CONFIG_HTC_PASIC3 is not set |
| 680 | # CONFIG_MFD_TMIO is not set | ||
| 673 | 681 | ||
| 674 | # | 682 | # |
| 675 | # Multimedia devices | 683 | # Multimedia devices |
| @@ -737,10 +745,6 @@ CONFIG_LOGO=y | |||
| 737 | CONFIG_LOGO_LINUX_MONO=y | 745 | CONFIG_LOGO_LINUX_MONO=y |
| 738 | CONFIG_LOGO_LINUX_VGA16=y | 746 | CONFIG_LOGO_LINUX_VGA16=y |
| 739 | CONFIG_LOGO_LINUX_CLUT224=y | 747 | CONFIG_LOGO_LINUX_CLUT224=y |
| 740 | |||
| 741 | # | ||
| 742 | # Sound | ||
| 743 | # | ||
| 744 | # CONFIG_SOUND is not set | 748 | # CONFIG_SOUND is not set |
| 745 | CONFIG_HID_SUPPORT=y | 749 | CONFIG_HID_SUPPORT=y |
| 746 | CONFIG_HID=m | 750 | CONFIG_HID=m |
| @@ -752,6 +756,7 @@ CONFIG_HIDRAW=y | |||
| 752 | # CONFIG_NEW_LEDS is not set | 756 | # CONFIG_NEW_LEDS is not set |
| 753 | # CONFIG_ACCESSIBILITY is not set | 757 | # CONFIG_ACCESSIBILITY is not set |
| 754 | # CONFIG_RTC_CLASS is not set | 758 | # CONFIG_RTC_CLASS is not set |
| 759 | # CONFIG_DMADEVICES is not set | ||
| 755 | # CONFIG_UIO is not set | 760 | # CONFIG_UIO is not set |
| 756 | 761 | ||
| 757 | # | 762 | # |
| @@ -786,6 +791,7 @@ CONFIG_XFS_FS=m | |||
| 786 | CONFIG_OCFS2_FS=m | 791 | CONFIG_OCFS2_FS=m |
| 787 | CONFIG_OCFS2_FS_O2CB=m | 792 | CONFIG_OCFS2_FS_O2CB=m |
| 788 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 793 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
| 794 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 789 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 795 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 790 | # CONFIG_OCFS2_DEBUG_FS is not set | 796 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 791 | CONFIG_DNOTIFY=y | 797 | CONFIG_DNOTIFY=y |
| @@ -845,6 +851,7 @@ CONFIG_HFSPLUS_FS=m | |||
| 845 | CONFIG_CRAMFS=m | 851 | CONFIG_CRAMFS=m |
| 846 | # CONFIG_VXFS_FS is not set | 852 | # CONFIG_VXFS_FS is not set |
| 847 | CONFIG_MINIX_FS=y | 853 | CONFIG_MINIX_FS=y |
| 854 | # CONFIG_OMFS_FS is not set | ||
| 848 | CONFIG_HPFS_FS=m | 855 | CONFIG_HPFS_FS=m |
| 849 | # CONFIG_QNX4FS_FS is not set | 856 | # CONFIG_QNX4FS_FS is not set |
| 850 | # CONFIG_ROMFS_FS is not set | 857 | # CONFIG_ROMFS_FS is not set |
| @@ -857,18 +864,17 @@ CONFIG_NFS_FS=y | |||
| 857 | CONFIG_NFS_V3=y | 864 | CONFIG_NFS_V3=y |
| 858 | # CONFIG_NFS_V3_ACL is not set | 865 | # CONFIG_NFS_V3_ACL is not set |
| 859 | CONFIG_NFS_V4=y | 866 | CONFIG_NFS_V4=y |
| 867 | CONFIG_ROOT_NFS=y | ||
| 860 | CONFIG_NFSD=m | 868 | CONFIG_NFSD=m |
| 861 | CONFIG_NFSD_V3=y | 869 | CONFIG_NFSD_V3=y |
| 862 | # CONFIG_NFSD_V3_ACL is not set | 870 | # CONFIG_NFSD_V3_ACL is not set |
| 863 | # CONFIG_NFSD_V4 is not set | 871 | # CONFIG_NFSD_V4 is not set |
| 864 | CONFIG_ROOT_NFS=y | ||
| 865 | CONFIG_LOCKD=y | 872 | CONFIG_LOCKD=y |
| 866 | CONFIG_LOCKD_V4=y | 873 | CONFIG_LOCKD_V4=y |
| 867 | CONFIG_EXPORTFS=m | 874 | CONFIG_EXPORTFS=m |
| 868 | CONFIG_NFS_COMMON=y | 875 | CONFIG_NFS_COMMON=y |
| 869 | CONFIG_SUNRPC=y | 876 | CONFIG_SUNRPC=y |
| 870 | CONFIG_SUNRPC_GSS=y | 877 | CONFIG_SUNRPC_GSS=y |
| 871 | CONFIG_SUNRPC_BIND34=y | ||
| 872 | CONFIG_RPCSEC_GSS_KRB5=y | 878 | CONFIG_RPCSEC_GSS_KRB5=y |
| 873 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 879 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 874 | CONFIG_SMB_FS=m | 880 | CONFIG_SMB_FS=m |
| @@ -877,7 +883,6 @@ CONFIG_SMB_NLS_REMOTE="cp437" | |||
| 877 | # CONFIG_CIFS is not set | 883 | # CONFIG_CIFS is not set |
| 878 | # CONFIG_NCP_FS is not set | 884 | # CONFIG_NCP_FS is not set |
| 879 | CONFIG_CODA_FS=m | 885 | CONFIG_CODA_FS=m |
| 880 | # CONFIG_CODA_FS_OLD_API is not set | ||
| 881 | # CONFIG_AFS_FS is not set | 886 | # CONFIG_AFS_FS is not set |
| 882 | 887 | ||
| 883 | # | 888 | # |
| @@ -942,6 +947,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 942 | # CONFIG_HEADERS_CHECK is not set | 947 | # CONFIG_HEADERS_CHECK is not set |
| 943 | # CONFIG_DEBUG_KERNEL is not set | 948 | # CONFIG_DEBUG_KERNEL is not set |
| 944 | CONFIG_DEBUG_BUGVERBOSE=y | 949 | CONFIG_DEBUG_BUGVERBOSE=y |
| 950 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 951 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 945 | # CONFIG_SAMPLES is not set | 952 | # CONFIG_SAMPLES is not set |
| 946 | 953 | ||
| 947 | # | 954 | # |
| @@ -1001,6 +1008,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
| 1001 | CONFIG_CRYPTO_MD4=m | 1008 | CONFIG_CRYPTO_MD4=m |
| 1002 | CONFIG_CRYPTO_MD5=y | 1009 | CONFIG_CRYPTO_MD5=y |
| 1003 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1010 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 1011 | CONFIG_CRYPTO_RMD128=m | ||
| 1012 | CONFIG_CRYPTO_RMD160=m | ||
| 1013 | CONFIG_CRYPTO_RMD256=m | ||
| 1014 | CONFIG_CRYPTO_RMD320=m | ||
| 1004 | CONFIG_CRYPTO_SHA1=m | 1015 | CONFIG_CRYPTO_SHA1=m |
| 1005 | CONFIG_CRYPTO_SHA256=m | 1016 | CONFIG_CRYPTO_SHA256=m |
| 1006 | CONFIG_CRYPTO_SHA512=m | 1017 | CONFIG_CRYPTO_SHA512=m |
| @@ -1042,6 +1053,7 @@ CONFIG_BITREVERSE=y | |||
| 1042 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1053 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1043 | CONFIG_CRC_CCITT=m | 1054 | CONFIG_CRC_CCITT=m |
| 1044 | CONFIG_CRC16=m | 1055 | CONFIG_CRC16=m |
| 1056 | CONFIG_CRC_T10DIF=y | ||
| 1045 | CONFIG_CRC_ITU_T=m | 1057 | CONFIG_CRC_ITU_T=m |
| 1046 | CONFIG_CRC32=y | 1058 | CONFIG_CRC32=y |
| 1047 | # CONFIG_CRC7 is not set | 1059 | # CONFIG_CRC7 is not set |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 335a6ae3d594..11c92dc53791 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -45,18 +45,7 @@ static void r39xx_wait(void) | |||
| 45 | local_irq_enable(); | 45 | local_irq_enable(); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | /* | 48 | extern void r4k_wait(void); |
| 49 | * There is a race when WAIT instruction executed with interrupt | ||
| 50 | * enabled. | ||
| 51 | * But it is implementation-dependent wheter the pipelie restarts when | ||
| 52 | * a non-enabled interrupt is requested. | ||
| 53 | */ | ||
| 54 | static void r4k_wait(void) | ||
| 55 | { | ||
| 56 | __asm__(" .set mips3 \n" | ||
| 57 | " wait \n" | ||
| 58 | " .set mips0 \n"); | ||
| 59 | } | ||
| 60 | 49 | ||
| 61 | /* | 50 | /* |
| 62 | * This variant is preferable as it allows testing need_resched and going to | 51 | * This variant is preferable as it allows testing need_resched and going to |
| @@ -128,7 +117,7 @@ static int __init wait_disable(char *s) | |||
| 128 | 117 | ||
| 129 | __setup("nowait", wait_disable); | 118 | __setup("nowait", wait_disable); |
| 130 | 119 | ||
| 131 | static inline void check_wait(void) | 120 | void __init check_wait(void) |
| 132 | { | 121 | { |
| 133 | struct cpuinfo_mips *c = ¤t_cpu_data; | 122 | struct cpuinfo_mips *c = ¤t_cpu_data; |
| 134 | 123 | ||
| @@ -242,7 +231,6 @@ static inline void check_errata(void) | |||
| 242 | 231 | ||
| 243 | void __init check_bugs32(void) | 232 | void __init check_bugs32(void) |
| 244 | { | 233 | { |
| 245 | check_wait(); | ||
| 246 | check_errata(); | 234 | check_errata(); |
| 247 | } | 235 | } |
| 248 | 236 | ||
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index c6ada98ee042..f886dd7f708e 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <asm/stackframe.h> | 20 | #include <asm/stackframe.h> |
| 21 | #include <asm/war.h> | 21 | #include <asm/war.h> |
| 22 | #include <asm/page.h> | 22 | #include <asm/page.h> |
| 23 | #include <asm/thread_info.h> | ||
| 23 | 24 | ||
| 24 | #define PANIC_PIC(msg) \ | 25 | #define PANIC_PIC(msg) \ |
| 25 | .set push; \ | 26 | .set push; \ |
| @@ -126,7 +127,42 @@ handle_vcei: | |||
| 126 | 127 | ||
| 127 | __FINIT | 128 | __FINIT |
| 128 | 129 | ||
| 130 | .align 5 /* 32 byte rollback region */ | ||
| 131 | LEAF(r4k_wait) | ||
| 132 | .set push | ||
| 133 | .set noreorder | ||
| 134 | /* start of rollback region */ | ||
| 135 | LONG_L t0, TI_FLAGS($28) | ||
| 136 | nop | ||
| 137 | andi t0, _TIF_NEED_RESCHED | ||
| 138 | bnez t0, 1f | ||
| 139 | nop | ||
| 140 | nop | ||
| 141 | nop | ||
| 142 | .set mips3 | ||
| 143 | wait | ||
| 144 | /* end of rollback region (the region size must be power of two) */ | ||
| 145 | .set pop | ||
| 146 | 1: | ||
| 147 | jr ra | ||
| 148 | END(r4k_wait) | ||
| 149 | |||
| 150 | .macro BUILD_ROLLBACK_PROLOGUE handler | ||
| 151 | FEXPORT(rollback_\handler) | ||
| 152 | .set push | ||
| 153 | .set noat | ||
| 154 | MFC0 k0, CP0_EPC | ||
| 155 | PTR_LA k1, r4k_wait | ||
| 156 | ori k0, 0x1f /* 32 byte rollback region */ | ||
| 157 | xori k0, 0x1f | ||
| 158 | bne k0, k1, 9f | ||
| 159 | MTC0 k0, CP0_EPC | ||
| 160 | 9: | ||
| 161 | .set pop | ||
| 162 | .endm | ||
| 163 | |||
| 129 | .align 5 | 164 | .align 5 |
| 165 | BUILD_ROLLBACK_PROLOGUE handle_int | ||
| 130 | NESTED(handle_int, PT_SIZE, sp) | 166 | NESTED(handle_int, PT_SIZE, sp) |
| 131 | #ifdef CONFIG_TRACE_IRQFLAGS | 167 | #ifdef CONFIG_TRACE_IRQFLAGS |
| 132 | /* | 168 | /* |
| @@ -201,6 +237,7 @@ NESTED(except_vec_ejtag_debug, 0, sp) | |||
| 201 | * This prototype is copied to ebase + n*IntCtl.VS and patched | 237 | * This prototype is copied to ebase + n*IntCtl.VS and patched |
| 202 | * to invoke the handler | 238 | * to invoke the handler |
| 203 | */ | 239 | */ |
| 240 | BUILD_ROLLBACK_PROLOGUE except_vec_vi | ||
| 204 | NESTED(except_vec_vi, 0, sp) | 241 | NESTED(except_vec_vi, 0, sp) |
| 205 | SAVE_SOME | 242 | SAVE_SOME |
| 206 | SAVE_AT | 243 | SAVE_AT |
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index b16facd9ea8e..ce7684335a41 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
| @@ -148,6 +148,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | |||
| 148 | clear_tsk_thread_flag(p, TIF_USEDFPU); | 148 | clear_tsk_thread_flag(p, TIF_USEDFPU); |
| 149 | 149 | ||
| 150 | #ifdef CONFIG_MIPS_MT_FPAFF | 150 | #ifdef CONFIG_MIPS_MT_FPAFF |
| 151 | clear_tsk_thread_flag(p, TIF_FPUBOUND); | ||
| 152 | |||
| 151 | /* | 153 | /* |
| 152 | * FPU affinity support is cleaner if we track the | 154 | * FPU affinity support is cleaner if we track the |
| 153 | * user-visible CPU affinity from the very beginning. | 155 | * user-visible CPU affinity from the very beginning. |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 6bee29097a56..5fd0cd020af5 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -46,6 +46,9 @@ | |||
| 46 | #include <asm/types.h> | 46 | #include <asm/types.h> |
| 47 | #include <asm/stacktrace.h> | 47 | #include <asm/stacktrace.h> |
| 48 | 48 | ||
| 49 | extern void check_wait(void); | ||
| 50 | extern asmlinkage void r4k_wait(void); | ||
| 51 | extern asmlinkage void rollback_handle_int(void); | ||
| 49 | extern asmlinkage void handle_int(void); | 52 | extern asmlinkage void handle_int(void); |
| 50 | extern asmlinkage void handle_tlbm(void); | 53 | extern asmlinkage void handle_tlbm(void); |
| 51 | extern asmlinkage void handle_tlbl(void); | 54 | extern asmlinkage void handle_tlbl(void); |
| @@ -1251,6 +1254,9 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs) | |||
| 1251 | 1254 | ||
| 1252 | extern char except_vec_vi, except_vec_vi_lui; | 1255 | extern char except_vec_vi, except_vec_vi_lui; |
| 1253 | extern char except_vec_vi_ori, except_vec_vi_end; | 1256 | extern char except_vec_vi_ori, except_vec_vi_end; |
| 1257 | extern char rollback_except_vec_vi; | ||
| 1258 | char *vec_start = (cpu_wait == r4k_wait) ? | ||
| 1259 | &rollback_except_vec_vi : &except_vec_vi; | ||
| 1254 | #ifdef CONFIG_MIPS_MT_SMTC | 1260 | #ifdef CONFIG_MIPS_MT_SMTC |
| 1255 | /* | 1261 | /* |
| 1256 | * We need to provide the SMTC vectored interrupt handler | 1262 | * We need to provide the SMTC vectored interrupt handler |
| @@ -1258,11 +1264,11 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs) | |||
| 1258 | * Status.IM bit to be masked before going there. | 1264 | * Status.IM bit to be masked before going there. |
| 1259 | */ | 1265 | */ |
| 1260 | extern char except_vec_vi_mori; | 1266 | extern char except_vec_vi_mori; |
| 1261 | const int mori_offset = &except_vec_vi_mori - &except_vec_vi; | 1267 | const int mori_offset = &except_vec_vi_mori - vec_start; |
| 1262 | #endif /* CONFIG_MIPS_MT_SMTC */ | 1268 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| 1263 | const int handler_len = &except_vec_vi_end - &except_vec_vi; | 1269 | const int handler_len = &except_vec_vi_end - vec_start; |
| 1264 | const int lui_offset = &except_vec_vi_lui - &except_vec_vi; | 1270 | const int lui_offset = &except_vec_vi_lui - vec_start; |
| 1265 | const int ori_offset = &except_vec_vi_ori - &except_vec_vi; | 1271 | const int ori_offset = &except_vec_vi_ori - vec_start; |
| 1266 | 1272 | ||
| 1267 | if (handler_len > VECTORSPACING) { | 1273 | if (handler_len > VECTORSPACING) { |
| 1268 | /* | 1274 | /* |
| @@ -1272,7 +1278,7 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs) | |||
| 1272 | panic("VECTORSPACING too small"); | 1278 | panic("VECTORSPACING too small"); |
| 1273 | } | 1279 | } |
| 1274 | 1280 | ||
| 1275 | memcpy(b, &except_vec_vi, handler_len); | 1281 | memcpy(b, vec_start, handler_len); |
| 1276 | #ifdef CONFIG_MIPS_MT_SMTC | 1282 | #ifdef CONFIG_MIPS_MT_SMTC |
| 1277 | BUG_ON(n > 7); /* Vector index %d exceeds SMTC maximum. */ | 1283 | BUG_ON(n > 7); /* Vector index %d exceeds SMTC maximum. */ |
| 1278 | 1284 | ||
| @@ -1554,6 +1560,10 @@ void __init trap_init(void) | |||
| 1554 | extern char except_vec3_generic, except_vec3_r4000; | 1560 | extern char except_vec3_generic, except_vec3_r4000; |
| 1555 | extern char except_vec4; | 1561 | extern char except_vec4; |
| 1556 | unsigned long i; | 1562 | unsigned long i; |
| 1563 | int rollback; | ||
| 1564 | |||
| 1565 | check_wait(); | ||
| 1566 | rollback = (cpu_wait == r4k_wait); | ||
| 1557 | 1567 | ||
| 1558 | #if defined(CONFIG_KGDB) | 1568 | #if defined(CONFIG_KGDB) |
| 1559 | if (kgdb_early_setup) | 1569 | if (kgdb_early_setup) |
| @@ -1618,7 +1628,7 @@ void __init trap_init(void) | |||
| 1618 | if (board_be_init) | 1628 | if (board_be_init) |
| 1619 | board_be_init(); | 1629 | board_be_init(); |
| 1620 | 1630 | ||
| 1621 | set_except_vector(0, handle_int); | 1631 | set_except_vector(0, rollback ? rollback_handle_int : handle_int); |
| 1622 | set_except_vector(1, handle_tlbm); | 1632 | set_except_vector(1, handle_tlbm); |
| 1623 | set_except_vector(2, handle_tlbl); | 1633 | set_except_vector(2, handle_tlbl); |
| 1624 | set_except_vector(3, handle_tlbs); | 1634 | set_except_vector(3, handle_tlbs); |
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index b5470ceb418b..afb119f35682 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
| @@ -36,6 +36,7 @@ SECTIONS | |||
| 36 | SCHED_TEXT | 36 | SCHED_TEXT |
| 37 | LOCK_TEXT | 37 | LOCK_TEXT |
| 38 | KPROBES_TEXT | 38 | KPROBES_TEXT |
| 39 | *(.text.*) | ||
| 39 | *(.fixup) | 40 | *(.fixup) |
| 40 | *(.gnu.warning) | 41 | *(.gnu.warning) |
| 41 | } :text = 0 | 42 | } :text = 0 |
diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S index 8d7784122c14..edac9892c51a 100644 --- a/arch/mips/lib/csum_partial.S +++ b/arch/mips/lib/csum_partial.S | |||
| @@ -39,12 +39,14 @@ | |||
| 39 | #ifdef USE_DOUBLE | 39 | #ifdef USE_DOUBLE |
| 40 | 40 | ||
| 41 | #define LOAD ld | 41 | #define LOAD ld |
| 42 | #define LOAD32 lwu | ||
| 42 | #define ADD daddu | 43 | #define ADD daddu |
| 43 | #define NBYTES 8 | 44 | #define NBYTES 8 |
| 44 | 45 | ||
| 45 | #else | 46 | #else |
| 46 | 47 | ||
| 47 | #define LOAD lw | 48 | #define LOAD lw |
| 49 | #define LOAD32 lw | ||
| 48 | #define ADD addu | 50 | #define ADD addu |
| 49 | #define NBYTES 4 | 51 | #define NBYTES 4 |
| 50 | 52 | ||
| @@ -60,6 +62,14 @@ | |||
| 60 | ADD sum, v1; \ | 62 | ADD sum, v1; \ |
| 61 | .set pop | 63 | .set pop |
| 62 | 64 | ||
| 65 | #define ADDC32(sum,reg) \ | ||
| 66 | .set push; \ | ||
| 67 | .set noat; \ | ||
| 68 | addu sum, reg; \ | ||
| 69 | sltu v1, sum, reg; \ | ||
| 70 | addu sum, v1; \ | ||
| 71 | .set pop | ||
| 72 | |||
| 63 | #define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3) \ | 73 | #define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3) \ |
| 64 | LOAD _t0, (offset + UNIT(0))(src); \ | 74 | LOAD _t0, (offset + UNIT(0))(src); \ |
| 65 | LOAD _t1, (offset + UNIT(1))(src); \ | 75 | LOAD _t1, (offset + UNIT(1))(src); \ |
| @@ -132,7 +142,7 @@ LEAF(csum_partial) | |||
| 132 | beqz t8, .Lqword_align | 142 | beqz t8, .Lqword_align |
| 133 | andi t8, src, 0x8 | 143 | andi t8, src, 0x8 |
| 134 | 144 | ||
| 135 | lw t0, 0x00(src) | 145 | LOAD32 t0, 0x00(src) |
| 136 | LONG_SUBU a1, a1, 0x4 | 146 | LONG_SUBU a1, a1, 0x4 |
| 137 | ADDC(sum, t0) | 147 | ADDC(sum, t0) |
| 138 | PTR_ADDU src, src, 0x4 | 148 | PTR_ADDU src, src, 0x4 |
| @@ -211,7 +221,7 @@ LEAF(csum_partial) | |||
| 211 | LONG_SRL t8, t8, 0x2 | 221 | LONG_SRL t8, t8, 0x2 |
| 212 | 222 | ||
| 213 | .Lend_words: | 223 | .Lend_words: |
| 214 | lw t0, (src) | 224 | LOAD32 t0, (src) |
| 215 | LONG_SUBU t8, t8, 0x1 | 225 | LONG_SUBU t8, t8, 0x1 |
| 216 | ADDC(sum, t0) | 226 | ADDC(sum, t0) |
| 217 | .set reorder /* DADDI_WAR */ | 227 | .set reorder /* DADDI_WAR */ |
| @@ -230,6 +240,9 @@ LEAF(csum_partial) | |||
| 230 | /* Still a full word to go */ | 240 | /* Still a full word to go */ |
| 231 | ulw t1, (src) | 241 | ulw t1, (src) |
| 232 | PTR_ADDIU src, 4 | 242 | PTR_ADDIU src, 4 |
| 243 | #ifdef USE_DOUBLE | ||
| 244 | dsll t1, t1, 32 /* clear lower 32bit */ | ||
| 245 | #endif | ||
| 233 | ADDC(sum, t1) | 246 | ADDC(sum, t1) |
| 234 | 247 | ||
| 235 | 1: move t1, zero | 248 | 1: move t1, zero |
| @@ -280,7 +293,7 @@ LEAF(csum_partial) | |||
| 280 | 1: | 293 | 1: |
| 281 | .set reorder | 294 | .set reorder |
| 282 | /* Add the passed partial csum. */ | 295 | /* Add the passed partial csum. */ |
| 283 | ADDC(sum, a2) | 296 | ADDC32(sum, a2) |
| 284 | jr ra | 297 | jr ra |
| 285 | .set noreorder | 298 | .set noreorder |
| 286 | END(csum_partial) | 299 | END(csum_partial) |
| @@ -681,7 +694,7 @@ EXC( sb t0, NBYTES-2(dst), .Ls_exc) | |||
| 681 | .set pop | 694 | .set pop |
| 682 | 1: | 695 | 1: |
| 683 | .set reorder | 696 | .set reorder |
| 684 | ADDC(sum, psum) | 697 | ADDC32(sum, psum) |
| 685 | jr ra | 698 | jr ra |
| 686 | .set noreorder | 699 | .set noreorder |
| 687 | 700 | ||
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c index cba36a247e32..92dd1a0ca352 100644 --- a/arch/mips/vr41xx/common/irq.c +++ b/arch/mips/vr41xx/common/irq.c | |||
| @@ -72,6 +72,7 @@ static void irq_dispatch(unsigned int irq) | |||
| 72 | cascade = irq_cascade + irq; | 72 | cascade = irq_cascade + irq; |
| 73 | if (cascade->get_irq != NULL) { | 73 | if (cascade->get_irq != NULL) { |
| 74 | unsigned int source_irq = irq; | 74 | unsigned int source_irq = irq; |
| 75 | int ret; | ||
| 75 | desc = irq_desc + source_irq; | 76 | desc = irq_desc + source_irq; |
| 76 | if (desc->chip->mask_ack) | 77 | if (desc->chip->mask_ack) |
| 77 | desc->chip->mask_ack(source_irq); | 78 | desc->chip->mask_ack(source_irq); |
| @@ -79,8 +80,9 @@ static void irq_dispatch(unsigned int irq) | |||
| 79 | desc->chip->mask(source_irq); | 80 | desc->chip->mask(source_irq); |
| 80 | desc->chip->ack(source_irq); | 81 | desc->chip->ack(source_irq); |
| 81 | } | 82 | } |
| 82 | irq = cascade->get_irq(irq); | 83 | ret = cascade->get_irq(irq); |
| 83 | if (irq < 0) | 84 | irq = ret; |
| 85 | if (ret < 0) | ||
| 84 | atomic_inc(&irq_err_count); | 86 | atomic_inc(&irq_err_count); |
| 85 | else | 87 | else |
| 86 | irq_dispatch(irq); | 88 | irq_dispatch(irq); |
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c index 78f092ca0316..33cf25025dac 100644 --- a/arch/mn10300/mm/fault.c +++ b/arch/mn10300/mm/fault.c | |||
| @@ -174,7 +174,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code, | |||
| 174 | * If we're in an interrupt or have no user | 174 | * If we're in an interrupt or have no user |
| 175 | * context, we must not take the fault.. | 175 | * context, we must not take the fault.. |
| 176 | */ | 176 | */ |
| 177 | if (in_interrupt() || !mm) | 177 | if (in_atomic() || !mm) |
| 178 | goto no_context; | 178 | goto no_context; |
| 179 | 179 | ||
| 180 | down_read(&mm->mmap_sem); | 180 | down_read(&mm->mmap_sem); |
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 717a3bc1352e..65d1a8454d2c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -195,7 +195,7 @@ image-$(CONFIG_PPC_CELLEB) += zImage.pseries | |||
| 195 | image-$(CONFIG_PPC_CHRP) += zImage.chrp | 195 | image-$(CONFIG_PPC_CHRP) += zImage.chrp |
| 196 | image-$(CONFIG_PPC_EFIKA) += zImage.chrp | 196 | image-$(CONFIG_PPC_EFIKA) += zImage.chrp |
| 197 | image-$(CONFIG_PPC_PMAC) += zImage.pmac | 197 | image-$(CONFIG_PPC_PMAC) += zImage.pmac |
| 198 | image-$(CONFIG_PPC_HOLLY) += zImage.holly | 198 | image-$(CONFIG_PPC_HOLLY) += dtbImage.holly |
| 199 | image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800 | 199 | image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800 |
| 200 | image-$(CONFIG_PPC_ISERIES) += zImage.iseries | 200 | image-$(CONFIG_PPC_ISERIES) += zImage.iseries |
| 201 | image-$(CONFIG_DEFAULT_UIMAGE) += uImage | 201 | image-$(CONFIG_DEFAULT_UIMAGE) += uImage |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 3b3a1062cb25..584a4f184eb2 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
| @@ -281,7 +281,7 @@ | |||
| 281 | cell-index = <0>; | 281 | cell-index = <0>; |
| 282 | reg = <0x0 0x80>; | 282 | reg = <0x0 0x80>; |
| 283 | interrupt-parent = <&mpic>; | 283 | interrupt-parent = <&mpic>; |
| 284 | interrupts = <60 2>; | 284 | interrupts = <76 2>; |
| 285 | }; | 285 | }; |
| 286 | dma-channel@1 { | 286 | dma-channel@1 { |
| 287 | compatible = "fsl,mpc8610-dma-channel", | 287 | compatible = "fsl,mpc8610-dma-channel", |
| @@ -289,7 +289,7 @@ | |||
| 289 | cell-index = <1>; | 289 | cell-index = <1>; |
| 290 | reg = <0x80 0x80>; | 290 | reg = <0x80 0x80>; |
| 291 | interrupt-parent = <&mpic>; | 291 | interrupt-parent = <&mpic>; |
| 292 | interrupts = <61 2>; | 292 | interrupts = <77 2>; |
| 293 | }; | 293 | }; |
| 294 | dma-channel@2 { | 294 | dma-channel@2 { |
| 295 | compatible = "fsl,mpc8610-dma-channel", | 295 | compatible = "fsl,mpc8610-dma-channel", |
| @@ -297,7 +297,7 @@ | |||
| 297 | cell-index = <2>; | 297 | cell-index = <2>; |
| 298 | reg = <0x100 0x80>; | 298 | reg = <0x100 0x80>; |
| 299 | interrupt-parent = <&mpic>; | 299 | interrupt-parent = <&mpic>; |
| 300 | interrupts = <62 2>; | 300 | interrupts = <78 2>; |
| 301 | }; | 301 | }; |
| 302 | dma-channel@3 { | 302 | dma-channel@3 { |
| 303 | compatible = "fsl,mpc8610-dma-channel", | 303 | compatible = "fsl,mpc8610-dma-channel", |
| @@ -305,7 +305,7 @@ | |||
| 305 | cell-index = <3>; | 305 | cell-index = <3>; |
| 306 | reg = <0x180 0x80>; | 306 | reg = <0x180 0x80>; |
| 307 | interrupt-parent = <&mpic>; | 307 | interrupt-parent = <&mpic>; |
| 308 | interrupts = <63 2>; | 308 | interrupts = <79 2>; |
| 309 | }; | 309 | }; |
| 310 | }; | 310 | }; |
| 311 | 311 | ||
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 80d1f399ee51..64c6ee22eefd 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h | |||
| @@ -409,6 +409,13 @@ do { \ | |||
| 409 | /* Keep this the last entry. */ | 409 | /* Keep this the last entry. */ |
| 410 | #define R_PPC64_NUM 107 | 410 | #define R_PPC64_NUM 107 |
| 411 | 411 | ||
| 412 | /* There's actually a third entry here, but it's unused */ | ||
| 413 | struct ppc64_opd_entry | ||
| 414 | { | ||
| 415 | unsigned long funcaddr; | ||
| 416 | unsigned long r2; | ||
| 417 | }; | ||
| 418 | |||
| 412 | #ifdef __KERNEL__ | 419 | #ifdef __KERNEL__ |
| 413 | 420 | ||
| 414 | #ifdef CONFIG_SPU_BASE | 421 | #ifdef CONFIG_SPU_BASE |
diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h index 7710e9e6660f..07956f3e7844 100644 --- a/arch/powerpc/include/asm/sections.h +++ b/arch/powerpc/include/asm/sections.h | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | #define _ASM_POWERPC_SECTIONS_H | 2 | #define _ASM_POWERPC_SECTIONS_H |
| 3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
| 4 | 4 | ||
| 5 | #include <linux/elf.h> | ||
| 6 | #include <linux/uaccess.h> | ||
| 5 | #include <asm-generic/sections.h> | 7 | #include <asm-generic/sections.h> |
| 6 | 8 | ||
| 7 | #ifdef __powerpc64__ | 9 | #ifdef __powerpc64__ |
| @@ -17,7 +19,15 @@ static inline int in_kernel_text(unsigned long addr) | |||
| 17 | } | 19 | } |
| 18 | 20 | ||
| 19 | #undef dereference_function_descriptor | 21 | #undef dereference_function_descriptor |
| 20 | void *dereference_function_descriptor(void *); | 22 | static inline void *dereference_function_descriptor(void *ptr) |
| 23 | { | ||
| 24 | struct ppc64_opd_entry *desc = ptr; | ||
| 25 | void *p; | ||
| 26 | |||
| 27 | if (!probe_kernel_address(&desc->funcaddr, p)) | ||
| 28 | ptr = p; | ||
| 29 | return ptr; | ||
| 30 | } | ||
| 21 | 31 | ||
| 22 | #endif | 32 | #endif |
| 23 | 33 | ||
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index ad79de272ff3..1af2377e4992 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c | |||
| @@ -21,9 +21,7 @@ | |||
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
| 23 | #include <linux/bug.h> | 23 | #include <linux/bug.h> |
| 24 | #include <linux/uaccess.h> | ||
| 25 | #include <asm/module.h> | 24 | #include <asm/module.h> |
| 26 | #include <asm/sections.h> | ||
| 27 | #include <asm/firmware.h> | 25 | #include <asm/firmware.h> |
| 28 | #include <asm/code-patching.h> | 26 | #include <asm/code-patching.h> |
| 29 | #include <linux/sort.h> | 27 | #include <linux/sort.h> |
| @@ -43,13 +41,6 @@ | |||
| 43 | #define DEBUGP(fmt , ...) | 41 | #define DEBUGP(fmt , ...) |
| 44 | #endif | 42 | #endif |
| 45 | 43 | ||
| 46 | /* There's actually a third entry here, but it's unused */ | ||
| 47 | struct ppc64_opd_entry | ||
| 48 | { | ||
| 49 | unsigned long funcaddr; | ||
| 50 | unsigned long r2; | ||
| 51 | }; | ||
| 52 | |||
| 53 | /* Like PPC32, we need little trampolines to do > 24-bit jumps (into | 44 | /* Like PPC32, we need little trampolines to do > 24-bit jumps (into |
| 54 | the kernel itself). But on PPC64, these need to be used for every | 45 | the kernel itself). But on PPC64, these need to be used for every |
| 55 | jump, actually, to reset r2 (TOC+0x8000). */ | 46 | jump, actually, to reset r2 (TOC+0x8000). */ |
| @@ -452,13 +443,3 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, | |||
| 452 | 443 | ||
| 453 | return 0; | 444 | return 0; |
| 454 | } | 445 | } |
| 455 | |||
| 456 | void *dereference_function_descriptor(void *ptr) | ||
| 457 | { | ||
| 458 | struct ppc64_opd_entry *desc = ptr; | ||
| 459 | void *p; | ||
| 460 | |||
| 461 | if (!probe_kernel_address(&desc->funcaddr, p)) | ||
| 462 | ptr = p; | ||
| 463 | return ptr; | ||
| 464 | } | ||
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index c481d45f97b7..f58c537446a8 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
| @@ -241,7 +241,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna) | |||
| 241 | return of_bus_default_map(addr, range, na, ns, pna); | 241 | return of_bus_default_map(addr, range, na, ns, pna); |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | static unsigned int of_bus_sbus_get_flags(const u32 *addr) | 244 | static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags) |
| 245 | { | 245 | { |
| 246 | return IORESOURCE_MEM; | 246 | return IORESOURCE_MEM; |
| 247 | } | 247 | } |
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c index 20699c701412..8ce6285a06d5 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c | |||
| @@ -288,7 +288,7 @@ static const struct user_regset sparc32_regsets[] = { | |||
| 288 | */ | 288 | */ |
| 289 | [REGSET_GENERAL] = { | 289 | [REGSET_GENERAL] = { |
| 290 | .core_note_type = NT_PRSTATUS, | 290 | .core_note_type = NT_PRSTATUS, |
| 291 | .n = 38 * sizeof(u32), | 291 | .n = 38, |
| 292 | .size = sizeof(u32), .align = sizeof(u32), | 292 | .size = sizeof(u32), .align = sizeof(u32), |
| 293 | .get = genregs32_get, .set = genregs32_set | 293 | .get = genregs32_get, .set = genregs32_set |
| 294 | }, | 294 | }, |
| @@ -304,7 +304,7 @@ static const struct user_regset sparc32_regsets[] = { | |||
| 304 | */ | 304 | */ |
| 305 | [REGSET_FP] = { | 305 | [REGSET_FP] = { |
| 306 | .core_note_type = NT_PRFPREG, | 306 | .core_note_type = NT_PRFPREG, |
| 307 | .n = 99 * sizeof(u32), | 307 | .n = 99, |
| 308 | .size = sizeof(u32), .align = sizeof(u32), | 308 | .size = sizeof(u32), .align = sizeof(u32), |
| 309 | .get = fpregs32_get, .set = fpregs32_set | 309 | .get = fpregs32_get, .set = fpregs32_set |
| 310 | }, | 310 | }, |
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 23963882bc18..7495bc774685 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 10 | #include <linux/linkage.h> | ||
| 10 | #include <linux/ptrace.h> | 11 | #include <linux/ptrace.h> |
| 11 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 12 | #include <linux/kernel_stat.h> | 13 | #include <linux/kernel_stat.h> |
| @@ -866,7 +867,7 @@ static void kill_prom_timer(void) | |||
| 866 | : "g1", "g2"); | 867 | : "g1", "g2"); |
| 867 | } | 868 | } |
| 868 | 869 | ||
| 869 | void init_irqwork_curcpu(void) | 870 | void notrace init_irqwork_curcpu(void) |
| 870 | { | 871 | { |
| 871 | int cpu = hard_smp_processor_id(); | 872 | int cpu = hard_smp_processor_id(); |
| 872 | 873 | ||
| @@ -897,7 +898,7 @@ static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type | |||
| 897 | } | 898 | } |
| 898 | } | 899 | } |
| 899 | 900 | ||
| 900 | void __cpuinit sun4v_register_mondo_queues(int this_cpu) | 901 | void __cpuinit notrace sun4v_register_mondo_queues(int this_cpu) |
| 901 | { | 902 | { |
| 902 | struct trap_per_cpu *tb = &trap_block[this_cpu]; | 903 | struct trap_per_cpu *tb = &trap_block[this_cpu]; |
| 903 | 904 | ||
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index ef5fe29202c2..f85b6bebb0be 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
| @@ -575,7 +575,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm | |||
| 575 | { | 575 | { |
| 576 | unsigned long csr_reg, csr, csr_error_bits; | 576 | unsigned long csr_reg, csr, csr_error_bits; |
| 577 | irqreturn_t ret = IRQ_NONE; | 577 | irqreturn_t ret = IRQ_NONE; |
| 578 | u16 stat; | 578 | u16 stat, *addr; |
| 579 | 579 | ||
| 580 | if (is_pbm_a) { | 580 | if (is_pbm_a) { |
| 581 | csr_reg = pbm->controller_regs + PSYCHO_PCIA_CTRL; | 581 | csr_reg = pbm->controller_regs + PSYCHO_PCIA_CTRL; |
| @@ -597,7 +597,9 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm | |||
| 597 | printk("%s: PCI SERR signal asserted.\n", pbm->name); | 597 | printk("%s: PCI SERR signal asserted.\n", pbm->name); |
| 598 | ret = IRQ_HANDLED; | 598 | ret = IRQ_HANDLED; |
| 599 | } | 599 | } |
| 600 | pci_read_config_word(pbm->pci_bus->self, PCI_STATUS, &stat); | 600 | addr = psycho_pci_config_mkaddr(pbm, pbm->pci_first_busno, |
| 601 | 0, PCI_STATUS); | ||
| 602 | pci_config_read16(addr, &stat); | ||
| 601 | if (stat & (PCI_STATUS_PARITY | | 603 | if (stat & (PCI_STATUS_PARITY | |
| 602 | PCI_STATUS_SIG_TARGET_ABORT | | 604 | PCI_STATUS_SIG_TARGET_ABORT | |
| 603 | PCI_STATUS_REC_TARGET_ABORT | | 605 | PCI_STATUS_REC_TARGET_ABORT | |
| @@ -605,7 +607,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm | |||
| 605 | PCI_STATUS_SIG_SYSTEM_ERROR)) { | 607 | PCI_STATUS_SIG_SYSTEM_ERROR)) { |
| 606 | printk("%s: PCI bus error, PCI_STATUS[%04x]\n", | 608 | printk("%s: PCI bus error, PCI_STATUS[%04x]\n", |
| 607 | pbm->name, stat); | 609 | pbm->name, stat); |
| 608 | pci_write_config_word(pbm->pci_bus->self, PCI_STATUS, 0xffff); | 610 | pci_config_write16(addr, 0xffff); |
| 609 | ret = IRQ_HANDLED; | 611 | ret = IRQ_HANDLED; |
| 610 | } | 612 | } |
| 611 | return ret; | 613 | return ret; |
| @@ -744,16 +746,16 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm) | |||
| 744 | * the second will just error out since we do not pass in | 746 | * the second will just error out since we do not pass in |
| 745 | * IRQF_SHARED. | 747 | * IRQF_SHARED. |
| 746 | */ | 748 | */ |
| 747 | err = request_irq(op->irqs[1], psycho_ue_intr, 0, | 749 | err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED, |
| 748 | "PSYCHO_UE", pbm); | 750 | "PSYCHO_UE", pbm); |
| 749 | err = request_irq(op->irqs[2], psycho_ce_intr, 0, | 751 | err = request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED, |
| 750 | "PSYCHO_CE", pbm); | 752 | "PSYCHO_CE", pbm); |
| 751 | 753 | ||
| 752 | /* This one, however, ought not to fail. We can just warn | 754 | /* This one, however, ought not to fail. We can just warn |
| 753 | * about it since the system can still operate properly even | 755 | * about it since the system can still operate properly even |
| 754 | * if this fails. | 756 | * if this fails. |
| 755 | */ | 757 | */ |
| 756 | err = request_irq(op->irqs[0], psycho_pcierr_intr, 0, | 758 | err = request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED, |
| 757 | "PSYCHO_PCIERR", pbm); | 759 | "PSYCHO_PCIERR", pbm); |
| 758 | if (err) | 760 | if (err) |
| 759 | printk(KERN_WARNING "%s: Could not register PCIERR, " | 761 | printk(KERN_WARNING "%s: Could not register PCIERR, " |
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index 3c048ac4e638..7151513f156e 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c | |||
| @@ -156,55 +156,11 @@ static unsigned long psycho_pcislot_imap_offset(unsigned long ino) | |||
| 156 | return PSYCHO_IMAP_B_SLOT0 + (slot * 8); | 156 | return PSYCHO_IMAP_B_SLOT0 + (slot * 8); |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | #define PSYCHO_IMAP_SCSI 0x1000UL | 159 | #define PSYCHO_OBIO_IMAP_BASE 0x1000UL |
| 160 | #define PSYCHO_IMAP_ETH 0x1008UL | 160 | |
| 161 | #define PSYCHO_IMAP_BPP 0x1010UL | ||
| 162 | #define PSYCHO_IMAP_AU_REC 0x1018UL | ||
| 163 | #define PSYCHO_IMAP_AU_PLAY 0x1020UL | ||
| 164 | #define PSYCHO_IMAP_PFAIL 0x1028UL | ||
| 165 | #define PSYCHO_IMAP_KMS 0x1030UL | ||
| 166 | #define PSYCHO_IMAP_FLPY 0x1038UL | ||
| 167 | #define PSYCHO_IMAP_SHW 0x1040UL | ||
| 168 | #define PSYCHO_IMAP_KBD 0x1048UL | ||
| 169 | #define PSYCHO_IMAP_MS 0x1050UL | ||
| 170 | #define PSYCHO_IMAP_SER 0x1058UL | ||
| 171 | #define PSYCHO_IMAP_TIM0 0x1060UL | ||
| 172 | #define PSYCHO_IMAP_TIM1 0x1068UL | ||
| 173 | #define PSYCHO_IMAP_UE 0x1070UL | ||
| 174 | #define PSYCHO_IMAP_CE 0x1078UL | ||
| 175 | #define PSYCHO_IMAP_A_ERR 0x1080UL | ||
| 176 | #define PSYCHO_IMAP_B_ERR 0x1088UL | ||
| 177 | #define PSYCHO_IMAP_PMGMT 0x1090UL | ||
| 178 | #define PSYCHO_IMAP_GFX 0x1098UL | ||
| 179 | #define PSYCHO_IMAP_EUPA 0x10a0UL | ||
| 180 | |||
| 181 | static unsigned long __psycho_onboard_imap_off[] = { | ||
| 182 | /*0x20*/ PSYCHO_IMAP_SCSI, | ||
| 183 | /*0x21*/ PSYCHO_IMAP_ETH, | ||
| 184 | /*0x22*/ PSYCHO_IMAP_BPP, | ||
| 185 | /*0x23*/ PSYCHO_IMAP_AU_REC, | ||
| 186 | /*0x24*/ PSYCHO_IMAP_AU_PLAY, | ||
| 187 | /*0x25*/ PSYCHO_IMAP_PFAIL, | ||
| 188 | /*0x26*/ PSYCHO_IMAP_KMS, | ||
| 189 | /*0x27*/ PSYCHO_IMAP_FLPY, | ||
| 190 | /*0x28*/ PSYCHO_IMAP_SHW, | ||
| 191 | /*0x29*/ PSYCHO_IMAP_KBD, | ||
| 192 | /*0x2a*/ PSYCHO_IMAP_MS, | ||
| 193 | /*0x2b*/ PSYCHO_IMAP_SER, | ||
| 194 | /*0x2c*/ PSYCHO_IMAP_TIM0, | ||
| 195 | /*0x2d*/ PSYCHO_IMAP_TIM1, | ||
| 196 | /*0x2e*/ PSYCHO_IMAP_UE, | ||
| 197 | /*0x2f*/ PSYCHO_IMAP_CE, | ||
| 198 | /*0x30*/ PSYCHO_IMAP_A_ERR, | ||
| 199 | /*0x31*/ PSYCHO_IMAP_B_ERR, | ||
| 200 | /*0x32*/ PSYCHO_IMAP_PMGMT, | ||
| 201 | /*0x33*/ PSYCHO_IMAP_GFX, | ||
| 202 | /*0x34*/ PSYCHO_IMAP_EUPA, | ||
| 203 | }; | ||
| 204 | #define PSYCHO_ONBOARD_IRQ_BASE 0x20 | 161 | #define PSYCHO_ONBOARD_IRQ_BASE 0x20 |
| 205 | #define PSYCHO_ONBOARD_IRQ_LAST 0x34 | ||
| 206 | #define psycho_onboard_imap_offset(__ino) \ | 162 | #define psycho_onboard_imap_offset(__ino) \ |
| 207 | __psycho_onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE] | 163 | (PSYCHO_OBIO_IMAP_BASE + (((__ino) & 0x1f) << 3)) |
| 208 | 164 | ||
| 209 | #define PSYCHO_ICLR_A_SLOT0 0x1400UL | 165 | #define PSYCHO_ICLR_A_SLOT0 0x1400UL |
| 210 | #define PSYCHO_ICLR_SCSI 0x1800UL | 166 | #define PSYCHO_ICLR_SCSI 0x1800UL |
| @@ -228,10 +184,6 @@ static unsigned int psycho_irq_build(struct device_node *dp, | |||
| 228 | imap_off = psycho_pcislot_imap_offset(ino); | 184 | imap_off = psycho_pcislot_imap_offset(ino); |
| 229 | } else { | 185 | } else { |
| 230 | /* Onboard device */ | 186 | /* Onboard device */ |
| 231 | if (ino > PSYCHO_ONBOARD_IRQ_LAST) { | ||
| 232 | prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino); | ||
| 233 | prom_halt(); | ||
| 234 | } | ||
| 235 | imap_off = psycho_onboard_imap_offset(ino); | 187 | imap_off = psycho_onboard_imap_offset(ino); |
| 236 | } | 188 | } |
| 237 | 189 | ||
| @@ -318,23 +270,6 @@ static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2) | |||
| 318 | 270 | ||
| 319 | #define SABRE_IMAP_A_SLOT0 0x0c00UL | 271 | #define SABRE_IMAP_A_SLOT0 0x0c00UL |
| 320 | #define SABRE_IMAP_B_SLOT0 0x0c20UL | 272 | #define SABRE_IMAP_B_SLOT0 0x0c20UL |
| 321 | #define SABRE_IMAP_SCSI 0x1000UL | ||
| 322 | #define SABRE_IMAP_ETH 0x1008UL | ||
| 323 | #define SABRE_IMAP_BPP 0x1010UL | ||
| 324 | #define SABRE_IMAP_AU_REC 0x1018UL | ||
| 325 | #define SABRE_IMAP_AU_PLAY 0x1020UL | ||
| 326 | #define SABRE_IMAP_PFAIL 0x1028UL | ||
| 327 | #define SABRE_IMAP_KMS 0x1030UL | ||
| 328 | #define SABRE_IMAP_FLPY 0x1038UL | ||
| 329 | #define SABRE_IMAP_SHW 0x1040UL | ||
| 330 | #define SABRE_IMAP_KBD 0x1048UL | ||
| 331 | #define SABRE_IMAP_MS 0x1050UL | ||
| 332 | #define SABRE_IMAP_SER 0x1058UL | ||
| 333 | #define SABRE_IMAP_UE 0x1070UL | ||
| 334 | #define SABRE_IMAP_CE 0x1078UL | ||
| 335 | #define SABRE_IMAP_PCIERR 0x1080UL | ||
| 336 | #define SABRE_IMAP_GFX 0x1098UL | ||
| 337 | #define SABRE_IMAP_EUPA 0x10a0UL | ||
| 338 | #define SABRE_ICLR_A_SLOT0 0x1400UL | 273 | #define SABRE_ICLR_A_SLOT0 0x1400UL |
| 339 | #define SABRE_ICLR_B_SLOT0 0x1480UL | 274 | #define SABRE_ICLR_B_SLOT0 0x1480UL |
| 340 | #define SABRE_ICLR_SCSI 0x1800UL | 275 | #define SABRE_ICLR_SCSI 0x1800UL |
| @@ -364,33 +299,10 @@ static unsigned long sabre_pcislot_imap_offset(unsigned long ino) | |||
| 364 | return SABRE_IMAP_B_SLOT0 + (slot * 8); | 299 | return SABRE_IMAP_B_SLOT0 + (slot * 8); |
| 365 | } | 300 | } |
| 366 | 301 | ||
| 367 | static unsigned long __sabre_onboard_imap_off[] = { | 302 | #define SABRE_OBIO_IMAP_BASE 0x1000UL |
| 368 | /*0x20*/ SABRE_IMAP_SCSI, | 303 | #define SABRE_ONBOARD_IRQ_BASE 0x20 |
| 369 | /*0x21*/ SABRE_IMAP_ETH, | ||
| 370 | /*0x22*/ SABRE_IMAP_BPP, | ||
| 371 | /*0x23*/ SABRE_IMAP_AU_REC, | ||
| 372 | /*0x24*/ SABRE_IMAP_AU_PLAY, | ||
| 373 | /*0x25*/ SABRE_IMAP_PFAIL, | ||
| 374 | /*0x26*/ SABRE_IMAP_KMS, | ||
| 375 | /*0x27*/ SABRE_IMAP_FLPY, | ||
| 376 | /*0x28*/ SABRE_IMAP_SHW, | ||
| 377 | /*0x29*/ SABRE_IMAP_KBD, | ||
| 378 | /*0x2a*/ SABRE_IMAP_MS, | ||
| 379 | /*0x2b*/ SABRE_IMAP_SER, | ||
| 380 | /*0x2c*/ 0 /* reserved */, | ||
| 381 | /*0x2d*/ 0 /* reserved */, | ||
| 382 | /*0x2e*/ SABRE_IMAP_UE, | ||
| 383 | /*0x2f*/ SABRE_IMAP_CE, | ||
| 384 | /*0x30*/ SABRE_IMAP_PCIERR, | ||
| 385 | /*0x31*/ 0 /* reserved */, | ||
| 386 | /*0x32*/ 0 /* reserved */, | ||
| 387 | /*0x33*/ SABRE_IMAP_GFX, | ||
| 388 | /*0x34*/ SABRE_IMAP_EUPA, | ||
| 389 | }; | ||
| 390 | #define SABRE_ONBOARD_IRQ_BASE 0x20 | ||
| 391 | #define SABRE_ONBOARD_IRQ_LAST 0x30 | ||
| 392 | #define sabre_onboard_imap_offset(__ino) \ | 304 | #define sabre_onboard_imap_offset(__ino) \ |
| 393 | __sabre_onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE] | 305 | (SABRE_OBIO_IMAP_BASE + (((__ino) & 0x1f) << 3)) |
| 394 | 306 | ||
| 395 | #define sabre_iclr_offset(ino) \ | 307 | #define sabre_iclr_offset(ino) \ |
| 396 | ((ino & 0x20) ? (SABRE_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \ | 308 | ((ino & 0x20) ? (SABRE_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \ |
| @@ -453,10 +365,6 @@ static unsigned int sabre_irq_build(struct device_node *dp, | |||
| 453 | imap_off = sabre_pcislot_imap_offset(ino); | 365 | imap_off = sabre_pcislot_imap_offset(ino); |
| 454 | } else { | 366 | } else { |
| 455 | /* onboard device */ | 367 | /* onboard device */ |
| 456 | if (ino > SABRE_ONBOARD_IRQ_LAST) { | ||
| 457 | prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino); | ||
| 458 | prom_halt(); | ||
| 459 | } | ||
| 460 | imap_off = sabre_onboard_imap_offset(ino); | 368 | imap_off = sabre_onboard_imap_offset(ino); |
| 461 | } | 369 | } |
| 462 | 370 | ||
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index bd578cc4856d..10306e476e38 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
| @@ -443,7 +443,7 @@ static const struct user_regset sparc64_regsets[] = { | |||
| 443 | */ | 443 | */ |
| 444 | [REGSET_GENERAL] = { | 444 | [REGSET_GENERAL] = { |
| 445 | .core_note_type = NT_PRSTATUS, | 445 | .core_note_type = NT_PRSTATUS, |
| 446 | .n = 36 * sizeof(u64), | 446 | .n = 36, |
| 447 | .size = sizeof(u64), .align = sizeof(u64), | 447 | .size = sizeof(u64), .align = sizeof(u64), |
| 448 | .get = genregs64_get, .set = genregs64_set | 448 | .get = genregs64_get, .set = genregs64_set |
| 449 | }, | 449 | }, |
| @@ -455,7 +455,7 @@ static const struct user_regset sparc64_regsets[] = { | |||
| 455 | */ | 455 | */ |
| 456 | [REGSET_FP] = { | 456 | [REGSET_FP] = { |
| 457 | .core_note_type = NT_PRFPREG, | 457 | .core_note_type = NT_PRFPREG, |
| 458 | .n = 35 * sizeof(u64), | 458 | .n = 35, |
| 459 | .size = sizeof(u64), .align = sizeof(u64), | 459 | .size = sizeof(u64), .align = sizeof(u64), |
| 460 | .get = fpregs64_get, .set = fpregs64_set | 460 | .get = fpregs64_get, .set = fpregs64_set |
| 461 | }, | 461 | }, |
| @@ -801,7 +801,7 @@ static const struct user_regset sparc32_regsets[] = { | |||
| 801 | */ | 801 | */ |
| 802 | [REGSET_GENERAL] = { | 802 | [REGSET_GENERAL] = { |
| 803 | .core_note_type = NT_PRSTATUS, | 803 | .core_note_type = NT_PRSTATUS, |
| 804 | .n = 38 * sizeof(u32), | 804 | .n = 38, |
| 805 | .size = sizeof(u32), .align = sizeof(u32), | 805 | .size = sizeof(u32), .align = sizeof(u32), |
| 806 | .get = genregs32_get, .set = genregs32_set | 806 | .get = genregs32_get, .set = genregs32_set |
| 807 | }, | 807 | }, |
| @@ -817,7 +817,7 @@ static const struct user_regset sparc32_regsets[] = { | |||
| 817 | */ | 817 | */ |
| 818 | [REGSET_FP] = { | 818 | [REGSET_FP] = { |
| 819 | .core_note_type = NT_PRFPREG, | 819 | .core_note_type = NT_PRFPREG, |
| 820 | .n = 99 * sizeof(u32), | 820 | .n = 99, |
| 821 | .size = sizeof(u32), .align = sizeof(u32), | 821 | .size = sizeof(u32), .align = sizeof(u32), |
| 822 | .get = fpregs32_get, .set = fpregs32_set | 822 | .get = fpregs32_get, .set = fpregs32_set |
| 823 | }, | 823 | }, |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 3d924121c796..c824df13f589 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 13 | #include <linux/linkage.h> | ||
| 13 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 14 | #include <linux/signal.h> | 15 | #include <linux/signal.h> |
| 15 | #include <linux/smp.h> | 16 | #include <linux/smp.h> |
| @@ -2453,7 +2454,7 @@ struct trap_per_cpu trap_block[NR_CPUS]; | |||
| 2453 | /* This can get invoked before sched_init() so play it super safe | 2454 | /* This can get invoked before sched_init() so play it super safe |
| 2454 | * and use hard_smp_processor_id(). | 2455 | * and use hard_smp_processor_id(). |
| 2455 | */ | 2456 | */ |
| 2456 | void init_cur_cpu_trap(struct thread_info *t) | 2457 | void notrace init_cur_cpu_trap(struct thread_info *t) |
| 2457 | { | 2458 | { |
| 2458 | int cpu = hard_smp_processor_id(); | 2459 | int cpu = hard_smp_processor_id(); |
| 2459 | struct trap_per_cpu *p = &trap_block[cpu]; | 2460 | struct trap_per_cpu *p = &trap_block[cpu]; |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 1c7d39f0e89e..9983bc3f5d18 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -344,31 +344,15 @@ static void __init early_cpu_detect(void) | |||
| 344 | 344 | ||
| 345 | /* | 345 | /* |
| 346 | * The NOPL instruction is supposed to exist on all CPUs with | 346 | * The NOPL instruction is supposed to exist on all CPUs with |
| 347 | * family >= 6, unfortunately, that's not true in practice because | 347 | * family >= 6; unfortunately, that's not true in practice because |
| 348 | * of early VIA chips and (more importantly) broken virtualizers that | 348 | * of early VIA chips and (more importantly) broken virtualizers that |
| 349 | * are not easy to detect. Hence, probe for it based on first | 349 | * are not easy to detect. In the latter case it doesn't even *fail* |
| 350 | * principles. | 350 | * reliably, so probing for it doesn't even work. Disable it completely |
| 351 | * unless we can find a reliable way to detect all the broken cases. | ||
| 351 | */ | 352 | */ |
| 352 | static void __cpuinit detect_nopl(struct cpuinfo_x86 *c) | 353 | static void __cpuinit detect_nopl(struct cpuinfo_x86 *c) |
| 353 | { | 354 | { |
| 354 | const u32 nopl_signature = 0x888c53b1; /* Random number */ | ||
| 355 | u32 has_nopl = nopl_signature; | ||
| 356 | |||
| 357 | clear_cpu_cap(c, X86_FEATURE_NOPL); | 355 | clear_cpu_cap(c, X86_FEATURE_NOPL); |
| 358 | if (c->x86 >= 6) { | ||
| 359 | asm volatile("\n" | ||
| 360 | "1: .byte 0x0f,0x1f,0xc0\n" /* nopl %eax */ | ||
| 361 | "2:\n" | ||
| 362 | " .section .fixup,\"ax\"\n" | ||
| 363 | "3: xor %0,%0\n" | ||
| 364 | " jmp 2b\n" | ||
| 365 | " .previous\n" | ||
| 366 | _ASM_EXTABLE(1b,3b) | ||
| 367 | : "+a" (has_nopl)); | ||
| 368 | |||
| 369 | if (has_nopl == nopl_signature) | ||
| 370 | set_cpu_cap(c, X86_FEATURE_NOPL); | ||
| 371 | } | ||
| 372 | } | 356 | } |
| 373 | 357 | ||
| 374 | static void __cpuinit generic_identify(struct cpuinfo_x86 *c) | 358 | static void __cpuinit generic_identify(struct cpuinfo_x86 *c) |
diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c index f2d43bc75514..ff7d3b0124f1 100644 --- a/arch/x86/kernel/kdebugfs.c +++ b/arch/x86/kernel/kdebugfs.c | |||
| @@ -139,6 +139,7 @@ static int __init create_setup_data_nodes(struct dentry *parent) | |||
| 139 | if (PageHighMem(pg)) { | 139 | if (PageHighMem(pg)) { |
| 140 | data = ioremap_cache(pa_data, sizeof(*data)); | 140 | data = ioremap_cache(pa_data, sizeof(*data)); |
| 141 | if (!data) { | 141 | if (!data) { |
| 142 | kfree(node); | ||
| 142 | error = -ENXIO; | 143 | error = -ENXIO; |
| 143 | goto err_dir; | 144 | goto err_dir; |
| 144 | } | 145 | } |
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 7fc4d5b0a6a0..876e91890777 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
| @@ -246,6 +246,14 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c) | |||
| 246 | return 1; | 246 | return 1; |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | static cpumask_t c1e_mask = CPU_MASK_NONE; | ||
| 250 | static int c1e_detected; | ||
| 251 | |||
| 252 | void c1e_remove_cpu(int cpu) | ||
| 253 | { | ||
| 254 | cpu_clear(cpu, c1e_mask); | ||
| 255 | } | ||
| 256 | |||
| 249 | /* | 257 | /* |
| 250 | * C1E aware idle routine. We check for C1E active in the interrupt | 258 | * C1E aware idle routine. We check for C1E active in the interrupt |
| 251 | * pending message MSR. If we detect C1E, then we handle it the same | 259 | * pending message MSR. If we detect C1E, then we handle it the same |
| @@ -253,9 +261,6 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c) | |||
| 253 | */ | 261 | */ |
| 254 | static void c1e_idle(void) | 262 | static void c1e_idle(void) |
| 255 | { | 263 | { |
| 256 | static cpumask_t c1e_mask = CPU_MASK_NONE; | ||
| 257 | static int c1e_detected; | ||
| 258 | |||
| 259 | if (need_resched()) | 264 | if (need_resched()) |
| 260 | return; | 265 | return; |
| 261 | 266 | ||
| @@ -265,8 +270,10 @@ static void c1e_idle(void) | |||
| 265 | rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi); | 270 | rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi); |
| 266 | if (lo & K8_INTP_C1E_ACTIVE_MASK) { | 271 | if (lo & K8_INTP_C1E_ACTIVE_MASK) { |
| 267 | c1e_detected = 1; | 272 | c1e_detected = 1; |
| 268 | mark_tsc_unstable("TSC halt in C1E"); | 273 | if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) |
| 269 | printk(KERN_INFO "System has C1E enabled\n"); | 274 | mark_tsc_unstable("TSC halt in AMD C1E"); |
| 275 | printk(KERN_INFO "System has AMD C1E enabled\n"); | ||
| 276 | set_cpu_cap(&boot_cpu_data, X86_FEATURE_AMDC1E); | ||
| 270 | } | 277 | } |
| 271 | } | 278 | } |
| 272 | 279 | ||
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 362d4e7f2d38..9838f2539dfc 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -670,6 +670,10 @@ void __init setup_arch(char **cmdline_p) | |||
| 670 | 670 | ||
| 671 | parse_early_param(); | 671 | parse_early_param(); |
| 672 | 672 | ||
| 673 | #ifdef CONFIG_X86_64 | ||
| 674 | check_efer(); | ||
| 675 | #endif | ||
| 676 | |||
| 673 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | 677 | #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) |
| 674 | /* | 678 | /* |
| 675 | * Must be before kernel pagetables are setup | 679 | * Must be before kernel pagetables are setup |
| @@ -738,7 +742,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 738 | #else | 742 | #else |
| 739 | num_physpages = max_pfn; | 743 | num_physpages = max_pfn; |
| 740 | 744 | ||
| 741 | check_efer(); | ||
| 742 | 745 | ||
| 743 | /* How many end-of-memory variables you have, grandma! */ | 746 | /* How many end-of-memory variables you have, grandma! */ |
| 744 | /* need this before calling reserve_initrd */ | 747 | /* need this before calling reserve_initrd */ |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 66b04e598817..06f1407d5542 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | #include <asm/desc.h> | 52 | #include <asm/desc.h> |
| 53 | #include <asm/nmi.h> | 53 | #include <asm/nmi.h> |
| 54 | #include <asm/irq.h> | 54 | #include <asm/irq.h> |
| 55 | #include <asm/idle.h> | ||
| 55 | #include <asm/smp.h> | 56 | #include <asm/smp.h> |
| 56 | #include <asm/trampoline.h> | 57 | #include <asm/trampoline.h> |
| 57 | #include <asm/cpu.h> | 58 | #include <asm/cpu.h> |
| @@ -1414,6 +1415,7 @@ void play_dead_common(void) | |||
| 1414 | idle_task_exit(); | 1415 | idle_task_exit(); |
| 1415 | reset_lazy_tlbstate(); | 1416 | reset_lazy_tlbstate(); |
| 1416 | irq_ctx_exit(raw_smp_processor_id()); | 1417 | irq_ctx_exit(raw_smp_processor_id()); |
| 1418 | c1e_remove_cpu(raw_smp_processor_id()); | ||
| 1417 | 1419 | ||
| 1418 | mb(); | 1420 | mb(); |
| 1419 | /* Ack it */ | 1421 | /* Ack it */ |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 0bfe2bd305eb..3da2508eb22a 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -711,6 +711,10 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp) | |||
| 711 | u64 *spte; | 711 | u64 *spte; |
| 712 | int young = 0; | 712 | int young = 0; |
| 713 | 713 | ||
| 714 | /* always return old for EPT */ | ||
| 715 | if (!shadow_accessed_mask) | ||
| 716 | return 0; | ||
| 717 | |||
| 714 | spte = rmap_next(kvm, rmapp, NULL); | 718 | spte = rmap_next(kvm, rmapp, NULL); |
| 715 | while (spte) { | 719 | while (spte) { |
| 716 | int _young; | 720 | int _young; |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index e2ee264740c7..8233b86c778c 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
| @@ -62,6 +62,7 @@ static int npt = 1; | |||
| 62 | module_param(npt, int, S_IRUGO); | 62 | module_param(npt, int, S_IRUGO); |
| 63 | 63 | ||
| 64 | static void kvm_reput_irq(struct vcpu_svm *svm); | 64 | static void kvm_reput_irq(struct vcpu_svm *svm); |
| 65 | static void svm_flush_tlb(struct kvm_vcpu *vcpu); | ||
| 65 | 66 | ||
| 66 | static inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu) | 67 | static inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu) |
| 67 | { | 68 | { |
| @@ -878,6 +879,10 @@ set: | |||
| 878 | static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) | 879 | static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) |
| 879 | { | 880 | { |
| 880 | unsigned long host_cr4_mce = read_cr4() & X86_CR4_MCE; | 881 | unsigned long host_cr4_mce = read_cr4() & X86_CR4_MCE; |
| 882 | unsigned long old_cr4 = to_svm(vcpu)->vmcb->save.cr4; | ||
| 883 | |||
| 884 | if (npt_enabled && ((old_cr4 ^ cr4) & X86_CR4_PGE)) | ||
| 885 | force_new_asid(vcpu); | ||
| 881 | 886 | ||
| 882 | vcpu->arch.cr4 = cr4; | 887 | vcpu->arch.cr4 = cr4; |
| 883 | if (!npt_enabled) | 888 | if (!npt_enabled) |
| @@ -1027,6 +1032,13 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) | |||
| 1027 | KVMTRACE_3D(TDP_FAULT, &svm->vcpu, error_code, | 1032 | KVMTRACE_3D(TDP_FAULT, &svm->vcpu, error_code, |
| 1028 | (u32)fault_address, (u32)(fault_address >> 32), | 1033 | (u32)fault_address, (u32)(fault_address >> 32), |
| 1029 | handler); | 1034 | handler); |
| 1035 | /* | ||
| 1036 | * FIXME: Tis shouldn't be necessary here, but there is a flush | ||
| 1037 | * missing in the MMU code. Until we find this bug, flush the | ||
| 1038 | * complete TLB here on an NPF | ||
| 1039 | */ | ||
| 1040 | if (npt_enabled) | ||
| 1041 | svm_flush_tlb(&svm->vcpu); | ||
| 1030 | 1042 | ||
| 1031 | if (event_injection) | 1043 | if (event_injection) |
| 1032 | kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address); | 1044 | kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address); |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 2a69773e3b26..7041cc52b562 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -3301,8 +3301,7 @@ static int __init vmx_init(void) | |||
| 3301 | kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK | | 3301 | kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK | |
| 3302 | VMX_EPT_WRITABLE_MASK | | 3302 | VMX_EPT_WRITABLE_MASK | |
| 3303 | VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT); | 3303 | VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT); |
| 3304 | kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK, | 3304 | kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull, |
| 3305 | VMX_EPT_FAKE_DIRTY_MASK, 0ull, | ||
| 3306 | VMX_EPT_EXECUTABLE_MASK); | 3305 | VMX_EPT_EXECUTABLE_MASK); |
| 3307 | kvm_enable_tdp(); | 3306 | kvm_enable_tdp(); |
| 3308 | } else | 3307 | } else |
diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index 425a13436b3f..23e8373507ad 100644 --- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h | |||
| @@ -370,8 +370,6 @@ enum vmcs_field { | |||
| 370 | #define VMX_EPT_READABLE_MASK 0x1ull | 370 | #define VMX_EPT_READABLE_MASK 0x1ull |
| 371 | #define VMX_EPT_WRITABLE_MASK 0x2ull | 371 | #define VMX_EPT_WRITABLE_MASK 0x2ull |
| 372 | #define VMX_EPT_EXECUTABLE_MASK 0x4ull | 372 | #define VMX_EPT_EXECUTABLE_MASK 0x4ull |
| 373 | #define VMX_EPT_FAKE_ACCESSED_MASK (1ull << 62) | ||
| 374 | #define VMX_EPT_FAKE_DIRTY_MASK (1ull << 63) | ||
| 375 | 373 | ||
| 376 | #define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul | 374 | #define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul |
| 377 | 375 | ||
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index d37f29376b0c..60ec1d08ff24 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
| @@ -458,11 +458,7 @@ static void __init pagetable_init(void) | |||
| 458 | { | 458 | { |
| 459 | pgd_t *pgd_base = swapper_pg_dir; | 459 | pgd_t *pgd_base = swapper_pg_dir; |
| 460 | 460 | ||
| 461 | paravirt_pagetable_setup_start(pgd_base); | ||
| 462 | |||
| 463 | permanent_kmaps_init(pgd_base); | 461 | permanent_kmaps_init(pgd_base); |
| 464 | |||
| 465 | paravirt_pagetable_setup_done(pgd_base); | ||
| 466 | } | 462 | } |
| 467 | 463 | ||
| 468 | #ifdef CONFIG_ACPI_SLEEP | 464 | #ifdef CONFIG_ACPI_SLEEP |
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index b6acc3a0af46..d67901083888 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
| @@ -42,7 +42,7 @@ char * __init xen_memory_setup(void) | |||
| 42 | 42 | ||
| 43 | e820.nr_map = 0; | 43 | e820.nr_map = 0; |
| 44 | 44 | ||
| 45 | e820_add_region(0, PFN_PHYS(max_pfn), E820_RAM); | 45 | e820_add_region(0, PFN_PHYS((u64)max_pfn), E820_RAM); |
| 46 | 46 | ||
| 47 | /* | 47 | /* |
| 48 | * Even though this is normal, usable memory under Xen, reserve | 48 | * Even though this is normal, usable memory under Xen, reserve |
diff --git a/block/cmd-filter.c b/block/cmd-filter.c index 228b6447e89f..79c14996ac11 100644 --- a/block/cmd-filter.c +++ b/block/cmd-filter.c | |||
| @@ -49,6 +49,7 @@ int blk_verify_command(struct blk_cmd_filter *filter, | |||
| 49 | } | 49 | } |
| 50 | EXPORT_SYMBOL(blk_verify_command); | 50 | EXPORT_SYMBOL(blk_verify_command); |
| 51 | 51 | ||
| 52 | #if 0 | ||
| 52 | /* and now, the sysfs stuff */ | 53 | /* and now, the sysfs stuff */ |
| 53 | static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page, | 54 | static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page, |
| 54 | int rw) | 55 | int rw) |
| @@ -233,3 +234,4 @@ void blk_unregister_filter(struct gendisk *disk) | |||
| 233 | kobject_put(disk->holder_dir->parent); | 234 | kobject_put(disk->holder_dir->parent); |
| 234 | } | 235 | } |
| 235 | EXPORT_SYMBOL(blk_unregister_filter); | 236 | EXPORT_SYMBOL(blk_unregister_filter); |
| 237 | #endif | ||
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index b1d08a8f5003..e6b4606e36b6 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -1499,7 +1499,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, | |||
| 1499 | * off. | 1499 | * off. |
| 1500 | */ | 1500 | */ |
| 1501 | if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) { | 1501 | if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) { |
| 1502 | int rc = piix_disable_ahci(pdev); | 1502 | rc = piix_disable_ahci(pdev); |
| 1503 | if (rc) | 1503 | if (rc) |
| 1504 | return rc; | 1504 | return rc; |
| 1505 | } | 1505 | } |
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 3ead02fe379e..5032c32fa505 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
| @@ -96,6 +96,7 @@ enum { | |||
| 96 | PORT_SCR = 0x20, | 96 | PORT_SCR = 0x20, |
| 97 | 97 | ||
| 98 | /* HOST_CTL bits */ | 98 | /* HOST_CTL bits */ |
| 99 | HCTL_LEDEN = (1 << 3), /* enable LED operation */ | ||
| 99 | HCTL_IRQOFF = (1 << 8), /* global IRQ off */ | 100 | HCTL_IRQOFF = (1 << 8), /* global IRQ off */ |
| 100 | HCTL_FTHD0 = (1 << 10), /* fifo threshold 0 */ | 101 | HCTL_FTHD0 = (1 << 10), /* fifo threshold 0 */ |
| 101 | HCTL_FTHD1 = (1 << 11), /* fifo threshold 1*/ | 102 | HCTL_FTHD1 = (1 << 11), /* fifo threshold 1*/ |
| @@ -540,7 +541,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc) | |||
| 540 | void __iomem *port_base = inic_port_base(ap); | 541 | void __iomem *port_base = inic_port_base(ap); |
| 541 | 542 | ||
| 542 | /* fire up the ADMA engine */ | 543 | /* fire up the ADMA engine */ |
| 543 | writew(HCTL_FTHD0, port_base + HOST_CTL); | 544 | writew(HCTL_FTHD0 | HCTL_LEDEN, port_base + HOST_CTL); |
| 544 | writew(IDMA_CTL_GO, port_base + PORT_IDMA_CTL); | 545 | writew(IDMA_CTL_GO, port_base + PORT_IDMA_CTL); |
| 545 | writeb(0, port_base + PORT_CPB_PTQFIFO); | 546 | writeb(0, port_base + PORT_CPB_PTQFIFO); |
| 546 | 547 | ||
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 4eee533f3f4a..71d2ac4e3f46 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
| @@ -178,11 +178,13 @@ static int verify_pmtmr_rate(void) | |||
| 178 | 178 | ||
| 179 | /* Number of monotonicity checks to perform during initialization */ | 179 | /* Number of monotonicity checks to perform during initialization */ |
| 180 | #define ACPI_PM_MONOTONICITY_CHECKS 10 | 180 | #define ACPI_PM_MONOTONICITY_CHECKS 10 |
| 181 | /* Number of reads we try to get two different values */ | ||
| 182 | #define ACPI_PM_READ_CHECKS 10000 | ||
| 181 | 183 | ||
| 182 | static int __init init_acpi_pm_clocksource(void) | 184 | static int __init init_acpi_pm_clocksource(void) |
| 183 | { | 185 | { |
| 184 | cycle_t value1, value2; | 186 | cycle_t value1, value2; |
| 185 | unsigned int i, j, good = 0; | 187 | unsigned int i, j = 0; |
| 186 | 188 | ||
| 187 | if (!pmtmr_ioport) | 189 | if (!pmtmr_ioport) |
| 188 | return -ENODEV; | 190 | return -ENODEV; |
| @@ -192,29 +194,26 @@ static int __init init_acpi_pm_clocksource(void) | |||
| 192 | 194 | ||
| 193 | /* "verify" this timing source: */ | 195 | /* "verify" this timing source: */ |
| 194 | for (j = 0; j < ACPI_PM_MONOTONICITY_CHECKS; j++) { | 196 | for (j = 0; j < ACPI_PM_MONOTONICITY_CHECKS; j++) { |
| 197 | udelay(100 * j); | ||
| 195 | value1 = clocksource_acpi_pm.read(); | 198 | value1 = clocksource_acpi_pm.read(); |
| 196 | for (i = 0; i < 10000; i++) { | 199 | for (i = 0; i < ACPI_PM_READ_CHECKS; i++) { |
| 197 | value2 = clocksource_acpi_pm.read(); | 200 | value2 = clocksource_acpi_pm.read(); |
| 198 | if (value2 == value1) | 201 | if (value2 == value1) |
| 199 | continue; | 202 | continue; |
| 200 | if (value2 > value1) | 203 | if (value2 > value1) |
| 201 | good++; | ||
| 202 | break; | 204 | break; |
| 203 | if ((value2 < value1) && ((value2) < 0xFFF)) | 205 | if ((value2 < value1) && ((value2) < 0xFFF)) |
| 204 | good++; | ||
| 205 | break; | 206 | break; |
| 206 | printk(KERN_INFO "PM-Timer had inconsistent results:" | 207 | printk(KERN_INFO "PM-Timer had inconsistent results:" |
| 207 | " 0x%#llx, 0x%#llx - aborting.\n", | 208 | " 0x%#llx, 0x%#llx - aborting.\n", |
| 208 | value1, value2); | 209 | value1, value2); |
| 209 | return -EINVAL; | 210 | return -EINVAL; |
| 210 | } | 211 | } |
| 211 | udelay(300 * i); | 212 | if (i == ACPI_PM_READ_CHECKS) { |
| 212 | } | 213 | printk(KERN_INFO "PM-Timer failed consistency check " |
| 213 | 214 | " (0x%#llx) - aborting.\n", value1); | |
| 214 | if (good != ACPI_PM_MONOTONICITY_CHECKS) { | 215 | return -ENODEV; |
| 215 | printk(KERN_INFO "PM-Timer failed consistency check " | 216 | } |
| 216 | " (0x%#llx) - aborting.\n", value1); | ||
| 217 | return -ENODEV; | ||
| 218 | } | 217 | } |
| 219 | 218 | ||
| 220 | if (verify_pmtmr_rate() != 0) | 219 | if (verify_pmtmr_rate() != 0) |
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index ee827a7f7c6a..b6ad3ac5916e 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
| @@ -1157,6 +1157,8 @@ static int aead_authenc_givencrypt( | |||
| 1157 | edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; | 1157 | edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; |
| 1158 | 1158 | ||
| 1159 | memcpy(req->giv, ctx->iv, crypto_aead_ivsize(authenc)); | 1159 | memcpy(req->giv, ctx->iv, crypto_aead_ivsize(authenc)); |
| 1160 | /* avoid consecutive packets going out with same IV */ | ||
| 1161 | *(__be64 *)req->giv ^= cpu_to_be64(req->seq); | ||
| 1160 | 1162 | ||
| 1161 | return ipsec_esp(edesc, areq, req->giv, req->seq, | 1163 | return ipsec_esp(edesc, areq, req->giv, req->seq, |
| 1162 | ipsec_esp_encrypt_done); | 1164 | ipsec_esp_encrypt_done); |
| @@ -1449,6 +1451,8 @@ static int talitos_probe(struct of_device *ofdev, | |||
| 1449 | 1451 | ||
| 1450 | priv->ofdev = ofdev; | 1452 | priv->ofdev = ofdev; |
| 1451 | 1453 | ||
| 1454 | INIT_LIST_HEAD(&priv->alg_list); | ||
| 1455 | |||
| 1452 | tasklet_init(&priv->done_task, talitos_done, (unsigned long)dev); | 1456 | tasklet_init(&priv->done_task, talitos_done, (unsigned long)dev); |
| 1453 | tasklet_init(&priv->error_task, talitos_error, (unsigned long)dev); | 1457 | tasklet_init(&priv->error_task, talitos_error, (unsigned long)dev); |
| 1454 | 1458 | ||
| @@ -1575,8 +1579,6 @@ static int talitos_probe(struct of_device *ofdev, | |||
| 1575 | } | 1579 | } |
| 1576 | 1580 | ||
| 1577 | /* register crypto algorithms the device supports */ | 1581 | /* register crypto algorithms the device supports */ |
| 1578 | INIT_LIST_HEAD(&priv->alg_list); | ||
| 1579 | |||
| 1580 | for (i = 0; i < ARRAY_SIZE(driver_algs); i++) { | 1582 | for (i = 0; i < ARRAY_SIZE(driver_algs); i++) { |
| 1581 | if (hw_supports(dev, driver_algs[i].desc_hdr_template)) { | 1583 | if (hw_supports(dev, driver_algs[i].desc_hdr_template)) { |
| 1582 | struct talitos_crypto_alg *t_alg; | 1584 | struct talitos_crypto_alg *t_alg; |
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c index ce8d94fbfd7e..bfda8c80ef24 100644 --- a/drivers/hwmon/ad7414.c +++ b/drivers/hwmon/ad7414.c | |||
| @@ -69,7 +69,7 @@ static inline int ad7414_write(struct i2c_client *client, u8 reg, u8 value) | |||
| 69 | return i2c_smbus_write_byte_data(client, reg, value); | 69 | return i2c_smbus_write_byte_data(client, reg, value); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | struct ad7414_data *ad7414_update_device(struct device *dev) | 72 | static struct ad7414_data *ad7414_update_device(struct device *dev) |
| 73 | { | 73 | { |
| 74 | struct i2c_client *client = to_i2c_client(dev); | 74 | struct i2c_client *client = to_i2c_client(dev); |
| 75 | struct ad7414_data *data = i2c_get_clientdata(client); | 75 | struct ad7414_data *data = i2c_get_clientdata(client); |
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c index d191118ba0cb..d6b490d3e36f 100644 --- a/drivers/hwmon/atxp1.c +++ b/drivers/hwmon/atxp1.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | MODULE_LICENSE("GPL"); | 32 | MODULE_LICENSE("GPL"); |
| 33 | MODULE_DESCRIPTION("System voltages control via Attansic ATXP1"); | 33 | MODULE_DESCRIPTION("System voltages control via Attansic ATXP1"); |
| 34 | MODULE_VERSION("0.6.2"); | 34 | MODULE_VERSION("0.6.3"); |
| 35 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); | 35 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); |
| 36 | 36 | ||
| 37 | #define ATXP1_VID 0x00 | 37 | #define ATXP1_VID 0x00 |
| @@ -289,16 +289,16 @@ static int atxp1_detect(struct i2c_client *new_client, int kind, | |||
| 289 | if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) && | 289 | if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) && |
| 290 | (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) && | 290 | (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) && |
| 291 | (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) && | 291 | (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) && |
| 292 | (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) { | 292 | (i2c_smbus_read_byte_data(new_client, 0xff) == 0))) |
| 293 | return -ENODEV; | ||
| 293 | 294 | ||
| 294 | /* No vendor ID, now checking if registers 0x10,0x11 (non-existent) | 295 | /* No vendor ID, now checking if registers 0x10,0x11 (non-existent) |
| 295 | * showing the same as register 0x00 */ | 296 | * showing the same as register 0x00 */ |
| 296 | temp = i2c_smbus_read_byte_data(new_client, 0x00); | 297 | temp = i2c_smbus_read_byte_data(new_client, 0x00); |
| 297 | 298 | ||
| 298 | if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) && | 299 | if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) && |
| 299 | (i2c_smbus_read_byte_data(new_client, 0x11) == temp) )) | 300 | (i2c_smbus_read_byte_data(new_client, 0x11) == temp))) |
| 300 | return -ENODEV; | 301 | return -ENODEV; |
| 301 | } | ||
| 302 | 302 | ||
| 303 | /* Get VRM */ | 303 | /* Get VRM */ |
| 304 | temp = vid_which_vrm(); | 304 | temp = vid_which_vrm(); |
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 30cdb0956779..f1133081cc42 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
| @@ -273,10 +273,10 @@ struct it87_data { | |||
| 273 | static inline int has_16bit_fans(const struct it87_data *data) | 273 | static inline int has_16bit_fans(const struct it87_data *data) |
| 274 | { | 274 | { |
| 275 | /* IT8705F Datasheet 0.4.1, 3h == Version G. | 275 | /* IT8705F Datasheet 0.4.1, 3h == Version G. |
| 276 | IT8712F Datasheet 0.9.1, section 8.3.5 indicates 7h == Version I. | 276 | IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J. |
| 277 | These are the first revisions with 16bit tachometer support. */ | 277 | These are the first revisions with 16bit tachometer support. */ |
| 278 | return (data->type == it87 && data->revision >= 0x03) | 278 | return (data->type == it87 && data->revision >= 0x03) |
| 279 | || (data->type == it8712 && data->revision >= 0x07) | 279 | || (data->type == it8712 && data->revision >= 0x08) |
| 280 | || data->type == it8716 | 280 | || data->type == it8716 |
| 281 | || data->type == it8718; | 281 | || data->type == it8718; |
| 282 | } | 282 | } |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index f1489999cf91..49a8c589e346 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1933,7 +1933,6 @@ static void ide_cd_remove(ide_drive_t *drive) | |||
| 1933 | 1933 | ||
| 1934 | ide_proc_unregister_driver(drive, info->driver); | 1934 | ide_proc_unregister_driver(drive, info->driver); |
| 1935 | 1935 | ||
| 1936 | blk_unregister_filter(info->disk); | ||
| 1937 | del_gendisk(info->disk); | 1936 | del_gendisk(info->disk); |
| 1938 | 1937 | ||
| 1939 | ide_cd_put(info); | 1938 | ide_cd_put(info); |
| @@ -2159,7 +2158,6 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
| 2159 | g->fops = &idecd_ops; | 2158 | g->fops = &idecd_ops; |
| 2160 | g->flags |= GENHD_FL_REMOVABLE; | 2159 | g->flags |= GENHD_FL_REMOVABLE; |
| 2161 | add_disk(g); | 2160 | add_disk(g); |
| 2162 | blk_register_filter(g); | ||
| 2163 | return 0; | 2161 | return 0; |
| 2164 | 2162 | ||
| 2165 | out_free_cd: | 2163 | out_free_cd: |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index eb107eef0dbc..c37ab1743819 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
| @@ -613,6 +613,14 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list) | |||
| 613 | return 0; | 613 | return 0; |
| 614 | } | 614 | } |
| 615 | 615 | ||
| 616 | static struct hpt_info *hpt3xx_get_info(struct device *dev) | ||
| 617 | { | ||
| 618 | struct ide_host *host = dev_get_drvdata(dev); | ||
| 619 | struct hpt_info *info = (struct hpt_info *)host->host_priv; | ||
| 620 | |||
| 621 | return dev == host->dev[1] ? info + 1 : info; | ||
| 622 | } | ||
| 623 | |||
| 616 | /* | 624 | /* |
| 617 | * The Marvell bridge chips used on the HighPoint SATA cards do not seem | 625 | * The Marvell bridge chips used on the HighPoint SATA cards do not seem |
| 618 | * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes... | 626 | * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes... |
| @@ -621,9 +629,7 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list) | |||
| 621 | static u8 hpt3xx_udma_filter(ide_drive_t *drive) | 629 | static u8 hpt3xx_udma_filter(ide_drive_t *drive) |
| 622 | { | 630 | { |
| 623 | ide_hwif_t *hwif = HWIF(drive); | 631 | ide_hwif_t *hwif = HWIF(drive); |
| 624 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 632 | struct hpt_info *info = hpt3xx_get_info(hwif->dev); |
| 625 | struct ide_host *host = pci_get_drvdata(dev); | ||
| 626 | struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]); | ||
| 627 | u8 mask = hwif->ultra_mask; | 633 | u8 mask = hwif->ultra_mask; |
| 628 | 634 | ||
| 629 | switch (info->chip_type) { | 635 | switch (info->chip_type) { |
| @@ -662,9 +668,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive) | |||
| 662 | static u8 hpt3xx_mdma_filter(ide_drive_t *drive) | 668 | static u8 hpt3xx_mdma_filter(ide_drive_t *drive) |
| 663 | { | 669 | { |
| 664 | ide_hwif_t *hwif = HWIF(drive); | 670 | ide_hwif_t *hwif = HWIF(drive); |
| 665 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 671 | struct hpt_info *info = hpt3xx_get_info(hwif->dev); |
| 666 | struct ide_host *host = pci_get_drvdata(dev); | ||
| 667 | struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]); | ||
| 668 | 672 | ||
| 669 | switch (info->chip_type) { | 673 | switch (info->chip_type) { |
| 670 | case HPT372 : | 674 | case HPT372 : |
| @@ -700,8 +704,7 @@ static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed) | |||
| 700 | { | 704 | { |
| 701 | ide_hwif_t *hwif = drive->hwif; | 705 | ide_hwif_t *hwif = drive->hwif; |
| 702 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 706 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
| 703 | struct ide_host *host = pci_get_drvdata(dev); | 707 | struct hpt_info *info = hpt3xx_get_info(hwif->dev); |
| 704 | struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]); | ||
| 705 | struct hpt_timings *t = info->timings; | 708 | struct hpt_timings *t = info->timings; |
| 706 | u8 itr_addr = 0x40 + (drive->dn * 4); | 709 | u8 itr_addr = 0x40 + (drive->dn * 4); |
| 707 | u32 old_itr = 0; | 710 | u32 old_itr = 0; |
| @@ -744,8 +747,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask) | |||
| 744 | { | 747 | { |
| 745 | ide_hwif_t *hwif = HWIF(drive); | 748 | ide_hwif_t *hwif = HWIF(drive); |
| 746 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 749 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
| 747 | struct ide_host *host = pci_get_drvdata(dev); | 750 | struct hpt_info *info = hpt3xx_get_info(hwif->dev); |
| 748 | struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]); | ||
| 749 | 751 | ||
| 750 | if (drive->quirk_list) { | 752 | if (drive->quirk_list) { |
| 751 | if (info->chip_type >= HPT370) { | 753 | if (info->chip_type >= HPT370) { |
| @@ -973,8 +975,7 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f | |||
| 973 | static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev) | 975 | static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev) |
| 974 | { | 976 | { |
| 975 | unsigned long io_base = pci_resource_start(dev, 4); | 977 | unsigned long io_base = pci_resource_start(dev, 4); |
| 976 | struct ide_host *host = pci_get_drvdata(dev); | 978 | struct hpt_info *info = hpt3xx_get_info(&dev->dev); |
| 977 | struct hpt_info *info = host->host_priv + (&dev->dev == host->dev[1]); | ||
| 978 | const char *name = DRV_NAME; | 979 | const char *name = DRV_NAME; |
| 979 | u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */ | 980 | u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */ |
| 980 | u8 chip_type; | 981 | u8 chip_type; |
| @@ -1217,8 +1218,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev) | |||
| 1217 | static u8 hpt3xx_cable_detect(ide_hwif_t *hwif) | 1218 | static u8 hpt3xx_cable_detect(ide_hwif_t *hwif) |
| 1218 | { | 1219 | { |
| 1219 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 1220 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
| 1220 | struct ide_host *host = pci_get_drvdata(dev); | 1221 | struct hpt_info *info = hpt3xx_get_info(hwif->dev); |
| 1221 | struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]); | ||
| 1222 | u8 chip_type = info->chip_type; | 1222 | u8 chip_type = info->chip_type; |
| 1223 | u8 scr1 = 0, ata66 = hwif->channel ? 0x01 : 0x02; | 1223 | u8 scr1 = 0, ata66 = hwif->channel ? 0x01 : 0x02; |
| 1224 | 1224 | ||
| @@ -1262,8 +1262,7 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif) | |||
| 1262 | static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) | 1262 | static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) |
| 1263 | { | 1263 | { |
| 1264 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 1264 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
| 1265 | struct ide_host *host = pci_get_drvdata(dev); | 1265 | struct hpt_info *info = hpt3xx_get_info(hwif->dev); |
| 1266 | struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]); | ||
| 1267 | int serialize = HPT_SERIALIZE_IO; | 1266 | int serialize = HPT_SERIALIZE_IO; |
| 1268 | u8 chip_type = info->chip_type; | 1267 | u8 chip_type = info->chip_type; |
| 1269 | u8 new_mcr, old_mcr = 0; | 1268 | u8 new_mcr, old_mcr = 0; |
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index f29dbb767e87..9559248f265b 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c | |||
| @@ -1342,6 +1342,12 @@ static __be32 convert_access(int acc) | |||
| 1342 | static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr) | 1342 | static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr) |
| 1343 | { | 1343 | { |
| 1344 | struct mlx4_ib_fast_reg_page_list *mfrpl = to_mfrpl(wr->wr.fast_reg.page_list); | 1344 | struct mlx4_ib_fast_reg_page_list *mfrpl = to_mfrpl(wr->wr.fast_reg.page_list); |
| 1345 | int i; | ||
| 1346 | |||
| 1347 | for (i = 0; i < wr->wr.fast_reg.page_list_len; ++i) | ||
| 1348 | wr->wr.fast_reg.page_list->page_list[i] = | ||
| 1349 | cpu_to_be64(wr->wr.fast_reg.page_list->page_list[i] | | ||
| 1350 | MLX4_MTT_FLAG_PRESENT); | ||
| 1345 | 1351 | ||
| 1346 | fseg->flags = convert_access(wr->wr.fast_reg.access_flags); | 1352 | fseg->flags = convert_access(wr->wr.fast_reg.access_flags); |
| 1347 | fseg->mem_key = cpu_to_be32(wr->wr.fast_reg.rkey); | 1353 | fseg->mem_key = cpu_to_be32(wr->wr.fast_reg.rkey); |
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index 9f0b964b2c99..499d3cf83e1f 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c | |||
| @@ -1956,13 +1956,6 @@ static int mini_cm_reject(struct nes_cm_core *cm_core, | |||
| 1956 | return ret; | 1956 | return ret; |
| 1957 | cleanup_retrans_entry(cm_node); | 1957 | cleanup_retrans_entry(cm_node); |
| 1958 | cm_node->state = NES_CM_STATE_CLOSED; | 1958 | cm_node->state = NES_CM_STATE_CLOSED; |
| 1959 | ret = send_fin(cm_node, NULL); | ||
| 1960 | |||
| 1961 | if (cm_node->accept_pend) { | ||
| 1962 | BUG_ON(!cm_node->listener); | ||
| 1963 | atomic_dec(&cm_node->listener->pend_accepts_cnt); | ||
| 1964 | BUG_ON(atomic_read(&cm_node->listener->pend_accepts_cnt) < 0); | ||
| 1965 | } | ||
| 1966 | 1959 | ||
| 1967 | ret = send_reset(cm_node, NULL); | 1960 | ret = send_reset(cm_node, NULL); |
| 1968 | return ret; | 1961 | return ret; |
| @@ -2383,6 +2376,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp) | |||
| 2383 | atomic_inc(&cm_disconnects); | 2376 | atomic_inc(&cm_disconnects); |
| 2384 | cm_event.event = IW_CM_EVENT_DISCONNECT; | 2377 | cm_event.event = IW_CM_EVENT_DISCONNECT; |
| 2385 | if (last_ae == NES_AEQE_AEID_LLP_CONNECTION_RESET) { | 2378 | if (last_ae == NES_AEQE_AEID_LLP_CONNECTION_RESET) { |
| 2379 | issued_disconnect_reset = 1; | ||
| 2386 | cm_event.status = IW_CM_EVENT_STATUS_RESET; | 2380 | cm_event.status = IW_CM_EVENT_STATUS_RESET; |
| 2387 | nes_debug(NES_DBG_CM, "Generating a CM " | 2381 | nes_debug(NES_DBG_CM, "Generating a CM " |
| 2388 | "Disconnect Event (status reset) for " | 2382 | "Disconnect Event (status reset) for " |
| @@ -2508,7 +2502,6 @@ static int nes_disconnect(struct nes_qp *nesqp, int abrupt) | |||
| 2508 | nes_debug(NES_DBG_CM, "Call close API\n"); | 2502 | nes_debug(NES_DBG_CM, "Call close API\n"); |
| 2509 | 2503 | ||
| 2510 | g_cm_core->api->close(g_cm_core, nesqp->cm_node); | 2504 | g_cm_core->api->close(g_cm_core, nesqp->cm_node); |
| 2511 | nesqp->cm_node = NULL; | ||
| 2512 | } | 2505 | } |
| 2513 | 2506 | ||
| 2514 | return ret; | 2507 | return ret; |
| @@ -2837,6 +2830,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) | |||
| 2837 | cm_node->apbvt_set = 1; | 2830 | cm_node->apbvt_set = 1; |
| 2838 | nesqp->cm_node = cm_node; | 2831 | nesqp->cm_node = cm_node; |
| 2839 | cm_node->nesqp = nesqp; | 2832 | cm_node->nesqp = nesqp; |
| 2833 | nes_add_ref(&nesqp->ibqp); | ||
| 2840 | 2834 | ||
| 2841 | return 0; | 2835 | return 0; |
| 2842 | } | 2836 | } |
| @@ -3167,7 +3161,6 @@ static void cm_event_connect_error(struct nes_cm_event *event) | |||
| 3167 | if (ret) | 3161 | if (ret) |
| 3168 | printk(KERN_ERR "%s[%u] OFA CM event_handler returned, " | 3162 | printk(KERN_ERR "%s[%u] OFA CM event_handler returned, " |
| 3169 | "ret=%d\n", __func__, __LINE__, ret); | 3163 | "ret=%d\n", __func__, __LINE__, ret); |
| 3170 | nes_rem_ref(&nesqp->ibqp); | ||
| 3171 | cm_id->rem_ref(cm_id); | 3164 | cm_id->rem_ref(cm_id); |
| 3172 | 3165 | ||
| 3173 | rem_ref_cm_node(event->cm_node->cm_core, event->cm_node); | 3166 | rem_ref_cm_node(event->cm_node->cm_core, event->cm_node); |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index b0ffc9abe8c0..05eb41b8ab63 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h | |||
| @@ -293,6 +293,7 @@ struct ipoib_dev_priv { | |||
| 293 | 293 | ||
| 294 | struct delayed_work pkey_poll_task; | 294 | struct delayed_work pkey_poll_task; |
| 295 | struct delayed_work mcast_task; | 295 | struct delayed_work mcast_task; |
| 296 | struct work_struct carrier_on_task; | ||
| 296 | struct work_struct flush_light; | 297 | struct work_struct flush_light; |
| 297 | struct work_struct flush_normal; | 298 | struct work_struct flush_normal; |
| 298 | struct work_struct flush_heavy; | 299 | struct work_struct flush_heavy; |
| @@ -464,6 +465,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port); | |||
| 464 | void ipoib_dev_cleanup(struct net_device *dev); | 465 | void ipoib_dev_cleanup(struct net_device *dev); |
| 465 | 466 | ||
| 466 | void ipoib_mcast_join_task(struct work_struct *work); | 467 | void ipoib_mcast_join_task(struct work_struct *work); |
| 468 | void ipoib_mcast_carrier_on_task(struct work_struct *work); | ||
| 467 | void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb); | 469 | void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb); |
| 468 | 470 | ||
| 469 | void ipoib_mcast_restart_task(struct work_struct *work); | 471 | void ipoib_mcast_restart_task(struct work_struct *work); |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 7e9e218738fa..1b1df5cc4113 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
| @@ -1075,6 +1075,7 @@ static void ipoib_setup(struct net_device *dev) | |||
| 1075 | 1075 | ||
| 1076 | INIT_DELAYED_WORK(&priv->pkey_poll_task, ipoib_pkey_poll); | 1076 | INIT_DELAYED_WORK(&priv->pkey_poll_task, ipoib_pkey_poll); |
| 1077 | INIT_DELAYED_WORK(&priv->mcast_task, ipoib_mcast_join_task); | 1077 | INIT_DELAYED_WORK(&priv->mcast_task, ipoib_mcast_join_task); |
| 1078 | INIT_WORK(&priv->carrier_on_task, ipoib_mcast_carrier_on_task); | ||
| 1078 | INIT_WORK(&priv->flush_light, ipoib_ib_dev_flush_light); | 1079 | INIT_WORK(&priv->flush_light, ipoib_ib_dev_flush_light); |
| 1079 | INIT_WORK(&priv->flush_normal, ipoib_ib_dev_flush_normal); | 1080 | INIT_WORK(&priv->flush_normal, ipoib_ib_dev_flush_normal); |
| 1080 | INIT_WORK(&priv->flush_heavy, ipoib_ib_dev_flush_heavy); | 1081 | INIT_WORK(&priv->flush_heavy, ipoib_ib_dev_flush_heavy); |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index ac33c8f3ea85..aae28620a6e5 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
| @@ -366,6 +366,21 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast) | |||
| 366 | return ret; | 366 | return ret; |
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | void ipoib_mcast_carrier_on_task(struct work_struct *work) | ||
| 370 | { | ||
| 371 | struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, | ||
| 372 | carrier_on_task); | ||
| 373 | |||
| 374 | /* | ||
| 375 | * Take rtnl_lock to avoid racing with ipoib_stop() and | ||
| 376 | * turning the carrier back on while a device is being | ||
| 377 | * removed. | ||
| 378 | */ | ||
| 379 | rtnl_lock(); | ||
| 380 | netif_carrier_on(priv->dev); | ||
| 381 | rtnl_unlock(); | ||
| 382 | } | ||
| 383 | |||
| 369 | static int ipoib_mcast_join_complete(int status, | 384 | static int ipoib_mcast_join_complete(int status, |
| 370 | struct ib_sa_multicast *multicast) | 385 | struct ib_sa_multicast *multicast) |
| 371 | { | 386 | { |
| @@ -392,16 +407,12 @@ static int ipoib_mcast_join_complete(int status, | |||
| 392 | &priv->mcast_task, 0); | 407 | &priv->mcast_task, 0); |
| 393 | mutex_unlock(&mcast_mutex); | 408 | mutex_unlock(&mcast_mutex); |
| 394 | 409 | ||
| 395 | if (mcast == priv->broadcast) { | 410 | /* |
| 396 | /* | 411 | * Defer carrier on work to ipoib_workqueue to avoid a |
| 397 | * Take RTNL lock here to avoid racing with | 412 | * deadlock on rtnl_lock here. |
| 398 | * ipoib_stop() and turning the carrier back | 413 | */ |
| 399 | * on while a device is being removed. | 414 | if (mcast == priv->broadcast) |
| 400 | */ | 415 | queue_work(ipoib_workqueue, &priv->carrier_on_task); |
| 401 | rtnl_lock(); | ||
| 402 | netif_carrier_on(dev); | ||
| 403 | rtnl_unlock(); | ||
| 404 | } | ||
| 405 | 416 | ||
| 406 | return 0; | 417 | return 0; |
| 407 | } | 418 | } |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4790c83d78d0..deeac4b44173 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -5761,7 +5761,11 @@ void md_do_sync(mddev_t *mddev) | |||
| 5761 | * time 'round when curr_resync == 2 | 5761 | * time 'round when curr_resync == 2 |
| 5762 | */ | 5762 | */ |
| 5763 | continue; | 5763 | continue; |
| 5764 | prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE); | 5764 | /* We need to wait 'interruptible' so as not to |
| 5765 | * contribute to the load average, and not to | ||
| 5766 | * be caught by 'softlockup' | ||
| 5767 | */ | ||
| 5768 | prepare_to_wait(&resync_wait, &wq, TASK_INTERRUPTIBLE); | ||
| 5765 | if (!kthread_should_stop() && | 5769 | if (!kthread_should_stop() && |
| 5766 | mddev2->curr_resync >= mddev->curr_resync) { | 5770 | mddev2->curr_resync >= mddev->curr_resync) { |
| 5767 | printk(KERN_INFO "md: delaying %s of %s" | 5771 | printk(KERN_INFO "md: delaying %s of %s" |
| @@ -5769,6 +5773,8 @@ void md_do_sync(mddev_t *mddev) | |||
| 5769 | " share one or more physical units)\n", | 5773 | " share one or more physical units)\n", |
| 5770 | desc, mdname(mddev), mdname(mddev2)); | 5774 | desc, mdname(mddev), mdname(mddev2)); |
| 5771 | mddev_put(mddev2); | 5775 | mddev_put(mddev2); |
| 5776 | if (signal_pending(current)) | ||
| 5777 | flush_signals(current); | ||
| 5772 | schedule(); | 5778 | schedule(); |
| 5773 | finish_wait(&resync_wait, &wq); | 5779 | finish_wait(&resync_wait, &wq); |
| 5774 | goto try_again; | 5780 | goto try_again; |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index ecbfa1b39b70..3e9e0dcd217e 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -968,7 +968,7 @@ config VIDEO_PXA27x | |||
| 968 | 968 | ||
| 969 | config VIDEO_SH_MOBILE_CEU | 969 | config VIDEO_SH_MOBILE_CEU |
| 970 | tristate "SuperH Mobile CEU Interface driver" | 970 | tristate "SuperH Mobile CEU Interface driver" |
| 971 | depends on VIDEO_DEV | 971 | depends on VIDEO_DEV && HAS_DMA |
| 972 | select SOC_CAMERA | 972 | select SOC_CAMERA |
| 973 | select VIDEOBUF_DMA_CONTIG | 973 | select VIDEOBUF_DMA_CONTIG |
| 974 | ---help--- | 974 | ---help--- |
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index a38005008a20..cea46906408e 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c | |||
| @@ -185,7 +185,7 @@ static void memstick_free(struct device *dev) | |||
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | static struct class memstick_host_class = { | 187 | static struct class memstick_host_class = { |
| 188 | .name = "memstick_host", | 188 | .name = "memstick_host", |
| 189 | .dev_release = memstick_free | 189 | .dev_release = memstick_free |
| 190 | }; | 190 | }; |
| 191 | 191 | ||
| @@ -264,7 +264,7 @@ EXPORT_SYMBOL(memstick_new_req); | |||
| 264 | * @sg - TPC argument | 264 | * @sg - TPC argument |
| 265 | */ | 265 | */ |
| 266 | void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc, | 266 | void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc, |
| 267 | struct scatterlist *sg) | 267 | const struct scatterlist *sg) |
| 268 | { | 268 | { |
| 269 | mrq->tpc = tpc; | 269 | mrq->tpc = tpc; |
| 270 | if (tpc & 8) | 270 | if (tpc & 8) |
| @@ -294,7 +294,7 @@ EXPORT_SYMBOL(memstick_init_req_sg); | |||
| 294 | * user supplied buffer. | 294 | * user supplied buffer. |
| 295 | */ | 295 | */ |
| 296 | void memstick_init_req(struct memstick_request *mrq, unsigned char tpc, | 296 | void memstick_init_req(struct memstick_request *mrq, unsigned char tpc, |
| 297 | void *buf, size_t length) | 297 | const void *buf, size_t length) |
| 298 | { | 298 | { |
| 299 | mrq->tpc = tpc; | 299 | mrq->tpc = tpc; |
| 300 | if (tpc & 8) | 300 | if (tpc & 8) |
| @@ -439,7 +439,7 @@ static void memstick_check(struct work_struct *work) | |||
| 439 | if (!host->card) { | 439 | if (!host->card) { |
| 440 | if (memstick_power_on(host)) | 440 | if (memstick_power_on(host)) |
| 441 | goto out_power_off; | 441 | goto out_power_off; |
| 442 | } else | 442 | } else if (host->card->stop) |
| 443 | host->card->stop(host->card); | 443 | host->card->stop(host->card); |
| 444 | 444 | ||
| 445 | card = memstick_alloc_card(host); | 445 | card = memstick_alloc_card(host); |
| @@ -458,7 +458,7 @@ static void memstick_check(struct work_struct *work) | |||
| 458 | || !(host->card->check(host->card))) { | 458 | || !(host->card->check(host->card))) { |
| 459 | device_unregister(&host->card->dev); | 459 | device_unregister(&host->card->dev); |
| 460 | host->card = NULL; | 460 | host->card = NULL; |
| 461 | } else | 461 | } else if (host->card->start) |
| 462 | host->card->start(host->card); | 462 | host->card->start(host->card); |
| 463 | } | 463 | } |
| 464 | 464 | ||
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 44b1817f2f2f..d2d2318dafa4 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c | |||
| @@ -30,6 +30,8 @@ module_param(major, int, 0644); | |||
| 30 | #define MSPRO_BLOCK_SIGNATURE 0xa5c3 | 30 | #define MSPRO_BLOCK_SIGNATURE 0xa5c3 |
| 31 | #define MSPRO_BLOCK_MAX_ATTRIBUTES 41 | 31 | #define MSPRO_BLOCK_MAX_ATTRIBUTES 41 |
| 32 | 32 | ||
| 33 | #define MSPRO_BLOCK_PART_SHIFT 3 | ||
| 34 | |||
| 33 | enum { | 35 | enum { |
| 34 | MSPRO_BLOCK_ID_SYSINFO = 0x10, | 36 | MSPRO_BLOCK_ID_SYSINFO = 0x10, |
| 35 | MSPRO_BLOCK_ID_MODELNAME = 0x15, | 37 | MSPRO_BLOCK_ID_MODELNAME = 0x15, |
| @@ -195,7 +197,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp) | |||
| 195 | static int mspro_block_disk_release(struct gendisk *disk) | 197 | static int mspro_block_disk_release(struct gendisk *disk) |
| 196 | { | 198 | { |
| 197 | struct mspro_block_data *msb = disk->private_data; | 199 | struct mspro_block_data *msb = disk->private_data; |
| 198 | int disk_id = disk->first_minor >> MEMSTICK_PART_SHIFT; | 200 | int disk_id = disk->first_minor >> MSPRO_BLOCK_PART_SHIFT; |
| 199 | 201 | ||
| 200 | mutex_lock(&mspro_block_disk_lock); | 202 | mutex_lock(&mspro_block_disk_lock); |
| 201 | 203 | ||
| @@ -877,6 +879,7 @@ static int mspro_block_switch_interface(struct memstick_dev *card) | |||
| 877 | struct mspro_block_data *msb = memstick_get_drvdata(card); | 879 | struct mspro_block_data *msb = memstick_get_drvdata(card); |
| 878 | int rc = 0; | 880 | int rc = 0; |
| 879 | 881 | ||
| 882 | try_again: | ||
| 880 | if (msb->caps & MEMSTICK_CAP_PAR4) | 883 | if (msb->caps & MEMSTICK_CAP_PAR4) |
| 881 | rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4); | 884 | rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4); |
| 882 | else | 885 | else |
| @@ -930,6 +933,18 @@ static int mspro_block_switch_interface(struct memstick_dev *card) | |||
| 930 | rc = memstick_set_rw_addr(card); | 933 | rc = memstick_set_rw_addr(card); |
| 931 | if (!rc) | 934 | if (!rc) |
| 932 | rc = mspro_block_set_interface(card, msb->system); | 935 | rc = mspro_block_set_interface(card, msb->system); |
| 936 | |||
| 937 | if (!rc) { | ||
| 938 | msleep(150); | ||
| 939 | rc = mspro_block_wait_for_ced(card); | ||
| 940 | if (rc) | ||
| 941 | return rc; | ||
| 942 | |||
| 943 | if (msb->caps & MEMSTICK_CAP_PAR8) { | ||
| 944 | msb->caps &= ~MEMSTICK_CAP_PAR8; | ||
| 945 | goto try_again; | ||
| 946 | } | ||
| 947 | } | ||
| 933 | } | 948 | } |
| 934 | return rc; | 949 | return rc; |
| 935 | } | 950 | } |
| @@ -1117,14 +1132,16 @@ static int mspro_block_init_card(struct memstick_dev *card) | |||
| 1117 | return -EIO; | 1132 | return -EIO; |
| 1118 | 1133 | ||
| 1119 | msb->caps = host->caps; | 1134 | msb->caps = host->caps; |
| 1120 | rc = mspro_block_switch_interface(card); | 1135 | |
| 1136 | msleep(150); | ||
| 1137 | rc = mspro_block_wait_for_ced(card); | ||
| 1121 | if (rc) | 1138 | if (rc) |
| 1122 | return rc; | 1139 | return rc; |
| 1123 | 1140 | ||
| 1124 | msleep(200); | 1141 | rc = mspro_block_switch_interface(card); |
| 1125 | rc = mspro_block_wait_for_ced(card); | ||
| 1126 | if (rc) | 1142 | if (rc) |
| 1127 | return rc; | 1143 | return rc; |
| 1144 | |||
| 1128 | dev_dbg(&card->dev, "card activated\n"); | 1145 | dev_dbg(&card->dev, "card activated\n"); |
| 1129 | if (msb->system != MEMSTICK_SYS_SERIAL) | 1146 | if (msb->system != MEMSTICK_SYS_SERIAL) |
| 1130 | msb->caps |= MEMSTICK_CAP_AUTO_GET_INT; | 1147 | msb->caps |= MEMSTICK_CAP_AUTO_GET_INT; |
| @@ -1192,12 +1209,12 @@ static int mspro_block_init_disk(struct memstick_dev *card) | |||
| 1192 | if (rc) | 1209 | if (rc) |
| 1193 | return rc; | 1210 | return rc; |
| 1194 | 1211 | ||
| 1195 | if ((disk_id << MEMSTICK_PART_SHIFT) > 255) { | 1212 | if ((disk_id << MSPRO_BLOCK_PART_SHIFT) > 255) { |
| 1196 | rc = -ENOSPC; | 1213 | rc = -ENOSPC; |
| 1197 | goto out_release_id; | 1214 | goto out_release_id; |
| 1198 | } | 1215 | } |
| 1199 | 1216 | ||
| 1200 | msb->disk = alloc_disk(1 << MEMSTICK_PART_SHIFT); | 1217 | msb->disk = alloc_disk(1 << MSPRO_BLOCK_PART_SHIFT); |
| 1201 | if (!msb->disk) { | 1218 | if (!msb->disk) { |
| 1202 | rc = -ENOMEM; | 1219 | rc = -ENOMEM; |
| 1203 | goto out_release_id; | 1220 | goto out_release_id; |
| @@ -1220,7 +1237,7 @@ static int mspro_block_init_disk(struct memstick_dev *card) | |||
| 1220 | MSPRO_BLOCK_MAX_PAGES * msb->page_size); | 1237 | MSPRO_BLOCK_MAX_PAGES * msb->page_size); |
| 1221 | 1238 | ||
| 1222 | msb->disk->major = major; | 1239 | msb->disk->major = major; |
| 1223 | msb->disk->first_minor = disk_id << MEMSTICK_PART_SHIFT; | 1240 | msb->disk->first_minor = disk_id << MSPRO_BLOCK_PART_SHIFT; |
| 1224 | msb->disk->fops = &ms_block_bdops; | 1241 | msb->disk->fops = &ms_block_bdops; |
| 1225 | msb->usage_count = 1; | 1242 | msb->usage_count = 1; |
| 1226 | msb->disk->private_data = msb; | 1243 | msb->disk->private_data = msb; |
| @@ -1416,7 +1433,7 @@ out_unlock: | |||
| 1416 | 1433 | ||
| 1417 | static struct memstick_device_id mspro_block_id_tbl[] = { | 1434 | static struct memstick_device_id mspro_block_id_tbl[] = { |
| 1418 | {MEMSTICK_MATCH_ALL, MEMSTICK_TYPE_PRO, MEMSTICK_CATEGORY_STORAGE_DUO, | 1435 | {MEMSTICK_MATCH_ALL, MEMSTICK_TYPE_PRO, MEMSTICK_CATEGORY_STORAGE_DUO, |
| 1419 | MEMSTICK_CLASS_GENERIC_DUO}, | 1436 | MEMSTICK_CLASS_DUO}, |
| 1420 | {} | 1437 | {} |
| 1421 | }; | 1438 | }; |
| 1422 | 1439 | ||
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 3485c63d20b0..2fb95a5b72eb 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
| @@ -81,6 +81,8 @@ struct jmb38x_ms { | |||
| 81 | #define TPC_CODE_SZ_MASK 0x00000700 | 81 | #define TPC_CODE_SZ_MASK 0x00000700 |
| 82 | #define TPC_DATA_SZ_MASK 0x00000007 | 82 | #define TPC_DATA_SZ_MASK 0x00000007 |
| 83 | 83 | ||
| 84 | #define HOST_CONTROL_TDELAY_EN 0x00040000 | ||
| 85 | #define HOST_CONTROL_HW_OC_P 0x00010000 | ||
| 84 | #define HOST_CONTROL_RESET_REQ 0x00008000 | 86 | #define HOST_CONTROL_RESET_REQ 0x00008000 |
| 85 | #define HOST_CONTROL_REI 0x00004000 | 87 | #define HOST_CONTROL_REI 0x00004000 |
| 86 | #define HOST_CONTROL_LED 0x00000400 | 88 | #define HOST_CONTROL_LED 0x00000400 |
| @@ -88,6 +90,7 @@ struct jmb38x_ms { | |||
| 88 | #define HOST_CONTROL_RESET 0x00000100 | 90 | #define HOST_CONTROL_RESET 0x00000100 |
| 89 | #define HOST_CONTROL_POWER_EN 0x00000080 | 91 | #define HOST_CONTROL_POWER_EN 0x00000080 |
| 90 | #define HOST_CONTROL_CLOCK_EN 0x00000040 | 92 | #define HOST_CONTROL_CLOCK_EN 0x00000040 |
| 93 | #define HOST_CONTROL_REO 0x00000008 | ||
| 91 | #define HOST_CONTROL_IF_SHIFT 4 | 94 | #define HOST_CONTROL_IF_SHIFT 4 |
| 92 | 95 | ||
| 93 | #define HOST_CONTROL_IF_SERIAL 0x0 | 96 | #define HOST_CONTROL_IF_SERIAL 0x0 |
| @@ -133,11 +136,15 @@ struct jmb38x_ms { | |||
| 133 | #define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000 | 136 | #define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000 |
| 134 | 137 | ||
| 135 | #define CLOCK_CONTROL_40MHZ 0x00000001 | 138 | #define CLOCK_CONTROL_40MHZ 0x00000001 |
| 136 | #define CLOCK_CONTROL_50MHZ 0x00000002 | 139 | #define CLOCK_CONTROL_50MHZ 0x0000000a |
| 137 | #define CLOCK_CONTROL_60MHZ 0x00000008 | 140 | #define CLOCK_CONTROL_60MHZ 0x00000008 |
| 138 | #define CLOCK_CONTROL_62_5MHZ 0x0000000c | 141 | #define CLOCK_CONTROL_62_5MHZ 0x0000000c |
| 139 | #define CLOCK_CONTROL_OFF 0x00000000 | 142 | #define CLOCK_CONTROL_OFF 0x00000000 |
| 140 | 143 | ||
| 144 | #define PCI_CTL_CLOCK_DLY_ADDR 0x000000b0 | ||
| 145 | #define PCI_CTL_CLOCK_DLY_MASK_A 0x00000f00 | ||
| 146 | #define PCI_CTL_CLOCK_DLY_MASK_B 0x0000f000 | ||
| 147 | |||
| 141 | enum { | 148 | enum { |
| 142 | CMD_READY = 0x01, | 149 | CMD_READY = 0x01, |
| 143 | FIFO_READY = 0x02, | 150 | FIFO_READY = 0x02, |
| @@ -367,8 +374,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh) | |||
| 367 | return host->req->error; | 374 | return host->req->error; |
| 368 | } | 375 | } |
| 369 | 376 | ||
| 370 | dev_dbg(&msh->dev, "control %08x\n", | 377 | dev_dbg(&msh->dev, "control %08x\n", readl(host->addr + HOST_CONTROL)); |
| 371 | readl(host->addr + HOST_CONTROL)); | ||
| 372 | dev_dbg(&msh->dev, "status %08x\n", readl(host->addr + INT_STATUS)); | 378 | dev_dbg(&msh->dev, "status %08x\n", readl(host->addr + INT_STATUS)); |
| 373 | dev_dbg(&msh->dev, "hstatus %08x\n", readl(host->addr + STATUS)); | 379 | dev_dbg(&msh->dev, "hstatus %08x\n", readl(host->addr + STATUS)); |
| 374 | 380 | ||
| @@ -637,7 +643,7 @@ static int jmb38x_ms_reset(struct jmb38x_ms_host *host) | |||
| 637 | ndelay(20); | 643 | ndelay(20); |
| 638 | } | 644 | } |
| 639 | dev_dbg(&host->chip->pdev->dev, "reset_req timeout\n"); | 645 | dev_dbg(&host->chip->pdev->dev, "reset_req timeout\n"); |
| 640 | return -EIO; | 646 | /* return -EIO; */ |
| 641 | 647 | ||
| 642 | reset_next: | 648 | reset_next: |
| 643 | writel(HOST_CONTROL_RESET | HOST_CONTROL_CLOCK_EN | 649 | writel(HOST_CONTROL_RESET | HOST_CONTROL_CLOCK_EN |
| @@ -680,7 +686,9 @@ static int jmb38x_ms_set_param(struct memstick_host *msh, | |||
| 680 | 686 | ||
| 681 | host_ctl = 7; | 687 | host_ctl = 7; |
| 682 | host_ctl |= HOST_CONTROL_POWER_EN | 688 | host_ctl |= HOST_CONTROL_POWER_EN |
| 683 | | HOST_CONTROL_CLOCK_EN; | 689 | | HOST_CONTROL_CLOCK_EN |
| 690 | | HOST_CONTROL_HW_OC_P | ||
| 691 | | HOST_CONTROL_TDELAY_EN; | ||
| 684 | writel(host_ctl, host->addr + HOST_CONTROL); | 692 | writel(host_ctl, host->addr + HOST_CONTROL); |
| 685 | 693 | ||
| 686 | writel(host->id ? PAD_PU_PD_ON_MS_SOCK1 | 694 | writel(host->id ? PAD_PU_PD_ON_MS_SOCK1 |
| @@ -704,33 +712,40 @@ static int jmb38x_ms_set_param(struct memstick_host *msh, | |||
| 704 | break; | 712 | break; |
| 705 | case MEMSTICK_INTERFACE: | 713 | case MEMSTICK_INTERFACE: |
| 706 | host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT); | 714 | host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT); |
| 715 | pci_read_config_dword(host->chip->pdev, | ||
| 716 | PCI_CTL_CLOCK_DLY_ADDR, | ||
| 717 | &clock_delay); | ||
| 718 | clock_delay &= host->id ? ~PCI_CTL_CLOCK_DLY_MASK_B | ||
| 719 | : ~PCI_CTL_CLOCK_DLY_MASK_A; | ||
| 707 | 720 | ||
| 708 | if (value == MEMSTICK_SERIAL) { | 721 | if (value == MEMSTICK_SERIAL) { |
| 709 | host_ctl &= ~HOST_CONTROL_FAST_CLK; | 722 | host_ctl &= ~HOST_CONTROL_FAST_CLK; |
| 723 | host_ctl &= ~HOST_CONTROL_REO; | ||
| 710 | host_ctl |= HOST_CONTROL_IF_SERIAL | 724 | host_ctl |= HOST_CONTROL_IF_SERIAL |
| 711 | << HOST_CONTROL_IF_SHIFT; | 725 | << HOST_CONTROL_IF_SHIFT; |
| 712 | host_ctl |= HOST_CONTROL_REI; | 726 | host_ctl |= HOST_CONTROL_REI; |
| 713 | clock_ctl = CLOCK_CONTROL_40MHZ; | 727 | clock_ctl = CLOCK_CONTROL_40MHZ; |
| 714 | clock_delay = 0; | ||
| 715 | } else if (value == MEMSTICK_PAR4) { | 728 | } else if (value == MEMSTICK_PAR4) { |
| 716 | host_ctl |= HOST_CONTROL_FAST_CLK; | 729 | host_ctl |= HOST_CONTROL_FAST_CLK | HOST_CONTROL_REO; |
| 717 | host_ctl |= HOST_CONTROL_IF_PAR4 | 730 | host_ctl |= HOST_CONTROL_IF_PAR4 |
| 718 | << HOST_CONTROL_IF_SHIFT; | 731 | << HOST_CONTROL_IF_SHIFT; |
| 719 | host_ctl &= ~HOST_CONTROL_REI; | 732 | host_ctl &= ~HOST_CONTROL_REI; |
| 720 | clock_ctl = CLOCK_CONTROL_40MHZ; | 733 | clock_ctl = CLOCK_CONTROL_40MHZ; |
| 721 | clock_delay = 4; | 734 | clock_delay |= host->id ? (4 << 12) : (4 << 8); |
| 722 | } else if (value == MEMSTICK_PAR8) { | 735 | } else if (value == MEMSTICK_PAR8) { |
| 723 | host_ctl |= HOST_CONTROL_FAST_CLK; | 736 | host_ctl |= HOST_CONTROL_FAST_CLK; |
| 724 | host_ctl |= HOST_CONTROL_IF_PAR8 | 737 | host_ctl |= HOST_CONTROL_IF_PAR8 |
| 725 | << HOST_CONTROL_IF_SHIFT; | 738 | << HOST_CONTROL_IF_SHIFT; |
| 726 | host_ctl &= ~HOST_CONTROL_REI; | 739 | host_ctl &= ~(HOST_CONTROL_REI | HOST_CONTROL_REO); |
| 727 | clock_ctl = CLOCK_CONTROL_60MHZ; | 740 | clock_ctl = CLOCK_CONTROL_50MHZ; |
| 728 | clock_delay = 0; | ||
| 729 | } else | 741 | } else |
| 730 | return -EINVAL; | 742 | return -EINVAL; |
| 743 | |||
| 731 | writel(host_ctl, host->addr + HOST_CONTROL); | 744 | writel(host_ctl, host->addr + HOST_CONTROL); |
| 732 | writel(clock_ctl, host->addr + CLOCK_CONTROL); | 745 | writel(clock_ctl, host->addr + CLOCK_CONTROL); |
| 733 | writel(clock_delay, host->addr + CLOCK_DELAY); | 746 | pci_write_config_dword(host->chip->pdev, |
| 747 | PCI_CTL_CLOCK_DLY_ADDR, | ||
| 748 | clock_delay); | ||
| 734 | break; | 749 | break; |
| 735 | }; | 750 | }; |
| 736 | return 0; | 751 | return 0; |
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 23c91f5f6b61..d61cee796efd 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c | |||
| @@ -445,6 +445,9 @@ static void __exit gru_exit(void) | |||
| 445 | int order = get_order(sizeof(struct gru_state) * | 445 | int order = get_order(sizeof(struct gru_state) * |
| 446 | GRU_CHIPLETS_PER_BLADE); | 446 | GRU_CHIPLETS_PER_BLADE); |
| 447 | 447 | ||
| 448 | if (!IS_UV()) | ||
| 449 | return; | ||
| 450 | |||
| 448 | for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++) | 451 | for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++) |
| 449 | free_irq(IRQ_GRU + i, NULL); | 452 | free_irq(IRQ_GRU + i, NULL); |
| 450 | 453 | ||
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 6986f3926244..ebc8b9d77613 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
| @@ -615,14 +615,19 @@ static struct mmc_driver mmc_driver = { | |||
| 615 | 615 | ||
| 616 | static int __init mmc_blk_init(void) | 616 | static int __init mmc_blk_init(void) |
| 617 | { | 617 | { |
| 618 | int res = -ENOMEM; | 618 | int res; |
| 619 | 619 | ||
| 620 | res = register_blkdev(MMC_BLOCK_MAJOR, "mmc"); | 620 | res = register_blkdev(MMC_BLOCK_MAJOR, "mmc"); |
| 621 | if (res) | 621 | if (res) |
| 622 | goto out; | 622 | goto out; |
| 623 | 623 | ||
| 624 | return mmc_register_driver(&mmc_driver); | 624 | res = mmc_register_driver(&mmc_driver); |
| 625 | if (res) | ||
| 626 | goto out2; | ||
| 625 | 627 | ||
| 628 | return 0; | ||
| 629 | out2: | ||
| 630 | unregister_blkdev(MMC_BLOCK_MAJOR, "mmc"); | ||
| 626 | out: | 631 | out: |
| 627 | return res; | 632 | return res; |
| 628 | } | 633 | } |
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c index f26b01d811ae..b92b172074ee 100644 --- a/drivers/mmc/card/mmc_test.c +++ b/drivers/mmc/card/mmc_test.c | |||
| @@ -1040,7 +1040,7 @@ static const struct mmc_test_case mmc_test_cases[] = { | |||
| 1040 | 1040 | ||
| 1041 | }; | 1041 | }; |
| 1042 | 1042 | ||
| 1043 | static struct mutex mmc_test_lock; | 1043 | static DEFINE_MUTEX(mmc_test_lock); |
| 1044 | 1044 | ||
| 1045 | static void mmc_test_run(struct mmc_test_card *test, int testcase) | 1045 | static void mmc_test_run(struct mmc_test_card *test, int testcase) |
| 1046 | { | 1046 | { |
| @@ -1171,8 +1171,6 @@ static int mmc_test_probe(struct mmc_card *card) | |||
| 1171 | if ((card->type != MMC_TYPE_MMC) && (card->type != MMC_TYPE_SD)) | 1171 | if ((card->type != MMC_TYPE_MMC) && (card->type != MMC_TYPE_SD)) |
| 1172 | return -ENODEV; | 1172 | return -ENODEV; |
| 1173 | 1173 | ||
| 1174 | mutex_init(&mmc_test_lock); | ||
| 1175 | |||
| 1176 | ret = device_create_file(&card->dev, &dev_attr_test); | 1174 | ret = device_create_file(&card->dev, &dev_attr_test); |
| 1177 | if (ret) | 1175 | if (ret) |
| 1178 | return ret; | 1176 | return ret; |
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 0bd06f5bd62f..917035e16da4 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
| @@ -195,7 +195,9 @@ static int atmci_regs_show(struct seq_file *s, void *v) | |||
| 195 | 195 | ||
| 196 | /* Grab a more or less consistent snapshot */ | 196 | /* Grab a more or less consistent snapshot */ |
| 197 | spin_lock_irq(&host->mmc->lock); | 197 | spin_lock_irq(&host->mmc->lock); |
| 198 | clk_enable(host->mck); | ||
| 198 | memcpy_fromio(buf, host->regs, MCI_REGS_SIZE); | 199 | memcpy_fromio(buf, host->regs, MCI_REGS_SIZE); |
| 200 | clk_disable(host->mck); | ||
| 199 | spin_unlock_irq(&host->mmc->lock); | 201 | spin_unlock_irq(&host->mmc->lock); |
| 200 | 202 | ||
| 201 | seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n", | 203 | seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n", |
| @@ -216,6 +218,8 @@ static int atmci_regs_show(struct seq_file *s, void *v) | |||
| 216 | atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]); | 218 | atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]); |
| 217 | atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]); | 219 | atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]); |
| 218 | 220 | ||
| 221 | kfree(buf); | ||
| 222 | |||
| 219 | return 0; | 223 | return 0; |
| 220 | } | 224 | } |
| 221 | 225 | ||
| @@ -237,7 +241,6 @@ static void atmci_init_debugfs(struct atmel_mci *host) | |||
| 237 | struct mmc_host *mmc; | 241 | struct mmc_host *mmc; |
| 238 | struct dentry *root; | 242 | struct dentry *root; |
| 239 | struct dentry *node; | 243 | struct dentry *node; |
| 240 | struct resource *res; | ||
| 241 | 244 | ||
| 242 | mmc = host->mmc; | 245 | mmc = host->mmc; |
| 243 | root = mmc->debugfs_root; | 246 | root = mmc->debugfs_root; |
| @@ -251,9 +254,6 @@ static void atmci_init_debugfs(struct atmel_mci *host) | |||
| 251 | if (!node) | 254 | if (!node) |
| 252 | goto err; | 255 | goto err; |
| 253 | 256 | ||
| 254 | res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0); | ||
| 255 | node->d_inode->i_size = res->end - res->start + 1; | ||
| 256 | |||
| 257 | node = debugfs_create_file("req", S_IRUSR, root, host, &atmci_req_fops); | 257 | node = debugfs_create_file("req", S_IRUSR, root, host, &atmci_req_fops); |
| 258 | if (!node) | 258 | if (!node) |
| 259 | goto err; | 259 | goto err; |
| @@ -1059,6 +1059,10 @@ static int __init atmci_probe(struct platform_device *pdev) | |||
| 1059 | host->present = !gpio_get_value(host->detect_pin); | 1059 | host->present = !gpio_get_value(host->detect_pin); |
| 1060 | } | 1060 | } |
| 1061 | } | 1061 | } |
| 1062 | |||
| 1063 | if (!gpio_is_valid(host->detect_pin)) | ||
| 1064 | mmc->caps |= MMC_CAP_NEEDS_POLL; | ||
| 1065 | |||
| 1062 | if (gpio_is_valid(host->wp_pin)) { | 1066 | if (gpio_is_valid(host->wp_pin)) { |
| 1063 | if (gpio_request(host->wp_pin, "mmc_wp")) { | 1067 | if (gpio_request(host->wp_pin, "mmc_wp")) { |
| 1064 | dev_dbg(&mmc->class_dev, "no WP pin available\n"); | 1068 | dev_dbg(&mmc->class_dev, "no WP pin available\n"); |
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 9e647a06054f..ba2b4240a86a 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h | |||
| @@ -159,10 +159,10 @@ static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host, | |||
| 159 | #define STATUS_TO_TEXT(a) \ | 159 | #define STATUS_TO_TEXT(a) \ |
| 160 | do { \ | 160 | do { \ |
| 161 | if (status & TMIO_STAT_##a) \ | 161 | if (status & TMIO_STAT_##a) \ |
| 162 | printf(#a); \ | 162 | printk(#a); \ |
| 163 | } while (0) | 163 | } while (0) |
| 164 | 164 | ||
| 165 | void debug_status(u32 status) | 165 | void pr_debug_status(u32 status) |
| 166 | { | 166 | { |
| 167 | printk(KERN_DEBUG "status: %08x = ", status); | 167 | printk(KERN_DEBUG "status: %08x = ", status); |
| 168 | STATUS_TO_TEXT(CARD_REMOVE); | 168 | STATUS_TO_TEXT(CARD_REMOVE); |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index c3c579f98ed0..dfacd31f7ed0 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
| @@ -6597,7 +6597,7 @@ struct flash_spec { | |||
| 6597 | 6597 | ||
| 6598 | struct bnx2_irq { | 6598 | struct bnx2_irq { |
| 6599 | irq_handler_t handler; | 6599 | irq_handler_t handler; |
| 6600 | u16 vector; | 6600 | unsigned int vector; |
| 6601 | u8 requested; | 6601 | u8 requested; |
| 6602 | char name[16]; | 6602 | char name[16]; |
| 6603 | }; | 6603 | }; |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 453115acaad2..5cf78d612c45 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
| 2738 | nic->flags |= wol_magic; | 2738 | nic->flags |= wol_magic; |
| 2739 | 2739 | ||
| 2740 | /* ack any pending wake events, disable PME */ | 2740 | /* ack any pending wake events, disable PME */ |
| 2741 | err = pci_enable_wake(pdev, 0, 0); | 2741 | pci_pme_active(pdev, false); |
| 2742 | if (err) | ||
| 2743 | DPRINTK(PROBE, ERR, "Error clearing wake event\n"); | ||
| 2744 | 2742 | ||
| 2745 | strcpy(netdev->name, "eth%d"); | 2743 | strcpy(netdev->name, "eth%d"); |
| 2746 | if((err = register_netdev(netdev))) { | 2744 | if((err = register_netdev(netdev))) { |
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 9d6edf3e73f9..d04eef53571e 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
| @@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer); | |||
| 144 | static u8 e1000_calculate_mng_checksum(char *buffer, u32 length); | 144 | static u8 e1000_calculate_mng_checksum(char *buffer, u32 length); |
| 145 | static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex); | 145 | static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex); |
| 146 | static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw); | 146 | static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw); |
| 147 | static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data); | ||
| 148 | static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data); | ||
| 147 | 149 | ||
| 148 | /* IGP cable length table */ | 150 | /* IGP cable length table */ |
| 149 | static const | 151 | static const |
| @@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] = | |||
| 168 | 83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124, | 170 | 83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124, |
| 169 | 104, 109, 114, 118, 121, 124}; | 171 | 104, 109, 114, 118, 121, 124}; |
| 170 | 172 | ||
| 173 | static DEFINE_SPINLOCK(e1000_eeprom_lock); | ||
| 174 | |||
| 171 | /****************************************************************************** | 175 | /****************************************************************************** |
| 172 | * Set the phy type member in the hw struct. | 176 | * Set the phy type member in the hw struct. |
| 173 | * | 177 | * |
| @@ -4904,6 +4908,15 @@ static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw) | |||
| 4904 | *****************************************************************************/ | 4908 | *****************************************************************************/ |
| 4905 | s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | 4909 | s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) |
| 4906 | { | 4910 | { |
| 4911 | s32 ret; | ||
| 4912 | spin_lock(&e1000_eeprom_lock); | ||
| 4913 | ret = e1000_do_read_eeprom(hw, offset, words, data); | ||
| 4914 | spin_unlock(&e1000_eeprom_lock); | ||
| 4915 | return ret; | ||
| 4916 | } | ||
| 4917 | |||
| 4918 | static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | ||
| 4919 | { | ||
| 4907 | struct e1000_eeprom_info *eeprom = &hw->eeprom; | 4920 | struct e1000_eeprom_info *eeprom = &hw->eeprom; |
| 4908 | u32 i = 0; | 4921 | u32 i = 0; |
| 4909 | 4922 | ||
| @@ -5236,6 +5249,16 @@ s32 e1000_update_eeprom_checksum(struct e1000_hw *hw) | |||
| 5236 | *****************************************************************************/ | 5249 | *****************************************************************************/ |
| 5237 | s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | 5250 | s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) |
| 5238 | { | 5251 | { |
| 5252 | s32 ret; | ||
| 5253 | spin_lock(&e1000_eeprom_lock); | ||
| 5254 | ret = e1000_do_write_eeprom(hw, offset, words, data); | ||
| 5255 | spin_unlock(&e1000_eeprom_lock); | ||
| 5256 | return ret; | ||
| 5257 | } | ||
| 5258 | |||
| 5259 | |||
| 5260 | static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | ||
| 5261 | { | ||
| 5239 | struct e1000_eeprom_info *eeprom = &hw->eeprom; | 5262 | struct e1000_eeprom_info *eeprom = &hw->eeprom; |
| 5240 | s32 status = 0; | 5263 | s32 status = 0; |
| 5241 | 5264 | ||
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 0b6ecef9a849..eeb55ed2152d 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -5643,6 +5643,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 5643 | dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff; | 5643 | dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff; |
| 5644 | dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff; | 5644 | dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff; |
| 5645 | writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll); | 5645 | writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll); |
| 5646 | printk(KERN_DEBUG "nv_probe: set workaround bit for reversed mac addr\n"); | ||
| 5646 | } | 5647 | } |
| 5647 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | 5648 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
| 5648 | 5649 | ||
| @@ -5890,14 +5891,12 @@ static void nv_restore_phy(struct net_device *dev) | |||
| 5890 | } | 5891 | } |
| 5891 | } | 5892 | } |
| 5892 | 5893 | ||
| 5893 | static void __devexit nv_remove(struct pci_dev *pci_dev) | 5894 | static void nv_restore_mac_addr(struct pci_dev *pci_dev) |
| 5894 | { | 5895 | { |
| 5895 | struct net_device *dev = pci_get_drvdata(pci_dev); | 5896 | struct net_device *dev = pci_get_drvdata(pci_dev); |
| 5896 | struct fe_priv *np = netdev_priv(dev); | 5897 | struct fe_priv *np = netdev_priv(dev); |
| 5897 | u8 __iomem *base = get_hwbase(dev); | 5898 | u8 __iomem *base = get_hwbase(dev); |
| 5898 | 5899 | ||
| 5899 | unregister_netdev(dev); | ||
| 5900 | |||
| 5901 | /* special op: write back the misordered MAC address - otherwise | 5900 | /* special op: write back the misordered MAC address - otherwise |
| 5902 | * the next nv_probe would see a wrong address. | 5901 | * the next nv_probe would see a wrong address. |
| 5903 | */ | 5902 | */ |
| @@ -5905,6 +5904,15 @@ static void __devexit nv_remove(struct pci_dev *pci_dev) | |||
| 5905 | writel(np->orig_mac[1], base + NvRegMacAddrB); | 5904 | writel(np->orig_mac[1], base + NvRegMacAddrB); |
| 5906 | writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV, | 5905 | writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV, |
| 5907 | base + NvRegTransmitPoll); | 5906 | base + NvRegTransmitPoll); |
| 5907 | } | ||
| 5908 | |||
| 5909 | static void __devexit nv_remove(struct pci_dev *pci_dev) | ||
| 5910 | { | ||
| 5911 | struct net_device *dev = pci_get_drvdata(pci_dev); | ||
| 5912 | |||
| 5913 | unregister_netdev(dev); | ||
| 5914 | |||
| 5915 | nv_restore_mac_addr(pci_dev); | ||
| 5908 | 5916 | ||
| 5909 | /* restore any phy related changes */ | 5917 | /* restore any phy related changes */ |
| 5910 | nv_restore_phy(dev); | 5918 | nv_restore_phy(dev); |
| @@ -5975,6 +5983,8 @@ static void nv_shutdown(struct pci_dev *pdev) | |||
| 5975 | if (netif_running(dev)) | 5983 | if (netif_running(dev)) |
| 5976 | nv_close(dev); | 5984 | nv_close(dev); |
| 5977 | 5985 | ||
| 5986 | nv_restore_mac_addr(pdev); | ||
| 5987 | |||
| 5978 | pci_disable_device(pdev); | 5988 | pci_disable_device(pdev); |
| 5979 | if (system_state == SYSTEM_POWER_OFF) { | 5989 | if (system_state == SYSTEM_POWER_OFF) { |
| 5980 | if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled)) | 5990 | if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled)) |
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index 8239939554bc..fbbd3e660c27 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
| @@ -139,7 +139,7 @@ static int __init do_hpp_probe(struct net_device *dev) | |||
| 139 | #ifndef MODULE | 139 | #ifndef MODULE |
| 140 | struct net_device * __init hp_plus_probe(int unit) | 140 | struct net_device * __init hp_plus_probe(int unit) |
| 141 | { | 141 | { |
| 142 | struct net_device *dev = alloc_ei_netdev(); | 142 | struct net_device *dev = alloc_eip_netdev(); |
| 143 | int err; | 143 | int err; |
| 144 | 144 | ||
| 145 | if (!dev) | 145 | if (!dev) |
| @@ -284,7 +284,7 @@ hpp_open(struct net_device *dev) | |||
| 284 | int option_reg; | 284 | int option_reg; |
| 285 | int retval; | 285 | int retval; |
| 286 | 286 | ||
| 287 | if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { | 287 | if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) { |
| 288 | return retval; | 288 | return retval; |
| 289 | } | 289 | } |
| 290 | 290 | ||
| @@ -302,7 +302,7 @@ hpp_open(struct net_device *dev) | |||
| 302 | /* Select the operational page. */ | 302 | /* Select the operational page. */ |
| 303 | outw(Perf_Page, ioaddr + HP_PAGING); | 303 | outw(Perf_Page, ioaddr + HP_PAGING); |
| 304 | 304 | ||
| 305 | ei_open(dev); | 305 | eip_open(dev); |
| 306 | return 0; | 306 | return 0; |
| 307 | } | 307 | } |
| 308 | 308 | ||
| @@ -313,7 +313,7 @@ hpp_close(struct net_device *dev) | |||
| 313 | int option_reg = inw(ioaddr + HPP_OPTION); | 313 | int option_reg = inw(ioaddr + HPP_OPTION); |
| 314 | 314 | ||
| 315 | free_irq(dev->irq, dev); | 315 | free_irq(dev->irq, dev); |
| 316 | ei_close(dev); | 316 | eip_close(dev); |
| 317 | outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset, | 317 | outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset, |
| 318 | ioaddr + HPP_OPTION); | 318 | ioaddr + HPP_OPTION); |
| 319 | 319 | ||
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index 62071d9c4a55..d1dd5b48dbd1 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c | |||
| @@ -67,11 +67,10 @@ struct mlx4_mpt_entry { | |||
| 67 | #define MLX4_MPT_FLAG_PHYSICAL (1 << 9) | 67 | #define MLX4_MPT_FLAG_PHYSICAL (1 << 9) |
| 68 | #define MLX4_MPT_FLAG_REGION (1 << 8) | 68 | #define MLX4_MPT_FLAG_REGION (1 << 8) |
| 69 | 69 | ||
| 70 | #define MLX4_MPT_PD_FLAG_FAST_REG (1 << 26) | 70 | #define MLX4_MPT_PD_FLAG_FAST_REG (1 << 27) |
| 71 | #define MLX4_MPT_PD_FLAG_RAE (1 << 28) | ||
| 71 | #define MLX4_MPT_PD_FLAG_EN_INV (3 << 24) | 72 | #define MLX4_MPT_PD_FLAG_EN_INV (3 << 24) |
| 72 | 73 | ||
| 73 | #define MLX4_MTT_FLAG_PRESENT 1 | ||
| 74 | |||
| 75 | #define MLX4_MPT_STATUS_SW 0xF0 | 74 | #define MLX4_MPT_STATUS_SW 0xF0 |
| 76 | #define MLX4_MPT_STATUS_HW 0x00 | 75 | #define MLX4_MPT_STATUS_HW 0x00 |
| 77 | 76 | ||
| @@ -348,7 +347,10 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr) | |||
| 348 | if (mr->mtt.order >= 0 && mr->mtt.page_shift == 0) { | 347 | if (mr->mtt.order >= 0 && mr->mtt.page_shift == 0) { |
| 349 | /* fast register MR in free state */ | 348 | /* fast register MR in free state */ |
| 350 | mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_FREE); | 349 | mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_FREE); |
| 351 | mpt_entry->pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG); | 350 | mpt_entry->pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG | |
| 351 | MLX4_MPT_PD_FLAG_RAE); | ||
| 352 | mpt_entry->mtt_sz = cpu_to_be32((1 << mr->mtt.order) * | ||
| 353 | MLX4_MTT_ENTRY_PER_SEG); | ||
| 352 | } else { | 354 | } else { |
| 353 | mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_SW_OWNS); | 355 | mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_SW_OWNS); |
| 354 | } | 356 | } |
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index e4765b713aba..e3be81eba8a4 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
| @@ -5984,6 +5984,56 @@ static void niu_netif_start(struct niu *np) | |||
| 5984 | niu_enable_interrupts(np, 1); | 5984 | niu_enable_interrupts(np, 1); |
| 5985 | } | 5985 | } |
| 5986 | 5986 | ||
| 5987 | static void niu_reset_buffers(struct niu *np) | ||
| 5988 | { | ||
| 5989 | int i, j, k, err; | ||
| 5990 | |||
| 5991 | if (np->rx_rings) { | ||
| 5992 | for (i = 0; i < np->num_rx_rings; i++) { | ||
| 5993 | struct rx_ring_info *rp = &np->rx_rings[i]; | ||
| 5994 | |||
| 5995 | for (j = 0, k = 0; j < MAX_RBR_RING_SIZE; j++) { | ||
| 5996 | struct page *page; | ||
| 5997 | |||
| 5998 | page = rp->rxhash[j]; | ||
| 5999 | while (page) { | ||
| 6000 | struct page *next = | ||
| 6001 | (struct page *) page->mapping; | ||
| 6002 | u64 base = page->index; | ||
| 6003 | base = base >> RBR_DESCR_ADDR_SHIFT; | ||
| 6004 | rp->rbr[k++] = cpu_to_le32(base); | ||
| 6005 | page = next; | ||
| 6006 | } | ||
| 6007 | } | ||
| 6008 | for (; k < MAX_RBR_RING_SIZE; k++) { | ||
| 6009 | err = niu_rbr_add_page(np, rp, GFP_ATOMIC, k); | ||
| 6010 | if (unlikely(err)) | ||
| 6011 | break; | ||
| 6012 | } | ||
| 6013 | |||
| 6014 | rp->rbr_index = rp->rbr_table_size - 1; | ||
| 6015 | rp->rcr_index = 0; | ||
| 6016 | rp->rbr_pending = 0; | ||
| 6017 | rp->rbr_refill_pending = 0; | ||
| 6018 | } | ||
| 6019 | } | ||
| 6020 | if (np->tx_rings) { | ||
| 6021 | for (i = 0; i < np->num_tx_rings; i++) { | ||
| 6022 | struct tx_ring_info *rp = &np->tx_rings[i]; | ||
| 6023 | |||
| 6024 | for (j = 0; j < MAX_TX_RING_SIZE; j++) { | ||
| 6025 | if (rp->tx_buffs[j].skb) | ||
| 6026 | (void) release_tx_packet(np, rp, j); | ||
| 6027 | } | ||
| 6028 | |||
| 6029 | rp->pending = MAX_TX_RING_SIZE; | ||
| 6030 | rp->prod = 0; | ||
| 6031 | rp->cons = 0; | ||
| 6032 | rp->wrap_bit = 0; | ||
| 6033 | } | ||
| 6034 | } | ||
| 6035 | } | ||
| 6036 | |||
| 5987 | static void niu_reset_task(struct work_struct *work) | 6037 | static void niu_reset_task(struct work_struct *work) |
| 5988 | { | 6038 | { |
| 5989 | struct niu *np = container_of(work, struct niu, reset_task); | 6039 | struct niu *np = container_of(work, struct niu, reset_task); |
| @@ -6006,6 +6056,12 @@ static void niu_reset_task(struct work_struct *work) | |||
| 6006 | 6056 | ||
| 6007 | niu_stop_hw(np); | 6057 | niu_stop_hw(np); |
| 6008 | 6058 | ||
| 6059 | spin_unlock_irqrestore(&np->lock, flags); | ||
| 6060 | |||
| 6061 | niu_reset_buffers(np); | ||
| 6062 | |||
| 6063 | spin_lock_irqsave(&np->lock, flags); | ||
| 6064 | |||
| 6009 | err = niu_init_hw(np); | 6065 | err = niu_init_hw(np); |
| 6010 | if (!err) { | 6066 | if (!err) { |
| 6011 | np->timer.expires = jiffies + HZ; | 6067 | np->timer.expires = jiffies + HZ; |
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c index caf569401a34..00a0eaa08866 100644 --- a/drivers/net/wireless/ath9k/beacon.c +++ b/drivers/net/wireless/ath9k/beacon.c | |||
| @@ -209,6 +209,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id) | |||
| 209 | unsigned int curlen; | 209 | unsigned int curlen; |
| 210 | struct ath_txq *cabq; | 210 | struct ath_txq *cabq; |
| 211 | struct ath_txq *mcastq; | 211 | struct ath_txq *mcastq; |
| 212 | struct ieee80211_tx_info *info; | ||
| 212 | avp = sc->sc_vaps[if_id]; | 213 | avp = sc->sc_vaps[if_id]; |
| 213 | 214 | ||
| 214 | mcastq = &avp->av_mcastq; | 215 | mcastq = &avp->av_mcastq; |
| @@ -232,6 +233,18 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id) | |||
| 232 | */ | 233 | */ |
| 233 | curlen = skb->len; | 234 | curlen = skb->len; |
| 234 | 235 | ||
| 236 | info = IEEE80211_SKB_CB(skb); | ||
| 237 | if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { | ||
| 238 | /* | ||
| 239 | * TODO: make sure the seq# gets assigned properly (vs. other | ||
| 240 | * TX frames) | ||
| 241 | */ | ||
| 242 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | ||
| 243 | sc->seq_no += 0x10; | ||
| 244 | hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); | ||
| 245 | hdr->seq_ctrl |= cpu_to_le16(sc->seq_no); | ||
| 246 | } | ||
| 247 | |||
| 235 | /* XXX: spin_lock_bh should not be used here, but sparse bitches | 248 | /* XXX: spin_lock_bh should not be used here, but sparse bitches |
| 236 | * otherwise. We should fix sparse :) */ | 249 | * otherwise. We should fix sparse :) */ |
| 237 | spin_lock_bh(&mcastq->axq_lock); | 250 | spin_lock_bh(&mcastq->axq_lock); |
diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h index 673b3d81133a..4ee695b76b88 100644 --- a/drivers/net/wireless/ath9k/core.h +++ b/drivers/net/wireless/ath9k/core.h | |||
| @@ -992,6 +992,7 @@ struct ath_softc { | |||
| 992 | u32 sc_txintrperiod; /* tx interrupt batching */ | 992 | u32 sc_txintrperiod; /* tx interrupt batching */ |
| 993 | int sc_haltype2q[ATH9K_WME_AC_VO+1]; /* HAL WME AC -> h/w qnum */ | 993 | int sc_haltype2q[ATH9K_WME_AC_VO+1]; /* HAL WME AC -> h/w qnum */ |
| 994 | u32 sc_ant_tx[8]; /* recent tx frames/antenna */ | 994 | u32 sc_ant_tx[8]; /* recent tx frames/antenna */ |
| 995 | u16 seq_no; /* TX sequence number */ | ||
| 995 | 996 | ||
| 996 | /* Beacon */ | 997 | /* Beacon */ |
| 997 | struct ath9k_tx_queue_info sc_beacon_qi; | 998 | struct ath9k_tx_queue_info sc_beacon_qi; |
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index c5107f269f24..99badf1404c3 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
| @@ -369,6 +369,20 @@ static int ath9k_tx(struct ieee80211_hw *hw, | |||
| 369 | { | 369 | { |
| 370 | struct ath_softc *sc = hw->priv; | 370 | struct ath_softc *sc = hw->priv; |
| 371 | int hdrlen, padsize; | 371 | int hdrlen, padsize; |
| 372 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
| 373 | |||
| 374 | /* | ||
| 375 | * As a temporary workaround, assign seq# here; this will likely need | ||
| 376 | * to be cleaned up to work better with Beacon transmission and virtual | ||
| 377 | * BSSes. | ||
| 378 | */ | ||
| 379 | if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { | ||
| 380 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | ||
| 381 | if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) | ||
| 382 | sc->seq_no += 0x10; | ||
| 383 | hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); | ||
| 384 | hdr->seq_ctrl |= cpu_to_le16(sc->seq_no); | ||
| 385 | } | ||
| 372 | 386 | ||
| 373 | /* Add the padding after the header if this is not already done */ | 387 | /* Add the padding after the header if this is not already done */ |
| 374 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); | 388 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); |
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c index fec5645944a4..34ae125d5384 100644 --- a/drivers/net/wireless/b43/rfkill.c +++ b/drivers/net/wireless/b43/rfkill.c | |||
| @@ -43,23 +43,6 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev) | |||
| 43 | return 0; | 43 | return 0; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | /* Update the rfkill state */ | ||
| 47 | static void b43_rfkill_update_state(struct b43_wldev *dev) | ||
| 48 | { | ||
| 49 | struct b43_rfkill *rfk = &(dev->wl->rfkill); | ||
| 50 | |||
| 51 | if (!dev->radio_hw_enable) { | ||
| 52 | rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED; | ||
| 53 | return; | ||
| 54 | } | ||
| 55 | |||
| 56 | if (!dev->phy.radio_on) | ||
| 57 | rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED; | ||
| 58 | else | ||
| 59 | rfk->rfkill->state = RFKILL_STATE_UNBLOCKED; | ||
| 60 | |||
| 61 | } | ||
| 62 | |||
| 63 | /* The poll callback for the hardware button. */ | 46 | /* The poll callback for the hardware button. */ |
| 64 | static void b43_rfkill_poll(struct input_polled_dev *poll_dev) | 47 | static void b43_rfkill_poll(struct input_polled_dev *poll_dev) |
| 65 | { | 48 | { |
| @@ -77,7 +60,6 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev) | |||
| 77 | if (unlikely(enabled != dev->radio_hw_enable)) { | 60 | if (unlikely(enabled != dev->radio_hw_enable)) { |
| 78 | dev->radio_hw_enable = enabled; | 61 | dev->radio_hw_enable = enabled; |
| 79 | report_change = 1; | 62 | report_change = 1; |
| 80 | b43_rfkill_update_state(dev); | ||
| 81 | b43info(wl, "Radio hardware status changed to %s\n", | 63 | b43info(wl, "Radio hardware status changed to %s\n", |
| 82 | enabled ? "ENABLED" : "DISABLED"); | 64 | enabled ? "ENABLED" : "DISABLED"); |
| 83 | } | 65 | } |
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index 476add97e974..b32bf6a94f19 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c | |||
| @@ -44,23 +44,6 @@ static bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev) | |||
| 44 | return 0; | 44 | return 0; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | /* Update the rfkill state */ | ||
| 48 | static void b43legacy_rfkill_update_state(struct b43legacy_wldev *dev) | ||
| 49 | { | ||
| 50 | struct b43legacy_rfkill *rfk = &(dev->wl->rfkill); | ||
| 51 | |||
| 52 | if (!dev->radio_hw_enable) { | ||
| 53 | rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED; | ||
| 54 | return; | ||
| 55 | } | ||
| 56 | |||
| 57 | if (!dev->phy.radio_on) | ||
| 58 | rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED; | ||
| 59 | else | ||
| 60 | rfk->rfkill->state = RFKILL_STATE_UNBLOCKED; | ||
| 61 | |||
| 62 | } | ||
| 63 | |||
| 64 | /* The poll callback for the hardware button. */ | 47 | /* The poll callback for the hardware button. */ |
| 65 | static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev) | 48 | static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev) |
| 66 | { | 49 | { |
| @@ -78,7 +61,6 @@ static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev) | |||
| 78 | if (unlikely(enabled != dev->radio_hw_enable)) { | 61 | if (unlikely(enabled != dev->radio_hw_enable)) { |
| 79 | dev->radio_hw_enable = enabled; | 62 | dev->radio_hw_enable = enabled; |
| 80 | report_change = 1; | 63 | report_change = 1; |
| 81 | b43legacy_rfkill_update_state(dev); | ||
| 82 | b43legacyinfo(wl, "Radio hardware status changed to %s\n", | 64 | b43legacyinfo(wl, "Radio hardware status changed to %s\n", |
| 83 | enabled ? "ENABLED" : "DISABLED"); | 65 | enabled ? "ENABLED" : "DISABLED"); |
| 84 | } | 66 | } |
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 40337a06c18a..146ca9cd1567 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
| @@ -320,15 +320,15 @@ static int disable_slot(struct hotplug_slot *slot) | |||
| 320 | return -ENODEV; | 320 | return -ENODEV; |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | /* remove the device from the pci core */ | ||
| 324 | pci_remove_bus_device(dev); | ||
| 325 | |||
| 323 | /* queue work item to blow away this sysfs entry and other | 326 | /* queue work item to blow away this sysfs entry and other |
| 324 | * parts. | 327 | * parts. |
| 325 | */ | 328 | */ |
| 326 | INIT_WORK(&dslot->remove_work, remove_slot_worker); | 329 | INIT_WORK(&dslot->remove_work, remove_slot_worker); |
| 327 | queue_work(dummyphp_wq, &dslot->remove_work); | 330 | queue_work(dummyphp_wq, &dslot->remove_work); |
| 328 | 331 | ||
| 329 | /* blow away this sysfs entry and other parts. */ | ||
| 330 | remove_slot(dslot); | ||
| 331 | |||
| 332 | pci_dev_put(dev); | 332 | pci_dev_put(dev); |
| 333 | } | 333 | } |
| 334 | return 0; | 334 | return 0; |
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index ab31f5ba665d..9d934ddee956 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
| @@ -258,7 +258,7 @@ static int pcie_poll_cmd(struct controller *ctrl) | |||
| 258 | return 1; | 258 | return 1; |
| 259 | } | 259 | } |
| 260 | } | 260 | } |
| 261 | while (timeout > 1000) { | 261 | while (timeout > 0) { |
| 262 | msleep(10); | 262 | msleep(10); |
| 263 | timeout -= 10; | 263 | timeout -= 10; |
| 264 | if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) { | 264 | if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) { |
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 8d0e60ac849c..c3edcdc08e72 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -2348,11 +2348,34 @@ static void __init iommu_exit_mempool(void) | |||
| 2348 | 2348 | ||
| 2349 | } | 2349 | } |
| 2350 | 2350 | ||
| 2351 | static int blacklist_iommu(const struct dmi_system_id *id) | ||
| 2352 | { | ||
| 2353 | printk(KERN_INFO "%s detected; disabling IOMMU\n", | ||
| 2354 | id->ident); | ||
| 2355 | dmar_disabled = 1; | ||
| 2356 | return 0; | ||
| 2357 | } | ||
| 2358 | |||
| 2359 | static struct dmi_system_id __initdata intel_iommu_dmi_table[] = { | ||
| 2360 | { /* Some DG33BU BIOS revisions advertised non-existent VT-d */ | ||
| 2361 | .callback = blacklist_iommu, | ||
| 2362 | .ident = "Intel DG33BU", | ||
| 2363 | { DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), | ||
| 2364 | DMI_MATCH(DMI_BOARD_NAME, "DG33BU"), | ||
| 2365 | } | ||
| 2366 | }, | ||
| 2367 | { } | ||
| 2368 | }; | ||
| 2369 | |||
| 2370 | |||
| 2351 | void __init detect_intel_iommu(void) | 2371 | void __init detect_intel_iommu(void) |
| 2352 | { | 2372 | { |
| 2353 | if (swiotlb || no_iommu || iommu_detected || dmar_disabled) | 2373 | if (swiotlb || no_iommu || iommu_detected || dmar_disabled) |
| 2354 | return; | 2374 | return; |
| 2355 | if (early_dmar_detect()) { | 2375 | if (early_dmar_detect()) { |
| 2376 | dmi_check_system(intel_iommu_dmi_table); | ||
| 2377 | if (dmar_disabled) | ||
| 2378 | return; | ||
| 2356 | iommu_detected = 1; | 2379 | iommu_detected = 1; |
| 2357 | } | 2380 | } |
| 2358 | } | 2381 | } |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index cce2f4cb1fbf..36698e57b97f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -304,6 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | |||
| 304 | } else { | 304 | } else { |
| 305 | res->start = l64; | 305 | res->start = l64; |
| 306 | res->end = l64 + sz64; | 306 | res->end = l64 + sz64; |
| 307 | printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", | ||
| 308 | pci_name(dev), pos, (unsigned long long)res->start, | ||
| 309 | (unsigned long long)res->end); | ||
| 307 | } | 310 | } |
| 308 | } else { | 311 | } else { |
| 309 | sz = pci_size(l, sz, mask); | 312 | sz = pci_size(l, sz, mask); |
| @@ -313,6 +316,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | |||
| 313 | 316 | ||
| 314 | res->start = l; | 317 | res->start = l; |
| 315 | res->end = l + sz; | 318 | res->end = l + sz; |
| 319 | printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev), | ||
| 320 | pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio", | ||
| 321 | (unsigned long long)res->start, (unsigned long long)res->end); | ||
| 316 | } | 322 | } |
| 317 | 323 | ||
| 318 | out: | 324 | out: |
| @@ -383,7 +389,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
| 383 | res->start = base; | 389 | res->start = base; |
| 384 | if (!res->end) | 390 | if (!res->end) |
| 385 | res->end = limit + 0xfff; | 391 | res->end = limit + 0xfff; |
| 386 | printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end); | 392 | printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n", |
| 393 | pci_name(dev), (unsigned long long) res->start, | ||
| 394 | (unsigned long long) res->end); | ||
| 387 | } | 395 | } |
| 388 | 396 | ||
| 389 | res = child->resource[1]; | 397 | res = child->resource[1]; |
| @@ -395,7 +403,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
| 395 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; | 403 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; |
| 396 | res->start = base; | 404 | res->start = base; |
| 397 | res->end = limit + 0xfffff; | 405 | res->end = limit + 0xfffff; |
| 398 | printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end); | 406 | printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", |
| 407 | pci_name(dev), (unsigned long long) res->start, | ||
| 408 | (unsigned long long) res->end); | ||
| 399 | } | 409 | } |
| 400 | 410 | ||
| 401 | res = child->resource[2]; | 411 | res = child->resource[2]; |
| @@ -431,7 +441,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
| 431 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; | 441 | res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; |
| 432 | res->start = base; | 442 | res->start = base; |
| 433 | res->end = limit + 0xfffff; | 443 | res->end = limit + 0xfffff; |
| 434 | printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",res->start, res->end); | 444 | printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", |
| 445 | pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", | ||
| 446 | (unsigned long long) res->start, (unsigned long long) res->end); | ||
| 435 | } | 447 | } |
| 436 | } | 448 | } |
| 437 | 449 | ||
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 1aad599816f7..3abbfad9ddab 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -540,7 +540,11 @@ static void pci_bus_dump_res(struct pci_bus *bus) | |||
| 540 | if (!res) | 540 | if (!res) |
| 541 | continue; | 541 | continue; |
| 542 | 542 | ||
| 543 | printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end); | 543 | printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", |
| 544 | bus->number, i, | ||
| 545 | (res->flags & IORESOURCE_IO) ? "io port" : "mmio", | ||
| 546 | (unsigned long long) res->start, | ||
| 547 | (unsigned long long) res->end); | ||
| 544 | } | 548 | } |
| 545 | } | 549 | } |
| 546 | 550 | ||
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index c48f3f69bdaf..da3972153226 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
| @@ -748,7 +748,9 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops | |||
| 748 | 748 | ||
| 749 | add_timer(&skt->poll_timer); | 749 | add_timer(&skt->poll_timer); |
| 750 | 750 | ||
| 751 | device_create_file(&skt->socket.dev, &dev_attr_status); | 751 | ret = device_create_file(&skt->socket.dev, &dev_attr_status); |
| 752 | if (ret) | ||
| 753 | goto out_err_8; | ||
| 752 | } | 754 | } |
| 753 | 755 | ||
| 754 | dev_set_drvdata(dev, sinfo); | 756 | dev_set_drvdata(dev, sinfo); |
| @@ -758,6 +760,8 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops | |||
| 758 | do { | 760 | do { |
| 759 | skt = &sinfo->skt[i]; | 761 | skt = &sinfo->skt[i]; |
| 760 | 762 | ||
| 763 | device_remove_file(&skt->socket.dev, &dev_attr_status); | ||
| 764 | out_err_8: | ||
| 761 | del_timer_sync(&skt->poll_timer); | 765 | del_timer_sync(&skt->poll_timer); |
| 762 | pcmcia_unregister_socket(&skt->socket); | 766 | pcmcia_unregister_socket(&skt->socket); |
| 763 | 767 | ||
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index e0ce65fca4e7..9a50f245774b 100644 --- a/drivers/s390/cio/ccwgroup.c +++ b/drivers/s390/cio/ccwgroup.c | |||
| @@ -113,7 +113,8 @@ ccwgroup_release (struct device *dev) | |||
| 113 | 113 | ||
| 114 | for (i = 0; i < gdev->count; i++) { | 114 | for (i = 0; i < gdev->count; i++) { |
| 115 | if (gdev->cdev[i]) { | 115 | if (gdev->cdev[i]) { |
| 116 | dev_set_drvdata(&gdev->cdev[i]->dev, NULL); | 116 | if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev) |
| 117 | dev_set_drvdata(&gdev->cdev[i]->dev, NULL); | ||
| 117 | put_device(&gdev->cdev[i]->dev); | 118 | put_device(&gdev->cdev[i]->dev); |
| 118 | } | 119 | } |
| 119 | } | 120 | } |
| @@ -296,6 +297,7 @@ error: | |||
| 296 | if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev) | 297 | if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev) |
| 297 | dev_set_drvdata(&gdev->cdev[i]->dev, NULL); | 298 | dev_set_drvdata(&gdev->cdev[i]->dev, NULL); |
| 298 | put_device(&gdev->cdev[i]->dev); | 299 | put_device(&gdev->cdev[i]->dev); |
| 300 | gdev->cdev[i] = NULL; | ||
| 299 | } | 301 | } |
| 300 | mutex_unlock(&gdev->reg_mutex); | 302 | mutex_unlock(&gdev->reg_mutex); |
| 301 | put_device(&gdev->dev); | 303 | put_device(&gdev->dev); |
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 5954b905e3ca..326f4cc7f92c 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
| @@ -174,6 +174,7 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */ | |||
| 174 | CIO_TRACE_EVENT(4, sch->dev.bus_id); | 174 | CIO_TRACE_EVENT(4, sch->dev.bus_id); |
| 175 | 175 | ||
| 176 | orb = &to_io_private(sch)->orb; | 176 | orb = &to_io_private(sch)->orb; |
| 177 | memset(orb, 0, sizeof(union orb)); | ||
| 177 | /* sch is always under 2G. */ | 178 | /* sch is always under 2G. */ |
| 178 | orb->cmd.intparm = (u32)(addr_t)sch; | 179 | orb->cmd.intparm = (u32)(addr_t)sch; |
| 179 | orb->cmd.fmt = 1; | 180 | orb->cmd.fmt = 1; |
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index 391dd29749f8..51b6a05f4d12 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
| @@ -152,10 +152,8 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device) | |||
| 152 | */ | 152 | */ |
| 153 | static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) | 153 | static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) |
| 154 | { | 154 | { |
| 155 | struct zfcp_adapter *adapter; | 155 | struct zfcp_adapter *adapter = dev_get_drvdata(&ccw_device->dev); |
| 156 | 156 | ||
| 157 | down(&zfcp_data.config_sema); | ||
| 158 | adapter = dev_get_drvdata(&ccw_device->dev); | ||
| 159 | switch (event) { | 157 | switch (event) { |
| 160 | case CIO_GONE: | 158 | case CIO_GONE: |
| 161 | dev_warn(&adapter->ccw_device->dev, "device gone\n"); | 159 | dev_warn(&adapter->ccw_device->dev, "device gone\n"); |
| @@ -174,8 +172,6 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) | |||
| 174 | 89, NULL); | 172 | 89, NULL); |
| 175 | break; | 173 | break; |
| 176 | } | 174 | } |
| 177 | zfcp_erp_wait(adapter); | ||
| 178 | up(&zfcp_data.config_sema); | ||
| 179 | return 1; | 175 | return 1; |
| 180 | } | 176 | } |
| 181 | 177 | ||
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index e984469bb98b..56196c98c07b 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
| @@ -39,18 +39,6 @@ struct zfcp_gpn_ft { | |||
| 39 | struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS]; | 39 | struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS]; |
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | static struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *adapter, | ||
| 43 | u32 d_id) | ||
| 44 | { | ||
| 45 | struct zfcp_port *port; | ||
| 46 | |||
| 47 | list_for_each_entry(port, &adapter->port_list_head, list) | ||
| 48 | if ((port->d_id == d_id) && | ||
| 49 | !atomic_test_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status)) | ||
| 50 | return port; | ||
| 51 | return NULL; | ||
| 52 | } | ||
| 53 | |||
| 54 | static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, | 42 | static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, |
| 55 | struct fcp_rscn_element *elem) | 43 | struct fcp_rscn_element *elem) |
| 56 | { | 44 | { |
| @@ -341,12 +329,13 @@ void zfcp_test_link(struct zfcp_port *port) | |||
| 341 | 329 | ||
| 342 | zfcp_port_get(port); | 330 | zfcp_port_get(port); |
| 343 | retval = zfcp_fc_adisc(port); | 331 | retval = zfcp_fc_adisc(port); |
| 344 | if (retval == 0 || retval == -EBUSY) | 332 | if (retval == 0) |
| 345 | return; | 333 | return; |
| 346 | 334 | ||
| 347 | /* send of ADISC was not possible */ | 335 | /* send of ADISC was not possible */ |
| 348 | zfcp_port_put(port); | 336 | zfcp_port_put(port); |
| 349 | zfcp_erp_port_forced_reopen(port, 0, 65, NULL); | 337 | if (retval != -EBUSY) |
| 338 | zfcp_erp_port_forced_reopen(port, 0, 65, NULL); | ||
| 350 | } | 339 | } |
| 351 | 340 | ||
| 352 | static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter) | 341 | static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter) |
| @@ -363,7 +352,6 @@ static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter) | |||
| 363 | if (ret) | 352 | if (ret) |
| 364 | return ret; | 353 | return ret; |
| 365 | zfcp_erp_wait(adapter); | 354 | zfcp_erp_wait(adapter); |
| 366 | zfcp_port_put(adapter->nameserver_port); | ||
| 367 | } | 355 | } |
| 368 | return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED, | 356 | return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED, |
| 369 | &adapter->nameserver_port->status); | 357 | &adapter->nameserver_port->status); |
| @@ -475,7 +463,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) | |||
| 475 | struct zfcp_adapter *adapter = ct->port->adapter; | 463 | struct zfcp_adapter *adapter = ct->port->adapter; |
| 476 | struct zfcp_port *port, *tmp; | 464 | struct zfcp_port *port, *tmp; |
| 477 | u32 d_id; | 465 | u32 d_id; |
| 478 | int ret = 0, x; | 466 | int ret = 0, x, last = 0; |
| 479 | 467 | ||
| 480 | if (ct->status) | 468 | if (ct->status) |
| 481 | return -EIO; | 469 | return -EIO; |
| @@ -492,19 +480,24 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) | |||
| 492 | down(&zfcp_data.config_sema); | 480 | down(&zfcp_data.config_sema); |
| 493 | 481 | ||
| 494 | /* first entry is the header */ | 482 | /* first entry is the header */ |
| 495 | for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES; x++) { | 483 | for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) { |
| 496 | if (x % (ZFCP_GPN_FT_ENTRIES + 1)) | 484 | if (x % (ZFCP_GPN_FT_ENTRIES + 1)) |
| 497 | acc++; | 485 | acc++; |
| 498 | else | 486 | else |
| 499 | acc = sg_virt(++sg); | 487 | acc = sg_virt(++sg); |
| 500 | 488 | ||
| 489 | last = acc->control & 0x80; | ||
| 501 | d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 | | 490 | d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 | |
| 502 | acc->port_id[2]; | 491 | acc->port_id[2]; |
| 503 | 492 | ||
| 504 | /* skip the adapter's port and known remote ports */ | 493 | /* skip the adapter's port and known remote ports */ |
| 505 | if (acc->wwpn == fc_host_port_name(adapter->scsi_host) || | 494 | if (acc->wwpn == fc_host_port_name(adapter->scsi_host)) |
| 506 | zfcp_get_port_by_did(adapter, d_id)) | 495 | continue; |
| 496 | port = zfcp_get_port_by_wwpn(adapter, acc->wwpn); | ||
| 497 | if (port) { | ||
| 498 | zfcp_port_get(port); | ||
| 507 | continue; | 499 | continue; |
| 500 | } | ||
| 508 | 501 | ||
| 509 | port = zfcp_port_enqueue(adapter, acc->wwpn, | 502 | port = zfcp_port_enqueue(adapter, acc->wwpn, |
| 510 | ZFCP_STATUS_PORT_DID_DID | | 503 | ZFCP_STATUS_PORT_DID_DID | |
| @@ -513,8 +506,6 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) | |||
| 513 | ret = PTR_ERR(port); | 506 | ret = PTR_ERR(port); |
| 514 | else | 507 | else |
| 515 | zfcp_erp_port_reopen(port, 0, 149, NULL); | 508 | zfcp_erp_port_reopen(port, 0, 149, NULL); |
| 516 | if (acc->control & 0x80) /* last entry */ | ||
| 517 | break; | ||
| 518 | } | 509 | } |
| 519 | 510 | ||
| 520 | zfcp_erp_wait(adapter); | 511 | zfcp_erp_wait(adapter); |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 19c1ca913874..49dbeb754e5f 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
| @@ -710,10 +710,10 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req) | |||
| 710 | 710 | ||
| 711 | static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue) | 711 | static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue) |
| 712 | { | 712 | { |
| 713 | spin_lock(&queue->lock); | 713 | spin_lock_bh(&queue->lock); |
| 714 | if (atomic_read(&queue->count)) | 714 | if (atomic_read(&queue->count)) |
| 715 | return 1; | 715 | return 1; |
| 716 | spin_unlock(&queue->lock); | 716 | spin_unlock_bh(&queue->lock); |
| 717 | return 0; | 717 | return 0; |
| 718 | } | 718 | } |
| 719 | 719 | ||
| @@ -722,13 +722,13 @@ static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter) | |||
| 722 | long ret; | 722 | long ret; |
| 723 | struct zfcp_qdio_queue *req_q = &adapter->req_q; | 723 | struct zfcp_qdio_queue *req_q = &adapter->req_q; |
| 724 | 724 | ||
| 725 | spin_unlock(&req_q->lock); | 725 | spin_unlock_bh(&req_q->lock); |
| 726 | ret = wait_event_interruptible_timeout(adapter->request_wq, | 726 | ret = wait_event_interruptible_timeout(adapter->request_wq, |
| 727 | zfcp_fsf_sbal_check(req_q), 5 * HZ); | 727 | zfcp_fsf_sbal_check(req_q), 5 * HZ); |
| 728 | if (ret > 0) | 728 | if (ret > 0) |
| 729 | return 0; | 729 | return 0; |
| 730 | 730 | ||
| 731 | spin_lock(&req_q->lock); | 731 | spin_lock_bh(&req_q->lock); |
| 732 | return -EIO; | 732 | return -EIO; |
| 733 | } | 733 | } |
| 734 | 734 | ||
| @@ -870,14 +870,14 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter) | |||
| 870 | volatile struct qdio_buffer_element *sbale; | 870 | volatile struct qdio_buffer_element *sbale; |
| 871 | int retval = -EIO; | 871 | int retval = -EIO; |
| 872 | 872 | ||
| 873 | spin_lock(&adapter->req_q.lock); | 873 | spin_lock_bh(&adapter->req_q.lock); |
| 874 | if (zfcp_fsf_req_sbal_get(adapter)) | 874 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 875 | goto out; | 875 | goto out; |
| 876 | 876 | ||
| 877 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS, | 877 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS, |
| 878 | ZFCP_REQ_NO_QTCB, | 878 | ZFCP_REQ_NO_QTCB, |
| 879 | adapter->pool.fsf_req_status_read); | 879 | adapter->pool.fsf_req_status_read); |
| 880 | if (unlikely(IS_ERR(req))) { | 880 | if (IS_ERR(req)) { |
| 881 | retval = PTR_ERR(req); | 881 | retval = PTR_ERR(req); |
| 882 | goto out; | 882 | goto out; |
| 883 | } | 883 | } |
| @@ -910,7 +910,7 @@ failed_buf: | |||
| 910 | zfcp_fsf_req_free(req); | 910 | zfcp_fsf_req_free(req); |
| 911 | zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL); | 911 | zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL); |
| 912 | out: | 912 | out: |
| 913 | spin_unlock(&adapter->req_q.lock); | 913 | spin_unlock_bh(&adapter->req_q.lock); |
| 914 | return retval; | 914 | return retval; |
| 915 | } | 915 | } |
| 916 | 916 | ||
| @@ -988,7 +988,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, | |||
| 988 | goto out; | 988 | goto out; |
| 989 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, | 989 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, |
| 990 | req_flags, adapter->pool.fsf_req_abort); | 990 | req_flags, adapter->pool.fsf_req_abort); |
| 991 | if (unlikely(IS_ERR(req))) | 991 | if (IS_ERR(req)) |
| 992 | goto out; | 992 | goto out; |
| 993 | 993 | ||
| 994 | if (unlikely(!(atomic_read(&unit->status) & | 994 | if (unlikely(!(atomic_read(&unit->status) & |
| @@ -1106,13 +1106,13 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool, | |||
| 1106 | struct zfcp_fsf_req *req; | 1106 | struct zfcp_fsf_req *req; |
| 1107 | int ret = -EIO; | 1107 | int ret = -EIO; |
| 1108 | 1108 | ||
| 1109 | spin_lock(&adapter->req_q.lock); | 1109 | spin_lock_bh(&adapter->req_q.lock); |
| 1110 | if (zfcp_fsf_req_sbal_get(adapter)) | 1110 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1111 | goto out; | 1111 | goto out; |
| 1112 | 1112 | ||
| 1113 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC, | 1113 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC, |
| 1114 | ZFCP_REQ_AUTO_CLEANUP, pool); | 1114 | ZFCP_REQ_AUTO_CLEANUP, pool); |
| 1115 | if (unlikely(IS_ERR(req))) { | 1115 | if (IS_ERR(req)) { |
| 1116 | ret = PTR_ERR(req); | 1116 | ret = PTR_ERR(req); |
| 1117 | goto out; | 1117 | goto out; |
| 1118 | } | 1118 | } |
| @@ -1148,7 +1148,7 @@ failed_send: | |||
| 1148 | if (erp_action) | 1148 | if (erp_action) |
| 1149 | erp_action->fsf_req = NULL; | 1149 | erp_action->fsf_req = NULL; |
| 1150 | out: | 1150 | out: |
| 1151 | spin_unlock(&adapter->req_q.lock); | 1151 | spin_unlock_bh(&adapter->req_q.lock); |
| 1152 | return ret; | 1152 | return ret; |
| 1153 | } | 1153 | } |
| 1154 | 1154 | ||
| @@ -1223,7 +1223,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els) | |||
| 1223 | goto out; | 1223 | goto out; |
| 1224 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS, | 1224 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS, |
| 1225 | ZFCP_REQ_AUTO_CLEANUP, NULL); | 1225 | ZFCP_REQ_AUTO_CLEANUP, NULL); |
| 1226 | if (unlikely(IS_ERR(req))) { | 1226 | if (IS_ERR(req)) { |
| 1227 | ret = PTR_ERR(req); | 1227 | ret = PTR_ERR(req); |
| 1228 | goto out; | 1228 | goto out; |
| 1229 | } | 1229 | } |
| @@ -1263,14 +1263,14 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action) | |||
| 1263 | struct zfcp_adapter *adapter = erp_action->adapter; | 1263 | struct zfcp_adapter *adapter = erp_action->adapter; |
| 1264 | int retval = -EIO; | 1264 | int retval = -EIO; |
| 1265 | 1265 | ||
| 1266 | spin_lock(&adapter->req_q.lock); | 1266 | spin_lock_bh(&adapter->req_q.lock); |
| 1267 | if (!atomic_read(&adapter->req_q.count)) | 1267 | if (!atomic_read(&adapter->req_q.count)) |
| 1268 | goto out; | 1268 | goto out; |
| 1269 | req = zfcp_fsf_req_create(adapter, | 1269 | req = zfcp_fsf_req_create(adapter, |
| 1270 | FSF_QTCB_EXCHANGE_CONFIG_DATA, | 1270 | FSF_QTCB_EXCHANGE_CONFIG_DATA, |
| 1271 | ZFCP_REQ_AUTO_CLEANUP, | 1271 | ZFCP_REQ_AUTO_CLEANUP, |
| 1272 | adapter->pool.fsf_req_erp); | 1272 | adapter->pool.fsf_req_erp); |
| 1273 | if (unlikely(IS_ERR(req))) { | 1273 | if (IS_ERR(req)) { |
| 1274 | retval = PTR_ERR(req); | 1274 | retval = PTR_ERR(req); |
| 1275 | goto out; | 1275 | goto out; |
| 1276 | } | 1276 | } |
| @@ -1295,7 +1295,7 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action) | |||
| 1295 | erp_action->fsf_req = NULL; | 1295 | erp_action->fsf_req = NULL; |
| 1296 | } | 1296 | } |
| 1297 | out: | 1297 | out: |
| 1298 | spin_unlock(&adapter->req_q.lock); | 1298 | spin_unlock_bh(&adapter->req_q.lock); |
| 1299 | return retval; | 1299 | return retval; |
| 1300 | } | 1300 | } |
| 1301 | 1301 | ||
| @@ -1306,13 +1306,13 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, | |||
| 1306 | struct zfcp_fsf_req *req = NULL; | 1306 | struct zfcp_fsf_req *req = NULL; |
| 1307 | int retval = -EIO; | 1307 | int retval = -EIO; |
| 1308 | 1308 | ||
| 1309 | spin_lock(&adapter->req_q.lock); | 1309 | spin_lock_bh(&adapter->req_q.lock); |
| 1310 | if (zfcp_fsf_req_sbal_get(adapter)) | 1310 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1311 | goto out; | 1311 | goto out; |
| 1312 | 1312 | ||
| 1313 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA, | 1313 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA, |
| 1314 | 0, NULL); | 1314 | 0, NULL); |
| 1315 | if (unlikely(IS_ERR(req))) { | 1315 | if (IS_ERR(req)) { |
| 1316 | retval = PTR_ERR(req); | 1316 | retval = PTR_ERR(req); |
| 1317 | goto out; | 1317 | goto out; |
| 1318 | } | 1318 | } |
| @@ -1334,7 +1334,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, | |||
| 1334 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 1334 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
| 1335 | retval = zfcp_fsf_req_send(req); | 1335 | retval = zfcp_fsf_req_send(req); |
| 1336 | out: | 1336 | out: |
| 1337 | spin_unlock(&adapter->req_q.lock); | 1337 | spin_unlock_bh(&adapter->req_q.lock); |
| 1338 | if (!retval) | 1338 | if (!retval) |
| 1339 | wait_event(req->completion_wq, | 1339 | wait_event(req->completion_wq, |
| 1340 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 1340 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
| @@ -1359,13 +1359,13 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) | |||
| 1359 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) | 1359 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) |
| 1360 | return -EOPNOTSUPP; | 1360 | return -EOPNOTSUPP; |
| 1361 | 1361 | ||
| 1362 | spin_lock(&adapter->req_q.lock); | 1362 | spin_lock_bh(&adapter->req_q.lock); |
| 1363 | if (!atomic_read(&adapter->req_q.count)) | 1363 | if (!atomic_read(&adapter->req_q.count)) |
| 1364 | goto out; | 1364 | goto out; |
| 1365 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, | 1365 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, |
| 1366 | ZFCP_REQ_AUTO_CLEANUP, | 1366 | ZFCP_REQ_AUTO_CLEANUP, |
| 1367 | adapter->pool.fsf_req_erp); | 1367 | adapter->pool.fsf_req_erp); |
| 1368 | if (unlikely(IS_ERR(req))) { | 1368 | if (IS_ERR(req)) { |
| 1369 | retval = PTR_ERR(req); | 1369 | retval = PTR_ERR(req); |
| 1370 | goto out; | 1370 | goto out; |
| 1371 | } | 1371 | } |
| @@ -1385,7 +1385,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) | |||
| 1385 | erp_action->fsf_req = NULL; | 1385 | erp_action->fsf_req = NULL; |
| 1386 | } | 1386 | } |
| 1387 | out: | 1387 | out: |
| 1388 | spin_unlock(&adapter->req_q.lock); | 1388 | spin_unlock_bh(&adapter->req_q.lock); |
| 1389 | return retval; | 1389 | return retval; |
| 1390 | } | 1390 | } |
| 1391 | 1391 | ||
| @@ -1405,13 +1405,13 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
| 1405 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) | 1405 | if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)) |
| 1406 | return -EOPNOTSUPP; | 1406 | return -EOPNOTSUPP; |
| 1407 | 1407 | ||
| 1408 | spin_lock(&adapter->req_q.lock); | 1408 | spin_lock_bh(&adapter->req_q.lock); |
| 1409 | if (!atomic_read(&adapter->req_q.count)) | 1409 | if (!atomic_read(&adapter->req_q.count)) |
| 1410 | goto out; | 1410 | goto out; |
| 1411 | 1411 | ||
| 1412 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0, | 1412 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0, |
| 1413 | NULL); | 1413 | NULL); |
| 1414 | if (unlikely(IS_ERR(req))) { | 1414 | if (IS_ERR(req)) { |
| 1415 | retval = PTR_ERR(req); | 1415 | retval = PTR_ERR(req); |
| 1416 | goto out; | 1416 | goto out; |
| 1417 | } | 1417 | } |
| @@ -1427,7 +1427,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
| 1427 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 1427 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
| 1428 | retval = zfcp_fsf_req_send(req); | 1428 | retval = zfcp_fsf_req_send(req); |
| 1429 | out: | 1429 | out: |
| 1430 | spin_unlock(&adapter->req_q.lock); | 1430 | spin_unlock_bh(&adapter->req_q.lock); |
| 1431 | if (!retval) | 1431 | if (!retval) |
| 1432 | wait_event(req->completion_wq, | 1432 | wait_event(req->completion_wq, |
| 1433 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 1433 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
| @@ -1531,7 +1531,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) | |||
| 1531 | struct zfcp_fsf_req *req; | 1531 | struct zfcp_fsf_req *req; |
| 1532 | int retval = -EIO; | 1532 | int retval = -EIO; |
| 1533 | 1533 | ||
| 1534 | spin_lock(&adapter->req_q.lock); | 1534 | spin_lock_bh(&adapter->req_q.lock); |
| 1535 | if (zfcp_fsf_req_sbal_get(adapter)) | 1535 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1536 | goto out; | 1536 | goto out; |
| 1537 | 1537 | ||
| @@ -1539,7 +1539,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) | |||
| 1539 | FSF_QTCB_OPEN_PORT_WITH_DID, | 1539 | FSF_QTCB_OPEN_PORT_WITH_DID, |
| 1540 | ZFCP_REQ_AUTO_CLEANUP, | 1540 | ZFCP_REQ_AUTO_CLEANUP, |
| 1541 | adapter->pool.fsf_req_erp); | 1541 | adapter->pool.fsf_req_erp); |
| 1542 | if (unlikely(IS_ERR(req))) { | 1542 | if (IS_ERR(req)) { |
| 1543 | retval = PTR_ERR(req); | 1543 | retval = PTR_ERR(req); |
| 1544 | goto out; | 1544 | goto out; |
| 1545 | } | 1545 | } |
| @@ -1562,7 +1562,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) | |||
| 1562 | erp_action->fsf_req = NULL; | 1562 | erp_action->fsf_req = NULL; |
| 1563 | } | 1563 | } |
| 1564 | out: | 1564 | out: |
| 1565 | spin_unlock(&adapter->req_q.lock); | 1565 | spin_unlock_bh(&adapter->req_q.lock); |
| 1566 | return retval; | 1566 | return retval; |
| 1567 | } | 1567 | } |
| 1568 | 1568 | ||
| @@ -1603,14 +1603,14 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action) | |||
| 1603 | struct zfcp_fsf_req *req; | 1603 | struct zfcp_fsf_req *req; |
| 1604 | int retval = -EIO; | 1604 | int retval = -EIO; |
| 1605 | 1605 | ||
| 1606 | spin_lock(&adapter->req_q.lock); | 1606 | spin_lock_bh(&adapter->req_q.lock); |
| 1607 | if (zfcp_fsf_req_sbal_get(adapter)) | 1607 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1608 | goto out; | 1608 | goto out; |
| 1609 | 1609 | ||
| 1610 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT, | 1610 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT, |
| 1611 | ZFCP_REQ_AUTO_CLEANUP, | 1611 | ZFCP_REQ_AUTO_CLEANUP, |
| 1612 | adapter->pool.fsf_req_erp); | 1612 | adapter->pool.fsf_req_erp); |
| 1613 | if (unlikely(IS_ERR(req))) { | 1613 | if (IS_ERR(req)) { |
| 1614 | retval = PTR_ERR(req); | 1614 | retval = PTR_ERR(req); |
| 1615 | goto out; | 1615 | goto out; |
| 1616 | } | 1616 | } |
| @@ -1633,7 +1633,7 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action) | |||
| 1633 | erp_action->fsf_req = NULL; | 1633 | erp_action->fsf_req = NULL; |
| 1634 | } | 1634 | } |
| 1635 | out: | 1635 | out: |
| 1636 | spin_unlock(&adapter->req_q.lock); | 1636 | spin_unlock_bh(&adapter->req_q.lock); |
| 1637 | return retval; | 1637 | return retval; |
| 1638 | } | 1638 | } |
| 1639 | 1639 | ||
| @@ -1700,14 +1700,14 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action) | |||
| 1700 | struct zfcp_fsf_req *req; | 1700 | struct zfcp_fsf_req *req; |
| 1701 | int retval = -EIO; | 1701 | int retval = -EIO; |
| 1702 | 1702 | ||
| 1703 | spin_lock(&adapter->req_q.lock); | 1703 | spin_lock_bh(&adapter->req_q.lock); |
| 1704 | if (zfcp_fsf_req_sbal_get(adapter)) | 1704 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1705 | goto out; | 1705 | goto out; |
| 1706 | 1706 | ||
| 1707 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT, | 1707 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT, |
| 1708 | ZFCP_REQ_AUTO_CLEANUP, | 1708 | ZFCP_REQ_AUTO_CLEANUP, |
| 1709 | adapter->pool.fsf_req_erp); | 1709 | adapter->pool.fsf_req_erp); |
| 1710 | if (unlikely(IS_ERR(req))) { | 1710 | if (IS_ERR(req)) { |
| 1711 | retval = PTR_ERR(req); | 1711 | retval = PTR_ERR(req); |
| 1712 | goto out; | 1712 | goto out; |
| 1713 | } | 1713 | } |
| @@ -1731,7 +1731,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action) | |||
| 1731 | erp_action->fsf_req = NULL; | 1731 | erp_action->fsf_req = NULL; |
| 1732 | } | 1732 | } |
| 1733 | out: | 1733 | out: |
| 1734 | spin_unlock(&adapter->req_q.lock); | 1734 | spin_unlock_bh(&adapter->req_q.lock); |
| 1735 | return retval; | 1735 | return retval; |
| 1736 | } | 1736 | } |
| 1737 | 1737 | ||
| @@ -1875,14 +1875,14 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action) | |||
| 1875 | struct zfcp_fsf_req *req; | 1875 | struct zfcp_fsf_req *req; |
| 1876 | int retval = -EIO; | 1876 | int retval = -EIO; |
| 1877 | 1877 | ||
| 1878 | spin_lock(&adapter->req_q.lock); | 1878 | spin_lock_bh(&adapter->req_q.lock); |
| 1879 | if (zfcp_fsf_req_sbal_get(adapter)) | 1879 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1880 | goto out; | 1880 | goto out; |
| 1881 | 1881 | ||
| 1882 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN, | 1882 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN, |
| 1883 | ZFCP_REQ_AUTO_CLEANUP, | 1883 | ZFCP_REQ_AUTO_CLEANUP, |
| 1884 | adapter->pool.fsf_req_erp); | 1884 | adapter->pool.fsf_req_erp); |
| 1885 | if (unlikely(IS_ERR(req))) { | 1885 | if (IS_ERR(req)) { |
| 1886 | retval = PTR_ERR(req); | 1886 | retval = PTR_ERR(req); |
| 1887 | goto out; | 1887 | goto out; |
| 1888 | } | 1888 | } |
| @@ -1910,7 +1910,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action) | |||
| 1910 | erp_action->fsf_req = NULL; | 1910 | erp_action->fsf_req = NULL; |
| 1911 | } | 1911 | } |
| 1912 | out: | 1912 | out: |
| 1913 | spin_unlock(&adapter->req_q.lock); | 1913 | spin_unlock_bh(&adapter->req_q.lock); |
| 1914 | return retval; | 1914 | return retval; |
| 1915 | } | 1915 | } |
| 1916 | 1916 | ||
| @@ -1965,13 +1965,13 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action) | |||
| 1965 | struct zfcp_fsf_req *req; | 1965 | struct zfcp_fsf_req *req; |
| 1966 | int retval = -EIO; | 1966 | int retval = -EIO; |
| 1967 | 1967 | ||
| 1968 | spin_lock(&adapter->req_q.lock); | 1968 | spin_lock_bh(&adapter->req_q.lock); |
| 1969 | if (zfcp_fsf_req_sbal_get(adapter)) | 1969 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 1970 | goto out; | 1970 | goto out; |
| 1971 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN, | 1971 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN, |
| 1972 | ZFCP_REQ_AUTO_CLEANUP, | 1972 | ZFCP_REQ_AUTO_CLEANUP, |
| 1973 | adapter->pool.fsf_req_erp); | 1973 | adapter->pool.fsf_req_erp); |
| 1974 | if (unlikely(IS_ERR(req))) { | 1974 | if (IS_ERR(req)) { |
| 1975 | retval = PTR_ERR(req); | 1975 | retval = PTR_ERR(req); |
| 1976 | goto out; | 1976 | goto out; |
| 1977 | } | 1977 | } |
| @@ -1995,7 +1995,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action) | |||
| 1995 | erp_action->fsf_req = NULL; | 1995 | erp_action->fsf_req = NULL; |
| 1996 | } | 1996 | } |
| 1997 | out: | 1997 | out: |
| 1998 | spin_unlock(&adapter->req_q.lock); | 1998 | spin_unlock_bh(&adapter->req_q.lock); |
| 1999 | return retval; | 1999 | return retval; |
| 2000 | } | 2000 | } |
| 2001 | 2001 | ||
| @@ -2228,7 +2228,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter, | |||
| 2228 | goto out; | 2228 | goto out; |
| 2229 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, | 2229 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, |
| 2230 | adapter->pool.fsf_req_scsi); | 2230 | adapter->pool.fsf_req_scsi); |
| 2231 | if (unlikely(IS_ERR(req))) { | 2231 | if (IS_ERR(req)) { |
| 2232 | retval = PTR_ERR(req); | 2232 | retval = PTR_ERR(req); |
| 2233 | goto out; | 2233 | goto out; |
| 2234 | } | 2234 | } |
| @@ -2351,7 +2351,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter, | |||
| 2351 | goto out; | 2351 | goto out; |
| 2352 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, | 2352 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, |
| 2353 | adapter->pool.fsf_req_scsi); | 2353 | adapter->pool.fsf_req_scsi); |
| 2354 | if (unlikely(IS_ERR(req))) | 2354 | if (IS_ERR(req)) |
| 2355 | goto out; | 2355 | goto out; |
| 2356 | 2356 | ||
| 2357 | req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; | 2357 | req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; |
| @@ -2417,12 +2417,12 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter, | |||
| 2417 | return ERR_PTR(-EINVAL); | 2417 | return ERR_PTR(-EINVAL); |
| 2418 | } | 2418 | } |
| 2419 | 2419 | ||
| 2420 | spin_lock(&adapter->req_q.lock); | 2420 | spin_lock_bh(&adapter->req_q.lock); |
| 2421 | if (zfcp_fsf_req_sbal_get(adapter)) | 2421 | if (zfcp_fsf_req_sbal_get(adapter)) |
| 2422 | goto out; | 2422 | goto out; |
| 2423 | 2423 | ||
| 2424 | req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL); | 2424 | req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL); |
| 2425 | if (unlikely(IS_ERR(req))) { | 2425 | if (IS_ERR(req)) { |
| 2426 | retval = -EPERM; | 2426 | retval = -EPERM; |
| 2427 | goto out; | 2427 | goto out; |
| 2428 | } | 2428 | } |
| @@ -2447,7 +2447,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter, | |||
| 2447 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 2447 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
| 2448 | retval = zfcp_fsf_req_send(req); | 2448 | retval = zfcp_fsf_req_send(req); |
| 2449 | out: | 2449 | out: |
| 2450 | spin_unlock(&adapter->req_q.lock); | 2450 | spin_unlock_bh(&adapter->req_q.lock); |
| 2451 | 2451 | ||
| 2452 | if (!retval) { | 2452 | if (!retval) { |
| 2453 | wait_event(req->completion_wq, | 2453 | wait_event(req->completion_wq, |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index d6dbd653fde9..69d632d851d9 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
| @@ -423,9 +423,9 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter) | |||
| 423 | 423 | ||
| 424 | /* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */ | 424 | /* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */ |
| 425 | req_q = &adapter->req_q; | 425 | req_q = &adapter->req_q; |
| 426 | spin_lock(&req_q->lock); | 426 | spin_lock_bh(&req_q->lock); |
| 427 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status); | 427 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status); |
| 428 | spin_unlock(&req_q->lock); | 428 | spin_unlock_bh(&req_q->lock); |
| 429 | 429 | ||
| 430 | qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR); | 430 | qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR); |
| 431 | 431 | ||
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index c7f06298bd3c..4e0322b1c1ea 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -63,7 +63,7 @@ comment "SCSI support type (disk, tape, CD-ROM)" | |||
| 63 | config BLK_DEV_SD | 63 | config BLK_DEV_SD |
| 64 | tristate "SCSI disk support" | 64 | tristate "SCSI disk support" |
| 65 | depends on SCSI | 65 | depends on SCSI |
| 66 | select CRC_T10DIF | 66 | select CRC_T10DIF if BLK_DEV_INTEGRITY |
| 67 | ---help--- | 67 | ---help--- |
| 68 | If you want to use SCSI hard disks, Fibre Channel disks, | 68 | If you want to use SCSI hard disks, Fibre Channel disks, |
| 69 | Serial ATA (SATA) or Parallel ATA (PATA) hard disks, | 69 | Serial ATA (SATA) or Parallel ATA (PATA) hard disks, |
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 994da56fffed..708e475896b9 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c | |||
| @@ -425,7 +425,7 @@ static int alua_check_sense(struct scsi_device *sdev, | |||
| 425 | /* | 425 | /* |
| 426 | * LUN Not Accessible - ALUA state transition | 426 | * LUN Not Accessible - ALUA state transition |
| 427 | */ | 427 | */ |
| 428 | return NEEDS_RETRY; | 428 | return ADD_TO_MLQUEUE; |
| 429 | if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0b) | 429 | if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0b) |
| 430 | /* | 430 | /* |
| 431 | * LUN Not Accessible -- Target port in standby state | 431 | * LUN Not Accessible -- Target port in standby state |
| @@ -447,18 +447,18 @@ static int alua_check_sense(struct scsi_device *sdev, | |||
| 447 | /* | 447 | /* |
| 448 | * Power On, Reset, or Bus Device Reset, just retry. | 448 | * Power On, Reset, or Bus Device Reset, just retry. |
| 449 | */ | 449 | */ |
| 450 | return NEEDS_RETRY; | 450 | return ADD_TO_MLQUEUE; |
| 451 | if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x06) { | 451 | if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x06) { |
| 452 | /* | 452 | /* |
| 453 | * ALUA state changed | 453 | * ALUA state changed |
| 454 | */ | 454 | */ |
| 455 | return NEEDS_RETRY; | 455 | return ADD_TO_MLQUEUE; |
| 456 | } | 456 | } |
| 457 | if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x07) { | 457 | if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x07) { |
| 458 | /* | 458 | /* |
| 459 | * Implicit ALUA state transition failed | 459 | * Implicit ALUA state transition failed |
| 460 | */ | 460 | */ |
| 461 | return NEEDS_RETRY; | 461 | return ADD_TO_MLQUEUE; |
| 462 | } | 462 | } |
| 463 | break; | 463 | break; |
| 464 | } | 464 | } |
| @@ -490,7 +490,7 @@ static int alua_stpg(struct scsi_device *sdev, int state, | |||
| 490 | if (!err) | 490 | if (!err) |
| 491 | return SCSI_DH_IO; | 491 | return SCSI_DH_IO; |
| 492 | err = alua_check_sense(sdev, &sense_hdr); | 492 | err = alua_check_sense(sdev, &sense_hdr); |
| 493 | if (retry > 0 && err == NEEDS_RETRY) { | 493 | if (retry > 0 && err == ADD_TO_MLQUEUE) { |
| 494 | retry--; | 494 | retry--; |
| 495 | goto retry; | 495 | goto retry; |
| 496 | } | 496 | } |
| @@ -535,7 +535,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) | |||
| 535 | return SCSI_DH_IO; | 535 | return SCSI_DH_IO; |
| 536 | 536 | ||
| 537 | err = alua_check_sense(sdev, &sense_hdr); | 537 | err = alua_check_sense(sdev, &sense_hdr); |
| 538 | if (err == NEEDS_RETRY) | 538 | if (err == ADD_TO_MLQUEUE) |
| 539 | goto retry; | 539 | goto retry; |
| 540 | sdev_printk(KERN_INFO, sdev, | 540 | sdev_printk(KERN_INFO, sdev, |
| 541 | "%s: rtpg sense code %02x/%02x/%02x\n", | 541 | "%s: rtpg sense code %02x/%02x/%02x\n", |
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c index b9d23e9e9a44..ef693e8412e9 100644 --- a/drivers/scsi/device_handler/scsi_dh_emc.c +++ b/drivers/scsi/device_handler/scsi_dh_emc.c | |||
| @@ -439,7 +439,7 @@ static int clariion_check_sense(struct scsi_device *sdev, | |||
| 439 | * Unit Attention Code. This is the first IO | 439 | * Unit Attention Code. This is the first IO |
| 440 | * to the new path, so just retry. | 440 | * to the new path, so just retry. |
| 441 | */ | 441 | */ |
| 442 | return NEEDS_RETRY; | 442 | return ADD_TO_MLQUEUE; |
| 443 | break; | 443 | break; |
| 444 | } | 444 | } |
| 445 | 445 | ||
| @@ -514,7 +514,7 @@ retry: | |||
| 514 | return SCSI_DH_IO; | 514 | return SCSI_DH_IO; |
| 515 | 515 | ||
| 516 | err = clariion_check_sense(sdev, &sshdr); | 516 | err = clariion_check_sense(sdev, &sshdr); |
| 517 | if (retry > 0 && err == NEEDS_RETRY) { | 517 | if (retry > 0 && err == ADD_TO_MLQUEUE) { |
| 518 | retry--; | 518 | retry--; |
| 519 | goto retry; | 519 | goto retry; |
| 520 | } | 520 | } |
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index 2dee69da35cf..6e2f130d56de 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c | |||
| @@ -551,7 +551,7 @@ static int rdac_check_sense(struct scsi_device *sdev, | |||
| 551 | * | 551 | * |
| 552 | * Just retry and wait. | 552 | * Just retry and wait. |
| 553 | */ | 553 | */ |
| 554 | return NEEDS_RETRY; | 554 | return ADD_TO_MLQUEUE; |
| 555 | break; | 555 | break; |
| 556 | case ILLEGAL_REQUEST: | 556 | case ILLEGAL_REQUEST: |
| 557 | if (sense_hdr->asc == 0x94 && sense_hdr->ascq == 0x01) { | 557 | if (sense_hdr->asc == 0x94 && sense_hdr->ascq == 0x01) { |
| @@ -568,7 +568,7 @@ static int rdac_check_sense(struct scsi_device *sdev, | |||
| 568 | /* | 568 | /* |
| 569 | * Power On, Reset, or Bus Device Reset, just retry. | 569 | * Power On, Reset, or Bus Device Reset, just retry. |
| 570 | */ | 570 | */ |
| 571 | return NEEDS_RETRY; | 571 | return ADD_TO_MLQUEUE; |
| 572 | break; | 572 | break; |
| 573 | } | 573 | } |
| 574 | /* success just means we do not care what scsi-ml does */ | 574 | /* success just means we do not care what scsi-ml does */ |
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 880051c89bde..39ce3aba1dac 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -391,7 +391,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd) | |||
| 391 | 391 | ||
| 392 | case HARDWARE_ERROR: | 392 | case HARDWARE_ERROR: |
| 393 | if (scmd->device->retry_hwerror) | 393 | if (scmd->device->retry_hwerror) |
| 394 | return NEEDS_RETRY; | 394 | return ADD_TO_MLQUEUE; |
| 395 | else | 395 | else |
| 396 | return SUCCESS; | 396 | return SUCCESS; |
| 397 | 397 | ||
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 84b4879cff11..34d0de6cd511 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -1080,7 +1080,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, | |||
| 1080 | * PDT=1Fh none (no FDD connected to the requested logical unit) | 1080 | * PDT=1Fh none (no FDD connected to the requested logical unit) |
| 1081 | */ | 1081 | */ |
| 1082 | if (((result[0] >> 5) == 1 || starget->pdt_1f_for_no_lun) && | 1082 | if (((result[0] >> 5) == 1 || starget->pdt_1f_for_no_lun) && |
| 1083 | (result[0] & 0x1f) == 0x1f) { | 1083 | (result[0] & 0x1f) == 0x1f && |
| 1084 | !scsi_is_wlun(lun)) { | ||
| 1084 | SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO | 1085 | SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO |
| 1085 | "scsi scan: peripheral device type" | 1086 | "scsi scan: peripheral device type" |
| 1086 | " of 31, no device added\n")); | 1087 | " of 31, no device added\n")); |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2a2bc89aba83..e5e7d7856454 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1875,7 +1875,6 @@ static int sd_probe(struct device *dev) | |||
| 1875 | 1875 | ||
| 1876 | dev_set_drvdata(dev, sdkp); | 1876 | dev_set_drvdata(dev, sdkp); |
| 1877 | add_disk(gd); | 1877 | add_disk(gd); |
| 1878 | blk_register_filter(gd); | ||
| 1879 | sd_dif_config_host(sdkp); | 1878 | sd_dif_config_host(sdkp); |
| 1880 | 1879 | ||
| 1881 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", | 1880 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", |
| @@ -1909,7 +1908,6 @@ static int sd_remove(struct device *dev) | |||
| 1909 | struct scsi_disk *sdkp = dev_get_drvdata(dev); | 1908 | struct scsi_disk *sdkp = dev_get_drvdata(dev); |
| 1910 | 1909 | ||
| 1911 | device_del(&sdkp->dev); | 1910 | device_del(&sdkp->dev); |
| 1912 | blk_unregister_filter(sdkp->disk); | ||
| 1913 | del_gendisk(sdkp->disk); | 1911 | del_gendisk(sdkp->disk); |
| 1914 | sd_shutdown(dev); | 1912 | sd_shutdown(dev); |
| 1915 | 1913 | ||
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 3292965bfd84..27f5bfd1def3 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -656,7 +656,6 @@ static int sr_probe(struct device *dev) | |||
| 656 | dev_set_drvdata(dev, cd); | 656 | dev_set_drvdata(dev, cd); |
| 657 | disk->flags |= GENHD_FL_REMOVABLE; | 657 | disk->flags |= GENHD_FL_REMOVABLE; |
| 658 | add_disk(disk); | 658 | add_disk(disk); |
| 659 | blk_register_filter(disk); | ||
| 660 | 659 | ||
| 661 | sdev_printk(KERN_DEBUG, sdev, | 660 | sdev_printk(KERN_DEBUG, sdev, |
| 662 | "Attached scsi CD-ROM %s\n", cd->cdi.name); | 661 | "Attached scsi CD-ROM %s\n", cd->cdi.name); |
| @@ -895,7 +894,6 @@ static int sr_remove(struct device *dev) | |||
| 895 | { | 894 | { |
| 896 | struct scsi_cd *cd = dev_get_drvdata(dev); | 895 | struct scsi_cd *cd = dev_get_drvdata(dev); |
| 897 | 896 | ||
| 898 | blk_unregister_filter(cd->disk); | ||
| 899 | del_gendisk(cd->disk); | 897 | del_gendisk(cd->disk); |
| 900 | 898 | ||
| 901 | mutex_lock(&sr_ref_mutex); | 899 | mutex_lock(&sr_ref_mutex); |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 6a29f9330a73..3f90f1bbbbcd 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -127,8 +127,13 @@ | |||
| 127 | #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ | 127 | #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ |
| 128 | #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ | 128 | #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ |
| 129 | #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ | 129 | #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ |
| 130 | #define UCR3_REF25 (1<<3) /* Ref freq 25 MHz */ | 130 | #ifdef CONFIG_ARCH_IMX |
| 131 | #define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz */ | 131 | #define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ |
| 132 | #define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ | ||
| 133 | #endif | ||
| 134 | #if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3 | ||
| 135 | #define UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */ | ||
| 136 | #endif | ||
| 132 | #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ | 137 | #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ |
| 133 | #define UCR3_BPEN (1<<0) /* Preset registers enable */ | 138 | #define UCR3_BPEN (1<<0) /* Preset registers enable */ |
| 134 | #define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */ | 139 | #define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */ |
| @@ -445,7 +450,7 @@ static irqreturn_t imx_int(int irq, void *dev_id) | |||
| 445 | readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN) | 450 | readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN) |
| 446 | imx_txint(irq, dev_id); | 451 | imx_txint(irq, dev_id); |
| 447 | 452 | ||
| 448 | if (sts & USR1_RTSS) | 453 | if (sts & USR1_RTSD) |
| 449 | imx_rtsint(irq, dev_id); | 454 | imx_rtsint(irq, dev_id); |
| 450 | 455 | ||
| 451 | return IRQ_HANDLED; | 456 | return IRQ_HANDLED; |
| @@ -598,6 +603,12 @@ static int imx_startup(struct uart_port *port) | |||
| 598 | temp |= (UCR2_RXEN | UCR2_TXEN); | 603 | temp |= (UCR2_RXEN | UCR2_TXEN); |
| 599 | writel(temp, sport->port.membase + UCR2); | 604 | writel(temp, sport->port.membase + UCR2); |
| 600 | 605 | ||
| 606 | #if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3 | ||
| 607 | temp = readl(sport->port.membase + UCR3); | ||
| 608 | temp |= UCR3_RXDMUXSEL; | ||
| 609 | writel(temp, sport->port.membase + UCR3); | ||
| 610 | #endif | ||
| 611 | |||
| 601 | /* | 612 | /* |
| 602 | * Enable modem status interrupts | 613 | * Enable modem status interrupts |
| 603 | */ | 614 | */ |
| @@ -1133,13 +1144,19 @@ static int serial_imx_probe(struct platform_device *pdev) | |||
| 1133 | if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS)) | 1144 | if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS)) |
| 1134 | sport->have_rtscts = 1; | 1145 | sport->have_rtscts = 1; |
| 1135 | 1146 | ||
| 1136 | if (pdata->init) | 1147 | if (pdata->init) { |
| 1137 | pdata->init(pdev); | 1148 | ret = pdata->init(pdev); |
| 1149 | if (ret) | ||
| 1150 | goto clkput; | ||
| 1151 | } | ||
| 1138 | 1152 | ||
| 1139 | uart_add_one_port(&imx_reg, &sport->port); | 1153 | uart_add_one_port(&imx_reg, &sport->port); |
| 1140 | platform_set_drvdata(pdev, &sport->port); | 1154 | platform_set_drvdata(pdev, &sport->port); |
| 1141 | 1155 | ||
| 1142 | return 0; | 1156 | return 0; |
| 1157 | clkput: | ||
| 1158 | clk_put(sport->clk); | ||
| 1159 | clk_disable(sport->clk); | ||
| 1143 | unmap: | 1160 | unmap: |
| 1144 | iounmap(sport->port.membase); | 1161 | iounmap(sport->port.membase); |
| 1145 | free: | 1162 | free: |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 34c7c9875681..0e53354c1cfe 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -47,9 +47,10 @@ MODULE_ALIAS("platform:pxa2xx-spi"); | |||
| 47 | 47 | ||
| 48 | #define MAX_BUSES 3 | 48 | #define MAX_BUSES 3 |
| 49 | 49 | ||
| 50 | #define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR) | 50 | #define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR) |
| 51 | #define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK) | 51 | #define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK) |
| 52 | #define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0) | 52 | #define IS_DMA_ALIGNED(x) (((x) & 0x07) == 0) |
| 53 | #define MAX_DMA_LEN 8191 | ||
| 53 | 54 | ||
| 54 | /* | 55 | /* |
| 55 | * for testing SSCR1 changes that require SSP restart, basically | 56 | * for testing SSCR1 changes that require SSP restart, basically |
| @@ -144,7 +145,6 @@ struct driver_data { | |||
| 144 | size_t tx_map_len; | 145 | size_t tx_map_len; |
| 145 | u8 n_bytes; | 146 | u8 n_bytes; |
| 146 | u32 dma_width; | 147 | u32 dma_width; |
| 147 | int cs_change; | ||
| 148 | int (*write)(struct driver_data *drv_data); | 148 | int (*write)(struct driver_data *drv_data); |
| 149 | int (*read)(struct driver_data *drv_data); | 149 | int (*read)(struct driver_data *drv_data); |
| 150 | irqreturn_t (*transfer_handler)(struct driver_data *drv_data); | 150 | irqreturn_t (*transfer_handler)(struct driver_data *drv_data); |
| @@ -406,8 +406,45 @@ static void giveback(struct driver_data *drv_data) | |||
| 406 | struct spi_transfer, | 406 | struct spi_transfer, |
| 407 | transfer_list); | 407 | transfer_list); |
| 408 | 408 | ||
| 409 | /* Delay if requested before any change in chip select */ | ||
| 410 | if (last_transfer->delay_usecs) | ||
| 411 | udelay(last_transfer->delay_usecs); | ||
| 412 | |||
| 413 | /* Drop chip select UNLESS cs_change is true or we are returning | ||
| 414 | * a message with an error, or next message is for another chip | ||
| 415 | */ | ||
| 409 | if (!last_transfer->cs_change) | 416 | if (!last_transfer->cs_change) |
| 410 | drv_data->cs_control(PXA2XX_CS_DEASSERT); | 417 | drv_data->cs_control(PXA2XX_CS_DEASSERT); |
| 418 | else { | ||
| 419 | struct spi_message *next_msg; | ||
| 420 | |||
| 421 | /* Holding of cs was hinted, but we need to make sure | ||
| 422 | * the next message is for the same chip. Don't waste | ||
| 423 | * time with the following tests unless this was hinted. | ||
| 424 | * | ||
| 425 | * We cannot postpone this until pump_messages, because | ||
| 426 | * after calling msg->complete (below) the driver that | ||
| 427 | * sent the current message could be unloaded, which | ||
| 428 | * could invalidate the cs_control() callback... | ||
| 429 | */ | ||
| 430 | |||
| 431 | /* get a pointer to the next message, if any */ | ||
| 432 | spin_lock_irqsave(&drv_data->lock, flags); | ||
| 433 | if (list_empty(&drv_data->queue)) | ||
| 434 | next_msg = NULL; | ||
| 435 | else | ||
| 436 | next_msg = list_entry(drv_data->queue.next, | ||
| 437 | struct spi_message, queue); | ||
| 438 | spin_unlock_irqrestore(&drv_data->lock, flags); | ||
| 439 | |||
| 440 | /* see if the next and current messages point | ||
| 441 | * to the same chip | ||
| 442 | */ | ||
| 443 | if (next_msg && next_msg->spi != msg->spi) | ||
| 444 | next_msg = NULL; | ||
| 445 | if (!next_msg || msg->state == ERROR_STATE) | ||
| 446 | drv_data->cs_control(PXA2XX_CS_DEASSERT); | ||
| 447 | } | ||
| 411 | 448 | ||
| 412 | msg->state = NULL; | 449 | msg->state = NULL; |
| 413 | if (msg->complete) | 450 | if (msg->complete) |
| @@ -490,10 +527,9 @@ static void dma_transfer_complete(struct driver_data *drv_data) | |||
| 490 | msg->actual_length += drv_data->len - | 527 | msg->actual_length += drv_data->len - |
| 491 | (drv_data->rx_end - drv_data->rx); | 528 | (drv_data->rx_end - drv_data->rx); |
| 492 | 529 | ||
| 493 | /* Release chip select if requested, transfer delays are | 530 | /* Transfer delays and chip select release are |
| 494 | * handled in pump_transfers */ | 531 | * handled in pump_transfers or giveback |
| 495 | if (drv_data->cs_change) | 532 | */ |
| 496 | drv_data->cs_control(PXA2XX_CS_DEASSERT); | ||
| 497 | 533 | ||
| 498 | /* Move to next transfer */ | 534 | /* Move to next transfer */ |
| 499 | msg->state = next_transfer(drv_data); | 535 | msg->state = next_transfer(drv_data); |
| @@ -602,10 +638,9 @@ static void int_transfer_complete(struct driver_data *drv_data) | |||
| 602 | drv_data->cur_msg->actual_length += drv_data->len - | 638 | drv_data->cur_msg->actual_length += drv_data->len - |
| 603 | (drv_data->rx_end - drv_data->rx); | 639 | (drv_data->rx_end - drv_data->rx); |
| 604 | 640 | ||
| 605 | /* Release chip select if requested, transfer delays are | 641 | /* Transfer delays and chip select release are |
| 606 | * handled in pump_transfers */ | 642 | * handled in pump_transfers or giveback |
| 607 | if (drv_data->cs_change) | 643 | */ |
| 608 | drv_data->cs_control(PXA2XX_CS_DEASSERT); | ||
| 609 | 644 | ||
| 610 | /* Move to next transfer */ | 645 | /* Move to next transfer */ |
| 611 | drv_data->cur_msg->state = next_transfer(drv_data); | 646 | drv_data->cur_msg->state = next_transfer(drv_data); |
| @@ -840,23 +875,40 @@ static void pump_transfers(unsigned long data) | |||
| 840 | return; | 875 | return; |
| 841 | } | 876 | } |
| 842 | 877 | ||
| 843 | /* Delay if requested at end of transfer*/ | 878 | /* Delay if requested at end of transfer before CS change */ |
| 844 | if (message->state == RUNNING_STATE) { | 879 | if (message->state == RUNNING_STATE) { |
| 845 | previous = list_entry(transfer->transfer_list.prev, | 880 | previous = list_entry(transfer->transfer_list.prev, |
| 846 | struct spi_transfer, | 881 | struct spi_transfer, |
| 847 | transfer_list); | 882 | transfer_list); |
| 848 | if (previous->delay_usecs) | 883 | if (previous->delay_usecs) |
| 849 | udelay(previous->delay_usecs); | 884 | udelay(previous->delay_usecs); |
| 885 | |||
| 886 | /* Drop chip select only if cs_change is requested */ | ||
| 887 | if (previous->cs_change) | ||
| 888 | drv_data->cs_control(PXA2XX_CS_DEASSERT); | ||
| 850 | } | 889 | } |
| 851 | 890 | ||
| 852 | /* Check transfer length */ | 891 | /* Check for transfers that need multiple DMA segments */ |
| 853 | if (transfer->len > 8191) | 892 | if (transfer->len > MAX_DMA_LEN && chip->enable_dma) { |
| 854 | { | 893 | |
| 855 | dev_warn(&drv_data->pdev->dev, "pump_transfers: transfer " | 894 | /* reject already-mapped transfers; PIO won't always work */ |
| 856 | "length greater than 8191\n"); | 895 | if (message->is_dma_mapped |
| 857 | message->status = -EINVAL; | 896 | || transfer->rx_dma || transfer->tx_dma) { |
| 858 | giveback(drv_data); | 897 | dev_err(&drv_data->pdev->dev, |
| 859 | return; | 898 | "pump_transfers: mapped transfer length " |
| 899 | "of %lu is greater than %d\n", | ||
| 900 | transfer->len, MAX_DMA_LEN); | ||
| 901 | message->status = -EINVAL; | ||
| 902 | giveback(drv_data); | ||
| 903 | return; | ||
| 904 | } | ||
| 905 | |||
| 906 | /* warn ... we force this to PIO mode */ | ||
| 907 | if (printk_ratelimit()) | ||
| 908 | dev_warn(&message->spi->dev, "pump_transfers: " | ||
| 909 | "DMA disabled for transfer length %ld " | ||
| 910 | "greater than %d\n", | ||
| 911 | (long)drv_data->len, MAX_DMA_LEN); | ||
| 860 | } | 912 | } |
| 861 | 913 | ||
| 862 | /* Setup the transfer state based on the type of transfer */ | 914 | /* Setup the transfer state based on the type of transfer */ |
| @@ -878,7 +930,6 @@ static void pump_transfers(unsigned long data) | |||
| 878 | drv_data->len = transfer->len & DCMD_LENGTH; | 930 | drv_data->len = transfer->len & DCMD_LENGTH; |
| 879 | drv_data->write = drv_data->tx ? chip->write : null_writer; | 931 | drv_data->write = drv_data->tx ? chip->write : null_writer; |
| 880 | drv_data->read = drv_data->rx ? chip->read : null_reader; | 932 | drv_data->read = drv_data->rx ? chip->read : null_reader; |
| 881 | drv_data->cs_change = transfer->cs_change; | ||
| 882 | 933 | ||
| 883 | /* Change speed and bit per word on a per transfer */ | 934 | /* Change speed and bit per word on a per transfer */ |
| 884 | cr0 = chip->cr0; | 935 | cr0 = chip->cr0; |
| @@ -925,7 +976,7 @@ static void pump_transfers(unsigned long data) | |||
| 925 | &dma_thresh)) | 976 | &dma_thresh)) |
| 926 | if (printk_ratelimit()) | 977 | if (printk_ratelimit()) |
| 927 | dev_warn(&message->spi->dev, | 978 | dev_warn(&message->spi->dev, |
| 928 | "pump_transfer: " | 979 | "pump_transfers: " |
| 929 | "DMA burst size reduced to " | 980 | "DMA burst size reduced to " |
| 930 | "match bits_per_word\n"); | 981 | "match bits_per_word\n"); |
| 931 | } | 982 | } |
| @@ -939,8 +990,23 @@ static void pump_transfers(unsigned long data) | |||
| 939 | 990 | ||
| 940 | message->state = RUNNING_STATE; | 991 | message->state = RUNNING_STATE; |
| 941 | 992 | ||
| 942 | /* Try to map dma buffer and do a dma transfer if successful */ | 993 | /* Try to map dma buffer and do a dma transfer if successful, but |
| 943 | if ((drv_data->dma_mapped = map_dma_buffers(drv_data))) { | 994 | * only if the length is non-zero and less than MAX_DMA_LEN. |
| 995 | * | ||
| 996 | * Zero-length non-descriptor DMA is illegal on PXA2xx; force use | ||
| 997 | * of PIO instead. Care is needed above because the transfer may | ||
| 998 | * have have been passed with buffers that are already dma mapped. | ||
| 999 | * A zero-length transfer in PIO mode will not try to write/read | ||
| 1000 | * to/from the buffers | ||
| 1001 | * | ||
| 1002 | * REVISIT large transfers are exactly where we most want to be | ||
| 1003 | * using DMA. If this happens much, split those transfers into | ||
| 1004 | * multiple DMA segments rather than forcing PIO. | ||
| 1005 | */ | ||
| 1006 | drv_data->dma_mapped = 0; | ||
| 1007 | if (drv_data->len > 0 && drv_data->len <= MAX_DMA_LEN) | ||
| 1008 | drv_data->dma_mapped = map_dma_buffers(drv_data); | ||
| 1009 | if (drv_data->dma_mapped) { | ||
| 944 | 1010 | ||
| 945 | /* Ensure we have the correct interrupt handler */ | 1011 | /* Ensure we have the correct interrupt handler */ |
| 946 | drv_data->transfer_handler = dma_transfer; | 1012 | drv_data->transfer_handler = dma_transfer; |
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 070c6219e2d6..ac0e3e4b3c54 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
| @@ -267,16 +267,13 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) | |||
| 267 | cs->hw_mode |= SPMODE_LEN(bits_per_word); | 267 | cs->hw_mode |= SPMODE_LEN(bits_per_word); |
| 268 | 268 | ||
| 269 | if ((mpc83xx_spi->spibrg / hz) > 64) { | 269 | if ((mpc83xx_spi->spibrg / hz) > 64) { |
| 270 | cs->hw_mode |= SPMODE_DIV16; | ||
| 270 | pm = mpc83xx_spi->spibrg / (hz * 64); | 271 | pm = mpc83xx_spi->spibrg / (hz * 64); |
| 271 | if (pm > 16) { | 272 | if (pm > 16) { |
| 272 | cs->hw_mode |= SPMODE_DIV16; | 273 | dev_err(&spi->dev, "Requested speed is too " |
| 273 | pm /= 16; | 274 | "low: %d Hz. Will use %d Hz instead.\n", |
| 274 | if (pm > 16) { | 275 | hz, mpc83xx_spi->spibrg / 1024); |
| 275 | dev_err(&spi->dev, "Requested speed is too " | 276 | pm = 16; |
| 276 | "low: %d Hz. Will use %d Hz instead.\n", | ||
| 277 | hz, mpc83xx_spi->spibrg / 1024); | ||
| 278 | pm = 16; | ||
| 279 | } | ||
| 280 | } | 277 | } |
| 281 | } else | 278 | } else |
| 282 | pm = mpc83xx_spi->spibrg / (hz * 4); | 279 | pm = mpc83xx_spi->spibrg / (hz * 4); |
| @@ -315,11 +312,20 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
| 315 | if (t->bits_per_word) | 312 | if (t->bits_per_word) |
| 316 | bits_per_word = t->bits_per_word; | 313 | bits_per_word = t->bits_per_word; |
| 317 | len = t->len; | 314 | len = t->len; |
| 318 | if (bits_per_word > 8) | 315 | if (bits_per_word > 8) { |
| 316 | /* invalid length? */ | ||
| 317 | if (len & 1) | ||
| 318 | return -EINVAL; | ||
| 319 | len /= 2; | 319 | len /= 2; |
| 320 | if (bits_per_word > 16) | 320 | } |
| 321 | if (bits_per_word > 16) { | ||
| 322 | /* invalid length? */ | ||
| 323 | if (len & 1) | ||
| 324 | return -EINVAL; | ||
| 321 | len /= 2; | 325 | len /= 2; |
| 326 | } | ||
| 322 | mpc83xx_spi->count = len; | 327 | mpc83xx_spi->count = len; |
| 328 | |||
| 323 | INIT_COMPLETION(mpc83xx_spi->done); | 329 | INIT_COMPLETION(mpc83xx_spi->done); |
| 324 | 330 | ||
| 325 | /* enable rx ints */ | 331 | /* enable rx ints */ |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 98abc73c1a1d..3eb414b84a9d 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
| @@ -430,7 +430,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev) | |||
| 430 | #endif | 430 | #endif |
| 431 | 431 | ||
| 432 | MODULE_ALIAS("platform:s3c2410-spi"); | 432 | MODULE_ALIAS("platform:s3c2410-spi"); |
| 433 | static struct platform_driver s3c24xx_spidrv = { | 433 | static struct platform_driver s3c24xx_spi_driver = { |
| 434 | .remove = __exit_p(s3c24xx_spi_remove), | 434 | .remove = __exit_p(s3c24xx_spi_remove), |
| 435 | .suspend = s3c24xx_spi_suspend, | 435 | .suspend = s3c24xx_spi_suspend, |
| 436 | .resume = s3c24xx_spi_resume, | 436 | .resume = s3c24xx_spi_resume, |
| @@ -442,12 +442,12 @@ static struct platform_driver s3c24xx_spidrv = { | |||
| 442 | 442 | ||
| 443 | static int __init s3c24xx_spi_init(void) | 443 | static int __init s3c24xx_spi_init(void) |
| 444 | { | 444 | { |
| 445 | return platform_driver_probe(&s3c24xx_spidrv, s3c24xx_spi_probe); | 445 | return platform_driver_probe(&s3c24xx_spi_driver, s3c24xx_spi_probe); |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | static void __exit s3c24xx_spi_exit(void) | 448 | static void __exit s3c24xx_spi_exit(void) |
| 449 | { | 449 | { |
| 450 | platform_driver_unregister(&s3c24xx_spidrv); | 450 | platform_driver_unregister(&s3c24xx_spi_driver); |
| 451 | } | 451 | } |
| 452 | 452 | ||
| 453 | module_init(s3c24xx_spi_init); | 453 | module_init(s3c24xx_spi_init); |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 5a24c6411d34..75dac578104f 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
| @@ -208,6 +208,36 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2) | |||
| 208 | return value; | 208 | return value; |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | static void atmel_lcdfb_stop_nowait(struct atmel_lcdfb_info *sinfo) | ||
| 212 | { | ||
| 213 | /* Turn off the LCD controller and the DMA controller */ | ||
| 214 | lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, | ||
| 215 | sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET); | ||
| 216 | |||
| 217 | /* Wait for the LCDC core to become idle */ | ||
| 218 | while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY) | ||
| 219 | msleep(10); | ||
| 220 | |||
| 221 | lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0); | ||
| 222 | } | ||
| 223 | |||
| 224 | static void atmel_lcdfb_stop(struct atmel_lcdfb_info *sinfo) | ||
| 225 | { | ||
| 226 | atmel_lcdfb_stop_nowait(sinfo); | ||
| 227 | |||
| 228 | /* Wait for DMA engine to become idle... */ | ||
| 229 | while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY) | ||
| 230 | msleep(10); | ||
| 231 | } | ||
| 232 | |||
| 233 | static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo) | ||
| 234 | { | ||
| 235 | lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon); | ||
| 236 | lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, | ||
| 237 | (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ||
| 238 | | ATMEL_LCDC_PWR); | ||
| 239 | } | ||
| 240 | |||
| 211 | static void atmel_lcdfb_update_dma(struct fb_info *info, | 241 | static void atmel_lcdfb_update_dma(struct fb_info *info, |
| 212 | struct fb_var_screeninfo *var) | 242 | struct fb_var_screeninfo *var) |
| 213 | { | 243 | { |
| @@ -420,26 +450,8 @@ static void atmel_lcdfb_reset(struct atmel_lcdfb_info *sinfo) | |||
| 420 | { | 450 | { |
| 421 | might_sleep(); | 451 | might_sleep(); |
| 422 | 452 | ||
| 423 | /* LCD power off */ | 453 | atmel_lcdfb_stop(sinfo); |
| 424 | lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET); | 454 | atmel_lcdfb_start(sinfo); |
| 425 | |||
| 426 | /* wait for the LCDC core to become idle */ | ||
| 427 | while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY) | ||
| 428 | msleep(10); | ||
| 429 | |||
| 430 | /* DMA disable */ | ||
| 431 | lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0); | ||
| 432 | |||
| 433 | /* wait for DMA engine to become idle */ | ||
| 434 | while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY) | ||
| 435 | msleep(10); | ||
| 436 | |||
| 437 | /* LCD power on */ | ||
| 438 | lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, | ||
| 439 | (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); | ||
| 440 | |||
| 441 | /* DMA enable */ | ||
| 442 | lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon); | ||
| 443 | } | 455 | } |
| 444 | 456 | ||
| 445 | /** | 457 | /** |
| @@ -471,14 +483,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info) | |||
| 471 | info->var.xres, info->var.yres, | 483 | info->var.xres, info->var.yres, |
| 472 | info->var.xres_virtual, info->var.yres_virtual); | 484 | info->var.xres_virtual, info->var.yres_virtual); |
| 473 | 485 | ||
| 474 | /* Turn off the LCD controller and the DMA controller */ | 486 | atmel_lcdfb_stop_nowait(sinfo); |
| 475 | lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET); | ||
| 476 | |||
| 477 | /* Wait for the LCDC core to become idle */ | ||
| 478 | while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY) | ||
| 479 | msleep(10); | ||
| 480 | |||
| 481 | lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0); | ||
| 482 | 487 | ||
| 483 | if (info->var.bits_per_pixel == 1) | 488 | if (info->var.bits_per_pixel == 1) |
| 484 | info->fix.visual = FB_VISUAL_MONO01; | 489 | info->fix.visual = FB_VISUAL_MONO01; |
| @@ -583,13 +588,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info) | |||
| 583 | while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY) | 588 | while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY) |
| 584 | msleep(10); | 589 | msleep(10); |
| 585 | 590 | ||
| 586 | dev_dbg(info->device, " * re-enable DMA engine\n"); | 591 | atmel_lcdfb_start(sinfo); |
| 587 | /* ...and enable it with updated configuration */ | ||
| 588 | lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon); | ||
| 589 | |||
| 590 | dev_dbg(info->device, " * re-enable LCDC core\n"); | ||
| 591 | lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, | ||
| 592 | (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); | ||
| 593 | 592 | ||
| 594 | dev_dbg(info->device, " * DONE\n"); | 593 | dev_dbg(info->device, " * DONE\n"); |
| 595 | 594 | ||
| @@ -1032,11 +1031,20 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg) | |||
| 1032 | struct fb_info *info = platform_get_drvdata(pdev); | 1031 | struct fb_info *info = platform_get_drvdata(pdev); |
| 1033 | struct atmel_lcdfb_info *sinfo = info->par; | 1032 | struct atmel_lcdfb_info *sinfo = info->par; |
| 1034 | 1033 | ||
| 1034 | /* | ||
| 1035 | * We don't want to handle interrupts while the clock is | ||
| 1036 | * stopped. It may take forever. | ||
| 1037 | */ | ||
| 1038 | lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL); | ||
| 1039 | |||
| 1035 | sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); | 1040 | sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); |
| 1036 | lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); | 1041 | lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); |
| 1037 | if (sinfo->atmel_lcdfb_power_control) | 1042 | if (sinfo->atmel_lcdfb_power_control) |
| 1038 | sinfo->atmel_lcdfb_power_control(0); | 1043 | sinfo->atmel_lcdfb_power_control(0); |
| 1044 | |||
| 1045 | atmel_lcdfb_stop(sinfo); | ||
| 1039 | atmel_lcdfb_stop_clock(sinfo); | 1046 | atmel_lcdfb_stop_clock(sinfo); |
| 1047 | |||
| 1040 | return 0; | 1048 | return 0; |
| 1041 | } | 1049 | } |
| 1042 | 1050 | ||
| @@ -1046,9 +1054,15 @@ static int atmel_lcdfb_resume(struct platform_device *pdev) | |||
| 1046 | struct atmel_lcdfb_info *sinfo = info->par; | 1054 | struct atmel_lcdfb_info *sinfo = info->par; |
| 1047 | 1055 | ||
| 1048 | atmel_lcdfb_start_clock(sinfo); | 1056 | atmel_lcdfb_start_clock(sinfo); |
| 1057 | atmel_lcdfb_start(sinfo); | ||
| 1049 | if (sinfo->atmel_lcdfb_power_control) | 1058 | if (sinfo->atmel_lcdfb_power_control) |
| 1050 | sinfo->atmel_lcdfb_power_control(1); | 1059 | sinfo->atmel_lcdfb_power_control(1); |
| 1051 | lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon); | 1060 | lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon); |
| 1061 | |||
| 1062 | /* Enable FIFO & DMA errors */ | ||
| 1063 | lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI | ||
| 1064 | | ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI); | ||
| 1065 | |||
| 1052 | return 0; | 1066 | return 0; |
| 1053 | } | 1067 | } |
| 1054 | 1068 | ||
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c index 87ee5ccee348..ed8feb052df9 100644 --- a/fs/bfs/dir.c +++ b/fs/bfs/dir.c | |||
| @@ -125,8 +125,8 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
| 125 | inode->i_ino); | 125 | inode->i_ino); |
| 126 | if (err) { | 126 | if (err) { |
| 127 | inode_dec_link_count(inode); | 127 | inode_dec_link_count(inode); |
| 128 | iput(inode); | ||
| 129 | mutex_unlock(&info->bfs_lock); | 128 | mutex_unlock(&info->bfs_lock); |
| 129 | iput(inode); | ||
| 130 | return err; | 130 | return err; |
| 131 | } | 131 | } |
| 132 | mutex_unlock(&info->bfs_lock); | 132 | mutex_unlock(&info->bfs_lock); |
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 506c24fb5078..a53da1466277 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
| @@ -594,7 +594,7 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, | |||
| 594 | goto bail; | 594 | goto bail; |
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | if (!ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)) && !p_blkno) { | 597 | if (!ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)) && !p_blkno && create) { |
| 598 | ocfs2_error(inode->i_sb, | 598 | ocfs2_error(inode->i_sb, |
| 599 | "Inode %llu has a hole at block %llu\n", | 599 | "Inode %llu has a hole at block %llu\n", |
| 600 | (unsigned long long)OCFS2_I(inode)->ip_blkno, | 600 | (unsigned long long)OCFS2_I(inode)->ip_blkno, |
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 7d6b34e201db..ecc3330972e5 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c | |||
| @@ -499,9 +499,9 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev) | |||
| 499 | if (!size) | 499 | if (!size) |
| 500 | continue; | 500 | continue; |
| 501 | if (from + size > get_capacity(disk)) { | 501 | if (from + size > get_capacity(disk)) { |
| 502 | printk(KERN_ERR " %s: p%d exceeds device capacity\n", | 502 | printk(KERN_WARNING |
| 503 | "%s: p%d exceeds device capacity\n", | ||
| 503 | disk->disk_name, p); | 504 | disk->disk_name, p); |
| 504 | continue; | ||
| 505 | } | 505 | } |
| 506 | res = add_partition(disk, p, from, size, state->parts[p].flags); | 506 | res = add_partition(disk, p, from, size, state->parts[p].flags); |
| 507 | if (res) { | 507 | if (res) { |
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index bca0f81eb687..7821589a17d5 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
| @@ -547,8 +547,8 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp | |||
| 547 | 547 | ||
| 548 | for (tmp = dir->subdir; tmp; tmp = tmp->next) | 548 | for (tmp = dir->subdir; tmp; tmp = tmp->next) |
| 549 | if (strcmp(tmp->name, dp->name) == 0) { | 549 | if (strcmp(tmp->name, dp->name) == 0) { |
| 550 | printk(KERN_WARNING "proc_dir_entry '%s' already " | 550 | printk(KERN_WARNING "proc_dir_entry '%s/%s' already registered\n", |
| 551 | "registered\n", dp->name); | 551 | dir->name, dp->name); |
| 552 | dump_stack(); | 552 | dump_stack(); |
| 553 | break; | 553 | break; |
| 554 | } | 554 | } |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 00f10a2dcf12..29e20c6b1f7f 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -183,6 +183,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 183 | "SReclaimable: %8lu kB\n" | 183 | "SReclaimable: %8lu kB\n" |
| 184 | "SUnreclaim: %8lu kB\n" | 184 | "SUnreclaim: %8lu kB\n" |
| 185 | "PageTables: %8lu kB\n" | 185 | "PageTables: %8lu kB\n" |
| 186 | #ifdef CONFIG_QUICKLIST | ||
| 187 | "Quicklists: %8lu kB\n" | ||
| 188 | #endif | ||
| 186 | "NFS_Unstable: %8lu kB\n" | 189 | "NFS_Unstable: %8lu kB\n" |
| 187 | "Bounce: %8lu kB\n" | 190 | "Bounce: %8lu kB\n" |
| 188 | "WritebackTmp: %8lu kB\n" | 191 | "WritebackTmp: %8lu kB\n" |
| @@ -190,8 +193,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 190 | "Committed_AS: %8lu kB\n" | 193 | "Committed_AS: %8lu kB\n" |
| 191 | "VmallocTotal: %8lu kB\n" | 194 | "VmallocTotal: %8lu kB\n" |
| 192 | "VmallocUsed: %8lu kB\n" | 195 | "VmallocUsed: %8lu kB\n" |
| 193 | "VmallocChunk: %8lu kB\n" | 196 | "VmallocChunk: %8lu kB\n", |
| 194 | "Quicklists: %8lu kB\n", | ||
| 195 | K(i.totalram), | 197 | K(i.totalram), |
| 196 | K(i.freeram), | 198 | K(i.freeram), |
| 197 | K(i.bufferram), | 199 | K(i.bufferram), |
| @@ -216,6 +218,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 216 | K(global_page_state(NR_SLAB_RECLAIMABLE)), | 218 | K(global_page_state(NR_SLAB_RECLAIMABLE)), |
| 217 | K(global_page_state(NR_SLAB_UNRECLAIMABLE)), | 219 | K(global_page_state(NR_SLAB_UNRECLAIMABLE)), |
| 218 | K(global_page_state(NR_PAGETABLE)), | 220 | K(global_page_state(NR_PAGETABLE)), |
| 221 | #ifdef CONFIG_QUICKLIST | ||
| 222 | K(quicklist_total_size()), | ||
| 223 | #endif | ||
| 219 | K(global_page_state(NR_UNSTABLE_NFS)), | 224 | K(global_page_state(NR_UNSTABLE_NFS)), |
| 220 | K(global_page_state(NR_BOUNCE)), | 225 | K(global_page_state(NR_BOUNCE)), |
| 221 | K(global_page_state(NR_WRITEBACK_TEMP)), | 226 | K(global_page_state(NR_WRITEBACK_TEMP)), |
| @@ -223,8 +228,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 223 | K(committed), | 228 | K(committed), |
| 224 | (unsigned long)VMALLOC_TOTAL >> 10, | 229 | (unsigned long)VMALLOC_TOTAL >> 10, |
| 225 | vmi.used >> 10, | 230 | vmi.used >> 10, |
| 226 | vmi.largest_chunk >> 10, | 231 | vmi.largest_chunk >> 10 |
| 227 | K(quicklist_total_size()) | ||
| 228 | ); | 232 | ); |
| 229 | 233 | ||
| 230 | len += hugetlb_report_meminfo(page + len); | 234 | len += hugetlb_report_meminfo(page + len); |
diff --git a/fs/udf/file.c b/fs/udf/file.c index 0ed6e146a0d9..eb91f3b70320 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
| @@ -211,6 +211,7 @@ const struct file_operations udf_file_operations = { | |||
| 211 | .release = udf_release_file, | 211 | .release = udf_release_file, |
| 212 | .fsync = udf_fsync_file, | 212 | .fsync = udf_fsync_file, |
| 213 | .splice_read = generic_file_splice_read, | 213 | .splice_read = generic_file_splice_read, |
| 214 | .llseek = generic_file_llseek, | ||
| 214 | }; | 215 | }; |
| 215 | 216 | ||
| 216 | const struct inode_operations udf_file_inode_operations = { | 217 | const struct inode_operations udf_file_inode_operations = { |
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c index eb9cfa23dc3d..a4f2b3ce45b0 100644 --- a/fs/udf/ialloc.c +++ b/fs/udf/ialloc.c | |||
| @@ -76,11 +76,24 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
| 76 | *err = -ENOSPC; | 76 | *err = -ENOSPC; |
| 77 | 77 | ||
| 78 | iinfo = UDF_I(inode); | 78 | iinfo = UDF_I(inode); |
| 79 | iinfo->i_unique = 0; | 79 | if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) { |
| 80 | iinfo->i_lenExtents = 0; | 80 | iinfo->i_efe = 1; |
| 81 | iinfo->i_next_alloc_block = 0; | 81 | if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev) |
| 82 | iinfo->i_next_alloc_goal = 0; | 82 | sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE; |
| 83 | iinfo->i_strat4096 = 0; | 83 | iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize - |
| 84 | sizeof(struct extendedFileEntry), | ||
| 85 | GFP_KERNEL); | ||
| 86 | } else { | ||
| 87 | iinfo->i_efe = 0; | ||
| 88 | iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize - | ||
| 89 | sizeof(struct fileEntry), | ||
| 90 | GFP_KERNEL); | ||
| 91 | } | ||
| 92 | if (!iinfo->i_ext.i_data) { | ||
| 93 | iput(inode); | ||
| 94 | *err = -ENOMEM; | ||
| 95 | return NULL; | ||
| 96 | } | ||
| 84 | 97 | ||
| 85 | block = udf_new_block(dir->i_sb, NULL, | 98 | block = udf_new_block(dir->i_sb, NULL, |
| 86 | dinfo->i_location.partitionReferenceNum, | 99 | dinfo->i_location.partitionReferenceNum, |
| @@ -111,6 +124,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
| 111 | lvhd->uniqueID = cpu_to_le64(uniqueID); | 124 | lvhd->uniqueID = cpu_to_le64(uniqueID); |
| 112 | mark_buffer_dirty(sbi->s_lvid_bh); | 125 | mark_buffer_dirty(sbi->s_lvid_bh); |
| 113 | } | 126 | } |
| 127 | mutex_unlock(&sbi->s_alloc_mutex); | ||
| 114 | inode->i_mode = mode; | 128 | inode->i_mode = mode; |
| 115 | inode->i_uid = current->fsuid; | 129 | inode->i_uid = current->fsuid; |
| 116 | if (dir->i_mode & S_ISGID) { | 130 | if (dir->i_mode & S_ISGID) { |
| @@ -129,25 +143,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
| 129 | iinfo->i_lenEAttr = 0; | 143 | iinfo->i_lenEAttr = 0; |
| 130 | iinfo->i_lenAlloc = 0; | 144 | iinfo->i_lenAlloc = 0; |
| 131 | iinfo->i_use = 0; | 145 | iinfo->i_use = 0; |
| 132 | if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) { | ||
| 133 | iinfo->i_efe = 1; | ||
| 134 | if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev) | ||
| 135 | sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE; | ||
| 136 | iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize - | ||
| 137 | sizeof(struct extendedFileEntry), | ||
| 138 | GFP_KERNEL); | ||
| 139 | } else { | ||
| 140 | iinfo->i_efe = 0; | ||
| 141 | iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize - | ||
| 142 | sizeof(struct fileEntry), | ||
| 143 | GFP_KERNEL); | ||
| 144 | } | ||
| 145 | if (!iinfo->i_ext.i_data) { | ||
| 146 | iput(inode); | ||
| 147 | *err = -ENOMEM; | ||
| 148 | mutex_unlock(&sbi->s_alloc_mutex); | ||
| 149 | return NULL; | ||
| 150 | } | ||
| 151 | if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_AD_IN_ICB)) | 146 | if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_AD_IN_ICB)) |
| 152 | iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB; | 147 | iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB; |
| 153 | else if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_SHORT_AD)) | 148 | else if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_SHORT_AD)) |
| @@ -158,7 +153,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
| 158 | iinfo->i_crtime = current_fs_time(inode->i_sb); | 153 | iinfo->i_crtime = current_fs_time(inode->i_sb); |
| 159 | insert_inode_hash(inode); | 154 | insert_inode_hash(inode); |
| 160 | mark_inode_dirty(inode); | 155 | mark_inode_dirty(inode); |
| 161 | mutex_unlock(&sbi->s_alloc_mutex); | ||
| 162 | 156 | ||
| 163 | if (DQUOT_ALLOC_INODE(inode)) { | 157 | if (DQUOT_ALLOC_INODE(inode)) { |
| 164 | DQUOT_DROP(inode); | 158 | DQUOT_DROP(inode); |
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index f42f80a3b1fa..a44d68eb50b5 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
| @@ -1338,6 +1338,10 @@ __xfs_get_blocks( | |||
| 1338 | offset = (xfs_off_t)iblock << inode->i_blkbits; | 1338 | offset = (xfs_off_t)iblock << inode->i_blkbits; |
| 1339 | ASSERT(bh_result->b_size >= (1 << inode->i_blkbits)); | 1339 | ASSERT(bh_result->b_size >= (1 << inode->i_blkbits)); |
| 1340 | size = bh_result->b_size; | 1340 | size = bh_result->b_size; |
| 1341 | |||
| 1342 | if (!create && direct && offset >= i_size_read(inode)) | ||
| 1343 | return 0; | ||
| 1344 | |||
| 1341 | error = xfs_iomap(XFS_I(inode), offset, size, | 1345 | error = xfs_iomap(XFS_I(inode), offset, size, |
| 1342 | create ? flags : BMAPI_READ, &iomap, &niomap); | 1346 | create ? flags : BMAPI_READ, &iomap, &niomap); |
| 1343 | if (error) | 1347 | if (error) |
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 73c65f19e549..18d3c8487835 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
| @@ -1302,9 +1302,29 @@ xfs_fs_remount( | |||
| 1302 | mp->m_flags &= ~XFS_MOUNT_BARRIER; | 1302 | mp->m_flags &= ~XFS_MOUNT_BARRIER; |
| 1303 | break; | 1303 | break; |
| 1304 | default: | 1304 | default: |
| 1305 | /* | ||
| 1306 | * Logically we would return an error here to prevent | ||
| 1307 | * users from believing they might have changed | ||
| 1308 | * mount options using remount which can't be changed. | ||
| 1309 | * | ||
| 1310 | * But unfortunately mount(8) adds all options from | ||
| 1311 | * mtab and fstab to the mount arguments in some cases | ||
| 1312 | * so we can't blindly reject options, but have to | ||
| 1313 | * check for each specified option if it actually | ||
| 1314 | * differs from the currently set option and only | ||
| 1315 | * reject it if that's the case. | ||
| 1316 | * | ||
| 1317 | * Until that is implemented we return success for | ||
| 1318 | * every remount request, and silently ignore all | ||
| 1319 | * options that we can't actually change. | ||
| 1320 | */ | ||
| 1321 | #if 0 | ||
| 1305 | printk(KERN_INFO | 1322 | printk(KERN_INFO |
| 1306 | "XFS: mount option \"%s\" not supported for remount\n", p); | 1323 | "XFS: mount option \"%s\" not supported for remount\n", p); |
| 1307 | return -EINVAL; | 1324 | return -EINVAL; |
| 1325 | #else | ||
| 1326 | return 0; | ||
| 1327 | #endif | ||
| 1308 | } | 1328 | } |
| 1309 | } | 1329 | } |
| 1310 | 1330 | ||
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index 608c30c3f76b..002fc2617c8e 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
| @@ -732,6 +732,7 @@ xfs_buf_item_init( | |||
| 732 | bip->bli_item.li_ops = &xfs_buf_item_ops; | 732 | bip->bli_item.li_ops = &xfs_buf_item_ops; |
| 733 | bip->bli_item.li_mountp = mp; | 733 | bip->bli_item.li_mountp = mp; |
| 734 | bip->bli_buf = bp; | 734 | bip->bli_buf = bp; |
| 735 | xfs_buf_hold(bp); | ||
| 735 | bip->bli_format.blf_type = XFS_LI_BUF; | 736 | bip->bli_format.blf_type = XFS_LI_BUF; |
| 736 | bip->bli_format.blf_blkno = (__int64_t)XFS_BUF_ADDR(bp); | 737 | bip->bli_format.blf_blkno = (__int64_t)XFS_BUF_ADDR(bp); |
| 737 | bip->bli_format.blf_len = (ushort)BTOBB(XFS_BUF_COUNT(bp)); | 738 | bip->bli_format.blf_len = (ushort)BTOBB(XFS_BUF_COUNT(bp)); |
| @@ -867,6 +868,21 @@ xfs_buf_item_dirty( | |||
| 867 | return (bip->bli_flags & XFS_BLI_DIRTY); | 868 | return (bip->bli_flags & XFS_BLI_DIRTY); |
| 868 | } | 869 | } |
| 869 | 870 | ||
| 871 | STATIC void | ||
| 872 | xfs_buf_item_free( | ||
| 873 | xfs_buf_log_item_t *bip) | ||
| 874 | { | ||
| 875 | #ifdef XFS_TRANS_DEBUG | ||
| 876 | kmem_free(bip->bli_orig); | ||
| 877 | kmem_free(bip->bli_logged); | ||
| 878 | #endif /* XFS_TRANS_DEBUG */ | ||
| 879 | |||
| 880 | #ifdef XFS_BLI_TRACE | ||
| 881 | ktrace_free(bip->bli_trace); | ||
| 882 | #endif | ||
| 883 | kmem_zone_free(xfs_buf_item_zone, bip); | ||
| 884 | } | ||
| 885 | |||
| 870 | /* | 886 | /* |
| 871 | * This is called when the buf log item is no longer needed. It should | 887 | * This is called when the buf log item is no longer needed. It should |
| 872 | * free the buf log item associated with the given buffer and clear | 888 | * free the buf log item associated with the given buffer and clear |
| @@ -887,18 +903,8 @@ xfs_buf_item_relse( | |||
| 887 | (XFS_BUF_IODONE_FUNC(bp) != NULL)) { | 903 | (XFS_BUF_IODONE_FUNC(bp) != NULL)) { |
| 888 | XFS_BUF_CLR_IODONE_FUNC(bp); | 904 | XFS_BUF_CLR_IODONE_FUNC(bp); |
| 889 | } | 905 | } |
| 890 | 906 | xfs_buf_rele(bp); | |
| 891 | #ifdef XFS_TRANS_DEBUG | 907 | xfs_buf_item_free(bip); |
| 892 | kmem_free(bip->bli_orig); | ||
| 893 | bip->bli_orig = NULL; | ||
| 894 | kmem_free(bip->bli_logged); | ||
| 895 | bip->bli_logged = NULL; | ||
| 896 | #endif /* XFS_TRANS_DEBUG */ | ||
| 897 | |||
| 898 | #ifdef XFS_BLI_TRACE | ||
| 899 | ktrace_free(bip->bli_trace); | ||
| 900 | #endif | ||
| 901 | kmem_zone_free(xfs_buf_item_zone, bip); | ||
| 902 | } | 908 | } |
| 903 | 909 | ||
| 904 | 910 | ||
| @@ -1120,6 +1126,7 @@ xfs_buf_iodone( | |||
| 1120 | 1126 | ||
| 1121 | ASSERT(bip->bli_buf == bp); | 1127 | ASSERT(bip->bli_buf == bp); |
| 1122 | 1128 | ||
| 1129 | xfs_buf_rele(bp); | ||
| 1123 | mp = bip->bli_item.li_mountp; | 1130 | mp = bip->bli_item.li_mountp; |
| 1124 | 1131 | ||
| 1125 | /* | 1132 | /* |
| @@ -1136,18 +1143,7 @@ xfs_buf_iodone( | |||
| 1136 | * xfs_trans_delete_ail() drops the AIL lock. | 1143 | * xfs_trans_delete_ail() drops the AIL lock. |
| 1137 | */ | 1144 | */ |
| 1138 | xfs_trans_delete_ail(mp, (xfs_log_item_t *)bip); | 1145 | xfs_trans_delete_ail(mp, (xfs_log_item_t *)bip); |
| 1139 | 1146 | xfs_buf_item_free(bip); | |
| 1140 | #ifdef XFS_TRANS_DEBUG | ||
| 1141 | kmem_free(bip->bli_orig); | ||
| 1142 | bip->bli_orig = NULL; | ||
| 1143 | kmem_free(bip->bli_logged); | ||
| 1144 | bip->bli_logged = NULL; | ||
| 1145 | #endif /* XFS_TRANS_DEBUG */ | ||
| 1146 | |||
| 1147 | #ifdef XFS_BLI_TRACE | ||
| 1148 | ktrace_free(bip->bli_trace); | ||
| 1149 | #endif | ||
| 1150 | kmem_zone_free(xfs_buf_item_zone, bip); | ||
| 1151 | } | 1147 | } |
| 1152 | 1148 | ||
| 1153 | #if defined(XFS_BLI_TRACE) | 1149 | #if defined(XFS_BLI_TRACE) |
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index 760f4c5b5160..75b0cd4da0ea 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c | |||
| @@ -149,7 +149,14 @@ xfs_swap_extents( | |||
| 149 | 149 | ||
| 150 | sbp = &sxp->sx_stat; | 150 | sbp = &sxp->sx_stat; |
| 151 | 151 | ||
| 152 | xfs_lock_two_inodes(ip, tip, lock_flags); | 152 | /* |
| 153 | * we have to do two separate lock calls here to keep lockdep | ||
| 154 | * happy. If we try to get all the locks in one call, lock will | ||
| 155 | * report false positives when we drop the ILOCK and regain them | ||
| 156 | * below. | ||
| 157 | */ | ||
| 158 | xfs_lock_two_inodes(ip, tip, XFS_IOLOCK_EXCL); | ||
| 159 | xfs_lock_two_inodes(ip, tip, XFS_ILOCK_EXCL); | ||
| 153 | locked = 1; | 160 | locked = 1; |
| 154 | 161 | ||
| 155 | /* Verify that both files have the same format */ | 162 | /* Verify that both files have the same format */ |
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index ccba14eb9dbe..503ea89e8b9a 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
| @@ -124,16 +124,27 @@ STATIC void xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog, | |||
| 124 | STATIC int xlog_iclogs_empty(xlog_t *log); | 124 | STATIC int xlog_iclogs_empty(xlog_t *log); |
| 125 | 125 | ||
| 126 | #if defined(XFS_LOG_TRACE) | 126 | #if defined(XFS_LOG_TRACE) |
| 127 | |||
| 128 | #define XLOG_TRACE_LOGGRANT_SIZE 2048 | ||
| 129 | #define XLOG_TRACE_ICLOG_SIZE 256 | ||
| 130 | |||
| 131 | void | ||
| 132 | xlog_trace_loggrant_alloc(xlog_t *log) | ||
| 133 | { | ||
| 134 | log->l_grant_trace = ktrace_alloc(XLOG_TRACE_LOGGRANT_SIZE, KM_NOFS); | ||
| 135 | } | ||
| 136 | |||
| 137 | void | ||
| 138 | xlog_trace_loggrant_dealloc(xlog_t *log) | ||
| 139 | { | ||
| 140 | ktrace_free(log->l_grant_trace); | ||
| 141 | } | ||
| 142 | |||
| 127 | void | 143 | void |
| 128 | xlog_trace_loggrant(xlog_t *log, xlog_ticket_t *tic, xfs_caddr_t string) | 144 | xlog_trace_loggrant(xlog_t *log, xlog_ticket_t *tic, xfs_caddr_t string) |
| 129 | { | 145 | { |
| 130 | unsigned long cnts; | 146 | unsigned long cnts; |
| 131 | 147 | ||
| 132 | if (!log->l_grant_trace) { | ||
| 133 | log->l_grant_trace = ktrace_alloc(2048, KM_NOSLEEP); | ||
| 134 | if (!log->l_grant_trace) | ||
| 135 | return; | ||
| 136 | } | ||
| 137 | /* ticket counts are 1 byte each */ | 148 | /* ticket counts are 1 byte each */ |
| 138 | cnts = ((unsigned long)tic->t_ocnt) | ((unsigned long)tic->t_cnt) << 8; | 149 | cnts = ((unsigned long)tic->t_ocnt) | ((unsigned long)tic->t_cnt) << 8; |
| 139 | 150 | ||
| @@ -157,10 +168,20 @@ xlog_trace_loggrant(xlog_t *log, xlog_ticket_t *tic, xfs_caddr_t string) | |||
| 157 | } | 168 | } |
| 158 | 169 | ||
| 159 | void | 170 | void |
| 171 | xlog_trace_iclog_alloc(xlog_in_core_t *iclog) | ||
| 172 | { | ||
| 173 | iclog->ic_trace = ktrace_alloc(XLOG_TRACE_ICLOG_SIZE, KM_NOFS); | ||
| 174 | } | ||
| 175 | |||
| 176 | void | ||
| 177 | xlog_trace_iclog_dealloc(xlog_in_core_t *iclog) | ||
| 178 | { | ||
| 179 | ktrace_free(iclog->ic_trace); | ||
| 180 | } | ||
| 181 | |||
| 182 | void | ||
| 160 | xlog_trace_iclog(xlog_in_core_t *iclog, uint state) | 183 | xlog_trace_iclog(xlog_in_core_t *iclog, uint state) |
| 161 | { | 184 | { |
| 162 | if (!iclog->ic_trace) | ||
| 163 | iclog->ic_trace = ktrace_alloc(256, KM_NOFS); | ||
| 164 | ktrace_enter(iclog->ic_trace, | 185 | ktrace_enter(iclog->ic_trace, |
| 165 | (void *)((unsigned long)state), | 186 | (void *)((unsigned long)state), |
| 166 | (void *)((unsigned long)current_pid()), | 187 | (void *)((unsigned long)current_pid()), |
| @@ -170,8 +191,15 @@ xlog_trace_iclog(xlog_in_core_t *iclog, uint state) | |||
| 170 | (void *)NULL, (void *)NULL); | 191 | (void *)NULL, (void *)NULL); |
| 171 | } | 192 | } |
| 172 | #else | 193 | #else |
| 194 | |||
| 195 | #define xlog_trace_loggrant_alloc(log) | ||
| 196 | #define xlog_trace_loggrant_dealloc(log) | ||
| 173 | #define xlog_trace_loggrant(log,tic,string) | 197 | #define xlog_trace_loggrant(log,tic,string) |
| 198 | |||
| 199 | #define xlog_trace_iclog_alloc(iclog) | ||
| 200 | #define xlog_trace_iclog_dealloc(iclog) | ||
| 174 | #define xlog_trace_iclog(iclog,state) | 201 | #define xlog_trace_iclog(iclog,state) |
| 202 | |||
| 175 | #endif /* XFS_LOG_TRACE */ | 203 | #endif /* XFS_LOG_TRACE */ |
| 176 | 204 | ||
| 177 | 205 | ||
| @@ -1009,7 +1037,7 @@ xlog_iodone(xfs_buf_t *bp) | |||
| 1009 | * layer, it means the underlyin device no longer supports | 1037 | * layer, it means the underlyin device no longer supports |
| 1010 | * barrier I/O. Warn loudly and turn off barriers. | 1038 | * barrier I/O. Warn loudly and turn off barriers. |
| 1011 | */ | 1039 | */ |
| 1012 | if ((l->l_mp->m_flags & XFS_MOUNT_BARRIER) && !XFS_BUF_ORDERED(bp)) { | 1040 | if ((l->l_mp->m_flags & XFS_MOUNT_BARRIER) && !XFS_BUF_ISORDERED(bp)) { |
| 1013 | l->l_mp->m_flags &= ~XFS_MOUNT_BARRIER; | 1041 | l->l_mp->m_flags &= ~XFS_MOUNT_BARRIER; |
| 1014 | xfs_fs_cmn_err(CE_WARN, l->l_mp, | 1042 | xfs_fs_cmn_err(CE_WARN, l->l_mp, |
| 1015 | "xlog_iodone: Barriers are no longer supported" | 1043 | "xlog_iodone: Barriers are no longer supported" |
| @@ -1231,6 +1259,7 @@ xlog_alloc_log(xfs_mount_t *mp, | |||
| 1231 | spin_lock_init(&log->l_grant_lock); | 1259 | spin_lock_init(&log->l_grant_lock); |
| 1232 | sv_init(&log->l_flush_wait, 0, "flush_wait"); | 1260 | sv_init(&log->l_flush_wait, 0, "flush_wait"); |
| 1233 | 1261 | ||
| 1262 | xlog_trace_loggrant_alloc(log); | ||
| 1234 | /* log record size must be multiple of BBSIZE; see xlog_rec_header_t */ | 1263 | /* log record size must be multiple of BBSIZE; see xlog_rec_header_t */ |
| 1235 | ASSERT((XFS_BUF_SIZE(bp) & BBMASK) == 0); | 1264 | ASSERT((XFS_BUF_SIZE(bp) & BBMASK) == 0); |
| 1236 | 1265 | ||
| @@ -1285,6 +1314,8 @@ xlog_alloc_log(xfs_mount_t *mp, | |||
| 1285 | sv_init(&iclog->ic_force_wait, SV_DEFAULT, "iclog-force"); | 1314 | sv_init(&iclog->ic_force_wait, SV_DEFAULT, "iclog-force"); |
| 1286 | sv_init(&iclog->ic_write_wait, SV_DEFAULT, "iclog-write"); | 1315 | sv_init(&iclog->ic_write_wait, SV_DEFAULT, "iclog-write"); |
| 1287 | 1316 | ||
| 1317 | xlog_trace_iclog_alloc(iclog); | ||
| 1318 | |||
| 1288 | iclogp = &iclog->ic_next; | 1319 | iclogp = &iclog->ic_next; |
| 1289 | } | 1320 | } |
| 1290 | *iclogp = log->l_iclog; /* complete ring */ | 1321 | *iclogp = log->l_iclog; /* complete ring */ |
| @@ -1565,11 +1596,7 @@ xlog_dealloc_log(xlog_t *log) | |||
| 1565 | sv_destroy(&iclog->ic_force_wait); | 1596 | sv_destroy(&iclog->ic_force_wait); |
| 1566 | sv_destroy(&iclog->ic_write_wait); | 1597 | sv_destroy(&iclog->ic_write_wait); |
| 1567 | xfs_buf_free(iclog->ic_bp); | 1598 | xfs_buf_free(iclog->ic_bp); |
| 1568 | #ifdef XFS_LOG_TRACE | 1599 | xlog_trace_iclog_dealloc(iclog); |
| 1569 | if (iclog->ic_trace != NULL) { | ||
| 1570 | ktrace_free(iclog->ic_trace); | ||
| 1571 | } | ||
| 1572 | #endif | ||
| 1573 | next_iclog = iclog->ic_next; | 1600 | next_iclog = iclog->ic_next; |
| 1574 | kmem_free(iclog); | 1601 | kmem_free(iclog); |
| 1575 | iclog = next_iclog; | 1602 | iclog = next_iclog; |
| @@ -1578,14 +1605,7 @@ xlog_dealloc_log(xlog_t *log) | |||
| 1578 | spinlock_destroy(&log->l_grant_lock); | 1605 | spinlock_destroy(&log->l_grant_lock); |
| 1579 | 1606 | ||
| 1580 | xfs_buf_free(log->l_xbuf); | 1607 | xfs_buf_free(log->l_xbuf); |
| 1581 | #ifdef XFS_LOG_TRACE | 1608 | xlog_trace_loggrant_dealloc(log); |
| 1582 | if (log->l_trace != NULL) { | ||
| 1583 | ktrace_free(log->l_trace); | ||
| 1584 | } | ||
| 1585 | if (log->l_grant_trace != NULL) { | ||
| 1586 | ktrace_free(log->l_grant_trace); | ||
| 1587 | } | ||
| 1588 | #endif | ||
| 1589 | log->l_mp->m_log = NULL; | 1609 | log->l_mp->m_log = NULL; |
| 1590 | kmem_free(log); | 1610 | kmem_free(log); |
| 1591 | } /* xlog_dealloc_log */ | 1611 | } /* xlog_dealloc_log */ |
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index c8a5b22ee3e3..e7d8f84443fa 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
| @@ -448,7 +448,6 @@ typedef struct log { | |||
| 448 | int l_grant_write_bytes; | 448 | int l_grant_write_bytes; |
| 449 | 449 | ||
| 450 | #ifdef XFS_LOG_TRACE | 450 | #ifdef XFS_LOG_TRACE |
| 451 | struct ktrace *l_trace; | ||
| 452 | struct ktrace *l_grant_trace; | 451 | struct ktrace *l_grant_trace; |
| 453 | #endif | 452 | #endif |
| 454 | 453 | ||
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index aa238c8fbd7a..8b6812f66a15 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
| @@ -1838,6 +1838,12 @@ again: | |||
| 1838 | #endif | 1838 | #endif |
| 1839 | } | 1839 | } |
| 1840 | 1840 | ||
| 1841 | /* | ||
| 1842 | * xfs_lock_two_inodes() can only be used to lock one type of lock | ||
| 1843 | * at a time - the iolock or the ilock, but not both at once. If | ||
| 1844 | * we lock both at once, lockdep will report false positives saying | ||
| 1845 | * we have violated locking orders. | ||
| 1846 | */ | ||
| 1841 | void | 1847 | void |
| 1842 | xfs_lock_two_inodes( | 1848 | xfs_lock_two_inodes( |
| 1843 | xfs_inode_t *ip0, | 1849 | xfs_inode_t *ip0, |
| @@ -1848,6 +1854,8 @@ xfs_lock_two_inodes( | |||
| 1848 | int attempts = 0; | 1854 | int attempts = 0; |
| 1849 | xfs_log_item_t *lp; | 1855 | xfs_log_item_t *lp; |
| 1850 | 1856 | ||
| 1857 | if (lock_mode & (XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL)) | ||
| 1858 | ASSERT((lock_mode & (XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)) == 0); | ||
| 1851 | ASSERT(ip0->i_ino != ip1->i_ino); | 1859 | ASSERT(ip0->i_ino != ip1->i_ino); |
| 1852 | 1860 | ||
| 1853 | if (ip0->i_ino > ip1->i_ino) { | 1861 | if (ip0->i_ino > ip1->i_ino) { |
| @@ -3152,6 +3160,13 @@ error1: /* Just cancel transaction */ | |||
| 3152 | /* | 3160 | /* |
| 3153 | * Zero file bytes between startoff and endoff inclusive. | 3161 | * Zero file bytes between startoff and endoff inclusive. |
| 3154 | * The iolock is held exclusive and no blocks are buffered. | 3162 | * The iolock is held exclusive and no blocks are buffered. |
| 3163 | * | ||
| 3164 | * This function is used by xfs_free_file_space() to zero | ||
| 3165 | * partial blocks when the range to free is not block aligned. | ||
| 3166 | * When unreserving space with boundaries that are not block | ||
| 3167 | * aligned we round up the start and round down the end | ||
| 3168 | * boundaries and then use this function to zero the parts of | ||
| 3169 | * the blocks that got dropped during the rounding. | ||
| 3155 | */ | 3170 | */ |
| 3156 | STATIC int | 3171 | STATIC int |
| 3157 | xfs_zero_remaining_bytes( | 3172 | xfs_zero_remaining_bytes( |
| @@ -3168,6 +3183,17 @@ xfs_zero_remaining_bytes( | |||
| 3168 | int nimap; | 3183 | int nimap; |
| 3169 | int error = 0; | 3184 | int error = 0; |
| 3170 | 3185 | ||
| 3186 | /* | ||
| 3187 | * Avoid doing I/O beyond eof - it's not necessary | ||
| 3188 | * since nothing can read beyond eof. The space will | ||
| 3189 | * be zeroed when the file is extended anyway. | ||
| 3190 | */ | ||
| 3191 | if (startoff >= ip->i_size) | ||
| 3192 | return 0; | ||
| 3193 | |||
| 3194 | if (endoff > ip->i_size) | ||
| 3195 | endoff = ip->i_size; | ||
| 3196 | |||
| 3171 | bp = xfs_buf_get_noaddr(mp->m_sb.sb_blocksize, | 3197 | bp = xfs_buf_get_noaddr(mp->m_sb.sb_blocksize, |
| 3172 | XFS_IS_REALTIME_INODE(ip) ? | 3198 | XFS_IS_REALTIME_INODE(ip) ? |
| 3173 | mp->m_rtdev_targp : mp->m_ddev_targp); | 3199 | mp->m_rtdev_targp : mp->m_ddev_targp); |
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index a3f738cffdb6..edc6ba82e090 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
| @@ -97,6 +97,16 @@ extern void warn_slowpath(const char *file, const int line, | |||
| 97 | unlikely(__ret_warn_once); \ | 97 | unlikely(__ret_warn_once); \ |
| 98 | }) | 98 | }) |
| 99 | 99 | ||
| 100 | #define WARN_ONCE(condition, format...) ({ \ | ||
| 101 | static int __warned; \ | ||
| 102 | int __ret_warn_once = !!(condition); \ | ||
| 103 | \ | ||
| 104 | if (unlikely(__ret_warn_once)) \ | ||
| 105 | if (WARN(!__warned, format)) \ | ||
| 106 | __warned = 1; \ | ||
| 107 | unlikely(__ret_warn_once); \ | ||
| 108 | }) | ||
| 109 | |||
| 100 | #define WARN_ON_RATELIMIT(condition, state) \ | 110 | #define WARN_ON_RATELIMIT(condition, state) \ |
| 101 | WARN_ON((condition) && __ratelimit(state)) | 111 | WARN_ON((condition) && __ratelimit(state)) |
| 102 | 112 | ||
diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h index 635d764dc13e..35d1743b57ac 100644 --- a/include/asm-x86/acpi.h +++ b/include/asm-x86/acpi.h | |||
| @@ -140,6 +140,8 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate) | |||
| 140 | boot_cpu_data.x86_model <= 0x05 && | 140 | boot_cpu_data.x86_model <= 0x05 && |
| 141 | boot_cpu_data.x86_mask < 0x0A) | 141 | boot_cpu_data.x86_mask < 0x0A) |
| 142 | return 1; | 142 | return 1; |
| 143 | else if (boot_cpu_has(X86_FEATURE_AMDC1E)) | ||
| 144 | return 1; | ||
| 143 | else | 145 | else |
| 144 | return max_cstate; | 146 | return max_cstate; |
| 145 | } | 147 | } |
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 9489283a4bcf..cfcfb0a806ba 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
| @@ -81,6 +81,7 @@ | |||
| 81 | #define X86_FEATURE_LFENCE_RDTSC (3*32+18) /* Lfence synchronizes RDTSC */ | 81 | #define X86_FEATURE_LFENCE_RDTSC (3*32+18) /* Lfence synchronizes RDTSC */ |
| 82 | #define X86_FEATURE_11AP (3*32+19) /* Bad local APIC aka 11AP */ | 82 | #define X86_FEATURE_11AP (3*32+19) /* Bad local APIC aka 11AP */ |
| 83 | #define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */ | 83 | #define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */ |
| 84 | #define X86_FEATURE_AMDC1E (3*32+21) /* AMD C1E detected */ | ||
| 84 | 85 | ||
| 85 | /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ | 86 | /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ |
| 86 | #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ | 87 | #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ |
diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h index d240e5b30a45..cbb649123612 100644 --- a/include/asm-x86/idle.h +++ b/include/asm-x86/idle.h | |||
| @@ -10,4 +10,6 @@ void idle_notifier_register(struct notifier_block *n); | |||
| 10 | void enter_idle(void); | 10 | void enter_idle(void); |
| 11 | void exit_idle(void); | 11 | void exit_idle(void); |
| 12 | 12 | ||
| 13 | void c1e_remove_cpu(int cpu); | ||
| 14 | |||
| 13 | #endif | 15 | #endif |
diff --git a/include/linux/ata.h b/include/linux/ata.h index 1ce19c1ef0e9..8a12d718c169 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -745,7 +745,7 @@ static inline int ata_ok(u8 status) | |||
| 745 | static inline int lba_28_ok(u64 block, u32 n_block) | 745 | static inline int lba_28_ok(u64 block, u32 n_block) |
| 746 | { | 746 | { |
| 747 | /* check the ending block number */ | 747 | /* check the ending block number */ |
| 748 | return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256); | 748 | return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256); |
| 749 | } | 749 | } |
| 750 | 750 | ||
| 751 | static inline int lba_48_ok(u64 block, u32 n_block) | 751 | static inline int lba_48_ok(u64 block, u32 n_block) |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 44710d7e7bff..53ea933cf60b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -843,8 +843,6 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *); | |||
| 843 | */ | 843 | */ |
| 844 | extern int blk_verify_command(struct blk_cmd_filter *filter, | 844 | extern int blk_verify_command(struct blk_cmd_filter *filter, |
| 845 | unsigned char *cmd, int has_write_perm); | 845 | unsigned char *cmd, int has_write_perm); |
| 846 | extern int blk_register_filter(struct gendisk *disk); | ||
| 847 | extern void blk_unregister_filter(struct gendisk *disk); | ||
| 848 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); | 846 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); |
| 849 | 847 | ||
| 850 | #define MAX_PHYS_SEGMENTS 128 | 848 | #define MAX_PHYS_SEGMENTS 128 |
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 8d3b7a9afd17..350033e8f4e1 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
| @@ -159,9 +159,9 @@ extern struct resource * __devm_request_region(struct device *dev, | |||
| 159 | struct resource *parent, resource_size_t start, | 159 | struct resource *parent, resource_size_t start, |
| 160 | resource_size_t n, const char *name); | 160 | resource_size_t n, const char *name); |
| 161 | 161 | ||
| 162 | #define devm_release_region(start,n) \ | 162 | #define devm_release_region(dev, start, n) \ |
| 163 | __devm_release_region(dev, &ioport_resource, (start), (n)) | 163 | __devm_release_region(dev, &ioport_resource, (start), (n)) |
| 164 | #define devm_release_mem_region(start,n) \ | 164 | #define devm_release_mem_region(dev, start, n) \ |
| 165 | __devm_release_region(dev, &iomem_resource, (start), (n)) | 165 | __devm_release_region(dev, &iomem_resource, (start), (n)) |
| 166 | 166 | ||
| 167 | extern void __devm_release_region(struct device *dev, struct resource *parent, | 167 | extern void __devm_release_region(struct device *dev, struct resource *parent, |
diff --git a/include/linux/memstick.h b/include/linux/memstick.h index a9f998a3f48b..d0c37e682234 100644 --- a/include/linux/memstick.h +++ b/include/linux/memstick.h | |||
| @@ -21,30 +21,30 @@ | |||
| 21 | struct ms_status_register { | 21 | struct ms_status_register { |
| 22 | unsigned char reserved; | 22 | unsigned char reserved; |
| 23 | unsigned char interrupt; | 23 | unsigned char interrupt; |
| 24 | #define MEMSTICK_INT_CMDNAK 0x0001 | 24 | #define MEMSTICK_INT_CMDNAK 0x01 |
| 25 | #define MEMSTICK_INT_IOREQ 0x0008 | 25 | #define MEMSTICK_INT_IOREQ 0x08 |
| 26 | #define MEMSTICK_INT_IOBREQ 0x0010 | 26 | #define MEMSTICK_INT_IOBREQ 0x10 |
| 27 | #define MEMSTICK_INT_BREQ 0x0020 | 27 | #define MEMSTICK_INT_BREQ 0x20 |
| 28 | #define MEMSTICK_INT_ERR 0x0040 | 28 | #define MEMSTICK_INT_ERR 0x40 |
| 29 | #define MEMSTICK_INT_CED 0x0080 | 29 | #define MEMSTICK_INT_CED 0x80 |
| 30 | 30 | ||
| 31 | unsigned char status0; | 31 | unsigned char status0; |
| 32 | #define MEMSTICK_STATUS0_WP 0x0001 | 32 | #define MEMSTICK_STATUS0_WP 0x01 |
| 33 | #define MEMSTICK_STATUS0_SL 0x0002 | 33 | #define MEMSTICK_STATUS0_SL 0x02 |
| 34 | #define MEMSTICK_STATUS0_BF 0x0010 | 34 | #define MEMSTICK_STATUS0_BF 0x10 |
| 35 | #define MEMSTICK_STATUS0_BE 0x0020 | 35 | #define MEMSTICK_STATUS0_BE 0x20 |
| 36 | #define MEMSTICK_STATUS0_FB0 0x0040 | 36 | #define MEMSTICK_STATUS0_FB0 0x40 |
| 37 | #define MEMSTICK_STATUS0_MB 0x0080 | 37 | #define MEMSTICK_STATUS0_MB 0x80 |
| 38 | 38 | ||
| 39 | unsigned char status1; | 39 | unsigned char status1; |
| 40 | #define MEMSTICK_STATUS1_UCFG 0x0001 | 40 | #define MEMSTICK_STATUS1_UCFG 0x01 |
| 41 | #define MEMSTICK_STATUS1_FGER 0x0002 | 41 | #define MEMSTICK_STATUS1_FGER 0x02 |
| 42 | #define MEMSTICK_STATUS1_UCEX 0x0004 | 42 | #define MEMSTICK_STATUS1_UCEX 0x04 |
| 43 | #define MEMSTICK_STATUS1_EXER 0x0008 | 43 | #define MEMSTICK_STATUS1_EXER 0x08 |
| 44 | #define MEMSTICK_STATUS1_UCDT 0x0010 | 44 | #define MEMSTICK_STATUS1_UCDT 0x10 |
| 45 | #define MEMSTICK_STATUS1_DTER 0x0020 | 45 | #define MEMSTICK_STATUS1_DTER 0x20 |
| 46 | #define MEMSTICK_STATUS1_FBI 0x0040 | 46 | #define MEMSTICK_STATUS1_FB1 0x40 |
| 47 | #define MEMSTICK_STATUS1_MB 0x0080 | 47 | #define MEMSTICK_STATUS1_MB 0x80 |
| 48 | } __attribute__((packed)); | 48 | } __attribute__((packed)); |
| 49 | 49 | ||
| 50 | struct ms_id_register { | 50 | struct ms_id_register { |
| @@ -56,32 +56,32 @@ struct ms_id_register { | |||
| 56 | 56 | ||
| 57 | struct ms_param_register { | 57 | struct ms_param_register { |
| 58 | unsigned char system; | 58 | unsigned char system; |
| 59 | #define MEMSTICK_SYS_ATEN 0xc0 | ||
| 60 | #define MEMSTICK_SYS_BAMD 0x80 | ||
| 61 | #define MEMSTICK_SYS_PAM 0x08 | 59 | #define MEMSTICK_SYS_PAM 0x08 |
| 60 | #define MEMSTICK_SYS_BAMD 0x80 | ||
| 62 | 61 | ||
| 63 | unsigned char block_address_msb; | 62 | unsigned char block_address_msb; |
| 64 | unsigned short block_address; | 63 | unsigned short block_address; |
| 65 | unsigned char cp; | 64 | unsigned char cp; |
| 66 | #define MEMSTICK_CP_BLOCK 0x0000 | 65 | #define MEMSTICK_CP_BLOCK 0x00 |
| 67 | #define MEMSTICK_CP_PAGE 0x0020 | 66 | #define MEMSTICK_CP_PAGE 0x20 |
| 68 | #define MEMSTICK_CP_EXTRA 0x0040 | 67 | #define MEMSTICK_CP_EXTRA 0x40 |
| 69 | #define MEMSTICK_CP_OVERWRITE 0x0080 | 68 | #define MEMSTICK_CP_OVERWRITE 0x80 |
| 70 | 69 | ||
| 71 | unsigned char page_address; | 70 | unsigned char page_address; |
| 72 | } __attribute__((packed)); | 71 | } __attribute__((packed)); |
| 73 | 72 | ||
| 74 | struct ms_extra_data_register { | 73 | struct ms_extra_data_register { |
| 75 | unsigned char overwrite_flag; | 74 | unsigned char overwrite_flag; |
| 76 | #define MEMSTICK_OVERWRITE_UPDATA 0x0010 | 75 | #define MEMSTICK_OVERWRITE_UDST 0x10 |
| 77 | #define MEMSTICK_OVERWRITE_PAGE 0x0060 | 76 | #define MEMSTICK_OVERWRITE_PGST1 0x20 |
| 78 | #define MEMSTICK_OVERWRITE_BLOCK 0x0080 | 77 | #define MEMSTICK_OVERWRITE_PGST0 0x40 |
| 78 | #define MEMSTICK_OVERWRITE_BKST 0x80 | ||
| 79 | 79 | ||
| 80 | unsigned char management_flag; | 80 | unsigned char management_flag; |
| 81 | #define MEMSTICK_MANAGEMENT_SYSTEM 0x0004 | 81 | #define MEMSTICK_MANAGEMENT_SYSFLG 0x04 |
| 82 | #define MEMSTICK_MANAGEMENT_TRANS_TABLE 0x0008 | 82 | #define MEMSTICK_MANAGEMENT_ATFLG 0x08 |
| 83 | #define MEMSTICK_MANAGEMENT_COPY 0x0010 | 83 | #define MEMSTICK_MANAGEMENT_SCMS1 0x10 |
| 84 | #define MEMSTICK_MANAGEMENT_ACCESS 0x0020 | 84 | #define MEMSTICK_MANAGEMENT_SCMS0 0x20 |
| 85 | 85 | ||
| 86 | unsigned short logical_address; | 86 | unsigned short logical_address; |
| 87 | } __attribute__((packed)); | 87 | } __attribute__((packed)); |
| @@ -96,9 +96,9 @@ struct ms_register { | |||
| 96 | 96 | ||
| 97 | struct mspro_param_register { | 97 | struct mspro_param_register { |
| 98 | unsigned char system; | 98 | unsigned char system; |
| 99 | #define MEMSTICK_SYS_SERIAL 0x80 | ||
| 100 | #define MEMSTICK_SYS_PAR4 0x00 | 99 | #define MEMSTICK_SYS_PAR4 0x00 |
| 101 | #define MEMSTICK_SYS_PAR8 0x40 | 100 | #define MEMSTICK_SYS_PAR8 0x40 |
| 101 | #define MEMSTICK_SYS_SERIAL 0x80 | ||
| 102 | 102 | ||
| 103 | unsigned short data_count; | 103 | unsigned short data_count; |
| 104 | unsigned int data_address; | 104 | unsigned int data_address; |
| @@ -147,7 +147,7 @@ struct ms_register_addr { | |||
| 147 | unsigned char w_length; | 147 | unsigned char w_length; |
| 148 | } __attribute__((packed)); | 148 | } __attribute__((packed)); |
| 149 | 149 | ||
| 150 | enum { | 150 | enum memstick_tpc { |
| 151 | MS_TPC_READ_MG_STATUS = 0x01, | 151 | MS_TPC_READ_MG_STATUS = 0x01, |
| 152 | MS_TPC_READ_LONG_DATA = 0x02, | 152 | MS_TPC_READ_LONG_DATA = 0x02, |
| 153 | MS_TPC_READ_SHORT_DATA = 0x03, | 153 | MS_TPC_READ_SHORT_DATA = 0x03, |
| @@ -167,7 +167,7 @@ enum { | |||
| 167 | MS_TPC_SET_CMD = 0x0e | 167 | MS_TPC_SET_CMD = 0x0e |
| 168 | }; | 168 | }; |
| 169 | 169 | ||
| 170 | enum { | 170 | enum memstick_command { |
| 171 | MS_CMD_BLOCK_END = 0x33, | 171 | MS_CMD_BLOCK_END = 0x33, |
| 172 | MS_CMD_RESET = 0x3c, | 172 | MS_CMD_RESET = 0x3c, |
| 173 | MS_CMD_BLOCK_WRITE = 0x55, | 173 | MS_CMD_BLOCK_WRITE = 0x55, |
| @@ -201,8 +201,6 @@ enum { | |||
| 201 | 201 | ||
| 202 | /*** Driver structures and functions ***/ | 202 | /*** Driver structures and functions ***/ |
| 203 | 203 | ||
| 204 | #define MEMSTICK_PART_SHIFT 3 | ||
| 205 | |||
| 206 | enum memstick_param { MEMSTICK_POWER = 1, MEMSTICK_INTERFACE }; | 204 | enum memstick_param { MEMSTICK_POWER = 1, MEMSTICK_INTERFACE }; |
| 207 | 205 | ||
| 208 | #define MEMSTICK_POWER_OFF 0 | 206 | #define MEMSTICK_POWER_OFF 0 |
| @@ -215,24 +213,27 @@ enum memstick_param { MEMSTICK_POWER = 1, MEMSTICK_INTERFACE }; | |||
| 215 | struct memstick_host; | 213 | struct memstick_host; |
| 216 | struct memstick_driver; | 214 | struct memstick_driver; |
| 217 | 215 | ||
| 216 | struct memstick_device_id { | ||
| 217 | unsigned char match_flags; | ||
| 218 | #define MEMSTICK_MATCH_ALL 0x01 | 218 | #define MEMSTICK_MATCH_ALL 0x01 |
| 219 | 219 | ||
| 220 | unsigned char type; | ||
| 220 | #define MEMSTICK_TYPE_LEGACY 0xff | 221 | #define MEMSTICK_TYPE_LEGACY 0xff |
| 221 | #define MEMSTICK_TYPE_DUO 0x00 | 222 | #define MEMSTICK_TYPE_DUO 0x00 |
| 222 | #define MEMSTICK_TYPE_PRO 0x01 | 223 | #define MEMSTICK_TYPE_PRO 0x01 |
| 223 | 224 | ||
| 225 | unsigned char category; | ||
| 224 | #define MEMSTICK_CATEGORY_STORAGE 0xff | 226 | #define MEMSTICK_CATEGORY_STORAGE 0xff |
| 225 | #define MEMSTICK_CATEGORY_STORAGE_DUO 0x00 | 227 | #define MEMSTICK_CATEGORY_STORAGE_DUO 0x00 |
| 228 | #define MEMSTICK_CATEGORY_IO 0x01 | ||
| 229 | #define MEMSTICK_CATEGORY_IO_PRO 0x10 | ||
| 226 | 230 | ||
| 227 | #define MEMSTICK_CLASS_GENERIC 0xff | ||
| 228 | #define MEMSTICK_CLASS_GENERIC_DUO 0x00 | ||
| 229 | |||
| 230 | |||
| 231 | struct memstick_device_id { | ||
| 232 | unsigned char match_flags; | ||
| 233 | unsigned char type; | ||
| 234 | unsigned char category; | ||
| 235 | unsigned char class; | 231 | unsigned char class; |
| 232 | #define MEMSTICK_CLASS_FLASH 0xff | ||
| 233 | #define MEMSTICK_CLASS_DUO 0x00 | ||
| 234 | #define MEMSTICK_CLASS_ROM 0x01 | ||
| 235 | #define MEMSTICK_CLASS_RO 0x02 | ||
| 236 | #define MEMSTICK_CLASS_WP 0x03 | ||
| 236 | }; | 237 | }; |
| 237 | 238 | ||
| 238 | struct memstick_request { | 239 | struct memstick_request { |
| @@ -319,9 +320,9 @@ void memstick_suspend_host(struct memstick_host *host); | |||
| 319 | void memstick_resume_host(struct memstick_host *host); | 320 | void memstick_resume_host(struct memstick_host *host); |
| 320 | 321 | ||
| 321 | void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc, | 322 | void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc, |
| 322 | struct scatterlist *sg); | 323 | const struct scatterlist *sg); |
| 323 | void memstick_init_req(struct memstick_request *mrq, unsigned char tpc, | 324 | void memstick_init_req(struct memstick_request *mrq, unsigned char tpc, |
| 324 | void *buf, size_t length); | 325 | const void *buf, size_t length); |
| 325 | int memstick_next_req(struct memstick_host *host, | 326 | int memstick_next_req(struct memstick_host *host, |
| 326 | struct memstick_request **mrq); | 327 | struct memstick_request **mrq); |
| 327 | void memstick_new_req(struct memstick_host *host); | 328 | void memstick_new_req(struct memstick_host *host); |
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 655ea0d1ee14..b2f944468313 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
| @@ -141,6 +141,10 @@ enum { | |||
| 141 | MLX4_STAT_RATE_OFFSET = 5 | 141 | MLX4_STAT_RATE_OFFSET = 5 |
| 142 | }; | 142 | }; |
| 143 | 143 | ||
| 144 | enum { | ||
| 145 | MLX4_MTT_FLAG_PRESENT = 1 | ||
| 146 | }; | ||
| 147 | |||
| 144 | static inline u64 mlx4_fw_ver(u64 major, u64 minor, u64 subminor) | 148 | static inline u64 mlx4_fw_ver(u64 major, u64 minor, u64 subminor) |
| 145 | { | 149 | { |
| 146 | return (major << 32) | (minor << 16) | subminor; | 150 | return (major << 32) | (minor << 16) | subminor; |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 443bc7cd8c62..428328a05fa1 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -751,8 +751,9 @@ static inline int zonelist_node_idx(struct zoneref *zoneref) | |||
| 751 | * | 751 | * |
| 752 | * This function returns the next zone at or below a given zone index that is | 752 | * This function returns the next zone at or below a given zone index that is |
| 753 | * within the allowed nodemask using a cursor as the starting point for the | 753 | * within the allowed nodemask using a cursor as the starting point for the |
| 754 | * search. The zoneref returned is a cursor that is used as the next starting | 754 | * search. The zoneref returned is a cursor that represents the current zone |
| 755 | * point for future calls to next_zones_zonelist(). | 755 | * being examined. It should be advanced by one before calling |
| 756 | * next_zones_zonelist again. | ||
| 756 | */ | 757 | */ |
| 757 | struct zoneref *next_zones_zonelist(struct zoneref *z, | 758 | struct zoneref *next_zones_zonelist(struct zoneref *z, |
| 758 | enum zone_type highest_zoneidx, | 759 | enum zone_type highest_zoneidx, |
| @@ -768,9 +769,8 @@ struct zoneref *next_zones_zonelist(struct zoneref *z, | |||
| 768 | * | 769 | * |
| 769 | * This function returns the first zone at or below a given zone index that is | 770 | * This function returns the first zone at or below a given zone index that is |
| 770 | * within the allowed nodemask. The zoneref returned is a cursor that can be | 771 | * within the allowed nodemask. The zoneref returned is a cursor that can be |
| 771 | * used to iterate the zonelist with next_zones_zonelist. The cursor should | 772 | * used to iterate the zonelist with next_zones_zonelist by advancing it by |
| 772 | * not be used by the caller as it does not match the value of the zone | 773 | * one before calling. |
| 773 | * returned. | ||
| 774 | */ | 774 | */ |
| 775 | static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist, | 775 | static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist, |
| 776 | enum zone_type highest_zoneidx, | 776 | enum zone_type highest_zoneidx, |
| @@ -795,7 +795,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist, | |||
| 795 | #define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \ | 795 | #define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \ |
| 796 | for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone); \ | 796 | for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone); \ |
| 797 | zone; \ | 797 | zone; \ |
| 798 | z = next_zones_zonelist(z, highidx, nodemask, &zone)) \ | 798 | z = next_zones_zonelist(++z, highidx, nodemask, &zone)) \ |
| 799 | 799 | ||
| 800 | /** | 800 | /** |
| 801 | * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index | 801 | * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 1ce54b63085d..be764e514e35 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
| @@ -21,7 +21,14 @@ struct pnp_dev; | |||
| 21 | /* | 21 | /* |
| 22 | * Resource Management | 22 | * Resource Management |
| 23 | */ | 23 | */ |
| 24 | #ifdef CONFIG_PNP | ||
| 24 | struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int); | 25 | struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int); |
| 26 | #else | ||
| 27 | static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num) | ||
| 28 | { | ||
| 29 | return NULL; | ||
| 30 | } | ||
| 31 | #endif | ||
| 25 | 32 | ||
| 26 | static inline int pnp_resource_valid(struct resource *res) | 33 | static inline int pnp_resource_valid(struct resource *res) |
| 27 | { | 34 | { |
diff --git a/include/net/netlink.h b/include/net/netlink.h index 18024b8cecb8..208fe5a38546 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h | |||
| @@ -702,7 +702,7 @@ static inline int nla_len(const struct nlattr *nla) | |||
| 702 | */ | 702 | */ |
| 703 | static inline int nla_ok(const struct nlattr *nla, int remaining) | 703 | static inline int nla_ok(const struct nlattr *nla, int remaining) |
| 704 | { | 704 | { |
| 705 | return remaining >= sizeof(*nla) && | 705 | return remaining >= (int) sizeof(*nla) && |
| 706 | nla->nla_len >= sizeof(*nla) && | 706 | nla->nla_len >= sizeof(*nla) && |
| 707 | nla->nla_len <= remaining; | 707 | nla->nla_len <= remaining; |
| 708 | } | 708 | } |
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 5c40cc537d4c..192f8716aa9e 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h | |||
| @@ -309,6 +309,20 @@ struct scsi_lun { | |||
| 309 | }; | 309 | }; |
| 310 | 310 | ||
| 311 | /* | 311 | /* |
| 312 | * The Well Known LUNS (SAM-3) in our int representation of a LUN | ||
| 313 | */ | ||
| 314 | #define SCSI_W_LUN_BASE 0xc100 | ||
| 315 | #define SCSI_W_LUN_REPORT_LUNS (SCSI_W_LUN_BASE + 1) | ||
| 316 | #define SCSI_W_LUN_ACCESS_CONTROL (SCSI_W_LUN_BASE + 2) | ||
| 317 | #define SCSI_W_LUN_TARGET_LOG_PAGE (SCSI_W_LUN_BASE + 3) | ||
| 318 | |||
| 319 | static inline int scsi_is_wlun(unsigned int lun) | ||
| 320 | { | ||
| 321 | return (lun & 0xff00) == SCSI_W_LUN_BASE; | ||
| 322 | } | ||
| 323 | |||
| 324 | |||
| 325 | /* | ||
| 312 | * MESSAGE CODES | 326 | * MESSAGE CODES |
| 313 | */ | 327 | */ |
| 314 | 328 | ||
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index f227bc172690..827cd9adccb2 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -843,37 +843,25 @@ static void cpuset_change_cpumask(struct task_struct *tsk, | |||
| 843 | /** | 843 | /** |
| 844 | * update_tasks_cpumask - Update the cpumasks of tasks in the cpuset. | 844 | * update_tasks_cpumask - Update the cpumasks of tasks in the cpuset. |
| 845 | * @cs: the cpuset in which each task's cpus_allowed mask needs to be changed | 845 | * @cs: the cpuset in which each task's cpus_allowed mask needs to be changed |
| 846 | * @heap: if NULL, defer allocating heap memory to cgroup_scan_tasks() | ||
| 846 | * | 847 | * |
| 847 | * Called with cgroup_mutex held | 848 | * Called with cgroup_mutex held |
| 848 | * | 849 | * |
| 849 | * The cgroup_scan_tasks() function will scan all the tasks in a cgroup, | 850 | * The cgroup_scan_tasks() function will scan all the tasks in a cgroup, |
| 850 | * calling callback functions for each. | 851 | * calling callback functions for each. |
| 851 | * | 852 | * |
| 852 | * Return 0 if successful, -errno if not. | 853 | * No return value. It's guaranteed that cgroup_scan_tasks() always returns 0 |
| 854 | * if @heap != NULL. | ||
| 853 | */ | 855 | */ |
| 854 | static int update_tasks_cpumask(struct cpuset *cs) | 856 | static void update_tasks_cpumask(struct cpuset *cs, struct ptr_heap *heap) |
| 855 | { | 857 | { |
| 856 | struct cgroup_scanner scan; | 858 | struct cgroup_scanner scan; |
| 857 | struct ptr_heap heap; | ||
| 858 | int retval; | ||
| 859 | |||
| 860 | /* | ||
| 861 | * cgroup_scan_tasks() will initialize heap->gt for us. | ||
| 862 | * heap_init() is still needed here for we should not change | ||
| 863 | * cs->cpus_allowed when heap_init() fails. | ||
| 864 | */ | ||
| 865 | retval = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL); | ||
| 866 | if (retval) | ||
| 867 | return retval; | ||
| 868 | 859 | ||
| 869 | scan.cg = cs->css.cgroup; | 860 | scan.cg = cs->css.cgroup; |
| 870 | scan.test_task = cpuset_test_cpumask; | 861 | scan.test_task = cpuset_test_cpumask; |
| 871 | scan.process_task = cpuset_change_cpumask; | 862 | scan.process_task = cpuset_change_cpumask; |
| 872 | scan.heap = &heap; | 863 | scan.heap = heap; |
| 873 | retval = cgroup_scan_tasks(&scan); | 864 | cgroup_scan_tasks(&scan); |
| 874 | |||
| 875 | heap_free(&heap); | ||
| 876 | return retval; | ||
| 877 | } | 865 | } |
| 878 | 866 | ||
| 879 | /** | 867 | /** |
| @@ -883,6 +871,7 @@ static int update_tasks_cpumask(struct cpuset *cs) | |||
| 883 | */ | 871 | */ |
| 884 | static int update_cpumask(struct cpuset *cs, const char *buf) | 872 | static int update_cpumask(struct cpuset *cs, const char *buf) |
| 885 | { | 873 | { |
| 874 | struct ptr_heap heap; | ||
| 886 | struct cpuset trialcs; | 875 | struct cpuset trialcs; |
| 887 | int retval; | 876 | int retval; |
| 888 | int is_load_balanced; | 877 | int is_load_balanced; |
| @@ -917,6 +906,10 @@ static int update_cpumask(struct cpuset *cs, const char *buf) | |||
| 917 | if (cpus_equal(cs->cpus_allowed, trialcs.cpus_allowed)) | 906 | if (cpus_equal(cs->cpus_allowed, trialcs.cpus_allowed)) |
| 918 | return 0; | 907 | return 0; |
| 919 | 908 | ||
| 909 | retval = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL); | ||
| 910 | if (retval) | ||
| 911 | return retval; | ||
| 912 | |||
| 920 | is_load_balanced = is_sched_load_balance(&trialcs); | 913 | is_load_balanced = is_sched_load_balance(&trialcs); |
| 921 | 914 | ||
| 922 | mutex_lock(&callback_mutex); | 915 | mutex_lock(&callback_mutex); |
| @@ -927,9 +920,9 @@ static int update_cpumask(struct cpuset *cs, const char *buf) | |||
| 927 | * Scan tasks in the cpuset, and update the cpumasks of any | 920 | * Scan tasks in the cpuset, and update the cpumasks of any |
| 928 | * that need an update. | 921 | * that need an update. |
| 929 | */ | 922 | */ |
| 930 | retval = update_tasks_cpumask(cs); | 923 | update_tasks_cpumask(cs, &heap); |
| 931 | if (retval < 0) | 924 | |
| 932 | return retval; | 925 | heap_free(&heap); |
| 933 | 926 | ||
| 934 | if (is_load_balanced) | 927 | if (is_load_balanced) |
| 935 | async_rebuild_sched_domains(); | 928 | async_rebuild_sched_domains(); |
| @@ -1965,7 +1958,7 @@ static void scan_for_empty_cpusets(const struct cpuset *root) | |||
| 1965 | nodes_empty(cp->mems_allowed)) | 1958 | nodes_empty(cp->mems_allowed)) |
| 1966 | remove_tasks_in_empty_cpuset(cp); | 1959 | remove_tasks_in_empty_cpuset(cp); |
| 1967 | else { | 1960 | else { |
| 1968 | update_tasks_cpumask(cp); | 1961 | update_tasks_cpumask(cp, NULL); |
| 1969 | update_tasks_nodemask(cp, &oldmems); | 1962 | update_tasks_nodemask(cp, &oldmems); |
| 1970 | } | 1963 | } |
| 1971 | } | 1964 | } |
diff --git a/kernel/sched.c b/kernel/sched.c index cc1f81b50b82..98890807375b 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -8909,6 +8909,9 @@ static int sched_rt_global_constraints(void) | |||
| 8909 | u64 rt_runtime, rt_period; | 8909 | u64 rt_runtime, rt_period; |
| 8910 | int ret = 0; | 8910 | int ret = 0; |
| 8911 | 8911 | ||
| 8912 | if (sysctl_sched_rt_period <= 0) | ||
| 8913 | return -EINVAL; | ||
| 8914 | |||
| 8912 | rt_period = ktime_to_ns(tg->rt_bandwidth.rt_period); | 8915 | rt_period = ktime_to_ns(tg->rt_bandwidth.rt_period); |
| 8913 | rt_runtime = tg->rt_bandwidth.rt_runtime; | 8916 | rt_runtime = tg->rt_bandwidth.rt_runtime; |
| 8914 | 8917 | ||
| @@ -8925,6 +8928,9 @@ static int sched_rt_global_constraints(void) | |||
| 8925 | unsigned long flags; | 8928 | unsigned long flags; |
| 8926 | int i; | 8929 | int i; |
| 8927 | 8930 | ||
| 8931 | if (sysctl_sched_rt_period <= 0) | ||
| 8932 | return -EINVAL; | ||
| 8933 | |||
| 8928 | spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags); | 8934 | spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags); |
| 8929 | for_each_possible_cpu(i) { | 8935 | for_each_possible_cpu(i) { |
| 8930 | struct rt_rq *rt_rq = &cpu_rq(i)->rt; | 8936 | struct rt_rq *rt_rq = &cpu_rq(i)->rt; |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 552310798dad..1113157b2058 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -350,6 +350,7 @@ static void __enable_runtime(struct rq *rq) | |||
| 350 | spin_lock(&rt_rq->rt_runtime_lock); | 350 | spin_lock(&rt_rq->rt_runtime_lock); |
| 351 | rt_rq->rt_runtime = rt_b->rt_runtime; | 351 | rt_rq->rt_runtime = rt_b->rt_runtime; |
| 352 | rt_rq->rt_time = 0; | 352 | rt_rq->rt_time = 0; |
| 353 | rt_rq->rt_throttled = 0; | ||
| 353 | spin_unlock(&rt_rq->rt_runtime_lock); | 354 | spin_unlock(&rt_rq->rt_runtime_lock); |
| 354 | spin_unlock(&rt_b->rt_runtime_lock); | 355 | spin_unlock(&rt_b->rt_runtime_lock); |
| 355 | } | 356 | } |
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 1876b526c778..f8d968063cea 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c | |||
| @@ -72,6 +72,16 @@ void clockevents_set_mode(struct clock_event_device *dev, | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | /** | 74 | /** |
| 75 | * clockevents_shutdown - shutdown the device and clear next_event | ||
| 76 | * @dev: device to shutdown | ||
| 77 | */ | ||
| 78 | void clockevents_shutdown(struct clock_event_device *dev) | ||
| 79 | { | ||
| 80 | clockevents_set_mode(dev, CLOCK_EVT_MODE_SHUTDOWN); | ||
| 81 | dev->next_event.tv64 = KTIME_MAX; | ||
| 82 | } | ||
| 83 | |||
| 84 | /** | ||
| 75 | * clockevents_program_event - Reprogram the clock event device. | 85 | * clockevents_program_event - Reprogram the clock event device. |
| 76 | * @expires: absolute expiry time (monotonic clock) | 86 | * @expires: absolute expiry time (monotonic clock) |
| 77 | * | 87 | * |
| @@ -206,7 +216,7 @@ void clockevents_exchange_device(struct clock_event_device *old, | |||
| 206 | 216 | ||
| 207 | if (new) { | 217 | if (new) { |
| 208 | BUG_ON(new->mode != CLOCK_EVT_MODE_UNUSED); | 218 | BUG_ON(new->mode != CLOCK_EVT_MODE_UNUSED); |
| 209 | clockevents_set_mode(new, CLOCK_EVT_MODE_SHUTDOWN); | 219 | clockevents_shutdown(new); |
| 210 | } | 220 | } |
| 211 | local_irq_restore(flags); | 221 | local_irq_restore(flags); |
| 212 | } | 222 | } |
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 2f5a38294bf9..bd7034542399 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c | |||
| @@ -235,9 +235,8 @@ static void tick_do_broadcast_on_off(void *why) | |||
| 235 | case CLOCK_EVT_NOTIFY_BROADCAST_FORCE: | 235 | case CLOCK_EVT_NOTIFY_BROADCAST_FORCE: |
| 236 | if (!cpu_isset(cpu, tick_broadcast_mask)) { | 236 | if (!cpu_isset(cpu, tick_broadcast_mask)) { |
| 237 | cpu_set(cpu, tick_broadcast_mask); | 237 | cpu_set(cpu, tick_broadcast_mask); |
| 238 | if (td->mode == TICKDEV_MODE_PERIODIC) | 238 | if (bc->mode == TICKDEV_MODE_PERIODIC) |
| 239 | clockevents_set_mode(dev, | 239 | clockevents_shutdown(dev); |
| 240 | CLOCK_EVT_MODE_SHUTDOWN); | ||
| 241 | } | 240 | } |
| 242 | if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE) | 241 | if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE) |
| 243 | tick_broadcast_force = 1; | 242 | tick_broadcast_force = 1; |
| @@ -246,7 +245,7 @@ static void tick_do_broadcast_on_off(void *why) | |||
| 246 | if (!tick_broadcast_force && | 245 | if (!tick_broadcast_force && |
| 247 | cpu_isset(cpu, tick_broadcast_mask)) { | 246 | cpu_isset(cpu, tick_broadcast_mask)) { |
| 248 | cpu_clear(cpu, tick_broadcast_mask); | 247 | cpu_clear(cpu, tick_broadcast_mask); |
| 249 | if (td->mode == TICKDEV_MODE_PERIODIC) | 248 | if (bc->mode == TICKDEV_MODE_PERIODIC) |
| 250 | tick_setup_periodic(dev, 0); | 249 | tick_setup_periodic(dev, 0); |
| 251 | } | 250 | } |
| 252 | break; | 251 | break; |
| @@ -254,7 +253,7 @@ static void tick_do_broadcast_on_off(void *why) | |||
| 254 | 253 | ||
| 255 | if (cpus_empty(tick_broadcast_mask)) { | 254 | if (cpus_empty(tick_broadcast_mask)) { |
| 256 | if (!bc_stopped) | 255 | if (!bc_stopped) |
| 257 | clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN); | 256 | clockevents_shutdown(bc); |
| 258 | } else if (bc_stopped) { | 257 | } else if (bc_stopped) { |
| 259 | if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) | 258 | if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) |
| 260 | tick_broadcast_start_periodic(bc); | 259 | tick_broadcast_start_periodic(bc); |
| @@ -306,7 +305,7 @@ void tick_shutdown_broadcast(unsigned int *cpup) | |||
| 306 | 305 | ||
| 307 | if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) { | 306 | if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) { |
| 308 | if (bc && cpus_empty(tick_broadcast_mask)) | 307 | if (bc && cpus_empty(tick_broadcast_mask)) |
| 309 | clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN); | 308 | clockevents_shutdown(bc); |
| 310 | } | 309 | } |
| 311 | 310 | ||
| 312 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); | 311 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); |
| @@ -321,7 +320,7 @@ void tick_suspend_broadcast(void) | |||
| 321 | 320 | ||
| 322 | bc = tick_broadcast_device.evtdev; | 321 | bc = tick_broadcast_device.evtdev; |
| 323 | if (bc) | 322 | if (bc) |
| 324 | clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN); | 323 | clockevents_shutdown(bc); |
| 325 | 324 | ||
| 326 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); | 325 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); |
| 327 | } | 326 | } |
| @@ -576,4 +575,12 @@ void tick_shutdown_broadcast_oneshot(unsigned int *cpup) | |||
| 576 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); | 575 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); |
| 577 | } | 576 | } |
| 578 | 577 | ||
| 578 | /* | ||
| 579 | * Check, whether the broadcast device is in one shot mode | ||
| 580 | */ | ||
| 581 | int tick_broadcast_oneshot_active(void) | ||
| 582 | { | ||
| 583 | return tick_broadcast_device.mode == TICKDEV_MODE_ONESHOT; | ||
| 584 | } | ||
| 585 | |||
| 579 | #endif | 586 | #endif |
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index c4777193d567..df12434b43ca 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c | |||
| @@ -33,7 +33,7 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device); | |||
| 33 | */ | 33 | */ |
| 34 | ktime_t tick_next_period; | 34 | ktime_t tick_next_period; |
| 35 | ktime_t tick_period; | 35 | ktime_t tick_period; |
| 36 | int tick_do_timer_cpu __read_mostly = -1; | 36 | int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT; |
| 37 | DEFINE_SPINLOCK(tick_device_lock); | 37 | DEFINE_SPINLOCK(tick_device_lock); |
| 38 | 38 | ||
| 39 | /* | 39 | /* |
| @@ -109,7 +109,8 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast) | |||
| 109 | if (!tick_device_is_functional(dev)) | 109 | if (!tick_device_is_functional(dev)) |
| 110 | return; | 110 | return; |
| 111 | 111 | ||
| 112 | if (dev->features & CLOCK_EVT_FEAT_PERIODIC) { | 112 | if ((dev->features & CLOCK_EVT_FEAT_PERIODIC) && |
| 113 | !tick_broadcast_oneshot_active()) { | ||
| 113 | clockevents_set_mode(dev, CLOCK_EVT_MODE_PERIODIC); | 114 | clockevents_set_mode(dev, CLOCK_EVT_MODE_PERIODIC); |
| 114 | } else { | 115 | } else { |
| 115 | unsigned long seq; | 116 | unsigned long seq; |
| @@ -148,7 +149,7 @@ static void tick_setup_device(struct tick_device *td, | |||
| 148 | * If no cpu took the do_timer update, assign it to | 149 | * If no cpu took the do_timer update, assign it to |
| 149 | * this cpu: | 150 | * this cpu: |
| 150 | */ | 151 | */ |
| 151 | if (tick_do_timer_cpu == -1) { | 152 | if (tick_do_timer_cpu == TICK_DO_TIMER_BOOT) { |
| 152 | tick_do_timer_cpu = cpu; | 153 | tick_do_timer_cpu = cpu; |
| 153 | tick_next_period = ktime_get(); | 154 | tick_next_period = ktime_get(); |
| 154 | tick_period = ktime_set(0, NSEC_PER_SEC / HZ); | 155 | tick_period = ktime_set(0, NSEC_PER_SEC / HZ); |
| @@ -249,7 +250,7 @@ static int tick_check_new_device(struct clock_event_device *newdev) | |||
| 249 | * not give it back to the clockevents layer ! | 250 | * not give it back to the clockevents layer ! |
| 250 | */ | 251 | */ |
| 251 | if (tick_is_broadcast_device(curdev)) { | 252 | if (tick_is_broadcast_device(curdev)) { |
| 252 | clockevents_set_mode(curdev, CLOCK_EVT_MODE_SHUTDOWN); | 253 | clockevents_shutdown(curdev); |
| 253 | curdev = NULL; | 254 | curdev = NULL; |
| 254 | } | 255 | } |
| 255 | clockevents_exchange_device(curdev, newdev); | 256 | clockevents_exchange_device(curdev, newdev); |
| @@ -300,7 +301,8 @@ static void tick_shutdown(unsigned int *cpup) | |||
| 300 | if (*cpup == tick_do_timer_cpu) { | 301 | if (*cpup == tick_do_timer_cpu) { |
| 301 | int cpu = first_cpu(cpu_online_map); | 302 | int cpu = first_cpu(cpu_online_map); |
| 302 | 303 | ||
| 303 | tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu : -1; | 304 | tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu : |
| 305 | TICK_DO_TIMER_NONE; | ||
| 304 | } | 306 | } |
| 305 | spin_unlock_irqrestore(&tick_device_lock, flags); | 307 | spin_unlock_irqrestore(&tick_device_lock, flags); |
| 306 | } | 308 | } |
| @@ -311,7 +313,7 @@ static void tick_suspend(void) | |||
| 311 | unsigned long flags; | 313 | unsigned long flags; |
| 312 | 314 | ||
| 313 | spin_lock_irqsave(&tick_device_lock, flags); | 315 | spin_lock_irqsave(&tick_device_lock, flags); |
| 314 | clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_SHUTDOWN); | 316 | clockevents_shutdown(td->evtdev); |
| 315 | spin_unlock_irqrestore(&tick_device_lock, flags); | 317 | spin_unlock_irqrestore(&tick_device_lock, flags); |
| 316 | } | 318 | } |
| 317 | 319 | ||
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index 0ffc2918ea6f..469248782c23 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * tick internal variable and functions used by low/high res code | 2 | * tick internal variable and functions used by low/high res code |
| 3 | */ | 3 | */ |
| 4 | |||
| 5 | #define TICK_DO_TIMER_NONE -1 | ||
| 6 | #define TICK_DO_TIMER_BOOT -2 | ||
| 7 | |||
| 4 | DECLARE_PER_CPU(struct tick_device, tick_cpu_device); | 8 | DECLARE_PER_CPU(struct tick_device, tick_cpu_device); |
| 5 | extern spinlock_t tick_device_lock; | 9 | extern spinlock_t tick_device_lock; |
| 6 | extern ktime_t tick_next_period; | 10 | extern ktime_t tick_next_period; |
| @@ -10,6 +14,8 @@ extern int tick_do_timer_cpu __read_mostly; | |||
| 10 | extern void tick_setup_periodic(struct clock_event_device *dev, int broadcast); | 14 | extern void tick_setup_periodic(struct clock_event_device *dev, int broadcast); |
| 11 | extern void tick_handle_periodic(struct clock_event_device *dev); | 15 | extern void tick_handle_periodic(struct clock_event_device *dev); |
| 12 | 16 | ||
| 17 | extern void clockevents_shutdown(struct clock_event_device *dev); | ||
| 18 | |||
| 13 | /* | 19 | /* |
| 14 | * NO_HZ / high resolution timer shared code | 20 | * NO_HZ / high resolution timer shared code |
| 15 | */ | 21 | */ |
| @@ -29,6 +35,7 @@ extern void tick_broadcast_oneshot_control(unsigned long reason); | |||
| 29 | extern void tick_broadcast_switch_to_oneshot(void); | 35 | extern void tick_broadcast_switch_to_oneshot(void); |
| 30 | extern void tick_shutdown_broadcast_oneshot(unsigned int *cpup); | 36 | extern void tick_shutdown_broadcast_oneshot(unsigned int *cpup); |
| 31 | extern int tick_resume_broadcast_oneshot(struct clock_event_device *bc); | 37 | extern int tick_resume_broadcast_oneshot(struct clock_event_device *bc); |
| 38 | extern int tick_broadcast_oneshot_active(void); | ||
| 32 | # else /* BROADCAST */ | 39 | # else /* BROADCAST */ |
| 33 | static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc) | 40 | static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc) |
| 34 | { | 41 | { |
| @@ -37,6 +44,7 @@ static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc) | |||
| 37 | static inline void tick_broadcast_oneshot_control(unsigned long reason) { } | 44 | static inline void tick_broadcast_oneshot_control(unsigned long reason) { } |
| 38 | static inline void tick_broadcast_switch_to_oneshot(void) { } | 45 | static inline void tick_broadcast_switch_to_oneshot(void) { } |
| 39 | static inline void tick_shutdown_broadcast_oneshot(unsigned int *cpup) { } | 46 | static inline void tick_shutdown_broadcast_oneshot(unsigned int *cpup) { } |
| 47 | static inline int tick_broadcast_oneshot_active(void) { return 0; } | ||
| 40 | # endif /* !BROADCAST */ | 48 | # endif /* !BROADCAST */ |
| 41 | 49 | ||
| 42 | #else /* !ONESHOT */ | 50 | #else /* !ONESHOT */ |
| @@ -66,6 +74,7 @@ static inline int tick_resume_broadcast_oneshot(struct clock_event_device *bc) | |||
| 66 | { | 74 | { |
| 67 | return 0; | 75 | return 0; |
| 68 | } | 76 | } |
| 77 | static inline int tick_broadcast_oneshot_active(void) { return 0; } | ||
| 69 | #endif /* !TICK_ONESHOT */ | 78 | #endif /* !TICK_ONESHOT */ |
| 70 | 79 | ||
| 71 | /* | 80 | /* |
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index a87b0468568b..39019b3f7621 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -75,6 +75,9 @@ static void tick_do_update_jiffies64(ktime_t now) | |||
| 75 | incr * ticks); | 75 | incr * ticks); |
| 76 | } | 76 | } |
| 77 | do_timer(++ticks); | 77 | do_timer(++ticks); |
| 78 | |||
| 79 | /* Keep the tick_next_period variable up to date */ | ||
| 80 | tick_next_period = ktime_add(last_jiffies_update, tick_period); | ||
| 78 | } | 81 | } |
| 79 | write_sequnlock(&xtime_lock); | 82 | write_sequnlock(&xtime_lock); |
| 80 | } | 83 | } |
| @@ -221,7 +224,7 @@ void tick_nohz_stop_sched_tick(int inidle) | |||
| 221 | */ | 224 | */ |
| 222 | if (unlikely(!cpu_online(cpu))) { | 225 | if (unlikely(!cpu_online(cpu))) { |
| 223 | if (cpu == tick_do_timer_cpu) | 226 | if (cpu == tick_do_timer_cpu) |
| 224 | tick_do_timer_cpu = -1; | 227 | tick_do_timer_cpu = TICK_DO_TIMER_NONE; |
| 225 | } | 228 | } |
| 226 | 229 | ||
| 227 | if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) | 230 | if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) |
| @@ -303,7 +306,7 @@ void tick_nohz_stop_sched_tick(int inidle) | |||
| 303 | * invoked. | 306 | * invoked. |
| 304 | */ | 307 | */ |
| 305 | if (cpu == tick_do_timer_cpu) | 308 | if (cpu == tick_do_timer_cpu) |
| 306 | tick_do_timer_cpu = -1; | 309 | tick_do_timer_cpu = TICK_DO_TIMER_NONE; |
| 307 | 310 | ||
| 308 | ts->idle_sleeps++; | 311 | ts->idle_sleeps++; |
| 309 | 312 | ||
| @@ -468,7 +471,7 @@ static void tick_nohz_handler(struct clock_event_device *dev) | |||
| 468 | * this duty, then the jiffies update is still serialized by | 471 | * this duty, then the jiffies update is still serialized by |
| 469 | * xtime_lock. | 472 | * xtime_lock. |
| 470 | */ | 473 | */ |
| 471 | if (unlikely(tick_do_timer_cpu == -1)) | 474 | if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE)) |
| 472 | tick_do_timer_cpu = cpu; | 475 | tick_do_timer_cpu = cpu; |
| 473 | 476 | ||
| 474 | /* Check, if the jiffies need an update */ | 477 | /* Check, if the jiffies need an update */ |
| @@ -570,7 +573,7 @@ static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer) | |||
| 570 | * this duty, then the jiffies update is still serialized by | 573 | * this duty, then the jiffies update is still serialized by |
| 571 | * xtime_lock. | 574 | * xtime_lock. |
| 572 | */ | 575 | */ |
| 573 | if (unlikely(tick_do_timer_cpu == -1)) | 576 | if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE)) |
| 574 | tick_do_timer_cpu = cpu; | 577 | tick_do_timer_cpu = cpu; |
| 575 | #endif | 578 | #endif |
| 576 | 579 | ||
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 876ba6d5b670..8d2688ff1352 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c | |||
| @@ -422,9 +422,12 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, | |||
| 422 | { | 422 | { |
| 423 | unsigned int offset = 0; | 423 | unsigned int offset = 0; |
| 424 | struct sg_mapping_iter miter; | 424 | struct sg_mapping_iter miter; |
| 425 | unsigned long flags; | ||
| 425 | 426 | ||
| 426 | sg_miter_start(&miter, sgl, nents, SG_MITER_ATOMIC); | 427 | sg_miter_start(&miter, sgl, nents, SG_MITER_ATOMIC); |
| 427 | 428 | ||
| 429 | local_irq_save(flags); | ||
| 430 | |||
| 428 | while (sg_miter_next(&miter) && offset < buflen) { | 431 | while (sg_miter_next(&miter) && offset < buflen) { |
| 429 | unsigned int len; | 432 | unsigned int len; |
| 430 | 433 | ||
| @@ -442,6 +445,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, | |||
| 442 | 445 | ||
| 443 | sg_miter_stop(&miter); | 446 | sg_miter_stop(&miter); |
| 444 | 447 | ||
| 448 | local_irq_restore(flags); | ||
| 445 | return offset; | 449 | return offset; |
| 446 | } | 450 | } |
| 447 | 451 | ||
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 977edbdbc1de..8826fdf0f180 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
| @@ -491,7 +491,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, | |||
| 491 | * the lowest available address range. | 491 | * the lowest available address range. |
| 492 | */ | 492 | */ |
| 493 | dma_addr_t handle; | 493 | dma_addr_t handle; |
| 494 | handle = swiotlb_map_single(NULL, NULL, size, DMA_FROM_DEVICE); | 494 | handle = swiotlb_map_single(hwdev, NULL, size, DMA_FROM_DEVICE); |
| 495 | if (swiotlb_dma_mapping_error(hwdev, handle)) | 495 | if (swiotlb_dma_mapping_error(hwdev, handle)) |
| 496 | return NULL; | 496 | return NULL; |
| 497 | 497 | ||
diff --git a/mm/mmzone.c b/mm/mmzone.c index 486ed595ee6f..16ce8b955dcf 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c | |||
| @@ -69,6 +69,6 @@ struct zoneref *next_zones_zonelist(struct zoneref *z, | |||
| 69 | (z->zone && !zref_in_nodemask(z, nodes))) | 69 | (z->zone && !zref_in_nodemask(z, nodes))) |
| 70 | z++; | 70 | z++; |
| 71 | 71 | ||
| 72 | *zone = zonelist_zone(z++); | 72 | *zone = zonelist_zone(z); |
| 73 | return z; | 73 | return z; |
| 74 | } | 74 | } |
| @@ -1932,6 +1932,7 @@ init_kmem_cache_node(struct kmem_cache_node *n, struct kmem_cache *s) | |||
| 1932 | INIT_LIST_HEAD(&n->partial); | 1932 | INIT_LIST_HEAD(&n->partial); |
| 1933 | #ifdef CONFIG_SLUB_DEBUG | 1933 | #ifdef CONFIG_SLUB_DEBUG |
| 1934 | atomic_long_set(&n->nr_slabs, 0); | 1934 | atomic_long_set(&n->nr_slabs, 0); |
| 1935 | atomic_long_set(&n->total_objects, 0); | ||
| 1935 | INIT_LIST_HEAD(&n->full); | 1936 | INIT_LIST_HEAD(&n->full); |
| 1936 | #endif | 1937 | #endif |
| 1937 | } | 1938 | } |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index f5b21cb93699..278a3ace14f6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -164,6 +164,9 @@ static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev * | |||
| 164 | { | 164 | { |
| 165 | int ret; | 165 | int ret; |
| 166 | 166 | ||
| 167 | if (!test_bit(HCI_UP, &hdev->flags)) | ||
| 168 | return -ENETDOWN; | ||
| 169 | |||
| 167 | /* Serialize all requests */ | 170 | /* Serialize all requests */ |
| 168 | hci_req_lock(hdev); | 171 | hci_req_lock(hdev); |
| 169 | ret = __hci_request(hdev, req, opt, timeout); | 172 | ret = __hci_request(hdev, req, opt, timeout); |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 8e42fbbd5761..57e26fa66185 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -951,6 +951,27 @@ int udp_disconnect(struct sock *sk, int flags) | |||
| 951 | return 0; | 951 | return 0; |
| 952 | } | 952 | } |
| 953 | 953 | ||
| 954 | static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) | ||
| 955 | { | ||
| 956 | int is_udplite = IS_UDPLITE(sk); | ||
| 957 | int rc; | ||
| 958 | |||
| 959 | if ((rc = sock_queue_rcv_skb(sk, skb)) < 0) { | ||
| 960 | /* Note that an ENOMEM error is charged twice */ | ||
| 961 | if (rc == -ENOMEM) | ||
| 962 | UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, | ||
| 963 | is_udplite); | ||
| 964 | goto drop; | ||
| 965 | } | ||
| 966 | |||
| 967 | return 0; | ||
| 968 | |||
| 969 | drop: | ||
| 970 | UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); | ||
| 971 | kfree_skb(skb); | ||
| 972 | return -1; | ||
| 973 | } | ||
| 974 | |||
| 954 | /* returns: | 975 | /* returns: |
| 955 | * -1: error | 976 | * -1: error |
| 956 | * 0: success | 977 | * 0: success |
| @@ -989,9 +1010,7 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) | |||
| 989 | up->encap_rcv != NULL) { | 1010 | up->encap_rcv != NULL) { |
| 990 | int ret; | 1011 | int ret; |
| 991 | 1012 | ||
| 992 | bh_unlock_sock(sk); | ||
| 993 | ret = (*up->encap_rcv)(sk, skb); | 1013 | ret = (*up->encap_rcv)(sk, skb); |
| 994 | bh_lock_sock(sk); | ||
| 995 | if (ret <= 0) { | 1014 | if (ret <= 0) { |
| 996 | UDP_INC_STATS_BH(sock_net(sk), | 1015 | UDP_INC_STATS_BH(sock_net(sk), |
| 997 | UDP_MIB_INDATAGRAMS, | 1016 | UDP_MIB_INDATAGRAMS, |
| @@ -1044,17 +1063,16 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) | |||
| 1044 | goto drop; | 1063 | goto drop; |
| 1045 | } | 1064 | } |
| 1046 | 1065 | ||
| 1047 | if ((rc = sock_queue_rcv_skb(sk,skb)) < 0) { | 1066 | rc = 0; |
| 1048 | /* Note that an ENOMEM error is charged twice */ | ||
| 1049 | if (rc == -ENOMEM) { | ||
| 1050 | UDP_INC_STATS_BH(sock_net(sk), | ||
| 1051 | UDP_MIB_RCVBUFERRORS, is_udplite); | ||
| 1052 | atomic_inc(&sk->sk_drops); | ||
| 1053 | } | ||
| 1054 | goto drop; | ||
| 1055 | } | ||
| 1056 | 1067 | ||
| 1057 | return 0; | 1068 | bh_lock_sock(sk); |
| 1069 | if (!sock_owned_by_user(sk)) | ||
| 1070 | rc = __udp_queue_rcv_skb(sk, skb); | ||
| 1071 | else | ||
| 1072 | sk_add_backlog(sk, skb); | ||
| 1073 | bh_unlock_sock(sk); | ||
| 1074 | |||
| 1075 | return rc; | ||
| 1058 | 1076 | ||
| 1059 | drop: | 1077 | drop: |
| 1060 | UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); | 1078 | UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); |
| @@ -1092,15 +1110,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
| 1092 | skb1 = skb_clone(skb, GFP_ATOMIC); | 1110 | skb1 = skb_clone(skb, GFP_ATOMIC); |
| 1093 | 1111 | ||
| 1094 | if (skb1) { | 1112 | if (skb1) { |
| 1095 | int ret = 0; | 1113 | int ret = udp_queue_rcv_skb(sk, skb1); |
| 1096 | |||
| 1097 | bh_lock_sock(sk); | ||
| 1098 | if (!sock_owned_by_user(sk)) | ||
| 1099 | ret = udp_queue_rcv_skb(sk, skb1); | ||
| 1100 | else | ||
| 1101 | sk_add_backlog(sk, skb1); | ||
| 1102 | bh_unlock_sock(sk); | ||
| 1103 | |||
| 1104 | if (ret > 0) | 1114 | if (ret > 0) |
| 1105 | /* we should probably re-process instead | 1115 | /* we should probably re-process instead |
| 1106 | * of dropping packets here. */ | 1116 | * of dropping packets here. */ |
| @@ -1195,13 +1205,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], | |||
| 1195 | uh->dest, inet_iif(skb), udptable); | 1205 | uh->dest, inet_iif(skb), udptable); |
| 1196 | 1206 | ||
| 1197 | if (sk != NULL) { | 1207 | if (sk != NULL) { |
| 1198 | int ret = 0; | 1208 | int ret = udp_queue_rcv_skb(sk, skb); |
| 1199 | bh_lock_sock(sk); | ||
| 1200 | if (!sock_owned_by_user(sk)) | ||
| 1201 | ret = udp_queue_rcv_skb(sk, skb); | ||
| 1202 | else | ||
| 1203 | sk_add_backlog(sk, skb); | ||
| 1204 | bh_unlock_sock(sk); | ||
| 1205 | sock_put(sk); | 1209 | sock_put(sk); |
| 1206 | 1210 | ||
| 1207 | /* a return value > 0 means to resubmit the input, but | 1211 | /* a return value > 0 means to resubmit the input, but |
| @@ -1494,7 +1498,7 @@ struct proto udp_prot = { | |||
| 1494 | .sendmsg = udp_sendmsg, | 1498 | .sendmsg = udp_sendmsg, |
| 1495 | .recvmsg = udp_recvmsg, | 1499 | .recvmsg = udp_recvmsg, |
| 1496 | .sendpage = udp_sendpage, | 1500 | .sendpage = udp_sendpage, |
| 1497 | .backlog_rcv = udp_queue_rcv_skb, | 1501 | .backlog_rcv = __udp_queue_rcv_skb, |
| 1498 | .hash = udp_lib_hash, | 1502 | .hash = udp_lib_hash, |
| 1499 | .unhash = udp_lib_unhash, | 1503 | .unhash = udp_lib_unhash, |
| 1500 | .get_port = udp_v4_get_port, | 1504 | .get_port = udp_v4_get_port, |
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 9634091ee2f0..ec0a0839ce51 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -215,10 +215,9 @@ static void dev_watchdog(unsigned long arg) | |||
| 215 | time_after(jiffies, (dev->trans_start + | 215 | time_after(jiffies, (dev->trans_start + |
| 216 | dev->watchdog_timeo))) { | 216 | dev->watchdog_timeo))) { |
| 217 | char drivername[64]; | 217 | char drivername[64]; |
| 218 | printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n", | 218 | WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n", |
| 219 | dev->name, netdev_drivername(dev, drivername, 64)); | 219 | dev->name, netdev_drivername(dev, drivername, 64)); |
| 220 | dev->tx_timeout(dev); | 220 | dev->tx_timeout(dev); |
| 221 | WARN_ON_ONCE(1); | ||
| 222 | } | 221 | } |
| 223 | if (!mod_timer(&dev->watchdog_timer, | 222 | if (!mod_timer(&dev->watchdog_timer, |
| 224 | round_jiffies(jiffies + | 223 | round_jiffies(jiffies + |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 8472b8b349c4..abd51cef2413 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -599,11 +599,12 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, | |||
| 599 | /* Check to see if this is a duplicate. */ | 599 | /* Check to see if this is a duplicate. */ |
| 600 | peer = sctp_assoc_lookup_paddr(asoc, addr); | 600 | peer = sctp_assoc_lookup_paddr(asoc, addr); |
| 601 | if (peer) { | 601 | if (peer) { |
| 602 | /* An UNKNOWN state is only set on transports added by | ||
| 603 | * user in sctp_connectx() call. Such transports should be | ||
| 604 | * considered CONFIRMED per RFC 4960, Section 5.4. | ||
| 605 | */ | ||
| 602 | if (peer->state == SCTP_UNKNOWN) { | 606 | if (peer->state == SCTP_UNKNOWN) { |
| 603 | if (peer_state == SCTP_ACTIVE) | 607 | peer->state = SCTP_ACTIVE; |
| 604 | peer->state = SCTP_ACTIVE; | ||
| 605 | if (peer_state == SCTP_UNCONFIRMED) | ||
| 606 | peer->state = SCTP_UNCONFIRMED; | ||
| 607 | } | 608 | } |
| 608 | return peer; | 609 | return peer; |
| 609 | } | 610 | } |
diff --git a/net/sctp/output.c b/net/sctp/output.c index 0dc4a7dfb234..225c7123c41f 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -533,7 +533,8 @@ int sctp_packet_transmit(struct sctp_packet *packet) | |||
| 533 | if (!(dst->dev->features & NETIF_F_NO_CSUM)) { | 533 | if (!(dst->dev->features & NETIF_F_NO_CSUM)) { |
| 534 | crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len); | 534 | crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len); |
| 535 | crc32 = sctp_end_cksum(crc32); | 535 | crc32 = sctp_end_cksum(crc32); |
| 536 | } | 536 | } else |
| 537 | nskb->ip_summed = CHECKSUM_UNNECESSARY; | ||
| 537 | 538 | ||
| 538 | /* 3) Put the resultant value into the checksum field in the | 539 | /* 3) Put the resultant value into the checksum field in the |
| 539 | * common header, and leave the rest of the bits unchanged. | 540 | * common header, and leave the rest of the bits unchanged. |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index e8ca4e54981f..b599cbba4fbe 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
| @@ -1886,11 +1886,13 @@ static void sctp_process_ext_param(struct sctp_association *asoc, | |||
| 1886 | /* if the peer reports AUTH, assume that he | 1886 | /* if the peer reports AUTH, assume that he |
| 1887 | * supports AUTH. | 1887 | * supports AUTH. |
| 1888 | */ | 1888 | */ |
| 1889 | asoc->peer.auth_capable = 1; | 1889 | if (sctp_auth_enable) |
| 1890 | asoc->peer.auth_capable = 1; | ||
| 1890 | break; | 1891 | break; |
| 1891 | case SCTP_CID_ASCONF: | 1892 | case SCTP_CID_ASCONF: |
| 1892 | case SCTP_CID_ASCONF_ACK: | 1893 | case SCTP_CID_ASCONF_ACK: |
| 1893 | asoc->peer.asconf_capable = 1; | 1894 | if (sctp_addip_enable) |
| 1895 | asoc->peer.asconf_capable = 1; | ||
| 1894 | break; | 1896 | break; |
| 1895 | default: | 1897 | default: |
| 1896 | break; | 1898 | break; |
| @@ -2319,12 +2321,10 @@ clean_up: | |||
| 2319 | /* Release the transport structures. */ | 2321 | /* Release the transport structures. */ |
| 2320 | list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) { | 2322 | list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) { |
| 2321 | transport = list_entry(pos, struct sctp_transport, transports); | 2323 | transport = list_entry(pos, struct sctp_transport, transports); |
| 2322 | list_del_init(pos); | 2324 | if (transport->state != SCTP_ACTIVE) |
| 2323 | sctp_transport_free(transport); | 2325 | sctp_assoc_rm_peer(asoc, transport); |
| 2324 | } | 2326 | } |
| 2325 | 2327 | ||
| 2326 | asoc->peer.transport_count = 0; | ||
| 2327 | |||
| 2328 | nomem: | 2328 | nomem: |
| 2329 | return 0; | 2329 | return 0; |
| 2330 | } | 2330 | } |
| @@ -2460,6 +2460,9 @@ do_addr_param: | |||
| 2460 | break; | 2460 | break; |
| 2461 | 2461 | ||
| 2462 | case SCTP_PARAM_SET_PRIMARY: | 2462 | case SCTP_PARAM_SET_PRIMARY: |
| 2463 | if (!sctp_addip_enable) | ||
| 2464 | goto fall_through; | ||
| 2465 | |||
| 2463 | addr_param = param.v + sizeof(sctp_addip_param_t); | 2466 | addr_param = param.v + sizeof(sctp_addip_param_t); |
| 2464 | 2467 | ||
| 2465 | af = sctp_get_af_specific(param_type2af(param.p->type)); | 2468 | af = sctp_get_af_specific(param_type2af(param.p->type)); |