tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+103
-100
+1
-1
drivers/acpi/nfit.c
+1
-1
drivers/acpi/nfit.c
···
27
27
* For readq() and writeq() on 32-bit builds, the hi-lo, lo-hi order is
28
28
* irrelevant.
29
29
*/
30
-
#include <asm-generic/io-64-nonatomic-hi-lo.h>
30
+
#include <linux/io-64-nonatomic-hi-lo.h>
31
31
32
32
static bool force_enable_dimms;
33
33
module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR);
+1
-1
drivers/acpi/osl.c
+1
-1
drivers/acpi/osl.c
+1
-1
drivers/block/drbd/drbd_bitmap.c
+1
-1
drivers/block/drbd/drbd_bitmap.c
-2
drivers/crypto/hifn_795x.c
-2
drivers/crypto/hifn_795x.c
+1
-1
drivers/edac/i3200_edac.c
+1
-1
drivers/edac/i3200_edac.c
+1
-1
drivers/edac/ie31200_edac.c
+1
-1
drivers/edac/ie31200_edac.c
+1
-1
drivers/edac/x38_edac.c
+1
-1
drivers/edac/x38_edac.c
+1
-1
drivers/gpio/gpio-mxc.c
+1
-1
drivers/gpio/gpio-mxc.c
+1
-1
drivers/i2c/busses/i2c-ismt.c
+1
-1
drivers/i2c/busses/i2c-ismt.c
+1
-1
drivers/infiniband/hw/mlx5/main.c
+1
-1
drivers/infiniband/hw/mlx5/main.c
+1
-2
drivers/mfd/intel-lpss.c
+1
-2
drivers/mfd/intel-lpss.c
+1
-1
drivers/net/ethernet/intel/i40e/i40e_osdep.h
+1
-1
drivers/net/ethernet/intel/i40e/i40e_osdep.h
···
35
35
#include <linux/highuid.h>
36
36
37
37
/* get readq/writeq support for 32 bit kernels, use the low-first version */
38
-
#include <asm-generic/io-64-nonatomic-lo-hi.h>
38
+
#include <linux/io-64-nonatomic-lo-hi.h>
39
39
40
40
/* File to be the magic between shared code and
41
41
* actual OS primitives
+1
-1
drivers/net/ethernet/intel/i40evf/i40e_osdep.h
+1
-1
drivers/net/ethernet/intel/i40evf/i40e_osdep.h
···
34
34
#include <linux/pci.h>
35
35
36
36
/* get readq/writeq support for 32 bit kernels, use the low-first version */
37
-
#include <asm-generic/io-64-nonatomic-lo-hi.h>
37
+
#include <linux/io-64-nonatomic-lo-hi.h>
38
38
39
39
/* File to be the magic between shared code and
40
40
* actual OS primitives
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/main.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/main.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+1
-1
drivers/net/ethernet/rocker/rocker.c
+1
-1
drivers/net/ethernet/rocker/rocker.c
+1
-1
drivers/nvme/host/pci.c
+1
-1
drivers/nvme/host/pci.c
+1
-1
drivers/platform/x86/ibm_rtl.c
+1
-1
drivers/platform/x86/ibm_rtl.c
+1
-1
drivers/platform/x86/intel_ips.c
+1
-1
drivers/platform/x86/intel_ips.c
+1
-1
drivers/scsi/qla4xxx/ql4_nx.c
+1
-1
drivers/scsi/qla4xxx/ql4_nx.c
+1
-1
drivers/tty/n_tracerouter.c
+1
-1
drivers/tty/n_tracerouter.c
+1
-1
drivers/tty/n_tracesink.c
+1
-1
drivers/tty/n_tracesink.c
+1
-2
drivers/usb/host/xhci.h
+1
-2
drivers/usb/host/xhci.h
+3
-3
include/asm-generic/bitops/count_zeros.h
include/linux/count_zeros.h
+3
-3
include/asm-generic/bitops/count_zeros.h
include/linux/count_zeros.h
···
9
9
* 2 of the Licence, or (at your option) any later version.
10
10
*/
11
11
12
-
#ifndef _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
13
-
#define _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
12
+
#ifndef _LINUX_BITOPS_COUNT_ZEROS_H_
13
+
#define _LINUX_BITOPS_COUNT_ZEROS_H_
14
14
15
15
#include <asm/bitops.h>
16
16
···
54
54
return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0;
55
55
}
56
56
57
-
#endif /* _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_ */
57
+
#endif /* _LINUX_BITOPS_COUNT_ZEROS_H_ */
+7
-4
include/asm-generic/cmpxchg.h
+7
-4
include/asm-generic/cmpxchg.h
···
79
79
}
80
80
}
81
81
82
-
#define xchg(ptr, x) \
83
-
((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
82
+
#define xchg(ptr, x) ({ \
83
+
((__typeof__(*(ptr))) \
84
+
__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))); \
85
+
})
84
86
85
87
#endif /* xchg */
86
88
···
92
90
#include <asm-generic/cmpxchg-local.h>
93
91
94
92
#ifndef cmpxchg_local
95
-
#define cmpxchg_local(ptr, o, n) \
93
+
#define cmpxchg_local(ptr, o, n) ({ \
96
94
((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
97
-
(unsigned long)(n), sizeof(*(ptr))))
95
+
(unsigned long)(n), sizeof(*(ptr)))); \
96
+
})
98
97
#endif
99
98
100
99
#ifndef cmpxchg64_local
+2
-32
include/asm-generic/io-64-nonatomic-hi-lo.h
+2
-32
include/asm-generic/io-64-nonatomic-hi-lo.h
···
1
-
#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_
2
-
#define _ASM_IO_64_NONATOMIC_HI_LO_H_
3
-
4
-
#include <linux/io.h>
5
-
#include <asm-generic/int-ll64.h>
6
-
7
-
static inline __u64 hi_lo_readq(const volatile void __iomem *addr)
8
-
{
9
-
const volatile u32 __iomem *p = addr;
10
-
u32 low, high;
11
-
12
-
high = readl(p + 1);
13
-
low = readl(p);
14
-
15
-
return low + ((u64)high << 32);
16
-
}
17
-
18
-
static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr)
19
-
{
20
-
writel(val >> 32, addr + 4);
21
-
writel(val, addr);
22
-
}
23
-
24
-
#ifndef readq
25
-
#define readq hi_lo_readq
26
-
#endif
27
-
28
-
#ifndef writeq
29
-
#define writeq hi_lo_writeq
30
-
#endif
31
-
32
-
#endif /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */
1
+
/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */
2
+
#include <linux/io-64-nonatomic-hi-lo.h>
+2
-32
include/asm-generic/io-64-nonatomic-lo-hi.h
+2
-32
include/asm-generic/io-64-nonatomic-lo-hi.h
···
1
-
#ifndef _ASM_IO_64_NONATOMIC_LO_HI_H_
2
-
#define _ASM_IO_64_NONATOMIC_LO_HI_H_
3
-
4
-
#include <linux/io.h>
5
-
#include <asm-generic/int-ll64.h>
6
-
7
-
static inline __u64 lo_hi_readq(const volatile void __iomem *addr)
8
-
{
9
-
const volatile u32 __iomem *p = addr;
10
-
u32 low, high;
11
-
12
-
low = readl(p);
13
-
high = readl(p + 1);
14
-
15
-
return low + ((u64)high << 32);
16
-
}
17
-
18
-
static inline void lo_hi_writeq(__u64 val, volatile void __iomem *addr)
19
-
{
20
-
writel(val, addr);
21
-
writel(val >> 32, addr + 4);
22
-
}
23
-
24
-
#ifndef readq
25
-
#define readq lo_hi_readq
26
-
#endif
27
-
28
-
#ifndef writeq
29
-
#define writeq lo_hi_writeq
30
-
#endif
31
-
32
-
#endif /* _ASM_IO_64_NONATOMIC_LO_HI_H_ */
1
+
/* XXX: delete asm-generic/io-64-nonatomic-lo-hi.h after converting new users */
2
+
#include <linux/io-64-nonatomic-lo-hi.h>
+32
include/linux/io-64-nonatomic-hi-lo.h
+32
include/linux/io-64-nonatomic-hi-lo.h
···
1
+
#ifndef _LINUX_IO_64_NONATOMIC_HI_LO_H_
2
+
#define _LINUX_IO_64_NONATOMIC_HI_LO_H_
3
+
4
+
#include <linux/io.h>
5
+
#include <asm-generic/int-ll64.h>
6
+
7
+
static inline __u64 hi_lo_readq(const volatile void __iomem *addr)
8
+
{
9
+
const volatile u32 __iomem *p = addr;
10
+
u32 low, high;
11
+
12
+
high = readl(p + 1);
13
+
low = readl(p);
14
+
15
+
return low + ((u64)high << 32);
16
+
}
17
+
18
+
static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr)
19
+
{
20
+
writel(val >> 32, addr + 4);
21
+
writel(val, addr);
22
+
}
23
+
24
+
#ifndef readq
25
+
#define readq hi_lo_readq
26
+
#endif
27
+
28
+
#ifndef writeq
29
+
#define writeq hi_lo_writeq
30
+
#endif
31
+
32
+
#endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */
+32
include/linux/io-64-nonatomic-lo-hi.h
+32
include/linux/io-64-nonatomic-lo-hi.h
···
1
+
#ifndef _LINUX_IO_64_NONATOMIC_LO_HI_H_
2
+
#define _LINUX_IO_64_NONATOMIC_LO_HI_H_
3
+
4
+
#include <linux/io.h>
5
+
#include <asm-generic/int-ll64.h>
6
+
7
+
static inline __u64 lo_hi_readq(const volatile void __iomem *addr)
8
+
{
9
+
const volatile u32 __iomem *p = addr;
10
+
u32 low, high;
11
+
12
+
low = readl(p);
13
+
high = readl(p + 1);
14
+
15
+
return low + ((u64)high << 32);
16
+
}
17
+
18
+
static inline void lo_hi_writeq(__u64 val, volatile void __iomem *addr)
19
+
{
20
+
writel(val, addr);
21
+
writel(val >> 32, addr + 4);
22
+
}
23
+
24
+
#ifndef readq
25
+
#define readq lo_hi_readq
26
+
#endif
27
+
28
+
#ifndef writeq
29
+
#define writeq lo_hi_writeq
30
+
#endif
31
+
32
+
#endif /* _LINUX_IO_64_NONATOMIC_LO_HI_H_ */
+1
-1
lib/mpi/longlong.h
+1
-1
lib/mpi/longlong.h