diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 17:25:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 17:25:59 -0400 |
| commit | ac3f482236793c75caae2c2ebb3f3e5f8b7393e1 (patch) | |
| tree | f769225f9a77ae1e026b18d3d9260f5e5aefe99d /Documentation | |
| parent | 85be928c4101670f99cdd7c927798aa4dcbb3168 (diff) | |
| parent | f39d1b9792881ce4eb982ec8cc65258bf95674b5 (diff) | |
Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
dma-debug: Fix the overlap() function to be correct and readable
oprofile: reset bt_lost_no_mapping with other stats
x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon
signals: declare sys_rt_tgsigqueueinfo in syscalls.h
rcu: Mark Hierarchical RCU no longer experimental
dma-debug: Put all hash-chain locks into the same lock class
dma-debug: fix off-by-one error in overlap function
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index d77fbd8b79ac..dd1a6d4bb747 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1720,8 +1720,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1720 | oprofile.cpu_type= Force an oprofile cpu type | 1720 | oprofile.cpu_type= Force an oprofile cpu type |
| 1721 | This might be useful if you have an older oprofile | 1721 | This might be useful if you have an older oprofile |
| 1722 | userland or if you want common events. | 1722 | userland or if you want common events. |
| 1723 | Format: { archperfmon } | 1723 | Format: { arch_perfmon } |
| 1724 | archperfmon: [X86] Force use of architectural | 1724 | arch_perfmon: [X86] Force use of architectural |
| 1725 | perfmon on Intel CPUs instead of the | 1725 | perfmon on Intel CPUs instead of the |
| 1726 | CPU specific event set. | 1726 | CPU specific event set. |
| 1727 | 1727 | ||