Skip to content

Commit 8ce7a9c

Browse files
author
James Bottomley
committed
Merge ../linux-2.6
2 parents d2afb3a + 01da5fd commit 8ce7a9c

File tree

867 files changed

+22109
-9013
lines changed

Some content is hidden

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

867 files changed

+22109
-9013
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ include/config
3030
include/linux/autoconf.h
3131
include/linux/compile.h
3232
include/linux/version.h
33+
include/linux/utsrelease.h
3334

3435
# stgit generated dirs
3536
patches-*
37+
38+
# quilt's files
39+
patches
40+
series

‎CREDITS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ S: (address available on request)
22092209
S: USA
22102210

22112211
N: Ian McDonald
2212-
E: iam4@cs.waikato.ac.nz
2212+
E: ian.mcdonald@jandi.co.nz
22132213
E: imcdnzl@gmail.com
22142214
W: http://wand.net.nz/~iam4
22152215
W: http://imcdnzl.blogspot.com

‎Documentation/DocBook/kernel-api.tmpl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
!Iinclude/linux/ktime.h
5959
!Iinclude/linux/hrtimer.h
6060
!Ekernel/hrtimer.c
61+
</sect1>
62+
<sect1><title>Workqueues and Kevents</title>
63+
!Ekernel/workqueue.c
6164
</sect1>
6265
<sect1><title>Internal Functions</title>
6366
!Ikernel/exit.c
@@ -300,7 +303,7 @@ X!Ekernel/module.c
300303
</sect1>
301304

302305
<sect1><title>Resources Management</title>
303-
!Ekernel/resource.c
306+
!Ikernel/resource.c
304307
</sect1>
305308

306309
<sect1><title>MTRR Handling</title>
@@ -312,9 +315,7 @@ X!Ekernel/module.c
312315
!Edrivers/pci/pci-driver.c
313316
!Edrivers/pci/remove.c
314317
!Edrivers/pci/pci-acpi.c
315-
<!-- kerneldoc does not understand __devinit
316-
X!Edrivers/pci/search.c
317-
-->
318+
!Edrivers/pci/search.c
318319
!Edrivers/pci/msi.c
319320
!Edrivers/pci/bus.c
320321
<!-- FIXME: Removed for now since no structured comments in source

‎Documentation/SubmittingPatches

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ kernel, the process can sometimes be daunting if you're not familiar
1010
with "the system." This text is a collection of suggestions which
1111
can greatly increase the chances of your change being accepted.
1212

13-
If you are submitting a driver, also read Documentation/SubmittingDrivers.
13+
Read Documentation/SubmitChecklist for a list of items to check
14+
before submitting code. If you are submitting a driver, also read
15+
Documentation/SubmittingDrivers.
1416

1517

1618

@@ -74,9 +76,6 @@ There are a number of scripts which can aid in this:
7476
Quilt:
7577
http://savannah.nongnu.org/projects/quilt
7678

77-
Randy Dunlap's patch scripts:
78-
http://www.xenotime.net/linux/scripts/patching-scripts-002.tar.gz
79-
8079
Andrew Morton's patch scripts:
8180
http://www.zip.com.au/~akpm/linux/patches/
8281
Instead of these scripts, quilt is the recommended patch management
@@ -484,7 +483,7 @@ Greg Kroah-Hartman "How to piss off a kernel subsystem maintainer".
484483
<http://www.kroah.com/log/2005/10/19/>
485484
<http://www.kroah.com/log/2006/01/11/>
486485

487-
NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!.
486+
NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
488487
<http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>
489488

490489
Kernel Documentation/CodingStyle
@@ -493,4 +492,3 @@ Kernel Documentation/CodingStyle
493492
Linus Torvald's mail on the canonical patch format:
494493
<http://lkml.org/lkml/2005/4/7/183>
495494
--
496-
Last updated on 17 Nov 2005.

‎Documentation/accounting/delay-accounting.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@ Compile the kernel with
6464
CONFIG_TASK_DELAY_ACCT=y
6565
CONFIG_TASKSTATS=y
6666

67-
Enable the accounting at boot time by adding
68-
the following to the kernel boot options
69-
delayacct
67+
Delay accounting is enabled by default at boot up.
68+
To disable, add
69+
nodelayacct
70+
to the kernel boot options. The rest of the instructions
71+
below assume this has not been done.
7072

71-
and after the system has booted up, use a utility
73+
After the system has booted up, use a utility
7274
similar to getdelays.c to access the delays
7375
seen by a given task or a task group (tgid).
7476
The utility also allows a given command to be

