diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:14:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:14:05 -0800 |
| commit | 6f267f9cc2ea3c375b3e70e336f4feb7da365fe3 (patch) | |
| tree | e60c68517c38a58abc8af02e76d332e8dae332a8 /include | |
| parent | 7b4d3039dfd2cbfa15127c29dcb557f314d13db1 (diff) | |
v2.4.6.9 -> v2.4.7
- me: fix ptrace and /proc issues with new core-dump permissions
- numerous: IDE tape driver update for completion handlers
- Ben Collins: ieee1394 GUID cleanups
- Jacek Stepniewski: nasty deadlock in rename()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 1 | ||||
| -rw-r--r-- | include/linux/mtd/cfi.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 6e5d72757d05..48b8dbd14a3c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -442,6 +442,7 @@ extern int make_pages_present(unsigned long addr, unsigned long end); extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write); extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char *dst, int len); extern int ptrace_writedata(struct task_struct *tsk, char * src, unsigned long dst, int len); +extern int ptrace_attach(struct task_struct *tsk); /* * On a two-level page table, this ends up being trivial. Thus the diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index bda9f0ae74b6..d32afe265335 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h @@ -1,7 +1,7 @@ /* Common Flash Interface structures * See http://support.intel.com/design/flash/technote/index.htm - * $Id: cfi.h,v 1.21 2001/06/03 01:32:57 nico Exp $ + * $Id: cfi.h,v 1.22 2001/07/06 09:29:07 dwmw2 Exp $ */ #ifndef __MTD_CFI_H__ @@ -10,6 +10,7 @@ #include <linux/config.h> #include <linux/delay.h> #include <linux/types.h> +#include <linux/interrupt.h> #include <linux/mtd/flashchip.h> #include <linux/mtd/cfi_endian.h> |