A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

Browse source 
* '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.
This commit is contained in:
Linus Torvalds 2006-10-11 11:20:11 -07:00
commit 0ca9caae2d
19 changed files with 123 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/asm-s390/cio.h
View file

@ -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);

2
include/asm-s390/timer.h
View file

@ -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;
};