Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 370974
b: refs/heads/master
c: 3412b6a
h: refs/heads/master
v: v3
  • Loading branch information
Rusty Russell committed Apr 22, 2013
1 parent ff6023b commit cc5e61c
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 167 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1f394b1c33d93416c90f97e201d4d386c04af55
refs/heads/master: 3412b6ae2924e068f9932f841bdea0f2d8424502
10 changes: 1 addition & 9 deletions trunk/drivers/lguest/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,10 @@ static int __init init(void)
if (err)
goto out;

/* Now we set up the pagetable implementation for the Guests. */
err = init_pagetables(lg_switcher_pages);
if (err)
goto unmap;

/* We might need to reserve an interrupt vector. */
err = init_interrupts();
if (err)
goto free_pgtables;
goto unmap;

/* /dev/lguest needs to be registered. */
err = lguest_device_init();
Expand All @@ -356,8 +351,6 @@ static int __init init(void)

free_interrupts:
free_interrupts();
free_pgtables:
free_pagetables();
unmap:
unmap_switcher();
out:
Expand All @@ -369,7 +362,6 @@ static void __exit fini(void)
{
lguest_device_remove();
free_interrupts();
free_pagetables();
unmap_switcher();

lguest_arch_host_fini();
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/lguest/lg.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@

#include <asm/lguest.h>

void free_pagetables(void);
int init_pagetables(struct page **switcher_pages);

struct pgdir {
unsigned long gpgdir;
pgd_t *pgdir;
Expand Down
Loading

0 comments on commit cc5e61c

Please sign in to comment.