1. 23 Jun, 2009 18 commits
  2. 22 Jun, 2009 22 commits
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · ac1b7c37
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (63 commits)
        mtd: OneNAND: Allow setting of boundary information when built as module
        jffs2: leaking jffs2_summary in function jffs2_scan_medium
        mtd: nand: Fix memory leak on txx9ndfmc probe failure.
        mtd: orion_nand: use burst reads with double word accesses
        mtd/nand: s3c6400 support for s3c2410 driver
        [MTD] [NAND] S3C2410: Use DIV_ROUND_UP
        [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write
        [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND
        [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set
        mtd: physmap_of: Add multiple regions and concatenation support
        mtd: nand: max_retries off by one in mxc_nand
        mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440
        mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform
        mtd: Flex-OneNAND support
        mtd: nand: add OMAP2/OMAP3 NAND driver
        mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
        mtd: uclinux: mark local stuff static
        mtd: uclinux: do not allow to be built as a module
        mtd: uclinux: allow systems to override map addr/size
        mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 9e268beb
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (49 commits)
        [ARM] idle: clean up pm_idle calling, obey hlt_counter
        [ARM] S3C: Fix gpio-config off-by-one bug
        [ARM] S3C64XX: add to_irq() support for EINT() GPIO
        [ARM] S3C64XX: clock.c: fix typo in usb-host clock ctrlbit
        [ARM] S3C64XX: fix HCLK gate defines
        [ARM] Update mach-types
        [ARM] wire up rt_tgsigqueueinfo and perf_counter_open
        OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons
        OMAP3 SDRC: set FIXEDDELAY when disabling SDRC DLL
        OMAP3: Add support for DPLL3 divisor values higher than 2
        OMAP3 SRAM: convert SRAM code to use macros rather than magic numbers
        OMAP3 SRAM: add more comments on the SRAM code
        OMAP3 clock/SDRC: program SDRC_MR register during SDRC clock change
        OMAP3 clock: add a short delay when lowering CORE clk rate
        OMAP3 clock: initialize SDRC timings at kernel start
        OMAP3 clock: remove wait for DPLL3 M2 clock to stabilize
        [ARM] Add old Feroceon support to compressed/head.S
        [ARM] 5559/1: Limit the stack unwinding caused by a kthread exit
        [ARM] 5558/1: Add extra checks to ARM unwinder to avoid tracing corrupt stacks
        [ARM] 5557/1: Discard some ARM.ex*.*exit.text sections when !HOTPLUG or !HOTPLUG_CPU
    • Russell King's avatar
      [ARM] idle: clean up pm_idle calling, obey hlt_counter · 9ccdac36
      Russell King authored
      pm_idle is used by infrastructure (eg, cpuidle) which expects architectures
      to call it in a certain way.  Arrange for ARM to follow x86's lead on this
      and call pm_idle() with interrupts already disabled.  However, we expect
      pm_idle() to enable interrupts before it returns.
      Also, OMAP wants to be able to disable hlt-ing, so allow hlt_counter to
      prevent all calls to pm_idle.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
    • David Howells's avatar
      MN10300: Fix the vmlinux ldscript · 2e8b5a09
      David Howells authored
      Fix the MN10300 vmlinux ldscript.  It needs to use various macros from
      asm-generic/vmlinux.lds.h to correctly include all that it needs to.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • David Howells's avatar
      LDSCRIPT: Name INIT_RAM_FS consistently · eadfe219
      David Howells authored
      In asm-generic/vmlinux.lds.h, name INIT_RAM_FS consistently, no matter the
      setting of CONFIG_BLK_DEV_INITRD.  This corrects:
      	commit ef53dae8
      	Author: Sam Ravnborg <sam@ravnborg.org>
      	Date:   Sun Jun 7 20:46:37 2009 +0200
      	Subject: Improve vmlinux.lds.h support for arch specific linker scripts
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsd · 7e0338c0
      Linus Torvalds authored
      * 'for-2.6.31' of git://fieldses.org/git/linux-nfsd: (60 commits)
        SUNRPC: Fix the TCP server's send buffer accounting
        nfsd41: Backchannel: minorversion support for the back channel
        nfsd41: Backchannel: cleanup nfs4.0 callback encode routines
        nfsd41: Remove ip address collision detection case
        nfsd: optimise the starting of zero threads when none are running.
        nfsd: don't take nfsd_mutex twice when setting number of threads.
        nfsd41: sanity check client drc maxreqs
        nfsd41: move channel attributes from nfsd4_session to a nfsd4_channel_attr struct
        NFS: kill off complicated macro 'PROC'
        sunrpc: potential memory leak in function rdma_read_xdr
        nfsd: minor nfsd_vfs_write cleanup
        nfsd: Pull write-gathering code out of nfsd_vfs_write
        nfsd: track last inode only in use_wgather case
        sunrpc: align cache_clean work's timer
        nfsd: Use write gathering only with NFSv2
        NFSv4: kill off complicated macro 'PROC'
        NFSv4: do exact check about attribute specified
        knfsd: remove unreported filehandle stats counters
        knfsd: fix reply cache memory corruption
        knfsd: reply cache cleanups
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · df36b439
      Linus Torvalds authored
      * 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (128 commits)
        nfs41: sunrpc: xprt_alloc_bc_request() should not use spin_lock_bh()
        nfs41: Move initialization of nfs4_opendata seq_res to nfs4_init_opendata_res
        nfs: remove unnecessary NFS_INO_INVALID_ACL checks
        NFS: More "sloppy" parsing problems
        NFS: Invalid mount option values should always fail, even with "sloppy"
        NFS: Remove unused XDR decoder functions
        NFS: Update MNT and MNT3 reply decoding functions
        NFS: add XDR decoder for mountd version 3 auth-flavor lists
        NFS: add new file handle decoders to in-kernel mountd client
        NFS: Add separate mountd status code decoders for each mountd version
        NFS: remove unused function in fs/nfs/mount_clnt.c
        NFS: Use xdr_stream-based XDR encoder for MNT's dirpath argument
        NFS: Clean up MNT program definitions
        lockd: Don't bother with RPC ping for NSM upcalls
        lockd: Update NSM state from SM_MON replies
        NFS: Fix false error return from nfs_callback_up() if ipv6.ko is not available
        NFS: Return error code from nfs_callback_up() to user space
        NFS: Do not display the setting of the "intr" mount option
        NFS: add support for splice writes
        nfs41: Backchannel: CB_SEQUENCE validation
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · a9b011f5
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (22 commits)
        [S390] Update default configuration.
        [S390] kprobes: defer setting of ctlblk state
        [S390] Enable tick based perf_counter on s390.
        [S390] dasd: fix refcounting in dasd_change_state
        [S390] lockless idle time accounting
        [S390] driver_data access
        [S390] pm: fix build error for !SMP
        [S390] dasd_pm: fix stop flag handling
        [S390] ap/zcrypt: Suspend/Resume ap bus and zcrypt
        [S390] qdio: Sanitize do_QDIO sanity checks
        [S390] qdio: leave inbound SBALs primed
        [S390] qdio: merge AI tasklet into interrupt handler
        [S390] qdio: extract all primed SBALs at once
        [S390] qdio: fix check for running under z/VM
        [S390] qdio: move adapter interrupt tasklet code
        [S390] Use del_timer instead of del_timer_sync
        [S390] s390: remove DEBUG_MALLOC
        [S390] vt220 console: convert from bootmem to slab
        [S390] sclp console: convert from bootmem to slab
        [S390] 3270 console: convert from bootmem to slab
    • Linus Torvalds's avatar
      Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux · b5bdd438
      Linus Torvalds authored
      * 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
        i2c: Fix stuck transaction on cpm-i2c driver
        i2c-omap: Fix build breaking typo cpu_is_omap_2430
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 · f39cf0b7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
        xtensa: enable m41t80 driver in s6105_defconfig
        xtensa: add m41t62 rtc to s6105 platform
        xtensa: enable s6gmac in s6105_defconfig
        xtensa: s6105 specific configuration for s6gmac
        s6gmac: xtensa s6000 on-chip ethernet driver
        xtensa: support s6000 gpio irqs and alternate function selection
        xtensa: s6000 dma engine support
        xtensa: allow variant to initialize own irq chips
        xtensa: cache inquiry and unaligned cache handling functions
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 59ef7a83
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (74 commits)
        PCI: make msi_free_irqs() to use msix_mask_irq() instead of open coded write
        PCI: Fix the NIU MSI-X problem in a better way
        PCI ASPM: remove get_root_port_link
        PCI ASPM: cleanup pcie_aspm_sanity_check
        PCI ASPM: remove has_switch field
        PCI ASPM: cleanup calc_Lx_latency
        PCI ASPM: cleanup pcie_aspm_get_cap_device
        PCI ASPM: cleanup clkpm checks
        PCI ASPM: cleanup __pcie_aspm_check_state_one
        PCI ASPM: cleanup initialization
        PCI ASPM: cleanup change input argument of aspm functions
        PCI ASPM: cleanup misc in struct pcie_link_state
        PCI ASPM: cleanup clkpm state in struct pcie_link_state
        PCI ASPM: cleanup latency field in struct pcie_link_state
        PCI ASPM: cleanup aspm state field in struct pcie_link_state
        PCI ASPM: fix typo in struct pcie_link_state
        PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS
        PCI: remove redundant __msi_set_enable()
        PCI PM: consistently use type bool for wake enable variable
        x86/ACPI: Correct maximum allowed _CRS returned resources and warn if exceeded
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 5165aece
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (43 commits)
        via-velocity: Fix velocity driver unmapping incorrect size.
        mlx4_en: Remove redundant refill code on RX
        mlx4_en: Removed redundant check on lso header size
        mlx4_en: Cancel port_up check in transmit function
        mlx4_en: using stop/start_all_queues
        mlx4_en: Removed redundant skb->len check
        mlx4_en: Counting all the dropped packets on the TX side
        usbnet cdc_subset: fix issues talking to PXA gadgets
        Net: qla3xxx, remove sleeping in atomic
        ipv4: fix NULL pointer + success return in route lookup path
        isdn: clean up documentation index
        cfg80211: validate station settings
        cfg80211: allow setting station parameters in mesh
        cfg80211: allow adding/deleting stations on mesh
        ath5k: fix beacon_int handling
        MAINTAINERS: Fix Atheros pattern paths
        ath9k: restore PS mode, before we put the chip into FULL SLEEP state.
        ath9k: wait for beacon frame along with CAB
        acer-wmi: fix rfkill conversion
        ath5k: avoid PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
    • Hitoshi Mitake's avatar
      Making fs/minix/minix.h double including safe · e38be994
      Hitoshi Mitake authored
      I happened to find that fs/minix/minix.h doesn't guard double include.
      Yes, I know this never cause something destructive because this is
      self-evidence that no source file includes minix.h twice, but I think
      fixing this is better than disregarding it.
      Signed-off-by: default avatarHitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Alan Cox's avatar
      msm: fixups to match current code · 44da59e4
      Alan Cox authored
      The tty layer is now a bit more fussy about reporting the right baud rate
      back. Make the msm driver match the current state of affairs.
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Robert Love's avatar
    • Richard Röjfors's avatar
      timbuart: Fix for tx_empty · 2421c48b
      Richard Röjfors authored
      Hardware updated to support TX FIFO empty.
      Signed-off-by: default avatarRichard Röjfors <richard.rojfors.ext@mocean-labs.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Paul Fulghum's avatar
      tty: n_hdlc add buffer flushing · be10eb75
      Paul Fulghum authored
      Add flush_buffer tty callback to flush rx buffers.
      Add TCFLSH ioctl processing to flush tx buffers.
      Increase default tx buffers from 1 to 3.
      Remove unneeded flush_buffer call in open callback.
      Remove vendor specific CVS version string.
      Signed-off-by: default avatarPaul Fulghum <paulkf@microgate.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Peter Korsgaard's avatar
      serial: samsung.c: mark s3c24xx_serial_remove as __devexit · 90ceb964
      Peter Korsgaard authored
      Mark the remove function as __devexit so it gets eliminated in
      CONFIG_HOTPLUG=n builds.  Saves ~100 bytes.
      Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
      Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Kevin Hilman's avatar
      serial@ add OMAP wakeup-enable register · 099d5270
      Kevin Hilman authored
      Add the wakeup enable register to the list of OMAP-specific UART
      registers.  This is to support forthcoming OMAP PM enhancements which
      use the wakeup feature of the OMAP's 8250-based UART.
      Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Alan Cox's avatar
      tty: fix some bogns in the serqt_usb2 driver · 94362fd7
      Alan Cox authored
      Remove the replicated urban legends from the comments and fix a couple of
      other silly calls
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Alan Cox's avatar
      ppp: Fix throttling bugs · a6540f73
      Alan Cox authored
      The ppp layer goes around calling the unthrottle method from non sleeping
      paths. This isn't safe because the unthrottle methods in the tty layer need
      to be able to sleep (consider a USB dongle).
      Until now this didn't show up because the ppp layer never actually throttled
      a port so the unthrottle was always a no-op. Currently it's a mutex taking
      path so warnings are spewed if the unthrottle occurs via certain paths.
      Fix this by removing the unneccessary unthrottle calls.
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Jiri Slaby's avatar
      vt_ioctl: fix lock imbalance · a115902f
      Jiri Slaby authored
      Don't return from switch/case directly in vt_ioctl. Set ret and break
      instead so that we unlock BKL.
      Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>