diff options
author | Pratyush Anand <panand@redhat.com> | 2015-01-13 19:21:52 +0530 |
---|---|---|
committer | Steve Capper <steve.capper@linaro.org> | 2015-01-27 16:46:20 +0000 |
commit | e1e8d61666a7ab34dd814beb7c800135b9f5f9cc (patch) | |
tree | ec106943724a31d47b8de258c0c3816e56696d18 | |
parent | 5eb037d9e5c6b1a3256f59c905214825f3ef2520 (diff) | |
download | linux-e1e8d61666a7ab34dd814beb7c800135b9f5f9cc.tar.gz |
ARM64: rename enum debug_el to enum debug_elx to fix "wrong kind of tag"
asm/debug-monitors.h contains definition for debug opcode. So, it will
be needed by asm/uprobes.h.
With enum debug_el it generates following compilation error, since
asm/uprobes.h is included.
lib/list_sort.c:160:8: error: ‘debug_el’ defined as wrong kind of tag
struct debug_el {
Therefore rename enum debug_el to enum debug_elx.
Signed-off-by: Pratyush Anand <panand@redhat.com>
-rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 6 | ||||
-rw-r--r-- | arch/arm64/kernel/debug-monitors.c | 4 | ||||
-rw-r--r-- | arch/arm64/kernel/hw_breakpoint.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index 5f196ee8d97..24d2694770b 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -132,13 +132,13 @@ void unregister_break_hook(struct break_hook *hook); u8 debug_monitors_arch(void); -enum debug_el { +enum debug_elx { DBG_ACTIVE_EL0 = 0, DBG_ACTIVE_EL1, }; -void enable_debug_monitors(enum debug_el el); -void disable_debug_monitors(enum debug_el el); +void enable_debug_monitors(enum debug_elx el); +void disable_debug_monitors(enum debug_elx el); void user_rewind_single_step(struct task_struct *task); void user_fastforward_single_step(struct task_struct *task); diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index 98ba5c8c514..aaa0e87d52f 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -82,7 +82,7 @@ early_param("nodebugmon", early_debug_disable); static DEFINE_PER_CPU(int, mde_ref_count); static DEFINE_PER_CPU(int, kde_ref_count); -void enable_debug_monitors(enum debug_el el) +void enable_debug_monitors(enum debug_elx el) { u32 mdscr, enable = 0; @@ -102,7 +102,7 @@ void enable_debug_monitors(enum debug_el el) } } -void disable_debug_monitors(enum debug_el el) +void disable_debug_monitors(enum debug_elx el) { u32 mdscr, disable = 0; diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index df1cf15377b..bc8829682c4 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -157,7 +157,7 @@ static void write_wb_reg(int reg, int n, u64 val) * Convert a breakpoint privilege level to the corresponding exception * level. */ -static enum debug_el debug_exception_level(int privilege) +static enum debug_elx debug_exception_level(int privilege) { switch (privilege) { case AARCH64_BREAKPOINT_EL0: @@ -231,7 +231,7 @@ static int hw_breakpoint_control(struct perf_event *bp, struct perf_event **slots; struct debug_info *debug_info = ¤t->thread.debug; int i, max_slots, ctrl_reg, val_reg, reg_enable; - enum debug_el dbg_el = debug_exception_level(info->ctrl.privilege); + enum debug_elx dbg_el = debug_exception_level(info->ctrl.privilege); u32 ctrl; if (info->ctrl.type == ARM_BREAKPOINT_EXECUTE) { @@ -538,7 +538,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * exception level at the register level. * This is used when single-stepping after a breakpoint exception. */ -static void toggle_bp_registers(int reg, enum debug_el el, int enable) +static void toggle_bp_registers(int reg, enum debug_elx el, int enable) { int i, max_slots, privilege; u32 ctrl; |