---
 Makefile                 |    6 +++---
 include/Kbuild           |    1 +
 scripts/package/buildtar |   12 +++++++++---
 tests/Makefile           |    5 +----
 4 files changed, 14 insertions(+), 10 deletions(-)

Index: linux-2.6/scripts/package/buildtar
===================================================================
--- linux-2.6.orig/scripts/package/buildtar	2007-10-27 17:27:17.779666436 -0700
+++ linux-2.6/scripts/package/buildtar	2007-10-27 17:28:21.378416328 -0700
@@ -16,7 +16,7 @@ set -e
 # Some variables and settings used throughout the script
 #
 tmpdir="${objtree}/tar-install"
-tarball="${objtree}/linux-${KERNELRELEASE}.tar"
+tarball="${HOME}/k/k-${KERNELRELEASE}.t"
 
 
 #
@@ -29,11 +29,11 @@ case "${1}" in
 		;;
 	targz-pkg)
 		compress="gzip -c9"
-		file_ext=".gz"
+		file_ext="gz"
 		;;
 	tarbz2-pkg)
 		compress="bzip2 -c9"
-		file_ext=".bz2"
+		file_ext="bz2"
 		;;
 	*)
 		echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
@@ -79,6 +79,12 @@ case "${ARCH}" in
 		[ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
 		[ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
 		;;
+	ia64)
+		[ -f "${objtree}/vmlinux.gz" ] && cp -v -- "${objtree}/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+		mkdir -p "${tmpdir}/boot/efi/efi/SuSE"
+		[ -f "${objtree}/vmlinux.gz" ] && cp -v -- "${objtree}/vmlinux.gz" "${tmpdir}/boot/efi/efi/SuSE/vmlinuz-christoph"
+		rm -f "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+		;;
 	*)
 		[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
 		echo "" >&2
Index: linux-2.6/Makefile
===================================================================
--- linux-2.6.orig/Makefile	2007-10-27 17:27:17.787666329 -0700
+++ linux-2.6/Makefile	2007-10-27 17:48:08.059666388 -0700
@@ -116,8 +116,8 @@ KBUILD_OUTPUT := $(shell cd $(KBUILD_OUT
 $(if $(KBUILD_OUTPUT),, \
      $(error output directory "$(saved-output)" does not exist))
 # Check that OUTPUT directory is not the same as where we have kernel src
-$(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \
-     $(error Output directory (O=...) specifies kernel src dir))
+#$(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \
+#     $(error Output directory (O=...) specifies kernel src dir))
 
 PHONY += $(MAKECMDGOALS) sub-make
 
@@ -577,7 +577,7 @@ export mod_strip_cmd
 
 
 ifeq ($(KBUILD_EXTMOD),)
-core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
+core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ tests/
 
 vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
Index: linux-2.6/include/Kbuild
===================================================================
--- linux-2.6.orig/include/Kbuild	2007-10-27 17:27:03.598916035 -0700
+++ linux-2.6/include/Kbuild	2007-10-27 17:48:08.059666388 -0700
@@ -4,5 +4,6 @@ header-y += sound/
 header-y += mtd/
 header-y += rdma/
 header-y += video/
+header-y += tests/
 
 header-y += asm-$(ARCH)/
Index: linux-2.6/tests/Makefile
===================================================================
--- linux-2.6.orig/tests/Makefile	2007-10-27 17:27:03.586415997 -0700
+++ linux-2.6/tests/Makefile	2007-10-27 17:48:08.062415846 -0700
@@ -1,5 +1,2 @@
-obj-m := slub_test.o
-
-default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+obj-m += slub_test.o