Permalink
Switch branches/tags
Commits on Apr 15, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 15, 2010
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      SELinux: Reduce max avtab size to avoid page allocation failures
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 15, 2010
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: use separate class for ceph sockets' sk_lock
      ceph: reserve one more caps space when doing readdir
      ceph: queue_cap_snap should always queue dirty context
      ceph: fix dentry reference leak in dcache readdir
      ceph: decode v5 of osdmap (pool names) [protocol change]
      ceph: fix ack counter reset on connection reset
      ceph: fix leaked inode ref due to snap metadata writeback race
      ceph: fix snap context reference leaks
      ceph: allow writeback of snapped pages older than 'oldest' snapc
      ceph: fix dentry rehashing on virtual .snap dir
  3. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds committed Apr 15, 2010
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (applesmc) Switch maintainers
      hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support
      hwmon: (it87) Invalidate cache on temperature sensor change
      hwmon: (it87) Properly handle wrong sensor type requests
      hwmon: (it87) Don't arbitrarily enable temperature channels
      hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n
      hwmon: (sht15) Fix sht15_calc_temp interpolation function
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds committed Apr 15, 2010
    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      lguest: stop using KVM hypercall mechanism
      lguest: workaround cmpxchg8b_emu by ignoring cli in the guest.
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 15, 2010
    …/git/geert/linux-m68k
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative()
      m68k: Fix `struct sigcontext' for ColdFire
Commits on Apr 14, 2010
  1. SELinux: Reduce max avtab size to avoid page allocation failures

    stephensmalley committed with James Morris Mar 15, 2010
    Reduce MAX_AVTAB_HASH_BITS so that the avtab allocation is an order 2
    allocation rather than an order 4 allocation on x86_64.  This
    addresses reports of page allocation failures:
    http://marc.info/?l=selinux&m=126757230625867&w=2
    https://bugzilla.redhat.com/show_bug.cgi?id=570433
    
    Reported-by:  Russell Coker <russell@coker.com.au>
    Signed-off-by:  Stephen D. Smalley <sds@tycho.nsa.gov>
    Acked-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  2. m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_ne…

    geertu committed Mar 21, 2010
    …gative()
    
    Recently, we started seeing this on allmodconfig builds:
    
      CC      mm/memcontrol.o
    {standard input}: Assembler messages:
    {standard input}:4076: Error: operands mismatch -- statement `subl 12(%fp),170(%a0)' ignored
    
    Correct the asm constraint, like done for m68knommu.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  3. m68k: Fix `struct sigcontext' for ColdFire

    Maxim Kuvyrkov committed with geertu Mar 3, 2010
    LibSegFault uses piggybacks sc_fpstate field of the `struct sigcontext'
    and this patch avoids LibSegFault overflowing this field.  Also this
    removes an unnecessary divergence from classic m68k.
    
    Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  4. vsprintf: Change struct printf_spec.precision from s8 to s16

    JoePerches committed with torvalds Apr 14, 2010
    Commit ef0658f changed precision
    from int to s8.
    
    There is existing kernel code that uses a larger precision.
    
    An example from the audit code:
    	vsnprintf(...,..., " msg='%.1024s'", (char *)data);
    which overflows precision and truncates to nothing.
    
    Extending precision size fixes the audit system issue.
    
    Other changes:
    
    Change the size of the struct printf_spec.type from u16 to u8 so
    sizeof(struct printf_spec) stays as small as possible.
    Reorder the struct members so sizeof(struct printf_spec) remains 64 bits
    without alignment holes.
    Document the struct members a bit more.
    
    Original-patch-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: Joe Perches <joe@perches.com>
    Tested-by: Justin P. Mattock <justinmattock@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. hwmon: (applesmc) Switch maintainers

    rydberg committed with Jean Delvare Apr 14, 2010
    Nicolas has expressed a wish to be relieved from the maintenance
    of applesmc, so we simply switch maintainer with this patch.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Acked-by: Nicolas Boichat <nicolas@boichat.ch>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  6. hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support

    Justin P. Mattock committed with Jean Delvare Apr 14, 2010
    Add the iMac9,1 and the MacBookPro2,2 temperature sensors to hwmon
    driver applesmc to fix kernel bug #14429:
    https://bugzilla.kernel.org/show_bug.cgi?id=14429
    
    Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
    Acked-by: Nicolas Boichat <nicolas@boichat.ch>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  7. hwmon: (it87) Invalidate cache on temperature sensor change

    Jean Delvare committed Apr 14, 2010
    When any temperature sensor type is changed, the corresponding
    temperature value needs to be updated. The register caching mechanism
    may delay this update, so we want to invalidate the cache to force an
    immediate update.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  8. hwmon: (it87) Properly handle wrong sensor type requests

    Jean Delvare committed Apr 14, 2010
    Currently, if someone tries to set the thermal sensor type to an
    unsupported value, subsequent accesses to the chip may temporarily
    show the sensor in question as disabled. Use a temporary variable
    and only update the cached value on success, to prevent such
    confusion.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  9. hwmon: (it87) Don't arbitrarily enable temperature channels

    Jean Delvare committed Apr 14, 2010
    Temperature channels can be used in 2 different modes (thermistor and
    thermal diode) and we don't know which one, if any, is correct for
    every given board. So don't arbitrarily choose one. Instead, leave the
    temperature channels untouched. They can be configured from user-space
    if needed anyway.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  10. hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n

    Jean Delvare committed Apr 14, 2010
    When CONFIG_REGULATOR isn't set, regulator_get_voltage() returns 0.
    Properly handle this case by not trusting the value.
    
    Reported-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Jonathan Cameron <jic23@cam.ac.uk>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
  11. hwmon: (sht15) Fix sht15_calc_temp interpolation function

    joufella committed with Jean Delvare Apr 14, 2010
    I discovered two issues.
    First the previous sht15_calc_temp() loop did not iterate through the
    temppoints array since the (data->supply_uV > temppoints[i - 1].vdd)
    test is always true in this direction.
    
    Also the two-points linear interpolation function was returning biased
    values due to a stray division by 1000 which shouldn't be there.
    
    [JD: Also change the default value for d1 from 0 to something saner.]
    
    Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
  12. lguest: stop using KVM hypercall mechanism

    rustyrussell committed Apr 15, 2010
    This is a partial revert of 4cd8b5e "lguest: use KVM hypercalls";
    we revert to using (just as questionable but more reliable) int $15 for
    hypercalls.  I didn't revert the register mapping, so we still use the
    same calling convention as kvm.
    
    KVM in more recent incarnations stopped injecting a fault when a guest
    tried to use the VMCALL instruction from ring 1, so lguest under kvm
    fails to make hypercalls.  It was nice to share code with our KVM
    cousins, but this was overreach.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Matias Zabaljauregui <zabaljauregui@gmail.com>
    Cc: Avi Kivity <avi@redhat.com>
  13. lguest: workaround cmpxchg8b_emu by ignoring cli in the guest.

    rustyrussell committed Apr 15, 2010
    It's only used by cmpxchg8b_emu (see db677ff for the gory
    details), and fixing that to be paravirt aware would be more work than
    simply ignoring it (and AFAICT only help lguest).  This makes lguest
    work on machines which have cmpxchg8b, for kernels compiled for older
    processors.
    
    (We can't emulate it properly: the popf which expects to restore interrupts
    does not trap).
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
    Cc: virtualization@lists.osdl.org
  14. Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds committed Apr 14, 2010
    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling
