Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master'

Browse source
This commit is contained in:
Jeff Garzik 2005-12-06 04:39:48 -05:00
commit 003a20c81e
5 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 15 SUBLEVEL = 15
EXTRAVERSION =-rc4 EXTRAVERSION =-rc5
NAME=Affluent Albatross NAME=Affluent Albatross
# *DOCUMENTATION* # *DOCUMENTATION*

3
drivers/Makefile
View file

@ -5,7 +5,7 @@
# Rewritten to use lists instead of if-statements. # Rewritten to use lists instead of if-statements.
# #
obj-$(CONFIG_PCI) += pci/ usb/ obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_PARISC) += parisc/
obj-$(CONFIG_RAPIDIO) += rapidio/ obj-$(CONFIG_RAPIDIO) += rapidio/
obj-y += video/ obj-y += video/
@ -49,6 +49,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB) += usb/
obj-$(CONFIG_PCI) += usb/
obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_USB_GADGET) += usb/gadget/
obj-$(CONFIG_GAMEPORT) += input/gameport/ obj-$(CONFIG_GAMEPORT) += input/gameport/
obj-$(CONFIG_INPUT) += input/ obj-$(CONFIG_INPUT) += input/

9
drivers/scsi/libata-scsi.c
View file

@ -2239,7 +2239,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
struct scsi_cmnd *cmd = qc->scsicmd; struct scsi_cmnd *cmd = qc->scsicmd;
if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)
return 1; goto invalid_fld;
/* /*
* 12 and 16 byte CDBs use different offsets to * 12 and 16 byte CDBs use different offsets to
@ -2301,7 +2301,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
*/ */
if ((tf->command == ATA_CMD_SET_FEATURES) if ((tf->command == ATA_CMD_SET_FEATURES)
&& (tf->feature == SETFEATURES_XFER)) && (tf->feature == SETFEATURES_XFER))
return 1; goto invalid_fld;
/* /*
* Set flags so that all registers will be written, * Set flags so that all registers will be written,
@ -2322,6 +2322,11 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
qc->nsect = cmd->bufflen / ATA_SECT_SIZE; qc->nsect = cmd->bufflen / ATA_SECT_SIZE;
return 0; return 0;
invalid_fld:
ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x00);
/* "Invalid field in cdb" */
return 1;
} }
/** /**

2
mm/memory.c
View file

@ -1223,7 +1223,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page *
return -EINVAL; return -EINVAL;
return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot);
} }
EXPORT_SYMBOL_GPL(vm_insert_page); EXPORT_SYMBOL(vm_insert_page);
/* /*
* Somebody does a pfn remapping that doesn't actually work as a vma. * Somebody does a pfn remapping that doesn't actually work as a vma.

16
mm/page_alloc.c
View file

@ -1772,16 +1772,16 @@ static int __devinit zone_batchsize(struct zone *zone)
batch = 1; batch = 1;
/* /*
* We will be trying to allcoate bigger chunks of contiguous * Clamp the batch to a 2^n - 1 value. Having a power
* memory of the order of fls(batch). This should result in * of 2 value was found to be more likely to have
* better cache coloring. * suboptimal cache aliasing properties in some cases.
* *
* A sanity check also to ensure that batch is still in limits. * For example if 2 tasks are alternately allocating
* batches of pages, one task can end up with a lot
* of pages of one half of the possible page colors
* and the other with pages of the other colors.
*/ */
batch = (1 << fls(batch + batch/2)); batch = (1 << (fls(batch + batch/2)-1)) - 1;
if (fls(batch) >= (PAGE_SHIFT + MAX_ORDER - 2))
batch = PAGE_SHIFT + ((MAX_ORDER - 1 - PAGE_SHIFT)/2);
return batch; return batch;
} }