Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 299083
b: refs/heads/master
c: 7b78f13
h: refs/heads/master
i:
  299081: 4f0d094
  299079: 931fd9f
v: v3
  • Loading branch information
Markus Trippelsdorf authored and Ingo Molnar committed Apr 4, 2012
1 parent ded8500 commit 5197f01
Show file tree
Hide file tree
Showing 4,907 changed files with 62,676 additions and 131,193 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ccb1ec95e924a24906ef01ce6d028a8dc13dc87d
refs/heads/master: 7b78f13603c6fcb64e020a0bbe31a651ea2b657b
2 changes: 1 addition & 1 deletion trunk/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ What: /sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
Date: August 2008
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
This file determines if the transaction of the USB TMC
This file determines if the the transaction of the USB TMC
device is to be automatically aborted if there is any error.
For more details about this, please see the document,
"Universal Serial Bus Test and Measurement Class Specification
Expand Down
16 changes: 0 additions & 16 deletions trunk/Documentation/ABI/testing/debugfs-olpc
View file

This file was deleted.

25 changes: 0 additions & 25 deletions trunk/Documentation/ABI/testing/sysfs-block-dm
View file

This file was deleted.

75 changes: 0 additions & 75 deletions trunk/Documentation/ABI/testing/sysfs-bus-rpmsg
View file

This file was deleted.

18 changes: 0 additions & 18 deletions trunk/Documentation/ABI/testing/sysfs-driver-samsung-laptop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,3 @@ Description: Some Samsung laptops have different "performance levels"
Specifically, not all support the "overclock" option,
and it's still unknown if this value even changes
anything, other than making the user feel a bit better.

What: /sys/devices/platform/samsung/battery_life_extender
Date: December 1, 2011
KernelVersion: 3.3
Contact: Corentin Chary <corentin.chary@gmail.com>
Description: Max battery charge level can be modified, battery cycle
life can be extended by reducing the max battery charge
level.
0 means normal battery mode (100% charge)
1 means battery life extender mode (80% charge)

What: /sys/devices/platform/samsung/usb_charge
Date: December 1, 2011
KernelVersion: 3.3
Contact: Corentin Chary <corentin.chary@gmail.com>
Description: Use your USB ports to charge devices, even
when your laptop is powered off.
1 means enabled, 0 means disabled.
20 changes: 0 additions & 20 deletions trunk/Documentation/ABI/testing/sysfs-firmware-acpi
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
What: /sys/firmware/acpi/bgrt/
Date: January 2012
Contact: Matthew Garrett <mjg@redhat.com>
Description:
The BGRT is an ACPI 5.0 feature that allows the OS
to obtain a copy of the firmware boot splash and
some associated metadata. This is intended to be used
by boot splash applications in order to interact with
the firmware boot splash in order to avoid jarring
transitions.

image: The image bitmap. Currently a 32-bit BMP.
status: 1 if the image is valid, 0 if firmware invalidated it.
type: 0 indicates image is in BMP format.
version: The version of the BGRT. Currently 1.
xoffset: The number of pixels between the left of the screen
and the left edge of the image.
yoffset: The number of pixels between the top of the screen
and the top edge of the image.

What: /sys/firmware/acpi/interrupts/
Date: February 2008
Contact: Len Brown <lenb@kernel.org>
Expand Down
29 changes: 0 additions & 29 deletions trunk/Documentation/CodingStyle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,35 +793,6 @@ own custom mode, or may have some other magic method for making indentation
work correctly.


Chapter 19: Inline assembly

In architecture-specific code, you may need to use inline assembly to interface
with CPU or platform functionality. Don't hesitate to do so when necessary.
However, don't use inline assembly gratuitously when C can do the job. You can
and should poke hardware from C when possible.

Consider writing simple helper functions that wrap common bits of inline
assembly, rather than repeatedly writing them with slight variations. Remember
that inline assembly can use C parameters.

Large, non-trivial assembly functions should go in .S files, with corresponding
C prototypes defined in C header files. The C prototypes for assembly
functions should use "asmlinkage".

You may need to mark your asm statement as volatile, to prevent GCC from
removing it if GCC doesn't notice any side effects. You don't always need to
do so, though, and doing so unnecessarily can limit optimization.

When writing a single inline assembly statement containing multiple
instructions, put each instruction on a separate line in a separate quoted
string, and end each string except the last with \n\t to properly indent the
next instruction in the assembly output:

asm ("magic %reg1, #42\n\t"
"more_magic %reg2, %reg3"
: /* outputs */ : /* inputs */ : /* clobbers */);



Appendix I: References

Expand Down
18 changes: 0 additions & 18 deletions trunk/Documentation/DMA-attributes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,3 @@ may be weakly ordered, that is that reads and writes may pass each other.
Since it is optional for platforms to implement DMA_ATTR_WEAK_ORDERING,
those that do not will simply ignore the attribute and exhibit default
behavior.

