Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cefa17e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 891cc228 6ce1f81f

arch/ia64/include/asm/page.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ get_order (unsigned long size) 
# define pgprot_val(x)	((x).pgprot)

# define pgprot_val(x)	((x).pgprot)





# define __pte(x)	((pte_t) { (x) } )

# define __pte(x)	((pte_t) { (x) } )

# define __pmd(x)	((pmd_t) { (x) } )

# define __pgprot(x)	((pgprot_t) { (x) } )

# define __pgprot(x)	((pgprot_t) { (x) } )





#else /* !STRICT_MM_TYPECHECKS */

#else /* !STRICT_MM_TYPECHECKS */