Noticed by Christoph Hellwig <hch@lst.de>.

Probably somebody got the logic wrong while adding
#ifndef CONFIG_BLK_DEV_IDECS back in 2.4.0-test2.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ide-disk only checks for drive->blocked and blk_fs_request() if TASKFILE_IO
is defined.  Move these checks (and TCQ check too) to upper function.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ptep_establish() is used to establish a new mapping at COW time,
and it always replaces a non-writable page mapping with a totally
new page mapping that is dirty (and likely writable, although ptrace
may cause a non-writable new mapping). Because it was nonwritable,
we don't have to worry about losing concurrent dirty page bit updates.

ptep_update_access_flags() leaves the same page mapping, but updates
the accessed/dirty/writable bits (it only ever sets them, and never
removes any permissions). Often easier, but it may race with a dirty
bit update on another CPU.

Booted on x86 and ppc64.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

PAGE_SIZE isn't even always defined at this point,
which makes us test undefined preprocessor symbols.

It so happens that the test works in that case,
but since the test is a bit pointless in the first
place...

some rather subtle C type expansion rules.

This makes sparse happier.

This helps reduce sparse noise.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into kernel.bkbits.net:/home/davem/tg3-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

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

When trying to spddelete individual entries using setkey, spddelete always 
fails.  The culprit is in net/af_key.c; spdadd sets the family field of the 
selector when creating an entry, but spddelete doesn't when building a 
selector to match for xfrm_policy_bysel.  Trivial fix is to have spddelete 
set the family field in the selector in same way spdadd does.

helper function to write-back the dirty and accessed bits from
ptep_establish().

Right now this defaults to the same old "set_pte()" that we've
always done, except for x86 where we now fix the (unlikely)
race in updating accessed bits and dropping a concurrent dirty
bit.

preparation for pte update race fix.

This does not actually use the information yet, but
the next few patches will start to put it to some
good use.

Fix over long nodemask clearing in get_mem_policy() by using the
right size for the node mask.

In xfrm_state_find, the larval state never actually matures with
Openswan so it only ever gets deleted by the timer which means
that the time crash can't happen :)  It becomes a (possible) memory
leak instead.

Trent Jarvi <taj@www.linux.org.uk> noticed this.  The file was out of date
with current web site and maintainer.  Please apply to 2.4 and 2.6.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

into nuts.davemloft.net:/disk1/BK/net-2.6

Even with a 16kB stack, we have been seeing stack overflows on PPC64
under stress.  This patch implements separate per-cpu stacks for
processing interrupts and softirqs, along the lines of the
CONFIG_4KSTACKS stuff on x86.  At the moment the stacks are still 16kB
but I hope we can reduce that to 8kB in future.  (Gcc is capable of
adding instructions to the function prolog to check the stack pointer
whenever it moves it downwards, and I want to use that when I try
using 8kB stacks so I can be confident that we aren't overflowing the
stack.)
Signed-off-by: Paul Mackerras <paulus@samba.org>

This patch, from Venkatesh Pallipadi, changes x86 IO-APICs to use fixed
interrupt delivery instead of lowest priority to support larger number
of CPUs.  Only bigsmp is affected by this cleanup. 

From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Signed-off-by: Marcus Meissner <meissner@suse.de>

Added missing DM_REMOVE_ALL call.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

We can avoid the local_irq_enable() in sched_yield() because schedule()
unconditionally enables interrupts anyway.

Signed-off-by: Christian Meder <chris@onestepahead.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

sched.h typo fix from Christian Meder.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Add a warning that "idle=poll" is a performance hit on hyperthreaded CPUs.

From: Bart Samwel <bart@samwel.tk>

Currently the ACPI binding script in the Laptop Mode doc always says "20
seconds" and "2 hours" for the timeouts it uses.  This is incorrect if the
user changed the config values, so we print something more general.

From: William Lee Irwin III <wli@holomorphy.com>

PMD_SIZE is not a compile-time constant on sparc.  Use min() in there so
that the cluster size will be evaluated at runtime if the architecture
insists on doing that.

It's initialising slot 24 in two places.  Gerd Knorr <kraxel@bytesex.org> says
"This one should be 23.".

From: Andi Kleen <ak@muc.de>

The 32bit generic nops added with a previous patch to x86-64 alternative()
are not completely 64bit clean.  This caused crashes in some cases.  This
patch reverts this broken change.

From: David Sanders <linux@sandersweb.net>

Patch adds support for the emulated Soundblaster 16 in Virtual PC 2004.

From: FabF <fabian.frederick@skynet.be>

Signed-off-by: Christian Meder <chris@onestepahead.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

The following obviously correct patch from Christian Meder simplifies the
DELTA() define.

From: Andi Kleen <ak@muc.de>

Really enable the NUMA API system calls on x86-64.

Signed-off-by: Hugh Dickins <hugh@veritas.com>

sys_remap_file_pages is declared as asmlinkage in mm/fremap.c, but is the one
syscall declared without asmlinkage in include/linux/syscalls.h.

Signed-off-by: Hugh Dickins <hugh@veritas.com>

It seems eccentric to implement MAP_POPULATE only on PROT_NONE mappings:
do_mmap_pgoff is passing down prot, then sys_remap_file_pages verifies it's
not set.  I guess that's an oversight from when we realized that the prot arg
to sys_remap_file_pages was misdesigned.

There's another oddity whose heritage is harder for me to understand, so
please let me leave it to you: sys_remap_file_pages is declared as asmlinkage
in mm/fremap.c, but is the one syscall declared without asmlinkage in
include/linux/syscalls.h.

From: Jeff Mahoney <jeffm@suse.com>

The following is a patch to fix a locking problem in ACL/xattr code. It
manifests when a user attempts to set an xattr on a file which they do
not own, and on which an ACL is applied.

What happens is this:
reiserfs_setxattr [write lock inode xattr sem]
  ->xattr_set
    -> lookup
       -> __reiserfs_permission [if conditions above are met, and need_lock=
 is
          unset, read lock inode xattr sem] *lockup*

Since we already keep track of when to lock during permission calls, the
fix is simple: just make the locking conditional as it was before.

Credits to Andreas Gruenbacher <agruen@suse.de>

From: Ben Fennema <bfennema@falcon.csc.calpoly.edu>

The problem occured when files were stored on the disc in 16-bit per
character mode when all the upper bits were 0.  The fs module
converted the file name given by the user to a 8-bit per character
string to compare, so the comparison always failed.

The patch maps the file from disc into the current locale and then
compares it directly to the file name given by the user.