- remove last vestiges of CKRM

diff --git a/include/asm-alpha/relay.h b/include/asm-alpha/relay.h
deleted file mode 100644 (file)
index 104091f..0000000
--- a/include/asm-alpha/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_ALPHA_RELAY_H
-#define _ASM_ALPHA_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-arm/relay.h b/include/asm-arm/relay.h
deleted file mode 100644 (file)
index f9913f1..0000000
--- a/include/asm-arm/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_ARM_RELAY_H
-#define _ASM_ARM_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-arm26/relay.h b/include/asm-arm26/relay.h
deleted file mode 100644 (file)
index f9913f1..0000000
--- a/include/asm-arm26/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_ARM_RELAY_H
-#define _ASM_ARM_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-cris/relay.h b/include/asm-cris/relay.h
deleted file mode 100644 (file)
index 30ee42c..0000000
--- a/include/asm-cris/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_CRIS_RELAY_H
-#define _ASM_CRIS_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-generic/relay.h b/include/asm-generic/relay.h
deleted file mode 100644 (file)
index c6d8dea..0000000
--- 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 <linux/relayfs_fs.h>
-
-/**
- *     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 (file)
index 34ebfdd..0000000
--- a/include/asm-h8300/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_H8300_RELAY_H
-#define _ASM_H8300_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-i386/relay.h b/include/asm-i386/relay.h
deleted file mode 100644 (file)
index 98e5b72..0000000
--- 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 <linux/relayfs_fs.h>
-
-#ifdef CONFIG_X86_TSC
-#include <asm/msr.h>
-
-/**
- *     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 <asm-generic/relay.h>
-#endif /* #ifdef CONFIG_X86_TSC */
-#endif

diff --git a/include/asm-ia64/relay.h b/include/asm-ia64/relay.h
deleted file mode 100644 (file)
index 1d7628e..0000000
--- a/include/asm-ia64/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_IA64_RELAY_H
-#define _ASM_IA64_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-m68k/relay.h b/include/asm-m68k/relay.h
deleted file mode 100644 (file)
index ec637ff..0000000
--- a/include/asm-m68k/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_M68K_RELAY_H
-#define _ASM_M68K_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-m68knommu/relay.h b/include/asm-m68knommu/relay.h
deleted file mode 100644 (file)
index ef1afa6..0000000
--- a/include/asm-m68knommu/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_M68KNOMMU_RELAY_H
-#define _ASM_M68KNOMMU_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-mips/relay.h b/include/asm-mips/relay.h
deleted file mode 100644 (file)
index 37304bd..0000000
--- a/include/asm-mips/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_RELAY_H
-#define _ASM_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-mips64/relay.h b/include/asm-mips64/relay.h
deleted file mode 100644 (file)
index 37304bd..0000000
--- a/include/asm-mips64/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_RELAY_H
-#define _ASM_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-parisc/relay.h b/include/asm-parisc/relay.h
deleted file mode 100644 (file)
index cea0c77..0000000
--- a/include/asm-parisc/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_PARISC_RELAY_H
-#define _ASM_PARISC_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-ppc/relay.h b/include/asm-ppc/relay.h
deleted file mode 100644 (file)
index c5b8526..0000000
--- a/include/asm-ppc/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_PPC_RELAY_H
-#define _ASM_PPC_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-ppc64/relay.h b/include/asm-ppc64/relay.h
deleted file mode 100644 (file)
index 3c428ef..0000000
--- a/include/asm-ppc64/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_PPC64_RELAY_H
-#define _ASM_PPC64_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-s390/relay.h b/include/asm-s390/relay.h
deleted file mode 100644 (file)
index 502eb3b..0000000
--- a/include/asm-s390/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_S390_RELAY_H
-#define _ASM_S390_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-sh/relay.h b/include/asm-sh/relay.h
deleted file mode 100644 (file)
index fd8b764..0000000
--- a/include/asm-sh/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_SH_RELAY_H
-#define _ASM_SH_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-sparc/relay.h b/include/asm-sparc/relay.h
deleted file mode 100644 (file)
index 2141eac..0000000
--- a/include/asm-sparc/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_SPARC_RELAY_H
-#define _ASM_SPARC_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-sparc64/relay.h b/include/asm-sparc64/relay.h
deleted file mode 100644 (file)
index 72ea164..0000000
--- a/include/asm-sparc64/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ASM_SPARC64_RELAY_H
-#define _ASM_SPARC64_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-v850/relay.h b/include/asm-v850/relay.h
deleted file mode 100644 (file)
index 869a538..0000000
--- a/include/asm-v850/relay.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef __V850_RELAY_H
-#define __V850_RELAY_H
-
-#include <asm-generic/relay.h>
-#endif

diff --git a/include/asm-x86_64/relay.h b/include/asm-x86_64/relay.h
deleted file mode 100644 (file)
index d8b1b88..0000000
--- 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 <asm-generic/relay.h>
-#endif