provide a single, common implementation for get_order_from_{bytes,pages}()

All three per-architecture implementations were identical, and I cannot
see how future architectures would need any sort of customization here
(the only per-architecture aspect here is the actual PAGE_SHIFT value).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>

diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h
index bfc0f7696336a656ff36ae66c4b4256e5d7f163f..7604e0c6dc9e9a5bc7bd0774fb16c9442d85d636 100644 (file)
--- a/xen/include/asm-arm/mm.h
+++ b/xen/include/asm-arm/mm.h
@@ -202,25 +202,6 @@ static inline paddr_t gvirt_to_maddr(uint32_t va)
 #define mfn_to_virt(mfn)  (maddr_to_virt((paddr_t)(mfn) << PAGE_SHIFT))
 
 
-static inline int get_order_from_bytes(paddr_t size)
-{
-    int order;
-    size = (size-1) >> PAGE_SHIFT;
-    for ( order = 0; size; order++ )
-        size >>= 1;
-    return order;
-}
-
-static inline int get_order_from_pages(unsigned long nr_pages)
-{
-    int order;
-    nr_pages--;
-    for ( order = 0; nr_pages; order++ )
-        nr_pages >>= 1;
-    return order;
-}
-
-
 /* Convert between Xen-heap virtual addresses and page-info structures. */
 static inline struct page_info *virt_to_page(const void *v)
 {

diff --git a/xen/include/asm-ia64/xenpage.h b/xen/include/asm-ia64/xenpage.h
index 0eea015df6583aa5ae9e0c4583d9b701decaf585..4acbe91e1334fa5b800f07bf7f23686fbf171555 100644 (file)
--- a/xen/include/asm-ia64/xenpage.h
+++ b/xen/include/asm-ia64/xenpage.h
@@ -60,24 +60,6 @@ typedef union xen_va {
        void *p;
 } xen_va;
 
-static inline int get_order_from_bytes(paddr_t size)
-{
-    int order;
-    size = (size-1) >> PAGE_SHIFT;
-    for ( order = 0; size; order++ )
-        size >>= 1;
-    return order;
-}
-
-static inline int get_order_from_pages(unsigned long nr_pages)
-{
-    int order;
-    nr_pages--;
-    for ( order = 0; nr_pages; order++ )
-        nr_pages >>= 1;
-    return order;
-}
-
 static inline int get_order_from_shift(unsigned long shift)
 {
     if (shift <= PAGE_SHIFT)

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 59b42cc348bc19d065cb1ff770b3d7d004a075fe..9986ac99d1e9abfb856f5d660298239ec1a7d683 100644 (file)
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -354,24 +354,6 @@ void setup_idle_pagetable(void);
 
 #ifndef __ASSEMBLY__
 
-static inline int get_order_from_bytes(paddr_t size)
-{
-    int order;
-    size = (size-1) >> PAGE_SHIFT;
-    for ( order = 0; size; order++ )
-        size >>= 1;
-    return order;
-}
-
-static inline int get_order_from_pages(unsigned long nr_pages)
-{
-    int order;
-    nr_pages--;
-    for ( order = 0; nr_pages; order++ )
-        nr_pages >>= 1;
-    return order;
-}
-
 /* Allocator functions for Xen pagetables. */
 void *alloc_xen_pagetable(void);
 void free_xen_pagetable(void *v);

diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 94e7d42a8e16059a2019821c460ed8d3106d69c0..11381a1303b2e5ac79e392bd0b22f3084d61fdb2 100644 (file)
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -318,6 +318,28 @@ page_list_splice(struct page_list_head *list, struct page_list_head *head)
 # define page_list_splice(list, hd)        list_splice(list, hd)
 #endif
 
+static inline unsigned int get_order_from_bytes(paddr_t size)
+{
+    unsigned int order;
+
+    size = (size - 1) >> PAGE_SHIFT;
+    for ( order = 0; size; order++ )
+        size >>= 1;
+
+    return order;
+}
+
+static inline unsigned int get_order_from_pages(unsigned long nr_pages)
+{
+    unsigned int order;
+
+    nr_pages--;
+    for ( order = 0; nr_pages; order++ )
+        nr_pages >>= 1;
+
+    return order;
+}
+
 void scrub_one_page(struct page_info *);
 
 /* Returns 1 on success, 0 on error, negative if the ring