diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:36:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:36:50 -0400 |
commit | c4a6eb3b7d5b483de331313e7ea38a6891a3447a (patch) | |
tree | de415b67626308b1fa414e47f17959939c017c92 /net | |
parent | 33081adf8b89d5a716d7e1c60171768d39795b39 (diff) | |
parent | 96f4a70d8eb4d746b19d5b5510407c8ff0d00340 (diff) |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (48 commits)
[S390] topology: export cpu topology via proc/sysinfo
[S390] topology: move topology sysinfo code
[S390] topology: clean up facility detection
[S390] cleanup facility list handling
[S390] enable ARCH_DMA_ADDR_T_64BIT with 64BIT
[S390] dasd: ignore unsolicited interrupts for DIAG
[S390] kvm: Enable z196 instruction facilities
[S390] dasd: fix unsolicited interrupt recognition
[S390] dasd: fix use after free in dbf
[S390] kvm: Fix badness at include/asm/mmu_context.h:83
[S390] cio: fix I/O cancel function
[S390] topology: change default
[S390] smp: use correct cpu address in print_cpu_info()
[S390] remove ieee_instruction_pointer from thread_struct
[S390] cleanup system call parameter setup
[S390] correct alignment of cpuid structure
[S390] cleanup lowcore access from external interrupts
[S390] cleanup lowcore access from program checks
[S390] pgtable: move pte_mkhuge() from hugetlb.h to pgtable.h
[S390] fix SIGBUS handling
...
Diffstat (limited to 'net')
-rw-r--r-- | net/iucv/iucv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index 499c045d6910..f7db676de77d 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c | |||
@@ -1798,7 +1798,8 @@ static void iucv_work_fn(struct work_struct *work) | |||
1798 | * Handles external interrupts coming in from CP. | 1798 | * Handles external interrupts coming in from CP. |
1799 | * Places the interrupt buffer on a queue and schedules iucv_tasklet_fn(). | 1799 | * Places the interrupt buffer on a queue and schedules iucv_tasklet_fn(). |
1800 | */ | 1800 | */ |
1801 | static void iucv_external_interrupt(u16 code) | 1801 | static void iucv_external_interrupt(unsigned int ext_int_code, |
1802 | unsigned int param32, unsigned long param64) | ||
1802 | { | 1803 | { |
1803 | struct iucv_irq_data *p; | 1804 | struct iucv_irq_data *p; |
1804 | struct iucv_irq_list *work; | 1805 | struct iucv_irq_list *work; |