Commits on Apr 13, 2010
  1. Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds committed Apr 13, 2010
    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFSv4: fix delegated locking
      NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible
      NFS: Fix a race with the new commit code
      NFS: Ensure that writeback_single_inode() calls write_inode() when syncing
      NFS: Fix the mode calculation in nfs_find_open_context
      NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR
  2. ceph: use separate class for ceph sockets' sk_lock

    liewegas committed Apr 13, 2010
    Use a separate class for ceph sockets to prevent lockdep confusion.
    Because ceph sockets only get passed kernel pointers, there is no
    dependency from sk_lock -> mmap_sem.  If we share the same class as other
    sockets, lockdep detects a circular dependency from
    
    	mmap_sem (page fault) -> fs mutex -> sk_lock -> mmap_sem
    
    because dependencies are noted from both ceph and user contexts.  Using
    a separate class prevents the sk_lock(ceph) -> mmap_sem dependency and
    makes lockdep happy.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  3. ceph: reserve one more caps space when doing readdir

    yehudasa committed with liewegas Apr 13, 2010
    We were missing space for the directory cap.  The result was a BUG at
    fs/ceph/caps.c:2178.
    
    Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
    Signed-off-by: Sage Weil <sage@newdream.net>
  4. ceph: queue_cap_snap should always queue dirty context

    liewegas committed Apr 13, 2010
    This simplifies the calling convention, and fixes a bug where we queue a
    capsnap with a context other than i_head_snapc (the one that matches the
    dirty pages).  The result was a BUG at fs/ceph/caps.c:2178 on writeback
    completion when a capsnap matching the writeback snapc could not be found.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  5. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds committed Apr 13, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Add some more commentary to __raw_local_irq_save()
      sparc64: Fix memory leak in pci_register_iommu_region().
      sparc64: Add kmemleak annotation to sun4v_build_virq()
      sparc64: Support kmemleak.
      sparc64: Add function graph tracer support.
      sparc64: Give a stack frame to the ftrace call sites.
      sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.
      sparc64: Remove profiling from some low-level bits.
      sparc64: Kill unnecessary static on local var in ftrace_call_replace().
      sparc64: Kill CONFIG_STACK_DEBUG code.
      sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up.
      sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs.
      sparc64: Use kstack_valid() in die_if_kernel().
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Apr 13, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
      smc91c92_cs: define multicast_table as unsigned char
      can: avoids a false warning
      e1000e: stop cleaning when we reach tx_ring->next_to_use
      igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
      virtio_net: missing sg_init_table
      Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb"
      iwlwifi: need check for valid qos packet before free
      tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb
      udp: fix for unicast RX path optimization
      myri10ge: fix rx_pause in myri10ge_set_pauseparam
      net: corrected documentation for hardware time stamping
      stmmac: use resource_size()
      x.25 attempts to negotiate invalid throughput
      x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet.
      bridge: Fix IGMP3 report parsing
      cnic: Fix crash during bnx2x MTU change.
      qlcnic: fix set mac addr
      r6040: fix r6040_multicast_list
      vhost-net: fix vq_memory_access_ok error checking
      ath9k: fix double calls to ath_radio_enable
      ...
  7. smc91c92_cs: define multicast_table as unsigned char

    Ken Kawasaki committed with davem330 Apr 10, 2010
    smc91c92_cs:
      * define multicast_table as unsigned char
      * remove unnecessary "#ifndef final_version"
    
    Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. can: avoids a false warning

    Eric Dumazet committed with davem330 Apr 9, 2010
    At this point optlen == sizeof(sfilter) but some compilers are dumb.
    
    Reported-by: Németh Márton <nm127@freemail.h
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Acked-by: Oliver Hartkopp <oliver@hartkopp.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. e1000e: stop cleaning when we reach tx_ring->next_to_use

    Terry Loftin committed with davem330 Apr 9, 2010
    Tx ring buffers after tx_ring->next_to_use are volatile and could
    change, possibly causing a crash.  Stop cleaning when we hit
    tx_ring->next_to_use.
    
    Signed-off-by: Terry Loftin <terry.loftin@hp.com>
    Acked-by: Bruce Allan <bruce.w.allan@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. igb: restrict WoL for 82576 ET2 Quad Port Server Adapter

    Stefan Assmann committed with davem330 Apr 9, 2010
    Restrict Wake-on-LAN to first port on 82576 ET2 quad port NICs, as it is
    only supported there.
    
    Signed-off-by: Stefan Assmann <sassmann@redhat.com>
    Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. sparc64: Add some more commentary to __raw_local_irq_save()

    davem330 committed Apr 13, 2010
    Suggested by Peter Zijlstra
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

    davem330 committed Apr 13, 2010
    Conflicts:
    	lib/Kconfig.debug
  13. sparc64: Fix memory leak in pci_register_iommu_region().

    davem330 committed Apr 11, 2010
    Found by kmemleak.
    
    If request_resource() fails, we leak the struct resource we
    allocated to represent the IOMMU mapping area.
    
    This actually happens on sun4v machines because the IOMEM area is only
    reported sans the IOMMU region, unlike all previous systems.  I'll
    need to fix that at some point, but for now fix the leak.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  14. sparc64: Add kmemleak annotation to sun4v_build_virq()

    davem330 committed Apr 11, 2010
    The only reference we store to this memory is in the form of a
    physical address, so kmemleak can't see it.
    
    Add a kmemleak_not_leak() annotation.
    
    It's probably useful to be able to look at a dump of these things
    either via debugfs or similar, and thus we could at some point store
    them in some kind of table and therefore get rid of this annotation.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. sparc64: Support kmemleak.

    davem330 committed Apr 9, 2010
    Only missing thing was an _sdata marker in vmlinux.lds.S
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. sparc64: Add function graph tracer support.

    davem330 committed Apr 7, 2010
    Signed-off-by: David S. Miller <davem@davemloft.net>