1.1 --- a/fs/binfmt_plan9.c	Mon Feb 23 17:52:27 2009 -0500
     1.2 +++ b/fs/binfmt_plan9.c	Wed Feb 25 14:36:17 2009 +0100
     1.3 @@ -21,6 +21,15 @@
     1.4  
     1.5  #include "binfmt_plan9.h"
     1.6  
     1.7 +static int load_plan9_binary(struct linux_binprm *, struct pt_regs *);
     1.8 +
     1.9 +static struct linux_binfmt plan9_format = {
    1.10 +       .module = THIS_MODULE,
    1.11 +       .load_binary = load_plan9_binary,
    1.12 +       .load_shlib = NULL,
    1.13 +       .core_dump = NULL
    1.14 +};
    1.15 +
    1.16  /*
    1.17   * All Plan 9 programs linked with libc obtain the address of the
    1.18   * '_tos' structure from EAX when executing _main().
    1.19 @@ -64,7 +73,7 @@
    1.20  	unsigned long __user *sp;
    1.21  	int argc = bprm->argc;
    1.22          
    1.23 -        unsigned long q = (unsigned long p);
    1.24 +        unsigned long q = (unsigned long)p;
    1.25          
    1.26  	sp = (void __user *)
    1.27  	    ((-(unsigned long)sizeof(char *)) & q);
    1.28 @@ -187,11 +196,6 @@
    1.29  	return 0;
    1.30  }
    1.31  
    1.32 -static struct linux_binfmt plan9_format = {
    1.33 -	.module = THIS_MODULE,
    1.34 -	.load_binary = load_plan9_binary
    1.35 -};
    1.36 -
    1.37  static int __init plan9_aout_init(void)
    1.38  {
    1.39  	return register_binfmt(&plan9_format);