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

Commit ddae9c2e authored by Nathan Scott's avatar Nathan Scott
Browse files

Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git

parents 0d1335b3 a4fc7ab1

Documentation/cpusets.txt

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ Cpusets extends these two mechanisms as follows: 
The implementation of cpusets requires a few, simple hooks

into the rest of the kernel, none in performance critical paths:



 - in main/init.c, to initialize the root cpuset at system boot.

 - in init/main.c, to initialize the root cpuset at system boot.

 - in fork and exit, to attach and detach a task from its cpuset.

 - in sched_setaffinity, to mask the requested CPUs by what's

   allowed in that tasks cpuset.
@@ -146,7 +146,7 @@ into the rest of the kernel, none in performance critical paths: 
   and related changes in both sched.c and arch/ia64/kernel/domain.c

 - in the mbind and set_mempolicy system calls, to mask the requested

   Memory Nodes by what's allowed in that tasks cpuset.

 - in page_alloc, to restrict memory to allowed nodes.

 - in page_alloc.c, to restrict memory to allowed nodes.

 - in vmscan.c, to restrict page recovery to the current cpuset.



In addition a new file system, of type "cpuset" may be mounted,

Documentation/laptop-mode.txt

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ How to conserve battery power using laptop-mode 


Document Author: Bart Samwel (bart@samwel.tk)

Date created: January 2, 2004

Last modified: July 10, 2004

Last modified: December 06, 2004



Introduction

------------
@@ -33,7 +33,7 @@ or anything. Simply install all the files included in this document, and 
laptop mode will automatically be started when you're on battery. For

your convenience, a tarball containing an installer can be downloaded at:



http://www.xs4all.nl/~bsamwel/laptop_mode/tools

http://www.xs4all.nl/~bsamwel/laptop_mode/tools/



To configure laptop mode, you need to edit the configuration file, which is

located in /etc/default/laptop-mode on Debian-based systems, or in
@@ -912,7 +912,7 @@ void usage() 
    exit(0);

}



int main(int ac, char **av)

int main(int argc, char **argv)

{

    int fd;

    char *disk = 0;

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2487,7 +2487,7 @@ P: Paul Mundt 
M:	lethal@linux-sh.org

P:	Kazumoto Kojima

M:	kkojima@rr.iij4u.or.jp

L:	linux-sh@m17n.org

L:	linuxsh-dev@lists.sourceforge.net

W:	http://www.linux-sh.org

W:	http://www.m17n.org/linux-sh/

W:	http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html

arch/i386/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -101,4 +101,4 @@ zlilo: $(BOOTIMAGE) 
	if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi



install:

	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
 
	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"

arch/i386/mm/pageattr.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) 
		return;

	if (!enable)

		mutex_debug_check_no_locks_freed(page_address(page),

						 page_address(page+numpages));

						 numpages * PAGE_SIZE);



	/* the return value is ignored - the calls cannot fail,

	 * large pages are disabled at boot time.