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

Commit 61405fea authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core 



Merge reason: queue up dependent patch, update to -rc4

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 9c443dfd 1703f2c3

.gitignore

+2 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
*.lst

*.symtypes

*.order

modules.builtin

*.elf

*.bin

*.gz
@@ -36,6 +37,7 @@ 
tags

TAGS

vmlinux

vmlinuz

System.map

Module.markers

Module.symvers
@@ -45,14 +47,8 @@ Module.symvers 
#

# Generated include files

#

include/asm

include/asm-*/asm-offsets.h

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h

include/linux/bounds.h

include/generated



# stgit generated dirs

Documentation/ABI/testing/sysfs-bus-usb

+10 −8
Original line number Diff line number Diff line
@@ -21,25 +21,27 @@ Contact: Alan Stern <stern@rowland.harvard.edu> 
Description:

		Each USB device directory will contain a file named

		power/level.  This file holds a power-level setting for

		the device, one of "on", "auto", or "suspend".

		the device, either "on" or "auto".



		"on" means that the device is not allowed to autosuspend,

		although normal suspends for system sleep will still

		be honored.  "auto" means the device will autosuspend

		and autoresume in the usual manner, according to the

		capabilities of its driver.  "suspend" means the device

		is forced into a suspended state and it will not autoresume

		in response to I/O requests.  However remote-wakeup requests

		from the device may still be enabled (the remote-wakeup

		setting is controlled separately by the power/wakeup

		attribute).

		capabilities of its driver.



		During normal use, devices should be left in the "auto"

		level.  The other levels are meant for administrative uses.

		level.  The "on" level is meant for administrative uses.

		If you want to suspend a device immediately but leave it

		free to wake up in response to I/O requests, you should

		write "0" to power/autosuspend.



		Device not capable of proper suspend and resume should be

		left in the "on" level.  Although the USB spec requires

		devices to support suspend/resume, many of them do not.

		In fact so many don't that by default, the USB core

		initializes all non-hub devices in the "on" level.  Some

		drivers may change this setting when they are bound.



What:		/sys/bus/usb/devices/.../power/persist

Date:		May 2007

KernelVersion:	2.6.23

Documentation/DocBook/mtdnand.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 
		</para>

		<programlisting>

static struct mtd_info *board_mtd;

static unsigned long baseaddr;

static void __iomem *baseaddr;

		</programlisting>

		<para>

			Static example
@@ -182,7 +182,7 @@ static unsigned long baseaddr; 
		<programlisting>

static struct mtd_info board_mtd;

static struct nand_chip board_chip;

static unsigned long baseaddr;

static void __iomem *baseaddr;

		</programlisting>

	</sect1>

	<sect1 id="Partition_defines">
@@ -283,7 +283,7 @@ int __init board_init (void) 
	}



	/* map physical address */

	baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	if (!baseaddr) {

		printk("Ioremap to access NAND chip failed\n");

		err = -EIO;
@@ -316,7 +316,7 @@ int __init board_init (void) 
	goto out;



out_ior:

	iounmap((void *)baseaddr);

	iounmap(baseaddr);

out_mtd:

	kfree (board_mtd);

out:
@@ -341,7 +341,7 @@ static void __exit board_cleanup (void) 
	nand_release (board_mtd);



	/* unmap physical address */

	iounmap((void *)baseaddr);

	iounmap(baseaddr);

	

	/* Free the MTD device structure */

	kfree (board_mtd);

Documentation/IO-mapping.txt

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ For such memory, you can do things like 
	 * access only the 640k-1MB area, so anything else

	 * has to be remapped.

	 */

	char * baseptr = ioremap(0xFC000000, 1024*1024);

	void __iomem *baseptr = ioremap(0xFC000000, 1024*1024);



	/* write a 'A' to the offset 10 of the area */

	writeb('A',baseptr+10);