diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/resume-trace.h | 30 | ||||
-rw-r--r-- | include/linux/serial_core.h | 3 |
2 files changed, 33 insertions, 0 deletions
diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h new file mode 100644 index 000000000000..a376bd4ade39 --- /dev/null +++ b/include/linux/resume-trace.h | |||
@@ -0,0 +1,30 @@ | |||
1 | #ifndef RESUME_TRACE_H | ||
2 | #define RESUME_TRACE_H | ||
3 | |||
4 | #ifdef CONFIG_PM_TRACE | ||
5 | |||
6 | struct device; | ||
7 | extern void set_trace_device(struct device *); | ||
8 | extern void generate_resume_trace(void *tracedata, unsigned int user); | ||
9 | |||
10 | #define TRACE_DEVICE(dev) set_trace_device(dev) | ||
11 | #define TRACE_RESUME(user) do { \ | ||
12 | void *tracedata; \ | ||
13 | asm volatile("movl $1f,%0\n" \ | ||
14 | ".section .tracedata,\"a\"\n" \ | ||
15 | "1:\t.word %c1\n" \ | ||
16 | "\t.long %c2\n" \ | ||
17 | ".previous" \ | ||
18 | :"=r" (tracedata) \ | ||
19 | : "i" (__LINE__), "i" (__FILE__)); \ | ||
20 | generate_resume_trace(tracedata, user); \ | ||
21 | } while (0) | ||
22 | |||
23 | #else | ||
24 | |||
25 | #define TRACE_DEVICE(dev) do { } while (0) | ||
26 | #define TRACE_RESUME(dev) do { } while (0) | ||
27 | |||
28 | #endif | ||
29 | |||
30 | #endif | ||
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 0ef50baa7da6..951c4e858274 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -130,6 +130,9 @@ | |||
130 | /* SUN4V Hypervisor Console */ | 130 | /* SUN4V Hypervisor Console */ |
131 | #define PORT_SUNHV 72 | 131 | #define PORT_SUNHV 72 |
132 | 132 | ||
133 | #define PORT_S3C2412 73 | ||
134 | |||
135 | |||
133 | #ifdef __KERNEL__ | 136 | #ifdef __KERNEL__ |
134 | 137 | ||
135 | #include <linux/compiler.h> | 138 | #include <linux/compiler.h> |