1. 20 Aug, 2010 19 commits
  2. 19 Aug, 2010 3 commits
  3. 18 Aug, 2010 18 commits
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 763008c4
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: Fix an Oops in the NFSv4 atomic open code
        NFS: Fix the selection of security flavours in Kconfig
        NFS: fix the return value of nfs_file_fsync()
        rpcrdma: Fix SQ size calculation when memreg is FRMR
        xprtrdma: Do not truncate iova_start values in frmr registrations.
        nfs: Remove redundant NULL check upon kfree()
        nfs: Add "lookupcache" to displayed mount options
        NFS: allow close-to-open cache semantics to apply to root of NFS filesystem
        SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494)
      763008c4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · d1126ad9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        USB HID: Add ID for eGalax Multitouch used in JooJoo tablet
        HID: hiddev: fix memory corruption due to invalid intfdata
        HID: hiddev: protect against disconnect/NULL-dereference race
        HID: picolcd: correct ordering of framebuffer freeing
        HID: picolcd: testing the wrong variable
      d1126ad9
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 2a554736
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Fix build error: conflicting types for ‘sys_execve’
      2a554736
    • David Howells's avatar
      Fix the declaration of sys_execve() in asm-generic/syscalls.h · d15ca320
      David Howells authored
      Fix the declaration of sys_execve() in asm-generic/syscalls.h to have
      various consts applied to its pointers.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d15ca320
    • Tony Luck's avatar
      [IA64] Fix build error: conflicting types for ‘sys_execve’ · 145e5aa2
      Tony Luck authored
      arch/ia64/kernel/process.c:636: error: conflicting types for ‘sys_execve’
      
      commit d7627467
      Make do_execve() take a const filename pointer
      
      Missed the declaration of sys_execve in the ia64 asm/unistd.h (perhaps
      because there is no reason for it to be there ... it might be a left over
      from the COMPAT code?). Just delete the conflicting version.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      145e5aa2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 145c3ae4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        fs: brlock vfsmount_lock
        fs: scale files_lock
        lglock: introduce special lglock and brlock spin locks
        tty: fix fu_list abuse
        fs: cleanup files_lock locking
        fs: remove extra lookup in __lookup_hash
        fs: fs_struct rwlock to spinlock
        apparmor: use task path helpers
        fs: dentry allocation consolidation
        fs: fix do_lookup false negative
        mbcache: Limit the maximum number of cache entries
        hostfs ->follow_link() braino
        hostfs: dumb (and usually harmless) tpyo - strncpy instead of strlcpy
        remove SWRITE* I/O types
        kill BH_Ordered flag
        vfs: update ctime when changing the file's permission by setfacl
        cramfs: only unlock new inodes
        fix reiserfs_evict_inode end_writeback second call
      145c3ae4
    • Uwe Kleine-König's avatar
      mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y · 81ca03a0
      Uwe Kleine-König authored
      This fixes a build breakage introduced by commit 4c2ef25f ("mmc: fix
      all hangs related to mmc/sd card insert/removal during suspend/resume")
      
      Cc: David Brownell <david-b@pacbell.net>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: linux-mmc@vger.kernel.org
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      Acked-by: default avatarMaxim Levitsky <maximlevitsky@gmail.com>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      81ca03a0
    • Kusanagi Kouichi's avatar
      perf tools: Fix build error on read only source. · ecafda60
      Kusanagi Kouichi authored
      Parts of the build process were generating files outside the specified
      O= directory, causing the build to fail on systems where the sources are
      in a read only file system.
      
      Fix it by using $(OUTPUT) on these locations.
      
      Also check that $(OUTPUT) actually exists, just like the top level
      kernel Makefile does. Otherwise the failure message emitted is
      completely misleading.
      
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <20100817140841.0859362C03A@msa106.auone-net.jp>
      Signed-off-by: default avatarKusanagi Kouichi <slash@ac.auone-net.jp>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      ecafda60
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 1ca72feb
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/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 tools: Fix build on POSIX shells
        latencytop: Fix kconfig dependency warnings
        perf annotate tui: Fix exit and RIGHT keys handling
        tracing: Sanitize value returned from write(trace_marker, "...", len)
        tracing/events: Convert format output to seq_file
        tracing: Extend recordmcount to better support Blackfin mcount
        tracing: Fix ring_buffer_read_page reading out of page boundary
        tracing: Fix an unallocated memory access in function_graph
      1ca72feb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 7dfb2d40
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)
        ALSA: hda - Fix ALC680 base model capture
        ASoC: Remove DSP mode support for WM8776
        ALSA: hda - Add quirk for Dell Vostro 1220
        ALSA: riptide - Fix detection / load of firmware files
      7dfb2d40
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 6c8bfb7f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: include sched.h in ColdFire/SPI driver
        m68knommu: formatting of pointers in printk()
        m68knommu: arch/m68k/include/asm/ide.h fix for nommu
      6c8bfb7f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · d9f5d415
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md:
        md raid-1/10 Fix bio_rw bit manipulations again
        md: provide appropriate return value for spare_active functions.
        md: Notify sysfs when RAID1/5/10 disk is In_sync.
        Update recovery_offset even when external metadata is used.
      d9f5d415
    • Linus Torvalds's avatar
      Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 86ea51d4
      Linus Torvalds authored
      * 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
        spi.h: missing kernel-doc notation, please fix
        of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
        of: Fix missing includes
        ata: update for of_device to platform_device replacement
        microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
        microblaze: Fix of/address: Merge all of the bus translation code
        booting-without-of: Remove nonexistent chapters from TOC, fix numbering
      86ea51d4
    • Trond Myklebust's avatar
      NFS: Fix an Oops in the NFSv4 atomic open code · 0a377cff
      Trond Myklebust authored
      Adam Lackorzynski reports:
      
      with 2.6.35.2 I'm getting this reproducible Oops:
      
      [  110.825396] BUG: unable to handle kernel NULL pointer dereference at
      (null)
      [  110.828638] IP: [<ffffffff811247b7>] encode_attrs+0x1a/0x2a4
      [  110.828638] PGD be89f067 PUD bf18f067 PMD 0
      [  110.828638] Oops: 0000 [#1] SMP
      [  110.828638] last sysfs file: /sys/class/net/lo/operstate
      [  110.828638] CPU 2
      [  110.828638] Modules linked in: rtc_cmos rtc_core rtc_lib amd64_edac_mod
      i2c_amd756 edac_core i2c_core dm_mirror dm_region_hash dm_log dm_snapshot
      sg sr_mod usb_storage ohci_hcd mptspi tg3 mptscsih mptbase usbcore nls_base
      [last unloaded: scsi_wait_scan]
      [  110.828638]
      [  110.828638] Pid: 11264, comm: setchecksum Not tainted 2.6.35.2 #1
      [  110.828638] RIP: 0010:[<ffffffff811247b7>]  [<ffffffff811247b7>]
      encode_attrs+0x1a/0x2a4
      [  110.828638] RSP: 0000:ffff88003bf5b878  EFLAGS: 00010296
      [  110.828638] RAX: ffff8800bddb48a8 RBX: ffff88003bf5bb18 RCX:
      0000000000000000
      [  110.828638] RDX: ffff8800be258800 RSI: 0000000000000000 RDI:
      ffff88003bf5b9f8
      [  110.828638] RBP: 0000000000000000 R08: ffff8800bddb48a8 R09:
      0000000000000004
      [  110.828638] R10: 0000000000000003 R11: ffff8800be779000 R12:
      ffff8800be258800
      [  110.828638] R13: ffff88003bf5b9f8 R14: ffff88003bf5bb20 R15:
      ffff8800be258800
      [  110.828638] FS:  0000000000000000(0000) GS:ffff880041e00000(0063)
      knlGS:00000000556bd6b0
      [  110.828638] CS:  0010 DS: 002b ES: 002b CR0: 000000008005003b
      [  110.828638] CR2: 0000000000000000 CR3: 00000000be8ef000 CR4:
      00000000000006e0
      [  110.828638] DR0: 0000000000000000 DR1: 0000000000000000 DR2:
      0000000000000000
      [  110.828638] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7:
      0000000000000400
      [  110.828638] Process setchecksum (pid: 11264, threadinfo
      ffff88003bf5a000, task ffff88003f232210)
      [  110.828638] Stack:
      [  110.828638]  0000000000000000 ffff8800bfbcf920 0000000000000000
      0000000000000ffe
      [  110.828638] <0> 0000000000000000 0000000000000000 0000000000000000
      0000000000000000
      [  110.828638] <0> 0000000000000000 0000000000000000 0000000000000000
      0000000000000000
      [  110.828638] Call Trace:
      [  110.828638]  [<ffffffff81124c1f>] ? nfs4_xdr_enc_setattr+0x90/0xb4
      [  110.828638]  [<ffffffff81371161>] ? call_transmit+0x1c3/0x24a
      [  110.828638]  [<ffffffff813774d9>] ? __rpc_execute+0x78/0x22a
      [  110.828638]  [<ffffffff81371a91>] ? rpc_run_task+0x21/0x2b
      [  110.828638]  [<ffffffff81371b7e>] ? rpc_call_sync+0x3d/0x5d
      [  110.828638]  [<ffffffff8111e284>] ? _nfs4_do_setattr+0x11b/0x147
      [  110.828638]  [<ffffffff81109466>] ? nfs_init_locked+0x0/0x32
      [  110.828638]  [<ffffffff810ac521>] ? ifind+0x4e/0x90
      [  110.828638]  [<ffffffff8111e2fb>] ? nfs4_do_setattr+0x4b/0x6e
      [  110.828638]  [<ffffffff8111e634>] ? nfs4_do_open+0x291/0x3a6
      [  110.828638]  [<ffffffff8111ed81>] ? nfs4_open_revalidate+0x63/0x14a
      [  110.828638]  [<ffffffff811056c4>] ? nfs_open_revalidate+0xd7/0x161
      [  110.828638]  [<ffffffff810a2de4>] ? do_lookup+0x1a4/0x201
      [  110.828638]  [<ffffffff810a4733>] ? link_path_walk+0x6a/0x9d5
      [  110.828638]  [<ffffffff810a42b6>] ? do_last+0x17b/0x58e
      [  110.828638]  [<ffffffff810a5fbe>] ? do_filp_open+0x1bd/0x56e
      [  110.828638]  [<ffffffff811cd5e0>] ? _atomic_dec_and_lock+0x30/0x48
      [  110.828638]  [<ffffffff810a9b1b>] ? dput+0x37/0x152
      [  110.828638]  [<ffffffff810ae063>] ? alloc_fd+0x69/0x10a
      [  110.828638]  [<ffffffff81099f39>] ? do_sys_open+0x56/0x100
      [  110.828638]  [<ffffffff81027a22>] ? ia32_sysret+0x0/0x5
      [  110.828638] Code: 83 f1 01 e8 f5 ca ff ff 48 83 c4 50 5b 5d 41 5c c3 41
      57 41 56 41 55 49 89 fd 41 54 49 89 d4 55 48 89 f5 53 48 81 ec 18 01 00 00
      <8b> 06 89 c2 83 e2 08 83 fa 01 19 db 83 e3 f8 83 c3 18 a8 01 8d
      [  110.828638] RIP  [<ffffffff811247b7>] encode_attrs+0x1a/0x2a4
      [  110.828638]  RSP <ffff88003bf5b878>
      [  110.828638] CR2: 0000000000000000
      [  112.840396] ---[ end trace 95282e83fd77358f ]---
      
      We need to ensure that the O_EXCL flag is turned off if the user doesn't
      set O_CREAT.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      0a377cff
    • Takashi Iwai's avatar
      Merge branch 'fix/asoc' into for-linus · 2ea1ef57
      Takashi Iwai authored
      2ea1ef57
    • Takashi Iwai's avatar
      Merge branch 'fix/hda' into for-linus · 76165a30
      Takashi Iwai authored
      76165a30
    • Jaroslav Kysela's avatar
      ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter) · 56385a12
      Jaroslav Kysela authored
      With some hardware combinations, the PCM interrupts are acknowledged
      before the period boundary from the emu10k1 chip. The midlevel PCM code
      gets confused and the playback stream is interrupted.
      
      It seems that the interrupt processing shift by 2 samples is enough
      to fix this issue. This default value does not harm other,
      non-affected hardware.
      
      More information: Kernel bugzilla bug#16300
      
      [A copmile warning fixed by tiwai]
      Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      56385a12
    • Nick Piggin's avatar
      fs: brlock vfsmount_lock · 99b7db7b
      Nick Piggin authored
      fs: brlock vfsmount_lock
      
      Use a brlock for the vfsmount lock. It must be taken for write whenever
      modifying the mount hash or associated fields, and may be taken for read when
      performing mount hash lookups.
      
      A new lock is added for the mnt-id allocator, so it doesn't need to take
      the heavy vfsmount write-lock.
      
      The number of atomics should remain the same for fastpath rlock cases, though
      code would be slightly slower due to per-cpu access. Scalability is not not be
      much improved in common cases yet, due to other locks (ie. dcache_lock) getting
      in the way. However path lookups crossing mountpoints should be one case where
      scalability is improved (currently requiring the global lock).
      
      The slowpath is slower due to use of brlock. On a 64 core, 64 socket, 32 node
      Altix system (high latency to remote nodes), a simple umount microbenchmark
      (mount --bind mnt mnt2 ; umount mnt2 loop 1000 times), before this patch it
      took 6.8s, afterwards took 7.1s, about 5% slower.
      
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarNick Piggin <npiggin@kernel.dk>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      99b7db7b