mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/arm: rename PGC_reserved to PGC_static
PGC_reserved could be ambiguous, and we have to tell what the pages are reserved for, so this commit intends to rename PGC_reserved to PGC_static, which clearly indicates the page is reserved for static memory. Signed-off-by: Penny Zheng <penny.zheng@arm.com> Acked-by: Jan Beulich <jbeulich@suse.com> Acked-by: Julien Grall <jgrall@amazon.com>
This commit is contained in:
Penny Zheng authored and Jan Beulich committed
1 parent
ee8d9d0c1c
commit
283abca299
2 files changed
+14
-14
No files matched your search
@@ -121,9 +121,9 @@ struct page_info
|
||||
/* Page is Xen heap? */
|
||||
#define _PGC_xen_heap PG_shift(2)
|
||||
#define PGC_xen_heap PG_mask(1, 2)
|
||||
/* Page is reserved */
|
||||
#define _PGC_reserved PG_shift(3)
|
||||
#define PGC_reserved PG_mask(1, 3)
|
||||
/* Page is static memory */
|
||||
#define _PGC_static PG_shift(3)
|
||||
#define PGC_static PG_mask(1, 3)
|
||||
/* ... */
|
||||
/* Page is broken? */
|
||||
#define _PGC_broken PG_shift(7)
|
||||
|
||||
+11
-11
@@ -151,8 +151,8 @@
|
||||
#define p2m_pod_offline_or_broken_replace(pg) BUG_ON(pg != NULL)
|
||||
#endif
|
||||
|
||||
#ifndef PGC_reserved
|
||||
#define PGC_reserved 0
|
||||
#ifndef PGC_static
|
||||
#define PGC_static 0
|
||||
#endif
|
||||
|
||||
#ifndef PGT_TYPE_INFO_INITIALIZER
|
||||
@@ -2342,7 +2342,7 @@ int assign_pages(
|
||||
|
||||
for ( i = 0; i < nr; i++ )
|
||||
{
|
||||
ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_reserved)));
|
||||
ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_static)));
|
||||
if ( pg[i].count_info & PGC_extra )
|
||||
extra_pages++;
|
||||
}
|
||||
@@ -2402,7 +2402,7 @@ int assign_pages(
|
||||
page_set_owner(&pg[i], d);
|
||||
smp_wmb(); /* Domain pointer must be visible before updating refcnt. */
|
||||
pg[i].count_info =
|
||||
(pg[i].count_info & (PGC_extra | PGC_reserved)) | PGC_allocated | 1;
|
||||
(pg[i].count_info & (PGC_extra | PGC_static)) | PGC_allocated | 1;
|
||||
|
||||
page_list_add_tail(&pg[i], page_to_list(d, &pg[i]));
|
||||
}
|
||||
@@ -2708,8 +2708,8 @@ void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns,
|
||||
scrub_one_page(pg);
|
||||
}
|
||||
|
||||
/* In case initializing page of static memory, mark it PGC_reserved. */
|
||||
pg[i].count_info |= PGC_reserved;
|
||||
/* In case initializing page of static memory, mark it PGC_static. */
|
||||
pg[i].count_info |= PGC_static;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2738,8 +2738,8 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn,
|
||||
|
||||
for ( i = 0; i < nr_mfns; i++ )
|
||||
{
|
||||
/* The page should be reserved and not yet allocated. */
|
||||
if ( pg[i].count_info != (PGC_state_free | PGC_reserved) )
|
||||
/* The page should be static and not yet allocated. */
|
||||
if ( pg[i].count_info != (PGC_state_free | PGC_static) )
|
||||
{
|
||||
printk(XENLOG_ERR
|
||||
"pg[%lu] Static MFN %"PRI_mfn" c=%#lx t=%#x\n",
|
||||
@@ -2753,10 +2753,10 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn,
|
||||
&tlbflush_timestamp);
|
||||
|
||||
/*
|
||||
* Preserve flag PGC_reserved and change page state
|
||||
* Preserve flag PGC_static and change page state
|
||||
* to PGC_state_inuse.
|
||||
*/
|
||||
pg[i].count_info = PGC_reserved | PGC_state_inuse;
|
||||
pg[i].count_info = PGC_static | PGC_state_inuse;
|
||||
/* Initialise fields which have other uses for free pages. */
|
||||
pg[i].u.inuse.type_info = PGT_TYPE_INFO_INITIALIZER;
|
||||
page_set_owner(&pg[i], NULL);
|
||||
@@ -2778,7 +2778,7 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn,
|
||||
|
||||
out_err:
|
||||
while ( i-- )
|
||||
pg[i].count_info = PGC_reserved | PGC_state_free;
|
||||
pg[i].count_info = PGC_static | PGC_state_free;
|
||||
|
||||
spin_unlock(&heap_lock);
|
||||
|
||||
|
||||