diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /include/asm-powerpc/paca.h | |
| parent | fea63e38013ec628ab3f7fddc4c2148064b7910a (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge branch 'master' into upstream
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 */ |