> From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > commit 7ddcdea5b54492f54700f427f58690cf1e187e5e upstream. > To pick up the changes in: > a85cbe6159ffc973 ("uapi: move constants from <linux/kernel.h> to <linux/const.h>") > That causes no changes in tooling, just addresses this perf build > warning: > Warning: Kernel ABI header at 'tools/include/uapi/linux/const.h' differs from latest version at 'include/uapi/linux/const.h' > diff -u tools/include/uapi/linux/const.h include/uapi/linux/const.h > Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> > Cc: Ian Rogers <irogers@xxxxxxxxxx> > Cc: Jiri Olsa <jolsa@xxxxxxxxxx> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx> > Cc: Petr Vorel <petr.vorel@xxxxxxxxx> > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > Signed-off-by: Petr Vorel <petr.vorel@xxxxxxxxx> > --- > Fix for previous commit. For stable/linux-5.4.y. Kind regards, Petr > Kind regards, > Petr > tools/include/uapi/linux/const.h | 5 +++++ > 1 file changed, 5 insertions(+) > diff --git a/tools/include/uapi/linux/const.h b/tools/include/uapi/linux/const.h > index 5ed721ad5b19..af2a44c08683 100644 > --- a/tools/include/uapi/linux/const.h > +++ b/tools/include/uapi/linux/const.h > @@ -28,4 +28,9 @@ > #define _BITUL(x) (_UL(1) << (x)) > #define _BITULL(x) (_ULL(1) << (x)) > +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) > +#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) > + > +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > + > #endif /* _UAPI_LINUX_CONST_H */