Module: xenomai-gch
Branch: for-head
Commit: 149fbd8fbc8e898f65f7dc588905daddb89359b8
URL:
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=149fbd8fbc8e898f65f7dc588905daddb89359b8
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Mon Dec 14 12:06:51 2009 +0100
x86: fix phys_addr_t definition for linux 2.4 build
---
include/asm-generic/wrappers.h | 2 --
include/asm-powerpc/wrappers.h | 2 ++
include/asm-x86/wrappers_32.h | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/wrappers.h b/include/asm-generic/wrappers.h
index 198d882..ea798cf 100644
--- a/include/asm-generic/wrappers.h
+++ b/include/asm-generic/wrappers.h
@@ -319,8 +319,6 @@ static inline unsigned long hweight_long(unsigned long w)
unsigned long find_next_bit(const unsigned long *addr,
unsigned long size, unsigned long offset);
-typedef phys_addr_t resource_size_t;
-
#define mmiowb() barrier()
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
diff --git a/include/asm-powerpc/wrappers.h b/include/asm-powerpc/wrappers.h
index 7d98539..8df4a1f 100644
--- a/include/asm-powerpc/wrappers.h
+++ b/include/asm-powerpc/wrappers.h
@@ -53,6 +53,8 @@ static __inline__ int fls(unsigned int x)
return 32 - lz;
}
+typedef phys_addr_t resource_size_t;
+
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) */
#define wrap_phys_mem_prot(filp,pfn,size,prot) \
diff --git a/include/asm-x86/wrappers_32.h b/include/asm-x86/wrappers_32.h
index d16cf6d..90ccdc1 100644
--- a/include/asm-x86/wrappers_32.h
+++ b/include/asm-x86/wrappers_32.h
@@ -78,6 +78,10 @@ static inline int fls(int x)
return r+1;
}
+typedef unsigned long phys_addr_t;
+
+typedef phys_addr_t resource_size_t;
+
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) */
#define wrap_phys_mem_prot(filp,pfn,size,prot) (prot)
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
