tile: Use common threadinfo allocator
Use the core allocator and deal with the extra cleanup in arch_release_thread_info(). Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Chris Metcalf <cmetcalf@tilera.com> Link: http://lkml.kernel.org/r/20120505150142.311126440@linutronix.de
This commit is contained in:
parent
41101809a8
commit
d909a81b19
2 changed files with 4 additions and 25 deletions
|
@ -77,16 +77,14 @@ struct thread_info {
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
|
void arch_release_thread_info(struct thread_info *info);
|
||||||
|
|
||||||
/* How to get the thread information struct from C. */
|
/* How to get the thread information struct from C. */
|
||||||
register unsigned long stack_pointer __asm__("sp");
|
register unsigned long stack_pointer __asm__("sp");
|
||||||
|
|
||||||
#define current_thread_info() \
|
#define current_thread_info() \
|
||||||
((struct thread_info *)(stack_pointer & -THREAD_SIZE))
|
((struct thread_info *)(stack_pointer & -THREAD_SIZE))
|
||||||
|
|
||||||
#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
|
|
||||||
extern struct thread_info *alloc_thread_info_node(struct task_struct *task, int node);
|
|
||||||
extern void free_thread_info(struct thread_info *info);
|
|
||||||
|
|
||||||
/* Sit on a nap instruction until interrupted. */
|
/* Sit on a nap instruction until interrupted. */
|
||||||
extern void smp_nap(void);
|
extern void smp_nap(void);
|
||||||
|
|
||||||
|
|
|
@ -114,27 +114,10 @@ void cpu_idle(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct thread_info *alloc_thread_info_node(struct task_struct *task, int node)
|
|
||||||
{
|
|
||||||
struct page *page;
|
|
||||||
gfp_t flags = GFP_KERNEL;
|
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_STACK_USAGE
|
|
||||||
flags |= __GFP_ZERO;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
page = alloc_pages_node(node, flags, THREAD_SIZE_ORDER);
|
|
||||||
if (!page)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return (struct thread_info *)page_address(page);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Free a thread_info node, and all of its derivative
|
* Release a thread_info structure
|
||||||
* data structures.
|
|
||||||
*/
|
*/
|
||||||
void free_thread_info(struct thread_info *info)
|
void arch_release_thread_info(struct thread_info *info)
|
||||||
{
|
{
|
||||||
struct single_step_state *step_state = info->step_state;
|
struct single_step_state *step_state = info->step_state;
|
||||||
|
|
||||||
|
@ -169,8 +152,6 @@ void free_thread_info(struct thread_info *info)
|
||||||
*/
|
*/
|
||||||
kfree(step_state);
|
kfree(step_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
free_pages((unsigned long)info, THREAD_SIZE_ORDER);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void save_arch_state(struct thread_struct *t);
|
static void save_arch_state(struct thread_struct *t);
|
||||||
|
|
Loading…
Add table
Reference in a new issue