diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /arch/cris/mm/tlb.c | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'arch/cris/mm/tlb.c')
| -rw-r--r-- | arch/cris/mm/tlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/mm/tlb.c b/arch/cris/mm/tlb.c index c4a98e2e529e..b7f8de576777 100644 --- a/arch/cris/mm/tlb.c +++ b/arch/cris/mm/tlb.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | /* The TLB can host up to 64 different mm contexts at the same time. | 16 | /* The TLB can host up to 64 different mm contexts at the same time. |
| 17 | * The running context is R_MMU_CONTEXT, and each TLB entry contains a | 17 | * The running context is R_MMU_CONTEXT, and each TLB entry contains a |
| 18 | * page_id that has to match to give a hit. In page_id_map, we keep track | 18 | * page_id that has to match to give a hit. In page_id_map, we keep track |
| 19 | * of which mm's we have assigned which page_id's, so that we know when | 19 | * of which mm we have assigned to which page_id, so that we know when |
| 20 | * to invalidate TLB entries. | 20 | * to invalidate TLB entries. |
| 21 | * | 21 | * |
| 22 | * The last page_id is never running - it is used as an invalid page_id | 22 | * The last page_id is never running - it is used as an invalid page_id |