1. 09 4月, 2013 5 次提交
  2. 06 4月, 2013 7 次提交
    • S
      ARM: dt: create a DT header for the GIC · 4be505d4
      Stephen Warren 提交于
      The ARM GIC binding defines a few custom cells and flags for its IRQ
      specifier. Provide names for those.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      4be505d4
    • S
      ARM: dt: add header to define IRQ flags · 840ef8b7
      Stephen Warren 提交于
      Many IRQ device tree bindings use the same flags. Create a header to
      define those.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      840ef8b7
    • S
      ARM: dt: add header to define GPIO flags · 71fab21f
      Stephen Warren 提交于
      Many GPIO device tree bindings use the same flags. Create a header to
      define those.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      71fab21f
    • S
      kbuild: always run gcc -E on *.dts, remove cmd_dtc_cpp · b40b25ff
      Stephen Warren 提交于
      Replace cmd_dtc with cmd_dtc_cpp, and delete the latter.
      
      Previously, a special file extension (.dtsp) was required to trigger
      the C pre-processor to run on device tree files. This was ugly. Now that
      previous changes have enhanced cmd_dtc_cpp to collect dependency
      information from both gcc -E and dtc, we can transparently run the pre-
      processor on all device tree files, irrespective of whether they
      use /include/ or #include syntax to include *.dtsi.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      b40b25ff
    • S
      kbuild: cmd_dtc_cpp: extract deps from both gcc -E and dtc · 85f02be8
      Stephen Warren 提交于
      Prior to this change, when compiling *.dts to *.dtb, the dependency
      output from dtc would be used, and when compiling *.dtsp to *.dtb, the
      dependency output from gcc -E alone would be used, despite dtc also
      being invoked (on a temporary file that was guaranteed to have no
      dependencies).
      
      With this change, when compiling *.dtsp to *.dtb, the dependency files
      from both gcc -E and dtc are used. This will allow cmd_dtc_cpp to
      replace cmd_dtc in a future change. In turn, that will allow the C pre-
      processor to be run transparently on *.dts, without the need to a
      separate rule or file extension to trigger it.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      85f02be8
    • S
      kbuild: fixdep: support concatenated dep files · 2ab8a996
      Stephen Warren 提交于
      The current use-case for fixdep is: a source file is run through a single
      processing step, which creates a single dependency file as a side-effect,
      which fixdep transforms into the file used by the kernel build process.
      
      In order to transparently run the C pre-processor on device-tree files,
      we wish to run both gcc -E and dtc on a source file in a single rule.
      This generates two dependency files, which must be transformed together
      into the file used by the kernel build process. This change modifies
      fixdep so it can process the concatenation of multiple separate input
      dependency files, and produce a correct unified output.
      
      The code changes have the slight benefit of transforming the loop in
      parse_dep_file() into more of a lexer/tokenizer, with the loop body being
      more of a parser. Previously, some of this logic was mixed together
      before the loop. I also added some comments, which I hope are useful.
      
      Benchmarking shows that on a cross-compiled ARM tegra_defconfig build,
      there is less than 0.5 seconds speed decrease with this change, on top
      of a build time of ~2m24s. This is probably within the noise.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      2ab8a996
    • S
      kbuild: create an "include chroot" for DT bindings · c58299aa
      Stephen Warren 提交于
      The recent dtc+cpp support allows header files and C pre-processor
      defines/macros to be used when compiling device tree files. These
      headers will typically define various constants that are part of the
      device tree bindings.
      
      The original patch which set up the dtc+cpp include path only considered
      using those headers from device tree files. However, most are also
      useful for kernel code which needs to interpret the device tree.
      
      In both the DT files and the kernel, I'd like to include the DT-related
      headers in the same way, for example, <dt-bindings/gpio/tegra-gpio.h>.
      That will simplify any text which discusses the DT header locations.
      
      Creating a <dt-bindings/> for kernel source to use is as simple as
      placing files into include/dt-bindings/.
      
      However, when compiling DT files, the include path should be restricted
      so that only the dt-bindings path is available; arbitrary kernel headers
      shouldn't be exposed. For this reason, create a specific include
      directory for use by dtc+cpp, and symlink dt-bindings from there to the
      actual location of include/dt-bindings/. For want of a better location,
      place this "include chroot" into the existing dts/ directory.
      
      arch/*/boot/dts/include/dt-bindings -> ../../../../../include/dt-bindings
      
      Some headers used by device tree files may not be useful to the kernel;
      they may be used simply to aid in constructing the DT file (e.g. macros
      to create a node), but not define any information that the kernel needs
      to share. These may be placed directly into arch/*/boot/dts/ along with
      the DT files themselves.
      Acked-by: NMichal Marek <mmarek@suse.cz>
      Acked-by: NShawn Guo <shawn.guo@linaro.org>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      c58299aa
  3. 02 4月, 2013 4 次提交
  4. 01 4月, 2013 8 次提交
    • M
      ARM: imx: Remove cpufreq driver · 180cb7d6
      Markus Pargmann 提交于
      The old cpufreq driver is not necessary anymore with DT and
      cpufreq-cpu0.
      Signed-off-by: NMarkus Pargmann <mpa@pengutronix.de>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      180cb7d6
    • S
      ARM: imx: remove pl310_get_save_ptr() declaration · fda7f226
      Shawn Guo 提交于
      Commit a1f1c7ef (arm/imx6q: add suspend/resume support) added
      declaration for a non-existing function pl310_get_save_ptr() by
      mistake.  Remove it.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      fda7f226
    • S
      ARM: imx: remove duplicated function declaration · 4e33a063
      Shawn Guo 提交于
      Commit 13eed989 (arm/imx6q: add device tree machine support) added
      duplicated function declaration for imx_enable_cpu() and
      imx_set_cpu_jump().  Remove them.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      4e33a063
    • L
      Linux 3.9-rc5 · 07961ac7
      Linus Torvalds 提交于
      07961ac7
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 0bb44280
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "Two fixes for slave-dmaengine.
      
        The first one is for making slave_id value correct for dw_dmac and
        the other one fixes the endieness in DT parsing"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dw_dmac: adjust slave_id accordingly to request line base
        dmaengine: dw_dma: fix endianess for DT xlate function
      0bb44280
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · a7b436d3
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "For a some fixes for Kernel 3.9:
         - subsystem build fix when VIDEO_DEV=y, VIDEO_V4L2=m and I2C=m
         - compilation fix for arm multiarch preventing IR_RX51 to be selected
         - regression fix at bttv crop logic
         - s5p-mfc/m5mols/exynos: a few fixes for cameras on exynos hardware"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] [REGRESSION] bt8xx: Fix too large height in cropcap
        [media] fix compilation with both V4L2 and I2C as 'm'
        [media] m5mols: Fix bug in stream on handler
        [media] s5p-fimc: Do not attempt to disable not enabled media pipeline
        [media] s5p-mfc: Fix encoder control 15 issue
        [media] s5p-mfc: Fix frame skip bug
        [media] s5p-fimc: send valid m2m ctx to fimc_m2m_job_finish
        [media] exynos-gsc: send valid m2m ctx to gsc_m2m_job_finish
        [media] fimc-lite: Fix the variable type to avoid possible crash
        [media] fimc-lite: Initialize 'step' field in fimc_lite_ctrl structure
        [media] ir: IR_RX51 only works on OMAP2
      a7b436d3
    • L
      Merge tag 'for-linus-20130331' of git://git.kernel.dk/linux-block · d299c290
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "Alright, this time from 10K up in the air.
      
        Collection of fixes that have been queued up since the merge window
        opened, hence postponed until later in the cycle.  The pull request
        contains:
      
         - A bunch of fixes for the xen blk front/back driver.
      
         - A round of fixes for the new IBM RamSan driver, fixing various
           nasty issues.
      
         - Fixes for multiple drives from Wei Yongjun, bad handling of return
           values and wrong pointer math.
      
         - A fix for loop properly killing partitions when being detached."
      
      * tag 'for-linus-20130331' of git://git.kernel.dk/linux-block: (25 commits)
        mg_disk: fix error return code in mg_probe()
        rsxx: remove unused variable
        rsxx: enable error return of rsxx_eeh_save_issued_dmas()
        block: removes dynamic allocation on stack
        Block: blk-flush: Fixed indent code style
        cciss: fix invalid use of sizeof in cciss_find_cfgtables()
        loop: cleanup partitions when detaching loop device
        loop: fix error return code in loop_add()
        mtip32xx: fix error return code in mtip_pci_probe()
        xen-blkfront: remove frame list from blk_shadow
        xen-blkfront: pre-allocate pages for requests
        xen-blkback: don't store dev_bus_addr
        xen-blkfront: switch from llist to list
        xen-blkback: fix foreach_grant_safe to handle empty lists
        xen-blkfront: replace kmalloc and then memcpy with kmemdup
        xen-blkback: fix dispatch_rw_block_io() error path
        rsxx: fix missing unlock on error return in rsxx_eeh_remap_dmas()
        Adding in EEH support to the IBM FlashSystem 70/80 device driver
        block: IBM RamSan 70/80 error message bug fix.
        block: IBM RamSan 70/80 branding changes.
        ...
      d299c290
    • P
      Revert "lockdep: check that no locks held at freeze time" · dbf520a9
      Paul Walmsley 提交于
      This reverts commit 6aa97070.
      
      Commit 6aa97070 ("lockdep: check that no locks held at freeze time")
      causes problems with NFS root filesystems.  The failures were noticed on
      OMAP2 and 3 boards during kernel init:
      
        [ BUG: swapper/0/1 still has locks held! ]
        3.9.0-rc3-00344-ga937536b #1 Not tainted
        -------------------------------------
        1 lock held by swapper/0/1:
         #0:  (&type->s_umount_key#13/1){+.+.+.}, at: [<c011e84c>] sget+0x248/0x574
      
        stack backtrace:
          rpc_wait_bit_killable
          __wait_on_bit
          out_of_line_wait_on_bit
          __rpc_execute
          rpc_run_task
          rpc_call_sync
          nfs_proc_get_root
          nfs_get_root
          nfs_fs_mount_common
          nfs_try_mount
          nfs_fs_mount
          mount_fs
          vfs_kern_mount
          do_mount
          sys_mount
          do_mount_root
          mount_root
          prepare_namespace
          kernel_init_freeable
          kernel_init
      
      Although the rootfs mounts, the system is unstable.  Here's a transcript
      from a PM test:
      
        http://www.pwsan.com/omap/testlogs/test_v3.9-rc3/20130317194234/pm/37xxevm/37xxevm_log.txt
      
      Here's what the test log should look like:
      
        http://www.pwsan.com/omap/testlogs/test_v3.8/20130218214403/pm/37xxevm/37xxevm_log.txt
      
      Mailing list discussion is here:
      
        http://lkml.org/lkml/2013/3/4/221
      
      Deal with this for v3.9 by reverting the problem commit, until folks can
      figure out the right long-term course of action.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Mandeep Singh Baines <msb@chromium.org>
      Cc: Jeff Layton <jlayton@redhat.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Cc: <maciej.rutecki@gmail.com>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Ben Chan <benchan@chromium.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Rafael J. Wysocki <rjw@sisk.pl>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dbf520a9
  5. 31 3月, 2013 1 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 13d2080d
      Linus Torvalds 提交于
      Pull SCSI target fixes from Nicholas Bellinger:
       "This includes the bug-fix for a >= v3.8-rc1 regression specific to
        iscsi-target persistent reservation conflict handling (CC'ed to
        stable), and a tcm_vhost patch to drop VIRTIO_RING_F_EVENT_IDX usage
        so that in-flight qemu vhost-scsi-pci device code can detect the
        proper vhost feature bits.
      
        Also, there are two more tcm_vhost patches still being discussed by
        MST and Asias for v3.9 that will be required for the in-flight qemu
        vhost-scsi-pci device patch to function properly, and that should
        (hopefully) be the last target fixes for this round."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
        tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit
      13d2080d
  6. 30 3月, 2013 8 次提交
  7. 29 3月, 2013 7 次提交
    • J
      Btrfs: don't drop path when printing out tree errors in scrub · d8fe29e9
      Josef Bacik 提交于
      A user reported a panic where we were panicing somewhere in
      tree_backref_for_extent from scrub_print_warning.  He only captured the trace
      but looking at scrub_print_warning we drop the path right before we mess with
      the extent buffer to print out a bunch of stuff, which isn't right.  So fix this
      by dropping the path after we use the eb if we need to.  Thanks,
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: NChris Mason <chris.mason@fusionio.com>
      d8fe29e9
    • N
      target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case · f85eda8d
      Nicholas Bellinger 提交于
      This patch fixes a regression introduced in v3.8-rc1 code where a failed
      target_check_reservation() check in target_setup_cmd_from_cdb() was causing
      an incorrect SAM_STAT_GOOD status to be returned during a WRITE operation
      performed by an unregistered / unreserved iscsi initiator port.
      
      This regression is only effecting iscsi-target due to a special case check
      for TCM_RESERVATION_CONFLICT within iscsi_target_erl1.c:iscsit_execute_cmd(),
      and was still correctly disallowing WRITE commands from backend submission
      for unregistered / unreserved initiator ports, while returning the incorrect
      SAM_STAT_GOOD status due to the missing SAM_STAT_RESERVATION_CONFLICT
      assignment.
      
      This regression was first introduced with:
      
      commit de103c93
      Author: Christoph Hellwig <hch@lst.de>
      Date:   Tue Nov 6 12:24:09 2012 -0800
      
          target: pass sense_reason as a return value
      
      Go ahead and re-add the missing SAM_STAT_RESERVATION_CONFLICT assignment
      during a target_check_reservation() failure, so that iscsi-target code
      sends the correct SCSI status.
      
      All other fabrics using target_submit_cmd_*() with a RESERVATION_CONFLICT
      call to transport_generic_request_failure() are not effected by this bug.
      Reported-by: NJeff Leung <jleung@curriegrad2004.ca>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NNicholas Bellinger <nab@linux-iscsi.org>
      f85eda8d
    • N
      tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit · 5dade710
      Nicholas Bellinger 提交于
      This patch adds a VHOST_SCSI_FEATURES mask minus VIRTIO_RING_F_EVENT_IDX
      so that vhost-scsi-pci userspace will strip this feature bit once
      GET_FEATURES reports it as being unsupported on the host.
      
      This is to avoid a bug where ->handle_kicks() are missed when EVENT_IDX
      is enabled by default in userspace code.
      
      (mst: Rename to VHOST_SCSI_FEATURES + add comment)
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: NAsias He <asias@redhat.com>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NNicholas Bellinger <nab@linux-iscsi.org>
      5dade710
    • M
      Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs" · 09a9f1d2
      Michel Lespinasse 提交于
      This reverts commit 18693050 ("mm: introduce VM_POPULATE flag to
      better deal with racy userspace programs").
      
      VM_POPULATE only has any effect when userspace plays racy games with
      vmas by trying to unmap and remap memory regions that mmap or mlock are
      operating on.
      
      Also, the only effect of VM_POPULATE when userspace plays such games is
      that it avoids populating new memory regions that get remapped into the
      address range that was being operated on by the original mmap or mlock
      calls.
      
      Let's remove VM_POPULATE as there isn't any strong argument to mandate a
      new vm_flag.
      Signed-off-by: NMichel Lespinasse <walken@google.com>
      Signed-off-by: NHugh Dickins <hughd@google.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      09a9f1d2
    • L
      Merge tag 'usb-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 0776ce03
      Linus Torvalds 提交于
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are some USB fixes to resolve issues reported recently, as well
        as a new device id for the ftdi_sio driver."
      
      * tag 'usb-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
        usb: Fix compile error by selecting USB_OTG_UTILS
        USB: serial: fix hang when opening port
        USB: EHCI: fix bug in iTD/siTD DMA pool allocation
        xhci: Don't warn on empty ring for suspended devices.
        usb: xhci: Fix TRB transfer length macro used for Event TRB.
        usb/acpi: binding xhci root hub usb port with ACPI
        usb: add find_raw_port_number callback to struct hc_driver()
        usb: xhci: fix build warning
      0776ce03
    • L
      Merge tag 'tty-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 045ecc26
      Linus Torvalds 提交于
      Pull TTY/serial fixes from Greg Kroah-Hartman:
       "Here are some tty/serial driver fixes for 3.9.
      
        The big thing here is the fix for the huge mess we caused renaming the
        8250 driver accidentally in the 3.7 kernel release, without realizing
        that there were users of the module options that suddenly broke.  This
        is now resolved, and, to top the injury off, we have a backwards-
        compatible option for those users who got used to the new name since
        3.7.  Ugh, sorry about that.
      
        Other than that, some other minor fixes for issues that have been
        reported by users."
      
      * tag 'tty-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Xilinx: ARM: UART: clear pending irqs before enabling irqs
        TTY: 8250, deprecated 8250_core.* options
        TTY: 8250, revert module name change
        serial: 8250_pci: Add WCH CH352 quirk to avoid Xscale detection
        tty: atmel_serial_probe(): index of atmel_ports[] fix
      045ecc26
    • L
      Merge tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 865752ed
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg Kroah-Hartman:
       "Here are two tiny staging driver fixes to resolve issues that have
        been reported."
      
      * tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: comedi: s626: fix continuous acquisition
        staging: zcache: fix typo "64_BIT"
      865752ed