From 4b6960eb62cd1d0f834f457852ec70c4a1a98e21 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Sat, 20 Aug 2005 23:02:55 +0000 Subject: [PATCH] - remove last vestiges of CKRM --- include/asm-alpha/relay.h | 5 -- include/asm-arm/relay.h | 5 -- include/asm-arm26/relay.h | 5 -- include/asm-cris/relay.h | 5 -- include/asm-generic/relay.h | 76 ------------------------- include/asm-h8300/relay.h | 5 -- include/asm-i386/relay.h | 101 ---------------------------------- include/asm-ia64/relay.h | 5 -- include/asm-m68k/relay.h | 5 -- include/asm-m68knommu/relay.h | 5 -- include/asm-mips/relay.h | 5 -- include/asm-mips64/relay.h | 5 -- include/asm-parisc/relay.h | 5 -- include/asm-ppc/relay.h | 5 -- include/asm-ppc64/relay.h | 5 -- include/asm-s390/relay.h | 5 -- include/asm-sh/relay.h | 5 -- include/asm-sparc/relay.h | 5 -- include/asm-sparc64/relay.h | 5 -- include/asm-v850/relay.h | 5 -- include/asm-x86_64/relay.h | 5 -- 21 files changed, 272 deletions(-) delete mode 100644 include/asm-alpha/relay.h delete mode 100644 include/asm-arm/relay.h delete mode 100644 include/asm-arm26/relay.h delete mode 100644 include/asm-cris/relay.h delete mode 100644 include/asm-generic/relay.h delete mode 100644 include/asm-h8300/relay.h delete mode 100644 include/asm-i386/relay.h delete mode 100644 include/asm-ia64/relay.h delete mode 100644 include/asm-m68k/relay.h delete mode 100644 include/asm-m68knommu/relay.h delete mode 100644 include/asm-mips/relay.h delete mode 100644 include/asm-mips64/relay.h delete mode 100644 include/asm-parisc/relay.h delete mode 100644 include/asm-ppc/relay.h delete mode 100644 include/asm-ppc64/relay.h delete mode 100644 include/asm-s390/relay.h delete mode 100644 include/asm-sh/relay.h delete mode 100644 include/asm-sparc/relay.h delete mode 100644 include/asm-sparc64/relay.h delete mode 100644 include/asm-v850/relay.h delete mode 100644 include/asm-x86_64/relay.h diff --git a/include/asm-alpha/relay.h b/include/asm-alpha/relay.h deleted file mode 100644 index 104091f06..000000000 --- a/include/asm-alpha/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_ALPHA_RELAY_H -#define _ASM_ALPHA_RELAY_H - -#include -#endif diff --git a/include/asm-arm/relay.h b/include/asm-arm/relay.h deleted file mode 100644 index f9913f1b1..000000000 --- a/include/asm-arm/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_ARM_RELAY_H -#define _ASM_ARM_RELAY_H - -#include -#endif diff --git a/include/asm-arm26/relay.h b/include/asm-arm26/relay.h deleted file mode 100644 index f9913f1b1..000000000 --- a/include/asm-arm26/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_ARM_RELAY_H -#define _ASM_ARM_RELAY_H - -#include -#endif diff --git a/include/asm-cris/relay.h b/include/asm-cris/relay.h deleted file mode 100644 index 30ee42c13..000000000 --- a/include/asm-cris/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_CRIS_RELAY_H -#define _ASM_CRIS_RELAY_H - -#include -#endif diff --git a/include/asm-generic/relay.h b/include/asm-generic/relay.h deleted file mode 100644 index c6d8dead8..000000000 --- a/include/asm-generic/relay.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef _ASM_GENERIC_RELAY_H -#define _ASM_GENERIC_RELAY_H -/* - * linux/include/asm-generic/relay.h - * - * Copyright (C) 2002, 2003 - Tom Zanussi (zanussi@us.ibm.com), IBM Corp - * Copyright (C) 2002 - Karim Yaghmour (karim@opersys.com) - * - * Architecture-independent definitions for relayfs - */ - -#include - -/** - * get_time_delta - utility function for getting time delta - * @now: pointer to a timeval struct that may be given current time - * @rchan: the channel - * - * Returns the time difference between the current time and the buffer - * start time. - */ -static inline u32 -get_time_delta(struct timeval *now, struct rchan *rchan) -{ - u32 time_delta; - - do_gettimeofday(now); - time_delta = calc_time_delta(now, &rchan->buf_start_time); - - return time_delta; -} - -/** - * get_timestamp - utility function for getting a time and TSC pair - * @now: current time - * @tsc: the TSC associated with now - * @rchan: the channel - * - * Sets the value pointed to by now to the current time. Value pointed to - * by tsc is not set since there is no generic TSC support. - */ -static inline void -get_timestamp(struct timeval *now, - u32 *tsc, - struct rchan *rchan) -{ - do_gettimeofday(now); -} - -/** - * get_time_or_tsc: - Utility function for getting a time or a TSC. - * @now: current time - * @tsc: current TSC - * @rchan: the channel - * - * Sets the value pointed to by now to the current time. - */ -static inline void -get_time_or_tsc(struct timeval *now, - u32 *tsc, - struct rchan *rchan) -{ - do_gettimeofday(now); -} - -/** - * have_tsc - does this platform have a useable TSC? - * - * Returns 0. - */ -static inline int -have_tsc(void) -{ - return 0; -} -#endif diff --git a/include/asm-h8300/relay.h b/include/asm-h8300/relay.h deleted file mode 100644 index 34ebfdd2f..000000000 --- a/include/asm-h8300/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_H8300_RELAY_H -#define _ASM_H8300_RELAY_H - -#include -#endif diff --git a/include/asm-i386/relay.h b/include/asm-i386/relay.h deleted file mode 100644 index 98e5b7246..000000000 --- a/include/asm-i386/relay.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef _ASM_I386_RELAY_H -#define _ASM_I386_RELAY_H -/* - * linux/include/asm-i386/relay.h - * - * Copyright (C) 2002, 2003 - Tom Zanussi (zanussi@us.ibm.com), IBM Corp - * Copyright (C) 2002 - Karim Yaghmour (karim@opersys.com) - * - * i386 definitions for relayfs - */ - -#include - -#ifdef CONFIG_X86_TSC -#include - -/** - * get_time_delta - utility function for getting time delta - * @now: pointer to a timeval struct that may be given current time - * @rchan: the channel - * - * Returns either the TSC if TSCs are being used, or the time and the - * time difference between the current time and the buffer start time - * if TSCs are not being used. - */ -static inline u32 -get_time_delta(struct timeval *now, struct rchan *rchan) -{ - u32 time_delta; - - if ((using_tsc(rchan) == 1) && cpu_has_tsc) - rdtscl(time_delta); - else { - do_gettimeofday(now); - time_delta = calc_time_delta(now, &rchan->buf_start_time); - } - - return time_delta; -} - -/** - * get_timestamp - utility function for getting a time and TSC pair - * @now: current time - * @tsc: the TSC associated with now - * @rchan: the channel - * - * Sets the value pointed to by now to the current time and the value - * pointed to by tsc to the tsc associated with that time, if the - * platform supports TSC. - */ -static inline void -get_timestamp(struct timeval *now, - u32 *tsc, - struct rchan *rchan) -{ - do_gettimeofday(now); - - if ((using_tsc(rchan) == 1) && cpu_has_tsc) - rdtscl(*tsc); -} - -/** - * get_time_or_tsc - utility function for getting a time or a TSC - * @now: current time - * @tsc: current TSC - * @rchan: the channel - * - * Sets the value pointed to by now to the current time or the value - * pointed to by tsc to the current tsc, depending on whether we're - * using TSCs or not. - */ -static inline void -get_time_or_tsc(struct timeval *now, - u32 *tsc, - struct rchan *rchan) -{ - if ((using_tsc(rchan) == 1) && cpu_has_tsc) - rdtscl(*tsc); - else - do_gettimeofday(now); -} - -/** - * have_tsc - does this platform have a useable TSC? - * - * Returns 1 if this platform has a useable TSC counter for - * timestamping purposes, 0 otherwise. - */ -static inline int -have_tsc(void) -{ - if (cpu_has_tsc) - return 1; - else - return 0; -} - -#else /* No TSC support (#ifdef CONFIG_X86_TSC) */ -#include -#endif /* #ifdef CONFIG_X86_TSC */ -#endif diff --git a/include/asm-ia64/relay.h b/include/asm-ia64/relay.h deleted file mode 100644 index 1d7628ec6..000000000 --- a/include/asm-ia64/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_IA64_RELAY_H -#define _ASM_IA64_RELAY_H - -#include -#endif diff --git a/include/asm-m68k/relay.h b/include/asm-m68k/relay.h deleted file mode 100644 index ec637ffb8..000000000 --- a/include/asm-m68k/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_M68K_RELAY_H -#define _ASM_M68K_RELAY_H - -#include -#endif diff --git a/include/asm-m68knommu/relay.h b/include/asm-m68knommu/relay.h deleted file mode 100644 index ef1afa6b2..000000000 --- a/include/asm-m68knommu/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_M68KNOMMU_RELAY_H -#define _ASM_M68KNOMMU_RELAY_H - -#include -#endif diff --git a/include/asm-mips/relay.h b/include/asm-mips/relay.h deleted file mode 100644 index 37304bd30..000000000 --- a/include/asm-mips/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_RELAY_H -#define _ASM_RELAY_H - -#include -#endif diff --git a/include/asm-mips64/relay.h b/include/asm-mips64/relay.h deleted file mode 100644 index 37304bd30..000000000 --- a/include/asm-mips64/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_RELAY_H -#define _ASM_RELAY_H - -#include -#endif diff --git a/include/asm-parisc/relay.h b/include/asm-parisc/relay.h deleted file mode 100644 index cea0c777f..000000000 --- a/include/asm-parisc/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_PARISC_RELAY_H -#define _ASM_PARISC_RELAY_H - -#include -#endif diff --git a/include/asm-ppc/relay.h b/include/asm-ppc/relay.h deleted file mode 100644 index c5b8526a7..000000000 --- a/include/asm-ppc/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_PPC_RELAY_H -#define _ASM_PPC_RELAY_H - -#include -#endif diff --git a/include/asm-ppc64/relay.h b/include/asm-ppc64/relay.h deleted file mode 100644 index 3c428ef02..000000000 --- a/include/asm-ppc64/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_PPC64_RELAY_H -#define _ASM_PPC64_RELAY_H - -#include -#endif diff --git a/include/asm-s390/relay.h b/include/asm-s390/relay.h deleted file mode 100644 index 502eb3b58..000000000 --- a/include/asm-s390/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_S390_RELAY_H -#define _ASM_S390_RELAY_H - -#include -#endif diff --git a/include/asm-sh/relay.h b/include/asm-sh/relay.h deleted file mode 100644 index fd8b76416..000000000 --- a/include/asm-sh/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_SH_RELAY_H -#define _ASM_SH_RELAY_H - -#include -#endif diff --git a/include/asm-sparc/relay.h b/include/asm-sparc/relay.h deleted file mode 100644 index 2141eac01..000000000 --- a/include/asm-sparc/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_SPARC_RELAY_H -#define _ASM_SPARC_RELAY_H - -#include -#endif diff --git a/include/asm-sparc64/relay.h b/include/asm-sparc64/relay.h deleted file mode 100644 index 72ea16410..000000000 --- a/include/asm-sparc64/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_SPARC64_RELAY_H -#define _ASM_SPARC64_RELAY_H - -#include -#endif diff --git a/include/asm-v850/relay.h b/include/asm-v850/relay.h deleted file mode 100644 index 869a53890..000000000 --- a/include/asm-v850/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __V850_RELAY_H -#define __V850_RELAY_H - -#include -#endif diff --git a/include/asm-x86_64/relay.h b/include/asm-x86_64/relay.h deleted file mode 100644 index d8b1b8859..000000000 --- a/include/asm-x86_64/relay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ASM_X86_64_RELAY_H -#define _ASM_X86_64_RELAY_H - -#include -#endif -- 2.47.0