1. 28 5月, 2014 3 次提交
    • L
      ACPICA: Linux headers: Add <acpi/platform/aclinuxex.h> · d13bd5a6
      Lv Zheng 提交于
      From ACPICA's perspective, <acpi/actypes.h> should be included after
      inclusion of <acpi/platform/acenv.h>.  But currently in Linux,
      <acpi/platform/aclinux.h> included by <acpi/platform/acenv.h> has
      included <acpi/actypes.h> to find ACPICA types for inline functions.
      
      This causes the following problem:
      1. Redundant code in <asm/acpi.h> and <acpi/platform/aclinux.h>:
         Linux must be careful to keep conditions for <acpi/actypes.h> inclusion
         consistent with the conditions for <acpi/platform/aclinux.h> inclusion.
         Which finally leads to the issue that we have to keep many useless macro
         definitions in <acpi/platform/aclinux.h> or <asm/acpi.h>.
         Such conditions include:
           COMPILER_DEPENDENT_UINT64
           COMPILER_DEPENDENT_INT64
           ACPI_INLINE
           ACPI_SYSTEM_XFACE
           ACPI_EXTERNAL_XFACE
           ACPI_INTERNAL_XFACE
           ACPI_INTERNAL_VAR_XFACE
           ACPI_MUTEX_TYPE
           DEBUGGER_THREADING
           ACPI_ACQUIRE_GLOBAL_LOCK
           ACPI_RELEASE_GLOBAL_LOCK
           ACPI_FLUSH_CPU_CACHE
         They have default implementations in <include/acpi/platform/acenv.h>
         while Linux need to keep a copy in <asm/acpi.h> to avoid build errors.
      
      This patch introduces <acpi/platform/aclinuxex.h> to fix this issue by
      splitting conditions and declarations (most of them are inline functions)
      into 2 header files so that the wrong inclusion of <acpi/actypes.h> can be
      removed from <acpi/platform/aclinux.h>.
      
      This patch also removes old ACPI_NATIVE_INTERFACE_HEADER mechanism which is
      not preferred by Linux and adds the platform/acenvex.h to be the solution
      to solve this issue.
      Signed-off-by: NLv Zheng <lv.zheng@intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      d13bd5a6
    • L
      ACPICA: Linux headers: Remove ACPI_PREEMPTION_POINT() due to no usages. · 636fcfef
      Lv Zheng 提交于
      This patch deletes deprecated ACPI_PREEMPTION_POINT(), there is no user
      for it in Linux kernel now.
      Signed-off-by: NLv Zheng <lv.zheng@intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      636fcfef
    • R
      Merge back earlier ACPICA material. · c9b77a40
      Rafael J. Wysocki 提交于
      Conflicts:
      	drivers/acpi/acpica/acglobal.h
      c9b77a40
  2. 13 5月, 2014 1 次提交
  3. 07 5月, 2014 27 次提交
  4. 06 5月, 2014 1 次提交
  5. 05 5月, 2014 4 次提交
    • L
      Linux 3.15-rc4 · 89ca3b88
      Linus Torvalds 提交于
      89ca3b88
    • L
      Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux · 164c0997
      Linus Torvalds 提交于
      Pull file locking change from Jeff Layton:
       "Only an email address change to the MAINTAINERS file"
      
      * tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux:
        MAINTAINERS: email address change for Jeff Layton
      164c0997
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 8a9f5ecd
      Linus Torvalds 提交于
      Pull arm64 fixes from Catalin Marinas:
       "These are mostly arm64 fixes with an additional arm(64) platform fix
        for the initialisation of vexpress clocks (the latter only affecting
        arm64; the arch/arm64 code is SoC agnostic and does not rely on early
        SoC-specific calls)
      
         - vexpress platform clocks initialisation moved earlier following the
           arm64 move of of_clk_init() call in a previous commit
         - Default DMA ops changed to non-coherent to preserve compatibility
           with 32-bit ARM DT files.  The "dma-coherent" property can be used
           to explicitly mark a device coherent.  The Applied Micro DT file
           has been updated to avoid DMA cache maintenance for the X-Gene SATA
           controller (the only arm64 related driver with such assumption in
           -rc mainline)
         - Fixmap correction for earlyprintk
         - kern_addr_valid() fix for huge pages"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        vexpress: Initialise the sysregs before setting up the clocks
        arm64: Mark the Applied Micro X-Gene SATA controller as DMA coherent
        arm64: Use bus notifiers to set per-device coherent DMA ops
        arm64: Make default dma_ops to be noncoherent
        arm64: fixmap: fix missing sub-page offset for earlyprintk
        arm64: Fix for the arm64 kern_addr_valid() function
      8a9f5ecd
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · e3fb7d4c
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is two patches both fixing bugs in drivers (virtio-scsi and
        mpt2sas) causing an oops in certain circumstances"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] virtio-scsi: Skip setting affinity on uninitialized vq
        [SCSI] mpt2sas: Don't disable device twice at suspend.
      e3fb7d4c
  6. 04 5月, 2014 4 次提交