Module: xenomai-forge
Branch: master
Commit: be8f6a2ef9901a0e0815f10c926e3f9b423393e4
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=be8f6a2ef9901a0e0815f10c926e3f9b423393e4

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sat Dec 31 15:58:02 2011 +0100

blackfin: fix build

---

 include/asm-blackfin/syscall.h  |    2 --
 include/asm-blackfin/wrappers.h |    5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/asm-blackfin/syscall.h b/include/asm-blackfin/syscall.h
index c84d637..005d9a3 100644
--- a/include/asm-blackfin/syscall.h
+++ b/include/asm-blackfin/syscall.h
@@ -49,8 +49,6 @@
 #define __xn_reg_arg3(regs)   ((regs)->r2)
 #define __xn_reg_arg4(regs)   ((regs)->r3)
 #define __xn_reg_arg5(regs)   ((regs)->r4)
-#define __xn_reg_pc(regs)     ((regs)->pc)
-#define __xn_reg_pc(regs)     ((regs)->usp)
 
 #define __xn_reg_mux_p(regs)        ((__xn_reg_mux(regs) & 0xffff) == 
sc_nucleus_mux)
 #define __xn_mux_id(regs)           ((__xn_reg_mux(regs) >> 24) & 0xff)
diff --git a/include/asm-blackfin/wrappers.h b/include/asm-blackfin/wrappers.h
index d96c715..de59d2f 100644
--- a/include/asm-blackfin/wrappers.h
+++ b/include/asm-blackfin/wrappers.h
@@ -26,9 +26,8 @@
 
 #include <asm-generic/xenomai/wrappers.h> /* Read the generic portion. */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
-#undef CAN_ERR_MASK
-#endif
+#define __put_user_inatomic __put_user
+#define __get_user_inatomic __get_user
 
 #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