diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-09 10:42:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-09 10:42:21 +0100 |
| commit | 4385428a477559b26736cc3c80d8b68f31126c71 (patch) | |
| tree | 8eb0cbc78e79c368687fa13a1e0674ae537f830f /arch/x86/include/asm/paravirt.h | |
| parent | perf, x86: P4 PMU - Fix unflagged overflows handling (diff) | |
| parent | dynamic debug: Fix build issue with older gcc (diff) | |
| download | linux-4385428a477559b26736cc3c80d8b68f31126c71.tar.xz linux-4385428a477559b26736cc3c80d8b68f31126c71.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
| -rw-r--r-- | arch/x86/include/asm/paravirt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index ef9975812c77..7709c12431b8 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -112,7 +112,7 @@ static inline void arch_safe_halt(void) static inline void halt(void) { - PVOP_VCALL0(pv_irq_ops.safe_halt); + PVOP_VCALL0(pv_irq_ops.halt); } static inline void wbinvd(void) |