aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts
diff options
context:
space:
mode:
authorChristoph Hellwig <[email protected]>2007-07-23 18:43:53 -0700
committerLinus Torvalds <[email protected]>2007-07-24 12:24:58 -0700
commitb2c863bd2daa2b2e36d66db58bc1e18f37151829 (patch)
treea1d2a8bdfa5c5dd19ed54ac5da683e8b8398fad5 /tools/perf/scripts
parentcb276805803b8e0616159d80a441ab26a931ada4 (diff)
spusched: fix mismerge in spufs.h
spufs.h now has two enums for the sched_flags leading to identical values for SPU_SCHED_WAS_ACTIVE and SPU_SCHED_NOTIFY_ACTIVE. Merge them into a single enum as they were in the IBM development tree. Signed-off-by: Christoph Hellwig <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'tools/perf/scripts')
0 files changed, 0 insertions, 0 deletions