Description: Upstream changes introduced in version 3.8.1-2ubuntu1
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 rtai (3.8.1-2ubuntu1) natty; urgency=low
 .
   * First attempt to get it work for armel
 .
 The person named in the Author field signed this changelog entry.
Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- rtai-3.8.1.orig/base/include/asm-arm/rtai_hal.h
+++ rtai-3.8.1/base/include/asm-arm/rtai_hal.h
@@ -49,7 +49,6 @@
 #define _RTAI_ASM_ARM_HAL_H
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
 
 #define RTAI_SYSCALL_MODE
 
@@ -59,7 +58,6 @@
 #include <rtai_hal_names.h>
 #include <asm/rtai_vectors.h>
 #include <rtai_types.h>	
-#include <asm/div64.h>
 
 #define RTAI_NR_CPUS	1
 #define RTAI_NR_IRQS  IPIPE_NR_XIRQS
--- rtai-3.8.1.orig/base/include/asm-arm/rtai_atomic.h
+++ rtai-3.8.1/base/include/asm-arm/rtai_atomic.h
@@ -105,6 +105,7 @@ static inline unsigned long atomic_cmpxc
 		__asm__ __volatile__("@ atomic_cmpxchg\n"
 		"ldrex	%1, [%2]\n"
 		"teq	%1, %3\n"
+		"itt eq\n"
 		"strexeq %0, %4, [%2]\n"
 		    : "=&r" (res), "=&r" (oldval)
 		    : "r" (*(unsigned long*)ptr), "r" (old), "r" (new)