diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 19:23:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 19:23:34 -0800 |
| commit | 91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0 (patch) | |
| tree | 058a5961548d489fdaffdbcfb7b34893946d37cf /include/asm-mips/sn/klconfig.h | |
| parent | 15a4cb9c25df05a5d4844e80a1aea83d66165868 (diff) | |
| parent | 0004a9dfeaa709a7f853487aba19932c9b1a87c8 (diff) | |
| download | op-kernel-dev-91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0.zip op-kernel-dev-91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0.tar.gz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cleanup memory barriers for weakly ordered systems.
[MIPS] Alchemy: Automatically enable CONFIG_RESOURCES_64BIT for PCI configs.
[MIPS] Unify csum_partial.S
[MIPS] SWARM: Fix a typo in #error directives
[MIPS] Fix atomic.h build errors.
[MIPS] Use SYSVIPC_COMPAT to fix various problems on N32
[MIPS] klconfig add missing bracket
Diffstat (limited to 'include/asm-mips/sn/klconfig.h')
| -rw-r--r-- | include/asm-mips/sn/klconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h index b63cd06..15d70ca 100644 --- a/include/asm-mips/sn/klconfig.h +++ b/include/asm-mips/sn/klconfig.h @@ -176,7 +176,7 @@ typedef struct kl_config_hdr { /* --- New Macros for the changed kl_config_hdr_t structure --- */ #define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\ - (unsigned long)_k + (_k->ch_malloc_hdr_off))) + ((unsigned long)_k + (_k->ch_malloc_hdr_off))) #define KL_CONFIG_CH_MALLOC_HDR(_n) PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n)) |
