diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-03-21 08:22:56 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-21 08:22:56 -0800 |
| commit | 133a58c1fd97022690d53dd58df56579193cbc1d (patch) | |
| tree | 34e304eaf545cd7991580a7a30609f49c919eb52 /include/asm-ia64 | |
| parent | dc5cdd8ec146a60152f2264c8fe920ca5ecc71ea (diff) | |
| parent | 7aa6ba41362a7f888ad11fdcfe51ca8d92226cd3 (diff) | |
| download | linux-3.10-133a58c1fd97022690d53dd58df56579193cbc1d.tar.gz linux-3.10-133a58c1fd97022690d53dd58df56579193cbc1d.tar.bz2 linux-3.10-133a58c1fd97022690d53dd58df56579193cbc1d.zip | |
Pull sn2-reduce-kmalloc-wrap into release branch
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/sn/xpc.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/asm-ia64/sn/xpc.h b/include/asm-ia64/sn/xpc.h index df7f5f4f3cd..aa3b8ace903 100644 --- a/include/asm-ia64/sn/xpc.h +++ b/include/asm-ia64/sn/xpc.h @@ -1227,28 +1227,6 @@ xpc_map_bte_errors(bte_result_t error) -static inline void * -xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) -{ - /* see if kmalloc will give us cachline aligned memory by default */ - *base = kmalloc(size, flags); - if (*base == NULL) { - return NULL; - } - if ((u64) *base == L1_CACHE_ALIGN((u64) *base)) { - return *base; - } - kfree(*base); - - /* nope, we'll have to do it ourselves */ - *base = kmalloc(size + L1_CACHE_BYTES, flags); - if (*base == NULL) { - return NULL; - } - return (void *) L1_CACHE_ALIGN((u64) *base); -} - - /* * Check to see if there is any channel activity to/from the specified * partition. |