Skip to content

Commit df49e75

Browse files
author
Russell King
committed
Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk
2 parents 129f1e5 + d87e603 commit df49e75

File tree

210 files changed

+2674
-3166
lines changed

Some content is hidden

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

210 files changed

+2674
-3166
lines changed

‎Documentation/Changes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Intro
22
=====
33

44
This document is designed to provide a list of the minimum levels of
5-
software necessary to run the 2.5 kernels, as well as provide brief
5+
software necessary to run the 2.6 kernels, as well as provide brief
66
instructions regarding any other "Gotchas" users may encounter when
77
trying life on the Bleeding Edge. If upgrading from a pre-2.4.x
88
kernel, please consult the Changes file included with 2.4.x kernels for
@@ -142,7 +142,7 @@ version of ksymoops to decode the report; see REPORTING-BUGS in the
142142
root of the Linux source for more information.
143143

144144
Module-Init-Tools
145-
--------
145+
-----------------
146146

147147
A new module loader is now in the kernel that requires module-init-tools
148148
to use. It is backward compatible with the 2.4.x series kernels.
@@ -337,8 +337,8 @@ Ksymoops
337337
--------
338338
o <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>
339339

340-
Modutils
341-
--------
340+
Module-Init-Tools
341+
-----------------
342342
o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>
343343

344344
Mkinitrd

‎Documentation/binfmt_misc.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ There are some restrictions:
4141
offset+size(magic) has to be less than 128
4242
- the interpreter string may not exceed 127 characters
4343

44+
To use binfmt_misc you have to mount it first. You can mount it with
45+
"mount -t binfmt_misc none /proc/sys/fs/binfmt_misc" command, or you can add
46+
a line "none /proc/sys/fs/binfmt_misc binfmt_misc defaults 0 0" to your
47+
/etc/fstab so it auto mounts on boot.
48+
4449
You may want to add the binary formats in one of your /etc/rc scripts during
4550
boot-up. Read the manual of your init program to figure out how to do this
4651
right.

‎Documentation/cdrom/aztcd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ If you do not have the iso9660-filesystem in your boot kernel, you also have
178178
to load it before you can mount the CDROM:
179179
insmod /lib/modules/X.X.X/fs/isofs.o
180180
The mount procedure works as described in 4. above.
181-
(In all commands 'X.X.X' is the current linux kernel version number. For details
182-
see file modules.txt in /usr/src/linux/Documentation)
181+
(In all commands 'X.X.X' is the current linux kernel version number)
183182

184183
4.2 CDROM CONNECTED TO A SOUNDCARD
185184
Most soundcards do have a bus interface to the CDROM-drive. In many cases

‎Documentation/cdrom/sbpcd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ Using sbpcd as a "loadable module":
272272

273273
If you do NOT select "Matsushita/Panasonic CDROM driver support" during the
274274
"make config" of your kernel, you can build the "loadable module" sbpcd.o.
275-
Read /usr/src/linux/Documentation/modules.txt on this.
276275

277276
If sbpcd gets used as a module, the support of more than one interface
278277
card (i.e. drives 4...15) is disabled.

‎Documentation/ftape.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,7 @@ C. Boot and load time configuration
246246

