Commits on Sep 20, 2009
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
      includecheck fix: x86, cpu/common.c
      includecheck fix: kernel/trace, ring_buffer.c
      includecheck fix: include/linux, ftrace.h
      includecheck fix: include/linux, page_cgroup.h
      includecheck fix: include/linux, aio.h
      includecheck fix: include/drm, drm_memory.h
      includecheck fix: include/acpi, acpi_bus.h
      includecheck fix: drivers/xen, evtchn.c
      includecheck fix: drivers/video, vgacon.c
      includecheck fix: drivers/scsi, ibmvscsi.c
      includecheck fix: drivers/scsi, libfcoe.c
      includecheck fix: x86, shadow.c
      includecheck fix: x86, traps.c
      includecheck fix: um, helper.c
      includecheck fix: s390, sys_s390.c
    torvalds committed Sep 20, 2009
  2. @torvalds

    loongson: fix cut-and-paste mis-merge

    Ingo points out that I screwed up when merging the 'timers-for-linus'
    branch in commit a03fdb7.
    
    A bit too much copy-and-pasting caused the end result to have an
    extraneous 'return' in the middle of an expression.  That was obviously
    bogus.  Blush.
    
    Reported-by-with-patch: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 20, 2009
  3. @torvalds

    Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

    * 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
      [PATCH] i2c-imx: make bus available early
      i2c-mv64xxx: correct mv64xxx_i2c_intr() return type
    torvalds committed Sep 20, 2009
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-cor…

    …e-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      Driver-Core: extend devnode callbacks to provide permissions
    torvalds committed Sep 20, 2009
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (79 commits)
      USB serial: update the console driver
      usb-serial: straighten out serial_open
      usb-serial: add missing tests and debug lines
      usb-serial: rename subroutines
      usb-serial: fix termios initialization logic
      usb-serial: acquire references when a new tty is installed
      usb-serial: change logic of serial lookups
      usb-serial: put subroutines in logical order
      usb-serial: change referencing of port and serial structures
      tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
      tty: Char: mxser, add support for CP112UL
      uartlite: support shared interrupt lines
      tty: USB: serial/mct_u232, fix tty refcnt
      tty: riscom8, fix tty refcnt
      tty: riscom8, fix shutdown declaration
      TTY: fix typos
      tty: Power: fix suspend vt regression
      tty: vt: use printk_once
      tty: handle VT specific compat ioctls in vt driver
      n_tty: move echoctl check and clean up logic
      ...
    torvalds committed Sep 20, 2009
  6. @torvalds

    Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pu…

    …b/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (58 commits)
      perf_counter: Fix perf_copy_attr() pointer arithmetic
      perf utils: Use a define for the maximum length of a trace event
      perf: Add timechart help text and add timechart to "perf help"
      tracing, x86, cpuidle: Move the end point of a C state in the power tracer
      perf utils: Be consistent about minimum text size in the svghelper
      perf timechart: Add "perf timechart record"
      perf: Add the timechart tool
      perf: Add a SVG helper library file
      tracing, perf: Convert the power tracer into an event tracer
      perf: Add a sample_event type to the event_union
      perf: Allow perf utilities to have "callback" options without arguments
      perf: Store trace event name/id pairs in perf.data
      perf: Add a timestamp to fork events
      sched_clock: Make it NMI safe
      perf_counter: Fix up swcounter throttling
      x86, perf_counter, bts: Optimize BTS overflow handling
      perf sched: Add --input=file option to builtin-sched.c
      perf trace: Sample timestamp and cpu when using record flag
      perf tools: Increase MAX_EVENT_LENGTH
      perf tools: Fix memory leak in read_ftrace_printk()
      ...
    torvalds committed Sep 20, 2009
  7. includecheck fix: x86, cpu/common.c

    fix the following 'make includecheck' warning:
    
      arch/x86/kernel/cpu/common.c: linux/smp.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Alan Cox <alan@linux.intel.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    LKML-Reference: <1252087783.6385.10.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  8. includecheck fix: kernel/trace, ring_buffer.c

    fix the following 'make includecheck' warning:
    
      kernel/trace/ring_buffer.c: trace.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247068617.4382.107.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  9. includecheck fix: include/linux, ftrace.h

    fix the following 'make includecheck' warning:
    
      include/linux/ftrace.h: linux/sched.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247068321.4382.102.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  10. includecheck fix: include/linux, page_cgroup.h

    fix the following 'make includecheck' warning:
    
      include/linux/page_cgroup.h: linux/swap.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Paul Menage <menage@google.com>
    Jaswinder Singh Rajput committed Sep 20, 2009
  11. includecheck fix: include/linux, aio.h

    fix the following 'make includecheck' warning:
    
      include/linux/aio.h: linux/aio_abi.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: bcrl@kvack.org
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247068254.4382.101.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  12. includecheck fix: include/drm, drm_memory.h

    fix the following 'make includecheck' warning:
    
      include/drm/drm_memory.h: linux/vmalloc.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247068169.4382.99.camel@ht.satnam>
    Acked-by: Dave Airlie <airlied@redhat.com>
    Jaswinder Singh Rajput committed Sep 20, 2009
  13. includecheck fix: include/acpi, acpi_bus.h

    fix the following 'make includecheck' warning:
    
      include/acpi/acpi_bus.h: linux/device.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247068058.4382.96.camel@ht.satnam>
    Acked-by: Len Brown <len.brown@intel.com>
    Jaswinder Singh Rajput committed Sep 20, 2009
  14. includecheck fix: drivers/xen, evtchn.c

    fix the following 'make includecheck' warning:
    
      drivers/xen/evtchn.c: linux/errno.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc:  chrisw@sous-sol.org
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247067749.4382.90.camel@ht.satnam>
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Jaswinder Singh Rajput committed Sep 20, 2009
  15. includecheck fix: drivers/video, vgacon.c

    fix the following 'make includecheck' warning:
    
      drivers/video/console/vgacon.c: linux/slab.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Martin Mares <mj@ucw.cz>
    Cc: mchehab@infradead.org
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247067624.4382.88.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  16. includecheck fix: drivers/scsi, ibmvscsi.c

    fix the following 'make includecheck' warning:
    
      drivers/scsi/ibmvscsi/ibmvscsi.c: asm/firmware.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247067016.4382.78.camel@ht.satnam>
    Acked-by: Brian King <brking@linux.vnet.ibm.com>
    Jaswinder Singh Rajput committed Sep 20, 2009
  17. includecheck fix: drivers/scsi, libfcoe.c

    fix the following 'make includecheck' warning:
    
      drivers/scsi/fcoe/libfcoe.c: linux/netdevice.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247066936.4382.76.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  18. includecheck fix: x86, shadow.c

    fix the following 'make includecheck' warning:
    
      arch/x86/mm/kmemcheck/shadow.c: linux/module.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247065179.4382.51.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  19. includecheck fix: x86, traps.c

    fix the following 'make includecheck' warning:
    
      arch/x86/kernel/traps.c: asm/traps.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247065094.4382.49.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
  20. includecheck fix: um, helper.c

    fix the following 'make includecheck' warning:
    
      arch/um/os-Linux/helper.c: linux/limits.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: jdike@addtoit.com
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247064950.4382.45.camel@ht.satnam>
    Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
    Jaswinder Singh Rajput committed Sep 20, 2009
  21. includecheck fix: s390, sys_s390.c

    fix the following 'make includecheck' warning:
    
      arch/s390/kernel/sys_s390.c: linux/syscalls.h is included more than once.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Cc: schwidefsky@de.ibm.com
    Cc: heiko.carstens@de.ibm.com
    Cc: Sam Ravnborg <sam@ravnborg.org>
    LKML-Reference: <1247068809.4382.111.camel@ht.satnam>
    Jaswinder Singh Rajput committed Sep 20, 2009