DMA_ATTR_WRITE_COMBINE
----------------------

DMA_ATTR_WRITE_COMBINE specifies that writes to the mapping may be
buffered to improve performance.

Since it is optional for platforms to implement DMA_ATTR_WRITE_COMBINE,
those that do not will simply ignore the attribute and exhibit default
behavior.

DMA_ATTR_NON_CONSISTENT
-----------------------

DMA_ATTR_NON_CONSISTENT lets the platform to choose to return either
consistent or non-consistent memory as it sees fit. By using this API,
you are guaranteeing to the platform that you have all the correct and
necessary sync points for this memory in the driver.
17 changes: 0 additions & 17 deletions trunk/Documentation/DocBook/device-drivers.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,21 +446,4 @@ X!Idrivers/video/console/fonts.c
!Edrivers/i2c/i2c-core.c
</chapter>

<chapter id="hsi">
<title>High Speed Synchronous Serial Interface (HSI)</title>

<para>
High Speed Synchronous Serial Interface (HSI) is a
serial interface mainly used for connecting application
engines (APE) with cellular modem engines (CMT) in cellular
handsets.

HSI provides multiplexing for up to 16 logical channels,
low-latency and full duplex communication.
</para>

!Iinclude/linux/hsi/hsi.h
!Edrivers/hsi/hsi.c
</chapter>

</book>
2 changes: 1 addition & 1 deletion trunk/Documentation/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
pcmcia/ spi/ timers/ watchdog/src/
pcmcia/ spi/ timers/ vm/ watchdog/src/
8 changes: 0 additions & 8 deletions trunk/Documentation/acpi/apei/einj.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@ directory apei/einj. The following files are provided.
This file is used to set the second error parameter value. Effect of
parameter depends on error_type specified.

- notrigger
The EINJ mechanism is a two step process. First inject the error, then
perform some actions to trigger it. Setting "notrigger" to 1 skips the
trigger phase, which *may* allow the user to cause the error in some other
context by a simple access to the cpu, memory location, or device that is
the target of the error injection. Whether this actually works depends
on what operations the BIOS actually includes in the trigger phase.

BIOS versions based in the ACPI 4.0 specification have limited options
to control where the errors are injected. Your BIOS may support an
extension (enabled with the param_extension=1 module parameter, or
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/aoe/aoe.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ CREATING DEVICE NODES
sh Documentation/aoe/mkshelf.sh /dev/etherd 0

There is also an autoload script that shows how to edit
/etc/modprobe.d/aoe.conf to ensure that the aoe module is loaded when
/etc/modprobe.conf to ensure that the aoe module is loaded when
necessary.

USING DEVICE NODES
Expand Down
4 changes: 2 additions & 2 deletions trunk/Documentation/aoe/autoload.sh
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh
# set aoe to autoload by installing the
# aliases in /etc/modprobe.d/
# aliases in /etc/modprobe.conf

f=/etc/modprobe.d/aoe.conf
f=/etc/modprobe.conf

if test ! -r $f || test ! -w $f; then
echo "cannot configure $f for module autoloading" 1>&2
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/blockdev/floppy.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ you can put:

options floppy omnibook messages

in a configuration file in /etc/modprobe.d/.
in /etc/modprobe.conf.


The floppy driver related options are:
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/cgroups/cpusets.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ and name space for cpusets, with a minimum of additional kernel code.

The cpus and mems files in the root (top_cpuset) cpuset are
read-only. The cpus file automatically tracks the value of
cpu_online_mask using a CPU hotplug notifier, and the mems file
cpu_online_map using a CPU hotplug notifier, and the mems file
automatically tracks the value of node_states[N_HIGH_MEMORY]--i.e.,
nodes with memory--using the cpuset_track_online_nodes() hook.

Expand Down
5 changes: 3 additions & 2 deletions trunk/Documentation/cgroups/memory.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April)

Features:
- accounting anonymous pages, file caches, swap caches usage and limiting them.
- pages are linked to per-memcg LRU exclusively, and there is no global LRU.
- private LRU and reclaim routine. (system's global LRU and private LRU
work independently from each other)
- optionally, memory+swap usage can be accounted and limited.
- hierarchical accounting
- soft limit
Expand Down Expand Up @@ -153,7 +154,7 @@ updated. page_cgroup has its own LRU on cgroup.
2.2.1 Accounting details

All mapped anon pages (RSS) and cache pages (Page Cache) are accounted.
Some pages which are never reclaimable and will not be on the LRU
Some pages which are never reclaimable and will not be on the global LRU
are not accounted. We just account pages under usual VM management.

RSS pages are accounted at page_fault unless they've already been accounted
Expand Down
Loading

0 comments on commit 5197f01

Please sign in to comment.