Re: [PATCH 09/18] kern/bootstrap.c: move struct definition to a header file

[Samuel Thibault]

Marin Ramesa, le Fri 06 Dec 2013 16:29:51 +0100, a écrit :
> * kern/bootstrap.c: Include kern/bootstrap.h.
> (user_bootstrap_info): Move struct definition to kern/bootstrap.h.

Ditto.

> ---
>  kern/bootstrap.c | 10 +---------
>  kern/bootstrap.h |  8 ++++++++
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/kern/bootstrap.c b/kern/bootstrap.c
> index 41b02fe..b09e9cf 100644
> --- a/kern/bootstrap.c
> +++ b/kern/bootstrap.c
> @@ -47,6 +47,7 @@
>  #include <kern/task.h>
>  #include <kern/thread.h>
>  #include <kern/lock.h>
> +#include <kern/bootstrap.h>
>  #include <vm/vm_kern.h>
>  #include <vm/vm_user.h>
>  #include <vm/pmap.h>
> @@ -701,15 +702,6 @@ $0 ${boot-args} ${host-port} ${device-port} 
> ${root-device} $(task-create) $(task
>       /*NOTREACHED*/
>  }
>  
> -
> -struct user_bootstrap_info
> -{
> -  struct multiboot_module *mod;
> -  char **argv;
> -  int done;
> -  decl_simple_lock_data(,lock)
> -};
> -
>  int
>  boot_script_exec_cmd (void *hook, task_t task, char *path, int argc,
>                     char **argv, char *strings, int stringlen)
> diff --git a/kern/bootstrap.h b/kern/bootstrap.h
> index b8ed8d9..702c678 100644
> --- a/kern/bootstrap.h
> +++ b/kern/bootstrap.h
> @@ -19,6 +19,14 @@
>  #ifndef _KERN_BOOTSTRAP_H_
>  #define _KERN_BOOTSTRAP_H_
>  
> +struct user_bootstrap_info
> +{
> +  struct multiboot_module *mod;
> +  char **argv;
> +  int done;
> +  decl_simple_lock_data(,lock)
> +};
> +
>  extern void bootstrap_create(void);
>  
>  #endif /* _KERN_BOOTSTRAP_H_ */
> -- 
> 1.8.1.4
> 
> 

-- 
Samuel
Now I know someone out there is going to claim, "Well then, UNIX is intuitive,
because you only need to learn 5000 commands, and then everything else follows
from that! Har har har!"
(Andy Bates in comp.os.linux.misc, on "intuitive interfaces", slightly
defending Macs.)