247247
or by editing the file `/etc/modules.conf' in which case they take
248248
effect each time when the module is loaded with `modprobe' (please
249-
refer to the modules documentation, i.e. `modules.txt' and the
250-
respective manual pages). Thus, you should add a line
249+
refer to the respective manual pages). Thus, you should add a line
251250

252251
options ftape ft_tracing=4
253252

‎Documentation/kbuild/kconfig-language.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,13 @@ applicable everywhere (see syntax).
105105
or equal to the first symbol and smaller than or equal to the second
106106
symbol.
107107

108-
- help text: "help"
108+
- help text: "help" or "---help---"
109109
This defines a help text. The end of the help text is determined by
110110
the indentation level, this means it ends at the first line which has
111111
a smaller indentation than the first line of the help text.
112+
"---help---" and "help" do not differ in behaviour, "---help---" is
113+
used to help visually seperate configuration logic from help within
114+
the file as an aid to developers.
112115

113116

114117
Menu dependencies

‎Documentation/kbuild/makefiles.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ more details, with real examples.
212212

213213
No special notation is required in the makefiles for
214214
modules exporting symbols.
215-
See also Documentation/modules.txt.
216215

217216
--- 3.5 Library file goals - lib-y
218217

‎Documentation/kernel-parameters.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,10 @@ running once the system is up.
460460
logibm_irq= [HW,MOUSE] Logitech Bus Mouse Driver
461461
Format: <irq>
462462

463+
log_buf_len=n Sets the size of the printk ring buffer, in bytes.
464+
Format is n, nk, nM. n must be a power of two. The
465+
default is set in kernel config.
466+
463467
lp=0 [LP] Specify parallel ports to use, e.g,
464468
lp=port[,port...] lp=none,parport0 (lp0 not configured, lp1 uses
465469
lp=reset first parallel port). 'lp=0' disables the

‎Documentation/sched-coding.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The routines
4747

4848
and
4949

50-
double_rq_unlock(runqueue_t *rq1, runqueue_t rq2)
50+
double_rq_unlock(runqueue_t *rq1, runqueue_t *rq2)
5151

5252
safely lock and unlock, respectively, the two specified runqueues. They do
5353
not, however, disable and restore interrupts. Users are required to do so

‎Documentation/scsi/ncr53c8xx.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ competing for the SCSI BUS. By the way, when the chip is using SCSI id 7,
10251025
then it will for sure win the next SCSI BUS arbitration.
10261026

10271027
Since, there is no way to know what devices are trying to arbitrate for the
1028-
BUS, using this feature can be extremally unfair. So, you are not advised
1028+
BUS, using this feature can be extremely unfair. So, you are not advised
10291029
to enable it, or at most enable this feature for the case the chip lost
10301030
the previous arbitration (boot option 'iarb:1').
10311031

‎Documentation/sound/oss/Introduction

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ options bttv card=0 radio=0 pll=0
431431

432432
For More Information (RTFM):
433433
============================
434-
1) Information on kernel modules: linux/Documentation/modules.txt
435-
and manual pages for insmod and modprobe.
434+
1) Information on kernel modules: manual pages for insmod and modprobe.
436435

437436
2) Information on PnP, RTFM manual pages for isapnp.
438437

‎Documentation/sysrq.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ to specifically enable it at run-time. That is not the case any longer.
2222
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2323
On x86 - You press the key combo 'ALT-SysRq-<command key>'. Note - Some
2424
keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is
25-
also known as the 'Print Screen' key.
25+
also known as the 'Print Screen' key. Also some keyboards cannot
26+
handle so many keys being pressed at the same time, so you might
27+
have better luck with "press Alt", "press SysRq", "release Alt",
28+
"press <command key>", release everything.
2629

2730
On SPARC - You press 'ALT-STOP-<command key>', I believe.
2831

‎Documentation/video4linux/CQcam.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ these procedures.
7171
2.1 Module Configuration
7272

7373
Using modules requires a bit of work to install and pass the
74-
parameters. Do read ../modules.txt, and understand that entries
75-
in /etc/modules.conf of:
74+
parameters. Understand that entries in /etc/modules.conf of:
7675

7776
alias parport_lowlevel parport_pc
7877
options parport_pc io=0x378 irq=none

‎Documentation/vm/hugetlbpage.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ calls. Though the mount of filesystem will be required for using mmaps.
107107
#include <sys/shm.h>
108108
#include <sys/types.h>
109109
#include <sys/mman.h>
110+
#include <errno.h>
110111

111112
extern int errno;
112113
#define SHM_HUGETLB 04000
@@ -167,6 +168,7 @@ main()
167168
#include <stdio.h>
168169
#include <sys/mman.h>
169170
#include <fcntl.h>
171+
#include <errno.h>
170172

171173
#define FILE_NAME "/mnt/hugepagefile"
172174
#define LENGTH (256*1024*1024)

‎Documentation/vm/locking

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Started Oct 1999 by Kanoj Sarcar <kanoj@sgi.com>
1+
Started Oct 1999 by Kanoj Sarcar <kanojsarcar@yahoo.com>
22

33
The intent of this file is to have an uptodate, running commentary
44
from different people about how locking and synchronization is done

‎README

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
Linux kernel release 2.5.xx
1+
Linux kernel release 2.6.xx
22

3-
These are the release notes for Linux version 2.5. Read them carefully,
3+
These are the release notes for Linux version 2.6. Read them carefully,
44
as they tell you what this is all about, explain how to install the
55
kernel, and what to do if something goes wrong.
66

7-
NOTE! As with all odd-numbered releases, 2.5.x is a development kernel.
8-
For stable kernels, see the 2.4.x maintained by Marcelo Tosatti.
9-
107
WHAT IS LINUX?
118

129
Linux is a Unix clone written from scratch by Linus Torvalds with
@@ -55,7 +52,7 @@ INSTALLING the kernel:
5552
directory where you have permissions (eg. your home directory) and
5653
unpack it:
5754

58-
gzip -cd linux-2.5.XX.tar.gz | tar xvf -
55+
gzip -cd linux-2.6.XX.tar.gz | tar xvf -
5956

6057
Replace "XX" with the version number of the latest kernel.
6158

@@ -64,15 +61,15 @@ INSTALLING the kernel:
6461
files. They should match the library, and not get messed up by
6562
whatever the kernel-du-jour happens to be.
6663

67-
- You can also upgrade between 2.5.xx releases by patching. Patches are
64+
- You can also upgrade between 2.6.xx releases by patching. Patches are
6865
distributed in the traditional gzip and the new bzip2 format. To
6966
install by patching, get all the newer patch files, enter the
70-
top level directory of the kernel source (linux-2.5.xx) and execute:
67+
top level directory of the kernel source (linux-2.6.xx) and execute:
7168

72-
gzip -cd ../patch-2.5.xx.gz | patch -p1
69+
gzip -cd ../patch-2.6.xx.gz | patch -p1
7370

7471
or
75-
bzip2 -dc ../patch-2.5.xx.bz2 | patch -p1
72+
bzip2 -dc ../patch-2.6.xx.bz2 | patch -p1
7673

7774
(repeat xx for all versions bigger than the version of your current
7875
source tree, _in_order_) and you should be ok. You may want to remove
@@ -99,7 +96,7 @@ INSTALLING the kernel:
9996

10097
SOFTWARE REQUIREMENTS
10198

102-
Compiling and running the 2.5.xx kernels requires up-to-date
99+
Compiling and running the 2.6.xx kernels requires up-to-date
103100
versions of various software packages. Consult
104101
./Documentation/Changes for the minimum version numbers required
105102
and how to get updates for these packages. Beware that using
@@ -193,8 +190,6 @@ COMPILING the kernel:
193190

194191
- If you configured any of the parts of the kernel as `modules', you
195192
will have to do "make modules" followed by "make modules_install".
196-
Read Documentation/modules.txt for more information. For example,
197-
an explanation of how to use the modules is included there.
198193

