From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755729Ab2DTWFx (ORCPT ); Fri, 20 Apr 2012 18:05:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34169 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754984Ab2DTWFv (ORCPT ); Fri, 20 Apr 2012 18:05:51 -0400 Date: Fri, 20 Apr 2012 15:05:31 -0700 From: "tip-bot for H. Peter Anvin" Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, richard@nod.at, david.daney@cavium.com, tglx@linutronix.de, viro@zeniv.linux.org.uk Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, david.daney@cavium.com, richard@nod.at, tglx@linutronix.de, viro@zeniv.linux.org.uk In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/extable] x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S Git-Commit-ID: f542c5d6e57ea32daae3708a71911d9f5c883c5a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Fri, 20 Apr 2012 15:05:37 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f542c5d6e57ea32daae3708a71911d9f5c883c5a Gitweb: http://git.kernel.org/tip/f542c5d6e57ea32daae3708a71911d9f5c883c5a Author: H. Peter Anvin AuthorDate: Fri, 20 Apr 2012 12:19:52 -0700 Committer: H. Peter Anvin CommitDate: Fri, 20 Apr 2012 13:51:39 -0700 x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S Remove open-coded exception table entries in arch/x86/um/checksum_32.S, and replace them with _ASM_EXTABLE() macros; this will allow us to change the format and type of the exception table entries. Signed-off-by: H. Peter Anvin Cc: David Daney Cc: Richard Weinberger Cc: Al Viro Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com --- arch/x86/um/checksum_32.S | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/um/checksum_32.S b/arch/x86/um/checksum_32.S index f058d2f..8d0c420 100644 --- a/arch/x86/um/checksum_32.S +++ b/arch/x86/um/checksum_32.S @@ -26,6 +26,7 @@ */ #include +#include /* * computes a partial checksum, e.g. for TCP/UDP fragments @@ -232,15 +233,11 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst, #define SRC(y...) \ 9999: y; \ - .section __ex_table, "a"; \ - .long 9999b, 6001f ; \ - .previous + _ASM_EXTABLE(9999b, 6001f) #define DST(y...) \ 9999: y; \ - .section __ex_table, "a"; \ - .long 9999b, 6002f ; \ - .previous + _ASM_EXTABLE(9999b, 6002f) .align 4