1. 31 Oct, 2013 6 commits
    • Lv Zheng's avatar
      ACPICA: Fix indentation issues for macro invocations. · cd27d79f
      Lv Zheng authored
      During the automatic translation of the upstream ACPICA source code
      into Linux kernel source code some extra white spaces are added by
      the "indent" program at the beginning of each line which is an
      invocation of a macro and there is no ";" at the end of the line.
      
      For this reason, a new mode has been added to the translation scripts
      to remove the extra spaces inserted before invoking such macros and add
      an empty line between the invocations of such macros (like the other
      function declarations).  This new mode is executed after executing
      "indent" during the Linux release process.  Consequently, some
      existing ACPICA source code in the Linux kernel tree needs to be
      adjusted to allow the new scripts to work correctly.
      
      The affected macros and files are:
       1. ACPI_HW_DEPENDENT_RETURN (acpixf.h/acdebug.h/acevents.h):
          This macro is used as a wrapper for hardware dependent APIs to offer
          a stub when the reduced hardware is configured during compilation.
       2. ACPI_EXPORT_SYMBOL (utglobal.c):
          This macro is used by Linux to export symbols to be found by Linux
          modules.  All such invocations are well formatted except those
          exported as global variables.
      
      This can help to reduce the source code differences between Linux
      and upstream ACPICA, and also help to automate the release process.
      No functional or binary generation changes should result from it.
      Lv Zheng.
      
      [rjw: Changelog]
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      cd27d79f
    • Lv Zheng's avatar
      ACPICA: Prevent possible build issues for use of ACPI_PRINTF_LIKE macro · 4506bf23
      Lv Zheng authored
      The following build error:
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         CC      arch/x86/kernel/setup.o
       In file included from include/acpi/acpi.h:64:0,
                        from include/linux/iscsi_ibft.h:24,
                        from arch/x86/kernel/setup.c:43:
       include/acpi/acpixf.h:543:1: error: expected ',' or ';' before '{' token
       include/acpi/acpixf.h:540:1: warning: 'acpi_error' declared 'static' but never defined [-Wunused-function]
       make[2]: *** [arch/x86/kernel/setup.o] Error 1
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      can be triggerred by the following stub function (if implemented):
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       static inline void ACPI_INTERNAL_VAR_XFACE
       acpi_error(const char *module_name,
       	   u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3)
       {
       }
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      This patch changes the position of ACPI_PRINTF_LIKE(x) to follow the
      style of __printf(x, x+1) used in Linux to prevent such issues from
      happening.  Lv Zheng.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      4506bf23
    • Lv Zheng's avatar
      ACPICA: Deploy ACPI_EXPORT_SYMBOL_INIT for main ACPICA initialization interfaces. · d21f600b
      Lv Zheng authored
      This changes can reduce source code differences between Linux and ACPICA
      upstream to help improving the release automation.
      
      The side effect of applying this patch in Linux is:
      1. Some ACPICA initialization/termination APIs are no longer exported in
         Linux, these include:
          acpi_load_tables
          acpi_initialize_subsystem
          acpi_enable_subsystem
          acpi_initialize_objects
          acpi_terminate
      2. This patch does not affect the following APIs as they are currently not
         marked with ACPI_EXPORT_SYMBOL in Linux:
          acpi_reallocate_root_table
          acpi_initialize_tables
      Such functions should not be exported as they are internal to ACPI
      subsystem in Linux, and will only be invoked inside of ACPI subsystem's
      initialization routines marked with __init and termination routines marked
      with __exit.  While on other OSPMs, such functions may still need to be
      exported.
      
      Thus this patch adds the configurability for ACPICA, so that it leaves
      OSPMs to determine if the __init/__exit marked functions should be exported
      or not.  Lv Zheng.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      d21f600b
    • Lv Zheng's avatar
      ACPICA: Linuxize: Change indentation of C labels. · 10622bf8
      Lv Zheng authored
      It is reported by kernel build test systems that all ACPICA source
      files in the kernel tree have incorrect label indentation.  This
      patch changes default indent option used in the release process to
      fix this bug.  Lv Zheng.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      10622bf8
    • Bob Moore's avatar
      ACPICA: Clarify ACPI_FREE_BUFFER usage. · bb1cab3d
      Bob Moore authored
      Add a comment to clarify reason for using ACPI_FREE_BUFFER directly
      instead of ACPI_FREE.
      
      In addition to that, change one instance in which ACPI_FREE_BUFFER()
      should be used instead of ACPI_FREE().
      
      [rjw: Subject and changelog]
      Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      bb1cab3d
    • Lv Zheng's avatar
      ACPICA: Add EXPORT_ACPI_INTERFACES macro to external interface modules. · 839e928f
      Lv Zheng authored
      For Linux, there are no functional changes/binary generation differences
      introduced by this patch.
      
      This change adds a new macro to all files that contain external ACPICA
      interfaces. It can be detected and used by the host (via the host-specific
      header) for any special processing required for such modules. Lv Zheng.
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      839e928f
  2. 30 Oct, 2013 10 commits
  3. 15 Oct, 2013 1 commit
    • Rafael J. Wysocki's avatar
      MAINTAINERS / ACPICA: Add ACPICA information to MAINTAINERS · 3774929d
      Rafael J. Wysocki authored
      ACPICA (ACPI Component Architecture) is an external project that
      some ACPI kernel code, including the AML interpreter, is derived
      from.  That kernel code is generated automatically out of the
      original upstream ACPICA sources and therefore, as a general rule,
      all changes to it have to go through the ACPICA upstream.
      
      Add ACPICA information to MAINTAINERS to provide the upstream
      ACPICA maintainers contact information and pointers to the original
      ACPICA Web site and source code.
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      3774929d
  4. 23 Sep, 2013 18 commits
  5. 22 Sep, 2013 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block · 68cf8d0c
      Linus Torvalds authored
      Pull block IO fixes from Jens Axboe:
       "After merge window, no new stuff this time only a collection of neatly
        confined and simple fixes"
      
      * 'for-3.12/core' of git://git.kernel.dk/linux-block:
        cfq: explicitly use 64bit divide operation for 64bit arguments
        block: Add nr_bios to block_rq_remap tracepoint
        If the queue is dying then we only call the rq->end_io callout. This leaves bios setup on the request, because the caller assumes when the blk_execute_rq_nowait/blk_execute_rq call has completed that the rq->bios have been cleaned up.
        bio-integrity: Fix use of bs->bio_integrity_pool after free
        blkcg: relocate root_blkg setting and clearing
        block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
        block: trace all devices plug operation
      68cf8d0c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 0fbf2cc9
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "These are mostly bug fixes and a two small performance fixes.  The
        most important of the bunch are Josef's fix for a snapshotting
        regression and Mark's update to fix compile problems on arm"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (25 commits)
        Btrfs: create the uuid tree on remount rw
        btrfs: change extent-same to copy entire argument struct
        Btrfs: dir_inode_operations should use btrfs_update_time also
        btrfs: Add btrfs: prefix to kernel log output
        btrfs: refuse to remount read-write after abort
        Btrfs: btrfs_ioctl_default_subvol: Revert back to toplevel subvolume when arg is 0
        Btrfs: don't leak transaction in btrfs_sync_file()
        Btrfs: add the missing mutex unlock in write_all_supers()
        Btrfs: iput inode on allocation failure
        Btrfs: remove space_info->reservation_progress
        Btrfs: kill delay_iput arg to the wait_ordered functions
        Btrfs: fix worst case calculator for space usage
        Revert "Btrfs: rework the overcommit logic to be based on the total size"
        Btrfs: improve replacing nocow extents
        Btrfs: drop dir i_size when adding new names on replay
        Btrfs: replay dir_index items before other items
        Btrfs: check roots last log commit when checking if an inode has been logged
        Btrfs: actually log directory we are fsync()'ing
        Btrfs: actually limit the size of delalloc range
        Btrfs: allocate the free space by the existed max extent size when ENOSPC
        ...
      0fbf2cc9
    • Anatol Pomozov's avatar
      cfq: explicitly use 64bit divide operation for 64bit arguments · f3cff25f
      Anatol Pomozov authored
      'samples' is 64bit operant, but do_div() second parameter is 32.
      do_div silently truncates high 32 bits and calculated result
      is invalid.
      
      In case if low 32bit of 'samples' are zeros then do_div() produces
      kernel crash.
      Signed-off-by: default avatarAnatol Pomozov <anatol.pomozov@gmail.com>
      Acked-by: default avatarTejun Heo <tj@kernel.org>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      f3cff25f
  6. 21 Sep, 2013 2 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-for-3.12a' of... · 61740810
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-for-3.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      First round of IIO fixes for 3.12
      
      A series of wrong 'struct dev' assumptions in suspend/resume callbacks
      following on from this issue being identified in a new driver review.
      One to watch out for in future.
      
      A number of driver specific fixes
      1) at91 - fix a overflow in clock rate computation
      2) dummy - Kconfig dependency issue
      3) isl29018 - uninitialized value
      4) hmc5843 - measurement conversion bug introduced by recent cleanup.
      5) ade7854-spi - wrong return value.
      
      Some IIO core fixes
      1) Wrong value picked up for event code creation for a modified channel
      2) A null dereference on failure to initialize a buffer after no buffer has
         been in use, when using the available_scan_masks approach.
      3) Sampling not stopped when a device is removed. Effects forced removal
         such as hot unplugging.
      4) Prevent device going away if a chrdev is still open in userspace.
      5) Prevent race on chardev opening and device being freed.
      6) Add a missing iio_buffer_init in the call back buffer.
      
      These last few are the first part of a set from Lars-Peter Clausen who
      has been taking a closer look at our removal paths and buffer handling
      than anyone has for quite some time.
      61740810
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.12-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · c43a3855
      Linus Torvalds authored
      Pull NFS client bugfix from Trond Myklebust:
       "Fix a regression due to incorrect sharing of gss auth caches"
      
      * tag 'nfs-for-3.12-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        RPCSEC_GSS: fix crash on destroying gss auth
      c43a3855