From patchwork Tue Nov 7 21:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Arora X-Patchwork-Id: 162736 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp539631vqo; Tue, 7 Nov 2023 13:59:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGD4fFKU6ME1a2rRSFBpmNx/UANJY/Uz6Qj09gkAsXG6+hVAio70s6eE8Pps/MWolsXQdEJ X-Received: by 2002:a05:6a00:1353:b0:690:fe13:1d28 with SMTP id k19-20020a056a00135300b00690fe131d28mr285726pfu.33.1699394377250; Tue, 07 Nov 2023 13:59:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699394377; cv=pass; d=google.com; s=arc-20160816; b=flZV0GqPb3nWVoEpKmW57ZxRGc7nZ7xGO2NNP1POtZQip0XEh7W8t+4nYmFW0KWIhq l46RlBzgXhqIvyCxqKPFm3lbV9FHd9EoKO9rkuUmWdE3ku5JA2zPfHP2+kaTBUEpmYg4 a13knm4IgYNbubQnVeP6HfG5W8dPty6a+OjKPhnQqX3wkuHHq02sDSSnDPxVqdu2uKp9 aJafw5Cm1Phjn0TAaS6ELd8NQktvyfnA4+/TWkYEVF0jsR8MAWCyqVA/Q0pn8fMY/O17 LqLQOlo6CuZLqItJLIZqj2a8sIzPIkwjm0j5cGkIuGLu5n0BCBPwPu3SaTmoZnWyXyp2 Ll5g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=lSHJYOhJH1cM0w0ObGeU30WtZ6GiFFGTdHFP6PoG6zc=; fh=nHnEAWNp+qNKUfhTYdiVYwv41cALFixOy2SlfWaTsrM=; b=JiWVkrUtH9JyElDNVRXIX2npsNP/tKoACXMuexM1MLrnqp4RvOeKmSbbliTXu4qUu7 UZKiUNrVOLeeVYhBMphcvp3kq1rgavfASrw7wrj7BUjD+Nksul9ph5RArfOVrTTNTxRS H74I5Ft6Mt8Wvy0Bv9aosHNPzrc8OG5alaIT7eVqgrrUtgh8kG/Xmm42TS87JbSv+FfY G+bL71cGnN7sPCp6sSU0WEfhmuWw1lPSzpp2AUKg8xuO68Cxd8OHqGbZ4PViPXWJ2n7N ObFpAhN1IYnfPJJHa1+Uvm6RjqBAgXOUg51FpYUASd61PKfPXYzkTs5iq6C94KgHI/FZ nO2Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=IszQ7sTj; dkim=pass header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=qzKN2kIb; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id z2-20020a62d102000000b006b87eb11b94si10654773pfg.108.2023.11.07.13.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:59:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=IszQ7sTj; dkim=pass header.i=@oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=qzKN2kIb; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E04C082CA0EF; Tue, 7 Nov 2023 13:59:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234114AbjKGV7b (ORCPT + 32 others); Tue, 7 Nov 2023 16:59:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229650AbjKGV70 (ORCPT ); Tue, 7 Nov 2023 16:59:26 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E31C910D0 for ; Tue, 7 Nov 2023 13:59:24 -0800 (PST) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A7LJP6G004600; Tue, 7 Nov 2023 21:58:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=lSHJYOhJH1cM0w0ObGeU30WtZ6GiFFGTdHFP6PoG6zc=; b=IszQ7sTj+o41AwIQwmnJ6fRqFwWje0XT+GjkwF7TO9heWpynVZUtS+iuqPgmBY5RnJ/p 0PIuhPkC6YWmmuueGj4pu+2MoByUU4TmBbD6AOO8cRf29eAr5BK1D0ZxLDFsxQbehXoG L32rbMStmeTTkmEJNltos0ciwQ5Wd9QQUC2RU7p4juqFDhbsv1GVBgdy8qAmylzADw2P E67hV6BvUS2QTrXgk5F/ij+fa93LHNTK1LkP02Ke2JBBmpQFA5GgtKsKv5jysbcK+VKB wI3H8r+RPsfvN5oEcfv887qtJu1IUTghwsECbWC963QvN5158q6NNxJ4bHNXqGXfy9JH 3w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u7w23g2a7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Nov 2023 21:58:19 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3A7LIrDN003912; Tue, 7 Nov 2023 21:58:18 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u7w1vsh7b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Nov 2023 21:58:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BwZtYe1YYYEvDail/OEjTq95yZ8vxFPqjbjT1vS6mJPhIH0ecWJg6EY0JdL1Lth3UBXJKdSVu7L7FGU7VMR1Ri9yWK7JKr49KsP9SSDIzzXc3Qtdm+tuDokXDrCQ91agDVcUjYN0b2HwL0yvKaZ1o7P+1edryRAYBlnKq6xBDL7zYfJeTGJv5fc+5Csj39f87z4aVb75j11OmGX6rBpM2R17HC7JwTwoN1SNGJEHCcuWeKAt2qLqyf7knwqHQmwHmMQccUVvOTwfw9Xdrt0bqAKmGDa4goYnyQJejTV0IRLA1ReQ/NCHL2/z7cWufUR1+TU6aDcMHuJ+ItSBTbIDSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lSHJYOhJH1cM0w0ObGeU30WtZ6GiFFGTdHFP6PoG6zc=; b=EtVyvGiTc6Qde+dmt5RhqfnUa6i53Fe7STMRVwStRcpyTziXVTd/XYRvuZATCq8IJzMe897/NB/8RUxOgEYq5tPKMg9WgSwfr8AE+Q8oROvhHGqBL0V5Y3hpmgDEfRJq66exxz36+Av2ysqo+O1/HbW6vYmibS6yIkVM7OjyxCzrTOOb2ahWI8mQtzY/Wn23w0nI6T9xDvofbCdZTOcs5WgKRmT7Femhw+5tCQvuBQy4A5fiJlEpDgPpdq0HFMNWw9d5l5ZK4MGSt+nheSU0rtHiCDdXjMMjRuzfyFLwyKsRc0ntAwkywIH1BGFh5jZZ7TJ/8PZjrA2sZox3GtYC1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lSHJYOhJH1cM0w0ObGeU30WtZ6GiFFGTdHFP6PoG6zc=; b=qzKN2kIbyNzmUtgoP50iQ5Xj9bawtp7hDYbonHXuxtsRzKa5/+zqqMiuJpCNPYGCW5Y8ZRNlcE5oYkUU6UIS+9v1XXTfSktx52ozxTSO5k8fP1Qu4zKvCQUwHScwVNWa7SgQ3Eo+yTcXY1NRAF3GQWrCEWXRkc7x7oP9T2S7eKA= Received: from CO6PR10MB5409.namprd10.prod.outlook.com (2603:10b6:5:357::14) by CYYPR10MB7651.namprd10.prod.outlook.com (2603:10b6:930:bc::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.29; Tue, 7 Nov 2023 21:57:53 +0000 Received: from CO6PR10MB5409.namprd10.prod.outlook.com ([fe80::1ce3:4a8c:4c99:acea]) by CO6PR10MB5409.namprd10.prod.outlook.com ([fe80::1ce3:4a8c:4c99:acea%7]) with mapi id 15.20.6954.028; Tue, 7 Nov 2023 21:57:53 +0000 From: Ankur Arora To: linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, paulmck@kernel.org, linux-mm@kvack.org, x86@kernel.org, akpm@linux-foundation.org, luto@kernel.org, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org, willy@infradead.org, mgorman@suse.de, jon.grimm@amd.com, bharata@amd.com, raghavendra.kt@amd.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com, jgross@suse.com, andrew.cooper3@citrix.com, mingo@kernel.org, bristot@kernel.org, mathieu.desnoyers@efficios.com, geert@linux-m68k.org, glaubitz@physik.fu-berlin.de, anton.ivanov@cambridgegreys.com, mattst88@gmail.com, krypton@ulrich-teichert.org, rostedt@goodmis.org, David.Laight@ACULAB.COM, richard@nod.at, mjguzik@gmail.com, Ankur Arora Subject: [RFC PATCH 03/86] Revert "ftrace: Use preemption model accessors for trace header printout" Date: Tue, 7 Nov 2023 13:56:49 -0800 Message-Id: <20231107215742.363031-4-ankur.a.arora@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231107215742.363031-1-ankur.a.arora@oracle.com> References: <20231107215742.363031-1-ankur.a.arora@oracle.com> X-ClientProxiedBy: MW4PR04CA0136.namprd04.prod.outlook.com (2603:10b6:303:84::21) To CO6PR10MB5409.namprd10.prod.outlook.com (2603:10b6:5:357::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR10MB5409:EE_|CYYPR10MB7651:EE_ X-MS-Office365-Filtering-Correlation-Id: e044a1d6-797a-4f21-d1b2-08dbdfdc9799 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: viKks5iqpD6nVjDDkIOfRYuh0ef7bT7chs+Dozjxvyx79ZE/EM0h9EuPijZIYVycTJEVs1QpeYMJ1MeRf+xihrdsz4sO7Vib82DT9n98W4831jaDCX3el8E30vHEtCfTUJ2wSjB5An6fEosBMvCD/JzjEK21aNSLHfk23ckfgVfJNLVhq/+2xQS4wl+To+ixqPyD4HIETBDpCXaWFZxVRq/XXt6uQsZmjJhdyHSYOaMgfRpvVEcZNXnfavsOFKSjQxNt3ljCUjsXs80V70haIbJsr8KkJViO76gMML3oJbeLCM9A1466SGA2OhiY2LRKIcVczzoZlb6KzfO+ld82h6Nv/EaAgEYPl74woQJXYgv2y4mXTTQItQ0fWymhEhS65uh4XA7f94V+POJgVao2pBe9kL4k+O5SyP+/JPoWsrHDIPrkwyEL+dUCBmI9mnMQiNvqrHppxQ5rcKgIC2iLMAXMZx1H61Wr1tOXAfBt7DXdhfdD/FU3SxayWtySJ2BteJAW5J8LGhdBCg1HfUe6Q+5GwDh8QmW41OZOBTJ8MNklVdVniow6PipcfgYMVVJ8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR10MB5409.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(366004)(39860400002)(136003)(396003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(6916009)(41300700001)(66556008)(66946007)(4744005)(83380400001)(7406005)(7416002)(66476007)(316002)(478600001)(8676002)(6486002)(2906002)(6666004)(5660300002)(4326008)(8936002)(6506007)(6512007)(26005)(1076003)(38100700002)(2616005)(107886003)(86362001)(103116003)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: weBZYfqbZskq+X3vX8zDxufGKYDa+H8I5C/+RsWdHQu/zeykGB88oleyR00NPvYnYLe/s/quL4CcxXzplINZTY1xh0pdnqoWxiE35cl/K5MQdbrJY8gYez6apxTau6Z2Quoez7VBof1XI73HwNqZaygo6/iBOOZsfgRkSjLY6e3WZjKPaIEsRK0ysT8q4FMHZnPL+t5BMv7kbVSJq80OyJdvh4sEkaMcKvdktRWXdjcw2v/LIYC1K5s+6pVtcfeZfo7LQKrru1FzY5aCZZCglj7RGDQRfY4TQwNgAw7G9VAZp5lKvTX6Uf4ECQ/lmIvOMxW7ThdMUuUCIzSgQJOxbqFm/bEVAM/1XPf0f+xgUFxWDIp/G/YWmYWfvN+HsGJzaRMd58OPAj1CC2FlIZd1LQcpk0hlSK4/+TMZVDJOuJAVp8T7f+Z/sn7l/AvWM9uxIi+5rBFTVh4ZUN1RpF8LbQzQoUVebiZexpfvUI3+4sKfSFFKMIg882hJDZXwhK0xsFz+gGYVApzCrAQyV1jLX3VXN5L0Xn3m5ZtIioI8rRhV0W4+9I6TrxCM+g0ybAlnzDMWeWR4FeU/rCstpUQ60s638Ij1Gja8Li/o2mTicvm7u5USPqXh0Y4rsUBiF1wo8vD6iVGTCTag6t3g3a700wpSMAWYRSb8YxnDemaLH2sFwADTAVLDAGlI0Z5Pya7MLGK1l5p915/Nl+LjjNigr49k7RcU0dp2gVKZEF44/E7CNO60B+BkvqS9wjLBst9nU1SfC4uFReq9fwqBEPqA51ryoMGzds0RTQjDWDwuNVAZrr02I5rRalrI9DuW4Et1T5IRyF/fcn4M4mwlpkGYp6JkXFusTPQGjdzTQQg0nD3jJ4BY2+86V8sji6L24ge3xkjbGMx7/mHeaChfhCEFwGxfJLU5m7zZ98Y+8jDLqIgBKQt046wJznCvPlEAGVpdu8zwzSoZ94VzAnp1rsVMBh5JLtRLiazkeYJjI4ENrruc6S++iN63SRNU4O/Ab8Iabt6JPTVMbveRJesiCk4hZnUVbtizqTVM9+wfEcbHXsxwgE+KF1+rP13JyviWTOE2i0dX7yzP7MG8MUX7immBXJI8fdBUoV/Kquu3nlMxcasjpCQYtt3X7Mf+LNQIkda3smi5i6TFmh4IW9GCSya1CZ2qPe/15L2+d8orS/IgzW0TtjeSwQzTxew4gy6tp2HIT3nbS9/oua9E/UKd+ErFdp0KY0biD4FnurCdkEnCkVeYHj1vU35Ny/6c0nm1ce7v1c2UW5SWr51evA06jODqvS0zsclzMLtx3EPygfP+UQqHsG8+KNkTJ+O3jn1Hrat2ddLYFJ10usO1Btw5JKt3pXG8EYazino5ZfJBJyuRPQ36AWeNIi5xcfhcpnoHIuHM2nQTRp0HysQ+h3oyrVJe/pJIknrTH91Xl7JV10eIF0dFVVQKhV7PLHfqjuRaLOBb7knChbWCugIVBEnqIdKSAW1plUFW2qGgVYkSV41ckzUpVFwVisFiaQKSPUMCa2OgB+FvNy+HvUNl+DS8KlwwkrfgT2Bk5CTZwMcCioN4pOckJhjin3JCAFGP6E6WO9DVADtYPPy12/3X6lMrgOCACw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qJAYUBfs8oRhd15pCNI7F2fBv6Fb06ZSeRN4mbsJPvpiQh92EKVfczTAGO0F5og8mmczEgNd+AxQ94acWA49wJt8D5dkD+Yh448UD3YWQndGuErn7UaQ+6bOoUjU5mTYkhXIGtcuQFsFGHmN885vdJjEs0S0abedMZYatqy2O9ZM9eTjkGUiyIUCy07NSlcfjE+6q9dinvdrFxGtbkoOKO0vHNIfzlt6tnCSAYGoHbv/GpPBFBm6tkF1LOq11JFIn7TtGQ9MS4Eah9vknhX9QJXulUAfE23BaYGNz5YtRCfdMV1OGSOoyOp1oeraOwOiSLuk7jzNEh3c0bdpuTp1YWPu/blZR7M9+3Sfp+aEqNqqx0kU14FQSRT+c7qXE11ienC1hKtQHtU7sLowWstvI0kElgK5X/NhXPRyt1gyC5SFHa/aNdsI0CQFca0xhRXOCr5voe0QzDiCCuQbpQuQ9aXJil+f82t3tXGnRsufMaAHBRSWUs6XfjL7oHzq3avraPbM1tl/w1gCo4QtiMrpFDR057l+oHutMZonwH9NGbAFH+AMWaNrxQZFy44P7aQEBiPRNjxKgLDrv22NBs8L3TWqcEtXDc66G7b0UcEUjzsCIYaJ0TXTxFaFm4xSX5LmfNND4At0vQsEsNp2Rmlqise+kC4IZFdrribAse8CDIOKeERd3QPYuhshf4qDslO1c7glCKe3Yo82iUnr+iGVR6jtJX11vUcr0LdQ06Gl5O1ExeIa7dH0oTN8DjwZiDbr5vjyRbXpa2ONNCxHorX0AzElHaHsyTa2BtL4ZzIXw+sUIGSqPd1c843p/Q3VPR+XxNHpN7whf1lFVSLowo/WYLNTmvJTcW09AJ+NXknbd5+HaCQDlsjlgBwbBVhK82S69VdrVNBV+NYwbpvagRM91LbRxliWKrYHo+0WhFO0d2ji7yO5FC2rhXgL+Ai6ZNR1jUKkxZg7H2eY6eCQp1eViqt4T+F2Xz5Jj+4d7ts8NKU+PmpIOxIw2874QVSaEbuYgMhXnpyckbG4C78c7xQHGV03Hc1co2X6EEfAhA+F08o3p+dbLmS4J2rqaroycZOQyZJ7sv6xSCA9TeVSURWbObjinlIoJ/G9ml1jTStuuiVk5LGjiRettX4yait2/uJkHL/KGf/+6KzmxIseXwJeTqlrMmUcsUB0Znj5ItkqZi1b2MwGI6fLlaLmZU2m033FCZLeGLy2CB8A4o4qI0VvqrpVLc7VWG9Nd5npUroPo7VDKWnFMT2HFMF4RmddYcCDz9lJsPz3x8BXMATGMHF9s3eN7Oh9Jfad7oM+lV8SxK2Pqh03QdQuGQeuij37iSWZFZ34Trmhyuqk1DHqr2Zcj3l8u379kbhn1QMn3Q5yvEME3+bie3xsddGfinlr4SZ7EOnv4hSAO+zzjBwUa8OEMtrFq3vXOEVkNGAh5Ki+jWB28/2bt2XD40eDE545TO0Wlm5PUF1ETtW1qcoNKemsGxktYVHuX/cwfPOgN4ggentRoPBQnAkPLyrJb58cWld2QMmg5+buYMHEVw+GujLkUA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e044a1d6-797a-4f21-d1b2-08dbdfdc9799 X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 21:57:53.4683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2Y4+CxZBz0b2YXeDco/84I/fE3VrKfujSFKb1GdsytiX8L4wVmd6CxRopHdwX9np2Vn93jjSXGFUKxU2VpUrWrvjmEaJncXBCeTlSk4xTXM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7651 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-07_13,2023-11-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=888 mlxscore=0 adultscore=0 phishscore=0 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311070182 X-Proofpoint-GUID: wuMSjcSazq8RICIzAXl82AEvESFYohml X-Proofpoint-ORIG-GUID: wuMSjcSazq8RICIzAXl82AEvESFYohml Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 07 Nov 2023 13:59:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781944158620916124 X-GMAIL-MSGID: 1781944158620916124 This reverts commit 089c02ae2771a14af2928c59c56abfb9b885a8d7. Signed-off-by: Ankur Arora --- kernel/trace/trace.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index abaaf516fcae..7f565f0a00da 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4392,11 +4392,17 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter) entries, total, buf->cpu, - preempt_model_none() ? "server" : - preempt_model_voluntary() ? "desktop" : - preempt_model_full() ? "preempt" : - preempt_model_rt() ? "preempt_rt" : +#if defined(CONFIG_PREEMPT_NONE) + "server", +#elif defined(CONFIG_PREEMPT_VOLUNTARY) + "desktop", +#elif defined(CONFIG_PREEMPT) + "preempt", +#elif defined(CONFIG_PREEMPT_RT) + "preempt_rt", +#else "unknown", +#endif /* These are reserved for later use */ 0, 0, 0, 0); #ifdef CONFIG_SMP