Skip to content

Commit 616ad8c

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/defconfig
2 parents 9980996 + b380b0d commit 616ad8c

File tree

1,869 files changed

+62212
-19817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,869 files changed

+62212
-19817
lines changed

‎Documentation/ABI/testing/sysfs-firmware-sgi_uv

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/firmware/sgi_uv/
2+
Date: August 2008
3+
Contact: Russ Anderson <[email protected]>
4+
Description:
5+
The /sys/firmware/sgi_uv directory contains information
6+
about the SGI UV platform.
7+
8+
Under that directory are a number of files:
9+
10+
partition_id
11+
coherence_id
12+
13+
The partition_id entry contains the partition id.
14+
SGI UV systems can be partitioned into multiple physical
15+
machines, which each partition running a unique copy
16+
of the operating system. Each partition will have a unique
17+
partition id. To display the partition id, use the command:
18+
19+
cat /sys/firmware/sgi_uv/partition_id
20+
21+
The coherence_id entry contains the coherence id.
22+
A partitioned SGI UV system can have one or more coherence
23+
domain. The coherence id indicates which coherence domain
24+
this partition is in. To display the coherence id, use the
25+
command:
26+
27+
cat /sys/firmware/sgi_uv/coherence_id

‎Documentation/DocBook/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml
102102
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
103103
$(obj)/procfs-guide.xml: $(C-procfs-example2)
104104

105+
# List of programs to build
106+
##oops, this is a kernel module::hostprogs-y := procfs_example
107+
obj-m += procfs_example.o
108+
109+
# Tell kbuild to always build the programs
110+
always := $(hostprogs-y)
111+
105112
notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
106113
exit 1
107114
db2xtemplate = db2TYPE -o $(dir $@) $<

‎Documentation/DocBook/procfs_example.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,6 @@ static int __init init_procfs_example(void)
189189
return 0;
190190

191191
no_symlink:
192-
remove_proc_entry("tty", example_dir);
193-
no_tty:
194192
remove_proc_entry("bar", example_dir);
195193
no_bar:
196194
remove_proc_entry("foo", example_dir);
@@ -206,7 +204,6 @@ static int __init init_procfs_example(void)
206204
static void __exit cleanup_procfs_example(void)
207205
{
208206
remove_proc_entry("jiffies_too", example_dir);
209-
remove_proc_entry("tty", example_dir);
210207
remove_proc_entry("bar", example_dir);
211208
remove_proc_entry("foo", example_dir);
212209
remove_proc_entry("jiffies", example_dir);
@@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example);
222219

223220
MODULE_AUTHOR("Erik Mouw");
224221
MODULE_DESCRIPTION("procfs examples");
222+
MODULE_LICENSE("GPL");

‎Documentation/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
2+
filesystems/configfs/ ia64/ networking/ \
3+
pcmcia/ spi/ video4linux/ vm/ watchdog/src/

‎Documentation/accounting/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# kbuild trick to avoid linker error. Can be omitted if a module is built.
2+
obj- := dummy.o
3+
4+
# List of programs to build
5+
hostprogs-y := getdelays
6+
7+
# Tell kbuild to always build the programs
8+
always := $(hostprogs-y)
9+
10+
HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include

‎Documentation/accounting/getdelays.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,28 +201,37 @@ void print_delayacct(struct taskstats *t)
201201
"RECLAIM %12s%15s\n"
202202
" %15llu%15llu\n",
203203
"count", "real total", "virtual total", "delay total",
204-
t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
205-
t->cpu_delay_total,
204+
(unsigned long long)t->cpu_count,
205+
(unsigned long long)t->cpu_run_real_total,
206+
(unsigned long long)t->cpu_run_virtual_total,
207+
(unsigned long long)t->cpu_delay_total,
206208
"count", "delay total",
207-
t->blkio_count, t->blkio_delay_total,
208-
"count", "delay total", t->swapin_count, t->swapin_delay_total,
209+
(unsigned long long)t->blkio_count,
210+
(unsigned long long)t->blkio_delay_total,
209211
"count", "delay total",
210-
t->freepages_count, t->freepages_delay_total);
212+
(unsigned long long)t->swapin_count,
213+
(unsigned long long)t->swapin_delay_total,
214+
"count", "delay total",
215+
(unsigned long long)t->freepages_count,
216+
(unsigned long long)t->freepages_delay_total);
211217
}
212218

