Merge commit 'v2.6.29-rc4' into sched/core

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index a5bd658c2e83..275b78896a73 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -514,7 +514,8 @@ struct xpc_channel_uv {
                                                 /* partition's notify mq */
 
         struct xpc_send_msg_slot_uv *send_msg_slots;
-        struct xpc_notify_mq_msg_uv *recv_msg_slots;
+        void *recv_msg_slots;   /* each slot will hold a xpc_notify_mq_msg_uv */
+                                /* structure plus the user's payload */
 
         struct xpc_fifo_head_uv msg_slot_free_list;
         struct xpc_fifo_head_uv recv_msg_list;  /* deliverable payloads */