From patchwork Mon Dec 16 14:51:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 3354331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3F227C0D4A for ; Mon, 16 Dec 2013 14:52:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3701720172 for ; Mon, 16 Dec 2013 14:52:44 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 548EC2020E for ; Mon, 16 Dec 2013 14:52:39 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsZX8-0000dC-JL; Mon, 16 Dec 2013 14:52:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsZX6-0004nE-7o; Mon, 16 Dec 2013 14:52:32 +0000 Received: from mail-pa0-f54.google.com ([209.85.220.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsZX3-0004mu-HM for linux-arm-kernel@lists.infradead.org; Mon, 16 Dec 2013 14:52:30 +0000 Received: by mail-pa0-f54.google.com with SMTP id rd3so3028620pab.41 for ; Mon, 16 Dec 2013 06:52:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=spdcsS9Bj27rjihqO7x8BEjfdHv5RWynMtA2Uov8Ruc=; b=ds1b95eknBVtTodyiIE+4vkDX/sdyxa5zKpqrhaRJsqhkfGcLdeO+606wJeg49lDlW S6DeBwomM10ACo25uRz+4Mh6nkgQTlEZ8lxTiJ8jGQbTVgSxBy5eEmuM4pd0axytHi9I o5Jp5CkUqxy62R/Q13uqImqdqvAX7voDzEGs2KCFM4Oxx3EIywT9jqWMbApd+qpuHvrJ swM7silrFPDrQWg7ofuEM9DHFiZBnoV5g5ZNQ3QisXhIhKzwwzairAszg7RpnFU6n0u6 VBTlXYwCCLbPoILwB3oNDOzRMvSpjAkqiJG8P5E2zlRi/Mh6VMc0T/xaULdZK0iwlk12 XklQ== X-Gm-Message-State: ALoCoQkYsLP4UQk+uqMb1EsqadHhPKKyq4IzvKAw5H1pKn7rVeGmh9NIdXonCW7S++a79Baql/J0 X-Received: by 10.68.237.228 with SMTP id vf4mr20701963pbc.131.1387205521420; Mon, 16 Dec 2013 06:52:01 -0800 (PST) Received: from [10.145.55.72] ([60.245.65.194]) by mx.google.com with ESMTPSA id g6sm36761243pat.2.2013.12.16.06.51.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Dec 2013 06:52:00 -0800 (PST) Message-ID: <1387205515.6989.1.camel@phoenix> Subject: [PATCH] ARM: Remove duplicate SCHED_HRTICK config option From: Axel Lin To: Russell King , Olof Johansson Date: Mon, 16 Dec 2013 22:51:55 +0800 X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131216_095229_664400_BBFC7FBF X-CRM114-Status: UNSURE ( 8.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are two SCHED_HRTICK config entries in Kconfig. This looks like a merge mistake. Fix it. Signed-off-by: Axel Lin Acked-by: Olof Johansson --- arch/arm/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e462c5d..03649aa0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1656,9 +1656,6 @@ config HZ config SCHED_HRTICK def_bool HIGH_RES_TIMERS -config SCHED_HRTICK - def_bool HIGH_RES_TIMERS - config THUMB2_KERNEL bool "Compile the kernel in Thumb-2 mode" if !CPU_THUMBONLY depends on (CPU_V7 || CPU_V7M) && !CPU_V6 && !CPU_V6K