]> err.no Git - linux-2.6/commit
uml: move remaining useful contents of user_util.h
authorJeff Dike <jdike@addtoit.com>
Sun, 6 May 2007 21:51:09 +0000 (14:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 7 May 2007 19:13:01 +0000 (12:13 -0700)
commit24fa6c0832f4513ac897082d7d803970a40cc1b0
tree261c0b7612f74b703ce88efb7dd22548779e1399
parent4ff83ce1114827f707b7f1f4f2e5f69de9df94ac
uml: move remaining useful contents of user_util.h

Rescue the useful contents of the soon-to-be-gone user-util.h.

pty.c now gets ptsname from stdlib.h like it should have always done.

CATCH_EINTR is now in os.h, although perhaps all usage should be under
os-Linux at some point.

get_pty is also in os.h.

This patch restores the old definition of ARRAY_SIZE in user.h.  This file is
included only in userspace files, so there will be no conflict with the
kernel's new ARRAY_SIZE.  The copy of the kernel's ARRAY_SIZE and associated
infrastructure is now gone.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/um/drivers/pty.c
arch/um/include/os.h
arch/um/include/user.h
arch/um/include/user_util.h
arch/um/os-Linux/sys-i386/tls.c