diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-05 14:48:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-05 14:48:44 +0100 |
| commit | 88806d5c0f1fa26d2430181bf5860e1c3ec52478 (patch) | |
| tree | 6d7c8aacb497c618437a1f4ac80d58e6c816eca1 /arch/parisc/include | |
| parent | 38a57ec885acbfad82dd23c3f68ab3b36910ca41 (diff) | |
| parent | 03140572475f22e638d88aaa9410007317f376b4 (diff) | |
Merge tag 'v3.14.5' into linux-linaro-lsk-v3.14
This is the 3.14.5 stable release
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/shmparam.h | 5 | ||||
| -rw-r--r-- | arch/parisc/include/uapi/asm/resource.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/shmparam.h b/arch/parisc/include/asm/shmparam.h index 628ddc22faa8..afe1300ab667 100644 --- a/arch/parisc/include/asm/shmparam.h +++ b/arch/parisc/include/asm/shmparam.h @@ -1,8 +1,7 @@ #ifndef _ASMPARISC_SHMPARAM_H #define _ASMPARISC_SHMPARAM_H -#define __ARCH_FORCE_SHMLBA 1 - -#define SHMLBA 0x00400000 /* attach addr needs to be 4 Mb aligned */ +#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ +#define SHM_COLOUR 0x00400000 /* shared mappings colouring */ #endif /* _ASMPARISC_SHMPARAM_H */ diff --git a/arch/parisc/include/uapi/asm/resource.h b/arch/parisc/include/uapi/asm/resource.h index 8b06343b62ed..090483c47dbb 100644 --- a/arch/parisc/include/uapi/asm/resource.h +++ b/arch/parisc/include/uapi/asm/resource.h @@ -1,7 +1,6 @@ #ifndef _ASM_PARISC_RESOURCE_H #define _ASM_PARISC_RESOURCE_H -#define _STK_LIM_MAX 10 * _STK_LIM #include <asm-generic/resource.h> #endif |