Commits on Sep 19, 2009
  1. [PATCH] i2c-imx: make bus available early

    As I2C is used by PMICs also, make the busses available early via
    subsys_initcall().
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Wolfram Sang committed with Ben Dooks Sep 19, 2009
  2. i2c-mv64xxx: correct mv64xxx_i2c_intr() return type

    The mv64xxx_i2c_intr() irq handler in drivers/i2c/busses/i2c-mv64xxx.c
    is declared as returning 'int', resulting in this compile-time warning:
    
    drivers/i2c/busses/i2c-mv64xxx.c: In function 'mv64xxx_i2c_probe':
    drivers/i2c/busses/i2c-mv64xxx.c:540: warning: passing argument 2 of 'request_irq' from incompatible pointer type
    
    Fix: correct the return type to 'irqreturn_t'.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Mikael Pettersson committed with Ben Dooks Sep 7, 2009
  3. USB serial: update the console driver

    This patch (as1292) modifies the USB serial console driver, to make it
    compatible with the recent changes to the USB serial core.  The most
    important change is that serial->disc_mutex now has to be unlocked
    following a successful call to usb_serial_get_by_index().
    
    Other less notable changes include:
    
    	Use the requested port number instead of port 0 always.
    
    	Prevent the serial device from being autosuspended.
    
    	Use the ASYNCB_INITIALIZED flag bit to indicate when the
    	port hardware has been initialized.
    
    In spite of these changes, there's no question that the USB serial
    console code is still a big hack.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 4, 2009
  4. usb-serial: straighten out serial_open

    This patch (as1291) removes a bunch of code from serial_open(), things
    that were rendered unnecessary by earlier patches.  A missing spinlock
    is added to protect port->port.count, which needs to be incremented
    even if the open fails but not if the tty has gotten a hangup.  The
    test for whether the hardware has been initialized, based on the use
    count, is replaced by a more transparent test of the
    ASYNCB_INITIALIZED bit in the port flags.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  5. usb-serial: add missing tests and debug lines

    This patch (as1290) adds some missing tests.  serial_down() isn't
    supposed to do anything if the hardware hasn't been initialized, and
    serial_close() isn't supposed to do anything if the tty has gotten a
    hangup (because serial_hangup() takes care of shutting down the
    hardware).
    
    The patch also updates and adds a few debugging lines.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  6. usb-serial: rename subroutines

    This patch (as1289) renames serial_do_down() to serial_down() and
    serial_do_free() to serial_release().  It also adds a missing call to
    tty_shutdown() in serial_release().
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  7. usb-serial: fix termios initialization logic

    This patch (as1288) fixes the initialization logic in
    serial_install().  A new tty always needs to have a termios
    initialized no matter what, not just in the case where the lower
    driver will override the termios settings.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  8. usb-serial: acquire references when a new tty is installed

    This patch (as1287) makes serial_install() be reponsible for acquiring
    references to the usb_serial structure and the driver module when a
    tty is first used.  This is more sensible than having serial_open() do
    it, because a tty can be opened many times whereas it is installed
    only once, when it is created.  (Not to mention that these actions are
    reversed when the tty is released, not when it is closed.)  Finally,
    it is at install time that the TTY core takes its own reference to the
    usb_serial module, so it is only fitting that we should act the same
    way in regard to the lower-level serial driver.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  9. usb-serial: change logic of serial lookups

    This patch (as1286) changes usb_serial_get_by_index().  Now the
    routine will check whether the serial device has been disconnected; if
    it has then the return value will be NULL.  If the device hasn't been
    disconnected then the routine will return with serial->disc_mutex
    held, so that the caller can use the structure without fear of racing
    against driver unloads.
    
    This permits the scope of table_mutex in destroy_serial() to be
    reduced.  Instead of protecting the entire function, it suffices to
    protect the part that actually uses serial_table[], i.e., the call to
    return_serial().  There's no longer any danger of the refcount being
    incremented after it reaches 0 (which was the reason for having the
    large scope previously), because it can't reach 0 until the serial
    device has been disconnected.
    
    Also, the patch makes serial_install() check that serial is non-NULL
    before attempting to use it.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  10. usb-serial: put subroutines in logical order

    This patch (as1285) rearranges the subroutines in usb-serial.c
    concerned with tty lifetimes into a more logical order: install, open,
    hangup, close, release.  It also updates the formatting of the
    kerneldoc comments.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  11. usb-serial: change referencing of port and serial structures

    This patch (as1284) changes the referencing of the usb_serial and
    usb_serial_port structures in usb-serial.c.  It's not feasible to make
    the port structures keep a reference to the serial structure, because
    the ports need to remain in existence when serial is released -- quite
    a few of the drivers expect this.  Consequently taking a reference
    to the port when the device file is open is insufficient; such a
    reference would not pin serial.
    
    To fix this, we now take a reference to serial when the device file is
    opened.  The final put_device() for the ports occurs in
    destroy_serial(), so that the ports will last as long as they are
    needed.
    
    The patch initializes all the port devices, including those in the
    unused "fake" ports.  This makes the code more uniform because they
    can all be released in the same way.  The error handling code in
    usb_serial_probe() is much simplified by this approach; instead of
    freeing everything by hand we can use a single usb_serial_put() call.
    
    Also simplified is the port-release mechanism.  Instead of being two
    separate routines, port_release() and port_free() can be combined into
    one.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with Live-CD User Sep 1, 2009
  12. @jirislaby

    tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl

    In moxa specific ASPP_OQUEUE ioctl command, they apparently want
    only know whether there is space in transmitter hold register.
    
    So switch UART_LSR_TEMT to UART_LSR_THRE in that specific case
    according to the change in 1.14 moxa drivers.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    jirislaby committed with Live-CD User Sep 10, 2009
  13. @jirislaby

    tty: Char: mxser, add support for CP112UL

    Add support for MOXA:0x1120 pci device. It's a 2-port device and differs
    in no way from the others. So this turns out to be a trivial
    pci_device_id change.
    
    Increase also the version number.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    jirislaby committed with Live-CD User Sep 10, 2009
  14. @jacmet

    uartlite: support shared interrupt lines

    Adapt isr to work with shared interrupt lines.
    
    Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    jacmet committed with Live-CD User Sep 9, 2009