diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 15:50:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 15:50:20 -0700 |
| commit | e4903fb59590f86190280a549420f6cb85bd7f7e (patch) | |
| tree | 48a299a5e61d7645811f804d1a5bfeb408bfb202 /include/asm-ia64/processor.h | |
| parent | 6a28a05f9b1b4db920e390ac89968ed6d2e4b8ec (diff) | |
| parent | cb2e0912f714b116812ef5834b5ba80d894ac967 (diff) | |
| download | talos-obmc-linux-e4903fb59590f86190280a549420f6cb85bd7f7e.tar.gz talos-obmc-linux-e4903fb59590f86190280a549420f6cb85bd7f7e.zip | |
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] Nail two more simple section mismatch errors
[IA64] fix section mismatch warnings
[IA64] rename partial_page
[IA64] Ensure that machvec is set up takes place before serial console
[IA64] vector-domain - fix vector_table
[IA64] vector-domain - handle assign_irq_vector(AUTO_ASSIGN)
Diffstat (limited to 'include/asm-ia64/processor.h')
| -rw-r--r-- | include/asm-ia64/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index 6251c76437d2..be3b0ae43270 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h @@ -220,7 +220,7 @@ struct desc_struct { #define TLS_SIZE (GDT_ENTRY_TLS_ENTRIES * 8) -struct partial_page_list; +struct ia64_partial_page_list; #endif struct thread_struct { @@ -242,7 +242,7 @@ struct thread_struct { __u64 fdr; /* IA32 fp except. data reg */ __u64 old_k1; /* old value of ar.k1 */ __u64 old_iob; /* old IOBase value */ - struct partial_page_list *ppl; /* partial page list for 4K page size issue */ + struct ia64_partial_page_list *ppl; /* partial page list for 4K page size issue */ /* cached TLS descriptors. */ struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; |
