Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.34-git1

May 17, 2010

  1. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/geert/linux-m68k
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: amiga - Floppy platform device conversion
      m68k: amiga - Sound platform device conversion
      m68k: amiga - Frame buffer platform device conversion
      m68k: amiga - Zorro host bridge platform device conversion
      m68k: amiga - Zorro bus modalias support
      platform: Make platform resource input parameters const
      m68k: invoke oom-killer from page fault
      serial167: Kill unused variables
      m68k: Implement generic_find_next_{zero_,}le_bit()
      m68k: hp300 - Checkpatch cleanup
      m68k: Remove trailing spaces in messages
      m68k: Simplify param.h by using <asm-generic/param.h>
      m68k: Remove BKL from rtc implementations
    torvalds authored
  2. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

    * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
      logfs: handle powerfail on NAND flash
      logfs: handle errors from get_mtd_device()
      logfs: remove unused variable
      logfs: fix sync
      logfs: fix compile failure
      logfs: initialize li->li_refcount
      logfs: commit reservations under space pressure
      logfs: survive logfs_buf_recover read errors
      logfs: Close i_ino reuse race
      logfs: fix logfs_seek_hole()
      logfs: Return -EINVAL if filesystem image doesn't match
      LogFS: Fix typo in b6349ac
      logfs: testing the wrong variable
    torvalds authored
  3. Linus Torvalds

    Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/frederic/random-tracing
    
    * 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      ptrace: Cleanup useless header
      ptrace: kill BKL in ptrace syscall
    torvalds authored
  4. Geert Uytterhoeven

    m68k: amiga - Floppy platform device conversion

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  5. Geert Uytterhoeven

    m68k: amiga - Sound platform device conversion

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  6. Geert Uytterhoeven

    m68k: amiga - Frame buffer platform device conversion

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  7. Geert Uytterhoeven

    m68k: amiga - Zorro host bridge platform device conversion

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  8. Geert Uytterhoeven

    m68k: amiga - Zorro bus modalias support

    Add Amiga Zorro bus modalias and uevent support
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  9. Geert Uytterhoeven

    platform: Make platform resource input parameters const

    Make the platform resource input parameters of platform_device_add_resources()
    and platform_device_register_simple() const, as the resources are copied and
    never modified.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    geertu authored
  10. m68k: invoke oom-killer from page fault

    As explained in commit 1c0fe6e, we want to call the architecture independent
    oom killer when getting an unexplained OOM from handle_mm_fault, rather than
    simply killing current.
    
    Cc: linux-m68k@lists.linux-m68k.org
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: linux-arch@vger.kernel.org
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: David Rientjes <rientjes@google.com>
    [Geert] Kill 2 introduced compiler warnings
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Nick Piggin authored geertu committed
  11. Geert Uytterhoeven

    serial167: Kill unused variables

    commits 638157b ("serial167: prepare to push
    BKL down into drivers") and 4165fe4 ("tty:
    Fix up char drivers request_room usage") removed code without removing the
    corresponding variables:
    
    | drivers/char/serial167.c: In function 'cd2401_rx_interrupt':
    | drivers/char/serial167.c:630: warning: unused variable 'len'
    | drivers/char/serial167.c: In function 'cy_ioctl':
    | drivers/char/serial167.c:1531: warning: unused variable 'val'
    
    Remove the variables to kill the warnings.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  12. Geert Uytterhoeven

    m68k: Implement generic_find_next_{zero_,}le_bit()

    linux-next:
    fs/udf/balloc.c: In function 'udf_bitmap_new_block':
    fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'
    
    Convert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(),
    and wrap the ext2_find_next_{zero_,}bit() around the latter.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    geertu authored
  13. m68k: hp300 - Checkpatch cleanup

    arch/m68k/hp300/time.h:2: WARNING: space prohibited between function name and open parenthesis '('
    
    Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Andrea Gelmini authored geertu committed
  14. m68k: Remove trailing spaces in messages

    Signed-off-by: Frans Pop <elendil@planet.nl>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Frans Pop authored geertu committed
  15. Robert P. J. Day

    m68k: Simplify param.h by using <asm-generic/param.h>

    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    rpjday authored geertu committed
  16. m68k: Remove BKL from rtc implementations

    m68k does not support SMP. The access to the rtc is already serialized
    with local_irq_save/restore which is sufficient on UP.
    
    The open() protection in arch/m68k/mvme16x/rtc.c is not pretty but
    sufficient on UP and safe w/o the BKL.
    
    open() in arch/m68k/bvme6000/rtc.c can do with the same atomic logic
    as arch/m68k/mvme16x/rtc.c
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Thomas Gleixner authored geertu committed
  17. Anton Blanchard

    atomic_t: Remove volatile from atomic_t definition

    When looking at a performance problem on PowerPC, I noticed some awful code
    generation:
    
    c00000000051fc98:       3b 60 00 01     li      r27,1
    ...
    c00000000051fca0:       3b 80 00 00     li      r28,0
    ...
    c00000000051fcdc:       93 61 00 70     stw     r27,112(r1)
    c00000000051fce0:       93 81 00 74     stw     r28,116(r1)
    c00000000051fce4:       81 21 00 70     lwz     r9,112(r1)
    c00000000051fce8:       80 01 00 74     lwz     r0,116(r1)
    c00000000051fcec:       7d 29 07 b4     extsw   r9,r9
    c00000000051fcf0:       7c 00 07 b4     extsw   r0,r0
    
    c00000000051fcf4:       7c 20 04 ac     lwsync
    c00000000051fcf8:       7d 60 f8 28     lwarx   r11,0,r31
    c00000000051fcfc:       7c 0b 48 00     cmpw    r11,r9
    c00000000051fd00:       40 c2 00 10     bne-    c00000000051fd10
    c00000000051fd04:       7c 00 f9 2d     stwcx.  r0,0,r31
    c00000000051fd08:       40 c2 ff f0     bne+    c00000000051fcf8
    c00000000051fd0c:       4c 00 01 2c     isync
    
    We create two constants, write them out to the stack, read them straight back
    in and sign extend them. What a mess.
    
    It turns out this bad code is a result of us defining atomic_t as a
    volatile int.
    
    We removed the volatile attribute from the powerpc atomic_t definition years
    ago, but commit ea435467500612636f8f4fb639ff6e76b2496e4b (atomic_t: unify all
    arch definitions) added it back in.
    
    To dig up an old quote from Linus:
    
    > The fact is, volatile on data structures is a bug. It's a wart in the C
    > language. It shouldn't be used.
    >
    > Volatile accesses in *code* can be ok, and if we have "atomic_read()"
    > expand to a "*(volatile int *)&(x)->value", then I'd be ok with that.
    >
    > But marking data structures volatile just makes the compiler screw up
    > totally, and makes code for initialization sequences etc much worse.
    
    And screw up it does :)
    
    With the volatile removed, we see much more reasonable code generation:
    
    c00000000051f5b8:       3b 60 00 01     li      r27,1
    ...
    c00000000051f5c0:       3b 80 00 00     li      r28,0
    ...
    
    c00000000051fc7c:       7c 20 04 ac     lwsync
    c00000000051fc80:       7c 00 f8 28     lwarx   r0,0,r31
    c00000000051fc84:       7c 00 d8 00     cmpw    r0,r27
    c00000000051fc88:       40 c2 00 10     bne-    c00000000051fc98
    c00000000051fc8c:       7f 80 f9 2d     stwcx.  r28,0,r31
    c00000000051fc90:       40 c2 ff f0     bne+    c00000000051fc80
    c00000000051fc94:       4c 00 01 2c     isync
    
    Six instructions less.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    antonblanchard authored torvalds committed
  18. Anton Blanchard

    atomic_t: Cast to volatile when accessing atomic variables

    In preparation for removing volatile from the atomic_t definition, this
    patch adds a volatile cast to all the atomic read functions.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    antonblanchard authored torvalds committed

