From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx49hOmRFBKdPf9bLk06FZLpcKs84vJkTdkoyo1rN/e79pQiq9Dv7nB9xM8zaVQ1kfuM4u+Ff ARC-Seal: i=1; a=rsa-sha256; t=1523021397; cv=none; d=google.com; s=arc-20160816; b=YMnk2+pwEZIS5YGukXc2WQ63dqZTjyRyIMHj4Wjnjwld0Sf8qqty6I4NFx2pcXsip+ HloTa5jm/5NHJ13e4ldrLVFb6dMdvv12tyOJ9yJuPSDUGWtbzfa57y+1WuQ1Vw8vUCxZ QQwkuifNkQuONJm/4tjnXuOgsufaoyqmFx5lUM445D90cZLYCJkf545NTIRGlVSvCXnv G2vbCAGvTg7hHuAbEjegqDcMI7bRJWVrCDbyUW9RppvJkjG3i9g6yu/CNjVEkOHS3m02 VE74UMJR6Ls8MRtn6veUYs8udsV+LPiIpCWXDsMj2hAvyheZZbPR+XuF+56SuwJDBHiP yRfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=L7g3WCshnaDTHmWidYhNKCMAyMB+IGAEFzUP27AEa6A=; b=TuA3EeqPfUVOSrj0/yra6IfiZrEMWeQp406acdpTYH6Umb2HRxKvH41DuQzGPvA+xi JJyGuRpkgTiI+Jh4V7+OrInfaJFWDUAbRTKZOq7zJ0aN3DfUL0r5CrOEs5oJOJn7QbDn 7Yqb/4TO3Nc1vPmMfWQbL7WuVR6WtG6fkNH6JrzFLSmcEuyZQjV2TrW3ENmw3xD+VIy7 muRiXIvNMmx6pvbQpZEvDCItpD+fOkXq68QMzBHn2H+SPvB9QmMeXjR0T3/+gw2CIK+o ByOihwSRZXdjra2qqfLjoRDojhbF+7RPiOXhvFZNHX6j62oEf1cj1UuRZRmvndYkaNke Zvaw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthias Kaehlcke , "Jason A . Donenfeld" , Grant Grundler , Michael Davidson , Greg Hackmann , Thomas Gleixner , Andrew Morton , Linus Torvalds , Nathan Chancellor Subject: [PATCH 4.4 22/72] jiffies.h: declare jiffies and jiffies_64 with ____cacheline_aligned_in_smp Date: Fri, 6 Apr 2018 15:23:23 +0200 Message-Id: <20180406084306.988867365@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084305.210085169@linuxfoundation.org> References: <20180406084305.210085169@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597003685413855358?= X-GMAIL-MSGID: =?utf-8?q?1597003685413855358?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthias Kaehlcke commit 7c30f352c852bae2715ad65ac4a38ca9af7d7696 upstream. jiffies_64 is defined in kernel/time/timer.c with ____cacheline_aligned_in_smp, however this macro is not part of the declaration of jiffies and jiffies_64 in jiffies.h. As a result clang generates the following warning: kernel/time/timer.c:57:26: error: section does not match previous declaration [-Werror,-Wsection] __visible u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; ^ include/linux/cache.h:39:36: note: expanded from macro '__cacheline_aligned_in_smp' ^ include/linux/cache.h:34:4: note: expanded from macro '__cacheline_aligned' __section__(".data..cacheline_aligned"))) ^ include/linux/jiffies.h:77:12: note: previous attribute is here extern u64 __jiffy_data jiffies_64; ^ include/linux/jiffies.h:70:38: note: expanded from macro '__jiffy_data' Link: http://lkml.kernel.org/r/20170403190200.70273-1-mka@chromium.org Signed-off-by: Matthias Kaehlcke Cc: "Jason A . Donenfeld" Cc: Grant Grundler Cc: Michael Davidson Cc: Greg Hackmann Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- include/linux/jiffies.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -1,6 +1,7 @@ #ifndef _LINUX_JIFFIES_H #define _LINUX_JIFFIES_H +#include #include #include #include @@ -63,19 +64,13 @@ extern int register_refined_jiffies(long /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */ #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ) -/* some arch's have a small-data section that can be accessed register-relative - * but that can only take up to, say, 4-byte variables. jiffies being part of - * an 8-byte variable may not be correctly accessed unless we force the issue - */ -#define __jiffy_data __attribute__((section(".data"))) - /* * The 64-bit value is not atomic - you MUST NOT read it * without sampling the sequence number in jiffies_lock. * get_jiffies_64() will do this for you as appropriate. */ -extern u64 __jiffy_data jiffies_64; -extern unsigned long volatile __jiffy_data jiffies; +extern u64 __cacheline_aligned_in_smp jiffies_64; +extern unsigned long volatile __cacheline_aligned_in_smp jiffies; #if (BITS_PER_LONG < 64) u64 get_jiffies_64(void);