summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2009-01-06Merge commit 'trivial/for-next'Stephen Rothwell
2009-01-06Merge commit 'nommu/master'Stephen Rothwell
Conflicts: kernel/fork.c
2009-01-06Merge commit 'fuse/for-next'Stephen Rothwell
2009-01-06Merge commit 'osd/linux-next'Stephen Rothwell
2009-01-06Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
Conflicts: lib/swiotlb.c
2009-01-06Merge commit 'security-testing/next'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2009-01-06Merge commit 'voltage/for-next'Stephen Rothwell
2009-01-06Merge commit 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/i2c/chips/Kconfig drivers/i2c/chips/Makefile
2009-01-06Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS
2009-01-06Merge commit 'md/for-next'Stephen Rothwell
2009-01-06Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-01-06Merge commit 'leds/for-mm'Stephen Rothwell
2009-01-06Merge commit 'gfs2/master'Stephen Rothwell
2009-01-06Merge commit 'cpufreq/next'Stephen Rothwell
2009-01-06Merge commit 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/devices/m25p80.c drivers/mtd/devices/mtd_dataflash.c
2009-01-06Merge commit 'async_tx/next'Stephen Rothwell
2009-01-06Merge commit 'ext4/next'Stephen Rothwell
Conflicts: fs/ext4/ialloc.c
2009-01-06Merge commit 'ocfs2/linux-next'Stephen Rothwell
2009-01-06Merge commit 'scsi/master'Stephen Rothwell
Conflicts: drivers/scsi/scsi_ioctl.c
2009-01-06Merge commit 'kvm/master'Stephen Rothwell
2009-01-06Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-01-06Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-01-06Merge commit 'acpi/test'Stephen Rothwell
2009-01-06Merge branch 'quilt/ide'Stephen Rothwell
2009-01-06Merge branch 'quilt/i2c'Stephen Rothwell
2009-01-06Merge commit 'hid/for-next'Stephen Rothwell
2009-01-06Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-01-06Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/hotplug/acpiphp_glue.c
2009-01-06Merge commit 'timers/auto-timers-next'Stephen Rothwell
Conflicts: kernel/time/tick-common.c
2009-01-06Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2009-01-06Merge commit 'sched/auto-sched-next'Stephen Rothwell
2009-01-06Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2009-01-06Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2009-01-06Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2009-01-06Merge branch 'quilt/usb'Stephen Rothwell
2009-01-06Merge branch 'quilt/driver-core'Stephen Rothwell
2009-01-06Merge commit 'input-current/for-linus'Stephen Rothwell
2009-01-06Merge commit 'net-current/master'Stephen Rothwell
2009-01-06dm-target-remove-struct-tt_internalCheng Renquan
The tt_internal is really just a list_head to manage registered target_type in a double linked list, Here embed the list_head into target_type directly, 1. to avoid kmalloc/kfree; 2. then tt_internal is really unneeded; Signed-off-by: Cheng Renquan <crquan@gmail.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Reviewed-by: Alasdair G Kergon <agk@redhat.com>
2009-01-06dm-support-barriers-on-simple-devicesAndi Kleen
Implement barrier support for single device DM devices This patch implements barrier support in DM for the common case of dm linear just remapping a single underlying device. In this case we can safely pass the barrier through because there can be no reordering between devices. NB. Any DM device might cease to support barriers if it gets reconfigured so code must continue to allow for a possible -EOPNOTSUPP on every barrier bio submitted. - agk Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2009-01-06dm-request-extend-target-interfaceKiyoshi Ueda
This patch adds the following target interfaces for request-based dm. map_rq : for mapping a request rq_end_io : for finishing a request busy : for avoiding performance regression from bio-based dm. Target can tell dm core not to map requests now, and that may help requests in the block layer queue to be bigger by I/O merging. In bio-based dm, this behavior is done by device drivers managing the block layer queue. But in request-based dm, dm core has to do that since dm core manages the block layer queue. Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com> Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2009-01-06dm-consolidate-target-deregistration-error-handlingMikulas Patocka
Change dm_unregister_target to return void and use BUG() for error reporting. dm_unregister_target can only fail because of programming bug in the target driver. It can't fail because of user's behavior or disk errors. This patch changes unregister_target to return void and use BUG if someone tries to unregister non-registered target or unregister target that is in use. This patch removes code duplication (testing of error codes in all dm targets) and reports bugs in just one place, in dm_unregister_target. In some target drivers, these return codes were ignored, which could lead to a situation where bugs could be missed. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2009-01-06wimax: export linux/wimax.h and linux/wimax/i2400m.h with headers_installInaky Perez-Gonzalez
These two files are what user space can use to establish communication with the WiMAX kernel API and to speak the Intel 2400m Wireless WiMAX connection's control protocol. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06i2400m: host/device procotol and core driver definitionsInaky Perez-Gonzalez
The wimax/i2400m.h defines the structures and constants for the host-device protocols: - boot / firmware upload protocol - general data transport protocol - control protocol It is done in such a way that can also be used verbatim by user space. drivers/net/wimax/i2400m.h defines all the APIs used by the core, bus-generic driver (i2400m) and the bus specific drivers (i2400m-BUSNAME). It also gives a roadmap to the driver implementation. debug-levels.h adds the core driver's debug settings. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06wimax: debug macros and debug settings for the WiMAX stackInaky Perez-Gonzalez
This file contains a simple debug framework that is used in the stack; it allows the debug level to be controlled at compile-time (so the debug code is optimized out) and at run-time (for what wasn't compiled out). This is eventually going to be moved to use dynamic_printk(). Just need to find time to do it. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06wimax: headers for kernel API and user space interactionInaky Perez-Gonzalez
Definitions for the user/kernel API protocol through generic netlink. User space can copy it verbatim and use it. Kernel API definition declares the main data types and calls for the drivers to integrate into the WiMAX stack. Provides usage documentation. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06debugfs: add helpers for exporting a size_t simple valueInaky Perez-Gonzalez
In the same spirit as debugfs_create_*(), introduce helpers for exporting size_t values over debugfs. The only trick done is that the format verifier is kept at %llu instead of %zu; otherwise type warnings would pop up: format ‘%zu’ expects type ‘size_t’, but argument 2 has type ‘long long unsigned int’ There is no real way to fix this one--however, we can consider %llu and %zu to be compatible if we consider that we are using the same for validating in debugfs_create_{x,u}{8,16,32}(). Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06USB: storage: add last-sector hacksAlan Stern
This patch (as1189b) adds some hacks to usb-storage for dealing with the growing problems involving bad capacity values and last-sector accesses: A new flag, US_FL_CAPACITY_OK, is created to indicate that the device is known to report its capacity correctly. An unusual_devs entry for Linux's own File-backed Storage Gadget is added with this flag set, since g_file_storage always reports the correct capacity and since the capacity need not be even (it is determined by the size of the backing file). An entry in unusual_devs.h which has only the CAPACITY_OK flag set shouldn't prejudice libusual, since the device will work perfectly well with either usb-storage or ub. So a new macro, COMPLIANT_DEV, is added to let libusual know about these entries. When a last-sector access succeeds and the total number of sectors is odd (the unexpected case, in which guessing that the number is even might cause trouble), a WARN is triggered. The kerneloops.org project will collect these warnings, allowing us to add CAPACITY_OK flags for the devices in question before implementing the default-to-even heuristic. If users want to prevent the stack dump produced by the WARN, they can disable the hack by adding an unusual_devs entry for their device with the CAPACITY_OK flag. When a last-sector access fails three times in a row and neither the FIX_CAPACITY nor the CAPACITY_OK flag is set, we assume the last-sector bug is present. We replace the existing status and sense data with values that will cause the SCSI core to fail the access immediately rather than retry indefinitely. This should fix the difficulties people have been having with Nokia phones. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06USB: extension of anchor API to unpoison an anchorOliver Neukum
This extension allows unpoisoning an anchor allowing drivers that resubmit URBs to reuse an anchor for methods like resume() Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-01-06USB: mark "reject" field of struct urb as atomic_tMing Lei
It is enough to protect accesses to reject field of urb by marking it as atomic_t,also it is the only reason of existence of usb_reject_lock,so remove the lock to make code more clean. Signed-off-by: Ming Lei <tom.leiming@gmail.com> Acked-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>