From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Ian Jackson <iwj@xenproject.org>, Julien Grall <julien@xen.org>,
Wei Liu <wl@xen.org>, Stefano Stabellini <sstabellini@kernel.org>
Subject: [PATCH v3 3/8] lib: move list sorting code
Date: Mon, 23 Nov 2020 16:21:51 +0100 [thread overview]
Message-ID: <9e855f2f-c654-6515-ae4f-9c69859c1c88@suse.com> (raw)
In-Reply-To: <1a6bac6a-7d83-f5b6-c5b9-8b3b39824d40@suse.com>
Build the source file always, as by putting it into an archive it still
won't be linked into final binaries when not needed. This way possible
build breakage will be easier to notice, and it's more consistent with
us unconditionally building other library kind of code (e.g. sort() or
bsearch()).
While moving the source file, take the opportunity and drop the
pointless EXPORT_SYMBOL() and an unnecessary #include.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
xen/arch/arm/Kconfig | 4 +---
xen/common/Kconfig | 3 ---
xen/common/Makefile | 1 -
xen/lib/Makefile | 1 +
xen/{common/list_sort.c => lib/list-sort.c} | 2 --
5 files changed, 2 insertions(+), 9 deletions(-)
rename xen/{common/list_sort.c => lib/list-sort.c} (98%)
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index f5b1bcda0323..38b6c31ba5dd 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -56,9 +56,7 @@ config HVM
def_bool y
config NEW_VGIC
- bool
- prompt "Use new VGIC implementation"
- select NEEDS_LIST_SORT
+ bool "Use new VGIC implementation"
---help---
This is an alternative implementation of the ARM GIC interrupt
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 3e2cf2508899..0661328a99e7 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -66,9 +66,6 @@ config MEM_ACCESS
config NEEDS_LIBELF
bool
-config NEEDS_LIST_SORT
- bool
-
menu "Speculative hardening"
config SPECULATIVE_HARDEN_ARRAY
diff --git a/xen/common/Makefile b/xen/common/Makefile
index d109f279a490..332e7d667cec 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -21,7 +21,6 @@ obj-y += keyhandler.o
obj-$(CONFIG_KEXEC) += kexec.o
obj-$(CONFIG_KEXEC) += kimage.o
obj-y += lib.o
-obj-$(CONFIG_NEEDS_LIST_SORT) += list_sort.o
obj-$(CONFIG_LIVEPATCH) += livepatch.o livepatch_elf.o
obj-$(CONFIG_MEM_ACCESS) += mem_access.o
obj-y += memory.o
diff --git a/xen/lib/Makefile b/xen/lib/Makefile
index b8814361d63e..764f3624b5f9 100644
--- a/xen/lib/Makefile
+++ b/xen/lib/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_X86) += x86/
lib-y += ctype.o
+lib-y += list-sort.o
diff --git a/xen/common/list_sort.c b/xen/lib/list-sort.c
similarity index 98%
rename from xen/common/list_sort.c
rename to xen/lib/list-sort.c
index af2b2f6519f1..f8d8bbf28178 100644
--- a/xen/common/list_sort.c
+++ b/xen/lib/list-sort.c
@@ -15,7 +15,6 @@
* this program; If not, see <http://www.gnu.org/licenses/>.
*/
-#include <xen/lib.h>
#include <xen/list.h>
#define MAX_LIST_LENGTH_BITS 20
@@ -154,4 +153,3 @@ void list_sort(void *priv, struct list_head *head,
merge_and_restore_back_links(priv, cmp, head, part[max_lev], list);
}
-EXPORT_SYMBOL(list_sort);
next prev parent reply other threads:[~2020-11-23 15:22 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 15:16 [PATCH v3 0/8] xen: beginnings of moving library-like code into an archive Jan Beulich
2020-11-23 15:20 ` [PATCH v3 1/8] xen: fix build when $(obj-y) consists of just blanks Jan Beulich
2020-12-09 11:34 ` Bertrand Marquis
2020-12-09 17:40 ` Anthony PERARD
2020-12-10 10:21 ` Jan Beulich
2020-12-10 14:50 ` Anthony PERARD
2020-11-23 15:21 ` [PATCH v3 2/8] lib: collect library files in an archive Jan Beulich
2020-12-09 11:37 ` Bertrand Marquis
2020-12-09 14:42 ` Jan Beulich
2020-12-09 14:46 ` Bertrand Marquis
2020-12-10 14:47 ` Anthony PERARD
2020-12-11 10:00 ` Jan Beulich
2020-12-11 15:49 ` Anthony PERARD
2020-12-18 8:02 ` Ping: Arm: " Jan Beulich
2020-12-18 9:25 ` Julien Grall
2020-11-23 15:21 ` Jan Beulich [this message]
2020-12-09 11:39 ` [PATCH v3 3/8] lib: move list sorting code Bertrand Marquis
2020-11-23 15:22 ` [PATCH v3 4/8] lib: move parse_size_and_unit() Jan Beulich
2020-12-09 11:40 ` Bertrand Marquis
2020-11-23 15:22 ` [PATCH v3 5/8] lib: move init_constructors() Jan Beulich
2020-12-09 14:16 ` Bertrand Marquis
2020-11-23 15:23 ` [PATCH v3 6/8] lib: move rbtree code Jan Beulich
2020-12-09 14:18 ` Bertrand Marquis
2020-11-23 15:23 ` [PATCH v3 7/8] lib: move bsearch code Jan Beulich
2020-11-23 15:24 ` [PATCH v3 8/8] lib: move sort code Jan Beulich
2020-12-09 14:27 ` Bertrand Marquis
2020-12-04 11:43 ` [PATCH v3 0/8] xen: beginnings of moving library-like code into an archive Wei Liu
2020-12-09 11:33 ` Bertrand Marquis
2020-12-09 14:47 ` Jan Beulich
2020-12-09 14:51 ` Julien Grall
2020-12-09 14:56 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e855f2f-c654-6515-ae4f-9c69859c1c88@suse.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=iwj@xenproject.org \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).