projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
ia64
/
kernel
/
fsys.S
diff --git
a/arch/ia64/kernel/fsys.S
b/arch/ia64/kernel/fsys.S
index f15d8601827fe39dd9c97d41f27ec86a3e7d2f17..cc26edac0ec6e7768f25f1ea6ed60ca2d8d143a1 100644
(file)
--- a/
arch/ia64/kernel/fsys.S
+++ b/
arch/ia64/kernel/fsys.S
@@
-173,7
+173,7
@@
ENTRY(fsys_set_tid_address)
FSYS_RETURN
END(fsys_set_tid_address)
-#if IA64_GTOD_
LOCK
_OFFSET !=0
+#if IA64_GTOD_
SEQ
_OFFSET !=0
#error fsys_gettimeofday incompatible with changes to struct fsyscall_gtod_data_t
#endif
#if IA64_ITC_JITTER_OFFSET !=0