diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-02 16:39:07 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-02 16:39:07 -0800 |
commit | 06749f192b740651302a84273707d0b66749d126 (patch) | |
tree | f79f6bd1f8a8a0b63b624d78bedc5c00650f1383 /kernel/extable.c | |
parent | 931cf48d2db64c67d0e917f55d7db7ab7b9fefa3 (diff) | |
parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) |
Merge v3.13-rc2 into staging-next
we want these fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/extable.c')
-rw-r--r-- | kernel/extable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/extable.c b/kernel/extable.c index 832cb28105b..763faf037ec 100644 --- a/kernel/extable.c +++ b/kernel/extable.c @@ -61,7 +61,7 @@ const struct exception_table_entry *search_exception_tables(unsigned long addr) static inline int init_kernel_text(unsigned long addr) { if (addr >= (unsigned long)_sinittext && - addr <= (unsigned long)_einittext) + addr < (unsigned long)_einittext) return 1; return 0; } @@ -69,7 +69,7 @@ static inline int init_kernel_text(unsigned long addr) int core_kernel_text(unsigned long addr) { if (addr >= (unsigned long)_stext && - addr <= (unsigned long)_etext) + addr < (unsigned long)_etext) return 1; if (system_state == SYSTEM_BOOTING && |