Skip to content
Commits on Jun 1, 2010
  1. @torvalds

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

    …benh/powerpc
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set
      powerpc/44x: icon: select SM502 and frame buffer console support
      powerpc/85xx: Add P1021MDS board support
      powerpc/85xx: Change MPC8572DS camp dtses for MSI sharing
      powerpc/fsl_msi: add removal path and probe failing path
      powerpc/fsl_msi: enable msi sharing through AMP OSes
      powerpc/fsl_msi: enable msi allocation in all banks
      powerpc/fsl_msi: fix the conflict of virt_msir's chip_data
      powerpc/fsl_msi: Add multiple MSI bank support
      powerpc/kexec: Add support for FSL-BookE
      powerpc/fsl-booke: Move the entry setup code into a seperate file
      powerpc/fsl-booke: fix the case where we are not in the first page
      powerpc/85xx: Enable support for ports 3 and 4 on 8548 CDS
      powerpc/fsl-booke: Add hibernation support for FSL BookE processors
      powerpc/e500mc: Implement machine check handler.
      powerpc/44x: Add basic ICON PPC440SPe board support
      powerpc/44x: Fix UART clocks on 440SPe
      powerpc/44x: Add reset-type to katmai.dts
      powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC.
    torvalds committed Jun 1, 2010
  2. @torvalds

    Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/anholt/drm-intel
    
    * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (41 commits)
      drm/i915: add HAS_BSD check to i915_getparam
      drm/i915: Honor sync polarity from VBT panel timing descriptors
      drm/i915: Unmask interrupt for render engine on Sandybridge
      drm/i915: Fix PIPE_CONTROL command on Sandybridge
      drm/i915: Fix up address spaces in slow_kernel_write()
      drm/i915: Use non-atomic kmap for slow copy paths
      drm/i915: Avoid moving from CPU domain during pwrite
      drm/i915: Cleanup after failed initialization of ringbuffers
      drm/i915: Reject bind_to_gtt() early if object > aperture
      drm/i915: Check error code whilst moving buffer to GTT domain.
      drm/i915: Remove spurious warning "Failure to install fence"
      drm/i915: Rebind bo if currently bound with incorrect alignment.
      drm/i915: Include pitch in set_base debug statement.
      drm/i915: Only print "nothing to do" debug message as required.
      drm/i915: Propagate error from unbinding an unfenceable object.
      drm/i915: Avoid nesting of domain changes when setting display plane
      drm/i915: Hold the spinlock whilst resetting unpin_work along error path
      drm/i915: Only print an message if there was an error
      drm/i915: Clean up leftover bits from hws move to ring structure.
      drm/i915: Add CxSR support on Pineview DDR3
      ...
    torvalds committed Jun 1, 2010
  3. @error27 @torvalds

    FS-Cache: Remove unneeded null checks

    fscache_write_op() makes unnecessary checks of the page variable to see if it
    is NULL.  It can't be NULL at those points as the kernel would already have
    crashed a little higher up where we examined page->index.
    
    Furthermore, unless radix_tree_gang_lookup_tag() can return 1 but no page, a
    NULL pointer crash should not be encountered there as we can only get there if
    r_t_g_l_t() returned 1.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    error27 committed with torvalds Jun 1, 2010
  4. @anholt

    drm/i915: add HAS_BSD check to i915_getparam

    This will let userland only try to use the new media decode
    functionality when the appropriate kernel is present.
    
    Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Zou Nan hai committed with anholt May 31, 2010
  5. @nwnk @anholt

    drm/i915: Honor sync polarity from VBT panel timing descriptors

    I'm actually kind of shocked that it works at all otherwise.
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    nwnk committed with anholt May 28, 2010
  6. @torvalds

    Documentation/timers/hpet_example.c: only build on X86

    We should only build hpet_example on x86[-64], where it is implemented.
    It can cause build errors on other architectures.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Arjan van de Ven <arjan@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Randy Dunlap committed with torvalds Jun 1, 2010
  7. @torvalds

    AFS: Fix possible null pointer dereference in afs_alloc_server()

    Fix a possible null pointer dereference in afs_alloc_server(): the server
    pointer is NULL if there was an allocation failure, and under such a
    condition, we can't dereference it in the _leave() statement.
    
    Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Denis Kirjanov committed with torvalds Jun 1, 2010
  8. @torvalds

    fix cpu_chain section mismatch...

    In commit e9fb763 ("cpu-hotplug: introduce cpu_notify(),
    __cpu_notify(), cpu_notify_nofail()") the new helper functions access
    cpu_chain.  As a result, it shouldn't be marked __cpuinitdata (via
    section mismatch warning).
    
    Alternatively, the helper functions should be forced inline, or marked
    __ref or __cpuinit.  In the meantime, this patch silences the warning
    the trivial way.
    
    Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Daniel J Blueman committed with torvalds Jun 1, 2010
  9. @torvalds

    Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

    * 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
      kbuild: Revert part of e8d400a to resolve a conflict
      kbuild: Fix checking of scm-identifier variable
      gconfig: add support to show hidden options that have prompts
      menuconfig: add support to show hidden options which have prompts
      gconfig: remove show_debug option
      gconfig: remove dbg_print_ptype() and dbg_print_stype()
      kconfig: fix zconfdump()
      kconfig: some small fixes
      add random binaries to .gitignore
      kbuild: Include gen_initramfs_list.sh and the file list in the .d file
      kconfig: recalc symbol value before showing search results
      .gitignore: ignore *.lzo files
      headerdep: perlcritic warning
      scripts/Makefile.lib: Align the output of LZO
      kbuild: Generate modules.builtin in make modules_install
      Revert "kbuild: specify absolute paths for cscope"
      kbuild: Do not unnecessarily regenerate modules.builtin
      headers_install: use local file handles
      headers_check: fix perl warnings
      export_report: fix perl warnings
      ...
    torvalds committed Jun 1, 2010
  10. @torvalds

    Merge branch 'for-linus' of git://www.jni.nu/cris

    * 'for-linus' of git://www.jni.nu/cris:
      CRIS: Don't use mask_irq as symbol name
      CRIS: Simplify param.h by simply including <asm-generic/param.h>
      CRISv10: Whitespace fixes for hw_settings.S
      CRISv10: Trivial fixes.
      CRISv32: Fix RS485 port 4 CD Kconfig item.
      CRISv32: Remove duplicated Kconfig items.
      cris: push down BKL into some device drivers
    torvalds committed Jun 1, 2010
  11. @torvalds

    intel_scu_ipc: Length fix

    Commands with data must set the length in the message.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Alan Cox committed with torvalds Jun 1, 2010
  12. @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: (28 commits)
      drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held
      ksz884x: Add missing validate_addr hook
      ksz884x: convert to netdev_tx_t
      virtio-net: pass gfp to add_buf
      be2net: convert hdr.timeout in be_cmd_loopback_test() to le32
      can: mpc5xxx_can.c: Fix build failure
      net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1
      net: sock_queue_err_skb() dont mess with sk_forward_alloc
      netfilter: xtables: stackptr should be percpu
      netfilter: don't xt_jumpstack_alloc twice in xt_register_table
      greth: Fix build after OF device conversions.
      net: fix sk_forward_alloc corruptions
      Phonet: listening socket lock protects the connected socket list
      caif: unlock on error path in cfserl_receive()
      be2net: remove superfluous externs
      be2net: add unlock on error path
      net/rds: Add missing mutex_unlock
      drivers/isdn/hardware/mISDN: Add missing spin_unlock
      fs_enet: Adjust BDs after tx error
      skb: make skb_recycle_check() return a bool value
      ...
    torvalds committed Jun 1, 2010
  13. @torvalds

    binfmt_elf_fdpic: Fix clear_user() error handling

    clear_user() returns the number of bytes that could not be copied rather than
    an error code.  So we should return -EFAULT rather than directly returning the
    results.
    
    Without this patch, positive values may be returned to elf_fdpic_map_file()
    and the following error handlings do not function as expected.
    
    1.
    	ret = elf_fdpic_map_file_constdisp_on_uclinux(params, file, mm);
    	if (ret < 0)
    		return ret;
    2.
    	ret = elf_fdpic_map_file_by_direct_mmap(params, file, mm);
    	if (ret < 0)
    		return ret;
    
    Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Mike Frysinger <vapier@gentoo.org>
    CC: Alexander Viro <viro@zeniv.linux.org.uk>
    CC: Andrew Morton <akpm@linux-foundation.org>
    CC: Daisuke HATAYAMA <d.hatayama@jp.fujitsu.com>
    CC: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Takuya Yoshikawa committed with torvalds Jun 1, 2010
  14. @JuliaLawall @davem330

    drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held

    The function inittiger is only called from nj_init_card, where a lock is held.
    
    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @gfp exists@
    identifier fn;
    position p;
    @@
    
    fn(...) {
     ... when != spin_unlock_irqrestore
         when any
     GFP_KERNEL@p
     ... when any
    }
    
    @locked@
    identifier gfp.fn;
    @@
    
    spin_lock_irqsave(...)
    ...  when != spin_unlock_irqrestore
    fn(...)
    
    @depends on locked@
    position gfp.p;
    @@
    
    - GFP_KERNEL@p
    + GFP_ATOMIC
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    JuliaLawall committed with davem330 Jun 1, 2010
  15. @davem330

    ksz884x: Add missing validate_addr hook

    Add missing validate_addr hook
    
    Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Denis Kirjanov committed with davem330 May 31, 2010
  16. @davem330

    ksz884x: convert to netdev_tx_t

    Convert TX hook to netdev_tx_t type
    
    Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Denis Kirjanov committed with davem330 May 31, 2010
  17. @mstsirkin @davem330

    virtio-net: pass gfp to add_buf

    virtio-net bounces buffer allocations off to
    a thread if it can't allocate buffers from the atomic
    pool. However, if posting buffers still requires atomic
    buffers, this is unlikely to succeed.
    Fix by passing in the proper gfp_t parameter.
    
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    mstsirkin committed with davem330 May 31, 2010
  18. @davem330

    be2net: convert hdr.timeout in be_cmd_loopback_test() to le32

    The current code fails on ppc as hdr.timeout is not being converted
    to le32.
    
    Signed-off-by: Sathya Perla <sathyap@serverengines.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Sathya Perla committed with davem330 Jun 1, 2010
  19. @davem330

    can: mpc5xxx_can.c: Fix build failure

    Fixes build error caused by the OF device_node pointer
    being moved into struct device.
    
    Signed-off-by: Anatolij Gustschin <agust@denx.de>
    Cc: Wolfgang Grandegger <wg@grandegger.com>
    Cc: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Anatolij Gustschin committed with davem330 May 31, 2010
  20. @JoePerches @davem330

    net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG…

    … > 1
    
    Commit: c720c7e missed these.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    JoePerches committed with davem330 May 31, 2010
  21. @davem330
  22. @davem330

    net: sock_queue_err_skb() dont mess with sk_forward_alloc

    Correct sk_forward_alloc handling for error_queue would need to use a
    backlog of frames that softirq handler could not deliver because socket
    is owned by user thread. Or extend backlog processing to be able to
    process normal and error packets.
    
    Another possibility is to not use mem charge for error queue, this is
    what I implemented in this patch.
    
    Note: this reverts commit 2903037
    (net: fix sk_forward_alloc corruptions), since we dont need to lock
    socket anymore.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet committed with davem330 May 31, 2010
