diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /arch/tile/mm/fault.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/tile/mm/fault.c')
| -rw-r--r-- | arch/tile/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c index 758f597f488c..51f8663bf074 100644 --- a/arch/tile/mm/fault.c +++ b/arch/tile/mm/fault.c | |||
| @@ -290,7 +290,7 @@ static int handle_page_fault(struct pt_regs *regs, | |||
| 290 | /* | 290 | /* |
| 291 | * Early on, we need to check for migrating PTE entries; | 291 | * Early on, we need to check for migrating PTE entries; |
| 292 | * see homecache.c. If we find a migrating PTE, we wait until | 292 | * see homecache.c. If we find a migrating PTE, we wait until |
| 293 | * the backing page claims to be done migrating, then we procede. | 293 | * the backing page claims to be done migrating, then we proceed. |
| 294 | * For kernel PTEs, we rewrite the PTE and return and retry. | 294 | * For kernel PTEs, we rewrite the PTE and return and retry. |
| 295 | * Otherwise, we treat the fault like a normal "no PTE" fault, | 295 | * Otherwise, we treat the fault like a normal "no PTE" fault, |
| 296 | * rather than trying to patch up the existing PTE. | 296 | * rather than trying to patch up the existing PTE. |