[Pkg-virtualbox-commits] r233 - in trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-03-02 09:40:08 +0000 (Sun, 02 Mar 2008)
New Revision: 233

Added:
   trunk/debian/patches/02-2.6.25.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Added patch by Frans Pop <elendil at planet.nl> to make modules compile with kernel 2.6.25.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-25 18:55:27 UTC (rev 232)
+++ trunk/debian/changelog	2008-03-02 09:40:08 UTC (rev 233)
@@ -1,10 +1,15 @@
 virtualbox-ose (1.5.6-dfsg-2) UNRELEASED; urgency=low
 
+  [ Daniel Baumann ]
   * Added Brazilian-Portuguese debconf translation from Eder L. Marques
     <eder at edermarques.net> (Closes: #467452).
 
- -- Daniel Baumann <daniel at debian.org>  Mon, 25 Feb 2008 19:53:00 +0100
+  [ Michael Meskes ]
+  * Added patch by Frans Pop <elendil at planet.nl> to make modules compile with
+    kernel 2.6.25, closes: #468864
 
+ -- Michael Meskes <meskes at debian.org>  Sun, 02 Mar 2008 10:38:31 +0100
+
 virtualbox-ose (1.5.6-dfsg-1) unstable; urgency=low
 
   [ Michael Meskes ]

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-02-25 18:55:27 UTC (rev 232)
+++ trunk/debian/patches/00list	2008-03-02 09:40:08 UTC (rev 233)
@@ -1,4 +1,5 @@
 01-no-64bit-guest.dpatch
+02-2.6.25.dpatch
 03-config-kmk.dpatch
 04-localconf-kmk.dpatch
 05-vboxdrv-references.dpatch

Added: trunk/debian/patches/02-2.6.25.dpatch
===================================================================
--- trunk/debian/patches/02-2.6.25.dpatch	                        (rev 0)
+++ trunk/debian/patches/02-2.6.25.dpatch	2008-03-02 09:40:08 UTC (rev 233)
@@ -0,0 +1,50 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-2.6.25.dpatch by Frans Pop <elendil at planet.nl>
+##
+## DP: Changes needed to compile moduls on kernel 2.6.25.
+
+ at DPATCH@
+
+diff -ur virtualbox-ose_1.5.6/r0drv/linux/the-linux-kernel.h virtualbox-ose/r0drv/linux/the-linux-kernel.h
+--- virtualbox-ose_1.5.6/r0drv/linux/the-linux-kernel.h	2008-02-23 11:10:06.000000000 +0100
++++ virtualbox-ose/r0drv/linux/the-linux-kernel.h	2008-02-27 01:57:20.000000000 +0100
+@@ -225,12 +225,16 @@
+ #undef bool
+ 
+ /*
+- * There are post-2.6.24 kernels (confusingly with unchanged version number)
+- * which eliminate macros which were marked as deprecated.
++ * The 2.6.25 kernel eliminates macros that were marked as deprecated and eliminates
++ * routine change_page_attr() in favor of the set_pages_* API.
+  */
+ #ifndef __attribute_used__
+ #define __attribute_used__ __used
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++int change_page_attr(struct page *page, int numpages, pgprot_t prot);
++#endif
++
+ #endif
+ 
+diff -ur virtualbox-ose_1.5.6/linux/SUPDrv-linux.c virtualbox-ose/linux/SUPDrv-linux.c
+--- virtualbox-ose_1.5.6/linux/SUPDrv-linux.c	2008-02-23 11:10:05.000000000 +0100
++++ virtualbox-ose/linux/SUPDrv-linux.c	2008-02-27 01:54:17.000000000 +0100
+@@ -2069,6 +2069,17 @@
+ /* GCC C++ hack. */
+ unsigned __gxx_personality_v0 = 0xcccccccc;
+ 
++/* Add the change_page_attr routine for kernels 2.6.25 or later */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++int change_page_attr(struct page *page, int numpages, pgprot_t prot)
++{
++	/* use the set_pages_* API */
++	if (pgprot_val(prot) & _PAGE_NX)
++		set_pages_nx(page, numpages);
++	set_pages_uc(page, numpages);
++	return 0;
++}
++#endif
+ 
+ module_init(VBoxSupDrvInit);
+ module_exit(VBoxSupDrvUnload);