diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/powerpc/include/asm/paca.h | |
| parent | 37f9ef553bed630957e025504cdcbc76f5de49d5 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'arch/powerpc/include/asm/paca.h')
| -rw-r--r-- | arch/powerpc/include/asm/paca.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index 0ea1985bdb8b..c8a3cbfe02ff 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h | |||
| @@ -105,6 +105,7 @@ struct paca_struct { | |||
| 105 | u8 soft_enabled; /* irq soft-enable flag */ | 105 | u8 soft_enabled; /* irq soft-enable flag */ |
| 106 | u8 hard_enabled; /* set if irqs are enabled in MSR */ | 106 | u8 hard_enabled; /* set if irqs are enabled in MSR */ |
| 107 | u8 io_sync; /* writel() needs spin_unlock sync */ | 107 | u8 io_sync; /* writel() needs spin_unlock sync */ |
| 108 | u8 perf_counter_pending; /* PM interrupt while soft-disabled */ | ||
| 108 | 109 | ||
| 109 | /* Stuff for accurate time accounting */ | 110 | /* Stuff for accurate time accounting */ |
| 110 | u64 user_time; /* accumulated usermode TB ticks */ | 111 | u64 user_time; /* accumulated usermode TB ticks */ |