Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'hot-fixes' (fixes for rc6)
This is a collection of three fixes for small annoyances.
Two of these are already pending in other trees, but I really don't want
to release another -rc with these issues pending, so I picked up the
patches for these things directly. We'll end up with duplicate commits
eventually, I prefer that over having these issues pending.
The third one is just me getting rid of another BUG_ON() just because it
was reported and I dislike those things so much.
* merge 'hot-fixes' branch:
ida: don't use BUG_ON() for debugging
drm/aperture: Run fbdev removal before internal helpers
ptrace: fix clearing of JOBCTL_TRACED in ptrace_unfreeze_traced()
+18
-13
+15
-11
drivers/gpu/drm/drm_aperture.c
+15
-11
drivers/gpu/drm/drm_aperture.c
···
329
329
const struct drm_driver *req_driver)
330
330
{
331
331
resource_size_t base, size;
332
-
int bar, ret = 0;
332
+
int bar, ret;
333
+
334
+
/*
335
+
* WARNING: Apparently we must kick fbdev drivers before vgacon,
336
+
* otherwise the vga fbdev driver falls over.
337
+
*/
338
+
#if IS_REACHABLE(CONFIG_FB)
339
+
ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
340
+
if (ret)
341
+
return ret;
342
+
#endif
343
+
ret = vga_remove_vgacon(pdev);
344
+
if (ret)
345
+
return ret;
333
346
334
347
for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
335
348
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
···
352
339
drm_aperture_detach_drivers(base, size);
353
340
}
354
341
355
-
/*
356
-
* WARNING: Apparently we must kick fbdev drivers before vgacon,
357
-
* otherwise the vga fbdev driver falls over.
358
-
*/
359
-
#if IS_REACHABLE(CONFIG_FB)
360
-
ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
361
-
#endif
362
-
if (ret == 0)
363
-
ret = vga_remove_vgacon(pdev);
364
-
return ret;
342
+
return 0;
365
343
}
366
344
EXPORT_SYMBOL(drm_aperture_remove_conflicting_pci_framebuffers);
+1
-1
kernel/ptrace.c
+1
-1
kernel/ptrace.c
···
222
222
if (lock_task_sighand(task, &flags)) {
223
223
task->jobctl &= ~JOBCTL_PTRACE_FROZEN;
224
224
if (__fatal_signal_pending(task)) {
225
-
task->jobctl &= ~TASK_TRACED;
225
+
task->jobctl &= ~JOBCTL_TRACED;
226
226
wake_up_state(task, __TASK_TRACED);
227
227
}
228
228
unlock_task_sighand(task, &flags);