diff options
-rw-r--r-- | backport/backport-include/linux/kernel.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/backport/backport-include/linux/kernel.h b/backport/backport-include/linux/kernel.h index 7d56f02b..54050aa5 100644 --- a/backport/backport-include/linux/kernel.h +++ b/backport/backport-include/linux/kernel.h @@ -153,19 +153,6 @@ int __must_check hex2bin(u8 *dst, const char *src, size_t count); #define clamp(val, lo, hi) min((typeof(val))max(val, lo), hi) #endif /* < 3.18 */ -#endif /* __BACKPORT_KERNEL_H */ - -/* - * We have to do this outside the include guard, because - * out own header (linux/export.h) has to include kernel.h - * indirectly (through module.h) and then undef's pr_fmt. - * Then, when the real kernel.h gets included again, it's - * not defined and we get problems ... - */ -#ifndef pr_fmt -#define pr_fmt(msg) msg -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0) #undef abs @@ -193,3 +180,16 @@ int __must_check hex2bin(u8 *dst, const char *src, size_t count); ({ signed type __x = (x); __x < 0 ? -__x : __x; }), other) #endif + +#endif /* __BACKPORT_KERNEL_H */ + +/* + * We have to do this outside the include guard, because + * out own header (linux/export.h) has to include kernel.h + * indirectly (through module.h) and then undef's pr_fmt. + * Then, when the real kernel.h gets included again, it's + * not defined and we get problems ... + */ +#ifndef pr_fmt +#define pr_fmt(msg) msg +#endif |