From patchwork Mon May 30 02:14:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9140141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9883860755 for ; Mon, 30 May 2016 02:16:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88A9D27BEF for ; Mon, 30 May 2016 02:16:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D1D328185; Mon, 30 May 2016 02:16:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2FAE127BEF for ; Mon, 30 May 2016 02:16:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7Cjj-0001Rj-AP; Mon, 30 May 2016 02:15:23 +0000 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7CjV-00004v-HL for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2016 02:15:10 +0000 Received: from emea01-db3-obe.outbound.protection.outlook.com (mail-db3lrp0075.outbound.protection.outlook.com [213.199.154.75]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-31-v-s0-9LnTim8kun778AwlA-1; Mon, 30 May 2016 03:14:46 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QsXShO3EaIarljYftzUxAJ6MryXc8648wEUa9IObhH8=; b=js+B3dPx20xcTJ2rjesepaIs0zCt/41VEC6aEAss1qCShWIMUiYyDzzkVePL5i6l8DQHCPuVsP1u31YrjkpwL9DXaVJRecqMLvBlYZW9LBq76NNioFd1vnpDO3bMmSFM5qm6SgoV53ZruDOJIY+SeTdfxtLCmwQehgJsYfj2/uw= Received: from DB5PR08CA0009.eurprd08.prod.outlook.com (10.163.102.147) by DB5PR08MB0518.eurprd08.prod.outlook.com (10.161.245.19) with Microsoft SMTP Server (TLS) id 15.1.506.9; Mon, 30 May 2016 02:14:45 +0000 Received: from AM1FFO11FD012.protection.gbl (2a01:111:f400:7e00::140) by DB5PR08CA0009.outlook.office365.com (2a01:111:e400:52c3::19) with Microsoft SMTP Server (TLS) id 15.1.506.9 via Frontend Transport; Mon, 30 May 2016 02:14:44 +0000 Received: from nebula.arm.com (217.140.96.140) by AM1FFO11FD012.mail.protection.outlook.com (10.174.65.101) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Mon, 30 May 2016 02:14:44 +0000 Received: from sha-win-210.asiapac.arm.com (10.1.2.79) by mail.arm.com (10.1.105.66) with Microsoft SMTP Server id 14.3.279.2; Mon, 30 May 2016 03:14:42 +0100 From: Huang Shijie To: Subject: [PATCH 2/3] arm64: fix the wrong type Date: Mon, 30 May 2016 10:14:27 +0800 Message-ID: <1464574468-22700-2-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464574468-22700-1-git-send-email-shijie.huang@arm.com> References: <1464574468-22700-1-git-send-email-shijie.huang@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(106466001)(2351001)(87936001)(5003940100001)(586003)(104016004)(5008740100001)(86362001)(11100500001)(229853001)(33646002)(47776003)(189998001)(19580395003)(19580405001)(110136002)(2906002)(5003600100002)(77096005)(6806005)(2950100001)(50226002)(76176999)(36756003)(50986999)(48376002)(4326007)(92566002)(8676002)(1220700001)(8936002)(450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR08MB0518; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD012; 1:kTumUJ7MhFk3Wz2tZShz3m9nccPYS//Rj7yICYGKyXRzbxNfRP70u2Oos8NG6TLX5CMNTkhU8mor17JqyhIDNboSftosYYcDoUHkaBUC7+rHIH5oacVOTdWitDomCgrzfdUyV67AJK7cyUZae0wZC7jwPeuMjFTY65ZfpI36WHKHZqzjhSx2/Srj1U1rNDWahnYbmCDT1TLIgr7mskEVPwRkisEoULEuSEDOsAi0ICY3xS81BiQdG5syH3xjxlyGOJxXjiP/ab9onDG9ydS2ZlbXiLoq/pDab2ldsTGpjj6LNUZJH2dU8acOcVkwypSjUFPR3dnCfN2F5CnnqyPElwPhb+J4+WgrdLxFL0BayAYbe3seNgQIZM+abA01lXTipG9ZdCHz1JygYRWSy0Z6GxdK/hWgcXcScbP+CxXYn7YL7MlovMGtknBsirxpmF/PMLjQ01bNTC8wE96+uzNgqsBfrVSZxGm3JwPb8tzMwPUwH9FcFVoyTronqt6tYebnqmm24mDcRKn0rWdu6sGeQlTi3WSVVjjMpDMmbscQBeY= X-MS-Office365-Filtering-Correlation-Id: 1b4a5d2f-8531-4200-b1d6-08d388302ad3 X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0518; 2:P0drjuk1pk4klqAXoyB16gqOc6lrEJu1lOJZXzy4LMjZmqbep03r+z74T9mWvwA51F6n6nuEk4qDlWF4TA8zXf1MCXQNY0yVDT9lwoXyziVg6F7yr1KJ4AUS2VZZlE7NbXMAggP3S4szV0b8mH/oWhDtToA4Yg4LfbFWfUA+67qlY8iEEIYo+HduNHCzCevM; 3:T8+m+1c2f9IPnU84EtDX3/B7fBDaCmfS6WD4aw38XeEV0Kuh/MKUcekbWSmtyTy5lrfRSR1sVNMTRhKZwwnVS5jEdGdS5fpK1S/hCOm29A0sYVuhJdhiVCaPtLs+D0jALK/STEKH+eYeeA+l+kea3+ZRcp01YtVMH+Vn7GznFuQ1koGjELHyfSpjqGHyPERehHsCRdNTQ21XjJ1nB/Jd28kIgfhFYU5zOtXsdE65PAsuEBN8J2AYi9TLi4Qfs6dGP6yVZ6502dtUmfmq9jnAlw== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:DB5PR08MB0518; X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0518; 25:AZSv3H+4dg050P25+SPnfAb1sushP786BuCmXdck448e3tJq+3ZrBSAtRP6wsT3nDaAo57muwlG/+pTSkt1iG3sgr1EUikBHctVFacxD5JJwogrYaHU5rfbsbBh3zJamWdH9WxaSQo+kXstdI3pYcDsuH4MNbbcv1N6ADo6H+BD2SH1Wc5JxqDjjbtuyChegc1qbNujj02G42XYpxSx6DRMUjwxUfVACuwJ1NiIX8nTx5NFOdWkZdeWEF1e7hLxwfq45FlzOINpImd250LNHBp2XejlFmvscjEbHTMV8eKwNjwX/OiBC1RaKU3ZmN1opNOY6b97JM615jAGzv0TXCQbp9aaPJcBOeZ4LfAUOR+Vguh7E8DfAByCXiOUYPDHEx7jCGMJuxtwhucYY8/gG1KU9CBH8291rZEP4X8cza9VO1MzV5T5+qLDM33F4t1yibQFzEdXO9Wg/V7TuUt+zf0SCWHrTU23eOernd+oTTZv8aOHQKd9tm5wH4iySbf+9wWKHqTqLfpWea1qOesSktk7hRUzUl06XcZT0ANuUKRruCaM0JtONWAVVZ5tgvDXDjLYPHtSs5Y36ybMeaWbN/5k7R3EypEhPiHrpHAnxiav1+CKYkc5euMxlNyW1bzaYS7S8SmfRd7bociKuoHmg6L6OS16rxvjra+XQK+rqSNKDmyt9pNW8t8N/xLEvMDF5LGiYHX1IGzGSO8B4MbHdLjYU3hkv1OPURMyhT9vxWQrTyrJYeVypSQlbB6gl5e/V NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0518; 20:wq8SkoBt3QMWuyDa2qq3yxK4hKqMWGPqhLyJ+6o97AHCqQSFGx6ihobxtJ2QpLA7JmbiXS7xcVAPnB/NkASocE9elv1x15wbJXM5FpYmLZtOKrkzHB170RrOs92D6FFw1PERPfaSmrxDniZ++ftL2BsQPBQc5d0NW6AWp/JoOTLAFte8YyDRctyt+jRflhfIBfWVkUxQ7yswOLFoPcwe//tsqvfAnGJTDbSBV6VcfUPFfsfQPPMGsJeBsMj0+eRw; 4:8NHiDJcHoWyscMxKjlZKwuJ4BXBilV3EuJbilSrfIn0gNgBVyaeV73QOU+GXdNFT+HXsQCsI4qyINXOZRgY484ls1bNiuLFktd+YWytMaviIy36Glw5yWc4JZ4RguSseJIZYBeNyRY2y3H08UNBuXo63SLf2uL5rFYT9h/6TD8uVoCGq+cgG6hw88A2zJZp9UfmqKTs6eGBQR0Li+aouSN99172dTA41Vks7DhuNf7vCipxHTHiOFb9KSQ+k79oyzcMyTUGg34v9Dc5qtDtHaztoI1zUxn7f3AnxpWGRTApFTMwrIIZ+6rP0gh0qYM0OdZlT/iroLkezLGV9H46Bg50E5++CCW8JLO0vTzp9zIdBCHAPwwMqQu2rkEWANt7InkDxo0frmyyLTxk5PyJG/+W39N50KaoZN+Ypsu17KH73nySC6yPEmK/6q69f6Q8rZpbyOB6oFCgThgSfAm/BJi/hiB/MbXy5LaZx6Drs+N13C1KlhjqhvcB4VQyZZuX6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(8121501046)(13020025)(5005006)(13013025)(13023025)(10201501046)(3002001)(6055026); SRVR:DB5PR08MB0518; BCL:0; PCL:0; RULEID:; SRVR:DB5PR08MB0518; X-Forefront-PRVS: 09583628E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR08MB0518; 23:csDzasCIbTaynWmzlaBVRsN0v1qSYHxf/tJZttseN?= =?us-ascii?Q?LhUJttrH0ccRMNjA/dQMXx+SOhm/2MB8SIOZpnQ7J4Jqin6QAmiAtJnABF5g?= =?us-ascii?Q?cr1zgaixwL7lVpaMIGHL+gX0UzmGhn7z4BCHDBcvwEDeVlr9dLPgHeEYffAL?= =?us-ascii?Q?Pus+QLlCuQhfc36wmu1MVa/t/NwxEkFjysvaT/kx09ke576jAm3iZhldes20?= =?us-ascii?Q?qA8ITUqHOTDV1ykovCRiu/5xFtQY/NEw7B0ffGgrizP1PO1zSwCDAWGTYRb2?= =?us-ascii?Q?e/UXRtUCHjWtflsXDyTB/UBoaF1PQWBdZf5iNUGaKbLvQd7Fe/tbSXovLHYp?= =?us-ascii?Q?Ert3NTXhrNNgnHusO0qGJSsE6nkVl1rBWR3dWHD3X/GR9+mcEPpOlJPy54p0?= =?us-ascii?Q?aBGNM91UxxTsBOPWeOGENkR6rUxjktEdJz30UBSA3cVAXwamQkAPUkCFu+DD?= =?us-ascii?Q?mudGrCEm9TdKOYX9qTTBaYQjUaF2aKv0DDqCnvOWfILmWx7WBiDJe7wM2b50?= =?us-ascii?Q?YF8p+RtsAbgNYx8lDYJ+yuFobMARAEBZxVjNpXzz4uWa1NAGbMqUs0QAFk0Z?= =?us-ascii?Q?nHkeTck9NeJdAfE+JYoTBdeB8DSuQ+/7HhQhOKM4k/5cX9RgbPdX2jEacLCX?= =?us-ascii?Q?7bqjkO7c81a0yQXWKfBPAKswu7H7fE8Y42NAzcYjoFu/m6v/2++zmfpidJ9P?= =?us-ascii?Q?K8zOeg5WTa0WZEE5qD0Jz3WIFtLGTlVlQqugAsSqgSlJoz20C2dwbbkFAygV?= =?us-ascii?Q?UxjHcnycbCBhVV2Tq6bOSwOBDpvpm+DthMGgdtxuezrtXJXtavNU4XbaepxH?= =?us-ascii?Q?XZPu8mgdhBvgLQg3TdLbiQLaQ1xAyF4BE8Y4/z4mtkTnFo3VaWIE6D/kq1ag?= =?us-ascii?Q?ulLIe/dFhIq3OpNXde3OJ5MAo4m3mrl1kuTVPC+b3R272ctac0EdtvPIA4C/?= =?us-ascii?Q?VMMocmPGIFL8cKiEJR+A+7sVVIBSgmWXXpOmkNUyi0YN8d1naVuJn2u2RNWJ?= =?us-ascii?Q?8I=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0518; 5:tHehjsQEvfJ2xGQyCm7+sZS/N7KgZhNEjnecnvKCn+mG+UfySGOtSKLYmEQMiEx9OhWA7GNC5ze+FSb/98iRuhQsW8tgkMVV46gfHHGyf78Qtmg1JhUzI6RxkOg9xBeiNYSknqTTysnmvM0vxetJbQ==; 24:Q72G5AtCmB3ia7ruG3yAQSpKiZSTuiHTYFM2vrc2v0oKOsdbZvSNK3HkVFjzVF9qv1zsanCIW8lJe3zS6tQpjKKlNmEJkVraaXJaJrdiwQk=; 7:B0h82N1wJDDv4h3ZKOoM1TEeL35DVwX7zaypxTHj872CjKpKyH6354X6Ba6SFR6Nq1lIFx1R9H6FVDqoLoAIBwVV3QjB4SVSUtjHn5Iegw7WF/Hj8ADzlzeoxLK/Gxfql6VTmExLuDOVpHpiz/w0Rie93cLFK010UZSGqB78H9OGZRnokHH6TLFT9R3zbgH8; 20:8WwxpV/gN1JO2eKqrN9QCDT10UUVe8TBbQqGOmF4CVTjTaQH1d00oX71jqsorVKqY/DqOXLcokVTcBqevFD+rx1DLbn9/dhgG10Y2O/rxk+UceUG1Org4DjH370P2VF40qqSmYygN/Te0Y0cE90alHKm1DeBAVJ63ukixxtg8W4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2016 02:14:44.5356 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR08MB0518 X-MC-Unique: v-s0-9LnTim8kun778AwlA-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160529_191510_046149_8C520218 X-CRM114-Status: UNSURE ( 7.77 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, steve.capper@arm.com, will.deacon@arm.com, Huang Shijie , nd@arm.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We should use the pudval_t for the PUD_* macros, not the pgdval_t. This patch fixes them. Signed-off-by: Huang Shijie --- arch/arm64/include/asm/pgtable-hwdef.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index eeb3269..54e2fbf 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -116,9 +116,9 @@ * Level 1 descriptor (PUD). */ #define PUD_TYPE_TABLE (_AT(pudval_t, 3) << 0) -#define PUD_TABLE_BIT (_AT(pgdval_t, 1) << 1) -#define PUD_TYPE_MASK (_AT(pgdval_t, 3) << 0) -#define PUD_TYPE_SECT (_AT(pgdval_t, 1) << 0) +#define PUD_TABLE_BIT (_AT(pudval_t, 1) << 1) +#define PUD_TYPE_MASK (_AT(pudval_t, 3) << 0) +#define PUD_TYPE_SECT (_AT(pudval_t, 1) << 0) /* * Level 2 descriptor (PMD).