Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-19
-5
arch/tile/include/asm/thread_info.h
-5
arch/tile/include/asm/thread_info.h
···
91
91
/* Enable interrupts racelessly and nap forever: helper for cpu_idle(). */
92
92
extern void _cpu_idle(void);
93
93
94
-
/* Switch boot idle thread to a freshly-allocated stack and free old stack. */
95
-
extern void cpu_idle_on_new_stack(struct thread_info *old_ti,
96
-
unsigned long new_sp,
97
-
unsigned long new_ss10);
98
-
99
94
#else /* __ASSEMBLY__ */
100
95
101
96
/*
-14
arch/tile/kernel/entry.S
-14
arch/tile/kernel/entry.S
···
68
68
jrp lr /* keep backtracer happy */
69
69
STD_ENDPROC(KBacktraceIterator_init_current)
70
70
71
-
/*
72
-
* Reset our stack to r1/r2 (sp and ksp0+cpu respectively), then
73
-
* free the old stack (passed in r0) and re-invoke cpu_idle().
74
-
* We update sp and ksp0 simultaneously to avoid backtracer warnings.
75
-
*/
76
-
STD_ENTRY(cpu_idle_on_new_stack)
77
-
{
78
-
move sp, r1
79
-
mtspr SPR_SYSTEM_SAVE_K_0, r2
80
-
}
81
-
jal free_thread_info
82
-
j cpu_idle
83
-
STD_ENDPROC(cpu_idle_on_new_stack)
84
-
85
71
/* Loop forever on a nap during SMP boot. */
86
72
STD_ENTRY(smp_nap)
87
73
nap