commit a939b96cccdb65df80a52447ec8e4a6d79c56dbb Merge: 5cab385... 6a7c7ea... Author: Linus Torvalds Date: Mon Apr 20 08:43:06 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM/Suspend: Introduce two new platform callbacks to avoid breakage commit 5cab3856e76f4e6dd44731cea054021105e3e02d Merge: 2edbdd1... 59de2be... Author: Linus Torvalds Date: Mon Apr 20 08:42:48 2009 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: agp: zero pages before sending to userspace drm: check for minor master before allowing drop master. drm: set/clear is_master when master changed drm: clean dirty memory after device release drm: count reaches -1 commit 2edbdd1266784495979576c4ab4ef294c29bad27 Merge: a5432f5... 1f59390... Author: Linus Torvalds Date: Mon Apr 20 08:37:37 2009 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: support bitmaps on RAID10 arrays larger then 2 terabytes md: update sync_completed and reshape_position even more often. md: improve usefulness and accuracy of sysfs file md/sync_completed. md: allow setting newly added device to 'in_sync' via sysfs. md: tiny md.h cleanups commit a5432f5ad43822802ba6f8ba8662ca6361712044 Author: David Howells Date: Mon Apr 20 15:46:45 2009 +0100 FS-Cache: Add MAINTAINERS record for FS-Cache and CacheFiles Add MAINTAINERS record for FS-Cache and CacheFiles. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit f297bfee71df4f1cc5bacd4dea330e1241ba61ae Author: David Howells Date: Mon Apr 20 12:46:24 2009 +0100 FRV: Don't attempt to #include as it doesn't exist Stop the FRV arch from attempting to #include as it doesn't exist. Reported-by: Robert P. J. Day Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 8a577ffc75d9194fe8cdb7479236f2081c26ca1f Author: Kay Sievers Date: Sat Apr 18 15:05:45 2009 -0700 driver: dont update dev_name via device_add path notice one system /proc/iomem some entries missed the name for pci_devices it turns that dev->dev.kobj name is changed after device_add. for pci code: via acpi_pci_root_driver.ops.add (aka acpi_pci_root_add) ==> pci_acpi_scan_root is used to scan pci bus/device, and at the same time we read the resource for pci_dev in the pci_read_bases, we have res->name = pci_name(pci_dev); pci_name is calling dev_name. later via acpi_pci_root_driver.ops.start (aka acpi_pci_root_start) ==> pci_bus_add_device to add all pci_dev in kobj tree. pci_bus_add_device will call device_add. actually in device_add /* first, register with generic layer. */ error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev_name(dev)); if (error) goto Error; will get one new name for that kobj, old name is freed. [Impact: fix corrupted names in /proc/iomem ] Signed-off-by: Yinghai Lu Signed-off-by: Linus Torvalds commit 1f59390339f263c0fe7908fbe54466dbf3a64b58 Author: NeilBrown Date: Mon Apr 20 11:50:24 2009 +1000 md: support bitmaps on RAID10 arrays larger then 2 terabytes .. and other arrays with components larger than 2 terabytes. We use a "long" rather than a "sector_t" in part of the bitmap size calculations, which is sad. Reported-by: "Mario 'BitKoenig' Holbe" Signed-off-by: NeilBrown commit 59de2bebabc5027f93df999d59cc65df591c3e6e Author: Shaohua Li Date: Mon Apr 20 10:08:35 2009 +1000 agp: zero pages before sending to userspace AGP pages might be mapped into userspace finally, so the pages should be set to zero before userspace can use it. Otherwise there is potential information leakage. Signed-off-by: Shaohua Li Signed-off-by: Dave Airlie commit 07f1c7a7f6736d9ec2eba57d209c5f48888d841e Author: Dave Airlie Date: Mon Apr 20 09:32:50 2009 +1000 drm: check for minor master before allowing drop master. When fast user switching a lot eventually we get to the point, where we were checking for the wrong thing in this function. Signed-off-by: Dave Airlie commit 6b0084266c1d4917ad9259759a1e7bd623cb3888 Author: Jonas Bonn Date: Thu Apr 16 09:00:02 2009 +0200 drm: set/clear is_master when master changed The variable is_master is being used to track the drm_file that is currently master, so its value needs to be updated accordingly when the master is changed. Signed-off-by: Jonas Bonn Signed-off-by: Dave Airlie commit 77d26dc9b9805f322f5a1f6e559b18ad66205bd9 Author: Ma Ling Date: Thu Apr 16 17:51:25 2009 +0800 drm: clean dirty memory after device release In current code we register/unregister connector object by drm_sysfs_connector_add/remove function. However under some cases, we need to dynamically register or unregister device multiple times, so we have to go through register -> unregister ->register routine. Because after device_unregister function our memory is dirty, we need to do clean operation in order to re-register the device, otherwise the system will crash. The patch intends to clean device after device release. Signed-off-by: Ma Ling Signed-off-by: Dave Airlie commit d9c6f546469f33f9aa48ae5991c33da8cd535b37 Author: Roel Kluin Date: Thu Apr 16 22:57:46 2009 +0200 drm: count reaches -1 With a postfix decrement in the test count will reach -1 rather than 0, subsequent tests fail. Signed-off-by: Roel Kluin Signed-off-by: Dave Airlie commit 6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e Author: Rafael J. Wysocki Date: Sun Apr 19 20:08:42 2009 +0200 PM/Suspend: Introduce two new platform callbacks to avoid breakage Commit 900af0d973856d6feb6fc088c2d0d3fde57707d3 (PM: Change suspend code ordering) changed the ordering of suspend code in such a way that the platform .prepare() callback is now executed after the device drivers' late suspend callbacks have run. Unfortunately, this turns out to break ARM platforms that need to talk via I2C to power control devices during the .prepare() callback. For this reason introduce two new platform suspend callbacks, .prepare_late() and .wake(), that will be called just prior to disabling non-boot CPUs and right after bringing them back on line, respectively, and use them instead of .prepare() and .finish() for ACPI suspend. Make the PM core execute the .prepare() and .finish() platform suspend callbacks where they were executed previously (that is, right after calling the regular suspend methods provided by device drivers and right before executing their regular resume methods, respectively). It is not necessary to make analogous changes to the hibernation code and data structures at the moment, because they are only used by ACPI platforms. Signed-off-by: Rafael J. Wysocki Reported-by: Russell King Acked-by: Len Brown commit d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a Merge: af8f937... 38cfe96... Author: Linus Torvalds Date: Sun Apr 19 10:58:20 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio: lguest: document 32-bit and PAE requirements lguest: tell git to ignore Documentation/lguest/lguest virtio: fix suspend when using virtio_balloon lguest: fix guest crash on non-linear addresses in gdt pvops lguest: fix crash on vmlinux images commit af8f937274437fa81b95e4e2d461460220636cb8 Merge: 091ccb0... d6aa764... Author: Linus Torvalds Date: Sun Apr 19 10:57:38 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Set function_id only on FG nodes ALSA: MAINTAINERS - Update SOUND ALSA: emu10k1 - off by 1 in snd_emu10k1_wait() ASoC: OMAP: Fix FS polarity in OSK5912 machine driver ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver ASoC: Fix include build error in s3c2412-i2s.c ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate ASoC: Fix jive_wm8750.c build problems ASoC: pxa-ssp: allow setting of dai format 0 ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600) ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934 ALSA: hda_intel.c - Consolidate bitfields commit 091ccb006fcf5c4aa1283901ca6e62ff85b3a569 Merge: c0b7988... 720097d... Author: Linus Torvalds Date: Sun Apr 19 10:54:06 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kbuild: introduce subdir-ccflags-y kbuild: support include/generated commit c0b7988200a82290287c6f4cd49585007f73175a Author: Samuel Thibault Date: Sat Apr 18 22:17:17 2009 +0200 Revert "console ASCII glyph 1:1 mapping" This reverts commit 1c55f18717304100a5f624c923f7cb6511b4116d. Ingo Brueckl was assuming that reverting to 1:1 mapping for chars >= 128 was not useful, but it happens to be: due to the limitations of the Linux console, when a blind user wants to read BIG5 on it, he has no other way than loading a font without SFM and let the 1:1 mapping permit the screen reader to get the BIG5 encoding. Signed-off-by: Samuel Thibault Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 42a17ad2762f465d291c3bc0b6ed2b3738f65481 Author: Ralf Baechle Date: Sat Apr 18 11:30:56 2009 +0200 needs to include . uses EINVAL so should include . This fixes a build error on 64-bit MIPS if CONFIG_SECCOMP is disabled. Signed-off-by: Ralf Baechle Signed-off-by: Linus Torvalds commit 613cbe3d4870429bf2e816d4bbe3146d157ee5c1 Author: Andi Kleen Date: Sun Apr 19 18:40:43 2009 +0200 Don't set relatime when noatime is specified Since commit 0a1c01c9477602ee8b44548a9405b2c1d587b5a2 ("Make relatime default") when a file system is mounted explicitely with noatime it gets both the MNT_RELATIME and MNT_NOATIME bits set. This shows up like this in /proc/mounts: /dev/xxx /yyy ext3 rw,noatime,relatime,errors=continue,data=writeback 0 0 That looks strange. The VFS uses noatime in this case, but both flags are set. So it's more a cosmetic issue, but still better to fix. Cc: mjg@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 38cfe968040250b89c3554a17219a9fda45b9665 Author: Rusty Russell Date: Sun Apr 19 23:14:02 2009 -0600 lguest: document 32-bit and PAE requirements Robert noted that we don't actually document that lguest is 32-bit only, nor that PAE must be off (CONFIG_PAE is now prompted for if HIGHMEM is set to "off). Signed-off-by: Rusty Russell Cc: lguest@ozlabs.org Cc: "Robert P. J. Day" commit 9536c26b31ae34ba6371a1b8f406028e9756f913 Author: Matt Kraai Date: Thu Apr 16 23:46:20 2009 -0700 lguest: tell git to ignore Documentation/lguest/lguest This is the example lguest launcher binary. Signed-off-by: Matt Kraai Signed-off-by: Rusty Russell commit 84a139a985300901dfad99bd93c7345d180af860 Author: Marcelo Tosatti Date: Thu Apr 16 21:14:04 2009 -0300 virtio: fix suspend when using virtio_balloon Break out of wait_event_interruptible() if freezing has been requested, in the vballoon thread. Without this change vballoon refuses to stop and the system can't suspend. Signed-off-by: Marcelo Tosatti Signed-off-by: Rusty Russell Cc: stable@kernel.org commit a489f0b555b753f9df8ddc24c7e74f657ef7ee7b Author: Rusty Russell Date: Sun Apr 19 23:14:00 2009 -0600 lguest: fix guest crash on non-linear addresses in gdt pvops Fixes guest crash 'lguest: bad read address 0x4800000 len 256' The new per-cpu allocator ends up handing a non-linear address to write_gdt_entry. We do __pa() on it, and hand it to the host, which kills us. I've long wanted to make the hypercall "LOAD_GDT_ENTRY" to match the IDT code, but had no pressing reason until now. Signed-off-by: Rusty Russell Cc: lguest@ozlabs.org commit 88df781afb788fa588dbf2e77f205214022a8893 Author: Matias Zabaljauregui Date: Wed Apr 8 17:58:39 2009 -0300 lguest: fix crash on vmlinux images Typical message: 'lguest: unhandled trap 6 at 0x418726 (0x0)' vmlinux guests were broken by 4cd8b5e2a159f18a1507f1187b44a1acbfa6341b 'lguest: use KVM hypercalls', which rewrites guest text from kvm hypercalls to trap 31. The Launcher mmaps the kernel image. The Guest executes and immediately faults in the first text page (read-only). Then it hits a hypercall, and we rewrite that hypercall, causing a copy-on-write. But the Guest pagetables still refer to the old page: we fault again, but as Host we see the hypercall already rewritten, and pass the fault back to the Guest. The Guest hasn't set up an IDT yet, so we kill it. This doesn't happen with bzImages: they unpack themselves and so the text pages are already read-write. Signed-off-by: Rusty Russell Tested-by: Patrick McHardy commit d6aa764ee8674512287913fcc3a0b1b5c050d5eb Merge: 81584a0... 3126a17... Author: Takashi Iwai Date: Sun Apr 19 11:40:02 2009 +0200 Merge branch 'fix/misc' into for-linus * fix/misc: ALSA: MAINTAINERS - Update SOUND ALSA: emu10k1 - off by 1 in snd_emu10k1_wait() commit 81584a079fc7a18b53fc7db4232419a8faadd414 Merge: 7c4112a... c828342... Author: Takashi Iwai Date: Sun Apr 19 11:39:57 2009 +0200 Merge branch 'fix/intel8x0' into for-linus * fix/intel8x0: ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600) ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934 commit 7c4112a285b00e137db04844b8b9b478e5d4363e Merge: 1e2ae4d... 93e82ae... Author: Takashi Iwai Date: Sun Apr 19 11:39:46 2009 +0200 Merge branch 'fix/hda' into for-linus * fix/hda: ALSA: hda - Set function_id only on FG nodes ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs ALSA: hda_intel.c - Consolidate bitfields commit 1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395 Merge: ff54250... 002fbad... Author: Takashi Iwai Date: Sun Apr 19 11:39:38 2009 +0200 Merge branch 'fix/asoc' into for-linus * fix/asoc: ASoC: OMAP: Fix FS polarity in OSK5912 machine driver ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver ASoC: Fix include build error in s3c2412-i2s.c ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate ASoC: Fix jive_wm8750.c build problems ASoC: pxa-ssp: allow setting of dai format 0 commit 720097d895956c0bf15b8440f7845159a04b74da Author: Sam Ravnborg Date: Sun Apr 19 11:04:26 2009 +0200 kbuild: introduce subdir-ccflags-y Following patch introduce support for setting options to gcc that has effect for current directory and all subdirectories. The typical use case are an architecture or a subsystem that decide to cover all files with -Werror. Today alpha, mips and sparc uses -Werror in almost all their Makefile- with subdir-ccflag-y it is now simpler to do so as only the top-level directories needs to be covered. Likewise if we decide to cover a full subsystem such as net/ with -Werror this is done by adding a single line to net/Makefile. Signed-off-by: Sam Ravnborg Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner commit f14875a3e0cc35d7dbe15ee39763a6ae922e7034 Author: Sam Ravnborg Date: Sat Apr 18 23:51:08 2009 +0200 kbuild: support include/generated We need a location for generated files. Today they are spread over several places and bringing them together to a common place makes it obvious hat is generated and what isreal files. Al Viro originally suggested: include/gen Linus suggested to spell it out. This patch implement support for include/generated All files in include/generated are ignored by git. include/generated is removed during "make mrproper". With this we are ready to implement support for include/generated in the various architctures and in the base kernel. Signed-off-by: Sam Ravnborg Cc: Al Viro Cc: Linus Torvalds commit ff54250a0ebab7f90a5f848a0ba63f999830c872 Author: Linus Torvalds Date: Sat Apr 18 21:44:24 2009 -0700 Remove 'recurse into child resources' logic from 'reserve_region_with_split()' This function is not actually used right now, since the original use case for it was done with insert_resource_expand_to_fit() instead. However, we now have another usage case that wants to basically do a "reserve IO resource, splitting around existing resources", however that one doesn't actually want the "recurse into the conflicting resource" logic at all. And since recursing into the conflicting resource was the most complex part, and isn't wanted, just remove it. Maybe we'll some day want both versions, but we can just resurrect the logic then. Tested-by: Yinghai Lu Signed-off-by: Linus Torvalds commit 8d4ab5daca4b3bf9c9166908db0c436722d52e77 Merge: df89f1b... fc6f394... Author: Linus Torvalds Date: Sat Apr 18 21:37:07 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: when renaming don't try to unlink negative dentry cifs: remove unneeded bcc_ptr update in CIFSTCon cifs: add cFYI messages with some of the saved strings from ssetup/tcon cifs: fix buffer size for tcon->nativeFileSystem field cifs: fix unicode string area word alignment in session setup [CIFS] Fix build break caused by change to new current_umask helper function [CIFS] Fix sparse warnings [CIFS] Add support for posix open during lookup cifs: no need to use rcu_assign_pointer on immutable keys cifs: remove dnotify thread code [CIFS] remove some build warnings cifs: vary timeout on writes past EOF based on offset (try #5) [CIFS] Fix build break from recent DFS patch when DFS support not enabled Remote DFS root support. [CIFS] Endian convert UniqueId when reporting inode numbers from server files cifs: remove some pointless conditionals before kfree() cifs: flush data on any setattr commit df89f1ba971b3df2b7e1bc46ca7ce867539186fa Merge: 62f2730... 15da90b... Author: Linus Torvalds Date: Sat Apr 18 12:07:25 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: cs5536: define dma_sff_read_status() method ide: fix barriers support ide: Remove void casts hpt366: use ATA_DMA_* constants hpt366: fix HPT370 DMA timeouts commit 62f2730a11b6fbd6ac274dcf1bc8251abe8d2205 Merge: 4af94f3... defc433... Author: Linus Torvalds Date: Sat Apr 18 11:37:50 2009 -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: Smack: check for SMACK xattr validity in smack_inode_setxattr commit 4af94f39004a0d1a074e7573457e238a29557848 Author: Randy Dunlap Date: Fri Apr 17 18:30:28 2009 -0700 doc: fix kernel-parameters.txt mistaken deletions Re-add missing kernel-parameters documentation that was accidentally deleted in commit 0cb55ad2. Thanks to Ingo and Weidong Han for the heads-up on this. Signed-off-by: Randy Dunlap cc: Ingo Molnar cc: Len Brown Signed-off-by: Linus Torvalds commit a21e25536169432cf9174d631972bc1cd4c75062 Author: Rafael J. Wysocki Date: Sat Apr 18 17:23:41 2009 +0200 PM/Hibernate: Fix memory shrinking Commit d979677c4c0 ("mm: shrink_all_memory(): use sc.nr_reclaimed") broke the memory shrinking used by hibernation, becuse it did not update shrink_all_zones() in accordance with the other changes it made. Fix this by making shrink_all_zones() update sc->nr_reclaimed instead of overwriting its value. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=13058 Reported-and-tested-by: Alan Jenkins Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit 15da90b516e9da92cc1d90001e640fd6707d0e27 Author: Sergei Shtylyov Date: Sat Apr 18 17:42:20 2009 +0200 cs5536: define dma_sff_read_status() method The driver somehow got merged with the initializer for the dma_sff_read_status() method missing which caused kernel panic on bootup. This should fix the kernel.org bug #13026... Signed-off-by: Sergei Shtylyov Reported-by: Arnd Hannemann Signed-off-by: Bartlomiej Zolnierkiewicz commit f505d49ffd25ed062e76ffd17568d3937fcd338c Author: Bartlomiej Zolnierkiewicz Date: Sat Apr 18 17:42:20 2009 +0200 ide: fix barriers support Freeing non-slab objects is bad and results in an oops. Fix it. Reported-and-tested-by: Andrew Price Cc: Theodore Tso Cc: "Rafael J. Wysocki" Signed-off-by: Bartlomiej Zolnierkiewicz commit d5f840bf74c09ca5a31e518c9d984999926b5f44 Author: Jack Stone Date: Sat Apr 18 17:42:19 2009 +0200 ide: Remove void casts Remove uneeded void casts Signed-off-by: Jack Stone Cc: jeff@garzik.org Cc: kernel-janitors@vger.kernel.org Cc: Jack Stone Signed-off-by: Bartlomiej Zolnierkiewicz commit 59c8d04f5ee97ea46da854e9adbbaa45d988c39d Author: Sergei Shtylyov Date: Sat Apr 18 17:42:19 2009 +0200 hpt366: use ATA_DMA_* constants Use ATA_DMA_* constants instead of the bare numbers for the BMIDE register bits. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit c018f1ee5cf81e58b93d9e93a2ee39cad13dc1ac Author: Sergei Shtylyov Date: Sat Apr 18 17:42:19 2009 +0200 hpt366: fix HPT370 DMA timeouts The big driver change in 2.4.19-rc1 introduced a regression for many HPT370[A] chips -- DMA stopped to work completely, only causing endless timeouts... The culprit has been identified (at last!): it turned to be the code resetting the DMA state machine before each transfer. Stop doing it now as this counter- measure has clearly caused more harm than good. This should fix the kernel.org bug #7703. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit defc433ba3bc587826bb467ce0e63452deafa65d Author: Etienne Basset Date: Thu Apr 16 23:58:42 2009 +0200 Smack: check for SMACK xattr validity in smack_inode_setxattr the following patch moves checks for SMACK xattr validity from smack_inode_post_setxattr (which cannot return an error to the user) to smack_inode_setxattr (which can return an error). Signed-off-by: Etienne Basset Acked-by: Casey Schaufler Signed-off-by: James Morris commit aefe6475720bd5eb8aacbc881488f3aa65618562 Merge: d022baf... 16e6aec... Author: Linus Torvalds Date: Fri Apr 17 16:20:29 2009 -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: [libata] fix build error on drivers/ata/pata_legacy.c pata_via: Cache and rewrite the device bit sata_mv: workaround for multi_count errata sata24 sata_mv: tidy up qc->tf usage in qc_prep() functions commit 16e6aeca9e86fb0effb847c1687c9b2cc8e3fb4c Author: Zhenwen Xu Date: Fri Apr 17 15:32:59 2009 +0800 [libata] fix build error on drivers/ata/pata_legacy.c fix those errors: drivers/ata/pata_legacy.c: In function ‘pdc_data_xfer_vlb’: drivers/ata/pata_legacy.c:289: error: ‘ap’ undeclared (first use in this function) drivers/ata/pata_legacy.c:289: error: (Each undeclared identifier is reported only once drivers/ata/pata_legacy.c:289: error: for each function it appears in.) drivers/ata/pata_legacy.c: At top level: drivers/ata/pata_legacy.c:869: error: ‘ATA_PFLAG_PIO32_CHANGE’ undeclared here (not in a +function) make[2]: *** [drivers/ata/pata_legacy.o] Error 1 make[1]: *** [drivers/ata] Error 2 Signed-off-by: Zhenwen Xu Acked-by: Alan Cox Signed-off-by: Jeff Garzik commit b4746ed785d776b1be647458bc911cc607c6ef1c Author: Alan Cox Date: Fri Apr 17 12:21:21 2009 +0100 pata_via: Cache and rewrite the device bit Some VIA chipsets will reset the DEV bit after IEN changes on ctl. Our optimised write path avoids doing this but we need to remove the optimisation on these devices. [Identified and some original patches proposed by Josehn Chan @ VIA but discussion then all ground to a halt so given a test case I dug it back out] Signed-off-by: Alan Cox commit 299b3f8df90a3f7416d8df121d8a42b1a2aeced4 Author: Mark Lord Date: Mon Apr 13 11:29:34 2009 -0400 sata_mv: workaround for multi_count errata sata24 Workaround for errata SATA#24 in sata_mv. This errata affects WRITE_MULTI* commands when the device multi_count produces a DRQ block size >= 4Kbytes. We work around it here by converting such operations into ordinary PIO_WRITEs instead. Note that this might result in a PIO FUA write unavoidably being converted into a non-FUA write. In practice, any system using FUA is also going to be using DMA rather than PIO, so this shouldn't affect anyone in the real world. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 8d2b450d0f9233f221d545f26720eebbc468e857 Author: Mark Lord Date: Mon Apr 13 11:27:18 2009 -0400 sata_mv: tidy up qc->tf usage in qc_prep() functions Tidy up qc->tf accesses in the mv_qc_prep() functions. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit fc6f394332ef1bf6ff5fbeaba0f2cd7a3c7971b6 Author: Jeff Layton Date: Fri Apr 17 11:45:30 2009 -0400 cifs: when renaming don't try to unlink negative dentry When attempting to rename a file on a read-only share, the kernel can call cifs_unlink on a negative dentry, which causes an oops. Only try to unlink the file if it's a positive dentry. Signed-off-by: Jeff Layton Tested-by: Shirish Pargaonkar CC: Stable Signed-off-by: Steve French commit d022bafbb66a2662edaee5bf38bf0f70a755dcd0 Merge: 74a205a... 1a92e82... Author: Linus Torvalds Date: Fri Apr 17 13:53:34 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (43 commits) staging: slicoss: update README otus/zdusb.c: additional USB idnetifier Staging: go7007: fix build issues Staging: sxg: Fix leaks and checksum errors in transmit code path Staging: sxg: Fix sleep in atomic context warning while loading driver Staging: sxg: Use correct queue_id for transmitting non-TCP packets Staging: sxg: Fire watchdog timer at end of open routine to change the link Staging: Pohmelfs: Add load balancing between network states with the same priority. Staging: Pohmelfs: Added IO permissions and priorities. Staging: Pohmelfs: Added ->show_stats() callback. Staging: Pohmelfs: Drop ftrans debugging code. Staging: Pohmelfs: Use wait_on_page_timeout when waiting for remote directory sync instead of hardcoded 25 seconds. Staging: Pohmelfs: Reduce debugging noise about non-existing objects. Staging: Pohmelfs: Sync fs before killing it, since dentry cache is shrunk before writeback is invoked via generic_shutdown_super() Staging: Pohmelfs: Extend remount option. Staging: Pohmelfs: Set NETFS_INODE_REMOTE_SYNCED and clear NETFS_INODE_OWNED bits in the root inode. Staging: Pohmelfs: Added 'need_lock' variable into debug print. Staging: Pohmelfs: Disable read lock in pohmelfs_getattr(). Staging: Pohmelfs: Move parent lock to the place where we really have to send a lookup request to the server. Staging: pohmelfs: Populate dentry cache when receiving the new readdir entry. ... commit 74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b Merge: dd26bf6... 912335c... Author: Linus Torvalds Date: Fri Apr 17 13:53:16 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: UIO: fix specific device driver missing statement for depmod Driver core: remove pr_fmt() from dynamic_dev_dbg() printk driver core: prevent device_for_each_child from oopsing dynamic debug: resurrect old pr_debug() semantics as pr_devel() Driver Core: early platform driver proc: mounts_poll() make consistent to mdstat_poll sysfs: sysfs poll keep the poll rule of regular file. driver core: allow non-root users to listen to uevents driver core: fix driver_match_device sysfs: don't use global workqueue in sysfs_schedule_callback() commit dd26bf6d95f050c42cc8f15e750b09851e1fd30b Merge: 7217fa9... fca10c8... Author: Linus Torvalds Date: Fri Apr 17 13:53:00 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits) WUSB: correct format of wusb_chid sysfs file WUSB: fix oops when completing URBs for disconnected devices WUSB: disconnect all devices when stopping a WUSB HCD USB: whci-hcd: check return value of usb_hcd_link_urb_to_ep() USB: whci-hcd: provide a endpoint_reset method USB: add reset endpoint operations USB device codes for Motorola phone. usb-storage: fix mistake in Makefile USB: usb-serial ch341: support for DTR/RTS/CTS Revert USB: usb-serial ch341: support for DTR/RTS/CTS USB: musb: fix possible panic while resuming USB: musb: fix isochronous TXDMA (take 2) USB: musb: sanitize clearing TXCSR DMA bits (take 2) USB: musb: bugfixes for multi-packet TXDMA support USB: musb_host, fix ep0 fifo flushing USB: usb-storage: augment unusual_devs entry for Simple Tech/Datafab USB: musb_host, minor enqueue locking fix (v2) USB: fix oops in cdc-wdm in case of malformed descriptors USB: qcserial: Add extra device IDs USB: option: Add ids for D-Link DWM-652 3.5G modem ... commit 7217fa9851c99ffe43cee9e3ba4b81a34ce7bac4 Merge: 91ec65b... 7f07df5... Author: Linus Torvalds Date: Fri Apr 17 13:51:14 2009 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (48 commits) [ARM] S3C24XX: ADC: Check pending queue before freeing adc client [ARM] S3C: Fix ADC driver sparse warning [ARM] Osiris: Fix double initialisation in machine block [ARM] Anubis: Fix sparse warnings for items that should be static [ARM] JIVE: Fix sparse warnings about items which should be static [ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon' [ARM] S3C24XX: Fix sparse error in gpiolib.c [ARM] 5455/1: Fix IRQ noise from VIC code [ARM] 5454/1: ep93xx_eth: fix sparse warnings [ARM] remove .gitignore from include/asm-arm Update MAINTAINERS mxc defconfig updates mx31ads: Mark as having full regulatoion constraints with 1133-EV1 board mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 board Fix ifdef in plat-mxc/irc.c MX1ADS: remove I2C ifdefs qong: remove AIPS[12] mappings from machine-specific iotable mx31ads: imoux pins should be passed in as unsigned int MXC: remove orphan imx_init_uart() definition mx31: pin definition for csi ... commit 7f07df540e3c6048e826c9dd4c29c9c836086e86 Merge: c917c1d... ea5a6fd... Author: Russell King Date: Fri Apr 17 21:35:56 2009 +0100 Merge branch 'defconfig-s3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux commit c917c1d0151667768d22fb96d083a11e3dac5f36 Merge: 77f4025... 0c3ee07... Author: Russell King Date: Fri Apr 17 21:35:44 2009 +0100 Merge branch 'v2630-rc2-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux commit 1a92e82a86556727da1626393f2a6becf7e62f39 Author: Stephen Hemminger Date: Wed Apr 15 16:52:16 2009 -0700 staging: slicoss: update README I looked, I gagged, I left Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 5672487d29bd6a3cb0bff941d4f4535ccacc41ed Author: Daniele Napolitano Date: Tue Apr 14 16:58:33 2009 -0700 otus/zdusb.c: additional USB idnetifier Provide support for WN111v2 USB 802.11n adapter. Signed-off-by: Daniele Napolitano Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 86a79d2e7094589413880eefa5c6111032382584 Author: Greg Kroah-Hartman Date: Mon Apr 13 13:16:54 2009 -0700 Staging: go7007: fix build issues Now that TUNER_SET_TYPE_ADDR is gone from the tree, the older code kicks in and tries to use TUNER_SET_TYPE, which went away a long time ago. This patch removes all of this logic, as it should not be needed anymore now, and by doing so, fixes the build. Signed-off-by: Greg Kroah-Hartman commit b824adc9686fb9a6edca164c13107bfed3e41d4e Author: Mithlesh Thukral Date: Wed Mar 25 15:51:49 2009 +0530 Staging: sxg: Fix leaks and checksum errors in transmit code path Fix the transmit function for the following: * Free XmtCmd in the error code path. This use to leak memory in error conditions. * Do pci mapping after the checksum operations are over. They can reallocate the skb at a different location. * Fix UDP checksum errors which were seen in wireshark Signed-off-by: LinSysSoft Sahara Team Signed-off-by: Mithlesh Thukral Signed-off-by: Greg Kroah-Hartman commit cc4b8dfc3ff32f890cd5de0ce22de44f124d0d05 Author: Mithlesh Thukral Date: Wed Mar 25 15:51:14 2009 +0530 Staging: sxg: Fix sleep in atomic context warning while loading driver Leave a spinlock before calling request_irq(). request_irq() calls kmalloc which can sleep. This was generating a warning dump while driver is loaded. Signed-off-by: LinSysSoft Sahara Team Signed-off-by: Mithlesh Thukral Signed-off-by: Greg Kroah-Hartman commit 8d17e6ad8113f7534d978b1b3511f62637483fcc Author: Mithlesh Thukral Date: Wed Mar 25 15:50:34 2009 +0530 Staging: sxg: Use correct queue_id for transmitting non-TCP packets Use correct queue_id while transmitting non-TCP packets. They should always use queue 0. Signed-off-by: LinSysSoft Sahara Team Signed-off-by: Mithlesh Thukral commit 1f895130c0b0dd293b924b1c6cecac90a2e35dc6 Author: Mithlesh Thukral Date: Wed Mar 25 15:49:58 2009 +0530 Staging: sxg: Fire watchdog timer at end of open routine to change the link The watchdog timer which updates the link status was not fired at the end of sxg_entry_open(). Add that. Signed-off-by: LinSysSoft Sahara Team Signed-off-by: Mithlesh Thukral Signed-off-by: Greg Kroah-Hartman commit d43f3612818b13f44e12bfc2ad75b4b46628b3da Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:30 2009 +0300 Staging: Pohmelfs: Add load balancing between network states with the same priority. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit e0ca87391694dfacd01465d5c01c579c3b8b63e0 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:29 2009 +0300 Staging: Pohmelfs: Added IO permissions and priorities. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit f2739de19176009b14475207d5418cd79e7f0ba3 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:28 2009 +0300 Staging: Pohmelfs: Added ->show_stats() callback. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 50e4babfb0c36f1665ffcdc9a1826021aedb173f Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:27 2009 +0300 Staging: Pohmelfs: Drop ftrans debugging code. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit b82ba780a769a2735c86b5197457972a7df0af08 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:26 2009 +0300 Staging: Pohmelfs: Use wait_on_page_timeout when waiting for remote directory sync instead of hardcoded 25 seconds. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit d1ec64409bf6fed877d0e55e23587b2b6f5d7d58 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:25 2009 +0300 Staging: Pohmelfs: Reduce debugging noise about non-existing objects. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit cee9bb2ebdc1697f9be7ee5bdd6867daaa712179 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:24 2009 +0300 Staging: Pohmelfs: Sync fs before killing it, since dentry cache is shrunk before writeback is invoked via generic_shutdown_super() Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit e504342448375ffd73dec2b540a5aaf5da6f8439 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:23 2009 +0300 Staging: Pohmelfs: Extend remount option. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 872dc5e500cc25e3c35d83510dfbd6fb8d78221b Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:22 2009 +0300 Staging: Pohmelfs: Set NETFS_INODE_REMOTE_SYNCED and clear NETFS_INODE_OWNED bits in the root inode. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit b522efdd6f8ab8eaae8c8aa984ab7f06a08bcc8e Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:21 2009 +0300 Staging: Pohmelfs: Added 'need_lock' variable into debug print. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 86ac7253e81b47808f2702596efdfcbfb1a62372 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:20 2009 +0300 Staging: Pohmelfs: Disable read lock in pohmelfs_getattr(). Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit f3b8fa701b4bd8ec6d378896ad005f01e8382381 Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:19 2009 +0300 Staging: Pohmelfs: Move parent lock to the place where we really have to send a lookup request to the server. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 288a9a8955cd28bf6a0f48ec821cf9028e96081b Author: Evgeniy Polyakov Date: Fri Mar 27 15:04:18 2009 +0300 Staging: pohmelfs: Populate dentry cache when receiving the new readdir entry. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit f7ed550b3ecab4a14f78019ff3e8899add607f92 Author: Lior Dotan Date: Wed Feb 11 13:35:10 2009 +0200 Revert Staging: SLICOSS: use gfp_kernel where possible Revert commit 2bb347361e2c19799431f56488a3f64de40a3aa6 This commit has been reported to cause problems: Mar 24 11:50:31 linuxdev kernel: BUG: sleeping function called from invalid context at mm/slub.c:1599 Mar 24 11:50:31 linuxdev kernel: in_atomic(): 1, irqs_disabled(): 0, pid: 3251, name: avahi-daemon Cc: Lior Dotan Cc: Christopher Harrer Signed-off-by: Greg Kroah-Hartman commit d203eea8db0b4acbd19ade1aa025ad9b9e0d8863 Author: Geert Uytterhoeven Date: Mon Apr 6 15:15:55 2009 +0200 Staging: STLC45XX should depend on GENERIC_HARDIRQS m68k allmodconfig: | drivers/staging/stlc45xx/stlc45xx.c: In function 'stlc45xx_probe': | drivers/staging/stlc45xx/stlc45xx.c:2456: error: implicit declaration of function 'set_irq_type' | make[6]: *** [drivers/staging/stlc45xx/stlc45xx.o] Error 1 Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman commit 861a0dcc397f3e94024cc311086799393ec517df Author: Arve Hjønnevåg Date: Mon Apr 6 15:13:00 2009 -0700 Staging: binder: Defer flush and release operations to avoid deadlocks. If a transaction that contains a file descriptor fails on a later object, the new file descriptor needs to be closed. If this is a binder file descriptor we would deadlock in flush. If there were no other references to the file at this point release would also be called. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 0cf24a7dc9123ddf63c413b6d4b38017b19db713 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:59 2009 -0700 Staging: binder: Prevent the wrong thread from adding a transaction to the stack. If a thread is part of a transaction stack, it is only allowed to make another call if it was the target of the top transaction on the stack. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 7af7467efa64affc6505375ceac97d68cfb58e94 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:58 2009 -0700 Staging: binder: Cast to uintptr_t instead of size_t when aligning pointers Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 282ca175d4c440ec4d74bc622ee497e5b3530ce5 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:57 2009 -0700 Staging: binder: Keep a reference to the files_struct while the driver is mmapped This prevents breaking fget_light if a single threaded application allows incoming file descriptors (in replies or on nodes). Should also prevent inserting a file in the wrong files_struct if the receving process execs in the middle of a transaction (between task_get_unused_fd_flags and task_fd_install). Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit ea5c4cc68e2b5f4ec41d666376d3606d4d5c3426 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:56 2009 -0700 Staging: binder: Add more offset validation. Check that datasize is not smaller than one flat_binder_object. Check that offsets are aligned. Check that offsets_size is aligned. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 4ddfc911e39a01f95ad9765d3b9e6f43e14eeff4 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:55 2009 -0700 Staging: binder: mmap fixes. Only allow a binder file pointer to be mmapped once. The buffer management code cannot deal with more then one area. Also remove leftover mutex_unlock if mmap fails. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 85e0b0cbbfc17e7f7baa9e76f9a937249108fc52 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:54 2009 -0700 Staging: binder: Don't create two proc entries with the same name if the driver is opened twice in one process. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 1d8cbcf5d66b1f23f776a2c10ef9574a338cd109 Author: Arve Hjønnevåg Date: Mon Apr 6 15:12:53 2009 -0700 Staging: binder: Remove VM_EXEC check. Many platforms do not support mappings without VM_EXEC. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 20aa9e9b5465a2566e23d78643735dfae3277dab Author: Alan Cox Date: Tue Apr 7 18:43:43 2009 +0100 Staging: aten2011: Clean up some tty bits Minor fixes for tty layer stuff in this driver Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 7cf94029bc0ba99f85a95f19d6823391dffbcf5a Author: Daniele Napolitano Date: Wed Apr 1 14:53:39 2009 -0700 Staging: rt2870: add ID for Sitecom WL-315 Signed-off-by: Daniele Napolitano Cc: Arnd Bergmann Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a405f43ee336fb890fd967625cc133f9d2e59a9f Author: Alexander Beregalov Date: Sun Mar 29 19:59:13 2009 +0400 Staging: line6: convert to snd_card_create() Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit cea96778196dcf7127d6bbbf296c1651848650f2 Author: Alexander Beregalov Date: Sun Mar 29 19:31:28 2009 +0400 Staging: wlan-ng: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 7bea36118ee888f0428d22ea6a5560de33e6e739 Author: Alexander Beregalov Date: Sun Mar 29 19:30:46 2009 +0400 Staging: sxg: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 79bd1096bb31445a04b43e470e03d40d700a14a1 Author: Alexander Beregalov Date: Sun Mar 29 19:30:08 2009 +0400 Staging: slicoss: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit d39efb24eaf7cbda4d161b152f1eab82939fb6e9 Author: Alexander Beregalov Date: Sun Mar 29 19:29:18 2009 +0400 Staging: rt3070: convert to netdev_ops Also remove unused variable. Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 4d562f74ec2cd3e957fbc222b0e975554bb5f2c2 Author: Alexander Beregalov Date: Sun Mar 29 19:28:11 2009 +0400 Staging: rt2870: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit ca7d2dbbadd6c3d6d10e98b94e25cb9566ed3af1 Author: Alexander Beregalov Date: Sun Mar 29 19:27:21 2009 +0400 Staging: rt2860: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 17a23b384f88a336a5230e80dea2013aad03b6f7 Author: Alexander Beregalov Date: Sun Mar 29 19:26:25 2009 +0400 Staging: otus: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit fa5a602a62d7dca6d8ea24cfb4aae349dbaabc7b Author: Alexander Beregalov Date: Sun Mar 29 19:25:33 2009 +0400 Staging: et131x: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 0e46ff33d4a698bf0b69fec0eab076d65709e357 Author: Alexander Beregalov Date: Sun Mar 29 19:24:32 2009 +0400 Staging: epl: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 3a3236827372a1d3ddfb2ea8abf84ba89e856b44 Author: Alexander Beregalov Date: Sun Mar 29 19:23:34 2009 +0400 Staging: at76: convert to netdev_ops Signed-off-by: Alexander Beregalov Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit fca10c81d99ff9956179058460dfddc0418f3902 Author: David Vrabel Date: Wed Apr 8 17:36:30 2009 +0000 WUSB: correct format of wusb_chid sysfs file Make the wusb_chid sysfs file match the ABI documentation. Print all zeros if the WUSB host is stopped (instead of an empty file) and end the file with a newline. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 5936ac7f93965931c508e1928d142076998ce65d Author: David Vrabel Date: Wed Apr 8 17:36:32 2009 +0000 WUSB: fix oops when completing URBs for disconnected devices Fix an oops in wusbhc_giveback_urb() if the wusb device had disconnected while an urb was in progress. Also release the ref count obtained here. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 8db324ec4322a15cf8819b8a7f0eff5aa98b2ff6 Author: David Vrabel Date: Wed Apr 8 17:36:33 2009 +0000 WUSB: disconnect all devices when stopping a WUSB HCD Make sure all WUSB devices are disconnected when stopping a WUSB HCD so that we don't leak the devices' wusb_dev structures. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit f720af91ec2c67e9a1abbd935570f4b4e1f0dd54 Author: David Vrabel Date: Wed Apr 8 17:36:31 2009 +0000 USB: whci-hcd: check return value of usb_hcd_link_urb_to_ep() Check the return value of usb_hcd_link_urb_to_ep() and do not add the urb to the ASL/PZL if it returns an error. Omitting the check results in urbs that appear to be submitted successfully but then cannot be unliked (because usb_hcd_check_unlink_urb() returns an error). This can cause khubd (for example) to block forever in usb_kill_urb(). Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 7f0406db5fe4dd3ad3cbd53830239a87d68156fd Author: David Vrabel Date: Wed Apr 8 17:36:29 2009 +0000 USB: whci-hcd: provide a endpoint_reset method Provide a endpoint_reset method to reset sequence number and current window. This QHead information can only be changed while the qset is not in a schedule. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 3444b26afa145148951112534f298bdc554ec789 Author: David Vrabel Date: Wed Apr 8 17:36:28 2009 +0000 USB: add reset endpoint operations Wireless USB endpoint state has a sequence number and a current window and not just a single toggle bit. So allow HCDs to provide a endpoint_reset method and call this or clear the software toggles as required (after a clear halt, set configuration etc.). usb_settoggle() and friends are then HCD internal and are moved into core/hcd.h and all device drivers call usb_reset_endpoint() instead. If the device endpoint state has been reset (with a clear halt) but the host endpoint state has not then subsequent data transfers will not complete. The device will only work again after it is reset or disconnected. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit d45e230bf03850f17394a760dfa003d986a67729 Author: Dr. Greg Wettstein Date: Sat Apr 11 09:12:08 2009 -0500 USB device codes for Motorola phone. The v950 appears to be a ruggedized version of the Motorola Razor phone. Tethering to the phone to use it in 'phone as modem' mode requires the use of the specialized moto-modem driver which layers over the usb-serial driver. Support for the v950 was added simply adding the device ID's for the phone. Signed-off-by: Dr. Greg Wettstein Signed-off-by: Greg Kroah-Hartman commit dfc15e8955338fedf5c5d15622c4042c1e4ee332 Author: Alan Stern Date: Thu Apr 9 14:59:44 2009 -0400 usb-storage: fix mistake in Makefile This patch (as1228) fixes a Makefile error introduced when the subdrivers in usb-storage were split out into separate modules. The intention is that when CONFIG_USB_LIBUSUAL is set, libusual.o and usual-tables.o should be combined into a single object file (called usb-libusual). The current Makefile will instead create two separate objects, and the result won't load properly. Signed-off-by: Alan Stern Reported-and-tested-by: Alan Jenkins Reported-and-tested-by: Mike Galbraith Signed-off-by: Greg Kroah-Hartman commit f4c1a8379a6d1ba39ac7b87f75d1352ef05cffff Author: Werner Cornelius Date: Fri Jan 16 21:02:41 2009 +0100 USB: usb-serial ch341: support for DTR/RTS/CTS commit 664d5df92e88b6ef091048a802b3750f4e989180 upstream. Fixup of Werner Cornelius patch to the ch341 USB-serial driver, which adds: - support all baudrates, not just a hard-coded set - support for controlling DTR, RTS and CTS Features still missing: - character length other than 8 bits - parity settings - break control I adapted his patch for the new usb_serial API introduced in 2.6.25-git8 by Alan Cox on 22 July 2008. Non-compliance to the new API was a reason for refusing a similar patch from Tollef Fog Heen. Usage example by Tollef Fog Heen : TEMPer USB thermometer based on a patch by: From: Tollef Fog Heen * Implement support for all baud rates rather than just a hard coded set. * Make it possible to control status and control lines * Grab a bunch of #defines from FreeBSD to reduce the number of magic numbers in the file Signed-off-by: Werner Cornelius Signed-off-by: Boris Hajduk Cc: Alan Cox Signed-off-by: Tollef Fog Heen Signed-off-by: Greg Kroah-Hartman commit c7877e1983f051cc267e1ec8c232a02d23c0a82a Author: Greg Kroah-Hartman Date: Tue Apr 7 11:56:32 2009 -0700 Revert USB: usb-serial ch341: support for DTR/RTS/CTS Reverts commit 664d5df92e88b6ef091048a802b3750f4e989180 as the commit log information was not complete, and we didn't have a proper signed-off-by by the author of the original BSD code. Cc: Werner Cornelius Cc: Boris Hajduk Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 0ec8fd70fbd7327e1bf747c4a2f6b67efdf16618 Author: Kim Kyuwon Date: Thu Mar 26 18:56:51 2009 -0700 USB: musb: fix possible panic while resuming During driver resume processing, musb could cause a kernel panic. Fix by enabling the clock earlier, with the resume_early method. Signed-off-by: Kim Kyuwon Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6b6e97107f12f3a9f7b5b43a6c3b94409240bcff Author: Sergei Shtylyov Date: Thu Mar 26 18:29:19 2009 -0700 USB: musb: fix isochronous TXDMA (take 2) Multi-frame isochronous TX URBs transfers in DMA mode never complete with CPPI DMA because musb_host_tx() doesn't restart DMA on the second frame, only emitting a debug message. With Inventra DMA they complete, but in PIO mode. To fix: - Factor out programming of the DMA transfer from musb_ep_program() into musb_tx_dma_program(); - Reorder the code at the end of musb_host_tx() to facilitate the fallback to PIO iff DMA fails; - Handle the buffer offset consistently for both PIO and DMA modes; - Add an argument to musb_ep_program() for the same reason (it only worked correctly with non-zero offset of the first frame in PIO mode); - Set the completed isochronous frame descriptor's 'actual_length' and 'status' fields correctly in DMA mode. Also, since CPPI reportedly doesn't like sending isochronous packets in the RNDIS mode, change the criterion for this mode to be used only for multi-packet transfers. (There's no need for that mode in the single-packet case anyway.) [ dbrownell@users.sourceforge.net: split comment paragraph into bullet list, shrink patch delta, style tweaks ] Signed-off-by: Pavel Kiryukhin Signed-off-by: Sergei Shtylyov Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b6e434a5404b9ce8c285ea081b6ea5c523b29db4 Author: Sergei Shtylyov Date: Thu Mar 26 18:27:47 2009 -0700 USB: musb: sanitize clearing TXCSR DMA bits (take 2) The MUSB code clears TXCSR_DMAMODE incorrectly in several places, either asserting that TXCSR_DMAENAB is clear (when sometimes it isn't) or clearing both bits together. Recent versions of the programmer's guide require DMAENAB to be cleared first, although some older ones didn't. Fix this and while at it: - In musb_gadget::txstate(), stop clearing the AUTOSET and DMAMODE bits for the CPPI case since they never get set anyway (the former bit is reserved on DaVinci); but do clear the DMAENAB bit on the DMA error path. - In musb_host::musb_ep_program(), remove the duplicate DMA controller specific code code clearing the TXCSR previous state, add the code to clear TXCSR DMA bits on the Inventra DMA error path, to replace such code (executed late) on the PIO path. - In musbhsdma::dma_channel_abort()/dma_controller_irq(), add/use the 'offset' variable to avoid MUSB_EP_OFFSET() invocations on every RXCSR/TXCSR access. [dbrownell@users.sourceforge.net: don't introduce CamelCase, shrink diff] Signed-off-by: Sergei Shtylyov Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit c7bbc056a92476b3b3d70a8df7cc746ac5d56de7 Author: Sergei Shtylyov Date: Thu Mar 26 18:26:40 2009 -0700 USB: musb: bugfixes for multi-packet TXDMA support We really want to use DMA mode 1 for all multi-packet transfers; that's one IRQ on DMA completion, instead of one per packet. There is an important issue with such transfers, especially on the host side: when such transfers end with a full-size packet, we must defer musb_dma_completion() calls until the FIFO empties. Else we report URB completions too soon, and may clobber data in the FIFO fifo when writing the next packet (losing data). The Inventra DMA support uses DMA mode 1, but it ignores that issue. The CPPI DMA support uses mode 0, but doesn't handle its TXPKTRDY interrupts quite right either; it can get stale "packet ready" interrupts, and report transfer completion too early using slightly different code paths, also losing data. So I'm solving it in a generic way -- by adding a sort of the "interrupt filter" into musb_host_tx(), catching these cases where a DMA completion IRQ doesn't suffice and removing some needlessly controller-specific logic. When a TXDMA interrupt happens and DMA request mode 1 is active, that filter resets to mode 0 and defers URB completion processing until TXPKTRDY, unless the FIFO is already empty. Related filtering logic in Inventra and CPPI code gets removed. Since it should be competely safe now to use the DMA request mode 1 for host side transfers with the CPPI DMA controller, set it in musb_h_tx_dma_start() ... now renamed (and shared). [ dbrownell@users.sourceforge.net: don't introduce more CamElCase; use more concise explanations ] Signed-off-by: Sergei Shtylyov Cc: Felipe Balbi Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 78322c1a64387673f46afb8b5e31edec94e9603d Author: David Brownell Date: Thu Mar 26 17:38:30 2009 -0700 USB: musb_host, fix ep0 fifo flushing The MUSB host side can't share generic TX FIFO flush logic with EP0; the EP0 TX status register bits are different from those for other entpoints. Resolve this issue by providing a new EP0-specific routine to flush and reset the FIFO, which pays careful attention to restrictions listed in the latest programmer's guide. This gets rid of an open issue whereby the usbtest control write test (#14) failed. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e4813eec8d47c8299d968bd5349dc881fa481c26 Author: Alan Stern Date: Tue Mar 24 10:39:13 2009 -0400 USB: usb-storage: augment unusual_devs entry for Simple Tech/Datafab This patch (as1227) adds the MAX_SECTORS_64 flag to the unusual_devs entry for the Simple Tech/Datafab controller. This fixes Bugzilla #12882. Signed-off-by: Alan Stern Reported-and-tested-by: binbin Cc: stable Signed-off-by: Greg Kroah-Hartman commit 74bb35083d889c696a0f54be76ffe85a66dcbdc1 Author: David Brownell Date: Thu Mar 26 17:36:57 2009 -0700 USB: musb_host, minor enqueue locking fix (v2) Someone noted that the enqueue path used an unlocked access for usb_host_endpoint->hcpriv ... fix that, by being safe and always accessing it under spinlock protection. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e13c594f3a1fc2c78e7a20d1a07974f71e4b448f Author: Oliver Neukum Date: Sat Apr 4 09:25:15 2009 +0200 USB: fix oops in cdc-wdm in case of malformed descriptors cdc-wdm needs to ignore extremely malformed descriptors. Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Greg Kroah-Hartman commit f05932c0caf40c43af8a2c21adf7c46a00c436c4 Author: Matthew Garrett Date: Sat Apr 4 17:24:24 2009 +0100 USB: qcserial: Add extra device IDs Add a set of device IDs from the Windows drivers. These aren't complete (there's a couple of cases where a QDL device is identified without the associated modem being identified), but it's better than the current situation. Signed-off-by: Matthew Garrett Signed-off-by: Greg Kroah-Hartman commit c00deaa542100a697acb5be200b9f54317c1cf69 Author: Pascal Terjan Date: Tue Apr 7 14:40:42 2009 +0200 USB: option: Add ids for D-Link DWM-652 3.5G modem This patch allows D-Link DWM-652 3.5G modem to work. It is an express card but was only tested with the provided usb adapter as I don't have machines with express card connector. /dev/ttyUSB{0,1,2} get created, and using comgt on ttyUSB1 works fine : [root@plop tmp]# comgt -d /dev/ttyUSB1 -e Enter PIN number: XXXX Waiting for Registration..(120 sec max). Registered on Home network: "Orange France",2 Signal Quality: 15,99 From: Pascal Terjan Signed-off-by: Greg Kroah-Hartman commit ae27d84351f1f3568118318a8c40ff3a154bd629 Author: Peter Korsgaard Date: Wed Mar 25 11:32:59 2009 +0100 USB: ftdi_sio: add vendor/project id for JETI specbos 1201 spectrometer Signed-off-by: Peter Korsgaard Cc: stable Signed-off-by: Greg Kroah-Hartman commit 237e75bf1e558f7330f8deb167fa3116405bef2c Author: Jonathan McDowell Date: Thu Mar 26 00:45:27 2009 -0700 usb gadget: fix ethernet link reports to ethtool The g_ether USB gadget driver currently decides whether or not there's a link to report back for eth_get_link based on if the USB link speed is set. The USB gadget speed is however often set even before the device is enumerated. It seems more sensible to only report a "link" if we're actually connected to a host that wants to talk to us. The patch below does this for me - tested with the PXA27x UDC driver. Signed-off-by: Jonathan McDowell Signed-off-by: David Brownell Cc: stable Signed-off-by: Greg Kroah-Hartman commit 91ec65ba335db80b686f93b9eb531d537e712e61 Merge: df42654... 0c387ec... Author: Linus Torvalds Date: Fri Apr 17 10:08:13 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ads7846 - fix unsafe disable_irq Input: mainstone-wm97xx - fix condition in pen_up Input: pc110pad - remove unused variable dev Input: bf54x-keys - remove depreciated IRQF_SAMPLE_RANDOM flag Input: ad7877, ad7879 - remove depreciated IRQF_SAMPLE_RANDOM flag Input: da9034-ts - make pen {down,up} events more reliable Input: da9034-ts - add Bin Yang as co-author of the driver Input: atkbd - add forced release keys quirk for Samsung NC20 Input: atkbd - add forced release keys quirk for Samsung Q45 Input: gameport - fix attach driver code Input: hp_sdc_rtc should depend on serio Input: wm97xx - don't specify IRQF_SAMPLE_RANDOM Input: ads7846 - introduce platform specific way to synchronize sampling Input: remove unnecessary synchronize_rcu() call Input: i8042 - add a DMI table for the i8042.reset option Input: i8042 - introduce a tougher reset commit df42654e90b3045691f4c327075897aed9691ebe Author: Linus Torvalds Date: Fri Apr 17 09:59:27 2009 -0700 Get rid of final remnants of include/asm-$(ARCH) This renames include/asm-h8300/timer.h into arch/h8300/include/asm: it was left over just because that file had been created in the -mm tree before the whole h8300 header subdirectory had been moved, and then got merged in the old location afterwards. (See commits e0b0f9e4ead2468f84c26332ec42b118e76af572: "h8300: update timer handler - new files" and 758db3f2118703a1e36374dae5d58bed963e7e0d: "[h8300] move include/asm-h8300 to arch/h8300/include/asm" for details). This also removes a left-over .gitignore file in include/asm-arm that became stale when the ARM header files were moved (which happened in multiple commits, just see "git log -- include/asm-arm" for details). Signed-off-by: Linus Torvalds commit 4dc8ab86e0724642e2f778116de64f4b832d7d94 Merge: b9836e0... 78a4999... Author: Linus Torvalds Date: Fri Apr 17 09:57:17 2009 -0700 Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm commit b9836e08375d86834edcde45e3628e63db8b9624 Merge: 6566abd... 0917798... Author: Linus Torvalds Date: Fri Apr 17 09:56:11 2009 -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 microcode driver newly spewing warnings x86, PAT: Remove page granularity tracking for vm_insert_pfn maps x86: disable X86_PTRACE_BTS for now x86, documentation: kernel-parameters replace X86-32,X86-64 with X86 x86: pci-swiotlb.c swiotlb_dma_ops should be static x86, PAT: Remove duplicate memtype reserve in devmem mmap x86, PAT: Consolidate code in pat_x_mtrr_type() and reserve_memtype() x86, PAT: Changing memtype to WC ensuring no WB alias x86, PAT: Handle faults cleanly in set_memory_ APIs x86, PAT: Change order of cpa and free in set_memory_wb x86, CPA: Change idmap attribute before ioremap attribute setup commit 6566abdbd0566fc1b5950c9f87ef57c7443d6fa8 Author: Matt Kraai Date: Fri Apr 17 12:56:38 2009 +0100 AFS: Guard afs_file_readpage_read_complete() definition with CONFIG_AFS_FSCACHE If CONFIG_AFS_FSCACHE is not defined, the following warning is displayed when fs/afs/file.c is compiled: fs/afs/file.c:111: warning: ‘afs_file_readpage_read_complete’ defined but not used This occurs because all calls to this function are guarded by CONFIG_AFS_FSCACHE. Thus, guard its definition as well. Signed-off-by: Matt Kraai Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit d29a2e943867bfa48f72ee6e99723a1b29fe6f7e Author: Alan Cox Date: Fri Apr 17 12:22:35 2009 +0100 vfat: Note the NLS requirement Close bug #4754. Stop people getting into a situation where they can't get their FAT filesystems to mount as they expect. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 93e82ae781e1ca4797cf2a226d3c303975bd99c7 Author: Takashi Iwai Date: Fri Apr 17 18:04:41 2009 +0200 ALSA: hda - Set function_id only on FG nodes (Re)set function_id only from the value on FG nodes. The current code overrides the value with the last widget. Signed-off-by: Takashi Iwai commit b80901bbf599553f483b9509f2dce416b938aae8 Author: Randy Dunlap Date: Thu Apr 16 19:09:55 2009 -0700 splice: fix new kernel-doc warnings splice: fix kernel-doc warnings Warning(fs/splice.c:617): bad line: Warning(fs/splice.c:722): No description found for parameter 'sd' Warning(fs/splice.c:722): Excess function parameter 'pipe' description in 'splice_from_pipe_begin' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 0c3ee078251b85812e585b5cf5d1635afd73f4e2 Author: Ramax Lo Date: Tue Apr 14 23:56:18 2009 +0800 [ARM] S3C24XX: ADC: Check pending queue before freeing adc client Check pending queue and remove the adc client being released. Signed-off-by: Ramax Lo Signed-off-by: Ben Dooks commit f8c8ac8109ecdd3583b0ac9fd3adf058678a802e Author: Ben Dooks Date: Fri Apr 17 12:36:49 2009 +0100 [ARM] S3C: Fix ADC driver sparse warning The symbol 's3c_adc_try' in arch/arm/plat-s3c24xx/adc.c does not need to be exported and thus should be static. This fixes the following sparse warning: adc.c:103:6: warning: symbol 's3c_adc_try' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit 2a96ad05e93be75398871a2fce932ed234d03112 Author: Ben Dooks Date: Fri Apr 17 12:36:47 2009 +0100 [ARM] Osiris: Fix double initialisation in machine block The .init_machine entry in mach-osiris.c had the same entry twice, so remove one definition to fix the following warning from sparse: mach-osiris.c:416:3: warning: Initializer entry defined twice mach-osiris.c:418:3: also defined here Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit 019dbaa11db56d8e5d868e02421ff236a054c0d8 Author: Ben Dooks Date: Fri Apr 17 12:36:46 2009 +0100 [ARM] Anubis: Fix sparse warnings for items that should be static Make 'anubis_ide_platdata' statis as it is not used outside the file it is in, fixing the following sparse warning: mach-anubis.c:246:27: warning: symbol 'anubis_ide_platdata' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit 59c1ab60909ffacbf978ac72e4bb1d40d79f1465 Author: Ben Dooks Date: Fri Apr 17 12:36:45 2009 +0100 [ARM] JIVE: Fix sparse warnings about items which should be static Make 'jive_vgg2432a4_display' and 'jive_lcd_config' static as they are not exported, and are generating the following sparse warnings: mach-jive.c:280:26: warning: symbol 'jive_vgg2432a4_display' was not declared. Should it be static? mach-jive.c:313:28: warning: symbol 'jive_lcd_config' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit ad14ff37496baa4bee98ea99db8bb8615c648b49 Author: Ben Dooks Date: Fri Apr 17 12:36:44 2009 +0100 [ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon' Fix the following sparse warning due to s3c_device_hwmon being missing from devs.c:380:24: warning: symbol 's3c_device_hwmon' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit ec5cfbfc05b180a026b4ebce72f341ee196de262 Author: Ben Dooks Date: Fri Apr 17 12:36:43 2009 +0100 [ARM] S3C24XX: Fix sparse error in gpiolib.c Fix the following sparse error generated by including instead of gpiolib.c:78:22: warning: symbol 's3c24xx_gpios' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit 3126a1790e897252868941bd29a3dd526b506804 Author: Joe Perches Date: Wed Apr 15 23:38:45 2009 -0700 ALSA: MAINTAINERS - Update SOUND Signed-off-by: Joe Perches Signed-off-by: Takashi Iwai commit 5a47fa3d30b5d1977b4e7d1daf5ba5b577258ce1 Author: Roel Kluin Date: Thu Apr 16 23:54:04 2009 +0200 ALSA: emu10k1 - off by 1 in snd_emu10k1_wait() With `while (count++ < 16384)' count reaches 16385. Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit 78a49990269a539fc77e9a669d9e74e1dfaec657 Author: Hirokazu Takata Date: Fri Apr 17 10:46:25 2009 +0900 m32r: move include/asm-m32r/* to arch/m32r/include/asm/ Move remained files, ftrace.h and swab.h, to arch/m32r/include/asm/. Signed-off-by: Hirokazu Takata commit 22c9d52bc03b880045ab1081890a38f11b272ae7 Author: Jeff Layton Date: Thu Apr 16 13:48:49 2009 -0400 cifs: remove unneeded bcc_ptr update in CIFSTCon This pointer isn't used again after this point. It's also not updated in the ascii case, so there's no need to update it here. Pointed-out-by: Dave Kleikamp Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 313fecfa69bbad0a10d3313a50a89d3064f47ce1 Author: Jeff Layton Date: Thu Apr 16 11:21:53 2009 -0400 cifs: add cFYI messages with some of the saved strings from ssetup/tcon ...to make it easier to find problems in this area in the future. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit f083def68f84b04fe3f97312498911afce79609e Author: Jeff Layton Date: Thu Apr 16 11:21:52 2009 -0400 cifs: fix buffer size for tcon->nativeFileSystem field The buffer for this was resized recently to fix a bug. It's still possible however that a malicious server could overflow this field by sending characters in it that are >2 bytes in the local charset. Double the size of the buffer to account for this possibility. Also get rid of some really strange and seemingly pointless NULL termination. It's NULL terminating the string in the source buffer, but by the time that happens, we've already copied the string. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 27b87fe52baba0a55e9723030e76fce94fabcea4 Author: Jeff Layton Date: Tue Apr 14 11:00:53 2009 -0400 cifs: fix unicode string area word alignment in session setup The handling of unicode string area alignment is wrong. decode_unicode_ssetup improperly assumes that it will always be preceded by a pad byte. This isn't the case if the string area is already word-aligned. This problem, combined with the bad buffer sizing for the serverDomain string can cause memory corruption. The bad alignment can make it so that the alignment of the characters is off. This can make them translate to characters that are greater than 2 bytes each. If this happens we can overflow the allocation. Fix this by fixing the alignment in CIFS_SessSetup instead so we can verify it against the head of the response. Also, clean up the workaround for improperly terminated strings by checking for a odd-length unicode buffers and then forcibly terminating them. Finally, resize the buffer for serverDomain. Now that we've fixed the alignment, it's probably fine, but a malicious server could overflow it. A better solution for handling these strings is still needed, but this should be a suitable bandaid. Signed-off-by: Jeff Layton CC: Stable Signed-off-by: Steve French commit 88dd47fff4891545bfcfdf39146dde8380771766 Author: Steve French Date: Wed Apr 15 03:09:39 2009 +0000 [CIFS] Fix build break caused by change to new current_umask helper function Signed-off-by: Steve French commit bc8cd4390c9129fbd286b10fa99972dfb68cd069 Author: Steve French Date: Sun Apr 12 18:18:40 2009 +0000 [CIFS] Fix sparse warnings Signed-off-by: Shirish Pargaonkar CC: Jeff Layton Signed-off-by: Steve French commit a6ce4932fbdbcd8f8e8c6df76812014351c32892 Author: Steve French Date: Thu Apr 9 01:14:32 2009 +0000 [CIFS] Add support for posix open during lookup This patch by utilizing lookup intents, and thus removing a network roundtrip in the open path, improves performance dramatically on open (30% or more) to Samba and other servers which support the cifs posix extensions Signed-off-by: Shirish Pargaonkar Signed-off-by: Steve French commit d9fb5c091b419e0495c50c1cce9e4cf9f7105072 Author: Jeff Layton Date: Mon Mar 23 01:47:11 2009 -0400 cifs: no need to use rcu_assign_pointer on immutable keys cifs: no need to use rcu_assign_pointer on immutable keys Neither keytype in use by CIFS has an "update" method. This means that the keys are immutable once instantiated. We don't need to use RCU to set the payload data pointers. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 5144ebf408ed08380917126493450ee22e63fe3f Author: Jeff Layton Date: Mon Mar 23 01:47:12 2009 -0400 cifs: remove dnotify thread code cifs: remove dnotify thread code Al Viro recently removed the dir_notify code from the kernel along with the CIFS code that used it. We can also get rid of the dnotify thread as well. In actuality, it never had anything to do with dir_notify anyway. All it did was unnecessarily wake up all the tasks waiting on the response queues every 15s. Previously that happened to prevent tasks from hanging indefinitely when the server went unresponsive, but we put those to sleep with proper timeouts now so there's no reason to keep this around. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 2d6d589d8009b37ae03244059c93e0e8cf46910e Author: Steve French Date: Thu Apr 9 00:36:44 2009 +0000 [CIFS] remove some build warnings Signed-off-by: Steve French commit fbec9ab952d4810960e620035c8e95f0fbbae4be Author: Jeff Layton Date: Fri Apr 3 13:44:00 2009 -0400 cifs: vary timeout on writes past EOF based on offset (try #5) This is the fourth version of this patch: The first three generated a compiler warning asking for explicit curly braces. The first two didn't handle update the size correctly when writes that didn't start at the eof were done. The first patch also didn't update the size correctly when it explicitly set via truncate(). This patch adds code to track the client's current understanding of the size of the file on the server separate from the i_size, and then to use this info to semi-intelligently set the timeout for writes past the EOF. This helps prevent timeouts when trying to write large, sparse files on windows servers. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit d036f50fc202e1a851a25dc5edc215ebd0086201 Author: Steve French Date: Fri Apr 3 03:12:08 2009 +0000 [CIFS] Fix build break from recent DFS patch when DFS support not enabled Signed-off-by: Steve French commit 1bfe73c258addc388b90fe8c2c6bbc0f0c9c10dd Author: Igor Mammedov Date: Wed Apr 1 17:54:42 2009 +0400 Remote DFS root support. Allows to mount share on a server that returns -EREMOTE at the tree connect stage or at the check on a full path accessibility. Signed-off-by: Igor Mammedov Acked-by: Jeff Layton Signed-off-by: Steve French commit 85a6dac54a7e28112488b02523202985edc7e639 Author: Steve French Date: Wed Apr 1 05:22:00 2009 +0000 [CIFS] Endian convert UniqueId when reporting inode numbers from server files Jeff made a good point that we should endian convert the UniqueId when we use it to set i_ino Even though this value is opaque to the client, when comparing the inode numbers of the same server file from two different clients (one big endian, one little endian) or when we compare a big endian client's view of i_ino with what the server thinks - we should get the same value Signed-off-by: Steve French commit 74496d365ad171d11f21da4a8be71c945f6ec825 Author: Wei Yongjun Date: Tue Mar 31 16:28:36 2009 +0800 cifs: remove some pointless conditionals before kfree() Remove some pointless conditionals before kfree(). Signed-off-by: Wei Yongjun Signed-off-by: Steve French commit 0f4d634c59a4e062bef81c00d9e63333f2a83b46 Author: Jeff Layton Date: Thu Mar 26 13:35:37 2009 -0400 cifs: flush data on any setattr We already flush all the dirty pages for an inode before doing ATTR_SIZE and ATTR_MTIME changes. There's another problem though -- if we change the mode so that the file becomes read-only then we may not be able to write data to it after a reconnect. Fix this by just going back to flushing all the dirty data on any setattr call. There are probably some cases that can be optimized out, but I'm not sure they're worthwhile and we need to consider them more carefully to make sure that we don't cause regressions if we have to reconnect before writeback occurs. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 9f76208c33984ab777eace5d07a4e36e88703e02 Merge: d06be22... 557055b... Author: Linus Torvalds Date: Thu Apr 16 18:17:22 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix branch tracer header tracing: Fix power tracer header commit d06be221504189f38950111c214802ada0eb1b71 Merge: 4d831f5... 381512c... Author: Linus Torvalds Date: Thu Apr 16 18:16:29 2009 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Avoid printing sched_group::__cpu_power for default case tracing, sched: mark get_parent_ip() notrace commit c03f6a19699fce4389888a45db8245969311d868 Author: NeilBrown Date: Fri Apr 17 11:06:30 2009 +1000 md: update sync_completed and reshape_position even more often. There are circumstances when a user-space process might need to "oversee" a resync/reshape process. For example when doing an in-place reshape of a raid5, it is prudent to take a backup of each section before reshaping it as this is the only way to provide safety against an unplanned shutdown (i.e. crash/power failure). The sync_max sysfs value can be used to stop the resync from advancing beyond a particular point. So user-space can: suspend IO to the first section and back it up set 'sync_max' to the end of the section wait for 'sync_completed' to reach that point resume IO on the first section and move on to the next section. However this process requires the kernel and user-space to run in lock-step which could introduce unnecessary delays. It would be better if a 'double buffered' approach could be used with userspace and kernel space working on different sections with the 'next' section always ready when the 'current' section is finished. One problem with implementing this is that sync_completed is only guaranteed to be updated when the sync process reaches sync_max. (it is updated on a time basis at other times, but it is hard to rely on that). This defeats some of the double buffering. With this patch, sync_completed (and reshape_position) get updated as the current position approaches sync_max, so there is room for userspace to advance sync_max early without losing updates. To be precise, sync_completed is updated when the current sync position reaches half way between the current value of sync_completed and the value of sync_max. This will usually be a good time for user space to update sync_max. If sync_max does not get updated, the updates to sync_completed (together with associated metadata updates) will occur at an exponentially increasing frequency which will get unreasonably fast (one update every page) immediately before the process hits sync_max and stops. So the update rate will be unreasonably fast only for an insignificant period of time. Signed-off-by: NeilBrown commit fe4e719d82c4052751d2287de4bd18bd04e93685 Author: Hirokazu Takata Date: Fri Nov 28 02:46:48 2008 +0900 m32r: move include/asm-m32r headers to arch/m32r/include/asm Signed-off-by: Hirokazu Takata commit 4d831f53ddd5c0117ff40f841cf330c78d242e82 Merge: 20d9207... 79d381c... Author: Linus Torvalds Date: Thu Apr 16 17:56:39 2009 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kernel/softirq.c: fix sparse warning rcu: Make hierarchical RCU less IPI-happy commit 79d381c9f2354b594dcab9b04dfcc0debf7294fe Author: H Hartley Sweeten Date: Thu Apr 16 19:30:18 2009 -0400 kernel/softirq.c: fix sparse warning Fix sparse warning in kernel/softirq.c. warning: do-while statement is not a compound statement Signed-off-by: H Hartley Sweeten LKML-Reference: Signed-off-by: Ingo Molnar commit 20d9207849d5abe60461841b3c3724f6e7c9d33e Merge: c19f836... 4ea3c51... Author: Linus Torvalds Date: Thu Apr 16 16:43:20 2009 -0700 Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: UV BAU distribution and payload MMRs x86: UV: BAU partition-relative distribution map x86, uv: add Kconfig dependency on NUMA for UV systems x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems x86, UV: Fix for nodes with memory and no cpus x86, UV: system table in bios accessed after unmap x86: UV BAU messaging timeouts x86: UV BAU and nodes with no memory commit 912335c43bb10d124471bf063a85e132aa814214 Author: Hans J. Koch Date: Sat Apr 11 04:18:25 2009 +0200 UIO: fix specific device driver missing statement for depmod On Fri, Apr 10, 2009 at 01:50:50PM -0700, Andrew Morton wrote: > On Fri, 10 Apr 2009 13:32:01 GMT > bugzilla-daemon@bugzilla.kernel.org wrote: > > > http://bugzilla.kernel.org/show_bug.cgi?id=13059 drivers/uio/uio_cif.c misses a MODULE_DEVICE_TABLE, this fixes it. Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 7607b1d673469d5b5dce4c9b6779d165e03c8ff5 Author: Jason Baron Date: Wed Apr 8 12:12:52 2009 -0400 Driver core: remove pr_fmt() from dynamic_dev_dbg() printk When pr_fmt() was added to the pr_debug() code, we added it not only to the dynamic_pr_debug() function, but also to the dynamic_dev_dbg() funciton. However, dev_dbg() doesn't make use of pr_fmt(), so neither should dynamic_dev_dbg(). Signed-off-by: Jason Baron Signed-off-by: Greg Kroah-Hartman commit 014c90dbb9b63bae067afc80a7931a76c5268ae3 Author: Greg Kroah-Hartman Date: Wed Apr 15 16:00:12 2009 -0700 driver core: prevent device_for_each_child from oopsing David Vrabel noticed that the wireless usb stack likes to call device_for_each_chile() with an empty bus. This used to work fine, but now oopses. This patch fixes the oops and makes the code behave like it used to. Reported-by: David Vrabel Tested-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 4ccb457966391295bd9b3644f6bdc9ddd97b6051 Author: Michael Ellerman Date: Thu Apr 9 14:48:24 2009 -0700 dynamic debug: resurrect old pr_debug() semantics as pr_devel() pr_debug() used to produce zero code unless DEBUG was #defined. This is now no longer the case in practice[1]. There are places where it's useful to have debugging printks, but we don't want them to generate any code in production kernels. So add a new macro, pr_devel(), for _devel_opment, to provide the old semantics, ie. if the programmer doesn't explicitly enable debugging, no code is produced. [1]: You can turn CONFIG_DYNAMIC_DEBUG off, but it's enabled in at least one distro kernel, so it's not really a solution. Signed-off-by: Michael Ellerman Cc: Jason Baron Cc: Greg Banks Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 13977091a988fb0d21821c2221ddc920eba36b79 Author: Magnus Damm Date: Mon Mar 30 14:37:25 2009 -0700 Driver Core: early platform driver V3 of the early platform driver implementation. Platform drivers are great for embedded platforms because we can separate driver configuration from the actual driver. So base addresses, interrupts and other configuration can be kept with the processor or board code, and the platform driver can be reused by many different platforms. For early devices we have nothing today. For instance, to configure early timers and early serial ports we cannot use platform devices. This because the setup order during boot. Timers are needed before the platform driver core code is available. The same goes for early printk support. Early in this case means before initcalls. These early drivers today have their configuration either hard coded or they receive it using some special configuration method. This is working quite well, but if we want to support both regular kernel modules and early devices then we need to have two ways of configuring the same driver. A single way would be better. The early platform driver patch is basically a set of functions that allow drivers to register themselves and architecture code to locate them and probe. Registration happens through early_param(). The time for the probe is decided by the architecture code. See Documentation/driver-model/platform.txt for more details. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Magnus Damm Cc: Paul Mundt Cc: Kay Sievers Cc: David Brownell Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 31b07093c44a7a442394d44423e21d783f5523b8 Author: KOSAKI Motohiro Date: Thu Apr 9 13:57:59 2009 +0900 proc: mounts_poll() make consistent to mdstat_poll In recently sysfs_poll discussion, Neil Brown pointed out /proc/mounts also should be fixed. SUSv3 says "Regular files shall always poll TRUE for reading and writing". see http://www.opengroup.org/onlinepubs/009695399/functions/poll.html Then, mounts_poll()'s default should be "POLLIN | POLLRDNORM". it mean always readable. In addition, event trigger should use "POLLERR | POLLPRI" instead POLLERR. it makes consistent to mdstat_poll() and sysfs_poll(). and, select(2) can handle POLLPRI easily. Reported-by: Neil Brown Signed-off-by: KOSAKI Motohiro Cc: Ram Pai Cc: Miklos Szeredi Cc: Al Viro Signed-off-by: Greg Kroah-Hartman commit 1af3557abdef34ee036a6de4cb79e24468544b8d Author: KOSAKI Motohiro Date: Thu Apr 9 13:53:22 2009 +0900 sysfs: sysfs poll keep the poll rule of regular file. Currently, following test programs don't finished. % ruby -e ' Thread.new { sleep } File.read("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies") ' strace expose the reason. ... open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies", O_RDONLY|O_LARGEFILE) = 3 ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf9fa6b8) = -1 ENOTTY (Inappropriate ioctl for device) fstat64(3, {st_mode=S_IFREG|0444, st_size=4096, ...}) = 0 _llseek(3, 0, [0], SEEK_CUR) = 0 select(4, [3], NULL, NULL, NULL) = 1 (in [3]) read(3, "1400000 1300000 1200000 1100000 1"..., 4096) = 62 select(4, [3], NULL, NULL, NULL Because Ruby (the scripting language) VM assume select system-call against regular file don't block. it because SUSv3 says "Regular files shall always poll TRUE for reading and writing". see http://www.opengroup.org/onlinepubs/009695399/functions/poll.html it seems valid assumption. But sysfs_poll() don't keep this rule although sysfs file can read and write always. This patch restore proper poll behavior to sysfs. /sys/block/md*/md/sync_action polling application and another sysfs updating sensitive application still can use POLLERR and POLLPRI. Cc: Neil Brown Signed-off-by: KOSAKI Motohiro Signed-off-by: Greg Kroah-Hartman commit d094cbe998eb566d47552aa9d3c26c9123a7b858 Author: Kay Sievers Date: Fri Apr 3 19:04:15 2009 +0200 driver core: allow non-root users to listen to uevents Users can read sysfs files, there is no reason they should not be allowed to listen to uevents. This lets xorg and other userspace programs properly get these messages without having to be root. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 5247aecfe62266ffdedf2fc9e4243638554455b6 Author: Ming Lei Date: Fri Mar 27 21:50:00 2009 +0800 driver core: fix driver_match_device This patch fixes a bug introduced in commit 49b420a13ff95b449947181190b08367348e3e1b. If a instance of bus_type doesn't have .match method, all .probe of drivers in the bus should be called, or else the .probe have not a chance to be called. Signed-off-by: Ming Lei Reported-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit d110271e1f4140a9fb06d968b1afe9ca56a6064e Author: Alex Chiang Date: Wed Mar 25 15:11:36 2009 -0600 sysfs: don't use global workqueue in sysfs_schedule_callback() A sysfs attribute using sysfs_schedule_callback() to commit suicide may end up calling device_unregister(), which will eventually call a driver's ->remove function. Drivers may call flush_scheduled_work() in their shutdown routines, in which case lockdep will complain with something like the following: ============================================= [ INFO: possible recursive locking detected ] 2.6.29-rc8-kk #1 --------------------------------------------- events/4/56 is trying to acquire lock: (events){--..}, at: [] flush_workqueue+0x0/0xa0 but task is already holding lock: (events){--..}, at: [] run_workqueue+0x108/0x230 other info that might help us debug this: 3 locks held by events/4/56: #0: (events){--..}, at: [] run_workqueue+0x108/0x230 #1: (&ss->work){--..}, at: [] run_workqueue+0x108/0x230 #2: (pci_remove_rescan_mutex){--..}, at: [] remove_callback+0x21/0x40 stack backtrace: Pid: 56, comm: events/4 Not tainted 2.6.29-rc8-kk #1 Call Trace: [] validate_chain+0xb7d/0x1260 [] __lock_acquire+0x42e/0xa40 [] lock_acquire+0x58/0x80 [] ? flush_workqueue+0x0/0xa0 [] flush_workqueue+0x4d/0xa0 [] ? flush_workqueue+0x0/0xa0 [] flush_scheduled_work+0x10/0x20 [] e1000_remove+0x55/0xfe [e1000e] [] ? sysfs_schedule_callback_work+0x0/0x50 [] pci_device_remove+0x32/0x70 [] __device_release_driver+0x59/0x90 [] device_release_driver+0x2b/0x40 [] bus_remove_device+0xa6/0x120 [] device_del+0x12b/0x190 [] device_unregister+0x26/0x70 [] pci_stop_dev+0x49/0x60 [] pci_remove_bus_device+0x40/0xc0 [] remove_callback+0x29/0x40 [] sysfs_schedule_callback_work+0x1f/0x50 [] run_workqueue+0x15a/0x230 [] ? run_workqueue+0x108/0x230 [] worker_thread+0x9f/0x100 [] ? autoremove_wake_function+0x0/0x40 [] ? worker_thread+0x0/0x100 [] kthread+0x4d/0x80 [] child_rip+0xa/0x20 [] ? restore_args+0x0/0x30 [] ? kthread+0x0/0x80 [] ? child_rip+0x0/0x20 Although we know that the device_unregister path will never acquire a lock that a driver might try to acquire in its ->remove, in general we should never attempt to flush a workqueue from within the same workqueue, and lockdep rightly complains. So as long as sysfs attributes cannot commit suicide directly and we are stuck with this callback mechanism, put the sysfs callbacks on their own workqueue instead of the global one. This has the side benefit that if a suicidal sysfs attribute kicks off a long chain of ->remove callbacks, we no longer induce a long delay on the global queue. This also fixes a missing module_put in the error path introduced by sysfs-only-allow-one-scheduled-removal-callback-per-kobj.patch. We never destroy the workqueue, but I'm not sure that's a problem. Reported-by: Kenji Kaneshige Tested-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Greg Kroah-Hartman commit 0917798d82212f884fff650e7e520de3b438f947 Author: Dmitry Adamushko Date: Wed Apr 15 16:51:48 2009 +0200 x86: fix microcode driver newly spewing warnings Jeff Garzik reported this WARN_ON() noise: > Kernel: 2.6.30-rc1-00306-g8371f87 > Hardware: ICH10 x86-64 > > This is a regression from 2.6.29. Microcode spews the following WARNING > multiple times during boot: > > ------------[ cut here ]------------ > WARNING: at fs/sysfs/group.c:138 sysfs_remove_group+0xeb/0xf0() > Hardware name: sysfs group ffffffffa0209700 not found for > kobject 'cpu0' Keep sysfs files around for cpus even when we failed to locate microcode for them at the moment of module loading. The appropriate microcode firmware can become available later on. Signed-off-by: Ingo Molnar commit 381512cf3d27f63f7a45b1bbe7d2d609c2ea3b74 Author: Gautham R Shenoy Date: Tue Apr 14 09:09:36 2009 +0530 sched: Avoid printing sched_group::__cpu_power for default case Commit 46e0bb9c12f4 ("sched: Print sched_group::__cpu_power in sched_domain_debug") produces a messy dmesg output while attempting to print the sched_group::__cpu_power for each group in the sched_domain hierarchy. Fix this by avoid printing the __cpu_power for default cases. (i.e, __cpu_power == SCHED_LOAD_SCALE). [ Impact: reduce syslog clutter ] Reported-by: Tony Luck Signed-off-by: Gautham R Shenoy Fixed-by: Tony Luck Cc: a.p.zijlstra@chello.nl LKML-Reference: <20090414033936.GA534@in.ibm.com> Signed-off-by: Ingo Molnar commit 4b065046273afa01ec8e3de7da407e8d3599251d Author: Pallipadi, Venkatesh Date: Wed Apr 8 15:37:16 2009 -0700 x86, PAT: Remove page granularity tracking for vm_insert_pfn maps This change resolves the problem of too many single page entries in pat_memtype_list and "freeing invalid memtype" errors with i915, reported here: http://marc.info/?l=linux-kernel&m=123845244713183&w=2 Remove page level granularity track and untrack of vm_insert_pfn. memtype tracking at page granularity does not scale and cleaner approach would be for the driver to request a type for a bigger IO address range or PCI io memory range for that device, either at mmap time or driver init time and just use that type during vm_insert_pfn. This patch just removes the track/untrack of vm_insert_pfn. That means we will be in same state as 2.6.28, with respect to these APIs. Newer APIs for the drivers to request a memtype for a bigger region is coming soon. [ Impact: fix Xorg startup warnings and hangs ] Reported-by: Arkadiusz Miskiewicz Tested-by: Arkadiusz Miskiewicz Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha Cc: Jesse Barnes LKML-Reference: <20090408223716.GC3493@linux-os.sc.intel.com> Signed-off-by: Ingo Molnar commit c19f83669a02d4fa047d0d40f518e90f6f19c4c6 Merge: 05fa199... e3cf95d... Author: Linus Torvalds Date: Thu Apr 16 14:42:04 2009 -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: ata: Report 16/32bit PIO as best we can libata: use ATA_ID_CFA_* pata_legacy: fix no device fail path pata_hpt37x: fix HPT370 DMA timeouts libata: handle SEMB signature better commit 05fa199d45c54a9bda7aa3ae6537253d6f097aa9 Author: Hugh Dickins Date: Thu Apr 16 21:58:12 2009 +0100 mm: pass correct mm when growing stack Tetsuo Handa reports seeing the WARN_ON(current->mm == NULL) in security_vm_enough_memory(), when do_execve() is touching the target mm's stack, to set up its args and environment. Yes, a UMH_NO_WAIT or UMH_WAIT_PROC call_usermodehelper() spawns an mm-less kernel thread to do the exec. And in any case, that vm_enough_memory check when growing stack ought to be done on the target mm, not on the execer's mm (though apart from the warning, it only makes a slight tweak to OVERCOMMIT_NEVER behaviour). Reported-by: Tetsuo Handa Signed-off-by: Hugh Dickins Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 05f54c13cd0c33694eec39a265475c5d6cf223cf Author: Hugh Dickins Date: Thu Apr 16 21:55:29 2009 +0100 Revert "kobject: don't block for each kobject_uevent". This reverts commit f520360d93cdc37de5d972dac4bf3bdef6a7f6a7. Tetsuo Handa, running a kernel with CONFIG_DEBUG_PAGEALLOC=y and CONFIG_UEVENT_HELPER_PATH=/sbin/hotplug, has been hitting RCU detected CPU stalls: it's been spinning in the loop where do_execve() counts up the args (but why wasn't fixup_exception working? dunno). The recent change, switching kobject_uevent_env() from UMH_WAIT_EXEC to UMH_NO_WAIT, is broken: the exec uses args on the local stack here, and an env which is kfreed as soon as call_usermodehelper() returns. It very much needs to wait for the exec to be done. An alternative would be to keep the UMH_NO_WAIT, and complicate the code to allocate and free these resources correctly? but no, as GregKH pointed out when making the commit, CONFIG_UEVENT_HELPER_PATH="" is a much better optimization - though some distros are still saying /sbin/hotplug in their .config, yet with no such binary in their initrd or their root. Reported-by: Tetsuo Handa Signed-off-by: Hugh Dickins Acked-by: Greg Kroah-Hartman Acked-by: Arjan van de Ven Acked-by: Will Newton Signed-off-by: Linus Torvalds commit 77f4025b5e7b290f5c3cc03aa6242328694c71d4 Author: Linus Walleij Date: Thu Apr 16 21:17:56 2009 +0100 [ARM] 5455/1: Fix IRQ noise from VIC code The VIC code will attempt to perform som default set_irq_chip() and set_irq_chip_data() on all IRQs supported by the VIC, while the new IRQ handling code strictly checks for the global NR_IRQS to be respected also for these IRQs. This patch will respect the interrupt mask passed to the VIC driver and will prevent it from attempting to call these functions on any unused interrupts. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit e3cf95dd6d352954b663d2934110d6e30af2406d Author: Alan Cox Date: Thu Apr 9 17:31:17 2009 +0100 ata: Report 16/32bit PIO as best we can The legacy old IDE ioctl API for this is a bit primitive so we try and map stuff sensibly onto it. - Set PIO over DMA devices to report 32bit - Add ability to change the PIO32 settings if the controller permits it - Add that functionality into the sff drivers - Add that functionality into the VLB legacy driver - Turn on the 32bit PIO on the ninja32 and add support there Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 62afe5d744047df8ff15a369f4c1ebad71c937d4 Author: Sergei Shtylyov Date: Mon Apr 13 20:50:00 2009 +0400 libata: use ATA_ID_CFA_* Use ATA_ID_CFA_* constants for CFA specific identify data words 162 and 163. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 20cbf5f8c0fe3df2ddbde1f334993b4dda18a651 Author: Tejun Heo Date: Tue Apr 14 12:59:03 2009 +0900 pata_legacy: fix no device fail path When pata_legacy can't detect any device, it unregisters the platform_device and fails detection. However, it forgets to detach ata host triggering weird failures as the host later gets freed by devres while still attached. Fix it. Signed-off-by: Tejun Heo Reported-by: Peter Zijlstra Signed-off-by: Jeff Garzik commit 265b7215aed36941620b65ecfff516200fb190c1 Author: Sergei Shtylyov Date: Tue Apr 14 18:39:14 2009 +0400 pata_hpt37x: fix HPT370 DMA timeouts The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 79b42babbac2a5a522b8e269fb2811b6e1063030 Author: Tejun Heo Date: Wed Apr 15 06:21:10 2009 +0900 libata: handle SEMB signature better WDC WD1600JS-62MHB5 successfully hits the window between ATA/ATAPI-7 and Serial ATA II standards and reports 3c/c3 signature which now is assigned to SEMB. Make ata_dev_classify() report ATA_DEV_SEMB on the sig and let ata_dev_read_id() work around it by trying IDENTIFY once. This fixes bko#11579. Signed-off-by: Tejun Heo Reported-by: David Haun Reported-by: Lars Wirzenius Reported-by: Juan Manuel Signed-off-by: Jeff Garzik commit 4ea3c51d5bd3bb4eea7d7d3a1f80d1a48c2a6f92 Author: Cliff Wickman Date: Thu Apr 16 07:53:09 2009 -0500 x86: UV BAU distribution and payload MMRs This patch correctly sets BAU memory mapped registers to point to the sending activation descriptor table and target payload table. The "Broadcast Assist Unit" is used for TLB shootdown in UV. The memory mapped registers that point to sending and receiving memory structures contain node numbers. In one case the __pa() function did not provide the node id of memory on blade zero in configurations where that id is nonzero. In another case, it was assumed that memory was allocated on the local node. That assumption is not true in a configuration in which the node has no memory. Tested on the UV hardware simulator. [ Impact: fix possible runtime crash due to incorrect TLB logic ] Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar commit 5e075cb5cee4faecc82e2b8a04e640176629976e Author: Hartley Sweeten Date: Thu Apr 16 17:56:10 2009 +0100 [ARM] 5454/1: ep93xx_eth: fix sparse warnings Fix 50+ sparse warnings in the ep93xx ethernet driver. warning: incorrect type in argument 1 (different address spaces) Signed-off-by: H Hartley Sweeten Signed-off-by: Russell King commit 0c387ec88abf4f1ddfe8c3be10ea981bc447b406 Merge: ba28f22... 3f3e7c6... Author: Dmitry Torokhov Date: Thu Apr 16 08:51:52 2009 -0700 Merge branch 'next' into for-linus commit 32dc496b47eb31f7a1d115a2708e8ef1d054e1fb Merge: 8cd50e8... c5ab660... Author: Russell King Date: Thu Apr 16 16:16:34 2009 +0100 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 commit 8cd50e8e2b416c7f07b267ab3457c6c25a540ba9 Author: Russell King Date: Thu Apr 16 16:09:08 2009 +0100 [ARM] remove .gitignore from include/asm-arm Signed-off-by: Russell King commit 35c80d5f400f68f2eccf3069d1c068e154bde9c9 Author: Chris Mason Date: Wed Apr 15 13:22:38 2009 -0400 Add block_write_full_page_endio for passing endio handler block_write_full_page doesn't allow the caller to control what happens when the IO is over. This adds a new call named block_write_full_page_endio so the buffer head end_io handler can be provided by the caller. This will be used by the ext3 data=guarded mode to do i_size updates in a workqueue based end_io handler. end_buffer_async_write is also exported so it can be called to do the dirty work of managing page writeback for the higher level end_io handler. Signed-off-by: Chris Mason Acked-by: Theodore Tso Acked-by: Jan Kara Signed-off-by: Linus Torvalds commit f69955855eac55a048d26a1618f50dfaa160a006 Author: Chris Mason Date: Wed Apr 15 13:22:37 2009 -0400 Export filemap_write_and_wait_range This wasn't exported before and is useful (used by the experimental ext3 data=guarded code) Signed-off-by: Chris Mason Acked-by: Theodore Tso Acked-by: Jan Kara Signed-off-by: Linus Torvalds commit cd97824994042b809493807ea644ba26c0c23290 Merge: 3307f19... 3664090... Author: Linus Torvalds Date: Thu Apr 16 07:41:56 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits) phylib: Fix delay argument of schedule_delayed_work NET/ixgbe: Fix powering off during shutdown NET/e1000e: Fix powering off during shutdown NET/e1000: Fix powering off during shutdown packet: avoid warnings when high-order page allocation fails gianfar: stop send queue before resetting gianfar myr10ge: again fix lro_gen_skb() alignment declance: convert to net_device_ops bfin_mac: convert to net_device_ops au1000: convert to net_device_ops atarilance: convert to net_device_ops a2065: convert to net_device_ops ixgbe: update real_num_tx_queues on changing num_rx_queues ixgbe: fix tx queue index Revert "rose: zero length frame filtering in af_rose.c" sfc: Use correct macro to set event bitfield sfc: Match calls to netif_napi_add() and netif_napi_del() bonding: Remove debug printk e1000/e1000: fix compile warning ehea: Fix incomplete conversion to net_device_ops ... commit 3307f19f634dfb134b370c59a778fdb2d574c17b Merge: 5b1d07e... ed247e1... Author: Linus Torvalds Date: Thu Apr 16 07:40:48 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: remove some pointless conditionals before kfree() sbus: changed ioctls to unlocked sparc: asm/atomic.h on 32bit should include asm/system.h for xchg sparc64: Fix smp_callin() locking. commit d4275354993eb6ed6a45cfd01a39dcb0cce3793b Author: Russell King Date: Thu Apr 16 14:05:27 2009 +0100 Update MAINTAINERS Update rmk's email address, and expand on what he's responsible for. Signed-off-by: Russell King commit 002fbad829883a3ad9b185077f9e54c37dc7502d Author: Jarkko Nikula Date: Wed Apr 15 13:48:17 2009 +0300 ASoC: OMAP: Fix FS polarity in OSK5912 machine driver Using inverted FS polarity in OSK5912 must be an error since TLV320AIC23 do not have support for inverted polarities. This is mostly due the hassle with the DSP formats in OMAP McBSP DAI and inversion on OMAP side probably just made this configuration working at some point. Signed-off-by: Jarkko Nikula Acked-by: Arun KS Signed-off-by: Mark Brown commit 36ce85824549c1aece65478bf9fe2d224ae06f86 Author: Jarkko Nikula Date: Wed Apr 15 13:48:16 2009 +0300 ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver The DSP format wasn't still correct in OMAP McBSP DAI even after the commit bd25867a6cbe7a00ef7dbe8d9ddebc91b00b9b3f. Thanks to Peter Ujfalusi for noticing and being part of the fix. Now the FS length definition is more clear by defining it with FWID(0). Signed-off-by: Jarkko Nikula Acked-by: Peter Ujfalusi Signed-off-by: Mark Brown commit 76fff3680286d3f7f1ced5e38d613deff86caf20 Author: Ben Dooks Date: Thu Apr 16 10:32:21 2009 +0100 ASoC: Fix include build error in s3c2412-i2s.c Fix accidental change of to in s3c2412-i2s.c Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 3715c6aaa913d9fb044b9eb36d957a8d2703723a Author: Ben Dooks Date: Thu Apr 16 10:32:22 2009 +0100 ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes Fix the build error in s3c-i2s-v2.c caused by a change to the snd_soc_dai ops field. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 1d2b7ae9a0994c166014e9a07a61d9cfee6215a0 Author: Ben Dooks Date: Thu Apr 16 10:32:23 2009 +0100 ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate The definition of s3c_i2sv2_iis_calc_rate was never renamed from s3c2412_iis_calc_rate, so rename this to allow the build to work. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 01c4cad4f76cebdb4d0db37a9775554478fb7149 Author: Ben Dooks Date: Thu Apr 16 10:32:20 2009 +0100 ASoC: Fix jive_wm8750.c build problems Fix build errors in sound/soc/s3c24xx/jive_wm8750.c from changes to ASoC. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit a5735b7ede1d1ca81ebf491d699530715b105560 Author: Daniel Mack Date: Wed Apr 15 20:24:45 2009 +0200 ASoC: pxa-ssp: allow setting of dai format 0 pxa_ssp_set_dai_fmt() currently has an early exit if the desired format equals the current configuration. This is correct behaviour unless this function is called with a zero value parameter for the first time. Zero is a valid value for this function, but the early exit is bogus in this case. Hence, set priv->dai_fmt to -1 in the beginning so we can configure the port. Signed-off-by: Daniel Mack Cc: pHilipp Zabel Signed-off-by: Mark Brown commit 4dc1f87f079d5c6b01284d08b28eff2c4fbd15c4 Author: Takashi Iwai Date: Thu Apr 16 14:19:19 2009 +0200 ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too Add the upper-limit of mixer amp for AD1884A-laptop model just like the mobile model for some HP laptops. Signed-off-by: Takashi Iwai commit c5ab660db9a98187667d017bb9425f0c1dc76ac1 Author: Sascha Hauer Date: Wed Apr 8 11:39:34 2009 +0200 mxc defconfig updates This patch removes several i.MX board specific defconfig files in favour for a mx1_defconfig, mx27_defconfig and mx3_defconfig. All config files have all currently available boards, i.MX specific drivers and the network device drivers for the boards enabled. Signed-off-by: Sascha Hauer commit 0ac402fdaa4569604e802018922ae7cdbe0fc63b Author: Mark Brown Date: Mon Apr 13 13:05:28 2009 +0100 mx31ads: Mark as having full regulatoion constraints with 1133-EV1 board This allows the regulator API to power off unused regulators at the end of init. Signed-off-by: Mark Brown commit 132d3f950e4dbc4e4315e44e7abc85f8aba469fd Author: Mark Brown Date: Tue Apr 14 11:25:18 2009 +0100 mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 board Otherwise we'd need massive ifdefs in the code. Signed-off-by: Mark Brown commit 3f2030163efe4a7ee820ae56dab9a4db8c1ebb49 Author: Darius Augulis Date: Wed Apr 8 16:17:50 2009 +0300 Fix ifdef in plat-mxc/irc.c Move ifdef under function brackets. This fixes compile crach when IRQ priorities are disabled. Signed-off-by: Darius Augulis commit 3fa6dd6a7aa7ce1a7d490ef88c2c8ec7db0f196b Author: Darius Augulis Date: Wed Apr 8 11:15:00 2009 +0300 MX1ADS: remove I2C ifdefs Signed-off-by: Darius Augulis commit 248ca85f0135dcb03bc054cd172453b36aad6571 Author: Ilya Yanok Date: Sat Mar 14 21:51:59 2009 +0300 qong: remove AIPS[12] mappings from machine-specific iotable AIPS[12] are no mapped from generic MX3 code so we don't need to map them from machine-specific map_io function anymore. Signed-off-by: Ilya Yanok commit 9070e7afb80473c2b5c932152391b52e1e89c637 Author: Mark Brown Date: Mon Apr 13 13:02:36 2009 +0100 mx31ads: imoux pins should be passed in as unsigned int To match the mxc_iomux_setup_multiple_pins() prototype. Signed-off-by: Mark Brown commit 470f9b602e3b5fa5d5fb62c8c5b648d2139e7976 Author: Paulius Zaleckas Date: Mon Apr 6 16:40:52 2009 +0300 MXC: remove orphan imx_init_uart() definition Signed-off-by: Paulius Zaleckas Cc: Sascha Hauer commit d5f281043ae3e955430dcaa92905327587b4d17a Author: Valentin Longchamp Date: Wed Apr 1 16:32:41 2009 +0200 mx31: pin definition for csi Signed-off-by: Valentin Longchamp commit c44af41ad5dc3e26b138ddf2e399cfdd0dc2008c Author: Valentin Longchamp Date: Wed Apr 1 16:18:25 2009 +0200 MX31: pin definition for sdhc2 This also adds the pins used on mx31moboard for WP and CD Signed-off-by: Valentin Longchamp commit c5c96f4dce83f00f587f9ee6b8679ff2ab469971 Author: Vladimir Barinov Date: Wed Apr 1 16:07:14 2009 +0400 MX31: Add I2C pin definitions Add I2C pin definitions for MX31 SoC Signed-off-by: Vladimir Barinov commit 4bd962987daad2d9ec83f92b2b5351a80fb8ea68 Author: Sascha Hauer Date: Fri Dec 19 14:31:54 2008 +0100 MX31: Add more alternate pin definitions Signed-off-by: Sascha Hauer commit f8e5143be765b2c60b9ae96477560d3f46be5e99 Author: Sascha Hauer Date: Sat Apr 4 13:40:39 2009 +0200 pcm037 board support: Fix eth interrupt gpio setting gpio_direction_input needs the gpio number, not the pin description. Signed-off-by: Sascha Hauer commit 1b3c9bf2cd00e1e8a47177b92900dcff363843cb Author: Holger Schurig Date: Wed Apr 1 13:58:21 2009 +0200 imx21: activate i2c Set the correct clkdev-name for the i2c clock. It also get's rid of the ARCH_NR_GPIOS define on the rationale that isn't an ARCH-wide setting anyway. If a device has two pca953x devices, the reserved number will be wrong. Signed-off-by: Holger Schurig commit 289a689b109dfd086c0459fb35b32a1d96bdb8ce Author: Holger Schurig Date: Tue Mar 31 12:16:59 2009 +0200 imx21: fixes some clocknames Signed-off-by: commit db756394064f4059e2f542fc0d27e91ce57bf292 Author: Ben Dooks Date: Tue Mar 10 23:21:48 2009 +0000 [ARM] S3C: Export s3c_gpio_cfgpin and s3c_gpio_setpull for modules Add an export of the two GPIO configuration calls s3c_gpio_cfgpin and s3c_gpio_setpull to allow modules to use them (such as ASoC drivers) Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks commit ffd0e56c606836581da5df742a43ce8015ca7475 Author: Takashi Iwai Date: Thu Apr 16 12:20:24 2009 +0200 ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs When the headphone can have no unique DAC, the current code doesn't check the HP-detection although it should. Put the hp-detection check before the DAC check to fix this bug. Signed-off-by: Takashi Iwai commit 3664090e199f10cb0282097faae8f8ca58c1e4ae Author: Atsushi Nemoto Date: Thu Apr 16 02:43:37 2009 -0700 phylib: Fix delay argument of schedule_delayed_work The commit a390d1f3 ("phylib: convert state_queue work to delayed_work") missed converting 'expires' value to 'delay' value. Signed-off-by: Atsushi Nemoto Acked-by: Marcin Slusarz Signed-off-by: David S. Miller commit ea5a6fd810a4edc22c931f4c43b8d03c3a8c30fc Author: Ben Dooks Date: Thu Apr 16 10:20:47 2009 +0100 [ARM] s3c2410_defconfig: Update miscellaneous drivers Update the driver build in the s3c2410_defconfig for the LED, IDE, Input and EEPROM options Signed-off-by: Ben Dooks commit f8832a988c54dbb2e12dce78ada67b1577a166ee Author: Ben Dooks Date: Wed Apr 15 17:25:39 2009 +0100 [ARM] s3c2410_defconfig: Update USB device drivers Add more USB device driver options to the s3c2410_defconfig, mostly as modules. Signed-off-by: Ben Dooks commit 89d44a0f006f30e8a1fa23c09f25e729eb70e3e5 Author: Ben Dooks Date: Wed Apr 15 17:21:36 2009 +0100 [ARM] s3c2410_defconfig: Update filesystem options Update the filesystem options in the s3c2410_defconfig, such as building ext4, enable the automounter as modules and update the network filesysyem choices. Signed-off-by: Ben Dooks commit f04121e457f8ffd45aa6f2fb7abe85552f107db4 Author: Ben Dooks Date: Wed Apr 15 17:15:05 2009 +0100 [ARM] s3c2410_defconfig: Add video/radio drivers Add a set of various video and radio drivers to the s3c2410_defconfig as modules. Signed-off-by: Ben Dooks commit 68c468c9d02674e7164580482320cfab92e8ad85 Author: Ben Dooks Date: Wed Apr 15 17:07:24 2009 +0100 [ARM] s3c2410_defconfig: Add sound drivers Add sound drivers to the s3c2410_defconfig. Signed-off-by: Ben Dooks commit 9d8d05ae66f40642987486f4b107565fc561a77c Author: Rafael J. Wysocki Date: Wed Apr 15 17:44:01 2009 +0000 NET/ixgbe: Fix powering off during shutdown Prevent ixgbe from putting the adapter into D3 during shutdown except when we're going to power off the system, since doing that may generally cause problems with kexec to happen (such problems were observed for igb and forcedeth). For this purpose seperate ixgbe_shutdown() from ixgbe_suspend() and use the appropriate PCI PM callbacks in both of them. Signed-off-by: "Rafael J. Wysocki" Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4f9de721ab73a5271a79b126f7b5140b01a05c99 Author: Rafael J. Wysocki Date: Wed Apr 15 17:43:43 2009 +0000 NET/e1000e: Fix powering off during shutdown Prevent e1000e from putting the adapter into D3 during shutdown except when we're going to power off the system, since doing that may generally cause problems with kexec to happen (such problems were observed for igb and forcedeth). For this purpose seperate e1000e_shutdown() from e1000e_suspend() and use the appropriate PCI PM callbacks in both of them. Signed-off-by: "Rafael J. Wysocki" Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b43fcd7dc7bf0471b3bdda8fee3418e93ac25863 Author: Rafael J. Wysocki Date: Wed Apr 15 17:43:24 2009 +0000 NET/e1000: Fix powering off during shutdown Prevent e1000 from putting the adapter into D3 during shutdown except when we're going to power off the system, since doing that may generally cause problems with kexec to happen (such problems were observed for igb and forcedeth). For this purpose seperate e1000_shutdown() from e1000_suspend() and use the appropriate PCI PM callbacks in both of them. Signed-off-by: "Rafael J. Wysocki" Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cbb55092a674bcfd9774637a06d0f1511763aa2c Author: eric miao Date: Thu Apr 16 09:55:23 2009 +0100 [ARM] 5453/1: fix building breakage of sys_oabi-compat.c due to missing kmalloc/kfree It seems that declarations of kmalloc/kfree are missed, explicitly include it. Signed-off-by: Eric Miao Signed-off-by: Russell King commit c82834251ceb81b7575927c767500bd8c4a7f928 Author: Daniel T Chen Date: Wed Apr 15 19:48:08 2009 -0400 ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600) Subject says it all. Briefly, use hp_only for another Dell Inspiron 8600. Reference: Ubuntu #41015 (https://launchpad.net/bugs/41015) Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 4611b043ce9c45cd8ac760b8379b02ceffe26b0d Author: Daniel T Chen Date: Wed Apr 15 19:43:35 2009 -0400 ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934 While cleaning up quirks, I noticed that there is a duplicated quirk for the SSID 0x103c0934. Looking back through the bug reports, I've concluded that there is only one necessary quirk (hp_mute_led), so this patch removes the conflicting one. Reference: Ubuntu #44066 (https://launchpad.net/bugs/44066) Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit d523b0c808a5c5cbde9ac89427d98ee6288f5f2f Author: Joe Perches Date: Wed Apr 15 11:39:01 2009 -0700 ALSA: hda_intel.c - Consolidate bitfields Commit fa00e046b41663cbda9b1affc0594669e5f14219 added a new bitfield not adjacent to other bitfields in the same struct. Moved the new one. Signed-off-by: Joe Perches Signed-off-by: Takashi Iwai commit 3f3e7c6e139f704e2f48ea3b45ff7724a8d46456 Author: Ben Nizette Date: Wed Apr 15 18:57:55 2009 -0700 Input: ads7846 - fix unsafe disable_irq The use of disable_irq inside the handler for the interrupt being disabled has always been dangerous. disable_irq should wait for that handler to complete before returning -> deadlock. For some reason this wasn't actually the case until 3aa551c9b was merged but since this time, the ads7846 driver has deadlocked the system on first interrupt. Convert the driver to use the handler-safe _nosync variant. Signed-off-by: Ben Nizette Signed-off-by: Dmitry Torokhov commit d45b41ae8da0f54aec0eebcc6f893ba5f22a1e8e Author: Ingo Molnar Date: Wed Apr 15 23:15:14 2009 +0200 x86: disable X86_PTRACE_BTS for now Oleg Nesterov found a couple of races in the ptrace-bts code and fixes are queued up for it but they did not get ready in time for the merge window. We'll merge them in v2.6.31 - until then mark the feature as CONFIG_BROKEN. There's no user-space yet making use of this so it's not a big issue. Cc: Signed-off-by: Ingo Molnar commit 5b1d07ed0e5b2707f786957c7a40eb2f399c84a8 Author: David Howells Date: Wed Apr 15 19:35:01 2009 +0100 RCU: Don't try and predeclare inline funcs as it upsets some versions of gcc Don't try and predeclare inline funcs like this: static inline void wait_migrated_callbacks(void) ... static void _rcu_barrier(enum rcu_barrier type) { ... wait_migrated_callbacks(); } ... static inline void wait_migrated_callbacks(void) { wait_event(rcu_migrate_wq, !atomic_read(&rcu_migrate_type_count)); } as it upsets some versions of gcc under some circumstances: kernel/rcupdate.c: In function `_rcu_barrier': kernel/rcupdate.c:125: sorry, unimplemented: inlining failed in call to 'wait_migrated_callbacks': function body not available kernel/rcupdate.c:152: sorry, unimplemented: called from here This can be dealt with by simply putting the static variables (rcu_migrate_*) at the top, and moving the implementation of the function up so that it replaces its forward declaration. Signed-off-by: David Howells Cc: Dipankar Sarma Cc: Paul E. McKenney Signed-off-by: Linus Torvalds commit da60682c116855cf342926b4f3427079400ee7e6 Author: David Howells Date: Wed Apr 15 19:34:56 2009 +0100 The default CONFIG_BUG=n version of BUG() should have an empty do...while The default CONFIG_BUG=n version of BUG() should incorporate an empty a do...while statement to avoid compilation weirdness. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 616df135110ccae617ef9f10e0814fa48462cc37 Author: David Howells Date: Wed Apr 15 19:34:51 2009 +0100 MN10300: Stop gcc from generating uninitialised variable warnings after BUG() Stop gcc from generating uninitialised variable warnings after BUG(). The problem is that MN10300's implementation of BUG() invokes system call 15 which doesn't return - but there's no way to tell the compiler that and also emit the bug table element with the correct file and line data. So instead, we make the do...while wrapper in _debug_bug_trap() an endless loop from which there's no escape. Also, while we're at it, (1) get rid of _debug_bug_trap() and just implement directly as BUG(), and (2) make the implementation of BUG() contingent on CONFIG_BUG=y. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 76d320a5072f93abb913e9b9d84304f819c34b96 Author: David Howells Date: Wed Apr 15 19:34:46 2009 +0100 MN10300: Wire up missing system calls Wire up missing system calls preadv() and pwritev(). Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 3bb4e153a7819c53911aa8a767c22bac9871a202 Author: David Howells Date: Wed Apr 15 19:34:41 2009 +0100 MN10300: Discard duplicate PFN_xxx() macros Discard duplicate PFN_xxx() macros from arch code as they're now in the general headers. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 31712eec954dea9260006ac415abc9bc747ddc84 Merge: 3ee8da8... ab96e79... Author: Linus Torvalds Date: Wed Apr 15 13:28:27 2009 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] boot cputime accounting [S390] add read_persistent_clock [S390] cpu hotplug and accounting values [S390] fix idle time accounting [S390] smp: fix cpu_possible_map initialization [S390] dasd: fix idaw boundary checking for track based ccw [S390] dasd: Use the new async framework for autoonlining. [S390] qdio: remove dead timeout handler [S390] appldata: Use new mod_virt_timer_periodic() function. [S390] extend virtual timer interface by mod_virt_timer_periodic [S390] stp synchronization retry timer [S390] call nmi_enter/nmi_exit on machine checks [S390] wire up preadv/pwritev system calls [S390] s390: move machine flags to lowcore commit 3ee8da87ba6151ec91b2b8bbd27633bb248ea0d5 Merge: a2c252e... 9dd175f... Author: Linus Torvalds Date: Wed Apr 15 09:11:11 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix the cmd cache keys for amp verbs ALSA: add missing definitions(letters) to HD-Audio.txt ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 [ALSA] intel8x0: add one retry to the ac97_clock measurement routine [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes ALSA: snd-usb-caiaq: clean up header includes ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user() [ALSA] intel8x0: do not use zero value from PICB register [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies [ALSA] hda_intel: fix unexpected ring buffer positions ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h commit a2c252ebdeaab28c9b400570594d576dae295958 Merge: 23da64b... 1328df7... Author: Linus Torvalds Date: Wed Apr 15 09:04:12 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Use DEFINE_SPINLOCK GFS2: cleanup file_operations mess GFS2: Move umount flush rwsem GFS2: Fix symlink creation race GFS2: Make quotad's waiting interruptible commit 180deb50880cdc5e9dd69ec97af0d6e72c5417fc Author: Jiri Slaby Date: Wed Apr 15 09:03:07 2009 -0700 Input: mainstone-wm97xx - fix condition in pen_up The loop body was never executed, because the condition is always false. Convert to for with more obvious condition. Signed-off-by: Jiri Slaby Acked-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 9a03fbe802f4bd676de17af61aaaab8969982439 Author: Ilpo Järvinen Date: Wed Apr 15 09:03:07 2009 -0700 Input: pc110pad - remove unused variable dev dev is leftover from b0ee0d3eb31a163c958f2960906c44bcdfdc607b (Input: pc110pad - use no_pci_devices()). Signed-off-by: Ilpo Järvinen Signed-off-by: Dmitry Torokhov commit 23da64b4714812b66ecf010e7dfb3ed1bf2eda69 Merge: a23c218... a36e71f... Author: Linus Torvalds Date: Wed Apr 15 09:03:47 2009 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (28 commits) cfq-iosched: add close cooperator code cfq-iosched: log responsible 'cfqq' in idle timer arm cfq-iosched: tweak kick logic a bit more cfq-iosched: no need to save interrupts in cfq_kick_queue() brd: fix cacheflushing brd: support barriers swap: Remove code handling bio_alloc failure with __GFP_WAIT gfs2: Remove code handling bio_alloc failure with __GFP_WAIT ext4: Remove code handling bio_alloc failure with __GFP_WAIT dio: Remove code handling bio_alloc failure with __GFP_WAIT block: Remove code handling bio_alloc failure with __GFP_WAIT bio: add documentation to bio_alloc() splice: add helpers for locking pipe inode splice: remove generic_file_splice_write_nolock() ocfs2: fix i_mutex locking in ocfs2_splice_to_file() splice: fix i_mutex locking in generic_splice_write() splice: remove i_mutex locking in splice_from_pipe() splice: split up __splice_from_pipe() block: fix SG_IO to return a proper error value cfq-iosched: don't delay queue kick for a merged request ... commit 3eaa750d5652afbb9c8f25308c3647f89e41cefb Author: Michael Hennerich Date: Tue Apr 14 10:38:36 2009 -0700 Input: bf54x-keys - remove depreciated IRQF_SAMPLE_RANDOM flag Signed-off-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit 0bc69ce692bd240bef2819d9f3b3527fad524f5b Author: Michael Hennerich Date: Tue Apr 14 10:38:36 2009 -0700 Input: ad7877, ad7879 - remove depreciated IRQF_SAMPLE_RANDOM flag This patch removes depreciated IRQF_SAMPLE_RANDOM flags from ad7877 and ad7879 touchscreen drivers. Signed-off-by: Michael Hennerich Signed-off-by: Dmitry Torokhov commit 7f6d5ff22b06d0c4db7b3b1eae336a19e88f808c Author: Eric Miao Date: Tue Apr 14 10:38:35 2009 -0700 Input: da9034-ts - make pen {down,up} events more reliable PEN_{UP/DOWN} events are expected to be available soon after stopping TSI auto measurement, but this is found not always be true. Work around this by adding delay and simulating such an event (according to pen down status bit). Signed-off-by: Bin Yang Signed-off-by: Eric Miao Signed-off-by: Dmitry Torokhov commit 93ff27c66de5c9eb0ead1e6f979afa97cbcf1e9d Author: Eric Miao Date: Tue Apr 14 10:38:35 2009 -0700 Input: da9034-ts - add Bin Yang as co-author of the driver Bin did a lot of work on this driver, without his help, this driver will not be possible. Signed-off-by: Bin Yang Signed-off-by: Eric Miao Signed-off-by: Dmitry Torokhov commit e04126c79242d2740b469292d42c239bad7807cc Author: Barry Carroll Date: Tue Apr 14 10:38:34 2009 -0700 Input: atkbd - add forced release keys quirk for Samsung NC20 Signed-off-by: Barry Carroll Signed-off-by: Dmitry Torokhov commit 157f3a3e17cd498571db2a472dc3a15a7679ee3f Author: Dmitry Torokhov Date: Mon Apr 13 15:27:50 2009 -0700 Input: atkbd - add forced release keys quirk for Samsung Q45 Signed-off-by: Dmitry Torokhov commit 4ced8e7cb990a2c3bbf0ac7f27b35c890e7ce895 Author: Dmitry Torokhov Date: Mon Apr 13 15:27:49 2009 -0700 Input: gameport - fix attach driver code The commit 6902c0bead4ce266226fc0c5b3828b850bdc884a that moved driver registration out of kgameportd thread was incomplete and did not add the code necessary to actually attach driver to already registered devices, rectify that. Signed-off-by: Dmitry Torokhov commit d061ebd57a046b3df8be8b76c387a95171059244 Author: Alexander Beregalov Date: Sat Apr 11 16:55:41 2009 -0700 Input: hp_sdc_rtc should depend on serio Fix this build error when CONFIG_SERIO is not set hp_sdc_rtc.c:691: undefined reference to `hp_sdc_request_timer_irq' and so on.. "select should be used with care. select will force a symbol to a value without visiting the dependencies." Signed-off-by: Alexander Beregalov Signed-off-by: Dmitry Torokhov commit 9dd175f7d2db1826c891855d3d150da3a5792e94 Merge: f4723b2... fcad94a... Author: Takashi Iwai Date: Wed Apr 15 17:52:32 2009 +0200 Merge branch 'topic/hda' into for-linus * topic/hda: ALSA: hda - Fix the cmd cache keys for amp verbs ALSA: add missing definitions(letters) to HD-Audio.txt commit fcad94a4c71c36a05f4d5c6dcb174534b4e0b136 Author: Takashi Iwai Date: Wed Apr 15 17:48:35 2009 +0200 ALSA: hda - Fix the cmd cache keys for amp verbs Fix the key value generation for get/set amp verbs. The upper bits of the parameter have to be combined with the verb value to be unique for each direction/index of amp access. This fixes the resume problem on some hardwares like Macbook after the channel mode is changed. Tested-by: Johannes Berg Cc: Signed-off-by: Takashi Iwai commit a23c218bd36e11120daf18e00a91d5dc20e288e6 Merge: ea34f43... b71a0c2... Author: Linus Torvalds Date: Wed Apr 15 08:42:40 2009 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: pseries/dtl.c should include asm/firmware.h powerpc: Fix data-corrupting bug in __futex_atomic_op powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset() powerpc: Allow 256kB pages with SHMEM powerpc: Document new FSL I2C bindings and cleanup powerpc/mm: Fix compile warning powerpc/85xx: TQM8548: update defconfig powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3 powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes powerpc: Add support for early tlbilx opcode powerpc: Fix tlbilx opcode commit ea34f43a074af85823e49b9bf62f47d8d3f0e81a Author: Linus Torvalds Date: Wed Apr 15 08:05:13 2009 -0700 acpi-cpufreq: fix 'smp_call_function_many()' confusion It turns out that 'smp_call_function_many()' doesn't work at all like 'smp_call_function_single()', and my change to Andrew's patch to use it rather than a loop over all CPU's acpi-cpufreq doesn't work. My bad. 'smp_call_function_many()' has two "features" (aka "documented bugs"): (a) it needs to be called with preemption disabled, because it uses smp_processor_id() without guarding the CPU lookup with 'get_cpu()' and 'put_cpu()' like the 'single' variant does. (b) even if the current CPU is part of the CPU mask, it won't do the call on that CPU. Still, we're better off trying to use 'smp_call_function_many()' than looping over CPU's, since it at least in theory allows us to use a broadcast IPI and do it all in parallel. So let's just work around the silly semantic bugs in that function. Reported-and-tested-by: Ali Gholami Rudi Cc: Ingo Molnar Cc: Andrew Morton , Cc: Rusty Russell Cc: Dave Jones Signed-off-by: Linus Torvalds commit 121613e431c20de9829da0e9c83b3638762417cd Author: Ben Dooks Date: Wed Apr 15 15:12:11 2009 +0100 [ARM] s3c2410_defconfig: Add MMC/SD core and drivers Add SD/MMC to the s3c2410_defconfig, building in the core and adding the rest of the drivers as modules. Signed-off-by: Ben Dooks commit 2ba4d47210354e5595ceb4464525b5ae7cff3774 Author: Ben Dooks Date: Wed Apr 15 15:02:47 2009 +0100 [ARM] s3c2410_defconfig: Update machine configuration Update the machine configuration of s3c2410_defconfig to add support for newer machines, and update the s3c24xx specific options. Signed-off-by: Ben Dooks commit 7fa6bed89af1ddb14511fddc47133e574d92dcb2 Author: Ben Dooks Date: Wed Apr 15 15:00:18 2009 +0100 [ARM] s3c2410_defconfig: Update network options Update the list of modules being built for the network core of the s3c2410_defconfig. This update adds such items as TCP congestion, netfilter for IPv4 and IPv6. Signed-off-by: Ben Dooks commit 02884218368080f5ab891d270168d6c76c17ee5a Author: Ben Dooks Date: Wed Apr 15 14:56:33 2009 +0100 [ARM] s3c2410_defconfig: update to 2.6.30-rc2 Update arch/arm/configs/s3c2410_defconfig to the latest kernel release (2.6.30-rc2). Signed-off-by: Ben Dooks commit b7f9a94bf22e8dfa6420faac831e40d2492dd28c Author: Mark Brown Date: Wed Apr 8 16:12:35 2009 +0100 [ARM] SMDK6410: Request GPIOs for LCD power control Going forward gpio_request() will be a requirement for GPIO API users so call it for the LCD power GPIOs. With present code the kernel functions but generaets loud WARN_ON()s when using the unrequested GPIOs. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit acd216a15db902294904a974f66e1ba18763dc4c Author: Huang Weiyi Date: Wed Apr 8 07:11:04 2009 +0800 [ARM] S3C: remove duplicated #include Remove duplicated #include in arch/arm/mach-s3c2412/mach-jive.c. Signed-off-by: Huang Weiyi Signed-off-by: Ben Dooks commit 719bfeaae8104fca4ca5d47c02592b08682f14fa Author: Eric Dumazet Date: Wed Apr 15 03:39:52 2009 -0700 packet: avoid warnings when high-order page allocation fails Latest tcpdump/libpcap triggers annoying messages because of high order page allocation failures (when lowmem exhausted or fragmented) These allocation errors are correctly handled so could be silent. [22660.208901] tcpdump: page allocation failure. order:5, mode:0xc0d0 [22660.208921] Pid: 13866, comm: tcpdump Not tainted 2.6.30-rc2 #170 [22660.208936] Call Trace: [22660.208950] [] ? printk+0x18/0x1a [22660.208965] [] __alloc_pages_internal+0x357/0x460 [22660.208980] [] __get_free_pages+0x21/0x40 [22660.208995] [] packet_set_ring+0x105/0x3d0 [22660.209009] [] packet_setsockopt+0x21d/0x4d0 [22660.209025] [] ? filemap_fault+0x0/0x450 [22660.209040] [] sys_setsockopt+0x54/0xa0 [22660.209053] [] sys_socketcall+0xef/0x270 [22660.209067] [] sysenter_do_call+0x12/0x26 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a36e71f996e25d6213f57951f7ae1874086ec57e Author: Jens Axboe Date: Wed Apr 15 12:15:11 2009 +0200 cfq-iosched: add close cooperator code If we have processes that are working in close proximity to each other on disk, we don't want to idle wait. Instead allow the close process to issue a request, getting better aggregate bandwidth. The anticipatory scheduler has similar checks, noop and deadline do not need it since they don't care about process <-> io mappings. The code for CFQ is a little more involved though, since we split request queues into per-process contexts. This fixes a performance problem with eg dump(8), since it uses several processes in some silly attempt to speed IO up. Even if dump(8) isn't really a valid case (it should be fixed by using CLONE_IO), there are other cases where we see close processes and where idling ends up hurting performance. Credit goes to Jeff Moyer for writing the initial implementation. Signed-off-by: Jens Axboe commit 9481ffdc61738a91baf0f8b7fb20922768ae1b8e Author: Jens Axboe Date: Wed Apr 15 12:14:13 2009 +0200 cfq-iosched: log responsible 'cfqq' in idle timer arm Makes it easier to read the traces. Signed-off-by: Jens Axboe commit 2d870722965211de072bb36b446a4df99dae07e1 Author: Jens Axboe Date: Wed Apr 15 12:12:46 2009 +0200 cfq-iosched: tweak kick logic a bit more We only kick the dispatch for an idling queue, if we think it's a (somewhat) fully merged request. Also allow a kick if we have other busy queues in the system, since we don't want to risk waiting for a potential merge in that case. It's better to get some work done and proceed. Signed-off-by: Jens Axboe commit 40bb54d197a10fe86d73073ee8202ba2812a05fa Author: Jens Axboe Date: Wed Apr 15 12:11:10 2009 +0200 cfq-iosched: no need to save interrupts in cfq_kick_queue() It's called from the workqueue handlers from process context, so we always have irqs enabled when entered. Signed-off-by: Jens Axboe commit c2572f2b4ffc27ba79211aceee3bef53a59bb5cd Author: Nick Piggin Date: Wed Apr 15 10:32:07 2009 +0200 brd: fix cacheflushing brd is missing a flush_dcache_page. On 2nd thoughts, perhaps it is the pagecache's responsibility to flush user virtual aliases (the driver of course should flush kernel virtual mappings)... but anyway, there already exists cache flushing for one direction of transfer, so we should add the other. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit dfbc4752eab33e66f113f9daa2effbe241cd661d Author: Nick Piggin Date: Wed Apr 15 10:27:07 2009 +0200 brd: support barriers brd is always ordered (not that it matters, as it is defined not to survive when the system goes down). So tell the block layer it is ordered, which might be of help with testing filesystems. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit 297dbf50d7ab0539cf9cf7f2a66918665a18e45e Author: Nikanth Karthikesan Date: Wed Apr 15 10:37:04 2009 +0530 swap: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit b1fffc9ca6ca4c3feef3a7e8405252d528d312dc Author: Nikanth Karthikesan Date: Wed Apr 15 10:36:35 2009 +0530 gfs2: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_NOFS implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Acked-by: Steven Whitehouse Signed-off-by: Jens Axboe commit 226e7dabf5534722944adefbad01970bd38bb7ae Author: Nikanth Karthikesan Date: Wed Apr 15 10:36:16 2009 +0530 ext4: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_NOIO implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 4d1f9fdb6177a9bdecf26976337dd39abcc8edbc Author: Nikanth Karthikesan Date: Wed Apr 15 10:35:52 2009 +0530 dio: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_KERNEL implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 15afd1cc7b624e1c94fdf824ec5af611050b150c Author: Nikanth Karthikesan Date: Wed Apr 15 10:35:31 2009 +0530 block: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_KERNEL implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 86c824b9434e764d01489688e4e38aee43b93fcf Author: Jens Axboe Date: Wed Apr 15 09:00:07 2009 +0200 bio: add documentation to bio_alloc() Explain that with __GFP_WAIT set it will not fail, and that the caller must never allocate more than 1 bio at the time. Signed-off-by: Jens Axboe commit 61e0d47c33cc371f725bcda4a47ae0efe652dba8 Author: Miklos Szeredi Date: Tue Apr 14 19:48:41 2009 +0200 splice: add helpers for locking pipe inode There are lots of sequences like this, especially in splice code: if (pipe->inode) mutex_lock(&pipe->inode->i_mutex); /* do something */ if (pipe->inode) mutex_unlock(&pipe->inode->i_mutex); so introduce helpers which do the conditional locking and unlocking. Also replace the inode_double_lock() call with a pipe_double_lock() helper to avoid spreading the use of this functionality beyond the pipe code. This patch is just a cleanup, and should cause no behavioral changes. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit f8cc774ce4844811a55e2352f1443055e3994e28 Author: Miklos Szeredi Date: Tue Apr 14 19:48:40 2009 +0200 splice: remove generic_file_splice_write_nolock() Remove the now unused generic_file_splice_write_nolock() function. It's conceptually broken anyway, because splice may need to wait for pipe events so holding locks across the whole operation is wrong. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit 328eaaba4e41a04c1dc4679d65bea3fee4349d86 Author: Miklos Szeredi Date: Tue Apr 14 19:48:39 2009 +0200 ocfs2: fix i_mutex locking in ocfs2_splice_to_file() Rearrange locking of i_mutex on destination and call to ocfs2_rw_lock() so locks are only held while buffers are copied with the pipe_to_file() actor, and not while waiting for more data on the pipe. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit eb443e5a25d43996deb62b9bcee1a4ce5dea2ead Author: Miklos Szeredi Date: Tue Apr 14 19:48:38 2009 +0200 splice: fix i_mutex locking in generic_splice_write() Rearrange locking of i_mutex on destination so it's only held while buffers are copied with the pipe_to_file() actor, and not while waiting for more data on the pipe. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit 2933970b960223076d6affcf7a77e2bc546b8102 Author: Miklos Szeredi Date: Tue Apr 14 19:48:37 2009 +0200 splice: remove i_mutex locking in splice_from_pipe() splice_from_pipe() is only called from two places: - generic_splice_sendpage() - splice_write_null() Neither of these require i_mutex to be taken on the destination inode. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit b3c2d2ddd63944ef2a1e4a43077b602288107e01 Author: Miklos Szeredi Date: Tue Apr 14 19:48:36 2009 +0200 splice: split up __splice_from_pipe() Split up __splice_from_pipe() into four helper functions: splice_from_pipe_begin() splice_from_pipe_next() splice_from_pipe_feed() splice_from_pipe_end() splice_from_pipe_next() will wait (if necessary) for more buffers to be added to the pipe. splice_from_pipe_feed() will feed the buffers to the supplied actor and return when there's no more data available (or if all of the requested data has been copied). This is necessary so that implementations can do locking around the non-waiting splice_from_pipe_feed(). This patch should not cause any change in behavior. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit 91e463c8f5f7a5b09d3d034c01a88567af60c504 Author: FUJITA Tomonori Date: Mon Apr 13 20:03:10 2009 +0200 block: fix SG_IO to return a proper error value blk_rq_unmap_user() returns -EFAULT if a program passes an invalid address to kernel. SG_IO path needs to pass the returned value to user space instead of ignoring it. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit ed247e12fe5da4417602c3c0ce22932fb0f9cac1 Author: Wei Yongjun Date: Wed Apr 15 03:04:56 2009 -0700 sparc: remove some pointless conditionals before kfree() Remove some pointless conditionals before kfree(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 83b2086ce2a1458168dc8b9d624060b2d7a82d4c Author: Justin Mattock Date: Tue Apr 14 14:31:21 2009 -0700 ALSA: add missing definitions(letters) to HD-Audio.txt impact: Add missing definitions(letters). Signed-off-by: Justin P. Mattock Signed-off-by: Takashi Iwai commit cbea270714faae389c48c2901ee7988ecd62f664 Author: Markus Brunner Date: Wed Apr 15 02:35:40 2009 -0700 gianfar: stop send queue before resetting gianfar After a transmit timed out, the reset task will be called, which will free the allocated resources(stop_gfar). If gfar_poll will be called before the resources get allocated again gfar_clean_tx_ring will call dev_kfree_skb_any(NULL). Example crash: ops: Kernel access of bad area, sig: 11 [#1] PREEMPT RSBBA100 Modules linked in: NIP: c01a10c4 LR: c013b254 CTR: c013c038 REGS: c02e7d20 TRAP: 0300 Not tainted (2.6.27.20) MSR: 00001032 CR: 24000082 XER: 20000000 DAR: 000000a0, DSISR: 20000000 TASK = c02ce578[0] 'swapper' THREAD: c02e6000 GPR00: 000000a0 c02e7dd0 c02ce578 00000000 00000040 00000001 c02ec1c0 00001032 GPR08: c080d1e0 df9ea800 00000000 00000000 24000082 ffffffff 0404f000 00000000 GPR16: ffffffbf ffffffff ffffffff ffdff7ff ffffffff c02d0fd4 00100100 00200200 GPR24: c031220c 00000001 00000001 00000000 00000000 df849800 ff109000 df849b80 NIP [c01a10c4] dev_kfree_skb_irq+0x18/0x70 LR [c013b254] gfar_clean_tx_ring+0x70/0x11c Call Trace: [c02e7dd0] [c003e978] update_wall_time+0x730/0x744 (unreliable) [c02e7df0] [c013b254] gfar_clean_tx_ring+0x70/0x11c [c02e7e10] [c013c07c] gfar_poll+0x44/0x150 [c02e7e30] [c01a064c] net_rx_action+0xa8/0x19c [c02e7e70] [c00251d4] __do_softirq+0x64/0xc0 [c02e7e90] [c0006384] do_softirq+0x40/0x58 [c02e7ea0] [c00250a8] irq_exit+0x40/0x9c [c02e7eb0] [c000642c] do_IRQ+0x90/0xac [c02e7ec0] [c0010ab4] ret_from_except+0x0/0x14 --- Exception: 501 at cpu_idle+0x9c/0xf8 LR = cpu_idle+0x9c/0xf8 [c02e7f80] [c0009820] cpu_idle+0x58/0xf8 (unreliable) [c02e7fa0] [c01fb8c8] __got2_end+0x7c/0x90 [c02e7fc0] [c026c794] start_kernel+0x2c0/0x2d4 [c02e7ff0] [00003438] 0x3438 Instruction dump: 7fa00124 80010024 bba10014 38210020 7c0803a6 4e800020 9421ffe0 7c0802a6 7c6b1b78 90010024 380300a0 bfa10014 <7d200028> 3129ffff 7d20012d 40a2fff4 Kernel panic - not syncing: Fatal exception in interrupt This Patch calls netif_stop_queue before calling stop_gfar. Signed-off-by: Markus Brunner Signed-off-by: David S. Miller commit 636d2f68a0814d84de26c021b2c15e3b4ffa29de Author: Stanislaw Gruszka Date: Wed Apr 15 02:26:49 2009 -0700 myr10ge: again fix lro_gen_skb() alignment Add LRO alignment initially committed in 621544eb8c3beaa859c75850f816dd9b056a00a3 ("[LRO]: fix lro_gen_skb() alignment") and removed in 0dcffac1a329be69bab0ac604bf7283737108e68 ("myri10ge: add multislices support") during conversion to multi-slice. Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit f4723b224d21ff546ac1fea4483094548d529479 Merge: 00610a8... 336500f... Author: Takashi Iwai Date: Wed Apr 15 11:24:27 2009 +0200 Merge branch 'topic/memdup_user' into for-linus * topic/memdup_user: ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user() commit 00610a81df32ea50dba0105078e7369988caef3b Merge: 035f5af... 936e7d0... Author: Takashi Iwai Date: Wed Apr 15 11:24:22 2009 +0200 Merge branch 'topic/usb-caiaq' into for-linus * topic/usb-caiaq: ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes ALSA: snd-usb-caiaq: clean up header includes commit 035f5afb022451b6b4f7ca1ff65a43d7ea8154a1 Merge: 2e8e59f... 34e51ce... Author: Takashi Iwai Date: Wed Apr 15 11:24:14 2009 +0200 Merge branch 'topic/asoc' into for-linus * topic/asoc: ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h commit 2e8e59f437ce303fde2077cc5f84ce03c6ff1020 Merge: 45c27fc... ff0c68d... Author: Takashi Iwai Date: Wed Apr 15 11:24:09 2009 +0200 Merge branch 'topic/hda' into for-linus * topic/hda: ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack commit ff0c68d03b77ecb3a682137c42e947a4dc33e9b3 Merge: bfb5303... 95c0909... Author: Takashi Iwai Date: Wed Apr 15 11:23:44 2009 +0200 Merge branch 'topic/jack-free-fix' into topic/hda * topic/jack-free-fix: ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack commit 45c27fc8c89d39956930abeff8433c33d07a8d5f Merge: 0882e8d... 2ec775e... Author: Takashi Iwai Date: Wed Apr 15 11:21:13 2009 +0200 Merge branch 'master' of git://git.alsa-project.org/alsa-kernel into for-linus * 'master' of git://git.alsa-project.org/alsa-kernel: [ALSA] intel8x0: add one retry to the ac97_clock measurement routine [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine [ALSA] intel8x0: do not use zero value from PICB register [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies [ALSA] hda_intel: fix unexpected ring buffer positions commit 1328df725239804ae30fc7257c1a3185e679b517 Author: Xu Gang Date: Tue Apr 14 14:54:14 2009 +0800 GFS2: Use DEFINE_SPINLOCK SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead. (as suggested in Documentation/spinlocks.txt) Signed-off-by: Xu Gang Signed-off-by: Steven Whitehouse commit 10d2198805d7faa2b193485446ff6b1de42c9b78 Author: Christoph Hellwig Date: Tue Apr 7 19:42:17 2009 +0200 GFS2: cleanup file_operations mess Remove the weird pointer to file_operations mess and replace it with straight-forward defining of the lockinginstance names to the _nolock variants. Signed-off-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit a228df6339e0d385b8149c860d81b6007f5e9c81 Author: Steven Whitehouse Date: Tue Apr 7 14:01:34 2009 +0100 GFS2: Move umount flush rwsem The rwsem, used only on umount, is in the wrong place in glock.c. This patch moves it up a bit so that it does not get called under a spinlock. Signed-off-by: Steven Whitehouse commit 5cf32524de745c56e1411d63eccf23fef1709d73 Author: Steven Whitehouse Date: Tue Mar 31 16:06:27 2009 +0100 GFS2: Fix symlink creation race In certain cases symlinks can appear to have zero size if a lookup on the inode occurs within a certain (very short) time after the symlink has been created. The symlink is correctly created on disk but appears to have zero size when stat()ed. This patch closes the race and prevents incorrect sizes appearing. Signed-off-by: Steven Whitehouse commit 7fa5d20d1a5e60ef7e453993b67b26c87dc09f07 Author: Steven Whitehouse Date: Tue Mar 31 15:49:08 2009 +0100 GFS2: Make quotad's waiting interruptible So we don't count its D state in the loadavg. Reported-by: Nathan Straz Signed-off-by: Steven Whitehouse commit bfb53037c61ddf7c16a40297ad16f2bcbde534dc Author: Takashi Iwai Date: Tue Apr 14 14:51:04 2009 +0200 ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 Added the models for quirk bitmask 1734:110x and 1734:113x of Fujitsu laptops. This will fix the model detection for Amilo Xa3540. Signed-off-by: Takashi Iwai commit d5565f76d30a164570d883ab2e77a24b6b8686a0 Author: Hartley Sweeten Date: Tue Apr 14 21:38:07 2009 +0100 [ARM] 5451/1: ep93xx:core.c: build warning fix Fix trivial build warning due to incompatible pointer type. ep93xx_timer_interrupt() has the wrong return type causing a warning during the build. Signed-off-by: H Hartley Sweeten Signed-off-by: Russell King commit 7fccfc00c003c855936970facdbb667bae9dbe9a Author: Aaro Koskinen Date: Tue Apr 14 13:07:35 2009 +0100 [ARM] 5450/1: Flush only the needed range when unmapping a VMA When unmapping N pages (e.g. shared memory) the amount of TLB flushes done can be (N*PAGE_SIZE/ZAP_BLOCK_SIZE)*N although it should be N at maximum. With PREEMPT kernel ZAP_BLOCK_SIZE is 8 pages, so there is a noticeable performance penalty when unmapping a large VMA and the system is spending its time in flush_tlb_range(). The problem is that tlb_end_vma() is always flushing the full VMA range. The subrange that needs to be flushed can be calculated by tlb_remove_tlb_entry(). This approach was suggested by Hugh Dickins, and is also used by other arches. The speed increase is roughly 3x for 8M mappings and for larger mappings even more. Signed-off-by: Aaro Koskinen Signed-off-by: Russell King commit 41609ff43005de11dadfb0ccadb344f0e2966829 Author: Mark Brown Date: Tue Apr 14 11:06:49 2009 +0100 [ARM] 5449/1: S3C: Use disable_irq_nosync() to fix boot lockups With 2.6.30-rc1 on SMDK6410 I experience a soft lockup on bootup when the Samsung serial driver attempts to disable the transmit interrupt from within the transmit interrupt handler: it calls disable_irq() which locks up due to attempting to synchronise with the running handler. Fix this by using disable_irq_nosync(). Also make the same change in the recieve path. Backtrace: [] (__irq_svc+0x34/0x80) from [] (synchr) [] (synchronize_irq+0xc/0xcc) from [] (s) [] (s3c24xx_serial_stop_tx+0x1c/0x3c) from [] (s3c24xx_serial_tx_chars+0xf8/0x104) from [] (handle_IRQ_event+0x74/0x118) from []) [] (handle_level_irq+0x100/0x118) from [) [] (s3c_irq_demux_uart+0x94/0xc4) from [) [] (_text+0x50/0x6c) from [] (__irq_svc+) Signed-off-by: Mark Brown Acked-by: Ben Dooks Signed-off-by: Russell King commit 9fa264d0d327a67db4913b400bcfb174d929054c Merge: 0882e8d... 6845a65... Author: Russell King Date: Wed Apr 15 09:58:21 2009 +0100 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 2ec775e7053c82bc90858ede011b35aeb416995b Author: Jaroslav Kysela Date: Wed Apr 15 10:16:24 2009 +0200 [ALSA] intel8x0: add one retry to the ac97_clock measurement routine It seems that on some hardware platforms, the first measurement is wrong. This patch adds second measurement to this case. Signed-off-by: Jaroslav Kysela commit d6ceb25e8d8bccf826848c2621a50d02c0a7f4ae Author: Jens Axboe Date: Tue Apr 14 14:18:16 2009 +0200 cfq-iosched: don't delay queue kick for a merged request "Zhang, Yanmin" reports that commit b029195dda0129b427c6e579a3bb3ae752da3a93 introduced a regression of about 50% with sequential threaded read workloads. The test case is: tiotest -k0 -k1 -k3 -f 80 -t 32 which starts 32 threads each reading a 80MB file. Twiddle the kick queue logic so that we do start IO immediately, if it appears to be a fully merged request. We can't really detect that, so just check if the request is bigger than a page or not. The assumption is that since single bio issues will first queue a single request with just one page attached and then later do merges on that, if we already have more than a page worth of data in the request, then the request is most likely good to go. Verified that this doesn't cause a regression with the test case that commit b029195dda0129b427c6e579a3bb3ae752da3a93 was fixing. It does not, we still see maximum sized requests for the queue-then-merge cases. Signed-off-by: Jens Axboe commit 053c525fcf976810f023d96472f414c0d5e6339b Author: Jens Axboe Date: Wed Apr 8 13:44:08 2009 +0200 buffer: switch do_emergency_thaw() away from pdflush_operation() This is (again) a preparatory patch similar to commit a2a9537ac0b37a5da6fbe7e1e9cb06c524d2a9c4. It open codes a simple async way of executing do_thaw_all() out of context, so we can get rid of pdflush. Signed-off-by: Jens Axboe commit 329007ce25d56fc7113df7b4828d607806d8bc21 Author: Jens Axboe Date: Wed Apr 8 11:38:50 2009 +0200 block: update biodoc.txt on plugging We do per-device plugging, get rid of any references to tq_disk as that has been dead since 2.6.5 or so. Signed-off-by: Jens Axboe commit 1d6bfbdf38f37bcc259e7c56c8c73664772651fb Author: Jens Axboe Date: Wed Apr 8 11:02:08 2009 +0200 as-iosched: get rid of private REQ_SYNC/REQ_ASYNC defines We can just use the block layer BLK_RW_SYNC/ASYNC defines now. Signed-off-by: Jens Axboe commit ff6657c6c8ac99444e5dd4c4f7c1dc9271173382 Author: Jens Axboe Date: Wed Apr 8 10:58:57 2009 +0200 cfq-iosched: get rid of private SYNC/ASYNC defines We can just use the block layer BLK_RW_SYNC/ASYNC defines now. Signed-off-by: Jens Axboe commit b0b78f81a5a3bfe9442fcc3a9c13e298a742556a Author: Jens Axboe Date: Wed Apr 8 10:56:08 2009 +0200 cfq-iosched: use rw_is_sync() to see if rw flags are sync or not Signed-off-by: Jens Axboe commit 48e70bc18ac81881dedd3aa327c55b924fc41ecf Author: Jens Axboe Date: Tue Apr 14 08:19:27 2009 +0200 Document and move the various READ/WRITE types It's a somewhat twisty maze of hints and behavioural modifiers, try and clear it up a bit with some documentation. Signed-off-by: Jens Axboe commit f600abe2de81628c40effbb3f8eaf5af0d291e57 Author: Jens Axboe Date: Wed Apr 8 14:22:01 2009 +0200 block: fix bad spelling of quiesce Credit goes to Andrew Morton for spotting this one. Signed-off-by: Jens Axboe commit 8f3d8ba20e67991b531e9c0227dcd1f99271a32c Author: Christoph Hellwig Date: Tue Apr 7 19:55:13 2009 +0200 block: move bio list helpers into bio.h It's used by DM and MD and generally useful, so move the bio list helpers into bio.h. Signed-off-by: Christoph Hellwig Acked-by: Alasdair G Kergon Signed-off-by: Jens Axboe commit b71a0c296cee4debaf446760fbd29ead1587a7ac Author: Sachin Sant Date: Tue Apr 14 14:35:55 2009 +0000 powerpc: pseries/dtl.c should include asm/firmware.h A randconfig build on powerpc failed with: dtl.c: In function 'dtl_init': dtl.c:238: error: implicit declaration of function 'firmware_has_feature' dtl.c:238: error: 'FW_FEATURE_SPLPAR' undeclared (first use in this function) - We need firmware.h for these definitions. Signed-off-by: Sachin Sant Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 306a82881b14d950d59e0b59a55093a07d82aa9a Author: Paul Mackerras Date: Mon Apr 13 14:09:09 2009 +0000 powerpc: Fix data-corrupting bug in __futex_atomic_op Richard Henderson pointed out that the powerpc __futex_atomic_op has a bug: it will write the wrong value if the stwcx. fails and it has to retry the lwarx/stwcx. loop, since 'oparg' will have been overwritten by the result from the first time around the loop. This happens because it uses the same register for 'oparg' (an input) as it uses for the result. This fixes it by using separate registers for 'oparg' and 'ret'. Cc: stable@kernel.org Signed-off-by: Paul Mackerras commit c58dc575f3c8bdc69fb868ec51e1c80ee7cae5e7 Author: Mike Mason Date: Fri Apr 10 08:57:03 2009 +0000 powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset() While adding native EEH support to Emulex and Qlogic drivers, it was discovered that dev->error_state was set to pci_io_channel_normal too late in the recovery process. These drivers rely on error_state to determine if they can access the device in their slot_reset callback, thus error_state needs to be set to pci_io_channel_normal in eeh_report_reset(). Below is a detailed explanation (courtesy of Richard Lary) as to why this is necessary. Background: PCI MMIO or DMA accesses to a frozen slot generate additional EEH errors. If the number of additional EEH errors exceeds EEH_MAX_FAILS the adapter will be shutdown. To avoid triggering excessive EEH errors and an undesirable adapter shutdown, some drivers use the pci_channel_offline(dev) wrapper function to return a Boolean value based on the value of pci_dev->error_state to determine if PCI MMIO or DMA accesses are safe. If the wrapper returns TRUE, drivers must not make PCI MMIO or DMA access to their hardware. The pci_dev structure member error_state reflects one of three values, 1) pci_channel_io_normal, 2) pci_channel_io_frozen, 3) pci_channel_io_perm_failure. Function pci_channel_offline(dev) returns TRUE if error_state is pci_channel_io_frozen or pci_channel_io_perm_failure. The EEH driver sets pci_dev->error_state to pci_channel_io_frozen at the point where the PCI slot is frozen. Currently, the EEH driver restores dev->error_state to pci_channel_io_normal in eeh_report_resume() before calling the driver's resume callback. However, when the EEH driver calls the driver's slot_reset callback() from eeh_report_reset(), it incorrectly indicates the error state is still pci_channel_io_frozen. Waiting until eeh_report_resume() to restore dev->error_state to pci_channel_io_normal is too late for Emulex and QLogic FC drivers and any other drivers which are designed to use common code paths in these two cases: i) those called after the driver's slot_reset callback() and ii) those called after the PCI slot is frozen but before the driver's slot_reset callback is called. Case i) all driver paths executed to reinitialize the hardware after a reset and case ii) all code paths executed by driver kernel threads that run asynchronous to the main driver thread, such as interrupt handlers and worker threads to process driver work queues. Emulex and QLogic FC drivers are designed with common code paths which require that pci_channel_offline(dev) reflect the true state of the hardware. The state transitions that the hardware takes from Normal Operations to Slot Frozen to Reset to Normal Operations are documented in the Power Architecture™ Platform Requirements+ (PAPR+) in Table 75. PE State Control. PAPR defines the following 3 states: 0 -- Not reset, Not EEH stopped, MMIO load/store allowed, DMA allowed (Normal Operations) 1 -- Reset, Not EEH stopped, MMIO load/store disabled, DMA disabled 2 -- Not reset, EEH stopped, MMIO load/store disabled, DMA disabled (Slot Frozen) An EEH error places the slot in state 2 (Frozen) and the adapter driver is notified that an EEH error was detected. If the adapter driver returns PCI_ERS_RESULT_NEED_RESET, the EEH driver calls eeh_reset_device() to place the slot into state 1 (Reset) and eeh_reset_device completes by placing the slot into State 0 (Normal Operations). Upon return from eeh_reset_device(), the EEH driver calls eeh_report_reset, which then calls the adapter's slot_reset callback. At the time the adapter's slot_reset callback is called, the true state of the hardware is Normal Operations and should be accurately reflected by setting dev->error_state to pci_channel_io_normal. The current implementation of EEH driver does not do so and requires this change to correct this deficiency. Signed-off-by: Mike Mason Acked-by: Linas Vepstas Signed-off-by: Paul Mackerras commit adf213c43898f2324cfc35c315556bc21cb65b31 Author: Hugh Dickins Date: Mon Apr 6 11:01:15 2009 +0000 powerpc: Allow 256kB pages with SHMEM Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, let powerpc 256kB pages coexist with CONFIG_SHMEM again. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit ad5a24e0944e8a0869d1f685ce4ae739adf84a87 Author: Alexander Beregalov Date: Tue Apr 14 18:30:25 2009 +0000 declance: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 149da651bf340b796576a078574fbb49ed09b7ae Author: Alexander Beregalov Date: Tue Apr 14 18:30:24 2009 +0000 bfin_mac: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit d9a92cee09d2748ec5d4126cf36083a3a8a5449d Author: Alexander Beregalov Date: Tue Apr 14 18:30:23 2009 +0000 au1000: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 8e7678fe0992a6107041b839b08ac4af55d41592 Author: Alexander Beregalov Date: Tue Apr 14 18:30:22 2009 +0000 atarilance: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 444f1a92702adb9865dd8f509fd55bca9c46a78e Author: Alexander Beregalov Date: Tue Apr 14 18:30:21 2009 +0000 a2065: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit af22ab1bd20e9dedf3a37cc1d401ef8bbd587ef0 Author: Wu Fengguang Date: Tue Apr 14 21:54:07 2009 -0700 ixgbe: update real_num_tx_queues on changing num_rx_queues Move the update of real_num_tx_queues from ixgbe_acquire_msix_vectors() to ixgbe_set_num_queues(), to ensure it be always in sync with num_tx_queues. Signed-off-by: Wu Fengguang Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 95615d90a321349709c80091f2a9cb284757ff0d Author: Wu Fengguang Date: Tue Apr 14 21:53:48 2009 -0700 ixgbe: fix tx queue index Don't do the num_tx_queues based masking on calculating tx queue index. 1) num_tx_queues is not always power-of-2, because it also depends on the online cpu numbers. So the masking could be a performance bug on a 6 cpu system. 2) queue_mapping will be limited by real_num_tx_queues=num_tx_queues in the generic netdev function set_cur_queue_map(). So the bound limiting here is not necessary. Signed-off-by: Wu Fengguang Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba Author: David S. Miller Date: Tue Apr 14 20:28:00 2009 -0700 Revert "rose: zero length frame filtering in af_rose.c" This reverts commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b. Alan Cox did the research, and just like the other radio protocols zero-length frames have meaning because at the top level ROSE is X.25 PLP. So this zero-length filtering is invalid. Signed-off-by: David S. Miller commit 239795adf7f1a40cf0be0e05544d37706c9b4cf9 Author: Ben Hutchings Date: Tue Apr 14 19:48:34 2009 -0700 sfc: Use correct macro to set event bitfield falcon_sim_phy_event() used EFX_OWORD_FIELD, which operates on bitfields in 128-bit values, on an event, which is a 64-bit value. This should be harmless - these macros always use little-endian ordering, so it would read and write back the following 8 bytes unchanged - but it is obviously wrong. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 718cff1eec595ce6ab0635b8160a51ee37d9268d Author: Ben Hutchings Date: Tue Apr 14 19:47:46 2009 -0700 sfc: Match calls to netif_napi_add() and netif_napi_del() sfc could call netif_napi_add() multiple times for the same napi_struct, corrupting the list of napi_structs for the associated device and leading to a busy-loop on device removal. Move the call to netif_napi_add() and add a call to netif_napi_del() in the obvious places. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6c0f8bc77233d000a34a01989c42e650c8c32180 Author: Stoyan Gaydarov Date: Tue Apr 14 19:46:19 2009 -0700 sbus: changed ioctls to unlocked Signed-off-by: Stoyan Gaydarov Signed-off-by: David S. Miller commit c7cb1521b3289e2d107d3139ad7a902b386d7e43 Author: Stephen Rothwell Date: Tue Apr 14 02:00:48 2009 -0700 sparc: asm/atomic.h on 32bit should include asm/system.h for xchg Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 8e255baa449df3049a8827a7f1f4f12b6921d0d1 Author: David S. Miller Date: Wed Apr 8 21:06:35 2009 -0700 sparc64: Fix smp_callin() locking. Interrupts must be disabled when taking the IPI lock. Caught by lockdep. Reported-by: Meelis Roos Signed-off-by: David S. Miller commit 2690f8d62e98779c71625dba9a0fd525d8b2263d Author: Jay Vosburgh Date: Tue Apr 14 16:53:14 2009 -0700 bonding: Remove debug printk Remove debug printk I accidently left in as part of commit: commit 6146b1a4da98377e4abddc91ba5856bef8f23f1e Author: Jay Vosburgh Date: Tue Nov 4 17:51:15 2008 -0800 bonding: Fix ALB mode to balance traffic on VLANs Reported by Duncan Gibb Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit df26fd2c594a0876b4e6b802dee7753024e484d9 Author: Jesse Brandeburg Date: Tue Apr 14 16:38:49 2009 -0700 e1000/e1000: fix compile warning e1000/e1000e compile report a possible unused variable, fix that for now. Shortly after this a small refactor and bug fix will follow in the same code. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b Author: Alexander Beregalov Date: Tue Apr 14 15:18:00 2009 -0700 ehea: Fix incomplete conversion to net_device_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit d119b3927994e3d620d6adb0dd1ea6bf24427875 Author: Michal Schmidt Date: Tue Apr 14 15:16:55 2009 -0700 skge: fix occasional BUG during MTU change The BUG_ON(skge->tx_ring.to_use != skge->tx_ring.to_clean) in skge_up() was sometimes observed when setting MTU. skge_down() disables the TX queue, but then reenables it by mistake via skge_tx_clean(). Fix it by moving the waking of the queue from skge_tx_clean() to the other caller. And to make sure start_xmit is not in progress on another CPU, skge_down() should call netif_tx_disable(). The bug was reported to me by Jiri Jilek whose Debian system sometimes failed to boot. He tested the patch and the bug did not happen anymore. Signed-off-by: Michal Schmidt Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit fc59f9a3bf8096a1f68a8b78ada7a0e0ab9236b2 Author: Herbert Xu Date: Tue Apr 14 15:11:06 2009 -0700 gro: Restore correct value to gso_size Since everybody has been focusing on baremetal GRO performance no one noticed when I added a bug that zapped gso_size for all GRO packets. This only gets picked up when you forward the skb out of an interface. Thanks to Mark Wagner for noticing this bug when testing kvm. Reported-by: Mark Wagner Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 29dab4fd3176e25dfab6cd763beb02d87973c288 Author: Jaroslav Kysela Date: Tue Apr 14 22:40:04 2009 +0200 [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine Also add a little code cleanup. Signed-off-by: Jaroslav Kysela commit 94ca8e4852807fc42d2f64fcaf248aafc4f2e6a7 Author: Cliff Wickman Date: Tue Apr 14 10:56:48 2009 -0500 x86: UV: BAU partition-relative distribution map This patch enables each partition's BAU distribution bit map to be partition-relative. The distribution bitmap had been constructed assuming 0 as the base node number. That construct would not have allowed a total system of greater than 256 nodes. It also corrects an error that occurred when the first blade's nasid was not zero. That nasid was stored as the base node. The base node number gets added by hardware to the node numbers implied in the distribution bitmap, resulting in invalid target nasids. Tested on the UV hardware simulator. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar commit 6845a658e09767e72c12558825ed66a9eda02737 Author: Huang Weiyi Date: Thu Apr 9 20:36:57 2009 +0800 [ARM] pxa/em-x270: remove duplicated #include Remove duplicated #include in arch/arm/mach-pxa/em-x270.c. Signed-off-by: Huang Weiyi Acked-by: Mike Rapoport Signed-off-by: Eric Miao commit bd9d074098afb5f8693306d22aaf005bfb50d8f7 Author: Mike Rapoport Date: Tue Apr 14 08:32:55 2009 +0300 [ARM] pxa/em-x270: explicitly set .gpio_cs in TDO35S SPI chip data After commit a7bb3909b3293d503211d7f6af8ed62c1644b686 ("spi: pxa2xx_spi: introduce chipselect GPIO to simplify the common cases") the .gpio_cs field in pxa2xx_spi_chip has to be set explicitly. Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao commit 95c0909961bc5ff18c78b2ab0d093cddc0a8b0b5 Author: Takashi Iwai Date: Tue Apr 14 16:15:29 2009 +0200 ALSA: hda - Avoid call of snd_jack_report at release Don't call snd_jack_report at release of sigmatel and conexnat codecs which results in Oops at unloading the module. The Oops is triggered by the power-up sequence during the free due to the pincfg restoration. Since the power-up sequence is involved with the unsol handling, the jack reporting may be issued during that. The Oops occurs with this jack reporting because the jack instances have been already released but the codec doesn't do the proper book-keeping. This patch adds the book-keeping of jack instances to avoid the access to bogus pointers. Signed-off-by: Takashi Iwai commit 9d59065cd6fae841ca56c281189d5b8d0817d35f Author: Takashi Iwai Date: Tue Apr 14 16:13:58 2009 +0200 ALSA: add private_data to struct snd_jack Added private_data and private_free fields to struct snd_jack so that the caller can assign the data. It'll be helpful for avoiding the double-free of the jack instance. Signed-off-by: Takashi Iwai commit ab96e798cbd562a53edd802272e49a5100b29efb Author: Martin Schwidefsky Date: Tue Apr 14 15:36:29 2009 +0200 [S390] boot cputime accounting Start the cpu time accounting very early to catch the cpu time spent for the initial kernel setup. To make the output of /proc/uptime match the sum of all cpu accounting values of the boot cpu reset xtime and wall_to_monotonic to sane values based on the TOD clock. The values set by timekeeping_init are off by up to a second. Signed-off-by: Martin Schwidefsky commit b6112ccbff5ec580d46b584ecc3c3a773b830da2 Author: Martin Schwidefsky Date: Tue Apr 14 15:36:28 2009 +0200 [S390] add read_persistent_clock Add a read_persistent_clock function that does not just return 0. Since timekeeping_init calls the function before time_init has been called move reset_tod_clock to early.c to make sure that the TOD clock is running when read_persistent_clock is invoked. Signed-off-by: Martin Schwidefsky commit 5b409ed17bb32c8316b1f456466c70529454573a Author: Martin Schwidefsky Date: Tue Apr 14 15:36:27 2009 +0200 [S390] cpu hotplug and accounting values Reset the cpu timer to the maximum value and correctly initialize the cpu accounting values in the lowcore when the cpu is started. Signed-off-by: Martin Schwidefsky commit b86ccca49cd8f22086c1d135ab3051cf48fb1688 Author: Martin Schwidefsky Date: Tue Apr 14 15:36:26 2009 +0200 [S390] fix idle time accounting The steal time is calculated by subtracting the time the virtual cpu has been running on a physical cpu from the wall clock time. To make that work all wall time needs to be added to the steal time field first before the virtual cpu time is subtracted. The time between the last clock update and the load of the enabled wait psw needs to be added to the steal_time field as well to make the sum over all cpu accounting numbers match the wall clock. Signed-off-by: Martin Schwidefsky commit 88e012856d05a5d00ae80c691fb7aa5adda268d7 Author: Heiko Carstens Date: Tue Apr 14 15:36:25 2009 +0200 [S390] smp: fix cpu_possible_map initialization The cpu_possible_map by default is initialized with all ones in s390. If the kernel paramert possible_cpus= is passed the cpu_possible_map is supposed to have x bits set. However the current code just sets the x bits without clearing the NR_CPUS bits that were already set. So we end up with an unchanged map that has all bits set. To fix this just clear the map before setting any new bits. This broke with def6cfb70bab83c0094bc0cedd27c4eda563043e "[S390] cpumask: Use accessors code." Cc: Rusty Russell Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 52db45c3c55a0fca53077dfd7b123e30cd210aad Author: Stefan Weinhuber Date: Tue Apr 14 15:36:24 2009 +0200 [S390] dasd: fix idaw boundary checking for track based ccw A ccw command that reads or writes several records at once will usually transfer more data then fits into one page and needs to address memory areas using a list of indirect data address words (idaw). All but the first of these areas must start on a 4KB or 2KB block boundary (depending on the idaw format). A check for this restriction was missing and has been added with this patch. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit f3445a1a656bc26b07946cc6d20de1ef07c8d116 Author: Cornelia Huck Date: Tue Apr 14 15:36:23 2009 +0200 [S390] dasd: Use the new async framework for autoonlining. The dasd driver can automatically online detected dasds, which especially important for finding the root device. Currently, it will wait for each online operation to finish individually, which may take long if many dasds need to be onlined. When using the new async framework, these onlining operations can run in parallel and presence of the root device is ensured by the fact that prepare_namespace() waits for all async threads to finish. Signed-off-by: Cornelia Huck Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 75cb71f3184f3dd5b78d991d5e0e047774865f5d Author: Jan Glauber Date: Tue Apr 14 15:36:22 2009 +0200 [S390] qdio: remove dead timeout handler The QDIO ccw devices are started by ccw_device_start so no timeout can occur for the interrupt handler. Remove the dead code. In case of an I/O error set the device state to error and wake up a possibly running qdio_shutdown waiter. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 43ae8a1b32735c662ba7ebf3509c4f670f75e3d5 Author: Gerald Schaefer Date: Tue Apr 14 15:36:21 2009 +0200 [S390] appldata: Use new mod_virt_timer_periodic() function. mod_virt_timer() was used to modify/add cpu timers for cpus that were set online. This resulted in a one-shot timer for every cpu that was newly added or previously set offline, instead of an interval timer, which broke the appldata vtime interval setup. To fix this, the new mod_virt_timer_periodic() function is used, which adds interval timers instead of one-shot timers. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit b6ecfa9273e27b5c7ba04655eb44f78bf4db5b64 Author: Jan Glauber Date: Tue Apr 14 15:36:20 2009 +0200 [S390] extend virtual timer interface by mod_virt_timer_periodic In case mod_virt_timer is used to add a non pending timer the timer is always added as a one-shot timer. If mod_virt_timer is used for periodic timers they may therfore be degraded to one-shot timers. Add mod_virt_timer_periodic to the interface to allow safe re-programming of the interval value. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 0436230148c55e3afbe5c57775a1fb44ba4834ac Author: Martin Schwidefsky Date: Tue Apr 14 15:36:19 2009 +0200 [S390] stp synchronization retry timer Add a timer that retries the clock synchronization via the server time protocol if there is a usable clock but the synchronization failed. Signed-off-by: Martin Schwidefsky commit 81f64b87731aa33eef6b88af9d92c3398d48cf41 Author: Heiko Carstens Date: Tue Apr 14 15:36:18 2009 +0200 [S390] call nmi_enter/nmi_exit on machine checks nmi_enter/nmi_exit includes the lockdep calls and various other calls which were missing so far. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a93e11f9b9604134373ae790bce738d62109de60 Author: Heiko Carstens Date: Tue Apr 14 15:36:17 2009 +0200 [S390] wire up preadv/pwritev system calls Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 25097bf153391f7be4c591d47061b3dc4990dac2 Author: Christian Ehrhardt Date: Tue Apr 14 15:36:16 2009 +0200 [S390] s390: move machine flags to lowcore Currently the storage of the machine flags is a globally exported unsigned long long variable. By moving the storage location into the lowcore struct we allow assembler code to check machine_flags directly even without needing a register. Addtionally the lowcore and therefore the machine flags too will be in cache most of the time. Signed-off-by: Christian Ehrhardt Signed-off-by: Martin Schwidefsky commit 936e7d03394bc6238091db10d060326622c87ed7 Author: Daniel Mack Date: Wed Apr 1 19:05:39 2009 +0200 ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes Cleanup only, no functional change. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit e431cf45687d1ccb7c7d818defc2af34bd783db2 Author: Daniel Mack Date: Sat Mar 28 21:19:49 2009 +0100 ALSA: snd-usb-caiaq: clean up header includes Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 336500f0305dc1552e8d01a60b409a7db781ca28 Author: Li Zefan Date: Fri Apr 10 09:44:31 2009 +0800 ALSA: sound/pci: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit 85385c1551d509e9e377b7be07ea0e755fb2c3ce Author: Li Zefan Date: Fri Apr 10 09:43:59 2009 +0800 ALSA: sound/usb: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit 68425adcc419bfe90776f59e66b8c4cdb6e1b1f3 Author: Li Zefan Date: Fri Apr 10 09:43:36 2009 +0800 ALSA: sound/isa: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit ef44a1ec6eeef189998f84e7230e1d3535b01074 Author: Li Zefan Date: Fri Apr 10 09:43:08 2009 +0800 ALSA: sound/core: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit 34e51ce60a210094bd66cf0a75dd8512247618ca Merge: 577c9c4... 6e498d5... Author: Takashi Iwai Date: Tue Apr 14 11:48:25 2009 +0200 Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc commit 6cececfcece2b072d29886ed7140495f3af17153 Author: Jaswinder Singh Rajput Date: Tue Apr 14 14:03:43 2009 +0530 x86, documentation: kernel-parameters replace X86-32,X86-64 with X86 X86 is same as X86-32+X86-64 so replace X86-32,X86-64 with X86. Signed-off-by: Jaswinder Singh Rajput LKML-Reference: <1239698023.3033.37.camel@ht.satnam> Signed-off-by: Ingo Molnar commit ef631b0ca01655d24e9ca7e199262c4a46416a26 Author: Paul E. McKenney Date: Mon Apr 13 21:31:16 2009 -0700 rcu: Make hierarchical RCU less IPI-happy This patch fixes a hierarchical-RCU performance bug located by Anton Blanchard. The problem stems from a misguided attempt to provide a work-around for jiffies-counter failure. This work-around uses a per-CPU n_rcu_pending counter, which is incremented on each call to rcu_pending(), which in turn is called from each scheduling-clock interrupt. Each CPU then treats this counter as a surrogate for the jiffies counter, so that if the jiffies counter fails to advance, the per-CPU n_rcu_pending counter will cause RCU to invoke force_quiescent_state(), which in turn will (among other things) send resched IPIs to CPUs that have thus far failed to pass through an RCU quiescent state. Unfortunately, each CPU resets only its own counter after sending a batch of IPIs. This means that the other CPUs will also (needlessly) send -another- round of IPIs, for a full N-squared set of IPIs in the worst case every three scheduler-clock ticks until the grace period finally ends. It is not reasonable for a given CPU to reset each and every n_rcu_pending for all the other CPUs, so this patch instead simply disables the jiffies-counter "training wheels", thus eliminating the excessive IPIs. Note that the jiffies-counter IPIs do not have this problem due to the fact that the jiffies counter is global, so that the CPU sending the IPIs can easily reset things, thus preventing the other CPUs from sending redundant IPIs. Note also that the n_rcu_pending counter remains, as it will continue to be used for tracing. It may also see use to update the jiffies counter, should an appropriate kick-the-jiffies-counter API appear. Located-by: Anton Blanchard Tested-by: Anton Blanchard Signed-off-by: Paul E. McKenney Cc: anton@samba.org Cc: akpm@linux-foundation.org Cc: dipankar@in.ibm.com Cc: manfred@colorfullife.com Cc: cl@linux-foundation.org Cc: josht@linux.vnet.ibm.com Cc: schamp@sgi.com Cc: niv@us.ibm.com Cc: dvhltc@us.ibm.com Cc: ego@in.ibm.com Cc: laijs@cn.fujitsu.com Cc: rostedt@goodmis.org Cc: peterz@infradead.org Cc: penberg@cs.helsinki.fi Cc: andi@firstfloor.org Cc: "Paul E. McKenney" LKML-Reference: <12396834793575-git-send-email-> Signed-off-by: Ingo Molnar commit ce8632ba6b3ed0bf2efa98672e2808de34250389 Author: Yang Hongyang Date: Mon Apr 13 15:51:00 2009 +0000 ipv6:remove useless check After switch (rthdr->type) {...},the check below is completely useless.Because: if the type is 2,then hdrlen must be 2 and segments_left must be 1,clearly the check is redundant;if the type is not 2,then goto sticky_done,the check is useless too. Signed-off-by: Yang Hongyang Reviewed-by: Shan Wei Signed-off-by: David S. Miller commit 0eca93bcf73e5939053a94f7c48f8d6fe6199e00 Author: Herbert Xu Date: Tue Apr 14 02:09:43 2009 -0700 tun: Fix crash with non-GSO users When I made the tun driver use non-linear packets as the preferred option, it broke non-GSO users because they would end up allocating a completely non-linear packet, which triggers a crash when we call eth_type_trans. This patch reverts non-GSO users to using linear packets and adds a check to ensure that GSO users can't cause crashes in the same way. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 86bcebafc5e7f5163ccf828792fe694b112ed6fa Author: Ilpo Järvinen Date: Tue Apr 14 02:08:53 2009 -0700 tcp: fix >2 iw selection A long-standing feature in tcp_init_metrics() is such that any of its goto reset prevents call to tcp_init_cwnd(). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit acb180b0e335ad88acfed6c8a33e39c05b95dc49 Author: NeilBrown Date: Tue Apr 14 16:28:34 2009 +1000 md: improve usefulness and accuracy of sysfs file md/sync_completed. The sync_completed file reports how much of a resync (or recovery or reshape) has been completed. However due to the possibility of out-of-order completion of writes, it is not certain to be accurate. We have an internal value - mddev->curr_resync_completed - which is an accurate value (though it might not always be quite so uptodate). So: - make curr_resync_completed be uptodate a little more often, particularly when raid5 reshape updates status in the metadata - report curr_resync_completed in the sysfs file - allow poll/select to report all updates to md/sync_completed. This makes sync_completed completed usable by any external metadata handler that wants to record this status information in its metadata. Signed-off-by: NeilBrown commit 6d56e278444bc8323b1bcfcada126b8e4dbba0f4 Author: NeilBrown Date: Tue Apr 14 12:01:57 2009 +1000 md: allow setting newly added device to 'in_sync' via sysfs. When adding devices to an active array via sysfs, there is currently no way to mark a device as 'in-sync' which is useful when incrementally assembling an array. So add that option. Signed-off-by: NeilBrown commit 63fe08177f92ce21929df8af6361491b98ad12cd Author: Christoph Hellwig Date: Tue Apr 14 12:01:53 2009 +1000 md: tiny md.h cleanups - update inclusion guard and make sure it covers the whole file - remove superflous #ifdef CONFIG_BLOCK - make sure all required headers are included so that new users aren't required to include others before Signed-off-by: Christoph Hellwig Signed-off-by: NeilBrown commit 1a31f2042e938f1b467aa3d807cc5666352bf8a3 Author: Stephen Hemminger Date: Mon Apr 13 18:12:57 2009 -0700 netsched: Allow meta match on vlan tag on receive When vlan acceleration is used on receive, the vlan tag is maintained outside of the skb data. The existing vlan tag match only works on TX path because it uses vlan_get_tag which tests for VLAN_HW_TX_ACCEL. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ff6c6fed3a8ab9b0a7b02574e095e905e89421d9 Author: Jaswinder Singh Rajput Date: Sun Apr 12 23:24:21 2009 +0530 x86: pci-swiotlb.c swiotlb_dma_ops should be static Impact: reduce kernel size a bit, address sparse warning Addresses the problem pointed out by this sparse warning: arch/x86/kernel/pci-swiotlb.c:53:20: warning: symbol 'swiotlb_dma_ops' was not declared. Should it be static? For x86: swiotlb_dma_ops can be static, because it's not used outside of pci-swiotlb.c Signed-off-by: Jaswinder Singh Rajput Acked-by: FUJITA Tomonori LKML-Reference: <1239558861.3938.2.camel@localhost.localdomain> Signed-off-by: Ingo Molnar commit 557055bebe9212dfa6b9f5df811dfd0dac77ec55 Author: Zhaolei Date: Mon Apr 13 16:02:34 2009 +0800 tracing: Fix branch tracer header Before patch: # tracer: branch # # TASK-PID CPU# TIMESTAMP FUNCTION # | | | | | <...>-2981 [000] 24008.872738: [ ok ] trace_irq_handler_exit:irq_event_types.h:41 <...>-2981 [000] 24008.872742: [ ok ] note_interrupt:spurious.c:229 ... After patch: # tracer: branch # # TASK-PID CPU# TIMESTAMP CORRECT FUNC:FILE:LINE # | | | | | | <...>-2985 [000] 26329.142970: [ ok ] slab_free:slub.c:1776 <...>-2985 [000] 26329.142972: [ ok ] trace_kmem_cache_free:kmem_event_types.h:191 ... Signed-off-by: Zhao Lei Acked-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Tom Zanussi LKML-Reference: <49E2F19A.3040006@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 132380a06b24704fd6c9be55c44d4ef3972cead2 Author: Lai Jiangshan Date: Thu Apr 2 14:18:25 2009 +0800 tracing, sched: mark get_parent_ip() notrace Impact: remove overly redundant tracing entries When tracer is "function" or "function_graph", way too much "get_parent_ip" entries are recorded in ring_buffer. Signed-off-by: Lai Jiangshan Acked-by: Frederic Weisbecker Acked-by: Steven Rostedt LKML-Reference: <49D458B1.5000703@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 1db9e29bb0ff3c9366e8a50fb09ca8dbc364bfd6 Author: Herbert Xu Date: Mon Apr 13 04:41:01 2009 +0000 gro: Normalise skb before bypassing GRO on netpoll VLAN path Hi: gro: Normalise skb before bypassing GRO on netpoll VLAN path When we detect netpoll RX on the GRO VLAN path we bail out and call the normal VLAN receive handler. However, the packet needs to be normalised by calling eth_type_trans since that's what the normal path expects (normally the GRO path does the fixup). This patch adds the necessary call to vlan_gro_frags. Signed-off-by: Herbert Xu Thanks, Signed-off-by: David S. Miller commit 03a980d162eb48a79ce21d47f45b9ec7d9db20e9 Author: Ajit Khaparde Date: Mon Apr 13 15:41:50 2009 -0700 be2net: fix for default setting of pause auto-negotiation This patch fixes the default value of pause auto-negotiation supported by PCS. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit a95c2a3b9d6615ef6fad69fbb787a208ad6506b3 Author: Alexander Beregalov Date: Sat Apr 11 07:45:55 2009 +0000 eth_v10: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 2b1425421212e38c7dade357abaf8804fe236ade Author: Alexander Beregalov Date: Sat Apr 11 07:44:55 2009 +0000 ioc3-eth: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 9b6bfecd6556b9844a70147fe94dd86bb00aee97 Author: Alexander Beregalov Date: Sat Apr 11 07:44:06 2009 +0000 isa-skeleton: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit d0174aea3ee8d51a82b5793c3a177efff89121fa Author: Alexander Beregalov Date: Sat Apr 11 07:43:11 2009 +0000 mac89x0: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 5f1fa992382cf8bb82002aaf19fa03bf67330254 Author: Alexander Beregalov Date: Sat Apr 11 07:42:26 2009 +0000 macb: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit c6e6d8525c415736d961a15c449d8c98cb7562d4 Author: Alexander Beregalov Date: Sat Apr 11 07:41:28 2009 +0000 macsonic: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit ebf84eaa927be41a440fd4c8f81e1844922bc0b2 Author: Alexander Beregalov Date: Sat Apr 11 07:40:49 2009 +0000 sh_eth: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 7e4fdcb99cd578c800fb7d6c298950a2938f9ca6 Author: Alexander Beregalov Date: Sat Apr 11 07:39:58 2009 +0000 sun3_82586: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 5a1c28b3e4aa0ac755d73363fd1c84c0063c06be Author: Alexander Beregalov Date: Sat Apr 11 07:38:54 2009 +0000 tc35815: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 80ef1fc82e3feb541f9645322eab7afa778cce98 Author: Alexander Beregalov Date: Sat Apr 11 07:37:59 2009 +0000 tsi108_eth: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit ccd97bb01c7404ee000bb0627d1864b84fc9d904 Author: Alexander Beregalov Date: Sat Apr 11 07:30:19 2009 +0000 xtsonic: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit dcd07be3ffab7d20f4d498369e7526f6f4945257 Author: Anatolij Gustschin Date: Tue Apr 7 02:01:43 2009 +0000 phylib: Add interrupt source check function to M88E1121R driver Add did_interrupt() function to check if a PHY port really caused an interrupt. This is needed in the case of shared PHY interrupt pin configuration to stop interrupt event processing for PHY ports which didn't cause an interrupt. Signed-off-by: Anatolij Gustschin Signed-off-by: David S. Miller commit a8729eb302a5b5da8b0b4d29582c42648a2e0f12 Author: Anatolij Gustschin Date: Tue Apr 7 02:01:42 2009 +0000 phylib: Allow early-out in phy_change Marvell 88E1121R Dual PHY device can be hardware-configured to use shared interrupt pin for both PHY ports. For such PHY configurations using shared PHY interrupt phy_interrupt() handler will also schedule a work for PHY port which didn't cause an interrupt. This patch adds a possibility for PHY drivers to provide did_interrupt() function which reports if the PHY (or a PHY port in a multi-PHY device) generated an interrupt. This function is called in phy_change() as phy_change() shouldn't proceed if it is invoked for a PHY which didn't cause an interrupt. So check for interrupt originator in phy_change() to allow early-out. Signed-off-by: Anatolij Gustschin Signed-off-by: David S. Miller commit 140bc92903287cff4545e358c1651e4b7312cbd3 Author: Sergei Poselenov Date: Tue Apr 7 02:01:41 2009 +0000 phylib: Basic support for the M88E1121R Marvell chip Add support for the Marvell M88E1121R Dual GigE PHY Signed-off-by: Yuri Tikhonov Signed-off-by: Sergei Poselenov Signed-off-by: Anatolij Gustschin Signed-off-by: David S. Miller commit 83400207a07584539366f6859362db6872809a12 Merge: 0d489ff... 80a04d3... Author: David S. Miller Date: Mon Apr 13 14:41:05 2009 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: MAINTAINERS commit a3d03ecaf9fe722bf96e4ef4a2f5e42ef652ddeb Author: Zhaolei Date: Mon Apr 13 15:23:53 2009 +0800 tracing: Fix power tracer header Before patch: # tracer: power # # TASK-PID CPU# TIMESTAMP FUNCTION # | | | | | [ 676.875865889] CSTATE: Going to C1 on cpu 0 for 0.005911463 [ 676.882938805] CSTATE: Going to C1 on cpu 0 for 0.104796532 ... After patch: # tracer: power # # TIMESTAMP STATE EVENT # | | | [ 676.875865889] CSTATE: Going to C1 on cpu 0 for 0.005911463 [ 676.882938805] CSTATE: Going to C1 on cpu 0 for 0.104796532 ... v2: Use seq_puts instead of seq_printf Signed-off-by: Zhao Lei Cc: Arjan van de Ven Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Tom Zanussi LKML-Reference: <49E2E889.5000903@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 Author: James Bottomley Date: Mon Apr 13 14:31:51 2009 -0700 tg3: fix big endian MAC address collection failure We noticed on parisc that our broadcoms all swapped MAC addresses going from 2.6.29 to 2.6.30-rc1: Apr 11 07:48:24 ion kernel: eth0: Tigon3 [partno(BCM95700A6) rev 0105] (PCI:66MHz:64-bit) MAC address 00:30:6e:4b:15:59 Apr 13 07:34:34 ion kernel: eth0: Tigon3 [partno(BCM95700A6) rev 0105] (PCI:66MHz:64-bit) MAC address 00:00:59:15:4b:6e The problem patch is: commit 6d348f2c1e0bb1cf7a494b51fc921095ead3f6ae Author: Matt Carlson Date: Wed Feb 25 14:25:52 2009 +0000 tg3: Eliminate tg3_nvram_read_swab() With the root cause being the use of memcpy to set the mac address: memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2); memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo)); This might work on little endian machines, but it can't on big endian ones. You have to use the original setting mechanism to be correct on all architectures. The attached patch fixes parisc. Signed-off-by: James Bottomley Signed-off-by: David S. Miller commit da2436a23c038055b1da6fe30b6ea2886b1e07b0 Author: Jaroslav Kysela Date: Mon Apr 13 21:31:25 2009 +0200 [ALSA] intel8x0: do not use zero value from PICB register It seems that the zero value from the PICB (position in current buffer) register is not reliable. Use jiffies to correct returned value from the ring buffer pointer callback. Signed-off-by: Jaroslav Kysela commit 920e4ae31cb113328e617f4a0663fb17d7b09124 Author: Jaroslav Kysela Date: Mon Apr 13 20:45:42 2009 +0200 [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable - use monotonic posix clock to measure time - try to avoid reading zero from PICB (position in current buffer) register - show also measured samples - when clock is near 41000 or 44100, use exactly these values (they appears to be reference clocks for hardware manufacturers) Signed-off-by: Jaroslav Kysela commit 5a31bec014449dc9ca994e4c1dbf2802b7ca458a Author: Brian Haley Date: Mon Apr 13 00:11:30 2009 -0700 Bonding: fix zero address hole bug in arp_ip_target list Fix a zero address hole bug in the bonding arp_ip_target list that was causing the bond to ignore ARP replies (bugz 13006). Instead of just setting the array entry to zero, we now copy any additional entries down one slot, putting the zero entry at the end. With this change we can now have all the loops that walk the array stop when they hit a zero since there will be no addresses after it. Changes are based in part on code fragment provided in kernel: bugzilla 13006: http://bugzilla.kernel.org/show_bug.cgi?id=13006 by Steve Howard Signed-off-by: Brian Haley Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit efb12cd20ace78aca03304f356f9c9c0c9ca3f66 Author: Marek Vasut Date: Sun Apr 12 16:37:23 2009 +0200 [ARM] pxa: PalmTX and PalmT5 USB fixes Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 918c71c0ff302637b745104e8ffe6142a64f514c Author: Marek Vasut Date: Fri Apr 10 10:42:50 2009 +0800 [ARM] pxa: add missing declaration of pxa26x_init_irq() Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 2b2562d38130c769ee59948ba7e1f93d3787ca43 Author: Daniel Ribeiro Date: Wed Apr 8 22:48:03 2009 -0300 [ARM] pxa: fix typo of cs_deassert() in pxa2xx-spi.c Signed-off-by: Daniel Ribeiro Signed-off-by: Eric Miao commit 4f295232bef43adf648876a0cd950faa99daa5f1 Author: Mark Brown Date: Sat Apr 11 16:50:17 2009 -0700 Input: wm97xx - don't specify IRQF_SAMPLE_RANDOM The input core will add entropy to the pool so this flag is not needed. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit fd746d540abf8c686f5f868ae62112692e684088 Author: Eric Miao Date: Sat Apr 11 16:54:59 2009 -0700 Input: ads7846 - introduce platform specific way to synchronize sampling Noises can be introduced when LCD signals are being driven, some platforms provide a signal to assist the synchronization of this sampling procedure. Signed-off-by: Eric Miao Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit b79e83bdd961ec9b862191c0df51aaeb3cb85664 Author: Arjan van de Ven Date: Sat Apr 11 16:50:15 2009 -0700 Input: remove unnecessary synchronize_rcu() call There is no need to issue serialize_rcu() after adding a new handle to the list of handles associated with the device because new events will "see" the new handle in the list immediately. Remove it so we can boot a little bit faster. Signed-off-by: Dmitry Torokhov commit 7c46e23681ebca23249806b379125cf72b7435b6 Author: Arjan van de Ven Date: Sat Apr 11 16:50:13 2009 -0700 Input: i8042 - add a DMI table for the i8042.reset option There are several DMI tables in the i8042 (keyboard) driver already, but not one for the i8042.reset option. This patch adds such an option. Two users for this table are added as well, the MSI Wind U-100 and the LG X110. The MSI Wind also needs to be in the "don't trust the pnp data" for the touchpad to work on my machine. Signed-off-by: Arjan van de Ven Signed-off-by: Dmitry Torokhov commit 5ea2fc6491631d2c3f346dcb0d9d6edd44ccf4cd Author: Arjan van de Ven Date: Thu Apr 9 11:36:50 2009 -0700 Input: i8042 - introduce a tougher reset Some touchpads don't reset right the first time (MSI Wind U-100 for example). This patch will retry the reset up to 5 times. In addition, on x86, we don't fail entire i8042 initialization if controller reset fails in hope that keyboard port will still be functional and user will still get a working keyboard. This is especially important on netbooks. Signed-off-by: Arjan van de Ven Signed-off-by: Dmitry Torokhov commit 9ca046d57412361ac4d220b96fed7fb932616d85 Author: Alexander Duyck Date: Thu Apr 9 22:49:39 2009 +0000 igb: do not check for vf_data if we didn't enable vfs The driver is currently dumping a message in the log about failing to allocate vf data when max_vfs is equal to 0. This change makes it so the error message is only displayed if we set max_vfs to a non zero value. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2d165771062cae75de26fe7bc7cb2d937ff6f1b4 Author: Alexander Duyck Date: Thu Apr 9 22:49:20 2009 +0000 igbvf: fix unused external references The igbvbf driver exposed several unused extrnal references due to the fact that code was copied from igb and then some functionality was removed. This changes that so that unused functions are either removed or made static. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ff6f63dde73e0673c09cca22c5005380dfcc79a4 Author: Alexander Duyck Date: Thu Apr 9 22:49:02 2009 +0000 igb: fix unused external references introduced with sr-iov changes There were several unused external references added with the sr-iov enablement changes. This patch changes all those references to static local references. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fe146be67bd73aa35db032fe3481ca20efe17fcc Author: Alexander Beregalov Date: Thu Apr 9 17:29:38 2009 +0000 ether3: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 0b179e315ad61e8969b984a4ab4acc65e5ecb506 Author: Alexander Beregalov Date: Thu Apr 9 17:28:55 2009 +0000 ether1: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 9aa7b30ce36f3bfa03b878296d55e0551682de15 Author: Alexander Beregalov Date: Thu Apr 9 17:28:06 2009 +0000 ep93xx_eth: convert to net_device_ops Also make ep93xx_dev_alloc static. Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 531c6804a4299663c7fa798ebfa9dbf843e91e0e Author: Alexander Beregalov Date: Thu Apr 9 17:27:00 2009 +0000 at91_ether: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit fefbfb1e09cbcd5ad6fd595c52aa8f01dc4e1126 Author: Alexander Beregalov Date: Thu Apr 9 17:25:25 2009 +0000 am79c961a: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit f97b1f2a416045c7a9c7e62d575a809bc32c0f1e Author: Alexander Beregalov Date: Fri Apr 10 07:59:24 2009 +0000 ariadne: convert to net_device_ops On Fri, Apr 10, 2009 at 06:13:54PM +0200, Jan Ceuleers wrote: > Alexander Beregalov wrote: > > > > Signed-off-by: Alexander Beregalov > ... > > @@ -197,13 +209,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, > > dev->mem_start = ZTWO_VADDR(mem_start); > > dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE; > > > > - dev->open = &ariadne_open; > > - dev->stop = &ariadne_close; > > - dev->hard_start_xmit = &ariadne_start_xmit; > > - dev->tx_timeout = &ariadne_tx_timeout; > > + dev->netdev_ops = &ariadne_netdev_ops;; > > We don't really need two semicolons there but I suppose that they won't > hurt. Thanks! David, please apply this patch Signed-off-by: David S. Miller commit 15efc02b2625f1bb2b1970b1f4bc777590b9ed73 Author: Alexander Beregalov Date: Thu Apr 9 15:56:14 2009 +0000 ibm_newemac: convert to netdev_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 8c02acd79867077508ffa5ed4eb6c8c79df73a96 Author: Alexander Beregalov Date: Thu Apr 9 04:46:53 2009 +0000 fs_enet: convert to netdev_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 499923c7a3254971873e55a1690d07d3700eea47 Author: Vlad Yasevich Date: Thu Apr 9 17:37:33 2009 +0000 ipv6: Fix NULL pointer dereference with time-wait sockets Commit b2f5e7cd3dee2ed721bf0675e1a1ddebb849aee6 (ipv6: Fix conflict resolutions during ipv6 binding) introduced a regression where time-wait sockets were not treated correctly. This resulted in the following: BUG: unable to handle kernel NULL pointer dereference at 0000000000000062 IP: [] ipv4_rcv_saddr_equal+0x61/0x70 ... Call Trace: [] ipv6_rcv_saddr_equal+0x1bb/0x250 [ipv6] [] inet6_csk_bind_conflict+0x88/0xd0 [ipv6] [] inet_csk_get_port+0x1ee/0x400 [] inet6_bind+0x1cf/0x3a0 [ipv6] [] ? sockfd_lookup_light+0x3c/0xd0 [] sys_bind+0x89/0x100 [] ? trace_hardirqs_on_thunk+0x3a/0x3c [] system_call_fastpath+0x16/0x1b Tested-by: Brian Haley Tested-by: Ed Tomlinson Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 48f6e8990858fc9a0ca7d3c9347e6774eb941dba Author: Ben Hutchings Date: Thu Apr 9 05:47:41 2009 +0000 net: Update maintainers Essentially all networking changes go through David Miller. Jeff Garzik no longer handles device drivers separately. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3ca17dfbdcaf3def764e72751619b1cc2c9760b9 Author: Séguier Régis Date: Thu Apr 9 01:33:57 2009 +0000 via-velocity : fix compilation warning. Fix this warning: drivers/net/via-velocity.c:1924: warning: passing argument 2 of 'request_irq' from incompatible pointer type Signed-off-by: Seguier Regis Signed-off-by: David S. Miller commit 57401d5e36d2966247e9c06b94f5133609c8da21 Author: Dan Carpenter Date: Sat Apr 11 01:52:29 2009 -0700 phy: error handling for platform_device_register_simple() platform_device_register_simple() returns ERR_PTR() and not NULL. Found by smatch (http://repo.or.cz/w/smatch.git). Compile tested. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 3384901f1b1af676ccb9d75aa23a568c294c527b Author: Wei Yongjun Date: Wed Apr 8 21:27:28 2009 +0000 tr: fix leakage of device in net/802/tr.c Add dev_put() after dev_get_by_index() to avoid leakage of device. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit d6c519e12984d26d96b91e4482280acbba0e0a22 Author: Alexander Duyck Date: Wed Apr 8 13:20:50 2009 +0000 ixgbe: only allow WOL for 82599 KX4 NIC All NICs were reporting WOL support when only the KX4 NIC is capable of supporting WOL. This patch adds a function to check for and exclude all non-WOL capable nics from enabling WOL in ethtool. Signed-off-by: Alexander Duyck Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 87c1201708381c2791caa78a2caf217778633277 Author: PJ Waskiewicz Date: Wed Apr 8 13:20:31 2009 +0000 ixgbe: Move the LED blink code to common, since 82599 also uses it The LED blink code is common for 82599 as well. It should be moved to ixgbe_common.c so both devices can use it, and not have it duplicated. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit d543103a0c75edc0a7a08dfd796de67466a15dfb Author: Alexander Duyck Date: Wed Apr 8 13:15:22 2009 +0000 net: netif_device_attach/detach should start/stop all queues Currently netif_device_attach/detach are only stopping one queue. They should be starting and stopping all the queues on a given device. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0c3c8a18361a636069f5a5d9d0d0f9c2124e6b94 Author: Suresh Siddha Date: Thu Apr 9 14:26:52 2009 -0700 x86, PAT: Remove duplicate memtype reserve in devmem mmap /dev/mem mmap code was doing memtype reserve/free for a while now. Recently we added memtype tracking in remap_pfn_range, and /dev/mem mmap uses it indirectly. So, we don't need seperate tracking in /dev/mem code any more. That means another ~100 lines of code removed :-). Signed-off-by: Suresh Siddha Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20090409212709.085210000@intel.com> Signed-off-by: Ingo Molnar commit b6ff32d9aaeeeecf98f9a852d715569183585312 Author: Suresh Siddha Date: Thu Apr 9 14:26:51 2009 -0700 x86, PAT: Consolidate code in pat_x_mtrr_type() and reserve_memtype() Fix pat_x_mtrr_type() to use UC_MINUS when the mtrr type return UC. This is to be consistent with ioremap() and ioremap_nocache() which uses UC_MINUS. Consolidate the code such that reserve_memtype() also uses pat_x_mtrr_type() when the caller doesn't specify any special attribute (non WB attribute). Signed-off-by: Suresh Siddha Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20090409212708.939936000@intel.com> Signed-off-by: Ingo Molnar commit 3869c4aa18835c8c61b44bd0f3ace36e9d3b5bd0 Author: venkatesh.pallipadi@intel.com Date: Thu Apr 9 14:26:50 2009 -0700 x86, PAT: Changing memtype to WC ensuring no WB alias As per SDM, there should not be any aliasing of a WC with any cacheable type across CPUs. That is if one CPU is changing the identity map memtype to _WC, no other CPU at the time of this change should not have a TLB for this page that carries a WB attribute. SDM suggests to make the page not present. But for that we will have to handle any page faults that can potentially happen due to these pages being not present. Other way to deal with this without having any WB mapping is to change the page first to UC and then to WC. This ensures that we meet the SDM requirement of no cacheable alais to WC page. This also has same or lower overhead than marking the page not present and making it present later. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha LKML-Reference: <20090409212708.797481000@intel.com> Signed-off-by: Ingo Molnar commit 9fa3ab390abfc8b49fc0dd7c845b0ad224ec429f Author: venkatesh.pallipadi@intel.com Date: Thu Apr 9 14:26:49 2009 -0700 x86, PAT: Handle faults cleanly in set_memory_ APIs Handle faults and do proper cleanups in set_memory_*() functions. In some cases, these functions were not doing proper free on failure paths. With the changes to tracking memtype of RAM pages in struct page instead of pat list, we do not need the changes in commits c5e147. This patch reverts that change. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha LKML-Reference: <20090409212708.653222000@intel.com> Signed-off-by: Ingo Molnar commit a5593e0b329a14dea41ea173380dbf1533de2bd2 Author: venkatesh.pallipadi@intel.com Date: Thu Apr 9 14:26:48 2009 -0700 x86, PAT: Change order of cpa and free in set_memory_wb To be free of aliasing due to races, set_memory_* interfaces should follow ordering of reserving, changing memtype to UC/WC, changing memtype back to WB followed by free. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Suresh Siddha LKML-Reference: <20090409212708.512280000@intel.com> Signed-off-by: Ingo Molnar commit 43a432b1559798d33970261f710030f787770231 Author: Suresh Siddha Date: Thu Apr 9 14:26:47 2009 -0700 x86, CPA: Change idmap attribute before ioremap attribute setup Change the identity mapping with the requested attribute first, before we setup the virtual memory mapping with the new requested attribute. This makes sure that there is no window when identity map'ed attribute may disagree with ioremap range on the attribute type. This also avoids doing cpa on the ioremap'ed address twice (first in ioremap_page_range and then in ioremap_change_attr using vaddr), and should improve ioremap performance a bit. Signed-off-by: Suresh Siddha Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20090409212708.373330000@intel.com> Signed-off-by: Ingo Molnar commit bbf6ad1399e9516b0a95de3ad58ffbaed670e4cc Author: Jaroslav Kysela Date: Fri Apr 10 12:28:58 2009 +0200 [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies Some drivers like Intel8x0 or Intel HDA are broken for some hardware variants. This patch adds more strict buffer position checks based on jiffies when internal hw_ptr is updated. Enable xrun_debug to see mangling of wrong positions. As a side effect, the hw_ptr interrupt update routine might do slightly better job when many interrupts are lost. Signed-off-by: Jaroslav Kysela commit fa00e046b41663cbda9b1affc0594669e5f14219 Author: Jaroslav Kysela Date: Fri Apr 10 12:20:45 2009 +0200 [ALSA] hda_intel: fix unexpected ring buffer positions I found two issues with ICH7-M (it should be related to other HDA chipsets as well): - the ring buffer position is not reset when stream restarts (after xrun) - solved by moving azx_stream_reset() call from open() to prepare() callback and reset posbuf to zero (it might be filled with hw later than position() callback is called) - irq_ignore flag should be set also when ring buffer memory area is not changed in prepare() callback - this patch replaces irq_ignore with more universal check based on jiffies clock Signed-off-by: Jaroslav Kysela commit 6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 Author: Mark Brown Date: Thu Apr 9 16:40:41 2009 +0100 ASoC: Disable S3C64xx support in Kconfig Due to the process and communications issues with the 2.6.30 S3C platform merges none of the underlying arch/arm code for S3C64xx audio support made it into mainline, rendering the drivers useless. Disable them in Kconfig to avoid user confusion - users patching in the required support can always reenable this too. Signed-off-by: Mark Brown commit fd2bd98818fc1c9672241b845344cbfbb159a4f9 Author: Eric Miao Date: Thu Apr 9 14:13:07 2009 +0800 ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h Signed-off-by: Eric Miao Cc: Philipp Zabel Signed-off-by: Mark Brown commit 6c2da9c2182fe64b1443a75efc09e493923e86b0 Author: David S. Miller Date: Thu Apr 9 01:09:33 2009 -0700 forcedeth: Use napi_complete() not __napi_complete(). It's not enough that forcedeth's interrupts are disabled, local cpu interrupts have to unconditionally be off when we remove the device from the poll list. Based upon a crash report from Alexander Beregalov : WARNING: at lib/list_debug.c:30 __list_add+0x89/0x90() Hardware name: list_add corruption. prev->next should be next (c06ea834), but was f70244c8. (prev=c06ea834). Modules linked in: w83627hf hwmon_vid i2c_nforce2 Pid: 1436, comm: portageq Not tainted 2.6.30-rc1 #1 Call Trace: [] warn_slowpath+0x73/0xd0 [] ? __kfree_skb+0x38/0x90 [] ? tcp_data_snd_check+0x26/0xe0 [] ? tcp_rcv_established+0x2bf/0x5e0 [] ? tcp_v4_rcv+0x47a/0x610 [] ? print_lock_contention_bug+0x1d/0x110 [] ? _spin_unlock+0x27/0x50 [] ? tcp_v4_rcv+0x54b/0x610 [] __list_add+0x89/0x90 [] __napi_schedule+0x29/0x60 [] e1000_intr+0xbd/0x1a0 [] handle_IRQ_event+0x3e/0x120 [] handle_fasteoi_irq+0x60/0xd0 [] handle_irq+0x34/0x60 [] ? rcu_irq_enter+0x8/0x40 [] do_IRQ+0x39/0xa0 [] ? skb_release_head_state+0x2c/0x60 [] common_interrupt+0x2e/0x34 [] ? list_del+0x21/0x90 [] ? trace_hardirqs_on+0xb/0x10 [] __napi_complete+0x1a/0x30 [] nv_napi_poll+0xd1/0x5c0 [] ? trace_hardirqs_on+0xb/0x10 [] net_rx_action+0x106/0x1b0 [] __do_softirq+0x6f/0x100 [] ? _spin_unlock+0x27/0x50 [] ? handle_fasteoi_irq+0x88/0xd0 [] do_softirq+0x5d/0x70 [] irq_exit+0x7d/0xa0 [] do_IRQ+0x42/0xa0 [] ? do_softirq+0x47/0x70 [] common_interrupt+0x2e/0x34 Signed-off-by: David S. Miller commit 0e983d3c38f87d405beb1ebbe2fea11eb01cc4c6 Author: Eric Miao Date: Thu Apr 9 14:05:02 2009 +0800 [ARM] pxa/colibri: fix missing variable name in inline functions Even they are empty inline functions, the compiler still complains about the missing variable names. Signed-off-by: Eric Miao Cc: Daniel Mack commit 54c28d294c658abb6d6430a49fda230fdfd601c8 Author: Jack Steiner Date: Fri Apr 3 15:39:42 2009 -0500 x86, uv: add Kconfig dependency on NUMA for UV systems Impact: build fix Add Kconfig dependency on NUMA for enabling UV. Although it might be possible to configure non-NUMA UV systems, they are unsupported and not interesting. Much of the infrastructure for UV requires NUMA support. Signed-off-by: Jack Steiner LKML-Reference: <20090403203942.GA20137@sgi.com> Signed-off-by: Ingo Molnar commit 06aa05b307e8efbc278f201198e7cdf3877bc5c2 Author: Russ Anderson Date: Fri Apr 3 17:24:23 2009 -0500 x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems /sys/firmware/sgi_uv should only be created on uv systems. Signed-off-by: Russ Anderson LKML-Reference: <20090403222423.GA28546@sgi.com> Signed-off-by: Ingo Molnar commit 8d82ffd15e59febf2c597067a777526958b7f769 Author: Wolfgang Grandegger Date: Tue Apr 7 10:20:56 2009 +0200 powerpc: Document new FSL I2C bindings and cleanup This patch documents the new bindings for the MPC I2C bus driver. Furthermore, it removes obsolete FSL device related definitions for I2C. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit 52ce67f157f8c5623524dc6c5b2ddd6a0d2aa774 Author: Kumar Gala Date: Tue Apr 7 21:58:07 2009 -0500 powerpc/mm: Fix compile warning arch/powerpc/mm/tlb_nohash.c: In function 'flush_tlb_mm': arch/powerpc/mm/tlb_nohash.c:128: warning: unused variable 'cpu_mask' Signed-off-by: Kumar Gala commit 54ca40dcb5b956c30495e8c7b73c9ad636fb58bd Author: Wolfgang Grandegger Date: Mon Mar 16 09:57:59 2009 +0100 powerpc/85xx: TQM8548: update defconfig Enable highmem support for the TQM8548-AG modules and NAND support for the TQM8548-BE modules. Furthermore disable USB, Wireless and IDE support because it's not available on the STK85xx starter kit. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit 655544c69c8d8bdc0c377ad1d30d147a5a28a1fb Author: Wolfgang Grandegger Date: Mon Mar 16 09:57:17 2009 +0100 powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3 For enet2 and enet3 the wrong phy-handles have been used in DTS files of the TQM8548 modules. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit 6467cae318ba8adaab37a82e8dd8af60ca9ed6e4 Author: Wolfgang Grandegger Date: Mon Mar 16 09:56:26 2009 +0100 powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes Commit 0f73a449a649acfca91404a98a35353a618b9555 added I2C device nodes for the LM75 thermal sensor on the TQM85xx modules, unfortunately with the wrong I2C address. The LM75s are located at address 0x48. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit e9965577406a2148ade97b5e0ce7c448b4ba4ef6 Author: Kumar Gala Date: Mon Apr 6 23:36:50 2009 -0500 powerpc: Add support for early tlbilx opcode During the ISA 2.06 development the opcode for tlbilx changed and some early implementations used to old opcode. Add support for a MMU_FTR fixup to deal with this. Signed-off-by: Kumar Gala commit 7281f5dc2c9582f3efaed9b367837ca6117d7b7f Author: Kumar Gala Date: Mon Apr 6 15:25:52 2009 -0500 powerpc: Fix tlbilx opcode The tlbilx opcode was not matching the Power ISA 2.06 arch spec. The old opcode was an early suggested opcode that changed during the 2.06 architecture process. Signed-off-by: Kumar Gala commit 6a891a24e4d0056c365a90ff2d71c38fd366b0d0 Author: Jack Steiner Date: Mon Mar 30 09:01:11 2009 -0500 x86, UV: Fix for nodes with memory and no cpus Fix initialization of UV blade information for systems that have nodes with memory but no cpus. Signed-off-by: Jack Steiner LKML-Reference: <20090330140111.GA18461@sgi.com> Signed-off-by: Ingo Molnar commit 1a544e659cbfce178395e9a090a47d1907d0cfa8 Author: Russ Anderson Date: Mon Mar 30 17:52:40 2009 -0500 x86, UV: system table in bios accessed after unmap Use the copy of UV system table in kernel memory, not the one in bios after unmapping. Signed-off-by: Russ Anderson LKML-Reference: <20090330225240.GA22776@sgi.com> Signed-off-by: Ingo Molnar commit c4c4688f72e638708e5f6b5c259699de82a36fec Author: Cliff Wickman Date: Fri Apr 3 08:34:32 2009 -0500 x86: UV BAU messaging timeouts This patch replaces a 'nop' uv_enable_timeouts() in the UV TLB shootdown code. (somehow, long ago that function got eviscerated) If any cpu in the destination node does not get interrupted by the message and post completion in a reasonable time the hardware should respond to the sender with an error. This function enables such timeouts. Tested on the UV hardware simulator. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar commit 9674f35b1ec17577163897f052f405c1e9e5893d Author: Cliff Wickman Date: Fri Apr 3 08:34:05 2009 -0500 x86: UV BAU and nodes with no memory This patch fixes BAU initialization for systems containing nodes with no memory and for systems with non-consecutive node numbers. Fixes and clarifies situations where pnode should be used instead of node id. Tested on the UV hardware simulator. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar