From patchwork Thu Dec 5 15:40:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 13895608 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA0F7E7716C for ; Thu, 5 Dec 2024 15:43:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3934C6B008A; Thu, 5 Dec 2024 10:43:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 31C0F6B017F; Thu, 5 Dec 2024 10:43:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D2886B014F; Thu, 5 Dec 2024 10:43:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D49E06B008A for ; Thu, 5 Dec 2024 10:43:05 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 24CFBAF475 for ; Thu, 5 Dec 2024 15:43:05 +0000 (UTC) X-FDA: 82861323384.21.E9851DF Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by imf02.hostedemail.com (Postfix) with ESMTP id CCDE18000E for ; Thu, 5 Dec 2024 15:42:32 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jSkcg1fS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of ubizjak@gmail.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=ubizjak@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733413368; a=rsa-sha256; cv=none; b=L4rfArwl6EI0LSWSTDzFGnPMFd0V7Ces6Yzud6xk91KAoF083ebESI5/KqTUtR96y6r4yW EGUXBUyRwPPOjTNcGlqSv4Qa8Gku7YGeCUbKJ29S7vNg03RKNbI0Qn/a3f2h9sbc1qXA6q XVlWmzJWQ1+ohyTMpN7PDe2mJ3yHbn0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jSkcg1fS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of ubizjak@gmail.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=ubizjak@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733413368; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZP45adl0m/JgLHunU63kkKsbCdYBQc86IYFQ7X6p794=; b=t62GnN31QwwfkXF8ndIa3Kpj6Szqaq7HFhaXiOyClcJLAlld6g3G0BxXVbDUEz5sx3W8fl LWUvhkEiBZbKNw0OOVrSNN3EyKdtjyHA8sGFuEanuScbzXXjOM8zlUwuDTRauyjc2xTMzF iXS+w39wxEdzhKnxSmdPELLPlSLxg0M= Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4349fb56260so7447815e9.3 for ; Thu, 05 Dec 2024 07:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733413381; x=1734018181; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZP45adl0m/JgLHunU63kkKsbCdYBQc86IYFQ7X6p794=; b=jSkcg1fSswGSrPmjT5K5EFGH6lWKSHZj5UakmpibW8d+e32JwCJQxepbS7rRIdtikT rL1xoqc6ZHtBRqlZwcCum74DsEqlBwqXkisRwrx24CtDCgirMmTIJYL2ulFdAMeoiidT GqfKbWBW/Yp86Z2CwaUfG4iqT4fN+zJA4t2uLzp5uQDyH7ORphRbKvxzxTr0HaynqzjN kMWbhr8biagBka6qOwKD2N2mruixBl6rZfZvBvi9M7cB79wM7t2dNH9ChdzU1jqFdosm xzeKFaaZR9YLD3rwplV81lTze0tNhEmaS/QHdquEjJHa5+tkdTHqny4BZA0nr1VWYV8C dDwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733413381; x=1734018181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZP45adl0m/JgLHunU63kkKsbCdYBQc86IYFQ7X6p794=; b=ZNlag1/HkfGAZBiSY1pkaml3HilE9CemEOOO88jQ+lhfhL26s+P+a3AleyBaIH6T4m bVaiVIHaDAPR5hLAZ2LUEBT4IS2QfkeuyREqRZKFIpRND2mOPQkbBwuRlJykwj5q6DEb F+rpqm2SyNNo+/5zZfn+O5qWJR7EJFxHhstzv1q7XH1XTeoff2pMSv5clPlM3i/K+V3Y 1F5nkoRiRW6OiUDMADA6XizWwD/ny0+gAVtw+pokEcLDAf8AwePl0AU+QaABLNkt4Mpn tN8lo2pfi12xLkbgs51Vl979Jl5zIeLltxKj2Yha3XWAYh8JuxVhMPG85pnGpN1oG2RQ qWqQ== X-Forwarded-Encrypted: i=1; AJvYcCU0DUraSSBZDVmcTeZ+HjociHZDvWqx1ci3GmXh07idrGTDyg0MqGvyELwiIaiaFKdoDBNDYymeIA==@kvack.org X-Gm-Message-State: AOJu0Yzful7sKojMRo0HbBkb3OJ09Y0xmxnbiCpAkH4NQDxK+kJnNoCg qgIO2doO3mXUYLyJDB+RwKmUx48pc62rM/M10avnXL4rWr7sFEVP X-Gm-Gg: ASbGncv6KNQihVVAAaJuSnFJfongWrH4uzqAXUqhXa8H9eqVoCl93zhJ99duu7JjKRd 6CouANxSFKdCgJtSvr/qnMSdNc5Hla4XZlaQ478CF8owE+wzV/lF4MxgViDp/68EeBgjh9Q/fsT s+1+pQjlKGwvt44hn1Cv+FNz/6FIZToqqwVmCwZEbW3GDLoohw8kIR2FwrA861+xPo29yQ+7jmU kIQLR/KvdIYgK0vgYcKWfbr5muyBhmh6okx9XgHm7UUUoKLOba2f49/bjc= X-Google-Smtp-Source: AGHT+IHlSg504pBumLfceXQFWDia6MAuCEjJGazacj++iFQVK3VDRzhe2tl+FybaLA5HFJZH550yXg== X-Received: by 2002:a05:600c:570a:b0:434:9f81:76d5 with SMTP id 5b1f17b1804b1-434d0a06619mr87843265e9.22.1733413381210; Thu, 05 Dec 2024 07:43:01 -0800 (PST) Received: from localhost.localdomain ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434da11387dsm27020185e9.30.2024.12.05.07.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Dec 2024 07:43:00 -0800 (PST) From: Uros Bizjak To: x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-bcachefs@vger.kernel.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org Cc: Uros Bizjak , Nadav Amit , Dennis Zhou , Tejun Heo , Christoph Lameter , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Kent Overstreet , Arnd Bergmann , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Peter Zijlstra , Will Deacon , Waiman Long , Boqun Feng , Linus Torvalds , Brian Gerst Subject: [PATCH v2 3/6] percpu: Use TYPEOF_UNQUAL() in variable declarations Date: Thu, 5 Dec 2024 16:40:53 +0100 Message-ID: <20241205154247.43444-4-ubizjak@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20241205154247.43444-1-ubizjak@gmail.com> References: <20241205154247.43444-1-ubizjak@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CCDE18000E X-Stat-Signature: ta5i4n99cbg8rnk41qb8y7ym6bu7iww4 X-Rspam-User: X-HE-Tag: 1733413352-380387 X-HE-Meta: U2FsdGVkX1/jpYFHn54qwXeoNTFPfNSvVSvP2MZythRbZkLK9DDhVOi3BSwz2WeZrMqCOuVJRpGBXUZ65rlphsGTmpWk/od7tuYmxQiCiCysqpUTQyannrMVuyeT2ywdnDlR5NUkHl9DxEnmrL+KOcEJkZmpy2MZ3FAFGU0OpMbfOTNBNFFBwYIXqmAANkb1/HXVMEdZihQOnpjpFFoPbn5RJz7iG1n9Q8Sp2HbVGOna2+hPJt2LE8BabU5AvCTReBRZwvPG1k7/hTNujJ6kkIOOPgk/POK2ysrvw/6kHjtaGKDbx05NIFIYYmkjiuUjUA0LC3Ql7JOAYpDl1x4KOfVq+BF7ny/dzdKsqHfLL47WwYJbjFF/wsWFsNw8Z0VIFtBbkIa8EKT5SjSbzBgMoc1h3qrRsBR/18fAeyBGGx66+fzmUvZlPlrI9uxCU2q/jHFEbdhsOm3xP5cfA/k07PSCtCLeIymKS92rnhYN+RomtqymMhRqzyVvaU4nugNaOnEoLagbWnK9sTPoR4qVsmxsc/ekYg9L3Tgo97W+sqqeI81aovL1AUHxQ7nu3OeUdHmuxfnchpEf4E17VaDJ0lAjdvlZ48knv+gSPsHXO7az75ebuKEhgU2y894ez440X/sZScXMjjNYQUduBDtKN1aiQQpvRv3E9UZ550ktA8FVqby8CqLW8gI7vcYVd94yKHjKxmxvY9acGxKO4v/qAItc3p/PrWdUXNetlZb/gETbDiMS91tcDtJb1wOFQqmi4jmJOdCLIPoA37kpXNkh5W42ZmjEmtqumPNrz0+n6gBuJwqrgnYbSv0kfOg17Acup5WfRPEAQ1TL2uhVjuRNXxt+R3VMVGfFB68aLyhmECmDxi2ula+NORqmZSiF78Vs6yXqXAPaR/QLSNOQ2Q/PR6ITk3hA02crUhmLl+6pVx/Wp7g3fvSh/OVkuyAtZkD+Z0iEmgLxfx8ub5knPnV 0SgDFZFS UDDyjoAuQeF5GUNMiosQRoUKxNXKFmmhypCLRfNreZ10lv+54o87Bn4jeKcDeC5xejklxau2r303YvjWeBHfLUHiUIE0yBtGbGQSVGf2ngaG5xvYbWzIV0mbQgFxjmxYuB0Q0xBn40dtn2glwxKWZndDSWqK02tWQUQveFcQOdh8FNpzKvNFvPEm4b4KbwIHzpcBm60VcQEnLq1OtpDXSD1h8EbzjI69V+DZjdt1KdMlsJ6+TbOHyoTbfgWj3XfA1UgIKgAqhLNVRdtHkVCjQ2pelx7Vlgx/Dr0H2sTMdyzln2gB+ehSl5bxmPmuTShbTBZ+XBRqG91DAKDb/jHT+uhkE6+31ReqqsE3Qmz4uTHxvgGRu2z87ibRvgxXcOogqbu+PtL83DChKpGUv52oJvSRor0ZvVBNprG6ISLRApeTDNOQ9OYzffdxosJybY8cUHc0rXyOeF/EpOUyAG45I6uPM0zz2jyHY0FQCR4J9FAFRE5pji1h1zNofkFnu+E8jo5DjkJel1OVcw8U2XzkyTLTfW8ZXM3ldhmSzGUzgYio3WZ0Qvbg8VseEvtYHqPCinVPt9ffz5u+6hvgI29l6ZDM+VjBN0FriV1puvWj7+ZyO4MuhW3czXOnaUolKDpwjpoMRRkSSojXMXRGSTXu9CSS5/QrNN6EbdI+v8naxeDELOJtDZ7gqIymHRz2ClQkmjqWbdpasJGuDKA+2/i1mi0lk/tYTw2FaBvyKc0j4pa6gkBIWKhq94gE3Qr4uLr2Aw6BZVlAtAlIdnbAnYz58JpMJVQFPCLxLMee1deJNRX0pfA/mHXLke9AHMvtQ6VzUd8fFED0nqGscbLpVESWvnHK/yDXLNrwbYL3VY+CDTrAftJlxe3CtR0KUJMuoGhri88UdKwjCfmS4BEv6R9dvHgHknNBDvE0+UuPC X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Use TYPEOF_UNQUAL() to declare variables as a corresponding type without named address space qualifier to avoid "‘__seg_gs’ specified for auto variable ‘var’" errors. Signed-off-by: Uros Bizjak Acked-by: Nadav Amit Cc: Dennis Zhou Cc: Tejun Heo Cc: Christoph Lameter Cc: Andy Lutomirski Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: Kent Overstreet Cc: Arnd Bergmann Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Peter Zijlstra Cc: Will Deacon Cc: Waiman Long Cc: Boqun Feng Cc: Linus Torvalds Cc: Brian Gerst --- arch/x86/include/asm/percpu.h | 10 +++++----- fs/bcachefs/util.h | 2 +- include/asm-generic/percpu.h | 26 +++++++++++++------------- include/linux/part_stat.h | 2 +- include/linux/percpu-defs.h | 4 ++-- include/net/snmp.h | 5 ++--- kernel/locking/percpu-rwsem.c | 2 +- net/mpls/internal.h | 4 ++-- 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index e525cd85f999..666e4137b09f 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -180,7 +180,7 @@ do { \ __pcpu_type_##size pto_val__ = __pcpu_cast_##size(_val); \ \ if (0) { \ - typeof(_var) pto_tmp__; \ + TYPEOF_UNQUAL(_var) pto_tmp__; \ pto_tmp__ = (_val); \ (void)pto_tmp__; \ } \ @@ -219,7 +219,7 @@ do { \ __pcpu_type_##size pto_val__ = __pcpu_cast_##size(_val); \ \ if (0) { \ - typeof(_var) pto_tmp__; \ + TYPEOF_UNQUAL(_var) pto_tmp__; \ pto_tmp__ = (_val); \ (void)pto_tmp__; \ } \ @@ -240,7 +240,7 @@ do { \ (val) == (typeof(val))-1)) ? (int)(val) : 0; \ \ if (0) { \ - typeof(var) pao_tmp__; \ + TYPEOF_UNQUAL(var) pao_tmp__; \ pao_tmp__ = (val); \ (void)pao_tmp__; \ } \ @@ -273,7 +273,7 @@ do { \ */ #define raw_percpu_xchg_op(_var, _nval) \ ({ \ - typeof(_var) pxo_old__ = raw_cpu_read(_var); \ + TYPEOF_UNQUAL(_var) pxo_old__ = raw_cpu_read(_var); \ \ raw_cpu_write(_var, _nval); \ \ @@ -287,7 +287,7 @@ do { \ */ #define this_percpu_xchg_op(_var, _nval) \ ({ \ - typeof(_var) pxo_old__ = this_cpu_read(_var); \ + TYPEOF_UNQUAL(_var) pxo_old__ = this_cpu_read(_var); \ \ do { } while (!this_cpu_try_cmpxchg(_var, &pxo_old__, _nval)); \ \ diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index fb02c1c36004..415a5803b8f4 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -586,7 +586,7 @@ do { \ #define per_cpu_sum(_p) \ ({ \ - typeof(*_p) _ret = 0; \ + TYPEOF_UNQUAL(*_p) _ret = 0; \ \ int cpu; \ for_each_possible_cpu(cpu) \ diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 94cbd50cc870..50597b975a49 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h @@ -74,7 +74,7 @@ do { \ #define raw_cpu_generic_add_return(pcp, val) \ ({ \ - typeof(pcp) *__p = raw_cpu_ptr(&(pcp)); \ + TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&(pcp)); \ \ *__p += val; \ *__p; \ @@ -82,8 +82,8 @@ do { \ #define raw_cpu_generic_xchg(pcp, nval) \ ({ \ - typeof(pcp) *__p = raw_cpu_ptr(&(pcp)); \ - typeof(pcp) __ret; \ + TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&(pcp)); \ + TYPEOF_UNQUAL(pcp) __ret; \ __ret = *__p; \ *__p = nval; \ __ret; \ @@ -91,7 +91,7 @@ do { \ #define __cpu_fallback_try_cmpxchg(pcp, ovalp, nval, _cmpxchg) \ ({ \ - typeof(pcp) __val, __old = *(ovalp); \ + TYPEOF_UNQUAL(pcp) __val, __old = *(ovalp); \ __val = _cmpxchg(pcp, __old, nval); \ if (__val != __old) \ *(ovalp) = __val; \ @@ -100,8 +100,8 @@ do { \ #define raw_cpu_generic_try_cmpxchg(pcp, ovalp, nval) \ ({ \ - typeof(pcp) *__p = raw_cpu_ptr(&(pcp)); \ - typeof(pcp) __val = *__p, ___old = *(ovalp); \ + TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&(pcp)); \ + TYPEOF_UNQUAL(pcp) __val = *__p, ___old = *(ovalp); \ bool __ret; \ if (__val == ___old) { \ *__p = nval; \ @@ -115,14 +115,14 @@ do { \ #define raw_cpu_generic_cmpxchg(pcp, oval, nval) \ ({ \ - typeof(pcp) __old = (oval); \ + TYPEOF_UNQUAL(pcp) __old = (oval); \ raw_cpu_generic_try_cmpxchg(pcp, &__old, nval); \ __old; \ }) #define __this_cpu_generic_read_nopreempt(pcp) \ ({ \ - typeof(pcp) ___ret; \ + TYPEOF_UNQUAL(pcp) ___ret; \ preempt_disable_notrace(); \ ___ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ preempt_enable_notrace(); \ @@ -131,7 +131,7 @@ do { \ #define __this_cpu_generic_read_noirq(pcp) \ ({ \ - typeof(pcp) ___ret; \ + TYPEOF_UNQUAL(pcp) ___ret; \ unsigned long ___flags; \ raw_local_irq_save(___flags); \ ___ret = raw_cpu_generic_read(pcp); \ @@ -141,7 +141,7 @@ do { \ #define this_cpu_generic_read(pcp) \ ({ \ - typeof(pcp) __ret; \ + TYPEOF_UNQUAL(pcp) __ret; \ if (__native_word(pcp)) \ __ret = __this_cpu_generic_read_nopreempt(pcp); \ else \ @@ -160,7 +160,7 @@ do { \ #define this_cpu_generic_add_return(pcp, val) \ ({ \ - typeof(pcp) __ret; \ + TYPEOF_UNQUAL(pcp) __ret; \ unsigned long __flags; \ raw_local_irq_save(__flags); \ __ret = raw_cpu_generic_add_return(pcp, val); \ @@ -170,7 +170,7 @@ do { \ #define this_cpu_generic_xchg(pcp, nval) \ ({ \ - typeof(pcp) __ret; \ + TYPEOF_UNQUAL(pcp) __ret; \ unsigned long __flags; \ raw_local_irq_save(__flags); \ __ret = raw_cpu_generic_xchg(pcp, nval); \ @@ -190,7 +190,7 @@ do { \ #define this_cpu_generic_cmpxchg(pcp, oval, nval) \ ({ \ - typeof(pcp) __ret; \ + TYPEOF_UNQUAL(pcp) __ret; \ unsigned long __flags; \ raw_local_irq_save(__flags); \ __ret = raw_cpu_generic_cmpxchg(pcp, oval, nval); \ diff --git a/include/linux/part_stat.h b/include/linux/part_stat.h index ac8c44dd8237..c5e9cac0575e 100644 --- a/include/linux/part_stat.h +++ b/include/linux/part_stat.h @@ -33,7 +33,7 @@ struct disk_stats { #define part_stat_read(part, field) \ ({ \ - typeof((part)->bd_stats->field) res = 0; \ + TYPEOF_UNQUAL((part)->bd_stats->field) res = 0; \ unsigned int _cpu; \ for_each_possible_cpu(_cpu) \ res += per_cpu_ptr((part)->bd_stats, _cpu)->field; \ diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 35842d1e3879..266297b21a5d 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -320,7 +320,7 @@ static __always_inline void __this_cpu_preempt_check(const char *op) { } #define __pcpu_size_call_return(stem, variable) \ ({ \ - typeof(variable) pscr_ret__; \ + TYPEOF_UNQUAL(variable) pscr_ret__; \ __verify_pcpu_ptr(&(variable)); \ switch(sizeof(variable)) { \ case 1: pscr_ret__ = stem##1(variable); break; \ @@ -335,7 +335,7 @@ static __always_inline void __this_cpu_preempt_check(const char *op) { } #define __pcpu_size_call_return2(stem, variable, ...) \ ({ \ - typeof(variable) pscr2_ret__; \ + TYPEOF_UNQUAL(variable) pscr2_ret__; \ __verify_pcpu_ptr(&(variable)); \ switch(sizeof(variable)) { \ case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break; \ diff --git a/include/net/snmp.h b/include/net/snmp.h index 468a67836e2f..4cb4326dfebe 100644 --- a/include/net/snmp.h +++ b/include/net/snmp.h @@ -159,7 +159,7 @@ struct linux_tls_mib { #define __SNMP_ADD_STATS64(mib, field, addend) \ do { \ - __typeof__(*mib) *ptr = raw_cpu_ptr(mib); \ + TYPEOF_UNQUAL(*mib) *ptr = raw_cpu_ptr(mib); \ u64_stats_update_begin(&ptr->syncp); \ ptr->mibs[field] += addend; \ u64_stats_update_end(&ptr->syncp); \ @@ -176,8 +176,7 @@ struct linux_tls_mib { #define SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1) #define __SNMP_UPD_PO_STATS64(mib, basefield, addend) \ do { \ - __typeof__(*mib) *ptr; \ - ptr = raw_cpu_ptr((mib)); \ + TYPEOF_UNQUAL(*mib) *ptr = raw_cpu_ptr(mib); \ u64_stats_update_begin(&ptr->syncp); \ ptr->mibs[basefield##PKTS]++; \ ptr->mibs[basefield##OCTETS] += addend; \ diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c index 6083883c4fe0..d6964fc29f51 100644 --- a/kernel/locking/percpu-rwsem.c +++ b/kernel/locking/percpu-rwsem.c @@ -184,7 +184,7 @@ EXPORT_SYMBOL_GPL(__percpu_down_read); #define per_cpu_sum(var) \ ({ \ - typeof(var) __sum = 0; \ + TYPEOF_UNQUAL(var) __sum = 0; \ int cpu; \ compiletime_assert_atomic_type(__sum); \ for_each_possible_cpu(cpu) \ diff --git a/net/mpls/internal.h b/net/mpls/internal.h index b9f492ddf93b..83c629529b57 100644 --- a/net/mpls/internal.h +++ b/net/mpls/internal.h @@ -33,7 +33,7 @@ struct mpls_dev { #define MPLS_INC_STATS_LEN(mdev, len, pkts_field, bytes_field) \ do { \ - __typeof__(*(mdev)->stats) *ptr = \ + TYPEOF_UNQUAL(*(mdev)->stats) *ptr = \ raw_cpu_ptr((mdev)->stats); \ local_bh_disable(); \ u64_stats_update_begin(&ptr->syncp); \ @@ -45,7 +45,7 @@ struct mpls_dev { #define MPLS_INC_STATS(mdev, field) \ do { \ - __typeof__(*(mdev)->stats) *ptr = \ + TYPEOF_UNQUAL(*(mdev)->stats) *ptr = \ raw_cpu_ptr((mdev)->stats); \ local_bh_disable(); \ u64_stats_update_begin(&ptr->syncp); \