Re: 2.6.18-rc4-mm3

[Cedric Le Goater <clg@fr.ibm.com>]

Haavard Skinnemoen wrote:
> On Sat, 26 Aug 2006 16:09:22 -0700
> Andrew Morton <akpm@osdl.org> wrote:
> 
>> +namespaces-add-nsproxy-move-init_nsproxy-into-kernel-nsproxyc.patch
> 
> This causes a multiple definition of init_nsproxy on AVR32. Reverting
> namespaces-add-nsproxy-avr32-fix.patch fixes it.

Could you try this ?

thanks,

C.


Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>

---
 arch/avr32/kernel/init_task.c |    2 --
 1 file changed, 2 deletions(-)

Index: 2.6.18-rc4-mm3/arch/avr32/kernel/init_task.c
===================================================================
--- 2.6.18-rc4-mm3.orig/arch/avr32/kernel/init_task.c
+++ 2.6.18-rc4-mm3/arch/avr32/kernel/init_task.c
@@ -10,7 +10,6 @@
 #include <linux/sched.h>
 #include <linux/init_task.h>
 #include <linux/mqueue.h>
-#include <linux/nsproxy.h>

 #include <asm/pgtable.h>

@@ -19,7 +18,6 @@ static struct files_struct init_files =
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 struct mm_struct init_mm = INIT_MM(init_mm);
-struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);

 EXPORT_SYMBOL(init_mm);