diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-08 13:15:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-08 13:15:37 -0400 |
| commit | 84bb671dc46d77d665d2b5e74539e81b2129bb3e (patch) | |
| tree | 0917b00c767bfd52bd67897dcb53a4e200d65278 | |
| parent | f6ab91add6355e231e1c47897027b2a6ee4fa268 (diff) | |
| parent | 238c1a78c957f3dc7cb848b161dcf4805793ed56 (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
| -rw-r--r-- | arch/powerpc/oprofile/op_model_cell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index 2c9e52267292..7fd90d02d8c6 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c | |||
| @@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n) | |||
| 1077 | index = ENTRIES-1; | 1077 | index = ENTRIES-1; |
| 1078 | 1078 | ||
| 1079 | /* make sure index is valid */ | 1079 | /* make sure index is valid */ |
| 1080 | if ((index > ENTRIES) || (index < 0)) | 1080 | if ((index >= ENTRIES) || (index < 0)) |
| 1081 | index = ENTRIES-1; | 1081 | index = ENTRIES-1; |
| 1082 | 1082 | ||
| 1083 | return initial_lfsr[index]; | 1083 | return initial_lfsr[index]; |