Commits on May 31, 2010
  1. @rustyrussell @torvalds

    module: fix reference to mod->percpu after freeing module.

    Rafael sees a sometimes crash at precpu_modfree from kernel/module.c; it
    only occurred with another (since-reverted) patch, but that patch simply
    changed timing to uncover this bug, it was otherwise unrelated.
    
    The comment about the mod being freed is self-explanatory, but neither
    Tejun nor I read it.  This bug was introduced in 259354d, after it
    had previously been fixed in 6e2b757.  How embarrassing.
    
    Reported-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Embarrassingly-Acked-by: Tejun Heo <tj@kernel.org>
    Cc: Masami Hiramatsu <mhiramat@redhat.com>
    Tested-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rustyrussell committed with torvalds May 31, 2010
  2. @kaber

    netfilter: xtables: stackptr should be percpu

    commit f3c5c1b (netfilter: xtables: make ip_tables reentrant)
    introduced a performance regression, because stackptr array is shared by
    all cpus, adding cache line ping pongs. (16 cpus share a 64 bytes cache
    line)
    
    Fix this using alloc_percpu()
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Acked-By: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Eric Dumazet committed with kaber May 31, 2010
  3. @kaber

    netfilter: don't xt_jumpstack_alloc twice in xt_register_table

    In xt_register_table, xt_jumpstack_alloc is called first, later
    xt_replace_table is used. But in xt_replace_table, xt_jumpstack_alloc
    will be used again. Then the memory allocated by previous xt_jumpstack_alloc
    will be leaked. We can simply remove the previous xt_jumpstack_alloc because
    there aren't any users of newinfo between xt_jumpstack_alloc and
    xt_replace_table.
    
    Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
    Cc: Patrick McHardy <kaber@trash.net>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Jan Engelhardt <jengelh@medozas.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Acked-By: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Xiaotian Feng committed with kaber May 31, 2010
  4. @davem330

    greth: Fix build after OF device conversions.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed May 31, 2010
  5. @davem330
  6. @ozbenh

    powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    ozbenh committed May 31, 2010
  7. @ozbenh

    Merge commit 'kumar/next' into next

    Conflicts:
    	arch/powerpc/sysdev/fsl_msi.c
    ozbenh committed May 31, 2010
