Attachment #168800 for bug #242476

View | Details | Raw Unified | Return to bug 242476
Collapse All | Expand All

Lines 103-109 Link Here

(-)NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/nv-linux.h (+12 lines)
103	#endif	103	#endif
104		104
105	#include <linux/spinlock.h>	105	#include <linux/spinlock.h>
		106	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		107	#else
106	#include <asm/semaphore.h>	108	#include <asm/semaphore.h>
		109	#endif
107	#include <linux/completion.h>	110	#include <linux/completion.h>
108	#include <linux/highmem.h>	111	#include <linux/highmem.h>
109		112
Lines 618-630 Link Here
618	#if defined(preempt_disable)	621	#if defined(preempt_disable)
619	preempt_disable();	622	preempt_disable();
620	#endif	623	#endif
		624
		625	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		626	ret = smp_call_function(func, info, 1);
		627	#else
621	ret = smp_call_function(func, info, 1, 1);	628	ret = smp_call_function(func, info, 1, 1);
		629	#endif
622	func(info);	630	func(info);
623	#if defined(preempt_enable)	631	#if defined(preempt_enable)
624	preempt_enable();	632	preempt_enable();
625	#endif	633	#endif
626	#else	634	#else
		635	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		636	ret = on_each_cpu(func, info, 1);
		637	#else
627	ret = on_each_cpu(func, info, 1, 1);	638	ret = on_each_cpu(func, info, 1, 1);
		639	#endif
628	#endif	640	#endif
629	return ret;	641	return ret;
630	}	642	}




        case CPU_ONLINE:
            if (get_cpu() == cpu)
                __nv_setup_pat_entries(NULL);
             else
	    	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		smp_call_function(__nv_setup_pat_entries, hcpu, 1);
		#else
                 smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);
		#endif
             put_cpu();
             break;
         case CPU_DOWN_PREPARE:
             if (get_cpu() == cpu)
                 __nv_restore_pat_entries(NULL);
             else
	    	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		smp_call_function(__nv_restore_pat_entries, hcpu, 1);
		#else
                 smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);
		#endif
             put_cpu();
             break;
    }

    return NOTIFY_OK;

Lines 48-54 Link Here

(-)NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/os-interface.c (+6 lines)
48	#endif	48	#endif
49	local_bh_disable();	49	local_bh_disable();
50	atomic_set(&os_smp_barrier, 1);	50	atomic_set(&os_smp_barrier, 1);
		51	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		52	ret = smp_call_function(ipi_handler, NULL, 0);
		53	#else
51	ret = smp_call_function(ipi_handler, NULL, 1, 0);	54	ret = smp_call_function(ipi_handler, NULL, 1, 0);
		55	#endif
52	#endif	56	#endif
53	return (ret == 0) ? RM_OK : RM_ERROR;	57	return (ret == 0) ? RM_OK : RM_ERROR;
54	}	58	}
Lines 632-638 Link Here
632	U032 sig	636	U032 sig
633	)	637	)
634	{	638	{
		639	#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
635	return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK;	640	return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK;
		641	#endif
636	}	642	}
637		643
638	/*******************************************************************************/	644	/*******************************************************************************/

Return to bug 242476

Lines 1187-1203 Link Here

(-)NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/nv.c (-11 / +19 lines)
1187	case CPU_ONLINE:	1187	case CPU_ONLINE:
1188	if (get_cpu() == cpu)	1188	if (get_cpu() == cpu)
1189	__nv_setup_pat_entries(NULL);	1189	__nv_setup_pat_entries(NULL);
1190	else	1190	else
1191	smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);	1191	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
1192	put_cpu();	1192	smp_call_function(__nv_setup_pat_entries, hcpu, 1);
1193	break;	1193	#else
1194	case CPU_DOWN_PREPARE:	1194	smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);
1195	if (get_cpu() == cpu)	1195	#endif
1196	__nv_restore_pat_entries(NULL);	1196	put_cpu();
1197	else	1197	break;
1198	smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);	1198	case CPU_DOWN_PREPARE:
1199	put_cpu();	1199	if (get_cpu() == cpu)
1200	break;	1200	__nv_restore_pat_entries(NULL);
		1201	else
		1202	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
		1203	smp_call_function(__nv_restore_pat_entries, hcpu, 1);
		1204	#else
		1205	smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);
		1206	#endif
		1207	put_cpu();
		1208	break;
1201	}	1209	}
1202		1210
1203	return NOTIFY_OK;	1211	return NOTIFY_OK;