|
Line
Link Here
|
| 0 |
-- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c |
0 |
++ svgalib-1.9.25/kernel/svgalib_helper/main.c |
|
Lines 162-171
static void task_startad(void *data) {
Link Here
|
| 162 |
get_user(pciv.address, &user_pciv->address); \ |
162 |
get_user(pciv.address, &user_pciv->address); \ |
| 163 |
get_user(pciv.val, &user_pciv->val); |
163 |
get_user(pciv.val, &user_pciv->val); |
| 164 |
#define PUT_PCIV \ |
164 |
#define PUT_PCIV \ |
| 165 |
put_user(pciv.val, &user_pciv->val); |
165 |
put_user(pciv.val, &user_pciv->val); |
|
|
166 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) |
| 166 |
static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, |
167 |
static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, |
| 167 |
unsigned int cmd, unsigned long arg) { |
168 |
unsigned int cmd, unsigned long arg) { |
|
|
169 |
#else |
| 170 |
static int svgalib_helper_ioctl(struct file *filp, |
| 171 |
unsigned int cmd, unsigned long arg) { |
| 172 |
struct inode *inode=filp->f_dentry->d_inode; |
| 173 |
#endif |
| 168 |
|
174 |
|
| 169 |
io_t iov, *user_iov=(io_t *)arg; |
175 |
io_t iov, *user_iov=(io_t *)arg; |
| 170 |
pcic_t pciv, *user_pciv=(pcic_t *)arg; |
176 |
pcic_t pciv, *user_pciv=(pcic_t *)arg; |
| 171 |
int minor = my_minor(inode->i_rdev); |
177 |
int minor = my_minor(inode->i_rdev); |
|
Lines 595-601
struct file_operations svgalib_helper_fo
Link Here
|
| 595 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) |
601 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) |
| 596 |
.owner = THIS_MODULE, |
602 |
.owner = THIS_MODULE, |
| 597 |
#endif |
603 |
#endif |
|
|
604 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) |
| 598 |
.ioctl = svgalib_helper_ioctl, |
605 |
.ioctl = svgalib_helper_ioctl, |
|
|
606 |
#else |
| 607 |
.unlocked_ioctl = svgalib_helper_ioctl, |
| 608 |
#endif |
| 599 |
.mmap = svgalib_helper_mmap, |
609 |
.mmap = svgalib_helper_mmap, |
| 600 |
.open = svgalib_helper_open, |
610 |
.open = svgalib_helper_open, |
| 601 |
.release = svgalib_helper_release, |
611 |
.release = svgalib_helper_release, |
