From commits-return-9713-archive-asf-public=cust-asf.ponee.io@nuttx.apache.org Sun May 17 13:36:55 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 287FD180643 for ; Sun, 17 May 2020 15:36:55 +0200 (CEST) Received: (qmail 85272 invoked by uid 500); 17 May 2020 13:36:54 -0000 Mailing-List: contact commits-help@nuttx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nuttx.apache.org Delivered-To: mailing list commits@nuttx.apache.org Received: (qmail 85261 invoked by uid 99); 17 May 2020 13:36:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 May 2020 13:36:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 4F7F485E29; Sun, 17 May 2020 13:36:54 +0000 (UTC) Date: Sun, 17 May 2020 13:36:54 +0000 To: "commits@nuttx.apache.org" Subject: [incubator-nuttx] branch master updated: arch/sim: Fix multiple definition of `g_cpu_wait' and `g_cpu_paused' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158972261420.30768.6673557830421634743@gitbox.apache.org> From: gnutt@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-nuttx X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 54c643164bffc0c9573ccebdc061406538165cf1 X-Git-Newrev: d938b50969195a7829635a13ecd34f456b9ff76e X-Git-Rev: d938b50969195a7829635a13ecd34f456b9ff76e X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gnutt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new d938b50 arch/sim: Fix multiple definition of `g_cpu_wait' and `g_cpu_paused' d938b50 is described below commit d938b50969195a7829635a13ecd34f456b9ff76e Author: Xiang Xiao AuthorDate: Sun May 17 13:53:33 2020 +0800 arch/sim: Fix multiple definition of `g_cpu_wait' and `g_cpu_paused' Signed-off-by: Xiang Xiao Change-Id: I62d81582d58c9156ee8a56207b479dad7d6d18df --- arch/sim/src/sim/up_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h index 7208e31..de35b8c 100644 --- a/arch/sim/src/sim/up_internal.h +++ b/arch/sim/src/sim/up_internal.h @@ -211,8 +211,8 @@ * so that it will be ready for the next pause operation. */ -volatile spinlock_t g_cpu_wait[CONFIG_SMP_NCPUS] SP_SECTION; -volatile spinlock_t g_cpu_paused[CONFIG_SMP_NCPUS] SP_SECTION; +extern volatile spinlock_t g_cpu_wait[CONFIG_SMP_NCPUS] SP_SECTION; +extern volatile spinlock_t g_cpu_paused[CONFIG_SMP_NCPUS] SP_SECTION; #endif /****************************************************************************