diff options
Diffstat (limited to 'arch/avr32/kernel')
| -rw-r--r-- | arch/avr32/kernel/process.c | 6 | ||||
| -rw-r--r-- | arch/avr32/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/avr32/kernel/syscall_table.S | 1 | ||||
| -rw-r--r-- | arch/avr32/kernel/traps.c | 2 | ||||
| -rw-r--r-- | arch/avr32/kernel/vmlinux.lds.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index 4e4181ed1c6d..13f988402613 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c | |||
| @@ -330,13 +330,13 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | |||
| 330 | { | 330 | { |
| 331 | struct pt_regs *childregs; | 331 | struct pt_regs *childregs; |
| 332 | 332 | ||
| 333 | childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long)p->thread_info)) - 1; | 333 | childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long)task_stack_page(p))) - 1; |
| 334 | *childregs = *regs; | 334 | *childregs = *regs; |
| 335 | 335 | ||
| 336 | if (user_mode(regs)) | 336 | if (user_mode(regs)) |
| 337 | childregs->sp = usp; | 337 | childregs->sp = usp; |
| 338 | else | 338 | else |
| 339 | childregs->sp = (unsigned long)p->thread_info + THREAD_SIZE; | 339 | childregs->sp = (unsigned long)task_stack_page(p) + THREAD_SIZE; |
| 340 | 340 | ||
| 341 | childregs->r12 = 0; /* Set return value for child */ | 341 | childregs->r12 = 0; /* Set return value for child */ |
| 342 | 342 | ||
| @@ -403,7 +403,7 @@ unsigned long get_wchan(struct task_struct *p) | |||
| 403 | if (!p || p == current || p->state == TASK_RUNNING) | 403 | if (!p || p == current || p->state == TASK_RUNNING) |
| 404 | return 0; | 404 | return 0; |
| 405 | 405 | ||
| 406 | stack_page = (unsigned long)p->thread_info; | 406 | stack_page = (unsigned long)task_stack_page(p); |
| 407 | BUG_ON(!stack_page); | 407 | BUG_ON(!stack_page); |
| 408 | 408 | ||
| 409 | /* | 409 | /* |
diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c index 8ac74dddbbde..3c36c2d16148 100644 --- a/arch/avr32/kernel/ptrace.c +++ b/arch/avr32/kernel/ptrace.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | static struct pt_regs *get_user_regs(struct task_struct *tsk) | 25 | static struct pt_regs *get_user_regs(struct task_struct *tsk) |
| 26 | { | 26 | { |
| 27 | return (struct pt_regs *)((unsigned long) tsk->thread_info + | 27 | return (struct pt_regs *)((unsigned long)task_stack_page(tsk) + |
| 28 | THREAD_SIZE - sizeof(struct pt_regs)); | 28 | THREAD_SIZE - sizeof(struct pt_regs)); |
| 29 | } | 29 | } |
| 30 | 30 | ||
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index 7c279586fbba..07f6a6fa340d 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/arch/avr32/kernel/syscall_table.S | |||
| @@ -291,4 +291,5 @@ sys_call_table: | |||
| 291 | .long sys_shmget /* 275 */ | 291 | .long sys_shmget /* 275 */ |
| 292 | .long sys_shmdt | 292 | .long sys_shmdt |
| 293 | .long sys_shmctl | 293 | .long sys_shmctl |
| 294 | .long sys_utimensat | ||
| 294 | .long sys_ni_syscall /* r8 is saturated at nr_syscalls */ | 295 | .long sys_ni_syscall /* r8 is saturated at nr_syscalls */ |
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c index 4de9edf96ed2..86d107511dd4 100644 --- a/arch/avr32/kernel/traps.c +++ b/arch/avr32/kernel/traps.c | |||
| @@ -123,7 +123,7 @@ asmlinkage void do_address_exception(unsigned long ecr, struct pt_regs *regs) | |||
| 123 | 123 | ||
| 124 | /* This way of handling undefined instructions is stolen from ARM */ | 124 | /* This way of handling undefined instructions is stolen from ARM */ |
| 125 | static LIST_HEAD(undef_hook); | 125 | static LIST_HEAD(undef_hook); |
| 126 | static spinlock_t undef_lock = SPIN_LOCK_UNLOCKED; | 126 | static DEFINE_SPINLOCK(undef_lock); |
| 127 | 127 | ||
| 128 | void register_undef_hook(struct undef_hook *hook) | 128 | void register_undef_hook(struct undef_hook *hook) |
| 129 | { | 129 | { |
diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.c index 7ad20cfb48a8..e7f72c995a32 100644 --- a/arch/avr32/kernel/vmlinux.lds.c +++ b/arch/avr32/kernel/vmlinux.lds.c | |||
| @@ -35,7 +35,7 @@ SECTIONS | |||
| 35 | _einittext = .; | 35 | _einittext = .; |
| 36 | . = ALIGN(4); | 36 | . = ALIGN(4); |
| 37 | __tagtable_begin = .; | 37 | __tagtable_begin = .; |
| 38 | *(.taglist) | 38 | *(.taglist.init) |
| 39 | __tagtable_end = .; | 39 | __tagtable_end = .; |
| 40 | *(.init.data) | 40 | *(.init.data) |
| 41 | . = ALIGN(16); | 41 | . = ALIGN(16); |