Revert "dtrace: ensure pdata is large enough"

This reverts commit 3acb568516269ead26f9916f0d01c9ae553c590c.

Orabug: 23344927
Acked-by: Chuck Anderson <chuck.anderson@oracle.com>

diff --git a/arch/sparc/include/asm/dtrace_arch.h b/arch/sparc/include/asm/dtrace_arch.h
index 68cf5478a67159e9da44d14eb33cc8c95d2136aa..729ca60423e8bcc958d0a75c96b9c5b04f262e33 100644 (file)
--- a/arch/sparc/include/asm/dtrace_arch.h
+++ b/arch/sparc/include/asm/dtrace_arch.h
@@ -5,10 +5,6 @@
 
 typedef uint32_t       asm_instr_t;
 
-#define SDT_TRAMP_SIZE         11
-#define DTRACE_PDATA_SIZE      64
-#define DTRACE_PDATA_EXTRA     (dtrace_sdt_nprobes * SDT_TRAMP_SIZE * \
-                                sizeof(asm_instr_t))
-#define DTRACE_PDATA_MAXSIZE   (DTRACE_PDATA_SIZE + DTRACE_PDATA_EXTRA)
+#define SDT_TRAMP_SIZE 11
 
 #endif /* _SPARC_DTRACE_ARCH_H */

diff --git a/arch/x86/include/asm/dtrace_arch.h b/arch/x86/include/asm/dtrace_arch.h
index 12165fae33c3f1ff123009923e0c09ea471f3cc6..4806af6188ad7013e0f14fc7a25f6ab68f53cd06 100644 (file)
--- a/arch/x86/include/asm/dtrace_arch.h
+++ b/arch/x86/include/asm/dtrace_arch.h
@@ -5,8 +5,4 @@
 
 typedef uint8_t                asm_instr_t;
 
-#define DTRACE_PDATA_SIZE      64
-#define DTRACE_PDATA_EXTRA      0
-#define DTRACE_PDATA_MAXSIZE    (DTRACE_PDATA_SIZE + DTRACE_PDATA_EXTRA)
-
 #endif /* _X86_DTRACE_ARCH_H */

diff --git a/kernel/dtrace/dtrace_os.c b/kernel/dtrace/dtrace_os.c
index 48947b6deebcdd7d42f22f7808a7fff687f8eaf2..ff94fd9b442089b5b7f9014d370548ad861ff1be 100644 (file)
--- a/kernel/dtrace/dtrace_os.c
+++ b/kernel/dtrace/dtrace_os.c
@@ -31,6 +31,8 @@
 /*---------------------------------------------------------------------------*\
 (* OS SPECIFIC DTRACE SETUP                                                  *)
 \*---------------------------------------------------------------------------*/
+#define DTRACE_PDATA_MAXSIZE   2048
+
 struct module          *dtrace_kmod = NULL;
 EXPORT_SYMBOL(dtrace_kmod);