diff options
author | David Howells <dhowells@redhat.com> | 2012-03-28 13:30:03 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-03-28 13:30:03 -0400 |
commit | f9aa7e1882f3ceec919b30f64a2ce6e66a2571b1 (patch) | |
tree | d9b1e03d15102703722e39883ac719be52615e1a /arch/xtensa/kernel | |
parent | 8978bfd2288adaa24d39fa15f57eb9e24ffeca12 (diff) |
Disintegrate asm/system.h for Xtensa
Disintegrate asm/system.h for Xtensa.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r-- | arch/xtensa/kernel/process.c | 1 | ||||
-rw-r--r-- | arch/xtensa/kernel/ptrace.c | 1 | ||||
-rw-r--r-- | arch/xtensa/kernel/setup.c | 1 | ||||
-rw-r--r-- | arch/xtensa/kernel/traps.c | 19 |
4 files changed, 19 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index 2c9004770c4..6a2d6edf8f7 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include <asm/pgtable.h> | 35 | #include <asm/pgtable.h> |
36 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
37 | #include <asm/system.h> | ||
38 | #include <asm/io.h> | 37 | #include <asm/io.h> |
39 | #include <asm/processor.h> | 38 | #include <asm/processor.h> |
40 | #include <asm/platform.h> | 39 | #include <asm/platform.h> |
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 2dff698ab02..33eea4c16f1 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
27 | #include <asm/system.h> | ||
28 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
29 | #include <asm/ptrace.h> | 28 | #include <asm/ptrace.h> |
30 | #include <asm/elf.h> | 29 | #include <asm/elf.h> |
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 1e5a034fe01..17e746f7be6 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c | |||
@@ -34,7 +34,6 @@ | |||
34 | # include <linux/seq_file.h> | 34 | # include <linux/seq_file.h> |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #include <asm/system.h> | ||
38 | #include <asm/bootparam.h> | 37 | #include <asm/bootparam.h> |
39 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
40 | #include <asm/processor.h> | 39 | #include <asm/processor.h> |
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index e64efac3b9d..bc1e14cf936 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c | |||
@@ -381,6 +381,25 @@ static __always_inline unsigned long *stack_pointer(struct task_struct *task) | |||
381 | return sp; | 381 | return sp; |
382 | } | 382 | } |
383 | 383 | ||
384 | static inline void spill_registers(void) | ||
385 | { | ||
386 | unsigned int a0, ps; | ||
387 | |||
388 | __asm__ __volatile__ ( | ||
389 | "movi a14," __stringify (PS_EXCM_BIT) " | 1\n\t" | ||
390 | "mov a12, a0\n\t" | ||
391 | "rsr a13," __stringify(SAR) "\n\t" | ||
392 | "xsr a14," __stringify(PS) "\n\t" | ||
393 | "movi a0, _spill_registers\n\t" | ||
394 | "rsync\n\t" | ||
395 | "callx0 a0\n\t" | ||
396 | "mov a0, a12\n\t" | ||
397 | "wsr a13," __stringify(SAR) "\n\t" | ||
398 | "wsr a14," __stringify(PS) "\n\t" | ||
399 | :: "a" (&a0), "a" (&ps) | ||
400 | : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15", "memory"); | ||
401 | } | ||
402 | |||
384 | void show_trace(struct task_struct *task, unsigned long *sp) | 403 | void show_trace(struct task_struct *task, unsigned long *sp) |
385 | { | 404 | { |
386 | unsigned long a0, a1, pc; | 405 | unsigned long a0, a1, pc; |