From 4e801c8352a095948474d9d09d13f3a6b6bf4ceb Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <tipecaml@gmail.com>
Date: Tue, 12 Feb 2013 05:01:53 +0100
Subject: [PATCH] --- yaml --- r: 349783 b: refs/heads/master c:
 4f8c85272c5e7ea1f2fe15d866835bc6f8fc996f h: refs/heads/master i:   349781:
 78b279130232bddf0209c3c03068811b16d84b2b   349779:
 ef80a9a4721961b1d8ac30fb61bfcfd55a10d6ce   349775:
 6e42df79f3f43f3bc5729765d1204e0c0ca0ce89 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/xen/pcpu.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 18b2de611ccb..838030d0c958 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13d2b4d11d69a92574a55bfd985cfb0ca77aebdc
+refs/heads/master: 4f8c85272c5e7ea1f2fe15d866835bc6f8fc996f
diff --git a/trunk/drivers/xen/pcpu.c b/trunk/drivers/xen/pcpu.c
index 067fcfa1723e..5a27a4599a4a 100644
--- a/trunk/drivers/xen/pcpu.c
+++ b/trunk/drivers/xen/pcpu.c
@@ -278,8 +278,7 @@ static int sync_pcpu(uint32_t cpu, uint32_t *max_cpu)
 	 * Only those at cpu present map has its sys interface.
 	 */
 	if (info->flags & XEN_PCPU_FLAGS_INVALID) {
-		if (pcpu)
-			unregister_and_remove_pcpu(pcpu);
+		unregister_and_remove_pcpu(pcpu);
 		return 0;
 	}