Annotation of /trunk/ati-drivers/patches/ati-drivers-8.40.4-warnings.patch
Parent Directory | Revision Log
Revision 317 -
(hide annotations)
(download)
Sun Aug 19 18:08:53 2007 UTC (17 years, 1 month ago) by niro
File size: 3262 byte(s)
Sun Aug 19 18:08:53 2007 UTC (17 years, 1 month ago) by niro
File size: 3262 byte(s)
-fixups for 8.40.4
1 | niro | 317 | diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c |
2 | --- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200 | ||
3 | +++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200 | ||
4 | @@ -452,7 +452,7 @@ | ||
5 | } | ||
6 | |||
7 | static unsigned int | ||
8 | -firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) | ||
9 | +firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt) | ||
10 | { | ||
11 | if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt)) | ||
12 | { | ||
13 | @@ -1491,7 +1491,8 @@ | ||
14 | int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst) | ||
15 | { | ||
16 | void *temp = src; | ||
17 | - return put_user(temp, dst); | ||
18 | + void *dst_temp = dst; | ||
19 | + return put_user(temp, dst_temp); | ||
20 | } | ||
21 | |||
22 | int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst) | ||
23 | @@ -1883,7 +1884,7 @@ | ||
24 | |||
25 | __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from) | ||
26 | { | ||
27 | - return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from ); | ||
28 | + return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); | ||
29 | } | ||
30 | |||
31 | void* ATI_API_CALL __ke_malloc(__ke_size_t size) | ||
32 | @@ -2813,9 +2814,9 @@ | ||
33 | #else | ||
34 | static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */ | ||
35 | |||
36 | -static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs) | ||
37 | +static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1) | ||
38 | { | ||
39 | - irq_handler_func(irq, arg1, regs); | ||
40 | + irq_handler_func(irq, arg1, NULL); | ||
41 | return IRQ_HANDLED; | ||
42 | } | ||
43 | |||
44 | @@ -2826,7 +2827,7 @@ | ||
45 | irq_handler_func = handler; | ||
46 | return request_irq(irq, | ||
47 | ke_irq_handler_wrap, | ||
48 | - SA_SHIRQ, dev_name, dev_id); | ||
49 | + IRQF_SHARED, dev_name, dev_id); | ||
50 | } | ||
51 | |||
52 | void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) | ||
53 | @@ -2848,9 +2849,7 @@ | ||
54 | |||
55 | void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd) | ||
56 | { | ||
57 | -#ifdef FIREGL_IOCTL_COMPAT | ||
58 | - return 0; | ||
59 | -#else | ||
60 | +#ifndef FIREGL_IOCTL_COMPAT | ||
61 | unregister_ioctl32_conversion(cmd); | ||
62 | #endif | ||
63 | } | ||
64 | @@ -4353,7 +4352,7 @@ | ||
65 | void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) | ||
66 | { | ||
67 | #ifdef CONFIG_SMP | ||
68 | - smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 ); | ||
69 | + smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 ); | ||
70 | #endif | ||
71 | } | ||
72 | |||
73 | @@ -5303,7 +5302,7 @@ | ||
74 | /** \brief Type definition of the structure describing Slab Cache object */ | ||
75 | typedef struct tag_kasSlabCache_t | ||
76 | { | ||
77 | - kmem_cache_t* cache; /* OS slab cache object */ | ||
78 | + struct kmem_cache* cache; /* OS slab cache object */ | ||
79 | spinlock_t lock; /* OS spinlock object protecting the cache */ | ||
80 | unsigned int routine_type; /* Type of routine the cache might be accessed from */ | ||
81 | char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ | ||
82 | @@ -5344,7 +5343,7 @@ | ||
83 | |||
84 | slabcache_obj->routine_type = access_type; | ||
85 | spin_lock_init(&(slabcache_obj->lock)); | ||
86 | - sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj); | ||
87 | + sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj); | ||
88 | |||
89 | DBG_TRACE("creating slab object '%s'", slabcache_obj->name); | ||
90 |