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

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

Fixed the type of SIOCGIFCONF callback; inet instance was already
correctly annotated, decnet one was _not_.  Moreover, decnet callback
needed fixing - dereferencing userland address.

Made ->write_proc in tty_driver suitable for procfs write callback

n_tty annotated, ldisc_struct ->read() and ->write() got __user
on their buf argument.

vt, vt_ioctl, consolemap and selection annotated, struct unimapdesc
and struct consolefontdesc got __user on their pointer members.

tty_ioctl.c annotation

tty_io.c annotated

That "u64" in there is actually struct iocb __user *.  Changed
prototype, killed casts in body and caller...

return void in floppy.h and "conditionally long" constants in page.h.

Would be useful to teach as(1) about C notation for long...

Long constants marked as such.

#if where #ifdef should've been.  Fixed.

Annotation of amd64 code - just adding __user where needed...

	Annotated basic primitives (copy_.._user, get_user, ...).
Functions got __user in prototypes, macros (in uaccess.h) got a
conditional check - see CHECK_UPTR() below.  If you have more elegant
way to deal with the macros - please, tell.

	Annotation of net/* ...copy... that deals with userland pointers +
several bits that fell out of previous patch (trivial annotations)

	dev_ioctl() has a __user pointer argument; however, its declaration
lacks that and callers are also wrong.  Declaration fixed, callers updated.

Here's the tail of setsockopt I've missed - for old protocol families we
have wrappers around those methods.

I managed to break compilation with my last patch with a last minute edit.

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

that can also be used in assembly language context.

This one fixes the common CPU_FTR_COHERENT_ICACHE warning in
asm/cacheflush.h.

x86-64 shares some numa code with i386, and that didn't handle holes in
the node map properly.  Fix this.

Add accumulated bug fixes for x86-64 and some minor cleanups.

 - Add ptep_set_access_flags from i386
 - Change memory text mapping to 10MB from 40MB to make alias window
   smaller
 - Disable change_page_attr for kernel mapoing for now (wrong, but the
   other code also doesn't work)
 - Add .bss.page_aligned and align interrupt/exception stacks (idea from
   Matt Mackall)
 - Protect sysenter MSR setup against missing registers. 
 - Set mce tolerance level to 1 (panic instead of deadlock)
 - Fix cross 4GB bug in find_first_bit (Michael Matz)
 - Add missing memory clobbers in bitops.h (Suresh B.  Siddha)
 - Check kernel size at boot up
 - Set boot cpu online at boot to fix early printk
 - Fix EFER bit definitions (Dave Jones)
 - Fix comments in 32bit syscall table.
 - Quieten all 32bit syscalls that are unimplemented in 32bit. 
 - Various MCE fixes suggested by Eric Morton, David Boles et.al.
   More to come.
 - Quieten some printks
 - Fix cpu online check in msr driver
 - Lower polling interval for machine checks to 5 minutes to avoid
   overrunning the registers. 
 - Make memcpy_{from,to}io more compatible with i386 (Roland Dreier)

sparse to warn about implicit typing.

The following patch makes the vram boot option actually be recognized
and its value assigned to the vram variable.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	netfilter set/getsockopt annotated.  That's a continuation of previous
patch - by now the only remaining place where setsockopt()/getsockopt()
userland pointers are not traced is vcc_[sg]etsockopt() and down into the
ATM drivers.  Everything from that area in net/* should be done by now.

	That's pretty much it as far as non-trivial splitting counts; remaining
patches in net/* are independent, tty and console stuff is also not hard to
split (not much of it, anyway) and what remains is arch-dependent code for
alpha and amd64.  Of course there'll be more stuff coming, but as far as I'm
concerned the rest of my pile is managable - and finally below 200Kb.  That'll
go tomorrow - right now I'm going down and getting some sleep...

This fixes sparse warnings for the user write method, and the UART
ioctl functions which copy data to/from userspace.

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

Patch from Nicolas Pitre

... since this is not supported at the moment and would fail to build.

Patch from Nicolas Pitre

Patch from Nicolas Pitre

Correcting my own screw-up, found by Ian Campbell.