git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'connlimit' of git://dev.medozas.de/linux
[pandora-kernel.git]
/
arch
/
x86
/
oprofile
/
nmi_int.c
diff --git
a/arch/x86/oprofile/nmi_int.c
b/arch/x86/oprofile/nmi_int.c
index
4e8baad
..
e2b7b0c
100644
(file)
--- a/
arch/x86/oprofile/nmi_int.c
+++ b/
arch/x86/oprofile/nmi_int.c
@@
-65,7
+65,6
@@
static int profile_exceptions_notify(struct notifier_block *self,
switch (val) {
case DIE_NMI:
switch (val) {
case DIE_NMI:
- case DIE_NMI_IPI:
if (ctr_running)
model->check_ctrs(args->regs, &__get_cpu_var(cpu_msrs));
else if (!nmi_enabled)
if (ctr_running)
model->check_ctrs(args->regs, &__get_cpu_var(cpu_msrs));
else if (!nmi_enabled)
@@
-143,7
+142,7
@@
static inline int has_mux(void)
inline int op_x86_phys_to_virt(int phys)
{
inline int op_x86_phys_to_virt(int phys)
{
- return __
get_cpu_var
(switch_index) + phys;
+ return __
this_cpu_read
(switch_index) + phys;
}
inline int op_x86_virt_to_phys(int virt)
}
inline int op_x86_virt_to_phys(int virt)
@@
-361,7
+360,7
@@
static void nmi_cpu_setup(void *dummy)
static struct notifier_block profile_exceptions_nb = {
.notifier_call = profile_exceptions_notify,
.next = NULL,
static struct notifier_block profile_exceptions_nb = {
.notifier_call = profile_exceptions_notify,
.next = NULL,
- .priority =
2
+ .priority =
NMI_LOCAL_LOW_PRIOR,
};
static void nmi_cpu_restore_registers(struct op_msrs *msrs)
};
static void nmi_cpu_restore_registers(struct op_msrs *msrs)
@@
-732,6
+731,9
@@
int __init op_nmi_init(struct oprofile_operations *ops)
case 0x14:
cpu_type = "x86-64/family14h";
break;
case 0x14:
cpu_type = "x86-64/family14h";
break;
+ case 0x15:
+ cpu_type = "x86-64/family15h";
+ break;
default:
return -ENODEV;
}
default:
return -ENODEV;
}