diff options
author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-04-06 22:00:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:08 -0400 |
commit | 99081ab553d6a88dd6b3774af5eef94dbb8faad7 (patch) | |
tree | a78c2a07ec780b110e49939c8b954e2468398e16 | |
parent | b918e5e60d775549478e4268155142156a95aa17 (diff) |
kprobes: move EXPORT_SYMBOL_GPL just after function definitions
Clean up positions of EXPORT_SYMBOL_GPL in kernel/kprobes.c according to
checkpatch.pl.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/kprobes.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index a55bfadfd766..ca4c22d78cfd 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
@@ -722,6 +722,7 @@ out: | |||
722 | 722 | ||
723 | return ret; | 723 | return ret; |
724 | } | 724 | } |
725 | EXPORT_SYMBOL_GPL(register_kprobe); | ||
725 | 726 | ||
726 | /* | 727 | /* |
727 | * Unregister a kprobe without a scheduler synchronization. | 728 | * Unregister a kprobe without a scheduler synchronization. |
@@ -803,11 +804,13 @@ int __kprobes register_kprobes(struct kprobe **kps, int num) | |||
803 | } | 804 | } |
804 | return ret; | 805 | return ret; |
805 | } | 806 | } |
807 | EXPORT_SYMBOL_GPL(register_kprobes); | ||
806 | 808 | ||
807 | void __kprobes unregister_kprobe(struct kprobe *p) | 809 | void __kprobes unregister_kprobe(struct kprobe *p) |
808 | { | 810 | { |
809 | unregister_kprobes(&p, 1); | 811 | unregister_kprobes(&p, 1); |
810 | } | 812 | } |
813 | EXPORT_SYMBOL_GPL(unregister_kprobe); | ||
811 | 814 | ||
812 | void __kprobes unregister_kprobes(struct kprobe **kps, int num) | 815 | void __kprobes unregister_kprobes(struct kprobe **kps, int num) |
813 | { | 816 | { |
@@ -826,6 +829,7 @@ void __kprobes unregister_kprobes(struct kprobe **kps, int num) | |||
826 | if (kps[i]->addr) | 829 | if (kps[i]->addr) |
827 | __unregister_kprobe_bottom(kps[i]); | 830 | __unregister_kprobe_bottom(kps[i]); |
828 | } | 831 | } |
832 | EXPORT_SYMBOL_GPL(unregister_kprobes); | ||
829 | 833 | ||
830 | static struct notifier_block kprobe_exceptions_nb = { | 834 | static struct notifier_block kprobe_exceptions_nb = { |
831 | .notifier_call = kprobe_exceptions_notify, | 835 | .notifier_call = kprobe_exceptions_notify, |
@@ -865,16 +869,19 @@ int __kprobes register_jprobes(struct jprobe **jps, int num) | |||
865 | } | 869 | } |
866 | return ret; | 870 | return ret; |
867 | } | 871 | } |
872 | EXPORT_SYMBOL_GPL(register_jprobes); | ||
868 | 873 | ||
869 | int __kprobes register_jprobe(struct jprobe *jp) | 874 | int __kprobes register_jprobe(struct jprobe *jp) |
870 | { | 875 | { |
871 | return register_jprobes(&jp, 1); | 876 | return register_jprobes(&jp, 1); |
872 | } | 877 | } |
878 | EXPORT_SYMBOL_GPL(register_jprobe); | ||
873 | 879 | ||
874 | void __kprobes unregister_jprobe(struct jprobe *jp) | 880 | void __kprobes unregister_jprobe(struct jprobe *jp) |
875 | { | 881 | { |
876 | unregister_jprobes(&jp, 1); | 882 | unregister_jprobes(&jp, 1); |
877 | } | 883 | } |
884 | EXPORT_SYMBOL_GPL(unregister_jprobe); | ||
878 | 885 | ||
879 | void __kprobes unregister_jprobes(struct jprobe **jps, int num) | 886 | void __kprobes unregister_jprobes(struct jprobe **jps, int num) |
880 | { | 887 | { |
@@ -894,6 +901,7 @@ void __kprobes unregister_jprobes(struct jprobe **jps, int num) | |||
894 | __unregister_kprobe_bottom(&jps[i]->kp); | 901 | __unregister_kprobe_bottom(&jps[i]->kp); |
895 | } | 902 | } |
896 | } | 903 | } |
904 | EXPORT_SYMBOL_GPL(unregister_jprobes); | ||
897 | 905 | ||
898 | #ifdef CONFIG_KRETPROBES | 906 | #ifdef CONFIG_KRETPROBES |
899 | /* | 907 | /* |
@@ -987,6 +995,7 @@ int __kprobes register_kretprobe(struct kretprobe *rp) | |||
987 | free_rp_inst(rp); | 995 | free_rp_inst(rp); |
988 | return ret; | 996 | return ret; |
989 | } | 997 | } |
998 | EXPORT_SYMBOL_GPL(register_kretprobe); | ||
990 | 999 | ||
991 | int __kprobes register_kretprobes(struct kretprobe **rps, int num) | 1000 | int __kprobes register_kretprobes(struct kretprobe **rps, int num) |
992 | { | 1001 | { |
@@ -1004,11 +1013,13 @@ int __kprobes register_kretprobes(struct kretprobe **rps, int num) | |||
1004 | } | 1013 | } |
1005 | return ret; | 1014 | return ret; |
1006 | } | 1015 | } |
1016 | EXPORT_SYMBOL_GPL(register_kretprobes); | ||
1007 | 1017 | ||
1008 | void __kprobes unregister_kretprobe(struct kretprobe *rp) | 1018 | void __kprobes unregister_kretprobe(struct kretprobe *rp) |
1009 | { | 1019 | { |
1010 | unregister_kretprobes(&rp, 1); | 1020 | unregister_kretprobes(&rp, 1); |
1011 | } | 1021 | } |
1022 | EXPORT_SYMBOL_GPL(unregister_kretprobe); | ||
1012 | 1023 | ||
1013 | void __kprobes unregister_kretprobes(struct kretprobe **rps, int num) | 1024 | void __kprobes unregister_kretprobes(struct kretprobe **rps, int num) |
1014 | { | 1025 | { |
@@ -1030,24 +1041,30 @@ void __kprobes unregister_kretprobes(struct kretprobe **rps, int num) | |||
1030 | } | 1041 | } |
1031 | } | 1042 | } |
1032 | } | 1043 | } |
1044 | EXPORT_SYMBOL_GPL(unregister_kretprobes); | ||
1033 | 1045 | ||
1034 | #else /* CONFIG_KRETPROBES */ | 1046 | #else /* CONFIG_KRETPROBES */ |
1035 | int __kprobes register_kretprobe(struct kretprobe *rp) | 1047 | int __kprobes register_kretprobe(struct kretprobe *rp) |
1036 | { | 1048 | { |
1037 | return -ENOSYS; | 1049 | return -ENOSYS; |
1038 | } | 1050 | } |
1051 | EXPORT_SYMBOL_GPL(register_kretprobe); | ||
1039 | 1052 | ||
1040 | int __kprobes register_kretprobes(struct kretprobe **rps, int num) | 1053 | int __kprobes register_kretprobes(struct kretprobe **rps, int num) |
1041 | { | 1054 | { |
1042 | return -ENOSYS; | 1055 | return -ENOSYS; |
1043 | } | 1056 | } |
1057 | EXPORT_SYMBOL_GPL(register_kretprobes); | ||
1058 | |||
1044 | void __kprobes unregister_kretprobe(struct kretprobe *rp) | 1059 | void __kprobes unregister_kretprobe(struct kretprobe *rp) |
1045 | { | 1060 | { |
1046 | } | 1061 | } |
1062 | EXPORT_SYMBOL_GPL(unregister_kretprobe); | ||
1047 | 1063 | ||
1048 | void __kprobes unregister_kretprobes(struct kretprobe **rps, int num) | 1064 | void __kprobes unregister_kretprobes(struct kretprobe **rps, int num) |
1049 | { | 1065 | { |
1050 | } | 1066 | } |
1067 | EXPORT_SYMBOL_GPL(unregister_kretprobes); | ||
1051 | 1068 | ||
1052 | static int __kprobes pre_handler_kretprobe(struct kprobe *p, | 1069 | static int __kprobes pre_handler_kretprobe(struct kprobe *p, |
1053 | struct pt_regs *regs) | 1070 | struct pt_regs *regs) |
@@ -1418,16 +1435,5 @@ late_initcall(debugfs_kprobe_init); | |||
1418 | 1435 | ||
1419 | module_init(init_kprobes); | 1436 | module_init(init_kprobes); |
1420 | 1437 | ||
1421 | EXPORT_SYMBOL_GPL(register_kprobe); | 1438 | /* defined in arch/.../kernel/kprobes.c */ |
1422 | EXPORT_SYMBOL_GPL(unregister_kprobe); | ||
1423 | EXPORT_SYMBOL_GPL(register_kprobes); | ||
1424 | EXPORT_SYMBOL_GPL(unregister_kprobes); | ||
1425 | EXPORT_SYMBOL_GPL(register_jprobe); | ||
1426 | EXPORT_SYMBOL_GPL(unregister_jprobe); | ||
1427 | EXPORT_SYMBOL_GPL(register_jprobes); | ||
1428 | EXPORT_SYMBOL_GPL(unregister_jprobes); | ||
1429 | EXPORT_SYMBOL_GPL(jprobe_return); | 1439 | EXPORT_SYMBOL_GPL(jprobe_return); |
1430 | EXPORT_SYMBOL_GPL(register_kretprobe); | ||
1431 | EXPORT_SYMBOL_GPL(unregister_kretprobe); | ||
1432 | EXPORT_SYMBOL_GPL(register_kretprobes); | ||
1433 | EXPORT_SYMBOL_GPL(unregister_kretprobes); | ||