diff options
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r-- | arch/arm/kernel/process.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index ba2adefa53f7..acf5e6fdb6dc 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
17 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
18 | #include <linux/unistd.h> | 18 | #include <linux/unistd.h> |
19 | #include <linux/slab.h> | ||
20 | #include <linux/user.h> | 19 | #include <linux/user.h> |
21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
22 | #include <linux/reboot.h> | 21 | #include <linux/reboot.h> |
@@ -356,7 +355,7 @@ EXPORT_SYMBOL(dump_fpu); | |||
356 | * the thread function, and r3 points to the exit function. | 355 | * the thread function, and r3 points to the exit function. |
357 | */ | 356 | */ |
358 | extern void kernel_thread_helper(void); | 357 | extern void kernel_thread_helper(void); |
359 | asm( ".section .text\n" | 358 | asm( ".pushsection .text\n" |
360 | " .align\n" | 359 | " .align\n" |
361 | " .type kernel_thread_helper, #function\n" | 360 | " .type kernel_thread_helper, #function\n" |
362 | "kernel_thread_helper:\n" | 361 | "kernel_thread_helper:\n" |
@@ -364,11 +363,11 @@ asm( ".section .text\n" | |||
364 | " mov lr, r3\n" | 363 | " mov lr, r3\n" |
365 | " mov pc, r2\n" | 364 | " mov pc, r2\n" |
366 | " .size kernel_thread_helper, . - kernel_thread_helper\n" | 365 | " .size kernel_thread_helper, . - kernel_thread_helper\n" |
367 | " .previous"); | 366 | " .popsection"); |
368 | 367 | ||
369 | #ifdef CONFIG_ARM_UNWIND | 368 | #ifdef CONFIG_ARM_UNWIND |
370 | extern void kernel_thread_exit(long code); | 369 | extern void kernel_thread_exit(long code); |
371 | asm( ".section .text\n" | 370 | asm( ".pushsection .text\n" |
372 | " .align\n" | 371 | " .align\n" |
373 | " .type kernel_thread_exit, #function\n" | 372 | " .type kernel_thread_exit, #function\n" |
374 | "kernel_thread_exit:\n" | 373 | "kernel_thread_exit:\n" |
@@ -378,7 +377,7 @@ asm( ".section .text\n" | |||
378 | " nop\n" | 377 | " nop\n" |
379 | " .fnend\n" | 378 | " .fnend\n" |
380 | " .size kernel_thread_exit, . - kernel_thread_exit\n" | 379 | " .size kernel_thread_exit, . - kernel_thread_exit\n" |
381 | " .previous"); | 380 | " .popsection"); |
382 | #else | 381 | #else |
383 | #define kernel_thread_exit do_exit | 382 | #define kernel_thread_exit do_exit |
384 | #endif | 383 | #endif |