--- zzzz-none-000/linux-3.10.107/include/linux/printk.h 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/include/linux/printk.h 2021-11-10 11:53:56.000000000 +0000 @@ -92,7 +92,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; } @@ -103,18 +103,16 @@ void early_vprintk(const char *fmt, va_list ap); #else static inline __printf(1, 2) __cold -void early_printk(const char *s, ...) { } +void early_printk(const char *s __maybe_unused, ...) { } #endif + #ifdef CONFIG_PRINTK asmlinkage __printf(5, 0) int vprintk_emit(int facility, int level, const char *dict, size_t dictlen, const char *fmt, va_list args); -asmlinkage __printf(1, 0) -int vprintk(const char *fmt, va_list args); - asmlinkage __printf(5, 6) __cold asmlinkage int printk_emit(int facility, int level, const char *dict, size_t dictlen, @@ -123,6 +121,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_ ! */ @@ -138,6 +147,7 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies, unsigned int interval_msec); + extern int printk_delay_msec; extern int dmesg_restrict; extern int kptr_restrict; @@ -151,17 +161,41 @@ void show_regs_print_info(const char *log_lvl); #else static inline __printf(1, 0) -int vprintk(const char *s, va_list args) +int vprintk(const char *s __maybe_unused, va_list args __maybe_unused) +{ + return 0; +} +static inline __printf(1, 2) __cold +int printk(const char *s __maybe_unused, ...) { return 0; } static inline __printf(1, 2) __cold -int printk(const char *s, ...) +int printk_deferred(const char *s __maybe_unused, ...) +{ +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_deferred(const char *s, ...) +int printk_sched(const char *s __maybe_unused, ...) { return 0; } @@ -169,8 +203,9 @@ { 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 __maybe_unused, + unsigned int interval_msec __maybe_unused) { return false; } @@ -183,23 +218,34 @@ { } -static inline void setup_log_buf(int early) +static inline void setup_log_buf(int early __maybe_unused) { } -static inline void dump_stack_set_arch_desc(const char *fmt, ...) +static inline void dump_stack_set_arch_desc(const char *fmt __maybe_unused, + ...) { } -static inline void dump_stack_print_info(const char *log_lvl) +static inline void dump_stack_print_info(const char *log_lvl __maybe_unused) { } -static inline void show_regs_print_info(const char *log_lvl) +static inline void show_regs_print_info(const char *log_lvl __maybe_unused) { } #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 void dump_stack(void) __cold; #ifndef pr_fmt @@ -373,13 +419,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 __maybe_unused, + const char *prefix_str __maybe_unused, + int prefix_type __maybe_unused, + int rowsize __maybe_unused, + int groupsize __maybe_unused, + const void *buf __maybe_unused, + size_t len __maybe_unused, + bool ascii __maybe_unused) { } -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 __maybe_unused, + int prefix_type __maybe_unused, + const void *buf __maybe_unused, + size_t len __maybe_unused) { }