From: Yinghai Lu Subject: [PATCH for linus tree] ACPI: remove duplicated lines of merging problems with acpi_processor_add Date: Tue, 7 Feb 2012 08:20:37 -0800 Message-ID: <1328631637-9488-2-git-send-email-yinghai@kernel.org> References: <1328631637-9488-1-git-send-email-yinghai@kernel.org> Return-path: Received: from rcsinet15.oracle.com ([148.87.113.117]:25166 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754126Ab2BGQVL (ORCPT ); Tue, 7 Feb 2012 11:21:11 -0500 In-Reply-To: <1328631637-9488-1-git-send-email-yinghai@kernel.org> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Len Brown , Greg Kroah-Hartman Cc: linux-acpi@vger.kernel.org, Yinghai Lu , Linus Torvalds , Thomas Renninger Those lines have two copies. Not sure how it could happen, looks like git problem. Signed-off-by: Yinghai Lu Cc: Linus Torvalds Cc: Thomas Renninger --- drivers/acpi/processor_driver.c | 7 ------- 1 file changed, 7 deletions(-) Index: linux-2.6/drivers/acpi/processor_driver.c =================================================================== --- linux-2.6.orig/drivers/acpi/processor_driver.c +++ linux-2.6/drivers/acpi/processor_driver.c @@ -586,13 +586,6 @@ static int __cpuinit acpi_processor_add( if (pr->flags.need_hotplug_init) return 0; - /* - * Do not start hotplugged CPUs now, but when they - * are onlined the first time - */ - if (pr->flags.need_hotplug_init) - return 0; - result = acpi_processor_start(pr); if (result) goto err_remove_sysfs;