--- zzzz-none-000/linux-5.15.111/include/linux/printk.h 2023-05-11 14:00:40.000000000 +0000 +++ puma7-arm-6670-761/linux-5.15.111/include/linux/printk.h 2024-02-07 09:28:07.000000000 +0000 @@ -152,6 +152,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(1, 2) __cold int _printk(const char *fmt, ...); @@ -224,12 +232,24 @@ { } +#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; } @@ -709,13 +729,20 @@ int prefix_type, int rowsize, int groupsize, const void *buf, size_t len, bool ascii); #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) { }