diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 18:14:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 18:14:37 -0500 |
| commit | 70c01f01a214d9cc2e5a96ac43941f48a200f53f (patch) | |
| tree | 0c23ceacab0007aec95625f7c30ec62118cd512d /arch/ia64/kernel/unwind.c | |
| parent | c4eb1bf63f3dc03611b79d6dd260dfa70c5e72f9 (diff) | |
| parent | 5b5923975f07836fc7a5388f9fa5f459828ae4ee (diff) | |
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] Don't go beyond iosapic_intr_info's arraysize
[IA64] Do not go beyond ARRAY_SIZE of unw.hash
[IA64] enable setting DMAR on by default
Diffstat (limited to 'arch/ia64/kernel/unwind.c')
| -rw-r--r-- | arch/ia64/kernel/unwind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c index 67810b77d998..b6c0e63a0bf6 100644 --- a/arch/ia64/kernel/unwind.c +++ b/arch/ia64/kernel/unwind.c | |||
| @@ -2149,7 +2149,7 @@ unw_remove_unwind_table (void *handle) | |||
| 2149 | 2149 | ||
| 2150 | /* next, remove hash table entries for this table */ | 2150 | /* next, remove hash table entries for this table */ |
| 2151 | 2151 | ||
| 2152 | for (index = 0; index <= UNW_HASH_SIZE; ++index) { | 2152 | for (index = 0; index < UNW_HASH_SIZE; ++index) { |
| 2153 | tmp = unw.cache + unw.hash[index]; | 2153 | tmp = unw.cache + unw.hash[index]; |
| 2154 | if (unw.hash[index] >= UNW_CACHE_SIZE | 2154 | if (unw.hash[index] >= UNW_CACHE_SIZE |
| 2155 | || tmp->ip < table->start || tmp->ip >= table->end) | 2155 | || tmp->ip < table->start || tmp->ip >= table->end) |