Skip to content

Commit

Permalink
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history 
…t/torvalds/linux-2.6
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Sep 1, 2008
2 parents 31db6e9 + bef69ea commit 9d7548d
Show file tree
Hide file tree
Showing 1,758 changed files with 61,067 additions and 19,102 deletions.
7 changes: 7 additions & 0 deletions Documentation/DocBook/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
$(obj)/procfs-guide.xml: $(C-procfs-example2)

# List of programs to build
##oops, this is a kernel module::hostprogs-y := procfs_example
obj-m += procfs_example.o

# Tell kbuild to always build the programs
always := $(hostprogs-y)

notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
exit 1
db2xtemplate = db2TYPE -o $(dir $@) $<
Expand Down
4 changes: 1 addition & 3 deletions Documentation/DocBook/procfs_example.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ static int __init init_procfs_example(void)
return 0;

no_symlink:
remove_proc_entry("tty", example_dir);
no_tty:
remove_proc_entry("bar", example_dir);
no_bar:
remove_proc_entry("foo", example_dir);
Expand All @@ -206,7 +204,6 @@ static int __init init_procfs_example(void)
static void __exit cleanup_procfs_example(void)
{
remove_proc_entry("jiffies_too", example_dir);
remove_proc_entry("tty", example_dir);
remove_proc_entry("bar", example_dir);
remove_proc_entry("foo", example_dir);
remove_proc_entry("jiffies", example_dir);
Expand All @@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example);

MODULE_AUTHOR("Erik Mouw");
MODULE_DESCRIPTION("procfs examples");
MODULE_LICENSE("GPL");
3 changes: 3 additions & 0 deletions Documentation/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
filesystems/configfs/ ia64/ networking/ \
pcmcia/ spi/ video4linux/ vm/ watchdog/src/
10 changes: 10 additions & 0 deletions Documentation/accounting/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := getdelays

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include
25 changes: 17 additions & 8 deletions Documentation/accounting/getdelays.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,28 +201,37 @@ void print_delayacct(struct taskstats *t)
"RECLAIM %12s%15s\n"
" %15llu%15llu\n",
"count", "real total", "virtual total", "delay total",
t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
t->cpu_delay_total,
(unsigned long long)t->cpu_count,
(unsigned long long)t->cpu_run_real_total,
(unsigned long long)t->cpu_run_virtual_total,
(unsigned long long)t->cpu_delay_total,
"count", "delay total",
t->blkio_count, t->blkio_delay_total,
"count", "delay total", t->swapin_count, t->swapin_delay_total,
(unsigned long long)t->blkio_count,
(unsigned long long)t->blkio_delay_total,
"count", "delay total",
t->freepages_count, t->freepages_delay_total);
(unsigned long long)t->swapin_count,
(unsigned long long)t->swapin_delay_total,
"count", "delay total",
(unsigned long long)t->freepages_count,
(unsigned long long)t->freepages_delay_total);
}

void task_context_switch_counts(struct taskstats *t)
{
printf("\n\nTask %15s%15s\n"
" %15llu%15llu\n",
"voluntary", "nonvoluntary",
t->nvcsw, t->nivcsw);
(unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
}

void print_cgroupstats(struct cgroupstats *c)
{
printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
"uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
c->nr_running, c->nr_stopped, c->nr_uninterruptible);
"uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
(unsigned long long)c->nr_io_wait,
(unsigned long long)c->nr_running,
(unsigned long long)c->nr_stopped,
(unsigned long long)c->nr_uninterruptible);
}


Expand Down
15 changes: 15 additions & 0 deletions Documentation/arm/Samsung-S3C24XX/GPIO.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,21 @@ Introduction
data-sheet/users manual to find out the complete list.


GPIOLIB
-------

With the event of the GPIOLIB in drivers/gpio, support for some
of the GPIO functions such as reading and writing a pin will
be removed in favour of this common access method.

Once all the extant drivers have been converted, the functions
listed below will be removed (they may be marked as __deprecated
in the near future).

