From patchwork Wed Jun 26 12:33:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13712822 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0129DC27C4F for ; Wed, 26 Jun 2024 12:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=/twEt+o+rSyqGboOKJgAjPtdhrf61D+ucdaDSWnuFx8=; b=mVQ6yzXoM14l3daQE6SgxOd1LU vJyXWivjzH3CXrspwUljusbY/iQypQpzXa2vu1b4xJoL7el4/PD2Vj8fY8GisdtxygetxD5dMklHK ZOlRJWoh4C6XWCY2+sb+RAkxjHeogNihLNgpfok1LhDk1MBNyNydMC5fn6ZFnDAvOrz4/3528Dd9h ADGI5rEoqNlD/ojkLPpdjKLHnXwx1S1ofSQp4ExGWqTpN3L+slKdBOfdD/9Y/osBYM4ypEuZW23aR vZPwq369dZypfkAAPkL9U0lFYt2ALNBW/CfFekNl/mP0D6mhhkXG+6sx8HdlAJH1drrSegpHlsBE6 IHmbiE1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMRqn-00000006l89-1yNl; Wed, 26 Jun 2024 12:34:13 +0000 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMRqd-00000006l6i-2PNb for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 12:34:07 +0000 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a6265d3ba8fso754975366b.0 for ; Wed, 26 Jun 2024 05:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719405241; x=1720010041; darn=lists.infradead.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=/twEt+o+rSyqGboOKJgAjPtdhrf61D+ucdaDSWnuFx8=; b=yVa27cVL5dM1/07syxCIBu8unkahlDfUfbYKFRoGFkWw+wD7xhtiRH6z/gzwHm2iUF yuEd01RsWVZfVC8URL/GtXl9O0AQ+gp56jkpEyaZXxFmHidodSSBxeoFbnoMU3YAi8/H 9CMi+rlaf4VrIgztD+LgX6zBMfIHn+YRc3k5HzfqQucPTOU+a+hnEC5JG8k1GKhu51Tw yeWV1I2Yc80XZqpCHL6ShfOI8s5AovSGjwf5Gt0dx84M09BfiswJBWvJi/cad8FFqGmg 6Z51ojgkpwpxszE3x4KwogIX/SMaHxLkgSPrMRAH6c06jJhqxisRZQA+B8k/ROuhYKlK 6BFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719405241; x=1720010041; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/twEt+o+rSyqGboOKJgAjPtdhrf61D+ucdaDSWnuFx8=; b=I1Qc7tBSdUHMJciZW9U8BRJa+2jaBbicTjhGfrycpYDBwybU63SIIPecB3vH7Pg3Pu 2dn+rHZunJty0qIiEFoeFaDl+vJEjE5VMczLG480JaWMHa9cZR/RS2yI+cxbDvIgtvXi N32YWMAwUq+gtpvV1qM0zBat9tkSLMMVefKk/XAZhhyWpeFaBLl4+3LY+pbIebRKOd75 6a+wfcdvyrvDR4Kwery6ZxAa11YqoCx9L0liwhF8NOLOo5sKA7+LzfLqJ9PQOUp3hJg+ EvQvk9K3DG5J5FcbLTwqrdn/2+kC0/IS72pIMXbP1scpgvRhb6+PEiqYidOLwf/kSv6B wH/w== X-Gm-Message-State: AOJu0YwKlcm6qven20y7kV9/sqro7qNe8eIiwh8DB3jsudBEKHyoWWqo YXfTiFDOk16qQqPSBR76jEjwe+AQuO2/O0uxmVYup92T4hrzfH7WDgeTHinjgaJ0haqHs3CjzqR 7 X-Google-Smtp-Source: AGHT+IEeupPIvIhpd6LPC45MM1OJFsdCrbg4qAgBLwjL30ItISzgQi55Gm+z7bmKWBwO7ZUvFv30jw== X-Received: by 2002:a17:907:9188:b0:a6f:501d:c225 with SMTP id a640c23a62f3a-a7242cb8d62mr574526666b.45.1719405240775; Wed, 26 Jun 2024 05:34:00 -0700 (PDT) Received: from lino.lan ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7265580e84sm205255366b.98.2024.06.26.05.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 05:34:00 -0700 (PDT) From: Linus Walleij Date: Wed, 26 Jun 2024 14:33:55 +0200 Subject: [PATCH] ARM: mm: CFI: Fix some erroneous reset prototypes MIME-Version: 1.0 Message-Id: <20240626-arm-proto-regression-v1-1-089c23ea13dd@linaro.org> X-B4-Tracking: v=1; b=H4sIALIKfGYC/x3MMQqAMAxA0auUzAZiqR28ijiIpjWDVlIRoXh3q +Mf3i+QWYUz9KaA8iVZ0l6jbQzM67RHRllqgyXryFuPk254aDoTKkfl/AFcWtd5JgqBLFR6KAe 5/+0wPs8LvN5d/mYAAAA= To: Russell King , Sami Tolvanen Cc: linux-arm-kernel@lists.infradead.org, kernel test robot , Linus Walleij X-Mailer: b4 0.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240626_053405_524058_4C09A04E X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org I somehow got a few cpu_nn_reset() signatures wrong in my patch. Fix it up. Fixes: 393999fa9627 ("ARM: 9389/2: mm: Define prototypes for all per-processor calls") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202406260432.6WGV2jCk-lkp@intel.com/ Signed-off-by: Linus Walleij Reviewed-by: Sami Tolvanen --- arch/arm/mm/proc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) --- base-commit: 55027e689933ba2e64f3d245fb1ff185b3e7fc81 change-id: 20240626-arm-proto-regression-d1456e00ff02 Best regards, diff --git a/arch/arm/mm/proc.c b/arch/arm/mm/proc.c index bdbbf65d1b36..2027845efefb 100644 --- a/arch/arm/mm/proc.c +++ b/arch/arm/mm/proc.c @@ -17,7 +17,7 @@ void cpu_arm7tdmi_proc_init(void); __ADDRESSABLE(cpu_arm7tdmi_proc_init); void cpu_arm7tdmi_proc_fin(void); __ADDRESSABLE(cpu_arm7tdmi_proc_fin); -void cpu_arm7tdmi_reset(void); +void cpu_arm7tdmi_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm7tdmi_reset); int cpu_arm7tdmi_do_idle(void); __ADDRESSABLE(cpu_arm7tdmi_do_idle); @@ -32,7 +32,7 @@ void cpu_arm720_proc_init(void); __ADDRESSABLE(cpu_arm720_proc_init); void cpu_arm720_proc_fin(void); __ADDRESSABLE(cpu_arm720_proc_fin); -void cpu_arm720_reset(void); +void cpu_arm720_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm720_reset); int cpu_arm720_do_idle(void); __ADDRESSABLE(cpu_arm720_do_idle); @@ -49,7 +49,7 @@ void cpu_arm740_proc_init(void); __ADDRESSABLE(cpu_arm740_proc_init); void cpu_arm740_proc_fin(void); __ADDRESSABLE(cpu_arm740_proc_fin); -void cpu_arm740_reset(void); +void cpu_arm740_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm740_reset); int cpu_arm740_do_idle(void); __ADDRESSABLE(cpu_arm740_do_idle); @@ -64,7 +64,7 @@ void cpu_arm9tdmi_proc_init(void); __ADDRESSABLE(cpu_arm9tdmi_proc_init); void cpu_arm9tdmi_proc_fin(void); __ADDRESSABLE(cpu_arm9tdmi_proc_fin); -void cpu_arm9tdmi_reset(void); +void cpu_arm9tdmi_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm9tdmi_reset); int cpu_arm9tdmi_do_idle(void); __ADDRESSABLE(cpu_arm9tdmi_do_idle); @@ -79,7 +79,7 @@ void cpu_arm920_proc_init(void); __ADDRESSABLE(cpu_arm920_proc_init); void cpu_arm920_proc_fin(void); __ADDRESSABLE(cpu_arm920_proc_fin); -void cpu_arm920_reset(void); +void cpu_arm920_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm920_reset); int cpu_arm920_do_idle(void); __ADDRESSABLE(cpu_arm920_do_idle); @@ -102,7 +102,7 @@ void cpu_arm922_proc_init(void); __ADDRESSABLE(cpu_arm922_proc_init); void cpu_arm922_proc_fin(void); __ADDRESSABLE(cpu_arm922_proc_fin); -void cpu_arm922_reset(void); +void cpu_arm922_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm922_reset); int cpu_arm922_do_idle(void); __ADDRESSABLE(cpu_arm922_do_idle); @@ -119,7 +119,7 @@ void cpu_arm925_proc_init(void); __ADDRESSABLE(cpu_arm925_proc_init); void cpu_arm925_proc_fin(void); __ADDRESSABLE(cpu_arm925_proc_fin); -void cpu_arm925_reset(void); +void cpu_arm925_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm925_reset); int cpu_arm925_do_idle(void); __ADDRESSABLE(cpu_arm925_do_idle); @@ -159,7 +159,7 @@ void cpu_arm940_proc_init(void); __ADDRESSABLE(cpu_arm940_proc_init); void cpu_arm940_proc_fin(void); __ADDRESSABLE(cpu_arm940_proc_fin); -void cpu_arm940_reset(void); +void cpu_arm940_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm940_reset); int cpu_arm940_do_idle(void); __ADDRESSABLE(cpu_arm940_do_idle); @@ -174,7 +174,7 @@ void cpu_arm946_proc_init(void); __ADDRESSABLE(cpu_arm946_proc_init); void cpu_arm946_proc_fin(void); __ADDRESSABLE(cpu_arm946_proc_fin); -void cpu_arm946_reset(void); +void cpu_arm946_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_arm946_reset); int cpu_arm946_do_idle(void); __ADDRESSABLE(cpu_arm946_do_idle); @@ -429,7 +429,7 @@ void cpu_v7_proc_init(void); __ADDRESSABLE(cpu_v7_proc_init); void cpu_v7_proc_fin(void); __ADDRESSABLE(cpu_v7_proc_fin); -void cpu_v7_reset(void); +void cpu_v7_reset(unsigned long addr, bool hvc); __ADDRESSABLE(cpu_v7_reset); int cpu_v7_do_idle(void); __ADDRESSABLE(cpu_v7_do_idle);