From 09bcb9063fedeb30366e7886f95b1875968a2fe3 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Sat, 20 Sep 2008 12:58:40 +0200 Subject: [PATCH] --- yaml --- r: 117091 b: refs/heads/master c: 45f197ade73ba95681b9803680c75352fc0a1c0a h: refs/heads/master i: 117089: adee659fbfbdd3e368ca56bd0d33317d19eb90b8 117087: 5298f1a5096b425fc78ef7a63c9a7037eee7a483 v: v3 --- [refs] | 2 +- trunk/arch/x86/oprofile/nmi_int.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 88be0b4f98e6..084b7c36627d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2879a927bb7a3cf91ae3906a5e59215f9c17dd75 +refs/heads/master: 45f197ade73ba95681b9803680c75352fc0a1c0a diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c index fb4902bc6f14..4108d02c5292 100644 --- a/trunk/arch/x86/oprofile/nmi_int.c +++ b/trunk/arch/x86/oprofile/nmi_int.c @@ -551,7 +551,7 @@ int __init op_nmi_init(struct oprofile_operations *ops) } /* default values, can be overwritten by model */ - __get_cpu_var(switch_index) = 0; + __raw_get_cpu_var(switch_index) = 0; ops->create_files = nmi_create_files; ops->setup = nmi_setup; ops->shutdown = nmi_shutdown;