git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'kumar/merge' into merge
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
mach-loongson
/
loongson.h
diff --git
a/arch/mips/include/asm/mach-loongson/loongson.h
b/arch/mips/include/asm/mach-loongson/loongson.h
index 1cf7b1401ee43259ed8947e60ccb1b8d91605fe8..fcdbe3a4ce1f4f42de0887506cf1c3cba584e04d 100644
(file)
--- a/
arch/mips/include/asm/mach-loongson/loongson.h
+++ b/
arch/mips/include/asm/mach-loongson/loongson.h
@@
-307,7
+307,7
@@
extern unsigned long _loongson_addrwincfg_base;
*/
#define LOONGSON_ADDRWIN_CFG(s, d, w, src, dst, size) do {\
s##_WIN##w##_BASE = (src); \
- s##_WIN##w##_MMAP = (
src
) | ADDRWIN_MAP_DST_##d; \
+ s##_WIN##w##_MMAP = (
dst
) | ADDRWIN_MAP_DST_##d; \
s##_WIN##w##_MASK = ~(size-1); \
} while (0)