1. 21 Dec, 2012 3 commits
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · f59dc2bb
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A number of smallish fixes scattered around the ARM code.  Probably
        the most serious one is the one from Al addressing the missing locking
        in the swap emulation code."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards
        ARM: 7606/1: cache: flush to LoUU instead of LoUIS on uniprocessor CPUs
        ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
        ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata
        ARM: 7602/1: Pass real "__machine_arch_type" variable to setup_machine_tags() procedure
        ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S
      f59dc2bb
    • Linus Torvalds's avatar
      Merge tag 'fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f3dc1294
      Linus Torvalds authored
      Pull ARM SoC fixes part 2 from Olof Johansson:
       "Here are a few more fixes for 3.8.  Two branches of fixes for Samsung
        platforms, including fixes for the audio build errors on all non-DT
        platforms.  There's also a fixup to the sunxi device-tree file renames
        due to a bad patch application by me, and a fix for OMAP due to
        function renames merged through the powerpc tree."
      
      * tag 'fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: OMAP2+: Fix compillation error in mach-omap2/timer.c
        ARM: sunxi: rename device tree source files
        ARM: EXYNOS: Avoid passing the clks through platform data
        ARM: S5PV210: Avoid passing the clks through platform data
        ARM: S5P64X0: Add I2S clkdev support
        ARM: S5PC100: Add I2S clkdev support
        ARM: S3C64XX: Add I2S clkdev support
        ARM: EXYNOS: Fix MSHC clocks instance names
        ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
        ARM: EXYNOS: Fix NULL pointer dereference bug in SMDK4X12
        ARM: EXYNOS: Fix NULL pointer dereference bug in Origen
        ARM: SAMSUNG: Add missing include guard to gpio-core.h
        pinctrl: exynos5440/samsung: Staticize pcfgs
        pinctrl: samsung: Fix a typo in pinctrl-samsung.h
        ARM: EXYNOS: fix skip scu_enable() for EXYNOS5440
        ARM: EXYNOS: fix GIC using for EXYNOS5440
        ARM: EXYNOS: fix build error when MFC is not selected
      f3dc1294
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · af487e42
      Linus Torvalds authored
      Pull kbuild misc changes from Michal Marek:
       "This is the non-critical part of kbuild
      
         - scripts/kernel-doc requires a "Return:" section for non-void
           functions
         - ARCH=arm SUBARCH=... support for make tags
         - COMPILED_SOURCE=1 support for make tags (only indexes .c files for
           which a .o exists)
         - New coccinelle check
         - Option parsing fix for scripts/config"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/config: Fix wrong "shift" for --keep-case
        scripts/tags.sh: Support compiled source
        scripts/tags.sh: Support subarch for ARM
        scripts/coccinelle/misc/warn.cocci: use WARN
        scripts/kernel-doc: check that non-void fcts describe their return value
        Kernel-doc: Convention: Use a "Return" section to describe return values
      af487e42
  2. 20 Dec, 2012 37 commits
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 810a4855
      Linus Torvalds authored
      Pull kbuild changes from Michal Marek:
       "The kbuild changes are minimal this time:
      
         - scripts/pnmlogo fix for some newer format
      
         - minor top-level Makefile cleanup
      
         - fix for a v3.5 regression with make clean M=<directory>"
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: Do not remove vmlinux when cleaning external module
        scripts/pnmtologo: fix for plain PBM
        kbuild: Remove reference to uninitialised variable
      810a4855
    • Tony Lindgren's avatar
      ARM: OMAP2+: Trivial fix for IOMMU merge issue · 6f8c9d21
      Tony Lindgren authored
      Commit 787314c3 ("Merge tag 'iommu-updates-v3.8' of
      git://git./linux/kernel/git/joro/iommu") did not account for the changed
      header location.
      
      The headers were made local to mach-omap2 as they are specific to omap2+
      only, and we wanted to get most of the #include <plat/*.h> headers fixed
      up anyways for the ARM multiplatform support.
      
      We attempted to avoid this kind of merge conflict early on by setting up
      a minimal git branch shared by the arm-soc tree and the iommu tree, but
      looks like we still hit a merge issue there as the branches got merged
      as various topic branches.
      
      Cc: Joerg Roedel <joro@8bytes.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6f8c9d21
    • Linus Torvalds's avatar
      Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linux · 98219727
      Linus Torvalds authored
      Pull nfsd update from Bruce Fields:
       "Included this time:
      
         - more nfsd containerization work from Stanislav Kinsbursky: we're
           not quite there yet, but should be by 3.9.
      
         - NFSv4.1 progress: implementation of basic backchannel security
           negotiation and the mandatory BACKCHANNEL_CTL operation.  See
      
             http://wiki.linux-nfs.org/wiki/index.php/Server_4.0_and_4.1_issues
      
           for remaining TODO's
      
         - Fixes for some bugs that could be triggered by unusual compounds.
           Our xdr code wasn't designed with v4 compounds in mind, and it
           shows.  A more thorough rewrite is still a todo.
      
         - If you've ever seen "RPC: multiple fragments per record not
           supported" logged while using some sort of odd userland NFS client,
           that should now be fixed.
      
         - Further work from Jeff Layton on our mechanism for storing
           information about NFSv4 clients across reboots.
      
         - Further work from Bryan Schumaker on his fault-injection mechanism
           (which allows us to discard selective NFSv4 state, to excercise
           rarely-taken recovery code paths in the client.)
      
         - The usual mix of miscellaneous bugs and cleanup.
      
        Thanks to everyone who tested or contributed this cycle."
      
      * 'for-3.8' of git://linux-nfs.org/~bfields/linux: (111 commits)
        nfsd4: don't leave freed stateid hashed
        nfsd4: free_stateid can use the current stateid
        nfsd4: cleanup: replace rq_resused count by rq_next_page pointer
        nfsd: warn on odd reply state in nfsd_vfs_read
        nfsd4: fix oops on unusual readlike compound
        nfsd4: disable zero-copy on non-final read ops
        svcrpc: fix some printks
        NFSD: Correct the size calculation in fault_inject_write
        NFSD: Pass correct buffer size to rpc_ntop
        nfsd: pass proper net to nfsd_destroy() from NFSd kthreads
        nfsd: simplify service shutdown
        nfsd: replace boolean nfsd_up flag by users counter
        nfsd: simplify NFSv4 state init and shutdown
        nfsd: introduce helpers for generic resources init and shutdown
        nfsd: make NFSd service structure allocated per net
        nfsd: make NFSd service boot time per-net
        nfsd: per-net NFSd up flag introduced
        nfsd: move per-net startup code to separated function
        nfsd: pass net to __write_ports() and down
        nfsd: pass net to nfsd_set_nrthreads()
        ...
      98219727
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 40889e8d
      Linus Torvalds authored
      Pull Ceph update from Sage Weil:
       "There are a few different groups of commits here.  The largest is
        Alex's ongoing work to enable the coming RBD features (cloning,
        striping).  There is some cleanup in libceph that goes along with it.
      
        Cyril and David have fixed some problems with NFS reexport (leaking
        dentries and page locks), and there is a batch of patches from Yan
        fixing problems with the fs client when running against a clustered
        MDS.  There are a few bug fixes mixed in for good measure, many of
        which will be going to the stable trees once they're upstream.
      
        My apologies for the late pull.  There is still a gremlin in the rbd
        map/unmap code and I was hoping to include the fix for that as well,
        but we haven't been able to confirm the fix is correct yet; I'll send
        that in a separate pull once it's nailed down."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (68 commits)
        rbd: get rid of rbd_{get,put}_dev()
        libceph: register request before unregister linger
        libceph: don't use rb_init_node() in ceph_osdc_alloc_request()
        libceph: init event->node in ceph_osdc_create_event()
        libceph: init osd->o_node in create_osd()
        libceph: report connection fault with warning
        libceph: socket can close in any connection state
        rbd: don't use ENOTSUPP
        rbd: remove linger unconditionally
        rbd: get rid of RBD_MAX_SEG_NAME_LEN
        libceph: avoid using freed osd in __kick_osd_requests()
        ceph: don't reference req after put
        rbd: do not allow remove of mounted-on image
        libceph: Unlock unprocessed pages in start_read() error path
        ceph: call handle_cap_grant() for cap import message
        ceph: Fix __ceph_do_pending_vmtruncate
        ceph: Don't add dirty inode to dirty list if caps is in migration
        ceph: Fix infinite loop in __wake_requests
        ceph: Don't update i_max_size when handling non-auth cap
        bdi_register: add __printf verification, fix arg mismatch
        ...
      40889e8d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 1ca22254
      Linus Torvalds authored
      Pull two btrfs reverts from Chris Mason:
       "I had missed that for two of the patches in my last pull, we had
        included different fixes during 3.7."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Revert "Btrfs: reorder tree mod log operations in deleting a pointer"
        Revert "Btrfs: MOD_LOG_KEY_REMOVE_WHILE_MOVING never change node's nritems"
      1ca22254
    • Linus Torvalds's avatar
      Merge tag 'for-3.8-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · a13eea6b
      Linus Torvalds authored
      Pull new F2FS filesystem from Jaegeuk Kim:
       "Introduce a new file system, Flash-Friendly File System (F2FS), to
        Linux 3.8.
      
        Highlights:
         - Add initial f2fs source codes
         - Fix an endian conversion bug
         - Fix build failures on random configs
         - Fix the power-off-recovery routine
         - Minor cleanup, coding style, and typos patches"
      
      From the Kconfig help text:
      
        F2FS is based on Log-structured File System (LFS), which supports
        versatile "flash-friendly" features. The design has been focused on
        addressing the fundamental issues in LFS, which are snowball effect
        of wandering tree and high cleaning overhead.
      
        Since flash-based storages show different characteristics according to
        the internal geometry or flash memory management schemes aka FTL, F2FS
        and tools support various parameters not only for configuring on-disk
        layout, but also for selecting allocation and cleaning algorithms.
      
      and there's an article by Neil Brown about it on lwn.net:
      
        http://lwn.net/Articles/518988/
      
      * tag 'for-3.8-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (36 commits)
        f2fs: fix tracking parent inode number
        f2fs: cleanup the f2fs_bio_alloc routine
        f2fs: introduce accessor to retrieve number of dentry slots
        f2fs: remove redundant call to f2fs_put_page in delete entry
        f2fs: make use of GFP_F2FS_ZERO for setting gfp_mask
        f2fs: rewrite f2fs_bio_alloc to make it simpler
        f2fs: fix a typo in f2fs documentation
        f2fs: remove unused variable
        f2fs: move error condition for mkdir at proper place
        f2fs: remove unneeded initialization
        f2fs: check read only condition before beginning write out
        f2fs: remove unneeded memset from init_once
        f2fs: show error in case of invalid mount arguments
        f2fs: fix the compiler warning for uninitialized use of variable
        f2fs: resolve build failures
        f2fs: adjust kernel coding style
        f2fs: fix endian conversion bugs reported by sparse
        f2fs: remove unneeded version.h header file from f2fs.h
        f2fs: update the f2fs document
        f2fs: update Kconfig and Makefile
        ...
      a13eea6b
    • Stephen Boyd's avatar
      lib: atomic64: Initialize locks statically to fix early users · fcc16882
      Stephen Boyd authored
      The atomic64 library uses a handful of static spin locks to implement
      atomic 64-bit operations on architectures without support for atomic
      64-bit instructions.
      
      Unfortunately, the spinlocks are initialized in a pure initcall and that
      is too late for the vfs namespace code which wants to use atomic64
      operations before the initcall is run.
      
      This became a problem as of commit 8823c079: "vfs: Add setns support
      for the mount namespace".
      
      This leads to BUG messages such as:
      
        BUG: spinlock bad magic on CPU#0, swapper/0/0
         lock: atomic64_lock+0x240/0x400, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
          do_raw_spin_lock+0x158/0x198
          _raw_spin_lock_irqsave+0x4c/0x58
          atomic64_add_return+0x30/0x5c
          alloc_mnt_ns.clone.14+0x44/0xac
          create_mnt_ns+0xc/0x54
          mnt_init+0x120/0x1d4
          vfs_caches_init+0xe0/0x10c
          start_kernel+0x29c/0x300
      
      coming out early on during boot when spinlock debugging is enabled.
      
      Fix this by initializing the spinlocks statically at compile time.
      Reported-and-tested-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
      Tested-by: default avatarTony Lindgren <tony@atomide.com>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fcc16882
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 787314c3
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "A few new features this merge-window.  The most important one is
        probably, that dma-debug now warns if a dma-handle is not checked with
        dma_mapping_error by the device driver.  This requires minor changes
        to some architectures which make use of dma-debug.  Most of these
        changes have the respective Acks by the Arch-Maintainers.
      
        Besides that there are updates to the AMD IOMMU driver for refactor
        the IOMMU-Groups support and to make sure it does not trigger a
        hardware erratum.
      
        The OMAP changes (for which I pulled in a branch from Tony Lindgren's
        tree) have a conflict in linux-next with the arm-soc tree.  The
        conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is
        deleted in the arm-soc tree.  It is safe to delete the file too so
        solve the conflict.  Similar changes are done in the arm-soc tree in
        the common clock framework migration.  A missing hunk from the patch
        in the IOMMU tree will be submitted as a seperate patch when the
        merge-window is closed."
      
      * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits)
        ARM: dma-mapping: support debug_dma_mapping_error
        ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks
        iommu/omap: Adapt to runtime pm
        iommu/omap: Migrate to hwmod framework
        iommu/omap: Keep mmu enabled when requested
        iommu/omap: Remove redundant clock handling on ISR
        iommu/amd: Remove obsolete comment
        iommu/amd: Don't use 512GB pages
        iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch
        iommu/tegra: gart: Move bus_set_iommu after probe for multi arch
        iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all
        tile: dma_debug: add debug_dma_mapping_error support
        sh: dma_debug: add debug_dma_mapping_error support
        powerpc: dma_debug: add debug_dma_mapping_error support
        mips: dma_debug: add debug_dma_mapping_error support
        microblaze: dma-mapping: support debug_dma_mapping_error
        ia64: dma_debug: add debug_dma_mapping_error support
        c6x: dma_debug: add debug_dma_mapping_error support
        ARM64: dma_debug: add debug_dma_mapping_error support
        intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
        ...
      787314c3
    • Woodhouse, David's avatar
      intel-iommu: Free old page tables before creating superpage · 6491d4d0
      Woodhouse, David authored
      The dma_pte_free_pagetable() function will only free a page table page
      if it is asked to free the *entire* 2MiB range that it covers. So if a
      page table page was used for one or more small mappings, it's likely to
      end up still present in the page tables... but with no valid PTEs.
      
      This was fine when we'd only be repopulating it with 4KiB PTEs anyway
      but the same virtual address range can end up being reused for a
      *large-page* mapping. And in that case were were trying to insert the
      large page into the second-level page table, and getting a complaint
      from the sanity check in __domain_mapping() because there was already a
      corresponding entry. This was *relatively* harmless; it led to a memory
      leak of the old page table page, but no other ill-effects.
      
      Fix it by calling dma_pte_clear_range (hopefully redundant) and
      dma_pte_free_pagetable() before setting up the new large page.
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Tested-by: default avatarRavi Murty <Ravi.Murty@intel.com>
      Tested-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
      Cc: stable@kernel.org [3.0+]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6491d4d0
    • Peter Ujfalusi's avatar
      ARM: OMAP2+: Fix compillation error in mach-omap2/timer.c · 2727da85
      Peter Ujfalusi authored
      prom_add_property() has been renamed to of_add_property()
      This patch fixes the following comilation error:
      
      arch/arm/mach-omap2/timer.c: In function ‘omap_get_timer_dt’:
      arch/arm/mach-omap2/timer.c:178:3: error: implicit declaration of function ‘prom_add_property’ [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
      make[1]: *** Waiting for unfinished jobs....
      Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      2727da85
    • Olof Johansson's avatar
      Merge branch 'v3.8-samsung-fixes-audio' of... · f438a830
      Olof Johansson authored
      Merge branch 'v3.8-samsung-fixes-audio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      From Kukjin Kim:
      
      This is for fix the following build error in dev-audio.c on current Samsung
      platforms :-(
      
      arch/arm/mach-exynos/dev-audio.c:58:4: error: unknown field 'src_clk'
      specified in initializer
      arch/arm/mach-exynos/dev-audio.c:58:4: warning: initialization makes integer
      from pointer without a cast [enabled by default]
      arch/arm/mach-exynos/dev-audio.c:58:4: warning: (near initialization for
      'i2sv5_pdata.type.i2s.idma_addr') [enabled by default]
      arch/arm/mach-exynos/dev-audio.c:91:4: error: unknown field 'src_clk'
      specified in initializer
      arch/arm/mach-exynos/dev-audio.c:91:4: warning: initialization makes integer
      from pointer without a cast [enabled by default]
      arch/arm/mach-exynos/dev-audio.c:91:4: warning: (near initialization for
      'i2sv3_pdata.type.i2s.idma_addr') [enabled by default]
      
      * 'v3.8-samsung-fixes-audio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Avoid passing the clks through platform data
        ARM: S5PV210: Avoid passing the clks through platform data
        ARM: S5P64X0: Add I2S clkdev support
        ARM: S5PC100: Add I2S clkdev support
        ARM: S3C64XX: Add I2S clkdev support
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      f438a830
    • Olof Johansson's avatar
      Merge branch 'v3.8-samsung-fixes-1' of... · f2420ec2
      Olof Johansson authored
      Merge branch 'v3.8-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      From Kukjin Kim:
      
      Here is Samsung fixes-1 for v3.8-rc1.
      Most of them are trivial fixes which are for NULL pointer dereference, MSHC
      clocks instance names and exynos5440 stuff.
      
      * 'v3.8-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Fix MSHC clocks instance names
        ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
        ARM: EXYNOS: Fix NULL pointer dereference bug in SMDK4X12
        ARM: EXYNOS: Fix NULL pointer dereference bug in Origen
        ARM: SAMSUNG: Add missing include guard to gpio-core.h
        pinctrl: exynos5440/samsung: Staticize pcfgs
        pinctrl: samsung: Fix a typo in pinctrl-samsung.h
        ARM: EXYNOS: fix skip scu_enable() for EXYNOS5440
        ARM: EXYNOS: fix GIC using for EXYNOS5440
        ARM: EXYNOS: fix build error when MFC is not selected
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      f2420ec2
    • Olof Johansson's avatar
      ARM: sunxi: rename device tree source files · febd41d5
      Olof Johansson authored
      This is the rename portion of "ARM: sunxi: Change device tree naming
      scheme for sunxi" that were missed when the patch was applied.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      febd41d5
    • Alex Elder's avatar
      rbd: get rid of rbd_{get,put}_dev() · c3e946ce
      Alex Elder authored
      The functions rbd_get_dev() and rbd_put_dev() are trivial wrappers
      that add no value, and their existence suggests they may do more
      than what they do.
      
      Get rid of them.
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Reviewed-by: default avatarDan Mick <dan.mick@inktank.com>
      c3e946ce
    • Alex Elder's avatar
      libceph: register request before unregister linger · c89ce05e
      Alex Elder authored
      In kick_requests(), we need to register the request before we
      unregister the linger request.  Otherwise the unregister will
      reset the request's osd pointer to NULL.
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Reviewed-by: default avatarSage Weil <sage@inktank.com>
      c89ce05e
    • Alex Elder's avatar
      libceph: don't use rb_init_node() in ceph_osdc_alloc_request() · a978fa20
      Alex Elder authored
      The red-black node in the ceph osd request structure is initialized
      in ceph_osdc_alloc_request() using rbd_init_node().  We do need to
      initialize this, because in __unregister_request() we call
      RB_EMPTY_NODE(), which expects the node it's checking to have
      been initialized.  But rb_init_node() is apparently overkill, and
      may in fact be on its way out.  So use RB_CLEAR_NODE() instead.
      
      For a little more background, see this commit:
          4c199a93 rbtree: empty nodes have no color"
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Reviewed-by: default avatarSage Weil <sage@inktank.com>
      a978fa20
    • Alex Elder's avatar
      libceph: init event->node in ceph_osdc_create_event() · 3ee5234d
      Alex Elder authored
      The red-black node node in the ceph osd event structure is not
      initialized in create_osdc_create_event().  Because this node can
      be the subject of a RB_EMPTY_NODE() call later on, we should ensure
      the node is initialized properly for that.
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Reviewed-by: default avatarSage Weil <sage@inktank.com>
      3ee5234d
    • Alex Elder's avatar
      libceph: init osd->o_node in create_osd() · f407731d
      Alex Elder authored
      The red-black node node in the ceph osd structure is not initialized
      in create_osd().  Because this node can be the subject of a
      RB_EMPTY_NODE() call later on, we should ensure the node is
      initialized properly for that.  Add a call to RB_CLEAR_NODE()
      initialize it.
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Reviewed-by: default avatarSage Weil <sage@inktank.com>
      f407731d
    • Alex Elder's avatar
      libceph: report connection fault with warning · 28362986
      Alex Elder authored
      When a connection's socket disconnects, or if there's a protocol
      error of some kind on the connection, a fault is signaled and
      the connection is reset (closed and reopened, basically).  We
      currently get an error message on the log whenever this occurs.
      
      A ceph connection will attempt to reestablish a socket connection
      repeatedly if a fault occurs.  This means that these error messages
      will get repeatedly added to the log, which is undesirable.
      
      Change the error message to be a warning, so they don't get
      logged by default.
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Reviewed-by: default avatarSage Weil <sage@inktank.com>
      28362986
    • Vaibhav Bedia's avatar
      ARM: OMAP: Fix build breakage due to missing include in i2c.c · 18000985
      Vaibhav Bedia authored
      Merge commit 752451f0 ("Merge branch 'i2c-embedded/for-next' of
      git://git.pengutronix.de/git/wsa/linux") resulted in a build breakage
      for OMAP
      
        arch/arm/mach-omap2/i2c.c: In function 'omap_pm_set_max_mpu_wakeup_lat_compat':
        arch/arm/mach-omap2/i2c.c:130:2: error: implicit declaration of function 'omap_pm_set_max_mpu_wakeup_lat'
        make[1]: *** [arch/arm/mach-omap2/i2c.o] Error 1
      
      Fix this by including the appropriate header file with the function
      prototype.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      18000985
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · b7dfde95
      Linus Torvalds authored
      Pull virtio update from Rusty Russell:
       "Some nice cleanups, and even a patch my wife did as a "live" demo for
        Latinoware 2012.
      
        There's a slightly non-trivial merge in virtio-net, as we cleaned up
        the virtio add_buf interface while DaveM accepted the mq virtio-net
        patches."
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (27 commits)
        virtio_console: Add support for remoteproc serial
        virtio_console: Merge struct buffer_token into struct port_buffer
        virtio: add drv_to_virtio to make code clearly
        virtio: use dev_to_virtio wrapper in virtio
        virtio-mmio: Fix irq parsing in command line parameter
        virtio_console: Free buffers from out-queue upon close
        virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
        virtio_console: Use kmalloc instead of kzalloc
        virtio_console: Free buffer if splice fails
        virtio: tools: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: scsi: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: rpmsg: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: net: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: console: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: make virtqueue_add_buf() returning 0 on success, not capacity.
        virtio: console: don't rely on virtqueue_add_buf() returning capacity.
        virtio_net: don't rely on virtqueue_add_buf() returning capacity.
        virtio-net: remove unused skb_vnet_hdr->num_sg field
        virtio-net: correct capacity math on ring full
        virtio: move queue_index and num_free fields into core struct virtqueue.
        ...
      b7dfde95
    • Linus Torvalds's avatar
      Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 03c850ec
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This update contains overall only driver-specific fixes.  Slightly
        large LOC are seen in usb-audio driver for a couple of new device
        quirks and cs42l71 ASoC driver for enhanced features.  The others are
        a few small (regression) fixes HD-audio, and yet other small / trival
        ASoC fixes."
      
      * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: Support for Digidesign Mbox 2 USB sound card:
        ALSA: HDA: Fix sound resume hang
        ALSA: hda - bug fix for invalid connection list of Haswell HDMI codec pins
        ALSA: hda - Fix the wrong pincaps set in ALC861VD dallas/hp fixup
        ALSA: hda - Set codec->single_adc_amp flag for Realtek codecs
        ASoC: atmel-ssc: change disable to disable in dts node
        ASoC: Prevent pop_wait overwrite
        ALSA: usb-audio: ignore-quirk for HP Wireless Audio
        ALSA: hda - Always turn on pins for HDMI/DP
        ALSA: hda - Fix pin configuration of HP Pavilion dv7
        ASoC: core: Fix splitting of log messages
        ASoC: cs42l73: Change VSPIN/VSPOUT to VSPINOUT
        ASoC: cs42l73: Add DAPM events for power down.
        ASoC: cs42l73: Add DMIC's as DAPM inputs.
        ASoC: sigmadsp: Fix endianness conversion issue
        ASoC: tpa6130a2: Use devm_* APIs
      03c850ec
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi · 85d5b70d
      Linus Torvalds authored
      Pull UBI update from Artem Bityutskiy:
       "Nothing exciting, just clean-ups and nicification.  Oh, and one small
        optimization which makes UBI to use less RAM."
      
      * tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi:
        UBI: embed ubi_debug_info field in ubi_device struct
        UBI: introduce helpers dbg_chk_{io, gen}
        UBI: replace memcpy with struct assignment
        UBI: remove spurious comment
        UBI: gluebi: rename misleading variables
        UBI: do not allocate the memory unnecessarily
        UBI: use list_move_tail instead of list_del/list_add_tail
      85d5b70d
    • Linus Torvalds's avatar
      Merge tags 'disintegrate-h8300-20121219', 'disintegrate-m32r-20121219' and... · 43260ade
      Linus Torvalds authored
      Merge tags 'disintegrate-h8300-20121219', 'disintegrate-m32r-20121219' and 'disintegrate-score-20121220' of git://git.infradead.org/users/dhowells/linux-headers
      
      Pull UAPI disintegration for H8/300, M32R and Score from David Howells.
      
      Scripted UAPI patches for architectures that apparently never reacted to
      it on their own.
      
      * tag 'disintegrate-h8300-20121219' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/h8300/include/asm
      
      * tag 'disintegrate-m32r-20121219' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/m32r/include/asm
      
      * tag 'disintegrate-score-20121220' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/score/include/asm
      43260ade
    • Linus Torvalds's avatar
      Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris · 0c544501
      Linus Torvalds authored
      Pull CRIS changes from Jesper Nilsson.
      
      ... mainly the UAPI disintegration.
      
      * tag 'cris-for-linus-3.8' of git://jni.nu/cris:
        UAPI: Fix up empty files in arch/cris/
        CRIS: locking: fix the return value of arch_read_trylock()
        CRIS: use kbuild.h instead of defining macros in asm-offset.c
        UAPI: (Scripted) Disintegrate arch/cris/include/asm
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
      0c544501
    • Linus Torvalds's avatar
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1ffab3d4
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "This is a batch of fixes for arm-soc platforms, most of it is for OMAP
        but there are others too (i.MX, Tegra, ep93xx).  Fixes warnings, some
        broken platforms and drivers, etc.  A bit all over the map really."
      
      There was some concern about commit 68136b10 ("RM: sunxi: Change device
      tree naming scheme for sunxi"), but Tony says:
       "Looks like that's trivial to fix as needed, no need to rebuild the
        branch to fix that AFAIK.
      
        The fix can be done once Olof is available online again.
      
        Linus, I suggest that you go ahead and pull this if there are no other
        issues with this branch."
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        ARM: sunxi: Change device tree naming scheme for sunxi
        ARM: ux500: fix missing include
        ARM: u300: delete custom pin hog code
        ARM: davinci: fix build break due to missing include
        ARM: exynos: Fix warning due to missing 'inline' in stub
        ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
        ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
        ARM: dts: mx27: Fix the AIPI bus for FEC
        ARM: OMAP2+: common: remove use of vram
        ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings
        ARM: OMAP4: clock data: DPLLs are missing bypass clocks in their parent lists
        ARM: OMAP4: clock data: div_iva_hs_clk is a power-of-two divider
        ARM: OMAP4: Fix EMU clock domain always on
        ARM: OMAP4460: Workaround ABE DPLL failing to turn-on
        ARM: OMAP4: Enhance support for DPLLs with 4X multiplier
        ARM: OMAP4: Add function table for non-M4X dplls
        ARM: OMAP4: Update timer clock aliases
        ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
        ARM: dts: Add build target for omap4-panda-a4
        ARM: dts: OMAP2420: Correct H4 board memory size
        ...
      1ffab3d4
    • Linus Torvalds's avatar
      Merge tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf · ddedec28
      Linus Torvalds authored
      Pull dma-buf updates from Sumit Semwal:
       "A fairly small dma-buf pull request for 3.8 - only 2 patches"
      
      * tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
        dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER
        dma-buf: might_sleep() in dma_buf_unmap_attachment()
      ddedec28
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 8cb68bdf
      Linus Torvalds authored
      Pull hwmon subsystem update from Jean Delvare:
       "There are many improvements to the it87 driver, as well as suspend
        support for the Winbond Super-I/O chips, and a few other fixes."
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon-vid: Add support for AMD family 11h to 15h processors
        hwmon: (it87) Support PECI for additional chips
        hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate
        hwmon: (it87) Manage device specific features with table
        hwmon: (it87) Replace pwm group macro with direct attribute definitions
        hwmon: (it87) Avoid quoted string splits across lines
        hwmon: (it87) Save fan registers in 2-dimensional array
        hwmon: (it87) Introduce support for tempX_offset sysfs attribute
        hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions
        hwmon: (it87) Save voltage register values in 2-dimensional array
        hwmon: (it87) Save temperature registers in 2-dimensional array
        hwmon: (w83627ehf) Get rid of smatch warnings
        hwmon: (w83627hf) Don't touch nonexistent I2C address registers
        hwmon: (w83627ehf) Add support for suspend
        hwmon: (w83627hf) Add support for suspend
        hwmon: Fix PCI device reference leak in quirk
      8cb68bdf
    • Hugh Dickins's avatar
      ksm: make rmap walks more scalable · b6b19f25
      Hugh Dickins authored
      The rmap walks in ksm.c are like those in rmap.c: they can safely be
      done with anon_vma_lock_read().
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b6b19f25
    • Hugh Dickins's avatar
      sched: numa: ksm: fix oops in task_numa_placment() · 2832bc19
      Hugh Dickins authored
      task_numa_placement() oopsed on NULL p->mm when task_numa_fault() got
      called in the handling of break_ksm() for ksmd.  That might be a
      peculiar case, which perhaps KSM could takes steps to avoid? but it's
      more robust if task_numa_placement() allows for such a possibility.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2832bc19
    • Zlatko Calusic's avatar
      mm: do not sleep in balance_pgdat if there's no i/o congestion · cda73a10
      Zlatko Calusic authored
      On a 4GB RAM machine, where Normal zone is much smaller than DMA32 zone,
      the Normal zone gets fragmented in time.  This requires relatively more
      pressure in balance_pgdat to get the zone above the required watermark.
      Unfortunately, the congestion_wait() call in there slows it down for a
      completely wrong reason, expecting that there's a lot of
      writeback/swapout, even when there's none (much more common).  After a
      few days, when fragmentation progresses, this flawed logic translates to
      a very high CPU iowait times, even though there's no I/O congestion at
      all.  If THP is enabled, the problem occurs sooner, but I was able to
      see it even on !THP kernels, just by giving it a bit more time to occur.
      
      The proper way to deal with this is to not wait, unless there's
      congestion.  Thanks to Mel Gorman, we already have the function that
      perfectly fits the job.  The patch was tested on a machine which nicely
      revealed the problem after only 1 day of uptime, and it's been working
      great.
      Signed-off-by: default avatarZlatko Calusic <zlatko.calusic@iskon.hr>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cda73a10
    • David Howells's avatar
      UAPI: Fix up empty files in arch/cris/ · 77c8006d
      David Howells authored
      Fix up three empty files in arch/cris/ by sticking placeholder comments in
      there to prevent the patch program from deleting them.
      
      I decided not to delete the arch-v*/Kbuild files as it's possibly someone might
      want to use them for genhdr-y lines in the future, but they could be deleted
      and the pointer lines removed from asm/Kbuild.  The uapi/arch-v*/Kbuild files
      ought to be uneffected by such a change.
      
      asm/swab.h didn't have anything outside of __KERNEL__ so nothing appeared in
      uapi/asm/swab.h.  The latter, however, is exported by Kbuild.asm.
      
      This needs to be applied after the CRIS UAPI disintegration patch.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      77c8006d
    • Wei Yongjun's avatar
      CRIS: locking: fix the return value of arch_read_trylock() · 00addd1a
      Wei Yongjun authored
      arch_write_trylock() should return 'ret' instead of always
      return 1.
      
      dpatch engine is used to auto generate this patch.
      (https://github.com/weiyj/dpatch)
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      00addd1a
    • Jesper Nilsson's avatar
      Merge tag 'disintegrate-cris-20121009' of... · e61ac0b0
      Jesper Nilsson authored
      Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2
      
      UAPI Disintegration 2012-10-09
      
      * tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/cris/include/asm
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
      e61ac0b0
    • James Hogan's avatar
      CRIS: use kbuild.h instead of defining macros in asm-offset.c · 8e6b4dd1
      James Hogan authored
      This is modelled on commits such as the one below:
      
      Commit fc1c3a00 ("sh: use kbuild.h
      instead of defining macros in asm-offsets.c") introduced in v2.6.26.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      8e6b4dd1
    • David Howells's avatar
    • Will Deacon's avatar
      ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards · e6ee4b2b
      Will Deacon authored
      Commit 34ae6c96 ("ARM: 7298/1: realview: fix mapping of MPCore
      private memory region") accidentally broke the definition for the base
      address of the private peripheral region on revision B Realview-EB
      boards.
      
      This patch uses the correct address for REALVIEW_EB11MP_PRIV_MEM_BASE.
      
      Cc: <stable@vger.kernel.org>
      Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Tested-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      e6ee4b2b