1. 26 10月, 2010 8 次提交
    • D
      MN10300: Fix the PERCPU() alignment to allow for workqueues · 52605627
      David Howells 提交于
      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: NAkira Takeuchi <takeuchi.akr@jp.panasonic.com>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NMark Salter <msalter@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      52605627
    • L
      Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 74eb94b2
      Linus Torvalds 提交于
      * 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (67 commits)
        SUNRPC: Cleanup duplicate assignment in rpcauth_refreshcred
        nfs: fix unchecked value
        Ask for time_delta during fsinfo probe
        Revalidate caches on lock
        SUNRPC: After calling xprt_release(), we must restart from call_reserve
        NFSv4: Fix up the 'dircount' hint in encode_readdir
        NFSv4: Clean up nfs4_decode_dirent
        NFSv4: nfs4_decode_dirent must clear entry->fattr->valid
        NFSv4: Fix a regression in decode_getfattr
        NFSv4: Fix up decode_attr_filehandle() to handle the case of empty fh pointer
        NFS: Ensure we check all allocation return values in new readdir code
        NFS: Readdir plus in v4
        NFS: introduce generic decode_getattr function
        NFS: check xdr_decode for errors
        NFS: nfs_readdir_filler catch all errors
        NFS: readdir with vmapped pages
        NFS: remove page size checking code
        NFS: decode_dirent should use an xdr_stream
        SUNRPC: Add a helper function xdr_inline_peek
        NFS: remove readdir plus limit
        ...
      74eb94b2
    • L
      Merge branch 'omap-for-linus' of... · 7b6181e0
      Linus Torvalds 提交于
      Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
        omap: complete removal of machine_desc.io_pg_offst and .phys_io
        omap: UART: fix wakeup registers for OMAP24xx UART2
        omap: Fix spotty MMC voltages
        ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
        serial: omap-serial: fix signess error
        OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
        omap: dma: Fix buffering disable bit setting for omap24xx
        omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
        OMAP3: PM: fix scratchpad memory accesses for off-mode
        omap4: pandaboard: enable the ehci port on pandaboard
        omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
        omap4: pandaboard: remove unused hsmmc definition
        OMAP: McBSP: Remove null omap44xx ops comment
        OMAP: McBSP: Swap CLKS source definition
        OMAP: McBSP: Fix CLKR and FSR signal muxing
        OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
        OMAP: control: move plat-omap/control.h to mach-omap2/control.h
        OMAP: split plat-omap/common.c
        OMAP: McBSP: implement functional clock switching via clock framework
        OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
        ...
      
      Fixed up trivial conflicts in arch/arm/mach-omap2/
      {board-zoom-peripherals.c,devices.c} as per Tony
      7b6181e0
    • L
      Merge branch 'davinci-for-linus' of... · 72e58063
      Linus Torvalds 提交于
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
        davinci: fix remaining board support after io_pgoffst removal
        davinci: mityomapl138: make file local data static
        arm/davinci: remove duplicated include
        davinci: Initial support for Omapl138-Hawkboard
        davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
        davinci: add tnetv107x touchscreen platform device
        input: add driver for tnetv107x touchscreen controller
        davinci: add keypad config for tnetv107x evm board
        davinci: add tnetv107x keypad platform device
        input: add driver for tnetv107x on-chip keypad controller
        net: davinci_emac: cleanup unused cpdma code
        net: davinci_emac: switch to new cpdma layer
        net: davinci_emac: separate out cpdma code
        net: davinci_emac: cleanup unused mdio emac code
        omap: cleanup unused davinci mdio arch code
        davinci: cleanup mdio arch code and switch to phy_id
        net: davinci_emac: switch to new mdio
        omap: add mdio platform devices
        davinci: add mdio platform devices
        net: davinci_emac: separate out davinci mdio
        ...
      
      Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
      added next to each other - one from the davinci merge, one from the
      input merge)
      72e58063
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 57c155d5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Remove inode->i_count manipulation in exofs_new_inode
        fs/exofs: typo fix of faild to failed
        exofs: Set i_mapping->backing_dev_info anyway
        exofs: Cleaup read path in regard with read_for_write
      57c155d5
    • B
      x86-32, mm: Remove duplicated include · 9afd281a
      Borislav Petkov 提交于
      Commit b40827fa ("x86-32, mm: Add an initial page table for core
      bootstrapping") added an include directive which is needless and is
      taken care of by a previous one.  Remove it.
      Caught-by: NJaswinder Singh Rajput <jaswinderlinux@gmail.com>
      Signed-off-by: NBorislav Petkov <bp@alien8.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9afd281a
    • B
      exofs: Remove inode->i_count manipulation in exofs_new_inode · fe2fd9ed
      Boaz Harrosh 提交于
      exofs_new_inode() was incrementing the inode->i_count and
      decrementing it in create_done(), in a bad attempt to make sure
      the inode will still be there when the asynchronous create_done()
      finally arrives. This was very stupid because iput() was not called,
      and if it was actually needed, it would leak the inode.
      
      However all this is not needed, because at exofs_evict_inode()
      we already wait for create_done() by waiting for the
      object_created event. Therefore remove the superfluous ref counting
      and just Thicken the comment at exofs_evict_inode() a bit.
      
      While at it change places that open coded wait_obj_created()
      to call the already available wrapper.
      
      CC: Dave Chinner <dchinner@redhat.com>
      CC: Christoph Hellwig <hch@lst.de>
      CC: Nick Piggin <npiggin@kernel.dk>
      Signed-off-by: NBoaz Harrosh <bharrosh@panasas.com>
      fe2fd9ed
    • J
      fs/exofs: typo fix of faild to failed · 571f7f46
      Joe Perches 提交于
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NBoaz Harrosh <bharrosh@panasas.com>
      571f7f46
  2. 25 10月, 2010 32 次提交