Fixups for previous changesets, avoid warnings etc.

arch/i386/kernel/bluesmoke.c

@@ -10,12 +10,14 @@
 #include <linux/config.h>
 #include <linux/irq.h>
 #include <linux/tqueue.h>
+
 #include <asm/processor.h> 
 #include <asm/system.h>
 #include <asm/msr.h>
 #include <asm/apic.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/hardirq.h>
 
 #ifdef CONFIG_X86_MCE
 

arch/i386/mm/ioremap.c

@@ -215,7 +215,7 @@ void iounmap(void *addr)
 	struct vm_struct *p;
 	if (addr <= high_memory) 
 		return; 
-	p = remove_kernel_area(PAGE_MASK & (unsigned long) addr); 
+	p = remove_kernel_area((void *) (PAGE_MASK & (unsigned long) addr));
 	if (!p) { 
 		printk("__iounmap: bad address %p\n", addr);
 		return;

fs/nfs/dir.c

@@ -833,7 +833,7 @@ static int nfs_safe_remove(struct dentry *dentry)
 {
 	struct inode *dir = dentry->d_parent->d_inode;
 	struct inode *inode = dentry->d_inode;
-	int error = -EBUSY, rehash = 0;
+	int error = -EBUSY;
 		
 	dfprintk(VFS, "NFS: safe_remove(%s/%s)\n",
 		dentry->d_parent->d_name.name, dentry->d_name.name);