‎Documentation/connector/ucon.c

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
/*
2+
* ucon.c
3+
*
4+
* Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru>
5+
*
6+
*
7+
* This program is free software; you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License as published by
9+
* the Free Software Foundation; either version 2 of the License, or
10+
* (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Public License
18+
* along with this program; if not, write to the Free Software
19+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20+
*/
21+
22+
#include <asm/types.h>
23+
24+
#include <sys/types.h>
25+
#include <sys/socket.h>
26+
#include <sys/poll.h>
27+
28+
#include <linux/netlink.h>
29+
#include <linux/rtnetlink.h>
30+
31+
#include <arpa/inet.h>
32+
33+
#include <stdio.h>
34+
#include <stdlib.h>
35+
#include <unistd.h>
36+
#include <string.h>
37+
#include <errno.h>
38+
#include <time.h>
39+
40+
#include <linux/connector.h>
41+
42+
#define DEBUG
43+
#define NETLINK_CONNECTOR 11
44+
45+
#ifdef DEBUG
46+
#define ulog(f, a...) fprintf(stdout, f, ##a)
47+
#else
48+
#define ulog(f, a...) do {} while (0)
49+
#endif
50+
51+
static int need_exit;
52+
static __u32 seq;
53+
54+
static int netlink_send(int s, struct cn_msg *msg)
55+
{
56+
struct nlmsghdr *nlh;
57+
unsigned int size;
58+
int err;
59+
char buf[128];
60+
struct cn_msg *m;
61+
62+
size = NLMSG_SPACE(sizeof(struct cn_msg) + msg->len);
63+
64+
nlh = (struct nlmsghdr *)buf;
65+
nlh->nlmsg_seq = seq++;
66+
nlh->nlmsg_pid = getpid();
67+
nlh->nlmsg_type = NLMSG_DONE;
68+
nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
69+
nlh->nlmsg_flags = 0;
70+
71+
m = NLMSG_DATA(nlh);
72+
#if 0
73+
ulog("%s: [%08x.%08x] len=%u, seq=%u, ack=%u.\n",
74+
__func__, msg->id.idx, msg->id.val, msg->len, msg->seq, msg->ack);
75+
#endif
76+
memcpy(m, msg, sizeof(*m) + msg->len);
77+
78+
err = send(s, nlh, size, 0);
79+
if (err == -1)
80+
ulog("Failed to send: %s [%d].\n",
81+
strerror(errno), errno);
82+
83+
return err;
84+
}
85+
86+
int main(int argc, char *argv[])
87+
{
88+
int s;
89+
char buf[1024];
90+
int len;
91+
struct nlmsghdr *reply;
92+
struct sockaddr_nl l_local;
93+
struct cn_msg *data;
94+
FILE *out;
95+
time_t tm;
96+
struct pollfd pfd;
97+
98+
if (argc < 2)
99+
out = stdout;
100+
else {
101+
out = fopen(argv[1], "a+");
102+
if (!out) {
103+
ulog("Unable to open %s for writing: %s\n",
104+
argv[1], strerror(errno));
105+
out = stdout;
106+
}
107+
}
108+
109+
memset(buf, 0, sizeof(buf));
110+
111+
s = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
112+
if (s == -1) {
113+
perror("socket");
114+
return -1;
115+
}
116+
117+
l_local.nl_family = AF_NETLINK;
118+
l_local.nl_groups = 0x123; /* bitmask of requested groups */
119+
l_local.nl_pid = 0;
120+
121+
if (bind(s, (struct sockaddr *)&l_local, sizeof(struct sockaddr_nl)) == -1) {
122+
perror("bind");
123+
close(s);
124+
return -1;
125+
}
126+
127+
#if 0
128+
{
129+
int on = 0x57; /* Additional group number */
130+
setsockopt(s, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &on, sizeof(on));
131+
}
132+
#endif
133+
if (0) {
134+
int i, j;
135+
136+
memset(buf, 0, sizeof(buf));
137+
138+
data = (struct cn_msg *)buf;
139+
140+
data->id.idx = 0x123;
141+
data->id.val = 0x456;
142+
data->seq = seq++;
143+
data->ack = 0;
144+
data->len = 0;
145+
146+
for (j=0; j<10; ++j) {
147+
for (i=0; i<1000; ++i) {
148+
len = netlink_send(s, data);
149+
}
150+
151+
ulog("%d messages have been sent to %08x.%08x.\n", i, data->id.idx, data->id.val);
152+
}
153+
154+
return 0;
155+
}
156+
157+
158+
pfd.fd = s;
159+
160+
while (!need_exit) {
161+
pfd.events = POLLIN;
162+
pfd.revents = 0;
163+
switch (poll(&pfd, 1, -1)) {
164+
case 0:
165+
need_exit = 1;
166+
break;
167+
case -1:
168+
if (errno != EINTR) {
169+
need_exit = 1;
170+
break;
171+
}
172+
continue;
173+
}
174+
if (need_exit)
175+
break;
176+
177+
memset(buf, 0, sizeof(buf));
178+
len = recv(s, buf, sizeof(buf), 0);
179+
if (len == -1) {
180+
perror("recv buf");
181+
close(s);
182+
return -1;
183+
}
184+
reply = (struct nlmsghdr *)buf;
185+
186+
switch (reply->nlmsg_type) {
187+
case NLMSG_ERROR:
188+
fprintf(out, "Error message received.\n");
189+
fflush(out);
190+
break;
191+
case NLMSG_DONE:
192+
data = (struct cn_msg *)NLMSG_DATA(reply);
193+
194+
time(&tm);
195+
fprintf(out, "%.24s : [%x.%x] [%08u.%08u].\n",
196+
ctime(&tm), data->id.idx, data->id.val, data->seq, data->ack);
197+
fflush(out);
198+
break;
199+
default:
200+
break;
201+
}
202+
}
203+
204+
close(s);
205+
return 0;
206+
}

