From patchwork Mon Jan 12 07:06:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Paliwal X-Patchwork-Id: 5608691 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 70BB19F358 for ; Mon, 12 Jan 2015 07:24:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FAAB2063F for ; Mon, 12 Jan 2015 07:24:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 790592062D for ; Mon, 12 Jan 2015 07:24:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751387AbbALHX5 (ORCPT ); Mon, 12 Jan 2015 02:23:57 -0500 Received: from jaguar.aricent.com ([121.241.96.11]:43315 "EHLO jaguar.aricent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbbALHXz convert rfc822-to-8bit (ORCPT ); Mon, 12 Jan 2015 02:23:55 -0500 Received: from jaguar.aricent.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3F48B218B95; Mon, 12 Jan 2015 12:38:02 +0530 (IST) Received: from GUREXHT01.ASIAN.AD.ARICENT.COM (unknown [10.203.171.136]) by jaguar.aricent.com (Postfix) with ESMTPS id 2FDCF218B78; Mon, 12 Jan 2015 12:38:02 +0530 (IST) Received: from imsseuq.aricent.com (10.203.171.248) by GUREXHT01.ASIAN.AD.ARICENT.COM (10.203.171.136) with Microsoft SMTP Server id 8.3.342.0; Mon, 12 Jan 2015 12:38:00 +0530 Received: from h2512.localdomain ([172.16.116.228]) by imsseuq.aricent.com (8.13.1/8.13.1) with ESMTP id t0C6VBrF019509; Mon, 12 Jan 2015 12:01:35 +0530 From: Abhishek Paliwal To: , CC: Chandrakala.Chavva@caviumnetworks.com, rakesh.garg@aricent.com, Abhishek Paliwal , David Daney , Andreas Herrmann , linux-mips@linux-mips.org, James Hogan , kvm@vger.kernel.org, Ralf Baechle Subject: [PATCH 5/9] MIPS donot build fast TLB refill handler with 32-bit kernels. Date: Mon, 12 Jan 2015 12:36:21 +0530 Message-ID: <1421046385-2535-6-git-send-email-abhishek.paliwal@aricent.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1421046385-2535-1-git-send-email-abhishek.paliwal@aricent.com> References: <1421046385-2535-1-git-send-email-abhishek.paliwal@aricent.com> MIME-Version: 1.0 X-TM-AS-MML: disable Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 35d0470668cca234e49ed35342b3f9a0eec8355c upstream The fast handler only supports 64-bit kernels. Signed-off-by: David Daney Signed-off-by: Andreas Herrmann Cc: linux-mips@linux-mips.org Cc: James Hogan Cc: kvm@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7010/ Signed-off-by: Ralf Baechle Signed-off-by: Abhishek Paliwal --- arch/mips/mm/tlbex.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 1.8.1.4 "DISCLAIMER: This message is proprietary to Aricent and is intended solely for the use of the individual to whom it is addressed. It may contain privileged or confidential information and should not be circulated or used for any purpose other than for what it is intended. If you have received this message in error, please notify the originator immediately. If you are not the intended recipient, you are notified that you are strictly prohibited from using, copying, altering, or disclosing the contents of this message. Aricent accepts no responsibility for loss or damage arising from the use of the information transmitted by this email including damage from virus." -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index aa24119..c05f2fd 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -1247,13 +1247,17 @@ static void build_r4000_tlb_refill_handler(void) unsigned int final_len; struct mips_huge_tlb_info htlb_info __maybe_unused; enum vmalloc64_mode vmalloc_mode __maybe_unused; - +#ifdef CONFIG_64BIT + bool is64bit = true; +#else + bool is64bit = false; +#endif memset(tlb_handler, 0, sizeof(tlb_handler)); memset(labels, 0, sizeof(labels)); memset(relocs, 0, sizeof(relocs)); memset(final_handler, 0, sizeof(final_handler)); - if ((scratch_reg >= 0 || scratchpad_available()) && use_bbit_insns()) { + if (is64bit && (scratch_reg >= 0 || scratchpad_available()) && use_bbit_insns()) { htlb_info = build_fast_tlb_refill_handler(&p, &l, &r, K0, K1, scratch_reg); vmalloc_mode = refill_scratch;