199194
- Keep a backup kernel handy in case something goes wrong. This is
200195
especially true for the development releases, since each new release

‎arch/alpha/Kconfig

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -471,21 +471,6 @@ config EISA
471471
bool
472472
depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
473473
default y
474-
---help---
475-
The Extended Industry Standard Architecture (EISA) bus was
476-
developed as an open alternative to the IBM MicroChannel bus.
477-
478-
The EISA bus provided some of the features of the IBM MicroChannel
479-
bus while maintaining backward compatibility with cards made for
480-
the older ISA bus. The EISA bus saw limited use between 1988 and
481-
1995 when it was made obsolete by the PCI bus.
482-
483-
Say Y here if you are building a kernel for an EISA-based machine.
484-
485-
Otherwise, say N.
486-
487-
config EISA_ALWAYS
488-
def_bool EISA
489474

490475
config SMP
491476
bool "Symmetric multi-processing support"

‎arch/alpha/kernel/setup.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <linux/seq_file.h>
3434
#include <linux/root_dev.h>
3535
#include <linux/initrd.h>
36+
#include <linux/eisa.h>
3637
#ifdef CONFIG_MAGIC_SYSRQ
3738
#include <linux/sysrq.h>
3839
#include <linux/reboot.h>
@@ -680,6 +681,11 @@ setup_arch(char **cmdline_p)
680681
/* Default root filesystem to sda2. */
681682
ROOT_DEV = Root_SDA2;
682683

684+
#ifdef CONFIG_EISA
685+
/* FIXME: only set this when we actually have EISA in this box? */
686+
EISA_bus = 1;
687+
#endif
688+
683689
/*
684690
* Check ASN in HWRPB for validity, report if bad.
685691
* FIXME: how was this failing? Should we trust it instead,

‎arch/arm/mm/discontig.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
#include <linux/init.h>
1616
#include <linux/bootmem.h>
1717

18-
#if NR_NODES != 4
18+
#if MAX_NUMNODES != 4
1919
#error Fix Me Please
2020
#endif
2121

2222
/*
2323
* Our node_data structure for discontiguous memory.
2424
*/
2525

