diff options
297 files changed, 8483 insertions, 5858 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index fc8e7c7d182f..e8fb24671967 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
@@ -271,8 +271,6 @@ netlabel/ | |||
271 | - directory with information on the NetLabel subsystem. | 271 | - directory with information on the NetLabel subsystem. |
272 | networking/ | 272 | networking/ |
273 | - directory with info on various aspects of networking with Linux. | 273 | - directory with info on various aspects of networking with Linux. |
274 | nfsroot.txt | ||
275 | - short guide on setting up a diskless box with NFS root filesystem. | ||
276 | nmi_watchdog.txt | 274 | nmi_watchdog.txt |
277 | - info on NMI watchdog for SMP systems. | 275 | - info on NMI watchdog for SMP systems. |
278 | nommu-mmap.txt | 276 | nommu-mmap.txt |
@@ -321,8 +319,6 @@ robust-futexes.txt | |||
321 | - a description of what robust futexes are. | 319 | - a description of what robust futexes are. |
322 | rocket.txt | 320 | rocket.txt |
323 | - info on the Comtrol RocketPort multiport serial driver. | 321 | - info on the Comtrol RocketPort multiport serial driver. |
324 | rpc-cache.txt | ||
325 | - introduction to the caching mechanisms in the sunrpc layer. | ||
326 | rt-mutex-design.txt | 322 | rt-mutex-design.txt |
327 | - description of the RealTime mutex implementation design. | 323 | - description of the RealTime mutex implementation design. |
328 | rt-mutex.txt | 324 | rt-mutex.txt |
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 47a539c7642d..1fc4e7144dce 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches | |||
@@ -328,7 +328,7 @@ now, but you can do this to mark internal company procedures or just | |||
328 | point out some special detail about the sign-off. | 328 | point out some special detail about the sign-off. |
329 | 329 | ||
330 | 330 | ||
331 | 13) When to use Acked-by: | 331 | 13) When to use Acked-by: and Cc: |
332 | 332 | ||
333 | The Signed-off-by: tag indicates that the signer was involved in the | 333 | The Signed-off-by: tag indicates that the signer was involved in the |
334 | development of the patch, or that he/she was in the patch's delivery path. | 334 | development of the patch, or that he/she was in the patch's delivery path. |
@@ -349,11 +349,59 @@ Acked-by: does not necessarily indicate acknowledgement of the entire patch. | |||
349 | For example, if a patch affects multiple subsystems and has an Acked-by: from | 349 | For example, if a patch affects multiple subsystems and has an Acked-by: from |
350 | one subsystem maintainer then this usually indicates acknowledgement of just | 350 | one subsystem maintainer then this usually indicates acknowledgement of just |
351 | the part which affects that maintainer's code. Judgement should be used here. | 351 | the part which affects that maintainer's code. Judgement should be used here. |
352 | When in doubt people should refer to the original discussion in the mailing | 352 | When in doubt people should refer to the original discussion in the mailing |
353 | list archives. | 353 | list archives. |
354 | 354 | ||
355 | If a person has had the opportunity to comment on a patch, but has not | ||
356 | provided such comments, you may optionally add a "Cc:" tag to the patch. | ||
357 | This is the only tag which might be added without an explicit action by the | ||
358 | person it names. This tag documents that potentially interested parties | ||
359 | have been included in the discussion | ||
355 | 360 | ||
356 | 14) The canonical patch format | 361 | |
362 | 14) Using Test-by: and Reviewed-by: | ||
363 | |||
364 | A Tested-by: tag indicates that the patch has been successfully tested (in | ||
365 | some environment) by the person named. This tag informs maintainers that | ||
366 | some testing has been performed, provides a means to locate testers for | ||
367 | future patches, and ensures credit for the testers. | ||
368 | |||
369 | Reviewed-by:, instead, indicates that the patch has been reviewed and found | ||
370 | acceptable according to the Reviewer's Statement: | ||
371 | |||
372 | Reviewer's statement of oversight | ||
373 | |||
374 | By offering my Reviewed-by: tag, I state that: | ||
375 | |||
376 | (a) I have carried out a technical review of this patch to | ||
377 | evaluate its appropriateness and readiness for inclusion into | ||
378 | the mainline kernel. | ||
379 | |||
380 | (b) Any problems, concerns, or questions relating to the patch | ||
381 | have been communicated back to the submitter. I am satisfied | ||
382 | with the submitter's response to my comments. | ||
383 | |||
384 | (c) While there may be things that could be improved with this | ||
385 | submission, I believe that it is, at this time, (1) a | ||
386 | worthwhile modification to the kernel, and (2) free of known | ||
387 | issues which would argue against its inclusion. | ||
388 | |||
389 | (d) While I have reviewed the patch and believe it to be sound, I | ||
390 | do not (unless explicitly stated elsewhere) make any | ||
391 | warranties or guarantees that it will achieve its stated | ||
392 | purpose or function properly in any given situation. | ||
393 | |||
394 | A Reviewed-by tag is a statement of opinion that the patch is an | ||
395 | appropriate modification of the kernel without any remaining serious | ||
396 | technical issues. Any interested reviewer (who has done the work) can | ||
397 | offer a Reviewed-by tag for a patch. This tag serves to give credit to | ||
398 | reviewers and to inform maintainers of the degree of review which has been | ||
399 | done on the patch. Reviewed-by: tags, when supplied by reviewers known to | ||
400 | understand the subject area and to perform thorough reviews, will normally | ||
401 | increase the liklihood of your patch getting into the kernel. | ||
402 | |||
403 | |||
404 | 15) The canonical patch format | ||
357 | 405 | ||
358 | The canonical patch subject line is: | 406 | The canonical patch subject line is: |
359 | 407 | ||
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index e68021c08fbd..52cd611277a3 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX | |||
@@ -66,6 +66,8 @@ mandatory-locking.txt | |||
66 | - info on the Linux implementation of Sys V mandatory file locking. | 66 | - info on the Linux implementation of Sys V mandatory file locking. |
67 | ncpfs.txt | 67 | ncpfs.txt |
68 | - info on Novell Netware(tm) filesystem using NCP protocol. | 68 | - info on Novell Netware(tm) filesystem using NCP protocol. |
69 | nfsroot.txt | ||
70 | - short guide on setting up a diskless box with NFS root filesystem. | ||
69 | ntfs.txt | 71 | ntfs.txt |
70 | - info and mount options for the NTFS filesystem (Windows NT). | 72 | - info and mount options for the NTFS filesystem (Windows NT). |
71 | ocfs2.txt | 73 | ocfs2.txt |
@@ -82,6 +84,10 @@ relay.txt | |||
82 | - info on relay, for efficient streaming from kernel to user space. | 84 | - info on relay, for efficient streaming from kernel to user space. |
83 | romfs.txt | 85 | romfs.txt |
84 | - description of the ROMFS filesystem. | 86 | - description of the ROMFS filesystem. |
87 | rpc-cache.txt | ||
88 | - introduction to the caching mechanisms in the sunrpc layer. | ||
89 | seq_file.txt | ||
90 | - how to use the seq_file API | ||
85 | sharedsubtree.txt | 91 | sharedsubtree.txt |
86 | - a description of shared subtrees for namespaces. | 92 | - a description of shared subtrees for namespaces. |
87 | smbfs.txt | 93 | smbfs.txt |
diff --git a/Documentation/nfsroot.txt b/Documentation/filesystems/nfsroot.txt index 31b329172343..31b329172343 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/filesystems/nfsroot.txt | |||
diff --git a/Documentation/rpc-cache.txt b/Documentation/filesystems/rpc-cache.txt index 8a382bea6808..8a382bea6808 100644 --- a/Documentation/rpc-cache.txt +++ b/Documentation/filesystems/rpc-cache.txt | |||
diff --git a/Documentation/filesystems/seq_file.txt b/Documentation/filesystems/seq_file.txt new file mode 100644 index 000000000000..cc6cdb95b73a --- /dev/null +++ b/Documentation/filesystems/seq_file.txt | |||
@@ -0,0 +1,283 @@ | |||
1 | The seq_file interface | ||
2 | |||
3 | Copyright 2003 Jonathan Corbet <corbet@lwn.net> | ||
4 | This file is originally from the LWN.net Driver Porting series at | ||
5 | http://lwn.net/Articles/driver-porting/ | ||
6 | |||
7 | |||
8 | There are numerous ways for a device driver (or other kernel component) to | ||
9 | provide information to the user or system administrator. One useful | ||
10 | technique is the creation of virtual files, in debugfs, /proc or elsewhere. | ||
11 | Virtual files can provide human-readable output that is easy to get at | ||
12 | without any special utility programs; they can also make life easier for | ||
13 | script writers. It is not surprising that the use of virtual files has | ||
14 | grown over the years. | ||
15 | |||
16 | Creating those files correctly has always been a bit of a challenge, | ||
17 | however. It is not that hard to make a virtual file which returns a | ||
18 | string. But life gets trickier if the output is long - anything greater | ||
19 | than an application is likely to read in a single operation. Handling | ||
20 | multiple reads (and seeks) requires careful attention to the reader's | ||
21 | position within the virtual file - that position is, likely as not, in the | ||
22 | middle of a line of output. The kernel has traditionally had a number of | ||
23 | implementations that got this wrong. | ||
24 | |||
25 | The 2.6 kernel contains a set of functions (implemented by Alexander Viro) | ||
26 | which are designed to make it easy for virtual file creators to get it | ||
27 | right. | ||
28 | |||
29 | The seq_file interface is available via <linux/seq_file.h>. There are | ||
30 | three aspects to seq_file: | ||
31 | |||
32 | * An iterator interface which lets a virtual file implementation | ||
33 | step through the objects it is presenting. | ||
34 | |||
35 | * Some utility functions for formatting objects for output without | ||
36 | needing to worry about things like output buffers. | ||
37 | |||
38 | * A set of canned file_operations which implement most operations on | ||
39 | the virtual file. | ||
40 | |||
41 | We'll look at the seq_file interface via an extremely simple example: a | ||
42 | loadable module which creates a file called /proc/sequence. The file, when | ||
43 | read, simply produces a set of increasing integer values, one per line. The | ||
44 | sequence will continue until the user loses patience and finds something | ||
45 | better to do. The file is seekable, in that one can do something like the | ||
46 | following: | ||
47 | |||
48 | dd if=/proc/sequence of=out1 count=1 | ||
49 | dd if=/proc/sequence skip=1 out=out2 count=1 | ||
50 | |||
51 | Then concatenate the output files out1 and out2 and get the right | ||
52 | result. Yes, it is a thoroughly useless module, but the point is to show | ||
53 | how the mechanism works without getting lost in other details. (Those | ||
54 | wanting to see the full source for this module can find it at | ||
55 | http://lwn.net/Articles/22359/). | ||
56 | |||
57 | |||
58 | The iterator interface | ||
59 | |||
60 | Modules implementing a virtual file with seq_file must implement a simple | ||
61 | iterator object that allows stepping through the data of interest. | ||
62 | Iterators must be able to move to a specific position - like the file they | ||
63 | implement - but the interpretation of that position is up to the iterator | ||
64 | itself. A seq_file implementation that is formatting firewall rules, for | ||
65 | example, could interpret position N as the Nth rule in the chain. | ||
66 | Positioning can thus be done in whatever way makes the most sense for the | ||
67 | generator of the data, which need not be aware of how a position translates | ||
68 | to an offset in the virtual file. The one obvious exception is that a | ||
69 | position of zero should indicate the beginning of the file. | ||
70 | |||
71 | The /proc/sequence iterator just uses the count of the next number it | ||
72 | will output as its position. | ||
73 | |||
74 | Four functions must be implemented to make the iterator work. The first, | ||
75 | called start() takes a position as an argument and returns an iterator | ||
76 | which will start reading at that position. For our simple sequence example, | ||
77 | the start() function looks like: | ||
78 | |||
79 | static void *ct_seq_start(struct seq_file *s, loff_t *pos) | ||
80 | { | ||
81 | loff_t *spos = kmalloc(sizeof(loff_t), GFP_KERNEL); | ||
82 | if (! spos) | ||
83 | return NULL; | ||
84 | *spos = *pos; | ||
85 | return spos; | ||
86 | } | ||
87 | |||
88 | The entire data structure for this iterator is a single loff_t value | ||
89 | holding the current position. There is no upper bound for the sequence | ||
90 | iterator, but that will not be the case for most other seq_file | ||
91 | implementations; in most cases the start() function should check for a | ||
92 | "past end of file" condition and return NULL if need be. | ||
93 | |||
94 | For more complicated applications, the private field of the seq_file | ||
95 | structure can be used. There is also a special value whch can be returned | ||
96 | by the start() function called SEQ_START_TOKEN; it can be used if you wish | ||
97 | to instruct your show() function (described below) to print a header at the | ||
98 | top of the output. SEQ_START_TOKEN should only be used if the offset is | ||
99 | zero, however. | ||
100 | |||
101 | The next function to implement is called, amazingly, next(); its job is to | ||
102 | move the iterator forward to the next position in the sequence. The | ||
103 | example module can simply increment the position by one; more useful | ||
104 | modules will do what is needed to step through some data structure. The | ||
105 | next() function returns a new iterator, or NULL if the sequence is | ||
106 | complete. Here's the example version: | ||
107 | |||
108 | static void *ct_seq_next(struct seq_file *s, void *v, loff_t *pos) | ||
109 | { | ||
110 | loff_t *spos = v; | ||
111 | *pos = ++*spos; | ||
112 | return spos; | ||
113 | } | ||
114 | |||
115 | The stop() function is called when iteration is complete; its job, of | ||
116 | course, is to clean up. If dynamic memory is allocated for the iterator, | ||
117 | stop() is the place to free it. | ||
118 | |||
119 | static void ct_seq_stop(struct seq_file *s, void *v) | ||
120 | { | ||
121 | kfree(v); | ||
122 | } | ||
123 | |||
124 | Finally, the show() function should format the object currently pointed to | ||
125 | by the iterator for output. It should return zero, or an error code if | ||
126 | something goes wrong. The example module's show() function is: | ||
127 | |||
128 | static int ct_seq_show(struct seq_file *s, void *v) | ||
129 | { | ||
130 | loff_t *spos = v; | ||
131 | seq_printf(s, "%lld\n", (long long)*spos); | ||
132 | return 0; | ||
133 | } | ||
134 | |||
135 | We will look at seq_printf() in a moment. But first, the definition of the | ||
136 | seq_file iterator is finished by creating a seq_operations structure with | ||
137 | the four functions we have just defined: | ||
138 | |||
139 | static const struct seq_operations ct_seq_ops = { | ||
140 | .start = ct_seq_start, | ||
141 | .next = ct_seq_next, | ||
142 | .stop = ct_seq_stop, | ||
143 | .show = ct_seq_show | ||
144 | }; | ||
145 | |||
146 | This structure will be needed to tie our iterator to the /proc file in | ||
147 | a little bit. | ||
148 | |||
149 | It's worth noting that the interator value returned by start() and | ||
150 | manipulated by the other functions is considered to be completely opaque by | ||
151 | the seq_file code. It can thus be anything that is useful in stepping | ||
152 | through the data to be output. Counters can be useful, but it could also be | ||
153 | a direct pointer into an array or linked list. Anything goes, as long as | ||
154 | the programmer is aware that things can happen between calls to the | ||
155 | iterator function. However, the seq_file code (by design) will not sleep | ||
156 | between the calls to start() and stop(), so holding a lock during that time | ||
157 | is a reasonable thing to do. The seq_file code will also avoid taking any | ||
158 | other locks while the iterator is active. | ||
159 | |||
160 | |||
161 | Formatted output | ||
162 | |||
163 | The seq_file code manages positioning within the output created by the | ||
164 | iterator and getting it into the user's buffer. But, for that to work, that | ||
165 | output must be passed to the seq_file code. Some utility functions have | ||
166 | been defined which make this task easy. | ||
167 | |||
168 | Most code will simply use seq_printf(), which works pretty much like | ||
169 | printk(), but which requires the seq_file pointer as an argument. It is | ||
170 | common to ignore the return value from seq_printf(), but a function | ||
171 | producing complicated output may want to check that value and quit if | ||
172 | something non-zero is returned; an error return means that the seq_file | ||
173 | buffer has been filled and further output will be discarded. | ||
174 | |||
175 | For straight character output, the following functions may be used: | ||
176 | |||
177 | int seq_putc(struct seq_file *m, char c); | ||
178 | int seq_puts(struct seq_file *m, const char *s); | ||
179 | int seq_escape(struct seq_file *m, const char *s, const char *esc); | ||
180 | |||
181 | The first two output a single character and a string, just like one would | ||
182 | expect. seq_escape() is like seq_puts(), except that any character in s | ||
183 | which is in the string esc will be represented in octal form in the output. | ||
184 | |||
185 | There is also a function for printing filenames: | ||
186 | |||
187 | int seq_path(struct seq_file *m, struct path *path, char *esc); | ||
188 | |||
189 | Here, path indicates the file of interest, and esc is a set of characters | ||
190 | which should be escaped in the output. | ||
191 | |||
192 | |||
193 | Making it all work | ||
194 | |||
195 | So far, we have a nice set of functions which can produce output within the | ||
196 | seq_file system, but we have not yet turned them into a file that a user | ||
197 | can see. Creating a file within the kernel requires, of course, the | ||
198 | creation of a set of file_operations which implement the operations on that | ||
199 | file. The seq_file interface provides a set of canned operations which do | ||
200 | most of the work. The virtual file author still must implement the open() | ||
201 | method, however, to hook everything up. The open function is often a single | ||
202 | line, as in the example module: | ||
203 | |||
204 | static int ct_open(struct inode *inode, struct file *file) | ||
205 | { | ||
206 | return seq_open(file, &ct_seq_ops); | ||
207 | } | ||
208 | |||
209 | Here, the call to seq_open() takes the seq_operations structure we created | ||
210 | before, and gets set up to iterate through the virtual file. | ||
211 | |||
212 | On a successful open, seq_open() stores the struct seq_file pointer in | ||
213 | file->private_data. If you have an application where the same iterator can | ||
214 | be used for more than one file, you can store an arbitrary pointer in the | ||
215 | private field of the seq_file structure; that value can then be retrieved | ||
216 | by the iterator functions. | ||
217 | |||
218 | The other operations of interest - read(), llseek(), and release() - are | ||
219 | all implemented by the seq_file code itself. So a virtual file's | ||
220 | file_operations structure will look like: | ||
221 | |||
222 | static const struct file_operations ct_file_ops = { | ||
223 | .owner = THIS_MODULE, | ||
224 | .open = ct_open, | ||
225 | .read = seq_read, | ||
226 | .llseek = seq_lseek, | ||
227 | .release = seq_release | ||
228 | }; | ||
229 | |||
230 | There is also a seq_release_private() which passes the contents of the | ||
231 | seq_file private field to kfree() before releasing the structure. | ||
232 | |||
233 | The final step is the creation of the /proc file itself. In the example | ||
234 | code, that is done in the initialization code in the usual way: | ||
235 | |||
236 | static int ct_init(void) | ||
237 | { | ||
238 | struct proc_dir_entry *entry; | ||
239 | |||
240 | entry = create_proc_entry("sequence", 0, NULL); | ||
241 | if (entry) | ||
242 | entry->proc_fops = &ct_file_ops; | ||
243 | return 0; | ||
244 | } | ||
245 | |||
246 | module_init(ct_init); | ||
247 | |||
248 | And that is pretty much it. | ||
249 | |||
250 | |||
251 | seq_list | ||
252 | |||
253 | If your file will be iterating through a linked list, you may find these | ||
254 | routines useful: | ||
255 | |||
256 | struct list_head *seq_list_start(struct list_head *head, | ||
257 | loff_t pos); | ||
258 | struct list_head *seq_list_start_head(struct list_head *head, | ||
259 | loff_t pos); | ||
260 | struct list_head *seq_list_next(void *v, struct list_head *head, | ||
261 | loff_t *ppos); | ||
262 | |||
263 | These helpers will interpret pos as a position within the list and iterate | ||
264 | accordingly. Your start() and next() functions need only invoke the | ||
265 | seq_list_* helpers with a pointer to the appropriate list_head structure. | ||
266 | |||
267 | |||
268 | The extra-simple version | ||
269 | |||
270 | For extremely simple virtual files, there is an even easier interface. A | ||
271 | module can define only the show() function, which should create all the | ||
272 | output that the virtual file will contain. The file's open() method then | ||
273 | calls: | ||
274 | |||
275 | int single_open(struct file *file, | ||
276 | int (*show)(struct seq_file *m, void *p), | ||
277 | void *data); | ||
278 | |||
279 | When output time comes, the show() function will be called once. The data | ||
280 | value given to single_open() can be found in the private field of the | ||
281 | seq_file structure. When using single_open(), the programmer should use | ||
282 | single_release() instead of seq_release() in the file_operations structure | ||
283 | to avoid a memory leak. | ||
diff --git a/Documentation/hrtimers/highres.txt b/Documentation/hrtimers/highres.txt index ce0e9a91e157..a73ecf5b4bdb 100644 --- a/Documentation/hrtimers/highres.txt +++ b/Documentation/hrtimers/highres.txt | |||
@@ -98,7 +98,7 @@ System-level global event devices are used for the Linux periodic tick. Per-CPU | |||
98 | event devices are used to provide local CPU functionality such as process | 98 | event devices are used to provide local CPU functionality such as process |
99 | accounting, profiling, and high resolution timers. | 99 | accounting, profiling, and high resolution timers. |
100 | 100 | ||
101 | The management layer assignes one or more of the folliwing functions to a clock | 101 | The management layer assigns one or more of the following functions to a clock |
102 | event device: | 102 | event device: |
103 | - system global periodic tick (jiffies update) | 103 | - system global periodic tick (jiffies update) |
104 | - cpu local update_process_times | 104 | - cpu local update_process_times |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4cd1a5da80a4..dafd001bf833 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -375,6 +375,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
375 | ccw_timeout_log [S390] | 375 | ccw_timeout_log [S390] |
376 | See Documentation/s390/CommonIO for details. | 376 | See Documentation/s390/CommonIO for details. |
377 | 377 | ||
378 | cgroup_disable= [KNL] Disable a particular controller | ||
379 | Format: {name of the controller(s) to disable} | ||
380 | {Currently supported controllers - "memory"} | ||
381 | |||
378 | checkreqprot [SELINUX] Set initial checkreqprot flag value. | 382 | checkreqprot [SELINUX] Set initial checkreqprot flag value. |
379 | Format: { "0" | "1" } | 383 | Format: { "0" | "1" } |
380 | See security/selinux/Kconfig help text. | 384 | See security/selinux/Kconfig help text. |
@@ -840,7 +844,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
840 | arch/alpha/kernel/core_marvel.c. | 844 | arch/alpha/kernel/core_marvel.c. |
841 | 845 | ||
842 | ip= [IP_PNP] | 846 | ip= [IP_PNP] |
843 | See Documentation/nfsroot.txt. | 847 | See Documentation/filesystems/nfsroot.txt. |
844 | 848 | ||
845 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards | 849 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards |
846 | See comment before ip2_setup() in | 850 | See comment before ip2_setup() in |
@@ -1194,10 +1198,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1194 | file if at all. | 1198 | file if at all. |
1195 | 1199 | ||
1196 | nfsaddrs= [NFS] | 1200 | nfsaddrs= [NFS] |
1197 | See Documentation/nfsroot.txt. | 1201 | See Documentation/filesystems/nfsroot.txt. |
1198 | 1202 | ||
1199 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. | 1203 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. |
1200 | See Documentation/nfsroot.txt. | 1204 | See Documentation/filesystems/nfsroot.txt. |
1201 | 1205 | ||
1202 | nfs.callback_tcpport= | 1206 | nfs.callback_tcpport= |
1203 | [NFS] set the TCP port on which the NFSv4 callback | 1207 | [NFS] set the TCP port on which the NFSv4 callback |
diff --git a/Documentation/scheduler/00-INDEX b/Documentation/scheduler/00-INDEX index b5f5ca069b2d..fc234d093fbf 100644 --- a/Documentation/scheduler/00-INDEX +++ b/Documentation/scheduler/00-INDEX | |||
@@ -12,5 +12,7 @@ sched-domains.txt | |||
12 | - information on scheduling domains. | 12 | - information on scheduling domains. |
13 | sched-nice-design.txt | 13 | sched-nice-design.txt |
14 | - How and why the scheduler's nice levels are implemented. | 14 | - How and why the scheduler's nice levels are implemented. |
15 | sched-rt-group.txt | ||
16 | - real-time group scheduling. | ||
15 | sched-stats.txt | 17 | sched-stats.txt |
16 | - information on schedstats (Linux Scheduler Statistics). | 18 | - information on schedstats (Linux Scheduler Statistics). |
diff --git a/Documentation/sched-rt-group.txt b/Documentation/scheduler/sched-rt-group.txt index 1c6332f4543c..1c6332f4543c 100644 --- a/Documentation/sched-rt-group.txt +++ b/Documentation/scheduler/sched-rt-group.txt | |||
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index 8861e47e5a2d..6d5f18143c50 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary | |||
@@ -116,6 +116,13 @@ low order bit. So when a chip's timing diagram shows the clock | |||
116 | starting low (CPOL=0) and data stabilized for sampling during the | 116 | starting low (CPOL=0) and data stabilized for sampling during the |
117 | trailing clock edge (CPHA=1), that's SPI mode 1. | 117 | trailing clock edge (CPHA=1), that's SPI mode 1. |
118 | 118 | ||
119 | Note that the clock mode is relevant as soon as the chipselect goes | ||
120 | active. So the master must set the clock to inactive before selecting | ||
121 | a slave, and the slave can tell the chosen polarity by sampling the | ||
122 | clock level when its select line goes active. That's why many devices | ||
123 | support for example both modes 0 and 3: they don't care about polarity, | ||
124 | and alway clock data in/out on rising clock edges. | ||
125 | |||
119 | 126 | ||
120 | How do these driver programming interfaces work? | 127 | How do these driver programming interfaces work? |
121 | ------------------------------------------------ | 128 | ------------------------------------------------ |
@@ -379,8 +386,14 @@ any more such messages. | |||
379 | + when bidirectional reads and writes start ... by how its | 386 | + when bidirectional reads and writes start ... by how its |
380 | sequence of spi_transfer requests is arranged; | 387 | sequence of spi_transfer requests is arranged; |
381 | 388 | ||
389 | + which I/O buffers are used ... each spi_transfer wraps a | ||
390 | buffer for each transfer direction, supporting full duplex | ||
391 | (two pointers, maybe the same one in both cases) and half | ||
392 | duplex (one pointer is NULL) transfers; | ||
393 | |||
382 | + optionally defining short delays after transfers ... using | 394 | + optionally defining short delays after transfers ... using |
383 | the spi_transfer.delay_usecs setting; | 395 | the spi_transfer.delay_usecs setting (this delay can be the |
396 | only protocol effect, if the buffer length is zero); | ||
384 | 397 | ||
385 | + whether the chipselect becomes inactive after a transfer and | 398 | + whether the chipselect becomes inactive after a transfer and |
386 | any delay ... by using the spi_transfer.cs_change flag; | 399 | any delay ... by using the spi_transfer.cs_change flag; |
diff --git a/Documentation/spinlocks.txt b/Documentation/spinlocks.txt index 471e75389778..619699dde593 100644 --- a/Documentation/spinlocks.txt +++ b/Documentation/spinlocks.txt | |||
@@ -5,6 +5,28 @@ Please use DEFINE_SPINLOCK()/DEFINE_RWLOCK() or | |||
5 | __SPIN_LOCK_UNLOCKED()/__RW_LOCK_UNLOCKED() as appropriate for static | 5 | __SPIN_LOCK_UNLOCKED()/__RW_LOCK_UNLOCKED() as appropriate for static |
6 | initialization. | 6 | initialization. |
7 | 7 | ||
8 | Most of the time, you can simply turn: | ||
9 | |||
10 | static spinlock_t xxx_lock = SPIN_LOCK_UNLOCKED; | ||
11 | |||
12 | into: | ||
13 | |||
14 | static DEFINE_SPINLOCK(xxx_lock); | ||
15 | |||
16 | Static structure member variables go from: | ||
17 | |||
18 | struct foo bar { | ||
19 | .lock = SPIN_LOCK_UNLOCKED; | ||
20 | }; | ||
21 | |||
22 | to: | ||
23 | |||
24 | struct foo bar { | ||
25 | .lock = __SPIN_LOCK_UNLOCKED(bar.lock); | ||
26 | }; | ||
27 | |||
28 | Declaration of static rw_locks undergo a similar transformation. | ||
29 | |||
8 | Dynamic initialization, when necessary, may be performed as | 30 | Dynamic initialization, when necessary, may be performed as |
9 | demonstrated below. | 31 | demonstrated below. |
10 | 32 | ||
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 25 | 3 | SUBLEVEL = 25 |
4 | EXTRAVERSION = -rc8 | 4 | EXTRAVERSION = -rc9 |
5 | NAME = Funky Weasel is Jiggy wit it | 5 | NAME = Funky Weasel is Jiggy wit it |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S index d3b9253d862a..bf35f33e48c9 100644 --- a/arch/frv/kernel/entry-table.S +++ b/arch/frv/kernel/entry-table.S | |||
@@ -316,8 +316,14 @@ __trap_fixup_kernel_data_tlb_miss: | |||
316 | .section .trap.vector | 316 | .section .trap.vector |
317 | .org TBR_TT_TRAP0 >> 2 | 317 | .org TBR_TT_TRAP0 >> 2 |
318 | .long system_call | 318 | .long system_call |
319 | .rept 126 | 319 | .rept 119 |
320 | .long __entry_unsupported_trap | 320 | .long __entry_unsupported_trap |
321 | .endr | 321 | .endr |
322 | |||
323 | # userspace atomic op emulation, traps 120-126 | ||
324 | .rept 7 | ||
325 | .long __entry_atomic_op | ||
326 | .endr | ||
327 | |||
322 | .org TBR_TT_BREAK >> 2 | 328 | .org TBR_TT_BREAK >> 2 |
323 | .long __entry_debug_exception | 329 | .long __entry_debug_exception |
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index f36d7f4a7c25..b8a4b94779b1 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S | |||
@@ -656,6 +656,26 @@ __entry_debug_exception: | |||
656 | 656 | ||
657 | ############################################################################### | 657 | ############################################################################### |
658 | # | 658 | # |
659 | # handle atomic operation emulation for userspace | ||
660 | # | ||
661 | ############################################################################### | ||
662 | .globl __entry_atomic_op | ||
663 | __entry_atomic_op: | ||
664 | LEDS 0x6012 | ||
665 | sethi.p %hi(atomic_operation),gr5 | ||
666 | setlo %lo(atomic_operation),gr5 | ||
667 | movsg esfr1,gr8 | ||
668 | movsg epcr0,gr9 | ||
669 | movsg esr0,gr10 | ||
670 | |||
671 | # now that we've accessed the exception regs, we can enable exceptions | ||
672 | movsg psr,gr4 | ||
673 | ori gr4,#PSR_ET,gr4 | ||
674 | movgs gr4,psr | ||
675 | jmpl @(gr5,gr0) ; call atomic_operation(esfr1,epcr0,esr0) | ||
676 | |||
677 | ############################################################################### | ||
678 | # | ||
659 | # handle media exception | 679 | # handle media exception |
660 | # | 680 | # |
661 | ############################################################################### | 681 | ############################################################################### |
diff --git a/arch/frv/kernel/head.inc b/arch/frv/kernel/head.inc index d424cd2eb213..bff66628b99a 100644 --- a/arch/frv/kernel/head.inc +++ b/arch/frv/kernel/head.inc | |||
@@ -46,5 +46,5 @@ | |||
46 | #ifdef CONFIG_MMU | 46 | #ifdef CONFIG_MMU |
47 | __sdram_base = 0x00000000 /* base address to which SDRAM relocated */ | 47 | __sdram_base = 0x00000000 /* base address to which SDRAM relocated */ |
48 | #else | 48 | #else |
49 | __sdram_base = 0xc0000000 /* base address to which SDRAM relocated */ | 49 | __sdram_base = __page_offset /* base address to which SDRAM relocated */ |
50 | #endif | 50 | #endif |
diff --git a/arch/frv/kernel/switch_to.S b/arch/frv/kernel/switch_to.S index b5275fa9cd0d..b06668670fcc 100644 --- a/arch/frv/kernel/switch_to.S +++ b/arch/frv/kernel/switch_to.S | |||
@@ -102,13 +102,6 @@ __switch_to: | |||
102 | movgs gr14,lr | 102 | movgs gr14,lr |
103 | bar | 103 | bar |
104 | 104 | ||
105 | srli gr15,#28,gr5 | ||
106 | subicc gr5,#0xc,gr0,icc0 | ||
107 | beq icc0,#0,111f | ||
108 | break | ||
109 | nop | ||
110 | 111: | ||
111 | |||
112 | # jump to __switch_back or ret_from_fork as appropriate | 105 | # jump to __switch_back or ret_from_fork as appropriate |
113 | # - move prev to GR8 | 106 | # - move prev to GR8 |
114 | movgs gr4,psr | 107 | movgs gr4,psr |
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c index 2e6098c85578..7089c2428b3f 100644 --- a/arch/frv/kernel/traps.c +++ b/arch/frv/kernel/traps.c | |||
@@ -73,7 +73,7 @@ asmlinkage void illegal_instruction(unsigned long esfr1, unsigned long epcr0, un | |||
73 | epcr0, esr0, esfr1); | 73 | epcr0, esr0, esfr1); |
74 | 74 | ||
75 | info.si_errno = 0; | 75 | info.si_errno = 0; |
76 | info.si_addr = (void *) ((epcr0 & EPCR0_PC) ? (epcr0 & EPCR0_PC) : __frame->pc); | 76 | info.si_addr = (void *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc); |
77 | 77 | ||
78 | switch (__frame->tbr & TBR_TT) { | 78 | switch (__frame->tbr & TBR_TT) { |
79 | case TBR_TT_ILLEGAL_INSTR: | 79 | case TBR_TT_ILLEGAL_INSTR: |
@@ -102,6 +102,233 @@ asmlinkage void illegal_instruction(unsigned long esfr1, unsigned long epcr0, un | |||
102 | 102 | ||
103 | /*****************************************************************************/ | 103 | /*****************************************************************************/ |
104 | /* | 104 | /* |
105 | * handle atomic operations with errors | ||
106 | * - arguments in gr8, gr9, gr10 | ||
107 | * - original memory value placed in gr5 | ||
108 | * - replacement memory value placed in gr9 | ||
109 | */ | ||
110 | asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0, | ||
111 | unsigned long esr0) | ||
112 | { | ||
113 | static DEFINE_SPINLOCK(atomic_op_lock); | ||
114 | unsigned long x, y, z, *p; | ||
115 | mm_segment_t oldfs; | ||
116 | siginfo_t info; | ||
117 | int ret; | ||
118 | |||
119 | y = 0; | ||
120 | z = 0; | ||
121 | |||
122 | oldfs = get_fs(); | ||
123 | if (!user_mode(__frame)) | ||
124 | set_fs(KERNEL_DS); | ||
125 | |||
126 | switch (__frame->tbr & TBR_TT) { | ||
127 | /* TIRA gr0,#120 | ||
128 | * u32 __atomic_user_cmpxchg32(u32 *ptr, u32 test, u32 new) | ||
129 | */ | ||
130 | case TBR_TT_ATOMIC_CMPXCHG32: | ||
131 | p = (unsigned long *) __frame->gr8; | ||
132 | x = __frame->gr9; | ||
133 | y = __frame->gr10; | ||
134 | |||
135 | for (;;) { | ||
136 | ret = get_user(z, p); | ||
137 | if (ret < 0) | ||
138 | goto error; | ||
139 | |||
140 | if (z != x) | ||
141 | goto done; | ||
142 | |||
143 | spin_lock_irq(&atomic_op_lock); | ||
144 | |||
145 | if (__get_user(z, p) == 0) { | ||
146 | if (z != x) | ||
147 | goto done2; | ||
148 | |||
149 | if (__put_user(y, p) == 0) | ||
150 | goto done2; | ||
151 | goto error2; | ||
152 | } | ||
153 | |||
154 | spin_unlock_irq(&atomic_op_lock); | ||
155 | } | ||
156 | |||
157 | /* TIRA gr0,#121 | ||
158 | * u32 __atomic_kernel_xchg32(void *v, u32 new) | ||
159 | */ | ||
160 | case TBR_TT_ATOMIC_XCHG32: | ||
161 | p = (unsigned long *) __frame->gr8; | ||
162 | y = __frame->gr9; | ||
163 | |||
164 | for (;;) { | ||
165 | ret = get_user(z, p); | ||
166 | if (ret < 0) | ||
167 | goto error; | ||
168 | |||
169 | spin_lock_irq(&atomic_op_lock); | ||
170 | |||
171 | if (__get_user(z, p) == 0) { | ||
172 | if (__put_user(y, p) == 0) | ||
173 | goto done2; | ||
174 | goto error2; | ||
175 | } | ||
176 | |||
177 | spin_unlock_irq(&atomic_op_lock); | ||
178 | } | ||
179 | |||
180 | /* TIRA gr0,#122 | ||
181 | * ulong __atomic_kernel_XOR_return(ulong i, ulong *v) | ||
182 | */ | ||
183 | case TBR_TT_ATOMIC_XOR: | ||
184 | p = (unsigned long *) __frame->gr8; | ||
185 | x = __frame->gr9; | ||
186 | |||
187 | for (;;) { | ||
188 | ret = get_user(z, p); | ||
189 | if (ret < 0) | ||
190 | goto error; | ||
191 | |||
192 | spin_lock_irq(&atomic_op_lock); | ||
193 | |||
194 | if (__get_user(z, p) == 0) { | ||
195 | y = x ^ z; | ||
196 | if (__put_user(y, p) == 0) | ||
197 | goto done2; | ||
198 | goto error2; | ||
199 | } | ||
200 | |||
201 | spin_unlock_irq(&atomic_op_lock); | ||
202 | } | ||
203 | |||
204 | /* TIRA gr0,#123 | ||
205 | * ulong __atomic_kernel_OR_return(ulong i, ulong *v) | ||
206 | */ | ||
207 | case TBR_TT_ATOMIC_OR: | ||
208 | p = (unsigned long *) __frame->gr8; | ||
209 | x = __frame->gr9; | ||
210 | |||
211 | for (;;) { | ||
212 | ret = get_user(z, p); | ||
213 | if (ret < 0) | ||
214 | goto error; | ||
215 | |||
216 | spin_lock_irq(&atomic_op_lock); | ||
217 | |||
218 | if (__get_user(z, p) == 0) { | ||
219 | y = x ^ z; | ||
220 | if (__put_user(y, p) == 0) | ||
221 | goto done2; | ||
222 | goto error2; | ||
223 | } | ||
224 | |||
225 | spin_unlock_irq(&atomic_op_lock); | ||
226 | } | ||
227 | |||
228 | /* TIRA gr0,#124 | ||
229 | * ulong __atomic_kernel_AND_return(ulong i, ulong *v) | ||
230 | */ | ||
231 | case TBR_TT_ATOMIC_AND: | ||
232 | p = (unsigned long *) __frame->gr8; | ||
233 | x = __frame->gr9; | ||
234 | |||
235 | for (;;) { | ||
236 | ret = get_user(z, p); | ||
237 | if (ret < 0) | ||
238 | goto error; | ||
239 | |||
240 | spin_lock_irq(&atomic_op_lock); | ||
241 | |||
242 | if (__get_user(z, p) == 0) { | ||
243 | y = x & z; | ||
244 | if (__put_user(y, p) == 0) | ||
245 | goto done2; | ||
246 | goto error2; | ||
247 | } | ||
248 | |||
249 | spin_unlock_irq(&atomic_op_lock); | ||
250 | } | ||
251 | |||
252 | /* TIRA gr0,#125 | ||
253 | * int __atomic_user_sub_return(atomic_t *v, int i) | ||
254 | */ | ||
255 | case TBR_TT_ATOMIC_SUB: | ||
256 | p = (unsigned long *) __frame->gr8; | ||
257 | x = __frame->gr9; | ||
258 | |||
259 | for (;;) { | ||
260 | ret = get_user(z, p); | ||
261 | if (ret < 0) | ||
262 | goto error; | ||
263 | |||
264 | spin_lock_irq(&atomic_op_lock); | ||
265 | |||
266 | if (__get_user(z, p) == 0) { | ||
267 | y = z - x; | ||
268 | if (__put_user(y, p) == 0) | ||
269 | goto done2; | ||
270 | goto error2; | ||
271 | } | ||
272 | |||
273 | spin_unlock_irq(&atomic_op_lock); | ||
274 | } | ||
275 | |||
276 | /* TIRA gr0,#126 | ||
277 | * int __atomic_user_add_return(atomic_t *v, int i) | ||
278 | */ | ||
279 | case TBR_TT_ATOMIC_ADD: | ||
280 | p = (unsigned long *) __frame->gr8; | ||
281 | x = __frame->gr9; | ||
282 | |||
283 | for (;;) { | ||
284 | ret = get_user(z, p); | ||
285 | if (ret < 0) | ||
286 | goto error; | ||
287 | |||
288 | spin_lock_irq(&atomic_op_lock); | ||
289 | |||
290 | if (__get_user(z, p) == 0) { | ||
291 | y = z + x; | ||
292 | if (__put_user(y, p) == 0) | ||
293 | goto done2; | ||
294 | goto error2; | ||
295 | } | ||
296 | |||
297 | spin_unlock_irq(&atomic_op_lock); | ||
298 | } | ||
299 | |||
300 | default: | ||
301 | BUG(); | ||
302 | } | ||
303 | |||
304 | done2: | ||
305 | spin_unlock_irq(&atomic_op_lock); | ||
306 | done: | ||
307 | if (!user_mode(__frame)) | ||
308 | set_fs(oldfs); | ||
309 | __frame->gr5 = z; | ||
310 | __frame->gr9 = y; | ||
311 | return; | ||
312 | |||
313 | error2: | ||
314 | spin_unlock_irq(&atomic_op_lock); | ||
315 | error: | ||
316 | if (!user_mode(__frame)) | ||
317 | set_fs(oldfs); | ||
318 | __frame->pc -= 4; | ||
319 | |||
320 | die_if_kernel("-- Atomic Op Error --\n"); | ||
321 | |||
322 | info.si_signo = SIGSEGV; | ||
323 | info.si_code = SEGV_ACCERR; | ||
324 | info.si_errno = 0; | ||
325 | info.si_addr = (void *) __frame->pc; | ||
326 | |||
327 | force_sig_info(info.si_signo, &info, current); | ||
328 | } | ||
329 | |||
330 | /*****************************************************************************/ | ||
331 | /* | ||
105 | * | 332 | * |
106 | */ | 333 | */ |
107 | asmlinkage void media_exception(unsigned long msr0, unsigned long msr1) | 334 | asmlinkage void media_exception(unsigned long msr0, unsigned long msr1) |
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 2cba605cb59d..b15173f28a23 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile | |||
@@ -13,6 +13,8 @@ | |||
13 | # Copyright (C) 1994 by Hamish Macdonald | 13 | # Copyright (C) 1994 by Hamish Macdonald |
14 | # | 14 | # |
15 | 15 | ||
16 | KBUILD_DEFCONFIG := amiga_defconfig | ||
17 | |||
16 | # override top level makefile | 18 | # override top level makefile |
17 | AS += -m68020 | 19 | AS += -m68020 |
18 | LDFLAGS := -m m68kelf | 20 | LDFLAGS := -m m68kelf |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 5649fbae430e..e41958371367 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:23 2005 | 4 | # Wed Apr 2 20:46:06 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-amiga" | 27 | CONFIG_LOCALVERSION="-amiga" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -80,10 +128,24 @@ CONFIG_M68030=y | |||
80 | CONFIG_M68040=y | 128 | CONFIG_M68040=y |
81 | CONFIG_M68060=y | 129 | CONFIG_M68060=y |
82 | CONFIG_MMU_MOTOROLA=y | 130 | CONFIG_MMU_MOTOROLA=y |
83 | CONFIG_M68KFPU_EMU=y | 131 | # CONFIG_M68KFPU_EMU is not set |
84 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
85 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
86 | # CONFIG_ADVANCED is not set | 132 | # CONFIG_ADVANCED is not set |
133 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
134 | CONFIG_NODES_SHIFT=3 | ||
135 | CONFIG_SELECT_MEMORY_MODEL=y | ||
136 | # CONFIG_FLATMEM_MANUAL is not set | ||
137 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
138 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
139 | CONFIG_DISCONTIGMEM=y | ||
140 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
141 | CONFIG_NEED_MULTIPLE_NODES=y | ||
142 | # CONFIG_SPARSEMEM_STATIC is not set | ||
143 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
145 | # CONFIG_RESOURCES_64BIT is not set | ||
146 | CONFIG_ZONE_DMA_FLAG=1 | ||
147 | CONFIG_BOUNCE=y | ||
148 | CONFIG_VIRT_TO_BUS=y | ||
87 | 149 | ||
88 | # | 150 | # |
89 | # General setup | 151 | # General setup |
@@ -97,47 +159,288 @@ CONFIG_AMIGA_PCMCIA=y | |||
97 | CONFIG_PROC_HARDWARE=y | 159 | CONFIG_PROC_HARDWARE=y |
98 | CONFIG_ISA=y | 160 | CONFIG_ISA=y |
99 | CONFIG_GENERIC_ISA_DMA=y | 161 | CONFIG_GENERIC_ISA_DMA=y |
162 | CONFIG_ZONE_DMA=y | ||
163 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
100 | CONFIG_ZORRO_NAMES=y | 164 | CONFIG_ZORRO_NAMES=y |
101 | 165 | ||
102 | # | 166 | # |
103 | # Device Drivers | 167 | # Networking |
104 | # | 168 | # |
169 | CONFIG_NET=y | ||
105 | 170 | ||
106 | # | 171 | # |
107 | # Generic Driver Options | 172 | # Networking options |
108 | # | 173 | # |
109 | CONFIG_STANDALONE=y | 174 | CONFIG_PACKET=y |
110 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 175 | # CONFIG_PACKET_MMAP is not set |
111 | CONFIG_FW_LOADER=m | 176 | CONFIG_UNIX=y |
112 | # CONFIG_DEBUG_DRIVER is not set | 177 | CONFIG_XFRM=y |
178 | # CONFIG_XFRM_USER is not set | ||
179 | # CONFIG_XFRM_SUB_POLICY is not set | ||
180 | CONFIG_XFRM_MIGRATE=y | ||
181 | # CONFIG_XFRM_STATISTICS is not set | ||
182 | CONFIG_NET_KEY=y | ||
183 | CONFIG_NET_KEY_MIGRATE=y | ||
184 | CONFIG_INET=y | ||
185 | # CONFIG_IP_MULTICAST is not set | ||
186 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
187 | CONFIG_IP_FIB_HASH=y | ||
188 | # CONFIG_IP_PNP is not set | ||
189 | CONFIG_NET_IPIP=m | ||
190 | CONFIG_NET_IPGRE=m | ||
191 | # CONFIG_ARPD is not set | ||
192 | CONFIG_SYN_COOKIES=y | ||
193 | CONFIG_INET_AH=m | ||
194 | CONFIG_INET_ESP=m | ||
195 | CONFIG_INET_IPCOMP=m | ||
196 | CONFIG_INET_XFRM_TUNNEL=m | ||
197 | CONFIG_INET_TUNNEL=m | ||
198 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | ||
199 | CONFIG_INET_XFRM_MODE_TUNNEL=m | ||
200 | CONFIG_INET_XFRM_MODE_BEET=m | ||
201 | CONFIG_INET_LRO=m | ||
202 | CONFIG_INET_DIAG=m | ||
203 | CONFIG_INET_TCP_DIAG=m | ||
204 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
205 | CONFIG_TCP_CONG_CUBIC=y | ||
206 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
207 | # CONFIG_TCP_MD5SIG is not set | ||
208 | # CONFIG_IP_VS is not set | ||
209 | CONFIG_IPV6=m | ||
210 | CONFIG_IPV6_PRIVACY=y | ||
211 | CONFIG_IPV6_ROUTER_PREF=y | ||
212 | CONFIG_IPV6_ROUTE_INFO=y | ||
213 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
214 | CONFIG_INET6_AH=m | ||
215 | CONFIG_INET6_ESP=m | ||
216 | CONFIG_INET6_IPCOMP=m | ||
217 | # CONFIG_IPV6_MIP6 is not set | ||
218 | CONFIG_INET6_XFRM_TUNNEL=m | ||
219 | CONFIG_INET6_TUNNEL=m | ||
220 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
221 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
222 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
223 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
224 | CONFIG_IPV6_SIT=m | ||
225 | CONFIG_IPV6_TUNNEL=m | ||
226 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
227 | # CONFIG_NETWORK_SECMARK is not set | ||
228 | CONFIG_NETFILTER=y | ||
229 | # CONFIG_NETFILTER_DEBUG is not set | ||
230 | CONFIG_NETFILTER_ADVANCED=y | ||
231 | |||
232 | # | ||
233 | # Core Netfilter Configuration | ||
234 | # | ||
235 | CONFIG_NETFILTER_NETLINK=m | ||
236 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
237 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
238 | CONFIG_NF_CONNTRACK=m | ||
239 | CONFIG_NF_CT_ACCT=y | ||
240 | CONFIG_NF_CONNTRACK_MARK=y | ||
241 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
242 | CONFIG_NF_CT_PROTO_GRE=m | ||
243 | CONFIG_NF_CT_PROTO_SCTP=m | ||
244 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
245 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
246 | CONFIG_NF_CONNTRACK_FTP=m | ||
247 | CONFIG_NF_CONNTRACK_H323=m | ||
248 | CONFIG_NF_CONNTRACK_IRC=m | ||
249 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
250 | CONFIG_NF_CONNTRACK_PPTP=m | ||
251 | CONFIG_NF_CONNTRACK_SANE=m | ||
252 | CONFIG_NF_CONNTRACK_SIP=m | ||
253 | CONFIG_NF_CONNTRACK_TFTP=m | ||
254 | # CONFIG_NF_CT_NETLINK is not set | ||
255 | CONFIG_NETFILTER_XTABLES=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
265 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
266 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
295 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
113 | 296 | ||
114 | # | 297 | # |
115 | # Memory Technology Devices (MTD) | 298 | # IP: Netfilter Configuration |
116 | # | 299 | # |
117 | # CONFIG_MTD is not set | 300 | CONFIG_NF_CONNTRACK_IPV4=m |
301 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
302 | CONFIG_IP_NF_QUEUE=m | ||
303 | CONFIG_IP_NF_IPTABLES=m | ||
304 | CONFIG_IP_NF_MATCH_RECENT=m | ||
305 | CONFIG_IP_NF_MATCH_ECN=m | ||
306 | CONFIG_IP_NF_MATCH_AH=m | ||
307 | CONFIG_IP_NF_MATCH_TTL=m | ||
308 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
309 | CONFIG_IP_NF_FILTER=m | ||
310 | CONFIG_IP_NF_TARGET_REJECT=m | ||
311 | CONFIG_IP_NF_TARGET_LOG=m | ||
312 | CONFIG_IP_NF_TARGET_ULOG=m | ||
313 | CONFIG_NF_NAT=m | ||
314 | CONFIG_NF_NAT_NEEDED=y | ||
315 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
316 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
317 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
318 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
319 | CONFIG_NF_NAT_PROTO_GRE=m | ||
320 | CONFIG_NF_NAT_FTP=m | ||
321 | CONFIG_NF_NAT_IRC=m | ||
322 | CONFIG_NF_NAT_TFTP=m | ||
323 | CONFIG_NF_NAT_AMANDA=m | ||
324 | CONFIG_NF_NAT_PPTP=m | ||
325 | CONFIG_NF_NAT_H323=m | ||
326 | CONFIG_NF_NAT_SIP=m | ||
327 | CONFIG_IP_NF_MANGLE=m | ||
328 | CONFIG_IP_NF_TARGET_ECN=m | ||
329 | CONFIG_IP_NF_TARGET_TTL=m | ||
330 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
331 | CONFIG_IP_NF_RAW=m | ||
332 | CONFIG_IP_NF_ARPTABLES=m | ||
333 | CONFIG_IP_NF_ARPFILTER=m | ||
334 | CONFIG_IP_NF_ARP_MANGLE=m | ||
335 | |||
336 | # | ||
337 | # IPv6: Netfilter Configuration | ||
338 | # | ||
339 | CONFIG_NF_CONNTRACK_IPV6=m | ||
340 | CONFIG_IP6_NF_QUEUE=m | ||
341 | CONFIG_IP6_NF_IPTABLES=m | ||
342 | CONFIG_IP6_NF_MATCH_RT=m | ||
343 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
344 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
345 | CONFIG_IP6_NF_MATCH_HL=m | ||
346 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
347 | CONFIG_IP6_NF_MATCH_AH=m | ||
348 | CONFIG_IP6_NF_MATCH_MH=m | ||
349 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
350 | CONFIG_IP6_NF_FILTER=m | ||
351 | CONFIG_IP6_NF_TARGET_LOG=m | ||
352 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
353 | CONFIG_IP6_NF_MANGLE=m | ||
354 | CONFIG_IP6_NF_TARGET_HL=m | ||
355 | CONFIG_IP6_NF_RAW=m | ||
356 | CONFIG_IP_DCCP=m | ||
357 | CONFIG_INET_DCCP_DIAG=m | ||
358 | CONFIG_IP_DCCP_ACKVEC=y | ||
359 | |||
360 | # | ||
361 | # DCCP CCIDs Configuration (EXPERIMENTAL) | ||
362 | # | ||
363 | CONFIG_IP_DCCP_CCID2=m | ||
364 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
365 | CONFIG_IP_DCCP_CCID3=m | ||
366 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
367 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
368 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
369 | CONFIG_IP_SCTP=m | ||
370 | # CONFIG_SCTP_DBG_MSG is not set | ||
371 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
372 | # CONFIG_SCTP_HMAC_NONE is not set | ||
373 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
374 | CONFIG_SCTP_HMAC_MD5=y | ||
375 | # CONFIG_TIPC is not set | ||
376 | # CONFIG_ATM is not set | ||
377 | # CONFIG_BRIDGE is not set | ||
378 | # CONFIG_VLAN_8021Q is not set | ||
379 | # CONFIG_DECNET is not set | ||
380 | CONFIG_LLC=m | ||
381 | # CONFIG_LLC2 is not set | ||
382 | # CONFIG_IPX is not set | ||
383 | CONFIG_ATALK=m | ||
384 | # CONFIG_DEV_APPLETALK is not set | ||
385 | # CONFIG_X25 is not set | ||
386 | # CONFIG_LAPB is not set | ||
387 | # CONFIG_ECONET is not set | ||
388 | # CONFIG_WAN_ROUTER is not set | ||
389 | # CONFIG_NET_SCHED is not set | ||
390 | CONFIG_NET_CLS_ROUTE=y | ||
118 | 391 | ||
119 | # | 392 | # |
120 | # Parallel port support | 393 | # Network testing |
121 | # | 394 | # |
395 | # CONFIG_NET_PKTGEN is not set | ||
396 | # CONFIG_HAMRADIO is not set | ||
397 | # CONFIG_CAN is not set | ||
398 | # CONFIG_IRDA is not set | ||
399 | # CONFIG_BT is not set | ||
400 | # CONFIG_AF_RXRPC is not set | ||
401 | |||
402 | # | ||
403 | # Wireless | ||
404 | # | ||
405 | # CONFIG_CFG80211 is not set | ||
406 | CONFIG_WIRELESS_EXT=y | ||
407 | # CONFIG_MAC80211 is not set | ||
408 | CONFIG_IEEE80211=m | ||
409 | # CONFIG_IEEE80211_DEBUG is not set | ||
410 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
411 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
412 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
413 | CONFIG_IEEE80211_SOFTMAC=m | ||
414 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
415 | # CONFIG_RFKILL is not set | ||
416 | # CONFIG_NET_9P is not set | ||
417 | |||
418 | # | ||
419 | # Device Drivers | ||
420 | # | ||
421 | |||
422 | # | ||
423 | # Generic Driver Options | ||
424 | # | ||
425 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
426 | CONFIG_STANDALONE=y | ||
427 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
428 | CONFIG_FW_LOADER=m | ||
429 | # CONFIG_SYS_HYPERVISOR is not set | ||
430 | CONFIG_CONNECTOR=m | ||
431 | # CONFIG_MTD is not set | ||
122 | CONFIG_PARPORT=m | 432 | CONFIG_PARPORT=m |
123 | # CONFIG_PARPORT_PC is not set | 433 | # CONFIG_PARPORT_PC is not set |
124 | CONFIG_PARPORT_NOT_PC=y | ||
125 | CONFIG_PARPORT_AMIGA=m | 434 | CONFIG_PARPORT_AMIGA=m |
126 | CONFIG_PARPORT_MFC3=m | 435 | CONFIG_PARPORT_MFC3=m |
127 | # CONFIG_PARPORT_GSC is not set | 436 | # CONFIG_PARPORT_GSC is not set |
437 | # CONFIG_PARPORT_AX88796 is not set | ||
128 | CONFIG_PARPORT_1284=y | 438 | CONFIG_PARPORT_1284=y |
129 | 439 | CONFIG_PARPORT_NOT_PC=y | |
130 | # | ||
131 | # Plug and Play support | ||
132 | # | ||
133 | # CONFIG_PNP is not set | 440 | # CONFIG_PNP is not set |
134 | 441 | CONFIG_BLK_DEV=y | |
135 | # | ||
136 | # Block devices | ||
137 | # | ||
138 | CONFIG_AMIGA_FLOPPY=y | 442 | CONFIG_AMIGA_FLOPPY=y |
139 | CONFIG_AMIGA_Z2RAM=y | 443 | CONFIG_AMIGA_Z2RAM=y |
140 | # CONFIG_PARIDE is not set | ||
141 | # CONFIG_BLK_DEV_COW_COMMON is not set | 444 | # CONFIG_BLK_DEV_COW_COMMON is not set |
142 | CONFIG_BLK_DEV_LOOP=y | 445 | CONFIG_BLK_DEV_LOOP=y |
143 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 446 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
@@ -145,56 +448,66 @@ CONFIG_BLK_DEV_NBD=m | |||
145 | CONFIG_BLK_DEV_RAM=y | 448 | CONFIG_BLK_DEV_RAM=y |
146 | CONFIG_BLK_DEV_RAM_COUNT=16 | 449 | CONFIG_BLK_DEV_RAM_COUNT=16 |
147 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 450 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
148 | CONFIG_BLK_DEV_INITRD=y | 451 | # CONFIG_BLK_DEV_XIP is not set |
149 | CONFIG_INITRAMFS_SOURCE="" | ||
150 | CONFIG_CDROM_PKTCDVD=m | 452 | CONFIG_CDROM_PKTCDVD=m |
151 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 453 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
152 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 454 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
153 | |||
154 | # | ||
155 | # IO Schedulers | ||
156 | # | ||
157 | CONFIG_IOSCHED_NOOP=y | ||
158 | CONFIG_IOSCHED_AS=y | ||
159 | CONFIG_IOSCHED_DEADLINE=y | ||
160 | CONFIG_IOSCHED_CFQ=y | ||
161 | CONFIG_ATA_OVER_ETH=m | 455 | CONFIG_ATA_OVER_ETH=m |
162 | 456 | CONFIG_MISC_DEVICES=y | |
163 | # | 457 | # CONFIG_EEPROM_93CX6 is not set |
164 | # ATA/ATAPI/MFM/RLL support | 458 | # CONFIG_ENCLOSURE_SERVICES is not set |
165 | # | 459 | CONFIG_HAVE_IDE=y |
166 | CONFIG_IDE=y | 460 | CONFIG_IDE=y |
167 | CONFIG_BLK_DEV_IDE=y | 461 | CONFIG_BLK_DEV_IDE=y |
168 | 462 | ||
169 | # | 463 | # |
170 | # Please see Documentation/ide.txt for help/info on IDE drives | 464 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
171 | # | 465 | # |
172 | # CONFIG_BLK_DEV_IDE_SATA is not set | 466 | # CONFIG_BLK_DEV_IDE_SATA is not set |
173 | CONFIG_BLK_DEV_IDEDISK=y | 467 | CONFIG_BLK_DEV_IDEDISK=y |
174 | # CONFIG_IDEDISK_MULTI_MODE is not set | 468 | # CONFIG_IDEDISK_MULTI_MODE is not set |
175 | CONFIG_BLK_DEV_IDECD=y | 469 | CONFIG_BLK_DEV_IDECD=y |
176 | CONFIG_BLK_DEV_IDETAPE=m | 470 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
471 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
177 | CONFIG_BLK_DEV_IDEFLOPPY=m | 472 | CONFIG_BLK_DEV_IDEFLOPPY=m |
178 | # CONFIG_BLK_DEV_IDESCSI is not set | 473 | # CONFIG_BLK_DEV_IDESCSI is not set |
179 | # CONFIG_IDE_TASK_IOCTL is not set | 474 | # CONFIG_IDE_TASK_IOCTL is not set |
475 | CONFIG_IDE_PROC_FS=y | ||
180 | 476 | ||
181 | # | 477 | # |
182 | # IDE chipset support/bugfixes | 478 | # IDE chipset support/bugfixes |
183 | # | 479 | # |
184 | CONFIG_IDE_GENERIC=y | 480 | # CONFIG_IDE_GENERIC is not set |
185 | # CONFIG_IDE_ARM is not set | 481 | # CONFIG_BLK_DEV_PLATFORM is not set |
186 | CONFIG_BLK_DEV_GAYLE=y | 482 | CONFIG_BLK_DEV_GAYLE=y |
187 | CONFIG_BLK_DEV_IDEDOUBLER=y | 483 | CONFIG_BLK_DEV_IDEDOUBLER=y |
188 | CONFIG_BLK_DEV_BUDDHA=y | 484 | CONFIG_BLK_DEV_BUDDHA=y |
189 | # CONFIG_IDE_CHIPSETS is not set | 485 | |
486 | # | ||
487 | # Other IDE chipsets support | ||
488 | # | ||
489 | |||
490 | # | ||
491 | # Note: most of these also require special kernel boot parameters | ||
492 | # | ||
493 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
494 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
495 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
496 | # CONFIG_BLK_DEV_HT6560B is not set | ||
497 | # CONFIG_BLK_DEV_QD65XX is not set | ||
498 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
190 | # CONFIG_BLK_DEV_IDEDMA is not set | 499 | # CONFIG_BLK_DEV_IDEDMA is not set |
191 | # CONFIG_IDEDMA_AUTO is not set | 500 | # CONFIG_IDE_ARCH_OBSOLETE_INIT is not set |
192 | # CONFIG_BLK_DEV_HD is not set | 501 | # CONFIG_BLK_DEV_HD is not set |
193 | 502 | ||
194 | # | 503 | # |
195 | # SCSI device support | 504 | # SCSI device support |
196 | # | 505 | # |
506 | CONFIG_RAID_ATTRS=m | ||
197 | CONFIG_SCSI=y | 507 | CONFIG_SCSI=y |
508 | CONFIG_SCSI_DMA=y | ||
509 | CONFIG_SCSI_TGT=m | ||
510 | # CONFIG_SCSI_NETLINK is not set | ||
198 | CONFIG_SCSI_PROC_FS=y | 511 | CONFIG_SCSI_PROC_FS=y |
199 | 512 | ||
200 | # | 513 | # |
@@ -206,6 +519,7 @@ CONFIG_CHR_DEV_OSST=m | |||
206 | CONFIG_BLK_DEV_SR=y | 519 | CONFIG_BLK_DEV_SR=y |
207 | CONFIG_BLK_DEV_SR_VENDOR=y | 520 | CONFIG_BLK_DEV_SR_VENDOR=y |
208 | CONFIG_CHR_DEV_SG=m | 521 | CONFIG_CHR_DEV_SG=m |
522 | # CONFIG_CHR_DEV_SCH is not set | ||
209 | 523 | ||
210 | # | 524 | # |
211 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 525 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
@@ -213,30 +527,34 @@ CONFIG_CHR_DEV_SG=m | |||
213 | # CONFIG_SCSI_MULTI_LUN is not set | 527 | # CONFIG_SCSI_MULTI_LUN is not set |
214 | CONFIG_SCSI_CONSTANTS=y | 528 | CONFIG_SCSI_CONSTANTS=y |
215 | # CONFIG_SCSI_LOGGING is not set | 529 | # CONFIG_SCSI_LOGGING is not set |
530 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
531 | CONFIG_SCSI_WAIT_SCAN=m | ||
216 | 532 | ||
217 | # | 533 | # |
218 | # SCSI Transport Attributes | 534 | # SCSI Transports |
219 | # | 535 | # |
220 | # CONFIG_SCSI_SPI_ATTRS is not set | 536 | CONFIG_SCSI_SPI_ATTRS=y |
221 | # CONFIG_SCSI_FC_ATTRS is not set | 537 | # CONFIG_SCSI_FC_ATTRS is not set |
222 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 538 | CONFIG_SCSI_ISCSI_ATTRS=m |
223 | 539 | CONFIG_SCSI_SAS_ATTRS=m | |
224 | # | 540 | CONFIG_SCSI_SAS_LIBSAS=m |
225 | # SCSI low-level drivers | 541 | CONFIG_SCSI_SAS_HOST_SMP=y |
226 | # | 542 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
543 | CONFIG_SCSI_SRP_ATTRS=m | ||
544 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
545 | CONFIG_SCSI_LOWLEVEL=y | ||
546 | CONFIG_ISCSI_TCP=m | ||
227 | # CONFIG_SCSI_AHA152X is not set | 547 | # CONFIG_SCSI_AHA152X is not set |
228 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 548 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
549 | # CONFIG_SCSI_ADVANSYS is not set | ||
229 | # CONFIG_SCSI_IN2000 is not set | 550 | # CONFIG_SCSI_IN2000 is not set |
230 | # CONFIG_SCSI_SATA is not set | ||
231 | # CONFIG_SCSI_DTC3280 is not set | 551 | # CONFIG_SCSI_DTC3280 is not set |
232 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 552 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
233 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | 553 | # CONFIG_SCSI_GENERIC_NCR5380 is not set |
234 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set | 554 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set |
235 | # CONFIG_SCSI_PPA is not set | ||
236 | # CONFIG_SCSI_IMM is not set | ||
237 | # CONFIG_SCSI_NCR53C406A is not set | 555 | # CONFIG_SCSI_NCR53C406A is not set |
556 | CONFIG_53C700_BE_BUS=y | ||
238 | # CONFIG_SCSI_PAS16 is not set | 557 | # CONFIG_SCSI_PAS16 is not set |
239 | # CONFIG_SCSI_PSI240I is not set | ||
240 | # CONFIG_SCSI_QLOGIC_FAS is not set | 558 | # CONFIG_SCSI_QLOGIC_FAS is not set |
241 | # CONFIG_SCSI_SYM53C416 is not set | 559 | # CONFIG_SCSI_SYM53C416 is not set |
242 | # CONFIG_SCSI_T128 is not set | 560 | # CONFIG_SCSI_T128 is not set |
@@ -244,243 +562,42 @@ CONFIG_SCSI_CONSTANTS=y | |||
244 | CONFIG_A3000_SCSI=y | 562 | CONFIG_A3000_SCSI=y |
245 | CONFIG_A2091_SCSI=y | 563 | CONFIG_A2091_SCSI=y |
246 | CONFIG_GVP11_SCSI=y | 564 | CONFIG_GVP11_SCSI=y |
247 | CONFIG_CYBERSTORM_SCSI=y | 565 | CONFIG_SCSI_A4000T=y |
248 | CONFIG_CYBERSTORMII_SCSI=y | 566 | CONFIG_SCSI_ZORRO7XX=y |
249 | CONFIG_BLZ2060_SCSI=y | ||
250 | CONFIG_BLZ1230_SCSI=y | ||
251 | CONFIG_FASTLANE_SCSI=y | ||
252 | CONFIG_OKTAGON_SCSI=y | ||
253 | |||
254 | # | ||
255 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
256 | # | ||
257 | # CONFIG_CD_NO_IDESCSI is not set | ||
258 | |||
259 | # | ||
260 | # Multi-device support (RAID and LVM) | ||
261 | # | ||
262 | CONFIG_MD=y | 567 | CONFIG_MD=y |
263 | CONFIG_BLK_DEV_MD=m | 568 | CONFIG_BLK_DEV_MD=m |
264 | CONFIG_MD_LINEAR=m | 569 | CONFIG_MD_LINEAR=m |
265 | CONFIG_MD_RAID0=m | 570 | CONFIG_MD_RAID0=m |
266 | CONFIG_MD_RAID1=m | 571 | CONFIG_MD_RAID1=m |
267 | # CONFIG_MD_RAID10 is not set | 572 | # CONFIG_MD_RAID10 is not set |
268 | CONFIG_MD_RAID5=m | 573 | CONFIG_MD_RAID456=m |
269 | CONFIG_MD_RAID6=m | 574 | CONFIG_MD_RAID5_RESHAPE=y |
270 | CONFIG_MD_MULTIPATH=m | 575 | CONFIG_MD_MULTIPATH=m |
271 | # CONFIG_MD_FAULTY is not set | 576 | # CONFIG_MD_FAULTY is not set |
272 | CONFIG_BLK_DEV_DM=m | 577 | CONFIG_BLK_DEV_DM=m |
578 | # CONFIG_DM_DEBUG is not set | ||
273 | CONFIG_DM_CRYPT=m | 579 | CONFIG_DM_CRYPT=m |
274 | CONFIG_DM_SNAPSHOT=m | 580 | CONFIG_DM_SNAPSHOT=m |
275 | CONFIG_DM_MIRROR=m | 581 | CONFIG_DM_MIRROR=m |
276 | CONFIG_DM_ZERO=m | 582 | CONFIG_DM_ZERO=m |
277 | CONFIG_DM_MULTIPATH=m | 583 | CONFIG_DM_MULTIPATH=m |
278 | CONFIG_DM_MULTIPATH_EMC=m | 584 | CONFIG_DM_MULTIPATH_EMC=m |
279 | 585 | CONFIG_DM_MULTIPATH_RDAC=m | |
280 | # | 586 | CONFIG_DM_MULTIPATH_HP=m |
281 | # Fusion MPT device support | 587 | # CONFIG_DM_DELAY is not set |
282 | # | 588 | CONFIG_DM_UEVENT=y |
283 | |||
284 | # | ||
285 | # IEEE 1394 (FireWire) support | ||
286 | # | ||
287 | |||
288 | # | ||
289 | # I2O device support | ||
290 | # | ||
291 | |||
292 | # | ||
293 | # Networking support | ||
294 | # | ||
295 | CONFIG_NET=y | ||
296 | |||
297 | # | ||
298 | # Networking options | ||
299 | # | ||
300 | CONFIG_PACKET=y | ||
301 | # CONFIG_PACKET_MMAP is not set | ||
302 | CONFIG_UNIX=y | ||
303 | CONFIG_NET_KEY=y | ||
304 | CONFIG_INET=y | ||
305 | # CONFIG_IP_MULTICAST is not set | ||
306 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
307 | # CONFIG_IP_PNP is not set | ||
308 | CONFIG_NET_IPIP=m | ||
309 | CONFIG_NET_IPGRE=m | ||
310 | # CONFIG_ARPD is not set | ||
311 | CONFIG_SYN_COOKIES=y | ||
312 | CONFIG_INET_AH=m | ||
313 | CONFIG_INET_ESP=m | ||
314 | CONFIG_INET_IPCOMP=m | ||
315 | CONFIG_INET_TUNNEL=m | ||
316 | CONFIG_IP_TCPDIAG=m | ||
317 | CONFIG_IP_TCPDIAG_IPV6=y | ||
318 | |||
319 | # | ||
320 | # IP: Virtual Server Configuration | ||
321 | # | ||
322 | # CONFIG_IP_VS is not set | ||
323 | CONFIG_IPV6=m | ||
324 | CONFIG_IPV6_PRIVACY=y | ||
325 | CONFIG_INET6_AH=m | ||
326 | CONFIG_INET6_ESP=m | ||
327 | CONFIG_INET6_IPCOMP=m | ||
328 | CONFIG_INET6_TUNNEL=m | ||
329 | CONFIG_IPV6_TUNNEL=m | ||
330 | CONFIG_NETFILTER=y | ||
331 | # CONFIG_NETFILTER_DEBUG is not set | ||
332 | |||
333 | # | ||
334 | # IP: Netfilter Configuration | ||
335 | # | ||
336 | CONFIG_IP_NF_CONNTRACK=m | ||
337 | # CONFIG_IP_NF_CT_ACCT is not set | ||
338 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
339 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
340 | CONFIG_IP_NF_FTP=m | ||
341 | CONFIG_IP_NF_IRC=m | ||
342 | CONFIG_IP_NF_TFTP=m | ||
343 | CONFIG_IP_NF_AMANDA=m | ||
344 | CONFIG_IP_NF_QUEUE=m | ||
345 | CONFIG_IP_NF_IPTABLES=m | ||
346 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
347 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
348 | CONFIG_IP_NF_MATCH_MAC=m | ||
349 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
350 | CONFIG_IP_NF_MATCH_MARK=m | ||
351 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
352 | CONFIG_IP_NF_MATCH_TOS=m | ||
353 | CONFIG_IP_NF_MATCH_RECENT=m | ||
354 | CONFIG_IP_NF_MATCH_ECN=m | ||
355 | CONFIG_IP_NF_MATCH_DSCP=m | ||
356 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
357 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
358 | CONFIG_IP_NF_MATCH_TTL=m | ||
359 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
360 | CONFIG_IP_NF_MATCH_HELPER=m | ||
361 | CONFIG_IP_NF_MATCH_STATE=m | ||
362 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
363 | CONFIG_IP_NF_MATCH_OWNER=m | ||
364 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
365 | CONFIG_IP_NF_MATCH_REALM=m | ||
366 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
367 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
368 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
369 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
370 | CONFIG_IP_NF_FILTER=m | ||
371 | CONFIG_IP_NF_TARGET_REJECT=m | ||
372 | CONFIG_IP_NF_TARGET_LOG=m | ||
373 | CONFIG_IP_NF_TARGET_ULOG=m | ||
374 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
375 | CONFIG_IP_NF_NAT=m | ||
376 | CONFIG_IP_NF_NAT_NEEDED=y | ||
377 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
378 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
379 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
380 | CONFIG_IP_NF_TARGET_SAME=m | ||
381 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | ||
382 | CONFIG_IP_NF_NAT_IRC=m | ||
383 | CONFIG_IP_NF_NAT_FTP=m | ||
384 | CONFIG_IP_NF_NAT_TFTP=m | ||
385 | CONFIG_IP_NF_NAT_AMANDA=m | ||
386 | CONFIG_IP_NF_MANGLE=m | ||
387 | CONFIG_IP_NF_TARGET_TOS=m | ||
388 | CONFIG_IP_NF_TARGET_ECN=m | ||
389 | CONFIG_IP_NF_TARGET_DSCP=m | ||
390 | CONFIG_IP_NF_TARGET_MARK=m | ||
391 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
392 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
393 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
394 | CONFIG_IP_NF_RAW=m | ||
395 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
396 | CONFIG_IP_NF_ARPTABLES=m | ||
397 | CONFIG_IP_NF_ARPFILTER=m | ||
398 | CONFIG_IP_NF_ARP_MANGLE=m | ||
399 | |||
400 | # | ||
401 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | ||
402 | # | ||
403 | CONFIG_IP6_NF_QUEUE=m | ||
404 | CONFIG_IP6_NF_IPTABLES=m | ||
405 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
406 | CONFIG_IP6_NF_MATCH_MAC=m | ||
407 | CONFIG_IP6_NF_MATCH_RT=m | ||
408 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
409 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
410 | CONFIG_IP6_NF_MATCH_HL=m | ||
411 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
412 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
413 | CONFIG_IP6_NF_MATCH_MARK=m | ||
414 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
415 | CONFIG_IP6_NF_MATCH_AHESP=m | ||
416 | CONFIG_IP6_NF_MATCH_LENGTH=m | ||
417 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
418 | CONFIG_IP6_NF_FILTER=m | ||
419 | CONFIG_IP6_NF_TARGET_LOG=m | ||
420 | CONFIG_IP6_NF_MANGLE=m | ||
421 | CONFIG_IP6_NF_TARGET_MARK=m | ||
422 | CONFIG_IP6_NF_RAW=m | ||
423 | CONFIG_XFRM=y | ||
424 | CONFIG_XFRM_USER=m | ||
425 | |||
426 | # | ||
427 | # SCTP Configuration (EXPERIMENTAL) | ||
428 | # | ||
429 | CONFIG_IP_SCTP=m | ||
430 | # CONFIG_SCTP_DBG_MSG is not set | ||
431 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
432 | # CONFIG_SCTP_HMAC_NONE is not set | ||
433 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
434 | CONFIG_SCTP_HMAC_MD5=y | ||
435 | # CONFIG_ATM is not set | ||
436 | # CONFIG_BRIDGE is not set | ||
437 | # CONFIG_VLAN_8021Q is not set | ||
438 | # CONFIG_DECNET is not set | ||
439 | CONFIG_LLC=m | ||
440 | # CONFIG_LLC2 is not set | ||
441 | CONFIG_IPX=m | ||
442 | # CONFIG_IPX_INTERN is not set | ||
443 | CONFIG_ATALK=m | ||
444 | # CONFIG_DEV_APPLETALK is not set | ||
445 | # CONFIG_X25 is not set | ||
446 | # CONFIG_LAPB is not set | ||
447 | # CONFIG_NET_DIVERT is not set | ||
448 | # CONFIG_ECONET is not set | ||
449 | # CONFIG_WAN_ROUTER is not set | ||
450 | |||
451 | # | ||
452 | # QoS and/or fair queueing | ||
453 | # | ||
454 | # CONFIG_NET_SCHED is not set | ||
455 | CONFIG_NET_CLS_ROUTE=y | ||
456 | |||
457 | # | ||
458 | # Network testing | ||
459 | # | ||
460 | # CONFIG_NET_PKTGEN is not set | ||
461 | CONFIG_NETPOLL=y | ||
462 | # CONFIG_NETPOLL_RX is not set | ||
463 | # CONFIG_NETPOLL_TRAP is not set | ||
464 | CONFIG_NET_POLL_CONTROLLER=y | ||
465 | # CONFIG_HAMRADIO is not set | ||
466 | # CONFIG_IRDA is not set | ||
467 | # CONFIG_BT is not set | ||
468 | CONFIG_NETDEVICES=y | 589 | CONFIG_NETDEVICES=y |
590 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
469 | CONFIG_DUMMY=m | 591 | CONFIG_DUMMY=m |
470 | # CONFIG_BONDING is not set | 592 | # CONFIG_BONDING is not set |
593 | CONFIG_MACVLAN=m | ||
471 | CONFIG_EQUALIZER=m | 594 | CONFIG_EQUALIZER=m |
472 | # CONFIG_TUN is not set | 595 | # CONFIG_TUN is not set |
473 | 596 | CONFIG_VETH=m | |
474 | # | ||
475 | # ARCnet devices | ||
476 | # | ||
477 | # CONFIG_ARCNET is not set | 597 | # CONFIG_ARCNET is not set |
478 | 598 | # CONFIG_PHYLIB is not set | |
479 | # | ||
480 | # Ethernet (10 or 100Mbit) | ||
481 | # | ||
482 | CONFIG_NET_ETHERNET=y | 599 | CONFIG_NET_ETHERNET=y |
483 | CONFIG_MII=m | 600 | # CONFIG_MII is not set |
484 | CONFIG_ARIADNE=m | 601 | CONFIG_ARIADNE=m |
485 | CONFIG_A2065=m | 602 | CONFIG_A2065=m |
486 | CONFIG_HYDRA=m | 603 | CONFIG_HYDRA=m |
@@ -493,32 +610,24 @@ CONFIG_APNE=m | |||
493 | # CONFIG_DEPCA is not set | 610 | # CONFIG_DEPCA is not set |
494 | # CONFIG_HP100 is not set | 611 | # CONFIG_HP100 is not set |
495 | # CONFIG_NET_ISA is not set | 612 | # CONFIG_NET_ISA is not set |
613 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
614 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
615 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
616 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
496 | # CONFIG_NET_PCI is not set | 617 | # CONFIG_NET_PCI is not set |
618 | # CONFIG_B44 is not set | ||
497 | # CONFIG_NET_POCKET is not set | 619 | # CONFIG_NET_POCKET is not set |
498 | 620 | # CONFIG_NETDEV_1000 is not set | |
499 | # | 621 | # CONFIG_NETDEV_10000 is not set |
500 | # Ethernet (1000 Mbit) | ||
501 | # | ||
502 | |||
503 | # | ||
504 | # Ethernet (10000 Mbit) | ||
505 | # | ||
506 | |||
507 | # | ||
508 | # Token Ring devices | ||
509 | # | ||
510 | # CONFIG_TR is not set | 622 | # CONFIG_TR is not set |
511 | 623 | ||
512 | # | 624 | # |
513 | # Wireless LAN (non-hamradio) | 625 | # Wireless LAN |
514 | # | ||
515 | # CONFIG_NET_RADIO is not set | ||
516 | |||
517 | # | ||
518 | # Wan interfaces | ||
519 | # | 626 | # |
627 | # CONFIG_WLAN_PRE80211 is not set | ||
628 | # CONFIG_WLAN_80211 is not set | ||
520 | # CONFIG_WAN is not set | 629 | # CONFIG_WAN is not set |
521 | CONFIG_PLIP=m | 630 | # CONFIG_PLIP is not set |
522 | CONFIG_PPP=m | 631 | CONFIG_PPP=m |
523 | # CONFIG_PPP_MULTILINK is not set | 632 | # CONFIG_PPP_MULTILINK is not set |
524 | CONFIG_PPP_FILTER=y | 633 | CONFIG_PPP_FILTER=y |
@@ -526,28 +635,28 @@ CONFIG_PPP_ASYNC=m | |||
526 | CONFIG_PPP_SYNC_TTY=m | 635 | CONFIG_PPP_SYNC_TTY=m |
527 | CONFIG_PPP_DEFLATE=m | 636 | CONFIG_PPP_DEFLATE=m |
528 | CONFIG_PPP_BSDCOMP=m | 637 | CONFIG_PPP_BSDCOMP=m |
638 | CONFIG_PPP_MPPE=m | ||
529 | CONFIG_PPPOE=m | 639 | CONFIG_PPPOE=m |
640 | CONFIG_PPPOL2TP=m | ||
530 | CONFIG_SLIP=m | 641 | CONFIG_SLIP=m |
531 | CONFIG_SLIP_COMPRESSED=y | 642 | CONFIG_SLIP_COMPRESSED=y |
643 | CONFIG_SLHC=m | ||
532 | CONFIG_SLIP_SMART=y | 644 | CONFIG_SLIP_SMART=y |
533 | CONFIG_SLIP_MODE_SLIP6=y | 645 | CONFIG_SLIP_MODE_SLIP6=y |
534 | CONFIG_SHAPER=m | ||
535 | CONFIG_NETCONSOLE=m | 646 | CONFIG_NETCONSOLE=m |
536 | 647 | CONFIG_NETCONSOLE_DYNAMIC=y | |
537 | # | 648 | CONFIG_NETPOLL=y |
538 | # ISDN subsystem | 649 | # CONFIG_NETPOLL_TRAP is not set |
539 | # | 650 | CONFIG_NET_POLL_CONTROLLER=y |
540 | # CONFIG_ISDN is not set | 651 | # CONFIG_ISDN is not set |
541 | |||
542 | # | ||
543 | # Telephony Support | ||
544 | # | ||
545 | # CONFIG_PHONE is not set | 652 | # CONFIG_PHONE is not set |
546 | 653 | ||
547 | # | 654 | # |
548 | # Input device support | 655 | # Input device support |
549 | # | 656 | # |
550 | CONFIG_INPUT=y | 657 | CONFIG_INPUT=y |
658 | CONFIG_INPUT_FF_MEMLESS=m | ||
659 | # CONFIG_INPUT_POLLDEV is not set | ||
551 | 660 | ||
552 | # | 661 | # |
553 | # Userland interfaces | 662 | # Userland interfaces |
@@ -557,7 +666,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
557 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 666 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
558 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 667 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
559 | # CONFIG_INPUT_JOYDEV is not set | 668 | # CONFIG_INPUT_JOYDEV is not set |
560 | # CONFIG_INPUT_TSDEV is not set | ||
561 | # CONFIG_INPUT_EVDEV is not set | 669 | # CONFIG_INPUT_EVDEV is not set |
562 | # CONFIG_INPUT_EVBUG is not set | 670 | # CONFIG_INPUT_EVBUG is not set |
563 | 671 | ||
@@ -570,6 +678,7 @@ CONFIG_INPUT_KEYBOARD=y | |||
570 | # CONFIG_KEYBOARD_LKKBD is not set | 678 | # CONFIG_KEYBOARD_LKKBD is not set |
571 | # CONFIG_KEYBOARD_XTKBD is not set | 679 | # CONFIG_KEYBOARD_XTKBD is not set |
572 | # CONFIG_KEYBOARD_NEWTON is not set | 680 | # CONFIG_KEYBOARD_NEWTON is not set |
681 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
573 | CONFIG_KEYBOARD_AMIGA=y | 682 | CONFIG_KEYBOARD_AMIGA=y |
574 | CONFIG_INPUT_MOUSE=y | 683 | CONFIG_INPUT_MOUSE=y |
575 | # CONFIG_MOUSE_PS2 is not set | 684 | # CONFIG_MOUSE_PS2 is not set |
@@ -577,7 +686,7 @@ CONFIG_INPUT_MOUSE=y | |||
577 | # CONFIG_MOUSE_INPORT is not set | 686 | # CONFIG_MOUSE_INPORT is not set |
578 | # CONFIG_MOUSE_LOGIBM is not set | 687 | # CONFIG_MOUSE_LOGIBM is not set |
579 | # CONFIG_MOUSE_PC110PAD is not set | 688 | # CONFIG_MOUSE_PC110PAD is not set |
580 | CONFIG_MOUSE_AMIGA=y | 689 | CONFIG_MOUSE_AMIGA=m |
581 | # CONFIG_MOUSE_VSXXXAA is not set | 690 | # CONFIG_MOUSE_VSXXXAA is not set |
582 | CONFIG_INPUT_JOYSTICK=y | 691 | CONFIG_INPUT_JOYSTICK=y |
583 | # CONFIG_JOYSTICK_ANALOG is not set | 692 | # CONFIG_JOYSTICK_ANALOG is not set |
@@ -603,16 +712,16 @@ CONFIG_INPUT_JOYSTICK=y | |||
603 | # CONFIG_JOYSTICK_TURBOGRAFX is not set | 712 | # CONFIG_JOYSTICK_TURBOGRAFX is not set |
604 | CONFIG_JOYSTICK_AMIGA=m | 713 | CONFIG_JOYSTICK_AMIGA=m |
605 | # CONFIG_JOYSTICK_JOYDUMP is not set | 714 | # CONFIG_JOYSTICK_JOYDUMP is not set |
715 | # CONFIG_INPUT_TABLET is not set | ||
606 | # CONFIG_INPUT_TOUCHSCREEN is not set | 716 | # CONFIG_INPUT_TOUCHSCREEN is not set |
607 | # CONFIG_INPUT_MISC is not set | 717 | CONFIG_INPUT_MISC=y |
718 | CONFIG_INPUT_M68K_BEEP=m | ||
719 | # CONFIG_INPUT_UINPUT is not set | ||
608 | 720 | ||
609 | # | 721 | # |
610 | # Hardware I/O ports | 722 | # Hardware I/O ports |
611 | # | 723 | # |
612 | CONFIG_SERIO=m | 724 | # CONFIG_SERIO is not set |
613 | CONFIG_SERIO_SERPORT=m | ||
614 | # CONFIG_SERIO_PARKBD is not set | ||
615 | # CONFIG_SERIO_RAW is not set | ||
616 | # CONFIG_GAMEPORT is not set | 725 | # CONFIG_GAMEPORT is not set |
617 | 726 | ||
618 | # | 727 | # |
@@ -621,6 +730,7 @@ CONFIG_SERIO_SERPORT=m | |||
621 | CONFIG_VT=y | 730 | CONFIG_VT=y |
622 | CONFIG_VT_CONSOLE=y | 731 | CONFIG_VT_CONSOLE=y |
623 | CONFIG_HW_CONSOLE=y | 732 | CONFIG_HW_CONSOLE=y |
733 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
624 | # CONFIG_SERIAL_NONSTANDARD is not set | 734 | # CONFIG_SERIAL_NONSTANDARD is not set |
625 | CONFIG_A2232=m | 735 | CONFIG_A2232=m |
626 | 736 | ||
@@ -638,94 +748,102 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
638 | CONFIG_PRINTER=m | 748 | CONFIG_PRINTER=m |
639 | # CONFIG_LP_CONSOLE is not set | 749 | # CONFIG_LP_CONSOLE is not set |
640 | # CONFIG_PPDEV is not set | 750 | # CONFIG_PPDEV is not set |
641 | # CONFIG_TIPAR is not set | ||
642 | |||
643 | # | ||
644 | # IPMI | ||
645 | # | ||
646 | # CONFIG_IPMI_HANDLER is not set | 751 | # CONFIG_IPMI_HANDLER is not set |
647 | 752 | # CONFIG_HW_RANDOM is not set | |
648 | # | ||
649 | # Watchdog Cards | ||
650 | # | ||
651 | # CONFIG_WATCHDOG is not set | ||
652 | CONFIG_GEN_RTC=m | 753 | CONFIG_GEN_RTC=m |
653 | CONFIG_GEN_RTC_X=y | 754 | CONFIG_GEN_RTC_X=y |
654 | # CONFIG_DTLK is not set | 755 | # CONFIG_DTLK is not set |
655 | # CONFIG_R3964 is not set | 756 | # CONFIG_R3964 is not set |
656 | |||
657 | # | ||
658 | # Ftape, the floppy tape device driver | ||
659 | # | ||
660 | # CONFIG_DRM is not set | ||
661 | # CONFIG_RAW_DRIVER is not set | 757 | # CONFIG_RAW_DRIVER is not set |
662 | 758 | # CONFIG_TCG_TPM is not set | |
663 | # | ||
664 | # TPM devices | ||
665 | # | ||
666 | |||
667 | # | ||
668 | # I2C support | ||
669 | # | ||
670 | # CONFIG_I2C is not set | 759 | # CONFIG_I2C is not set |
671 | 760 | ||
672 | # | 761 | # |
673 | # Dallas's 1-wire bus | 762 | # SPI support |
674 | # | 763 | # |
764 | # CONFIG_SPI is not set | ||
765 | # CONFIG_SPI_MASTER is not set | ||
675 | # CONFIG_W1 is not set | 766 | # CONFIG_W1 is not set |
767 | # CONFIG_POWER_SUPPLY is not set | ||
768 | # CONFIG_HWMON is not set | ||
769 | # CONFIG_THERMAL is not set | ||
770 | # CONFIG_WATCHDOG is not set | ||
676 | 771 | ||
677 | # | 772 | # |
678 | # Misc devices | 773 | # Sonics Silicon Backplane |
679 | # | 774 | # |
775 | CONFIG_SSB_POSSIBLE=y | ||
776 | # CONFIG_SSB is not set | ||
680 | 777 | ||
681 | # | 778 | # |
682 | # Multimedia devices | 779 | # Multifunction device drivers |
683 | # | 780 | # |
684 | # CONFIG_VIDEO_DEV is not set | 781 | # CONFIG_MFD_SM501 is not set |
685 | 782 | ||
686 | # | 783 | # |
687 | # Digital Video Broadcasting Devices | 784 | # Multimedia devices |
688 | # | 785 | # |
689 | # CONFIG_DVB is not set | 786 | # CONFIG_VIDEO_DEV is not set |
787 | # CONFIG_DVB_CORE is not set | ||
788 | # CONFIG_DAB is not set | ||
690 | 789 | ||
691 | # | 790 | # |
692 | # Graphics support | 791 | # Graphics support |
693 | # | 792 | # |
793 | # CONFIG_VGASTATE is not set | ||
794 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
694 | CONFIG_FB=y | 795 | CONFIG_FB=y |
796 | # CONFIG_FIRMWARE_EDID is not set | ||
797 | # CONFIG_FB_DDC is not set | ||
695 | CONFIG_FB_CFB_FILLRECT=y | 798 | CONFIG_FB_CFB_FILLRECT=y |
696 | CONFIG_FB_CFB_COPYAREA=y | 799 | CONFIG_FB_CFB_COPYAREA=y |
697 | CONFIG_FB_CFB_IMAGEBLIT=y | 800 | CONFIG_FB_CFB_IMAGEBLIT=y |
698 | CONFIG_FB_SOFT_CURSOR=y | 801 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
802 | # CONFIG_FB_SYS_FILLRECT is not set | ||
803 | # CONFIG_FB_SYS_COPYAREA is not set | ||
804 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
805 | # CONFIG_FB_SYS_FOPS is not set | ||
806 | CONFIG_FB_DEFERRED_IO=y | ||
807 | # CONFIG_FB_SVGALIB is not set | ||
699 | # CONFIG_FB_MACMODES is not set | 808 | # CONFIG_FB_MACMODES is not set |
700 | CONFIG_FB_MODE_HELPERS=y | 809 | # CONFIG_FB_BACKLIGHT is not set |
810 | # CONFIG_FB_MODE_HELPERS is not set | ||
701 | # CONFIG_FB_TILEBLITTING is not set | 811 | # CONFIG_FB_TILEBLITTING is not set |
702 | CONFIG_FB_CIRRUS=m | 812 | |
813 | # | ||
814 | # Frame buffer hardware drivers | ||
815 | # | ||
816 | CONFIG_FB_CIRRUS=y | ||
703 | CONFIG_FB_AMIGA=y | 817 | CONFIG_FB_AMIGA=y |
704 | CONFIG_FB_AMIGA_OCS=y | 818 | CONFIG_FB_AMIGA_OCS=y |
705 | CONFIG_FB_AMIGA_ECS=y | 819 | CONFIG_FB_AMIGA_ECS=y |
706 | CONFIG_FB_AMIGA_AGA=y | 820 | CONFIG_FB_AMIGA_AGA=y |
707 | CONFIG_FB_FM2=y | 821 | CONFIG_FB_FM2=y |
822 | # CONFIG_FB_UVESA is not set | ||
708 | # CONFIG_FB_S1D13XXX is not set | 823 | # CONFIG_FB_S1D13XXX is not set |
709 | # CONFIG_FB_VIRTUAL is not set | 824 | # CONFIG_FB_VIRTUAL is not set |
825 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
826 | |||
827 | # | ||
828 | # Display device support | ||
829 | # | ||
830 | # CONFIG_DISPLAY_SUPPORT is not set | ||
710 | 831 | ||
711 | # | 832 | # |
712 | # Console display driver support | 833 | # Console display driver support |
713 | # | 834 | # |
714 | CONFIG_DUMMY_CONSOLE=y | 835 | CONFIG_DUMMY_CONSOLE=y |
715 | CONFIG_FRAMEBUFFER_CONSOLE=y | 836 | CONFIG_FRAMEBUFFER_CONSOLE=y |
837 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
838 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
716 | # CONFIG_FONTS is not set | 839 | # CONFIG_FONTS is not set |
717 | CONFIG_FONT_8x8=y | 840 | CONFIG_FONT_8x8=y |
718 | CONFIG_FONT_8x16=y | 841 | CONFIG_FONT_8x16=y |
719 | CONFIG_FONT_PEARL_8x8=y | 842 | CONFIG_FONT_PEARL_8x8=y |
720 | |||
721 | # | ||
722 | # Logo configuration | ||
723 | # | ||
724 | CONFIG_LOGO=y | 843 | CONFIG_LOGO=y |
725 | CONFIG_LOGO_LINUX_MONO=y | 844 | CONFIG_LOGO_LINUX_MONO=y |
726 | CONFIG_LOGO_LINUX_VGA16=y | 845 | CONFIG_LOGO_LINUX_VGA16=y |
727 | CONFIG_LOGO_LINUX_CLUT224=y | 846 | CONFIG_LOGO_LINUX_CLUT224=y |
728 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
729 | 847 | ||
730 | # | 848 | # |
731 | # Sound | 849 | # Sound |
@@ -733,27 +851,21 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
733 | CONFIG_SOUND=m | 851 | CONFIG_SOUND=m |
734 | CONFIG_DMASOUND_PAULA=m | 852 | CONFIG_DMASOUND_PAULA=m |
735 | CONFIG_DMASOUND=m | 853 | CONFIG_DMASOUND=m |
736 | 854 | CONFIG_HID_SUPPORT=y | |
737 | # | 855 | CONFIG_HID=m |
738 | # USB support | 856 | # CONFIG_HID_DEBUG is not set |
739 | # | 857 | CONFIG_HIDRAW=y |
740 | # CONFIG_USB_ARCH_HAS_HCD is not set | 858 | # CONFIG_USB_SUPPORT is not set |
741 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
742 | |||
743 | # | ||
744 | # USB Gadget Support | ||
745 | # | ||
746 | # CONFIG_USB_GADGET is not set | ||
747 | |||
748 | # | ||
749 | # MMC/SD Card support | ||
750 | # | ||
751 | # CONFIG_MMC is not set | 859 | # CONFIG_MMC is not set |
860 | # CONFIG_MEMSTICK is not set | ||
861 | # CONFIG_NEW_LEDS is not set | ||
862 | # CONFIG_RTC_CLASS is not set | ||
863 | # CONFIG_AUXDISPLAY is not set | ||
752 | 864 | ||
753 | # | 865 | # |
754 | # InfiniBand support | 866 | # Userspace I/O |
755 | # | 867 | # |
756 | # CONFIG_INFINIBAND is not set | 868 | # CONFIG_UIO is not set |
757 | 869 | ||
758 | # | 870 | # |
759 | # Character devices | 871 | # Character devices |
@@ -768,10 +880,11 @@ CONFIG_MULTIFACE_III_TTY=m | |||
768 | # | 880 | # |
769 | CONFIG_EXT2_FS=y | 881 | CONFIG_EXT2_FS=y |
770 | # CONFIG_EXT2_FS_XATTR is not set | 882 | # CONFIG_EXT2_FS_XATTR is not set |
883 | # CONFIG_EXT2_FS_XIP is not set | ||
771 | CONFIG_EXT3_FS=y | 884 | CONFIG_EXT3_FS=y |
772 | # CONFIG_EXT3_FS_XATTR is not set | 885 | # CONFIG_EXT3_FS_XATTR is not set |
886 | # CONFIG_EXT4DEV_FS is not set | ||
773 | CONFIG_JBD=y | 887 | CONFIG_JBD=y |
774 | # CONFIG_JBD_DEBUG is not set | ||
775 | CONFIG_REISERFS_FS=m | 888 | CONFIG_REISERFS_FS=m |
776 | # CONFIG_REISERFS_CHECK is not set | 889 | # CONFIG_REISERFS_CHECK is not set |
777 | # CONFIG_REISERFS_PROC_INFO is not set | 890 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -782,25 +895,29 @@ CONFIG_JFS_FS=m | |||
782 | # CONFIG_JFS_DEBUG is not set | 895 | # CONFIG_JFS_DEBUG is not set |
783 | # CONFIG_JFS_STATISTICS is not set | 896 | # CONFIG_JFS_STATISTICS is not set |
784 | CONFIG_FS_POSIX_ACL=y | 897 | CONFIG_FS_POSIX_ACL=y |
785 | |||
786 | # | ||
787 | # XFS support | ||
788 | # | ||
789 | CONFIG_XFS_FS=m | 898 | CONFIG_XFS_FS=m |
790 | CONFIG_XFS_EXPORT=y | ||
791 | # CONFIG_XFS_RT is not set | ||
792 | # CONFIG_XFS_QUOTA is not set | 899 | # CONFIG_XFS_QUOTA is not set |
793 | # CONFIG_XFS_SECURITY is not set | 900 | # CONFIG_XFS_SECURITY is not set |
794 | # CONFIG_XFS_POSIX_ACL is not set | 901 | # CONFIG_XFS_POSIX_ACL is not set |
795 | CONFIG_MINIX_FS=y | 902 | # CONFIG_XFS_RT is not set |
796 | # CONFIG_ROMFS_FS is not set | 903 | CONFIG_GFS2_FS=m |
904 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
905 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
906 | CONFIG_OCFS2_FS=m | ||
907 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
908 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
909 | CONFIG_DNOTIFY=y | ||
910 | CONFIG_INOTIFY=y | ||
911 | CONFIG_INOTIFY_USER=y | ||
797 | CONFIG_QUOTA=y | 912 | CONFIG_QUOTA=y |
913 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
914 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
798 | # CONFIG_QFMT_V1 is not set | 915 | # CONFIG_QFMT_V1 is not set |
799 | # CONFIG_QFMT_V2 is not set | 916 | # CONFIG_QFMT_V2 is not set |
800 | CONFIG_QUOTACTL=y | 917 | CONFIG_QUOTACTL=y |
801 | CONFIG_DNOTIFY=y | ||
802 | CONFIG_AUTOFS_FS=m | 918 | CONFIG_AUTOFS_FS=m |
803 | CONFIG_AUTOFS4_FS=m | 919 | CONFIG_AUTOFS4_FS=m |
920 | CONFIG_FUSE_FS=m | ||
804 | 921 | ||
805 | # | 922 | # |
806 | # CD-ROM/DVD Filesystems | 923 | # CD-ROM/DVD Filesystems |
@@ -808,7 +925,6 @@ CONFIG_AUTOFS4_FS=m | |||
808 | CONFIG_ISO9660_FS=y | 925 | CONFIG_ISO9660_FS=y |
809 | CONFIG_JOLIET=y | 926 | CONFIG_JOLIET=y |
810 | CONFIG_ZISOFS=y | 927 | CONFIG_ZISOFS=y |
811 | CONFIG_ZISOFS_FS=y | ||
812 | CONFIG_UDF_FS=m | 928 | CONFIG_UDF_FS=m |
813 | CONFIG_UDF_NLS=y | 929 | CONFIG_UDF_NLS=y |
814 | 930 | ||
@@ -827,19 +943,18 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
827 | # | 943 | # |
828 | CONFIG_PROC_FS=y | 944 | CONFIG_PROC_FS=y |
829 | CONFIG_PROC_KCORE=y | 945 | CONFIG_PROC_KCORE=y |
946 | CONFIG_PROC_SYSCTL=y | ||
830 | CONFIG_SYSFS=y | 947 | CONFIG_SYSFS=y |
831 | # CONFIG_DEVFS_FS is not set | ||
832 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
833 | CONFIG_TMPFS=y | 948 | CONFIG_TMPFS=y |
834 | # CONFIG_TMPFS_XATTR is not set | 949 | # CONFIG_TMPFS_POSIX_ACL is not set |
835 | # CONFIG_HUGETLB_PAGE is not set | 950 | # CONFIG_HUGETLB_PAGE is not set |
836 | CONFIG_RAMFS=y | 951 | CONFIG_CONFIGFS_FS=m |
837 | 952 | ||
838 | # | 953 | # |
839 | # Miscellaneous filesystems | 954 | # Miscellaneous filesystems |
840 | # | 955 | # |
841 | # CONFIG_ADFS_FS is not set | 956 | # CONFIG_ADFS_FS is not set |
842 | CONFIG_AFFS_FS=y | 957 | CONFIG_AFFS_FS=m |
843 | CONFIG_HFS_FS=m | 958 | CONFIG_HFS_FS=m |
844 | CONFIG_HFSPLUS_FS=m | 959 | CONFIG_HFSPLUS_FS=m |
845 | # CONFIG_BEFS_FS is not set | 960 | # CONFIG_BEFS_FS is not set |
@@ -847,43 +962,39 @@ CONFIG_HFSPLUS_FS=m | |||
847 | # CONFIG_EFS_FS is not set | 962 | # CONFIG_EFS_FS is not set |
848 | CONFIG_CRAMFS=m | 963 | CONFIG_CRAMFS=m |
849 | # CONFIG_VXFS_FS is not set | 964 | # CONFIG_VXFS_FS is not set |
965 | CONFIG_MINIX_FS=y | ||
850 | CONFIG_HPFS_FS=m | 966 | CONFIG_HPFS_FS=m |
851 | # CONFIG_QNX4FS_FS is not set | 967 | # CONFIG_QNX4FS_FS is not set |
968 | # CONFIG_ROMFS_FS is not set | ||
852 | CONFIG_SYSV_FS=m | 969 | CONFIG_SYSV_FS=m |
853 | CONFIG_UFS_FS=m | 970 | CONFIG_UFS_FS=m |
854 | # CONFIG_UFS_FS_WRITE is not set | 971 | # CONFIG_UFS_FS_WRITE is not set |
855 | 972 | # CONFIG_UFS_DEBUG is not set | |
856 | # | 973 | CONFIG_NETWORK_FILESYSTEMS=y |
857 | # Network File Systems | ||
858 | # | ||
859 | CONFIG_NFS_FS=m | 974 | CONFIG_NFS_FS=m |
860 | CONFIG_NFS_V3=y | 975 | CONFIG_NFS_V3=y |
976 | # CONFIG_NFS_V3_ACL is not set | ||
861 | CONFIG_NFS_V4=y | 977 | CONFIG_NFS_V4=y |
862 | # CONFIG_NFS_DIRECTIO is not set | 978 | # CONFIG_NFS_DIRECTIO is not set |
863 | CONFIG_NFSD=m | 979 | CONFIG_NFSD=m |
864 | CONFIG_NFSD_V3=y | 980 | CONFIG_NFSD_V3=y |
865 | CONFIG_NFSD_V4=y | 981 | # CONFIG_NFSD_V3_ACL is not set |
982 | # CONFIG_NFSD_V4 is not set | ||
866 | CONFIG_NFSD_TCP=y | 983 | CONFIG_NFSD_TCP=y |
867 | CONFIG_LOCKD=m | 984 | CONFIG_LOCKD=m |
868 | CONFIG_LOCKD_V4=y | 985 | CONFIG_LOCKD_V4=y |
869 | CONFIG_EXPORTFS=m | 986 | CONFIG_EXPORTFS=m |
987 | CONFIG_NFS_COMMON=y | ||
870 | CONFIG_SUNRPC=m | 988 | CONFIG_SUNRPC=m |
871 | CONFIG_SUNRPC_GSS=m | 989 | CONFIG_SUNRPC_GSS=m |
990 | CONFIG_SUNRPC_BIND34=y | ||
872 | CONFIG_RPCSEC_GSS_KRB5=m | 991 | CONFIG_RPCSEC_GSS_KRB5=m |
873 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 992 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
874 | CONFIG_SMB_FS=m | 993 | CONFIG_SMB_FS=m |
875 | CONFIG_SMB_NLS_DEFAULT=y | 994 | CONFIG_SMB_NLS_DEFAULT=y |
876 | CONFIG_SMB_NLS_REMOTE="cp437" | 995 | CONFIG_SMB_NLS_REMOTE="cp437" |
877 | # CONFIG_CIFS is not set | 996 | # CONFIG_CIFS is not set |
878 | CONFIG_NCP_FS=m | 997 | # CONFIG_NCP_FS is not set |
879 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
880 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
881 | # CONFIG_NCPFS_STRONG is not set | ||
882 | CONFIG_NCPFS_NFS_NS=y | ||
883 | CONFIG_NCPFS_OS2_NS=y | ||
884 | # CONFIG_NCPFS_SMALLDOS is not set | ||
885 | CONFIG_NCPFS_NLS=y | ||
886 | # CONFIG_NCPFS_EXTRAS is not set | ||
887 | CONFIG_CODA_FS=m | 998 | CONFIG_CODA_FS=m |
888 | # CONFIG_CODA_FS_OLD_API is not set | 999 | # CONFIG_CODA_FS_OLD_API is not set |
889 | # CONFIG_AFS_FS is not set | 1000 | # CONFIG_AFS_FS is not set |
@@ -894,10 +1005,6 @@ CONFIG_CODA_FS=m | |||
894 | # CONFIG_PARTITION_ADVANCED is not set | 1005 | # CONFIG_PARTITION_ADVANCED is not set |
895 | CONFIG_AMIGA_PARTITION=y | 1006 | CONFIG_AMIGA_PARTITION=y |
896 | CONFIG_MSDOS_PARTITION=y | 1007 | CONFIG_MSDOS_PARTITION=y |
897 | |||
898 | # | ||
899 | # Native Language Support | ||
900 | # | ||
901 | CONFIG_NLS=y | 1008 | CONFIG_NLS=y |
902 | CONFIG_NLS_DEFAULT="iso8859-1" | 1009 | CONFIG_NLS_DEFAULT="iso8859-1" |
903 | CONFIG_NLS_CODEPAGE_437=y | 1010 | CONFIG_NLS_CODEPAGE_437=y |
@@ -938,35 +1045,42 @@ CONFIG_NLS_ISO8859_15=m | |||
938 | CONFIG_NLS_KOI8_R=m | 1045 | CONFIG_NLS_KOI8_R=m |
939 | CONFIG_NLS_KOI8_U=m | 1046 | CONFIG_NLS_KOI8_U=m |
940 | CONFIG_NLS_UTF8=m | 1047 | CONFIG_NLS_UTF8=m |
1048 | CONFIG_DLM=m | ||
1049 | # CONFIG_DLM_DEBUG is not set | ||
941 | 1050 | ||
942 | # | 1051 | # |
943 | # Kernel hacking | 1052 | # Kernel hacking |
944 | # | 1053 | # |
945 | # CONFIG_PRINTK_TIME is not set | 1054 | # CONFIG_PRINTK_TIME is not set |
946 | CONFIG_DEBUG_KERNEL=y | 1055 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1056 | CONFIG_ENABLE_MUST_CHECK=y | ||
947 | CONFIG_MAGIC_SYSRQ=y | 1057 | CONFIG_MAGIC_SYSRQ=y |
948 | CONFIG_LOG_BUF_SHIFT=16 | 1058 | # CONFIG_UNUSED_SYMBOLS is not set |
949 | # CONFIG_SCHEDSTATS is not set | ||
950 | # CONFIG_DEBUG_SLAB is not set | ||
951 | # CONFIG_DEBUG_SPINLOCK is not set | ||
952 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
953 | # CONFIG_DEBUG_KOBJECT is not set | ||
954 | CONFIG_DEBUG_BUGVERBOSE=y | ||
955 | # CONFIG_DEBUG_INFO is not set | ||
956 | # CONFIG_DEBUG_FS is not set | 1059 | # CONFIG_DEBUG_FS is not set |
957 | # CONFIG_FRAME_POINTER is not set | 1060 | # CONFIG_HEADERS_CHECK is not set |
1061 | # CONFIG_DEBUG_KERNEL is not set | ||
1062 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1063 | # CONFIG_SAMPLES is not set | ||
958 | 1064 | ||
959 | # | 1065 | # |
960 | # Security options | 1066 | # Security options |
961 | # | 1067 | # |
962 | # CONFIG_KEYS is not set | 1068 | # CONFIG_KEYS is not set |
963 | # CONFIG_SECURITY is not set | 1069 | # CONFIG_SECURITY is not set |
964 | 1070 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
965 | # | 1071 | CONFIG_XOR_BLOCKS=m |
966 | # Cryptographic options | 1072 | CONFIG_ASYNC_CORE=m |
967 | # | 1073 | CONFIG_ASYNC_MEMCPY=m |
1074 | CONFIG_ASYNC_XOR=m | ||
968 | CONFIG_CRYPTO=y | 1075 | CONFIG_CRYPTO=y |
1076 | CONFIG_CRYPTO_ALGAPI=y | ||
1077 | CONFIG_CRYPTO_AEAD=m | ||
1078 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1079 | CONFIG_CRYPTO_SEQIV=m | ||
1080 | CONFIG_CRYPTO_HASH=y | ||
1081 | CONFIG_CRYPTO_MANAGER=y | ||
969 | CONFIG_CRYPTO_HMAC=y | 1082 | CONFIG_CRYPTO_HMAC=y |
1083 | CONFIG_CRYPTO_XCBC=m | ||
970 | CONFIG_CRYPTO_NULL=m | 1084 | CONFIG_CRYPTO_NULL=m |
971 | CONFIG_CRYPTO_MD4=m | 1085 | CONFIG_CRYPTO_MD4=m |
972 | CONFIG_CRYPTO_MD5=m | 1086 | CONFIG_CRYPTO_MD5=m |
@@ -975,9 +1089,21 @@ CONFIG_CRYPTO_SHA256=m | |||
975 | CONFIG_CRYPTO_SHA512=m | 1089 | CONFIG_CRYPTO_SHA512=m |
976 | CONFIG_CRYPTO_WP512=m | 1090 | CONFIG_CRYPTO_WP512=m |
977 | CONFIG_CRYPTO_TGR192=m | 1091 | CONFIG_CRYPTO_TGR192=m |
1092 | CONFIG_CRYPTO_GF128MUL=m | ||
1093 | CONFIG_CRYPTO_ECB=m | ||
1094 | CONFIG_CRYPTO_CBC=m | ||
1095 | CONFIG_CRYPTO_PCBC=m | ||
1096 | CONFIG_CRYPTO_LRW=m | ||
1097 | CONFIG_CRYPTO_XTS=m | ||
1098 | CONFIG_CRYPTO_CTR=m | ||
1099 | CONFIG_CRYPTO_GCM=m | ||
1100 | CONFIG_CRYPTO_CCM=m | ||
1101 | CONFIG_CRYPTO_CRYPTD=m | ||
978 | CONFIG_CRYPTO_DES=m | 1102 | CONFIG_CRYPTO_DES=m |
1103 | CONFIG_CRYPTO_FCRYPT=m | ||
979 | CONFIG_CRYPTO_BLOWFISH=m | 1104 | CONFIG_CRYPTO_BLOWFISH=m |
980 | CONFIG_CRYPTO_TWOFISH=m | 1105 | CONFIG_CRYPTO_TWOFISH=m |
1106 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
981 | CONFIG_CRYPTO_SERPENT=m | 1107 | CONFIG_CRYPTO_SERPENT=m |
982 | CONFIG_CRYPTO_AES=m | 1108 | CONFIG_CRYPTO_AES=m |
983 | CONFIG_CRYPTO_CAST5=m | 1109 | CONFIG_CRYPTO_CAST5=m |
@@ -986,20 +1112,35 @@ CONFIG_CRYPTO_TEA=m | |||
986 | CONFIG_CRYPTO_ARC4=m | 1112 | CONFIG_CRYPTO_ARC4=m |
987 | CONFIG_CRYPTO_KHAZAD=m | 1113 | CONFIG_CRYPTO_KHAZAD=m |
988 | CONFIG_CRYPTO_ANUBIS=m | 1114 | CONFIG_CRYPTO_ANUBIS=m |
1115 | CONFIG_CRYPTO_SEED=m | ||
1116 | CONFIG_CRYPTO_SALSA20=m | ||
989 | CONFIG_CRYPTO_DEFLATE=m | 1117 | CONFIG_CRYPTO_DEFLATE=m |
990 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1118 | CONFIG_CRYPTO_MICHAEL_MIC=m |
991 | CONFIG_CRYPTO_CRC32C=m | 1119 | CONFIG_CRYPTO_CRC32C=m |
1120 | CONFIG_CRYPTO_CAMELLIA=m | ||
992 | CONFIG_CRYPTO_TEST=m | 1121 | CONFIG_CRYPTO_TEST=m |
993 | 1122 | CONFIG_CRYPTO_AUTHENC=m | |
994 | # | 1123 | CONFIG_CRYPTO_LZO=m |
995 | # Hardware crypto devices | 1124 | # CONFIG_CRYPTO_HW is not set |
996 | # | ||
997 | 1125 | ||
998 | # | 1126 | # |
999 | # Library routines | 1127 | # Library routines |
1000 | # | 1128 | # |
1129 | CONFIG_BITREVERSE=y | ||
1001 | CONFIG_CRC_CCITT=m | 1130 | CONFIG_CRC_CCITT=m |
1131 | CONFIG_CRC16=m | ||
1132 | # CONFIG_CRC_ITU_T is not set | ||
1002 | CONFIG_CRC32=y | 1133 | CONFIG_CRC32=y |
1134 | # CONFIG_CRC7 is not set | ||
1003 | CONFIG_LIBCRC32C=m | 1135 | CONFIG_LIBCRC32C=m |
1004 | CONFIG_ZLIB_INFLATE=y | 1136 | CONFIG_ZLIB_INFLATE=y |
1005 | CONFIG_ZLIB_DEFLATE=m | 1137 | CONFIG_ZLIB_DEFLATE=m |
1138 | CONFIG_LZO_COMPRESS=m | ||
1139 | CONFIG_LZO_DECOMPRESS=m | ||
1140 | CONFIG_TEXTSEARCH=y | ||
1141 | CONFIG_TEXTSEARCH_KMP=m | ||
1142 | CONFIG_TEXTSEARCH_BM=m | ||
1143 | CONFIG_TEXTSEARCH_FSM=m | ||
1144 | CONFIG_PLIST=y | ||
1145 | CONFIG_HAS_IOMEM=y | ||
1146 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 63024b0b7ac3..e61196cd7fa5 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:27 2005 | 4 | # Wed Apr 2 20:46:07 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-apollo" | 27 | CONFIG_LOCALVERSION="-apollo" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -80,10 +128,24 @@ CONFIG_M68030=y | |||
80 | CONFIG_M68040=y | 128 | CONFIG_M68040=y |
81 | CONFIG_M68060=y | 129 | CONFIG_M68060=y |
82 | CONFIG_MMU_MOTOROLA=y | 130 | CONFIG_MMU_MOTOROLA=y |
83 | CONFIG_M68KFPU_EMU=y | 131 | # CONFIG_M68KFPU_EMU is not set |
84 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
85 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
86 | # CONFIG_ADVANCED is not set | 132 | # CONFIG_ADVANCED is not set |
133 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
134 | CONFIG_NODES_SHIFT=3 | ||
135 | CONFIG_SELECT_MEMORY_MODEL=y | ||
136 | # CONFIG_FLATMEM_MANUAL is not set | ||
137 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
138 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
139 | CONFIG_DISCONTIGMEM=y | ||
140 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
141 | CONFIG_NEED_MULTIPLE_NODES=y | ||
142 | # CONFIG_SPARSEMEM_STATIC is not set | ||
143 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
145 | # CONFIG_RESOURCES_64BIT is not set | ||
146 | CONFIG_ZONE_DMA_FLAG=1 | ||
147 | CONFIG_BOUNCE=y | ||
148 | CONFIG_VIRT_TO_BUS=y | ||
87 | 149 | ||
88 | # | 150 | # |
89 | # General setup | 151 | # General setup |
@@ -93,134 +155,11 @@ CONFIG_BINFMT_AOUT=m | |||
93 | CONFIG_BINFMT_MISC=m | 155 | CONFIG_BINFMT_MISC=m |
94 | CONFIG_HEARTBEAT=y | 156 | CONFIG_HEARTBEAT=y |
95 | CONFIG_PROC_HARDWARE=y | 157 | CONFIG_PROC_HARDWARE=y |
158 | CONFIG_ZONE_DMA=y | ||
159 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
96 | 160 | ||
97 | # | 161 | # |
98 | # Device Drivers | 162 | # Networking |
99 | # | ||
100 | |||
101 | # | ||
102 | # Generic Driver Options | ||
103 | # | ||
104 | CONFIG_STANDALONE=y | ||
105 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
106 | CONFIG_FW_LOADER=m | ||
107 | # CONFIG_DEBUG_DRIVER is not set | ||
108 | |||
109 | # | ||
110 | # Memory Technology Devices (MTD) | ||
111 | # | ||
112 | # CONFIG_MTD is not set | ||
113 | |||
114 | # | ||
115 | # Parallel port support | ||
116 | # | ||
117 | # CONFIG_PARPORT is not set | ||
118 | |||
119 | # | ||
120 | # Plug and Play support | ||
121 | # | ||
122 | |||
123 | # | ||
124 | # Block devices | ||
125 | # | ||
126 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
127 | CONFIG_BLK_DEV_LOOP=y | ||
128 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
129 | CONFIG_BLK_DEV_NBD=m | ||
130 | CONFIG_BLK_DEV_RAM=y | ||
131 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
132 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
133 | CONFIG_BLK_DEV_INITRD=y | ||
134 | CONFIG_INITRAMFS_SOURCE="" | ||
135 | CONFIG_CDROM_PKTCDVD=m | ||
136 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
137 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
138 | |||
139 | # | ||
140 | # IO Schedulers | ||
141 | # | ||
142 | CONFIG_IOSCHED_NOOP=y | ||
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | ||
145 | CONFIG_IOSCHED_CFQ=y | ||
146 | CONFIG_ATA_OVER_ETH=m | ||
147 | |||
148 | # | ||
149 | # ATA/ATAPI/MFM/RLL support | ||
150 | # | ||
151 | # CONFIG_IDE is not set | ||
152 | |||
153 | # | ||
154 | # SCSI device support | ||
155 | # | ||
156 | CONFIG_SCSI=y | ||
157 | CONFIG_SCSI_PROC_FS=y | ||
158 | |||
159 | # | ||
160 | # SCSI support type (disk, tape, CD-ROM) | ||
161 | # | ||
162 | CONFIG_BLK_DEV_SD=y | ||
163 | CONFIG_CHR_DEV_ST=m | ||
164 | # CONFIG_CHR_DEV_OSST is not set | ||
165 | CONFIG_BLK_DEV_SR=y | ||
166 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
167 | CONFIG_CHR_DEV_SG=m | ||
168 | |||
169 | # | ||
170 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
171 | # | ||
172 | # CONFIG_SCSI_MULTI_LUN is not set | ||
173 | CONFIG_SCSI_CONSTANTS=y | ||
174 | # CONFIG_SCSI_LOGGING is not set | ||
175 | |||
176 | # | ||
177 | # SCSI Transport Attributes | ||
178 | # | ||
179 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
180 | # CONFIG_SCSI_FC_ATTRS is not set | ||
181 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
182 | |||
183 | # | ||
184 | # SCSI low-level drivers | ||
185 | # | ||
186 | # CONFIG_SCSI_SATA is not set | ||
187 | # CONFIG_SCSI_DEBUG is not set | ||
188 | |||
189 | # | ||
190 | # Multi-device support (RAID and LVM) | ||
191 | # | ||
192 | CONFIG_MD=y | ||
193 | CONFIG_BLK_DEV_MD=m | ||
194 | CONFIG_MD_LINEAR=m | ||
195 | CONFIG_MD_RAID0=m | ||
196 | CONFIG_MD_RAID1=m | ||
197 | # CONFIG_MD_RAID10 is not set | ||
198 | CONFIG_MD_RAID5=m | ||
199 | CONFIG_MD_RAID6=m | ||
200 | CONFIG_MD_MULTIPATH=m | ||
201 | # CONFIG_MD_FAULTY is not set | ||
202 | CONFIG_BLK_DEV_DM=m | ||
203 | CONFIG_DM_CRYPT=m | ||
204 | CONFIG_DM_SNAPSHOT=m | ||
205 | CONFIG_DM_MIRROR=m | ||
206 | CONFIG_DM_ZERO=m | ||
207 | CONFIG_DM_MULTIPATH=m | ||
208 | CONFIG_DM_MULTIPATH_EMC=m | ||
209 | |||
210 | # | ||
211 | # Fusion MPT device support | ||
212 | # | ||
213 | |||
214 | # | ||
215 | # IEEE 1394 (FireWire) support | ||
216 | # | ||
217 | |||
218 | # | ||
219 | # I2O device support | ||
220 | # | ||
221 | |||
222 | # | ||
223 | # Networking support | ||
224 | # | 163 | # |
225 | CONFIG_NET=y | 164 | CONFIG_NET=y |
226 | 165 | ||
@@ -230,10 +169,17 @@ CONFIG_NET=y | |||
230 | CONFIG_PACKET=y | 169 | CONFIG_PACKET=y |
231 | # CONFIG_PACKET_MMAP is not set | 170 | # CONFIG_PACKET_MMAP is not set |
232 | CONFIG_UNIX=y | 171 | CONFIG_UNIX=y |
172 | CONFIG_XFRM=y | ||
173 | # CONFIG_XFRM_USER is not set | ||
174 | # CONFIG_XFRM_SUB_POLICY is not set | ||
175 | CONFIG_XFRM_MIGRATE=y | ||
176 | # CONFIG_XFRM_STATISTICS is not set | ||
233 | CONFIG_NET_KEY=y | 177 | CONFIG_NET_KEY=y |
178 | CONFIG_NET_KEY_MIGRATE=y | ||
234 | CONFIG_INET=y | 179 | CONFIG_INET=y |
235 | # CONFIG_IP_MULTICAST is not set | 180 | # CONFIG_IP_MULTICAST is not set |
236 | # CONFIG_IP_ADVANCED_ROUTER is not set | 181 | # CONFIG_IP_ADVANCED_ROUTER is not set |
182 | CONFIG_IP_FIB_HASH=y | ||
237 | CONFIG_IP_PNP=y | 183 | CONFIG_IP_PNP=y |
238 | CONFIG_IP_PNP_DHCP=y | 184 | CONFIG_IP_PNP_DHCP=y |
239 | CONFIG_IP_PNP_BOOTP=y | 185 | CONFIG_IP_PNP_BOOTP=y |
@@ -245,145 +191,199 @@ CONFIG_SYN_COOKIES=y | |||
245 | CONFIG_INET_AH=m | 191 | CONFIG_INET_AH=m |
246 | CONFIG_INET_ESP=m | 192 | CONFIG_INET_ESP=m |
247 | CONFIG_INET_IPCOMP=m | 193 | CONFIG_INET_IPCOMP=m |
194 | CONFIG_INET_XFRM_TUNNEL=m | ||
248 | CONFIG_INET_TUNNEL=m | 195 | CONFIG_INET_TUNNEL=m |
249 | CONFIG_IP_TCPDIAG=m | 196 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
250 | CONFIG_IP_TCPDIAG_IPV6=y | 197 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
251 | 198 | CONFIG_INET_XFRM_MODE_BEET=m | |
252 | # | 199 | CONFIG_INET_LRO=m |
253 | # IP: Virtual Server Configuration | 200 | CONFIG_INET_DIAG=m |
254 | # | 201 | CONFIG_INET_TCP_DIAG=m |
202 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
203 | CONFIG_TCP_CONG_CUBIC=y | ||
204 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
205 | # CONFIG_TCP_MD5SIG is not set | ||
255 | # CONFIG_IP_VS is not set | 206 | # CONFIG_IP_VS is not set |
256 | CONFIG_IPV6=m | 207 | CONFIG_IPV6=m |
257 | CONFIG_IPV6_PRIVACY=y | 208 | CONFIG_IPV6_PRIVACY=y |
209 | CONFIG_IPV6_ROUTER_PREF=y | ||
210 | CONFIG_IPV6_ROUTE_INFO=y | ||
211 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
258 | CONFIG_INET6_AH=m | 212 | CONFIG_INET6_AH=m |
259 | CONFIG_INET6_ESP=m | 213 | CONFIG_INET6_ESP=m |
260 | CONFIG_INET6_IPCOMP=m | 214 | CONFIG_INET6_IPCOMP=m |
215 | # CONFIG_IPV6_MIP6 is not set | ||
216 | CONFIG_INET6_XFRM_TUNNEL=m | ||
261 | CONFIG_INET6_TUNNEL=m | 217 | CONFIG_INET6_TUNNEL=m |
218 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
219 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
220 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
221 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
222 | CONFIG_IPV6_SIT=m | ||
262 | CONFIG_IPV6_TUNNEL=m | 223 | CONFIG_IPV6_TUNNEL=m |
224 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
225 | # CONFIG_NETWORK_SECMARK is not set | ||
263 | CONFIG_NETFILTER=y | 226 | CONFIG_NETFILTER=y |
264 | # CONFIG_NETFILTER_DEBUG is not set | 227 | # CONFIG_NETFILTER_DEBUG is not set |
228 | CONFIG_NETFILTER_ADVANCED=y | ||
229 | |||
230 | # | ||
231 | # Core Netfilter Configuration | ||
232 | # | ||
233 | CONFIG_NETFILTER_NETLINK=m | ||
234 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
235 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
236 | CONFIG_NF_CONNTRACK=m | ||
237 | CONFIG_NF_CT_ACCT=y | ||
238 | CONFIG_NF_CONNTRACK_MARK=y | ||
239 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
240 | CONFIG_NF_CT_PROTO_GRE=m | ||
241 | CONFIG_NF_CT_PROTO_SCTP=m | ||
242 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
243 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
244 | CONFIG_NF_CONNTRACK_FTP=m | ||
245 | CONFIG_NF_CONNTRACK_H323=m | ||
246 | CONFIG_NF_CONNTRACK_IRC=m | ||
247 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
248 | CONFIG_NF_CONNTRACK_PPTP=m | ||
249 | CONFIG_NF_CONNTRACK_SANE=m | ||
250 | CONFIG_NF_CONNTRACK_SIP=m | ||
251 | CONFIG_NF_CONNTRACK_TFTP=m | ||
252 | # CONFIG_NF_CT_NETLINK is not set | ||
253 | CONFIG_NETFILTER_XTABLES=m | ||
254 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
255 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
265 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
265 | 294 | ||
266 | # | 295 | # |
267 | # IP: Netfilter Configuration | 296 | # IP: Netfilter Configuration |
268 | # | 297 | # |
269 | CONFIG_IP_NF_CONNTRACK=m | 298 | CONFIG_NF_CONNTRACK_IPV4=m |
270 | # CONFIG_IP_NF_CT_ACCT is not set | 299 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
271 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
272 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
273 | CONFIG_IP_NF_FTP=m | ||
274 | CONFIG_IP_NF_IRC=m | ||
275 | CONFIG_IP_NF_TFTP=m | ||
276 | CONFIG_IP_NF_AMANDA=m | ||
277 | CONFIG_IP_NF_QUEUE=m | 300 | CONFIG_IP_NF_QUEUE=m |
278 | CONFIG_IP_NF_IPTABLES=m | 301 | CONFIG_IP_NF_IPTABLES=m |
279 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
280 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
281 | CONFIG_IP_NF_MATCH_MAC=m | ||
282 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
283 | CONFIG_IP_NF_MATCH_MARK=m | ||
284 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
285 | CONFIG_IP_NF_MATCH_TOS=m | ||
286 | CONFIG_IP_NF_MATCH_RECENT=m | 302 | CONFIG_IP_NF_MATCH_RECENT=m |
287 | CONFIG_IP_NF_MATCH_ECN=m | 303 | CONFIG_IP_NF_MATCH_ECN=m |
288 | CONFIG_IP_NF_MATCH_DSCP=m | 304 | CONFIG_IP_NF_MATCH_AH=m |
289 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
290 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
291 | CONFIG_IP_NF_MATCH_TTL=m | 305 | CONFIG_IP_NF_MATCH_TTL=m |
292 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
293 | CONFIG_IP_NF_MATCH_HELPER=m | ||
294 | CONFIG_IP_NF_MATCH_STATE=m | ||
295 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
296 | CONFIG_IP_NF_MATCH_OWNER=m | ||
297 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 306 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
298 | CONFIG_IP_NF_MATCH_REALM=m | ||
299 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
300 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
301 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
302 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
303 | CONFIG_IP_NF_FILTER=m | 307 | CONFIG_IP_NF_FILTER=m |
304 | CONFIG_IP_NF_TARGET_REJECT=m | 308 | CONFIG_IP_NF_TARGET_REJECT=m |
305 | CONFIG_IP_NF_TARGET_LOG=m | 309 | CONFIG_IP_NF_TARGET_LOG=m |
306 | CONFIG_IP_NF_TARGET_ULOG=m | 310 | CONFIG_IP_NF_TARGET_ULOG=m |
307 | CONFIG_IP_NF_TARGET_TCPMSS=m | 311 | CONFIG_NF_NAT=m |
308 | CONFIG_IP_NF_NAT=m | 312 | CONFIG_NF_NAT_NEEDED=y |
309 | CONFIG_IP_NF_NAT_NEEDED=y | ||
310 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 313 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
311 | CONFIG_IP_NF_TARGET_REDIRECT=m | 314 | CONFIG_IP_NF_TARGET_REDIRECT=m |
312 | CONFIG_IP_NF_TARGET_NETMAP=m | 315 | CONFIG_IP_NF_TARGET_NETMAP=m |
313 | CONFIG_IP_NF_TARGET_SAME=m | 316 | CONFIG_NF_NAT_SNMP_BASIC=m |
314 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 317 | CONFIG_NF_NAT_PROTO_GRE=m |
315 | CONFIG_IP_NF_NAT_IRC=m | 318 | CONFIG_NF_NAT_FTP=m |
316 | CONFIG_IP_NF_NAT_FTP=m | 319 | CONFIG_NF_NAT_IRC=m |
317 | CONFIG_IP_NF_NAT_TFTP=m | 320 | CONFIG_NF_NAT_TFTP=m |
318 | CONFIG_IP_NF_NAT_AMANDA=m | 321 | CONFIG_NF_NAT_AMANDA=m |
322 | CONFIG_NF_NAT_PPTP=m | ||
323 | CONFIG_NF_NAT_H323=m | ||
324 | CONFIG_NF_NAT_SIP=m | ||
319 | CONFIG_IP_NF_MANGLE=m | 325 | CONFIG_IP_NF_MANGLE=m |
320 | CONFIG_IP_NF_TARGET_TOS=m | ||
321 | CONFIG_IP_NF_TARGET_ECN=m | 326 | CONFIG_IP_NF_TARGET_ECN=m |
322 | CONFIG_IP_NF_TARGET_DSCP=m | 327 | CONFIG_IP_NF_TARGET_TTL=m |
323 | CONFIG_IP_NF_TARGET_MARK=m | 328 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
324 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
325 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
326 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
327 | CONFIG_IP_NF_RAW=m | 329 | CONFIG_IP_NF_RAW=m |
328 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
329 | CONFIG_IP_NF_ARPTABLES=m | 330 | CONFIG_IP_NF_ARPTABLES=m |
330 | CONFIG_IP_NF_ARPFILTER=m | 331 | CONFIG_IP_NF_ARPFILTER=m |
331 | CONFIG_IP_NF_ARP_MANGLE=m | 332 | CONFIG_IP_NF_ARP_MANGLE=m |
332 | 333 | ||
333 | # | 334 | # |
334 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 335 | # IPv6: Netfilter Configuration |
335 | # | 336 | # |
337 | CONFIG_NF_CONNTRACK_IPV6=m | ||
336 | CONFIG_IP6_NF_QUEUE=m | 338 | CONFIG_IP6_NF_QUEUE=m |
337 | CONFIG_IP6_NF_IPTABLES=m | 339 | CONFIG_IP6_NF_IPTABLES=m |
338 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
339 | CONFIG_IP6_NF_MATCH_MAC=m | ||
340 | CONFIG_IP6_NF_MATCH_RT=m | 340 | CONFIG_IP6_NF_MATCH_RT=m |
341 | CONFIG_IP6_NF_MATCH_OPTS=m | 341 | CONFIG_IP6_NF_MATCH_OPTS=m |
342 | CONFIG_IP6_NF_MATCH_FRAG=m | 342 | CONFIG_IP6_NF_MATCH_FRAG=m |
343 | CONFIG_IP6_NF_MATCH_HL=m | 343 | CONFIG_IP6_NF_MATCH_HL=m |
344 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
345 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
346 | CONFIG_IP6_NF_MATCH_MARK=m | ||
347 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 344 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
348 | CONFIG_IP6_NF_MATCH_AHESP=m | 345 | CONFIG_IP6_NF_MATCH_AH=m |
349 | CONFIG_IP6_NF_MATCH_LENGTH=m | 346 | CONFIG_IP6_NF_MATCH_MH=m |
350 | CONFIG_IP6_NF_MATCH_EUI64=m | 347 | CONFIG_IP6_NF_MATCH_EUI64=m |
351 | CONFIG_IP6_NF_FILTER=m | 348 | CONFIG_IP6_NF_FILTER=m |
352 | CONFIG_IP6_NF_TARGET_LOG=m | 349 | CONFIG_IP6_NF_TARGET_LOG=m |
350 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
353 | CONFIG_IP6_NF_MANGLE=m | 351 | CONFIG_IP6_NF_MANGLE=m |
354 | CONFIG_IP6_NF_TARGET_MARK=m | 352 | CONFIG_IP6_NF_TARGET_HL=m |
355 | CONFIG_IP6_NF_RAW=m | 353 | CONFIG_IP6_NF_RAW=m |
356 | CONFIG_XFRM=y | 354 | CONFIG_IP_DCCP=m |
357 | CONFIG_XFRM_USER=m | 355 | CONFIG_INET_DCCP_DIAG=m |
356 | CONFIG_IP_DCCP_ACKVEC=y | ||
358 | 357 | ||
359 | # | 358 | # |
360 | # SCTP Configuration (EXPERIMENTAL) | 359 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
361 | # | 360 | # |
361 | CONFIG_IP_DCCP_CCID2=m | ||
362 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
363 | CONFIG_IP_DCCP_CCID3=m | ||
364 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
365 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
366 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
362 | CONFIG_IP_SCTP=m | 367 | CONFIG_IP_SCTP=m |
363 | # CONFIG_SCTP_DBG_MSG is not set | 368 | # CONFIG_SCTP_DBG_MSG is not set |
364 | # CONFIG_SCTP_DBG_OBJCNT is not set | 369 | # CONFIG_SCTP_DBG_OBJCNT is not set |
365 | # CONFIG_SCTP_HMAC_NONE is not set | 370 | # CONFIG_SCTP_HMAC_NONE is not set |
366 | # CONFIG_SCTP_HMAC_SHA1 is not set | 371 | # CONFIG_SCTP_HMAC_SHA1 is not set |
367 | CONFIG_SCTP_HMAC_MD5=y | 372 | CONFIG_SCTP_HMAC_MD5=y |
373 | # CONFIG_TIPC is not set | ||
368 | # CONFIG_ATM is not set | 374 | # CONFIG_ATM is not set |
369 | # CONFIG_BRIDGE is not set | 375 | # CONFIG_BRIDGE is not set |
370 | # CONFIG_VLAN_8021Q is not set | 376 | # CONFIG_VLAN_8021Q is not set |
371 | # CONFIG_DECNET is not set | 377 | # CONFIG_DECNET is not set |
372 | CONFIG_LLC=m | 378 | CONFIG_LLC=m |
373 | # CONFIG_LLC2 is not set | 379 | # CONFIG_LLC2 is not set |
374 | CONFIG_IPX=m | 380 | # CONFIG_IPX is not set |
375 | # CONFIG_IPX_INTERN is not set | ||
376 | CONFIG_ATALK=m | 381 | CONFIG_ATALK=m |
377 | # CONFIG_DEV_APPLETALK is not set | 382 | # CONFIG_DEV_APPLETALK is not set |
378 | # CONFIG_X25 is not set | 383 | # CONFIG_X25 is not set |
379 | # CONFIG_LAPB is not set | 384 | # CONFIG_LAPB is not set |
380 | # CONFIG_NET_DIVERT is not set | ||
381 | # CONFIG_ECONET is not set | 385 | # CONFIG_ECONET is not set |
382 | # CONFIG_WAN_ROUTER is not set | 386 | # CONFIG_WAN_ROUTER is not set |
383 | |||
384 | # | ||
385 | # QoS and/or fair queueing | ||
386 | # | ||
387 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
388 | CONFIG_NET_CLS_ROUTE=y | 388 | CONFIG_NET_CLS_ROUTE=y |
389 | 389 | ||
@@ -391,46 +391,154 @@ CONFIG_NET_CLS_ROUTE=y | |||
391 | # Network testing | 391 | # Network testing |
392 | # | 392 | # |
393 | # CONFIG_NET_PKTGEN is not set | 393 | # CONFIG_NET_PKTGEN is not set |
394 | CONFIG_NETPOLL=y | ||
395 | # CONFIG_NETPOLL_RX is not set | ||
396 | # CONFIG_NETPOLL_TRAP is not set | ||
397 | CONFIG_NET_POLL_CONTROLLER=y | ||
398 | # CONFIG_HAMRADIO is not set | 394 | # CONFIG_HAMRADIO is not set |
395 | # CONFIG_CAN is not set | ||
399 | # CONFIG_IRDA is not set | 396 | # CONFIG_IRDA is not set |
400 | # CONFIG_BT is not set | 397 | # CONFIG_BT is not set |
401 | CONFIG_NETDEVICES=y | 398 | # CONFIG_AF_RXRPC is not set |
402 | CONFIG_DUMMY=m | ||
403 | # CONFIG_BONDING is not set | ||
404 | CONFIG_EQUALIZER=m | ||
405 | # CONFIG_TUN is not set | ||
406 | 399 | ||
407 | # | 400 | # |
408 | # Ethernet (10 or 100Mbit) | 401 | # Wireless |
409 | # | 402 | # |
410 | CONFIG_NET_ETHERNET=y | 403 | # CONFIG_CFG80211 is not set |
411 | CONFIG_MII=m | 404 | CONFIG_WIRELESS_EXT=y |
412 | CONFIG_APOLLO_ELPLUS=y | 405 | # CONFIG_MAC80211 is not set |
406 | CONFIG_IEEE80211=m | ||
407 | # CONFIG_IEEE80211_DEBUG is not set | ||
408 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
409 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
410 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
411 | CONFIG_IEEE80211_SOFTMAC=m | ||
412 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
413 | # CONFIG_RFKILL is not set | ||
414 | # CONFIG_NET_9P is not set | ||
413 | 415 | ||
414 | # | 416 | # |
415 | # Ethernet (1000 Mbit) | 417 | # Device Drivers |
416 | # | 418 | # |
417 | 419 | ||
418 | # | 420 | # |
419 | # Ethernet (10000 Mbit) | 421 | # Generic Driver Options |
420 | # | 422 | # |
423 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
424 | CONFIG_STANDALONE=y | ||
425 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
426 | CONFIG_FW_LOADER=m | ||
427 | # CONFIG_SYS_HYPERVISOR is not set | ||
428 | CONFIG_CONNECTOR=m | ||
429 | # CONFIG_MTD is not set | ||
430 | # CONFIG_PARPORT is not set | ||
431 | CONFIG_BLK_DEV=y | ||
432 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
433 | CONFIG_BLK_DEV_LOOP=y | ||
434 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
435 | CONFIG_BLK_DEV_NBD=m | ||
436 | CONFIG_BLK_DEV_RAM=y | ||
437 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
438 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
439 | # CONFIG_BLK_DEV_XIP is not set | ||
440 | CONFIG_CDROM_PKTCDVD=m | ||
441 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
442 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
443 | CONFIG_ATA_OVER_ETH=m | ||
444 | CONFIG_MISC_DEVICES=y | ||
445 | # CONFIG_EEPROM_93CX6 is not set | ||
446 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
447 | CONFIG_HAVE_IDE=y | ||
448 | # CONFIG_IDE is not set | ||
421 | 449 | ||
422 | # | 450 | # |
423 | # Token Ring devices | 451 | # SCSI device support |
424 | # | 452 | # |
453 | CONFIG_RAID_ATTRS=m | ||
454 | CONFIG_SCSI=y | ||
455 | CONFIG_SCSI_DMA=y | ||
456 | CONFIG_SCSI_TGT=m | ||
457 | # CONFIG_SCSI_NETLINK is not set | ||
458 | CONFIG_SCSI_PROC_FS=y | ||
425 | 459 | ||
426 | # | 460 | # |
427 | # Wireless LAN (non-hamradio) | 461 | # SCSI support type (disk, tape, CD-ROM) |
428 | # | 462 | # |
429 | # CONFIG_NET_RADIO is not set | 463 | CONFIG_BLK_DEV_SD=y |
464 | CONFIG_CHR_DEV_ST=m | ||
465 | CONFIG_CHR_DEV_OSST=m | ||
466 | CONFIG_BLK_DEV_SR=y | ||
467 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
468 | CONFIG_CHR_DEV_SG=m | ||
469 | # CONFIG_CHR_DEV_SCH is not set | ||
470 | |||
471 | # | ||
472 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
473 | # | ||
474 | # CONFIG_SCSI_MULTI_LUN is not set | ||
475 | CONFIG_SCSI_CONSTANTS=y | ||
476 | # CONFIG_SCSI_LOGGING is not set | ||
477 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
478 | CONFIG_SCSI_WAIT_SCAN=m | ||
479 | |||
480 | # | ||
481 | # SCSI Transports | ||
482 | # | ||
483 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
484 | # CONFIG_SCSI_FC_ATTRS is not set | ||
485 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
486 | CONFIG_SCSI_SAS_ATTRS=m | ||
487 | CONFIG_SCSI_SAS_LIBSAS=m | ||
488 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
489 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
490 | CONFIG_SCSI_SRP_ATTRS=m | ||
491 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
492 | CONFIG_SCSI_LOWLEVEL=y | ||
493 | CONFIG_ISCSI_TCP=m | ||
494 | # CONFIG_SCSI_DEBUG is not set | ||
495 | CONFIG_MD=y | ||
496 | CONFIG_BLK_DEV_MD=m | ||
497 | CONFIG_MD_LINEAR=m | ||
498 | CONFIG_MD_RAID0=m | ||
499 | CONFIG_MD_RAID1=m | ||
500 | # CONFIG_MD_RAID10 is not set | ||
501 | CONFIG_MD_RAID456=m | ||
502 | CONFIG_MD_RAID5_RESHAPE=y | ||
503 | CONFIG_MD_MULTIPATH=m | ||
504 | # CONFIG_MD_FAULTY is not set | ||
505 | CONFIG_BLK_DEV_DM=m | ||
506 | # CONFIG_DM_DEBUG is not set | ||
507 | CONFIG_DM_CRYPT=m | ||
508 | CONFIG_DM_SNAPSHOT=m | ||
509 | CONFIG_DM_MIRROR=m | ||
510 | CONFIG_DM_ZERO=m | ||
511 | CONFIG_DM_MULTIPATH=m | ||
512 | CONFIG_DM_MULTIPATH_EMC=m | ||
513 | CONFIG_DM_MULTIPATH_RDAC=m | ||
514 | CONFIG_DM_MULTIPATH_HP=m | ||
515 | # CONFIG_DM_DELAY is not set | ||
516 | CONFIG_DM_UEVENT=y | ||
517 | CONFIG_NETDEVICES=y | ||
518 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
519 | CONFIG_DUMMY=m | ||
520 | # CONFIG_BONDING is not set | ||
521 | CONFIG_MACVLAN=m | ||
522 | CONFIG_EQUALIZER=m | ||
523 | # CONFIG_TUN is not set | ||
524 | CONFIG_VETH=m | ||
525 | # CONFIG_PHYLIB is not set | ||
526 | CONFIG_NET_ETHERNET=y | ||
527 | # CONFIG_MII is not set | ||
528 | CONFIG_APOLLO_ELPLUS=y | ||
529 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
530 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
531 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
532 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
533 | # CONFIG_B44 is not set | ||
534 | # CONFIG_NETDEV_1000 is not set | ||
535 | # CONFIG_NETDEV_10000 is not set | ||
430 | 536 | ||
431 | # | 537 | # |
432 | # Wan interfaces | 538 | # Wireless LAN |
433 | # | 539 | # |
540 | # CONFIG_WLAN_PRE80211 is not set | ||
541 | # CONFIG_WLAN_80211 is not set | ||
434 | # CONFIG_WAN is not set | 542 | # CONFIG_WAN is not set |
435 | CONFIG_PPP=m | 543 | CONFIG_PPP=m |
436 | # CONFIG_PPP_MULTILINK is not set | 544 | # CONFIG_PPP_MULTILINK is not set |
@@ -439,28 +547,28 @@ CONFIG_PPP_ASYNC=m | |||
439 | CONFIG_PPP_SYNC_TTY=m | 547 | CONFIG_PPP_SYNC_TTY=m |
440 | CONFIG_PPP_DEFLATE=m | 548 | CONFIG_PPP_DEFLATE=m |
441 | CONFIG_PPP_BSDCOMP=m | 549 | CONFIG_PPP_BSDCOMP=m |
550 | CONFIG_PPP_MPPE=m | ||
442 | CONFIG_PPPOE=m | 551 | CONFIG_PPPOE=m |
552 | CONFIG_PPPOL2TP=m | ||
443 | CONFIG_SLIP=m | 553 | CONFIG_SLIP=m |
444 | CONFIG_SLIP_COMPRESSED=y | 554 | CONFIG_SLIP_COMPRESSED=y |
555 | CONFIG_SLHC=m | ||
445 | CONFIG_SLIP_SMART=y | 556 | CONFIG_SLIP_SMART=y |
446 | CONFIG_SLIP_MODE_SLIP6=y | 557 | CONFIG_SLIP_MODE_SLIP6=y |
447 | CONFIG_SHAPER=m | ||
448 | CONFIG_NETCONSOLE=m | 558 | CONFIG_NETCONSOLE=m |
449 | 559 | CONFIG_NETCONSOLE_DYNAMIC=y | |
450 | # | 560 | CONFIG_NETPOLL=y |
451 | # ISDN subsystem | 561 | # CONFIG_NETPOLL_TRAP is not set |
452 | # | 562 | CONFIG_NET_POLL_CONTROLLER=y |
453 | # CONFIG_ISDN is not set | 563 | # CONFIG_ISDN is not set |
454 | |||
455 | # | ||
456 | # Telephony Support | ||
457 | # | ||
458 | # CONFIG_PHONE is not set | 564 | # CONFIG_PHONE is not set |
459 | 565 | ||
460 | # | 566 | # |
461 | # Input device support | 567 | # Input device support |
462 | # | 568 | # |
463 | CONFIG_INPUT=y | 569 | CONFIG_INPUT=y |
570 | CONFIG_INPUT_FF_MEMLESS=m | ||
571 | # CONFIG_INPUT_POLLDEV is not set | ||
464 | 572 | ||
465 | # | 573 | # |
466 | # Userland interfaces | 574 | # Userland interfaces |
@@ -470,7 +578,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
470 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 578 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
471 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 579 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
472 | # CONFIG_INPUT_JOYDEV is not set | 580 | # CONFIG_INPUT_JOYDEV is not set |
473 | # CONFIG_INPUT_TSDEV is not set | ||
474 | # CONFIG_INPUT_EVDEV is not set | 581 | # CONFIG_INPUT_EVDEV is not set |
475 | # CONFIG_INPUT_EVBUG is not set | 582 | # CONFIG_INPUT_EVBUG is not set |
476 | 583 | ||
@@ -483,11 +590,19 @@ CONFIG_INPUT_KEYBOARD=y | |||
483 | # CONFIG_KEYBOARD_LKKBD is not set | 590 | # CONFIG_KEYBOARD_LKKBD is not set |
484 | # CONFIG_KEYBOARD_XTKBD is not set | 591 | # CONFIG_KEYBOARD_XTKBD is not set |
485 | # CONFIG_KEYBOARD_NEWTON is not set | 592 | # CONFIG_KEYBOARD_NEWTON is not set |
593 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
486 | CONFIG_INPUT_MOUSE=y | 594 | CONFIG_INPUT_MOUSE=y |
487 | CONFIG_MOUSE_PS2=m | 595 | CONFIG_MOUSE_PS2=m |
596 | CONFIG_MOUSE_PS2_ALPS=y | ||
597 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
598 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
599 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
600 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
601 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
488 | CONFIG_MOUSE_SERIAL=m | 602 | CONFIG_MOUSE_SERIAL=m |
489 | # CONFIG_MOUSE_VSXXXAA is not set | 603 | # CONFIG_MOUSE_VSXXXAA is not set |
490 | # CONFIG_INPUT_JOYSTICK is not set | 604 | # CONFIG_INPUT_JOYSTICK is not set |
605 | # CONFIG_INPUT_TABLET is not set | ||
491 | # CONFIG_INPUT_TOUCHSCREEN is not set | 606 | # CONFIG_INPUT_TOUCHSCREEN is not set |
492 | # CONFIG_INPUT_MISC is not set | 607 | # CONFIG_INPUT_MISC is not set |
493 | 608 | ||
@@ -495,7 +610,7 @@ CONFIG_MOUSE_SERIAL=m | |||
495 | # Hardware I/O ports | 610 | # Hardware I/O ports |
496 | # | 611 | # |
497 | CONFIG_SERIO=m | 612 | CONFIG_SERIO=m |
498 | CONFIG_SERIO_SERPORT=m | 613 | # CONFIG_SERIO_SERPORT is not set |
499 | CONFIG_SERIO_LIBPS2=m | 614 | CONFIG_SERIO_LIBPS2=m |
500 | # CONFIG_SERIO_RAW is not set | 615 | # CONFIG_SERIO_RAW is not set |
501 | # CONFIG_GAMEPORT is not set | 616 | # CONFIG_GAMEPORT is not set |
@@ -506,6 +621,7 @@ CONFIG_SERIO_LIBPS2=m | |||
506 | CONFIG_VT=y | 621 | CONFIG_VT=y |
507 | CONFIG_VT_CONSOLE=y | 622 | CONFIG_VT_CONSOLE=y |
508 | CONFIG_HW_CONSOLE=y | 623 | CONFIG_HW_CONSOLE=y |
624 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
509 | # CONFIG_SERIAL_NONSTANDARD is not set | 625 | # CONFIG_SERIAL_NONSTANDARD is not set |
510 | 626 | ||
511 | # | 627 | # |
@@ -519,90 +635,114 @@ CONFIG_HW_CONSOLE=y | |||
519 | CONFIG_UNIX98_PTYS=y | 635 | CONFIG_UNIX98_PTYS=y |
520 | CONFIG_LEGACY_PTYS=y | 636 | CONFIG_LEGACY_PTYS=y |
521 | CONFIG_LEGACY_PTY_COUNT=256 | 637 | CONFIG_LEGACY_PTY_COUNT=256 |
522 | |||
523 | # | ||
524 | # IPMI | ||
525 | # | ||
526 | # CONFIG_IPMI_HANDLER is not set | 638 | # CONFIG_IPMI_HANDLER is not set |
527 | 639 | # CONFIG_HW_RANDOM is not set | |
528 | # | 640 | CONFIG_GEN_RTC=m |
529 | # Watchdog Cards | ||
530 | # | ||
531 | # CONFIG_WATCHDOG is not set | ||
532 | CONFIG_GEN_RTC=y | ||
533 | CONFIG_GEN_RTC_X=y | 641 | CONFIG_GEN_RTC_X=y |
534 | # CONFIG_DTLK is not set | ||
535 | # CONFIG_R3964 is not set | 642 | # CONFIG_R3964 is not set |
536 | |||
537 | # | ||
538 | # Ftape, the floppy tape device driver | ||
539 | # | ||
540 | # CONFIG_DRM is not set | ||
541 | # CONFIG_RAW_DRIVER is not set | 643 | # CONFIG_RAW_DRIVER is not set |
644 | # CONFIG_TCG_TPM is not set | ||
645 | # CONFIG_I2C is not set | ||
542 | 646 | ||
543 | # | 647 | # |
544 | # TPM devices | 648 | # SPI support |
545 | # | 649 | # |
650 | # CONFIG_SPI is not set | ||
651 | # CONFIG_SPI_MASTER is not set | ||
652 | # CONFIG_W1 is not set | ||
653 | # CONFIG_POWER_SUPPLY is not set | ||
654 | # CONFIG_HWMON is not set | ||
655 | # CONFIG_THERMAL is not set | ||
656 | # CONFIG_WATCHDOG is not set | ||
546 | 657 | ||
547 | # | 658 | # |
548 | # I2C support | 659 | # Sonics Silicon Backplane |
549 | # | 660 | # |
550 | # CONFIG_I2C is not set | 661 | CONFIG_SSB_POSSIBLE=y |
662 | # CONFIG_SSB is not set | ||
551 | 663 | ||
552 | # | 664 | # |
553 | # Dallas's 1-wire bus | 665 | # Multifunction device drivers |
554 | # | 666 | # |
555 | # CONFIG_W1 is not set | 667 | # CONFIG_MFD_SM501 is not set |
556 | 668 | ||
557 | # | 669 | # |
558 | # Misc devices | 670 | # Multimedia devices |
559 | # | 671 | # |
672 | # CONFIG_VIDEO_DEV is not set | ||
673 | # CONFIG_DVB_CORE is not set | ||
674 | # CONFIG_DAB is not set | ||
560 | 675 | ||
561 | # | 676 | # |
562 | # Multimedia devices | 677 | # Graphics support |
563 | # | 678 | # |
564 | # CONFIG_VIDEO_DEV is not set | 679 | # CONFIG_VGASTATE is not set |
680 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
681 | CONFIG_FB=y | ||
682 | # CONFIG_FIRMWARE_EDID is not set | ||
683 | # CONFIG_FB_DDC is not set | ||
684 | CONFIG_FB_CFB_FILLRECT=y | ||
685 | # CONFIG_FB_CFB_COPYAREA is not set | ||
686 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
687 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
688 | # CONFIG_FB_SYS_FILLRECT is not set | ||
689 | # CONFIG_FB_SYS_COPYAREA is not set | ||
690 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
691 | # CONFIG_FB_SYS_FOPS is not set | ||
692 | CONFIG_FB_DEFERRED_IO=y | ||
693 | # CONFIG_FB_SVGALIB is not set | ||
694 | # CONFIG_FB_MACMODES is not set | ||
695 | # CONFIG_FB_BACKLIGHT is not set | ||
696 | # CONFIG_FB_MODE_HELPERS is not set | ||
697 | # CONFIG_FB_TILEBLITTING is not set | ||
565 | 698 | ||
566 | # | 699 | # |
567 | # Digital Video Broadcasting Devices | 700 | # Frame buffer hardware drivers |
568 | # | 701 | # |
569 | # CONFIG_DVB is not set | 702 | CONFIG_FB_APOLLO=y |
703 | # CONFIG_FB_UVESA is not set | ||
704 | # CONFIG_FB_S1D13XXX is not set | ||
705 | # CONFIG_FB_VIRTUAL is not set | ||
706 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
570 | 707 | ||
571 | # | 708 | # |
572 | # Graphics support | 709 | # Display device support |
573 | # | 710 | # |
574 | # CONFIG_FB is not set | 711 | # CONFIG_DISPLAY_SUPPORT is not set |
575 | 712 | ||
576 | # | 713 | # |
577 | # Console display driver support | 714 | # Console display driver support |
578 | # | 715 | # |
579 | CONFIG_DUMMY_CONSOLE=y | 716 | CONFIG_DUMMY_CONSOLE=y |
717 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
718 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
719 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
720 | # CONFIG_FONTS is not set | ||
721 | CONFIG_FONT_8x8=y | ||
722 | CONFIG_FONT_8x16=y | ||
723 | CONFIG_LOGO=y | ||
724 | CONFIG_LOGO_LINUX_MONO=y | ||
725 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
726 | # CONFIG_LOGO_LINUX_CLUT224 is not set | ||
580 | 727 | ||
581 | # | 728 | # |
582 | # Sound | 729 | # Sound |
583 | # | 730 | # |
584 | # CONFIG_SOUND is not set | 731 | # CONFIG_SOUND is not set |
585 | 732 | CONFIG_HID_SUPPORT=y | |
586 | # | 733 | CONFIG_HID=m |
587 | # USB support | 734 | # CONFIG_HID_DEBUG is not set |
588 | # | 735 | CONFIG_HIDRAW=y |
589 | # CONFIG_USB_ARCH_HAS_HCD is not set | 736 | # CONFIG_USB_SUPPORT is not set |
590 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
591 | |||
592 | # | ||
593 | # USB Gadget Support | ||
594 | # | ||
595 | # CONFIG_USB_GADGET is not set | ||
596 | |||
597 | # | ||
598 | # MMC/SD Card support | ||
599 | # | ||
600 | # CONFIG_MMC is not set | 737 | # CONFIG_MMC is not set |
738 | # CONFIG_MEMSTICK is not set | ||
739 | # CONFIG_NEW_LEDS is not set | ||
740 | # CONFIG_RTC_CLASS is not set | ||
601 | 741 | ||
602 | # | 742 | # |
603 | # InfiniBand support | 743 | # Userspace I/O |
604 | # | 744 | # |
605 | # CONFIG_INFINIBAND is not set | 745 | # CONFIG_UIO is not set |
606 | 746 | ||
607 | # | 747 | # |
608 | # Character devices | 748 | # Character devices |
@@ -615,10 +755,11 @@ CONFIG_SERIAL_CONSOLE=y | |||
615 | # | 755 | # |
616 | CONFIG_EXT2_FS=y | 756 | CONFIG_EXT2_FS=y |
617 | # CONFIG_EXT2_FS_XATTR is not set | 757 | # CONFIG_EXT2_FS_XATTR is not set |
758 | # CONFIG_EXT2_FS_XIP is not set | ||
618 | CONFIG_EXT3_FS=y | 759 | CONFIG_EXT3_FS=y |
619 | # CONFIG_EXT3_FS_XATTR is not set | 760 | # CONFIG_EXT3_FS_XATTR is not set |
761 | # CONFIG_EXT4DEV_FS is not set | ||
620 | CONFIG_JBD=y | 762 | CONFIG_JBD=y |
621 | # CONFIG_JBD_DEBUG is not set | ||
622 | CONFIG_REISERFS_FS=m | 763 | CONFIG_REISERFS_FS=m |
623 | # CONFIG_REISERFS_CHECK is not set | 764 | # CONFIG_REISERFS_CHECK is not set |
624 | # CONFIG_REISERFS_PROC_INFO is not set | 765 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -629,25 +770,29 @@ CONFIG_JFS_FS=m | |||
629 | # CONFIG_JFS_DEBUG is not set | 770 | # CONFIG_JFS_DEBUG is not set |
630 | # CONFIG_JFS_STATISTICS is not set | 771 | # CONFIG_JFS_STATISTICS is not set |
631 | CONFIG_FS_POSIX_ACL=y | 772 | CONFIG_FS_POSIX_ACL=y |
632 | |||
633 | # | ||
634 | # XFS support | ||
635 | # | ||
636 | CONFIG_XFS_FS=m | 773 | CONFIG_XFS_FS=m |
637 | CONFIG_XFS_EXPORT=y | ||
638 | # CONFIG_XFS_RT is not set | ||
639 | # CONFIG_XFS_QUOTA is not set | 774 | # CONFIG_XFS_QUOTA is not set |
640 | # CONFIG_XFS_SECURITY is not set | 775 | # CONFIG_XFS_SECURITY is not set |
641 | # CONFIG_XFS_POSIX_ACL is not set | 776 | # CONFIG_XFS_POSIX_ACL is not set |
642 | CONFIG_MINIX_FS=y | 777 | # CONFIG_XFS_RT is not set |
643 | # CONFIG_ROMFS_FS is not set | 778 | CONFIG_GFS2_FS=m |
779 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
780 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
781 | CONFIG_OCFS2_FS=m | ||
782 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
783 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
784 | CONFIG_DNOTIFY=y | ||
785 | CONFIG_INOTIFY=y | ||
786 | CONFIG_INOTIFY_USER=y | ||
644 | CONFIG_QUOTA=y | 787 | CONFIG_QUOTA=y |
788 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
789 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
645 | # CONFIG_QFMT_V1 is not set | 790 | # CONFIG_QFMT_V1 is not set |
646 | # CONFIG_QFMT_V2 is not set | 791 | # CONFIG_QFMT_V2 is not set |
647 | CONFIG_QUOTACTL=y | 792 | CONFIG_QUOTACTL=y |
648 | CONFIG_DNOTIFY=y | ||
649 | CONFIG_AUTOFS_FS=m | 793 | CONFIG_AUTOFS_FS=m |
650 | CONFIG_AUTOFS4_FS=m | 794 | CONFIG_AUTOFS4_FS=m |
795 | CONFIG_FUSE_FS=m | ||
651 | 796 | ||
652 | # | 797 | # |
653 | # CD-ROM/DVD Filesystems | 798 | # CD-ROM/DVD Filesystems |
@@ -655,7 +800,6 @@ CONFIG_AUTOFS4_FS=m | |||
655 | CONFIG_ISO9660_FS=y | 800 | CONFIG_ISO9660_FS=y |
656 | CONFIG_JOLIET=y | 801 | CONFIG_JOLIET=y |
657 | CONFIG_ZISOFS=y | 802 | CONFIG_ZISOFS=y |
658 | CONFIG_ZISOFS_FS=y | ||
659 | CONFIG_UDF_FS=m | 803 | CONFIG_UDF_FS=m |
660 | CONFIG_UDF_NLS=y | 804 | CONFIG_UDF_NLS=y |
661 | 805 | ||
@@ -674,13 +818,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
674 | # | 818 | # |
675 | CONFIG_PROC_FS=y | 819 | CONFIG_PROC_FS=y |
676 | CONFIG_PROC_KCORE=y | 820 | CONFIG_PROC_KCORE=y |
821 | CONFIG_PROC_SYSCTL=y | ||
677 | CONFIG_SYSFS=y | 822 | CONFIG_SYSFS=y |
678 | # CONFIG_DEVFS_FS is not set | ||
679 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
680 | CONFIG_TMPFS=y | 823 | CONFIG_TMPFS=y |
681 | # CONFIG_TMPFS_XATTR is not set | 824 | # CONFIG_TMPFS_POSIX_ACL is not set |
682 | # CONFIG_HUGETLB_PAGE is not set | 825 | # CONFIG_HUGETLB_PAGE is not set |
683 | CONFIG_RAMFS=y | 826 | CONFIG_CONFIGFS_FS=m |
684 | 827 | ||
685 | # | 828 | # |
686 | # Miscellaneous filesystems | 829 | # Miscellaneous filesystems |
@@ -694,44 +837,40 @@ CONFIG_HFSPLUS_FS=m | |||
694 | # CONFIG_EFS_FS is not set | 837 | # CONFIG_EFS_FS is not set |
695 | CONFIG_CRAMFS=m | 838 | CONFIG_CRAMFS=m |
696 | # CONFIG_VXFS_FS is not set | 839 | # CONFIG_VXFS_FS is not set |
840 | CONFIG_MINIX_FS=y | ||
697 | CONFIG_HPFS_FS=m | 841 | CONFIG_HPFS_FS=m |
698 | # CONFIG_QNX4FS_FS is not set | 842 | # CONFIG_QNX4FS_FS is not set |
843 | # CONFIG_ROMFS_FS is not set | ||
699 | CONFIG_SYSV_FS=m | 844 | CONFIG_SYSV_FS=m |
700 | CONFIG_UFS_FS=m | 845 | CONFIG_UFS_FS=m |
701 | # CONFIG_UFS_FS_WRITE is not set | 846 | # CONFIG_UFS_FS_WRITE is not set |
702 | 847 | # CONFIG_UFS_DEBUG is not set | |
703 | # | 848 | CONFIG_NETWORK_FILESYSTEMS=y |
704 | # Network File Systems | ||
705 | # | ||
706 | CONFIG_NFS_FS=y | 849 | CONFIG_NFS_FS=y |
707 | CONFIG_NFS_V3=y | 850 | CONFIG_NFS_V3=y |
851 | # CONFIG_NFS_V3_ACL is not set | ||
708 | CONFIG_NFS_V4=y | 852 | CONFIG_NFS_V4=y |
709 | # CONFIG_NFS_DIRECTIO is not set | 853 | # CONFIG_NFS_DIRECTIO is not set |
710 | CONFIG_NFSD=m | 854 | CONFIG_NFSD=m |
711 | CONFIG_NFSD_V3=y | 855 | CONFIG_NFSD_V3=y |
712 | CONFIG_NFSD_V4=y | 856 | # CONFIG_NFSD_V3_ACL is not set |
857 | # CONFIG_NFSD_V4 is not set | ||
713 | CONFIG_NFSD_TCP=y | 858 | CONFIG_NFSD_TCP=y |
714 | CONFIG_ROOT_NFS=y | 859 | CONFIG_ROOT_NFS=y |
715 | CONFIG_LOCKD=y | 860 | CONFIG_LOCKD=y |
716 | CONFIG_LOCKD_V4=y | 861 | CONFIG_LOCKD_V4=y |
717 | CONFIG_EXPORTFS=m | 862 | CONFIG_EXPORTFS=m |
863 | CONFIG_NFS_COMMON=y | ||
718 | CONFIG_SUNRPC=y | 864 | CONFIG_SUNRPC=y |
719 | CONFIG_SUNRPC_GSS=y | 865 | CONFIG_SUNRPC_GSS=y |
866 | CONFIG_SUNRPC_BIND34=y | ||
720 | CONFIG_RPCSEC_GSS_KRB5=y | 867 | CONFIG_RPCSEC_GSS_KRB5=y |
721 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 868 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
722 | CONFIG_SMB_FS=m | 869 | CONFIG_SMB_FS=m |
723 | CONFIG_SMB_NLS_DEFAULT=y | 870 | CONFIG_SMB_NLS_DEFAULT=y |
724 | CONFIG_SMB_NLS_REMOTE="cp437" | 871 | CONFIG_SMB_NLS_REMOTE="cp437" |
725 | # CONFIG_CIFS is not set | 872 | # CONFIG_CIFS is not set |
726 | CONFIG_NCP_FS=m | 873 | # CONFIG_NCP_FS is not set |
727 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
728 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
729 | # CONFIG_NCPFS_STRONG is not set | ||
730 | CONFIG_NCPFS_NFS_NS=y | ||
731 | CONFIG_NCPFS_OS2_NS=y | ||
732 | # CONFIG_NCPFS_SMALLDOS is not set | ||
733 | CONFIG_NCPFS_NLS=y | ||
734 | # CONFIG_NCPFS_EXTRAS is not set | ||
735 | CONFIG_CODA_FS=m | 874 | CONFIG_CODA_FS=m |
736 | # CONFIG_CODA_FS_OLD_API is not set | 875 | # CONFIG_CODA_FS_OLD_API is not set |
737 | # CONFIG_AFS_FS is not set | 876 | # CONFIG_AFS_FS is not set |
@@ -741,10 +880,6 @@ CONFIG_CODA_FS=m | |||
741 | # | 880 | # |
742 | # CONFIG_PARTITION_ADVANCED is not set | 881 | # CONFIG_PARTITION_ADVANCED is not set |
743 | CONFIG_MSDOS_PARTITION=y | 882 | CONFIG_MSDOS_PARTITION=y |
744 | |||
745 | # | ||
746 | # Native Language Support | ||
747 | # | ||
748 | CONFIG_NLS=y | 883 | CONFIG_NLS=y |
749 | CONFIG_NLS_DEFAULT="iso8859-1" | 884 | CONFIG_NLS_DEFAULT="iso8859-1" |
750 | CONFIG_NLS_CODEPAGE_437=y | 885 | CONFIG_NLS_CODEPAGE_437=y |
@@ -785,35 +920,42 @@ CONFIG_NLS_ISO8859_15=m | |||
785 | CONFIG_NLS_KOI8_R=m | 920 | CONFIG_NLS_KOI8_R=m |
786 | CONFIG_NLS_KOI8_U=m | 921 | CONFIG_NLS_KOI8_U=m |
787 | CONFIG_NLS_UTF8=m | 922 | CONFIG_NLS_UTF8=m |
923 | CONFIG_DLM=m | ||
924 | # CONFIG_DLM_DEBUG is not set | ||
788 | 925 | ||
789 | # | 926 | # |
790 | # Kernel hacking | 927 | # Kernel hacking |
791 | # | 928 | # |
792 | # CONFIG_PRINTK_TIME is not set | 929 | # CONFIG_PRINTK_TIME is not set |
793 | CONFIG_DEBUG_KERNEL=y | 930 | CONFIG_ENABLE_WARN_DEPRECATED=y |
931 | CONFIG_ENABLE_MUST_CHECK=y | ||
794 | CONFIG_MAGIC_SYSRQ=y | 932 | CONFIG_MAGIC_SYSRQ=y |
795 | CONFIG_LOG_BUF_SHIFT=16 | 933 | # CONFIG_UNUSED_SYMBOLS is not set |
796 | # CONFIG_SCHEDSTATS is not set | ||
797 | # CONFIG_DEBUG_SLAB is not set | ||
798 | # CONFIG_DEBUG_SPINLOCK is not set | ||
799 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
800 | # CONFIG_DEBUG_KOBJECT is not set | ||
801 | CONFIG_DEBUG_BUGVERBOSE=y | ||
802 | # CONFIG_DEBUG_INFO is not set | ||
803 | # CONFIG_DEBUG_FS is not set | 934 | # CONFIG_DEBUG_FS is not set |
804 | # CONFIG_FRAME_POINTER is not set | 935 | # CONFIG_HEADERS_CHECK is not set |
936 | # CONFIG_DEBUG_KERNEL is not set | ||
937 | CONFIG_DEBUG_BUGVERBOSE=y | ||
938 | # CONFIG_SAMPLES is not set | ||
805 | 939 | ||
806 | # | 940 | # |
807 | # Security options | 941 | # Security options |
808 | # | 942 | # |
809 | # CONFIG_KEYS is not set | 943 | # CONFIG_KEYS is not set |
810 | # CONFIG_SECURITY is not set | 944 | # CONFIG_SECURITY is not set |
811 | 945 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
812 | # | 946 | CONFIG_XOR_BLOCKS=m |
813 | # Cryptographic options | 947 | CONFIG_ASYNC_CORE=m |
814 | # | 948 | CONFIG_ASYNC_MEMCPY=m |
949 | CONFIG_ASYNC_XOR=m | ||
815 | CONFIG_CRYPTO=y | 950 | CONFIG_CRYPTO=y |
951 | CONFIG_CRYPTO_ALGAPI=y | ||
952 | CONFIG_CRYPTO_AEAD=m | ||
953 | CONFIG_CRYPTO_BLKCIPHER=y | ||
954 | CONFIG_CRYPTO_SEQIV=m | ||
955 | CONFIG_CRYPTO_HASH=y | ||
956 | CONFIG_CRYPTO_MANAGER=y | ||
816 | CONFIG_CRYPTO_HMAC=y | 957 | CONFIG_CRYPTO_HMAC=y |
958 | CONFIG_CRYPTO_XCBC=m | ||
817 | CONFIG_CRYPTO_NULL=m | 959 | CONFIG_CRYPTO_NULL=m |
818 | CONFIG_CRYPTO_MD4=m | 960 | CONFIG_CRYPTO_MD4=m |
819 | CONFIG_CRYPTO_MD5=y | 961 | CONFIG_CRYPTO_MD5=y |
@@ -822,9 +964,21 @@ CONFIG_CRYPTO_SHA256=m | |||
822 | CONFIG_CRYPTO_SHA512=m | 964 | CONFIG_CRYPTO_SHA512=m |
823 | CONFIG_CRYPTO_WP512=m | 965 | CONFIG_CRYPTO_WP512=m |
824 | CONFIG_CRYPTO_TGR192=m | 966 | CONFIG_CRYPTO_TGR192=m |
967 | CONFIG_CRYPTO_GF128MUL=m | ||
968 | CONFIG_CRYPTO_ECB=m | ||
969 | CONFIG_CRYPTO_CBC=y | ||
970 | CONFIG_CRYPTO_PCBC=m | ||
971 | CONFIG_CRYPTO_LRW=m | ||
972 | CONFIG_CRYPTO_XTS=m | ||
973 | CONFIG_CRYPTO_CTR=m | ||
974 | CONFIG_CRYPTO_GCM=m | ||
975 | CONFIG_CRYPTO_CCM=m | ||
976 | CONFIG_CRYPTO_CRYPTD=m | ||
825 | CONFIG_CRYPTO_DES=y | 977 | CONFIG_CRYPTO_DES=y |
978 | CONFIG_CRYPTO_FCRYPT=m | ||
826 | CONFIG_CRYPTO_BLOWFISH=m | 979 | CONFIG_CRYPTO_BLOWFISH=m |
827 | CONFIG_CRYPTO_TWOFISH=m | 980 | CONFIG_CRYPTO_TWOFISH=m |
981 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
828 | CONFIG_CRYPTO_SERPENT=m | 982 | CONFIG_CRYPTO_SERPENT=m |
829 | CONFIG_CRYPTO_AES=m | 983 | CONFIG_CRYPTO_AES=m |
830 | CONFIG_CRYPTO_CAST5=m | 984 | CONFIG_CRYPTO_CAST5=m |
@@ -833,20 +987,35 @@ CONFIG_CRYPTO_TEA=m | |||
833 | CONFIG_CRYPTO_ARC4=m | 987 | CONFIG_CRYPTO_ARC4=m |
834 | CONFIG_CRYPTO_KHAZAD=m | 988 | CONFIG_CRYPTO_KHAZAD=m |
835 | CONFIG_CRYPTO_ANUBIS=m | 989 | CONFIG_CRYPTO_ANUBIS=m |
990 | CONFIG_CRYPTO_SEED=m | ||
991 | CONFIG_CRYPTO_SALSA20=m | ||
836 | CONFIG_CRYPTO_DEFLATE=m | 992 | CONFIG_CRYPTO_DEFLATE=m |
837 | CONFIG_CRYPTO_MICHAEL_MIC=m | 993 | CONFIG_CRYPTO_MICHAEL_MIC=m |
838 | CONFIG_CRYPTO_CRC32C=m | 994 | CONFIG_CRYPTO_CRC32C=m |
995 | CONFIG_CRYPTO_CAMELLIA=m | ||
839 | CONFIG_CRYPTO_TEST=m | 996 | CONFIG_CRYPTO_TEST=m |
840 | 997 | CONFIG_CRYPTO_AUTHENC=m | |
841 | # | 998 | CONFIG_CRYPTO_LZO=m |
842 | # Hardware crypto devices | 999 | # CONFIG_CRYPTO_HW is not set |
843 | # | ||
844 | 1000 | ||
845 | # | 1001 | # |
846 | # Library routines | 1002 | # Library routines |
847 | # | 1003 | # |
1004 | CONFIG_BITREVERSE=y | ||
848 | CONFIG_CRC_CCITT=m | 1005 | CONFIG_CRC_CCITT=m |
1006 | CONFIG_CRC16=m | ||
1007 | # CONFIG_CRC_ITU_T is not set | ||
849 | CONFIG_CRC32=y | 1008 | CONFIG_CRC32=y |
1009 | # CONFIG_CRC7 is not set | ||
850 | CONFIG_LIBCRC32C=m | 1010 | CONFIG_LIBCRC32C=m |
851 | CONFIG_ZLIB_INFLATE=y | 1011 | CONFIG_ZLIB_INFLATE=y |
852 | CONFIG_ZLIB_DEFLATE=m | 1012 | CONFIG_ZLIB_DEFLATE=m |
1013 | CONFIG_LZO_COMPRESS=m | ||
1014 | CONFIG_LZO_DECOMPRESS=m | ||
1015 | CONFIG_TEXTSEARCH=y | ||
1016 | CONFIG_TEXTSEARCH_KMP=m | ||
1017 | CONFIG_TEXTSEARCH_BM=m | ||
1018 | CONFIG_TEXTSEARCH_FSM=m | ||
1019 | CONFIG_PLIST=y | ||
1020 | CONFIG_HAS_IOMEM=y | ||
1021 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 6433da2d2ce2..ba7f971bb026 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:32 2005 | 4 | # Wed Apr 2 20:46:09 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-atari" | 27 | CONFIG_LOCALVERSION="-atari" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -80,10 +128,24 @@ CONFIG_M68030=y | |||
80 | CONFIG_M68040=y | 128 | CONFIG_M68040=y |
81 | CONFIG_M68060=y | 129 | CONFIG_M68060=y |
82 | CONFIG_MMU_MOTOROLA=y | 130 | CONFIG_MMU_MOTOROLA=y |
83 | CONFIG_M68KFPU_EMU=y | 131 | # CONFIG_M68KFPU_EMU is not set |
84 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
85 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
86 | # CONFIG_ADVANCED is not set | 132 | # CONFIG_ADVANCED is not set |
133 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
134 | CONFIG_NODES_SHIFT=3 | ||
135 | CONFIG_SELECT_MEMORY_MODEL=y | ||
136 | # CONFIG_FLATMEM_MANUAL is not set | ||
137 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
138 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
139 | CONFIG_DISCONTIGMEM=y | ||
140 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
141 | CONFIG_NEED_MULTIPLE_NODES=y | ||
142 | # CONFIG_SPARSEMEM_STATIC is not set | ||
143 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
145 | # CONFIG_RESOURCES_64BIT is not set | ||
146 | CONFIG_ZONE_DMA_FLAG=1 | ||
147 | CONFIG_BOUNCE=y | ||
148 | CONFIG_VIRT_TO_BUS=y | ||
87 | 149 | ||
88 | # | 150 | # |
89 | # General setup | 151 | # General setup |
@@ -94,166 +156,11 @@ CONFIG_BINFMT_MISC=m | |||
94 | CONFIG_STRAM_PROC=y | 156 | CONFIG_STRAM_PROC=y |
95 | CONFIG_HEARTBEAT=y | 157 | CONFIG_HEARTBEAT=y |
96 | CONFIG_PROC_HARDWARE=y | 158 | CONFIG_PROC_HARDWARE=y |
159 | CONFIG_ZONE_DMA=y | ||
160 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
97 | 161 | ||
98 | # | 162 | # |
99 | # Device Drivers | 163 | # Networking |
100 | # | ||
101 | |||
102 | # | ||
103 | # Generic Driver Options | ||
104 | # | ||
105 | CONFIG_STANDALONE=y | ||
106 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
107 | CONFIG_FW_LOADER=m | ||
108 | # CONFIG_DEBUG_DRIVER is not set | ||
109 | |||
110 | # | ||
111 | # Memory Technology Devices (MTD) | ||
112 | # | ||
113 | # CONFIG_MTD is not set | ||
114 | |||
115 | # | ||
116 | # Parallel port support | ||
117 | # | ||
118 | CONFIG_PARPORT=m | ||
119 | # CONFIG_PARPORT_PC is not set | ||
120 | CONFIG_PARPORT_NOT_PC=y | ||
121 | CONFIG_PARPORT_ATARI=m | ||
122 | # CONFIG_PARPORT_GSC is not set | ||
123 | CONFIG_PARPORT_1284=y | ||
124 | |||
125 | # | ||
126 | # Plug and Play support | ||
127 | # | ||
128 | |||
129 | # | ||
130 | # Block devices | ||
131 | # | ||
132 | CONFIG_ATARI_FLOPPY=y | ||
133 | # CONFIG_PARIDE is not set | ||
134 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
135 | CONFIG_BLK_DEV_LOOP=y | ||
136 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
137 | CONFIG_BLK_DEV_NBD=m | ||
138 | CONFIG_BLK_DEV_RAM=y | ||
139 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
140 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
141 | CONFIG_BLK_DEV_INITRD=y | ||
142 | CONFIG_INITRAMFS_SOURCE="" | ||
143 | CONFIG_CDROM_PKTCDVD=m | ||
144 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
145 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
146 | |||
147 | # | ||
148 | # IO Schedulers | ||
149 | # | ||
150 | CONFIG_IOSCHED_NOOP=y | ||
151 | CONFIG_IOSCHED_AS=y | ||
152 | CONFIG_IOSCHED_DEADLINE=y | ||
153 | CONFIG_IOSCHED_CFQ=y | ||
154 | CONFIG_ATA_OVER_ETH=m | ||
155 | |||
156 | # | ||
157 | # ATA/ATAPI/MFM/RLL support | ||
158 | # | ||
159 | CONFIG_IDE=y | ||
160 | CONFIG_BLK_DEV_IDE=y | ||
161 | |||
162 | # | ||
163 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
164 | # | ||
165 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
166 | CONFIG_BLK_DEV_IDEDISK=y | ||
167 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
168 | CONFIG_BLK_DEV_IDECD=y | ||
169 | CONFIG_BLK_DEV_IDETAPE=m | ||
170 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
171 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
172 | # CONFIG_IDE_TASK_IOCTL is not set | ||
173 | |||
174 | # | ||
175 | # IDE chipset support/bugfixes | ||
176 | # | ||
177 | CONFIG_IDE_GENERIC=y | ||
178 | # CONFIG_IDE_ARM is not set | ||
179 | CONFIG_BLK_DEV_FALCON_IDE=y | ||
180 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
181 | # CONFIG_IDEDMA_AUTO is not set | ||
182 | # CONFIG_BLK_DEV_HD is not set | ||
183 | |||
184 | # | ||
185 | # SCSI device support | ||
186 | # | ||
187 | CONFIG_SCSI=y | ||
188 | CONFIG_SCSI_PROC_FS=y | ||
189 | |||
190 | # | ||
191 | # SCSI support type (disk, tape, CD-ROM) | ||
192 | # | ||
193 | CONFIG_BLK_DEV_SD=y | ||
194 | CONFIG_CHR_DEV_ST=m | ||
195 | # CONFIG_CHR_DEV_OSST is not set | ||
196 | CONFIG_BLK_DEV_SR=y | ||
197 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
198 | CONFIG_CHR_DEV_SG=m | ||
199 | |||
200 | # | ||
201 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
202 | # | ||
203 | # CONFIG_SCSI_MULTI_LUN is not set | ||
204 | CONFIG_SCSI_CONSTANTS=y | ||
205 | # CONFIG_SCSI_LOGGING is not set | ||
206 | |||
207 | # | ||
208 | # SCSI Transport Attributes | ||
209 | # | ||
210 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
211 | # CONFIG_SCSI_FC_ATTRS is not set | ||
212 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
213 | |||
214 | # | ||
215 | # SCSI low-level drivers | ||
216 | # | ||
217 | # CONFIG_SCSI_SATA is not set | ||
218 | # CONFIG_SCSI_PPA is not set | ||
219 | # CONFIG_SCSI_IMM is not set | ||
220 | # CONFIG_SCSI_DEBUG is not set | ||
221 | |||
222 | # | ||
223 | # Multi-device support (RAID and LVM) | ||
224 | # | ||
225 | CONFIG_MD=y | ||
226 | CONFIG_BLK_DEV_MD=m | ||
227 | CONFIG_MD_LINEAR=m | ||
228 | CONFIG_MD_RAID0=m | ||
229 | CONFIG_MD_RAID1=m | ||
230 | # CONFIG_MD_RAID10 is not set | ||
231 | CONFIG_MD_RAID5=m | ||
232 | CONFIG_MD_RAID6=m | ||
233 | CONFIG_MD_MULTIPATH=m | ||
234 | # CONFIG_MD_FAULTY is not set | ||
235 | CONFIG_BLK_DEV_DM=m | ||
236 | CONFIG_DM_CRYPT=m | ||
237 | CONFIG_DM_SNAPSHOT=m | ||
238 | CONFIG_DM_MIRROR=m | ||
239 | CONFIG_DM_ZERO=m | ||
240 | CONFIG_DM_MULTIPATH=m | ||
241 | CONFIG_DM_MULTIPATH_EMC=m | ||
242 | |||
243 | # | ||
244 | # Fusion MPT device support | ||
245 | # | ||
246 | |||
247 | # | ||
248 | # IEEE 1394 (FireWire) support | ||
249 | # | ||
250 | |||
251 | # | ||
252 | # I2O device support | ||
253 | # | ||
254 | |||
255 | # | ||
256 | # Networking support | ||
257 | # | 164 | # |
258 | CONFIG_NET=y | 165 | CONFIG_NET=y |
259 | 166 | ||
@@ -263,10 +170,17 @@ CONFIG_NET=y | |||
263 | CONFIG_PACKET=y | 170 | CONFIG_PACKET=y |
264 | # CONFIG_PACKET_MMAP is not set | 171 | # CONFIG_PACKET_MMAP is not set |
265 | CONFIG_UNIX=y | 172 | CONFIG_UNIX=y |
173 | CONFIG_XFRM=y | ||
174 | # CONFIG_XFRM_USER is not set | ||
175 | # CONFIG_XFRM_SUB_POLICY is not set | ||
176 | CONFIG_XFRM_MIGRATE=y | ||
177 | # CONFIG_XFRM_STATISTICS is not set | ||
266 | CONFIG_NET_KEY=y | 178 | CONFIG_NET_KEY=y |
179 | CONFIG_NET_KEY_MIGRATE=y | ||
267 | CONFIG_INET=y | 180 | CONFIG_INET=y |
268 | # CONFIG_IP_MULTICAST is not set | 181 | # CONFIG_IP_MULTICAST is not set |
269 | # CONFIG_IP_ADVANCED_ROUTER is not set | 182 | # CONFIG_IP_ADVANCED_ROUTER is not set |
183 | CONFIG_IP_FIB_HASH=y | ||
270 | # CONFIG_IP_PNP is not set | 184 | # CONFIG_IP_PNP is not set |
271 | CONFIG_NET_IPIP=m | 185 | CONFIG_NET_IPIP=m |
272 | CONFIG_NET_IPGRE=m | 186 | CONFIG_NET_IPGRE=m |
@@ -275,145 +189,199 @@ CONFIG_SYN_COOKIES=y | |||
275 | CONFIG_INET_AH=m | 189 | CONFIG_INET_AH=m |
276 | CONFIG_INET_ESP=m | 190 | CONFIG_INET_ESP=m |
277 | CONFIG_INET_IPCOMP=m | 191 | CONFIG_INET_IPCOMP=m |
192 | CONFIG_INET_XFRM_TUNNEL=m | ||
278 | CONFIG_INET_TUNNEL=m | 193 | CONFIG_INET_TUNNEL=m |
279 | CONFIG_IP_TCPDIAG=m | 194 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
280 | CONFIG_IP_TCPDIAG_IPV6=y | 195 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
281 | 196 | CONFIG_INET_XFRM_MODE_BEET=m | |
282 | # | 197 | CONFIG_INET_LRO=m |
283 | # IP: Virtual Server Configuration | 198 | CONFIG_INET_DIAG=m |
284 | # | 199 | CONFIG_INET_TCP_DIAG=m |
200 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
201 | CONFIG_TCP_CONG_CUBIC=y | ||
202 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
203 | # CONFIG_TCP_MD5SIG is not set | ||
285 | # CONFIG_IP_VS is not set | 204 | # CONFIG_IP_VS is not set |
286 | CONFIG_IPV6=m | 205 | CONFIG_IPV6=m |
287 | CONFIG_IPV6_PRIVACY=y | 206 | CONFIG_IPV6_PRIVACY=y |
207 | CONFIG_IPV6_ROUTER_PREF=y | ||
208 | CONFIG_IPV6_ROUTE_INFO=y | ||
209 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
288 | CONFIG_INET6_AH=m | 210 | CONFIG_INET6_AH=m |
289 | CONFIG_INET6_ESP=m | 211 | CONFIG_INET6_ESP=m |
290 | CONFIG_INET6_IPCOMP=m | 212 | CONFIG_INET6_IPCOMP=m |
213 | # CONFIG_IPV6_MIP6 is not set | ||
214 | CONFIG_INET6_XFRM_TUNNEL=m | ||
291 | CONFIG_INET6_TUNNEL=m | 215 | CONFIG_INET6_TUNNEL=m |
216 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
217 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
218 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
219 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
220 | CONFIG_IPV6_SIT=m | ||
292 | CONFIG_IPV6_TUNNEL=m | 221 | CONFIG_IPV6_TUNNEL=m |
222 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
223 | # CONFIG_NETWORK_SECMARK is not set | ||
293 | CONFIG_NETFILTER=y | 224 | CONFIG_NETFILTER=y |
294 | # CONFIG_NETFILTER_DEBUG is not set | 225 | # CONFIG_NETFILTER_DEBUG is not set |
226 | CONFIG_NETFILTER_ADVANCED=y | ||
227 | |||
228 | # | ||
229 | # Core Netfilter Configuration | ||
230 | # | ||
231 | CONFIG_NETFILTER_NETLINK=m | ||
232 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
233 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
234 | CONFIG_NF_CONNTRACK=m | ||
235 | CONFIG_NF_CT_ACCT=y | ||
236 | CONFIG_NF_CONNTRACK_MARK=y | ||
237 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
238 | CONFIG_NF_CT_PROTO_GRE=m | ||
239 | CONFIG_NF_CT_PROTO_SCTP=m | ||
240 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
241 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
242 | CONFIG_NF_CONNTRACK_FTP=m | ||
243 | CONFIG_NF_CONNTRACK_H323=m | ||
244 | CONFIG_NF_CONNTRACK_IRC=m | ||
245 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
246 | CONFIG_NF_CONNTRACK_PPTP=m | ||
247 | CONFIG_NF_CONNTRACK_SANE=m | ||
248 | CONFIG_NF_CONNTRACK_SIP=m | ||
249 | CONFIG_NF_CONNTRACK_TFTP=m | ||
250 | # CONFIG_NF_CT_NETLINK is not set | ||
251 | CONFIG_NETFILTER_XTABLES=m | ||
252 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
253 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
254 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
255 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
263 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
264 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
265 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
295 | 292 | ||
296 | # | 293 | # |
297 | # IP: Netfilter Configuration | 294 | # IP: Netfilter Configuration |
298 | # | 295 | # |
299 | CONFIG_IP_NF_CONNTRACK=m | 296 | CONFIG_NF_CONNTRACK_IPV4=m |
300 | # CONFIG_IP_NF_CT_ACCT is not set | 297 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
301 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
302 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
303 | CONFIG_IP_NF_FTP=m | ||
304 | CONFIG_IP_NF_IRC=m | ||
305 | CONFIG_IP_NF_TFTP=m | ||
306 | CONFIG_IP_NF_AMANDA=m | ||
307 | CONFIG_IP_NF_QUEUE=m | 298 | CONFIG_IP_NF_QUEUE=m |
308 | CONFIG_IP_NF_IPTABLES=m | 299 | CONFIG_IP_NF_IPTABLES=m |
309 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
310 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
311 | CONFIG_IP_NF_MATCH_MAC=m | ||
312 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
313 | CONFIG_IP_NF_MATCH_MARK=m | ||
314 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
315 | CONFIG_IP_NF_MATCH_TOS=m | ||
316 | CONFIG_IP_NF_MATCH_RECENT=m | 300 | CONFIG_IP_NF_MATCH_RECENT=m |
317 | CONFIG_IP_NF_MATCH_ECN=m | 301 | CONFIG_IP_NF_MATCH_ECN=m |
318 | CONFIG_IP_NF_MATCH_DSCP=m | 302 | CONFIG_IP_NF_MATCH_AH=m |
319 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
320 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
321 | CONFIG_IP_NF_MATCH_TTL=m | 303 | CONFIG_IP_NF_MATCH_TTL=m |
322 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
323 | CONFIG_IP_NF_MATCH_HELPER=m | ||
324 | CONFIG_IP_NF_MATCH_STATE=m | ||
325 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
326 | CONFIG_IP_NF_MATCH_OWNER=m | ||
327 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 304 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
328 | CONFIG_IP_NF_MATCH_REALM=m | ||
329 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
330 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
331 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
332 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
333 | CONFIG_IP_NF_FILTER=m | 305 | CONFIG_IP_NF_FILTER=m |
334 | CONFIG_IP_NF_TARGET_REJECT=m | 306 | CONFIG_IP_NF_TARGET_REJECT=m |
335 | CONFIG_IP_NF_TARGET_LOG=m | 307 | CONFIG_IP_NF_TARGET_LOG=m |
336 | CONFIG_IP_NF_TARGET_ULOG=m | 308 | CONFIG_IP_NF_TARGET_ULOG=m |
337 | CONFIG_IP_NF_TARGET_TCPMSS=m | 309 | CONFIG_NF_NAT=m |
338 | CONFIG_IP_NF_NAT=m | 310 | CONFIG_NF_NAT_NEEDED=y |
339 | CONFIG_IP_NF_NAT_NEEDED=y | ||
340 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 311 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
341 | CONFIG_IP_NF_TARGET_REDIRECT=m | 312 | CONFIG_IP_NF_TARGET_REDIRECT=m |
342 | CONFIG_IP_NF_TARGET_NETMAP=m | 313 | CONFIG_IP_NF_TARGET_NETMAP=m |
343 | CONFIG_IP_NF_TARGET_SAME=m | 314 | CONFIG_NF_NAT_SNMP_BASIC=m |
344 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 315 | CONFIG_NF_NAT_PROTO_GRE=m |
345 | CONFIG_IP_NF_NAT_IRC=m | 316 | CONFIG_NF_NAT_FTP=m |
346 | CONFIG_IP_NF_NAT_FTP=m | 317 | CONFIG_NF_NAT_IRC=m |
347 | CONFIG_IP_NF_NAT_TFTP=m | 318 | CONFIG_NF_NAT_TFTP=m |
348 | CONFIG_IP_NF_NAT_AMANDA=m | 319 | CONFIG_NF_NAT_AMANDA=m |
320 | CONFIG_NF_NAT_PPTP=m | ||
321 | CONFIG_NF_NAT_H323=m | ||
322 | CONFIG_NF_NAT_SIP=m | ||
349 | CONFIG_IP_NF_MANGLE=m | 323 | CONFIG_IP_NF_MANGLE=m |
350 | CONFIG_IP_NF_TARGET_TOS=m | ||
351 | CONFIG_IP_NF_TARGET_ECN=m | 324 | CONFIG_IP_NF_TARGET_ECN=m |
352 | CONFIG_IP_NF_TARGET_DSCP=m | 325 | CONFIG_IP_NF_TARGET_TTL=m |
353 | CONFIG_IP_NF_TARGET_MARK=m | 326 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
354 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
355 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
356 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
357 | CONFIG_IP_NF_RAW=m | 327 | CONFIG_IP_NF_RAW=m |
358 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
359 | CONFIG_IP_NF_ARPTABLES=m | 328 | CONFIG_IP_NF_ARPTABLES=m |
360 | CONFIG_IP_NF_ARPFILTER=m | 329 | CONFIG_IP_NF_ARPFILTER=m |
361 | CONFIG_IP_NF_ARP_MANGLE=m | 330 | CONFIG_IP_NF_ARP_MANGLE=m |
362 | 331 | ||
363 | # | 332 | # |
364 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 333 | # IPv6: Netfilter Configuration |
365 | # | 334 | # |
335 | CONFIG_NF_CONNTRACK_IPV6=m | ||
366 | CONFIG_IP6_NF_QUEUE=m | 336 | CONFIG_IP6_NF_QUEUE=m |
367 | CONFIG_IP6_NF_IPTABLES=m | 337 | CONFIG_IP6_NF_IPTABLES=m |
368 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
369 | CONFIG_IP6_NF_MATCH_MAC=m | ||
370 | CONFIG_IP6_NF_MATCH_RT=m | 338 | CONFIG_IP6_NF_MATCH_RT=m |
371 | CONFIG_IP6_NF_MATCH_OPTS=m | 339 | CONFIG_IP6_NF_MATCH_OPTS=m |
372 | CONFIG_IP6_NF_MATCH_FRAG=m | 340 | CONFIG_IP6_NF_MATCH_FRAG=m |
373 | CONFIG_IP6_NF_MATCH_HL=m | 341 | CONFIG_IP6_NF_MATCH_HL=m |
374 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
375 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
376 | CONFIG_IP6_NF_MATCH_MARK=m | ||
377 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 342 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
378 | CONFIG_IP6_NF_MATCH_AHESP=m | 343 | CONFIG_IP6_NF_MATCH_AH=m |
379 | CONFIG_IP6_NF_MATCH_LENGTH=m | 344 | CONFIG_IP6_NF_MATCH_MH=m |
380 | CONFIG_IP6_NF_MATCH_EUI64=m | 345 | CONFIG_IP6_NF_MATCH_EUI64=m |
381 | CONFIG_IP6_NF_FILTER=m | 346 | CONFIG_IP6_NF_FILTER=m |
382 | CONFIG_IP6_NF_TARGET_LOG=m | 347 | CONFIG_IP6_NF_TARGET_LOG=m |
348 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
383 | CONFIG_IP6_NF_MANGLE=m | 349 | CONFIG_IP6_NF_MANGLE=m |
384 | CONFIG_IP6_NF_TARGET_MARK=m | 350 | CONFIG_IP6_NF_TARGET_HL=m |
385 | CONFIG_IP6_NF_RAW=m | 351 | CONFIG_IP6_NF_RAW=m |
386 | CONFIG_XFRM=y | 352 | CONFIG_IP_DCCP=m |
387 | CONFIG_XFRM_USER=m | 353 | CONFIG_INET_DCCP_DIAG=m |
354 | CONFIG_IP_DCCP_ACKVEC=y | ||
388 | 355 | ||
389 | # | 356 | # |
390 | # SCTP Configuration (EXPERIMENTAL) | 357 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
391 | # | 358 | # |
359 | CONFIG_IP_DCCP_CCID2=m | ||
360 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
361 | CONFIG_IP_DCCP_CCID3=m | ||
362 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
363 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
364 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
392 | CONFIG_IP_SCTP=m | 365 | CONFIG_IP_SCTP=m |
393 | # CONFIG_SCTP_DBG_MSG is not set | 366 | # CONFIG_SCTP_DBG_MSG is not set |
394 | # CONFIG_SCTP_DBG_OBJCNT is not set | 367 | # CONFIG_SCTP_DBG_OBJCNT is not set |
395 | # CONFIG_SCTP_HMAC_NONE is not set | 368 | # CONFIG_SCTP_HMAC_NONE is not set |
396 | # CONFIG_SCTP_HMAC_SHA1 is not set | 369 | # CONFIG_SCTP_HMAC_SHA1 is not set |
397 | CONFIG_SCTP_HMAC_MD5=y | 370 | CONFIG_SCTP_HMAC_MD5=y |
371 | # CONFIG_TIPC is not set | ||
398 | # CONFIG_ATM is not set | 372 | # CONFIG_ATM is not set |
399 | # CONFIG_BRIDGE is not set | 373 | # CONFIG_BRIDGE is not set |
400 | # CONFIG_VLAN_8021Q is not set | 374 | # CONFIG_VLAN_8021Q is not set |
401 | # CONFIG_DECNET is not set | 375 | # CONFIG_DECNET is not set |
402 | CONFIG_LLC=m | 376 | CONFIG_LLC=m |
403 | # CONFIG_LLC2 is not set | 377 | # CONFIG_LLC2 is not set |
404 | CONFIG_IPX=m | 378 | # CONFIG_IPX is not set |
405 | # CONFIG_IPX_INTERN is not set | ||
406 | CONFIG_ATALK=m | 379 | CONFIG_ATALK=m |
407 | # CONFIG_DEV_APPLETALK is not set | 380 | # CONFIG_DEV_APPLETALK is not set |
408 | # CONFIG_X25 is not set | 381 | # CONFIG_X25 is not set |
409 | # CONFIG_LAPB is not set | 382 | # CONFIG_LAPB is not set |
410 | # CONFIG_NET_DIVERT is not set | ||
411 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
412 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
413 | |||
414 | # | ||
415 | # QoS and/or fair queueing | ||
416 | # | ||
417 | # CONFIG_NET_SCHED is not set | 385 | # CONFIG_NET_SCHED is not set |
418 | CONFIG_NET_CLS_ROUTE=y | 386 | CONFIG_NET_CLS_ROUTE=y |
419 | 387 | ||
@@ -421,46 +389,189 @@ CONFIG_NET_CLS_ROUTE=y | |||
421 | # Network testing | 389 | # Network testing |
422 | # | 390 | # |
423 | # CONFIG_NET_PKTGEN is not set | 391 | # CONFIG_NET_PKTGEN is not set |
424 | CONFIG_NETPOLL=y | ||
425 | # CONFIG_NETPOLL_RX is not set | ||
426 | # CONFIG_NETPOLL_TRAP is not set | ||
427 | CONFIG_NET_POLL_CONTROLLER=y | ||
428 | # CONFIG_HAMRADIO is not set | 392 | # CONFIG_HAMRADIO is not set |
393 | # CONFIG_CAN is not set | ||
429 | # CONFIG_IRDA is not set | 394 | # CONFIG_IRDA is not set |
430 | # CONFIG_BT is not set | 395 | # CONFIG_BT is not set |
431 | CONFIG_NETDEVICES=y | 396 | # CONFIG_AF_RXRPC is not set |
432 | CONFIG_DUMMY=m | ||
433 | # CONFIG_BONDING is not set | ||
434 | CONFIG_EQUALIZER=m | ||
435 | # CONFIG_TUN is not set | ||
436 | 397 | ||
437 | # | 398 | # |
438 | # Ethernet (10 or 100Mbit) | 399 | # Wireless |
439 | # | 400 | # |
440 | CONFIG_NET_ETHERNET=y | 401 | # CONFIG_CFG80211 is not set |
441 | CONFIG_MII=m | 402 | CONFIG_WIRELESS_EXT=y |
442 | CONFIG_ATARILANCE=m | 403 | # CONFIG_MAC80211 is not set |
404 | CONFIG_IEEE80211=m | ||
405 | # CONFIG_IEEE80211_DEBUG is not set | ||
406 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
407 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
408 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
409 | CONFIG_IEEE80211_SOFTMAC=m | ||
410 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
411 | # CONFIG_RFKILL is not set | ||
412 | # CONFIG_NET_9P is not set | ||
413 | |||
414 | # | ||
415 | # Device Drivers | ||
416 | # | ||
417 | |||
418 | # | ||
419 | # Generic Driver Options | ||
420 | # | ||
421 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
422 | CONFIG_STANDALONE=y | ||
423 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
424 | CONFIG_FW_LOADER=m | ||
425 | # CONFIG_SYS_HYPERVISOR is not set | ||
426 | CONFIG_CONNECTOR=m | ||
427 | # CONFIG_MTD is not set | ||
428 | CONFIG_PARPORT=m | ||
429 | CONFIG_PARPORT_ATARI=m | ||
430 | # CONFIG_PARPORT_GSC is not set | ||
431 | # CONFIG_PARPORT_AX88796 is not set | ||
432 | CONFIG_PARPORT_1284=y | ||
433 | CONFIG_PARPORT_NOT_PC=y | ||
434 | CONFIG_BLK_DEV=y | ||
435 | CONFIG_ATARI_FLOPPY=y | ||
436 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
437 | CONFIG_BLK_DEV_LOOP=y | ||
438 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
439 | CONFIG_BLK_DEV_NBD=m | ||
440 | CONFIG_BLK_DEV_RAM=y | ||
441 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
442 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
443 | # CONFIG_BLK_DEV_XIP is not set | ||
444 | CONFIG_CDROM_PKTCDVD=m | ||
445 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
446 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
447 | CONFIG_ATA_OVER_ETH=m | ||
448 | CONFIG_MISC_DEVICES=y | ||
449 | # CONFIG_EEPROM_93CX6 is not set | ||
450 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
451 | CONFIG_HAVE_IDE=y | ||
452 | CONFIG_IDE=y | ||
453 | CONFIG_BLK_DEV_IDE=y | ||
454 | |||
455 | # | ||
456 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | ||
457 | # | ||
458 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
459 | CONFIG_BLK_DEV_IDEDISK=y | ||
460 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
461 | CONFIG_BLK_DEV_IDECD=y | ||
462 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
463 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
464 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
465 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
466 | # CONFIG_IDE_TASK_IOCTL is not set | ||
467 | CONFIG_IDE_PROC_FS=y | ||
443 | 468 | ||
444 | # | 469 | # |
445 | # Ethernet (1000 Mbit) | 470 | # IDE chipset support/bugfixes |
446 | # | 471 | # |
472 | # CONFIG_IDE_GENERIC is not set | ||
473 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
474 | CONFIG_BLK_DEV_FALCON_IDE=y | ||
475 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
476 | # CONFIG_IDE_ARCH_OBSOLETE_INIT is not set | ||
477 | # CONFIG_BLK_DEV_HD is not set | ||
447 | 478 | ||
448 | # | 479 | # |
449 | # Ethernet (10000 Mbit) | 480 | # SCSI device support |
450 | # | 481 | # |
482 | CONFIG_RAID_ATTRS=m | ||
483 | CONFIG_SCSI=y | ||
484 | CONFIG_SCSI_DMA=y | ||
485 | CONFIG_SCSI_TGT=m | ||
486 | # CONFIG_SCSI_NETLINK is not set | ||
487 | CONFIG_SCSI_PROC_FS=y | ||
451 | 488 | ||
452 | # | 489 | # |
453 | # Token Ring devices | 490 | # SCSI support type (disk, tape, CD-ROM) |
491 | # | ||
492 | CONFIG_BLK_DEV_SD=y | ||
493 | CONFIG_CHR_DEV_ST=m | ||
494 | CONFIG_CHR_DEV_OSST=m | ||
495 | CONFIG_BLK_DEV_SR=y | ||
496 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
497 | CONFIG_CHR_DEV_SG=m | ||
498 | # CONFIG_CHR_DEV_SCH is not set | ||
499 | |||
500 | # | ||
501 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
454 | # | 502 | # |
503 | # CONFIG_SCSI_MULTI_LUN is not set | ||
504 | CONFIG_SCSI_CONSTANTS=y | ||
505 | # CONFIG_SCSI_LOGGING is not set | ||
506 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
507 | CONFIG_SCSI_WAIT_SCAN=m | ||
455 | 508 | ||
456 | # | 509 | # |
457 | # Wireless LAN (non-hamradio) | 510 | # SCSI Transports |
458 | # | 511 | # |
459 | # CONFIG_NET_RADIO is not set | 512 | CONFIG_SCSI_SPI_ATTRS=y |
513 | # CONFIG_SCSI_FC_ATTRS is not set | ||
514 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
515 | CONFIG_SCSI_SAS_ATTRS=m | ||
516 | CONFIG_SCSI_SAS_LIBSAS=m | ||
517 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
518 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
519 | CONFIG_SCSI_SRP_ATTRS=m | ||
520 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
521 | CONFIG_SCSI_LOWLEVEL=y | ||
522 | CONFIG_ISCSI_TCP=m | ||
523 | # CONFIG_SCSI_DEBUG is not set | ||
524 | CONFIG_ATARI_SCSI=y | ||
525 | # CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set | ||
526 | # CONFIG_ATARI_SCSI_RESET_BOOT is not set | ||
527 | CONFIG_MD=y | ||
528 | CONFIG_BLK_DEV_MD=m | ||
529 | CONFIG_MD_LINEAR=m | ||
530 | CONFIG_MD_RAID0=m | ||
531 | CONFIG_MD_RAID1=m | ||
532 | # CONFIG_MD_RAID10 is not set | ||
533 | CONFIG_MD_RAID456=m | ||
534 | CONFIG_MD_RAID5_RESHAPE=y | ||
535 | CONFIG_MD_MULTIPATH=m | ||
536 | # CONFIG_MD_FAULTY is not set | ||
537 | CONFIG_BLK_DEV_DM=m | ||
538 | # CONFIG_DM_DEBUG is not set | ||
539 | CONFIG_DM_CRYPT=m | ||
540 | CONFIG_DM_SNAPSHOT=m | ||
541 | CONFIG_DM_MIRROR=m | ||
542 | CONFIG_DM_ZERO=m | ||
543 | CONFIG_DM_MULTIPATH=m | ||
544 | CONFIG_DM_MULTIPATH_EMC=m | ||
545 | CONFIG_DM_MULTIPATH_RDAC=m | ||
546 | CONFIG_DM_MULTIPATH_HP=m | ||
547 | # CONFIG_DM_DELAY is not set | ||
548 | CONFIG_DM_UEVENT=y | ||
549 | CONFIG_NETDEVICES=y | ||
550 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
551 | CONFIG_DUMMY=m | ||
552 | # CONFIG_BONDING is not set | ||
553 | CONFIG_MACVLAN=m | ||
554 | CONFIG_EQUALIZER=m | ||
555 | # CONFIG_TUN is not set | ||
556 | CONFIG_VETH=m | ||
557 | # CONFIG_PHYLIB is not set | ||
558 | CONFIG_NET_ETHERNET=y | ||
559 | CONFIG_MII=m | ||
560 | CONFIG_ATARILANCE=m | ||
561 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
562 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
563 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
564 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
565 | # CONFIG_B44 is not set | ||
566 | # CONFIG_NET_POCKET is not set | ||
567 | # CONFIG_NETDEV_1000 is not set | ||
568 | # CONFIG_NETDEV_10000 is not set | ||
460 | 569 | ||
461 | # | 570 | # |
462 | # Wan interfaces | 571 | # Wireless LAN |
463 | # | 572 | # |
573 | # CONFIG_WLAN_PRE80211 is not set | ||
574 | # CONFIG_WLAN_80211 is not set | ||
464 | # CONFIG_WAN is not set | 575 | # CONFIG_WAN is not set |
465 | # CONFIG_PLIP is not set | 576 | # CONFIG_PLIP is not set |
466 | CONFIG_PPP=m | 577 | CONFIG_PPP=m |
@@ -470,28 +581,28 @@ CONFIG_PPP_ASYNC=m | |||
470 | CONFIG_PPP_SYNC_TTY=m | 581 | CONFIG_PPP_SYNC_TTY=m |
471 | CONFIG_PPP_DEFLATE=m | 582 | CONFIG_PPP_DEFLATE=m |
472 | CONFIG_PPP_BSDCOMP=m | 583 | CONFIG_PPP_BSDCOMP=m |
584 | CONFIG_PPP_MPPE=m | ||
473 | CONFIG_PPPOE=m | 585 | CONFIG_PPPOE=m |
586 | CONFIG_PPPOL2TP=m | ||
474 | CONFIG_SLIP=m | 587 | CONFIG_SLIP=m |
475 | CONFIG_SLIP_COMPRESSED=y | 588 | CONFIG_SLIP_COMPRESSED=y |
589 | CONFIG_SLHC=m | ||
476 | CONFIG_SLIP_SMART=y | 590 | CONFIG_SLIP_SMART=y |
477 | CONFIG_SLIP_MODE_SLIP6=y | 591 | CONFIG_SLIP_MODE_SLIP6=y |
478 | CONFIG_SHAPER=m | ||
479 | CONFIG_NETCONSOLE=m | 592 | CONFIG_NETCONSOLE=m |
480 | 593 | CONFIG_NETCONSOLE_DYNAMIC=y | |
481 | # | 594 | CONFIG_NETPOLL=y |
482 | # ISDN subsystem | 595 | # CONFIG_NETPOLL_TRAP is not set |
483 | # | 596 | CONFIG_NET_POLL_CONTROLLER=y |
484 | # CONFIG_ISDN is not set | 597 | # CONFIG_ISDN is not set |
485 | |||
486 | # | ||
487 | # Telephony Support | ||
488 | # | ||
489 | # CONFIG_PHONE is not set | 598 | # CONFIG_PHONE is not set |
490 | 599 | ||
491 | # | 600 | # |
492 | # Input device support | 601 | # Input device support |
493 | # | 602 | # |
494 | CONFIG_INPUT=y | 603 | CONFIG_INPUT=y |
604 | CONFIG_INPUT_FF_MEMLESS=m | ||
605 | # CONFIG_INPUT_POLLDEV is not set | ||
495 | 606 | ||
496 | # | 607 | # |
497 | # Userland interfaces | 608 | # Userland interfaces |
@@ -501,7 +612,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
501 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 612 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
502 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 613 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
503 | # CONFIG_INPUT_JOYDEV is not set | 614 | # CONFIG_INPUT_JOYDEV is not set |
504 | # CONFIG_INPUT_TSDEV is not set | ||
505 | # CONFIG_INPUT_EVDEV is not set | 615 | # CONFIG_INPUT_EVDEV is not set |
506 | # CONFIG_INPUT_EVBUG is not set | 616 | # CONFIG_INPUT_EVBUG is not set |
507 | 617 | ||
@@ -509,26 +619,37 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
509 | # Input Device Drivers | 619 | # Input Device Drivers |
510 | # | 620 | # |
511 | CONFIG_INPUT_KEYBOARD=y | 621 | CONFIG_INPUT_KEYBOARD=y |
512 | CONFIG_KEYBOARD_ATKBD=y | 622 | # CONFIG_KEYBOARD_ATKBD is not set |
513 | # CONFIG_KEYBOARD_SUNKBD is not set | 623 | # CONFIG_KEYBOARD_SUNKBD is not set |
514 | # CONFIG_KEYBOARD_LKKBD is not set | 624 | # CONFIG_KEYBOARD_LKKBD is not set |
515 | # CONFIG_KEYBOARD_XTKBD is not set | 625 | # CONFIG_KEYBOARD_XTKBD is not set |
516 | # CONFIG_KEYBOARD_NEWTON is not set | 626 | # CONFIG_KEYBOARD_NEWTON is not set |
627 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
628 | CONFIG_ATARI_KBD_CORE=y | ||
629 | CONFIG_KEYBOARD_ATARI=y | ||
517 | CONFIG_INPUT_MOUSE=y | 630 | CONFIG_INPUT_MOUSE=y |
518 | CONFIG_MOUSE_PS2=y | 631 | CONFIG_MOUSE_PS2=y |
632 | CONFIG_MOUSE_PS2_ALPS=y | ||
633 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
634 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
635 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
636 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
637 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
519 | # CONFIG_MOUSE_SERIAL is not set | 638 | # CONFIG_MOUSE_SERIAL is not set |
639 | CONFIG_MOUSE_ATARI=m | ||
520 | # CONFIG_MOUSE_VSXXXAA is not set | 640 | # CONFIG_MOUSE_VSXXXAA is not set |
521 | # CONFIG_INPUT_JOYSTICK is not set | 641 | # CONFIG_INPUT_JOYSTICK is not set |
642 | # CONFIG_INPUT_TABLET is not set | ||
522 | # CONFIG_INPUT_TOUCHSCREEN is not set | 643 | # CONFIG_INPUT_TOUCHSCREEN is not set |
523 | CONFIG_INPUT_MISC=y | 644 | CONFIG_INPUT_MISC=y |
524 | CONFIG_INPUT_M68K_BEEP=m | 645 | CONFIG_INPUT_M68K_BEEP=m |
525 | CONFIG_INPUT_UINPUT=m | 646 | # CONFIG_INPUT_UINPUT is not set |
526 | 647 | ||
527 | # | 648 | # |
528 | # Hardware I/O ports | 649 | # Hardware I/O ports |
529 | # | 650 | # |
530 | CONFIG_SERIO=y | 651 | CONFIG_SERIO=y |
531 | CONFIG_SERIO_SERPORT=y | 652 | # CONFIG_SERIO_SERPORT is not set |
532 | # CONFIG_SERIO_PARKBD is not set | 653 | # CONFIG_SERIO_PARKBD is not set |
533 | CONFIG_SERIO_LIBPS2=y | 654 | CONFIG_SERIO_LIBPS2=y |
534 | # CONFIG_SERIO_RAW is not set | 655 | # CONFIG_SERIO_RAW is not set |
@@ -540,6 +661,7 @@ CONFIG_SERIO_LIBPS2=y | |||
540 | CONFIG_VT=y | 661 | CONFIG_VT=y |
541 | CONFIG_VT_CONSOLE=y | 662 | CONFIG_VT_CONSOLE=y |
542 | CONFIG_HW_CONSOLE=y | 663 | CONFIG_HW_CONSOLE=y |
664 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
543 | # CONFIG_SERIAL_NONSTANDARD is not set | 665 | # CONFIG_SERIAL_NONSTANDARD is not set |
544 | 666 | ||
545 | # | 667 | # |
@@ -556,86 +678,97 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
556 | CONFIG_PRINTER=m | 678 | CONFIG_PRINTER=m |
557 | # CONFIG_LP_CONSOLE is not set | 679 | # CONFIG_LP_CONSOLE is not set |
558 | # CONFIG_PPDEV is not set | 680 | # CONFIG_PPDEV is not set |
559 | # CONFIG_TIPAR is not set | ||
560 | |||
561 | # | ||
562 | # IPMI | ||
563 | # | ||
564 | # CONFIG_IPMI_HANDLER is not set | 681 | # CONFIG_IPMI_HANDLER is not set |
565 | 682 | # CONFIG_HW_RANDOM is not set | |
566 | # | ||
567 | # Watchdog Cards | ||
568 | # | ||
569 | # CONFIG_WATCHDOG is not set | ||
570 | CONFIG_NVRAM=y | 683 | CONFIG_NVRAM=y |
571 | CONFIG_GEN_RTC=y | 684 | CONFIG_GEN_RTC=m |
572 | CONFIG_GEN_RTC_X=y | 685 | CONFIG_GEN_RTC_X=y |
573 | # CONFIG_DTLK is not set | ||
574 | # CONFIG_R3964 is not set | 686 | # CONFIG_R3964 is not set |
575 | |||
576 | # | ||
577 | # Ftape, the floppy tape device driver | ||
578 | # | ||
579 | # CONFIG_DRM is not set | ||
580 | # CONFIG_RAW_DRIVER is not set | 687 | # CONFIG_RAW_DRIVER is not set |
581 | 688 | # CONFIG_TCG_TPM is not set | |
582 | # | ||
583 | # TPM devices | ||
584 | # | ||
585 | |||
586 | # | ||
587 | # I2C support | ||
588 | # | ||
589 | # CONFIG_I2C is not set | 689 | # CONFIG_I2C is not set |
590 | 690 | ||
591 | # | 691 | # |
592 | # Dallas's 1-wire bus | 692 | # SPI support |
593 | # | 693 | # |
694 | # CONFIG_SPI is not set | ||
695 | # CONFIG_SPI_MASTER is not set | ||
594 | # CONFIG_W1 is not set | 696 | # CONFIG_W1 is not set |
697 | # CONFIG_POWER_SUPPLY is not set | ||
698 | # CONFIG_HWMON is not set | ||
699 | # CONFIG_THERMAL is not set | ||
700 | # CONFIG_WATCHDOG is not set | ||
595 | 701 | ||
596 | # | 702 | # |
597 | # Misc devices | 703 | # Sonics Silicon Backplane |
598 | # | 704 | # |
705 | CONFIG_SSB_POSSIBLE=y | ||
706 | # CONFIG_SSB is not set | ||
599 | 707 | ||
600 | # | 708 | # |
601 | # Multimedia devices | 709 | # Multifunction device drivers |
602 | # | 710 | # |
603 | # CONFIG_VIDEO_DEV is not set | 711 | # CONFIG_MFD_SM501 is not set |
604 | 712 | ||
605 | # | 713 | # |
606 | # Digital Video Broadcasting Devices | 714 | # Multimedia devices |
607 | # | 715 | # |
608 | # CONFIG_DVB is not set | 716 | # CONFIG_VIDEO_DEV is not set |
717 | # CONFIG_DVB_CORE is not set | ||
718 | # CONFIG_DAB is not set | ||
609 | 719 | ||
610 | # | 720 | # |
611 | # Graphics support | 721 | # Graphics support |
612 | # | 722 | # |
723 | # CONFIG_VGASTATE is not set | ||
724 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
613 | CONFIG_FB=y | 725 | CONFIG_FB=y |
614 | # CONFIG_FB_CFB_FILLRECT is not set | 726 | # CONFIG_FIRMWARE_EDID is not set |
615 | # CONFIG_FB_CFB_COPYAREA is not set | 727 | # CONFIG_FB_DDC is not set |
616 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 728 | CONFIG_FB_CFB_FILLRECT=y |
617 | # CONFIG_FB_SOFT_CURSOR is not set | 729 | CONFIG_FB_CFB_COPYAREA=y |
730 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
731 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
732 | # CONFIG_FB_SYS_FILLRECT is not set | ||
733 | # CONFIG_FB_SYS_COPYAREA is not set | ||
734 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
735 | # CONFIG_FB_SYS_FOPS is not set | ||
736 | CONFIG_FB_DEFERRED_IO=y | ||
737 | # CONFIG_FB_SVGALIB is not set | ||
618 | # CONFIG_FB_MACMODES is not set | 738 | # CONFIG_FB_MACMODES is not set |
619 | CONFIG_FB_MODE_HELPERS=y | 739 | # CONFIG_FB_BACKLIGHT is not set |
740 | # CONFIG_FB_MODE_HELPERS is not set | ||
620 | # CONFIG_FB_TILEBLITTING is not set | 741 | # CONFIG_FB_TILEBLITTING is not set |
621 | # CONFIG_FB_ATY is not set | 742 | |
743 | # | ||
744 | # Frame buffer hardware drivers | ||
745 | # | ||
746 | CONFIG_FB_ATARI=y | ||
747 | # CONFIG_FB_UVESA is not set | ||
622 | # CONFIG_FB_S1D13XXX is not set | 748 | # CONFIG_FB_S1D13XXX is not set |
749 | # CONFIG_FB_ATY is not set | ||
623 | # CONFIG_FB_VIRTUAL is not set | 750 | # CONFIG_FB_VIRTUAL is not set |
751 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
752 | |||
753 | # | ||
754 | # Display device support | ||
755 | # | ||
756 | # CONFIG_DISPLAY_SUPPORT is not set | ||
624 | 757 | ||
625 | # | 758 | # |
626 | # Console display driver support | 759 | # Console display driver support |
627 | # | 760 | # |
628 | CONFIG_DUMMY_CONSOLE=y | 761 | CONFIG_DUMMY_CONSOLE=y |
629 | CONFIG_FRAMEBUFFER_CONSOLE=y | 762 | CONFIG_FRAMEBUFFER_CONSOLE=y |
763 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
764 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
630 | # CONFIG_FONTS is not set | 765 | # CONFIG_FONTS is not set |
631 | CONFIG_FONT_8x8=y | 766 | CONFIG_FONT_8x8=y |
632 | CONFIG_FONT_8x16=y | 767 | CONFIG_FONT_8x16=y |
633 | 768 | CONFIG_LOGO=y | |
634 | # | 769 | CONFIG_LOGO_LINUX_MONO=y |
635 | # Logo configuration | 770 | CONFIG_LOGO_LINUX_VGA16=y |
636 | # | 771 | CONFIG_LOGO_LINUX_CLUT224=y |
637 | # CONFIG_LOGO is not set | ||
638 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
639 | 772 | ||
640 | # | 773 | # |
641 | # Sound | 774 | # Sound |
@@ -643,27 +776,21 @@ CONFIG_FONT_8x16=y | |||
643 | CONFIG_SOUND=m | 776 | CONFIG_SOUND=m |
644 | CONFIG_DMASOUND_ATARI=m | 777 | CONFIG_DMASOUND_ATARI=m |
645 | CONFIG_DMASOUND=m | 778 | CONFIG_DMASOUND=m |
646 | 779 | CONFIG_HID_SUPPORT=y | |
647 | # | 780 | CONFIG_HID=m |
648 | # USB support | 781 | # CONFIG_HID_DEBUG is not set |
649 | # | 782 | CONFIG_HIDRAW=y |
650 | # CONFIG_USB_ARCH_HAS_HCD is not set | 783 | # CONFIG_USB_SUPPORT is not set |
651 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
652 | |||
653 | # | ||
654 | # USB Gadget Support | ||
655 | # | ||
656 | # CONFIG_USB_GADGET is not set | ||
657 | |||
658 | # | ||
659 | # MMC/SD Card support | ||
660 | # | ||
661 | # CONFIG_MMC is not set | 784 | # CONFIG_MMC is not set |
785 | # CONFIG_MEMSTICK is not set | ||
786 | # CONFIG_NEW_LEDS is not set | ||
787 | # CONFIG_RTC_CLASS is not set | ||
788 | # CONFIG_AUXDISPLAY is not set | ||
662 | 789 | ||
663 | # | 790 | # |
664 | # InfiniBand support | 791 | # Userspace I/O |
665 | # | 792 | # |
666 | # CONFIG_INFINIBAND is not set | 793 | # CONFIG_UIO is not set |
667 | 794 | ||
668 | # | 795 | # |
669 | # Character devices | 796 | # Character devices |
@@ -680,38 +807,44 @@ CONFIG_ATARI_DSP56K=m | |||
680 | # | 807 | # |
681 | CONFIG_EXT2_FS=y | 808 | CONFIG_EXT2_FS=y |
682 | # CONFIG_EXT2_FS_XATTR is not set | 809 | # CONFIG_EXT2_FS_XATTR is not set |
810 | # CONFIG_EXT2_FS_XIP is not set | ||
683 | CONFIG_EXT3_FS=y | 811 | CONFIG_EXT3_FS=y |
684 | # CONFIG_EXT3_FS_XATTR is not set | 812 | # CONFIG_EXT3_FS_XATTR is not set |
813 | # CONFIG_EXT4DEV_FS is not set | ||
685 | CONFIG_JBD=y | 814 | CONFIG_JBD=y |
686 | # CONFIG_JBD_DEBUG is not set | ||
687 | CONFIG_REISERFS_FS=m | 815 | CONFIG_REISERFS_FS=m |
688 | # CONFIG_REISERFS_CHECK is not set | 816 | # CONFIG_REISERFS_CHECK is not set |
689 | CONFIG_REISERFS_PROC_INFO=y | 817 | # CONFIG_REISERFS_PROC_INFO is not set |
690 | # CONFIG_REISERFS_FS_XATTR is not set | 818 | # CONFIG_REISERFS_FS_XATTR is not set |
691 | CONFIG_JFS_FS=m | 819 | CONFIG_JFS_FS=m |
692 | # CONFIG_JFS_POSIX_ACL is not set | 820 | # CONFIG_JFS_POSIX_ACL is not set |
693 | # CONFIG_JFS_SECURITY is not set | 821 | # CONFIG_JFS_SECURITY is not set |
694 | # CONFIG_JFS_DEBUG is not set | 822 | # CONFIG_JFS_DEBUG is not set |
695 | # CONFIG_JFS_STATISTICS is not set | 823 | # CONFIG_JFS_STATISTICS is not set |
696 | 824 | CONFIG_FS_POSIX_ACL=y | |
697 | # | ||
698 | # XFS support | ||
699 | # | ||
700 | CONFIG_XFS_FS=m | 825 | CONFIG_XFS_FS=m |
701 | CONFIG_XFS_EXPORT=y | ||
702 | # CONFIG_XFS_RT is not set | ||
703 | # CONFIG_XFS_QUOTA is not set | 826 | # CONFIG_XFS_QUOTA is not set |
704 | # CONFIG_XFS_SECURITY is not set | 827 | # CONFIG_XFS_SECURITY is not set |
705 | # CONFIG_XFS_POSIX_ACL is not set | 828 | # CONFIG_XFS_POSIX_ACL is not set |
706 | CONFIG_MINIX_FS=y | 829 | # CONFIG_XFS_RT is not set |
707 | # CONFIG_ROMFS_FS is not set | 830 | CONFIG_GFS2_FS=m |
831 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
832 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
833 | CONFIG_OCFS2_FS=m | ||
834 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
835 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
836 | CONFIG_DNOTIFY=y | ||
837 | CONFIG_INOTIFY=y | ||
838 | CONFIG_INOTIFY_USER=y | ||
708 | CONFIG_QUOTA=y | 839 | CONFIG_QUOTA=y |
840 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
841 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
709 | # CONFIG_QFMT_V1 is not set | 842 | # CONFIG_QFMT_V1 is not set |
710 | # CONFIG_QFMT_V2 is not set | 843 | # CONFIG_QFMT_V2 is not set |
711 | CONFIG_QUOTACTL=y | 844 | CONFIG_QUOTACTL=y |
712 | CONFIG_DNOTIFY=y | ||
713 | CONFIG_AUTOFS_FS=m | 845 | CONFIG_AUTOFS_FS=m |
714 | CONFIG_AUTOFS4_FS=m | 846 | CONFIG_AUTOFS4_FS=m |
847 | CONFIG_FUSE_FS=m | ||
715 | 848 | ||
716 | # | 849 | # |
717 | # CD-ROM/DVD Filesystems | 850 | # CD-ROM/DVD Filesystems |
@@ -719,7 +852,6 @@ CONFIG_AUTOFS4_FS=m | |||
719 | CONFIG_ISO9660_FS=y | 852 | CONFIG_ISO9660_FS=y |
720 | CONFIG_JOLIET=y | 853 | CONFIG_JOLIET=y |
721 | CONFIG_ZISOFS=y | 854 | CONFIG_ZISOFS=y |
722 | CONFIG_ZISOFS_FS=y | ||
723 | CONFIG_UDF_FS=m | 855 | CONFIG_UDF_FS=m |
724 | CONFIG_UDF_NLS=y | 856 | CONFIG_UDF_NLS=y |
725 | 857 | ||
@@ -738,13 +870,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
738 | # | 870 | # |
739 | CONFIG_PROC_FS=y | 871 | CONFIG_PROC_FS=y |
740 | CONFIG_PROC_KCORE=y | 872 | CONFIG_PROC_KCORE=y |
873 | CONFIG_PROC_SYSCTL=y | ||
741 | CONFIG_SYSFS=y | 874 | CONFIG_SYSFS=y |
742 | # CONFIG_DEVFS_FS is not set | ||
743 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
744 | CONFIG_TMPFS=y | 875 | CONFIG_TMPFS=y |
745 | # CONFIG_TMPFS_XATTR is not set | 876 | # CONFIG_TMPFS_POSIX_ACL is not set |
746 | # CONFIG_HUGETLB_PAGE is not set | 877 | # CONFIG_HUGETLB_PAGE is not set |
747 | CONFIG_RAMFS=y | 878 | CONFIG_CONFIGFS_FS=m |
748 | 879 | ||
749 | # | 880 | # |
750 | # Miscellaneous filesystems | 881 | # Miscellaneous filesystems |
@@ -758,42 +889,38 @@ CONFIG_HFSPLUS_FS=m | |||
758 | # CONFIG_EFS_FS is not set | 889 | # CONFIG_EFS_FS is not set |
759 | CONFIG_CRAMFS=m | 890 | CONFIG_CRAMFS=m |
760 | # CONFIG_VXFS_FS is not set | 891 | # CONFIG_VXFS_FS is not set |
892 | CONFIG_MINIX_FS=y | ||
761 | CONFIG_HPFS_FS=m | 893 | CONFIG_HPFS_FS=m |
762 | # CONFIG_QNX4FS_FS is not set | 894 | # CONFIG_QNX4FS_FS is not set |
895 | # CONFIG_ROMFS_FS is not set | ||
763 | CONFIG_SYSV_FS=m | 896 | CONFIG_SYSV_FS=m |
764 | CONFIG_UFS_FS=m | 897 | CONFIG_UFS_FS=m |
765 | # CONFIG_UFS_FS_WRITE is not set | 898 | # CONFIG_UFS_FS_WRITE is not set |
766 | 899 | # CONFIG_UFS_DEBUG is not set | |
767 | # | 900 | CONFIG_NETWORK_FILESYSTEMS=y |
768 | # Network File Systems | ||
769 | # | ||
770 | CONFIG_NFS_FS=m | 901 | CONFIG_NFS_FS=m |
771 | CONFIG_NFS_V3=y | 902 | CONFIG_NFS_V3=y |
903 | # CONFIG_NFS_V3_ACL is not set | ||
772 | # CONFIG_NFS_V4 is not set | 904 | # CONFIG_NFS_V4 is not set |
773 | # CONFIG_NFS_DIRECTIO is not set | 905 | # CONFIG_NFS_DIRECTIO is not set |
774 | CONFIG_NFSD=m | 906 | CONFIG_NFSD=m |
775 | CONFIG_NFSD_V3=y | 907 | CONFIG_NFSD_V3=y |
908 | # CONFIG_NFSD_V3_ACL is not set | ||
776 | # CONFIG_NFSD_V4 is not set | 909 | # CONFIG_NFSD_V4 is not set |
777 | CONFIG_NFSD_TCP=y | 910 | CONFIG_NFSD_TCP=y |
778 | CONFIG_LOCKD=m | 911 | CONFIG_LOCKD=m |
779 | CONFIG_LOCKD_V4=y | 912 | CONFIG_LOCKD_V4=y |
780 | CONFIG_EXPORTFS=m | 913 | CONFIG_EXPORTFS=m |
914 | CONFIG_NFS_COMMON=y | ||
781 | CONFIG_SUNRPC=m | 915 | CONFIG_SUNRPC=m |
916 | CONFIG_SUNRPC_BIND34=y | ||
782 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 917 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
783 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 918 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
784 | CONFIG_SMB_FS=m | 919 | CONFIG_SMB_FS=m |
785 | CONFIG_SMB_NLS_DEFAULT=y | 920 | CONFIG_SMB_NLS_DEFAULT=y |
786 | CONFIG_SMB_NLS_REMOTE="cp437" | 921 | CONFIG_SMB_NLS_REMOTE="cp437" |
787 | # CONFIG_CIFS is not set | 922 | # CONFIG_CIFS is not set |
788 | CONFIG_NCP_FS=m | 923 | # CONFIG_NCP_FS is not set |
789 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
790 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
791 | # CONFIG_NCPFS_STRONG is not set | ||
792 | CONFIG_NCPFS_NFS_NS=y | ||
793 | CONFIG_NCPFS_OS2_NS=y | ||
794 | # CONFIG_NCPFS_SMALLDOS is not set | ||
795 | CONFIG_NCPFS_NLS=y | ||
796 | # CONFIG_NCPFS_EXTRAS is not set | ||
797 | CONFIG_CODA_FS=m | 924 | CONFIG_CODA_FS=m |
798 | # CONFIG_CODA_FS_OLD_API is not set | 925 | # CONFIG_CODA_FS_OLD_API is not set |
799 | # CONFIG_AFS_FS is not set | 926 | # CONFIG_AFS_FS is not set |
@@ -804,10 +931,6 @@ CONFIG_CODA_FS=m | |||
804 | # CONFIG_PARTITION_ADVANCED is not set | 931 | # CONFIG_PARTITION_ADVANCED is not set |
805 | CONFIG_ATARI_PARTITION=y | 932 | CONFIG_ATARI_PARTITION=y |
806 | CONFIG_MSDOS_PARTITION=y | 933 | CONFIG_MSDOS_PARTITION=y |
807 | |||
808 | # | ||
809 | # Native Language Support | ||
810 | # | ||
811 | CONFIG_NLS=y | 934 | CONFIG_NLS=y |
812 | CONFIG_NLS_DEFAULT="iso8859-1" | 935 | CONFIG_NLS_DEFAULT="iso8859-1" |
813 | CONFIG_NLS_CODEPAGE_437=y | 936 | CONFIG_NLS_CODEPAGE_437=y |
@@ -848,35 +971,42 @@ CONFIG_NLS_ISO8859_15=m | |||
848 | CONFIG_NLS_KOI8_R=m | 971 | CONFIG_NLS_KOI8_R=m |
849 | CONFIG_NLS_KOI8_U=m | 972 | CONFIG_NLS_KOI8_U=m |
850 | CONFIG_NLS_UTF8=m | 973 | CONFIG_NLS_UTF8=m |
974 | CONFIG_DLM=m | ||
975 | # CONFIG_DLM_DEBUG is not set | ||
851 | 976 | ||
852 | # | 977 | # |
853 | # Kernel hacking | 978 | # Kernel hacking |
854 | # | 979 | # |
855 | # CONFIG_PRINTK_TIME is not set | 980 | # CONFIG_PRINTK_TIME is not set |
856 | CONFIG_DEBUG_KERNEL=y | 981 | CONFIG_ENABLE_WARN_DEPRECATED=y |
982 | CONFIG_ENABLE_MUST_CHECK=y | ||
857 | CONFIG_MAGIC_SYSRQ=y | 983 | CONFIG_MAGIC_SYSRQ=y |
858 | CONFIG_LOG_BUF_SHIFT=16 | 984 | # CONFIG_UNUSED_SYMBOLS is not set |
859 | # CONFIG_SCHEDSTATS is not set | ||
860 | # CONFIG_DEBUG_SLAB is not set | ||
861 | # CONFIG_DEBUG_SPINLOCK is not set | ||
862 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
863 | # CONFIG_DEBUG_KOBJECT is not set | ||
864 | CONFIG_DEBUG_BUGVERBOSE=y | ||
865 | # CONFIG_DEBUG_INFO is not set | ||
866 | # CONFIG_DEBUG_FS is not set | 985 | # CONFIG_DEBUG_FS is not set |
867 | # CONFIG_FRAME_POINTER is not set | 986 | # CONFIG_HEADERS_CHECK is not set |
987 | # CONFIG_DEBUG_KERNEL is not set | ||
988 | CONFIG_DEBUG_BUGVERBOSE=y | ||
989 | # CONFIG_SAMPLES is not set | ||
868 | 990 | ||
869 | # | 991 | # |
870 | # Security options | 992 | # Security options |
871 | # | 993 | # |
872 | # CONFIG_KEYS is not set | 994 | # CONFIG_KEYS is not set |
873 | # CONFIG_SECURITY is not set | 995 | # CONFIG_SECURITY is not set |
874 | 996 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
875 | # | 997 | CONFIG_XOR_BLOCKS=m |
876 | # Cryptographic options | 998 | CONFIG_ASYNC_CORE=m |
877 | # | 999 | CONFIG_ASYNC_MEMCPY=m |
1000 | CONFIG_ASYNC_XOR=m | ||
878 | CONFIG_CRYPTO=y | 1001 | CONFIG_CRYPTO=y |
1002 | CONFIG_CRYPTO_ALGAPI=y | ||
1003 | CONFIG_CRYPTO_AEAD=m | ||
1004 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1005 | CONFIG_CRYPTO_SEQIV=m | ||
1006 | CONFIG_CRYPTO_HASH=y | ||
1007 | CONFIG_CRYPTO_MANAGER=y | ||
879 | CONFIG_CRYPTO_HMAC=y | 1008 | CONFIG_CRYPTO_HMAC=y |
1009 | CONFIG_CRYPTO_XCBC=m | ||
880 | CONFIG_CRYPTO_NULL=m | 1010 | CONFIG_CRYPTO_NULL=m |
881 | CONFIG_CRYPTO_MD4=m | 1011 | CONFIG_CRYPTO_MD4=m |
882 | CONFIG_CRYPTO_MD5=m | 1012 | CONFIG_CRYPTO_MD5=m |
@@ -885,9 +1015,21 @@ CONFIG_CRYPTO_SHA256=m | |||
885 | CONFIG_CRYPTO_SHA512=m | 1015 | CONFIG_CRYPTO_SHA512=m |
886 | CONFIG_CRYPTO_WP512=m | 1016 | CONFIG_CRYPTO_WP512=m |
887 | CONFIG_CRYPTO_TGR192=m | 1017 | CONFIG_CRYPTO_TGR192=m |
1018 | CONFIG_CRYPTO_GF128MUL=m | ||
1019 | CONFIG_CRYPTO_ECB=m | ||
1020 | CONFIG_CRYPTO_CBC=m | ||
1021 | CONFIG_CRYPTO_PCBC=m | ||
1022 | CONFIG_CRYPTO_LRW=m | ||
1023 | CONFIG_CRYPTO_XTS=m | ||
1024 | CONFIG_CRYPTO_CTR=m | ||
1025 | CONFIG_CRYPTO_GCM=m | ||
1026 | CONFIG_CRYPTO_CCM=m | ||
1027 | CONFIG_CRYPTO_CRYPTD=m | ||
888 | CONFIG_CRYPTO_DES=m | 1028 | CONFIG_CRYPTO_DES=m |
1029 | CONFIG_CRYPTO_FCRYPT=m | ||
889 | CONFIG_CRYPTO_BLOWFISH=m | 1030 | CONFIG_CRYPTO_BLOWFISH=m |
890 | CONFIG_CRYPTO_TWOFISH=m | 1031 | CONFIG_CRYPTO_TWOFISH=m |
1032 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
891 | CONFIG_CRYPTO_SERPENT=m | 1033 | CONFIG_CRYPTO_SERPENT=m |
892 | CONFIG_CRYPTO_AES=m | 1034 | CONFIG_CRYPTO_AES=m |
893 | CONFIG_CRYPTO_CAST5=m | 1035 | CONFIG_CRYPTO_CAST5=m |
@@ -896,20 +1038,35 @@ CONFIG_CRYPTO_TEA=m | |||
896 | CONFIG_CRYPTO_ARC4=m | 1038 | CONFIG_CRYPTO_ARC4=m |
897 | CONFIG_CRYPTO_KHAZAD=m | 1039 | CONFIG_CRYPTO_KHAZAD=m |
898 | CONFIG_CRYPTO_ANUBIS=m | 1040 | CONFIG_CRYPTO_ANUBIS=m |
1041 | CONFIG_CRYPTO_SEED=m | ||
1042 | CONFIG_CRYPTO_SALSA20=m | ||
899 | CONFIG_CRYPTO_DEFLATE=m | 1043 | CONFIG_CRYPTO_DEFLATE=m |
900 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1044 | CONFIG_CRYPTO_MICHAEL_MIC=m |
901 | CONFIG_CRYPTO_CRC32C=m | 1045 | CONFIG_CRYPTO_CRC32C=m |
1046 | CONFIG_CRYPTO_CAMELLIA=m | ||
902 | CONFIG_CRYPTO_TEST=m | 1047 | CONFIG_CRYPTO_TEST=m |
903 | 1048 | CONFIG_CRYPTO_AUTHENC=m | |
904 | # | 1049 | CONFIG_CRYPTO_LZO=m |
905 | # Hardware crypto devices | 1050 | # CONFIG_CRYPTO_HW is not set |
906 | # | ||
907 | 1051 | ||
908 | # | 1052 | # |
909 | # Library routines | 1053 | # Library routines |
910 | # | 1054 | # |
1055 | CONFIG_BITREVERSE=y | ||
911 | CONFIG_CRC_CCITT=m | 1056 | CONFIG_CRC_CCITT=m |
1057 | CONFIG_CRC16=y | ||
1058 | # CONFIG_CRC_ITU_T is not set | ||
912 | CONFIG_CRC32=y | 1059 | CONFIG_CRC32=y |
1060 | # CONFIG_CRC7 is not set | ||
913 | CONFIG_LIBCRC32C=m | 1061 | CONFIG_LIBCRC32C=m |
914 | CONFIG_ZLIB_INFLATE=y | 1062 | CONFIG_ZLIB_INFLATE=y |
915 | CONFIG_ZLIB_DEFLATE=m | 1063 | CONFIG_ZLIB_DEFLATE=m |
1064 | CONFIG_LZO_COMPRESS=m | ||
1065 | CONFIG_LZO_DECOMPRESS=m | ||
1066 | CONFIG_TEXTSEARCH=y | ||
1067 | CONFIG_TEXTSEARCH_KMP=m | ||
1068 | CONFIG_TEXTSEARCH_BM=m | ||
1069 | CONFIG_TEXTSEARCH_FSM=m | ||
1070 | CONFIG_PLIST=y | ||
1071 | CONFIG_HAS_IOMEM=y | ||
1072 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index da2a23a21463..ed98eff708c4 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:37 2005 | 4 | # Wed Apr 2 20:46:10 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-bvme6000" | 27 | CONFIG_LOCALVERSION="-bvme6000" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -85,6 +133,22 @@ CONFIG_M68060=y | |||
85 | CONFIG_MMU_MOTOROLA=y | 133 | CONFIG_MMU_MOTOROLA=y |
86 | # CONFIG_M68KFPU_EMU is not set | 134 | # CONFIG_M68KFPU_EMU is not set |
87 | # CONFIG_ADVANCED is not set | 135 | # CONFIG_ADVANCED is not set |
136 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
137 | CONFIG_NODES_SHIFT=3 | ||
138 | CONFIG_SELECT_MEMORY_MODEL=y | ||
139 | # CONFIG_FLATMEM_MANUAL is not set | ||
140 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
141 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
142 | CONFIG_DISCONTIGMEM=y | ||
143 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
144 | CONFIG_NEED_MULTIPLE_NODES=y | ||
145 | # CONFIG_SPARSEMEM_STATIC is not set | ||
146 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
147 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
148 | # CONFIG_RESOURCES_64BIT is not set | ||
149 | CONFIG_ZONE_DMA_FLAG=1 | ||
150 | CONFIG_BOUNCE=y | ||
151 | CONFIG_VIRT_TO_BUS=y | ||
88 | 152 | ||
89 | # | 153 | # |
90 | # General setup | 154 | # General setup |
@@ -93,134 +157,11 @@ CONFIG_BINFMT_ELF=y | |||
93 | CONFIG_BINFMT_AOUT=m | 157 | CONFIG_BINFMT_AOUT=m |
94 | CONFIG_BINFMT_MISC=m | 158 | CONFIG_BINFMT_MISC=m |
95 | CONFIG_PROC_HARDWARE=y | 159 | CONFIG_PROC_HARDWARE=y |
160 | CONFIG_ZONE_DMA=y | ||
161 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
96 | 162 | ||
97 | # | 163 | # |
98 | # Device Drivers | 164 | # Networking |
99 | # | ||
100 | |||
101 | # | ||
102 | # Generic Driver Options | ||
103 | # | ||
104 | CONFIG_STANDALONE=y | ||
105 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
106 | CONFIG_FW_LOADER=m | ||
107 | # CONFIG_DEBUG_DRIVER is not set | ||
108 | |||
109 | # | ||
110 | # Memory Technology Devices (MTD) | ||
111 | # | ||
112 | # CONFIG_MTD is not set | ||
113 | |||
114 | # | ||
115 | # Parallel port support | ||
116 | # | ||
117 | # CONFIG_PARPORT is not set | ||
118 | |||
119 | # | ||
120 | # Plug and Play support | ||
121 | # | ||
122 | |||
123 | # | ||
124 | # Block devices | ||
125 | # | ||
126 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
127 | CONFIG_BLK_DEV_LOOP=y | ||
128 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
129 | CONFIG_BLK_DEV_NBD=m | ||
130 | CONFIG_BLK_DEV_RAM=y | ||
131 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
132 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
133 | CONFIG_BLK_DEV_INITRD=y | ||
134 | CONFIG_INITRAMFS_SOURCE="" | ||
135 | CONFIG_CDROM_PKTCDVD=m | ||
136 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
137 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
138 | |||
139 | # | ||
140 | # IO Schedulers | ||
141 | # | ||
142 | CONFIG_IOSCHED_NOOP=y | ||
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | ||
145 | CONFIG_IOSCHED_CFQ=y | ||
146 | CONFIG_ATA_OVER_ETH=m | ||
147 | |||
148 | # | ||
149 | # ATA/ATAPI/MFM/RLL support | ||
150 | # | ||
151 | # CONFIG_IDE is not set | ||
152 | |||
153 | # | ||
154 | # SCSI device support | ||
155 | # | ||
156 | CONFIG_SCSI=y | ||
157 | CONFIG_SCSI_PROC_FS=y | ||
158 | |||
159 | # | ||
160 | # SCSI support type (disk, tape, CD-ROM) | ||
161 | # | ||
162 | CONFIG_BLK_DEV_SD=y | ||
163 | CONFIG_CHR_DEV_ST=m | ||
164 | # CONFIG_CHR_DEV_OSST is not set | ||
165 | CONFIG_BLK_DEV_SR=y | ||
166 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
167 | CONFIG_CHR_DEV_SG=m | ||
168 | |||
169 | # | ||
170 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
171 | # | ||
172 | # CONFIG_SCSI_MULTI_LUN is not set | ||
173 | CONFIG_SCSI_CONSTANTS=y | ||
174 | # CONFIG_SCSI_LOGGING is not set | ||
175 | |||
176 | # | ||
177 | # SCSI Transport Attributes | ||
178 | # | ||
179 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
180 | # CONFIG_SCSI_FC_ATTRS is not set | ||
181 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
182 | |||
183 | # | ||
184 | # SCSI low-level drivers | ||
185 | # | ||
186 | # CONFIG_SCSI_SATA is not set | ||
187 | # CONFIG_SCSI_DEBUG is not set | ||
188 | |||
189 | # | ||
190 | # Multi-device support (RAID and LVM) | ||
191 | # | ||
192 | CONFIG_MD=y | ||
193 | CONFIG_BLK_DEV_MD=m | ||
194 | CONFIG_MD_LINEAR=m | ||
195 | CONFIG_MD_RAID0=m | ||
196 | CONFIG_MD_RAID1=m | ||
197 | # CONFIG_MD_RAID10 is not set | ||
198 | CONFIG_MD_RAID5=m | ||
199 | CONFIG_MD_RAID6=m | ||
200 | CONFIG_MD_MULTIPATH=m | ||
201 | # CONFIG_MD_FAULTY is not set | ||
202 | CONFIG_BLK_DEV_DM=m | ||
203 | CONFIG_DM_CRYPT=m | ||
204 | CONFIG_DM_SNAPSHOT=m | ||
205 | CONFIG_DM_MIRROR=m | ||
206 | CONFIG_DM_ZERO=m | ||
207 | CONFIG_DM_MULTIPATH=m | ||
208 | CONFIG_DM_MULTIPATH_EMC=m | ||
209 | |||
210 | # | ||
211 | # Fusion MPT device support | ||
212 | # | ||
213 | |||
214 | # | ||
215 | # IEEE 1394 (FireWire) support | ||
216 | # | ||
217 | |||
218 | # | ||
219 | # I2O device support | ||
220 | # | ||
221 | |||
222 | # | ||
223 | # Networking support | ||
224 | # | 165 | # |
225 | CONFIG_NET=y | 166 | CONFIG_NET=y |
226 | 167 | ||
@@ -230,10 +171,17 @@ CONFIG_NET=y | |||
230 | CONFIG_PACKET=y | 171 | CONFIG_PACKET=y |
231 | # CONFIG_PACKET_MMAP is not set | 172 | # CONFIG_PACKET_MMAP is not set |
232 | CONFIG_UNIX=y | 173 | CONFIG_UNIX=y |
174 | CONFIG_XFRM=y | ||
175 | # CONFIG_XFRM_USER is not set | ||
176 | # CONFIG_XFRM_SUB_POLICY is not set | ||
177 | CONFIG_XFRM_MIGRATE=y | ||
178 | # CONFIG_XFRM_STATISTICS is not set | ||
233 | CONFIG_NET_KEY=y | 179 | CONFIG_NET_KEY=y |
180 | CONFIG_NET_KEY_MIGRATE=y | ||
234 | CONFIG_INET=y | 181 | CONFIG_INET=y |
235 | # CONFIG_IP_MULTICAST is not set | 182 | # CONFIG_IP_MULTICAST is not set |
236 | # CONFIG_IP_ADVANCED_ROUTER is not set | 183 | # CONFIG_IP_ADVANCED_ROUTER is not set |
184 | CONFIG_IP_FIB_HASH=y | ||
237 | CONFIG_IP_PNP=y | 185 | CONFIG_IP_PNP=y |
238 | CONFIG_IP_PNP_DHCP=y | 186 | CONFIG_IP_PNP_DHCP=y |
239 | CONFIG_IP_PNP_BOOTP=y | 187 | CONFIG_IP_PNP_BOOTP=y |
@@ -245,126 +193,186 @@ CONFIG_SYN_COOKIES=y | |||
245 | CONFIG_INET_AH=m | 193 | CONFIG_INET_AH=m |
246 | CONFIG_INET_ESP=m | 194 | CONFIG_INET_ESP=m |
247 | CONFIG_INET_IPCOMP=m | 195 | CONFIG_INET_IPCOMP=m |
196 | CONFIG_INET_XFRM_TUNNEL=m | ||
248 | CONFIG_INET_TUNNEL=m | 197 | CONFIG_INET_TUNNEL=m |
249 | CONFIG_IP_TCPDIAG=m | 198 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
250 | CONFIG_IP_TCPDIAG_IPV6=y | 199 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
251 | 200 | CONFIG_INET_XFRM_MODE_BEET=m | |
252 | # | 201 | CONFIG_INET_LRO=m |
253 | # IP: Virtual Server Configuration | 202 | CONFIG_INET_DIAG=m |
254 | # | 203 | CONFIG_INET_TCP_DIAG=m |
204 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
205 | CONFIG_TCP_CONG_CUBIC=y | ||
206 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
207 | # CONFIG_TCP_MD5SIG is not set | ||
255 | # CONFIG_IP_VS is not set | 208 | # CONFIG_IP_VS is not set |
256 | CONFIG_IPV6=m | 209 | CONFIG_IPV6=m |
257 | CONFIG_IPV6_PRIVACY=y | 210 | CONFIG_IPV6_PRIVACY=y |
211 | CONFIG_IPV6_ROUTER_PREF=y | ||
212 | CONFIG_IPV6_ROUTE_INFO=y | ||
213 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
258 | CONFIG_INET6_AH=m | 214 | CONFIG_INET6_AH=m |
259 | CONFIG_INET6_ESP=m | 215 | CONFIG_INET6_ESP=m |
260 | CONFIG_INET6_IPCOMP=m | 216 | CONFIG_INET6_IPCOMP=m |
217 | # CONFIG_IPV6_MIP6 is not set | ||
218 | CONFIG_INET6_XFRM_TUNNEL=m | ||
261 | CONFIG_INET6_TUNNEL=m | 219 | CONFIG_INET6_TUNNEL=m |
220 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
221 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
222 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
223 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
224 | CONFIG_IPV6_SIT=m | ||
262 | CONFIG_IPV6_TUNNEL=m | 225 | CONFIG_IPV6_TUNNEL=m |
226 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
227 | # CONFIG_NETWORK_SECMARK is not set | ||
263 | CONFIG_NETFILTER=y | 228 | CONFIG_NETFILTER=y |
264 | # CONFIG_NETFILTER_DEBUG is not set | 229 | # CONFIG_NETFILTER_DEBUG is not set |
230 | CONFIG_NETFILTER_ADVANCED=y | ||
231 | |||
232 | # | ||
233 | # Core Netfilter Configuration | ||
234 | # | ||
235 | CONFIG_NETFILTER_NETLINK=m | ||
236 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
237 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
238 | CONFIG_NF_CONNTRACK=m | ||
239 | CONFIG_NF_CT_ACCT=y | ||
240 | CONFIG_NF_CONNTRACK_MARK=y | ||
241 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
242 | CONFIG_NF_CT_PROTO_GRE=m | ||
243 | CONFIG_NF_CT_PROTO_SCTP=m | ||
244 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
245 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
246 | CONFIG_NF_CONNTRACK_FTP=m | ||
247 | CONFIG_NF_CONNTRACK_H323=m | ||
248 | CONFIG_NF_CONNTRACK_IRC=m | ||
249 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
250 | CONFIG_NF_CONNTRACK_PPTP=m | ||
251 | CONFIG_NF_CONNTRACK_SANE=m | ||
252 | CONFIG_NF_CONNTRACK_SIP=m | ||
253 | CONFIG_NF_CONNTRACK_TFTP=m | ||
254 | # CONFIG_NF_CT_NETLINK is not set | ||
255 | CONFIG_NETFILTER_XTABLES=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
265 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
266 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
295 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
265 | 296 | ||
266 | # | 297 | # |
267 | # IP: Netfilter Configuration | 298 | # IP: Netfilter Configuration |
268 | # | 299 | # |
269 | CONFIG_IP_NF_CONNTRACK=m | 300 | CONFIG_NF_CONNTRACK_IPV4=m |
270 | # CONFIG_IP_NF_CT_ACCT is not set | 301 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
271 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
272 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
273 | CONFIG_IP_NF_FTP=m | ||
274 | CONFIG_IP_NF_IRC=m | ||
275 | CONFIG_IP_NF_TFTP=m | ||
276 | CONFIG_IP_NF_AMANDA=m | ||
277 | CONFIG_IP_NF_QUEUE=m | 302 | CONFIG_IP_NF_QUEUE=m |
278 | CONFIG_IP_NF_IPTABLES=m | 303 | CONFIG_IP_NF_IPTABLES=m |
279 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
280 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
281 | CONFIG_IP_NF_MATCH_MAC=m | ||
282 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
283 | CONFIG_IP_NF_MATCH_MARK=m | ||
284 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
285 | CONFIG_IP_NF_MATCH_TOS=m | ||
286 | CONFIG_IP_NF_MATCH_RECENT=m | 304 | CONFIG_IP_NF_MATCH_RECENT=m |
287 | CONFIG_IP_NF_MATCH_ECN=m | 305 | CONFIG_IP_NF_MATCH_ECN=m |
288 | CONFIG_IP_NF_MATCH_DSCP=m | 306 | CONFIG_IP_NF_MATCH_AH=m |
289 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
290 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
291 | CONFIG_IP_NF_MATCH_TTL=m | 307 | CONFIG_IP_NF_MATCH_TTL=m |
292 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
293 | CONFIG_IP_NF_MATCH_HELPER=m | ||
294 | CONFIG_IP_NF_MATCH_STATE=m | ||
295 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
296 | CONFIG_IP_NF_MATCH_OWNER=m | ||
297 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 308 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
298 | CONFIG_IP_NF_MATCH_REALM=m | ||
299 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
300 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
301 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
302 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
303 | CONFIG_IP_NF_FILTER=m | 309 | CONFIG_IP_NF_FILTER=m |
304 | CONFIG_IP_NF_TARGET_REJECT=m | 310 | CONFIG_IP_NF_TARGET_REJECT=m |
305 | CONFIG_IP_NF_TARGET_LOG=m | 311 | CONFIG_IP_NF_TARGET_LOG=m |
306 | CONFIG_IP_NF_TARGET_ULOG=m | 312 | CONFIG_IP_NF_TARGET_ULOG=m |
307 | CONFIG_IP_NF_TARGET_TCPMSS=m | 313 | CONFIG_NF_NAT=m |
308 | CONFIG_IP_NF_NAT=m | 314 | CONFIG_NF_NAT_NEEDED=y |
309 | CONFIG_IP_NF_NAT_NEEDED=y | ||
310 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 315 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
311 | CONFIG_IP_NF_TARGET_REDIRECT=m | 316 | CONFIG_IP_NF_TARGET_REDIRECT=m |
312 | CONFIG_IP_NF_TARGET_NETMAP=m | 317 | CONFIG_IP_NF_TARGET_NETMAP=m |
313 | CONFIG_IP_NF_TARGET_SAME=m | 318 | CONFIG_NF_NAT_SNMP_BASIC=m |
314 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 319 | CONFIG_NF_NAT_PROTO_GRE=m |
315 | CONFIG_IP_NF_NAT_IRC=m | 320 | CONFIG_NF_NAT_FTP=m |
316 | CONFIG_IP_NF_NAT_FTP=m | 321 | CONFIG_NF_NAT_IRC=m |
317 | CONFIG_IP_NF_NAT_TFTP=m | 322 | CONFIG_NF_NAT_TFTP=m |
318 | CONFIG_IP_NF_NAT_AMANDA=m | 323 | CONFIG_NF_NAT_AMANDA=m |
324 | CONFIG_NF_NAT_PPTP=m | ||
325 | CONFIG_NF_NAT_H323=m | ||
326 | CONFIG_NF_NAT_SIP=m | ||
319 | CONFIG_IP_NF_MANGLE=m | 327 | CONFIG_IP_NF_MANGLE=m |
320 | CONFIG_IP_NF_TARGET_TOS=m | ||
321 | CONFIG_IP_NF_TARGET_ECN=m | 328 | CONFIG_IP_NF_TARGET_ECN=m |
322 | CONFIG_IP_NF_TARGET_DSCP=m | 329 | CONFIG_IP_NF_TARGET_TTL=m |
323 | CONFIG_IP_NF_TARGET_MARK=m | 330 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
324 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
325 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
326 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
327 | CONFIG_IP_NF_RAW=m | 331 | CONFIG_IP_NF_RAW=m |
328 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
329 | CONFIG_IP_NF_ARPTABLES=m | 332 | CONFIG_IP_NF_ARPTABLES=m |
330 | CONFIG_IP_NF_ARPFILTER=m | 333 | CONFIG_IP_NF_ARPFILTER=m |
331 | CONFIG_IP_NF_ARP_MANGLE=m | 334 | CONFIG_IP_NF_ARP_MANGLE=m |
332 | 335 | ||
333 | # | 336 | # |
334 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 337 | # IPv6: Netfilter Configuration |
335 | # | 338 | # |
339 | CONFIG_NF_CONNTRACK_IPV6=m | ||
336 | CONFIG_IP6_NF_QUEUE=m | 340 | CONFIG_IP6_NF_QUEUE=m |
337 | CONFIG_IP6_NF_IPTABLES=m | 341 | CONFIG_IP6_NF_IPTABLES=m |
338 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
339 | CONFIG_IP6_NF_MATCH_MAC=m | ||
340 | CONFIG_IP6_NF_MATCH_RT=m | 342 | CONFIG_IP6_NF_MATCH_RT=m |
341 | CONFIG_IP6_NF_MATCH_OPTS=m | 343 | CONFIG_IP6_NF_MATCH_OPTS=m |
342 | CONFIG_IP6_NF_MATCH_FRAG=m | 344 | CONFIG_IP6_NF_MATCH_FRAG=m |
343 | CONFIG_IP6_NF_MATCH_HL=m | 345 | CONFIG_IP6_NF_MATCH_HL=m |
344 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
345 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
346 | CONFIG_IP6_NF_MATCH_MARK=m | ||
347 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 346 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
348 | CONFIG_IP6_NF_MATCH_AHESP=m | 347 | CONFIG_IP6_NF_MATCH_AH=m |
349 | CONFIG_IP6_NF_MATCH_LENGTH=m | 348 | CONFIG_IP6_NF_MATCH_MH=m |
350 | CONFIG_IP6_NF_MATCH_EUI64=m | 349 | CONFIG_IP6_NF_MATCH_EUI64=m |
351 | CONFIG_IP6_NF_FILTER=m | 350 | CONFIG_IP6_NF_FILTER=m |
352 | CONFIG_IP6_NF_TARGET_LOG=m | 351 | CONFIG_IP6_NF_TARGET_LOG=m |
352 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
353 | CONFIG_IP6_NF_MANGLE=m | 353 | CONFIG_IP6_NF_MANGLE=m |
354 | CONFIG_IP6_NF_TARGET_MARK=m | 354 | CONFIG_IP6_NF_TARGET_HL=m |
355 | CONFIG_IP6_NF_RAW=m | 355 | CONFIG_IP6_NF_RAW=m |
356 | CONFIG_XFRM=y | 356 | CONFIG_IP_DCCP=m |
357 | CONFIG_XFRM_USER=m | 357 | CONFIG_INET_DCCP_DIAG=m |
358 | CONFIG_IP_DCCP_ACKVEC=y | ||
358 | 359 | ||
359 | # | 360 | # |
360 | # SCTP Configuration (EXPERIMENTAL) | 361 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
361 | # | 362 | # |
363 | CONFIG_IP_DCCP_CCID2=m | ||
364 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
365 | CONFIG_IP_DCCP_CCID3=m | ||
366 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
367 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
368 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
362 | CONFIG_IP_SCTP=m | 369 | CONFIG_IP_SCTP=m |
363 | # CONFIG_SCTP_DBG_MSG is not set | 370 | # CONFIG_SCTP_DBG_MSG is not set |
364 | # CONFIG_SCTP_DBG_OBJCNT is not set | 371 | # CONFIG_SCTP_DBG_OBJCNT is not set |
365 | # CONFIG_SCTP_HMAC_NONE is not set | 372 | # CONFIG_SCTP_HMAC_NONE is not set |
366 | # CONFIG_SCTP_HMAC_SHA1 is not set | 373 | # CONFIG_SCTP_HMAC_SHA1 is not set |
367 | CONFIG_SCTP_HMAC_MD5=y | 374 | CONFIG_SCTP_HMAC_MD5=y |
375 | # CONFIG_TIPC is not set | ||
368 | # CONFIG_ATM is not set | 376 | # CONFIG_ATM is not set |
369 | # CONFIG_BRIDGE is not set | 377 | # CONFIG_BRIDGE is not set |
370 | # CONFIG_VLAN_8021Q is not set | 378 | # CONFIG_VLAN_8021Q is not set |
@@ -376,13 +384,8 @@ CONFIG_ATALK=m | |||
376 | # CONFIG_DEV_APPLETALK is not set | 384 | # CONFIG_DEV_APPLETALK is not set |
377 | # CONFIG_X25 is not set | 385 | # CONFIG_X25 is not set |
378 | # CONFIG_LAPB is not set | 386 | # CONFIG_LAPB is not set |
379 | # CONFIG_NET_DIVERT is not set | ||
380 | # CONFIG_ECONET is not set | 387 | # CONFIG_ECONET is not set |
381 | # CONFIG_WAN_ROUTER is not set | 388 | # CONFIG_WAN_ROUTER is not set |
382 | |||
383 | # | ||
384 | # QoS and/or fair queueing | ||
385 | # | ||
386 | # CONFIG_NET_SCHED is not set | 389 | # CONFIG_NET_SCHED is not set |
387 | CONFIG_NET_CLS_ROUTE=y | 390 | CONFIG_NET_CLS_ROUTE=y |
388 | 391 | ||
@@ -390,76 +393,186 @@ CONFIG_NET_CLS_ROUTE=y | |||
390 | # Network testing | 393 | # Network testing |
391 | # | 394 | # |
392 | # CONFIG_NET_PKTGEN is not set | 395 | # CONFIG_NET_PKTGEN is not set |
393 | CONFIG_NETPOLL=y | ||
394 | # CONFIG_NETPOLL_RX is not set | ||
395 | # CONFIG_NETPOLL_TRAP is not set | ||
396 | CONFIG_NET_POLL_CONTROLLER=y | ||
397 | # CONFIG_HAMRADIO is not set | 396 | # CONFIG_HAMRADIO is not set |
397 | # CONFIG_CAN is not set | ||
398 | # CONFIG_IRDA is not set | 398 | # CONFIG_IRDA is not set |
399 | # CONFIG_BT is not set | 399 | # CONFIG_BT is not set |
400 | CONFIG_NETDEVICES=y | 400 | # CONFIG_AF_RXRPC is not set |
401 | CONFIG_DUMMY=m | ||
402 | # CONFIG_BONDING is not set | ||
403 | CONFIG_EQUALIZER=m | ||
404 | # CONFIG_TUN is not set | ||
405 | 401 | ||
406 | # | 402 | # |
407 | # Ethernet (10 or 100Mbit) | 403 | # Wireless |
408 | # | 404 | # |
409 | CONFIG_NET_ETHERNET=y | 405 | # CONFIG_CFG80211 is not set |
410 | CONFIG_MII=m | 406 | CONFIG_WIRELESS_EXT=y |
411 | CONFIG_BVME6000_NET=y | 407 | # CONFIG_MAC80211 is not set |
408 | CONFIG_IEEE80211=m | ||
409 | # CONFIG_IEEE80211_DEBUG is not set | ||
410 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
411 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
412 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
413 | CONFIG_IEEE80211_SOFTMAC=m | ||
414 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
415 | # CONFIG_RFKILL is not set | ||
416 | # CONFIG_NET_9P is not set | ||
412 | 417 | ||
413 | # | 418 | # |
414 | # Ethernet (1000 Mbit) | 419 | # Device Drivers |
415 | # | 420 | # |
416 | 421 | ||
417 | # | 422 | # |
418 | # Ethernet (10000 Mbit) | 423 | # Generic Driver Options |
419 | # | 424 | # |
425 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
426 | CONFIG_STANDALONE=y | ||
427 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
428 | CONFIG_FW_LOADER=m | ||
429 | # CONFIG_SYS_HYPERVISOR is not set | ||
430 | CONFIG_CONNECTOR=m | ||
431 | # CONFIG_MTD is not set | ||
432 | # CONFIG_PARPORT is not set | ||
433 | CONFIG_BLK_DEV=y | ||
434 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
435 | CONFIG_BLK_DEV_LOOP=y | ||
436 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
437 | CONFIG_BLK_DEV_NBD=m | ||
438 | CONFIG_BLK_DEV_RAM=y | ||
439 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
440 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
441 | # CONFIG_BLK_DEV_XIP is not set | ||
442 | CONFIG_CDROM_PKTCDVD=m | ||
443 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
444 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
445 | CONFIG_ATA_OVER_ETH=m | ||
446 | CONFIG_MISC_DEVICES=y | ||
447 | # CONFIG_EEPROM_93CX6 is not set | ||
448 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
449 | CONFIG_HAVE_IDE=y | ||
450 | # CONFIG_IDE is not set | ||
420 | 451 | ||
421 | # | 452 | # |
422 | # Token Ring devices | 453 | # SCSI device support |
423 | # | 454 | # |
455 | CONFIG_RAID_ATTRS=m | ||
456 | CONFIG_SCSI=y | ||
457 | CONFIG_SCSI_DMA=y | ||
458 | CONFIG_SCSI_TGT=m | ||
459 | # CONFIG_SCSI_NETLINK is not set | ||
460 | CONFIG_SCSI_PROC_FS=y | ||
424 | 461 | ||
425 | # | 462 | # |
426 | # Wireless LAN (non-hamradio) | 463 | # SCSI support type (disk, tape, CD-ROM) |
427 | # | 464 | # |
428 | # CONFIG_NET_RADIO is not set | 465 | CONFIG_BLK_DEV_SD=y |
466 | CONFIG_CHR_DEV_ST=m | ||
467 | CONFIG_CHR_DEV_OSST=m | ||
468 | CONFIG_BLK_DEV_SR=y | ||
469 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
470 | CONFIG_CHR_DEV_SG=m | ||
471 | # CONFIG_CHR_DEV_SCH is not set | ||
472 | |||
473 | # | ||
474 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
475 | # | ||
476 | # CONFIG_SCSI_MULTI_LUN is not set | ||
477 | CONFIG_SCSI_CONSTANTS=y | ||
478 | # CONFIG_SCSI_LOGGING is not set | ||
479 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
480 | CONFIG_SCSI_WAIT_SCAN=m | ||
481 | |||
482 | # | ||
483 | # SCSI Transports | ||
484 | # | ||
485 | CONFIG_SCSI_SPI_ATTRS=y | ||
486 | # CONFIG_SCSI_FC_ATTRS is not set | ||
487 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
488 | CONFIG_SCSI_SAS_ATTRS=m | ||
489 | CONFIG_SCSI_SAS_LIBSAS=m | ||
490 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
491 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
492 | CONFIG_SCSI_SRP_ATTRS=m | ||
493 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
494 | CONFIG_SCSI_LOWLEVEL=y | ||
495 | CONFIG_ISCSI_TCP=m | ||
496 | CONFIG_53C700_BE_BUS=y | ||
497 | # CONFIG_SCSI_DEBUG is not set | ||
498 | CONFIG_BVME6000_SCSI=y | ||
499 | CONFIG_MD=y | ||
500 | CONFIG_BLK_DEV_MD=m | ||
501 | CONFIG_MD_LINEAR=m | ||
502 | CONFIG_MD_RAID0=m | ||
503 | CONFIG_MD_RAID1=m | ||
504 | # CONFIG_MD_RAID10 is not set | ||
505 | CONFIG_MD_RAID456=m | ||
506 | CONFIG_MD_RAID5_RESHAPE=y | ||
507 | CONFIG_MD_MULTIPATH=m | ||
508 | # CONFIG_MD_FAULTY is not set | ||
509 | CONFIG_BLK_DEV_DM=m | ||
510 | # CONFIG_DM_DEBUG is not set | ||
511 | CONFIG_DM_CRYPT=m | ||
512 | CONFIG_DM_SNAPSHOT=m | ||
513 | CONFIG_DM_MIRROR=m | ||
514 | CONFIG_DM_ZERO=m | ||
515 | CONFIG_DM_MULTIPATH=m | ||
516 | CONFIG_DM_MULTIPATH_EMC=m | ||
517 | CONFIG_DM_MULTIPATH_RDAC=m | ||
518 | CONFIG_DM_MULTIPATH_HP=m | ||
519 | # CONFIG_DM_DELAY is not set | ||
520 | CONFIG_DM_UEVENT=y | ||
521 | CONFIG_NETDEVICES=y | ||
522 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
523 | CONFIG_DUMMY=m | ||
524 | # CONFIG_BONDING is not set | ||
525 | CONFIG_MACVLAN=m | ||
526 | CONFIG_EQUALIZER=m | ||
527 | # CONFIG_TUN is not set | ||
528 | CONFIG_VETH=m | ||
529 | # CONFIG_PHYLIB is not set | ||
530 | CONFIG_NET_ETHERNET=y | ||
531 | # CONFIG_MII is not set | ||
532 | CONFIG_BVME6000_NET=y | ||
533 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
534 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
536 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
537 | # CONFIG_B44 is not set | ||
538 | # CONFIG_NETDEV_1000 is not set | ||
539 | # CONFIG_NETDEV_10000 is not set | ||
429 | 540 | ||
430 | # | 541 | # |
431 | # Wan interfaces | 542 | # Wireless LAN |
432 | # | 543 | # |
544 | # CONFIG_WLAN_PRE80211 is not set | ||
545 | # CONFIG_WLAN_80211 is not set | ||
433 | # CONFIG_WAN is not set | 546 | # CONFIG_WAN is not set |
434 | CONFIG_PPP=m | 547 | CONFIG_PPP=m |
435 | # CONFIG_PPP_MULTILINK is not set | 548 | # CONFIG_PPP_MULTILINK is not set |
436 | # CONFIG_PPP_FILTER is not set | 549 | CONFIG_PPP_FILTER=y |
437 | CONFIG_PPP_ASYNC=m | 550 | CONFIG_PPP_ASYNC=m |
438 | CONFIG_PPP_SYNC_TTY=m | 551 | CONFIG_PPP_SYNC_TTY=m |
439 | CONFIG_PPP_DEFLATE=m | 552 | CONFIG_PPP_DEFLATE=m |
440 | CONFIG_PPP_BSDCOMP=m | 553 | CONFIG_PPP_BSDCOMP=m |
554 | CONFIG_PPP_MPPE=m | ||
441 | CONFIG_PPPOE=m | 555 | CONFIG_PPPOE=m |
556 | CONFIG_PPPOL2TP=m | ||
442 | CONFIG_SLIP=m | 557 | CONFIG_SLIP=m |
443 | CONFIG_SLIP_COMPRESSED=y | 558 | CONFIG_SLIP_COMPRESSED=y |
559 | CONFIG_SLHC=m | ||
444 | CONFIG_SLIP_SMART=y | 560 | CONFIG_SLIP_SMART=y |
445 | CONFIG_SLIP_MODE_SLIP6=y | 561 | CONFIG_SLIP_MODE_SLIP6=y |
446 | CONFIG_SHAPER=m | ||
447 | CONFIG_NETCONSOLE=m | 562 | CONFIG_NETCONSOLE=m |
448 | 563 | CONFIG_NETCONSOLE_DYNAMIC=y | |
449 | # | 564 | CONFIG_NETPOLL=y |
450 | # ISDN subsystem | 565 | # CONFIG_NETPOLL_TRAP is not set |
451 | # | 566 | CONFIG_NET_POLL_CONTROLLER=y |
452 | # CONFIG_ISDN is not set | 567 | # CONFIG_ISDN is not set |
453 | |||
454 | # | ||
455 | # Telephony Support | ||
456 | # | ||
457 | # CONFIG_PHONE is not set | 568 | # CONFIG_PHONE is not set |
458 | 569 | ||
459 | # | 570 | # |
460 | # Input device support | 571 | # Input device support |
461 | # | 572 | # |
462 | CONFIG_INPUT=y | 573 | CONFIG_INPUT=y |
574 | CONFIG_INPUT_FF_MEMLESS=m | ||
575 | # CONFIG_INPUT_POLLDEV is not set | ||
463 | 576 | ||
464 | # | 577 | # |
465 | # Userland interfaces | 578 | # Userland interfaces |
@@ -469,7 +582,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
469 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 582 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
470 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 583 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
471 | # CONFIG_INPUT_JOYDEV is not set | 584 | # CONFIG_INPUT_JOYDEV is not set |
472 | # CONFIG_INPUT_TSDEV is not set | ||
473 | # CONFIG_INPUT_EVDEV is not set | 585 | # CONFIG_INPUT_EVDEV is not set |
474 | # CONFIG_INPUT_EVBUG is not set | 586 | # CONFIG_INPUT_EVBUG is not set |
475 | 587 | ||
@@ -482,11 +594,19 @@ CONFIG_INPUT_KEYBOARD=y | |||
482 | # CONFIG_KEYBOARD_LKKBD is not set | 594 | # CONFIG_KEYBOARD_LKKBD is not set |
483 | # CONFIG_KEYBOARD_XTKBD is not set | 595 | # CONFIG_KEYBOARD_XTKBD is not set |
484 | # CONFIG_KEYBOARD_NEWTON is not set | 596 | # CONFIG_KEYBOARD_NEWTON is not set |
597 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
485 | CONFIG_INPUT_MOUSE=y | 598 | CONFIG_INPUT_MOUSE=y |
486 | CONFIG_MOUSE_PS2=m | 599 | CONFIG_MOUSE_PS2=m |
600 | CONFIG_MOUSE_PS2_ALPS=y | ||
601 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
602 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
603 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
604 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
605 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
487 | CONFIG_MOUSE_SERIAL=m | 606 | CONFIG_MOUSE_SERIAL=m |
488 | # CONFIG_MOUSE_VSXXXAA is not set | 607 | # CONFIG_MOUSE_VSXXXAA is not set |
489 | # CONFIG_INPUT_JOYSTICK is not set | 608 | # CONFIG_INPUT_JOYSTICK is not set |
609 | # CONFIG_INPUT_TABLET is not set | ||
490 | # CONFIG_INPUT_TOUCHSCREEN is not set | 610 | # CONFIG_INPUT_TOUCHSCREEN is not set |
491 | # CONFIG_INPUT_MISC is not set | 611 | # CONFIG_INPUT_MISC is not set |
492 | 612 | ||
@@ -494,7 +614,7 @@ CONFIG_MOUSE_SERIAL=m | |||
494 | # Hardware I/O ports | 614 | # Hardware I/O ports |
495 | # | 615 | # |
496 | CONFIG_SERIO=m | 616 | CONFIG_SERIO=m |
497 | CONFIG_SERIO_SERPORT=m | 617 | # CONFIG_SERIO_SERPORT is not set |
498 | CONFIG_SERIO_LIBPS2=m | 618 | CONFIG_SERIO_LIBPS2=m |
499 | # CONFIG_SERIO_RAW is not set | 619 | # CONFIG_SERIO_RAW is not set |
500 | # CONFIG_GAMEPORT is not set | 620 | # CONFIG_GAMEPORT is not set |
@@ -505,6 +625,7 @@ CONFIG_SERIO_LIBPS2=m | |||
505 | CONFIG_VT=y | 625 | CONFIG_VT=y |
506 | CONFIG_VT_CONSOLE=y | 626 | CONFIG_VT_CONSOLE=y |
507 | CONFIG_HW_CONSOLE=y | 627 | CONFIG_HW_CONSOLE=y |
628 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
508 | # CONFIG_SERIAL_NONSTANDARD is not set | 629 | # CONFIG_SERIAL_NONSTANDARD is not set |
509 | 630 | ||
510 | # | 631 | # |
@@ -518,59 +639,56 @@ CONFIG_HW_CONSOLE=y | |||
518 | CONFIG_UNIX98_PTYS=y | 639 | CONFIG_UNIX98_PTYS=y |
519 | CONFIG_LEGACY_PTYS=y | 640 | CONFIG_LEGACY_PTYS=y |
520 | CONFIG_LEGACY_PTY_COUNT=256 | 641 | CONFIG_LEGACY_PTY_COUNT=256 |
521 | |||
522 | # | ||
523 | # IPMI | ||
524 | # | ||
525 | # CONFIG_IPMI_HANDLER is not set | 642 | # CONFIG_IPMI_HANDLER is not set |
526 | 643 | # CONFIG_HW_RANDOM is not set | |
527 | # | ||
528 | # Watchdog Cards | ||
529 | # | ||
530 | # CONFIG_WATCHDOG is not set | ||
531 | CONFIG_GEN_RTC=m | 644 | CONFIG_GEN_RTC=m |
532 | CONFIG_GEN_RTC_X=y | 645 | CONFIG_GEN_RTC_X=y |
533 | # CONFIG_DTLK is not set | ||
534 | # CONFIG_R3964 is not set | 646 | # CONFIG_R3964 is not set |
535 | |||
536 | # | ||
537 | # Ftape, the floppy tape device driver | ||
538 | # | ||
539 | # CONFIG_DRM is not set | ||
540 | # CONFIG_RAW_DRIVER is not set | 647 | # CONFIG_RAW_DRIVER is not set |
648 | # CONFIG_TCG_TPM is not set | ||
649 | # CONFIG_I2C is not set | ||
541 | 650 | ||
542 | # | 651 | # |
543 | # TPM devices | 652 | # SPI support |
544 | # | ||
545 | |||
546 | # | ||
547 | # I2C support | ||
548 | # | 653 | # |
549 | # CONFIG_I2C is not set | 654 | # CONFIG_SPI is not set |
655 | # CONFIG_SPI_MASTER is not set | ||
656 | # CONFIG_W1 is not set | ||
657 | # CONFIG_POWER_SUPPLY is not set | ||
658 | # CONFIG_HWMON is not set | ||
659 | # CONFIG_THERMAL is not set | ||
660 | # CONFIG_WATCHDOG is not set | ||
550 | 661 | ||
551 | # | 662 | # |
552 | # Dallas's 1-wire bus | 663 | # Sonics Silicon Backplane |
553 | # | 664 | # |
554 | # CONFIG_W1 is not set | 665 | CONFIG_SSB_POSSIBLE=y |
666 | # CONFIG_SSB is not set | ||
555 | 667 | ||
556 | # | 668 | # |
557 | # Misc devices | 669 | # Multifunction device drivers |
558 | # | 670 | # |
671 | # CONFIG_MFD_SM501 is not set | ||
559 | 672 | ||
560 | # | 673 | # |
561 | # Multimedia devices | 674 | # Multimedia devices |
562 | # | 675 | # |
563 | # CONFIG_VIDEO_DEV is not set | 676 | # CONFIG_VIDEO_DEV is not set |
677 | # CONFIG_DVB_CORE is not set | ||
678 | # CONFIG_DAB is not set | ||
564 | 679 | ||
565 | # | 680 | # |
566 | # Digital Video Broadcasting Devices | 681 | # Graphics support |
567 | # | 682 | # |
568 | # CONFIG_DVB is not set | 683 | # CONFIG_VGASTATE is not set |
684 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
685 | # CONFIG_FB is not set | ||
686 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
569 | 687 | ||
570 | # | 688 | # |
571 | # Graphics support | 689 | # Display device support |
572 | # | 690 | # |
573 | # CONFIG_FB is not set | 691 | # CONFIG_DISPLAY_SUPPORT is not set |
574 | 692 | ||
575 | # | 693 | # |
576 | # Console display driver support | 694 | # Console display driver support |
@@ -581,27 +699,20 @@ CONFIG_DUMMY_CONSOLE=y | |||
581 | # Sound | 699 | # Sound |
582 | # | 700 | # |
583 | # CONFIG_SOUND is not set | 701 | # CONFIG_SOUND is not set |
584 | 702 | CONFIG_HID_SUPPORT=y | |
585 | # | 703 | CONFIG_HID=m |
586 | # USB support | 704 | # CONFIG_HID_DEBUG is not set |
587 | # | 705 | CONFIG_HIDRAW=y |
588 | # CONFIG_USB_ARCH_HAS_HCD is not set | 706 | # CONFIG_USB_SUPPORT is not set |
589 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
590 | |||
591 | # | ||
592 | # USB Gadget Support | ||
593 | # | ||
594 | # CONFIG_USB_GADGET is not set | ||
595 | |||
596 | # | ||
597 | # MMC/SD Card support | ||
598 | # | ||
599 | # CONFIG_MMC is not set | 707 | # CONFIG_MMC is not set |
708 | # CONFIG_MEMSTICK is not set | ||
709 | # CONFIG_NEW_LEDS is not set | ||
710 | # CONFIG_RTC_CLASS is not set | ||
600 | 711 | ||
601 | # | 712 | # |
602 | # InfiniBand support | 713 | # Userspace I/O |
603 | # | 714 | # |
604 | # CONFIG_INFINIBAND is not set | 715 | # CONFIG_UIO is not set |
605 | 716 | ||
606 | # | 717 | # |
607 | # Character devices | 718 | # Character devices |
@@ -614,10 +725,11 @@ CONFIG_SERIAL_CONSOLE=y | |||
614 | # | 725 | # |
615 | CONFIG_EXT2_FS=y | 726 | CONFIG_EXT2_FS=y |
616 | # CONFIG_EXT2_FS_XATTR is not set | 727 | # CONFIG_EXT2_FS_XATTR is not set |
728 | # CONFIG_EXT2_FS_XIP is not set | ||
617 | CONFIG_EXT3_FS=y | 729 | CONFIG_EXT3_FS=y |
618 | # CONFIG_EXT3_FS_XATTR is not set | 730 | # CONFIG_EXT3_FS_XATTR is not set |
731 | # CONFIG_EXT4DEV_FS is not set | ||
619 | CONFIG_JBD=y | 732 | CONFIG_JBD=y |
620 | # CONFIG_JBD_DEBUG is not set | ||
621 | CONFIG_REISERFS_FS=m | 733 | CONFIG_REISERFS_FS=m |
622 | # CONFIG_REISERFS_CHECK is not set | 734 | # CONFIG_REISERFS_CHECK is not set |
623 | # CONFIG_REISERFS_PROC_INFO is not set | 735 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -628,25 +740,29 @@ CONFIG_JFS_FS=m | |||
628 | # CONFIG_JFS_DEBUG is not set | 740 | # CONFIG_JFS_DEBUG is not set |
629 | # CONFIG_JFS_STATISTICS is not set | 741 | # CONFIG_JFS_STATISTICS is not set |
630 | CONFIG_FS_POSIX_ACL=y | 742 | CONFIG_FS_POSIX_ACL=y |
631 | |||
632 | # | ||
633 | # XFS support | ||
634 | # | ||
635 | CONFIG_XFS_FS=m | 743 | CONFIG_XFS_FS=m |
636 | CONFIG_XFS_EXPORT=y | ||
637 | # CONFIG_XFS_RT is not set | ||
638 | # CONFIG_XFS_QUOTA is not set | 744 | # CONFIG_XFS_QUOTA is not set |
639 | # CONFIG_XFS_SECURITY is not set | 745 | # CONFIG_XFS_SECURITY is not set |
640 | # CONFIG_XFS_POSIX_ACL is not set | 746 | # CONFIG_XFS_POSIX_ACL is not set |
641 | CONFIG_MINIX_FS=y | 747 | # CONFIG_XFS_RT is not set |
642 | # CONFIG_ROMFS_FS is not set | 748 | CONFIG_GFS2_FS=m |
749 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
750 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
751 | CONFIG_OCFS2_FS=m | ||
752 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
753 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
754 | CONFIG_DNOTIFY=y | ||
755 | CONFIG_INOTIFY=y | ||
756 | CONFIG_INOTIFY_USER=y | ||
643 | CONFIG_QUOTA=y | 757 | CONFIG_QUOTA=y |
758 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
759 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
644 | # CONFIG_QFMT_V1 is not set | 760 | # CONFIG_QFMT_V1 is not set |
645 | # CONFIG_QFMT_V2 is not set | 761 | # CONFIG_QFMT_V2 is not set |
646 | CONFIG_QUOTACTL=y | 762 | CONFIG_QUOTACTL=y |
647 | CONFIG_DNOTIFY=y | ||
648 | CONFIG_AUTOFS_FS=m | 763 | CONFIG_AUTOFS_FS=m |
649 | CONFIG_AUTOFS4_FS=m | 764 | CONFIG_AUTOFS4_FS=m |
765 | CONFIG_FUSE_FS=m | ||
650 | 766 | ||
651 | # | 767 | # |
652 | # CD-ROM/DVD Filesystems | 768 | # CD-ROM/DVD Filesystems |
@@ -654,7 +770,6 @@ CONFIG_AUTOFS4_FS=m | |||
654 | CONFIG_ISO9660_FS=y | 770 | CONFIG_ISO9660_FS=y |
655 | CONFIG_JOLIET=y | 771 | CONFIG_JOLIET=y |
656 | CONFIG_ZISOFS=y | 772 | CONFIG_ZISOFS=y |
657 | CONFIG_ZISOFS_FS=y | ||
658 | CONFIG_UDF_FS=m | 773 | CONFIG_UDF_FS=m |
659 | CONFIG_UDF_NLS=y | 774 | CONFIG_UDF_NLS=y |
660 | 775 | ||
@@ -673,13 +788,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
673 | # | 788 | # |
674 | CONFIG_PROC_FS=y | 789 | CONFIG_PROC_FS=y |
675 | CONFIG_PROC_KCORE=y | 790 | CONFIG_PROC_KCORE=y |
791 | CONFIG_PROC_SYSCTL=y | ||
676 | CONFIG_SYSFS=y | 792 | CONFIG_SYSFS=y |
677 | # CONFIG_DEVFS_FS is not set | ||
678 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
679 | CONFIG_TMPFS=y | 793 | CONFIG_TMPFS=y |
680 | # CONFIG_TMPFS_XATTR is not set | 794 | # CONFIG_TMPFS_POSIX_ACL is not set |
681 | # CONFIG_HUGETLB_PAGE is not set | 795 | # CONFIG_HUGETLB_PAGE is not set |
682 | CONFIG_RAMFS=y | 796 | CONFIG_CONFIGFS_FS=m |
683 | 797 | ||
684 | # | 798 | # |
685 | # Miscellaneous filesystems | 799 | # Miscellaneous filesystems |
@@ -693,44 +807,40 @@ CONFIG_HFSPLUS_FS=m | |||
693 | # CONFIG_EFS_FS is not set | 807 | # CONFIG_EFS_FS is not set |
694 | CONFIG_CRAMFS=m | 808 | CONFIG_CRAMFS=m |
695 | # CONFIG_VXFS_FS is not set | 809 | # CONFIG_VXFS_FS is not set |
810 | CONFIG_MINIX_FS=y | ||
696 | CONFIG_HPFS_FS=m | 811 | CONFIG_HPFS_FS=m |
697 | # CONFIG_QNX4FS_FS is not set | 812 | # CONFIG_QNX4FS_FS is not set |
813 | # CONFIG_ROMFS_FS is not set | ||
698 | CONFIG_SYSV_FS=m | 814 | CONFIG_SYSV_FS=m |
699 | CONFIG_UFS_FS=m | 815 | CONFIG_UFS_FS=m |
700 | # CONFIG_UFS_FS_WRITE is not set | 816 | # CONFIG_UFS_FS_WRITE is not set |
701 | 817 | # CONFIG_UFS_DEBUG is not set | |
702 | # | 818 | CONFIG_NETWORK_FILESYSTEMS=y |
703 | # Network File Systems | ||
704 | # | ||
705 | CONFIG_NFS_FS=y | 819 | CONFIG_NFS_FS=y |
706 | CONFIG_NFS_V3=y | 820 | CONFIG_NFS_V3=y |
821 | # CONFIG_NFS_V3_ACL is not set | ||
707 | CONFIG_NFS_V4=y | 822 | CONFIG_NFS_V4=y |
708 | # CONFIG_NFS_DIRECTIO is not set | 823 | # CONFIG_NFS_DIRECTIO is not set |
709 | CONFIG_NFSD=m | 824 | CONFIG_NFSD=m |
710 | CONFIG_NFSD_V3=y | 825 | CONFIG_NFSD_V3=y |
711 | CONFIG_NFSD_V4=y | 826 | # CONFIG_NFSD_V3_ACL is not set |
827 | # CONFIG_NFSD_V4 is not set | ||
712 | CONFIG_NFSD_TCP=y | 828 | CONFIG_NFSD_TCP=y |
713 | CONFIG_ROOT_NFS=y | 829 | CONFIG_ROOT_NFS=y |
714 | CONFIG_LOCKD=y | 830 | CONFIG_LOCKD=y |
715 | CONFIG_LOCKD_V4=y | 831 | CONFIG_LOCKD_V4=y |
716 | CONFIG_EXPORTFS=m | 832 | CONFIG_EXPORTFS=m |
833 | CONFIG_NFS_COMMON=y | ||
717 | CONFIG_SUNRPC=y | 834 | CONFIG_SUNRPC=y |
718 | CONFIG_SUNRPC_GSS=y | 835 | CONFIG_SUNRPC_GSS=y |
836 | CONFIG_SUNRPC_BIND34=y | ||
719 | CONFIG_RPCSEC_GSS_KRB5=y | 837 | CONFIG_RPCSEC_GSS_KRB5=y |
720 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 838 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
721 | CONFIG_SMB_FS=m | 839 | CONFIG_SMB_FS=m |
722 | CONFIG_SMB_NLS_DEFAULT=y | 840 | CONFIG_SMB_NLS_DEFAULT=y |
723 | CONFIG_SMB_NLS_REMOTE="cp437" | 841 | CONFIG_SMB_NLS_REMOTE="cp437" |
724 | # CONFIG_CIFS is not set | 842 | # CONFIG_CIFS is not set |
725 | CONFIG_NCP_FS=m | 843 | # CONFIG_NCP_FS is not set |
726 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
727 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
728 | # CONFIG_NCPFS_STRONG is not set | ||
729 | CONFIG_NCPFS_NFS_NS=y | ||
730 | CONFIG_NCPFS_OS2_NS=y | ||
731 | # CONFIG_NCPFS_SMALLDOS is not set | ||
732 | CONFIG_NCPFS_NLS=y | ||
733 | # CONFIG_NCPFS_EXTRAS is not set | ||
734 | CONFIG_CODA_FS=m | 844 | CONFIG_CODA_FS=m |
735 | # CONFIG_CODA_FS_OLD_API is not set | 845 | # CONFIG_CODA_FS_OLD_API is not set |
736 | # CONFIG_AFS_FS is not set | 846 | # CONFIG_AFS_FS is not set |
@@ -740,10 +850,7 @@ CONFIG_CODA_FS=m | |||
740 | # | 850 | # |
741 | # CONFIG_PARTITION_ADVANCED is not set | 851 | # CONFIG_PARTITION_ADVANCED is not set |
742 | CONFIG_MSDOS_PARTITION=y | 852 | CONFIG_MSDOS_PARTITION=y |
743 | 853 | CONFIG_SYSV68_PARTITION=y | |
744 | # | ||
745 | # Native Language Support | ||
746 | # | ||
747 | CONFIG_NLS=y | 854 | CONFIG_NLS=y |
748 | CONFIG_NLS_DEFAULT="iso8859-1" | 855 | CONFIG_NLS_DEFAULT="iso8859-1" |
749 | CONFIG_NLS_CODEPAGE_437=y | 856 | CONFIG_NLS_CODEPAGE_437=y |
@@ -784,35 +891,42 @@ CONFIG_NLS_ISO8859_15=m | |||
784 | CONFIG_NLS_KOI8_R=m | 891 | CONFIG_NLS_KOI8_R=m |
785 | CONFIG_NLS_KOI8_U=m | 892 | CONFIG_NLS_KOI8_U=m |
786 | CONFIG_NLS_UTF8=m | 893 | CONFIG_NLS_UTF8=m |
894 | CONFIG_DLM=m | ||
895 | # CONFIG_DLM_DEBUG is not set | ||
787 | 896 | ||
788 | # | 897 | # |
789 | # Kernel hacking | 898 | # Kernel hacking |
790 | # | 899 | # |
791 | # CONFIG_PRINTK_TIME is not set | 900 | # CONFIG_PRINTK_TIME is not set |
792 | CONFIG_DEBUG_KERNEL=y | 901 | CONFIG_ENABLE_WARN_DEPRECATED=y |
902 | CONFIG_ENABLE_MUST_CHECK=y | ||
793 | CONFIG_MAGIC_SYSRQ=y | 903 | CONFIG_MAGIC_SYSRQ=y |
794 | CONFIG_LOG_BUF_SHIFT=16 | 904 | # CONFIG_UNUSED_SYMBOLS is not set |
795 | # CONFIG_SCHEDSTATS is not set | ||
796 | # CONFIG_DEBUG_SLAB is not set | ||
797 | # CONFIG_DEBUG_SPINLOCK is not set | ||
798 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
799 | # CONFIG_DEBUG_KOBJECT is not set | ||
800 | CONFIG_DEBUG_BUGVERBOSE=y | ||
801 | # CONFIG_DEBUG_INFO is not set | ||
802 | # CONFIG_DEBUG_FS is not set | 905 | # CONFIG_DEBUG_FS is not set |
803 | # CONFIG_FRAME_POINTER is not set | 906 | # CONFIG_HEADERS_CHECK is not set |
907 | # CONFIG_DEBUG_KERNEL is not set | ||
908 | CONFIG_DEBUG_BUGVERBOSE=y | ||
909 | # CONFIG_SAMPLES is not set | ||
804 | 910 | ||
805 | # | 911 | # |
806 | # Security options | 912 | # Security options |
807 | # | 913 | # |
808 | # CONFIG_KEYS is not set | 914 | # CONFIG_KEYS is not set |
809 | # CONFIG_SECURITY is not set | 915 | # CONFIG_SECURITY is not set |
810 | 916 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
811 | # | 917 | CONFIG_XOR_BLOCKS=m |
812 | # Cryptographic options | 918 | CONFIG_ASYNC_CORE=m |
813 | # | 919 | CONFIG_ASYNC_MEMCPY=m |
920 | CONFIG_ASYNC_XOR=m | ||
814 | CONFIG_CRYPTO=y | 921 | CONFIG_CRYPTO=y |
922 | CONFIG_CRYPTO_ALGAPI=y | ||
923 | CONFIG_CRYPTO_AEAD=m | ||
924 | CONFIG_CRYPTO_BLKCIPHER=y | ||
925 | CONFIG_CRYPTO_SEQIV=m | ||
926 | CONFIG_CRYPTO_HASH=y | ||
927 | CONFIG_CRYPTO_MANAGER=y | ||
815 | CONFIG_CRYPTO_HMAC=y | 928 | CONFIG_CRYPTO_HMAC=y |
929 | CONFIG_CRYPTO_XCBC=m | ||
816 | CONFIG_CRYPTO_NULL=m | 930 | CONFIG_CRYPTO_NULL=m |
817 | CONFIG_CRYPTO_MD4=m | 931 | CONFIG_CRYPTO_MD4=m |
818 | CONFIG_CRYPTO_MD5=y | 932 | CONFIG_CRYPTO_MD5=y |
@@ -821,9 +935,21 @@ CONFIG_CRYPTO_SHA256=m | |||
821 | CONFIG_CRYPTO_SHA512=m | 935 | CONFIG_CRYPTO_SHA512=m |
822 | CONFIG_CRYPTO_WP512=m | 936 | CONFIG_CRYPTO_WP512=m |
823 | CONFIG_CRYPTO_TGR192=m | 937 | CONFIG_CRYPTO_TGR192=m |
938 | CONFIG_CRYPTO_GF128MUL=m | ||
939 | CONFIG_CRYPTO_ECB=m | ||
940 | CONFIG_CRYPTO_CBC=y | ||
941 | CONFIG_CRYPTO_PCBC=m | ||
942 | CONFIG_CRYPTO_LRW=m | ||
943 | CONFIG_CRYPTO_XTS=m | ||
944 | CONFIG_CRYPTO_CTR=m | ||
945 | CONFIG_CRYPTO_GCM=m | ||
946 | CONFIG_CRYPTO_CCM=m | ||
947 | CONFIG_CRYPTO_CRYPTD=m | ||
824 | CONFIG_CRYPTO_DES=y | 948 | CONFIG_CRYPTO_DES=y |
949 | CONFIG_CRYPTO_FCRYPT=m | ||
825 | CONFIG_CRYPTO_BLOWFISH=m | 950 | CONFIG_CRYPTO_BLOWFISH=m |
826 | CONFIG_CRYPTO_TWOFISH=m | 951 | CONFIG_CRYPTO_TWOFISH=m |
952 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
827 | CONFIG_CRYPTO_SERPENT=m | 953 | CONFIG_CRYPTO_SERPENT=m |
828 | CONFIG_CRYPTO_AES=m | 954 | CONFIG_CRYPTO_AES=m |
829 | CONFIG_CRYPTO_CAST5=m | 955 | CONFIG_CRYPTO_CAST5=m |
@@ -832,20 +958,35 @@ CONFIG_CRYPTO_TEA=m | |||
832 | CONFIG_CRYPTO_ARC4=m | 958 | CONFIG_CRYPTO_ARC4=m |
833 | CONFIG_CRYPTO_KHAZAD=m | 959 | CONFIG_CRYPTO_KHAZAD=m |
834 | CONFIG_CRYPTO_ANUBIS=m | 960 | CONFIG_CRYPTO_ANUBIS=m |
961 | CONFIG_CRYPTO_SEED=m | ||
962 | CONFIG_CRYPTO_SALSA20=m | ||
835 | CONFIG_CRYPTO_DEFLATE=m | 963 | CONFIG_CRYPTO_DEFLATE=m |
836 | CONFIG_CRYPTO_MICHAEL_MIC=m | 964 | CONFIG_CRYPTO_MICHAEL_MIC=m |
837 | CONFIG_CRYPTO_CRC32C=m | 965 | CONFIG_CRYPTO_CRC32C=m |
966 | CONFIG_CRYPTO_CAMELLIA=m | ||
838 | CONFIG_CRYPTO_TEST=m | 967 | CONFIG_CRYPTO_TEST=m |
839 | 968 | CONFIG_CRYPTO_AUTHENC=m | |
840 | # | 969 | CONFIG_CRYPTO_LZO=m |
841 | # Hardware crypto devices | 970 | # CONFIG_CRYPTO_HW is not set |
842 | # | ||
843 | 971 | ||
844 | # | 972 | # |
845 | # Library routines | 973 | # Library routines |
846 | # | 974 | # |
975 | CONFIG_BITREVERSE=m | ||
847 | CONFIG_CRC_CCITT=m | 976 | CONFIG_CRC_CCITT=m |
977 | CONFIG_CRC16=m | ||
978 | # CONFIG_CRC_ITU_T is not set | ||
848 | CONFIG_CRC32=m | 979 | CONFIG_CRC32=m |
980 | # CONFIG_CRC7 is not set | ||
849 | CONFIG_LIBCRC32C=m | 981 | CONFIG_LIBCRC32C=m |
850 | CONFIG_ZLIB_INFLATE=y | 982 | CONFIG_ZLIB_INFLATE=y |
851 | CONFIG_ZLIB_DEFLATE=m | 983 | CONFIG_ZLIB_DEFLATE=m |
984 | CONFIG_LZO_COMPRESS=m | ||
985 | CONFIG_LZO_DECOMPRESS=m | ||
986 | CONFIG_TEXTSEARCH=y | ||
987 | CONFIG_TEXTSEARCH_KMP=m | ||
988 | CONFIG_TEXTSEARCH_BM=m | ||
989 | CONFIG_TEXTSEARCH_FSM=m | ||
990 | CONFIG_PLIST=y | ||
991 | CONFIG_HAS_IOMEM=y | ||
992 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 51251883adf8..38b68c70e567 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:41 2005 | 4 | # Wed Apr 2 20:46:12 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-hp300" | 27 | CONFIG_LOCALVERSION="-hp300" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -81,10 +129,24 @@ CONFIG_M68030=y | |||
81 | CONFIG_M68040=y | 129 | CONFIG_M68040=y |
82 | CONFIG_M68060=y | 130 | CONFIG_M68060=y |
83 | CONFIG_MMU_MOTOROLA=y | 131 | CONFIG_MMU_MOTOROLA=y |
84 | CONFIG_M68KFPU_EMU=y | 132 | # CONFIG_M68KFPU_EMU is not set |
85 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
86 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
87 | # CONFIG_ADVANCED is not set | 133 | # CONFIG_ADVANCED is not set |
134 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
135 | CONFIG_NODES_SHIFT=3 | ||
136 | CONFIG_SELECT_MEMORY_MODEL=y | ||
137 | # CONFIG_FLATMEM_MANUAL is not set | ||
138 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
139 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
140 | CONFIG_DISCONTIGMEM=y | ||
141 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
142 | CONFIG_NEED_MULTIPLE_NODES=y | ||
143 | # CONFIG_SPARSEMEM_STATIC is not set | ||
144 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
145 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
146 | # CONFIG_RESOURCES_64BIT is not set | ||
147 | CONFIG_ZONE_DMA_FLAG=1 | ||
148 | CONFIG_BOUNCE=y | ||
149 | CONFIG_VIRT_TO_BUS=y | ||
88 | 150 | ||
89 | # | 151 | # |
90 | # General setup | 152 | # General setup |
@@ -94,134 +156,11 @@ CONFIG_BINFMT_AOUT=m | |||
94 | CONFIG_BINFMT_MISC=m | 156 | CONFIG_BINFMT_MISC=m |
95 | CONFIG_HEARTBEAT=y | 157 | CONFIG_HEARTBEAT=y |
96 | CONFIG_PROC_HARDWARE=y | 158 | CONFIG_PROC_HARDWARE=y |
159 | CONFIG_ZONE_DMA=y | ||
160 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
97 | 161 | ||
98 | # | 162 | # |
99 | # Device Drivers | 163 | # Networking |
100 | # | ||
101 | |||
102 | # | ||
103 | # Generic Driver Options | ||
104 | # | ||
105 | CONFIG_STANDALONE=y | ||
106 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
107 | CONFIG_FW_LOADER=m | ||
108 | # CONFIG_DEBUG_DRIVER is not set | ||
109 | |||
110 | # | ||
111 | # Memory Technology Devices (MTD) | ||
112 | # | ||
113 | # CONFIG_MTD is not set | ||
114 | |||
115 | # | ||
116 | # Parallel port support | ||
117 | # | ||
118 | # CONFIG_PARPORT is not set | ||
119 | |||
120 | # | ||
121 | # Plug and Play support | ||
122 | # | ||
123 | |||
124 | # | ||
125 | # Block devices | ||
126 | # | ||
127 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
128 | CONFIG_BLK_DEV_LOOP=y | ||
129 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
130 | CONFIG_BLK_DEV_NBD=m | ||
131 | CONFIG_BLK_DEV_RAM=y | ||
132 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
133 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
134 | CONFIG_BLK_DEV_INITRD=y | ||
135 | CONFIG_INITRAMFS_SOURCE="" | ||
136 | CONFIG_CDROM_PKTCDVD=m | ||
137 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
138 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
139 | |||
140 | # | ||
141 | # IO Schedulers | ||
142 | # | ||
143 | CONFIG_IOSCHED_NOOP=y | ||
144 | CONFIG_IOSCHED_AS=y | ||
145 | CONFIG_IOSCHED_DEADLINE=y | ||
146 | CONFIG_IOSCHED_CFQ=y | ||
147 | CONFIG_ATA_OVER_ETH=m | ||
148 | |||
149 | # | ||
150 | # ATA/ATAPI/MFM/RLL support | ||
151 | # | ||
152 | # CONFIG_IDE is not set | ||
153 | |||
154 | # | ||
155 | # SCSI device support | ||
156 | # | ||
157 | CONFIG_SCSI=y | ||
158 | CONFIG_SCSI_PROC_FS=y | ||
159 | |||
160 | # | ||
161 | # SCSI support type (disk, tape, CD-ROM) | ||
162 | # | ||
163 | CONFIG_BLK_DEV_SD=y | ||
164 | CONFIG_CHR_DEV_ST=m | ||
165 | # CONFIG_CHR_DEV_OSST is not set | ||
166 | CONFIG_BLK_DEV_SR=y | ||
167 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
168 | CONFIG_CHR_DEV_SG=m | ||
169 | |||
170 | # | ||
171 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
172 | # | ||
173 | # CONFIG_SCSI_MULTI_LUN is not set | ||
174 | CONFIG_SCSI_CONSTANTS=y | ||
175 | # CONFIG_SCSI_LOGGING is not set | ||
176 | |||
177 | # | ||
178 | # SCSI Transport Attributes | ||
179 | # | ||
180 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
181 | # CONFIG_SCSI_FC_ATTRS is not set | ||
182 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
183 | |||
184 | # | ||
185 | # SCSI low-level drivers | ||
186 | # | ||
187 | # CONFIG_SCSI_SATA is not set | ||
188 | # CONFIG_SCSI_DEBUG is not set | ||
189 | |||
190 | # | ||
191 | # Multi-device support (RAID and LVM) | ||
192 | # | ||
193 | CONFIG_MD=y | ||
194 | CONFIG_BLK_DEV_MD=m | ||
195 | CONFIG_MD_LINEAR=m | ||
196 | CONFIG_MD_RAID0=m | ||
197 | CONFIG_MD_RAID1=m | ||
198 | # CONFIG_MD_RAID10 is not set | ||
199 | CONFIG_MD_RAID5=m | ||
200 | CONFIG_MD_RAID6=m | ||
201 | CONFIG_MD_MULTIPATH=m | ||
202 | # CONFIG_MD_FAULTY is not set | ||
203 | CONFIG_BLK_DEV_DM=m | ||
204 | CONFIG_DM_CRYPT=m | ||
205 | CONFIG_DM_SNAPSHOT=m | ||
206 | CONFIG_DM_MIRROR=m | ||
207 | CONFIG_DM_ZERO=m | ||
208 | CONFIG_DM_MULTIPATH=m | ||
209 | CONFIG_DM_MULTIPATH_EMC=m | ||
210 | |||
211 | # | ||
212 | # Fusion MPT device support | ||
213 | # | ||
214 | |||
215 | # | ||
216 | # IEEE 1394 (FireWire) support | ||
217 | # | ||
218 | |||
219 | # | ||
220 | # I2O device support | ||
221 | # | ||
222 | |||
223 | # | ||
224 | # Networking support | ||
225 | # | 164 | # |
226 | CONFIG_NET=y | 165 | CONFIG_NET=y |
227 | 166 | ||
@@ -231,10 +170,17 @@ CONFIG_NET=y | |||
231 | CONFIG_PACKET=y | 170 | CONFIG_PACKET=y |
232 | # CONFIG_PACKET_MMAP is not set | 171 | # CONFIG_PACKET_MMAP is not set |
233 | CONFIG_UNIX=y | 172 | CONFIG_UNIX=y |
173 | CONFIG_XFRM=y | ||
174 | # CONFIG_XFRM_USER is not set | ||
175 | # CONFIG_XFRM_SUB_POLICY is not set | ||
176 | CONFIG_XFRM_MIGRATE=y | ||
177 | # CONFIG_XFRM_STATISTICS is not set | ||
234 | CONFIG_NET_KEY=y | 178 | CONFIG_NET_KEY=y |
179 | CONFIG_NET_KEY_MIGRATE=y | ||
235 | CONFIG_INET=y | 180 | CONFIG_INET=y |
236 | # CONFIG_IP_MULTICAST is not set | 181 | # CONFIG_IP_MULTICAST is not set |
237 | # CONFIG_IP_ADVANCED_ROUTER is not set | 182 | # CONFIG_IP_ADVANCED_ROUTER is not set |
183 | CONFIG_IP_FIB_HASH=y | ||
238 | CONFIG_IP_PNP=y | 184 | CONFIG_IP_PNP=y |
239 | CONFIG_IP_PNP_DHCP=y | 185 | CONFIG_IP_PNP_DHCP=y |
240 | CONFIG_IP_PNP_BOOTP=y | 186 | CONFIG_IP_PNP_BOOTP=y |
@@ -246,145 +192,199 @@ CONFIG_SYN_COOKIES=y | |||
246 | CONFIG_INET_AH=m | 192 | CONFIG_INET_AH=m |
247 | CONFIG_INET_ESP=m | 193 | CONFIG_INET_ESP=m |
248 | CONFIG_INET_IPCOMP=m | 194 | CONFIG_INET_IPCOMP=m |
195 | CONFIG_INET_XFRM_TUNNEL=m | ||
249 | CONFIG_INET_TUNNEL=m | 196 | CONFIG_INET_TUNNEL=m |
250 | CONFIG_IP_TCPDIAG=m | 197 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
251 | CONFIG_IP_TCPDIAG_IPV6=y | 198 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
252 | 199 | CONFIG_INET_XFRM_MODE_BEET=m | |
253 | # | 200 | CONFIG_INET_LRO=m |
254 | # IP: Virtual Server Configuration | 201 | CONFIG_INET_DIAG=m |
255 | # | 202 | CONFIG_INET_TCP_DIAG=m |
203 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
204 | CONFIG_TCP_CONG_CUBIC=y | ||
205 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
206 | # CONFIG_TCP_MD5SIG is not set | ||
256 | # CONFIG_IP_VS is not set | 207 | # CONFIG_IP_VS is not set |
257 | CONFIG_IPV6=m | 208 | CONFIG_IPV6=m |
258 | CONFIG_IPV6_PRIVACY=y | 209 | CONFIG_IPV6_PRIVACY=y |
210 | CONFIG_IPV6_ROUTER_PREF=y | ||
211 | CONFIG_IPV6_ROUTE_INFO=y | ||
212 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
259 | CONFIG_INET6_AH=m | 213 | CONFIG_INET6_AH=m |
260 | CONFIG_INET6_ESP=m | 214 | CONFIG_INET6_ESP=m |
261 | CONFIG_INET6_IPCOMP=m | 215 | CONFIG_INET6_IPCOMP=m |
216 | # CONFIG_IPV6_MIP6 is not set | ||
217 | CONFIG_INET6_XFRM_TUNNEL=m | ||
262 | CONFIG_INET6_TUNNEL=m | 218 | CONFIG_INET6_TUNNEL=m |
219 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
220 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
221 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
222 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
223 | CONFIG_IPV6_SIT=m | ||
263 | CONFIG_IPV6_TUNNEL=m | 224 | CONFIG_IPV6_TUNNEL=m |
225 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
226 | # CONFIG_NETWORK_SECMARK is not set | ||
264 | CONFIG_NETFILTER=y | 227 | CONFIG_NETFILTER=y |
265 | # CONFIG_NETFILTER_DEBUG is not set | 228 | # CONFIG_NETFILTER_DEBUG is not set |
229 | CONFIG_NETFILTER_ADVANCED=y | ||
230 | |||
231 | # | ||
232 | # Core Netfilter Configuration | ||
233 | # | ||
234 | CONFIG_NETFILTER_NETLINK=m | ||
235 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
236 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
237 | CONFIG_NF_CONNTRACK=m | ||
238 | CONFIG_NF_CT_ACCT=y | ||
239 | CONFIG_NF_CONNTRACK_MARK=y | ||
240 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
241 | CONFIG_NF_CT_PROTO_GRE=m | ||
242 | CONFIG_NF_CT_PROTO_SCTP=m | ||
243 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
244 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
245 | CONFIG_NF_CONNTRACK_FTP=m | ||
246 | CONFIG_NF_CONNTRACK_H323=m | ||
247 | CONFIG_NF_CONNTRACK_IRC=m | ||
248 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
249 | CONFIG_NF_CONNTRACK_PPTP=m | ||
250 | CONFIG_NF_CONNTRACK_SANE=m | ||
251 | CONFIG_NF_CONNTRACK_SIP=m | ||
252 | CONFIG_NF_CONNTRACK_TFTP=m | ||
253 | # CONFIG_NF_CT_NETLINK is not set | ||
254 | CONFIG_NETFILTER_XTABLES=m | ||
255 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
265 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
266 | 295 | ||
267 | # | 296 | # |
268 | # IP: Netfilter Configuration | 297 | # IP: Netfilter Configuration |
269 | # | 298 | # |
270 | CONFIG_IP_NF_CONNTRACK=m | 299 | CONFIG_NF_CONNTRACK_IPV4=m |
271 | # CONFIG_IP_NF_CT_ACCT is not set | 300 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
272 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
273 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
274 | CONFIG_IP_NF_FTP=m | ||
275 | CONFIG_IP_NF_IRC=m | ||
276 | CONFIG_IP_NF_TFTP=m | ||
277 | CONFIG_IP_NF_AMANDA=m | ||
278 | CONFIG_IP_NF_QUEUE=m | 301 | CONFIG_IP_NF_QUEUE=m |
279 | CONFIG_IP_NF_IPTABLES=m | 302 | CONFIG_IP_NF_IPTABLES=m |
280 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
281 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
282 | CONFIG_IP_NF_MATCH_MAC=m | ||
283 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
284 | CONFIG_IP_NF_MATCH_MARK=m | ||
285 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
286 | CONFIG_IP_NF_MATCH_TOS=m | ||
287 | CONFIG_IP_NF_MATCH_RECENT=m | 303 | CONFIG_IP_NF_MATCH_RECENT=m |
288 | CONFIG_IP_NF_MATCH_ECN=m | 304 | CONFIG_IP_NF_MATCH_ECN=m |
289 | CONFIG_IP_NF_MATCH_DSCP=m | 305 | CONFIG_IP_NF_MATCH_AH=m |
290 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
291 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
292 | CONFIG_IP_NF_MATCH_TTL=m | 306 | CONFIG_IP_NF_MATCH_TTL=m |
293 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
294 | CONFIG_IP_NF_MATCH_HELPER=m | ||
295 | CONFIG_IP_NF_MATCH_STATE=m | ||
296 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
297 | CONFIG_IP_NF_MATCH_OWNER=m | ||
298 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 307 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
299 | CONFIG_IP_NF_MATCH_REALM=m | ||
300 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
301 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
302 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
303 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
304 | CONFIG_IP_NF_FILTER=m | 308 | CONFIG_IP_NF_FILTER=m |
305 | CONFIG_IP_NF_TARGET_REJECT=m | 309 | CONFIG_IP_NF_TARGET_REJECT=m |
306 | CONFIG_IP_NF_TARGET_LOG=m | 310 | CONFIG_IP_NF_TARGET_LOG=m |
307 | CONFIG_IP_NF_TARGET_ULOG=m | 311 | CONFIG_IP_NF_TARGET_ULOG=m |
308 | CONFIG_IP_NF_TARGET_TCPMSS=m | 312 | CONFIG_NF_NAT=m |
309 | CONFIG_IP_NF_NAT=m | 313 | CONFIG_NF_NAT_NEEDED=y |
310 | CONFIG_IP_NF_NAT_NEEDED=y | ||
311 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 314 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
312 | CONFIG_IP_NF_TARGET_REDIRECT=m | 315 | CONFIG_IP_NF_TARGET_REDIRECT=m |
313 | CONFIG_IP_NF_TARGET_NETMAP=m | 316 | CONFIG_IP_NF_TARGET_NETMAP=m |
314 | CONFIG_IP_NF_TARGET_SAME=m | 317 | CONFIG_NF_NAT_SNMP_BASIC=m |
315 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 318 | CONFIG_NF_NAT_PROTO_GRE=m |
316 | CONFIG_IP_NF_NAT_IRC=m | 319 | CONFIG_NF_NAT_FTP=m |
317 | CONFIG_IP_NF_NAT_FTP=m | 320 | CONFIG_NF_NAT_IRC=m |
318 | CONFIG_IP_NF_NAT_TFTP=m | 321 | CONFIG_NF_NAT_TFTP=m |
319 | CONFIG_IP_NF_NAT_AMANDA=m | 322 | CONFIG_NF_NAT_AMANDA=m |
323 | CONFIG_NF_NAT_PPTP=m | ||
324 | CONFIG_NF_NAT_H323=m | ||
325 | CONFIG_NF_NAT_SIP=m | ||
320 | CONFIG_IP_NF_MANGLE=m | 326 | CONFIG_IP_NF_MANGLE=m |
321 | CONFIG_IP_NF_TARGET_TOS=m | ||
322 | CONFIG_IP_NF_TARGET_ECN=m | 327 | CONFIG_IP_NF_TARGET_ECN=m |
323 | CONFIG_IP_NF_TARGET_DSCP=m | 328 | CONFIG_IP_NF_TARGET_TTL=m |
324 | CONFIG_IP_NF_TARGET_MARK=m | 329 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
325 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
326 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
327 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
328 | CONFIG_IP_NF_RAW=m | 330 | CONFIG_IP_NF_RAW=m |
329 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
330 | CONFIG_IP_NF_ARPTABLES=m | 331 | CONFIG_IP_NF_ARPTABLES=m |
331 | CONFIG_IP_NF_ARPFILTER=m | 332 | CONFIG_IP_NF_ARPFILTER=m |
332 | CONFIG_IP_NF_ARP_MANGLE=m | 333 | CONFIG_IP_NF_ARP_MANGLE=m |
333 | 334 | ||
334 | # | 335 | # |
335 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 336 | # IPv6: Netfilter Configuration |
336 | # | 337 | # |
338 | CONFIG_NF_CONNTRACK_IPV6=m | ||
337 | CONFIG_IP6_NF_QUEUE=m | 339 | CONFIG_IP6_NF_QUEUE=m |
338 | CONFIG_IP6_NF_IPTABLES=m | 340 | CONFIG_IP6_NF_IPTABLES=m |
339 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
340 | CONFIG_IP6_NF_MATCH_MAC=m | ||
341 | CONFIG_IP6_NF_MATCH_RT=m | 341 | CONFIG_IP6_NF_MATCH_RT=m |
342 | CONFIG_IP6_NF_MATCH_OPTS=m | 342 | CONFIG_IP6_NF_MATCH_OPTS=m |
343 | CONFIG_IP6_NF_MATCH_FRAG=m | 343 | CONFIG_IP6_NF_MATCH_FRAG=m |
344 | CONFIG_IP6_NF_MATCH_HL=m | 344 | CONFIG_IP6_NF_MATCH_HL=m |
345 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
346 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
347 | CONFIG_IP6_NF_MATCH_MARK=m | ||
348 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 345 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
349 | CONFIG_IP6_NF_MATCH_AHESP=m | 346 | CONFIG_IP6_NF_MATCH_AH=m |
350 | CONFIG_IP6_NF_MATCH_LENGTH=m | 347 | CONFIG_IP6_NF_MATCH_MH=m |
351 | CONFIG_IP6_NF_MATCH_EUI64=m | 348 | CONFIG_IP6_NF_MATCH_EUI64=m |
352 | CONFIG_IP6_NF_FILTER=m | 349 | CONFIG_IP6_NF_FILTER=m |
353 | CONFIG_IP6_NF_TARGET_LOG=m | 350 | CONFIG_IP6_NF_TARGET_LOG=m |
351 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
354 | CONFIG_IP6_NF_MANGLE=m | 352 | CONFIG_IP6_NF_MANGLE=m |
355 | CONFIG_IP6_NF_TARGET_MARK=m | 353 | CONFIG_IP6_NF_TARGET_HL=m |
356 | CONFIG_IP6_NF_RAW=m | 354 | CONFIG_IP6_NF_RAW=m |
357 | CONFIG_XFRM=y | 355 | CONFIG_IP_DCCP=m |
358 | CONFIG_XFRM_USER=m | 356 | CONFIG_INET_DCCP_DIAG=m |
357 | CONFIG_IP_DCCP_ACKVEC=y | ||
359 | 358 | ||
360 | # | 359 | # |
361 | # SCTP Configuration (EXPERIMENTAL) | 360 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
362 | # | 361 | # |
362 | CONFIG_IP_DCCP_CCID2=m | ||
363 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
364 | CONFIG_IP_DCCP_CCID3=m | ||
365 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
366 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
367 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
363 | CONFIG_IP_SCTP=m | 368 | CONFIG_IP_SCTP=m |
364 | # CONFIG_SCTP_DBG_MSG is not set | 369 | # CONFIG_SCTP_DBG_MSG is not set |
365 | # CONFIG_SCTP_DBG_OBJCNT is not set | 370 | # CONFIG_SCTP_DBG_OBJCNT is not set |
366 | # CONFIG_SCTP_HMAC_NONE is not set | 371 | # CONFIG_SCTP_HMAC_NONE is not set |
367 | # CONFIG_SCTP_HMAC_SHA1 is not set | 372 | # CONFIG_SCTP_HMAC_SHA1 is not set |
368 | CONFIG_SCTP_HMAC_MD5=y | 373 | CONFIG_SCTP_HMAC_MD5=y |
374 | # CONFIG_TIPC is not set | ||
369 | # CONFIG_ATM is not set | 375 | # CONFIG_ATM is not set |
370 | # CONFIG_BRIDGE is not set | 376 | # CONFIG_BRIDGE is not set |
371 | # CONFIG_VLAN_8021Q is not set | 377 | # CONFIG_VLAN_8021Q is not set |
372 | # CONFIG_DECNET is not set | 378 | # CONFIG_DECNET is not set |
373 | CONFIG_LLC=m | 379 | CONFIG_LLC=m |
374 | # CONFIG_LLC2 is not set | 380 | # CONFIG_LLC2 is not set |
375 | CONFIG_IPX=m | 381 | # CONFIG_IPX is not set |
376 | # CONFIG_IPX_INTERN is not set | ||
377 | CONFIG_ATALK=m | 382 | CONFIG_ATALK=m |
378 | # CONFIG_DEV_APPLETALK is not set | 383 | # CONFIG_DEV_APPLETALK is not set |
379 | # CONFIG_X25 is not set | 384 | # CONFIG_X25 is not set |
380 | # CONFIG_LAPB is not set | 385 | # CONFIG_LAPB is not set |
381 | # CONFIG_NET_DIVERT is not set | ||
382 | # CONFIG_ECONET is not set | 386 | # CONFIG_ECONET is not set |
383 | # CONFIG_WAN_ROUTER is not set | 387 | # CONFIG_WAN_ROUTER is not set |
384 | |||
385 | # | ||
386 | # QoS and/or fair queueing | ||
387 | # | ||
388 | # CONFIG_NET_SCHED is not set | 388 | # CONFIG_NET_SCHED is not set |
389 | CONFIG_NET_CLS_ROUTE=y | 389 | CONFIG_NET_CLS_ROUTE=y |
390 | 390 | ||
@@ -392,46 +392,154 @@ CONFIG_NET_CLS_ROUTE=y | |||
392 | # Network testing | 392 | # Network testing |
393 | # | 393 | # |
394 | # CONFIG_NET_PKTGEN is not set | 394 | # CONFIG_NET_PKTGEN is not set |
395 | CONFIG_NETPOLL=y | ||
396 | # CONFIG_NETPOLL_RX is not set | ||
397 | # CONFIG_NETPOLL_TRAP is not set | ||
398 | CONFIG_NET_POLL_CONTROLLER=y | ||
399 | # CONFIG_HAMRADIO is not set | 395 | # CONFIG_HAMRADIO is not set |
396 | # CONFIG_CAN is not set | ||
400 | # CONFIG_IRDA is not set | 397 | # CONFIG_IRDA is not set |
401 | # CONFIG_BT is not set | 398 | # CONFIG_BT is not set |
402 | CONFIG_NETDEVICES=y | 399 | # CONFIG_AF_RXRPC is not set |
403 | CONFIG_DUMMY=m | ||
404 | # CONFIG_BONDING is not set | ||
405 | CONFIG_EQUALIZER=m | ||
406 | # CONFIG_TUN is not set | ||
407 | 400 | ||
408 | # | 401 | # |
409 | # Ethernet (10 or 100Mbit) | 402 | # Wireless |
410 | # | 403 | # |
411 | CONFIG_NET_ETHERNET=y | 404 | # CONFIG_CFG80211 is not set |
412 | CONFIG_MII=m | 405 | CONFIG_WIRELESS_EXT=y |
413 | CONFIG_HPLANCE=y | 406 | # CONFIG_MAC80211 is not set |
407 | CONFIG_IEEE80211=m | ||
408 | # CONFIG_IEEE80211_DEBUG is not set | ||
409 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
410 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
411 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
412 | CONFIG_IEEE80211_SOFTMAC=m | ||
413 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
414 | # CONFIG_RFKILL is not set | ||
415 | # CONFIG_NET_9P is not set | ||
414 | 416 | ||
415 | # | 417 | # |
416 | # Ethernet (1000 Mbit) | 418 | # Device Drivers |
417 | # | 419 | # |
418 | 420 | ||
419 | # | 421 | # |
420 | # Ethernet (10000 Mbit) | 422 | # Generic Driver Options |
421 | # | 423 | # |
424 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
425 | CONFIG_STANDALONE=y | ||
426 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
427 | CONFIG_FW_LOADER=m | ||
428 | # CONFIG_SYS_HYPERVISOR is not set | ||
429 | CONFIG_CONNECTOR=m | ||
430 | # CONFIG_MTD is not set | ||
431 | # CONFIG_PARPORT is not set | ||
432 | CONFIG_BLK_DEV=y | ||
433 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
434 | CONFIG_BLK_DEV_LOOP=y | ||
435 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
436 | CONFIG_BLK_DEV_NBD=m | ||
437 | CONFIG_BLK_DEV_RAM=y | ||
438 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
439 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
440 | # CONFIG_BLK_DEV_XIP is not set | ||
441 | CONFIG_CDROM_PKTCDVD=m | ||
442 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
443 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
444 | CONFIG_ATA_OVER_ETH=m | ||
445 | CONFIG_MISC_DEVICES=y | ||
446 | # CONFIG_EEPROM_93CX6 is not set | ||
447 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
448 | CONFIG_HAVE_IDE=y | ||
449 | # CONFIG_IDE is not set | ||
422 | 450 | ||
423 | # | 451 | # |
424 | # Token Ring devices | 452 | # SCSI device support |
425 | # | 453 | # |
454 | CONFIG_RAID_ATTRS=m | ||
455 | CONFIG_SCSI=y | ||
456 | CONFIG_SCSI_DMA=y | ||
457 | CONFIG_SCSI_TGT=m | ||
458 | # CONFIG_SCSI_NETLINK is not set | ||
459 | CONFIG_SCSI_PROC_FS=y | ||
426 | 460 | ||
427 | # | 461 | # |
428 | # Wireless LAN (non-hamradio) | 462 | # SCSI support type (disk, tape, CD-ROM) |
429 | # | 463 | # |
430 | # CONFIG_NET_RADIO is not set | 464 | CONFIG_BLK_DEV_SD=y |
465 | CONFIG_CHR_DEV_ST=m | ||
466 | CONFIG_CHR_DEV_OSST=m | ||
467 | CONFIG_BLK_DEV_SR=y | ||
468 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
469 | CONFIG_CHR_DEV_SG=m | ||
470 | # CONFIG_CHR_DEV_SCH is not set | ||
471 | |||
472 | # | ||
473 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
474 | # | ||
475 | # CONFIG_SCSI_MULTI_LUN is not set | ||
476 | CONFIG_SCSI_CONSTANTS=y | ||
477 | # CONFIG_SCSI_LOGGING is not set | ||
478 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
479 | CONFIG_SCSI_WAIT_SCAN=m | ||
480 | |||
481 | # | ||
482 | # SCSI Transports | ||
483 | # | ||
484 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
485 | # CONFIG_SCSI_FC_ATTRS is not set | ||
486 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
487 | CONFIG_SCSI_SAS_ATTRS=m | ||
488 | CONFIG_SCSI_SAS_LIBSAS=m | ||
489 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
490 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
491 | CONFIG_SCSI_SRP_ATTRS=m | ||
492 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
493 | CONFIG_SCSI_LOWLEVEL=y | ||
494 | CONFIG_ISCSI_TCP=m | ||
495 | # CONFIG_SCSI_DEBUG is not set | ||
496 | CONFIG_MD=y | ||
497 | CONFIG_BLK_DEV_MD=m | ||
498 | CONFIG_MD_LINEAR=m | ||
499 | CONFIG_MD_RAID0=m | ||
500 | CONFIG_MD_RAID1=m | ||
501 | # CONFIG_MD_RAID10 is not set | ||
502 | CONFIG_MD_RAID456=m | ||
503 | CONFIG_MD_RAID5_RESHAPE=y | ||
504 | CONFIG_MD_MULTIPATH=m | ||
505 | # CONFIG_MD_FAULTY is not set | ||
506 | CONFIG_BLK_DEV_DM=m | ||
507 | # CONFIG_DM_DEBUG is not set | ||
508 | CONFIG_DM_CRYPT=m | ||
509 | CONFIG_DM_SNAPSHOT=m | ||
510 | CONFIG_DM_MIRROR=m | ||
511 | CONFIG_DM_ZERO=m | ||
512 | CONFIG_DM_MULTIPATH=m | ||
513 | CONFIG_DM_MULTIPATH_EMC=m | ||
514 | CONFIG_DM_MULTIPATH_RDAC=m | ||
515 | CONFIG_DM_MULTIPATH_HP=m | ||
516 | # CONFIG_DM_DELAY is not set | ||
517 | CONFIG_DM_UEVENT=y | ||
518 | CONFIG_NETDEVICES=y | ||
519 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
520 | CONFIG_DUMMY=m | ||
521 | # CONFIG_BONDING is not set | ||
522 | CONFIG_MACVLAN=m | ||
523 | CONFIG_EQUALIZER=m | ||
524 | # CONFIG_TUN is not set | ||
525 | CONFIG_VETH=m | ||
526 | # CONFIG_PHYLIB is not set | ||
527 | CONFIG_NET_ETHERNET=y | ||
528 | # CONFIG_MII is not set | ||
529 | CONFIG_HPLANCE=y | ||
530 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
534 | # CONFIG_B44 is not set | ||
535 | # CONFIG_NETDEV_1000 is not set | ||
536 | # CONFIG_NETDEV_10000 is not set | ||
431 | 537 | ||
432 | # | 538 | # |
433 | # Wan interfaces | 539 | # Wireless LAN |
434 | # | 540 | # |
541 | # CONFIG_WLAN_PRE80211 is not set | ||
542 | # CONFIG_WLAN_80211 is not set | ||
435 | # CONFIG_WAN is not set | 543 | # CONFIG_WAN is not set |
436 | CONFIG_PPP=m | 544 | CONFIG_PPP=m |
437 | # CONFIG_PPP_MULTILINK is not set | 545 | # CONFIG_PPP_MULTILINK is not set |
@@ -440,28 +548,28 @@ CONFIG_PPP_ASYNC=m | |||
440 | CONFIG_PPP_SYNC_TTY=m | 548 | CONFIG_PPP_SYNC_TTY=m |
441 | CONFIG_PPP_DEFLATE=m | 549 | CONFIG_PPP_DEFLATE=m |
442 | CONFIG_PPP_BSDCOMP=m | 550 | CONFIG_PPP_BSDCOMP=m |
551 | CONFIG_PPP_MPPE=m | ||
443 | CONFIG_PPPOE=m | 552 | CONFIG_PPPOE=m |
553 | CONFIG_PPPOL2TP=m | ||
444 | CONFIG_SLIP=m | 554 | CONFIG_SLIP=m |
445 | CONFIG_SLIP_COMPRESSED=y | 555 | CONFIG_SLIP_COMPRESSED=y |
556 | CONFIG_SLHC=m | ||
446 | CONFIG_SLIP_SMART=y | 557 | CONFIG_SLIP_SMART=y |
447 | CONFIG_SLIP_MODE_SLIP6=y | 558 | CONFIG_SLIP_MODE_SLIP6=y |
448 | CONFIG_SHAPER=m | ||
449 | CONFIG_NETCONSOLE=m | 559 | CONFIG_NETCONSOLE=m |
450 | 560 | CONFIG_NETCONSOLE_DYNAMIC=y | |
451 | # | 561 | CONFIG_NETPOLL=y |
452 | # ISDN subsystem | 562 | # CONFIG_NETPOLL_TRAP is not set |
453 | # | 563 | CONFIG_NET_POLL_CONTROLLER=y |
454 | # CONFIG_ISDN is not set | 564 | # CONFIG_ISDN is not set |
455 | |||
456 | # | ||
457 | # Telephony Support | ||
458 | # | ||
459 | # CONFIG_PHONE is not set | 565 | # CONFIG_PHONE is not set |
460 | 566 | ||
461 | # | 567 | # |
462 | # Input device support | 568 | # Input device support |
463 | # | 569 | # |
464 | CONFIG_INPUT=y | 570 | CONFIG_INPUT=y |
571 | CONFIG_INPUT_FF_MEMLESS=m | ||
572 | # CONFIG_INPUT_POLLDEV is not set | ||
465 | 573 | ||
466 | # | 574 | # |
467 | # Userland interfaces | 575 | # Userland interfaces |
@@ -471,7 +579,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
471 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 579 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
472 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 580 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
473 | # CONFIG_INPUT_JOYDEV is not set | 581 | # CONFIG_INPUT_JOYDEV is not set |
474 | # CONFIG_INPUT_TSDEV is not set | ||
475 | # CONFIG_INPUT_EVDEV is not set | 582 | # CONFIG_INPUT_EVDEV is not set |
476 | # CONFIG_INPUT_EVBUG is not set | 583 | # CONFIG_INPUT_EVBUG is not set |
477 | 584 | ||
@@ -484,19 +591,35 @@ CONFIG_INPUT_KEYBOARD=y | |||
484 | # CONFIG_KEYBOARD_LKKBD is not set | 591 | # CONFIG_KEYBOARD_LKKBD is not set |
485 | # CONFIG_KEYBOARD_XTKBD is not set | 592 | # CONFIG_KEYBOARD_XTKBD is not set |
486 | # CONFIG_KEYBOARD_NEWTON is not set | 593 | # CONFIG_KEYBOARD_NEWTON is not set |
594 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
595 | CONFIG_KEYBOARD_HIL_OLD=y | ||
596 | CONFIG_KEYBOARD_HIL=y | ||
487 | CONFIG_INPUT_MOUSE=y | 597 | CONFIG_INPUT_MOUSE=y |
488 | CONFIG_MOUSE_PS2=m | 598 | CONFIG_MOUSE_PS2=m |
599 | CONFIG_MOUSE_PS2_ALPS=y | ||
600 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
601 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
602 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
603 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
604 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
489 | CONFIG_MOUSE_SERIAL=m | 605 | CONFIG_MOUSE_SERIAL=m |
490 | # CONFIG_MOUSE_VSXXXAA is not set | 606 | # CONFIG_MOUSE_VSXXXAA is not set |
607 | CONFIG_MOUSE_HIL=m | ||
491 | # CONFIG_INPUT_JOYSTICK is not set | 608 | # CONFIG_INPUT_JOYSTICK is not set |
609 | # CONFIG_INPUT_TABLET is not set | ||
492 | # CONFIG_INPUT_TOUCHSCREEN is not set | 610 | # CONFIG_INPUT_TOUCHSCREEN is not set |
493 | # CONFIG_INPUT_MISC is not set | 611 | CONFIG_INPUT_MISC=y |
612 | # CONFIG_INPUT_M68K_BEEP is not set | ||
613 | # CONFIG_INPUT_UINPUT is not set | ||
614 | CONFIG_HP_SDC_RTC=m | ||
494 | 615 | ||
495 | # | 616 | # |
496 | # Hardware I/O ports | 617 | # Hardware I/O ports |
497 | # | 618 | # |
498 | CONFIG_SERIO=m | 619 | CONFIG_SERIO=y |
499 | CONFIG_SERIO_SERPORT=m | 620 | # CONFIG_SERIO_SERPORT is not set |
621 | CONFIG_HP_SDC=y | ||
622 | CONFIG_HIL_MLC=y | ||
500 | CONFIG_SERIO_LIBPS2=m | 623 | CONFIG_SERIO_LIBPS2=m |
501 | # CONFIG_SERIO_RAW is not set | 624 | # CONFIG_SERIO_RAW is not set |
502 | # CONFIG_GAMEPORT is not set | 625 | # CONFIG_GAMEPORT is not set |
@@ -507,6 +630,7 @@ CONFIG_SERIO_LIBPS2=m | |||
507 | CONFIG_VT=y | 630 | CONFIG_VT=y |
508 | CONFIG_VT_CONSOLE=y | 631 | CONFIG_VT_CONSOLE=y |
509 | CONFIG_HW_CONSOLE=y | 632 | CONFIG_HW_CONSOLE=y |
633 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
510 | # CONFIG_SERIAL_NONSTANDARD is not set | 634 | # CONFIG_SERIAL_NONSTANDARD is not set |
511 | 635 | ||
512 | # | 636 | # |
@@ -520,90 +644,114 @@ CONFIG_HW_CONSOLE=y | |||
520 | CONFIG_UNIX98_PTYS=y | 644 | CONFIG_UNIX98_PTYS=y |
521 | CONFIG_LEGACY_PTYS=y | 645 | CONFIG_LEGACY_PTYS=y |
522 | CONFIG_LEGACY_PTY_COUNT=256 | 646 | CONFIG_LEGACY_PTY_COUNT=256 |
523 | |||
524 | # | ||
525 | # IPMI | ||
526 | # | ||
527 | # CONFIG_IPMI_HANDLER is not set | 647 | # CONFIG_IPMI_HANDLER is not set |
528 | 648 | # CONFIG_HW_RANDOM is not set | |
529 | # | 649 | CONFIG_GEN_RTC=m |
530 | # Watchdog Cards | ||
531 | # | ||
532 | # CONFIG_WATCHDOG is not set | ||
533 | CONFIG_GEN_RTC=y | ||
534 | CONFIG_GEN_RTC_X=y | 650 | CONFIG_GEN_RTC_X=y |
535 | # CONFIG_DTLK is not set | ||
536 | # CONFIG_R3964 is not set | 651 | # CONFIG_R3964 is not set |
537 | |||
538 | # | ||
539 | # Ftape, the floppy tape device driver | ||
540 | # | ||
541 | # CONFIG_DRM is not set | ||
542 | # CONFIG_RAW_DRIVER is not set | 652 | # CONFIG_RAW_DRIVER is not set |
653 | # CONFIG_TCG_TPM is not set | ||
654 | # CONFIG_I2C is not set | ||
543 | 655 | ||
544 | # | 656 | # |
545 | # TPM devices | 657 | # SPI support |
546 | # | 658 | # |
659 | # CONFIG_SPI is not set | ||
660 | # CONFIG_SPI_MASTER is not set | ||
661 | # CONFIG_W1 is not set | ||
662 | # CONFIG_POWER_SUPPLY is not set | ||
663 | # CONFIG_HWMON is not set | ||
664 | # CONFIG_THERMAL is not set | ||
665 | # CONFIG_WATCHDOG is not set | ||
547 | 666 | ||
548 | # | 667 | # |
549 | # I2C support | 668 | # Sonics Silicon Backplane |
550 | # | 669 | # |
551 | # CONFIG_I2C is not set | 670 | CONFIG_SSB_POSSIBLE=y |
671 | # CONFIG_SSB is not set | ||
552 | 672 | ||
553 | # | 673 | # |
554 | # Dallas's 1-wire bus | 674 | # Multifunction device drivers |
555 | # | 675 | # |
556 | # CONFIG_W1 is not set | 676 | # CONFIG_MFD_SM501 is not set |
557 | 677 | ||
558 | # | 678 | # |
559 | # Misc devices | 679 | # Multimedia devices |
560 | # | 680 | # |
681 | # CONFIG_VIDEO_DEV is not set | ||
682 | # CONFIG_DVB_CORE is not set | ||
683 | # CONFIG_DAB is not set | ||
561 | 684 | ||
562 | # | 685 | # |
563 | # Multimedia devices | 686 | # Graphics support |
564 | # | 687 | # |
565 | # CONFIG_VIDEO_DEV is not set | 688 | # CONFIG_VGASTATE is not set |
689 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
690 | CONFIG_FB=y | ||
691 | # CONFIG_FIRMWARE_EDID is not set | ||
692 | # CONFIG_FB_DDC is not set | ||
693 | CONFIG_FB_CFB_FILLRECT=y | ||
694 | # CONFIG_FB_CFB_COPYAREA is not set | ||
695 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
696 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
697 | # CONFIG_FB_SYS_FILLRECT is not set | ||
698 | # CONFIG_FB_SYS_COPYAREA is not set | ||
699 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
700 | # CONFIG_FB_SYS_FOPS is not set | ||
701 | CONFIG_FB_DEFERRED_IO=y | ||
702 | # CONFIG_FB_SVGALIB is not set | ||
703 | # CONFIG_FB_MACMODES is not set | ||
704 | # CONFIG_FB_BACKLIGHT is not set | ||
705 | # CONFIG_FB_MODE_HELPERS is not set | ||
706 | # CONFIG_FB_TILEBLITTING is not set | ||
566 | 707 | ||
567 | # | 708 | # |
568 | # Digital Video Broadcasting Devices | 709 | # Frame buffer hardware drivers |
569 | # | 710 | # |
570 | # CONFIG_DVB is not set | 711 | CONFIG_FB_HP300=y |
712 | # CONFIG_FB_UVESA is not set | ||
713 | # CONFIG_FB_S1D13XXX is not set | ||
714 | # CONFIG_FB_VIRTUAL is not set | ||
715 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
571 | 716 | ||
572 | # | 717 | # |
573 | # Graphics support | 718 | # Display device support |
574 | # | 719 | # |
575 | # CONFIG_FB is not set | 720 | # CONFIG_DISPLAY_SUPPORT is not set |
576 | 721 | ||
577 | # | 722 | # |
578 | # Console display driver support | 723 | # Console display driver support |
579 | # | 724 | # |
580 | CONFIG_DUMMY_CONSOLE=y | 725 | CONFIG_DUMMY_CONSOLE=y |
726 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
727 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
728 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
729 | # CONFIG_FONTS is not set | ||
730 | CONFIG_FONT_8x8=y | ||
731 | CONFIG_FONT_8x16=y | ||
732 | CONFIG_LOGO=y | ||
733 | # CONFIG_LOGO_LINUX_MONO is not set | ||
734 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
735 | CONFIG_LOGO_LINUX_CLUT224=y | ||
581 | 736 | ||
582 | # | 737 | # |
583 | # Sound | 738 | # Sound |
584 | # | 739 | # |
585 | # CONFIG_SOUND is not set | 740 | # CONFIG_SOUND is not set |
586 | 741 | CONFIG_HID_SUPPORT=y | |
587 | # | 742 | CONFIG_HID=m |
588 | # USB support | 743 | # CONFIG_HID_DEBUG is not set |
589 | # | 744 | CONFIG_HIDRAW=y |
590 | # CONFIG_USB_ARCH_HAS_HCD is not set | 745 | # CONFIG_USB_SUPPORT is not set |
591 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
592 | |||
593 | # | ||
594 | # USB Gadget Support | ||
595 | # | ||
596 | # CONFIG_USB_GADGET is not set | ||
597 | |||
598 | # | ||
599 | # MMC/SD Card support | ||
600 | # | ||
601 | # CONFIG_MMC is not set | 746 | # CONFIG_MMC is not set |
747 | # CONFIG_MEMSTICK is not set | ||
748 | # CONFIG_NEW_LEDS is not set | ||
749 | # CONFIG_RTC_CLASS is not set | ||
602 | 750 | ||
603 | # | 751 | # |
604 | # InfiniBand support | 752 | # Userspace I/O |
605 | # | 753 | # |
606 | # CONFIG_INFINIBAND is not set | 754 | # CONFIG_UIO is not set |
607 | 755 | ||
608 | # | 756 | # |
609 | # Character devices | 757 | # Character devices |
@@ -614,10 +762,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
614 | # | 762 | # |
615 | CONFIG_EXT2_FS=y | 763 | CONFIG_EXT2_FS=y |
616 | # CONFIG_EXT2_FS_XATTR is not set | 764 | # CONFIG_EXT2_FS_XATTR is not set |
765 | # CONFIG_EXT2_FS_XIP is not set | ||
617 | CONFIG_EXT3_FS=y | 766 | CONFIG_EXT3_FS=y |
618 | # CONFIG_EXT3_FS_XATTR is not set | 767 | # CONFIG_EXT3_FS_XATTR is not set |
768 | # CONFIG_EXT4DEV_FS is not set | ||
619 | CONFIG_JBD=y | 769 | CONFIG_JBD=y |
620 | # CONFIG_JBD_DEBUG is not set | ||
621 | CONFIG_REISERFS_FS=m | 770 | CONFIG_REISERFS_FS=m |
622 | # CONFIG_REISERFS_CHECK is not set | 771 | # CONFIG_REISERFS_CHECK is not set |
623 | # CONFIG_REISERFS_PROC_INFO is not set | 772 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -628,25 +777,29 @@ CONFIG_JFS_FS=m | |||
628 | # CONFIG_JFS_DEBUG is not set | 777 | # CONFIG_JFS_DEBUG is not set |
629 | # CONFIG_JFS_STATISTICS is not set | 778 | # CONFIG_JFS_STATISTICS is not set |
630 | CONFIG_FS_POSIX_ACL=y | 779 | CONFIG_FS_POSIX_ACL=y |
631 | |||
632 | # | ||
633 | # XFS support | ||
634 | # | ||
635 | CONFIG_XFS_FS=m | 780 | CONFIG_XFS_FS=m |
636 | CONFIG_XFS_EXPORT=y | ||
637 | # CONFIG_XFS_RT is not set | ||
638 | # CONFIG_XFS_QUOTA is not set | 781 | # CONFIG_XFS_QUOTA is not set |
639 | # CONFIG_XFS_SECURITY is not set | 782 | # CONFIG_XFS_SECURITY is not set |
640 | # CONFIG_XFS_POSIX_ACL is not set | 783 | # CONFIG_XFS_POSIX_ACL is not set |
641 | CONFIG_MINIX_FS=y | 784 | # CONFIG_XFS_RT is not set |
642 | # CONFIG_ROMFS_FS is not set | 785 | CONFIG_GFS2_FS=m |
786 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
787 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
788 | CONFIG_OCFS2_FS=m | ||
789 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
790 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
791 | CONFIG_DNOTIFY=y | ||
792 | CONFIG_INOTIFY=y | ||
793 | CONFIG_INOTIFY_USER=y | ||
643 | CONFIG_QUOTA=y | 794 | CONFIG_QUOTA=y |
795 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
796 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
644 | # CONFIG_QFMT_V1 is not set | 797 | # CONFIG_QFMT_V1 is not set |
645 | # CONFIG_QFMT_V2 is not set | 798 | # CONFIG_QFMT_V2 is not set |
646 | CONFIG_QUOTACTL=y | 799 | CONFIG_QUOTACTL=y |
647 | CONFIG_DNOTIFY=y | ||
648 | CONFIG_AUTOFS_FS=m | 800 | CONFIG_AUTOFS_FS=m |
649 | CONFIG_AUTOFS4_FS=m | 801 | CONFIG_AUTOFS4_FS=m |
802 | CONFIG_FUSE_FS=m | ||
650 | 803 | ||
651 | # | 804 | # |
652 | # CD-ROM/DVD Filesystems | 805 | # CD-ROM/DVD Filesystems |
@@ -654,7 +807,6 @@ CONFIG_AUTOFS4_FS=m | |||
654 | CONFIG_ISO9660_FS=y | 807 | CONFIG_ISO9660_FS=y |
655 | CONFIG_JOLIET=y | 808 | CONFIG_JOLIET=y |
656 | CONFIG_ZISOFS=y | 809 | CONFIG_ZISOFS=y |
657 | CONFIG_ZISOFS_FS=y | ||
658 | CONFIG_UDF_FS=m | 810 | CONFIG_UDF_FS=m |
659 | CONFIG_UDF_NLS=y | 811 | CONFIG_UDF_NLS=y |
660 | 812 | ||
@@ -673,13 +825,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
673 | # | 825 | # |
674 | CONFIG_PROC_FS=y | 826 | CONFIG_PROC_FS=y |
675 | CONFIG_PROC_KCORE=y | 827 | CONFIG_PROC_KCORE=y |
828 | CONFIG_PROC_SYSCTL=y | ||
676 | CONFIG_SYSFS=y | 829 | CONFIG_SYSFS=y |
677 | # CONFIG_DEVFS_FS is not set | ||
678 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
679 | CONFIG_TMPFS=y | 830 | CONFIG_TMPFS=y |
680 | # CONFIG_TMPFS_XATTR is not set | 831 | # CONFIG_TMPFS_POSIX_ACL is not set |
681 | # CONFIG_HUGETLB_PAGE is not set | 832 | # CONFIG_HUGETLB_PAGE is not set |
682 | CONFIG_RAMFS=y | 833 | CONFIG_CONFIGFS_FS=m |
683 | 834 | ||
684 | # | 835 | # |
685 | # Miscellaneous filesystems | 836 | # Miscellaneous filesystems |
@@ -693,44 +844,40 @@ CONFIG_HFSPLUS_FS=m | |||
693 | # CONFIG_EFS_FS is not set | 844 | # CONFIG_EFS_FS is not set |
694 | CONFIG_CRAMFS=m | 845 | CONFIG_CRAMFS=m |
695 | # CONFIG_VXFS_FS is not set | 846 | # CONFIG_VXFS_FS is not set |
847 | CONFIG_MINIX_FS=y | ||
696 | CONFIG_HPFS_FS=m | 848 | CONFIG_HPFS_FS=m |
697 | # CONFIG_QNX4FS_FS is not set | 849 | # CONFIG_QNX4FS_FS is not set |
850 | # CONFIG_ROMFS_FS is not set | ||
698 | CONFIG_SYSV_FS=m | 851 | CONFIG_SYSV_FS=m |
699 | CONFIG_UFS_FS=m | 852 | CONFIG_UFS_FS=m |
700 | # CONFIG_UFS_FS_WRITE is not set | 853 | # CONFIG_UFS_FS_WRITE is not set |
701 | 854 | # CONFIG_UFS_DEBUG is not set | |
702 | # | 855 | CONFIG_NETWORK_FILESYSTEMS=y |
703 | # Network File Systems | ||
704 | # | ||
705 | CONFIG_NFS_FS=y | 856 | CONFIG_NFS_FS=y |
706 | CONFIG_NFS_V3=y | 857 | CONFIG_NFS_V3=y |
858 | # CONFIG_NFS_V3_ACL is not set | ||
707 | CONFIG_NFS_V4=y | 859 | CONFIG_NFS_V4=y |
708 | # CONFIG_NFS_DIRECTIO is not set | 860 | # CONFIG_NFS_DIRECTIO is not set |
709 | CONFIG_NFSD=m | 861 | CONFIG_NFSD=m |
710 | CONFIG_NFSD_V3=y | 862 | CONFIG_NFSD_V3=y |
711 | CONFIG_NFSD_V4=y | 863 | # CONFIG_NFSD_V3_ACL is not set |
864 | # CONFIG_NFSD_V4 is not set | ||
712 | CONFIG_NFSD_TCP=y | 865 | CONFIG_NFSD_TCP=y |
713 | CONFIG_ROOT_NFS=y | 866 | CONFIG_ROOT_NFS=y |
714 | CONFIG_LOCKD=y | 867 | CONFIG_LOCKD=y |
715 | CONFIG_LOCKD_V4=y | 868 | CONFIG_LOCKD_V4=y |
716 | CONFIG_EXPORTFS=m | 869 | CONFIG_EXPORTFS=m |
870 | CONFIG_NFS_COMMON=y | ||
717 | CONFIG_SUNRPC=y | 871 | CONFIG_SUNRPC=y |
718 | CONFIG_SUNRPC_GSS=y | 872 | CONFIG_SUNRPC_GSS=y |
873 | CONFIG_SUNRPC_BIND34=y | ||
719 | CONFIG_RPCSEC_GSS_KRB5=y | 874 | CONFIG_RPCSEC_GSS_KRB5=y |
720 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 875 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
721 | CONFIG_SMB_FS=m | 876 | CONFIG_SMB_FS=m |
722 | CONFIG_SMB_NLS_DEFAULT=y | 877 | CONFIG_SMB_NLS_DEFAULT=y |
723 | CONFIG_SMB_NLS_REMOTE="cp437" | 878 | CONFIG_SMB_NLS_REMOTE="cp437" |
724 | # CONFIG_CIFS is not set | 879 | # CONFIG_CIFS is not set |
725 | CONFIG_NCP_FS=m | 880 | # CONFIG_NCP_FS is not set |
726 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
727 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
728 | # CONFIG_NCPFS_STRONG is not set | ||
729 | CONFIG_NCPFS_NFS_NS=y | ||
730 | CONFIG_NCPFS_OS2_NS=y | ||
731 | # CONFIG_NCPFS_SMALLDOS is not set | ||
732 | CONFIG_NCPFS_NLS=y | ||
733 | # CONFIG_NCPFS_EXTRAS is not set | ||
734 | CONFIG_CODA_FS=m | 881 | CONFIG_CODA_FS=m |
735 | # CONFIG_CODA_FS_OLD_API is not set | 882 | # CONFIG_CODA_FS_OLD_API is not set |
736 | # CONFIG_AFS_FS is not set | 883 | # CONFIG_AFS_FS is not set |
@@ -740,10 +887,6 @@ CONFIG_CODA_FS=m | |||
740 | # | 887 | # |
741 | # CONFIG_PARTITION_ADVANCED is not set | 888 | # CONFIG_PARTITION_ADVANCED is not set |
742 | CONFIG_MSDOS_PARTITION=y | 889 | CONFIG_MSDOS_PARTITION=y |
743 | |||
744 | # | ||
745 | # Native Language Support | ||
746 | # | ||
747 | CONFIG_NLS=y | 890 | CONFIG_NLS=y |
748 | CONFIG_NLS_DEFAULT="iso8859-1" | 891 | CONFIG_NLS_DEFAULT="iso8859-1" |
749 | CONFIG_NLS_CODEPAGE_437=y | 892 | CONFIG_NLS_CODEPAGE_437=y |
@@ -784,35 +927,42 @@ CONFIG_NLS_ISO8859_15=m | |||
784 | CONFIG_NLS_KOI8_R=m | 927 | CONFIG_NLS_KOI8_R=m |
785 | CONFIG_NLS_KOI8_U=m | 928 | CONFIG_NLS_KOI8_U=m |
786 | CONFIG_NLS_UTF8=m | 929 | CONFIG_NLS_UTF8=m |
930 | CONFIG_DLM=m | ||
931 | # CONFIG_DLM_DEBUG is not set | ||
787 | 932 | ||
788 | # | 933 | # |
789 | # Kernel hacking | 934 | # Kernel hacking |
790 | # | 935 | # |
791 | # CONFIG_PRINTK_TIME is not set | 936 | # CONFIG_PRINTK_TIME is not set |
792 | CONFIG_DEBUG_KERNEL=y | 937 | CONFIG_ENABLE_WARN_DEPRECATED=y |
938 | CONFIG_ENABLE_MUST_CHECK=y | ||
793 | CONFIG_MAGIC_SYSRQ=y | 939 | CONFIG_MAGIC_SYSRQ=y |
794 | CONFIG_LOG_BUF_SHIFT=16 | 940 | # CONFIG_UNUSED_SYMBOLS is not set |
795 | # CONFIG_SCHEDSTATS is not set | ||
796 | # CONFIG_DEBUG_SLAB is not set | ||
797 | # CONFIG_DEBUG_SPINLOCK is not set | ||
798 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
799 | # CONFIG_DEBUG_KOBJECT is not set | ||
800 | CONFIG_DEBUG_BUGVERBOSE=y | ||
801 | # CONFIG_DEBUG_INFO is not set | ||
802 | # CONFIG_DEBUG_FS is not set | 941 | # CONFIG_DEBUG_FS is not set |
803 | # CONFIG_FRAME_POINTER is not set | 942 | # CONFIG_HEADERS_CHECK is not set |
943 | # CONFIG_DEBUG_KERNEL is not set | ||
944 | CONFIG_DEBUG_BUGVERBOSE=y | ||
945 | # CONFIG_SAMPLES is not set | ||
804 | 946 | ||
805 | # | 947 | # |
806 | # Security options | 948 | # Security options |
807 | # | 949 | # |
808 | # CONFIG_KEYS is not set | 950 | # CONFIG_KEYS is not set |
809 | # CONFIG_SECURITY is not set | 951 | # CONFIG_SECURITY is not set |
810 | 952 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
811 | # | 953 | CONFIG_XOR_BLOCKS=m |
812 | # Cryptographic options | 954 | CONFIG_ASYNC_CORE=m |
813 | # | 955 | CONFIG_ASYNC_MEMCPY=m |
956 | CONFIG_ASYNC_XOR=m | ||
814 | CONFIG_CRYPTO=y | 957 | CONFIG_CRYPTO=y |
958 | CONFIG_CRYPTO_ALGAPI=y | ||
959 | CONFIG_CRYPTO_AEAD=m | ||
960 | CONFIG_CRYPTO_BLKCIPHER=y | ||
961 | CONFIG_CRYPTO_SEQIV=m | ||
962 | CONFIG_CRYPTO_HASH=y | ||
963 | CONFIG_CRYPTO_MANAGER=y | ||
815 | CONFIG_CRYPTO_HMAC=y | 964 | CONFIG_CRYPTO_HMAC=y |
965 | CONFIG_CRYPTO_XCBC=m | ||
816 | CONFIG_CRYPTO_NULL=m | 966 | CONFIG_CRYPTO_NULL=m |
817 | CONFIG_CRYPTO_MD4=m | 967 | CONFIG_CRYPTO_MD4=m |
818 | CONFIG_CRYPTO_MD5=y | 968 | CONFIG_CRYPTO_MD5=y |
@@ -821,9 +971,21 @@ CONFIG_CRYPTO_SHA256=m | |||
821 | CONFIG_CRYPTO_SHA512=m | 971 | CONFIG_CRYPTO_SHA512=m |
822 | CONFIG_CRYPTO_WP512=m | 972 | CONFIG_CRYPTO_WP512=m |
823 | CONFIG_CRYPTO_TGR192=m | 973 | CONFIG_CRYPTO_TGR192=m |
974 | CONFIG_CRYPTO_GF128MUL=m | ||
975 | CONFIG_CRYPTO_ECB=m | ||
976 | CONFIG_CRYPTO_CBC=y | ||
977 | CONFIG_CRYPTO_PCBC=m | ||
978 | CONFIG_CRYPTO_LRW=m | ||
979 | CONFIG_CRYPTO_XTS=m | ||
980 | CONFIG_CRYPTO_CTR=m | ||
981 | CONFIG_CRYPTO_GCM=m | ||
982 | CONFIG_CRYPTO_CCM=m | ||
983 | CONFIG_CRYPTO_CRYPTD=m | ||
824 | CONFIG_CRYPTO_DES=y | 984 | CONFIG_CRYPTO_DES=y |
985 | CONFIG_CRYPTO_FCRYPT=m | ||
825 | CONFIG_CRYPTO_BLOWFISH=m | 986 | CONFIG_CRYPTO_BLOWFISH=m |
826 | CONFIG_CRYPTO_TWOFISH=m | 987 | CONFIG_CRYPTO_TWOFISH=m |
988 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
827 | CONFIG_CRYPTO_SERPENT=m | 989 | CONFIG_CRYPTO_SERPENT=m |
828 | CONFIG_CRYPTO_AES=m | 990 | CONFIG_CRYPTO_AES=m |
829 | CONFIG_CRYPTO_CAST5=m | 991 | CONFIG_CRYPTO_CAST5=m |
@@ -832,20 +994,35 @@ CONFIG_CRYPTO_TEA=m | |||
832 | CONFIG_CRYPTO_ARC4=m | 994 | CONFIG_CRYPTO_ARC4=m |
833 | CONFIG_CRYPTO_KHAZAD=m | 995 | CONFIG_CRYPTO_KHAZAD=m |
834 | CONFIG_CRYPTO_ANUBIS=m | 996 | CONFIG_CRYPTO_ANUBIS=m |
997 | CONFIG_CRYPTO_SEED=m | ||
998 | CONFIG_CRYPTO_SALSA20=m | ||
835 | CONFIG_CRYPTO_DEFLATE=m | 999 | CONFIG_CRYPTO_DEFLATE=m |
836 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1000 | CONFIG_CRYPTO_MICHAEL_MIC=m |
837 | CONFIG_CRYPTO_CRC32C=m | 1001 | CONFIG_CRYPTO_CRC32C=m |
1002 | CONFIG_CRYPTO_CAMELLIA=m | ||
838 | CONFIG_CRYPTO_TEST=m | 1003 | CONFIG_CRYPTO_TEST=m |
839 | 1004 | CONFIG_CRYPTO_AUTHENC=m | |
840 | # | 1005 | CONFIG_CRYPTO_LZO=m |
841 | # Hardware crypto devices | 1006 | # CONFIG_CRYPTO_HW is not set |
842 | # | ||
843 | 1007 | ||
844 | # | 1008 | # |
845 | # Library routines | 1009 | # Library routines |
846 | # | 1010 | # |
1011 | CONFIG_BITREVERSE=y | ||
847 | CONFIG_CRC_CCITT=m | 1012 | CONFIG_CRC_CCITT=m |
1013 | CONFIG_CRC16=m | ||
1014 | # CONFIG_CRC_ITU_T is not set | ||
848 | CONFIG_CRC32=y | 1015 | CONFIG_CRC32=y |
1016 | # CONFIG_CRC7 is not set | ||
849 | CONFIG_LIBCRC32C=m | 1017 | CONFIG_LIBCRC32C=m |
850 | CONFIG_ZLIB_INFLATE=y | 1018 | CONFIG_ZLIB_INFLATE=y |
851 | CONFIG_ZLIB_DEFLATE=m | 1019 | CONFIG_ZLIB_DEFLATE=m |
1020 | CONFIG_LZO_COMPRESS=m | ||
1021 | CONFIG_LZO_DECOMPRESS=m | ||
1022 | CONFIG_TEXTSEARCH=y | ||
1023 | CONFIG_TEXTSEARCH_KMP=m | ||
1024 | CONFIG_TEXTSEARCH_BM=m | ||
1025 | CONFIG_TEXTSEARCH_FSM=m | ||
1026 | CONFIG_PLIST=y | ||
1027 | CONFIG_HAS_IOMEM=y | ||
1028 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index ff9dffa5b860..738bca695a88 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:45 2005 | 4 | # Wed Apr 2 20:46:14 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-mac" | 27 | CONFIG_LOCALVERSION="-mac" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -82,10 +130,24 @@ CONFIG_M68030=y | |||
82 | CONFIG_M68040=y | 130 | CONFIG_M68040=y |
83 | # CONFIG_M68060 is not set | 131 | # CONFIG_M68060 is not set |
84 | CONFIG_MMU_MOTOROLA=y | 132 | CONFIG_MMU_MOTOROLA=y |
85 | CONFIG_M68KFPU_EMU=y | 133 | # CONFIG_M68KFPU_EMU is not set |
86 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
87 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
88 | # CONFIG_ADVANCED is not set | 134 | # CONFIG_ADVANCED is not set |
135 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
136 | CONFIG_NODES_SHIFT=3 | ||
137 | CONFIG_SELECT_MEMORY_MODEL=y | ||
138 | # CONFIG_FLATMEM_MANUAL is not set | ||
139 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
140 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
141 | CONFIG_DISCONTIGMEM=y | ||
142 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
143 | CONFIG_NEED_MULTIPLE_NODES=y | ||
144 | # CONFIG_SPARSEMEM_STATIC is not set | ||
145 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
146 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
147 | # CONFIG_RESOURCES_64BIT is not set | ||
148 | CONFIG_ZONE_DMA_FLAG=1 | ||
149 | CONFIG_BOUNCE=y | ||
150 | CONFIG_VIRT_TO_BUS=y | ||
89 | 151 | ||
90 | # | 152 | # |
91 | # General setup | 153 | # General setup |
@@ -95,171 +157,11 @@ CONFIG_BINFMT_AOUT=m | |||
95 | CONFIG_BINFMT_MISC=m | 157 | CONFIG_BINFMT_MISC=m |
96 | # CONFIG_HEARTBEAT is not set | 158 | # CONFIG_HEARTBEAT is not set |
97 | CONFIG_PROC_HARDWARE=y | 159 | CONFIG_PROC_HARDWARE=y |
160 | CONFIG_ZONE_DMA=y | ||
161 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
98 | 162 | ||
99 | # | 163 | # |
100 | # Device Drivers | 164 | # Networking |
101 | # | ||
102 | |||
103 | # | ||
104 | # Generic Driver Options | ||
105 | # | ||
106 | CONFIG_STANDALONE=y | ||
107 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
108 | CONFIG_FW_LOADER=m | ||
109 | # CONFIG_DEBUG_DRIVER is not set | ||
110 | |||
111 | # | ||
112 | # Memory Technology Devices (MTD) | ||
113 | # | ||
114 | # CONFIG_MTD is not set | ||
115 | |||
116 | # | ||
117 | # Parallel port support | ||
118 | # | ||
119 | # CONFIG_PARPORT is not set | ||
120 | |||
121 | # | ||
122 | # Plug and Play support | ||
123 | # | ||
124 | |||
125 | # | ||
126 | # Block devices | ||
127 | # | ||
128 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
129 | CONFIG_BLK_DEV_LOOP=y | ||
130 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
131 | CONFIG_BLK_DEV_NBD=m | ||
132 | CONFIG_BLK_DEV_RAM=y | ||
133 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
134 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
135 | CONFIG_BLK_DEV_INITRD=y | ||
136 | CONFIG_INITRAMFS_SOURCE="" | ||
137 | CONFIG_CDROM_PKTCDVD=m | ||
138 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
139 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
140 | |||
141 | # | ||
142 | # IO Schedulers | ||
143 | # | ||
144 | CONFIG_IOSCHED_NOOP=y | ||
145 | CONFIG_IOSCHED_AS=y | ||
146 | CONFIG_IOSCHED_DEADLINE=y | ||
147 | CONFIG_IOSCHED_CFQ=y | ||
148 | CONFIG_ATA_OVER_ETH=m | ||
149 | |||
150 | # | ||
151 | # ATA/ATAPI/MFM/RLL support | ||
152 | # | ||
153 | CONFIG_IDE=y | ||
154 | CONFIG_BLK_DEV_IDE=y | ||
155 | |||
156 | # | ||
157 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
158 | # | ||
159 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
160 | CONFIG_BLK_DEV_IDEDISK=y | ||
161 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
162 | CONFIG_BLK_DEV_IDECD=y | ||
163 | CONFIG_BLK_DEV_IDETAPE=m | ||
164 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
165 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
166 | # CONFIG_IDE_TASK_IOCTL is not set | ||
167 | |||
168 | # | ||
169 | # IDE chipset support/bugfixes | ||
170 | # | ||
171 | CONFIG_IDE_GENERIC=y | ||
172 | # CONFIG_IDE_ARM is not set | ||
173 | CONFIG_BLK_DEV_MAC_IDE=y | ||
174 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
175 | # CONFIG_IDEDMA_AUTO is not set | ||
176 | # CONFIG_BLK_DEV_HD is not set | ||
177 | |||
178 | # | ||
179 | # SCSI device support | ||
180 | # | ||
181 | CONFIG_SCSI=y | ||
182 | CONFIG_SCSI_PROC_FS=y | ||
183 | |||
184 | # | ||
185 | # SCSI support type (disk, tape, CD-ROM) | ||
186 | # | ||
187 | CONFIG_BLK_DEV_SD=y | ||
188 | CONFIG_CHR_DEV_ST=m | ||
189 | CONFIG_CHR_DEV_OSST=m | ||
190 | CONFIG_BLK_DEV_SR=y | ||
191 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
192 | CONFIG_CHR_DEV_SG=m | ||
193 | |||
194 | # | ||
195 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
196 | # | ||
197 | # CONFIG_SCSI_MULTI_LUN is not set | ||
198 | CONFIG_SCSI_CONSTANTS=y | ||
199 | # CONFIG_SCSI_LOGGING is not set | ||
200 | |||
201 | # | ||
202 | # SCSI Transport Attributes | ||
203 | # | ||
204 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
205 | # CONFIG_SCSI_FC_ATTRS is not set | ||
206 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
207 | |||
208 | # | ||
209 | # SCSI low-level drivers | ||
210 | # | ||
211 | # CONFIG_SCSI_SATA is not set | ||
212 | # CONFIG_SCSI_DEBUG is not set | ||
213 | CONFIG_MAC_SCSI=y | ||
214 | CONFIG_SCSI_MAC_ESP=y | ||
215 | |||
216 | # | ||
217 | # Multi-device support (RAID and LVM) | ||
218 | # | ||
219 | CONFIG_MD=y | ||
220 | CONFIG_BLK_DEV_MD=m | ||
221 | CONFIG_MD_LINEAR=m | ||
222 | CONFIG_MD_RAID0=m | ||
223 | CONFIG_MD_RAID1=m | ||
224 | # CONFIG_MD_RAID10 is not set | ||
225 | CONFIG_MD_RAID5=m | ||
226 | CONFIG_MD_RAID6=m | ||
227 | CONFIG_MD_MULTIPATH=m | ||
228 | # CONFIG_MD_FAULTY is not set | ||
229 | CONFIG_BLK_DEV_DM=m | ||
230 | CONFIG_DM_CRYPT=m | ||
231 | CONFIG_DM_SNAPSHOT=m | ||
232 | CONFIG_DM_MIRROR=m | ||
233 | CONFIG_DM_ZERO=m | ||
234 | CONFIG_DM_MULTIPATH=m | ||
235 | CONFIG_DM_MULTIPATH_EMC=m | ||
236 | |||
237 | # | ||
238 | # Fusion MPT device support | ||
239 | # | ||
240 | |||
241 | # | ||
242 | # IEEE 1394 (FireWire) support | ||
243 | # | ||
244 | |||
245 | # | ||
246 | # I2O device support | ||
247 | # | ||
248 | |||
249 | # | ||
250 | # Macintosh device drivers | ||
251 | # | ||
252 | CONFIG_ADB=y | ||
253 | CONFIG_ADB_MACII=y | ||
254 | CONFIG_ADB_MACIISI=y | ||
255 | CONFIG_ADB_IOP=y | ||
256 | CONFIG_ADB_PMU68K=y | ||
257 | CONFIG_ADB_CUDA=y | ||
258 | CONFIG_INPUT_ADBHID=y | ||
259 | CONFIG_MAC_EMUMOUSEBTN=y | ||
260 | |||
261 | # | ||
262 | # Networking support | ||
263 | # | 165 | # |
264 | CONFIG_NET=y | 166 | CONFIG_NET=y |
265 | 167 | ||
@@ -269,10 +171,17 @@ CONFIG_NET=y | |||
269 | CONFIG_PACKET=y | 171 | CONFIG_PACKET=y |
270 | # CONFIG_PACKET_MMAP is not set | 172 | # CONFIG_PACKET_MMAP is not set |
271 | CONFIG_UNIX=y | 173 | CONFIG_UNIX=y |
174 | CONFIG_XFRM=y | ||
175 | # CONFIG_XFRM_USER is not set | ||
176 | # CONFIG_XFRM_SUB_POLICY is not set | ||
177 | CONFIG_XFRM_MIGRATE=y | ||
178 | # CONFIG_XFRM_STATISTICS is not set | ||
272 | CONFIG_NET_KEY=y | 179 | CONFIG_NET_KEY=y |
180 | CONFIG_NET_KEY_MIGRATE=y | ||
273 | CONFIG_INET=y | 181 | CONFIG_INET=y |
274 | # CONFIG_IP_MULTICAST is not set | 182 | # CONFIG_IP_MULTICAST is not set |
275 | # CONFIG_IP_ADVANCED_ROUTER is not set | 183 | # CONFIG_IP_ADVANCED_ROUTER is not set |
184 | CONFIG_IP_FIB_HASH=y | ||
276 | # CONFIG_IP_PNP is not set | 185 | # CONFIG_IP_PNP is not set |
277 | CONFIG_NET_IPIP=m | 186 | CONFIG_NET_IPIP=m |
278 | CONFIG_NET_IPGRE=m | 187 | CONFIG_NET_IPGRE=m |
@@ -281,148 +190,202 @@ CONFIG_SYN_COOKIES=y | |||
281 | CONFIG_INET_AH=m | 190 | CONFIG_INET_AH=m |
282 | CONFIG_INET_ESP=m | 191 | CONFIG_INET_ESP=m |
283 | CONFIG_INET_IPCOMP=m | 192 | CONFIG_INET_IPCOMP=m |
193 | CONFIG_INET_XFRM_TUNNEL=m | ||
284 | CONFIG_INET_TUNNEL=m | 194 | CONFIG_INET_TUNNEL=m |
285 | CONFIG_IP_TCPDIAG=m | 195 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
286 | CONFIG_IP_TCPDIAG_IPV6=y | 196 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
287 | 197 | CONFIG_INET_XFRM_MODE_BEET=m | |
288 | # | 198 | CONFIG_INET_LRO=m |
289 | # IP: Virtual Server Configuration | 199 | CONFIG_INET_DIAG=m |
290 | # | 200 | CONFIG_INET_TCP_DIAG=m |
201 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
202 | CONFIG_TCP_CONG_CUBIC=y | ||
203 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
204 | # CONFIG_TCP_MD5SIG is not set | ||
291 | # CONFIG_IP_VS is not set | 205 | # CONFIG_IP_VS is not set |
292 | CONFIG_IPV6=m | 206 | CONFIG_IPV6=m |
293 | CONFIG_IPV6_PRIVACY=y | 207 | CONFIG_IPV6_PRIVACY=y |
208 | CONFIG_IPV6_ROUTER_PREF=y | ||
209 | CONFIG_IPV6_ROUTE_INFO=y | ||
210 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
294 | CONFIG_INET6_AH=m | 211 | CONFIG_INET6_AH=m |
295 | CONFIG_INET6_ESP=m | 212 | CONFIG_INET6_ESP=m |
296 | CONFIG_INET6_IPCOMP=m | 213 | CONFIG_INET6_IPCOMP=m |
214 | # CONFIG_IPV6_MIP6 is not set | ||
215 | CONFIG_INET6_XFRM_TUNNEL=m | ||
297 | CONFIG_INET6_TUNNEL=m | 216 | CONFIG_INET6_TUNNEL=m |
217 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
218 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
219 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
220 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
221 | CONFIG_IPV6_SIT=m | ||
298 | CONFIG_IPV6_TUNNEL=m | 222 | CONFIG_IPV6_TUNNEL=m |
223 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
224 | # CONFIG_NETWORK_SECMARK is not set | ||
299 | CONFIG_NETFILTER=y | 225 | CONFIG_NETFILTER=y |
300 | # CONFIG_NETFILTER_DEBUG is not set | 226 | # CONFIG_NETFILTER_DEBUG is not set |
227 | CONFIG_NETFILTER_ADVANCED=y | ||
228 | |||
229 | # | ||
230 | # Core Netfilter Configuration | ||
231 | # | ||
232 | CONFIG_NETFILTER_NETLINK=m | ||
233 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
234 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
235 | CONFIG_NF_CONNTRACK=m | ||
236 | CONFIG_NF_CT_ACCT=y | ||
237 | CONFIG_NF_CONNTRACK_MARK=y | ||
238 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
239 | CONFIG_NF_CT_PROTO_GRE=m | ||
240 | CONFIG_NF_CT_PROTO_SCTP=m | ||
241 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
242 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
243 | CONFIG_NF_CONNTRACK_FTP=m | ||
244 | CONFIG_NF_CONNTRACK_H323=m | ||
245 | CONFIG_NF_CONNTRACK_IRC=m | ||
246 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
247 | CONFIG_NF_CONNTRACK_PPTP=m | ||
248 | CONFIG_NF_CONNTRACK_SANE=m | ||
249 | CONFIG_NF_CONNTRACK_SIP=m | ||
250 | CONFIG_NF_CONNTRACK_TFTP=m | ||
251 | # CONFIG_NF_CT_NETLINK is not set | ||
252 | CONFIG_NETFILTER_XTABLES=m | ||
253 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
254 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
255 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
264 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
265 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
301 | 293 | ||
302 | # | 294 | # |
303 | # IP: Netfilter Configuration | 295 | # IP: Netfilter Configuration |
304 | # | 296 | # |
305 | CONFIG_IP_NF_CONNTRACK=m | 297 | CONFIG_NF_CONNTRACK_IPV4=m |
306 | # CONFIG_IP_NF_CT_ACCT is not set | 298 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
307 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
308 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
309 | CONFIG_IP_NF_FTP=m | ||
310 | CONFIG_IP_NF_IRC=m | ||
311 | CONFIG_IP_NF_TFTP=m | ||
312 | CONFIG_IP_NF_AMANDA=m | ||
313 | CONFIG_IP_NF_QUEUE=m | 299 | CONFIG_IP_NF_QUEUE=m |
314 | CONFIG_IP_NF_IPTABLES=m | 300 | CONFIG_IP_NF_IPTABLES=m |
315 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
316 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
317 | CONFIG_IP_NF_MATCH_MAC=m | ||
318 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
319 | CONFIG_IP_NF_MATCH_MARK=m | ||
320 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
321 | CONFIG_IP_NF_MATCH_TOS=m | ||
322 | CONFIG_IP_NF_MATCH_RECENT=m | 301 | CONFIG_IP_NF_MATCH_RECENT=m |
323 | CONFIG_IP_NF_MATCH_ECN=m | 302 | CONFIG_IP_NF_MATCH_ECN=m |
324 | CONFIG_IP_NF_MATCH_DSCP=m | 303 | CONFIG_IP_NF_MATCH_AH=m |
325 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
326 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
327 | CONFIG_IP_NF_MATCH_TTL=m | 304 | CONFIG_IP_NF_MATCH_TTL=m |
328 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
329 | CONFIG_IP_NF_MATCH_HELPER=m | ||
330 | CONFIG_IP_NF_MATCH_STATE=m | ||
331 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
332 | CONFIG_IP_NF_MATCH_OWNER=m | ||
333 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 305 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
334 | CONFIG_IP_NF_MATCH_REALM=m | ||
335 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
336 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
337 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
338 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
339 | CONFIG_IP_NF_FILTER=m | 306 | CONFIG_IP_NF_FILTER=m |
340 | CONFIG_IP_NF_TARGET_REJECT=m | 307 | CONFIG_IP_NF_TARGET_REJECT=m |
341 | CONFIG_IP_NF_TARGET_LOG=m | 308 | CONFIG_IP_NF_TARGET_LOG=m |
342 | CONFIG_IP_NF_TARGET_ULOG=m | 309 | CONFIG_IP_NF_TARGET_ULOG=m |
343 | CONFIG_IP_NF_TARGET_TCPMSS=m | 310 | CONFIG_NF_NAT=m |
344 | CONFIG_IP_NF_NAT=m | 311 | CONFIG_NF_NAT_NEEDED=y |
345 | CONFIG_IP_NF_NAT_NEEDED=y | ||
346 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 312 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
347 | CONFIG_IP_NF_TARGET_REDIRECT=m | 313 | CONFIG_IP_NF_TARGET_REDIRECT=m |
348 | CONFIG_IP_NF_TARGET_NETMAP=m | 314 | CONFIG_IP_NF_TARGET_NETMAP=m |
349 | CONFIG_IP_NF_TARGET_SAME=m | 315 | CONFIG_NF_NAT_SNMP_BASIC=m |
350 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 316 | CONFIG_NF_NAT_PROTO_GRE=m |
351 | CONFIG_IP_NF_NAT_IRC=m | 317 | CONFIG_NF_NAT_FTP=m |
352 | CONFIG_IP_NF_NAT_FTP=m | 318 | CONFIG_NF_NAT_IRC=m |
353 | CONFIG_IP_NF_NAT_TFTP=m | 319 | CONFIG_NF_NAT_TFTP=m |
354 | CONFIG_IP_NF_NAT_AMANDA=m | 320 | CONFIG_NF_NAT_AMANDA=m |
321 | CONFIG_NF_NAT_PPTP=m | ||
322 | CONFIG_NF_NAT_H323=m | ||
323 | CONFIG_NF_NAT_SIP=m | ||
355 | CONFIG_IP_NF_MANGLE=m | 324 | CONFIG_IP_NF_MANGLE=m |
356 | CONFIG_IP_NF_TARGET_TOS=m | ||
357 | CONFIG_IP_NF_TARGET_ECN=m | 325 | CONFIG_IP_NF_TARGET_ECN=m |
358 | CONFIG_IP_NF_TARGET_DSCP=m | 326 | CONFIG_IP_NF_TARGET_TTL=m |
359 | CONFIG_IP_NF_TARGET_MARK=m | 327 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
360 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
361 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
362 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
363 | CONFIG_IP_NF_RAW=m | 328 | CONFIG_IP_NF_RAW=m |
364 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
365 | CONFIG_IP_NF_ARPTABLES=m | 329 | CONFIG_IP_NF_ARPTABLES=m |
366 | CONFIG_IP_NF_ARPFILTER=m | 330 | CONFIG_IP_NF_ARPFILTER=m |
367 | CONFIG_IP_NF_ARP_MANGLE=m | 331 | CONFIG_IP_NF_ARP_MANGLE=m |
368 | 332 | ||
369 | # | 333 | # |
370 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 334 | # IPv6: Netfilter Configuration |
371 | # | 335 | # |
336 | CONFIG_NF_CONNTRACK_IPV6=m | ||
372 | CONFIG_IP6_NF_QUEUE=m | 337 | CONFIG_IP6_NF_QUEUE=m |
373 | CONFIG_IP6_NF_IPTABLES=m | 338 | CONFIG_IP6_NF_IPTABLES=m |
374 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
375 | CONFIG_IP6_NF_MATCH_MAC=m | ||
376 | CONFIG_IP6_NF_MATCH_RT=m | 339 | CONFIG_IP6_NF_MATCH_RT=m |
377 | CONFIG_IP6_NF_MATCH_OPTS=m | 340 | CONFIG_IP6_NF_MATCH_OPTS=m |
378 | CONFIG_IP6_NF_MATCH_FRAG=m | 341 | CONFIG_IP6_NF_MATCH_FRAG=m |
379 | CONFIG_IP6_NF_MATCH_HL=m | 342 | CONFIG_IP6_NF_MATCH_HL=m |
380 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
381 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
382 | CONFIG_IP6_NF_MATCH_MARK=m | ||
383 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 343 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
384 | CONFIG_IP6_NF_MATCH_AHESP=m | 344 | CONFIG_IP6_NF_MATCH_AH=m |
385 | CONFIG_IP6_NF_MATCH_LENGTH=m | 345 | CONFIG_IP6_NF_MATCH_MH=m |
386 | CONFIG_IP6_NF_MATCH_EUI64=m | 346 | CONFIG_IP6_NF_MATCH_EUI64=m |
387 | CONFIG_IP6_NF_FILTER=m | 347 | CONFIG_IP6_NF_FILTER=m |
388 | CONFIG_IP6_NF_TARGET_LOG=m | 348 | CONFIG_IP6_NF_TARGET_LOG=m |
349 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
389 | CONFIG_IP6_NF_MANGLE=m | 350 | CONFIG_IP6_NF_MANGLE=m |
390 | CONFIG_IP6_NF_TARGET_MARK=m | 351 | CONFIG_IP6_NF_TARGET_HL=m |
391 | CONFIG_IP6_NF_RAW=m | 352 | CONFIG_IP6_NF_RAW=m |
392 | CONFIG_XFRM=y | 353 | CONFIG_IP_DCCP=m |
393 | CONFIG_XFRM_USER=m | 354 | CONFIG_INET_DCCP_DIAG=m |
355 | CONFIG_IP_DCCP_ACKVEC=y | ||
394 | 356 | ||
395 | # | 357 | # |
396 | # SCTP Configuration (EXPERIMENTAL) | 358 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
397 | # | 359 | # |
360 | CONFIG_IP_DCCP_CCID2=m | ||
361 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
362 | CONFIG_IP_DCCP_CCID3=m | ||
363 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
364 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
365 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
398 | CONFIG_IP_SCTP=m | 366 | CONFIG_IP_SCTP=m |
399 | # CONFIG_SCTP_DBG_MSG is not set | 367 | # CONFIG_SCTP_DBG_MSG is not set |
400 | # CONFIG_SCTP_DBG_OBJCNT is not set | 368 | # CONFIG_SCTP_DBG_OBJCNT is not set |
401 | # CONFIG_SCTP_HMAC_NONE is not set | 369 | # CONFIG_SCTP_HMAC_NONE is not set |
402 | # CONFIG_SCTP_HMAC_SHA1 is not set | 370 | # CONFIG_SCTP_HMAC_SHA1 is not set |
403 | CONFIG_SCTP_HMAC_MD5=y | 371 | CONFIG_SCTP_HMAC_MD5=y |
372 | # CONFIG_TIPC is not set | ||
404 | # CONFIG_ATM is not set | 373 | # CONFIG_ATM is not set |
405 | # CONFIG_BRIDGE is not set | 374 | # CONFIG_BRIDGE is not set |
406 | # CONFIG_VLAN_8021Q is not set | 375 | # CONFIG_VLAN_8021Q is not set |
407 | # CONFIG_DECNET is not set | 376 | # CONFIG_DECNET is not set |
408 | CONFIG_LLC=m | 377 | CONFIG_LLC=m |
409 | # CONFIG_LLC2 is not set | 378 | # CONFIG_LLC2 is not set |
410 | CONFIG_IPX=m | 379 | # CONFIG_IPX is not set |
411 | # CONFIG_IPX_INTERN is not set | ||
412 | CONFIG_ATALK=m | 380 | CONFIG_ATALK=m |
413 | CONFIG_DEV_APPLETALK=y | 381 | CONFIG_DEV_APPLETALK=m |
414 | CONFIG_IPDDP=m | 382 | CONFIG_IPDDP=m |
415 | CONFIG_IPDDP_ENCAP=y | 383 | CONFIG_IPDDP_ENCAP=y |
416 | CONFIG_IPDDP_DECAP=y | 384 | CONFIG_IPDDP_DECAP=y |
417 | # CONFIG_X25 is not set | 385 | # CONFIG_X25 is not set |
418 | # CONFIG_LAPB is not set | 386 | # CONFIG_LAPB is not set |
419 | # CONFIG_NET_DIVERT is not set | ||
420 | # CONFIG_ECONET is not set | 387 | # CONFIG_ECONET is not set |
421 | # CONFIG_WAN_ROUTER is not set | 388 | # CONFIG_WAN_ROUTER is not set |
422 | |||
423 | # | ||
424 | # QoS and/or fair queueing | ||
425 | # | ||
426 | # CONFIG_NET_SCHED is not set | 389 | # CONFIG_NET_SCHED is not set |
427 | CONFIG_NET_CLS_ROUTE=y | 390 | CONFIG_NET_CLS_ROUTE=y |
428 | 391 | ||
@@ -430,80 +393,223 @@ CONFIG_NET_CLS_ROUTE=y | |||
430 | # Network testing | 393 | # Network testing |
431 | # | 394 | # |
432 | # CONFIG_NET_PKTGEN is not set | 395 | # CONFIG_NET_PKTGEN is not set |
433 | CONFIG_NETPOLL=y | ||
434 | # CONFIG_NETPOLL_RX is not set | ||
435 | # CONFIG_NETPOLL_TRAP is not set | ||
436 | CONFIG_NET_POLL_CONTROLLER=y | ||
437 | # CONFIG_HAMRADIO is not set | 396 | # CONFIG_HAMRADIO is not set |
397 | # CONFIG_CAN is not set | ||
438 | # CONFIG_IRDA is not set | 398 | # CONFIG_IRDA is not set |
439 | # CONFIG_BT is not set | 399 | # CONFIG_BT is not set |
440 | CONFIG_NETDEVICES=y | 400 | # CONFIG_AF_RXRPC is not set |
441 | CONFIG_DUMMY=m | ||
442 | # CONFIG_BONDING is not set | ||
443 | CONFIG_EQUALIZER=m | ||
444 | # CONFIG_TUN is not set | ||
445 | 401 | ||
446 | # | 402 | # |
447 | # Ethernet (10 or 100Mbit) | 403 | # Wireless |
448 | # | 404 | # |
449 | CONFIG_NET_ETHERNET=y | 405 | # CONFIG_CFG80211 is not set |
450 | # CONFIG_MII is not set | 406 | CONFIG_WIRELESS_EXT=y |
451 | CONFIG_MAC8390=y | 407 | # CONFIG_MAC80211 is not set |
452 | CONFIG_MAC89x0=y | 408 | CONFIG_IEEE80211=m |
453 | CONFIG_MACSONIC=y | 409 | # CONFIG_IEEE80211_DEBUG is not set |
454 | CONFIG_MACMACE=y | 410 | CONFIG_IEEE80211_CRYPT_WEP=m |
455 | # CONFIG_NET_VENDOR_SMC is not set | 411 | CONFIG_IEEE80211_CRYPT_CCMP=m |
412 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
413 | CONFIG_IEEE80211_SOFTMAC=m | ||
414 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
415 | # CONFIG_RFKILL is not set | ||
416 | # CONFIG_NET_9P is not set | ||
417 | |||
418 | # | ||
419 | # Device Drivers | ||
420 | # | ||
421 | |||
422 | # | ||
423 | # Generic Driver Options | ||
424 | # | ||
425 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
426 | CONFIG_STANDALONE=y | ||
427 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
428 | CONFIG_FW_LOADER=m | ||
429 | # CONFIG_SYS_HYPERVISOR is not set | ||
430 | CONFIG_CONNECTOR=m | ||
431 | # CONFIG_MTD is not set | ||
432 | # CONFIG_PARPORT is not set | ||
433 | CONFIG_BLK_DEV=y | ||
434 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
435 | CONFIG_BLK_DEV_LOOP=y | ||
436 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
437 | CONFIG_BLK_DEV_NBD=m | ||
438 | CONFIG_BLK_DEV_RAM=y | ||
439 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
440 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
441 | # CONFIG_BLK_DEV_XIP is not set | ||
442 | CONFIG_CDROM_PKTCDVD=m | ||
443 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
444 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
445 | CONFIG_ATA_OVER_ETH=m | ||
446 | CONFIG_MISC_DEVICES=y | ||
447 | # CONFIG_EEPROM_93CX6 is not set | ||
448 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
449 | CONFIG_HAVE_IDE=y | ||
450 | CONFIG_IDE=y | ||
451 | CONFIG_BLK_DEV_IDE=y | ||
456 | 452 | ||
457 | # | 453 | # |
458 | # Ethernet (1000 Mbit) | 454 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
455 | # | ||
456 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
457 | CONFIG_BLK_DEV_IDEDISK=y | ||
458 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
459 | CONFIG_BLK_DEV_IDECD=y | ||
460 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
461 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
462 | CONFIG_BLK_DEV_IDEFLOPPY=m | ||
463 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
464 | # CONFIG_IDE_TASK_IOCTL is not set | ||
465 | CONFIG_IDE_PROC_FS=y | ||
466 | |||
467 | # | ||
468 | # IDE chipset support/bugfixes | ||
459 | # | 469 | # |
470 | # CONFIG_IDE_GENERIC is not set | ||
471 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
472 | CONFIG_BLK_DEV_MAC_IDE=y | ||
473 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
474 | # CONFIG_IDE_ARCH_OBSOLETE_INIT is not set | ||
475 | # CONFIG_BLK_DEV_HD is not set | ||
460 | 476 | ||
461 | # | 477 | # |
462 | # Ethernet (10000 Mbit) | 478 | # SCSI device support |
463 | # | 479 | # |
480 | CONFIG_RAID_ATTRS=m | ||
481 | CONFIG_SCSI=y | ||
482 | CONFIG_SCSI_DMA=y | ||
483 | CONFIG_SCSI_TGT=m | ||
484 | # CONFIG_SCSI_NETLINK is not set | ||
485 | CONFIG_SCSI_PROC_FS=y | ||
464 | 486 | ||
465 | # | 487 | # |
466 | # Token Ring devices | 488 | # SCSI support type (disk, tape, CD-ROM) |
467 | # | 489 | # |
490 | CONFIG_BLK_DEV_SD=y | ||
491 | CONFIG_CHR_DEV_ST=m | ||
492 | CONFIG_CHR_DEV_OSST=m | ||
493 | CONFIG_BLK_DEV_SR=y | ||
494 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
495 | CONFIG_CHR_DEV_SG=m | ||
496 | # CONFIG_CHR_DEV_SCH is not set | ||
468 | 497 | ||
469 | # | 498 | # |
470 | # Wireless LAN (non-hamradio) | 499 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
471 | # | 500 | # |
472 | # CONFIG_NET_RADIO is not set | 501 | # CONFIG_SCSI_MULTI_LUN is not set |
502 | CONFIG_SCSI_CONSTANTS=y | ||
503 | # CONFIG_SCSI_LOGGING is not set | ||
504 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
505 | CONFIG_SCSI_WAIT_SCAN=m | ||
473 | 506 | ||
474 | # | 507 | # |
475 | # Wan interfaces | 508 | # SCSI Transports |
476 | # | 509 | # |
510 | CONFIG_SCSI_SPI_ATTRS=y | ||
511 | # CONFIG_SCSI_FC_ATTRS is not set | ||
512 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
513 | CONFIG_SCSI_SAS_ATTRS=m | ||
514 | CONFIG_SCSI_SAS_LIBSAS=m | ||
515 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
516 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
517 | CONFIG_SCSI_SRP_ATTRS=m | ||
518 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
519 | CONFIG_SCSI_LOWLEVEL=y | ||
520 | CONFIG_ISCSI_TCP=m | ||
521 | # CONFIG_SCSI_DEBUG is not set | ||
522 | CONFIG_MAC_SCSI=y | ||
523 | CONFIG_MD=y | ||
524 | CONFIG_BLK_DEV_MD=m | ||
525 | CONFIG_MD_LINEAR=m | ||
526 | CONFIG_MD_RAID0=m | ||
527 | CONFIG_MD_RAID1=m | ||
528 | # CONFIG_MD_RAID10 is not set | ||
529 | CONFIG_MD_RAID456=m | ||
530 | CONFIG_MD_RAID5_RESHAPE=y | ||
531 | CONFIG_MD_MULTIPATH=m | ||
532 | # CONFIG_MD_FAULTY is not set | ||
533 | CONFIG_BLK_DEV_DM=m | ||
534 | # CONFIG_DM_DEBUG is not set | ||
535 | CONFIG_DM_CRYPT=m | ||
536 | CONFIG_DM_SNAPSHOT=m | ||
537 | CONFIG_DM_MIRROR=m | ||
538 | CONFIG_DM_ZERO=m | ||
539 | CONFIG_DM_MULTIPATH=m | ||
540 | CONFIG_DM_MULTIPATH_EMC=m | ||
541 | CONFIG_DM_MULTIPATH_RDAC=m | ||
542 | CONFIG_DM_MULTIPATH_HP=m | ||
543 | # CONFIG_DM_DELAY is not set | ||
544 | CONFIG_DM_UEVENT=y | ||
545 | CONFIG_MACINTOSH_DRIVERS=y | ||
546 | CONFIG_ADB=y | ||
547 | CONFIG_ADB_MACII=y | ||
548 | CONFIG_ADB_MACIISI=y | ||
549 | CONFIG_ADB_IOP=y | ||
550 | CONFIG_ADB_PMU68K=y | ||
551 | CONFIG_ADB_CUDA=y | ||
552 | CONFIG_INPUT_ADBHID=y | ||
553 | CONFIG_MAC_EMUMOUSEBTN=y | ||
554 | CONFIG_NETDEVICES=y | ||
555 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
556 | CONFIG_DUMMY=m | ||
557 | # CONFIG_BONDING is not set | ||
558 | CONFIG_MACVLAN=m | ||
559 | CONFIG_EQUALIZER=m | ||
560 | # CONFIG_TUN is not set | ||
561 | CONFIG_VETH=m | ||
562 | # CONFIG_PHYLIB is not set | ||
563 | CONFIG_NET_ETHERNET=y | ||
564 | # CONFIG_MII is not set | ||
565 | CONFIG_MAC8390=y | ||
566 | CONFIG_MAC89x0=m | ||
567 | CONFIG_MACSONIC=m | ||
568 | CONFIG_MACMACE=y | ||
569 | # CONFIG_NET_VENDOR_SMC is not set | ||
570 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
571 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
572 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
573 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
574 | # CONFIG_B44 is not set | ||
575 | # CONFIG_NETDEV_1000 is not set | ||
576 | # CONFIG_NETDEV_10000 is not set | ||
577 | |||
578 | # | ||
579 | # Wireless LAN | ||
580 | # | ||
581 | # CONFIG_WLAN_PRE80211 is not set | ||
582 | # CONFIG_WLAN_80211 is not set | ||
477 | # CONFIG_WAN is not set | 583 | # CONFIG_WAN is not set |
478 | CONFIG_PPP=m | 584 | CONFIG_PPP=m |
479 | # CONFIG_PPP_MULTILINK is not set | 585 | # CONFIG_PPP_MULTILINK is not set |
480 | CONFIG_PPP_FILTER=y | 586 | CONFIG_PPP_FILTER=y |
481 | # CONFIG_PPP_ASYNC is not set | 587 | CONFIG_PPP_ASYNC=m |
482 | # CONFIG_PPP_SYNC_TTY is not set | 588 | CONFIG_PPP_SYNC_TTY=m |
483 | CONFIG_PPP_DEFLATE=m | 589 | CONFIG_PPP_DEFLATE=m |
484 | CONFIG_PPP_BSDCOMP=m | 590 | CONFIG_PPP_BSDCOMP=m |
591 | CONFIG_PPP_MPPE=m | ||
485 | CONFIG_PPPOE=m | 592 | CONFIG_PPPOE=m |
593 | CONFIG_PPPOL2TP=m | ||
486 | CONFIG_SLIP=m | 594 | CONFIG_SLIP=m |
487 | CONFIG_SLIP_COMPRESSED=y | 595 | CONFIG_SLIP_COMPRESSED=y |
596 | CONFIG_SLHC=m | ||
488 | CONFIG_SLIP_SMART=y | 597 | CONFIG_SLIP_SMART=y |
489 | CONFIG_SLIP_MODE_SLIP6=y | 598 | CONFIG_SLIP_MODE_SLIP6=y |
490 | CONFIG_SHAPER=m | ||
491 | CONFIG_NETCONSOLE=m | 599 | CONFIG_NETCONSOLE=m |
492 | 600 | CONFIG_NETCONSOLE_DYNAMIC=y | |
493 | # | 601 | CONFIG_NETPOLL=y |
494 | # ISDN subsystem | 602 | # CONFIG_NETPOLL_TRAP is not set |
495 | # | 603 | CONFIG_NET_POLL_CONTROLLER=y |
496 | # CONFIG_ISDN is not set | 604 | # CONFIG_ISDN is not set |
497 | |||
498 | # | ||
499 | # Telephony Support | ||
500 | # | ||
501 | # CONFIG_PHONE is not set | 605 | # CONFIG_PHONE is not set |
502 | 606 | ||
503 | # | 607 | # |
504 | # Input device support | 608 | # Input device support |
505 | # | 609 | # |
506 | CONFIG_INPUT=y | 610 | CONFIG_INPUT=y |
611 | CONFIG_INPUT_FF_MEMLESS=m | ||
612 | # CONFIG_INPUT_POLLDEV is not set | ||
507 | 613 | ||
508 | # | 614 | # |
509 | # Userland interfaces | 615 | # Userland interfaces |
@@ -513,7 +619,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
513 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 619 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
514 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 620 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
515 | # CONFIG_INPUT_JOYDEV is not set | 621 | # CONFIG_INPUT_JOYDEV is not set |
516 | # CONFIG_INPUT_TSDEV is not set | ||
517 | # CONFIG_INPUT_EVDEV is not set | 622 | # CONFIG_INPUT_EVDEV is not set |
518 | # CONFIG_INPUT_EVBUG is not set | 623 | # CONFIG_INPUT_EVBUG is not set |
519 | 624 | ||
@@ -526,19 +631,29 @@ CONFIG_INPUT_KEYBOARD=y | |||
526 | # CONFIG_KEYBOARD_LKKBD is not set | 631 | # CONFIG_KEYBOARD_LKKBD is not set |
527 | # CONFIG_KEYBOARD_XTKBD is not set | 632 | # CONFIG_KEYBOARD_XTKBD is not set |
528 | # CONFIG_KEYBOARD_NEWTON is not set | 633 | # CONFIG_KEYBOARD_NEWTON is not set |
634 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
529 | CONFIG_INPUT_MOUSE=y | 635 | CONFIG_INPUT_MOUSE=y |
530 | CONFIG_MOUSE_PS2=m | 636 | CONFIG_MOUSE_PS2=m |
637 | CONFIG_MOUSE_PS2_ALPS=y | ||
638 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
639 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
640 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
641 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
642 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
531 | CONFIG_MOUSE_SERIAL=m | 643 | CONFIG_MOUSE_SERIAL=m |
532 | # CONFIG_MOUSE_VSXXXAA is not set | 644 | # CONFIG_MOUSE_VSXXXAA is not set |
533 | # CONFIG_INPUT_JOYSTICK is not set | 645 | # CONFIG_INPUT_JOYSTICK is not set |
646 | # CONFIG_INPUT_TABLET is not set | ||
534 | # CONFIG_INPUT_TOUCHSCREEN is not set | 647 | # CONFIG_INPUT_TOUCHSCREEN is not set |
535 | # CONFIG_INPUT_MISC is not set | 648 | CONFIG_INPUT_MISC=y |
649 | CONFIG_INPUT_M68K_BEEP=m | ||
650 | # CONFIG_INPUT_UINPUT is not set | ||
536 | 651 | ||
537 | # | 652 | # |
538 | # Hardware I/O ports | 653 | # Hardware I/O ports |
539 | # | 654 | # |
540 | CONFIG_SERIO=m | 655 | CONFIG_SERIO=m |
541 | CONFIG_SERIO_SERPORT=m | 656 | # CONFIG_SERIO_SERPORT is not set |
542 | CONFIG_SERIO_LIBPS2=m | 657 | CONFIG_SERIO_LIBPS2=m |
543 | # CONFIG_SERIO_RAW is not set | 658 | # CONFIG_SERIO_RAW is not set |
544 | # CONFIG_GAMEPORT is not set | 659 | # CONFIG_GAMEPORT is not set |
@@ -549,6 +664,7 @@ CONFIG_SERIO_LIBPS2=m | |||
549 | CONFIG_VT=y | 664 | CONFIG_VT=y |
550 | CONFIG_VT_CONSOLE=y | 665 | CONFIG_VT_CONSOLE=y |
551 | CONFIG_HW_CONSOLE=y | 666 | CONFIG_HW_CONSOLE=y |
667 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
552 | # CONFIG_SERIAL_NONSTANDARD is not set | 668 | # CONFIG_SERIAL_NONSTANDARD is not set |
553 | 669 | ||
554 | # | 670 | # |
@@ -562,116 +678,117 @@ CONFIG_HW_CONSOLE=y | |||
562 | CONFIG_UNIX98_PTYS=y | 678 | CONFIG_UNIX98_PTYS=y |
563 | CONFIG_LEGACY_PTYS=y | 679 | CONFIG_LEGACY_PTYS=y |
564 | CONFIG_LEGACY_PTY_COUNT=256 | 680 | CONFIG_LEGACY_PTY_COUNT=256 |
565 | |||
566 | # | ||
567 | # IPMI | ||
568 | # | ||
569 | # CONFIG_IPMI_HANDLER is not set | 681 | # CONFIG_IPMI_HANDLER is not set |
570 | 682 | # CONFIG_HW_RANDOM is not set | |
571 | # | ||
572 | # Watchdog Cards | ||
573 | # | ||
574 | # CONFIG_WATCHDOG is not set | ||
575 | CONFIG_GEN_RTC=m | 683 | CONFIG_GEN_RTC=m |
576 | CONFIG_GEN_RTC_X=y | 684 | CONFIG_GEN_RTC_X=y |
577 | # CONFIG_DTLK is not set | ||
578 | # CONFIG_R3964 is not set | 685 | # CONFIG_R3964 is not set |
579 | |||
580 | # | ||
581 | # Ftape, the floppy tape device driver | ||
582 | # | ||
583 | # CONFIG_DRM is not set | ||
584 | # CONFIG_RAW_DRIVER is not set | 686 | # CONFIG_RAW_DRIVER is not set |
585 | 687 | # CONFIG_TCG_TPM is not set | |
586 | # | ||
587 | # TPM devices | ||
588 | # | ||
589 | |||
590 | # | ||
591 | # I2C support | ||
592 | # | ||
593 | # CONFIG_I2C is not set | 688 | # CONFIG_I2C is not set |
594 | 689 | ||
595 | # | 690 | # |
596 | # Dallas's 1-wire bus | 691 | # SPI support |
597 | # | 692 | # |
693 | # CONFIG_SPI is not set | ||
694 | # CONFIG_SPI_MASTER is not set | ||
598 | # CONFIG_W1 is not set | 695 | # CONFIG_W1 is not set |
696 | # CONFIG_POWER_SUPPLY is not set | ||
697 | # CONFIG_HWMON is not set | ||
698 | # CONFIG_THERMAL is not set | ||
699 | # CONFIG_WATCHDOG is not set | ||
599 | 700 | ||
600 | # | 701 | # |
601 | # Misc devices | 702 | # Sonics Silicon Backplane |
602 | # | 703 | # |
704 | CONFIG_SSB_POSSIBLE=y | ||
705 | # CONFIG_SSB is not set | ||
603 | 706 | ||
604 | # | 707 | # |
605 | # Multimedia devices | 708 | # Multifunction device drivers |
606 | # | 709 | # |
607 | # CONFIG_VIDEO_DEV is not set | 710 | # CONFIG_MFD_SM501 is not set |
608 | 711 | ||
609 | # | 712 | # |
610 | # Digital Video Broadcasting Devices | 713 | # Multimedia devices |
611 | # | 714 | # |
612 | # CONFIG_DVB is not set | 715 | # CONFIG_VIDEO_DEV is not set |
716 | # CONFIG_DVB_CORE is not set | ||
717 | # CONFIG_DAB is not set | ||
613 | 718 | ||
614 | # | 719 | # |
615 | # Graphics support | 720 | # Graphics support |
616 | # | 721 | # |
722 | # CONFIG_VGASTATE is not set | ||
723 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
617 | CONFIG_FB=y | 724 | CONFIG_FB=y |
725 | # CONFIG_FIRMWARE_EDID is not set | ||
726 | # CONFIG_FB_DDC is not set | ||
618 | CONFIG_FB_CFB_FILLRECT=y | 727 | CONFIG_FB_CFB_FILLRECT=y |
619 | CONFIG_FB_CFB_COPYAREA=y | 728 | CONFIG_FB_CFB_COPYAREA=y |
620 | CONFIG_FB_CFB_IMAGEBLIT=y | 729 | CONFIG_FB_CFB_IMAGEBLIT=y |
621 | CONFIG_FB_SOFT_CURSOR=y | 730 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
731 | # CONFIG_FB_SYS_FILLRECT is not set | ||
732 | # CONFIG_FB_SYS_COPYAREA is not set | ||
733 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
734 | # CONFIG_FB_SYS_FOPS is not set | ||
735 | CONFIG_FB_DEFERRED_IO=y | ||
736 | # CONFIG_FB_SVGALIB is not set | ||
622 | CONFIG_FB_MACMODES=y | 737 | CONFIG_FB_MACMODES=y |
623 | CONFIG_FB_MODE_HELPERS=y | 738 | # CONFIG_FB_BACKLIGHT is not set |
739 | # CONFIG_FB_MODE_HELPERS is not set | ||
624 | # CONFIG_FB_TILEBLITTING is not set | 740 | # CONFIG_FB_TILEBLITTING is not set |
741 | |||
742 | # | ||
743 | # Frame buffer hardware drivers | ||
744 | # | ||
625 | CONFIG_FB_VALKYRIE=y | 745 | CONFIG_FB_VALKYRIE=y |
626 | CONFIG_FB_MAC=y | 746 | CONFIG_FB_MAC=y |
747 | # CONFIG_FB_UVESA is not set | ||
627 | # CONFIG_FB_S1D13XXX is not set | 748 | # CONFIG_FB_S1D13XXX is not set |
628 | # CONFIG_FB_VIRTUAL is not set | 749 | # CONFIG_FB_VIRTUAL is not set |
750 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
751 | |||
752 | # | ||
753 | # Display device support | ||
754 | # | ||
755 | # CONFIG_DISPLAY_SUPPORT is not set | ||
629 | 756 | ||
630 | # | 757 | # |
631 | # Console display driver support | 758 | # Console display driver support |
632 | # | 759 | # |
633 | CONFIG_DUMMY_CONSOLE=y | 760 | CONFIG_DUMMY_CONSOLE=y |
634 | CONFIG_FRAMEBUFFER_CONSOLE=y | 761 | CONFIG_FRAMEBUFFER_CONSOLE=y |
762 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
763 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
635 | # CONFIG_FONTS is not set | 764 | # CONFIG_FONTS is not set |
636 | CONFIG_FONT_8x8=y | 765 | CONFIG_FONT_8x8=y |
637 | CONFIG_FONT_8x16=y | 766 | CONFIG_FONT_8x16=y |
638 | CONFIG_FONT_6x11=y | 767 | CONFIG_FONT_6x11=y |
639 | |||
640 | # | ||
641 | # Logo configuration | ||
642 | # | ||
643 | CONFIG_LOGO=y | 768 | CONFIG_LOGO=y |
644 | CONFIG_LOGO_LINUX_MONO=y | 769 | CONFIG_LOGO_LINUX_MONO=y |
645 | CONFIG_LOGO_LINUX_VGA16=y | 770 | CONFIG_LOGO_LINUX_VGA16=y |
646 | CONFIG_LOGO_LINUX_CLUT224=y | 771 | CONFIG_LOGO_LINUX_CLUT224=y |
647 | CONFIG_LOGO_MAC_CLUT224=y | 772 | CONFIG_LOGO_MAC_CLUT224=y |
648 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
649 | 773 | ||
650 | # | 774 | # |
651 | # Sound | 775 | # Sound |
652 | # | 776 | # |
653 | # CONFIG_SOUND is not set | 777 | # CONFIG_SOUND is not set |
654 | 778 | CONFIG_HID_SUPPORT=y | |
655 | # | 779 | CONFIG_HID=m |
656 | # USB support | 780 | # CONFIG_HID_DEBUG is not set |
657 | # | 781 | CONFIG_HIDRAW=y |
658 | # CONFIG_USB_ARCH_HAS_HCD is not set | 782 | # CONFIG_USB_SUPPORT is not set |
659 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
660 | |||
661 | # | ||
662 | # USB Gadget Support | ||
663 | # | ||
664 | # CONFIG_USB_GADGET is not set | ||
665 | |||
666 | # | ||
667 | # MMC/SD Card support | ||
668 | # | ||
669 | # CONFIG_MMC is not set | 783 | # CONFIG_MMC is not set |
784 | # CONFIG_MEMSTICK is not set | ||
785 | # CONFIG_NEW_LEDS is not set | ||
786 | # CONFIG_RTC_CLASS is not set | ||
670 | 787 | ||
671 | # | 788 | # |
672 | # InfiniBand support | 789 | # Userspace I/O |
673 | # | 790 | # |
674 | # CONFIG_INFINIBAND is not set | 791 | # CONFIG_UIO is not set |
675 | 792 | ||
676 | # | 793 | # |
677 | # Character devices | 794 | # Character devices |
@@ -685,10 +802,11 @@ CONFIG_SERIAL_CONSOLE=y | |||
685 | # | 802 | # |
686 | CONFIG_EXT2_FS=y | 803 | CONFIG_EXT2_FS=y |
687 | # CONFIG_EXT2_FS_XATTR is not set | 804 | # CONFIG_EXT2_FS_XATTR is not set |
805 | # CONFIG_EXT2_FS_XIP is not set | ||
688 | CONFIG_EXT3_FS=y | 806 | CONFIG_EXT3_FS=y |
689 | # CONFIG_EXT3_FS_XATTR is not set | 807 | # CONFIG_EXT3_FS_XATTR is not set |
808 | # CONFIG_EXT4DEV_FS is not set | ||
690 | CONFIG_JBD=y | 809 | CONFIG_JBD=y |
691 | # CONFIG_JBD_DEBUG is not set | ||
692 | CONFIG_REISERFS_FS=m | 810 | CONFIG_REISERFS_FS=m |
693 | # CONFIG_REISERFS_CHECK is not set | 811 | # CONFIG_REISERFS_CHECK is not set |
694 | # CONFIG_REISERFS_PROC_INFO is not set | 812 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -699,25 +817,29 @@ CONFIG_JFS_FS=m | |||
699 | # CONFIG_JFS_DEBUG is not set | 817 | # CONFIG_JFS_DEBUG is not set |
700 | # CONFIG_JFS_STATISTICS is not set | 818 | # CONFIG_JFS_STATISTICS is not set |
701 | CONFIG_FS_POSIX_ACL=y | 819 | CONFIG_FS_POSIX_ACL=y |
702 | |||
703 | # | ||
704 | # XFS support | ||
705 | # | ||
706 | CONFIG_XFS_FS=m | 820 | CONFIG_XFS_FS=m |
707 | CONFIG_XFS_EXPORT=y | ||
708 | # CONFIG_XFS_RT is not set | ||
709 | # CONFIG_XFS_QUOTA is not set | 821 | # CONFIG_XFS_QUOTA is not set |
710 | # CONFIG_XFS_SECURITY is not set | 822 | # CONFIG_XFS_SECURITY is not set |
711 | # CONFIG_XFS_POSIX_ACL is not set | 823 | # CONFIG_XFS_POSIX_ACL is not set |
712 | CONFIG_MINIX_FS=y | 824 | # CONFIG_XFS_RT is not set |
713 | # CONFIG_ROMFS_FS is not set | 825 | CONFIG_GFS2_FS=m |
826 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
827 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
828 | CONFIG_OCFS2_FS=m | ||
829 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
830 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
831 | CONFIG_DNOTIFY=y | ||
832 | CONFIG_INOTIFY=y | ||
833 | CONFIG_INOTIFY_USER=y | ||
714 | CONFIG_QUOTA=y | 834 | CONFIG_QUOTA=y |
835 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
836 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
715 | # CONFIG_QFMT_V1 is not set | 837 | # CONFIG_QFMT_V1 is not set |
716 | # CONFIG_QFMT_V2 is not set | 838 | # CONFIG_QFMT_V2 is not set |
717 | CONFIG_QUOTACTL=y | 839 | CONFIG_QUOTACTL=y |
718 | CONFIG_DNOTIFY=y | ||
719 | CONFIG_AUTOFS_FS=m | 840 | CONFIG_AUTOFS_FS=m |
720 | CONFIG_AUTOFS4_FS=m | 841 | CONFIG_AUTOFS4_FS=m |
842 | CONFIG_FUSE_FS=m | ||
721 | 843 | ||
722 | # | 844 | # |
723 | # CD-ROM/DVD Filesystems | 845 | # CD-ROM/DVD Filesystems |
@@ -725,7 +847,6 @@ CONFIG_AUTOFS4_FS=m | |||
725 | CONFIG_ISO9660_FS=y | 847 | CONFIG_ISO9660_FS=y |
726 | CONFIG_JOLIET=y | 848 | CONFIG_JOLIET=y |
727 | CONFIG_ZISOFS=y | 849 | CONFIG_ZISOFS=y |
728 | CONFIG_ZISOFS_FS=y | ||
729 | CONFIG_UDF_FS=m | 850 | CONFIG_UDF_FS=m |
730 | CONFIG_UDF_NLS=y | 851 | CONFIG_UDF_NLS=y |
731 | 852 | ||
@@ -744,13 +865,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
744 | # | 865 | # |
745 | CONFIG_PROC_FS=y | 866 | CONFIG_PROC_FS=y |
746 | CONFIG_PROC_KCORE=y | 867 | CONFIG_PROC_KCORE=y |
868 | CONFIG_PROC_SYSCTL=y | ||
747 | CONFIG_SYSFS=y | 869 | CONFIG_SYSFS=y |
748 | # CONFIG_DEVFS_FS is not set | ||
749 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
750 | CONFIG_TMPFS=y | 870 | CONFIG_TMPFS=y |
751 | # CONFIG_TMPFS_XATTR is not set | 871 | # CONFIG_TMPFS_POSIX_ACL is not set |
752 | # CONFIG_HUGETLB_PAGE is not set | 872 | # CONFIG_HUGETLB_PAGE is not set |
753 | CONFIG_RAMFS=y | 873 | CONFIG_CONFIGFS_FS=m |
754 | 874 | ||
755 | # | 875 | # |
756 | # Miscellaneous filesystems | 876 | # Miscellaneous filesystems |
@@ -764,43 +884,39 @@ CONFIG_HFSPLUS_FS=y | |||
764 | # CONFIG_EFS_FS is not set | 884 | # CONFIG_EFS_FS is not set |
765 | CONFIG_CRAMFS=m | 885 | CONFIG_CRAMFS=m |
766 | # CONFIG_VXFS_FS is not set | 886 | # CONFIG_VXFS_FS is not set |
887 | CONFIG_MINIX_FS=y | ||
767 | CONFIG_HPFS_FS=m | 888 | CONFIG_HPFS_FS=m |
768 | # CONFIG_QNX4FS_FS is not set | 889 | # CONFIG_QNX4FS_FS is not set |
890 | # CONFIG_ROMFS_FS is not set | ||
769 | CONFIG_SYSV_FS=m | 891 | CONFIG_SYSV_FS=m |
770 | CONFIG_UFS_FS=m | 892 | CONFIG_UFS_FS=m |
771 | # CONFIG_UFS_FS_WRITE is not set | 893 | # CONFIG_UFS_FS_WRITE is not set |
772 | 894 | # CONFIG_UFS_DEBUG is not set | |
773 | # | 895 | CONFIG_NETWORK_FILESYSTEMS=y |
774 | # Network File Systems | ||
775 | # | ||
776 | CONFIG_NFS_FS=m | 896 | CONFIG_NFS_FS=m |
777 | CONFIG_NFS_V3=y | 897 | CONFIG_NFS_V3=y |
898 | # CONFIG_NFS_V3_ACL is not set | ||
778 | CONFIG_NFS_V4=y | 899 | CONFIG_NFS_V4=y |
779 | # CONFIG_NFS_DIRECTIO is not set | 900 | # CONFIG_NFS_DIRECTIO is not set |
780 | CONFIG_NFSD=m | 901 | CONFIG_NFSD=m |
781 | CONFIG_NFSD_V3=y | 902 | CONFIG_NFSD_V3=y |
782 | CONFIG_NFSD_V4=y | 903 | # CONFIG_NFSD_V3_ACL is not set |
904 | # CONFIG_NFSD_V4 is not set | ||
783 | CONFIG_NFSD_TCP=y | 905 | CONFIG_NFSD_TCP=y |
784 | CONFIG_LOCKD=m | 906 | CONFIG_LOCKD=m |
785 | CONFIG_LOCKD_V4=y | 907 | CONFIG_LOCKD_V4=y |
786 | CONFIG_EXPORTFS=m | 908 | CONFIG_EXPORTFS=m |
909 | CONFIG_NFS_COMMON=y | ||
787 | CONFIG_SUNRPC=m | 910 | CONFIG_SUNRPC=m |
788 | CONFIG_SUNRPC_GSS=m | 911 | CONFIG_SUNRPC_GSS=m |
912 | CONFIG_SUNRPC_BIND34=y | ||
789 | CONFIG_RPCSEC_GSS_KRB5=m | 913 | CONFIG_RPCSEC_GSS_KRB5=m |
790 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 914 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
791 | CONFIG_SMB_FS=m | 915 | CONFIG_SMB_FS=m |
792 | CONFIG_SMB_NLS_DEFAULT=y | 916 | CONFIG_SMB_NLS_DEFAULT=y |
793 | CONFIG_SMB_NLS_REMOTE="cp437" | 917 | CONFIG_SMB_NLS_REMOTE="cp437" |
794 | # CONFIG_CIFS is not set | 918 | # CONFIG_CIFS is not set |
795 | CONFIG_NCP_FS=m | 919 | # CONFIG_NCP_FS is not set |
796 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
797 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
798 | # CONFIG_NCPFS_STRONG is not set | ||
799 | CONFIG_NCPFS_NFS_NS=y | ||
800 | CONFIG_NCPFS_OS2_NS=y | ||
801 | # CONFIG_NCPFS_SMALLDOS is not set | ||
802 | CONFIG_NCPFS_NLS=y | ||
803 | # CONFIG_NCPFS_EXTRAS is not set | ||
804 | CONFIG_CODA_FS=m | 920 | CONFIG_CODA_FS=m |
805 | # CONFIG_CODA_FS_OLD_API is not set | 921 | # CONFIG_CODA_FS_OLD_API is not set |
806 | # CONFIG_AFS_FS is not set | 922 | # CONFIG_AFS_FS is not set |
@@ -808,27 +924,9 @@ CONFIG_CODA_FS=m | |||
808 | # | 924 | # |
809 | # Partition Types | 925 | # Partition Types |
810 | # | 926 | # |
811 | CONFIG_PARTITION_ADVANCED=y | 927 | # CONFIG_PARTITION_ADVANCED is not set |
812 | # CONFIG_ACORN_PARTITION is not set | ||
813 | # CONFIG_OSF_PARTITION is not set | ||
814 | CONFIG_AMIGA_PARTITION=y | ||
815 | CONFIG_ATARI_PARTITION=y | ||
816 | CONFIG_MAC_PARTITION=y | 928 | CONFIG_MAC_PARTITION=y |
817 | CONFIG_MSDOS_PARTITION=y | 929 | CONFIG_MSDOS_PARTITION=y |
818 | CONFIG_BSD_DISKLABEL=y | ||
819 | CONFIG_MINIX_SUBPARTITION=y | ||
820 | CONFIG_SOLARIS_X86_PARTITION=y | ||
821 | CONFIG_UNIXWARE_DISKLABEL=y | ||
822 | CONFIG_LDM_PARTITION=y | ||
823 | CONFIG_LDM_DEBUG=y | ||
824 | # CONFIG_SGI_PARTITION is not set | ||
825 | # CONFIG_ULTRIX_PARTITION is not set | ||
826 | CONFIG_SUN_PARTITION=y | ||
827 | # CONFIG_EFI_PARTITION is not set | ||
828 | |||
829 | # | ||
830 | # Native Language Support | ||
831 | # | ||
832 | CONFIG_NLS=y | 930 | CONFIG_NLS=y |
833 | CONFIG_NLS_DEFAULT="iso8859-1" | 931 | CONFIG_NLS_DEFAULT="iso8859-1" |
834 | CONFIG_NLS_CODEPAGE_437=y | 932 | CONFIG_NLS_CODEPAGE_437=y |
@@ -869,46 +967,65 @@ CONFIG_NLS_ISO8859_15=m | |||
869 | CONFIG_NLS_KOI8_R=m | 967 | CONFIG_NLS_KOI8_R=m |
870 | CONFIG_NLS_KOI8_U=m | 968 | CONFIG_NLS_KOI8_U=m |
871 | CONFIG_NLS_UTF8=y | 969 | CONFIG_NLS_UTF8=y |
970 | CONFIG_DLM=m | ||
971 | # CONFIG_DLM_DEBUG is not set | ||
872 | 972 | ||
873 | # | 973 | # |
874 | # Kernel hacking | 974 | # Kernel hacking |
875 | # | 975 | # |
876 | # CONFIG_PRINTK_TIME is not set | 976 | # CONFIG_PRINTK_TIME is not set |
877 | CONFIG_DEBUG_KERNEL=y | 977 | CONFIG_ENABLE_WARN_DEPRECATED=y |
978 | CONFIG_ENABLE_MUST_CHECK=y | ||
878 | CONFIG_MAGIC_SYSRQ=y | 979 | CONFIG_MAGIC_SYSRQ=y |
879 | CONFIG_LOG_BUF_SHIFT=16 | 980 | # CONFIG_UNUSED_SYMBOLS is not set |
880 | # CONFIG_SCHEDSTATS is not set | ||
881 | # CONFIG_DEBUG_SLAB is not set | ||
882 | # CONFIG_DEBUG_SPINLOCK is not set | ||
883 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
884 | # CONFIG_DEBUG_KOBJECT is not set | ||
885 | CONFIG_DEBUG_BUGVERBOSE=y | ||
886 | # CONFIG_DEBUG_INFO is not set | ||
887 | # CONFIG_DEBUG_FS is not set | 981 | # CONFIG_DEBUG_FS is not set |
888 | # CONFIG_FRAME_POINTER is not set | 982 | # CONFIG_HEADERS_CHECK is not set |
983 | # CONFIG_DEBUG_KERNEL is not set | ||
984 | CONFIG_DEBUG_BUGVERBOSE=y | ||
985 | # CONFIG_SAMPLES is not set | ||
889 | 986 | ||
890 | # | 987 | # |
891 | # Security options | 988 | # Security options |
892 | # | 989 | # |
893 | # CONFIG_KEYS is not set | 990 | # CONFIG_KEYS is not set |
894 | # CONFIG_SECURITY is not set | 991 | # CONFIG_SECURITY is not set |
895 | 992 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
896 | # | 993 | CONFIG_XOR_BLOCKS=m |
897 | # Cryptographic options | 994 | CONFIG_ASYNC_CORE=m |
898 | # | 995 | CONFIG_ASYNC_MEMCPY=m |
996 | CONFIG_ASYNC_XOR=m | ||
899 | CONFIG_CRYPTO=y | 997 | CONFIG_CRYPTO=y |
998 | CONFIG_CRYPTO_ALGAPI=y | ||
999 | CONFIG_CRYPTO_AEAD=m | ||
1000 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1001 | CONFIG_CRYPTO_SEQIV=m | ||
1002 | CONFIG_CRYPTO_HASH=y | ||
1003 | CONFIG_CRYPTO_MANAGER=y | ||
900 | CONFIG_CRYPTO_HMAC=y | 1004 | CONFIG_CRYPTO_HMAC=y |
1005 | CONFIG_CRYPTO_XCBC=m | ||
901 | CONFIG_CRYPTO_NULL=m | 1006 | CONFIG_CRYPTO_NULL=m |
902 | CONFIG_CRYPTO_MD4=m | 1007 | CONFIG_CRYPTO_MD4=m |
903 | CONFIG_CRYPTO_MD5=y | 1008 | CONFIG_CRYPTO_MD5=m |
904 | CONFIG_CRYPTO_SHA1=m | 1009 | CONFIG_CRYPTO_SHA1=m |
905 | CONFIG_CRYPTO_SHA256=m | 1010 | CONFIG_CRYPTO_SHA256=m |
906 | CONFIG_CRYPTO_SHA512=m | 1011 | CONFIG_CRYPTO_SHA512=m |
907 | CONFIG_CRYPTO_WP512=m | 1012 | CONFIG_CRYPTO_WP512=m |
908 | CONFIG_CRYPTO_TGR192=m | 1013 | CONFIG_CRYPTO_TGR192=m |
1014 | CONFIG_CRYPTO_GF128MUL=m | ||
1015 | CONFIG_CRYPTO_ECB=m | ||
1016 | CONFIG_CRYPTO_CBC=m | ||
1017 | CONFIG_CRYPTO_PCBC=m | ||
1018 | CONFIG_CRYPTO_LRW=m | ||
1019 | CONFIG_CRYPTO_XTS=m | ||
1020 | CONFIG_CRYPTO_CTR=m | ||
1021 | CONFIG_CRYPTO_GCM=m | ||
1022 | CONFIG_CRYPTO_CCM=m | ||
1023 | CONFIG_CRYPTO_CRYPTD=m | ||
909 | CONFIG_CRYPTO_DES=m | 1024 | CONFIG_CRYPTO_DES=m |
1025 | CONFIG_CRYPTO_FCRYPT=m | ||
910 | CONFIG_CRYPTO_BLOWFISH=m | 1026 | CONFIG_CRYPTO_BLOWFISH=m |
911 | CONFIG_CRYPTO_TWOFISH=m | 1027 | CONFIG_CRYPTO_TWOFISH=m |
1028 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
912 | CONFIG_CRYPTO_SERPENT=m | 1029 | CONFIG_CRYPTO_SERPENT=m |
913 | CONFIG_CRYPTO_AES=m | 1030 | CONFIG_CRYPTO_AES=m |
914 | CONFIG_CRYPTO_CAST5=m | 1031 | CONFIG_CRYPTO_CAST5=m |
@@ -917,20 +1034,35 @@ CONFIG_CRYPTO_TEA=m | |||
917 | CONFIG_CRYPTO_ARC4=m | 1034 | CONFIG_CRYPTO_ARC4=m |
918 | CONFIG_CRYPTO_KHAZAD=m | 1035 | CONFIG_CRYPTO_KHAZAD=m |
919 | CONFIG_CRYPTO_ANUBIS=m | 1036 | CONFIG_CRYPTO_ANUBIS=m |
1037 | CONFIG_CRYPTO_SEED=m | ||
1038 | CONFIG_CRYPTO_SALSA20=m | ||
920 | CONFIG_CRYPTO_DEFLATE=m | 1039 | CONFIG_CRYPTO_DEFLATE=m |
921 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1040 | CONFIG_CRYPTO_MICHAEL_MIC=m |
922 | CONFIG_CRYPTO_CRC32C=m | 1041 | CONFIG_CRYPTO_CRC32C=m |
1042 | CONFIG_CRYPTO_CAMELLIA=m | ||
923 | CONFIG_CRYPTO_TEST=m | 1043 | CONFIG_CRYPTO_TEST=m |
924 | 1044 | CONFIG_CRYPTO_AUTHENC=m | |
925 | # | 1045 | CONFIG_CRYPTO_LZO=m |
926 | # Hardware crypto devices | 1046 | # CONFIG_CRYPTO_HW is not set |
927 | # | ||
928 | 1047 | ||
929 | # | 1048 | # |
930 | # Library routines | 1049 | # Library routines |
931 | # | 1050 | # |
1051 | CONFIG_BITREVERSE=y | ||
932 | CONFIG_CRC_CCITT=m | 1052 | CONFIG_CRC_CCITT=m |
1053 | CONFIG_CRC16=m | ||
1054 | # CONFIG_CRC_ITU_T is not set | ||
933 | CONFIG_CRC32=y | 1055 | CONFIG_CRC32=y |
1056 | # CONFIG_CRC7 is not set | ||
934 | CONFIG_LIBCRC32C=m | 1057 | CONFIG_LIBCRC32C=m |
935 | CONFIG_ZLIB_INFLATE=y | 1058 | CONFIG_ZLIB_INFLATE=y |
936 | CONFIG_ZLIB_DEFLATE=m | 1059 | CONFIG_ZLIB_DEFLATE=m |
1060 | CONFIG_LZO_COMPRESS=m | ||
1061 | CONFIG_LZO_DECOMPRESS=m | ||
1062 | CONFIG_TEXTSEARCH=y | ||
1063 | CONFIG_TEXTSEARCH_KMP=m | ||
1064 | CONFIG_TEXTSEARCH_BM=m | ||
1065 | CONFIG_TEXTSEARCH_FSM=m | ||
1066 | CONFIG_PLIST=y | ||
1067 | CONFIG_HAS_IOMEM=y | ||
1068 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index f0d5534f6830..f40b1724254b 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:50 2005 | 4 | # Wed Apr 2 20:46:17 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-mvme147" | 27 | CONFIG_LOCALVERSION="-mvme147" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -85,6 +133,22 @@ CONFIG_M68030=y | |||
85 | CONFIG_MMU_MOTOROLA=y | 133 | CONFIG_MMU_MOTOROLA=y |
86 | # CONFIG_M68KFPU_EMU is not set | 134 | # CONFIG_M68KFPU_EMU is not set |
87 | # CONFIG_ADVANCED is not set | 135 | # CONFIG_ADVANCED is not set |
136 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
137 | CONFIG_NODES_SHIFT=3 | ||
138 | CONFIG_SELECT_MEMORY_MODEL=y | ||
139 | # CONFIG_FLATMEM_MANUAL is not set | ||
140 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
141 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
142 | CONFIG_DISCONTIGMEM=y | ||
143 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
144 | CONFIG_NEED_MULTIPLE_NODES=y | ||
145 | # CONFIG_SPARSEMEM_STATIC is not set | ||
146 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
147 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
148 | # CONFIG_RESOURCES_64BIT is not set | ||
149 | CONFIG_ZONE_DMA_FLAG=1 | ||
150 | CONFIG_BOUNCE=y | ||
151 | CONFIG_VIRT_TO_BUS=y | ||
88 | 152 | ||
89 | # | 153 | # |
90 | # General setup | 154 | # General setup |
@@ -93,135 +157,11 @@ CONFIG_BINFMT_ELF=y | |||
93 | CONFIG_BINFMT_AOUT=m | 157 | CONFIG_BINFMT_AOUT=m |
94 | CONFIG_BINFMT_MISC=m | 158 | CONFIG_BINFMT_MISC=m |
95 | CONFIG_PROC_HARDWARE=y | 159 | CONFIG_PROC_HARDWARE=y |
160 | CONFIG_ZONE_DMA=y | ||
161 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
96 | 162 | ||
97 | # | 163 | # |
98 | # Device Drivers | 164 | # Networking |
99 | # | ||
100 | |||
101 | # | ||
102 | # Generic Driver Options | ||
103 | # | ||
104 | CONFIG_STANDALONE=y | ||
105 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
106 | CONFIG_FW_LOADER=m | ||
107 | # CONFIG_DEBUG_DRIVER is not set | ||
108 | |||
109 | # | ||
110 | # Memory Technology Devices (MTD) | ||
111 | # | ||
112 | # CONFIG_MTD is not set | ||
113 | |||
114 | # | ||
115 | # Parallel port support | ||
116 | # | ||
117 | # CONFIG_PARPORT is not set | ||
118 | |||
119 | # | ||
120 | # Plug and Play support | ||
121 | # | ||
122 | |||
123 | # | ||
124 | # Block devices | ||
125 | # | ||
126 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
127 | CONFIG_BLK_DEV_LOOP=y | ||
128 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
129 | CONFIG_BLK_DEV_NBD=m | ||
130 | CONFIG_BLK_DEV_RAM=y | ||
131 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
132 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
133 | CONFIG_BLK_DEV_INITRD=y | ||
134 | CONFIG_INITRAMFS_SOURCE="" | ||
135 | CONFIG_CDROM_PKTCDVD=m | ||
136 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
137 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
138 | |||
139 | # | ||
140 | # IO Schedulers | ||
141 | # | ||
142 | CONFIG_IOSCHED_NOOP=y | ||
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | ||
145 | CONFIG_IOSCHED_CFQ=y | ||
146 | CONFIG_ATA_OVER_ETH=m | ||
147 | |||
148 | # | ||
149 | # ATA/ATAPI/MFM/RLL support | ||
150 | # | ||
151 | # CONFIG_IDE is not set | ||
152 | |||
153 | # | ||
154 | # SCSI device support | ||
155 | # | ||
156 | CONFIG_SCSI=y | ||
157 | CONFIG_SCSI_PROC_FS=y | ||
158 | |||
159 | # | ||
160 | # SCSI support type (disk, tape, CD-ROM) | ||
161 | # | ||
162 | CONFIG_BLK_DEV_SD=y | ||
163 | CONFIG_CHR_DEV_ST=m | ||
164 | # CONFIG_CHR_DEV_OSST is not set | ||
165 | CONFIG_BLK_DEV_SR=y | ||
166 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
167 | CONFIG_CHR_DEV_SG=m | ||
168 | |||
169 | # | ||
170 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
171 | # | ||
172 | # CONFIG_SCSI_MULTI_LUN is not set | ||
173 | CONFIG_SCSI_CONSTANTS=y | ||
174 | # CONFIG_SCSI_LOGGING is not set | ||
175 | |||
176 | # | ||
177 | # SCSI Transport Attributes | ||
178 | # | ||
179 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
180 | # CONFIG_SCSI_FC_ATTRS is not set | ||
181 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
182 | |||
183 | # | ||
184 | # SCSI low-level drivers | ||
185 | # | ||
186 | # CONFIG_SCSI_SATA is not set | ||
187 | # CONFIG_SCSI_DEBUG is not set | ||
188 | CONFIG_MVME147_SCSI=y | ||
189 | |||
190 | # | ||
191 | # Multi-device support (RAID and LVM) | ||
192 | # | ||
193 | CONFIG_MD=y | ||
194 | CONFIG_BLK_DEV_MD=m | ||
195 | CONFIG_MD_LINEAR=m | ||
196 | CONFIG_MD_RAID0=m | ||
197 | CONFIG_MD_RAID1=m | ||
198 | # CONFIG_MD_RAID10 is not set | ||
199 | CONFIG_MD_RAID5=m | ||
200 | CONFIG_MD_RAID6=m | ||
201 | CONFIG_MD_MULTIPATH=m | ||
202 | # CONFIG_MD_FAULTY is not set | ||
203 | CONFIG_BLK_DEV_DM=m | ||
204 | CONFIG_DM_CRYPT=m | ||
205 | CONFIG_DM_SNAPSHOT=m | ||
206 | CONFIG_DM_MIRROR=m | ||
207 | CONFIG_DM_ZERO=m | ||
208 | CONFIG_DM_MULTIPATH=m | ||
209 | CONFIG_DM_MULTIPATH_EMC=m | ||
210 | |||
211 | # | ||
212 | # Fusion MPT device support | ||
213 | # | ||
214 | |||
215 | # | ||
216 | # IEEE 1394 (FireWire) support | ||
217 | # | ||
218 | |||
219 | # | ||
220 | # I2O device support | ||
221 | # | ||
222 | |||
223 | # | ||
224 | # Networking support | ||
225 | # | 165 | # |
226 | CONFIG_NET=y | 166 | CONFIG_NET=y |
227 | 167 | ||
@@ -231,10 +171,17 @@ CONFIG_NET=y | |||
231 | CONFIG_PACKET=y | 171 | CONFIG_PACKET=y |
232 | # CONFIG_PACKET_MMAP is not set | 172 | # CONFIG_PACKET_MMAP is not set |
233 | CONFIG_UNIX=y | 173 | CONFIG_UNIX=y |
174 | CONFIG_XFRM=y | ||
175 | # CONFIG_XFRM_USER is not set | ||
176 | # CONFIG_XFRM_SUB_POLICY is not set | ||
177 | CONFIG_XFRM_MIGRATE=y | ||
178 | # CONFIG_XFRM_STATISTICS is not set | ||
234 | CONFIG_NET_KEY=y | 179 | CONFIG_NET_KEY=y |
180 | CONFIG_NET_KEY_MIGRATE=y | ||
235 | CONFIG_INET=y | 181 | CONFIG_INET=y |
236 | # CONFIG_IP_MULTICAST is not set | 182 | # CONFIG_IP_MULTICAST is not set |
237 | # CONFIG_IP_ADVANCED_ROUTER is not set | 183 | # CONFIG_IP_ADVANCED_ROUTER is not set |
184 | CONFIG_IP_FIB_HASH=y | ||
238 | CONFIG_IP_PNP=y | 185 | CONFIG_IP_PNP=y |
239 | CONFIG_IP_PNP_DHCP=y | 186 | CONFIG_IP_PNP_DHCP=y |
240 | CONFIG_IP_PNP_BOOTP=y | 187 | CONFIG_IP_PNP_BOOTP=y |
@@ -246,145 +193,199 @@ CONFIG_SYN_COOKIES=y | |||
246 | CONFIG_INET_AH=m | 193 | CONFIG_INET_AH=m |
247 | CONFIG_INET_ESP=m | 194 | CONFIG_INET_ESP=m |
248 | CONFIG_INET_IPCOMP=m | 195 | CONFIG_INET_IPCOMP=m |
196 | CONFIG_INET_XFRM_TUNNEL=m | ||
249 | CONFIG_INET_TUNNEL=m | 197 | CONFIG_INET_TUNNEL=m |
250 | CONFIG_IP_TCPDIAG=m | 198 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
251 | CONFIG_IP_TCPDIAG_IPV6=y | 199 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
252 | 200 | CONFIG_INET_XFRM_MODE_BEET=m | |
253 | # | 201 | CONFIG_INET_LRO=m |
254 | # IP: Virtual Server Configuration | 202 | CONFIG_INET_DIAG=m |
255 | # | 203 | CONFIG_INET_TCP_DIAG=m |
204 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
205 | CONFIG_TCP_CONG_CUBIC=y | ||
206 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
207 | # CONFIG_TCP_MD5SIG is not set | ||
256 | # CONFIG_IP_VS is not set | 208 | # CONFIG_IP_VS is not set |
257 | CONFIG_IPV6=m | 209 | CONFIG_IPV6=m |
258 | CONFIG_IPV6_PRIVACY=y | 210 | CONFIG_IPV6_PRIVACY=y |
211 | CONFIG_IPV6_ROUTER_PREF=y | ||
212 | CONFIG_IPV6_ROUTE_INFO=y | ||
213 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
259 | CONFIG_INET6_AH=m | 214 | CONFIG_INET6_AH=m |
260 | CONFIG_INET6_ESP=m | 215 | CONFIG_INET6_ESP=m |
261 | CONFIG_INET6_IPCOMP=m | 216 | CONFIG_INET6_IPCOMP=m |
217 | # CONFIG_IPV6_MIP6 is not set | ||
218 | CONFIG_INET6_XFRM_TUNNEL=m | ||
262 | CONFIG_INET6_TUNNEL=m | 219 | CONFIG_INET6_TUNNEL=m |
220 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
221 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
222 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
223 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
224 | CONFIG_IPV6_SIT=m | ||
263 | CONFIG_IPV6_TUNNEL=m | 225 | CONFIG_IPV6_TUNNEL=m |
226 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
227 | # CONFIG_NETWORK_SECMARK is not set | ||
264 | CONFIG_NETFILTER=y | 228 | CONFIG_NETFILTER=y |
265 | # CONFIG_NETFILTER_DEBUG is not set | 229 | # CONFIG_NETFILTER_DEBUG is not set |
230 | CONFIG_NETFILTER_ADVANCED=y | ||
231 | |||
232 | # | ||
233 | # Core Netfilter Configuration | ||
234 | # | ||
235 | CONFIG_NETFILTER_NETLINK=m | ||
236 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
237 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
238 | CONFIG_NF_CONNTRACK=m | ||
239 | CONFIG_NF_CT_ACCT=y | ||
240 | CONFIG_NF_CONNTRACK_MARK=y | ||
241 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
242 | CONFIG_NF_CT_PROTO_GRE=m | ||
243 | CONFIG_NF_CT_PROTO_SCTP=m | ||
244 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
245 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
246 | CONFIG_NF_CONNTRACK_FTP=m | ||
247 | CONFIG_NF_CONNTRACK_H323=m | ||
248 | CONFIG_NF_CONNTRACK_IRC=m | ||
249 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
250 | CONFIG_NF_CONNTRACK_PPTP=m | ||
251 | CONFIG_NF_CONNTRACK_SANE=m | ||
252 | CONFIG_NF_CONNTRACK_SIP=m | ||
253 | CONFIG_NF_CONNTRACK_TFTP=m | ||
254 | # CONFIG_NF_CT_NETLINK is not set | ||
255 | CONFIG_NETFILTER_XTABLES=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
265 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
266 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
295 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
266 | 296 | ||
267 | # | 297 | # |
268 | # IP: Netfilter Configuration | 298 | # IP: Netfilter Configuration |
269 | # | 299 | # |
270 | CONFIG_IP_NF_CONNTRACK=m | 300 | CONFIG_NF_CONNTRACK_IPV4=m |
271 | # CONFIG_IP_NF_CT_ACCT is not set | 301 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
272 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
273 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
274 | CONFIG_IP_NF_FTP=m | ||
275 | CONFIG_IP_NF_IRC=m | ||
276 | CONFIG_IP_NF_TFTP=m | ||
277 | CONFIG_IP_NF_AMANDA=m | ||
278 | CONFIG_IP_NF_QUEUE=m | 302 | CONFIG_IP_NF_QUEUE=m |
279 | CONFIG_IP_NF_IPTABLES=m | 303 | CONFIG_IP_NF_IPTABLES=m |
280 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
281 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
282 | CONFIG_IP_NF_MATCH_MAC=m | ||
283 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
284 | CONFIG_IP_NF_MATCH_MARK=m | ||
285 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
286 | CONFIG_IP_NF_MATCH_TOS=m | ||
287 | CONFIG_IP_NF_MATCH_RECENT=m | 304 | CONFIG_IP_NF_MATCH_RECENT=m |
288 | CONFIG_IP_NF_MATCH_ECN=m | 305 | CONFIG_IP_NF_MATCH_ECN=m |
289 | CONFIG_IP_NF_MATCH_DSCP=m | 306 | CONFIG_IP_NF_MATCH_AH=m |
290 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
291 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
292 | CONFIG_IP_NF_MATCH_TTL=m | 307 | CONFIG_IP_NF_MATCH_TTL=m |
293 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
294 | CONFIG_IP_NF_MATCH_HELPER=m | ||
295 | CONFIG_IP_NF_MATCH_STATE=m | ||
296 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
297 | CONFIG_IP_NF_MATCH_OWNER=m | ||
298 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 308 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
299 | CONFIG_IP_NF_MATCH_REALM=m | ||
300 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
301 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
302 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
303 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
304 | CONFIG_IP_NF_FILTER=m | 309 | CONFIG_IP_NF_FILTER=m |
305 | CONFIG_IP_NF_TARGET_REJECT=m | 310 | CONFIG_IP_NF_TARGET_REJECT=m |
306 | CONFIG_IP_NF_TARGET_LOG=m | 311 | CONFIG_IP_NF_TARGET_LOG=m |
307 | CONFIG_IP_NF_TARGET_ULOG=m | 312 | CONFIG_IP_NF_TARGET_ULOG=m |
308 | CONFIG_IP_NF_TARGET_TCPMSS=m | 313 | CONFIG_NF_NAT=m |
309 | CONFIG_IP_NF_NAT=m | 314 | CONFIG_NF_NAT_NEEDED=y |
310 | CONFIG_IP_NF_NAT_NEEDED=y | ||
311 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 315 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
312 | CONFIG_IP_NF_TARGET_REDIRECT=m | 316 | CONFIG_IP_NF_TARGET_REDIRECT=m |
313 | CONFIG_IP_NF_TARGET_NETMAP=m | 317 | CONFIG_IP_NF_TARGET_NETMAP=m |
314 | CONFIG_IP_NF_TARGET_SAME=m | 318 | CONFIG_NF_NAT_SNMP_BASIC=m |
315 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 319 | CONFIG_NF_NAT_PROTO_GRE=m |
316 | CONFIG_IP_NF_NAT_IRC=m | 320 | CONFIG_NF_NAT_FTP=m |
317 | CONFIG_IP_NF_NAT_FTP=m | 321 | CONFIG_NF_NAT_IRC=m |
318 | CONFIG_IP_NF_NAT_TFTP=m | 322 | CONFIG_NF_NAT_TFTP=m |
319 | CONFIG_IP_NF_NAT_AMANDA=m | 323 | CONFIG_NF_NAT_AMANDA=m |
324 | CONFIG_NF_NAT_PPTP=m | ||
325 | CONFIG_NF_NAT_H323=m | ||
326 | CONFIG_NF_NAT_SIP=m | ||
320 | CONFIG_IP_NF_MANGLE=m | 327 | CONFIG_IP_NF_MANGLE=m |
321 | CONFIG_IP_NF_TARGET_TOS=m | ||
322 | CONFIG_IP_NF_TARGET_ECN=m | 328 | CONFIG_IP_NF_TARGET_ECN=m |
323 | CONFIG_IP_NF_TARGET_DSCP=m | 329 | CONFIG_IP_NF_TARGET_TTL=m |
324 | CONFIG_IP_NF_TARGET_MARK=m | 330 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
325 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
326 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
327 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
328 | CONFIG_IP_NF_RAW=m | 331 | CONFIG_IP_NF_RAW=m |
329 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
330 | CONFIG_IP_NF_ARPTABLES=m | 332 | CONFIG_IP_NF_ARPTABLES=m |
331 | CONFIG_IP_NF_ARPFILTER=m | 333 | CONFIG_IP_NF_ARPFILTER=m |
332 | CONFIG_IP_NF_ARP_MANGLE=m | 334 | CONFIG_IP_NF_ARP_MANGLE=m |
333 | 335 | ||
334 | # | 336 | # |
335 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 337 | # IPv6: Netfilter Configuration |
336 | # | 338 | # |
339 | CONFIG_NF_CONNTRACK_IPV6=m | ||
337 | CONFIG_IP6_NF_QUEUE=m | 340 | CONFIG_IP6_NF_QUEUE=m |
338 | CONFIG_IP6_NF_IPTABLES=m | 341 | CONFIG_IP6_NF_IPTABLES=m |
339 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
340 | CONFIG_IP6_NF_MATCH_MAC=m | ||
341 | CONFIG_IP6_NF_MATCH_RT=m | 342 | CONFIG_IP6_NF_MATCH_RT=m |
342 | CONFIG_IP6_NF_MATCH_OPTS=m | 343 | CONFIG_IP6_NF_MATCH_OPTS=m |
343 | CONFIG_IP6_NF_MATCH_FRAG=m | 344 | CONFIG_IP6_NF_MATCH_FRAG=m |
344 | CONFIG_IP6_NF_MATCH_HL=m | 345 | CONFIG_IP6_NF_MATCH_HL=m |
345 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
346 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
347 | CONFIG_IP6_NF_MATCH_MARK=m | ||
348 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 346 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
349 | CONFIG_IP6_NF_MATCH_AHESP=m | 347 | CONFIG_IP6_NF_MATCH_AH=m |
350 | CONFIG_IP6_NF_MATCH_LENGTH=m | 348 | CONFIG_IP6_NF_MATCH_MH=m |
351 | CONFIG_IP6_NF_MATCH_EUI64=m | 349 | CONFIG_IP6_NF_MATCH_EUI64=m |
352 | CONFIG_IP6_NF_FILTER=m | 350 | CONFIG_IP6_NF_FILTER=m |
353 | CONFIG_IP6_NF_TARGET_LOG=m | 351 | CONFIG_IP6_NF_TARGET_LOG=m |
352 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
354 | CONFIG_IP6_NF_MANGLE=m | 353 | CONFIG_IP6_NF_MANGLE=m |
355 | CONFIG_IP6_NF_TARGET_MARK=m | 354 | CONFIG_IP6_NF_TARGET_HL=m |
356 | CONFIG_IP6_NF_RAW=m | 355 | CONFIG_IP6_NF_RAW=m |
357 | CONFIG_XFRM=y | 356 | CONFIG_IP_DCCP=m |
358 | CONFIG_XFRM_USER=m | 357 | CONFIG_INET_DCCP_DIAG=m |
358 | CONFIG_IP_DCCP_ACKVEC=y | ||
359 | 359 | ||
360 | # | 360 | # |
361 | # SCTP Configuration (EXPERIMENTAL) | 361 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
362 | # | 362 | # |
363 | CONFIG_IP_DCCP_CCID2=m | ||
364 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
365 | CONFIG_IP_DCCP_CCID3=m | ||
366 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
367 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
368 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
363 | CONFIG_IP_SCTP=m | 369 | CONFIG_IP_SCTP=m |
364 | # CONFIG_SCTP_DBG_MSG is not set | 370 | # CONFIG_SCTP_DBG_MSG is not set |
365 | # CONFIG_SCTP_DBG_OBJCNT is not set | 371 | # CONFIG_SCTP_DBG_OBJCNT is not set |
366 | # CONFIG_SCTP_HMAC_NONE is not set | 372 | # CONFIG_SCTP_HMAC_NONE is not set |
367 | # CONFIG_SCTP_HMAC_SHA1 is not set | 373 | # CONFIG_SCTP_HMAC_SHA1 is not set |
368 | CONFIG_SCTP_HMAC_MD5=y | 374 | CONFIG_SCTP_HMAC_MD5=y |
375 | # CONFIG_TIPC is not set | ||
369 | # CONFIG_ATM is not set | 376 | # CONFIG_ATM is not set |
370 | # CONFIG_BRIDGE is not set | 377 | # CONFIG_BRIDGE is not set |
371 | # CONFIG_VLAN_8021Q is not set | 378 | # CONFIG_VLAN_8021Q is not set |
372 | # CONFIG_DECNET is not set | 379 | # CONFIG_DECNET is not set |
373 | CONFIG_LLC=m | 380 | CONFIG_LLC=m |
374 | # CONFIG_LLC2 is not set | 381 | # CONFIG_LLC2 is not set |
375 | CONFIG_IPX=m | 382 | # CONFIG_IPX is not set |
376 | # CONFIG_IPX_INTERN is not set | ||
377 | CONFIG_ATALK=m | 383 | CONFIG_ATALK=m |
378 | # CONFIG_DEV_APPLETALK is not set | 384 | # CONFIG_DEV_APPLETALK is not set |
379 | # CONFIG_X25 is not set | 385 | # CONFIG_X25 is not set |
380 | # CONFIG_LAPB is not set | 386 | # CONFIG_LAPB is not set |
381 | # CONFIG_NET_DIVERT is not set | ||
382 | # CONFIG_ECONET is not set | 387 | # CONFIG_ECONET is not set |
383 | # CONFIG_WAN_ROUTER is not set | 388 | # CONFIG_WAN_ROUTER is not set |
384 | |||
385 | # | ||
386 | # QoS and/or fair queueing | ||
387 | # | ||
388 | # CONFIG_NET_SCHED is not set | 389 | # CONFIG_NET_SCHED is not set |
389 | CONFIG_NET_CLS_ROUTE=y | 390 | CONFIG_NET_CLS_ROUTE=y |
390 | 391 | ||
@@ -392,46 +393,155 @@ CONFIG_NET_CLS_ROUTE=y | |||
392 | # Network testing | 393 | # Network testing |
393 | # | 394 | # |
394 | # CONFIG_NET_PKTGEN is not set | 395 | # CONFIG_NET_PKTGEN is not set |
395 | CONFIG_NETPOLL=y | ||
396 | # CONFIG_NETPOLL_RX is not set | ||
397 | # CONFIG_NETPOLL_TRAP is not set | ||
398 | CONFIG_NET_POLL_CONTROLLER=y | ||
399 | # CONFIG_HAMRADIO is not set | 396 | # CONFIG_HAMRADIO is not set |
397 | # CONFIG_CAN is not set | ||
400 | # CONFIG_IRDA is not set | 398 | # CONFIG_IRDA is not set |
401 | # CONFIG_BT is not set | 399 | # CONFIG_BT is not set |
402 | CONFIG_NETDEVICES=y | 400 | # CONFIG_AF_RXRPC is not set |
403 | CONFIG_DUMMY=m | ||
404 | # CONFIG_BONDING is not set | ||
405 | CONFIG_EQUALIZER=m | ||
406 | # CONFIG_TUN is not set | ||
407 | 401 | ||
408 | # | 402 | # |
409 | # Ethernet (10 or 100Mbit) | 403 | # Wireless |
410 | # | 404 | # |
411 | CONFIG_NET_ETHERNET=y | 405 | # CONFIG_CFG80211 is not set |
412 | CONFIG_MII=m | 406 | CONFIG_WIRELESS_EXT=y |
413 | CONFIG_MVME147_NET=y | 407 | # CONFIG_MAC80211 is not set |
408 | CONFIG_IEEE80211=m | ||
409 | # CONFIG_IEEE80211_DEBUG is not set | ||
410 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
411 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
412 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
413 | CONFIG_IEEE80211_SOFTMAC=m | ||
414 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
415 | # CONFIG_RFKILL is not set | ||
416 | # CONFIG_NET_9P is not set | ||
414 | 417 | ||
415 | # | 418 | # |
416 | # Ethernet (1000 Mbit) | 419 | # Device Drivers |
420 | # | ||
421 | |||
422 | # | ||
423 | # Generic Driver Options | ||
424 | # | ||
425 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
426 | CONFIG_STANDALONE=y | ||
427 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
428 | CONFIG_FW_LOADER=m | ||
429 | # CONFIG_SYS_HYPERVISOR is not set | ||
430 | CONFIG_CONNECTOR=m | ||
431 | # CONFIG_MTD is not set | ||
432 | # CONFIG_PARPORT is not set | ||
433 | CONFIG_BLK_DEV=y | ||
434 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
435 | CONFIG_BLK_DEV_LOOP=y | ||
436 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
437 | CONFIG_BLK_DEV_NBD=m | ||
438 | CONFIG_BLK_DEV_RAM=y | ||
439 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
440 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
441 | # CONFIG_BLK_DEV_XIP is not set | ||
442 | CONFIG_CDROM_PKTCDVD=m | ||
443 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
444 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
445 | CONFIG_ATA_OVER_ETH=m | ||
446 | CONFIG_MISC_DEVICES=y | ||
447 | # CONFIG_EEPROM_93CX6 is not set | ||
448 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
449 | CONFIG_HAVE_IDE=y | ||
450 | # CONFIG_IDE is not set | ||
451 | |||
452 | # | ||
453 | # SCSI device support | ||
417 | # | 454 | # |
455 | CONFIG_RAID_ATTRS=m | ||
456 | CONFIG_SCSI=y | ||
457 | CONFIG_SCSI_DMA=y | ||
458 | CONFIG_SCSI_TGT=m | ||
459 | # CONFIG_SCSI_NETLINK is not set | ||
460 | CONFIG_SCSI_PROC_FS=y | ||
418 | 461 | ||
419 | # | 462 | # |
420 | # Ethernet (10000 Mbit) | 463 | # SCSI support type (disk, tape, CD-ROM) |
421 | # | 464 | # |
465 | CONFIG_BLK_DEV_SD=y | ||
466 | CONFIG_CHR_DEV_ST=m | ||
467 | CONFIG_CHR_DEV_OSST=m | ||
468 | CONFIG_BLK_DEV_SR=y | ||
469 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
470 | CONFIG_CHR_DEV_SG=m | ||
471 | # CONFIG_CHR_DEV_SCH is not set | ||
422 | 472 | ||
423 | # | 473 | # |
424 | # Token Ring devices | 474 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
425 | # | 475 | # |
476 | # CONFIG_SCSI_MULTI_LUN is not set | ||
477 | CONFIG_SCSI_CONSTANTS=y | ||
478 | # CONFIG_SCSI_LOGGING is not set | ||
479 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
480 | CONFIG_SCSI_WAIT_SCAN=m | ||
426 | 481 | ||
427 | # | 482 | # |
428 | # Wireless LAN (non-hamradio) | 483 | # SCSI Transports |
429 | # | 484 | # |
430 | # CONFIG_NET_RADIO is not set | 485 | CONFIG_SCSI_SPI_ATTRS=y |
486 | # CONFIG_SCSI_FC_ATTRS is not set | ||
487 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
488 | CONFIG_SCSI_SAS_ATTRS=m | ||
489 | CONFIG_SCSI_SAS_LIBSAS=m | ||
490 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
491 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
492 | CONFIG_SCSI_SRP_ATTRS=m | ||
493 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
494 | CONFIG_SCSI_LOWLEVEL=y | ||
495 | CONFIG_ISCSI_TCP=m | ||
496 | # CONFIG_SCSI_DEBUG is not set | ||
497 | CONFIG_MVME147_SCSI=y | ||
498 | CONFIG_MD=y | ||
499 | CONFIG_BLK_DEV_MD=m | ||
500 | CONFIG_MD_LINEAR=m | ||
501 | CONFIG_MD_RAID0=m | ||
502 | CONFIG_MD_RAID1=m | ||
503 | # CONFIG_MD_RAID10 is not set | ||
504 | CONFIG_MD_RAID456=m | ||
505 | CONFIG_MD_RAID5_RESHAPE=y | ||
506 | CONFIG_MD_MULTIPATH=m | ||
507 | # CONFIG_MD_FAULTY is not set | ||
508 | CONFIG_BLK_DEV_DM=m | ||
509 | # CONFIG_DM_DEBUG is not set | ||
510 | CONFIG_DM_CRYPT=m | ||
511 | CONFIG_DM_SNAPSHOT=m | ||
512 | CONFIG_DM_MIRROR=m | ||
513 | CONFIG_DM_ZERO=m | ||
514 | CONFIG_DM_MULTIPATH=m | ||
515 | CONFIG_DM_MULTIPATH_EMC=m | ||
516 | CONFIG_DM_MULTIPATH_RDAC=m | ||
517 | CONFIG_DM_MULTIPATH_HP=m | ||
518 | # CONFIG_DM_DELAY is not set | ||
519 | CONFIG_DM_UEVENT=y | ||
520 | CONFIG_NETDEVICES=y | ||
521 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
522 | CONFIG_DUMMY=m | ||
523 | # CONFIG_BONDING is not set | ||
524 | CONFIG_MACVLAN=m | ||
525 | CONFIG_EQUALIZER=m | ||
526 | # CONFIG_TUN is not set | ||
527 | CONFIG_VETH=m | ||
528 | # CONFIG_PHYLIB is not set | ||
529 | CONFIG_NET_ETHERNET=y | ||
530 | # CONFIG_MII is not set | ||
531 | CONFIG_MVME147_NET=y | ||
532 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
533 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
534 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
536 | # CONFIG_B44 is not set | ||
537 | # CONFIG_NETDEV_1000 is not set | ||
538 | # CONFIG_NETDEV_10000 is not set | ||
431 | 539 | ||
432 | # | 540 | # |
433 | # Wan interfaces | 541 | # Wireless LAN |
434 | # | 542 | # |
543 | # CONFIG_WLAN_PRE80211 is not set | ||
544 | # CONFIG_WLAN_80211 is not set | ||
435 | # CONFIG_WAN is not set | 545 | # CONFIG_WAN is not set |
436 | CONFIG_PPP=m | 546 | CONFIG_PPP=m |
437 | # CONFIG_PPP_MULTILINK is not set | 547 | # CONFIG_PPP_MULTILINK is not set |
@@ -440,28 +550,28 @@ CONFIG_PPP_ASYNC=m | |||
440 | CONFIG_PPP_SYNC_TTY=m | 550 | CONFIG_PPP_SYNC_TTY=m |
441 | CONFIG_PPP_DEFLATE=m | 551 | CONFIG_PPP_DEFLATE=m |
442 | CONFIG_PPP_BSDCOMP=m | 552 | CONFIG_PPP_BSDCOMP=m |
553 | CONFIG_PPP_MPPE=m | ||
443 | CONFIG_PPPOE=m | 554 | CONFIG_PPPOE=m |
555 | CONFIG_PPPOL2TP=m | ||
444 | CONFIG_SLIP=m | 556 | CONFIG_SLIP=m |
445 | CONFIG_SLIP_COMPRESSED=y | 557 | CONFIG_SLIP_COMPRESSED=y |
558 | CONFIG_SLHC=m | ||
446 | CONFIG_SLIP_SMART=y | 559 | CONFIG_SLIP_SMART=y |
447 | CONFIG_SLIP_MODE_SLIP6=y | 560 | CONFIG_SLIP_MODE_SLIP6=y |
448 | CONFIG_SHAPER=m | ||
449 | CONFIG_NETCONSOLE=m | 561 | CONFIG_NETCONSOLE=m |
450 | 562 | CONFIG_NETCONSOLE_DYNAMIC=y | |
451 | # | 563 | CONFIG_NETPOLL=y |
452 | # ISDN subsystem | 564 | # CONFIG_NETPOLL_TRAP is not set |
453 | # | 565 | CONFIG_NET_POLL_CONTROLLER=y |
454 | # CONFIG_ISDN is not set | 566 | # CONFIG_ISDN is not set |
455 | |||
456 | # | ||
457 | # Telephony Support | ||
458 | # | ||
459 | # CONFIG_PHONE is not set | 567 | # CONFIG_PHONE is not set |
460 | 568 | ||
461 | # | 569 | # |
462 | # Input device support | 570 | # Input device support |
463 | # | 571 | # |
464 | CONFIG_INPUT=y | 572 | CONFIG_INPUT=y |
573 | CONFIG_INPUT_FF_MEMLESS=m | ||
574 | # CONFIG_INPUT_POLLDEV is not set | ||
465 | 575 | ||
466 | # | 576 | # |
467 | # Userland interfaces | 577 | # Userland interfaces |
@@ -471,7 +581,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
471 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 581 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
472 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 582 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
473 | # CONFIG_INPUT_JOYDEV is not set | 583 | # CONFIG_INPUT_JOYDEV is not set |
474 | # CONFIG_INPUT_TSDEV is not set | ||
475 | # CONFIG_INPUT_EVDEV is not set | 584 | # CONFIG_INPUT_EVDEV is not set |
476 | # CONFIG_INPUT_EVBUG is not set | 585 | # CONFIG_INPUT_EVBUG is not set |
477 | 586 | ||
@@ -484,11 +593,19 @@ CONFIG_INPUT_KEYBOARD=y | |||
484 | # CONFIG_KEYBOARD_LKKBD is not set | 593 | # CONFIG_KEYBOARD_LKKBD is not set |
485 | # CONFIG_KEYBOARD_XTKBD is not set | 594 | # CONFIG_KEYBOARD_XTKBD is not set |
486 | # CONFIG_KEYBOARD_NEWTON is not set | 595 | # CONFIG_KEYBOARD_NEWTON is not set |
596 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
487 | CONFIG_INPUT_MOUSE=y | 597 | CONFIG_INPUT_MOUSE=y |
488 | CONFIG_MOUSE_PS2=m | 598 | CONFIG_MOUSE_PS2=m |
599 | CONFIG_MOUSE_PS2_ALPS=y | ||
600 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
601 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
602 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
603 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
604 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
489 | CONFIG_MOUSE_SERIAL=m | 605 | CONFIG_MOUSE_SERIAL=m |
490 | # CONFIG_MOUSE_VSXXXAA is not set | 606 | # CONFIG_MOUSE_VSXXXAA is not set |
491 | # CONFIG_INPUT_JOYSTICK is not set | 607 | # CONFIG_INPUT_JOYSTICK is not set |
608 | # CONFIG_INPUT_TABLET is not set | ||
492 | # CONFIG_INPUT_TOUCHSCREEN is not set | 609 | # CONFIG_INPUT_TOUCHSCREEN is not set |
493 | # CONFIG_INPUT_MISC is not set | 610 | # CONFIG_INPUT_MISC is not set |
494 | 611 | ||
@@ -496,7 +613,7 @@ CONFIG_MOUSE_SERIAL=m | |||
496 | # Hardware I/O ports | 613 | # Hardware I/O ports |
497 | # | 614 | # |
498 | CONFIG_SERIO=m | 615 | CONFIG_SERIO=m |
499 | CONFIG_SERIO_SERPORT=m | 616 | # CONFIG_SERIO_SERPORT is not set |
500 | CONFIG_SERIO_LIBPS2=m | 617 | CONFIG_SERIO_LIBPS2=m |
501 | # CONFIG_SERIO_RAW is not set | 618 | # CONFIG_SERIO_RAW is not set |
502 | # CONFIG_GAMEPORT is not set | 619 | # CONFIG_GAMEPORT is not set |
@@ -507,6 +624,7 @@ CONFIG_SERIO_LIBPS2=m | |||
507 | CONFIG_VT=y | 624 | CONFIG_VT=y |
508 | CONFIG_VT_CONSOLE=y | 625 | CONFIG_VT_CONSOLE=y |
509 | CONFIG_HW_CONSOLE=y | 626 | CONFIG_HW_CONSOLE=y |
627 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
510 | # CONFIG_SERIAL_NONSTANDARD is not set | 628 | # CONFIG_SERIAL_NONSTANDARD is not set |
511 | 629 | ||
512 | # | 630 | # |
@@ -520,112 +638,80 @@ CONFIG_HW_CONSOLE=y | |||
520 | CONFIG_UNIX98_PTYS=y | 638 | CONFIG_UNIX98_PTYS=y |
521 | CONFIG_LEGACY_PTYS=y | 639 | CONFIG_LEGACY_PTYS=y |
522 | CONFIG_LEGACY_PTY_COUNT=256 | 640 | CONFIG_LEGACY_PTY_COUNT=256 |
523 | |||
524 | # | ||
525 | # IPMI | ||
526 | # | ||
527 | # CONFIG_IPMI_HANDLER is not set | 641 | # CONFIG_IPMI_HANDLER is not set |
528 | 642 | # CONFIG_HW_RANDOM is not set | |
529 | # | ||
530 | # Watchdog Cards | ||
531 | # | ||
532 | # CONFIG_WATCHDOG is not set | ||
533 | CONFIG_GEN_RTC=m | 643 | CONFIG_GEN_RTC=m |
534 | CONFIG_GEN_RTC_X=y | 644 | CONFIG_GEN_RTC_X=y |
535 | # CONFIG_DTLK is not set | ||
536 | # CONFIG_R3964 is not set | 645 | # CONFIG_R3964 is not set |
537 | |||
538 | # | ||
539 | # Ftape, the floppy tape device driver | ||
540 | # | ||
541 | # CONFIG_DRM is not set | ||
542 | # CONFIG_RAW_DRIVER is not set | 646 | # CONFIG_RAW_DRIVER is not set |
647 | # CONFIG_TCG_TPM is not set | ||
648 | # CONFIG_I2C is not set | ||
543 | 649 | ||
544 | # | 650 | # |
545 | # TPM devices | 651 | # SPI support |
546 | # | ||
547 | |||
548 | # | ||
549 | # I2C support | ||
550 | # | 652 | # |
551 | # CONFIG_I2C is not set | 653 | # CONFIG_SPI is not set |
654 | # CONFIG_SPI_MASTER is not set | ||
655 | # CONFIG_W1 is not set | ||
656 | # CONFIG_POWER_SUPPLY is not set | ||
657 | # CONFIG_HWMON is not set | ||
658 | # CONFIG_THERMAL is not set | ||
659 | # CONFIG_WATCHDOG is not set | ||
552 | 660 | ||
553 | # | 661 | # |
554 | # Dallas's 1-wire bus | 662 | # Sonics Silicon Backplane |
555 | # | 663 | # |
556 | # CONFIG_W1 is not set | 664 | CONFIG_SSB_POSSIBLE=y |
665 | # CONFIG_SSB is not set | ||
557 | 666 | ||
558 | # | 667 | # |
559 | # Misc devices | 668 | # Multifunction device drivers |
560 | # | 669 | # |
670 | # CONFIG_MFD_SM501 is not set | ||
561 | 671 | ||
562 | # | 672 | # |
563 | # Multimedia devices | 673 | # Multimedia devices |
564 | # | 674 | # |
565 | # CONFIG_VIDEO_DEV is not set | 675 | # CONFIG_VIDEO_DEV is not set |
676 | # CONFIG_DVB_CORE is not set | ||
677 | # CONFIG_DAB is not set | ||
566 | 678 | ||
567 | # | 679 | # |
568 | # Digital Video Broadcasting Devices | 680 | # Graphics support |
569 | # | 681 | # |
570 | # CONFIG_DVB is not set | 682 | # CONFIG_VGASTATE is not set |
683 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
684 | # CONFIG_FB is not set | ||
685 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
571 | 686 | ||
572 | # | 687 | # |
573 | # Graphics support | 688 | # Display device support |
574 | # | 689 | # |
575 | CONFIG_FB=y | 690 | # CONFIG_DISPLAY_SUPPORT is not set |
576 | # CONFIG_FB_CFB_FILLRECT is not set | ||
577 | # CONFIG_FB_CFB_COPYAREA is not set | ||
578 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
579 | # CONFIG_FB_SOFT_CURSOR is not set | ||
580 | # CONFIG_FB_MACMODES is not set | ||
581 | CONFIG_FB_MODE_HELPERS=y | ||
582 | # CONFIG_FB_TILEBLITTING is not set | ||
583 | # CONFIG_FB_S1D13XXX is not set | ||
584 | # CONFIG_FB_VIRTUAL is not set | ||
585 | 691 | ||
586 | # | 692 | # |
587 | # Console display driver support | 693 | # Console display driver support |
588 | # | 694 | # |
589 | CONFIG_DUMMY_CONSOLE=y | 695 | CONFIG_DUMMY_CONSOLE=y |
590 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
591 | # CONFIG_FONTS is not set | ||
592 | CONFIG_FONT_8x8=y | ||
593 | CONFIG_FONT_8x16=y | ||
594 | |||
595 | # | ||
596 | # Logo configuration | ||
597 | # | ||
598 | CONFIG_LOGO=y | ||
599 | CONFIG_LOGO_LINUX_MONO=y | ||
600 | CONFIG_LOGO_LINUX_VGA16=y | ||
601 | CONFIG_LOGO_LINUX_CLUT224=y | ||
602 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
603 | 696 | ||
604 | # | 697 | # |
605 | # Sound | 698 | # Sound |
606 | # | 699 | # |
607 | # CONFIG_SOUND is not set | 700 | # CONFIG_SOUND is not set |
608 | 701 | CONFIG_HID_SUPPORT=y | |
609 | # | 702 | CONFIG_HID=m |
610 | # USB support | 703 | # CONFIG_HID_DEBUG is not set |
611 | # | 704 | CONFIG_HIDRAW=y |
612 | # CONFIG_USB_ARCH_HAS_HCD is not set | 705 | # CONFIG_USB_SUPPORT is not set |
613 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
614 | |||
615 | # | ||
616 | # USB Gadget Support | ||
617 | # | ||
618 | # CONFIG_USB_GADGET is not set | ||
619 | |||
620 | # | ||
621 | # MMC/SD Card support | ||
622 | # | ||
623 | # CONFIG_MMC is not set | 706 | # CONFIG_MMC is not set |
707 | # CONFIG_MEMSTICK is not set | ||
708 | # CONFIG_NEW_LEDS is not set | ||
709 | # CONFIG_RTC_CLASS is not set | ||
624 | 710 | ||
625 | # | 711 | # |
626 | # InfiniBand support | 712 | # Userspace I/O |
627 | # | 713 | # |
628 | # CONFIG_INFINIBAND is not set | 714 | # CONFIG_UIO is not set |
629 | 715 | ||
630 | # | 716 | # |
631 | # Character devices | 717 | # Character devices |
@@ -638,10 +724,11 @@ CONFIG_SERIAL_CONSOLE=y | |||
638 | # | 724 | # |
639 | CONFIG_EXT2_FS=y | 725 | CONFIG_EXT2_FS=y |
640 | # CONFIG_EXT2_FS_XATTR is not set | 726 | # CONFIG_EXT2_FS_XATTR is not set |
727 | # CONFIG_EXT2_FS_XIP is not set | ||
641 | CONFIG_EXT3_FS=y | 728 | CONFIG_EXT3_FS=y |
642 | # CONFIG_EXT3_FS_XATTR is not set | 729 | # CONFIG_EXT3_FS_XATTR is not set |
730 | # CONFIG_EXT4DEV_FS is not set | ||
643 | CONFIG_JBD=y | 731 | CONFIG_JBD=y |
644 | # CONFIG_JBD_DEBUG is not set | ||
645 | CONFIG_REISERFS_FS=m | 732 | CONFIG_REISERFS_FS=m |
646 | # CONFIG_REISERFS_CHECK is not set | 733 | # CONFIG_REISERFS_CHECK is not set |
647 | # CONFIG_REISERFS_PROC_INFO is not set | 734 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -652,25 +739,29 @@ CONFIG_JFS_FS=m | |||
652 | # CONFIG_JFS_DEBUG is not set | 739 | # CONFIG_JFS_DEBUG is not set |
653 | # CONFIG_JFS_STATISTICS is not set | 740 | # CONFIG_JFS_STATISTICS is not set |
654 | CONFIG_FS_POSIX_ACL=y | 741 | CONFIG_FS_POSIX_ACL=y |
655 | |||
656 | # | ||
657 | # XFS support | ||
658 | # | ||
659 | CONFIG_XFS_FS=m | 742 | CONFIG_XFS_FS=m |
660 | CONFIG_XFS_EXPORT=y | ||
661 | # CONFIG_XFS_RT is not set | ||
662 | # CONFIG_XFS_QUOTA is not set | 743 | # CONFIG_XFS_QUOTA is not set |
663 | # CONFIG_XFS_SECURITY is not set | 744 | # CONFIG_XFS_SECURITY is not set |
664 | # CONFIG_XFS_POSIX_ACL is not set | 745 | # CONFIG_XFS_POSIX_ACL is not set |
665 | CONFIG_MINIX_FS=y | 746 | # CONFIG_XFS_RT is not set |
666 | # CONFIG_ROMFS_FS is not set | 747 | CONFIG_GFS2_FS=m |
748 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
749 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
750 | CONFIG_OCFS2_FS=m | ||
751 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
752 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
753 | CONFIG_DNOTIFY=y | ||
754 | CONFIG_INOTIFY=y | ||
755 | CONFIG_INOTIFY_USER=y | ||
667 | CONFIG_QUOTA=y | 756 | CONFIG_QUOTA=y |
757 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
758 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
668 | # CONFIG_QFMT_V1 is not set | 759 | # CONFIG_QFMT_V1 is not set |
669 | # CONFIG_QFMT_V2 is not set | 760 | # CONFIG_QFMT_V2 is not set |
670 | CONFIG_QUOTACTL=y | 761 | CONFIG_QUOTACTL=y |
671 | CONFIG_DNOTIFY=y | ||
672 | CONFIG_AUTOFS_FS=m | 762 | CONFIG_AUTOFS_FS=m |
673 | CONFIG_AUTOFS4_FS=m | 763 | CONFIG_AUTOFS4_FS=m |
764 | CONFIG_FUSE_FS=m | ||
674 | 765 | ||
675 | # | 766 | # |
676 | # CD-ROM/DVD Filesystems | 767 | # CD-ROM/DVD Filesystems |
@@ -678,7 +769,6 @@ CONFIG_AUTOFS4_FS=m | |||
678 | CONFIG_ISO9660_FS=y | 769 | CONFIG_ISO9660_FS=y |
679 | CONFIG_JOLIET=y | 770 | CONFIG_JOLIET=y |
680 | CONFIG_ZISOFS=y | 771 | CONFIG_ZISOFS=y |
681 | CONFIG_ZISOFS_FS=y | ||
682 | CONFIG_UDF_FS=m | 772 | CONFIG_UDF_FS=m |
683 | CONFIG_UDF_NLS=y | 773 | CONFIG_UDF_NLS=y |
684 | 774 | ||
@@ -697,15 +787,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
697 | # | 787 | # |
698 | CONFIG_PROC_FS=y | 788 | CONFIG_PROC_FS=y |
699 | CONFIG_PROC_KCORE=y | 789 | CONFIG_PROC_KCORE=y |
790 | CONFIG_PROC_SYSCTL=y | ||
700 | CONFIG_SYSFS=y | 791 | CONFIG_SYSFS=y |
701 | CONFIG_DEVFS_FS=y | ||
702 | # CONFIG_DEVFS_MOUNT is not set | ||
703 | # CONFIG_DEVFS_DEBUG is not set | ||
704 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
705 | CONFIG_TMPFS=y | 792 | CONFIG_TMPFS=y |
706 | # CONFIG_TMPFS_XATTR is not set | 793 | # CONFIG_TMPFS_POSIX_ACL is not set |
707 | # CONFIG_HUGETLB_PAGE is not set | 794 | # CONFIG_HUGETLB_PAGE is not set |
708 | CONFIG_RAMFS=y | 795 | CONFIG_CONFIGFS_FS=m |
709 | 796 | ||
710 | # | 797 | # |
711 | # Miscellaneous filesystems | 798 | # Miscellaneous filesystems |
@@ -719,44 +806,40 @@ CONFIG_HFSPLUS_FS=m | |||
719 | # CONFIG_EFS_FS is not set | 806 | # CONFIG_EFS_FS is not set |
720 | CONFIG_CRAMFS=m | 807 | CONFIG_CRAMFS=m |
721 | # CONFIG_VXFS_FS is not set | 808 | # CONFIG_VXFS_FS is not set |
809 | CONFIG_MINIX_FS=y | ||
722 | CONFIG_HPFS_FS=m | 810 | CONFIG_HPFS_FS=m |
723 | # CONFIG_QNX4FS_FS is not set | 811 | # CONFIG_QNX4FS_FS is not set |
812 | # CONFIG_ROMFS_FS is not set | ||
724 | CONFIG_SYSV_FS=m | 813 | CONFIG_SYSV_FS=m |
725 | CONFIG_UFS_FS=m | 814 | CONFIG_UFS_FS=m |
726 | # CONFIG_UFS_FS_WRITE is not set | 815 | # CONFIG_UFS_FS_WRITE is not set |
727 | 816 | # CONFIG_UFS_DEBUG is not set | |
728 | # | 817 | CONFIG_NETWORK_FILESYSTEMS=y |
729 | # Network File Systems | ||
730 | # | ||
731 | CONFIG_NFS_FS=y | 818 | CONFIG_NFS_FS=y |
732 | CONFIG_NFS_V3=y | 819 | CONFIG_NFS_V3=y |
820 | # CONFIG_NFS_V3_ACL is not set | ||
733 | CONFIG_NFS_V4=y | 821 | CONFIG_NFS_V4=y |
734 | # CONFIG_NFS_DIRECTIO is not set | 822 | # CONFIG_NFS_DIRECTIO is not set |
735 | CONFIG_NFSD=m | 823 | CONFIG_NFSD=m |
736 | CONFIG_NFSD_V3=y | 824 | CONFIG_NFSD_V3=y |
737 | CONFIG_NFSD_V4=y | 825 | # CONFIG_NFSD_V3_ACL is not set |
826 | # CONFIG_NFSD_V4 is not set | ||
738 | CONFIG_NFSD_TCP=y | 827 | CONFIG_NFSD_TCP=y |
739 | CONFIG_ROOT_NFS=y | 828 | CONFIG_ROOT_NFS=y |
740 | CONFIG_LOCKD=y | 829 | CONFIG_LOCKD=y |
741 | CONFIG_LOCKD_V4=y | 830 | CONFIG_LOCKD_V4=y |
742 | CONFIG_EXPORTFS=m | 831 | CONFIG_EXPORTFS=m |
832 | CONFIG_NFS_COMMON=y | ||
743 | CONFIG_SUNRPC=y | 833 | CONFIG_SUNRPC=y |
744 | CONFIG_SUNRPC_GSS=y | 834 | CONFIG_SUNRPC_GSS=y |
835 | CONFIG_SUNRPC_BIND34=y | ||
745 | CONFIG_RPCSEC_GSS_KRB5=y | 836 | CONFIG_RPCSEC_GSS_KRB5=y |
746 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 837 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
747 | CONFIG_SMB_FS=m | 838 | CONFIG_SMB_FS=m |
748 | CONFIG_SMB_NLS_DEFAULT=y | 839 | CONFIG_SMB_NLS_DEFAULT=y |
749 | CONFIG_SMB_NLS_REMOTE="cp437" | 840 | CONFIG_SMB_NLS_REMOTE="cp437" |
750 | # CONFIG_CIFS is not set | 841 | # CONFIG_CIFS is not set |
751 | CONFIG_NCP_FS=m | 842 | # CONFIG_NCP_FS is not set |
752 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
753 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
754 | # CONFIG_NCPFS_STRONG is not set | ||
755 | # CONFIG_NCPFS_NFS_NS is not set | ||
756 | # CONFIG_NCPFS_OS2_NS is not set | ||
757 | # CONFIG_NCPFS_SMALLDOS is not set | ||
758 | CONFIG_NCPFS_NLS=y | ||
759 | # CONFIG_NCPFS_EXTRAS is not set | ||
760 | CONFIG_CODA_FS=m | 843 | CONFIG_CODA_FS=m |
761 | # CONFIG_CODA_FS_OLD_API is not set | 844 | # CONFIG_CODA_FS_OLD_API is not set |
762 | # CONFIG_AFS_FS is not set | 845 | # CONFIG_AFS_FS is not set |
@@ -766,10 +849,7 @@ CONFIG_CODA_FS=m | |||
766 | # | 849 | # |
767 | # CONFIG_PARTITION_ADVANCED is not set | 850 | # CONFIG_PARTITION_ADVANCED is not set |
768 | CONFIG_MSDOS_PARTITION=y | 851 | CONFIG_MSDOS_PARTITION=y |
769 | 852 | CONFIG_SYSV68_PARTITION=y | |
770 | # | ||
771 | # Native Language Support | ||
772 | # | ||
773 | CONFIG_NLS=y | 853 | CONFIG_NLS=y |
774 | CONFIG_NLS_DEFAULT="iso8859-1" | 854 | CONFIG_NLS_DEFAULT="iso8859-1" |
775 | CONFIG_NLS_CODEPAGE_437=y | 855 | CONFIG_NLS_CODEPAGE_437=y |
@@ -810,35 +890,42 @@ CONFIG_NLS_ISO8859_15=m | |||
810 | CONFIG_NLS_KOI8_R=m | 890 | CONFIG_NLS_KOI8_R=m |
811 | CONFIG_NLS_KOI8_U=m | 891 | CONFIG_NLS_KOI8_U=m |
812 | CONFIG_NLS_UTF8=m | 892 | CONFIG_NLS_UTF8=m |
893 | CONFIG_DLM=m | ||
894 | # CONFIG_DLM_DEBUG is not set | ||
813 | 895 | ||
814 | # | 896 | # |
815 | # Kernel hacking | 897 | # Kernel hacking |
816 | # | 898 | # |
817 | # CONFIG_PRINTK_TIME is not set | 899 | # CONFIG_PRINTK_TIME is not set |
818 | CONFIG_DEBUG_KERNEL=y | 900 | CONFIG_ENABLE_WARN_DEPRECATED=y |
901 | CONFIG_ENABLE_MUST_CHECK=y | ||
819 | CONFIG_MAGIC_SYSRQ=y | 902 | CONFIG_MAGIC_SYSRQ=y |
820 | CONFIG_LOG_BUF_SHIFT=16 | 903 | # CONFIG_UNUSED_SYMBOLS is not set |
821 | # CONFIG_SCHEDSTATS is not set | ||
822 | # CONFIG_DEBUG_SLAB is not set | ||
823 | # CONFIG_DEBUG_SPINLOCK is not set | ||
824 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
825 | # CONFIG_DEBUG_KOBJECT is not set | ||
826 | CONFIG_DEBUG_BUGVERBOSE=y | ||
827 | # CONFIG_DEBUG_INFO is not set | ||
828 | # CONFIG_DEBUG_FS is not set | 904 | # CONFIG_DEBUG_FS is not set |
829 | # CONFIG_FRAME_POINTER is not set | 905 | # CONFIG_HEADERS_CHECK is not set |
906 | # CONFIG_DEBUG_KERNEL is not set | ||
907 | CONFIG_DEBUG_BUGVERBOSE=y | ||
908 | # CONFIG_SAMPLES is not set | ||
830 | 909 | ||
831 | # | 910 | # |
832 | # Security options | 911 | # Security options |
833 | # | 912 | # |
834 | # CONFIG_KEYS is not set | 913 | # CONFIG_KEYS is not set |
835 | # CONFIG_SECURITY is not set | 914 | # CONFIG_SECURITY is not set |
836 | 915 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
837 | # | 916 | CONFIG_XOR_BLOCKS=m |
838 | # Cryptographic options | 917 | CONFIG_ASYNC_CORE=m |
839 | # | 918 | CONFIG_ASYNC_MEMCPY=m |
919 | CONFIG_ASYNC_XOR=m | ||
840 | CONFIG_CRYPTO=y | 920 | CONFIG_CRYPTO=y |
921 | CONFIG_CRYPTO_ALGAPI=y | ||
922 | CONFIG_CRYPTO_AEAD=m | ||
923 | CONFIG_CRYPTO_BLKCIPHER=y | ||
924 | CONFIG_CRYPTO_SEQIV=m | ||
925 | CONFIG_CRYPTO_HASH=y | ||
926 | CONFIG_CRYPTO_MANAGER=y | ||
841 | CONFIG_CRYPTO_HMAC=y | 927 | CONFIG_CRYPTO_HMAC=y |
928 | CONFIG_CRYPTO_XCBC=m | ||
842 | CONFIG_CRYPTO_NULL=m | 929 | CONFIG_CRYPTO_NULL=m |
843 | CONFIG_CRYPTO_MD4=m | 930 | CONFIG_CRYPTO_MD4=m |
844 | CONFIG_CRYPTO_MD5=y | 931 | CONFIG_CRYPTO_MD5=y |
@@ -847,9 +934,21 @@ CONFIG_CRYPTO_SHA256=m | |||
847 | CONFIG_CRYPTO_SHA512=m | 934 | CONFIG_CRYPTO_SHA512=m |
848 | CONFIG_CRYPTO_WP512=m | 935 | CONFIG_CRYPTO_WP512=m |
849 | CONFIG_CRYPTO_TGR192=m | 936 | CONFIG_CRYPTO_TGR192=m |
937 | CONFIG_CRYPTO_GF128MUL=m | ||
938 | CONFIG_CRYPTO_ECB=m | ||
939 | CONFIG_CRYPTO_CBC=y | ||
940 | CONFIG_CRYPTO_PCBC=m | ||
941 | CONFIG_CRYPTO_LRW=m | ||
942 | CONFIG_CRYPTO_XTS=m | ||
943 | CONFIG_CRYPTO_CTR=m | ||
944 | CONFIG_CRYPTO_GCM=m | ||
945 | CONFIG_CRYPTO_CCM=m | ||
946 | CONFIG_CRYPTO_CRYPTD=m | ||
850 | CONFIG_CRYPTO_DES=y | 947 | CONFIG_CRYPTO_DES=y |
948 | CONFIG_CRYPTO_FCRYPT=m | ||
851 | CONFIG_CRYPTO_BLOWFISH=m | 949 | CONFIG_CRYPTO_BLOWFISH=m |
852 | CONFIG_CRYPTO_TWOFISH=m | 950 | CONFIG_CRYPTO_TWOFISH=m |
951 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
853 | CONFIG_CRYPTO_SERPENT=m | 952 | CONFIG_CRYPTO_SERPENT=m |
854 | CONFIG_CRYPTO_AES=m | 953 | CONFIG_CRYPTO_AES=m |
855 | CONFIG_CRYPTO_CAST5=m | 954 | CONFIG_CRYPTO_CAST5=m |
@@ -858,20 +957,35 @@ CONFIG_CRYPTO_TEA=m | |||
858 | CONFIG_CRYPTO_ARC4=m | 957 | CONFIG_CRYPTO_ARC4=m |
859 | CONFIG_CRYPTO_KHAZAD=m | 958 | CONFIG_CRYPTO_KHAZAD=m |
860 | CONFIG_CRYPTO_ANUBIS=m | 959 | CONFIG_CRYPTO_ANUBIS=m |
960 | CONFIG_CRYPTO_SEED=m | ||
961 | CONFIG_CRYPTO_SALSA20=m | ||
861 | CONFIG_CRYPTO_DEFLATE=m | 962 | CONFIG_CRYPTO_DEFLATE=m |
862 | CONFIG_CRYPTO_MICHAEL_MIC=m | 963 | CONFIG_CRYPTO_MICHAEL_MIC=m |
863 | CONFIG_CRYPTO_CRC32C=m | 964 | CONFIG_CRYPTO_CRC32C=m |
965 | CONFIG_CRYPTO_CAMELLIA=m | ||
864 | CONFIG_CRYPTO_TEST=m | 966 | CONFIG_CRYPTO_TEST=m |
865 | 967 | CONFIG_CRYPTO_AUTHENC=m | |
866 | # | 968 | CONFIG_CRYPTO_LZO=m |
867 | # Hardware crypto devices | 969 | # CONFIG_CRYPTO_HW is not set |
868 | # | ||
869 | 970 | ||
870 | # | 971 | # |
871 | # Library routines | 972 | # Library routines |
872 | # | 973 | # |
974 | CONFIG_BITREVERSE=y | ||
873 | CONFIG_CRC_CCITT=m | 975 | CONFIG_CRC_CCITT=m |
976 | CONFIG_CRC16=m | ||
977 | # CONFIG_CRC_ITU_T is not set | ||
874 | CONFIG_CRC32=y | 978 | CONFIG_CRC32=y |
979 | # CONFIG_CRC7 is not set | ||
875 | CONFIG_LIBCRC32C=m | 980 | CONFIG_LIBCRC32C=m |
876 | CONFIG_ZLIB_INFLATE=y | 981 | CONFIG_ZLIB_INFLATE=y |
877 | CONFIG_ZLIB_DEFLATE=m | 982 | CONFIG_ZLIB_DEFLATE=m |
983 | CONFIG_LZO_COMPRESS=m | ||
984 | CONFIG_LZO_DECOMPRESS=m | ||
985 | CONFIG_TEXTSEARCH=y | ||
986 | CONFIG_TEXTSEARCH_KMP=m | ||
987 | CONFIG_TEXTSEARCH_BM=m | ||
988 | CONFIG_TEXTSEARCH_FSM=m | ||
989 | CONFIG_PLIST=y | ||
990 | CONFIG_HAS_IOMEM=y | ||
991 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 1d5c46ff3c81..e9ccc774334e 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:53 2005 | 4 | # Wed Apr 2 20:46:19 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-mvme16x" | 27 | CONFIG_LOCALVERSION="-mvme16x" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -85,6 +133,22 @@ CONFIG_M68060=y | |||
85 | CONFIG_MMU_MOTOROLA=y | 133 | CONFIG_MMU_MOTOROLA=y |
86 | # CONFIG_M68KFPU_EMU is not set | 134 | # CONFIG_M68KFPU_EMU is not set |
87 | # CONFIG_ADVANCED is not set | 135 | # CONFIG_ADVANCED is not set |
136 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
137 | CONFIG_NODES_SHIFT=3 | ||
138 | CONFIG_SELECT_MEMORY_MODEL=y | ||
139 | # CONFIG_FLATMEM_MANUAL is not set | ||
140 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
141 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
142 | CONFIG_DISCONTIGMEM=y | ||
143 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
144 | CONFIG_NEED_MULTIPLE_NODES=y | ||
145 | # CONFIG_SPARSEMEM_STATIC is not set | ||
146 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
147 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
148 | # CONFIG_RESOURCES_64BIT is not set | ||
149 | CONFIG_ZONE_DMA_FLAG=1 | ||
150 | CONFIG_BOUNCE=y | ||
151 | CONFIG_VIRT_TO_BUS=y | ||
88 | 152 | ||
89 | # | 153 | # |
90 | # General setup | 154 | # General setup |
@@ -93,134 +157,11 @@ CONFIG_BINFMT_ELF=y | |||
93 | CONFIG_BINFMT_AOUT=m | 157 | CONFIG_BINFMT_AOUT=m |
94 | CONFIG_BINFMT_MISC=m | 158 | CONFIG_BINFMT_MISC=m |
95 | CONFIG_PROC_HARDWARE=y | 159 | CONFIG_PROC_HARDWARE=y |
160 | CONFIG_ZONE_DMA=y | ||
161 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
96 | 162 | ||
97 | # | 163 | # |
98 | # Device Drivers | 164 | # Networking |
99 | # | ||
100 | |||
101 | # | ||
102 | # Generic Driver Options | ||
103 | # | ||
104 | CONFIG_STANDALONE=y | ||
105 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
106 | CONFIG_FW_LOADER=m | ||
107 | # CONFIG_DEBUG_DRIVER is not set | ||
108 | |||
109 | # | ||
110 | # Memory Technology Devices (MTD) | ||
111 | # | ||
112 | # CONFIG_MTD is not set | ||
113 | |||
114 | # | ||
115 | # Parallel port support | ||
116 | # | ||
117 | # CONFIG_PARPORT is not set | ||
118 | |||
119 | # | ||
120 | # Plug and Play support | ||
121 | # | ||
122 | |||
123 | # | ||
124 | # Block devices | ||
125 | # | ||
126 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
127 | CONFIG_BLK_DEV_LOOP=y | ||
128 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
129 | CONFIG_BLK_DEV_NBD=m | ||
130 | CONFIG_BLK_DEV_RAM=y | ||
131 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
132 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
133 | CONFIG_BLK_DEV_INITRD=y | ||
134 | CONFIG_INITRAMFS_SOURCE="" | ||
135 | CONFIG_CDROM_PKTCDVD=m | ||
136 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
137 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
138 | |||
139 | # | ||
140 | # IO Schedulers | ||
141 | # | ||
142 | CONFIG_IOSCHED_NOOP=y | ||
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | ||
145 | CONFIG_IOSCHED_CFQ=y | ||
146 | CONFIG_ATA_OVER_ETH=m | ||
147 | |||
148 | # | ||
149 | # ATA/ATAPI/MFM/RLL support | ||
150 | # | ||
151 | # CONFIG_IDE is not set | ||
152 | |||
153 | # | ||
154 | # SCSI device support | ||
155 | # | ||
156 | CONFIG_SCSI=y | ||
157 | CONFIG_SCSI_PROC_FS=y | ||
158 | |||
159 | # | ||
160 | # SCSI support type (disk, tape, CD-ROM) | ||
161 | # | ||
162 | CONFIG_BLK_DEV_SD=y | ||
163 | CONFIG_CHR_DEV_ST=m | ||
164 | # CONFIG_CHR_DEV_OSST is not set | ||
165 | CONFIG_BLK_DEV_SR=y | ||
166 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
167 | CONFIG_CHR_DEV_SG=m | ||
168 | |||
169 | # | ||
170 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
171 | # | ||
172 | # CONFIG_SCSI_MULTI_LUN is not set | ||
173 | CONFIG_SCSI_CONSTANTS=y | ||
174 | # CONFIG_SCSI_LOGGING is not set | ||
175 | |||
176 | # | ||
177 | # SCSI Transport Attributes | ||
178 | # | ||
179 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
180 | # CONFIG_SCSI_FC_ATTRS is not set | ||
181 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
182 | |||
183 | # | ||
184 | # SCSI low-level drivers | ||
185 | # | ||
186 | # CONFIG_SCSI_SATA is not set | ||
187 | # CONFIG_SCSI_DEBUG is not set | ||
188 | |||
189 | # | ||
190 | # Multi-device support (RAID and LVM) | ||
191 | # | ||
192 | CONFIG_MD=y | ||
193 | CONFIG_BLK_DEV_MD=m | ||
194 | CONFIG_MD_LINEAR=m | ||
195 | CONFIG_MD_RAID0=m | ||
196 | CONFIG_MD_RAID1=m | ||
197 | # CONFIG_MD_RAID10 is not set | ||
198 | CONFIG_MD_RAID5=m | ||
199 | CONFIG_MD_RAID6=m | ||
200 | CONFIG_MD_MULTIPATH=m | ||
201 | # CONFIG_MD_FAULTY is not set | ||
202 | CONFIG_BLK_DEV_DM=m | ||
203 | CONFIG_DM_CRYPT=m | ||
204 | CONFIG_DM_SNAPSHOT=m | ||
205 | CONFIG_DM_MIRROR=m | ||
206 | CONFIG_DM_ZERO=m | ||
207 | CONFIG_DM_MULTIPATH=m | ||
208 | CONFIG_DM_MULTIPATH_EMC=m | ||
209 | |||
210 | # | ||
211 | # Fusion MPT device support | ||
212 | # | ||
213 | |||
214 | # | ||
215 | # IEEE 1394 (FireWire) support | ||
216 | # | ||
217 | |||
218 | # | ||
219 | # I2O device support | ||
220 | # | ||
221 | |||
222 | # | ||
223 | # Networking support | ||
224 | # | 165 | # |
225 | CONFIG_NET=y | 166 | CONFIG_NET=y |
226 | 167 | ||
@@ -230,10 +171,17 @@ CONFIG_NET=y | |||
230 | CONFIG_PACKET=y | 171 | CONFIG_PACKET=y |
231 | # CONFIG_PACKET_MMAP is not set | 172 | # CONFIG_PACKET_MMAP is not set |
232 | CONFIG_UNIX=y | 173 | CONFIG_UNIX=y |
174 | CONFIG_XFRM=y | ||
175 | # CONFIG_XFRM_USER is not set | ||
176 | # CONFIG_XFRM_SUB_POLICY is not set | ||
177 | CONFIG_XFRM_MIGRATE=y | ||
178 | # CONFIG_XFRM_STATISTICS is not set | ||
233 | CONFIG_NET_KEY=y | 179 | CONFIG_NET_KEY=y |
180 | CONFIG_NET_KEY_MIGRATE=y | ||
234 | CONFIG_INET=y | 181 | CONFIG_INET=y |
235 | # CONFIG_IP_MULTICAST is not set | 182 | # CONFIG_IP_MULTICAST is not set |
236 | # CONFIG_IP_ADVANCED_ROUTER is not set | 183 | # CONFIG_IP_ADVANCED_ROUTER is not set |
184 | CONFIG_IP_FIB_HASH=y | ||
237 | CONFIG_IP_PNP=y | 185 | CONFIG_IP_PNP=y |
238 | CONFIG_IP_PNP_DHCP=y | 186 | CONFIG_IP_PNP_DHCP=y |
239 | CONFIG_IP_PNP_BOOTP=y | 187 | CONFIG_IP_PNP_BOOTP=y |
@@ -245,145 +193,199 @@ CONFIG_SYN_COOKIES=y | |||
245 | CONFIG_INET_AH=m | 193 | CONFIG_INET_AH=m |
246 | CONFIG_INET_ESP=m | 194 | CONFIG_INET_ESP=m |
247 | CONFIG_INET_IPCOMP=m | 195 | CONFIG_INET_IPCOMP=m |
196 | CONFIG_INET_XFRM_TUNNEL=m | ||
248 | CONFIG_INET_TUNNEL=m | 197 | CONFIG_INET_TUNNEL=m |
249 | CONFIG_IP_TCPDIAG=m | 198 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
250 | CONFIG_IP_TCPDIAG_IPV6=y | 199 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
251 | 200 | CONFIG_INET_XFRM_MODE_BEET=m | |
252 | # | 201 | CONFIG_INET_LRO=m |
253 | # IP: Virtual Server Configuration | 202 | CONFIG_INET_DIAG=m |
254 | # | 203 | CONFIG_INET_TCP_DIAG=m |
204 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
205 | CONFIG_TCP_CONG_CUBIC=y | ||
206 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
207 | # CONFIG_TCP_MD5SIG is not set | ||
255 | # CONFIG_IP_VS is not set | 208 | # CONFIG_IP_VS is not set |
256 | CONFIG_IPV6=m | 209 | CONFIG_IPV6=m |
257 | CONFIG_IPV6_PRIVACY=y | 210 | CONFIG_IPV6_PRIVACY=y |
211 | CONFIG_IPV6_ROUTER_PREF=y | ||
212 | CONFIG_IPV6_ROUTE_INFO=y | ||
213 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
258 | CONFIG_INET6_AH=m | 214 | CONFIG_INET6_AH=m |
259 | CONFIG_INET6_ESP=m | 215 | CONFIG_INET6_ESP=m |
260 | CONFIG_INET6_IPCOMP=m | 216 | CONFIG_INET6_IPCOMP=m |
217 | # CONFIG_IPV6_MIP6 is not set | ||
218 | CONFIG_INET6_XFRM_TUNNEL=m | ||
261 | CONFIG_INET6_TUNNEL=m | 219 | CONFIG_INET6_TUNNEL=m |
220 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
221 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
222 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
223 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
224 | CONFIG_IPV6_SIT=m | ||
262 | CONFIG_IPV6_TUNNEL=m | 225 | CONFIG_IPV6_TUNNEL=m |
226 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
227 | # CONFIG_NETWORK_SECMARK is not set | ||
263 | CONFIG_NETFILTER=y | 228 | CONFIG_NETFILTER=y |
264 | # CONFIG_NETFILTER_DEBUG is not set | 229 | # CONFIG_NETFILTER_DEBUG is not set |
230 | CONFIG_NETFILTER_ADVANCED=y | ||
231 | |||
232 | # | ||
233 | # Core Netfilter Configuration | ||
234 | # | ||
235 | CONFIG_NETFILTER_NETLINK=m | ||
236 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
237 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
238 | CONFIG_NF_CONNTRACK=m | ||
239 | CONFIG_NF_CT_ACCT=y | ||
240 | CONFIG_NF_CONNTRACK_MARK=y | ||
241 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
242 | CONFIG_NF_CT_PROTO_GRE=m | ||
243 | CONFIG_NF_CT_PROTO_SCTP=m | ||
244 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
245 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
246 | CONFIG_NF_CONNTRACK_FTP=m | ||
247 | CONFIG_NF_CONNTRACK_H323=m | ||
248 | CONFIG_NF_CONNTRACK_IRC=m | ||
249 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
250 | CONFIG_NF_CONNTRACK_PPTP=m | ||
251 | CONFIG_NF_CONNTRACK_SANE=m | ||
252 | CONFIG_NF_CONNTRACK_SIP=m | ||
253 | CONFIG_NF_CONNTRACK_TFTP=m | ||
254 | # CONFIG_NF_CT_NETLINK is not set | ||
255 | CONFIG_NETFILTER_XTABLES=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
265 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
266 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
294 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
295 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
265 | 296 | ||
266 | # | 297 | # |
267 | # IP: Netfilter Configuration | 298 | # IP: Netfilter Configuration |
268 | # | 299 | # |
269 | CONFIG_IP_NF_CONNTRACK=m | 300 | CONFIG_NF_CONNTRACK_IPV4=m |
270 | # CONFIG_IP_NF_CT_ACCT is not set | 301 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
271 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
272 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
273 | CONFIG_IP_NF_FTP=m | ||
274 | CONFIG_IP_NF_IRC=m | ||
275 | CONFIG_IP_NF_TFTP=m | ||
276 | CONFIG_IP_NF_AMANDA=m | ||
277 | CONFIG_IP_NF_QUEUE=m | 302 | CONFIG_IP_NF_QUEUE=m |
278 | CONFIG_IP_NF_IPTABLES=m | 303 | CONFIG_IP_NF_IPTABLES=m |
279 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
280 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
281 | CONFIG_IP_NF_MATCH_MAC=m | ||
282 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
283 | CONFIG_IP_NF_MATCH_MARK=m | ||
284 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
285 | CONFIG_IP_NF_MATCH_TOS=m | ||
286 | CONFIG_IP_NF_MATCH_RECENT=m | 304 | CONFIG_IP_NF_MATCH_RECENT=m |
287 | CONFIG_IP_NF_MATCH_ECN=m | 305 | CONFIG_IP_NF_MATCH_ECN=m |
288 | CONFIG_IP_NF_MATCH_DSCP=m | 306 | CONFIG_IP_NF_MATCH_AH=m |
289 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
290 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
291 | CONFIG_IP_NF_MATCH_TTL=m | 307 | CONFIG_IP_NF_MATCH_TTL=m |
292 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
293 | CONFIG_IP_NF_MATCH_HELPER=m | ||
294 | CONFIG_IP_NF_MATCH_STATE=m | ||
295 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
296 | CONFIG_IP_NF_MATCH_OWNER=m | ||
297 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 308 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
298 | CONFIG_IP_NF_MATCH_REALM=m | ||
299 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
300 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
301 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
302 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
303 | CONFIG_IP_NF_FILTER=m | 309 | CONFIG_IP_NF_FILTER=m |
304 | CONFIG_IP_NF_TARGET_REJECT=m | 310 | CONFIG_IP_NF_TARGET_REJECT=m |
305 | CONFIG_IP_NF_TARGET_LOG=m | 311 | CONFIG_IP_NF_TARGET_LOG=m |
306 | CONFIG_IP_NF_TARGET_ULOG=m | 312 | CONFIG_IP_NF_TARGET_ULOG=m |
307 | CONFIG_IP_NF_TARGET_TCPMSS=m | 313 | CONFIG_NF_NAT=m |
308 | CONFIG_IP_NF_NAT=m | 314 | CONFIG_NF_NAT_NEEDED=y |
309 | CONFIG_IP_NF_NAT_NEEDED=y | ||
310 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 315 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
311 | CONFIG_IP_NF_TARGET_REDIRECT=m | 316 | CONFIG_IP_NF_TARGET_REDIRECT=m |
312 | CONFIG_IP_NF_TARGET_NETMAP=m | 317 | CONFIG_IP_NF_TARGET_NETMAP=m |
313 | CONFIG_IP_NF_TARGET_SAME=m | 318 | CONFIG_NF_NAT_SNMP_BASIC=m |
314 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 319 | CONFIG_NF_NAT_PROTO_GRE=m |
315 | CONFIG_IP_NF_NAT_IRC=m | 320 | CONFIG_NF_NAT_FTP=m |
316 | CONFIG_IP_NF_NAT_FTP=m | 321 | CONFIG_NF_NAT_IRC=m |
317 | CONFIG_IP_NF_NAT_TFTP=m | 322 | CONFIG_NF_NAT_TFTP=m |
318 | CONFIG_IP_NF_NAT_AMANDA=m | 323 | CONFIG_NF_NAT_AMANDA=m |
324 | CONFIG_NF_NAT_PPTP=m | ||
325 | CONFIG_NF_NAT_H323=m | ||
326 | CONFIG_NF_NAT_SIP=m | ||
319 | CONFIG_IP_NF_MANGLE=m | 327 | CONFIG_IP_NF_MANGLE=m |
320 | CONFIG_IP_NF_TARGET_TOS=m | ||
321 | CONFIG_IP_NF_TARGET_ECN=m | 328 | CONFIG_IP_NF_TARGET_ECN=m |
322 | CONFIG_IP_NF_TARGET_DSCP=m | 329 | CONFIG_IP_NF_TARGET_TTL=m |
323 | CONFIG_IP_NF_TARGET_MARK=m | 330 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
324 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
325 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
326 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
327 | CONFIG_IP_NF_RAW=m | 331 | CONFIG_IP_NF_RAW=m |
328 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
329 | CONFIG_IP_NF_ARPTABLES=m | 332 | CONFIG_IP_NF_ARPTABLES=m |
330 | CONFIG_IP_NF_ARPFILTER=m | 333 | CONFIG_IP_NF_ARPFILTER=m |
331 | CONFIG_IP_NF_ARP_MANGLE=m | 334 | CONFIG_IP_NF_ARP_MANGLE=m |
332 | 335 | ||
333 | # | 336 | # |
334 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 337 | # IPv6: Netfilter Configuration |
335 | # | 338 | # |
339 | CONFIG_NF_CONNTRACK_IPV6=m | ||
336 | CONFIG_IP6_NF_QUEUE=m | 340 | CONFIG_IP6_NF_QUEUE=m |
337 | CONFIG_IP6_NF_IPTABLES=m | 341 | CONFIG_IP6_NF_IPTABLES=m |
338 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
339 | CONFIG_IP6_NF_MATCH_MAC=m | ||
340 | CONFIG_IP6_NF_MATCH_RT=m | 342 | CONFIG_IP6_NF_MATCH_RT=m |
341 | CONFIG_IP6_NF_MATCH_OPTS=m | 343 | CONFIG_IP6_NF_MATCH_OPTS=m |
342 | CONFIG_IP6_NF_MATCH_FRAG=m | 344 | CONFIG_IP6_NF_MATCH_FRAG=m |
343 | CONFIG_IP6_NF_MATCH_HL=m | 345 | CONFIG_IP6_NF_MATCH_HL=m |
344 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
345 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
346 | CONFIG_IP6_NF_MATCH_MARK=m | ||
347 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 346 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
348 | CONFIG_IP6_NF_MATCH_AHESP=m | 347 | CONFIG_IP6_NF_MATCH_AH=m |
349 | CONFIG_IP6_NF_MATCH_LENGTH=m | 348 | CONFIG_IP6_NF_MATCH_MH=m |
350 | CONFIG_IP6_NF_MATCH_EUI64=m | 349 | CONFIG_IP6_NF_MATCH_EUI64=m |
351 | CONFIG_IP6_NF_FILTER=m | 350 | CONFIG_IP6_NF_FILTER=m |
352 | CONFIG_IP6_NF_TARGET_LOG=m | 351 | CONFIG_IP6_NF_TARGET_LOG=m |
352 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
353 | CONFIG_IP6_NF_MANGLE=m | 353 | CONFIG_IP6_NF_MANGLE=m |
354 | CONFIG_IP6_NF_TARGET_MARK=m | 354 | CONFIG_IP6_NF_TARGET_HL=m |
355 | CONFIG_IP6_NF_RAW=m | 355 | CONFIG_IP6_NF_RAW=m |
356 | CONFIG_XFRM=y | 356 | CONFIG_IP_DCCP=m |
357 | CONFIG_XFRM_USER=m | 357 | CONFIG_INET_DCCP_DIAG=m |
358 | CONFIG_IP_DCCP_ACKVEC=y | ||
358 | 359 | ||
359 | # | 360 | # |
360 | # SCTP Configuration (EXPERIMENTAL) | 361 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
361 | # | 362 | # |
363 | CONFIG_IP_DCCP_CCID2=m | ||
364 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
365 | CONFIG_IP_DCCP_CCID3=m | ||
366 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
367 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
368 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
362 | CONFIG_IP_SCTP=m | 369 | CONFIG_IP_SCTP=m |
363 | # CONFIG_SCTP_DBG_MSG is not set | 370 | # CONFIG_SCTP_DBG_MSG is not set |
364 | # CONFIG_SCTP_DBG_OBJCNT is not set | 371 | # CONFIG_SCTP_DBG_OBJCNT is not set |
365 | # CONFIG_SCTP_HMAC_NONE is not set | 372 | # CONFIG_SCTP_HMAC_NONE is not set |
366 | # CONFIG_SCTP_HMAC_SHA1 is not set | 373 | # CONFIG_SCTP_HMAC_SHA1 is not set |
367 | CONFIG_SCTP_HMAC_MD5=y | 374 | CONFIG_SCTP_HMAC_MD5=y |
375 | # CONFIG_TIPC is not set | ||
368 | # CONFIG_ATM is not set | 376 | # CONFIG_ATM is not set |
369 | # CONFIG_BRIDGE is not set | 377 | # CONFIG_BRIDGE is not set |
370 | # CONFIG_VLAN_8021Q is not set | 378 | # CONFIG_VLAN_8021Q is not set |
371 | # CONFIG_DECNET is not set | 379 | # CONFIG_DECNET is not set |
372 | CONFIG_LLC=m | 380 | CONFIG_LLC=m |
373 | # CONFIG_LLC2 is not set | 381 | # CONFIG_LLC2 is not set |
374 | CONFIG_IPX=m | 382 | # CONFIG_IPX is not set |
375 | # CONFIG_IPX_INTERN is not set | ||
376 | CONFIG_ATALK=m | 383 | CONFIG_ATALK=m |
377 | # CONFIG_DEV_APPLETALK is not set | 384 | # CONFIG_DEV_APPLETALK is not set |
378 | # CONFIG_X25 is not set | 385 | # CONFIG_X25 is not set |
379 | # CONFIG_LAPB is not set | 386 | # CONFIG_LAPB is not set |
380 | # CONFIG_NET_DIVERT is not set | ||
381 | # CONFIG_ECONET is not set | 387 | # CONFIG_ECONET is not set |
382 | # CONFIG_WAN_ROUTER is not set | 388 | # CONFIG_WAN_ROUTER is not set |
383 | |||
384 | # | ||
385 | # QoS and/or fair queueing | ||
386 | # | ||
387 | # CONFIG_NET_SCHED is not set | 389 | # CONFIG_NET_SCHED is not set |
388 | CONFIG_NET_CLS_ROUTE=y | 390 | CONFIG_NET_CLS_ROUTE=y |
389 | 391 | ||
@@ -391,46 +393,156 @@ CONFIG_NET_CLS_ROUTE=y | |||
391 | # Network testing | 393 | # Network testing |
392 | # | 394 | # |
393 | # CONFIG_NET_PKTGEN is not set | 395 | # CONFIG_NET_PKTGEN is not set |
394 | CONFIG_NETPOLL=y | ||
395 | # CONFIG_NETPOLL_RX is not set | ||
396 | # CONFIG_NETPOLL_TRAP is not set | ||
397 | CONFIG_NET_POLL_CONTROLLER=y | ||
398 | # CONFIG_HAMRADIO is not set | 396 | # CONFIG_HAMRADIO is not set |
397 | # CONFIG_CAN is not set | ||
399 | # CONFIG_IRDA is not set | 398 | # CONFIG_IRDA is not set |
400 | # CONFIG_BT is not set | 399 | # CONFIG_BT is not set |
401 | CONFIG_NETDEVICES=y | 400 | # CONFIG_AF_RXRPC is not set |
402 | CONFIG_DUMMY=m | ||
403 | # CONFIG_BONDING is not set | ||
404 | CONFIG_EQUALIZER=m | ||
405 | # CONFIG_TUN is not set | ||
406 | 401 | ||
407 | # | 402 | # |
408 | # Ethernet (10 or 100Mbit) | 403 | # Wireless |
409 | # | 404 | # |
410 | CONFIG_NET_ETHERNET=y | 405 | # CONFIG_CFG80211 is not set |
411 | CONFIG_MII=m | 406 | CONFIG_WIRELESS_EXT=y |
412 | CONFIG_MVME16x_NET=y | 407 | # CONFIG_MAC80211 is not set |
408 | CONFIG_IEEE80211=m | ||
409 | # CONFIG_IEEE80211_DEBUG is not set | ||
410 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
411 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
412 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
413 | CONFIG_IEEE80211_SOFTMAC=m | ||
414 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
415 | # CONFIG_RFKILL is not set | ||
416 | # CONFIG_NET_9P is not set | ||
413 | 417 | ||
414 | # | 418 | # |
415 | # Ethernet (1000 Mbit) | 419 | # Device Drivers |
416 | # | 420 | # |
417 | 421 | ||
418 | # | 422 | # |
419 | # Ethernet (10000 Mbit) | 423 | # Generic Driver Options |
420 | # | 424 | # |
425 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
426 | CONFIG_STANDALONE=y | ||
427 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
428 | CONFIG_FW_LOADER=m | ||
429 | # CONFIG_SYS_HYPERVISOR is not set | ||
430 | CONFIG_CONNECTOR=m | ||
431 | # CONFIG_MTD is not set | ||
432 | # CONFIG_PARPORT is not set | ||
433 | CONFIG_BLK_DEV=y | ||
434 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
435 | CONFIG_BLK_DEV_LOOP=y | ||
436 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
437 | CONFIG_BLK_DEV_NBD=m | ||
438 | CONFIG_BLK_DEV_RAM=y | ||
439 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
440 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
441 | # CONFIG_BLK_DEV_XIP is not set | ||
442 | CONFIG_CDROM_PKTCDVD=m | ||
443 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
444 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
445 | CONFIG_ATA_OVER_ETH=m | ||
446 | CONFIG_MISC_DEVICES=y | ||
447 | # CONFIG_EEPROM_93CX6 is not set | ||
448 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
449 | CONFIG_HAVE_IDE=y | ||
450 | # CONFIG_IDE is not set | ||
451 | |||
452 | # | ||
453 | # SCSI device support | ||
454 | # | ||
455 | CONFIG_RAID_ATTRS=m | ||
456 | CONFIG_SCSI=y | ||
457 | CONFIG_SCSI_DMA=y | ||
458 | CONFIG_SCSI_TGT=m | ||
459 | # CONFIG_SCSI_NETLINK is not set | ||
460 | CONFIG_SCSI_PROC_FS=y | ||
421 | 461 | ||
422 | # | 462 | # |
423 | # Token Ring devices | 463 | # SCSI support type (disk, tape, CD-ROM) |
424 | # | 464 | # |
465 | CONFIG_BLK_DEV_SD=y | ||
466 | CONFIG_CHR_DEV_ST=m | ||
467 | CONFIG_CHR_DEV_OSST=m | ||
468 | CONFIG_BLK_DEV_SR=y | ||
469 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
470 | CONFIG_CHR_DEV_SG=m | ||
471 | # CONFIG_CHR_DEV_SCH is not set | ||
425 | 472 | ||
426 | # | 473 | # |
427 | # Wireless LAN (non-hamradio) | 474 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
428 | # | 475 | # |
429 | # CONFIG_NET_RADIO is not set | 476 | # CONFIG_SCSI_MULTI_LUN is not set |
477 | CONFIG_SCSI_CONSTANTS=y | ||
478 | # CONFIG_SCSI_LOGGING is not set | ||
479 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
480 | CONFIG_SCSI_WAIT_SCAN=m | ||
430 | 481 | ||
431 | # | 482 | # |
432 | # Wan interfaces | 483 | # SCSI Transports |
484 | # | ||
485 | CONFIG_SCSI_SPI_ATTRS=y | ||
486 | # CONFIG_SCSI_FC_ATTRS is not set | ||
487 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
488 | CONFIG_SCSI_SAS_ATTRS=m | ||
489 | CONFIG_SCSI_SAS_LIBSAS=m | ||
490 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
491 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
492 | CONFIG_SCSI_SRP_ATTRS=m | ||
493 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
494 | CONFIG_SCSI_LOWLEVEL=y | ||
495 | CONFIG_ISCSI_TCP=m | ||
496 | CONFIG_53C700_BE_BUS=y | ||
497 | # CONFIG_SCSI_DEBUG is not set | ||
498 | CONFIG_MVME16x_SCSI=y | ||
499 | CONFIG_MD=y | ||
500 | CONFIG_BLK_DEV_MD=m | ||
501 | CONFIG_MD_LINEAR=m | ||
502 | CONFIG_MD_RAID0=m | ||
503 | CONFIG_MD_RAID1=m | ||
504 | # CONFIG_MD_RAID10 is not set | ||
505 | CONFIG_MD_RAID456=m | ||
506 | CONFIG_MD_RAID5_RESHAPE=y | ||
507 | CONFIG_MD_MULTIPATH=m | ||
508 | # CONFIG_MD_FAULTY is not set | ||
509 | CONFIG_BLK_DEV_DM=m | ||
510 | # CONFIG_DM_DEBUG is not set | ||
511 | CONFIG_DM_CRYPT=m | ||
512 | CONFIG_DM_SNAPSHOT=m | ||
513 | CONFIG_DM_MIRROR=m | ||
514 | CONFIG_DM_ZERO=m | ||
515 | CONFIG_DM_MULTIPATH=m | ||
516 | CONFIG_DM_MULTIPATH_EMC=m | ||
517 | CONFIG_DM_MULTIPATH_RDAC=m | ||
518 | CONFIG_DM_MULTIPATH_HP=m | ||
519 | # CONFIG_DM_DELAY is not set | ||
520 | CONFIG_DM_UEVENT=y | ||
521 | CONFIG_NETDEVICES=y | ||
522 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
523 | CONFIG_DUMMY=m | ||
524 | # CONFIG_BONDING is not set | ||
525 | CONFIG_MACVLAN=m | ||
526 | CONFIG_EQUALIZER=m | ||
527 | # CONFIG_TUN is not set | ||
528 | CONFIG_VETH=m | ||
529 | # CONFIG_PHYLIB is not set | ||
530 | CONFIG_NET_ETHERNET=y | ||
531 | # CONFIG_MII is not set | ||
532 | CONFIG_MVME16x_NET=y | ||
533 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
534 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
535 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
536 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
537 | # CONFIG_B44 is not set | ||
538 | # CONFIG_NETDEV_1000 is not set | ||
539 | # CONFIG_NETDEV_10000 is not set | ||
540 | |||
433 | # | 541 | # |
542 | # Wireless LAN | ||
543 | # | ||
544 | # CONFIG_WLAN_PRE80211 is not set | ||
545 | # CONFIG_WLAN_80211 is not set | ||
434 | # CONFIG_WAN is not set | 546 | # CONFIG_WAN is not set |
435 | CONFIG_PPP=m | 547 | CONFIG_PPP=m |
436 | # CONFIG_PPP_MULTILINK is not set | 548 | # CONFIG_PPP_MULTILINK is not set |
@@ -439,28 +551,28 @@ CONFIG_PPP_ASYNC=m | |||
439 | CONFIG_PPP_SYNC_TTY=m | 551 | CONFIG_PPP_SYNC_TTY=m |
440 | CONFIG_PPP_DEFLATE=m | 552 | CONFIG_PPP_DEFLATE=m |
441 | CONFIG_PPP_BSDCOMP=m | 553 | CONFIG_PPP_BSDCOMP=m |
554 | CONFIG_PPP_MPPE=m | ||
442 | CONFIG_PPPOE=m | 555 | CONFIG_PPPOE=m |
556 | CONFIG_PPPOL2TP=m | ||
443 | CONFIG_SLIP=m | 557 | CONFIG_SLIP=m |
444 | CONFIG_SLIP_COMPRESSED=y | 558 | CONFIG_SLIP_COMPRESSED=y |
559 | CONFIG_SLHC=m | ||
445 | CONFIG_SLIP_SMART=y | 560 | CONFIG_SLIP_SMART=y |
446 | CONFIG_SLIP_MODE_SLIP6=y | 561 | CONFIG_SLIP_MODE_SLIP6=y |
447 | CONFIG_SHAPER=m | ||
448 | CONFIG_NETCONSOLE=m | 562 | CONFIG_NETCONSOLE=m |
449 | 563 | CONFIG_NETCONSOLE_DYNAMIC=y | |
450 | # | 564 | CONFIG_NETPOLL=y |
451 | # ISDN subsystem | 565 | # CONFIG_NETPOLL_TRAP is not set |
452 | # | 566 | CONFIG_NET_POLL_CONTROLLER=y |
453 | # CONFIG_ISDN is not set | 567 | # CONFIG_ISDN is not set |
454 | |||
455 | # | ||
456 | # Telephony Support | ||
457 | # | ||
458 | # CONFIG_PHONE is not set | 568 | # CONFIG_PHONE is not set |
459 | 569 | ||
460 | # | 570 | # |
461 | # Input device support | 571 | # Input device support |
462 | # | 572 | # |
463 | CONFIG_INPUT=y | 573 | CONFIG_INPUT=y |
574 | CONFIG_INPUT_FF_MEMLESS=m | ||
575 | # CONFIG_INPUT_POLLDEV is not set | ||
464 | 576 | ||
465 | # | 577 | # |
466 | # Userland interfaces | 578 | # Userland interfaces |
@@ -470,7 +582,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
470 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 582 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
471 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 583 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
472 | # CONFIG_INPUT_JOYDEV is not set | 584 | # CONFIG_INPUT_JOYDEV is not set |
473 | # CONFIG_INPUT_TSDEV is not set | ||
474 | # CONFIG_INPUT_EVDEV is not set | 585 | # CONFIG_INPUT_EVDEV is not set |
475 | # CONFIG_INPUT_EVBUG is not set | 586 | # CONFIG_INPUT_EVBUG is not set |
476 | 587 | ||
@@ -483,11 +594,19 @@ CONFIG_INPUT_KEYBOARD=y | |||
483 | # CONFIG_KEYBOARD_LKKBD is not set | 594 | # CONFIG_KEYBOARD_LKKBD is not set |
484 | # CONFIG_KEYBOARD_XTKBD is not set | 595 | # CONFIG_KEYBOARD_XTKBD is not set |
485 | # CONFIG_KEYBOARD_NEWTON is not set | 596 | # CONFIG_KEYBOARD_NEWTON is not set |
597 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
486 | CONFIG_INPUT_MOUSE=y | 598 | CONFIG_INPUT_MOUSE=y |
487 | CONFIG_MOUSE_PS2=m | 599 | CONFIG_MOUSE_PS2=m |
600 | CONFIG_MOUSE_PS2_ALPS=y | ||
601 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
602 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
603 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
604 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
605 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
488 | CONFIG_MOUSE_SERIAL=m | 606 | CONFIG_MOUSE_SERIAL=m |
489 | # CONFIG_MOUSE_VSXXXAA is not set | 607 | # CONFIG_MOUSE_VSXXXAA is not set |
490 | # CONFIG_INPUT_JOYSTICK is not set | 608 | # CONFIG_INPUT_JOYSTICK is not set |
609 | # CONFIG_INPUT_TABLET is not set | ||
491 | # CONFIG_INPUT_TOUCHSCREEN is not set | 610 | # CONFIG_INPUT_TOUCHSCREEN is not set |
492 | # CONFIG_INPUT_MISC is not set | 611 | # CONFIG_INPUT_MISC is not set |
493 | 612 | ||
@@ -495,7 +614,7 @@ CONFIG_MOUSE_SERIAL=m | |||
495 | # Hardware I/O ports | 614 | # Hardware I/O ports |
496 | # | 615 | # |
497 | CONFIG_SERIO=m | 616 | CONFIG_SERIO=m |
498 | CONFIG_SERIO_SERPORT=m | 617 | # CONFIG_SERIO_SERPORT is not set |
499 | CONFIG_SERIO_LIBPS2=m | 618 | CONFIG_SERIO_LIBPS2=m |
500 | # CONFIG_SERIO_RAW is not set | 619 | # CONFIG_SERIO_RAW is not set |
501 | # CONFIG_GAMEPORT is not set | 620 | # CONFIG_GAMEPORT is not set |
@@ -506,6 +625,7 @@ CONFIG_SERIO_LIBPS2=m | |||
506 | CONFIG_VT=y | 625 | CONFIG_VT=y |
507 | CONFIG_VT_CONSOLE=y | 626 | CONFIG_VT_CONSOLE=y |
508 | CONFIG_HW_CONSOLE=y | 627 | CONFIG_HW_CONSOLE=y |
628 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
509 | # CONFIG_SERIAL_NONSTANDARD is not set | 629 | # CONFIG_SERIAL_NONSTANDARD is not set |
510 | 630 | ||
511 | # | 631 | # |
@@ -519,116 +639,85 @@ CONFIG_HW_CONSOLE=y | |||
519 | CONFIG_UNIX98_PTYS=y | 639 | CONFIG_UNIX98_PTYS=y |
520 | CONFIG_LEGACY_PTYS=y | 640 | CONFIG_LEGACY_PTYS=y |
521 | CONFIG_LEGACY_PTY_COUNT=256 | 641 | CONFIG_LEGACY_PTY_COUNT=256 |
522 | |||
523 | # | ||
524 | # IPMI | ||
525 | # | ||
526 | # CONFIG_IPMI_HANDLER is not set | 642 | # CONFIG_IPMI_HANDLER is not set |
527 | 643 | # CONFIG_HW_RANDOM is not set | |
528 | # | ||
529 | # Watchdog Cards | ||
530 | # | ||
531 | # CONFIG_WATCHDOG is not set | ||
532 | CONFIG_GEN_RTC=m | 644 | CONFIG_GEN_RTC=m |
533 | CONFIG_GEN_RTC_X=y | 645 | CONFIG_GEN_RTC_X=y |
534 | # CONFIG_DTLK is not set | ||
535 | # CONFIG_R3964 is not set | 646 | # CONFIG_R3964 is not set |
536 | |||
537 | # | ||
538 | # Ftape, the floppy tape device driver | ||
539 | # | ||
540 | # CONFIG_DRM is not set | ||
541 | # CONFIG_RAW_DRIVER is not set | 647 | # CONFIG_RAW_DRIVER is not set |
648 | # CONFIG_TCG_TPM is not set | ||
649 | # CONFIG_I2C is not set | ||
542 | 650 | ||
543 | # | 651 | # |
544 | # TPM devices | 652 | # SPI support |
545 | # | 653 | # |
654 | # CONFIG_SPI is not set | ||
655 | # CONFIG_SPI_MASTER is not set | ||
656 | # CONFIG_W1 is not set | ||
657 | # CONFIG_POWER_SUPPLY is not set | ||
658 | # CONFIG_HWMON is not set | ||
659 | # CONFIG_THERMAL is not set | ||
660 | # CONFIG_WATCHDOG is not set | ||
546 | 661 | ||
547 | # | 662 | # |
548 | # I2C support | 663 | # Sonics Silicon Backplane |
549 | # | 664 | # |
550 | # CONFIG_I2C is not set | 665 | CONFIG_SSB_POSSIBLE=y |
666 | # CONFIG_SSB is not set | ||
551 | 667 | ||
552 | # | 668 | # |
553 | # Dallas's 1-wire bus | 669 | # Multifunction device drivers |
554 | # | ||
555 | # CONFIG_W1 is not set | ||
556 | |||
557 | # | ||
558 | # Misc devices | ||
559 | # | 670 | # |
671 | # CONFIG_MFD_SM501 is not set | ||
560 | 672 | ||
561 | # | 673 | # |
562 | # Multimedia devices | 674 | # Multimedia devices |
563 | # | 675 | # |
564 | # CONFIG_VIDEO_DEV is not set | 676 | # CONFIG_VIDEO_DEV is not set |
677 | # CONFIG_DVB_CORE is not set | ||
678 | # CONFIG_DAB is not set | ||
565 | 679 | ||
566 | # | 680 | # |
567 | # Digital Video Broadcasting Devices | 681 | # Graphics support |
568 | # | 682 | # |
569 | # CONFIG_DVB is not set | 683 | # CONFIG_VGASTATE is not set |
684 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
685 | # CONFIG_FB is not set | ||
686 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
570 | 687 | ||
571 | # | 688 | # |
572 | # Graphics support | 689 | # Display device support |
573 | # | 690 | # |
574 | CONFIG_FB=y | 691 | # CONFIG_DISPLAY_SUPPORT is not set |
575 | # CONFIG_FB_CFB_FILLRECT is not set | ||
576 | # CONFIG_FB_CFB_COPYAREA is not set | ||
577 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
578 | # CONFIG_FB_SOFT_CURSOR is not set | ||
579 | # CONFIG_FB_MACMODES is not set | ||
580 | CONFIG_FB_MODE_HELPERS=y | ||
581 | # CONFIG_FB_TILEBLITTING is not set | ||
582 | # CONFIG_FB_S1D13XXX is not set | ||
583 | # CONFIG_FB_VIRTUAL is not set | ||
584 | 692 | ||
585 | # | 693 | # |
586 | # Console display driver support | 694 | # Console display driver support |
587 | # | 695 | # |
588 | CONFIG_DUMMY_CONSOLE=y | 696 | CONFIG_DUMMY_CONSOLE=y |
589 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
590 | # CONFIG_FONTS is not set | ||
591 | CONFIG_FONT_8x8=y | ||
592 | CONFIG_FONT_8x16=y | ||
593 | |||
594 | # | ||
595 | # Logo configuration | ||
596 | # | ||
597 | CONFIG_LOGO=y | ||
598 | CONFIG_LOGO_LINUX_MONO=y | ||
599 | CONFIG_LOGO_LINUX_VGA16=y | ||
600 | CONFIG_LOGO_LINUX_CLUT224=y | ||
601 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
602 | 697 | ||
603 | # | 698 | # |
604 | # Sound | 699 | # Sound |
605 | # | 700 | # |
606 | # CONFIG_SOUND is not set | 701 | # CONFIG_SOUND is not set |
607 | 702 | CONFIG_HID_SUPPORT=y | |
608 | # | 703 | CONFIG_HID=m |
609 | # USB support | 704 | # CONFIG_HID_DEBUG is not set |
610 | # | 705 | CONFIG_HIDRAW=y |
611 | # CONFIG_USB_ARCH_HAS_HCD is not set | 706 | # CONFIG_USB_SUPPORT is not set |
612 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
613 | |||
614 | # | ||
615 | # USB Gadget Support | ||
616 | # | ||
617 | # CONFIG_USB_GADGET is not set | ||
618 | |||
619 | # | ||
620 | # MMC/SD Card support | ||
621 | # | ||
622 | # CONFIG_MMC is not set | 707 | # CONFIG_MMC is not set |
708 | # CONFIG_MEMSTICK is not set | ||
709 | # CONFIG_NEW_LEDS is not set | ||
710 | # CONFIG_RTC_CLASS is not set | ||
623 | 711 | ||
624 | # | 712 | # |
625 | # InfiniBand support | 713 | # Userspace I/O |
626 | # | 714 | # |
627 | # CONFIG_INFINIBAND is not set | 715 | # CONFIG_UIO is not set |
628 | 716 | ||
629 | # | 717 | # |
630 | # Character devices | 718 | # Character devices |
631 | # | 719 | # |
720 | CONFIG_SERIAL167=y | ||
632 | CONFIG_MVME162_SCC=y | 721 | CONFIG_MVME162_SCC=y |
633 | CONFIG_SERIAL_CONSOLE=y | 722 | CONFIG_SERIAL_CONSOLE=y |
634 | 723 | ||
@@ -637,10 +726,11 @@ CONFIG_SERIAL_CONSOLE=y | |||
637 | # | 726 | # |
638 | CONFIG_EXT2_FS=y | 727 | CONFIG_EXT2_FS=y |
639 | # CONFIG_EXT2_FS_XATTR is not set | 728 | # CONFIG_EXT2_FS_XATTR is not set |
729 | # CONFIG_EXT2_FS_XIP is not set | ||
640 | CONFIG_EXT3_FS=y | 730 | CONFIG_EXT3_FS=y |
641 | # CONFIG_EXT3_FS_XATTR is not set | 731 | # CONFIG_EXT3_FS_XATTR is not set |
732 | # CONFIG_EXT4DEV_FS is not set | ||
642 | CONFIG_JBD=y | 733 | CONFIG_JBD=y |
643 | # CONFIG_JBD_DEBUG is not set | ||
644 | CONFIG_REISERFS_FS=m | 734 | CONFIG_REISERFS_FS=m |
645 | # CONFIG_REISERFS_CHECK is not set | 735 | # CONFIG_REISERFS_CHECK is not set |
646 | # CONFIG_REISERFS_PROC_INFO is not set | 736 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -651,25 +741,29 @@ CONFIG_JFS_FS=m | |||
651 | # CONFIG_JFS_DEBUG is not set | 741 | # CONFIG_JFS_DEBUG is not set |
652 | # CONFIG_JFS_STATISTICS is not set | 742 | # CONFIG_JFS_STATISTICS is not set |
653 | CONFIG_FS_POSIX_ACL=y | 743 | CONFIG_FS_POSIX_ACL=y |
654 | |||
655 | # | ||
656 | # XFS support | ||
657 | # | ||
658 | CONFIG_XFS_FS=m | 744 | CONFIG_XFS_FS=m |
659 | CONFIG_XFS_EXPORT=y | ||
660 | # CONFIG_XFS_RT is not set | ||
661 | # CONFIG_XFS_QUOTA is not set | 745 | # CONFIG_XFS_QUOTA is not set |
662 | # CONFIG_XFS_SECURITY is not set | 746 | # CONFIG_XFS_SECURITY is not set |
663 | # CONFIG_XFS_POSIX_ACL is not set | 747 | # CONFIG_XFS_POSIX_ACL is not set |
664 | CONFIG_MINIX_FS=y | 748 | # CONFIG_XFS_RT is not set |
665 | # CONFIG_ROMFS_FS is not set | 749 | CONFIG_GFS2_FS=m |
750 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
751 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
752 | CONFIG_OCFS2_FS=m | ||
753 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
754 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
755 | CONFIG_DNOTIFY=y | ||
756 | CONFIG_INOTIFY=y | ||
757 | CONFIG_INOTIFY_USER=y | ||
666 | CONFIG_QUOTA=y | 758 | CONFIG_QUOTA=y |
759 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
760 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
667 | # CONFIG_QFMT_V1 is not set | 761 | # CONFIG_QFMT_V1 is not set |
668 | # CONFIG_QFMT_V2 is not set | 762 | # CONFIG_QFMT_V2 is not set |
669 | CONFIG_QUOTACTL=y | 763 | CONFIG_QUOTACTL=y |
670 | CONFIG_DNOTIFY=y | ||
671 | CONFIG_AUTOFS_FS=m | 764 | CONFIG_AUTOFS_FS=m |
672 | CONFIG_AUTOFS4_FS=m | 765 | CONFIG_AUTOFS4_FS=m |
766 | CONFIG_FUSE_FS=m | ||
673 | 767 | ||
674 | # | 768 | # |
675 | # CD-ROM/DVD Filesystems | 769 | # CD-ROM/DVD Filesystems |
@@ -677,7 +771,6 @@ CONFIG_AUTOFS4_FS=m | |||
677 | CONFIG_ISO9660_FS=y | 771 | CONFIG_ISO9660_FS=y |
678 | CONFIG_JOLIET=y | 772 | CONFIG_JOLIET=y |
679 | CONFIG_ZISOFS=y | 773 | CONFIG_ZISOFS=y |
680 | CONFIG_ZISOFS_FS=y | ||
681 | CONFIG_UDF_FS=m | 774 | CONFIG_UDF_FS=m |
682 | CONFIG_UDF_NLS=y | 775 | CONFIG_UDF_NLS=y |
683 | 776 | ||
@@ -696,15 +789,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
696 | # | 789 | # |
697 | CONFIG_PROC_FS=y | 790 | CONFIG_PROC_FS=y |
698 | CONFIG_PROC_KCORE=y | 791 | CONFIG_PROC_KCORE=y |
792 | CONFIG_PROC_SYSCTL=y | ||
699 | CONFIG_SYSFS=y | 793 | CONFIG_SYSFS=y |
700 | CONFIG_DEVFS_FS=y | ||
701 | # CONFIG_DEVFS_MOUNT is not set | ||
702 | # CONFIG_DEVFS_DEBUG is not set | ||
703 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
704 | CONFIG_TMPFS=y | 794 | CONFIG_TMPFS=y |
705 | # CONFIG_TMPFS_XATTR is not set | 795 | # CONFIG_TMPFS_POSIX_ACL is not set |
706 | # CONFIG_HUGETLB_PAGE is not set | 796 | # CONFIG_HUGETLB_PAGE is not set |
707 | CONFIG_RAMFS=y | 797 | CONFIG_CONFIGFS_FS=m |
708 | 798 | ||
709 | # | 799 | # |
710 | # Miscellaneous filesystems | 800 | # Miscellaneous filesystems |
@@ -718,44 +808,40 @@ CONFIG_HFSPLUS_FS=m | |||
718 | # CONFIG_EFS_FS is not set | 808 | # CONFIG_EFS_FS is not set |
719 | CONFIG_CRAMFS=m | 809 | CONFIG_CRAMFS=m |
720 | # CONFIG_VXFS_FS is not set | 810 | # CONFIG_VXFS_FS is not set |
811 | CONFIG_MINIX_FS=y | ||
721 | CONFIG_HPFS_FS=m | 812 | CONFIG_HPFS_FS=m |
722 | # CONFIG_QNX4FS_FS is not set | 813 | # CONFIG_QNX4FS_FS is not set |
814 | # CONFIG_ROMFS_FS is not set | ||
723 | CONFIG_SYSV_FS=m | 815 | CONFIG_SYSV_FS=m |
724 | CONFIG_UFS_FS=m | 816 | CONFIG_UFS_FS=m |
725 | # CONFIG_UFS_FS_WRITE is not set | 817 | # CONFIG_UFS_FS_WRITE is not set |
726 | 818 | # CONFIG_UFS_DEBUG is not set | |
727 | # | 819 | CONFIG_NETWORK_FILESYSTEMS=y |
728 | # Network File Systems | ||
729 | # | ||
730 | CONFIG_NFS_FS=y | 820 | CONFIG_NFS_FS=y |
731 | CONFIG_NFS_V3=y | 821 | CONFIG_NFS_V3=y |
822 | # CONFIG_NFS_V3_ACL is not set | ||
732 | CONFIG_NFS_V4=y | 823 | CONFIG_NFS_V4=y |
733 | # CONFIG_NFS_DIRECTIO is not set | 824 | # CONFIG_NFS_DIRECTIO is not set |
734 | CONFIG_NFSD=m | 825 | CONFIG_NFSD=m |
735 | CONFIG_NFSD_V3=y | 826 | CONFIG_NFSD_V3=y |
736 | CONFIG_NFSD_V4=y | 827 | # CONFIG_NFSD_V3_ACL is not set |
828 | # CONFIG_NFSD_V4 is not set | ||
737 | CONFIG_NFSD_TCP=y | 829 | CONFIG_NFSD_TCP=y |
738 | CONFIG_ROOT_NFS=y | 830 | CONFIG_ROOT_NFS=y |
739 | CONFIG_LOCKD=y | 831 | CONFIG_LOCKD=y |
740 | CONFIG_LOCKD_V4=y | 832 | CONFIG_LOCKD_V4=y |
741 | CONFIG_EXPORTFS=m | 833 | CONFIG_EXPORTFS=m |
834 | CONFIG_NFS_COMMON=y | ||
742 | CONFIG_SUNRPC=y | 835 | CONFIG_SUNRPC=y |
743 | CONFIG_SUNRPC_GSS=y | 836 | CONFIG_SUNRPC_GSS=y |
837 | CONFIG_SUNRPC_BIND34=y | ||
744 | CONFIG_RPCSEC_GSS_KRB5=y | 838 | CONFIG_RPCSEC_GSS_KRB5=y |
745 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 839 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
746 | CONFIG_SMB_FS=m | 840 | CONFIG_SMB_FS=m |
747 | CONFIG_SMB_NLS_DEFAULT=y | 841 | CONFIG_SMB_NLS_DEFAULT=y |
748 | CONFIG_SMB_NLS_REMOTE="cp437" | 842 | CONFIG_SMB_NLS_REMOTE="cp437" |
749 | # CONFIG_CIFS is not set | 843 | # CONFIG_CIFS is not set |
750 | CONFIG_NCP_FS=m | 844 | # CONFIG_NCP_FS is not set |
751 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
752 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
753 | # CONFIG_NCPFS_STRONG is not set | ||
754 | # CONFIG_NCPFS_NFS_NS is not set | ||
755 | # CONFIG_NCPFS_OS2_NS is not set | ||
756 | # CONFIG_NCPFS_SMALLDOS is not set | ||
757 | CONFIG_NCPFS_NLS=y | ||
758 | # CONFIG_NCPFS_EXTRAS is not set | ||
759 | CONFIG_CODA_FS=m | 845 | CONFIG_CODA_FS=m |
760 | # CONFIG_CODA_FS_OLD_API is not set | 846 | # CONFIG_CODA_FS_OLD_API is not set |
761 | # CONFIG_AFS_FS is not set | 847 | # CONFIG_AFS_FS is not set |
@@ -765,10 +851,7 @@ CONFIG_CODA_FS=m | |||
765 | # | 851 | # |
766 | # CONFIG_PARTITION_ADVANCED is not set | 852 | # CONFIG_PARTITION_ADVANCED is not set |
767 | CONFIG_MSDOS_PARTITION=y | 853 | CONFIG_MSDOS_PARTITION=y |
768 | 854 | CONFIG_SYSV68_PARTITION=y | |
769 | # | ||
770 | # Native Language Support | ||
771 | # | ||
772 | CONFIG_NLS=y | 855 | CONFIG_NLS=y |
773 | CONFIG_NLS_DEFAULT="iso8859-1" | 856 | CONFIG_NLS_DEFAULT="iso8859-1" |
774 | CONFIG_NLS_CODEPAGE_437=y | 857 | CONFIG_NLS_CODEPAGE_437=y |
@@ -809,35 +892,42 @@ CONFIG_NLS_ISO8859_15=m | |||
809 | CONFIG_NLS_KOI8_R=m | 892 | CONFIG_NLS_KOI8_R=m |
810 | CONFIG_NLS_KOI8_U=m | 893 | CONFIG_NLS_KOI8_U=m |
811 | CONFIG_NLS_UTF8=m | 894 | CONFIG_NLS_UTF8=m |
895 | CONFIG_DLM=m | ||
896 | # CONFIG_DLM_DEBUG is not set | ||
812 | 897 | ||
813 | # | 898 | # |
814 | # Kernel hacking | 899 | # Kernel hacking |
815 | # | 900 | # |
816 | # CONFIG_PRINTK_TIME is not set | 901 | # CONFIG_PRINTK_TIME is not set |
817 | CONFIG_DEBUG_KERNEL=y | 902 | CONFIG_ENABLE_WARN_DEPRECATED=y |
903 | CONFIG_ENABLE_MUST_CHECK=y | ||
818 | CONFIG_MAGIC_SYSRQ=y | 904 | CONFIG_MAGIC_SYSRQ=y |
819 | CONFIG_LOG_BUF_SHIFT=16 | 905 | # CONFIG_UNUSED_SYMBOLS is not set |
820 | # CONFIG_SCHEDSTATS is not set | ||
821 | # CONFIG_DEBUG_SLAB is not set | ||
822 | # CONFIG_DEBUG_SPINLOCK is not set | ||
823 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
824 | # CONFIG_DEBUG_KOBJECT is not set | ||
825 | CONFIG_DEBUG_BUGVERBOSE=y | ||
826 | # CONFIG_DEBUG_INFO is not set | ||
827 | # CONFIG_DEBUG_FS is not set | 906 | # CONFIG_DEBUG_FS is not set |
828 | # CONFIG_FRAME_POINTER is not set | 907 | # CONFIG_HEADERS_CHECK is not set |
908 | # CONFIG_DEBUG_KERNEL is not set | ||
909 | CONFIG_DEBUG_BUGVERBOSE=y | ||
910 | # CONFIG_SAMPLES is not set | ||
829 | 911 | ||
830 | # | 912 | # |
831 | # Security options | 913 | # Security options |
832 | # | 914 | # |
833 | # CONFIG_KEYS is not set | 915 | # CONFIG_KEYS is not set |
834 | # CONFIG_SECURITY is not set | 916 | # CONFIG_SECURITY is not set |
835 | 917 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
836 | # | 918 | CONFIG_XOR_BLOCKS=m |
837 | # Cryptographic options | 919 | CONFIG_ASYNC_CORE=m |
838 | # | 920 | CONFIG_ASYNC_MEMCPY=m |
921 | CONFIG_ASYNC_XOR=m | ||
839 | CONFIG_CRYPTO=y | 922 | CONFIG_CRYPTO=y |
923 | CONFIG_CRYPTO_ALGAPI=y | ||
924 | CONFIG_CRYPTO_AEAD=m | ||
925 | CONFIG_CRYPTO_BLKCIPHER=y | ||
926 | CONFIG_CRYPTO_SEQIV=m | ||
927 | CONFIG_CRYPTO_HASH=y | ||
928 | CONFIG_CRYPTO_MANAGER=y | ||
840 | CONFIG_CRYPTO_HMAC=y | 929 | CONFIG_CRYPTO_HMAC=y |
930 | CONFIG_CRYPTO_XCBC=m | ||
841 | CONFIG_CRYPTO_NULL=m | 931 | CONFIG_CRYPTO_NULL=m |
842 | CONFIG_CRYPTO_MD4=m | 932 | CONFIG_CRYPTO_MD4=m |
843 | CONFIG_CRYPTO_MD5=y | 933 | CONFIG_CRYPTO_MD5=y |
@@ -846,9 +936,21 @@ CONFIG_CRYPTO_SHA256=m | |||
846 | CONFIG_CRYPTO_SHA512=m | 936 | CONFIG_CRYPTO_SHA512=m |
847 | CONFIG_CRYPTO_WP512=m | 937 | CONFIG_CRYPTO_WP512=m |
848 | CONFIG_CRYPTO_TGR192=m | 938 | CONFIG_CRYPTO_TGR192=m |
939 | CONFIG_CRYPTO_GF128MUL=m | ||
940 | CONFIG_CRYPTO_ECB=m | ||
941 | CONFIG_CRYPTO_CBC=y | ||
942 | CONFIG_CRYPTO_PCBC=m | ||
943 | CONFIG_CRYPTO_LRW=m | ||
944 | CONFIG_CRYPTO_XTS=m | ||
945 | CONFIG_CRYPTO_CTR=m | ||
946 | CONFIG_CRYPTO_GCM=m | ||
947 | CONFIG_CRYPTO_CCM=m | ||
948 | CONFIG_CRYPTO_CRYPTD=m | ||
849 | CONFIG_CRYPTO_DES=y | 949 | CONFIG_CRYPTO_DES=y |
950 | CONFIG_CRYPTO_FCRYPT=m | ||
850 | CONFIG_CRYPTO_BLOWFISH=m | 951 | CONFIG_CRYPTO_BLOWFISH=m |
851 | CONFIG_CRYPTO_TWOFISH=m | 952 | CONFIG_CRYPTO_TWOFISH=m |
953 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
852 | CONFIG_CRYPTO_SERPENT=m | 954 | CONFIG_CRYPTO_SERPENT=m |
853 | CONFIG_CRYPTO_AES=m | 955 | CONFIG_CRYPTO_AES=m |
854 | CONFIG_CRYPTO_CAST5=m | 956 | CONFIG_CRYPTO_CAST5=m |
@@ -857,20 +959,35 @@ CONFIG_CRYPTO_TEA=m | |||
857 | CONFIG_CRYPTO_ARC4=m | 959 | CONFIG_CRYPTO_ARC4=m |
858 | CONFIG_CRYPTO_KHAZAD=m | 960 | CONFIG_CRYPTO_KHAZAD=m |
859 | CONFIG_CRYPTO_ANUBIS=m | 961 | CONFIG_CRYPTO_ANUBIS=m |
962 | CONFIG_CRYPTO_SEED=m | ||
963 | CONFIG_CRYPTO_SALSA20=m | ||
860 | CONFIG_CRYPTO_DEFLATE=m | 964 | CONFIG_CRYPTO_DEFLATE=m |
861 | CONFIG_CRYPTO_MICHAEL_MIC=m | 965 | CONFIG_CRYPTO_MICHAEL_MIC=m |
862 | CONFIG_CRYPTO_CRC32C=m | 966 | CONFIG_CRYPTO_CRC32C=m |
967 | CONFIG_CRYPTO_CAMELLIA=m | ||
863 | CONFIG_CRYPTO_TEST=m | 968 | CONFIG_CRYPTO_TEST=m |
864 | 969 | CONFIG_CRYPTO_AUTHENC=m | |
865 | # | 970 | CONFIG_CRYPTO_LZO=m |
866 | # Hardware crypto devices | 971 | # CONFIG_CRYPTO_HW is not set |
867 | # | ||
868 | 972 | ||
869 | # | 973 | # |
870 | # Library routines | 974 | # Library routines |
871 | # | 975 | # |
976 | CONFIG_BITREVERSE=y | ||
872 | CONFIG_CRC_CCITT=m | 977 | CONFIG_CRC_CCITT=m |
978 | CONFIG_CRC16=m | ||
979 | # CONFIG_CRC_ITU_T is not set | ||
873 | CONFIG_CRC32=y | 980 | CONFIG_CRC32=y |
981 | # CONFIG_CRC7 is not set | ||
874 | CONFIG_LIBCRC32C=m | 982 | CONFIG_LIBCRC32C=m |
875 | CONFIG_ZLIB_INFLATE=y | 983 | CONFIG_ZLIB_INFLATE=y |
876 | CONFIG_ZLIB_DEFLATE=m | 984 | CONFIG_ZLIB_DEFLATE=m |
985 | CONFIG_LZO_COMPRESS=m | ||
986 | CONFIG_LZO_DECOMPRESS=m | ||
987 | CONFIG_TEXTSEARCH=y | ||
988 | CONFIG_TEXTSEARCH_KMP=m | ||
989 | CONFIG_TEXTSEARCH_BM=m | ||
990 | CONFIG_TEXTSEARCH_FSM=m | ||
991 | CONFIG_PLIST=y | ||
992 | CONFIG_HAS_IOMEM=y | ||
993 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 856238634d42..165658fe73eb 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -1,63 +1,112 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:34:58 2005 | 4 | # Wed Apr 2 20:46:20 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
16 | CONFIG_NO_IOPORT=y | ||
17 | # CONFIG_NO_DMA is not set | ||
18 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
19 | CONFIG_HZ=100 | ||
20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 21 | ||
12 | # | 22 | # |
13 | # Code maturity level options | 23 | # General setup |
14 | # | 24 | # |
15 | CONFIG_EXPERIMENTAL=y | 25 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 26 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-q40" | 28 | CONFIG_LOCALVERSION="-q40" |
29 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 30 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 31 | CONFIG_SYSVIPC=y |
32 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 33 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 34 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 35 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 36 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 37 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 38 | # CONFIG_IKCONFIG is not set |
39 | CONFIG_LOG_BUF_SHIFT=14 | ||
40 | # CONFIG_CGROUPS is not set | ||
41 | # CONFIG_GROUP_SCHED is not set | ||
42 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
43 | CONFIG_RELAY=y | ||
44 | CONFIG_NAMESPACES=y | ||
45 | # CONFIG_UTS_NS is not set | ||
46 | # CONFIG_IPC_NS is not set | ||
47 | # CONFIG_USER_NS is not set | ||
48 | # CONFIG_PID_NS is not set | ||
49 | CONFIG_BLK_DEV_INITRD=y | ||
50 | CONFIG_INITRAMFS_SOURCE="" | ||
51 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
52 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 53 | # CONFIG_EMBEDDED is not set |
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 56 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
58 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | ||
62 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 66 | CONFIG_EPOLL=y |
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 70 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 71 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 72 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 73 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 74 | # CONFIG_SLOB is not set |
75 | # CONFIG_PROFILING is not set | ||
76 | # CONFIG_MARKERS is not set | ||
77 | # CONFIG_HAVE_OPROFILE is not set | ||
78 | # CONFIG_HAVE_KPROBES is not set | ||
79 | # CONFIG_HAVE_KRETPROBES is not set | ||
80 | CONFIG_PROC_PAGE_MONITOR=y | ||
81 | CONFIG_SLABINFO=y | ||
82 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 83 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 84 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 85 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 86 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 87 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 88 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 89 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 90 | CONFIG_KMOD=y |
91 | CONFIG_BLOCK=y | ||
92 | # CONFIG_LBD is not set | ||
93 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
94 | # CONFIG_LSF is not set | ||
95 | CONFIG_BLK_DEV_BSG=y | ||
96 | |||
97 | # | ||
98 | # IO Schedulers | ||
99 | # | ||
100 | CONFIG_IOSCHED_NOOP=y | ||
101 | CONFIG_IOSCHED_AS=y | ||
102 | CONFIG_IOSCHED_DEADLINE=y | ||
103 | CONFIG_IOSCHED_CFQ=y | ||
104 | CONFIG_DEFAULT_AS=y | ||
105 | # CONFIG_DEFAULT_DEADLINE is not set | ||
106 | # CONFIG_DEFAULT_CFQ is not set | ||
107 | # CONFIG_DEFAULT_NOOP is not set | ||
108 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
109 | CONFIG_CLASSIC_RCU=y | ||
61 | 110 | ||
62 | # | 111 | # |
63 | # Platform dependent setup | 112 | # Platform dependent setup |
@@ -80,10 +129,24 @@ CONFIG_Q40=y | |||
80 | CONFIG_M68040=y | 129 | CONFIG_M68040=y |
81 | CONFIG_M68060=y | 130 | CONFIG_M68060=y |
82 | CONFIG_MMU_MOTOROLA=y | 131 | CONFIG_MMU_MOTOROLA=y |
83 | CONFIG_M68KFPU_EMU=y | 132 | # CONFIG_M68KFPU_EMU is not set |
84 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
85 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
86 | # CONFIG_ADVANCED is not set | 133 | # CONFIG_ADVANCED is not set |
134 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
135 | CONFIG_NODES_SHIFT=3 | ||
136 | CONFIG_SELECT_MEMORY_MODEL=y | ||
137 | # CONFIG_FLATMEM_MANUAL is not set | ||
138 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
139 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
140 | CONFIG_DISCONTIGMEM=y | ||
141 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
142 | CONFIG_NEED_MULTIPLE_NODES=y | ||
143 | # CONFIG_SPARSEMEM_STATIC is not set | ||
144 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
145 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
146 | # CONFIG_RESOURCES_64BIT is not set | ||
147 | CONFIG_ZONE_DMA_FLAG=1 | ||
148 | CONFIG_BOUNCE=y | ||
149 | CONFIG_VIRT_TO_BUS=y | ||
87 | 150 | ||
88 | # | 151 | # |
89 | # General setup | 152 | # General setup |
@@ -91,41 +154,282 @@ CONFIG_M68KFPU_EMU_EXTRAPREC=y | |||
91 | CONFIG_BINFMT_ELF=y | 154 | CONFIG_BINFMT_ELF=y |
92 | CONFIG_BINFMT_AOUT=m | 155 | CONFIG_BINFMT_AOUT=m |
93 | CONFIG_BINFMT_MISC=m | 156 | CONFIG_BINFMT_MISC=m |
94 | # CONFIG_HEARTBEAT is not set | 157 | CONFIG_HEARTBEAT=y |
95 | CONFIG_PROC_HARDWARE=y | 158 | CONFIG_PROC_HARDWARE=y |
96 | CONFIG_ISA=y | 159 | CONFIG_ISA=y |
97 | CONFIG_GENERIC_ISA_DMA=y | 160 | CONFIG_GENERIC_ISA_DMA=y |
161 | CONFIG_ZONE_DMA=y | ||
162 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
98 | 163 | ||
99 | # | 164 | # |
100 | # Device Drivers | 165 | # Networking |
101 | # | 166 | # |
167 | CONFIG_NET=y | ||
102 | 168 | ||
103 | # | 169 | # |
104 | # Generic Driver Options | 170 | # Networking options |
105 | # | 171 | # |
106 | CONFIG_STANDALONE=y | 172 | CONFIG_PACKET=y |
107 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 173 | # CONFIG_PACKET_MMAP is not set |
108 | CONFIG_FW_LOADER=m | 174 | CONFIG_UNIX=y |
109 | # CONFIG_DEBUG_DRIVER is not set | 175 | CONFIG_XFRM=y |
176 | # CONFIG_XFRM_USER is not set | ||
177 | # CONFIG_XFRM_SUB_POLICY is not set | ||
178 | CONFIG_XFRM_MIGRATE=y | ||
179 | # CONFIG_XFRM_STATISTICS is not set | ||
180 | CONFIG_NET_KEY=y | ||
181 | CONFIG_NET_KEY_MIGRATE=y | ||
182 | CONFIG_INET=y | ||
183 | # CONFIG_IP_MULTICAST is not set | ||
184 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
185 | CONFIG_IP_FIB_HASH=y | ||
186 | # CONFIG_IP_PNP is not set | ||
187 | CONFIG_NET_IPIP=m | ||
188 | CONFIG_NET_IPGRE=m | ||
189 | # CONFIG_ARPD is not set | ||
190 | CONFIG_SYN_COOKIES=y | ||
191 | CONFIG_INET_AH=m | ||
192 | CONFIG_INET_ESP=m | ||
193 | CONFIG_INET_IPCOMP=m | ||
194 | CONFIG_INET_XFRM_TUNNEL=m | ||
195 | CONFIG_INET_TUNNEL=m | ||
196 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | ||
197 | CONFIG_INET_XFRM_MODE_TUNNEL=m | ||
198 | CONFIG_INET_XFRM_MODE_BEET=m | ||
199 | CONFIG_INET_LRO=m | ||
200 | CONFIG_INET_DIAG=m | ||
201 | CONFIG_INET_TCP_DIAG=m | ||
202 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
203 | CONFIG_TCP_CONG_CUBIC=y | ||
204 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
205 | # CONFIG_TCP_MD5SIG is not set | ||
206 | # CONFIG_IP_VS is not set | ||
207 | CONFIG_IPV6=m | ||
208 | CONFIG_IPV6_PRIVACY=y | ||
209 | CONFIG_IPV6_ROUTER_PREF=y | ||
210 | CONFIG_IPV6_ROUTE_INFO=y | ||
211 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
212 | CONFIG_INET6_AH=m | ||
213 | CONFIG_INET6_ESP=m | ||
214 | CONFIG_INET6_IPCOMP=m | ||
215 | # CONFIG_IPV6_MIP6 is not set | ||
216 | CONFIG_INET6_XFRM_TUNNEL=m | ||
217 | CONFIG_INET6_TUNNEL=m | ||
218 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
219 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
220 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
221 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
222 | CONFIG_IPV6_SIT=m | ||
223 | CONFIG_IPV6_TUNNEL=m | ||
224 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
225 | # CONFIG_NETWORK_SECMARK is not set | ||
226 | CONFIG_NETFILTER=y | ||
227 | # CONFIG_NETFILTER_DEBUG is not set | ||
228 | CONFIG_NETFILTER_ADVANCED=y | ||
229 | |||
230 | # | ||
231 | # Core Netfilter Configuration | ||
232 | # | ||
233 | CONFIG_NETFILTER_NETLINK=m | ||
234 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
235 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
236 | CONFIG_NF_CONNTRACK=m | ||
237 | CONFIG_NF_CT_ACCT=y | ||
238 | CONFIG_NF_CONNTRACK_MARK=y | ||
239 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
240 | CONFIG_NF_CT_PROTO_GRE=m | ||
241 | CONFIG_NF_CT_PROTO_SCTP=m | ||
242 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
243 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
244 | CONFIG_NF_CONNTRACK_FTP=m | ||
245 | CONFIG_NF_CONNTRACK_H323=m | ||
246 | CONFIG_NF_CONNTRACK_IRC=m | ||
247 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
248 | CONFIG_NF_CONNTRACK_PPTP=m | ||
249 | CONFIG_NF_CONNTRACK_SANE=m | ||
250 | CONFIG_NF_CONNTRACK_SIP=m | ||
251 | CONFIG_NF_CONNTRACK_TFTP=m | ||
252 | # CONFIG_NF_CT_NETLINK is not set | ||
253 | CONFIG_NETFILTER_XTABLES=m | ||
254 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
255 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
264 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
265 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
293 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
110 | 294 | ||
111 | # | 295 | # |
112 | # Memory Technology Devices (MTD) | 296 | # IP: Netfilter Configuration |
113 | # | 297 | # |
114 | # CONFIG_MTD is not set | 298 | CONFIG_NF_CONNTRACK_IPV4=m |
299 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
300 | CONFIG_IP_NF_QUEUE=m | ||
301 | CONFIG_IP_NF_IPTABLES=m | ||
302 | CONFIG_IP_NF_MATCH_RECENT=m | ||
303 | CONFIG_IP_NF_MATCH_ECN=m | ||
304 | CONFIG_IP_NF_MATCH_AH=m | ||
305 | CONFIG_IP_NF_MATCH_TTL=m | ||
306 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
307 | CONFIG_IP_NF_FILTER=m | ||
308 | CONFIG_IP_NF_TARGET_REJECT=m | ||
309 | CONFIG_IP_NF_TARGET_LOG=m | ||
310 | CONFIG_IP_NF_TARGET_ULOG=m | ||
311 | CONFIG_NF_NAT=m | ||
312 | CONFIG_NF_NAT_NEEDED=y | ||
313 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
314 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
315 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
316 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
317 | CONFIG_NF_NAT_PROTO_GRE=m | ||
318 | CONFIG_NF_NAT_FTP=m | ||
319 | CONFIG_NF_NAT_IRC=m | ||
320 | CONFIG_NF_NAT_TFTP=m | ||
321 | CONFIG_NF_NAT_AMANDA=m | ||
322 | CONFIG_NF_NAT_PPTP=m | ||
323 | CONFIG_NF_NAT_H323=m | ||
324 | CONFIG_NF_NAT_SIP=m | ||
325 | CONFIG_IP_NF_MANGLE=m | ||
326 | CONFIG_IP_NF_TARGET_ECN=m | ||
327 | CONFIG_IP_NF_TARGET_TTL=m | ||
328 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
329 | CONFIG_IP_NF_RAW=m | ||
330 | CONFIG_IP_NF_ARPTABLES=m | ||
331 | CONFIG_IP_NF_ARPFILTER=m | ||
332 | CONFIG_IP_NF_ARP_MANGLE=m | ||
115 | 333 | ||
116 | # | 334 | # |
117 | # Parallel port support | 335 | # IPv6: Netfilter Configuration |
118 | # | 336 | # |
119 | # CONFIG_PARPORT is not set | 337 | CONFIG_NF_CONNTRACK_IPV6=m |
338 | CONFIG_IP6_NF_QUEUE=m | ||
339 | CONFIG_IP6_NF_IPTABLES=m | ||
340 | CONFIG_IP6_NF_MATCH_RT=m | ||
341 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
342 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
343 | CONFIG_IP6_NF_MATCH_HL=m | ||
344 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
345 | CONFIG_IP6_NF_MATCH_AH=m | ||
346 | CONFIG_IP6_NF_MATCH_MH=m | ||
347 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
348 | CONFIG_IP6_NF_FILTER=m | ||
349 | CONFIG_IP6_NF_TARGET_LOG=m | ||
350 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
351 | CONFIG_IP6_NF_MANGLE=m | ||
352 | CONFIG_IP6_NF_TARGET_HL=m | ||
353 | CONFIG_IP6_NF_RAW=m | ||
354 | CONFIG_IP_DCCP=m | ||
355 | CONFIG_INET_DCCP_DIAG=m | ||
356 | CONFIG_IP_DCCP_ACKVEC=y | ||
120 | 357 | ||
121 | # | 358 | # |
122 | # Plug and Play support | 359 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
123 | # | 360 | # |
124 | # CONFIG_PNP is not set | 361 | CONFIG_IP_DCCP_CCID2=m |
362 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
363 | CONFIG_IP_DCCP_CCID3=m | ||
364 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
365 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
366 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
367 | CONFIG_IP_SCTP=m | ||
368 | # CONFIG_SCTP_DBG_MSG is not set | ||
369 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
370 | # CONFIG_SCTP_HMAC_NONE is not set | ||
371 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
372 | CONFIG_SCTP_HMAC_MD5=y | ||
373 | # CONFIG_TIPC is not set | ||
374 | # CONFIG_ATM is not set | ||
375 | # CONFIG_BRIDGE is not set | ||
376 | # CONFIG_VLAN_8021Q is not set | ||
377 | # CONFIG_DECNET is not set | ||
378 | CONFIG_LLC=m | ||
379 | # CONFIG_LLC2 is not set | ||
380 | # CONFIG_IPX is not set | ||
381 | CONFIG_ATALK=m | ||
382 | # CONFIG_DEV_APPLETALK is not set | ||
383 | # CONFIG_X25 is not set | ||
384 | # CONFIG_LAPB is not set | ||
385 | # CONFIG_ECONET is not set | ||
386 | # CONFIG_WAN_ROUTER is not set | ||
387 | # CONFIG_NET_SCHED is not set | ||
388 | CONFIG_NET_CLS_ROUTE=y | ||
125 | 389 | ||
126 | # | 390 | # |
127 | # Block devices | 391 | # Network testing |
128 | # | 392 | # |
393 | # CONFIG_NET_PKTGEN is not set | ||
394 | # CONFIG_HAMRADIO is not set | ||
395 | # CONFIG_CAN is not set | ||
396 | # CONFIG_IRDA is not set | ||
397 | # CONFIG_BT is not set | ||
398 | # CONFIG_AF_RXRPC is not set | ||
399 | |||
400 | # | ||
401 | # Wireless | ||
402 | # | ||
403 | # CONFIG_CFG80211 is not set | ||
404 | CONFIG_WIRELESS_EXT=y | ||
405 | # CONFIG_MAC80211 is not set | ||
406 | CONFIG_IEEE80211=m | ||
407 | # CONFIG_IEEE80211_DEBUG is not set | ||
408 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
409 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
410 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
411 | CONFIG_IEEE80211_SOFTMAC=m | ||
412 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
413 | # CONFIG_RFKILL is not set | ||
414 | # CONFIG_NET_9P is not set | ||
415 | |||
416 | # | ||
417 | # Device Drivers | ||
418 | # | ||
419 | |||
420 | # | ||
421 | # Generic Driver Options | ||
422 | # | ||
423 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
424 | CONFIG_STANDALONE=y | ||
425 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
426 | CONFIG_FW_LOADER=m | ||
427 | # CONFIG_SYS_HYPERVISOR is not set | ||
428 | CONFIG_CONNECTOR=m | ||
429 | # CONFIG_MTD is not set | ||
430 | # CONFIG_PARPORT is not set | ||
431 | # CONFIG_PNP is not set | ||
432 | CONFIG_BLK_DEV=y | ||
129 | # CONFIG_BLK_DEV_FD is not set | 433 | # CONFIG_BLK_DEV_FD is not set |
130 | # CONFIG_BLK_DEV_COW_COMMON is not set | 434 | # CONFIG_BLK_DEV_COW_COMMON is not set |
131 | CONFIG_BLK_DEV_LOOP=y | 435 | CONFIG_BLK_DEV_LOOP=y |
@@ -134,54 +438,64 @@ CONFIG_BLK_DEV_NBD=m | |||
134 | CONFIG_BLK_DEV_RAM=y | 438 | CONFIG_BLK_DEV_RAM=y |
135 | CONFIG_BLK_DEV_RAM_COUNT=16 | 439 | CONFIG_BLK_DEV_RAM_COUNT=16 |
136 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 440 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
137 | CONFIG_BLK_DEV_INITRD=y | 441 | # CONFIG_BLK_DEV_XIP is not set |
138 | CONFIG_INITRAMFS_SOURCE="" | ||
139 | CONFIG_CDROM_PKTCDVD=m | 442 | CONFIG_CDROM_PKTCDVD=m |
140 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 443 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
141 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 444 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
142 | |||
143 | # | ||
144 | # IO Schedulers | ||
145 | # | ||
146 | CONFIG_IOSCHED_NOOP=y | ||
147 | CONFIG_IOSCHED_AS=y | ||
148 | CONFIG_IOSCHED_DEADLINE=y | ||
149 | CONFIG_IOSCHED_CFQ=y | ||
150 | CONFIG_ATA_OVER_ETH=m | 445 | CONFIG_ATA_OVER_ETH=m |
151 | 446 | CONFIG_MISC_DEVICES=y | |
152 | # | 447 | # CONFIG_EEPROM_93CX6 is not set |
153 | # ATA/ATAPI/MFM/RLL support | 448 | # CONFIG_ENCLOSURE_SERVICES is not set |
154 | # | 449 | CONFIG_HAVE_IDE=y |
155 | CONFIG_IDE=y | 450 | CONFIG_IDE=y |
156 | CONFIG_BLK_DEV_IDE=y | 451 | CONFIG_BLK_DEV_IDE=y |
157 | 452 | ||
158 | # | 453 | # |
159 | # Please see Documentation/ide.txt for help/info on IDE drives | 454 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
160 | # | 455 | # |
161 | # CONFIG_BLK_DEV_IDE_SATA is not set | 456 | # CONFIG_BLK_DEV_IDE_SATA is not set |
162 | CONFIG_BLK_DEV_IDEDISK=y | 457 | CONFIG_BLK_DEV_IDEDISK=y |
163 | # CONFIG_IDEDISK_MULTI_MODE is not set | 458 | # CONFIG_IDEDISK_MULTI_MODE is not set |
164 | CONFIG_BLK_DEV_IDECD=y | 459 | CONFIG_BLK_DEV_IDECD=y |
165 | CONFIG_BLK_DEV_IDETAPE=m | 460 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y |
461 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
166 | CONFIG_BLK_DEV_IDEFLOPPY=m | 462 | CONFIG_BLK_DEV_IDEFLOPPY=m |
167 | # CONFIG_BLK_DEV_IDESCSI is not set | 463 | # CONFIG_BLK_DEV_IDESCSI is not set |
168 | # CONFIG_IDE_TASK_IOCTL is not set | 464 | # CONFIG_IDE_TASK_IOCTL is not set |
465 | CONFIG_IDE_PROC_FS=y | ||
169 | 466 | ||
170 | # | 467 | # |
171 | # IDE chipset support/bugfixes | 468 | # IDE chipset support/bugfixes |
172 | # | 469 | # |
173 | CONFIG_IDE_GENERIC=y | 470 | # CONFIG_IDE_GENERIC is not set |
174 | # CONFIG_IDE_ARM is not set | 471 | # CONFIG_BLK_DEV_PLATFORM is not set |
175 | CONFIG_BLK_DEV_Q40IDE=y | 472 | CONFIG_BLK_DEV_Q40IDE=y |
176 | # CONFIG_IDE_CHIPSETS is not set | 473 | |
474 | # | ||
475 | # Other IDE chipsets support | ||
476 | # | ||
477 | |||
478 | # | ||
479 | # Note: most of these also require special kernel boot parameters | ||
480 | # | ||
481 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
482 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
483 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
484 | # CONFIG_BLK_DEV_HT6560B is not set | ||
485 | # CONFIG_BLK_DEV_QD65XX is not set | ||
486 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
177 | # CONFIG_BLK_DEV_IDEDMA is not set | 487 | # CONFIG_BLK_DEV_IDEDMA is not set |
178 | # CONFIG_IDEDMA_AUTO is not set | 488 | # CONFIG_IDE_ARCH_OBSOLETE_INIT is not set |
179 | # CONFIG_BLK_DEV_HD is not set | 489 | # CONFIG_BLK_DEV_HD is not set |
180 | 490 | ||
181 | # | 491 | # |
182 | # SCSI device support | 492 | # SCSI device support |
183 | # | 493 | # |
494 | CONFIG_RAID_ATTRS=m | ||
184 | CONFIG_SCSI=y | 495 | CONFIG_SCSI=y |
496 | CONFIG_SCSI_DMA=y | ||
497 | CONFIG_SCSI_TGT=m | ||
498 | # CONFIG_SCSI_NETLINK is not set | ||
185 | CONFIG_SCSI_PROC_FS=y | 499 | CONFIG_SCSI_PROC_FS=y |
186 | 500 | ||
187 | # | 501 | # |
@@ -189,10 +503,11 @@ CONFIG_SCSI_PROC_FS=y | |||
189 | # | 503 | # |
190 | CONFIG_BLK_DEV_SD=y | 504 | CONFIG_BLK_DEV_SD=y |
191 | CONFIG_CHR_DEV_ST=m | 505 | CONFIG_CHR_DEV_ST=m |
192 | # CONFIG_CHR_DEV_OSST is not set | 506 | CONFIG_CHR_DEV_OSST=m |
193 | CONFIG_BLK_DEV_SR=y | 507 | CONFIG_BLK_DEV_SR=y |
194 | CONFIG_BLK_DEV_SR_VENDOR=y | 508 | CONFIG_BLK_DEV_SR_VENDOR=y |
195 | CONFIG_CHR_DEV_SG=m | 509 | CONFIG_CHR_DEV_SG=m |
510 | # CONFIG_CHR_DEV_SCH is not set | ||
196 | 511 | ||
197 | # | 512 | # |
198 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 513 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
@@ -200,266 +515,71 @@ CONFIG_CHR_DEV_SG=m | |||
200 | # CONFIG_SCSI_MULTI_LUN is not set | 515 | # CONFIG_SCSI_MULTI_LUN is not set |
201 | CONFIG_SCSI_CONSTANTS=y | 516 | CONFIG_SCSI_CONSTANTS=y |
202 | # CONFIG_SCSI_LOGGING is not set | 517 | # CONFIG_SCSI_LOGGING is not set |
518 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
519 | CONFIG_SCSI_WAIT_SCAN=m | ||
203 | 520 | ||
204 | # | 521 | # |
205 | # SCSI Transport Attributes | 522 | # SCSI Transports |
206 | # | 523 | # |
207 | # CONFIG_SCSI_SPI_ATTRS is not set | 524 | # CONFIG_SCSI_SPI_ATTRS is not set |
208 | # CONFIG_SCSI_FC_ATTRS is not set | 525 | # CONFIG_SCSI_FC_ATTRS is not set |
209 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 526 | CONFIG_SCSI_ISCSI_ATTRS=m |
210 | 527 | CONFIG_SCSI_SAS_ATTRS=m | |
211 | # | 528 | CONFIG_SCSI_SAS_LIBSAS=m |
212 | # SCSI low-level drivers | 529 | CONFIG_SCSI_SAS_HOST_SMP=y |
213 | # | 530 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
531 | CONFIG_SCSI_SRP_ATTRS=m | ||
532 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
533 | CONFIG_SCSI_LOWLEVEL=y | ||
534 | CONFIG_ISCSI_TCP=m | ||
214 | # CONFIG_SCSI_AHA152X is not set | 535 | # CONFIG_SCSI_AHA152X is not set |
215 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 536 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
537 | # CONFIG_SCSI_ADVANSYS is not set | ||
216 | # CONFIG_SCSI_IN2000 is not set | 538 | # CONFIG_SCSI_IN2000 is not set |
217 | # CONFIG_SCSI_SATA is not set | ||
218 | # CONFIG_SCSI_DTC3280 is not set | 539 | # CONFIG_SCSI_DTC3280 is not set |
219 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 540 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
220 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | 541 | # CONFIG_SCSI_GENERIC_NCR5380 is not set |
221 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set | 542 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set |
222 | # CONFIG_SCSI_NCR53C406A is not set | 543 | # CONFIG_SCSI_NCR53C406A is not set |
223 | # CONFIG_SCSI_PAS16 is not set | 544 | # CONFIG_SCSI_PAS16 is not set |
224 | # CONFIG_SCSI_PSI240I is not set | ||
225 | # CONFIG_SCSI_QLOGIC_FAS is not set | 545 | # CONFIG_SCSI_QLOGIC_FAS is not set |
226 | # CONFIG_SCSI_SYM53C416 is not set | 546 | # CONFIG_SCSI_SYM53C416 is not set |
227 | # CONFIG_SCSI_T128 is not set | 547 | # CONFIG_SCSI_T128 is not set |
228 | # CONFIG_SCSI_DEBUG is not set | 548 | # CONFIG_SCSI_DEBUG is not set |
229 | |||
230 | # | ||
231 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
232 | # | ||
233 | # CONFIG_CD_NO_IDESCSI is not set | ||
234 | |||
235 | # | ||
236 | # Multi-device support (RAID and LVM) | ||
237 | # | ||
238 | CONFIG_MD=y | 549 | CONFIG_MD=y |
239 | CONFIG_BLK_DEV_MD=m | 550 | CONFIG_BLK_DEV_MD=m |
240 | CONFIG_MD_LINEAR=m | 551 | CONFIG_MD_LINEAR=m |
241 | CONFIG_MD_RAID0=m | 552 | CONFIG_MD_RAID0=m |
242 | CONFIG_MD_RAID1=m | 553 | CONFIG_MD_RAID1=m |
243 | # CONFIG_MD_RAID10 is not set | 554 | # CONFIG_MD_RAID10 is not set |
244 | CONFIG_MD_RAID5=m | 555 | CONFIG_MD_RAID456=m |
245 | CONFIG_MD_RAID6=m | 556 | CONFIG_MD_RAID5_RESHAPE=y |
246 | CONFIG_MD_MULTIPATH=m | 557 | CONFIG_MD_MULTIPATH=m |
247 | # CONFIG_MD_FAULTY is not set | 558 | # CONFIG_MD_FAULTY is not set |
248 | CONFIG_BLK_DEV_DM=m | 559 | CONFIG_BLK_DEV_DM=m |
560 | # CONFIG_DM_DEBUG is not set | ||
249 | CONFIG_DM_CRYPT=m | 561 | CONFIG_DM_CRYPT=m |
250 | CONFIG_DM_SNAPSHOT=m | 562 | CONFIG_DM_SNAPSHOT=m |
251 | CONFIG_DM_MIRROR=m | 563 | CONFIG_DM_MIRROR=m |
252 | CONFIG_DM_ZERO=m | 564 | CONFIG_DM_ZERO=m |
253 | CONFIG_DM_MULTIPATH=m | 565 | CONFIG_DM_MULTIPATH=m |
254 | CONFIG_DM_MULTIPATH_EMC=m | 566 | CONFIG_DM_MULTIPATH_EMC=m |
255 | 567 | CONFIG_DM_MULTIPATH_RDAC=m | |
256 | # | 568 | CONFIG_DM_MULTIPATH_HP=m |
257 | # Fusion MPT device support | 569 | # CONFIG_DM_DELAY is not set |
258 | # | 570 | CONFIG_DM_UEVENT=y |
259 | |||
260 | # | ||
261 | # IEEE 1394 (FireWire) support | ||
262 | # | ||
263 | |||
264 | # | ||
265 | # I2O device support | ||
266 | # | ||
267 | |||
268 | # | ||
269 | # Networking support | ||
270 | # | ||
271 | CONFIG_NET=y | ||
272 | |||
273 | # | ||
274 | # Networking options | ||
275 | # | ||
276 | CONFIG_PACKET=y | ||
277 | # CONFIG_PACKET_MMAP is not set | ||
278 | CONFIG_UNIX=y | ||
279 | CONFIG_NET_KEY=y | ||
280 | CONFIG_INET=y | ||
281 | # CONFIG_IP_MULTICAST is not set | ||
282 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
283 | CONFIG_IP_PNP=y | ||
284 | CONFIG_IP_PNP_DHCP=y | ||
285 | CONFIG_IP_PNP_BOOTP=y | ||
286 | CONFIG_IP_PNP_RARP=y | ||
287 | CONFIG_NET_IPIP=m | ||
288 | CONFIG_NET_IPGRE=m | ||
289 | # CONFIG_ARPD is not set | ||
290 | CONFIG_SYN_COOKIES=y | ||
291 | CONFIG_INET_AH=m | ||
292 | CONFIG_INET_ESP=m | ||
293 | CONFIG_INET_IPCOMP=m | ||
294 | CONFIG_INET_TUNNEL=m | ||
295 | CONFIG_IP_TCPDIAG=m | ||
296 | CONFIG_IP_TCPDIAG_IPV6=y | ||
297 | |||
298 | # | ||
299 | # IP: Virtual Server Configuration | ||
300 | # | ||
301 | # CONFIG_IP_VS is not set | ||
302 | CONFIG_IPV6=m | ||
303 | CONFIG_IPV6_PRIVACY=y | ||
304 | CONFIG_INET6_AH=m | ||
305 | CONFIG_INET6_ESP=m | ||
306 | CONFIG_INET6_IPCOMP=m | ||
307 | CONFIG_INET6_TUNNEL=m | ||
308 | CONFIG_IPV6_TUNNEL=m | ||
309 | CONFIG_NETFILTER=y | ||
310 | # CONFIG_NETFILTER_DEBUG is not set | ||
311 | |||
312 | # | ||
313 | # IP: Netfilter Configuration | ||
314 | # | ||
315 | CONFIG_IP_NF_CONNTRACK=m | ||
316 | # CONFIG_IP_NF_CT_ACCT is not set | ||
317 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
318 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
319 | CONFIG_IP_NF_FTP=m | ||
320 | CONFIG_IP_NF_IRC=m | ||
321 | CONFIG_IP_NF_TFTP=m | ||
322 | CONFIG_IP_NF_AMANDA=m | ||
323 | CONFIG_IP_NF_QUEUE=m | ||
324 | CONFIG_IP_NF_IPTABLES=m | ||
325 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
326 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
327 | CONFIG_IP_NF_MATCH_MAC=m | ||
328 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
329 | CONFIG_IP_NF_MATCH_MARK=m | ||
330 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
331 | CONFIG_IP_NF_MATCH_TOS=m | ||
332 | CONFIG_IP_NF_MATCH_RECENT=m | ||
333 | CONFIG_IP_NF_MATCH_ECN=m | ||
334 | CONFIG_IP_NF_MATCH_DSCP=m | ||
335 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
336 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
337 | CONFIG_IP_NF_MATCH_TTL=m | ||
338 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
339 | CONFIG_IP_NF_MATCH_HELPER=m | ||
340 | CONFIG_IP_NF_MATCH_STATE=m | ||
341 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
342 | CONFIG_IP_NF_MATCH_OWNER=m | ||
343 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
344 | CONFIG_IP_NF_MATCH_REALM=m | ||
345 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
346 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
347 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
348 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
349 | CONFIG_IP_NF_FILTER=m | ||
350 | CONFIG_IP_NF_TARGET_REJECT=m | ||
351 | CONFIG_IP_NF_TARGET_LOG=m | ||
352 | CONFIG_IP_NF_TARGET_ULOG=m | ||
353 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
354 | CONFIG_IP_NF_NAT=m | ||
355 | CONFIG_IP_NF_NAT_NEEDED=y | ||
356 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
357 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
358 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
359 | CONFIG_IP_NF_TARGET_SAME=m | ||
360 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | ||
361 | CONFIG_IP_NF_NAT_IRC=m | ||
362 | CONFIG_IP_NF_NAT_FTP=m | ||
363 | CONFIG_IP_NF_NAT_TFTP=m | ||
364 | CONFIG_IP_NF_NAT_AMANDA=m | ||
365 | CONFIG_IP_NF_MANGLE=m | ||
366 | CONFIG_IP_NF_TARGET_TOS=m | ||
367 | CONFIG_IP_NF_TARGET_ECN=m | ||
368 | CONFIG_IP_NF_TARGET_DSCP=m | ||
369 | CONFIG_IP_NF_TARGET_MARK=m | ||
370 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
371 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
372 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
373 | CONFIG_IP_NF_RAW=m | ||
374 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
375 | CONFIG_IP_NF_ARPTABLES=m | ||
376 | CONFIG_IP_NF_ARPFILTER=m | ||
377 | CONFIG_IP_NF_ARP_MANGLE=m | ||
378 | |||
379 | # | ||
380 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | ||
381 | # | ||
382 | CONFIG_IP6_NF_QUEUE=m | ||
383 | CONFIG_IP6_NF_IPTABLES=m | ||
384 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
385 | CONFIG_IP6_NF_MATCH_MAC=m | ||
386 | CONFIG_IP6_NF_MATCH_RT=m | ||
387 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
388 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
389 | CONFIG_IP6_NF_MATCH_HL=m | ||
390 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
391 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
392 | CONFIG_IP6_NF_MATCH_MARK=m | ||
393 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
394 | CONFIG_IP6_NF_MATCH_AHESP=m | ||
395 | CONFIG_IP6_NF_MATCH_LENGTH=m | ||
396 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
397 | CONFIG_IP6_NF_FILTER=m | ||
398 | CONFIG_IP6_NF_TARGET_LOG=m | ||
399 | CONFIG_IP6_NF_MANGLE=m | ||
400 | CONFIG_IP6_NF_TARGET_MARK=m | ||
401 | CONFIG_IP6_NF_RAW=m | ||
402 | CONFIG_XFRM=y | ||
403 | # CONFIG_XFRM_USER is not set | ||
404 | |||
405 | # | ||
406 | # SCTP Configuration (EXPERIMENTAL) | ||
407 | # | ||
408 | CONFIG_IP_SCTP=m | ||
409 | # CONFIG_SCTP_DBG_MSG is not set | ||
410 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
411 | # CONFIG_SCTP_HMAC_NONE is not set | ||
412 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
413 | CONFIG_SCTP_HMAC_MD5=y | ||
414 | # CONFIG_ATM is not set | ||
415 | # CONFIG_BRIDGE is not set | ||
416 | # CONFIG_VLAN_8021Q is not set | ||
417 | # CONFIG_DECNET is not set | ||
418 | CONFIG_LLC=m | ||
419 | # CONFIG_LLC2 is not set | ||
420 | CONFIG_IPX=m | ||
421 | # CONFIG_IPX_INTERN is not set | ||
422 | CONFIG_ATALK=m | ||
423 | # CONFIG_DEV_APPLETALK is not set | ||
424 | # CONFIG_X25 is not set | ||
425 | # CONFIG_LAPB is not set | ||
426 | # CONFIG_NET_DIVERT is not set | ||
427 | # CONFIG_ECONET is not set | ||
428 | # CONFIG_WAN_ROUTER is not set | ||
429 | |||
430 | # | ||
431 | # QoS and/or fair queueing | ||
432 | # | ||
433 | # CONFIG_NET_SCHED is not set | ||
434 | CONFIG_NET_CLS_ROUTE=y | ||
435 | |||
436 | # | ||
437 | # Network testing | ||
438 | # | ||
439 | # CONFIG_NET_PKTGEN is not set | ||
440 | CONFIG_NETPOLL=y | ||
441 | # CONFIG_NETPOLL_RX is not set | ||
442 | # CONFIG_NETPOLL_TRAP is not set | ||
443 | CONFIG_NET_POLL_CONTROLLER=y | ||
444 | # CONFIG_HAMRADIO is not set | ||
445 | # CONFIG_IRDA is not set | ||
446 | # CONFIG_BT is not set | ||
447 | CONFIG_NETDEVICES=y | 571 | CONFIG_NETDEVICES=y |
572 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
448 | CONFIG_DUMMY=m | 573 | CONFIG_DUMMY=m |
449 | # CONFIG_BONDING is not set | 574 | # CONFIG_BONDING is not set |
575 | CONFIG_MACVLAN=m | ||
450 | CONFIG_EQUALIZER=m | 576 | CONFIG_EQUALIZER=m |
451 | # CONFIG_TUN is not set | 577 | # CONFIG_TUN is not set |
452 | 578 | CONFIG_VETH=m | |
453 | # | ||
454 | # ARCnet devices | ||
455 | # | ||
456 | # CONFIG_ARCNET is not set | 579 | # CONFIG_ARCNET is not set |
457 | 580 | # CONFIG_PHYLIB is not set | |
458 | # | ||
459 | # Ethernet (10 or 100Mbit) | ||
460 | # | ||
461 | CONFIG_NET_ETHERNET=y | 581 | CONFIG_NET_ETHERNET=y |
462 | CONFIG_MII=m | 582 | # CONFIG_MII is not set |
463 | # CONFIG_NET_VENDOR_3COM is not set | 583 | # CONFIG_NET_VENDOR_3COM is not set |
464 | # CONFIG_NET_VENDOR_SMC is not set | 584 | # CONFIG_NET_VENDOR_SMC is not set |
465 | # CONFIG_NET_VENDOR_RACAL is not set | 585 | # CONFIG_NET_VENDOR_RACAL is not set |
@@ -468,30 +588,21 @@ CONFIG_MII=m | |||
468 | # CONFIG_HP100 is not set | 588 | # CONFIG_HP100 is not set |
469 | # CONFIG_NET_ISA is not set | 589 | # CONFIG_NET_ISA is not set |
470 | CONFIG_NE2000=m | 590 | CONFIG_NE2000=m |
591 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
592 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
593 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
594 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
471 | # CONFIG_NET_PCI is not set | 595 | # CONFIG_NET_PCI is not set |
472 | # CONFIG_NET_POCKET is not set | 596 | # CONFIG_B44 is not set |
473 | 597 | # CONFIG_NETDEV_1000 is not set | |
474 | # | 598 | # CONFIG_NETDEV_10000 is not set |
475 | # Ethernet (1000 Mbit) | ||
476 | # | ||
477 | |||
478 | # | ||
479 | # Ethernet (10000 Mbit) | ||
480 | # | ||
481 | |||
482 | # | ||
483 | # Token Ring devices | ||
484 | # | ||
485 | # CONFIG_TR is not set | 599 | # CONFIG_TR is not set |
486 | 600 | ||
487 | # | 601 | # |
488 | # Wireless LAN (non-hamradio) | 602 | # Wireless LAN |
489 | # | ||
490 | # CONFIG_NET_RADIO is not set | ||
491 | |||
492 | # | ||
493 | # Wan interfaces | ||
494 | # | 603 | # |
604 | # CONFIG_WLAN_PRE80211 is not set | ||
605 | # CONFIG_WLAN_80211 is not set | ||
495 | # CONFIG_WAN is not set | 606 | # CONFIG_WAN is not set |
496 | CONFIG_PPP=m | 607 | CONFIG_PPP=m |
497 | # CONFIG_PPP_MULTILINK is not set | 608 | # CONFIG_PPP_MULTILINK is not set |
@@ -500,28 +611,28 @@ CONFIG_PPP_ASYNC=m | |||
500 | CONFIG_PPP_SYNC_TTY=m | 611 | CONFIG_PPP_SYNC_TTY=m |
501 | CONFIG_PPP_DEFLATE=m | 612 | CONFIG_PPP_DEFLATE=m |
502 | CONFIG_PPP_BSDCOMP=m | 613 | CONFIG_PPP_BSDCOMP=m |
614 | CONFIG_PPP_MPPE=m | ||
503 | CONFIG_PPPOE=m | 615 | CONFIG_PPPOE=m |
616 | CONFIG_PPPOL2TP=m | ||
504 | CONFIG_SLIP=m | 617 | CONFIG_SLIP=m |
505 | CONFIG_SLIP_COMPRESSED=y | 618 | CONFIG_SLIP_COMPRESSED=y |
619 | CONFIG_SLHC=m | ||
506 | CONFIG_SLIP_SMART=y | 620 | CONFIG_SLIP_SMART=y |
507 | CONFIG_SLIP_MODE_SLIP6=y | 621 | CONFIG_SLIP_MODE_SLIP6=y |
508 | CONFIG_SHAPER=m | ||
509 | CONFIG_NETCONSOLE=m | 622 | CONFIG_NETCONSOLE=m |
510 | 623 | CONFIG_NETCONSOLE_DYNAMIC=y | |
511 | # | 624 | CONFIG_NETPOLL=y |
512 | # ISDN subsystem | 625 | # CONFIG_NETPOLL_TRAP is not set |
513 | # | 626 | CONFIG_NET_POLL_CONTROLLER=y |
514 | # CONFIG_ISDN is not set | 627 | # CONFIG_ISDN is not set |
515 | |||
516 | # | ||
517 | # Telephony Support | ||
518 | # | ||
519 | # CONFIG_PHONE is not set | 628 | # CONFIG_PHONE is not set |
520 | 629 | ||
521 | # | 630 | # |
522 | # Input device support | 631 | # Input device support |
523 | # | 632 | # |
524 | CONFIG_INPUT=y | 633 | CONFIG_INPUT=y |
634 | CONFIG_INPUT_FF_MEMLESS=m | ||
635 | # CONFIG_INPUT_POLLDEV is not set | ||
525 | 636 | ||
526 | # | 637 | # |
527 | # Userland interfaces | 638 | # Userland interfaces |
@@ -531,7 +642,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
531 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 642 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
532 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 643 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
533 | # CONFIG_INPUT_JOYDEV is not set | 644 | # CONFIG_INPUT_JOYDEV is not set |
534 | # CONFIG_INPUT_TSDEV is not set | ||
535 | # CONFIG_INPUT_EVDEV is not set | 645 | # CONFIG_INPUT_EVDEV is not set |
536 | # CONFIG_INPUT_EVBUG is not set | 646 | # CONFIG_INPUT_EVBUG is not set |
537 | 647 | ||
@@ -544,22 +654,32 @@ CONFIG_INPUT_KEYBOARD=y | |||
544 | # CONFIG_KEYBOARD_LKKBD is not set | 654 | # CONFIG_KEYBOARD_LKKBD is not set |
545 | # CONFIG_KEYBOARD_XTKBD is not set | 655 | # CONFIG_KEYBOARD_XTKBD is not set |
546 | # CONFIG_KEYBOARD_NEWTON is not set | 656 | # CONFIG_KEYBOARD_NEWTON is not set |
657 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
547 | CONFIG_INPUT_MOUSE=y | 658 | CONFIG_INPUT_MOUSE=y |
548 | CONFIG_MOUSE_PS2=m | 659 | CONFIG_MOUSE_PS2=m |
660 | CONFIG_MOUSE_PS2_ALPS=y | ||
661 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
662 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
663 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
664 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
665 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
549 | CONFIG_MOUSE_SERIAL=m | 666 | CONFIG_MOUSE_SERIAL=m |
550 | # CONFIG_MOUSE_INPORT is not set | 667 | # CONFIG_MOUSE_INPORT is not set |
551 | # CONFIG_MOUSE_LOGIBM is not set | 668 | # CONFIG_MOUSE_LOGIBM is not set |
552 | # CONFIG_MOUSE_PC110PAD is not set | 669 | # CONFIG_MOUSE_PC110PAD is not set |
553 | # CONFIG_MOUSE_VSXXXAA is not set | 670 | # CONFIG_MOUSE_VSXXXAA is not set |
554 | # CONFIG_INPUT_JOYSTICK is not set | 671 | # CONFIG_INPUT_JOYSTICK is not set |
672 | # CONFIG_INPUT_TABLET is not set | ||
555 | # CONFIG_INPUT_TOUCHSCREEN is not set | 673 | # CONFIG_INPUT_TOUCHSCREEN is not set |
556 | # CONFIG_INPUT_MISC is not set | 674 | CONFIG_INPUT_MISC=y |
675 | CONFIG_INPUT_M68K_BEEP=m | ||
676 | # CONFIG_INPUT_UINPUT is not set | ||
557 | 677 | ||
558 | # | 678 | # |
559 | # Hardware I/O ports | 679 | # Hardware I/O ports |
560 | # | 680 | # |
561 | CONFIG_SERIO=m | 681 | CONFIG_SERIO=m |
562 | CONFIG_SERIO_SERPORT=m | 682 | # CONFIG_SERIO_SERPORT is not set |
563 | CONFIG_SERIO_Q40KBD=m | 683 | CONFIG_SERIO_Q40KBD=m |
564 | CONFIG_SERIO_LIBPS2=m | 684 | CONFIG_SERIO_LIBPS2=m |
565 | # CONFIG_SERIO_RAW is not set | 685 | # CONFIG_SERIO_RAW is not set |
@@ -571,6 +691,7 @@ CONFIG_SERIO_LIBPS2=m | |||
571 | CONFIG_VT=y | 691 | CONFIG_VT=y |
572 | CONFIG_VT_CONSOLE=y | 692 | CONFIG_VT_CONSOLE=y |
573 | CONFIG_HW_CONSOLE=y | 693 | CONFIG_HW_CONSOLE=y |
694 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
574 | # CONFIG_SERIAL_NONSTANDARD is not set | 695 | # CONFIG_SERIAL_NONSTANDARD is not set |
575 | 696 | ||
576 | # | 697 | # |
@@ -584,115 +705,117 @@ CONFIG_HW_CONSOLE=y | |||
584 | CONFIG_UNIX98_PTYS=y | 705 | CONFIG_UNIX98_PTYS=y |
585 | CONFIG_LEGACY_PTYS=y | 706 | CONFIG_LEGACY_PTYS=y |
586 | CONFIG_LEGACY_PTY_COUNT=256 | 707 | CONFIG_LEGACY_PTY_COUNT=256 |
587 | |||
588 | # | ||
589 | # IPMI | ||
590 | # | ||
591 | # CONFIG_IPMI_HANDLER is not set | 708 | # CONFIG_IPMI_HANDLER is not set |
592 | 709 | # CONFIG_HW_RANDOM is not set | |
593 | # | ||
594 | # Watchdog Cards | ||
595 | # | ||
596 | # CONFIG_WATCHDOG is not set | ||
597 | CONFIG_GEN_RTC=m | 710 | CONFIG_GEN_RTC=m |
598 | CONFIG_GEN_RTC_X=y | 711 | CONFIG_GEN_RTC_X=y |
599 | # CONFIG_DTLK is not set | 712 | # CONFIG_DTLK is not set |
600 | # CONFIG_R3964 is not set | 713 | # CONFIG_R3964 is not set |
601 | |||
602 | # | ||
603 | # Ftape, the floppy tape device driver | ||
604 | # | ||
605 | # CONFIG_DRM is not set | ||
606 | # CONFIG_RAW_DRIVER is not set | 714 | # CONFIG_RAW_DRIVER is not set |
607 | 715 | # CONFIG_TCG_TPM is not set | |
608 | # | ||
609 | # TPM devices | ||
610 | # | ||
611 | |||
612 | # | ||
613 | # I2C support | ||
614 | # | ||
615 | # CONFIG_I2C is not set | 716 | # CONFIG_I2C is not set |
616 | 717 | ||
617 | # | 718 | # |
618 | # Dallas's 1-wire bus | 719 | # SPI support |
619 | # | 720 | # |
721 | # CONFIG_SPI is not set | ||
722 | # CONFIG_SPI_MASTER is not set | ||
620 | # CONFIG_W1 is not set | 723 | # CONFIG_W1 is not set |
724 | # CONFIG_POWER_SUPPLY is not set | ||
725 | # CONFIG_HWMON is not set | ||
726 | # CONFIG_THERMAL is not set | ||
727 | # CONFIG_WATCHDOG is not set | ||
621 | 728 | ||
622 | # | 729 | # |
623 | # Misc devices | 730 | # Sonics Silicon Backplane |
624 | # | 731 | # |
732 | CONFIG_SSB_POSSIBLE=y | ||
733 | # CONFIG_SSB is not set | ||
625 | 734 | ||
626 | # | 735 | # |
627 | # Multimedia devices | 736 | # Multifunction device drivers |
628 | # | 737 | # |
629 | # CONFIG_VIDEO_DEV is not set | 738 | # CONFIG_MFD_SM501 is not set |
630 | 739 | ||
631 | # | 740 | # |
632 | # Digital Video Broadcasting Devices | 741 | # Multimedia devices |
633 | # | 742 | # |
634 | # CONFIG_DVB is not set | 743 | # CONFIG_VIDEO_DEV is not set |
744 | # CONFIG_DVB_CORE is not set | ||
745 | # CONFIG_DAB is not set | ||
635 | 746 | ||
636 | # | 747 | # |
637 | # Graphics support | 748 | # Graphics support |
638 | # | 749 | # |
750 | # CONFIG_VGASTATE is not set | ||
751 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
639 | CONFIG_FB=y | 752 | CONFIG_FB=y |
753 | # CONFIG_FIRMWARE_EDID is not set | ||
754 | # CONFIG_FB_DDC is not set | ||
640 | CONFIG_FB_CFB_FILLRECT=y | 755 | CONFIG_FB_CFB_FILLRECT=y |
641 | CONFIG_FB_CFB_COPYAREA=y | 756 | CONFIG_FB_CFB_COPYAREA=y |
642 | CONFIG_FB_CFB_IMAGEBLIT=y | 757 | CONFIG_FB_CFB_IMAGEBLIT=y |
643 | CONFIG_FB_SOFT_CURSOR=y | 758 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
759 | # CONFIG_FB_SYS_FILLRECT is not set | ||
760 | # CONFIG_FB_SYS_COPYAREA is not set | ||
761 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
762 | # CONFIG_FB_SYS_FOPS is not set | ||
763 | CONFIG_FB_DEFERRED_IO=y | ||
764 | # CONFIG_FB_SVGALIB is not set | ||
644 | # CONFIG_FB_MACMODES is not set | 765 | # CONFIG_FB_MACMODES is not set |
645 | CONFIG_FB_MODE_HELPERS=y | 766 | # CONFIG_FB_BACKLIGHT is not set |
767 | # CONFIG_FB_MODE_HELPERS is not set | ||
646 | # CONFIG_FB_TILEBLITTING is not set | 768 | # CONFIG_FB_TILEBLITTING is not set |
769 | |||
770 | # | ||
771 | # Frame buffer hardware drivers | ||
772 | # | ||
647 | CONFIG_FB_Q40=y | 773 | CONFIG_FB_Q40=y |
774 | # CONFIG_FB_UVESA is not set | ||
648 | # CONFIG_FB_S1D13XXX is not set | 775 | # CONFIG_FB_S1D13XXX is not set |
649 | # CONFIG_FB_VIRTUAL is not set | 776 | # CONFIG_FB_VIRTUAL is not set |
777 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
778 | |||
779 | # | ||
780 | # Display device support | ||
781 | # | ||
782 | # CONFIG_DISPLAY_SUPPORT is not set | ||
650 | 783 | ||
651 | # | 784 | # |
652 | # Console display driver support | 785 | # Console display driver support |
653 | # | 786 | # |
654 | CONFIG_DUMMY_CONSOLE=y | 787 | CONFIG_DUMMY_CONSOLE=y |
655 | CONFIG_FRAMEBUFFER_CONSOLE=y | 788 | CONFIG_FRAMEBUFFER_CONSOLE=y |
789 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
790 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
656 | # CONFIG_FONTS is not set | 791 | # CONFIG_FONTS is not set |
657 | CONFIG_FONT_8x8=y | 792 | CONFIG_FONT_8x8=y |
658 | CONFIG_FONT_8x16=y | 793 | CONFIG_FONT_8x16=y |
659 | |||
660 | # | ||
661 | # Logo configuration | ||
662 | # | ||
663 | CONFIG_LOGO=y | 794 | CONFIG_LOGO=y |
664 | CONFIG_LOGO_LINUX_MONO=y | 795 | CONFIG_LOGO_LINUX_MONO=y |
665 | CONFIG_LOGO_LINUX_VGA16=y | 796 | CONFIG_LOGO_LINUX_VGA16=y |
666 | CONFIG_LOGO_LINUX_CLUT224=y | 797 | CONFIG_LOGO_LINUX_CLUT224=y |
667 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
668 | 798 | ||
669 | # | 799 | # |
670 | # Sound | 800 | # Sound |
671 | # | 801 | # |
672 | CONFIG_SOUND=y | 802 | CONFIG_SOUND=m |
673 | CONFIG_DMASOUND_Q40=y | 803 | CONFIG_DMASOUND_Q40=m |
674 | CONFIG_DMASOUND=y | 804 | CONFIG_DMASOUND=m |
675 | 805 | CONFIG_HID_SUPPORT=y | |
676 | # | 806 | CONFIG_HID=m |
677 | # USB support | 807 | # CONFIG_HID_DEBUG is not set |
678 | # | 808 | CONFIG_HIDRAW=y |
679 | # CONFIG_USB_ARCH_HAS_HCD is not set | 809 | # CONFIG_USB_SUPPORT is not set |
680 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
681 | |||
682 | # | ||
683 | # USB Gadget Support | ||
684 | # | ||
685 | # CONFIG_USB_GADGET is not set | ||
686 | |||
687 | # | ||
688 | # MMC/SD Card support | ||
689 | # | ||
690 | # CONFIG_MMC is not set | 810 | # CONFIG_MMC is not set |
811 | # CONFIG_MEMSTICK is not set | ||
812 | # CONFIG_NEW_LEDS is not set | ||
813 | # CONFIG_RTC_CLASS is not set | ||
691 | 814 | ||
692 | # | 815 | # |
693 | # InfiniBand support | 816 | # Userspace I/O |
694 | # | 817 | # |
695 | # CONFIG_INFINIBAND is not set | 818 | # CONFIG_UIO is not set |
696 | 819 | ||
697 | # | 820 | # |
698 | # Character devices | 821 | # Character devices |
@@ -703,10 +826,11 @@ CONFIG_DMASOUND=y | |||
703 | # | 826 | # |
704 | CONFIG_EXT2_FS=y | 827 | CONFIG_EXT2_FS=y |
705 | # CONFIG_EXT2_FS_XATTR is not set | 828 | # CONFIG_EXT2_FS_XATTR is not set |
829 | # CONFIG_EXT2_FS_XIP is not set | ||
706 | CONFIG_EXT3_FS=y | 830 | CONFIG_EXT3_FS=y |
707 | # CONFIG_EXT3_FS_XATTR is not set | 831 | # CONFIG_EXT3_FS_XATTR is not set |
832 | # CONFIG_EXT4DEV_FS is not set | ||
708 | CONFIG_JBD=y | 833 | CONFIG_JBD=y |
709 | # CONFIG_JBD_DEBUG is not set | ||
710 | CONFIG_REISERFS_FS=m | 834 | CONFIG_REISERFS_FS=m |
711 | # CONFIG_REISERFS_CHECK is not set | 835 | # CONFIG_REISERFS_CHECK is not set |
712 | # CONFIG_REISERFS_PROC_INFO is not set | 836 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -717,25 +841,29 @@ CONFIG_JFS_FS=m | |||
717 | # CONFIG_JFS_DEBUG is not set | 841 | # CONFIG_JFS_DEBUG is not set |
718 | # CONFIG_JFS_STATISTICS is not set | 842 | # CONFIG_JFS_STATISTICS is not set |
719 | CONFIG_FS_POSIX_ACL=y | 843 | CONFIG_FS_POSIX_ACL=y |
720 | |||
721 | # | ||
722 | # XFS support | ||
723 | # | ||
724 | CONFIG_XFS_FS=m | 844 | CONFIG_XFS_FS=m |
725 | CONFIG_XFS_EXPORT=y | ||
726 | # CONFIG_XFS_RT is not set | ||
727 | # CONFIG_XFS_QUOTA is not set | 845 | # CONFIG_XFS_QUOTA is not set |
728 | # CONFIG_XFS_SECURITY is not set | 846 | # CONFIG_XFS_SECURITY is not set |
729 | # CONFIG_XFS_POSIX_ACL is not set | 847 | # CONFIG_XFS_POSIX_ACL is not set |
730 | CONFIG_MINIX_FS=y | 848 | # CONFIG_XFS_RT is not set |
731 | # CONFIG_ROMFS_FS is not set | 849 | CONFIG_GFS2_FS=m |
850 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
851 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
852 | CONFIG_OCFS2_FS=m | ||
853 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
854 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
855 | CONFIG_DNOTIFY=y | ||
856 | CONFIG_INOTIFY=y | ||
857 | CONFIG_INOTIFY_USER=y | ||
732 | CONFIG_QUOTA=y | 858 | CONFIG_QUOTA=y |
859 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
860 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
733 | # CONFIG_QFMT_V1 is not set | 861 | # CONFIG_QFMT_V1 is not set |
734 | # CONFIG_QFMT_V2 is not set | 862 | # CONFIG_QFMT_V2 is not set |
735 | CONFIG_QUOTACTL=y | 863 | CONFIG_QUOTACTL=y |
736 | CONFIG_DNOTIFY=y | ||
737 | CONFIG_AUTOFS_FS=m | 864 | CONFIG_AUTOFS_FS=m |
738 | CONFIG_AUTOFS4_FS=m | 865 | CONFIG_AUTOFS4_FS=m |
866 | CONFIG_FUSE_FS=m | ||
739 | 867 | ||
740 | # | 868 | # |
741 | # CD-ROM/DVD Filesystems | 869 | # CD-ROM/DVD Filesystems |
@@ -743,7 +871,6 @@ CONFIG_AUTOFS4_FS=m | |||
743 | CONFIG_ISO9660_FS=y | 871 | CONFIG_ISO9660_FS=y |
744 | CONFIG_JOLIET=y | 872 | CONFIG_JOLIET=y |
745 | CONFIG_ZISOFS=y | 873 | CONFIG_ZISOFS=y |
746 | CONFIG_ZISOFS_FS=y | ||
747 | CONFIG_UDF_FS=m | 874 | CONFIG_UDF_FS=m |
748 | CONFIG_UDF_NLS=y | 875 | CONFIG_UDF_NLS=y |
749 | 876 | ||
@@ -762,13 +889,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
762 | # | 889 | # |
763 | CONFIG_PROC_FS=y | 890 | CONFIG_PROC_FS=y |
764 | CONFIG_PROC_KCORE=y | 891 | CONFIG_PROC_KCORE=y |
892 | CONFIG_PROC_SYSCTL=y | ||
765 | CONFIG_SYSFS=y | 893 | CONFIG_SYSFS=y |
766 | # CONFIG_DEVFS_FS is not set | ||
767 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
768 | CONFIG_TMPFS=y | 894 | CONFIG_TMPFS=y |
769 | # CONFIG_TMPFS_XATTR is not set | 895 | # CONFIG_TMPFS_POSIX_ACL is not set |
770 | # CONFIG_HUGETLB_PAGE is not set | 896 | # CONFIG_HUGETLB_PAGE is not set |
771 | CONFIG_RAMFS=y | 897 | CONFIG_CONFIGFS_FS=m |
772 | 898 | ||
773 | # | 899 | # |
774 | # Miscellaneous filesystems | 900 | # Miscellaneous filesystems |
@@ -782,44 +908,39 @@ CONFIG_HFSPLUS_FS=m | |||
782 | # CONFIG_EFS_FS is not set | 908 | # CONFIG_EFS_FS is not set |
783 | CONFIG_CRAMFS=m | 909 | CONFIG_CRAMFS=m |
784 | # CONFIG_VXFS_FS is not set | 910 | # CONFIG_VXFS_FS is not set |
911 | CONFIG_MINIX_FS=y | ||
785 | CONFIG_HPFS_FS=m | 912 | CONFIG_HPFS_FS=m |
786 | # CONFIG_QNX4FS_FS is not set | 913 | # CONFIG_QNX4FS_FS is not set |
914 | # CONFIG_ROMFS_FS is not set | ||
787 | CONFIG_SYSV_FS=m | 915 | CONFIG_SYSV_FS=m |
788 | CONFIG_UFS_FS=m | 916 | CONFIG_UFS_FS=m |
789 | CONFIG_UFS_FS_WRITE=y | 917 | # CONFIG_UFS_FS_WRITE is not set |
790 | 918 | # CONFIG_UFS_DEBUG is not set | |
791 | # | 919 | CONFIG_NETWORK_FILESYSTEMS=y |
792 | # Network File Systems | ||
793 | # | ||
794 | CONFIG_NFS_FS=y | 920 | CONFIG_NFS_FS=y |
795 | CONFIG_NFS_V3=y | 921 | CONFIG_NFS_V3=y |
922 | # CONFIG_NFS_V3_ACL is not set | ||
796 | CONFIG_NFS_V4=y | 923 | CONFIG_NFS_V4=y |
797 | # CONFIG_NFS_DIRECTIO is not set | 924 | # CONFIG_NFS_DIRECTIO is not set |
798 | CONFIG_NFSD=m | 925 | CONFIG_NFSD=m |
799 | CONFIG_NFSD_V3=y | 926 | CONFIG_NFSD_V3=y |
800 | CONFIG_NFSD_V4=y | 927 | # CONFIG_NFSD_V3_ACL is not set |
928 | # CONFIG_NFSD_V4 is not set | ||
801 | CONFIG_NFSD_TCP=y | 929 | CONFIG_NFSD_TCP=y |
802 | CONFIG_ROOT_NFS=y | ||
803 | CONFIG_LOCKD=y | 930 | CONFIG_LOCKD=y |
804 | CONFIG_LOCKD_V4=y | 931 | CONFIG_LOCKD_V4=y |
805 | CONFIG_EXPORTFS=m | 932 | CONFIG_EXPORTFS=m |
933 | CONFIG_NFS_COMMON=y | ||
806 | CONFIG_SUNRPC=y | 934 | CONFIG_SUNRPC=y |
807 | CONFIG_SUNRPC_GSS=y | 935 | CONFIG_SUNRPC_GSS=y |
936 | CONFIG_SUNRPC_BIND34=y | ||
808 | CONFIG_RPCSEC_GSS_KRB5=y | 937 | CONFIG_RPCSEC_GSS_KRB5=y |
809 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 938 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
810 | CONFIG_SMB_FS=m | 939 | CONFIG_SMB_FS=m |
811 | CONFIG_SMB_NLS_DEFAULT=y | 940 | CONFIG_SMB_NLS_DEFAULT=y |
812 | CONFIG_SMB_NLS_REMOTE="cp437" | 941 | CONFIG_SMB_NLS_REMOTE="cp437" |
813 | # CONFIG_CIFS is not set | 942 | # CONFIG_CIFS is not set |
814 | CONFIG_NCP_FS=m | 943 | # CONFIG_NCP_FS is not set |
815 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
816 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
817 | # CONFIG_NCPFS_STRONG is not set | ||
818 | # CONFIG_NCPFS_NFS_NS is not set | ||
819 | # CONFIG_NCPFS_OS2_NS is not set | ||
820 | # CONFIG_NCPFS_SMALLDOS is not set | ||
821 | CONFIG_NCPFS_NLS=y | ||
822 | # CONFIG_NCPFS_EXTRAS is not set | ||
823 | CONFIG_CODA_FS=m | 944 | CONFIG_CODA_FS=m |
824 | # CONFIG_CODA_FS_OLD_API is not set | 945 | # CONFIG_CODA_FS_OLD_API is not set |
825 | # CONFIG_AFS_FS is not set | 946 | # CONFIG_AFS_FS is not set |
@@ -829,10 +950,6 @@ CONFIG_CODA_FS=m | |||
829 | # | 950 | # |
830 | # CONFIG_PARTITION_ADVANCED is not set | 951 | # CONFIG_PARTITION_ADVANCED is not set |
831 | CONFIG_MSDOS_PARTITION=y | 952 | CONFIG_MSDOS_PARTITION=y |
832 | |||
833 | # | ||
834 | # Native Language Support | ||
835 | # | ||
836 | CONFIG_NLS=y | 953 | CONFIG_NLS=y |
837 | CONFIG_NLS_DEFAULT="iso8859-1" | 954 | CONFIG_NLS_DEFAULT="iso8859-1" |
838 | CONFIG_NLS_CODEPAGE_437=y | 955 | CONFIG_NLS_CODEPAGE_437=y |
@@ -873,35 +990,42 @@ CONFIG_NLS_ISO8859_15=m | |||
873 | CONFIG_NLS_KOI8_R=m | 990 | CONFIG_NLS_KOI8_R=m |
874 | CONFIG_NLS_KOI8_U=m | 991 | CONFIG_NLS_KOI8_U=m |
875 | CONFIG_NLS_UTF8=m | 992 | CONFIG_NLS_UTF8=m |
993 | CONFIG_DLM=m | ||
994 | # CONFIG_DLM_DEBUG is not set | ||
876 | 995 | ||
877 | # | 996 | # |
878 | # Kernel hacking | 997 | # Kernel hacking |
879 | # | 998 | # |
880 | # CONFIG_PRINTK_TIME is not set | 999 | # CONFIG_PRINTK_TIME is not set |
881 | CONFIG_DEBUG_KERNEL=y | 1000 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1001 | CONFIG_ENABLE_MUST_CHECK=y | ||
882 | CONFIG_MAGIC_SYSRQ=y | 1002 | CONFIG_MAGIC_SYSRQ=y |
883 | CONFIG_LOG_BUF_SHIFT=16 | 1003 | # CONFIG_UNUSED_SYMBOLS is not set |
884 | # CONFIG_SCHEDSTATS is not set | ||
885 | # CONFIG_DEBUG_SLAB is not set | ||
886 | # CONFIG_DEBUG_SPINLOCK is not set | ||
887 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
888 | # CONFIG_DEBUG_KOBJECT is not set | ||
889 | CONFIG_DEBUG_BUGVERBOSE=y | ||
890 | # CONFIG_DEBUG_INFO is not set | ||
891 | # CONFIG_DEBUG_FS is not set | 1004 | # CONFIG_DEBUG_FS is not set |
892 | # CONFIG_FRAME_POINTER is not set | 1005 | # CONFIG_HEADERS_CHECK is not set |
1006 | # CONFIG_DEBUG_KERNEL is not set | ||
1007 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1008 | # CONFIG_SAMPLES is not set | ||
893 | 1009 | ||
894 | # | 1010 | # |
895 | # Security options | 1011 | # Security options |
896 | # | 1012 | # |
897 | # CONFIG_KEYS is not set | 1013 | # CONFIG_KEYS is not set |
898 | # CONFIG_SECURITY is not set | 1014 | # CONFIG_SECURITY is not set |
899 | 1015 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
900 | # | 1016 | CONFIG_XOR_BLOCKS=m |
901 | # Cryptographic options | 1017 | CONFIG_ASYNC_CORE=m |
902 | # | 1018 | CONFIG_ASYNC_MEMCPY=m |
1019 | CONFIG_ASYNC_XOR=m | ||
903 | CONFIG_CRYPTO=y | 1020 | CONFIG_CRYPTO=y |
1021 | CONFIG_CRYPTO_ALGAPI=y | ||
1022 | CONFIG_CRYPTO_AEAD=m | ||
1023 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1024 | CONFIG_CRYPTO_SEQIV=m | ||
1025 | CONFIG_CRYPTO_HASH=y | ||
1026 | CONFIG_CRYPTO_MANAGER=y | ||
904 | CONFIG_CRYPTO_HMAC=y | 1027 | CONFIG_CRYPTO_HMAC=y |
1028 | CONFIG_CRYPTO_XCBC=m | ||
905 | CONFIG_CRYPTO_NULL=m | 1029 | CONFIG_CRYPTO_NULL=m |
906 | CONFIG_CRYPTO_MD4=m | 1030 | CONFIG_CRYPTO_MD4=m |
907 | CONFIG_CRYPTO_MD5=y | 1031 | CONFIG_CRYPTO_MD5=y |
@@ -910,9 +1034,21 @@ CONFIG_CRYPTO_SHA256=m | |||
910 | CONFIG_CRYPTO_SHA512=m | 1034 | CONFIG_CRYPTO_SHA512=m |
911 | CONFIG_CRYPTO_WP512=m | 1035 | CONFIG_CRYPTO_WP512=m |
912 | CONFIG_CRYPTO_TGR192=m | 1036 | CONFIG_CRYPTO_TGR192=m |
1037 | CONFIG_CRYPTO_GF128MUL=m | ||
1038 | CONFIG_CRYPTO_ECB=m | ||
1039 | CONFIG_CRYPTO_CBC=y | ||
1040 | CONFIG_CRYPTO_PCBC=m | ||
1041 | CONFIG_CRYPTO_LRW=m | ||
1042 | CONFIG_CRYPTO_XTS=m | ||
1043 | CONFIG_CRYPTO_CTR=m | ||
1044 | CONFIG_CRYPTO_GCM=m | ||
1045 | CONFIG_CRYPTO_CCM=m | ||
1046 | CONFIG_CRYPTO_CRYPTD=m | ||
913 | CONFIG_CRYPTO_DES=y | 1047 | CONFIG_CRYPTO_DES=y |
1048 | CONFIG_CRYPTO_FCRYPT=m | ||
914 | CONFIG_CRYPTO_BLOWFISH=m | 1049 | CONFIG_CRYPTO_BLOWFISH=m |
915 | CONFIG_CRYPTO_TWOFISH=m | 1050 | CONFIG_CRYPTO_TWOFISH=m |
1051 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
916 | CONFIG_CRYPTO_SERPENT=m | 1052 | CONFIG_CRYPTO_SERPENT=m |
917 | CONFIG_CRYPTO_AES=m | 1053 | CONFIG_CRYPTO_AES=m |
918 | CONFIG_CRYPTO_CAST5=m | 1054 | CONFIG_CRYPTO_CAST5=m |
@@ -921,20 +1057,35 @@ CONFIG_CRYPTO_TEA=m | |||
921 | CONFIG_CRYPTO_ARC4=m | 1057 | CONFIG_CRYPTO_ARC4=m |
922 | CONFIG_CRYPTO_KHAZAD=m | 1058 | CONFIG_CRYPTO_KHAZAD=m |
923 | CONFIG_CRYPTO_ANUBIS=m | 1059 | CONFIG_CRYPTO_ANUBIS=m |
1060 | CONFIG_CRYPTO_SEED=m | ||
1061 | CONFIG_CRYPTO_SALSA20=m | ||
924 | CONFIG_CRYPTO_DEFLATE=m | 1062 | CONFIG_CRYPTO_DEFLATE=m |
925 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1063 | CONFIG_CRYPTO_MICHAEL_MIC=m |
926 | CONFIG_CRYPTO_CRC32C=m | 1064 | CONFIG_CRYPTO_CRC32C=m |
1065 | CONFIG_CRYPTO_CAMELLIA=m | ||
927 | CONFIG_CRYPTO_TEST=m | 1066 | CONFIG_CRYPTO_TEST=m |
928 | 1067 | CONFIG_CRYPTO_AUTHENC=m | |
929 | # | 1068 | CONFIG_CRYPTO_LZO=m |
930 | # Hardware crypto devices | 1069 | # CONFIG_CRYPTO_HW is not set |
931 | # | ||
932 | 1070 | ||
933 | # | 1071 | # |
934 | # Library routines | 1072 | # Library routines |
935 | # | 1073 | # |
1074 | CONFIG_BITREVERSE=y | ||
936 | CONFIG_CRC_CCITT=m | 1075 | CONFIG_CRC_CCITT=m |
1076 | CONFIG_CRC16=m | ||
1077 | # CONFIG_CRC_ITU_T is not set | ||
937 | CONFIG_CRC32=y | 1078 | CONFIG_CRC32=y |
1079 | # CONFIG_CRC7 is not set | ||
938 | CONFIG_LIBCRC32C=m | 1080 | CONFIG_LIBCRC32C=m |
939 | CONFIG_ZLIB_INFLATE=y | 1081 | CONFIG_ZLIB_INFLATE=y |
940 | CONFIG_ZLIB_DEFLATE=m | 1082 | CONFIG_ZLIB_DEFLATE=m |
1083 | CONFIG_LZO_COMPRESS=m | ||
1084 | CONFIG_LZO_DECOMPRESS=m | ||
1085 | CONFIG_TEXTSEARCH=y | ||
1086 | CONFIG_TEXTSEARCH_KMP=m | ||
1087 | CONFIG_TEXTSEARCH_BM=m | ||
1088 | CONFIG_TEXTSEARCH_FSM=m | ||
1089 | CONFIG_PLIST=y | ||
1090 | CONFIG_HAS_IOMEM=y | ||
1091 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index af903b5c5708..bd2b9c4927c4 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:35:02 2005 | 4 | # Wed Apr 2 20:46:22 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | CONFIG_NO_DMA=y | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-sun3" | 27 | CONFIG_LOCALVERSION="-sun3" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -69,10 +117,24 @@ CONFIG_SUN3=y | |||
69 | # | 117 | # |
70 | CONFIG_M68020=y | 118 | CONFIG_M68020=y |
71 | CONFIG_MMU_SUN3=y | 119 | CONFIG_MMU_SUN3=y |
72 | CONFIG_M68KFPU_EMU=y | 120 | # CONFIG_M68KFPU_EMU is not set |
73 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
74 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
75 | # CONFIG_ADVANCED is not set | 121 | # CONFIG_ADVANCED is not set |
122 | CONFIG_SINGLE_MEMORY_CHUNK=y | ||
123 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
124 | CONFIG_SELECT_MEMORY_MODEL=y | ||
125 | CONFIG_FLATMEM_MANUAL=y | ||
126 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
127 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
128 | CONFIG_FLATMEM=y | ||
129 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
130 | CONFIG_NEED_MULTIPLE_NODES=y | ||
131 | # CONFIG_SPARSEMEM_STATIC is not set | ||
132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
133 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
134 | # CONFIG_RESOURCES_64BIT is not set | ||
135 | CONFIG_ZONE_DMA_FLAG=1 | ||
136 | CONFIG_BOUNCE=y | ||
137 | CONFIG_VIRT_TO_BUS=y | ||
76 | 138 | ||
77 | # | 139 | # |
78 | # General setup | 140 | # General setup |
@@ -81,134 +143,11 @@ CONFIG_BINFMT_ELF=y | |||
81 | CONFIG_BINFMT_AOUT=m | 143 | CONFIG_BINFMT_AOUT=m |
82 | CONFIG_BINFMT_MISC=m | 144 | CONFIG_BINFMT_MISC=m |
83 | CONFIG_PROC_HARDWARE=y | 145 | CONFIG_PROC_HARDWARE=y |
146 | CONFIG_ZONE_DMA=y | ||
147 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
84 | 148 | ||
85 | # | 149 | # |
86 | # Device Drivers | 150 | # Networking |
87 | # | ||
88 | |||
89 | # | ||
90 | # Generic Driver Options | ||
91 | # | ||
92 | CONFIG_STANDALONE=y | ||
93 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
94 | CONFIG_FW_LOADER=m | ||
95 | # CONFIG_DEBUG_DRIVER is not set | ||
96 | |||
97 | # | ||
98 | # Memory Technology Devices (MTD) | ||
99 | # | ||
100 | # CONFIG_MTD is not set | ||
101 | |||
102 | # | ||
103 | # Parallel port support | ||
104 | # | ||
105 | # CONFIG_PARPORT is not set | ||
106 | |||
107 | # | ||
108 | # Plug and Play support | ||
109 | # | ||
110 | |||
111 | # | ||
112 | # Block devices | ||
113 | # | ||
114 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
115 | CONFIG_BLK_DEV_LOOP=y | ||
116 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
117 | CONFIG_BLK_DEV_NBD=m | ||
118 | CONFIG_BLK_DEV_RAM=y | ||
119 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
120 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
121 | CONFIG_BLK_DEV_INITRD=y | ||
122 | CONFIG_INITRAMFS_SOURCE="" | ||
123 | CONFIG_CDROM_PKTCDVD=m | ||
124 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
125 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
126 | |||
127 | # | ||
128 | # IO Schedulers | ||
129 | # | ||
130 | CONFIG_IOSCHED_NOOP=y | ||
131 | CONFIG_IOSCHED_AS=y | ||
132 | CONFIG_IOSCHED_DEADLINE=y | ||
133 | CONFIG_IOSCHED_CFQ=y | ||
134 | CONFIG_ATA_OVER_ETH=m | ||
135 | |||
136 | # | ||
137 | # ATA/ATAPI/MFM/RLL support | ||
138 | # | ||
139 | # CONFIG_IDE is not set | ||
140 | |||
141 | # | ||
142 | # SCSI device support | ||
143 | # | ||
144 | CONFIG_SCSI=y | ||
145 | CONFIG_SCSI_PROC_FS=y | ||
146 | |||
147 | # | ||
148 | # SCSI support type (disk, tape, CD-ROM) | ||
149 | # | ||
150 | CONFIG_BLK_DEV_SD=y | ||
151 | CONFIG_CHR_DEV_ST=m | ||
152 | # CONFIG_CHR_DEV_OSST is not set | ||
153 | CONFIG_BLK_DEV_SR=y | ||
154 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
155 | CONFIG_CHR_DEV_SG=m | ||
156 | |||
157 | # | ||
158 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
159 | # | ||
160 | # CONFIG_SCSI_MULTI_LUN is not set | ||
161 | CONFIG_SCSI_CONSTANTS=y | ||
162 | # CONFIG_SCSI_LOGGING is not set | ||
163 | |||
164 | # | ||
165 | # SCSI Transport Attributes | ||
166 | # | ||
167 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
168 | # CONFIG_SCSI_FC_ATTRS is not set | ||
169 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
170 | |||
171 | # | ||
172 | # SCSI low-level drivers | ||
173 | # | ||
174 | # CONFIG_SCSI_SATA is not set | ||
175 | # CONFIG_SCSI_DEBUG is not set | ||
176 | |||
177 | # | ||
178 | # Multi-device support (RAID and LVM) | ||
179 | # | ||
180 | CONFIG_MD=y | ||
181 | CONFIG_BLK_DEV_MD=m | ||
182 | CONFIG_MD_LINEAR=m | ||
183 | CONFIG_MD_RAID0=m | ||
184 | CONFIG_MD_RAID1=m | ||
185 | # CONFIG_MD_RAID10 is not set | ||
186 | CONFIG_MD_RAID5=m | ||
187 | CONFIG_MD_RAID6=m | ||
188 | CONFIG_MD_MULTIPATH=m | ||
189 | # CONFIG_MD_FAULTY is not set | ||
190 | CONFIG_BLK_DEV_DM=m | ||
191 | CONFIG_DM_CRYPT=m | ||
192 | CONFIG_DM_SNAPSHOT=m | ||
193 | CONFIG_DM_MIRROR=m | ||
194 | CONFIG_DM_ZERO=m | ||
195 | CONFIG_DM_MULTIPATH=m | ||
196 | CONFIG_DM_MULTIPATH_EMC=m | ||
197 | |||
198 | # | ||
199 | # Fusion MPT device support | ||
200 | # | ||
201 | |||
202 | # | ||
203 | # IEEE 1394 (FireWire) support | ||
204 | # | ||
205 | |||
206 | # | ||
207 | # I2O device support | ||
208 | # | ||
209 | |||
210 | # | ||
211 | # Networking support | ||
212 | # | 151 | # |
213 | CONFIG_NET=y | 152 | CONFIG_NET=y |
214 | 153 | ||
@@ -218,10 +157,17 @@ CONFIG_NET=y | |||
218 | CONFIG_PACKET=y | 157 | CONFIG_PACKET=y |
219 | # CONFIG_PACKET_MMAP is not set | 158 | # CONFIG_PACKET_MMAP is not set |
220 | CONFIG_UNIX=y | 159 | CONFIG_UNIX=y |
160 | CONFIG_XFRM=y | ||
161 | # CONFIG_XFRM_USER is not set | ||
162 | # CONFIG_XFRM_SUB_POLICY is not set | ||
163 | CONFIG_XFRM_MIGRATE=y | ||
164 | # CONFIG_XFRM_STATISTICS is not set | ||
221 | CONFIG_NET_KEY=y | 165 | CONFIG_NET_KEY=y |
166 | CONFIG_NET_KEY_MIGRATE=y | ||
222 | CONFIG_INET=y | 167 | CONFIG_INET=y |
223 | # CONFIG_IP_MULTICAST is not set | 168 | # CONFIG_IP_MULTICAST is not set |
224 | # CONFIG_IP_ADVANCED_ROUTER is not set | 169 | # CONFIG_IP_ADVANCED_ROUTER is not set |
170 | CONFIG_IP_FIB_HASH=y | ||
225 | CONFIG_IP_PNP=y | 171 | CONFIG_IP_PNP=y |
226 | CONFIG_IP_PNP_DHCP=y | 172 | CONFIG_IP_PNP_DHCP=y |
227 | CONFIG_IP_PNP_BOOTP=y | 173 | CONFIG_IP_PNP_BOOTP=y |
@@ -233,145 +179,199 @@ CONFIG_SYN_COOKIES=y | |||
233 | CONFIG_INET_AH=m | 179 | CONFIG_INET_AH=m |
234 | CONFIG_INET_ESP=m | 180 | CONFIG_INET_ESP=m |
235 | CONFIG_INET_IPCOMP=m | 181 | CONFIG_INET_IPCOMP=m |
182 | CONFIG_INET_XFRM_TUNNEL=m | ||
236 | CONFIG_INET_TUNNEL=m | 183 | CONFIG_INET_TUNNEL=m |
237 | CONFIG_IP_TCPDIAG=m | 184 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
238 | CONFIG_IP_TCPDIAG_IPV6=y | 185 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
239 | 186 | CONFIG_INET_XFRM_MODE_BEET=m | |
240 | # | 187 | CONFIG_INET_LRO=m |
241 | # IP: Virtual Server Configuration | 188 | CONFIG_INET_DIAG=m |
242 | # | 189 | CONFIG_INET_TCP_DIAG=m |
190 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
191 | CONFIG_TCP_CONG_CUBIC=y | ||
192 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
193 | # CONFIG_TCP_MD5SIG is not set | ||
243 | # CONFIG_IP_VS is not set | 194 | # CONFIG_IP_VS is not set |
244 | CONFIG_IPV6=m | 195 | CONFIG_IPV6=m |
245 | CONFIG_IPV6_PRIVACY=y | 196 | CONFIG_IPV6_PRIVACY=y |
197 | CONFIG_IPV6_ROUTER_PREF=y | ||
198 | CONFIG_IPV6_ROUTE_INFO=y | ||
199 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
246 | CONFIG_INET6_AH=m | 200 | CONFIG_INET6_AH=m |
247 | CONFIG_INET6_ESP=m | 201 | CONFIG_INET6_ESP=m |
248 | CONFIG_INET6_IPCOMP=m | 202 | CONFIG_INET6_IPCOMP=m |
203 | # CONFIG_IPV6_MIP6 is not set | ||
204 | CONFIG_INET6_XFRM_TUNNEL=m | ||
249 | CONFIG_INET6_TUNNEL=m | 205 | CONFIG_INET6_TUNNEL=m |
206 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
207 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
208 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
209 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
210 | CONFIG_IPV6_SIT=m | ||
250 | CONFIG_IPV6_TUNNEL=m | 211 | CONFIG_IPV6_TUNNEL=m |
212 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
213 | # CONFIG_NETWORK_SECMARK is not set | ||
251 | CONFIG_NETFILTER=y | 214 | CONFIG_NETFILTER=y |
252 | # CONFIG_NETFILTER_DEBUG is not set | 215 | # CONFIG_NETFILTER_DEBUG is not set |
216 | CONFIG_NETFILTER_ADVANCED=y | ||
217 | |||
218 | # | ||
219 | # Core Netfilter Configuration | ||
220 | # | ||
221 | CONFIG_NETFILTER_NETLINK=m | ||
222 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
223 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
224 | CONFIG_NF_CONNTRACK=m | ||
225 | CONFIG_NF_CT_ACCT=y | ||
226 | CONFIG_NF_CONNTRACK_MARK=y | ||
227 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
228 | CONFIG_NF_CT_PROTO_GRE=m | ||
229 | CONFIG_NF_CT_PROTO_SCTP=m | ||
230 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
231 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
232 | CONFIG_NF_CONNTRACK_FTP=m | ||
233 | CONFIG_NF_CONNTRACK_H323=m | ||
234 | CONFIG_NF_CONNTRACK_IRC=m | ||
235 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
236 | CONFIG_NF_CONNTRACK_PPTP=m | ||
237 | CONFIG_NF_CONNTRACK_SANE=m | ||
238 | CONFIG_NF_CONNTRACK_SIP=m | ||
239 | CONFIG_NF_CONNTRACK_TFTP=m | ||
240 | # CONFIG_NF_CT_NETLINK is not set | ||
241 | CONFIG_NETFILTER_XTABLES=m | ||
242 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
243 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
244 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
245 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
246 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
247 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
248 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
249 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
250 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
251 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
252 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
253 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
254 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
255 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
256 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
257 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
258 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
259 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
260 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
261 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
262 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
263 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
264 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
265 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
253 | 282 | ||
254 | # | 283 | # |
255 | # IP: Netfilter Configuration | 284 | # IP: Netfilter Configuration |
256 | # | 285 | # |
257 | CONFIG_IP_NF_CONNTRACK=m | 286 | CONFIG_NF_CONNTRACK_IPV4=m |
258 | # CONFIG_IP_NF_CT_ACCT is not set | 287 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
259 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
260 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
261 | CONFIG_IP_NF_FTP=m | ||
262 | CONFIG_IP_NF_IRC=m | ||
263 | CONFIG_IP_NF_TFTP=m | ||
264 | CONFIG_IP_NF_AMANDA=m | ||
265 | CONFIG_IP_NF_QUEUE=m | 288 | CONFIG_IP_NF_QUEUE=m |
266 | CONFIG_IP_NF_IPTABLES=m | 289 | CONFIG_IP_NF_IPTABLES=m |
267 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
268 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
269 | CONFIG_IP_NF_MATCH_MAC=m | ||
270 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
271 | CONFIG_IP_NF_MATCH_MARK=m | ||
272 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
273 | CONFIG_IP_NF_MATCH_TOS=m | ||
274 | CONFIG_IP_NF_MATCH_RECENT=m | 290 | CONFIG_IP_NF_MATCH_RECENT=m |
275 | CONFIG_IP_NF_MATCH_ECN=m | 291 | CONFIG_IP_NF_MATCH_ECN=m |
276 | CONFIG_IP_NF_MATCH_DSCP=m | 292 | CONFIG_IP_NF_MATCH_AH=m |
277 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
278 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
279 | CONFIG_IP_NF_MATCH_TTL=m | 293 | CONFIG_IP_NF_MATCH_TTL=m |
280 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
281 | CONFIG_IP_NF_MATCH_HELPER=m | ||
282 | CONFIG_IP_NF_MATCH_STATE=m | ||
283 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
284 | CONFIG_IP_NF_MATCH_OWNER=m | ||
285 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 294 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
286 | CONFIG_IP_NF_MATCH_REALM=m | ||
287 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
288 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
289 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
290 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
291 | CONFIG_IP_NF_FILTER=m | 295 | CONFIG_IP_NF_FILTER=m |
292 | CONFIG_IP_NF_TARGET_REJECT=m | 296 | CONFIG_IP_NF_TARGET_REJECT=m |
293 | CONFIG_IP_NF_TARGET_LOG=m | 297 | CONFIG_IP_NF_TARGET_LOG=m |
294 | CONFIG_IP_NF_TARGET_ULOG=m | 298 | CONFIG_IP_NF_TARGET_ULOG=m |
295 | CONFIG_IP_NF_TARGET_TCPMSS=m | 299 | CONFIG_NF_NAT=m |
296 | CONFIG_IP_NF_NAT=m | 300 | CONFIG_NF_NAT_NEEDED=y |
297 | CONFIG_IP_NF_NAT_NEEDED=y | ||
298 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 301 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
299 | CONFIG_IP_NF_TARGET_REDIRECT=m | 302 | CONFIG_IP_NF_TARGET_REDIRECT=m |
300 | CONFIG_IP_NF_TARGET_NETMAP=m | 303 | CONFIG_IP_NF_TARGET_NETMAP=m |
301 | CONFIG_IP_NF_TARGET_SAME=m | 304 | CONFIG_NF_NAT_SNMP_BASIC=m |
302 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 305 | CONFIG_NF_NAT_PROTO_GRE=m |
303 | CONFIG_IP_NF_NAT_IRC=m | 306 | CONFIG_NF_NAT_FTP=m |
304 | CONFIG_IP_NF_NAT_FTP=m | 307 | CONFIG_NF_NAT_IRC=m |
305 | CONFIG_IP_NF_NAT_TFTP=m | 308 | CONFIG_NF_NAT_TFTP=m |
306 | CONFIG_IP_NF_NAT_AMANDA=m | 309 | CONFIG_NF_NAT_AMANDA=m |
310 | CONFIG_NF_NAT_PPTP=m | ||
311 | CONFIG_NF_NAT_H323=m | ||
312 | CONFIG_NF_NAT_SIP=m | ||
307 | CONFIG_IP_NF_MANGLE=m | 313 | CONFIG_IP_NF_MANGLE=m |
308 | CONFIG_IP_NF_TARGET_TOS=m | ||
309 | CONFIG_IP_NF_TARGET_ECN=m | 314 | CONFIG_IP_NF_TARGET_ECN=m |
310 | CONFIG_IP_NF_TARGET_DSCP=m | 315 | CONFIG_IP_NF_TARGET_TTL=m |
311 | CONFIG_IP_NF_TARGET_MARK=m | 316 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
312 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
313 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
314 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
315 | CONFIG_IP_NF_RAW=m | 317 | CONFIG_IP_NF_RAW=m |
316 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
317 | CONFIG_IP_NF_ARPTABLES=m | 318 | CONFIG_IP_NF_ARPTABLES=m |
318 | CONFIG_IP_NF_ARPFILTER=m | 319 | CONFIG_IP_NF_ARPFILTER=m |
319 | CONFIG_IP_NF_ARP_MANGLE=m | 320 | CONFIG_IP_NF_ARP_MANGLE=m |
320 | 321 | ||
321 | # | 322 | # |
322 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 323 | # IPv6: Netfilter Configuration |
323 | # | 324 | # |
325 | CONFIG_NF_CONNTRACK_IPV6=m | ||
324 | CONFIG_IP6_NF_QUEUE=m | 326 | CONFIG_IP6_NF_QUEUE=m |
325 | CONFIG_IP6_NF_IPTABLES=m | 327 | CONFIG_IP6_NF_IPTABLES=m |
326 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
327 | CONFIG_IP6_NF_MATCH_MAC=m | ||
328 | CONFIG_IP6_NF_MATCH_RT=m | 328 | CONFIG_IP6_NF_MATCH_RT=m |
329 | CONFIG_IP6_NF_MATCH_OPTS=m | 329 | CONFIG_IP6_NF_MATCH_OPTS=m |
330 | CONFIG_IP6_NF_MATCH_FRAG=m | 330 | CONFIG_IP6_NF_MATCH_FRAG=m |
331 | CONFIG_IP6_NF_MATCH_HL=m | 331 | CONFIG_IP6_NF_MATCH_HL=m |
332 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
333 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
334 | CONFIG_IP6_NF_MATCH_MARK=m | ||
335 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 332 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
336 | CONFIG_IP6_NF_MATCH_AHESP=m | 333 | CONFIG_IP6_NF_MATCH_AH=m |
337 | CONFIG_IP6_NF_MATCH_LENGTH=m | 334 | CONFIG_IP6_NF_MATCH_MH=m |
338 | CONFIG_IP6_NF_MATCH_EUI64=m | 335 | CONFIG_IP6_NF_MATCH_EUI64=m |
339 | CONFIG_IP6_NF_FILTER=m | 336 | CONFIG_IP6_NF_FILTER=m |
340 | CONFIG_IP6_NF_TARGET_LOG=m | 337 | CONFIG_IP6_NF_TARGET_LOG=m |
338 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
341 | CONFIG_IP6_NF_MANGLE=m | 339 | CONFIG_IP6_NF_MANGLE=m |
342 | CONFIG_IP6_NF_TARGET_MARK=m | 340 | CONFIG_IP6_NF_TARGET_HL=m |
343 | CONFIG_IP6_NF_RAW=m | 341 | CONFIG_IP6_NF_RAW=m |
344 | CONFIG_XFRM=y | 342 | CONFIG_IP_DCCP=m |
345 | # CONFIG_XFRM_USER is not set | 343 | CONFIG_INET_DCCP_DIAG=m |
344 | CONFIG_IP_DCCP_ACKVEC=y | ||
346 | 345 | ||
347 | # | 346 | # |
348 | # SCTP Configuration (EXPERIMENTAL) | 347 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
349 | # | 348 | # |
349 | CONFIG_IP_DCCP_CCID2=m | ||
350 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
351 | CONFIG_IP_DCCP_CCID3=m | ||
352 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
353 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
354 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
350 | CONFIG_IP_SCTP=m | 355 | CONFIG_IP_SCTP=m |
351 | # CONFIG_SCTP_DBG_MSG is not set | 356 | # CONFIG_SCTP_DBG_MSG is not set |
352 | # CONFIG_SCTP_DBG_OBJCNT is not set | 357 | # CONFIG_SCTP_DBG_OBJCNT is not set |
353 | # CONFIG_SCTP_HMAC_NONE is not set | 358 | # CONFIG_SCTP_HMAC_NONE is not set |
354 | # CONFIG_SCTP_HMAC_SHA1 is not set | 359 | # CONFIG_SCTP_HMAC_SHA1 is not set |
355 | CONFIG_SCTP_HMAC_MD5=y | 360 | CONFIG_SCTP_HMAC_MD5=y |
361 | # CONFIG_TIPC is not set | ||
356 | # CONFIG_ATM is not set | 362 | # CONFIG_ATM is not set |
357 | # CONFIG_BRIDGE is not set | 363 | # CONFIG_BRIDGE is not set |
358 | # CONFIG_VLAN_8021Q is not set | 364 | # CONFIG_VLAN_8021Q is not set |
359 | # CONFIG_DECNET is not set | 365 | # CONFIG_DECNET is not set |
360 | CONFIG_LLC=m | 366 | CONFIG_LLC=m |
361 | # CONFIG_LLC2 is not set | 367 | # CONFIG_LLC2 is not set |
362 | CONFIG_IPX=m | 368 | # CONFIG_IPX is not set |
363 | # CONFIG_IPX_INTERN is not set | ||
364 | CONFIG_ATALK=m | 369 | CONFIG_ATALK=m |
365 | # CONFIG_DEV_APPLETALK is not set | 370 | # CONFIG_DEV_APPLETALK is not set |
366 | # CONFIG_X25 is not set | 371 | # CONFIG_X25 is not set |
367 | # CONFIG_LAPB is not set | 372 | # CONFIG_LAPB is not set |
368 | # CONFIG_NET_DIVERT is not set | ||
369 | # CONFIG_ECONET is not set | 373 | # CONFIG_ECONET is not set |
370 | # CONFIG_WAN_ROUTER is not set | 374 | # CONFIG_WAN_ROUTER is not set |
371 | |||
372 | # | ||
373 | # QoS and/or fair queueing | ||
374 | # | ||
375 | # CONFIG_NET_SCHED is not set | 375 | # CONFIG_NET_SCHED is not set |
376 | CONFIG_NET_CLS_ROUTE=y | 376 | CONFIG_NET_CLS_ROUTE=y |
377 | 377 | ||
@@ -379,47 +379,156 @@ CONFIG_NET_CLS_ROUTE=y | |||
379 | # Network testing | 379 | # Network testing |
380 | # | 380 | # |
381 | # CONFIG_NET_PKTGEN is not set | 381 | # CONFIG_NET_PKTGEN is not set |
382 | CONFIG_NETPOLL=y | ||
383 | # CONFIG_NETPOLL_RX is not set | ||
384 | # CONFIG_NETPOLL_TRAP is not set | ||
385 | CONFIG_NET_POLL_CONTROLLER=y | ||
386 | # CONFIG_HAMRADIO is not set | 382 | # CONFIG_HAMRADIO is not set |
383 | # CONFIG_CAN is not set | ||
387 | # CONFIG_IRDA is not set | 384 | # CONFIG_IRDA is not set |
388 | # CONFIG_BT is not set | 385 | # CONFIG_BT is not set |
389 | CONFIG_NETDEVICES=y | 386 | # CONFIG_AF_RXRPC is not set |
390 | CONFIG_DUMMY=m | ||
391 | # CONFIG_BONDING is not set | ||
392 | CONFIG_EQUALIZER=m | ||
393 | # CONFIG_TUN is not set | ||
394 | 387 | ||
395 | # | 388 | # |
396 | # Ethernet (10 or 100Mbit) | 389 | # Wireless |
397 | # | 390 | # |
398 | CONFIG_NET_ETHERNET=y | 391 | # CONFIG_CFG80211 is not set |
399 | CONFIG_MII=m | 392 | CONFIG_WIRELESS_EXT=y |
400 | CONFIG_SUN3LANCE=y | 393 | # CONFIG_MAC80211 is not set |
401 | CONFIG_SUN3_82586=y | 394 | CONFIG_IEEE80211=m |
395 | # CONFIG_IEEE80211_DEBUG is not set | ||
396 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
397 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
398 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
399 | CONFIG_IEEE80211_SOFTMAC=m | ||
400 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
401 | # CONFIG_RFKILL is not set | ||
402 | # CONFIG_NET_9P is not set | ||
402 | 403 | ||
403 | # | 404 | # |
404 | # Ethernet (1000 Mbit) | 405 | # Device Drivers |
405 | # | 406 | # |
406 | 407 | ||
407 | # | 408 | # |
408 | # Ethernet (10000 Mbit) | 409 | # Generic Driver Options |
409 | # | 410 | # |
411 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
412 | CONFIG_STANDALONE=y | ||
413 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
414 | CONFIG_FW_LOADER=m | ||
415 | # CONFIG_SYS_HYPERVISOR is not set | ||
416 | CONFIG_CONNECTOR=m | ||
417 | # CONFIG_MTD is not set | ||
418 | # CONFIG_PARPORT is not set | ||
419 | CONFIG_BLK_DEV=y | ||
420 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
421 | CONFIG_BLK_DEV_LOOP=y | ||
422 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
423 | CONFIG_BLK_DEV_NBD=m | ||
424 | CONFIG_BLK_DEV_RAM=y | ||
425 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
426 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
427 | # CONFIG_BLK_DEV_XIP is not set | ||
428 | CONFIG_CDROM_PKTCDVD=m | ||
429 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
430 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
431 | CONFIG_ATA_OVER_ETH=m | ||
432 | CONFIG_MISC_DEVICES=y | ||
433 | # CONFIG_EEPROM_93CX6 is not set | ||
434 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
435 | CONFIG_HAVE_IDE=y | ||
436 | # CONFIG_IDE is not set | ||
410 | 437 | ||
411 | # | 438 | # |
412 | # Token Ring devices | 439 | # SCSI device support |
413 | # | 440 | # |
441 | CONFIG_RAID_ATTRS=m | ||
442 | CONFIG_SCSI=y | ||
443 | # CONFIG_SCSI_DMA is not set | ||
444 | CONFIG_SCSI_TGT=m | ||
445 | # CONFIG_SCSI_NETLINK is not set | ||
446 | CONFIG_SCSI_PROC_FS=y | ||
414 | 447 | ||
415 | # | 448 | # |
416 | # Wireless LAN (non-hamradio) | 449 | # SCSI support type (disk, tape, CD-ROM) |
417 | # | 450 | # |
418 | # CONFIG_NET_RADIO is not set | 451 | CONFIG_BLK_DEV_SD=y |
452 | CONFIG_CHR_DEV_ST=m | ||
453 | CONFIG_CHR_DEV_OSST=m | ||
454 | CONFIG_BLK_DEV_SR=y | ||
455 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
456 | CONFIG_CHR_DEV_SG=m | ||
457 | # CONFIG_CHR_DEV_SCH is not set | ||
419 | 458 | ||
420 | # | 459 | # |
421 | # Wan interfaces | 460 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
422 | # | 461 | # |
462 | # CONFIG_SCSI_MULTI_LUN is not set | ||
463 | CONFIG_SCSI_CONSTANTS=y | ||
464 | # CONFIG_SCSI_LOGGING is not set | ||
465 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
466 | CONFIG_SCSI_WAIT_SCAN=m | ||
467 | |||
468 | # | ||
469 | # SCSI Transports | ||
470 | # | ||
471 | CONFIG_SCSI_SPI_ATTRS=y | ||
472 | # CONFIG_SCSI_FC_ATTRS is not set | ||
473 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
474 | CONFIG_SCSI_SAS_ATTRS=m | ||
475 | CONFIG_SCSI_SAS_LIBSAS=m | ||
476 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
477 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
478 | CONFIG_SCSI_SRP_ATTRS=m | ||
479 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
480 | CONFIG_SCSI_LOWLEVEL=y | ||
481 | CONFIG_ISCSI_TCP=m | ||
482 | # CONFIG_SCSI_DEBUG is not set | ||
483 | CONFIG_SUN3_SCSI=y | ||
484 | CONFIG_MD=y | ||
485 | CONFIG_BLK_DEV_MD=m | ||
486 | CONFIG_MD_LINEAR=m | ||
487 | CONFIG_MD_RAID0=m | ||
488 | CONFIG_MD_RAID1=m | ||
489 | # CONFIG_MD_RAID10 is not set | ||
490 | CONFIG_MD_RAID456=m | ||
491 | CONFIG_MD_RAID5_RESHAPE=y | ||
492 | CONFIG_MD_MULTIPATH=m | ||
493 | # CONFIG_MD_FAULTY is not set | ||
494 | CONFIG_BLK_DEV_DM=m | ||
495 | # CONFIG_DM_DEBUG is not set | ||
496 | CONFIG_DM_CRYPT=m | ||
497 | CONFIG_DM_SNAPSHOT=m | ||
498 | CONFIG_DM_MIRROR=m | ||
499 | CONFIG_DM_ZERO=m | ||
500 | CONFIG_DM_MULTIPATH=m | ||
501 | CONFIG_DM_MULTIPATH_EMC=m | ||
502 | CONFIG_DM_MULTIPATH_RDAC=m | ||
503 | CONFIG_DM_MULTIPATH_HP=m | ||
504 | # CONFIG_DM_DELAY is not set | ||
505 | CONFIG_DM_UEVENT=y | ||
506 | CONFIG_NETDEVICES=y | ||
507 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
508 | CONFIG_DUMMY=m | ||
509 | # CONFIG_BONDING is not set | ||
510 | CONFIG_MACVLAN=m | ||
511 | CONFIG_EQUALIZER=m | ||
512 | # CONFIG_TUN is not set | ||
513 | CONFIG_VETH=m | ||
514 | # CONFIG_PHYLIB is not set | ||
515 | CONFIG_NET_ETHERNET=y | ||
516 | # CONFIG_MII is not set | ||
517 | CONFIG_SUN3LANCE=y | ||
518 | CONFIG_SUN3_82586=y | ||
519 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
520 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
521 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
522 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
523 | # CONFIG_B44 is not set | ||
524 | # CONFIG_NETDEV_1000 is not set | ||
525 | # CONFIG_NETDEV_10000 is not set | ||
526 | |||
527 | # | ||
528 | # Wireless LAN | ||
529 | # | ||
530 | # CONFIG_WLAN_PRE80211 is not set | ||
531 | # CONFIG_WLAN_80211 is not set | ||
423 | # CONFIG_WAN is not set | 532 | # CONFIG_WAN is not set |
424 | CONFIG_PPP=m | 533 | CONFIG_PPP=m |
425 | # CONFIG_PPP_MULTILINK is not set | 534 | # CONFIG_PPP_MULTILINK is not set |
@@ -428,28 +537,28 @@ CONFIG_PPP_ASYNC=m | |||
428 | CONFIG_PPP_SYNC_TTY=m | 537 | CONFIG_PPP_SYNC_TTY=m |
429 | CONFIG_PPP_DEFLATE=m | 538 | CONFIG_PPP_DEFLATE=m |
430 | CONFIG_PPP_BSDCOMP=m | 539 | CONFIG_PPP_BSDCOMP=m |
540 | CONFIG_PPP_MPPE=m | ||
431 | CONFIG_PPPOE=m | 541 | CONFIG_PPPOE=m |
542 | CONFIG_PPPOL2TP=m | ||
432 | CONFIG_SLIP=m | 543 | CONFIG_SLIP=m |
433 | CONFIG_SLIP_COMPRESSED=y | 544 | CONFIG_SLIP_COMPRESSED=y |
545 | CONFIG_SLHC=m | ||
434 | CONFIG_SLIP_SMART=y | 546 | CONFIG_SLIP_SMART=y |
435 | CONFIG_SLIP_MODE_SLIP6=y | 547 | CONFIG_SLIP_MODE_SLIP6=y |
436 | CONFIG_SHAPER=m | ||
437 | CONFIG_NETCONSOLE=m | 548 | CONFIG_NETCONSOLE=m |
438 | 549 | CONFIG_NETCONSOLE_DYNAMIC=y | |
439 | # | 550 | CONFIG_NETPOLL=y |
440 | # ISDN subsystem | 551 | # CONFIG_NETPOLL_TRAP is not set |
441 | # | 552 | CONFIG_NET_POLL_CONTROLLER=y |
442 | # CONFIG_ISDN is not set | 553 | # CONFIG_ISDN is not set |
443 | |||
444 | # | ||
445 | # Telephony Support | ||
446 | # | ||
447 | # CONFIG_PHONE is not set | 554 | # CONFIG_PHONE is not set |
448 | 555 | ||
449 | # | 556 | # |
450 | # Input device support | 557 | # Input device support |
451 | # | 558 | # |
452 | CONFIG_INPUT=y | 559 | CONFIG_INPUT=y |
560 | CONFIG_INPUT_FF_MEMLESS=m | ||
561 | # CONFIG_INPUT_POLLDEV is not set | ||
453 | 562 | ||
454 | # | 563 | # |
455 | # Userland interfaces | 564 | # Userland interfaces |
@@ -459,7 +568,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
459 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 568 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
460 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 569 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
461 | # CONFIG_INPUT_JOYDEV is not set | 570 | # CONFIG_INPUT_JOYDEV is not set |
462 | # CONFIG_INPUT_TSDEV is not set | ||
463 | # CONFIG_INPUT_EVDEV is not set | 571 | # CONFIG_INPUT_EVDEV is not set |
464 | # CONFIG_INPUT_EVBUG is not set | 572 | # CONFIG_INPUT_EVBUG is not set |
465 | 573 | ||
@@ -472,11 +580,19 @@ CONFIG_KEYBOARD_SUNKBD=y | |||
472 | # CONFIG_KEYBOARD_LKKBD is not set | 580 | # CONFIG_KEYBOARD_LKKBD is not set |
473 | # CONFIG_KEYBOARD_XTKBD is not set | 581 | # CONFIG_KEYBOARD_XTKBD is not set |
474 | # CONFIG_KEYBOARD_NEWTON is not set | 582 | # CONFIG_KEYBOARD_NEWTON is not set |
583 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
475 | CONFIG_INPUT_MOUSE=y | 584 | CONFIG_INPUT_MOUSE=y |
476 | CONFIG_MOUSE_PS2=m | 585 | CONFIG_MOUSE_PS2=m |
586 | CONFIG_MOUSE_PS2_ALPS=y | ||
587 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
588 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
589 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
590 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
591 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
477 | CONFIG_MOUSE_SERIAL=m | 592 | CONFIG_MOUSE_SERIAL=m |
478 | # CONFIG_MOUSE_VSXXXAA is not set | 593 | # CONFIG_MOUSE_VSXXXAA is not set |
479 | # CONFIG_INPUT_JOYSTICK is not set | 594 | # CONFIG_INPUT_JOYSTICK is not set |
595 | # CONFIG_INPUT_TABLET is not set | ||
480 | # CONFIG_INPUT_TOUCHSCREEN is not set | 596 | # CONFIG_INPUT_TOUCHSCREEN is not set |
481 | # CONFIG_INPUT_MISC is not set | 597 | # CONFIG_INPUT_MISC is not set |
482 | 598 | ||
@@ -484,7 +600,7 @@ CONFIG_MOUSE_SERIAL=m | |||
484 | # Hardware I/O ports | 600 | # Hardware I/O ports |
485 | # | 601 | # |
486 | CONFIG_SERIO=y | 602 | CONFIG_SERIO=y |
487 | CONFIG_SERIO_SERPORT=m | 603 | # CONFIG_SERIO_SERPORT is not set |
488 | CONFIG_SERIO_LIBPS2=m | 604 | CONFIG_SERIO_LIBPS2=m |
489 | # CONFIG_SERIO_RAW is not set | 605 | # CONFIG_SERIO_RAW is not set |
490 | # CONFIG_GAMEPORT is not set | 606 | # CONFIG_GAMEPORT is not set |
@@ -495,6 +611,7 @@ CONFIG_SERIO_LIBPS2=m | |||
495 | CONFIG_VT=y | 611 | CONFIG_VT=y |
496 | CONFIG_VT_CONSOLE=y | 612 | CONFIG_VT_CONSOLE=y |
497 | CONFIG_HW_CONSOLE=y | 613 | CONFIG_HW_CONSOLE=y |
614 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
498 | # CONFIG_SERIAL_NONSTANDARD is not set | 615 | # CONFIG_SERIAL_NONSTANDARD is not set |
499 | 616 | ||
500 | # | 617 | # |
@@ -508,112 +625,113 @@ CONFIG_HW_CONSOLE=y | |||
508 | CONFIG_UNIX98_PTYS=y | 625 | CONFIG_UNIX98_PTYS=y |
509 | CONFIG_LEGACY_PTYS=y | 626 | CONFIG_LEGACY_PTYS=y |
510 | CONFIG_LEGACY_PTY_COUNT=256 | 627 | CONFIG_LEGACY_PTY_COUNT=256 |
511 | |||
512 | # | ||
513 | # IPMI | ||
514 | # | ||
515 | # CONFIG_IPMI_HANDLER is not set | 628 | # CONFIG_IPMI_HANDLER is not set |
516 | 629 | # CONFIG_HW_RANDOM is not set | |
517 | # | 630 | CONFIG_GEN_RTC=m |
518 | # Watchdog Cards | ||
519 | # | ||
520 | # CONFIG_WATCHDOG is not set | ||
521 | CONFIG_GEN_RTC=y | ||
522 | CONFIG_GEN_RTC_X=y | 631 | CONFIG_GEN_RTC_X=y |
523 | # CONFIG_DTLK is not set | ||
524 | # CONFIG_R3964 is not set | 632 | # CONFIG_R3964 is not set |
525 | |||
526 | # | ||
527 | # Ftape, the floppy tape device driver | ||
528 | # | ||
529 | # CONFIG_DRM is not set | ||
530 | # CONFIG_RAW_DRIVER is not set | 633 | # CONFIG_RAW_DRIVER is not set |
531 | 634 | # CONFIG_TCG_TPM is not set | |
532 | # | ||
533 | # TPM devices | ||
534 | # | ||
535 | |||
536 | # | ||
537 | # I2C support | ||
538 | # | ||
539 | # CONFIG_I2C is not set | 635 | # CONFIG_I2C is not set |
540 | 636 | ||
541 | # | 637 | # |
542 | # Dallas's 1-wire bus | 638 | # SPI support |
543 | # | 639 | # |
640 | # CONFIG_SPI is not set | ||
641 | # CONFIG_SPI_MASTER is not set | ||
544 | # CONFIG_W1 is not set | 642 | # CONFIG_W1 is not set |
643 | # CONFIG_POWER_SUPPLY is not set | ||
644 | # CONFIG_HWMON is not set | ||
645 | # CONFIG_THERMAL is not set | ||
646 | # CONFIG_WATCHDOG is not set | ||
545 | 647 | ||
546 | # | 648 | # |
547 | # Misc devices | 649 | # Sonics Silicon Backplane |
548 | # | 650 | # |
651 | CONFIG_SSB_POSSIBLE=y | ||
652 | # CONFIG_SSB is not set | ||
549 | 653 | ||
550 | # | 654 | # |
551 | # Multimedia devices | 655 | # Multifunction device drivers |
552 | # | 656 | # |
553 | # CONFIG_VIDEO_DEV is not set | 657 | # CONFIG_MFD_SM501 is not set |
554 | 658 | ||
555 | # | 659 | # |
556 | # Digital Video Broadcasting Devices | 660 | # Multimedia devices |
557 | # | 661 | # |
558 | # CONFIG_DVB is not set | 662 | # CONFIG_VIDEO_DEV is not set |
663 | # CONFIG_DVB_CORE is not set | ||
664 | # CONFIG_DAB is not set | ||
559 | 665 | ||
560 | # | 666 | # |
561 | # Graphics support | 667 | # Graphics support |
562 | # | 668 | # |
669 | # CONFIG_VGASTATE is not set | ||
670 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
563 | CONFIG_FB=y | 671 | CONFIG_FB=y |
672 | # CONFIG_FIRMWARE_EDID is not set | ||
673 | # CONFIG_FB_DDC is not set | ||
564 | # CONFIG_FB_CFB_FILLRECT is not set | 674 | # CONFIG_FB_CFB_FILLRECT is not set |
565 | # CONFIG_FB_CFB_COPYAREA is not set | 675 | # CONFIG_FB_CFB_COPYAREA is not set |
566 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 676 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
567 | # CONFIG_FB_SOFT_CURSOR is not set | 677 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
678 | # CONFIG_FB_SYS_FILLRECT is not set | ||
679 | # CONFIG_FB_SYS_COPYAREA is not set | ||
680 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
681 | # CONFIG_FB_SYS_FOPS is not set | ||
682 | CONFIG_FB_DEFERRED_IO=y | ||
683 | # CONFIG_FB_SVGALIB is not set | ||
568 | # CONFIG_FB_MACMODES is not set | 684 | # CONFIG_FB_MACMODES is not set |
569 | CONFIG_FB_MODE_HELPERS=y | 685 | # CONFIG_FB_BACKLIGHT is not set |
686 | # CONFIG_FB_MODE_HELPERS is not set | ||
570 | # CONFIG_FB_TILEBLITTING is not set | 687 | # CONFIG_FB_TILEBLITTING is not set |
688 | |||
689 | # | ||
690 | # Frame buffer hardware drivers | ||
691 | # | ||
692 | # CONFIG_FB_UVESA is not set | ||
571 | # CONFIG_FB_S1D13XXX is not set | 693 | # CONFIG_FB_S1D13XXX is not set |
572 | # CONFIG_FB_VIRTUAL is not set | 694 | # CONFIG_FB_VIRTUAL is not set |
695 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
696 | |||
697 | # | ||
698 | # Display device support | ||
699 | # | ||
700 | # CONFIG_DISPLAY_SUPPORT is not set | ||
573 | 701 | ||
574 | # | 702 | # |
575 | # Console display driver support | 703 | # Console display driver support |
576 | # | 704 | # |
577 | CONFIG_DUMMY_CONSOLE=y | 705 | CONFIG_DUMMY_CONSOLE=y |
578 | CONFIG_FRAMEBUFFER_CONSOLE=y | 706 | CONFIG_FRAMEBUFFER_CONSOLE=y |
707 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
708 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
579 | # CONFIG_FONTS is not set | 709 | # CONFIG_FONTS is not set |
580 | CONFIG_FONT_8x8=y | 710 | CONFIG_FONT_8x8=y |
581 | CONFIG_FONT_8x16=y | 711 | CONFIG_FONT_8x16=y |
582 | |||
583 | # | ||
584 | # Logo configuration | ||
585 | # | ||
586 | CONFIG_LOGO=y | 712 | CONFIG_LOGO=y |
587 | CONFIG_LOGO_LINUX_MONO=y | 713 | CONFIG_LOGO_LINUX_MONO=y |
588 | CONFIG_LOGO_LINUX_VGA16=y | 714 | CONFIG_LOGO_LINUX_VGA16=y |
589 | CONFIG_LOGO_LINUX_CLUT224=y | 715 | CONFIG_LOGO_LINUX_CLUT224=y |
590 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
591 | 716 | ||
592 | # | 717 | # |
593 | # Sound | 718 | # Sound |
594 | # | 719 | # |
595 | # CONFIG_SOUND is not set | 720 | # CONFIG_SOUND is not set |
596 | 721 | CONFIG_HID_SUPPORT=y | |
597 | # | 722 | CONFIG_HID=m |
598 | # USB support | 723 | # CONFIG_HID_DEBUG is not set |
599 | # | 724 | CONFIG_HIDRAW=y |
600 | # CONFIG_USB_ARCH_HAS_HCD is not set | 725 | # CONFIG_USB_SUPPORT is not set |
601 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
602 | |||
603 | # | ||
604 | # USB Gadget Support | ||
605 | # | ||
606 | # CONFIG_USB_GADGET is not set | ||
607 | |||
608 | # | ||
609 | # MMC/SD Card support | ||
610 | # | ||
611 | # CONFIG_MMC is not set | 726 | # CONFIG_MMC is not set |
727 | # CONFIG_MEMSTICK is not set | ||
728 | # CONFIG_NEW_LEDS is not set | ||
729 | # CONFIG_RTC_CLASS is not set | ||
612 | 730 | ||
613 | # | 731 | # |
614 | # InfiniBand support | 732 | # Userspace I/O |
615 | # | 733 | # |
616 | # CONFIG_INFINIBAND is not set | 734 | # CONFIG_UIO is not set |
617 | 735 | ||
618 | # | 736 | # |
619 | # Character devices | 737 | # Character devices |
@@ -624,10 +742,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
624 | # | 742 | # |
625 | CONFIG_EXT2_FS=y | 743 | CONFIG_EXT2_FS=y |
626 | # CONFIG_EXT2_FS_XATTR is not set | 744 | # CONFIG_EXT2_FS_XATTR is not set |
745 | # CONFIG_EXT2_FS_XIP is not set | ||
627 | CONFIG_EXT3_FS=y | 746 | CONFIG_EXT3_FS=y |
628 | # CONFIG_EXT3_FS_XATTR is not set | 747 | # CONFIG_EXT3_FS_XATTR is not set |
748 | # CONFIG_EXT4DEV_FS is not set | ||
629 | CONFIG_JBD=y | 749 | CONFIG_JBD=y |
630 | # CONFIG_JBD_DEBUG is not set | ||
631 | CONFIG_REISERFS_FS=m | 750 | CONFIG_REISERFS_FS=m |
632 | # CONFIG_REISERFS_CHECK is not set | 751 | # CONFIG_REISERFS_CHECK is not set |
633 | # CONFIG_REISERFS_PROC_INFO is not set | 752 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -638,25 +757,29 @@ CONFIG_JFS_FS=m | |||
638 | # CONFIG_JFS_DEBUG is not set | 757 | # CONFIG_JFS_DEBUG is not set |
639 | # CONFIG_JFS_STATISTICS is not set | 758 | # CONFIG_JFS_STATISTICS is not set |
640 | CONFIG_FS_POSIX_ACL=y | 759 | CONFIG_FS_POSIX_ACL=y |
641 | |||
642 | # | ||
643 | # XFS support | ||
644 | # | ||
645 | CONFIG_XFS_FS=m | 760 | CONFIG_XFS_FS=m |
646 | CONFIG_XFS_EXPORT=y | ||
647 | # CONFIG_XFS_RT is not set | ||
648 | # CONFIG_XFS_QUOTA is not set | 761 | # CONFIG_XFS_QUOTA is not set |
649 | # CONFIG_XFS_SECURITY is not set | 762 | # CONFIG_XFS_SECURITY is not set |
650 | # CONFIG_XFS_POSIX_ACL is not set | 763 | # CONFIG_XFS_POSIX_ACL is not set |
651 | CONFIG_MINIX_FS=y | 764 | # CONFIG_XFS_RT is not set |
652 | # CONFIG_ROMFS_FS is not set | 765 | CONFIG_GFS2_FS=m |
766 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
767 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
768 | CONFIG_OCFS2_FS=m | ||
769 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
770 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
771 | CONFIG_DNOTIFY=y | ||
772 | CONFIG_INOTIFY=y | ||
773 | CONFIG_INOTIFY_USER=y | ||
653 | CONFIG_QUOTA=y | 774 | CONFIG_QUOTA=y |
775 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
776 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
654 | # CONFIG_QFMT_V1 is not set | 777 | # CONFIG_QFMT_V1 is not set |
655 | # CONFIG_QFMT_V2 is not set | 778 | # CONFIG_QFMT_V2 is not set |
656 | CONFIG_QUOTACTL=y | 779 | CONFIG_QUOTACTL=y |
657 | CONFIG_DNOTIFY=y | ||
658 | CONFIG_AUTOFS_FS=m | 780 | CONFIG_AUTOFS_FS=m |
659 | CONFIG_AUTOFS4_FS=m | 781 | CONFIG_AUTOFS4_FS=m |
782 | CONFIG_FUSE_FS=m | ||
660 | 783 | ||
661 | # | 784 | # |
662 | # CD-ROM/DVD Filesystems | 785 | # CD-ROM/DVD Filesystems |
@@ -664,7 +787,6 @@ CONFIG_AUTOFS4_FS=m | |||
664 | CONFIG_ISO9660_FS=y | 787 | CONFIG_ISO9660_FS=y |
665 | CONFIG_JOLIET=y | 788 | CONFIG_JOLIET=y |
666 | CONFIG_ZISOFS=y | 789 | CONFIG_ZISOFS=y |
667 | CONFIG_ZISOFS_FS=y | ||
668 | CONFIG_UDF_FS=m | 790 | CONFIG_UDF_FS=m |
669 | CONFIG_UDF_NLS=y | 791 | CONFIG_UDF_NLS=y |
670 | 792 | ||
@@ -683,15 +805,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
683 | # | 805 | # |
684 | CONFIG_PROC_FS=y | 806 | CONFIG_PROC_FS=y |
685 | CONFIG_PROC_KCORE=y | 807 | CONFIG_PROC_KCORE=y |
808 | CONFIG_PROC_SYSCTL=y | ||
686 | CONFIG_SYSFS=y | 809 | CONFIG_SYSFS=y |
687 | CONFIG_DEVFS_FS=y | ||
688 | CONFIG_DEVFS_MOUNT=y | ||
689 | # CONFIG_DEVFS_DEBUG is not set | ||
690 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
691 | CONFIG_TMPFS=y | 810 | CONFIG_TMPFS=y |
692 | # CONFIG_TMPFS_XATTR is not set | 811 | # CONFIG_TMPFS_POSIX_ACL is not set |
693 | # CONFIG_HUGETLB_PAGE is not set | 812 | # CONFIG_HUGETLB_PAGE is not set |
694 | CONFIG_RAMFS=y | 813 | CONFIG_CONFIGFS_FS=m |
695 | 814 | ||
696 | # | 815 | # |
697 | # Miscellaneous filesystems | 816 | # Miscellaneous filesystems |
@@ -705,44 +824,40 @@ CONFIG_HFSPLUS_FS=m | |||
705 | # CONFIG_EFS_FS is not set | 824 | # CONFIG_EFS_FS is not set |
706 | CONFIG_CRAMFS=m | 825 | CONFIG_CRAMFS=m |
707 | # CONFIG_VXFS_FS is not set | 826 | # CONFIG_VXFS_FS is not set |
827 | CONFIG_MINIX_FS=y | ||
708 | CONFIG_HPFS_FS=m | 828 | CONFIG_HPFS_FS=m |
709 | # CONFIG_QNX4FS_FS is not set | 829 | # CONFIG_QNX4FS_FS is not set |
830 | # CONFIG_ROMFS_FS is not set | ||
710 | CONFIG_SYSV_FS=m | 831 | CONFIG_SYSV_FS=m |
711 | CONFIG_UFS_FS=m | 832 | CONFIG_UFS_FS=m |
712 | CONFIG_UFS_FS_WRITE=y | 833 | # CONFIG_UFS_FS_WRITE is not set |
713 | 834 | # CONFIG_UFS_DEBUG is not set | |
714 | # | 835 | CONFIG_NETWORK_FILESYSTEMS=y |
715 | # Network File Systems | ||
716 | # | ||
717 | CONFIG_NFS_FS=y | 836 | CONFIG_NFS_FS=y |
718 | CONFIG_NFS_V3=y | 837 | CONFIG_NFS_V3=y |
838 | # CONFIG_NFS_V3_ACL is not set | ||
719 | CONFIG_NFS_V4=y | 839 | CONFIG_NFS_V4=y |
720 | # CONFIG_NFS_DIRECTIO is not set | 840 | # CONFIG_NFS_DIRECTIO is not set |
721 | CONFIG_NFSD=m | 841 | CONFIG_NFSD=m |
722 | CONFIG_NFSD_V3=y | 842 | CONFIG_NFSD_V3=y |
723 | CONFIG_NFSD_V4=y | 843 | # CONFIG_NFSD_V3_ACL is not set |
844 | # CONFIG_NFSD_V4 is not set | ||
724 | CONFIG_NFSD_TCP=y | 845 | CONFIG_NFSD_TCP=y |
725 | CONFIG_ROOT_NFS=y | 846 | CONFIG_ROOT_NFS=y |
726 | CONFIG_LOCKD=y | 847 | CONFIG_LOCKD=y |
727 | CONFIG_LOCKD_V4=y | 848 | CONFIG_LOCKD_V4=y |
728 | CONFIG_EXPORTFS=m | 849 | CONFIG_EXPORTFS=m |
850 | CONFIG_NFS_COMMON=y | ||
729 | CONFIG_SUNRPC=y | 851 | CONFIG_SUNRPC=y |
730 | CONFIG_SUNRPC_GSS=y | 852 | CONFIG_SUNRPC_GSS=y |
853 | CONFIG_SUNRPC_BIND34=y | ||
731 | CONFIG_RPCSEC_GSS_KRB5=y | 854 | CONFIG_RPCSEC_GSS_KRB5=y |
732 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
733 | CONFIG_SMB_FS=m | 856 | CONFIG_SMB_FS=m |
734 | CONFIG_SMB_NLS_DEFAULT=y | 857 | CONFIG_SMB_NLS_DEFAULT=y |
735 | CONFIG_SMB_NLS_REMOTE="cp437" | 858 | CONFIG_SMB_NLS_REMOTE="cp437" |
736 | # CONFIG_CIFS is not set | 859 | # CONFIG_CIFS is not set |
737 | CONFIG_NCP_FS=m | 860 | # CONFIG_NCP_FS is not set |
738 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
739 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
740 | # CONFIG_NCPFS_STRONG is not set | ||
741 | # CONFIG_NCPFS_NFS_NS is not set | ||
742 | # CONFIG_NCPFS_OS2_NS is not set | ||
743 | # CONFIG_NCPFS_SMALLDOS is not set | ||
744 | CONFIG_NCPFS_NLS=y | ||
745 | # CONFIG_NCPFS_EXTRAS is not set | ||
746 | CONFIG_CODA_FS=m | 861 | CONFIG_CODA_FS=m |
747 | # CONFIG_CODA_FS_OLD_API is not set | 862 | # CONFIG_CODA_FS_OLD_API is not set |
748 | # CONFIG_AFS_FS is not set | 863 | # CONFIG_AFS_FS is not set |
@@ -753,10 +868,6 @@ CONFIG_CODA_FS=m | |||
753 | # CONFIG_PARTITION_ADVANCED is not set | 868 | # CONFIG_PARTITION_ADVANCED is not set |
754 | CONFIG_MSDOS_PARTITION=y | 869 | CONFIG_MSDOS_PARTITION=y |
755 | CONFIG_SUN_PARTITION=y | 870 | CONFIG_SUN_PARTITION=y |
756 | |||
757 | # | ||
758 | # Native Language Support | ||
759 | # | ||
760 | CONFIG_NLS=y | 871 | CONFIG_NLS=y |
761 | CONFIG_NLS_DEFAULT="iso8859-1" | 872 | CONFIG_NLS_DEFAULT="iso8859-1" |
762 | CONFIG_NLS_CODEPAGE_437=y | 873 | CONFIG_NLS_CODEPAGE_437=y |
@@ -797,35 +908,42 @@ CONFIG_NLS_ISO8859_15=m | |||
797 | CONFIG_NLS_KOI8_R=m | 908 | CONFIG_NLS_KOI8_R=m |
798 | CONFIG_NLS_KOI8_U=m | 909 | CONFIG_NLS_KOI8_U=m |
799 | CONFIG_NLS_UTF8=m | 910 | CONFIG_NLS_UTF8=m |
911 | CONFIG_DLM=m | ||
912 | # CONFIG_DLM_DEBUG is not set | ||
800 | 913 | ||
801 | # | 914 | # |
802 | # Kernel hacking | 915 | # Kernel hacking |
803 | # | 916 | # |
804 | # CONFIG_PRINTK_TIME is not set | 917 | # CONFIG_PRINTK_TIME is not set |
805 | CONFIG_DEBUG_KERNEL=y | 918 | CONFIG_ENABLE_WARN_DEPRECATED=y |
919 | CONFIG_ENABLE_MUST_CHECK=y | ||
806 | CONFIG_MAGIC_SYSRQ=y | 920 | CONFIG_MAGIC_SYSRQ=y |
807 | CONFIG_LOG_BUF_SHIFT=16 | 921 | # CONFIG_UNUSED_SYMBOLS is not set |
808 | # CONFIG_SCHEDSTATS is not set | ||
809 | # CONFIG_DEBUG_SLAB is not set | ||
810 | # CONFIG_DEBUG_SPINLOCK is not set | ||
811 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
812 | # CONFIG_DEBUG_KOBJECT is not set | ||
813 | CONFIG_DEBUG_BUGVERBOSE=y | ||
814 | # CONFIG_DEBUG_INFO is not set | ||
815 | # CONFIG_DEBUG_FS is not set | 922 | # CONFIG_DEBUG_FS is not set |
816 | # CONFIG_FRAME_POINTER is not set | 923 | # CONFIG_HEADERS_CHECK is not set |
924 | # CONFIG_DEBUG_KERNEL is not set | ||
925 | CONFIG_DEBUG_BUGVERBOSE=y | ||
926 | # CONFIG_SAMPLES is not set | ||
817 | 927 | ||
818 | # | 928 | # |
819 | # Security options | 929 | # Security options |
820 | # | 930 | # |
821 | # CONFIG_KEYS is not set | 931 | # CONFIG_KEYS is not set |
822 | # CONFIG_SECURITY is not set | 932 | # CONFIG_SECURITY is not set |
823 | 933 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
824 | # | 934 | CONFIG_XOR_BLOCKS=m |
825 | # Cryptographic options | 935 | CONFIG_ASYNC_CORE=m |
826 | # | 936 | CONFIG_ASYNC_MEMCPY=m |
937 | CONFIG_ASYNC_XOR=m | ||
827 | CONFIG_CRYPTO=y | 938 | CONFIG_CRYPTO=y |
939 | CONFIG_CRYPTO_ALGAPI=y | ||
940 | CONFIG_CRYPTO_AEAD=m | ||
941 | CONFIG_CRYPTO_BLKCIPHER=y | ||
942 | CONFIG_CRYPTO_SEQIV=m | ||
943 | CONFIG_CRYPTO_HASH=y | ||
944 | CONFIG_CRYPTO_MANAGER=y | ||
828 | CONFIG_CRYPTO_HMAC=y | 945 | CONFIG_CRYPTO_HMAC=y |
946 | CONFIG_CRYPTO_XCBC=m | ||
829 | CONFIG_CRYPTO_NULL=m | 947 | CONFIG_CRYPTO_NULL=m |
830 | CONFIG_CRYPTO_MD4=m | 948 | CONFIG_CRYPTO_MD4=m |
831 | CONFIG_CRYPTO_MD5=y | 949 | CONFIG_CRYPTO_MD5=y |
@@ -834,9 +952,21 @@ CONFIG_CRYPTO_SHA256=m | |||
834 | CONFIG_CRYPTO_SHA512=m | 952 | CONFIG_CRYPTO_SHA512=m |
835 | CONFIG_CRYPTO_WP512=m | 953 | CONFIG_CRYPTO_WP512=m |
836 | CONFIG_CRYPTO_TGR192=m | 954 | CONFIG_CRYPTO_TGR192=m |
955 | CONFIG_CRYPTO_GF128MUL=m | ||
956 | CONFIG_CRYPTO_ECB=m | ||
957 | CONFIG_CRYPTO_CBC=y | ||
958 | CONFIG_CRYPTO_PCBC=m | ||
959 | CONFIG_CRYPTO_LRW=m | ||
960 | CONFIG_CRYPTO_XTS=m | ||
961 | CONFIG_CRYPTO_CTR=m | ||
962 | CONFIG_CRYPTO_GCM=m | ||
963 | CONFIG_CRYPTO_CCM=m | ||
964 | CONFIG_CRYPTO_CRYPTD=m | ||
837 | CONFIG_CRYPTO_DES=y | 965 | CONFIG_CRYPTO_DES=y |
966 | CONFIG_CRYPTO_FCRYPT=m | ||
838 | CONFIG_CRYPTO_BLOWFISH=m | 967 | CONFIG_CRYPTO_BLOWFISH=m |
839 | CONFIG_CRYPTO_TWOFISH=m | 968 | CONFIG_CRYPTO_TWOFISH=m |
969 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
840 | CONFIG_CRYPTO_SERPENT=m | 970 | CONFIG_CRYPTO_SERPENT=m |
841 | CONFIG_CRYPTO_AES=m | 971 | CONFIG_CRYPTO_AES=m |
842 | CONFIG_CRYPTO_CAST5=m | 972 | CONFIG_CRYPTO_CAST5=m |
@@ -845,20 +975,34 @@ CONFIG_CRYPTO_TEA=m | |||
845 | CONFIG_CRYPTO_ARC4=m | 975 | CONFIG_CRYPTO_ARC4=m |
846 | CONFIG_CRYPTO_KHAZAD=m | 976 | CONFIG_CRYPTO_KHAZAD=m |
847 | CONFIG_CRYPTO_ANUBIS=m | 977 | CONFIG_CRYPTO_ANUBIS=m |
978 | CONFIG_CRYPTO_SEED=m | ||
979 | CONFIG_CRYPTO_SALSA20=m | ||
848 | CONFIG_CRYPTO_DEFLATE=m | 980 | CONFIG_CRYPTO_DEFLATE=m |
849 | CONFIG_CRYPTO_MICHAEL_MIC=m | 981 | CONFIG_CRYPTO_MICHAEL_MIC=m |
850 | CONFIG_CRYPTO_CRC32C=m | 982 | CONFIG_CRYPTO_CRC32C=m |
983 | CONFIG_CRYPTO_CAMELLIA=m | ||
851 | CONFIG_CRYPTO_TEST=m | 984 | CONFIG_CRYPTO_TEST=m |
852 | 985 | CONFIG_CRYPTO_AUTHENC=m | |
853 | # | 986 | CONFIG_CRYPTO_LZO=m |
854 | # Hardware crypto devices | 987 | # CONFIG_CRYPTO_HW is not set |
855 | # | ||
856 | 988 | ||
857 | # | 989 | # |
858 | # Library routines | 990 | # Library routines |
859 | # | 991 | # |
992 | CONFIG_BITREVERSE=y | ||
860 | CONFIG_CRC_CCITT=m | 993 | CONFIG_CRC_CCITT=m |
994 | CONFIG_CRC16=m | ||
995 | # CONFIG_CRC_ITU_T is not set | ||
861 | CONFIG_CRC32=y | 996 | CONFIG_CRC32=y |
997 | # CONFIG_CRC7 is not set | ||
862 | CONFIG_LIBCRC32C=m | 998 | CONFIG_LIBCRC32C=m |
863 | CONFIG_ZLIB_INFLATE=y | 999 | CONFIG_ZLIB_INFLATE=y |
864 | CONFIG_ZLIB_DEFLATE=m | 1000 | CONFIG_ZLIB_DEFLATE=m |
1001 | CONFIG_LZO_COMPRESS=m | ||
1002 | CONFIG_LZO_DECOMPRESS=m | ||
1003 | CONFIG_TEXTSEARCH=y | ||
1004 | CONFIG_TEXTSEARCH_KMP=m | ||
1005 | CONFIG_TEXTSEARCH_BM=m | ||
1006 | CONFIG_TEXTSEARCH_FSM=m | ||
1007 | CONFIG_PLIST=y | ||
1008 | CONFIG_HAS_IOMEM=y | ||
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 997143b7928a..f18154f1ef1f 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -1,63 +1,111 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-rc6-m68k | 3 | # Linux kernel version: 2.6.25-rc8 |
4 | # Tue Jun 7 20:35:06 2005 | 4 | # Wed Apr 2 20:46:23 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
9 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_TIME_LOW_RES=y | ||
14 | CONFIG_GENERIC_IOMAP=y | ||
15 | CONFIG_NO_IOPORT=y | ||
16 | # CONFIG_NO_DMA is not set | ||
17 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
18 | CONFIG_HZ=100 | ||
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 20 | ||
12 | # | 21 | # |
13 | # Code maturity level options | 22 | # General setup |
14 | # | 23 | # |
15 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="-sun3x" | 27 | CONFIG_LOCALVERSION="-sun3x" |
28 | CONFIG_LOCALVERSION_AUTO=y | ||
24 | CONFIG_SWAP=y | 29 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
31 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | CONFIG_POSIX_MQUEUE=y | 32 | CONFIG_POSIX_MQUEUE=y |
27 | CONFIG_BSD_PROCESS_ACCT=y | 33 | CONFIG_BSD_PROCESS_ACCT=y |
28 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 34 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
29 | CONFIG_SYSCTL=y | 35 | # CONFIG_TASKSTATS is not set |
30 | CONFIG_AUDIT=y | 36 | # CONFIG_AUDIT is not set |
31 | CONFIG_HOTPLUG=y | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | ||
39 | # CONFIG_CGROUPS is not set | ||
40 | # CONFIG_GROUP_SCHED is not set | ||
41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
42 | CONFIG_RELAY=y | ||
43 | CONFIG_NAMESPACES=y | ||
44 | # CONFIG_UTS_NS is not set | ||
45 | # CONFIG_IPC_NS is not set | ||
46 | # CONFIG_USER_NS is not set | ||
47 | # CONFIG_PID_NS is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
51 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_EMBEDDED is not set | 52 | # CONFIG_EMBEDDED is not set |
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
35 | CONFIG_KALLSYMS=y | 55 | CONFIG_KALLSYMS=y |
36 | # CONFIG_KALLSYMS_ALL is not set | ||
37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
57 | CONFIG_HOTPLUG=y | ||
38 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
39 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | ||
61 | # CONFIG_COMPAT_BRK is not set | ||
40 | CONFIG_BASE_FULL=y | 62 | CONFIG_BASE_FULL=y |
41 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
64 | CONFIG_ANON_INODES=y | ||
42 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 70 | CONFIG_VM_EVENT_COUNTERS=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_SLAB=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | # CONFIG_SLUB is not set |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | # CONFIG_SLOB is not set |
74 | # CONFIG_PROFILING is not set | ||
75 | # CONFIG_MARKERS is not set | ||
76 | # CONFIG_HAVE_OPROFILE is not set | ||
77 | # CONFIG_HAVE_KPROBES is not set | ||
78 | # CONFIG_HAVE_KRETPROBES is not set | ||
79 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | ||
81 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 82 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 83 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 84 | CONFIG_MODULES=y |
55 | CONFIG_MODULE_UNLOAD=y | 85 | CONFIG_MODULE_UNLOAD=y |
56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 87 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 88 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 89 | CONFIG_KMOD=y |
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | CONFIG_BLK_DEV_BSG=y | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | CONFIG_IOSCHED_AS=y | ||
101 | CONFIG_IOSCHED_DEADLINE=y | ||
102 | CONFIG_IOSCHED_CFQ=y | ||
103 | CONFIG_DEFAULT_AS=y | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | # CONFIG_DEFAULT_NOOP is not set | ||
107 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
61 | 109 | ||
62 | # | 110 | # |
63 | # Platform dependent setup | 111 | # Platform dependent setup |
@@ -80,10 +128,24 @@ CONFIG_M68030=y | |||
80 | # CONFIG_M68040 is not set | 128 | # CONFIG_M68040 is not set |
81 | # CONFIG_M68060 is not set | 129 | # CONFIG_M68060 is not set |
82 | CONFIG_MMU_MOTOROLA=y | 130 | CONFIG_MMU_MOTOROLA=y |
83 | CONFIG_M68KFPU_EMU=y | 131 | # CONFIG_M68KFPU_EMU is not set |
84 | CONFIG_M68KFPU_EMU_EXTRAPREC=y | ||
85 | # CONFIG_M68KFPU_EMU_ONLY is not set | ||
86 | # CONFIG_ADVANCED is not set | 132 | # CONFIG_ADVANCED is not set |
133 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
134 | CONFIG_NODES_SHIFT=3 | ||
135 | CONFIG_SELECT_MEMORY_MODEL=y | ||
136 | # CONFIG_FLATMEM_MANUAL is not set | ||
137 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
138 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
139 | CONFIG_DISCONTIGMEM=y | ||
140 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
141 | CONFIG_NEED_MULTIPLE_NODES=y | ||
142 | # CONFIG_SPARSEMEM_STATIC is not set | ||
143 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
145 | # CONFIG_RESOURCES_64BIT is not set | ||
146 | CONFIG_ZONE_DMA_FLAG=1 | ||
147 | CONFIG_BOUNCE=y | ||
148 | CONFIG_VIRT_TO_BUS=y | ||
87 | 149 | ||
88 | # | 150 | # |
89 | # General setup | 151 | # General setup |
@@ -92,135 +154,11 @@ CONFIG_BINFMT_ELF=y | |||
92 | CONFIG_BINFMT_AOUT=m | 154 | CONFIG_BINFMT_AOUT=m |
93 | CONFIG_BINFMT_MISC=m | 155 | CONFIG_BINFMT_MISC=m |
94 | CONFIG_PROC_HARDWARE=y | 156 | CONFIG_PROC_HARDWARE=y |
157 | CONFIG_ZONE_DMA=y | ||
158 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
95 | 159 | ||
96 | # | 160 | # |
97 | # Device Drivers | 161 | # Networking |
98 | # | ||
99 | |||
100 | # | ||
101 | # Generic Driver Options | ||
102 | # | ||
103 | CONFIG_STANDALONE=y | ||
104 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
105 | CONFIG_FW_LOADER=m | ||
106 | # CONFIG_DEBUG_DRIVER is not set | ||
107 | |||
108 | # | ||
109 | # Memory Technology Devices (MTD) | ||
110 | # | ||
111 | # CONFIG_MTD is not set | ||
112 | |||
113 | # | ||
114 | # Parallel port support | ||
115 | # | ||
116 | # CONFIG_PARPORT is not set | ||
117 | |||
118 | # | ||
119 | # Plug and Play support | ||
120 | # | ||
121 | |||
122 | # | ||
123 | # Block devices | ||
124 | # | ||
125 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
126 | CONFIG_BLK_DEV_LOOP=y | ||
127 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
128 | CONFIG_BLK_DEV_NBD=m | ||
129 | CONFIG_BLK_DEV_RAM=y | ||
130 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
131 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
132 | CONFIG_BLK_DEV_INITRD=y | ||
133 | CONFIG_INITRAMFS_SOURCE="" | ||
134 | CONFIG_CDROM_PKTCDVD=m | ||
135 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
136 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
137 | |||
138 | # | ||
139 | # IO Schedulers | ||
140 | # | ||
141 | CONFIG_IOSCHED_NOOP=y | ||
142 | CONFIG_IOSCHED_AS=y | ||
143 | CONFIG_IOSCHED_DEADLINE=y | ||
144 | CONFIG_IOSCHED_CFQ=y | ||
145 | CONFIG_ATA_OVER_ETH=m | ||
146 | |||
147 | # | ||
148 | # ATA/ATAPI/MFM/RLL support | ||
149 | # | ||
150 | # CONFIG_IDE is not set | ||
151 | |||
152 | # | ||
153 | # SCSI device support | ||
154 | # | ||
155 | CONFIG_SCSI=y | ||
156 | CONFIG_SCSI_PROC_FS=y | ||
157 | |||
158 | # | ||
159 | # SCSI support type (disk, tape, CD-ROM) | ||
160 | # | ||
161 | CONFIG_BLK_DEV_SD=y | ||
162 | CONFIG_CHR_DEV_ST=m | ||
163 | # CONFIG_CHR_DEV_OSST is not set | ||
164 | CONFIG_BLK_DEV_SR=y | ||
165 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
166 | CONFIG_CHR_DEV_SG=m | ||
167 | |||
168 | # | ||
169 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
170 | # | ||
171 | # CONFIG_SCSI_MULTI_LUN is not set | ||
172 | CONFIG_SCSI_CONSTANTS=y | ||
173 | # CONFIG_SCSI_LOGGING is not set | ||
174 | |||
175 | # | ||
176 | # SCSI Transport Attributes | ||
177 | # | ||
178 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
179 | # CONFIG_SCSI_FC_ATTRS is not set | ||
180 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
181 | |||
182 | # | ||
183 | # SCSI low-level drivers | ||
184 | # | ||
185 | # CONFIG_SCSI_SATA is not set | ||
186 | # CONFIG_SCSI_DEBUG is not set | ||
187 | CONFIG_SUN3X_ESP=y | ||
188 | |||
189 | # | ||
190 | # Multi-device support (RAID and LVM) | ||
191 | # | ||
192 | CONFIG_MD=y | ||
193 | CONFIG_BLK_DEV_MD=m | ||
194 | CONFIG_MD_LINEAR=m | ||
195 | CONFIG_MD_RAID0=m | ||
196 | CONFIG_MD_RAID1=m | ||
197 | # CONFIG_MD_RAID10 is not set | ||
198 | CONFIG_MD_RAID5=m | ||
199 | CONFIG_MD_RAID6=m | ||
200 | CONFIG_MD_MULTIPATH=m | ||
201 | # CONFIG_MD_FAULTY is not set | ||
202 | CONFIG_BLK_DEV_DM=m | ||
203 | CONFIG_DM_CRYPT=m | ||
204 | CONFIG_DM_SNAPSHOT=m | ||
205 | CONFIG_DM_MIRROR=m | ||
206 | CONFIG_DM_ZERO=m | ||
207 | CONFIG_DM_MULTIPATH=m | ||
208 | CONFIG_DM_MULTIPATH_EMC=m | ||
209 | |||
210 | # | ||
211 | # Fusion MPT device support | ||
212 | # | ||
213 | |||
214 | # | ||
215 | # IEEE 1394 (FireWire) support | ||
216 | # | ||
217 | |||
218 | # | ||
219 | # I2O device support | ||
220 | # | ||
221 | |||
222 | # | ||
223 | # Networking support | ||
224 | # | 162 | # |
225 | CONFIG_NET=y | 163 | CONFIG_NET=y |
226 | 164 | ||
@@ -230,10 +168,17 @@ CONFIG_NET=y | |||
230 | CONFIG_PACKET=y | 168 | CONFIG_PACKET=y |
231 | # CONFIG_PACKET_MMAP is not set | 169 | # CONFIG_PACKET_MMAP is not set |
232 | CONFIG_UNIX=y | 170 | CONFIG_UNIX=y |
171 | CONFIG_XFRM=y | ||
172 | # CONFIG_XFRM_USER is not set | ||
173 | # CONFIG_XFRM_SUB_POLICY is not set | ||
174 | CONFIG_XFRM_MIGRATE=y | ||
175 | # CONFIG_XFRM_STATISTICS is not set | ||
233 | CONFIG_NET_KEY=y | 176 | CONFIG_NET_KEY=y |
177 | CONFIG_NET_KEY_MIGRATE=y | ||
234 | CONFIG_INET=y | 178 | CONFIG_INET=y |
235 | # CONFIG_IP_MULTICAST is not set | 179 | # CONFIG_IP_MULTICAST is not set |
236 | # CONFIG_IP_ADVANCED_ROUTER is not set | 180 | # CONFIG_IP_ADVANCED_ROUTER is not set |
181 | CONFIG_IP_FIB_HASH=y | ||
237 | CONFIG_IP_PNP=y | 182 | CONFIG_IP_PNP=y |
238 | CONFIG_IP_PNP_DHCP=y | 183 | CONFIG_IP_PNP_DHCP=y |
239 | CONFIG_IP_PNP_BOOTP=y | 184 | CONFIG_IP_PNP_BOOTP=y |
@@ -245,145 +190,199 @@ CONFIG_SYN_COOKIES=y | |||
245 | CONFIG_INET_AH=m | 190 | CONFIG_INET_AH=m |
246 | CONFIG_INET_ESP=m | 191 | CONFIG_INET_ESP=m |
247 | CONFIG_INET_IPCOMP=m | 192 | CONFIG_INET_IPCOMP=m |
193 | CONFIG_INET_XFRM_TUNNEL=m | ||
248 | CONFIG_INET_TUNNEL=m | 194 | CONFIG_INET_TUNNEL=m |
249 | CONFIG_IP_TCPDIAG=m | 195 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
250 | CONFIG_IP_TCPDIAG_IPV6=y | 196 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
251 | 197 | CONFIG_INET_XFRM_MODE_BEET=m | |
252 | # | 198 | CONFIG_INET_LRO=m |
253 | # IP: Virtual Server Configuration | 199 | CONFIG_INET_DIAG=m |
254 | # | 200 | CONFIG_INET_TCP_DIAG=m |
201 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
202 | CONFIG_TCP_CONG_CUBIC=y | ||
203 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
204 | # CONFIG_TCP_MD5SIG is not set | ||
255 | # CONFIG_IP_VS is not set | 205 | # CONFIG_IP_VS is not set |
256 | CONFIG_IPV6=m | 206 | CONFIG_IPV6=m |
257 | CONFIG_IPV6_PRIVACY=y | 207 | CONFIG_IPV6_PRIVACY=y |
208 | CONFIG_IPV6_ROUTER_PREF=y | ||
209 | CONFIG_IPV6_ROUTE_INFO=y | ||
210 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
258 | CONFIG_INET6_AH=m | 211 | CONFIG_INET6_AH=m |
259 | CONFIG_INET6_ESP=m | 212 | CONFIG_INET6_ESP=m |
260 | CONFIG_INET6_IPCOMP=m | 213 | CONFIG_INET6_IPCOMP=m |
214 | # CONFIG_IPV6_MIP6 is not set | ||
215 | CONFIG_INET6_XFRM_TUNNEL=m | ||
261 | CONFIG_INET6_TUNNEL=m | 216 | CONFIG_INET6_TUNNEL=m |
217 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
218 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
219 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
220 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
221 | CONFIG_IPV6_SIT=m | ||
262 | CONFIG_IPV6_TUNNEL=m | 222 | CONFIG_IPV6_TUNNEL=m |
223 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
224 | # CONFIG_NETWORK_SECMARK is not set | ||
263 | CONFIG_NETFILTER=y | 225 | CONFIG_NETFILTER=y |
264 | # CONFIG_NETFILTER_DEBUG is not set | 226 | # CONFIG_NETFILTER_DEBUG is not set |
227 | CONFIG_NETFILTER_ADVANCED=y | ||
228 | |||
229 | # | ||
230 | # Core Netfilter Configuration | ||
231 | # | ||
232 | CONFIG_NETFILTER_NETLINK=m | ||
233 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
234 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
235 | CONFIG_NF_CONNTRACK=m | ||
236 | CONFIG_NF_CT_ACCT=y | ||
237 | CONFIG_NF_CONNTRACK_MARK=y | ||
238 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
239 | CONFIG_NF_CT_PROTO_GRE=m | ||
240 | CONFIG_NF_CT_PROTO_SCTP=m | ||
241 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
242 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
243 | CONFIG_NF_CONNTRACK_FTP=m | ||
244 | CONFIG_NF_CONNTRACK_H323=m | ||
245 | CONFIG_NF_CONNTRACK_IRC=m | ||
246 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
247 | CONFIG_NF_CONNTRACK_PPTP=m | ||
248 | CONFIG_NF_CONNTRACK_SANE=m | ||
249 | CONFIG_NF_CONNTRACK_SIP=m | ||
250 | CONFIG_NF_CONNTRACK_TFTP=m | ||
251 | # CONFIG_NF_CT_NETLINK is not set | ||
252 | CONFIG_NETFILTER_XTABLES=m | ||
253 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
254 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
255 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
256 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
257 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
258 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
259 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
260 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
261 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
262 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
263 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
264 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
265 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
266 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
267 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
268 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
269 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
270 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
271 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
272 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
273 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
274 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
275 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
276 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
277 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
278 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
279 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
280 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
281 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
282 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
283 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
284 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
285 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
286 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
287 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
288 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
289 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
290 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
291 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
292 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
265 | 293 | ||
266 | # | 294 | # |
267 | # IP: Netfilter Configuration | 295 | # IP: Netfilter Configuration |
268 | # | 296 | # |
269 | CONFIG_IP_NF_CONNTRACK=m | 297 | CONFIG_NF_CONNTRACK_IPV4=m |
270 | # CONFIG_IP_NF_CT_ACCT is not set | 298 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
271 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
272 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
273 | CONFIG_IP_NF_FTP=m | ||
274 | CONFIG_IP_NF_IRC=m | ||
275 | CONFIG_IP_NF_TFTP=m | ||
276 | CONFIG_IP_NF_AMANDA=m | ||
277 | CONFIG_IP_NF_QUEUE=m | 299 | CONFIG_IP_NF_QUEUE=m |
278 | CONFIG_IP_NF_IPTABLES=m | 300 | CONFIG_IP_NF_IPTABLES=m |
279 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
280 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
281 | CONFIG_IP_NF_MATCH_MAC=m | ||
282 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
283 | CONFIG_IP_NF_MATCH_MARK=m | ||
284 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
285 | CONFIG_IP_NF_MATCH_TOS=m | ||
286 | CONFIG_IP_NF_MATCH_RECENT=m | 301 | CONFIG_IP_NF_MATCH_RECENT=m |
287 | CONFIG_IP_NF_MATCH_ECN=m | 302 | CONFIG_IP_NF_MATCH_ECN=m |
288 | CONFIG_IP_NF_MATCH_DSCP=m | 303 | CONFIG_IP_NF_MATCH_AH=m |
289 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
290 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
291 | CONFIG_IP_NF_MATCH_TTL=m | 304 | CONFIG_IP_NF_MATCH_TTL=m |
292 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
293 | CONFIG_IP_NF_MATCH_HELPER=m | ||
294 | CONFIG_IP_NF_MATCH_STATE=m | ||
295 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
296 | CONFIG_IP_NF_MATCH_OWNER=m | ||
297 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 305 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
298 | CONFIG_IP_NF_MATCH_REALM=m | ||
299 | # CONFIG_IP_NF_MATCH_SCTP is not set | ||
300 | # CONFIG_IP_NF_MATCH_COMMENT is not set | ||
301 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
302 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
303 | CONFIG_IP_NF_FILTER=m | 306 | CONFIG_IP_NF_FILTER=m |
304 | CONFIG_IP_NF_TARGET_REJECT=m | 307 | CONFIG_IP_NF_TARGET_REJECT=m |
305 | CONFIG_IP_NF_TARGET_LOG=m | 308 | CONFIG_IP_NF_TARGET_LOG=m |
306 | CONFIG_IP_NF_TARGET_ULOG=m | 309 | CONFIG_IP_NF_TARGET_ULOG=m |
307 | CONFIG_IP_NF_TARGET_TCPMSS=m | 310 | CONFIG_NF_NAT=m |
308 | CONFIG_IP_NF_NAT=m | 311 | CONFIG_NF_NAT_NEEDED=y |
309 | CONFIG_IP_NF_NAT_NEEDED=y | ||
310 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 312 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
311 | CONFIG_IP_NF_TARGET_REDIRECT=m | 313 | CONFIG_IP_NF_TARGET_REDIRECT=m |
312 | CONFIG_IP_NF_TARGET_NETMAP=m | 314 | CONFIG_IP_NF_TARGET_NETMAP=m |
313 | CONFIG_IP_NF_TARGET_SAME=m | 315 | CONFIG_NF_NAT_SNMP_BASIC=m |
314 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 316 | CONFIG_NF_NAT_PROTO_GRE=m |
315 | CONFIG_IP_NF_NAT_IRC=m | 317 | CONFIG_NF_NAT_FTP=m |
316 | CONFIG_IP_NF_NAT_FTP=m | 318 | CONFIG_NF_NAT_IRC=m |
317 | CONFIG_IP_NF_NAT_TFTP=m | 319 | CONFIG_NF_NAT_TFTP=m |
318 | CONFIG_IP_NF_NAT_AMANDA=m | 320 | CONFIG_NF_NAT_AMANDA=m |
321 | CONFIG_NF_NAT_PPTP=m | ||
322 | CONFIG_NF_NAT_H323=m | ||
323 | CONFIG_NF_NAT_SIP=m | ||
319 | CONFIG_IP_NF_MANGLE=m | 324 | CONFIG_IP_NF_MANGLE=m |
320 | CONFIG_IP_NF_TARGET_TOS=m | ||
321 | CONFIG_IP_NF_TARGET_ECN=m | 325 | CONFIG_IP_NF_TARGET_ECN=m |
322 | CONFIG_IP_NF_TARGET_DSCP=m | 326 | CONFIG_IP_NF_TARGET_TTL=m |
323 | CONFIG_IP_NF_TARGET_MARK=m | 327 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
324 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
325 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
326 | # CONFIG_IP_NF_TARGET_CLUSTERIP is not set | ||
327 | CONFIG_IP_NF_RAW=m | 328 | CONFIG_IP_NF_RAW=m |
328 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
329 | CONFIG_IP_NF_ARPTABLES=m | 329 | CONFIG_IP_NF_ARPTABLES=m |
330 | CONFIG_IP_NF_ARPFILTER=m | 330 | CONFIG_IP_NF_ARPFILTER=m |
331 | CONFIG_IP_NF_ARP_MANGLE=m | 331 | CONFIG_IP_NF_ARP_MANGLE=m |
332 | 332 | ||
333 | # | 333 | # |
334 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 334 | # IPv6: Netfilter Configuration |
335 | # | 335 | # |
336 | CONFIG_NF_CONNTRACK_IPV6=m | ||
336 | CONFIG_IP6_NF_QUEUE=m | 337 | CONFIG_IP6_NF_QUEUE=m |
337 | CONFIG_IP6_NF_IPTABLES=m | 338 | CONFIG_IP6_NF_IPTABLES=m |
338 | CONFIG_IP6_NF_MATCH_LIMIT=m | ||
339 | CONFIG_IP6_NF_MATCH_MAC=m | ||
340 | CONFIG_IP6_NF_MATCH_RT=m | 339 | CONFIG_IP6_NF_MATCH_RT=m |
341 | CONFIG_IP6_NF_MATCH_OPTS=m | 340 | CONFIG_IP6_NF_MATCH_OPTS=m |
342 | CONFIG_IP6_NF_MATCH_FRAG=m | 341 | CONFIG_IP6_NF_MATCH_FRAG=m |
343 | CONFIG_IP6_NF_MATCH_HL=m | 342 | CONFIG_IP6_NF_MATCH_HL=m |
344 | CONFIG_IP6_NF_MATCH_MULTIPORT=m | ||
345 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
346 | CONFIG_IP6_NF_MATCH_MARK=m | ||
347 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 343 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
348 | CONFIG_IP6_NF_MATCH_AHESP=m | 344 | CONFIG_IP6_NF_MATCH_AH=m |
349 | CONFIG_IP6_NF_MATCH_LENGTH=m | 345 | CONFIG_IP6_NF_MATCH_MH=m |
350 | CONFIG_IP6_NF_MATCH_EUI64=m | 346 | CONFIG_IP6_NF_MATCH_EUI64=m |
351 | CONFIG_IP6_NF_FILTER=m | 347 | CONFIG_IP6_NF_FILTER=m |
352 | CONFIG_IP6_NF_TARGET_LOG=m | 348 | CONFIG_IP6_NF_TARGET_LOG=m |
349 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
353 | CONFIG_IP6_NF_MANGLE=m | 350 | CONFIG_IP6_NF_MANGLE=m |
354 | CONFIG_IP6_NF_TARGET_MARK=m | 351 | CONFIG_IP6_NF_TARGET_HL=m |
355 | CONFIG_IP6_NF_RAW=m | 352 | CONFIG_IP6_NF_RAW=m |
356 | CONFIG_XFRM=y | 353 | CONFIG_IP_DCCP=m |
357 | # CONFIG_XFRM_USER is not set | 354 | CONFIG_INET_DCCP_DIAG=m |
355 | CONFIG_IP_DCCP_ACKVEC=y | ||
358 | 356 | ||
359 | # | 357 | # |
360 | # SCTP Configuration (EXPERIMENTAL) | 358 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
361 | # | 359 | # |
360 | CONFIG_IP_DCCP_CCID2=m | ||
361 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
362 | CONFIG_IP_DCCP_CCID3=m | ||
363 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
364 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
365 | CONFIG_IP_DCCP_TFRC_LIB=m | ||
362 | CONFIG_IP_SCTP=m | 366 | CONFIG_IP_SCTP=m |
363 | # CONFIG_SCTP_DBG_MSG is not set | 367 | # CONFIG_SCTP_DBG_MSG is not set |
364 | # CONFIG_SCTP_DBG_OBJCNT is not set | 368 | # CONFIG_SCTP_DBG_OBJCNT is not set |
365 | # CONFIG_SCTP_HMAC_NONE is not set | 369 | # CONFIG_SCTP_HMAC_NONE is not set |
366 | # CONFIG_SCTP_HMAC_SHA1 is not set | 370 | # CONFIG_SCTP_HMAC_SHA1 is not set |
367 | CONFIG_SCTP_HMAC_MD5=y | 371 | CONFIG_SCTP_HMAC_MD5=y |
372 | # CONFIG_TIPC is not set | ||
368 | # CONFIG_ATM is not set | 373 | # CONFIG_ATM is not set |
369 | # CONFIG_BRIDGE is not set | 374 | # CONFIG_BRIDGE is not set |
370 | # CONFIG_VLAN_8021Q is not set | 375 | # CONFIG_VLAN_8021Q is not set |
371 | # CONFIG_DECNET is not set | 376 | # CONFIG_DECNET is not set |
372 | CONFIG_LLC=m | 377 | CONFIG_LLC=m |
373 | # CONFIG_LLC2 is not set | 378 | # CONFIG_LLC2 is not set |
374 | CONFIG_IPX=m | 379 | # CONFIG_IPX is not set |
375 | # CONFIG_IPX_INTERN is not set | ||
376 | CONFIG_ATALK=m | 380 | CONFIG_ATALK=m |
377 | # CONFIG_DEV_APPLETALK is not set | 381 | # CONFIG_DEV_APPLETALK is not set |
378 | # CONFIG_X25 is not set | 382 | # CONFIG_X25 is not set |
379 | # CONFIG_LAPB is not set | 383 | # CONFIG_LAPB is not set |
380 | # CONFIG_NET_DIVERT is not set | ||
381 | # CONFIG_ECONET is not set | 384 | # CONFIG_ECONET is not set |
382 | # CONFIG_WAN_ROUTER is not set | 385 | # CONFIG_WAN_ROUTER is not set |
383 | |||
384 | # | ||
385 | # QoS and/or fair queueing | ||
386 | # | ||
387 | # CONFIG_NET_SCHED is not set | 386 | # CONFIG_NET_SCHED is not set |
388 | CONFIG_NET_CLS_ROUTE=y | 387 | CONFIG_NET_CLS_ROUTE=y |
389 | 388 | ||
@@ -391,46 +390,155 @@ CONFIG_NET_CLS_ROUTE=y | |||
391 | # Network testing | 390 | # Network testing |
392 | # | 391 | # |
393 | # CONFIG_NET_PKTGEN is not set | 392 | # CONFIG_NET_PKTGEN is not set |
394 | CONFIG_NETPOLL=y | ||
395 | # CONFIG_NETPOLL_RX is not set | ||
396 | # CONFIG_NETPOLL_TRAP is not set | ||
397 | CONFIG_NET_POLL_CONTROLLER=y | ||
398 | # CONFIG_HAMRADIO is not set | 393 | # CONFIG_HAMRADIO is not set |
394 | # CONFIG_CAN is not set | ||
399 | # CONFIG_IRDA is not set | 395 | # CONFIG_IRDA is not set |
400 | # CONFIG_BT is not set | 396 | # CONFIG_BT is not set |
401 | CONFIG_NETDEVICES=y | 397 | # CONFIG_AF_RXRPC is not set |
402 | CONFIG_DUMMY=m | ||
403 | # CONFIG_BONDING is not set | ||
404 | CONFIG_EQUALIZER=m | ||
405 | # CONFIG_TUN is not set | ||
406 | 398 | ||
407 | # | 399 | # |
408 | # Ethernet (10 or 100Mbit) | 400 | # Wireless |
409 | # | 401 | # |
410 | CONFIG_NET_ETHERNET=y | 402 | # CONFIG_CFG80211 is not set |
411 | CONFIG_MII=m | 403 | CONFIG_WIRELESS_EXT=y |
412 | CONFIG_SUN3LANCE=y | 404 | # CONFIG_MAC80211 is not set |
405 | CONFIG_IEEE80211=m | ||
406 | # CONFIG_IEEE80211_DEBUG is not set | ||
407 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
408 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
409 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
410 | CONFIG_IEEE80211_SOFTMAC=m | ||
411 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | ||
412 | # CONFIG_RFKILL is not set | ||
413 | # CONFIG_NET_9P is not set | ||
413 | 414 | ||
414 | # | 415 | # |
415 | # Ethernet (1000 Mbit) | 416 | # Device Drivers |
416 | # | 417 | # |
417 | 418 | ||
418 | # | 419 | # |
419 | # Ethernet (10000 Mbit) | 420 | # Generic Driver Options |
420 | # | 421 | # |
422 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
423 | CONFIG_STANDALONE=y | ||
424 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
425 | CONFIG_FW_LOADER=m | ||
426 | # CONFIG_SYS_HYPERVISOR is not set | ||
427 | CONFIG_CONNECTOR=m | ||
428 | # CONFIG_MTD is not set | ||
429 | # CONFIG_PARPORT is not set | ||
430 | CONFIG_BLK_DEV=y | ||
431 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
432 | CONFIG_BLK_DEV_LOOP=y | ||
433 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
434 | CONFIG_BLK_DEV_NBD=m | ||
435 | CONFIG_BLK_DEV_RAM=y | ||
436 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
437 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
438 | # CONFIG_BLK_DEV_XIP is not set | ||
439 | CONFIG_CDROM_PKTCDVD=m | ||
440 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
441 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
442 | CONFIG_ATA_OVER_ETH=m | ||
443 | CONFIG_MISC_DEVICES=y | ||
444 | # CONFIG_EEPROM_93CX6 is not set | ||
445 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
446 | CONFIG_HAVE_IDE=y | ||
447 | # CONFIG_IDE is not set | ||
421 | 448 | ||
422 | # | 449 | # |
423 | # Token Ring devices | 450 | # SCSI device support |
424 | # | 451 | # |
452 | CONFIG_RAID_ATTRS=m | ||
453 | CONFIG_SCSI=y | ||
454 | CONFIG_SCSI_DMA=y | ||
455 | CONFIG_SCSI_TGT=m | ||
456 | # CONFIG_SCSI_NETLINK is not set | ||
457 | CONFIG_SCSI_PROC_FS=y | ||
425 | 458 | ||
426 | # | 459 | # |
427 | # Wireless LAN (non-hamradio) | 460 | # SCSI support type (disk, tape, CD-ROM) |
428 | # | 461 | # |
429 | # CONFIG_NET_RADIO is not set | 462 | CONFIG_BLK_DEV_SD=y |
463 | CONFIG_CHR_DEV_ST=m | ||
464 | CONFIG_CHR_DEV_OSST=m | ||
465 | CONFIG_BLK_DEV_SR=y | ||
466 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
467 | CONFIG_CHR_DEV_SG=m | ||
468 | # CONFIG_CHR_DEV_SCH is not set | ||
430 | 469 | ||
431 | # | 470 | # |
432 | # Wan interfaces | 471 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
433 | # | 472 | # |
473 | # CONFIG_SCSI_MULTI_LUN is not set | ||
474 | CONFIG_SCSI_CONSTANTS=y | ||
475 | # CONFIG_SCSI_LOGGING is not set | ||
476 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
477 | CONFIG_SCSI_WAIT_SCAN=m | ||
478 | |||
479 | # | ||
480 | # SCSI Transports | ||
481 | # | ||
482 | CONFIG_SCSI_SPI_ATTRS=y | ||
483 | # CONFIG_SCSI_FC_ATTRS is not set | ||
484 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
485 | CONFIG_SCSI_SAS_ATTRS=m | ||
486 | CONFIG_SCSI_SAS_LIBSAS=m | ||
487 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
488 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
489 | CONFIG_SCSI_SRP_ATTRS=m | ||
490 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
491 | CONFIG_SCSI_LOWLEVEL=y | ||
492 | CONFIG_ISCSI_TCP=m | ||
493 | # CONFIG_SCSI_DEBUG is not set | ||
494 | CONFIG_SUN3X_ESP=y | ||
495 | CONFIG_MD=y | ||
496 | CONFIG_BLK_DEV_MD=m | ||
497 | CONFIG_MD_LINEAR=m | ||
498 | CONFIG_MD_RAID0=m | ||
499 | CONFIG_MD_RAID1=m | ||
500 | # CONFIG_MD_RAID10 is not set | ||
501 | CONFIG_MD_RAID456=m | ||
502 | CONFIG_MD_RAID5_RESHAPE=y | ||
503 | CONFIG_MD_MULTIPATH=m | ||
504 | # CONFIG_MD_FAULTY is not set | ||
505 | CONFIG_BLK_DEV_DM=m | ||
506 | # CONFIG_DM_DEBUG is not set | ||
507 | CONFIG_DM_CRYPT=m | ||
508 | CONFIG_DM_SNAPSHOT=m | ||
509 | CONFIG_DM_MIRROR=m | ||
510 | CONFIG_DM_ZERO=m | ||
511 | CONFIG_DM_MULTIPATH=m | ||
512 | CONFIG_DM_MULTIPATH_EMC=m | ||
513 | CONFIG_DM_MULTIPATH_RDAC=m | ||
514 | CONFIG_DM_MULTIPATH_HP=m | ||
515 | # CONFIG_DM_DELAY is not set | ||
516 | CONFIG_DM_UEVENT=y | ||
517 | CONFIG_NETDEVICES=y | ||
518 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
519 | CONFIG_DUMMY=m | ||
520 | # CONFIG_BONDING is not set | ||
521 | CONFIG_MACVLAN=m | ||
522 | CONFIG_EQUALIZER=m | ||
523 | # CONFIG_TUN is not set | ||
524 | CONFIG_VETH=m | ||
525 | # CONFIG_PHYLIB is not set | ||
526 | CONFIG_NET_ETHERNET=y | ||
527 | # CONFIG_MII is not set | ||
528 | CONFIG_SUN3LANCE=y | ||
529 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
530 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
531 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
532 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
533 | # CONFIG_B44 is not set | ||
534 | # CONFIG_NETDEV_1000 is not set | ||
535 | # CONFIG_NETDEV_10000 is not set | ||
536 | |||
537 | # | ||
538 | # Wireless LAN | ||
539 | # | ||
540 | # CONFIG_WLAN_PRE80211 is not set | ||
541 | # CONFIG_WLAN_80211 is not set | ||
434 | # CONFIG_WAN is not set | 542 | # CONFIG_WAN is not set |
435 | CONFIG_PPP=m | 543 | CONFIG_PPP=m |
436 | # CONFIG_PPP_MULTILINK is not set | 544 | # CONFIG_PPP_MULTILINK is not set |
@@ -439,28 +547,28 @@ CONFIG_PPP_ASYNC=m | |||
439 | CONFIG_PPP_SYNC_TTY=m | 547 | CONFIG_PPP_SYNC_TTY=m |
440 | CONFIG_PPP_DEFLATE=m | 548 | CONFIG_PPP_DEFLATE=m |
441 | CONFIG_PPP_BSDCOMP=m | 549 | CONFIG_PPP_BSDCOMP=m |
550 | CONFIG_PPP_MPPE=m | ||
442 | CONFIG_PPPOE=m | 551 | CONFIG_PPPOE=m |
552 | CONFIG_PPPOL2TP=m | ||
443 | CONFIG_SLIP=m | 553 | CONFIG_SLIP=m |
444 | CONFIG_SLIP_COMPRESSED=y | 554 | CONFIG_SLIP_COMPRESSED=y |
555 | CONFIG_SLHC=m | ||
445 | CONFIG_SLIP_SMART=y | 556 | CONFIG_SLIP_SMART=y |
446 | CONFIG_SLIP_MODE_SLIP6=y | 557 | CONFIG_SLIP_MODE_SLIP6=y |
447 | CONFIG_SHAPER=m | ||
448 | CONFIG_NETCONSOLE=m | 558 | CONFIG_NETCONSOLE=m |
449 | 559 | CONFIG_NETCONSOLE_DYNAMIC=y | |
450 | # | 560 | CONFIG_NETPOLL=y |
451 | # ISDN subsystem | 561 | # CONFIG_NETPOLL_TRAP is not set |
452 | # | 562 | CONFIG_NET_POLL_CONTROLLER=y |
453 | # CONFIG_ISDN is not set | 563 | # CONFIG_ISDN is not set |
454 | |||
455 | # | ||
456 | # Telephony Support | ||
457 | # | ||
458 | # CONFIG_PHONE is not set | 564 | # CONFIG_PHONE is not set |
459 | 565 | ||
460 | # | 566 | # |
461 | # Input device support | 567 | # Input device support |
462 | # | 568 | # |
463 | CONFIG_INPUT=y | 569 | CONFIG_INPUT=y |
570 | CONFIG_INPUT_FF_MEMLESS=m | ||
571 | # CONFIG_INPUT_POLLDEV is not set | ||
464 | 572 | ||
465 | # | 573 | # |
466 | # Userland interfaces | 574 | # Userland interfaces |
@@ -470,7 +578,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
470 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 578 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
471 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 579 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
472 | # CONFIG_INPUT_JOYDEV is not set | 580 | # CONFIG_INPUT_JOYDEV is not set |
473 | # CONFIG_INPUT_TSDEV is not set | ||
474 | # CONFIG_INPUT_EVDEV is not set | 581 | # CONFIG_INPUT_EVDEV is not set |
475 | # CONFIG_INPUT_EVBUG is not set | 582 | # CONFIG_INPUT_EVBUG is not set |
476 | 583 | ||
@@ -483,11 +590,19 @@ CONFIG_KEYBOARD_SUNKBD=y | |||
483 | # CONFIG_KEYBOARD_LKKBD is not set | 590 | # CONFIG_KEYBOARD_LKKBD is not set |
484 | # CONFIG_KEYBOARD_XTKBD is not set | 591 | # CONFIG_KEYBOARD_XTKBD is not set |
485 | # CONFIG_KEYBOARD_NEWTON is not set | 592 | # CONFIG_KEYBOARD_NEWTON is not set |
593 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
486 | CONFIG_INPUT_MOUSE=y | 594 | CONFIG_INPUT_MOUSE=y |
487 | CONFIG_MOUSE_PS2=m | 595 | CONFIG_MOUSE_PS2=m |
596 | CONFIG_MOUSE_PS2_ALPS=y | ||
597 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
598 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
599 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
600 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
601 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
488 | CONFIG_MOUSE_SERIAL=m | 602 | CONFIG_MOUSE_SERIAL=m |
489 | # CONFIG_MOUSE_VSXXXAA is not set | 603 | # CONFIG_MOUSE_VSXXXAA is not set |
490 | # CONFIG_INPUT_JOYSTICK is not set | 604 | # CONFIG_INPUT_JOYSTICK is not set |
605 | # CONFIG_INPUT_TABLET is not set | ||
491 | # CONFIG_INPUT_TOUCHSCREEN is not set | 606 | # CONFIG_INPUT_TOUCHSCREEN is not set |
492 | # CONFIG_INPUT_MISC is not set | 607 | # CONFIG_INPUT_MISC is not set |
493 | 608 | ||
@@ -495,7 +610,7 @@ CONFIG_MOUSE_SERIAL=m | |||
495 | # Hardware I/O ports | 610 | # Hardware I/O ports |
496 | # | 611 | # |
497 | CONFIG_SERIO=y | 612 | CONFIG_SERIO=y |
498 | CONFIG_SERIO_SERPORT=m | 613 | # CONFIG_SERIO_SERPORT is not set |
499 | CONFIG_SERIO_LIBPS2=m | 614 | CONFIG_SERIO_LIBPS2=m |
500 | # CONFIG_SERIO_RAW is not set | 615 | # CONFIG_SERIO_RAW is not set |
501 | # CONFIG_GAMEPORT is not set | 616 | # CONFIG_GAMEPORT is not set |
@@ -506,6 +621,7 @@ CONFIG_SERIO_LIBPS2=m | |||
506 | CONFIG_VT=y | 621 | CONFIG_VT=y |
507 | CONFIG_VT_CONSOLE=y | 622 | CONFIG_VT_CONSOLE=y |
508 | CONFIG_HW_CONSOLE=y | 623 | CONFIG_HW_CONSOLE=y |
624 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
509 | # CONFIG_SERIAL_NONSTANDARD is not set | 625 | # CONFIG_SERIAL_NONSTANDARD is not set |
510 | 626 | ||
511 | # | 627 | # |
@@ -519,112 +635,113 @@ CONFIG_HW_CONSOLE=y | |||
519 | CONFIG_UNIX98_PTYS=y | 635 | CONFIG_UNIX98_PTYS=y |
520 | CONFIG_LEGACY_PTYS=y | 636 | CONFIG_LEGACY_PTYS=y |
521 | CONFIG_LEGACY_PTY_COUNT=256 | 637 | CONFIG_LEGACY_PTY_COUNT=256 |
522 | |||
523 | # | ||
524 | # IPMI | ||
525 | # | ||
526 | # CONFIG_IPMI_HANDLER is not set | 638 | # CONFIG_IPMI_HANDLER is not set |
527 | 639 | # CONFIG_HW_RANDOM is not set | |
528 | # | 640 | CONFIG_GEN_RTC=m |
529 | # Watchdog Cards | ||
530 | # | ||
531 | # CONFIG_WATCHDOG is not set | ||
532 | CONFIG_GEN_RTC=y | ||
533 | CONFIG_GEN_RTC_X=y | 641 | CONFIG_GEN_RTC_X=y |
534 | # CONFIG_DTLK is not set | ||
535 | # CONFIG_R3964 is not set | 642 | # CONFIG_R3964 is not set |
536 | |||
537 | # | ||
538 | # Ftape, the floppy tape device driver | ||
539 | # | ||
540 | # CONFIG_DRM is not set | ||
541 | # CONFIG_RAW_DRIVER is not set | 643 | # CONFIG_RAW_DRIVER is not set |
542 | 644 | # CONFIG_TCG_TPM is not set | |
543 | # | ||
544 | # TPM devices | ||
545 | # | ||
546 | |||
547 | # | ||
548 | # I2C support | ||
549 | # | ||
550 | # CONFIG_I2C is not set | 645 | # CONFIG_I2C is not set |
551 | 646 | ||
552 | # | 647 | # |
553 | # Dallas's 1-wire bus | 648 | # SPI support |
554 | # | 649 | # |
650 | # CONFIG_SPI is not set | ||
651 | # CONFIG_SPI_MASTER is not set | ||
555 | # CONFIG_W1 is not set | 652 | # CONFIG_W1 is not set |
653 | # CONFIG_POWER_SUPPLY is not set | ||
654 | # CONFIG_HWMON is not set | ||
655 | # CONFIG_THERMAL is not set | ||
656 | # CONFIG_WATCHDOG is not set | ||
556 | 657 | ||
557 | # | 658 | # |
558 | # Misc devices | 659 | # Sonics Silicon Backplane |
559 | # | 660 | # |
661 | CONFIG_SSB_POSSIBLE=y | ||
662 | # CONFIG_SSB is not set | ||
560 | 663 | ||
561 | # | 664 | # |
562 | # Multimedia devices | 665 | # Multifunction device drivers |
563 | # | 666 | # |
564 | # CONFIG_VIDEO_DEV is not set | 667 | # CONFIG_MFD_SM501 is not set |
565 | 668 | ||
566 | # | 669 | # |
567 | # Digital Video Broadcasting Devices | 670 | # Multimedia devices |
568 | # | 671 | # |
569 | # CONFIG_DVB is not set | 672 | # CONFIG_VIDEO_DEV is not set |
673 | # CONFIG_DVB_CORE is not set | ||
674 | # CONFIG_DAB is not set | ||
570 | 675 | ||
571 | # | 676 | # |
572 | # Graphics support | 677 | # Graphics support |
573 | # | 678 | # |
679 | # CONFIG_VGASTATE is not set | ||
680 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
574 | CONFIG_FB=y | 681 | CONFIG_FB=y |
682 | # CONFIG_FIRMWARE_EDID is not set | ||
683 | # CONFIG_FB_DDC is not set | ||
575 | # CONFIG_FB_CFB_FILLRECT is not set | 684 | # CONFIG_FB_CFB_FILLRECT is not set |
576 | # CONFIG_FB_CFB_COPYAREA is not set | 685 | # CONFIG_FB_CFB_COPYAREA is not set |
577 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 686 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
578 | # CONFIG_FB_SOFT_CURSOR is not set | 687 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
688 | # CONFIG_FB_SYS_FILLRECT is not set | ||
689 | # CONFIG_FB_SYS_COPYAREA is not set | ||
690 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
691 | # CONFIG_FB_SYS_FOPS is not set | ||
692 | CONFIG_FB_DEFERRED_IO=y | ||
693 | # CONFIG_FB_SVGALIB is not set | ||
579 | # CONFIG_FB_MACMODES is not set | 694 | # CONFIG_FB_MACMODES is not set |
580 | CONFIG_FB_MODE_HELPERS=y | 695 | # CONFIG_FB_BACKLIGHT is not set |
696 | # CONFIG_FB_MODE_HELPERS is not set | ||
581 | # CONFIG_FB_TILEBLITTING is not set | 697 | # CONFIG_FB_TILEBLITTING is not set |
698 | |||
699 | # | ||
700 | # Frame buffer hardware drivers | ||
701 | # | ||
702 | # CONFIG_FB_UVESA is not set | ||
582 | # CONFIG_FB_S1D13XXX is not set | 703 | # CONFIG_FB_S1D13XXX is not set |
583 | # CONFIG_FB_VIRTUAL is not set | 704 | # CONFIG_FB_VIRTUAL is not set |
705 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
706 | |||
707 | # | ||
708 | # Display device support | ||
709 | # | ||
710 | # CONFIG_DISPLAY_SUPPORT is not set | ||
584 | 711 | ||
585 | # | 712 | # |
586 | # Console display driver support | 713 | # Console display driver support |
587 | # | 714 | # |
588 | CONFIG_DUMMY_CONSOLE=y | 715 | CONFIG_DUMMY_CONSOLE=y |
589 | CONFIG_FRAMEBUFFER_CONSOLE=y | 716 | CONFIG_FRAMEBUFFER_CONSOLE=y |
717 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
718 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
590 | # CONFIG_FONTS is not set | 719 | # CONFIG_FONTS is not set |
591 | CONFIG_FONT_8x8=y | 720 | CONFIG_FONT_8x8=y |
592 | CONFIG_FONT_8x16=y | 721 | CONFIG_FONT_8x16=y |
593 | |||
594 | # | ||
595 | # Logo configuration | ||
596 | # | ||
597 | CONFIG_LOGO=y | 722 | CONFIG_LOGO=y |
598 | CONFIG_LOGO_LINUX_MONO=y | 723 | CONFIG_LOGO_LINUX_MONO=y |
599 | CONFIG_LOGO_LINUX_VGA16=y | 724 | CONFIG_LOGO_LINUX_VGA16=y |
600 | CONFIG_LOGO_LINUX_CLUT224=y | 725 | CONFIG_LOGO_LINUX_CLUT224=y |
601 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
602 | 726 | ||
603 | # | 727 | # |
604 | # Sound | 728 | # Sound |
605 | # | 729 | # |
606 | # CONFIG_SOUND is not set | 730 | # CONFIG_SOUND is not set |
607 | 731 | CONFIG_HID_SUPPORT=y | |
608 | # | 732 | CONFIG_HID=m |
609 | # USB support | 733 | # CONFIG_HID_DEBUG is not set |
610 | # | 734 | CONFIG_HIDRAW=y |
611 | # CONFIG_USB_ARCH_HAS_HCD is not set | 735 | # CONFIG_USB_SUPPORT is not set |
612 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
613 | |||
614 | # | ||
615 | # USB Gadget Support | ||
616 | # | ||
617 | # CONFIG_USB_GADGET is not set | ||
618 | |||
619 | # | ||
620 | # MMC/SD Card support | ||
621 | # | ||
622 | # CONFIG_MMC is not set | 736 | # CONFIG_MMC is not set |
737 | # CONFIG_MEMSTICK is not set | ||
738 | # CONFIG_NEW_LEDS is not set | ||
739 | # CONFIG_RTC_CLASS is not set | ||
623 | 740 | ||
624 | # | 741 | # |
625 | # InfiniBand support | 742 | # Userspace I/O |
626 | # | 743 | # |
627 | # CONFIG_INFINIBAND is not set | 744 | # CONFIG_UIO is not set |
628 | 745 | ||
629 | # | 746 | # |
630 | # Character devices | 747 | # Character devices |
@@ -635,10 +752,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
635 | # | 752 | # |
636 | CONFIG_EXT2_FS=y | 753 | CONFIG_EXT2_FS=y |
637 | # CONFIG_EXT2_FS_XATTR is not set | 754 | # CONFIG_EXT2_FS_XATTR is not set |
755 | # CONFIG_EXT2_FS_XIP is not set | ||
638 | CONFIG_EXT3_FS=y | 756 | CONFIG_EXT3_FS=y |
639 | # CONFIG_EXT3_FS_XATTR is not set | 757 | # CONFIG_EXT3_FS_XATTR is not set |
758 | # CONFIG_EXT4DEV_FS is not set | ||
640 | CONFIG_JBD=y | 759 | CONFIG_JBD=y |
641 | # CONFIG_JBD_DEBUG is not set | ||
642 | CONFIG_REISERFS_FS=m | 760 | CONFIG_REISERFS_FS=m |
643 | # CONFIG_REISERFS_CHECK is not set | 761 | # CONFIG_REISERFS_CHECK is not set |
644 | # CONFIG_REISERFS_PROC_INFO is not set | 762 | # CONFIG_REISERFS_PROC_INFO is not set |
@@ -649,25 +767,29 @@ CONFIG_JFS_FS=m | |||
649 | # CONFIG_JFS_DEBUG is not set | 767 | # CONFIG_JFS_DEBUG is not set |
650 | # CONFIG_JFS_STATISTICS is not set | 768 | # CONFIG_JFS_STATISTICS is not set |
651 | CONFIG_FS_POSIX_ACL=y | 769 | CONFIG_FS_POSIX_ACL=y |
652 | |||
653 | # | ||
654 | # XFS support | ||
655 | # | ||
656 | CONFIG_XFS_FS=m | 770 | CONFIG_XFS_FS=m |
657 | CONFIG_XFS_EXPORT=y | ||
658 | # CONFIG_XFS_RT is not set | ||
659 | # CONFIG_XFS_QUOTA is not set | 771 | # CONFIG_XFS_QUOTA is not set |
660 | # CONFIG_XFS_SECURITY is not set | 772 | # CONFIG_XFS_SECURITY is not set |
661 | # CONFIG_XFS_POSIX_ACL is not set | 773 | # CONFIG_XFS_POSIX_ACL is not set |
662 | CONFIG_MINIX_FS=y | 774 | # CONFIG_XFS_RT is not set |
663 | # CONFIG_ROMFS_FS is not set | 775 | CONFIG_GFS2_FS=m |
776 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
777 | CONFIG_GFS2_FS_LOCKING_DLM=m | ||
778 | CONFIG_OCFS2_FS=m | ||
779 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | ||
780 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
781 | CONFIG_DNOTIFY=y | ||
782 | CONFIG_INOTIFY=y | ||
783 | CONFIG_INOTIFY_USER=y | ||
664 | CONFIG_QUOTA=y | 784 | CONFIG_QUOTA=y |
785 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
786 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
665 | # CONFIG_QFMT_V1 is not set | 787 | # CONFIG_QFMT_V1 is not set |
666 | # CONFIG_QFMT_V2 is not set | 788 | # CONFIG_QFMT_V2 is not set |
667 | CONFIG_QUOTACTL=y | 789 | CONFIG_QUOTACTL=y |
668 | CONFIG_DNOTIFY=y | ||
669 | CONFIG_AUTOFS_FS=m | 790 | CONFIG_AUTOFS_FS=m |
670 | CONFIG_AUTOFS4_FS=m | 791 | CONFIG_AUTOFS4_FS=m |
792 | CONFIG_FUSE_FS=m | ||
671 | 793 | ||
672 | # | 794 | # |
673 | # CD-ROM/DVD Filesystems | 795 | # CD-ROM/DVD Filesystems |
@@ -675,7 +797,6 @@ CONFIG_AUTOFS4_FS=m | |||
675 | CONFIG_ISO9660_FS=y | 797 | CONFIG_ISO9660_FS=y |
676 | CONFIG_JOLIET=y | 798 | CONFIG_JOLIET=y |
677 | CONFIG_ZISOFS=y | 799 | CONFIG_ZISOFS=y |
678 | CONFIG_ZISOFS_FS=y | ||
679 | CONFIG_UDF_FS=m | 800 | CONFIG_UDF_FS=m |
680 | CONFIG_UDF_NLS=y | 801 | CONFIG_UDF_NLS=y |
681 | 802 | ||
@@ -694,15 +815,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
694 | # | 815 | # |
695 | CONFIG_PROC_FS=y | 816 | CONFIG_PROC_FS=y |
696 | CONFIG_PROC_KCORE=y | 817 | CONFIG_PROC_KCORE=y |
818 | CONFIG_PROC_SYSCTL=y | ||
697 | CONFIG_SYSFS=y | 819 | CONFIG_SYSFS=y |
698 | CONFIG_DEVFS_FS=y | ||
699 | CONFIG_DEVFS_MOUNT=y | ||
700 | # CONFIG_DEVFS_DEBUG is not set | ||
701 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
702 | CONFIG_TMPFS=y | 820 | CONFIG_TMPFS=y |
703 | # CONFIG_TMPFS_XATTR is not set | 821 | # CONFIG_TMPFS_POSIX_ACL is not set |
704 | # CONFIG_HUGETLB_PAGE is not set | 822 | # CONFIG_HUGETLB_PAGE is not set |
705 | CONFIG_RAMFS=y | 823 | CONFIG_CONFIGFS_FS=m |
706 | 824 | ||
707 | # | 825 | # |
708 | # Miscellaneous filesystems | 826 | # Miscellaneous filesystems |
@@ -716,44 +834,40 @@ CONFIG_HFSPLUS_FS=m | |||
716 | # CONFIG_EFS_FS is not set | 834 | # CONFIG_EFS_FS is not set |
717 | CONFIG_CRAMFS=m | 835 | CONFIG_CRAMFS=m |
718 | # CONFIG_VXFS_FS is not set | 836 | # CONFIG_VXFS_FS is not set |
837 | CONFIG_MINIX_FS=y | ||
719 | CONFIG_HPFS_FS=m | 838 | CONFIG_HPFS_FS=m |
720 | # CONFIG_QNX4FS_FS is not set | 839 | # CONFIG_QNX4FS_FS is not set |
840 | # CONFIG_ROMFS_FS is not set | ||
721 | CONFIG_SYSV_FS=m | 841 | CONFIG_SYSV_FS=m |
722 | CONFIG_UFS_FS=m | 842 | CONFIG_UFS_FS=m |
723 | CONFIG_UFS_FS_WRITE=y | 843 | # CONFIG_UFS_FS_WRITE is not set |
724 | 844 | # CONFIG_UFS_DEBUG is not set | |
725 | # | 845 | CONFIG_NETWORK_FILESYSTEMS=y |
726 | # Network File Systems | ||
727 | # | ||
728 | CONFIG_NFS_FS=y | 846 | CONFIG_NFS_FS=y |
729 | CONFIG_NFS_V3=y | 847 | CONFIG_NFS_V3=y |
848 | # CONFIG_NFS_V3_ACL is not set | ||
730 | CONFIG_NFS_V4=y | 849 | CONFIG_NFS_V4=y |
731 | # CONFIG_NFS_DIRECTIO is not set | 850 | # CONFIG_NFS_DIRECTIO is not set |
732 | CONFIG_NFSD=m | 851 | CONFIG_NFSD=m |
733 | CONFIG_NFSD_V3=y | 852 | CONFIG_NFSD_V3=y |
734 | CONFIG_NFSD_V4=y | 853 | # CONFIG_NFSD_V3_ACL is not set |
854 | # CONFIG_NFSD_V4 is not set | ||
735 | CONFIG_NFSD_TCP=y | 855 | CONFIG_NFSD_TCP=y |
736 | CONFIG_ROOT_NFS=y | 856 | CONFIG_ROOT_NFS=y |
737 | CONFIG_LOCKD=y | 857 | CONFIG_LOCKD=y |
738 | CONFIG_LOCKD_V4=y | 858 | CONFIG_LOCKD_V4=y |
739 | CONFIG_EXPORTFS=m | 859 | CONFIG_EXPORTFS=m |
860 | CONFIG_NFS_COMMON=y | ||
740 | CONFIG_SUNRPC=y | 861 | CONFIG_SUNRPC=y |
741 | CONFIG_SUNRPC_GSS=y | 862 | CONFIG_SUNRPC_GSS=y |
863 | CONFIG_SUNRPC_BIND34=y | ||
742 | CONFIG_RPCSEC_GSS_KRB5=y | 864 | CONFIG_RPCSEC_GSS_KRB5=y |
743 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 865 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
744 | CONFIG_SMB_FS=m | 866 | CONFIG_SMB_FS=m |
745 | CONFIG_SMB_NLS_DEFAULT=y | 867 | CONFIG_SMB_NLS_DEFAULT=y |
746 | CONFIG_SMB_NLS_REMOTE="cp437" | 868 | CONFIG_SMB_NLS_REMOTE="cp437" |
747 | # CONFIG_CIFS is not set | 869 | # CONFIG_CIFS is not set |
748 | CONFIG_NCP_FS=m | 870 | # CONFIG_NCP_FS is not set |
749 | # CONFIG_NCPFS_PACKET_SIGNING is not set | ||
750 | # CONFIG_NCPFS_IOCTL_LOCKING is not set | ||
751 | # CONFIG_NCPFS_STRONG is not set | ||
752 | # CONFIG_NCPFS_NFS_NS is not set | ||
753 | # CONFIG_NCPFS_OS2_NS is not set | ||
754 | # CONFIG_NCPFS_SMALLDOS is not set | ||
755 | CONFIG_NCPFS_NLS=y | ||
756 | # CONFIG_NCPFS_EXTRAS is not set | ||
757 | CONFIG_CODA_FS=m | 871 | CONFIG_CODA_FS=m |
758 | # CONFIG_CODA_FS_OLD_API is not set | 872 | # CONFIG_CODA_FS_OLD_API is not set |
759 | # CONFIG_AFS_FS is not set | 873 | # CONFIG_AFS_FS is not set |
@@ -764,10 +878,6 @@ CONFIG_CODA_FS=m | |||
764 | # CONFIG_PARTITION_ADVANCED is not set | 878 | # CONFIG_PARTITION_ADVANCED is not set |
765 | CONFIG_MSDOS_PARTITION=y | 879 | CONFIG_MSDOS_PARTITION=y |
766 | CONFIG_SUN_PARTITION=y | 880 | CONFIG_SUN_PARTITION=y |
767 | |||
768 | # | ||
769 | # Native Language Support | ||
770 | # | ||
771 | CONFIG_NLS=y | 881 | CONFIG_NLS=y |
772 | CONFIG_NLS_DEFAULT="iso8859-1" | 882 | CONFIG_NLS_DEFAULT="iso8859-1" |
773 | CONFIG_NLS_CODEPAGE_437=y | 883 | CONFIG_NLS_CODEPAGE_437=y |
@@ -808,35 +918,42 @@ CONFIG_NLS_ISO8859_15=m | |||
808 | CONFIG_NLS_KOI8_R=m | 918 | CONFIG_NLS_KOI8_R=m |
809 | CONFIG_NLS_KOI8_U=m | 919 | CONFIG_NLS_KOI8_U=m |
810 | CONFIG_NLS_UTF8=m | 920 | CONFIG_NLS_UTF8=m |
921 | CONFIG_DLM=m | ||
922 | # CONFIG_DLM_DEBUG is not set | ||
811 | 923 | ||
812 | # | 924 | # |
813 | # Kernel hacking | 925 | # Kernel hacking |
814 | # | 926 | # |
815 | # CONFIG_PRINTK_TIME is not set | 927 | # CONFIG_PRINTK_TIME is not set |
816 | CONFIG_DEBUG_KERNEL=y | 928 | CONFIG_ENABLE_WARN_DEPRECATED=y |
929 | CONFIG_ENABLE_MUST_CHECK=y | ||
817 | CONFIG_MAGIC_SYSRQ=y | 930 | CONFIG_MAGIC_SYSRQ=y |
818 | CONFIG_LOG_BUF_SHIFT=16 | 931 | # CONFIG_UNUSED_SYMBOLS is not set |
819 | # CONFIG_SCHEDSTATS is not set | ||
820 | # CONFIG_DEBUG_SLAB is not set | ||
821 | # CONFIG_DEBUG_SPINLOCK is not set | ||
822 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
823 | # CONFIG_DEBUG_KOBJECT is not set | ||
824 | CONFIG_DEBUG_BUGVERBOSE=y | ||
825 | # CONFIG_DEBUG_INFO is not set | ||
826 | # CONFIG_DEBUG_FS is not set | 932 | # CONFIG_DEBUG_FS is not set |
827 | # CONFIG_FRAME_POINTER is not set | 933 | # CONFIG_HEADERS_CHECK is not set |
934 | # CONFIG_DEBUG_KERNEL is not set | ||
935 | CONFIG_DEBUG_BUGVERBOSE=y | ||
936 | # CONFIG_SAMPLES is not set | ||
828 | 937 | ||
829 | # | 938 | # |
830 | # Security options | 939 | # Security options |
831 | # | 940 | # |
832 | # CONFIG_KEYS is not set | 941 | # CONFIG_KEYS is not set |
833 | # CONFIG_SECURITY is not set | 942 | # CONFIG_SECURITY is not set |
834 | 943 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
835 | # | 944 | CONFIG_XOR_BLOCKS=m |
836 | # Cryptographic options | 945 | CONFIG_ASYNC_CORE=m |
837 | # | 946 | CONFIG_ASYNC_MEMCPY=m |
947 | CONFIG_ASYNC_XOR=m | ||
838 | CONFIG_CRYPTO=y | 948 | CONFIG_CRYPTO=y |
949 | CONFIG_CRYPTO_ALGAPI=y | ||
950 | CONFIG_CRYPTO_AEAD=m | ||
951 | CONFIG_CRYPTO_BLKCIPHER=y | ||
952 | CONFIG_CRYPTO_SEQIV=m | ||
953 | CONFIG_CRYPTO_HASH=y | ||
954 | CONFIG_CRYPTO_MANAGER=y | ||
839 | CONFIG_CRYPTO_HMAC=y | 955 | CONFIG_CRYPTO_HMAC=y |
956 | CONFIG_CRYPTO_XCBC=m | ||
840 | CONFIG_CRYPTO_NULL=m | 957 | CONFIG_CRYPTO_NULL=m |
841 | CONFIG_CRYPTO_MD4=m | 958 | CONFIG_CRYPTO_MD4=m |
842 | CONFIG_CRYPTO_MD5=y | 959 | CONFIG_CRYPTO_MD5=y |
@@ -845,9 +962,21 @@ CONFIG_CRYPTO_SHA256=m | |||
845 | CONFIG_CRYPTO_SHA512=m | 962 | CONFIG_CRYPTO_SHA512=m |
846 | CONFIG_CRYPTO_WP512=m | 963 | CONFIG_CRYPTO_WP512=m |
847 | CONFIG_CRYPTO_TGR192=m | 964 | CONFIG_CRYPTO_TGR192=m |
965 | CONFIG_CRYPTO_GF128MUL=m | ||
966 | CONFIG_CRYPTO_ECB=m | ||
967 | CONFIG_CRYPTO_CBC=y | ||
968 | CONFIG_CRYPTO_PCBC=m | ||
969 | CONFIG_CRYPTO_LRW=m | ||
970 | CONFIG_CRYPTO_XTS=m | ||
971 | CONFIG_CRYPTO_CTR=m | ||
972 | CONFIG_CRYPTO_GCM=m | ||
973 | CONFIG_CRYPTO_CCM=m | ||
974 | CONFIG_CRYPTO_CRYPTD=m | ||
848 | CONFIG_CRYPTO_DES=y | 975 | CONFIG_CRYPTO_DES=y |
976 | CONFIG_CRYPTO_FCRYPT=m | ||
849 | CONFIG_CRYPTO_BLOWFISH=m | 977 | CONFIG_CRYPTO_BLOWFISH=m |
850 | CONFIG_CRYPTO_TWOFISH=m | 978 | CONFIG_CRYPTO_TWOFISH=m |
979 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
851 | CONFIG_CRYPTO_SERPENT=m | 980 | CONFIG_CRYPTO_SERPENT=m |
852 | CONFIG_CRYPTO_AES=m | 981 | CONFIG_CRYPTO_AES=m |
853 | CONFIG_CRYPTO_CAST5=m | 982 | CONFIG_CRYPTO_CAST5=m |
@@ -856,20 +985,35 @@ CONFIG_CRYPTO_TEA=m | |||
856 | CONFIG_CRYPTO_ARC4=m | 985 | CONFIG_CRYPTO_ARC4=m |
857 | CONFIG_CRYPTO_KHAZAD=m | 986 | CONFIG_CRYPTO_KHAZAD=m |
858 | CONFIG_CRYPTO_ANUBIS=m | 987 | CONFIG_CRYPTO_ANUBIS=m |
988 | CONFIG_CRYPTO_SEED=m | ||
989 | CONFIG_CRYPTO_SALSA20=m | ||
859 | CONFIG_CRYPTO_DEFLATE=m | 990 | CONFIG_CRYPTO_DEFLATE=m |
860 | CONFIG_CRYPTO_MICHAEL_MIC=m | 991 | CONFIG_CRYPTO_MICHAEL_MIC=m |
861 | CONFIG_CRYPTO_CRC32C=m | 992 | CONFIG_CRYPTO_CRC32C=m |
993 | CONFIG_CRYPTO_CAMELLIA=m | ||
862 | CONFIG_CRYPTO_TEST=m | 994 | CONFIG_CRYPTO_TEST=m |
863 | 995 | CONFIG_CRYPTO_AUTHENC=m | |
864 | # | 996 | CONFIG_CRYPTO_LZO=m |
865 | # Hardware crypto devices | 997 | # CONFIG_CRYPTO_HW is not set |
866 | # | ||
867 | 998 | ||
868 | # | 999 | # |
869 | # Library routines | 1000 | # Library routines |
870 | # | 1001 | # |
1002 | CONFIG_BITREVERSE=y | ||
871 | CONFIG_CRC_CCITT=m | 1003 | CONFIG_CRC_CCITT=m |
1004 | CONFIG_CRC16=m | ||
1005 | # CONFIG_CRC_ITU_T is not set | ||
872 | CONFIG_CRC32=y | 1006 | CONFIG_CRC32=y |
1007 | # CONFIG_CRC7 is not set | ||
873 | CONFIG_LIBCRC32C=m | 1008 | CONFIG_LIBCRC32C=m |
874 | CONFIG_ZLIB_INFLATE=y | 1009 | CONFIG_ZLIB_INFLATE=y |
875 | CONFIG_ZLIB_DEFLATE=m | 1010 | CONFIG_ZLIB_DEFLATE=m |
1011 | CONFIG_LZO_COMPRESS=m | ||
1012 | CONFIG_LZO_DECOMPRESS=m | ||
1013 | CONFIG_TEXTSEARCH=y | ||
1014 | CONFIG_TEXTSEARCH_KMP=m | ||
1015 | CONFIG_TEXTSEARCH_BM=m | ||
1016 | CONFIG_TEXTSEARCH_FSM=m | ||
1017 | CONFIG_PLIST=y | ||
1018 | CONFIG_HAS_IOMEM=y | ||
1019 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig deleted file mode 100644 index 7d935e48a9a8..000000000000 --- a/arch/m68k/defconfig +++ /dev/null | |||
@@ -1,657 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.12-rc6-m68k | ||
4 | # Tue Jun 7 20:34:17 2005 | ||
5 | # | ||
6 | CONFIG_M68K=y | ||
7 | CONFIG_MMU=y | ||
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
11 | |||
12 | # | ||
13 | # Code maturity level options | ||
14 | # | ||
15 | CONFIG_EXPERIMENTAL=y | ||
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | ||
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="" | ||
24 | CONFIG_SWAP=y | ||
25 | CONFIG_SYSVIPC=y | ||
26 | # CONFIG_POSIX_MQUEUE is not set | ||
27 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
28 | CONFIG_SYSCTL=y | ||
29 | # CONFIG_AUDIT is not set | ||
30 | # CONFIG_HOTPLUG is not set | ||
31 | CONFIG_KOBJECT_UEVENT=y | ||
32 | # CONFIG_IKCONFIG is not set | ||
33 | # CONFIG_EMBEDDED is not set | ||
34 | CONFIG_KALLSYMS=y | ||
35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
36 | CONFIG_PRINTK=y | ||
37 | CONFIG_BUG=y | ||
38 | CONFIG_BASE_FULL=y | ||
39 | CONFIG_FUTEX=y | ||
40 | CONFIG_EPOLL=y | ||
41 | CONFIG_SHMEM=y | ||
42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
43 | CONFIG_CC_ALIGN_LABELS=0 | ||
44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
46 | # CONFIG_TINY_SHMEM is not set | ||
47 | CONFIG_BASE_SMALL=0 | ||
48 | |||
49 | # | ||
50 | # Loadable module support | ||
51 | # | ||
52 | # CONFIG_MODULES is not set | ||
53 | |||
54 | # | ||
55 | # Platform dependent setup | ||
56 | # | ||
57 | # CONFIG_SUN3 is not set | ||
58 | CONFIG_AMIGA=y | ||
59 | # CONFIG_ATARI is not set | ||
60 | # CONFIG_MAC is not set | ||
61 | # CONFIG_APOLLO is not set | ||
62 | # CONFIG_VME is not set | ||
63 | # CONFIG_HP300 is not set | ||
64 | # CONFIG_SUN3X is not set | ||
65 | # CONFIG_Q40 is not set | ||
66 | |||
67 | # | ||
68 | # Processor type | ||
69 | # | ||
70 | CONFIG_M68020=y | ||
71 | CONFIG_M68030=y | ||
72 | CONFIG_M68040=y | ||
73 | # CONFIG_M68060 is not set | ||
74 | CONFIG_MMU_MOTOROLA=y | ||
75 | # CONFIG_M68KFPU_EMU is not set | ||
76 | # CONFIG_ADVANCED is not set | ||
77 | |||
78 | # | ||
79 | # General setup | ||
80 | # | ||
81 | CONFIG_BINFMT_ELF=y | ||
82 | CONFIG_BINFMT_AOUT=y | ||
83 | # CONFIG_BINFMT_MISC is not set | ||
84 | CONFIG_ZORRO=y | ||
85 | # CONFIG_AMIGA_PCMCIA is not set | ||
86 | # CONFIG_HEARTBEAT is not set | ||
87 | CONFIG_PROC_HARDWARE=y | ||
88 | # CONFIG_ZORRO_NAMES is not set | ||
89 | |||
90 | # | ||
91 | # Device Drivers | ||
92 | # | ||
93 | |||
94 | # | ||
95 | # Generic Driver Options | ||
96 | # | ||
97 | CONFIG_STANDALONE=y | ||
98 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
99 | # CONFIG_FW_LOADER is not set | ||
100 | |||
101 | # | ||
102 | # Memory Technology Devices (MTD) | ||
103 | # | ||
104 | # CONFIG_MTD is not set | ||
105 | |||
106 | # | ||
107 | # Parallel port support | ||
108 | # | ||
109 | # CONFIG_PARPORT is not set | ||
110 | |||
111 | # | ||
112 | # Plug and Play support | ||
113 | # | ||
114 | |||
115 | # | ||
116 | # Block devices | ||
117 | # | ||
118 | CONFIG_AMIGA_FLOPPY=y | ||
119 | # CONFIG_AMIGA_Z2RAM is not set | ||
120 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
121 | # CONFIG_BLK_DEV_LOOP is not set | ||
122 | # CONFIG_BLK_DEV_NBD is not set | ||
123 | CONFIG_BLK_DEV_RAM=y | ||
124 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
125 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
126 | CONFIG_BLK_DEV_INITRD=y | ||
127 | CONFIG_INITRAMFS_SOURCE="" | ||
128 | CONFIG_CDROM_PKTCDVD=y | ||
129 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
130 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
131 | |||
132 | # | ||
133 | # IO Schedulers | ||
134 | # | ||
135 | CONFIG_IOSCHED_NOOP=y | ||
136 | CONFIG_IOSCHED_AS=y | ||
137 | CONFIG_IOSCHED_DEADLINE=y | ||
138 | CONFIG_IOSCHED_CFQ=y | ||
139 | # CONFIG_ATA_OVER_ETH is not set | ||
140 | |||
141 | # | ||
142 | # ATA/ATAPI/MFM/RLL support | ||
143 | # | ||
144 | # CONFIG_IDE is not set | ||
145 | |||
146 | # | ||
147 | # SCSI device support | ||
148 | # | ||
149 | CONFIG_SCSI=y | ||
150 | CONFIG_SCSI_PROC_FS=y | ||
151 | |||
152 | # | ||
153 | # SCSI support type (disk, tape, CD-ROM) | ||
154 | # | ||
155 | CONFIG_BLK_DEV_SD=y | ||
156 | CONFIG_CHR_DEV_ST=y | ||
157 | # CONFIG_CHR_DEV_OSST is not set | ||
158 | CONFIG_BLK_DEV_SR=y | ||
159 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
160 | # CONFIG_CHR_DEV_SG is not set | ||
161 | |||
162 | # | ||
163 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
164 | # | ||
165 | # CONFIG_SCSI_MULTI_LUN is not set | ||
166 | CONFIG_SCSI_CONSTANTS=y | ||
167 | # CONFIG_SCSI_LOGGING is not set | ||
168 | |||
169 | # | ||
170 | # SCSI Transport Attributes | ||
171 | # | ||
172 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
173 | # CONFIG_SCSI_FC_ATTRS is not set | ||
174 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
175 | |||
176 | # | ||
177 | # SCSI low-level drivers | ||
178 | # | ||
179 | # CONFIG_SCSI_SATA is not set | ||
180 | # CONFIG_SCSI_DEBUG is not set | ||
181 | CONFIG_A3000_SCSI=y | ||
182 | CONFIG_A2091_SCSI=y | ||
183 | CONFIG_GVP11_SCSI=y | ||
184 | # CONFIG_CYBERSTORM_SCSI is not set | ||
185 | # CONFIG_CYBERSTORMII_SCSI is not set | ||
186 | # CONFIG_BLZ2060_SCSI is not set | ||
187 | # CONFIG_BLZ1230_SCSI is not set | ||
188 | # CONFIG_FASTLANE_SCSI is not set | ||
189 | # CONFIG_OKTAGON_SCSI is not set | ||
190 | |||
191 | # | ||
192 | # Multi-device support (RAID and LVM) | ||
193 | # | ||
194 | # CONFIG_MD is not set | ||
195 | |||
196 | # | ||
197 | # Fusion MPT device support | ||
198 | # | ||
199 | |||
200 | # | ||
201 | # IEEE 1394 (FireWire) support | ||
202 | # | ||
203 | |||
204 | # | ||
205 | # I2O device support | ||
206 | # | ||
207 | |||
208 | # | ||
209 | # Networking support | ||
210 | # | ||
211 | CONFIG_NET=y | ||
212 | |||
213 | # | ||
214 | # Networking options | ||
215 | # | ||
216 | CONFIG_PACKET=y | ||
217 | # CONFIG_PACKET_MMAP is not set | ||
218 | CONFIG_UNIX=y | ||
219 | # CONFIG_NET_KEY is not set | ||
220 | CONFIG_INET=y | ||
221 | # CONFIG_IP_MULTICAST is not set | ||
222 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
223 | # CONFIG_IP_PNP is not set | ||
224 | # CONFIG_NET_IPIP is not set | ||
225 | # CONFIG_NET_IPGRE is not set | ||
226 | # CONFIG_ARPD is not set | ||
227 | # CONFIG_SYN_COOKIES is not set | ||
228 | # CONFIG_INET_AH is not set | ||
229 | # CONFIG_INET_ESP is not set | ||
230 | # CONFIG_INET_IPCOMP is not set | ||
231 | # CONFIG_INET_TUNNEL is not set | ||
232 | CONFIG_IP_TCPDIAG=y | ||
233 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
234 | # CONFIG_IPV6 is not set | ||
235 | # CONFIG_NETFILTER is not set | ||
236 | |||
237 | # | ||
238 | # SCTP Configuration (EXPERIMENTAL) | ||
239 | # | ||
240 | # CONFIG_IP_SCTP is not set | ||
241 | # CONFIG_ATM is not set | ||
242 | # CONFIG_BRIDGE is not set | ||
243 | # CONFIG_VLAN_8021Q is not set | ||
244 | # CONFIG_DECNET is not set | ||
245 | # CONFIG_LLC2 is not set | ||
246 | # CONFIG_IPX is not set | ||
247 | # CONFIG_ATALK is not set | ||
248 | # CONFIG_X25 is not set | ||
249 | # CONFIG_LAPB is not set | ||
250 | # CONFIG_NET_DIVERT is not set | ||
251 | # CONFIG_ECONET is not set | ||
252 | # CONFIG_WAN_ROUTER is not set | ||
253 | |||
254 | # | ||
255 | # QoS and/or fair queueing | ||
256 | # | ||
257 | # CONFIG_NET_SCHED is not set | ||
258 | # CONFIG_NET_CLS_ROUTE is not set | ||
259 | |||
260 | # | ||
261 | # Network testing | ||
262 | # | ||
263 | # CONFIG_NET_PKTGEN is not set | ||
264 | # CONFIG_NETPOLL is not set | ||
265 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
266 | # CONFIG_HAMRADIO is not set | ||
267 | # CONFIG_IRDA is not set | ||
268 | # CONFIG_BT is not set | ||
269 | CONFIG_NETDEVICES=y | ||
270 | # CONFIG_DUMMY is not set | ||
271 | # CONFIG_BONDING is not set | ||
272 | # CONFIG_EQUALIZER is not set | ||
273 | # CONFIG_TUN is not set | ||
274 | |||
275 | # | ||
276 | # Ethernet (10 or 100Mbit) | ||
277 | # | ||
278 | # CONFIG_NET_ETHERNET is not set | ||
279 | |||
280 | # | ||
281 | # Ethernet (1000 Mbit) | ||
282 | # | ||
283 | |||
284 | # | ||
285 | # Ethernet (10000 Mbit) | ||
286 | # | ||
287 | |||
288 | # | ||
289 | # Token Ring devices | ||
290 | # | ||
291 | |||
292 | # | ||
293 | # Wireless LAN (non-hamradio) | ||
294 | # | ||
295 | # CONFIG_NET_RADIO is not set | ||
296 | |||
297 | # | ||
298 | # Wan interfaces | ||
299 | # | ||
300 | # CONFIG_WAN is not set | ||
301 | # CONFIG_PPP is not set | ||
302 | # CONFIG_SLIP is not set | ||
303 | # CONFIG_SHAPER is not set | ||
304 | # CONFIG_NETCONSOLE is not set | ||
305 | |||
306 | # | ||
307 | # ISDN subsystem | ||
308 | # | ||
309 | # CONFIG_ISDN is not set | ||
310 | |||
311 | # | ||
312 | # Telephony Support | ||
313 | # | ||
314 | # CONFIG_PHONE is not set | ||
315 | |||
316 | # | ||
317 | # Input device support | ||
318 | # | ||
319 | CONFIG_INPUT=y | ||
320 | |||
321 | # | ||
322 | # Userland interfaces | ||
323 | # | ||
324 | CONFIG_INPUT_MOUSEDEV=y | ||
325 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
326 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
327 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
328 | # CONFIG_INPUT_JOYDEV is not set | ||
329 | # CONFIG_INPUT_TSDEV is not set | ||
330 | # CONFIG_INPUT_EVDEV is not set | ||
331 | # CONFIG_INPUT_EVBUG is not set | ||
332 | |||
333 | # | ||
334 | # Input Device Drivers | ||
335 | # | ||
336 | CONFIG_INPUT_KEYBOARD=y | ||
337 | CONFIG_KEYBOARD_ATKBD=y | ||
338 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
339 | # CONFIG_KEYBOARD_LKKBD is not set | ||
340 | # CONFIG_KEYBOARD_XTKBD is not set | ||
341 | # CONFIG_KEYBOARD_NEWTON is not set | ||
342 | # CONFIG_KEYBOARD_AMIGA is not set | ||
343 | CONFIG_INPUT_MOUSE=y | ||
344 | CONFIG_MOUSE_PS2=y | ||
345 | # CONFIG_MOUSE_SERIAL is not set | ||
346 | # CONFIG_MOUSE_AMIGA is not set | ||
347 | # CONFIG_MOUSE_VSXXXAA is not set | ||
348 | # CONFIG_INPUT_JOYSTICK is not set | ||
349 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
350 | # CONFIG_INPUT_MISC is not set | ||
351 | |||
352 | # | ||
353 | # Hardware I/O ports | ||
354 | # | ||
355 | CONFIG_SERIO=y | ||
356 | CONFIG_SERIO_SERPORT=y | ||
357 | CONFIG_SERIO_LIBPS2=y | ||
358 | # CONFIG_SERIO_RAW is not set | ||
359 | # CONFIG_GAMEPORT is not set | ||
360 | |||
361 | # | ||
362 | # Character devices | ||
363 | # | ||
364 | CONFIG_VT=y | ||
365 | CONFIG_VT_CONSOLE=y | ||
366 | CONFIG_HW_CONSOLE=y | ||
367 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
368 | # CONFIG_A2232 is not set | ||
369 | |||
370 | # | ||
371 | # Serial drivers | ||
372 | # | ||
373 | # CONFIG_SERIAL_8250 is not set | ||
374 | |||
375 | # | ||
376 | # Non-8250 serial port support | ||
377 | # | ||
378 | CONFIG_UNIX98_PTYS=y | ||
379 | CONFIG_LEGACY_PTYS=y | ||
380 | CONFIG_LEGACY_PTY_COUNT=256 | ||
381 | |||
382 | # | ||
383 | # IPMI | ||
384 | # | ||
385 | # CONFIG_IPMI_HANDLER is not set | ||
386 | |||
387 | # | ||
388 | # Watchdog Cards | ||
389 | # | ||
390 | # CONFIG_WATCHDOG is not set | ||
391 | # CONFIG_GEN_RTC is not set | ||
392 | # CONFIG_DTLK is not set | ||
393 | # CONFIG_R3964 is not set | ||
394 | |||
395 | # | ||
396 | # Ftape, the floppy tape device driver | ||
397 | # | ||
398 | # CONFIG_DRM is not set | ||
399 | # CONFIG_RAW_DRIVER is not set | ||
400 | |||
401 | # | ||
402 | # TPM devices | ||
403 | # | ||
404 | |||
405 | # | ||
406 | # I2C support | ||
407 | # | ||
408 | # CONFIG_I2C is not set | ||
409 | |||
410 | # | ||
411 | # Dallas's 1-wire bus | ||
412 | # | ||
413 | # CONFIG_W1 is not set | ||
414 | |||
415 | # | ||
416 | # Misc devices | ||
417 | # | ||
418 | |||
419 | # | ||
420 | # Multimedia devices | ||
421 | # | ||
422 | # CONFIG_VIDEO_DEV is not set | ||
423 | |||
424 | # | ||
425 | # Digital Video Broadcasting Devices | ||
426 | # | ||
427 | # CONFIG_DVB is not set | ||
428 | |||
429 | # | ||
430 | # Graphics support | ||
431 | # | ||
432 | CONFIG_FB=y | ||
433 | # CONFIG_FB_CFB_FILLRECT is not set | ||
434 | # CONFIG_FB_CFB_COPYAREA is not set | ||
435 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
436 | CONFIG_FB_SOFT_CURSOR=y | ||
437 | # CONFIG_FB_MACMODES is not set | ||
438 | CONFIG_FB_MODE_HELPERS=y | ||
439 | # CONFIG_FB_TILEBLITTING is not set | ||
440 | # CONFIG_FB_CIRRUS is not set | ||
441 | CONFIG_FB_AMIGA=y | ||
442 | CONFIG_FB_AMIGA_OCS=y | ||
443 | CONFIG_FB_AMIGA_ECS=y | ||
444 | CONFIG_FB_AMIGA_AGA=y | ||
445 | # CONFIG_FB_FM2 is not set | ||
446 | # CONFIG_FB_S1D13XXX is not set | ||
447 | # CONFIG_FB_VIRTUAL is not set | ||
448 | |||
449 | # | ||
450 | # Console display driver support | ||
451 | # | ||
452 | CONFIG_DUMMY_CONSOLE=y | ||
453 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
454 | |||
455 | # | ||
456 | # Logo configuration | ||
457 | # | ||
458 | # CONFIG_LOGO is not set | ||
459 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
460 | |||
461 | # | ||
462 | # Sound | ||
463 | # | ||
464 | # CONFIG_SOUND is not set | ||
465 | |||
466 | # | ||
467 | # USB support | ||
468 | # | ||
469 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
470 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
471 | |||
472 | # | ||
473 | # USB Gadget Support | ||
474 | # | ||
475 | # CONFIG_USB_GADGET is not set | ||
476 | |||
477 | # | ||
478 | # MMC/SD Card support | ||
479 | # | ||
480 | # CONFIG_MMC is not set | ||
481 | |||
482 | # | ||
483 | # InfiniBand support | ||
484 | # | ||
485 | # CONFIG_INFINIBAND is not set | ||
486 | |||
487 | # | ||
488 | # Character devices | ||
489 | # | ||
490 | CONFIG_AMIGA_BUILTIN_SERIAL=y | ||
491 | # CONFIG_MULTIFACE_III_TTY is not set | ||
492 | # CONFIG_GVPIOEXT is not set | ||
493 | # CONFIG_SERIAL_CONSOLE is not set | ||
494 | |||
495 | # | ||
496 | # File systems | ||
497 | # | ||
498 | CONFIG_EXT2_FS=y | ||
499 | # CONFIG_EXT2_FS_XATTR is not set | ||
500 | # CONFIG_EXT3_FS is not set | ||
501 | # CONFIG_JBD is not set | ||
502 | # CONFIG_REISERFS_FS is not set | ||
503 | # CONFIG_JFS_FS is not set | ||
504 | |||
505 | # | ||
506 | # XFS support | ||
507 | # | ||
508 | # CONFIG_XFS_FS is not set | ||
509 | CONFIG_MINIX_FS=y | ||
510 | # CONFIG_ROMFS_FS is not set | ||
511 | # CONFIG_QUOTA is not set | ||
512 | CONFIG_DNOTIFY=y | ||
513 | # CONFIG_AUTOFS_FS is not set | ||
514 | # CONFIG_AUTOFS4_FS is not set | ||
515 | |||
516 | # | ||
517 | # CD-ROM/DVD Filesystems | ||
518 | # | ||
519 | # CONFIG_ISO9660_FS is not set | ||
520 | # CONFIG_UDF_FS is not set | ||
521 | |||
522 | # | ||
523 | # DOS/FAT/NT Filesystems | ||
524 | # | ||
525 | CONFIG_FAT_FS=y | ||
526 | CONFIG_MSDOS_FS=y | ||
527 | # CONFIG_VFAT_FS is not set | ||
528 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
529 | # CONFIG_NTFS_FS is not set | ||
530 | |||
531 | # | ||
532 | # Pseudo filesystems | ||
533 | # | ||
534 | CONFIG_PROC_FS=y | ||
535 | CONFIG_PROC_KCORE=y | ||
536 | CONFIG_SYSFS=y | ||
537 | # CONFIG_DEVFS_FS is not set | ||
538 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
539 | # CONFIG_TMPFS is not set | ||
540 | # CONFIG_HUGETLB_PAGE is not set | ||
541 | CONFIG_RAMFS=y | ||
542 | |||
543 | # | ||
544 | # Miscellaneous filesystems | ||
545 | # | ||
546 | # CONFIG_ADFS_FS is not set | ||
547 | # CONFIG_AFFS_FS is not set | ||
548 | # CONFIG_HFS_FS is not set | ||
549 | # CONFIG_HFSPLUS_FS is not set | ||
550 | # CONFIG_BEFS_FS is not set | ||
551 | # CONFIG_BFS_FS is not set | ||
552 | # CONFIG_EFS_FS is not set | ||
553 | # CONFIG_CRAMFS is not set | ||
554 | # CONFIG_VXFS_FS is not set | ||
555 | # CONFIG_HPFS_FS is not set | ||
556 | # CONFIG_QNX4FS_FS is not set | ||
557 | # CONFIG_SYSV_FS is not set | ||
558 | # CONFIG_UFS_FS is not set | ||
559 | |||
560 | # | ||
561 | # Network File Systems | ||
562 | # | ||
563 | CONFIG_NFS_FS=y | ||
564 | # CONFIG_NFS_V3 is not set | ||
565 | # CONFIG_NFS_V4 is not set | ||
566 | # CONFIG_NFS_DIRECTIO is not set | ||
567 | # CONFIG_NFSD is not set | ||
568 | CONFIG_LOCKD=y | ||
569 | CONFIG_SUNRPC=y | ||
570 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
571 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
572 | # CONFIG_SMB_FS is not set | ||
573 | # CONFIG_CIFS is not set | ||
574 | # CONFIG_NCP_FS is not set | ||
575 | # CONFIG_CODA_FS is not set | ||
576 | # CONFIG_AFS_FS is not set | ||
577 | |||
578 | # | ||
579 | # Partition Types | ||
580 | # | ||
581 | # CONFIG_PARTITION_ADVANCED is not set | ||
582 | CONFIG_AMIGA_PARTITION=y | ||
583 | CONFIG_MSDOS_PARTITION=y | ||
584 | |||
585 | # | ||
586 | # Native Language Support | ||
587 | # | ||
588 | CONFIG_NLS=y | ||
589 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
590 | CONFIG_NLS_CODEPAGE_437=y | ||
591 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
592 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
593 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
594 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
595 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
596 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
597 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
598 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
599 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
600 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
601 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
602 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
603 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
604 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
605 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
606 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
607 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
608 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
609 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
610 | # CONFIG_NLS_ISO8859_8 is not set | ||
611 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
612 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
613 | # CONFIG_NLS_ASCII is not set | ||
614 | # CONFIG_NLS_ISO8859_1 is not set | ||
615 | # CONFIG_NLS_ISO8859_2 is not set | ||
616 | # CONFIG_NLS_ISO8859_3 is not set | ||
617 | # CONFIG_NLS_ISO8859_4 is not set | ||
618 | # CONFIG_NLS_ISO8859_5 is not set | ||
619 | # CONFIG_NLS_ISO8859_6 is not set | ||
620 | # CONFIG_NLS_ISO8859_7 is not set | ||
621 | # CONFIG_NLS_ISO8859_9 is not set | ||
622 | # CONFIG_NLS_ISO8859_13 is not set | ||
623 | # CONFIG_NLS_ISO8859_14 is not set | ||
624 | # CONFIG_NLS_ISO8859_15 is not set | ||
625 | # CONFIG_NLS_KOI8_R is not set | ||
626 | # CONFIG_NLS_KOI8_U is not set | ||
627 | # CONFIG_NLS_UTF8 is not set | ||
628 | |||
629 | # | ||
630 | # Kernel hacking | ||
631 | # | ||
632 | # CONFIG_PRINTK_TIME is not set | ||
633 | # CONFIG_DEBUG_KERNEL is not set | ||
634 | CONFIG_LOG_BUF_SHIFT=14 | ||
635 | CONFIG_DEBUG_BUGVERBOSE=y | ||
636 | |||
637 | # | ||
638 | # Security options | ||
639 | # | ||
640 | # CONFIG_KEYS is not set | ||
641 | # CONFIG_SECURITY is not set | ||
642 | |||
643 | # | ||
644 | # Cryptographic options | ||
645 | # | ||
646 | # CONFIG_CRYPTO is not set | ||
647 | |||
648 | # | ||
649 | # Hardware crypto devices | ||
650 | # | ||
651 | |||
652 | # | ||
653 | # Library routines | ||
654 | # | ||
655 | # CONFIG_CRC_CCITT is not set | ||
656 | CONFIG_CRC32=y | ||
657 | # CONFIG_LIBCRC32C is not set | ||
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 3191afa29ad8..25f4eab8ea9c 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c | |||
@@ -139,7 +139,6 @@ | |||
139 | #include <asm/system.h> | 139 | #include <asm/system.h> |
140 | #include <asm/gdb-stub.h> | 140 | #include <asm/gdb-stub.h> |
141 | #include <asm/inst.h> | 141 | #include <asm/inst.h> |
142 | #include <asm/smp.h> | ||
143 | 142 | ||
144 | /* | 143 | /* |
145 | * external low-level support routines | 144 | * external low-level support routines |
@@ -656,6 +655,7 @@ void set_async_breakpoint(unsigned long *epc) | |||
656 | *epc = (unsigned long)async_breakpoint; | 655 | *epc = (unsigned long)async_breakpoint; |
657 | } | 656 | } |
658 | 657 | ||
658 | #ifdef CONFIG_SMP | ||
659 | static void kgdb_wait(void *arg) | 659 | static void kgdb_wait(void *arg) |
660 | { | 660 | { |
661 | unsigned flags; | 661 | unsigned flags; |
@@ -668,6 +668,7 @@ static void kgdb_wait(void *arg) | |||
668 | 668 | ||
669 | local_irq_restore(flags); | 669 | local_irq_restore(flags); |
670 | } | 670 | } |
671 | #endif | ||
671 | 672 | ||
672 | /* | 673 | /* |
673 | * GDB stub needs to call kgdb_wait on all processor with interrupts | 674 | * GDB stub needs to call kgdb_wait on all processor with interrupts |
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 6496925b5e29..77aefb4ebedd 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -361,6 +361,16 @@ static inline int has_valid_asid(const struct mm_struct *mm) | |||
361 | #endif | 361 | #endif |
362 | } | 362 | } |
363 | 363 | ||
364 | static void r4k__flush_cache_vmap(void) | ||
365 | { | ||
366 | r4k_blast_dcache(); | ||
367 | } | ||
368 | |||
369 | static void r4k__flush_cache_vunmap(void) | ||
370 | { | ||
371 | r4k_blast_dcache(); | ||
372 | } | ||
373 | |||
364 | static inline void local_r4k_flush_cache_range(void * args) | 374 | static inline void local_r4k_flush_cache_range(void * args) |
365 | { | 375 | { |
366 | struct vm_area_struct *vma = args; | 376 | struct vm_area_struct *vma = args; |
@@ -1281,6 +1291,10 @@ void __cpuinit r4k_cache_init(void) | |||
1281 | PAGE_SIZE - 1); | 1291 | PAGE_SIZE - 1); |
1282 | else | 1292 | else |
1283 | shm_align_mask = PAGE_SIZE-1; | 1293 | shm_align_mask = PAGE_SIZE-1; |
1294 | |||
1295 | __flush_cache_vmap = r4k__flush_cache_vmap; | ||
1296 | __flush_cache_vunmap = r4k__flush_cache_vunmap; | ||
1297 | |||
1284 | flush_cache_all = cache_noop; | 1298 | flush_cache_all = cache_noop; |
1285 | __flush_cache_all = r4k___flush_cache_all; | 1299 | __flush_cache_all = r4k___flush_cache_all; |
1286 | flush_cache_mm = r4k_flush_cache_mm; | 1300 | flush_cache_mm = r4k_flush_cache_mm; |
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c index b09d56981d53..a9f7f1f5e9b4 100644 --- a/arch/mips/mm/c-tx39.c +++ b/arch/mips/mm/c-tx39.c | |||
@@ -122,6 +122,16 @@ static inline void tx39_blast_icache(void) | |||
122 | local_irq_restore(flags); | 122 | local_irq_restore(flags); |
123 | } | 123 | } |
124 | 124 | ||
125 | static void tx39__flush_cache_vmap(void) | ||
126 | { | ||
127 | tx39_blast_dcache(); | ||
128 | } | ||
129 | |||
130 | static void tx39__flush_cache_vunmap(void) | ||
131 | { | ||
132 | tx39_blast_dcache(); | ||
133 | } | ||
134 | |||
125 | static inline void tx39_flush_cache_all(void) | 135 | static inline void tx39_flush_cache_all(void) |
126 | { | 136 | { |
127 | if (!cpu_has_dc_aliases) | 137 | if (!cpu_has_dc_aliases) |
@@ -344,6 +354,8 @@ void __cpuinit tx39_cache_init(void) | |||
344 | switch (current_cpu_type()) { | 354 | switch (current_cpu_type()) { |
345 | case CPU_TX3912: | 355 | case CPU_TX3912: |
346 | /* TX39/H core (writethru direct-map cache) */ | 356 | /* TX39/H core (writethru direct-map cache) */ |
357 | __flush_cache_vmap = tx39__flush_cache_vmap; | ||
358 | __flush_cache_vunmap = tx39__flush_cache_vunmap; | ||
347 | flush_cache_all = tx39h_flush_icache_all; | 359 | flush_cache_all = tx39h_flush_icache_all; |
348 | __flush_cache_all = tx39h_flush_icache_all; | 360 | __flush_cache_all = tx39h_flush_icache_all; |
349 | flush_cache_mm = (void *) tx39h_flush_icache_all; | 361 | flush_cache_mm = (void *) tx39h_flush_icache_all; |
@@ -369,6 +381,9 @@ void __cpuinit tx39_cache_init(void) | |||
369 | write_c0_wired(0); /* set 8 on reset... */ | 381 | write_c0_wired(0); /* set 8 on reset... */ |
370 | /* board-dependent init code may set WBON */ | 382 | /* board-dependent init code may set WBON */ |
371 | 383 | ||
384 | __flush_cache_vmap = tx39__flush_cache_vmap; | ||
385 | __flush_cache_vunmap = tx39__flush_cache_vunmap; | ||
386 | |||
372 | flush_cache_all = tx39_flush_cache_all; | 387 | flush_cache_all = tx39_flush_cache_all; |
373 | __flush_cache_all = tx39___flush_cache_all; | 388 | __flush_cache_all = tx39___flush_cache_all; |
374 | flush_cache_mm = tx39_flush_cache_mm; | 389 | flush_cache_mm = tx39_flush_cache_mm; |
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 51ab1faa027d..f5903679ee6a 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c | |||
@@ -30,6 +30,9 @@ void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, | |||
30 | unsigned long pfn); | 30 | unsigned long pfn); |
31 | void (*flush_icache_range)(unsigned long start, unsigned long end); | 31 | void (*flush_icache_range)(unsigned long start, unsigned long end); |
32 | 32 | ||
33 | void (*__flush_cache_vmap)(void); | ||
34 | void (*__flush_cache_vunmap)(void); | ||
35 | |||
33 | /* MIPS specific cache operations */ | 36 | /* MIPS specific cache operations */ |
34 | void (*flush_cache_sigtramp)(unsigned long addr); | 37 | void (*flush_cache_sigtramp)(unsigned long addr); |
35 | void (*local_flush_data_cache_page)(void * addr); | 38 | void (*local_flush_data_cache_page)(void * addr); |
diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S index a8399b013729..06ac31f3be88 100644 --- a/arch/sh/boot/compressed/head_32.S +++ b/arch/sh/boot/compressed/head_32.S | |||
@@ -7,7 +7,6 @@ | |||
7 | 7 | ||
8 | .text | 8 | .text |
9 | 9 | ||
10 | #include <linux/linkage.h> | ||
11 | #include <asm/page.h> | 10 | #include <asm/page.h> |
12 | 11 | ||
13 | .global startup | 12 | .global startup |
diff --git a/arch/sh/boot/compressed/head_64.S b/arch/sh/boot/compressed/head_64.S index 1d4ecbfc767c..f72c1989f5f2 100644 --- a/arch/sh/boot/compressed/head_64.S +++ b/arch/sh/boot/compressed/head_64.S | |||
@@ -13,7 +13,6 @@ | |||
13 | * Modification for compressed loader: | 13 | * Modification for compressed loader: |
14 | * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) | 14 | * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) |
15 | */ | 15 | */ |
16 | #include <linux/linkage.h> | ||
17 | #include <asm/cache.h> | 16 | #include <asm/cache.h> |
18 | #include <asm/cpu/mmu_context.h> | 17 | #include <asm/cpu/mmu_context.h> |
19 | #include <asm/cpu/registers.h> | 18 | #include <asm/cpu/registers.h> |
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 046999b1d1af..0283d8133075 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
29 | #include <asm/pgtable.h> | 29 | #include <asm/pgtable.h> |
30 | #include <asm/mmu_context.h> | 30 | #include <asm/mmu_context.h> |
31 | #include <asm/fpu.h> | ||
31 | 32 | ||
32 | struct task_struct *last_task_used_math = NULL; | 33 | struct task_struct *last_task_used_math = NULL; |
33 | 34 | ||
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c index f6fbdfa6876d..d453c47dc522 100644 --- a/arch/sh/kernel/ptrace_64.c +++ b/arch/sh/kernel/ptrace_64.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <asm/system.h> | 33 | #include <asm/system.h> |
34 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
35 | #include <asm/mmu_context.h> | 35 | #include <asm/mmu_context.h> |
36 | #include <asm/fpu.h> | ||
36 | 37 | ||
37 | /* This mask defines the bits of the SR which the user is not allowed to | 38 | /* This mask defines the bits of the SR which the user is not allowed to |
38 | change, which are everything except S, Q, M, PR, SZ, FR. */ | 39 | change, which are everything except S, Q, M, PR, SZ, FR. */ |
diff --git a/arch/sh/kernel/sh_ksyms_32.c b/arch/sh/kernel/sh_ksyms_32.c index d80de3903271..45bb333fd9ec 100644 --- a/arch/sh/kernel/sh_ksyms_32.c +++ b/arch/sh/kernel/sh_ksyms_32.c | |||
@@ -149,3 +149,4 @@ EXPORT_SYMBOL(clear_page); | |||
149 | EXPORT_SYMBOL(copy_page); | 149 | EXPORT_SYMBOL(copy_page); |
150 | EXPORT_SYMBOL(__clear_user); | 150 | EXPORT_SYMBOL(__clear_user); |
151 | EXPORT_SYMBOL(_ebss); | 151 | EXPORT_SYMBOL(_ebss); |
152 | EXPORT_SYMBOL(empty_zero_page); | ||
diff --git a/arch/sh/kernel/sh_ksyms_64.c b/arch/sh/kernel/sh_ksyms_64.c index dd38a683de65..b6410ce4bd1d 100644 --- a/arch/sh/kernel/sh_ksyms_64.c +++ b/arch/sh/kernel/sh_ksyms_64.c | |||
@@ -44,6 +44,7 @@ EXPORT_SYMBOL(__put_user_asm_l); | |||
44 | EXPORT_SYMBOL(__get_user_asm_l); | 44 | EXPORT_SYMBOL(__get_user_asm_l); |
45 | EXPORT_SYMBOL(copy_page); | 45 | EXPORT_SYMBOL(copy_page); |
46 | EXPORT_SYMBOL(__copy_user); | 46 | EXPORT_SYMBOL(__copy_user); |
47 | EXPORT_SYMBOL(empty_zero_page); | ||
47 | EXPORT_SYMBOL(memcpy); | 48 | EXPORT_SYMBOL(memcpy); |
48 | EXPORT_SYMBOL(__udelay); | 49 | EXPORT_SYMBOL(__udelay); |
49 | EXPORT_SYMBOL(__ndelay); | 50 | EXPORT_SYMBOL(__ndelay); |
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index 80bde19d445b..552eb810cd85 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
27 | #include <asm/pgtable.h> | 27 | #include <asm/pgtable.h> |
28 | #include <asm/cacheflush.h> | 28 | #include <asm/cacheflush.h> |
29 | #include <asm/fpu.h> | ||
29 | 30 | ||
30 | #define REG_RET 9 | 31 | #define REG_RET 9 |
31 | #define REG_ARG1 2 | 32 | #define REG_ARG1 2 |
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c index baa4fa368dce..e08b3bfeb656 100644 --- a/arch/sh/kernel/traps_32.c +++ b/arch/sh/kernel/traps_32.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/limits.h> | 25 | #include <linux/limits.h> |
26 | #include <asm/system.h> | 26 | #include <asm/system.h> |
27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
28 | #include <asm/fpu.h> | ||
28 | 29 | ||
29 | #ifdef CONFIG_SH_KGDB | 30 | #ifdef CONFIG_SH_KGDB |
30 | #include <asm/kgdb.h> | 31 | #include <asm/kgdb.h> |
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c index 1b58a7499087..a85831cbf18b 100644 --- a/arch/sh/kernel/traps_64.c +++ b/arch/sh/kernel/traps_64.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <asm/atomic.h> | 30 | #include <asm/atomic.h> |
31 | #include <asm/processor.h> | 31 | #include <asm/processor.h> |
32 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
33 | #include <asm/fpu.h> | ||
33 | 34 | ||
34 | #undef DEBUG_EXCEPTION | 35 | #undef DEBUG_EXCEPTION |
35 | #ifdef DEBUG_EXCEPTION | 36 | #ifdef DEBUG_EXCEPTION |
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c index 5b54f11f4e59..7f44ae69b29e 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c | |||
@@ -325,7 +325,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
325 | const struct user_regset_view *view; | 325 | const struct user_regset_view *view; |
326 | int ret; | 326 | int ret; |
327 | 327 | ||
328 | view = task_user_regset_view(child); | 328 | view = task_user_regset_view(current); |
329 | 329 | ||
330 | switch(request) { | 330 | switch(request) { |
331 | case PTRACE_GETREGS: { | 331 | case PTRACE_GETREGS: { |
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index aaae865e7932..e9fc0aa2da38 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
@@ -114,6 +114,85 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, | |||
114 | preempt_enable(); | 114 | preempt_enable(); |
115 | } | 115 | } |
116 | 116 | ||
117 | static int get_from_target(struct task_struct *target, unsigned long uaddr, | ||
118 | void *kbuf, int len) | ||
119 | { | ||
120 | if (target == current) { | ||
121 | if (copy_from_user(kbuf, (void __user *) uaddr, len)) | ||
122 | return -EFAULT; | ||
123 | } else { | ||
124 | int len2 = access_process_vm(target, uaddr, kbuf, len, 0); | ||
125 | if (len2 != len) | ||
126 | return -EFAULT; | ||
127 | } | ||
128 | return 0; | ||
129 | } | ||
130 | |||
131 | static int set_to_target(struct task_struct *target, unsigned long uaddr, | ||
132 | void *kbuf, int len) | ||
133 | { | ||
134 | if (target == current) { | ||
135 | if (copy_to_user((void __user *) uaddr, kbuf, len)) | ||
136 | return -EFAULT; | ||
137 | } else { | ||
138 | int len2 = access_process_vm(target, uaddr, kbuf, len, 1); | ||
139 | if (len2 != len) | ||
140 | return -EFAULT; | ||
141 | } | ||
142 | return 0; | ||
143 | } | ||
144 | |||
145 | static int regwindow64_get(struct task_struct *target, | ||
146 | const struct pt_regs *regs, | ||
147 | struct reg_window *wbuf) | ||
148 | { | ||
149 | unsigned long rw_addr = regs->u_regs[UREG_I6]; | ||
150 | |||
151 | if (test_tsk_thread_flag(current, TIF_32BIT)) { | ||
152 | struct reg_window32 win32; | ||
153 | int i; | ||
154 | |||
155 | if (get_from_target(target, rw_addr, &win32, sizeof(win32))) | ||
156 | return -EFAULT; | ||
157 | for (i = 0; i < 8; i++) | ||
158 | wbuf->locals[i] = win32.locals[i]; | ||
159 | for (i = 0; i < 8; i++) | ||
160 | wbuf->ins[i] = win32.ins[i]; | ||
161 | } else { | ||
162 | rw_addr += STACK_BIAS; | ||
163 | if (get_from_target(target, rw_addr, wbuf, sizeof(*wbuf))) | ||
164 | return -EFAULT; | ||
165 | } | ||
166 | |||
167 | return 0; | ||
168 | } | ||
169 | |||
170 | static int regwindow64_set(struct task_struct *target, | ||
171 | const struct pt_regs *regs, | ||
172 | struct reg_window *wbuf) | ||
173 | { | ||
174 | unsigned long rw_addr = regs->u_regs[UREG_I6]; | ||
175 | |||
176 | if (test_tsk_thread_flag(current, TIF_32BIT)) { | ||
177 | struct reg_window32 win32; | ||
178 | int i; | ||
179 | |||
180 | for (i = 0; i < 8; i++) | ||
181 | win32.locals[i] = wbuf->locals[i]; | ||
182 | for (i = 0; i < 8; i++) | ||
183 | win32.ins[i] = wbuf->ins[i]; | ||
184 | |||
185 | if (set_to_target(target, rw_addr, &win32, sizeof(win32))) | ||
186 | return -EFAULT; | ||
187 | } else { | ||
188 | rw_addr += STACK_BIAS; | ||
189 | if (set_to_target(target, rw_addr, wbuf, sizeof(*wbuf))) | ||
190 | return -EFAULT; | ||
191 | } | ||
192 | |||
193 | return 0; | ||
194 | } | ||
195 | |||
117 | enum sparc_regset { | 196 | enum sparc_regset { |
118 | REGSET_GENERAL, | 197 | REGSET_GENERAL, |
119 | REGSET_FP, | 198 | REGSET_FP, |
@@ -133,16 +212,13 @@ static int genregs64_get(struct task_struct *target, | |||
133 | ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, | 212 | ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, |
134 | regs->u_regs, | 213 | regs->u_regs, |
135 | 0, 16 * sizeof(u64)); | 214 | 0, 16 * sizeof(u64)); |
136 | if (!ret) { | 215 | if (!ret && count && pos < (32 * sizeof(u64))) { |
137 | unsigned long __user *reg_window = (unsigned long __user *) | 216 | struct reg_window window; |
138 | (regs->u_regs[UREG_I6] + STACK_BIAS); | ||
139 | unsigned long window[16]; | ||
140 | 217 | ||
141 | if (copy_from_user(window, reg_window, sizeof(window))) | 218 | if (regwindow64_get(target, regs, &window)) |
142 | return -EFAULT; | 219 | return -EFAULT; |
143 | |||
144 | ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, | 220 | ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, |
145 | window, | 221 | &window, |
146 | 16 * sizeof(u64), | 222 | 16 * sizeof(u64), |
147 | 32 * sizeof(u64)); | 223 | 32 * sizeof(u64)); |
148 | } | 224 | } |
@@ -164,10 +240,11 @@ static int genregs64_get(struct task_struct *target, | |||
164 | 36 * sizeof(u64)); | 240 | 36 * sizeof(u64)); |
165 | } | 241 | } |
166 | 242 | ||
167 | if (!ret) | 243 | if (!ret) { |
168 | ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf, | 244 | ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf, |
169 | 36 * sizeof(u64), -1); | 245 | 36 * sizeof(u64), -1); |
170 | 246 | ||
247 | } | ||
171 | return ret; | 248 | return ret; |
172 | } | 249 | } |
173 | 250 | ||
@@ -185,20 +262,19 @@ static int genregs64_set(struct task_struct *target, | |||
185 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 262 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
186 | regs->u_regs, | 263 | regs->u_regs, |
187 | 0, 16 * sizeof(u64)); | 264 | 0, 16 * sizeof(u64)); |
188 | if (!ret && count > 0) { | 265 | if (!ret && count && pos < (32 * sizeof(u64))) { |
189 | unsigned long __user *reg_window = (unsigned long __user *) | 266 | struct reg_window window; |
190 | (regs->u_regs[UREG_I6] + STACK_BIAS); | ||
191 | unsigned long window[16]; | ||
192 | 267 | ||
193 | if (copy_from_user(window, reg_window, sizeof(window))) | 268 | if (regwindow64_get(target, regs, &window)) |
194 | return -EFAULT; | 269 | return -EFAULT; |
195 | 270 | ||
196 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 271 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
197 | window, | 272 | &window, |
198 | 16 * sizeof(u64), | 273 | 16 * sizeof(u64), |
199 | 32 * sizeof(u64)); | 274 | 32 * sizeof(u64)); |
275 | |||
200 | if (!ret && | 276 | if (!ret && |
201 | copy_to_user(reg_window, window, sizeof(window))) | 277 | regwindow64_set(target, regs, &window)) |
202 | return -EFAULT; | 278 | return -EFAULT; |
203 | } | 279 | } |
204 | 280 | ||
@@ -412,9 +488,22 @@ static int genregs32_get(struct task_struct *target, | |||
412 | *k++ = regs->u_regs[pos++]; | 488 | *k++ = regs->u_regs[pos++]; |
413 | 489 | ||
414 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; | 490 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; |
415 | for (; count > 0 && pos < 32; count--) { | 491 | if (target == current) { |
416 | if (get_user(*k++, ®_window[pos++])) | 492 | for (; count > 0 && pos < 32; count--) { |
417 | return -EFAULT; | 493 | if (get_user(*k++, ®_window[pos++])) |
494 | return -EFAULT; | ||
495 | } | ||
496 | } else { | ||
497 | for (; count > 0 && pos < 32; count--) { | ||
498 | if (access_process_vm(target, | ||
499 | (unsigned long) | ||
500 | ®_window[pos], | ||
501 | k, sizeof(*k), 0) | ||
502 | != sizeof(*k)) | ||
503 | return -EFAULT; | ||
504 | k++; | ||
505 | pos++; | ||
506 | } | ||
418 | } | 507 | } |
419 | } else { | 508 | } else { |
420 | for (; count > 0 && pos < 16; count--) { | 509 | for (; count > 0 && pos < 16; count--) { |
@@ -423,10 +512,28 @@ static int genregs32_get(struct task_struct *target, | |||
423 | } | 512 | } |
424 | 513 | ||
425 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; | 514 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; |
426 | for (; count > 0 && pos < 32; count--) { | 515 | if (target == current) { |
427 | if (get_user(reg, ®_window[pos++]) || | 516 | for (; count > 0 && pos < 32; count--) { |
428 | put_user(reg, u++)) | 517 | if (get_user(reg, ®_window[pos++]) || |
429 | return -EFAULT; | 518 | put_user(reg, u++)) |
519 | return -EFAULT; | ||
520 | } | ||
521 | } else { | ||
522 | for (; count > 0 && pos < 32; count--) { | ||
523 | if (access_process_vm(target, | ||
524 | (unsigned long) | ||
525 | ®_window[pos], | ||
526 | ®, sizeof(reg), 0) | ||
527 | != sizeof(reg)) | ||
528 | return -EFAULT; | ||
529 | if (access_process_vm(target, | ||
530 | (unsigned long) u, | ||
531 | ®, sizeof(reg), 1) | ||
532 | != sizeof(reg)) | ||
533 | return -EFAULT; | ||
534 | pos++; | ||
535 | u++; | ||
536 | } | ||
430 | } | 537 | } |
431 | } | 538 | } |
432 | while (count > 0) { | 539 | while (count > 0) { |
@@ -488,9 +595,23 @@ static int genregs32_set(struct task_struct *target, | |||
488 | regs->u_regs[pos++] = *k++; | 595 | regs->u_regs[pos++] = *k++; |
489 | 596 | ||
490 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; | 597 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; |
491 | for (; count > 0 && pos < 32; count--) { | 598 | if (target == current) { |
492 | if (put_user(*k++, ®_window[pos++])) | 599 | for (; count > 0 && pos < 32; count--) { |
493 | return -EFAULT; | 600 | if (put_user(*k++, ®_window[pos++])) |
601 | return -EFAULT; | ||
602 | } | ||
603 | } else { | ||
604 | for (; count > 0 && pos < 32; count--) { | ||
605 | if (access_process_vm(target, | ||
606 | (unsigned long) | ||
607 | ®_window[pos], | ||
608 | (void *) k, | ||
609 | sizeof(*k), 1) | ||
610 | != sizeof(*k)) | ||
611 | return -EFAULT; | ||
612 | k++; | ||
613 | pos++; | ||
614 | } | ||
494 | } | 615 | } |
495 | } else { | 616 | } else { |
496 | for (; count > 0 && pos < 16; count--) { | 617 | for (; count > 0 && pos < 16; count--) { |
@@ -500,10 +621,29 @@ static int genregs32_set(struct task_struct *target, | |||
500 | } | 621 | } |
501 | 622 | ||
502 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; | 623 | reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6]; |
503 | for (; count > 0 && pos < 32; count--) { | 624 | if (target == current) { |
504 | if (get_user(reg, u++) || | 625 | for (; count > 0 && pos < 32; count--) { |
505 | put_user(reg, ®_window[pos++])) | 626 | if (get_user(reg, u++) || |
506 | return -EFAULT; | 627 | put_user(reg, ®_window[pos++])) |
628 | return -EFAULT; | ||
629 | } | ||
630 | } else { | ||
631 | for (; count > 0 && pos < 32; count--) { | ||
632 | if (access_process_vm(target, | ||
633 | (unsigned long) | ||
634 | u, | ||
635 | ®, sizeof(reg), 0) | ||
636 | != sizeof(reg)) | ||
637 | return -EFAULT; | ||
638 | if (access_process_vm(target, | ||
639 | (unsigned long) | ||
640 | ®_window[pos], | ||
641 | ®, sizeof(reg), 1) | ||
642 | != sizeof(reg)) | ||
643 | return -EFAULT; | ||
644 | pos++; | ||
645 | u++; | ||
646 | } | ||
507 | } | 647 | } |
508 | } | 648 | } |
509 | while (count > 0) { | 649 | while (count > 0) { |
@@ -711,7 +851,7 @@ struct compat_fps { | |||
711 | long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | 851 | long compat_arch_ptrace(struct task_struct *child, compat_long_t request, |
712 | compat_ulong_t caddr, compat_ulong_t cdata) | 852 | compat_ulong_t caddr, compat_ulong_t cdata) |
713 | { | 853 | { |
714 | const struct user_regset_view *view = task_user_regset_view(child); | 854 | const struct user_regset_view *view = task_user_regset_view(current); |
715 | compat_ulong_t caddr2 = task_pt_regs(current)->u_regs[UREG_I4]; | 855 | compat_ulong_t caddr2 = task_pt_regs(current)->u_regs[UREG_I4]; |
716 | struct pt_regs32 __user *pregs; | 856 | struct pt_regs32 __user *pregs; |
717 | struct compat_fps __user *fps; | 857 | struct compat_fps __user *fps; |
@@ -819,7 +959,7 @@ struct fps { | |||
819 | 959 | ||
820 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 960 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
821 | { | 961 | { |
822 | const struct user_regset_view *view = task_user_regset_view(child); | 962 | const struct user_regset_view *view = task_user_regset_view(current); |
823 | unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4]; | 963 | unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4]; |
824 | struct pt_regs __user *pregs; | 964 | struct pt_regs __user *pregs; |
825 | struct fps __user *fps; | 965 | struct fps __user *fps; |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 94a9d64208ee..9d51956e8e2f 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
@@ -357,7 +357,7 @@ static int invalid_frame_pointer(void __user *fp, int fplen) | |||
357 | static inline int | 357 | static inline int |
358 | save_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu) | 358 | save_fpu_state(struct pt_regs *regs, __siginfo_fpu_t __user *fpu) |
359 | { | 359 | { |
360 | unsigned long *fpregs = (unsigned long *)(regs+1); | 360 | unsigned long *fpregs = current_thread_info()->fpregs; |
361 | unsigned long fprs; | 361 | unsigned long fprs; |
362 | int err = 0; | 362 | int err = 0; |
363 | 363 | ||
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 45d79ea890ae..5fed98ca0e1f 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c | |||
@@ -65,7 +65,8 @@ __setup("noreplace-paravirt", setup_noreplace_paravirt); | |||
65 | get them easily into strings. */ | 65 | get them easily into strings. */ |
66 | asm("\t.section .rodata, \"a\"\nintelnops: " | 66 | asm("\t.section .rodata, \"a\"\nintelnops: " |
67 | GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6 | 67 | GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6 |
68 | GENERIC_NOP7 GENERIC_NOP8); | 68 | GENERIC_NOP7 GENERIC_NOP8 |
69 | "\t.previous"); | ||
69 | extern const unsigned char intelnops[]; | 70 | extern const unsigned char intelnops[]; |
70 | static const unsigned char *const intel_nops[ASM_NOP_MAX+1] = { | 71 | static const unsigned char *const intel_nops[ASM_NOP_MAX+1] = { |
71 | NULL, | 72 | NULL, |
@@ -83,7 +84,8 @@ static const unsigned char *const intel_nops[ASM_NOP_MAX+1] = { | |||
83 | #ifdef K8_NOP1 | 84 | #ifdef K8_NOP1 |
84 | asm("\t.section .rodata, \"a\"\nk8nops: " | 85 | asm("\t.section .rodata, \"a\"\nk8nops: " |
85 | K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6 | 86 | K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6 |
86 | K8_NOP7 K8_NOP8); | 87 | K8_NOP7 K8_NOP8 |
88 | "\t.previous"); | ||
87 | extern const unsigned char k8nops[]; | 89 | extern const unsigned char k8nops[]; |
88 | static const unsigned char *const k8_nops[ASM_NOP_MAX+1] = { | 90 | static const unsigned char *const k8_nops[ASM_NOP_MAX+1] = { |
89 | NULL, | 91 | NULL, |
@@ -101,7 +103,8 @@ static const unsigned char *const k8_nops[ASM_NOP_MAX+1] = { | |||
101 | #ifdef K7_NOP1 | 103 | #ifdef K7_NOP1 |
102 | asm("\t.section .rodata, \"a\"\nk7nops: " | 104 | asm("\t.section .rodata, \"a\"\nk7nops: " |
103 | K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6 | 105 | K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6 |
104 | K7_NOP7 K7_NOP8); | 106 | K7_NOP7 K7_NOP8 |
107 | "\t.previous"); | ||
105 | extern const unsigned char k7nops[]; | 108 | extern const unsigned char k7nops[]; |
106 | static const unsigned char *const k7_nops[ASM_NOP_MAX+1] = { | 109 | static const unsigned char *const k7_nops[ASM_NOP_MAX+1] = { |
107 | NULL, | 110 | NULL, |
@@ -119,7 +122,8 @@ static const unsigned char *const k7_nops[ASM_NOP_MAX+1] = { | |||
119 | #ifdef P6_NOP1 | 122 | #ifdef P6_NOP1 |
120 | asm("\t.section .rodata, \"a\"\np6nops: " | 123 | asm("\t.section .rodata, \"a\"\np6nops: " |
121 | P6_NOP1 P6_NOP2 P6_NOP3 P6_NOP4 P6_NOP5 P6_NOP6 | 124 | P6_NOP1 P6_NOP2 P6_NOP3 P6_NOP4 P6_NOP5 P6_NOP6 |
122 | P6_NOP7 P6_NOP8); | 125 | P6_NOP7 P6_NOP8 |
126 | "\t.previous"); | ||
123 | extern const unsigned char p6nops[]; | 127 | extern const unsigned char p6nops[]; |
124 | static const unsigned char *const p6_nops[ASM_NOP_MAX+1] = { | 128 | static const unsigned char *const p6_nops[ASM_NOP_MAX+1] = { |
125 | NULL, | 129 | NULL, |
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 027e5c003b16..170d2f5523b2 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
@@ -143,14 +143,6 @@ static void __init check_config(void) | |||
143 | #endif | 143 | #endif |
144 | 144 | ||
145 | /* | 145 | /* |
146 | * If we configured ourselves for a TSC, we'd better have one! | ||
147 | */ | ||
148 | #ifdef CONFIG_X86_TSC | ||
149 | if (!cpu_has_tsc) | ||
150 | panic("Kernel compiled for Pentium+, requires TSC feature!"); | ||
151 | #endif | ||
152 | |||
153 | /* | ||
154 | * If we were told we had a good local APIC, check for buggy Pentia, | 146 | * If we were told we had a good local APIC, check for buggy Pentia, |
155 | * i.e. all B steppings and the C2 stepping of P54C when using their | 147 | * i.e. all B steppings and the C2 stepping of P54C when using their |
156 | * integrated APIC (see 11AP erratum in "Pentium Processor | 148 | * integrated APIC (see 11AP erratum in "Pentium Processor |
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c index 9b838324b818..b943e10ad814 100644 --- a/arch/x86/kernel/cpu/perfctr-watchdog.c +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c | |||
@@ -652,9 +652,6 @@ static void probe_nmi_watchdog(void) | |||
652 | wd_ops = &p6_wd_ops; | 652 | wd_ops = &p6_wd_ops; |
653 | break; | 653 | break; |
654 | case 15: | 654 | case 15: |
655 | if (boot_cpu_data.x86_model > 0x4) | ||
656 | return; | ||
657 | |||
658 | wd_ops = &p4_wd_ops; | 655 | wd_ops = &p4_wd_ops; |
659 | break; | 656 | break; |
660 | default: | 657 | default: |
@@ -670,8 +667,10 @@ int lapic_watchdog_init(unsigned nmi_hz) | |||
670 | { | 667 | { |
671 | if (!wd_ops) { | 668 | if (!wd_ops) { |
672 | probe_nmi_watchdog(); | 669 | probe_nmi_watchdog(); |
673 | if (!wd_ops) | 670 | if (!wd_ops) { |
671 | printk(KERN_INFO "NMI watchdog: CPU not supported\n"); | ||
674 | return -1; | 672 | return -1; |
673 | } | ||
675 | 674 | ||
676 | if (!wd_ops->reserve()) { | 675 | if (!wd_ops->reserve()) { |
677 | printk(KERN_ERR | 676 | printk(KERN_ERR |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 235fd6c77504..36652ea1a265 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -133,13 +133,16 @@ static void hpet_reserve_platform_timers(unsigned long id) | |||
133 | #ifdef CONFIG_HPET_EMULATE_RTC | 133 | #ifdef CONFIG_HPET_EMULATE_RTC |
134 | hpet_reserve_timer(&hd, 1); | 134 | hpet_reserve_timer(&hd, 1); |
135 | #endif | 135 | #endif |
136 | |||
136 | hd.hd_irq[0] = HPET_LEGACY_8254; | 137 | hd.hd_irq[0] = HPET_LEGACY_8254; |
137 | hd.hd_irq[1] = HPET_LEGACY_RTC; | 138 | hd.hd_irq[1] = HPET_LEGACY_RTC; |
138 | 139 | ||
139 | for (i = 2; i < nrtimers; timer++, i++) | 140 | for (i = 2; i < nrtimers; timer++, i++) |
140 | hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >> | 141 | hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >> |
141 | Tn_INT_ROUTE_CNF_SHIFT; | 142 | Tn_INT_ROUTE_CNF_SHIFT; |
143 | |||
142 | hpet_alloc(&hd); | 144 | hpet_alloc(&hd); |
145 | |||
143 | } | 146 | } |
144 | #else | 147 | #else |
145 | static void hpet_reserve_platform_timers(unsigned long id) { } | 148 | static void hpet_reserve_platform_timers(unsigned long id) { } |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index faf3229f8fb3..700e4647dd30 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
@@ -615,8 +615,8 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
615 | 615 | ||
616 | nommu: | 616 | nommu: |
617 | /* Should not happen anymore */ | 617 | /* Should not happen anymore */ |
618 | printk(KERN_ERR "PCI-DMA: More than 4GB of RAM and no IOMMU\n" | 618 | printk(KERN_WARNING "PCI-DMA: More than 4GB of RAM and no IOMMU\n" |
619 | KERN_ERR "PCI-DMA: 32bit PCI IO may malfunction.\n"); | 619 | KERN_WARNING "falling back to iommu=soft.\n"); |
620 | return -1; | 620 | return -1; |
621 | } | 621 | } |
622 | 622 | ||
@@ -692,9 +692,9 @@ void __init gart_iommu_init(void) | |||
692 | !gart_iommu_aperture || | 692 | !gart_iommu_aperture || |
693 | (no_agp && init_k8_gatt(&info) < 0)) { | 693 | (no_agp && init_k8_gatt(&info) < 0)) { |
694 | if (end_pfn > MAX_DMA32_PFN) { | 694 | if (end_pfn > MAX_DMA32_PFN) { |
695 | printk(KERN_ERR "WARNING more than 4GB of memory " | 695 | printk(KERN_WARNING "More than 4GB of memory " |
696 | "but GART IOMMU not available.\n" | 696 | "but GART IOMMU not available.\n" |
697 | KERN_ERR "WARNING 32bit PCI may malfunction.\n"); | 697 | KERN_WARNING "falling back to iommu=soft.\n"); |
698 | } | 698 | } |
699 | return; | 699 | return; |
700 | } | 700 | } |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index be3c7a299f02..43930e73f657 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -82,7 +82,6 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
82 | */ | 82 | */ |
83 | void (*pm_idle)(void); | 83 | void (*pm_idle)(void); |
84 | EXPORT_SYMBOL(pm_idle); | 84 | EXPORT_SYMBOL(pm_idle); |
85 | static DEFINE_PER_CPU(unsigned int, cpu_idle_state); | ||
86 | 85 | ||
87 | void disable_hlt(void) | 86 | void disable_hlt(void) |
88 | { | 87 | { |
@@ -190,9 +189,6 @@ void cpu_idle(void) | |||
190 | while (!need_resched()) { | 189 | while (!need_resched()) { |
191 | void (*idle)(void); | 190 | void (*idle)(void); |
192 | 191 | ||
193 | if (__get_cpu_var(cpu_idle_state)) | ||
194 | __get_cpu_var(cpu_idle_state) = 0; | ||
195 | |||
196 | check_pgt_cache(); | 192 | check_pgt_cache(); |
197 | rmb(); | 193 | rmb(); |
198 | idle = pm_idle; | 194 | idle = pm_idle; |
@@ -220,40 +216,19 @@ static void do_nothing(void *unused) | |||
220 | { | 216 | { |
221 | } | 217 | } |
222 | 218 | ||
219 | /* | ||
220 | * cpu_idle_wait - Used to ensure that all the CPUs discard old value of | ||
221 | * pm_idle and update to new pm_idle value. Required while changing pm_idle | ||
222 | * handler on SMP systems. | ||
223 | * | ||
224 | * Caller must have changed pm_idle to the new value before the call. Old | ||
225 | * pm_idle value will not be used by any CPU after the return of this function. | ||
226 | */ | ||
223 | void cpu_idle_wait(void) | 227 | void cpu_idle_wait(void) |
224 | { | 228 | { |
225 | unsigned int cpu, this_cpu = get_cpu(); | 229 | smp_mb(); |
226 | cpumask_t map, tmp = current->cpus_allowed; | 230 | /* kick all the CPUs so that they exit out of pm_idle */ |
227 | 231 | smp_call_function(do_nothing, NULL, 0, 1); | |
228 | set_cpus_allowed(current, cpumask_of_cpu(this_cpu)); | ||
229 | put_cpu(); | ||
230 | |||
231 | cpus_clear(map); | ||
232 | for_each_online_cpu(cpu) { | ||
233 | per_cpu(cpu_idle_state, cpu) = 1; | ||
234 | cpu_set(cpu, map); | ||
235 | } | ||
236 | |||
237 | __get_cpu_var(cpu_idle_state) = 0; | ||
238 | |||
239 | wmb(); | ||
240 | do { | ||
241 | ssleep(1); | ||
242 | for_each_online_cpu(cpu) { | ||
243 | if (cpu_isset(cpu, map) && !per_cpu(cpu_idle_state, cpu)) | ||
244 | cpu_clear(cpu, map); | ||
245 | } | ||
246 | cpus_and(map, map, cpu_online_map); | ||
247 | /* | ||
248 | * We waited 1 sec, if a CPU still did not call idle | ||
249 | * it may be because it is in idle and not waking up | ||
250 | * because it has nothing to do. | ||
251 | * Give all the remaining CPUS a kick. | ||
252 | */ | ||
253 | smp_call_function_mask(map, do_nothing, NULL, 0); | ||
254 | } while (!cpus_empty(map)); | ||
255 | |||
256 | set_cpus_allowed(current, tmp); | ||
257 | } | 232 | } |
258 | EXPORT_SYMBOL_GPL(cpu_idle_wait); | 233 | EXPORT_SYMBOL_GPL(cpu_idle_wait); |
259 | 234 | ||
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 3baf9b9f4c87..46c4c546b499 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -63,7 +63,6 @@ EXPORT_SYMBOL(boot_option_idle_override); | |||
63 | */ | 63 | */ |
64 | void (*pm_idle)(void); | 64 | void (*pm_idle)(void); |
65 | EXPORT_SYMBOL(pm_idle); | 65 | EXPORT_SYMBOL(pm_idle); |
66 | static DEFINE_PER_CPU(unsigned int, cpu_idle_state); | ||
67 | 66 | ||
68 | static ATOMIC_NOTIFIER_HEAD(idle_notifier); | 67 | static ATOMIC_NOTIFIER_HEAD(idle_notifier); |
69 | 68 | ||
@@ -173,9 +172,6 @@ void cpu_idle(void) | |||
173 | while (!need_resched()) { | 172 | while (!need_resched()) { |
174 | void (*idle)(void); | 173 | void (*idle)(void); |
175 | 174 | ||
176 | if (__get_cpu_var(cpu_idle_state)) | ||
177 | __get_cpu_var(cpu_idle_state) = 0; | ||
178 | |||
179 | rmb(); | 175 | rmb(); |
180 | idle = pm_idle; | 176 | idle = pm_idle; |
181 | if (!idle) | 177 | if (!idle) |
@@ -207,40 +203,19 @@ static void do_nothing(void *unused) | |||
207 | { | 203 | { |
208 | } | 204 | } |
209 | 205 | ||
206 | /* | ||
207 | * cpu_idle_wait - Used to ensure that all the CPUs discard old value of | ||
208 | * pm_idle and update to new pm_idle value. Required while changing pm_idle | ||
209 | * handler on SMP systems. | ||
210 | * | ||
211 | * Caller must have changed pm_idle to the new value before the call. Old | ||
212 | * pm_idle value will not be used by any CPU after the return of this function. | ||
213 | */ | ||
210 | void cpu_idle_wait(void) | 214 | void cpu_idle_wait(void) |
211 | { | 215 | { |
212 | unsigned int cpu, this_cpu = get_cpu(); | 216 | smp_mb(); |
213 | cpumask_t map, tmp = current->cpus_allowed; | 217 | /* kick all the CPUs so that they exit out of pm_idle */ |
214 | 218 | smp_call_function(do_nothing, NULL, 0, 1); | |
215 | set_cpus_allowed(current, cpumask_of_cpu(this_cpu)); | ||
216 | put_cpu(); | ||
217 | |||
218 | cpus_clear(map); | ||
219 | for_each_online_cpu(cpu) { | ||
220 | per_cpu(cpu_idle_state, cpu) = 1; | ||
221 | cpu_set(cpu, map); | ||
222 | } | ||
223 | |||
224 | __get_cpu_var(cpu_idle_state) = 0; | ||
225 | |||
226 | wmb(); | ||
227 | do { | ||
228 | ssleep(1); | ||
229 | for_each_online_cpu(cpu) { | ||
230 | if (cpu_isset(cpu, map) && !per_cpu(cpu_idle_state, cpu)) | ||
231 | cpu_clear(cpu, map); | ||
232 | } | ||
233 | cpus_and(map, map, cpu_online_map); | ||
234 | /* | ||
235 | * We waited 1 sec, if a CPU still did not call idle | ||
236 | * it may be because it is in idle and not waking up | ||
237 | * because it has nothing to do. | ||
238 | * Give all the remaining CPUS a kick. | ||
239 | */ | ||
240 | smp_call_function_mask(map, do_nothing, 0, 0); | ||
241 | } while (!cpus_empty(map)); | ||
242 | |||
243 | set_cpus_allowed(current, tmp); | ||
244 | } | 219 | } |
245 | EXPORT_SYMBOL_GPL(cpu_idle_wait); | 220 | EXPORT_SYMBOL_GPL(cpu_idle_wait); |
246 | 221 | ||
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c index 022bcaa3b42e..ab6bf375a307 100644 --- a/arch/x86/kernel/tls.c +++ b/arch/x86/kernel/tls.c | |||
@@ -92,7 +92,7 @@ int do_set_thread_area(struct task_struct *p, int idx, | |||
92 | asmlinkage int sys_set_thread_area(struct user_desc __user *u_info) | 92 | asmlinkage int sys_set_thread_area(struct user_desc __user *u_info) |
93 | { | 93 | { |
94 | int ret = do_set_thread_area(current, -1, u_info, 1); | 94 | int ret = do_set_thread_area(current, -1, u_info, 1); |
95 | prevent_tail_call(ret); | 95 | asmlinkage_protect(1, ret, u_info); |
96 | return ret; | 96 | return ret; |
97 | } | 97 | } |
98 | 98 | ||
@@ -142,7 +142,7 @@ int do_get_thread_area(struct task_struct *p, int idx, | |||
142 | asmlinkage int sys_get_thread_area(struct user_desc __user *u_info) | 142 | asmlinkage int sys_get_thread_area(struct user_desc __user *u_info) |
143 | { | 143 | { |
144 | int ret = do_get_thread_area(current, -1, u_info); | 144 | int ret = do_get_thread_area(current, -1, u_info); |
145 | prevent_tail_call(ret); | 145 | asmlinkage_protect(1, ret, u_info); |
146 | return ret; | 146 | return ret; |
147 | } | 147 | } |
148 | 148 | ||
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index f14cfd9d1f94..c2241e04ea5f 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
@@ -256,9 +256,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data) | |||
256 | ref_freq, freq->new); | 256 | ref_freq, freq->new); |
257 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { | 257 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { |
258 | tsc_khz = cpu_khz; | 258 | tsc_khz = cpu_khz; |
259 | preempt_disable(); | 259 | set_cyc2ns_scale(cpu_khz, freq->cpu); |
260 | set_cyc2ns_scale(cpu_khz, smp_processor_id()); | ||
261 | preempt_enable(); | ||
262 | /* | 260 | /* |
263 | * TSC based sched_clock turns | 261 | * TSC based sched_clock turns |
264 | * to junk w/ cpufreq | 262 | * to junk w/ cpufreq |
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c index 947554ddabb6..d3bebaaad842 100644 --- a/arch/x86/kernel/tsc_64.c +++ b/arch/x86/kernel/tsc_64.c | |||
@@ -148,9 +148,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, | |||
148 | mark_tsc_unstable("cpufreq changes"); | 148 | mark_tsc_unstable("cpufreq changes"); |
149 | } | 149 | } |
150 | 150 | ||
151 | preempt_disable(); | 151 | set_cyc2ns_scale(tsc_khz_ref, freq->cpu); |
152 | set_cyc2ns_scale(tsc_khz_ref, smp_processor_id()); | ||
153 | preempt_enable(); | ||
154 | 152 | ||
155 | return 0; | 153 | return 0; |
156 | } | 154 | } |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index de4e6f05840b..27ee26aedf94 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -667,10 +667,10 @@ static void xen_release_pt_init(u32 pfn) | |||
667 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | 667 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); |
668 | } | 668 | } |
669 | 669 | ||
670 | static void pin_pagetable_pfn(unsigned level, unsigned long pfn) | 670 | static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn) |
671 | { | 671 | { |
672 | struct mmuext_op op; | 672 | struct mmuext_op op; |
673 | op.cmd = level; | 673 | op.cmd = cmd; |
674 | op.arg1.mfn = pfn_to_mfn(pfn); | 674 | op.arg1.mfn = pfn_to_mfn(pfn); |
675 | if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF)) | 675 | if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF)) |
676 | BUG(); | 676 | BUG(); |
@@ -687,7 +687,8 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level) | |||
687 | 687 | ||
688 | if (!PageHighMem(page)) { | 688 | if (!PageHighMem(page)) { |
689 | make_lowmem_page_readonly(__va(PFN_PHYS(pfn))); | 689 | make_lowmem_page_readonly(__va(PFN_PHYS(pfn))); |
690 | pin_pagetable_pfn(level, pfn); | 690 | if (level == PT_PTE) |
691 | pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn); | ||
691 | } else | 692 | } else |
692 | /* make sure there are no stray mappings of | 693 | /* make sure there are no stray mappings of |
693 | this page */ | 694 | this page */ |
@@ -697,27 +698,39 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level) | |||
697 | 698 | ||
698 | static void xen_alloc_pt(struct mm_struct *mm, u32 pfn) | 699 | static void xen_alloc_pt(struct mm_struct *mm, u32 pfn) |
699 | { | 700 | { |
700 | xen_alloc_ptpage(mm, pfn, MMUEXT_PIN_L1_TABLE); | 701 | xen_alloc_ptpage(mm, pfn, PT_PTE); |
701 | } | 702 | } |
702 | 703 | ||
703 | static void xen_alloc_pd(struct mm_struct *mm, u32 pfn) | 704 | static void xen_alloc_pd(struct mm_struct *mm, u32 pfn) |
704 | { | 705 | { |
705 | xen_alloc_ptpage(mm, pfn, MMUEXT_PIN_L2_TABLE); | 706 | xen_alloc_ptpage(mm, pfn, PT_PMD); |
706 | } | 707 | } |
707 | 708 | ||
708 | /* This should never happen until we're OK to use struct page */ | 709 | /* This should never happen until we're OK to use struct page */ |
709 | static void xen_release_pt(u32 pfn) | 710 | static void xen_release_ptpage(u32 pfn, unsigned level) |
710 | { | 711 | { |
711 | struct page *page = pfn_to_page(pfn); | 712 | struct page *page = pfn_to_page(pfn); |
712 | 713 | ||
713 | if (PagePinned(page)) { | 714 | if (PagePinned(page)) { |
714 | if (!PageHighMem(page)) { | 715 | if (!PageHighMem(page)) { |
715 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn); | 716 | if (level == PT_PTE) |
717 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn); | ||
716 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | 718 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); |
717 | } | 719 | } |
720 | ClearPagePinned(page); | ||
718 | } | 721 | } |
719 | } | 722 | } |
720 | 723 | ||
724 | static void xen_release_pt(u32 pfn) | ||
725 | { | ||
726 | xen_release_ptpage(pfn, PT_PTE); | ||
727 | } | ||
728 | |||
729 | static void xen_release_pd(u32 pfn) | ||
730 | { | ||
731 | xen_release_ptpage(pfn, PT_PMD); | ||
732 | } | ||
733 | |||
721 | #ifdef CONFIG_HIGHPTE | 734 | #ifdef CONFIG_HIGHPTE |
722 | static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) | 735 | static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) |
723 | { | 736 | { |
@@ -838,7 +851,7 @@ static __init void xen_pagetable_setup_done(pgd_t *base) | |||
838 | pv_mmu_ops.alloc_pt = xen_alloc_pt; | 851 | pv_mmu_ops.alloc_pt = xen_alloc_pt; |
839 | pv_mmu_ops.alloc_pd = xen_alloc_pd; | 852 | pv_mmu_ops.alloc_pd = xen_alloc_pd; |
840 | pv_mmu_ops.release_pt = xen_release_pt; | 853 | pv_mmu_ops.release_pt = xen_release_pt; |
841 | pv_mmu_ops.release_pd = xen_release_pt; | 854 | pv_mmu_ops.release_pd = xen_release_pd; |
842 | pv_mmu_ops.set_pte = xen_set_pte; | 855 | pv_mmu_ops.set_pte = xen_set_pte; |
843 | 856 | ||
844 | setup_shared_info(); | 857 | setup_shared_info(); |
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 0144395448ae..2a054ef2a3da 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -310,13 +310,6 @@ pgd_t xen_make_pgd(unsigned long pgd) | |||
310 | } | 310 | } |
311 | #endif /* CONFIG_X86_PAE */ | 311 | #endif /* CONFIG_X86_PAE */ |
312 | 312 | ||
313 | enum pt_level { | ||
314 | PT_PGD, | ||
315 | PT_PUD, | ||
316 | PT_PMD, | ||
317 | PT_PTE | ||
318 | }; | ||
319 | |||
320 | /* | 313 | /* |
321 | (Yet another) pagetable walker. This one is intended for pinning a | 314 | (Yet another) pagetable walker. This one is intended for pinning a |
322 | pagetable. This means that it walks a pagetable and calls the | 315 | pagetable. This means that it walks a pagetable and calls the |
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index c9ff27f3ac3a..b5e189b1519d 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
@@ -3,6 +3,13 @@ | |||
3 | #include <linux/linkage.h> | 3 | #include <linux/linkage.h> |
4 | #include <asm/page.h> | 4 | #include <asm/page.h> |
5 | 5 | ||
6 | enum pt_level { | ||
7 | PT_PGD, | ||
8 | PT_PUD, | ||
9 | PT_PMD, | ||
10 | PT_PTE | ||
11 | }; | ||
12 | |||
6 | /* | 13 | /* |
7 | * Page-directory addresses above 4GB do not fit into architectural %cr3. | 14 | * Page-directory addresses above 4GB do not fit into architectural %cr3. |
8 | * When accessing %cr3, or equivalent field in vcpu_guest_context, guests | 15 | * When accessing %cr3, or equivalent field in vcpu_guest_context, guests |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index f26da2bfcc15..f4e1006c253d 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1214,6 +1214,8 @@ static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq) | |||
1214 | static void __cfq_exit_single_io_context(struct cfq_data *cfqd, | 1214 | static void __cfq_exit_single_io_context(struct cfq_data *cfqd, |
1215 | struct cfq_io_context *cic) | 1215 | struct cfq_io_context *cic) |
1216 | { | 1216 | { |
1217 | struct io_context *ioc = cic->ioc; | ||
1218 | |||
1217 | list_del_init(&cic->queue_list); | 1219 | list_del_init(&cic->queue_list); |
1218 | 1220 | ||
1219 | /* | 1221 | /* |
@@ -1223,6 +1225,9 @@ static void __cfq_exit_single_io_context(struct cfq_data *cfqd, | |||
1223 | cic->dead_key = (unsigned long) cic->key; | 1225 | cic->dead_key = (unsigned long) cic->key; |
1224 | cic->key = NULL; | 1226 | cic->key = NULL; |
1225 | 1227 | ||
1228 | if (ioc->ioc_data == cic) | ||
1229 | rcu_assign_pointer(ioc->ioc_data, NULL); | ||
1230 | |||
1226 | if (cic->cfqq[ASYNC]) { | 1231 | if (cic->cfqq[ASYNC]) { |
1227 | cfq_exit_cfqq(cfqd, cic->cfqq[ASYNC]); | 1232 | cfq_exit_cfqq(cfqd, cic->cfqq[ASYNC]); |
1228 | cic->cfqq[ASYNC] = NULL; | 1233 | cic->cfqq[ASYNC] = NULL; |
@@ -1255,7 +1260,6 @@ static void cfq_exit_single_io_context(struct io_context *ioc, | |||
1255 | */ | 1260 | */ |
1256 | static void cfq_exit_io_context(struct io_context *ioc) | 1261 | static void cfq_exit_io_context(struct io_context *ioc) |
1257 | { | 1262 | { |
1258 | rcu_assign_pointer(ioc->ioc_data, NULL); | ||
1259 | call_for_each_cic(ioc, cfq_exit_single_io_context); | 1263 | call_for_each_cic(ioc, cfq_exit_single_io_context); |
1260 | } | 1264 | } |
1261 | 1265 | ||
@@ -1478,8 +1482,7 @@ cfq_drop_dead_cic(struct cfq_data *cfqd, struct io_context *ioc, | |||
1478 | 1482 | ||
1479 | spin_lock_irqsave(&ioc->lock, flags); | 1483 | spin_lock_irqsave(&ioc->lock, flags); |
1480 | 1484 | ||
1481 | if (ioc->ioc_data == cic) | 1485 | BUG_ON(ioc->ioc_data == cic); |
1482 | rcu_assign_pointer(ioc->ioc_data, NULL); | ||
1483 | 1486 | ||
1484 | radix_tree_delete(&ioc->radix_root, (unsigned long) cfqd); | 1487 | radix_tree_delete(&ioc->radix_root, (unsigned long) cfqd); |
1485 | hlist_del_rcu(&cic->cic_list); | 1488 | hlist_del_rcu(&cic->cic_list); |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 36a68fa114e3..a825b431b64f 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -822,7 +822,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type) | |||
822 | } | 822 | } |
823 | 823 | ||
824 | processors[pr->id] = NULL; | 824 | processors[pr->id] = NULL; |
825 | 825 | processor_device_array[pr->id] = NULL; | |
826 | kfree(pr); | 826 | kfree(pr); |
827 | 827 | ||
828 | return 0; | 828 | return 0; |
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index c4e00ac8ea85..1bcecc7dd2ca 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) | |||
1125 | tz->trips.active[i].flags.valid; i++, trips++); | 1125 | tz->trips.active[i].flags.valid; i++, trips++); |
1126 | tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone", | 1126 | tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone", |
1127 | trips, tz, &acpi_thermal_zone_ops); | 1127 | trips, tz, &acpi_thermal_zone_ops); |
1128 | if (!tz->thermal_zone) | 1128 | if (IS_ERR(tz->thermal_zone)) |
1129 | return -ENODEV; | 1129 | return -ENODEV; |
1130 | 1130 | ||
1131 | result = sysfs_create_link(&tz->device->dev.kobj, | 1131 | result = sysfs_create_link(&tz->device->dev.kobj, |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 12fb44f16766..980a74188781 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) | |||
713 | 713 | ||
714 | kfree(obj); | 714 | kfree(obj); |
715 | 715 | ||
716 | if (device->cap._BCL && device->cap._BCM && max_level > 0) { | 716 | if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){ |
717 | int result; | 717 | int result; |
718 | static int count = 0; | 718 | static int count = 0; |
719 | char *name; | 719 | char *name; |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 48519887f94a..be95fdb69726 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -326,6 +326,44 @@ static void ata_force_horkage(struct ata_device *dev) | |||
326 | } | 326 | } |
327 | 327 | ||
328 | /** | 328 | /** |
329 | * atapi_cmd_type - Determine ATAPI command type from SCSI opcode | ||
330 | * @opcode: SCSI opcode | ||
331 | * | ||
332 | * Determine ATAPI command type from @opcode. | ||
333 | * | ||
334 | * LOCKING: | ||
335 | * None. | ||
336 | * | ||
337 | * RETURNS: | ||
338 | * ATAPI_{READ|WRITE|READ_CD|PASS_THRU|MISC} | ||
339 | */ | ||
340 | int atapi_cmd_type(u8 opcode) | ||
341 | { | ||
342 | switch (opcode) { | ||
343 | case GPCMD_READ_10: | ||
344 | case GPCMD_READ_12: | ||
345 | return ATAPI_READ; | ||
346 | |||
347 | case GPCMD_WRITE_10: | ||
348 | case GPCMD_WRITE_12: | ||
349 | case GPCMD_WRITE_AND_VERIFY_10: | ||
350 | return ATAPI_WRITE; | ||
351 | |||
352 | case GPCMD_READ_CD: | ||
353 | case GPCMD_READ_CD_MSF: | ||
354 | return ATAPI_READ_CD; | ||
355 | |||
356 | case ATA_16: | ||
357 | case ATA_12: | ||
358 | if (atapi_passthru16) | ||
359 | return ATAPI_PASS_THRU; | ||
360 | /* fall thru */ | ||
361 | default: | ||
362 | return ATAPI_MISC; | ||
363 | } | ||
364 | } | ||
365 | |||
366 | /** | ||
329 | * ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure | 367 | * ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure |
330 | * @tf: Taskfile to convert | 368 | * @tf: Taskfile to convert |
331 | * @pmp: Port multiplier port | 369 | * @pmp: Port multiplier port |
@@ -2660,7 +2698,7 @@ int ata_bus_probe(struct ata_port *ap) | |||
2660 | specific sequence bass-ackwards so that PDIAG- is released by | 2698 | specific sequence bass-ackwards so that PDIAG- is released by |
2661 | the slave device */ | 2699 | the slave device */ |
2662 | 2700 | ||
2663 | ata_link_for_each_dev(dev, &ap->link) { | 2701 | ata_link_for_each_dev_reverse(dev, &ap->link) { |
2664 | if (tries[dev->devno]) | 2702 | if (tries[dev->devno]) |
2665 | dev->class = classes[dev->devno]; | 2703 | dev->class = classes[dev->devno]; |
2666 | 2704 | ||
@@ -7774,6 +7812,7 @@ EXPORT_SYMBOL_GPL(ata_tf_read); | |||
7774 | EXPORT_SYMBOL_GPL(ata_noop_dev_select); | 7812 | EXPORT_SYMBOL_GPL(ata_noop_dev_select); |
7775 | EXPORT_SYMBOL_GPL(ata_std_dev_select); | 7813 | EXPORT_SYMBOL_GPL(ata_std_dev_select); |
7776 | EXPORT_SYMBOL_GPL(sata_print_link_status); | 7814 | EXPORT_SYMBOL_GPL(sata_print_link_status); |
7815 | EXPORT_SYMBOL_GPL(atapi_cmd_type); | ||
7777 | EXPORT_SYMBOL_GPL(ata_tf_to_fis); | 7816 | EXPORT_SYMBOL_GPL(ata_tf_to_fis); |
7778 | EXPORT_SYMBOL_GPL(ata_tf_from_fis); | 7817 | EXPORT_SYMBOL_GPL(ata_tf_from_fis); |
7779 | EXPORT_SYMBOL_GPL(ata_pack_xfermask); | 7818 | EXPORT_SYMBOL_GPL(ata_pack_xfermask); |
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 8786455c901d..511a830b6256 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -36,6 +36,10 @@ | |||
36 | #define DRV_NAME "pata_ali" | 36 | #define DRV_NAME "pata_ali" |
37 | #define DRV_VERSION "0.7.5" | 37 | #define DRV_VERSION "0.7.5" |
38 | 38 | ||
39 | static int ali_atapi_dma = 0; | ||
40 | module_param_named(atapi_dma, ali_atapi_dma, int, 0644); | ||
41 | MODULE_PARM_DESC(atapi_dma, "Enable ATAPI DMA (0=disable, 1=enable)"); | ||
42 | |||
39 | /* | 43 | /* |
40 | * Cable special cases | 44 | * Cable special cases |
41 | */ | 45 | */ |
@@ -270,6 +274,27 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
270 | } | 274 | } |
271 | 275 | ||
272 | /** | 276 | /** |
277 | * ali_warn_atapi_dma - Warn about ATAPI DMA disablement | ||
278 | * @adev: Device | ||
279 | * | ||
280 | * Whine about ATAPI DMA disablement if @adev is an ATAPI device. | ||
281 | * Can be used as ->dev_config. | ||
282 | */ | ||
283 | |||
284 | static void ali_warn_atapi_dma(struct ata_device *adev) | ||
285 | { | ||
286 | struct ata_eh_context *ehc = &adev->link->eh_context; | ||
287 | int print_info = ehc->i.flags & ATA_EHI_PRINTINFO; | ||
288 | |||
289 | if (print_info && adev->class == ATA_DEV_ATAPI && !ali_atapi_dma) { | ||
290 | ata_dev_printk(adev, KERN_WARNING, | ||
291 | "WARNING: ATAPI DMA disabled for reliablity issues. It can be enabled\n"); | ||
292 | ata_dev_printk(adev, KERN_WARNING, | ||
293 | "WARNING: via pata_ali.atapi_dma modparam or corresponding sysfs node.\n"); | ||
294 | } | ||
295 | } | ||
296 | |||
297 | /** | ||
273 | * ali_lock_sectors - Keep older devices to 255 sector mode | 298 | * ali_lock_sectors - Keep older devices to 255 sector mode |
274 | * @adev: Device | 299 | * @adev: Device |
275 | * | 300 | * |
@@ -283,6 +308,7 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
283 | static void ali_lock_sectors(struct ata_device *adev) | 308 | static void ali_lock_sectors(struct ata_device *adev) |
284 | { | 309 | { |
285 | adev->max_sectors = 255; | 310 | adev->max_sectors = 255; |
311 | ali_warn_atapi_dma(adev); | ||
286 | } | 312 | } |
287 | 313 | ||
288 | /** | 314 | /** |
@@ -294,6 +320,18 @@ static void ali_lock_sectors(struct ata_device *adev) | |||
294 | 320 | ||
295 | static int ali_check_atapi_dma(struct ata_queued_cmd *qc) | 321 | static int ali_check_atapi_dma(struct ata_queued_cmd *qc) |
296 | { | 322 | { |
323 | if (!ali_atapi_dma) { | ||
324 | /* FIXME: pata_ali can't do ATAPI DMA reliably but the | ||
325 | * IDE alim15x3 driver can. I tried lots of things | ||
326 | * but couldn't find what the actual difference was. | ||
327 | * If you got an idea, please write it to | ||
328 | * linux-ide@vger.kernel.org and cc htejun@gmail.com. | ||
329 | * | ||
330 | * Disable ATAPI DMA for now. | ||
331 | */ | ||
332 | return -EOPNOTSUPP; | ||
333 | } | ||
334 | |||
297 | /* If its not a media command, its not worth it */ | 335 | /* If its not a media command, its not worth it */ |
298 | if (atapi_cmd_type(qc->cdb[0]) == ATAPI_MISC) | 336 | if (atapi_cmd_type(qc->cdb[0]) == ATAPI_MISC) |
299 | return -EOPNOTSUPP; | 337 | return -EOPNOTSUPP; |
@@ -359,6 +397,7 @@ static struct ata_port_operations ali_20_port_ops = { | |||
359 | 397 | ||
360 | .tf_load = ata_tf_load, | 398 | .tf_load = ata_tf_load, |
361 | .tf_read = ata_tf_read, | 399 | .tf_read = ata_tf_read, |
400 | .check_atapi_dma = ali_check_atapi_dma, | ||
362 | .check_status = ata_check_status, | 401 | .check_status = ata_check_status, |
363 | .exec_command = ata_exec_command, | 402 | .exec_command = ata_exec_command, |
364 | .dev_select = ata_std_dev_select, | 403 | .dev_select = ata_std_dev_select, |
@@ -438,6 +477,7 @@ static struct ata_port_operations ali_c5_port_ops = { | |||
438 | .check_status = ata_check_status, | 477 | .check_status = ata_check_status, |
439 | .exec_command = ata_exec_command, | 478 | .exec_command = ata_exec_command, |
440 | .dev_select = ata_std_dev_select, | 479 | .dev_select = ata_std_dev_select, |
480 | .dev_config = ali_warn_atapi_dma, | ||
441 | 481 | ||
442 | .freeze = ata_bmdma_freeze, | 482 | .freeze = ata_bmdma_freeze, |
443 | .thaw = ata_bmdma_thaw, | 483 | .thaw = ata_bmdma_thaw, |
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 3988e44f4934..7c5b2dd9a1a1 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -270,7 +270,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio) | |||
270 | tmpbyte & 1, tmpbyte & 0x30); | 270 | tmpbyte & 1, tmpbyte & 0x30); |
271 | 271 | ||
272 | *try_mmio = 0; | 272 | *try_mmio = 0; |
273 | #ifdef CONFIG_PPC | 273 | #ifdef CONFIG_PPC_MERGE |
274 | if (machine_is(cell)) | 274 | if (machine_is(cell)) |
275 | *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); | 275 | *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); |
276 | #endif | 276 | #endif |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 4c1985511548..9d1e3cad4aa9 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -1256,7 +1256,6 @@ static int sata_fsl_probe(struct of_device *ofdev, | |||
1256 | void __iomem *ssr_base = NULL; | 1256 | void __iomem *ssr_base = NULL; |
1257 | void __iomem *csr_base = NULL; | 1257 | void __iomem *csr_base = NULL; |
1258 | struct sata_fsl_host_priv *host_priv = NULL; | 1258 | struct sata_fsl_host_priv *host_priv = NULL; |
1259 | struct resource *r; | ||
1260 | int irq; | 1259 | int irq; |
1261 | struct ata_host *host; | 1260 | struct ata_host *host; |
1262 | 1261 | ||
@@ -1266,8 +1265,6 @@ static int sata_fsl_probe(struct of_device *ofdev, | |||
1266 | dev_printk(KERN_INFO, &ofdev->dev, | 1265 | dev_printk(KERN_INFO, &ofdev->dev, |
1267 | "Sata FSL Platform/CSB Driver init\n"); | 1266 | "Sata FSL Platform/CSB Driver init\n"); |
1268 | 1267 | ||
1269 | r = kmalloc(sizeof(struct resource), GFP_KERNEL); | ||
1270 | |||
1271 | hcr_base = of_iomap(ofdev->node, 0); | 1268 | hcr_base = of_iomap(ofdev->node, 0); |
1272 | if (!hcr_base) | 1269 | if (!hcr_base) |
1273 | goto error_exit_with_cleanup; | 1270 | goto error_exit_with_cleanup; |
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 840d1c4a7850..019e367b59fc 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -531,8 +531,8 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *en | |||
531 | * */ | 531 | * */ |
532 | static const struct pci_device_id k2_sata_pci_tbl[] = { | 532 | static const struct pci_device_id k2_sata_pci_tbl[] = { |
533 | { PCI_VDEVICE(SERVERWORKS, 0x0240), chip_svw4 }, | 533 | { PCI_VDEVICE(SERVERWORKS, 0x0240), chip_svw4 }, |
534 | { PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw4 }, | 534 | { PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw8 }, |
535 | { PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw8 }, | 535 | { PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw4 }, |
536 | { PCI_VDEVICE(SERVERWORKS, 0x024a), chip_svw4 }, | 536 | { PCI_VDEVICE(SERVERWORKS, 0x024a), chip_svw4 }, |
537 | { PCI_VDEVICE(SERVERWORKS, 0x024b), chip_svw4 }, | 537 | { PCI_VDEVICE(SERVERWORKS, 0x024b), chip_svw4 }, |
538 | { PCI_VDEVICE(SERVERWORKS, 0x0410), chip_svw42 }, | 538 | { PCI_VDEVICE(SERVERWORKS, 0x0410), chip_svw42 }, |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 55bd35c0f082..9c9627e8e334 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <scsi/sg.h> | 50 | #include <scsi/sg.h> |
51 | #include <scsi/scsi_ioctl.h> | 51 | #include <scsi/scsi_ioctl.h> |
52 | #include <linux/cdrom.h> | 52 | #include <linux/cdrom.h> |
53 | #include <linux/scatterlist.h> | ||
53 | 54 | ||
54 | #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) | 55 | #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) |
55 | #define DRIVER_NAME "HP CISS Driver (v 3.6.14)" | 56 | #define DRIVER_NAME "HP CISS Driver (v 3.6.14)" |
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index c452e2d355ee..27bfe72aab59 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
@@ -8,6 +8,7 @@ | |||
8 | * and is not licensed separately. See file COPYING for details. | 8 | * and is not licensed separately. See file COPYING for details. |
9 | * | 9 | * |
10 | * TODO (sorted by decreasing priority) | 10 | * TODO (sorted by decreasing priority) |
11 | * -- Return sense now that rq allows it (we always auto-sense anyway). | ||
11 | * -- set readonly flag for CDs, set removable flag for CF readers | 12 | * -- set readonly flag for CDs, set removable flag for CF readers |
12 | * -- do inquiry and verify we got a disk and not a tape (for LUN mismatch) | 13 | * -- do inquiry and verify we got a disk and not a tape (for LUN mismatch) |
13 | * -- verify the 13 conditions and do bulk resets | 14 | * -- verify the 13 conditions and do bulk resets |
@@ -359,7 +360,8 @@ static void ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun, | |||
359 | static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, | 360 | static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, |
360 | struct ub_scsi_cmd *cmd, struct ub_request *urq); | 361 | struct ub_scsi_cmd *cmd, struct ub_request *urq); |
361 | static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd); | 362 | static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd); |
362 | static void ub_end_rq(struct request *rq, unsigned int status); | 363 | static void ub_end_rq(struct request *rq, unsigned int status, |
364 | unsigned int cmd_len); | ||
363 | static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun, | 365 | static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun, |
364 | struct ub_request *urq, struct ub_scsi_cmd *cmd); | 366 | struct ub_request *urq, struct ub_scsi_cmd *cmd); |
365 | static int ub_submit_scsi(struct ub_dev *sc, struct ub_scsi_cmd *cmd); | 367 | static int ub_submit_scsi(struct ub_dev *sc, struct ub_scsi_cmd *cmd); |
@@ -642,13 +644,13 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq) | |||
642 | 644 | ||
643 | if (atomic_read(&sc->poison)) { | 645 | if (atomic_read(&sc->poison)) { |
644 | blkdev_dequeue_request(rq); | 646 | blkdev_dequeue_request(rq); |
645 | ub_end_rq(rq, DID_NO_CONNECT << 16); | 647 | ub_end_rq(rq, DID_NO_CONNECT << 16, blk_rq_bytes(rq)); |
646 | return 0; | 648 | return 0; |
647 | } | 649 | } |
648 | 650 | ||
649 | if (lun->changed && !blk_pc_request(rq)) { | 651 | if (lun->changed && !blk_pc_request(rq)) { |
650 | blkdev_dequeue_request(rq); | 652 | blkdev_dequeue_request(rq); |
651 | ub_end_rq(rq, SAM_STAT_CHECK_CONDITION); | 653 | ub_end_rq(rq, SAM_STAT_CHECK_CONDITION, blk_rq_bytes(rq)); |
652 | return 0; | 654 | return 0; |
653 | } | 655 | } |
654 | 656 | ||
@@ -701,7 +703,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq) | |||
701 | 703 | ||
702 | drop: | 704 | drop: |
703 | ub_put_cmd(lun, cmd); | 705 | ub_put_cmd(lun, cmd); |
704 | ub_end_rq(rq, DID_ERROR << 16); | 706 | ub_end_rq(rq, DID_ERROR << 16, blk_rq_bytes(rq)); |
705 | return 0; | 707 | return 0; |
706 | } | 708 | } |
707 | 709 | ||
@@ -770,6 +772,7 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
770 | struct ub_request *urq = cmd->back; | 772 | struct ub_request *urq = cmd->back; |
771 | struct request *rq; | 773 | struct request *rq; |
772 | unsigned int scsi_status; | 774 | unsigned int scsi_status; |
775 | unsigned int cmd_len; | ||
773 | 776 | ||
774 | rq = urq->rq; | 777 | rq = urq->rq; |
775 | 778 | ||
@@ -779,8 +782,18 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
779 | rq->data_len = 0; | 782 | rq->data_len = 0; |
780 | else | 783 | else |
781 | rq->data_len -= cmd->act_len; | 784 | rq->data_len -= cmd->act_len; |
785 | scsi_status = 0; | ||
786 | } else { | ||
787 | if (cmd->act_len != cmd->len) { | ||
788 | if ((cmd->key == MEDIUM_ERROR || | ||
789 | cmd->key == UNIT_ATTENTION) && | ||
790 | ub_rw_cmd_retry(sc, lun, urq, cmd) == 0) | ||
791 | return; | ||
792 | scsi_status = SAM_STAT_CHECK_CONDITION; | ||
793 | } else { | ||
794 | scsi_status = 0; | ||
795 | } | ||
782 | } | 796 | } |
783 | scsi_status = 0; | ||
784 | } else { | 797 | } else { |
785 | if (blk_pc_request(rq)) { | 798 | if (blk_pc_request(rq)) { |
786 | /* UB_SENSE_SIZE is smaller than SCSI_SENSE_BUFFERSIZE */ | 799 | /* UB_SENSE_SIZE is smaller than SCSI_SENSE_BUFFERSIZE */ |
@@ -801,14 +814,17 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
801 | 814 | ||
802 | urq->rq = NULL; | 815 | urq->rq = NULL; |
803 | 816 | ||
817 | cmd_len = cmd->len; | ||
804 | ub_put_cmd(lun, cmd); | 818 | ub_put_cmd(lun, cmd); |
805 | ub_end_rq(rq, scsi_status); | 819 | ub_end_rq(rq, scsi_status, cmd_len); |
806 | blk_start_queue(lun->disk->queue); | 820 | blk_start_queue(lun->disk->queue); |
807 | } | 821 | } |
808 | 822 | ||
809 | static void ub_end_rq(struct request *rq, unsigned int scsi_status) | 823 | static void ub_end_rq(struct request *rq, unsigned int scsi_status, |
824 | unsigned int cmd_len) | ||
810 | { | 825 | { |
811 | int error; | 826 | int error; |
827 | long rqlen; | ||
812 | 828 | ||
813 | if (scsi_status == 0) { | 829 | if (scsi_status == 0) { |
814 | error = 0; | 830 | error = 0; |
@@ -816,8 +832,12 @@ static void ub_end_rq(struct request *rq, unsigned int scsi_status) | |||
816 | error = -EIO; | 832 | error = -EIO; |
817 | rq->errors = scsi_status; | 833 | rq->errors = scsi_status; |
818 | } | 834 | } |
819 | if (__blk_end_request(rq, error, blk_rq_bytes(rq))) | 835 | rqlen = blk_rq_bytes(rq); /* Oddly enough, this is the residue. */ |
820 | BUG(); | 836 | if (__blk_end_request(rq, error, cmd_len)) { |
837 | printk(KERN_WARNING DRV_NAME | ||
838 | ": __blk_end_request blew, %s-cmd total %u rqlen %ld\n", | ||
839 | blk_pc_request(rq)? "pc": "fs", cmd_len, rqlen); | ||
840 | } | ||
821 | } | 841 | } |
822 | 842 | ||
823 | static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun, | 843 | static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun, |
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index c10d128e34db..675d88bda066 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h | |||
@@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
1092 | #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a) | 1092 | #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a) |
1093 | #define IS_I915GM(dev) ((dev)->pci_device == 0x2592) | 1093 | #define IS_I915GM(dev) ((dev)->pci_device == 0x2592) |
1094 | #define IS_I945G(dev) ((dev)->pci_device == 0x2772) | 1094 | #define IS_I945G(dev) ((dev)->pci_device == 0x2772) |
1095 | #define IS_I945GM(dev) ((dev)->pci_device == 0x27A2) | 1095 | #define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||\ |
1096 | 1096 | (dev)->pci_device == 0x27AE) | |
1097 | #define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \ | 1097 | #define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \ |
1098 | (dev)->pci_device == 0x2982 || \ | 1098 | (dev)->pci_device == 0x2982 || \ |
1099 | (dev)->pci_device == 0x2992 || \ | 1099 | (dev)->pci_device == 0x2992 || \ |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 465ad35ed38f..1399971be689 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -731,14 +731,14 @@ static unsigned long hpet_calibrate(struct hpets *hpetp) | |||
731 | 731 | ||
732 | int hpet_alloc(struct hpet_data *hdp) | 732 | int hpet_alloc(struct hpet_data *hdp) |
733 | { | 733 | { |
734 | u64 cap, mcfg, hpet_config; | 734 | u64 cap, mcfg; |
735 | struct hpet_dev *devp; | 735 | struct hpet_dev *devp; |
736 | u32 i, ntimer, irq; | 736 | u32 i, ntimer; |
737 | struct hpets *hpetp; | 737 | struct hpets *hpetp; |
738 | size_t siz; | 738 | size_t siz; |
739 | struct hpet __iomem *hpet; | 739 | struct hpet __iomem *hpet; |
740 | static struct hpets *last = NULL; | 740 | static struct hpets *last = NULL; |
741 | unsigned long period, irq_bitmap; | 741 | unsigned long period; |
742 | unsigned long long temp; | 742 | unsigned long long temp; |
743 | 743 | ||
744 | /* | 744 | /* |
@@ -765,47 +765,11 @@ int hpet_alloc(struct hpet_data *hdp) | |||
765 | hpetp->hp_hpet_phys = hdp->hd_phys_address; | 765 | hpetp->hp_hpet_phys = hdp->hd_phys_address; |
766 | 766 | ||
767 | hpetp->hp_ntimer = hdp->hd_nirqs; | 767 | hpetp->hp_ntimer = hdp->hd_nirqs; |
768 | hpet = hpetp->hp_hpet; | ||
769 | |||
770 | /* Assign IRQs statically for legacy devices */ | ||
771 | hpetp->hp_dev[0].hd_hdwirq = hdp->hd_irq[0]; | ||
772 | hpetp->hp_dev[1].hd_hdwirq = hdp->hd_irq[1]; | ||
773 | |||
774 | /* Assign IRQs dynamically for the others */ | ||
775 | for (i = 2, devp = &hpetp->hp_dev[2]; i < hdp->hd_nirqs; i++, devp++) { | ||
776 | struct hpet_timer __iomem *timer; | ||
777 | 768 | ||
778 | timer = &hpet->hpet_timers[devp - hpetp->hp_dev]; | 769 | for (i = 0; i < hdp->hd_nirqs; i++) |
770 | hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i]; | ||
779 | 771 | ||
780 | /* Check if there's already an IRQ assigned to the timer */ | 772 | hpet = hpetp->hp_hpet; |
781 | if (hdp->hd_irq[i]) { | ||
782 | hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i]; | ||
783 | continue; | ||
784 | } | ||
785 | |||
786 | hpet_config = readq(&timer->hpet_config); | ||
787 | irq_bitmap = (hpet_config & Tn_INT_ROUTE_CAP_MASK) | ||
788 | >> Tn_INT_ROUTE_CAP_SHIFT; | ||
789 | if (!irq_bitmap) | ||
790 | irq = 0; /* No valid IRQ Assignable */ | ||
791 | else { | ||
792 | irq = find_first_bit(&irq_bitmap, 32); | ||
793 | do { | ||
794 | hpet_config |= irq << Tn_INT_ROUTE_CNF_SHIFT; | ||
795 | writeq(hpet_config, &timer->hpet_config); | ||
796 | |||
797 | /* | ||
798 | * Verify whether we have written a valid | ||
799 | * IRQ number by reading it back again | ||
800 | */ | ||
801 | hpet_config = readq(&timer->hpet_config); | ||
802 | if (irq == (hpet_config & Tn_INT_ROUTE_CNF_MASK) | ||
803 | >> Tn_INT_ROUTE_CNF_SHIFT) | ||
804 | break; /* Success */ | ||
805 | } while ((irq = (find_next_bit(&irq_bitmap, 32, irq)))); | ||
806 | } | ||
807 | hpetp->hp_dev[i].hd_hdwirq = irq; | ||
808 | } | ||
809 | 773 | ||
810 | cap = readq(&hpet->hpet_cap); | 774 | cap = readq(&hpet->hpet_cap); |
811 | 775 | ||
@@ -836,8 +800,7 @@ int hpet_alloc(struct hpet_data *hdp) | |||
836 | hpetp->hp_which, hdp->hd_phys_address, | 800 | hpetp->hp_which, hdp->hd_phys_address, |
837 | hpetp->hp_ntimer > 1 ? "s" : ""); | 801 | hpetp->hp_ntimer > 1 ? "s" : ""); |
838 | for (i = 0; i < hpetp->hp_ntimer; i++) | 802 | for (i = 0; i < hpetp->hp_ntimer; i++) |
839 | printk("%s %d", i > 0 ? "," : "", | 803 | printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); |
840 | hpetp->hp_dev[i].hd_hdwirq); | ||
841 | printk("\n"); | 804 | printk("\n"); |
842 | 805 | ||
843 | printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n", | 806 | printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n", |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 4072449ad1cd..c5e3ed7e903b 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
@@ -266,7 +266,7 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm) | |||
266 | dev->name = "IPMI controller"; | 266 | dev->name = "IPMI controller"; |
267 | dev->device_data = data; | 267 | dev->device_data = data; |
268 | 268 | ||
269 | list_add(&dev->list, &dmi_devices); | 269 | list_add_tail(&dev->list, &dmi_devices); |
270 | } | 270 | } |
271 | 271 | ||
272 | static void __init dmi_save_extended_devices(const struct dmi_header *dm) | 272 | static void __init dmi_save_extended_devices(const struct dmi_header *dm) |
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index cce5a614758d..fde26345a379 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
@@ -382,9 +382,8 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) | |||
382 | break; | 382 | break; |
383 | 383 | ||
384 | case DAVINCI_I2C_IVR_ARDY: | 384 | case DAVINCI_I2C_IVR_ARDY: |
385 | w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG); | 385 | davinci_i2c_write_reg(dev, |
386 | MOD_REG_BIT(w, DAVINCI_I2C_STR_ARDY, 1); | 386 | DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_ARDY); |
387 | davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w); | ||
388 | complete(&dev->cmd_complete); | 387 | complete(&dev->cmd_complete); |
389 | break; | 388 | break; |
390 | 389 | ||
@@ -397,12 +396,9 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) | |||
397 | if (dev->buf_len) | 396 | if (dev->buf_len) |
398 | continue; | 397 | continue; |
399 | 398 | ||
400 | w = davinci_i2c_read_reg(dev, | ||
401 | DAVINCI_I2C_STR_REG); | ||
402 | MOD_REG_BIT(w, DAVINCI_I2C_IMR_RRDY, 0); | ||
403 | davinci_i2c_write_reg(dev, | 399 | davinci_i2c_write_reg(dev, |
404 | DAVINCI_I2C_STR_REG, | 400 | DAVINCI_I2C_STR_REG, |
405 | w); | 401 | DAVINCI_I2C_IMR_RRDY); |
406 | } else | 402 | } else |
407 | dev_err(dev->dev, "RDR IRQ while no " | 403 | dev_err(dev->dev, "RDR IRQ while no " |
408 | "data requested\n"); | 404 | "data requested\n"); |
@@ -428,9 +424,8 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) | |||
428 | break; | 424 | break; |
429 | 425 | ||
430 | case DAVINCI_I2C_IVR_SCD: | 426 | case DAVINCI_I2C_IVR_SCD: |
431 | w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG); | 427 | davinci_i2c_write_reg(dev, |
432 | MOD_REG_BIT(w, DAVINCI_I2C_STR_SCD, 1); | 428 | DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_SCD); |
433 | davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w); | ||
434 | complete(&dev->cmd_complete); | 429 | complete(&dev->cmd_complete); |
435 | break; | 430 | break; |
436 | 431 | ||
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 7c7eb0cfeceb..22bb247d0e60 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(iic_force_poll, "Force polling mode"); | |||
55 | 55 | ||
56 | static int iic_force_fast; | 56 | static int iic_force_fast; |
57 | module_param(iic_force_fast, bool, 0); | 57 | module_param(iic_force_fast, bool, 0); |
58 | MODULE_PARM_DESC(iic_fast_poll, "Force fast mode (400 kHz)"); | 58 | MODULE_PARM_DESC(iic_force_fast, "Force fast mode (400 kHz)"); |
59 | 59 | ||
60 | #define DBG_LEVEL 0 | 60 | #define DBG_LEVEL 0 |
61 | 61 | ||
diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c index cb9abe7565a7..b1c050ff311d 100644 --- a/drivers/i2c/busses/i2c-tiny-usb.c +++ b/drivers/i2c/busses/i2c-tiny-usb.c | |||
@@ -131,11 +131,15 @@ static const struct i2c_algorithm usb_algorithm = { | |||
131 | 131 | ||
132 | /* ----- begin of usb layer ---------------------------------------------- */ | 132 | /* ----- begin of usb layer ---------------------------------------------- */ |
133 | 133 | ||
134 | /* The usb i2c interface uses a vid/pid pair donated by */ | 134 | /* |
135 | /* Future Technology Devices International Ltd. */ | 135 | * Initially the usb i2c interface uses a vid/pid pair donated by |
136 | * Future Technology Devices International Ltd., later a pair was | ||
137 | * bought from EZPrototypes | ||
138 | */ | ||
136 | static struct usb_device_id i2c_tiny_usb_table [] = { | 139 | static struct usb_device_id i2c_tiny_usb_table [] = { |
137 | { USB_DEVICE(0x0403, 0xc631) }, | 140 | { USB_DEVICE(0x0403, 0xc631) }, /* FTDI */ |
138 | { } /* Terminating entry */ | 141 | { USB_DEVICE(0x1c40, 0x0534) }, /* EZPrototypes */ |
142 | { } /* Terminating entry */ | ||
139 | }; | 143 | }; |
140 | 144 | ||
141 | MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table); | 145 | MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table); |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index cc4be9621bc0..8d624afe8529 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -492,7 +492,7 @@ static void proc_reports_siimage (struct pci_dev *dev, u8 clocking, const char * | |||
492 | 492 | ||
493 | static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name) | 493 | static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name) |
494 | { | 494 | { |
495 | unsigned long bar5 = pci_resource_start(dev, 5); | 495 | resource_size_t bar5 = pci_resource_start(dev, 5); |
496 | unsigned long barsize = pci_resource_len(dev, 5); | 496 | unsigned long barsize = pci_resource_len(dev, 5); |
497 | u8 tmpbyte = 0; | 497 | u8 tmpbyte = 0; |
498 | void __iomem *ioaddr; | 498 | void __iomem *ioaddr; |
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index ced83c202cac..ef1a300068dc 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -2010,6 +2010,7 @@ isdn_net_init(struct net_device *ndev) | |||
2010 | ndev->flags = IFF_NOARP|IFF_POINTOPOINT; | 2010 | ndev->flags = IFF_NOARP|IFF_POINTOPOINT; |
2011 | ndev->type = ARPHRD_ETHER; | 2011 | ndev->type = ARPHRD_ETHER; |
2012 | ndev->addr_len = ETH_ALEN; | 2012 | ndev->addr_len = ETH_ALEN; |
2013 | ndev->validate_addr = NULL; | ||
2013 | 2014 | ||
2014 | /* for clients with MPPP maybe higher values better */ | 2015 | /* for clients with MPPP maybe higher values better */ |
2015 | ndev->tx_queue_len = 30; | 2016 | ndev->tx_queue_len = 30; |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index c574cf5efb5c..b162b839a662 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -2348,25 +2348,15 @@ static void handle_issuing_new_write_requests6(raid5_conf_t *conf, | |||
2348 | static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh, | 2348 | static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh, |
2349 | struct stripe_head_state *s, int disks) | 2349 | struct stripe_head_state *s, int disks) |
2350 | { | 2350 | { |
2351 | int canceled_check = 0; | ||
2352 | |||
2351 | set_bit(STRIPE_HANDLE, &sh->state); | 2353 | set_bit(STRIPE_HANDLE, &sh->state); |
2352 | /* Take one of the following actions: | ||
2353 | * 1/ start a check parity operation if (uptodate == disks) | ||
2354 | * 2/ finish a check parity operation and act on the result | ||
2355 | * 3/ skip to the writeback section if we previously | ||
2356 | * initiated a recovery operation | ||
2357 | */ | ||
2358 | if (s->failed == 0 && | ||
2359 | !test_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending)) { | ||
2360 | if (!test_and_set_bit(STRIPE_OP_CHECK, &sh->ops.pending)) { | ||
2361 | BUG_ON(s->uptodate != disks); | ||
2362 | clear_bit(R5_UPTODATE, &sh->dev[sh->pd_idx].flags); | ||
2363 | sh->ops.count++; | ||
2364 | s->uptodate--; | ||
2365 | } else if ( | ||
2366 | test_and_clear_bit(STRIPE_OP_CHECK, &sh->ops.complete)) { | ||
2367 | clear_bit(STRIPE_OP_CHECK, &sh->ops.ack); | ||
2368 | clear_bit(STRIPE_OP_CHECK, &sh->ops.pending); | ||
2369 | 2354 | ||
2355 | /* complete a check operation */ | ||
2356 | if (test_and_clear_bit(STRIPE_OP_CHECK, &sh->ops.complete)) { | ||
2357 | clear_bit(STRIPE_OP_CHECK, &sh->ops.ack); | ||
2358 | clear_bit(STRIPE_OP_CHECK, &sh->ops.pending); | ||
2359 | if (s->failed == 0) { | ||
2370 | if (sh->ops.zero_sum_result == 0) | 2360 | if (sh->ops.zero_sum_result == 0) |
2371 | /* parity is correct (on disc, | 2361 | /* parity is correct (on disc, |
2372 | * not in buffer any more) | 2362 | * not in buffer any more) |
@@ -2391,7 +2381,8 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh, | |||
2391 | s->uptodate++; | 2381 | s->uptodate++; |
2392 | } | 2382 | } |
2393 | } | 2383 | } |
2394 | } | 2384 | } else |
2385 | canceled_check = 1; /* STRIPE_INSYNC is not set */ | ||
2395 | } | 2386 | } |
2396 | 2387 | ||
2397 | /* check if we can clear a parity disk reconstruct */ | 2388 | /* check if we can clear a parity disk reconstruct */ |
@@ -2404,12 +2395,28 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh, | |||
2404 | clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending); | 2395 | clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending); |
2405 | } | 2396 | } |
2406 | 2397 | ||
2398 | /* start a new check operation if there are no failures, the stripe is | ||
2399 | * not insync, and a repair is not in flight | ||
2400 | */ | ||
2401 | if (s->failed == 0 && | ||
2402 | !test_bit(STRIPE_INSYNC, &sh->state) && | ||
2403 | !test_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending)) { | ||
2404 | if (!test_and_set_bit(STRIPE_OP_CHECK, &sh->ops.pending)) { | ||
2405 | BUG_ON(s->uptodate != disks); | ||
2406 | clear_bit(R5_UPTODATE, &sh->dev[sh->pd_idx].flags); | ||
2407 | sh->ops.count++; | ||
2408 | s->uptodate--; | ||
2409 | } | ||
2410 | } | ||
2411 | |||
2407 | /* Wait for check parity and compute block operations to complete | 2412 | /* Wait for check parity and compute block operations to complete |
2408 | * before write-back | 2413 | * before write-back. If a failure occurred while the check operation |
2414 | * was in flight we need to cycle this stripe through handle_stripe | ||
2415 | * since the parity block may not be uptodate | ||
2409 | */ | 2416 | */ |
2410 | if (!test_bit(STRIPE_INSYNC, &sh->state) && | 2417 | if (!canceled_check && !test_bit(STRIPE_INSYNC, &sh->state) && |
2411 | !test_bit(STRIPE_OP_CHECK, &sh->ops.pending) && | 2418 | !test_bit(STRIPE_OP_CHECK, &sh->ops.pending) && |
2412 | !test_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending)) { | 2419 | !test_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending)) { |
2413 | struct r5dev *dev; | 2420 | struct r5dev *dev; |
2414 | /* either failed parity check, or recovery is happening */ | 2421 | /* either failed parity check, or recovery is happening */ |
2415 | if (s->failed == 0) | 2422 | if (s->failed == 0) |
diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 8cf91353b56a..7b8bb6949f5e 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile | |||
@@ -6,3 +6,6 @@ obj-y := common/ | |||
6 | obj-y += video/ | 6 | obj-y += video/ |
7 | obj-$(CONFIG_VIDEO_DEV) += radio/ | 7 | obj-$(CONFIG_VIDEO_DEV) += radio/ |
8 | obj-$(CONFIG_DVB_CORE) += dvb/ | 8 | obj-$(CONFIG_DVB_CORE) += dvb/ |
9 | ifeq ($(CONFIG_DVB_CORE),) | ||
10 | obj-$(CONFIG_VIDEO_TUNER) += dvb/frontends/ | ||
11 | endif | ||
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index 819433485d3b..1a4d8319773c 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c | |||
@@ -445,7 +445,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable) | |||
445 | s5h1409_readreg(state, 0xe3) | 0x1100); | 445 | s5h1409_readreg(state, 0xe3) | 0x1100); |
446 | else | 446 | else |
447 | return s5h1409_writereg(state, 0xe3, | 447 | return s5h1409_writereg(state, 0xe3, |
448 | s5h1409_readreg(state, 0xe3) & 0xeeff); | 448 | s5h1409_readreg(state, 0xe3) & 0xfeff); |
449 | } | 449 | } |
450 | 450 | ||
451 | static int s5h1409_sleep(struct dvb_frontend* fe, int enable) | 451 | static int s5h1409_sleep(struct dvb_frontend* fe, int enable) |
diff --git a/drivers/media/video/bt8xx/bt832.c b/drivers/media/video/bt8xx/bt832.c index a51876137880..f92f06dec0d0 100644 --- a/drivers/media/video/bt8xx/bt832.c +++ b/drivers/media/video/bt8xx/bt832.c | |||
@@ -97,6 +97,11 @@ int bt832_init(struct i2c_client *i2c_client_s) | |||
97 | int rc; | 97 | int rc; |
98 | 98 | ||
99 | buf=kmalloc(65,GFP_KERNEL); | 99 | buf=kmalloc(65,GFP_KERNEL); |
100 | if (!buf) { | ||
101 | v4l_err(&t->client, | ||
102 | "Unable to allocate memory. Detaching.\n"); | ||
103 | return 0; | ||
104 | } | ||
100 | bt832_hexdump(i2c_client_s,buf); | 105 | bt832_hexdump(i2c_client_s,buf); |
101 | 106 | ||
102 | if(buf[0x40] != 0x31) { | 107 | if(buf[0x40] != 0x31) { |
@@ -211,7 +216,12 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
211 | switch (cmd) { | 216 | switch (cmd) { |
212 | case BT832_HEXDUMP: { | 217 | case BT832_HEXDUMP: { |
213 | unsigned char *buf; | 218 | unsigned char *buf; |
214 | buf=kmalloc(65,GFP_KERNEL); | 219 | buf = kmalloc(65, GFP_KERNEL); |
220 | if (!buf) { | ||
221 | v4l_err(&t->client, | ||
222 | "Unable to allocate memory\n"); | ||
223 | break; | ||
224 | } | ||
215 | bt832_hexdump(&t->client,buf); | 225 | bt832_hexdump(&t->client,buf); |
216 | kfree(buf); | 226 | kfree(buf); |
217 | } | 227 | } |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index 4df6d6d936fc..fe9991c10cf4 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c | |||
@@ -155,6 +155,41 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = { | |||
155 | 155 | ||
156 | 156 | ||
157 | /*------------------------------------------------------------------------*/ | 157 | /*------------------------------------------------------------------------*/ |
158 | /* Hauppauge PVR-USB2 Model 73xxx */ | ||
159 | |||
160 | static const char *pvr2_client_73xxx[] = { | ||
161 | "cx25840", | ||
162 | "tuner", | ||
163 | }; | ||
164 | |||
165 | static const char *pvr2_fw1_names_73xxx[] = { | ||
166 | "v4l-pvrusb2-73xxx-01.fw", | ||
167 | }; | ||
168 | |||
169 | static const struct pvr2_device_desc pvr2_device_73xxx = { | ||
170 | .description = "WinTV PVR USB2 Model Category 73xxxx", | ||
171 | .shortname = "73xxx", | ||
172 | .client_modules.lst = pvr2_client_73xxx, | ||
173 | .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx), | ||
174 | .fx2_firmware.lst = pvr2_fw1_names_73xxx, | ||
175 | .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx), | ||
176 | .flag_has_cx25840 = !0, | ||
177 | .flag_has_hauppauge_rom = !0, | ||
178 | #if 0 | ||
179 | .flag_has_analogtuner = !0, | ||
180 | .flag_has_composite = !0, | ||
181 | .flag_has_svideo = !0, | ||
182 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | ||
183 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, | ||
184 | .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE, | ||
185 | #else | ||
186 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | ||
187 | #endif | ||
188 | }; | ||
189 | |||
190 | |||
191 | |||
192 | /*------------------------------------------------------------------------*/ | ||
158 | /* Hauppauge PVR-USB2 Model 75xxx */ | 193 | /* Hauppauge PVR-USB2 Model 75xxx */ |
159 | 194 | ||
160 | static const char *pvr2_client_75xxx[] = { | 195 | static const char *pvr2_client_75xxx[] = { |
@@ -198,8 +233,12 @@ struct usb_device_id pvr2_device_table[] = { | |||
198 | { USB_DEVICE(0x11ba, 0x1001), | 233 | { USB_DEVICE(0x11ba, 0x1001), |
199 | .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2}, | 234 | .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2}, |
200 | #endif | 235 | #endif |
236 | { USB_DEVICE(0x2040, 0x7300), | ||
237 | .driver_info = (kernel_ulong_t)&pvr2_device_73xxx}, | ||
201 | { USB_DEVICE(0x2040, 0x7500), | 238 | { USB_DEVICE(0x2040, 0x7500), |
202 | .driver_info = (kernel_ulong_t)&pvr2_device_75xxx}, | 239 | .driver_info = (kernel_ulong_t)&pvr2_device_75xxx}, |
240 | { USB_DEVICE(0x2040, 0x7501), | ||
241 | .driver_info = (kernel_ulong_t)&pvr2_device_75xxx}, | ||
203 | { } | 242 | { } |
204 | }; | 243 | }; |
205 | 244 | ||
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 47794d23a42e..0080452531d6 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
@@ -718,7 +718,7 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long | |||
718 | /* Someone else might have been playing with it. */ | 718 | /* Someone else might have been playing with it. */ |
719 | return -EAGAIN; | 719 | return -EAGAIN; |
720 | } | 720 | } |
721 | 721 | /* Fall through */ | |
722 | case FL_READY: | 722 | case FL_READY: |
723 | case FL_CFI_QUERY: | 723 | case FL_CFI_QUERY: |
724 | case FL_JEDEC_QUERY: | 724 | case FL_JEDEC_QUERY: |
@@ -778,14 +778,14 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long | |||
778 | chip->state = FL_READY; | 778 | chip->state = FL_READY; |
779 | return 0; | 779 | return 0; |
780 | 780 | ||
781 | case FL_SHUTDOWN: | ||
782 | /* The machine is rebooting now,so no one can get chip anymore */ | ||
783 | return -EIO; | ||
781 | case FL_POINT: | 784 | case FL_POINT: |
782 | /* Only if there's no operation suspended... */ | 785 | /* Only if there's no operation suspended... */ |
783 | if (mode == FL_READY && chip->oldstate == FL_READY) | 786 | if (mode == FL_READY && chip->oldstate == FL_READY) |
784 | return 0; | 787 | return 0; |
785 | 788 | /* Fall through */ | |
786 | case FL_SHUTDOWN: | ||
787 | /* The machine is rebooting now,so no one can get chip anymore */ | ||
788 | return -EIO; | ||
789 | default: | 789 | default: |
790 | sleep: | 790 | sleep: |
791 | set_current_state(TASK_UNINTERRUPTIBLE); | 791 | set_current_state(TASK_UNINTERRUPTIBLE); |
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index d072e87ce4e2..458d477614d6 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c | |||
@@ -1763,6 +1763,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd) | |||
1763 | 1763 | ||
1764 | default: | 1764 | default: |
1765 | /* Not an idle state */ | 1765 | /* Not an idle state */ |
1766 | set_current_state(TASK_UNINTERRUPTIBLE); | ||
1766 | add_wait_queue(&chip->wq, &wait); | 1767 | add_wait_queue(&chip->wq, &wait); |
1767 | 1768 | ||
1768 | spin_unlock(chip->mutex); | 1769 | spin_unlock(chip->mutex); |
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c index b344ff858b2d..492e2ab27420 100644 --- a/drivers/mtd/chips/cfi_cmdset_0020.c +++ b/drivers/mtd/chips/cfi_cmdset_0020.c | |||
@@ -1015,6 +1015,7 @@ static void cfi_staa_sync (struct mtd_info *mtd) | |||
1015 | 1015 | ||
1016 | default: | 1016 | default: |
1017 | /* Not an idle state */ | 1017 | /* Not an idle state */ |
1018 | set_current_state(TASK_UNINTERRUPTIBLE); | ||
1018 | add_wait_queue(&chip->wq, &wait); | 1019 | add_wait_queue(&chip->wq, &wait); |
1019 | 1020 | ||
1020 | spin_unlock_bh(chip->mutex); | 1021 | spin_unlock_bh(chip->mutex); |
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c index de32b3fba322..7bdb5af35951 100644 --- a/drivers/net/bnx2x.c +++ b/drivers/net/bnx2x.c | |||
@@ -63,8 +63,8 @@ | |||
63 | #include "bnx2x.h" | 63 | #include "bnx2x.h" |
64 | #include "bnx2x_init.h" | 64 | #include "bnx2x_init.h" |
65 | 65 | ||
66 | #define DRV_MODULE_VERSION "1.42.3" | 66 | #define DRV_MODULE_VERSION "1.42.4" |
67 | #define DRV_MODULE_RELDATE "2008/3/9" | 67 | #define DRV_MODULE_RELDATE "2008/4/9" |
68 | #define BNX2X_BC_VER 0x040200 | 68 | #define BNX2X_BC_VER 0x040200 |
69 | 69 | ||
70 | /* Time in jiffies before concluding the transmitter is hung. */ | 70 | /* Time in jiffies before concluding the transmitter is hung. */ |
@@ -6153,7 +6153,7 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode) | |||
6153 | func, mode); | 6153 | func, mode); |
6154 | REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, | 6154 | REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, |
6155 | 0xffffffff); | 6155 | 0xffffffff); |
6156 | REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, | 6156 | REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET, |
6157 | 0xfffc); | 6157 | 0xfffc); |
6158 | bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END); | 6158 | bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END); |
6159 | 6159 | ||
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 93b7fb246960..a8d3280923e8 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | 41 | ||
42 | #define DRV_NAME "ehea" | 42 | #define DRV_NAME "ehea" |
43 | #define DRV_VERSION "EHEA_0089" | 43 | #define DRV_VERSION "EHEA_0090" |
44 | 44 | ||
45 | /* eHEA capability flags */ | 45 | /* eHEA capability flags */ |
46 | #define DLPAR_PORT_ADD_REM 1 | 46 | #define DLPAR_PORT_ADD_REM 1 |
@@ -371,6 +371,7 @@ struct ehea_port_res { | |||
371 | struct ehea_q_skb_arr rq2_skba; | 371 | struct ehea_q_skb_arr rq2_skba; |
372 | struct ehea_q_skb_arr rq3_skba; | 372 | struct ehea_q_skb_arr rq3_skba; |
373 | struct ehea_q_skb_arr sq_skba; | 373 | struct ehea_q_skb_arr sq_skba; |
374 | int sq_skba_size; | ||
374 | spinlock_t netif_queue; | 375 | spinlock_t netif_queue; |
375 | int queue_stopped; | 376 | int queue_stopped; |
376 | int swqe_refill_th; | 377 | int swqe_refill_th; |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 07c742dd3f09..f460b623c077 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -349,7 +349,8 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes) | |||
349 | pr->rq1_skba.os_skbs = 0; | 349 | pr->rq1_skba.os_skbs = 0; |
350 | 350 | ||
351 | if (unlikely(test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))) { | 351 | if (unlikely(test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))) { |
352 | pr->rq1_skba.index = index; | 352 | if (nr_of_wqes > 0) |
353 | pr->rq1_skba.index = index; | ||
353 | pr->rq1_skba.os_skbs = fill_wqes; | 354 | pr->rq1_skba.os_skbs = fill_wqes; |
354 | return; | 355 | return; |
355 | } | 356 | } |
@@ -1464,7 +1465,9 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr, | |||
1464 | init_attr->act_nr_rwqes_rq2, | 1465 | init_attr->act_nr_rwqes_rq2, |
1465 | init_attr->act_nr_rwqes_rq3); | 1466 | init_attr->act_nr_rwqes_rq3); |
1466 | 1467 | ||
1467 | ret = ehea_init_q_skba(&pr->sq_skba, init_attr->act_nr_send_wqes + 1); | 1468 | pr->sq_skba_size = init_attr->act_nr_send_wqes + 1; |
1469 | |||
1470 | ret = ehea_init_q_skba(&pr->sq_skba, pr->sq_skba_size); | ||
1468 | ret |= ehea_init_q_skba(&pr->rq1_skba, init_attr->act_nr_rwqes_rq1 + 1); | 1471 | ret |= ehea_init_q_skba(&pr->rq1_skba, init_attr->act_nr_rwqes_rq1 + 1); |
1469 | ret |= ehea_init_q_skba(&pr->rq2_skba, init_attr->act_nr_rwqes_rq2 + 1); | 1472 | ret |= ehea_init_q_skba(&pr->rq2_skba, init_attr->act_nr_rwqes_rq2 + 1); |
1470 | ret |= ehea_init_q_skba(&pr->rq3_skba, init_attr->act_nr_rwqes_rq3 + 1); | 1473 | ret |= ehea_init_q_skba(&pr->rq3_skba, init_attr->act_nr_rwqes_rq3 + 1); |
@@ -2621,6 +2624,22 @@ void ehea_purge_sq(struct ehea_qp *orig_qp) | |||
2621 | } | 2624 | } |
2622 | } | 2625 | } |
2623 | 2626 | ||
2627 | void ehea_flush_sq(struct ehea_port *port) | ||
2628 | { | ||
2629 | int i; | ||
2630 | |||
2631 | for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) { | ||
2632 | struct ehea_port_res *pr = &port->port_res[i]; | ||
2633 | int swqe_max = pr->sq_skba_size - 2 - pr->swqe_ll_count; | ||
2634 | int k = 0; | ||
2635 | while (atomic_read(&pr->swqe_avail) < swqe_max) { | ||
2636 | msleep(5); | ||
2637 | if (++k == 20) | ||
2638 | break; | ||
2639 | } | ||
2640 | } | ||
2641 | } | ||
2642 | |||
2624 | int ehea_stop_qps(struct net_device *dev) | 2643 | int ehea_stop_qps(struct net_device *dev) |
2625 | { | 2644 | { |
2626 | struct ehea_port *port = netdev_priv(dev); | 2645 | struct ehea_port *port = netdev_priv(dev); |
@@ -2845,6 +2864,7 @@ static void ehea_rereg_mrs(struct work_struct *work) | |||
2845 | if (dev->flags & IFF_UP) { | 2864 | if (dev->flags & IFF_UP) { |
2846 | down(&port->port_lock); | 2865 | down(&port->port_lock); |
2847 | netif_stop_queue(dev); | 2866 | netif_stop_queue(dev); |
2867 | ehea_flush_sq(port); | ||
2848 | ret = ehea_stop_qps(dev); | 2868 | ret = ehea_stop_qps(dev); |
2849 | if (ret) { | 2869 | if (ret) { |
2850 | up(&port->port_lock); | 2870 | up(&port->port_lock); |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 980c2c229a71..9f088a47d8b1 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -2112,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev) | |||
2112 | 2112 | ||
2113 | np->tx_pkts_in_progress--; | 2113 | np->tx_pkts_in_progress--; |
2114 | if (np->tx_change_owner) { | 2114 | if (np->tx_change_owner) { |
2115 | __le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen); | 2115 | np->tx_change_owner->first_tx_desc->flaglen |= |
2116 | flaglen |= NV_TX2_VALID; | 2116 | cpu_to_le32(NV_TX2_VALID); |
2117 | np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen); | ||
2118 | np->tx_pkts_in_progress++; | 2117 | np->tx_pkts_in_progress++; |
2119 | 2118 | ||
2120 | np->tx_change_owner = np->tx_change_owner->next_tx_ctx; | 2119 | np->tx_change_owner = np->tx_change_owner->next_tx_ctx; |
@@ -5317,8 +5316,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5317 | 5316 | ||
5318 | /* check the workaround bit for correct mac address order */ | 5317 | /* check the workaround bit for correct mac address order */ |
5319 | txreg = readl(base + NvRegTransmitPoll); | 5318 | txreg = readl(base + NvRegTransmitPoll); |
5320 | if ((txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) || | 5319 | if (id->driver_data & DEV_HAS_CORRECT_MACADDR) { |
5321 | (id->driver_data & DEV_HAS_CORRECT_MACADDR)) { | ||
5322 | /* mac address is already in correct order */ | 5320 | /* mac address is already in correct order */ |
5323 | dev->dev_addr[0] = (np->orig_mac[0] >> 0) & 0xff; | 5321 | dev->dev_addr[0] = (np->orig_mac[0] >> 0) & 0xff; |
5324 | dev->dev_addr[1] = (np->orig_mac[0] >> 8) & 0xff; | 5322 | dev->dev_addr[1] = (np->orig_mac[0] >> 8) & 0xff; |
@@ -5326,6 +5324,22 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5326 | dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff; | 5324 | dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff; |
5327 | dev->dev_addr[4] = (np->orig_mac[1] >> 0) & 0xff; | 5325 | dev->dev_addr[4] = (np->orig_mac[1] >> 0) & 0xff; |
5328 | dev->dev_addr[5] = (np->orig_mac[1] >> 8) & 0xff; | 5326 | dev->dev_addr[5] = (np->orig_mac[1] >> 8) & 0xff; |
5327 | } else if (txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) { | ||
5328 | /* mac address is already in correct order */ | ||
5329 | dev->dev_addr[0] = (np->orig_mac[0] >> 0) & 0xff; | ||
5330 | dev->dev_addr[1] = (np->orig_mac[0] >> 8) & 0xff; | ||
5331 | dev->dev_addr[2] = (np->orig_mac[0] >> 16) & 0xff; | ||
5332 | dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff; | ||
5333 | dev->dev_addr[4] = (np->orig_mac[1] >> 0) & 0xff; | ||
5334 | dev->dev_addr[5] = (np->orig_mac[1] >> 8) & 0xff; | ||
5335 | /* | ||
5336 | * Set orig mac address back to the reversed version. | ||
5337 | * This flag will be cleared during low power transition. | ||
5338 | * Therefore, we should always put back the reversed address. | ||
5339 | */ | ||
5340 | np->orig_mac[0] = (dev->dev_addr[5] << 0) + (dev->dev_addr[4] << 8) + | ||
5341 | (dev->dev_addr[3] << 16) + (dev->dev_addr[2] << 24); | ||
5342 | np->orig_mac[1] = (dev->dev_addr[1] << 0) + (dev->dev_addr[0] << 8); | ||
5329 | } else { | 5343 | } else { |
5330 | /* need to reverse mac address to correct order */ | 5344 | /* need to reverse mac address to correct order */ |
5331 | dev->dev_addr[0] = (np->orig_mac[1] >> 8) & 0xff; | 5345 | dev->dev_addr[0] = (np->orig_mac[1] >> 8) & 0xff; |
@@ -5596,7 +5610,9 @@ out: | |||
5596 | static int nv_resume(struct pci_dev *pdev) | 5610 | static int nv_resume(struct pci_dev *pdev) |
5597 | { | 5611 | { |
5598 | struct net_device *dev = pci_get_drvdata(pdev); | 5612 | struct net_device *dev = pci_get_drvdata(pdev); |
5613 | u8 __iomem *base = get_hwbase(dev); | ||
5599 | int rc = 0; | 5614 | int rc = 0; |
5615 | u32 txreg; | ||
5600 | 5616 | ||
5601 | if (!netif_running(dev)) | 5617 | if (!netif_running(dev)) |
5602 | goto out; | 5618 | goto out; |
@@ -5607,6 +5623,11 @@ static int nv_resume(struct pci_dev *pdev) | |||
5607 | pci_restore_state(pdev); | 5623 | pci_restore_state(pdev); |
5608 | pci_enable_wake(pdev, PCI_D0, 0); | 5624 | pci_enable_wake(pdev, PCI_D0, 0); |
5609 | 5625 | ||
5626 | /* restore mac address reverse flag */ | ||
5627 | txreg = readl(base + NvRegTransmitPoll); | ||
5628 | txreg |= NVREG_TRANSMITPOLL_MAC_ADDR_REV; | ||
5629 | writel(txreg, base + NvRegTransmitPoll); | ||
5630 | |||
5610 | rc = nv_open(dev); | 5631 | rc = nv_open(dev); |
5611 | out: | 5632 | out: |
5612 | return rc; | 5633 | return rc; |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index af869cf9ae7d..940e2041ba38 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -835,7 +835,8 @@ static int fs_enet_close(struct net_device *dev) | |||
835 | 835 | ||
836 | netif_stop_queue(dev); | 836 | netif_stop_queue(dev); |
837 | netif_carrier_off(dev); | 837 | netif_carrier_off(dev); |
838 | napi_disable(&fep->napi); | 838 | if (fep->fpi->use_napi) |
839 | napi_disable(&fep->napi); | ||
839 | phy_stop(fep->phydev); | 840 | phy_stop(fep->phydev); |
840 | 841 | ||
841 | spin_lock_irqsave(&fep->lock, flags); | 842 | spin_lock_irqsave(&fep->lock, flags); |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 1d210ed46130..489c7c3b90d9 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -242,12 +242,12 @@ static int macb_mii_init(struct macb *bp) | |||
242 | /* Enable managment port */ | 242 | /* Enable managment port */ |
243 | macb_writel(bp, NCR, MACB_BIT(MPE)); | 243 | macb_writel(bp, NCR, MACB_BIT(MPE)); |
244 | 244 | ||
245 | bp->mii_bus.name = "MACB_mii_bus", | 245 | bp->mii_bus.name = "MACB_mii_bus"; |
246 | bp->mii_bus.read = &macb_mdio_read, | 246 | bp->mii_bus.read = &macb_mdio_read; |
247 | bp->mii_bus.write = &macb_mdio_write, | 247 | bp->mii_bus.write = &macb_mdio_write; |
248 | bp->mii_bus.reset = &macb_mdio_reset, | 248 | bp->mii_bus.reset = &macb_mdio_reset; |
249 | bp->mii_bus.id = bp->pdev->id, | 249 | bp->mii_bus.id = bp->pdev->id; |
250 | bp->mii_bus.priv = bp, | 250 | bp->mii_bus.priv = bp; |
251 | bp->mii_bus.dev = &bp->dev->dev; | 251 | bp->mii_bus.dev = &bp->dev->dev; |
252 | pdata = bp->pdev->dev.platform_data; | 252 | pdata = bp->pdev->dev.platform_data; |
253 | 253 | ||
@@ -1257,6 +1257,8 @@ static int __exit macb_remove(struct platform_device *pdev) | |||
1257 | 1257 | ||
1258 | if (dev) { | 1258 | if (dev) { |
1259 | bp = netdev_priv(dev); | 1259 | bp = netdev_priv(dev); |
1260 | if (bp->phy_dev) | ||
1261 | phy_disconnect(bp->phy_dev); | ||
1260 | mdiobus_unregister(&bp->mii_bus); | 1262 | mdiobus_unregister(&bp->mii_bus); |
1261 | kfree(bp->mii_bus.irq); | 1263 | kfree(bp->mii_bus.irq); |
1262 | unregister_netdev(dev); | 1264 | unregister_netdev(dev); |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 33539917e9b8..32a8503a7acd 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
@@ -211,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev) | |||
211 | } | 211 | } |
212 | 212 | ||
213 | if (phydev->interface == PHY_INTERFACE_MODE_SGMII) { | 213 | if (phydev->interface == PHY_INTERFACE_MODE_SGMII) { |
214 | int temp; | ||
215 | |||
216 | temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); | 214 | temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); |
217 | if (temp < 0) | 215 | if (temp < 0) |
218 | return temp; | 216 | return temp; |
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index 37b42394560d..15fcee55284e 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c | |||
@@ -1446,6 +1446,7 @@ static int __devinit sc92031_probe(struct pci_dev *pdev, | |||
1446 | } | 1446 | } |
1447 | 1447 | ||
1448 | pci_set_drvdata(pdev, dev); | 1448 | pci_set_drvdata(pdev, dev); |
1449 | SET_NETDEV_DEV(dev, &pdev->dev); | ||
1449 | 1450 | ||
1450 | #if SC92031_USE_BAR == 0 | 1451 | #if SC92031_USE_BAR == 0 |
1451 | dev->mem_start = pci_resource_start(pdev, SC92031_USE_BAR); | 1452 | dev->mem_start = pci_resource_start(pdev, SC92031_USE_BAR); |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 853bce0ac478..f226bcac7d17 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -154,6 +154,7 @@ static const char *yukon2_name[] = { | |||
154 | "EC", /* 0xb6 */ | 154 | "EC", /* 0xb6 */ |
155 | "FE", /* 0xb7 */ | 155 | "FE", /* 0xb7 */ |
156 | "FE+", /* 0xb8 */ | 156 | "FE+", /* 0xb8 */ |
157 | "Supreme", /* 0xb9 */ | ||
157 | }; | 158 | }; |
158 | 159 | ||
159 | static void sky2_set_multicast(struct net_device *dev); | 160 | static void sky2_set_multicast(struct net_device *dev); |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 4020e9e955b3..63a54e29d563 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -1326,9 +1326,11 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) | |||
1326 | SMC_SET_INT_MASK(mask); | 1326 | SMC_SET_INT_MASK(mask); |
1327 | spin_unlock(&lp->lock); | 1327 | spin_unlock(&lp->lock); |
1328 | 1328 | ||
1329 | #ifndef CONFIG_NET_POLL_CONTROLLER | ||
1329 | if (timeout == MAX_IRQ_LOOPS) | 1330 | if (timeout == MAX_IRQ_LOOPS) |
1330 | PRINTK("%s: spurious interrupt (mask = 0x%02x)\n", | 1331 | PRINTK("%s: spurious interrupt (mask = 0x%02x)\n", |
1331 | dev->name, mask); | 1332 | dev->name, mask); |
1333 | #endif | ||
1332 | DBG(3, "%s: Interrupt done (%d loops)\n", | 1334 | DBG(3, "%s: Interrupt done (%d loops)\n", |
1333 | dev->name, MAX_IRQ_LOOPS - timeout); | 1335 | dev->name, MAX_IRQ_LOOPS - timeout); |
1334 | 1336 | ||
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 98a832a75539..51d4134b37b1 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -92,14 +92,14 @@ | |||
92 | #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) | 92 | #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) |
93 | # endif | 93 | # endif |
94 | /* check if the mac in reg is valid */ | 94 | /* check if the mac in reg is valid */ |
95 | #define SMC_GET_MAC_ADDR(lp, addr) \ | 95 | #define SMC_GET_MAC_ADDR(addr) \ |
96 | do { \ | 96 | do { \ |
97 | unsigned int __v; \ | 97 | unsigned int __v; \ |
98 | __v = SMC_inw(ioaddr, ADDR0_REG(lp)); \ | 98 | __v = SMC_inw(ioaddr, ADDR0_REG); \ |
99 | addr[0] = __v; addr[1] = __v >> 8; \ | 99 | addr[0] = __v; addr[1] = __v >> 8; \ |
100 | __v = SMC_inw(ioaddr, ADDR1_REG(lp)); \ | 100 | __v = SMC_inw(ioaddr, ADDR1_REG); \ |
101 | addr[2] = __v; addr[3] = __v >> 8; \ | 101 | addr[2] = __v; addr[3] = __v >> 8; \ |
102 | __v = SMC_inw(ioaddr, ADDR2_REG(lp)); \ | 102 | __v = SMC_inw(ioaddr, ADDR2_REG); \ |
103 | addr[4] = __v; addr[5] = __v >> 8; \ | 103 | addr[4] = __v; addr[5] = __v >> 8; \ |
104 | if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ | 104 | if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ |
105 | random_ether_addr(addr); \ | 105 | random_ether_addr(addr); \ |
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index c49214feae91..7b7b1717b0d1 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1472,13 +1472,12 @@ static int __netdev_rx(struct net_device *dev, int *quota) | |||
1472 | #ifndef final_version /* Remove after testing. */ | 1472 | #ifndef final_version /* Remove after testing. */ |
1473 | /* You will want this info for the initial debug. */ | 1473 | /* You will want this info for the initial debug. */ |
1474 | if (debug > 5) { | 1474 | if (debug > 5) { |
1475 | DECLARE_MAC_BUF(mac); | 1475 | printk(KERN_DEBUG " Rx data " MAC_FMT " " MAC_FMT |
1476 | DECLARE_MAC_BUF(mac2); | ||
1477 | |||
1478 | printk(KERN_DEBUG " Rx data %s %s" | ||
1479 | " %2.2x%2.2x.\n", | 1476 | " %2.2x%2.2x.\n", |
1480 | print_mac(mac, &skb->data[0]), | 1477 | skb->data[0], skb->data[1], skb->data[2], |
1481 | print_mac(mac2, &skb->data[6]), | 1478 | skb->data[3], skb->data[4], skb->data[5], |
1479 | skb->data[6], skb->data[7], skb->data[8], | ||
1480 | skb->data[9], skb->data[10], skb->data[11], | ||
1482 | skb->data[12], skb->data[13]); | 1481 | skb->data[12], skb->data[13]); |
1483 | } | 1482 | } |
1484 | #endif | 1483 | #endif |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index f9ef8bd8b11e..96043c5746d0 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -64,8 +64,8 @@ | |||
64 | 64 | ||
65 | #define DRV_MODULE_NAME "tg3" | 65 | #define DRV_MODULE_NAME "tg3" |
66 | #define PFX DRV_MODULE_NAME ": " | 66 | #define PFX DRV_MODULE_NAME ": " |
67 | #define DRV_MODULE_VERSION "3.88" | 67 | #define DRV_MODULE_VERSION "3.90" |
68 | #define DRV_MODULE_RELDATE "March 20, 2008" | 68 | #define DRV_MODULE_RELDATE "April 12, 2008" |
69 | 69 | ||
70 | #define TG3_DEF_MAC_MODE 0 | 70 | #define TG3_DEF_MAC_MODE 0 |
71 | #define TG3_DEF_RX_MODE 0 | 71 | #define TG3_DEF_RX_MODE 0 |
@@ -804,6 +804,12 @@ static int tg3_writephy(struct tg3 *tp, int reg, u32 val) | |||
804 | return ret; | 804 | return ret; |
805 | } | 805 | } |
806 | 806 | ||
807 | static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val) | ||
808 | { | ||
809 | tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg); | ||
810 | tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val); | ||
811 | } | ||
812 | |||
807 | static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable) | 813 | static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable) |
808 | { | 814 | { |
809 | u32 phy; | 815 | u32 phy; |
@@ -886,6 +892,49 @@ static int tg3_bmcr_reset(struct tg3 *tp) | |||
886 | return 0; | 892 | return 0; |
887 | } | 893 | } |
888 | 894 | ||
895 | static void tg3_phy_apply_otp(struct tg3 *tp) | ||
896 | { | ||
897 | u32 otp, phy; | ||
898 | |||
899 | if (!tp->phy_otp) | ||
900 | return; | ||
901 | |||
902 | otp = tp->phy_otp; | ||
903 | |||
904 | /* Enable SM_DSP clock and tx 6dB coding. */ | ||
905 | phy = MII_TG3_AUXCTL_SHDWSEL_AUXCTL | | ||
906 | MII_TG3_AUXCTL_ACTL_SMDSP_ENA | | ||
907 | MII_TG3_AUXCTL_ACTL_TX_6DB; | ||
908 | tg3_writephy(tp, MII_TG3_AUX_CTRL, phy); | ||
909 | |||
910 | phy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT); | ||
911 | phy |= MII_TG3_DSP_TAP1_AGCTGT_DFLT; | ||
912 | tg3_phydsp_write(tp, MII_TG3_DSP_TAP1, phy); | ||
913 | |||
914 | phy = ((otp & TG3_OTP_HPFFLTR_MASK) >> TG3_OTP_HPFFLTR_SHIFT) | | ||
915 | ((otp & TG3_OTP_HPFOVER_MASK) >> TG3_OTP_HPFOVER_SHIFT); | ||
916 | tg3_phydsp_write(tp, MII_TG3_DSP_AADJ1CH0, phy); | ||
917 | |||
918 | phy = ((otp & TG3_OTP_LPFDIS_MASK) >> TG3_OTP_LPFDIS_SHIFT); | ||
919 | phy |= MII_TG3_DSP_AADJ1CH3_ADCCKADJ; | ||
920 | tg3_phydsp_write(tp, MII_TG3_DSP_AADJ1CH3, phy); | ||
921 | |||
922 | phy = ((otp & TG3_OTP_VDAC_MASK) >> TG3_OTP_VDAC_SHIFT); | ||
923 | tg3_phydsp_write(tp, MII_TG3_DSP_EXP75, phy); | ||
924 | |||
925 | phy = ((otp & TG3_OTP_10BTAMP_MASK) >> TG3_OTP_10BTAMP_SHIFT); | ||
926 | tg3_phydsp_write(tp, MII_TG3_DSP_EXP96, phy); | ||
927 | |||
928 | phy = ((otp & TG3_OTP_ROFF_MASK) >> TG3_OTP_ROFF_SHIFT) | | ||
929 | ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT); | ||
930 | tg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy); | ||
931 | |||
932 | /* Turn off SM_DSP clock. */ | ||
933 | phy = MII_TG3_AUXCTL_SHDWSEL_AUXCTL | | ||
934 | MII_TG3_AUXCTL_ACTL_TX_6DB; | ||
935 | tg3_writephy(tp, MII_TG3_AUX_CTRL, phy); | ||
936 | } | ||
937 | |||
889 | static int tg3_wait_macro_done(struct tg3 *tp) | 938 | static int tg3_wait_macro_done(struct tg3 *tp) |
890 | { | 939 | { |
891 | int limit = 100; | 940 | int limit = 100; |
@@ -1073,6 +1122,7 @@ static void tg3_link_report(struct tg3 *); | |||
1073 | */ | 1122 | */ |
1074 | static int tg3_phy_reset(struct tg3 *tp) | 1123 | static int tg3_phy_reset(struct tg3 *tp) |
1075 | { | 1124 | { |
1125 | u32 cpmuctrl; | ||
1076 | u32 phy_status; | 1126 | u32 phy_status; |
1077 | int err; | 1127 | int err; |
1078 | 1128 | ||
@@ -1102,10 +1152,28 @@ static int tg3_phy_reset(struct tg3 *tp) | |||
1102 | goto out; | 1152 | goto out; |
1103 | } | 1153 | } |
1104 | 1154 | ||
1155 | cpmuctrl = 0; | ||
1156 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 && | ||
1157 | GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) { | ||
1158 | cpmuctrl = tr32(TG3_CPMU_CTRL); | ||
1159 | if (cpmuctrl & CPMU_CTRL_GPHY_10MB_RXONLY) | ||
1160 | tw32(TG3_CPMU_CTRL, | ||
1161 | cpmuctrl & ~CPMU_CTRL_GPHY_10MB_RXONLY); | ||
1162 | } | ||
1163 | |||
1105 | err = tg3_bmcr_reset(tp); | 1164 | err = tg3_bmcr_reset(tp); |
1106 | if (err) | 1165 | if (err) |
1107 | return err; | 1166 | return err; |
1108 | 1167 | ||
1168 | if (cpmuctrl & CPMU_CTRL_GPHY_10MB_RXONLY) { | ||
1169 | u32 phy; | ||
1170 | |||
1171 | phy = MII_TG3_DSP_EXP8_AEDW | MII_TG3_DSP_EXP8_REJ2MHz; | ||
1172 | tg3_phydsp_write(tp, MII_TG3_DSP_EXP8, phy); | ||
1173 | |||
1174 | tw32(TG3_CPMU_CTRL, cpmuctrl); | ||
1175 | } | ||
1176 | |||
1109 | if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) { | 1177 | if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) { |
1110 | u32 val; | 1178 | u32 val; |
1111 | 1179 | ||
@@ -1124,6 +1192,8 @@ static int tg3_phy_reset(struct tg3 *tp) | |||
1124 | MII_TG3_MISC_SHDW_APD_WKTM_84MS); | 1192 | MII_TG3_MISC_SHDW_APD_WKTM_84MS); |
1125 | } | 1193 | } |
1126 | 1194 | ||
1195 | tg3_phy_apply_otp(tp); | ||
1196 | |||
1127 | out: | 1197 | out: |
1128 | if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) { | 1198 | if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) { |
1129 | tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00); | 1199 | tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00); |
@@ -9464,7 +9534,8 @@ static int tg3_test_loopback(struct tg3 *tp) | |||
9464 | if (err) | 9534 | if (err) |
9465 | return TG3_LOOPBACK_FAILED; | 9535 | return TG3_LOOPBACK_FAILED; |
9466 | 9536 | ||
9467 | if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) { | 9537 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || |
9538 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) { | ||
9468 | int i; | 9539 | int i; |
9469 | u32 status; | 9540 | u32 status; |
9470 | 9541 | ||
@@ -9481,17 +9552,23 @@ static int tg3_test_loopback(struct tg3 *tp) | |||
9481 | if (status != CPMU_MUTEX_GNT_DRIVER) | 9552 | if (status != CPMU_MUTEX_GNT_DRIVER) |
9482 | return TG3_LOOPBACK_FAILED; | 9553 | return TG3_LOOPBACK_FAILED; |
9483 | 9554 | ||
9484 | /* Turn off power management based on link speed. */ | 9555 | /* Turn off link-based power management. */ |
9485 | cpmuctrl = tr32(TG3_CPMU_CTRL); | 9556 | cpmuctrl = tr32(TG3_CPMU_CTRL); |
9486 | tw32(TG3_CPMU_CTRL, | 9557 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || |
9487 | cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE | | 9558 | GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5761_AX) |
9488 | CPMU_CTRL_LINK_AWARE_MODE)); | 9559 | tw32(TG3_CPMU_CTRL, |
9560 | cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE | | ||
9561 | CPMU_CTRL_LINK_AWARE_MODE)); | ||
9562 | else | ||
9563 | tw32(TG3_CPMU_CTRL, | ||
9564 | cpmuctrl & ~CPMU_CTRL_LINK_AWARE_MODE); | ||
9489 | } | 9565 | } |
9490 | 9566 | ||
9491 | if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK)) | 9567 | if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK)) |
9492 | err |= TG3_MAC_LOOPBACK_FAILED; | 9568 | err |= TG3_MAC_LOOPBACK_FAILED; |
9493 | 9569 | ||
9494 | if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) { | 9570 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || |
9571 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) { | ||
9495 | tw32(TG3_CPMU_CTRL, cpmuctrl); | 9572 | tw32(TG3_CPMU_CTRL, cpmuctrl); |
9496 | 9573 | ||
9497 | /* Release the mutex */ | 9574 | /* Release the mutex */ |
@@ -10724,9 +10801,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) | |||
10724 | tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL) | 10801 | tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL) |
10725 | tp->led_ctrl = LED_CTRL_MODE_PHY_2; | 10802 | tp->led_ctrl = LED_CTRL_MODE_PHY_2; |
10726 | 10803 | ||
10727 | if (tp->pci_chip_rev_id == CHIPREV_ID_5784_A0 || | 10804 | if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5784_AX) |
10728 | tp->pci_chip_rev_id == CHIPREV_ID_5784_A1) | 10805 | tp->led_ctrl = LED_CTRL_MODE_PHY_1; |
10729 | tp->led_ctrl = LED_CTRL_MODE_MAC; | ||
10730 | 10806 | ||
10731 | if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP) { | 10807 | if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP) { |
10732 | tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT; | 10808 | tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT; |
@@ -10773,6 +10849,55 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) | |||
10773 | } | 10849 | } |
10774 | } | 10850 | } |
10775 | 10851 | ||
10852 | static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd) | ||
10853 | { | ||
10854 | int i; | ||
10855 | u32 val; | ||
10856 | |||
10857 | tw32(OTP_CTRL, cmd | OTP_CTRL_OTP_CMD_START); | ||
10858 | tw32(OTP_CTRL, cmd); | ||
10859 | |||
10860 | /* Wait for up to 1 ms for command to execute. */ | ||
10861 | for (i = 0; i < 100; i++) { | ||
10862 | val = tr32(OTP_STATUS); | ||
10863 | if (val & OTP_STATUS_CMD_DONE) | ||
10864 | break; | ||
10865 | udelay(10); | ||
10866 | } | ||
10867 | |||
10868 | return (val & OTP_STATUS_CMD_DONE) ? 0 : -EBUSY; | ||
10869 | } | ||
10870 | |||
10871 | /* Read the gphy configuration from the OTP region of the chip. The gphy | ||
10872 | * configuration is a 32-bit value that straddles the alignment boundary. | ||
10873 | * We do two 32-bit reads and then shift and merge the results. | ||
10874 | */ | ||
10875 | static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp) | ||
10876 | { | ||
10877 | u32 bhalf_otp, thalf_otp; | ||
10878 | |||
10879 | tw32(OTP_MODE, OTP_MODE_OTP_THRU_GRC); | ||
10880 | |||
10881 | if (tg3_issue_otp_command(tp, OTP_CTRL_OTP_CMD_INIT)) | ||
10882 | return 0; | ||
10883 | |||
10884 | tw32(OTP_ADDRESS, OTP_ADDRESS_MAGIC1); | ||
10885 | |||
10886 | if (tg3_issue_otp_command(tp, OTP_CTRL_OTP_CMD_READ)) | ||
10887 | return 0; | ||
10888 | |||
10889 | thalf_otp = tr32(OTP_READ_DATA); | ||
10890 | |||
10891 | tw32(OTP_ADDRESS, OTP_ADDRESS_MAGIC2); | ||
10892 | |||
10893 | if (tg3_issue_otp_command(tp, OTP_CTRL_OTP_CMD_READ)) | ||
10894 | return 0; | ||
10895 | |||
10896 | bhalf_otp = tr32(OTP_READ_DATA); | ||
10897 | |||
10898 | return ((thalf_otp & 0x0000ffff) << 16) | (bhalf_otp >> 16); | ||
10899 | } | ||
10900 | |||
10776 | static int __devinit tg3_phy_probe(struct tg3 *tp) | 10901 | static int __devinit tg3_phy_probe(struct tg3 *tp) |
10777 | { | 10902 | { |
10778 | u32 hw_phy_id_1, hw_phy_id_2; | 10903 | u32 hw_phy_id_1, hw_phy_id_2; |
@@ -11586,6 +11711,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
11586 | tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG; | 11711 | tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG; |
11587 | } | 11712 | } |
11588 | 11713 | ||
11714 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 && | ||
11715 | GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) { | ||
11716 | tp->phy_otp = tg3_read_otp_phycfg(tp); | ||
11717 | if (tp->phy_otp == 0) | ||
11718 | tp->phy_otp = TG3_OTP_DEFAULT; | ||
11719 | } | ||
11720 | |||
11589 | tp->coalesce_mode = 0; | 11721 | tp->coalesce_mode = 0; |
11590 | if (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_AX && | 11722 | if (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_AX && |
11591 | GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_BX) | 11723 | GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_BX) |
@@ -12446,7 +12578,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
12446 | const struct pci_device_id *ent) | 12578 | const struct pci_device_id *ent) |
12447 | { | 12579 | { |
12448 | static int tg3_version_printed = 0; | 12580 | static int tg3_version_printed = 0; |
12449 | unsigned long tg3reg_base, tg3reg_len; | 12581 | resource_size_t tg3reg_base; |
12582 | unsigned long tg3reg_len; | ||
12450 | struct net_device *dev; | 12583 | struct net_device *dev; |
12451 | struct tg3 *tp; | 12584 | struct tg3 *tp; |
12452 | int err, pm_cap; | 12585 | int err, pm_cap; |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 3938eb35ce8c..c1075a73d66c 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -138,6 +138,8 @@ | |||
138 | #define CHIPREV_5704_BX 0x21 | 138 | #define CHIPREV_5704_BX 0x21 |
139 | #define CHIPREV_5750_AX 0x40 | 139 | #define CHIPREV_5750_AX 0x40 |
140 | #define CHIPREV_5750_BX 0x41 | 140 | #define CHIPREV_5750_BX 0x41 |
141 | #define CHIPREV_5784_AX 0x57840 | ||
142 | #define CHIPREV_5761_AX 0x57610 | ||
141 | #define GET_METAL_REV(CHIP_REV_ID) ((CHIP_REV_ID) & 0xff) | 143 | #define GET_METAL_REV(CHIP_REV_ID) ((CHIP_REV_ID) & 0xff) |
142 | #define METAL_REV_A0 0x00 | 144 | #define METAL_REV_A0 0x00 |
143 | #define METAL_REV_A1 0x01 | 145 | #define METAL_REV_A1 0x01 |
@@ -866,6 +868,7 @@ | |||
866 | #define CPMU_CTRL_LINK_IDLE_MODE 0x00000200 | 868 | #define CPMU_CTRL_LINK_IDLE_MODE 0x00000200 |
867 | #define CPMU_CTRL_LINK_AWARE_MODE 0x00000400 | 869 | #define CPMU_CTRL_LINK_AWARE_MODE 0x00000400 |
868 | #define CPMU_CTRL_LINK_SPEED_MODE 0x00004000 | 870 | #define CPMU_CTRL_LINK_SPEED_MODE 0x00004000 |
871 | #define CPMU_CTRL_GPHY_10MB_RXONLY 0x00010000 | ||
869 | #define TG3_CPMU_LSPD_10MB_CLK 0x00003604 | 872 | #define TG3_CPMU_LSPD_10MB_CLK 0x00003604 |
870 | #define CPMU_LSPD_10MB_MACCLK_MASK 0x001f0000 | 873 | #define CPMU_LSPD_10MB_MACCLK_MASK 0x001f0000 |
871 | #define CPMU_LSPD_10MB_MACCLK_6_25 0x00130000 | 874 | #define CPMU_LSPD_10MB_MACCLK_6_25 0x00130000 |
@@ -1559,7 +1562,24 @@ | |||
1559 | /* 0x702c unused */ | 1562 | /* 0x702c unused */ |
1560 | 1563 | ||
1561 | #define NVRAM_ADDR_LOCKOUT 0x00007030 | 1564 | #define NVRAM_ADDR_LOCKOUT 0x00007030 |
1562 | /* 0x7034 --> 0x7c00 unused */ | 1565 | /* 0x7034 --> 0x7500 unused */ |
1566 | |||
1567 | #define OTP_MODE 0x00007500 | ||
1568 | #define OTP_MODE_OTP_THRU_GRC 0x00000001 | ||
1569 | #define OTP_CTRL 0x00007504 | ||
1570 | #define OTP_CTRL_OTP_PROG_ENABLE 0x00200000 | ||
1571 | #define OTP_CTRL_OTP_CMD_READ 0x00000000 | ||
1572 | #define OTP_CTRL_OTP_CMD_INIT 0x00000008 | ||
1573 | #define OTP_CTRL_OTP_CMD_START 0x00000001 | ||
1574 | #define OTP_STATUS 0x00007508 | ||
1575 | #define OTP_STATUS_CMD_DONE 0x00000001 | ||
1576 | #define OTP_ADDRESS 0x0000750c | ||
1577 | #define OTP_ADDRESS_MAGIC1 0x000000a0 | ||
1578 | #define OTP_ADDRESS_MAGIC2 0x00000080 | ||
1579 | /* 0x7510 unused */ | ||
1580 | |||
1581 | #define OTP_READ_DATA 0x00007514 | ||
1582 | /* 0x7518 --> 0x7c04 unused */ | ||
1563 | 1583 | ||
1564 | #define PCIE_TRANSACTION_CFG 0x00007c04 | 1584 | #define PCIE_TRANSACTION_CFG 0x00007c04 |
1565 | #define PCIE_TRANS_CFG_1SHOT_MSI 0x20000000 | 1585 | #define PCIE_TRANS_CFG_1SHOT_MSI 0x20000000 |
@@ -1568,6 +1588,28 @@ | |||
1568 | #define PCIE_PWR_MGMT_THRESH 0x00007d28 | 1588 | #define PCIE_PWR_MGMT_THRESH 0x00007d28 |
1569 | #define PCIE_PWR_MGMT_L1_THRESH_MSK 0x0000ff00 | 1589 | #define PCIE_PWR_MGMT_L1_THRESH_MSK 0x0000ff00 |
1570 | 1590 | ||
1591 | |||
1592 | /* OTP bit definitions */ | ||
1593 | #define TG3_OTP_AGCTGT_MASK 0x000000e0 | ||
1594 | #define TG3_OTP_AGCTGT_SHIFT 1 | ||
1595 | #define TG3_OTP_HPFFLTR_MASK 0x00000300 | ||
1596 | #define TG3_OTP_HPFFLTR_SHIFT 1 | ||
1597 | #define TG3_OTP_HPFOVER_MASK 0x00000400 | ||
1598 | #define TG3_OTP_HPFOVER_SHIFT 1 | ||
1599 | #define TG3_OTP_LPFDIS_MASK 0x00000800 | ||
1600 | #define TG3_OTP_LPFDIS_SHIFT 11 | ||
1601 | #define TG3_OTP_VDAC_MASK 0xff000000 | ||
1602 | #define TG3_OTP_VDAC_SHIFT 24 | ||
1603 | #define TG3_OTP_10BTAMP_MASK 0x0000f000 | ||
1604 | #define TG3_OTP_10BTAMP_SHIFT 8 | ||
1605 | #define TG3_OTP_ROFF_MASK 0x00e00000 | ||
1606 | #define TG3_OTP_ROFF_SHIFT 11 | ||
1607 | #define TG3_OTP_RCOFF_MASK 0x001c0000 | ||
1608 | #define TG3_OTP_RCOFF_SHIFT 16 | ||
1609 | |||
1610 | #define TG3_OTP_DEFAULT 0x286c1640 | ||
1611 | |||
1612 | |||
1571 | #define TG3_EEPROM_MAGIC 0x669955aa | 1613 | #define TG3_EEPROM_MAGIC 0x669955aa |
1572 | #define TG3_EEPROM_MAGIC_FW 0xa5000000 | 1614 | #define TG3_EEPROM_MAGIC_FW 0xa5000000 |
1573 | #define TG3_EEPROM_MAGIC_FW_MSK 0xff000000 | 1615 | #define TG3_EEPROM_MAGIC_FW_MSK 0xff000000 |
@@ -1705,15 +1747,31 @@ | |||
1705 | 1747 | ||
1706 | #define MII_TG3_DSP_RW_PORT 0x15 /* DSP coefficient read/write port */ | 1748 | #define MII_TG3_DSP_RW_PORT 0x15 /* DSP coefficient read/write port */ |
1707 | 1749 | ||
1708 | #define MII_TG3_DSP_ADDRESS 0x17 /* DSP address register */ | ||
1709 | #define MII_TG3_EPHY_PTEST 0x17 /* 5906 PHY register */ | 1750 | #define MII_TG3_EPHY_PTEST 0x17 /* 5906 PHY register */ |
1751 | #define MII_TG3_DSP_ADDRESS 0x17 /* DSP address register */ | ||
1752 | |||
1753 | #define MII_TG3_DSP_TAP1 0x0001 | ||
1754 | #define MII_TG3_DSP_TAP1_AGCTGT_DFLT 0x0007 | ||
1755 | #define MII_TG3_DSP_AADJ1CH0 0x001f | ||
1756 | #define MII_TG3_DSP_AADJ1CH3 0x601f | ||
1757 | #define MII_TG3_DSP_AADJ1CH3_ADCCKADJ 0x0002 | ||
1758 | #define MII_TG3_DSP_EXP8 0x0708 | ||
1759 | #define MII_TG3_DSP_EXP8_REJ2MHz 0x0001 | ||
1760 | #define MII_TG3_DSP_EXP8_AEDW 0x0200 | ||
1761 | #define MII_TG3_DSP_EXP75 0x0f75 | ||
1762 | #define MII_TG3_DSP_EXP96 0x0f96 | ||
1763 | #define MII_TG3_DSP_EXP97 0x0f97 | ||
1710 | 1764 | ||
1711 | #define MII_TG3_AUX_CTRL 0x18 /* auxilliary control register */ | 1765 | #define MII_TG3_AUX_CTRL 0x18 /* auxilliary control register */ |
1712 | 1766 | ||
1713 | #define MII_TG3_AUXCTL_MISC_WREN 0x8000 | 1767 | #define MII_TG3_AUXCTL_MISC_WREN 0x8000 |
1714 | #define MII_TG3_AUXCTL_MISC_FORCE_AMDIX 0x0200 | 1768 | #define MII_TG3_AUXCTL_MISC_FORCE_AMDIX 0x0200 |
1715 | #define MII_TG3_AUXCTL_MISC_RDSEL_MISC 0x7000 | 1769 | #define MII_TG3_AUXCTL_MISC_RDSEL_MISC 0x7000 |
1716 | #define MII_TG3_AUXCTL_SHDWSEL_MISC 0x0007 | 1770 | #define MII_TG3_AUXCTL_SHDWSEL_MISC 0x0007 |
1771 | |||
1772 | #define MII_TG3_AUXCTL_ACTL_SMDSP_ENA 0x0800 | ||
1773 | #define MII_TG3_AUXCTL_ACTL_TX_6DB 0x0400 | ||
1774 | #define MII_TG3_AUXCTL_SHDWSEL_AUXCTL 0x0000 | ||
1717 | 1775 | ||
1718 | #define MII_TG3_AUX_STAT 0x19 /* auxilliary status register */ | 1776 | #define MII_TG3_AUX_STAT 0x19 /* auxilliary status register */ |
1719 | #define MII_TG3_AUX_STAT_LPASS 0x0004 | 1777 | #define MII_TG3_AUX_STAT_LPASS 0x0004 |
@@ -1743,6 +1801,20 @@ | |||
1743 | #define MII_TG3_INT_DUPLEXCHG 0x0008 | 1801 | #define MII_TG3_INT_DUPLEXCHG 0x0008 |
1744 | #define MII_TG3_INT_ANEG_PAGE_RX 0x0400 | 1802 | #define MII_TG3_INT_ANEG_PAGE_RX 0x0400 |
1745 | 1803 | ||
1804 | #define MII_TG3_MISC_SHDW 0x1c | ||
1805 | #define MII_TG3_MISC_SHDW_WREN 0x8000 | ||
1806 | #define MII_TG3_MISC_SHDW_SCR5_SEL 0x1400 | ||
1807 | #define MII_TG3_MISC_SHDW_APD_SEL 0x2800 | ||
1808 | |||
1809 | #define MII_TG3_MISC_SHDW_SCR5_C125OE 0x0001 | ||
1810 | #define MII_TG3_MISC_SHDW_SCR5_DLLAPD 0x0002 | ||
1811 | #define MII_TG3_MISC_SHDW_SCR5_SDTL 0x0004 | ||
1812 | #define MII_TG3_MISC_SHDW_SCR5_DLPTLM 0x0008 | ||
1813 | #define MII_TG3_MISC_SHDW_SCR5_LPED 0x0010 | ||
1814 | |||
1815 | #define MII_TG3_MISC_SHDW_APD_WKTM_84MS 0x0001 | ||
1816 | #define MII_TG3_MISC_SHDW_APD_ENABLE 0x0020 | ||
1817 | |||
1746 | #define MII_TG3_EPHY_TEST 0x1f /* 5906 PHY register */ | 1818 | #define MII_TG3_EPHY_TEST 0x1f /* 5906 PHY register */ |
1747 | #define MII_TG3_EPHY_SHADOW_EN 0x80 | 1819 | #define MII_TG3_EPHY_SHADOW_EN 0x80 |
1748 | 1820 | ||
@@ -2473,6 +2545,7 @@ struct tg3 { | |||
2473 | #define PHY_REV_BCM5411_X0 0x1 /* Found on Netgear GA302T */ | 2545 | #define PHY_REV_BCM5411_X0 0x1 /* Found on Netgear GA302T */ |
2474 | 2546 | ||
2475 | u32 led_ctrl; | 2547 | u32 led_ctrl; |
2548 | u32 phy_otp; | ||
2476 | u16 pci_cmd; | 2549 | u16 pci_cmd; |
2477 | 2550 | ||
2478 | char board_part_number[24]; | 2551 | char board_part_number[24]; |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 433c994ea9d8..0ab51a0f35fc 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -117,7 +117,7 @@ | |||
117 | * Official releases will only have an a.b.c version number format. | 117 | * Official releases will only have an a.b.c version number format. |
118 | */ | 118 | */ |
119 | 119 | ||
120 | static char version[] __devinitdata = | 120 | static char version[] = |
121 | "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ; | 121 | "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ; |
122 | 122 | ||
123 | static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion", | 123 | static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion", |
@@ -290,7 +290,7 @@ op_disable_dev: | |||
290 | return i; | 290 | return i; |
291 | } | 291 | } |
292 | 292 | ||
293 | static int __devinit olympic_init(struct net_device *dev) | 293 | static int olympic_init(struct net_device *dev) |
294 | { | 294 | { |
295 | struct olympic_private *olympic_priv; | 295 | struct olympic_private *olympic_priv; |
296 | u8 __iomem *olympic_mmio, *init_srb,*adapter_addr; | 296 | u8 __iomem *olympic_mmio, *init_srb,*adapter_addr; |
@@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev) | |||
434 | 434 | ||
435 | } | 435 | } |
436 | 436 | ||
437 | static int __devinit olympic_open(struct net_device *dev) | 437 | static int olympic_open(struct net_device *dev) |
438 | { | 438 | { |
439 | struct olympic_private *olympic_priv=netdev_priv(dev); | 439 | struct olympic_private *olympic_priv=netdev_priv(dev); |
440 | u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb; | 440 | u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb; |
@@ -1438,13 +1438,18 @@ static void olympic_arb_cmd(struct net_device *dev) | |||
1438 | 1438 | ||
1439 | if (olympic_priv->olympic_network_monitor) { | 1439 | if (olympic_priv->olympic_network_monitor) { |
1440 | struct trh_hdr *mac_hdr; | 1440 | struct trh_hdr *mac_hdr; |
1441 | DECLARE_MAC_BUF(mac); | ||
1442 | printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name); | 1441 | printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name); |
1443 | mac_hdr = tr_hdr(mac_frame); | 1442 | mac_hdr = tr_hdr(mac_frame); |
1444 | printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %s\n", | 1443 | printk(KERN_WARNING "%s: MAC Frame Dest. Addr: " |
1445 | dev->name, print_mac(mac, mac_hdr->daddr)); | 1444 | MAC_FMT " \n", dev->name, |
1446 | printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %s\n", | 1445 | mac_hdr->daddr[0], mac_hdr->daddr[1], |
1447 | dev->name, print_mac(mac, mac_hdr->saddr)); | 1446 | mac_hdr->daddr[2], mac_hdr->daddr[3], |
1447 | mac_hdr->daddr[4], mac_hdr->daddr[5]); | ||
1448 | printk(KERN_WARNING "%s: MAC Frame Srce. Addr: " | ||
1449 | MAC_FMT " \n", dev->name, | ||
1450 | mac_hdr->saddr[0], mac_hdr->saddr[1], | ||
1451 | mac_hdr->saddr[2], mac_hdr->saddr[3], | ||
1452 | mac_hdr->saddr[4], mac_hdr->saddr[5]); | ||
1448 | } | 1453 | } |
1449 | netif_rx(mac_frame); | 1454 | netif_rx(mac_frame); |
1450 | dev->last_rx = jiffies; | 1455 | dev->last_rx = jiffies; |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 7b816a032957..5b5d87585d91 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -67,9 +67,42 @@ | |||
67 | #include <asm/system.h> | 67 | #include <asm/system.h> |
68 | #include <asm/uaccess.h> | 68 | #include <asm/uaccess.h> |
69 | 69 | ||
70 | /* Uncomment to enable debugging */ | ||
71 | /* #define TUN_DEBUG 1 */ | ||
72 | |||
70 | #ifdef TUN_DEBUG | 73 | #ifdef TUN_DEBUG |
71 | static int debug; | 74 | static int debug; |
75 | |||
76 | #define DBG if(tun->debug)printk | ||
77 | #define DBG1 if(debug==2)printk | ||
78 | #else | ||
79 | #define DBG( a... ) | ||
80 | #define DBG1( a... ) | ||
81 | #endif | ||
82 | |||
83 | struct tun_struct { | ||
84 | struct list_head list; | ||
85 | unsigned long flags; | ||
86 | int attached; | ||
87 | uid_t owner; | ||
88 | gid_t group; | ||
89 | |||
90 | wait_queue_head_t read_wait; | ||
91 | struct sk_buff_head readq; | ||
92 | |||
93 | struct net_device *dev; | ||
94 | |||
95 | struct fasync_struct *fasync; | ||
96 | |||
97 | unsigned long if_flags; | ||
98 | u8 dev_addr[ETH_ALEN]; | ||
99 | u32 chr_filter[2]; | ||
100 | u32 net_filter[2]; | ||
101 | |||
102 | #ifdef TUN_DEBUG | ||
103 | int debug; | ||
72 | #endif | 104 | #endif |
105 | }; | ||
73 | 106 | ||
74 | /* Network device part of the driver */ | 107 | /* Network device part of the driver */ |
75 | 108 | ||
@@ -253,8 +286,11 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, | |||
253 | return -EFAULT; | 286 | return -EFAULT; |
254 | } | 287 | } |
255 | 288 | ||
256 | if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) | 289 | if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) { |
257 | align = NET_IP_ALIGN; | 290 | align = NET_IP_ALIGN; |
291 | if (unlikely(len < ETH_HLEN)) | ||
292 | return -EINVAL; | ||
293 | } | ||
258 | 294 | ||
259 | if (!(skb = alloc_skb(len + align, GFP_KERNEL))) { | 295 | if (!(skb = alloc_skb(len + align, GFP_KERNEL))) { |
260 | tun->dev->stats.rx_dropped++; | 296 | tun->dev->stats.rx_dropped++; |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 8cc316653a39..0ee4c168e4c0 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -3833,6 +3833,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3833 | struct device_node *phy; | 3833 | struct device_node *phy; |
3834 | int err, ucc_num, max_speed = 0; | 3834 | int err, ucc_num, max_speed = 0; |
3835 | const phandle *ph; | 3835 | const phandle *ph; |
3836 | const u32 *fixed_link; | ||
3836 | const unsigned int *prop; | 3837 | const unsigned int *prop; |
3837 | const char *sprop; | 3838 | const char *sprop; |
3838 | const void *mac_addr; | 3839 | const void *mac_addr; |
@@ -3923,18 +3924,38 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3923 | 3924 | ||
3924 | ug_info->uf_info.regs = res.start; | 3925 | ug_info->uf_info.regs = res.start; |
3925 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); | 3926 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); |
3927 | fixed_link = of_get_property(np, "fixed-link", NULL); | ||
3928 | if (fixed_link) { | ||
3929 | ug_info->mdio_bus = 0; | ||
3930 | ug_info->phy_address = fixed_link[0]; | ||
3931 | phy = NULL; | ||
3932 | } else { | ||
3933 | ph = of_get_property(np, "phy-handle", NULL); | ||
3934 | phy = of_find_node_by_phandle(*ph); | ||
3926 | 3935 | ||
3927 | ph = of_get_property(np, "phy-handle", NULL); | 3936 | if (phy == NULL) |
3928 | phy = of_find_node_by_phandle(*ph); | 3937 | return -ENODEV; |
3929 | 3938 | ||
3930 | if (phy == NULL) | 3939 | /* set the PHY address */ |
3931 | return -ENODEV; | 3940 | prop = of_get_property(phy, "reg", NULL); |
3941 | if (prop == NULL) | ||
3942 | return -1; | ||
3943 | ug_info->phy_address = *prop; | ||
3944 | |||
3945 | /* Set the bus id */ | ||
3946 | mdio = of_get_parent(phy); | ||
3947 | |||
3948 | if (mdio == NULL) | ||
3949 | return -1; | ||
3932 | 3950 | ||
3933 | /* set the PHY address */ | 3951 | err = of_address_to_resource(mdio, 0, &res); |
3934 | prop = of_get_property(phy, "reg", NULL); | 3952 | of_node_put(mdio); |
3935 | if (prop == NULL) | 3953 | |
3936 | return -1; | 3954 | if (err) |
3937 | ug_info->phy_address = *prop; | 3955 | return -1; |
3956 | |||
3957 | ug_info->mdio_bus = res.start; | ||
3958 | } | ||
3938 | 3959 | ||
3939 | /* get the phy interface type, or default to MII */ | 3960 | /* get the phy interface type, or default to MII */ |
3940 | prop = of_get_property(np, "phy-connection-type", NULL); | 3961 | prop = of_get_property(np, "phy-connection-type", NULL); |
@@ -3979,20 +4000,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3979 | ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4; | 4000 | ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4; |
3980 | } | 4001 | } |
3981 | 4002 | ||
3982 | /* Set the bus id */ | ||
3983 | mdio = of_get_parent(phy); | ||
3984 | |||
3985 | if (mdio == NULL) | ||
3986 | return -1; | ||
3987 | |||
3988 | err = of_address_to_resource(mdio, 0, &res); | ||
3989 | of_node_put(mdio); | ||
3990 | |||
3991 | if (err) | ||
3992 | return -1; | ||
3993 | |||
3994 | ug_info->mdio_bus = res.start; | ||
3995 | |||
3996 | if (netif_msg_probe(&debug)) | 4003 | if (netif_msg_probe(&debug)) |
3997 | printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n", | 4004 | printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n", |
3998 | ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs, | 4005 | ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs, |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b58472cf76f8..555b70c8b863 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -234,11 +234,12 @@ static int start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
234 | struct scatterlist sg[1+MAX_SKB_FRAGS]; | 234 | struct scatterlist sg[1+MAX_SKB_FRAGS]; |
235 | struct virtio_net_hdr *hdr; | 235 | struct virtio_net_hdr *hdr; |
236 | const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; | 236 | const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; |
237 | DECLARE_MAC_BUF(mac); | ||
238 | 237 | ||
239 | sg_init_table(sg, 1+MAX_SKB_FRAGS); | 238 | sg_init_table(sg, 1+MAX_SKB_FRAGS); |
240 | 239 | ||
241 | pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest)); | 240 | pr_debug("%s: xmit %p " MAC_FMT "\n", dev->name, skb, |
241 | dest[0], dest[1], dest[2], | ||
242 | dest[3], dest[4], dest[5]); | ||
242 | 243 | ||
243 | /* Encode metadata header at front. */ | 244 | /* Encode metadata header at front. */ |
244 | hdr = skb_vnet_hdr(skb); | 245 | hdr = skb_vnet_hdr(skb); |
@@ -284,7 +285,6 @@ again: | |||
284 | /* Activate callback for using skbs: if this returns false it | 285 | /* Activate callback for using skbs: if this returns false it |
285 | * means some were used in the meantime. */ | 286 | * means some were used in the meantime. */ |
286 | if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) { | 287 | if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) { |
287 | printk("Unlikely: restart svq race\n"); | ||
288 | vi->svq->vq_ops->disable_cb(vi->svq); | 288 | vi->svq->vq_ops->disable_cb(vi->svq); |
289 | netif_start_queue(dev); | 289 | netif_start_queue(dev); |
290 | goto again; | 290 | goto again; |
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index a3df09ee729f..8005dd16fb4e 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig | |||
@@ -150,9 +150,13 @@ config HDLC_FR | |||
150 | 150 | ||
151 | config HDLC_PPP | 151 | config HDLC_PPP |
152 | tristate "Synchronous Point-to-Point Protocol (PPP) support" | 152 | tristate "Synchronous Point-to-Point Protocol (PPP) support" |
153 | depends on HDLC | 153 | depends on HDLC && BROKEN |
154 | help | 154 | help |
155 | Generic HDLC driver supporting PPP over WAN connections. | 155 | Generic HDLC driver supporting PPP over WAN connections. |
156 | This module is currently broken and will cause a kernel panic | ||
157 | when a device configured in PPP mode is activated. | ||
158 | |||
159 | It will be replaced by new PPP implementation in Linux 2.6.26. | ||
156 | 160 | ||
157 | If unsure, say N. | 161 | If unsure, say N. |
158 | 162 | ||
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c index 49978bdb4324..4fd73809602e 100644 --- a/drivers/net/wireless/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/hostap/hostap_80211_rx.c | |||
@@ -635,7 +635,6 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb, | |||
635 | { | 635 | { |
636 | struct ieee80211_hdr_4addr *hdr; | 636 | struct ieee80211_hdr_4addr *hdr; |
637 | int res, hdrlen; | 637 | int res, hdrlen; |
638 | DECLARE_MAC_BUF(mac); | ||
639 | 638 | ||
640 | if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) | 639 | if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) |
641 | return 0; | 640 | return 0; |
@@ -647,8 +646,10 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb, | |||
647 | strcmp(crypt->ops->name, "TKIP") == 0) { | 646 | strcmp(crypt->ops->name, "TKIP") == 0) { |
648 | if (net_ratelimit()) { | 647 | if (net_ratelimit()) { |
649 | printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " | 648 | printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " |
650 | "received packet from %s\n", | 649 | "received packet from " MAC_FMT "\n", |
651 | local->dev->name, print_mac(mac, hdr->addr2)); | 650 | local->dev->name, |
651 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
652 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
652 | } | 653 | } |
653 | return -1; | 654 | return -1; |
654 | } | 655 | } |
@@ -657,9 +658,12 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb, | |||
657 | res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); | 658 | res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); |
658 | atomic_dec(&crypt->refcnt); | 659 | atomic_dec(&crypt->refcnt); |
659 | if (res < 0) { | 660 | if (res < 0) { |
660 | printk(KERN_DEBUG "%s: decryption failed (SA=%s" | 661 | printk(KERN_DEBUG "%s: decryption failed (SA=" MAC_FMT |
661 | ") res=%d\n", | 662 | ") res=%d\n", |
662 | local->dev->name, print_mac(mac, hdr->addr2), res); | 663 | local->dev->name, |
664 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
665 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
666 | res); | ||
663 | local->comm_tallies.rx_discards_wep_undecryptable++; | 667 | local->comm_tallies.rx_discards_wep_undecryptable++; |
664 | return -1; | 668 | return -1; |
665 | } | 669 | } |
@@ -721,7 +725,6 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
721 | struct ieee80211_crypt_data *crypt = NULL; | 725 | struct ieee80211_crypt_data *crypt = NULL; |
722 | void *sta = NULL; | 726 | void *sta = NULL; |
723 | int keyidx = 0; | 727 | int keyidx = 0; |
724 | DECLARE_MAC_BUF(mac); | ||
725 | 728 | ||
726 | iface = netdev_priv(dev); | 729 | iface = netdev_priv(dev); |
727 | local = iface->local; | 730 | local = iface->local; |
@@ -798,8 +801,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
798 | * frames silently instead of filling system log with | 801 | * frames silently instead of filling system log with |
799 | * these reports. */ | 802 | * these reports. */ |
800 | printk(KERN_DEBUG "%s: WEP decryption failed (not set)" | 803 | printk(KERN_DEBUG "%s: WEP decryption failed (not set)" |
801 | " (SA=%s)\n", | 804 | " (SA=" MAC_FMT ")\n", |
802 | local->dev->name, print_mac(mac, hdr->addr2)); | 805 | local->dev->name, |
806 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
807 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
803 | #endif | 808 | #endif |
804 | local->comm_tallies.rx_discards_wep_undecryptable++; | 809 | local->comm_tallies.rx_discards_wep_undecryptable++; |
805 | goto rx_dropped; | 810 | goto rx_dropped; |
@@ -813,8 +818,9 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
813 | (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) | 818 | (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) |
814 | { | 819 | { |
815 | printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " | 820 | printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " |
816 | "from %s\n", dev->name, | 821 | "from " MAC_FMT "\n", dev->name, |
817 | print_mac(mac, hdr->addr2)); | 822 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
823 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
818 | /* TODO: could inform hostapd about this so that it | 824 | /* TODO: could inform hostapd about this so that it |
819 | * could send auth failure report */ | 825 | * could send auth failure report */ |
820 | goto rx_dropped; | 826 | goto rx_dropped; |
@@ -982,8 +988,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
982 | "unencrypted EAPOL frame\n", local->dev->name); | 988 | "unencrypted EAPOL frame\n", local->dev->name); |
983 | } else { | 989 | } else { |
984 | printk(KERN_DEBUG "%s: encryption configured, but RX " | 990 | printk(KERN_DEBUG "%s: encryption configured, but RX " |
985 | "frame not encrypted (SA=%s)\n", | 991 | "frame not encrypted (SA=" MAC_FMT ")\n", |
986 | local->dev->name, print_mac(mac, hdr->addr2)); | 992 | local->dev->name, |
993 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
994 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
987 | goto rx_dropped; | 995 | goto rx_dropped; |
988 | } | 996 | } |
989 | } | 997 | } |
@@ -992,9 +1000,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
992 | !hostap_is_eapol_frame(local, skb)) { | 1000 | !hostap_is_eapol_frame(local, skb)) { |
993 | if (net_ratelimit()) { | 1001 | if (net_ratelimit()) { |
994 | printk(KERN_DEBUG "%s: dropped unencrypted RX data " | 1002 | printk(KERN_DEBUG "%s: dropped unencrypted RX data " |
995 | "frame from %s" | 1003 | "frame from " MAC_FMT " (drop_unencrypted=1)\n", |
996 | " (drop_unencrypted=1)\n", | 1004 | dev->name, |
997 | dev->name, print_mac(mac, hdr->addr2)); | 1005 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1006 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
998 | } | 1007 | } |
999 | goto rx_dropped; | 1008 | goto rx_dropped; |
1000 | } | 1009 | } |
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c index e7afc3ec3e6d..921c984416f8 100644 --- a/drivers/net/wireless/hostap/hostap_80211_tx.c +++ b/drivers/net/wireless/hostap/hostap_80211_tx.c | |||
@@ -314,7 +314,6 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb, | |||
314 | struct ieee80211_hdr_4addr *hdr; | 314 | struct ieee80211_hdr_4addr *hdr; |
315 | u16 fc; | 315 | u16 fc; |
316 | int prefix_len, postfix_len, hdr_len, res; | 316 | int prefix_len, postfix_len, hdr_len, res; |
317 | DECLARE_MAC_BUF(mac); | ||
318 | 317 | ||
319 | iface = netdev_priv(skb->dev); | 318 | iface = netdev_priv(skb->dev); |
320 | local = iface->local; | 319 | local = iface->local; |
@@ -329,8 +328,10 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb, | |||
329 | hdr = (struct ieee80211_hdr_4addr *) skb->data; | 328 | hdr = (struct ieee80211_hdr_4addr *) skb->data; |
330 | if (net_ratelimit()) { | 329 | if (net_ratelimit()) { |
331 | printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " | 330 | printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " |
332 | "TX packet to %s\n", | 331 | "TX packet to " MAC_FMT "\n", |
333 | local->dev->name, print_mac(mac, hdr->addr1)); | 332 | local->dev->name, |
333 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], | ||
334 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]); | ||
334 | } | 335 | } |
335 | kfree_skb(skb); | 336 | kfree_skb(skb); |
336 | return NULL; | 337 | return NULL; |
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index ad040a3bb8a7..0acd9589c48c 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
@@ -632,7 +632,6 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data) | |||
632 | __le16 *pos; | 632 | __le16 *pos; |
633 | struct sta_info *sta = NULL; | 633 | struct sta_info *sta = NULL; |
634 | char *txt = NULL; | 634 | char *txt = NULL; |
635 | DECLARE_MAC_BUF(mac); | ||
636 | 635 | ||
637 | if (ap->local->hostapd) { | 636 | if (ap->local->hostapd) { |
638 | dev_kfree_skb(skb); | 637 | dev_kfree_skb(skb); |
@@ -684,10 +683,12 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data) | |||
684 | if (sta) | 683 | if (sta) |
685 | atomic_dec(&sta->users); | 684 | atomic_dec(&sta->users); |
686 | if (txt) { | 685 | if (txt) { |
687 | PDEBUG(DEBUG_AP, "%s: %s auth_cb - alg=%d " | 686 | PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth_cb - alg=%d " |
688 | "trans#=%d status=%d - %s\n", | 687 | "trans#=%d status=%d - %s\n", |
689 | dev->name, print_mac(mac, hdr->addr1), auth_alg, | 688 | dev->name, |
690 | auth_transaction, status, txt); | 689 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], |
690 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5], | ||
691 | auth_alg, auth_transaction, status, txt); | ||
691 | } | 692 | } |
692 | dev_kfree_skb(skb); | 693 | dev_kfree_skb(skb); |
693 | } | 694 | } |
@@ -703,7 +704,6 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data) | |||
703 | __le16 *pos; | 704 | __le16 *pos; |
704 | struct sta_info *sta = NULL; | 705 | struct sta_info *sta = NULL; |
705 | char *txt = NULL; | 706 | char *txt = NULL; |
706 | DECLARE_MAC_BUF(mac); | ||
707 | 707 | ||
708 | if (ap->local->hostapd) { | 708 | if (ap->local->hostapd) { |
709 | dev_kfree_skb(skb); | 709 | dev_kfree_skb(skb); |
@@ -754,8 +754,11 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data) | |||
754 | if (sta) | 754 | if (sta) |
755 | atomic_dec(&sta->users); | 755 | atomic_dec(&sta->users); |
756 | if (txt) { | 756 | if (txt) { |
757 | PDEBUG(DEBUG_AP, "%s: %s assoc_cb - %s\n", | 757 | PDEBUG(DEBUG_AP, "%s: " MAC_FMT " assoc_cb - %s\n", |
758 | dev->name, print_mac(mac, hdr->addr1), txt); | 758 | dev->name, |
759 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], | ||
760 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5], | ||
761 | txt); | ||
759 | } | 762 | } |
760 | dev_kfree_skb(skb); | 763 | dev_kfree_skb(skb); |
761 | } | 764 | } |
@@ -767,7 +770,6 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data) | |||
767 | struct ap_data *ap = data; | 770 | struct ap_data *ap = data; |
768 | struct ieee80211_hdr_4addr *hdr; | 771 | struct ieee80211_hdr_4addr *hdr; |
769 | struct sta_info *sta; | 772 | struct sta_info *sta; |
770 | DECLARE_MAC_BUF(mac); | ||
771 | 773 | ||
772 | if (skb->len < 24) | 774 | if (skb->len < 24) |
773 | goto fail; | 775 | goto fail; |
@@ -779,9 +781,11 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data) | |||
779 | sta->flags &= ~WLAN_STA_PENDING_POLL; | 781 | sta->flags &= ~WLAN_STA_PENDING_POLL; |
780 | spin_unlock(&ap->sta_table_lock); | 782 | spin_unlock(&ap->sta_table_lock); |
781 | } else { | 783 | } else { |
782 | PDEBUG(DEBUG_AP, "%s: STA %s" | 784 | PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT |
783 | " did not ACK activity poll frame\n", | 785 | " did not ACK activity poll frame\n", |
784 | ap->local->dev->name, print_mac(mac, hdr->addr1)); | 786 | ap->local->dev->name, |
787 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], | ||
788 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]); | ||
785 | } | 789 | } |
786 | 790 | ||
787 | fail: | 791 | fail: |
@@ -1306,7 +1310,6 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb, | |||
1306 | struct sta_info *sta = NULL; | 1310 | struct sta_info *sta = NULL; |
1307 | struct ieee80211_crypt_data *crypt; | 1311 | struct ieee80211_crypt_data *crypt; |
1308 | char *txt = ""; | 1312 | char *txt = ""; |
1309 | DECLARE_MAC_BUF(mac); | ||
1310 | 1313 | ||
1311 | len = skb->len - IEEE80211_MGMT_HDR_LEN; | 1314 | len = skb->len - IEEE80211_MGMT_HDR_LEN; |
1312 | 1315 | ||
@@ -1315,8 +1318,9 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb, | |||
1315 | 1318 | ||
1316 | if (len < 6) { | 1319 | if (len < 6) { |
1317 | PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload " | 1320 | PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload " |
1318 | "(len=%d) from %s\n", dev->name, len, | 1321 | "(len=%d) from " MAC_FMT "\n", dev->name, len, |
1319 | print_mac(mac, hdr->addr2)); | 1322 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1323 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
1320 | return; | 1324 | return; |
1321 | } | 1325 | } |
1322 | 1326 | ||
@@ -1381,8 +1385,10 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb, | |||
1381 | if (time_after(jiffies, sta->u.ap.last_beacon + | 1385 | if (time_after(jiffies, sta->u.ap.last_beacon + |
1382 | (10 * sta->listen_interval * HZ) / 1024)) { | 1386 | (10 * sta->listen_interval * HZ) / 1024)) { |
1383 | PDEBUG(DEBUG_AP, "%s: no beacons received for a while," | 1387 | PDEBUG(DEBUG_AP, "%s: no beacons received for a while," |
1384 | " assuming AP %s is now STA\n", | 1388 | " assuming AP " MAC_FMT " is now STA\n", |
1385 | dev->name, print_mac(mac, sta->addr)); | 1389 | dev->name, |
1390 | sta->addr[0], sta->addr[1], sta->addr[2], | ||
1391 | sta->addr[3], sta->addr[4], sta->addr[5]); | ||
1386 | sta->ap = 0; | 1392 | sta->ap = 0; |
1387 | sta->flags = 0; | 1393 | sta->flags = 0; |
1388 | sta->u.sta.challenge = NULL; | 1394 | sta->u.sta.challenge = NULL; |
@@ -1497,10 +1503,13 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb, | |||
1497 | } | 1503 | } |
1498 | 1504 | ||
1499 | if (resp) { | 1505 | if (resp) { |
1500 | PDEBUG(DEBUG_AP, "%s: %s auth (alg=%d " | 1506 | PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth (alg=%d " |
1501 | "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n", | 1507 | "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n", |
1502 | dev->name, print_mac(mac, hdr->addr2), auth_alg, | 1508 | dev->name, |
1503 | auth_transaction, status_code, len, fc, resp, txt); | 1509 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1510 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1511 | auth_alg, auth_transaction, status_code, len, | ||
1512 | fc, resp, txt); | ||
1504 | } | 1513 | } |
1505 | } | 1514 | } |
1506 | 1515 | ||
@@ -1519,14 +1528,15 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb, | |||
1519 | int send_deauth = 0; | 1528 | int send_deauth = 0; |
1520 | char *txt = ""; | 1529 | char *txt = ""; |
1521 | u8 prev_ap[ETH_ALEN]; | 1530 | u8 prev_ap[ETH_ALEN]; |
1522 | DECLARE_MAC_BUF(mac); | ||
1523 | 1531 | ||
1524 | left = len = skb->len - IEEE80211_MGMT_HDR_LEN; | 1532 | left = len = skb->len - IEEE80211_MGMT_HDR_LEN; |
1525 | 1533 | ||
1526 | if (len < (reassoc ? 10 : 4)) { | 1534 | if (len < (reassoc ? 10 : 4)) { |
1527 | PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload " | 1535 | PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload " |
1528 | "(len=%d, reassoc=%d) from %s\n", | 1536 | "(len=%d, reassoc=%d) from " MAC_FMT "\n", |
1529 | dev->name, len, reassoc, print_mac(mac, hdr->addr2)); | 1537 | dev->name, len, reassoc, |
1538 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
1539 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]); | ||
1530 | return; | 1540 | return; |
1531 | } | 1541 | } |
1532 | 1542 | ||
@@ -1603,9 +1613,12 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb, | |||
1603 | } | 1613 | } |
1604 | 1614 | ||
1605 | if (left > 0) { | 1615 | if (left > 0) { |
1606 | PDEBUG(DEBUG_AP, "%s: assoc from %s" | 1616 | PDEBUG(DEBUG_AP, "%s: assoc from " MAC_FMT |
1607 | " with extra data (%d bytes) [", | 1617 | " with extra data (%d bytes) [", |
1608 | dev->name, print_mac(mac, hdr->addr2), left); | 1618 | dev->name, |
1619 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
1620 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1621 | left); | ||
1609 | while (left > 0) { | 1622 | while (left > 0) { |
1610 | PDEBUG2(DEBUG_AP, "<%02x>", *u); | 1623 | PDEBUG2(DEBUG_AP, "<%02x>", *u); |
1611 | u++; left--; | 1624 | u++; left--; |
@@ -1704,10 +1717,15 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb, | |||
1704 | } | 1717 | } |
1705 | 1718 | ||
1706 | #if 0 | 1719 | #if 0 |
1707 | PDEBUG(DEBUG_AP, "%s: %s %sassoc (len=%d " | 1720 | PDEBUG(DEBUG_AP, "%s: " MAC_FMT" %sassoc (len=%d " |
1708 | "prev_ap=%s) => %d(%d) (%s)\n", | 1721 | "prev_ap=" MAC_FMT") => %d(%d) (%s)\n", |
1709 | dev->name, print_mac(mac, hdr->addr2), reassoc ? "re" : "", len, | 1722 | dev->name, |
1710 | print_mac(mac, prev_ap), resp, send_deauth, txt); | 1723 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1724 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1725 | reassoc ? "re" : "", len, | ||
1726 | prev_ap[0], prev_ap[1], prev_ap[2], | ||
1727 | prev_ap[3], prev_ap[4], prev_ap[5], | ||
1728 | resp, send_deauth, txt); | ||
1711 | #endif | 1729 | #endif |
1712 | } | 1730 | } |
1713 | 1731 | ||
@@ -1735,9 +1753,11 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb, | |||
1735 | pos = (__le16 *) body; | 1753 | pos = (__le16 *) body; |
1736 | reason_code = le16_to_cpu(*pos); | 1754 | reason_code = le16_to_cpu(*pos); |
1737 | 1755 | ||
1738 | PDEBUG(DEBUG_AP, "%s: deauthentication: %s len=%d, " | 1756 | PDEBUG(DEBUG_AP, "%s: deauthentication: " MAC_FMT " len=%d, " |
1739 | "reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len, | 1757 | "reason_code=%d\n", dev->name, |
1740 | reason_code); | 1758 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1759 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1760 | len, reason_code); | ||
1741 | 1761 | ||
1742 | spin_lock_bh(&local->ap->sta_table_lock); | 1762 | spin_lock_bh(&local->ap->sta_table_lock); |
1743 | sta = ap_get_sta(local->ap, hdr->addr2); | 1763 | sta = ap_get_sta(local->ap, hdr->addr2); |
@@ -1748,9 +1768,11 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb, | |||
1748 | } | 1768 | } |
1749 | spin_unlock_bh(&local->ap->sta_table_lock); | 1769 | spin_unlock_bh(&local->ap->sta_table_lock); |
1750 | if (sta == NULL) { | 1770 | if (sta == NULL) { |
1751 | printk("%s: deauthentication from %s, " | 1771 | printk("%s: deauthentication from " MAC_FMT ", " |
1752 | "reason_code=%d, but STA not authenticated\n", dev->name, | 1772 | "reason_code=%d, but STA not authenticated\n", dev->name, |
1753 | print_mac(mac, hdr->addr2), reason_code); | 1773 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1774 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1775 | reason_code); | ||
1754 | } | 1776 | } |
1755 | } | 1777 | } |
1756 | 1778 | ||
@@ -1766,7 +1788,6 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb, | |||
1766 | u16 reason_code; | 1788 | u16 reason_code; |
1767 | __le16 *pos; | 1789 | __le16 *pos; |
1768 | struct sta_info *sta = NULL; | 1790 | struct sta_info *sta = NULL; |
1769 | DECLARE_MAC_BUF(mac); | ||
1770 | 1791 | ||
1771 | len = skb->len - IEEE80211_MGMT_HDR_LEN; | 1792 | len = skb->len - IEEE80211_MGMT_HDR_LEN; |
1772 | 1793 | ||
@@ -1778,9 +1799,11 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb, | |||
1778 | pos = (__le16 *) body; | 1799 | pos = (__le16 *) body; |
1779 | reason_code = le16_to_cpu(*pos); | 1800 | reason_code = le16_to_cpu(*pos); |
1780 | 1801 | ||
1781 | PDEBUG(DEBUG_AP, "%s: disassociation: %s len=%d, " | 1802 | PDEBUG(DEBUG_AP, "%s: disassociation: " MAC_FMT " len=%d, " |
1782 | "reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len, | 1803 | "reason_code=%d\n", dev->name, |
1783 | reason_code); | 1804 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], |
1805 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1806 | len, reason_code); | ||
1784 | 1807 | ||
1785 | spin_lock_bh(&local->ap->sta_table_lock); | 1808 | spin_lock_bh(&local->ap->sta_table_lock); |
1786 | sta = ap_get_sta(local->ap, hdr->addr2); | 1809 | sta = ap_get_sta(local->ap, hdr->addr2); |
@@ -1791,9 +1814,12 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb, | |||
1791 | } | 1814 | } |
1792 | spin_unlock_bh(&local->ap->sta_table_lock); | 1815 | spin_unlock_bh(&local->ap->sta_table_lock); |
1793 | if (sta == NULL) { | 1816 | if (sta == NULL) { |
1794 | printk("%s: disassociation from %s, " | 1817 | printk("%s: disassociation from " MAC_FMT ", " |
1795 | "reason_code=%d, but STA not authenticated\n", | 1818 | "reason_code=%d, but STA not authenticated\n", |
1796 | dev->name, print_mac(mac, hdr->addr2), reason_code); | 1819 | dev->name, |
1820 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
1821 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1822 | reason_code); | ||
1797 | } | 1823 | } |
1798 | } | 1824 | } |
1799 | 1825 | ||
@@ -1882,16 +1908,20 @@ static void handle_pspoll(local_info_t *local, | |||
1882 | struct sta_info *sta; | 1908 | struct sta_info *sta; |
1883 | u16 aid; | 1909 | u16 aid; |
1884 | struct sk_buff *skb; | 1910 | struct sk_buff *skb; |
1885 | DECLARE_MAC_BUF(mac); | ||
1886 | 1911 | ||
1887 | PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%s" | 1912 | PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=" MAC_FMT |
1888 | ", TA=%s PWRMGT=%d\n", | 1913 | ", TA=" MAC_FMT " PWRMGT=%d\n", |
1889 | print_mac(mac, hdr->addr1), print_mac(mac, hdr->addr2), | 1914 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], |
1915 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5], | ||
1916 | hdr->addr2[0], hdr->addr2[1], hdr->addr2[2], | ||
1917 | hdr->addr2[3], hdr->addr2[4], hdr->addr2[5], | ||
1890 | !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM)); | 1918 | !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM)); |
1891 | 1919 | ||
1892 | if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { | 1920 | if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { |
1893 | PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=%s" | 1921 | PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=" MAC_FMT |
1894 | " not own MAC\n", print_mac(mac, hdr->addr1)); | 1922 | " not own MAC\n", |
1923 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], | ||
1924 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]); | ||
1895 | return; | 1925 | return; |
1896 | } | 1926 | } |
1897 | 1927 | ||
@@ -1969,7 +1999,6 @@ static void handle_wds_oper_queue(struct work_struct *work) | |||
1969 | wds_oper_queue); | 1999 | wds_oper_queue); |
1970 | local_info_t *local = ap->local; | 2000 | local_info_t *local = ap->local; |
1971 | struct wds_oper_data *entry, *prev; | 2001 | struct wds_oper_data *entry, *prev; |
1972 | DECLARE_MAC_BUF(mac); | ||
1973 | 2002 | ||
1974 | spin_lock_bh(&local->lock); | 2003 | spin_lock_bh(&local->lock); |
1975 | entry = local->ap->wds_oper_entries; | 2004 | entry = local->ap->wds_oper_entries; |
@@ -1978,10 +2007,11 @@ static void handle_wds_oper_queue(struct work_struct *work) | |||
1978 | 2007 | ||
1979 | while (entry) { | 2008 | while (entry) { |
1980 | PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection " | 2009 | PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection " |
1981 | "to AP %s\n", | 2010 | "to AP " MAC_FMT "\n", |
1982 | local->dev->name, | 2011 | local->dev->name, |
1983 | entry->type == WDS_ADD ? "adding" : "removing", | 2012 | entry->type == WDS_ADD ? "adding" : "removing", |
1984 | print_mac(mac, entry->addr)); | 2013 | entry->addr[0], entry->addr[1], entry->addr[2], |
2014 | entry->addr[3], entry->addr[4], entry->addr[5]); | ||
1985 | if (entry->type == WDS_ADD) | 2015 | if (entry->type == WDS_ADD) |
1986 | prism2_wds_add(local, entry->addr, 0); | 2016 | prism2_wds_add(local, entry->addr, 0); |
1987 | else if (entry->type == WDS_DEL) | 2017 | else if (entry->type == WDS_DEL) |
@@ -2158,7 +2188,6 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb, | |||
2158 | #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ | 2188 | #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ |
2159 | u16 fc, type, stype; | 2189 | u16 fc, type, stype; |
2160 | struct ieee80211_hdr_4addr *hdr; | 2190 | struct ieee80211_hdr_4addr *hdr; |
2161 | DECLARE_MAC_BUF(mac); | ||
2162 | 2191 | ||
2163 | /* FIX: should give skb->len to handler functions and check that the | 2192 | /* FIX: should give skb->len to handler functions and check that the |
2164 | * buffer is long enough */ | 2193 | * buffer is long enough */ |
@@ -2187,8 +2216,9 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb, | |||
2187 | 2216 | ||
2188 | if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { | 2217 | if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { |
2189 | PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)=" | 2218 | PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)=" |
2190 | "%s not own MAC\n", | 2219 | MAC_FMT " not own MAC\n", |
2191 | print_mac(mac, hdr->addr1)); | 2220 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], |
2221 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]); | ||
2192 | goto done; | 2222 | goto done; |
2193 | } | 2223 | } |
2194 | 2224 | ||
@@ -2224,14 +2254,18 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb, | |||
2224 | } | 2254 | } |
2225 | 2255 | ||
2226 | if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { | 2256 | if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { |
2227 | PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%s" | 2257 | PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=" MAC_FMT |
2228 | " not own MAC\n", print_mac(mac, hdr->addr1)); | 2258 | " not own MAC\n", |
2259 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], | ||
2260 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]); | ||
2229 | goto done; | 2261 | goto done; |
2230 | } | 2262 | } |
2231 | 2263 | ||
2232 | if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) { | 2264 | if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) { |
2233 | PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%s" | 2265 | PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=" MAC_FMT |
2234 | " not own MAC\n", print_mac(mac, hdr->addr3)); | 2266 | " not own MAC\n", |
2267 | hdr->addr3[0], hdr->addr3[1], hdr->addr3[2], | ||
2268 | hdr->addr3[3], hdr->addr3[4], hdr->addr3[5]); | ||
2235 | goto done; | 2269 | goto done; |
2236 | } | 2270 | } |
2237 | 2271 | ||
@@ -2312,7 +2346,6 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta) | |||
2312 | struct sk_buff *skb; | 2346 | struct sk_buff *skb; |
2313 | struct ieee80211_hdr_4addr *hdr; | 2347 | struct ieee80211_hdr_4addr *hdr; |
2314 | struct hostap_80211_rx_status rx_stats; | 2348 | struct hostap_80211_rx_status rx_stats; |
2315 | DECLARE_MAC_BUF(mac); | ||
2316 | 2349 | ||
2317 | if (skb_queue_empty(&sta->tx_buf)) | 2350 | if (skb_queue_empty(&sta->tx_buf)) |
2318 | return; | 2351 | return; |
@@ -2334,7 +2367,9 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta) | |||
2334 | hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14)); | 2367 | hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14)); |
2335 | 2368 | ||
2336 | PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA " | 2369 | PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA " |
2337 | "%s\n", local->dev->name, print_mac(mac, sta->addr)); | 2370 | MAC_FMT "\n", local->dev->name, |
2371 | sta->addr[0], sta->addr[1], sta->addr[2], | ||
2372 | sta->addr[3], sta->addr[4], sta->addr[5]); | ||
2338 | 2373 | ||
2339 | skb->dev = local->dev; | 2374 | skb->dev = local->dev; |
2340 | 2375 | ||
@@ -2661,7 +2696,6 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev) | |||
2661 | int ret = sta->tx_rate; | 2696 | int ret = sta->tx_rate; |
2662 | struct hostap_interface *iface; | 2697 | struct hostap_interface *iface; |
2663 | local_info_t *local; | 2698 | local_info_t *local; |
2664 | DECLARE_MAC_BUF(mac); | ||
2665 | 2699 | ||
2666 | iface = netdev_priv(dev); | 2700 | iface = netdev_priv(dev); |
2667 | local = iface->local; | 2701 | local = iface->local; |
@@ -2689,9 +2723,12 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev) | |||
2689 | case 3: sta->tx_rate = 110; break; | 2723 | case 3: sta->tx_rate = 110; break; |
2690 | default: sta->tx_rate = 0; break; | 2724 | default: sta->tx_rate = 0; break; |
2691 | } | 2725 | } |
2692 | PDEBUG(DEBUG_AP, "%s: STA %s" | 2726 | PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT |
2693 | " TX rate raised to %d\n", | 2727 | " TX rate raised to %d\n", |
2694 | dev->name, print_mac(mac, sta->addr), sta->tx_rate); | 2728 | dev->name, |
2729 | sta->addr[0], sta->addr[1], sta->addr[2], | ||
2730 | sta->addr[3], sta->addr[4], sta->addr[5], | ||
2731 | sta->tx_rate); | ||
2695 | } | 2732 | } |
2696 | sta->tx_since_last_failure = 0; | 2733 | sta->tx_since_last_failure = 0; |
2697 | } | 2734 | } |
@@ -2709,7 +2746,6 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx) | |||
2709 | int set_tim, ret; | 2746 | int set_tim, ret; |
2710 | struct ieee80211_hdr_4addr *hdr; | 2747 | struct ieee80211_hdr_4addr *hdr; |
2711 | struct hostap_skb_tx_data *meta; | 2748 | struct hostap_skb_tx_data *meta; |
2712 | DECLARE_MAC_BUF(mac); | ||
2713 | 2749 | ||
2714 | meta = (struct hostap_skb_tx_data *) skb->cb; | 2750 | meta = (struct hostap_skb_tx_data *) skb->cb; |
2715 | ret = AP_TX_CONTINUE; | 2751 | ret = AP_TX_CONTINUE; |
@@ -2745,8 +2781,9 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx) | |||
2745 | * print out any errors here. */ | 2781 | * print out any errors here. */ |
2746 | if (net_ratelimit()) { | 2782 | if (net_ratelimit()) { |
2747 | printk(KERN_DEBUG "AP: drop packet to non-associated " | 2783 | printk(KERN_DEBUG "AP: drop packet to non-associated " |
2748 | "STA %s\n", | 2784 | "STA " MAC_FMT "\n", |
2749 | print_mac(mac, hdr->addr1)); | 2785 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], |
2786 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]); | ||
2750 | } | 2787 | } |
2751 | #endif | 2788 | #endif |
2752 | local->ap->tx_drop_nonassoc++; | 2789 | local->ap->tx_drop_nonassoc++; |
@@ -2784,9 +2821,11 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx) | |||
2784 | } | 2821 | } |
2785 | 2822 | ||
2786 | if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) { | 2823 | if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) { |
2787 | PDEBUG(DEBUG_PS, "%s: No more space in STA (%s" | 2824 | PDEBUG(DEBUG_PS, "%s: No more space in STA (" MAC_FMT |
2788 | ")'s PS mode buffer\n", | 2825 | ")'s PS mode buffer\n", |
2789 | local->dev->name, print_mac(mac, sta->addr)); | 2826 | local->dev->name, |
2827 | sta->addr[0], sta->addr[1], sta->addr[2], | ||
2828 | sta->addr[3], sta->addr[4], sta->addr[5]); | ||
2790 | /* Make sure that TIM is set for the station (it might not be | 2829 | /* Make sure that TIM is set for the station (it might not be |
2791 | * after AP wlan hw reset). */ | 2830 | * after AP wlan hw reset). */ |
2792 | /* FIX: should fix hw reset to restore bits based on STA | 2831 | /* FIX: should fix hw reset to restore bits based on STA |
@@ -2850,7 +2889,6 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb) | |||
2850 | struct sta_info *sta; | 2889 | struct sta_info *sta; |
2851 | struct ieee80211_hdr_4addr *hdr; | 2890 | struct ieee80211_hdr_4addr *hdr; |
2852 | struct hostap_skb_tx_data *meta; | 2891 | struct hostap_skb_tx_data *meta; |
2853 | DECLARE_MAC_BUF(mac); | ||
2854 | 2892 | ||
2855 | hdr = (struct ieee80211_hdr_4addr *) skb->data; | 2893 | hdr = (struct ieee80211_hdr_4addr *) skb->data; |
2856 | meta = (struct hostap_skb_tx_data *) skb->cb; | 2894 | meta = (struct hostap_skb_tx_data *) skb->cb; |
@@ -2859,9 +2897,12 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb) | |||
2859 | sta = ap_get_sta(local->ap, hdr->addr1); | 2897 | sta = ap_get_sta(local->ap, hdr->addr1); |
2860 | if (!sta) { | 2898 | if (!sta) { |
2861 | spin_unlock(&local->ap->sta_table_lock); | 2899 | spin_unlock(&local->ap->sta_table_lock); |
2862 | PDEBUG(DEBUG_AP, "%s: Could not find STA %s" | 2900 | PDEBUG(DEBUG_AP, "%s: Could not find STA " MAC_FMT |
2863 | " for this TX error (@%lu)\n", | 2901 | " for this TX error (@%lu)\n", |
2864 | local->dev->name, print_mac(mac, hdr->addr1), jiffies); | 2902 | local->dev->name, |
2903 | hdr->addr1[0], hdr->addr1[1], hdr->addr1[2], | ||
2904 | hdr->addr1[3], hdr->addr1[4], hdr->addr1[5], | ||
2905 | jiffies); | ||
2865 | return; | 2906 | return; |
2866 | } | 2907 | } |
2867 | 2908 | ||
@@ -2888,9 +2929,11 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb) | |||
2888 | case 3: sta->tx_rate = 110; break; | 2929 | case 3: sta->tx_rate = 110; break; |
2889 | default: sta->tx_rate = 0; break; | 2930 | default: sta->tx_rate = 0; break; |
2890 | } | 2931 | } |
2891 | PDEBUG(DEBUG_AP, "%s: STA %s" | 2932 | PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT |
2892 | " TX rate lowered to %d\n", | 2933 | " TX rate lowered to %d\n", |
2893 | local->dev->name, print_mac(mac, sta->addr), | 2934 | local->dev->name, |
2935 | sta->addr[0], sta->addr[1], sta->addr[2], | ||
2936 | sta->addr[3], sta->addr[4], sta->addr[5], | ||
2894 | sta->tx_rate); | 2937 | sta->tx_rate); |
2895 | } | 2938 | } |
2896 | sta->tx_consecutive_exc = 0; | 2939 | sta->tx_consecutive_exc = 0; |
@@ -2956,7 +2999,6 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev, | |||
2956 | struct sta_info *sta; | 2999 | struct sta_info *sta; |
2957 | u16 fc, type, stype; | 3000 | u16 fc, type, stype; |
2958 | struct ieee80211_hdr_4addr *hdr; | 3001 | struct ieee80211_hdr_4addr *hdr; |
2959 | DECLARE_MAC_BUF(mac); | ||
2960 | 3002 | ||
2961 | if (local->ap == NULL) | 3003 | if (local->ap == NULL) |
2962 | return AP_RX_CONTINUE; | 3004 | return AP_RX_CONTINUE; |
@@ -2988,9 +3030,12 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev, | |||
2988 | } else { | 3030 | } else { |
2989 | printk(KERN_DEBUG "%s: dropped received packet" | 3031 | printk(KERN_DEBUG "%s: dropped received packet" |
2990 | " from non-associated STA " | 3032 | " from non-associated STA " |
2991 | "%s" | 3033 | MAC_FMT |
2992 | " (type=0x%02x, subtype=0x%02x)\n", | 3034 | " (type=0x%02x, subtype=0x%02x)\n", |
2993 | dev->name, print_mac(mac, hdr->addr2), | 3035 | dev->name, |
3036 | hdr->addr2[0], hdr->addr2[1], | ||
3037 | hdr->addr2[2], hdr->addr2[3], | ||
3038 | hdr->addr2[4], hdr->addr2[5], | ||
2994 | type >> 2, stype >> 4); | 3039 | type >> 2, stype >> 4); |
2995 | hostap_rx(dev, skb, rx_stats); | 3040 | hostap_rx(dev, skb, rx_stats); |
2996 | #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ | 3041 | #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ |
@@ -3025,8 +3070,11 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev, | |||
3025 | * being associated. */ | 3070 | * being associated. */ |
3026 | printk(KERN_DEBUG "%s: rejected received nullfunc " | 3071 | printk(KERN_DEBUG "%s: rejected received nullfunc " |
3027 | "frame without ToDS from not associated STA " | 3072 | "frame without ToDS from not associated STA " |
3028 | "%s\n", | 3073 | MAC_FMT "\n", |
3029 | dev->name, print_mac(mac, hdr->addr2)); | 3074 | dev->name, |
3075 | hdr->addr2[0], hdr->addr2[1], | ||
3076 | hdr->addr2[2], hdr->addr2[3], | ||
3077 | hdr->addr2[4], hdr->addr2[5]); | ||
3030 | hostap_rx(dev, skb, rx_stats); | 3078 | hostap_rx(dev, skb, rx_stats); |
3031 | #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ | 3079 | #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ |
3032 | } | 3080 | } |
@@ -3043,9 +3091,12 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev, | |||
3043 | * If BSSID is own, report the dropping of this frame. */ | 3091 | * If BSSID is own, report the dropping of this frame. */ |
3044 | if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) { | 3092 | if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) { |
3045 | printk(KERN_DEBUG "%s: dropped received packet from " | 3093 | printk(KERN_DEBUG "%s: dropped received packet from " |
3046 | "%s with no ToDS flag " | 3094 | MAC_FMT " with no ToDS flag " |
3047 | "(type=0x%02x, subtype=0x%02x)\n", dev->name, | 3095 | "(type=0x%02x, subtype=0x%02x)\n", dev->name, |
3048 | print_mac(mac, hdr->addr2), type >> 2, stype >> 4); | 3096 | hdr->addr2[0], hdr->addr2[1], |
3097 | hdr->addr2[2], hdr->addr2[3], | ||
3098 | hdr->addr2[4], hdr->addr2[5], | ||
3099 | type >> 2, stype >> 4); | ||
3049 | hostap_dump_rx_80211(dev->name, skb, rx_stats); | 3100 | hostap_dump_rx_80211(dev->name, skb, rx_stats); |
3050 | } | 3101 | } |
3051 | ret = AP_RX_DROP; | 3102 | ret = AP_RX_DROP; |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index a56d9fc6354f..98d6ff69d375 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -10192,7 +10192,6 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, | |||
10192 | u8 id, hdr_len, unicast; | 10192 | u8 id, hdr_len, unicast; |
10193 | u16 remaining_bytes; | 10193 | u16 remaining_bytes; |
10194 | int fc; | 10194 | int fc; |
10195 | DECLARE_MAC_BUF(mac); | ||
10196 | 10195 | ||
10197 | hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); | 10196 | hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); |
10198 | switch (priv->ieee->iw_mode) { | 10197 | switch (priv->ieee->iw_mode) { |
@@ -10203,8 +10202,10 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, | |||
10203 | id = ipw_add_station(priv, hdr->addr1); | 10202 | id = ipw_add_station(priv, hdr->addr1); |
10204 | if (id == IPW_INVALID_STATION) { | 10203 | if (id == IPW_INVALID_STATION) { |
10205 | IPW_WARNING("Attempt to send data to " | 10204 | IPW_WARNING("Attempt to send data to " |
10206 | "invalid cell: %s\n", | 10205 | "invalid cell: " MAC_FMT "\n", |
10207 | print_mac(mac, hdr->addr1)); | 10206 | hdr->addr1[0], hdr->addr1[1], |
10207 | hdr->addr1[2], hdr->addr1[3], | ||
10208 | hdr->addr1[4], hdr->addr1[5]); | ||
10208 | goto drop; | 10209 | goto drop; |
10209 | } | 10210 | } |
10210 | } | 10211 | } |
@@ -11576,6 +11577,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv) | |||
11576 | priv->prom_priv->priv = priv; | 11577 | priv->prom_priv->priv = priv; |
11577 | 11578 | ||
11578 | strcpy(priv->prom_net_dev->name, "rtap%d"); | 11579 | strcpy(priv->prom_net_dev->name, "rtap%d"); |
11580 | memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN); | ||
11579 | 11581 | ||
11580 | priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP; | 11582 | priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP; |
11581 | priv->prom_net_dev->open = ipw_prom_open; | 11583 | priv->prom_net_dev->open = ipw_prom_open; |
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index b79a35a40ab6..b54ff712e703 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
@@ -35,7 +35,6 @@ config IWL4965_HT | |||
35 | bool "Enable 802.11n HT features in iwl4965 driver" | 35 | bool "Enable 802.11n HT features in iwl4965 driver" |
36 | depends on EXPERIMENTAL | 36 | depends on EXPERIMENTAL |
37 | depends on IWL4965 && IWL4965_QOS | 37 | depends on IWL4965 && IWL4965_QOS |
38 | depends on n | ||
39 | ---help--- | 38 | ---help--- |
40 | This option enables IEEE 802.11n High Throughput features | 39 | This option enables IEEE 802.11n High Throughput features |
41 | for the iwl4965 driver. | 40 | for the iwl4965 driver. |
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index 87e145ffe8f1..6a24ed6067e0 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c | |||
@@ -541,7 +541,7 @@ void lbs_association_worker(struct work_struct *work) | |||
541 | } | 541 | } |
542 | 542 | ||
543 | if (find_any_ssid) { | 543 | if (find_any_ssid) { |
544 | u8 new_mode; | 544 | u8 new_mode = assoc_req->mode; |
545 | 545 | ||
546 | ret = lbs_find_best_network_ssid(priv, assoc_req->ssid, | 546 | ret = lbs_find_best_network_ssid(priv, assoc_req->ssid, |
547 | &assoc_req->ssid_len, assoc_req->mode, &new_mode); | 547 | &assoc_req->ssid_len, assoc_req->mode, &new_mode); |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 93ea212fedd5..ad2e7d53b3da 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -2399,10 +2399,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
2399 | * beacon frame. | 2399 | * beacon frame. |
2400 | */ | 2400 | */ |
2401 | if (skb_headroom(skb) < TXD_DESC_SIZE) { | 2401 | if (skb_headroom(skb) < TXD_DESC_SIZE) { |
2402 | if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC)) { | 2402 | if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC)) |
2403 | dev_kfree_skb(skb); | ||
2404 | return -ENOMEM; | 2403 | return -ENOMEM; |
2405 | } | ||
2406 | } | 2404 | } |
2407 | 2405 | ||
2408 | /* | 2406 | /* |
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index d76d37bcb9cc..a85808938205 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -1568,9 +1568,8 @@ static void __devinit detect_and_report_it87(void) | |||
1568 | outb(r | 8, 0x2F); | 1568 | outb(r | 8, 0x2F); |
1569 | outb(0x02, 0x2E); /* Lock */ | 1569 | outb(0x02, 0x2E); /* Lock */ |
1570 | outb(0x02, 0x2F); | 1570 | outb(0x02, 0x2F); |
1571 | |||
1572 | release_region(0x2e, 1); | ||
1573 | } | 1571 | } |
1572 | release_region(0x2e, 1); | ||
1574 | } | 1573 | } |
1575 | #endif /* CONFIG_PARPORT_PC_SUPERIO */ | 1574 | #endif /* CONFIG_PARPORT_PC_SUPERIO */ |
1576 | 1575 | ||
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 9e7de63b26ef..02a4c8cf2b2d 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -252,6 +252,7 @@ config RTC_DRV_TWL92330 | |||
252 | 252 | ||
253 | config RTC_DRV_S35390A | 253 | config RTC_DRV_S35390A |
254 | tristate "Seiko Instruments S-35390A" | 254 | tristate "Seiko Instruments S-35390A" |
255 | select BITREVERSE | ||
255 | help | 256 | help |
256 | If you say yes here you will get support for the Seiko | 257 | If you say yes here you will get support for the Seiko |
257 | Instruments S-35390A. | 258 | Instruments S-35390A. |
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c index d3b9b14267ab..42244f14b41c 100644 --- a/drivers/rtc/rtc-at32ap700x.c +++ b/drivers/rtc/rtc-at32ap700x.c | |||
@@ -290,7 +290,7 @@ static int __exit at32_rtc_remove(struct platform_device *pdev) | |||
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
292 | 292 | ||
293 | MODULE_ALIAS("at32ap700x_rtc"); | 293 | MODULE_ALIAS("platform:at32ap700x_rtc"); |
294 | 294 | ||
295 | static struct platform_driver at32_rtc_driver = { | 295 | static struct platform_driver at32_rtc_driver = { |
296 | .remove = __exit_p(at32_rtc_remove), | 296 | .remove = __exit_p(at32_rtc_remove), |
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index 33795e5a5595..52abffc86bcd 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c | |||
@@ -407,3 +407,4 @@ module_exit(at91_rtc_exit); | |||
407 | MODULE_AUTHOR("Rick Bronson"); | 407 | MODULE_AUTHOR("Rick Bronson"); |
408 | MODULE_DESCRIPTION("RTC driver for Atmel AT91RM9200"); | 408 | MODULE_DESCRIPTION("RTC driver for Atmel AT91RM9200"); |
409 | MODULE_LICENSE("GPL"); | 409 | MODULE_LICENSE("GPL"); |
410 | MODULE_ALIAS("platform:at91_rtc"); | ||
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index d90ba860d216..4f28045d9ef2 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c | |||
@@ -470,3 +470,4 @@ module_exit(bfin_rtc_exit); | |||
470 | MODULE_DESCRIPTION("Blackfin On-Chip Real Time Clock Driver"); | 470 | MODULE_DESCRIPTION("Blackfin On-Chip Real Time Clock Driver"); |
471 | MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>"); | 471 | MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>"); |
472 | MODULE_LICENSE("GPL"); | 472 | MODULE_LICENSE("GPL"); |
473 | MODULE_ALIAS("platform:rtc-bfin"); | ||
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index f3ee2ad566b4..b48517021ee6 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
@@ -943,6 +943,9 @@ static void cmos_platform_shutdown(struct platform_device *pdev) | |||
943 | cmos_do_shutdown(); | 943 | cmos_do_shutdown(); |
944 | } | 944 | } |
945 | 945 | ||
946 | /* work with hotplug and coldplug */ | ||
947 | MODULE_ALIAS("platform:rtc_cmos"); | ||
948 | |||
946 | static struct platform_driver cmos_platform_driver = { | 949 | static struct platform_driver cmos_platform_driver = { |
947 | .remove = __exit_p(cmos_platform_remove), | 950 | .remove = __exit_p(cmos_platform_remove), |
948 | .shutdown = cmos_platform_shutdown, | 951 | .shutdown = cmos_platform_shutdown, |
diff --git a/drivers/rtc/rtc-ds1216.c b/drivers/rtc/rtc-ds1216.c index 83efb88f8f23..0b17770b032b 100644 --- a/drivers/rtc/rtc-ds1216.c +++ b/drivers/rtc/rtc-ds1216.c | |||
@@ -221,6 +221,7 @@ MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>"); | |||
221 | MODULE_DESCRIPTION("DS1216 RTC driver"); | 221 | MODULE_DESCRIPTION("DS1216 RTC driver"); |
222 | MODULE_LICENSE("GPL"); | 222 | MODULE_LICENSE("GPL"); |
223 | MODULE_VERSION(DRV_VERSION); | 223 | MODULE_VERSION(DRV_VERSION); |
224 | MODULE_ALIAS("platform:rtc-ds1216"); | ||
224 | 225 | ||
225 | module_init(ds1216_rtc_init); | 226 | module_init(ds1216_rtc_init); |
226 | module_exit(ds1216_rtc_exit); | 227 | module_exit(ds1216_rtc_exit); |
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index d74b8086fa31..d08912f18ddd 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c | |||
@@ -626,6 +626,9 @@ ds1511_rtc_remove(struct platform_device *pdev) | |||
626 | return 0; | 626 | return 0; |
627 | } | 627 | } |
628 | 628 | ||
629 | /* work with hotplug and coldplug */ | ||
630 | MODULE_ALIAS("platform:ds1511"); | ||
631 | |||
629 | static struct platform_driver ds1511_rtc_driver = { | 632 | static struct platform_driver ds1511_rtc_driver = { |
630 | .probe = ds1511_rtc_probe, | 633 | .probe = ds1511_rtc_probe, |
631 | .remove = __devexit_p(ds1511_rtc_remove), | 634 | .remove = __devexit_p(ds1511_rtc_remove), |
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index d9e848dcd450..a19f11415540 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
@@ -391,6 +391,9 @@ static int __devexit ds1553_rtc_remove(struct platform_device *pdev) | |||
391 | return 0; | 391 | return 0; |
392 | } | 392 | } |
393 | 393 | ||
394 | /* work with hotplug and coldplug */ | ||
395 | MODULE_ALIAS("platform:rtc-ds1553"); | ||
396 | |||
394 | static struct platform_driver ds1553_rtc_driver = { | 397 | static struct platform_driver ds1553_rtc_driver = { |
395 | .probe = ds1553_rtc_probe, | 398 | .probe = ds1553_rtc_probe, |
396 | .remove = __devexit_p(ds1553_rtc_remove), | 399 | .remove = __devexit_p(ds1553_rtc_remove), |
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index 2e73f0b183b2..24d35ede2dbf 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c | |||
@@ -276,3 +276,4 @@ MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | |||
276 | MODULE_DESCRIPTION("Dallas DS1742 RTC driver"); | 276 | MODULE_DESCRIPTION("Dallas DS1742 RTC driver"); |
277 | MODULE_LICENSE("GPL"); | 277 | MODULE_LICENSE("GPL"); |
278 | MODULE_VERSION(DRV_VERSION); | 278 | MODULE_VERSION(DRV_VERSION); |
279 | MODULE_ALIAS("platform:rtc-ds1742"); | ||
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c index ef4f147f3c0c..1e99325270df 100644 --- a/drivers/rtc/rtc-ep93xx.c +++ b/drivers/rtc/rtc-ep93xx.c | |||
@@ -132,6 +132,9 @@ static int __devexit ep93xx_rtc_remove(struct platform_device *dev) | |||
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | /* work with hotplug and coldplug */ | ||
136 | MODULE_ALIAS("platform:ep93xx-rtc"); | ||
137 | |||
135 | static struct platform_driver ep93xx_rtc_platform_driver = { | 138 | static struct platform_driver ep93xx_rtc_platform_driver = { |
136 | .driver = { | 139 | .driver = { |
137 | .name = "ep93xx-rtc", | 140 | .name = "ep93xx-rtc", |
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c index cd0bbc0e8038..013e6c103b9c 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c | |||
@@ -465,6 +465,9 @@ static int __devexit m48t59_rtc_remove(struct platform_device *pdev) | |||
465 | return 0; | 465 | return 0; |
466 | } | 466 | } |
467 | 467 | ||
468 | /* work with hotplug and coldplug */ | ||
469 | MODULE_ALIAS("platform:rtc-m48t59"); | ||
470 | |||
468 | static struct platform_driver m48t59_rtc_driver = { | 471 | static struct platform_driver m48t59_rtc_driver = { |
469 | .driver = { | 472 | .driver = { |
470 | .name = "rtc-m48t59", | 473 | .name = "rtc-m48t59", |
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c index 8ff4a1221f59..3f7f99a5d96a 100644 --- a/drivers/rtc/rtc-m48t86.c +++ b/drivers/rtc/rtc-m48t86.c | |||
@@ -199,6 +199,7 @@ MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | |||
199 | MODULE_DESCRIPTION("M48T86 RTC driver"); | 199 | MODULE_DESCRIPTION("M48T86 RTC driver"); |
200 | MODULE_LICENSE("GPL"); | 200 | MODULE_LICENSE("GPL"); |
201 | MODULE_VERSION(DRV_VERSION); | 201 | MODULE_VERSION(DRV_VERSION); |
202 | MODULE_ALIAS("platform:rtc-m48t86"); | ||
202 | 203 | ||
203 | module_init(m48t86_rtc_init); | 204 | module_init(m48t86_rtc_init); |
204 | module_exit(m48t86_rtc_exit); | 205 | module_exit(m48t86_rtc_exit); |
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index a2f84f169588..58f81c774943 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
@@ -497,7 +497,7 @@ static void omap_rtc_shutdown(struct platform_device *pdev) | |||
497 | rtc_write(0, OMAP_RTC_INTERRUPTS_REG); | 497 | rtc_write(0, OMAP_RTC_INTERRUPTS_REG); |
498 | } | 498 | } |
499 | 499 | ||
500 | MODULE_ALIAS("omap_rtc"); | 500 | MODULE_ALIAS("platform:omap_rtc"); |
501 | static struct platform_driver omap_rtc_driver = { | 501 | static struct platform_driver omap_rtc_driver = { |
502 | .probe = omap_rtc_probe, | 502 | .probe = omap_rtc_probe, |
503 | .remove = __devexit_p(omap_rtc_remove), | 503 | .remove = __devexit_p(omap_rtc_remove), |
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c index 66eb133bf5fd..664e89a817ed 100644 --- a/drivers/rtc/rtc-rs5c313.c +++ b/drivers/rtc/rtc-rs5c313.c | |||
@@ -421,3 +421,4 @@ MODULE_VERSION(DRV_VERSION); | |||
421 | MODULE_AUTHOR("kogiidena , Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); | 421 | MODULE_AUTHOR("kogiidena , Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); |
422 | MODULE_DESCRIPTION("Ricoh RS5C313 RTC device driver"); | 422 | MODULE_DESCRIPTION("Ricoh RS5C313 RTC device driver"); |
423 | MODULE_LICENSE("GPL"); | 423 | MODULE_LICENSE("GPL"); |
424 | MODULE_ALIAS("platform:" DRV_NAME); | ||
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 86766f1f2496..9f4d5129a496 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -592,3 +592,4 @@ module_exit(s3c_rtc_exit); | |||
592 | MODULE_DESCRIPTION("Samsung S3C RTC Driver"); | 592 | MODULE_DESCRIPTION("Samsung S3C RTC Driver"); |
593 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); | 593 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); |
594 | MODULE_LICENSE("GPL"); | 594 | MODULE_LICENSE("GPL"); |
595 | MODULE_ALIAS("platform:s3c2410-rtc"); | ||
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index ee253cc45de1..82f62d25f921 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -399,3 +399,4 @@ module_exit(sa1100_rtc_exit); | |||
399 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); | 399 | MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); |
400 | MODULE_DESCRIPTION("SA11x0/PXA2xx Realtime Clock Driver (RTC)"); | 400 | MODULE_DESCRIPTION("SA11x0/PXA2xx Realtime Clock Driver (RTC)"); |
401 | MODULE_LICENSE("GPL"); | 401 | MODULE_LICENSE("GPL"); |
402 | MODULE_ALIAS("platform:sa1100-rtc"); | ||
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index c1d6a1880ccf..9e9caa5d7f5f 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
@@ -664,3 +664,4 @@ MODULE_DESCRIPTION("SuperH on-chip RTC driver"); | |||
664 | MODULE_VERSION(DRV_VERSION); | 664 | MODULE_VERSION(DRV_VERSION); |
665 | MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, Jamie Lenehan <lenehan@twibble.org>"); | 665 | MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, Jamie Lenehan <lenehan@twibble.org>"); |
666 | MODULE_LICENSE("GPL"); | 666 | MODULE_LICENSE("GPL"); |
667 | MODULE_ALIAS("platform:" DRV_NAME); | ||
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index a265da7c6ff8..31d3c8c28588 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
@@ -394,6 +394,9 @@ static int __devexit stk17ta8_rtc_remove(struct platform_device *pdev) | |||
394 | return 0; | 394 | return 0; |
395 | } | 395 | } |
396 | 396 | ||
397 | /* work with hotplug and coldplug */ | ||
398 | MODULE_ALIAS("platform:stk17ta8"); | ||
399 | |||
397 | static struct platform_driver stk17ta8_rtc_driver = { | 400 | static struct platform_driver stk17ta8_rtc_driver = { |
398 | .probe = stk17ta8_rtc_probe, | 401 | .probe = stk17ta8_rtc_probe, |
399 | .remove = __devexit_p(stk17ta8_rtc_remove), | 402 | .remove = __devexit_p(stk17ta8_rtc_remove), |
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index a6b572978dc0..24203a06051a 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c | |||
@@ -264,3 +264,4 @@ module_exit(v3020_exit); | |||
264 | MODULE_DESCRIPTION("V3020 RTC"); | 264 | MODULE_DESCRIPTION("V3020 RTC"); |
265 | MODULE_AUTHOR("Raphael Assenat"); | 265 | MODULE_AUTHOR("Raphael Assenat"); |
266 | MODULE_LICENSE("GPL"); | 266 | MODULE_LICENSE("GPL"); |
267 | MODULE_ALIAS("platform:v3020"); | ||
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index ce2f78de7a80..be9c70d0b193 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c | |||
@@ -422,6 +422,9 @@ static int __devexit rtc_remove(struct platform_device *pdev) | |||
422 | return 0; | 422 | return 0; |
423 | } | 423 | } |
424 | 424 | ||
425 | /* work with hotplug and coldplug */ | ||
426 | MODULE_ALIAS("platform:RTC"); | ||
427 | |||
425 | static struct platform_driver rtc_platform_driver = { | 428 | static struct platform_driver rtc_platform_driver = { |
426 | .probe = rtc_probe, | 429 | .probe = rtc_probe, |
427 | .remove = __devexit_p(rtc_remove), | 430 | .remove = __devexit_p(rtc_remove), |
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index e5c6f6af8765..c78b836f59dd 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
@@ -181,6 +181,18 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask) | |||
181 | cmd = kmem_cache_alloc(shost->cmd_pool->cmd_slab, | 181 | cmd = kmem_cache_alloc(shost->cmd_pool->cmd_slab, |
182 | gfp_mask | shost->cmd_pool->gfp_mask); | 182 | gfp_mask | shost->cmd_pool->gfp_mask); |
183 | 183 | ||
184 | if (likely(cmd)) { | ||
185 | buf = kmem_cache_alloc(shost->cmd_pool->sense_slab, | ||
186 | gfp_mask | shost->cmd_pool->gfp_mask); | ||
187 | if (likely(buf)) { | ||
188 | memset(cmd, 0, sizeof(*cmd)); | ||
189 | cmd->sense_buffer = buf; | ||
190 | } else { | ||
191 | kmem_cache_free(shost->cmd_pool->cmd_slab, cmd); | ||
192 | cmd = NULL; | ||
193 | } | ||
194 | } | ||
195 | |||
184 | if (unlikely(!cmd)) { | 196 | if (unlikely(!cmd)) { |
185 | unsigned long flags; | 197 | unsigned long flags; |
186 | 198 | ||
@@ -197,16 +209,6 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask) | |||
197 | memset(cmd, 0, sizeof(*cmd)); | 209 | memset(cmd, 0, sizeof(*cmd)); |
198 | cmd->sense_buffer = buf; | 210 | cmd->sense_buffer = buf; |
199 | } | 211 | } |
200 | } else { | ||
201 | buf = kmem_cache_alloc(shost->cmd_pool->sense_slab, | ||
202 | gfp_mask | shost->cmd_pool->gfp_mask); | ||
203 | if (likely(buf)) { | ||
204 | memset(cmd, 0, sizeof(*cmd)); | ||
205 | cmd->sense_buffer = buf; | ||
206 | } else { | ||
207 | kmem_cache_free(shost->cmd_pool->cmd_slab, cmd); | ||
208 | cmd = NULL; | ||
209 | } | ||
210 | } | 212 | } |
211 | 213 | ||
212 | return cmd; | 214 | return cmd; |
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 85687aaf9cab..1749a27be066 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
@@ -863,3 +863,4 @@ module_exit(atmel_spi_exit); | |||
863 | MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver"); | 863 | MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver"); |
864 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 864 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); |
865 | MODULE_LICENSE("GPL"); | 865 | MODULE_LICENSE("GPL"); |
866 | MODULE_ALIAS("platform:atmel_spi"); | ||
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c index 41a3d00c4515..072c4a595334 100644 --- a/drivers/spi/au1550_spi.c +++ b/drivers/spi/au1550_spi.c | |||
@@ -958,6 +958,9 @@ static int __exit au1550_spi_remove(struct platform_device *pdev) | |||
958 | return 0; | 958 | return 0; |
959 | } | 959 | } |
960 | 960 | ||
961 | /* work with hotplug and coldplug */ | ||
962 | MODULE_ALIAS("platform:au1550-spi"); | ||
963 | |||
961 | static struct platform_driver au1550_spi_drv = { | 964 | static struct platform_driver au1550_spi_drv = { |
962 | .remove = __exit_p(au1550_spi_remove), | 965 | .remove = __exit_p(au1550_spi_remove), |
963 | .driver = { | 966 | .driver = { |
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index a86315a0c5b8..90729469d481 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
@@ -500,6 +500,9 @@ static int __exit mpc52xx_psc_spi_remove(struct platform_device *dev) | |||
500 | return mpc52xx_psc_spi_do_remove(&dev->dev); | 500 | return mpc52xx_psc_spi_do_remove(&dev->dev); |
501 | } | 501 | } |
502 | 502 | ||
503 | /* work with hotplug and coldplug */ | ||
504 | MODULE_ALIAS("platform:mpc52xx-psc-spi"); | ||
505 | |||
503 | static struct platform_driver mpc52xx_psc_spi_platform_driver = { | 506 | static struct platform_driver mpc52xx_psc_spi_platform_driver = { |
504 | .remove = __exit_p(mpc52xx_psc_spi_remove), | 507 | .remove = __exit_p(mpc52xx_psc_spi_remove), |
505 | .driver = { | 508 | .driver = { |
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index a6ba11afb03f..b1cc148036c1 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
@@ -1084,6 +1084,9 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev) | |||
1084 | return 0; | 1084 | return 0; |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | /* work with hotplug and coldplug */ | ||
1088 | MODULE_ALIAS("platform:omap2_mcspi"); | ||
1089 | |||
1087 | static struct platform_driver omap2_mcspi_driver = { | 1090 | static struct platform_driver omap2_mcspi_driver = { |
1088 | .driver = { | 1091 | .driver = { |
1089 | .name = "omap2_mcspi", | 1092 | .name = "omap2_mcspi", |
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index 8245b5153f30..5f00bd6500ef 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c | |||
@@ -537,10 +537,12 @@ static int __exit uwire_remove(struct platform_device *pdev) | |||
537 | return status; | 537 | return status; |
538 | } | 538 | } |
539 | 539 | ||
540 | /* work with hotplug and coldplug */ | ||
541 | MODULE_ALIAS("platform:omap_uwire"); | ||
542 | |||
540 | static struct platform_driver uwire_driver = { | 543 | static struct platform_driver uwire_driver = { |
541 | .driver = { | 544 | .driver = { |
542 | .name = "omap_uwire", | 545 | .name = "omap_uwire", |
543 | .bus = &platform_bus_type, | ||
544 | .owner = THIS_MODULE, | 546 | .owner = THIS_MODULE, |
545 | }, | 547 | }, |
546 | .remove = __exit_p(uwire_remove), | 548 | .remove = __exit_p(uwire_remove), |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 59deed79e0ab..147e26a78d64 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -44,6 +44,7 @@ | |||
44 | MODULE_AUTHOR("Stephen Street"); | 44 | MODULE_AUTHOR("Stephen Street"); |
45 | MODULE_DESCRIPTION("PXA2xx SSP SPI Controller"); | 45 | MODULE_DESCRIPTION("PXA2xx SSP SPI Controller"); |
46 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
47 | MODULE_ALIAS("platform:pxa2xx-spi"); | ||
47 | 48 | ||
48 | #define MAX_BUSES 3 | 49 | #define MAX_BUSES 3 |
49 | 50 | ||
@@ -1581,7 +1582,6 @@ static int pxa2xx_spi_resume(struct platform_device *pdev) | |||
1581 | static struct platform_driver driver = { | 1582 | static struct platform_driver driver = { |
1582 | .driver = { | 1583 | .driver = { |
1583 | .name = "pxa2xx-spi", | 1584 | .name = "pxa2xx-spi", |
1584 | .bus = &platform_bus_type, | ||
1585 | .owner = THIS_MODULE, | 1585 | .owner = THIS_MODULE, |
1586 | }, | 1586 | }, |
1587 | .remove = pxa2xx_spi_remove, | 1587 | .remove = pxa2xx_spi_remove, |
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index d853fceb6bf0..a9ac1fdb3094 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
@@ -713,8 +713,8 @@ static void pump_transfers(unsigned long data) | |||
713 | } else { | 713 | } else { |
714 | drv_data->len = transfer->len; | 714 | drv_data->len = transfer->len; |
715 | } | 715 | } |
716 | dev_dbg(&drv_data->pdev->dev, "transfer: ", | 716 | dev_dbg(&drv_data->pdev->dev, |
717 | "drv_data->write is %p, chip->write is %p, null_wr is %p\n", | 717 | "transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n", |
718 | drv_data->write, chip->write, null_writer); | 718 | drv_data->write, chip->write, null_writer); |
719 | 719 | ||
720 | /* speed and width has been set on per message */ | 720 | /* speed and width has been set on per message */ |
@@ -1294,6 +1294,12 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) | |||
1294 | goto out_error_queue_alloc; | 1294 | goto out_error_queue_alloc; |
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | status = peripheral_request_list(drv_data->pin_req, DRV_NAME); | ||
1298 | if (status != 0) { | ||
1299 | dev_err(&pdev->dev, ": Requesting Peripherals failed\n"); | ||
1300 | goto out_error_queue_alloc; | ||
1301 | } | ||
1302 | |||
1297 | /* Register with the SPI framework */ | 1303 | /* Register with the SPI framework */ |
1298 | platform_set_drvdata(pdev, drv_data); | 1304 | platform_set_drvdata(pdev, drv_data); |
1299 | status = spi_register_master(master); | 1305 | status = spi_register_master(master); |
@@ -1302,12 +1308,6 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) | |||
1302 | goto out_error_queue_alloc; | 1308 | goto out_error_queue_alloc; |
1303 | } | 1309 | } |
1304 | 1310 | ||
1305 | status = peripheral_request_list(drv_data->pin_req, DRV_NAME); | ||
1306 | if (status != 0) { | ||
1307 | dev_err(&pdev->dev, ": Requesting Peripherals failed\n"); | ||
1308 | goto out_error; | ||
1309 | } | ||
1310 | |||
1311 | dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n", | 1311 | dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n", |
1312 | DRV_DESC, DRV_VERSION, drv_data->regs_base, | 1312 | DRV_DESC, DRV_VERSION, drv_data->regs_base, |
1313 | drv_data->dma_channel); | 1313 | drv_data->dma_channel); |
@@ -1319,7 +1319,6 @@ out_error_no_dma_ch: | |||
1319 | iounmap((void *) drv_data->regs_base); | 1319 | iounmap((void *) drv_data->regs_base); |
1320 | out_error_ioremap: | 1320 | out_error_ioremap: |
1321 | out_error_get_res: | 1321 | out_error_get_res: |
1322 | out_error: | ||
1323 | spi_master_put(master); | 1322 | spi_master_put(master); |
1324 | 1323 | ||
1325 | return status; | 1324 | return status; |
@@ -1397,7 +1396,7 @@ static int bfin5xx_spi_resume(struct platform_device *pdev) | |||
1397 | #define bfin5xx_spi_resume NULL | 1396 | #define bfin5xx_spi_resume NULL |
1398 | #endif /* CONFIG_PM */ | 1397 | #endif /* CONFIG_PM */ |
1399 | 1398 | ||
1400 | MODULE_ALIAS("bfin-spi-master"); /* for platform bus hotplug */ | 1399 | MODULE_ALIAS("platform:bfin-spi"); |
1401 | static struct platform_driver bfin5xx_spi_driver = { | 1400 | static struct platform_driver bfin5xx_spi_driver = { |
1402 | .driver = { | 1401 | .driver = { |
1403 | .name = DRV_NAME, | 1402 | .name = DRV_NAME, |
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 1b0647124933..d4ba640366b6 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
@@ -1722,10 +1722,12 @@ static int spi_imx_resume(struct platform_device *pdev) | |||
1722 | #define spi_imx_resume NULL | 1722 | #define spi_imx_resume NULL |
1723 | #endif /* CONFIG_PM */ | 1723 | #endif /* CONFIG_PM */ |
1724 | 1724 | ||
1725 | /* work with hotplug and coldplug */ | ||
1726 | MODULE_ALIAS("platform:spi_imx"); | ||
1727 | |||
1725 | static struct platform_driver driver = { | 1728 | static struct platform_driver driver = { |
1726 | .driver = { | 1729 | .driver = { |
1727 | .name = "spi_imx", | 1730 | .name = "spi_imx", |
1728 | .bus = &platform_bus_type, | ||
1729 | .owner = THIS_MODULE, | 1731 | .owner = THIS_MODULE, |
1730 | }, | 1732 | }, |
1731 | .remove = __exit_p(spi_imx_remove), | 1733 | .remove = __exit_p(spi_imx_remove), |
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 04f7cd9fc261..be15a6213205 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
@@ -523,11 +523,12 @@ static int __exit mpc83xx_spi_remove(struct platform_device *dev) | |||
523 | return 0; | 523 | return 0; |
524 | } | 524 | } |
525 | 525 | ||
526 | MODULE_ALIAS("mpc83xx_spi"); /* for platform bus hotplug */ | 526 | MODULE_ALIAS("platform:mpc83xx_spi"); |
527 | static struct platform_driver mpc83xx_spi_driver = { | 527 | static struct platform_driver mpc83xx_spi_driver = { |
528 | .remove = __exit_p(mpc83xx_spi_remove), | 528 | .remove = __exit_p(mpc83xx_spi_remove), |
529 | .driver = { | 529 | .driver = { |
530 | .name = "mpc83xx_spi", | 530 | .name = "mpc83xx_spi", |
531 | .owner = THIS_MODULE, | ||
531 | }, | 532 | }, |
532 | }; | 533 | }; |
533 | 534 | ||
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 6e834b8b9d27..e75103aac790 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -415,7 +415,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev) | |||
415 | #define s3c24xx_spi_resume NULL | 415 | #define s3c24xx_spi_resume NULL |
416 | #endif | 416 | #endif |
417 | 417 | ||
418 | MODULE_ALIAS("s3c2410_spi"); /* for platform bus hotplug */ | 418 | MODULE_ALIAS("platform:s3c2410-spi"); |
419 | static struct platform_driver s3c24xx_spidrv = { | 419 | static struct platform_driver s3c24xx_spidrv = { |
420 | .remove = __exit_p(s3c24xx_spi_remove), | 420 | .remove = __exit_p(s3c24xx_spi_remove), |
421 | .suspend = s3c24xx_spi_suspend, | 421 | .suspend = s3c24xx_spi_suspend, |
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index 82ae7d7eca38..e33f6145c560 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c | |||
@@ -168,6 +168,8 @@ static int s3c2410_spigpio_remove(struct platform_device *dev) | |||
168 | #define s3c2410_spigpio_suspend NULL | 168 | #define s3c2410_spigpio_suspend NULL |
169 | #define s3c2410_spigpio_resume NULL | 169 | #define s3c2410_spigpio_resume NULL |
170 | 170 | ||
171 | /* work with hotplug and coldplug */ | ||
172 | MODULE_ALIAS("platform:spi_s3c24xx_gpio"); | ||
171 | 173 | ||
172 | static struct platform_driver s3c2410_spigpio_drv = { | 174 | static struct platform_driver s3c2410_spigpio_drv = { |
173 | .probe = s3c2410_spigpio_probe, | 175 | .probe = s3c2410_spigpio_probe, |
diff --git a/drivers/spi/spi_sh_sci.c b/drivers/spi/spi_sh_sci.c index 3dbe71b16d60..7d36720eb982 100644 --- a/drivers/spi/spi_sh_sci.c +++ b/drivers/spi/spi_sh_sci.c | |||
@@ -203,3 +203,4 @@ module_exit(sh_sci_spi_exit); | |||
203 | MODULE_DESCRIPTION("SH SCI SPI Driver"); | 203 | MODULE_DESCRIPTION("SH SCI SPI Driver"); |
204 | MODULE_AUTHOR("Magnus Damm <damm@opensource.se>"); | 204 | MODULE_AUTHOR("Magnus Damm <damm@opensource.se>"); |
205 | MODULE_LICENSE("GPL"); | 205 | MODULE_LICENSE("GPL"); |
206 | MODULE_ALIAS("platform:spi_sh_sci"); | ||
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c index 363ac8e68821..2296f37ea3c6 100644 --- a/drivers/spi/spi_txx9.c +++ b/drivers/spi/spi_txx9.c | |||
@@ -450,6 +450,9 @@ static int __exit txx9spi_remove(struct platform_device *dev) | |||
450 | return 0; | 450 | return 0; |
451 | } | 451 | } |
452 | 452 | ||
453 | /* work with hotplug and coldplug */ | ||
454 | MODULE_ALIAS("platform:spi_txx9"); | ||
455 | |||
453 | static struct platform_driver txx9spi_driver = { | 456 | static struct platform_driver txx9spi_driver = { |
454 | .remove = __exit_p(txx9spi_remove), | 457 | .remove = __exit_p(txx9spi_remove), |
455 | .driver = { | 458 | .driver = { |
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 5d04f520c123..cf6aef34fe25 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c | |||
@@ -408,6 +408,9 @@ static int __devexit xilinx_spi_remove(struct platform_device *dev) | |||
408 | return 0; | 408 | return 0; |
409 | } | 409 | } |
410 | 410 | ||
411 | /* work with hotplug and coldplug */ | ||
412 | MODULE_ALIAS("platform:" XILINX_SPI_NAME); | ||
413 | |||
411 | static struct platform_driver xilinx_spi_driver = { | 414 | static struct platform_driver xilinx_spi_driver = { |
412 | .probe = xilinx_spi_probe, | 415 | .probe = xilinx_spi_probe, |
413 | .remove = __devexit_p(xilinx_spi_remove), | 416 | .remove = __devexit_p(xilinx_spi_remove), |
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c index 3d3dd32bf3ab..a9e7eb45b2e7 100644 --- a/drivers/ssb/driver_mipscore.c +++ b/drivers/ssb/driver_mipscore.c | |||
@@ -109,12 +109,13 @@ static void set_irq(struct ssb_device *dev, unsigned int irq) | |||
109 | clear_irq(bus, oldirq); | 109 | clear_irq(bus, oldirq); |
110 | 110 | ||
111 | /* assign the new one */ | 111 | /* assign the new one */ |
112 | if (irq == 0) | 112 | if (irq == 0) { |
113 | ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) & ssb_read32(mdev, SSB_INTVEC))); | 113 | ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) | ssb_read32(mdev, SSB_INTVEC))); |
114 | 114 | } else { | |
115 | irqflag <<= ipsflag_irq_shift[irq]; | 115 | irqflag <<= ipsflag_irq_shift[irq]; |
116 | irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]); | 116 | irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]); |
117 | ssb_write32(mdev, SSB_IPSFLAG, irqflag); | 117 | ssb_write32(mdev, SSB_IPSFLAG, irqflag); |
118 | } | ||
118 | } | 119 | } |
119 | 120 | ||
120 | static void ssb_mips_serial_init(struct ssb_mipscore *mcore) | 121 | static void ssb_mips_serial_init(struct ssb_mipscore *mcore) |
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 74b9a8aea52b..5d777f211699 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c | |||
@@ -551,7 +551,7 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc, | |||
551 | } else { | 551 | } else { |
552 | tmp = ssb_read32(dev, SSB_TPSFLAG); | 552 | tmp = ssb_read32(dev, SSB_TPSFLAG); |
553 | tmp &= SSB_TPSFLAG_BPFLAG; | 553 | tmp &= SSB_TPSFLAG_BPFLAG; |
554 | intvec |= tmp; | 554 | intvec |= (1 << tmp); |
555 | } | 555 | } |
556 | ssb_write32(pdev, SSB_INTVEC, intvec); | 556 | ssb_write32(pdev, SSB_INTVEC, intvec); |
557 | } | 557 | } |
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index bedb2b4ee9d2..72017bf2e577 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -1044,6 +1044,12 @@ int ssb_bus_may_powerdown(struct ssb_bus *bus) | |||
1044 | goto out; | 1044 | goto out; |
1045 | 1045 | ||
1046 | cc = &bus->chipco; | 1046 | cc = &bus->chipco; |
1047 | |||
1048 | if (!cc->dev) | ||
1049 | goto out; | ||
1050 | if (cc->dev->id.revision < 5) | ||
1051 | goto out; | ||
1052 | |||
1047 | ssb_chipco_set_clockmode(cc, SSB_CLKMODE_SLOW); | 1053 | ssb_chipco_set_clockmode(cc, SSB_CLKMODE_SLOW); |
1048 | err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0); | 1054 | err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0); |
1049 | if (err) | 1055 | if (err) |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index a83e8b798ec9..fd15ced899d8 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -1884,3 +1884,4 @@ module_exit(udc_exit_module); | |||
1884 | MODULE_DESCRIPTION("AT91 udc driver"); | 1884 | MODULE_DESCRIPTION("AT91 udc driver"); |
1885 | MODULE_AUTHOR("Thomas Rathbone, David Brownell"); | 1885 | MODULE_AUTHOR("Thomas Rathbone, David Brownell"); |
1886 | MODULE_LICENSE("GPL"); | 1886 | MODULE_LICENSE("GPL"); |
1887 | MODULE_ALIAS("platform:at91_udc"); | ||
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index af8b2a3a2d4a..b0db4c31d018 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c | |||
@@ -2054,6 +2054,7 @@ static struct platform_driver udc_driver = { | |||
2054 | .remove = __exit_p(usba_udc_remove), | 2054 | .remove = __exit_p(usba_udc_remove), |
2055 | .driver = { | 2055 | .driver = { |
2056 | .name = "atmel_usba_udc", | 2056 | .name = "atmel_usba_udc", |
2057 | .owner = THIS_MODULE, | ||
2057 | }, | 2058 | }, |
2058 | }; | 2059 | }; |
2059 | 2060 | ||
@@ -2072,3 +2073,4 @@ module_exit(udc_exit); | |||
2072 | MODULE_DESCRIPTION("Atmel USBA UDC driver"); | 2073 | MODULE_DESCRIPTION("Atmel USBA UDC driver"); |
2073 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 2074 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); |
2074 | MODULE_LICENSE("GPL"); | 2075 | MODULE_LICENSE("GPL"); |
2076 | MODULE_ALIAS("platform:atmel_usba_udc"); | ||
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c index 63e8fa3a69e1..254012ad2b91 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.c +++ b/drivers/usb/gadget/fsl_usb2_udc.c | |||
@@ -2475,3 +2475,4 @@ module_exit(udc_exit); | |||
2475 | MODULE_DESCRIPTION(DRIVER_DESC); | 2475 | MODULE_DESCRIPTION(DRIVER_DESC); |
2476 | MODULE_AUTHOR(DRIVER_AUTHOR); | 2476 | MODULE_AUTHOR(DRIVER_AUTHOR); |
2477 | MODULE_LICENSE("GPL"); | 2477 | MODULE_LICENSE("GPL"); |
2478 | MODULE_ALIAS("platform:fsl-usb2-udc"); | ||
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index 37243ef7104e..078f72467671 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -2146,3 +2146,4 @@ module_exit(udc_exit); | |||
2146 | MODULE_DESCRIPTION(DRIVER_DESC); | 2146 | MODULE_DESCRIPTION(DRIVER_DESC); |
2147 | MODULE_AUTHOR("Mikko Lahteenmaki, Bo Henriksen"); | 2147 | MODULE_AUTHOR("Mikko Lahteenmaki, Bo Henriksen"); |
2148 | MODULE_LICENSE("GPL"); | 2148 | MODULE_LICENSE("GPL"); |
2149 | MODULE_ALIAS("platform:lh7a40x_udc"); | ||
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c index 835948f0715a..ee6b35fa870f 100644 --- a/drivers/usb/gadget/m66592-udc.c +++ b/drivers/usb/gadget/m66592-udc.c | |||
@@ -35,6 +35,7 @@ | |||
35 | MODULE_DESCRIPTION("M66592 USB gadget driver"); | 35 | MODULE_DESCRIPTION("M66592 USB gadget driver"); |
36 | MODULE_LICENSE("GPL"); | 36 | MODULE_LICENSE("GPL"); |
37 | MODULE_AUTHOR("Yoshihiro Shimoda"); | 37 | MODULE_AUTHOR("Yoshihiro Shimoda"); |
38 | MODULE_ALIAS("platform:m66592_udc"); | ||
38 | 39 | ||
39 | #define DRIVER_VERSION "18 Oct 2007" | 40 | #define DRIVER_VERSION "18 Oct 2007" |
40 | 41 | ||
@@ -1671,6 +1672,7 @@ static struct platform_driver m66592_driver = { | |||
1671 | .remove = __exit_p(m66592_remove), | 1672 | .remove = __exit_p(m66592_remove), |
1672 | .driver = { | 1673 | .driver = { |
1673 | .name = (char *) udc_name, | 1674 | .name = (char *) udc_name, |
1675 | .owner = THIS_MODULE, | ||
1674 | }, | 1676 | }, |
1675 | }; | 1677 | }; |
1676 | 1678 | ||
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index e6d68bda428a..ee1e9a314cd1 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -3109,4 +3109,4 @@ module_exit(udc_exit); | |||
3109 | 3109 | ||
3110 | MODULE_DESCRIPTION(DRIVER_DESC); | 3110 | MODULE_DESCRIPTION(DRIVER_DESC); |
3111 | MODULE_LICENSE("GPL"); | 3111 | MODULE_LICENSE("GPL"); |
3112 | 3112 | MODULE_ALIAS("platform:omap_udc"); | |
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index 096c41cc40d1..c00cd8b9d3d1 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
@@ -2380,4 +2380,4 @@ module_exit(udc_exit); | |||
2380 | MODULE_DESCRIPTION(DRIVER_DESC); | 2380 | MODULE_DESCRIPTION(DRIVER_DESC); |
2381 | MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell"); | 2381 | MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell"); |
2382 | MODULE_LICENSE("GPL"); | 2382 | MODULE_LICENSE("GPL"); |
2383 | 2383 | MODULE_ALIAS("platform:pxa2xx-udc"); | |
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index aadc4204d6f9..6b1ef488043b 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
@@ -2047,3 +2047,5 @@ MODULE_AUTHOR(DRIVER_AUTHOR); | |||
2047 | MODULE_DESCRIPTION(DRIVER_DESC); | 2047 | MODULE_DESCRIPTION(DRIVER_DESC); |
2048 | MODULE_VERSION(DRIVER_VERSION); | 2048 | MODULE_VERSION(DRIVER_VERSION); |
2049 | MODULE_LICENSE("GPL"); | 2049 | MODULE_LICENSE("GPL"); |
2050 | MODULE_ALIAS("platform:s3c2410-usbgadget"); | ||
2051 | MODULE_ALIAS("platform:s3c2440-usbgadget"); | ||
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index d7071c855758..203a3359a648 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1684,14 +1684,18 @@ static int isp116x_resume(struct platform_device *dev) | |||
1684 | 1684 | ||
1685 | #endif | 1685 | #endif |
1686 | 1686 | ||
1687 | /* work with hotplug and coldplug */ | ||
1688 | MODULE_ALIAS("platform:isp116x-hcd"); | ||
1689 | |||
1687 | static struct platform_driver isp116x_driver = { | 1690 | static struct platform_driver isp116x_driver = { |
1688 | .probe = isp116x_probe, | 1691 | .probe = isp116x_probe, |
1689 | .remove = isp116x_remove, | 1692 | .remove = isp116x_remove, |
1690 | .suspend = isp116x_suspend, | 1693 | .suspend = isp116x_suspend, |
1691 | .resume = isp116x_resume, | 1694 | .resume = isp116x_resume, |
1692 | .driver = { | 1695 | .driver = { |
1693 | .name = (char *)hcd_name, | 1696 | .name = (char *)hcd_name, |
1694 | }, | 1697 | .owner = THIS_MODULE, |
1698 | }, | ||
1695 | }; | 1699 | }; |
1696 | 1700 | ||
1697 | /*-----------------------------------------------------------------*/ | 1701 | /*-----------------------------------------------------------------*/ |
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 126fcbdd6408..d72dc07dda01 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
@@ -355,7 +355,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *pdev) | |||
355 | #define ohci_hcd_at91_drv_resume NULL | 355 | #define ohci_hcd_at91_drv_resume NULL |
356 | #endif | 356 | #endif |
357 | 357 | ||
358 | MODULE_ALIAS("at91_ohci"); | 358 | MODULE_ALIAS("platform:at91_ohci"); |
359 | 359 | ||
360 | static struct platform_driver ohci_hcd_at91_driver = { | 360 | static struct platform_driver ohci_hcd_at91_driver = { |
361 | .probe = ohci_hcd_at91_drv_probe, | 361 | .probe = ohci_hcd_at91_drv_probe, |
@@ -368,4 +368,3 @@ static struct platform_driver ohci_hcd_at91_driver = { | |||
368 | .owner = THIS_MODULE, | 368 | .owner = THIS_MODULE, |
369 | }, | 369 | }, |
370 | }; | 370 | }; |
371 | |||
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index 663a0600b6e7..f90fe0c7373f 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
@@ -345,3 +345,4 @@ static struct platform_driver ohci_hcd_au1xxx_driver = { | |||
345 | }, | 345 | }, |
346 | }; | 346 | }; |
347 | 347 | ||
348 | MODULE_ALIAS("platform:au1xxx-ohci"); | ||
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index a68ce9d3c525..156e93a9d0df 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
@@ -211,6 +211,8 @@ static struct platform_driver ohci_hcd_ep93xx_driver = { | |||
211 | #endif | 211 | #endif |
212 | .driver = { | 212 | .driver = { |
213 | .name = "ep93xx-ohci", | 213 | .name = "ep93xx-ohci", |
214 | .owner = THIS_MODULE, | ||
214 | }, | 215 | }, |
215 | }; | 216 | }; |
216 | 217 | ||
218 | MODULE_ALIAS("platform:ep93xx-ohci"); | ||
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 4a043abd85ea..13c12ed22252 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c | |||
@@ -251,3 +251,4 @@ static struct platform_driver ohci_hcd_lh7a404_driver = { | |||
251 | }, | 251 | }, |
252 | }; | 252 | }; |
253 | 253 | ||
254 | MODULE_ALIAS("platform:lh7a404-ohci"); | ||
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 74e1f4be10bb..7bfca1ed1b58 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -544,3 +544,4 @@ static struct platform_driver ohci_hcd_omap_driver = { | |||
544 | }, | 544 | }, |
545 | }; | 545 | }; |
546 | 546 | ||
547 | MODULE_ALIAS("platform:ohci"); | ||
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 6c52c66b659f..28b458f20cc3 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -456,9 +456,13 @@ static int usb_hcd_pnx4008_remove(struct platform_device *pdev) | |||
456 | return 0; | 456 | return 0; |
457 | } | 457 | } |
458 | 458 | ||
459 | /* work with hotplug and coldplug */ | ||
460 | MODULE_ALIAS("platform:usb-ohci"); | ||
461 | |||
459 | static struct platform_driver usb_hcd_pnx4008_driver = { | 462 | static struct platform_driver usb_hcd_pnx4008_driver = { |
460 | .driver = { | 463 | .driver = { |
461 | .name = "usb-ohci", | 464 | .name = "usb-ohci", |
465 | .owner = THIS_MODULE, | ||
462 | }, | 466 | }, |
463 | .probe = usb_hcd_pnx4008_probe, | 467 | .probe = usb_hcd_pnx4008_probe, |
464 | .remove = usb_hcd_pnx4008_remove, | 468 | .remove = usb_hcd_pnx4008_remove, |
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c index 85fdfd2a7ad0..605d59cba28e 100644 --- a/drivers/usb/host/ohci-pnx8550.c +++ b/drivers/usb/host/ohci-pnx8550.c | |||
@@ -230,11 +230,12 @@ static int ohci_hcd_pnx8550_drv_remove(struct platform_device *pdev) | |||
230 | return 0; | 230 | return 0; |
231 | } | 231 | } |
232 | 232 | ||
233 | MODULE_ALIAS("pnx8550-ohci"); | 233 | MODULE_ALIAS("platform:pnx8550-ohci"); |
234 | 234 | ||
235 | static struct platform_driver ohci_hcd_pnx8550_driver = { | 235 | static struct platform_driver ohci_hcd_pnx8550_driver = { |
236 | .driver = { | 236 | .driver = { |
237 | .name = "pnx8550-ohci", | 237 | .name = "pnx8550-ohci", |
238 | .owner = THIS_MODULE, | ||
238 | }, | 239 | }, |
239 | .probe = ohci_hcd_pnx8550_drv_probe, | 240 | .probe = ohci_hcd_pnx8550_drv_probe, |
240 | .remove = ohci_hcd_pnx8550_drv_remove, | 241 | .remove = ohci_hcd_pnx8550_drv_remove, |
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index f95be1896b0d..523c30125577 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c | |||
@@ -213,3 +213,4 @@ static struct platform_driver ohci_hcd_ppc_soc_driver = { | |||
213 | }, | 213 | }, |
214 | }; | 214 | }; |
215 | 215 | ||
216 | MODULE_ALIAS("platform:ppc-soc-ohci"); | ||
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index ff9a79843471..8ad9b3b604b5 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -364,6 +364,8 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev) | |||
364 | } | 364 | } |
365 | #endif | 365 | #endif |
366 | 366 | ||
367 | /* work with hotplug and coldplug */ | ||
368 | MODULE_ALIAS("platform:pxa27x-ohci"); | ||
367 | 369 | ||
368 | static struct platform_driver ohci_hcd_pxa27x_driver = { | 370 | static struct platform_driver ohci_hcd_pxa27x_driver = { |
369 | .probe = ohci_hcd_pxa27x_drv_probe, | 371 | .probe = ohci_hcd_pxa27x_drv_probe, |
@@ -375,6 +377,7 @@ static struct platform_driver ohci_hcd_pxa27x_driver = { | |||
375 | #endif | 377 | #endif |
376 | .driver = { | 378 | .driver = { |
377 | .name = "pxa27x-ohci", | 379 | .name = "pxa27x-ohci", |
380 | .owner = THIS_MODULE, | ||
378 | }, | 381 | }, |
379 | }; | 382 | }; |
380 | 383 | ||
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 44b79e8a6e25..ead4772f0f27 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
@@ -501,3 +501,4 @@ static struct platform_driver ohci_hcd_s3c2410_driver = { | |||
501 | }, | 501 | }, |
502 | }; | 502 | }; |
503 | 503 | ||
504 | MODULE_ALIAS("platform:s3c2410-ohci"); | ||
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 5309ac039e15..e7ee607278fe 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
@@ -141,3 +141,4 @@ static struct platform_driver ohci_hcd_sh_driver = { | |||
141 | }, | 141 | }, |
142 | }; | 142 | }; |
143 | 143 | ||
144 | MODULE_ALIAS("platform:sh_ohci"); | ||
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index a97070142869..4ea92762fb28 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
@@ -262,3 +262,4 @@ static struct platform_driver ohci_hcd_sm501_driver = { | |||
262 | .name = "sm501-usb", | 262 | .name = "sm501-usb", |
263 | }, | 263 | }, |
264 | }; | 264 | }; |
265 | MODULE_ALIAS("platform:sm501-usb"); | ||
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 0ce2fc5e396b..9f80e5285575 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -44,6 +44,7 @@ | |||
44 | MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver"); | 44 | MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver"); |
45 | MODULE_LICENSE("GPL"); | 45 | MODULE_LICENSE("GPL"); |
46 | MODULE_AUTHOR("Yoshihiro Shimoda"); | 46 | MODULE_AUTHOR("Yoshihiro Shimoda"); |
47 | MODULE_ALIAS("platform:r8a66597_hcd"); | ||
47 | 48 | ||
48 | #define DRIVER_VERSION "29 May 2007" | 49 | #define DRIVER_VERSION "29 May 2007" |
49 | 50 | ||
@@ -2219,6 +2220,7 @@ static struct platform_driver r8a66597_driver = { | |||
2219 | .resume = r8a66597_resume, | 2220 | .resume = r8a66597_resume, |
2220 | .driver = { | 2221 | .driver = { |
2221 | .name = (char *) hcd_name, | 2222 | .name = (char *) hcd_name, |
2223 | .owner = THIS_MODULE, | ||
2222 | }, | 2224 | }, |
2223 | }; | 2225 | }; |
2224 | 2226 | ||
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 59be276ccd9d..629bca0ebe8f 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -58,6 +58,7 @@ | |||
58 | 58 | ||
59 | MODULE_DESCRIPTION("SL811HS USB Host Controller Driver"); | 59 | MODULE_DESCRIPTION("SL811HS USB Host Controller Driver"); |
60 | MODULE_LICENSE("GPL"); | 60 | MODULE_LICENSE("GPL"); |
61 | MODULE_ALIAS("platform:sl811-hcd"); | ||
61 | 62 | ||
62 | #define DRIVER_VERSION "19 May 2005" | 63 | #define DRIVER_VERSION "19 May 2005" |
63 | 64 | ||
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 3033d6945202..8e117a795e93 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -3316,3 +3316,4 @@ static void __exit u132_hcd_exit(void) | |||
3316 | 3316 | ||
3317 | module_exit(u132_hcd_exit); | 3317 | module_exit(u132_hcd_exit); |
3318 | MODULE_LICENSE("GPL"); | 3318 | MODULE_LICENSE("GPL"); |
3319 | MODULE_ALIAS("platform:u132_hcd"); | ||
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index aa714028641e..c2fa5c630813 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c | |||
@@ -214,10 +214,7 @@ static void vring_disable_cb(struct virtqueue *_vq) | |||
214 | { | 214 | { |
215 | struct vring_virtqueue *vq = to_vvq(_vq); | 215 | struct vring_virtqueue *vq = to_vvq(_vq); |
216 | 216 | ||
217 | START_USE(vq); | ||
218 | BUG_ON(vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT); | ||
219 | vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT; | 217 | vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT; |
220 | END_USE(vq); | ||
221 | } | 218 | } |
222 | 219 | ||
223 | static bool vring_enable_cb(struct virtqueue *_vq) | 220 | static bool vring_enable_cb(struct virtqueue *_vq) |
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c index fb5ed6478f78..ae0fca5e8749 100644 --- a/drivers/watchdog/at32ap700x_wdt.c +++ b/drivers/watchdog/at32ap700x_wdt.c | |||
@@ -418,6 +418,9 @@ static int at32_wdt_resume(struct platform_device *pdev) | |||
418 | #define at32_wdt_resume NULL | 418 | #define at32_wdt_resume NULL |
419 | #endif | 419 | #endif |
420 | 420 | ||
421 | /* work with hotplug and coldplug */ | ||
422 | MODULE_ALIAS("platform:at32_wdt"); | ||
423 | |||
421 | static struct platform_driver at32_wdt_driver = { | 424 | static struct platform_driver at32_wdt_driver = { |
422 | .remove = __exit_p(at32_wdt_remove), | 425 | .remove = __exit_p(at32_wdt_remove), |
423 | .suspend = at32_wdt_suspend, | 426 | .suspend = at32_wdt_suspend, |
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index a684b1e87372..9ff9a9565320 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c | |||
@@ -286,3 +286,4 @@ MODULE_AUTHOR("Andrew Victor"); | |||
286 | MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); | 286 | MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); |
287 | MODULE_LICENSE("GPL"); | 287 | MODULE_LICENSE("GPL"); |
288 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 288 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
289 | MODULE_ALIAS("platform:at91_wdt"); | ||
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index a61cbd48dc07..1782c79eff06 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c | |||
@@ -248,6 +248,7 @@ static int davinci_wdt_remove(struct platform_device *pdev) | |||
248 | static struct platform_driver platform_wdt_driver = { | 248 | static struct platform_driver platform_wdt_driver = { |
249 | .driver = { | 249 | .driver = { |
250 | .name = "watchdog", | 250 | .name = "watchdog", |
251 | .owner = THIS_MODULE, | ||
251 | }, | 252 | }, |
252 | .probe = davinci_wdt_probe, | 253 | .probe = davinci_wdt_probe, |
253 | .remove = davinci_wdt_remove, | 254 | .remove = davinci_wdt_remove, |
@@ -277,3 +278,4 @@ MODULE_PARM_DESC(heartbeat, | |||
277 | 278 | ||
278 | MODULE_LICENSE("GPL"); | 279 | MODULE_LICENSE("GPL"); |
279 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 280 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
281 | MODULE_ALIAS("platform:watchdog"); | ||
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c index ca90c5192596..445b7e812112 100644 --- a/drivers/watchdog/it8712f_wdt.c +++ b/drivers/watchdog/it8712f_wdt.c | |||
@@ -200,6 +200,8 @@ it8712f_wdt_disable(void) | |||
200 | 200 | ||
201 | superio_outb(0, WDT_CONFIG); | 201 | superio_outb(0, WDT_CONFIG); |
202 | superio_outb(0, WDT_CONTROL); | 202 | superio_outb(0, WDT_CONTROL); |
203 | if (revision >= 0x08) | ||
204 | superio_outb(0, WDT_TIMEOUT + 1); | ||
203 | superio_outb(0, WDT_TIMEOUT); | 205 | superio_outb(0, WDT_TIMEOUT); |
204 | 206 | ||
205 | superio_exit(); | 207 | superio_exit(); |
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index e3a29c302309..df5a6b811ccd 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c | |||
@@ -306,3 +306,4 @@ MODULE_AUTHOR("Andrew Victor"); | |||
306 | MODULE_DESCRIPTION("Watchdog driver for KS8695"); | 306 | MODULE_DESCRIPTION("Watchdog driver for KS8695"); |
307 | MODULE_LICENSE("GPL"); | 307 | MODULE_LICENSE("GPL"); |
308 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 308 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
309 | MODULE_ALIAS("platform:ks8695_wdt"); | ||
diff --git a/drivers/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc83xx_wdt.c index 6369f569517f..b16c5cd972eb 100644 --- a/drivers/watchdog/mpc83xx_wdt.c +++ b/drivers/watchdog/mpc83xx_wdt.c | |||
@@ -206,6 +206,7 @@ static struct platform_driver mpc83xx_wdt_driver = { | |||
206 | .remove = __devexit_p(mpc83xx_wdt_remove), | 206 | .remove = __devexit_p(mpc83xx_wdt_remove), |
207 | .driver = { | 207 | .driver = { |
208 | .name = "mpc83xx_wdt", | 208 | .name = "mpc83xx_wdt", |
209 | .owner = THIS_MODULE, | ||
209 | }, | 210 | }, |
210 | }; | 211 | }; |
211 | 212 | ||
@@ -226,3 +227,4 @@ MODULE_AUTHOR("Dave Updegraff, Kumar Gala"); | |||
226 | MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor"); | 227 | MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor"); |
227 | MODULE_LICENSE("GPL"); | 228 | MODULE_LICENSE("GPL"); |
228 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 229 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
230 | MODULE_ALIAS("platform:mpc83xx_wdt"); | ||
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index 0d2b27735419..009573b81496 100644 --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c | |||
@@ -392,6 +392,9 @@ static int __devexit mpcore_wdt_remove(struct platform_device *dev) | |||
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | 394 | ||
395 | /* work with hotplug and coldplug */ | ||
396 | MODULE_ALIAS("platform:mpcore_wdt"); | ||
397 | |||
395 | static struct platform_driver mpcore_wdt_driver = { | 398 | static struct platform_driver mpcore_wdt_driver = { |
396 | .probe = mpcore_wdt_probe, | 399 | .probe = mpcore_wdt_probe, |
397 | .remove = __devexit_p(mpcore_wdt_remove), | 400 | .remove = __devexit_p(mpcore_wdt_remove), |
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 10b89f2703bd..a8e67383784e 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c | |||
@@ -243,6 +243,7 @@ static struct platform_driver mtx1_wdt = { | |||
243 | .probe = mtx1_wdt_probe, | 243 | .probe = mtx1_wdt_probe, |
244 | .remove = mtx1_wdt_remove, | 244 | .remove = mtx1_wdt_remove, |
245 | .driver.name = "mtx1-wdt", | 245 | .driver.name = "mtx1-wdt", |
246 | .driver.owner = THIS_MODULE, | ||
246 | }; | 247 | }; |
247 | 248 | ||
248 | static int __init mtx1_wdt_init(void) | 249 | static int __init mtx1_wdt_init(void) |
@@ -262,3 +263,4 @@ MODULE_AUTHOR("Michael Stickel, Florian Fainelli"); | |||
262 | MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); | 263 | MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); |
263 | MODULE_LICENSE("GPL"); | 264 | MODULE_LICENSE("GPL"); |
264 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 265 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
266 | MODULE_ALIAS("platform:mtx1-wdt"); | ||
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c index 0365c317f7e1..b59ca3273967 100644 --- a/drivers/watchdog/mv64x60_wdt.c +++ b/drivers/watchdog/mv64x60_wdt.c | |||
@@ -324,3 +324,4 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); | |||
324 | MODULE_DESCRIPTION("MV64x60 watchdog driver"); | 324 | MODULE_DESCRIPTION("MV64x60 watchdog driver"); |
325 | MODULE_LICENSE("GPL"); | 325 | MODULE_LICENSE("GPL"); |
326 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 326 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
327 | MODULE_ALIAS("platform:" MV64x60_WDT_NAME); | ||
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 635ca454f56b..74bc39aa1ce8 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c | |||
@@ -387,3 +387,4 @@ module_exit(omap_wdt_exit); | |||
387 | MODULE_AUTHOR("George G. Davis"); | 387 | MODULE_AUTHOR("George G. Davis"); |
388 | MODULE_LICENSE("GPL"); | 388 | MODULE_LICENSE("GPL"); |
389 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 389 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
390 | MODULE_ALIAS("platform:omap_wdt"); | ||
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index b04aa096a10a..6b8483d3c783 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
@@ -321,6 +321,7 @@ static int pnx4008_wdt_remove(struct platform_device *pdev) | |||
321 | static struct platform_driver platform_wdt_driver = { | 321 | static struct platform_driver platform_wdt_driver = { |
322 | .driver = { | 322 | .driver = { |
323 | .name = "watchdog", | 323 | .name = "watchdog", |
324 | .owner = THIS_MODULE, | ||
324 | }, | 325 | }, |
325 | .probe = pnx4008_wdt_probe, | 326 | .probe = pnx4008_wdt_probe, |
326 | .remove = pnx4008_wdt_remove, | 327 | .remove = pnx4008_wdt_remove, |
@@ -354,3 +355,4 @@ MODULE_PARM_DESC(nowayout, | |||
354 | 355 | ||
355 | MODULE_LICENSE("GPL"); | 356 | MODULE_LICENSE("GPL"); |
356 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 357 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
358 | MODULE_ALIAS("platform:watchdog"); | ||
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 7645e8812156..98532c0e0689 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
@@ -561,3 +561,4 @@ MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>, " | |||
561 | MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); | 561 | MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); |
562 | MODULE_LICENSE("GPL"); | 562 | MODULE_LICENSE("GPL"); |
563 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 563 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
564 | MODULE_ALIAS("platform:s3c2410-wdt"); | ||
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c index 328b3c7211ef..57cefef27ce3 100644 --- a/drivers/watchdog/txx9wdt.c +++ b/drivers/watchdog/txx9wdt.c | |||
@@ -274,3 +274,4 @@ module_exit(watchdog_exit); | |||
274 | MODULE_DESCRIPTION("TXx9 Watchdog Driver"); | 274 | MODULE_DESCRIPTION("TXx9 Watchdog Driver"); |
275 | MODULE_LICENSE("GPL"); | 275 | MODULE_LICENSE("GPL"); |
276 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 276 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
277 | MODULE_ALIAS("platform:txx9wdt"); | ||
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index ea94dbabf9a9..d85dc6d41c2a 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
@@ -381,11 +381,15 @@ EXPORT_SYMBOL_GPL(gnttab_cancel_free_callback); | |||
381 | static int grow_gnttab_list(unsigned int more_frames) | 381 | static int grow_gnttab_list(unsigned int more_frames) |
382 | { | 382 | { |
383 | unsigned int new_nr_grant_frames, extra_entries, i; | 383 | unsigned int new_nr_grant_frames, extra_entries, i; |
384 | unsigned int nr_glist_frames, new_nr_glist_frames; | ||
384 | 385 | ||
385 | new_nr_grant_frames = nr_grant_frames + more_frames; | 386 | new_nr_grant_frames = nr_grant_frames + more_frames; |
386 | extra_entries = more_frames * GREFS_PER_GRANT_FRAME; | 387 | extra_entries = more_frames * GREFS_PER_GRANT_FRAME; |
387 | 388 | ||
388 | for (i = nr_grant_frames; i < new_nr_grant_frames; i++) { | 389 | nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP; |
390 | new_nr_glist_frames = | ||
391 | (new_nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP; | ||
392 | for (i = nr_glist_frames; i < new_nr_glist_frames; i++) { | ||
389 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC); | 393 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC); |
390 | if (!gnttab_list[i]) | 394 | if (!gnttab_list[i]) |
391 | goto grow_nomem; | 395 | goto grow_nomem; |
@@ -407,7 +411,7 @@ static int grow_gnttab_list(unsigned int more_frames) | |||
407 | return 0; | 411 | return 0; |
408 | 412 | ||
409 | grow_nomem: | 413 | grow_nomem: |
410 | for ( ; i >= nr_grant_frames; i--) | 414 | for ( ; i >= nr_glist_frames; i--) |
411 | free_page((unsigned long) gnttab_list[i]); | 415 | free_page((unsigned long) gnttab_list[i]); |
412 | return -ENOMEM; | 416 | return -ENOMEM; |
413 | } | 417 | } |
@@ -530,7 +534,7 @@ static int gnttab_expand(unsigned int req_entries) | |||
530 | static int __devinit gnttab_init(void) | 534 | static int __devinit gnttab_init(void) |
531 | { | 535 | { |
532 | int i; | 536 | int i; |
533 | unsigned int max_nr_glist_frames; | 537 | unsigned int max_nr_glist_frames, nr_glist_frames; |
534 | unsigned int nr_init_grefs; | 538 | unsigned int nr_init_grefs; |
535 | 539 | ||
536 | if (!is_running_on_xen()) | 540 | if (!is_running_on_xen()) |
@@ -543,15 +547,15 @@ static int __devinit gnttab_init(void) | |||
543 | * grant reference free list on the current hypervisor. | 547 | * grant reference free list on the current hypervisor. |
544 | */ | 548 | */ |
545 | max_nr_glist_frames = (boot_max_nr_grant_frames * | 549 | max_nr_glist_frames = (boot_max_nr_grant_frames * |
546 | GREFS_PER_GRANT_FRAME / | 550 | GREFS_PER_GRANT_FRAME / RPP); |
547 | (PAGE_SIZE / sizeof(grant_ref_t))); | ||
548 | 551 | ||
549 | gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *), | 552 | gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *), |
550 | GFP_KERNEL); | 553 | GFP_KERNEL); |
551 | if (gnttab_list == NULL) | 554 | if (gnttab_list == NULL) |
552 | return -ENOMEM; | 555 | return -ENOMEM; |
553 | 556 | ||
554 | for (i = 0; i < nr_grant_frames; i++) { | 557 | nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP; |
558 | for (i = 0; i < nr_glist_frames; i++) { | ||
555 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL); | 559 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL); |
556 | if (gnttab_list[i] == NULL) | 560 | if (gnttab_list[i] == NULL) |
557 | goto ini_nomem; | 561 | goto ini_nomem; |
diff --git a/fs/Kconfig b/fs/Kconfig index d7312825592b..c509123bea49 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -1744,10 +1744,10 @@ config ROOT_NFS | |||
1744 | If you want your Linux box to mount its whole root file system (the | 1744 | If you want your Linux box to mount its whole root file system (the |
1745 | one containing the directory /) from some other computer over the | 1745 | one containing the directory /) from some other computer over the |
1746 | net via NFS (presumably because your box doesn't have a hard disk), | 1746 | net via NFS (presumably because your box doesn't have a hard disk), |
1747 | say Y. Read <file:Documentation/nfsroot.txt> for details. It is | 1747 | say Y. Read <file:Documentation/filesystems/nfsroot.txt> for |
1748 | likely that in this case, you also want to say Y to "Kernel level IP | 1748 | details. It is likely that in this case, you also want to say Y to |
1749 | autoconfiguration" so that your box can discover its network address | 1749 | "Kernel level IP autoconfiguration" so that your box can discover |
1750 | at boot time. | 1750 | its network address at boot time. |
1751 | 1751 | ||
1752 | Most people say N here. | 1752 | Most people say N here. |
1753 | 1753 | ||
@@ -936,14 +936,6 @@ int aio_complete(struct kiocb *iocb, long res, long res2) | |||
936 | return 1; | 936 | return 1; |
937 | } | 937 | } |
938 | 938 | ||
939 | /* | ||
940 | * Check if the user asked us to deliver the result through an | ||
941 | * eventfd. The eventfd_signal() function is safe to be called | ||
942 | * from IRQ context. | ||
943 | */ | ||
944 | if (!IS_ERR(iocb->ki_eventfd)) | ||
945 | eventfd_signal(iocb->ki_eventfd, 1); | ||
946 | |||
947 | info = &ctx->ring_info; | 939 | info = &ctx->ring_info; |
948 | 940 | ||
949 | /* add a completion event to the ring buffer. | 941 | /* add a completion event to the ring buffer. |
@@ -992,6 +984,15 @@ int aio_complete(struct kiocb *iocb, long res, long res2) | |||
992 | kunmap_atomic(ring, KM_IRQ1); | 984 | kunmap_atomic(ring, KM_IRQ1); |
993 | 985 | ||
994 | pr_debug("added to ring %p at [%lu]\n", iocb, tail); | 986 | pr_debug("added to ring %p at [%lu]\n", iocb, tail); |
987 | |||
988 | /* | ||
989 | * Check if the user asked us to deliver the result through an | ||
990 | * eventfd. The eventfd_signal() function is safe to be called | ||
991 | * from IRQ context. | ||
992 | */ | ||
993 | if (!IS_ERR(iocb->ki_eventfd)) | ||
994 | eventfd_signal(iocb->ki_eventfd, 1); | ||
995 | |||
995 | put_rq: | 996 | put_rq: |
996 | /* everything turned out well, dispose of the aiocb. */ | 997 | /* everything turned out well, dispose of the aiocb. */ |
997 | ret = __aio_put_req(ctx, iocb); | 998 | ret = __aio_put_req(ctx, iocb); |
@@ -1790,6 +1791,7 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id, | |||
1790 | put_ioctx(ioctx); | 1791 | put_ioctx(ioctx); |
1791 | } | 1792 | } |
1792 | 1793 | ||
1794 | asmlinkage_protect(5, ret, ctx_id, min_nr, nr, events, timeout); | ||
1793 | return ret; | 1795 | return ret; |
1794 | } | 1796 | } |
1795 | 1797 | ||
diff --git a/fs/buffer.c b/fs/buffer.c index 98196327ddf0..39ff14403d13 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -1181,7 +1181,20 @@ __getblk_slow(struct block_device *bdev, sector_t block, int size) | |||
1181 | void mark_buffer_dirty(struct buffer_head *bh) | 1181 | void mark_buffer_dirty(struct buffer_head *bh) |
1182 | { | 1182 | { |
1183 | WARN_ON_ONCE(!buffer_uptodate(bh)); | 1183 | WARN_ON_ONCE(!buffer_uptodate(bh)); |
1184 | if (!buffer_dirty(bh) && !test_set_buffer_dirty(bh)) | 1184 | |
1185 | /* | ||
1186 | * Very *carefully* optimize the it-is-already-dirty case. | ||
1187 | * | ||
1188 | * Don't let the final "is it dirty" escape to before we | ||
1189 | * perhaps modified the buffer. | ||
1190 | */ | ||
1191 | if (buffer_dirty(bh)) { | ||
1192 | smp_mb(); | ||
1193 | if (buffer_dirty(bh)) | ||
1194 | return; | ||
1195 | } | ||
1196 | |||
1197 | if (!test_set_buffer_dirty(bh)) | ||
1185 | __set_page_dirty(bh->b_page, page_mapping(bh->b_page), 0); | 1198 | __set_page_dirty(bh->b_page, page_mapping(bh->b_page), 0); |
1186 | } | 1199 | } |
1187 | 1200 | ||
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 29683645fa0a..5f4023678251 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
@@ -340,16 +340,23 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry) | |||
340 | 340 | ||
341 | if (inode->i_nlink > 0) | 341 | if (inode->i_nlink > 0) |
342 | drop_nlink(inode); | 342 | drop_nlink(inode); |
343 | hfsplus_delete_inode(inode); | 343 | if (inode->i_ino == cnid) |
344 | if (inode->i_ino != cnid && !inode->i_nlink) { | 344 | clear_nlink(inode); |
345 | if (!atomic_read(&HFSPLUS_I(inode).opencnt)) { | 345 | if (!inode->i_nlink) { |
346 | res = hfsplus_delete_cat(inode->i_ino, HFSPLUS_SB(sb).hidden_dir, NULL); | 346 | if (inode->i_ino != cnid) { |
347 | if (!res) | 347 | HFSPLUS_SB(sb).file_count--; |
348 | hfsplus_delete_inode(inode); | 348 | if (!atomic_read(&HFSPLUS_I(inode).opencnt)) { |
349 | res = hfsplus_delete_cat(inode->i_ino, | ||
350 | HFSPLUS_SB(sb).hidden_dir, | ||
351 | NULL); | ||
352 | if (!res) | ||
353 | hfsplus_delete_inode(inode); | ||
354 | } else | ||
355 | inode->i_flags |= S_DEAD; | ||
349 | } else | 356 | } else |
350 | inode->i_flags |= S_DEAD; | 357 | hfsplus_delete_inode(inode); |
351 | } else | 358 | } else |
352 | clear_nlink(inode); | 359 | HFSPLUS_SB(sb).file_count--; |
353 | inode->i_ctime = CURRENT_TIME_SEC; | 360 | inode->i_ctime = CURRENT_TIME_SEC; |
354 | mark_inode_dirty(inode); | 361 | mark_inode_dirty(inode); |
355 | 362 | ||
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index f9c5dd6f4b64..dcc2734e0b5d 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c | |||
@@ -129,7 +129,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, | |||
129 | struct inode *inode = mapping->host; | 129 | struct inode *inode = mapping->host; |
130 | struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); | 130 | struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); |
131 | pgoff_t index = pos >> PAGE_CACHE_SHIFT; | 131 | pgoff_t index = pos >> PAGE_CACHE_SHIFT; |
132 | uint32_t pageofs = pos & (PAGE_CACHE_SIZE - 1); | 132 | uint32_t pageofs = index << PAGE_CACHE_SHIFT; |
133 | int ret = 0; | 133 | int ret = 0; |
134 | 134 | ||
135 | pg = __grab_cache_page(mapping, index); | 135 | pg = __grab_cache_page(mapping, index); |
diff --git a/fs/locks.c b/fs/locks.c index d83fab1b77b5..43c0af21a0c5 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -1801,17 +1801,21 @@ again: | |||
1801 | if (error) | 1801 | if (error) |
1802 | goto out; | 1802 | goto out; |
1803 | 1803 | ||
1804 | for (;;) { | 1804 | if (filp->f_op && filp->f_op->lock != NULL) |
1805 | error = vfs_lock_file(filp, cmd, file_lock, NULL); | 1805 | error = filp->f_op->lock(filp, cmd, file_lock); |
1806 | if (error != -EAGAIN || cmd == F_SETLK) | 1806 | else { |
1807 | break; | 1807 | for (;;) { |
1808 | error = wait_event_interruptible(file_lock->fl_wait, | 1808 | error = posix_lock_file(filp, file_lock, NULL); |
1809 | !file_lock->fl_next); | 1809 | if (error != -EAGAIN || cmd == F_SETLK) |
1810 | if (!error) | 1810 | break; |
1811 | continue; | 1811 | error = wait_event_interruptible(file_lock->fl_wait, |
1812 | !file_lock->fl_next); | ||
1813 | if (!error) | ||
1814 | continue; | ||
1812 | 1815 | ||
1813 | locks_delete_block(file_lock); | 1816 | locks_delete_block(file_lock); |
1814 | break; | 1817 | break; |
1818 | } | ||
1815 | } | 1819 | } |
1816 | 1820 | ||
1817 | /* | 1821 | /* |
@@ -1925,17 +1929,21 @@ again: | |||
1925 | if (error) | 1929 | if (error) |
1926 | goto out; | 1930 | goto out; |
1927 | 1931 | ||
1928 | for (;;) { | 1932 | if (filp->f_op && filp->f_op->lock != NULL) |
1929 | error = vfs_lock_file(filp, cmd, file_lock, NULL); | 1933 | error = filp->f_op->lock(filp, cmd, file_lock); |
1930 | if (error != -EAGAIN || cmd == F_SETLK64) | 1934 | else { |
1931 | break; | 1935 | for (;;) { |
1932 | error = wait_event_interruptible(file_lock->fl_wait, | 1936 | error = posix_lock_file(filp, file_lock, NULL); |
1933 | !file_lock->fl_next); | 1937 | if (error != -EAGAIN || cmd == F_SETLK64) |
1934 | if (!error) | 1938 | break; |
1935 | continue; | 1939 | error = wait_event_interruptible(file_lock->fl_wait, |
1940 | !file_lock->fl_next); | ||
1941 | if (!error) | ||
1942 | continue; | ||
1936 | 1943 | ||
1937 | locks_delete_block(file_lock); | 1944 | locks_delete_block(file_lock); |
1938 | break; | 1945 | break; |
1946 | } | ||
1939 | } | 1947 | } |
1940 | 1948 | ||
1941 | /* | 1949 | /* |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index ef57a5ae5904..5d2e9d9a4e28 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -64,7 +64,11 @@ const struct file_operations nfs_file_operations = { | |||
64 | .write = do_sync_write, | 64 | .write = do_sync_write, |
65 | .aio_read = nfs_file_read, | 65 | .aio_read = nfs_file_read, |
66 | .aio_write = nfs_file_write, | 66 | .aio_write = nfs_file_write, |
67 | #ifdef CONFIG_MMU | ||
67 | .mmap = nfs_file_mmap, | 68 | .mmap = nfs_file_mmap, |
69 | #else | ||
70 | .mmap = generic_file_mmap, | ||
71 | #endif | ||
68 | .open = nfs_file_open, | 72 | .open = nfs_file_open, |
69 | .flush = nfs_file_flush, | 73 | .flush = nfs_file_flush, |
70 | .release = nfs_file_release, | 74 | .release = nfs_file_release, |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a4c7cf2bff3a..6f88d7c77ac9 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -506,6 +506,7 @@ static struct nfs_open_context *alloc_nfs_open_context(struct vfsmount *mnt, str | |||
506 | ctx->cred = get_rpccred(cred); | 506 | ctx->cred = get_rpccred(cred); |
507 | ctx->state = NULL; | 507 | ctx->state = NULL; |
508 | ctx->lockowner = current->files; | 508 | ctx->lockowner = current->files; |
509 | ctx->flags = 0; | ||
509 | ctx->error = 0; | 510 | ctx->error = 0; |
510 | ctx->dir_cookie = 0; | 511 | ctx->dir_cookie = 0; |
511 | atomic_set(&ctx->count, 1); | 512 | atomic_set(&ctx->count, 1); |
@@ -335,7 +335,7 @@ asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length) | |||
335 | { | 335 | { |
336 | long ret = do_sys_ftruncate(fd, length, 1); | 336 | long ret = do_sys_ftruncate(fd, length, 1); |
337 | /* avoid REGPARM breakage on x86: */ | 337 | /* avoid REGPARM breakage on x86: */ |
338 | prevent_tail_call(ret); | 338 | asmlinkage_protect(2, ret, fd, length); |
339 | return ret; | 339 | return ret; |
340 | } | 340 | } |
341 | 341 | ||
@@ -350,7 +350,7 @@ asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length) | |||
350 | { | 350 | { |
351 | long ret = do_sys_ftruncate(fd, length, 0); | 351 | long ret = do_sys_ftruncate(fd, length, 0); |
352 | /* avoid REGPARM breakage on x86: */ | 352 | /* avoid REGPARM breakage on x86: */ |
353 | prevent_tail_call(ret); | 353 | asmlinkage_protect(2, ret, fd, length); |
354 | return ret; | 354 | return ret; |
355 | } | 355 | } |
356 | #endif | 356 | #endif |
@@ -1067,7 +1067,7 @@ asmlinkage long sys_open(const char __user *filename, int flags, int mode) | |||
1067 | 1067 | ||
1068 | ret = do_sys_open(AT_FDCWD, filename, flags, mode); | 1068 | ret = do_sys_open(AT_FDCWD, filename, flags, mode); |
1069 | /* avoid REGPARM breakage on x86: */ | 1069 | /* avoid REGPARM breakage on x86: */ |
1070 | prevent_tail_call(ret); | 1070 | asmlinkage_protect(3, ret, filename, flags, mode); |
1071 | return ret; | 1071 | return ret; |
1072 | } | 1072 | } |
1073 | 1073 | ||
@@ -1081,7 +1081,7 @@ asmlinkage long sys_openat(int dfd, const char __user *filename, int flags, | |||
1081 | 1081 | ||
1082 | ret = do_sys_open(dfd, filename, flags, mode); | 1082 | ret = do_sys_open(dfd, filename, flags, mode); |
1083 | /* avoid REGPARM breakage on x86: */ | 1083 | /* avoid REGPARM breakage on x86: */ |
1084 | prevent_tail_call(ret); | 1084 | asmlinkage_protect(4, ret, dfd, filename, flags, mode); |
1085 | return ret; | 1085 | return ret; |
1086 | } | 1086 | } |
1087 | 1087 | ||
diff --git a/fs/signalfd.c b/fs/signalfd.c index cb2b63ae0bf4..8ead0db35933 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c | |||
@@ -111,9 +111,14 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, | |||
111 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); | 111 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); |
112 | err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); | 112 | err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); |
113 | break; | 113 | break; |
114 | default: /* this is just in case for now ... */ | 114 | default: |
115 | /* | ||
116 | * This case catches also the signals queued by sigqueue(). | ||
117 | */ | ||
115 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); | 118 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); |
116 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); | 119 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); |
120 | err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); | ||
121 | err |= __put_user(kinfo->si_int, &uinfo->ssi_int); | ||
117 | break; | 122 | break; |
118 | } | 123 | } |
119 | 124 | ||
diff --git a/fs/splice.c b/fs/splice.c index a861bb318ac8..eeb1a86a7014 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -370,8 +370,10 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, | |||
370 | * for an in-flight io page | 370 | * for an in-flight io page |
371 | */ | 371 | */ |
372 | if (flags & SPLICE_F_NONBLOCK) { | 372 | if (flags & SPLICE_F_NONBLOCK) { |
373 | if (TestSetPageLocked(page)) | 373 | if (TestSetPageLocked(page)) { |
374 | error = -EAGAIN; | ||
374 | break; | 375 | break; |
376 | } | ||
375 | } else | 377 | } else |
376 | lock_page(page); | 378 | lock_page(page); |
377 | 379 | ||
@@ -479,9 +481,8 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, | |||
479 | struct pipe_inode_info *pipe, size_t len, | 481 | struct pipe_inode_info *pipe, size_t len, |
480 | unsigned int flags) | 482 | unsigned int flags) |
481 | { | 483 | { |
482 | ssize_t spliced; | ||
483 | int ret; | ||
484 | loff_t isize, left; | 484 | loff_t isize, left; |
485 | int ret; | ||
485 | 486 | ||
486 | isize = i_size_read(in->f_mapping->host); | 487 | isize = i_size_read(in->f_mapping->host); |
487 | if (unlikely(*ppos >= isize)) | 488 | if (unlikely(*ppos >= isize)) |
@@ -491,29 +492,9 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, | |||
491 | if (unlikely(left < len)) | 492 | if (unlikely(left < len)) |
492 | len = left; | 493 | len = left; |
493 | 494 | ||
494 | ret = 0; | 495 | ret = __generic_file_splice_read(in, ppos, pipe, len, flags); |
495 | spliced = 0; | 496 | if (ret > 0) |
496 | while (len && !spliced) { | ||
497 | ret = __generic_file_splice_read(in, ppos, pipe, len, flags); | ||
498 | |||
499 | if (ret < 0) | ||
500 | break; | ||
501 | else if (!ret) { | ||
502 | if (spliced) | ||
503 | break; | ||
504 | if (flags & SPLICE_F_NONBLOCK) { | ||
505 | ret = -EAGAIN; | ||
506 | break; | ||
507 | } | ||
508 | } | ||
509 | |||
510 | *ppos += ret; | 497 | *ppos += ret; |
511 | len -= ret; | ||
512 | spliced += ret; | ||
513 | } | ||
514 | |||
515 | if (spliced) | ||
516 | return spliced; | ||
517 | 498 | ||
518 | return ret; | 499 | return ret; |
519 | } | 500 | } |
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index a9952e490ac9..f34bd010eb51 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
@@ -732,7 +732,7 @@ xfs_ioctl( | |||
732 | * Only allow the sys admin to reserve space unless | 732 | * Only allow the sys admin to reserve space unless |
733 | * unwritten extents are enabled. | 733 | * unwritten extents are enabled. |
734 | */ | 734 | */ |
735 | if (!XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) && | 735 | if (!xfs_sb_version_hasextflgbit(&mp->m_sb) && |
736 | !capable(CAP_SYS_ADMIN)) | 736 | !capable(CAP_SYS_ADMIN)) |
737 | return -EPERM; | 737 | return -EPERM; |
738 | 738 | ||
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 1f3da5b8657b..8e9c5ae6504d 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
@@ -1405,13 +1405,13 @@ xfs_qm_qino_alloc( | |||
1405 | #if defined(DEBUG) && defined(XFS_LOUD_RECOVERY) | 1405 | #if defined(DEBUG) && defined(XFS_LOUD_RECOVERY) |
1406 | unsigned oldv = mp->m_sb.sb_versionnum; | 1406 | unsigned oldv = mp->m_sb.sb_versionnum; |
1407 | #endif | 1407 | #endif |
1408 | ASSERT(!XFS_SB_VERSION_HASQUOTA(&mp->m_sb)); | 1408 | ASSERT(!xfs_sb_version_hasquota(&mp->m_sb)); |
1409 | ASSERT((sbfields & (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | | 1409 | ASSERT((sbfields & (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | |
1410 | XFS_SB_GQUOTINO | XFS_SB_QFLAGS)) == | 1410 | XFS_SB_GQUOTINO | XFS_SB_QFLAGS)) == |
1411 | (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | | 1411 | (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | |
1412 | XFS_SB_GQUOTINO | XFS_SB_QFLAGS)); | 1412 | XFS_SB_GQUOTINO | XFS_SB_QFLAGS)); |
1413 | 1413 | ||
1414 | XFS_SB_VERSION_ADDQUOTA(&mp->m_sb); | 1414 | xfs_sb_version_addquota(&mp->m_sb); |
1415 | mp->m_sb.sb_uquotino = NULLFSINO; | 1415 | mp->m_sb.sb_uquotino = NULLFSINO; |
1416 | mp->m_sb.sb_gquotino = NULLFSINO; | 1416 | mp->m_sb.sb_gquotino = NULLFSINO; |
1417 | 1417 | ||
@@ -1954,7 +1954,7 @@ xfs_qm_init_quotainos( | |||
1954 | /* | 1954 | /* |
1955 | * Get the uquota and gquota inodes | 1955 | * Get the uquota and gquota inodes |
1956 | */ | 1956 | */ |
1957 | if (XFS_SB_VERSION_HASQUOTA(&mp->m_sb)) { | 1957 | if (xfs_sb_version_hasquota(&mp->m_sb)) { |
1958 | if (XFS_IS_UQUOTA_ON(mp) && | 1958 | if (XFS_IS_UQUOTA_ON(mp) && |
1959 | mp->m_sb.sb_uquotino != NULLFSINO) { | 1959 | mp->m_sb.sb_uquotino != NULLFSINO) { |
1960 | ASSERT(mp->m_sb.sb_uquotino > 0); | 1960 | ASSERT(mp->m_sb.sb_uquotino > 0); |
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c index 97bb32937585..f4f6c4c861d7 100644 --- a/fs/xfs/quota/xfs_qm_bhv.c +++ b/fs/xfs/quota/xfs_qm_bhv.c | |||
@@ -118,7 +118,7 @@ xfs_qm_newmount( | |||
118 | *quotaflags = 0; | 118 | *quotaflags = 0; |
119 | *needquotamount = B_FALSE; | 119 | *needquotamount = B_FALSE; |
120 | 120 | ||
121 | quotaondisk = XFS_SB_VERSION_HASQUOTA(&mp->m_sb) && | 121 | quotaondisk = xfs_sb_version_hasquota(&mp->m_sb) && |
122 | (mp->m_sb.sb_qflags & XFS_ALL_QUOTA_ACCT); | 122 | (mp->m_sb.sb_qflags & XFS_ALL_QUOTA_ACCT); |
123 | 123 | ||
124 | if (quotaondisk) { | 124 | if (quotaondisk) { |
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index 2cc5886cfe85..d2b8be7e75f9 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
@@ -377,7 +377,7 @@ xfs_qm_scall_trunc_qfiles( | |||
377 | if (!capable(CAP_SYS_ADMIN)) | 377 | if (!capable(CAP_SYS_ADMIN)) |
378 | return XFS_ERROR(EPERM); | 378 | return XFS_ERROR(EPERM); |
379 | error = 0; | 379 | error = 0; |
380 | if (!XFS_SB_VERSION_HASQUOTA(&mp->m_sb) || flags == 0) { | 380 | if (!xfs_sb_version_hasquota(&mp->m_sb) || flags == 0) { |
381 | qdprintk("qtrunc flags=%x m_qflags=%x\n", flags, mp->m_qflags); | 381 | qdprintk("qtrunc flags=%x m_qflags=%x\n", flags, mp->m_qflags); |
382 | return XFS_ERROR(EINVAL); | 382 | return XFS_ERROR(EINVAL); |
383 | } | 383 | } |
@@ -522,7 +522,7 @@ xfs_qm_scall_getqstat( | |||
522 | memset(out, 0, sizeof(fs_quota_stat_t)); | 522 | memset(out, 0, sizeof(fs_quota_stat_t)); |
523 | 523 | ||
524 | out->qs_version = FS_QSTAT_VERSION; | 524 | out->qs_version = FS_QSTAT_VERSION; |
525 | if (! XFS_SB_VERSION_HASQUOTA(&mp->m_sb)) { | 525 | if (!xfs_sb_version_hasquota(&mp->m_sb)) { |
526 | out->qs_uquota.qfs_ino = NULLFSINO; | 526 | out->qs_uquota.qfs_ino = NULLFSINO; |
527 | out->qs_gquota.qfs_ino = NULLFSINO; | 527 | out->qs_gquota.qfs_ino = NULLFSINO; |
528 | return (0); | 528 | return (0); |
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index b08e2a2a8add..96ba6aa4ed8c 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c | |||
@@ -227,10 +227,10 @@ STATIC void | |||
227 | xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp) | 227 | xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp) |
228 | { | 228 | { |
229 | if ((mp->m_flags & XFS_MOUNT_ATTR2) && | 229 | if ((mp->m_flags & XFS_MOUNT_ATTR2) && |
230 | !(XFS_SB_VERSION_HASATTR2(&mp->m_sb))) { | 230 | !(xfs_sb_version_hasattr2(&mp->m_sb))) { |
231 | spin_lock(&mp->m_sb_lock); | 231 | spin_lock(&mp->m_sb_lock); |
232 | if (!XFS_SB_VERSION_HASATTR2(&mp->m_sb)) { | 232 | if (!xfs_sb_version_hasattr2(&mp->m_sb)) { |
233 | XFS_SB_VERSION_ADDATTR2(&mp->m_sb); | 233 | xfs_sb_version_addattr2(&mp->m_sb); |
234 | spin_unlock(&mp->m_sb_lock); | 234 | spin_unlock(&mp->m_sb_lock); |
235 | xfs_mod_sb(tp, XFS_SB_VERSIONNUM | XFS_SB_FEATURES2); | 235 | xfs_mod_sb(tp, XFS_SB_VERSIONNUM | XFS_SB_FEATURES2); |
236 | } else | 236 | } else |
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 1c0a5a585a82..2def273855a2 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
@@ -4047,17 +4047,17 @@ xfs_bmap_add_attrfork( | |||
4047 | xfs_trans_log_inode(tp, ip, logflags); | 4047 | xfs_trans_log_inode(tp, ip, logflags); |
4048 | if (error) | 4048 | if (error) |
4049 | goto error2; | 4049 | goto error2; |
4050 | if (!XFS_SB_VERSION_HASATTR(&mp->m_sb) || | 4050 | if (!xfs_sb_version_hasattr(&mp->m_sb) || |
4051 | (!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2)) { | 4051 | (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2)) { |
4052 | __int64_t sbfields = 0; | 4052 | __int64_t sbfields = 0; |
4053 | 4053 | ||
4054 | spin_lock(&mp->m_sb_lock); | 4054 | spin_lock(&mp->m_sb_lock); |
4055 | if (!XFS_SB_VERSION_HASATTR(&mp->m_sb)) { | 4055 | if (!xfs_sb_version_hasattr(&mp->m_sb)) { |
4056 | XFS_SB_VERSION_ADDATTR(&mp->m_sb); | 4056 | xfs_sb_version_addattr(&mp->m_sb); |
4057 | sbfields |= XFS_SB_VERSIONNUM; | 4057 | sbfields |= XFS_SB_VERSIONNUM; |
4058 | } | 4058 | } |
4059 | if (!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2) { | 4059 | if (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2) { |
4060 | XFS_SB_VERSION_ADDATTR2(&mp->m_sb); | 4060 | xfs_sb_version_addattr2(&mp->m_sb); |
4061 | sbfields |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2); | 4061 | sbfields |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2); |
4062 | } | 4062 | } |
4063 | if (sbfields) { | 4063 | if (sbfields) { |
@@ -5043,7 +5043,7 @@ xfs_bmapi( | |||
5043 | * A wasdelay extent has been initialized, so | 5043 | * A wasdelay extent has been initialized, so |
5044 | * shouldn't be flagged as unwritten. | 5044 | * shouldn't be flagged as unwritten. |
5045 | */ | 5045 | */ |
5046 | if (wr && XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb)) { | 5046 | if (wr && xfs_sb_version_hasextflgbit(&mp->m_sb)) { |
5047 | if (!wasdelay && (flags & XFS_BMAPI_PREALLOC)) | 5047 | if (!wasdelay && (flags & XFS_BMAPI_PREALLOC)) |
5048 | got.br_state = XFS_EXT_UNWRITTEN; | 5048 | got.br_state = XFS_EXT_UNWRITTEN; |
5049 | } | 5049 | } |
@@ -5483,7 +5483,7 @@ xfs_bunmapi( | |||
5483 | * get rid of part of a realtime extent. | 5483 | * get rid of part of a realtime extent. |
5484 | */ | 5484 | */ |
5485 | if (del.br_state == XFS_EXT_UNWRITTEN || | 5485 | if (del.br_state == XFS_EXT_UNWRITTEN || |
5486 | !XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb)) { | 5486 | !xfs_sb_version_hasextflgbit(&mp->m_sb)) { |
5487 | /* | 5487 | /* |
5488 | * This piece is unwritten, or we're not | 5488 | * This piece is unwritten, or we're not |
5489 | * using unwritten extents. Skip over it. | 5489 | * using unwritten extents. Skip over it. |
@@ -5535,7 +5535,7 @@ xfs_bunmapi( | |||
5535 | } else if ((del.br_startoff == start && | 5535 | } else if ((del.br_startoff == start && |
5536 | (del.br_state == XFS_EXT_UNWRITTEN || | 5536 | (del.br_state == XFS_EXT_UNWRITTEN || |
5537 | xfs_trans_get_block_res(tp) == 0)) || | 5537 | xfs_trans_get_block_res(tp) == 0)) || |
5538 | !XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb)) { | 5538 | !xfs_sb_version_hasextflgbit(&mp->m_sb)) { |
5539 | /* | 5539 | /* |
5540 | * Can't make it unwritten. There isn't | 5540 | * Can't make it unwritten. There isn't |
5541 | * a full extent here so just skip it. | 5541 | * a full extent here so just skip it. |
diff --git a/fs/xfs/xfs_bmap_btree.h b/fs/xfs/xfs_bmap_btree.h index 2d950e975918..cd0d4b4bb816 100644 --- a/fs/xfs/xfs_bmap_btree.h +++ b/fs/xfs/xfs_bmap_btree.h | |||
@@ -120,7 +120,7 @@ typedef enum { | |||
120 | * Extent state and extent format macros. | 120 | * Extent state and extent format macros. |
121 | */ | 121 | */ |
122 | #define XFS_EXTFMT_INODE(x) \ | 122 | #define XFS_EXTFMT_INODE(x) \ |
123 | (XFS_SB_VERSION_HASEXTFLGBIT(&((x)->i_mount->m_sb)) ? \ | 123 | (xfs_sb_version_hasextflgbit(&((x)->i_mount->m_sb)) ? \ |
124 | XFS_EXTFMT_HASSTATE : XFS_EXTFMT_NOSTATE) | 124 | XFS_EXTFMT_HASSTATE : XFS_EXTFMT_NOSTATE) |
125 | #define ISUNWRITTEN(x) ((x)->br_state == XFS_EXT_UNWRITTEN) | 125 | #define ISUNWRITTEN(x) ((x)->br_state == XFS_EXT_UNWRITTEN) |
126 | 126 | ||
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c index be7c4251fa61..e92e73f0e6af 100644 --- a/fs/xfs/xfs_dir2.c +++ b/fs/xfs/xfs_dir2.c | |||
@@ -49,7 +49,7 @@ void | |||
49 | xfs_dir_mount( | 49 | xfs_dir_mount( |
50 | xfs_mount_t *mp) | 50 | xfs_mount_t *mp) |
51 | { | 51 | { |
52 | ASSERT(XFS_SB_VERSION_HASDIRV2(&mp->m_sb)); | 52 | ASSERT(xfs_sb_version_hasdirv2(&mp->m_sb)); |
53 | ASSERT((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <= | 53 | ASSERT((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <= |
54 | XFS_MAX_BLOCKSIZE); | 54 | XFS_MAX_BLOCKSIZE); |
55 | mp->m_dirblksize = 1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog); | 55 | mp->m_dirblksize = 1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog); |
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index eadc1591c795..d3a0f538d6a6 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
@@ -77,36 +77,36 @@ xfs_fs_geometry( | |||
77 | if (new_version >= 3) { | 77 | if (new_version >= 3) { |
78 | geo->version = XFS_FSOP_GEOM_VERSION; | 78 | geo->version = XFS_FSOP_GEOM_VERSION; |
79 | geo->flags = | 79 | geo->flags = |
80 | (XFS_SB_VERSION_HASATTR(&mp->m_sb) ? | 80 | (xfs_sb_version_hasattr(&mp->m_sb) ? |
81 | XFS_FSOP_GEOM_FLAGS_ATTR : 0) | | 81 | XFS_FSOP_GEOM_FLAGS_ATTR : 0) | |
82 | (XFS_SB_VERSION_HASNLINK(&mp->m_sb) ? | 82 | (xfs_sb_version_hasnlink(&mp->m_sb) ? |
83 | XFS_FSOP_GEOM_FLAGS_NLINK : 0) | | 83 | XFS_FSOP_GEOM_FLAGS_NLINK : 0) | |
84 | (XFS_SB_VERSION_HASQUOTA(&mp->m_sb) ? | 84 | (xfs_sb_version_hasquota(&mp->m_sb) ? |
85 | XFS_FSOP_GEOM_FLAGS_QUOTA : 0) | | 85 | XFS_FSOP_GEOM_FLAGS_QUOTA : 0) | |
86 | (XFS_SB_VERSION_HASALIGN(&mp->m_sb) ? | 86 | (xfs_sb_version_hasalign(&mp->m_sb) ? |
87 | XFS_FSOP_GEOM_FLAGS_IALIGN : 0) | | 87 | XFS_FSOP_GEOM_FLAGS_IALIGN : 0) | |
88 | (XFS_SB_VERSION_HASDALIGN(&mp->m_sb) ? | 88 | (xfs_sb_version_hasdalign(&mp->m_sb) ? |
89 | XFS_FSOP_GEOM_FLAGS_DALIGN : 0) | | 89 | XFS_FSOP_GEOM_FLAGS_DALIGN : 0) | |
90 | (XFS_SB_VERSION_HASSHARED(&mp->m_sb) ? | 90 | (xfs_sb_version_hasshared(&mp->m_sb) ? |
91 | XFS_FSOP_GEOM_FLAGS_SHARED : 0) | | 91 | XFS_FSOP_GEOM_FLAGS_SHARED : 0) | |
92 | (XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) ? | 92 | (xfs_sb_version_hasextflgbit(&mp->m_sb) ? |
93 | XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) | | 93 | XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) | |
94 | (XFS_SB_VERSION_HASDIRV2(&mp->m_sb) ? | 94 | (xfs_sb_version_hasdirv2(&mp->m_sb) ? |
95 | XFS_FSOP_GEOM_FLAGS_DIRV2 : 0) | | 95 | XFS_FSOP_GEOM_FLAGS_DIRV2 : 0) | |
96 | (XFS_SB_VERSION_HASSECTOR(&mp->m_sb) ? | 96 | (xfs_sb_version_hassector(&mp->m_sb) ? |
97 | XFS_FSOP_GEOM_FLAGS_SECTOR : 0) | | 97 | XFS_FSOP_GEOM_FLAGS_SECTOR : 0) | |
98 | (xfs_sb_version_haslazysbcount(&mp->m_sb) ? | 98 | (xfs_sb_version_haslazysbcount(&mp->m_sb) ? |
99 | XFS_FSOP_GEOM_FLAGS_LAZYSB : 0) | | 99 | XFS_FSOP_GEOM_FLAGS_LAZYSB : 0) | |
100 | (XFS_SB_VERSION_HASATTR2(&mp->m_sb) ? | 100 | (xfs_sb_version_hasattr2(&mp->m_sb) ? |
101 | XFS_FSOP_GEOM_FLAGS_ATTR2 : 0); | 101 | XFS_FSOP_GEOM_FLAGS_ATTR2 : 0); |
102 | geo->logsectsize = XFS_SB_VERSION_HASSECTOR(&mp->m_sb) ? | 102 | geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ? |
103 | mp->m_sb.sb_logsectsize : BBSIZE; | 103 | mp->m_sb.sb_logsectsize : BBSIZE; |
104 | geo->rtsectsize = mp->m_sb.sb_blocksize; | 104 | geo->rtsectsize = mp->m_sb.sb_blocksize; |
105 | geo->dirblocksize = mp->m_dirblksize; | 105 | geo->dirblocksize = mp->m_dirblksize; |
106 | } | 106 | } |
107 | if (new_version >= 4) { | 107 | if (new_version >= 4) { |
108 | geo->flags |= | 108 | geo->flags |= |
109 | (XFS_SB_VERSION_HASLOGV2(&mp->m_sb) ? | 109 | (xfs_sb_version_haslogv2(&mp->m_sb) ? |
110 | XFS_FSOP_GEOM_FLAGS_LOGV2 : 0); | 110 | XFS_FSOP_GEOM_FLAGS_LOGV2 : 0); |
111 | geo->logsunit = mp->m_sb.sb_logsunit; | 111 | geo->logsunit = mp->m_sb.sb_logsunit; |
112 | } | 112 | } |
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index db9d5fa600af..5a146cb22980 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c | |||
@@ -191,7 +191,7 @@ xfs_ialloc_ag_alloc( | |||
191 | ASSERT(!(args.mp->m_flags & XFS_MOUNT_NOALIGN)); | 191 | ASSERT(!(args.mp->m_flags & XFS_MOUNT_NOALIGN)); |
192 | args.alignment = args.mp->m_dalign; | 192 | args.alignment = args.mp->m_dalign; |
193 | isaligned = 1; | 193 | isaligned = 1; |
194 | } else if (XFS_SB_VERSION_HASALIGN(&args.mp->m_sb) && | 194 | } else if (xfs_sb_version_hasalign(&args.mp->m_sb) && |
195 | args.mp->m_sb.sb_inoalignmt >= | 195 | args.mp->m_sb.sb_inoalignmt >= |
196 | XFS_B_TO_FSBT(args.mp, | 196 | XFS_B_TO_FSBT(args.mp, |
197 | XFS_INODE_CLUSTER_SIZE(args.mp))) | 197 | XFS_INODE_CLUSTER_SIZE(args.mp))) |
@@ -230,7 +230,7 @@ xfs_ialloc_ag_alloc( | |||
230 | args.agbno = be32_to_cpu(agi->agi_root); | 230 | args.agbno = be32_to_cpu(agi->agi_root); |
231 | args.fsbno = XFS_AGB_TO_FSB(args.mp, | 231 | args.fsbno = XFS_AGB_TO_FSB(args.mp, |
232 | be32_to_cpu(agi->agi_seqno), args.agbno); | 232 | be32_to_cpu(agi->agi_seqno), args.agbno); |
233 | if (XFS_SB_VERSION_HASALIGN(&args.mp->m_sb) && | 233 | if (xfs_sb_version_hasalign(&args.mp->m_sb) && |
234 | args.mp->m_sb.sb_inoalignmt >= | 234 | args.mp->m_sb.sb_inoalignmt >= |
235 | XFS_B_TO_FSBT(args.mp, XFS_INODE_CLUSTER_SIZE(args.mp))) | 235 | XFS_B_TO_FSBT(args.mp, XFS_INODE_CLUSTER_SIZE(args.mp))) |
236 | args.alignment = args.mp->m_sb.sb_inoalignmt; | 236 | args.alignment = args.mp->m_sb.sb_inoalignmt; |
@@ -271,7 +271,7 @@ xfs_ialloc_ag_alloc( | |||
271 | * use the old version so that old kernels will continue to be | 271 | * use the old version so that old kernels will continue to be |
272 | * able to use the file system. | 272 | * able to use the file system. |
273 | */ | 273 | */ |
274 | if (XFS_SB_VERSION_HASNLINK(&args.mp->m_sb)) | 274 | if (xfs_sb_version_hasnlink(&args.mp->m_sb)) |
275 | version = XFS_DINODE_VERSION_2; | 275 | version = XFS_DINODE_VERSION_2; |
276 | else | 276 | else |
277 | version = XFS_DINODE_VERSION_1; | 277 | version = XFS_DINODE_VERSION_1; |
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index a550546a7083..f43a6e01d68f 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1147,7 +1147,7 @@ xfs_ialloc( | |||
1147 | * the inode version number now. This way we only do the conversion | 1147 | * the inode version number now. This way we only do the conversion |
1148 | * here rather than here and in the flush/logging code. | 1148 | * here rather than here and in the flush/logging code. |
1149 | */ | 1149 | */ |
1150 | if (XFS_SB_VERSION_HASNLINK(&tp->t_mountp->m_sb) && | 1150 | if (xfs_sb_version_hasnlink(&tp->t_mountp->m_sb) && |
1151 | ip->i_d.di_version == XFS_DINODE_VERSION_1) { | 1151 | ip->i_d.di_version == XFS_DINODE_VERSION_1) { |
1152 | ip->i_d.di_version = XFS_DINODE_VERSION_2; | 1152 | ip->i_d.di_version = XFS_DINODE_VERSION_2; |
1153 | /* | 1153 | /* |
@@ -3434,9 +3434,9 @@ xfs_iflush_int( | |||
3434 | * has been updated, then make the conversion permanent. | 3434 | * has been updated, then make the conversion permanent. |
3435 | */ | 3435 | */ |
3436 | ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1 || | 3436 | ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1 || |
3437 | XFS_SB_VERSION_HASNLINK(&mp->m_sb)); | 3437 | xfs_sb_version_hasnlink(&mp->m_sb)); |
3438 | if (ip->i_d.di_version == XFS_DINODE_VERSION_1) { | 3438 | if (ip->i_d.di_version == XFS_DINODE_VERSION_1) { |
3439 | if (!XFS_SB_VERSION_HASNLINK(&mp->m_sb)) { | 3439 | if (!xfs_sb_version_hasnlink(&mp->m_sb)) { |
3440 | /* | 3440 | /* |
3441 | * Convert it back. | 3441 | * Convert it back. |
3442 | */ | 3442 | */ |
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 034ca7202295..2c775b4ae9e6 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c | |||
@@ -296,9 +296,9 @@ xfs_inode_item_format( | |||
296 | */ | 296 | */ |
297 | mp = ip->i_mount; | 297 | mp = ip->i_mount; |
298 | ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1 || | 298 | ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1 || |
299 | XFS_SB_VERSION_HASNLINK(&mp->m_sb)); | 299 | xfs_sb_version_hasnlink(&mp->m_sb)); |
300 | if (ip->i_d.di_version == XFS_DINODE_VERSION_1) { | 300 | if (ip->i_d.di_version == XFS_DINODE_VERSION_1) { |
301 | if (!XFS_SB_VERSION_HASNLINK(&mp->m_sb)) { | 301 | if (!xfs_sb_version_hasnlink(&mp->m_sb)) { |
302 | /* | 302 | /* |
303 | * Convert it back. | 303 | * Convert it back. |
304 | */ | 304 | */ |
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 658aab6b1bbf..f615e04364f4 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c | |||
@@ -45,7 +45,7 @@ xfs_internal_inum( | |||
45 | xfs_ino_t ino) | 45 | xfs_ino_t ino) |
46 | { | 46 | { |
47 | return (ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino || | 47 | return (ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino || |
48 | (XFS_SB_VERSION_HASQUOTA(&mp->m_sb) && | 48 | (xfs_sb_version_hasquota(&mp->m_sb) && |
49 | (ino == mp->m_sb.sb_uquotino || ino == mp->m_sb.sb_gquotino))); | 49 | (ino == mp->m_sb.sb_uquotino || ino == mp->m_sb.sb_gquotino))); |
50 | } | 50 | } |
51 | 51 | ||
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index a75edca1860f..31f2b04f2c97 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -1090,7 +1090,7 @@ xlog_get_iclog_buffer_size(xfs_mount_t *mp, | |||
1090 | size >>= 1; | 1090 | size >>= 1; |
1091 | } | 1091 | } |
1092 | 1092 | ||
1093 | if (XFS_SB_VERSION_HASLOGV2(&mp->m_sb)) { | 1093 | if (xfs_sb_version_haslogv2(&mp->m_sb)) { |
1094 | /* # headers = size / 32K | 1094 | /* # headers = size / 32K |
1095 | * one header holds cycles from 32K of data | 1095 | * one header holds cycles from 32K of data |
1096 | */ | 1096 | */ |
@@ -1186,13 +1186,13 @@ xlog_alloc_log(xfs_mount_t *mp, | |||
1186 | log->l_grant_reserve_cycle = 1; | 1186 | log->l_grant_reserve_cycle = 1; |
1187 | log->l_grant_write_cycle = 1; | 1187 | log->l_grant_write_cycle = 1; |
1188 | 1188 | ||
1189 | if (XFS_SB_VERSION_HASSECTOR(&mp->m_sb)) { | 1189 | if (xfs_sb_version_hassector(&mp->m_sb)) { |
1190 | log->l_sectbb_log = mp->m_sb.sb_logsectlog - BBSHIFT; | 1190 | log->l_sectbb_log = mp->m_sb.sb_logsectlog - BBSHIFT; |
1191 | ASSERT(log->l_sectbb_log <= mp->m_sectbb_log); | 1191 | ASSERT(log->l_sectbb_log <= mp->m_sectbb_log); |
1192 | /* for larger sector sizes, must have v2 or external log */ | 1192 | /* for larger sector sizes, must have v2 or external log */ |
1193 | ASSERT(log->l_sectbb_log == 0 || | 1193 | ASSERT(log->l_sectbb_log == 0 || |
1194 | log->l_logBBstart == 0 || | 1194 | log->l_logBBstart == 0 || |
1195 | XFS_SB_VERSION_HASLOGV2(&mp->m_sb)); | 1195 | xfs_sb_version_haslogv2(&mp->m_sb)); |
1196 | ASSERT(mp->m_sb.sb_logsectlog >= BBSHIFT); | 1196 | ASSERT(mp->m_sb.sb_logsectlog >= BBSHIFT); |
1197 | } | 1197 | } |
1198 | log->l_sectbb_mask = (1 << log->l_sectbb_log) - 1; | 1198 | log->l_sectbb_mask = (1 << log->l_sectbb_log) - 1; |
@@ -1247,7 +1247,7 @@ xlog_alloc_log(xfs_mount_t *mp, | |||
1247 | memset(head, 0, sizeof(xlog_rec_header_t)); | 1247 | memset(head, 0, sizeof(xlog_rec_header_t)); |
1248 | head->h_magicno = cpu_to_be32(XLOG_HEADER_MAGIC_NUM); | 1248 | head->h_magicno = cpu_to_be32(XLOG_HEADER_MAGIC_NUM); |
1249 | head->h_version = cpu_to_be32( | 1249 | head->h_version = cpu_to_be32( |
1250 | XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) ? 2 : 1); | 1250 | xfs_sb_version_haslogv2(&log->l_mp->m_sb) ? 2 : 1); |
1251 | head->h_size = cpu_to_be32(log->l_iclog_size); | 1251 | head->h_size = cpu_to_be32(log->l_iclog_size); |
1252 | /* new fields */ | 1252 | /* new fields */ |
1253 | head->h_fmt = cpu_to_be32(XLOG_FMT); | 1253 | head->h_fmt = cpu_to_be32(XLOG_FMT); |
@@ -1402,7 +1402,7 @@ xlog_sync(xlog_t *log, | |||
1402 | int roundoff; /* roundoff to BB or stripe */ | 1402 | int roundoff; /* roundoff to BB or stripe */ |
1403 | int split = 0; /* split write into two regions */ | 1403 | int split = 0; /* split write into two regions */ |
1404 | int error; | 1404 | int error; |
1405 | int v2 = XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb); | 1405 | int v2 = xfs_sb_version_haslogv2(&log->l_mp->m_sb); |
1406 | 1406 | ||
1407 | XFS_STATS_INC(xs_log_writes); | 1407 | XFS_STATS_INC(xs_log_writes); |
1408 | ASSERT(iclog->ic_refcnt == 0); | 1408 | ASSERT(iclog->ic_refcnt == 0); |
@@ -2881,7 +2881,7 @@ xlog_state_switch_iclogs(xlog_t *log, | |||
2881 | log->l_curr_block += BTOBB(eventual_size)+BTOBB(log->l_iclog_hsize); | 2881 | log->l_curr_block += BTOBB(eventual_size)+BTOBB(log->l_iclog_hsize); |
2882 | 2882 | ||
2883 | /* Round up to next log-sunit */ | 2883 | /* Round up to next log-sunit */ |
2884 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) && | 2884 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb) && |
2885 | log->l_mp->m_sb.sb_logsunit > 1) { | 2885 | log->l_mp->m_sb.sb_logsunit > 1) { |
2886 | __uint32_t sunit_bb = BTOBB(log->l_mp->m_sb.sb_logsunit); | 2886 | __uint32_t sunit_bb = BTOBB(log->l_mp->m_sb.sb_logsunit); |
2887 | log->l_curr_block = roundup(log->l_curr_block, sunit_bb); | 2887 | log->l_curr_block = roundup(log->l_curr_block, sunit_bb); |
@@ -3334,7 +3334,7 @@ xlog_ticket_get(xlog_t *log, | |||
3334 | unit_bytes += sizeof(xlog_op_header_t) * num_headers; | 3334 | unit_bytes += sizeof(xlog_op_header_t) * num_headers; |
3335 | 3335 | ||
3336 | /* for roundoff padding for transaction data and one for commit record */ | 3336 | /* for roundoff padding for transaction data and one for commit record */ |
3337 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) && | 3337 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb) && |
3338 | log->l_mp->m_sb.sb_logsunit > 1) { | 3338 | log->l_mp->m_sb.sb_logsunit > 1) { |
3339 | /* log su roundoff */ | 3339 | /* log su roundoff */ |
3340 | unit_bytes += 2*log->l_mp->m_sb.sb_logsunit; | 3340 | unit_bytes += 2*log->l_mp->m_sb.sb_logsunit; |
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index e008233ee249..c6244cc733c0 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
@@ -49,10 +49,10 @@ struct xfs_mount; | |||
49 | #define XLOG_HEADER_SIZE 512 | 49 | #define XLOG_HEADER_SIZE 512 |
50 | 50 | ||
51 | #define XLOG_REC_SHIFT(log) \ | 51 | #define XLOG_REC_SHIFT(log) \ |
52 | BTOBB(1 << (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) ? \ | 52 | BTOBB(1 << (xfs_sb_version_haslogv2(&log->l_mp->m_sb) ? \ |
53 | XLOG_MAX_RECORD_BSHIFT : XLOG_BIG_RECORD_BSHIFT)) | 53 | XLOG_MAX_RECORD_BSHIFT : XLOG_BIG_RECORD_BSHIFT)) |
54 | #define XLOG_TOTAL_REC_SHIFT(log) \ | 54 | #define XLOG_TOTAL_REC_SHIFT(log) \ |
55 | BTOBB(XLOG_MAX_ICLOGS << (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) ? \ | 55 | BTOBB(XLOG_MAX_ICLOGS << (xfs_sb_version_haslogv2(&log->l_mp->m_sb) ? \ |
56 | XLOG_MAX_RECORD_BSHIFT : XLOG_BIG_RECORD_BSHIFT)) | 56 | XLOG_MAX_RECORD_BSHIFT : XLOG_BIG_RECORD_BSHIFT)) |
57 | 57 | ||
58 | 58 | ||
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index b82d5d4d2462..b2b70eba282c 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -478,7 +478,7 @@ xlog_find_verify_log_record( | |||
478 | * reset last_blk. Only when last_blk points in the middle of a log | 478 | * reset last_blk. Only when last_blk points in the middle of a log |
479 | * record do we update last_blk. | 479 | * record do we update last_blk. |
480 | */ | 480 | */ |
481 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { | 481 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) { |
482 | uint h_size = be32_to_cpu(head->h_size); | 482 | uint h_size = be32_to_cpu(head->h_size); |
483 | 483 | ||
484 | xhdrs = h_size / XLOG_HEADER_CYCLE_SIZE; | 484 | xhdrs = h_size / XLOG_HEADER_CYCLE_SIZE; |
@@ -888,7 +888,7 @@ xlog_find_tail( | |||
888 | * unmount record if there is one, so we pass the lsn of the | 888 | * unmount record if there is one, so we pass the lsn of the |
889 | * unmount record rather than the block after it. | 889 | * unmount record rather than the block after it. |
890 | */ | 890 | */ |
891 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { | 891 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) { |
892 | int h_size = be32_to_cpu(rhead->h_size); | 892 | int h_size = be32_to_cpu(rhead->h_size); |
893 | int h_version = be32_to_cpu(rhead->h_version); | 893 | int h_version = be32_to_cpu(rhead->h_version); |
894 | 894 | ||
@@ -1101,7 +1101,7 @@ xlog_add_record( | |||
1101 | recp->h_magicno = cpu_to_be32(XLOG_HEADER_MAGIC_NUM); | 1101 | recp->h_magicno = cpu_to_be32(XLOG_HEADER_MAGIC_NUM); |
1102 | recp->h_cycle = cpu_to_be32(cycle); | 1102 | recp->h_cycle = cpu_to_be32(cycle); |
1103 | recp->h_version = cpu_to_be32( | 1103 | recp->h_version = cpu_to_be32( |
1104 | XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) ? 2 : 1); | 1104 | xfs_sb_version_haslogv2(&log->l_mp->m_sb) ? 2 : 1); |
1105 | recp->h_lsn = cpu_to_be64(xlog_assign_lsn(cycle, block)); | 1105 | recp->h_lsn = cpu_to_be64(xlog_assign_lsn(cycle, block)); |
1106 | recp->h_tail_lsn = cpu_to_be64(xlog_assign_lsn(tail_cycle, tail_block)); | 1106 | recp->h_tail_lsn = cpu_to_be64(xlog_assign_lsn(tail_cycle, tail_block)); |
1107 | recp->h_fmt = cpu_to_be32(XLOG_FMT); | 1107 | recp->h_fmt = cpu_to_be32(XLOG_FMT); |
@@ -3348,7 +3348,7 @@ xlog_pack_data( | |||
3348 | dp += BBSIZE; | 3348 | dp += BBSIZE; |
3349 | } | 3349 | } |
3350 | 3350 | ||
3351 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { | 3351 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) { |
3352 | xhdr = (xlog_in_core_2_t *)&iclog->ic_header; | 3352 | xhdr = (xlog_in_core_2_t *)&iclog->ic_header; |
3353 | for ( ; i < BTOBB(size); i++) { | 3353 | for ( ; i < BTOBB(size); i++) { |
3354 | j = i / (XLOG_HEADER_CYCLE_SIZE / BBSIZE); | 3354 | j = i / (XLOG_HEADER_CYCLE_SIZE / BBSIZE); |
@@ -3388,7 +3388,7 @@ xlog_unpack_data_checksum( | |||
3388 | be32_to_cpu(rhead->h_chksum), chksum); | 3388 | be32_to_cpu(rhead->h_chksum), chksum); |
3389 | cmn_err(CE_DEBUG, | 3389 | cmn_err(CE_DEBUG, |
3390 | "XFS: Disregard message if filesystem was created with non-DEBUG kernel"); | 3390 | "XFS: Disregard message if filesystem was created with non-DEBUG kernel"); |
3391 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { | 3391 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) { |
3392 | cmn_err(CE_DEBUG, | 3392 | cmn_err(CE_DEBUG, |
3393 | "XFS: LogR this is a LogV2 filesystem\n"); | 3393 | "XFS: LogR this is a LogV2 filesystem\n"); |
3394 | } | 3394 | } |
@@ -3415,7 +3415,7 @@ xlog_unpack_data( | |||
3415 | dp += BBSIZE; | 3415 | dp += BBSIZE; |
3416 | } | 3416 | } |
3417 | 3417 | ||
3418 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { | 3418 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) { |
3419 | xhdr = (xlog_in_core_2_t *)rhead; | 3419 | xhdr = (xlog_in_core_2_t *)rhead; |
3420 | for ( ; i < BTOBB(be32_to_cpu(rhead->h_len)); i++) { | 3420 | for ( ; i < BTOBB(be32_to_cpu(rhead->h_len)); i++) { |
3421 | j = i / (XLOG_HEADER_CYCLE_SIZE / BBSIZE); | 3421 | j = i / (XLOG_HEADER_CYCLE_SIZE / BBSIZE); |
@@ -3494,7 +3494,7 @@ xlog_do_recovery_pass( | |||
3494 | * Read the header of the tail block and get the iclog buffer size from | 3494 | * Read the header of the tail block and get the iclog buffer size from |
3495 | * h_size. Use this to tell how many sectors make up the log header. | 3495 | * h_size. Use this to tell how many sectors make up the log header. |
3496 | */ | 3496 | */ |
3497 | if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { | 3497 | if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) { |
3498 | /* | 3498 | /* |
3499 | * When using variable length iclogs, read first sector of | 3499 | * When using variable length iclogs, read first sector of |
3500 | * iclog header and extract the header size from it. Get a | 3500 | * iclog header and extract the header size from it. Get a |
@@ -3838,7 +3838,7 @@ xlog_do_recover( | |||
3838 | sbp = &log->l_mp->m_sb; | 3838 | sbp = &log->l_mp->m_sb; |
3839 | xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp)); | 3839 | xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp)); |
3840 | ASSERT(sbp->sb_magicnum == XFS_SB_MAGIC); | 3840 | ASSERT(sbp->sb_magicnum == XFS_SB_MAGIC); |
3841 | ASSERT(XFS_SB_GOOD_VERSION(sbp)); | 3841 | ASSERT(xfs_sb_good_version(sbp)); |
3842 | xfs_buf_relse(bp); | 3842 | xfs_buf_relse(bp); |
3843 | 3843 | ||
3844 | /* We've re-read the superblock so re-initialize per-cpu counters */ | 3844 | /* We've re-read the superblock so re-initialize per-cpu counters */ |
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 6409b3762995..8ed164eb9544 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include "xfs_quota.h" | 44 | #include "xfs_quota.h" |
45 | #include "xfs_fsops.h" | 45 | #include "xfs_fsops.h" |
46 | 46 | ||
47 | STATIC void xfs_mount_log_sbunit(xfs_mount_t *, __int64_t); | 47 | STATIC void xfs_mount_log_sb(xfs_mount_t *, __int64_t); |
48 | STATIC int xfs_uuid_mount(xfs_mount_t *); | 48 | STATIC int xfs_uuid_mount(xfs_mount_t *); |
49 | STATIC void xfs_uuid_unmount(xfs_mount_t *mp); | 49 | STATIC void xfs_uuid_unmount(xfs_mount_t *mp); |
50 | STATIC void xfs_unmountfs_wait(xfs_mount_t *); | 50 | STATIC void xfs_unmountfs_wait(xfs_mount_t *); |
@@ -119,6 +119,7 @@ static const struct { | |||
119 | { offsetof(xfs_sb_t, sb_logsectsize),0 }, | 119 | { offsetof(xfs_sb_t, sb_logsectsize),0 }, |
120 | { offsetof(xfs_sb_t, sb_logsunit), 0 }, | 120 | { offsetof(xfs_sb_t, sb_logsunit), 0 }, |
121 | { offsetof(xfs_sb_t, sb_features2), 0 }, | 121 | { offsetof(xfs_sb_t, sb_features2), 0 }, |
122 | { offsetof(xfs_sb_t, sb_bad_features2), 0 }, | ||
122 | { sizeof(xfs_sb_t), 0 } | 123 | { sizeof(xfs_sb_t), 0 } |
123 | }; | 124 | }; |
124 | 125 | ||
@@ -225,7 +226,7 @@ xfs_mount_validate_sb( | |||
225 | return XFS_ERROR(EWRONGFS); | 226 | return XFS_ERROR(EWRONGFS); |
226 | } | 227 | } |
227 | 228 | ||
228 | if (!XFS_SB_GOOD_VERSION(sbp)) { | 229 | if (!xfs_sb_good_version(sbp)) { |
229 | xfs_fs_mount_cmn_err(flags, "bad version"); | 230 | xfs_fs_mount_cmn_err(flags, "bad version"); |
230 | return XFS_ERROR(EWRONGFS); | 231 | return XFS_ERROR(EWRONGFS); |
231 | } | 232 | } |
@@ -300,7 +301,7 @@ xfs_mount_validate_sb( | |||
300 | /* | 301 | /* |
301 | * Version 1 directory format has never worked on Linux. | 302 | * Version 1 directory format has never worked on Linux. |
302 | */ | 303 | */ |
303 | if (unlikely(!XFS_SB_VERSION_HASDIRV2(sbp))) { | 304 | if (unlikely(!xfs_sb_version_hasdirv2(sbp))) { |
304 | xfs_fs_mount_cmn_err(flags, | 305 | xfs_fs_mount_cmn_err(flags, |
305 | "file system using version 1 directory format"); | 306 | "file system using version 1 directory format"); |
306 | return XFS_ERROR(ENOSYS); | 307 | return XFS_ERROR(ENOSYS); |
@@ -449,6 +450,7 @@ xfs_sb_from_disk( | |||
449 | to->sb_logsectsize = be16_to_cpu(from->sb_logsectsize); | 450 | to->sb_logsectsize = be16_to_cpu(from->sb_logsectsize); |
450 | to->sb_logsunit = be32_to_cpu(from->sb_logsunit); | 451 | to->sb_logsunit = be32_to_cpu(from->sb_logsunit); |
451 | to->sb_features2 = be32_to_cpu(from->sb_features2); | 452 | to->sb_features2 = be32_to_cpu(from->sb_features2); |
453 | to->sb_bad_features2 = be32_to_cpu(from->sb_bad_features2); | ||
452 | } | 454 | } |
453 | 455 | ||
454 | /* | 456 | /* |
@@ -781,7 +783,7 @@ xfs_update_alignment(xfs_mount_t *mp, int mfsi_flags, __uint64_t *update_flags) | |||
781 | * Update superblock with new values | 783 | * Update superblock with new values |
782 | * and log changes | 784 | * and log changes |
783 | */ | 785 | */ |
784 | if (XFS_SB_VERSION_HASDALIGN(sbp)) { | 786 | if (xfs_sb_version_hasdalign(sbp)) { |
785 | if (sbp->sb_unit != mp->m_dalign) { | 787 | if (sbp->sb_unit != mp->m_dalign) { |
786 | sbp->sb_unit = mp->m_dalign; | 788 | sbp->sb_unit = mp->m_dalign; |
787 | *update_flags |= XFS_SB_UNIT; | 789 | *update_flags |= XFS_SB_UNIT; |
@@ -792,7 +794,7 @@ xfs_update_alignment(xfs_mount_t *mp, int mfsi_flags, __uint64_t *update_flags) | |||
792 | } | 794 | } |
793 | } | 795 | } |
794 | } else if ((mp->m_flags & XFS_MOUNT_NOALIGN) != XFS_MOUNT_NOALIGN && | 796 | } else if ((mp->m_flags & XFS_MOUNT_NOALIGN) != XFS_MOUNT_NOALIGN && |
795 | XFS_SB_VERSION_HASDALIGN(&mp->m_sb)) { | 797 | xfs_sb_version_hasdalign(&mp->m_sb)) { |
796 | mp->m_dalign = sbp->sb_unit; | 798 | mp->m_dalign = sbp->sb_unit; |
797 | mp->m_swidth = sbp->sb_width; | 799 | mp->m_swidth = sbp->sb_width; |
798 | } | 800 | } |
@@ -869,7 +871,7 @@ xfs_set_rw_sizes(xfs_mount_t *mp) | |||
869 | STATIC void | 871 | STATIC void |
870 | xfs_set_inoalignment(xfs_mount_t *mp) | 872 | xfs_set_inoalignment(xfs_mount_t *mp) |
871 | { | 873 | { |
872 | if (XFS_SB_VERSION_HASALIGN(&mp->m_sb) && | 874 | if (xfs_sb_version_hasalign(&mp->m_sb) && |
873 | mp->m_sb.sb_inoalignmt >= | 875 | mp->m_sb.sb_inoalignmt >= |
874 | XFS_B_TO_FSBT(mp, mp->m_inode_cluster_size)) | 876 | XFS_B_TO_FSBT(mp, mp->m_inode_cluster_size)) |
875 | mp->m_inoalign_mask = mp->m_sb.sb_inoalignmt - 1; | 877 | mp->m_inoalign_mask = mp->m_sb.sb_inoalignmt - 1; |
@@ -970,6 +972,38 @@ xfs_mountfs( | |||
970 | xfs_mount_common(mp, sbp); | 972 | xfs_mount_common(mp, sbp); |
971 | 973 | ||
972 | /* | 974 | /* |
975 | * Check for a mismatched features2 values. Older kernels | ||
976 | * read & wrote into the wrong sb offset for sb_features2 | ||
977 | * on some platforms due to xfs_sb_t not being 64bit size aligned | ||
978 | * when sb_features2 was added, which made older superblock | ||
979 | * reading/writing routines swap it as a 64-bit value. | ||
980 | * | ||
981 | * For backwards compatibility, we make both slots equal. | ||
982 | * | ||
983 | * If we detect a mismatched field, we OR the set bits into the | ||
984 | * existing features2 field in case it has already been modified; we | ||
985 | * don't want to lose any features. We then update the bad location | ||
986 | * with the ORed value so that older kernels will see any features2 | ||
987 | * flags, and mark the two fields as needing updates once the | ||
988 | * transaction subsystem is online. | ||
989 | */ | ||
990 | if (xfs_sb_has_mismatched_features2(sbp)) { | ||
991 | cmn_err(CE_WARN, | ||
992 | "XFS: correcting sb_features alignment problem"); | ||
993 | sbp->sb_features2 |= sbp->sb_bad_features2; | ||
994 | sbp->sb_bad_features2 = sbp->sb_features2; | ||
995 | update_flags |= XFS_SB_FEATURES2 | XFS_SB_BAD_FEATURES2; | ||
996 | |||
997 | /* | ||
998 | * Re-check for ATTR2 in case it was found in bad_features2 | ||
999 | * slot. | ||
1000 | */ | ||
1001 | if (xfs_sb_version_hasattr2(&mp->m_sb)) | ||
1002 | mp->m_flags |= XFS_MOUNT_ATTR2; | ||
1003 | |||
1004 | } | ||
1005 | |||
1006 | /* | ||
973 | * Check if sb_agblocks is aligned at stripe boundary | 1007 | * Check if sb_agblocks is aligned at stripe boundary |
974 | * If sb_agblocks is NOT aligned turn off m_dalign since | 1008 | * If sb_agblocks is NOT aligned turn off m_dalign since |
975 | * allocator alignment is within an ag, therefore ag has | 1009 | * allocator alignment is within an ag, therefore ag has |
@@ -1159,11 +1193,10 @@ xfs_mountfs( | |||
1159 | } | 1193 | } |
1160 | 1194 | ||
1161 | /* | 1195 | /* |
1162 | * If fs is not mounted readonly, then update the superblock | 1196 | * If fs is not mounted readonly, then update the superblock changes. |
1163 | * unit and width changes. | ||
1164 | */ | 1197 | */ |
1165 | if (update_flags && !(mp->m_flags & XFS_MOUNT_RDONLY)) | 1198 | if (update_flags && !(mp->m_flags & XFS_MOUNT_RDONLY)) |
1166 | xfs_mount_log_sbunit(mp, update_flags); | 1199 | xfs_mount_log_sb(mp, update_flags); |
1167 | 1200 | ||
1168 | /* | 1201 | /* |
1169 | * Initialise the XFS quota management subsystem for this mount | 1202 | * Initialise the XFS quota management subsystem for this mount |
@@ -1875,16 +1908,18 @@ xfs_uuid_unmount( | |||
1875 | 1908 | ||
1876 | /* | 1909 | /* |
1877 | * Used to log changes to the superblock unit and width fields which could | 1910 | * Used to log changes to the superblock unit and width fields which could |
1878 | * be altered by the mount options. Only the first superblock is updated. | 1911 | * be altered by the mount options, as well as any potential sb_features2 |
1912 | * fixup. Only the first superblock is updated. | ||
1879 | */ | 1913 | */ |
1880 | STATIC void | 1914 | STATIC void |
1881 | xfs_mount_log_sbunit( | 1915 | xfs_mount_log_sb( |
1882 | xfs_mount_t *mp, | 1916 | xfs_mount_t *mp, |
1883 | __int64_t fields) | 1917 | __int64_t fields) |
1884 | { | 1918 | { |
1885 | xfs_trans_t *tp; | 1919 | xfs_trans_t *tp; |
1886 | 1920 | ||
1887 | ASSERT(fields & (XFS_SB_UNIT|XFS_SB_WIDTH|XFS_SB_UUID)); | 1921 | ASSERT(fields & (XFS_SB_UNIT | XFS_SB_WIDTH | XFS_SB_UUID | |
1922 | XFS_SB_FEATURES2 | XFS_SB_BAD_FEATURES2)); | ||
1888 | 1923 | ||
1889 | tp = xfs_trans_alloc(mp, XFS_TRANS_SB_UNIT); | 1924 | tp = xfs_trans_alloc(mp, XFS_TRANS_SB_UNIT); |
1890 | if (xfs_trans_reserve(tp, 0, mp->m_sb.sb_sectsize + 128, 0, 0, | 1925 | if (xfs_trans_reserve(tp, 0, mp->m_sb.sb_sectsize + 128, 0, 0, |
diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h index 94660b1a6ccc..d904efe7f871 100644 --- a/fs/xfs/xfs_sb.h +++ b/fs/xfs/xfs_sb.h | |||
@@ -89,6 +89,7 @@ struct xfs_mount; | |||
89 | 89 | ||
90 | /* | 90 | /* |
91 | * Superblock - in core version. Must match the ondisk version below. | 91 | * Superblock - in core version. Must match the ondisk version below. |
92 | * Must be padded to 64 bit alignment. | ||
92 | */ | 93 | */ |
93 | typedef struct xfs_sb { | 94 | typedef struct xfs_sb { |
94 | __uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */ | 95 | __uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */ |
@@ -145,10 +146,21 @@ typedef struct xfs_sb { | |||
145 | __uint16_t sb_logsectsize; /* sector size for the log, bytes */ | 146 | __uint16_t sb_logsectsize; /* sector size for the log, bytes */ |
146 | __uint32_t sb_logsunit; /* stripe unit size for the log */ | 147 | __uint32_t sb_logsunit; /* stripe unit size for the log */ |
147 | __uint32_t sb_features2; /* additional feature bits */ | 148 | __uint32_t sb_features2; /* additional feature bits */ |
149 | |||
150 | /* | ||
151 | * bad features2 field as a result of failing to pad the sb | ||
152 | * structure to 64 bits. Some machines will be using this field | ||
153 | * for features2 bits. Easiest just to mark it bad and not use | ||
154 | * it for anything else. | ||
155 | */ | ||
156 | __uint32_t sb_bad_features2; | ||
157 | |||
158 | /* must be padded to 64 bit alignment */ | ||
148 | } xfs_sb_t; | 159 | } xfs_sb_t; |
149 | 160 | ||
150 | /* | 161 | /* |
151 | * Superblock - on disk version. Must match the in core version below. | 162 | * Superblock - on disk version. Must match the in core version above. |
163 | * Must be padded to 64 bit alignment. | ||
152 | */ | 164 | */ |
153 | typedef struct xfs_dsb { | 165 | typedef struct xfs_dsb { |
154 | __be32 sb_magicnum; /* magic number == XFS_SB_MAGIC */ | 166 | __be32 sb_magicnum; /* magic number == XFS_SB_MAGIC */ |
@@ -205,6 +217,15 @@ typedef struct xfs_dsb { | |||
205 | __be16 sb_logsectsize; /* sector size for the log, bytes */ | 217 | __be16 sb_logsectsize; /* sector size for the log, bytes */ |
206 | __be32 sb_logsunit; /* stripe unit size for the log */ | 218 | __be32 sb_logsunit; /* stripe unit size for the log */ |
207 | __be32 sb_features2; /* additional feature bits */ | 219 | __be32 sb_features2; /* additional feature bits */ |
220 | /* | ||
221 | * bad features2 field as a result of failing to pad the sb | ||
222 | * structure to 64 bits. Some machines will be using this field | ||
223 | * for features2 bits. Easiest just to mark it bad and not use | ||
224 | * it for anything else. | ||
225 | */ | ||
226 | __be32 sb_bad_features2; | ||
227 | |||
228 | /* must be padded to 64 bit alignment */ | ||
208 | } xfs_dsb_t; | 229 | } xfs_dsb_t; |
209 | 230 | ||
210 | /* | 231 | /* |
@@ -223,7 +244,7 @@ typedef enum { | |||
223 | XFS_SBS_GQUOTINO, XFS_SBS_QFLAGS, XFS_SBS_FLAGS, XFS_SBS_SHARED_VN, | 244 | XFS_SBS_GQUOTINO, XFS_SBS_QFLAGS, XFS_SBS_FLAGS, XFS_SBS_SHARED_VN, |
224 | XFS_SBS_INOALIGNMT, XFS_SBS_UNIT, XFS_SBS_WIDTH, XFS_SBS_DIRBLKLOG, | 245 | XFS_SBS_INOALIGNMT, XFS_SBS_UNIT, XFS_SBS_WIDTH, XFS_SBS_DIRBLKLOG, |
225 | XFS_SBS_LOGSECTLOG, XFS_SBS_LOGSECTSIZE, XFS_SBS_LOGSUNIT, | 246 | XFS_SBS_LOGSECTLOG, XFS_SBS_LOGSECTSIZE, XFS_SBS_LOGSUNIT, |
226 | XFS_SBS_FEATURES2, | 247 | XFS_SBS_FEATURES2, XFS_SBS_BAD_FEATURES2, |
227 | XFS_SBS_FIELDCOUNT | 248 | XFS_SBS_FIELDCOUNT |
228 | } xfs_sb_field_t; | 249 | } xfs_sb_field_t; |
229 | 250 | ||
@@ -248,13 +269,15 @@ typedef enum { | |||
248 | #define XFS_SB_IFREE XFS_SB_MVAL(IFREE) | 269 | #define XFS_SB_IFREE XFS_SB_MVAL(IFREE) |
249 | #define XFS_SB_FDBLOCKS XFS_SB_MVAL(FDBLOCKS) | 270 | #define XFS_SB_FDBLOCKS XFS_SB_MVAL(FDBLOCKS) |
250 | #define XFS_SB_FEATURES2 XFS_SB_MVAL(FEATURES2) | 271 | #define XFS_SB_FEATURES2 XFS_SB_MVAL(FEATURES2) |
272 | #define XFS_SB_BAD_FEATURES2 XFS_SB_MVAL(BAD_FEATURES2) | ||
251 | #define XFS_SB_NUM_BITS ((int)XFS_SBS_FIELDCOUNT) | 273 | #define XFS_SB_NUM_BITS ((int)XFS_SBS_FIELDCOUNT) |
252 | #define XFS_SB_ALL_BITS ((1LL << XFS_SB_NUM_BITS) - 1) | 274 | #define XFS_SB_ALL_BITS ((1LL << XFS_SB_NUM_BITS) - 1) |
253 | #define XFS_SB_MOD_BITS \ | 275 | #define XFS_SB_MOD_BITS \ |
254 | (XFS_SB_UUID | XFS_SB_ROOTINO | XFS_SB_RBMINO | XFS_SB_RSUMINO | \ | 276 | (XFS_SB_UUID | XFS_SB_ROOTINO | XFS_SB_RBMINO | XFS_SB_RSUMINO | \ |
255 | XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | XFS_SB_GQUOTINO | \ | 277 | XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | XFS_SB_GQUOTINO | \ |
256 | XFS_SB_QFLAGS | XFS_SB_SHARED_VN | XFS_SB_UNIT | XFS_SB_WIDTH | \ | 278 | XFS_SB_QFLAGS | XFS_SB_SHARED_VN | XFS_SB_UNIT | XFS_SB_WIDTH | \ |
257 | XFS_SB_ICOUNT | XFS_SB_IFREE | XFS_SB_FDBLOCKS | XFS_SB_FEATURES2) | 279 | XFS_SB_ICOUNT | XFS_SB_IFREE | XFS_SB_FDBLOCKS | XFS_SB_FEATURES2 | \ |
280 | XFS_SB_BAD_FEATURES2) | ||
258 | 281 | ||
259 | 282 | ||
260 | /* | 283 | /* |
@@ -271,7 +294,6 @@ typedef enum { | |||
271 | 294 | ||
272 | #define XFS_SB_VERSION_NUM(sbp) ((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS) | 295 | #define XFS_SB_VERSION_NUM(sbp) ((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS) |
273 | 296 | ||
274 | #define XFS_SB_GOOD_VERSION(sbp) xfs_sb_good_version(sbp) | ||
275 | #ifdef __KERNEL__ | 297 | #ifdef __KERNEL__ |
276 | static inline int xfs_sb_good_version(xfs_sb_t *sbp) | 298 | static inline int xfs_sb_good_version(xfs_sb_t *sbp) |
277 | { | 299 | { |
@@ -297,7 +319,15 @@ static inline int xfs_sb_good_version(xfs_sb_t *sbp) | |||
297 | } | 319 | } |
298 | #endif /* __KERNEL__ */ | 320 | #endif /* __KERNEL__ */ |
299 | 321 | ||
300 | #define XFS_SB_VERSION_TONEW(v) xfs_sb_version_tonew(v) | 322 | /* |
323 | * Detect a mismatched features2 field. Older kernels read/wrote | ||
324 | * this into the wrong slot, so to be safe we keep them in sync. | ||
325 | */ | ||
326 | static inline int xfs_sb_has_mismatched_features2(xfs_sb_t *sbp) | ||
327 | { | ||
328 | return (sbp->sb_bad_features2 != sbp->sb_features2); | ||
329 | } | ||
330 | |||
301 | static inline unsigned xfs_sb_version_tonew(unsigned v) | 331 | static inline unsigned xfs_sb_version_tonew(unsigned v) |
302 | { | 332 | { |
303 | return ((((v) == XFS_SB_VERSION_1) ? \ | 333 | return ((((v) == XFS_SB_VERSION_1) ? \ |
@@ -308,7 +338,6 @@ static inline unsigned xfs_sb_version_tonew(unsigned v) | |||
308 | XFS_SB_VERSION_4); | 338 | XFS_SB_VERSION_4); |
309 | } | 339 | } |
310 | 340 | ||
311 | #define XFS_SB_VERSION_TOOLD(v) xfs_sb_version_toold(v) | ||
312 | static inline unsigned xfs_sb_version_toold(unsigned v) | 341 | static inline unsigned xfs_sb_version_toold(unsigned v) |
313 | { | 342 | { |
314 | return (((v) & (XFS_SB_VERSION_QUOTABIT | XFS_SB_VERSION_ALIGNBIT)) ? \ | 343 | return (((v) & (XFS_SB_VERSION_QUOTABIT | XFS_SB_VERSION_ALIGNBIT)) ? \ |
@@ -320,7 +349,6 @@ static inline unsigned xfs_sb_version_toold(unsigned v) | |||
320 | XFS_SB_VERSION_1))); | 349 | XFS_SB_VERSION_1))); |
321 | } | 350 | } |
322 | 351 | ||
323 | #define XFS_SB_VERSION_HASATTR(sbp) xfs_sb_version_hasattr(sbp) | ||
324 | static inline int xfs_sb_version_hasattr(xfs_sb_t *sbp) | 352 | static inline int xfs_sb_version_hasattr(xfs_sb_t *sbp) |
325 | { | 353 | { |
326 | return ((sbp)->sb_versionnum == XFS_SB_VERSION_2) || \ | 354 | return ((sbp)->sb_versionnum == XFS_SB_VERSION_2) || \ |
@@ -329,7 +357,6 @@ static inline int xfs_sb_version_hasattr(xfs_sb_t *sbp) | |||
329 | ((sbp)->sb_versionnum & XFS_SB_VERSION_ATTRBIT)); | 357 | ((sbp)->sb_versionnum & XFS_SB_VERSION_ATTRBIT)); |
330 | } | 358 | } |
331 | 359 | ||
332 | #define XFS_SB_VERSION_ADDATTR(sbp) xfs_sb_version_addattr(sbp) | ||
333 | static inline void xfs_sb_version_addattr(xfs_sb_t *sbp) | 360 | static inline void xfs_sb_version_addattr(xfs_sb_t *sbp) |
334 | { | 361 | { |
335 | (sbp)->sb_versionnum = (((sbp)->sb_versionnum == XFS_SB_VERSION_1) ? \ | 362 | (sbp)->sb_versionnum = (((sbp)->sb_versionnum == XFS_SB_VERSION_1) ? \ |
@@ -339,7 +366,6 @@ static inline void xfs_sb_version_addattr(xfs_sb_t *sbp) | |||
339 | (XFS_SB_VERSION_4 | XFS_SB_VERSION_ATTRBIT))); | 366 | (XFS_SB_VERSION_4 | XFS_SB_VERSION_ATTRBIT))); |
340 | } | 367 | } |
341 | 368 | ||
342 | #define XFS_SB_VERSION_HASNLINK(sbp) xfs_sb_version_hasnlink(sbp) | ||
343 | static inline int xfs_sb_version_hasnlink(xfs_sb_t *sbp) | 369 | static inline int xfs_sb_version_hasnlink(xfs_sb_t *sbp) |
344 | { | 370 | { |
345 | return ((sbp)->sb_versionnum == XFS_SB_VERSION_3) || \ | 371 | return ((sbp)->sb_versionnum == XFS_SB_VERSION_3) || \ |
@@ -347,7 +373,6 @@ static inline int xfs_sb_version_hasnlink(xfs_sb_t *sbp) | |||
347 | ((sbp)->sb_versionnum & XFS_SB_VERSION_NLINKBIT)); | 373 | ((sbp)->sb_versionnum & XFS_SB_VERSION_NLINKBIT)); |
348 | } | 374 | } |
349 | 375 | ||
350 | #define XFS_SB_VERSION_ADDNLINK(sbp) xfs_sb_version_addnlink(sbp) | ||
351 | static inline void xfs_sb_version_addnlink(xfs_sb_t *sbp) | 376 | static inline void xfs_sb_version_addnlink(xfs_sb_t *sbp) |
352 | { | 377 | { |
353 | (sbp)->sb_versionnum = ((sbp)->sb_versionnum <= XFS_SB_VERSION_2 ? \ | 378 | (sbp)->sb_versionnum = ((sbp)->sb_versionnum <= XFS_SB_VERSION_2 ? \ |
@@ -355,115 +380,63 @@ static inline void xfs_sb_version_addnlink(xfs_sb_t *sbp) | |||
355 | ((sbp)->sb_versionnum | XFS_SB_VERSION_NLINKBIT)); | 380 | ((sbp)->sb_versionnum | XFS_SB_VERSION_NLINKBIT)); |
356 | } | 381 | } |
357 | 382 | ||
358 | #define XFS_SB_VERSION_HASQUOTA(sbp) xfs_sb_version_hasquota(sbp) | ||
359 | static inline int xfs_sb_version_hasquota(xfs_sb_t *sbp) | 383 | static inline int xfs_sb_version_hasquota(xfs_sb_t *sbp) |
360 | { | 384 | { |
361 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 385 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
362 | ((sbp)->sb_versionnum & XFS_SB_VERSION_QUOTABIT); | 386 | ((sbp)->sb_versionnum & XFS_SB_VERSION_QUOTABIT); |
363 | } | 387 | } |
364 | 388 | ||
365 | #define XFS_SB_VERSION_ADDQUOTA(sbp) xfs_sb_version_addquota(sbp) | ||
366 | static inline void xfs_sb_version_addquota(xfs_sb_t *sbp) | 389 | static inline void xfs_sb_version_addquota(xfs_sb_t *sbp) |
367 | { | 390 | { |
368 | (sbp)->sb_versionnum = \ | 391 | (sbp)->sb_versionnum = \ |
369 | (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 ? \ | 392 | (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 ? \ |
370 | ((sbp)->sb_versionnum | XFS_SB_VERSION_QUOTABIT) : \ | 393 | ((sbp)->sb_versionnum | XFS_SB_VERSION_QUOTABIT) : \ |
371 | (XFS_SB_VERSION_TONEW((sbp)->sb_versionnum) | \ | 394 | (xfs_sb_version_tonew((sbp)->sb_versionnum) | \ |
372 | XFS_SB_VERSION_QUOTABIT)); | 395 | XFS_SB_VERSION_QUOTABIT)); |
373 | } | 396 | } |
374 | 397 | ||
375 | #define XFS_SB_VERSION_HASALIGN(sbp) xfs_sb_version_hasalign(sbp) | ||
376 | static inline int xfs_sb_version_hasalign(xfs_sb_t *sbp) | 398 | static inline int xfs_sb_version_hasalign(xfs_sb_t *sbp) |
377 | { | 399 | { |
378 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 400 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
379 | ((sbp)->sb_versionnum & XFS_SB_VERSION_ALIGNBIT); | 401 | ((sbp)->sb_versionnum & XFS_SB_VERSION_ALIGNBIT); |
380 | } | 402 | } |
381 | 403 | ||
382 | #define XFS_SB_VERSION_SUBALIGN(sbp) xfs_sb_version_subalign(sbp) | ||
383 | static inline void xfs_sb_version_subalign(xfs_sb_t *sbp) | ||
384 | { | ||
385 | (sbp)->sb_versionnum = \ | ||
386 | XFS_SB_VERSION_TOOLD((sbp)->sb_versionnum & ~XFS_SB_VERSION_ALIGNBIT); | ||
387 | } | ||
388 | |||
389 | #define XFS_SB_VERSION_HASDALIGN(sbp) xfs_sb_version_hasdalign(sbp) | ||
390 | static inline int xfs_sb_version_hasdalign(xfs_sb_t *sbp) | 404 | static inline int xfs_sb_version_hasdalign(xfs_sb_t *sbp) |
391 | { | 405 | { |
392 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 406 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
393 | ((sbp)->sb_versionnum & XFS_SB_VERSION_DALIGNBIT); | 407 | ((sbp)->sb_versionnum & XFS_SB_VERSION_DALIGNBIT); |
394 | } | 408 | } |
395 | 409 | ||
396 | #define XFS_SB_VERSION_ADDDALIGN(sbp) xfs_sb_version_adddalign(sbp) | ||
397 | static inline int xfs_sb_version_adddalign(xfs_sb_t *sbp) | ||
398 | { | ||
399 | return (sbp)->sb_versionnum = \ | ||
400 | ((sbp)->sb_versionnum | XFS_SB_VERSION_DALIGNBIT); | ||
401 | } | ||
402 | |||
403 | #define XFS_SB_VERSION_HASSHARED(sbp) xfs_sb_version_hasshared(sbp) | ||
404 | static inline int xfs_sb_version_hasshared(xfs_sb_t *sbp) | 410 | static inline int xfs_sb_version_hasshared(xfs_sb_t *sbp) |
405 | { | 411 | { |
406 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 412 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
407 | ((sbp)->sb_versionnum & XFS_SB_VERSION_SHAREDBIT); | 413 | ((sbp)->sb_versionnum & XFS_SB_VERSION_SHAREDBIT); |
408 | } | 414 | } |
409 | 415 | ||
410 | #define XFS_SB_VERSION_ADDSHARED(sbp) xfs_sb_version_addshared(sbp) | ||
411 | static inline int xfs_sb_version_addshared(xfs_sb_t *sbp) | ||
412 | { | ||
413 | return (sbp)->sb_versionnum = \ | ||
414 | ((sbp)->sb_versionnum | XFS_SB_VERSION_SHAREDBIT); | ||
415 | } | ||
416 | |||
417 | #define XFS_SB_VERSION_SUBSHARED(sbp) xfs_sb_version_subshared(sbp) | ||
418 | static inline int xfs_sb_version_subshared(xfs_sb_t *sbp) | ||
419 | { | ||
420 | return (sbp)->sb_versionnum = \ | ||
421 | ((sbp)->sb_versionnum & ~XFS_SB_VERSION_SHAREDBIT); | ||
422 | } | ||
423 | |||
424 | #define XFS_SB_VERSION_HASDIRV2(sbp) xfs_sb_version_hasdirv2(sbp) | ||
425 | static inline int xfs_sb_version_hasdirv2(xfs_sb_t *sbp) | 416 | static inline int xfs_sb_version_hasdirv2(xfs_sb_t *sbp) |
426 | { | 417 | { |
427 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 418 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
428 | ((sbp)->sb_versionnum & XFS_SB_VERSION_DIRV2BIT); | 419 | ((sbp)->sb_versionnum & XFS_SB_VERSION_DIRV2BIT); |
429 | } | 420 | } |
430 | 421 | ||
431 | #define XFS_SB_VERSION_HASLOGV2(sbp) xfs_sb_version_haslogv2(sbp) | ||
432 | static inline int xfs_sb_version_haslogv2(xfs_sb_t *sbp) | 422 | static inline int xfs_sb_version_haslogv2(xfs_sb_t *sbp) |
433 | { | 423 | { |
434 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 424 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
435 | ((sbp)->sb_versionnum & XFS_SB_VERSION_LOGV2BIT); | 425 | ((sbp)->sb_versionnum & XFS_SB_VERSION_LOGV2BIT); |
436 | } | 426 | } |
437 | 427 | ||
438 | #define XFS_SB_VERSION_HASEXTFLGBIT(sbp) xfs_sb_version_hasextflgbit(sbp) | ||
439 | static inline int xfs_sb_version_hasextflgbit(xfs_sb_t *sbp) | 428 | static inline int xfs_sb_version_hasextflgbit(xfs_sb_t *sbp) |
440 | { | 429 | { |
441 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 430 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
442 | ((sbp)->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT); | 431 | ((sbp)->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT); |
443 | } | 432 | } |
444 | 433 | ||
445 | #define XFS_SB_VERSION_ADDEXTFLGBIT(sbp) xfs_sb_version_addextflgbit(sbp) | ||
446 | static inline int xfs_sb_version_addextflgbit(xfs_sb_t *sbp) | ||
447 | { | ||
448 | return (sbp)->sb_versionnum = \ | ||
449 | ((sbp)->sb_versionnum | XFS_SB_VERSION_EXTFLGBIT); | ||
450 | } | ||
451 | |||
452 | #define XFS_SB_VERSION_SUBEXTFLGBIT(sbp) xfs_sb_version_subextflgbit(sbp) | ||
453 | static inline int xfs_sb_version_subextflgbit(xfs_sb_t *sbp) | ||
454 | { | ||
455 | return (sbp)->sb_versionnum = \ | ||
456 | ((sbp)->sb_versionnum & ~XFS_SB_VERSION_EXTFLGBIT); | ||
457 | } | ||
458 | |||
459 | #define XFS_SB_VERSION_HASSECTOR(sbp) xfs_sb_version_hassector(sbp) | ||
460 | static inline int xfs_sb_version_hassector(xfs_sb_t *sbp) | 434 | static inline int xfs_sb_version_hassector(xfs_sb_t *sbp) |
461 | { | 435 | { |
462 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 436 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
463 | ((sbp)->sb_versionnum & XFS_SB_VERSION_SECTORBIT); | 437 | ((sbp)->sb_versionnum & XFS_SB_VERSION_SECTORBIT); |
464 | } | 438 | } |
465 | 439 | ||
466 | #define XFS_SB_VERSION_HASMOREBITS(sbp) xfs_sb_version_hasmorebits(sbp) | ||
467 | static inline int xfs_sb_version_hasmorebits(xfs_sb_t *sbp) | 440 | static inline int xfs_sb_version_hasmorebits(xfs_sb_t *sbp) |
468 | { | 441 | { |
469 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ | 442 | return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ |
@@ -476,24 +449,22 @@ static inline int xfs_sb_version_hasmorebits(xfs_sb_t *sbp) | |||
476 | * For example, for a bit defined as XFS_SB_VERSION2_FUNBIT, has a macro: | 449 | * For example, for a bit defined as XFS_SB_VERSION2_FUNBIT, has a macro: |
477 | * | 450 | * |
478 | * SB_VERSION_HASFUNBIT(xfs_sb_t *sbp) | 451 | * SB_VERSION_HASFUNBIT(xfs_sb_t *sbp) |
479 | * ((XFS_SB_VERSION_HASMOREBITS(sbp) && | 452 | * ((xfs_sb_version_hasmorebits(sbp) && |
480 | * ((sbp)->sb_features2 & XFS_SB_VERSION2_FUNBIT) | 453 | * ((sbp)->sb_features2 & XFS_SB_VERSION2_FUNBIT) |
481 | */ | 454 | */ |
482 | 455 | ||
483 | static inline int xfs_sb_version_haslazysbcount(xfs_sb_t *sbp) | 456 | static inline int xfs_sb_version_haslazysbcount(xfs_sb_t *sbp) |
484 | { | 457 | { |
485 | return (XFS_SB_VERSION_HASMOREBITS(sbp) && \ | 458 | return (xfs_sb_version_hasmorebits(sbp) && \ |
486 | ((sbp)->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT)); | 459 | ((sbp)->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT)); |
487 | } | 460 | } |
488 | 461 | ||
489 | #define XFS_SB_VERSION_HASATTR2(sbp) xfs_sb_version_hasattr2(sbp) | ||
490 | static inline int xfs_sb_version_hasattr2(xfs_sb_t *sbp) | 462 | static inline int xfs_sb_version_hasattr2(xfs_sb_t *sbp) |
491 | { | 463 | { |
492 | return (XFS_SB_VERSION_HASMOREBITS(sbp)) && \ | 464 | return (xfs_sb_version_hasmorebits(sbp)) && \ |
493 | ((sbp)->sb_features2 & XFS_SB_VERSION2_ATTR2BIT); | 465 | ((sbp)->sb_features2 & XFS_SB_VERSION2_ATTR2BIT); |
494 | } | 466 | } |
495 | 467 | ||
496 | #define XFS_SB_VERSION_ADDATTR2(sbp) xfs_sb_version_addattr2(sbp) | ||
497 | static inline void xfs_sb_version_addattr2(xfs_sb_t *sbp) | 468 | static inline void xfs_sb_version_addattr2(xfs_sb_t *sbp) |
498 | { | 469 | { |
499 | ((sbp)->sb_versionnum = \ | 470 | ((sbp)->sb_versionnum = \ |
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 45d740df53b7..18a85e746680 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
@@ -339,10 +339,10 @@ xfs_bump_ino_vers2( | |||
339 | ip->i_d.di_onlink = 0; | 339 | ip->i_d.di_onlink = 0; |
340 | memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); | 340 | memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); |
341 | mp = tp->t_mountp; | 341 | mp = tp->t_mountp; |
342 | if (!XFS_SB_VERSION_HASNLINK(&mp->m_sb)) { | 342 | if (!xfs_sb_version_hasnlink(&mp->m_sb)) { |
343 | spin_lock(&mp->m_sb_lock); | 343 | spin_lock(&mp->m_sb_lock); |
344 | if (!XFS_SB_VERSION_HASNLINK(&mp->m_sb)) { | 344 | if (!xfs_sb_version_hasnlink(&mp->m_sb)) { |
345 | XFS_SB_VERSION_ADDNLINK(&mp->m_sb); | 345 | xfs_sb_version_addnlink(&mp->m_sb); |
346 | spin_unlock(&mp->m_sb_lock); | 346 | spin_unlock(&mp->m_sb_lock); |
347 | xfs_mod_sb(tp, XFS_SB_VERSIONNUM); | 347 | xfs_mod_sb(tp, XFS_SB_VERSIONNUM); |
348 | } else { | 348 | } else { |
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index 7321304a69cc..7094caff13cf 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c | |||
@@ -330,7 +330,7 @@ xfs_finish_flags( | |||
330 | int ronly = (mp->m_flags & XFS_MOUNT_RDONLY); | 330 | int ronly = (mp->m_flags & XFS_MOUNT_RDONLY); |
331 | 331 | ||
332 | /* Fail a mount where the logbuf is smaller then the log stripe */ | 332 | /* Fail a mount where the logbuf is smaller then the log stripe */ |
333 | if (XFS_SB_VERSION_HASLOGV2(&mp->m_sb)) { | 333 | if (xfs_sb_version_haslogv2(&mp->m_sb)) { |
334 | if ((ap->logbufsize <= 0) && | 334 | if ((ap->logbufsize <= 0) && |
335 | (mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE)) { | 335 | (mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE)) { |
336 | mp->m_logbsize = mp->m_sb.sb_logsunit; | 336 | mp->m_logbsize = mp->m_sb.sb_logsunit; |
@@ -349,9 +349,8 @@ xfs_finish_flags( | |||
349 | } | 349 | } |
350 | } | 350 | } |
351 | 351 | ||
352 | if (XFS_SB_VERSION_HASATTR2(&mp->m_sb)) { | 352 | if (xfs_sb_version_hasattr2(&mp->m_sb)) |
353 | mp->m_flags |= XFS_MOUNT_ATTR2; | 353 | mp->m_flags |= XFS_MOUNT_ATTR2; |
354 | } | ||
355 | 354 | ||
356 | /* | 355 | /* |
357 | * prohibit r/w mounts of read-only filesystems | 356 | * prohibit r/w mounts of read-only filesystems |
@@ -366,7 +365,7 @@ xfs_finish_flags( | |||
366 | * check for shared mount. | 365 | * check for shared mount. |
367 | */ | 366 | */ |
368 | if (ap->flags & XFSMNT_SHARED) { | 367 | if (ap->flags & XFSMNT_SHARED) { |
369 | if (!XFS_SB_VERSION_HASSHARED(&mp->m_sb)) | 368 | if (!xfs_sb_version_hasshared(&mp->m_sb)) |
370 | return XFS_ERROR(EINVAL); | 369 | return XFS_ERROR(EINVAL); |
371 | 370 | ||
372 | /* | 371 | /* |
@@ -512,7 +511,7 @@ xfs_mount( | |||
512 | if (!error && logdev && logdev != ddev) { | 511 | if (!error && logdev && logdev != ddev) { |
513 | unsigned int log_sector_size = BBSIZE; | 512 | unsigned int log_sector_size = BBSIZE; |
514 | 513 | ||
515 | if (XFS_SB_VERSION_HASSECTOR(&mp->m_sb)) | 514 | if (xfs_sb_version_hassector(&mp->m_sb)) |
516 | log_sector_size = mp->m_sb.sb_logsectsize; | 515 | log_sector_size = mp->m_sb.sb_logsectsize; |
517 | error = xfs_setsize_buftarg(mp->m_logdev_targp, | 516 | error = xfs_setsize_buftarg(mp->m_logdev_targp, |
518 | mp->m_sb.sb_blocksize, | 517 | mp->m_sb.sb_blocksize, |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 51305242ff8c..64c5953feca4 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -4132,7 +4132,7 @@ xfs_free_file_space( | |||
4132 | * actually need to zero the extent edges. Otherwise xfs_bunmapi | 4132 | * actually need to zero the extent edges. Otherwise xfs_bunmapi |
4133 | * will take care of it for us. | 4133 | * will take care of it for us. |
4134 | */ | 4134 | */ |
4135 | if (rt && !XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb)) { | 4135 | if (rt && !xfs_sb_version_hasextflgbit(&mp->m_sb)) { |
4136 | nimap = 1; | 4136 | nimap = 1; |
4137 | error = xfs_bmapi(NULL, ip, startoffset_fsb, | 4137 | error = xfs_bmapi(NULL, ip, startoffset_fsb, |
4138 | 1, 0, NULL, 0, &imap, &nimap, NULL, NULL); | 4138 | 1, 0, NULL, 0, &imap, &nimap, NULL, NULL); |
diff --git a/include/asm-frv/mem-layout.h b/include/asm-frv/mem-layout.h index 83532252b8be..734a1d0583b6 100644 --- a/include/asm-frv/mem-layout.h +++ b/include/asm-frv/mem-layout.h | |||
@@ -60,7 +60,7 @@ | |||
60 | */ | 60 | */ |
61 | #define BRK_BASE __UL(2 * 1024 * 1024 + PAGE_SIZE) | 61 | #define BRK_BASE __UL(2 * 1024 * 1024 + PAGE_SIZE) |
62 | #define STACK_TOP __UL(2 * 1024 * 1024) | 62 | #define STACK_TOP __UL(2 * 1024 * 1024) |
63 | #define STACK_TOP_MAX STACK_TOP | 63 | #define STACK_TOP_MAX __UL(0xc0000000) |
64 | 64 | ||
65 | /* userspace process size */ | 65 | /* userspace process size */ |
66 | #ifdef CONFIG_MMU | 66 | #ifdef CONFIG_MMU |
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h index 6c0682ed5fc9..4e219046fe42 100644 --- a/include/asm-frv/pgtable.h +++ b/include/asm-frv/pgtable.h | |||
@@ -507,13 +507,22 @@ static inline int pte_file(pte_t pte) | |||
507 | */ | 507 | */ |
508 | static inline void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte) | 508 | static inline void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte) |
509 | { | 509 | { |
510 | struct mm_struct *mm; | ||
510 | unsigned long ampr; | 511 | unsigned long ampr; |
511 | pgd_t *pge = pgd_offset(current->mm, address); | ||
512 | pud_t *pue = pud_offset(pge, address); | ||
513 | pmd_t *pme = pmd_offset(pue, address); | ||
514 | 512 | ||
515 | ampr = pme->ste[0] & 0xffffff00; | 513 | mm = current->mm; |
516 | ampr |= xAMPRx_L | xAMPRx_SS_16Kb | xAMPRx_S | xAMPRx_C | xAMPRx_V; | 514 | if (mm) { |
515 | pgd_t *pge = pgd_offset(mm, address); | ||
516 | pud_t *pue = pud_offset(pge, address); | ||
517 | pmd_t *pme = pmd_offset(pue, address); | ||
518 | |||
519 | ampr = pme->ste[0] & 0xffffff00; | ||
520 | ampr |= xAMPRx_L | xAMPRx_SS_16Kb | xAMPRx_S | xAMPRx_C | | ||
521 | xAMPRx_V; | ||
522 | } else { | ||
523 | address = ULONG_MAX; | ||
524 | ampr = 0; | ||
525 | } | ||
517 | 526 | ||
518 | asm volatile("movgs %0,scr0\n" | 527 | asm volatile("movgs %0,scr0\n" |
519 | "movgs %0,scr1\n" | 528 | "movgs %0,scr1\n" |
diff --git a/include/asm-frv/spr-regs.h b/include/asm-frv/spr-regs.h index c2a541ef828d..01e6af5e99b8 100644 --- a/include/asm-frv/spr-regs.h +++ b/include/asm-frv/spr-regs.h | |||
@@ -99,9 +99,23 @@ | |||
99 | #define TBR_TT_TRAP1 (0x81 << 4) | 99 | #define TBR_TT_TRAP1 (0x81 << 4) |
100 | #define TBR_TT_TRAP2 (0x82 << 4) | 100 | #define TBR_TT_TRAP2 (0x82 << 4) |
101 | #define TBR_TT_TRAP3 (0x83 << 4) | 101 | #define TBR_TT_TRAP3 (0x83 << 4) |
102 | #define TBR_TT_TRAP120 (0xf8 << 4) | ||
103 | #define TBR_TT_TRAP121 (0xf9 << 4) | ||
104 | #define TBR_TT_TRAP122 (0xfa << 4) | ||
105 | #define TBR_TT_TRAP123 (0xfb << 4) | ||
106 | #define TBR_TT_TRAP124 (0xfc << 4) | ||
107 | #define TBR_TT_TRAP125 (0xfd << 4) | ||
102 | #define TBR_TT_TRAP126 (0xfe << 4) | 108 | #define TBR_TT_TRAP126 (0xfe << 4) |
103 | #define TBR_TT_BREAK (0xff << 4) | 109 | #define TBR_TT_BREAK (0xff << 4) |
104 | 110 | ||
111 | #define TBR_TT_ATOMIC_CMPXCHG32 TBR_TT_TRAP120 | ||
112 | #define TBR_TT_ATOMIC_XCHG32 TBR_TT_TRAP121 | ||
113 | #define TBR_TT_ATOMIC_XOR TBR_TT_TRAP122 | ||
114 | #define TBR_TT_ATOMIC_OR TBR_TT_TRAP123 | ||
115 | #define TBR_TT_ATOMIC_AND TBR_TT_TRAP124 | ||
116 | #define TBR_TT_ATOMIC_SUB TBR_TT_TRAP125 | ||
117 | #define TBR_TT_ATOMIC_ADD TBR_TT_TRAP126 | ||
118 | |||
105 | #define __get_TBR() ({ unsigned long x; asm volatile("movsg tbr,%0" : "=r"(x)); x; }) | 119 | #define __get_TBR() ({ unsigned long x; asm volatile("movsg tbr,%0" : "=r"(x)); x; }) |
106 | 120 | ||
107 | /* | 121 | /* |
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index 2c57f4734746..30a67a9da11a 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h | |||
@@ -179,14 +179,23 @@ do { \ | |||
179 | #define mb() asm volatile ("membar" : : :"memory") | 179 | #define mb() asm volatile ("membar" : : :"memory") |
180 | #define rmb() asm volatile ("membar" : : :"memory") | 180 | #define rmb() asm volatile ("membar" : : :"memory") |
181 | #define wmb() asm volatile ("membar" : : :"memory") | 181 | #define wmb() asm volatile ("membar" : : :"memory") |
182 | #define set_mb(var, value) do { var = value; mb(); } while (0) | 182 | #define read_barrier_depends() barrier() |
183 | 183 | ||
184 | #define smp_mb() mb() | 184 | #ifdef CONFIG_SMP |
185 | #define smp_rmb() rmb() | 185 | #define smp_mb() mb() |
186 | #define smp_wmb() wmb() | 186 | #define smp_rmb() rmb() |
187 | 187 | #define smp_wmb() wmb() | |
188 | #define read_barrier_depends() do {} while(0) | ||
189 | #define smp_read_barrier_depends() read_barrier_depends() | 188 | #define smp_read_barrier_depends() read_barrier_depends() |
189 | #define set_mb(var, value) \ | ||
190 | do { xchg(&var, (value)); } while (0) | ||
191 | #else | ||
192 | #define smp_mb() barrier() | ||
193 | #define smp_rmb() barrier() | ||
194 | #define smp_wmb() barrier() | ||
195 | #define smp_read_barrier_depends() do {} while(0) | ||
196 | #define set_mb(var, value) \ | ||
197 | do { var = (value); barrier(); } while (0) | ||
198 | #endif | ||
190 | 199 | ||
191 | #define HARD_RESET_NOW() \ | 200 | #define HARD_RESET_NOW() \ |
192 | do { \ | 201 | do { \ |
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h index 01e7eadc97e2..d5c0f2fda51b 100644 --- a/include/asm-mips/cacheflush.h +++ b/include/asm-mips/cacheflush.h | |||
@@ -63,8 +63,22 @@ static inline void flush_icache_page(struct vm_area_struct *vma, | |||
63 | } | 63 | } |
64 | 64 | ||
65 | extern void (*flush_icache_range)(unsigned long start, unsigned long end); | 65 | extern void (*flush_icache_range)(unsigned long start, unsigned long end); |
66 | #define flush_cache_vmap(start, end) flush_cache_all() | 66 | |
67 | #define flush_cache_vunmap(start, end) flush_cache_all() | 67 | extern void (*__flush_cache_vmap)(void); |
68 | |||
69 | static inline void flush_cache_vmap(unsigned long start, unsigned long end) | ||
70 | { | ||
71 | if (cpu_has_dc_aliases) | ||
72 | __flush_cache_vmap(); | ||
73 | } | ||
74 | |||
75 | extern void (*__flush_cache_vunmap)(void); | ||
76 | |||
77 | static inline void flush_cache_vunmap(unsigned long start, unsigned long end) | ||
78 | { | ||
79 | if (cpu_has_dc_aliases) | ||
80 | __flush_cache_vunmap(); | ||
81 | } | ||
68 | 82 | ||
69 | extern void copy_to_user_page(struct vm_area_struct *vma, | 83 | extern void copy_to_user_page(struct vm_area_struct *vma, |
70 | struct page *page, unsigned long vaddr, void *dst, const void *src, | 84 | struct page *page, unsigned long vaddr, void *dst, const void *src, |
diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h index ed5fd7390678..72213e3d02c7 100644 --- a/include/asm-mips/mach-pb1x00/pb1200.h +++ b/include/asm-mips/mach-pb1x00/pb1200.h | |||
@@ -245,7 +245,7 @@ enum external_pb1200_ints { | |||
245 | PB1200_SD1_INSERT_INT, | 245 | PB1200_SD1_INSERT_INT, |
246 | PB1200_SD1_EJECT_INT, | 246 | PB1200_SD1_EJECT_INT, |
247 | 247 | ||
248 | PB1200_INT_END (PB1200_INT_BEGIN + 15) | 248 | PB1200_INT_END = PB1200_INT_BEGIN + 15 |
249 | }; | 249 | }; |
250 | 250 | ||
251 | /* For drivers/pcmcia/au1000_db1x00.c */ | 251 | /* For drivers/pcmcia/au1000_db1x00.c */ |
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h index 92021c1ffa3a..0e2292483b35 100644 --- a/include/asm-x86/irqflags.h +++ b/include/asm-x86/irqflags.h | |||
@@ -70,6 +70,26 @@ static inline void raw_local_irq_restore(unsigned long flags) | |||
70 | native_restore_fl(flags); | 70 | native_restore_fl(flags); |
71 | } | 71 | } |
72 | 72 | ||
73 | #ifdef CONFIG_X86_VSMP | ||
74 | |||
75 | /* | ||
76 | * Interrupt control for the VSMP architecture: | ||
77 | */ | ||
78 | |||
79 | static inline void raw_local_irq_disable(void) | ||
80 | { | ||
81 | unsigned long flags = __raw_local_save_flags(); | ||
82 | raw_local_irq_restore((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC); | ||
83 | } | ||
84 | |||
85 | static inline void raw_local_irq_enable(void) | ||
86 | { | ||
87 | unsigned long flags = __raw_local_save_flags(); | ||
88 | raw_local_irq_restore((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC)); | ||
89 | } | ||
90 | |||
91 | #else | ||
92 | |||
73 | static inline void raw_local_irq_disable(void) | 93 | static inline void raw_local_irq_disable(void) |
74 | { | 94 | { |
75 | native_irq_disable(); | 95 | native_irq_disable(); |
@@ -80,6 +100,8 @@ static inline void raw_local_irq_enable(void) | |||
80 | native_irq_enable(); | 100 | native_irq_enable(); |
81 | } | 101 | } |
82 | 102 | ||
103 | #endif | ||
104 | |||
83 | /* | 105 | /* |
84 | * Used in the idle loop; sti takes one instruction cycle | 106 | * Used in the idle loop; sti takes one instruction cycle |
85 | * to complete: | 107 | * to complete: |
@@ -137,10 +159,17 @@ static inline unsigned long __raw_local_irq_save(void) | |||
137 | #define raw_local_irq_save(flags) \ | 159 | #define raw_local_irq_save(flags) \ |
138 | do { (flags) = __raw_local_irq_save(); } while (0) | 160 | do { (flags) = __raw_local_irq_save(); } while (0) |
139 | 161 | ||
162 | #ifdef CONFIG_X86_VSMP | ||
163 | static inline int raw_irqs_disabled_flags(unsigned long flags) | ||
164 | { | ||
165 | return !(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC); | ||
166 | } | ||
167 | #else | ||
140 | static inline int raw_irqs_disabled_flags(unsigned long flags) | 168 | static inline int raw_irqs_disabled_flags(unsigned long flags) |
141 | { | 169 | { |
142 | return !(flags & X86_EFLAGS_IF); | 170 | return !(flags & X86_EFLAGS_IF); |
143 | } | 171 | } |
172 | #endif | ||
144 | 173 | ||
145 | static inline int raw_irqs_disabled(void) | 174 | static inline int raw_irqs_disabled(void) |
146 | { | 175 | { |
diff --git a/include/asm-x86/linkage.h b/include/asm-x86/linkage.h index 31739c7d66a9..c048353f4b85 100644 --- a/include/asm-x86/linkage.h +++ b/include/asm-x86/linkage.h | |||
@@ -8,12 +8,45 @@ | |||
8 | 8 | ||
9 | #ifdef CONFIG_X86_32 | 9 | #ifdef CONFIG_X86_32 |
10 | #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0))) | 10 | #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0))) |
11 | #define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret)) | ||
12 | /* | 11 | /* |
13 | * For 32-bit UML - mark functions implemented in assembly that use | 12 | * For 32-bit UML - mark functions implemented in assembly that use |
14 | * regparm input parameters: | 13 | * regparm input parameters: |
15 | */ | 14 | */ |
16 | #define asmregparm __attribute__((regparm(3))) | 15 | #define asmregparm __attribute__((regparm(3))) |
16 | |||
17 | /* | ||
18 | * Make sure the compiler doesn't do anything stupid with the | ||
19 | * arguments on the stack - they are owned by the *caller*, not | ||
20 | * the callee. This just fools gcc into not spilling into them, | ||
21 | * and keeps it from doing tailcall recursion and/or using the | ||
22 | * stack slots for temporaries, since they are live and "used" | ||
23 | * all the way to the end of the function. | ||
24 | * | ||
25 | * NOTE! On x86-64, all the arguments are in registers, so this | ||
26 | * only matters on a 32-bit kernel. | ||
27 | */ | ||
28 | #define asmlinkage_protect(n, ret, args...) \ | ||
29 | __asmlinkage_protect##n(ret, ##args) | ||
30 | #define __asmlinkage_protect_n(ret, args...) \ | ||
31 | __asm__ __volatile__ ("" : "=r" (ret) : "0" (ret), ##args) | ||
32 | #define __asmlinkage_protect0(ret) \ | ||
33 | __asmlinkage_protect_n(ret) | ||
34 | #define __asmlinkage_protect1(ret, arg1) \ | ||
35 | __asmlinkage_protect_n(ret, "g" (arg1)) | ||
36 | #define __asmlinkage_protect2(ret, arg1, arg2) \ | ||
37 | __asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2)) | ||
38 | #define __asmlinkage_protect3(ret, arg1, arg2, arg3) \ | ||
39 | __asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3)) | ||
40 | #define __asmlinkage_protect4(ret, arg1, arg2, arg3, arg4) \ | ||
41 | __asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \ | ||
42 | "g" (arg4)) | ||
43 | #define __asmlinkage_protect5(ret, arg1, arg2, arg3, arg4, arg5) \ | ||
44 | __asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \ | ||
45 | "g" (arg4), "g" (arg5)) | ||
46 | #define __asmlinkage_protect6(ret, arg1, arg2, arg3, arg4, arg5, arg6) \ | ||
47 | __asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \ | ||
48 | "g" (arg4), "g" (arg5), "g" (arg6)) | ||
49 | |||
17 | #endif | 50 | #endif |
18 | 51 | ||
19 | #ifdef CONFIG_X86_ALIGNMENT_16 | 52 | #ifdef CONFIG_X86_ALIGNMENT_16 |
diff --git a/include/asm-x86/nops.h b/include/asm-x86/nops.h index e3b2bce0aff8..b3930ae539b3 100644 --- a/include/asm-x86/nops.h +++ b/include/asm-x86/nops.h | |||
@@ -73,16 +73,7 @@ | |||
73 | #define P6_NOP7 ".byte 0x0f,0x1f,0x80,0,0,0,0\n" | 73 | #define P6_NOP7 ".byte 0x0f,0x1f,0x80,0,0,0,0\n" |
74 | #define P6_NOP8 ".byte 0x0f,0x1f,0x84,0x00,0,0,0,0\n" | 74 | #define P6_NOP8 ".byte 0x0f,0x1f,0x84,0x00,0,0,0,0\n" |
75 | 75 | ||
76 | #if defined(CONFIG_MK8) | 76 | #if defined(CONFIG_MK7) |
77 | #define ASM_NOP1 K8_NOP1 | ||
78 | #define ASM_NOP2 K8_NOP2 | ||
79 | #define ASM_NOP3 K8_NOP3 | ||
80 | #define ASM_NOP4 K8_NOP4 | ||
81 | #define ASM_NOP5 K8_NOP5 | ||
82 | #define ASM_NOP6 K8_NOP6 | ||
83 | #define ASM_NOP7 K8_NOP7 | ||
84 | #define ASM_NOP8 K8_NOP8 | ||
85 | #elif defined(CONFIG_MK7) | ||
86 | #define ASM_NOP1 K7_NOP1 | 77 | #define ASM_NOP1 K7_NOP1 |
87 | #define ASM_NOP2 K7_NOP2 | 78 | #define ASM_NOP2 K7_NOP2 |
88 | #define ASM_NOP3 K7_NOP3 | 79 | #define ASM_NOP3 K7_NOP3 |
@@ -100,6 +91,15 @@ | |||
100 | #define ASM_NOP6 P6_NOP6 | 91 | #define ASM_NOP6 P6_NOP6 |
101 | #define ASM_NOP7 P6_NOP7 | 92 | #define ASM_NOP7 P6_NOP7 |
102 | #define ASM_NOP8 P6_NOP8 | 93 | #define ASM_NOP8 P6_NOP8 |
94 | #elif defined(CONFIG_X86_64) | ||
95 | #define ASM_NOP1 K8_NOP1 | ||
96 | #define ASM_NOP2 K8_NOP2 | ||
97 | #define ASM_NOP3 K8_NOP3 | ||
98 | #define ASM_NOP4 K8_NOP4 | ||
99 | #define ASM_NOP5 K8_NOP5 | ||
100 | #define ASM_NOP6 K8_NOP6 | ||
101 | #define ASM_NOP7 K8_NOP7 | ||
102 | #define ASM_NOP8 K8_NOP8 | ||
103 | #else | 103 | #else |
104 | #define ASM_NOP1 GENERIC_NOP1 | 104 | #define ASM_NOP1 GENERIC_NOP1 |
105 | #define ASM_NOP2 GENERIC_NOP2 | 105 | #define ASM_NOP2 GENERIC_NOP2 |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 9cdd12a9e843..cedbbd806bf6 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -86,6 +86,7 @@ header-y += if_plip.h | |||
86 | header-y += if_ppp.h | 86 | header-y += if_ppp.h |
87 | header-y += if_slip.h | 87 | header-y += if_slip.h |
88 | header-y += if_strip.h | 88 | header-y += if_strip.h |
89 | header-y += if_tun.h | ||
89 | header-y += if_tunnel.h | 90 | header-y += if_tunnel.h |
90 | header-y += in6.h | 91 | header-y += in6.h |
91 | header-y += in_route.h | 92 | header-y += in_route.h |
@@ -229,7 +230,6 @@ unifdef-y += if_link.h | |||
229 | unifdef-y += if_pppol2tp.h | 230 | unifdef-y += if_pppol2tp.h |
230 | unifdef-y += if_pppox.h | 231 | unifdef-y += if_pppox.h |
231 | unifdef-y += if_tr.h | 232 | unifdef-y += if_tr.h |
232 | unifdef-y += if_tun.h | ||
233 | unifdef-y += if_vlan.h | 233 | unifdef-y += if_vlan.h |
234 | unifdef-y += if_wanpipe.h | 234 | unifdef-y += if_wanpipe.h |
235 | unifdef-y += igmp.h | 235 | unifdef-y += igmp.h |
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 028ba3b523b1..a6a6035a4e1e 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -256,6 +256,7 @@ struct cgroup_subsys { | |||
256 | void (*bind)(struct cgroup_subsys *ss, struct cgroup *root); | 256 | void (*bind)(struct cgroup_subsys *ss, struct cgroup *root); |
257 | int subsys_id; | 257 | int subsys_id; |
258 | int active; | 258 | int active; |
259 | int disabled; | ||
259 | int early_init; | 260 | int early_init; |
260 | #define MAX_CGROUP_TYPE_NAMELEN 32 | 261 | #define MAX_CGROUP_TYPE_NAMELEN 32 |
261 | const char *name; | 262 | const char *name; |
diff --git a/include/linux/hpet.h b/include/linux/hpet.h index 9cd94bfd07e5..2dc29ce6c8e4 100644 --- a/include/linux/hpet.h +++ b/include/linux/hpet.h | |||
@@ -64,7 +64,7 @@ struct hpet { | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | #define Tn_INT_ROUTE_CAP_MASK (0xffffffff00000000ULL) | 66 | #define Tn_INT_ROUTE_CAP_MASK (0xffffffff00000000ULL) |
67 | #define Tn_INT_ROUTE_CAP_SHIFT (32UL) | 67 | #define Tn_INI_ROUTE_CAP_SHIFT (32UL) |
68 | #define Tn_FSB_INT_DELCAP_MASK (0x8000UL) | 68 | #define Tn_FSB_INT_DELCAP_MASK (0x8000UL) |
69 | #define Tn_FSB_INT_DELCAP_SHIFT (15) | 69 | #define Tn_FSB_INT_DELCAP_SHIFT (15) |
70 | #define Tn_FSB_EN_CNF_MASK (0x4000UL) | 70 | #define Tn_FSB_EN_CNF_MASK (0x4000UL) |
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 72f1c5f47be3..8c71fe2fb1f5 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h | |||
@@ -18,47 +18,8 @@ | |||
18 | #ifndef __IF_TUN_H | 18 | #ifndef __IF_TUN_H |
19 | #define __IF_TUN_H | 19 | #define __IF_TUN_H |
20 | 20 | ||
21 | /* Uncomment to enable debugging */ | ||
22 | /* #define TUN_DEBUG 1 */ | ||
23 | |||
24 | #include <linux/types.h> | 21 | #include <linux/types.h> |
25 | 22 | ||
26 | #ifdef __KERNEL__ | ||
27 | |||
28 | #ifdef TUN_DEBUG | ||
29 | #define DBG if(tun->debug)printk | ||
30 | #define DBG1 if(debug==2)printk | ||
31 | #else | ||
32 | #define DBG( a... ) | ||
33 | #define DBG1( a... ) | ||
34 | #endif | ||
35 | |||
36 | struct tun_struct { | ||
37 | struct list_head list; | ||
38 | unsigned long flags; | ||
39 | int attached; | ||
40 | uid_t owner; | ||
41 | gid_t group; | ||
42 | |||
43 | wait_queue_head_t read_wait; | ||
44 | struct sk_buff_head readq; | ||
45 | |||
46 | struct net_device *dev; | ||
47 | |||
48 | struct fasync_struct *fasync; | ||
49 | |||
50 | unsigned long if_flags; | ||
51 | u8 dev_addr[ETH_ALEN]; | ||
52 | u32 chr_filter[2]; | ||
53 | u32 net_filter[2]; | ||
54 | |||
55 | #ifdef TUN_DEBUG | ||
56 | int debug; | ||
57 | #endif | ||
58 | }; | ||
59 | |||
60 | #endif /* __KERNEL__ */ | ||
61 | |||
62 | /* Read queue size */ | 23 | /* Read queue size */ |
63 | #define TUN_READQ_SIZE 500 | 24 | #define TUN_READQ_SIZE 500 |
64 | 25 | ||
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 4aaefc349a4b..134c8e5cf07c 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -53,7 +53,7 @@ struct ipv6_opt_hdr { | |||
53 | /* | 53 | /* |
54 | * TLV encoded option data follows. | 54 | * TLV encoded option data follows. |
55 | */ | 55 | */ |
56 | }; | 56 | } __attribute__ ((packed)); /* required for some archs */ |
57 | 57 | ||
58 | #define ipv6_destopt_hdr ipv6_opt_hdr | 58 | #define ipv6_destopt_hdr ipv6_opt_hdr |
59 | #define ipv6_hopopt_hdr ipv6_opt_hdr | 59 | #define ipv6_hopopt_hdr ipv6_opt_hdr |
diff --git a/include/linux/libata.h b/include/linux/libata.h index b064bfeb69ee..37ee881c42ac 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -350,7 +350,8 @@ enum { | |||
350 | ATAPI_READ = 0, /* READs */ | 350 | ATAPI_READ = 0, /* READs */ |
351 | ATAPI_WRITE = 1, /* WRITEs */ | 351 | ATAPI_WRITE = 1, /* WRITEs */ |
352 | ATAPI_READ_CD = 2, /* READ CD [MSF] */ | 352 | ATAPI_READ_CD = 2, /* READ CD [MSF] */ |
353 | ATAPI_MISC = 3, /* the rest */ | 353 | ATAPI_PASS_THRU = 3, /* SAT pass-thru */ |
354 | ATAPI_MISC = 4, /* the rest */ | ||
354 | }; | 355 | }; |
355 | 356 | ||
356 | enum ata_xfer_mask { | 357 | enum ata_xfer_mask { |
@@ -849,6 +850,7 @@ extern unsigned int ata_dev_try_classify(struct ata_device *dev, int present, | |||
849 | */ | 850 | */ |
850 | extern void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf); | 851 | extern void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf); |
851 | extern void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf); | 852 | extern void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf); |
853 | extern int atapi_cmd_type(u8 opcode); | ||
852 | extern void ata_tf_to_fis(const struct ata_taskfile *tf, | 854 | extern void ata_tf_to_fis(const struct ata_taskfile *tf, |
853 | u8 pmp, int is_cmd, u8 *fis); | 855 | u8 pmp, int is_cmd, u8 *fis); |
854 | extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf); | 856 | extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf); |
@@ -1379,27 +1381,6 @@ static inline int ata_try_flush_cache(const struct ata_device *dev) | |||
1379 | ata_id_has_flush_ext(dev->id); | 1381 | ata_id_has_flush_ext(dev->id); |
1380 | } | 1382 | } |
1381 | 1383 | ||
1382 | static inline int atapi_cmd_type(u8 opcode) | ||
1383 | { | ||
1384 | switch (opcode) { | ||
1385 | case GPCMD_READ_10: | ||
1386 | case GPCMD_READ_12: | ||
1387 | return ATAPI_READ; | ||
1388 | |||
1389 | case GPCMD_WRITE_10: | ||
1390 | case GPCMD_WRITE_12: | ||
1391 | case GPCMD_WRITE_AND_VERIFY_10: | ||
1392 | return ATAPI_WRITE; | ||
1393 | |||
1394 | case GPCMD_READ_CD: | ||
1395 | case GPCMD_READ_CD_MSF: | ||
1396 | return ATAPI_READ_CD; | ||
1397 | |||
1398 | default: | ||
1399 | return ATAPI_MISC; | ||
1400 | } | ||
1401 | } | ||
1402 | |||
1403 | static inline unsigned int ac_err_mask(u8 status) | 1384 | static inline unsigned int ac_err_mask(u8 status) |
1404 | { | 1385 | { |
1405 | if (status & (ATA_BUSY | ATA_DRQ)) | 1386 | if (status & (ATA_BUSY | ATA_DRQ)) |
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 0592936344c4..2119610b24f8 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
@@ -17,8 +17,24 @@ | |||
17 | # define asmregparm | 17 | # define asmregparm |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #ifndef prevent_tail_call | 20 | /* |
21 | # define prevent_tail_call(ret) do { } while (0) | 21 | * This is used by architectures to keep arguments on the stack |
22 | * untouched by the compiler by keeping them live until the end. | ||
23 | * The argument stack may be owned by the assembly-language | ||
24 | * caller, not the callee, and gcc doesn't always understand | ||
25 | * that. | ||
26 | * | ||
27 | * We have the return value, and a maximum of six arguments. | ||
28 | * | ||
29 | * This should always be followed by a "return ret" for the | ||
30 | * protection to work (ie no more work that the compiler might | ||
31 | * end up needing stack temporaries for). | ||
32 | */ | ||
33 | /* Assembly files may be compiled with -traditional .. */ | ||
34 | #ifndef __ASSEMBLY__ | ||
35 | #ifndef asmlinkage_protect | ||
36 | # define asmlinkage_protect(n, ret, args...) do { } while (0) | ||
37 | #endif | ||
22 | #endif | 38 | #endif |
23 | 39 | ||
24 | #ifndef __ALIGN | 40 | #ifndef __ALIGN |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 29dd55838e84..b2f05c230f4b 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -175,7 +175,7 @@ static inline void pnp_set_card_drvdata(struct pnp_card_link *pcard, void *data) | |||
175 | struct pnp_dev { | 175 | struct pnp_dev { |
176 | struct device dev; /* Driver Model device interface */ | 176 | struct device dev; /* Driver Model device interface */ |
177 | u64 dma_mask; | 177 | u64 dma_mask; |
178 | unsigned char number; /* used as an index, must be unique */ | 178 | unsigned int number; /* used as an index, must be unique */ |
179 | int status; | 179 | int status; |
180 | 180 | ||
181 | struct list_head global_list; /* node in global list of devices */ | 181 | struct list_head global_list; /* node in global list of devices */ |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 576a5f77d3bd..1129ee0a7180 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
@@ -341,6 +341,9 @@ static inline void double_spin_unlock(spinlock_t *l1, spinlock_t *l2, | |||
341 | * atomic_dec_and_lock - lock on reaching reference count zero | 341 | * atomic_dec_and_lock - lock on reaching reference count zero |
342 | * @atomic: the atomic counter | 342 | * @atomic: the atomic counter |
343 | * @lock: the spinlock in question | 343 | * @lock: the spinlock in question |
344 | * | ||
345 | * Decrements @atomic by 1. If the result is 0, returns true and locks | ||
346 | * @lock. Returns false for all other cases. | ||
344 | */ | 347 | */ |
345 | extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); | 348 | extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); |
346 | #define atomic_dec_and_lock(atomic, lock) \ | 349 | #define atomic_dec_and_lock(atomic, lock) \ |
diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 12c18ac1b973..e7d10845b3c1 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h | |||
@@ -41,6 +41,8 @@ struct virtqueue | |||
41 | * Returns NULL or the "data" token handed to add_buf. | 41 | * Returns NULL or the "data" token handed to add_buf. |
42 | * @disable_cb: disable callbacks | 42 | * @disable_cb: disable callbacks |
43 | * vq: the struct virtqueue we're talking about. | 43 | * vq: the struct virtqueue we're talking about. |
44 | * Note that this is not necessarily synchronous, hence unreliable and only | ||
45 | * useful as an optimization. | ||
44 | * @enable_cb: restart callbacks after disable_cb. | 46 | * @enable_cb: restart callbacks after disable_cb. |
45 | * vq: the struct virtqueue we're talking about. | 47 | * vq: the struct virtqueue we're talking about. |
46 | * This re-enables callbacks; it returns "false" if there are pending | 48 | * This re-enables callbacks; it returns "false" if there are pending |
@@ -48,7 +50,8 @@ struct virtqueue | |||
48 | * checking for more work, and enabling callbacks. | 50 | * checking for more work, and enabling callbacks. |
49 | * | 51 | * |
50 | * Locking rules are straightforward: the driver is responsible for | 52 | * Locking rules are straightforward: the driver is responsible for |
51 | * locking. No two operations may be invoked simultaneously. | 53 | * locking. No two operations may be invoked simultaneously, with the exception |
54 | * of @disable_cb. | ||
52 | * | 55 | * |
53 | * All operations can be called in any context. | 56 | * All operations can be called in any context. |
54 | */ | 57 | */ |
diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h index ba33db053854..7040a782c656 100644 --- a/include/net/inet_ecn.h +++ b/include/net/inet_ecn.h | |||
@@ -47,7 +47,7 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner) | |||
47 | } while (0) | 47 | } while (0) |
48 | 48 | ||
49 | #define IP6_ECN_flow_xmit(sk, label) do { \ | 49 | #define IP6_ECN_flow_xmit(sk, label) do { \ |
50 | if (INET_ECN_is_capable(inet_sk(sk)->tos)) \ | 50 | if (INET_ECN_is_capable(inet6_sk(sk)->tclass)) \ |
51 | (label) |= htonl(INET_ECN_ECT_0 << 20); \ | 51 | (label) |= htonl(INET_ECN_ECT_0 << 20); \ |
52 | } while (0) | 52 | } while (0) |
53 | 53 | ||
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 10ae2da6f93b..35b1e83fb96a 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
@@ -104,6 +104,7 @@ typedef enum { | |||
104 | SCTP_CMD_ADAPTATION_IND, /* generate and send adaptation event */ | 104 | SCTP_CMD_ADAPTATION_IND, /* generate and send adaptation event */ |
105 | SCTP_CMD_ASSOC_SHKEY, /* generate the association shared keys */ | 105 | SCTP_CMD_ASSOC_SHKEY, /* generate the association shared keys */ |
106 | SCTP_CMD_T1_RETRAN, /* Mark for retransmission after T1 timeout */ | 106 | SCTP_CMD_T1_RETRAN, /* Mark for retransmission after T1 timeout */ |
107 | SCTP_CMD_UPDATE_INITTAG, /* Update peer inittag */ | ||
107 | SCTP_CMD_LAST | 108 | SCTP_CMD_LAST |
108 | } sctp_verb_t; | 109 | } sctp_verb_t; |
109 | 110 | ||
diff --git a/include/net/sctp/ulpevent.h b/include/net/sctp/ulpevent.h index 9bcfc12275e8..7ea12e8e6676 100644 --- a/include/net/sctp/ulpevent.h +++ b/include/net/sctp/ulpevent.h | |||
@@ -67,7 +67,7 @@ struct sctp_ulpevent { | |||
67 | }; | 67 | }; |
68 | 68 | ||
69 | /* Retrieve the skb this event sits inside of. */ | 69 | /* Retrieve the skb this event sits inside of. */ |
70 | static inline struct sk_buff *sctp_event2skb(struct sctp_ulpevent *ev) | 70 | static inline struct sk_buff *sctp_event2skb(const struct sctp_ulpevent *ev) |
71 | { | 71 | { |
72 | return container_of((void *)ev, struct sk_buff, cb); | 72 | return container_of((void *)ev, struct sk_buff, cb); |
73 | } | 73 | } |
diff --git a/include/net/tcp.h b/include/net/tcp.h index 7de4ea3a04d9..4fd3eb2f8ec2 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -752,6 +752,8 @@ static inline unsigned int tcp_packets_in_flight(const struct tcp_sock *tp) | |||
752 | return tp->packets_out - tcp_left_out(tp) + tp->retrans_out; | 752 | return tp->packets_out - tcp_left_out(tp) + tp->retrans_out; |
753 | } | 753 | } |
754 | 754 | ||
755 | extern int tcp_limit_reno_sacked(struct tcp_sock *tp); | ||
756 | |||
755 | /* If cwnd > ssthresh, we may raise ssthresh to be half-way to cwnd. | 757 | /* If cwnd > ssthresh, we may raise ssthresh to be half-way to cwnd. |
756 | * The exception is rate halving phase, when cwnd is decreasing towards | 758 | * The exception is rate halving phase, when cwnd is decreasing towards |
757 | * ssthresh. | 759 | * ssthresh. |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 53d86b4b0ce0..2727f9238359 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -782,7 +782,14 @@ static int parse_cgroupfs_options(char *data, | |||
782 | if (!*token) | 782 | if (!*token) |
783 | return -EINVAL; | 783 | return -EINVAL; |
784 | if (!strcmp(token, "all")) { | 784 | if (!strcmp(token, "all")) { |
785 | opts->subsys_bits = (1 << CGROUP_SUBSYS_COUNT) - 1; | 785 | /* Add all non-disabled subsystems */ |
786 | int i; | ||
787 | opts->subsys_bits = 0; | ||
788 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { | ||
789 | struct cgroup_subsys *ss = subsys[i]; | ||
790 | if (!ss->disabled) | ||
791 | opts->subsys_bits |= 1ul << i; | ||
792 | } | ||
786 | } else if (!strcmp(token, "noprefix")) { | 793 | } else if (!strcmp(token, "noprefix")) { |
787 | set_bit(ROOT_NOPREFIX, &opts->flags); | 794 | set_bit(ROOT_NOPREFIX, &opts->flags); |
788 | } else if (!strncmp(token, "release_agent=", 14)) { | 795 | } else if (!strncmp(token, "release_agent=", 14)) { |
@@ -800,7 +807,8 @@ static int parse_cgroupfs_options(char *data, | |||
800 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { | 807 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { |
801 | ss = subsys[i]; | 808 | ss = subsys[i]; |
802 | if (!strcmp(token, ss->name)) { | 809 | if (!strcmp(token, ss->name)) { |
803 | set_bit(i, &opts->subsys_bits); | 810 | if (!ss->disabled) |
811 | set_bit(i, &opts->subsys_bits); | ||
804 | break; | 812 | break; |
805 | } | 813 | } |
806 | } | 814 | } |
@@ -2561,6 +2569,7 @@ static int proc_cgroup_show(struct seq_file *m, void *v) | |||
2561 | /* Skip this hierarchy if it has no active subsystems */ | 2569 | /* Skip this hierarchy if it has no active subsystems */ |
2562 | if (!root->actual_subsys_bits) | 2570 | if (!root->actual_subsys_bits) |
2563 | continue; | 2571 | continue; |
2572 | seq_printf(m, "%lu:", root->subsys_bits); | ||
2564 | for_each_subsys(root, ss) | 2573 | for_each_subsys(root, ss) |
2565 | seq_printf(m, "%s%s", count++ ? "," : "", ss->name); | 2574 | seq_printf(m, "%s%s", count++ ? "," : "", ss->name); |
2566 | seq_putc(m, ':'); | 2575 | seq_putc(m, ':'); |
@@ -2600,13 +2609,13 @@ static int proc_cgroupstats_show(struct seq_file *m, void *v) | |||
2600 | { | 2609 | { |
2601 | int i; | 2610 | int i; |
2602 | 2611 | ||
2603 | seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n"); | 2612 | seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\tenabled\n"); |
2604 | mutex_lock(&cgroup_mutex); | 2613 | mutex_lock(&cgroup_mutex); |
2605 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { | 2614 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { |
2606 | struct cgroup_subsys *ss = subsys[i]; | 2615 | struct cgroup_subsys *ss = subsys[i]; |
2607 | seq_printf(m, "%s\t%lu\t%d\n", | 2616 | seq_printf(m, "%s\t%lu\t%d\t%d\n", |
2608 | ss->name, ss->root->subsys_bits, | 2617 | ss->name, ss->root->subsys_bits, |
2609 | ss->root->number_of_cgroups); | 2618 | ss->root->number_of_cgroups, !ss->disabled); |
2610 | } | 2619 | } |
2611 | mutex_unlock(&cgroup_mutex); | 2620 | mutex_unlock(&cgroup_mutex); |
2612 | return 0; | 2621 | return 0; |
@@ -3010,3 +3019,27 @@ static void cgroup_release_agent(struct work_struct *work) | |||
3010 | spin_unlock(&release_list_lock); | 3019 | spin_unlock(&release_list_lock); |
3011 | mutex_unlock(&cgroup_mutex); | 3020 | mutex_unlock(&cgroup_mutex); |
3012 | } | 3021 | } |
3022 | |||
3023 | static int __init cgroup_disable(char *str) | ||
3024 | { | ||
3025 | int i; | ||
3026 | char *token; | ||
3027 | |||
3028 | while ((token = strsep(&str, ",")) != NULL) { | ||
3029 | if (!*token) | ||
3030 | continue; | ||
3031 | |||
3032 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { | ||
3033 | struct cgroup_subsys *ss = subsys[i]; | ||
3034 | |||
3035 | if (!strcmp(token, ss->name)) { | ||
3036 | ss->disabled = 1; | ||
3037 | printk(KERN_INFO "Disabling %s control group" | ||
3038 | " subsystem\n", ss->name); | ||
3039 | break; | ||
3040 | } | ||
3041 | } | ||
3042 | } | ||
3043 | return 1; | ||
3044 | } | ||
3045 | __setup("cgroup_disable=", cgroup_disable); | ||
diff --git a/kernel/exit.c b/kernel/exit.c index 53872bf993fa..073005b1cfb2 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -1608,7 +1608,7 @@ asmlinkage long sys_waitid(int which, pid_t upid, | |||
1608 | put_pid(pid); | 1608 | put_pid(pid); |
1609 | 1609 | ||
1610 | /* avoid REGPARM breakage on x86: */ | 1610 | /* avoid REGPARM breakage on x86: */ |
1611 | prevent_tail_call(ret); | 1611 | asmlinkage_protect(5, ret, which, upid, infop, options, ru); |
1612 | return ret; | 1612 | return ret; |
1613 | } | 1613 | } |
1614 | 1614 | ||
@@ -1640,7 +1640,7 @@ asmlinkage long sys_wait4(pid_t upid, int __user *stat_addr, | |||
1640 | put_pid(pid); | 1640 | put_pid(pid); |
1641 | 1641 | ||
1642 | /* avoid REGPARM breakage on x86: */ | 1642 | /* avoid REGPARM breakage on x86: */ |
1643 | prevent_tail_call(ret); | 1643 | asmlinkage_protect(4, ret, upid, stat_addr, options, ru); |
1644 | return ret; | 1644 | return ret; |
1645 | } | 1645 | } |
1646 | 1646 | ||
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 86a93376282c..0080968d3e4a 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -510,10 +510,8 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) | |||
510 | 510 | ||
511 | if (!initial) { | 511 | if (!initial) { |
512 | /* sleeps upto a single latency don't count. */ | 512 | /* sleeps upto a single latency don't count. */ |
513 | if (sched_feat(NEW_FAIR_SLEEPERS)) { | 513 | if (sched_feat(NEW_FAIR_SLEEPERS)) |
514 | vruntime -= calc_delta_fair(sysctl_sched_latency, | 514 | vruntime -= sysctl_sched_latency; |
515 | &cfs_rq->load); | ||
516 | } | ||
517 | 515 | ||
518 | /* ensure we never gain time by being placed backwards. */ | 516 | /* ensure we never gain time by being placed backwards. */ |
519 | vruntime = max_vruntime(se->vruntime, vruntime); | 517 | vruntime = max_vruntime(se->vruntime, vruntime); |
diff --git a/kernel/uid16.c b/kernel/uid16.c index dd308ba4e03b..3e41c1673e2f 100644 --- a/kernel/uid16.c +++ b/kernel/uid16.c | |||
@@ -21,7 +21,7 @@ asmlinkage long sys_chown16(const char __user * filename, old_uid_t user, old_gi | |||
21 | { | 21 | { |
22 | long ret = sys_chown(filename, low2highuid(user), low2highgid(group)); | 22 | long ret = sys_chown(filename, low2highuid(user), low2highgid(group)); |
23 | /* avoid REGPARM breakage on x86: */ | 23 | /* avoid REGPARM breakage on x86: */ |
24 | prevent_tail_call(ret); | 24 | asmlinkage_protect(3, ret, filename, user, group); |
25 | return ret; | 25 | return ret; |
26 | } | 26 | } |
27 | 27 | ||
@@ -29,7 +29,7 @@ asmlinkage long sys_lchown16(const char __user * filename, old_uid_t user, old_g | |||
29 | { | 29 | { |
30 | long ret = sys_lchown(filename, low2highuid(user), low2highgid(group)); | 30 | long ret = sys_lchown(filename, low2highuid(user), low2highgid(group)); |
31 | /* avoid REGPARM breakage on x86: */ | 31 | /* avoid REGPARM breakage on x86: */ |
32 | prevent_tail_call(ret); | 32 | asmlinkage_protect(3, ret, filename, user, group); |
33 | return ret; | 33 | return ret; |
34 | } | 34 | } |
35 | 35 | ||
@@ -37,7 +37,7 @@ asmlinkage long sys_fchown16(unsigned int fd, old_uid_t user, old_gid_t group) | |||
37 | { | 37 | { |
38 | long ret = sys_fchown(fd, low2highuid(user), low2highgid(group)); | 38 | long ret = sys_fchown(fd, low2highuid(user), low2highgid(group)); |
39 | /* avoid REGPARM breakage on x86: */ | 39 | /* avoid REGPARM breakage on x86: */ |
40 | prevent_tail_call(ret); | 40 | asmlinkage_protect(3, ret, fd, user, group); |
41 | return ret; | 41 | return ret; |
42 | } | 42 | } |
43 | 43 | ||
@@ -45,7 +45,7 @@ asmlinkage long sys_setregid16(old_gid_t rgid, old_gid_t egid) | |||
45 | { | 45 | { |
46 | long ret = sys_setregid(low2highgid(rgid), low2highgid(egid)); | 46 | long ret = sys_setregid(low2highgid(rgid), low2highgid(egid)); |
47 | /* avoid REGPARM breakage on x86: */ | 47 | /* avoid REGPARM breakage on x86: */ |
48 | prevent_tail_call(ret); | 48 | asmlinkage_protect(2, ret, rgid, egid); |
49 | return ret; | 49 | return ret; |
50 | } | 50 | } |
51 | 51 | ||
@@ -53,7 +53,7 @@ asmlinkage long sys_setgid16(old_gid_t gid) | |||
53 | { | 53 | { |
54 | long ret = sys_setgid(low2highgid(gid)); | 54 | long ret = sys_setgid(low2highgid(gid)); |
55 | /* avoid REGPARM breakage on x86: */ | 55 | /* avoid REGPARM breakage on x86: */ |
56 | prevent_tail_call(ret); | 56 | asmlinkage_protect(1, ret, gid); |
57 | return ret; | 57 | return ret; |
58 | } | 58 | } |
59 | 59 | ||
@@ -61,7 +61,7 @@ asmlinkage long sys_setreuid16(old_uid_t ruid, old_uid_t euid) | |||
61 | { | 61 | { |
62 | long ret = sys_setreuid(low2highuid(ruid), low2highuid(euid)); | 62 | long ret = sys_setreuid(low2highuid(ruid), low2highuid(euid)); |
63 | /* avoid REGPARM breakage on x86: */ | 63 | /* avoid REGPARM breakage on x86: */ |
64 | prevent_tail_call(ret); | 64 | asmlinkage_protect(2, ret, ruid, euid); |
65 | return ret; | 65 | return ret; |
66 | } | 66 | } |
67 | 67 | ||
@@ -69,7 +69,7 @@ asmlinkage long sys_setuid16(old_uid_t uid) | |||
69 | { | 69 | { |
70 | long ret = sys_setuid(low2highuid(uid)); | 70 | long ret = sys_setuid(low2highuid(uid)); |
71 | /* avoid REGPARM breakage on x86: */ | 71 | /* avoid REGPARM breakage on x86: */ |
72 | prevent_tail_call(ret); | 72 | asmlinkage_protect(1, ret, uid); |
73 | return ret; | 73 | return ret; |
74 | } | 74 | } |
75 | 75 | ||
@@ -78,7 +78,7 @@ asmlinkage long sys_setresuid16(old_uid_t ruid, old_uid_t euid, old_uid_t suid) | |||
78 | long ret = sys_setresuid(low2highuid(ruid), low2highuid(euid), | 78 | long ret = sys_setresuid(low2highuid(ruid), low2highuid(euid), |
79 | low2highuid(suid)); | 79 | low2highuid(suid)); |
80 | /* avoid REGPARM breakage on x86: */ | 80 | /* avoid REGPARM breakage on x86: */ |
81 | prevent_tail_call(ret); | 81 | asmlinkage_protect(3, ret, ruid, euid, suid); |
82 | return ret; | 82 | return ret; |
83 | } | 83 | } |
84 | 84 | ||
@@ -98,7 +98,7 @@ asmlinkage long sys_setresgid16(old_gid_t rgid, old_gid_t egid, old_gid_t sgid) | |||
98 | long ret = sys_setresgid(low2highgid(rgid), low2highgid(egid), | 98 | long ret = sys_setresgid(low2highgid(rgid), low2highgid(egid), |
99 | low2highgid(sgid)); | 99 | low2highgid(sgid)); |
100 | /* avoid REGPARM breakage on x86: */ | 100 | /* avoid REGPARM breakage on x86: */ |
101 | prevent_tail_call(ret); | 101 | asmlinkage_protect(3, ret, rgid, egid, sgid); |
102 | return ret; | 102 | return ret; |
103 | } | 103 | } |
104 | 104 | ||
@@ -117,7 +117,7 @@ asmlinkage long sys_setfsuid16(old_uid_t uid) | |||
117 | { | 117 | { |
118 | long ret = sys_setfsuid(low2highuid(uid)); | 118 | long ret = sys_setfsuid(low2highuid(uid)); |
119 | /* avoid REGPARM breakage on x86: */ | 119 | /* avoid REGPARM breakage on x86: */ |
120 | prevent_tail_call(ret); | 120 | asmlinkage_protect(1, ret, uid); |
121 | return ret; | 121 | return ret; |
122 | } | 122 | } |
123 | 123 | ||
@@ -125,7 +125,7 @@ asmlinkage long sys_setfsgid16(old_gid_t gid) | |||
125 | { | 125 | { |
126 | long ret = sys_setfsgid(low2highgid(gid)); | 126 | long ret = sys_setfsgid(low2highgid(gid)); |
127 | /* avoid REGPARM breakage on x86: */ | 127 | /* avoid REGPARM breakage on x86: */ |
128 | prevent_tail_call(ret); | 128 | asmlinkage_protect(1, ret, gid); |
129 | return ret; | 129 | return ret; |
130 | } | 130 | } |
131 | 131 | ||
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c index 9dc7056e5520..77f0f9b775a9 100644 --- a/lib/lzo/lzo1x_decompress.c +++ b/lib/lzo/lzo1x_decompress.c | |||
@@ -158,7 +158,7 @@ match: | |||
158 | t += 7 + *ip++; | 158 | t += 7 + *ip++; |
159 | } | 159 | } |
160 | m_pos -= le16_to_cpu(get_unaligned( | 160 | m_pos -= le16_to_cpu(get_unaligned( |
161 | (const unsigned short *)ip) >> 2); | 161 | (const unsigned short *)ip)) >> 2; |
162 | ip += 2; | 162 | ip += 2; |
163 | if (m_pos == op) | 163 | if (m_pos == op) |
164 | goto eof_found; | 164 | goto eof_found; |
diff --git a/lib/random32.c b/lib/random32.c index ec7f81d3fb18..ca87d86992bd 100644 --- a/lib/random32.c +++ b/lib/random32.c | |||
@@ -97,13 +97,18 @@ EXPORT_SYMBOL(random32); | |||
97 | * @seed: seed value | 97 | * @seed: seed value |
98 | * | 98 | * |
99 | * Add some additional seeding to the random32() pool. | 99 | * Add some additional seeding to the random32() pool. |
100 | * Note: this pool is per cpu so it only affects current CPU. | ||
101 | */ | 100 | */ |
102 | void srandom32(u32 entropy) | 101 | void srandom32(u32 entropy) |
103 | { | 102 | { |
104 | struct rnd_state *state = &get_cpu_var(net_rand_state); | 103 | int i; |
105 | __set_random32(state, state->s1 ^ entropy); | 104 | /* |
106 | put_cpu_var(state); | 105 | * No locking on the CPUs, but then somewhat random results are, well, |
106 | * expected. | ||
107 | */ | ||
108 | for_each_possible_cpu (i) { | ||
109 | struct rnd_state *state = &per_cpu(net_rand_state, i); | ||
110 | __set_random32(state, state->s1 ^ entropy); | ||
111 | } | ||
107 | } | 112 | } |
108 | EXPORT_SYMBOL(srandom32); | 113 | EXPORT_SYMBOL(srandom32); |
109 | 114 | ||
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9b648bd63451..2e0bfc93484b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -533,6 +533,9 @@ static int mem_cgroup_charge_common(struct page *page, struct mm_struct *mm, | |||
533 | unsigned long nr_retries = MEM_CGROUP_RECLAIM_RETRIES; | 533 | unsigned long nr_retries = MEM_CGROUP_RECLAIM_RETRIES; |
534 | struct mem_cgroup_per_zone *mz; | 534 | struct mem_cgroup_per_zone *mz; |
535 | 535 | ||
536 | if (mem_cgroup_subsys.disabled) | ||
537 | return 0; | ||
538 | |||
536 | /* | 539 | /* |
537 | * Should page_cgroup's go to their own slab? | 540 | * Should page_cgroup's go to their own slab? |
538 | * One could optimize the performance of the charging routine | 541 | * One could optimize the performance of the charging routine |
@@ -665,6 +668,9 @@ void mem_cgroup_uncharge_page(struct page *page) | |||
665 | struct mem_cgroup_per_zone *mz; | 668 | struct mem_cgroup_per_zone *mz; |
666 | unsigned long flags; | 669 | unsigned long flags; |
667 | 670 | ||
671 | if (mem_cgroup_subsys.disabled) | ||
672 | return; | ||
673 | |||
668 | /* | 674 | /* |
669 | * Check if our page_cgroup is valid | 675 | * Check if our page_cgroup is valid |
670 | */ | 676 | */ |
@@ -705,6 +711,9 @@ int mem_cgroup_prepare_migration(struct page *page) | |||
705 | { | 711 | { |
706 | struct page_cgroup *pc; | 712 | struct page_cgroup *pc; |
707 | 713 | ||
714 | if (mem_cgroup_subsys.disabled) | ||
715 | return 0; | ||
716 | |||
708 | lock_page_cgroup(page); | 717 | lock_page_cgroup(page); |
709 | pc = page_get_page_cgroup(page); | 718 | pc = page_get_page_cgroup(page); |
710 | if (pc) | 719 | if (pc) |
@@ -803,6 +812,9 @@ static int mem_cgroup_force_empty(struct mem_cgroup *mem) | |||
803 | int ret = -EBUSY; | 812 | int ret = -EBUSY; |
804 | int node, zid; | 813 | int node, zid; |
805 | 814 | ||
815 | if (mem_cgroup_subsys.disabled) | ||
816 | return 0; | ||
817 | |||
806 | css_get(&mem->css); | 818 | css_get(&mem->css); |
807 | /* | 819 | /* |
808 | * page reclaim code (kswapd etc..) will move pages between | 820 | * page reclaim code (kswapd etc..) will move pages between |
@@ -966,7 +978,7 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node) | |||
966 | { | 978 | { |
967 | struct mem_cgroup_per_node *pn; | 979 | struct mem_cgroup_per_node *pn; |
968 | struct mem_cgroup_per_zone *mz; | 980 | struct mem_cgroup_per_zone *mz; |
969 | int zone; | 981 | int zone, tmp = node; |
970 | /* | 982 | /* |
971 | * This routine is called against possible nodes. | 983 | * This routine is called against possible nodes. |
972 | * But it's BUG to call kmalloc() against offline node. | 984 | * But it's BUG to call kmalloc() against offline node. |
@@ -975,10 +987,9 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node) | |||
975 | * never be onlined. It's better to use memory hotplug callback | 987 | * never be onlined. It's better to use memory hotplug callback |
976 | * function. | 988 | * function. |
977 | */ | 989 | */ |
978 | if (node_state(node, N_HIGH_MEMORY)) | 990 | if (!node_state(node, N_NORMAL_MEMORY)) |
979 | pn = kmalloc_node(sizeof(*pn), GFP_KERNEL, node); | 991 | tmp = -1; |
980 | else | 992 | pn = kmalloc_node(sizeof(*pn), GFP_KERNEL, tmp); |
981 | pn = kmalloc(sizeof(*pn), GFP_KERNEL); | ||
982 | if (!pn) | 993 | if (!pn) |
983 | return 1; | 994 | return 1; |
984 | 995 | ||
@@ -1053,6 +1064,8 @@ static void mem_cgroup_destroy(struct cgroup_subsys *ss, | |||
1053 | static int mem_cgroup_populate(struct cgroup_subsys *ss, | 1064 | static int mem_cgroup_populate(struct cgroup_subsys *ss, |
1054 | struct cgroup *cont) | 1065 | struct cgroup *cont) |
1055 | { | 1066 | { |
1067 | if (mem_cgroup_subsys.disabled) | ||
1068 | return 0; | ||
1056 | return cgroup_add_files(cont, ss, mem_cgroup_files, | 1069 | return cgroup_add_files(cont, ss, mem_cgroup_files, |
1057 | ARRAY_SIZE(mem_cgroup_files)); | 1070 | ARRAY_SIZE(mem_cgroup_files)); |
1058 | } | 1071 | } |
@@ -1065,6 +1078,9 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss, | |||
1065 | struct mm_struct *mm; | 1078 | struct mm_struct *mm; |
1066 | struct mem_cgroup *mem, *old_mem; | 1079 | struct mem_cgroup *mem, *old_mem; |
1067 | 1080 | ||
1081 | if (mem_cgroup_subsys.disabled) | ||
1082 | return; | ||
1083 | |||
1068 | mm = get_task_mm(p); | 1084 | mm = get_task_mm(p); |
1069 | if (mm == NULL) | 1085 | if (mm == NULL) |
1070 | return; | 1086 | return; |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 480ea90e7dcd..41a76a05e6fd 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -692,6 +692,20 @@ static int vlan_dev_init(struct net_device *dev) | |||
692 | return 0; | 692 | return 0; |
693 | } | 693 | } |
694 | 694 | ||
695 | static void vlan_dev_uninit(struct net_device *dev) | ||
696 | { | ||
697 | struct vlan_priority_tci_mapping *pm; | ||
698 | struct vlan_dev_info *vlan = vlan_dev_info(dev); | ||
699 | int i; | ||
700 | |||
701 | for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) { | ||
702 | while ((pm = vlan->egress_priority_map[i]) != NULL) { | ||
703 | vlan->egress_priority_map[i] = pm->next; | ||
704 | kfree(pm); | ||
705 | } | ||
706 | } | ||
707 | } | ||
708 | |||
695 | void vlan_setup(struct net_device *dev) | 709 | void vlan_setup(struct net_device *dev) |
696 | { | 710 | { |
697 | ether_setup(dev); | 711 | ether_setup(dev); |
@@ -701,6 +715,7 @@ void vlan_setup(struct net_device *dev) | |||
701 | 715 | ||
702 | dev->change_mtu = vlan_dev_change_mtu; | 716 | dev->change_mtu = vlan_dev_change_mtu; |
703 | dev->init = vlan_dev_init; | 717 | dev->init = vlan_dev_init; |
718 | dev->uninit = vlan_dev_uninit; | ||
704 | dev->open = vlan_dev_open; | 719 | dev->open = vlan_dev_open; |
705 | dev->stop = vlan_dev_stop; | 720 | dev->stop = vlan_dev_stop; |
706 | dev->set_mac_address = vlan_dev_set_mac_address; | 721 | dev->set_mac_address = vlan_dev_set_mac_address; |
diff --git a/net/atm/lec.c b/net/atm/lec.c index a2efa7ff41f1..3235c57615e4 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -266,7 +266,6 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
266 | char buf[300]; | 266 | char buf[300]; |
267 | int i = 0; | 267 | int i = 0; |
268 | #endif /* DUMP_PACKETS >0 */ | 268 | #endif /* DUMP_PACKETS >0 */ |
269 | DECLARE_MAC_BUF(mac); | ||
270 | 269 | ||
271 | pr_debug("lec_start_xmit called\n"); | 270 | pr_debug("lec_start_xmit called\n"); |
272 | if (!priv->lecd) { | 271 | if (!priv->lecd) { |
@@ -374,15 +373,19 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
374 | if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) { | 373 | if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) { |
375 | pr_debug("%s:lec_start_xmit: queuing packet, ", | 374 | pr_debug("%s:lec_start_xmit: queuing packet, ", |
376 | dev->name); | 375 | dev->name); |
377 | pr_debug("MAC address %s\n", | 376 | pr_debug("MAC address " MAC_FMT "\n", |
378 | print_mac(mac, lec_h->h_dest)); | 377 | lec_h->h_dest[0], lec_h->h_dest[1], |
378 | lec_h->h_dest[2], lec_h->h_dest[3], | ||
379 | lec_h->h_dest[4], lec_h->h_dest[5]); | ||
379 | skb_queue_tail(&entry->tx_wait, skb); | 380 | skb_queue_tail(&entry->tx_wait, skb); |
380 | } else { | 381 | } else { |
381 | pr_debug | 382 | pr_debug |
382 | ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ", | 383 | ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ", |
383 | dev->name); | 384 | dev->name); |
384 | pr_debug("MAC address %s\n", | 385 | pr_debug("MAC address " MAC_FMT "\n", |
385 | print_mac(mac, lec_h->h_dest)); | 386 | lec_h->h_dest[0], lec_h->h_dest[1], |
387 | lec_h->h_dest[2], lec_h->h_dest[3], | ||
388 | lec_h->h_dest[4], lec_h->h_dest[5]); | ||
386 | priv->stats.tx_dropped++; | 389 | priv->stats.tx_dropped++; |
387 | dev_kfree_skb(skb); | 390 | dev_kfree_skb(skb); |
388 | } | 391 | } |
@@ -394,8 +397,10 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
394 | 397 | ||
395 | while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) { | 398 | while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) { |
396 | pr_debug("lec.c: emptying tx queue, "); | 399 | pr_debug("lec.c: emptying tx queue, "); |
397 | pr_debug("MAC address %s\n", | 400 | pr_debug("MAC address " MAC_FMT "\n", |
398 | print_mac(mac, lec_h->h_dest)); | 401 | lec_h->h_dest[0], lec_h->h_dest[1], |
402 | lec_h->h_dest[2], lec_h->h_dest[3], | ||
403 | lec_h->h_dest[4], lec_h->h_dest[5]); | ||
399 | lec_send(vcc, skb2, priv); | 404 | lec_send(vcc, skb2, priv); |
400 | } | 405 | } |
401 | 406 | ||
@@ -449,7 +454,6 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) | |||
449 | struct lec_arp_table *entry; | 454 | struct lec_arp_table *entry; |
450 | int i; | 455 | int i; |
451 | char *tmp; /* FIXME */ | 456 | char *tmp; /* FIXME */ |
452 | DECLARE_MAC_BUF(mac); | ||
453 | 457 | ||
454 | atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); | 458 | atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); |
455 | mesg = (struct atmlec_msg *)skb->data; | 459 | mesg = (struct atmlec_msg *)skb->data; |
@@ -536,9 +540,14 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) | |||
536 | struct net_bridge_fdb_entry *f; | 540 | struct net_bridge_fdb_entry *f; |
537 | 541 | ||
538 | pr_debug | 542 | pr_debug |
539 | ("%s: bridge zeppelin asks about %s\n", | 543 | ("%s: bridge zeppelin asks about " MAC_FMT "\n", |
540 | dev->name, | 544 | dev->name, |
541 | print_mac(mac, mesg->content.proxy.mac_addr)); | 545 | mesg->content.proxy.mac_addr[0], |
546 | mesg->content.proxy.mac_addr[1], | ||
547 | mesg->content.proxy.mac_addr[2], | ||
548 | mesg->content.proxy.mac_addr[3], | ||
549 | mesg->content.proxy.mac_addr[4], | ||
550 | mesg->content.proxy.mac_addr[5]); | ||
542 | 551 | ||
543 | if (br_fdb_get_hook == NULL || dev->br_port == NULL) | 552 | if (br_fdb_get_hook == NULL || dev->br_port == NULL) |
544 | break; | 553 | break; |
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index 5f4eb73fb9d3..57aeba729bae 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c | |||
@@ -218,9 +218,11 @@ void __exit ax25_uid_free(void) | |||
218 | struct hlist_node *node; | 218 | struct hlist_node *node; |
219 | 219 | ||
220 | write_lock(&ax25_uid_lock); | 220 | write_lock(&ax25_uid_lock); |
221 | again: | ||
221 | ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { | 222 | ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { |
222 | hlist_del_init(&ax25_uid->uid_node); | 223 | hlist_del_init(&ax25_uid->uid_node); |
223 | ax25_uid_put(ax25_uid); | 224 | ax25_uid_put(ax25_uid); |
225 | goto again; | ||
224 | } | 226 | } |
225 | write_unlock(&ax25_uid_lock); | 227 | write_unlock(&ax25_uid_lock); |
226 | } | 228 | } |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 1c0efd8ad9f3..af7e8be8d8d2 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -110,7 +110,8 @@ static inline __be16 pppoe_proto(const struct sk_buff *skb) | |||
110 | * ipt_REJECT needs it. Future netfilter modules might | 110 | * ipt_REJECT needs it. Future netfilter modules might |
111 | * require us to fill additional fields. */ | 111 | * require us to fill additional fields. */ |
112 | static struct net_device __fake_net_device = { | 112 | static struct net_device __fake_net_device = { |
113 | .hard_header_len = ETH_HLEN | 113 | .hard_header_len = ETH_HLEN, |
114 | .nd_net = &init_net, | ||
114 | }; | 115 | }; |
115 | 116 | ||
116 | static struct rtable __fake_rtable = { | 117 | static struct rtable __fake_rtable = { |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 0d0fd28a9041..608701339620 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -2131,8 +2131,8 @@ EXPORT_SYMBOL_GPL(skb_pull_rcsum); | |||
2131 | * @features: features for the output path (see dev->features) | 2131 | * @features: features for the output path (see dev->features) |
2132 | * | 2132 | * |
2133 | * This function performs segmentation on the given skb. It returns | 2133 | * This function performs segmentation on the given skb. It returns |
2134 | * the segment at the given position. It returns NULL if there are | 2134 | * a pointer to the first in a list of new skbs for the segments. |
2135 | * no more segments to generate, or when an error is encountered. | 2135 | * In case of error it returns ERR_PTR(err). |
2136 | */ | 2136 | */ |
2137 | struct sk_buff *skb_segment(struct sk_buff *skb, int features) | 2137 | struct sk_buff *skb_segment(struct sk_buff *skb, int features) |
2138 | { | 2138 | { |
diff --git a/net/core/sock.c b/net/core/sock.c index 2654c147c004..7a0567b4b2c9 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1725,7 +1725,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) | |||
1725 | sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; | 1725 | sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; |
1726 | sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; | 1726 | sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; |
1727 | 1727 | ||
1728 | sk->sk_stamp = ktime_set(-1L, -1L); | 1728 | sk->sk_stamp = ktime_set(-1L, 0); |
1729 | 1729 | ||
1730 | atomic_set(&sk->sk_refcnt, 1); | 1730 | atomic_set(&sk->sk_refcnt, 1); |
1731 | atomic_set(&sk->sk_drops, 0); | 1731 | atomic_set(&sk->sk_drops, 0); |
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 287a62bc2e0f..ba2ef94a2302 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
@@ -325,6 +325,12 @@ static inline int dccp_bad_service_code(const struct sock *sk, | |||
325 | * This is used for transmission as well as for reception. | 325 | * This is used for transmission as well as for reception. |
326 | */ | 326 | */ |
327 | struct dccp_skb_cb { | 327 | struct dccp_skb_cb { |
328 | union { | ||
329 | struct inet_skb_parm h4; | ||
330 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | ||
331 | struct inet6_skb_parm h6; | ||
332 | #endif | ||
333 | } header; | ||
328 | __u8 dccpd_type:4; | 334 | __u8 dccpd_type:4; |
329 | __u8 dccpd_ccval:4; | 335 | __u8 dccpd_ccval:4; |
330 | __u8 dccpd_reset_code, | 336 | __u8 dccpd_reset_code, |
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 474075adbde4..b33704415555 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -489,7 +489,6 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req, | |||
489 | 489 | ||
490 | dh->dccph_checksum = dccp_v4_csum_finish(skb, ireq->loc_addr, | 490 | dh->dccph_checksum = dccp_v4_csum_finish(skb, ireq->loc_addr, |
491 | ireq->rmt_addr); | 491 | ireq->rmt_addr); |
492 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); | ||
493 | err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, | 492 | err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr, |
494 | ireq->rmt_addr, | 493 | ireq->rmt_addr, |
495 | ireq->opt); | 494 | ireq->opt); |
diff --git a/net/dccp/output.c b/net/dccp/output.c index 3b763db3d863..3d7d628d870d 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -126,7 +126,6 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) | |||
126 | 126 | ||
127 | DCCP_INC_STATS(DCCP_MIB_OUTSEGS); | 127 | DCCP_INC_STATS(DCCP_MIB_OUTSEGS); |
128 | 128 | ||
129 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); | ||
130 | err = icsk->icsk_af_ops->queue_xmit(skb, 0); | 129 | err = icsk->icsk_af_ops->queue_xmit(skb, 0); |
131 | return net_xmit_eval(err); | 130 | return net_xmit_eval(err); |
132 | } | 131 | } |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index e3f5d37b84be..c91d3c1fd30d 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -1057,6 +1057,9 @@ static int __init dccp_init(void) | |||
1057 | int ehash_order, bhash_order, i; | 1057 | int ehash_order, bhash_order, i; |
1058 | int rc = -ENOBUFS; | 1058 | int rc = -ENOBUFS; |
1059 | 1059 | ||
1060 | BUILD_BUG_ON(sizeof(struct dccp_skb_cb) > | ||
1061 | FIELD_SIZEOF(struct sk_buff, cb)); | ||
1062 | |||
1060 | dccp_hashinfo.bind_bucket_cachep = | 1063 | dccp_hashinfo.bind_bucket_cachep = |
1061 | kmem_cache_create("dccp_bind_bucket", | 1064 | kmem_cache_create("dccp_bind_bucket", |
1062 | sizeof(struct inet_bind_bucket), 0, | 1065 | sizeof(struct inet_bind_bucket), 0, |
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index a7b417523e9b..a80839b02e3f 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
@@ -301,7 +301,7 @@ static int eth_change_mtu(struct net_device *dev, int new_mtu) | |||
301 | static int eth_validate_addr(struct net_device *dev) | 301 | static int eth_validate_addr(struct net_device *dev) |
302 | { | 302 | { |
303 | if (!is_valid_ether_addr(dev->dev_addr)) | 303 | if (!is_valid_ether_addr(dev->dev_addr)) |
304 | return -EINVAL; | 304 | return -EADDRNOTAVAIL; |
305 | 305 | ||
306 | return 0; | 306 | return 0; |
307 | } | 307 | } |
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 1e3f87c8c012..200ee1e63728 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -271,7 +271,6 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
271 | { | 271 | { |
272 | struct ieee80211_hdr_3addr *hdr; | 272 | struct ieee80211_hdr_3addr *hdr; |
273 | int res, hdrlen; | 273 | int res, hdrlen; |
274 | DECLARE_MAC_BUF(mac); | ||
275 | 274 | ||
276 | if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) | 275 | if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) |
277 | return 0; | 276 | return 0; |
@@ -283,8 +282,12 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
283 | res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); | 282 | res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); |
284 | atomic_dec(&crypt->refcnt); | 283 | atomic_dec(&crypt->refcnt); |
285 | if (res < 0) { | 284 | if (res < 0) { |
286 | IEEE80211_DEBUG_DROP("decryption failed (SA=%s" | 285 | IEEE80211_DEBUG_DROP("decryption failed (SA=" MAC_FMT |
287 | ") res=%d\n", print_mac(mac, hdr->addr2), res); | 286 | ") res=%d\n", |
287 | hdr->addr2[0], hdr->addr2[1], | ||
288 | hdr->addr2[2], hdr->addr2[3], | ||
289 | hdr->addr2[4], hdr->addr2[5], | ||
290 | res); | ||
288 | if (res == -2) | 291 | if (res == -2) |
289 | IEEE80211_DEBUG_DROP("Decryption failed ICV " | 292 | IEEE80211_DEBUG_DROP("Decryption failed ICV " |
290 | "mismatch (key %d)\n", | 293 | "mismatch (key %d)\n", |
@@ -304,7 +307,6 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, | |||
304 | { | 307 | { |
305 | struct ieee80211_hdr_3addr *hdr; | 308 | struct ieee80211_hdr_3addr *hdr; |
306 | int res, hdrlen; | 309 | int res, hdrlen; |
307 | DECLARE_MAC_BUF(mac); | ||
308 | 310 | ||
309 | if (crypt == NULL || crypt->ops->decrypt_msdu == NULL) | 311 | if (crypt == NULL || crypt->ops->decrypt_msdu == NULL) |
310 | return 0; | 312 | return 0; |
@@ -317,8 +319,12 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, | |||
317 | atomic_dec(&crypt->refcnt); | 319 | atomic_dec(&crypt->refcnt); |
318 | if (res < 0) { | 320 | if (res < 0) { |
319 | printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed" | 321 | printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed" |
320 | " (SA=%s keyidx=%d)\n", | 322 | " (SA=" MAC_FMT " keyidx=%d)\n", |
321 | ieee->dev->name, print_mac(mac, hdr->addr2), keyidx); | 323 | ieee->dev->name, |
324 | hdr->addr2[0], hdr->addr2[1], | ||
325 | hdr->addr2[2], hdr->addr2[3], | ||
326 | hdr->addr2[4], hdr->addr2[5], | ||
327 | keyidx); | ||
322 | return -1; | 328 | return -1; |
323 | } | 329 | } |
324 | 330 | ||
@@ -462,8 +468,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
462 | * frames silently instead of filling system log with | 468 | * frames silently instead of filling system log with |
463 | * these reports. */ | 469 | * these reports. */ |
464 | IEEE80211_DEBUG_DROP("Decryption failed (not set)" | 470 | IEEE80211_DEBUG_DROP("Decryption failed (not set)" |
465 | " (SA=%s)\n", | 471 | " (SA=" MAC_FMT ")\n", |
466 | print_mac(mac, hdr->addr2)); | 472 | hdr->addr2[0], hdr->addr2[1], |
473 | hdr->addr2[2], hdr->addr2[3], | ||
474 | hdr->addr2[4], hdr->addr2[5]); | ||
467 | ieee->ieee_stats.rx_discards_undecryptable++; | 475 | ieee->ieee_stats.rx_discards_undecryptable++; |
468 | goto rx_dropped; | 476 | goto rx_dropped; |
469 | } | 477 | } |
@@ -474,8 +482,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
474 | fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt && | 482 | fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt && |
475 | (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) { | 483 | (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) { |
476 | printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " | 484 | printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " |
477 | "from %s\n", dev->name, | 485 | "from " MAC_FMT "\n", dev->name, |
478 | print_mac(mac, hdr->addr2)); | 486 | hdr->addr2[0], hdr->addr2[1], |
487 | hdr->addr2[2], hdr->addr2[3], | ||
488 | hdr->addr2[4], hdr->addr2[5]); | ||
479 | /* TODO: could inform hostapd about this so that it | 489 | /* TODO: could inform hostapd about this so that it |
480 | * could send auth failure report */ | 490 | * could send auth failure report */ |
481 | goto rx_dropped; | 491 | goto rx_dropped; |
@@ -653,8 +663,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
653 | * configured */ | 663 | * configured */ |
654 | } else { | 664 | } else { |
655 | IEEE80211_DEBUG_DROP("encryption configured, but RX " | 665 | IEEE80211_DEBUG_DROP("encryption configured, but RX " |
656 | "frame not encrypted (SA=%s" | 666 | "frame not encrypted (SA=" |
657 | ")\n", print_mac(mac, hdr->addr2)); | 667 | MAC_FMT ")\n", |
668 | hdr->addr2[0], hdr->addr2[1], | ||
669 | hdr->addr2[2], hdr->addr2[3], | ||
670 | hdr->addr2[4], hdr->addr2[5]); | ||
658 | goto rx_dropped; | 671 | goto rx_dropped; |
659 | } | 672 | } |
660 | } | 673 | } |
@@ -662,9 +675,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
662 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep && | 675 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep && |
663 | !ieee80211_is_eapol_frame(ieee, skb)) { | 676 | !ieee80211_is_eapol_frame(ieee, skb)) { |
664 | IEEE80211_DEBUG_DROP("dropped unencrypted RX data " | 677 | IEEE80211_DEBUG_DROP("dropped unencrypted RX data " |
665 | "frame from %s" | 678 | "frame from " MAC_FMT |
666 | " (drop_unencrypted=1)\n", | 679 | " (drop_unencrypted=1)\n", |
667 | print_mac(mac, hdr->addr2)); | 680 | hdr->addr2[0], hdr->addr2[1], |
681 | hdr->addr2[2], hdr->addr2[3], | ||
682 | hdr->addr2[4], hdr->addr2[5]); | ||
668 | goto rx_dropped; | 683 | goto rx_dropped; |
669 | } | 684 | } |
670 | 685 | ||
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 9c7e5ffb223d..4670683b4688 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -160,7 +160,7 @@ config IP_PNP_DHCP | |||
160 | 160 | ||
161 | If unsure, say Y. Note that if you want to use DHCP, a DHCP server | 161 | If unsure, say Y. Note that if you want to use DHCP, a DHCP server |
162 | must be operating on your network. Read | 162 | must be operating on your network. Read |
163 | <file:Documentation/nfsroot.txt> for details. | 163 | <file:Documentation/filesystems/nfsroot.txt> for details. |
164 | 164 | ||
165 | config IP_PNP_BOOTP | 165 | config IP_PNP_BOOTP |
166 | bool "IP: BOOTP support" | 166 | bool "IP: BOOTP support" |
@@ -175,7 +175,7 @@ config IP_PNP_BOOTP | |||
175 | does BOOTP itself, providing all necessary information on the kernel | 175 | does BOOTP itself, providing all necessary information on the kernel |
176 | command line, you can say N here. If unsure, say Y. Note that if you | 176 | command line, you can say N here. If unsure, say Y. Note that if you |
177 | want to use BOOTP, a BOOTP server must be operating on your network. | 177 | want to use BOOTP, a BOOTP server must be operating on your network. |
178 | Read <file:Documentation/nfsroot.txt> for details. | 178 | Read <file:Documentation/filesystems/nfsroot.txt> for details. |
179 | 179 | ||
180 | config IP_PNP_RARP | 180 | config IP_PNP_RARP |
181 | bool "IP: RARP support" | 181 | bool "IP: RARP support" |
@@ -187,8 +187,8 @@ config IP_PNP_RARP | |||
187 | discovered automatically at boot time using the RARP protocol (an | 187 | discovered automatically at boot time using the RARP protocol (an |
188 | older protocol which is being obsoleted by BOOTP and DHCP), say Y | 188 | older protocol which is being obsoleted by BOOTP and DHCP), say Y |
189 | here. Note that if you want to use RARP, a RARP server must be | 189 | here. Note that if you want to use RARP, a RARP server must be |
190 | operating on your network. Read <file:Documentation/nfsroot.txt> for | 190 | operating on your network. Read |
191 | details. | 191 | <file:Documentation/filesystems/nfsroot.txt> for details. |
192 | 192 | ||
193 | # not yet ready.. | 193 | # not yet ready.. |
194 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP | 194 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP |
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index a944e8053e28..40508babad8c 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -591,7 +591,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
591 | } | 591 | } |
592 | 592 | ||
593 | if (xfrm_decode_session_reverse(skb_in, &fl, AF_INET)) | 593 | if (xfrm_decode_session_reverse(skb_in, &fl, AF_INET)) |
594 | goto ende; | 594 | goto relookup_failed; |
595 | 595 | ||
596 | if (inet_addr_type(net, fl.fl4_src) == RTN_LOCAL) | 596 | if (inet_addr_type(net, fl.fl4_src) == RTN_LOCAL) |
597 | err = __ip_route_output_key(net, &rt2, &fl); | 597 | err = __ip_route_output_key(net, &rt2, &fl); |
@@ -601,7 +601,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
601 | 601 | ||
602 | fl2.fl4_dst = fl.fl4_src; | 602 | fl2.fl4_dst = fl.fl4_src; |
603 | if (ip_route_output_key(net, &rt2, &fl2)) | 603 | if (ip_route_output_key(net, &rt2, &fl2)) |
604 | goto ende; | 604 | goto relookup_failed; |
605 | 605 | ||
606 | /* Ugh! */ | 606 | /* Ugh! */ |
607 | odst = skb_in->dst; | 607 | odst = skb_in->dst; |
@@ -614,21 +614,23 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
614 | } | 614 | } |
615 | 615 | ||
616 | if (err) | 616 | if (err) |
617 | goto ende; | 617 | goto relookup_failed; |
618 | 618 | ||
619 | err = xfrm_lookup((struct dst_entry **)&rt2, &fl, NULL, | 619 | err = xfrm_lookup((struct dst_entry **)&rt2, &fl, NULL, |
620 | XFRM_LOOKUP_ICMP); | 620 | XFRM_LOOKUP_ICMP); |
621 | if (err == -ENOENT) { | 621 | switch (err) { |
622 | case 0: | ||
623 | dst_release(&rt->u.dst); | ||
624 | rt = rt2; | ||
625 | break; | ||
626 | case -EPERM: | ||
627 | goto ende; | ||
628 | default: | ||
629 | relookup_failed: | ||
622 | if (!rt) | 630 | if (!rt) |
623 | goto out_unlock; | 631 | goto out_unlock; |
624 | goto route_done; | 632 | break; |
625 | } | 633 | } |
626 | |||
627 | dst_release(&rt->u.dst); | ||
628 | rt = rt2; | ||
629 | |||
630 | if (err) | ||
631 | goto out_unlock; | ||
632 | } | 634 | } |
633 | 635 | ||
634 | route_done: | 636 | route_done: |
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index 876169f3a528..717c411a5c6b 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c | |||
@@ -124,6 +124,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat | |||
124 | tw->tw_hash = sk->sk_hash; | 124 | tw->tw_hash = sk->sk_hash; |
125 | tw->tw_ipv6only = 0; | 125 | tw->tw_ipv6only = 0; |
126 | tw->tw_prot = sk->sk_prot_creator; | 126 | tw->tw_prot = sk->sk_prot_creator; |
127 | tw->tw_net = sk->sk_net; | ||
127 | atomic_set(&tw->tw_refcnt, 1); | 128 | atomic_set(&tw->tw_refcnt, 1); |
128 | inet_twsk_dead_node_init(tw); | 129 | inet_twsk_dead_node_init(tw); |
129 | __module_get(tw->tw_prot->owner); | 130 | __module_get(tw->tw_prot->owner); |
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index f72457b4b0a7..c2921d01e925 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -1132,7 +1132,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, | |||
1132 | } | 1132 | } |
1133 | release_sock(sk); | 1133 | release_sock(sk); |
1134 | 1134 | ||
1135 | if (len < sizeof(int) && len > 0 && val>=0 && val<255) { | 1135 | if (len < sizeof(int) && len > 0 && val>=0 && val<=255) { |
1136 | unsigned char ucval = (unsigned char)val; | 1136 | unsigned char ucval = (unsigned char)val; |
1137 | len = 1; | 1137 | len = 1; |
1138 | if (put_user(len, optlen)) | 1138 | if (put_user(len, optlen)) |
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 7c992fbbc2c3..4824fe8996bf 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -1411,7 +1411,7 @@ late_initcall(ip_auto_config); | |||
1411 | 1411 | ||
1412 | /* | 1412 | /* |
1413 | * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel | 1413 | * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel |
1414 | * command line parameter. See Documentation/nfsroot.txt. | 1414 | * command line parameter. See Documentation/filesystems/nfsroot.txt. |
1415 | */ | 1415 | */ |
1416 | static int __init ic_proto_name(char *name) | 1416 | static int __init ic_proto_name(char *name) |
1417 | { | 1417 | { |
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index 52926c8e3cc1..a12dd329e208 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c | |||
@@ -82,8 +82,8 @@ clusterip_config_put(struct clusterip_config *c) | |||
82 | static inline void | 82 | static inline void |
83 | clusterip_config_entry_put(struct clusterip_config *c) | 83 | clusterip_config_entry_put(struct clusterip_config *c) |
84 | { | 84 | { |
85 | write_lock_bh(&clusterip_lock); | ||
85 | if (atomic_dec_and_test(&c->entries)) { | 86 | if (atomic_dec_and_test(&c->entries)) { |
86 | write_lock_bh(&clusterip_lock); | ||
87 | list_del(&c->list); | 87 | list_del(&c->list); |
88 | write_unlock_bh(&clusterip_lock); | 88 | write_unlock_bh(&clusterip_lock); |
89 | 89 | ||
@@ -96,7 +96,9 @@ clusterip_config_entry_put(struct clusterip_config *c) | |||
96 | #ifdef CONFIG_PROC_FS | 96 | #ifdef CONFIG_PROC_FS |
97 | remove_proc_entry(c->pde->name, c->pde->parent); | 97 | remove_proc_entry(c->pde->name, c->pde->parent); |
98 | #endif | 98 | #endif |
99 | return; | ||
99 | } | 100 | } |
101 | write_unlock_bh(&clusterip_lock); | ||
100 | } | 102 | } |
101 | 103 | ||
102 | static struct clusterip_config * | 104 | static struct clusterip_config * |
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index 0d5fa3a54d04..36b4e3bb056f 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c | |||
@@ -629,6 +629,8 @@ static int __init nf_nat_init(void) | |||
629 | size_t i; | 629 | size_t i; |
630 | int ret; | 630 | int ret; |
631 | 631 | ||
632 | need_ipv4_conntrack(); | ||
633 | |||
632 | ret = nf_ct_extend_register(&nat_extend); | 634 | ret = nf_ct_extend_register(&nat_extend); |
633 | if (ret < 0) { | 635 | if (ret < 0) { |
634 | printk(KERN_ERR "nf_nat_core: Unable to register extension\n"); | 636 | printk(KERN_ERR "nf_nat_core: Unable to register extension\n"); |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7facdb0f6960..5119856017ab 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1625,13 +1625,11 @@ out: | |||
1625 | return flag; | 1625 | return flag; |
1626 | } | 1626 | } |
1627 | 1627 | ||
1628 | /* If we receive more dupacks than we expected counting segments | 1628 | /* Limits sacked_out so that sum with lost_out isn't ever larger than |
1629 | * in assumption of absent reordering, interpret this as reordering. | 1629 | * packets_out. Returns zero if sacked_out adjustement wasn't necessary. |
1630 | * The only another reason could be bug in receiver TCP. | ||
1631 | */ | 1630 | */ |
1632 | static void tcp_check_reno_reordering(struct sock *sk, const int addend) | 1631 | int tcp_limit_reno_sacked(struct tcp_sock *tp) |
1633 | { | 1632 | { |
1634 | struct tcp_sock *tp = tcp_sk(sk); | ||
1635 | u32 holes; | 1633 | u32 holes; |
1636 | 1634 | ||
1637 | holes = max(tp->lost_out, 1U); | 1635 | holes = max(tp->lost_out, 1U); |
@@ -1639,8 +1637,20 @@ static void tcp_check_reno_reordering(struct sock *sk, const int addend) | |||
1639 | 1637 | ||
1640 | if ((tp->sacked_out + holes) > tp->packets_out) { | 1638 | if ((tp->sacked_out + holes) > tp->packets_out) { |
1641 | tp->sacked_out = tp->packets_out - holes; | 1639 | tp->sacked_out = tp->packets_out - holes; |
1642 | tcp_update_reordering(sk, tp->packets_out + addend, 0); | 1640 | return 1; |
1643 | } | 1641 | } |
1642 | return 0; | ||
1643 | } | ||
1644 | |||
1645 | /* If we receive more dupacks than we expected counting segments | ||
1646 | * in assumption of absent reordering, interpret this as reordering. | ||
1647 | * The only another reason could be bug in receiver TCP. | ||
1648 | */ | ||
1649 | static void tcp_check_reno_reordering(struct sock *sk, const int addend) | ||
1650 | { | ||
1651 | struct tcp_sock *tp = tcp_sk(sk); | ||
1652 | if (tcp_limit_reno_sacked(tp)) | ||
1653 | tcp_update_reordering(sk, tp->packets_out + addend, 0); | ||
1644 | } | 1654 | } |
1645 | 1655 | ||
1646 | /* Emulate SACKs for SACKless connection: account for a new dupack. */ | 1656 | /* Emulate SACKs for SACKless connection: account for a new dupack. */ |
@@ -1681,11 +1691,16 @@ static inline void tcp_reset_reno_sack(struct tcp_sock *tp) | |||
1681 | int tcp_use_frto(struct sock *sk) | 1691 | int tcp_use_frto(struct sock *sk) |
1682 | { | 1692 | { |
1683 | const struct tcp_sock *tp = tcp_sk(sk); | 1693 | const struct tcp_sock *tp = tcp_sk(sk); |
1694 | const struct inet_connection_sock *icsk = inet_csk(sk); | ||
1684 | struct sk_buff *skb; | 1695 | struct sk_buff *skb; |
1685 | 1696 | ||
1686 | if (!sysctl_tcp_frto) | 1697 | if (!sysctl_tcp_frto) |
1687 | return 0; | 1698 | return 0; |
1688 | 1699 | ||
1700 | /* MTU probe and F-RTO won't really play nicely along currently */ | ||
1701 | if (icsk->icsk_mtup.probe_size) | ||
1702 | return 0; | ||
1703 | |||
1689 | if (IsSackFrto()) | 1704 | if (IsSackFrto()) |
1690 | return 1; | 1705 | return 1; |
1691 | 1706 | ||
@@ -2134,11 +2149,13 @@ static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb) | |||
2134 | /* Mark head of queue up as lost. With RFC3517 SACK, the packets is | 2149 | /* Mark head of queue up as lost. With RFC3517 SACK, the packets is |
2135 | * is against sacked "cnt", otherwise it's against facked "cnt" | 2150 | * is against sacked "cnt", otherwise it's against facked "cnt" |
2136 | */ | 2151 | */ |
2137 | static void tcp_mark_head_lost(struct sock *sk, int packets, int fast_rexmit) | 2152 | static void tcp_mark_head_lost(struct sock *sk, int packets) |
2138 | { | 2153 | { |
2139 | struct tcp_sock *tp = tcp_sk(sk); | 2154 | struct tcp_sock *tp = tcp_sk(sk); |
2140 | struct sk_buff *skb; | 2155 | struct sk_buff *skb; |
2141 | int cnt; | 2156 | int cnt, oldcnt; |
2157 | int err; | ||
2158 | unsigned int mss; | ||
2142 | 2159 | ||
2143 | BUG_TRAP(packets <= tp->packets_out); | 2160 | BUG_TRAP(packets <= tp->packets_out); |
2144 | if (tp->lost_skb_hint) { | 2161 | if (tp->lost_skb_hint) { |
@@ -2157,13 +2174,25 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int fast_rexmit) | |||
2157 | tp->lost_skb_hint = skb; | 2174 | tp->lost_skb_hint = skb; |
2158 | tp->lost_cnt_hint = cnt; | 2175 | tp->lost_cnt_hint = cnt; |
2159 | 2176 | ||
2177 | if (after(TCP_SKB_CB(skb)->end_seq, tp->high_seq)) | ||
2178 | break; | ||
2179 | |||
2180 | oldcnt = cnt; | ||
2160 | if (tcp_is_fack(tp) || tcp_is_reno(tp) || | 2181 | if (tcp_is_fack(tp) || tcp_is_reno(tp) || |
2161 | (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) | 2182 | (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) |
2162 | cnt += tcp_skb_pcount(skb); | 2183 | cnt += tcp_skb_pcount(skb); |
2163 | 2184 | ||
2164 | if (((!fast_rexmit || (tp->lost_out > 0)) && (cnt > packets)) || | 2185 | if (cnt > packets) { |
2165 | after(TCP_SKB_CB(skb)->end_seq, tp->high_seq)) | 2186 | if (tcp_is_sack(tp) || (oldcnt >= packets)) |
2166 | break; | 2187 | break; |
2188 | |||
2189 | mss = skb_shinfo(skb)->gso_size; | ||
2190 | err = tcp_fragment(sk, skb, (packets - oldcnt) * mss, mss); | ||
2191 | if (err < 0) | ||
2192 | break; | ||
2193 | cnt = packets; | ||
2194 | } | ||
2195 | |||
2167 | if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_SACKED_ACKED|TCPCB_LOST))) { | 2196 | if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_SACKED_ACKED|TCPCB_LOST))) { |
2168 | TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; | 2197 | TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; |
2169 | tp->lost_out += tcp_skb_pcount(skb); | 2198 | tp->lost_out += tcp_skb_pcount(skb); |
@@ -2180,17 +2209,17 @@ static void tcp_update_scoreboard(struct sock *sk, int fast_rexmit) | |||
2180 | struct tcp_sock *tp = tcp_sk(sk); | 2209 | struct tcp_sock *tp = tcp_sk(sk); |
2181 | 2210 | ||
2182 | if (tcp_is_reno(tp)) { | 2211 | if (tcp_is_reno(tp)) { |
2183 | tcp_mark_head_lost(sk, 1, fast_rexmit); | 2212 | tcp_mark_head_lost(sk, 1); |
2184 | } else if (tcp_is_fack(tp)) { | 2213 | } else if (tcp_is_fack(tp)) { |
2185 | int lost = tp->fackets_out - tp->reordering; | 2214 | int lost = tp->fackets_out - tp->reordering; |
2186 | if (lost <= 0) | 2215 | if (lost <= 0) |
2187 | lost = 1; | 2216 | lost = 1; |
2188 | tcp_mark_head_lost(sk, lost, fast_rexmit); | 2217 | tcp_mark_head_lost(sk, lost); |
2189 | } else { | 2218 | } else { |
2190 | int sacked_upto = tp->sacked_out - tp->reordering; | 2219 | int sacked_upto = tp->sacked_out - tp->reordering; |
2191 | if (sacked_upto < 0) | 2220 | if (sacked_upto < fast_rexmit) |
2192 | sacked_upto = 0; | 2221 | sacked_upto = fast_rexmit; |
2193 | tcp_mark_head_lost(sk, sacked_upto, fast_rexmit); | 2222 | tcp_mark_head_lost(sk, sacked_upto); |
2194 | } | 2223 | } |
2195 | 2224 | ||
2196 | /* New heuristics: it is possible only after we switched | 2225 | /* New heuristics: it is possible only after we switched |
@@ -2524,7 +2553,7 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag) | |||
2524 | before(tp->snd_una, tp->high_seq) && | 2553 | before(tp->snd_una, tp->high_seq) && |
2525 | icsk->icsk_ca_state != TCP_CA_Open && | 2554 | icsk->icsk_ca_state != TCP_CA_Open && |
2526 | tp->fackets_out > tp->reordering) { | 2555 | tp->fackets_out > tp->reordering) { |
2527 | tcp_mark_head_lost(sk, tp->fackets_out - tp->reordering, 0); | 2556 | tcp_mark_head_lost(sk, tp->fackets_out - tp->reordering); |
2528 | NET_INC_STATS_BH(LINUX_MIB_TCPLOSS); | 2557 | NET_INC_STATS_BH(LINUX_MIB_TCPLOSS); |
2529 | } | 2558 | } |
2530 | 2559 | ||
@@ -2586,6 +2615,8 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag) | |||
2586 | case TCP_CA_Loss: | 2615 | case TCP_CA_Loss: |
2587 | if (flag & FLAG_DATA_ACKED) | 2616 | if (flag & FLAG_DATA_ACKED) |
2588 | icsk->icsk_retransmits = 0; | 2617 | icsk->icsk_retransmits = 0; |
2618 | if (tcp_is_reno(tp) && flag & FLAG_SND_UNA_ADVANCED) | ||
2619 | tcp_reset_reno_sack(tp); | ||
2589 | if (!tcp_try_undo_loss(sk)) { | 2620 | if (!tcp_try_undo_loss(sk)) { |
2590 | tcp_moderate_cwnd(tp); | 2621 | tcp_moderate_cwnd(tp); |
2591 | tcp_xmit_retransmit_queue(sk); | 2622 | tcp_xmit_retransmit_queue(sk); |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 72b9350006fe..d29ef79c00ca 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1808,6 +1808,9 @@ void tcp_simple_retransmit(struct sock *sk) | |||
1808 | if (!lost) | 1808 | if (!lost) |
1809 | return; | 1809 | return; |
1810 | 1810 | ||
1811 | if (tcp_is_reno(tp)) | ||
1812 | tcp_limit_reno_sacked(tp); | ||
1813 | |||
1811 | tcp_verify_left_out(tp); | 1814 | tcp_verify_left_out(tp); |
1812 | 1815 | ||
1813 | /* Don't muck with the congestion window here. | 1816 | /* Don't muck with the congestion window here. |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e7a1882db048..e08955baedff 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -371,25 +371,26 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) | |||
371 | */ | 371 | */ |
372 | in6_dev_hold(ndev); | 372 | in6_dev_hold(ndev); |
373 | 373 | ||
374 | #if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE) | ||
375 | if (dev->type == ARPHRD_SIT && (dev->priv_flags & IFF_ISATAP)) { | ||
376 | printk(KERN_INFO | ||
377 | "%s: Disabled Multicast RS\n", | ||
378 | dev->name); | ||
379 | ndev->cnf.rtr_solicits = 0; | ||
380 | } | ||
381 | #endif | ||
382 | |||
374 | #ifdef CONFIG_IPV6_PRIVACY | 383 | #ifdef CONFIG_IPV6_PRIVACY |
375 | setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev); | 384 | setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev); |
376 | if ((dev->flags&IFF_LOOPBACK) || | 385 | if ((dev->flags&IFF_LOOPBACK) || |
377 | dev->type == ARPHRD_TUNNEL || | 386 | dev->type == ARPHRD_TUNNEL || |
378 | #if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE) | 387 | dev->type == ARPHRD_TUNNEL6 || |
379 | dev->type == ARPHRD_SIT || | 388 | dev->type == ARPHRD_SIT || |
380 | #endif | ||
381 | dev->type == ARPHRD_NONE) { | 389 | dev->type == ARPHRD_NONE) { |
382 | printk(KERN_INFO | 390 | printk(KERN_INFO |
383 | "%s: Disabled Privacy Extensions\n", | 391 | "%s: Disabled Privacy Extensions\n", |
384 | dev->name); | 392 | dev->name); |
385 | ndev->cnf.use_tempaddr = -1; | 393 | ndev->cnf.use_tempaddr = -1; |
386 | |||
387 | if (dev->type == ARPHRD_SIT && (dev->priv_flags & IFF_ISATAP)) { | ||
388 | printk(KERN_INFO | ||
389 | "%s: Disabled Multicast RS\n", | ||
390 | dev->name); | ||
391 | ndev->cnf.rtr_solicits = 0; | ||
392 | } | ||
393 | } else { | 394 | } else { |
394 | in6_dev_hold(ndev); | 395 | in6_dev_hold(ndev); |
395 | ipv6_regen_rndid((unsigned long) ndev); | 396 | ipv6_regen_rndid((unsigned long) ndev); |
@@ -2456,7 +2457,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2456 | 2457 | ||
2457 | ASSERT_RTNL(); | 2458 | ASSERT_RTNL(); |
2458 | 2459 | ||
2459 | if (dev == init_net.loopback_dev && how == 1) | 2460 | if ((dev->flags & IFF_LOOPBACK) && how == 1) |
2460 | how = 0; | 2461 | how = 0; |
2461 | 2462 | ||
2462 | rt6_ifdown(dev); | 2463 | rt6_ifdown(dev); |
@@ -2469,7 +2470,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2469 | /* Step 1: remove reference to ipv6 device from parent device. | 2470 | /* Step 1: remove reference to ipv6 device from parent device. |
2470 | Do not dev_put! | 2471 | Do not dev_put! |
2471 | */ | 2472 | */ |
2472 | if (how == 1) { | 2473 | if (how) { |
2473 | idev->dead = 1; | 2474 | idev->dead = 1; |
2474 | 2475 | ||
2475 | /* protected by rtnl_lock */ | 2476 | /* protected by rtnl_lock */ |
@@ -2501,12 +2502,12 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2501 | write_lock_bh(&idev->lock); | 2502 | write_lock_bh(&idev->lock); |
2502 | 2503 | ||
2503 | /* Step 3: clear flags for stateless addrconf */ | 2504 | /* Step 3: clear flags for stateless addrconf */ |
2504 | if (how != 1) | 2505 | if (!how) |
2505 | idev->if_flags &= ~(IF_RS_SENT|IF_RA_RCVD|IF_READY); | 2506 | idev->if_flags &= ~(IF_RS_SENT|IF_RA_RCVD|IF_READY); |
2506 | 2507 | ||
2507 | /* Step 4: clear address list */ | 2508 | /* Step 4: clear address list */ |
2508 | #ifdef CONFIG_IPV6_PRIVACY | 2509 | #ifdef CONFIG_IPV6_PRIVACY |
2509 | if (how == 1 && del_timer(&idev->regen_timer)) | 2510 | if (how && del_timer(&idev->regen_timer)) |
2510 | in6_dev_put(idev); | 2511 | in6_dev_put(idev); |
2511 | 2512 | ||
2512 | /* clear tempaddr list */ | 2513 | /* clear tempaddr list */ |
@@ -2543,7 +2544,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2543 | 2544 | ||
2544 | /* Step 5: Discard multicast list */ | 2545 | /* Step 5: Discard multicast list */ |
2545 | 2546 | ||
2546 | if (how == 1) | 2547 | if (how) |
2547 | ipv6_mc_destroy_dev(idev); | 2548 | ipv6_mc_destroy_dev(idev); |
2548 | else | 2549 | else |
2549 | ipv6_mc_down(idev); | 2550 | ipv6_mc_down(idev); |
@@ -2552,7 +2553,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2552 | 2553 | ||
2553 | /* Shot the device (if unregistered) */ | 2554 | /* Shot the device (if unregistered) */ |
2554 | 2555 | ||
2555 | if (how == 1) { | 2556 | if (how) { |
2556 | addrconf_sysctl_unregister(idev); | 2557 | addrconf_sysctl_unregister(idev); |
2557 | neigh_parms_release(&nd_tbl, idev->nd_parms); | 2558 | neigh_parms_release(&nd_tbl, idev->nd_parms); |
2558 | neigh_ifdown(&nd_tbl, dev); | 2559 | neigh_ifdown(&nd_tbl, dev); |
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 9c7f83fbc3a1..e5f56c953b58 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
@@ -334,9 +334,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr) | |||
334 | idev->ac_list = aca; | 334 | idev->ac_list = aca; |
335 | write_unlock_bh(&idev->lock); | 335 | write_unlock_bh(&idev->lock); |
336 | 336 | ||
337 | dst_hold(&rt->u.dst); | 337 | ip6_ins_rt(rt); |
338 | if (ip6_ins_rt(rt)) | ||
339 | dst_release(&rt->u.dst); | ||
340 | 338 | ||
341 | addrconf_join_solict(dev, &aca->aca_addr); | 339 | addrconf_join_solict(dev, &aca->aca_addr); |
342 | 340 | ||
@@ -378,10 +376,7 @@ int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr) | |||
378 | addrconf_leave_solict(idev, &aca->aca_addr); | 376 | addrconf_leave_solict(idev, &aca->aca_addr); |
379 | 377 | ||
380 | dst_hold(&aca->aca_rt->u.dst); | 378 | dst_hold(&aca->aca_rt->u.dst); |
381 | if (ip6_del_rt(aca->aca_rt)) | 379 | ip6_del_rt(aca->aca_rt); |
382 | dst_free(&aca->aca_rt->u.dst); | ||
383 | else | ||
384 | dst_release(&aca->aca_rt->u.dst); | ||
385 | 380 | ||
386 | aca_put(aca); | 381 | aca_put(aca); |
387 | return 0; | 382 | return 0; |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index f204a7275a0d..893287ecc628 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -436,24 +436,26 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, | |||
436 | } | 436 | } |
437 | 437 | ||
438 | if (xfrm_decode_session_reverse(skb, &fl2, AF_INET6)) | 438 | if (xfrm_decode_session_reverse(skb, &fl2, AF_INET6)) |
439 | goto out_dst_release; | 439 | goto relookup_failed; |
440 | 440 | ||
441 | if (ip6_dst_lookup(sk, &dst2, &fl)) | 441 | if (ip6_dst_lookup(sk, &dst2, &fl)) |
442 | goto out_dst_release; | 442 | goto relookup_failed; |
443 | 443 | ||
444 | err = xfrm_lookup(&dst2, &fl, sk, XFRM_LOOKUP_ICMP); | 444 | err = xfrm_lookup(&dst2, &fl, sk, XFRM_LOOKUP_ICMP); |
445 | if (err == -ENOENT) { | 445 | switch (err) { |
446 | case 0: | ||
447 | dst_release(dst); | ||
448 | dst = dst2; | ||
449 | break; | ||
450 | case -EPERM: | ||
451 | goto out_dst_release; | ||
452 | default: | ||
453 | relookup_failed: | ||
446 | if (!dst) | 454 | if (!dst) |
447 | goto out; | 455 | goto out; |
448 | goto route_done; | 456 | break; |
449 | } | 457 | } |
450 | 458 | ||
451 | dst_release(dst); | ||
452 | dst = dst2; | ||
453 | |||
454 | if (err) | ||
455 | goto out; | ||
456 | |||
457 | route_done: | 459 | route_done: |
458 | if (ipv6_addr_is_multicast(&fl.fl6_dst)) | 460 | if (ipv6_addr_is_multicast(&fl.fl6_dst)) |
459 | hlimit = np->mcast_hops; | 461 | hlimit = np->mcast_hops; |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 8897ccf8086a..0a6fbc1d1a50 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -372,8 +372,10 @@ void raw6_icmp_error(struct sk_buff *skb, int nexthdr, | |||
372 | read_lock(&raw_v6_hashinfo.lock); | 372 | read_lock(&raw_v6_hashinfo.lock); |
373 | sk = sk_head(&raw_v6_hashinfo.ht[hash]); | 373 | sk = sk_head(&raw_v6_hashinfo.ht[hash]); |
374 | if (sk != NULL) { | 374 | if (sk != NULL) { |
375 | saddr = &ipv6_hdr(skb)->saddr; | 375 | struct ipv6hdr *hdr = (struct ipv6hdr *) skb->data; |
376 | daddr = &ipv6_hdr(skb)->daddr; | 376 | |
377 | saddr = &hdr->saddr; | ||
378 | daddr = &hdr->daddr; | ||
377 | net = skb->dev->nd_net; | 379 | net = skb->dev->nd_net; |
378 | 380 | ||
379 | while ((sk = __raw_v6_lookup(net, sk, nexthdr, saddr, daddr, | 381 | while ((sk = __raw_v6_lookup(net, sk, nexthdr, saddr, daddr, |
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index e0c72d04584b..c1706855460a 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -312,14 +312,12 @@ static void ieee80211_sta_wmm_params(struct net_device *dev, | |||
312 | } | 312 | } |
313 | } | 313 | } |
314 | 314 | ||
315 | 315 | static u32 ieee80211_handle_protect_preamb(struct ieee80211_sub_if_data *sdata, | |
316 | static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata, | 316 | bool use_protection, |
317 | u8 erp_value) | 317 | bool use_short_preamble) |
318 | { | 318 | { |
319 | struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf; | 319 | struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf; |
320 | struct ieee80211_if_sta *ifsta = &sdata->u.sta; | 320 | struct ieee80211_if_sta *ifsta = &sdata->u.sta; |
321 | bool use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0; | ||
322 | bool use_short_preamble = (erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0; | ||
323 | DECLARE_MAC_BUF(mac); | 321 | DECLARE_MAC_BUF(mac); |
324 | u32 changed = 0; | 322 | u32 changed = 0; |
325 | 323 | ||
@@ -350,6 +348,32 @@ static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata, | |||
350 | return changed; | 348 | return changed; |
351 | } | 349 | } |
352 | 350 | ||
351 | static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata, | ||
352 | u8 erp_value) | ||
353 | { | ||
354 | bool use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0; | ||
355 | bool use_short_preamble = (erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0; | ||
356 | |||
357 | return ieee80211_handle_protect_preamb(sdata, | ||
358 | use_protection, use_short_preamble); | ||
359 | } | ||
360 | |||
361 | static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata, | ||
362 | struct ieee80211_sta_bss *bss) | ||
363 | { | ||
364 | u32 changed = 0; | ||
365 | |||
366 | if (bss->has_erp_value) | ||
367 | changed |= ieee80211_handle_erp_ie(sdata, bss->erp_value); | ||
368 | else { | ||
369 | u16 capab = bss->capability; | ||
370 | changed |= ieee80211_handle_protect_preamb(sdata, false, | ||
371 | (capab & WLAN_CAPABILITY_SHORT_PREAMBLE) != 0); | ||
372 | } | ||
373 | |||
374 | return changed; | ||
375 | } | ||
376 | |||
353 | int ieee80211_ht_cap_ie_to_ht_info(struct ieee80211_ht_cap *ht_cap_ie, | 377 | int ieee80211_ht_cap_ie_to_ht_info(struct ieee80211_ht_cap *ht_cap_ie, |
354 | struct ieee80211_ht_info *ht_info) | 378 | struct ieee80211_ht_info *ht_info) |
355 | { | 379 | { |
@@ -468,9 +492,7 @@ static void ieee80211_set_associated(struct net_device *dev, | |||
468 | local->hw.conf.channel, | 492 | local->hw.conf.channel, |
469 | ifsta->ssid, ifsta->ssid_len); | 493 | ifsta->ssid, ifsta->ssid_len); |
470 | if (bss) { | 494 | if (bss) { |
471 | if (bss->has_erp_value) | 495 | changed |= ieee80211_handle_bss_capability(sdata, bss); |
472 | changed |= ieee80211_handle_erp_ie( | ||
473 | sdata, bss->erp_value); | ||
474 | ieee80211_rx_bss_put(dev, bss); | 496 | ieee80211_rx_bss_put(dev, bss); |
475 | } | 497 | } |
476 | 498 | ||
@@ -2116,6 +2138,11 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev, | |||
2116 | 2138 | ||
2117 | if (elems.erp_info && elems.erp_info_len >= 1) | 2139 | if (elems.erp_info && elems.erp_info_len >= 1) |
2118 | changed |= ieee80211_handle_erp_ie(sdata, elems.erp_info[0]); | 2140 | changed |= ieee80211_handle_erp_ie(sdata, elems.erp_info[0]); |
2141 | else { | ||
2142 | u16 capab = le16_to_cpu(mgmt->u.beacon.capab_info); | ||
2143 | changed |= ieee80211_handle_protect_preamb(sdata, false, | ||
2144 | (capab & WLAN_CAPABILITY_SHORT_PREAMBLE) != 0); | ||
2145 | } | ||
2119 | 2146 | ||
2120 | if (elems.ht_cap_elem && elems.ht_info_elem && | 2147 | if (elems.ht_cap_elem && elems.ht_info_elem && |
2121 | elems.wmm_param && local->ops->conf_ht && | 2148 | elems.wmm_param && local->ops->conf_ht && |
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index dc29007c52cd..40d344b21453 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c | |||
@@ -466,38 +466,25 @@ static inline void rateinfo_recalc(struct dsthash_ent *dh, unsigned long now) | |||
466 | 466 | ||
467 | static inline __be32 maskl(__be32 a, unsigned int l) | 467 | static inline __be32 maskl(__be32 a, unsigned int l) |
468 | { | 468 | { |
469 | return htonl(ntohl(a) & ~(~(u_int32_t)0 >> l)); | 469 | return l ? htonl(ntohl(a) & ~0 << (32 - l)) : 0; |
470 | } | 470 | } |
471 | 471 | ||
472 | #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) | 472 | #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
473 | static void hashlimit_ipv6_mask(__be32 *i, unsigned int p) | 473 | static void hashlimit_ipv6_mask(__be32 *i, unsigned int p) |
474 | { | 474 | { |
475 | switch (p) { | 475 | switch (p) { |
476 | case 0: | 476 | case 0 ... 31: |
477 | i[0] = i[1] = 0; | ||
478 | i[2] = i[3] = 0; | ||
479 | break; | ||
480 | case 1 ... 31: | ||
481 | i[0] = maskl(i[0], p); | 477 | i[0] = maskl(i[0], p); |
482 | i[1] = i[2] = i[3] = 0; | 478 | i[1] = i[2] = i[3] = 0; |
483 | break; | 479 | break; |
484 | case 32: | 480 | case 32 ... 63: |
485 | i[1] = i[2] = i[3] = 0; | ||
486 | break; | ||
487 | case 33 ... 63: | ||
488 | i[1] = maskl(i[1], p - 32); | 481 | i[1] = maskl(i[1], p - 32); |
489 | i[2] = i[3] = 0; | 482 | i[2] = i[3] = 0; |
490 | break; | 483 | break; |
491 | case 64: | 484 | case 64 ... 95: |
492 | i[2] = i[3] = 0; | ||
493 | break; | ||
494 | case 65 ... 95: | ||
495 | i[2] = maskl(i[2], p - 64); | 485 | i[2] = maskl(i[2], p - 64); |
496 | i[3] = 0; | 486 | i[3] = 0; |
497 | case 96: | 487 | case 96 ... 127: |
498 | i[3] = 0; | ||
499 | break; | ||
500 | case 97 ... 127: | ||
501 | i[3] = maskl(i[3], p - 96); | 488 | i[3] = maskl(i[3], p - 96); |
502 | break; | 489 | break; |
503 | case 128: | 490 | case 128: |
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index c5c16b4b6e98..4d755444c449 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c | |||
@@ -411,8 +411,10 @@ static void u32_destroy(struct tcf_proto *tp) | |||
411 | } | 411 | } |
412 | } | 412 | } |
413 | 413 | ||
414 | for (ht=tp_c->hlist; ht; ht = ht->next) | 414 | for (ht = tp_c->hlist; ht; ht = ht->next) { |
415 | ht->refcnt--; | ||
415 | u32_clear_hnode(tp, ht); | 416 | u32_clear_hnode(tp, ht); |
417 | } | ||
416 | 418 | ||
417 | while ((ht = tp_c->hlist) != NULL) { | 419 | while ((ht = tp_c->hlist) != NULL) { |
418 | tp_c->hlist = ht->next; | 420 | tp_c->hlist = ht->next; |
@@ -441,8 +443,12 @@ static int u32_delete(struct tcf_proto *tp, unsigned long arg) | |||
441 | if (tp->root == ht) | 443 | if (tp->root == ht) |
442 | return -EINVAL; | 444 | return -EINVAL; |
443 | 445 | ||
444 | if (--ht->refcnt == 0) | 446 | if (ht->refcnt == 1) { |
447 | ht->refcnt--; | ||
445 | u32_destroy_hnode(tp, ht); | 448 | u32_destroy_hnode(tp, ht); |
449 | } else { | ||
450 | return -EBUSY; | ||
451 | } | ||
446 | 452 | ||
447 | return 0; | 453 | return 0; |
448 | } | 454 | } |
@@ -568,7 +574,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, | |||
568 | if (ht == NULL) | 574 | if (ht == NULL) |
569 | return -ENOBUFS; | 575 | return -ENOBUFS; |
570 | ht->tp_c = tp_c; | 576 | ht->tp_c = tp_c; |
571 | ht->refcnt = 0; | 577 | ht->refcnt = 1; |
572 | ht->divisor = divisor; | 578 | ht->divisor = divisor; |
573 | ht->handle = handle; | 579 | ht->handle = handle; |
574 | ht->prio = tp->prio; | 580 | ht->prio = tp->prio; |
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index b1e05d719f9b..85f1495e0edc 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -110,8 +110,9 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev, | |||
110 | spin_lock_bh(&sctp_local_addr_lock); | 110 | spin_lock_bh(&sctp_local_addr_lock); |
111 | list_for_each_entry_safe(addr, temp, | 111 | list_for_each_entry_safe(addr, temp, |
112 | &sctp_local_addr_list, list) { | 112 | &sctp_local_addr_list, list) { |
113 | if (ipv6_addr_equal(&addr->a.v6.sin6_addr, | 113 | if (addr->a.sa.sa_family == AF_INET6 && |
114 | &ifa->addr)) { | 114 | ipv6_addr_equal(&addr->a.v6.sin6_addr, |
115 | &ifa->addr)) { | ||
115 | found = 1; | 116 | found = 1; |
116 | addr->valid = 0; | 117 | addr->valid = 0; |
117 | list_del_rcu(&addr->list); | 118 | list_del_rcu(&addr->list); |
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 1bb3c5c35d2a..c0714469233c 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -793,6 +793,9 @@ int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) | |||
793 | break; | 793 | break; |
794 | 794 | ||
795 | case SCTP_CID_ABORT: | 795 | case SCTP_CID_ABORT: |
796 | if (sctp_test_T_bit(chunk)) { | ||
797 | packet->vtag = asoc->c.my_vtag; | ||
798 | } | ||
796 | case SCTP_CID_SACK: | 799 | case SCTP_CID_SACK: |
797 | case SCTP_CID_HEARTBEAT: | 800 | case SCTP_CID_HEARTBEAT: |
798 | case SCTP_CID_HEARTBEAT_ACK: | 801 | case SCTP_CID_HEARTBEAT_ACK: |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index f90091a1b9ce..c2dd65d9f38d 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -647,7 +647,9 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev, | |||
647 | spin_lock_bh(&sctp_local_addr_lock); | 647 | spin_lock_bh(&sctp_local_addr_lock); |
648 | list_for_each_entry_safe(addr, temp, | 648 | list_for_each_entry_safe(addr, temp, |
649 | &sctp_local_addr_list, list) { | 649 | &sctp_local_addr_list, list) { |
650 | if (addr->a.v4.sin_addr.s_addr == ifa->ifa_local) { | 650 | if (addr->a.sa.sa_family == AF_INET && |
651 | addr->a.v4.sin_addr.s_addr == | ||
652 | ifa->ifa_local) { | ||
651 | found = 1; | 653 | found = 1; |
652 | addr->valid = 0; | 654 | addr->valid = 0; |
653 | list_del_rcu(&addr->list); | 655 | list_del_rcu(&addr->list); |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 578630e8e00d..36ebb392472e 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1982,7 +1982,10 @@ static sctp_ierror_t sctp_verify_param(const struct sctp_association *asoc, | |||
1982 | struct sctp_chunk *chunk, | 1982 | struct sctp_chunk *chunk, |
1983 | struct sctp_chunk **err_chunk) | 1983 | struct sctp_chunk **err_chunk) |
1984 | { | 1984 | { |
1985 | struct sctp_hmac_algo_param *hmacs; | ||
1985 | int retval = SCTP_IERROR_NO_ERROR; | 1986 | int retval = SCTP_IERROR_NO_ERROR; |
1987 | __u16 n_elt, id = 0; | ||
1988 | int i; | ||
1986 | 1989 | ||
1987 | /* FIXME - This routine is not looking at each parameter per the | 1990 | /* FIXME - This routine is not looking at each parameter per the |
1988 | * chunk type, i.e., unrecognized parameters should be further | 1991 | * chunk type, i.e., unrecognized parameters should be further |
@@ -2056,9 +2059,29 @@ static sctp_ierror_t sctp_verify_param(const struct sctp_association *asoc, | |||
2056 | break; | 2059 | break; |
2057 | 2060 | ||
2058 | case SCTP_PARAM_HMAC_ALGO: | 2061 | case SCTP_PARAM_HMAC_ALGO: |
2059 | if (sctp_auth_enable) | 2062 | if (!sctp_auth_enable) |
2060 | break; | 2063 | goto fallthrough; |
2061 | /* Fall Through */ | 2064 | |
2065 | hmacs = (struct sctp_hmac_algo_param *)param.p; | ||
2066 | n_elt = (ntohs(param.p->length) - sizeof(sctp_paramhdr_t)) >> 1; | ||
2067 | |||
2068 | /* SCTP-AUTH: Section 6.1 | ||
2069 | * The HMAC algorithm based on SHA-1 MUST be supported and | ||
2070 | * included in the HMAC-ALGO parameter. | ||
2071 | */ | ||
2072 | for (i = 0; i < n_elt; i++) { | ||
2073 | id = ntohs(hmacs->hmac_ids[i]); | ||
2074 | |||
2075 | if (id == SCTP_AUTH_HMAC_ID_SHA1) | ||
2076 | break; | ||
2077 | } | ||
2078 | |||
2079 | if (id != SCTP_AUTH_HMAC_ID_SHA1) { | ||
2080 | sctp_process_inv_paramlength(asoc, param.p, chunk, | ||
2081 | err_chunk); | ||
2082 | retval = SCTP_IERROR_ABORT; | ||
2083 | } | ||
2084 | break; | ||
2062 | fallthrough: | 2085 | fallthrough: |
2063 | default: | 2086 | default: |
2064 | SCTP_DEBUG_PRINTK("Unrecognized param: %d for chunk %d.\n", | 2087 | SCTP_DEBUG_PRINTK("Unrecognized param: %d for chunk %d.\n", |
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index 28eb38eb6083..a4763fd24fd8 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
@@ -1536,6 +1536,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
1536 | error = sctp_auth_asoc_init_active_key(asoc, | 1536 | error = sctp_auth_asoc_init_active_key(asoc, |
1537 | GFP_ATOMIC); | 1537 | GFP_ATOMIC); |
1538 | break; | 1538 | break; |
1539 | case SCTP_CMD_UPDATE_INITTAG: | ||
1540 | asoc->peer.i.init_tag = cmd->obj.u32; | ||
1541 | break; | ||
1539 | 1542 | ||
1540 | default: | 1543 | default: |
1541 | printk(KERN_WARNING "Impossible command: %u, %p\n", | 1544 | printk(KERN_WARNING "Impossible command: %u, %p\n", |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index f2ed6473feef..07194c2a32df 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -4144,6 +4144,24 @@ static sctp_disposition_t sctp_sf_abort_violation( | |||
4144 | goto nomem; | 4144 | goto nomem; |
4145 | 4145 | ||
4146 | if (asoc) { | 4146 | if (asoc) { |
4147 | /* Treat INIT-ACK as a special case during COOKIE-WAIT. */ | ||
4148 | if (chunk->chunk_hdr->type == SCTP_CID_INIT_ACK && | ||
4149 | !asoc->peer.i.init_tag) { | ||
4150 | sctp_initack_chunk_t *initack; | ||
4151 | |||
4152 | initack = (sctp_initack_chunk_t *)chunk->chunk_hdr; | ||
4153 | if (!sctp_chunk_length_valid(chunk, | ||
4154 | sizeof(sctp_initack_chunk_t))) | ||
4155 | abort->chunk_hdr->flags |= SCTP_CHUNK_FLAG_T; | ||
4156 | else { | ||
4157 | unsigned int inittag; | ||
4158 | |||
4159 | inittag = ntohl(initack->init_hdr.init_tag); | ||
4160 | sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_INITTAG, | ||
4161 | SCTP_U32(inittag)); | ||
4162 | } | ||
4163 | } | ||
4164 | |||
4147 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); | 4165 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort)); |
4148 | SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS); | 4166 | SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS); |
4149 | 4167 | ||
@@ -4349,6 +4367,7 @@ sctp_disposition_t sctp_sf_do_prm_asoc(const struct sctp_endpoint *ep, | |||
4349 | sctp_cmd_seq_t *commands) | 4367 | sctp_cmd_seq_t *commands) |
4350 | { | 4368 | { |
4351 | struct sctp_chunk *repl; | 4369 | struct sctp_chunk *repl; |
4370 | struct sctp_association* my_asoc; | ||
4352 | 4371 | ||
4353 | /* The comment below says that we enter COOKIE-WAIT AFTER | 4372 | /* The comment below says that we enter COOKIE-WAIT AFTER |
4354 | * sending the INIT, but that doesn't actually work in our | 4373 | * sending the INIT, but that doesn't actually work in our |
@@ -4372,8 +4391,8 @@ sctp_disposition_t sctp_sf_do_prm_asoc(const struct sctp_endpoint *ep, | |||
4372 | /* Cast away the const modifier, as we want to just | 4391 | /* Cast away the const modifier, as we want to just |
4373 | * rerun it through as a sideffect. | 4392 | * rerun it through as a sideffect. |
4374 | */ | 4393 | */ |
4375 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_ASOC, | 4394 | my_asoc = (struct sctp_association *)asoc; |
4376 | SCTP_ASOC((struct sctp_association *) asoc)); | 4395 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_ASOC, SCTP_ASOC(my_asoc)); |
4377 | 4396 | ||
4378 | /* Choose transport for INIT. */ | 4397 | /* Choose transport for INIT. */ |
4379 | sctp_add_cmd_sf(commands, SCTP_CMD_INIT_CHOOSE_TRANSPORT, | 4398 | sctp_add_cmd_sf(commands, SCTP_CMD_INIT_CHOOSE_TRANSPORT, |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d994d822900d..998e63a31311 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -5868,11 +5868,12 @@ SCTP_STATIC int sctp_msghdr_parse(const struct msghdr *msg, | |||
5868 | sctp_cmsgs_t *cmsgs) | 5868 | sctp_cmsgs_t *cmsgs) |
5869 | { | 5869 | { |
5870 | struct cmsghdr *cmsg; | 5870 | struct cmsghdr *cmsg; |
5871 | struct msghdr *my_msg = (struct msghdr *)msg; | ||
5871 | 5872 | ||
5872 | for (cmsg = CMSG_FIRSTHDR(msg); | 5873 | for (cmsg = CMSG_FIRSTHDR(msg); |
5873 | cmsg != NULL; | 5874 | cmsg != NULL; |
5874 | cmsg = CMSG_NXTHDR((struct msghdr*)msg, cmsg)) { | 5875 | cmsg = CMSG_NXTHDR(my_msg, cmsg)) { |
5875 | if (!CMSG_OK(msg, cmsg)) | 5876 | if (!CMSG_OK(my_msg, cmsg)) |
5876 | return -EINVAL; | 5877 | return -EINVAL; |
5877 | 5878 | ||
5878 | /* Should we parse this header or ignore? */ | 5879 | /* Should we parse this header or ignore? */ |
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c index b43f1f110f87..ce6cda6b6994 100644 --- a/net/sctp/ulpevent.c +++ b/net/sctp/ulpevent.c | |||
@@ -859,7 +859,7 @@ __u16 sctp_ulpevent_get_notification_type(const struct sctp_ulpevent *event) | |||
859 | union sctp_notification *notification; | 859 | union sctp_notification *notification; |
860 | struct sk_buff *skb; | 860 | struct sk_buff *skb; |
861 | 861 | ||
862 | skb = sctp_event2skb((struct sctp_ulpevent *)event); | 862 | skb = sctp_event2skb(event); |
863 | notification = (union sctp_notification *) skb->data; | 863 | notification = (union sctp_notification *) skb->data; |
864 | return notification->sn_header.sn_type; | 864 | return notification->sn_header.sn_type; |
865 | } | 865 | } |
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 8c6a7f1a25e9..8834d68972cb 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -261,10 +261,6 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) | |||
261 | }; | 261 | }; |
262 | char servername[48]; | 262 | char servername[48]; |
263 | 263 | ||
264 | xprt = xprt_create_transport(&xprtargs); | ||
265 | if (IS_ERR(xprt)) | ||
266 | return (struct rpc_clnt *)xprt; | ||
267 | |||
268 | /* | 264 | /* |
269 | * If the caller chooses not to specify a hostname, whip | 265 | * If the caller chooses not to specify a hostname, whip |
270 | * up a string representation of the passed-in address. | 266 | * up a string representation of the passed-in address. |
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 995c3fdc16c2..79a55d56cc98 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
@@ -244,7 +244,7 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) | |||
244 | pgto = pages + (pgbase >> PAGE_CACHE_SHIFT); | 244 | pgto = pages + (pgbase >> PAGE_CACHE_SHIFT); |
245 | pgbase &= ~PAGE_CACHE_MASK; | 245 | pgbase &= ~PAGE_CACHE_MASK; |
246 | 246 | ||
247 | do { | 247 | for (;;) { |
248 | copy = PAGE_CACHE_SIZE - pgbase; | 248 | copy = PAGE_CACHE_SIZE - pgbase; |
249 | if (copy > len) | 249 | if (copy > len) |
250 | copy = len; | 250 | copy = len; |
@@ -253,6 +253,10 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) | |||
253 | memcpy(vto + pgbase, p, copy); | 253 | memcpy(vto + pgbase, p, copy); |
254 | kunmap_atomic(vto, KM_USER0); | 254 | kunmap_atomic(vto, KM_USER0); |
255 | 255 | ||
256 | len -= copy; | ||
257 | if (len == 0) | ||
258 | break; | ||
259 | |||
256 | pgbase += copy; | 260 | pgbase += copy; |
257 | if (pgbase == PAGE_CACHE_SIZE) { | 261 | if (pgbase == PAGE_CACHE_SIZE) { |
258 | flush_dcache_page(*pgto); | 262 | flush_dcache_page(*pgto); |
@@ -260,8 +264,7 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) | |||
260 | pgto++; | 264 | pgto++; |
261 | } | 265 | } |
262 | p += copy; | 266 | p += copy; |
263 | 267 | } | |
264 | } while ((len -= copy) != 0); | ||
265 | flush_dcache_page(*pgto); | 268 | flush_dcache_page(*pgto); |
266 | } | 269 | } |
267 | 270 | ||
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e3a214f63f91..f68a5c8f2147 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -945,7 +945,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) | |||
945 | nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]); | 945 | nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]); |
946 | params.listen_interval = | 946 | params.listen_interval = |
947 | nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]); | 947 | nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]); |
948 | params.listen_interval = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]); | 948 | params.aid = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]); |
949 | 949 | ||
950 | if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS], | 950 | if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS], |
951 | ¶ms.station_flags)) | 951 | ¶ms.station_flags)) |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 5d96f2728dc6..019d21de19b3 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -288,7 +288,7 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * | |||
288 | memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); | 288 | memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); |
289 | x->props.flags = p->flags; | 289 | x->props.flags = p->flags; |
290 | 290 | ||
291 | if (x->props.mode == XFRM_MODE_TRANSPORT) | 291 | if (!x->sel.family) |
292 | x->sel.family = p->family; | 292 | x->sel.family = p->family; |
293 | 293 | ||
294 | } | 294 | } |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 820d07a60ab0..d39b59cf8a08 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -760,13 +760,13 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb, | |||
760 | * this early in the boot process. */ | 760 | * this early in the boot process. */ |
761 | BUG_ON(!ss_initialized); | 761 | BUG_ON(!ss_initialized); |
762 | 762 | ||
763 | /* this might go away sometime down the line if there is a new user | ||
764 | * of clone, but for now, nfs better not get here... */ | ||
765 | BUG_ON(newsbsec->initialized); | ||
766 | |||
767 | /* how can we clone if the old one wasn't set up?? */ | 763 | /* how can we clone if the old one wasn't set up?? */ |
768 | BUG_ON(!oldsbsec->initialized); | 764 | BUG_ON(!oldsbsec->initialized); |
769 | 765 | ||
766 | /* if fs is reusing a sb, just let its options stand... */ | ||
767 | if (newsbsec->initialized) | ||
768 | return; | ||
769 | |||
770 | mutex_lock(&newsbsec->lock); | 770 | mutex_lock(&newsbsec->lock); |
771 | 771 | ||
772 | newsbsec->flags = oldsbsec->flags; | 772 | newsbsec->flags = oldsbsec->flags; |
@@ -1143,7 +1143,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent | |||
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | len = INITCONTEXTLEN; | 1145 | len = INITCONTEXTLEN; |
1146 | context = kmalloc(len, GFP_KERNEL); | 1146 | context = kmalloc(len, GFP_NOFS); |
1147 | if (!context) { | 1147 | if (!context) { |
1148 | rc = -ENOMEM; | 1148 | rc = -ENOMEM; |
1149 | dput(dentry); | 1149 | dput(dentry); |
@@ -1161,7 +1161,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent | |||
1161 | } | 1161 | } |
1162 | kfree(context); | 1162 | kfree(context); |
1163 | len = rc; | 1163 | len = rc; |
1164 | context = kmalloc(len, GFP_KERNEL); | 1164 | context = kmalloc(len, GFP_NOFS); |
1165 | if (!context) { | 1165 | if (!context) { |
1166 | rc = -ENOMEM; | 1166 | rc = -ENOMEM; |
1167 | dput(dentry); | 1167 | dput(dentry); |
@@ -1185,7 +1185,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent | |||
1185 | rc = 0; | 1185 | rc = 0; |
1186 | } else { | 1186 | } else { |
1187 | rc = security_context_to_sid_default(context, rc, &sid, | 1187 | rc = security_context_to_sid_default(context, rc, &sid, |
1188 | sbsec->def_sid); | 1188 | sbsec->def_sid, |
1189 | GFP_NOFS); | ||
1189 | if (rc) { | 1190 | if (rc) { |
1190 | printk(KERN_WARNING "%s: context_to_sid(%s) " | 1191 | printk(KERN_WARNING "%s: context_to_sid(%s) " |
1191 | "returned %d for dev=%s ino=%ld\n", | 1192 | "returned %d for dev=%s ino=%ld\n", |
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index f7d2f03781f2..44e12ec88090 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h | |||
@@ -86,7 +86,8 @@ int security_sid_to_context(u32 sid, char **scontext, | |||
86 | int security_context_to_sid(char *scontext, u32 scontext_len, | 86 | int security_context_to_sid(char *scontext, u32 scontext_len, |
87 | u32 *out_sid); | 87 | u32 *out_sid); |
88 | 88 | ||
89 | int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *out_sid, u32 def_sid); | 89 | int security_context_to_sid_default(char *scontext, u32 scontext_len, |
90 | u32 *out_sid, u32 def_sid, gfp_t gfp_flags); | ||
90 | 91 | ||
91 | int security_get_user_sids(u32 callsid, char *username, | 92 | int security_get_user_sids(u32 callsid, char *username, |
92 | u32 **sids, u32 *nel); | 93 | u32 **sids, u32 *nel); |
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index f37418601215..3f2bad28ee7b 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -680,7 +680,8 @@ out: | |||
680 | 680 | ||
681 | } | 681 | } |
682 | 682 | ||
683 | static int security_context_to_sid_core(char *scontext, u32 scontext_len, u32 *sid, u32 def_sid) | 683 | static int security_context_to_sid_core(char *scontext, u32 scontext_len, |
684 | u32 *sid, u32 def_sid, gfp_t gfp_flags) | ||
684 | { | 685 | { |
685 | char *scontext2; | 686 | char *scontext2; |
686 | struct context context; | 687 | struct context context; |
@@ -709,7 +710,7 @@ static int security_context_to_sid_core(char *scontext, u32 scontext_len, u32 *s | |||
709 | null suffix to the copy to avoid problems with the existing | 710 | null suffix to the copy to avoid problems with the existing |
710 | attr package, which doesn't view the null terminator as part | 711 | attr package, which doesn't view the null terminator as part |
711 | of the attribute value. */ | 712 | of the attribute value. */ |
712 | scontext2 = kmalloc(scontext_len+1,GFP_KERNEL); | 713 | scontext2 = kmalloc(scontext_len+1, gfp_flags); |
713 | if (!scontext2) { | 714 | if (!scontext2) { |
714 | rc = -ENOMEM; | 715 | rc = -ENOMEM; |
715 | goto out; | 716 | goto out; |
@@ -809,7 +810,7 @@ out: | |||
809 | int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid) | 810 | int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid) |
810 | { | 811 | { |
811 | return security_context_to_sid_core(scontext, scontext_len, | 812 | return security_context_to_sid_core(scontext, scontext_len, |
812 | sid, SECSID_NULL); | 813 | sid, SECSID_NULL, GFP_KERNEL); |
813 | } | 814 | } |
814 | 815 | ||
815 | /** | 816 | /** |
@@ -829,10 +830,11 @@ int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid) | |||
829 | * Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient | 830 | * Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient |
830 | * memory is available, or 0 on success. | 831 | * memory is available, or 0 on success. |
831 | */ | 832 | */ |
832 | int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *sid, u32 def_sid) | 833 | int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *sid, |
834 | u32 def_sid, gfp_t gfp_flags) | ||
833 | { | 835 | { |
834 | return security_context_to_sid_core(scontext, scontext_len, | 836 | return security_context_to_sid_core(scontext, scontext_len, |
835 | sid, def_sid); | 837 | sid, def_sid, gfp_flags); |
836 | } | 838 | } |
837 | 839 | ||
838 | static int compute_sid_handle_invalid_context( | 840 | static int compute_sid_handle_invalid_context( |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 25ccfce45759..7d911a18c082 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -617,6 +617,18 @@ static int snd_es1968_ac97_wait(struct es1968 *chip) | |||
617 | return 1; /* timeout */ | 617 | return 1; /* timeout */ |
618 | } | 618 | } |
619 | 619 | ||
620 | static int snd_es1968_ac97_wait_poll(struct es1968 *chip) | ||
621 | { | ||
622 | int timeout = 100000; | ||
623 | |||
624 | while (timeout-- > 0) { | ||
625 | if (!(inb(chip->io_port + ESM_AC97_INDEX) & 1)) | ||
626 | return 0; | ||
627 | } | ||
628 | snd_printd("es1968: ac97 timeout\n"); | ||
629 | return 1; /* timeout */ | ||
630 | } | ||
631 | |||
620 | static void snd_es1968_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val) | 632 | static void snd_es1968_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val) |
621 | { | 633 | { |
622 | struct es1968 *chip = ac97->private_data; | 634 | struct es1968 *chip = ac97->private_data; |
@@ -645,7 +657,7 @@ static unsigned short snd_es1968_ac97_read(struct snd_ac97 *ac97, unsigned short | |||
645 | outb(reg | 0x80, chip->io_port + ESM_AC97_INDEX); | 657 | outb(reg | 0x80, chip->io_port + ESM_AC97_INDEX); |
646 | /*msleep(1);*/ | 658 | /*msleep(1);*/ |
647 | 659 | ||
648 | if (! snd_es1968_ac97_wait(chip)) { | 660 | if (!snd_es1968_ac97_wait_poll(chip)) { |
649 | data = inw(chip->io_port + ESM_AC97_DATA); | 661 | data = inw(chip->io_port + ESM_AC97_DATA); |
650 | /*msleep(1);*/ | 662 | /*msleep(1);*/ |
651 | } | 663 | } |