Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f38f2a2c authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 4ef679e6 436b0f76

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 15

EXTRAVERSION =-rc4

EXTRAVERSION =-rc5

NAME=Affluent Albatross



# *DOCUMENTATION*

drivers/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# Rewritten to use lists instead of if-statements.

#



obj-$(CONFIG_PCI)		+= pci/ usb/

obj-$(CONFIG_PCI)		+= pci/

obj-$(CONFIG_PARISC)		+= parisc/

obj-$(CONFIG_RAPIDIO)		+= rapidio/

obj-y				+= video/
@@ -49,6 +49,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ 
obj-$(CONFIG_PARIDE) 		+= block/paride/

obj-$(CONFIG_TC)		+= tc/

obj-$(CONFIG_USB)		+= usb/

obj-$(CONFIG_PCI)		+= usb/

obj-$(CONFIG_USB_GADGET)	+= usb/gadget/

obj-$(CONFIG_GAMEPORT)		+= input/gameport/

obj-$(CONFIG_INPUT)		+= input/

mm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page * 
		return -EINVAL;

	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.

mm/page_alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -1772,16 +1772,16 @@ static int __devinit zone_batchsize(struct zone *zone) 
		batch = 1;



	/*

	 * We will be trying to allcoate bigger chunks of contiguous

	 * memory of the order of fls(batch).  This should result in

	 * better cache coloring.

	 * Clamp the batch to a 2^n - 1 value. Having a power

	 * of 2 value was found to be more likely to have

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



	if (fls(batch) >= (PAGE_SHIFT + MAX_ORDER - 2))

		batch = PAGE_SHIFT + ((MAX_ORDER - 1 - PAGE_SHIFT)/2);

	batch = (1 << (fls(batch + batch/2)-1)) - 1;



	return batch;

}