--- zzzz-none-000/linux-4.1.38/include/linux/printk.h 2017-01-18 18:48:06.000000000 +0000 +++ bcm63-7582-715/linux-4.1.38/include/linux/printk.h 2020-11-25 10:06:48.000000000 +0000 @@ -107,7 +107,7 @@ * gcc's format and side-effect checking. */ static inline __printf(1, 2) -int no_printk(const char *fmt, ...) +int no_printk(const char *fmt __maybe_unused, ...) { return 0; } @@ -139,6 +139,17 @@ asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); +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 + /* * Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ ! */ @@ -183,6 +194,30 @@ { return 0; } +#ifdef CONFIG_AVM_ENHANCED +static inline __printf(1, 2) __cold +int printk_linux(const char *fmt __maybe_unused, ...) +{ + return 0; +} +static inline int printk_avm_console_bend(unsigned int activate __maybe_unused) { + return 0; +} +#endif + +static inline __printf(5, 0) __cold +int vprintk_emit(int facility __maybe_unused, int level __maybe_unused, + const char *dict __maybe_unused, size_t dictlen __maybe_unused, + const char *fmt __maybe_unused, va_list args __maybe_unused) +{ + return 0; +} + +static inline __printf(1, 2) __cold +int printk_sched(const char *s __maybe_unused, ...) +{ + return 0; +} static inline int printk_ratelimit(void) { return 0; @@ -228,8 +263,26 @@ } #endif +#ifdef CONFIG_AVM_ENHANCED +static __printf(1, 2) +int _printk(const char *fmt, ...) __attribute__((weakref("printk"))) +__attribute__((deprecated("Neuer Name 'printk()'"))); + +static __printf(1, 2) +int __printk(const char *fmt, ...) __attribute__((weakref("printk_linux"))) +__attribute__((deprecated("Neuer Name 'printk_linux()'"))); +#endif + extern asmlinkage void dump_stack(void) __cold; +#if defined(CONFIG_BCM_KF_EXTRA_DEBUG) +/* extra ratelimit state for bcm_printk() and blog_dump() debugs. */ +extern int __bcm_printk_ratelimit(const char *func); +#define bcm_printk_ratelimit() __bcm_printk_ratelimit(__func__) + +extern int bcm_printk(const char *fmt, ...); +#endif + #ifndef pr_fmt #define pr_fmt(fmt) fmt #endif