diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 02:44:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 02:44:08 +0100 |
| commit | c0d362a832ee70435fc4555a64f820893b1da0bd (patch) | |
| tree | 162497df64451936dfdb70f972dd7849d3e3e520 /arch/powerpc/include/asm/paca.h | |
| parent | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (diff) | |
| parent | f78628374a13bc150db77c6e02d4f2c0a7f932ef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core
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 082b3aedf14..6ef05572301 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -99,6 +99,7 @@ struct paca_struct { u8 soft_enabled; /* irq soft-enable flag */ u8 hard_enabled; /* set if irqs are enabled in MSR */ u8 io_sync; /* writel() needs spin_unlock sync */ + u8 perf_counter_pending; /* PM interrupt while soft-disabled */ /* Stuff for accurate time accounting */ u64 user_time; /* accumulated usermode TB ticks */ |