Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cf5c095 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic cleanups from Arnd Bergmann:
 "The asm-generic changes for 4.4 are mostly a series from Christoph
  Hellwig to clean up various abuses of headers in there.  The patch to
  rename the io-64-nonatomic-*.h headers caused some conflicts with new
  users, so I added a workaround that we can remove in the next merge
  window.

  The only other patch is a warning fix from Marek Vasut"

* tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h
  asm-generic: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
  gpio-mxc: stop including <asm-generic/bug>
  n_tracesink: stop including <asm-generic/bug>
  n_tracerouter: stop including <asm-generic/bug>
  mlx5: stop including <asm-generic/kmap_types.h>
  hifn_795x: stop including <asm-generic/kmap_types.h>
  drbd: stop including <asm-generic/kmap_types.h>
  move count_zeroes.h out of asm-generic
  move io-64-nonatomic*.h out of asm-generic
parents 22402cd0 4008cb3a

drivers/acpi/nfit.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * For readq() and writeq() on 32-bit builds, the hi-lo, lo-hi order is

 * irrelevant.

 */

#include <asm-generic/io-64-nonatomic-hi-lo.h>

#include <linux/io-64-nonatomic-hi-lo.h>



static bool force_enable_dimms;

module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR);

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


#include <asm/io.h>

#include <asm/uaccess.h>

#include <asm-generic/io-64-nonatomic-lo-hi.h>

#include <linux/io-64-nonatomic-lo-hi.h>



#include "internal.h"

drivers/block/drbd/drbd_bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/string.h>

#include <linux/drbd.h>

#include <linux/slab.h>

#include <asm/kmap_types.h>

#include <linux/highmem.h>



#include "drbd_int.h"

drivers/crypto/hifn_795x.c

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#include <crypto/algapi.h>

#include <crypto/des.h>



#include <asm/kmap_types.h>



//#define HIFN_DEBUG



#ifdef HIFN_DEBUG

drivers/edac/i3200_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/io.h>

#include "edac_core.h"



#include <asm-generic/io-64-nonatomic-lo-hi.h>

#include <linux/io-64-nonatomic-lo-hi.h>



#define I3200_REVISION        "1.1"