diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-02 17:51:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-02 17:51:31 -0800 |
| commit | b8ef289daa313b3e5eb6564ed1c2758ddb6e3d6f (patch) | |
| tree | 6e1dd8490bcf311ad49f8a3901f2f112aa7d19c8 /arch/s390/mm/pgtable.c | |
| parent | d54cdc8ca7aabc69e145a62155855db42b04ed0b (diff) | |
| parent | d9c11b1e8aade25d7d75fb8f344e68e1301822e4 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] reset default for CONFIG_CHSC_SCH
[S390] qdio: prevent compile warning under CONFIG_32BIT
[S390] use asm-generic/cacheflush.h
[S390] tlb: fix build error caused by THP
[S390] missing sacf in uaccess
[S390] pgtable_list corruption
[S390] dasd: prevent panic with unresumed devices
Diffstat (limited to 'arch/s390/mm/pgtable.c')
| -rw-r--r-- | arch/s390/mm/pgtable.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 0c719c61972e..e1850c28cd68 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -336,7 +336,8 @@ void page_table_free(struct mm_struct *mm, unsigned long *table) page->flags ^= bits; if (page->flags & FRAG_MASK) { /* Page now has some free pgtable fragments. */ - list_move(&page->lru, &mm->context.pgtable_list); + if (!list_empty(&page->lru)) + list_move(&page->lru, &mm->context.pgtable_list); page = NULL; } else /* All fragments of the 4K page have been freed. */ |