Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c30989c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull tile fixes from Chris Metcalf:
 "These two minor bug fixes fix build failures from some changes that
  were merged in during the 3.5 merge window."

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: add #include to unbreak build after generic init_task conversion
  tile: remove cpu_idle_on_new_stack
parents 71fae7e7 2ded5c24

arch/tile/include/asm/thread_info.h

+0 −5
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ extern void smp_nap(void); 
/* Enable interrupts racelessly and nap forever: helper for cpu_idle(). */

extern void _cpu_idle(void);



/* Switch boot idle thread to a freshly-allocated stack and free old stack. */

extern void cpu_idle_on_new_stack(struct thread_info *old_ti,

				  unsigned long new_sp,

				  unsigned long new_ss10);



#else /* __ASSEMBLY__ */



/*

arch/tile/kernel/entry.S

+0 −14
Original line number Diff line number Diff line
@@ -68,20 +68,6 @@ STD_ENTRY(KBacktraceIterator_init_current) 
	jrp lr   /* keep backtracer happy */

	STD_ENDPROC(KBacktraceIterator_init_current)



/*

 * Reset our stack to r1/r2 (sp and ksp0+cpu respectively), then

 * free the old stack (passed in r0) and re-invoke cpu_idle().

 * We update sp and ksp0 simultaneously to avoid backtracer warnings.

 */

STD_ENTRY(cpu_idle_on_new_stack)

	{

	 move sp, r1

	 mtspr SPR_SYSTEM_SAVE_K_0, r2

	}

	jal free_thread_info

	j cpu_idle

	STD_ENDPROC(cpu_idle_on_new_stack)



/* Loop forever on a nap during SMP boot. */

STD_ENTRY(smp_nap)

	nap

arch/tile/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/smp.h>

#include <linux/timex.h>

#include <linux/hugetlb.h>

#include <linux/start_kernel.h>

#include <asm/setup.h>

#include <asm/sections.h>

#include <asm/cacheflush.h>