Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759859Ab2EIWC3 (ORCPT ); Wed, 9 May 2012 18:02:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44660 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759747Ab2EIWC1 (ORCPT ); Wed, 9 May 2012 18:02:27 -0400 Date: Wed, 9 May 2012 15:01:53 -0700 From: tip-bot for Jarkko Sakkinen Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, sam@ravnborg.org, mmarek@suse.cz, jarkko.sakkinen@intel.com, tglx@linutronix.de, hpa@linux.intel.com Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, sam@ravnborg.org, tglx@linutronix.de, jarkko.sakkinen@intel.com, mmarek@suse.cz, hpa@linux.intel.com In-Reply-To: <1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com> References: <1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/trampoline] x86, realmode: build fix: remove duplicate build Git-Commit-ID: c5403aed044e23f8d1ecdf05d0ff120314186527 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Wed, 09 May 2012 15:01:59 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2183 Lines: 60 Commit-ID: c5403aed044e23f8d1ecdf05d0ff120314186527 Gitweb: http://git.kernel.org/tip/c5403aed044e23f8d1ecdf05d0ff120314186527 Author: Jarkko Sakkinen AuthorDate: Wed, 9 May 2012 23:25:06 +0300 Committer: H. Peter Anvin CommitDate: Wed, 9 May 2012 13:32:17 -0700 x86, realmode: build fix: remove duplicate build Real-mode binary was built twice. This patch fixes the issue by making realmode.relocs as target for realmode.bin. [ hpa: removed the direct dependency on realmode.relocs in arch/x86/realmode/Makefile ] Signed-off-by: Jarkko Sakkinen Link: http://lkml.kernel.org/r/1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com Cc: Sam Ravnborg Cc: Michal Marek Signed-off-by: H. Peter Anvin --- arch/x86/realmode/Makefile | 5 +---- arch/x86/realmode/rm/Makefile | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/realmode/Makefile b/arch/x86/realmode/Makefile index f22a4f8..a05b3ac 100644 --- a/arch/x86/realmode/Makefile +++ b/arch/x86/realmode/Makefile @@ -11,10 +11,7 @@ subdir- := rm obj-y += rmpiggy.o -$(obj)/rmpiggy.o: $(obj)/rm/realmode.relocs $(obj)/rm/realmode.bin +$(obj)/rmpiggy.o: $(obj)/rm/realmode.bin $(obj)/rm/realmode.bin: FORCE $(Q)$(MAKE) $(build)=$(obj)/rm $@ - -$(obj)/rm/realmode.relocs: FORCE - $(Q)$(MAKE) $(build)=$(obj)/rm $@ diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile index de40bc4..1c1d3d3 100644 --- a/arch/x86/realmode/rm/Makefile +++ b/arch/x86/realmode/rm/Makefile @@ -48,7 +48,7 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE OBJCOPYFLAGS_realmode.bin := -O binary -$(obj)/realmode.bin: $(obj)/realmode.elf +$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs $(call if_changed,objcopy) quiet_cmd_relocs = RELOCS $@ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/