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.
Unified · Split
| @@ -40,13 +40,10 @@ enum { · 39 unmodified lines | |||
| 40 | struct spu_context_ops; | 40 | struct spu_context_ops; |
| 41 | struct spu_gang; | 41 | struct spu_gang; |
| 42 | 42 | ||
| 43 | enum { | ||
| 44 | SPU_SCHED_WAS_ACTIVE, /* was active upon spu_acquire_saved() */ | ||
| 45 | }; | ||
| 46 | |||
| 47 | /* ctx->sched_flags */ | 43 | /* ctx->sched_flags */ |
| 48 | enum { | 44 | enum { |
| 49 | SPU_SCHED_NOTIFY_ACTIVE, | 45 | SPU_SCHED_NOTIFY_ACTIVE, |
| 46 | SPU_SCHED_WAS_ACTIVE, /* was active upon spu_acquire_saved() */ | ||
| 50 | }; | 47 | }; |
| 51 | 48 | ||
| 52 | struct spu_context { | 49 | struct spu_context { |