May 16, 2010

  1. Linus Torvalds

    Linus 2.6.34

    torvalds authored
  2. Linus Torvalds

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

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      rtnetlink: make SR-IOV VF interface symmetric
      sctp: delete active ICMP proto unreachable timer when free transport
      tcp: fix MD5 (RFC2385) support
    torvalds authored
  3. Linus Torvalds

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Oprofile: Fix Loongson irq handler
      MIPS: N32: Use compat version for sys_ppoll.
      MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
    torvalds authored
  4. Chris Wright

    rtnetlink: make SR-IOV VF interface symmetric

    Now we have a set of nested attributes:
    
      IFLA_VFINFO_LIST (NESTED)
        IFLA_VF_INFO (NESTED)
          IFLA_VF_MAC
          IFLA_VF_VLAN
          IFLA_VF_TX_RATE
    
    This allows a single set to operate on multiple attributes if desired.
    Among other things, it means a dump can be replayed to set state.
    
    The current interface has yet to be released, so this seems like
    something to consider for 2.6.34.
    
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    chriswright authored davem330 committed
  5. sctp: delete active ICMP proto unreachable timer when free transport

    transport may be free before ICMP proto unreachable timer expire, so
    we should delete active ICMP proto unreachable timer when transport
    is going away.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Wei Yongjun authored davem330 committed
  6. tcp: fix MD5 (RFC2385) support

    TCP MD5 support uses percpu data for temporary storage. It currently
    disables preemption so that same storage cannot be reclaimed by another
    thread on same cpu.
    
    We also have to make sure a softirq handler wont try to use also same
    context. Various bug reports demonstrated corruptions.
    
    Fix is to disable preemption and BH.
    
    Reported-by: Bhaskar Dutta <bhaskie@gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet authored davem330 committed

