diff mbox

[for-next,1/7] x86: move x86_64/entry.S to pv directory

Message ID 20170406171434.15484-2-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu April 6, 2017, 5:14 p.m. UTC
That file contains 64 bit PV guest entry points.

No functional change.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 xen/arch/x86/pv/Makefile            | 1 +
 xen/arch/x86/{x86_64 => pv}/entry.S | 0
 xen/arch/x86/x86_64/Makefile        | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename xen/arch/x86/{x86_64 => pv}/entry.S (100%)

Comments

Jan Beulich April 21, 2017, 9:11 a.m. UTC | #1
>>> On 06.04.17 at 19:14, <wei.liu2@citrix.com> wrote:
> That file contains 64 bit PV guest entry points.

And a lot more, like interrupt and exception handling ones, which
aren't PV-specific at all. I'm sorry, but NAK.

Jan
Wei Liu April 21, 2017, 9:46 a.m. UTC | #2
On Fri, Apr 21, 2017 at 03:11:23AM -0600, Jan Beulich wrote:
> >>> On 06.04.17 at 19:14, <wei.liu2@citrix.com> wrote:
> > That file contains 64 bit PV guest entry points.
> 
> And a lot more, like interrupt and exception handling ones, which
> aren't PV-specific at all. I'm sorry, but NAK.
> 

Yeah, I discovered that later. I need to further split that file
unfortunately...

> Jan
>
diff mbox

Patch

diff --git a/xen/arch/x86/pv/Makefile b/xen/arch/x86/pv/Makefile
index ea94599438..08b6a3af64 100644
--- a/xen/arch/x86/pv/Makefile
+++ b/xen/arch/x86/pv/Makefile
@@ -1,2 +1,3 @@ 
 obj-y += hypercall.o
 obj-bin-y += dom0_build.init.o
+obj-bin-y += entry.o
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/pv/entry.S
similarity index 100%
rename from xen/arch/x86/x86_64/entry.S
rename to xen/arch/x86/pv/entry.S
diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile
index d8815e78b0..1f0a4f7bb2 100644
--- a/xen/arch/x86/x86_64/Makefile
+++ b/xen/arch/x86/x86_64/Makefile
@@ -1,6 +1,5 @@ 
 subdir-y += compat
 
-obj-bin-y += entry.o
 obj-bin-y += gpr_switch.o
 obj-y += traps.o
 obj-$(CONFIG_KEXEC) += machine_kexec.o