Adeos for Linux 2.6.19 PowerPC kernels.

diff -Naur linux-2.6.19.2.orig/arch/powerpc/kernel/head_booke.h linux-2.6.19.2/arch/powerpc/kernel/head_booke.h
@@ -187,6 +187,12 @@
 	EXC_XFER_TEMPLATE(hdlr, n, MSR_KERNEL, NOCOPY, transfer_to_handler_full, \
 			  ret_from_except_full)
 
+#ifdef CONFIG_IPIPE
+#define EXC_XFER_IPIPE(n, hdlr)         \
+       EXC_XFER_TEMPLATE(hdlr, n+1, MSR_KERNEL, NOCOPY, transfer_to_handler, \
+                         __ipipe_ret_from_except)
+#endif /* CONFIG_IPIPE */
+
 #define EXC_XFER_LITE(n, hdlr)		\
 	EXC_XFER_TEMPLATE(hdlr, n+1, MSR_KERNEL, NOCOPY, transfer_to_handler, \
 			  ret_from_except)

@@ -345,6 +351,15 @@
 	addi	r3,r1,STACK_FRAME_OVERHEAD;				      \
 	EXC_XFER_STD(0x0700, program_check_exception)
 
+#ifdef CONFIG_IPIPE
+#define DECREMENTER_EXCEPTION                                                \
+        START_EXCEPTION(Decrementer)                                          \
+        NORMAL_EXCEPTION_PROLOG;                                              \
+        lis     r0,TSR_DIS@h;           /* Setup the DEC interrupt mask */    \
+        mtspr   SPRN_TSR,r0;            /* Clear the DEC interrupt */         \
+        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
+        EXC_XFER_IPIPE(0x0900, __ipipe_grab_timer)
+#else /* !CONFIG_IPIPE */
 #define DECREMENTER_EXCEPTION						      \
 	START_EXCEPTION(Decrementer)					      \
 	NORMAL_EXCEPTION_PROLOG;					      \

@@ -352,6 +367,7 @@
 	mtspr   SPRN_TSR,r0;		/* Clear the DEC interrupt */	      \
 	addi    r3,r1,STACK_FRAME_OVERHEAD;				      \
 	EXC_XFER_LITE(0x0900, timer_interrupt)
+#endif /* CONFIG_IPIPE */
 
 #define FP_UNAVAILABLE_EXCEPTION					      \
 	START_EXCEPTION(FloatingPointUnavailable)			      \

