Received: by 2002:ab2:784b:0:b0:1fd:adc2:8405 with SMTP id m11csp183903lqp; Sun, 9 Jun 2024 23:59:35 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX5YAh4MI5UwtdUnVUkJk9g91zLn2AGhURrt2+nb57PK0oxdMeApBpz3dLEHj3YXePtlrtFVBiNeWaZH93G5rK/G49d8wHdsIudO7g2IQ== X-Google-Smtp-Source: AGHT+IFuAgOvToK45eUjzxaRRR6wBnC3NrpKE4TbjR7dlekiuYJg5ed1thdqJlBvSKGxx1vzQsBC X-Received: by 2002:a05:6a20:100c:b0:1b2:7d48:7f7d with SMTP id adf61e73a8af0-1b2f9e09be7mr6636943637.61.1718002775034; Sun, 09 Jun 2024 23:59:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718002775; cv=pass; d=google.com; s=arc-20160816; b=Tbnbs2CWCX54HgFONjErzBZpirM/PdASRTxVGEi/wlMA6ttYzzR5OifexDrD1IotVI sRsWLDyLhOtaSjm5iFt3rAaEkjkXxmnroZr09F1GsQMj7AvMo3zrwhzL/OXq4LS44gcL 1HZ5H7yQxAO+2gp799DWb68e1i2wHgsWexeXrfVkvTS2YhvDm22KyXOaCQc/X9x1i3v1 7wRJeToKVQotnTKzkRqf+3RMJrjpi0lTipH5iyiZ2h8/hoiWax5QNW1qInl+/hE7pGZX KKpzkV/uKjaCtm8BFKLst+iI+SzImVehDySw/JFqST4AOtKema/ZtlT9QZkZQ99/PZfL r5ag== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=94hswRoG4QejpgWk52uXPLn3esD4s603onPMyFxGKdw=; fh=zw8j/EgCMDBYih2muUv8cj+58iwaCsGr/vLAJnUP+KU=; b=mktj/TIsQ5trb6R8Oe5Zy7wLoabEHYwY7Pj0Uj0TNo9CDLlfBbv9UoYj9FSVn4T3Lm 3Sd998Vj/I5JbJoSC5CrzE1ArLTJu1FjR3FnwSFhHa8nWGxMeZrhhvzVaSxGyzh8QaNP xHI252BC884GrCnY8uv9VkaLBFPfejKzkaoW75Gpar3yPbBSg4Bkgd67vbP/0KmPWmJW UEPZMYtsuGC9qusACaS9VrQh5Te1ri2TkJc6mYCm057Wcg0ohTc9rIsY+Hxkbfqd8vGK kCok9bdioCdmE3iutcpO591MMQ9XJNcEggXX6zI5VBqztwJq9vin+Mfmm6flEw6ngWbQ bcug==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=C9IWgKrI; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of linux-kernel+bounces-207749-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-207749-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id d2e1a72fcca58-705983f086esi1137427b3a.189.2024.06.09.23.59.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jun 2024 23:59:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-207749-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=C9IWgKrI; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of linux-kernel+bounces-207749-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-207749-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id A959F28250C for ; Mon, 10 Jun 2024 06:59:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E2941C683; Mon, 10 Jun 2024 06:59:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="C9IWgKrI" Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2214E21364 for ; Mon, 10 Jun 2024 06:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718002768; cv=none; b=OmEuJ48VMJzH2JNrF2E0VMTDWRNI6hjw/fFkTtczvyDmNFIm9SPyaCPm+HaGqZAecIQJfuls8v17bgeTPrPvxGpwprb4ICICvoVJiWkQkLWxu1ncvQunx6ydlmwgURaTxAEJGTh+2rjJHpWooC+5xpVlVw/yHnV9aSmaNoGh/Q8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718002768; c=relaxed/simple; bh=fpqc3BGiClB/F6MGjNoNK1oIPopFNiKyI7v9DsVa320=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=MPr7VlTEupAxZwLnHSJdEPdG6+nTQmIO2f7qMRQnB1cUgjjoBElK9/xUUeA5cGE8EPFtu6d4YA5hELyYS5mDQSwSAdds6QdZIJMWBLj4JxCPcwUTbUmD84PsSgtPnRwWyZUhM5FjkEK9edFdTrVUxiqJmMQU/QxkNLDj70oeots= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=C9IWgKrI; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52b7ffd9f6eso4531798e87.3 for ; Sun, 09 Jun 2024 23:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1718002764; x=1718607564; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=94hswRoG4QejpgWk52uXPLn3esD4s603onPMyFxGKdw=; b=C9IWgKrIY5KC5LK+AbYHhNR2Bw4mIllkbsTvNHpZiFdSQMm67nWyBV9CzrpI//qM3m iXy63QDbDspqK7wdQN1RPVewZP+/813YMTvaxvsuN2Qea2SN7HGB7rfMU+z3HFJiweZ9 3/T63iqV6N3EXHkrtYgszCR3M18HYyFCaXcc839FFrC/ij8W1MS3sexd143auxO79tWA 0xr+MMYAZBPPPO82ccxRfowdJi9MO2mOBRmvY6WXC3VuFL31kma0TJiCelD9ZiJLtewl W1suoHYKqk82Yi7Ir0dxPSMwjsAqUu0fAtejPKc/3uWI2lbq7Ann6Kqghy+7yVRfiE8G B4xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718002764; x=1718607564; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=94hswRoG4QejpgWk52uXPLn3esD4s603onPMyFxGKdw=; b=cY8ItJG5m/S5GRMc2D923P88RUWjnRiAQOUN7qGGVEgbhiJ7//tIuLfNacx8yCIWlA MQ1+6UZoDtoM63oq7B3QJaXfqvD8hXt3MeYnzhtQ+sU3OdlzE+i8xdFFMhbsQ7HKrIS2 6gWSkvCZHGMyqGH2Ld0BMYNX578gNNUPpmKjRiW7uv6hDCTrZDLa3fKvqWyJZYKmk7ZK buN0g958DnVadxndzwrPuzZVaf5Jiv52ULkWmSTHQ3RUl+pUiQS8s7iX0QSrnNekUI+v GUjkhZD/5si2x4l5ScnhacaZvCFHfoMpJ1RgRnaI/8ghqUQNO0SMcVbi1qCT7BiMFL2Q ePYw== X-Gm-Message-State: AOJu0YwUCtiLWeTbP6hjbz0EGn/oSMSCmuefw0l7FsTChPkEPvGUrWPE +18Infn0W+1Ll6Iyv0pvX9Gzks8+8+yew1Do+3kHyq59HgWAgeG3Odc6dxPwtaztfTCasoY2Js2 Z X-Received: by 2002:a05:6512:1108:b0:52c:81fc:eba2 with SMTP id 2adb3069b0e04-52c81fcecbemr3607177e87.44.1718002764128; Sun, 09 Jun 2024 23:59:24 -0700 (PDT) Received: from ?IPV6:2a10:bac0:b000:7579:f459:e30d:c5ec:5a8e? ([2a10:bac0:b000:7579:f459:e30d:c5ec:5a8e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f26857582sm949974f8f.77.2024.06.09.23.59.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 09 Jun 2024 23:59:23 -0700 (PDT) Message-ID: <3c0235d7-219f-4a3e-bb58-eb662f61f570@suse.com> Date: Mon, 10 Jun 2024 09:59:23 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] x86/cpu: Consolidate identical branches To: x86@kernel.org Cc: linux-kernel@vger.kernel.org References: <20240521124832.486390-1-nik.borisov@suse.com> Content-Language: en-US From: Nikolay Borisov In-Reply-To: <20240521124832.486390-1-nik.borisov@suse.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 21.05.24 г. 15:48 ч., Nikolay Borisov wrote: > It's pointless to have 2 identical branches one after the other, simply > collapse them in a single branch. No functional changes. > > Signed-off-by: Nikolay Borisov Ping > --- > arch/x86/kernel/cpu/common.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c > index 69265c0acaea..369037a166fd 100644 > --- a/arch/x86/kernel/cpu/common.c > +++ b/arch/x86/kernel/cpu/common.c > @@ -1732,12 +1732,11 @@ static void generic_identify(struct cpuinfo_x86 *c) > { > c->extended_cpuid_level = 0; > > - if (!have_cpuid_p()) > + if (!have_cpuid_p()) { > identify_cpu_without_cpuid(c); > - > - /* cyrix could have cpuid enabled via c_identify()*/ > - if (!have_cpuid_p()) > + /* cyrix could have cpuid enabled via c_identify()*/ > return; > + } > > cpu_detect(c); >