aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/mm/pageattr.c2
-rw-r--r--drivers/char/watchdog/machzwd.c2
-rw-r--r--drivers/kvm/mmu.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index ad91528bdc14..e223b1d4981c 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -224,7 +224,7 @@ void global_flush_tlb(void)
224 list_replace_init(&df_list, &l); 224 list_replace_init(&df_list, &l);
225 spin_unlock_irq(&cpa_lock); 225 spin_unlock_irq(&cpa_lock);
226 if (!cpu_has_clflush) 226 if (!cpu_has_clflush)
227 flush_map(0); 227 flush_map(NULL);
228 list_for_each_entry_safe(pg, next, &l, lru) { 228 list_for_each_entry_safe(pg, next, &l, lru) {
229 if (cpu_has_clflush) 229 if (cpu_has_clflush)
230 flush_map(page_address(pg)); 230 flush_map(page_address(pg));
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)