diff options
| author | Richard Gooch <rgooch@atnf.csiro.au> | 2002-05-16 15:04:24 +0000 |
|---|---|---|
| committer | Richard Gooch <rgooch@atnf.csiro.au> | 2002-05-16 15:04:24 +0000 |
| commit | a68d9759bd527662bd605a6462a75f3a59907286 (patch) | |
| tree | 5f148d2b487f6b2f04e6bd3c963d7a5f56d178b1 /include/linux | |
| parent | 6a71fc3807f5c807aaf6f60433ac71bc13a7bf3d (diff) | |
| parent | 4cc4c6970e6573cc6a671f44de95097217a2be50 (diff) | |
Merge atnf.csiro.au:/workaholix1/kernel/v2.5/linus
into atnf.csiro.au:/workaholix1/kernel/v2.5/rgooch-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mm.h | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 9d92b69a8c36..2f0b56f0183b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -311,8 +311,6 @@ extern mem_map_t * mem_map; extern void show_free_areas(void); extern void show_free_areas_node(pg_data_t *pgdat); -extern void clear_page_tables(struct mm_struct *, unsigned long, int); - extern int fail_writepage(struct page *); struct page * shmem_nopage(struct vm_area_struct * vma, unsigned long address, int unused); struct file *shmem_file_setup(char * name, loff_t size); diff --git a/include/linux/sched.h b/include/linux/sched.h index fdf83faccdde..392d2174d84a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -39,7 +39,7 @@ struct exec_domain; #define CLONE_FS 0x00000200 /* set if fs info shared between processes */ #define CLONE_FILES 0x00000400 /* set if open files shared between processes */ #define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ -#define CLONE_PID 0x00001000 /* set if pid shared */ +#define CLONE_IDLETASK 0x00001000 /* set if new pid should be 0 (kernel only)*/ #define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ #define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ #define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ @@ -663,7 +663,7 @@ extern void daemonize(void); extern task_t *child_reaper; extern int do_execve(char *, char **, char **, struct pt_regs *); -extern int do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long); +extern struct task_struct *do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long); extern void FASTCALL(add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait)); extern void FASTCALL(add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t * wait)); |