UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Heiko Carstens 2008-12-25 13:39:24 +01:00 committed by Martin Schwidefsky
parent 2b1a61f0a8
commit 349f1b671a
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/s390/kernel/topology.c
View File

@ -63,7 +63,6 @@ static void topology_work_fn(struct work_struct *work);
static struct tl_info *tl_info; static struct tl_info *tl_info;
static struct core_info core_info; static struct core_info core_info;
static int machine_has_topology; static int machine_has_topology;
static int machine_has_topology_irq;
static struct timer_list topology_timer; static struct timer_list topology_timer;
static void set_topology_timer(void); static void set_topology_timer(void);
static DECLARE_WORK(topology_work, topology_work_fn); static DECLARE_WORK(topology_work, topology_work_fn);
@ -259,11 +258,6 @@ static void set_topology_timer(void)
add_timer(&topology_timer); add_timer(&topology_timer);
} }
static void topology_interrupt(__u16 code)
{
schedule_work(&topology_work);
}
static int __init early_parse_topology(char *p) static int __init early_parse_topology(char *p)
{ {
if (strncmp(p, "on", 2)) if (strncmp(p, "on", 2))
@ -283,14 +277,7 @@ static int __init init_topology_update(void)
goto out; goto out;
} }
init_timer_deferrable(&topology_timer); init_timer_deferrable(&topology_timer);
if (machine_has_topology_irq) { set_topology_timer();
rc = register_external_interrupt(0x2005, topology_interrupt);
if (rc)
goto out;
ctl_set_bit(0, 8);
}
else
set_topology_timer();
out: out:
update_cpu_core_map(); update_cpu_core_map();
return rc; return rc;
@ -311,9 +298,6 @@ void __init s390_init_cpu_topology(void)
return; return;
machine_has_topology = 1; machine_has_topology = 1;
if (facility_bits & (1ULL << 51))
machine_has_topology_irq = 1;
tl_info = alloc_bootmem_pages(PAGE_SIZE); tl_info = alloc_bootmem_pages(PAGE_SIZE);
info = tl_info; info = tl_info;
stsi(info, 15, 1, 2); stsi(info, 15, 1, 2);
@ -337,5 +321,4 @@ void __init s390_init_cpu_topology(void)
return; return;
error: error:
machine_has_topology = 0; machine_has_topology = 0;
machine_has_topology_irq = 0;
} }