summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2009-07-20Merge branch 'quilt/usb'Stephen Rothwell
2009-07-20Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: init/main.c
2009-07-20Merge commit 'sfi/sfi-test'Stephen Rothwell
2009-07-20Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S arch/x86/kernel/cpu/perf_counter.c drivers/cpufreq/cpufreq_ondemand.c
2009-07-20Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: drivers/oprofile/oprofile_stats.c include/linux/rcupdate.h
2009-07-20Merge commit 'fsnotify/for-next'Stephen Rothwell
2009-07-20Merge commit 'bluetooth/master'Stephen Rothwell
2009-07-20Merge commit 'suspend/linux-next'Stephen Rothwell
2009-07-20Merge commit 'trivial/for-next'Stephen Rothwell
2009-07-20Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-07-20Merge commit 'refs/next/20090713/ttydev'Stephen Rothwell
Conflicts: drivers/usb/serial/generic.c drivers/usb/serial/pl2303.c
2009-07-20Merge commit 'security-testing/next'Stephen Rothwell
2009-07-20Merge commit 'voltage/for-next'Stephen Rothwell
2009-07-20Merge commit 'drm/drm-next'Stephen Rothwell
2009-07-20Merge commit 'mfd/for-next'Stephen Rothwell
2009-07-20Merge commit 'slab/for-next'Stephen Rothwell
2009-07-20Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-07-20Merge commit 'battery/master'Stephen Rothwell
2009-07-20Merge commit 'block/for-next'Stephen Rothwell
2009-07-20Merge branch 'quilt/rr'Stephen Rothwell
2009-07-20Merge commit 'sound/for-next'Stephen Rothwell
2009-07-20Merge commit 'crypto/master'Stephen Rothwell
2009-07-20Merge commit 'net/master'Stephen Rothwell
2009-07-20Merge commit 'scsi/master'Stephen Rothwell
2009-07-20Merge commit 'kvm/master'Stephen Rothwell
2009-07-20Merge commit 'acpi/test'Stephen Rothwell
2009-07-20Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-07-20Merge branch 'quilt/i2c'Stephen Rothwell
2009-07-20Merge commit 'hid/for-next'Stephen Rothwell
2009-07-20Merge commit 'pci/linux-next'Stephen Rothwell
2009-07-20Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6'Stephen Rothwell
Conflicts: fs/reiserfs/journal.c fs/reiserfs/super.c
2009-07-20Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-07-20Merge commit 'fuse/for-next'Stephen Rothwell
2009-07-20Merge commit 'sh/master'Stephen Rothwell
2009-07-20Merge commit 'kbuild-current/master'Stephen Rothwell
2009-07-20Merge commit 'net-current/master'Stephen Rothwell
2009-07-20USB: isp1760: allow platform devices to customize devflagsMichael Hennerich
Platform device support was merged earlier, but support for boards to customize the devflags aspect of the controller was not. We want this on Blackfin systems to control the bus width, but might as well expose all of the fields while we're at it. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB: EHCI: Add Intel Moorestown EHCI controller HOSTPCx extensions and ↵Alek Du
support phy low power mode The Intel Moorestown EHCI controller supports non-standard HOSTPCx register extension. This register controls the LPM behaviour and controls the behaviour of each USB port. Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com> Signed-off-by: Alek Du <alek.du@intel.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Cc: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB: make intf.pm_usage an atomic_tAlan Stern
This patch (as1260) changes the pm_usage_cnt field in struct usb_interface from an int to an atomic_t. This is so that drivers can invoke the usb_autopm_get_interface_async() and usb_autopm_put_interface_async() routines without locking and without fear of corrupting the pm_usage_cnt value. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB: add API for userspace drivers to "claim" portsAlan Stern
This patch (as1258) implements a feature that users have been asking for: It gives programs the ability to "claim" a port on a hub, via a new usbfs ioctl. A device plugged into a "claimed" port will not be touched by the kernel beyond the immediate necessities of initialization and enumeration. In particular, when a device is plugged into a "claimed" port, the kernel will not select and install a configuration. And when a config is installed by usbfs or sysfs, the kernel will not probe any drivers for any of the interfaces. (However the kernel will fetch various string descriptors during enumeration. One could argue that this isn't really necessary, but the strings are exported in sysfs.) The patch does not guarantee exclusive access to these devices; it is still possible for more than one program to open the device file concurrently. Programs are responsible for coordinating access among themselves. A demonstration program showing how to use the new interface can be found in an attachment to http://marc.info/?l=linux-usb&m=124345857431452&w=2 The patch also makes a small simplification to the hub driver, replacing a bunch of more-or-less useless variants of "out of memory" with a single message. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB audio gadget: Un-inline generic_[gs]et_cmdLaurent Pinchart
Those functions are used only used to fill the set/get members of usb_audio_control. It doesn't make much sense to inline them. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB audio gadget: Prefix all macro definitions with UAC_ in linux/usb/audio.hLaurent Pinchart
linux/usb/audio.h is a public header file that includes definitions exported to userspace. To avoid namespace clashes, prefix all macro definitions with UAC_. Existing macros and structures prefixed with USB_AC_ and USB_AS_ are renamed for consistency. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB: Move vendor subclass definition from usb/audio.h to usb/ch9.hLaurent Pinchart
USB_SUBCLASS_VENDOR_SPEC is common to several USB classes and as such belongs to usb/ch9.h. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB: Move endpoint sync type definitions from usb/audio.h to usb/ch9.hLaurent Pinchart
And use the new definitions in the USB Audio Class gadget driver. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20USB: usbmon: end ugly tricks with DMA peekingPete Zaitcev
This patch fixes crashes when usbmon attempts to access GART aperture. The old code attempted to take a bus address and convert it into a virtual address, which clearly was impossible on systems with actual IOMMUs. Let us not persist in this foolishness, and use transfer_buffer in all cases instead. I think downsides are negligible. The ones I see are: - A driver may pass an address of one buffer down as transfer_buffer, and entirely different entity mapped for DMA, resulting in misleading output of usbmon. Note, however, that PIO based controllers would do transfer the same data that usbmon sees here. - Out of tree drivers may crash usbmon if they store garbage in transfer_buffer. I inspected the in-tree drivers, and clarified the documentation in comments. - Drivers that use get_user_pages will not be possible to monitor. I only found one driver with this problem (drivers/staging/rspiusb). - Same happens with with usb_storage transferring from highmem, but it works fine on 64-bit systems, so I think it's not a concern. At least we don't crash anymore. Why didn't we do this in 2.6.10? That's because back in those days it was popular not to fill in transfer_buffer, so almost all traffic would be invisible (e.g. all of HID was like that). But now, the tree is almost 100% PIO friendly, so we can do the right thing at last. Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Driver Core: devtmpfs - kernel-maintained tmpfs-based /devKay Sievers
Devtmpfs lets the kernel create a tmpfs instance called devtmpfs very early at kernel initialization, before any driver-core device is registered. Every device with a major/minor will provide a device node in devtmpfs. Devtmpfs can be changed and altered by userspace at any time, and in any way needed - just like today's udev-mounted tmpfs. Unmodified udev versions will run just fine on top of it, and will recognize an already existing kernel-created device node and use it. The default node permissions are root:root 0600. Proper permissions and user/group ownership, meaningful symlinks, all other policy still needs to be applied by userspace. If a node is created by devtmps, devtmpfs will remove the device node when the device goes away. If the device node was created by userspace, or the devtmpfs created node was replaced by userspace, it will no longer be removed by devtmpfs. If it is requested to auto-mount it, it makes init=/bin/sh work without any further userspace support. /dev will be fully populated and dynamic, and always reflect the current device state of the kernel. With the commonly used dynamic device numbers, it solves the problem where static devices nodes may point to the wrong devices. It is intended to make the initial bootup logic simpler and more robust, by de-coupling the creation of the inital environment, to reliably run userspace processes, from a complex userspace bootstrap logic to provide a working /dev. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Jan Blunck <jblunck@suse.de> Tested-By: Harald Hoyer <harald@redhat.com> Tested-By: Scott James Remnant <scott@ubuntu.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20driver model: constify attribute groupsDavid Brownell
Let attribute group vectors be declared "const". We'd like to let most attribute metadata live in read-only sections... this is a start. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Driver core: Add accessor for device platform dataMark Brown
For consistency with driver data provide a dev_get_platdata() accessor for reading the platform data from a device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Driver core: move dev_get/set_drvdata to drivers/base/dd.cGreg Kroah-Hartman
No one should directly access the driver_data field, so remove the field and make it private. We dynamically create the private field now if it is needed, to handle drivers that call get/set before they are registered with the driver core. Also update the copyright notices on these files while we are there. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20cpumask:move-obsolete-functions-to-end-of-headerRusty Russell
The new ones have pretty kerneldoc. Move the old ones to the end to avoid confusing people. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: benh@kernel.crashing.org