[PATCH] bsd-user: Catch up with sys/param.h requirement for machine/pmap.h

[PATCH] bsd-user: Catch up with sys/param.h requirement for machine/pmap.h

[Warner Losh]

From: Muhammad Moinur Rahman <bofh@FreeBSD.org>

Some versions of FreeBSD now require sys/param.h for machine/pmap.h on
x86. Include them here to meet that requirement. It does no harm on
older versions, so there's no need to #ifdef it.

Signed-off-by:  Muhammad Moinur Rahman <bofh@FreeBSD.org>
Reviewed-by:	John Baldwin <jhb@FreeBSD.org>
Signed-off-by:	Warner Losh <imp@bsdimp.com>
---
 bsd-user/host/i386/host-signal.h   | 1 +
 bsd-user/host/x86_64/host-signal.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bsd-user/host/i386/host-signal.h b/bsd-user/host/i386/host-signal.h
index 169e61b154c..ffdfaba534a 100644
--- a/bsd-user/host/i386/host-signal.h
+++ b/bsd-user/host/i386/host-signal.h
@@ -9,6 +9,7 @@
 #ifndef I386_HOST_SIGNAL_H
 #define I386_HOST_SIGNAL_H
 
+#include <sys/param.h>
 #include <sys/ucontext.h>
 #include <machine/trap.h>
 #include <vm/pmap.h>
diff --git a/bsd-user/host/x86_64/host-signal.h b/bsd-user/host/x86_64/host-signal.h
index 47ca19f8814..32ac4e41803 100644
--- a/bsd-user/host/x86_64/host-signal.h
+++ b/bsd-user/host/x86_64/host-signal.h
@@ -9,6 +9,7 @@
 #ifndef X86_64_HOST_SIGNAL_H
 #define X86_64_HOST_SIGNAL_H
 
+#include <sys/param.h>
 #include <sys/ucontext.h>
 #include <machine/trap.h>
 #include <vm/pmap.h>
-- 
2.33.1

Re: [PATCH] bsd-user: Catch up with sys/param.h requirement for machine/pmap.h

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 1741 bytes --]

Note: This is my first patch that someone else wrote that I'm trying to
accept
and land as the bsd-user maintainer unrelated to the other upstreaming work.
Please be let me know if I'm doing something wrong. I'll queue it to this
month's
bsd-user pull request (which likely will only include this patch).

Thanks!

On Wed, Oct 12, 2022 at 12:54 PM Warner Losh <imp@bsdimp.com> wrote:

> From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
>
> Some versions of FreeBSD now require sys/param.h for machine/pmap.h on
> x86. Include them here to meet that requirement. It does no harm on
> older versions, so there's no need to #ifdef it.
>
> Signed-off-by:  Muhammad Moinur Rahman <bofh@FreeBSD.org>
> Reviewed-by:    John Baldwin <jhb@FreeBSD.org>
> Signed-off-by:  Warner Losh <imp@bsdimp.com>
> ---
>  bsd-user/host/i386/host-signal.h   | 1 +
>  bsd-user/host/x86_64/host-signal.h | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/bsd-user/host/i386/host-signal.h
> b/bsd-user/host/i386/host-signal.h
> index 169e61b154c..ffdfaba534a 100644
> --- a/bsd-user/host/i386/host-signal.h
> +++ b/bsd-user/host/i386/host-signal.h
> @@ -9,6 +9,7 @@
>  #ifndef I386_HOST_SIGNAL_H
>  #define I386_HOST_SIGNAL_H
>
> +#include <sys/param.h>
>  #include <sys/ucontext.h>
>  #include <machine/trap.h>
>  #include <vm/pmap.h>
> diff --git a/bsd-user/host/x86_64/host-signal.h
> b/bsd-user/host/x86_64/host-signal.h
> index 47ca19f8814..32ac4e41803 100644
> --- a/bsd-user/host/x86_64/host-signal.h
> +++ b/bsd-user/host/x86_64/host-signal.h
> @@ -9,6 +9,7 @@
>  #ifndef X86_64_HOST_SIGNAL_H
>  #define X86_64_HOST_SIGNAL_H
>
> +#include <sys/param.h>
>  #include <sys/ucontext.h>
>  #include <machine/trap.h>
>  #include <vm/pmap.h>
> --
> 2.33.1
>
>

[-- Attachment #2: Type: text/html, Size: 2357 bytes --]

Re: [PATCH] bsd-user: Catch up with sys/param.h requirement for machine/pmap.h

[Richard Henderson]

On 10/13/22 11:57, Warner Losh wrote:
> Note: This is my first patch that someone else wrote that I'm trying to accept
> and land as the bsd-user maintainer unrelated to the other upstreaming work.
> Please be let me know if I'm doing something wrong. I'll queue it to this month's
> bsd-user pull request (which likely will only include this patch).
> 
> Thanks!
> 
> On Wed, Oct 12, 2022 at 12:54 PM Warner Losh <imp@bsdimp.com <mailto:imp@bsdimp.com>> wrote:
> 
>     From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
> 
>     Some versions of FreeBSD now require sys/param.h for machine/pmap.h on
>     x86. Include them here to meet that requirement. It does no harm on
>     older versions, so there's no need to #ifdef it.
> 
>     Signed-off-by:  Muhammad Moinur Rahman <bofh@FreeBSD.org>
>     Reviewed-by:    John Baldwin <jhb@FreeBSD.org>
>     Signed-off-by:  Warner Losh <imp@bsdimp.com>

This is exactly correct for a maintainer accepting work into a branch for a PR.


r~

Re: [PATCH] bsd-user: Catch up with sys/param.h requirement for machine/pmap.h

[Philippe Mathieu-Daudé]

On 12/10/22 20:56, Warner Losh wrote:
> From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
> 
> Some versions of FreeBSD now require sys/param.h for machine/pmap.h on
> x86. Include them here to meet that requirement. It does no harm on
> older versions, so there's no need to #ifdef it.
> 
> Signed-off-by:  Muhammad Moinur Rahman <bofh@FreeBSD.org>
> Reviewed-by:	John Baldwin <jhb@FreeBSD.org>
> Signed-off-by:	Warner Losh <imp@bsdimp.com>
> ---
>   bsd-user/host/i386/host-signal.h   | 1 +
>   bsd-user/host/x86_64/host-signal.h | 1 +
>   2 files changed, 2 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>