diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/softirq.c | 6 | ||||
| -rw-r--r-- | kernel/workqueue.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 7c562558a863..1c42e08fdfaa 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -427,7 +427,7 @@ void __tasklet_schedule(struct tasklet_struct *t) | |||
| 427 | 427 | ||
| 428 | lock_nv_registry(nvidia_device, &flags); | 428 | lock_nv_registry(nvidia_device, &flags); |
| 429 | 429 | ||
| 430 | device_owner = get_nv_device_owner(nvidia_device); | 430 | device_owner = get_nv_max_device_owner(nvidia_device); |
| 431 | 431 | ||
| 432 | if(device_owner==NULL) | 432 | if(device_owner==NULL) |
| 433 | { | 433 | { |
| @@ -497,7 +497,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t) | |||
| 497 | 497 | ||
| 498 | lock_nv_registry(nvidia_device, &flags); | 498 | lock_nv_registry(nvidia_device, &flags); |
| 499 | 499 | ||
| 500 | device_owner = get_nv_device_owner(nvidia_device); | 500 | device_owner = get_nv_max_device_owner(nvidia_device); |
| 501 | 501 | ||
| 502 | if(device_owner==NULL) | 502 | if(device_owner==NULL) |
| 503 | { | 503 | { |
| @@ -564,7 +564,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) | |||
| 564 | 564 | ||
| 565 | lock_nv_registry(nvidia_device, &flags); | 565 | lock_nv_registry(nvidia_device, &flags); |
| 566 | 566 | ||
| 567 | device_owner = get_nv_device_owner(nvidia_device); | 567 | device_owner = get_nv_max_device_owner(nvidia_device); |
| 568 | 568 | ||
| 569 | if(device_owner==NULL) | 569 | if(device_owner==NULL) |
| 570 | { | 570 | { |
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 2ceb7b43a045..6b59d59ce3cf 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -2704,7 +2704,7 @@ int schedule_work(struct work_struct *work) | |||
| 2704 | 2704 | ||
| 2705 | lock_nv_registry(nvidiaDevice, &flags); | 2705 | lock_nv_registry(nvidiaDevice, &flags); |
| 2706 | 2706 | ||
| 2707 | device_owner = get_nv_device_owner(nvidiaDevice); | 2707 | device_owner = get_nv_max_device_owner(nvidiaDevice); |
| 2708 | 2708 | ||
| 2709 | //2) If there is an owner, set work->owner to the owner's task struct. | 2709 | //2) If there is an owner, set work->owner to the owner's task struct. |
| 2710 | if(device_owner==NULL) | 2710 | if(device_owner==NULL) |