diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /arch/x86/xen/multicalls.h | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 fa3e10725d98..9e565da5d1f7 100644 --- a/arch/x86/xen/multicalls.h +++ b/arch/x86/xen/multicalls.h | |||
| @@ -41,7 +41,7 @@ static inline void xen_mc_issue(unsigned mode) | |||
| 41 | xen_mc_flush(); | 41 | xen_mc_flush(); |
| 42 | 42 | ||
| 43 | /* restore flags saved in xen_mc_batch */ | 43 | /* restore flags saved in xen_mc_batch */ |
| 44 | local_irq_restore(x86_read_percpu(xen_mc_irq_flags)); | 44 | local_irq_restore(percpu_read(xen_mc_irq_flags)); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | /* Set up a callback to be called when the current batch is flushed */ | 47 | /* Set up a callback to be called when the current batch is flushed */ |