From patchwork Mon Jul 6 08:51:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhigang Lu X-Patchwork-Id: 6105 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C4EC75A43; Mon, 6 Jul 2015 10:52:21 +0200 (CEST) Received: from emea01-db3-obe.outbound.protection.outlook.com (mail-db3on0061.outbound.protection.outlook.com [157.55.234.61]) by dpdk.org (Postfix) with ESMTP id 16B6437AF for ; Mon, 6 Jul 2015 10:52:21 +0200 (CEST) Received: from DB5PR02CA0023.eurprd02.prod.outlook.com (10.161.237.33) by HE1PR02MB0811.eurprd02.prod.outlook.com (10.161.118.150) with Microsoft SMTP Server (TLS) id 15.1.201.16; Mon, 6 Jul 2015 08:52:20 +0000 Received: from AM1FFO11FD046.protection.gbl (2a01:111:f400:7e00::123) by DB5PR02CA0023.outlook.office365.com (2a01:111:e400:5805::33) with Microsoft SMTP Server (TLS) id 15.1.207.19 via Frontend Transport; Mon, 6 Jul 2015 08:52:19 +0000 Authentication-Results: spf=fail (sender IP is 124.207.145.166) smtp.mailfrom=ezchip.com; ezchip.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of ezchip.com does not designate 124.207.145.166 as permitted sender) receiver=protection.outlook.com; client-ip=124.207.145.166; helo=bjgfarm-1.internal.tilera.com; Received: from bjgfarm-1.internal.tilera.com (124.207.145.166) by AM1FFO11FD046.mail.protection.outlook.com (10.174.65.209) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 6 Jul 2015 08:52:18 +0000 Received: (from zlu@localhost) by bjgfarm-1.internal.tilera.com (8.14.4/8.14.4/Submit) id t668qE96024525; Mon, 6 Jul 2015 16:52:14 +0800 From: Zhigang Lu To: Date: Mon, 6 Jul 2015 16:51:27 +0800 Message-ID: <1436172698-21749-3-git-send-email-zlu@ezchip.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1436172698-21749-1-git-send-email-zlu@ezchip.com> References: <1436172698-21749-1-git-send-email-zlu@ezchip.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD046; 1:CodvzwVgmSUdBFRfyrqKGeOD7Sh1eELA+QqeScNmOWYFZHp+UQAdEqox6kjh4jd+Sy/4Rjomwf0Gjv8VB1CowDN+CS1Md8xT+5SBQn8yDt1BFklk/oYT/D8QsZAdrKQMiCXRw/4pZYnNwOl7LBS+F70WqAcC3AuH8z1yNFUkm/2i3uV1EY2jgzwBW1FG30B8cysnnCuM0AuGXLr+COeEUuwl52V58w1oDlSCupaBEF2518lfNQW3trrL1TbteanAReXRb0nFhtw2/v1JPqhoTZ++WhxMLiwNniKytqQR6/JliPiWo/7yA1oCXrf5bZ7WzitAZ4Of0D5Z8aRpNugt9g== X-Forefront-Antispam-Report: CIP:124.207.145.166; CTRY:CN; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(189002)(199003)(48376002)(105606002)(47776003)(106466001)(6806004)(189998001)(19580405001)(104016003)(110136002)(229853001)(2351001)(42186005)(33646002)(19580395003)(50226001)(85426001)(5001960100002)(76176999)(450100001)(62966003)(77156002)(86362001)(2950100001)(50466002)(92566002)(46102003)(36756003)(5001920100001)(50986999)(107886002)(87936001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR02MB0811; H:bjgfarm-1.internal.tilera.com; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; HE1PR02MB0811; 2:14p23NSTTtGCPDR4mz5g5RXfUVvYQHxY/+cx6VoLnTWcx+2fdUlw0rtozFnLG3C+; 3:UtffT1vVE3V60+hAfCv774CA2DXcGU+PTgpeQNq9WEPNReUq/v+BKVUFGlabREFe91qrU6vBNG6FzoG8FNHK2OBcX5HQO14cEKXR8JmZK+V1AXcC8VQfjwHvtVj+BSDWlf3wi7SBCwasjYYwfSNRJtOAHBgIAM49qTiK4gTgY+vMEDMIROXtLCe6l1eAzXRz7diguLqR5bTkLob97sxRehjepfLxm+ZVXCXuLzl7TGOcmZtJkzoGMokNt88EK6Q6; 25:qHj/ordCvjXF9mm7WHbpPrI5nVWUrMgnDaVZ86QjX5vWBZLK6Zsmc/EM98oDo7ZQbfzpzOFLf3NnHkeTc4fdHjxO3WDIWTH/QM0pxWNyc7ZZm0NoH156tkMNcXdkUC5G3BaLZTNFMKmPcJl/AgS9wlmYxAOr0cmkQo1S+8GUpM6igFOKyzFsjudmC8Axm5GFZClcSBsW2Jm3HhUAhI5M/eVAXFzmPgCINnswoWPKQDmwC5VNjny36zPFA9knseCmMU3yK22zbExKrNQeqgDk9A==; 20:ADojP+mB82WBbvHi8Lcf38F/pLMFkEHL70JQUSGUd5JcaB4FlpPqcmyH+wd1PRXmFtOqrAY9nA/Ce5BcwFXX3dMINdNfDS+RpvL/5ImQ9JTPkx7FSjes3WTrmS37FijFa3HsYEVKkrxVQj8uf5QhqjxsHE4SPhVUFKnBx6D0qLA= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR02MB0811; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:HE1PR02MB0811; BCL:0; PCL:0; RULEID:; SRVR:HE1PR02MB0811; X-Microsoft-Exchange-Diagnostics: 1; HE1PR02MB0811; 4:p3jV+QsPwW7KT2Dgqwa1ye4txbVcFKrpbV3BllCJzcj3/sR5GOMyv0oOTJs7lpsUUnB4hs73YOsv9uY26UykS3UYl5k/xvZ+/DMe4TJGzlCcc3uoujQv31OJ5iVOfyNa3Pm0IpCuDYraxP84XiL0vt3bBZNQk9ttTs+ibdSLqE9OicK684RymeZIIryAuwD+D3kGoZIF/IE3j2tCleKXfeuzt2HfQXHYnEAKo3ZUI+AHMPm5X6yyv4jQQQW+EUw+mrOChvlWcCJdaJoJTHemU+iM5qHShNt7gW94vbgtGbg= X-Forefront-PRVS: 06290ECA9D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR02MB0811; 23:h4cwP3uLs1L0Dr2JX2SBqX3EhXX3jbj6Dsm9js/bm?= =?us-ascii?Q?z/PNdzDqWtkde1/wQ83eXsYp2Nifh//iVTdlrvdTCFVt/yos7dkIG7iakZra?= =?us-ascii?Q?O7AIVpVgcmuXhUssG2XV+GbkgHN7Z74jBz3OxymSByeI/Z/6WPSAUvmOzwaU?= =?us-ascii?Q?9TGM12TVrPtuUPfvlnMFsFp2s451+Eaj0ySmQslVVmSpzwRwfBi6ZDrJ8Bkk?= =?us-ascii?Q?WSmpDEEQe7Q0eQmJR95+94X4ZTLPVZQh21dnkDGVaNHsBTtM7Io2DCHcEykr?= =?us-ascii?Q?jQYu9V6cNgxN+Ak+IbeIlP31+iXW8CZq0eqH8px1wljMbzdCYIZVppujV6Pv?= =?us-ascii?Q?7+JbMEwQh72S+QL4TPvhHOvgeZiQH71qjsylRi+AKMK/aqIBKadyodBDt1NK?= =?us-ascii?Q?XK6mogKDdxphtuMDdBfEn06xgN4IF0bd2a0rB0emJm/PVqeuKBYLKhHXSPSl?= =?us-ascii?Q?cMbgi3ZyFd3e6MUVE4dqhWa4l/veuQQNtAcNsQDc7n93N4+c82yWeVCIeWIp?= =?us-ascii?Q?CZ9qhYv/SRIUs6yshWvTewI2EX/2e1hm9q3e3mXAWalVBCm/0qcK+juCagjF?= =?us-ascii?Q?5pQ5lYSRSC83yhRvp2ED22dEjxl3bKIV441tr0Up/2YJA5Rsdr5QSmVHuO/V?= =?us-ascii?Q?uiiE59DZYbiqdBlLbj72XQ0YbmCBz+s5pza6VtujB2zCwtOJG5DHydclFbWa?= =?us-ascii?Q?IlbCcCTNjUbNdT56RlJK0v312+O515CUYxWLgripdemk6udiaBc9z/x+dcfc?= =?us-ascii?Q?ojt9Ff4xInmFAotkFVgsc1uPjGyn5OgqIhDbO7FMgx3KCt0t4H6zDnuE/1qU?= =?us-ascii?Q?McrGTpPUPkN9oeQ6beFfA3BRqM0jx4+d/fUB6NS1xj9svl2e8CjN+7thOZJ/?= =?us-ascii?Q?j+xL4p1EQvLyY6I4aH/2iKhsB8As/71bUmcPYhrEzLIkbBsZYSHKEpvGPm3V?= =?us-ascii?Q?ZMoXt4KwJkw1d4XKG/pMsJKwElZ15LLAQmA8gS7cB20ZQ3HCOHHO9J1HFw+Z?= =?us-ascii?Q?gg=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR02MB0811; 5:6XxVXp49Gg0IQNaswuH8y7wHbwl5FFr6Qhx+LiYWUm7aMsYPHWo0G+BgKKqc96tPpek09ejuxjDp4XZ+Vs8gBSrpCDP5HTBHv1s4WOmTpHDsb32VVPt5JSEd6qd2phBnUD0Q724a/Mj8wGYoDG30iA==; 24:C0fFYy6VHuj1/9KklSb0oUClkRgROjr7rwUdUliACq3J+i4xSag0zZC+9AiQuwYqEM07wYLYkN8YYA8PiDTx4Wu2eAROzkgsGcGCK2EJeYQ=; 20:iGwQv8Nwdk32Ob0W17yA0sZhD68d9Vf2D1E9VKl5xS7v4rMsLiw45b2HNVp0CGMwmxNBGrlq/dOgLH24/g9cxQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2015 08:52:18.1585 (UTC) X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3; Ip=[124.207.145.166]; Helo=[bjgfarm-1.internal.tilera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR02MB0811 Subject: [dpdk-dev] [PATCH v3 02/12] hash: fix compilation on non-X86 platforms X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The "hash: remove duplicated code" change unfortunately broke the build for non-X86 platforms. This patch fixes this breakage. Change-Id: Ie109d67e681b75b45320fab1bf9de4eb9c9701bf Signed-off-by: Zhigang Lu Acked-by: Bruce Richardson --- lib/librte_hash/rte_jhash.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_hash/rte_jhash.h b/lib/librte_hash/rte_jhash.h index e230449..d1b6cf3 100644 --- a/lib/librte_hash/rte_jhash.h +++ b/lib/librte_hash/rte_jhash.h @@ -44,6 +44,7 @@ extern "C" { #endif +#include #include #include @@ -122,7 +123,7 @@ __rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc, const uint32_t *k = key; const uint32_t s = 0; #else - const uint32_t *k = (uint32_t *)(uintptr_t)key & (uintptr_t)~3); + const uint32_t *k = (uint32_t *)((uintptr_t)key & (uintptr_t)~3); const uint32_t s = ((uintptr_t)key & 3) * CHAR_BIT; #endif if (!check_align || s == 0) {