projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-microblaze.git]
/
kernel
/
extable.c
diff --git
a/kernel/extable.c
b/kernel/extable.c
index
a0024f2
..
b0ea5eb
100644
(file)
--- a/
kernel/extable.c
+++ b/
kernel/extable.c
@@
-34,7
+34,8
@@
u32 __initdata __visible main_extable_sort_needed = 1;
/* Sort the kernel's built-in exception table */
void __init sort_main_extable(void)
{
/* Sort the kernel's built-in exception table */
void __init sort_main_extable(void)
{
- if (main_extable_sort_needed && __stop___ex_table > __start___ex_table) {
+ if (main_extable_sort_needed &&
+ &__stop___ex_table > &__start___ex_table) {
pr_notice("Sorting __ex_table...\n");
sort_extable(__start___ex_table, __stop___ex_table);
}
pr_notice("Sorting __ex_table...\n");
sort_extable(__start___ex_table, __stop___ex_table);
}
@@
-149,8
+150,6
@@
int kernel_text_address(unsigned long addr)
goto out;
if (is_bpf_text_address(addr))
goto out;
goto out;
if (is_bpf_text_address(addr))
goto out;
- if (is_bpf_image_address(addr))
- goto out;
ret = 0;
out:
if (no_rcu)
ret = 0;
out:
if (no_rcu)