diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-31 12:59:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-31 12:59:55 +0000 |
| commit | 68066bb378a0504439e046cdb55d88362eb6379d (patch) | |
| tree | 0b60f72ddf7108a63dd4db617b42e07fbae5346d /kernel/extable.c | |
| parent | 43f627ac9de42607b2cdcc7a41f2bcc82187e06a (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into spi-dw
To resolve trivial overlaps with fixes.
Linux 3.13-rc6
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 && |