Skip to content

Commit

Permalink
x86: ptrace.c: fix defined-but-unused warnings
Browse files Browse the repository at this point in the history
arch/x86/kernel/ptrace.c:548: warning: 'ptrace_bts_get_size' defined but not used
arch/x86/kernel/ptrace.c:558: warning: 'ptrace_bts_read_record' defined but not used
arch/x86/kernel/ptrace.c:607: warning: 'ptrace_bts_clear' defined but not used
arch/x86/kernel/ptrace.c:617: warning: 'ptrace_bts_drain' defined but not used
arch/x86/kernel/ptrace.c:720: warning: 'ptrace_bts_config' defined but not used
arch/x86/kernel/ptrace.c:788: warning: 'ptrace_bts_status' defined but not used

Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Andrew Morton authored and Ingo Molnar committed Mar 27, 2008
1 parent bc713dc commit d8d4f15
Showing 1 changed file with 85 additions and 84 deletions.
169 changes: 85 additions & 84 deletions arch/x86/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -600,21 +600,6 @@ static int ptrace_bts_read_record(struct task_struct *child,
return sizeof(ret);
}

static int ptrace_bts_write_record(struct task_struct *child,
const struct bts_struct *in)
{
int retval;

if (!child->thread.ds_area_msr)
return -ENXIO;

retval = ds_write_bts((void *)child->thread.ds_area_msr, in);
if (retval)
return retval;

return sizeof(*in);
}

static int ptrace_bts_clear(struct task_struct *child)
{
if (!child->thread.ds_area_msr)
Expand Down Expand Up @@ -657,75 +642,6 @@ static int ptrace_bts_drain(struct task_struct *child,
return end;
}

static int ptrace_bts_realloc(struct task_struct *child,
int size, int reduce_size)
{
unsigned long rlim, vm;
int ret, old_size;

if (size < 0)
return -EINVAL;

old_size = ds_get_bts_size((void *)child->thread.ds_area_msr);
if (old_size < 0)
return old_size;

ret = ds_free((void **)&child->thread.ds_area_msr);
if (ret < 0)
goto out;

size >>= PAGE_SHIFT;
old_size >>= PAGE_SHIFT;

current->mm->total_vm -= old_size;
current->mm->locked_vm -= old_size;

if (size == 0)
goto out;

rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
vm = current->mm->total_vm + size;
if (rlim < vm) {
ret = -ENOMEM;

if (!reduce_size)
goto out;

size = rlim - current->mm->total_vm;
if (size <= 0)
goto out;
}

rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
vm = current->mm->locked_vm + size;
if (rlim < vm) {
ret = -ENOMEM;

if (!reduce_size)
goto out;

size = rlim - current->mm->locked_vm;
if (size <= 0)
goto out;
}

ret = ds_allocate((void **)&child->thread.ds_area_msr,
size << PAGE_SHIFT);
if (ret < 0)
goto out;

current->mm->total_vm += size;
current->mm->locked_vm += size;

out:
if (child->thread.ds_area_msr)
set_tsk_thread_flag(child, TIF_DS_AREA_MSR);
else
clear_tsk_thread_flag(child, TIF_DS_AREA_MSR);

return ret;
}

static int ptrace_bts_config(struct task_struct *child,
long cfg_size,
const struct ptrace_bts_config __user *ucfg)
Expand Down Expand Up @@ -828,6 +744,91 @@ static int ptrace_bts_status(struct task_struct *child,
return sizeof(cfg);
}


static int ptrace_bts_write_record(struct task_struct *child,
const struct bts_struct *in)
{
int retval;

if (!child->thread.ds_area_msr)
return -ENXIO;

retval = ds_write_bts((void *)child->thread.ds_area_msr, in);
if (retval)
return retval;

return sizeof(*in);
}

static int ptrace_bts_realloc(struct task_struct *child,
int size, int reduce_size)
{
unsigned long rlim, vm;
int ret, old_size;

if (size < 0)
return -EINVAL;

old_size = ds_get_bts_size((void *)child->thread.ds_area_msr);
if (old_size < 0)
return old_size;

ret = ds_free((void **)&child->thread.ds_area_msr);
if (ret < 0)
goto out;

size >>= PAGE_SHIFT;
old_size >>= PAGE_SHIFT;

current->mm->total_vm -= old_size;
current->mm->locked_vm -= old_size;

if (size == 0)
goto out;

rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
vm = current->mm->total_vm + size;
if (rlim < vm) {
ret = -ENOMEM;

if (!reduce_size)
goto out;

size = rlim - current->mm->total_vm;
if (size <= 0)
goto out;
}

rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
vm = current->mm->locked_vm + size;
if (rlim < vm) {
ret = -ENOMEM;

if (!reduce_size)
goto out;

size = rlim - current->mm->locked_vm;
if (size <= 0)
goto out;
}

ret = ds_allocate((void **)&child->thread.ds_area_msr,
size << PAGE_SHIFT);
if (ret < 0)
goto out;

current->mm->total_vm += size;
current->mm->locked_vm += size;

out:
if (child->thread.ds_area_msr)
set_tsk_thread_flag(child, TIF_DS_AREA_MSR);
else
clear_tsk_thread_flag(child, TIF_DS_AREA_MSR);

return ret;
}

void ptrace_bts_take_timestamp(struct task_struct *tsk,
enum bts_qualifier qualifier)
{
Expand Down

0 comments on commit d8d4f15

Please sign in to comment.