May 15, 2010

  1. lzufalcon

    MIPS: Oprofile: Fix Loongson irq handler

        
        The interrupt enable bit for the performance counters is in the Control
        Register $24, not in the counter register.
        loongson2_perfcount_handler(), we need to use
        
        Reported-by: Xu Hengyang <hengyang@mail.ustc.edu.cn>
        Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
        Cc: linux-mips@linux-mips.org
        Patchwork: http://patchwork.linux-mips.org/patch/1198/
        Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    
    ---
    lzufalcon authored ralfbaechle committed
  2. MIPS: N32: Use compat version for sys_ppoll.

        
        The sys_ppoll() takes struct 'struct timespec'. This is different for the
        N32 and N64 ABIs. Use the compat version to do the proper conversions.
        
        Signed-off-by: David Daney <ddaney@caviumnetworks.com>
        To: linux-mips@linux-mips.org
        Patchwork: http://patchwork.linux-mips.org/patch/1210/
        Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    
    ---
    Chandrakala Chavva authored ralfbaechle committed
  3. MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1

        
        In the FPU emulator code of the MIPS, the Cause bits of the FCSR register
        are not currently writeable by the ctc1 instruction.  In odd corner cases,
        this can cause problems.  For example, a case existed where a divide-by-zero
        exception was generated by the FPU, and the signal handler attempted to
        restore the FPU registers to their state before the exception occurred.  In
        this particular setup, writing the old value to the FCSR register would
        cause another divide-by-zero exception to occur immediately.  The solution
        is to change the ctc1 instruction emulator code to allow the Cause bits of
        the FCSR register to be writeable.  This is the behaviour of the hardware
        that the code is emulating.
        
        This problem was found by Shane McDonald, but the credit for the fix goes
        to Kevin Kissell.  In Kevin's words:
        
        I submit that the bug is indeed in that ctc_op:  case of the emulator.  The
        Cause bits (17:12) are supposed to be writable by that instruction, but the
        CTC1 emulation won't let them be updated by the instruction.  I think that
        actually if you just completely removed lines 387-388 [...] things would
        work a good deal better.  At least, it would be a more accurate emulation of
        the architecturally defined FPU.  If I wanted to be really, really pedantic
        (which I sometimes do), I'd also protect the reserved bits that aren't
        necessarily writable.
        
        Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
        To: anemo@mba.ocn.ne.jp
        To: kevink@paralogos.com
        To: sshtylyov@mvista.com
        Patchwork: http://patchwork.linux-mips.org/patch/1205/
        Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    
    ---
    Shane McDonald authored ralfbaechle committed
  4. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: check for read permission on src file in the clone ioctl
    torvalds authored
  5. dkirjanov

    lib/btree: fix possible NULL pointer dereference

    mempool_alloc() can return null in atomic case.
    
    Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
    Cc: Joern Engel <joern@logfs.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dkirjanov authored torvalds committed
  6. Nicolas Ferre

    mmc: at91_mci: modify cache flush routines

    As we were using an internal dma flushing routine, this patch changes to
    the DMA API flush_kernel_dcache_page().  Driver is able to compile now.
    
    [akpm@linux-foundation.org: flush_kernel_dcache_page() comes before kunmap_atomic()]
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    noglitch authored torvalds committed
  7. Dan Rosenberg

    Btrfs: check for read permission on src file in the clone ioctl

    The existing code would have allowed you to clone a file that was
    only open for writing
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    djrbliss authored chrismason-xx committed
  8. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      JFS: Free sbi memory in error path
      fs/sysv: dereferencing ERR_PTR()
      Fix double-free in logfs
      Fix the regression created by "set S_DEAD on unlink()..." commit
    torvalds authored
  9. Linus Torvalds

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf record: Add a fallback to the reference relocation symbol
    torvalds authored
  10. JFS: Free sbi memory in error path

    I spotted the missing kfree() while removing the BKL.
    
    [akpm@linux-foundation.org: avoid multiple returns so it doesn't happen again]
    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Cc: Dave Kleikamp <shaggy@austin.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Jan Blunck authored Al Viro committed
  11. fs/sysv: dereferencing ERR_PTR()

    I moved the dir_put_page() inside the if condition so we don't dereference
    "page", if it's an ERR_PTR().
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Dan Carpenter authored Al Viro committed
Something went wrong with that request. Please try again.