Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (b5598c96638c05daf58fda9a6b5bb4c7e2623973)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (b5598c96638c05daf58fda9a6b5bb4c7e2623973)
  • Date: Mon, 20 Jan 2014 13:28:30 -0600

GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

z-kernels/nvidia_driver/HISTORY | 3 +++
z-kernels/nvidia_driver/PRE_BUILD | 1 +
z-kernels/nvidia_driver/linux-3.13.patch | 26 ++++++++++++++++++++++++++
3 files changed, 30 insertions(+)

New commits:
commit b5598c96638c05daf58fda9a6b5bb4c7e2623973
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

z-kernels/nvidia_driver: fix run-time error with linux 3.13

diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 9f40c2c..f4fe35e 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2014-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, linux-3.13.patch: fix run-time error with linux 3.13
+
2014-01-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 331.38

diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index e3abfac..b8e75f9 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -4,6 +4,7 @@ sh $SOURCE_CACHE/$SOURCE --extract-only
\
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
#patch -p1 < $SPELL_DIRECTORY/linux-3.11.patch &&
+patch -p1 < $SPELL_DIRECTORY/linux-3.13.patch &&

# Fix defunct desktop file
sedit 's/__.*__\///' nvidia-settings.desktop &&
diff --git a/z-kernels/nvidia_driver/linux-3.13.patch
b/z-kernels/nvidia_driver/linux-3.13.patch
new file mode 100644
index 0000000..e6d9741
--- /dev/null
+++ b/z-kernels/nvidia_driver/linux-3.13.patch
@@ -0,0 +1,26 @@
+From d57c6bf7799dd815b6d9b0abbe9e86c2cd0ead21 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 20 Jan 2014 20:23:58 +0100
+Subject: [PATCH] fix error due to changed acpi api
+
+---
+ kernel/nv-acpi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/kernel/nv-acpi.c b/kernel/nv-acpi.c
+index b0138cd..6c55144 100644
+--- a/kernel/nv-acpi.c
++++ b/kernel/nv-acpi.c
+@@ -303,7 +303,9 @@ static int nv_acpi_remove(struct acpi_device *device,
int type)
+
+ if (pNvAcpiObject->notify_handler_installed)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
++#endif
+
+ // remove event notifier
+ status = acpi_remove_notify_handler(device->handle,
ACPI_DEVICE_NOTIFY, nv_acpi_event);
+--
+1.8.5.3
+



  • [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (b5598c96638c05daf58fda9a6b5bb4c7e2623973), Florian Franzmann, 01/20/2014

Archive powered by MHonArc 2.6.24.

Top of Page