[patch] Linux 3.4.0+ friendly patch

linux-3.4.0.patch (text/plain), 1.23 KB, created by Daniel Santos on 2012-05-04 21:17:18 UTC

diff --git a/kernel/conftest.sh b/kernel/conftest.sh
index 1556df7..4a2fc44 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -512,7 +512,10 @@ compile_test() {
             # and if it as an 'event' member.
             #
             echo "$CONFTEST_PREAMBLE
-            #include <asm/system.h>
+            #include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+#include <asm/system.h>
+#endif
             #include <linux/pm.h>
             void conftest_pm_message_t(pm_message_t state) {
                 pm_message_t *p = &state;
diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
index 772a095..4811809 100644
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -111,7 +111,9 @@
 #include <linux/timer.h>
 
 #include <asm/div64.h>              /* do_div()                         */
-#include <asm/system.h>             /* cli, sli, save_flags             */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+#include <asm/system>
+#endif             /* cli, sli, save_flags             */
 #include <asm/io.h>                 /* ioremap, virt_to_phys            */
 #include <asm/uaccess.h>            /* access_ok                        */
 #include <asm/page.h>               /* PAGE_OFFSET                      */