diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /include/asm-sh | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'include/asm-sh')
| -rw-r--r-- | include/asm-sh/dma.h | 1 | ||||
| -rw-r--r-- | include/asm-sh/machvec_init.h | 2 | ||||
| -rw-r--r-- | include/asm-sh/mmu_context.h | 3 | ||||
| -rw-r--r-- | include/asm-sh/unistd.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h index f20096234..0227057b9 100644 --- a/include/asm-sh/dma.h +++ b/include/asm-sh/dma.h @@ -1,6 +1,7 @@ #ifndef __ASM_SH_DMA_H #define __ASM_SH_DMA_H +#include <linux/config.h> #include <asm/io.h> /* need byte IO */ #define MAX_DMA_CHANNELS 8 diff --git a/include/asm-sh/machvec_init.h b/include/asm-sh/machvec_init.h index 3e82b3f62..9e7de808f 100644 --- a/include/asm-sh/machvec_init.h +++ b/include/asm-sh/machvec_init.h @@ -12,6 +12,8 @@ #ifndef __SH_MACHVEC_INIT_H #define __SH_MACHVEC_INIT_H +#include <linux/config.h> + /* * In a GENERIC kernel, we have lots of these vectors floating about, * all but one of which we want to go away. In a non-GENERIC kernel, diff --git a/include/asm-sh/mmu_context.h b/include/asm-sh/mmu_context.h index 82517a5af..268754e71 100644 --- a/include/asm-sh/mmu_context.h +++ b/include/asm-sh/mmu_context.h @@ -67,10 +67,11 @@ get_mmu_context(struct mm_struct *mm) * Initialize the context related info for a new mm_struct * instance. */ -extern __inline__ void init_new_context(struct task_struct *tsk, +extern __inline__ int init_new_context(struct task_struct *tsk, struct mm_struct *mm) { mm->context = NO_CONTEXT; + return 0; } /* diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index 0594308fe..132a4edc1 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h @@ -229,6 +229,7 @@ #define __NR_pivot_root 217 #define __NR_mincore 218 #define __NR_madvise 219 +#define __NR_getdents64 220 /* user-visible error numbers are in the range -1 - -125: see <asm-sh/errno.h> */ |