Module: xenomai-gch
Branch: for-head
Commit: fa011760e049d8baea7a2e9dbb24923cdfe62af8
URL:    
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=fa011760e049d8baea7a2e9dbb24923cdfe62af8

Author: Philippe Gerum <r...@xenomai.org>
Date:   Wed Dec 16 01:08:21 2009 +0100

wrappers: fix definition of phys_addr_t

---

 include/asm-generic/wrappers.h |    6 ------
 include/asm-powerpc/wrappers.h |    4 ++++
 include/asm-x86/wrappers_32.h  |    4 ++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/asm-generic/wrappers.h b/include/asm-generic/wrappers.h
index 198d882..ae36932 100644
--- a/include/asm-generic/wrappers.h
+++ b/include/asm-generic/wrappers.h
@@ -319,16 +319,10 @@ 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) */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-typedef unsigned long phys_addr_t;
-#endif
-
 #define compat_module_param_array(name, type, count, perm) \
        module_param_array(name, type, NULL, perm)
 
diff --git a/include/asm-powerpc/wrappers.h b/include/asm-powerpc/wrappers.h
index 7d98539..edab86c 100644
--- a/include/asm-powerpc/wrappers.h
+++ b/include/asm-powerpc/wrappers.h
@@ -30,6 +30,8 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 
+#include <asm/mmu.h>
+
 #define CONFIG_MMU 1
 
 #define wrap_phys_mem_prot(filp,pfn,size,prot)  \
@@ -53,6 +55,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

Reply via email to