projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: ASoC: hdmi-codec: Add ELD control
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
kernel.h
diff --git
a/include/linux/kernel.h
b/include/linux/kernel.h
index 350dfb08aee36bdce54c8ecf683dd7afed7b46ab..2955e672391d5e41f35b1e56bdf1517ecd076e30 100644
(file)
--- a/
include/linux/kernel.h
+++ b/
include/linux/kernel.h
@@
-607,7
+607,7
@@
do { \
#define do_trace_printk(fmt, args...) \
do { \
#define do_trace_printk(fmt, args...) \
do { \
- static const char *trace_printk_fmt
\
+ static const char *trace_printk_fmt
__used
\
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(fmt) ? fmt : NULL; \
\
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(fmt) ? fmt : NULL; \
\
@@
-651,7
+651,7
@@
int __trace_printk(unsigned long ip, const char *fmt, ...);
*/
#define trace_puts(str) ({ \
*/
#define trace_puts(str) ({ \
- static const char *trace_printk_fmt
\
+ static const char *trace_printk_fmt
__used
\
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(str) ? str : NULL; \
\
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(str) ? str : NULL; \
\
@@
-673,7
+673,7
@@
extern void trace_dump_stack(int skip);
#define ftrace_vprintk(fmt, vargs) \
do { \
if (__builtin_constant_p(fmt)) { \
#define ftrace_vprintk(fmt, vargs) \
do { \
if (__builtin_constant_p(fmt)) { \
- static const char *trace_printk_fmt
\
+ static const char *trace_printk_fmt
__used
\
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(fmt) ? fmt : NULL; \
\
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(fmt) ? fmt : NULL; \
\
@@
-830,4
+830,8
@@
static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
/* OTHER_WRITABLE? Generally considered a bad idea. */ \
BUILD_BUG_ON_ZERO((perms) & 2) + \
(perms))
/* OTHER_WRITABLE? Generally considered a bad idea. */ \
BUILD_BUG_ON_ZERO((perms) & 2) + \
(perms))
+
+/* To identify board information in panic logs, set this */
+extern char *mach_panic_string;
+
#endif
#endif