Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

argo: port to 4.19 kernel #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

argo: port to 4.19 kernel #1

wants to merge 4 commits into from

Conversation

cjp256
Copy link
Contributor

@cjp256 cjp256 commented Jan 25, 2019

Currently untested, but builds. Also needs following kernel patch to restore hypercall5:

From 2fa28193c62aa573bb309c0e58c884c248962b36 Mon Sep 17 00:00:00 2001
From: Chris Patterson <[email protected]>
Date: Fri, 25 Jan 2019 14:53:11 -0500
Subject: [PATCH] xen: re-add hypercall5 macro, used by argo

Signed-off-by: Chris Patterson <[email protected]>
---
 arch/x86/include/asm/xen/hypercall.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index ef05bea7010d..efabee330907 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -197,6 +197,18 @@ extern struct { char _entry[32]; } hypercall_page[];
 	(type)__res;							\
 })
 
+#define _hypercall5(type, name, a1, a2, a3, a4, a5)                    \
+({                                                                     \
+       __HYPERCALL_DECLS;                                              \
+       __HYPERCALL_5ARG(a1, a2, a3, a4, a5);                           \
+       asm volatile (__HYPERCALL                                       \
+                     : __HYPERCALL_5PARAM                              \
+                     : __HYPERCALL_ENTRY(name)                         \
+                     : __HYPERCALL_CLOBBER5);                          \
+       (type)__res;                                                    \
+})
+
+
 static inline long
 xen_single_call(unsigned int call,
 		unsigned long a1, unsigned long a2,
-- 
2.17.1

Eric Chanudet added 4 commits January 26, 2019 19:42
Definition of that macro was removed from kernel headers recently as it
was not used:
https://lkml.org/lkml/2018/8/20/267

Signed-off-by: Eric Chanudet <[email protected]>
Linux 4.19:
https://lwn.net/Articles/762922/

Refactor inode allocation while we're at it.
Version managemnet is getting out of hand, it should be time to make
some compat interface or split functions.

Signed-off-by: Eric Chanudet <[email protected]>
Signed-off-by: Eric Chanudet <[email protected]>
Makes in-place compilation less messy.

Signed-off-by: Eric Chanudet <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant