From: Dave Hansen <haveblue@us.ibm.com>, Bill Irwin

With PAE on, there are only 4 PGD entries.  The kernel ones never change,
so there is no need to copy them when a vmalloc fault occurs.  This was
this was causing problems with the split pmd patches, but it is still
correct for mainline.

Tested with and without PAE.  I ran it in a loop turning on and off 10 swap
partitions, which is what excited the original bug.
http://bugme.osdl.org/show_bug.cgi?id=640

If a swapfile is ftruncated while in use, subsequent swapout will scribble on
the filesystem.

This is a case of root-shoot-foot, but wrecking the fs is a fairly rude
response.  And it's easy to fix: hold i_sem across the life of the swapon.

From: Manfred Spraul <manfred@colorfullife.com>

Real 80386 cpus ignore the write protected bit in the page tables when
running in supervisory mode.  Thus the write protected bit must be checked by
software.  The current implementation does that check during access_ok().
This can result in data corruptions, if kswapd starts a swap-out between the
access_ok and the actual write operation.

To fix this, the patch moves the check from access_ok() into
__copy_to_user_ll(), and redirects all user space writes into
__copy_to_user_ll().  The patch only affects kernels build for 80386 cpus.
Additionally, the patch removes the dead prototypes for __put_user_{1,2,4,8}.

Due to the uninlining of access_ok, the .text segment is now ~ 8 kB shorter.

From: Monchi Abbad <kernel@axion.demon.nl>

I found a mistake in the dvbdev.c file when creating the dvb /devfs files,
it created /dev/dvb/adapter0device0 instead of /dev/dvb/adapter0/device0.
But here is a simple fix.

From: Christoph Hellwig <hch@lst.de>

This is a pretty huge patch, but splitting it doesn't make a lot
of sense..

(USB may still need work)

From: Christoph Hellwig <hch@lst.de>

partition_name() is a variant of __bdevname() that caches results and
returns a pointrer to kmalloc()ed data instead of printing into a buffer.
Due to it's caching it gets utterly confused when the name for a dev_t
changes (can happen easily now with device mapper and probably in the
future with dynamic dev_t users).

It's only used by the raid code and most calls are through a wrapper,
bdev_partition_name() which takes a struct block_device * that maybe be
NULL.

The patch below changes the bdev_partition_name() to call bdevname() if
possible and the other calls where we really have nothing more than a dev_t
to __bdevname.

Btw, it would be nice if someone who knows the md code a bit better than me
could remove bdev_partition_name() in favour of direct calls to bdevname()
where possible - that would also get rid of the returns pointer to string
on stack issue that this patch can't fix yet.

From: Christoph Hellwig <hch@lst.de>

Some people may already have noticed that I've been revamping the devfs API
recently.  The worst offender still left is devfs_register, it's prototype
is:

	 devfs_handle_t devfs_register(devfs_handle_t dir,
		const char *name, unsigned int flags,
		unsigned int major, unsigned int minor,
		umode_t mode, void *ops, void *info)

Of these:

 - dir and flags are always zero
 - the return value is never used
 - info is only used in one driver which doesn't even need it for
   operation
 - umode_t always describes a character device
 - name very often comes from a stack buffer we sprintf'ed into

so obviously we really want a much simpler API instead.  My first draft for
this was:

	int devfs_mk_cdev(dev_t dev, umode_t mode,
		struct file_operations *fops, void *info,
		const char *fmt, ...)

this removes the unused argumens, switches to a proper dev_t for the device
number and allows to directly use a printf-like expression as name, getting
rid of the temporary buffers.

Now Al has reappeared and put the first steps of his CIDR for charater device
on public ftp and we'll soon have a similar lookup object + fops mechanism in
generic code as we already habe for blockdevices, i.e.  the devfs code to
assign fops from an entry will become superflous as generic code already does
it.  That means the fops and info arguments are obsolete before they were
introduced, so I'd like to propose the following API instead:

	int devfs_mk_cdev(dev_t dev, umode_t mode, const char *fmt, ...)

which is much nicer anyway.  The educated reader will notice that this is
exactly the same prototype devfs_mk_bdev has so I'll probably get suggestions
to merge those two into some kind of devfs_mk_node soon.  Personally I don't
like that as character and blockdevices are two really separate entinities
and I'll like to keep them as separate as possible.

Example patch that introduces the API and converts drivers/input attached.

Every driver which calls devfs_mk_cdev (about 50) needs conversion.  Note
that the transition can happen in pieces - devfs_register continues to work
after this patch, it's just the plan to get rid of it in the end.

From: Christoph Hellwig <hch@lst.de>

disk_name() (and hence bdevname()) are now returning devfs-style device names
when devfs is enabled.

This is nice, but these names are very long, and they overflow the 32-char
buffers which these functions use.

The choices are:

a) Use a bigger buffer (increase BDEVNAME_SIZE).

   This might be practical.  But how big?

b) return the name in kmalloced memory, make caller free it up.   Yuk.

c) Add a print_bdevname() thing and intersperse that amongst the printk's.
   This would work.