- s3c2410_gpio_getpin
- s3c2410_gpio_setpin


Headers
-------

Expand Down
35 changes: 33 additions & 2 deletions Documentation/arm/Samsung-S3C24XX/Overview.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ Introduction

The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported.
S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported.

Support for the S3C2400 and S3C24A0 series are in progress.

Support for the S3C2400 series is in progress.

Configuration
-------------
Expand Down Expand Up @@ -38,6 +39,22 @@ Layout
Register, kernel and platform data definitions are held in the
arch/arm/mach-s3c2410 directory./include/mach

arch/arm/plat-s3c24xx:

Files in here are either common to all the s3c24xx family,
or are common to only some of them with names to indicate this
status. The files that are not common to all are generally named
with the initial cpu they support in the series to ensure a short
name without any possibility of confusion with newer devices.

As an example, initially s3c244x would cover s3c2440 and s3c2442, but
with the s3c2443 which does not share many of the same drivers in
this directory, the name becomes invalid. We stick to s3c2440-<x>
to indicate a driver that is s3c2440 and s3c2442 compatible.

This does mean that to find the status of any given SoC, a number
of directories may need to be searched.


Machines
--------
Expand Down Expand Up @@ -159,6 +176,17 @@ NAND
For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt


SD/MMC
------

The SD/MMC hardware pre S3C2443 is supported in the current
kernel, the driver is drivers/mmc/host/s3cmci.c and supports
1 and 4 bit SD or MMC cards.

The SDIO behaviour of this driver has not been fully tested. There is no
current support for hardware SDIO interrupts.


Serial
------

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

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


Clock Management
----------------
Expand Down
10 changes: 10 additions & 0 deletions Documentation/auxdisplay/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := cfag12864b-example

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include
11 changes: 11 additions & 0 deletions Documentation/connector/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ifneq ($(CONFIG_CONNECTOR),)
obj-m += cn_test.o
endif

# List of programs to build
hostprogs-y := ucon

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
5 changes: 0 additions & 5 deletions Documentation/cpu-hotplug.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,10 @@ apicid values in those tables for disabled apics. In the event BIOS doesn't
mark such hot-pluggable cpus as disabled entries, one could use this
parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.

s390 uses the number of cpus it detects at IPL time to also the number of bits
in cpu_possible_map. If it is desired to add additional cpus at a later time
the number should be specified using this option or the possible_cpus option.

possible_cpus=n [s390 only] use this to set hotpluggable cpus.
This option sets possible_cpus bits in
cpu_possible_map. Thus keeping the numbers of bits set
constant even if the machine gets rebooted.
This option overrides additional_cpus.

CPU maps and such
-----------------
Expand Down
3 changes: 0 additions & 3 deletions Documentation/devices.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2560,9 +2560,6 @@ Your cooperation is appreciated.
96 = /dev/usb/hiddev0 1st USB HID device
...
111 = /dev/usb/hiddev15 16th USB HID device
112 = /dev/usb/auer0 1st auerswald ISDN device
...
127 = /dev/usb/auer15 16th auerswald ISDN device
128 = /dev/usb/brlvgr0 First Braille Voyager device
...
131 = /dev/usb/brlvgr3 Fourth Braille Voyager device
Expand Down
9 changes: 0 additions & 9 deletions Documentation/feature-removal-schedule.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ Who: Pavel Machek <[email protected]>

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

What: old NCR53C9x driver
When: October 2007
Why: Replaced by the much better esp_scsi driver. Actual low-level
driver can be ported over almost trivially.
Who: David Miller <[email protected]>
Christoph Hellwig <[email protected]>

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

What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
When: December 2008
Files: include/linux/video_decoder.h include/linux/videodev.h
Expand Down
3 changes: 3 additions & 0 deletions Documentation/filesystems/configfs/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ifneq ($(CONFIG_CONFIGFS_FS),)
obj-m += configfs_example_explicit.o configfs_example_macros.o
endif
6 changes: 6 additions & 0 deletions Documentation/filesystems/ext4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ Mailing list: [email protected]

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

