/* lutex stuff */
#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
#include "genesis/sap.h"
+#include "pthread-lutex.h"
#endif
-unsigned char build_id[] =
+char build_id[] =
#include "../../output/build-id.tmp"
;
struct lutex *lutex = lutexes_to_resurrect[i];
FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
- lutex_init(lutex);
+ lutex_init((tagged_lutex_t) lutex);
}
free(lutexes_to_resurrect);
size -= bytes_read;
while (bytes_read) {
bytes_read -= sizeof(long);
- page_table[offset++].first_object_offset = data[i++];
+ /* Ignore all zeroes. The size of the page table
+ * core entry was rounded up to os_vm_page_size
+ * during the save, and might now have more
+ * elements than the page table.
+ */
+ if (data[i]) {
+ page_table[offset].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}