Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 185146
b: refs/heads/master
c: 9959c88
h: refs/heads/master
v: v3
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Dec 30, 2009
1 parent 5622519 commit bab898a
Show file tree
Hide file tree
Showing 5,885 changed files with 136,129 additions and 338,064 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: a626b46e17d0762d664ce471d40bc506b6e721ab
refs/heads/master: 9959c888a38b0f25b0e81a480f537d6489348442
1 change: 0 additions & 1 deletion trunk/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ modules.builtin
tags
TAGS
vmlinux
vmlinuz
System.map
Module.markers
Module.symvers
Expand Down
12 changes: 6 additions & 6 deletions trunk/Documentation/ABI/testing/ima_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Description:
lsm: [[subj_user=] [subj_role=] [subj_type=]
[obj_user=] [obj_role=] [obj_type=]]

base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
base: func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]
mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
fsmagic:= hex value
uid:= decimal value
Expand All @@ -40,11 +40,11 @@ Description:

measure func=BPRM_CHECK
measure func=FILE_MMAP mask=MAY_EXEC
measure func=FILE_CHECK mask=MAY_READ uid=0
measure func=INODE_PERM mask=MAY_READ uid=0

The default policy measures all executables in bprm_check,
all files mmapped executable in file_mmap, and all files
open for read by root in do_filp_open.
open for read by root in inode_permission.

Examples of LSM specific definitions:

Expand All @@ -54,8 +54,8 @@ Description:

dont_measure obj_type=var_log_t
dont_measure obj_type=auditd_log_t
measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
measure subj_role=system_r func=FILE_CHECK mask=MAY_READ
measure subj_user=system_u func=INODE_PERM mask=MAY_READ
measure subj_role=system_r func=INODE_PERM mask=MAY_READ

Smack:
measure subj_user=_ func=FILE_CHECK mask=MAY_READ
measure subj_user=_ func=INODE_PERM mask=MAY_READ
14 changes: 0 additions & 14 deletions trunk/Documentation/ABI/testing/sysfs-block
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,3 @@ Description:
preferred request size for workloads where sustained
throughput is desired. If no optimal I/O size is
reported this file contains 0.

What: /sys/block/<disk>/queue/nomerges
Date: January 2010
Contact:
Description:
Standard I/O elevator operations include attempts to
merge contiguous I/Os. For known random I/O loads these
attempts will always fail and result in extra cycles
being spent in the kernel. This allows one to turn off
this behavior on one of two ways: When set to 1, complex
merge checks are disabled, but the simple one-shot merges
with the previous I/O request are enabled. When set to 2,
all merge tries are disabled. The default value is 0 -
which enables all types of merge tries.
79 changes: 0 additions & 79 deletions trunk/Documentation/ABI/testing/sysfs-devices-power
View file

This file was deleted.

12 changes: 6 additions & 6 deletions trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
What: /sys/devices/platform/asus_laptop/display
What: /sys/devices/platform/asus-laptop/display
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -13,27 +13,27 @@ Description:
Ex: - 0 (0000b) means no display
- 3 (0011b) CRT+LCD.

What: /sys/devices/platform/asus_laptop/gps
What: /sys/devices/platform/asus-laptop/gps
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Control the gps device. 1 means on, 0 means off.
Users: Lapsus

What: /sys/devices/platform/asus_laptop/ledd
What: /sys/devices/platform/asus-laptop/ledd
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Some models like the W1N have a LED display that can be
used to display several informations.
To control the LED display, use the following :
echo 0x0T000DDD > /sys/devices/platform/asus_laptop/
echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
where T control the 3 letters display, and DDD the 3 digits display.
The DDD table can be found in Documentation/laptops/asus-laptop.txt

What: /sys/devices/platform/asus_laptop/bluetooth
What: /sys/devices/platform/asus-laptop/bluetooth
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -42,7 +42,7 @@ Description:
This may control the led, the device or both.
Users: Lapsus

What: /sys/devices/platform/asus_laptop/wlan
What: /sys/devices/platform/asus-laptop/wlan
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand Down
10 changes: 5 additions & 5 deletions trunk/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
What: /sys/devices/platform/eeepc/disp
What: /sys/devices/platform/eeepc-laptop/disp
Date: May 2008
KernelVersion: 2.6.26
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -9,21 +9,21 @@ Description:
- 3 = LCD+CRT
If you run X11, you should use xrandr instead.

What: /sys/devices/platform/eeepc/camera
What: /sys/devices/platform/eeepc-laptop/camera
Date: May 2008
KernelVersion: 2.6.26
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Control the camera. 1 means on, 0 means off.

