diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 23:50:57 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 23:50:57 +0100 |
commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/x86/xen/multicalls.h | |
parent | x86: add pte_set_flags/clear_flags for pte flag manipulation (diff) | |
parent | Merge branch 'linus' into core/percpu (diff) | |
download | linux-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.tar.xz linux-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.zip |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/x86/xen/multicalls.h')
-rw-r--r-- | arch/x86/xen/multicalls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/multicalls.h b/arch/x86/xen/multicalls.h index 858938241616..e786fa7f2615 100644 --- a/arch/x86/xen/multicalls.h +++ b/arch/x86/xen/multicalls.h @@ -39,7 +39,7 @@ static inline void xen_mc_issue(unsigned mode) xen_mc_flush(); /* restore flags saved in xen_mc_batch */ - local_irq_restore(x86_read_percpu(xen_mc_irq_flags)); + local_irq_restore(percpu_read(xen_mc_irq_flags)); } /* Set up a callback to be called when the current batch is flushed */ |