213219
void task_context_switch_counts(struct taskstats *t)
214220
{
215221
printf("\n\nTask %15s%15s\n"
216222
" %15llu%15llu\n",
217223
"voluntary", "nonvoluntary",
218-
t->nvcsw, t->nivcsw);
224+
(unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
219225
}
220226

221227
void print_cgroupstats(struct cgroupstats *c)
222228
{
223229
printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
224-
"uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
225-
c->nr_running, c->nr_stopped, c->nr_uninterruptible);
230+
"uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
231+
(unsigned long long)c->nr_io_wait,
232+
(unsigned long long)c->nr_running,
233+
(unsigned long long)c->nr_stopped,
234+
(unsigned long long)c->nr_uninterruptible);
226235
}
227236

228237

‎Documentation/arm/Samsung-S3C24XX/GPIO.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@ Introduction
1313
data-sheet/users manual to find out the complete list.
1414

1515

16+
GPIOLIB
17+
-------
18+
19+
With the event of the GPIOLIB in drivers/gpio, support for some
20+
of the GPIO functions such as reading and writing a pin will
21+
be removed in favour of this common access method.
22+
23+
Once all the extant drivers have been converted, the functions
24+
listed below will be removed (they may be marked as __deprecated
25+
in the near future).
26+
27+
- s3c2410_gpio_getpin
28+
- s3c2410_gpio_setpin
29+
30+
1631
Headers
1732
-------
1833

‎Documentation/arm/Samsung-S3C24XX/Overview.txt

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ Introduction
88

99
The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
1010
by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
11-
S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported.
11+
S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported.
12+
13+
Support for the S3C2400 and S3C24A0 series are in progress.
1214

13-
Support for the S3C2400 series is in progress.
1415

1516
Configuration
1617
-------------
@@ -38,6 +39,22 @@ Layout
3839
Register, kernel and platform data definitions are held in the
3940
arch/arm/mach-s3c2410 directory./include/mach
4041

42+
arch/arm/plat-s3c24xx:
43+
44+
Files in here are either common to all the s3c24xx family,
45+
or are common to only some of them with names to indicate this
46+
status. The files that are not common to all are generally named
47+
with the initial cpu they support in the series to ensure a short
48+
name without any possibility of confusion with newer devices.
49+
50+
As an example, initially s3c244x would cover s3c2440 and s3c2442, but
51+
with the s3c2443 which does not share many of the same drivers in
52+
this directory, the name becomes invalid. We stick to s3c2440-<x>
53+
to indicate a driver that is s3c2440 and s3c2442 compatible.
54+
55+
This does mean that to find the status of any given SoC, a number
56+
of directories may need to be searched.
57+
4158

4259
Machines
4360
--------
@@ -159,6 +176,17 @@ NAND
159176
For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt
160177

161178

179+
SD/MMC
180+
------
181+
182+
The SD/MMC hardware pre S3C2443 is supported in the current
183+
kernel, the driver is drivers/mmc/host/s3cmci.c and supports
184+
1 and 4 bit SD or MMC cards.
185+
186+
The SDIO behaviour of this driver has not been fully tested. There is no
187+
current support for hardware SDIO interrupts.
188+
189+
162190
Serial
163191
------
164192

@@ -178,6 +206,9 @@ GPIO
178206
The core contains support for manipulating the GPIO, see the
179207
documentation in GPIO.txt in the same directory as this file.
180208

