---

yaml --- r: 4063 b: refs/heads/master c: 1d6bebf h: refs/heads/master i: 4061: 65f3906 4059: 2a5b855 4055: e4fbe3b 4047: 5aea849 4031: 072f9b8 v: v3
git-mirror · Jul 2, 2005 · 4a6b452 · 4a6b452
1 parent f83e74b
commit 4a6b452
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 823 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eee0d03e33b0294eb3165c96f213a8c8ee461a8
+refs/heads/master: 1d6bebf2ecf92924492c491d9c3a72edba95f907
diff --git a/trunk/arch/alpha/kernel/irq_alpha.c b/trunk/arch/alpha/kernel/irq_alpha.c
@@ -55,6 +55,8 @@ do_entInt(unsigned long type, unsigned long vector,
 #ifdef CONFIG_SMP
 	  {
 		long cpu;
+
+		local_irq_disable();
 		smp_percpu_timer_interrupt(regs);
 		cpu = smp_processor_id();
 		if (cpu != boot_cpuid) {

diff --git a/trunk/arch/alpha/kernel/traps.c b/trunk/arch/alpha/kernel/traps.c
@@ -240,7 +240,7 @@ do_entIF(unsigned long type, struct pt_regs *regs)
 	siginfo_t info;
 	int signo, code;
 
-	if (regs->ps == 0) {
+	if ((regs->ps & ~IPL_MAX) == 0) {
 		if (type == 1) {
 			const unsigned int *data
 			  = (const unsigned int *) regs->pc;