Merge http://jdike.stearns.org:5000/fixes-2.5

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

diff --cc arch/um/Kconfig
index 632e046fb928fe698a87e324430a26fdf4a0aecd,d1e0008f639b17bb7b6d780db50250f7283b78a7..b95f163c71bab6a35bd12975c13a03783a87ef7a
--- 1/arch/um/Kconfig
--- 2/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -168,29 -170,9 +170,17 @@@ config KERNEL_HALF_GIG
  config HIGHMEM
        bool "Highmem support"
  
 +config KERNEL_STACK_ORDER
 +      int "Kernel stack size order"
 +      default 2
 +      help
 +      This option determines the size of UML kernel stacks.  They will
 +      be 1 << order pages.  The default is OK unless you're running Valgrind
 +      on UML, in which case, set this to 3.
 +
  endmenu
  
- 
- menu "Loadable module support"
- 
- config MODULES
-       bool "Enable loadable module support"
- 
- # MODVERSIONS does not yet work in this architecture
- #   bool '  Set version information on all module symbols' CONFIG_MODVERSIONS
- config KMOD
-       bool "Kernel module loader"
-       depends on MODULES
- 
- endmenu
+ source "init/Kconfig"
  
  source "arch/um/Kconfig_char"
  

diff --cc arch/um/kernel/Makefile
Simple merge

diff --cc arch/um/kernel/ksyms.c
Simple merge

diff --cc arch/um/kernel/process_kern.c
Simple merge

diff --cc arch/um/kernel/time_kern.c
Simple merge

diff --cc arch/um/kernel/tt/Makefile
index ea519a34a4bc504fe4ff017dec6f4f1e1889cc58,24aa3f3064369c58264b4dedf5f07065cd7e7d7a..9464699ee1c1d9e397dad34b2fee95d341ea12e7
--- 1/arch/um/kernel/tt/Makefile
--- 2/arch/um/kernel/tt/Makefile
+++ b/arch/um/kernel/tt/Makefile
@@@ -7,8 -9,10 +9,8 @@@ obj-y = exec_kern.o exec_user.o gdb.o k
        syscall_kern.o syscall_user.o time.o tlb.o tracer.o trap_user.o \
        uaccess_user.o sys-$(SUBARCH)/
  
- obj-$(CONFIG_PT_PROXY) += ptproxy/
+ obj-$(CONFIG_PT_PROXY) += gdb_kern.o ptproxy/
  
 -export-objs = ksyms.o
 -
  USER_OBJS := $(filter %_user.o,$(obj-y)) gdb.o time.o tracer.o
  USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
  

diff --cc arch/um/kernel/tt/process_kern.c
Simple merge

diff --cc arch/um/kernel/um_arch.c
Simple merge

diff --cc arch/um/kernel/user_util.c
Simple merge

diff --cc arch/um/sys-i386/Makefile
Simple merge