Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f34c506b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

declare struct ktime 



Some smarty went and inflicted ktime_t as a typedef upon us, so we cannot
forward declare it.

Create a new `union ktime', map ktime_t onto that.  Now we need to kill off
this ktime_t thing.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8522ead

include/linux/ktime.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ 
 * plain scalar nanosecond based representation can be selected by the

 * plain scalar nanosecond based representation can be selected by the

 * config switch CONFIG_KTIME_SCALAR.

 * config switch CONFIG_KTIME_SCALAR.

 */

 */

typedef union {

union ktime {

	s64	tv64;

	s64	tv64;

#if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR)

#if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR)

	struct {

	struct {
@@ -54,7 +54,9 @@ typedef union { 
# endif

# endif

	} tv;

	} tv;

#endif

#endif

} ktime_t;

};



typedef union ktime ktime_t;		/* Kill this */





#define KTIME_MAX			((s64)~((u64)1 << 63))

#define KTIME_MAX			((s64)~((u64)1 << 63))

#if (BITS_PER_LONG == 64)

#if (BITS_PER_LONG == 64)