Merge branch 'linux-2.6'

2006-09-14 07:07:18 +10:00
parent 3dd836a56d 63b98080da
commit c547fc28ab
295 changed files with 3615 additions and 2196 deletions
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -94,6 +94,7 @@ struct paca_struct {
 	u64 saved_r1;			/* r1 save for RTAS calls */
 	u64 saved_msr;			/* MSR saved here by enter_rtas */
 	u8 proc_enabled;		/* irq soft-enable flag */
+	u8 io_sync;			/* writel() needs spin_unlock sync */

 	/* Stuff for accurate time accounting */
 	u64 user_time;			/* accumulated usermode TB ticks */