1. 04 9月, 2013 15 次提交
  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 2 次提交
    • L
      Merge tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8495e9c4
      Linus Torvalds 提交于
      Pull ACPI fix from Rafael Wysocki:
       "I really hoped that it wouldn't be necessary to change anything in
        ACPI at this point, but it turns out that we need to revert one more
        ACPI video commit causing trouble.
      
        This reverts a change in the ACPI video driver that caused the ACPI
        backlight initialization to be carried out even if acpi_backlight=vendor
        is passed in the kernel command line which turns out to break things
        at least on one system"
      
      * tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPI / video: Always call acpi_video_init_brightness() on init"
      8495e9c4
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 5befb98b
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a set of small bug fixes for lpfc and zfcp and a fix for a
        fairly nasty bug in sg where a process which cancels I/O completes in
        a kernel thread which would then try to write back to the now gone
        userspace and end up writing to a random kernel address instead"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] zfcp: remove access control tables interface (keep sysfs files)
        [SCSI] zfcp: fix schedule-inside-lock in scsi_device list loops
        [SCSI] zfcp: fix lock imbalance by reworking request queue locking
        [SCSI] sg: Fix user memory corruption when SG_IO is interrupted by a signal
        [SCSI] lpfc: Don't force CONFIG_GENERIC_CSUM on
      5befb98b