summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2017-08-23 15:58:06 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-07-05 12:59:09 -0400
commit11a2d1a242e4eea5ab534eee3a1eb46f0d15dada (patch)
tree1573eab753e490bcd7aa025ca171218c8d21a35a
parentfd6458bae3729e8611f8e8656bef4554a6a76115 (diff)
Fix include paths for in-tree builds
Some source files include header files using <> even though the header file is not in a directory typically in the system include path. This works when compiling the kernel with an O= option (which stores built files outside the source tree) because the kernel adds various extra source paths to the system include path. However, this doesn't happen when building in-tree, so the source must be fixed to use "" for "local" files. Similarly, fix one usage of "" where no path was specified in the "" filename, whereas the header was in a relative directory to the source. Again, with O= I believe this works because the kernel added the file's location into the include path, but doesn't for in-tree builds. Note: Parts of the original commit apply to source that has been moved to linux-nvidia.git; see change Icf4f94b671e73c0a889bb996edc3f15d5fbde98b for that part of the original rel-28 change. Bug 1978388 Change-Id: I907c88a4822b309a33c031ec21dd215047ea3e94 Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1544318 Reviewed-on: https://git-master.nvidia.com/r/1545674 Reviewed-on: https://git-master.nvidia.com/r/1546976 (cherry picked from linux-4.9 commit cc6281afdbe059734d53f54020f1ead0b5cf3659) Reviewed-on: https://git-master.nvidia.com/r/1770153 Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Timo Alho <talho@nvidia.com> Tested-by: Timo Alho <talho@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/devfreq/governor_pod_scaling.c2
-rw-r--r--drivers/devfreq/governor_wmark_active.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/devfreq/governor_pod_scaling.c b/drivers/devfreq/governor_pod_scaling.c
index 8f596cb02..b9b05c5f6 100644
--- a/drivers/devfreq/governor_pod_scaling.c
+++ b/drivers/devfreq/governor_pod_scaling.c
@@ -36,7 +36,7 @@
36#define CREATE_TRACE_POINTS 36#define CREATE_TRACE_POINTS
37#include <trace/events/nvhost_podgov.h> 37#include <trace/events/nvhost_podgov.h>
38 38
39#include <governor.h> 39#include "governor.h"
40 40
41#include <linux/platform_device.h> 41#include <linux/platform_device.h>
42#include <linux/pm_runtime.h> 42#include <linux/pm_runtime.h>
diff --git a/drivers/devfreq/governor_wmark_active.c b/drivers/devfreq/governor_wmark_active.c
index 2b7b865d7..4f02d2e9c 100644
--- a/drivers/devfreq/governor_wmark_active.c
+++ b/drivers/devfreq/governor_wmark_active.c
@@ -23,7 +23,7 @@
23#include <linux/platform_device.h> 23#include <linux/platform_device.h>
24#include <linux/module.h> 24#include <linux/module.h>
25 25
26#include <governor.h> 26#include "governor.h"
27 27
28struct wmark_gov_info { 28struct wmark_gov_info {
29 /* probed from the devfreq */ 29 /* probed from the devfreq */