powerpc: upgrade legacy I-pipe support to 2.4.25-ppc-2.2-01

ksrc/arch/powerpc/patches/adeos-ipipe-2.4.25-ppc-DENX-2.2-00.patch → ksrc/arch/powerpc/patches/adeos-ipipe-2.4.25-ppc-DENX-2.2-01.patch

@@ -1069,7 +1069,7 @@ index d90d323..513c65d 100644
  EXPORT_SYMBOL(timer_interrupt);
  EXPORT_SYMBOL(do_IRQ_intercept);
 diff --git a/arch/ppc/kernel/process.c b/arch/ppc/kernel/process.c
-index b78fee1..05b9286 100644
+index b78fee1..d39f5d7 100644
 --- a/arch/ppc/kernel/process.c
 +++ b/arch/ppc/kernel/process.c
 @@ -211,7 +211,7 @@ _switch_to(struct task_struct *prev, struct task_struct *new,
@@ -1081,16 +1081,22 @@ index b78fee1..05b9286 100644
  
  	__save_flags(s);
  	__cli();
-@@ -276,7 +276,9 @@ _switch_to(struct task_struct *prev, struct task_struct *new,
+@@ -219,6 +219,7 @@ _switch_to(struct task_struct *prev, struct task_struct *new,
+ 	check_stack(prev);
+ 	check_stack(new);
  #endif
- 	new_thread = &new->thread;
- 	old_thread = &current->thread;
 +	local_irq_save_hw_cond(flags);
+ 
+ #ifdef CONFIG_SMP
+ 	/* avoid complexity of lazy save/restore of fpu
+@@ -278,6 +279,7 @@ _switch_to(struct task_struct *prev, struct task_struct *new,
+ 	old_thread = &current->thread;
  	*last = _switch(old_thread, new_thread);
-+	local_irq_restore_hw_cond(flags);
  	__restore_flags(s);
++	local_irq_restore_hw_cond(flags);
  }
  
+ void show_regs(struct pt_regs * regs)
 diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
 index aa4eaff..6f37807 100644
 --- a/arch/ppc/kernel/traps.c
@@ -1336,7 +1342,7 @@ index 8f0e170..ba649dc 100644
  extern void do_lost_interrupts(unsigned long);
 diff --git a/include/asm-ppc/ipipe.h b/include/asm-ppc/ipipe.h
 new file mode 100644
-index 0000000..507617a
+index 0000000..448348c
 --- /dev/null
 +++ b/include/asm-ppc/ipipe.h
 @@ -0,0 +1,187 @@
@@ -1380,10 +1386,10 @@ index 0000000..507617a
 +#include <asm/irq.h>
 +#include <asm/bitops.h>
 +
-+#define IPIPE_ARCH_STRING	"2.2-00"
++#define IPIPE_ARCH_STRING	"2.2-01"
 +#define IPIPE_MAJOR_NUMBER	2
 +#define IPIPE_MINOR_NUMBER	2
-+#define IPIPE_PATCH_NUMBER	0
++#define IPIPE_PATCH_NUMBER	1
 +
 +#define prepare_arch_switch(next)			\
 +	do {						\