diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 13:06:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 13:06:44 -0800 |
| commit | 9cefa17e196beab300d4faf09d242de77e5900d5 (patch) | |
| tree | c7f8e6677e0370466fdc8fca1a7bc87a7902151b /arch | |
| parent | 891cc2283216bf76f387546f0e220caf8ce9fbf9 (diff) | |
| parent | 6ce1f81f51c7b22f539012e446c01e8c75d20fd9 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix ia64 build failure in pmdp_get_and_clear
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h index 41b6d31110f..961a16f43e6 100644 --- a/arch/ia64/include/asm/page.h +++ b/arch/ia64/include/asm/page.h @@ -189,6 +189,7 @@ get_order (unsigned long size) # define pgprot_val(x) ((x).pgprot) # define __pte(x) ((pte_t) { (x) } ) +# define __pmd(x) ((pmd_t) { (x) } ) # define __pgprot(x) ((pgprot_t) { (x) } ) #else /* !STRICT_MM_TYPECHECKS */ |