--- zzzz-none-000/linux-4.9.279/include/linux/printk.h 2021-08-08 06:38:54.000000000 +0000 +++ puma7-arm-6591-750/linux-4.9.279/include/linux/printk.h 2023-02-08 10:58:16.000000000 +0000 @@ -7,6 +7,10 @@ #include #include +#if defined(CONFIG_AVM_KERNEL) +#include +#endif + extern const char linux_banner[]; extern const char linux_proc_banner[]; @@ -154,6 +158,14 @@ asmlinkage __printf(1, 0) int vprintk(const char *fmt, va_list args); +#ifdef CONFIG_AVM_ENHANCED +asmlinkage __printf(1, 2) __cold +int printk_linux(const char *fmt, ...); + +extern void vprintk_restore(void); /* depreciated: use printk_avm_console_bend() instead */ +extern int printk_avm_console_bend(unsigned int activate); +#endif + asmlinkage __printf(5, 6) __cold int printk_emit(int facility, int level, const char *dict, size_t dictlen, @@ -210,12 +222,25 @@ { return 0; } + +#ifdef CONFIG_AVM_ENHANCED +static inline __printf(1, 2) __cold +int printk_linux(const char *fmt, ...) +{ + return 0; +} +static inline int printk_avm_console_bend(unsigned int activate) { + return 0; +} +#endif + static inline int printk_ratelimit(void) { return 0; } -static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, - unsigned int interval_msec) +static inline bool printk_timed_ratelimit( + unsigned long *caller_jiffies, + unsigned int interval_msec) { return false; } @@ -469,13 +494,20 @@ const void *buf, size_t len); #endif /* defined(CONFIG_DYNAMIC_DEBUG) */ #else -static inline void print_hex_dump(const char *level, const char *prefix_str, - int prefix_type, int rowsize, int groupsize, - const void *buf, size_t len, bool ascii) +static inline void print_hex_dump(const char *level, + const char *prefix_str, + int prefix_type, + int rowsize, + int groupsize, + const void *buf, + size_t len, + bool ascii) { } -static inline void print_hex_dump_bytes(const char *prefix_str, int prefix_type, - const void *buf, size_t len) +static inline void print_hex_dump_bytes(const char *prefix_str, + int prefix_type, + const void *buf, + size_t len) { }