mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

Browse Source
This commit is contained in:
Trond Myklebust
2007-05-17 08:23:04 -04:00
parent 55d3ecab2d b2cd64153b
commit 5cf4cf65a8
89 changed files with 1657 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/libata.h
View File

@@ -140,6 +140,7 @@ enum {
ATA_DFLAG_PIO = (1 << 8), /* device limited to PIO mode */
ATA_DFLAG_NCQ_OFF = (1 << 9), /* device limited to non-NCQ mode */
ATA_DFLAG_SPUNDOWN = (1 << 10), /* XXX: for spindown_compat */
ATA_DFLAG_INIT_MASK = (1 << 16) - 1,
ATA_DFLAG_DETACH = (1 << 16),
@@ -173,6 +174,7 @@ enum {
ATA_FLAG_SETXFER_POLLING= (1 << 14), /* use polling for SETXFER */
ATA_FLAG_IGN_SIMPLEX = (1 << 15), /* ignore SIMPLEX */
ATA_FLAG_NO_IORDY = (1 << 16), /* controller lacks iordy */
ATA_FLAG_ACPI_SATA = (1 << 17), /* need native SATA ACPI layout */
/* The following flag belongs to ap->pflags but is kept in
* ap->flags because it's referenced in many LLDs and will be
@@ -431,7 +433,6 @@ struct ata_device {
struct scsi_device *sdev; /* attached SCSI device */
/* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */
u64 n_sectors; /* size of device, if ATA */
u64 n_sectors_boot; /* size of ATA device at startup */
unsigned int class; /* ATA_DEV_xxx */
u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
u8 pio_mode;

2
include/linux/slub_def.h
View File

@@ -88,7 +88,7 @@ static inline int kmalloc_index(int size)
*/
WARN_ON_ONCE(size == 0);
if (size >= (1 << KMALLOC_SHIFT_HIGH))
if (size > (1 << KMALLOC_SHIFT_HIGH))
return -1;
if (size > 64 && size <= 96)