Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp784823rwl; Wed, 5 Apr 2023 07:42:14 -0700 (PDT) X-Google-Smtp-Source: AKy350Y5I5/EthlqHXrSjIWibc3+JGQEpoB8f8PZBX7aNPcMR4L0J5YvNxlzBTsIo+RpFCRcweyc X-Received: by 2002:a17:906:ccc6:b0:8b1:2c37:ae97 with SMTP id ot6-20020a170906ccc600b008b12c37ae97mr2702611ejb.43.1680705733883; Wed, 05 Apr 2023 07:42:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680705733; cv=none; d=google.com; s=arc-20160816; b=RRF60GC7N5wZm4xiF3Lo3EnVRTi2aZ0YKPZ4xONm7ukKIZc86Ix+cO1fJHaqf5uWjj dAa7KAam6d4YI56gPw2gKOyUyY987MOfGqgam36jyb9PsVzpqOuIe4Uh6tCvSFRF8bGJ xNL9fMnYpeCH2UNXazfYBCbEEyWe02AAn2TZsAycGKe5VuzAKRx456QCWyVsGnE8RBS8 KYpK4aZTD5Sj5xvcrWDaoVPZqrO/ZGaEXPW59qaookGldrzLvSAvqKNzLLrGBp+XwRjT JHRV44vKrHE21wonEVqHR1aapdjDYYjI3bpBGMIAxzCRFOq+pHME4PjzqAPOhKnZl/+O e+0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Ivelhx9ng1tSdZPRE/IPDRDCHXDReZ4l2WYrsyrBS+0=; b=ucQjMKGXvmDhEyeF9n7+QS4filG7Hw1e2ZW7gSunqErBFe/yaMUB/rAxPRKwXt3RGu 6y6NDSY19ezfVYhqxAXWNeTzkT6CS4XIMSqKLHJVC23vv802WTJ4R+hZSKLVUIh5K55z ZBRXvHgyGy38RKZef921UifFqHKX4jsPKBbMI7fSXl4xEa49Sgk9vWs6DPGI+1dAPVor 8jjsGLIi6GvGfQHMzqlcmhwmgl6Vske+CNmppVzg9zB0w536CpmybtXd1Lb4kVW05Sid 6RA0lOB7q3BntetJHAprzfNU5jK83zYV1/rOtr7g8TeypMCvSD2LYYC8i98GVSMAim66 0hdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=aHhe3Fo2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id la22-20020a170906ad9600b009339e1eccf0si1228555ejb.219.2023.04.05.07.41.47; Wed, 05 Apr 2023 07:42:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=aHhe3Fo2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238130AbjDEOfH (ORCPT + 99 others); Wed, 5 Apr 2023 10:35:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238642AbjDEOe7 (ORCPT ); Wed, 5 Apr 2023 10:34:59 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83C84E61 for ; Wed, 5 Apr 2023 07:34:58 -0700 (PDT) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 335EVBOD012704; Wed, 5 Apr 2023 14:34:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=Ivelhx9ng1tSdZPRE/IPDRDCHXDReZ4l2WYrsyrBS+0=; b=aHhe3Fo2JAvpifGCO+Tfw1mhyFasHC+24W/DOR+1wkEC2SKaACOkZks8vJvf+4SN62eX jj3kojPHxFuT2v+LcFkbu6v1VigboUWPzy5gcmVAUKmFKKUIFMr4D4A0SIz86G1VOIIZ /0K8FVsRpfNIgKwZYoowO7ja3N8Pwuz5iCScPwwKIUD6faE37w92+XMh2qBzvaBttM9j wEpb3Xs1Hf3QI1h8vMqacBDP/VlqLgnEDBzZyWFxl8pO+EnDhDcxKODaskLjVcQV9QCc kOVwltrqAi9CEO2Aifb8z54DexQNrcGOBG5PDQhmJQcViYoxqDAG15sQjrjRMuA6G+Rg lg== Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ps7n3dvqk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Apr 2023 14:34:57 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33548rpQ019661; Wed, 5 Apr 2023 14:34:55 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma03fra.de.ibm.com (PPS) with ESMTPS id 3ppc872jh4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Apr 2023 14:34:55 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 335EYqQf30802530 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 Apr 2023 14:34:53 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DD7F82004D; Wed, 5 Apr 2023 14:34:52 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0F692004E; Wed, 5 Apr 2023 14:34:52 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 5 Apr 2023 14:34:52 +0000 (GMT) From: Heiko Carstens To: Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [PATCH] proc/stat: remove arch_idle_time() Date: Wed, 5 Apr 2023 16:34:52 +0200 Message-Id: <20230405143452.2677172-1-hca@linux.ibm.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: HQml2TZzgBdUV4LrJ0jw7H3gt-8QBLUU X-Proofpoint-ORIG-GUID: HQml2TZzgBdUV4LrJ0jw7H3gt-8QBLUU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-05_09,2023-04-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 clxscore=1011 impostorscore=0 mlxlogscore=979 bulkscore=0 adultscore=0 priorityscore=1501 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304050132 X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The last (only) architecture specific arch_idle_time() implementation was removed with commit be76ea614460 ("s390/idle: remove arch_cpu_idle_time() and corresponding code"). Therefore remove the now dead code in fs/proc/stat.c as well. Signed-off-by: Heiko Carstens --- fs/proc/stat.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/fs/proc/stat.c b/fs/proc/stat.c index 4fb8729a68d4..da60956b2915 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -22,30 +22,6 @@ #define arch_irq_stat() 0 #endif -#ifdef arch_idle_time - -u64 get_idle_time(struct kernel_cpustat *kcs, int cpu) -{ - u64 idle; - - idle = kcs->cpustat[CPUTIME_IDLE]; - if (cpu_online(cpu) && !nr_iowait_cpu(cpu)) - idle += arch_idle_time(cpu); - return idle; -} - -static u64 get_iowait_time(struct kernel_cpustat *kcs, int cpu) -{ - u64 iowait; - - iowait = kcs->cpustat[CPUTIME_IOWAIT]; - if (cpu_online(cpu) && nr_iowait_cpu(cpu)) - iowait += arch_idle_time(cpu); - return iowait; -} - -#else - u64 get_idle_time(struct kernel_cpustat *kcs, int cpu) { u64 idle, idle_usecs = -1ULL; @@ -78,8 +54,6 @@ static u64 get_iowait_time(struct kernel_cpustat *kcs, int cpu) return iowait; } -#endif - static void show_irq_gap(struct seq_file *p, unsigned int gap) { static const char zeros[] = " 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"; -- 2.37.2