diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /arch/mips | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/defconfig | 3 | ||||
| -rw-r--r-- | arch/mips/jazz/g364.c | 11 | ||||
| -rw-r--r-- | arch/mips/kernel/irixelf.c | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 33f54a301..9c6fb9073 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -153,6 +153,9 @@ CONFIG_PCNET32=y # Filesystems # # CONFIG_QUOTA is not set +# CONFIG_DCACHE_PRELOAD is not set +# CONFIG_OMIRR is not set +# CONFIG_TRANS_NAMES is not set # CONFIG_MINIX_FS is not set CONFIG_EXT2_FS=y # CONFIG_FAT_FS is not set diff --git a/arch/mips/jazz/g364.c b/arch/mips/jazz/g364.c index 92e130522..1503cc559 100644 --- a/arch/mips/jazz/g364.c +++ b/arch/mips/jazz/g364.c @@ -25,6 +25,11 @@ #include <linux/major.h> #include <linux/mm.h> #include <linux/ioport.h> +#include <linux/kbd_kern.h> +#include <linux/vt_kern.h> +#include <linux/consolemap.h> +#include <linux/selection.h> +#include <linux/console_struct.h> #include <asm/io.h> #include <asm/system.h> @@ -33,12 +38,6 @@ #include <asm/bootinfo.h> #include <asm/types.h> -#include "../../../drivers/char/kbd_kern.h" -#include "../../../drivers/char/vt_kern.h" -#include "../../../drivers/char/consolemap.h" -#include "../../../drivers/char/selection.h" -#include "../../../drivers/char/console_struct.h" - extern void register_console(void (*proc)(const char *)); extern void console_print(const char *); unsigned video_res_x; diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index d994155d0..fc0d542fc 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c @@ -465,7 +465,7 @@ static inline int look_for_irix_interpreter(char **name, goto losing; old_fs = get_fs(); set_fs(get_ds()); - retval = namei(*name, interpreter_inode); + retval = namei(NAM_FOLLOW_LINK, *name, interpreter_inode); set_fs(old_fs); if(retval < 0) goto losing; @@ -973,6 +973,7 @@ unsigned long irix_mapelf(int fd, struct elf_phdr *user_phdrp, int cnt) */ static int dump_write(struct file *file, const void *addr, int nr) { + file->f_inode->i_status |= ST_MODIFIED; return file->f_op->write(file->f_inode, file, addr, nr) == nr; } |