summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@nuclecu.unam.mx>1997-08-06 19:14:48 +0000
committerMiguel de Icaza <miguel@nuclecu.unam.mx>1997-08-06 19:14:48 +0000
commite2819e52a162873ff5061de81bb749831bdb5de9 (patch)
tree6067ea700202750ba335a423696f2972700e5f76 /mm
parent17a005074429bbf143e40401f405ae4363e56828 (diff)
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the one that should be used for the following files (ie, those that were in our tree, or those that came from Linus' patch), please, check these: include/asm-mips/jazz.h include/asm-mips/jazzdma.h include/asm-mips/ioctls.h
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c2
-rw-r--r--mm/simp.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 7c7740e65..03e82469e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -64,7 +64,6 @@ void invalidate_inode_pages(struct inode * inode)
inode->i_nrpages--;
if ((*p = page->next) != NULL)
(*p)->prev = page->prev;
- page->dirty = 0;
page->next = NULL;
page->prev = NULL;
remove_page_from_hash_queue(page);
@@ -97,7 +96,6 @@ repeat:
inode->i_nrpages--;
if ((*p = page->next) != NULL)
(*p)->prev = page->prev;
- page->dirty = 0;
page->next = NULL;
page->prev = NULL;
remove_page_from_hash_queue(page);
diff --git a/mm/simp.c b/mm/simp.c
index 7959d6a0e..6ad6bc73c 100644
--- a/mm/simp.c
+++ b/mm/simp.c
@@ -6,6 +6,7 @@
*/
#include <linux/simp.h>
+#include <linux/tasks.h>
#include <linux/smp.h>
#include <linux/mm.h>
#include <asm/spinlock.h>
@@ -207,7 +208,6 @@ static void alloc_header(struct simp * simp)
simp->usable_list = hdr;
}
-
/* current x86 memcpy() is horribly moving around registers for nothing,
* is doing unnecessary work if the size is dividable by a power-of-two,
* and it clobbers way too many registers.