--- zzzz-none-000/linux-2.6.19.2/ipc/msg.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/ipc/msg.c	2007-01-19 14:42:56.000000000 +0000
@@ -36,6 +36,7 @@
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
 #include <linux/nsproxy.h>
+#include <linux/grsecurity.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>
@@ -52,7 +53,7 @@
 	long			r_msgtype;
 	long			r_maxsize;
 
-	struct msg_msg		*volatile r_msg;
+	volatile struct msg_msg	*r_msg;
 };
 
 /* one msg_sender for each sleeping sender */
@@ -124,7 +125,6 @@
 	}
 	mutex_unlock(&msg_ids(ns).mutex);
 
-	ipc_fini_ids(ns->ids[IPC_MSG_IDS]);
 	kfree(ns->ids[IPC_MSG_IDS]);
 	ns->ids[IPC_MSG_IDS] = NULL;
 }
@@ -288,6 +288,8 @@
 	}
 	mutex_unlock(&msg_ids(ns).mutex);
 
+	gr_log_msgget(ret, msgflg);
+
 	return ret;
 }
 
@@ -554,6 +556,7 @@
 		break;
 	}
 	case IPC_RMID:
+		gr_log_msgrm(ipcp->uid, ipcp->cuid);
 		freeque(ns, msq, msqid);
 		break;
 	}