diff options
| author |   Christoph Hellwig <hch@lst.de> | 2007-07-23 18:43:53 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:24:58 -0700 |
| commit | b2c863bd2daa2b2e36d66db58bc1e18f37151829 (patch) | |
| tree | a1d2a8bdfa5c5dd19ed54ac5da683e8b8398fad5 /include/asm-xtensa | |
| parent | nfsd: fix possible oops on re-insertion of rpcsec_gss modules (diff) | |
| download | linux-dev-b2c863bd2daa2b2e36d66db58bc1e18f37151829.tar.xz linux-dev-b2c863bd2daa2b2e36d66db58bc1e18f37151829.zip | |
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>
Diffstat (limited to 'include/asm-xtensa')
0 files changed, 0 insertions, 0 deletions