diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-13 11:01:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-13 11:01:41 -0400 |
| commit | 63b98080daa35f0d682db04f4fb7ada010888752 (patch) | |
| tree | 213e124c89a51bbb99dd8e07fb6eacc970bbdc99 /include/asm-powerpc/paca.h | |
| parent | 1883c5aba9973331e3ff0050e05707fe8e84fe0d (diff) | |
| parent | eeac5c142b8687e35780b11b54b4c2f95b1a2436 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption
[POWERPC] Fix MMIO ops to provide expected barrier behaviour
[POWERPC] Fix interrupt clearing in kdump shutdown sequence
[POWERPC] update prep_defconfig
[POWERPC] kdump: Support kernels having 64k page size.
[POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().
[POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx.
[POWERPC] Update defconfigs
Diffstat (limited to 'include/asm-powerpc/paca.h')
| -rw-r--r-- | include/asm-powerpc/paca.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h index 2d4585f06209..3d5d590bc4b0 100644 --- a/include/asm-powerpc/paca.h +++ b/include/asm-powerpc/paca.h | |||
| @@ -93,6 +93,7 @@ struct paca_struct { | |||
| 93 | u64 saved_r1; /* r1 save for RTAS calls */ | 93 | u64 saved_r1; /* r1 save for RTAS calls */ |
| 94 | u64 saved_msr; /* MSR saved here by enter_rtas */ | 94 | u64 saved_msr; /* MSR saved here by enter_rtas */ |
| 95 | u8 proc_enabled; /* irq soft-enable flag */ | 95 | u8 proc_enabled; /* irq soft-enable flag */ |
| 96 | u8 io_sync; /* writel() needs spin_unlock sync */ | ||
| 96 | 97 | ||
| 97 | /* Stuff for accurate time accounting */ | 98 | /* Stuff for accurate time accounting */ |
| 98 | u64 user_time; /* accumulated usermode TB ticks */ | 99 | u64 user_time; /* accumulated usermode TB ticks */ |