diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-12-25 13:39:24 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 13:39:15 +0100 |
| commit | 349f1b671a4b2612c1355612bedadc81f86d26f1 (patch) | |
| tree | 9422b3ac6becc77296baa0b31b7052489b792006 /arch/s390 | |
| parent | 2b1a61f0a8c714c96277bf16a823a84bafa1397d (diff) | |
[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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/topology.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 71e6f56bfea..b3aac53fd6d 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); static struct tl_info *tl_info; static struct core_info core_info; static int machine_has_topology; -static int machine_has_topology_irq; static struct timer_list topology_timer; static void set_topology_timer(void); static DECLARE_WORK(topology_work, topology_work_fn); @@ -259,11 +258,6 @@ static void set_topology_timer(void) add_timer(&topology_timer); } -static void topology_interrupt(__u16 code) -{ - schedule_work(&topology_work); -} - static int __init early_parse_topology(char *p) { if (strncmp(p, "on", 2)) @@ -283,14 +277,7 @@ static int __init init_topology_update(void) goto out; } init_timer_deferrable(&topology_timer); - if (machine_has_topology_irq) { - rc = register_external_interrupt(0x2005, topology_interrupt); - if (rc) - goto out; - ctl_set_bit(0, 8); - } - else - set_topology_timer(); + set_topology_timer(); out: update_cpu_core_map(); return rc; @@ -311,9 +298,6 @@ void __init s390_init_cpu_topology(void) return; machine_has_topology = 1; - if (facility_bits & (1ULL << 51)) - machine_has_topology_irq = 1; - tl_info = alloc_bootmem_pages(PAGE_SIZE); info = tl_info; stsi(info, 15, 1, 2); @@ -337,5 +321,4 @@ void __init s390_init_cpu_topology(void) return; error: machine_has_topology = 0; - machine_has_topology_irq = 0; } |