Received: by 10.223.185.116 with SMTP id b49csp6406192wrg; Wed, 28 Feb 2018 08:54:12 -0800 (PST) X-Google-Smtp-Source: AH8x225rhfA6KpWXQZsiW8uV6laCw8Wn7mrp0nw9o++u7Gs5tVxZfzXidnwlHF59M4PSpmbzvsoT X-Received: by 2002:a17:902:57c6:: with SMTP id g6-v6mr17531034plj.358.1519836852749; Wed, 28 Feb 2018 08:54:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519836852; cv=none; d=google.com; s=arc-20160816; b=C7UdoEg8V8KpHFQ5QA2SbJ4SzzJO4BvkeRuL+iuNNxC0o1ydam+Wj7Gm6u28wL04zk Yk5QAROMCDixwhP4fWV9Rr0OTQ/Y5LNSCtmAANhBaFoCqYrQkrFyIldEFjs7uAI6wV/Q zgnQoicyt/kIdTDep/hxEJALurBqqPT4BexI6Yisz4YXcnQUV5rUuh0wXr0cI9+UYfW1 AKK80OFym07hxdMuvSauLlinjJMsX/rBFTfC095dC8qOqGXNwHF+5ZVST3upjDMadJ/2 nHjYbhncTXqY/558UF0XQ1/sh4aE4s+N04/dMQXVmC06sSXFG20H5Qg7q5Jqjsmbn2MK zmhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=PdhhUpLMH3UMYg5oEs8MlueSZg9kkdmBT2Q/jknkxPU=; b=IHV+clJWOYhkH37WDPhFRjFjEyn+d/0QIgttB20uwP/q4iAR68Te94HHGHQBg30pZj ci/OO3DB7VpzWdchyIfpOtSSKmh26u0FgEihSTCWFuRSGJlFmDxDupl4oj8X3tzOPSRx SHvkbkIBogtzvwjY46Gp+CKmgW7R/QLcg/GLzWXGpUIarbqM1ZJ2/MIBPbz0Wyi7J8ok vWltfjVKyTaGlLzbTYAYnOBQcF8We5lCC3cgsQTyeGopNMyySIEmzZCLunYfPTM10BMF ut1pCzquWHJXtfDP3wCcvQh2gu07AQCLkOyQVeds22NMOjklXobkasT46+6LpFh3EVkj d9AA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 33-v6si1484191pls.710.2018.02.28.08.53.58; Wed, 28 Feb 2018 08:54:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932784AbeB1QxO (ORCPT + 99 others); Wed, 28 Feb 2018 11:53:14 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:34544 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934236AbeB1P6E (ORCPT ); Wed, 28 Feb 2018 10:58:04 -0500 Received: from [2a02:8011:400e:2:6f00:88c8:c921:d332] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1er3Yr-0006XQ-OA; Wed, 28 Feb 2018 15:22:29 +0000 Received: from ben by deadeye with local (Exim 4.90_1) (envelope-from ) id 1er3Yi-0000AH-05; Wed, 28 Feb 2018 15:22:20 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Denys Vlasenko" , "Joe Perches" , "Linus Torvalds" Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 149/254] stddef.h: move offsetofend inside #ifndef/#endif guard, neaten In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Joe Perches commit 8c7fbe5795a016259445a61e072eb0118aaf6a61 upstream. Commit 3876488444e7 ("include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header") added offsetofend outside the normal include #ifndef/#endif guard. Move it inside. Miscellanea: o remove unnecessary blank line o standardize offsetof macros whitespace style Signed-off-by: Joe Perches Cc: Denys Vlasenko Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Ben Hutchings --- include/linux/stddef.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -3,7 +3,6 @@ #include - #undef NULL #define NULL ((void *)0) @@ -14,10 +13,9 @@ enum { #undef offsetof #ifdef __compiler_offsetof -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) +#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) #else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif +#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER) #endif /** @@ -28,3 +26,5 @@ enum { */ #define offsetofend(TYPE, MEMBER) \ (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER)) + +#endif