[kernel] r11868 - dists/trunk/linux-2.6/debian/patches/features/all/openvz

[Maximilian Attems]

Author: maks
Date: Mon Jul 21 14:36:21 2008
New Revision: 11868

Log:
openvz fix patch

commited per accident upstream openvz patch,
that doesn't apply to debian due to xen merge
+ local modifiction of Makefile and linux_banner.

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/openvz/openvz.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Jul 21 14:36:21 2008
@@ -467,8 +467,8 @@
  
  # *DOCUMENTATION*
 @@ -339,7 +340,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__
- KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
- KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+         SRCARCH := x86
+ endif
  
 -export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
 +export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION VZVERSION
@@ -24947,9 +24947,9 @@
 --- a/include/linux/page-flags.h
 +++ b/include/linux/page-flags.h
 @@ -157,6 +157,7 @@ PAGEFLAG(Active, active) __CLEARPAGEFLAG(Active, active)
- __PAGEFLAG(Slab, slab)
  PAGEFLAG(Checked, owner_priv_1)		/* Used by some filesystems */
  PAGEFLAG(Pinned, owner_priv_1) TESTSCFLAG(Pinned, owner_priv_1) /* Xen */
+ PAGEFLAG(SavePinned, dirty);					/* Xen */
 +PAGEFLAG(Checkpointed, owner_priv_1)
  PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
  PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private)
@@ -29995,9 +29995,9 @@
 +};
 +EXPORT_SYMBOL(virt_utsname);
 +
- /* FIXED STRINGS! Don't touch! */
  const char linux_banner[] =
- 	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+ 	"Linux version " UTS_RELEASE
+ #ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
 index d349746..7e5dde4 100644
 --- a/ipc/ipc_sysctl.c