Messages in this thread Patch in this message | | | Date | Wed, 4 Sep 2013 20:58:31 +0000 | From | Christoph Lameter <> | Subject | Re: [gcv v3 27/35] arm: Replace __get_cpu_var uses |
| |
Here is a patch to be applied after the earlier one to convert the local_t use to this_cpu. Not sure if I got the local_dec_and_test conversion right.
Index: linux/arch/arm64/kernel/debug-monitors.c =================================================================== --- linux.orig/arch/arm64/kernel/debug-monitors.c 2013-09-04 15:53:53.374943378 -0500 +++ linux/arch/arm64/kernel/debug-monitors.c 2013-09-04 15:57:19.564792739 -0500 @@ -27,7 +27,6 @@ #include <linux/uaccess.h>
#include <asm/debug-monitors.h> -#include <asm/local.h> #include <asm/cputype.h> #include <asm/system_misc.h>
@@ -89,8 +88,8 @@ early_param("nodebugmon", early_debug_di * Keep track of debug users on each core. * The ref counts are per-cpu so we use a local_t type. */ -static DEFINE_PER_CPU(local_t, mde_ref_count); -static DEFINE_PER_CPU(local_t, kde_ref_count); +static DEFINE_PER_CPU(int, mde_ref_count); +static DEFINE_PER_CPU(int, kde_ref_count);
void enable_debug_monitors(enum debug_el el) { @@ -98,11 +97,11 @@ void enable_debug_monitors(enum debug_el
WARN_ON(preemptible());
- if (local_inc_return(this_cpu_ptr(&mde_ref_count)) == 1) + if (this_cpu_inc_return(mde_ref_count) == 1) enable = DBG_MDSCR_MDE;
if (el == DBG_ACTIVE_EL1 && - local_inc_return(this_cpu_ptr(&kde_ref_count)) == 1) + this_cpu_inc_return(kde_ref_count) == 1) enable |= DBG_MDSCR_KDE;
if (enable && debug_enabled) { @@ -118,11 +117,11 @@ void disable_debug_monitors(enum debug_e
WARN_ON(preemptible());
- if (local_dec_and_test(this_cpu_ptr(&mde_ref_count))) + if (this_cpu_dec_return(mde_ref_count)) disable = ~DBG_MDSCR_MDE;
if (el == DBG_ACTIVE_EL1 && - local_dec_and_test(this_cpu_ptr(&kde_ref_count))) + this_cpu_dec_return(kde_ref_count)) disable &= ~DBG_MDSCR_KDE;
if (disable) {
| |