Attachment #197683 for bug #277548

Lines 293-299 Link Here

(-)usr/src/nv/os-agp.c.orig (+4 lines)
293	{	293	{
294	nv_pte_t *page_ptr = at->page_table[i];	294	nv_pte_t *page_ptr = at->page_table[i];
295		295
		296	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
296	page_ptr->phys_addr = (ptr->memory[i] & PAGE_MASK);	297	page_ptr->phys_addr = (ptr->memory[i] & PAGE_MASK);
		298	#else
		299	page_ptr->phys_addr = (page_to_phys(ptr->pages[i]) & PAGE_MASK);
		300	#endif
297	page_ptr->virt_addr = (unsigned long) __va(page_ptr->phys_addr);	301	page_ptr->virt_addr = (unsigned long) __va(page_ptr->phys_addr);
298	page_ptr->dma_addr = page_ptr->phys_addr;	302	page_ptr->dma_addr = page_ptr->phys_addr;
299	}	303	}





#else // defined(KERNEL_2_4)

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
static int nv_i2c_adapter_register_client(struct i2c_client * pClient)
{
    try_module_get(THIS_MODULE);

    module_put(THIS_MODULE);
    return 0;
}
#endif

struct i2c_adapter nv_i2c_adapter_prototype = {
    .owner             = THIS_MODULE,
    .algo              = &nv_i2c_algo,
    .algo_data         = NULL,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
    .client_register   = nv_i2c_adapter_register_client,
    .client_unregister = nv_i2c_adapter_unregister_client,
#endif
};

#endif // defined(KERNEL_2_4)

Return to bug 277548

Lines 225-230 Link Here

(-)usr/src/nv/nv-i2c.c.orig (+4 lines)
225		225
226	#else // defined(KERNEL_2_4)	226	#else // defined(KERNEL_2_4)
227		227
		228	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
228	static int nv_i2c_adapter_register_client(struct i2c_client * pClient)	229	static int nv_i2c_adapter_register_client(struct i2c_client * pClient)
229	{	230	{
230	try_module_get(THIS_MODULE);	231	try_module_get(THIS_MODULE);
Lines 236-248 Link Here
236	module_put(THIS_MODULE);	237	module_put(THIS_MODULE);
237	return 0;	238	return 0;
238	}	239	}
		240	#endif
239		241
240	struct i2c_adapter nv_i2c_adapter_prototype = {	242	struct i2c_adapter nv_i2c_adapter_prototype = {
241	.owner = THIS_MODULE,	243	.owner = THIS_MODULE,
242	.algo = &nv_i2c_algo,	244	.algo = &nv_i2c_algo,
243	.algo_data = NULL,	245	.algo_data = NULL,
		246	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
244	.client_register = nv_i2c_adapter_register_client,	247	.client_register = nv_i2c_adapter_register_client,
245	.client_unregister = nv_i2c_adapter_unregister_client,	248	.client_unregister = nv_i2c_adapter_unregister_client,
		249	#endif
246	};	250	};
247		251
248	#endif // defined(KERNEL_2_4)	252	#endif // defined(KERNEL_2_4)