From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751283AbVK3X6H (ORCPT ); Wed, 30 Nov 2005 18:58:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751284AbVK3X5d (ORCPT ); Wed, 30 Nov 2005 18:57:33 -0500 Received: from 213-239-205-147.clients.your-server.de ([213.239.205.147]:35490 "EHLO mail.tglx.de") by vger.kernel.org with ESMTP id S1751286AbVK3X5P (ORCPT ); Wed, 30 Nov 2005 18:57:15 -0500 Subject: [patch 06/43] Remove unused clock constants From: Thomas Gleixner Reply-To: tglx@linutronix.de To: linux-kernel@vger.kernel.org Cc: akpm@osdl.org, mingo@elte.hu, zippel@linux-m68k.org, george@mvista.com, johnstul@us.ibm.com References: <20051130231140.164337000@tglx.tec.linutronix.de> Content-Type: text/plain Organization: linutronix Date: Thu, 01 Dec 2005 01:02:57 +0100 Message-Id: <1133395377.32542.449.camel@tglx.tec.linutronix.de> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org plain text document attachment (time-h-remove-unused-clock-constants.patch) - remove unused CLOCK_ constants from time.h Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar include/linux/time.h | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) Index: linux-2.6.15-rc2-rework/include/linux/time.h =================================================================== --- linux-2.6.15-rc2-rework.orig/include/linux/time.h +++ linux-2.6.15-rc2-rework/include/linux/time.h @@ -103,12 +103,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 @@ -117,9 +115,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. --