1. 24 5月, 2014 6 次提交
  2. 15 5月, 2014 7 次提交
  3. 13 5月, 2014 2 次提交
  4. 10 5月, 2014 1 次提交
  5. 08 5月, 2014 1 次提交
  6. 24 4月, 2014 2 次提交
    • J
      arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h · adc01864
      Julien Grall 提交于
      virt_to_pfn has been defined in asm/memory.h by the commit e26a9e00 "ARM: Better
      virt_to_page() handling"
      
      This will result of a compilation warning when CONFIG_XEN is enabled.
      
      arch/arm/include/asm/xen/page.h:80:0: warning: "virt_to_pfn" redefined [enabled by default]
       #define virt_to_pfn(v)          (PFN_DOWN(__pa(v)))
       ^
      In file included from arch/arm/include/asm/page.h:163:0,
                       from arch/arm/include/asm/xen/page.h:4,
                       from include/xen/page.h:4,
                       from arch/arm/xen/grant-table.c:33:
      
      The definition in memory.h is nearly the same (it directly expand PFN_DOWN),
      so we can safely drop virt_to_pfn in xen include.
      Signed-off-by: NJulien Grall <julien.grall@linaro.org>
      Signed-off-by: NDavid Vrabel <david.vrabel@citrix.com>
      adc01864
    • I
      arm: xen: implement multicall hypercall support. · 5e40704e
      Ian Campbell 提交于
      As part of this make the usual change to xen_ulong_t in place of unsigned long.
      This change has no impact on x86.
      
      The Linux definition of struct multicall_entry.result differs from the Xen
      definition, I think for good reasons, and used a long rather than an unsigned
      long. Therefore introduce a xen_long_t, which is a long on x86 architectures
      and a signed 64-bit integer on ARM.
      
      Use uint32_t nr_calls on x86 for consistency with the ARM definition.
      
      Build tested on amd64 and i386 builds. Runtime tested on ARM.
      Signed-off-by: NIan Campbell <ian.campbell@citrix.com>
      Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
      Signed-off-by: NDavid Vrabel <david.vrabel@citrix.com>
      5e40704e
  7. 23 4月, 2014 8 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 1aae31c8
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "The main change is that we now publish "firmware ID" for the serio
        devices to help userspace figure out the kind of touchpads it is
        dealing with: i8042 will export PS/2 port's PNP IDs as firmware IDs.
      
        You will also get more quirks for Synaptics touchpads in various
        Lenovo laptops, a change to elantech driver to recognize even more
        models, and fixups to wacom and couple other drivers"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: elantech - add support for newer elantech touchpads
        Input: soc_button_array - fix a crash during rmmod
        Input: synaptics - add min/max quirk for ThinkPad T431s, L440, L540, S1 Yoga and X1
        Input: synaptics - report INPUT_PROP_TOPBUTTONPAD property
        Input: Add INPUT_PROP_TOPBUTTONPAD device property
        Input: i8042 - add firmware_id support
        Input: serio - add firmware_id sysfs attribute
        Input: wacom - handle 1024 pressure levels in wacom_tpc_pen
        Input: wacom - references to 'wacom->data' should use 'unsigned char*'
        Input: wacom - override 'pressure_max' with value from HID_USAGE_PRESSURE
        Input: wacom - use full 32-bit HID Usage value in switch statement
        Input: wacom - missed the last bit of expresskey for DTU-1031
        Input: ads7846 - fix device usage within attribute show
        Input: da9055_onkey - remove use of regmap_irq_get_virq()
      1aae31c8
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6db8148c
      Linus Torvalds 提交于
      Pull radeon drm fixes from Dave Airlie:
       "This is just radeon fixes, primarily the two pll fix and the aux fix,
        it also disables dpm on rv770 gpus, fixes driver reloading, and fixes
        two issues with runtime PM on some GPUS"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: don't allow runpm=1 on systems with out ATPX
        drm/radeon: fix ATPX detection on non-VGA GPUs
        drm/radeon/pm: don't walk the crtc list before it has been initialized (v2)
        drm/radeon: properly unregister hwmon interface (v2)
        drm/radeon: fix count in cik_sdma_ring_test()
        drm/radeon/aux: fix hpd assignment for aux bus
        drm/radeon: improve PLL limit handling in post div calculation
        drm/radeon: use fixed PPL ref divider if needed
        drm/radeon: disable dpm on rv770 by default
      6db8148c
    • J
      Input: elantech - add support for newer elantech touchpads · ae4bedf0
      Jordan Rife 提交于
      Newer elantech touchpads are not recognized by the current driver, since it
      fails to detect their firmware version number. This prevents more advanced
      touchpad features from being usable such as two-finger scrolling. This
      patch allows newer touchpads to be detected and be fully functional. Tested
      on Sony Vaio SVF13N17PXB.
      Signed-off-by: NJordan Rife <jrife0@gmail.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      ae4bedf0
    • L
      Input: soc_button_array - fix a crash during rmmod · 7740fc52
      Lejun Zhu 提交于
      When the system has zero or one button available, trying to rmmod
      soc_button_array will cause crash. Fix this by properly handling -ENODEV
      in probe().
      Signed-off-by: NLejun Zhu <lejun.zhu@linux.intel.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      7740fc52
    • D
      Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-next · abaafc0a
      Dave Airlie 提交于
      1. Further PLL parameter fixes.
      2. Fixes for HPD on DP
      3. Could of different PM fixes
      4. Disabling DPM on RV770
      
      * 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux:
        drm/radeon: don't allow runpm=1 on systems with out ATPX
        drm/radeon: fix ATPX detection on non-VGA GPUs
        drm/radeon/pm: don't walk the crtc list before it has been initialized (v2)
        drm/radeon: properly unregister hwmon interface (v2)
        drm/radeon: fix count in cik_sdma_ring_test()
        drm/radeon/aux: fix hpd assignment for aux bus
        drm/radeon: improve PLL limit handling in post div calculation
        drm/radeon: use fixed PPL ref divider if needed
        drm/radeon: disable dpm on rv770 by default
      abaafc0a
    • L
      mm: make fixup_user_fault() check the vma access rights too · 1b17844b
      Linus Torvalds 提交于
      fixup_user_fault() is used by the futex code when the direct user access
      fails, and the futex code wants it to either map in the page in a usable
      form or return an error.  It relied on handle_mm_fault() to map the
      page, and correctly checked the error return from that, but while that
      does map the page, it doesn't actually guarantee that the page will be
      mapped with sufficient permissions to be then accessed.
      
      So do the appropriate tests of the vma access rights by hand.
      
      [ Side note: arguably handle_mm_fault() could just do that itself, but
        we have traditionally done it in the caller, because some callers -
        notably get_user_pages() - have been able to access pages even when
        they are mapped with PROT_NONE.  Maybe we should re-visit that design
        decision, but in the meantime this is the minimal patch. ]
      
      Found by Dave Jones running his trinity tool.
      Reported-by: NDave Jones <davej@redhat.com>
      Acked-by: NHugh Dickins <hughd@google.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1b17844b
    • L
      Merge tag 'gpio-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 4d0fa8a0
      Linus Torvalds 提交于
      Pull gpio fixes from Linus Walleij:
       "A small batch of GPIO fixes for the v3.15 series.  I expect more to
        come in but I'm a bit behind on mail, might as well get these to you
        right now:
      
         - Change a crucial semantic ordering in the GPIO irqchip helpers
      
         - Fix two nasty regressions in the ACPI gpiolib extensions"
      
      * tag 'gpio-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio / ACPI: Prevent potential wrap of GPIO value on OpRegion read
        gpio / ACPI: Don't crash on NULL chip->dev
        gpio: set data first, then chip and handler
      4d0fa8a0
    • L
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 39bfe907
      Linus Torvalds 提交于
      Pull x86 vdso fix from Peter Anvin:
       "This is a single build fix for building with gold as opposed to GNU
        ld.  It got queued up separately and was expected to be pushed during
        the merge window, but it got left behind"
      
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, vdso: Make the vdso linker script compatible with Gold
      39bfe907
  8. 22 4月, 2014 7 次提交
  9. 21 4月, 2014 6 次提交
    • L
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9ac03675
      Linus Torvalds 提交于
      Pull ext4 fixes from Ted Ts'o:
       "These are regression and bug fixes for ext4.
      
        We had a number of new features in ext4 during this merge window
        (ZERO_RANGE and COLLAPSE_RANGE fallocate modes, renameat, etc.) so
        there were many more regression and bug fixes this time around.  It
        didn't help that xfstests hadn't been fully updated to fully stress
        test COLLAPSE_RANGE until after -rc1"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
        ext4: disable COLLAPSE_RANGE for bigalloc
        ext4: fix COLLAPSE_RANGE failure with 1KB block size
        ext4: use EINVAL if not a regular file in ext4_collapse_range()
        ext4: enforce we are operating on a regular file in ext4_zero_range()
        ext4: fix extent merging in ext4_ext_shift_path_extents()
        ext4: discard preallocations after removing space
        ext4: no need to truncate pagecache twice in collapse range
        ext4: fix removing status extents in ext4_collapse_range()
        ext4: use filemap_write_and_wait_range() correctly in collapse range
        ext4: use truncate_pagecache() in collapse range
        ext4: remove temporary shim used to merge COLLAPSE_RANGE and ZERO_RANGE
        ext4: fix ext4_count_free_clusters() with EXT4FS_DEBUG and bigalloc enabled
        ext4: always check ext4_ext_find_extent result
        ext4: fix error handling in ext4_ext_shift_extents
        ext4: silence sparse check warning for function ext4_trim_extent
        ext4: COLLAPSE_RANGE only works on extent-based files
        ext4: fix byte order problems introduced by the COLLAPSE_RANGE patches
        ext4: use i_size_read in ext4_unaligned_aio()
        fs: disallow all fallocate operation on active swapfile
        fs: move falloc collapse range check into the filesystem methods
        ...
      9ac03675
    • A
      um: Memory corruption on startup · 0565103d
      Anton Ivanov 提交于
      The reverse case of this race (you must msync before read) is
      well known. This is the not so common one.
      
      It can be triggered only on systems which do a lot of task
      switching and only at UML startup. If you are starting 200+ UMLs
      ~ 0.5% will always die without this fix.
      Signed-off-by: NAnton Ivanov <antivano@cisco.com>
      [rw: minor whitespace fixes]
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      0565103d
    • A
      um: Missing pipe handling · 9fcb663b
      Anton Ivanov 提交于
      UML does not handle sigpipe. As a result when running it under
      expect or redirecting the IO from the console to an external program
      it will crash if the program stops or exits.
      Signed-off-by: NAnton Ivanov <antivano@cisco.com>
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      9fcb663b
    • T
      uml: Simplify tempdir logic. · 0d71832e
      Tristan Schmelcher 提交于
      Inferring the mount hierarchy correctly from /proc/mounts is hard when MS_MOVE
      may have been used, and the previous code did it wrongly. This change simplifies
      the logic to only require that /dev/shm be _on_ tmpfs (which can be checked
      trivially with statfs) rather than that it be a _mountpoint_ of tmpfs, since
      there isn't a compelling reason to be that strict. We also now check for tmpfs
      on whatever directory we ultimately use so that the user is better informed.
      
      This change also moves the more standard TMPDIR environment variable check ahead
      of the others.
      
      Applies to 3.12.
      Signed-off-by: NTristan Schmelcher <tschmelcher@google.com>
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      0d71832e
    • L
      Linux 3.15-rc2 · a798c10f
      Linus Torvalds 提交于
      a798c10f
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 372feacb
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "Back from long weekend here in India and now the time to send fixes
        for slave dmaengine.
         - Dan's fix of sirf xlate code
         - Jean's fix for timberland
         - edma fixes by Sekhar for SG handling and Yuan for changing init
           call"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dma: fix eDMA driver as a subsys_initcall
        dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
        platform: Fix timberdale dependencies
        dma: edma: fix incorrect SG list handling
      372feacb