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

Commit 03347e25 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 compile error in arch/ia64/mm/extable.c
parents 19035e5b 1dcd775e

arch/ia64/mm/extable.c

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <linux/sort.h>



#include <asm/uaccess.h>

#include <asm/module.h>

#include <linux/module.h>



static int cmp_ex(const void *a, const void *b)

{
@@ -55,7 +55,7 @@ void sort_extable (struct exception_table_entry *start, 


static inline unsigned long ex_to_addr(const struct exception_table_entry *x)

{

	return (unsigned long)&x->insn + x->insn;

	return (unsigned long)&x->addr + x->addr;

}



#ifdef CONFIG_MODULES