lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 31 Aug 2010 22:56:45 -0400 From: Don Zickus <dzickus@...hat.com> To: mingo@...e.hu Cc: peterz@...radead.org, robert.richter@....com, gorcunov@...il.com, fweisbec@...il.com, linux-kernel@...r.kernel.org, ying.huang@...el.com, ming.m.lin@...el.com, yinghai@...nel.org, andi@...stfloor.org, Don Zickus <dzickus@...hat.com> Subject: [PATCH 3/4] [x86] perf: rename nmi variable to avoid clash with entry point There is already an entry point named .nmi in entry.S and that seems to clash with the per_cpu variable nmi defined in commit f3a860d8. Renaming this variable avoids the namespace collision. Signed-off-by: Don Zickus <dzickus@...hat.com> --- arch/x86/kernel/cpu/perf_event.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index dd2fceb..2a05ea4 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1205,7 +1205,7 @@ struct pmu_nmi_state { int handled; }; -static DEFINE_PER_CPU(struct pmu_nmi_state, nmi); +static DEFINE_PER_CPU_PAGE_ALIGNED(struct pmu_nmi_state, pmu_nmi); static int __kprobes perf_event_nmi_handler(struct notifier_block *self, @@ -1224,7 +1224,7 @@ perf_event_nmi_handler(struct notifier_block *self, break; case DIE_NMIUNKNOWN: this_nmi = percpu_read(irq_stat.__nmi_count); - if (this_nmi != __get_cpu_var(nmi).marked) + if (this_nmi != __get_cpu_var(pmu_nmi).marked) /* let the kernel handle the unknown nmi */ return NOTIFY_DONE; /* @@ -1248,8 +1248,8 @@ perf_event_nmi_handler(struct notifier_block *self, this_nmi = percpu_read(irq_stat.__nmi_count); if ((handled > 1) || /* the next nmi could be a back-to-back nmi */ - ((__get_cpu_var(nmi).marked == this_nmi) && - (__get_cpu_var(nmi).handled > 1))) { + ((__get_cpu_var(pmu_nmi).marked == this_nmi) && + (__get_cpu_var(pmu_nmi).handled > 1))) { /* * We could have two subsequent back-to-back nmis: The * first handles more than one counter, the 2nd @@ -1260,8 +1260,8 @@ perf_event_nmi_handler(struct notifier_block *self, * handling more than one counter. We will mark the * next (3rd) and then drop it if unhandled. */ - __get_cpu_var(nmi).marked = this_nmi + 1; - __get_cpu_var(nmi).handled = handled; + __get_cpu_var(pmu_nmi).marked = this_nmi + 1; + __get_cpu_var(pmu_nmi).handled = handled; } return NOTIFY_STOP; -- 1.7.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists