diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /include/asm-sh | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'include/asm-sh')
| -rw-r--r-- | include/asm-sh/io.h | 2 | ||||
| -rw-r--r-- | include/asm-sh/resource.h | 6 | ||||
| -rw-r--r-- | include/asm-sh/signal.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h index dd9205b32..677be2445 100644 --- a/include/asm-sh/io.h +++ b/include/asm-sh/io.h @@ -158,6 +158,8 @@ extern __inline__ void ctrl_outl(unsigned int b, unsigned long addr) #ifdef __KERNEL__ +#define IO_SPACE_LIMIT 0xffff + #include <asm/addrspace.h> /* diff --git a/include/asm-sh/resource.h b/include/asm-sh/resource.h index 857c37166..ef89ec7e6 100644 --- a/include/asm-sh/resource.h +++ b/include/asm-sh/resource.h @@ -18,6 +18,12 @@ #define RLIM_NLIMITS 10 +/* + * SuS says limits have to be unsigned. + * Which makes a ton more sense anyway. + */ +#define RLIM_INFINITY (~0UL) + #ifdef __KERNEL__ #define INIT_RLIMITS \ diff --git a/include/asm-sh/signal.h b/include/asm-sh/signal.h index ab4663210..0a6ebb3ba 100644 --- a/include/asm-sh/signal.h +++ b/include/asm-sh/signal.h @@ -51,6 +51,7 @@ typedef struct { #define SIGLOST 29 */ #define SIGPWR 30 +#define SIGSYS 31 #define SIGUNUSED 31 /* These should not be considered constants from userland. */ |