diff options
| author | Robin Cook | 2007-11-10 20:28:03 -0600 |
|---|---|---|
| committer | Robin Cook | 2007-11-10 20:28:03 -0600 |
| commit | c30e04b1e1903ee31ddfd97f82b5c978247a7141 (patch) | |
| tree | 77883ccc7b84fbdfa039965684601fe4add4ae5f /display/svgalib | |
| parent | edc5a78d40a5edfd179cf9580882b8b23cc0e72e (diff) | |
svgalib: add patch to compile with 2.6.23 kernel
Diffstat (limited to 'display/svgalib')
| -rw-r--r-- | display/svgalib/HISTORY | 5 | ||||
| -rwxr-xr-x | display/svgalib/PRE_BUILD | 4 | ||||
| -rw-r--r-- | display/svgalib/svgalib_helper-2.6.23.diff | 72 |
3 files changed, 80 insertions, 1 deletions
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY index b43f68d630..5c72579cb4 100644 --- a/display/svgalib/HISTORY +++ b/display/svgalib/HISTORY @@ -1,3 +1,8 @@ +2007-11-10 Robin Cook <rcook@wyrms.net> + * PRE_BUILD: added to apply patch for 2.6.23 + http://groups.google.com/group/svgalib/browse_thread/thread/367b73b209a0bb77 + http://groups.google.com/group/svgalib/browse_thread/thread/77a6f8362845b862 + 2006-12-27 Robin Cook <rcook@wyrms.net> * PRE_BUILD: added to apply patch for 2.6.19 diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD index 72b73efd01..8f3b0f93e4 100755 --- a/display/svgalib/PRE_BUILD +++ b/display/svgalib/PRE_BUILD @@ -10,7 +10,9 @@ sedit "s:\$(shell uname -r):$KER:g" \ # Apply patchs for kernel versions 2.6.15* and newer KER=${KER:0:6} && -if [ ${KER//\./} > 2619 ]; then +if [ ${KER//\./} > 2623 ]; then + patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff +elif [ ${KER//\./} > 2619 ]; then patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.19.diff elif [ ${KER//\./} > 2617 ]; then patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.18.diff diff --git a/display/svgalib/svgalib_helper-2.6.23.diff b/display/svgalib/svgalib_helper-2.6.23.diff new file mode 100644 index 0000000000..dc60739d14 --- /dev/null +++ b/display/svgalib/svgalib_helper-2.6.23.diff @@ -0,0 +1,72 @@ +diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h +--- svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h 2007-11-10 20:03:01.000000000 -0600 ++++ svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h 2007-11-10 20:16:58.000000000 -0600 +@@ -31,6 +31,7 @@ + #else /* Kernel 2.6 */ + + #define NO_TASK ++#include <linux/fs.h> + + # ifndef KERNEL_2_6 + # define KERNEL_2_6 +@@ -77,7 +78,8 @@ + } + static inline int devfs_unregister_chrdev (unsigned int major,const char *name) + { +- return unregister_chrdev (major, name); ++ unregister_chrdev (major, name); ++ return 0; + } + #endif + +diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/main.c svgalib-1.9.25.mod/kernel/svgalib_helper/main.c +--- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c 2007-11-10 20:03:01.000000000 -0600 ++++ svgalib-1.9.25.mod/kernel/svgalib_helper/main.c 2007-11-10 20:13:07.000000000 -0600 +@@ -1,5 +1,7 @@ +-#include <linux/config.h> +- ++#ifndef AUTOCONF_INCLUDED ++# include <linux/config.h> ++#endif ++ + #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) + # define MODVERSIONS + #endif +@@ -17,7 +19,9 @@ + #include <linux/ioport.h> + #include <linux/interrupt.h> + #include <linux/pci.h> +-#include <linux/devfs_fs_kernel.h> ++#ifndef AUTOCONF_INCLUDED ++# include <linux/devfs_fs_kernel.h> ++#endif + #include <linux/mm.h> + #include <linux/thread_info.h> + #include <linux/smp.h> +@@ -98,7 +102,7 @@ + static volatile int vsync=0; + static wait_queue_head_t vsync_wait; + +-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++static irqreturn_t vsync_interrupt(int irq, void *dev_id) + { + struct sh_pci_device *dev = (struct sh_pci_device *)dev_id; + +@@ -355,7 +359,7 @@ + vsync=1; + i=0; + while(irqs[i]!=-1) +- request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", sdev_id); ++ request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED, "svgalib_helper", sdev_id); + vga_enable_vsync((void *)sdev_id); + wait_event_interruptible(vsync_wait, !vsync); + i=0; +@@ -443,7 +447,7 @@ + int i=sh_pci_devs[minor]->dev->irq; + sh_pci_devs[minor]->opencount++; + if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 && i!=255) +- request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", sh_pci_devs[minor]); ++ request_irq(i, vsync_interrupt, IRQF_SHARED, "svgalib_helper", sh_pci_devs[minor]); + } + + #ifndef KERNEL_2_6 |