Merge cantab.net:/home/src/bklinux-2.6

into cantab.net:/home/src/ntfs-2.6

arch/i386/kernel/process.c

@@ -293,8 +293,12 @@ void exit_thread(void)
 
 	/* The process may have allocated an io port bitmap... nuke it. */
 	if (unlikely(NULL != tsk->thread.io_bitmap_ptr)) {
+		int cpu = get_cpu();
+		struct tss_struct *tss = init_tss + cpu;
 		kfree(tsk->thread.io_bitmap_ptr);
 		tsk->thread.io_bitmap_ptr = NULL;
+		tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET;
+		put_cpu();
 	}
 }
 

arch/x86_64/kernel/process.c

@@ -256,10 +256,11 @@ void exit_thread(void)
 {
 	struct task_struct *me = current;
 	if (me->thread.io_bitmap_ptr) { 
+		struct tss_struct *tss = init_tss + get_cpu();
 		kfree(me->thread.io_bitmap_ptr); 
 		me->thread.io_bitmap_ptr = NULL;
-		(init_tss + smp_processor_id())->io_bitmap_base = 
-			INVALID_IO_BITMAP_OFFSET;
+		tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET;
+		put_cpu();
 	}
 }
 

drivers/ide/ide-disk.c

@@ -1774,6 +1774,9 @@ static int idedisk_open(struct inode *inode, struct file *filp)
 
 static int ide_cacheflush_p(ide_drive_t *drive)
 {
+	if (!(drive->id->cfs_enable_2 & 0x3000))
+		return 0;
+
 	if(drive->wcache)
 	{
 		if (do_idedisk_flushcache(drive))