From 9e345415bcd3c4358350b89edfd710469b8bfaf9 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Tue, 1 Jul 2025 15:20:26 +0200 Subject: [PATCH] Fix indentation in pg_numa code Broken by commits 7fe2f67c7c9f, 81f287dc923f and bf1119d74a79. Backpatch to 18, same as the offending commits. Backpatch-through: 18 --- src/include/port/pg_numa.h | 1 + src/port/pg_numa.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/include/port/pg_numa.h b/src/include/port/pg_numa.h index 6c8b7103cc3..9d1ea6d0db8 100644 --- a/src/include/port/pg_numa.h +++ b/src/include/port/pg_numa.h @@ -28,6 +28,7 @@ static inline void pg_numa_touch_mem_if_required(void *ptr) { volatile uint64 touch pg_attribute_unused(); + touch = *(volatile uint64 *) ptr; } diff --git a/src/port/pg_numa.c b/src/port/pg_numa.c index c65f22020ea..3368a43a338 100644 --- a/src/port/pg_numa.c +++ b/src/port/pg_numa.c @@ -65,8 +65,8 @@ pg_numa_init(void) int pg_numa_query_pages(int pid, unsigned long count, void **pages, int *status) { - unsigned long next = 0; - int ret = 0; + unsigned long next = 0; + int ret = 0; /* * Chunk pointers passed to numa_move_pages to NUMA_QUERY_CHUNK_SIZE @@ -80,9 +80,9 @@ pg_numa_query_pages(int pid, unsigned long count, void **pages, int *status) CHECK_FOR_INTERRUPTS(); /* - * Bail out if any of the chunks errors out (ret<0). We ignore - * (ret>0) which is used to return number of nonmigrated pages, - * but we're not migrating any pages here. + * Bail out if any of the chunks errors out (ret<0). We ignore (ret>0) + * which is used to return number of nonmigrated pages, but we're not + * migrating any pages here. */ ret = numa_move_pages(pid, count_chunk, &pages[next], NULL, &status[next], 0); if (ret < 0) -- 2.39.5