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

Commit 134cbf35 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.30-rc5' into x86/mm 



Merge reason: this branch was on a .30-rc2 base - sync it up with
              all the latest fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 2feceeff 091bf762

Documentation/ABI/testing/sysfs-firmware-acpi

+6 −2
Original line number Diff line number Diff line
@@ -69,9 +69,13 @@ Description: 
		gpe1F:	     0	invalid

		gpe_all:    1192

		sci:	1194

		sci_not:     0	



		sci - The total number of times the ACPI SCI

		has claimed an interrupt.

		sci - The number of times the ACPI SCI

		has been called and claimed an interrupt.



		sci_not - The number of times the ACPI SCI

		has been called and NOT claimed an interrupt.



		gpe_all - count of SCI caused by GPEs.

Documentation/DocBook/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ quiet_cmd_db2pdf = PDF $@ 
	$(call cmd,db2pdf)





main_idx = Documentation/DocBook/index.html

index = index.html

main_idx = Documentation/DocBook/$(index)

build_main_index = rm -rf $(main_idx) && \

		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \

		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
@@ -232,7 +233,7 @@ clean-files := $(DOCBOOKS) \ 
	$(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \

	$(patsubst %.xml, %.html, $(DOCBOOKS)) \

	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \

	$(C-procfs-example)

	$(C-procfs-example) $(index)



clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man

Documentation/DocBook/kernel-api.tmpl

+5 −1
Original line number Diff line number Diff line
@@ -190,16 +190,20 @@ X!Ekernel/module.c 
!Edrivers/pci/pci.c

!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

!Edrivers/pci/access.c

!Edrivers/pci/irq.c

!Edrivers/pci/htirq.c

<!-- FIXME: Removed for now since no structured comments in source

X!Edrivers/pci/hotplug.c

-->

!Edrivers/pci/probe.c

!Edrivers/pci/slot.c

!Edrivers/pci/rom.c

!Edrivers/pci/iov.c

!Idrivers/pci/pci-sysfs.c

     </sect1>

     <sect1><title>PCI Hotplug Support Library</title>

!Edrivers/pci/hotplug/pci_hotplug_core.c

Documentation/filesystems/Locking

+16 −8
Original line number Diff line number Diff line
@@ -512,16 +512,24 @@ locking rules: 
		BKL	mmap_sem	PageLocked(page)

open:		no	yes

close:		no	yes

fault:		no	yes

page_mkwrite:	no	yes		no

fault:		no	yes		can return with page locked

page_mkwrite:	no	yes		can return with page locked

access:		no	yes



	->page_mkwrite() is called when a previously read-only page is

about to become writeable. The file system is responsible for

protecting against truncate races. Once appropriate action has been

taking to lock out truncate, the page range should be verified to be

within i_size. The page mapping should also be checked that it is not

NULL.

	->fault() is called when a previously not present pte is about

to be faulted in. The filesystem must find and return the page associated

with the passed in "pgoff" in the vm_fault structure. If it is possible that

the page may be truncated and/or invalidated, then the filesystem must lock

the page, then ensure it is not already truncated (the page lock will block

subsequent truncate), and then return with VM_FAULT_LOCKED, and the page

locked. The VM will unlock the page.



	->page_mkwrite() is called when a previously read-only pte is

about to become writeable. The filesystem again must ensure that there are

no truncate/invalidate races, and then return with the page locked. If

the page has been truncated, the filesystem should not look up a new page

like the ->fault() handler, but simply return with VM_FAULT_NOPAGE, which

will cause the VM to retry the fault.



	->access() is called when get_user_pages() fails in

acces_process_vm(), typically used to debug a process through

Documentation/filesystems/caching/cachefiles.txt

+4 −4
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ A NOTE ON SECURITY 
==================



CacheFiles makes use of the split security in the task_struct.  It allocates

its own task_security structure, and redirects current->act_as to point to it

its own task_security structure, and redirects current->cred to point to it

when it acts on behalf of another process, in that process's context.



The reason it does this is that it calls vfs_mkdir() and suchlike rather than
@@ -429,9 +429,9 @@ This means it may lose signals or ptrace events for example, and affects what 
the process looks like in /proc.



So CacheFiles makes use of a logical split in the security between the

objective security (task->sec) and the subjective security (task->act_as).  The

objective security holds the intrinsic security properties of a process and is

never overridden.  This is what appears in /proc, and is what is used when a

objective security (task->real_cred) and the subjective security (task->cred).

The objective security holds the intrinsic security properties of a process and

is never overridden.  This is what appears in /proc, and is what is used when a

process is the target of an operation by some other process (SIGKILL for

example).