From 2a5b855c255e52cf074c37c00e0e2c1ede7b8251 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 2 Jul 2005 10:37:50 -0700
Subject: [PATCH] --- yaml --- r: 4059 b: refs/heads/master c:
 86166f9846590fa46f8e24e9346d002e938a8b81 h: refs/heads/master i:   4057:
 d4562465946c7cca7ca3e4f269e06beb107ba898   4055:
 e4fbe3b3b0f642b97ddc1bfb833eac7a5539a03f v: v3

---
 [refs]                              | 2 +-
 trunk/arch/alpha/kernel/irq_alpha.c | 2 ++
 trunk/arch/alpha/kernel/traps.c     | 2 +-
 trunk/drivers/acpi/pci_irq.c        | 2 +-
 trunk/fs/fat/cache.c                | 2 +-
 trunk/fs/fat/inode.c                | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 965b30f865df..1cf617df416b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db5795547694cf68388aaf8f59723e850f7466f6
+refs/heads/master: 86166f9846590fa46f8e24e9346d002e938a8b81
diff --git a/trunk/arch/alpha/kernel/irq_alpha.c b/trunk/arch/alpha/kernel/irq_alpha.c
index e6ded33c6e22..9d34ce26e5ef 100644
--- 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
index fd7bd17cc960..6f509a644bdd 100644
--- 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;
diff --git a/trunk/drivers/acpi/pci_irq.c b/trunk/drivers/acpi/pci_irq.c
index 8dbf802ee7f8..d1f42b972821 100644
--- a/trunk/drivers/acpi/pci_irq.c
+++ b/trunk/drivers/acpi/pci_irq.c
@@ -433,7 +433,7 @@ acpi_pci_irq_enable (
 		printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI",
 			pci_name(dev), ('A' + pin));
 		/* Interrupt Line values above 0xF are forbidden */
-		if (dev->irq >= 0 && (dev->irq <= 0xF)) {
+		if (dev->irq > 0 && (dev->irq <= 0xF)) {
 			printk(" - using IRQ %d\n", dev->irq);
 			acpi_register_gsi(dev->irq, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
 			return_VALUE(0);
diff --git a/trunk/fs/fat/cache.c b/trunk/fs/fat/cache.c
index 7c52e465a619..77c24fcf712a 100644
--- a/trunk/fs/fat/cache.c
+++ b/trunk/fs/fat/cache.c
@@ -56,7 +56,7 @@ int __init fat_cache_init(void)
 	return 0;
 }
 
-void __exit fat_cache_destroy(void)
+void fat_cache_destroy(void)
 {
 	if (kmem_cache_destroy(fat_cache_cachep))
 		printk(KERN_INFO "fat_cache: not all structures were freed\n");
diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c
index 3e31c4a736f1..96ae85b67eba 100644
--- a/trunk/fs/fat/inode.c
+++ b/trunk/fs/fat/inode.c
@@ -1327,7 +1327,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
 EXPORT_SYMBOL(fat_fill_super);
 
 int __init fat_cache_init(void);
-void __exit fat_cache_destroy(void);
+void fat_cache_destroy(void);
 
 static int __init init_fat_fs(void)
 {