Skip to content

Commit 1625fb9

Browse files
authored
Merge branch 'linux-6.6.y' into linux-6.6.y-2026-06-04-mm1
2 parents 9b3de84 + 42462eb commit 1625fb9

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

.github/workflows/build-kernel-sw64.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build-kernel-sw6b:
2121
runs-on: [self-hosted, linux, x64]
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v6
2424
- name: "Install Deps"
2525
run: |
2626
git config --global user.email $email
@@ -35,6 +35,12 @@ jobs:
3535
build-kernel-sw8a:
3636
runs-on: [self-hosted, linux, x64]
3737
steps:
38+
- uses: actions/checkout@v6
39+
- name: "Install Deps"
40+
run: |
41+
git config --global user.email $email
42+
git config --global user.name $KBUILD_BUILD_USER
43+
3844
- name: "Compile kernel"
3945
run: |
4046
# .config

arch/sw_64/include/asm/bitops.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,14 @@ sched_find_first_bit(const unsigned long b[2])
561561

562562
#include <asm-generic/bitops/ext2-atomic-setbit.h>
563563

564+
#define clear_bit_unlock __sw64_clear_bit_unlock
565+
#define __clear_bit_unlock __sw64___clear_bit_unlock
566+
#define test_and_set_bit_lock __sw64_test_and_set_bit_lock
567+
#include <asm-generic/bitops/lock.h>
568+
#undef clear_bit_unlock
569+
#undef __clear_bit_unlock
570+
#undef test_and_set_bit_lock
571+
564572
#endif /* __KERNEL__ */
565573

566574
#endif /* _ASM_SW64_BITOPS_H */

0 commit comments

Comments
 (0)