diff --git a/[refs] b/[refs]
index 8d244ed86bf5..72b21a838e29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebdd90a8cb2e3963f55499850f02ce6003558b55
+refs/heads/master: 493cd9122af5bd0b219974a48f0e31da0c29ff7e
diff --git a/trunk/arch/x86/kernel/ds.c b/trunk/arch/x86/kernel/ds.c
index ab21c270bfa4..2b69994fd3a8 100644
--- a/trunk/arch/x86/kernel/ds.c
+++ b/trunk/arch/x86/kernel/ds.c
@@ -479,12 +479,12 @@ static int ds_release(struct task_struct *task, enum ds_qualifier qual)
 		goto out;
 
 	kfree(context->buffer[qual]);
-	context->buffer[qual] = 0;
+	context->buffer[qual] = NULL;
 
 	current->mm->total_vm  -= context->pages[qual];
 	current->mm->locked_vm -= context->pages[qual];
 	context->pages[qual] = 0;
-	context->owner[qual] = 0;
+	context->owner[qual] = NULL;
 
 	/*
 	 * we put the context twice:
diff --git a/trunk/arch/x86/kernel/ptrace.c b/trunk/arch/x86/kernel/ptrace.c
index ba19bb49bd09..5df6093ac776 100644
--- a/trunk/arch/x86/kernel/ptrace.c
+++ b/trunk/arch/x86/kernel/ptrace.c
@@ -734,7 +734,7 @@ static int ptrace_bts_config(struct task_struct *child,
 		goto errout;
 
 	if (cfg.flags & PTRACE_BTS_O_ALLOC) {
-		ds_ovfl_callback_t ovfl = 0;
+		ds_ovfl_callback_t ovfl = NULL;
 		unsigned int sig = 0;
 
 		/* we ignore the error in case we were not tracing child */
@@ -748,7 +748,7 @@ static int ptrace_bts_config(struct task_struct *child,
 			ovfl = ptrace_bts_ovfl;
 		}
 
-		error = ds_request_bts(child, /* base = */ 0, cfg.size, ovfl);
+		error = ds_request_bts(child, /* base = */ NULL, cfg.size, ovfl);
 		if (error < 0)
 			goto errout;
 
@@ -1086,7 +1086,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 		break;
 
 	case PTRACE_BTS_SIZE:
-		ret = ds_get_bts_index(child, /* pos = */ 0);
+		ret = ds_get_bts_index(child, /* pos = */ NULL);
 		break;
 
 	case PTRACE_BTS_GET: