74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
49 lines
1.6 KiB
Diff
49 lines
1.6 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(-)
|
|
|
|
diff --git a/tools/build/Build.include b/tools/build/Build.include
|
|
index 1dcb95e76f70..9d6f97a7c1aa 100644
|
|
--- a/tools/build/Build.include
|
|
+++ b/tools/build/Build.include
|
|
@@ -95,4 +95,4 @@ cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAG
|
|
###
|
|
## HOSTCC C flags
|
|
|
|
-host_c_flags = -Wp,-MD,$(depfile),-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))
|
|
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
|
|
index 41611d7f9873..51333bee190c 100644
|
|
--- 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>
|
|
diff --git a/tools/perf/pmu-events/json.c b/tools/perf/pmu-events/json.c
|
|
index f67bbb0aa36e..a72c70a97fab 100644
|
|
--- 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)
|
|
--
|
|
2.11.0
|
|
|