aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-09-23 17:56:44 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-24 03:57:47 -0400
commit493cd9122af5bd0b219974a48f0e31da0c29ff7e (patch)
tree5fdfdd6646c8abfebdcaad3a6b9fbca70016876b /arch
parentebdd90a8cb2e3963f55499850f02ce6003558b55 (diff)
x86: ds.c ptrace.c integer as NULL pointer sparse fixes
fix: arch/x86/kernel/ptrace.c:763:29: warning: Using plain integer as NULL pointer arch/x86/kernel/ptrace.c:777:46: warning: Using plain integer as NULL pointer arch/x86/kernel/ptrace.c:1115:45: warning: Using plain integer as NULL pointer arch/x86/kernel/ds.c:482:26: warning: Using plain integer as NULL pointer arch/x86/kernel/ds.c:487:25: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/ds.c4
-rw-r--r--arch/x86/kernel/ptrace.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c
index ab21c270bfa..2b69994fd3a 100644
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
@@ -479,12 +479,12 @@ static int ds_release(struct task_struct *task, enum ds_qualifier qual)
479 goto out; 479 goto out;
480 480
481 kfree(context->buffer[qual]); 481 kfree(context->buffer[qual]);
482 context->buffer[qual] = 0; 482 context->buffer[qual] = NULL;
483 483
484 current->mm->total_vm -= context->pages[qual]; 484 current->mm->total_vm -= context->pages[qual];
485 current->mm->locked_vm -= context->pages[qual]; 485 current->mm->locked_vm -= context->pages[qual];
486 context->pages[qual] = 0; 486 context->pages[qual] = 0;
487 context->owner[qual] = 0; 487 context->owner[qual] = NULL;
488 488
489 /* 489 /*
490 * we put the context twice: 490 * we put the context twice:
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index ba19bb49bd0..5df6093ac77 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -734,7 +734,7 @@ static int ptrace_bts_config(struct task_struct *child,
734 goto errout; 734 goto errout;
735 735
736 if (cfg.flags & PTRACE_BTS_O_ALLOC) { 736 if (cfg.flags & PTRACE_BTS_O_ALLOC) {
737 ds_ovfl_callback_t ovfl = 0; 737 ds_ovfl_callback_t ovfl = NULL;
738 unsigned int sig = 0; 738 unsigned int sig = 0;
739 739
740 /* we ignore the error in case we were not tracing child */ 740 /* we ignore the error in case we were not tracing child */
@@ -748,7 +748,7 @@ static int ptrace_bts_config(struct task_struct *child,
748 ovfl = ptrace_bts_ovfl; 748 ovfl = ptrace_bts_ovfl;
749 } 749 }
750 750
751 error = ds_request_bts(child, /* base = */ 0, cfg.size, ovfl); 751 error = ds_request_bts(child, /* base = */ NULL, cfg.size, ovfl);
752 if (error < 0) 752 if (error < 0)
753 goto errout; 753 goto errout;
754 754
@@ -1086,7 +1086,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
1086 break; 1086 break;
1087 1087
1088 case PTRACE_BTS_SIZE: 1088 case PTRACE_BTS_SIZE:
1089 ret = ds_get_bts_index(child, /* pos = */ 0); 1089 ret = ds_get_bts_index(child, /* pos = */ NULL);
1090 break; 1090 break;
1091 1091
1092 case PTRACE_BTS_GET: 1092 case PTRACE_BTS_GET: