commit a3cf859321486f69506326146ab3e2fd15c05c3f Merge: 3c3622d... 33468e7... Author: Linus Torvalds Date: Wed Jul 16 11:47:35 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (44 commits) hwmon: (w83l786ng) Convert to a new-style i2c driver hwmon: (w83l785ts) Convert to a new-style i2c driver hwmon: (w83793) Convert to a new-style i2c driver hwmon: (w83792d) Convert to a new-style i2c driver hwmon: (w83791d) Convert to a new-style i2c driver hwmon: (thmc50) Convert to a new-style i2c driver hwmon: (smsc47m192) Convert to a new-style i2c driver hwmon: (max6650) Convert to a new-style i2c driver hwmon: (max1619) Convert to a new-style i2c driver hwmon: (lm93) Convert to a new-style i2c driver hwmon: (lm92) Convert to a new-style i2c driver hwmon: (lm90) Convert to a new-style i2c driver hwmon: (lm87) Convert to a new-style i2c driver hwmon: (lm83) Convert to a new-style i2c driver hwmon: (lm80) Convert to a new-style i2c driver hwmon: (lm77) Convert to a new-style i2c driver hwmon: (lm63) Convert to a new-style i2c driver hwmon: (gl520sm) Convert to a new-style i2c driver hwmon: (gl518sm) Convert to a new-style i2c driver hwmon: (fscpos) Convert to a new-style i2c driver ... commit 3c3622dcb64c76c9abd2e468f802db9ba523421c Author: Randy Dunlap Date: Wed Jul 16 08:52:00 2008 -0500 Fix compile issues in fs/compat_ioctl.c when CONFIG_BLOCK is disabled Fix fs/compat_ioctl.c to handle CONFIG_BLOCK=n, CONFIG_SCSI=n to avoid build errors: In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:71: include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:71: include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd': include/scsi/scsi_cmnd.h:182: error: implicit declaration of function 'blk_bidi_rq' include/scsi/scsi_cmnd.h:183: error: dereferencing pointer to incomplete type include/scsi/scsi_cmnd.h: In function 'scsi_in': include/scsi/scsi_cmnd.h:189: error: dereferencing pointer to incomplete type Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e3621ee633810be1079d0fa65ac2c904f53b73fa Author: Kumar Gala Date: Wed Jul 16 08:39:12 2008 -0500 powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET If we don't enable FS_ENET we get build issues: arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe': arch/powerpc/platforms/82xx/ep8248e.c:129: undefined reference to `alloc_mdio_bitbang' arch/powerpc/platforms/82xx/ep8248e.c:143: undefined reference to `mdiobus_register' Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit bef5b54bd7bf8117c75cb943d64549134c6d9a1f Author: Ralf Baechle Date: Wed Jul 16 13:02:24 2008 +0100 Fix MIPS cross-compile problem Crosscompiling on a Fedora 9 machine running gcc 4.3.0 as its host compiler and gcc 3.4.6 for the mips-linux target results in the following build error: $ make malta_defconfig $ make cc1: error: unrecognized command line option "-fno-stack-protector" scripts/kconfig/conf -s arch/mips/Kconfig cc1: error: unrecognized command line option "-fno-stack-protector" The arch Makefile is included too late so the host compiler is feature tested, not the crosscompiler as intended and thus the Makefile applies adds -fno-stack-protector to crosscompiler's flags which fails for gcc 3.4.6. The bug was introduced by e06b8b98da071f7dd78fb7822991694288047df0 in 2.6.25; 35bb5b1e0e84cfa1a8906f7e6a77f391ff315791 did add more flags testing before the arch Makefile inclusion. Signed-off-by: Ralf Baechle Signed-off-by: Linus Torvalds commit 33468e7637c53b5516902422d66ca3d3fe64a9c3 Author: Jean Delvare Date: Wed Jul 16 19:30:18 2008 +0200 hwmon: (w83l786ng) Convert to a new-style i2c driver The new-style w83l786ng driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Kevin Lo commit dc18a4184d6794e2e5c6f05142f3f8aaeeaee506 Author: Jean Delvare Date: Wed Jul 16 19:30:18 2008 +0200 hwmon: (w83l785ts) Convert to a new-style i2c driver The new-style w83l785ts driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a7f13a6ec40379fe2116c647ac8e569227ba8d4f Author: Jean Delvare Date: Wed Jul 16 19:30:17 2008 +0200 hwmon: (w83793) Convert to a new-style i2c driver The new-style w83793 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 31d5d275a118527a2b9b0f68613428f176efbb8f Author: Jean Delvare Date: Wed Jul 16 19:30:17 2008 +0200 hwmon: (w83792d) Convert to a new-style i2c driver The new-style w83792d driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit cb0c1af37996f3016e34e9c709e5f727646f7207 Author: Jean Delvare Date: Wed Jul 16 19:30:17 2008 +0200 hwmon: (w83791d) Convert to a new-style i2c driver The new-style w83791d driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Marc Hulsman commit ccf37488322429bf8709f2227f3d48466add2b6b Author: Jean Delvare Date: Wed Jul 16 19:30:16 2008 +0200 hwmon: (thmc50) Convert to a new-style i2c driver The new-style thmc50 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Krzysztof Helt commit 8fb597bb6ec80d53836229bf3576c7b848b909e3 Author: Jean Delvare Date: Wed Jul 16 19:30:16 2008 +0200 hwmon: (smsc47m192) Convert to a new-style i2c driver The new-style smsc47m192 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Hartmut Rick commit 0d57abd5b87e2e82d8d2e8d5c9a3b56743ffa5ab Author: Jean Delvare Date: Wed Jul 16 19:30:16 2008 +0200 hwmon: (max6650) Convert to a new-style i2c driver The new-style max6650 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Hans J. Koch commit c6d3f6fa1b0b984991d6e2a261c7dd7f2685c7bd Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (max1619) Convert to a new-style i2c driver The new-style max1619 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Alexey Fisher commit 70b724063f789a443aff1e1a6f0f04d971342116 Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (lm93) Convert to a new-style i2c driver The new-style lm93 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Mark M. Hoffman Cc: Eric J. Bowersox Cc: Carsten Emde Cc: Hans J. Koch commit 910e8dcf16dd7afc08dc1791155cc69e07ca4183 Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (lm92) Convert to a new-style i2c driver The new-style lm92 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 9b0e85269275159a1f9c3e4a5d254caf5211950b Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (lm90) Convert to a new-style i2c driver The new-style lm90 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a888420af07b9a26b6d518328baa913fb704e950 Author: Jean Delvare Date: Wed Jul 16 19:30:14 2008 +0200 hwmon: (lm87) Convert to a new-style i2c driver The new-style lm87 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Ben Hutchings commit b6aacdcefac8ed60e77930b6e74129da6478e20e Author: Jean Delvare Date: Wed Jul 16 19:30:14 2008 +0200 hwmon: (lm83) Convert to a new-style i2c driver The new-style lm83 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 8c8bacc883610b672d3f08dc6ebf1f17e495f5b9 Author: Jean Delvare Date: Wed Jul 16 19:30:14 2008 +0200 hwmon: (lm80) Convert to a new-style i2c driver The new-style lm80 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a189dd62d328db7bf8ba68de6a948fdbc93dca25 Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (lm77) Convert to a new-style i2c driver The new-style lm77 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Andras Bali commit d5957be2f1535b1a6c77eabba0781ec7245c5dea Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (lm63) Convert to a new-style i2c driver The new-style lm63 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a23a9fe1d4d725e1624635f49e9790ec32deffd0 Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (gl520sm) Convert to a new-style i2c driver The new-style gl520sm driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Maarten Deprez commit 95d80e7c834d8742da38e2b9d2f36dec36da03a6 Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (gl518sm) Convert to a new-style i2c driver The new-style gl518sm driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit b9e39b1b1b79d3e074ca79b63f548ac48c85ca98 Author: Jean Delvare Date: Wed Jul 16 19:30:12 2008 +0200 hwmon: (fscpos) Convert to a new-style i2c driver The new-style fscpos driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 40ac1994bf988dac05434f856c2a4fa24e22b2ea Author: Jean Delvare Date: Wed Jul 16 19:30:12 2008 +0200 hwmon: (fschmd) Convert to a new-style i2c driver The new-style fschmd driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Hans de Goede commit c2df1591df3ea83b4a5890a1131dd821ca07e761 Author: Jean Delvare Date: Wed Jul 16 19:30:12 2008 +0200 hwmon: (fscher) Convert to a new-style i2c driver The new-style fscher driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Reinhard Nissl commit 935ada8c4481f9591caa1b88c83127c5931a8855 Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (f75375s) Drop legacy i2c driver Drop the legacy f75375s i2c driver, and add a detect callback to the new-style i2c driver to achieve the same functionality. Signed-off-by: Jean Delvare Acked-by: Riku Voipio commit 70313eabfc63ce6aa89b9fa3074129e5c521568a Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (ds1621) Convert to a new-style i2c driver The new-style ds1621 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 71163c7c36fa76bb5a72feca7fb685677444070a Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (atxp1) Convert to a new-style i2c driver The new-style atxp1 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 063675b15608dfbb8404b3a19546d579bd039d02 Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (asb100) Convert to a new-style i2c driver The new-style asb100 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit eea54766c6e3f9850affa91061164aeb6bba44b6 Author: Jean Delvare Date: Wed Jul 16 19:30:10 2008 +0200 hwmon: (adt7473) Convert to a new-style i2c driver The new-style adt7473 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Darrick J. Wong commit 008f1ca51e4a25ee3e34b8faa901dbeefaf0081a Author: Jean Delvare Date: Wed Jul 16 19:30:10 2008 +0200 hwmon: (adt7470) Convert to a new-style i2c driver The new-style adt7470 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Darrick J. Wong commit 7347cb388e5aecffc4920bd5ea6a61e4a4690bae Author: Jean Delvare Date: Wed Jul 16 19:30:10 2008 +0200 hwmon: (ads7828) Convert to a new-style i2c driver The new-style ads7828 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 7fae8283109e155467bc1c622178d3a475cdbddf Author: Jean Delvare Date: Wed Jul 16 19:30:09 2008 +0200 hwmon: (adm9240) Convert to a new-style i2c driver The new-style adm9240 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Grant Coady commit af200f881d2cbf3ba2f4c505fa1ae5cfef36f46a Author: Jean Delvare Date: Wed Jul 16 19:30:09 2008 +0200 hwmon: (adm1031) Convert to a new-style i2c driver The new-style adm1031 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Alexandre d'Alton commit 9c97fb4d255fbf6713ee2d77dd8ed8ae770a7e49 Author: Jean Delvare Date: Wed Jul 16 19:30:09 2008 +0200 hwmon: (adm1029) Convert to a new-style i2c driver The new-style adm1029 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Corentin Labbe commit 57f7eb0bcb2316dc264cd26f38b33dd2cf3151c1 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (adm1026) Convert to a new-style i2c driver The new-style adm1026 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 7dbafe021ba360bf25674a7e290d3e4a5c953981 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (adm1025) Convert to a new-style i2c driver The new-style adm1025 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 65817ed8d1376afff21019b5c0e0109e5a7d9cc0 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (adm1021) Convert to a new-style i2c driver The new-style adm1021 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 369932f6f840aedfbc717dd156bba7668a11d916 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (ad7418) Convert to a new-style i2c driver The ad7418 driver is only used on embedded platforms where i2c devices can easily be declared in platform code. Thus a new-style i2c driver makes perfect sense. This lets us get rid of quirky detection code (these chips have no identification registers) and shrinks the binary driver size by 38%. Signed-off-by: Jean Delvare Cc: Alessandro Zummo commit 61c91f7ded640bb2b340cc89d9ca3a3ca0229c74 Author: Jean Delvare Date: Wed Jul 16 19:30:07 2008 +0200 w1/ds2482: Convert to a new-style driver The new-style ds2482 driver implements the optional detect() callback to cover the use cases of the legacy driver. I'm curious if anyone really needs this though, so it might be removed in the feature. Signed-off-by: Jean Delvare commit bd8d421f7ca9f8da3d820d28379d796500f69529 Author: Jean Delvare Date: Wed Jul 16 19:30:07 2008 +0200 i2c: Convert the max6875 driver to a new-style i2c driver The new-style max6875 driver implements the optional detect() callback to cover the use cases of the legacy driver. I'm curious if anyone really needs this though, so it might be removed in the feature. Signed-off-by: Jean Delvare commit 3d63430a26b91fe3daee0dd933f899c225e66daa Author: Jean Delvare Date: Wed Jul 16 19:30:07 2008 +0200 i2c: Convert the pca9539 driver to a new-style i2c driver The new-style pca9539 driver implements the optional detect() callback to cover the use cases of the legacy driver. Warning: users will now have to use the force module parameter to get the driver to attach to their device. That's not a bad thing as these devices can't be detected anyway. Note that this doesn't change the fact that this driver is deprecated in favor of gpio/pca953x. Signed-off-by: Jean Delvare commit 97addff6def3f8e228a634fa017589f45c69de5c Author: Jean Delvare Date: Wed Jul 16 19:30:06 2008 +0200 i2c: Convert the pcf8575 driver to a new-style i2c driver The new-style pcf8575 driver implements the optional detect() callback to cover the use cases of the legacy driver. Warning: users will now have to use the force module parameter to get the driver to attach to their device. That's not a bad thing as these devices can't be detected anyway. Note that this doesn't change the fact that this driver is deprecated in favor of gpio/pcf857x. Signed-off-by: Jean Delvare commit 833bedb813689807385ae73175389c73a3f855c1 Author: Jean Delvare Date: Wed Jul 16 19:30:06 2008 +0200 i2c: Convert the pcf8574 driver to a new-style i2c driver The new-style pcf8574 driver implements the optional detect() callback to cover the use cases of the legacy driver. Warning: users will now have to use the force module parameter to get the driver to attach to their device. That's not a bad thing as these devices can't be detected anyway. Note that this doesn't change the fact that this driver is deprecated in favor of gpio/pcf857x. Signed-off-by: Jean Delvare commit 8b77e6ac4911a79993e583ece719736a9e035b1d Author: Jean Delvare Date: Wed Jul 16 19:30:06 2008 +0200 i2c: Convert the pcf8591 driver to a new-style i2c driver The new-style pcf8591 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 68be3363740e4ac3b4309faebcdf8fe5bf62ed2f Author: Jean Delvare Date: Wed Jul 16 19:30:05 2008 +0200 i2c: Convert the eeprom driver to a new-style i2c driver The new-style eeprom driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit bd4bc3dbded9cd7b2bdca6bba1aecb4251a8039d Author: Jean Delvare Date: Wed Jul 16 19:30:05 2008 +0200 i2c: Clear i2c_adapter.dev on adapter removal Clear i2c_adapter.dev on adapter removal. This makes it possible to re-add the adapter at a later point, which some drivers (i2c-amd756-s4882, i2c-nforce2-s4985) actually do. This fixes a bug reported by John Stultz here: http://lkml.org/lkml/2008/7/15/720 and by Ingo Molar there: http://lkml.org/lkml/2008/7/16/78 Signed-off-by: Jean Delvare Cc: John Stultz Cc: Ingo Molnar commit d25dc7fd4740decf4c66e2f17dbaa288448fabd5 Author: David Woodhouse Date: Tue Jul 15 22:54:04 2008 -0700 Fix 'make clean' and .gitignore for firmware/ directory. Provide a .gitignore file, and fix a typo which prevented some of the generated binary files from being removed on 'make clean'. Signed-off-by: David Woodhouse Reported-and-tested-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 45158894d4d6704afbb4cefe55e5f6ca279fe12a Merge: 89a93f2... 84c3d4a... Author: Linus Torvalds Date: Tue Jul 15 19:04:58 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (249 commits) powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES powerpc: Fix a build problem on ppc32 with new DMA_ATTRs ibm_newemac: Add MII mode support to the EMAC RGMII bridge. powerpc: Don't spin on sync instruction at boot time powerpc: Add VSX load/store alignment exception handler powerpc: fix giveup_vsx to save registers correctly powerpc: support for latencytop powerpc: Remove unnecessary condition when sanity-checking WIMG bits powerpc: Add PPC_FEATURE_PSERIES_PERFMON_COMPAT powerpc: Add driver for Barrier Synchronization Register powerpc: mman.h export fixups powerpc/fsl: update crypto node definition and device tree instances powerpc/fsl: Refactor device bindings powerpc/85xx: Minor fixes for 85xxds and 8536ds board. powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform powerpc/85xx: publish of device for cds platforms powerpc/booke: don't reinitialize time base powerpc/86xx: Refactor pic init powerpc/CPM: Add i2c pins to dts and board setup cpm_uart: Support uart_wait_until_sent() ... commit 89a93f2f4834f8c126e8d9dd6b368d0b9e21ec3d Merge: 260eddf... fe9233f... Author: Linus Torvalds Date: Tue Jul 15 18:58:04 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits) [SCSI] scsi_dh: fix kconfig related build errors [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h [SCSI] make struct scsi_{host,target}_type static [SCSI] fix locking in host use of blk_plug_device() [SCSI] zfcp: Cleanup external header file [SCSI] zfcp: Cleanup code in zfcp_erp.c [SCSI] zfcp: zfcp_fsf cleanup. [SCSI] zfcp: consolidate sysfs things into one file. [SCSI] zfcp: Cleanup of code in zfcp_aux.c [SCSI] zfcp: Cleanup of code in zfcp_scsi.c [SCSI] zfcp: Move status accessors from zfcp to SCSI include file. [SCSI] zfcp: Small QDIO cleanups [SCSI] zfcp: Adapter reopen for large number of unsolicited status [SCSI] zfcp: Fix error checking for ELS ADISC requests [SCSI] zfcp: wait until adapter is finished with ERP during auto-port [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver [SCSI] sg: Add target reset support [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC [SCSI] sd: Move scsi_disk() accessor function to sd.h ... commit 260eddf4391f162a69d1d163729249635fa7a78f Merge: f2d9c74... 7890ea1... Author: Linus Torvalds Date: Tue Jul 15 18:57:38 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: Revert crypto: prng - Deterministic CPRNG commit f2d9c740f6b9f92608dfb2a2bdd797e0350cabe4 Author: Steven Rostedt Date: Tue Jul 15 10:57:33 2008 -0400 ftrace: ftrace.txt updates This patch includes ftrace.txt updates that address (mostly) comments from Andrew Morton. It also includes updates that were suggested by Randy Dunlap, John Kacur and David Teigland. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 84c3d4aaec3338201b449034beac41635866bddf Merge: 43d2548... fafa3a3... Author: Benjamin Herrenschmidt Date: Wed Jul 16 11:07:59 2008 +1000 Merge commit 'origin/master' Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c commit fafa3a3f16723997f039a0193997464d66dafd8f Merge: 7e2225d... 431ceb8... Author: Linus Torvalds Date: Tue Jul 15 16:29:18 2008 -0700 Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix TSC build error on 32bit commit 7e2225d860772aaa07e1cebca6a5aa6f93f9aa91 Merge: 3a628b0... b27418a... Author: Linus Torvalds Date: Tue Jul 15 15:01:29 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (54 commits) [MIPS] Remove mips_machtype for LASAT machines [MIPS] Remove mips_machtype from EMMA2RH machines [MIPS] Remove mips_machtype from ARC based machines [MIPS] MTX-1 flash partition setup move to platform devices registration [MIPS] TXx9: cleanup and fix some sparse warnings [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx [MIPS] remove machtype for group Toshiba [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() [MIPS] txx9_board_vec set directly without mips_machtype [MIPS] IP22: Add platform device for Indy volume buttons [MIPS] cmbvr4133: Remove support [MIPS] remove wrppmc_machine_power_off() [MIPS] replace inline assembler to cpu_wait() [MIPS] IP22/28: Add platform devices for HAL2 [MIPS] TXx9: Update and merge defconfigs [MIPS] TXx9: Make single kernel can support multiple boards [MIPS] TXx9: Update defconfigs [MIPS] TXx9: Reorganize PCI code ... commit 3a628b0fd42f7eaf9d052447784d48ceae9ffb8e Author: Mikulas Patocka Date: Tue Jul 15 17:19:55 2008 -0400 Don't crash on IOMMU overflow in A100U2W driver Handle IOMMU overflow correctly, by retrying. IOMMU errors can happen and drivers must deal with them. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit a5db33411ae762e597bfcde6bb9d0c8c2ea9c0eb Author: Mikulas Patocka Date: Tue Jul 15 17:18:38 2008 -0400 BUG_ON on kernel misbehavior on A100U2W driver With broken Sparc64 IOMMU accounting, the kernel submits larger requests then allowed. Better to crash on BUG than corrupt memory. Signed-off-by: Mikulas Patocka Acked-by: James Bottomley Signed-off-by: Linus Torvalds commit 56d387ec210049be2fdb0fe26ba6d6de1b3c1b15 Author: Mikulas Patocka Date: Tue Jul 15 17:16:38 2008 -0400 Add udelay to A100U2W SCSI driver udelay is required on Sun Ultra 5. I don't know any reason or explanation for this, it was found purely experimentally. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit 987ff954cda2a206f5e694f267b0ccad869c257c Author: Mikulas Patocka Date: Tue Jul 15 17:15:41 2008 -0400 Fix endianity in A100U2W SCSI driver Support big endian systems in a100u2w driver. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit 63cf13b77ab785e87c867defa8545e6d4a989774 Author: Jeremy Fitzhardinge Date: Tue Jul 15 13:22:49 2008 -0700 generic ipi function calls: wait on alloc failure fallback When a GFP_ATOMIC allocation fails, it falls back to allocating the data on the stack and converting it to a waiting call. Make sure we actually wait in this case. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 59190f4213462f191fc0d22d39b1cf18ea39ca39 Merge: 64fd52a... f6f88e9... Author: Linus Torvalds Date: Tue Jul 15 14:02:33 2008 -0700 Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits) generic-ipi: more merge fallout generic-ipi: merge fix x86, visws: use mach-default/entry_arch.h x86, visws: fix generic-ipi build generic-ipi: fixlet generic-ipi: fix s390 build bug generic-ipi: fix linux-next tree build failure fix: "smp_call_function: get rid of the unused nonatomic/retry argument" fix: "smp_call_function: get rid of the unused nonatomic/retry argument" fix "smp_call_function: get rid of the unused nonatomic/retry argument" on_each_cpu(): kill unused 'retry' parameter smp_call_function: get rid of the unused nonatomic/retry argument sh: convert to generic helpers for IPI function calls parisc: convert to generic helpers for IPI function calls mips: convert to generic helpers for IPI function calls m32r: convert to generic helpers for IPI function calls arm: convert to generic helpers for IPI function calls alpha: convert to generic helpers for IPI function calls ia64: convert to generic helpers for IPI function calls powerpc: convert to generic helpers for IPI function calls ... Fix trivial conflicts due to rcu updates in kernel/rcupdate.c manually commit 64fd52a52077d3cd5a778ca031c0aaecf885eaa6 Merge: fe1a687... 6c9fcaf... Author: Linus Torvalds Date: Tue Jul 15 13:59:31 2008 -0700 Merge branch 'core/rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits) rcu classic: update qlen when cpu offline rcu: make rcutorture even more vicious: invoke RCU readers from irq handlers (timers) rcu: make quiescent rcutorture less power-hungry rcu, rcutorture: make quiescent rcutorture less power-hungry rcu: make rcutorture more vicious: reinstate boot-time testing rcu: make rcutorture more vicious: add stutter feature rcutorture: WARN_ON_ONCE(1) when detecting an error rcu: remove unused field struct rcu_data::rcu_tasklet Revert "prohibit rcutorture from being compiled into the kernel" rcu: fix nf_conntrack_helper.c build bug rculist.h: fix include in net/netfilter/nf_conntrack_netlink.c rcu: remove duplicated include in kernel/rcupreempt.c rcu: remove duplicated include in kernel/rcupreempt_trace.c RCU, rculist.h: fix list iterators rcu: fix rcu_try_flip_waitack_needed() to prevent grace-period stall rculist.h: use the rcu API rcu: split list.h and move rcu-protected lists into rculist.h sched: 1Q08 RCU doc update, add call_rcu_sched() rcu: add call_rcu_sched() and friends to rcutorture rcu: add rcu_barrier_sched() and rcu_barrier_bh() ... commit fe1a6875fcaaac2041945008a9875d2c07be1d9b Author: Sebastian Siewior Date: Tue Jul 15 22:28:46 2008 +0200 mm: fix build on non-mmu machines Commit 1ea0704e0d aka "mm: add a ptep_modify_prot transaction abstraction" caused: | CC init/main.o |In file included from include2/asm/pgtable.h:68, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/mm.h:39, | from include2/asm/uaccess.h:8, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/poll.h:13, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/rtc.h:113, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/efi.h:19, | from /home/bigeasy/git/linux-2.6-m68k/init/main.c:43: |/linux-2.6/include/asm-generic/pgtable.h: In function '__ptep_modify_prot_start': |/linux-2.6/include/asm-generic/pgtable.h:209: error: implicit declaration of function 'ptep_get_and_clear' |/linux-2.6/include/asm-generic/pgtable.h:209: error: incompatible types in return |/linux-2.6/include/asm-generic/pgtable.h: In function '__ptep_modify_prot_commit': |/linux-2.6/include/asm-generic/pgtable.h:220: error: implicit declaration of function 'set_pte_at' |make[2]: *** [init/main.o] Error 1 |make[1]: *** [init] Error 2 |make: *** [sub-make] Error 2 on my m68knommu box. Acked-by: Jeremy Fitzhardinge Cc: Linus Torvalds Cc: Hugh Dickins Cc: Ingo Molnar Signed-off-by: Sebastian Siewior Signed-off-by: Linus Torvalds commit de3b69d7d87e1e86c0307f0f15b377dcebeab906 Author: Steven Rostedt Date: Tue Jul 15 13:28:14 2008 -0400 ftrace: maintainer I'm willing to take responsibility for ftrace, and follow up on any issues that arise due to it. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 431ceb83f703a343bdd14350480a2224fa4bfedf Author: Thomas Gleixner Date: Tue Jul 15 22:08:04 2008 +0200 x86: fix TSC build error on 32bit Dave Hansen reported a build error on 32bit which went unnoticed as newer gcc versions seem to optimize unused static functions away before compiling them. Make vread_tsc() depend on CONFIG_X86_64 Signed-off-by: Thomas Gleixner commit f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be Author: Ingo Molnar Date: Tue Jul 15 22:08:52 2008 +0200 generic-ipi: more merge fallout fix more API change fallout in recently merged upstream changes. Signed-off-by: Ingo Molnar commit b3c9816b9fa9a7b75ab36111eb76eca03e5bab78 Author: Ingo Molnar Date: Tue Jul 15 22:03:56 2008 +0200 generic-ipi: merge fix fix merge fallout: arch/x86/pci/amd_bus.c: In function ‘enable_pci_io_ecs': arch/x86/pci/amd_bus.c:581: error: too many arguments to function ‘on_each_cpu' Signed-off-by: Ingo Molnar commit 1a781a777b2f6ac46523fe92396215762ced624d Merge: b9d2252... 42a2f21... Author: Ingo Molnar Date: Tue Jul 15 21:55:59 2008 +0200 Merge branch 'generic-ipi' into generic-ipi-for-linus Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar commit 22a37bcb7857541eb2d37806c4744ee2530baa98 Merge: 849c529... 82f06e8... Author: Linus Torvalds Date: Tue Jul 15 12:39:44 2008 -0700 Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: sbp2: spin disks down on suspend and shutdown firewire: fw-sbp2: spin disks down on suspend and shutdown ieee1394: sbp2: fix spindown for PL-3507 and TSB42AA9 firmwares firewire: fw-sbp2: fix spindown for PL-3507 and TSB42AA9 firmwares scsi: sd: optionally set power condition in START STOP UNIT commit 849c529f57020cc47085400edd5e641d95cd4faf Merge: b9d2252... a7ea678... Author: Linus Torvalds Date: Tue Jul 15 12:39:13 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: don't respond to broadcast write requests firewire: clean up fw_card reference counting firewire: clean up some includes firewire: remove unused struct members firewire: implement broadcast_channel CSR for 1394a compliance ieee1394: dump mmapped iso buffers in core files ieee1394: raw1394: Push the BKL down into the driver ioctls ieee1394: video1394: reorder module init, prepare BKL removal ieee1394: reduce log noise about config ROM CRC errors commit 6c9fcaf2eec1b9f85226a694230dd957dd7926b3 Merge: b9d2252... 199a952... Author: Ingo Molnar Date: Tue Jul 15 21:10:12 2008 +0200 Merge branch 'core/rcu' into core/rcu-for-linus commit b9d2252c1e44fa83a4e65fdc9eb93db6297c55af Merge: b312bf3... e79aec2... Author: Linus Torvalds Date: Tue Jul 15 11:26:14 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slab: rename slab_destroy_objs slub: current is always valid slub: Add check for kfree() of non slab objects. commit b312bf359e20cc39c00d480fd40a24c245d80bf7 Merge: dc221ea... 2640d7c... Author: Linus Torvalds Date: Tue Jul 15 11:18:10 2008 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: AHCI: Remove an unnecessary flush from ahci_qc_issue AHCI: speed up resume [libata] Add support for VPD page b1 ata: endianness annotations in pata drivers libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc [libata] sata_svw: update code comments relating to data corruption libata/ahci: enclosure management support libata: improve EH internal command timeout handling libata: use ULONG_MAX to terminate reset timeout table libata: improve EH retry delay handling libata: consistently use msecs for time durations commit dc221eae08eea3b0db127d1f152fac24d10b6a52 Merge: 98339cb... 4735c98... Author: Linus Torvalds Date: Tue Jul 15 11:16:05 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (56 commits) i2c: Add detection capability to new-style drivers i2c: Call client_unregister for new-style devices too i2c: Clean up old chip drivers i2c-ibm_iic: Register child nodes i2c: New-style EEPROM driver using device IDs i2c: Export the i2c_bus_type symbol i2c-au1550: Fix PM support i2c-dev: Delete empty detach_client callback i2c: Drop stray references to lm_sensors i2c: Check for ACPI resource conflicts i2c-ocores: basic PM support i2c-sibyte: SWARM I2C board initialization i2c-i801: Fix handling of error conditions i2c-i801: Rename local variable temp to status i2c-i801: Properly report bus arbitration loss i2c-i801: Remove verbose debugging messages i2c-algo-pcf: Drop unused struct members i2c-algo-pcf: Multi-master lost-arbitration improvement i2c: Deprecate the legacy gpio drivers i2c-pxa: Initialize early ... commit 98339cbd360b77c3167db287fd611468c2c44559 Merge: e4e0fad... cbbc4e8... Author: Linus Torvalds Date: Tue Jul 15 11:15:36 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (80 commits) ide-floppy: fix unfortunate function naming ide-tape: unify idetape_create_read/write_cmd ide: add ide_pc_intr() helper ide-{floppy,scsi}: read Status Register before stopping DMA engine ide-scsi: add more debugging to idescsi_pc_intr() ide-scsi: use pc->callback ide-floppy: add more debugging to idefloppy_pc_intr() ide-tape: always log debug info in idetape_pc_intr() if debugging is enabled ide-tape: add ide_tape_io_buffers() helper ide-tape: factor out DSC handling from idetape_pc_intr() ide-{floppy,tape}: move checking of ->failed_pc to ->callback ide: add ide_issue_pc() helper ide: add PC_FLAG_DRQ_INTERRUPT pc flag ide-scsi: move idescsi_map_sg() call out from idescsi_issue_pc() ide: add ide_transfer_pc() helper ide-scsi: set drive->scsi flag for devices handled by the driver ide-{cd,floppy,tape}: remove checking for drive->scsi ide: add PC_FLAG_ZIP_DRIVE pc flag ide-tape: factor out waiting for good ireason from idetape_transfer_pc() ide-tape: set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() ... commit cbbc4e818de4451cdef75a112b7fc8a523d5d2a0 Author: Borislav Petkov Date: Tue Jul 15 21:22:03 2008 +0200 ide-floppy: fix unfortunate function naming mv idefloppy_transfer_pc1 idefloppy_start_pc_transfer mv idefloppy_transfer_pc2 idefloppy_transfer_pc which describes their functionality and disambiguates them. There should be no functionality change introduced by this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit cd2abbfec84f43db740483daf4ea528d49d8858f Author: Borislav Petkov Date: Tue Jul 15 21:22:03 2008 +0200 ide-tape: unify idetape_create_read/write_cmd A straightforward one. There should be no functional change resulting from this change. [bart: minor fixups] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 646c0cb6c430f8d3ad3769dd1518fe664ff0ce27 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:03 2008 +0200 ide: add ide_pc_intr() helper * ide-tape.c: add 'drive' argument to idetape_update_buffers(). * Add generic ide_pc_intr() helper to ide-atapi.c and then convert ide-{floppy,tape,scsi} device drivers to use it. * ide-tape.c: remove no longer needed DBG_PC_INTR. There should be no functional changes caused by this patch (unless the debugging is explicitely compiled in). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 55d82bfa6763d6761670d740ab3bac2f1c042d87 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:03 2008 +0200 ide-{floppy,scsi}: read Status Register before stopping DMA engine Read Status Register before stopping DMA engine to match ide-tape device driver - it should be safe and shouldn't affect anything. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit cdca5c1f3b769eb2cdfc9cadc254cb74ba73c7d6 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:02 2008 +0200 ide-scsi: add more debugging to idescsi_pc_intr() Add more debugging to idescsi_pc_intr() to match ide-tape's idetape_pc_intr(). While at it: * Correct the first debug message. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit c6b2d260b5a7a5ed32aa2ce370d81183fc37eeb1 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:02 2008 +0200 ide-scsi: use pc->callback * Add ide_scsi_callback() pc->callback implementation, then update idescsi_check_condition() and idescsi_queue() to setup ->callback. * Convert idescsi_pc_intr() to use pc->callback. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4c93067ea9e5eca9d975bec74dae641228ac1bbe Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:02 2008 +0200 ide-floppy: add more debugging to idefloppy_pc_intr() Add more debugging to idefloppy_pc_intr() to match ide-tape's idetape_pc_intr(). While at it: * Correct the first debug message. * Log device name with "DMA finished" message. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3e421d324c003f8f002f402141b15d758adbfaef Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-tape: always log debug info in idetape_pc_intr() if debugging is enabled Add DBG_PC_INTR debug level and use it to always log debug info in idetape_pc_intr() if debugging is enabled. While at it: * Use drive->name instead of tape->name. * Log device name with "DMA finished" message. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 08424ac24a35b505463919a897b097f27e4dca96 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-tape: add ide_tape_io_buffers() helper * Add ide_tape_io_buffers() helper which is a wrapper for idetape_{in,out}put_buffers() and convert idetape_pc_intr() to use it. * Remove no longer used idetape_io_buf typedef. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz --- commit 74e63e74ea57e06839aa5fcf016eace35da26050 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-tape: factor out DSC handling from idetape_pc_intr() Factor out DSC handling from idetape_pc_intr() to ide_tape_handle_dsc() helper as a preparation for adding generic ide_pc_intr() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit dd2e9a032bc552f6e2ae852e81cde602c09d7d3e Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-{floppy,tape}: move checking of ->failed_pc to ->callback Move checking/resetting of ->failed_pc from ide*_pc_intr() to ->callback as a preparation for adding generic ide_pc_intr() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz --- commit 6bf1641ca1c7554f0da54aaf89788731b541bacc Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:00 2008 +0200 ide: add ide_issue_pc() helper Add generic ide_issue_pc() helper to ide-atapi.c and then convert ide-{floppy,tape,scsi} device drivers to use it. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 28c7214bd8c2bbd4873b8f1e7f58d86d3731124f Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:59 2008 +0200 ide: add PC_FLAG_DRQ_INTERRUPT pc flag Add PC_FLAG_DRQ_INTERRUPT pc flag, set it in ide*_do_request() and check for it (instead of checking for IDE*_FLAG_DRQ_INTERRUPT) in ide*_issue_pc(). This is a preparation for adding generic ide_issue_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4cc196897de9e6c02cf86debc5b9f7cf1b69a214 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:58 2008 +0200 ide-scsi: move idescsi_map_sg() call out from idescsi_issue_pc() Move idescsi_map_sg() call out from idescsi_issue_pc() to idescsi_do_request() as a preparation to adding generic ide_issue_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 594c16d8dd54cd7b1c5ef1ec3ac0f6bf34301dad Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:58 2008 +0200 ide: add ide_transfer_pc() helper * Add ide-atapi.c file for generic ATAPI support together with CONFIG_IDE_ATAPI config option. * Add generic ide_transfer_pc() helper to ide-atapi.c and then convert ide-{floppy,tape,scsi} device drivers to use it. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit f83cbc77b0d5521b4f0f591ede4870316944481a Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:58 2008 +0200 ide-scsi: set drive->scsi flag for devices handled by the driver This is a preparation for adding generic ide_transfer_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 794cc6804bb946826b7427d205ac391a5370d361 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide-{cd,floppy,tape}: remove checking for drive->scsi Remove checking for drive->scsi which is no longer set by IDE core code (leave the flag since it will be re-used for generic ATAPI support). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5d41893c0f9caf94b449eada0279a08c86f0212e Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide: add PC_FLAG_ZIP_DRIVE pc flag Add PC_FLAG_ZIP_DRIVE pc flag, set it in idefloppy_do_request() and check for it (instead of checking for IDEFLOPPY_FLAG_ZIP_DRIVE) in idefloppy_transfer_pc(). This is a preparation for adding generic ide_transfer_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5a7b75ab429e9ed568be50cfbf7091f097457cb8 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide-tape: factor out waiting for good ireason from idetape_transfer_pc() Factor out waiting for good ireason from idetape_transfer_pc() to ide_tape_wait_ireason() as a preparation for adding generic ide_transfer_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 9fd13a27c8a35ff1986793cb96aaedb5e75b5368 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide-tape: set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() Set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() instead of idetape_issue_pc() to match the other ATAPI device drivers. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 6ffb66410dd9f5f383d9265d51ab667333a8296c Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:56 2008 +0200 ide-floppy: start DMA engine in idefloppy_transfer_pc1() Start DMA engine and set PC_FLAG_DMA_IN_PROGRESS flag in idefloppy_transfer_pc1() instead of idefloppy_issue_pc() so the Status Register and the Interrupt Reason Register are checked first. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5e3310958204912f3f00be2592c945fbc37db6ae Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:56 2008 +0200 ide-{floppy,tape}: PC_FLAG_DMA_RECOMMENDED -> PC_FLAG_DMA_OK * Use PC_FLAG_DMA_OK flag instead of PC_FLAG_DMA_RECOMMENDED one. * Remove no longer used PC_FLAG_DMA_RECOMMENDED flag. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1b06e92aa03018e4b3ba281e03a7711d9b71a998 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:56 2008 +0200 ide-{floppy,tape}: merge pc->idefloppy_callback and pc->idetape_callback Merge pc->idefloppy_callback and pc->idetape_callback into pc->callback. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 81f4938239fea86d0a7529194a37fb81041171e0 Author: Borislav Petkov Date: Tue Jul 15 21:21:56 2008 +0200 ide-floppy: merge callbacks The appropriate functionality of the callback is established through querying the ATAPI packet command in pc->c[0]. While at it, simplify if (floppy->failed_pc)-branch to be found in the original idefloppy_request_sense_callback(). Bart: - keep handling for blk_pc_request() requests unchanged + add FIXME - add uptodate variable + leave just one idefloppy_end_request() call - add newline to the debug message Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 92f5daff2b8439fa4c57c57f47823ffc459c3bd9 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:55 2008 +0200 ide-tape: make pc->idetape_callback void There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5985e6abbd89f969c17fd80ab864c80f089827a3 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:55 2008 +0200 ide-tape: merge callbacks The appropriate functionality of the callback is established through querying the ATAPI packet command in pc->c[0]. While at it: - add uptodate variable + leave just one idetape_end_request() call - don't use HWGROUP() macro Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 258ec4113081c2b63117dc2df6d94c3e484e9747 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:55 2008 +0200 ide-tape: make idetape_retry_pc() void idetape_retry_pc() always returns ide_stopped so make it void. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 568ca92774d2f6be4a7e2f8357559bfdc9424056 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-{floppy,tape,scsi}: log device name instead of driver name Log device name instead of driver name in *_pc_intr() and *_transfer_pc*(). While at it: * Merge two consecutive printk()-s in *_pc_intr() together. * Replace "floppy"/"tape"/"scsi" references in printk()-s by "device". Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0b2eea4c5594ceaf13c57eaff7ff226263f1c36f Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-floppy: merge idefloppy_transfer_pc() and idefloppy_transfer_pc1() * Check IDEFLOPPY_FLAG_ZIP_DRIVE flag in idefloppy_transfer_pc1() and skip idefloppy_transfer_pc2()-phase if the flag is not set. * Always use idefloppy_transfer_pc1() in idefloppy_issue_pc() and remove no longer needed idefloppy_transfer_pc(). There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 170ee569bbe1005baebf2e9e4c3f4622d14ec851 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-tape: remove SIMULATE_ERRORS debug code Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 531e9e50543ebf562237b8ac64529ae09b344a43 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-tape: remove stale comments from idetape_pc_intr() Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 91395a16309596c2e78439aa5f9f6004f0365ef9 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-tape: remove unneeded CONFIG_BLK_DEV_IDEDMA ifdef PC_FLAG_DMA_IN_PROGRESS flag is never set if DMA support is disabled. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 6bd3b0bfb8fccdcce3b8524d6761e0a3ab6e23f0 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:53 2008 +0200 ide-tape: remove superfluous warning message from idetape_issue_pc() ide_dma_off() prints info about DMA being disabled. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1e049a8ea190b7cc22320c7797b36b2c6128c9c5 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:53 2008 +0200 ide-tape: remove superfluous error message from idetape_pc_intr() ide_dma_off() prints info about DMA being disabled. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 87429bdc2e0701fa33a455297de01e79797b4210 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:53 2008 +0200 ide-tape: idetape_pc_intr() should use local_irq_enable_in_hardirq() Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 43a2b5b29385a3e0997a47c86f286d3645e5cb44 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:52 2008 +0200 ide-scsi: add debug_log() macro Add debug_log() macro and convert the driver to use it. [ This makes debug messages to be always prefixed with "ide-scsi: " and use KERN_INFO level. ] While at it: * Change "DMA complete" debug message to "DMA finished" to match other ATAPI device drivers. * Use __func__. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit c8c51129805c0efb32f34afd3af8fe94f5757363 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:52 2008 +0200 ide-scsi: remove superfluous BUG_ON() from idescsi_transfer_pc() ide_set_handler() bugs on ->handler == NULL so no need to do it in idescsi_transfer_pc(). There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3e52fb4d1f4cc9630422982b6c5fa571e30f9889 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:52 2008 +0200 ide-scsi: merge idescsi_input_buffers() and idescsi_output_buffers() * Merge idescsi_input_buffers() and idescsi_output_buffers() into ide_scsi_io_buffers() helper. While at it: * Log device name instead of driver name on error. * Use xfer_func_t. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 6c60bd8ea7aa536d67830bc8384ef0ebdfb8aad4 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:52 2008 +0200 ide-scsi: fix Interrupt Reason checking in idescsi_pc_intr() Set PC_FLAG_WRITING pc flag in idescsi_queue() (if needed) and then fix Interrupt Reason checking in idescsi_pc_intr(). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit c04bbc812b05b304a9118687d0e0a47e35f00d1d Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:51 2008 +0200 ide-scsi: fix handling of DMA errors in idescsi_pc_intr() Check return value of ->dma_end method and if there was a DMA error handle it accordingly (set PC_FLAG_DMA_ERROR pc flag, don't update pc->xferred and increase rq->errors). Also move debug message in the right place while at it. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit e8e25f03e19c2c47834c821511625c0b80567827 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:51 2008 +0200 ide-scsi: fix DRQ checking for DMA transfers in idescsi_pc_intr() If DRQ bit of Status Register is not cleared it is an error condition and should be handled accordingly (disable DMA + reset the device). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit b3d96afccf8b5c67b66a61efb88c53ff029c6611 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:51 2008 +0200 ide-scsi: fix race in idescsi_transfer_pc() Start DMA engine before sending content of packet command (otherwise it is possible that IRQ will happen before DMA engine is started). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 63f5abb0959337db0d5bece9cefba03cdcadec51 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:51 2008 +0200 ide: remove action argument in ide_do_drive_cmd ide_do_drive_cmd is called only with ide_preempt action argument. So we can remove the action argument in ide_do_drive_cmd and ide_action_t typedef. This patch also includes two minor cleanups: 1) ide_do_drive_cmd always succeeds so we don't need the return value; 2) the callers use blk_rq_init before ide_do_drive_cmd so there is no need to initialize rq->errors. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7e12ca11d65f4cb29ed58ea3948f8c5d4f57b35e Author: FUJITA Tomonori Date: Tue Jul 15 21:21:50 2008 +0200 ide-scsi: replace ide_do_drive_cmd with blk_execute_rq_nowait All the callers of ide_do_drive_cmd() except for ide-scsi use ide_preempt action argument. This converts ide-scsi to use blk_execute_rq_nowait instead of ide_do_drive_cmd so that we can remove the action argument in ide_do_drive_cmd and ide_action_t typedef. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit ff07488346702f554aaeb6aae982540aa0302373 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:50 2008 +0200 ide: remove drive->ctl Remove drive->ctl (it is always equal to 0x08 after init time). While at it: * Use ATA_DEVCTL_OBS define. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 0fd04dcc2ebb6ec9088c24b368b0ce1f42a98ef5 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:50 2008 +0200 ide: use ->OUTBSYNC in ide_set_irq() Signed-off-by: Bartlomiej Zolnierkiewicz commit 6a732e11be1355baeeca7c47f19ab20e7baa6ce7 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:50 2008 +0200 ide: use ->OUTBSYNC in init_irq() Signed-off-by: Bartlomiej Zolnierkiewicz commit f8c4bd0ab2b8783c0f080957781e9f70bee48eaa Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:49 2008 +0200 ide: pass 'hwif *' instead of 'drive *' to ->OUTBSYNC method There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 135721446144af005109c25eeacca4fdddcd9a66 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:49 2008 +0200 ide: remove ->mmio flag from ide_hwif_t Since scc_pata host driver no longer uses IDE PCI layer / ide_dma_setup() and all other ->mmio users set also IDE_HFLAG_MMIO host flag we can safely remove ->mmio flag. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit ed4af48fd660176680da905817f6e40d51436e4c Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:48 2008 +0200 ide: move IRQ unmasking out from ->tf_load method Move IRQ unmasking out from ->tf_load method to its users. There should be no functional changes caused by this patch (SELECT_MASK() is NOP except for hpt366, icside and sgiioc4). Signed-off-by: Bartlomiej Zolnierkiewicz commit 9a410e79b552bacb4481f85618aa7333b7776ed7 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:48 2008 +0200 ide: remove IDE_TFLAG_NO_SELECT_MASK taskfile flag Always call SELECT_MASK(..., 0) in ide_tf_load() (needs to be done to match ide_set_irq(..., 1)) and then remove IDE_TFLAG_NO_SELECT_MASK taskfile flag. This change should only affect hpt366 and icside host drivers since ->maskproc(..., 0) for sgiioc4 is equivalent to ide_set_irq(..., 1). Cc: Sergei Shtylyov Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit e81a3bde13343bc36613aff8f864def7171b376a Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:48 2008 +0200 ide: fix do_probe() to use SELECT_DRIVE() Fix one place in do_probe() which used ->OUTB directly instead of calling SELECT_DRIVE() (so ->selectproc method is also used). Signed-off-by: Bartlomiej Zolnierkiewicz commit 49e153e68187454e296f1e03442393f1a3f1d69c Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:47 2008 +0200 ide: remove commented out code from ide_config_drive_speed() Signed-off-by: Bartlomiej Zolnierkiewicz commit 912ef6d94cc07ce5db19a8ed8953676727d4f30c Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:47 2008 +0200 sgiioc4: use ->extra_base instead of ->dma_status for dma_handle This is a preparation for removal of ->dma_status field from ide_hwif_t. There should be no functional changes caused by this patch. Acked-by: Jeremy Higdon Signed-off-by: Bartlomiej Zolnierkiewicz commit 57279a7a401eed844ded4346c5ff512e622ac1de Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:47 2008 +0200 ide: remove try_to_flush_leftover_data() Just use the new & shiny ide_pad_transfer() helper instead. Also remove the superfluous check for 'drive->media == ide_disk' while at it (ide_ata_error() is used only for ide_disk devices). Signed-off-by: Bartlomiej Zolnierkiewicz commit 931ee0dc5c69e8113233d21942681ab8fecde7f9 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:47 2008 +0200 ide: remove obsoleted "ide=" kernel parameters * Remove obsoleted "ide=" kernel parameters. * Remove no longer needed: - ide_setup() - parse_options() - __setup("", ...) - module_param(options, ...) * Use module_{init,exit}() for MODULE=y case and remove MODULE ifdef. * Make ide_*acpi* and ide_doubler variables static. Signed-off-by: Bartlomiej Zolnierkiewicz commit dbac9f895f628deebc99dee86dfd21c1823013c3 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:46 2008 +0200 ide: cleanup init_ide_data() * Remove no longer need init_ide_data() call from ide_setup(). * Cleanup init_ide_data(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 232595eaff951e96cabe5e85fed35f66b72ff51e Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:46 2008 +0200 ide: remove obsoleted "hdx=" kernel parameters * Remove obsoleted "hdx=" kernel parameters. * Remove no longer used stridx() and match_parm(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 30e5ee4d1a651a0c66e86c6612c003034bd20ba2 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:46 2008 +0200 ide: remove obsoleted "idebus=" kernel parameter * Remove obsoleted "idebus=" kernel parameter. * Remove no longer needed ide_system_bus_speed() and system_bus_clock() (together with idebus_parameter and system_bus_speed variables). Signed-off-by: Bartlomiej Zolnierkiewicz commit 681a561b7ec7fdcd8f35b68e44ac6d6c70aecc04 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:45 2008 +0200 block: unexport blk_end_sync_rq All the users of blk_end_sync_rq has gone (they are converted to use blk_execute_rq). This unexports blk_end_sync_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Signed-off-by: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 52a93ba815737e3877f85b46850cffe993a22429 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:45 2008 +0200 block: remove the checking for NULL queue in blk_put_request Some uses blk_put_request asymmetrically, that is, they uses it with requests that not allocated by blk_get_request. As a result, blk_put_request has a hack to catch a NULL request_queue. Now such callers are fixed (they use blk_get_request properly). So we can safely remove the hack in blk_put_request. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Signed-off-by: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit d79c5a670ddf076a346ddcf3d9e21785ecab963f Author: FUJITA Tomonori Date: Tue Jul 15 21:21:45 2008 +0200 block: convert pd_special_command to use blk_execute_rq pd_special_command uses blk_put_request with struct request on the stack. As a result, blk_put_request needs a hack to catch a NULL request_queue. This converts pd_special_command to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Signed-off-by: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit ed820f19521de246c5b7978f8f78290733a55b20 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:45 2008 +0200 ide-cd: remove ide_cd_init_rq ide_cd_init_rq is not used by ide-cd_ioctl any more. Only cdrom_queue_request_sense use it. This converts cdrom_queue_request_sense to use blk_rq_init directly and removes ide_cd_init_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 124cafc5eb973e748c4ce3dc1caad29274e64613 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:44 2008 +0200 ide: remove ide_init_drive_cmd ide_init_drive_cmd just calls blk_rq_init. This converts the users of ide_init_drive_cmd to use blk_rq_init directly and removes ide_init_drive_cmd. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 5f2e1ceef45ac07d7c52d16de2531a56c453bb0f Author: FUJITA Tomonori Date: Tue Jul 15 21:21:44 2008 +0200 ide: remove ide_wait/head_wait path in ide_do_drive_cmd Now all the users of ide_do_drive_cmd using ide_wait/head_wait are converted to use blk_execute_rq this removes the ide_wait/head_wait path in ide_do_drive_cmd. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 5b114715ed63f3a4fdf790f5df61364fc4adadf1 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:44 2008 +0200 ide: convert ide_do_drive_cmd path to use blk_execute_rq This converts the ide_do_drive_cmd path using ide_[head_]wait to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 9a2d43b7566caeeeb414aa628bc2759028897dbb Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:43 2008 +0200 block: handle blk_pm_resume_request() requests in blk_execute_rq_nowait() For blk_pm_resume_request() requests (which are used only by IDE subsystem currently) the queue is stopped so we need to call ->request_fn explicitly. Thanks to: - Rafael for reporting/bisecting the bug - Borislav/Rafael for testing the fix This is a preparation for converting IDE to use blk_execute_rq(). Cc: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Cc: "Rafael J. Wysocki" Signed-off-by: Bartlomiej Zolnierkiewicz commit 64ea1b4ab7f51c5de601d291a51508c27d445f70 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:43 2008 +0200 ide-tape: convert ide_do_drive_cmd path to use blk_execute_rq This converts the ide_do_drive_cmd path using ide_wait to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 154ed280e3f48995d0689b57f10b7063add63019 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:43 2008 +0200 ide-taskfile: convert ide_do_drive_cmd path to use blk_execute_rq This converts the ide_do_drive_cmd path using ide_wait to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 6fe162381e547f457252e68521eb42fd36ec1418 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:43 2008 +0200 ide-floppy: convert ide_do_drive_cmd path to use blk_execute_rq This converts the ide_do_drive_cmd path using ide_wait to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit dd47087bc173a84e8c42644b315d38b30dc02263 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:43 2008 +0200 ide-disk: convert ide_do_drive_cmd path to use blk_execute_rq This converts the ide_do_drive_cmd path using ide_wait to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 0ef4c4db7faabe4fb8a516e9e991e1e8e87a647f Author: FUJITA Tomonori Date: Tue Jul 15 21:21:42 2008 +0200 ide-cd: convert ide_do_drive_cmd path to use blk_execute_rq This converts the ide_do_drive_cmd path using ide_wait to use blk_execute_rq. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 5f828546e1acb45678e73d3a9a796c1a3a8c7846 Author: FUJITA Tomonori Date: Tue Jul 15 21:21:42 2008 +0200 ide-cd: convert ide_cd_queue_pc to use blk_execute_rq This converts ide_cd_queue_pc to use blk_execute_rq, necessitating changing the ide_cd_queue_pc prototype into a form that doesn't takes a pointer to request struct. ide_cd_queue_pc works like scsi_execute. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit c6866a6ff571eebebda45bf14b5b62188768893a Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:42 2008 +0200 ide: use __generic_unplug_device() in ide_do_drive_cmd() (take 2) * Call __elv_add_request() with 'plug' == 1 (so the device will be plugged) and then use __generic_unplug_device() instead of calling ide_do_request() directly. v2: * For blk_pm_resume_request() requests the queue is stopped so we need to call ->request_fn explicitly. Thanks to: - Rafael for reporting/bisecting the bug - Borislav/Rafael for testing the fix This is a preparation for converting IDE to use blk_execute_rq(). Cc: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Cc: "Rafael J. Wysocki" Signed-off-by: Bartlomiej Zolnierkiewicz commit e8a96aa71355edef9f40ce01459acf25c50cb78c Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:41 2008 +0200 ide: set REQ_PREEMPT request flag in ide_do_drive_cmd() users * Set REQ_PREEMPT request flag in ide_do_drive_cmd() users for ide_preempt and ide_head_wait action types. * Remove setting REQ_PREEMPT from ide_do_drive_cmd(). While at it: * Set 'where' variable outside ide_lock. This is a preparation for converting IDE to use blk_execute_rq(). There should be no functional changes caused by this patch. Cc: FUJITA Tomonori Cc: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 5d0cc8ae29b310ceb6516a6840ca22738aab7820 Author: Harvey Harrison Date: Tue Jul 15 21:21:41 2008 +0200 ide: use get_unaligned_* helpers Signed-off-by: Harvey Harrison Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit a792bd5a407872714942f50bf24083874ce03745 Author: Harvey Harrison Date: Tue Jul 15 21:21:41 2008 +0200 ide-tape: use clamp_t() rather than nested min_t()/max_t() Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit d6cddd3cac6650f273a2595c9f403aacee01ab05 Author: Harvey Harrison Date: Tue Jul 15 21:21:41 2008 +0200 ide: eliminate FIT() macro Replace the FIT() macro with the kernel-provided clamp_val() macro. FIT was always being called with a member of a struct ide_timing, which are shorts, and constant constraints for the min and max. Thus we can use clamp_val, rather than clamp_t. Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 5ddee516dae1acc779b36cb7565720a80503196d Author: Mikhail Cherkashin Date: Tue Jul 15 21:21:40 2008 +0200 ide: disable drive interrupts in ide_driveid_update() Since ide_driveid_update() uses polling to execute the IDENTIFY DEVICE command but clears nIEN bit in the control register and doesn't mask the IDE interrupt, the latter does happen and lead to the corresponding message to appear: ide0: unexpected interrupt, status=0x58, count=1 when e.g. running hdparm with option -X with a non-PCI IDE driver... Signed-off-by: Mikhail Cherkashin Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8c6e46ddb343004e33653f62f0b09c0721cd8c12 Author: Mikhail Cherkashin Date: Tue Jul 15 21:21:40 2008 +0200 palm_bk3710: fix tRP for UDMA mode 4 Fix tRP timing for UDMA mode 4 according to the ATA specification. Signed-off-by: Mikhail Cherkashin Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit e4e0fadcd929138aa82130a1c5f22206d86d7bb2 Merge: 1435176... ec1aef3... Author: Linus Torvalds Date: Tue Jul 15 11:03:19 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: remove DIRENTSIZ JFS: diAlloc() should return -EIO rather than EIO JFS: skip bad iput() call in error path JFS: switch to seq_files JFS: 0 is not valid errno value so return NULL from jfs_lookup commit 14351760e314b8a9720804b11c6bd11d0c0b1258 Author: Linus Torvalds Date: Tue Jul 15 11:01:39 2008 -0700 Fix printk format warning in clocksource/acpi_pm.c For real, this time. The earlier attempt just moved the warning around. Signed-off-by: Linus Torvalds commit b27418aa551a153e8bf1bd16cf93e5786f9590a9 Author: Thomas Bogendoerfer Date: Mon Jul 14 16:58:47 2008 +0200 [MIPS] Remove mips_machtype for LASAT machines This is the LASAT part of the mips_machtype removal. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 0b56fd8c7abbf85baeecb77be25c54d3c7d11587 Author: Thomas Bogendoerfer Date: Mon Jul 14 15:54:30 2008 +0200 [MIPS] Remove mips_machtype from EMMA2RH machines This is the EMMA2RH part of the mips_machtype removal. [Ralf: Fixed to the #error statements] Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit c660729501894e0b88054ad4b66a5f98a1a2a37e Author: Thomas Bogendoerfer Date: Mon Jul 14 15:11:40 2008 +0200 [MIPS] Remove mips_machtype from ARC based machines This is the ARC part of the mips_machtype removal. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 9528356308ecd2fb6368472615996a8602c02964 Author: Yoichi Yuasa Date: Fri Jul 11 22:34:48 2008 +0900 [MIPS] MTX-1 flash partition setup move to platform devices registration Signed-off-by: Yoichi Yuasa Acked-By: David Woodhouse Signed-off-by: Ralf Baechle commit 7b22609442a32050e37cec5f6735376af61e68a1 Author: Atsushi Nemoto Date: Mon Jul 14 00:15:04 2008 +0900 [MIPS] TXx9: cleanup and fix some sparse warnings * Do not return void value * Make some functions static * Do not include unnecessary bootinfo.h Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 4c642f3f5e9f3f1a2fcce2c3fa1a94bf80142202 Author: Atsushi Nemoto Date: Sun Jul 13 23:37:56 2008 +0900 [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx Rename mach-jmr3927 directory to more proper name to make adding other platforms easier. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6e68665e51b9937b132a990b9ae7f04118e64688 Author: Yoichi Yuasa Date: Sun Jul 13 20:04:18 2008 +0900 [MIPS] remove machtype for group Toshiba Signed-off-by: Yoichi Yuasa Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b6c4053610f04011bc0ecbc5a0417afe169b2693 Author: Yoichi Yuasa Date: Sun Jul 13 20:02:13 2008 +0900 [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Signed-off-by: Yoichi Yuasa Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit a38c47519832f22659244fd8437722b7aaa67f9a Author: Yoichi Yuasa Date: Sun Jul 13 20:01:04 2008 +0900 [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Signed-off-by: Yoichi Yuasa Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit a00fb6694f15b3bccf105f34f10bbcb6b47af67c Author: Yoichi Yuasa Date: Sun Jul 13 19:54:08 2008 +0900 [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Signed-off-by: Yoichi Yuasa Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 7a1fdf1946b641f7c2866b3386414657eeb88084 Author: Yoichi Yuasa Date: Sun Jul 13 19:51:55 2008 +0900 [MIPS] txx9_board_vec set directly without mips_machtype Signed-off-by: Yoichi Yuasa Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b03d7b18fd783f39e31560d568e7db954f3080af Author: Thomas Bogendoerfer Date: Fri Jul 11 23:03:03 2008 +0200 [MIPS] IP22: Add platform device for Indy volume buttons Create platform device for Indy volume buttons and remove button handling from ip22-reset.c Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit efff4ae259b8f750ea426d3084007f85c0a15a85 Author: Yoichi Yuasa Date: Fri Jul 11 22:45:21 2008 +0900 [MIPS] cmbvr4133: Remove support It cannot be built for a long time and nobody maintains it. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 3f16654f36723f5ef1ca38c4e2078ca377a0f86f Author: Yoichi Yuasa Date: Fri Jul 11 22:39:18 2008 +0900 [MIPS] remove wrppmc_machine_power_off() It can be replace wrppmc_machine_halt(). Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 9ecb1ff1b295a515b21d0ac83d8bd39b07335aab Author: Yoichi Yuasa Date: Fri Jul 11 22:39:14 2008 +0900 [MIPS] replace inline assembler to cpu_wait() Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5b438c44082d9f09fed10f3621fe8d5c93d3676d Author: Thomas Bogendoerfer Date: Thu Jul 10 20:29:55 2008 +0200 [MIPS] IP22/28: Add platform devices for HAL2 Create platform devices for hal2 and add option for selecting HAL2 alsa driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit bf744d417ff2fe1e8e386c7ad06e79c34a078642 Author: Atsushi Nemoto Date: Fri Jul 11 23:28:04 2008 +0900 [MIPS] TXx9: Update and merge defconfigs Merge rbhma4200(RBTX4927/37) and rbhma4500(RBTX4938) defconfig into single rbtx49xx defconfig. And jmr3927 defconfig is also updated. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit edcaf1a6a77315562e9781245cc8e028c9a921dc Author: Atsushi Nemoto Date: Fri Jul 11 23:27:54 2008 +0900 [MIPS] TXx9: Make single kernel can support multiple boards Make single kernel can be used on RBTX4927/37/38. Also make some SoC-specific code independent from board-specific code. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 766891565bdaf605ea4aebe3e75de77e848254d0 Author: Atsushi Nemoto Date: Fri Jul 11 00:33:21 2008 +0900 [MIPS] TXx9: Update defconfigs Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 89d63fe179520b11f54de1f26755b7444c79e73a Author: Atsushi Nemoto Date: Fri Jul 11 00:33:08 2008 +0900 [MIPS] TXx9: Reorganize PCI code Split out PCIC dependent code and SoC dependent code from board dependent code. Now TX4927 PCIC code is independent from TX4927/TX4938 SoC code. Also fix some build problems on CONFIG_PCI=n. As a bonus, "FPCIB0 Backplane Support" is available for all TX39/TX49 boards and PCI66 support is available for all TX49 boards. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 22b1d707ffc99faebd86257ad19d5bb9fc624734 Author: Atsushi Nemoto Date: Fri Jul 11 00:31:36 2008 +0900 [MIPS] TXx9: Reorganize code Move arch/mips/{jmr3927,tx4927,tx4938} into arch/mips/txx9/ tree. This will help more code sharing and maintainance. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 14476007c90005c8992b786c15a59cca31f53268 Author: Atsushi Nemoto Date: Thu Jul 10 01:02:08 2008 +0900 [MIPS] txx9: Make gpio_txx9 entirely spinlock-safe TXx9 GPIO set/get routines are spinlock-safe. This patch make gpio_direction_{input,output} routines also spinlock-safe so that they can be used during early board setup. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 315806cb19f9d375dccbc2d60fa14e16afdcd5ac Author: Ralf Baechle Date: Tue Jul 15 18:44:34 2008 +0100 [MIPS] Malta: Cleanup organization of code into directories. Signed-off-by: Ralf Baechle commit eda49eeebf263f3a34f6968959fc2e4825b42beb Author: Ralf Baechle Date: Tue Jul 15 18:44:34 2008 +0100 [MIPS] Remove always true ifdef conditions. Signed-off-by: Ralf Baechle commit d5deda6fa1ca434d36c2daffb63127e92c6470f5 Author: Ralf Baechle Date: Tue Jul 15 18:44:34 2008 +0100 [MIPS] MSC01: Cleanup configuration. This shouldn't depend on CONFIG_MIPS_BOARDS_GEN which is about to go away. Signed-off-by: Ralf Baechle commit 6da5e30b879394f0c55b2bbf3353d797097c8f0f Author: Ralf Baechle Date: Tue Jul 15 18:44:34 2008 +0100 [MIPS] Remove impossible ifdef and code wrapped by it. Signed-off-by: Ralf Baechle commit 1398ddb2ebdb41e8efe6ba42505fd452704c8405 Author: Ralf Baechle Date: Tue Jul 15 18:44:33 2008 +0100 [MIPS] SEAD: Remove support code. Signed-off-by: Ralf Baechle commit 2157bc68711bf0e69f9aca4d310bd863298fbb3f Author: Ralf Baechle Date: Tue Jul 15 18:44:33 2008 +0100 [MIPS] Atlas: Remove support code. Signed-off-by: Ralf Baechle commit 372a775f50347f5c1dd87752b16e5c05ea965790 Author: Ralf Baechle Date: Tue Jul 15 18:44:33 2008 +0100 [MIPS] Enable -ffunction-sections sections. -ffunction-sections serves as a workaround for the problems caused by the limited branch range in some inline assembler fragments for very large compilation units. Signed-off-by: Ralf Baechle commit 74c8494eeb7b321e5922ee43120f91c7c9b7317f Author: Ralf Baechle Date: Tue Jul 15 18:44:33 2008 +0100 [MIPS] Bigsur: Make defconfig a bit more useful. Signed-off-by: Ralf Baechle commit b012cffe7f6971e9ba5afca034a3d80e1cf1435c Author: Ralf Baechle Date: Tue Jul 15 18:44:33 2008 +0100 [MIPS] Replace use of print_symbol with new %sP pointer format. Signed-off-by: Ralf Baechle commit b29eee4935d9e5952a7ea8543ea499f06fb86808 Author: Atsushi Nemoto Date: Wed Apr 16 02:00:45 2008 +0900 [MIPS] rbtx4927: misc cleanups * Merge tx4927_pci.h into tx4927.h * Kill (broken) external PCI clock frequency reporting * Kill unnecessary wbflush() * Kill unnecessary includes * Kill debug garbages Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit af3e69cfc9644c742a22647a5091779b9dfb9653 Author: Atsushi Nemoto Date: Fri Jul 4 00:59:40 2008 +0900 [MIPS] Declare some pci variables in header file Declare pci_probe_only, etc. in asm-mips/pci.h file. This will fix some sparse warnings. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 8fa9cc16f820915fbe8ab6047c420703a87c307e Author: Thomas Bogendoerfer Date: Sat Jul 5 01:12:13 2008 +0200 [MIPS] IP32: Add platform devices for audio and volume button Create platform devices for audio and volume button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 7a2852e49fe2d19296812c0f0f833b0ee3043bbb Author: Thomas Bogendoerfer Date: Tue Mar 18 22:47:56 2008 +0100 [MIPS] IP28: switch to "normal" mode after PROM no longer needed SGI-IP28 is running in so called slow mode, when kernel is started from the PROM. PROM calls must be done in slow mode otherwise the PROM will issue an error. To get better memory performance we now switch to normal mode, when the PROM is no longer needed. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit c3dd3de789630b9b1ac8f5175f1c21bbf1cca939 Author: Dmitri Vorobiev Date: Wed Jun 18 10:18:23 2008 +0300 [MIPS] Add an appropriate header into display.c The following errors were caught by sparse: >>>>>>>>>>> arch/mips/mips-boards/generic/display.c:30:6: warning: symbol 'mips_display_message' was not declared. Should it be static? arch/mips/mips-boards/generic/display.c:58:6: warning: symbol 'mips_scroll_message' was not declared. Should it be static? >>>>>>>>>>> This patch includes the asm/mips-boards/prom.h header file into arch/mips/mips-boards/generic/display.c. This adds the needed function declarations, and the errors are gone. Compile-tested using defconfigs for Malta, Atlas and SEAD boards. Runtime test was successfully performed by booting a Malta 4Kc board up to the shell prompt. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 6ccab43b49beced70d8663b47ab471c4a23cb580 Author: Dmitri Vorobiev Date: Wed Jun 18 10:18:22 2008 +0300 [MIPS] Make gcmp_probe() static The gcmp_probe() function is needlessly defined global, and this patch makes it static. Tested by booting a Malta 4Kc board up to the shell prompt. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 7afed6a6c92fadedde8474bbfd92d6debc5e23b0 Author: Dmitri Vorobiev Date: Wed Jun 18 10:18:21 2008 +0300 [MIPS] A few cleanups in malta_int.c Both the fill_ipi_map() routine and the gic_intr_map array defined in arch/mips/mips-boards/malta/malta_int.c are not used outside of the latter file. Thus, these objects can become static. Moreover, these two objects are used by the MT code only, which is why this patch adds the appropriate ifdef. While at it, this patch removes an unnecessary preprocessing macro in favor of the commonly used ARRAY_SIZE. Successfully tested using a Qemu-emulated Malta board for both SMP and UP kernels. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit d58eaab5a01b9cf1819ec57271ac214a39bf6278 Author: Dmitri Vorobiev Date: Wed Jun 18 10:18:20 2008 +0300 [MIPS] Namespace clean-up in arch/mips/pci/pci.c The following symbols hose_head hose_tail are needlessly defined global in arch/mips/pci/pci.c, and this patch makes them static. The variable pci_isa_hose is not used, and is removed by this patch. Spotted by namespacecheck. Tested by booting a Malta 4Kc board up to the shell prompt. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 1ea6428cbdbb0fd1a6e7e8c3044253eab9aff4c7 Author: Dmitri Vorobiev Date: Wed Jun 18 10:18:19 2008 +0300 [MIPS] i8253: make the pit_clockevent variable static The pit_clockevent symbol is needlessly defined global. This patch makes that variable static. Spotted by sparse. Compile-tested using Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 8736595bb2b0ce6188ca31308c40921f3f02f35b Author: Thomas Bogendoerfer Date: Wed Jul 2 21:06:03 2008 +0200 [MIPS] Enable FAST-20 for onboard scsi Both onboard controller of the O2 support FAST-20 transfer speeds, but the bit, which signals that to the aic driver, isn't set. Instead of adding detection code to the scsi driver, we just fake the missing bit in the PCI config space of the scsi chips. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit f2bc713f15103372c0efab5fc09dd813655c5096 Author: Yoichi Yuasa Date: Thu Jun 26 21:52:51 2008 +0900 [MIPS] Cobalt: Register new LCD platform device. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 94daeb90698c56a85ed219eeb18d4a8cddde7b03 Author: David Daney Date: Wed Jun 11 10:04:25 2008 -0700 [MIPS] Fix asm constraints for 'ins' instructions. The third operand to 'ins' must be a constant int, not a register. [Ralf: The bug was actually intensional. Some versions used to throw an error under certain circumstances for code like: static inline void f(unsigned nr, unsigned *p) { unsigned short bit = nr & 5; if (__builtin_constant_p(bit)) { __asm__ __volatile__ (" foo %0, %1" : "=m" (*p) : "i" (bit)); } else { /* Do something else. */ } } because gcc was not able to figure out that the "i" constraint was possibly at the early stage when the constraint are getting verified. The solution was using "ri" instead of "i". The "ri" would keep gcc happy but in the end for code generation always the "i" constraint would be satisfied. The problem afair originally appeared in the i386 io.h and also hit it's mips equivalent. From there the workaround spread to many of the inline assembler functions.] Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 043ebd6c9de7500a399017643bbc5cafd4e37060 Author: Maciej W. Rozycki Date: Fri Jun 13 00:25:36 2008 +0100 [MIPS] DECstation: Document more MB ASIC register bits Document a few more register bits provided by the MB ASIC used on R4000SC (KN04) and R4400SC (KN05) CPU daughtercards with the DECstation. Reverse-engineered and not documented anywhere else to the best of my knowledge. Bit names appended to the last underscore the same as reported by the firmware in register dumps. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit 52f4f6bbcff5510f662a002ec1219660ea25af62 Author: Robert P. J. Day Date: Thu Jun 12 15:20:05 2008 -0400 [MIPS] Use kernel-supplied ARRAY_SIZE() macro. Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle commit 2957c9e61ee9c37e7ebf2c8acab03e073fe942fd Author: Ralf Baechle Date: Tue Jul 15 18:44:30 2008 +0100 [MIPS] IRIX: Goodbye and thanks for all the fish Never terribly functional or popular, plagued by hard to fix bugs the time to say goodbye has more than arrived. Signed-off-by: Ralf Baechle commit 997288517ec839b7639fcba77111256b13a66000 Author: Manuel Lauss Date: Mon Jun 9 08:39:58 2008 +0200 [MIPS] Alchemy: remove unused MMC macros from db1x00 header. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 4b62220b608ab71876d8920d5590f1db4ee2eb4a Author: Ralf Baechle Date: Tue Jul 15 18:44:29 2008 +0100 [MIPS] Alchemy, PNX: Use symbolic constants for DMA masks. Signed-off-by: Ralf Baechle commit f366e2085f28358a5294b8cdc847a377c02eb22d Author: Dmitri Vorobiev Date: Thu May 29 17:57:11 2008 +0300 [MIPS] unexport {allocate,free}_irqno The following routines allocate_irqno() free_irqno() seem not to be used outside of the core kernel code, hence exporting these functions is pointless. This patch removes the export. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 17f61e61b4a1d3ca254668cf12c1c5d828d892fd Author: Dmitri Vorobiev Date: Thu May 29 17:57:09 2008 +0300 [MIPS] Make two functions static The following routines uasm_rel_highest() uasm_rel_higher() are needlessly defined global. This patch makes them static. Compile-tested using a customized config for the Malta board. Booting the same board up to the shell prompt was also successful with this patch applied. Spotted by sparse. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 07cdb78436d52416a582e645b9afb6e26f986bc9 Author: Dmitri Vorobiev Date: Thu May 29 17:57:08 2008 +0300 [MIPS] fix sparse warning about setup_early_printk() This patch fixes the following sparse warning: <<<<<<<< arch/mips/kernel/early_printk.c:35:13: warning: symbol 'setup_early_printk' was not declared. Should it be static? <<<<<<<< The fix is to define a prototype of the setup_early_printk() function and to include the appropriate header into arch/mips/kernel/early_printk.c. [Ralf: Sorted includes again] Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit c88a8b4ab0e1a1f06938939d9ba42e9da6144ccb Author: Maciej W. Rozycki Date: Mon Jun 9 17:19:53 2008 +0100 [MIPS] Remove obsolete isa_slot_offset The isa_slot_offset variable and its __ISA_IO_base macro is not used anywhere anymore. It does not look like a decent interface per today's standards either. Remove both including all places of initialization. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit cb11dfa0247df479e384c4a7ab6846f3a6bf1570 Author: David Daney Date: Mon Jun 9 16:30:03 2008 -0700 [MIPS] Remove board_watchpoint_handler It is not used anywhere in tree. Signed-off-by: David Daney Signed-off-by: Andrew Morton Signed-off-by: Ralf Baechle commit 2954c02a884dc0ba9e91882c0aba13bcb9d22e6c Author: Chen, Huacai Date: Tue Jun 10 09:05:08 2008 +0800 [MIPS] modify the MIPS CPU classfication Signed-off-by: Huacai Chen Signed-off-by: Ralf Baechle commit da6e88f4963385b1b649b043691d206fbb951913 Merge: 61d97f4... 7dc9719... Author: Linus Torvalds Date: Tue Jul 15 10:39:57 2008 -0700 Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: add PCI ID for 6300ESB force hpet x86: add another PCI ID for ICH6 force-hpet kernel-paramaters: document pmtmr= command line option acpi_pm clccksource: fix printk format warning nohz: don't stop idle tick if softirqs are pending. pmtmr: allow command line override of ioport nohz: reduce jiffies polling overhead hrtimer: Remove unused variables in ktime_divns() hrtimer: remove warning in hres_timers_resume posix-timers: print RT watchdog message commit 61d97f4fcf73d30864a52373a34093be25be6a03 Merge: 38c4657... 48627d8... Author: Linus Torvalds Date: Tue Jul 15 10:39:22 2008 -0700 Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: remove extraneous checks in manage.c genirq: Expose default irq affinity mask (take 3) commit 38c46578ffd8ffbfec514c2a9876d527303322d6 Merge: e7849f1... 4abaca1... Author: Linus Torvalds Date: Tue Jul 15 10:38:46 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: [GFS2] Fix GFS2's use of do_div() in its quota calculations [GFS2] Remove unused declaration [GFS2] Remove support for unused and pointless flag [GFS2] Replace rgrp "recent list" with mru list [GFS2] Allow local DF locks when holding a cached EX glock [GFS2] Fix delayed demote race [GFS2] don't call permission() [GFS2] Fix module building [GFS2] Glock documentation [GFS2] Remove all_list from lock_dlm [GFS2] Remove obsolete conversion deadlock avoidance code [GFS2] Remove remote lock dropping code [GFS2] kernel panic mounting volume [GFS2] Revise readpage locking [GFS2] Fix ordering of args for list_add [GFS2] trivial sparse lock annotations [GFS2] No lock_nolock [GFS2] Fix ordering bug in lock_dlm [GFS2] Clean up the glock core commit e79aec291da55aa322ddb5d8f3bb04cdf69470d5 Author: Rabin Vincent Date: Fri Jul 4 00:40:32 2008 +0530 slab: rename slab_destroy_objs With the removal of destructors, slab_destroy_objs no longer actually destroys any objects, making the kernel doc incorrect and the function name misleading. In keeping with the other debug functions, rename it to slab_destroy_debugcheck and drop the kernel doc. Signed-off-by: Rabin Vincent Signed-off-by: Pekka Enberg commit 88e4ccf294ca62c2da998012a83533ce150c8dce Author: Alexey Dobriyan Date: Mon Jun 23 02:58:37 2008 +0400 slub: current is always valid Acked-by: Christoph Lameter Signed-off-by: Alexey Dobriyan Signed-off-by: Pekka Enberg commit 0937502af7c9b648ed4e884ccb7f504b01a005a1 Author: Christoph Lameter Date: Wed May 28 10:32:22 2008 -0700 slub: Add check for kfree() of non slab objects. We can detect kfree()s on non slab objects by checking for PageCompound(). Works in the same way as for ksize. This helped me catch an invalid kfree(). Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit e7849f16c13476288fe4fbd420975e8456c75aa0 Merge: af5329c... 131b943... Author: Linus Torvalds Date: Tue Jul 15 10:32:39 2008 -0700 Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: cputopology: always define CPU topology information, clean up cpu topology: always define CPU topology information commit af5329cdf51cdd208a323e521faa46800a16d2ec Merge: 1dc60c5... 7798ed0... Author: Linus Torvalds Date: Tue Jul 15 10:31:35 2008 -0700 Merge branch 'core/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: powerpc/generic-ipi tree build failure stacktrace: fix build failure on sparc64 stacktrace: export save_stack_trace[_tsk] stacktrace: fix modular build, export print_stack_trace and save_stack_trace backtrace: replace timer with tasklet + completions stacktrace: add saved stack traces to backtrace self-test stacktrace: print_stack_trace() cleanup debugging: make stacktrace independent from DEBUG_KERNEL stacktrace: don't crash on invalid stack trace structs commit 7890ea1f95fa8968fa6f5bb5860e6632932abfd3 Author: Herbert Xu Date: Tue Jul 15 23:46:24 2008 +0800 Revert crypto: prng - Deterministic CPRNG This patch is clearly not ready yet for prime time. Signed-off-by: Herbert Xu commit 1dc60c53d36b08f361e1a2767c41196acce96d08 Merge: 8d2567a... 3f1c387... Author: Linus Torvalds Date: Tue Jul 15 08:41:43 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix compile error with CONFIG_AS_CFI=n Documentation: document debugpat commandline option x86: sanitize Kconfig x86, suspend, acpi: correct and add comments about Big Real Mode x86, suspend, acpi: enter Big Real Mode Fixed trivial conflict in include/asm-x86/dwarf2.h due to just using different names for "cfi_ignore" (vs "__cfi_ignore") macro. commit 8d2567a620ae8c24968a2bdc1c906c724fac1f6a Merge: bcf559e... 49f1487... Author: Linus Torvalds Date: Tue Jul 15 08:36:38 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (61 commits) ext4: Documention update for new ordered mode and delayed allocation ext4: do not set extents feature from the kernel ext4: Don't allow nonextenst mount option for large filesystem ext4: Enable delalloc by default. ext4: delayed allocation i_blocks fix for stat ext4: fix delalloc i_disksize early update issue ext4: Handle page without buffers in ext4_*_writepage() ext4: Add ordered mode support for delalloc ext4: Invert lock ordering of page_lock and transaction start in delalloc mm: Add range_cont mode for writeback ext4: delayed allocation ENOSPC handling percpu_counter: new function percpu_counter_sum_and_set ext4: Add delayed allocation support in data=writeback mode vfs: add hooks for ext4's delayed allocation support jbd2: Remove data=ordered mode support using jbd buffer heads ext4: Use new framework for data=ordered mode in JBD2 jbd2: Implement data=ordered mode handling via inodes vfs: export filemap_fdatawrite_range() ext4: Fix lock inversion in ext4_ext_truncate() ext4: Invert the locking order of page_lock and transaction start ... commit bcf559e385ba099996c90469c817d2eb38aba418 Merge: 732b720... 242e3df... Author: Linus Torvalds Date: Tue Jul 15 08:35:28 2008 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: fixup issue with radeon and PAT support. commit 732b72069e77f288efa1d5245cc699d7cb98e528 Merge: 97c7d1e... 089be43... Author: Linus Torvalds Date: Tue Jul 15 08:16:48 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: Revert "SELinux: allow fstype unknown to policy to use xattrs if present" commit 97c7d1ea1f80f457da78b11ca638b7096a4548ee Merge: 4d3702b6... f507d28... Author: Linus Torvalds Date: Tue Jul 15 08:01:15 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (52 commits) IB/mlx4: Use kzalloc() for new QPs so flags are initialized to 0 mlx4_core: Use MOD_STAT_CFG command to get minimal page size RDMA/cma: Simplify locking needed for serialization of callbacks RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr RDMA/cxgb3: Fixes for zero STag RDMA/core: Add local DMA L_Key support IB/mthca: Fix check of max_send_sge for special QPs IB/mthca: Use round_jiffies() for catastrophic error polling timer IB/mthca: Remove "stop" flag for catastrophic error polling timer IPoIB: Double default RX/TX ring sizes IPoIB/cm: Reduce connected mode TX object size IB/ipath: Use IEEE OUI for vendor_id reported by ibv_query_device() IPoIB: Use dev_set_mtu() to change mtu IPoIB: Use rtnl lock/unlock when changing device flags IPoIB: Get rid of ipoib_mcast_detach() wrapper IPoIB: Only set Q_Key once: after joining broadcast group IPoIB: Remove priv->mcast_mutex IPoIB: Remove unused IPOIB_MCAST_STARTED code RDMA/cxgb3: Set rkey field for new memory windows in iwch_alloc_mw() RDMA/nes: Get rid of ring_doorbell parameter of nes_post_cqp_request() ... commit fe9233fb6914a0eb20166c967e3020f7f0fba2c9 Author: Chandra Seetharaman Date: Fri May 23 18:16:40 2008 -0700 [SCSI] scsi_dh: fix kconfig related build errors Do not automatically "select" SCSI_DH for dm-multipath. If SCSI_DH doesn't exist,just do not allow hardware handlers to be used. Handle SCSI_DH being a module also. Make sure it doesn't allow DM_MULTIPATH to be compiled in when SCSI_DH is a module. [jejb: added comment for Kconfig syntax] Signed-off-by: Chandra Seetharaman Reported-by: Randy Dunlap Reported-by: Andrew Morton Signed-off-by: James Bottomley commit 3f1c38723eb467d34d704d0ee6e7b796ba4981ee Author: Kevin Winchester Date: Mon Jul 14 21:36:13 2008 -0300 x86: Fix compile error with CONFIG_AS_CFI=n AS arch/x86/lib/csum-copy_64.o arch/x86/lib/csum-copy_64.S: Assembler messages: arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined make[1]: *** [arch/x86/lib/csum-copy_64.o] Error 1 make: *** [arch/x86/lib] Error 2 It appears that csum-copy_64.S and dwarf2.h both define an ignore macro. I would expect one of them can be renamed quite easily, unless they are references elsewhere. Caused-by-commit: 392a0fc96bd059b38564f5f8fb58327460cb5a9d x86: merge dwarf2 headers Signed-off-by: Thomas Gleixner commit d3af01f18bf18e9b2a95711894fc239daeab5e2e Author: Thomas Gleixner Date: Tue Jul 15 15:04:56 2008 +0200 Documentation: document debugpat commandline option Signed-off-by: Thomas Gleixner commit aba3728ce2e8ce85e1e5f6b275131e9332256789 Author: Thomas Gleixner Date: Tue Jul 15 14:48:48 2008 +0200 x86: sanitize Kconfig Set default n for MEMTEST and MTRR_SANITIZER and fix the help texts. Signed-off-by: Thomas Gleixner commit 91d0322bef047e2916b3e52741411bffc63929cb Merge: 065cb3d... 50515af... Author: Ingo Molnar Date: Tue Jul 15 13:45:59 2008 +0200 Merge branch 'linus' into x86/urgent commit 089be43e403a78cd6889cde2fba164fefe9dfd89 Author: James Morris Date: Tue Jul 15 18:32:49 2008 +1000 Revert "SELinux: allow fstype unknown to policy to use xattrs if present" This reverts commit 811f3799279e567aa354c649ce22688d949ac7a9. From Eric Paris: "Please drop this patch for now. It deadlocks on ntfs-3g. I need to rework it to handle fuse filesystems better. (casey was right)" commit f507d28bff0601f1a8a96b7939fa3855c50d25b6 Author: Eli Cohen Date: Mon Jul 14 23:48:53 2008 -0700 IB/mlx4: Use kzalloc() for new QPs so flags are initialized to 0 Current code uses kmalloc() and then just does a bitwise OR operation on qp->flags in create_qp_common(), which means that qp->flags may potentially have some unintended bits set. This patch uses kzalloc() and avoids further explicit clearing of structure members, which also shrinks the code: add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-65 (-65) function old new delta create_qp_common 2024 1959 -65 Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 2d92865158d0e21ef4350703af64bc2a610d81d3 Author: Vladimir Sokolovsky Date: Mon Jul 14 23:48:53 2008 -0700 mlx4_core: Use MOD_STAT_CFG command to get minimal page size There was a bug in some versions of the mlx4 driver in mlx4_alloc_fmr(), which hardcoded the minimum acceptable page_shift to be 12. However, new ConnectX firmware can support a minimum page_shift of 9 (log_pg_sz of 9 returned by QUERY_DEV_LIM) -- so with old drivers, ib_fmr_alloc() would fail for ULPs using the device minimum when creating FMRs. To preserve firmware compatibility with released mlx4 drivers, the firmware will continue to return 12 as before for log_page_sz in QUERY_DEV_CAP for these drivers. However, to enable new drivers to take advantage of the available smaller page size, the mlx4 driver now first sets the log_pg_sz to the device minimum by setting a log_page_sz value to 0 via the MOD_STAT_CFG command and then reading the real minimum via QUERY_DEV_CAP. Signed-off-by: Jack Morgenstein Signed-off-by: Vladimir Sokolovsky Signed-off-by: Roland Dreier commit de910bd92137005b5e1ecaf2ce68053d7d7d5350 Author: Or Gerlitz Date: Mon Jul 14 23:48:53 2008 -0700 RDMA/cma: Simplify locking needed for serialization of callbacks The RDMA CM has some logic in place to make sure that callbacks on a given CM ID are delivered to the consumer in a serialized manner. Specifically it has code to protect against a device removal racing with a running callback function. This patch simplifies this logic by using a mutex per ID instead of a wait queue and atomic variable. This means that cma_disable_remove() now is more properly named to cma_disable_callback(), and cma_enable_remove() can now be removed because it just would become a trivial wrapper around mutex_unlock(). Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 64c5e613b9dd34ef1281ed6d22478609667ae36a Author: Or Gerlitz Date: Mon Jul 14 23:48:53 2008 -0700 RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr Keep a pointer to the local (src) netdevice in struct rdma_dev_addr, and copy it in as part of rdma_copy_addr(). Use rdma_translate_ip() in cma_new_conn_id() to reduce some code duplication and also make sure the src_dev member gets set. In a high-availability configuration the netdevice pointer can be used by the RDMA CM to align RDMA sessions to use the same links as the IP stack does under fail-over and route change cases. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 4ab928f69208d240d3681336f34589e4b151824f Author: Steve Wise Date: Mon Jul 14 23:48:53 2008 -0700 RDMA/cxgb3: Fixes for zero STag Handling the zero STag in receive work request requires some extra logic in the driver: - Only set the QP_PRIV bit for kernel mode QPs. - Add a zero STag build function for recv wrs. The uP needs a PBL allocated and passed down in the recv WR so it can construct a HW PBL for the zero STag S/G entries. Note: we need to place a few restrictions on zero STag usage because of this: 1) all SGEs in a recv WR must either be zero STag or not. No mi