diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /mm | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 2 | ||||
| -rw-r--r-- | mm/memory.c | 4 | ||||
| -rw-r--r-- | mm/vmscan.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b597bdde7..6d718c01d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -907,7 +907,7 @@ static inline int do_write_page(struct inode * inode, struct file * file, { int retval; unsigned long size; - unsigned long old_fs; + mm_segment_t old_fs; size = offset + PAGE_SIZE; /* refuse to extend file size.. */ diff --git a/mm/memory.c b/mm/memory.c index 772fbbec2..82ed6c986 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -79,9 +79,7 @@ mem_map_t * mem_map = NULL; void oom(struct task_struct * task) { printk("\nOut of memory for %s.\n", task->comm); - task->sig->action[SIGKILL-1].sa_handler = NULL; - task->blocked &= ~(1<<(SIGKILL-1)); - send_sig(SIGKILL,task,1); + force_sig(SIGKILL, task); } /* diff --git a/mm/vmscan.c b/mm/vmscan.c index 53c4e58bf..a50684973 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -426,7 +426,7 @@ int kswapd(void *unused) current->session = 1; current->pgrp = 1; sprintf(current->comm, "kswapd"); - current->blocked = ~0UL; + sigfillset(¤t->blocked); /* * As a kernel thread we want to tamper with system buffers @@ -447,7 +447,7 @@ int kswapd(void *unused) int fail; kswapd_awake = 0; - current->signal = 0; + flush_signals(current); run_task_queue(&tq_disk); interruptible_sleep_on(&kswapd_wait); kswapd_awake = 1; |