diff options
| author | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
|---|---|---|
| committer | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
| commit | ebb688e3183bd5891312bdb8f4e2f520d70b36b6 (patch) | |
| tree | c30d1abefaccc8cd1baa4944aae3348668e13bde /arch/x86/xen | |
| parent | 8061f3a885ec3538bf405ff3957c205b1ab2aae4 (diff) | |
| parent | b2afcd30fff4c24290a63a2497de301864d9726d (diff) | |
Merge remote branch 'lttng/2.6.38-lttng-0.247'
Conflicts:
arch/arm/kernel/traps.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 50542efe45f..e3839c74ec4 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -974,6 +974,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { .read_pmc = native_read_pmc, .iret = xen_iret, + .nmi_return = xen_iret, .irq_enable_sysexit = xen_sysexit, #ifdef CONFIG_X86_64 .usergs_sysret32 = xen_sysret32, |