diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 08d4242df5ed..5e501aafd23a 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -8,7 +8,7 @@ name: Style Checker on: pull_request: # maybe pull_request_target - branches: [ main ] + branches: [ dev, disable_style ] types: [ opened, reopened, edited, synchronize ] permissions: @@ -31,4 +31,4 @@ jobs: - name: Run checker run: | sha=$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}) - tools/build/checkstyle9.pl --github ${sha}..${{ github.event.pull_request.head.sha }} + git diff ${sha}..${{ github.event.pull_request.head.sha }} | tools/build/checkstyle9.pl --github - || true diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 57c4e0ac897f..dbfc7268b53e 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1080,12 +1080,13 @@ exec_map_first_page(struct image_params *imgp) VM_OBJECT_WUNLOCK(object); } #endif - error = vm_page_grab_valid_unlocked(&m, object, 0, - VM_ALLOC_COUNT(VM_INITIAL_PAGEIN) | + error = vm_page_grab_valid_unlocked(&m, object, 0, VM_ALLOC_COUNT(VM_INITIAL_PAGEIN) | VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED); if (error != VM_PAGER_OK) + { return (EIO); + } imgp->firstpage = sf_buf_alloc(m, 0); imgp->image_header = (char *)sf_buf_kva(imgp->firstpage); @@ -2380,12 +2381,12 @@ core_output_memtag_cheri(char * __capability base, size_t mem_len, int sbuf_drain_core_output(void *arg, const char *data, int len) { - struct coredump_params *cp; - struct proc *p; - int error, locked; +struct coredump_params *cp; +struct proc *p; +int error, locked; - cp = arg; - p = cp->td->td_proc; +cp = arg; +p = cp->td->td_proc; /* * Some kern_proc out routines that print to this sbuf may