Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3755101pxk; Tue, 29 Sep 2020 05:35:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8zlOi27xsh9v4BXmfB8H7FPVRJjKUFzPQOHUMqQZ11X4Jx1dOFoz1ikDzwerXVX452NOZ X-Received: by 2002:a17:906:5490:: with SMTP id r16mr3517446ejo.222.1601382948674; Tue, 29 Sep 2020 05:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601382948; cv=none; d=google.com; s=arc-20160816; b=IZS3ySlbYQoIJRABNg+zL848bZY7ZTtEtOFNB7i6BB0kLw5bJPkxoeKJwmqfkMkS1W 7Z/CN+npR1mNKes1V3PqlWj4tqP4iHhVPCAs1L7bJsJQh2YQ+aAx/UmTMmFwf3RXvZ6r xLQtW7Gwr5jnuaPJ1a0LuwWJ8jTIHsEu9MgQqCSwCN5ennAv/rxS/5YIKX0cymqBNbwm k4dTaPFXZ5cw1PXU8dafYcKgjl2uf+SfC6I8lEV38xssw+puq/1LIXlW01tJMqO87G/R ZibU6eRJlpFgLPLSUpEvqk85SaFUdb0Je6kc3hKciDVb4Zrj3yW/KIg9coCBJX5EvpRp QMpQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6OEcdZzMVf+HlxwzvRH+IGOo9+OfDmeCe8M6bEZmhLw=; b=DjViTke0HrA7HwTB6D8V/pfGZXfRUqj0pFvt5EzgOPGMVfH+uFAIh7sXtPm6qxkBLa AU2f/ImRGku2au6QtPBFGTpImWobgzm7jTrlbF/rgODhKx8jnkXaUQBstY3V+pR7YnSR Kihi3hBR3xJyesGeCU3+X0XfycqFb32YrLTlehz8xTZCW/IRm6Qyf2PkxIywjyKtnDG+ zUOcB2hcvcS+CWPkiUw2vkrMMTSwtvxrqYVP07qlt+ccFTIUUA/2h+Em/o0+z+sDGeiQ bBnNmmHIgC7V/bKzubAJ9wBnUJyvN60ZQZ49zIJkpah0fgYCRIIHRkGlGFV29cGOxubO yi4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qSqufSA3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y17si2914544edt.218.2020.09.29.05.35.25; Tue, 29 Sep 2020 05:35:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qSqufSA3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730988AbgI2Me0 (ORCPT + 99 others); Tue, 29 Sep 2020 08:34:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:35520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729668AbgI2LW4 (ORCPT ); Tue, 29 Sep 2020 07:22:56 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F60323A74; Tue, 29 Sep 2020 11:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378418; bh=+Ni35/N2CQsVrArEzkm4WFDeYSc8aNOq6pXko1SDO5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qSqufSA3wjxiSzNHGEQbldThN/SCC21t/niS2wmI7fzQ0aNg+iaRYxdz9InQZNcn7 8n4vl391jiwf75ppnm49xG3PARTHcs14p6UVxf9KBtITJNVe/9cdgUM0qLPlYtCzOy TwZG7xVddIeOhvJO1/QHCP5kmFD0yoeHjnAxx5B4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Li , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 4.14 159/166] MIPS: Add the missing CPU_1074K into __get_cpu_type() Date: Tue, 29 Sep 2020 13:01:11 +0200 Message-Id: <20200929105943.130682910@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Li [ Upstream commit e393fbe6fa27af23f78df6e16a8fd2963578a8c4 ] Commit 442e14a2c55e ("MIPS: Add 1074K CPU support explicitly.") split 1074K from the 74K as an unique CPU type, while it missed to add the 'CPU_1074K' in __get_cpu_type(). So let's add it back. Fixes: 442e14a2c55e ("MIPS: Add 1074K CPU support explicitly.") Signed-off-by: Wei Li Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/include/asm/cpu-type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h index a45af3de075d9..d43e4ab20b238 100644 --- a/arch/mips/include/asm/cpu-type.h +++ b/arch/mips/include/asm/cpu-type.h @@ -47,6 +47,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) case CPU_34K: case CPU_1004K: case CPU_74K: + case CPU_1074K: case CPU_M14KC: case CPU_M14KEC: case CPU_INTERAPTIV: -- 2.25.1