Hexagon: fix build errors

Fix type-o in ptrace.c.
Add missing include: asm/hexagon_vm.h
Remove superfluous cast.
Replace 'p3_0' with 'preds'.

Signed-off-by: Sid Manning <sidneym@codeaurora.org>
Add -mlong-calls to build flags.
Signed-off-by: Brian Cain <bcain@codeaurora.org>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

diff --git a/arch/hexagon/Makefile b/arch/hexagon/Makefile
index c168c6980d0507af134e2842e94619de45356a50..38264831905b92148119d143377c20cdc04b6363 100644 (file)
--- a/arch/hexagon/Makefile
+++ b/arch/hexagon/Makefile
@@ -10,6 +10,9 @@ LDFLAGS_vmlinux += -G0
 # Do not use single-byte enums; these will overflow.
 KBUILD_CFLAGS += -fno-short-enums
 
+# We must use long-calls:
+KBUILD_CFLAGS += -mlong-calls
+
 # Modules must use either long-calls, or use pic/plt.
 # Use long-calls for now, it's easier.  And faster.
 # KBUILD_CFLAGS_MODULE += -fPIC

diff --git a/arch/hexagon/include/asm/timex.h b/arch/hexagon/include/asm/timex.h
index 78338d8ada83fc0c200dd0c2b50ed5109dc2d965..8d4ec76fceb458ab3f21e4fa858fae264d1ef166 100644 (file)
--- a/arch/hexagon/include/asm/timex.h
+++ b/arch/hexagon/include/asm/timex.h
@@ -8,6 +8,7 @@
 
 #include <asm-generic/timex.h>
 #include <asm/timer-regs.h>
+#include <asm/hexagon_vm.h>
 
 /* Using TCX0 as our clock.  CLOCK_TICK_RATE scheduled to be removed. */
 #define CLOCK_TICK_RATE              TCX0_CLK_RATE
@@ -16,7 +17,7 @@
 
 static inline int read_current_timer(unsigned long *timer_val)
 {
-       *timer_val = (unsigned long) __vmgettime();
+       *timer_val = __vmgettime();
        return 0;
 }
 

diff --git a/arch/hexagon/kernel/ptrace.c b/arch/hexagon/kernel/ptrace.c
index a5a89e944257c95f45899fe6dad803c094d3b114..8975f9b4cedf08b927b51497a682bf53b6b280fa 100644 (file)
--- a/arch/hexagon/kernel/ptrace.c
+++ b/arch/hexagon/kernel/ptrace.c
@@ -35,7 +35,7 @@ void user_disable_single_step(struct task_struct *child)
 
 static int genregs_get(struct task_struct *target,
                   const struct user_regset *regset,
-                  srtuct membuf to)
+                  struct membuf to)
 {
        struct pt_regs *regs = task_pt_regs(target);
 
@@ -54,7 +54,7 @@ static int genregs_get(struct task_struct *target,
        membuf_store(&to, regs->m0);
        membuf_store(&to, regs->m1);
        membuf_store(&to, regs->usr);
-       membuf_store(&to, regs->p3_0);
+       membuf_store(&to, regs->preds);
        membuf_store(&to, regs->gp);
        membuf_store(&to, regs->ugp);
        membuf_store(&to, pt_elr(regs)); // pc