# HG changeset patch
# User Stiletto <blasux@blasux.ru>
# Date 1368371715 -14400
# Node ID 6718f0ba24fd809fe7fc31fefbeada88b5dce1e0
# Parent  c7a2261b54141a4fe30f11cf25de8f395edc927a# Parent  932900ff8dbb84b2074f041e8d16112fb31eb957
Merge

diff -r 932900ff8dbb -r 6718f0ba24fd dwm.c
--- a/dwm.c	Sat May 11 00:22:55 2013 +0400
+++ b/dwm.c	Sun May 12 19:15:15 2013 +0400
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <X11/cursorfont.h>
@@ -1598,6 +1599,8 @@
 		if(dpy)
 			close(ConnectionNumber(dpy));
 		setsid();
+		if (munlockall())
+		    perror("munlockall()");
 		execvp(((char **)arg->v)[0], (char **)arg->v);
 		fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
 		perror(" failed");
@@ -2086,6 +2089,8 @@
 		fputs("warning: no locale support\n", stderr);
 	if(!(dpy = XOpenDisplay(NULL)))
 		die("dwm: cannot open display\n");
+	if (mlockall(MCL_CURRENT | MCL_FUTURE))
+		perror("mlockall()");
 	checkotherwm();
 	setup();
 	scan();