From ff3098df19bec1060f818abab3a3ce4150a92b68 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 20 Apr 2006 10:11:09 -0700 Subject: [PATCH] --- yaml --- r: 26263 b: refs/heads/master c: cbf283c048798ada7e062892b21de85fb5727243 h: refs/heads/master i: 26261: b11de906bf48041e40bedc6243acc9007ab9b10d 26259: b90202f6485594ca89866c0bb24646d6d164e822 26255: 4516dc3a1820ee09139f6d1245670a6b99b66fa7 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/topology.c | 7 ++----- trunk/arch/ia64/sn/kernel/xpc_partition.c | 8 ++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 657884b9f700..a774cd66ef7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6180deb1da5d087341fb5a3c1a15e61492dcd6b +refs/heads/master: cbf283c048798ada7e062892b21de85fb5727243 diff --git a/trunk/arch/ia64/kernel/topology.c b/trunk/arch/ia64/kernel/topology.c index b47476d655f1..e9b628ba64e5 100644 --- a/trunk/arch/ia64/kernel/topology.c +++ b/trunk/arch/ia64/kernel/topology.c @@ -305,13 +305,10 @@ static struct kobj_type cache_ktype_percpu_entry = { static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu) { - if (all_cpu_cache_info[cpu].cache_leaves) { - kfree(all_cpu_cache_info[cpu].cache_leaves); - all_cpu_cache_info[cpu].cache_leaves = NULL; - } + kfree(all_cpu_cache_info[cpu].cache_leaves); + all_cpu_cache_info[cpu].cache_leaves = NULL; all_cpu_cache_info[cpu].num_cache_leaves = 0; memset(&all_cpu_cache_info[cpu].kobj, 0, sizeof(struct kobject)); - return; } diff --git a/trunk/arch/ia64/sn/kernel/xpc_partition.c b/trunk/arch/ia64/sn/kernel/xpc_partition.c index 94211429fd0c..2a89cfce4954 100644 --- a/trunk/arch/ia64/sn/kernel/xpc_partition.c +++ b/trunk/arch/ia64/sn/kernel/xpc_partition.c @@ -136,9 +136,7 @@ xpc_get_rsvd_page_pa(int nasid) } if (L1_CACHE_ALIGN(len) > buf_len) { - if (buf_base != NULL) { - kfree(buf_base); - } + kfree(buf_base); buf_len = L1_CACHE_ALIGN(len); buf = (u64) xpc_kmalloc_cacheline_aligned(buf_len, GFP_KERNEL, &buf_base); @@ -159,9 +157,7 @@ xpc_get_rsvd_page_pa(int nasid) } } - if (buf_base != NULL) { - kfree(buf_base); - } + kfree(buf_base); if (status != SALRET_OK) { rp_pa = 0;