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

Commit 018b8d12 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[PATCH] frv: support module exception tables 



Fix the exception table handling so that modules exceptions are dealt with.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40234401

arch/frv/mm/extable.c

+9 −25
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static inline unsigned long search_one_table(const struct exception_table_entry 
 */

unsigned long search_exception_table(unsigned long pc)

{

	unsigned long ret = 0;

	const struct exception_table_entry *extab;



	/* determine if the fault lay during a memcpy_user or a memset_user */

	if (__frame->lr == (unsigned long) &__memset_user_error_lr &&
@@ -55,7 +55,8 @@ unsigned long search_exception_table(unsigned long pc) 
		 */

		return (unsigned long) &__memset_user_error_handler;

	}

	else if (__frame->lr == (unsigned long) &__memcpy_user_error_lr &&



	if (__frame->lr == (unsigned long) &__memcpy_user_error_lr &&

	    (unsigned long) &memcpy <= pc && pc < (unsigned long) &__memcpy_end

	    ) {

		/* the fault occurred in a protected memset
@@ -65,27 +66,10 @@ unsigned long search_exception_table(unsigned long pc) 
		return (unsigned long) &__memcpy_user_error_handler;

	}



#ifndef CONFIG_MODULES

	/* there is only the kernel to search.  */

	ret = search_one_table(__start___ex_table, __stop___ex_table - 1, pc);

	return ret;



#else

	/* the kernel is the last "module" -- no need to treat it special */

	unsigned long flags;

	struct module *mp;



	spin_lock_irqsave(&modlist_lock, flags);

	extab = search_exception_tables(pc);

	if (extab)

		return extab->fixup;



	for (mp = module_list; mp != NULL; mp = mp->next) {

		if (mp->ex_table_start == NULL || !(mp->flags & (MOD_RUNNING | MOD_INITIALIZING)))

			continue;

		ret = search_one_table(mp->ex_table_start, mp->ex_table_end - 1, pc);

		if (ret)

			break;

	}

	return 0;



	spin_unlock_irqrestore(&modlist_lock, flags);

	return ret;

#endif

} /* end search_exception_table() */