- Note that it is highly important to install the mke2fs.conf file
that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If
you have edited the /etc/mke2fs.conf file installed on your system,
you will need to merge your changes with the version from e2fsprogs
1.41.x.

- Create a new filesystem using the ext4dev filesystem type:

# mke2fs -t ext4dev /dev/hda1
Expand Down
22 changes: 14 additions & 8 deletions Documentation/filesystems/quota.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ Quota subsystem
===============

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

Quota limits (and amount of grace time) are set independently for each
filesystem.
Expand Down Expand Up @@ -53,6 +53,12 @@ in parentheses):
QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded
longer than given grace period.
QUOTA_NL_BSOFTWARN - space (block) softlimit
- four warnings are also defined for the event when user stops
exceeding some limit:
QUOTA_NL_IHARDBELOW - inode hardlimit
QUOTA_NL_ISOFTBELOW - inode softlimit
QUOTA_NL_BHARDBELOW - space (block) hardlimit
QUOTA_NL_BSOFTBELOW - space (block) softlimit
QUOTA_NL_A_DEV_MAJOR (u32)
- major number of a device with the affected filesystem
QUOTA_NL_A_DEV_MINOR (u32)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/filesystems/ubifs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes
it possible to fit quite a lot of data to the flash.

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

Expand Down
33 changes: 17 additions & 16 deletions Documentation/hwmon/ibmaem
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Kernel driver ibmaem
======================

This driver talks to the IBM Systems Director Active Energy Manager, known
henceforth as AEM.

Supported systems:
* Any recent IBM System X server with Active Energy Manager support.
* Any recent IBM System X server with AEM support.
This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface
driver ("ipmi-si") needs to be loaded for this driver to do anything.
Expand All @@ -14,24 +17,22 @@ Author: Darrick J. Wong
Description
-----------

This driver implements sensor reading support for the energy and power
meters available on various IBM System X hardware through the BMC. All
sensor banks will be exported as platform devices; this driver can talk
to both v1 and v2 interfaces. This driver is completely separate from the
older ibmpex driver.
This driver implements sensor reading support for the energy and power meters
available on various IBM System X hardware through the BMC. All sensor banks
will be exported as platform devices; this driver can talk to both v1 and v2
interfaces. This driver is completely separate from the older ibmpex driver.

The v1 AEM interface has a simple set of features to monitor energy use.
There is a register that displays an estimate of raw energy consumption
since the last BMC reset, and a power sensor that returns average power
use over a configurable interval.
The v1 AEM interface has a simple set of features to monitor energy use. There
is a register that displays an estimate of raw energy consumption since the
last BMC reset, and a power sensor that returns average power use over a
configurable interval.

The v2 AEM interface is a bit more sophisticated, being able to present
a wider range of energy and power use registers, the power cap as
set by the AEM software, and temperature sensors.
The v2 AEM interface is a bit more sophisticated, being able to present a wider
range of energy and power use registers, the power cap as set by the AEM
software, and temperature sensors.

Special Features
----------------

The "power_cap" value displays the current system power cap, as set by
the Active Energy Manager software. Setting the power cap from the host
is not currently supported.
The "power_cap" value displays the current system power cap, as set by the AEM
software. Setting the power cap from the host is not currently supported.
8 changes: 8 additions & 0 deletions Documentation/ia64/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := aliasing-test

# Tell kbuild to always build the programs
always := $(hostprogs-y)
1 change: 0 additions & 1 deletion Documentation/ioctl-number.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ Code Seq# Include File Comments
'T' all linux/soundcard.h conflict!
'T' all asm-i386/ioctls.h conflict!
'U' 00-EF linux/drivers/usb/usb.h
'U' F0-FF drivers/usb/auerswald.c
'V' all linux/vt.h
'W' 00-1F linux/watchdog.h conflict!
'W' 00-1F linux/wanrouter.h conflict!
Expand Down
Loading

0 comments on commit 9d7548d

Please sign in to comment.