diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-10 01:00:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-10 01:00:51 -0500 |
| commit | f4cd87aabb51fcc709b0dacc05b718c400c64172 (patch) | |
| tree | b1710d9da7a42951db8c764f5101b68a45e369af /include/asm-ia64/pal.h | |
| parent | 271368b69b9e8042063d6c713423e84503bbdaa0 (diff) | |
| parent | e3a696e03c861f69627185dd235366b9a4403454 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] refresh config files
[IA64] put kdump_find_rsvd_region in __init
[IA64] Remove sparse warning from unwind code
[IA64] add missing syscall trace clear
[IA64] Cleanup in crash.c
[IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
[IA64] pci_get_legacy_ide_irq should return irq (not GSI)
[IA64] whitespace fixes for include/asm-ia64/sal.h
[IA64] Cache error recovery
[IA64] Proper handling of TLB errors from duplicate itr.d dropins
Diffstat (limited to 'include/asm-ia64/pal.h')
| -rw-r--r-- | include/asm-ia64/pal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h index e43021a99a20..67656ce767c2 100644 --- a/include/asm-ia64/pal.h +++ b/include/asm-ia64/pal.h | |||
| @@ -371,6 +371,7 @@ typedef u64 pal_mc_info_index_t; | |||
| 371 | * dependent | 371 | * dependent |
| 372 | */ | 372 | */ |
| 373 | 373 | ||
| 374 | #define PAL_TLB_CHECK_OP_PURGE 8 | ||
| 374 | 375 | ||
| 375 | typedef struct pal_process_state_info_s { | 376 | typedef struct pal_process_state_info_s { |
| 376 | u64 reserved1 : 2, | 377 | u64 reserved1 : 2, |