diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-03-09 17:24:48 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-09 17:24:48 -0700 |
| commit | 0ffb81261428df3e9f4d32ed00a6bd385299bfcf (patch) | |
| tree | 06bbc160842f90e0243e1b29dacd13242564e380 /arch/x86/kernel/asm-offsets_32.c | |
| parent | 64b883c9d077d0d0f70685ab67a88dbcd1a72720 (diff) | |
| parent | 01355eaa8f6aadbf113d9d75c59accc60c274144 (diff) | |
Merge remote branch 'aviksil-lttng/linaro' into linux-linaro-2.6.38-alt
Diffstat (limited to 'arch/x86/kernel/asm-offsets_32.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c index 1a4088dda37..677f8475d9d 100644 --- a/arch/x86/kernel/asm-offsets_32.c +++ b/arch/x86/kernel/asm-offsets_32.c @@ -111,6 +111,7 @@ void foo(void) OFFSET(PV_IRQ_irq_disable, pv_irq_ops, irq_disable); OFFSET(PV_IRQ_irq_enable, pv_irq_ops, irq_enable); OFFSET(PV_CPU_iret, pv_cpu_ops, iret); + OFFSET(PV_CPU_nmi_return, pv_cpu_ops, nmi_return); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); #endif |