diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
| commit | 25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (patch) | |
| tree | 18a2ef934aa353ca695c3faaa3b7497fea22037a /arch/parisc/mm/fault.c | |
| parent | fef6108d4556917c45cd9ba397c1c7597f3990e1 (diff) | |
| parent | 4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/parisc/mm/fault.c')
| -rw-r--r-- | arch/parisc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 0ad945d4c0a4..64785e46f93b 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
| @@ -186,7 +186,7 @@ good_area: | |||
| 186 | break; | 186 | break; |
| 187 | case VM_FAULT_SIGBUS: | 187 | case VM_FAULT_SIGBUS: |
| 188 | /* | 188 | /* |
| 189 | * We hit a hared mapping outside of the file, or some | 189 | * We hit a shared mapping outside of the file, or some |
| 190 | * other thing happened to us that made us unable to | 190 | * other thing happened to us that made us unable to |
| 191 | * handle the page fault gracefully. | 191 | * handle the page fault gracefully. |
| 192 | */ | 192 | */ |