Module: xenomai-2.5
Branch: refs/tags/v2.1-rc4
Commit: 61b2ca41036bb5b36b9a03f67370ed13f6689d6e
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=61b2ca41036bb5b36b9a03f67370ed13f6689d6e
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat Mar 4 12:02:59 2006 +0000
Discard obsolete rthal_get_root_host_task call
---
include/asm-arm/Makefile.in | 4 ++--
include/asm-arm/hal.h | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/asm-arm/Makefile.in b/include/asm-arm/Makefile.in
index 9db0ba5..d87dd28 100644
--- a/include/asm-arm/Makefile.in
+++ b/include/asm-arm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h
index c6d96b5..a288e4c 100644
--- a/include/asm-arm/hal.h
+++ b/include/asm-arm/hal.h
@@ -35,7 +35,8 @@
typedef unsigned long long rthal_time_t;
#if __LINUX_ARM_ARCH__ < 5
-static inline __attribute_const__ unsigned long ffnz (unsigned long x) {
+static inline __attribute_const__ unsigned long ffnz (unsigned long x)
+{
int r = 0;
if (!x)
@@ -63,7 +64,8 @@ static inline __attribute_const__ unsigned long ffnz
(unsigned long x) {
return r;
}
#else
-static inline __attribute_const__ unsigned long ffnz (unsigned long ul) {
+static inline __attribute_const__ unsigned long ffnz (unsigned long ul)
+{
int __r;
__asm__("clz\t%0, %1" : "=r" (__r) : "r"(ul & (-ul)) : "cc");
return 31 - __r;
@@ -87,17 +89,15 @@ extern spinlock_t irq_controller_lock;
#define rthal_grab_control() do { } while(0)
#define rthal_release_control() do { } while(0)
-static inline unsigned long long rthal_rdtsc (void) {
+static inline unsigned long long rthal_rdtsc (void)
+{
unsigned long long t;
rthal_read_tsc(t);
return t;
}
-static inline struct task_struct *rthal_root_host_task (int cpuid) {
- return current;
-}
-
-static inline struct task_struct *rthal_current_host_task (int cpuid) {
+static inline struct task_struct *rthal_current_host_task (int cpuid)
+{
return current;
}
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
