From patchwork Thu Sep 30 06:28:55 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Amerigo Wang <amwang@redhat.com>
X-Patchwork-Id: 218892
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8U6Od2d030633
	for <patchwork-kbuild@patchwork.kernel.org>;
	Thu, 30 Sep 2010 06:24:39 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752878Ab0I3GYg (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Thu, 30 Sep 2010 02:24:36 -0400
Received: from mx1.redhat.com ([209.132.183.28]:9203 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752779Ab0I3GYg (ORCPT <rfc822;linux-kbuild@vger.kernel.org>);
	Thu, 30 Sep 2010 02:24:36 -0400
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8U6OPf3022303
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Thu, 30 Sep 2010 02:24:26 -0400
Received: from cr0.nay.redhat.com (dhcp-65-177.nay.redhat.com [10.66.65.177])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o8U6OM0m001884; Thu, 30 Sep 2010 02:24:23 -0400
From: Amerigo Wang <amwang@redhat.com>
To: linux-kbuild@vger.kernel.org
Cc: Amerigo Wang <amwang@redhat.com>,
	Stephen Hemminger <shemminger@vyatta.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Michal Marek <mmarek@suse.cz>, linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] Fix wrong source path in scripts/namespace.pl
Date: Thu, 30 Sep 2010 14:28:55 +0800
Message-Id: <1285828138-5873-1-git-send-email-amwang@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 30 Sep 2010 06:24:40 +0000 (UTC)


diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index 361d0f7..fb4e245 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -167,11 +167,11 @@ sub do_nm
 		printf STDERR "$fullname is not an object file\n";
 		return;
 	}
-	($source = $fullname) =~ s/\.o$//;
-	if (-e "$objtree$source.c" || -e "$objtree$source.S") {
-		$source = "$objtree$source";
+	($source = $basename) =~ s/\.o$//;
+	if (-e "$source.c" || -e "$source.S") {
+		$source = "$objtree$File::Find::dir/$source";
 	} else {
-		$source = "$srctree$source";
+		$source = "$srctree$File::Find::dir/$source";
 	}
 	if (! -e "$source.c" && ! -e "$source.S") {
 		# No obvious source, exclude the object if it is conglomerate