This old __per_cpu_data define wasn't enough if an arch wants to
use the gcc __thread prefix (thread local storage), which needs to
go *before* the type in the definition.  So we have to go for a
DECLARE macro, and while we're there, separate DECLARE and DEFINE,
as definitions of per-cpu data cannot live in modules.  This also
means that accidental direct references to per-cpu variables will
be caught at compile time.

This makes introduces get_cpu_var()/put_cpu_var() which gets a
per-cpu variable and disables preemption, and renames the (unsafe
under preemption) "this_cpu()" macro to __get_cpu_var().  It also
deletes the redundant definitions in linux/smp.h.

As per Andrew Morton's request.

This moves the early ioremap call to after cpu_online_map is initialized.
Note everything is wrapped in clustered_apic_mode, so should be safe.

When you reverted the stringify changes I sent last time, you missed removing
a comment, which is now grossly wrong.  This patch finishes the job.

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

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

Most syscall take a const char * argument in fact, also mark them extern.

This is part 3 of 3 of the genrtc patches.  This is my own slight bit
of work, as well as some work by Randolph Chung. This changes
set_rtc_time(struct *rtc_time) to return an int instead of void.
This was done so that the arch-specific code here could do additional
checks on the time and return an error if needed. This then introduces
include/asm-generic/rtc.h, include/asm-i386/rtc.h and
include/asm-alpha/rtc.h.  include/asm-generic/rtc.h contains the
get_rtc_time and set_rtc_time logic that is in drivers/char/rtc.c and
has been tested on SMP i386.  This also modifies include/asm-ppc/rtc.h
to return -ENODEV if no rtc hardware is present.

Additionally, Dave Jones pointed out to me a place where we might not be
safe when jiffies wraps, so this switches that to time_after().

From Randolph Chung, support for a 64bit kernel and a 32bit userland.

This is part 2 of 3 of the genrtc driver work.  This is the PPC portion
of the patch, which creates include/asm-ppc/rtc.h.  This has been in the
PPC bitkeeper tree for over a month now.

This is the current version of the genrtc driver from the m68k
community.  This is slightly different than the version I have sent
previously in that it has been switched to C99-style initializers,
which was done in the current m68k CVS tree by Geert Uytterhoeven, and
the needed changes to select/compile it in general.  I had previously
asked the m68k community if anyone objected to this being submitted by me,
and I got Richard Zidlicky's (who's at the top of the file) approval, as
well as Geert Uytterhoeven's approval.

i2c update:
 o Support for SMBus 2.0 PEC Packet Error Checking
 o New adapter-i2c-frodo for SA 1110 board
 o New adapter-i2c-rpx for embeded MPC8XX
 o Replace depreciated cli()&sti() with spin_{un}lock_irq()
 o Updated documentation

This patch adds sendfile() support to fatfs.

sys_sendfile() call,

    do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS);
        in_file->f_op->sendfile(out_file, in_file, ppos, count);

But,

ssize_t generic_file_sendfile(struct file *in_file, struct file *out_file,
			      loff_t *ppos, size_t count)

fist arg of generic_file_sendfile() should be for output. This patch
fixes this typo.

There are a number of places where generic_file_write could be used if
it didn't take i_sem by itself or where it doesn't need it:

(1)	XFS needs to do some preparation in it's write file operation
	(most notably taking it's own per-inode locks), after taking
	i_sem, but before calling the guts of generic_file_write.
(2)	blockdevices are happy with parralel get_block() operations,
	and there is nothing i_sem could protect.

This patch introduces a generic_file_write_nolock and makes the good old
generic_file_write a wrapper around.  The block device code is switched
over to it.

The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.

These are the completely generic bits (linux/init_task.h and linux/wait.h).

From: Art Haas <ahaas@neosoft.com>

  Here's the latest diffs for the files in include/linux.
  Patches are against 2.5.31.

The following patch from Anton Blanchard fixes a problem with the
sym53c8xx_2 driver in the 2.5 tree.  It assumes that the eh error
handlers are not called with the host lock held, which they are.

The code already copes with the possibility of having
read some of the 4byte length but not all, but can never
get into that situation.  We just need to add a 'return'
for the case where read got some data but not enough.
Either 0 or -EAGAIN could be returned, they both have the
same effect.

Now that we actually do shutdown the socket, we should
say so instead of just saying that we should....

Otherwise if you cannot stop and restart nfsd while a client holds a
connection.  Why this isn't the default I cannot imagine...

Currently svc_sock_setbuf can be called under a spinlock,
but it can try to lock a socket, which can block....

Now when we decide that changing the size might be good we
set a flag (SK_CHNGBUF) and then later (when the next
packet arrives) we change the sizes appropriately.

This (tested) patch fixes APM support on 2.5.31-BK.  The patch is based
on Stephen Rothwell's patch.

into maxwell.earthlink.net:/usr/src/fbdev-2.5

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

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

- Unlock the page in an out of memory error code path in
  fs/ntfs/aops.c::ntfs_read_block().
- If fs/ntfs/aops.c::ntfs_read_page() is called on an uptodate page,
  just unlock the page and return. (This can happen due to ->writepage
  clearing PageUptodate() during write out of MstProtected()
  attributes.
- Remove leaked write code again.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

The following patch corrects a bug where rmap would continue trying to
swap out a page even after it failed on one pte, which could result in
leaked pte chains and a bug when exiting applications which use mlock().

The bug was tracked down by Christian Ehrhardt, the reason it wasn't
found earlier was a subtlety in the code, so I've taken the liberty of
changing Christian's patch into something more explicit, we shouldn't
let this one happen again ;)

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

Misc.  compile fixes, xd.c switched to per-disk gendisks, Alan's 2.4
fixes for xd.c ported.

DAC960 switched to per-disk gendisks.

	KOCHI Takayoshi.