diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /include/asm-m68k | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/fcntl.h | 9 | ||||
| -rw-r--r-- | include/asm-m68k/resource.h | 4 | ||||
| -rw-r--r-- | include/asm-m68k/uaccess.h | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/include/asm-m68k/fcntl.h b/include/asm-m68k/fcntl.h index 63b22687a..9738061b7 100644 --- a/include/asm-m68k/fcntl.h +++ b/include/asm-m68k/fcntl.h @@ -47,6 +47,9 @@ #define F_EXLCK 4 /* or 3 */ #define F_SHLCK 8 /* or 4 */ +/* for leases */ +#define F_INPROGRESS 16 + /* operations for bsd flock(), also used by the kernel implementation */ #define LOCK_SH 1 /* shared lock */ #define LOCK_EX 2 /* exclusive lock */ @@ -54,6 +57,11 @@ blocking */ #define LOCK_UN 8 /* remove lock */ +#define LOCK_MAND 32 /* This is a mandatory flock */ +#define LOCK_READ 64 /* ... Which allows concurrent read operations */ +#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ +#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ + struct flock { short l_type; short l_whence; @@ -62,4 +70,5 @@ struct flock { pid_t l_pid; }; +#define F_LINUX_SPECIFIC_BASE 1024 #endif /* _M68K_FCNTL_H */ diff --git a/include/asm-m68k/resource.h b/include/asm-m68k/resource.h index f2a6f0f41..29cc6e973 100644 --- a/include/asm-m68k/resource.h +++ b/include/asm-m68k/resource.h @@ -15,8 +15,9 @@ #define RLIMIT_NOFILE 7 /* max number of open files */ #define RLIMIT_MEMLOCK 8 /* max locked-in-memory address space*/ #define RLIMIT_AS 9 /* address space limit */ +#define RLIMIT_LOCKS 10 /* maximum file locks held */ -#define RLIM_NLIMITS 10 +#define RLIM_NLIMITS 11 /* * SuS says limits have to be unsigned. @@ -37,6 +38,7 @@ {0, 0}, \ {INR_OPEN, INR_OPEN}, \ {LONG_MAX, LONG_MAX}, \ + {LONG_MAX, LONG_MAX}, \ {LONG_MAX, LONG_MAX} \ } diff --git a/include/asm-m68k/uaccess.h b/include/asm-m68k/uaccess.h index 82897ade9..1fe589f66 100644 --- a/include/asm-m68k/uaccess.h +++ b/include/asm-m68k/uaccess.h @@ -759,10 +759,6 @@ __constant_copy_to_user(void *to, const void *from, unsigned long n) #define __copy_from_user(to, from, n) copy_from_user(to, from, n) #define __copy_to_user(to, from, n) copy_to_user(to, from, n) -#define copy_to_user_ret(to,from,n,retval) ({ if (copy_to_user(to,from,n)) return retval; }) - -#define copy_from_user_ret(to,from,n,retval) ({ if (copy_from_user(to,from,n)) return retval; }) - /* * Copy a null terminated string from userspace. */ |