From f231e43333124d92a82acd19431f8104b8e48a75 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 21 Sep 2017 00:17:50 +0900
Subject: hexagon: get rid of #include <generated/compile.h>

<generated/compile.h> is created (or updated) when Kbuild descends
into the init/ directory.  In parallel building from a pristine
source tree, there is no guarantee <generated/compile.h> exists when
arch/hexagon/kernel/ptrace.c is compiled.

For hexagon architecture, we know UTS_MACHINE is a fixed string
"hexagon", so let's hard-code it, like many architectures do.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Richard Kuo <rkuo@codeaurora.org>
---
 arch/hexagon/kernel/ptrace.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'arch/hexagon')

diff --git a/arch/hexagon/kernel/ptrace.c b/arch/hexagon/kernel/ptrace.c
index ecd75e2e8eb3..fa76493c1745 100644
--- a/arch/hexagon/kernel/ptrace.c
+++ b/arch/hexagon/kernel/ptrace.c
@@ -18,8 +18,6 @@
  * 02110-1301, USA.
  */
 
-#include <generated/compile.h>
-
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
@@ -180,7 +178,7 @@ static const struct user_regset hexagon_regsets[] = {
 };
 
 static const struct user_regset_view hexagon_user_view = {
-	.name = UTS_MACHINE,
+	.name = "hexagon",
 	.e_machine = ELF_ARCH,
 	.ei_osabi = ELF_OSABI,
 	.regsets = hexagon_regsets,
-- 
cgit 


From 3a5befc146175de8bf6c4eb68866a4f5ad46265a Mon Sep 17 00:00:00 2001
From: Cao jin <caoj.fnst@cn.fujitsu.com>
Date: Mon, 9 Oct 2017 15:11:47 +0800
Subject: hexagon/kbuild: replace CFLAGS_MODULE with KBUILD_CFLAGS_MODULE

As kbuild document & commit 6588169d51 says: KBUILD_CFLAGS_MODULE is
used to add arch-specific options for $(CC). From commandline,
CFLAGS_MODULE shall be used.
Doesn't have any functional change, but just follow kbuild rules.

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
CC: linux-hexagon@vger.kernel.org
Acked-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 arch/hexagon/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'arch/hexagon')

diff --git a/arch/hexagon/Makefile b/arch/hexagon/Makefile
index 207711a0fd0c..4f5c84c4bbb4 100644
--- a/arch/hexagon/Makefile
+++ b/arch/hexagon/Makefile
@@ -11,9 +11,9 @@ KBUILD_CFLAGS += -fno-short-enums
 
 # Modules must use either long-calls, or use pic/plt.
 # Use long-calls for now, it's easier.  And faster.
-# CFLAGS_MODULE += -fPIC
-# LDFLAGS_MODULE += -shared
-CFLAGS_MODULE += -mlong-calls
+# KBUILD_CFLAGS_MODULE += -fPIC
+# KBUILD_LDFLAGS_MODULE += -shared
+KBUILD_CFLAGS_MODULE += -mlong-calls
 
 cflags-y += $(call cc-option,-mv${CONFIG_HEXAGON_ARCH_VERSION})
 aflags-y += $(call cc-option,-mv${CONFIG_HEXAGON_ARCH_VERSION})
-- 
cgit