aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/kernel/topology.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 71e6f56bfead..b3aac53fd6dc 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -63,7 +63,6 @@ static void topology_work_fn(struct work_struct *work);
63static struct tl_info *tl_info; 63static struct tl_info *tl_info;
64static struct core_info core_info; 64static struct core_info core_info;
65static int machine_has_topology; 65static int machine_has_topology;
66static int machine_has_topology_irq;
67static struct timer_list topology_timer; 66static struct timer_list topology_timer;
68static void set_topology_timer(void); 67static void set_topology_timer(void);
69static DECLARE_WORK(topology_work, topology_work_fn); 68static DECLARE_WORK(topology_work, topology_work_fn);
@@ -259,11 +258,6 @@ static void set_topology_timer(void)
259 add_timer(&topology_timer); 258 add_timer(&topology_timer);
260} 259}
261 260
262static void topology_interrupt(__u16 code)
263{
264 schedule_work(&topology_work);
265}
266
267static int __init early_parse_topology(char *p) 261static int __init early_parse_topology(char *p)
268{ 262{
269 if (strncmp(p, "on", 2)) 263 if (strncmp(p, "on", 2))
@@ -283,14 +277,7 @@ static int __init init_topology_update(void)
283 goto out; 277 goto out;
284 } 278 }
285 init_timer_deferrable(&topology_timer); 279 init_timer_deferrable(&topology_timer);
286 if (machine_has_topology_irq) { 280 set_topology_timer();
287 rc = register_external_interrupt(0x2005, topology_interrupt);
288 if (rc)
289 goto out;
290 ctl_set_bit(0, 8);
291 }
292 else
293 set_topology_timer();
294out: 281out:
295 update_cpu_core_map(); 282 update_cpu_core_map();
296 return rc; 283 return rc;
@@ -311,9 +298,6 @@ void __init s390_init_cpu_topology(void)
311 return; 298 return;
312 machine_has_topology = 1; 299 machine_has_topology = 1;
313 300
314 if (facility_bits & (1ULL << 51))
315 machine_has_topology_irq = 1;
316
317 tl_info = alloc_bootmem_pages(PAGE_SIZE); 301 tl_info = alloc_bootmem_pages(PAGE_SIZE);
318 info = tl_info; 302 info = tl_info;
319 stsi(info, 15, 1, 2); 303 stsi(info, 15, 1, 2);
@@ -337,5 +321,4 @@ void __init s390_init_cpu_topology(void)
337 return; 321 return;
338error: 322error:
339 machine_has_topology = 0; 323 machine_has_topology = 0;
340 machine_has_topology_irq = 0;
341} 324}