summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2002-04-21 23:10:18 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-04-21 23:10:18 -0700
commit8018e670c7b3249ac3602350e28a52453a930a18 (patch)
tree378c90f980ffb4afce025a128631dd72662c8757 /kernel
parent97f642532a88cdf94ec49a38b4fdeb1d9ffc5fa5 (diff)
[PATCH] 2.5.7 adjtimex and SINGLESHOT
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/time.c b/kernel/time.c
index e1a141a78b9f..05a005c3a012 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -216,6 +216,11 @@ int do_adjtimex(struct timex *txc)
/* Now we validate the data before disabling interrupts */
+ if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT)
+ /* singleshot must not be used with any other mode bits */
+ if (txc->modes != ADJ_OFFSET_SINGLESHOT)
+ return -EINVAL;
+
if (txc->modes != ADJ_OFFSET_SINGLESHOT && (txc->modes & ADJ_OFFSET))
/* adjustment Offset limited to +- .512 seconds */
if (txc->offset <= - MAXPHASE || txc->offset >= MAXPHASE )