Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: ptrace.c: fix defined-but-unused warnings

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>

authored by

Andrew Morton and committed by
Ingo Molnar
d8d4f157 bc713dcf

+85 -84
+85 -84
arch/x86/kernel/ptrace.c
··· 600 600 return sizeof(ret); 601 601 } 602 602 603 - static int ptrace_bts_write_record(struct task_struct *child, 604 - const struct bts_struct *in) 605 - { 606 - int retval; 607 - 608 - if (!child->thread.ds_area_msr) 609 - return -ENXIO; 610 - 611 - retval = ds_write_bts((void *)child->thread.ds_area_msr, in); 612 - if (retval) 613 - return retval; 614 - 615 - return sizeof(*in); 616 - } 617 - 618 603 static int ptrace_bts_clear(struct task_struct *child) 619 604 { 620 605 if (!child->thread.ds_area_msr) ··· 640 655 ds_clear(ds); 641 656 642 657 return end; 643 - } 644 - 645 - static int ptrace_bts_realloc(struct task_struct *child, 646 - int size, int reduce_size) 647 - { 648 - unsigned long rlim, vm; 649 - int ret, old_size; 650 - 651 - if (size < 0) 652 - return -EINVAL; 653 - 654 - old_size = ds_get_bts_size((void *)child->thread.ds_area_msr); 655 - if (old_size < 0) 656 - return old_size; 657 - 658 - ret = ds_free((void **)&child->thread.ds_area_msr); 659 - if (ret < 0) 660 - goto out; 661 - 662 - size >>= PAGE_SHIFT; 663 - old_size >>= PAGE_SHIFT; 664 - 665 - current->mm->total_vm -= old_size; 666 - current->mm->locked_vm -= old_size; 667 - 668 - if (size == 0) 669 - goto out; 670 - 671 - rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; 672 - vm = current->mm->total_vm + size; 673 - if (rlim < vm) { 674 - ret = -ENOMEM; 675 - 676 - if (!reduce_size) 677 - goto out; 678 - 679 - size = rlim - current->mm->total_vm; 680 - if (size <= 0) 681 - goto out; 682 - } 683 - 684 - rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; 685 - vm = current->mm->locked_vm + size; 686 - if (rlim < vm) { 687 - ret = -ENOMEM; 688 - 689 - if (!reduce_size) 690 - goto out; 691 - 692 - size = rlim - current->mm->locked_vm; 693 - if (size <= 0) 694 - goto out; 695 - } 696 - 697 - ret = ds_allocate((void **)&child->thread.ds_area_msr, 698 - size << PAGE_SHIFT); 699 - if (ret < 0) 700 - goto out; 701 - 702 - current->mm->total_vm += size; 703 - current->mm->locked_vm += size; 704 - 705 - out: 706 - if (child->thread.ds_area_msr) 707 - set_tsk_thread_flag(child, TIF_DS_AREA_MSR); 708 - else 709 - clear_tsk_thread_flag(child, TIF_DS_AREA_MSR); 710 - 711 - return ret; 712 658 } 713 659 714 660 static int ptrace_bts_config(struct task_struct *child, ··· 742 826 return -EFAULT; 743 827 744 828 return sizeof(cfg); 829 + } 830 + 831 + 832 + static int ptrace_bts_write_record(struct task_struct *child, 833 + const struct bts_struct *in) 834 + { 835 + int retval; 836 + 837 + if (!child->thread.ds_area_msr) 838 + return -ENXIO; 839 + 840 + retval = ds_write_bts((void *)child->thread.ds_area_msr, in); 841 + if (retval) 842 + return retval; 843 + 844 + return sizeof(*in); 845 + } 846 + 847 + static int ptrace_bts_realloc(struct task_struct *child, 848 + int size, int reduce_size) 849 + { 850 + unsigned long rlim, vm; 851 + int ret, old_size; 852 + 853 + if (size < 0) 854 + return -EINVAL; 855 + 856 + old_size = ds_get_bts_size((void *)child->thread.ds_area_msr); 857 + if (old_size < 0) 858 + return old_size; 859 + 860 + ret = ds_free((void **)&child->thread.ds_area_msr); 861 + if (ret < 0) 862 + goto out; 863 + 864 + size >>= PAGE_SHIFT; 865 + old_size >>= PAGE_SHIFT; 866 + 867 + current->mm->total_vm -= old_size; 868 + current->mm->locked_vm -= old_size; 869 + 870 + if (size == 0) 871 + goto out; 872 + 873 + rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; 874 + vm = current->mm->total_vm + size; 875 + if (rlim < vm) { 876 + ret = -ENOMEM; 877 + 878 + if (!reduce_size) 879 + goto out; 880 + 881 + size = rlim - current->mm->total_vm; 882 + if (size <= 0) 883 + goto out; 884 + } 885 + 886 + rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; 887 + vm = current->mm->locked_vm + size; 888 + if (rlim < vm) { 889 + ret = -ENOMEM; 890 + 891 + if (!reduce_size) 892 + goto out; 893 + 894 + size = rlim - current->mm->locked_vm; 895 + if (size <= 0) 896 + goto out; 897 + } 898 + 899 + ret = ds_allocate((void **)&child->thread.ds_area_msr, 900 + size << PAGE_SHIFT); 901 + if (ret < 0) 902 + goto out; 903 + 904 + current->mm->total_vm += size; 905 + current->mm->locked_vm += size; 906 + 907 + out: 908 + if (child->thread.ds_area_msr) 909 + set_tsk_thread_flag(child, TIF_DS_AREA_MSR); 910 + else 911 + clear_tsk_thread_flag(child, TIF_DS_AREA_MSR); 912 + 913 + return ret; 745 914 } 746 915 747 916 void ptrace_bts_take_timestamp(struct task_struct *tsk,