diff options
author | akpm@linux-foundation.org <akpm@linux-foundation.org> | 2007-07-25 06:44:55 +0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-07-25 23:56:39 +0400 |
commit | 3b74d18e54e20fc1d398eb391bea5b9aed22aca5 (patch) | |
tree | ab0c4f72ce87ea02978799c9e3fdc79c05bd1c9b /include/asm-ia64/processor.h | |
parent | a07ee86205808d36973440e68c7277f9ed63b87f (diff) | |
download | linux-3b74d18e54e20fc1d398eb391bea5b9aed22aca5.tar.xz |
[IA64] rename partial_page
Jens has added a partial_page thing in splice whcih conflicts with the ia64
one. Rename ia64 out of the way. (ia64 chose poorly).
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
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]; |