22 Apr, 2009

1 commit

  • Pass clocksource pointer to the read() callback for clocksources. This
    allows us to share the callback between multiple instances.

    [hugh@veritas.com: fix powerpc build of clocksource pass clocksource mods]
    [akpm@linux-foundation.org: cleanup]
    Signed-off-by: Magnus Damm
    Acked-by: John Stultz
    Cc: Thomas Gleixner
    Signed-off-by: Hugh Dickins
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Magnus Damm
     

07 Apr, 2009

6 commits

  • Both software emulated and hardware based CTS and RTS are enabled in
    serial driver.

    The CTS RTS PIN connection on BF548 UART port is defined as a modem
    device not as a host device. In order to test it under Linux, please
    nake a cross UART cable to exchange CTS and RTS signal.

    Signed-off-by: Sonic Zhang
    Signed-off-by: Bryan Wu
    Signed-off-by: Andrew Morton
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Sonic Zhang
     
  • Only the CTS bit is affected.

    Signed-off-by: Sonic Zhang
    Signed-off-by: Bryan Wu
    Signed-off-by: Andrew Morton
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Sonic Zhang
     
  • 1. Rewrite of the non-dma data transfer functions to use only ONE mode
    of TIMOD (TIMOD=0x1). With TIMOD=0, it was not possible to set the TX
    bit pattern. So the TDBR = 0xFFFF inside the read calls won't work.

    2. Clear SPI_RDBR before reading and before duplex transfer.
    Otherwise the garbage data in RDBR will get read. Since mmc_spi uses a
    lot of duplex transfers, this is the main cause of mmc_spi failure.

    3. Poll RXS for transfer completion. Polling SPIF or TXS cannot
    guarantee transfer completion. This may interrupt a transfer before it
    is finished. Also this may leave garbage data in buffer and affect
    next transfer.

    [Yi Li : add a field "u16 idle_tx_val" in "struct
    bfin5xx_spi_chip" to specify the value to transmit if no TX value
    is supplied.]
    Signed-off-by: Wolfgang Muees
    Signed-off-by: Yi Li
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wolfgang Muees
     
  • Add support for GPIO controlled SPI Chip Selects. To make use of this
    feature, set chip_select = 0 and add a proper cs_gpio to your
    controller_data.

    struct spi_board_info
    .chip_select = 0

    struct bfin5xx_spi_chip
    .cs_gpio = GPIO_P###

    There are various SPI devices that require SPI MODE_0, and need to have
    the Chip Selects asserted during the entire transfer. Consider using
    SPI_MODE_3 (SPI_CPHA | SPI_CPOL) if your device allows it.

    Signed-off-by: Michael Hennerich
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Hennerich
     
  • Fix erroneous SPI Clock divisor calculation. Make sure SPI_BAUD is always
    >= 2. Writing a value of 0 or 1 to the SPI_BAUD register disables the
    serial clock.

    Signed-off-by: Michael Hennerich
    Signed-off-by: Bryan Wu
    Acked-by: David Brownell
    Cc: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Hennerich
     
  • * git://git.infradead.org/mtd-2.6: (53 commits)
    [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
    [MTD] [NOR] Fixup for Numonyx M29W128 chips
    [MTD] mtdpart: Make ecc_stats more realistic.
    powerpc/85xx: TQM8548: Update DTS file for multi-chip support
    powerpc: NAND: FSL UPM: document new bindings
    [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
    [MTD] [NAND] FSL-UPM: add multi chip support
    [MTD] [NOR] Add device parent info to physmap_of
    [MTD] [NAND] Add support for NAND on the Socrates board
    [MTD] [NAND] Add support for 4KiB pages.
    [MTD] sysfs support should not depend on CONFIG_PROC_FS
    [MTD] [NAND] Add parent info for CAFÉ controller
    [MTD] support driver model updates
    [MTD] driver model updates (part 2)
    [MTD] driver model updates
    [MTD] [NAND] move gen_nand's probe function to .devinit.text
    [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
    [MTD] fix use after free in register_mtd_blktrans
    [MTD] [MAPS] Drop now unused sharpsl-flash map
    [MTD] ofpart: Check name property to determine partition nodes.
    ...

    Manually fix trivial conflict in drivers/mtd/maps/Makefile

    Linus Torvalds
     

06 Apr, 2009

1 commit

  • * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
    tracing, net: fix net tree and tracing tree merge interaction
    tracing, powerpc: fix powerpc tree and tracing tree interaction
    ring-buffer: do not remove reader page from list on ring buffer free
    function-graph: allow unregistering twice
    trace: make argument 'mem' of trace_seq_putmem() const
    tracing: add missing 'extern' keywords to trace_output.h
    tracing: provide trace_seq_reserve()
    blktrace: print out BLK_TN_MESSAGE properly
    blktrace: extract duplidate code
    blktrace: fix memory leak when freeing struct blk_io_trace
    blktrace: fix blk_probes_ref chaos
    blktrace: make classic output more classic
    blktrace: fix off-by-one bug
    blktrace: fix the original blktrace
    blktrace: fix a race when creating blk_tree_root in debugfs
    blktrace: fix timestamp in binary output
    tracing, Text Edit Lock: cleanup
    tracing: filter fix for TRACE_EVENT_FORMAT events
    ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
    x86: kretprobe-booster interrupt emulation code fix
    ...

    Fix up trivial conflicts in
    arch/parisc/include/asm/ftrace.h
    include/linux/memory.h
    kernel/extable.c
    kernel/module.c

    Linus Torvalds
     

04 Apr, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
    trivial: Update my email address
    trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
    trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
    trivial: Fix misspelling of "Celsius".
    trivial: remove unused variable 'path' in alloc_file()
    trivial: fix a pdlfush -> pdflush typo in comment
    trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
    trivial: wusb: Storage class should be before const qualifier
    trivial: drivers/char/bsr.c: Storage class should be before const qualifier
    trivial: h8300: Storage class should be before const qualifier
    trivial: fix where cgroup documentation is not correctly referred to
    trivial: Give the right path in Documentation example
    trivial: MTD: remove EOL from MODULE_DESCRIPTION
    trivial: Fix typo in bio_split()'s documentation
    trivial: PWM: fix of #endif comment
    trivial: fix typos/grammar errors in Kconfig texts
    trivial: Fix misspelling of firmware
    trivial: cgroups: documentation typo and spelling corrections
    trivial: Update contact info for Jochen Hein
    trivial: fix typo "resgister" -> "register"
    ...

    Linus Torvalds
     

03 Apr, 2009

1 commit


02 Apr, 2009

1 commit


31 Mar, 2009

1 commit

  • Setting ->owner as done currently (pde->owner = THIS_MODULE) is racy
    as correctly noted at bug #12454. Someone can lookup entry with NULL
    ->owner, thus not pinning enything, and release it later resulting
    in module refcount underflow.

    We can keep ->owner and supply it at registration time like ->proc_fops
    and ->data.

    But this leaves ->owner as easy-manipulative field (just one C assignment)
    and somebody will forget to unpin previous/pin current module when
    switching ->owner. ->proc_fops is declared as "const" which should give
    some thoughts.

    ->read_proc/->write_proc were just fixed to not require ->owner for
    protection.

    rmmod'ed directories will be empty and return "." and ".." -- no harm.
    And directories with tricky enough readdir and lookup shouldn't be modular.
    We definitely don't want such modular code.

    Removing ->owner will also make PDE smaller.

    So, let's nuke it.

    Kudos to Jeff Layton for reminding about this, let's say, oversight.

    http://bugzilla.kernel.org/show_bug.cgi?id=12454

    Signed-off-by: Alexey Dobriyan

    Alexey Dobriyan
     

30 Mar, 2009

1 commit


29 Mar, 2009

4 commits


28 Mar, 2009

12 commits


27 Mar, 2009

4 commits

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

    * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
    x86: headers cleanup - setup.h
    emu101k1.h: fix duplicate include of <linux/types.h>
    compiler-gcc4: conditionalize #error on __KERNEL__
    remove __KERNEL_STRICT_NAMES
    make netfilter use strict integer types
    make drm headers use strict integer types
    make MTD headers use strict integer types
    make most exported headers use strict integer types
    make exported headers use strict posix types
    unconditionally include asm/types.h from linux/types.h
    make linux/types.h as assembly safe
    Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
    headers_check fix cleanup: linux/reiserfs_fs.h
    headers_check fix cleanup: linux/nubus.h
    headers_check fix cleanup: linux/coda_psdev.h
    headers_check fix: x86, setup.h
    headers_check fix: x86, prctl.h
    headers_check fix: linux/reinserfs_fs.h
    headers_check fix: linux/socket.h
    headers_check fix: linux/nubus.h
    ...

    Manually fix trivial conflicts in:
    include/linux/netfilter/xt_limit.h
    include/linux/netfilter/xt_statistic.h

    Linus Torvalds
     
  • * 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
    x86: disable __do_IRQ support
    sparseirq, powerpc/cell: fix unused variable warning in interrupt.c
    genirq: deprecate obsolete typedefs and defines
    genirq: deprecate __do_IRQ
    genirq: add doc to struct irqaction
    genirq: use kzalloc instead of explicit zero initialization
    genirq: make irqreturn_t an enum
    genirq: remove redundant if condition
    genirq: remove unused hw_irq_controller typedef
    irq: export remove_irq() and setup_irq() symbols
    irq: match remove_irq() args with setup_irq()
    irq: add remove_irq() for freeing of setup_irq() irqs
    genirq: assert that irq handlers are indeed running in hardirq context
    irq: name 'p' variables a bit better
    irq: further clean up the free_irq() code flow
    irq: refactor and clean up the free_irq() code flow
    irq: clean up manage.c
    irq: use GFP_KERNEL for action allocation in request_irq()
    kernel/irq: fix sparse warning: make symbol static
    irq: optimize init_kstat_irqs/init_copy_kstat_irqs
    ...

    Linus Torvalds
     
  • Conflicts:
    drivers/net/wimax/i2400m/usb-notif.c

    David S. Miller
     
  • Ingo Molnar
     

24 Mar, 2009

1 commit


16 Mar, 2009

1 commit


10 Mar, 2009

3 commits


06 Mar, 2009

2 commits

  • Conflicts:
    arch/x86/Kconfig
    block/blktrace.c
    kernel/irq/handle.c

    Semantic conflict:
    kernel/trace/blktrace.c

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • Impact: cleaup

    Make the following cleanups.

    * There isn't much arch-specific about PERCPU_MODULE_RESERVE. Always
    define it whether arch overrides PERCPU_ENOUGH_ROOM or not.

    * blackfin overrides PERCPU_ENOUGH_ROOM to align static area size. Do
    it by default.

    * percpu allocation sizes doesn't have much to do with the page size.
    Don't use PAGE_SHIFT in their definition.

    Signed-off-by: Tejun Heo
    Cc: Bryan Wu

    Tejun Heo