From 79fb4f3c87cdd244bb564806221dca1813465b94 Mon Sep 17 00:00:00 2001 From: Vyacheslav Cherkashin Date: Thu, 4 Apr 2013 11:11:50 +0400 Subject: [PATCH] [REFACTOR] remove arch/dbi_kprobes.* files: src/modules/kprobe/arch/dbi_kprobes.h src/modules/kprobe/arch/dbi_kprobes.c --- kprobe/Kbuild | 2 +- kprobe/arch/dbi_kprobes.c | 62 ----------------------------------------------- kprobe/arch/dbi_kprobes.h | 62 ----------------------------------------------- kprobe/dbi_kprobes.c | 1 - 4 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 kprobe/arch/dbi_kprobes.c delete mode 100644 kprobe/arch/dbi_kprobes.h diff --git a/kprobe/Kbuild b/kprobe/Kbuild index e0e6bc2..d086f97 100644 --- a/kprobe/Kbuild +++ b/kprobe/Kbuild @@ -1,5 +1,5 @@ EXTRA_CFLAGS := $(extra_cflags) obj-m := swap_kprobe.o -swap_kprobe-y := dbi_kprobes_deps.o dbi_insn_slots.o arch/asm/dbi_kprobes.o arch/dbi_kprobes.o dbi_kprobes.o +swap_kprobe-y := dbi_kprobes_deps.o dbi_insn_slots.o arch/asm/dbi_kprobes.o dbi_kprobes.o swap_kprobe-$(CONFIG_ARM) += arch/asm/trampoline_arm.o diff --git a/kprobe/arch/dbi_kprobes.c b/kprobe/arch/dbi_kprobes.c deleted file mode 100644 index 25088f7..0000000 --- a/kprobe/arch/dbi_kprobes.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Kernel Probes (KProbes) - * arch//kernel/kprobes.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (C) IBM Corporation, 2002, 2004 - */ - -/* - * Dynamic Binary Instrumentation Module based on KProbes - * modules/kprobe/arch/dbi_kprobes.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (C) Samsung Electronics, 2006-2010 - * - * 2006-2007 Ekaterina Gorelkina : initial implementation for ARM and MIPS - * 2008-2009 Alexey Gerenkov User-Space - * Probes initial implementation; Support x86/ARM/MIPS for both user and kernel spaces. - * 2010 Ekaterina Gorelkina : redesign module for separating core and arch parts - * - - */ - -#include "dbi_kprobes.h" -#include "../dbi_kprobes.h" -#include "asm/dbi_kprobes.h" - -#include "../dbi_kdebug.h" -#include "../dbi_insn_slots.h" -#include "../dbi_kprobes_deps.h" - -#include -#include - -extern struct hlist_head kprobe_insn_pages; - diff --git a/kprobe/arch/dbi_kprobes.h b/kprobe/arch/dbi_kprobes.h deleted file mode 100644 index ff3c960..0000000 --- a/kprobe/arch/dbi_kprobes.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef _DBI_ARCH_KPROBES_H -#define _DBI_ARCH_KPROBES_H - -/* - * Kernel Probes (KProbes) - * include/linux/kprobes.h - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (C) IBM Corporation, 2002, 2004 - */ - -/* - * Dynamic Binary Instrumentation Module based on KProbes - * modules/kprobe/arch/dbi_kprobes.h - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (C) Samsung Electronics, 2006-2010 - * - * 2006-2007 Ekaterina Gorelkina : initial implementation for ARM and MIPS - * 2008-2009 Alexey Gerenkov User-Space - * Probes initial implementation; Support x86/ARM/MIPS for both user and kernel spaces. - * 2010 Ekaterina Gorelkina : redesign module for separating core and arch parts - * - */ - - -struct kprobe; -struct pt_regs; -struct kretprobe; -struct kretprobe_instance; -struct task_struct; -struct kprobe_ctlblk; - -void dbi_jprobe_return (void); - -#endif /* _DBI_ARCH_KPROBES_H */ diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c index 805e9c0..ba496ff 100644 --- a/kprobe/dbi_kprobes.c +++ b/kprobe/dbi_kprobes.c @@ -47,7 +47,6 @@ */ #include "dbi_kprobes.h" -#include "arch/dbi_kprobes.h" #include "arch/asm/dbi_kprobes.h" #include "dbi_kdebug.h" -- 2.7.4