into nuts.ninka.net:/disk1/davem/BK/net-2.5

Since sdla.c now has locking instead of cli/sti, it shouldn't be
completely busted on SMP.

Also, the frad interface registration needed to be done once
(and check the result), and undone on module unload.

* get rid of leftover sti
* no longer need MOD_INC/DEC stuff
* get rid of dead code related to MOD_INC/DEC
* use module_init/module_exit to cleanly run init code

into nuts.ninka.net:/disk1/davem/BK/net-2.5

try_then_request_module() does what crypto/autoload.c is doing, so
replace it.  Fix try_then_request_module(), too (thanks James).

I should have stayed in bed.

Apparently the new gcc 3.2.2 allows local variable declarations within
the code of a function if it is not used earlier. But older gcc's do
not allow this. 

into nuts.ninka.net:/disk1/davem/BK/net-2.5

Cleanup ikconfig
	- use single_open for built_with file.
	- get rid of unneeded globals
	- use copy_to_user instead of char at a time
	- only need the read routine, proc defaults to correct behaviour
	  for the rest.

When mmap MAP_SHARED is done on a file, it gets marked with VM_MAYSHARE
and, if it's read/write, VM_SHARED.  However, if it is remapped with
mremap(), the MAP_SHARED is only passed into the new mapping based on
VM_SHARED.  This means that remapped read only MAP_SHARED mappings lose
VM_MAYSHARE.  This is causing us a problem on parisc because we have to
align all shared mappings carefully to mitigate cache aliasing problems.

The fix is to key passing the MAP_SHARED flag back into the remapped are
off VM_MAYSHARE not VM_SHARED.

driver->supports_dma was used together with CONFIG_IDEDMA_ONLYDISK to limit
DMA access to disk devices only.  However Alan introduced new scheme in 2.5.63
and this field is not needed any longer because all ide drivers support DMA.

From Benjamin Herrenschmidt <benh@kernel.crashing.org>

into home.osdl.org:/home/torvalds/v2.5/linux

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.6

Some references to irq_stat[] snuck into generic code.  It doesn't work on
several architectures.

So revert that little improvement to the original version.

It seems that changing CONFIG_BLK_DEV_INITRD causes the whole kernel to
rebuild due to an inappropriate ifdef in linux/fs.h - we should not
conditionalise prototypes.

In addition, real_root_dev is only used by two files (kernel/sysctl.c
and init/do_mounts_initrd.c) so it makes even less sense that it was in
linux/fs.h

into home.osdl.org:/home/torvalds/v2.5/linux

into kernel.bkbits.net:/home/davem/net-2.5

This patch fixes a logic bug in NAT range calculations, which also
causes a large slowdown when ICMP floods go through NAT.

Author: Karlis Peisenieks

From: Rusty Russell <rusty@rustcorp.com.au>

Rather than hardcoded names in modprobe, modules can offer their own
aliases (which can be overridden by the config file).

Here are the tty-ldisc ones.

From: mike.miller@hp.com

Clean up the error handling in cciss_init_one().

From: Michael Pruznick <michael_pruznick@mvista.com>

build errors:
  hermes.h: In function `hermes_set_irqmask':
  hermes.h:337: parse error before "do"
  hermes.h:337: parse error before ';' token
  hermes.h: In function `hermes_write_words':

In mips, outw_p() is a #define do...while(0) which, in the case of ?:,
results in a statement being used where an expression is required.

From: Rusty Russell <rusty@rustcorp.com.au>

Please delete Documentation/kmod.txt: it's entirely outdated and misleading.

I thought about rewriting it, but there's not much to add beyond what's in
the CONFIG_KMOD's help text.

The same address `i8042_request_irq_cookie' is used in three places for the
i8042 request_irq() argument.  This means that if someone calls
i8042_check_mux() or i8042_check_aux() while the IRQ is in use, the
free_irq() call in there will free the wrong IRQ handler.

So give all three instances of request_irq() in i8042.c a distinct address by
which to identify the IRQ instance.

(This is probably a non-bug, because the `check' functions are not called
when the device is open, but it is better this way).

From: Andrew Lunn <andrew@lunn.ch>

Create the pty slaves on init so the behaviour is consistant with 2.4 and 2.6
without devfs.

From: James Morris <jmorris@redhat.com>

This patch adds an 'selinux' boot parameter which must be used to actually
enable SELinux.

It follows some internal discussion about deployment issues, where a vendor
would want to ship a single kernel image with SELinux built-in, without
requiring the user to use it.

Without specifying selinux=1 as a boot parameter, SELinux will not register
with LSM and selinuxfs will not be registered as a filesystem.  This causes
SELinux to be bypassed entirely from then on, and no performance overhead
is imposed.  Other security modules may then also be loaded if needed.