diff -urN linux-2.6.18-openvz-028.027/arch/x86_64/boot/compressed/Makefile linux-current/arch/x86_64/boot/compressed/Makefile
--- linux-2.6.18-openvz-028.027/arch/x86_64/boot/compressed/Makefile	2006-09-19 21:42:06.000000000 -0600
+++ linux-current/arch/x86_64/boot/compressed/Makefile	2007-10-18 10:44:40.000000000 -0600
@@ -7,7 +7,8 @@
 #
 
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS	:= -traditional -m32
+EXTRA_AFLAGS	:= -traditional
+AFLAGS		:= $(subst -m64,-m32,$(AFLAGS))
 
 # cannot use EXTRA_CFLAGS because base CFLAGS contains -mkernel which conflicts with
 # -m32
diff -urN linux-2.6.18-openvz-028.027/include/linux/sched.h linux-current/include/linux/sched.h
--- linux-2.6.18-openvz-028.027/include/linux/sched.h	2007-11-09 06:00:27.000000000 -0700
+++ linux-current/include/linux/sched.h	2007-10-18 11:14:40.000000000 -0600
@@ -1286,6 +1286,8 @@
 
 #define find_task_by_pid_all(nr)	\
 		find_task_by_pid_type_all(PIDTYPE_PID, nr)
+#define find_task_by_pid(nr) find_task_by_pid(nr)
+
 extern struct task_struct *find_task_by_pid_type_all(int type, int pid);
 extern void set_special_pids(pid_t session, pid_t pgrp);
 extern void __set_special_pids(pid_t session, pid_t pgrp);