Message ID | 20240123110347.1274217-5-tiwei.btw@antgroup.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-35168-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp257960dyi; Tue, 23 Jan 2024 03:11:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHfLZYi1C4HovpfPryqOlvU8ERqiExjB+lVm0fP+Pbo+u3VUJJmR5Vn2cmQrfFc86oMxyDC X-Received: by 2002:a05:620a:4e8:b0:783:9b90:6ddd with SMTP id b8-20020a05620a04e800b007839b906dddmr4684873qkh.30.1706008265702; Tue, 23 Jan 2024 03:11:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706008265; cv=pass; d=google.com; s=arc-20160816; b=G36ElCs3lloFY9b5UD91IM27y9qBQcPiRRzfljREeShY1TUszhnKncjXXlxhvZvfBu VEXiftnK04Al/i4NqqemiAVKdnnZPDUheYBp2JE5OW2INzu0uClh8jrhkrzSaYMPZPdx hd8SjplSCcVlp/VvR1K2VBZksd+E2CznZYYKHleDqaVHCmuz9wL33mJj17hoa80gKJ// ril8wRI0sjApnLydpObpKya2DBV+00DbzrQxkoRAVnsXpPlpz/VpU2MgVdvuuK4qO76X lVpCjl7mozxM3o9wp+1Mi0tm4QEiIWFlqnPR4L4BqvDgtVjYpaOR496wa+p2gCXR+QGI 9IHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=gr7z/SlPhRJd7tsl4kQkoTMn2fox0E9luuadMesY+gA=; fh=2OUCyawv763RJuh0tp1OY7aBUf41Q8m3nxrITJmYLpc=; b=EH+bt6Dc6PMvY/9scG3VOtc/kGU4yUHFBM5971eqXhkAfxALmwjeIgQIpLeSOP4AHy AVxJ0AxluRxoLDdwGXMAiraLrONtsXN6d7zSUA4Qge9XmDGBcwh3V9Y8RlnbdyDn64PM lkw1mcItf0tZC6avVAC3UEyBj408aW+SSscM3rFKqEC1M09FhGUJqGIrolh8NSuf3YTV OLVX5eXTa6zBxunqZzz2lxi/GFP1p411k4rTrnO5YuG4ET0JK9ht/clyGJLs1c0iVYRQ BNH7+kRQhdzdNyzphVoR2Ady26QL3TKF1t3VI3UsijiDWrSXXiGPvHQ/H3VUXaRS2Jwt tSlQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=antgroup.com dmarc=pass fromdomain=antgroup.com); spf=pass (google.com: domain of linux-kernel+bounces-35168-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-35168-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id bk9-20020a05620a1a0900b0078350f54cfbsi8198039qkb.116.2024.01.23.03.11.05 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 03:11:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-35168-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=antgroup.com dmarc=pass fromdomain=antgroup.com); spf=pass (google.com: domain of linux-kernel+bounces-35168-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-35168-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7DD311C21D31 for <ouuuleilei@gmail.com>; Tue, 23 Jan 2024 11:11:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5646F5DF30; Tue, 23 Jan 2024 11:09:21 +0000 (UTC) Received: from out0-218.mail.aliyun.com (out0-218.mail.aliyun.com [140.205.0.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A5E15D72E for <linux-kernel@vger.kernel.org>; Tue, 23 Jan 2024 11:09:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=140.205.0.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706008159; cv=none; b=nwZP9SQmAK68DOdwNdBwjHcjG1R0eYSQ5YoWksnXuOwLrlS2U/IoMI1KXqMVSiSyihHtN9WotE40YylFfCbovqZE0Hkzy4zAj2rOczhPIypU4gs2PpLdI8x4VBSlzbrZ2AJQ9ZJT2Ku17gBYyWvUD2uG6bhjKsp3JainEA4b5JE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706008159; c=relaxed/simple; bh=e5W/30uahPxnnobqPEw5qPDCHBhsj0fyCzs0F+PD/V8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kZFw8QVM0hXZifY1uSSPdpg1i6HbieVrHKSLlvg+ZaGt8hXjB84uVR/R0jpI1k1J2S+WWOGFrDhbuakp7KeR/plTO5vGtiiYiDRsZICUfe3bLVRzDquE8t/WEyg/bjuU8BlxRJQZIPWDL6FnB4k2Kpgi6AD0rM9ThNCLPa0xRic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=antgroup.com; spf=pass smtp.mailfrom=antgroup.com; arc=none smtp.client-ip=140.205.0.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=antgroup.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antgroup.com X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047199;MF=tiwei.btw@antgroup.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---.WDCKTk8_1706007836; Received: from ubuntu..(mailfrom:tiwei.btw@antgroup.com fp:SMTPD_---.WDCKTk8_1706007836) by smtp.aliyun-inc.com; Tue, 23 Jan 2024 19:03:57 +0800 From: "Tiwei Bie" <tiwei.btw@antgroup.com> To: richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net Cc: <linux-um@lists.infradead.org>, <linux-kernel@vger.kernel.org>, "Tiwei Bie" <tiwei.btw@antgroup.com> Subject: [PATCH 4/5] um: Fix the return type of __switch_to Date: Tue, 23 Jan 2024 19:03:46 +0800 Message-Id: <20240123110347.1274217-5-tiwei.btw@antgroup.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240123110347.1274217-1-tiwei.btw@antgroup.com> References: <20240123110347.1274217-1-tiwei.btw@antgroup.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788879323221321398 X-GMAIL-MSGID: 1788879323221321398 |
Series |
um: Minor fixes and cleanups
|
|
Commit Message
Tiwei Bie
Jan. 23, 2024, 11:03 a.m. UTC
Make it match the declaration in asm-generic/switch_to.h. And
also include the header to allow the compiler to check it.
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
---
arch/um/kernel/process.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 292c8014aaa6..a7607ef1b02f 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -26,6 +26,7 @@ #include <linux/resume_user_mode.h> #include <asm/current.h> #include <asm/mmu_context.h> +#include <asm/switch_to.h> #include <linux/uaccess.h> #include <as-layout.h> #include <kern_util.h> @@ -73,7 +74,7 @@ static inline void set_current(struct task_struct *task) extern void arch_switch_to(struct task_struct *to); -void *__switch_to(struct task_struct *from, struct task_struct *to) +struct task_struct *__switch_to(struct task_struct *from, struct task_struct *to) { to->thread.prev_sched = from; set_current(to);