1. 14 May, 2013 1 commit
  2. 13 May, 2013 7 commits
    • Denis Efremov's avatar
      staging: nvec: remove inline marking of EXPORT_SYMBOL functions · 705a4212
      Denis Efremov authored
      EXPORT_SYMBOL and inline directives are contradictory to each other.
      The patch fixes this inconsistency.
      
      Found by Linux Driver Verification project (linuxtesting.org).
      Signed-off-by: default avatarDenis Efremov <yefremov.denis@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      705a4212
    • Ian Abbott's avatar
      staging: comedi: complain if dma buffer allocation not supported · e9166139
      Ian Abbott authored
      When allocating a buffer to support asynchronous comedi commands, if a
      DMA coherent buffer was requested but `CONFIG_HAS_DMA` is undefined,
      bail out of local helper function `__comedi_buf_alloc()` with an error
      message.
      Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
      Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      e9166139
    • Ian Abbott's avatar
      staging: comedi: ni_mio_common: only do counter commands for ni_pcimio · bd304a73
      Ian Abbott authored
      "ni_mio_common.c" holds common code included by "ni_pcimio.c",
      "ni_atmio.c" and "ni_mio_cs.c", including a common initialization
      function `ni_E_init()`.  Amongst other things, this initializes some
      counter subdevices to support comedi instructions and asynchronous
      commands.  However, even though it sets up the handlers to support
      asynchronous commands on these subdevices, the handlers will return an
      error unless the `PCIDMA` macro is defined (which is defined only in
      "ni_pcimio.c").  If the `PCIDMA` macro is not defined, the comedi core
      will needlessly allocate buffers to support the asynchronous commands.
      Also, `s->async_dma_dir` is set to `DMA_BIDIRECTIONAL`, causing the
      physical pages for the buffers to be allocated using
      `dma_alloc_coherent()`.
      
      If the comedi core cannot call `dma_alloc_coherent()` because
      `CONFIG_HAS_DMA` is not defined, it will fail to allocate the buffers,
      which ultimately causes `ni_E_init()` to fail.
      
      Avoid the wastage and prevent the failure by only setting up
      asynchronous command support for the counter subdevices if the `PCIDMA`
      macro is defined.
      Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
      Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      bd304a73
    • Ian Abbott's avatar
      staging: comedi: work without HAS_DMA · 4efc4bbd
      Ian Abbott authored
      The core "comedi" module and the "mite" helper module for NI PCI devices
      both have calls to `dma_alloc_coherent()` and `dma_free_coherent()`.
      Those functions are only available if `CONFIG_HAS_DMA` is defined.
      
      Apart from the "mite" module, the functions are only called for comedi
      drivers that set `s->async_dma_dir` (where `s` is a pointer to a `struct
      comedi_subdevice`) to anything other than `DMA_NONE`.
      
      Change local helper functions `__comedi_buf_alloc()` and
      `__comedi_buf_free()` to only call `dma_alloc_coherent()` and
      `dma_free_coherent()` if `CONFIG_HAS_DMA` is defined.
      
      Change the "Kconfig" to make the following configuration options depend
      on `HAS_DMA`:
      
      `COMEDI_MITE` - builds the "mite" module.
      `COMEDI_NI_6527` - selects `COMEDI_MITE`.
      `COMEDI_NI_65XX` - selects `COMEDI_MITE`.
      `COMEDI_NI_670X` - selects `COMEDI_MITE`.
      `COMEDI_NI_LABPC_PCI` - selects `COMEDI_MITE`.
      `COMEDI_NI_PCIDIO` - selects `COMEDI_MITE`.
      `COMEDI_NI_TIOCMD` - selects `COMEDI_MITE`.
      `COMEDI_NI_660X` - selects `COMEDI_NI_TIOCMD`,
                         sets `s->async_dma_dir`.
      `COMEDI_NI_PCIMIO` - selects `COMEDI_NI_TIOCMD`,
                           sets `s->async_dma_dir`.
      Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
      Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      4efc4bbd
    • Ian Abbott's avatar
      staging: comedi: allow buffer resize if previous resize failed · b3fab427
      Ian Abbott authored
      When a comedi device is successfully attached, those subdevices that
      support asynchronous commands will have had buffers allocated
      successfully.  It is possible to resize the buffers afterwards, but if
      the resize fails the subdevice is left with no buffer
      (`s->async->prealloc_buf == NULL`).  Currently, this also causes any
      subsequent attempts to resize the buffer to fail with an error, which
      seems like a bad idea.
      
      Remove the check in `resize_async_buffer()` that causes the resize to
      fail if the subdevice currently has no buffer (presumably due to the
      failure of a previous resize attempt).  Callers of
      `resize_async_buffer()` have already checked that the subdevice is
      allowed to have a buffer.
      Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b3fab427
    • H Hartley Sweeten's avatar
      staging: comedi: ni_labpc: fix build when VIRT_TO_BUS is not defined · 1581a035
      H Hartley Sweeten authored
      After merging the final tree, the next-20130424 build (powerpc
      allyesconfig) failed like this:
      
      drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd':
      drivers/staging/comedi/drivers/ni_labpc.c:980:9: error:
          implicit declaration of function 'virt_to_bus'
         [-Werror=implicit-function-declaration]
      
      The virt_to_bus() is only needed for the ISA DMA support in this driver.
      
      On powerpc, CONFIG_COMEDI_NI_LABPC_ISA cannot be enabled due to the
      depends on VIRT_TO_BUS but the PCI driver, ni_labpc_pci, can be enabled.
      That driver uses the ni_labpc driver for the common support code shared
      by the ISA, PCI, and PCMCIA boards.
      
      The ISA specific support, and the optional ISA DMA support, are currently
      still in the common ni_labpc driver. The ISA specific code is protected
      by #if IS_ENABLED(CONFIG_COMEDI_NI_LABPC_ISA) and the ISA DMA support
      is protected by #ifdef CONFIG_ISA_DMA_API. This allows the ISA support
      to be enabled on architectures that support VIRT_TO_BUS and optionally
      enables ISA DMA support if ISA_DMA_API is enabled.
      
      Unfortunately, the ISA DMA code uses virt_to_bus(). This results in
      the build failure for architectures that enable ISA_DMA_API but do not
      have VIRT_TO_BUS.
      
      Add a new member to the private data, dma_addr, to hold the phys_addr_t
      returned by virt_to_bus() and initialize it in the ISA specific
      labpc_attach().
      
      For architectures that enable ISA_DMA_API but not VIRT_TO_BUS, this
      will fix the build error. This is also safe for architectures the
      enable both options but don't enable COMEDI_NI_LABPC_ISA because the
      dma channel (devpriv->dma_chan) is only initialized in the ISA
      specific labpc_attach().
      Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Ian Abbott <abbotti@mev.co.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      1581a035
    • Hema Prathaban's avatar
      staging: vt6656: use free_netdev instead of kfree · 0a438d5b
      Hema Prathaban authored
      use free_netdev() instead of kfree(pDevice->apdev)
      Signed-off-by: default avatarHema Prathaban <hemaklnce@gmail.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      0a438d5b
  3. 12 May, 2013 2 commits
    • Linus Torvalds's avatar
      Linux 3.10-rc1 · f722406f
      Linus Torvalds authored
      f722406f
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 26b840ae
      Linus Torvalds authored
      Pull tracing/kprobes update from Steven Rostedt:
       "The majority of these changes are from Masami Hiramatsu bringing
        kprobes up to par with the latest changes to ftrace (multi buffering
        and the new function probes).
      
        He also discovered and fixed some bugs in doing so.  When pulling in
        his patches, I also found a few minor bugs as well and fixed them.
      
        This also includes a compile fix for some archs that select the ring
        buffer but not tracing.
      
        I based this off of the last patch you took from me that fixed the
        merge conflict error, as that was the commit that had all the changes
        I needed for this set of changes."
      
      * tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing/kprobes: Support soft-mode disabling
        tracing/kprobes: Support ftrace_event_file base multibuffer
        tracing/kprobes: Pass trace_probe directly from dispatcher
        tracing/kprobes: Increment probe hit-count even if it is used by perf
        tracing/kprobes: Use bool for retprobe checker
        ftrace: Fix function probe when more than one probe is added
        ftrace: Fix the output of enabled_functions debug file
        ftrace: Fix locking in register_ftrace_function_probe()
        tracing: Add helper function trace_create_new_event() to remove duplicate code
        tracing: Modify soft-mode only if there's no other referrer
        tracing: Indicate enabled soft-mode in enable file
        tracing/kprobes: Fix to increment return event probe hit-count
        ftrace: Cleanup regex_lock and ftrace_lock around hash updating
        ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
        ftrace: Have ftrace_regex_write() return either read or error
        tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
        tracing: Don't succeed if event_enable_func did not register anything
        ring-buffer: Select IRQ_WORK
      26b840ae
  4. 11 May, 2013 4 commits
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.10-rc0-tag-two' of... · 607eeb0b
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
       - More fixes in the vCPU PVHVM hotplug path.
       - Add more documentation.
       - Fix various ARM related issues in the Xen generic drivers.
       - Updates in the xen-pciback driver per Bjorn's updates.
       - Mask the x2APIC feature for PV guests.
      
      * tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pci: Used cached MSI-X capability offset
        xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
        xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST
        xen: mask x2APIC feature in PV
        xen: SWIOTLB is only used on x86
        xen/spinlock: Fix check from greater than to be also be greater or equal to.
        xen/smp/pvhvm: Don't point per_cpu(xen_vpcu, 33 and larger) to shared_info
        xen/vcpu: Document the xen_vcpu_info and xen_vcpu
        xen/vcpu/pvhvm: Fix vcpu hotplugging hanging.
      607eeb0b
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 4c444501
      Linus Torvalds authored
      Pull second SCSI update from James "Jaj B" Bottomley:
       "This is the final round of SCSI patches for the merge window.  It
        consists mostly of driver updates (bnx2fc, ibmfc, fnic, lpfc,
        be2iscsi, pm80xx, qla4x and ipr).
      
        There's also the power management updates that complete the patches in
        Jens' tree, an iscsi refcounting problem fix from the last pull, some
        dif handling in scsi_debug fixes, a few nice code cleanups and an
        error handling busy bug fix."
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (92 commits)
        [SCSI] qla2xxx: Update firmware link in Kconfig file.
        [SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used
        [SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
        [SCSI] pm80xx: thermal, sas controller config and error handling update
        [SCSI] pm80xx: NCQ error handling changes
        [SCSI] pm80xx: WWN Modification for PM8081/88/89 controllers
        [SCSI] pm80xx: Changed module name and debug messages update
        [SCSI] pm80xx: Firmware flash memory free fix, with addition of new memory region for it
        [SCSI] pm80xx: SPC new firmware changes for device id 0x8081 alone
        [SCSI] pm80xx: Added SPCv/ve specific hardware functionalities and relevant changes in common files
        [SCSI] pm80xx: MSI-X implementation for using 64 interrupts
        [SCSI] pm80xx: Updated common functions common for SPC and SPCv/ve
        [SCSI] pm80xx: Multiple inbound/outbound queue configuration
        [SCSI] pm80xx: Added SPCv/ve specific ids, variables and modify for SPC
        [SCSI] lpfc: fix up Kconfig dependencies
        [SCSI] Handle MLQUEUE busy response in scsi_send_eh_cmnd
        [SCSI] sd: change to auto suspend mode
        [SCSI] sd: use REQ_PM in sd's runtime suspend operation
        [SCSI] qla4xxx: Fix iocb_cnt calculation in qla4xxx_send_mbox_iocb()
        [SCSI] ufs: Correct the expected data transfersize
        ...
      4c444501
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · ac4e0109
      Linus Torvalds authored
      Pull idle update from Len Brown:
       "Add support for new Haswell-ULT CPU idle power states"
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        intel_idle: initial C8, C9, C10 support
        tools/power turbostat: display C8, C9, C10 residency
      ac4e0109
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/users/eparis/audit · c4cc75c3
      Linus Torvalds authored
      Pull audit changes from Eric Paris:
       "Al used to send pull requests every couple of years but he told me to
        just start pushing them to you directly.
      
        Our touching outside of core audit code is pretty straight forward.  A
        couple of interface changes which hit net/.  A simple argument bug
        calling audit functions in namei.c and the removal of some assembly
        branch prediction code on ppc"
      
      * git://git.infradead.org/users/eparis/audit: (31 commits)
        audit: fix message spacing printing auid
        Revert "audit: move kaudit thread start from auditd registration to kaudit init"
        audit: vfs: fix audit_inode call in O_CREAT case of do_last
        audit: Make testing for a valid loginuid explicit.
        audit: fix event coverage of AUDIT_ANOM_LINK
        audit: use spin_lock in audit_receive_msg to process tty logging
        audit: do not needlessly take a lock in tty_audit_exit
        audit: do not needlessly take a spinlock in copy_signal
        audit: add an option to control logging of passwords with pam_tty_audit
        audit: use spin_lock_irqsave/restore in audit tty code
        helper for some session id stuff
        audit: use a consistent audit helper to log lsm information
        audit: push loginuid and sessionid processing down
        audit: stop pushing loginid, uid, sessionid as arguments
        audit: remove the old depricated kernel interface
        audit: make validity checking generic
        audit: allow checking the type of audit message in the user filter
        audit: fix build break when AUDIT_DEBUG == 2
        audit: remove duplicate export of audit_enabled
        Audit: do not print error when LSMs disabled
        ...
      c4cc75c3
  5. 10 May, 2013 26 commits