diff options
| author | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2006-09-29 02:45:43 -0400 |
|---|---|---|
| committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2006-09-29 02:45:43 -0400 |
| commit | 1b06e7926694178e146ff708b2c15a6da64c9765 (patch) | |
| tree | 30602fa4a854d6956f478212937726ca75ea13ce /arch/s390/kernel/process.c | |
| parent | 65e8697a12e356cd7a6ecafa1149f5c5c6a71593 (diff) | |
| parent | c972398b7871d9fb58c6a317786065a7cc6ca4be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/kernel/process.c')
| -rw-r--r-- | arch/s390/kernel/process.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index d3cbfa3005ec..6603fbb41d07 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
| 46 | #include <asm/timer.h> | 46 | #include <asm/timer.h> |
| 47 | 47 | ||
| 48 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); | 48 | asmlinkage void ret_from_fork(void) asm ("ret_from_fork"); |
| 49 | 49 | ||
| 50 | /* | 50 | /* |
| 51 | * Return saved PC of a blocked thread. used in kernel/sched. | 51 | * Return saved PC of a blocked thread. used in kernel/sched. |
| @@ -177,7 +177,8 @@ void show_regs(struct pt_regs *regs) | |||
| 177 | 177 | ||
| 178 | extern void kernel_thread_starter(void); | 178 | extern void kernel_thread_starter(void); |
| 179 | 179 | ||
| 180 | __asm__(".align 4\n" | 180 | asm( |
| 181 | ".align 4\n" | ||
| 181 | "kernel_thread_starter:\n" | 182 | "kernel_thread_starter:\n" |
| 182 | " la 2,0(10)\n" | 183 | " la 2,0(10)\n" |
| 183 | " basr 14,9\n" | 184 | " basr 14,9\n" |