Skip to content

Commit e7397b9

Browse files
mauri870gopherbot
authored andcommitted
unix: update to Linux 6.11
Change-Id: I1cc777822da1b557e69634faade8e24d06c00ce8 GitHub-Last-Rev: d09238e GitHub-Pull-Request: #218 Reviewed-on: https://go-review.googlesource.com/c/sys/+/613855 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Ian Lance Taylor <iant@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com> Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Michael Knyszek <mknyszek@google.com>
1 parent 981de40 commit e7397b9

26 files changed

+147
-36
lines changed

unix/linux/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
# Get the git sources. If not cached, this takes O(5 minutes).
1616
WORKDIR /git
1717
RUN git config --global advice.detachedHead false
18-
# Linux Kernel: Released 14 July 2024
19-
RUN git clone --branch v6.10 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
18+
# Linux Kernel: Released 15 Sep 2024
19+
RUN git clone --branch v6.11 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
2020
# GNU C library: Released 21 July 2024
2121
RUN git clone --branch release/2.40/master --depth 1 https://sourceware.org/git/glibc.git
2222

unix/linux/mksysnum.go

+14
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package main
88

99
import (
1010
"bufio"
11+
"bytes"
1112
"fmt"
1213
"os"
1314
"os/exec"
@@ -125,6 +126,19 @@ func main() {
125126
fmt.Fprintf(os.Stderr, "can't run %s", cc)
126127
os.Exit(1)
127128
}
129+
130+
switch goarch {
131+
case "riscv64", "loong64", "arm64":
132+
// Kernel linux v6.11 removed some __NR_* macros that only
133+
// existed on some architectures as an implementation detail. In
134+
// order to keep backwards compatibility we add them back.
135+
//
136+
// See https://lkml.org/lkml/2024/8/5/1283.
137+
if !bytes.Contains(cmd, []byte("#define __NR_arch_specific_syscall")) {
138+
cmd = append(cmd, []byte("#define __NR_arch_specific_syscall 244\n")...)
139+
}
140+
}
141+
128142
s := bufio.NewScanner(strings.NewReader(string(cmd)))
129143
var offset, prev, asOffset int
130144
var nums syscallNums

unix/syscall_linux_arm64.go

+2
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,5 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
182182
}
183183
return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
184184
}
185+
186+
const SYS_FSTATAT = SYS_NEWFSTATAT

unix/syscall_linux_loong64.go

+2
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,5 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error
214214
}
215215
return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
216216
}
217+
218+
const SYS_FSTATAT = SYS_NEWFSTATAT

unix/syscall_linux_riscv64.go

+2
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,5 @@ func RISCVHWProbe(pairs []RISCVHWProbePairs, set *CPUSet, flags uint) (err error
187187
}
188188
return riscvHWProbe(pairs, setSize, set, flags)
189189
}
190+
191+
const SYS_FSTATAT = SYS_NEWFSTATAT

unix/zerrors_linux.go

+11-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_386.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_amd64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_arm.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_arm64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_loong64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mips.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mips64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mips64le.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mipsle.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_ppc.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_ppc64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_ppc64le.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_riscv64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_s390x.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_sparc64.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zsysnum_linux_amd64.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zsysnum_linux_arm64.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zsysnum_linux_loong64.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zsysnum_linux_riscv64.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)