From patchwork Mon Nov 11 13:40:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 3167431 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 95C7BC045B for ; Mon, 11 Nov 2013 13:41:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 122F22037D for ; Mon, 11 Nov 2013 13:41:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C899C2037E for ; Mon, 11 Nov 2013 13:41:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753765Ab3KKNlG (ORCPT ); Mon, 11 Nov 2013 08:41:06 -0500 Received: from cantor2.suse.de ([195.135.220.15]:34585 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753520Ab3KKNlD (ORCPT ); Mon, 11 Nov 2013 08:41:03 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 757BAA67CA; Mon, 11 Nov 2013 14:41:02 +0100 (CET) Received: by sepie.suse.cz (Postfix, from userid 10020) id 169EE76417; Mon, 11 Nov 2013 14:41:01 +0100 (CET) From: Michal Marek To: linux-kernel@vger.kernel.org Cc: linux-kbuild@vger.kernel.org, Andi Kleen , Joe Mario Subject: [PATCH 2/2] kallsyms: Revert back to 128 max symbol length Date: Mon, 11 Nov 2013 14:40:36 +0100 Message-Id: <1384177236-8371-2-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1384177236-8371-1-git-send-email-mmarek@suse.cz> References: <1384177236-8371-1-git-send-email-mmarek@suse.cz> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Andi Kleen Cc: Joe Mario Signed-off-by: Michal Marek --- include/linux/kallsyms.h | 2 +- scripts/kallsyms.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 5648870..6883e19 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -9,7 +9,7 @@ #include #include -#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 48afa20..518da86c 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;