d) Just print the non-devfs device name.   That's what this patch does.

From: Chris Heath <chris@heathens.co.nz>

This patch fixes the PrintScreen key when CONFIG_MAGIC_SYSRQ is enabled.  It
allows you to use that key normally when Alt is not being pressed.  Patch is
against kernel 2.5.68.

From: Zwane Mwaikambo <zwane@linuxpower.ca>

update pcmcia drivers for new IRQ API

From:  Stewart Smith <stewartsmith@mac.com>

Remove the UPDATE_ATIME() macro, use update_atime() directly.

From: Christoph Hellwig <hch@lst.de>

Change sysrq sync/remount from a magic bdflush hook to proper pdflush
operations.  The sync operation reuses most of the regular sys_sync path now
instead of implementing it's own superblock walking and (broken) local disk
detection, the remount implementation has been moved to super.c, cleaned up
and updated for the last two years locking changes.  It also shares some code
with the regular remount path now.

From: Manfred Spraul <manfred@colorfullife.com>

attached is the promised cleanup/bugfix patch for the slab bootstrap:

- kmem_cache_init & kmem_cache_sizes_init merged into one function,
  called after mem_init().  It's impossible to bring slab to an operational
  state without working gfp, thus the early partial initialization is not
  necessary.

- g_cpucache_up set to FULL at the end of kmem_cache_init instead of the
  module init call.  This is a bugfix: slab was completely initialized,
  just the update of the state was missing.

- some documentation for the bootstrap added.

The minimal fix for the bug is a two-liner: move g_cpucache_up=FULL from
cpucache_init to kmem_cache_sizes_init, but I want to get rid of
kmem_cache_sizes_init, too.

The timer is being initialised too late (in ->open()).  If modprobe fails we
get an uninitialised timer warning.

From: Michael Buesch <fsdeveloper@yahoo.de> and Paul Schroeder.

mwavedd.h needs <linux/wait.h> and smapi.h

- ifdef fix in kmap_types.h (Oleg Drokin)

- remove redundant ext3 inclusions (Burton Windle)

- Fix misidentified warning printk in vmalloc.c

- radeon_cp printk warning fix (Randy Dunlap)

- Update minimum binutils version for the ".incbin" thing in vsyscall.S

- update raw driver to recent module API.

- update my email address

From: Zwane Mwaikambo <zwane@linuxpower.ca>

There was a 2.4 merge from Alan Cox, but a few #ifdef's got shuffled around
in the process, resulting in a broken build for !CONFIG_PM

From: Andi Kleen <ak@muc.de>

This driver was bogusly relying on the dropping of the __exit section at link
time.  cpia_exit() is calling proc_cpia_destroy(), which doesn't even exist
if !CONFIG_MODULE.

From: Andi Kleen <ak@muc.de>

Some configs didn't link anymore because they got references from
.altinstructions to __exit functions.  Fixing it at the linker level is not
easily possible.  This patch just discards .text.exit at runtime instead of
link time to avoid this.

It will also fix a related problem with .eh_frame in modern gcc (so far only
observed on x86-64, but could happen on i386 too)

From: Andi Kleen <ak@muc.de>

This patch adds an generic x86 subarchitecture. It is intended to provide
an dynamic interface for APIC drivers. There are already three subarchitectures
(bigsmp, summit, default) that only differ in how they drive the local APIC.
A fourth - Unisys ES7000 - is scheduled to be merged soon.

The subarchitecture concept separated this nicely, but it has the big
drawback that they are compile time options. A Linux vendor cannot
ship own binary kernel rpms for all of these machines. Runtime probing
is needed instead.

This patch adds a new "generic" subarchitecture that just acts as a
dynamic switching layer for APIC drivers. It only tries to virtualize
the APICs, no attempt is made to cover further incompatiblities.
This means machines like the Visual Workstation, pc9800 or
Voyager are not covered; but these are unlikely to be supported by
binary distributions anyways.

The generic arch reuses the existing interface in mach_ipi / mach_mpparse.h /
mach_apic.h and just pulls it using some macros into an "struct genapic"
object. The main APIC code does not recognize it, it is all hidden
in the mach-generic include files.

Auto detection of APIC types is supported in the usual way used by
existing ports like Summit - checking ACPI or mptables for specific
signatures - or it can be specified by the user using a new "apic="
boot option. I also moved the DMI scan to before the generic
subarchitecture probe, so DMI could be used in future too to probe
specific machines.

Some minor hacks were needed to avoid circular declaration of a few
symbols, but overall it's fairly clean.

The patch has been tested on a Summit machine, an generic 4 virtual CPUs
Xeon and on an ES7000.

user-supplied source checker on all C files before compiling
them.

I'll release the actual checker once I've cleaned it up a
bit more (yay, all the copyright paperwork completed!)

"defined()" rather than using it as a value.

properly checked with the rest of the kernel.

into penguin.transmeta.com:/home/torvalds/v2.5/linux

into kroah.com:/home/greg/linux/BK/gregkh-2.5

into penguin.transmeta.com:/home/torvalds/v2.5/linux