11diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
2- indexa3d6ac5318..f91a1b1422 100644
2+ indexb9302ac..95f7da2 100644
33--- a/src/backend/storage/ipc/procsignal.c
44+++ b/src/backend/storage/ipc/procsignal.c
5- @@ -26 ,6 +26 ,7 @@
5+ @@ -27 ,6 +27 ,7 @@
66 #include "storage/shmem.h"
77 #include "storage/sinval.h"
88 #include "tcop/tcopprot.h"
99+ #include "utils/memutils.h"
1010
1111
1212 /*
13- @@ -59 ,12 +60 ,17 @@ typedef struct
13+ @@ -60 ,12 +61 ,17 @@ typedef struct
1414 */
1515 #define NumProcSignalSlots(MaxBackends + NUM_AUXPROCTYPES)
1616
@@ -28,7 +28,7 @@ index a3d6ac5318..f91a1b1422 100644
2828 /*
2929 * ProcSignalShmemSize
3030 *Compute space needed for procsignal's shared memory
31- @@ -165 ,6 +171 ,57 @@ CleanupProcSignalState(int status, Datum arg)
31+ @@ -166 ,6 +172 ,57 @@ CleanupProcSignalState(int status, Datum arg)
3232 }
3333
3434 /*
@@ -86,7 +86,7 @@ index a3d6ac5318..f91a1b1422 100644
8686 * SendProcSignal
8787 *Send a signal to a Postgres process
8888 *
89- @@ -259 ,7 +316 ,8 @@ CheckProcSignal(ProcSignalReason reason)
89+ @@ -260 ,7 +317 ,8 @@ CheckProcSignal(ProcSignalReason reason)
9090 void
9191 procsignal_sigusr1_handler(SIGNAL_ARGS)
9292 {
@@ -96,7 +96,7 @@ index a3d6ac5318..f91a1b1422 100644
9696
9797 if (CheckProcSignal(PROCSIG_CATCHUP_INTERRUPT))
9898 HandleCatchupInterrupt();
99- @@ -288 ,9 +346 ,87 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
99+ @@ -292 ,9 +350 ,87 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
100100 if (CheckProcSignal(PROCSIG_RECOVERY_CONFLICT_BUFFERPIN))
101101 RecoveryConflictInterrupt(PROCSIG_RECOVERY_CONFLICT_BUFFERPIN);
102102
@@ -185,10 +185,10 @@ index a3d6ac5318..f91a1b1422 100644
185185+ RESUME_INTERRUPTS();
186186+ }
187187diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
188- indexf6be98bdd4..5fee511676 100644
188+ index63a1994..0dfad33 100644
189189--- a/src/backend/tcop/postgres.c
190190+++ b/src/backend/tcop/postgres.c
191- @@ -3005 ,6 +3005 ,8 @@ ProcessInterrupts(void)
191+ @@ -3012 ,6 +3012 ,8 @@ ProcessInterrupts(void)
192192
193193 if (ParallelMessagePending)
194194 HandleParallelMessages();
@@ -198,7 +198,7 @@ index f6be98bdd4..5fee511676 100644
198198
199199
200200diff --git a/src/include/storage/procsignal.h b/src/include/storage/procsignal.h
201- indexf67b9821f2..e941dcbb69 100644
201+ index20bb05b..9b16eb3 100644
202202--- a/src/include/storage/procsignal.h
203203+++ b/src/include/storage/procsignal.h
204204@@ -17,6 +17,8 @@
@@ -219,7 +219,7 @@ index f67b9821f2..e941dcbb69 100644
219219 PROCSIG_CATCHUP_INTERRUPT,/* sinval catchup interrupt */
220220 PROCSIG_NOTIFY_INTERRUPT,/* listen/notify interrupt */
221221 PROCSIG_PARALLEL_MESSAGE,/* message from cooperating parallel backend */
222- @@ -41 ,9 +45 ,20 @@ typedef enum
222+ @@ -42 ,9 +46 ,20 @@ typedef enum
223223 PROCSIG_RECOVERY_CONFLICT_BUFFERPIN,
224224 PROCSIG_RECOVERY_CONFLICT_STARTUP_DEADLOCK,
225225
@@ -240,7 +240,7 @@ index f67b9821f2..e941dcbb69 100644
240240 /*
241241 * prototypes for functions in procsignal.c
242242 */
243- @@ -51 ,9 +66 ,15 @@ extern Size ProcSignalShmemSize(void);
243+ @@ -52 ,9 +67 ,15 @@ extern Size ProcSignalShmemSize(void);
244244 extern void ProcSignalShmemInit(void);
245245
246246 extern void ProcSignalInit(int pss_idx);
@@ -255,4 +255,4 @@ index f67b9821f2..e941dcbb69 100644
255255+
256256 extern void procsignal_sigusr1_handler(SIGNAL_ARGS);
257257
258- #endif
258+ #endif