aboutsummaryrefslogtreecommitdiffstats
path: root/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h
diff options
context:
space:
mode:
authorkaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk>2003-03-11 00:37:28 +0000
committerkaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk>2003-03-11 00:37:28 +0000
commit1f41c8f857594c33942f4bd2b72ec417f77e7ed9 (patch)
treedbb25f0fda1e81bf230f4cca0892a641381119f7 /xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h
parentdddb1acc4135fe9752229895860ea6d3e1513d8a (diff)
downloadxen-1f41c8f857594c33942f4bd2b72ec417f77e7ed9.tar.gz
xen-1f41c8f857594c33942f4bd2b72ec417f77e7ed9.tar.bz2
xen-1f41c8f857594c33942f4bd2b72ec417f77e7ed9.zip
bitkeeper revision 1.122 (3e6d2fc8CULc6D1QN5JO9MAu4FbLdw)
system.h, hypervisor.c: Reverted to locking for page table updat esynchronisation. Shouldn't be noticeably slower, and the stronger guarantees may be useful in future.
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h')
-rw-r--r--xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h
index 05ff47c6f0..e318716a66 100644
--- a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h
+++ b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/system.h
@@ -319,7 +319,7 @@ do { \
shared_info_t *_shared = HYPERVISOR_shared_info; \
_shared->events_enable = (x); \
barrier(); \
- if ( _shared->events && (x) ) do_hypervisor_callback(NULL); \
+ if ( unlikely(_shared->events) && (x) ) do_hypervisor_callback(NULL); \
} while (0)
#define __cli() (HYPERVISOR_shared_info->events_enable = 0); barrier()
#define __sti() \
@@ -327,7 +327,7 @@ do { \
shared_info_t *_shared = HYPERVISOR_shared_info; \
_shared->events_enable = 1; \
barrier(); \
- if ( _shared->events ) do_hypervisor_callback(NULL); \
+ if ( unlikely(_shared->events) ) do_hypervisor_callback(NULL); \
} while (0)
#define safe_halt() ((void)0)