| commit | b2c863bd2daa2b2e36d66db58bc1e18f37151829 | [log] [tgz] |
|---|---|---|
| author | Christoph Hellwig <hch@lst.de> | Mon Jul 23 18:43:53 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 24 12:24:58 2007 -0700 |
| tree | a1d2a8bdfa5c5dd19ed54ac5da683e8b8398fad5 | |
| parent | cb276805803b8e0616159d80a441ab26a931ada4 [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 <hch@lst.de> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>