diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /include/asm-sparc64/shmparam.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'include/asm-sparc64/shmparam.h')
| -rw-r--r-- | include/asm-sparc64/shmparam.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h index 1ed0d6701a9b..5fa3a9b05e7f 100644 --- a/include/asm-sparc64/shmparam.h +++ b/include/asm-sparc64/shmparam.h | |||
| @@ -1,10 +1 @@ | |||
| 1 | #ifndef _ASMSPARC64_SHMPARAM_H | #include <asm-sparc/shmparam.h> | |
| 2 | #define _ASMSPARC64_SHMPARAM_H | ||
| 3 | |||
| 4 | #include <asm/spitfire.h> | ||
| 5 | |||
| 6 | #define __ARCH_FORCE_SHMLBA 1 | ||
| 7 | /* attach addr a multiple of this */ | ||
| 8 | #define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE) | ||
| 9 | |||
| 10 | #endif /* _ASMSPARC64_SHMPARAM_H */ | ||