diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/mips/include/uapi/asm/resource.h | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/mips/include/uapi/asm/resource.h')
| -rw-r--r-- | arch/mips/include/uapi/asm/resource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/uapi/asm/resource.h b/arch/mips/include/uapi/asm/resource.h index 87cb3085269c..b26439d4ab0b 100644 --- a/arch/mips/include/uapi/asm/resource.h +++ b/arch/mips/include/uapi/asm/resource.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * but we keep the old value on MIPS32, | 26 | * but we keep the old value on MIPS32, |
| 27 | * for compatibility: | 27 | * for compatibility: |
| 28 | */ | 28 | */ |
| 29 | #ifdef CONFIG_32BIT | 29 | #ifndef __mips64 |
| 30 | # define RLIM_INFINITY 0x7fffffffUL | 30 | # define RLIM_INFINITY 0x7fffffffUL |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||