diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /include/asm-mips | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/ioctls.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/namei.h | 4 | ||||
| -rw-r--r-- | include/asm-mips/pgtable.h | 3 | ||||
| -rw-r--r-- | include/asm-mips/system.h | 14 | ||||
| -rw-r--r-- | include/asm-mips/unistd.h | 4 |
5 files changed, 19 insertions, 8 deletions
diff --git a/include/asm-mips/ioctls.h b/include/asm-mips/ioctls.h index 9ec2c0215..5648eae7f 100644 --- a/include/asm-mips/ioctls.h +++ b/include/asm-mips/ioctls.h @@ -96,6 +96,8 @@ #define TCSBRKP 0x5486 /* Needed for POSIX tcsendbreak() */ #define TIOCTTYGSTRUCT 0x5487 /* For debugging only */ +#define TIOCSBRK 0x5427 /* BSD compatibility */ +#define TIOCCBRK 0x5428 /* BSD compatibility */ #define TIOCSERCONFIG 0x5488 #define TIOCSERGWILD 0x5489 diff --git a/include/asm-mips/namei.h b/include/asm-mips/namei.h index 0ff96ac00..b9c0aea15 100644 --- a/include/asm-mips/namei.h +++ b/include/asm-mips/namei.h @@ -13,6 +13,8 @@ /* Only one at this time. */ #define IRIX32_EMUL "usr/gnemul/irix/" +#if 0 /* XXX FIXME */ + extern int __namei(int, const char *, struct inode *, char *, struct inode **, struct inode **, struct qstr *, struct dentry **, int *); @@ -44,6 +46,8 @@ __prefix_namei(int retrieve_mode, const char * name, struct inode * base, return 0; } +#endif /* XXX FIXME */ + #else /* !defined(CONFIG_BINFMT_IRIX) */ #define __prefix_namei(retrieve_mode, name, base, buf, res_dir, res_inode, \ diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index ebeb6e67c..4f3876cdb 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -491,6 +491,9 @@ extern void (*update_mmu_cache)(struct vm_area_struct *vma, #define SWP_OFFSET(entry) ((entry) >> 15) #define SWP_ENTRY(type,offset) (((type) << 8) | ((offset) << 15)) +#define module_map vmalloc +#define module_unmap vfree + /* TLB operations. */ extern inline void tlb_probe(void) { diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index daf477459..2c752a0c0 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -108,13 +108,13 @@ __restore_flags(int flags) #define save_and_cli(x) __save_and_cli(x) #define restore_flags(x) __restore_flags(x) -#define sync_mem() \ -__asm__ __volatile__( \ - ".set\tnoreorder\n\t" \ - "sync\n\t" \ - ".set\treorder" \ - : /* no output */ \ - : /* no input */ \ +#define mb() \ +__asm__ __volatile__( \ + "# prevent instructions being moved around\n\t" \ + ".set\tnoreorder\n\t" \ + ".set\treorder" \ + : /* no output */ \ + : /* no input */ \ : "memory") #if !defined (__LANGUAGE_ASSEMBLY__) diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 4cf30a110..4517106ca 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h @@ -1177,11 +1177,13 @@ #define __NR_query_module (__NR_Linux + 187) #define __NR_poll (__NR_Linux + 188) #define __NR_nfsservctl (__NR_Linux + 189) +#define __NR_setresgid (__NR_Linux + 190) +#define __NR_getresgid (__NR_Linux + 191) /* * Offset of the last Linux flavoured syscall */ -#define __NR_Linux_syscalls 189 +#define __NR_Linux_syscalls 191 #ifndef __LANGUAGE_ASSEMBLY__ |