git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
s390
/
kernel
/
s390_ext.c
diff --git
a/arch/s390/kernel/s390_ext.c
b/arch/s390/kernel/s390_ext.c
index
6f5bafb
..
bc5beaa
100644
(file)
--- a/
arch/s390/kernel/s390_ext.c
+++ b/
arch/s390/kernel/s390_ext.c
@@
-13,10
+13,10
@@
#include <linux/errno.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
-#include <linux/vs_context.h>
#include <asm/lowcore.h>
#include <asm/s390_ext.h>
#include <asm/lowcore.h>
#include <asm/s390_ext.h>
+#include <asm/irq_regs.h>
#include <asm/irq.h>
/*
#include <asm/irq.h>
/*
@@
-37,7
+37,7
@@
int register_external_interrupt(__u16 code, ext_int_handler_t handler)
ext_int_info_t *p;
int index;
ext_int_info_t *p;
int index;
- p =
(ext_int_info_t *)
kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
+ p = kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
if (p == NULL)
return -ENOMEM;
p->code = code;
if (p == NULL)
return -ENOMEM;
p->code = code;
@@
-114,9
+114,10
@@
int unregister_early_external_interrupt(__u16 code, ext_int_handler_t handler,
void do_extint(struct pt_regs *regs, unsigned short code)
{
ext_int_info_t *p;
void do_extint(struct pt_regs *regs, unsigned short code)
{
ext_int_info_t *p;
- struct vx_info_save vxis;
int index;
int index;
+ struct pt_regs *old_regs;
+ old_regs = set_irq_regs(regs);
irq_enter();
asm volatile ("mc 0,0");
if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
irq_enter();
asm volatile ("mc 0,0");
if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
@@
-124,20
+125,18
@@
void do_extint(struct pt_regs *regs, unsigned short code)
* Make sure that the i/o interrupt did not "overtake"
* the last HZ timer interrupt.
*/
* Make sure that the i/o interrupt did not "overtake"
* the last HZ timer interrupt.
*/
- account_ticks(
regs
);
+ account_ticks();
kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;
index = ext_hash(code);
kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;
index = ext_hash(code);
- __enter_vx_admin(&vxis);
for (p = ext_int_hash[index]; p; p = p->next) {
if (likely(p->code == code)) {
if (likely(p->handler))
for (p = ext_int_hash[index]; p; p = p->next) {
if (likely(p->code == code)) {
if (likely(p->handler))
- p->handler(
regs,
code);
+ p->handler(code);
}
}
}
}
- __leave_vx_admin(&vxis);
irq_exit();
irq_exit();
+ set_irq_regs(old_regs);
}
EXPORT_SYMBOL(register_external_interrupt);
EXPORT_SYMBOL(unregister_external_interrupt);
}
EXPORT_SYMBOL(register_external_interrupt);
EXPORT_SYMBOL(unregister_external_interrupt);
-