Merge branch 'x86/urgent' into x86/pat
Conflicts: arch/x86/mm/pageattr.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
commit
8b53b57576
|
@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml
|
||||||
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
|
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
|
||||||
$(obj)/procfs-guide.xml: $(C-procfs-example2)
|
$(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 ***"; \
|
notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
|
||||||
exit 1
|
exit 1
|
||||||
db2xtemplate = db2TYPE -o $(dir $@) $<
|
db2xtemplate = db2TYPE -o $(dir $@) $<
|
||||||
|
|
|
@ -189,8 +189,6 @@ static int __init init_procfs_example(void)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
no_symlink:
|
no_symlink:
|
||||||
remove_proc_entry("tty", example_dir);
|
|
||||||
no_tty:
|
|
||||||
remove_proc_entry("bar", example_dir);
|
remove_proc_entry("bar", example_dir);
|
||||||
no_bar:
|
no_bar:
|
||||||
remove_proc_entry("foo", example_dir);
|
remove_proc_entry("foo", example_dir);
|
||||||
|
@ -206,7 +204,6 @@ out:
|
||||||
static void __exit cleanup_procfs_example(void)
|
static void __exit cleanup_procfs_example(void)
|
||||||
{
|
{
|
||||||
remove_proc_entry("jiffies_too", example_dir);
|
remove_proc_entry("jiffies_too", example_dir);
|
||||||
remove_proc_entry("tty", example_dir);
|
|
||||||
remove_proc_entry("bar", example_dir);
|
remove_proc_entry("bar", example_dir);
|
||||||
remove_proc_entry("foo", example_dir);
|
remove_proc_entry("foo", example_dir);
|
||||||
remove_proc_entry("jiffies", example_dir);
|
remove_proc_entry("jiffies", example_dir);
|
||||||
|
@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example);
|
||||||
|
|
||||||
MODULE_AUTHOR("Erik Mouw");
|
MODULE_AUTHOR("Erik Mouw");
|
||||||
MODULE_DESCRIPTION("procfs examples");
|
MODULE_DESCRIPTION("procfs examples");
|
||||||
|
MODULE_LICENSE("GPL");
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
|
||||||
|
filesystems/configfs/ ia64/ networking/ \
|
||||||
|
pcmcia/ spi/ video4linux/ vm/ watchdog/src/
|
|
@ -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
|
|
@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t)
|
||||||
"RECLAIM %12s%15s\n"
|
"RECLAIM %12s%15s\n"
|
||||||
" %15llu%15llu\n",
|
" %15llu%15llu\n",
|
||||||
"count", "real total", "virtual total", "delay total",
|
"count", "real total", "virtual total", "delay total",
|
||||||
t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
|
(unsigned long long)t->cpu_count,
|
||||||
t->cpu_delay_total,
|
(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",
|
"count", "delay total",
|
||||||
t->blkio_count, t->blkio_delay_total,
|
(unsigned long long)t->blkio_count,
|
||||||
"count", "delay total", t->swapin_count, t->swapin_delay_total,
|
(unsigned long long)t->blkio_delay_total,
|
||||||
"count", "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)
|
void task_context_switch_counts(struct taskstats *t)
|
||||||
|
@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t)
|
||||||
printf("\n\nTask %15s%15s\n"
|
printf("\n\nTask %15s%15s\n"
|
||||||
" %15llu%15llu\n",
|
" %15llu%15llu\n",
|
||||||
"voluntary", "nonvoluntary",
|
"voluntary", "nonvoluntary",
|
||||||
t->nvcsw, t->nivcsw);
|
(unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_cgroupstats(struct cgroupstats *c)
|
void print_cgroupstats(struct cgroupstats *c)
|
||||||
{
|
{
|
||||||
printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
|
printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
|
||||||
"uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
|
"uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
|
||||||
c->nr_running, c->nr_stopped, c->nr_uninterruptible);
|
(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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,21 @@ Introduction
|
||||||
data-sheet/users manual to find out the complete list.
|
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
|
Headers
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,10 @@ Introduction
|
||||||
|
|
||||||
The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
|
The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
|
||||||
by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
|
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
|
Configuration
|
||||||
-------------
|
-------------
|
||||||
|
@ -38,6 +39,22 @@ Layout
|
||||||
Register, kernel and platform data definitions are held in the
|
Register, kernel and platform data definitions are held in the
|
||||||
arch/arm/mach-s3c2410 directory./include/mach
|
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
|
Machines
|
||||||
--------
|
--------
|
||||||
|
@ -159,6 +176,17 @@ NAND
|
||||||
For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt
|
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
|
Serial
|
||||||
------
|
------
|
||||||
|
|
||||||
|
@ -178,6 +206,9 @@ GPIO
|
||||||
The core contains support for manipulating the GPIO, see the
|
The core contains support for manipulating the GPIO, see the
|
||||||
documentation in GPIO.txt in the same directory as this file.
|
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
|
Clock Management
|
||||||
----------------
|
----------------
|
||||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
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.
|
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.
|
possible_cpus=n [s390 only] use this to set hotpluggable cpus.
|
||||||
This option sets possible_cpus bits in
|
This option sets possible_cpus bits in
|
||||||
cpu_possible_map. Thus keeping the numbers of bits set
|
cpu_possible_map. Thus keeping the numbers of bits set
|
||||||
constant even if the machine gets rebooted.
|
constant even if the machine gets rebooted.
|
||||||
This option overrides additional_cpus.
|
|
||||||
|
|
||||||
CPU maps and such
|
CPU maps and such
|
||||||
-----------------
|
-----------------
|
||||||
|
|
|
@ -2560,9 +2560,6 @@ Your cooperation is appreciated.
|
||||||
96 = /dev/usb/hiddev0 1st USB HID device
|
96 = /dev/usb/hiddev0 1st USB HID device
|
||||||
...
|
...
|
||||||
111 = /dev/usb/hiddev15 16th 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
|
128 = /dev/usb/brlvgr0 First Braille Voyager device
|
||||||
...
|
...
|
||||||
131 = /dev/usb/brlvgr3 Fourth Braille Voyager device
|
131 = /dev/usb/brlvgr3 Fourth Braille Voyager device
|
||||||
|
|
|
@ -19,15 +19,6 @@ Who: Pavel Machek <pavel@suse.cz>
|
||||||
|
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
||||||
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 <davem@davemloft.net>
|
|
||||||
Christoph Hellwig <hch@lst.de>
|
|
||||||
|
|
||||||
---------------------------
|
|
||||||
|
|
||||||
What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
|
What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
|
||||||
When: December 2008
|
When: December 2008
|
||||||
Files: include/linux/video_decoder.h include/linux/videodev.h
|
Files: include/linux/video_decoder.h include/linux/videodev.h
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
ifneq ($(CONFIG_CONFIGFS_FS),)
|
||||||
|
obj-m += configfs_example_explicit.o configfs_example_macros.o
|
||||||
|
endif
|
|
@ -3,14 +3,14 @@ Quota subsystem
|
||||||
===============
|
===============
|
||||||
|
|
||||||
Quota subsystem allows system administrator to set limits on used space and
|
Quota subsystem allows system administrator to set limits on used space and
|
||||||
number of used inodes (inode is a filesystem structure which is associated
|
number of used inodes (inode is a filesystem structure which is associated with
|
||||||
with each file or directory) for users and/or groups. For both used space and
|
each file or directory) for users and/or groups. For both used space and number
|
||||||
number of used inodes there are actually two limits. The first one is called
|
of used inodes there are actually two limits. The first one is called softlimit
|
||||||
softlimit and the second one hardlimit. An user can never exceed a hardlimit
|
and the second one hardlimit. An user can never exceed a hardlimit for any
|
||||||
for any resource. User is allowed to exceed softlimit but only for limited
|
resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed
|
||||||
period of time. This period is called "grace period" or "grace time". When
|
softlimit but only for limited period of time. This period is called "grace
|
||||||
grace time is over, user is not able to allocate more space/inodes until he
|
period" or "grace time". When grace time is over, user is not able to allocate
|
||||||
frees enough of them to get below softlimit.
|
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
|
Quota limits (and amount of grace time) are set independently for each
|
||||||
filesystem.
|
filesystem.
|
||||||
|
@ -53,6 +53,12 @@ in parentheses):
|
||||||
QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded
|
QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded
|
||||||
longer than given grace period.
|
longer than given grace period.
|
||||||
QUOTA_NL_BSOFTWARN - space (block) softlimit
|
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)
|
QUOTA_NL_A_DEV_MAJOR (u32)
|
||||||
- major number of a device with the affected filesystem
|
- major number of a device with the affected filesystem
|
||||||
QUOTA_NL_A_DEV_MINOR (u32)
|
QUOTA_NL_A_DEV_MINOR (u32)
|
||||||
|
|
|
@ -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.
|
it possible to fit quite a lot of data to the flash.
|
||||||
|
|
||||||
Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.
|
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
|
journal and recovers from crashes, ensuring that the on-flash data
|
||||||
structures are consistent.
|
structures are consistent.
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
Kernel driver ibmaem
|
Kernel driver ibmaem
|
||||||
======================
|
======================
|
||||||
|
|
||||||
|
This driver talks to the IBM Systems Director Active Energy Manager, known
|
||||||
|
henceforth as AEM.
|
||||||
|
|
||||||
Supported systems:
|
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,
|
This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
|
||||||
x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface
|
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.
|
driver ("ipmi-si") needs to be loaded for this driver to do anything.
|
||||||
|
@ -14,24 +17,22 @@ Author: Darrick J. Wong
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
This driver implements sensor reading support for the energy and power
|
This driver implements sensor reading support for the energy and power meters
|
||||||
meters available on various IBM System X hardware through the BMC. All
|
available on various IBM System X hardware through the BMC. All sensor banks
|
||||||
sensor banks will be exported as platform devices; this driver can talk
|
will be exported as platform devices; this driver can talk to both v1 and v2
|
||||||
to both v1 and v2 interfaces. This driver is completely separate from the
|
interfaces. This driver is completely separate from the older ibmpex driver.
|
||||||
older ibmpex driver.
|
|
||||||
|
|
||||||
The v1 AEM interface has a simple set of features to monitor energy use.
|
The v1 AEM interface has a simple set of features to monitor energy use. There
|
||||||
There is a register that displays an estimate of raw energy consumption
|
is a register that displays an estimate of raw energy consumption since the
|
||||||
since the last BMC reset, and a power sensor that returns average power
|
last BMC reset, and a power sensor that returns average power use over a
|
||||||
use over a configurable interval.
|
configurable interval.
|
||||||
|
|
||||||
The v2 AEM interface is a bit more sophisticated, being able to present
|
The v2 AEM interface is a bit more sophisticated, being able to present a wider
|
||||||
a wider range of energy and power use registers, the power cap as
|
range of energy and power use registers, the power cap as set by the AEM
|
||||||
set by the AEM software, and temperature sensors.
|
software, and temperature sensors.
|
||||||
|
|
||||||
Special Features
|
Special Features
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
The "power_cap" value displays the current system power cap, as set by
|
The "power_cap" value displays the current system power cap, as set by the AEM
|
||||||
the Active Energy Manager software. Setting the power cap from the host
|
software. Setting the power cap from the host is not currently supported.
|
||||||
is not currently supported.
|
|
||||||
|
|
|
@ -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)
|
|
@ -105,7 +105,6 @@ Code Seq# Include File Comments
|
||||||
'T' all linux/soundcard.h conflict!
|
'T' all linux/soundcard.h conflict!
|
||||||
'T' all asm-i386/ioctls.h conflict!
|
'T' all asm-i386/ioctls.h conflict!
|
||||||
'U' 00-EF linux/drivers/usb/usb.h
|
'U' 00-EF linux/drivers/usb/usb.h
|
||||||
'U' F0-FF drivers/usb/auerswald.c
|
|
||||||
'V' all linux/vt.h
|
'V' all linux/vt.h
|
||||||
'W' 00-1F linux/watchdog.h conflict!
|
'W' 00-1F linux/watchdog.h conflict!
|
||||||
'W' 00-1F linux/wanrouter.h conflict!
|
'W' 00-1F linux/wanrouter.h conflict!
|
||||||
|
|
|
@ -1447,21 +1447,6 @@ static void configure_device(int fd, const char *tapif, u32 ipaddr)
|
||||||
err(1, "Bringing interface %s up", tapif);
|
err(1, "Bringing interface %s up", tapif);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void get_mac(int fd, const char *tapif, unsigned char hwaddr[6])
|
|
||||||
{
|
|
||||||
struct ifreq ifr;
|
|
||||||
|
|
||||||
memset(&ifr, 0, sizeof(ifr));
|
|
||||||
strcpy(ifr.ifr_name, tapif);
|
|
||||||
|
|
||||||
/* SIOC stands for Socket I/O Control. G means Get (vs S for Set
|
|
||||||
* above). IF means Interface, and HWADDR is hardware address.
|
|
||||||
* Simple! */
|
|
||||||
if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0)
|
|
||||||
err(1, "getting hw address for %s", tapif);
|
|
||||||
memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int get_tun_device(char tapif[IFNAMSIZ])
|
static int get_tun_device(char tapif[IFNAMSIZ])
|
||||||
{
|
{
|
||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
|
@ -1531,11 +1516,8 @@ static void setup_tun_net(char *arg)
|
||||||
p = strchr(arg, ':');
|
p = strchr(arg, ':');
|
||||||
if (p) {
|
if (p) {
|
||||||
str2mac(p+1, conf.mac);
|
str2mac(p+1, conf.mac);
|
||||||
|
add_feature(dev, VIRTIO_NET_F_MAC);
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
} else {
|
|
||||||
p = arg + strlen(arg);
|
|
||||||
/* None supplied; query the randomly assigned mac. */
|
|
||||||
get_mac(ipfd, tapif, conf.mac);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* arg is now either an IP address or a bridge name */
|
/* arg is now either an IP address or a bridge name */
|
||||||
|
@ -1547,13 +1529,10 @@ static void setup_tun_net(char *arg)
|
||||||
/* Set up the tun device. */
|
/* Set up the tun device. */
|
||||||
configure_device(ipfd, tapif, ip);
|
configure_device(ipfd, tapif, ip);
|
||||||
|
|
||||||
/* Tell Guest what MAC address to use. */
|
|
||||||
add_feature(dev, VIRTIO_NET_F_MAC);
|
|
||||||
add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
|
add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
|
||||||
/* Expect Guest to handle everything except UFO */
|
/* Expect Guest to handle everything except UFO */
|
||||||
add_feature(dev, VIRTIO_NET_F_CSUM);
|
add_feature(dev, VIRTIO_NET_F_CSUM);
|
||||||
add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);
|
add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);
|
||||||
add_feature(dev, VIRTIO_NET_F_MAC);
|
|
||||||
add_feature(dev, VIRTIO_NET_F_GUEST_TSO4);
|
add_feature(dev, VIRTIO_NET_F_GUEST_TSO4);
|
||||||
add_feature(dev, VIRTIO_NET_F_GUEST_TSO6);
|
add_feature(dev, VIRTIO_NET_F_GUEST_TSO6);
|
||||||
add_feature(dev, VIRTIO_NET_F_GUEST_ECN);
|
add_feature(dev, VIRTIO_NET_F_GUEST_ECN);
|
||||||
|
|
|
@ -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 := ifenslave
|
||||||
|
|
||||||
|
# Tell kbuild to always build the programs
|
||||||
|
always := $(hostprogs-y)
|
|
@ -1081,7 +1081,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ipaddr = ifr.ifr_addr.sa_data;
|
ipaddr = (unsigned char *)ifr.ifr_addr.sa_data;
|
||||||
v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n",
|
v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n",
|
||||||
slave_ifname, ifra[i].desc,
|
slave_ifname, ifra[i].desc,
|
||||||
ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
|
ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
|
||||||
|
|
|
@ -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 := crc32hash
|
||||||
|
|
||||||
|
# Tell kbuild to always build the programs
|
||||||
|
always := $(hostprogs-y)
|
||||||
|
|
||||||
|
HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include
|
|
@ -26,7 +26,7 @@ int main(int argc, char **argv) {
|
||||||
printf("no string passed as argument\n");
|
printf("no string passed as argument\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
result = crc32(argv[1], strlen(argv[1]));
|
result = crc32((unsigned char const *)argv[1], strlen(argv[1]));
|
||||||
printf("0x%x\n", result);
|
printf("0x%x\n", result);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1144,8 +1144,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
|
||||||
|
|
||||||
This module supports autoprobe and multiple cards.
|
This module supports autoprobe and multiple cards.
|
||||||
|
|
||||||
Power management is _not_ supported.
|
|
||||||
|
|
||||||
Module snd-ice1712
|
Module snd-ice1712
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
|
||||||
|
|
||||||
This module supports autoprobe and multiple cards.
|
This module supports autoprobe and multiple cards.
|
||||||
|
|
||||||
Power management is _not_ supported.
|
|
||||||
|
|
||||||
Module snd-pcsp
|
Module snd-pcsp
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
|
||||||
Module snd-virtuoso
|
Module snd-virtuoso
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
Module for sound cards based on the Asus AV200 chip, i.e.,
|
Module for sound cards based on the Asus AV100/AV200 chips,
|
||||||
Xonar D2 and Xonar D2X.
|
i.e., Xonar D1, DX, D2 and D2X.
|
||||||
|
|
||||||
This module supports autoprobe and multiple cards.
|
This module supports autoprobe and multiple cards.
|
||||||
|
|
||||||
Power management is _not_ supported.
|
|
||||||
|
|
||||||
Module snd-vx222
|
Module snd-vx222
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
||||||
|
obj- := dummy.o
|
||||||
|
|
||||||
|
# List of programs to build
|
||||||
|
hostprogs-y := spidev_test spidev_fdx
|
||||||
|
|
||||||
|
# Tell kbuild to always build the programs
|
||||||
|
always := $(hostprogs-y)
|
||||||
|
|
||||||
|
HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include
|
||||||
|
HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include
|
|
@ -1,30 +0,0 @@
|
||||||
Auerswald USB kernel driver
|
|
||||||
===========================
|
|
||||||
|
|
||||||
What is it? What can I do with it?
|
|
||||||
==================================
|
|
||||||
The auerswald USB kernel driver connects your linux 2.4.x
|
|
||||||
system to the auerswald usb-enabled devices.
|
|
||||||
|
|
||||||
There are two types of auerswald usb devices:
|
|
||||||
a) small PBX systems (ISDN)
|
|
||||||
b) COMfort system telephones (ISDN)
|
|
||||||
|
|
||||||
The driver installation creates the devices
|
|
||||||
/dev/usb/auer0..15. These devices carry a vendor-
|
|
||||||
specific protocol. You may run all auerswald java
|
|
||||||
software on it. The java software needs a native
|
|
||||||
library "libAuerUsbJNINative.so" installed on
|
|
||||||
your system. This library is available from
|
|
||||||
auerswald and shipped as part of the java software.
|
|
||||||
|
|
||||||
You may create the devices with:
|
|
||||||
mknod -m 666 /dev/usb/auer0 c 180 112
|
|
||||||
...
|
|
||||||
mknod -m 666 /dev/usb/auer15 c 180 127
|
|
||||||
|
|
||||||
Future plans
|
|
||||||
============
|
|
||||||
- Connection to ISDN4LINUX (the hisax interface)
|
|
||||||
|
|
||||||
The maintainer of this driver is wolfgang@iksw-muees.de
|
|
|
@ -436,7 +436,12 @@ post_reset; the USB core guarantees that this is true of internal
|
||||||
suspend/resume events as well.
|
suspend/resume events as well.
|
||||||
|
|
||||||
If a driver wants to block all suspend/resume calls during some
|
If a driver wants to block all suspend/resume calls during some
|
||||||
critical section, it can simply acquire udev->pm_mutex.
|
critical section, it can simply acquire udev->pm_mutex. Note that
|
||||||
|
calls to resume may be triggered indirectly. Block IO due to memory
|
||||||
|
allocations can make the vm subsystem resume a device. Thus while
|
||||||
|
holding this lock you must not allocate memory with GFP_KERNEL or
|
||||||
|
GFP_NOFS.
|
||||||
|
|
||||||
Alternatively, if the critical section might call some of the
|
Alternatively, if the critical section might call some of the
|
||||||
usb_autopm_* routines, the driver can avoid deadlock by doing:
|
usb_autopm_* routines, the driver can avoid deadlock by doing:
|
||||||
|
|
||||||
|
|
|
@ -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 := v4lgrab
|
||||||
|
|
||||||
|
# Tell kbuild to always build the programs
|
||||||
|
always := $(hostprogs-y)
|
|
@ -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 := slabinfo
|
||||||
|
|
||||||
|
# Tell kbuild to always build the programs
|
||||||
|
always := $(hostprogs-y)
|
|
@ -18,10 +18,11 @@ migrate_pages function call takes two sets of nodes and moves pages of a
|
||||||
process that are located on the from nodes to the destination nodes.
|
process that are located on the from nodes to the destination nodes.
|
||||||
Page migration functions are provided by the numactl package by Andi Kleen
|
Page migration functions are provided by the numactl package by Andi Kleen
|
||||||
(a version later than 0.9.3 is required. Get it from
|
(a version later than 0.9.3 is required. Get it from
|
||||||
ftp://ftp.suse.com/pub/people/ak). numactl provided libnuma which
|
ftp://oss.sgi.com/www/projects/libnuma/download/). numactl provides libnuma
|
||||||
provides an interface similar to other numa functionality for page migration.
|
which provides an interface similar to other numa functionality for page
|
||||||
cat /proc/<pid>/numa_maps allows an easy review of where the pages of
|
migration. cat /proc/<pid>/numa_maps allows an easy review of where the
|
||||||
a process are located. See also the numa_maps manpage in the numactl package.
|
pages of a process are located. See also the numa_maps documentation in the
|
||||||
|
proc(5) man page.
|
||||||
|
|
||||||
Manual migration is useful if for example the scheduler has relocated
|
Manual migration is useful if for example the scheduler has relocated
|
||||||
a process to a processor on a distant node. A batch scheduler or an
|
a process to a processor on a distant node. A batch scheduler or an
|
||||||
|
|
|
@ -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 := watchdog-simple watchdog-test
|
||||||
|
|
||||||
|
# Tell kbuild to always build the programs
|
||||||
|
always := $(hostprogs-y)
|
35
MAINTAINERS
35
MAINTAINERS
|
@ -175,12 +175,18 @@ M: bcrl@kvack.org
|
||||||
L: linux-aio@kvack.org
|
L: linux-aio@kvack.org
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
ABIT UGURU HARDWARE MONITOR DRIVER
|
ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
|
||||||
P: Hans de Goede
|
P: Hans de Goede
|
||||||
M: j.w.r.degoede@hhs.nl
|
M: j.w.r.degoede@hhs.nl
|
||||||
L: lm-sensors@lm-sensors.org
|
L: lm-sensors@lm-sensors.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
ABIT UGURU 3 HARDWARE MONITOR DRIVER
|
||||||
|
P: Alistair John Strachan
|
||||||
|
M: alistair@devzero.co.uk
|
||||||
|
L: lm-sensors@lm-sensors.org
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
ACENIC DRIVER
|
ACENIC DRIVER
|
||||||
P: Jes Sorensen
|
P: Jes Sorensen
|
||||||
M: jes@trained-monkey.org
|
M: jes@trained-monkey.org
|
||||||
|
@ -2462,7 +2468,7 @@ L: kernel-janitors@vger.kernel.org
|
||||||
W: http://www.kerneljanitors.org/
|
W: http://www.kerneljanitors.org/
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
KERNEL NFSD
|
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
|
||||||
P: J. Bruce Fields
|
P: J. Bruce Fields
|
||||||
M: bfields@fieldses.org
|
M: bfields@fieldses.org
|
||||||
P: Neil Brown
|
P: Neil Brown
|
||||||
|
@ -2928,6 +2934,12 @@ M: jirislaby@gmail.com
|
||||||
L: linux-kernel@vger.kernel.org
|
L: linux-kernel@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
|
||||||
|
P: Felipe Balbi
|
||||||
|
M: felipe.balbi@nokia.com
|
||||||
|
L: linux-usb@vger.kernel.org
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
|
MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
|
||||||
P: Andrew Gallatin
|
P: Andrew Gallatin
|
||||||
M: gallatin@myri.com
|
M: gallatin@myri.com
|
||||||
|
@ -3076,9 +3088,10 @@ M: horms@verge.net.au
|
||||||
P: Julian Anastasov
|
P: Julian Anastasov
|
||||||
M: ja@ssi.bg
|
M: ja@ssi.bg
|
||||||
L: netdev@vger.kernel.org
|
L: netdev@vger.kernel.org
|
||||||
|
L: lvs-devel@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
NFS CLIENT
|
NFS, SUNRPC, AND LOCKD CLIENTS
|
||||||
P: Trond Myklebust
|
P: Trond Myklebust
|
||||||
M: Trond.Myklebust@netapp.com
|
M: Trond.Myklebust@netapp.com
|
||||||
L: linux-nfs@vger.kernel.org
|
L: linux-nfs@vger.kernel.org
|
||||||
|
@ -3741,6 +3754,16 @@ L: linux-visws-devel@lists.sf.net
|
||||||
W: http://linux-visws.sf.net
|
W: http://linux-visws.sf.net
|
||||||
S: Maintained for 2.6.
|
S: Maintained for 2.6.
|
||||||
|
|
||||||
|
SGI GRU DRIVER
|
||||||
|
P: Jack Steiner
|
||||||
|
M: steiner@sgi.com
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
|
SGI XP/XPC/XPNET DRIVER
|
||||||
|
P: Dean Nelson
|
||||||
|
M: dcn@sgi.com
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
SIMTEC EB110ATX (Chalice CATS)
|
SIMTEC EB110ATX (Chalice CATS)
|
||||||
P: Ben Dooks
|
P: Ben Dooks
|
||||||
P: Vincent Sanders
|
P: Vincent Sanders
|
||||||
|
@ -4195,12 +4218,6 @@ M: oliver@neukum.name
|
||||||
L: linux-usb@vger.kernel.org
|
L: linux-usb@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
USB AUERSWALD DRIVER
|
|
||||||
P: Wolfgang Muees
|
|
||||||
M: wolfgang@iksw-muees.de
|
|
||||||
L: linux-usb@vger.kernel.org
|
|
||||||
S: Maintained
|
|
||||||
|
|
||||||
USB BLOCK DRIVER (UB ub)
|
USB BLOCK DRIVER (UB ub)
|
||||||
P: Pete Zaitcev
|
P: Pete Zaitcev
|
||||||
M: zaitcev@redhat.com
|
M: zaitcev@redhat.com
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -1,7 +1,7 @@
|
||||||
VERSION = 2
|
VERSION = 2
|
||||||
PATCHLEVEL = 6
|
PATCHLEVEL = 6
|
||||||
SUBLEVEL = 27
|
SUBLEVEL = 27
|
||||||
EXTRAVERSION = -rc2
|
EXTRAVERSION = -rc3
|
||||||
NAME = Rotary Wombat
|
NAME = Rotary Wombat
|
||||||
|
|
||||||
# *DOCUMENTATION*
|
# *DOCUMENTATION*
|
||||||
|
@ -821,6 +821,9 @@ ifdef CONFIG_HEADERS_CHECK
|
||||||
endif
|
endif
|
||||||
ifdef CONFIG_SAMPLES
|
ifdef CONFIG_SAMPLES
|
||||||
$(Q)$(MAKE) $(build)=samples
|
$(Q)$(MAKE) $(build)=samples
|
||||||
|
endif
|
||||||
|
ifdef CONFIG_BUILD_DOCSRC
|
||||||
|
$(Q)$(MAKE) $(build)=Documentation
|
||||||
endif
|
endif
|
||||||
$(call vmlinux-modpost)
|
$(call vmlinux-modpost)
|
||||||
$(call if_changed_rule,vmlinux__)
|
$(call if_changed_rule,vmlinux__)
|
||||||
|
@ -1166,7 +1169,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
|
||||||
#
|
#
|
||||||
clean: rm-dirs := $(CLEAN_DIRS)
|
clean: rm-dirs := $(CLEAN_DIRS)
|
||||||
clean: rm-files := $(CLEAN_FILES)
|
clean: rm-files := $(CLEAN_FILES)
|
||||||
clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs))
|
clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation)
|
||||||
|
|
||||||
PHONY += $(clean-dirs) clean archclean
|
PHONY += $(clean-dirs) clean archclean
|
||||||
$(clean-dirs):
|
$(clean-dirs):
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue