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

Commit 0ccd8c39 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'linus' into x86/core

parents 1625324d ec0c15af

Documentation/ABI/testing/sysfs-firmware-sgi_uv

0 → 100644
+27 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/sgi_uv/

Date:		August 2008

Contact:	Russ Anderson <rja@sgi.com>

Description:

		The /sys/firmware/sgi_uv directory contains information

		about the SGI UV platform.



		Under that directory are a number of files:



			partition_id

			coherence_id



		The partition_id entry contains the partition id.

		SGI UV systems can be partitioned into multiple physical

		machines, which each partition running a unique copy

		of the operating system.  Each partition will have a unique

		partition id.  To display the partition id, use the command:



			cat /sys/firmware/sgi_uv/partition_id



		The coherence_id entry contains the coherence id.

		A partitioned SGI UV system can have one or more coherence

		domain.  The coherence id indicates which coherence domain

		this partition is in.  To display the coherence id, use the

		command:



			cat /sys/firmware/sgi_uv/coherence_id

Documentation/dontdiff

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
*.css

*.dvi

*.eps

*.fw.gen.S

*.fw

*.gif

*.grep

*.grp

Documentation/filesystems/ntfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Web site 
========



There is plenty of additional information on the linux-ntfs web site

at http://linux-ntfs.sourceforge.net/

at http://www.linux-ntfs.org/



The web site has a lot of additional information, such as a comprehensive

FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS
@@ -272,7 +272,7 @@ And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 = 
For Win2k and later dynamic disks, you can for example use the ldminfo utility

which is part of the Linux LDM tools (the latest version at the time of

writing is linux-ldm-0.0.8.tar.bz2).  You can download it from:

	http://linux-ntfs.sourceforge.net/downloads.html

	http://www.linux-ntfs.org/

Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go

into it (cd linux-ldm-0.0.8) and change to the test directory (cd test).  You

will find the precompiled (i386) ldminfo utility there.  NOTE: You will not be

Documentation/filesystems/proc.txt

+19 −0
Original line number Diff line number Diff line
@@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and 
"smaps".  When enabled, the contents of these files are visible only to

readers that are allowed to ptrace() the given process.



msgmni

------



Maximum number of message queue ids on the system.

This value scales to the amount of lowmem. It is automatically recomputed

upon memory add/remove or ipc namespace creation/removal.

When a value is written into this file, msgmni's value becomes fixed, i.e. it

is not recomputed anymore when one of the above events occurs.

Use auto_msgmni to change this behavior.



auto_msgmni

-----------



Enables/Disables automatic recomputing of msgmni upon memory add/remove or

upon ipc namespace creation/removal (see the msgmni description above).

Echoing "1" into this file enables msgmni automatic recomputing.

Echoing "0" turns it off.

auto_msgmni default value is 1.





2.4 /proc/sys/vm - The virtual memory subsystem

-----------------------------------------------

Documentation/lguest/lguest.c

+8 −0
Original line number Diff line number Diff line
@@ -895,6 +895,9 @@ static void handle_console_output(int fd, struct virtqueue *vq, bool timeout) 
	}

}



/* This is called when we no longer want to hear about Guest changes to a

 * virtqueue.  This is more efficient in high-traffic cases, but it means we

 * have to set a timer to check if any more changes have occurred. */

static void block_vq(struct virtqueue *vq)

{

	struct itimerval itm;
@@ -939,6 +942,11 @@ static void handle_net_output(int fd, struct virtqueue *vq, bool timeout) 
	if (!timeout && num)

		block_vq(vq);



	/* We never quite know how long should we wait before we check the

	 * queue again for more packets.  We start at 500 microseconds, and if

	 * we get fewer packets than last time, we assume we made the timeout

	 * too small and increase it by 10 microseconds.  Otherwise, we drop it

	 * by one microsecond every time.  It seems to work well enough. */

	if (timeout) {

		if (num < last_timeout_num)

			timeout_usec += 10;