summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-02-16 13:49:16 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 23:05:30 +0100
commit2f6097129af5625db2fb5e601f89e5bf55cd1dcd (patch)
tree8e87652d217217c9fdb5ed5cdd044e103b9aba8b /include
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff)
downloadlinux-2f6097129af5625db2fb5e601f89e5bf55cd1dcd.tar.xz
linux-2f6097129af5625db2fb5e601f89e5bf55cd1dcd.zip
FRV: __pte_to_swp_entry doesn't expand correctly
The macro doesn't expand correctly when its parameter isn't 'pte'. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-frv/pgtable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h
index 83c51aba534b..e16fdb1f4f4f 100644
--- a/include/asm-frv/pgtable.h
+++ b/include/asm-frv/pgtable.h
@@ -478,7 +478,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
#define __swp_type(x) (((x).val >> 2) & 0x1f)
#define __swp_offset(x) ((x).val >> 8)
#define __swp_entry(type, offset) ((swp_entry_t) { ((type) << 2) | ((offset) << 8) })
-#define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte })
+#define __pte_to_swp_entry(_pte) ((swp_entry_t) { (_pte).pte })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
static inline int pte_file(pte_t pte)