git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tunnels: fix netns vs proto registration ordering
[safe/jmp/linux-2.6]
/
drivers
/
lguest
/
page_tables.c
diff --git
a/drivers/lguest/page_tables.c
b/drivers/lguest/page_tables.c
index
232fba6
..
cf94326
100644
(file)
--- a/
drivers/lguest/page_tables.c
+++ b/
drivers/lguest/page_tables.c
@@
-894,7
+894,7
@@
void guest_set_pte(struct lg_cpu *cpu,
* tells us they've changed. When the Guest tries to use the new entry it will
* fault and demand_page() will fix it up.
*
* tells us they've changed. When the Guest tries to use the new entry it will
* fault and demand_page() will fix it up.
*
- * So with that in mind here's our code to
to
update a (top-level) PGD entry:
+ * So with that in mind here's our code to update a (top-level) PGD entry:
*/
void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx)
{
*/
void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx)
{
@@
-996,11
+996,9
@@
static unsigned long setup_pagetables(struct lguest *lg,
if (copy_to_user(&pgdir[0], &pgd, sizeof(pgd)) != 0)
return -EFAULT;
/*
if (copy_to_user(&pgdir[0], &pgd, sizeof(pgd)) != 0)
return -EFAULT;
/*
- * And the third PGD entry (ie. addresses 3G-4G).
- *
- * FIXME: This assumes that PAGE_OFFSET for the Guest is 0xC0000000.
+ * And the other PGD entry to make the linear mapping at PAGE_OFFSET
*/
*/
- if (copy_to_user(&pgdir[
3], &pgd, sizeof(pgd)) != 0
)
+ if (copy_to_user(&pgdir[
KERNEL_PGD_BOUNDARY], &pgd, sizeof(pgd))
)
return -EFAULT;
#else
/*
return -EFAULT;
#else
/*