From patchwork Fri Feb 3 09:54:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9553715 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 448DA604A7 for ; Fri, 3 Feb 2017 09:55:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 369C62850D for ; Fri, 3 Feb 2017 09:55:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2AE3E28511; Fri, 3 Feb 2017 09:55:09 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF2472850D for ; Fri, 3 Feb 2017 09:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026AbdBCJzG (ORCPT ); Fri, 3 Feb 2017 04:55:06 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37957 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753163AbdBCJyu (ORCPT ); Fri, 3 Feb 2017 04:54:50 -0500 Received: by mail-wm0-f54.google.com with SMTP id r141so19479601wmg.1 for ; Fri, 03 Feb 2017 01:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fxGR1YG5KpKkqh3+63hx/c4j58cqgelrl1xhilCE+Bc=; b=MzoiFVRjvVvNmiC9y62EytGbecxeAj2N8/3xkth42FdxddZ5zv66h24XRcmsLCSbWW vfDgmVkw+CLOQNklRdmD6+IMW6mBupC18FjPo9+/oEP/k4bqJWGWl9GXTcXj+krhCXRE VZUtx3bzw1A6FVpOaLgN/WAd4spu5HAQ8LH+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fxGR1YG5KpKkqh3+63hx/c4j58cqgelrl1xhilCE+Bc=; b=XqobCe4Sya9/GvFMK2Gjt/0429E3WhTcpakI+Zn6k5nTerEjTL/0EBeYK24UOCrLGq D83oI82hkDACJ13Bx4LKjyD3NU7x3/WDMevxIi/EpKDpnzuirdi26i4Ty/4+ZwfJUDKw Jdv4qnXqbDhpXtNg1v612qpi2eN6+Ah/ETADafiWNu2Ycgsjcwxg33Nhc2J9qckJB/8Y Q//WnDABVlIchLlwLPEoZyKk9PNvF25cn/fN2DdcyeCbCKvF/lETRhR1lM4hPjh2ca/e lfEkvugRC2iBLUJ4eOX/1uDr0QOU+ZYADaqFCrSXJzNIpYVTyIg0/2AMgiVL16caS5kT voWw== X-Gm-Message-State: AMke39klfLkT6vCOP5rMSOmLmnnzr5VRT8uAFNcMxGvc72YqGWkxJ/KQs6FtN0xeF+9VO1VS X-Received: by 10.28.20.209 with SMTP id 200mr619358wmu.64.1486115679238; Fri, 03 Feb 2017 01:54:39 -0800 (PST) Received: from localhost.localdomain ([105.130.17.13]) by smtp.gmail.com with ESMTPSA id l67sm2144562wmf.1.2017.02.03.01.54.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Feb 2017 01:54:38 -0800 (PST) From: Ard Biesheuvel To: linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, jeyu@redhat.com, rusty@rustcorp.com.au, mmarek@suse.com, mpe@ellerman.id.au Cc: torvalds@linux-foundation.org, arnd@arndb.de, viro@zeniv.linux.org.uk, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel Subject: [PATCH v5 3/3] module: unify absolute krctab definitions for 32-bit and 64-bit Date: Fri, 3 Feb 2017 09:54:07 +0000 Message-Id: <1486115647-27680-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486115647-27680-1-git-send-email-ard.biesheuvel@linaro.org> References: <1486115647-27680-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The previous patch introduced a separate inline asm version of the krcrctab declaration template for use with 64-bit architectures, which cannot refer to ELF symbols using 32-bit quantities. This declaration should be equivalent to the C one for 32-bit architectures, but this needs to be checked first, so unify them in a separate patch. Signed-off-by: Ard Biesheuvel --- ... which can simply be dropped if it turns out to break anything. include/linux/export.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/linux/export.h b/include/linux/export.h index 7473fba6a60c..1a1dfdb2a5c6 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -49,13 +49,6 @@ extern struct module __this_module; " .weak " VMLINUX_SYMBOL_STR(__crc_##sym) " \n" \ " .long " VMLINUX_SYMBOL_STR(__crc_##sym) " - . \n" \ " .previous \n"); -#elif !defined(CONFIG_64BIT) -#define __CRC_SYMBOL(sym, sec) \ - extern __visible void *__crc_##sym __attribute__((weak)); \ - static const unsigned long __kcrctab_##sym \ - __used \ - __attribute__((section("___kcrctab" sec "+" #sym), used)) \ - = (unsigned long) &__crc_##sym; #else #define __CRC_SYMBOL(sym, sec) \ asm(" .section \"___kcrctab" sec "+" #sym "\", \"a\" \n" \