diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 18:54:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 18:54:55 -0400 |
| commit | df31405a9a240e8ea882953ea90736ff57b47643 (patch) | |
| tree | 082b1c061f976a4f9031f7e44b77d50a959a28de /arch | |
| parent | 7c30b0653f1bcaf04f8abf24cad5c1e642a3da47 (diff) | |
| parent | 404dda854b8bb04df72405d5088fa3e6100aef36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNLANCE]: Fix probing problem.
[SPARC64]: Fix X server hangs due to large pages.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/mm/generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c index 8cb06205d265..af9d81db0b38 100644 --- a/arch/sparc64/mm/generic.c +++ b/arch/sparc64/mm/generic.c | |||
| @@ -69,6 +69,8 @@ static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte, | |||
| 69 | } else | 69 | } else |
| 70 | offset += PAGE_SIZE; | 70 | offset += PAGE_SIZE; |
| 71 | 71 | ||
| 72 | if (pte_write(entry)) | ||
| 73 | entry = pte_mkdirty(entry); | ||
| 72 | do { | 74 | do { |
| 73 | BUG_ON(!pte_none(*pte)); | 75 | BUG_ON(!pte_none(*pte)); |
| 74 | set_pte_at(mm, address, pte, entry); | 76 | set_pte_at(mm, address, pte, entry); |