26-
static bootmem_data_t node_bootmem_data[NR_NODES];
26+
static bootmem_data_t node_bootmem_data[MAX_NUMNODES];
2727

28-
pg_data_t discontig_node_data[NR_NODES] = {
28+
pg_data_t discontig_node_data[MAX_NUMNODES] = {
2929
{ .bdata = &node_bootmem_data[0] },
3030
{ .bdata = &node_bootmem_data[1] },
3131
{ .bdata = &node_bootmem_data[2] },

‎arch/arm/mm/init.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
#include <asm/mach/arch.h>
3434
#include <asm/mach/map.h>
3535

36-
#ifndef CONFIG_DISCONTIGMEM
37-
#define NR_NODES 1
38-
#else
39-
#define NR_NODES 4
40-
#endif
41-
4236
#ifdef CONFIG_CPU_32
4337
#define TABLE_OFFSET (PTRS_PER_PTE)
4438
#else
@@ -178,7 +172,7 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
178172
{
179173
unsigned int i, bootmem_pages = 0, memend_pfn = 0;
180174

181-
for (i = 0; i < NR_NODES; i++) {
175+
for (i = 0; i < MAX_NUMNODES; i++) {
182176
np[i].start = -1U;
183177
np[i].end = 0;
184178
np[i].bootmap_pages = 0;
@@ -207,7 +201,7 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
207201
* we have, we're in trouble. (maybe we ought to
208202
* limit, instead of bugging?)
209203
*/
210-
if (numnodes > NR_NODES)
204+
if (numnodes > MAX_NUMNODES)
211205
BUG();
212206
}
213207

@@ -365,7 +359,7 @@ static inline void free_bootmem_node_bank(int node, struct meminfo *mi)
365359
*/
366360
void __init bootmem_init(struct meminfo *mi)
367361
{
368-
struct node_info node_info[NR_NODES], *np = node_info;
362+
struct node_info node_info[MAX_NUMNODES], *np = node_info;
369363
unsigned int bootmap_pages, bootmap_pfn, map_pg;
370364
int node, initrd_node;
371365

‎arch/i386/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ config NR_CPUS
447447
default "8"
448448
help
449449
This allows you to specify the maximum number of CPUs which this
450-
kernel will support. The maximum supported value is 32 and the
450+
kernel will support. The maximum supported value is 255 and the
451451
minimum value which makes sense is 2.
452452

453453
This is purely to save memory - each supported CPU adds

‎arch/i386/kernel/i387.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <linux/config.h>
1212
#include <linux/sched.h>
13-
#include <linux/spinlock.h>
1413
#include <asm/processor.h>
1514
#include <asm/i387.h>
1615
#include <asm/math_emu.h>

‎arch/i386/kernel/irq.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ static unsigned int parse_hex_value(const char __user *buffer,
904904
return -EFAULT;
905905

906906
/*
907-
* Parse the first 8 characters as a hex string, any non-hex char
907+
* Parse the first HEX_DIGITS characters as a hex string, any non-hex char
908908
* is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
909909
*/
910910

@@ -965,6 +965,8 @@ static int irq_affinity_write_proc(struct file *file, const char __user *buffer,
965965
return -EIO;
966966

967967
err = parse_hex_value(buffer, count, &new_value);
968+
if (err)
969+
return err;
968970

969971
/*
970972
* Do not allow disabling IRQs completely - it's a too easy

‎arch/i386/kernel/mca.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ struct resource mca_standard_resources[] = {
132132
#define MCA_STANDARD_RESOURCES (sizeof(mca_standard_resources)/sizeof(struct resource))
133133

134134
/**
135-
* mca_read_pos - read the POS registers into a memory buffer
135+
* mca_read_and_store_pos - read the POS registers into a memory buffer
136+
* @pos: a char pointer to 8 bytes, contains the POS register value on
137+
* successful return
136138
*
137139
* Returns 1 if a card actually exists (i.e. the pos isn't
138140
* all 0xff) or 0 otherwise

0 commit comments

Comments
 (0)