1. 04 9月, 2013 5 次提交
  2. 03 9月, 2013 3 次提交
    • J
      MIPS: Refactor load/entry address calculations · 3185557d
      James Hogan 提交于
      The vmlinux load address and entry address is calculated in multiple
      places:
       - arch/mips/Makefile defines load-y from CONFIG_PHYSICAL_START (or
         defined by the platform) and passes it to
         arch/mips/boot/compressed/Makefile.
       - arch/mips/boot/compressed/Makefile calculates kernel entry using nm.
       - arch/mips/lasat/image/Makefile calculates both load and entry address
         using nm.
      
      Lets combine these in the main Makefile and then pass them as Make
      parameters to each of the three boot image Makefiles (in boot/,
      boot/compressed, lasat/image/). The boot/ Makefile doesn't currently use
      them, but will soon need to for U-Boot image targets.
      
      The existing load-y definition is used in preference to calculating the
      load address using nm.
      Signed-off-by: NJames Hogan <james.hogan@imgtec.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5794/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      3185557d
    • J
      MIPS: Refactor boot and boot/compressed rules · 38d2d649
      James Hogan 提交于
      Split out the arch/mips/boot/ and arch/mips/boot/compressed/ targets
      into boot-y and bootz-y variables. This makes it slightly cleaner to add
      new targets.
      Signed-off-by: NJames Hogan <james.hogan@imgtec.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5793/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      38d2d649
    • J
      MIPS: add <dt-bindings/> symlink · 3b29aa5b
      James Hogan 提交于
      Add symlink to include/dt-bindings from arch/mips/boot/dts/include/ to
      match the ones in ARM and Meta architectures so that preprocessed device
      tree files can include various useful constant definitions.
      
      See commit c58299aa (kbuild: create an "include chroot" for DT bindings)
      merged in v3.10-rc1 for details.
      
      MIPS structures it's dts files a little differently to other
      architectures, having a separate dts directory for each SoC/platform,
      but most of the definitions in the dt-bindings/ directory are common so
      for now lets just have a single "include chroot" for all MIPS platforms.
      Signed-off-by: NJames Hogan <james.hogan@imgtec.com>
      Reviewed-by: NSteven. J. Hill <steven.hill@imgtec.com>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: linux-mips@linux-mips.org
      Cc: devicetree@vger.kernel.org
      Cc: linux-kbuild@vger.kernel.org
      Acked-by: NStephen Warren <swarren@nvidia.com>
      Patchwork: http://patchwork.linux-mips.org/patch/5745/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      3b29aa5b
  3. 26 8月, 2013 20 次提交
  4. 25 8月, 2013 8 次提交
  5. 24 8月, 2013 4 次提交
    • L
      Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 89b53e50
      Linus Torvalds 提交于
      Pull libata fixes from Tejun Heo:
       "This contains three commits all of which are updates for specific
        devices which aren't too widespread.  Pretty limited scope and nothing
        too interesting or dangerous"
      
      * 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        sata_fsl: save irqs while coalescing
        libata: apply behavioral quirks to sil3826 PMP
        sata, highbank: fix ordering of SGPIO signals
      89b53e50
    • L
      Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · e2982a04
      Linus Torvalds 提交于
      Pull cgroup fix from Tejun Heo:
       "A late fix for cgroup.
      
        This fixes a behavior regression visible to userland which was created
        by a commit merged during -rc1.  While the behavior change isn't too
        likely to be noticeable, the fix is relatively low risk and we'll need
        to backport it through -stable anyway if the bug gets released"
      
      * 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cpuset: fix a regression in validating config change
      e2982a04
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · f07823e1
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Ben was on holidays for a week so a few nouveau regression fixes
        backed up, but they all seem necessary.
      
        Otherwise one i915 and one gma500 fix"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        gma500: Fix SDVO turning off randomly
        drm/nv04/disp: fix framebuffer pin refcounting
        drm/nouveau/mc: fix race condition between constructor and request_irq()
        drm/nouveau: fix reclocking on nv40
        drm/nouveau/ltcg: fix allocating memory as free
        drm/nouveau/ltcg: fix ltcg memory initialization after suspend
        drm/nouveau/fb: fix null derefs in nv49 and nv4e init
        drm/i915: Invalidate TLBs for the rings after a reset
      f07823e1
    • A
      usb: phy: fix build breakage · 52d5b9ab
      Anatolij Gustschin 提交于
      Commit 94ae9843 (usb: phy: rename all phy drivers to phy-$name-usb.c)
      renamed drivers/usb/phy/otg_fsm.h to drivers/usb/phy/phy-fsm-usb.h
      but changed drivers/usb/phy/phy-fsm-usb.c to include not existing
      "phy-otg-fsm.h" instead of new "phy-fsm-usb.h". This breaks building:
        ...
        drivers/usb/phy/phy-fsm-usb.c:32:25: fatal error: phy-otg-fsm.h: No such file or directory
        compilation terminated.
        make[3]: *** [drivers/usb/phy/phy-fsm-usb.o] Error 1
      
      This commit also missed to modify drivers/usb/phy/phy-fsl-usb.h
      to include new "phy-fsm-usb.h" instead of "otg_fsm.h" resulting
      in another build breakage:
        ...
        In file included from drivers/usb/phy/phy-fsl-usb.c:46:0:
        drivers/usb/phy/phy-fsl-usb.h:18:21: fatal error: otg_fsm.h: No such file or directory
        compilation terminated.
        make[3]: *** [drivers/usb/phy/phy-fsl-usb.o] Error 1
      
      Fix both issues.
      Signed-off-by: NAnatolij Gustschin <agust@denx.de>
      Cc: stable <stable@vger.kernel.org> # 3.10+
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      52d5b9ab