Message ID | 20190205173306.20483-2-eric.auger@redhat.com |
---|---|
State | New |
Headers | show |
Series | ARM virt: Initial RAM expansion and PCDIMM/NVDIMM support | expand |
On Tue, 5 Feb 2019 at 17:33, Eric Auger <eric.auger@redhat.com> wrote: > > From: Alexey Kardashevskiy <aik@ozlabs.ru> > > Since Linux'es ab66dcc76d "powerpc: generate uapi header and system call > table files" there are 2 new files: unistd_32.h and unistd_64.h. These > files content is moved from unistd.h so now we have to copy new files > as well, just like we already do for other architectures; this does it > for MIPS as well. > > Also, v5.0-rc2 moved vhost bits around in 4b86713236e4bd > "vhost: split structs into a separate header file", add those too. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> I think this fix is handled by commit a0a6ef91a4a4edde27 (now in master), yes ? thanks -- PMM
On 15/02/2019 03:36, Peter Maydell wrote: > On Tue, 5 Feb 2019 at 17:33, Eric Auger <eric.auger@redhat.com> wrote: >> >> From: Alexey Kardashevskiy <aik@ozlabs.ru> >> >> Since Linux'es ab66dcc76d "powerpc: generate uapi header and system call >> table files" there are 2 new files: unistd_32.h and unistd_64.h. These >> files content is moved from unistd.h so now we have to copy new files >> as well, just like we already do for other architectures; this does it >> for MIPS as well. >> >> Also, v5.0-rc2 moved vhost bits around in 4b86713236e4bd >> "vhost: split structs into a separate header file", add those too. >> >> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > > I think this fix is handled by commit a0a6ef91a4a4edde27 > (now in master), yes ? uff, just noticed this mail. yes, it is done by a0a6ef91a4a4edde27. Thanks,
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 0a964fe240..1cd8bd57be 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -121,11 +121,20 @@ for arch in $ARCHLIST; do cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/" cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch" fi + if [ $arch = powerpc ]; then + cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-powerpc/" + cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-powerpc/" + fi + if [ $arch = mips ]; then + cp "$tmpdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-mips/" + cp "$tmpdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-mips/" + cp "$tmpdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-mips/" + fi done rm -rf "$output/linux-headers/linux" mkdir -p "$output/linux-headers/linux" -for header in kvm.h vfio.h vfio_ccw.h vhost.h \ +for header in kvm.h vfio.h vfio_ccw.h vhost.h vhost_types.h \ psci.h psp-sev.h userfaultfd.h; do cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" done