From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sat, 28 May 2016 12:25:49 +0000 (-0700)
Subject: Revert "dtrace: ensure pdata is large enough"
X-Git-Tag: v4.1.12-92~154^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a109baf7e66cfcb339b92f9c3bdd5bc1dadd59db;p=users%2Fjedix%2Flinux-maple.git

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 68cf5478a671..729ca60423e8 100644
--- 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 12165fae33c3..4806af6188ad 100644
--- 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 48947b6deebc..ff94fd9b4420 100644
--- 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);