diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/blackfin/include/asm/pda.h | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/blackfin/include/asm/pda.h')
| -rw-r--r-- | arch/blackfin/include/asm/pda.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/pda.h b/arch/blackfin/include/asm/pda.h index bd8d4a7efeb2..a67142740df0 100644 --- a/arch/blackfin/include/asm/pda.h +++ b/arch/blackfin/include/asm/pda.h | |||
| @@ -59,6 +59,7 @@ struct blackfin_pda { /* Per-processor Data Area */ | |||
| 59 | unsigned long icplb_fault_addr; | 59 | unsigned long icplb_fault_addr; |
| 60 | unsigned long retx; | 60 | unsigned long retx; |
| 61 | unsigned long seqstat; | 61 | unsigned long seqstat; |
| 62 | unsigned int __nmi_count; /* number of times NMI asserted on this CPU */ | ||
| 62 | }; | 63 | }; |
| 63 | 64 | ||
| 64 | extern struct blackfin_pda cpu_pda[]; | 65 | extern struct blackfin_pda cpu_pda[]; |