diff -Naur linux-2.6.19.2.orig/arch/powerpc/kernel/idle.c linux-2.6.19.2/arch/powerpc/kernel/idle.c
@@ -51,6 +51,7 @@
 	while (1) {
 		while (!need_resched() && !cpu_should_die()) {
 			ppc64_runlatch_off();
+			ipipe_suspend_domain();
 
 			if (ppc_md.power_save) {
 				clear_thread_flag(TIF_POLLING_NRFLAG);

@@ -59,13 +60,21 @@
 				 * is ordered w.r.t. need_resched() test.
 				 */
 				smp_mb();
+#ifdef CONFIG_IPIPE
+				local_irq_disable_hw();
+#else /* !CONFIG_IPIPE */
 				local_irq_disable();
+#endif /* CONFIG_IPIPE */
 
 				/* check again after disabling irqs */
 				if (!need_resched() && !cpu_should_die())
 					ppc_md.power_save();
 
+#ifdef CONFIG_IPIPE
+				local_irq_enable_hw();
+#else /* !CONFIG_IPIPE */
 				local_irq_enable();
+#endif /* CONFIG_IPIPE */
 				set_thread_flag(TIF_POLLING_NRFLAG);
 
 			} else {

264 lines not on this page · raw message

491 lines not on this page · raw message

diff -Naur linux-2.6.19.2.orig/arch/powerpc/kernel/irq.c linux-2.6.19.2/arch/powerpc/kernel/irq.c
@@ -69,7 +69,11 @@
 #endif
 
 int __irq_offset_value;
+#ifdef CONFIG_IPIPE
+int ppc_spurious_interrupts;
+#else /* !CONFIG_IPIPE */
 static int ppc_spurious_interrupts;
+#endif /* CONFIG_IPIPE */
 
 #ifdef CONFIG_PPC32
 EXPORT_SYMBOL(__irq_offset_value);

diff -Naur linux-2.6.19.2.orig/arch/powerpc/kernel/setup_32.c linux-2.6.19.2/arch/powerpc/kernel/setup_32.c
@@ -88,7 +88,7 @@
  * from the address that it was linked at, so we must use RELOC/PTRRELOC
  * to access static data (including strings).  -- paulus
  */
-unsigned long __init early_init(unsigned long dt_ptr)
+notrace unsigned long __init early_init(unsigned long dt_ptr)
 {
 	unsigned long offset = reloc_offset();
 	struct cpu_spec *spec;

diff -Naur linux-2.6.19.2.orig/arch/powerpc/kernel/time.c linux-2.6.19.2/arch/powerpc/kernel/time.c
@@ -296,7 +296,11 @@
 
 #else /* ! CONFIG_VIRT_CPU_ACCOUNTING */
 #define calc_cputime_factors()
+#ifdef CONFIG_IPIPE
+#define account_process_time(regs)      update_process_times(user_mode(__ipipe_tick_regs + smp_processor_id()))
+#else
 #define account_process_time(regs)	update_process_times(user_mode(regs))
+#endif /* CONFIG_IPIPE */
 #define calculate_steal_time()		do { } while (0)
 #endif
 

@@ -669,10 +673,17 @@
 		}
 		write_sequnlock(&xtime_lock);
 	}
-	
+
+#ifdef CONFIG_IPIPE
+	if (__ipipe_decr_ticks == tb_ticks_per_jiffy) {
+		next_dec = tb_ticks_per_jiffy - ticks;
+		set_dec(next_dec);
+	}
+#else /* !CONFIG_IPIPE */
 	next_dec = tb_ticks_per_jiffy - ticks;
 	set_dec(next_dec);
-
+#endif /* CONFIG_IPIPE */
+        
 #ifdef CONFIG_PPC_ISERIES
 	if (hvlpevent_is_pending())
 		process_hvlpevents();

diff -Naur linux-2.6.19.2.orig/arch/powerpc/kernel/traps.c linux-2.6.19.2/arch/powerpc/kernel/traps.c
@@ -324,6 +324,9 @@
 	int recover = 0;
 	unsigned long reason = get_mc_reason(regs);
 
+        if (ipipe_trap_notify(IPIPE_TRAP_MCE,regs))
+                return;
+        
 	/* See if any machine dependent calls */
 	if (ppc_md.machine_check_exception)
 		recover = ppc_md.machine_check_exception(regs);

@@ -490,6 +493,10 @@
 
 void unknown_exception(struct pt_regs *regs)
 {
+        if (ipipe_trap_notify(IPIPE_TRAP_IABR,regs))
+                return;
+        if (ipipe_trap_notify(IPIPE_TRAP_UNKNOWN,regs))
+                return;
 	printk("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
 	       regs->nip, regs->msr, regs->trap);
 

@@ -508,13 +515,17 @@
 
 void RunModeException(struct pt_regs *regs)
 {
+        if (ipipe_trap_notify(IPIPE_TRAP_RM,regs))
+                return;
 	_exception(SIGTRAP, regs, 0, 0);
 }
 
 void __kprobes single_step_exception(struct pt_regs *regs)
 {
 	regs->msr &= ~(MSR_SE | MSR_BE);  /* Turn off 'trace' bits */
-
+        if (ipipe_trap_notify(IPIPE_TRAP_SSTEP,regs))
+                return;
+ 
 	if (notify_die(DIE_SSTEP, "single_step", regs, 5,
 					5, SIGTRAP) == NOTIFY_STOP)
 		return;

@@ -534,7 +545,9 @@
 {
 	if (single_stepping(regs)) {
 		clear_single_step(regs);
-		_exception(SIGTRAP, regs, TRAP_TRACE, 0);
+                if (ipipe_trap_notify(IPIPE_TRAP_SSTEP,regs))
+                    return;
+                _exception(SIGTRAP, regs, TRAP_TRACE, 0);
 	}
 }
 

@@ -786,6 +799,9 @@
 	unsigned int reason = get_reason(regs);
 	extern int do_mathemu(struct pt_regs *regs);
 
+        if (ipipe_trap_notify(IPIPE_TRAP_PCE,regs))
+                return;
+        
 #ifdef CONFIG_MATH_EMULATION
 	/* (reason & REASON_ILLEGAL) would be the obvious thing here,
 	 * but there seems to be a hardware bug on the 405GP (RevD)

@@ -855,6 +871,9 @@
 		return;
 	}
 
+        if (ipipe_trap_notify(IPIPE_TRAP_ALIGNMENT,regs))
+                return;
+        
 	/* Operand address was bad */
 	if (fixed == -EFAULT) {
 		sig = SIGSEGV;

@@ -880,6 +899,8 @@
 
 void nonrecoverable_exception(struct pt_regs *regs)
 {
+        if (ipipe_trap_notify(IPIPE_TRAP_NREC,regs))
+                return;
 	printk(KERN_ERR "Non-recoverable exception at PC=%lx MSR=%lx\n",
 	       regs->nip, regs->msr);
 	debugger(regs);

@@ -902,6 +923,9 @@
 
 void altivec_unavailable_exception(struct pt_regs *regs)
 {
+  	if (ipipe_trap_notify(IPIPE_TRAP_ALTUNAVAIL,regs))
+	    	return;
+
 	if (user_mode(regs)) {
 		/* A user program has executed an altivec instruction,
 		   but this kernel doesn't support altivec. */

@@ -926,6 +950,9 @@
 	extern int Soft_emulate_8xx(struct pt_regs *);
 	int errcode;
 
+        if (ipipe_trap_notify(IPIPE_TRAP_SOFTEMU,regs))
+                return;
+        
 	CHECK_FULL_REGS(regs);
 
 	if (!user_mode(regs)) {

@@ -954,6 +981,9 @@
 
 void DebugException(struct pt_regs *regs, unsigned long debug_status)
 {
+        if (ipipe_trap_notify(IPIPE_TRAP_DEBUG,regs))
+                return;
+
 	if (debug_status & DBSR_IC) {	/* instruction completion */
 		regs->msr &= ~MSR_DE;
 		if (user_mode(regs)) {

@@ -984,6 +1014,9 @@
 {
 	int err;
 
+        if (ipipe_trap_notify(IPIPE_TRAP_ALTASSIST,regs))
+	    	return;
+
 	if (!user_mode(regs)) {
 		printk(KERN_EMERG "VMX/Altivec assist exception in kernel mode"
 		       " at %lx\n", regs->nip);

@@ -1034,6 +1067,9 @@
 	int fpexc_mode;
 	int code = 0;
 
+        if (ipipe_trap_notify(IPIPE_TRAP_SPE,regs))
+	    	return;
+
 	spefscr = current->thread.spefscr;
 	fpexc_mode = current->thread.fpexc_mode;
 

diff -Naur linux-2.6.19.2.orig/arch/powerpc/mm/fault.c linux-2.6.19.2/arch/powerpc/mm/fault.c
@@ -175,6 +175,9 @@
 	is_write = error_code & ESR_DST;
 #endif /* CONFIG_4xx || CONFIG_BOOKE */
 
+        if (ipipe_trap_notify(IPIPE_TRAP_ACCESS,regs))
+	    	return 0;
+        
 	if (notify_page_fault(DIE_PAGE_FAULT, "page_fault", regs, error_code,
 				11, SIGSEGV) == NOTIFY_STOP)
 		return 0;

diff -Naur linux-2.6.19.2.orig/arch/powerpc/sysdev/ipic.c linux-2.6.19.2/arch/powerpc/sysdev/ipic.c
@@ -4,6 +4,7 @@
  * IPIC routines implementations.
  *
  * Copyright 2005 Freescale Semiconductor, Inc.
+ * Copyright (C) 2007 Benjamin Zores, Alain Grimmer (Adeos/powerpc 2.6 port).
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the

@@ -500,6 +501,14 @@
 	return 0;
 }
 
+#ifdef CONFIG_IPIPE
+static void ipic_end_irq(unsigned int irq)
+{
+	if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+		ipic_unmask_irq(irq);
+}
+#endif /* CONFIG_IPIPE */
+
 static struct irq_chip ipic_irq_chip = {
 	.typename	= " IPIC  ",
 	.unmask		= ipic_unmask_irq,

@@ -507,6 +516,9 @@
 	.mask_ack	= ipic_mask_irq_and_ack,
 	.ack		= ipic_ack_irq,
 	.set_type	= ipic_set_irq_type,
+#ifdef CONFIG_IPIPE
+        .end            = ipic_end_irq,
+#endif /* CONFIG_IPIPE */
 };
 
 static int ipic_host_match(struct irq_host *h, struct device_node *node)

174 lines not on this page · raw message

216 lines not on this page · raw message

diff -Naur linux-2.6.19.2.orig/include/asm-powerpc/irq.h linux-2.6.19.2/include/asm-powerpc/irq.h
@@ -11,7 +11,9 @@
 
 #include <linux/threads.h>
 #include <linux/list.h>
+#ifdef CONFIG_PPC_MERGE
 #include <linux/radix-tree.h>
+#endif
 
 #include <asm/types.h>
 #include <asm/atomic.h>

diff -Naur linux-2.6.19.2.orig/include/asm-ppc/pgalloc.h linux-2.6.19.2/include/asm-ppc/pgalloc.h
@@ -39,5 +39,10 @@
 
 #define check_pgt_cache()	do { } while (0)
 
+static inline void set_pgdir(unsigned long address, pgd_t entry)
+{
+    /* nop */
+}
+
 #endif /* _PPC_PGALLOC_H */
 #endif /* __KERNEL__ */

diff -Naur linux-2.6.19.2.orig/include/linux/hardirq.h linux-2.6.19.2/include/linux/hardirq.h
@@ -128,7 +128,20 @@
  */
 extern void irq_exit(void);
 
+#ifdef CONFIG_IPIPE
+#define nmi_enter() \
+do { \
+    if (ipipe_current_domain == ipipe_root_domain) \
+	{ lockdep_off(); irq_enter(); } \
+} while(0)
+#define nmi_exit() \
+do { \
+    if (ipipe_current_domain == ipipe_root_domain) \
+	{ __irq_exit(); lockdep_on(); } \
+} while(0)
+#else /* !CONFIG_IPIPE */
 #define nmi_enter()		do { lockdep_off(); irq_enter(); } while (0)
 #define nmi_exit()		do { __irq_exit(); lockdep_on(); } while (0)
+#endif /* CONFIG_IPIPE */
 
 #endif /* LINUX_HARDIRQ_H */

769 lines not on this page · raw message

diff -Naur linux-2.6.19.2.orig/include/linux/ipipe_trace.h linux-2.6.19.2/include/linux/ipipe_trace.h
@@ -0,0 +1,40 @@
+/* -*- linux-c -*-
+ * include/linux/ipipe_trace.h
+ *
+ * Copyright (C) 2005 Luotao Fu.
+ *               2005, 2006 Jan Kiszka.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ * USA; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _LINUX_IPIPE_TRACE_H
+#define _LINUX_IPIPE_TRACE_H
+
+#include <linux/types.h>
+
+void ipipe_trace_begin(unsigned long v);
+void ipipe_trace_end(unsigned long v);
+void ipipe_trace_freeze(unsigned long v);
+void ipipe_trace_special(unsigned char special_id, unsigned long v);
+void ipipe_trace_pid(pid_t pid, short prio);
+
+int ipipe_trace_max_reset(void);
+int ipipe_trace_frozen_reset(void);
+
+void ipipe_trace_panic_freeze(void);
+void ipipe_trace_panic_dump(void);
+
+#endif	/* !__LINUX_IPIPE_H */

diff -Naur linux-2.6.19.2.orig/include/linux/linkage.h linux-2.6.19.2/include/linux/linkage.h
@@ -64,4 +64,8 @@
 #define fastcall
 #endif
 
+#ifndef notrace
+#define notrace		__attribute__((no_instrument_function))
+#endif
+
 #endif

diff -Naur linux-2.6.19.2.orig/include/linux/preempt.h linux-2.6.19.2/include/linux/preempt.h
@@ -26,22 +26,37 @@
 
 asmlinkage void preempt_schedule(void);
 
+#ifdef CONFIG_IPIPE
+#include <asm/ipipe.h>
+DECLARE_PER_CPU(struct ipipe_domain *, ipipe_percpu_domain);
+extern struct ipipe_domain ipipe_root;
+#define ipipe_preempt_guard() (per_cpu(ipipe_percpu_domain, ipipe_processor_id()) == &ipipe_root)
+#else  /* !CONFIG_IPIPE */
+#define ipipe_preempt_guard()	1
+#endif /* CONFIG_IPIPE */
+
 #define preempt_disable() \
 do { \
-	inc_preempt_count(); \
-	barrier(); \
+	if (ipipe_preempt_guard()) { \
+		inc_preempt_count(); \
+		barrier(); \
+	} \
 } while (0)
 
 #define preempt_enable_no_resched() \
 do { \
-	barrier(); \
-	dec_preempt_count(); \
+	if (ipipe_preempt_guard()) { \
+		barrier(); \
+		dec_preempt_count(); \
+	} \
 } while (0)
 
 #define preempt_check_resched() \
 do { \
-	if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) \
-		preempt_schedule(); \
+	if (ipipe_preempt_guard()) { \
+		if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) \
+			preempt_schedule(); \
+	} \
 } while (0)
 
 #define preempt_enable() \

diff -Naur linux-2.6.19.2.orig/include/linux/radix-tree.h linux-2.6.19.2/include/linux/radix-tree.h
@@ -19,7 +19,9 @@
 #ifndef _LINUX_RADIX_TREE_H
 #define _LINUX_RADIX_TREE_H
 
+#ifndef CONFIG_PPC_MERGE
 #include <linux/sched.h>
+#endif /* CONFIG_PPC_MERGE */
 #include <linux/preempt.h>
 #include <linux/types.h>
 

diff -Naur linux-2.6.19.2.orig/include/linux/sched.h linux-2.6.19.2/include/linux/sched.h
@@ -43,6 +43,7 @@
 
 #include <asm/param.h>	/* for HZ */
 
+#include <linux/ipipe.h>
 #include <linux/capability.h>
 #include <linux/threads.h>
 #include <linux/kernel.h>

@@ -150,6 +151,14 @@
 /* in tsk->state again */
 #define TASK_NONINTERACTIVE	64
 #define TASK_DEAD		128
+#ifdef CONFIG_IPIPE
+#define TASK_ATOMICSWITCH	512
+#define TASK_NOWAKEUP		1024
+#else  /* !CONFIG_IPIPE */
+#define TASK_ATOMICSWITCH	0
+#define TASK_NOWAKEUP		0
+#endif /* CONFIG_IPIPE */
+
 
 #define __set_task_state(tsk, state_value)		\
 	do { (tsk)->state = (state_value); } while (0)

@@ -1023,6 +1032,9 @@
 #ifdef	CONFIG_TASK_DELAY_ACCT
 	struct task_delay_info *delays;
 #endif
+#ifdef CONFIG_IPIPE
+	void *ptd[IPIPE_ROOT_NPTDKEYS];
+#endif
 };
 
 static inline pid_t process_group(struct task_struct *tsk)

@@ -1115,6 +1127,11 @@
 #define PF_SPREAD_SLAB	0x02000000	/* Spread some slab caches over cpuset */
 #define PF_MEMPOLICY	0x10000000	/* Non-default NUMA mempolicy */
 #define PF_MUTEX_TESTER	0x20000000	/* Thread belongs to the rt mutex tester */
+#ifdef CONFIG_IPIPE
+#define PF_EVNOTIFY	0x40000000	/* Notify other domains about internal events */
+#else
+#define PF_EVNOTIFY	0
+#endif /* CONFIG_IPIPE */
 
 /*
  * Only the _current_ task can read/write to tsk->flags, but other

diff -Naur linux-2.6.19.2.orig/init/main.c linux-2.6.19.2/init/main.c
@@ -535,6 +535,11 @@
 	softirq_init();
 	timekeeping_init();
 	time_init();
+	/*
+	 * We need to wait for the interrupt and time subsystems to be
+	 * initialized before enabling the pipeline.
+	 */
+	ipipe_init();
 	profile_init();
 	if (!irqs_disabled())
 		printk("start_kernel(): bug: interrupts were enabled early\n");

@@ -683,6 +688,7 @@
 #ifdef CONFIG_SYSCTL
 	sysctl_init();
 #endif
+	ipipe_init_proc();
 
 	do_initcalls();
 }

diff -Naur linux-2.6.19.2.orig/kernel/exit.c linux-2.6.19.2/kernel/exit.c
@@ -914,6 +914,7 @@
 	taskstats_exit_send(tsk, tidstats, group_dead, mycpu);
 	taskstats_exit_free(tidstats);
 
+	ipipe_exit_notify(tsk);
 	exit_mm(tsk);
 
 	if (group_dead)

diff -Naur linux-2.6.19.2.orig/kernel/fork.c linux-2.6.19.2/kernel/fork.c
@@ -384,6 +384,7 @@
 	might_sleep();
 
 	if (atomic_dec_and_test(&mm->mm_users)) {
+		ipipe_cleanup_notify(mm);
 		exit_aio(mm);
 		exit_mmap(mm);
 		if (!list_empty(&mm->mmlist)) {

@@ -914,7 +915,7 @@
 {
 	unsigned long new_flags = p->flags;
 
-	new_flags &= ~(PF_SUPERPRIV | PF_NOFREEZE);
+	new_flags &= ~(PF_SUPERPRIV | PF_NOFREEZE | PF_EVNOTIFY);
 	new_flags |= PF_FORKNOEXEC;
 	if (!(clone_flags & CLONE_PTRACE))
 		p->ptrace = 0;

@@ -1258,6 +1259,15 @@
 	spin_unlock(&current->sighand->siglock);
 	write_unlock_irq(&tasklist_lock);
 	proc_fork_connector(p);
+#ifdef CONFIG_IPIPE
+	{
+		int k;
+		
+		for (k = 0; k < IPIPE_ROOT_NPTDKEYS; k++)
+			p->ptd[k] = NULL;
+	}
+#endif /* CONFIG_IPIPE */
+ 
 	return p;
 
 bad_fork_cleanup_namespaces:

202 lines not on this page · raw message

424 lines not on this page · raw message

1,245 lines not on this page · raw message

diff -Naur linux-2.6.19.2.orig/kernel/irq/handle.c linux-2.6.19.2/kernel/irq/handle.c

Lines of this file are not shown. View the raw message.

73 lines not on this page · raw message

72 lines not on this page · raw message

diff -Naur linux-2.6.19.2.orig/kernel/signal.c linux-2.6.19.2/kernel/signal.c

Lines of this file are not shown. View the raw message.

diff -Naur linux-2.6.19.2.orig/lib/smp_processor_id.c linux-2.6.19.2/lib/smp_processor_id.c

Lines of this file are not shown. View the raw message.

diff -Naur linux-2.6.19.2.orig/mm/vmalloc.c linux-2.6.19.2/mm/vmalloc.c

Lines of this file are not shown. View the raw message.

@@ -198,8 +198,14 @@
 do {					 	\
 	local_irq_enable_nohead(ipd);		\
 	if (ipd == ipipe_root_domain) {		\
-		((void (*)(unsigned, struct pt_regs *))			\
-		 ipd->irqs[irq].handler) (irq, __ipipe_tick_regs + cpuid); \
+		if (likely(!ipipe_virtual_irq_p(irq)))			\
+			((void (*)(unsigned, struct pt_regs *))		\
+			 ipd->irqs[irq].handler) (irq, __ipipe_tick_regs + cpuid); \
+		else {							\
+			irq_enter();					\
+			ipd->irqs[irq].handler(irq, ipd->irqs[irq].cookie);\
+			irq_exit();					\
+		}							\
 	} else {							\
 		__clear_bit(IPIPE_SYNC_FLAG, &cpudata->status);		\
 		ipd->irqs[irq].handler(irq,ipd->irqs[irq].cookie);	\

@@ -625,7 +625,9 @@
 #endif
 
 	old_regs = set_irq_regs(regs);
+#ifndef CONFIG_IPIPE
 	irq_enter();
+#endif
 
 	profile_tick(CPU_PROFILING);
 	calculate_steal_time();

@@ -686,7 +688,9 @@
 	}
 #endif
 
+#ifndef CONFIG_IPIPE
 	irq_exit();
+#endif
 	set_irq_regs(old_regs);
 }