From patchwork Tue Sep 29 11:01:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 291031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D61DC4727C for ; Tue, 29 Sep 2020 11:55:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FC4C206F7 for ; Tue, 29 Sep 2020 11:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601380547; bh=4r4scWNj/vgqke4H70GM1qO/wDlAyEMvGEg0EG1Qysk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DUrmPPueH6rc1jlJwxS7Dxe9vrG5yowi5cjQRYCJVf/w4vhKxOjaW1D2Q14kR2sxs jW4Q6Fn/BitPeA4VaX0NE0IGsIx4U+MvXHIEJ5+UB5rWikfVlAjseFcD2Wy16AXmZO RcCODoehl9/g4udiD9+RVPqs7+F7HeCWaJ0m7NRw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731404AbgI2Lzq (ORCPT ); Tue, 29 Sep 2020 07:55:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:44120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730907AbgI2Los (ORCPT ); Tue, 29 Sep 2020 07:44:48 -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 B0802206E5; Tue, 29 Sep 2020 11:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379888; bh=4r4scWNj/vgqke4H70GM1qO/wDlAyEMvGEg0EG1Qysk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TGvU+0cx97OfcYIec+w2UUavNBX+l24i1plcPUf4I9hh8wdlCrz19qk81Y4l6kDsh 4FLy5OCbgo/7uM2gSs5r4rN4LYab3yIpfA2r3ZAkDJfaOv4V5oQ64rB/8+C+OIbgiT XGiXYpt16YrDjuIxZ14OTKPRMy5i/wnVgl9dl2So= 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 5.4 362/388] MIPS: Add the missing CPU_1074K into __get_cpu_type() Date: Tue, 29 Sep 2020 13:01:33 +0200 Message-Id: <20200929110027.990158631@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 7bbb66760a07c..1809c408736b0 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: