diff options
author | Linus Torvalds | 2015-11-06 23:22:15 +0100 |
---|---|---|
committer | Linus Torvalds | 2015-11-06 23:22:15 +0100 |
commit | 9cf5c095b65da63c08b928a7d0015d5d5dca8a66 (patch) | |
tree | f151dc13ce26c0252f41aeaf612dd3e9762c29dd /drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | |
parent | Merge tag 'trace-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... (diff) | |
parent | asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h (diff) | |
download | kernel-qcow2-linux-9cf5c095b65da63c08b928a7d0015d5d5dca8a66.tar.gz kernel-qcow2-linux-9cf5c095b65da63c08b928a7d0015d5d5dca8a66.tar.xz kernel-qcow2-linux-9cf5c095b65da63c08b928a7d0015d5d5dca8a66.zip |
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
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c index 1cda5d268ec9..4d3377b12657 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c @@ -30,7 +30,7 @@ * SOFTWARE. */ -#include <asm-generic/kmap_types.h> +#include <linux/highmem.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mlx5/driver.h> |