209+
Newer kernels carry GPIOLIB, and support is being moved towards
210+
this with some of the older support in line to be removed.
211+
181212

182213
Clock Management
183214
----------------

‎Documentation/auxdisplay/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# kbuild trick to avoid linker error. Can be omitted if a module is built.
2+
obj- := dummy.o
3+
4+
# List of programs to build
5+
hostprogs-y := cfag12864b-example
6+
7+
# Tell kbuild to always build the programs
8+
always := $(hostprogs-y)
9+
10+
HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include

‎Documentation/connector/Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ifneq ($(CONFIG_CONNECTOR),)
2+
obj-m += cn_test.o
3+
endif
4+
5+
# List of programs to build
6+
hostprogs-y := ucon
7+
8+
# Tell kbuild to always build the programs
9+
always := $(hostprogs-y)
10+
11+
HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include

‎Documentation/cpu-hotplug.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,10 @@ apicid values in those tables for disabled apics. In the event BIOS doesn't
5959
mark such hot-pluggable cpus as disabled entries, one could use this
6060
parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.
6161

62-
s390 uses the number of cpus it detects at IPL time to also the number of bits
63-
in cpu_possible_map. If it is desired to add additional cpus at a later time
64-
the number should be specified using this option or the possible_cpus option.
65-
6662
possible_cpus=n [s390 only] use this to set hotpluggable cpus.
6763
This option sets possible_cpus bits in
6864
cpu_possible_map. Thus keeping the numbers of bits set
6965
constant even if the machine gets rebooted.
70-
This option overrides additional_cpus.
7166

7267
CPU maps and such
7368
-----------------

‎Documentation/devices.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,9 +2560,6 @@ Your cooperation is appreciated.
25602560
96 = /dev/usb/hiddev0 1st USB HID device
25612561
...
25622562
111 = /dev/usb/hiddev15 16th USB HID device
2563-
112 = /dev/usb/auer0 1st auerswald ISDN device
2564-
...
2565-
127 = /dev/usb/auer15 16th auerswald ISDN device
25662563
128 = /dev/usb/brlvgr0 First Braille Voyager device
25672564
...
25682565
131 = /dev/usb/brlvgr3 Fourth Braille Voyager device

‎Documentation/dontdiff

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*.css
66
*.dvi
77
*.eps
8+
*.fw.gen.S
9+
*.fw
810
*.gif
911
*.grep
1012
*.grp

‎Documentation/feature-removal-schedule.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ Who: Pavel Machek <[email protected]>
1919

2020
---------------------------
2121

22-
What: old NCR53C9x driver
23-
When: October 2007
24-
Why: Replaced by the much better esp_scsi driver. Actual low-level
25-
driver can be ported over almost trivially.
26-
Who: David Miller <[email protected]>
27-
Christoph Hellwig <[email protected]>
28-
29-
---------------------------
30-
3122
What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
3223
When: December 2008
3324
Files: include/linux/video_decoder.h include/linux/videodev.h

‎Documentation/filesystems/configfs/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ifneq ($(CONFIG_CONFIGFS_FS),)
2+
obj-m += configfs_example_explicit.o configfs_example_macros.o
3+
endif

‎Documentation/filesystems/ext4.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ Mailing list: [email protected]
2626

2727
git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
2828

29+
- Note that it is highly important to install the mke2fs.conf file
30+
that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If
31+
you have edited the /etc/mke2fs.conf file installed on your system,
32+
you will need to merge your changes with the version from e2fsprogs
33+
1.41.x.
34+
2935
- Create a new filesystem using the ext4dev filesystem type:
3036

3137
# mke2fs -t ext4dev /dev/hda1

‎Documentation/filesystems/ntfs.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Web site
4040
========
4141

4242
There is plenty of additional information on the linux-ntfs web site
43-
at http://linux-ntfs.sourceforge.net/
43+
at http://www.linux-ntfs.org/
4444

