| Message ID | 20200612051238.1007764-7-nathanl@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 50e0cf3742a01e72f4ea4a8fe9221b152e22871b |
| Headers | show |
| Series | remove extended cede offline mode and bogus topology update code | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (ec7b8eb9bc7a519047485c95f7292b48f5b73fe6) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 42 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
* Nathan Lynch <nathanl@linux.ibm.com> [2020-06-12 00:12:26]: > Since vphn_enabled is always 0, we can stub out > timed_topology_update() and remove the code which becomes unreachable. > > Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> > --- > arch/powerpc/mm/numa.c | 21 --------------------- > 1 file changed, 21 deletions(-) > Looks good to me. Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 1b89bacb8975..6207297490a8 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1129,13 +1129,9 @@ struct topology_update_data { int new_nid; }; -#define TOPOLOGY_DEF_TIMER_SECS 60 - static cpumask_t cpu_associativity_changes_mask; static const int vphn_enabled; static const int prrn_enabled; -static void reset_topology_timer(void); -static int topology_timer_secs = 1; static int topology_inited; /* @@ -1143,15 +1139,6 @@ static int topology_inited; */ int timed_topology_update(int nsecs) { - if (vphn_enabled) { - if (nsecs > 0) - topology_timer_secs = nsecs; - else - topology_timer_secs = TOPOLOGY_DEF_TIMER_SECS; - - reset_topology_timer(); - } - return 0; } @@ -1438,14 +1425,6 @@ static void topology_schedule_update(void) schedule_work(&topology_work); } -static struct timer_list topology_timer; - -static void reset_topology_timer(void) -{ - if (vphn_enabled) - mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ); -} - /* * Start polling for associativity changes. */
Since vphn_enabled is always 0, we can stub out timed_topology_update() and remove the code which becomes unreachable. Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> --- arch/powerpc/mm/numa.c | 21 --------------------- 1 file changed, 21 deletions(-)