From patchwork Wed Feb 24 15:33:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 8409061 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 675AE9F88A for ; Wed, 24 Feb 2016 15:33:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3FC92035B for ; Wed, 24 Feb 2016 15:33:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C926820303 for ; Wed, 24 Feb 2016 15:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756658AbcBXPdT (ORCPT ); Wed, 24 Feb 2016 10:33:19 -0500 Received: from foss.arm.com ([217.140.101.70]:44865 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756637AbcBXPdR (ORCPT ); Wed, 24 Feb 2016 10:33:17 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1620A3A1; Wed, 24 Feb 2016 07:32:24 -0800 (PST) Received: from e104803-lin.lan (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ECC423F246; Wed, 24 Feb 2016 07:33:15 -0800 (PST) From: Andre Przywara To: Will Deacon Cc: Oleg Nesterov , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [PATCH 1/4] pre_init: rename x86/init.S to x86/init64.S Date: Wed, 24 Feb 2016 15:33:05 +0000 Message-Id: <1456327988-31568-2-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1456327988-31568-1-git-send-email-andre.przywara@arm.com> References: <1456327988-31568-1-git-send-email-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@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 To make room for the 32-bit implementation of that assembly stub, rename it. Signed-off-by: Andre Przywara --- Makefile | 2 +- x86/{init.S => init64.S} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename x86/{init.S => init64.S} (100%) diff --git a/x86/init.S b/x86/init64.S similarity index 100% rename from x86/init.S rename to x86/init64.S diff --git a/Makefile b/Makefile index 19eb7e5..e26afa3 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ endif ifeq ($(ARCH),x86_64) ARCH := x86 DEFINES += -DCONFIG_X86_64 - ARCH_PRE_INIT = x86/init.S + ARCH_PRE_INIT = x86/init64.S endif ### Arch-specific stuff