mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-17 08:55:29 +08:00
12d0742fd5
* kernel: bump 5.4 to 5.4.60
Deleted upstream patches:
generic:
041-genirq-affinity-Make-affinity-setting-if-activated-o.patch
ipq806x:
093-5-v5.8-ipq806x-PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-SoC.patch
093-6-v5.8-ipq806x-PCI-qcom-Add-support-for-tx-term-offset-for-rev-2_1_0.patch
Merged manually:
ipq806x:
093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
layerscape:
804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
Build-tested: ath79/generic, ipq806x, layerscape/armv7, layerscape/armv8_64b
Run-tested: ipq806x (R7800)
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* kernel: Update kernel 4.14 to version 4.14.195
Compile and runtime tested on lantiq/xrx200 and x86/64.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Co-authored-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 7f698012384ccb1ed10cc758acfd085096fdb307 Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 7 Jul 2017 17:02:03 +0200
|
|
Subject: kernel: fix linux 4.9 host tools portability issues
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
tools/build/Build.include | 2 +-
|
|
tools/perf/pmu-events/jevents.c | 1 +
|
|
tools/perf/pmu-events/json.c | 1 -
|
|
3 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/tools/build/Build.include
|
|
+++ b/tools/build/Build.include
|
|
@@ -99,4 +99,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$
|
|
###
|
|
## HOSTCC C flags
|
|
|
|
-host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
|
|
+host_c_flags = -MD -MF $(depfile) -MT $@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
|
|
--- a/tools/perf/pmu-events/jevents.c
|
|
+++ b/tools/perf/pmu-events/jevents.c
|
|
@@ -35,6 +35,7 @@
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
+#include <strings.h>
|
|
#include <ctype.h>
|
|
#include <unistd.h>
|
|
#include <stdarg.h>
|
|
--- a/tools/perf/pmu-events/json.c
|
|
+++ b/tools/perf/pmu-events/json.c
|
|
@@ -38,7 +38,6 @@
|
|
#include <unistd.h>
|
|
#include "jsmn.h"
|
|
#include "json.h"
|
|
-#include <linux/kernel.h>
|
|
|
|
|
|
static char *mapfile(const char *fn, size_t *size)
|