From patchwork Tue Jul 3 10:29:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10503753 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 276D4601D3 for ; Tue, 3 Jul 2018 10:30:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1732A289D7 for ; Tue, 3 Jul 2018 10:30:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14F7728A08; Tue, 3 Jul 2018 10:30:15 +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=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A67E928A07 for ; Tue, 3 Jul 2018 10:30:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDB486B0005; Tue, 3 Jul 2018 06:30:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B64E06B0006; Tue, 3 Jul 2018 06:30:12 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 858CB6B0008; Tue, 3 Jul 2018 06:30:12 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by kanga.kvack.org (Postfix) with ESMTP id 27C0D6B0005 for ; Tue, 3 Jul 2018 06:30:12 -0400 (EDT) Received: by mail-ed1-f72.google.com with SMTP id f16-v6so727673edq.18 for ; Tue, 03 Jul 2018 03:30:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=T8xfc7kyxaXR3p+78Nrhchd7faLnyV7B++cP2Bf/kMc=; b=NfMz95M+ZhWzF3rcwCwMfRJf7GUiDDMps8nLexojBLFSrGIhem4oAMo1vd6fk/jNqT 2BmSXT3YB6/9rZYWeXpt9ljQZXxv5KQW3q6ColXxd+YXCGuXnQGhVVHffyqOuAIruo36 GDFDbNC1nK49sNQoJQIWRew0hYuOYbePnXxtVqJ+SLckfJ1A+sGtOQN/SdCMcesk1F+N jqfTslpsW533bMmD6AoNZYRL3mbZ0drmynwNJX94H5nCX3kRhBPSLrM9lmNQXpxh4lp/ tQ4kgOQ6CY0RVBXM1PlqrwkinaGnqbVrGLeXWL2mPOv4Zed1hMr9Eh/ULpx3xW0vOz4R 3h7Q== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: APt69E34YCJ6sRob/NqzR3tuqPAqScGIJonAdkchprtUl7jsrqgBJ1gS F+spIh1y3/RBCKLecVbWZIWvJkZTjXjJKXGC2CFso7tOO1RaA9zmGlrLtnVombSpVvPBFHvIz8q KIzIiIym4UDbD0zL0mHhoWXAiaAplom34CCa1EmCpaII/0BlEuDcWTU61H1FFOzQ= X-Received: by 2002:a50:ca02:: with SMTP id d2-v6mr18958496edi.53.1530613811712; Tue, 03 Jul 2018 03:30:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc9eEEzqJnhsKUz4swcvMXU+tiV01qsOjBnnCY9pgokGEv16gVq95XG0q368wOlPS3BY+xO X-Received: by 2002:a50:ca02:: with SMTP id d2-v6mr18958455edi.53.1530613810911; Tue, 03 Jul 2018 03:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613810; cv=none; d=google.com; s=arc-20160816; b=wTPeYbETO7N9q3ir+EVBoVW/H5gzPWnnRWP+xW7hAdqS7WUNp4oHJyEFQJVG1Th2RH 3IlV56+dWK2P/DTy16TglqtZ/6swWjcUPvfXABL3gvarZA8tFCm38E5f+IGzYWTUY6fW JmFa68eSK1sTo59668iUJJOx63sx7vtj6pFrrj5NaGHD6LEhU3m2BqvpDlPvuWLkK3k0 4bjqqZjOfJ/LOV37iHKOCuabpZfcY4/GRVJ/gJs8N7PEpUqzlogPQInLq39cm1opDgz9 4fkgZUMi16EQy/JsEd1KRVJ+qpui+EQBvo9LaRnI739AGmALReb/J+qtV+YXRZ8TrEr0 SYcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=T8xfc7kyxaXR3p+78Nrhchd7faLnyV7B++cP2Bf/kMc=; b=lpvBYW/HS+PrEQ062C6rEpP43J4tJoJHkaSj81Mhl5XOnRzXYiybmMguU+fcUVm1lp tEVcs7J8tB30b7C68gEV0ppJXQ7yXxT2uG06jf6EgHZJ8PPqFzruS9nayAcDqsHvKw6D 2qmftk71XZ7YlzQ3Aw8dXAvtTamrQFZQi+dtN16UrrmRYttSXNN3ldL2Vfadcsmnmx64 od8YuTY9X6P3WUdqZOrheSzarOPQ4p092W/s/cQOo/y8wAfIOMRwkb3F6fjYK8ggqR80 ewDPd1HQgR+A8AyERbt2KbQiT18TZH2asMzC4q43uel0S9WbGYJO7dJeE2ztryUfd8IG NfwA== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id c31-v6si1175928edf.296.2018.07.03.03.30.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 03:30:10 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w63AOWiQ111846 for ; Tue, 3 Jul 2018 06:30:08 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k06dethem-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 03 Jul 2018 06:30:08 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Jul 2018 11:30:05 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 3 Jul 2018 11:30:02 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w63AU1rM13631684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 3 Jul 2018 10:30:01 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8ECE1AE059; Tue, 3 Jul 2018 13:30:04 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C09DEAE053; Tue, 3 Jul 2018 13:30:02 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.206.209]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Tue, 3 Jul 2018 13:30:02 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Tue, 03 Jul 2018 13:29:59 +0300 From: Mike Rapoport To: Geert Uytterhoeven , Greg Ungerer , Sam Creasey Cc: Michal Hocko , linux-m68k@lists.linux-m68k.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH 1/3] m68k/bitops: convert __ffs to match generic declaration Date: Tue, 3 Jul 2018 13:29:53 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530613795-6956-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1530613795-6956-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18070310-0028-0000-0000-000002D7AD91 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070310-0029-0000-0000-0000238F2E15 Message-Id: <1530613795-6956-2-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-03_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807030120 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The generic bitops declare __ffs as static inline unsigned long __ffs(unsigned long word); Convert the m68k version to match the generic declaration. Signed-off-by: Mike Rapoport --- arch/m68k/include/asm/bitops.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 93b47b1..54009ea 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -454,7 +454,7 @@ static inline unsigned long ffz(unsigned long word) */ #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \ !defined(CONFIG_M68000) && !defined(CONFIG_MCPU32) -static inline int __ffs(int x) +static inline unsigned long __ffs(unsigned long x) { __asm__ __volatile__ ("bitrev %0; ff1 %0" : "=d" (x) @@ -493,7 +493,11 @@ static inline int ffs(int x) : "dm" (x & -x)); return 32 - cnt; } -#define __ffs(x) (ffs(x) - 1) + +static inline unsigned long __ffs(unsigned long x) +{ + return ffs(x) - 1; +} /* * fls: find last bit set.