4545
The web site has a lot of additional information, such as a comprehensive
4646
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 =
272272
For Win2k and later dynamic disks, you can for example use the ldminfo utility
273273
which is part of the Linux LDM tools (the latest version at the time of
274274
writing is linux-ldm-0.0.8.tar.bz2). You can download it from:
275-
http://linux-ntfs.sourceforge.net/downloads.html
275+
http://www.linux-ntfs.org/
276276
Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go
277277
into it (cd linux-ldm-0.0.8) and change to the test directory (cd test). You
278278
will find the precompiled (i386) ldminfo utility there. NOTE: You will not be

‎Documentation/filesystems/proc.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and
13391339
"smaps". When enabled, the contents of these files are visible only to
13401340
readers that are allowed to ptrace() the given process.
13411341

1342+
msgmni
1343+
------
1344+
1345+
Maximum number of message queue ids on the system.
1346+
This value scales to the amount of lowmem. It is automatically recomputed
1347+
upon memory add/remove or ipc namespace creation/removal.
1348+
When a value is written into this file, msgmni's value becomes fixed, i.e. it
1349+
is not recomputed anymore when one of the above events occurs.
1350+
Use auto_msgmni to change this behavior.
1351+
1352+
auto_msgmni
1353+
-----------
1354+
1355+
Enables/Disables automatic recomputing of msgmni upon memory add/remove or
1356+
upon ipc namespace creation/removal (see the msgmni description above).
1357+
Echoing "1" into this file enables msgmni automatic recomputing.
1358+
Echoing "0" turns it off.
1359+
auto_msgmni default value is 1.
1360+
13421361

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

‎Documentation/filesystems/quota.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ Quota subsystem
33
===============
44

55
Quota subsystem allows system administrator to set limits on used space and
6-
number of used inodes (inode is a filesystem structure which is associated
7-
with each file or directory) for users and/or groups. For both used space and
8-
number of used inodes there are actually two limits. The first one is called
9-
softlimit and the second one hardlimit. An user can never exceed a hardlimit
10-
for any resource. User is allowed to exceed softlimit but only for limited
11-
period of time. This period is called "grace period" or "grace time". When
12-
grace time is over, user is not able to allocate more space/inodes until he
13-
frees enough of them to get below softlimit.
6+
number of used inodes (inode is a filesystem structure which is associated with
7+
each file or directory) for users and/or groups. For both used space and number
8+
of used inodes there are actually two limits. The first one is called softlimit
9+
and the second one hardlimit. An user can never exceed a hardlimit for any
10+
resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed
11+
softlimit but only for limited period of time. This period is called "grace
12+
period" or "grace time". When grace time is over, user is not able to allocate
13+
more space/inodes until he frees enough of them to get below softlimit.
1414

1515
Quota limits (and amount of grace time) are set independently for each
1616
filesystem.
@@ -53,6 +53,12 @@ in parentheses):
5353
QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded
5454
longer than given grace period.
5555
QUOTA_NL_BSOFTWARN - space (block) softlimit
56+
- four warnings are also defined for the event when user stops
57+
exceeding some limit:
58+
QUOTA_NL_IHARDBELOW - inode hardlimit
59+
QUOTA_NL_ISOFTBELOW - inode softlimit
60+
QUOTA_NL_BHARDBELOW - space (block) hardlimit
61+
QUOTA_NL_BSOFTBELOW - space (block) softlimit
5662
QUOTA_NL_A_DEV_MAJOR (u32)
5763
- major number of a device with the affected filesystem
5864
QUOTA_NL_A_DEV_MINOR (u32)

‎Documentation/filesystems/ubifs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes
5757
it possible to fit quite a lot of data to the flash.
5858

5959
Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.
60-
It does not need stuff like ckfs.ext2. UBIFS automatically replays its
60+
It does not need stuff like fsck.ext2. UBIFS automatically replays its
6161
journal and recovers from crashes, ensuring that the on-flash data
6262
structures are consistent.
6363

0 commit comments

Comments
 (0)