ia64: fix build in grant table and tmem code

Signed-off-by: Jan Beulich <jbeulich@novell.com>
This commit is contained in:
Keir Fraser committed 2010-10-24 13:17:42 +01:00
1 parent f9ee068de4
commit cd8c5cb75a
2 files changed
+7 -3

No files matched your search

+5 -1
View File
@@ -142,10 +142,11 @@ shared_entry_header(struct grant_table *t, grant_ref_t ref)
/* Check if the page has been paged out */
static int __get_paged_frame(unsigned long gfn, unsigned long *frame, int readonly, struct domain *rd)
{
int rc = GNTST_okay;
#if defined(P2M_PAGED_TYPES) || defined(P2M_SHARED_TYPES)
struct p2m_domain *p2m;
p2m_type_t p2mt;
mfn_t mfn;
int rc = GNTST_okay;
p2m = p2m_get_hostp2m(rd);
if ( readonly )
@@ -163,6 +164,9 @@ static int __get_paged_frame(unsigned long gfn, unsigned long *frame, int readon
*frame = INVALID_MFN;
rc = GNTST_bad_page;
}
#else
*frame = readonly ? gmfn_to_mfn(rd, gfn) : gfn_to_mfn_private(rd, gfn);
#endif
return rc;
}
+2 -2
View File
@@ -95,8 +95,8 @@ static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn,
return NULL;
}
static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp,
bool_t mark_dirty)
static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp,
unsigned long cli_mfn, bool_t mark_dirty)
{
ASSERT(0);
}
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.