Skip to contentSkip to conversation

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

PATCH In review Warner Losh 3 participants 4 messages Oct 12, 2022 – Oct 18, 2022

lore
Share & tools
lore
#0 lore raw

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

From: Muhammad Moinur Rahman <[email protected]>

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.

---
 bsd-user/host/i386/host-signal.h   | 1 +
 bsd-user/host/x86_64/host-signal.h | 1 +
 2 files changed, 2 insertions(+)
bsd-user/host/i386/host-signal.h +1 -0
index 169e61b154c..ffdfaba534a 100644
@@ -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>
bsd-user/host/x86_64/host-signal.h +1 -0
index 47ca19f8814..32ac4e41803 100644
@@ -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>
Signature · 1 line
2.33.1
#1 lore raw

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!

Quoted 44 lines · Warner Losh

From: Muhammad Moinur Rahman <[email protected]>

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 <[email protected]>
Reviewed-by:    John Baldwin <[email protected]>
Signed-off-by:  Warner Losh <[email protected]>
---
 bsd-user/host/i386/host-signal.h   | 1 +
 bsd-user/host/x86_64/host-signal.h | 1 +
 2 files changed, 2 insertions(+)
bsd-user/host/i386/host-signal.h +1 -0
index 169e61b154c..ffdfaba534a 100644
@@ -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>
bsd-user/host/x86_64/host-signal.h +1 -1
index 47ca19f8814..32ac4e41803 100644
@@ -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

#2 lore raw
Quoted 11 lines · Warner Losh

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 <[email protected] <mailto:[email protected]>> wrote:

From: Muhammad Moinur Rahman <[email protected]>

Quoted 7 lines

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.

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

r~

Reviewed-by on v1 1/1
#3 lore raw
In reply to Warner Losh
Quoted 6 lines · Warner Losh

From: Muhammad Moinur Rahman <[email protected]>

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.

Quoted 7 lines
---
  bsd-user/host/i386/host-signal.h   | 1 +
  bsd-user/host/x86_64/host-signal.h | 1 +
  2 files changed, 2 insertions(+)