‎Documentation/cpu-freq/user-guide.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,13 @@ scaling_governor, and by "echoing" the name of another
153153
that some governors won't load - they only
154154
work on some specific architectures or
155155
processors.
156-
scaling_min_freq and
156+
scaling_min_freq and
157157
scaling_max_freq show the current "policy limits" (in
158158
kHz). By echoing new values into these
159159
files, you can change these limits.
160+
NOTE: when setting a policy you need to
161+
first set scaling_max_freq, then
162+
scaling_min_freq.
160163

161164

162165
If you have selected the "userspace" governor which allows you to

‎Documentation/cpu-hotplug.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,16 +251,24 @@ A: This is what you would need in your kernel code to receive notifications.
251251
return NOTIFY_OK;
252252
}
253253

254-
static struct notifier_block foobar_cpu_notifer =
254+
static struct notifier_block __cpuinitdata foobar_cpu_notifer =
255255
{
256256
.notifier_call = foobar_cpu_callback,
257257
};
258258

259+
You need to call register_cpu_notifier() from your init function.
260+
Init functions could be of two types:
261+
1. early init (init function called when only the boot processor is online).
262+
2. late init (init function called _after_ all the CPUs are online).
259263

260-
In your init function,
264+
For the first case, you should add the following to your init function
261265

262266
register_cpu_notifier(&foobar_cpu_notifier);
263267

268+
For the second case, you should add the following to your init function
269+
270+
register_hotcpu_notifier(&foobar_cpu_notifier);
271+
264272
You can fail PREPARE notifiers if something doesn't work to prepare resources.
265273
This will stop the activity and send a following CANCELED event back.
266274

‎Documentation/cpusets.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,12 @@ exclusive cpuset. Also, the use of a Linux virtual file system (vfs)
217217
to represent the cpuset hierarchy provides for a familiar permission
218218
and name space for cpusets, with a minimum of additional kernel code.
219219

220+
The cpus file in the root (top_cpuset) cpuset is read-only.
221+
It automatically tracks the value of cpu_online_map, using a CPU
222+
hotplug notifier. If and when memory nodes can be hotplugged,
223+
we expect to make the mems file in the root cpuset read-only
224+
as well, and have it track the value of node_online_map.
225+
220226

221227
1.4 What are exclusive cpusets ?
222228
--------------------------------

‎Documentation/devices.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,10 +2565,10 @@ Your cooperation is appreciated.
25652565
243 = /dev/usb/dabusb3 Fourth dabusb device
25662566

25672567
180 block USB block devices
2568-
0 = /dev/uba First USB block device
2569-
8 = /dev/ubb Second USB block device
2570-
16 = /dev/ubc Thrid USB block device
2571-
...
2568+
0 = /dev/uba First USB block device
2569+
8 = /dev/ubb Second USB block device
2570+
16 = /dev/ubc Third USB block device
2571+
...
25722572

25732573
181 char Conrad Electronic parallel port radio clocks
25742574
0 = /dev/pcfclock0 First Conrad radio clock

0 commit comments

Comments
 (0)