From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: kvm@vger.kernel.org, pbonzini@redhat.com
Cc: frankja@linux.ibm.com, thuth@redhat.com, david@redhat.com,
drjones@redhat.com
Subject: [kvm-unit-tests PATCH v2 3/4] lib/alloc_page: move get_order and is_power_of_2 to a bitops.h
Date: Mon, 6 Jul 2020 18:43:23 +0200 [thread overview]
Message-ID: <20200706164324.81123-4-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20200706164324.81123-1-imbrenda@linux.ibm.com>
The functions get_order and is_power_of_2 are simple and should
probably be in a header, like similar simple functions in bitops.h
Since they concern bit manipulation, the logical place for them is in
bitops.h
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
---
lib/alloc_page.h | 1 -
lib/bitops.h | 10 ++++++++++
lib/libcflat.h | 5 -----
lib/alloc.c | 1 +
lib/alloc_page.c | 5 -----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/alloc_page.h b/lib/alloc_page.h
index d9aceb7..88540d1 100644
--- a/lib/alloc_page.h
+++ b/lib/alloc_page.h
@@ -15,6 +15,5 @@ void *alloc_pages(unsigned int order);
void free_page(void *page);
void free_pages(void *mem, size_t size);
void free_pages_by_order(void *mem, unsigned int order);
-unsigned int get_order(size_t size);
#endif
diff --git a/lib/bitops.h b/lib/bitops.h
index b310a22..308aa86 100644
--- a/lib/bitops.h
+++ b/lib/bitops.h
@@ -74,4 +74,14 @@ static inline unsigned long fls(unsigned long word)
}
#endif
+static inline bool is_power_of_2(unsigned long n)
+{
+ return n && !(n & (n - 1));
+}
+
+static inline unsigned int get_order(size_t size)
+{
+ return size ? fls(size) + !is_power_of_2(size) : 0;
+}
+
#endif
diff --git a/lib/libcflat.h b/lib/libcflat.h
index 7092af2..ec0f58b 100644
--- a/lib/libcflat.h
+++ b/lib/libcflat.h
@@ -147,11 +147,6 @@ do { \
} \
} while (0)
-static inline bool is_power_of_2(unsigned long n)
-{
- return n && !(n & (n - 1));
-}
-
/*
* One byte per bit, a ' between each group of 4 bits, and a null terminator.
*/
diff --git a/lib/alloc.c b/lib/alloc.c
index 6c89f98..9d89d24 100644
--- a/lib/alloc.c
+++ b/lib/alloc.c
@@ -1,4 +1,5 @@
#include "alloc.h"
+#include "bitops.h"
#include "asm/page.h"
#include "bitops.h"
diff --git a/lib/alloc_page.c b/lib/alloc_page.c
index f16eaad..fa3c527 100644
--- a/lib/alloc_page.c
+++ b/lib/alloc_page.c
@@ -175,8 +175,3 @@ void page_alloc_ops_enable(void)
{
alloc_ops = &page_alloc_ops;
}
-
-unsigned int get_order(size_t size)
-{
- return is_power_of_2(size) ? fls(size) : fls(size) + 1;
-}
--
2.26.2
next prev parent reply other threads:[~2020-07-06 16:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 16:43 [kvm-unit-tests PATCH v2 0/4] More lib/alloc cleanup and a minor improvement Claudio Imbrenda
2020-07-06 16:43 ` [kvm-unit-tests PATCH v2 1/4] lib/vmalloc: fix pages count local variable to be size_t Claudio Imbrenda
2020-07-06 16:57 ` Jim Mattson
2020-07-06 16:43 ` [kvm-unit-tests PATCH v2 2/4] lib/alloc_page: change some parameter types Claudio Imbrenda
2020-07-06 16:58 ` Jim Mattson
2020-07-13 15:16 ` Thomas Huth
2020-07-06 16:43 ` Claudio Imbrenda [this message]
2020-07-06 16:43 ` [kvm-unit-tests PATCH v2 4/4] lib/vmalloc: allow vm_memalign with alignment > PAGE_SIZE Claudio Imbrenda
2020-07-06 16:48 ` [kvm-unit-tests PATCH v2 0/4] More lib/alloc cleanup and a minor improvement Paolo Bonzini
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=20200706164324.81123-4-imbrenda@linux.ibm.com \
--to=imbrenda@linux.ibm.com \
--cc=david@redhat.com \
--cc=drjones@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
/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).