diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:31:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:31:14 -0400 |
| commit | 607baf1f4ef94637ab0f7d0e258932851dc5c0a2 (patch) | |
| tree | e5e3ed753fdad4eef8aaed2562df2a1148cec4ab /drivers/xen/events.c | |
| parent | 064a32d82c20cdcb0119a8b316eb520608d8c647 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/memtest
Diffstat (limited to 'drivers/xen/events.c')
| -rw-r--r-- | drivers/xen/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 4f0f22b020ea..76e5b7386af9 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
| @@ -529,7 +529,7 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) | |||
| 529 | 529 | ||
| 530 | #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */ | 530 | #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */ |
| 531 | /* Clear master flag /before/ clearing selector flag. */ | 531 | /* Clear master flag /before/ clearing selector flag. */ |
| 532 | rmb(); | 532 | wmb(); |
| 533 | #endif | 533 | #endif |
| 534 | pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0); | 534 | pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0); |
| 535 | while (pending_words != 0) { | 535 | while (pending_words != 0) { |