summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-11-11 14:23:08 +0100
committerMichal Marek <mmarek@suse.cz>2013-11-13 15:58:19 +0100
commit480f439c3db0d45d817d66caf3fa8e81a6fac01a (patch)
tree924d5d353b2b5ff72a6a1014053a2b6847718075
parentab7474ea5361f5fe883feb5ae637a1c948df1507 (diff)
downloadblackbird-op-linux-480f439c3db0d45d817d66caf3fa8e81a6fac01a.tar.gz
blackbird-op-linux-480f439c3db0d45d817d66caf3fa8e81a6fac01a.zip
kallsyms: Revert back to 128 max symbol length
This reverts commits f3462aa (Kbuild: Handle longer symbols in kallsyms.c) and eea0e9c (kbuild: Increase kallsyms max symbol length) except for the added overflow check. The reason is a regression caused by increasing the buffer: http://marc.info/?l=linux-kernel&m=138387700415675. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Joe Mario <jmario@redhat.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--include/linux/kallsyms.h2
-rw-r--r--scripts/kallsyms.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 56488708da4b..6883e197acb9 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -9,7 +9,7 @@
#include <linux/kernel.h>
#include <linux/stddef.h>
-#define KSYM_NAME_LEN 255
+#define KSYM_NAME_LEN 128
#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 48afa2020b00..518da86ce62a 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -27,7 +27,7 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
#endif
-#define KSYM_NAME_LEN 255
+#define KSYM_NAME_LEN 128
struct sym_entry {
unsigned long long addr;
OpenPOWER on IntegriCloud