1. 11 11月, 2015 16 次提交
    • C
      cx88: use pci_set_dma_mask insted of pci_dma_supported · 111be8b2
      Christoph Hellwig 提交于
      This ensures the dma mask that is supported by the driver is recorded
      in the device structure.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      111be8b2
    • C
      saa7134: use pci_set_dma_mask insted of pci_dma_supported · f546e121
      Christoph Hellwig 提交于
      This ensures the dma mask that is supported by the driver is recorded
      in the device structure.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
      Cc: Pawel Osciak <pawel@osciak.com>
      Cc: Hans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f546e121
    • C
      saa7164: use pci_set_dma_mask insted of pci_dma_supported · 45fa9c03
      Christoph Hellwig 提交于
      This ensures the dma mask that is supported by the driver is recorded
      in the device structure.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      Cc: Steven Toth <stoth@kernellabs.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      45fa9c03
    • C
      tw68-core: use pci_set_dma_mask insted of pci_dma_supported · bad007bc
      Christoph Hellwig 提交于
      This ensures the dma mask that is supported by the driver is recorded
      in the device structure.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
      Cc: Pawel Osciak <pawel@osciak.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bad007bc
    • C
      pcnet32: use pci_set_dma_mask insted of pci_dma_supported · 46a7fd8a
      Christoph Hellwig 提交于
      All drivers should be using dma_set_mask / pci_set_dma_mask to try to
      set the dma mask instead of just querying it.  Without that some iommu
      implementations may not work.
      
      pci_dma_supported is removed entirely, but dma_supported stays for
      dma_ops implementations for now.
      
      This patch (of 15):
      
      This ensures the dma mask that is supported by the driver is recorded
      in the device structure.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Acked-by: NDon Fry <pcnet32@frontier.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: Alexandre Courbot <acourbot@nvidia.com>
      Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
      Cc: Ben Skeggs <bskeggs@redhat.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Dave Airlie <airlied@redhat.com>
      Cc: David Airlie <airlied@linux.ie>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      Cc: Helge Deller <deller@gmx.de>
      Cc: Jiri Slaby <jslaby@suse.com>
      Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
      Cc: Pawel Osciak <pawel@osciak.com>
      Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
      Cc: Sergey Kozlov <serjk@netup.ru>
      Cc: Shradha Shah <sshah@solarflare.com>
      Cc: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
      Cc: Steven Toth <stoth@kernellabs.com>
      Cc: Thierry Reding <treding@nvidia.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      46a7fd8a
    • A
      lib/string.c: add ULL suffix to the constant definition · 3368e8fb
      Andy Shevchenko 提交于
      8-byte constant is too big for long and compiler complains about this.
      
        lib/string.c:907:20: warning: constant 0x0101010101010101 is so big it is long
      
      Append ULL suffix to explicitly show its type.
      Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3368e8fb
    • N
      hugetlb: trivial comment fix · d15c7c09
      Naoya Horiguchi 提交于
      Recently alloc_buddy_huge_page() was renamed to __alloc_buddy_huge_page(),
      so let's sync comments.
      Signed-off-by: NNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d15c7c09
    • G
      selftests/mlock2: add ULL suffix to 64-bit constants · e14231cf
      Geert Uytterhoeven 提交于
      On 32-bit (e.g. m68k):
      
          mlock2-tests.c: In function 'lock_check':
          mlock2-tests.c:293: warning: integer constant is too large for 'long' type
          mlock2-tests.c:294: warning: integer constant is too large for 'long' type
          mlock2-tests.c:299: warning: integer constant is too large for 'long' type
          ...
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NEric B Munson <emunson@akamai.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e14231cf
    • G
      selftests/mlock2: add missing #define _GNU_SOURCE · 60997feb
      Geert Uytterhoeven 提交于
      On glibc 2.3.6:
      
          mlock2-tests.c: In function 'seek_to_smaps_entry':
          mlock2-tests.c:158: warning: implicit declaration of function 'getline'
      
      According to the manpage of getline(), it needs _GNU_SOURCE before glibc
      2.10.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NEric B Munson <emunson@akamai.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      60997feb
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 42d4ebb4
      Linus Torvalds 提交于
      Pull watchdog update from Wim Van Sebroeck:
      
       - New driver for Broadcom 7038 Set-Top Box
       - imx2_wdt: Use register definition in regmap_write()
       - intel-mid: add Magic Closure flag
       - watchdog framework improvements:
            - Use device tree alias for naming watchdogs
            - propagate ping error code to the user space
            - Always evaluate new timeout against min_timeout
            - Use single variable name for struct watchdog_device
       - include clean-ups
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: include: add units for timeout values in kerneldoc
        watchdog: include: fix some typos
        watchdog: core: propagate ping error code to the user space
        watchdog: watchdog_dev: Use single variable name for struct watchdog_device
        watchdog: Always evaluate new timeout against min_timeout
        watchdog: intel-mid: add Magic Closure flag
        watchdog: imx2_wdt: Use register definition in regmap_write()
        watchdog: watchdog_dev: Use device tree alias for naming watchdogs
        watchdog: Watchdog driver for Broadcom Set-Top Box
        watchdog: bcm7038: add device tree binding documentation
      42d4ebb4
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 6aabef68
      Linus Torvalds 提交于
      Pull tiny hwmon update from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (k10temp) Remove duplicate pci-id define
      6aabef68
    • L
      Merge tag 'ntb-4.4' of git://github.com/jonmason/ntb · 1eb196c3
      Linus Torvalds 提交于
      Pull NTB bugfixes from Jon Mason:
       "NTB Bug fixes for potential NULL pointer accesses, accesses of a freed
        pointer, invalid buffer pointer, and a compiler warning.
      
        Also, unification of upstream/downstream addresses"
      
      * tag 'ntb-4.4' of git://github.com/jonmason/ntb:
        NTB: fix 32-bit compiler warning
        NTB: unify translation addresses
        NTB: invalid buf pointer in multi-MW setups
        NTB: remove unused variable
        NTB: fix access of free-ed pointer
        NTB: Fix issue where we may be accessing NULL ptr
      1eb196c3
    • L
      Merge tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 041c7951
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
       "This time we have a very typical update which is mostly fixes and
        updates to drivers and no new drivers.
      
         - the biggest change is coming from Peter for edma cleanup which even
           caused some last minute regression, things seem settled now
         - idma64 and dw updates
         - iotdma updates
         - module autoload fixes for various drivers
         - scatter gather support for hdmac"
      
      * tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (77 commits)
        dmaengine: edma: Add dummy driver skeleton for edma3-tptc
        Revert "ARM: DTS: am33xx: Use the new DT bindings for the eDMA3"
        Revert "ARM: DTS: am437x: Use the new DT bindings for the eDMA3"
        dmaengine: dw: some Intel devices has no memcpy support
        dmaengine: dw: platform: provide platform data for Intel
        dmaengine: dw: don't override platform data with autocfg
        dmaengine: hdmac: Add scatter-gathered memset support
        dmaengine: hdmac: factorise memset descriptor allocation
        dmaengine: virt-dma: Fix kernel-doc annotations
        ARM: DTS: am437x: Use the new DT bindings for the eDMA3
        ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
        dmaengine: edma: New device tree binding
        dmaengine: Kconfig: edma: Select TI_DMA_CROSSBAR in case of ARCH_OMAP
        dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx
        dmaengine: edma: Merge the of parsing functions
        dmaengine: edma: Do not allocate memory for edma_rsv_info in case of DT boot
        dmaengine: edma: Refactor the dma device and channel struct initialization
        dmaengine: edma: Get qDMA channel information from HW also
        dmaengine: edma: Merge map_dmach_to_queue into assign_channel_eventq
        dmaengine: edma: Correct PaRAM access function names (_parm_ to _param_)
        ...
      041c7951
    • L
      Merge tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 7d884710
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "Core:
         - Fix rtctest error path
      
        New drivers:
         - Microcrystal RV8803
      
        Subsystem wide cleanups:
         - remove misuse of IRQF_NO_SUSPEND flag
      
        Drivers:
         - at91rm9200: clear RTC alarm status flag prior to suspending
         - davinci: remove incorrect reference to probe function
         - ds1307: Fix alarm programming for mcp794xx
         - ds1390: trickle charger support, fix ds1390_get_reg
         - isl1208: Pass the IRQF_ONESHOT flag
         - opal: fix type of token
         - pcf2127: fix RTC_READ_VL, remove useless driver version
         - pcf85063: return an error when date is invalid
         - pcf8563: add CLKOUT to common clock framework
         - rx8025: remove unnecessary braces
         - s3c: Set year, month, day value for setting alarm
         - stmp3xxx: unify register access macros
         - License fixes: pcf2127, da9063
         - wakeup-source support for isl12057 and opal"
      
      * tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (23 commits)
        rtc: Add a driver for Micro Crystal RV8803
        rtc: s3c: Set year, month, day value for setting alarm
        rtc: ds1307: Fix alarm programming for mcp794xx
        rtc: isl12057: enable support for the standard "wakeup-source" property
        rtc: opal: enable support for the stardard "wakeup-source" property
        rtc: isl1208: Pass the IRQF_ONESHOT flag
        rtc: pcf8563: add CLKOUT to common clock framework
        rtc: davinci: remove incorrect reference to probe function
        rtc: at91rm9200: clear RTC alarm status flag prior to suspending
        rtc: pcf2127: remove useless driver version
        rtc: pcf2127: fix reading uninitialized value on RTC_READ_VL ioctl
        rtc: stmp3xxx: unify register access macros
        rtc: da9063: GPL copyright inconsistency fix
        rtc: pcf85063: return an error when date is invalid
        rtc: rx8025: remove unnecessary braces
        rtc: ds1343: remove misuse of IRQF_NO_SUSPEND flag
        rtc: ab8500: remove misuse of IRQF_NO_SUSPEND flag
        rtc: pl031: remove misuse of IRQF_NO_SUSPEND flag
        rtc: opal: fix type of token
        rtc: ds1390: Add trickle charger device tree binding
        ...
      7d884710
    • L
      Merge tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 3b138668
      Linus Torvalds 提交于
      Pull fbdev updates from Tomi Valkeinen:
       - omap: fix hdmi audio configuration issue
       - ssd1307fb: add ssd1309 support
       - tridentfb: support DDC
       - gxt4500: enable support for non-PPC platforms
      
      * tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        radeonfb: Deinline large functions
        gxt4500: enable panning
        gxt4500: Use arch_phys_wc_* for framebuffer
        gxt4500: fix color order
        gxt4500: fix 16bpp 565 mode
        gxt4500: enable on non-PPC architectures
        tridentfb: Add DDC support
        fb_ddc: Allow I2C adapters without SCL read capability
        fbdev: ssd1307fb: add ssd1309 support
        fbdev: ssd1307fb: alphabetize headers
        video/omap: remove invalid check
        OMAPDSS: hdmi: Reconfigure and restart audio when display is enabled
      3b138668
    • L
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 3e82806b
      Linus Torvalds 提交于
      Pull drm updates from Dave Airlie:
       "I Was Almost Tempted To Capitalise Every Word, but then I decided I
        couldn't read it myself!
      
        I've also got one pull request for the sti driver outstanding.  It
        relied on a commit in Greg's tree and I didn't find out in time, that
        commit is in your tree now so I might send that along once this is
        merged.
      
        I also had the accidental misfortune to have access to a Skylake on my
        desk for a few days, and I've had to encourage Intel to try harder,
        which seems to be happening now.
      
        Here is the main drm-next pull request for 4.4.
      
        Highlights:
      
        New driver:
              vc4 driver for the Rasberry Pi VPU.
              (From Eric Anholt at Broadcom.)
      
        Core:
              Atomic fbdev support
              Atomic helpers for runtime pm
              dp/aux i2c STATUS_UPDATE handling
              struct_mutex usage cleanups.
              Generic of probing support.
      
        Documentation:
              Kerneldoc for VGA switcheroo code.
              Rename to gpu instead of drm to reflect scope.
      
        i915:
              Skylake GuC firmware fixes
              HPD A support
              VBT backlight fallbacks
              Fastboot by default for some systems
              FBC work
              BXT/SKL workarounds
              Skylake deeper sleep state fixes
      
        amdgpu:
              Enable GPU scheduler by default
              New atombios opcodes
              GPUVM debugging options
              Stoney support.
              Fencing cleanups.
      
        radeon:
              More efficient CS checking
      
        nouveau:
              gk20a instance memory handling improvements.
              Improved PGOB detection and GK107 support
              Kepler GDDR5 PLL statbility improvement
              G8x/GT2xx reclock improvements
              new userspace API compatiblity fixes.
      
        virtio-gpu:
              Add 3D support - qemu 2.5 has it merged for it's gtk backend.
      
        msm:
              Initial msm88896 (snapdragon 8200)
      
        exynos:
              HDMI cleanups
              Enable mixer driver byt default
              Add DECON-TV support
      
        vmwgfx:
              Move to using memremap + fixes.
      
        rcar-du:
              Add support for R8A7793/4 DU
      
        armada:
              Remove support for non-component mode
              Improved plane handling
              Power savings while in DPMS off.
      
        tda998x:
              Remove unused slave encoder support
              Use more HDMI helpers
              Fix EDID read handling
      
        dwhdmi:
              Interlace video mode support for ipu-v3/dw_hdmi
              Hotplug state fixes
              Audio driver integration
      
        imx:
              More color formats support.
      
        tegra:
              Minor fixes/improvements"
      
      [ Merge fixup: remove unused variable 'dev' that had all uses removed in
        commit 4e270f08: "drm/gem: Drop struct_mutex requirement from
        drm_gem_mmap_obj" ]
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (764 commits)
        drm/vmwgfx: Relax irq locking somewhat
        drm/vmwgfx: Properly flush cursor updates and page-flips
        drm/i915/skl: disable display side power well support for now
        drm/i915: Extend DSL readout fix to BDW and SKL.
        drm/i915: Do graphics device reset under forcewake
        drm/i915: Skip fence installation for objects with rotated views (v4)
        vga_switcheroo: Drop client power state VGA_SWITCHEROO_INIT
        drm/amdgpu: group together common fence implementation
        drm/amdgpu: remove AMDGPU_FENCE_OWNER_MOVE
        drm/amdgpu: remove now unused fence functions
        drm/amdgpu: fix fence fallback check
        drm/amdgpu: fix stoping the scheduler timeout
        drm/amdgpu: cleanup on error in amdgpu_cs_ioctl()
        drm/i915: Fix locking around GuC firmware load
        drm/amdgpu: update Fiji's Golden setting
        drm/amdgpu: update Fiji's rev id
        drm/amdgpu: extract common code in vi_common_early_init
        drm/amd/scheduler: don't oops on failure to load
        drm/amdgpu: don't oops on failure to load (v2)
        drm/amdgpu: don't VT switch on suspend
        ...
      3e82806b
  2. 10 11月, 2015 24 次提交