BackPup/Linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-15 15:01:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Jeff Garzik
2005-10-13 21:22:27 -04:00
parent 0d69ae5fb7 046d20b739
commit 59aee3c2a1
323 changed files with 8096 additions and 2327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/cio/device.c
View File

@@ -544,7 +544,7 @@ get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
.sibling = sibling,
};
dev = bus_find_device(&css_bus_type, NULL, &data, match_devno);
dev = bus_find_device(&ccw_bus_type, NULL, &data, match_devno);
return dev ? to_ccwdev(dev) : NULL;
}

2
drivers/s390/scsi/zfcp_aux.c
View File

@@ -833,7 +833,7 @@ zfcp_unit_dequeue(struct zfcp_unit *unit)
}
static void *
zfcp_mempool_alloc(unsigned int __nocast gfp_mask, void *size)
zfcp_mempool_alloc(gfp_t gfp_mask, void *size)
{
return kmalloc((size_t) size, gfp_mask);
}