Commit b2c863bd authored Jul 23, 2007 by Christoph Hellwig Committed by Linus Torvalds Jul 24, 2007

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>

parent cb276805

arch/powerpc/platforms/cell/spufs/spufs.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -40,13 +40,10 @@ enum {
		struct spu_context_ops;
		struct spu_gang;

		enum {
		SPU_SCHED_WAS_ACTIVE, /* was active upon spu_acquire_saved() */
		};

		/* ctx->sched_flags */
		enum {
		SPU_SCHED_NOTIFY_ACTIVE,
		SPU_SCHED_WAS_ACTIVE, /* was active upon spu_acquire_saved() */
		};

		struct spu_context {