From patchwork Fri Oct 9 02:55:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongsheng Wang X-Patchwork-Id: 528082 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9718D140DA0 for ; Fri, 9 Oct 2015 14:02:43 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 7D0591A02D2 for ; Fri, 9 Oct 2015 14:02:43 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0144.outbound.protection.outlook.com [157.56.111.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 5E5661A0248 for ; Fri, 9 Oct 2015 14:01:42 +1100 (AEDT) Received: from BY2PR03CA050.namprd03.prod.outlook.com (10.141.249.23) by CY1PR03MB1488.namprd03.prod.outlook.com (10.163.17.18) with Microsoft SMTP Server (TLS) id 15.1.286.20; Fri, 9 Oct 2015 03:01:35 +0000 Received: from BN1AFFO11FD024.protection.gbl (2a01:111:f400:7c10::132) by BY2PR03CA050.outlook.office365.com (2a01:111:e400:2c5d::23) with Microsoft SMTP Server (TLS) id 15.1.293.16 via Frontend Transport; Fri, 9 Oct 2015 03:01:35 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD024.mail.protection.outlook.com (10.58.52.84) with Microsoft SMTP Server (TLS) id 15.1.293.9 via Frontend Transport; Fri, 9 Oct 2015 03:01:34 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t9931Skh032093; Thu, 8 Oct 2015 20:01:30 -0700 From: Dongsheng Wang To: Subject: [PATCH] powerpc: Quick fix upstream main line build error on PowerPC Date: Fri, 9 Oct 2015 10:55:09 +0800 Message-ID: <1444359309-40375-1-git-send-email-dongsheng.wang@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD024; 1:IqzvHfSHhlai+w3dJtLy5D0wtAyfxfNoonikaiwBwOLAmnAFScE5OhxAJXzdtddS6iL28PG0+oI3ociJDvZaUqDtGlGDbwnopvzWvVf0x2S2CyGTHjOpdKooVWbmaNt3Fo4iJR40nC3SjcrYIeWEhofFuPgFjlD4JvYTCHC5u/VaONjl5FTYv2jOal/eFAwdyjq1xLHrAQT/q1yJyXnwIeWIaO8pueLi31TyRXDNinll5qfNpJgvZtD1go6x5lEOheA2bYqcWs2VzatKs0ARrsGSN4Kun6g5lZ7ZUKRU4yEKQY5t59jO4HsH+uZ1ftKed7RqmBEmVdcE2hoWRXoNO3R2/79kTdc9BHQb7QjVANYJytVC9Lve2UaJr/lJJHDHd7GwDRNjVZ7+8+zYrOM/sw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(33646002)(5007970100001)(5001960100002)(50226001)(77096005)(2351001)(110136002)(11100500001)(104016004)(64706001)(97736004)(46102003)(5003940100001)(81156007)(87936001)(229853001)(189998001)(36756003)(107886002)(6806005)(47776003)(106466001)(92566002)(105606002)(19580405001)(19580395003)(50986999)(85426001)(86362001)(5008740100001)(50466002)(48376002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1488; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1488; 2:sffCIvp8OoUApVhUqXfH9MnAc66ag1cu8GTcbB9EheljqrAi+6tmEkF60HSkPmRe6+UN5oXv04rhjG31sfOe3arjwUQJQsSeLHnXBFNGLEP5k4NErG4RyK5LGdO3tUR5jiWufhjDOGLW1dpR7b3mncnKpukgstQgzWNLVY+Tpps=; 3:c9IgZj0E74NxZJD3ssHrDJrKQY6SoI8pUcA0WX9n/RuQFiFLEo9LVDGGz8QEp6knOmlMLjgofO/k4I33VnGtxKEj/gXAIGQnx6C1tQJMfGstLtLtuKDavP2A+WCn6iP2Dm9RE0AJmtAgqbo4GQ7n1ZiIRaZLyOYvfrx5DmGy19a8/UAOAXcbEnVue2MZvyxhDIQz1Nhaxj0AGT3z3CcoVjFmfsio3oJNw0PjlK+kmdk=; 25:p/+NaKUNY8Jh+rRP1WNQ1MrbyIvO3doJl8EKaXWXfDGIDp8Tr3QHJz1PACR6W5nYKdQsDfoYNMGxzeiMmMB+MOeqPPnEakiq68oLNJ0vyfHRftneeFVsxsAt4hU04WbowMML2BFqbeynvQwmdEadVve+/Io2GHZblaXmPJzM61YGjqpp20ANf1XDR8MuluJF1xQDDKNU6oRvXgn4F9/Iw71zVT8NX4CyW35GBaIz16LtSyNN5pvHt3o8I/ywHSIz X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1488; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1488; 20:T0wdpgyK/NwcAPEhNhiFL1RbYwK7YWN1yIJsutGwu53ewuNTt4teL6M1NT+YReDRE1AblIfzPwWzxVl0SURFve6fvCuhrsTI+URHLqUnAT9dOPcgWBLiZcI3qIXj/zEJjbxsynwNWMkyl+eNI1puIHUkI6yko1drPLOJA7dbuSb7LQ+bv2dy0KNU+IXh3FcwHFeer8ruMp+9TyAZOh9hLERmWVS0vgqWha3ECkDuvrZG2ZnDnVYLo1n8bI9+0VHINmdGuIvbiN6y9B4uDPQFwEbQe9K5wlNv6QN9yt/X4AfTDigft4U8DL2tYxnwLeRilhJIn9Es7QdpQh/mq23k5PscjgsYKtcUY09lW508kbk=; 4:Av4EOQu2+Tx+/j/1QCRGeMXIaN5MSUNUaRIs+FPU6o6eI/S6jqnQUyQ7ET/kDdZ01IT1qyNCljyHdlkxNwStzKAuSgMwLG5IcJwXMSoVl4SuuBzmJfQ3NSWNPMi4hOJgZ6qoqHNQKAQzyu7FNZNUMhK1ZXqbANQEn+Dw3sOJ2icW2gUW2PmtGsejqfVhKaLW1+JfZPutzia5HLQs1BWRDCOKaQQJdISEnejd3BCjpob/kfs/kaTCuJMTIjlgGpNuMe3Sl4oJP3qWa8+ivlS/ZOLURjsGmAzCOmaljFQPPfYeVDs3gQlztkStPGWMAPMbyIM4vo2lSvK3D6UmLKX3Iah7W8+kUtM1wHEXzCmL5VA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001); SRVR:CY1PR03MB1488; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1488; X-Forefront-PRVS: 0724FCD4CD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB1488; 23:lCsNk4F/JodfhouCbAZ5AC7VBsIW/Axs6xfzeOqr+?= =?us-ascii?Q?YUmhbAqT4kg4cQbMhiR6lEqbzS3gFxKYb8oeGPDOUSEFRPHUUh6VvxdKISZL?= =?us-ascii?Q?O8ObNsElLSweh4hogKl4anFsShodAb56ix8fDcHPgm73ftyORxZNvbxBrkFx?= =?us-ascii?Q?UwIdOpvpJMj6VxSmojeBC0fy1b8SYN6IhVgHOAvs35RH25QzeOyYWxkcZ6iC?= =?us-ascii?Q?W1Fg/NtU19n4qARL/D03WyORGl2uaKbtRZWDcNUuqo/jZ2jkwUNGmIOadqUw?= =?us-ascii?Q?DayKHVDcE89VHNALa3R38/NtxlBZyA96bIiH+QD/fQEvRD8sqpN11Ic6o2Ml?= =?us-ascii?Q?Z5oJr3ZLeVwQ4ho1prMUvTW48e+8pYf07F+/JxRxOsqGaYC+tb5mDzWgfLLS?= =?us-ascii?Q?jixrss0Uxlme00xBTWs9Zwhz4L2t0pm2MVbMblS890S0nC0PwB5F9D7uPIvq?= =?us-ascii?Q?GxeNK+B0wLZjZIMl+kiCZ1brd1ATTVphDBzRMXNQY1Re6xp5UpSDbfVQ88l1?= =?us-ascii?Q?ZDd3267ZGuXzk7Iy4Nu9azFvz0LAyCVknAMTf8FFat9kBiJh2B5R+bMqEfbl?= =?us-ascii?Q?vbVheW3i19uyeXoWCCEP/mtr3a5b+dQEfXmLzfDAmlkUnTxU6PmM8EChMPVn?= =?us-ascii?Q?maiLEs36OF117twYlTs+haHpTaDRNhflYSfNjB1aI+qfvavqzWGLfOxoGpsP?= =?us-ascii?Q?vGc0Qp8tygTM5J9h0D3iaJPdrQSpnfJU2gfmhJXSyny+yn44AIZcJaoTeLGE?= =?us-ascii?Q?r6wT7isQjXrCojQi0dGaA8fE0gbsWQlAhTf8+t1JYb53pFwYfZhoN9GhLjg7?= =?us-ascii?Q?THVO6OIOHCIHjTNUj3idA9X7HK7n0kCbSkpdMr6MIEQoIJ4IOo6JtLuWs0pC?= =?us-ascii?Q?oWBXxOO3/kco5t8n2ZLOPqPK9xCHKAG/v2uqajJCK0HlXAVFrAzXUH4zYx+1?= =?us-ascii?Q?I6zaFjLJB4IsIBWQ5HBFbq9BHTMec2Xnjo4/LxJbICLrM0n2mJOmyshB5/Gg?= =?us-ascii?Q?LIwtjcjIYIdhDNKTDWRN/kP7O5i5vLs0xDzLQiyWHD5i1zXrunnVaq0x0Ckj?= =?us-ascii?Q?WLybWCJtfH1uzR+NUplKRllA9gi?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1488; 5:KDBpUIaDAZpy63VlilkIXpEaLnqpnEgvCFhWFqelwPweuxH47mK9oG2/eZrbyEwwSK09qOq2DoUzfDGVkrvqK+I/5F0wpEt5/UlInIUJy5PJdfdaoGgm8SktxrFARrbXixB0HbpKxirX5xu4DD6xiQ==; 24:ckGHNVLZjaLGk4eKjadJgzLB68DqvKfYnHfYEC5oCTpP8kAdzPAJ1+kuo1j04Y4vpt81fM6tZypo8GQ/d+i/fWcNhE2RaYdZs/xAnQKs3w8=; 20:zDr3IxK4Xxx2Csu8JPxpF8Irq6pizxqD+0ZM+nuRZzhFTNJ3ylXFtWKlC09bKz5SZfNGYj31ibMyHQtdABuzag== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2015 03:01:34.9053 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1488 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, Wang Dongsheng , cmetcalf@ezchip.com, paulus@samba.org, scottwood@freescale.com, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wang Dongsheng This issue caused on 'commit 990486c8af04 ("strscpy: zero any trailing garbage bytes in the destination")'. zero_bytemask is not implemented on PowerPC. So copy the zero_bytemask of BIG_ENDIAN implementation from include/asm-generic/word-at-a-time.h to arch/powerpc/include/asm/word-at-a-time.h. Build message: lib/string.c: In function 'strscpy': lib/string.c:209:4: error: implicit declaration of function 'zero_bytemask' [-Werror=implicit-function-declaration] *(unsigned long *)(dest+res) = c & zero_bytemask(data); cc1: some warnings being treated as errors make[1]: *** [lib/string.o] Error 1 make[1]: *** Waiting for unfinished jobs.... Signed-off-by: Wang Dongsheng diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h index 5b3a903..d891456 100644 --- a/arch/powerpc/include/asm/word-at-a-time.h +++ b/arch/powerpc/include/asm/word-at-a-time.h @@ -40,6 +40,10 @@ static inline bool has_zero(unsigned long val, unsigned long *data, const struct return (val + c->high_bits) & ~rhs; } +#ifndef zero_bytemask +#define zero_bytemask(mask) (~1ul << __fls(mask)) +#endif + #else #ifdef CONFIG_64BIT