1. 12 7月, 2013 16 次提交
  2. 11 7月, 2013 24 次提交
    • L
      Revert "Makefile: Fix install error with make -j option" · 6d128e1e
      Linus Torvalds 提交于
      This reverts commit d2aae847.
      
      It is completely and utterly broken.  Module install should not build
      any files, and adding broken dependencies to "help" it build files is
      complete and utter sh*t.
      
      The kernel should not be built by root, and "make install" and "make
      module_install" (that for obvious reasons need to be run as root)
      absolutely must not build any files.  They should only ever copy the
      already-built files over.
      
      So having dependencies for the install targets is wrong, wrong, wrong.
      
      If you try to install a kernel without building it first, you *should*
      get errors. The build system shouldn't try to help root build the files.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6d128e1e
    • L
      Merge tag 'kvm-3.11-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 64fb6d9a
      Linus Torvalds 提交于
      Pull more KVM changes from Gleb Natapov:
       "A fix for a bug that prevents some guests from working on old Intel
        CPUs and a patch that integrates ARM64 KVM, merged via ARM64 tree,
        into Kconfig."
      
      * tag 'kvm-3.11-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: VMX: mark unusable segment as nonpresent
        arm64: KVM: Kconfig integration
      64fb6d9a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · b4294eec
      Linus Torvalds 提交于
      Pull Sparc bugfixes from David Miller:
       "Four bug fixes:
      
         1) Enable snoop tags properly on Sparc32/LEON, from Andreas Larsson
      
         2) strcpy() length check fix from Chen Gang.
      
         3) Forgotten unregister_netdev() in sunvnet driver, from Dave
            Kleikamp.
      
         4) Fix broken assembler offsets used in vm_area_struct accesses on
            sparc32, from Olivier DANET."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        [PATCH] sparc32: vm_area_struct access for old Sun SPARCs.
        sunvnet: vnet_port_remove must call unregister_netdev
        sparc32, leon: Require separate snoop tags set to regard snooping to be enabled
        arch: sparc: kernel: check the memory length before use strcpy().
      b4294eec
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 4ece92df
      Linus Torvalds 提交于
      Pull IDE updates from David Miller:
       "Just a few small things:
      
         1) module_platform_driver_probe() conversions from Jingoo Han.
      
         2) module_pci_driver() conversion from Libo Chen.
      
         3) PIO size calculation fix from Steven J Hill"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: Fix IDE PIO size calculation
        drivers/ide/delkin_cb: Convert to module_pci_driver
        ide: gayle: use module_platform_driver_probe()
        ide: tx4939ide: use module_platform_driver_probe()
        ide: tx4938ide: use module_platform_driver_probe()
      4ece92df
    • L
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 75fcf64d
      Linus Torvalds 提交于
      Pull printk locking fix from Thomas Gleixner:
       "A single lock ordering fix in the printk code"
      
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        printk: Fix rq->lock vs logbuf_lock unlock lock inversion
      75fcf64d
    • L
      Merge branch 'akpm' (patches from Andrew Morton) · db6e3304
      Linus Torvalds 提交于
      Merge more patches from Andrew Morton:
       "The rest of MM"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mm: remove free_area_cache
        zswap: add documentation
        zswap: add to mm/
        zbud: add to mm/
      db6e3304
    • M
      mm: remove free_area_cache · 98d1e64f
      Michel Lespinasse 提交于
      Since all architectures have been converted to use vm_unmapped_area(),
      there is no remaining use for the free_area_cache.
      Signed-off-by: NMichel Lespinasse <walken@google.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: David Howells <dhowells@redhat.com>
      Cc: Helge Deller <deller@gmx.de>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Richard Henderson <rth@twiddle.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      98d1e64f
    • S
      zswap: add documentation · 61b0d760
      Seth Jennings 提交于
      Add the documentation file for the zswap functionality
      Signed-off-by: NSeth Jennings <sjenning@linux.vnet.ibm.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Nitin Gupta <ngupta@vflare.org>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
      Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
      Cc: Jenifer Hopper <jhopper@us.ibm.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Johannes Weiner <jweiner@redhat.com>
      Cc: Larry Woodman <lwoodman@redhat.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Dave Hansen <dave@sr71.net>
      Cc: Joe Perches <joe@perches.com>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
      Cc: Hugh Dickens <hughd@google.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      61b0d760
    • S
      zswap: add to mm/ · 2b281117
      Seth Jennings 提交于
      zswap is a thin backend for frontswap that takes pages that are in the
      process of being swapped out and attempts to compress them and store
      them in a RAM-based memory pool.  This can result in a significant I/O
      reduction on the swap device and, in the case where decompressing from
      RAM is faster than reading from the swap device, can also improve
      workload performance.
      
      It also has support for evicting swap pages that are currently
      compressed in zswap to the swap device on an LRU(ish) basis.  This
      functionality makes zswap a true cache in that, once the cache is full,
      the oldest pages can be moved out of zswap to the swap device so newer
      pages can be compressed and stored in zswap.
      
      This patch adds the zswap driver to mm/
      Signed-off-by: NSeth Jennings <sjenning@linux.vnet.ibm.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Nitin Gupta <ngupta@vflare.org>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
      Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
      Cc: Jenifer Hopper <jhopper@us.ibm.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Johannes Weiner <jweiner@redhat.com>
      Cc: Larry Woodman <lwoodman@redhat.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Dave Hansen <dave@sr71.net>
      Cc: Joe Perches <joe@perches.com>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
      Cc: Hugh Dickens <hughd@google.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2b281117
    • S
      zbud: add to mm/ · 4e2e2770
      Seth Jennings 提交于
      zbud is an special purpose allocator for storing compressed pages.  It
      is designed to store up to two compressed pages per physical page.
      While this design limits storage density, it has simple and
      deterministic reclaim properties that make it preferable to a higher
      density approach when reclaim will be used.
      
      zbud works by storing compressed pages, or "zpages", together in pairs
      in a single memory page called a "zbud page".  The first buddy is "left
      justifed" at the beginning of the zbud page, and the last buddy is
      "right justified" at the end of the zbud page.  The benefit is that if
      either buddy is freed, the freed buddy space, coalesced with whatever
      slack space that existed between the buddies, results in the largest
      possible free region within the zbud page.
      
      zbud also provides an attractive lower bound on density.  The ratio of
      zpages to zbud pages can not be less than 1.  This ensures that zbud can
      never "do harm" by using more pages to store zpages than the
      uncompressed zpages would have used on their own.
      
      This implementation is a rewrite of the zbud allocator internally used
      by zcache in the driver/staging tree.  The rewrite was necessary to
      remove some of the zcache specific elements that were ingrained
      throughout and provide a generic allocation interface that can later be
      used by zsmalloc and others.
      
      This patch adds zbud to mm/ for later use by zswap.
      Signed-off-by: NSeth Jennings <sjenning@linux.vnet.ibm.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Nitin Gupta <ngupta@vflare.org>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
      Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
      Cc: Jenifer Hopper <jhopper@us.ibm.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Johannes Weiner <jweiner@redhat.com>
      Cc: Larry Woodman <lwoodman@redhat.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Dave Hansen <dave@sr71.net>
      Cc: Joe Perches <joe@perches.com>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
      Cc: Hugh Dickens <hughd@google.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Bob Liu <bob.liu@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4e2e2770
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · ae924949
      Linus Torvalds 提交于
      Pull coccinelle updates from Michal Marek:
       "The misc branch is reserved for Coccinelle this time:
      
         - 'report' is the default mode
         - MAINTAINERS update for Coccinelle
         - documentation udate
         - use new option format for spatch(1)
         - J=<n> variable to mimic make -j for coccicheck
         - check for missing pci_free_consistent() calls
      
        There are some patches for rpm-pkg and deb-pkg waiting for the
        3.12-rc1 merge window"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        Coccinelle: Update information about the minimal version required
        Coccinelle: Update the options used to the new option scheme
        scripts: Coccinelle script for pci_free_consistent()
        Coccinelle: Update the documentation
        Coccinelle: Update section of MAINTAINERS
        coccicheck: span checks across CPUs
        scripts/coccinelle: check for field address argument to kfree
        Coccinelle: Update the Coccinelle section of MAINTAINERS
        Coccinelle: Make 'report' the default mode
      ae924949
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · b202c0d5
      Linus Torvalds 提交于
      Pull kconfig updates from Michal Marek:
       - dependency solver fix for make defconfig
       - randconfig fixes, one of which had to be reverted again
       - more user-friendly sorting of search results
       - hex and range keywords support longs
       - fix for [mn]conf not to rely on particular behavior of the LINES and
         COLS variables
       - cleanup of magic constants in kconfig/lxdialog
       - [mn]conf formatting fixes
       - fix for scripts/config's help text in out-of-tree usage (under a
         different name)
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: allow "hex" and "range" to support longs
        Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
        kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
        kconfig: loop as long as we changed some symbols in randconfig
        kconfig/[mn]conf: make it explicit in the search box that a regexp is possible
        kconfig: sort found symbols by relevance
        kconfig/conf: print the seed used to initialise the RNG for randconfig
        kconfig/conf: accept a base-16 seed for randconfig
        kconfig/conf: fix randconfig setting multiple symbols in a choice
        scripts/config: replace hard-coded script name by a dynamic value
        mconf/nconf: mark empty menus/menuconfigs different from non-empty ones
        nconf: use function calls instead of ncurses' variables LINES and COLS
        mconf: use function calls instead of ncurses' variables LINES and COLS
        kconfig/lxdialog: handle newline characters in print_autowrap()
        kconfig/lxdialog: Use new mininimum resize definitions in conf_choice()
        kconfig/lxdialog: Add definitions for mininimum (re)size values
        kconfig: Fix defconfig when one choice menu selects options that another choice menu depends on
      b202c0d5
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · cb63fc26
      Linus Torvalds 提交于
      Pull kbuild updates from Michal Marek:
       - fix for make headers_install argv explosion with too long path
       - scripts/setlocalversion does not call git update-index needlessly
       - fix for the src.rpm produced by make rpm-pkg.  The new make
         image_name can be useful also for other packaging tools.
       - scripts/mod/devicetable-offsets.o is not rebuilt during each make run
       - make modules_install dependency fix
       - scripts/sortextable portability fix
       - fix for kbuild to generate the output directory for all object files
         in subdirs.
       - a couple of minor fixes
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: create directory for dir/file.o
        tools/include: use stdint types for user-space byteshift headers
        Makefile: Fix install error with make -j option
        Fix a build warning in scripts/mod/file2alias.c
        improve modalias building
        scripts/mod: Spelling s/DEVICEVTABLE/DEVICETABLE/
        kbuild: fix error when building from src rpm
        scripts/setlocalversion on write-protected source tree
        Makefile.lib: align DTB quiet_cmd
        kbuild: fix make headers_install when path is too long
      cb63fc26
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a9642fa3
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
       "Two small fixlets"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Fix interrupt handler timing harness
        perf/x86/amd: Do not print an error when the device is not present
      a9642fa3
    • L
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 81336333
      Linus Torvalds 提交于
      Pull module updates from Rusty Russell:
       "Nothing interesting.  Except the most embarrassing bugfix ever.  But
        let's ignore that"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: cleanup call chain.
        module: do percpu allocation after uniqueness check.  No, really!
        modules: don't fail to load on unknown parameters.
        ABI: Clarify when /sys/module/MODULENAME is created
        There is no /sys/parameters
        module: don't modify argument of module_kallsyms_lookup_name()
      81336333
    • L
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 5f129721
      Linus Torvalds 提交于
      Pull virtio updates from Rusty Russell:
       "No real surprises"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        MAINTAINERS: add tools/virtio/ under virtio
        tools/virtio: move module license stub to module.h
        virtio: include asm/barrier explicitly
        virtio: VIRTIO_F_ANY_LAYOUT feature
        lguest: fix example launcher compilation for broken glibc headers.
        virtio-net: fix the race between channels setting and refill
        tools/lguest: real barriers.
        tools/lguest: fix missing rmb().
        virtio_balloon: leak_balloon(): only tell host if we got pages deflated
        virtio-pci: fix leaks of msix_affinity_masks
        Fix comment typo "CONFIG_PAE"
      5f129721
    • L
      Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio · 15a49b9a
      Linus Torvalds 提交于
      Pull vfio updates from Alex Williamson:
       "Largely hugepage support for vfio/type1 iommu and surrounding cleanups
        and fixes"
      
      * tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio:
        vfio/type1: Fix leak on error path
        vfio: Limit group opens
        vfio/type1: Fix missed frees and zero sized removes
        vfio: fix documentation
        vfio: Provide module option to disable vfio_iommu_type1 hugepage support
        vfio: hugepage support for vfio_iommu_type1
        vfio: Convert type1 iommu to use rbtree
      15a49b9a
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 8d10aae2
      Linus Torvalds 提交于
      Pull vhost fixes and cleanups from Michael S Tsirkin:
       "This includes some fixes and cleanups for vhost net and scsi drivers"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost/test: update test after vhost cleanups
        vhost: Make local function static
        vhost: Make vhost a separate module
        vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd
        vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg
        vhost-scsi: Make func indention more consistent
        vhost-scsi: Rename struct vhost_scsi *s to *vs
        vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration
        vhost: Simplify dev->vqs[i] access
        vhost-net: fix use-after-free in vhost_net_flush
      8d10aae2
    • L
      Merge tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 66645656
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
       "A few updates this time, most important and exiciting (to me) is:
      
         - The new ARM SMMU driver.  This is a common IOMMU driver that will
           hopefully be used in a lot of upcoming ARM chips.  So the mess in
           the past where every SOC had its own IOMMU will be over.
      
        Besides that:
      
         - Some important fixes in the IOMMU unmap path.  There are fixes in
           the common code and also in the AMD IOMMU driver.
         - Other random fixes"
      
      * tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        MAINTAINERS: add entry for ARM system MMU driver
        iommu/arm: Add support for ARM Ltd. System MMU architecture
        documentation/iommu: Add description of ARM System MMU binding
        iommu: Use %pa and %zx instead of casting
        iommu/amd: Only unmap large pages from the first pte
        iommu: Fix compiler warning on pr_debug
        iommu/amd: Fix memory leak in free_pagetable
        iommu: Split iommu_unmaps
        iommu/{vt-d,amd}: Remove multifunction assumption around grouping
        iommu/omap: fix checkpatch warnings in omap iommu code
        iommu/omap: fix printk formats for dma_addr_t
        iommu/vt-d: DMAR reporting table needs at least one DRHD
        iommu/vt-d: Downgrade the warning if enabling irq remapping fails
      66645656
    • L
      drm: avoid warning in drm_load_edid_firmware() · 496fd15b
      Linus Torvalds 提交于
      Use "const char *" instead of "char *" in order to avoid this warning:
      
        drivers/gpu/drm/drm_edid_load.c: In function ‘drm_load_edid_firmware’:
        drivers/gpu/drm/drm_edid_load.c:245:25: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      496fd15b
    • O
      [PATCH] sparc32: vm_area_struct access for old Sun SPARCs. · 961246b4
      Olivier DANET 提交于
      Commit e4c6bfd2 ("mm: rearrange
      vm_area_struct for fewer cache misses") changed the layout of the
      vm_area_struct structure, it broke several SPARC32 assembly routines
      which used numerical constants for accessing the vm_mm field.
      
      This patch defines the VMA_VM_MM constant to replace the immediate values.
      Signed-off-by: NOlivier DANET <odanet@caramail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      961246b4
    • D
      sunvnet: vnet_port_remove must call unregister_netdev · aabb9875
      Dave Kleikamp 提交于
      The missing call to unregister_netdev() leaves the interface active
      after the driver is unloaded by rmmod.
      Signed-off-by: NDave Kleikamp <dave.kleikamp@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      aabb9875
    • A
      sparc32, leon: Require separate snoop tags set to regard snooping to be enabled · e8e2bfd1
      Andreas Larsson 提交于
      Even if data snooping is enabled, without separate snoop tags snooping will not
      work when the MMU is enabled.
      Signed-off-by: NAndreas Larsson <andreas@gaisler.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e8e2bfd1
    • C
      arch: sparc: kernel: check the memory length before use strcpy(). · f118e9ab
      Chen Gang 提交于
      For the related next strcpy(), the destination length is less than 512,
      but the source maximize length may be 'OPROMMAXPARAM' (4096) which is
      more than 512.
      
      One work flow may:
        openprom_sunos_ioctl() ->  if (cmd == OPROMSETOPT)
          getstrings() ->  will alloc buffer with size 'OPROMMAXPARAM'.
          opromsetopt() ->  devide the buffer into 'var' and 'value'
            of_set_property() -> pass
              prom_setprop() -> pass
                ldom_set_var()
      
      And do not mind the additional 4 alignment buffer increasing, since
      'sizeof(pkt) - sizeof(pkt.header)' is 4 alignment at least.
      Signed-off-by: NChen Gang <gang.chen@asianux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f118e9ab