Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler gets a small bug fix and the sysctl tree where I am removing all sysctl strategy routines.
This commit is contained in:
@@ -938,7 +938,7 @@ config PERF_EVENTS
|
||||
Enable kernel support for various performance events provided
|
||||
by software and hardware.
|
||||
|
||||
Software events are supported either build-in or via the
|
||||
Software events are supported either built-in or via the
|
||||
use of generic tracepoints.
|
||||
|
||||
Most modern CPUs support performance events via performance
|
||||
@@ -950,7 +950,7 @@ config PERF_EVENTS
|
||||
used to profile the code that runs on that CPU.
|
||||
|
||||
The Linux Performance Event subsystem provides an abstraction of
|
||||
these software and hardware cevent apabilities, available via a
|
||||
these software and hardware event capabilities, available via a
|
||||
system call and used by the "perf" utility in tools/perf/. It
|
||||
provides per task and per CPU counters, and it provides event
|
||||
capabilities on top of those.
|
||||
|
Reference in New Issue
Block a user