aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-29 04:28:24 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-29 04:28:24 +0000
commit795e7cf60de19e7a076a46874fab7bb88b43bbff (patch)
tree469843881decdebebff44e3a81b8e0ae8390ed54
parent9444bc1ee272362b4085f77bca3a63d369fc1e70 (diff)
downloadupstream-795e7cf60de19e7a076a46874fab7bb88b43bbff.tar.gz
upstream-795e7cf60de19e7a076a46874fab7bb88b43bbff.tar.bz2
upstream-795e7cf60de19e7a076a46874fab7bb88b43bbff.zip
kernel: fix linux/spi/spidev.h portability issues with musl
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45105
-rw-r--r--target/linux/generic/patches-3.18/214-spidev_h_portability.patch11
-rw-r--r--target/linux/generic/patches-4.0/214-spidev_h_portability.patch11
2 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/214-spidev_h_portability.patch b/target/linux/generic/patches-3.18/214-spidev_h_portability.patch
new file mode 100644
index 0000000000..dbee090547
--- /dev/null
+++ b/target/linux/generic/patches-3.18/214-spidev_h_portability.patch
@@ -0,0 +1,11 @@
+--- a/include/uapi/linux/spi/spidev.h
++++ b/include/uapi/linux/spi/spidev.h
+@@ -111,7 +111,7 @@ struct spi_ioc_transfer {
+
+ /* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
+ #define SPI_MSGSIZE(N) \
+- ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
++ ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << 13)) \
+ ? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
+ #define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
+
diff --git a/target/linux/generic/patches-4.0/214-spidev_h_portability.patch b/target/linux/generic/patches-4.0/214-spidev_h_portability.patch
new file mode 100644
index 0000000000..dbee090547
--- /dev/null
+++ b/target/linux/generic/patches-4.0/214-spidev_h_portability.patch
@@ -0,0 +1,11 @@
+--- a/include/uapi/linux/spi/spidev.h
++++ b/include/uapi/linux/spi/spidev.h
+@@ -111,7 +111,7 @@ struct spi_ioc_transfer {
+
+ /* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
+ #define SPI_MSGSIZE(N) \
+- ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
++ ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << 13)) \
+ ? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
+ #define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
+