diff --git a/src/rtapi/rtai_rtapi.c b/src/rtapi/rtai_rtapi.c
index 0d59e4f..1df45fb 100644
--- a/src/rtapi/rtai_rtapi.c
+++ b/src/rtapi/rtai_rtapi.c
@@ -655,10 +655,15 @@ static void wrapper(long task_id)
 static int rtapi_trap_handler(int vec, int signo, struct pt_regs *regs,
         void *task) {
     int self = rtapi_task_self();
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+    unsigned long eip = regs->ip;
+#else
+    unsigned long eip = regs->eip;
+#endif
     rtapi_print_msg(RTAPI_MSG_ERR,
        "RTAPI: Task %d[%p]: Fault with vec=%d, signo=%d ip=%08lx.\n"
        "RTAPI: This fault may not be recoverable without rebooting.\n",
-       self, task, vec, signo, regs->ip);
+       self, task, vec, signo, eip);
     rtapi_task_pause(self);
     return 0;
 }