From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4000417-1517256383-2-9753059567454268768 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517256382; b=s01PWwNgcO7EcnFVDThUGRtAhGGiD3iWwPoizUROEaOM1dX jC27X5r5aj1HX1SnYsJGmUOOboGA0JEwFKTgRjTkjR/iSz5DZjnzNOa7Kn/k5v5a u69HiLoWQV9tNsvCv5/+vKszAnWMqgBOKTqbhkLNa5O7N251mgiNtDUOkxMcm2Ok Zxs8AiQOhhDVmEx+9N96uQdHEunnla2DL6MvLemn8oPJuBFmHpr+HIWVk4ZyNzky kJlhdVovBsrtnF+eFi+8J77whiTQBejGs+W+wPANn0hMkK411x9apEzm7/OGWjlI TzqTbhF8dolzNi/C+9dyWsXK8qZIhxJBZVj0evg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1517256382; bh=zQHY5nwGaxK4NRSz567Qq1Rhis FpqmP+0NvKkhGsQMc=; b=BM6v351Ic5v3J3VE7KaVIofLwhgSknmoBpTsM37337 SwVRu5oU11+QhpJRm3lFpHSIdlg6lexNICWFZkRiqXYsBcPmLt/ISgT8FimbdC0c BzUpdh8l1LgjZSeyykZQHPWabEv2Y0ZQvIXm4O5jA6Za92oeYY0HfgVkre84MeYX Nq8FKIq2F5vShmmZiXOF/CrEX7iwkdcclslyZrBaSRw5Dtuz0HQztyZeZpjNg8SE kK35S0PMLoCSisr33NLzogOTTUl9AdMw5Lqj3Iyvj6xa9xGhVRfNPv0Ea/4LdW6u HFImqlDNzjXprx1kYygp7WfXRB3wGqbKifGNIlL6FI9g== ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbeA2UGU (ORCPT ); Mon, 29 Jan 2018 15:06:20 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47804 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbeA2UGQ (ORCPT ); Mon, 29 Jan 2018 15:06:16 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans-Werner Hilse , Richard Weinberger , Greg Hackmann , Bernie Innocenti , Lorenzo Colitti Subject: [PATCH 3.18 39/52] um: Remove copy&paste code from init.h Date: Mon, 29 Jan 2018 13:56:57 +0100 Message-Id: <20180129123629.898971218@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Weinberger commit 30b11ee9ae23d78de66b9ae315880af17a64ba83 upstream. As we got rid of the __KERNEL__ abuse, we can directly include linux/compiler.h now. This also allows gcc 5 to build UML. Reported-by: Hans-Werner Hilse Signed-off-by: Richard Weinberger Cc: Greg Hackmann Cc: Bernie Innocenti Cc: Lorenzo Colitti Signed-off-by: Greg Kroah-Hartman --- arch/um/include/shared/init.h | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) --- a/arch/um/include/shared/init.h +++ b/arch/um/include/shared/init.h @@ -40,28 +40,8 @@ typedef int (*initcall_t)(void); typedef void (*exitcall_t)(void); -#ifdef __UM_HOST__ -#ifndef __section -# define __section(S) __attribute__ ((__section__(#S))) -#endif - -#if __GNUC__ == 3 - -#if __GNUC_MINOR__ >= 3 -# define __used __attribute__((__used__)) -#else -# define __used __attribute__((__unused__)) -#endif - -#else -#if __GNUC__ == 4 -# define __used __attribute__((__used__)) -#endif -#endif - -#else #include -#endif + /* These are for everybody (although not all archs will actually discard it in modules) */ #define __init __section(.init.text)