From dcb1bd742baa2f5ffdf71f652eb4d7cddb798365 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 6 Dec 2006 20:32:37 -0800
Subject: [PATCH] --- yaml --- r: 42670 b: refs/heads/master c:
 a120586873d3d64de93bd6d593d237e131994e58 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/kernel/acpi/cstate.c | 6 ++----
 trunk/block/blktrace.c               | 3 +--
 trunk/mm/allocpercpu.c               | 9 +++++----
 trunk/net/ipv6/af_inet6.c            | 6 ++----
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 2f1ca6d11f43..2a52c4f7447d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b30973f877fea1a3fb84e05599890fcc082a88e5
+refs/heads/master: a120586873d3d64de93bd6d593d237e131994e58
diff --git a/trunk/arch/i386/kernel/acpi/cstate.c b/trunk/arch/i386/kernel/acpi/cstate.c
index 4664b55f623e..12e937c1ce4b 100644
--- a/trunk/arch/i386/kernel/acpi/cstate.c
+++ b/trunk/arch/i386/kernel/acpi/cstate.c
@@ -156,10 +156,8 @@ static int __init ffh_cstate_init(void)
 
 static void __exit ffh_cstate_exit(void)
 {
-	if (cpu_cstate_entry) {
-		free_percpu(cpu_cstate_entry);
-		cpu_cstate_entry = NULL;
-	}
+	free_percpu(cpu_cstate_entry);
+	cpu_cstate_entry = NULL;
 }
 
 arch_initcall(ffh_cstate_init);
diff --git a/trunk/block/blktrace.c b/trunk/block/blktrace.c
index 74e02c04b2da..d3679dd1d220 100644
--- a/trunk/block/blktrace.c
+++ b/trunk/block/blktrace.c
@@ -394,8 +394,7 @@ static int blk_trace_setup(request_queue_t *q, struct block_device *bdev,
 	if (bt) {
 		if (bt->dropped_file)
 			debugfs_remove(bt->dropped_file);
-		if (bt->sequence)
-			free_percpu(bt->sequence);
+		free_percpu(bt->sequence);
 		if (bt->rchan)
 			relay_close(bt->rchan);
 		kfree(bt);
diff --git a/trunk/mm/allocpercpu.c b/trunk/mm/allocpercpu.c
index eaa9abeea536..b2486cf887a0 100644
--- a/trunk/mm/allocpercpu.c
+++ b/trunk/mm/allocpercpu.c
@@ -17,10 +17,9 @@
 void percpu_depopulate(void *__pdata, int cpu)
 {
 	struct percpu_data *pdata = __percpu_disguise(__pdata);
-	if (pdata->ptrs[cpu]) {
-		kfree(pdata->ptrs[cpu]);
-		pdata->ptrs[cpu] = NULL;
-	}
+
+	kfree(pdata->ptrs[cpu]);
+	pdata->ptrs[cpu] = NULL;
 }
 EXPORT_SYMBOL_GPL(percpu_depopulate);
 
@@ -123,6 +122,8 @@ EXPORT_SYMBOL_GPL(__percpu_alloc_mask);
  */
 void percpu_free(void *__pdata)
 {
+	if (unlikely(!__pdata))
+		return;
 	__percpu_depopulate_mask(__pdata, &cpu_possible_map);
 	kfree(__percpu_disguise(__pdata));
 }
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index 87c8f54872b7..e5cd83b2205d 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -720,10 +720,8 @@ snmp6_mib_free(void *ptr[2])
 {
 	if (ptr == NULL)
 		return;
-	if (ptr[0])
-		free_percpu(ptr[0]);
-	if (ptr[1])
-		free_percpu(ptr[1]);
+	free_percpu(ptr[0]);
+	free_percpu(ptr[1]);
 	ptr[0] = ptr[1] = NULL;
 }