diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
| commit | bea6412a994a8f49d81bc103907563ab9f94c371 (patch) | |
| tree | 93afcafccce0f149d4221ec4bb6156dcdafdb0e5 /arch/microblaze/kernel/cpu/cache.c | |
| parent | 82c5cde1c4b01a62c9a19c9118b4b434c333ce86 (diff) | |
| parent | 49006bfd31f728a0dfdef6ef41635f0e6c546155 (diff) | |
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'arch/microblaze/kernel/cpu/cache.c')
| -rw-r--r-- | arch/microblaze/kernel/cpu/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index 4254514b4c8c..a6e44410672d 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c | |||
| @@ -140,7 +140,7 @@ do { \ | |||
| 140 | /* It is used only first parameter for OP - for wic, wdc */ | 140 | /* It is used only first parameter for OP - for wic, wdc */ |
| 141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ | 141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ |
| 142 | do { \ | 142 | do { \ |
| 143 | int volatile temp; \ | 143 | int volatile temp = 0; \ |
| 144 | int align = ~(line_length - 1); \ | 144 | int align = ~(line_length - 1); \ |
| 145 | end = ((end & align) == end) ? end - line_length : end & align; \ | 145 | end = ((end & align) == end) ? end - line_length : end & align; \ |
| 146 | WARN_ON(end - start < 0); \ | 146 | WARN_ON(end - start < 0); \ |