1. 26 Oct, 2010 33 commits
  2. 25 Oct, 2010 7 commits
    • Erik Gilling's avatar
      spi: tegra: fix error setting on timeout · f41649e0
      Erik Gilling authored
      avoids derefencing an uninitialized pointer
      
      Change-Id: Icf528441ae481e9f6f5ddc0be32c7c217fa49701
      Signed-off-by: default avatarErik Gilling <konkers@android.com>
      f41649e0
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · e0e170bd
      Linus Torvalds authored
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits)
        microblaze: Fix build with make 3.82
        fbdev/xilinxfb: Microblaze driver support
        microblaze: Support C optimized lib functions for little-endian
        microblaze: Separate library optimized functions
        microblaze: Support timer on AXI lite
        microblaze: Add support for little-endian Microblaze
        microblaze: KGDB little endian support
        microblaze: Add PVR for endians plus detection
        net: emaclite: Add support for little-endian platforms
        microblaze: trivial: Add comment for AXI pvr
        microblaze: pci-common cleanup
        microblaze: Support early console on uart16550
        microblaze: Do not compile early console support for uartlite if is disabled
        microblaze: Setup early console dynamically
        microblaze: Rename all uartlite early printk functions
        microblaze: remove early printk uarlite console dependency from header
        microblaze: Remove additional compatible properties
        microblaze: Remove hardcoded asm instraction for PVR loading
        microblaze: Use static const char * const where possible
        microblaze: Define VMALLOC_START/END
        ...
      e0e170bd
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · b20f9e5b
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (24 commits)
        hwmon: lis3: Release resources in case of failure
        hwmon: lis3: Short explanations of platform data fields
        hwmon: lis3: Enhance lis3 selftest with IRQ line test
        hwmon: lis3: use block read to access data registers
        hwmon: lis3: Adjust fuzziness for 8 bit device
        hwmon: lis3: New parameters to platform data
        hwmon: lis3: restore axis enabled bits
        hwmon: lis3: Power on corrections
        hwmon: lis3: Update coordinates at polled device open
        hwmon: lis3: Cleanup interrupt handling
        hwmon: lis3: regulator control
        hwmon: lis3: pm_runtime support
        Kirkwood: add fan support for Network Space Max v2
        hwmon: add generic GPIO fan driver
        hwmon: (coretemp) fix reading of microcode revision (v2)
        hwmon: ({core, pkg, via-cpu}temp) remove unnecessary CONFIG_HOTPLUG_CPU ifdefs
        hwmon: (pkgtemp) align driver initialization style with coretemp
        hwmon: LTC4261 Hardware monitoring driver
        hwmon: (lis3) add axes module parameter for custom axis-mapping
        hwmon: (hp_accel) Add HP Mini 510x family support
        ...
      b20f9e5b
    • David Howells's avatar
      MN10300: Fix the PERCPU() alignment to allow for workqueues · 52605627
      David Howells authored
      In the MN10300 arch, we occasionally see an assertion being tripped in
      alloc_cwqs() at the following line:
      
              /* just in case, make sure it's actually aligned */
        --->  BUG_ON(!IS_ALIGNED(wq->cpu_wq.v, align));
              return wq->cpu_wq.v ? 0 : -ENOMEM;
      
      The values are:
      
              wa->cpu_wq.v => 0x902776e0
              align => 0x100
      
      and align is calculated by the following:
      
              const size_t align = max_t(size_t, 1 << WORK_STRUCT_FLAG_BITS,
                                         __alignof__(unsigned long long));
      
      This is because the pointer in question (wq->cpu_wq.v) loses some of its
      lower bits to control flags, and so the object it points to must be
      sufficiently aligned to avoid the need to use those bits for pointing to
      things.
      
      Currently, 4 control bits and 4 colour bits are used in normal
      circumstances, plus a debugging bit if debugging is set.  This requires
      the cpu_workqueue_struct struct to be at least 256 bytes aligned (or 512
      bytes aligned with debugging).
      
      PERCPU() alignment on MN13000, however, is only 32 bytes as set in
      vmlinux.lds.S.  So we set this to PAGE_SIZE (4096) to match most other
      arches and stick a comment in alloc_cwqs() for anyone else who triggers
      the assertion.
      Reported-by: default avatarAkira Takeuchi <takeuchi.akr@jp.panasonic.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarMark Salter <msalter@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      52605627
    • J. Bruce Fields's avatar
      svcrpc: svc_tcp_sendto XPT_DEAD check is redundant · 42d7ba3d
      J. Bruce Fields authored
      The only caller (svc_send) has already checked XPT_DEAD.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      42d7ba3d
    • J. Bruce Fields's avatar
      svcrpc: no need for XPT_DEAD check in svc_xprt_enqueue · 01dba075
      J. Bruce Fields authored
      If any xprt marked DEAD is also left BUSY for the rest of its life, then
      the XPT_DEAD check here is superfluous--we'll get the same result from
      the XPT_BUSY check just after.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      01dba075
    • J. Bruce Fields's avatar
      svcrpc: assume svc_delete_xprt() called only once · ac9303eb
      J. Bruce Fields authored
      As long as DEAD exports are left BUSY, and svc_delete_xprt is called
      only with BUSY held, then svc_delete_xprt() will never be called on an
      xprt that is already DEAD.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      ac9303eb