Merge "coresight: etm4x: avoid build failure with unrolled loops"

This commit is contained in:
qctecmdr 2022-08-18 08:36:28 -07:00 committed by Gerrit - the friendly Code Review server
commit 274629818d

View File

@ -7,6 +7,7 @@
#define _CORESIGHT_CORESIGHT_ETM_H
#include <asm/local.h>
#include <linux/const.h>
#include <linux/spinlock.h>
#include <linux/types.h>
#include "coresight-priv.h"
@ -515,7 +516,7 @@
({ \
u64 __val; \
\
if (__builtin_constant_p((offset))) \
if (__is_constexpr((offset))) \
__val = read_etm4x_sysreg_const_offset((offset)); \
else \
__val = etm4x_sysreg_read((offset), true, (_64bit)); \