What: /sys/devices/platform/eeepc/cardr
What: /sys/devices/platform/eeepc-laptop/cardr
Date: May 2008
KernelVersion: 2.6.26
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Control the card reader. 1 means on, 0 means off.

What: /sys/devices/platform/eeepc/cpufv
What: /sys/devices/platform/eeepc-laptop/cpufv
Date: Jun 2009
KernelVersion: 2.6.31
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -42,7 +42,7 @@ Description:
`------------ Availables modes
For example, 0x301 means: mode 1 selected, 3 available modes.

What: /sys/devices/platform/eeepc/available_cpufv
What: /sys/devices/platform/eeepc-laptop/available_cpufv
Date: Jun 2009
KernelVersion: 2.6.31
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand Down
13 changes: 0 additions & 13 deletions trunk/Documentation/ABI/testing/sysfs-power
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,3 @@ Description:

CAUTION: Using it will cause your machine's real-time (CMOS)
clock to be set to a random invalid time after a resume.

What: /sys/power/pm_async
Date: January 2009
Contact: Rafael J. Wysocki <rjw@sisk.pl>
Description:
The /sys/power/pm_async file controls the switch allowing the
user space to enable or disable asynchronous suspend and resume
of devices. If enabled, this feature will cause some device
drivers' suspend and resume callbacks to be executed in parallel
with each other and with the main suspend thread. It is enabled
if this file contains "1", which is the default. It may be
disabled by writing "0" to this file, in which case all devices
will be suspended and resumed synchronously.
0 trunk/Documentation/PCI/PCI-DMA-mapping.txt → trunk/Documentation/DMA-mapping.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/device-drivers.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</sect1>

<sect1><title>Atomic and pointer manipulation</title>
!Iarch/x86/include/asm/atomic.h
!Iarch/x86/include/asm/atomic_32.h
!Iarch/x86/include/asm/unaligned.h
</sect1>

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/deviceiobook.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags)

<chapter id="pubfunctions">
<title>Public Functions Provided</title>
!Iarch/x86/include/asm/io.h
!Iarch/x86/include/asm/io_32.h
!Elib/iomap.c
</chapter>

Expand Down
3 changes: 2 additions & 1 deletion trunk/Documentation/DocBook/mac80211.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ usage should require reading the full document.
this though and the recommendation to allow only a single
interface in STA mode at first!
</para>
!Finclude/net/mac80211.h ieee80211_vif
!Finclude/net/mac80211.h ieee80211_if_init_conf
</chapter>

<chapter id="rx-tx">
Expand Down Expand Up @@ -234,6 +234,7 @@ usage should require reading the full document.
<title>Multiple queues and QoS support</title>
<para>TBD</para>
!Finclude/net/mac80211.h ieee80211_tx_queue_params
!Finclude/net/mac80211.h ieee80211_tx_queue_stats
</chapter>

<chapter id="AP">
Expand Down
12 changes: 6 additions & 6 deletions trunk/Documentation/DocBook/mtdnand.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,15 @@
</para>
<programlisting>
static struct mtd_info *board_mtd;
static void __iomem *baseaddr;
static unsigned long baseaddr;
</programlisting>
<para>
Static example
</para>
<programlisting>
static struct mtd_info board_mtd;
static struct nand_chip board_chip;
static void __iomem *baseaddr;
static unsigned long baseaddr;
</programlisting>
</sect1>
<sect1 id="Partition_defines">
Expand Down Expand Up @@ -283,8 +283,8 @@ int __init board_init (void)
}

/* map physical address */
baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
if (!baseaddr) {
baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
if(!baseaddr){
printk("Ioremap to access NAND chip failed\n");
err = -EIO;
goto out_mtd;
Expand Down Expand Up @@ -316,7 +316,7 @@ int __init board_init (void)
goto out;

out_ior:
iounmap(baseaddr);
iounmap((void *)baseaddr);
out_mtd:
kfree (board_mtd);
out:
Expand All @@ -341,7 +341,7 @@ static void __exit board_cleanup (void)
nand_release (board_mtd);

/* unmap physical address */
iounmap(baseaddr);
iounmap((void *)baseaddr);

/* Free the MTD device structure */
kfree (board_mtd);
Expand Down
3 changes: 1 addition & 2 deletions trunk/Documentation/DocBook/v4l/io.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,7 @@ number of a video input as in &v4l2-input; field
<entry></entry>
<entry>A place holder for future extensions and custom
(driver defined) buffer types
<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications
should set this to 0.</entry>
<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher.</entry>
</row>
</tbody>
</tgroup>
Expand Down
Loading

0 comments on commit bab898a

Please sign in to comment.