postgrespro
diff --git a/‎contrib/Makefile
Lines changed: 0 additions & 1 deletion b/‎contrib/Makefile
Lines changed: 0 additions & 1 deletion
diff --git a/‎contrib/pg_pathman/Makefile
Lines changed: 1 addition & 2 deletions b/‎contrib/pg_pathman/Makefile
Lines changed: 1 addition & 2 deletions
diff --git a/‎contrib/pg_pathman/dsm_array.c
Lines changed: 17 additions & 1 deletion b/‎contrib/pg_pathman/dsm_array.c
Lines changed: 17 additions & 1 deletion
@@ -34,7 +34,6 @@ SUBDIRS = \
 		oid2name	\
 		pageinspect	\
 		passwordcheck	\
-		pg_arman	\
 		pg_buffercache	\
 		pg_freespacemap \
 		pg_prewarm	\
 
@@ -1,6 +1,5 @@
 # contrib/pg_pathman/Makefile
 
-
 MODULE_big = pg_pathman
 OBJS = init.o pg_pathman.o dsm_array.o rangeset.o pl_funcs.o worker.o $(WIN32RES)
 
@@ -37,4 +36,4 @@ isolationcheck: | submake-isolation
 	$(pg_isolation_regress_check) \
 	    --temp-config=$(top_srcdir)/$(subdir)/conf.add \
 	    --outputdir=./isolation_output \
-	    $(ISOLATIONCHECKS)
+	    $(ISOLATIONCHECKS)
@@ -28,7 +28,13 @@ typedef struct DsmConfig
 
 static DsmConfig *dsm_cfg = NULL;
 
-typedef int BlockHeader;
+/*
+ * Block header
+ *
+ * Its size must be 4 bytes for 32bit and 8 bytes for 64bit. Otherwise it could
+ * screw up an alignment (for example on Sparc9)
+ */
+typedef uintptr_t BlockHeader;
 typedef BlockHeader* BlockHeaderPtr;
 
 #define FREE_BIT 0x80000000
@@ -43,6 +49,16 @@ typedef BlockHeader* BlockHeaderPtr;
 #define set_length(header, length) \
 	((length) | ((*header) & FREE_BIT))
 
+/*
+ * Amount of memory that need to be requested in shared memory to store dsm
+ * config
+ */
+Size
+get_dsm_shared_size()
+{
+	return (Size) MAXALIGN(sizeof(DsmConfig));
+}
+
 /*
  * Initialize dsm config for arrays
  */