linux5.4: update to 5.4.81.
This commit is contained in:
parent
ee9614158c
commit
115c57322d
2 changed files with 2 additions and 39 deletions
|
@ -1,37 +0,0 @@
|
|||
This also affects aarch64-musl systems at very least.
|
||||
|
||||
From 1b9ae0c92925ac40489be526d67d0010d0724ce0 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Thu, 21 May 2020 22:14:22 +0200
|
||||
Subject: [PATCH] wireless: Use linux/stddef.h instead of stddef.h
|
||||
|
||||
When compiling inside the kernel include linux/stddef.h instead of
|
||||
stddef.h. When I compile this header file in backports for power PC I
|
||||
run into a conflict with ptrdiff_t. I was unable to reproduce this in
|
||||
mainline kernel. I still would like to fix this problem in the kernel.
|
||||
|
||||
Fixes: 6989310f5d43 ("wireless: Use offsetof instead of custom macro.")
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Link: https://lore.kernel.org/r/20200521201422.16493-1-hauke@hauke-m.de
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
include/uapi/linux/wireless.h | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/uapi/linux/wireless.h b/include/uapi/linux/wireless.h
|
||||
index a2c006a364e0b..24f3371ad8262 100644
|
||||
--- a/include/uapi/linux/wireless.h
|
||||
+++ b/include/uapi/linux/wireless.h
|
||||
@@ -74,7 +74,11 @@
|
||||
#include <linux/socket.h> /* for "struct sockaddr" et al */
|
||||
#include <linux/if.h> /* for IFNAMSIZ and co... */
|
||||
|
||||
-#include <stddef.h> /* for offsetof */
|
||||
+#ifdef __KERNEL__
|
||||
+# include <linux/stddef.h> /* for offsetof */
|
||||
+#else
|
||||
+# include <stddef.h> /* for offsetof */
|
||||
+#endif
|
||||
|
||||
/***************************** VERSION *****************************/
|
||||
/*
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'linux5.4'
|
||||
pkgname=linux5.4
|
||||
version=5.4.80
|
||||
version=5.4.81
|
||||
revision=1
|
||||
wrksrc="linux-${version}"
|
||||
short_desc="Linux kernel and modules (${version%.*} series)"
|
||||
|
@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
|
|||
license="GPL-2.0-only"
|
||||
homepage="https://www.kernel.org"
|
||||
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
|
||||
checksum=49da425c1f3c530fd3ff31d85a0461f6b6dc6e459f7faf3eee23e49a98ce64c7
|
||||
checksum=9470bde475726996202d845a5fc3bc8bd3bb546bbc6816fb663fa73df25d8427
|
||||
python_version=3
|
||||
patch_args="-Np1"
|
||||
|
||||
|
|
Loading…
Reference in a new issue