diff options
Diffstat (limited to 'arch/sparc64/mm')
| -rw-r--r-- | arch/sparc64/mm/asyncd.c | 4 | ||||
| -rw-r--r-- | arch/sparc64/mm/init.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/sparc64/mm/asyncd.c b/arch/sparc64/mm/asyncd.c index a0d1c8144..d1c7f5d20 100644 --- a/arch/sparc64/mm/asyncd.c +++ b/arch/sparc64/mm/asyncd.c @@ -1,4 +1,4 @@ -/* $Id: asyncd.c,v 1.5 1998/09/13 04:30:33 davem Exp $ +/* $Id: asyncd.c,v 1.6 1999/05/12 11:11:48 davem Exp $ * The asyncd kernel daemon. This handles paging on behalf of * processes that receive page faults due to remote (async) memory * accesses. @@ -39,7 +39,7 @@ static struct { /* * The wait queue for waking up the async daemon: */ -static struct wait_queue * asyncd_wait = NULL; +static DECLARE_WAIT_QUEUE_HEAD(asyncd_wait); struct async_job { volatile struct async_job *next; diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index aeb4b26b7..6f3232d1d 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.127 1999/05/08 03:00:38 davem Exp $ +/* $Id: init.c,v 1.128 1999/05/25 16:53:24 jj Exp $ * arch/sparc64/mm/init.c * * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) @@ -21,6 +21,7 @@ #include <asm/oplib.h> #include <asm/iommu.h> #include <asm/io.h> +#include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/vaddrs.h> #include <asm/dma.h> @@ -730,6 +731,9 @@ void prom_world(int enter) unsigned long pstate; int i; + if (!enter) + set_fs(current->tss.current_ds); + if (!prom_ditlb_set) return; |