From 80a75749d69dfeb399bd7631a5ca55d56f7b245b Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 24 Jan 2007 19:13:08 +0000
Subject: [PATCH] --- yaml --- r: 45809 b: refs/heads/master c:
 9cfdf6f15a2a462b6b328b4c60b252cfc04ec03e h: refs/heads/master i:   45807:
 8a7f277d10a24ed79b29dd842b33ab2136c686da v: v3

---
 [refs]                       | 2 +-
 trunk/arch/mips/kernel/vpe.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 74a0ad87a0ad..9b2221c90140 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80aac59ed5b3e5ae2132bc620ff5607929c6a304
+refs/heads/master: 9cfdf6f15a2a462b6b328b4c60b252cfc04ec03e
diff --git a/trunk/arch/mips/kernel/vpe.c b/trunk/arch/mips/kernel/vpe.c
index 666bef484dcb..458fccf87c54 100644
--- a/trunk/arch/mips/kernel/vpe.c
+++ b/trunk/arch/mips/kernel/vpe.c
@@ -139,13 +139,16 @@ struct tc {
 	struct list_head list;
 };
 
-struct vpecontrol_ {
+struct {
 	/* Virtual processing elements */
 	struct list_head vpe_list;
 
 	/* Thread contexts */
 	struct list_head tc_list;
-} vpecontrol;
+} vpecontrol = {
+	.vpe_list = LIST_HEAD_INIT(vpecontrol.vpe_list),
+	.tc_list = LIST_HEAD_INIT(vpecontrol.tc_list)
+};
 
 static void release_progmem(void *ptr);
 /* static __attribute_used__ void dump_vpe(struct vpe * v); */
@@ -1388,8 +1391,6 @@ static int __init vpe_module_init(void)
 
 	/* dump_mtregs(); */
 
-	INIT_LIST_HEAD(&vpecontrol.vpe_list);
-	INIT_LIST_HEAD(&vpecontrol.tc_list);
 
 	val = read_c0_mvpconf0();
 	for (i = 0; i < ((val & MVPCONF0_PTC) + 1); i++) {