summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:20:11 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:20:11 -0700
commit0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 (patch)
tree93323b1f7146aefb1843cb995def6c09613bb363 /include
parent6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e (diff)
parent75e9de18f079a51fa987ef0703112d5bc125fdb7 (diff)
downloadop-kernel-dev-0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4.zip
op-kernel-dev-0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4.tar.gz
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] stacktrace bug. [S390] cio: remove casts from/to (void *). [S390] cio: Remove grace period for vary off chpid. [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private [S390] monwriter kzalloc size. [S390] cio: add missing KERN_INFO printk header. [S390] irq change improvements.
Diffstat (limited to 'include')
-rw-r--r--include/asm-s390/cio.h6
-rw-r--r--include/asm-s390/timer.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index da063cd..81287d8 100644
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -275,6 +275,12 @@ struct ccw_dev_id {
u16 devno;
};
+static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
+ struct ccw_dev_id *dev_id2)
+{
+ return !memcmp(dev_id1, dev_id2, sizeof(struct ccw_dev_id));
+}
+
extern int diag210(struct diag210 *addr);
extern void wait_cons_dev(void);
diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h
index fcd6c25..30e5cbe 100644
--- a/include/asm-s390/timer.h
+++ b/include/asm-s390/timer.h
@@ -26,7 +26,7 @@ struct vtimer_list {
spinlock_t lock;
unsigned long magic;
- void (*function)(unsigned long, struct pt_regs*);
+ void (*function)(unsigned long);
unsigned long data;
};
OpenPOWER on IntegriCloud