diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-06-05 11:10:23 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-06-05 11:10:23 +0100 |
| commit | 9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a (patch) | |
| tree | cbffbccb83865b418a0aabb4487b6e8fe70c590d /include/linux/start_kernel.h | |
| parent | d922b80b1010cd6164fa7d3c197b4fbf94b47beb (diff) | |
| parent | 2e1492835e439fceba57a5b0f9b17da8e78ffa3d (diff) | |
Merge drm/drm-next into drm-intel-gt-next
For conflict avoidance we need the following commit:
c9a9f18d3ad8 drm/i915/huc: use const struct bus_type pointers
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'include/linux/start_kernel.h')
| -rw-r--r-- | include/linux/start_kernel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/start_kernel.h b/include/linux/start_kernel.h index 8b369a41c03c..a9806a44a605 100644 --- a/include/linux/start_kernel.h +++ b/include/linux/start_kernel.h @@ -8,8 +8,8 @@ /* Define the prototype for start_kernel here, rather than cluttering up something else. */ -extern asmlinkage void __init start_kernel(void); -extern void __init arch_call_rest_init(void); -extern void __ref rest_init(void); +extern asmlinkage void __init __noreturn start_kernel(void); +extern void __init __noreturn arch_call_rest_init(void); +extern void __ref __noreturn rest_init(void); #endif /* _LINUX_START_KERNEL_H */ |