1. 10 Jan, 2013 12 commits
    • Chao Guan's avatar
      ACPICA: Performance enhancement for ACPI package objects. · 53938551
      Chao Guan authored
      This change greatly increases the performance of package objects
      within the interpreter. It changes the processing of reference
      counts for packages by optimizing for the most common case where
      the package subobjects are either integers, strings, or buffers.
      Increases the performance of the ASLTS test suite by 1.5X.
      Chao Guan. ACPICA BZ 943.
      https://www.acpica.org/bugzilla/show_bug.cgi?id=943Signed-off-by: default avatarChao Guan <chao.guan@intel.com>
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      53938551
    • Jesper Juhl's avatar
      ACPICA: Fix possible memory leak. · 22715821
      Jesper Juhl authored
      Ensure cleanup after a memory allocation failure in dsmethod.c.
      Original Linux change from Jesper Juhl.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      22715821
    • Lv Zheng's avatar
      ACPICA: Update initialization codes. · 75e44460
      Lv Zheng authored
      This patch decreases 18 lines of 20121018 divergence.diff.
      
      This patch updates initialization codes as they are already been updated in
      ACPICA. This can also help to reduce source code differences between Linux
      and ACPICA.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      75e44460
    • Lv Zheng's avatar
      ACPICA: Enhance error messages. · f8dca243
      Lv Zheng authored
      This patch decreases 29 lines of 20121018 divergence.diff.
      
      This patch updates error messages that already have been enhanced in
      ACPICA. This patch can also help to reduce the source code differences
      between Linux and ACPICA.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      f8dca243
    • Lv Zheng's avatar
      ACPICA: Fix broken call depth tracing logic. · 7b6afb67
      Lv Zheng authored
      This patch does not affect the generation of the Linux binary.
      This patch decreases 26 lines of 20121018 divergence.diff.
      
      The ACPICA uses a call depth tracing mechanism by wrapping the return
      statements with return macros and marking the entrance with
      ACPI_FUNCTION_TRACE_ macros. There are other ACPI_FUNCTION_ macros used
      to mark the functions not using this tracing mechanism.
      
      This patch fixes broken call depth tracing logic.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      7b6afb67
    • Lv Zheng's avatar
      ACPICA: Cleanup coding style to reduce differences between Linux and ACPICA. · 9c0d7939
      Lv Zheng authored
      This is a cosmetic patch only. Comparison of the resulting binary showed
      only line number differences.
      
      This patch does not affect the generation of the Linux binary.
      This patch decreases 314 lines of 20121018 divergence.diff.
      
      ACPICA core uses ()'s on return statements. This is a known and committed
      differences from Linux standard coding style.
      
      This patch cleans up the Linux side ACPICA code to use this codying style
      in order to reduce the source code differences between Linux and ACPICA.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      9c0d7939
    • Lv Zheng's avatar
      ACPICA: Cleanup indentation to reduce differences between Linux and ACPICA. · 3e8214e5
      Lv Zheng authored
      This is a cosmetic patch only. Comparison of the resulting binary showed
      only line number differences.
      
      This patch does not affect the generation of the Linux binary.
      This patch decreases 210 lines of 20121018 divergence.diff.
      
      The ACPICA source codes uses a totally different indentation style from the
      Linux to be compatible with other users (operating systems or BIOS).
      
      Indentation differences are critical to the release automation. There are
      two causes related to the "indentation" that are affecting the release
      automation:
      1. The ACPICA -> Linux release process is:
           ACPICA source -- acpisrc - hierarchy - indent ->
           linuxized ACPICA source -- diff ->
           linuxized ACPICA patch (x) -- human intervention ->
           linuxized ACPICA patch (o)
           Where
             'x' means "cannot be directly applied to the Linux"
             'o' means "can be directly applied to the Linux"
         Different "indent" version or "indent" options used in the "indent"
         step will lead to different divergences.
         The version of "indent" used for the current release process is:
           GNU indent 2.2.11
         The options of "indent" used for the current release process is:
           -npro -kr -i8 -ts8 -sob -l80 -ss -ncs
      2. Manual indentation prettifying work in the Linux side will also harm the
         automatically generated linuxized ACPICA patches, making them impossible
         to apply directly.
      
      This patch fixes source code differences caused by the two causes so that
      the "human intervention" can be reduced in the future.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      3e8214e5
    • Lv Zheng's avatar
      ACPICA: Cleanup source to reduce differences between Linux and ACPICA. · 739dcbb9
      Lv Zheng authored
      This is a cosmetic patch only. Comparison of the resulting binary showed
      only line number differences.
      
      This patch does not affect the generation of the Linux binary.
      This patch decreases 389 lines of 20121018 divergence.diff.
      
      This patch reduces source code diff caused by the simple code maintenance
      work:
      1. Deletion of the unused include files.
      2. Deletion of the deprecated codes blocks.
      3. Repositioning of the code blocks.
      4. Replacing the values with the well defined macros.
      5. Replacing the types with the equivalent types.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      739dcbb9
    • Lv Zheng's avatar
      ACPICA: Update codes under disabled build options. · 56324c10
      Lv Zheng authored
      This is a cosmetic patch only. Comparison of the resulting binary showed
      only line number differences.
      
      This patch does not affect the generation of the Linux binary.
      This patch decreases 170 lines of 20121018 divergence.diff.
      
      This patch updates ACPICA codes surrounded by some disabled build options
      so that the source code diff between Linux and ACPICA can be reduced.
      
      Some of these build options may never be used in the kernel, so they may
      be deleted entirely in future patches.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      56324c10
    • Lv Zheng's avatar
      ACPICA: Update compilation environment settings. · 0947c6de
      Lv Zheng authored
      This patch does not affect the generation of the Linux binary.
      This patch decreases 300 lines of 20121018 divergence.diff.
      
      This patch updates architecture specific environment settings for compiling
      ACPICA as such enhancement already has been done in ACPICA.
      
      Note that the appended compiler default settings in the
      <acpi/platform/acenv.h> will deprecate some of the macros defined in the
      architecture specific <asm/acpi.h>. Thus two of the <asm/acpi.h> headers
      have been cleaned up in this patch accordingly.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      0947c6de
    • Lv Zheng's avatar
      ACPICA: Cleanup updated comments. · 75c8044f
      Lv Zheng authored
      This is a cosmetic patch only. Comparison of the resulting binary showed
      only line number differences.
      
      This patch does not affect the generation of the Linux binary.
      This patch decreases 558 lines of 20121018 divergence.diff.
      
      This patch reduces the source code diff between Linux and ACPICA by
      cleaning the comments that already have been updated in ACPICA.
      
      There is no extra indentation done in this patch. Even the empty line
      deletions and insertions are also splitted into another cleanup patch so
      that this patch can be easily reviewed, and the binary differences can be
      held to a lowest level.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      75c8044f
    • Linus Torvalds's avatar
      Linux 3.8-rc3 · 9931faca
      Linus Torvalds authored
      9931faca
  2. 09 Jan, 2013 6 commits
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 5c49985c
      Linus Torvalds authored
      Pull ARM fixes from Russell King.
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel
        ARM: 7615/1: cache-l2x0: aurora: Invalidate during clean operation with WT enable
        ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b
        ARM: 7612/1: imx: Do not select some errata that depends on !ARCH_MULTIPLATFORM
        ARM: 7611/1: VIC: fix bug in VIC irqdomain code
        ARM: 7610/1: versatile: bump IRQ numbers
        ARM: 7609/1: disable errata work-arounds which access secure registers
        ARM: 7608/1: l2x0: Only set .set_debug on PL310 r3p0 and earlier
      5c49985c
    • Linus Torvalds's avatar
      Merge tag 'edac_fixes_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 57a0c1e2
      Linus Torvalds authored
      Pull EDAC fixes from Borislav Petkov:
       "Two error path fixes causing a crash and a Kconfig fix for an issue
        which spilled all EDAC suboptions into the 'Device Drivers' menu."
      
      * tag 'edac_fixes_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Cleanup device deregistering path
        EDAC: Fix EDAC Kconfig menu
        EDAC: Fix kernel panic on module unloading
      57a0c1e2
    • Linus Torvalds's avatar
      mm: reinstante dropped pmd_trans_splitting() check · e53289c0
      Linus Torvalds authored
      The check for a pmd being in the process of being split was dropped by
      mistake by commit d10e63f2 ("mm: numa: Create basic numa page
      hinting infrastructure"). Put it back.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Debugged-by: default avatarHillf Danton <dhillf@gmail.com>
      Acked-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Cc: Kirill Shutemov <kirill@shutemov.name>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e53289c0
    • Marc Dionne's avatar
      cred: Remove tgcred pointer from struct cred · 08c097fc
      Marc Dionne authored
      Commit 3a50597d ("KEYS: Make the session and process keyrings
      per-thread") removed the definition of the thread_group_cred structure,
      but left a now unused pointer in struct cred.
      Signed-off-by: default avatarMarc Dionne <marc.c.dionne@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      08c097fc
    • Linus Torvalds's avatar
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 974b3358
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "People are back from the holiday breaks, and it shows.  Here are a
        bunch of fixes for a number of platforms:
         - A couple of small fixes for Nomadik
         - A larger set of changes for kirkwood/mvebu
           - uart driver selection, dt clocks, gpio-poweroff fixups, a few
             __init annotation fixes and some error handling improvement in
             their xor dma driver.
         - i.MX had a couple of minor fixes (and a critical one for flexcan2
           clock setup)
         - MXS has a small board fix and a framebuffer bugfix
         - A set of fixes for Samsung Exynos, fixing default bootargs and some
           Exynos5440 clock issues
         - A set of OMAP changes including PM fixes and a few sparse warning
           fixups
      
        All in all a bit more positive code delta than we'd ideally want to
        see here, mostly from the OMAP PM changes, but nothing overly crazy."
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        ARM: clps711x: Fix bad merge of clockevents setup
        ARM: highbank: save and restore L2 cache and GIC on suspend
        ARM: highbank: add a power request clear
        ARM: highbank: fix secondary boot and hotplug
        ARM: highbank: fix typos with hignbank in power request functions
        ARM: dts: fix highbank cpu mpidr values
        ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
        ARM: mx5: Fix MX53 flexcan2 clock
        ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
        pinctrl: mvebu: make pdma clock on dove mandatory
        ARM: Dove: Add pinctrl clock to DT
        dma: mv_xor: fix error handling for clocks
        dma: mv_xor: fix error handling of mv_xor_channel_add()
        arm: mvebu: Add missing ; for cpu node.
        arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
        arm: mvebu: Armada XP MV78230 has two cores, not one
        clk: mvebu: Remove inappropriate __init tagging
        ARM: Kirkwood: Use fixed-regulator instead of board gpio call
        ARM: Kirkwood: Fix missing sdio clock
        ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
        ...
      974b3358
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ca5c8a4c
      Linus Torvalds authored
      Pull drm update from Dave Airlie:
       "Exynos and Radeon mostly, with a dma-buf and ttm fix thrown in.
      
        It's a bit big but its mostly exynos license fix ups and I'd rather
        not hold those up since its legally stuff.
      
        Radeon has a couple of fixes from dma engine work, TTM is just a
        locking fix, and dma-buf fix has been hanging around and I finally got
        a chance to review it."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits)
        drm/ttm: fix fence locking in ttm_buffer_object_transfer
        drm/prime: drop reference on imported dma-buf come from gem
        drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
        drm/exynos: move finish page flip to a common place
        drm/exynos: fimd: modify condition in fimd resume
        drm/radeon: fix DMA CS parser for r6xx linear copy packet
        drm/radeon: split r6xx and r7xx copy_dma functions
        drm/exynos: Use devm_clk_get in exynos_drm_gsc.c
        drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c
        drm/exynos: Use devm_clk_get in exynos_drm_rotator.c
        drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c
        drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c
        drm/exynos: Use devm_clk_get in exynos_drm_fimc.c
        drm/exynos: Remove redundant NULL check
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c
        drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c
        drm/exynos: fix gem buffer allocation type checking
        drm/exynos: remove needless parenthesis.
        drm/exynos: fix incorrect interrupt induced by m2m operation.
        ...
      ca5c8a4c
  3. 08 Jan, 2013 22 commits
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.8-rc2/fixes-signed-v2' of... · 434fec16
      Olof Johansson authored
      Merge tag 'omap-for-v3.8-rc2/fixes-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      The biggest change is a fix to deal with different power state
      on omap2 registers that causes issues trying to use common PM code.
      Also fix few incorrect registers, and an issue for omap1 USB, and
      few sparse fixes for issues that sneaked in with all the clean-up.
      
      * tag 'omap-for-v3.8-rc2/fixes-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
        ARM: OMAP1: fix USB configuration use-after-release
        ARM: OMAP2/3: PRM: fix bogus OMAP2xxx powerstate return values
        ARM: OMAP3: clock data: Add missing enable/disable for EMU clock
        ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources
        ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets
        ARM: OMAP4: PRM: Correct reset source map
        ARM: OMAP: SRAM: resolve sparse warnings
        ARM: OMAP AM33xx: hwmod data: resolve sparse warnings
        ARM: OMAP: 32k counter: resolve sparse warnings
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      434fec16
    • Olof Johansson's avatar
      Merge branch 'v3.8-samsung-fixes-2' of... · 2f64a8d7
      Olof Johansson authored
      Merge branch 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      From Kukjin Kim:
      Most of them are EXYNOS5440 fixes which are for changing uart console,
      cpu id (typo)  and silent complaining gpio error in kernel boot.
      
      * 'v3.8-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: skip the clock initialization for exynos5440
        ARM: EXYNOS: enable PINCTRL for EXYNOS5440
        ARM: dts: use uart port1 for console on exynos4210-smdkv310
        ARM: dts: use uart port0 for console on exynos5440-ssdk5440
        ARM: SAMSUNG: fix the cpu id for EXYNOS5440
        ARM: EXYNOS: Revise HDMI resource size
      2f64a8d7
    • Olof Johansson's avatar
      Merge tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 5595e755
      Olof Johansson authored
      From Shawn Guo:
      I have to send one critical mxsfb fix through arm-soc, as FB maintainer
      is unresponsive for quite a while.  People start complaining the missing
      of such an important fix.
      
      * tag 'mxs-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
        video: mxsfb: fix crash when unblanking the display
        ARM: dts: imx23-olinuxino: Fix IOMUX settings
      5595e755
    • Olof Johansson's avatar
      Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 2d9e02ca
      Olof Johansson authored
      From Shawn Guo:
      
      It includes one critical fix - wrong flexcan2 clock will hang system
      when the port gets brought up.  The other two are non-critical fixes,
      which are sent together here, since it's still early -rc stage.
      
      * tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: mx5: Fix MX53 flexcan2 clock
        ARM: dts: imx31-bug: Fix manufacturer compatible string
        clk: imx: Remove 'clock-output-names' from the examples
      2d9e02ca
    • Linus Torvalds's avatar
      Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ed2c8911
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Nothing too exciting here, just a few regression and trivial fixes,
        and new quirks for HD-audio and USB-audio.
      
         - HD-audio mute LED mode enum fix
         - Fix kernel panic of Digidesign Mbox2 usb-audio quirk (which was new
           in 3.8-rc1)
         - Creative BT-D1 usb-audio quirk
         - mute LED fixup for HP Pavillion 17 laptop"
      
      * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
        ALSA: au88x0: fix incorrect left shift
        sound: oss/pas2: Fix possible access out of array
        ALSA: usb-audio: Fix kernel panic of Digidesign Mbox2 quirk
        ALSA: usb-audio: Add support for Creative BT-D1 via usb sound quirks
        ALSA: hda - Switch "On" and "Off" for "Mute-LED Mode" kcontrol
      ed2c8911
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5c33d9b2
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) New sysctl ndisc_notify needs some documentation, from Hanns
          Frederic Sowa.
      
       2) Netfilter REJECT target doesn't set transport header of SKB
          correctly, from Mukund Jampala.
      
       3) Forcedeth driver needs to check for DMA mapping failures, from Larry
          Finger.
      
       4) brcmsmac driver can't use usleep_range while holding locks, use
          udelay instead.  From Niels Ole Salscheider.
      
       5) Fix unregister of netlink bridge multicast database handlers, from
          Vlad Yasevich and Rami Rosen.
      
       6) Fix checksum calculations in netfilter's ipv6 network prefix
          translation module.
      
       7) Fix high order page allocation failures in netfilter xt_recent, from
          Eric Dumazet.
      
       8) mac802154 needs to use netif_rx_ni() instead of netif_rx() because
          mac802154_process_data() can execute in process rather than
          interrupt context.  From Alexander Aring.
      
       9) Fix splice handling of MSG_SENDPAGE_NOTLAST, otherwise we elide one
          tcp_push() too many.  From Eric Dumazet and Willy Tarreau.
      
      10) Fix skb->truesize tracking in XEN netfront driver, from Ian
          Campbell.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
        xen/netfront: improve truesize tracking
        ipv4: fix NULL checking in devinet_ioctl()
        tcp: fix MSG_SENDPAGE_NOTLAST logic
        net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.
        ip-sysctl: fix spelling errors
        mac802154: fix NOHZ local_softirq_pending 08 warning
        ipv6: document ndisc_notify in networking/ip-sysctl.txt
        ath9k: Fix Kconfig for ATH9K_HTC
        netfilter: xt_recent: avoid high order page allocations
        netfilter: fix missing dependencies for the NOTRACK target
        netfilter: ip6t_NPT: fix IPv6 NTP checksum calculation
        bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.
        vxlan: allow live mac address change
        bridge: Correctly unregister MDB rtnetlink handlers
        brcmfmac: fix parsing rsn ie for ap mode.
        brcmsmac: add copyright information for Canonical
        rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192de: Fix warning for unchecked pci_map_single() call
        rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call
        ...
      5c33d9b2
    • Daniel Vetter's avatar
      drm/ttm: fix fence locking in ttm_buffer_object_transfer · e8e89622
      Daniel Vetter authored
      Noticed while reviewing the fence locking in the radeon pageflip
      handler.
      
      v2: Instead of grabbing the bdev->fence_lock in object_transfer just
      move the single callsite of that function a few lines, so that it is
      protected by the fence_lock. Suggested by Jerome Glisse.
      
      v3: Fix typo in commit message.
      Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e8e89622
    • Olof Johansson's avatar
      Merge tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux into fixes · 5cf87a12
      Olof Johansson authored
      From Jason Cooper:
      
      fixes for mvebu/kirkwood v3.8
       - use correct uart driver for mvebu boards
       - add a missing DT clocks
       - gpio-poweroff level vs. edge triggering, use gpio_is_valid()
       - remove an inappropriate __init, modules need to access function.
       - various DT fixes
       - error handling in mv_xor
      
      * tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux:
        pinctrl: mvebu: make pdma clock on dove mandatory
        ARM: Dove: Add pinctrl clock to DT
        dma: mv_xor: fix error handling for clocks
        dma: mv_xor: fix error handling of mv_xor_channel_add()
        arm: mvebu: Add missing ; for cpu node.
        arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
        arm: mvebu: Armada XP MV78230 has two cores, not one
        clk: mvebu: Remove inappropriate __init tagging
        ARM: Kirkwood: Use fixed-regulator instead of board gpio call
        ARM: Kirkwood: Fix missing sdio clock
        ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
        Power: gpio-poweroff: Fix documentation and gpio_is_valid
        ARM: Kirkwood: Fix missing clk for USB device.
        arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      5cf87a12
    • Olof Johansson's avatar
      ARM: clps711x: Fix bad merge of clockevents setup · 0e3a4a2e
      Olof Johansson authored
      I mismerged a previous branch from Alexander, and accidentally left
      in ARCH_USES_GETTIMEOFFSET. Remove it.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: Alexander Shiyan <shc_work@mail.ru>
      0e3a4a2e
    • Olof Johansson's avatar
      Merge tag 'nomadik-fixes-for-arm-soc' of... · daaeec93
      Olof Johansson authored
      Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
      
      From Linus Walleij:
      Two fixes to the Nomadik:
      - Delete a dangling include
      - Bump IRQ numbers to offset at 32
      
      * tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
        ARM: nomadik: bump the IRQ numbers again
        ARM: nomadik: delete dangling include
      daaeec93
    • Rob Herring's avatar
      ARM: highbank: save and restore L2 cache and GIC on suspend · 1ddda1cd
      Rob Herring authored
      This fixes suspend to RAM adding necessary save and restore of L2 and GIC.
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      1ddda1cd
    • Rob Herring's avatar
      ARM: highbank: add a power request clear · 9852910a
      Rob Herring authored
      When we fail to power down, we need to clear out the power request.
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9852910a
    • Rob Herring's avatar
      ARM: highbank: fix secondary boot and hotplug · 0b3455a7
      Rob Herring authored
      With commit 384a2902 (ARM: gic: use a private mapping for CPU target
      interfaces), wake-up IPIs now go to all cores as the gic cpu interface
      numbering may not follow core numbering. This broke secondary boot on
      highbank since the boot address was already set for all secondary cores,
      this caused all cores to boot before the kernel was ready.
      
      Fix this by moving the setting of the jump address to
      highbank_boot_secondary instead of highbank_smp_prepare_cpus and
      highbank_cpu_die. Also, clear the address when we boot. This prevents
      cores from booting before they are actually triggered and is also necessary
      to get suspend/resume to work.
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0b3455a7
    • Rob Herring's avatar
      ARM: highbank: fix typos with hignbank in power request functions · c05ee88f
      Rob Herring authored
      s/hignbank/highbank/
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c05ee88f
    • Rob Herring's avatar
      ARM: dts: fix highbank cpu mpidr values · 3943deed
      Rob Herring authored
      With the addition of commit a0ae0240 (ARM: kernel: add device tree init
      map function), the cpu reg values must match the cpu mpidr register or we'll
      get warnings. For some reason, the CLUSTERID on highbank is 9, so the reg
      value needs to be 0x90n to quiet the warnings.
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      3943deed
    • Rob Herring's avatar
      ARM: dts: add device_type prop to cpu nodes on Calxeda platforms · 36ff67bc
      Rob Herring authored
      While device_type is considered deprecated, it is still needed for tools
      like lshw to identify cpu nodes.
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      36ff67bc
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next · c75be259
      Dave Airlie authored
      Alex writes:
       A few more fixes for DMA and a mac quirk.
      
      * 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
        drm/radeon: fix DMA CS parser for r6xx linear copy packet
        drm/radeon: split r6xx and r7xx copy_dma functions
      c75be259
    • Seung-Woo Kim's avatar
      drm/prime: drop reference on imported dma-buf come from gem · be8a42ae
      Seung-Woo Kim authored
      Increasing ref counts of both dma-buf and gem for imported dma-buf come from gem
      makes memory leak. release function of dma-buf cannot be called because f_count
      of dma-buf increased by importing gem and gem ref count cannot be decrease
      because of exported dma-buf.
      
      So I add dma_buf_put() for imported gem come from its own gem into each drivers
      having prime_import and prime_export capabilities. With this, only gem ref
      count is increased if importing gem exported from gem of same driver.
      Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
      Signed-off-by: default avatarKyungmin.park <kyungmin.park@samsung.com>
      Cc: Inki Dae <inki.dae@samsung.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Rob Clark <rob.clark@linaro.org>
      Cc: Alex Deucher <alexander.deucher@amd.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      be8a42ae
    • Ian Campbell's avatar
      xen/netfront: improve truesize tracking · d9a58a78
      Ian Campbell authored
      Using RX_COPY_THRESHOLD is incorrect if the SKB is actually smaller
      than that. We have already accounted for this in
      NETFRONT_SKB_CB(skb)->pull_to so use that instead.
      
      Fixes WARN_ON from skb_try_coalesce.
      Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
      Cc: Sander Eikelenboom <linux@eikelenboom.it>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: annie li <annie.li@oracle.com>
      Cc: xen-devel@lists.xen.org
      Cc: netdev@vger.kernel.org
      Cc: stable@kernel.org # 3.7.x only
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d9a58a78
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-fixes' of... · f3215be9
      Dave Airlie authored
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Summary:
      - change exynos file license
        . Most of exynos files had been copied from some randome
          file and not updated correctly(wrong company name used).
          This was our mistakes so chagnes it correctly. For this,
          I'm not sure that this patch should go to -fix or -next.
          So please give me any comment if there is any problem.
      - consider buffer allocation without iommu
        . Without iommu, dma_alloc_attrs function allocates some
          memory region and returns cpu address so this patch makes
          the cpu address to be set to buf->kvaddr correctly
      - cleanups to ipp relevant codes.
      - use common finish page flip function
        . to avoid the duplication of same code, use
          exynos_drm_crtc_finish_pageflip function commonly instead
          of each one.
      - fix fimd resume issue.
        . when fimd was turned off by suspend, there was one issue that
          the fimd wasn't turned on by resume so fix it chaing resume
          condition.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (25 commits)
        drm/exynos: move finish page flip to a common place
        drm/exynos: fimd: modify condition in fimd resume
        drm/exynos: Use devm_clk_get in exynos_drm_gsc.c
        drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c
        drm/exynos: Use devm_clk_get in exynos_drm_rotator.c
        drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c
        drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c
        drm/exynos: Use devm_clk_get in exynos_drm_fimc.c
        drm/exynos: Remove redundant NULL check
        drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c
        drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c
        drm/exynos: fix gem buffer allocation type checking
        drm/exynos: remove needless parenthesis.
        drm/exynos: fix incorrect interrupt induced by m2m operation.
        drm/exynos: remove color bar pattern operation.
        drm/exynos: correct some comments to abbreviation.
        drm/exynos: fix build warning.
        drm/exynos: consider both case of vflip and hflip.
        drm/exynos: remove needless error handling to property.
        ...
      f3215be9
    • David S. Miller's avatar
      Merge branch 'master' of git://1984.lsi.us.es/nf · 32fa10b2
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      The following batch contains Netfilter fixes for 3.8-rc2, they are:
      
      * Fix IPv6 stateless network/port translation (NPT) checksum
        calculation, from Ulrich Weber.
      
      * Fix for xt_recent to avoid memory allocation failures if large
        hashtables are used, from Eric Dumazet.
      
      * Fix missing dependencies in Kconfig for the deprecated NOTRACK,
        from myself.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32fa10b2
    • Marek Vasut's avatar
      ARM: mx5: Fix MX53 flexcan2 clock · e37f0d5b
      Marek Vasut authored
      The second FlexCAN port uses different clock than the first one, configure
      correct clock to prevent hanging of the system during bringing up of the port.
      Signed-off-by: default avatarMarek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      e37f0d5b