12 Jun, 2009

13 commits

  • [xfs, btrfs, capifs, shmem don't need BKL, exempt]

    Signed-off-by: Alessio Igor Bogani
    Signed-off-by: Al Viro

    Alessio Igor Bogani
     
  • The only user of the i_cindex element in the inode structure is used
    is by the firewire drivers. As part of an attempt to slim down the
    inode structure to save memory --- since a typical Linux system will
    have hundreds of thousands if not millions of inodes cached, a
    reduction in the size inode has high leverage.

    The firewire driver does not need i_cindex in any fast path, so it's
    simple enough to calculate when it is needed, instead of wasting space
    in the inode structure.

    Signed-off-by: "Theodore Ts'o"
    Cc: krh@redhat.com
    Cc: stefanr@s5r6.in-berlin.de
    Cc: linux-fsdevel@vger.kernel.org
    Signed-off-by: Al Viro

    Theodore Ts'o
     
  • * 'for-linus' of git://linux-arm.org/linux-2.6:
    kmemleak: Add the corresponding MAINTAINERS entry
    kmemleak: Simple testing module for kmemleak
    kmemleak: Enable the building of the memory leak detector
    kmemleak: Remove some of the kmemleak false positives
    kmemleak: Add modules support
    kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
    kmemleak: Add the vmalloc memory allocation/freeing hooks
    kmemleak: Add the slub memory allocation/freeing hooks
    kmemleak: Add the slob memory allocation/freeing hooks
    kmemleak: Add the slab memory allocation/freeing hooks
    kmemleak: Add documentation on the memory leak detector
    kmemleak: Add the base support

    Manual conflict resolution (with the slab/earlyboot changes) in:
    drivers/char/vt.c
    init/main.c
    mm/slab.c

    Linus Torvalds
     
  • …el/git/tip/linux-2.6-tip

    * 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (574 commits)
    perf_counter: Turn off by default
    perf_counter: Add counter->id to the throttle event
    perf_counter: Better align code
    perf_counter: Rename L2 to LL cache
    perf_counter: Standardize event names
    perf_counter: Rename enums
    perf_counter tools: Clean up u64 usage
    perf_counter: Rename perf_counter_limit sysctl
    perf_counter: More paranoia settings
    perf_counter: powerpc: Implement generalized cache events for POWER processors
    perf_counters: powerpc: Add support for POWER7 processors
    perf_counter: Accurate period data
    perf_counter: Introduce struct for sample data
    perf_counter tools: Normalize data using per sample period data
    perf_counter: Annotate exit ctx recursion
    perf_counter tools: Propagate signals properly
    perf_counter tools: Small frequency related fixes
    perf_counter: More aggressive frequency adjustment
    perf_counter/x86: Fix the model number of Intel Core2 processors
    perf_counter, x86: Correct some event and umask values for Intel processors
    ...

    Linus Torvalds
     
  • …/git/penberg/slab-2.6

    * 'topic/slab/earlyboot' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    vgacon: use slab allocator instead of the bootmem allocator
    irq: use kcalloc() instead of the bootmem allocator
    sched: use slab in cpupri_init()
    sched: use alloc_cpumask_var() instead of alloc_bootmem_cpumask_var()
    memcg: don't use bootmem allocator in setup code
    irq/cpumask: make memoryless node zero happy
    x86: remove some alloc_bootmem_cpumask_var calling
    vt: use kzalloc() instead of the bootmem allocator
    sched: use kzalloc() instead of the bootmem allocator
    init: introduce mm_init()
    vmalloc: use kzalloc() instead of alloc_bootmem()
    slab: setup allocators earlier in the boot sequence
    bootmem: fix slab fallback on numa
    bootmem: use slab if bootmem is no longer available

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    [libata] ata_piix: Enable parallel scan
    sata_nv: use hardreset only for post-boot probing
    [libata] ahci: Restore SB600 SATA controller 64 bit DMA
    ata_piix: Remove stale comment
    ata_piix: Turn on hotplugging support for older chips
    ahci: misc cleanups for EM stuff
    [libata] get rid of ATA_MAX_QUEUE loop in ata_qc_complete_multiple() v2
    sata_sil: enable 32-bit PIO
    sata_sx4: speed up ECC initialization
    libata-sff: avoid byte swapping in ata_sff_data_xfer()
    [libata] ahci: use less error-prone array initializers

    Linus Torvalds
     
  • * 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block: (153 commits)
    block: add request clone interface (v2)
    floppy: fix hibernation
    ramdisk: remove long-deprecated "ramdisk=" boot-time parameter
    fs/bio.c: add missing __user annotation
    block: prevent possible io_context->refcount overflow
    Add serial number support for virtio_blk, V4a
    block: Add missing bounce_pfn stacking and fix comments
    Revert "block: Fix bounce limit setting in DM"
    cciss: decode unit attention in SCSI error handling code
    cciss: Remove no longer needed sendcmd reject processing code
    cciss: change SCSI error handling routines to work with interrupts enabled.
    cciss: separate error processing and command retrying code in sendcmd_withirq_core()
    cciss: factor out fix target status processing code from sendcmd functions
    cciss: simplify interface of sendcmd() and sendcmd_withirq()
    cciss: factor out core of sendcmd_withirq() for use by SCSI error handling code
    cciss: Use schedule_timeout_uninterruptible in SCSI error handling code
    block: needs to set the residual length of a bidi request
    Revert "block: implement blkdev_readpages"
    block: Fix bounce limit setting in DM
    Removed reference to non-existing file Documentation/PCI/PCI-DMA-mapping.txt
    ...

    Manually fix conflicts with tracing updates in:
    block/blk-sysfs.c
    drivers/ide/ide-atapi.c
    drivers/ide/ide-cd.c
    drivers/ide/ide-floppy.c
    drivers/ide/ide-tape.c
    include/trace/events/block.h
    kernel/trace/blktrace.c

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (26 commits)
    amd64_edac: add MAINTAINERS entry
    EDAC: do not enable modules by default
    amd64_edac: do not enable module by default
    amd64_edac: add module registration routines
    amd64_edac: add ECC reporting initializers
    amd64_edac: add EDAC core-related initializers
    amd64_edac: add error decoding logic
    amd64_edac: add ECC chipkill syndrome mapping table
    amd64_edac: add per-family descriptors
    amd64_edac: add F10h-and-later methods-p3
    amd64_edac: add F10h-and-later methods-p2
    amd64_edac: add F10h-and-later methods-p1
    amd64_edac: add k8-specific methods
    amd64_edac: assign DRAM chip select base and mask in a family-specific way
    amd64_edac: add helper to dump relevant registers
    amd64_edac: add DRAM address type conversion facilities
    amd64_edac: add functionality to compute the DRAM hole
    amd64_edac: add sys addr to memory controller mapping helpers
    amd64_edac: add memory scrubber interface
    amd64_edac: add MCA error types
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (266 commits)
    sh: Tie sparseirq in to Kconfig.
    sh: Wire up sys_rt_tgsigqueueinfo.
    sh: Fix sys_pwritev() syscall table entry for sh32.
    sh: Fix sh4a llsc-based cmpxchg()
    sh: sh7724: Add JPU support
    sh: sh7724: INTC setting update
    sh: sh7722 clock framework rewrite
    sh: sh7366 clock framework rewrite
    sh: sh7343 clock framework rewrite
    sh: sh7724 clock framework rewrite V3
    sh: sh7723 clock framework rewrite V2
    sh: add enable()/disable()/set_rate() to div6 code
    sh: add AP325RXA mode pin configuration
    sh: add Migo-R mode pin configuration
    sh: sh7722 mode pin definitions
    sh: sh7724 mode pin comments
    sh: sh7723 mode pin V2
    sh: rework mode pin code
    sh: clock div6 helper code
    sh: clock div4 frequency table offset fix
    ...

    Linus Torvalds
     
  • * 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (28 commits)
    ide-tape: fix debug call
    alim15x3: Remove historical hacks, re-enable init_hwif for PowerPC
    ide-dma: don't reset request fields on dma_timeout_retry()
    ide: drop rq->data handling from ide_map_sg()
    ide-atapi: kill unused fields and callbacks
    ide-tape: simplify read/write functions
    ide-tape: use byte size instead of sectors on rw issue functions
    ide-tape: unify r/w init paths
    ide-tape: kill idetape_bh
    ide-tape: use standard data transfer mechanism
    ide-tape: use single continuous buffer
    ide-atapi,tape,floppy: allow ->pc_callback() to change rq->data_len
    ide-tape,floppy: fix failed command completion after request sense
    ide-pm: don't abuse rq->data
    ide-cd,atapi: use bio for internal commands
    ide-atapi: convert ide-{floppy,tape} to using preallocated sense buffer
    ide-cd: convert to using generic sense request
    ide: add helpers for preparing sense requests
    ide-cd: don't abuse rq->buffer
    ide-atapi: don't abuse rq->buffer
    ...

    Linus Torvalds
     
  • Slab is initialized before the console subsystem so use the slab allocator in
    vgacon_scrollback_startup().

    Signed-off-by: Pekka Enberg

    Pekka Enberg
     
  • Now that kmem_cache_init() happens before console_init(), we should use
    kzalloc() and not the bootmem allocator.

    Signed-off-by: Pekka Enberg

    Pekka Enberg
     
  • There are allocations for which the main pointer cannot be found but
    they are not memory leaks. This patch fixes some of them. For more
    information on false positives, see Documentation/kmemleak.txt.

    Signed-off-by: Catalin Marinas

    Catalin Marinas
     

11 Jun, 2009

27 commits

  • * serial-from-alan: (79 commits)
    moxa: prevent opening unavailable ports
    imx: serial: use tty_encode_baud_rate to set true rate
    imx: serial: add IrDA support to serial driver
    imx: serial: use rational library function
    lib: isolate rational fractions helper function
    imx: serial: handle initialisation failure correctly
    imx: serial: be sure to stop xmit upon shutdown
    imx: serial: notify higher layers in case xmit IRQ was not called
    imx: serial: fix one bit field type
    imx: serial: fix whitespaces (no changes in functionality)
    tty: use prepare/finish_wait
    tty: remove sleep_on
    sierra: driver interface blacklisting
    sierra: driver urb handling improvements
    tty: resolve some sierra breakage
    timbuart: Fix the termios logic
    serial: Added Timberdale UART driver
    tty: Add URL for ttydev queue
    devpts: unregister the file system on error
    tty: Untangle termios and mm mutex dependencies
    ...

    Linus Torvalds
     
  • Conflicts:
    arch/x86/kernel/irqinit.c
    arch/x86/kernel/irqinit_64.c
    arch/x86/kernel/traps.c
    arch/x86/mm/fault.c
    include/linux/sched.h
    kernel/exit.c

    Ingo Molnar
     
  • In moxa.c there are 32 minor numbers reserved for each device. The
    number of ports actually available per device is stored in
    moxa_board_conf->numPorts. This number is not considered in moxa_open().
    Opening a port that is not available results in a kernel oops.
    This patch adds a test to moxa_open() that prevents opening unavailable
    ports.

    Signed-off-by: Dirk Eibach
    Signed-off-by: Jiri Slaby
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Dirk Eibach
     
  • real baud rate may be different from the one requested.
    for upper layers, set the nearest value to the real rate
    in favour of the rate previously requested.

    Signed-off-by: Oskar Schirmer
    Signed-off-by: Linus Torvalds

    Oskar Schirmer
     
  • Using the iMX serial driver with an IrDA device
    needs extra peripheral settings and specific
    timing depending on the transmitter circuitry used.

    Signed-off-by: Fabian Godehardt
    Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Fabian Godehardt
     
  • for calculation of numerator and denominator
    used in baud rate setting, use generic library function
    for optimum settings.

    Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Oskar Schirmer
     
  • correctly de-initialise device when setting up failed,
    call to pdata->exit() was missing.

    Signed-off-by: Daniel Glöckner
    Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Daniel Glöckner
     
  • needed to avoid continued transmission by hardware
    while software already shuts down, which might
    cause dangling characters to show up in hardware
    queues when restarting the device.

    Signed-off-by: Fabian Godehardt
    Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Fabian Godehardt
     
  • upper layers, namely line discipline, need to be notified
    when transmission of more data is possible. For spurious
    cases, where IRQ handling does not supply notification
    for sure, it is given additionally here, when data has just
    been transmitted and space in the buffer will most probably
    be available.

    Signed-off-by: Fabian Godehardt
    Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Fabian Godehardt
     
  • "have_rtscts" is assigned 1, while it is declared
    int:1, two's complement, which can hold 0 and -1
    only. The code works, as the upper bits are cut
    off, and tests are done against 0 only.

    Nonetheless, correctly declaring the bit field
    as unsigned int:1 renders the code more robust.

    Signed-off-by: Daniel Glöckner
    Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Daniel Glöckner
     
  • Signed-off-by: Oskar Schirmer
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Oskar Schirmer
     
  • Use prepare_to_wait and finish_wait instead of add_wait_queue and
    remove_wait_queue.

    This avoids us setting a task state.

    Signed-off-by: Jiri Slaby
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • Use wait_event instead of sleep_on in tty_block_til_ready.

    Wait for ASYNC_CLOSING flag being 0.

    Signed-off-by: Jiri Slaby
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • Interface blacklisting is necessary for non-serial interfaces that are handled
    by a different driver. The interface blacklisting is implemented in sierra
    driver per device. Each device in need of a blacklist has a static information
    array kept in the driver. This array contains the interface numbers that are
    blacklisted. The pointer for each blacklist array and the length
    of that blacklist are 'bundled' in data structure sierra_iface_info. A pointer
    to this information is set in id_table when the device is added to the id_table.

    The following is summary of changes we have made to sierra.c driver in
    this patch dealing with interface blacklisting support:
    - Added data structure sierra_iface_info and function is_blacklisted()
    to support blacklisting
    - Modified sierra_probe() to handle blacklisted interfaces accordingly
    - Improved comments in id_table
    - Added new device in id_table with blacklist interface support

    Signed-off-by: Elina Pasheva
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Elina Pasheva
     
  • [Folded from eight patches into one as the original set according to the
    author "All of the patches need to be applied to obtain a working product"
    so keeping them split seems unhelpful

    Merge fixes done versus other conflicting changes and moved the
    spin_lock_init from open to setup time -- Alan]

    Summary of the changes and code re-organization in this patch:

    - The memory for urbs is allocated and urbs are submitted only for the active
    interfaces (instead of pre-allocating these for all interfaces). This will
    save memory especially in the case of using composite devices.
    - The code has been re-organized and functionality has been extracted from
    sierra_startup(), sierra_shutdown(), sierra_open(), sierra_close() and added
    in helper functions sierra_release_urb(), sierra_stop_rx_urbs(),
    sierra_submit_rx_urbs() and sierra_setup_urb()

    - Added function sierra_release_urb() to free an urb and its transfer
    buffer.
    - Removed unecessary include file reference and comment.
    - Added function sierra_stop_rx_urbs() that takes care of the release of
    receive and interrupt urbs. This function is to be called by sierra_close()
    whenever an interface is de-activated.
    - Added new function sierra_submit_rx_urbs() that handles the submission of
    receive urbs and interrupt urbs (if any) during the interface activation.
    This function is to be called by sierra_open(). Added a second parameter to
    pass the memory allocation (as suggested by Oliver Neukum) so that this
    function can be used in post_reset() and resume().
    - Added new function sierra_setup_urb() that contains the functionality to
    allocate an urb, fill bulk urb using the supplied memory allocation flag
    and release urb upon error. Added parameter so that the caller pass the
    memory allocation flag for flexibility.
    - Moved sierra_close() before sierra_open() to resolve dependencies
    introduced by the code reorganization.
    - Modified sierra_close() to call sierra_stop_rx_urbs() and
    sierra_release_urb() functions added in previous patch.
    - Modified sierra_open() to call sierra_setup_urb() and sierra_submit_rx_urbs()
    functions; note urbs are allocated and submitted for each activated interface.
    - Modified sierra_startup() so that allocation of urbs happens whenever an
    interface is activated (urb allocation is moved to sierra_open()).
    - Modified sierra_shutdown() so that urbs are freed whenever an interface is
    de-activated (urb freeing moved to sierra_close() as shown in previous patch
    from the series)
    - Removed unecessary data structure from sierra_port_private_data
    - Suppress an entry in logs by not re-submitting an urb when usb_submit_urb()
    returns -EPERM, as this shows that usb_kill_urb() is running (as suggested by
    Oliver Neukum)

    Signed-off-by: Elina Pasheva
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Elina Pasheva
     
  • The various merges into the sierra driver inadvertently undid
    commit 212b8f0c3f5a2280bfa1d6ab13a6fe98552becaa by Elina Pasheva
    . Put it back so the OBEX port works again.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • The driver only handles speeds but it fails to return the current values
    for the hardware features it does not support.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • Driver for the UART found in the Timberdale FPGA

    Signed-off-by: Richard Röjfors
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Richard Röjfors
     
  • Although this doesn't cause any problems it could potentially do so for
    future mmap using devices. No real work is needed to sort it out so untangle
    it before it causes problems

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • The Blackfin JTAG interface has a 4 byte generic data field (EMUDAT). With
    a little creative thinking, we can turn this into a TTY device.

    Signed-off-by: Mike Frysinger
    Signed-off-by: Bryan Wu
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • The new open/close logic handles DTR and friends, so don't do it in our own
    open routine as well.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • Bluetooth shouldn't be doing this as most drivers don't support the flag,
    furthermore it shouldn't be needed with newer buffering. This becomes rather
    more visible as the locking fixes make the abuse of low_latency visible as
    spew on the users console/dmesg.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • This allows users to use the standard setserial command with this FT232
    feature as well as obscure chip specific interfaces we have now. We keep
    track of and respect the sysfs value for non-low-latency cases. In theory we
    could do smart stuff with VTIME and the like but this seems of questionable
    worth.

    Closes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=9120
    Signed-off-by: Alan Cox

    Alan Cox
     
  • This patch replaces the string "CP2101" with "CP210x" within cp210x.c
    This is to reduce confusion about the fact that the driver is actually
    compatible with CP2101, CP2102 and CP2103 devices.

    Signed-off-by: Craig Shelley

    (Fixed some collisions merging)

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Craig Shelley
     
  • The CP210X driver was developed without official device specifications.
    This has lead to an incorrect assumption that all GET request codes are
    equal to the corresponding SET request code +1.
    This patch removes this incorrect assumption, and uses request code
    definitions based on the updated GPL driver from SiLabs.
    This modification is needed before extended functionality such as GPIO
    on CP2103 can be supported.

    Signed-off-by: Craig Shelley
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Craig Shelley
     
  • Signed-off-by: Craig Shelley
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Craig Shelley
     
  • The UART RX handling code isn't exactly speeding, so don't go disabling
    all interrupts when processing the buffer. Just disable the relevant DMA
    interrupt. This greatly improves latency of the system when utilizing the
    UART.

    Signed-off-by: Sonic Zhang
    Signed-off-by: Mike Frysinger
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Sonic Zhang