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

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

split the typecheck macros out of include/linux/kernel.h 



Needed to fix up a recursive include snafu in
locking-add-typecheck-on-irqsave-and-friends-for-correct-flags.patch

Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5df439ef

include/linux/kernel.h

+1 −20
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/log2.h>

#include <linux/log2.h>

#include <linux/typecheck.h>

#include <asm/byteorder.h>

#include <asm/byteorder.h>

#include <asm/bug.h>

#include <asm/bug.h>
@@ -441,26 +442,6 @@ static inline char *pack_hex_byte(char *buf, u8 byte) 
	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\

	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\

	(type *)( (char *)__mptr - offsetof(type,member) );})

	(type *)( (char *)__mptr - offsetof(type,member) );})





/*

 * Check at compile time that something is of a particular type.

 * Always evaluates to 1 so you may use it easily in comparisons.

 */

#define typecheck(type,x) \

({	type __dummy; \

	typeof(x) __dummy2; \

	(void)(&__dummy == &__dummy2); \

	1; \

})



/*

 * Check at compile time that 'function' is a certain type, or is a pointer

 * to that type (needs to use typedef for the function type.)

 */

#define typecheck_fn(type,function) \

({	typeof(type) __tmp = function; \

	(void)__tmp; \

})



struct sysinfo;

struct sysinfo;

extern int do_sysinfo(struct sysinfo *info);

extern int do_sysinfo(struct sysinfo *info);

include/linux/typecheck.h

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
#ifndef TYPECHECK_H_INCLUDED

#define TYPECHECK_H_INCLUDED



/*

 * Check at compile time that something is of a particular type.

 * Always evaluates to 1 so you may use it easily in comparisons.

 */

#define typecheck(type,x) \

({	type __dummy; \

	typeof(x) __dummy2; \

	(void)(&__dummy == &__dummy2); \

	1; \

})



/*

 * Check at compile time that 'function' is a certain type, or is a pointer

 * to that type (needs to use typedef for the function type.)

 */

#define typecheck_fn(type,function) \

({	typeof(type) __tmp = function; \

	(void)__tmp; \

})



#endif		/* TYPECHECK_H_INCLUDED */