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. svn path=/dists/trunk/linux-2.6/; revision=11868
This commit is contained in:
parent
a6d01009e3
commit
5efd3a3f33
|
@ -467,8 +467,8 @@ index e3c5eb6..62dc374 100644
|
|||
|
||||
# *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 @@ index f31debf..5b44dd6 100644
|
|||
--- 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 @@ index 9d17d70..ce53b6b 100644
|
|||
+};
|
||||
+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
|
||||
|
|
Loading…
Reference in New Issue