Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 349f1b671a4b2612c1355612bedadc81f86d26f1

Authored by Heiko Carstens
Committed by Martin Schwidefsky
1 parent 2b1a61f0a8
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[S390] cpu topology: remove dead code 

Interrupts haven't been implemented. So remove the dead code.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 1 changed file with 1 additions and 18 deletions Side-by-side Diff

arch/s390/kernel/topology.c
Diff comments   View file @ 349f1b6
... ... @@ -63,7 +63,6 @@
63 63 static struct tl_info *tl_info;
64 64 static struct core_info core_info;
65 65 static int machine_has_topology;
66   -static int machine_has_topology_irq;
67 66 static struct timer_list topology_timer;
68 67 static void set_topology_timer(void);
69 68 static DECLARE_WORK(topology_work, topology_work_fn);
... ... @@ -259,11 +258,6 @@
259 258 add_timer(&topology_timer);
260 259 }
261 260  
262   -static void topology_interrupt(__u16 code)
263   -{
264   - schedule_work(&topology_work);
265   -}
266   -
267 261 static int __init early_parse_topology(char *p)
268 262 {
269 263 if (strncmp(p, "on", 2))
... ... @@ -283,14 +277,7 @@
283 277 goto out;
284 278 }
285 279 init_timer_deferrable(&topology_timer);
286   - if (machine_has_topology_irq) {
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();
  280 + set_topology_timer();
294 281 out:
295 282 update_cpu_core_map();
296 283 return rc;
... ... @@ -311,9 +298,6 @@
311 298 return;
312 299 machine_has_topology = 1;
313 300  
314   - if (facility_bits & (1ULL << 51))
315   - machine_has_topology_irq = 1;
316   -
317 301 tl_info = alloc_bootmem_pages(PAGE_SIZE);
318 302 info = tl_info;
319 303 stsi(info, 15, 1, 2);
... ... @@ -337,6 +321,5 @@
337 321 return;
338 322 error:
339 323 machine_has_topology = 0;
340   - machine_has_topology_irq = 0;
341 324 }