summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2009-08-18Revert "PM: Introduce core framework for run-time PM of I/O devices (rev. 17)"Stephen Rothwell
This reverts commit ea8e84f27325d9ddc7692f728a10e0a22cd59f52.
2009-08-18Merge branch 'quilt/usb'Stephen Rothwell
2009-08-18Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h
2009-08-18Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/base/class.c init/main.c
2009-08-18Merge commit 'hwpoison/hwpoison'Stephen Rothwell
2009-08-18Merge commit 'sfi/sfi-test'Stephen Rothwell
Conflicts: arch/x86/include/asm/io_apic.h arch/x86/kernel/acpi/boot.c arch/x86/kernel/apic/io_apic.c drivers/acpi/internal.h drivers/acpi/tables.c include/linux/acpi.h
2009-08-18Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S
2009-08-18Merge commit 'edac-amd/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/smpboot.c include/linux/topology.h
2009-08-18Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/include/asm/socket.h include/linux/rcupdate.h kernel/fork.c kernel/trace/trace.h
2009-08-18Merge commit 'kmemleak/kmemleak'Stephen Rothwell
2009-08-18Merge commit 'drbd/drbd'Stephen Rothwell
2009-08-18Merge commit 'fsnotify/for-next'Stephen Rothwell
Conflicts: fs/notify/inotify/inotify_fsnotify.c fs/notify/inotify/inotify_user.c fs/notify/notification.c
2009-08-18Merge commit 'bluetooth/master'Stephen Rothwell
2009-08-18Merge commit 'suspend/linux-next'Stephen Rothwell
2009-08-18Merge commit 'trivial/for-next'Stephen Rothwell
2009-08-18Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-08-18Merge commit 'watchdog/master'Stephen Rothwell
2009-08-18Merge commit 'agp/agp-next'Stephen Rothwell
2009-08-18Merge commit 'lblnet/master'Stephen Rothwell
2009-08-18Merge commit 'security-testing/next'Stephen Rothwell
2009-08-18Merge commit 'voltage/for-next'Stephen Rothwell
2009-08-18Merge commit 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/i915/intel_sdvo.c
2009-08-18Merge commit 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/input/misc/Kconfig
2009-08-18Merge commit 'slab/for-next'Stephen Rothwell
2009-08-18Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-08-18Merge commit 'battery/master'Stephen Rothwell
2009-08-18Merge commit 'block/for-next'Stephen Rothwell
2009-08-18Merge commit 'input/next'Stephen Rothwell
2009-08-18Merge branch 'quilt/rr'Stephen Rothwell
2009-08-18Merge commit 'cpufreq/next'Stephen Rothwell
2009-08-18Merge commit 'sound/for-next'Stephen Rothwell
2009-08-18Merge commit 'crypto/master'Stephen Rothwell
2009-08-18Merge commit 'wireless/master'Stephen Rothwell
2009-08-18Merge commit 'net/master'Stephen Rothwell
2009-08-18Merge commit 'scsi/master'Stephen Rothwell
2009-08-18Merge commit 'kvm/master'Stephen Rothwell
2009-08-18Merge commit 'acpi/test'Stephen Rothwell
2009-08-18Merge commit 'infiniband/for-next'Stephen Rothwell
2009-08-18Merge commit 'libata/NEXT'Stephen Rothwell
2009-08-18Merge commit 'ide/master'Stephen Rothwell
2009-08-18Merge commit 'v4l-dvb/master'Stephen Rothwell
Conflicts: arch/arm/mach-davinci/board-dm646x-evm.c arch/arm/mach-davinci/dm355.c arch/arm/mach-davinci/dm644x.c arch/arm/mach-davinci/dm646x.c arch/arm/mach-davinci/include/mach/dm355.h arch/arm/mach-davinci/include/mach/dm644x.h
2009-08-18Merge branch 'quilt/i2c'Stephen Rothwell
2009-08-18Merge commit 'hid/for-next'Stephen Rothwell
2009-08-18Merge commit 'pci/linux-next'Stephen Rothwell
2009-08-18Merge commit 'reiserfs-bkl/reiserfs/kill-bkl'Stephen Rothwell
2009-08-18Merge commit 'nfs/linux-next'Stephen Rothwell
2009-08-18Merge commit 'fuse/for-next'Stephen Rothwell
2009-08-18Merge commit 'sh/master'Stephen Rothwell
2009-08-18Merge commit 'arm/devel'Stephen Rothwell
2009-08-18USB: Use kfifo to buffer USB generic serial writesDavid VomLehn
When do_output_char() attempts to write a carriage return/line feed sequence, it first checks to see how much buffer room is available. If there are at least two characters free, it will write the carriage return/line feed with two calls to tty_put_char(). It calls the tty_operation functions write() for devices that don't support the tty_operations function put_char(). If the USB generic serial device's write URB is not in use, it will return the buffer size when asked how much room is available. The write() of the carriage return will cause it to mark the write URB busy, so the subsequent write() of the line feed will be ignored. The first part of patch uses the kfifo infrastructure to implement a write FIFO that accurately returns the amount of space available in the buffer. The second makes a minor change to kfifo_put() and __kfifo_put() to add the "const" attribute to their input buffer pointers. Signed-off-by: David VomLehn <dvomlehn@cisco.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>