diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-06-22 06:08:03 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-22 06:08:16 -0400 |
commit | d7d1104fa40f66dbe50840f05b34268144f8a17a (patch) | |
tree | f703b94cb887347f6b5b75b5a474418cfac7f575 /arch/s390/kernel/vtime.c | |
parent | f234012f52a37e48f2330e1ca2df69800e797c3b (diff) |
[S390] time: convert from bootmem to slab
The slab allocator is earlier available so convert the
bootmem allocations to slab/gfp allocations.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/vtime.c')
-rw-r--r-- | arch/s390/kernel/vtime.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index c8eb7255332b..ade17e771f05 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <asm/irq_regs.h> | 25 | #include <asm/irq_regs.h> |
26 | #include <asm/cputime.h> | 26 | #include <asm/cputime.h> |
27 | 27 | ||
28 | static ext_int_info_t ext_int_info_timer; | ||
29 | |||
30 | static DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer); | 28 | static DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer); |
31 | 29 | ||
32 | DEFINE_PER_CPU(struct s390_idle_data, s390_idle) = { | 30 | DEFINE_PER_CPU(struct s390_idle_data, s390_idle) = { |
@@ -557,8 +555,7 @@ void init_cpu_vtimer(void) | |||
557 | void __init vtime_init(void) | 555 | void __init vtime_init(void) |
558 | { | 556 | { |
559 | /* request the cpu timer external interrupt */ | 557 | /* request the cpu timer external interrupt */ |
560 | if (register_early_external_interrupt(0x1005, do_cpu_timer_interrupt, | 558 | if (register_external_interrupt(0x1005, do_cpu_timer_interrupt)) |
561 | &ext_int_info_timer) != 0) | ||
562 | panic("Couldn't request external interrupt 0x1005"); | 559 | panic("Couldn't request external interrupt 0x1005"); |
563 | 560 | ||
564 | /* Enable cpu timer interrupts on the boot cpu. */ | 561 | /* Enable cpu timer interrupts on the boot cpu. */ |