Skip to content

Commit

Permalink
Hexagon: fix build errors
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sid Manning authored and Brian Cain committed May 3, 2021
1 parent 9ccce09 commit 788dcee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions arch/hexagon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion arch/hexagon/include/asm/timex.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,7 +17,7 @@

static inline int read_current_timer(unsigned long *timer_val)
{
*timer_val = (unsigned long) __vmgettime();
*timer_val = __vmgettime();
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions arch/hexagon/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down

0 comments on commit 788dcee

Please sign in to comment.