summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-01-09 20:52:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:01:35 -0800
commit0c4f6eeca98a805fd0c2536b55039383eb56d2ba (patch)
tree9f24c228b7035d348980072d9cd25fa1fbc08c73
parent199e7056895c8427dec63e1d9841ceafcfaaf314 (diff)
downloadlinux-0c4f6eeca98a805fd0c2536b55039383eb56d2ba.tar.gz
linux-0c4f6eeca98a805fd0c2536b55039383eb56d2ba.tar.bz2
linux-0c4f6eeca98a805fd0c2536b55039383eb56d2ba.zip
[PATCH] hrtimer: remove unused clock constants
remove unused CLOCK_ constants from time.h Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/time.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index 773b83ddd8ef..ea64cde7c450 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -104,12 +104,10 @@ struct itimerval {
/*
* The IDs of the various system clocks (for POSIX.1b interval timers).
*/
-#define CLOCK_REALTIME 0
-#define CLOCK_MONOTONIC 1
+#define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 1
#define CLOCK_PROCESS_CPUTIME_ID 2
#define CLOCK_THREAD_CPUTIME_ID 3
-#define CLOCK_REALTIME_HR 4
-#define CLOCK_MONOTONIC_HR 5
/*
* The IDs of various hardware clocks
@@ -118,9 +116,8 @@ struct itimerval {
#define CLOCK_SGI_CYCLE 10
#define MAX_CLOCKS 16
-#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC | \
- CLOCK_REALTIME_HR | CLOCK_MONOTONIC_HR)
-#define CLOCKS_MONO (CLOCK_MONOTONIC & CLOCK_MONOTONIC_HR)
+#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC)
+#define CLOCKS_MONO (CLOCK_MONOTONIC)
/*
* The various flags for setting POSIX.1b interval timers.