aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-30Revert "serial: 8250_pci: add support for another kind of NetMos Technology ↵Greg Kroah-Hartman1-4/+0
PCI 9835 Multi-I/O Controller" This reverts commit 8d2f8cd424ca0b99001f3ff4f5db87c4e525f366. As reported by Stefan, this device already works with the parport_serial driver, so the 8250_pci driver should not also try to grab it as well. Reported-by: Stefan Seyfried <[email protected]> Cc: Wang YanQing <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2013-06-30powerpc/eeh: Fix fetching bus for single-dev-PEGavin Shan1-1/+2
While running Linux as guest on top of phyp, we possiblly have PE that includes single PCI device. However, we didn't return its PCI bus correctly and it leads to failure on recovery from EEH errors for single-dev-PE. The patch fixes the issue. Cc: <[email protected]> # v3.7+ Cc: Steve Best <[email protected]> Signed-off-by: Gavin Shan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-06-29Merge branch 'merge' of ↵Linus Torvalds2-7/+14
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc fixes from Ben Herrenschmidt: "We discovered some breakage in our "EEH" (PCI Error Handling) code while doing error injection, due to a couple of regressions. One of them is due to a patch (37f02195bee9 "powerpc/pci: fix PCI-e devices rescan issue on powerpc platform") that, in hindsight, I shouldn't have merged considering that it caused more problems than it solved. Please pull those two fixes. One for a simple EEH address cache initialization issue. The other one is a patch from Guenter that I had originally planned to put in 3.11 but which happens to also fix that other regression (a kernel oops during EEH error handling and possibly hotplug). With those two, the couple of test machines I've hammered with error injection are remaining up now. EEH appears to still fail to recover on some devices, so there is another problem that Gavin is looking into but at least it's no longer crashing the kernel." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pci: Improve device hotplug initialization powerpc/eeh: Add eeh_dev to the cache during boot
2013-06-29ARM: dt: Only print warning, not WARN() on bad cpu map in device treeOlof Johansson1-2/+3
Due to recent changes and expecations of proper cpu bindings, there are now cases for many of the in-tree devicetrees where a WARN() will hit on boot due to badly formatted /cpus nodes. Downgrade this to a pr_warn() to be less alarmist, since it's not a new problem. Tested on Arndale, Cubox, Seaboard and Panda ES. Panda hits the WARN without this, the others do not. Acked-by: Russell King <[email protected]> Signed-off-by: Olof Johansson <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2013-06-30powerpc/pci: Improve device hotplug initializationGuenter Roeck1-5/+12
Commit 37f02195b (powerpc/pci: fix PCI-e devices rescan issue on powerpc platform) fixes a problem with interrupt and DMA initialization on hot plugged devices. With this commit, interrupt and DMA initialization for hot plugged devices is handled in the pci device enable function. This approach has a couple of drawbacks. First, it creates two code paths for device initialization, one for hot plugged devices and another for devices known during the initial PCI scan. Second, the initialization code for hot plugged devices is only called when the device is enabled, ie typically in the probe function. Also, the platform specific setup code is called each time pci_enable_device() is called, not only once during device discovery, meaning it is actually called multiple times, once for devices discovered during the initial scan and again each time a driver is re-loaded. The visible result is that interrupt pins are only assigned to hot plugged devices when the device driver is loaded. Effectively this changes the PCI probe API, since pci_dev->irq and the device's dma configuration will now only be valid after pci_enable() was called at least once. A more subtle change is that platform specific PCI device setup is moved from device discovery into the driver's probe function, more specifically into the pci_enable_device() call. To fix the inconsistencies, add new function pcibios_add_device. Call pcibios_setup_device from pcibios_setup_bus_devices if device setup is not complete, and from pcibios_add_device if bus setup is complete. With this change, device setup code is moved back into device initialization, and called exactly once for both static and hot plugged devices. [ This also fixes a regression introduced by the above patch which causes dev->irq to be overwritten under some cirumstances after MSIs have been enabled for the device which leads to crashes due to the MSI core "hijacking" dev->irq to store the base MSI number and not the LSI. --BenH ] Cc: Yuanquan Chen <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Hiroo Matsumoto <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-06-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds3-13/+14
Pull crypto fix from Herbert Xu: "This fixes a crash in the crypto layer exposed by an SCTP test tool" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algboss - Hold ref count on larval
2013-06-29Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds1-0/+5
Pull drm/qxl fix from Dave Airlie: "Bad me forgot an access check, possible security issue, but since this is the first kernel with it, should be fine to just put it in now" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/qxl: add missing access check for execbuffer ioctl
2013-06-29Fix: kernel/ptrace.c: ptrace_peek_siginfo() missing __put_user() validationMathieu Desnoyers1-9/+11
This __put_user() could be used by unprivileged processes to write into kernel memory. The issue here is that even if copy_siginfo_to_user() fails, the error code is not checked before __put_user() is executed. Luckily, ptrace_peek_siginfo() has been added within the 3.10-rc cycle, so it has not hit a stable release yet. Signed-off-by: Mathieu Desnoyers <[email protected]> Acked-by: Oleg Nesterov <[email protected]> Cc: Andrey Vagin <[email protected]> Cc: Roland McGrath <[email protected]> Cc: Paul McKenney <[email protected]> Cc: David Howells <[email protected]> Cc: Dave Jones <[email protected]> Cc: Pavel Emelyanov <[email protected]> Cc: Pedro Alves <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2013-06-29Merge branch 'for-linus' of ↵Linus Torvalds1-1/+5
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client Pull Ceph fix from Sage Weil: "This is a recently spotted regression in the snapshot behavior... It turns out several tests weren't being run in the nightlies so this took a while to spot" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: rbd: send snapshot context with writes
2013-06-29Merge branch 'for-linus' of ↵Linus Torvalds1-15/+39
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull ubifs fixes from Al Viro: "A couple of ubifs readdir/lseek race fixes. Stable fodder, really nasty..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: UBIFS: fix a horrid bug UBIFS: prepare to fix a horrid bug
2013-06-29Merge tag 'for-linus-20130628' of ↵Linus Torvalds2-34/+22
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300 Pull two MN10300 fixes from David Howells: "The first fixes a problem with passing arrays rather than pointers to get_user() where __typeof__ then wants to declare and initialise an array variable which gcc doesn't like. The second fixes a problem whereby putting mem=xxx into the kernel command line causes init=xxx to get an incorrect value." * tag 'for-linus-20130628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300: mn10300: Use early_param() to parse "mem=" parameter mn10300: Allow to pass array name to get_user()
2013-06-29Merge branch 'timers-urgent-for-linus' of ↵Linus Torvalds1-2/+5
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fix from Thomas Gleixner: "Correct an ordering issue in the tick broadcast code. I really wish we'd get compensation for pain and suffering for each line of code we write to work around dysfunctional timer hardware." * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick: Fix tick_broadcast_pending_mask not cleared
2013-06-29Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds1-7/+9
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fix from Ingo Molnar: "One more fix for a recently discovered bug" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Disable monitoring on setuid processes for regular users
2013-06-29[readdir] constify ->actorAl Viro9-68/+57
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] ->readdir() is goneAl Viro7-16/+13
everything's converted to ->iterate() Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert ecryptfsAl Viro1-20/+15
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert codaAl Viro1-58/+19
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert ocfs2Al Viro4-113/+61
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert fatfsAl Viro1-50/+54
... pox upon the idiotic ioctls; life would be much easier without those. Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert xfsAl Viro7-61/+44
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert btrfsAl Viro3-40/+21
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert hostfsAl Viro1-7/+6
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert afsAl Viro1-62/+37
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert ncpfsAl Viro1-43/+35
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert hfsplusAl Viro1-27/+23
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert hfsAl Viro1-26/+23
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert befsAl Viro1-18/+22
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert cifsAl Viro3-100/+82
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert freevxfsAl Viro1-32/+23
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert fuseAl Viro1-20/+17
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert hpfsAl Viro1-27/+29
Signed-off-by: Al Viro <[email protected]>
2013-06-29reiserfs: switch reiserfs_readdir_dentry to inodeAl Viro3-17/+15
... and clean the callers up a bit Signed-off-by: Al Viro <[email protected]>
2013-06-29reiserfs: is_privroot_deh() needs only directory inode, actuallyAl Viro1-5/+4
... and that - only to get the superblock. Privroot is a directory and we don't allow hardlinks to those... Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert reiserfsAl Viro3-23/+19
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert ntfsAl Viro1-57/+27
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert isofsAl Viro1-22/+20
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert jffs2Al Viro1-36/+16
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert f2fsAl Viro2-35/+22
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert 9pAl Viro1-44/+28
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert affsAl Viro1-45/+24
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert adfsAl Viro1-24/+18
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert logfsAl Viro1-34/+15
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert jfsAl Viro3-36/+31
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert cephAl Viro1-51/+48
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert nfsAl Viro1-26/+25
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert ext4Al Viro3-190/+134
and trim the living hell out bogosities in inline dir case Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert qnx6Al Viro1-17/+14
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert qnx4Al Viro1-35/+31
... and use strnlen() instead of strlen() - it's done on untrusted data, after all. Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert omfsAl Viro1-56/+38
Signed-off-by: Al Viro <[email protected]>
2013-06-29[readdir] convert nilfs2Al Viro1-30/+18
Signed-off-by: Al Viro <[email protected]>