diff options
| -rw-r--r-- | fs/buffer.c | 2 | ||||
| -rw-r--r-- | kernel/watchdog.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index c4e11390a44c..ec0aca8ba6bf 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -2935,7 +2935,7 @@ static void guard_bh_eod(int rw, struct bio *bio, struct buffer_head *bh) | |||
| 2935 | bio->bi_io_vec[0].bv_len = bytes; | 2935 | bio->bi_io_vec[0].bv_len = bytes; |
| 2936 | 2936 | ||
| 2937 | /* ..and clear the end of the buffer for reads */ | 2937 | /* ..and clear the end of the buffer for reads */ |
| 2938 | if (rw & READ) { | 2938 | if ((rw & RW_MASK) == READ) { |
| 2939 | void *kaddr = kmap_atomic(bh->b_page); | 2939 | void *kaddr = kmap_atomic(bh->b_page); |
| 2940 | memset(kaddr + bh_offset(bh) + bytes, 0, bh->b_size - bytes); | 2940 | memset(kaddr + bh_offset(bh) + bytes, 0, bh->b_size - bytes); |
| 2941 | kunmap_atomic(kaddr); | 2941 | kunmap_atomic(kaddr); |
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index dd4b80a9f1a9..c8c21be11ab4 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
| @@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu) | |||
| 368 | { | 368 | { |
| 369 | struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); | 369 | struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); |
| 370 | 370 | ||
| 371 | if (!watchdog_enabled) | ||
| 372 | return; | ||
| 373 | |||
| 371 | watchdog_set_prio(SCHED_NORMAL, 0); | 374 | watchdog_set_prio(SCHED_NORMAL, 0); |
| 372 | hrtimer_cancel(hrtimer); | 375 | hrtimer_cancel(hrtimer); |
| 373 | /* disable the perf event */ | 376 | /* disable the perf event */ |