]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
tools headers: Sync the linux/unaligned.h copy with the kernel sources
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 19 May 2025 14:33:58 +0000 (11:33 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 20 May 2025 15:57:18 +0000 (12:57 -0300)
To pick up the changes in:

  acea9943271b6290 ("vdso: Address variable shadowing in macros")

Addressing this perf tools build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/include/linux/unaligned.h include/linux/unaligned.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peng Jiang <jiang.peng9@zte.com.cn>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20250519214126.1652491-5-acme@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/include/vdso/unaligned.h

index eee3d2a4dbe4d3dff1e59433dccbb6d39c2d71ff..ff0c06b6513eff61046f9fcf40111c9a8baf176b 100644 (file)
@@ -2,14 +2,14 @@
 #ifndef __VDSO_UNALIGNED_H
 #define __VDSO_UNALIGNED_H
 
-#define __get_unaligned_t(type, ptr) ({                                                \
-       const struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);      \
-       __pptr->x;                                                              \
+#define __get_unaligned_t(type, ptr) ({                                                        \
+       const struct { type x; } __packed * __get_pptr = (typeof(__get_pptr))(ptr);     \
+       __get_pptr->x;                                                                  \
 })
 
-#define __put_unaligned_t(type, val, ptr) do {                                 \
-       struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);            \
-       __pptr->x = (val);                                                      \
+#define __put_unaligned_t(type, val, ptr) do {                                         \
+       struct { type x; } __packed * __put_pptr = (typeof(__put_pptr))(ptr);           \
+       __put_pptr->x = (val);                                                          \
 } while (0)
 
 #endif /* __VDSO_UNALIGNED_H */