diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2012-06-06 11:21:44 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2012-06-06 11:29:31 -0400 |
| commit | 10db9e009af5c3647b9ee742dcb14f6ff447a2a5 (patch) | |
| tree | f386b8fff498c4594700d73af79c7b60d486b530 | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
tile: remove cpu_idle_on_new_stack
This routine isn't used unless CONFIG_HOMECACHE is enabled, which
isn't even available as a public configuration option yet.
Since it no longer links correctly in 3.4, just remove it for now.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
| -rw-r--r-- | arch/tile/include/asm/thread_info.h | 5 | ||||
| -rw-r--r-- | arch/tile/kernel/entry.S | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h index 7e1fef36bde6..e9c670d7a7fe 100644 --- a/arch/tile/include/asm/thread_info.h +++ b/arch/tile/include/asm/thread_info.h | |||
| @@ -91,11 +91,6 @@ extern void smp_nap(void); | |||
| 91 | /* Enable interrupts racelessly and nap forever: helper for cpu_idle(). */ | 91 | /* Enable interrupts racelessly and nap forever: helper for cpu_idle(). */ |
| 92 | extern void _cpu_idle(void); | 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 | #else /* __ASSEMBLY__ */ | 94 | #else /* __ASSEMBLY__ */ |
| 100 | 95 | ||
| 101 | /* | 96 | /* |
diff --git a/arch/tile/kernel/entry.S b/arch/tile/kernel/entry.S index 133c4b56a99e..c31637baff28 100644 --- a/arch/tile/kernel/entry.S +++ b/arch/tile/kernel/entry.S | |||
| @@ -68,20 +68,6 @@ STD_ENTRY(KBacktraceIterator_init_current) | |||
| 68 | jrp lr /* keep backtracer happy */ | 68 | jrp lr /* keep backtracer happy */ |
| 69 | STD_ENDPROC(KBacktraceIterator_init_current) | 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 | /* Loop forever on a nap during SMP boot. */ | 71 | /* Loop forever on a nap during SMP boot. */ |
| 86 | STD_ENTRY(smp_nap) | 72 | STD_ENTRY(smp_nap) |
| 87 | nap | 73 | nap |
