diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/mips/include/asm/shmparam.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/mips/include/asm/shmparam.h')
| -rw-r--r-- | arch/mips/include/asm/shmparam.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/include/asm/shmparam.h b/arch/mips/include/asm/shmparam.h new file mode 100644 index 000000000000..09290720751c --- /dev/null +++ b/arch/mips/include/asm/shmparam.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | /* | ||
| 2 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | * License. See the file "COPYING" in the main directory of this archive | ||
| 4 | * for more details. | ||
| 5 | */ | ||
| 6 | #ifndef _ASM_SHMPARAM_H | ||
| 7 | #define _ASM_SHMPARAM_H | ||
| 8 | |||
| 9 | #define __ARCH_FORCE_SHMLBA 1 | ||
| 10 | |||
| 11 | #define SHMLBA 0x40000 /* attach addr a multiple of this */ | ||
| 12 | |||
| 13 | #endif /* _ASM_SHMPARAM_H */ | ||