Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
Signed-off-by: Boqun Feng <[email protected]>
  • Loading branch information
fbq committed Sep 22, 2021
1 parent b207507 commit db49a24
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions rust/kernel/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl RawThread {
/// This function might sleep in `kthread_create_on_node` due to the memory
/// allocation and waiting for the completion, therefore do not call this
/// in atomic contexts (i.e. preemption-off contexts).
pub unsafe fn try_new(
pub unsafe fn spawn(
name: &CStr,
f: unsafe extern "C" fn(*mut c_types::c_void) -> c_types::c_int,
arg: *mut c_types::c_void,
Expand Down Expand Up @@ -214,7 +214,7 @@ impl Thread {
// SAFETY: `bridge::<F>` is a proper function pointer to a C function,
// and [`Box::from_raw`] will be used in it to consume the raw pointer
// in the new thread.
let result = unsafe { RawThread::try_new(name, bridge::<F>, data as _) };
let result = unsafe { RawThread::spawn(name, bridge::<F>, data as _) };

if result.is_err() {
// Creation fails, we need to consume the raw pointer `data` because
Expand Down
4 changes: 1 addition & 3 deletions scripts/link-vmlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,7 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
size1=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso_prev})
size2=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso})

if [ $size1 -ne $size2 ] || [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
kallsyms_step 3
fi
kallsyms_step 3
fi

vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
Expand Down

0 comments on commit db49a24

Please sign in to comment.