Commits on May 30, 2010
  1. @ozbenh

    Merge commit 'jwb/next' into next

    ozbenh committed May 31, 2010
  2. @torvalds

    Linux 2.6.35-rc1

    .. and thus endeth the merge window.
    torvalds committed May 30, 2010
  3. @torvalds

    Merge branch 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/penberg/slab-2.6
    
    * 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      SLUB: Allow full duplication of kmalloc array for 390
      slub: move kmem_cache_node into it's own cacheline
    torvalds committed May 30, 2010
  4. @torvalds

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

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      mutex: Fix optimistic spinning vs. BKL
    torvalds committed May 30, 2010
  5. @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 tui: Fix last use_browser problem related to .perfconfig
      perf symbols: Add the build id cache to the vmlinux path
      perf tui: Reset use_browser if stdout is not a tty
      ring-buffer: Move zeroing out excess in page to ring buffer code
      ring-buffer: Reset "real_end" when page is filled
    torvalds committed May 30, 2010
  6. @torvalds

    ia64: revert __node_random addition

    This partially reverts commit 4ec37de
    ("[IA64] Fix build breakage"), since the commit that made it necessary
    got reverted earlier (see commit 35926ff, 'Revert "cpusets:
    randomize node rotor used in cpuset_mem_spread_node()"')
    
    Even if we ever re-introduce this, there is no reason to make
    __node_random be some architecture-specific function.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed May 30, 2010
Something went wrong with that request. Please try again.