diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/watchdog/machzwd.c | 2 | ||||
-rw-r--r-- | drivers/kvm/mmu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index 276577d08fba..4d730fdbd528 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/drivers/char/watchdog/machzwd.c | |||
@@ -325,7 +325,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
325 | return put_user(0, p); | 325 | return put_user(0, p); |
326 | 326 | ||
327 | case WDIOC_KEEPALIVE: | 327 | case WDIOC_KEEPALIVE: |
328 | zf_ping(0); | 328 | zf_ping(NULL); |
329 | break; | 329 | break; |
330 | 330 | ||
331 | default: | 331 | default: |
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index 22c426cd8cb2..be793770f31b 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c | |||
@@ -333,7 +333,7 @@ static void rmap_desc_remove_entry(struct kvm_vcpu *vcpu, | |||
333 | for (j = RMAP_EXT - 1; !desc->shadow_ptes[j] && j > i; --j) | 333 | for (j = RMAP_EXT - 1; !desc->shadow_ptes[j] && j > i; --j) |
334 | ; | 334 | ; |
335 | desc->shadow_ptes[i] = desc->shadow_ptes[j]; | 335 | desc->shadow_ptes[i] = desc->shadow_ptes[j]; |
336 | desc->shadow_ptes[j] = 0; | 336 | desc->shadow_ptes[j] = NULL; |
337 | if (j != 0) | 337 | if (j != 0) |
338 | return; | 338 | return; |
339 | if (!prev_desc && !desc->more) | 339 | if (!prev_desc && !desc->more) |